https://git.reactos.org/?p=reactos.git;a=commitdiff;h=897e19b0a601825de15846...
commit 897e19b0a601825de158462eef9c5d3142346761 Author: Amine Khaldi amine.khaldi@reactos.org AuthorDate: Sun Mar 18 12:28:32 2018 +0100 Commit: Amine Khaldi amine.khaldi@reactos.org CommitDate: Sun Mar 18 12:28:32 2018 +0100
[MSCTF] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/msctf/CMakeLists.txt | 4 ++-- dll/win32/msctf/categorymgr.c | 20 ++++++++++++++++++++ dll/win32/msctf/compartmentmgr.c | 22 +++++++++++++++++++++- dll/win32/msctf/context.c | 21 +++++++++++++++++++++ dll/win32/msctf/displayattributemgr.c | 10 ++++++++++ dll/win32/msctf/documentmgr.c | 20 ++++++++++++++++++++ dll/win32/msctf/inputprocessor.c | 21 +++++++++++++++++++++ dll/win32/msctf/langbarmgr.c | 10 ++++++++++ dll/win32/msctf/msctf.c | 22 ++++++++++++++++++++-- dll/win32/msctf/msctf_internal.h | 24 +----------------------- dll/win32/msctf/precomp.h | 29 +++++++++++++++++++++++++++++ dll/win32/msctf/range.c | 20 ++++++++++++++++++++ dll/win32/msctf/threadmgr.c | 21 +++++++++++++++++++++ dll/win32/msctf/version.rc | 2 +- media/doc/README.WINE | 2 +- 15 files changed, 218 insertions(+), 30 deletions(-)
diff --git a/dll/win32/msctf/CMakeLists.txt b/dll/win32/msctf/CMakeLists.txt index 3296ee5aa5..02e172ac43 100644 --- a/dll/win32/msctf/CMakeLists.txt +++ b/dll/win32/msctf/CMakeLists.txt @@ -17,7 +17,7 @@ list(APPEND SOURCE msctf.c range.c threadmgr.c - msctf_internal.h + precomp.h ${CMAKE_CURRENT_BINARY_DIR}/msctf_stubs.c)
add_library(msctf SHARED @@ -28,5 +28,5 @@ add_library(msctf SHARED set_module_type(msctf win32dll) target_link_libraries(msctf uuid wine) add_importlibs(msctf ole32 oleaut32 user32 advapi32 advapi32_vista msvcrt kernel32 ntdll) -add_pch(msctf msctf_internal.h SOURCE) +add_pch(msctf precomp.h SOURCE) add_cd_file(TARGET msctf DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/msctf/categorymgr.c b/dll/win32/msctf/categorymgr.c index 509494fd0e..ad43833d62 100644 --- a/dll/win32/msctf/categorymgr.c +++ b/dll/win32/msctf/categorymgr.c @@ -18,8 +18,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "config.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "wine/debug.h" +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "winuser.h" +#include "shlwapi.h" +#include "winerror.h" +#include "objbase.h" + +#include "wine/unicode.h" + +#include "msctf.h" #include "msctf_internal.h"
+WINE_DEFAULT_DEBUG_CHANNEL(msctf); + typedef struct tagCategoryMgr { ITfCategoryMgr ITfCategoryMgr_iface; LONG refCount; diff --git a/dll/win32/msctf/compartmentmgr.c b/dll/win32/msctf/compartmentmgr.c index f0017f8e5a..4fe7b82f94 100644 --- a/dll/win32/msctf/compartmentmgr.c +++ b/dll/win32/msctf/compartmentmgr.c @@ -18,9 +18,29 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "config.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "wine/debug.h" +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "winuser.h" +#include "shlwapi.h" +#include "winerror.h" +#include "objbase.h" +#include "oleauto.h" +#include "olectl.h" + +#include "wine/unicode.h" + +#include "msctf.h" #include "msctf_internal.h"
-#include <oleauto.h> +WINE_DEFAULT_DEBUG_CHANNEL(msctf);
typedef struct tagCompartmentValue { struct list entry; diff --git a/dll/win32/msctf/context.c b/dll/win32/msctf/context.c index 9af5389f83..54052f6302 100644 --- a/dll/win32/msctf/context.c +++ b/dll/win32/msctf/context.c @@ -18,8 +18,29 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "config.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "wine/debug.h" +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "winuser.h" +#include "shlwapi.h" +#include "winerror.h" +#include "objbase.h" +#include "olectl.h" + +#include "wine/unicode.h" + +#include "msctf.h" #include "msctf_internal.h"
+WINE_DEFAULT_DEBUG_CHANNEL(msctf); + typedef struct tagContext { ITfContext ITfContext_iface; ITfSource ITfSource_iface; diff --git a/dll/win32/msctf/displayattributemgr.c b/dll/win32/msctf/displayattributemgr.c index 4c3e1aa7e6..c8bb71e2ce 100644 --- a/dll/win32/msctf/displayattributemgr.c +++ b/dll/win32/msctf/displayattributemgr.c @@ -18,8 +18,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#define COBJMACROS + +#include "wine/debug.h" +#include "winbase.h" +#include "winreg.h" +#include "shlwapi.h" + +#include "msctf.h" #include "msctf_internal.h"
+WINE_DEFAULT_DEBUG_CHANNEL(msctf); + typedef struct tagDisplayAttributeMgr { ITfDisplayAttributeMgr ITfDisplayAttributeMgr_iface;
diff --git a/dll/win32/msctf/documentmgr.c b/dll/win32/msctf/documentmgr.c index a764cdd85d..cf4c601cff 100644 --- a/dll/win32/msctf/documentmgr.c +++ b/dll/win32/msctf/documentmgr.c @@ -18,8 +18,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "config.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "wine/debug.h" +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "winuser.h" +#include "shlwapi.h" +#include "winerror.h" +#include "objbase.h" + +#include "wine/unicode.h" + +#include "msctf.h" #include "msctf_internal.h"
+WINE_DEFAULT_DEBUG_CHANNEL(msctf); + typedef struct tagDocumentMgr { ITfDocumentMgr ITfDocumentMgr_iface; ITfSource ITfSource_iface; diff --git a/dll/win32/msctf/inputprocessor.c b/dll/win32/msctf/inputprocessor.c index f744d63752..fdeba38b37 100644 --- a/dll/win32/msctf/inputprocessor.c +++ b/dll/win32/msctf/inputprocessor.c @@ -18,8 +18,29 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "config.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "wine/debug.h" +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "winuser.h" +#include "shlwapi.h" +#include "winerror.h" +#include "objbase.h" +#include "olectl.h" + +#include "wine/unicode.h" + +#include "msctf.h" #include "msctf_internal.h"
+WINE_DEFAULT_DEBUG_CHANNEL(msctf); + static const WCHAR szwLngp[] = {'L','a','n','g','u','a','g','e','P','r','o','f','i','l','e',0}; static const WCHAR szwEnable[] = {'E','n','a','b','l','e',0}; static const WCHAR szwTipfmt[] = {'%','s','\','%','s',0}; diff --git a/dll/win32/msctf/langbarmgr.c b/dll/win32/msctf/langbarmgr.c index 6b54ea9dea..f56c130caa 100644 --- a/dll/win32/msctf/langbarmgr.c +++ b/dll/win32/msctf/langbarmgr.c @@ -18,8 +18,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#define COBJMACROS + +#include "wine/debug.h" +#include "winbase.h" +#include "winreg.h" +#include "shlwapi.h" + +#include "msctf.h" #include "msctf_internal.h"
+WINE_DEFAULT_DEBUG_CHANNEL(msctf); + typedef struct tagLangBarMgr { ITfLangBarMgr ITfLangBarMgr_iface;
diff --git a/dll/win32/msctf/msctf.c b/dll/win32/msctf/msctf.c index c9c1d6a743..a19eaa1d33 100644 --- a/dll/win32/msctf/msctf.c +++ b/dll/win32/msctf/msctf.c @@ -18,10 +18,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "config.h" + +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS + +#include "wine/debug.h" +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "shlwapi.h" +#include "shlguid.h" +#include "comcat.h" +#include "olectl.h" +#include "rpcproxy.h" +#include "msctf.h" +#include "inputscope.h" + #include "msctf_internal.h"
-#include <rpcproxy.h> -#include <inputscope.h> +WINE_DEFAULT_DEBUG_CHANNEL(msctf);
static HINSTANCE MSCTF_hinstance;
diff --git a/dll/win32/msctf/msctf_internal.h b/dll/win32/msctf/msctf_internal.h index 09c9a34684..d5e7fe0d03 100644 --- a/dll/win32/msctf/msctf_internal.h +++ b/dll/win32/msctf/msctf_internal.h @@ -21,29 +21,7 @@ #ifndef __WINE_MSCTF_I_H #define __WINE_MSCTF_I_H
-#include <wine/config.h> - -#include <stdarg.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -#include <winreg.h> -#include <objbase.h> -#include <olectl.h> -#include <msctf.h> -#include <shlwapi.h> - -#include <wine/list.h> -#include <wine/unicode.h> - -#include <wine/debug.h> -WINE_DEFAULT_DEBUG_CHANNEL(msctf); +#include "wine/list.h"
#define COOKIE_MAGIC_TMSINK 0x0010 #define COOKIE_MAGIC_CONTEXTSINK 0x0020 diff --git a/dll/win32/msctf/precomp.h b/dll/win32/msctf/precomp.h new file mode 100644 index 0000000000..7e05cac46c --- /dev/null +++ b/dll/win32/msctf/precomp.h @@ -0,0 +1,29 @@ + +#ifndef _MSCTF_PRECOMP_H +#define _MSCTF_PRECOMP_H + +#include <wine/config.h> + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS + +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <objbase.h> +#include <olectl.h> +#include <msctf.h> +#include <shlwapi.h> + +#include <wine/list.h> +#include <wine/unicode.h> +#include <wine/debug.h> + +#include "msctf_internal.h" + +#endif /* !_MSCTF_PRECOMP_H */ diff --git a/dll/win32/msctf/range.c b/dll/win32/msctf/range.c index e5a7fca2ee..dca8983efd 100644 --- a/dll/win32/msctf/range.c +++ b/dll/win32/msctf/range.c @@ -18,8 +18,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "config.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "wine/debug.h" +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "winuser.h" +#include "shlwapi.h" +#include "winerror.h" +#include "objbase.h" + +#include "wine/unicode.h" + +#include "msctf.h" #include "msctf_internal.h"
+WINE_DEFAULT_DEBUG_CHANNEL(msctf); + typedef struct tagRange { ITfRange ITfRange_iface; /* const ITfRangeACPVtb *RangeACPVtbl; */ diff --git a/dll/win32/msctf/threadmgr.c b/dll/win32/msctf/threadmgr.c index 5dd77baaa5..8ca12ac078 100644 --- a/dll/win32/msctf/threadmgr.c +++ b/dll/win32/msctf/threadmgr.c @@ -18,8 +18,29 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "config.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "wine/debug.h" +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "winuser.h" +#include "shlwapi.h" +#include "winerror.h" +#include "objbase.h" +#include "olectl.h" + +#include "wine/unicode.h" + +#include "msctf.h" #include "msctf_internal.h"
+WINE_DEFAULT_DEBUG_CHANNEL(msctf); + typedef struct tagPreservedKey { struct list entry; diff --git a/dll/win32/msctf/version.rc b/dll/win32/msctf/version.rc index 956051f74a..56a0143734 100644 --- a/dll/win32/msctf/version.rc +++ b/dll/win32/msctf/version.rc @@ -25,4 +25,4 @@ #define WINE_PRODUCTVERSION 5,1,2600,3319 #define WINE_PRODUCTVERSION_STR "5.1.2600.3319"
-#include <wine/wine_common_ver.rc> +#include "wine/wine_common_ver.rc" diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 23caf121d5..1b709e7ab7 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -106,7 +106,7 @@ reactos/dll/win32/msadp32.acm # Synced to WineStaging-3.3 reactos/dll/win32/mscat32 # Synced to WineStaging-3.3 reactos/dll/win32/mscms # Synced to WineStaging-3.3 reactos/dll/win32/mscoree # Synced to Wine-1.5.4 -reactos/dll/win32/msctf # Synced to WineStaging-2.9 +reactos/dll/win32/msctf # Synced to WineStaging-3.3 reactos/dll/win32/msftedit # Synced to WineStaging-2.9 reactos/dll/win32/msg711.acm # Synced to WineStaging-2.9 reactos/dll/win32/msgsm32.acm # Synced to WineStaging-2.9
-
Amine Khaldi