mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-15 02:04:46 +00:00
user32: Make ToAscii(Ex) and ToUnicode(Ex) prototypes match PSDK.
This commit is contained in:
parent
0d2bc3fa35
commit
fc48f7743d
|
@ -202,7 +202,7 @@ static UINT nulldrv_SendInput( UINT count, LPINPUT inputs, int size )
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static INT nulldrv_ToUnicodeEx( UINT virt, UINT scan, LPBYTE state, LPWSTR str,
|
static INT nulldrv_ToUnicodeEx( UINT virt, UINT scan, const BYTE *state, LPWSTR str,
|
||||||
int size, UINT flags, HKL layout )
|
int size, UINT flags, HKL layout )
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -549,7 +549,7 @@ static UINT loaderdrv_SendInput( UINT count, LPINPUT inputs, int size )
|
||||||
return load_driver()->pSendInput( count, inputs, size );
|
return load_driver()->pSendInput( count, inputs, size );
|
||||||
}
|
}
|
||||||
|
|
||||||
static INT loaderdrv_ToUnicodeEx( UINT virt, UINT scan, LPBYTE state, LPWSTR str,
|
static INT loaderdrv_ToUnicodeEx( UINT virt, UINT scan, const BYTE *state, LPWSTR str,
|
||||||
int size, UINT flags, HKL layout )
|
int size, UINT flags, HKL layout )
|
||||||
{
|
{
|
||||||
return load_driver()->pToUnicodeEx( virt, scan, state, str, size, flags, layout );
|
return load_driver()->pToUnicodeEx( virt, scan, state, str, size, flags, layout );
|
||||||
|
|
|
@ -729,7 +729,7 @@ INT WINAPI GetKeyNameTextW(LONG lParam, LPWSTR lpBuffer, INT nSize)
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* ToUnicode (USER32.@)
|
* ToUnicode (USER32.@)
|
||||||
*/
|
*/
|
||||||
INT WINAPI ToUnicode(UINT virtKey, UINT scanCode, LPBYTE lpKeyState,
|
INT WINAPI ToUnicode(UINT virtKey, UINT scanCode, const BYTE *lpKeyState,
|
||||||
LPWSTR lpwStr, int size, UINT flags)
|
LPWSTR lpwStr, int size, UINT flags)
|
||||||
{
|
{
|
||||||
return ToUnicodeEx(virtKey, scanCode, lpKeyState, lpwStr, size, flags, GetKeyboardLayout(0));
|
return ToUnicodeEx(virtKey, scanCode, lpKeyState, lpwStr, size, flags, GetKeyboardLayout(0));
|
||||||
|
@ -738,7 +738,7 @@ INT WINAPI ToUnicode(UINT virtKey, UINT scanCode, LPBYTE lpKeyState,
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* ToUnicodeEx (USER32.@)
|
* ToUnicodeEx (USER32.@)
|
||||||
*/
|
*/
|
||||||
INT WINAPI ToUnicodeEx(UINT virtKey, UINT scanCode, LPBYTE lpKeyState,
|
INT WINAPI ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState,
|
||||||
LPWSTR lpwStr, int size, UINT flags, HKL hkl)
|
LPWSTR lpwStr, int size, UINT flags, HKL hkl)
|
||||||
{
|
{
|
||||||
return USER_Driver->pToUnicodeEx(virtKey, scanCode, lpKeyState, lpwStr, size, flags, hkl);
|
return USER_Driver->pToUnicodeEx(virtKey, scanCode, lpKeyState, lpwStr, size, flags, hkl);
|
||||||
|
@ -747,7 +747,7 @@ INT WINAPI ToUnicodeEx(UINT virtKey, UINT scanCode, LPBYTE lpKeyState,
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* ToAscii (USER32.@)
|
* ToAscii (USER32.@)
|
||||||
*/
|
*/
|
||||||
INT WINAPI ToAscii( UINT virtKey, UINT scanCode, LPBYTE lpKeyState,
|
INT WINAPI ToAscii( UINT virtKey, UINT scanCode, const BYTE *lpKeyState,
|
||||||
LPWORD lpChar, UINT flags )
|
LPWORD lpChar, UINT flags )
|
||||||
{
|
{
|
||||||
return ToAsciiEx(virtKey, scanCode, lpKeyState, lpChar, flags, GetKeyboardLayout(0));
|
return ToAsciiEx(virtKey, scanCode, lpKeyState, lpChar, flags, GetKeyboardLayout(0));
|
||||||
|
@ -756,7 +756,7 @@ INT WINAPI ToAscii( UINT virtKey, UINT scanCode, LPBYTE lpKeyState,
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* ToAsciiEx (USER32.@)
|
* ToAsciiEx (USER32.@)
|
||||||
*/
|
*/
|
||||||
INT WINAPI ToAsciiEx( UINT virtKey, UINT scanCode, LPBYTE lpKeyState,
|
INT WINAPI ToAsciiEx( UINT virtKey, UINT scanCode, const BYTE *lpKeyState,
|
||||||
LPWORD lpChar, UINT flags, HKL dwhkl )
|
LPWORD lpChar, UINT flags, HKL dwhkl )
|
||||||
{
|
{
|
||||||
WCHAR uni_chars[2];
|
WCHAR uni_chars[2];
|
||||||
|
|
|
@ -114,7 +114,7 @@ typedef struct tagUSER_DRIVER {
|
||||||
HKL (*pLoadKeyboardLayout)(LPCWSTR, UINT);
|
HKL (*pLoadKeyboardLayout)(LPCWSTR, UINT);
|
||||||
UINT (*pMapVirtualKeyEx)(UINT, UINT, HKL);
|
UINT (*pMapVirtualKeyEx)(UINT, UINT, HKL);
|
||||||
UINT (*pSendInput)(UINT, LPINPUT, int);
|
UINT (*pSendInput)(UINT, LPINPUT, int);
|
||||||
INT (*pToUnicodeEx)(UINT, UINT, LPBYTE, LPWSTR, int, UINT, HKL);
|
INT (*pToUnicodeEx)(UINT, UINT, const BYTE *, LPWSTR, int, UINT, HKL);
|
||||||
BOOL (*pUnloadKeyboardLayout)(HKL);
|
BOOL (*pUnloadKeyboardLayout)(HKL);
|
||||||
SHORT (*pVkKeyScanEx)(WCHAR, HKL);
|
SHORT (*pVkKeyScanEx)(WCHAR, HKL);
|
||||||
/* mouse functions */
|
/* mouse functions */
|
||||||
|
|
|
@ -2439,7 +2439,7 @@ static char KEYBOARD_MapDeadKeysym(KeySym keysym)
|
||||||
* FIXME : should do the above (return 2 for non matching deadchar+char combinations)
|
* FIXME : should do the above (return 2 for non matching deadchar+char combinations)
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
INT X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, LPBYTE lpKeyState,
|
INT X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState,
|
||||||
LPWSTR bufW, int bufW_size, UINT flags, HKL hkl)
|
LPWSTR bufW, int bufW_size, UINT flags, HKL hkl)
|
||||||
{
|
{
|
||||||
Display *display = thread_init_display();
|
Display *display = thread_init_display();
|
||||||
|
|
|
@ -5022,10 +5022,10 @@ WINUSERAPI LONG WINAPI TabbedTextOutA(HDC,INT,INT,LPCSTR,INT,INT,const IN
|
||||||
WINUSERAPI LONG WINAPI TabbedTextOutW(HDC,INT,INT,LPCWSTR,INT,INT,const INT*,INT);
|
WINUSERAPI LONG WINAPI TabbedTextOutW(HDC,INT,INT,LPCWSTR,INT,INT,const INT*,INT);
|
||||||
#define TabbedTextOut WINELIB_NAME_AW(TabbedTextOut)
|
#define TabbedTextOut WINELIB_NAME_AW(TabbedTextOut)
|
||||||
WINUSERAPI WORD WINAPI TileWindows (HWND,UINT,const RECT *,UINT,const HWND *);
|
WINUSERAPI WORD WINAPI TileWindows (HWND,UINT,const RECT *,UINT,const HWND *);
|
||||||
WINUSERAPI INT WINAPI ToAscii(UINT,UINT,LPBYTE,LPWORD,UINT);
|
WINUSERAPI INT WINAPI ToAscii(UINT,UINT,const BYTE *,LPWORD,UINT);
|
||||||
WINUSERAPI INT WINAPI ToAsciiEx(UINT,UINT,LPBYTE,LPWORD,UINT,HKL);
|
WINUSERAPI INT WINAPI ToAsciiEx(UINT,UINT,const BYTE *,LPWORD,UINT,HKL);
|
||||||
WINUSERAPI INT WINAPI ToUnicode(UINT,UINT,PBYTE,LPWSTR,int,UINT);
|
WINUSERAPI INT WINAPI ToUnicode(UINT,UINT,const BYTE *,LPWSTR,int,UINT);
|
||||||
WINUSERAPI INT WINAPI ToUnicodeEx(UINT,UINT,LPBYTE,LPWSTR,int,UINT,HKL);
|
WINUSERAPI INT WINAPI ToUnicodeEx(UINT,UINT,const BYTE *,LPWSTR,int,UINT,HKL);
|
||||||
WINUSERAPI BOOL WINAPI TrackMouseEvent(LPTRACKMOUSEEVENT);
|
WINUSERAPI BOOL WINAPI TrackMouseEvent(LPTRACKMOUSEEVENT);
|
||||||
WINUSERAPI BOOL WINAPI TrackPopupMenu(HMENU,UINT,INT,INT,INT,HWND,const RECT*);
|
WINUSERAPI BOOL WINAPI TrackPopupMenu(HMENU,UINT,INT,INT,INT,HWND,const RECT*);
|
||||||
WINUSERAPI BOOL WINAPI TrackPopupMenuEx(HMENU,UINT,INT,INT,HWND,LPTPMPARAMS);
|
WINUSERAPI BOOL WINAPI TrackPopupMenuEx(HMENU,UINT,INT,INT,HWND,LPTPMPARAMS);
|
||||||
|
|
Loading…
Reference in a new issue