Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 01:15:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

[PSDK]

Browse source 
- Move INPUTCONTEXT and ImmLockIMC to the wine imm.h
- Add wingdi.h inclusion.

svn path=/trunk/; revision=48502
This commit is contained in:
Amine Khaldi 2010-08-10 00:46:27 +00:00
parent 2bf65890b7
commit a334719f12
3 changed files with 28 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
reactos/include/psdk/imm.h
View file

@ -119,7 +119,6 @@ typedef struct tagIMEMENUITEMINFOW
DECL_WINELIB_TYPE_AW(IMEMENUITEMINFO) DECL_WINELIB_TYPE_AW(IMEMENUITEMINFO)
DECL_WINELIB_TYPE_AW(LPIMEMENUITEMINFO) DECL_WINELIB_TYPE_AW(LPIMEMENUITEMINFO)
typedef struct _tagCOMPOSITIONFORM typedef struct _tagCOMPOSITIONFORM
{ {
DWORD dwStyle; DWORD dwStyle;
@ -127,29 +126,6 @@ typedef struct _tagCOMPOSITIONFORM
RECT rcArea; RECT rcArea;
} COMPOSITIONFORM, *LPCOMPOSITIONFORM; } COMPOSITIONFORM, *LPCOMPOSITIONFORM;
typedef struct _tagINPUTCONTEXT {
HWND hWnd;
BOOL fOpen;
POINT ptStatusWndPos;
POINT ptSoftKbdPos;
DWORD fdwConversion;
DWORD fdwSentence;
union {
LOGFONTA A;
LOGFONTW W;
} lfFont;
COMPOSITIONFORM cfCompForm;
CANDIDATEFORM cfCandForm[4];
HIMCC hCompStr;
HIMCC hCandInfo;
HIMCC hGuideLine;
HIMCC hPrivate;
DWORD dwNumMsgBuf;
HIMCC hMsgBuf;
DWORD fdwInit;
DWORD dwReserve[3];
} INPUTCONTEXT, *LPINPUTCONTEXT;
typedef struct _tagIMEINFO { typedef struct _tagIMEINFO {
DWORD dwPrivateDataSize; DWORD dwPrivateDataSize;
DWORD fdwProperty; DWORD fdwProperty;
@ -233,7 +209,6 @@ typedef struct tagCANDIDATEINFO {
#define NI_SETCANDIDATE_PAGESIZE 0x0017 #define NI_SETCANDIDATE_PAGESIZE 0x0017
#define NI_IMEMENUSELECTED 0x0018 #define NI_IMEMENUSELECTED 0x0018
LPINPUTCONTEXT WINAPI ImmLockIMC(HIMC);
BOOL WINAPI ImmUnlockIMC(HIMC); BOOL WINAPI ImmUnlockIMC(HIMC);
DWORD WINAPI ImmGetIMCLockCount(HIMC); DWORD WINAPI ImmGetIMCLockCount(HIMC);
HIMCC WINAPI ImmCreateIMCC(DWORD); HIMCC WINAPI ImmCreateIMCC(DWORD);

27
reactos/include/reactos/wine/ddk/imm.h
View file

@ -1,2 +1,29 @@
#include <psdk/wingdi.h>
#include <psdk/imm.h> #include <psdk/imm.h>
typedef struct _tagINPUTCONTEXT {
HWND hWnd;
BOOL fOpen;
POINT ptStatusWndPos;
POINT ptSoftKbdPos;
DWORD fdwConversion;
DWORD fdwSentence;
union {
LOGFONTA A;
LOGFONTW W;
} lfFont;
COMPOSITIONFORM cfCompForm;
CANDIDATEFORM cfCandForm[4];
HIMCC hCompStr;
HIMCC hCandInfo;
HIMCC hGuideLine;
HIMCC hPrivate;
DWORD dwNumMsgBuf;
HIMCC hMsgBuf;
DWORD fdwInit;
DWORD dwReserve[3];
} INPUTCONTEXT, *LPINPUTCONTEXT;
LPINPUTCONTEXT WINAPI ImmLockIMC(HIMC);

1
reactos/include/reactos/wine/imm.h Normal file
View file

@ -0,0 +1 @@