system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-02 02:03:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

include: Fix ImeInquire declaration.

Browse source
This commit is contained in:
Rémi Bernon 2022-12-04 18:59:10 +01:00 committed by Alexandre Julliard
parent 68ff9a942e
commit 2fdfe16c2d
4 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dlls/imm32/imm.c
View file

@ -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;

2
dlls/winemac.drv/ime.c
View file

@ -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;

3
dlls/winex11.drv/ime.c
View file

@ -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;

2
include/immdev.h
View file

@ -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);