https://git.reactos.org/?p=reactos.git;a=commitdiff;h=034ec2e0fccc6efbe29ebd31c9a58751c1c6f98e
commit 034ec2e0fccc6efbe29ebd31c9a58751c1c6f98e Author: Amine Khaldi <[email protected]> AuthorDate: Sun Mar 18 12:32:52 2018 +0100 Commit: Amine Khaldi <[email protected]> CommitDate: Sun Mar 18 12:32:52 2018 +0100 [MSIMTF] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/msimtf/activeimmapp.c | 22 +++++++++++++++++++++- dll/win32/msimtf/main.c | 19 +++++++++++++++++-- dll/win32/msimtf/precomp.h | 4 ++-- media/doc/README.WINE | 2 +- 4 files changed, 41 insertions(+), 6 deletions(-) diff --git a/dll/win32/msimtf/activeimmapp.c b/dll/win32/msimtf/activeimmapp.c index 973a7d5722..fb5ef40be5 100644 --- a/dll/win32/msimtf/activeimmapp.c +++ b/dll/win32/msimtf/activeimmapp.c @@ -18,7 +18,27 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" +#include "config.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winreg.h" +#include "winuser.h" +#include "winerror.h" +#include "objbase.h" +#include "dimm.h" +#include "imm.h" + +#include "wine/unicode.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msimtf); typedef struct tagActiveIMMApp { IActiveIMMApp IActiveIMMApp_iface; diff --git a/dll/win32/msimtf/main.c b/dll/win32/msimtf/main.c index 9f341403ea..78c26cb10e 100644 --- a/dll/win32/msimtf/main.c +++ b/dll/win32/msimtf/main.c @@ -16,9 +16,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" +#include "config.h" -#include <rpcproxy.h> +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "ole2.h" +#include "rpcproxy.h" +#include "dimm.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msimtf); extern HRESULT ActiveIMMApp_Constructor(IUnknown *punkOuter, IUnknown **ppOut); diff --git a/dll/win32/msimtf/precomp.h b/dll/win32/msimtf/precomp.h index 43a5d4a4df..6daa8c5a88 100644 --- a/dll/win32/msimtf/precomp.h +++ b/dll/win32/msimtf/precomp.h @@ -1,3 +1,4 @@ + #ifndef _MSIMTF_PCH_ #define _MSIMTF_PCH_ @@ -19,6 +20,5 @@ #include <dimm.h> #include <wine/debug.h> -WINE_DEFAULT_DEBUG_CHANNEL(msimtf); -#endif /* _MSIMTF_PCH_ */ +#endif /* !_MSIMTF_PCH_ */ diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 6b5100495f..5ff19beb5c 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -114,7 +114,7 @@ reactos/dll/win32/mshtml # Synced to WineStaging-1.7.55 reactos/dll/win32/mshtml.tlb # Synced to WineStaging-1.7.55 reactos/dll/win32/msi # Synced to WineStaging-3.3 reactos/dll/win32/msimg32 # Synced to WineStaging-3.3 -reactos/dll/win32/msimtf # Synced to WineStaging-2.9 +reactos/dll/win32/msimtf # Synced to WineStaging-3.3 reactos/dll/win32/msisip # Synced to WineStaging-2.9 reactos/dll/win32/msisys.ocx # Synced to WineStaging-2.9 reactos/dll/win32/msnet32 # Synced to WineStaging-2.9
