[akhaldi] 48502: [PSDK] - Move INPUTCONTEXT and ImmLockIMC to the wine imm.h - Add wingdi.h inclusion.

Author: akhaldi
Date: Tue Aug 10 00:46:27 2010
New Revision: 48502

URL: http://svn.reactos.org/svn/reactos?rev=48502&view=rev
Log:
[PSDK]
- Move INPUTCONTEXT and ImmLockIMC to the wine imm.h
- Add wingdi.h inclusion.

Added:
    trunk/reactos/include/reactos/wine/imm.h   (with props)
Modified:
    trunk/reactos/include/psdk/imm.h
    trunk/reactos/include/reactos/wine/ddk/imm.h

Modified: trunk/reactos/include/psdk/imm.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/imm.h?rev=4850...
==============================================================================
--- trunk/reactos/include/psdk/imm.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/imm.h [iso-8859-1] Tue Aug 10 00:46:27 2010
@@ -119,36 +119,12 @@
 DECL_WINELIB_TYPE_AW(IMEMENUITEMINFO)
 DECL_WINELIB_TYPE_AW(LPIMEMENUITEMINFO)

-
 typedef struct _tagCOMPOSITIONFORM
 {
    			DWORD   dwStyle;
    			POINT ptCurrentPos;
    			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;
@@ -233,7 +209,6 @@
 #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);

Modified: trunk/reactos/include/reactos/wine/ddk/imm.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/ddk/im...
==============================================================================
--- trunk/reactos/include/reactos/wine/ddk/imm.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/wine/ddk/imm.h [iso-8859-1] Tue Aug 10 00:46:27 2010
@@ -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);

Added: trunk/reactos/include/reactos/wine/imm.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/imm.h?...
==============================================================================
--- trunk/reactos/include/reactos/wine/imm.h (added)
+++ trunk/reactos/include/reactos/wine/imm.h [iso-8859-1] Tue Aug 10 00:46:27 2010
@@ -1,0 +1,1 @@
+

Propchange: trunk/reactos/include/reactos/wine/imm.h
------------------------------------------------------------------------------
    svn:eol-style = native