Skip to content

W
wine-winehq
Commit c018ef6b authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard
Browse files
Options

Convert HKL to a void*.

parent 1c4b5c40
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 6 deletions
include/windef.h
View file @ c018ef6b
...@@ -83,7 +83,7 @@ DECLARE_HANDLE(HHOOK); ...@@ -83,7 +83,7 @@ DECLARE_HANDLE(HHOOK);
DECLARE_OLD_HANDLE(HICON); DECLARE_OLD_HANDLE(HICON);
DECLARE_OLD_HANDLE(HINSTANCE); DECLARE_OLD_HANDLE(HINSTANCE);
DECLARE_OLD_HANDLE(HKEY); DECLARE_OLD_HANDLE(HKEY);
DECLARE_OLD_HANDLE(HKL); DECLARE_HANDLE(HKL);
DECLARE_OLD_HANDLE(HMENU); DECLARE_OLD_HANDLE(HMENU);
DECLARE_HANDLE(HMETAFILE); DECLARE_HANDLE(HMETAFILE);
DECLARE_HANDLE(HMONITOR); DECLARE_HANDLE(HMONITOR);
......
windows/input.c
View file @ c018ef6b
...@@ -774,11 +774,11 @@ INT16 WINAPI GetKeyboardLayoutName16(LPSTR pwszKLID) ...@@ -774,11 +774,11 @@ INT16 WINAPI GetKeyboardLayoutName16(LPSTR pwszKLID)
*/ */
HKL WINAPI GetKeyboardLayout(DWORD dwLayout) HKL WINAPI GetKeyboardLayout(DWORD dwLayout)
{ {
HKL layout; UINT layout;
layout = GetSystemDefaultLCID(); /* FIXME */ layout = GetSystemDefaultLCID(); /* FIXME */
layout |= (layout<<16); /* FIXME */ layout |= (layout<<16); /* FIXME */
TRACE_(keyboard)("returning %08x\n",layout); TRACE_(keyboard)("returning %08x\n",layout);
return layout; return (HKL)layout;
} }
/**************************************************************************** /****************************************************************************
...@@ -1184,6 +1184,3 @@ TrackMouseEvent (TRACKMOUSEEVENT *ptme) ...@@ -1184,6 +1184,3 @@ TrackMouseEvent (TRACKMOUSEEVENT *ptme)
return TRUE; return TRUE;
} }
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