Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
fc48f774
Commit
fc48f774
authored
Oct 27, 2008
by
Dmitry Timoshkov
Committed by
Alexandre Julliard
Oct 27, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
user32: Make ToAscii(Ex) and ToUnicode(Ex) prototypes match PSDK.
parent
0d2bc3fa
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
12 deletions
+12
-12
driver.c
dlls/user32/driver.c
+2
-2
input.c
dlls/user32/input.c
+4
-4
user_private.h
dlls/user32/user_private.h
+1
-1
keyboard.c
dlls/winex11.drv/keyboard.c
+1
-1
winuser.h
include/winuser.h
+4
-4
No files found.
dlls/user32/driver.c
View file @
fc48f774
...
...
@@ -202,7 +202,7 @@ static UINT nulldrv_SendInput( UINT count, LPINPUT inputs, int size )
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
)
{
return
0
;
...
...
@@ -549,7 +549,7 @@ static UINT loaderdrv_SendInput( UINT count, LPINPUT inputs, int 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
)
{
return
load_driver
()
->
pToUnicodeEx
(
virt
,
scan
,
state
,
str
,
size
,
flags
,
layout
);
...
...
dlls/user32/input.c
View file @
fc48f774
...
...
@@ -729,7 +729,7 @@ INT WINAPI GetKeyNameTextW(LONG lParam, LPWSTR lpBuffer, INT nSize)
/****************************************************************************
* 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
)
{
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.@)
*/
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
)
{
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.@)
*/
INT
WINAPI
ToAscii
(
UINT
virtKey
,
UINT
scanCode
,
LPBYTE
lpKeyState
,
INT
WINAPI
ToAscii
(
UINT
virtKey
,
UINT
scanCode
,
const
BYTE
*
lpKeyState
,
LPWORD
lpChar
,
UINT
flags
)
{
return
ToAsciiEx
(
virtKey
,
scanCode
,
lpKeyState
,
lpChar
,
flags
,
GetKeyboardLayout
(
0
));
...
...
@@ -756,7 +756,7 @@ INT WINAPI ToAscii( UINT virtKey, UINT scanCode, LPBYTE lpKeyState,
/****************************************************************************
* 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
)
{
WCHAR
uni_chars
[
2
];
...
...
dlls/user32/user_private.h
View file @
fc48f774
...
...
@@ -114,7 +114,7 @@ typedef struct tagUSER_DRIVER {
HKL
(
*
pLoadKeyboardLayout
)(
LPCWSTR
,
UINT
);
UINT
(
*
pMapVirtualKeyEx
)(
UINT
,
UINT
,
HKL
);
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
);
SHORT
(
*
pVkKeyScanEx
)(
WCHAR
,
HKL
);
/* mouse functions */
...
...
dlls/winex11.drv/keyboard.c
View file @
fc48f774
...
...
@@ -2439,7 +2439,7 @@ static char KEYBOARD_MapDeadKeysym(KeySym keysym)
* 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
)
{
Display
*
display
=
thread_init_display
();
...
...
include/winuser.h
View file @
fc48f774
...
...
@@ -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
);
#define TabbedTextOut WINELIB_NAME_AW(TabbedTextOut)
WINUSERAPI
WORD
WINAPI
TileWindows
(
HWND
,
UINT
,
const
RECT
*
,
UINT
,
const
HWND
*
);
WINUSERAPI
INT
WINAPI
ToAscii
(
UINT
,
UINT
,
LPBYTE
,
LPWORD
,
UINT
);
WINUSERAPI
INT
WINAPI
ToAsciiEx
(
UINT
,
UINT
,
LPBYTE
,
LPWORD
,
UINT
,
HKL
);
WINUSERAPI
INT
WINAPI
ToUnicode
(
UINT
,
UINT
,
PBYTE
,
LPWSTR
,
int
,
UINT
);
WINUSERAPI
INT
WINAPI
ToUnicodeEx
(
UINT
,
UINT
,
LPBYTE
,
LPWSTR
,
int
,
UINT
,
HKL
);
WINUSERAPI
INT
WINAPI
ToAscii
(
UINT
,
UINT
,
const
BYTE
*
,
LPWORD
,
UINT
);
WINUSERAPI
INT
WINAPI
ToAsciiEx
(
UINT
,
UINT
,
const
BYTE
*
,
LPWORD
,
UINT
,
HKL
);
WINUSERAPI
INT
WINAPI
ToUnicode
(
UINT
,
UINT
,
const
BYTE
*
,
LPWSTR
,
int
,
UINT
);
WINUSERAPI
INT
WINAPI
ToUnicodeEx
(
UINT
,
UINT
,
const
BYTE
*
,
LPWSTR
,
int
,
UINT
,
HKL
);
WINUSERAPI
BOOL
WINAPI
TrackMouseEvent
(
LPTRACKMOUSEEVENT
);
WINUSERAPI
BOOL
WINAPI
TrackPopupMenu
(
HMENU
,
UINT
,
INT
,
INT
,
INT
,
HWND
,
const
RECT
*
);
WINUSERAPI
BOOL
WINAPI
TrackPopupMenuEx
(
HMENU
,
UINT
,
INT
,
INT
,
HWND
,
LPTPMPARAMS
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment