wine-commits November 2021

wine-commits@winehq.org

2 participants
951 discussions

Jacek Caban : win32u: Move NtUserGetKeyNameText implementation from user32.
by Alexandre Julliard 16 Nov '21

16 Nov '21

Module: wine Branch: master Commit: 65f3b653fad8b235dab0cc812fe42aab2ae6eb5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=65f3b653fad8b235dab0cc81… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 16 12:35:59 2021 +0100 win32u: Move NtUserGetKeyNameText implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 7 +-- dlls/user32/input.c | 146 +------------------------------------------ dlls/user32/user32.spec | 2 +- dlls/win32u/driver.c | 6 ++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/input.c | 93 +++++++++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 5 ++ 9 files changed, 110 insertions(+), 153 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=65f3b653fad8b235dab0…

1 0

Jacek Caban : win32u: Move NtUserGetKeyboardLayout implementation from user32.
by Alexandre Julliard 16 Nov '21

16 Nov '21

Module: wine Branch: master Commit: 563a233284d5a3fc0741af2421e239cd7b6b721f URL: https://source.winehq.org/git/wine.git/?a=commit;h=563a233284d5a3fc0741af24… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 16 12:35:43 2021 +0100 win32u: Move NtUserGetKeyboardLayout implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 35 ++++++++-------------------- dlls/user32/message.c | 4 ++-- dlls/user32/misc.c | 4 ++-- dlls/user32/sysparams.c | 2 +- dlls/user32/user32.spec | 2 +- dlls/user32/user_private.h | 30 ------------------------ dlls/win32u/input.c | 54 ++++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 5 ++++ include/ntuser.h | 30 ++++++++++++++++++++++++ 11 files changed, 106 insertions(+), 63 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=563a233284d5a3fc0741…

1 0

Jacek Caban : win32u: Move NtUserMapVirtualKeyEx implementation from user32.
by Alexandre Julliard 16 Nov '21

16 Nov '21

Module: wine Branch: master Commit: 8d34353878edb9be1a833db25ed98e9ee86dc930 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d34353878edb9be1a833db2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 16 12:34:17 2021 +0100 win32u: Move NtUserMapVirtualKeyEx implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 7 +- dlls/user32/input.c | 106 +---------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/driver.c | 6 ++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/input.c | 156 +++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 5 ++ 9 files changed, 174 insertions(+), 112 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8d34353878edb9be1a83…

1 0

Jacek Caban : win32u: Move NtUserVkKeyScanEx implementation from user32.
by Alexandre Julliard 16 Nov '21

16 Nov '21

Module: wine Branch: master Commit: 8f52632ca9925c376bacf60444739a3635f776d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f52632ca9925c376bacf604… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 16 12:33:53 2021 +0100 win32u: Move NtUserVkKeyScanEx implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 7 +---- dlls/user32/input.c | 69 ++------------------------------------------ dlls/user32/user32.spec | 2 +- dlls/win32u/driver.c | 6 ++++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/input.c | 66 ++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 5 ++++ 9 files changed, 84 insertions(+), 75 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8f52632ca9925c376bac…

1 0

Jacek Caban : win32u: Move NtUserSetKeyboardState implementation from user32.
by Alexandre Julliard 16 Nov '21

16 Nov '21

