Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 17:03:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MSCTF] Sync with Wine Staging 3.3. CORE-14434

Browse source
This commit is contained in:
Amine Khaldi 2018-03-18 12:28:32 +01:00
parent 8123ffac58
commit 897e19b0a6
15 changed files with 218 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dll/win32/msctf/CMakeLists.txt
View file

@ -17,7 +17,7 @@ list(APPEND SOURCE
msctf.c msctf.c
range.c range.c
threadmgr.c threadmgr.c
msctf_internal.h precomp.h
${CMAKE_CURRENT_BINARY_DIR}/msctf_stubs.c) ${CMAKE_CURRENT_BINARY_DIR}/msctf_stubs.c)
add_library(msctf SHARED add_library(msctf SHARED
@ -28,5 +28,5 @@ add_library(msctf SHARED
set_module_type(msctf win32dll) set_module_type(msctf win32dll)
target_link_libraries(msctf uuid wine) target_link_libraries(msctf uuid wine)
add_importlibs(msctf ole32 oleaut32 user32 advapi32 advapi32_vista msvcrt kernel32 ntdll) 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) add_cd_file(TARGET msctf DESTINATION reactos/system32 FOR all)

20
dll/win32/msctf/categorymgr.c
View file

@ -18,8 +18,28 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * 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" #include "msctf_internal.h"
WINE_DEFAULT_DEBUG_CHANNEL(msctf);
typedef struct tagCategoryMgr { typedef struct tagCategoryMgr {
ITfCategoryMgr ITfCategoryMgr_iface; ITfCategoryMgr ITfCategoryMgr_iface;
LONG refCount; LONG refCount;

22
dll/win32/msctf/compartmentmgr.c
View file

@ -18,9 +18,29 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * 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 "msctf_internal.h"
#include <oleauto.h> WINE_DEFAULT_DEBUG_CHANNEL(msctf);
typedef struct tagCompartmentValue { typedef struct tagCompartmentValue {
struct list entry; struct list entry;

21
dll/win32/msctf/context.c
View file

@ -18,8 +18,29 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * 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" #include "msctf_internal.h"
WINE_DEFAULT_DEBUG_CHANNEL(msctf);
typedef struct tagContext { typedef struct tagContext {
ITfContext ITfContext_iface; ITfContext ITfContext_iface;
ITfSource ITfSource_iface; ITfSource ITfSource_iface;

10
dll/win32/msctf/displayattributemgr.c
View file

@ -18,8 +18,18 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * 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" #include "msctf_internal.h"
WINE_DEFAULT_DEBUG_CHANNEL(msctf);
typedef struct tagDisplayAttributeMgr { typedef struct tagDisplayAttributeMgr {
ITfDisplayAttributeMgr ITfDisplayAttributeMgr_iface; ITfDisplayAttributeMgr ITfDisplayAttributeMgr_iface;

20
dll/win32/msctf/documentmgr.c
View file

@ -18,8 +18,28 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * 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" #include "msctf_internal.h"
WINE_DEFAULT_DEBUG_CHANNEL(msctf);
typedef struct tagDocumentMgr { typedef struct tagDocumentMgr {
ITfDocumentMgr ITfDocumentMgr_iface; ITfDocumentMgr ITfDocumentMgr_iface;
ITfSource ITfSource_iface; ITfSource ITfSource_iface;

21
dll/win32/msctf/inputprocessor.c
View file

@ -18,8 +18,29 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * 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" #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 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 szwEnable[] = {'E','n','a','b','l','e',0};
static const WCHAR szwTipfmt[] = {'%','s','\\','%','s',0}; static const WCHAR szwTipfmt[] = {'%','s','\\','%','s',0};

10
dll/win32/msctf/langbarmgr.c
View file

@ -18,8 +18,18 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * 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" #include "msctf_internal.h"
WINE_DEFAULT_DEBUG_CHANNEL(msctf);
typedef struct tagLangBarMgr { typedef struct tagLangBarMgr {
ITfLangBarMgr ITfLangBarMgr_iface; ITfLangBarMgr ITfLangBarMgr_iface;

22
dll/win32/msctf/msctf.c
View file

@ -18,10 +18,28 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * 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 "msctf_internal.h"
#include <rpcproxy.h> WINE_DEFAULT_DEBUG_CHANNEL(msctf);
#include <inputscope.h>
static HINSTANCE MSCTF_hinstance; static HINSTANCE MSCTF_hinstance;

24
dll/win32/msctf/msctf_internal.h
View file

@ -21,29 +21,7 @@
#ifndef __WINE_MSCTF_I_H #ifndef __WINE_MSCTF_I_H
#define __WINE_MSCTF_I_H #define __WINE_MSCTF_I_H
#include <wine/config.h> #include "wine/list.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);
#define COOKIE_MAGIC_TMSINK 0x0010 #define COOKIE_MAGIC_TMSINK 0x0010
#define COOKIE_MAGIC_CONTEXTSINK 0x0020 #define COOKIE_MAGIC_CONTEXTSINK 0x0020

29
dll/win32/msctf/precomp.h Normal file
View file

@ -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 */

20
dll/win32/msctf/range.c
View file

@ -18,8 +18,28 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * 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" #include "msctf_internal.h"
WINE_DEFAULT_DEBUG_CHANNEL(msctf);
typedef struct tagRange { typedef struct tagRange {
ITfRange ITfRange_iface; ITfRange ITfRange_iface;
/* const ITfRangeACPVtb *RangeACPVtbl; */ /* const ITfRangeACPVtb *RangeACPVtbl; */

21
dll/win32/msctf/threadmgr.c
View file

@ -18,8 +18,29 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * 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" #include "msctf_internal.h"
WINE_DEFAULT_DEBUG_CHANNEL(msctf);
typedef struct tagPreservedKey typedef struct tagPreservedKey
{ {
struct list entry; struct list entry;

2
dll/win32/msctf/version.rc
View file

@ -25,4 +25,4 @@
#define WINE_PRODUCTVERSION 5,1,2600,3319 #define WINE_PRODUCTVERSION 5,1,2600,3319
#define WINE_PRODUCTVERSION_STR "5.1.2600.3319" #define WINE_PRODUCTVERSION_STR "5.1.2600.3319"
#include <wine/wine_common_ver.rc> #include "wine/wine_common_ver.rc"

2
media/doc/README.WINE
View file

@ -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/mscat32 # Synced to WineStaging-3.3
reactos/dll/win32/mscms # 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/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/msftedit # Synced to WineStaging-2.9
reactos/dll/win32/msg711.acm # 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 reactos/dll/win32/msgsm32.acm # Synced to WineStaging-2.9