Module: wine Branch: master Commit: 2fdfe16c2d5a92b1204f929ba8074a7c6574c7cf URL: https://gitlab.winehq.org/wine/wine/-/commit/2fdfe16c2d5a92b1204f929ba8074a7...
Author: Rémi Bernon rbernon@codeweavers.com Date: Sun Dec 4 18:59:10 2022 +0100
include: Fix ImeInquire declaration.
---
dlls/imm32/imm.c | 4 ++-- dlls/winemac.drv/ime.c | 2 +- dlls/winex11.drv/ime.c | 3 +-- include/immdev.h | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index d7af6d79736..c4c495e86a5 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -62,7 +62,7 @@ typedef struct _tagImmHkl{ HWND UIWnd;
/* Function Pointers */ - BOOL (WINAPI *pImeInquire)(IMEINFO *, WCHAR *, const WCHAR *); + BOOL (WINAPI *pImeInquire)(IMEINFO *, WCHAR *, DWORD); BOOL (WINAPI *pImeConfigure)(HKL, HWND, DWORD, void *); BOOL (WINAPI *pImeDestroy)(UINT); LRESULT (WINAPI *pImeEscape)(HIMC, UINT, void *); @@ -508,7 +508,7 @@ static ImmHkl *IMM_GetImmHkl(HKL hkl) if (ptr->hIME) { 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); ptr->hIME = NULL; diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c index ee9db0ca396..7c0495a6fd5 100644 --- a/dlls/winemac.drv/ime.c +++ b/dlls/winemac.drv/ime.c @@ -1367,7 +1367,7 @@ static BOOL WINAPI register_classes( INIT_ONCE *once, void *param, void **contex 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;
diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index 7fe1e0a0b1e..ef498760a60 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -511,8 +511,7 @@ static void IME_AddToSelected(HIMC hIMC) hSelectedFrom[hSelectedCount-1] = hIMC; }
-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;
diff --git a/include/immdev.h b/include/immdev.h index 994bb44d74f..eb6591d1e74 100644 --- a/include/immdev.h +++ b/include/immdev.h @@ -154,7 +154,7 @@ HWND WINAPI ImmCreateSoftKeyboard(UINT, UINT, int, int); BOOL WINAPI ImmDestroySoftKeyboard(HWND); 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); DWORD WINAPI ImeConversionList(HIMC, LPCWSTR, LPCANDIDATELIST,DWORD,UINT); BOOL WINAPI ImeDestroy(UINT);