Module: wine Branch: master Commit: 05db9f63e1319c7b35ba2fe997f87c487d75fcc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05db9f63e1319c7b35ba2fe9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 16 12:33:36 2021 +0100 win32u: Move NtUserSetKeyboardState implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 17 ----------------- dlls/user32/user32.spec | 2 +- dlls/win32u/input.c | 16 ++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 7 +++++++ 7 files changed, 27 insertions(+), 19 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 08b5cffaa5f..fc6b6fa5822 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -593,23 +593,6 @@ BOOL WINAPI GetLastInputInfo(PLASTINPUTINFO plii) } -/********************************************************************** - * SetKeyboardState (USER32.@) - */ -BOOL WINAPI SetKeyboardState( LPBYTE state ) -{ - BOOL ret; - - SERVER_START_REQ( set_key_state ) - { - wine_server_add_data( req, state, 256 ); - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; - return ret; -} - - /********************************************************************** * VkKeyScanA (USER32.@) * diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index c4013b3dcfa..e48f30b46ca 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -673,7 +673,7 @@ @ stdcall SetForegroundWindow(long) @ stdcall SetGestureConfig(ptr long long ptr long) @ stdcall SetInternalWindowPos(long long ptr ptr) -@ stdcall SetKeyboardState(ptr) +@ stdcall SetKeyboardState(ptr) NtUserSetKeyboardState @ stdcall SetLastErrorEx(long long) @ stdcall SetLayeredWindowAttributes(ptr long long long) @ stdcall SetLogonNotifyWindow(long long) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index 4e790257ab1..feab4693fad 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -93,3 +93,19 @@ BOOL WINAPI NtUserGetKeyboardState( BYTE *state ) SERVER_END_REQ; return ret; } + +/********************************************************************** + * NtUserSetKeyboardState (win32u.@) + */ +BOOL WINAPI NtUserSetKeyboardState( BYTE *state ) +{ + BOOL ret; + + SERVER_START_REQ( set_key_state ) + { + wine_server_add_data( req, state, 256 ); + ret = !wine_server_call_err( req ); + } + SERVER_END_REQ; + return ret; +} diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index a7c08c5cef6..d1ddc429061 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -123,6 +123,7 @@ static void * const syscalls[] = NtUserOpenWindowStation, NtUserRemoveClipboardFormatListener, NtUserRemoveProp, + NtUserSetKeyboardState, NtUserSetObjectInformation, NtUserSetProcessWindowStation, NtUserSetProp, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index e4b31efe436..df48dfe9586 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1202,7 +1202,7 @@ @ stub NtUserSetInteractiveControlFocus @ stub NtUserSetInteractiveCtrlRotationAngle @ stub NtUserSetInternalWindowPos -@ stub NtUserSetKeyboardState +@ stdcall -syscall NtUserSetKeyboardState(ptr) @ stub NtUserSetLayeredWindowAttributes @ stub NtUserSetMagnificationDesktopMagnifierOffsetsDWMUpdated @ stub NtUserSetManipulationInputTarget diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 7c2ccbe63c7..09a281b5d14 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -110,6 +110,7 @@ SYSCALL_ENTRY( NtUserOpenWindowStation ) \ SYSCALL_ENTRY( NtUserRemoveClipboardFormatListener ) \ SYSCALL_ENTRY( NtUserRemoveProp ) \ + SYSCALL_ENTRY( NtUserSetKeyboardState ) \ SYSCALL_ENTRY( NtUserSetObjectInformation ) \ SYSCALL_ENTRY( NtUserSetProcessWindowStation ) \ SYSCALL_ENTRY( NtUserSetProp ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index a563e78a8f5..4c47b8937cf 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -251,3 +251,10 @@ NTSTATUS WINAPI wow64_NtUserGetKeyboardState( UINT *args ) return NtUserGetKeyboardState( state ); } + +NTSTATUS WINAPI wow64_NtUserSetKeyboardState( UINT *args ) +{ + BYTE *state = get_ptr( &args ); + + return NtUserSetKeyboardState( state ); +}

1 0

Jacek Caban : win32u: Move NtUserGetKeyboardState implementation from user32.
by Alexandre Julliard 16 Nov '21

16 Nov '21

Module: wine Branch: master Commit: deb455ec25ea9f47c9bf3119ff5b77089300fe0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=deb455ec25ea9f47c9bf3119… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 16 12:33:23 2021 +0100 win32u: Move NtUserGetKeyboardState implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 23 ----------------------- dlls/user32/message.c | 2 +- dlls/user32/user32.spec | 2 +- dlls/win32u/input.c | 22 ++++++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 7 +++++++ 8 files changed, 34 insertions(+), 26 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 7d0581dfc8f..08b5cffaa5f 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -593,29 +593,6 @@ BOOL WINAPI GetLastInputInfo(PLASTINPUTINFO plii) } -/********************************************************************** - * GetKeyboardState (USER32.@) - */ -BOOL WINAPI DECLSPEC_HOTPATCH GetKeyboardState( LPBYTE state ) -{ - BOOL ret; - UINT i; - - TRACE("(%p)\n", state); - - memset( state, 0, 256 ); - SERVER_START_REQ( get_key_state ) - { - req->key = -1; - wine_server_set_reply( req, state, 256 ); - ret = !wine_server_call_err( req ); - for (i = 0; i < 256; i++) state[i] &= 0x81; - } - SERVER_END_REQ; - return ret; -} - - /********************************************************************** * SetKeyboardState (USER32.@) */ diff --git a/dlls/user32/message.c b/dlls/user32/message.c index e5ea0735ed2..50c13323bc3 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3888,7 +3888,7 @@ BOOL WINAPI TranslateMessage( const MSG *msg ) return ImmTranslateMessage(msg->hwnd, msg->message, msg->wParam, msg->lParam); } - GetKeyboardState( state ); + NtUserGetKeyboardState( state ); len = ToUnicode(msg->wParam, HIWORD(msg->lParam), state, wp, ARRAY_SIZE(wp), 0); if (len == -1) { diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 91dc9674a3b..c4013b3dcfa 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -321,7 +321,7 @@ @ stdcall GetKeyboardLayoutList(long ptr) @ stdcall GetKeyboardLayoutNameA(ptr) @ stdcall GetKeyboardLayoutNameW(ptr) -@ stdcall GetKeyboardState(ptr) +@ stdcall -import GetKeyboardState(ptr) NtUserGetKeyboardState @ stdcall GetKeyboardType(long) @ stdcall GetLastActivePopup(long) @ stdcall GetLastInputInfo(ptr) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index 5383115a424..4e790257ab1 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -71,3 +71,25 @@ SHORT WINAPI NtUserGetKeyState( INT vkey ) TRACE("key (0x%x) -> %x\n", vkey, retval); return retval; } + +/********************************************************************** + * NtUserGetKeyboardState (win32u.@) + */ +BOOL WINAPI NtUserGetKeyboardState( BYTE *state ) +{ + BOOL ret; + UINT i; + + TRACE("(%p)\n", state); + + memset( state, 0, 256 ); + SERVER_START_REQ( get_key_state ) + { + req->key = -1; + wine_server_set_reply( req, state, 256 ); + ret = !wine_server_call_err( req ); + for (i = 0; i < 256; i++) state[i] &= 0x81; + } + SERVER_END_REQ; + return ret; +} diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 9216e95f25c..a7c08c5cef6 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -112,6 +112,7 @@ static void * const syscalls[] = NtUserGetClipboardSequenceNumber, NtUserGetClipboardViewer, NtUserGetKeyState, + NtUserGetKeyboardState, NtUserGetLayeredWindowAttributes, NtUserGetObjectInformation, NtUserGetProcessWindowStation, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 2003dc39bcd..e4b31efe436 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -949,7 +949,7 @@ @ stub NtUserGetKeyboardLayout @ stub NtUserGetKeyboardLayoutList @ stub NtUserGetKeyboardLayoutName -@ stub NtUserGetKeyboardState +@ stdcall -syscall NtUserGetKeyboardState(ptr) @ stdcall -syscall NtUserGetLayeredWindowAttributes(long ptr ptr ptr) @ stub NtUserGetListBoxInfo @ stub NtUserGetMenuBarInfo diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 7dc791e8eb5..7c2ccbe63c7 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -99,6 +99,7 @@ SYSCALL_ENTRY( NtUserGetClipboardSequenceNumber ) \ SYSCALL_ENTRY( NtUserGetClipboardViewer ) \ SYSCALL_ENTRY( NtUserGetKeyState ) \ + SYSCALL_ENTRY( NtUserGetKeyboardState ) \ SYSCALL_ENTRY( NtUserGetLayeredWindowAttributes ) \ SYSCALL_ENTRY( NtUserGetObjectInformation ) \ SYSCALL_ENTRY( NtUserGetProcessWindowStation ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index dcf8850c3f2..a563e78a8f5 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -244,3 +244,10 @@ NTSTATUS WINAPI wow64_NtUserGetKeyState( UINT *args ) return NtUserGetKeyState( vkey ); } + +NTSTATUS WINAPI wow64_NtUserGetKeyboardState( UINT *args ) +{ + BYTE *state = get_ptr( &args ); + + return NtUserGetKeyboardState( state ); +}

