2012-01-06 Chris Sutcliffe <ir0nh34d@users.sf.net>

[pf3gnuchains/pf3gnuchains4x.git] / winsup / w32api / include / imm.h

diff --git a/winsup/w32api/include/imm.h b/winsup/w32api/include/imm.h
index 30d9701..4fb6905 100644 (file)
--- a/winsup/w32api/include/imm.h
+++ b/winsup/w32api/include/imm.h
@@ -1,5 +1,9 @@
 #ifndef _IMM_H
 #define _IMM_H
+#if __GNUC__ >=3
+#pragma GCC system_header
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -16,6 +20,9 @@ extern "C" {
 #define WM_IME_CHAR 0x286
 #define WM_IME_KEYDOWN 0x290
 #define WM_IME_KEYUP 0x291
+#if (_WIN32_WINNT >= 0x0500)
+#define WM_IME_REQUEST 0x0288
+#endif
 #define IMC_GETCANDIDATEPOS 7
 #define IMC_SETCANDIDATEPOS 8
 #define IMC_GETCOMPOSITIONFONT 9
@@ -200,6 +207,8 @@ extern "C" {
 #define IME_REGWORD_STYLE_EUDC 1
 #define IME_REGWORD_STYLE_USER_FIRST 0x80000000
 #define IME_REGWORD_STYLE_USER_LAST 0xFFFFFFFF
+#define IMR_RECONVERTSTRING 4
+#define IMR_QUERYCHARPOSITION 6
 #define SOFTKEYBOARD_TYPE_T1 1
 #define SOFTKEYBOARD_TYPE_C1 2
 #define IMEMENUITEM_STRING_SIZE 80
@@ -260,6 +269,23 @@ typedef struct tagCANDIDATELIST {
        DWORD dwPageSize;
        DWORD dwOffset[1];
 } CANDIDATELIST,*PCANDIDATELIST,*LPCANDIDATELIST;
+typedef struct tagIMECHARPOSITION {
+  DWORD  dwSize;
+  DWORD  dwCharPos;
+  POINT  pt;
+  UINT   cLineHeight;
+  RECT   rcDocument;
+} IMECHARPOSITION, *PIMECHARPOSITION;
+typedef struct tagRECONVERTSTRING {
+  DWORD dwSize;
+  DWORD dwVersion;
+  DWORD dwStrLen;
+  DWORD dwStrOffset;
+  DWORD dwCompStrLen;
+  DWORD dwCompStrOffset;
+  DWORD dwTargetStrLen;
+  DWORD dwTargetStrOffset;
+} RECONVERTSTRING, *PRECONVERTSTRING;
 typedef struct tagREGISTERWORDA {
        LPSTR lpReading;
        LPSTR lpWord;
@@ -340,10 +366,12 @@ BOOL WINAPI ImmGetConversionStatus(HIMC,LPDWORD,PDWORD);
 BOOL WINAPI ImmSetConversionStatus(HIMC,DWORD,DWORD);
 BOOL WINAPI ImmGetOpenStatus(HIMC);
 BOOL WINAPI ImmSetOpenStatus(HIMC,BOOL);
+#ifndef NOGDI
 BOOL WINAPI ImmGetCompositionFontA(HIMC,LPLOGFONTA);
 BOOL WINAPI ImmGetCompositionFontW(HIMC,LPLOGFONTW);
 BOOL WINAPI ImmSetCompositionFontA(HIMC,LPLOGFONTA);
 BOOL WINAPI ImmSetCompositionFontW(HIMC,LPLOGFONTW);
+#endif
 BOOL WINAPI ImmConfigureIMEA(HKL,HWND,DWORD,PVOID);
 BOOL WINAPI ImmConfigureIMEW(HKL,HWND,DWORD,PVOID);
 LRESULT WINAPI ImmEscapeA(HKL,HIMC,UINT,PVOID);
@@ -383,8 +411,10 @@ DWORD WINAPI ImmGetImeMenuItemsW(HIMC,DWORD,DWORD,LPIMEMENUITEMINFOW,LPIMEMENUIT
 #define ImmGetConversionList ImmGetConversionListW
 #define ImmEscape ImmEscapeW
 #define ImmConfigureIME ImmConfigureIMEW
+#ifndef NOGDI
 #define ImmSetCompositionFont ImmSetCompositionFontW
 #define ImmGetCompositionFont ImmGetCompositionFontW
+#endif
 #define ImmGetGuideLine ImmGetGuideLineW
 #define ImmGetCandidateList ImmGetCandidateListW
 #define ImmGetCandidateListCount ImmGetCandidateListCountW
@@ -403,8 +433,10 @@ DWORD WINAPI ImmGetImeMenuItemsW(HIMC,DWORD,DWORD,LPIMEMENUITEMINFOW,LPIMEMENUIT
 #define ImmGetConversionList ImmGetConversionListA
 #define ImmEscape ImmEscapeA
 #define ImmConfigureIME ImmConfigureIMEA
+#ifndef NOGDI
 #define ImmSetCompositionFont ImmSetCompositionFontA
 #define ImmGetCompositionFont ImmGetCompositionFontA
+#endif
 #define ImmGetGuideLine ImmGetGuideLineA
 #define ImmGetCandidateList ImmGetCandidateListA
 #define ImmGetCandidateListCount ImmGetCandidateListCountA