gdiplus: Implemented GdipSetClipPath.

[wine] / include / imm.h

diff --git a/include/imm.h b/include/imm.h
index d8f1e4b..57658de 100644 (file)
--- a/include/imm.h
+++ b/include/imm.h
@@ -28,6 +28,15 @@ extern "C" {
 typedef HANDLE HIMC;
 typedef HANDLE HIMCC;
 
+typedef struct tagREGISTERWORDA {
+    LPSTR lpReading;
+    LPSTR lpWord;
+} REGISTERWORDA, *PREGISTERWORDA, *NPREGISTERWORDA, *LPREGISTERWORDA;
+
+typedef struct tagREGISTERWORDW {
+    LPWSTR lpReading;
+    LPWSTR lpWord;
+} REGISTERWORDW, *PREGISTERWORDW, *NPREGISTERWORDW, *LPREGISTERWORDW;
 
 typedef int (CALLBACK *REGISTERWORDENUMPROCA)(LPCSTR, DWORD, LPCSTR, LPVOID);
 typedef int (CALLBACK *REGISTERWORDENUMPROCW)(LPCWSTR, DWORD, LPCWSTR, LPVOID);
@@ -385,6 +394,8 @@ typedef struct _tagCOMPOSITIONFORM
 #define IMR_COMPOSITIONFONT            0x0003
 #define IMR_RECONVERTSTRING            0x0004
 #define IMR_CONFIRMRECONVERTSTRING     0x0005
+#define IMR_QUERYCHARPOSITION          0x0006
+#define IMR_DOCUMENTFEED               0x0007
 
 
 /* error code of ImmGetCompositionString */
@@ -484,7 +495,7 @@ DWORD    WINAPI ImmGetCandidateListCountA(HIMC, LPDWORD);
 DWORD    WINAPI ImmGetCandidateListCountW(HIMC, LPDWORD);
 #define  ImmGetCandidateListCount WINELIB_NAME_AW(ImmGetCandidateListCount)
 BOOL   WINAPI ImmGetCandidateWindow(HIMC, DWORD, LPCANDIDATEFORM);
-#ifndef NOGDI
+#if defined(_WINGDI_) && !defined(NOGDI)
 BOOL   WINAPI ImmGetCompositionFontA(HIMC, LPLOGFONTA);
 BOOL   WINAPI ImmGetCompositionFontW(HIMC, LPLOGFONTW);
 #define  ImmGetCompositionFont WINELIB_NAME_AW(ImmGetCompositionFont)
@@ -529,6 +540,7 @@ BOOL   WINAPI ImmIsUIMessageA(HWND, UINT, WPARAM, LPARAM);
 BOOL   WINAPI ImmIsUIMessageW(HWND, UINT, WPARAM, LPARAM);
 #define  ImmIsUIMessage WINELIB_NAME_AW(ImmIsUIMessage)
 BOOL   WINAPI ImmNotifyIME(HIMC, DWORD, DWORD, DWORD);
+BOOL   WINAPI ImmProcessKey(HWND, HKL, UINT, LPARAM, DWORD);
 BOOL   WINAPI ImmRegisterWordA(HKL, LPCSTR, DWORD, LPCSTR);
 BOOL   WINAPI ImmRegisterWordW(HKL, LPCWSTR, DWORD, LPCWSTR);
 #define  ImmRegisterWord WINELIB_NAME_AW(ImmRegisterWord)