Commit 2fdfe16c authored by Rémi Bernon's avatar Rémi Bernon Committed by Alexandre Julliard

include: Fix ImeInquire declaration.

parent 68ff9a94
...@@ -62,7 +62,7 @@ typedef struct _tagImmHkl{ ...@@ -62,7 +62,7 @@ typedef struct _tagImmHkl{
HWND UIWnd; HWND UIWnd;
/* Function Pointers */ /* Function Pointers */
BOOL (WINAPI *pImeInquire)(IMEINFO *, WCHAR *, const WCHAR *); BOOL (WINAPI *pImeInquire)(IMEINFO *, WCHAR *, DWORD);
BOOL (WINAPI *pImeConfigure)(HKL, HWND, DWORD, void *); BOOL (WINAPI *pImeConfigure)(HKL, HWND, DWORD, void *);
BOOL (WINAPI *pImeDestroy)(UINT); BOOL (WINAPI *pImeDestroy)(UINT);
LRESULT (WINAPI *pImeEscape)(HIMC, UINT, void *); LRESULT (WINAPI *pImeEscape)(HIMC, UINT, void *);
...@@ -508,7 +508,7 @@ static ImmHkl *IMM_GetImmHkl(HKL hkl) ...@@ -508,7 +508,7 @@ static ImmHkl *IMM_GetImmHkl(HKL hkl)
if (ptr->hIME) if (ptr->hIME)
{ {
LOAD_FUNCPTR(ImeInquire); LOAD_FUNCPTR(ImeInquire);
if (!ptr->pImeInquire || !ptr->pImeInquire(&ptr->imeInfo, ptr->imeClassName, NULL)) if (!ptr->pImeInquire || !ptr->pImeInquire(&ptr->imeInfo, ptr->imeClassName, 0))
{ {
FreeLibrary(ptr->hIME); FreeLibrary(ptr->hIME);
ptr->hIME = NULL; ptr->hIME = NULL;
......
...@@ -1367,7 +1367,7 @@ static BOOL WINAPI register_classes( INIT_ONCE *once, void *param, void **contex ...@@ -1367,7 +1367,7 @@ static BOOL WINAPI register_classes( INIT_ONCE *once, void *param, void **contex
return TRUE; return TRUE;
} }
BOOL WINAPI ImeInquire(LPIMEINFO lpIMEInfo, LPWSTR lpszUIClass, LPCWSTR lpszOption) BOOL WINAPI ImeInquire(LPIMEINFO lpIMEInfo, LPWSTR lpszUIClass, DWORD flags)
{ {
static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT;
......
...@@ -511,8 +511,7 @@ static void IME_AddToSelected(HIMC hIMC) ...@@ -511,8 +511,7 @@ static void IME_AddToSelected(HIMC hIMC)
hSelectedFrom[hSelectedCount-1] = hIMC; hSelectedFrom[hSelectedCount-1] = hIMC;
} }
BOOL WINAPI ImeInquire(LPIMEINFO lpIMEInfo, LPWSTR lpszUIClass, BOOL WINAPI ImeInquire(LPIMEINFO lpIMEInfo, LPWSTR lpszUIClass, DWORD flags)
LPCWSTR lpszOption)
{ {
static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT;
......
...@@ -154,7 +154,7 @@ HWND WINAPI ImmCreateSoftKeyboard(UINT, UINT, int, int); ...@@ -154,7 +154,7 @@ HWND WINAPI ImmCreateSoftKeyboard(UINT, UINT, int, int);
BOOL WINAPI ImmDestroySoftKeyboard(HWND); BOOL WINAPI ImmDestroySoftKeyboard(HWND);
BOOL WINAPI ImmShowSoftKeyboard(HWND, int); BOOL WINAPI ImmShowSoftKeyboard(HWND, int);
BOOL WINAPI ImeInquire(LPIMEINFO, LPWSTR, LPCWSTR lpszOptions); BOOL WINAPI ImeInquire(LPIMEINFO, LPWSTR, DWORD);
BOOL WINAPI ImeConfigure (HKL, HWND, DWORD, LPVOID); BOOL WINAPI ImeConfigure (HKL, HWND, DWORD, LPVOID);
DWORD WINAPI ImeConversionList(HIMC, LPCWSTR, LPCANDIDATELIST,DWORD,UINT); DWORD WINAPI ImeConversionList(HIMC, LPCWSTR, LPCANDIDATELIST,DWORD,UINT);
BOOL WINAPI ImeDestroy(UINT); BOOL WINAPI ImeDestroy(UINT);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment