[MSIMTF] Sync with Wine Staging 3.3. CORE-14434
authorAmine Khaldi <amine.khaldi@reactos.org>
Sun, 18 Mar 2018 11:32:52 +0000 (12:32 +0100)
committerAmine Khaldi <amine.khaldi@reactos.org>
Sun, 18 Mar 2018 11:32:52 +0000 (12:32 +0100)
dll/win32/msimtf/activeimmapp.c
dll/win32/msimtf/main.c
dll/win32/msimtf/precomp.h
media/doc/README.WINE

index 973a7d5..fb5ef40 100644 (file)
  * 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;
index 9f34140..78c26cb 100644 (file)
  * 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);
 
index 43a5d4a..6daa8c5 100644 (file)
@@ -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_ */
index 6b51004..5ff19be 100644 (file)
@@ -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