1 0

Jacek Caban : win32u: Move NtUserGetKeyState implementation from user32.
by Alexandre Julliard 16 Nov '21

16 Nov '21

Module: wine Branch: master Commit: d99f61dd9aa218ffb24f301a518fe659af9ee672 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d99f61dd9aa218ffb24f301a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 16 12:33:09 2021 +0100 win32u: Move NtUserGetKeyState implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/defwnd.c | 4 ++-- dlls/user32/dialog.c | 4 ++-- dlls/user32/edit.c | 8 ++++---- dlls/user32/input.c | 22 ---------------------- dlls/user32/listbox.c | 2 +- dlls/user32/mdi.c | 4 ++-- dlls/user32/menu.c | 6 +++--- dlls/user32/user32.spec | 2 +- dlls/user32/win.c | 2 +- dlls/win32u/input.c | 24 ++++++++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 7 +++++++ 14 files changed, 50 insertions(+), 39 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 5eb056ebd9e..916029c2579 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -507,11 +507,11 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa } else if( wParam == VK_F10 ) { - if (GetKeyState(VK_SHIFT) & 0x8000) + if (NtUserGetKeyState(VK_SHIFT) & 0x8000) SendMessageW( hwnd, WM_CONTEXTMENU, (WPARAM)hwnd, -1 ); iF10Key = 1; } - else if( wParam == VK_ESCAPE && (GetKeyState(VK_SHIFT) & 0x8000)) + else if (wParam == VK_ESCAPE && (NtUserGetKeyState(VK_SHIFT) & 0x8000)) SendMessageW( hwnd, WM_SYSCOMMAND, SC_KEYMENU, ' ' ); break; diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index c48f404eceb..7fac3e6b44c 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -1198,7 +1198,7 @@ BOOL WINAPI IsDialogMessageW( HWND hwndDlg, LPMSG msg ) * do so but I presume someone has) */ if (fIsDialog) - SendMessageW( hwndDlg, WM_NEXTDLGCTL, (GetKeyState(VK_SHIFT) & 0x8000), 0 ); + SendMessageW( hwndDlg, WM_NEXTDLGCTL, (NtUserGetKeyState(VK_SHIFT) & 0x8000), 0 ); else { /* It would appear that GetNextDlgTabItem can handle being @@ -1208,7 +1208,7 @@ BOOL WINAPI IsDialogMessageW( HWND hwndDlg, LPMSG msg ) HWND hwndFocus = GetFocus(); HWND hwndNext = GetNextDlgTabItem (hwndDlg, hwndFocus == hwndDlg ? NULL : hwndFocus, - GetKeyState (VK_SHIFT) & 0x8000); + NtUserGetKeyState (VK_SHIFT) & 0x8000); if (hwndNext) { dlgCode = SendMessageW (hwndNext, WM_GETDLGCODE, diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index cf5e807de21..73885566d3b 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -3176,7 +3176,7 @@ static LRESULT EDIT_WM_Char(EDITSTATE *es, WCHAR c) { BOOL control; - control = GetKeyState(VK_CONTROL) & 0x8000; + control = NtUserGetKeyState(VK_CONTROL) & 0x8000; switch (c) { case '\r': @@ -3436,11 +3436,11 @@ static LRESULT EDIT_WM_KeyDown(EDITSTATE *es, INT key) BOOL shift; BOOL control; - if (GetKeyState(VK_MENU) & 0x8000) + if (NtUserGetKeyState(VK_MENU) & 0x8000) return 0; - shift = GetKeyState(VK_SHIFT) & 0x8000; - control = GetKeyState(VK_CONTROL) & 0x8000; + shift = NtUserGetKeyState(VK_SHIFT) & 0x8000; + control = NtUserGetKeyState(VK_CONTROL) & 0x8000; switch (key) { case VK_F4: diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 1362664d0c9..7d0581dfc8f 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -593,28 +593,6 @@ BOOL WINAPI GetLastInputInfo(PLASTINPUTINFO plii) } -/********************************************************************** - * GetKeyState (USER32.@) - * - * An application calls the GetKeyState function in response to a - * keyboard-input message. This function retrieves the state of the key - * at the time the input message was generated. - */ -SHORT WINAPI DECLSPEC_HOTPATCH GetKeyState(INT vkey) -{ - SHORT retval = 0; - - SERVER_START_REQ( get_key_state ) - { - req->key = vkey; - if (!wine_server_call( req )) retval = (signed char)(reply->state & 0x81); - } - SERVER_END_REQ; - TRACE("key (0x%x) -> %x\n", vkey, retval); - return retval; -} - - /********************************************************************** * GetKeyboardState (USER32.@) */ diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 912adb716d0..c7e97170b27 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -2508,7 +2508,7 @@ static LRESULT LISTBOX_HandleKeyDown( LB_DESCR *descr, DWORD key ) if (caret >= 0) { if (((descr->style & LBS_EXTENDEDSEL) && - !(GetKeyState( VK_SHIFT ) & 0x8000)) || + !(NtUserGetKeyState( VK_SHIFT ) & 0x8000)) || !IS_MULTISELECT(descr)) descr->anchor_item = caret; LISTBOX_MoveCaret( descr, caret, TRUE ); diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index af39e5781ed..1047b969c17 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -1649,13 +1649,13 @@ BOOL WINAPI TranslateMDISysAccel( HWND hwndClient, LPMSG msg ) /* translate if the Ctrl key is down and Alt not. */ - if( (GetKeyState(VK_CONTROL) & 0x8000) && !(GetKeyState(VK_MENU) & 0x8000)) + if( (NtUserGetKeyState(VK_CONTROL) & 0x8000) && !(NtUserGetKeyState(VK_MENU) & 0x8000)) { switch( msg->wParam ) { case VK_F6: case VK_TAB: - wParam = ( GetKeyState(VK_SHIFT) & 0x8000 ) ? SC_NEXTWINDOW : SC_PREVWINDOW; + wParam = ( NtUserGetKeyState(VK_SHIFT) & 0x8000 ) ? SC_NEXTWINDOW : SC_PREVWINDOW; break; case VK_F4: case VK_RBUTTON: diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index ec6ff1d0dd0..f0d4be8a684 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -5505,9 +5505,9 @@ static BOOL translate_accelerator( HWND hWnd, UINT message, WPARAM wParam, LPARA if (wParam != key) return FALSE; - if (GetKeyState(VK_CONTROL) & 0x8000) mask |= FCONTROL; - if (GetKeyState(VK_MENU) & 0x8000) mask |= FALT; - if (GetKeyState(VK_SHIFT) & 0x8000) mask |= FSHIFT; + if (NtUserGetKeyState(VK_CONTROL) & 0x8000) mask |= FCONTROL; + if (NtUserGetKeyState(VK_MENU) & 0x8000) mask |= FALT; + if (NtUserGetKeyState(VK_SHIFT) & 0x8000) mask |= FSHIFT; if (message == WM_CHAR || message == WM_SYSCHAR) { diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 34ba824dc38..91dc9674a3b 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -316,7 +316,7 @@ @ stdcall GetKBCodePage() @ stdcall GetKeyNameTextA(long ptr long) @ stdcall GetKeyNameTextW(long ptr long) -@ stdcall GetKeyState(long) +@ stdcall -import GetKeyState(long) NtUserGetKeyState @ stdcall GetKeyboardLayout(long) @ stdcall GetKeyboardLayoutList(long ptr) @ stdcall GetKeyboardLayoutNameA(ptr) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index bc0b06c3f94..9fd5a9aa5e6 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3893,7 +3893,7 @@ BOOL WINAPI DragDetect( HWND hWnd, POINT pt ) TRACE( "%p,%s\n", hWnd, wine_dbgstr_point( &pt ) ); - if (!(GetKeyState( VK_LBUTTON ) & 0x8000)) + if (!(NtUserGetKeyState( VK_LBUTTON ) & 0x8000)) return FALSE; wDragWidth = GetSystemMetrics(SM_CXDRAG); diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index 0a4ebdace1d..5383115a424 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -28,6 +28,9 @@ #include "win32u_private.h" #include "wine/server.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(win); /********************************************************************** @@ -47,3 +50,24 @@ BOOL WINAPI NtUserAttachThreadInput( DWORD from, DWORD to, BOOL attach ) SERVER_END_REQ; return ret; } + +/********************************************************************** + * NtUserGetKeyState (win32u.@) + * + * An application calls the GetKeyState function in response to a + * keyboard-input message. This function retrieves the state of the key + * at the time the input message was generated. + */ +SHORT WINAPI NtUserGetKeyState( INT vkey ) +{ + SHORT retval = 0; + + SERVER_START_REQ( get_key_state ) + { + req->key = vkey; + if (!wine_server_call( req )) retval = (signed char)(reply->state & 0x81); + } + SERVER_END_REQ; + TRACE("key (0x%x) -> %x\n", vkey, retval); + return retval; +} diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index e557eade893..9216e95f25c 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -111,6 +111,7 @@ static void * const syscalls[] = NtUserGetClipboardOwner, NtUserGetClipboardSequenceNumber, NtUserGetClipboardViewer, + NtUserGetKeyState, NtUserGetLayeredWindowAttributes, NtUserGetObjectInformation, NtUserGetProcessWindowStation, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 2a627763091..2003dc39bcd 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -945,7 +945,7 @@ @ stub NtUserGetInteractiveCtrlSupportedWaveforms @ stub NtUserGetInternalWindowPos @ stub NtUserGetKeyNameText -@ stub NtUserGetKeyState +@ stdcall -syscall NtUserGetKeyState(long) @ stub NtUserGetKeyboardLayout @ stub NtUserGetKeyboardLayoutList @ stub NtUserGetKeyboardLayoutName diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 4f7ff8e003c..7dc791e8eb5 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -98,6 +98,7 @@ SYSCALL_ENTRY( NtUserGetClipboardOwner ) \ SYSCALL_ENTRY( NtUserGetClipboardSequenceNumber ) \ SYSCALL_ENTRY( NtUserGetClipboardViewer ) \ + SYSCALL_ENTRY( NtUserGetKeyState ) \ SYSCALL_ENTRY( NtUserGetLayeredWindowAttributes ) \ SYSCALL_ENTRY( NtUserGetObjectInformation ) \ SYSCALL_ENTRY( NtUserGetProcessWindowStation ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index a783eb42229..dcf8850c3f2 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -237,3 +237,10 @@ NTSTATUS WINAPI wow64_NtUserAttachThreadInput( UINT *args ) return NtUserAttachThreadInput( from, to, attach ); } + +NTSTATUS WINAPI wow64_NtUserGetKeyState( UINT *args ) +{ + INT vkey = get_ulong( &args ); + + return NtUserGetKeyState( vkey ); +}

1 0

Jacek Caban : win32u: Move NtUserAttachThreadInput implementation from user32.
by Alexandre Julliard 16 Nov '21

16 Nov '21

Module: wine Branch: master Commit: 94e06293966ac028a776445a283e7ed284648ab2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94e06293966ac028a776445a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 16 12:32:55 2021 +0100 win32u: Move NtUserAttachThreadInput implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 22 ---------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/Makefile.in | 1 + dlls/win32u/input.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 9 +++++++++ include/ntuser.h | 8 ++++++++ 9 files changed, 71 insertions(+), 24 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index b4e3579f5e8..1362664d0c9 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -593,28 +593,6 @@ BOOL WINAPI GetLastInputInfo(PLASTINPUTINFO plii) } -/********************************************************************** - * AttachThreadInput (USER32.@) - * - * Attaches the input processing mechanism of one thread to that of - * another thread. - */ -BOOL WINAPI AttachThreadInput( DWORD from, DWORD to, BOOL attach ) -{ - BOOL ret; - - SERVER_START_REQ( attach_thread_input ) - { - req->tid_from = from; - req->tid_to = to; - req->attach = attach; - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; - return ret; -} - - /********************************************************************** * GetKeyState (USER32.@) * diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 3825b6a4df2..34ba824dc38 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -12,7 +12,7 @@ @ stdcall AppendMenuW(long long long ptr) @ stdcall AreDpiAwarenessContextsEqual(long long) @ stdcall ArrangeIconicWindows(long) -@ stdcall AttachThreadInput(long long long) +@ stdcall AttachThreadInput(long long long) NtUserAttachThreadInput @ stdcall BeginDeferWindowPos(long) @ stdcall BeginPaint(long ptr) @ stdcall BlockInput(long) diff --git a/dlls/win32u/Makefile.in b/dlls/win32u/Makefile.in index 306a3302260..96cfb4a8ea7 100644 --- a/dlls/win32u/Makefile.in +++ b/dlls/win32u/Makefile.in @@ -26,6 +26,7 @@ C_SRCS = \ font.c \ freetype.c \ gdiobj.c \ + input.c \ main.c \ mapping.c \ opentype.c \ diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c new file mode 100644 index 00000000000..0a4ebdace1d --- /dev/null +++ b/dlls/win32u/input.c @@ -0,0 +1,49 @@ +/* + * USER Input processing + * + * Copyright 1993 Bob Amstadt + * Copyright 1996 Albrecht Kleine + * Copyright 1997 David Faure + * Copyright 1998 Morten Welinder + * Copyright 1998 Ulrich Weigand + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#if 0 +#pragma makedep unix +#endif + +#include "win32u_private.h" +#include "wine/server.h" + + +/********************************************************************** + * NtUserAttachThreadInput (win32u.@) + */ +BOOL WINAPI NtUserAttachThreadInput( DWORD from, DWORD to, BOOL attach ) +{ + BOOL ret; + + SERVER_START_REQ( attach_thread_input ) + { + req->tid_from = from; + req->tid_to = to; + req->attach = attach; + ret = !wine_server_call_err( req ); + } + SERVER_END_REQ; + return ret; +} diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 3eb38177a1f..e557eade893 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -102,6 +102,7 @@ static void * const syscalls[] = NtGdiSwapBuffers, NtGdiTransformPoints, NtUserAddClipboardFormatListener, + NtUserAttachThreadInput, NtUserCloseDesktop, NtUserCloseWindowStation, NtUserCreateDesktopEx, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 256ab822803..2a627763091 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -754,7 +754,7 @@ @ stub NtUserAddVisualIdentifier @ stub NtUserAlterWindowStyle @ stub NtUserAssociateInputContext -@ stub NtUserAttachThreadInput +@ stdcall -syscall NtUserAttachThreadInput(long long long) @ stub NtUserAutoPromoteMouseInPointer @ stub NtUserAutoRotateScreen @ stub NtUserBeginLayoutUpdate diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 45685c3ba21..4f7ff8e003c 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -89,6 +89,7 @@ SYSCALL_ENTRY( NtGdiSwapBuffers ) \ SYSCALL_ENTRY( NtGdiTransformPoints ) \ SYSCALL_ENTRY( NtUserAddClipboardFormatListener ) \ + SYSCALL_ENTRY( NtUserAttachThreadInput ) \ SYSCALL_ENTRY( NtUserCloseDesktop ) \ SYSCALL_ENTRY( NtUserCloseWindowStation ) \ SYSCALL_ENTRY( NtUserCreateDesktopEx ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index c86e7062314..a783eb42229 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -228,3 +228,12 @@ NTSTATUS WINAPI wow64_NtUserRemoveClipboardFormatListener( UINT *args ) return NtUserRemoveClipboardFormatListener( hwnd ); } + +NTSTATUS WINAPI wow64_NtUserAttachThreadInput( UINT *args ) +{ + DWORD from = get_ulong( &args ); + DWORD to = get_ulong( &args ); + BOOL attach = get_ulong( &args ); + + return NtUserAttachThreadInput( from, to, attach ); +} diff --git a/include/ntuser.h b/include/ntuser.h index 9fcd94128fd..d24032d1229 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -24,6 +24,7 @@ #include <winternl.h> BOOL WINAPI NtUserAddClipboardFormatListener( HWND hwnd ); +BOOL WINAPI NtUserAttachThreadInput( DWORD from, DWORD to, BOOL attach ); BOOL WINAPI NtUserCloseDesktop( HDESK handle ); BOOL WINAPI NtUserCloseWindowStation( HWINSTA handle ); INT WINAPI NtUserCountClipboardFormats(void); @@ -36,6 +37,10 @@ INT WINAPI NtUserGetClipboardFormatName( UINT format, WCHAR *buffer, INT max HWND WINAPI NtUserGetClipboardOwner(void); DWORD WINAPI NtUserGetClipboardSequenceNumber(void); HWND WINAPI NtUserGetClipboardViewer(void); +INT WINAPI NtUserGetKeyNameText( LONG lparam, WCHAR *buffer, INT size ); +SHORT WINAPI NtUserGetKeyState( INT vkey ); +HKL WINAPI NtUserGetKeyboardLayout( DWORD thread_id ); +BOOL WINAPI NtUserGetKeyboardState( BYTE *state ); BOOL WINAPI NtUserGetLayeredWindowAttributes( HWND hwnd, COLORREF *key, BYTE *alpha, DWORD *flags ); BOOL WINAPI NtUserGetObjectInformation( HANDLE handle, INT index, void *info, DWORD len, DWORD *needed ); @@ -45,14 +50,17 @@ HANDLE WINAPI NtUserGetProp( HWND hwnd, const WCHAR *str ); HDESK WINAPI NtUserGetThreadDesktop( DWORD thread ); BOOL WINAPI NtUserGetUpdatedClipboardFormats( UINT *formats, UINT size, UINT *out_size ); BOOL WINAPI NtUserIsClipboardFormatAvailable( UINT format ); +UINT WINAPI NtUserMapVirtualKeyEx( UINT code, UINT type, HKL layout ); HWINSTA WINAPI NtUserOpenWindowStation( OBJECT_ATTRIBUTES *attr, ACCESS_MASK access ); BOOL WINAPI NtUserSetObjectInformation( HANDLE handle, INT index, void *info, DWORD len ); HDESK WINAPI NtUserOpenDesktop( OBJECT_ATTRIBUTES *attr, DWORD flags, ACCESS_MASK access ); HDESK WINAPI NtUserOpenInputDesktop( DWORD flags, BOOL inherit, ACCESS_MASK access ); BOOL WINAPI NtUserRemoveClipboardFormatListener( HWND hwnd ); HANDLE WINAPI NtUserRemoveProp( HWND hwnd, const WCHAR *str ); +BOOL WINAPI NtUserSetKeyboardState( BYTE *state ); BOOL WINAPI NtUserSetProcessWindowStation( HWINSTA handle ); BOOL WINAPI NtUserSetProp( HWND hwnd, const WCHAR *str, HANDLE handle ); BOOL WINAPI NtUserSetThreadDesktop( HDESK handle ); +WORD WINAPI NtUserVkKeyScanEx( WCHAR chr, HKL layout ); #endif /* _NTUSER_ */

1 0

Zebediah Figura : wined3d: Make the "counter_bo" field of struct wined3d_unordered_access_view a wined3d_bo pointer.
by Alexandre Julliard 16 Nov '21

16 Nov '21

Module: wine Branch: master Commit: 4b678c1e9a8faf10576cede771a9c37cae5244ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b678c1e9a8faf10576cede7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 15 16:30:19 2021 -0600 wined3d: Make the "counter_bo" field of struct wined3d_unordered_access_view a wined3d_bo pointer. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 79dbc847249..b902812aded 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1616,7 +1616,7 @@ void wined3d_unordered_access_view_set_counter(struct wined3d_unordered_access_v src.buffer_object = 0; src.addr = (void *)&value; - dst.buffer_object = (struct wined3d_bo *)view->counter_bo; + dst.buffer_object = view->counter_bo; dst.addr = NULL; wined3d_context_copy_bo_address(context, &dst, &src, sizeof(uint32_t)); @@ -1632,7 +1632,7 @@ void wined3d_unordered_access_view_copy_counter(struct wined3d_unordered_access_ if (!view->counter_bo) return; - src.buffer_object = (struct wined3d_bo *)view->counter_bo; + src.buffer_object = view->counter_bo; src.addr = NULL; wined3d_buffer_copy_bo_address(buffer, context, offset, &src, sizeof(uint32_t)); @@ -1670,7 +1670,7 @@ static void wined3d_unordered_access_view_gl_cs_init(void *object) { struct wined3d_bo_gl *bo = &view_gl->counter_bo; - view_gl->v.counter_bo = (uintptr_t)bo; + view_gl->v.counter_bo = &bo->b; wined3d_context_gl_create_bo(context_gl, sizeof(uint32_t), GL_ATOMIC_COUNTER_BUFFER, GL_STATIC_DRAW, true, GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_CLIENT_STORAGE_BIT, bo); wined3d_unordered_access_view_set_counter(&view_gl->v, 0); @@ -2253,7 +2253,7 @@ static void wined3d_unordered_access_view_vk_cs_init(void *object) { TRACE("Created counter buffer view 0x%s.\n", wine_dbgstr_longlong(uav_vk->vk_counter_view)); - uav_vk->v.counter_bo = (uintptr_t)&uav_vk->counter_bo; + uav_vk->v.counter_bo = &uav_vk->counter_bo.b; } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 826bdc6e4a9..90824d83290 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5320,7 +5320,7 @@ struct wined3d_unordered_access_view const struct wined3d_format *format; struct wined3d_view_desc desc; - uintptr_t counter_bo; + struct wined3d_bo *counter_bo; }; void wined3d_unordered_access_view_cleanup(struct wined3d_unordered_access_view *view) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : wined3d: Make the "buffer_object" field of struct wined3d_const_bo_addr a wined3d_bo pointer.
by Alexandre Julliard 16 Nov '21

16 Nov '21

Module: wine Branch: master Commit: f3647c4b4faf2883548081af6aa9e12c4171a402 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3647c4b4faf2883548081af… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 15 16:30:18 2021 -0600 wined3d: Make the "buffer_object" field of struct wined3d_const_bo_addr a wined3d_bo pointer. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 6 +++--- dlls/wined3d/buffer.c | 4 ++-- dlls/wined3d/context_gl.c | 3 ++- dlls/wined3d/texture.c | 10 +++++++--- dlls/wined3d/utils.c | 2 +- dlls/wined3d/view.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 7 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 12811fd1482..e6f5bf108c7 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1211,12 +1211,12 @@ static void adapter_vk_flush_bo_address(struct wined3d_context *context, const struct wined3d_const_bo_address *data, size_t size) { struct wined3d_context_vk *context_vk = wined3d_context_vk(context); - struct wined3d_bo_vk *bo; + struct wined3d_bo *bo; - if (!(bo = (struct wined3d_bo_vk *)data->buffer_object)) + if (!(bo = data->buffer_object)) return; - flush_bo_range(context_vk, bo, (uintptr_t)data->addr, size); + flush_bo_range(context_vk, wined3d_bo_vk(bo), (uintptr_t)data->addr, size); } static bool adapter_vk_alloc_bo(struct wined3d_device *device, struct wined3d_resource *resource, diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b07f1510b74..315ea05260e 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1132,12 +1132,12 @@ void wined3d_buffer_update_sub_resource(struct wined3d_buffer *buffer, struct wi { if (upload_bo->flags & UPLOAD_BO_RENAME_ON_UNMAP) { - wined3d_buffer_set_bo(buffer, context, (struct wined3d_bo *)upload_bo->addr.buffer_object); + wined3d_buffer_set_bo(buffer, context, upload_bo->addr.buffer_object); wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_BUFFER); wined3d_buffer_invalidate_location(buffer, ~WINED3D_LOCATION_BUFFER); } - if (upload_bo->addr.buffer_object && upload_bo->addr.buffer_object == (uintptr_t)buffer->buffer_object) + if (upload_bo->addr.buffer_object && upload_bo->addr.buffer_object == buffer->buffer_object) wined3d_context_flush_bo_address(context, &upload_bo->addr, size); else wined3d_buffer_copy_bo_address(buffer, context, offset, &upload_bo->addr, size); diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index e91bff9328b..f7d4d9e8cb3 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2748,8 +2748,9 @@ static void flush_bo_ranges(struct wined3d_context_gl *context_gl, const struct struct wined3d_bo_gl *bo; unsigned int i; - if (!(bo = (struct wined3d_bo_gl *)data->buffer_object) || bo->b.coherent) + if (!data->buffer_object || data->buffer_object->coherent) return; + bo = wined3d_bo_gl(data->buffer_object); gl_info = context_gl->gl_info; wined3d_context_gl_bind_bo(context_gl, bo->binding, bo->id); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 370eaaf08e5..7e2da350f5a 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2476,7 +2476,7 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, return; } - bo.buffer_object = (struct wined3d_bo *)src_bo_addr->buffer_object; + bo.buffer_object = src_bo_addr->buffer_object; bo.addr = (BYTE *)src_bo_addr->addr + src_box->front * src_slice_pitch; if (dst_texture->resource.format_flags & WINED3DFMT_FLAG_BLOCKS) { @@ -4720,7 +4720,7 @@ static void wined3d_texture_vk_upload_data(struct wined3d_context *context, /* We need to be outside of a render pass for vkCmdPipelineBarrier() and vkCmdCopyBufferToImage() calls below. */ wined3d_context_vk_end_current_render_pass(context_vk); - if (!(src_bo = (struct wined3d_bo_vk *)src_bo_addr->buffer_object)) + if (!src_bo_addr->buffer_object) { if (!wined3d_context_vk_create_bo(context_vk, sub_resource->size, VK_BUFFER_USAGE_TRANSFER_SRC_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, &staging_bo)) @@ -4755,6 +4755,8 @@ static void wined3d_texture_vk_upload_data(struct wined3d_context *context, } else { + src_bo = wined3d_bo_vk(src_bo_addr->buffer_object); + vk_barrier.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER; vk_barrier.pNext = NULL; vk_barrier.srcAccessMask = vk_access_mask_from_buffer_usage(src_bo->usage) & ~WINED3D_READ_ONLY_ACCESS_FLAGS; @@ -4917,7 +4919,7 @@ static void wined3d_texture_vk_download_data(struct wined3d_context *context, /* We need to be outside of a render pass for vkCmdPipelineBarrier() and vkCmdCopyBufferToImage() calls below. */ wined3d_context_vk_end_current_render_pass(context_vk); - if (!(dst_bo = (struct wined3d_bo_vk *)dst_bo_addr->buffer_object)) + if (!dst_bo_addr->buffer_object) { if (!wined3d_context_vk_create_bo(context_vk, sub_resource->size, VK_BUFFER_USAGE_TRANSFER_DST_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, &staging_bo)) @@ -4930,6 +4932,8 @@ static void wined3d_texture_vk_download_data(struct wined3d_context *context, } else { + dst_bo = wined3d_bo_vk(dst_bo_addr->buffer_object); + vk_barrier.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER; vk_barrier.pNext = NULL; vk_barrier.srcAccessMask = vk_access_mask_from_buffer_usage(dst_bo->usage); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 26001775300..098b07ae35b 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4613,7 +4613,7 @@ const char *debug_const_bo_address(const struct wined3d_const_bo_address *addres { if (!address) return "(null)"; - return wine_dbg_sprintf("{%#lx:%p}", address->buffer_object, address->addr); + return wine_dbg_sprintf("{%p:%p}", address->buffer_object, address->addr); } const char *debug_bo_address(const struct wined3d_bo_address *address) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 0d8001f5cbe..79dbc847249 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1632,7 +1632,7 @@ void wined3d_unordered_access_view_copy_counter(struct wined3d_unordered_access_ if (!view->counter_bo) return; - src.buffer_object = view->counter_bo; + src.buffer_object = (struct wined3d_bo *)view->counter_bo; src.addr = NULL; wined3d_buffer_copy_bo_address(buffer, context, offset, &src, sizeof(uint32_t)); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3e2b05ded28..826bdc6e4a9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1685,7 +1685,7 @@ struct wined3d_bo_address struct wined3d_const_bo_address { - UINT_PTR buffer_object; + struct wined3d_bo *buffer_object; const BYTE *addr; };

1 0

← Newer
1
...
42
43
44
45
46
47
48
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2021