From 38a119a72e025646b97b22da72fd1a0989c2d5f6 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sun, 10 Nov 2019 14:03:20 +0100 Subject: [PATCH] [MSIMTF] Sync with Wine Staging 4.18. CORE-16441 --- dll/win32/msimtf/activeimmapp.c | 4 ---- dll/win32/msimtf/main.c | 2 -- dll/win32/msimtf/precomp.h | 2 -- media/doc/README.WINE | 2 +- 4 files changed, 1 insertion(+), 9 deletions(-) diff --git a/dll/win32/msimtf/activeimmapp.c b/dll/win32/msimtf/activeimmapp.c index fb5ef40be55..2d53feaae97 100644 --- a/dll/win32/msimtf/activeimmapp.c +++ b/dll/win32/msimtf/activeimmapp.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include #define COBJMACROS @@ -34,8 +32,6 @@ #include "dimm.h" #include "imm.h" -#include "wine/unicode.h" - #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msimtf); diff --git a/dll/win32/msimtf/main.c b/dll/win32/msimtf/main.c index 78c26cb10ee..76ad6548f4b 100644 --- a/dll/win32/msimtf/main.c +++ b/dll/win32/msimtf/main.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include #include diff --git a/dll/win32/msimtf/precomp.h b/dll/win32/msimtf/precomp.h index 6daa8c5a88b..1d8c9510c04 100644 --- a/dll/win32/msimtf/precomp.h +++ b/dll/win32/msimtf/precomp.h @@ -2,8 +2,6 @@ #ifndef _MSIMTF_PCH_ #define _MSIMTF_PCH_ -#include - #include #define WIN32_NO_STATUS diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 2cda2743636..a09da406e9d 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -115,7 +115,7 @@ dll/win32/mshtml # Synced to WineStaging-1.7.55 dll/win32/mshtml.tlb # Synced to WineStaging-1.7.55 dll/win32/msi # Synced to WineStaging-3.3 dll/win32/msimg32 # Synced to WineStaging-3.3 -dll/win32/msimtf # Synced to WineStaging-3.3 +dll/win32/msimtf # Synced to WineStaging-4.18 dll/win32/msisip # Synced to WineStaging-3.3 dll/win32/msisys.ocx # Synced to WineStaging-3.3 dll/win32/msnet32 # Synced to WineStaging-2.9