imm32: Make space for a 64bit pointer in the IMM window.
This commit is contained in:
parent
30f9296409
commit
7d2b787783
|
@ -2291,7 +2291,7 @@ BOOL WINAPI ImmSetOpenStatus(HIMC hIMC, BOOL fOpen)
|
|||
data->imeWnd = CreateWindowExW( WS_EX_TOOLWINDOW,
|
||||
data->immKbd->imeClassName, NULL, WS_POPUP, 0, 0, 1, 1, 0,
|
||||
0, data->immKbd->hIME, 0);
|
||||
SetWindowLongW(data->imeWnd, IMMGWL_IMC, (LONG)data);
|
||||
SetWindowLongPtrW(data->imeWnd, IMMGWL_IMC, (LONG_PTR)data);
|
||||
IMM_GetThreadData()->hwndDefault = data->imeWnd;
|
||||
}
|
||||
|
||||
|
|
|
@ -135,7 +135,7 @@ static void IME_RegisterClasses(void)
|
|||
wndClass.style = CS_GLOBALCLASS | CS_IME | CS_HREDRAW | CS_VREDRAW;
|
||||
wndClass.lpfnWndProc = IME_WindowProc;
|
||||
wndClass.cbClsExtra = 0;
|
||||
wndClass.cbWndExtra = 2 * sizeof(LONG);
|
||||
wndClass.cbWndExtra = 2 * sizeof(LONG_PTR);
|
||||
wndClass.hInstance = x11drv_module;
|
||||
wndClass.hCursor = LoadCursorW(NULL, (LPWSTR)IDC_ARROW);
|
||||
wndClass.hIcon = LoadIconW(NULL, (LPWSTR)IDI_APPLICATION);
|
||||
|
@ -1326,7 +1326,7 @@ static LRESULT WINAPI IME_WindowProc(HWND hwnd, UINT msg, WPARAM wParam,
|
|||
* messages.
|
||||
*/
|
||||
|
||||
hIMC = (HIMC)GetWindowLongW(hwnd,IMMGWL_IMC);
|
||||
hIMC = (HIMC)GetWindowLongPtrW(hwnd,IMMGWL_IMC);
|
||||
if (!hIMC)
|
||||
hIMC = RealIMC(FROM_X11);
|
||||
|
||||
|
|
|
@ -114,7 +114,7 @@ HIMCC WINAPI ImmReSizeIMCC(HIMCC, DWORD);
|
|||
DWORD WINAPI ImmGetIMCCSize(HIMCC);
|
||||
|
||||
#define IMMGWL_IMC 0
|
||||
#define IMMGWL_PRIVATE (sizeof(LONG))
|
||||
#define IMMGWL_PRIVATE (sizeof(LONG_PTR))
|
||||
|
||||
/* IME Property bits */
|
||||
#define IME_PROP_END_UNLOAD 0x0001
|
||||
|
|
Loading…
Reference in New Issue