[PSDK]

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

svn path=/trunk/; revision=48502

diff --git a/reactos/include/psdk/imm.h b/reactos/include/psdk/imm.h
index a48930b..07c2cc3 100644 (file)
--- a/reactos/include/psdk/imm.h
+++ b/reactos/include/psdk/imm.h
@@ -119,7 +119,6 @@ typedef struct tagIMEMENUITEMINFOW
 DECL_WINELIB_TYPE_AW(IMEMENUITEMINFO)
 DECL_WINELIB_TYPE_AW(LPIMEMENUITEMINFO)
 
-
 typedef struct _tagCOMPOSITIONFORM
 {
                                DWORD   dwStyle;
@@ -127,29 +126,6 @@ typedef struct _tagCOMPOSITIONFORM
                                RECT  rcArea;
 } 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 {
     DWORD       dwPrivateDataSize;
     DWORD       fdwProperty;
@@ -233,7 +209,6 @@ typedef struct tagCANDIDATEINFO {
 #define NI_SETCANDIDATE_PAGESIZE        0x0017
 #define NI_IMEMENUSELECTED              0x0018
 
-LPINPUTCONTEXT WINAPI ImmLockIMC(HIMC);
 BOOL  WINAPI ImmUnlockIMC(HIMC);
 DWORD WINAPI ImmGetIMCLockCount(HIMC);
 HIMCC  WINAPI ImmCreateIMCC(DWORD);

diff --git a/reactos/include/reactos/wine/ddk/imm.h b/reactos/include/reactos/wine/ddk/imm.h
index 057e90f..6de3e54 100644 (file)
--- a/reactos/include/reactos/wine/ddk/imm.h
+++ b/reactos/include/reactos/wine/ddk/imm.h
@@ -1,2 +1,29 @@
 
+#include <psdk/wingdi.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);

diff --git a/reactos/include/reactos/wine/imm.h b/reactos/include/reactos/wine/imm.h
new file mode 100644 (file)
index 0000000..8b13789
--- /dev/null
+++ b/reactos/include/reactos/wine/imm.h
@@ -0,0 +1 @@
+