June 2022 - Wine-Commits - list.winehq.org

Rémi Bernon : dinput/tests: Use dinput_test_(init|exit) for all tests.
by Alexandre Julliard June 9, 2022

June 9, 2022

Module: wine Branch: master Commit: f5e9079ed7739d3437a0ef91b2ca685621927c91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5e9079ed7739d3437a0ef91… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 2 10:02:26 2022 +0200 dinput/tests: Use dinput_test_(init|exit) for all tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/tests/device.c | 20 +++--- dlls/dinput/tests/device8.c | 38 ++--------- dlls/dinput/tests/dinput.c | 133 ++++++++++++++++++------------------- dlls/dinput/tests/dinput_test.h | 3 +- dlls/dinput/tests/force_feedback.c | 4 +- dlls/dinput/tests/hid.c | 52 +++++++++------ dlls/dinput/tests/hotplug.c | 4 +- dlls/dinput/tests/joystick.c | 32 +++++---- dlls/dinput/tests/joystick8.c | 4 +- dlls/dinput/tests/keyboard.c | 27 +++----- dlls/dinput/tests/mouse.c | 23 ++++--- 11 files changed, 159 insertions(+), 181 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f5e9079ed7739d3437a0…

1 0

Jacek Caban : win32u: Move NtUserInternalGetWindowIcon implementation from user32.
by Alexandre Julliard June 9, 2022

June 9, 2022

Module: wine Branch: master Commit: 6e2ea185c2acdb91b5367e9f72c770e2caa6fc16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e2ea185c2acdb91b5367e9f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 12 00:10:41 2022 +0200 win32u: Move NtUserInternalGetWindowIcon implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 8 ++++++++ dlls/user32/win.c | 47 ------------------------------------------- dlls/win32u/cursoricon.c | 21 +++++++++++++++++++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 48 ++++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/wrappers.c | 7 +++++++ include/ntuser.h | 15 +++++++++++++- 10 files changed, 102 insertions(+), 50 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6e2ea185c2acdb91b536…

1 0

Chilung Chan : po: Update Traditional Chinese translation.
by Alexandre Julliard June 9, 2022

June 9, 2022

Module: wine Branch: master Commit: ab4e56b3984204afdfc4c6cf9b9a8f9c745b53a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab4e56b3984204afdfc4c6cf… Author: Chilung Chan <eason066(a)gmail.com> Date: Thu Jun 9 03:35:01 2022 +0800 po: Update Traditional Chinese translation. Signed-off-by: Chilung Chan <eason066(a)gmail.com> Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/zh_TW.po | 66 ++++++++++++++++++++----------------------------------------- 1 file changed, 21 insertions(+), 45 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index e1e2c09a37e..f7bd3501244 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-12-23 14:09+0800\n" +"PO-Revision-Date: 2022-06-09 03:15+0800\n" "Last-Translator: Chilung Chan <eason066(a)gmail.com>\n" "Language-Team: Chinese (Taiwan)\n" "Language: zh_TW\n" @@ -3924,13 +3924,11 @@ msgstr "無法在這個物件更改屬性描述符中的 'writable' 屬性為 't #: dlls/jscript/jscript.rc:74 msgid "Cyclic __proto__ value" -msgstr "" +msgstr "循環的 __proto__ 值" #: dlls/jscript/jscript.rc:75 -#, fuzzy -#| msgid "Cannot define property '|': object is not extensible" msgid "Cannot create property for a non-extensible object" -msgstr "無法定義屬性 '|': 物件不能擴展" +msgstr "無法為不可擴展的物件建立屬性" #: dlls/jscript/jscript.rc:76 msgid "Cannot define property '|': object is not extensible" @@ -3945,10 +3943,8 @@ msgid "Cannot modify non-writable property '|'" msgstr "無法修改不可寫入的屬性 '|'" #: dlls/jscript/jscript.rc:79 -#, fuzzy -#| msgid "'this' is not a Map object" msgid "'this' is not a | object" -msgstr "'this' 不是 Map 物件" +msgstr "'this' 不是一個 | 物件" #: dlls/jscript/jscript.rc:80 msgid "Property cannot have both accessors and a value" @@ -3965,45 +3961,39 @@ msgstr "Wine" #: dlls/kernelbase/kernelbase.rc:29 msgid "Western Europe and United States" -msgstr "" +msgstr "西歐和美國" #: dlls/kernelbase/kernelbase.rc:30 -#, fuzzy -#| msgid "Central European" msgid "Central Europe" msgstr "中歐語言" #: dlls/kernelbase/kernelbase.rc:34 -#, fuzzy -#| msgid "Turkish" msgid "Turkic" -msgstr "土耳其語" +msgstr "突厥語" #: dlls/kernelbase/kernelbase.rc:36 msgid "Korean" -msgstr "" +msgstr "韓語" #: dlls/kernelbase/kernelbase.rc:37 -#, fuzzy -#| msgid "Operation Ceased" msgid "Traditional Chinese" -msgstr "作業已停止" +msgstr "繁體中文" #: dlls/kernelbase/kernelbase.rc:38 msgid "Simplified Chinese" -msgstr "" +msgstr "簡體中文" #: dlls/kernelbase/kernelbase.rc:43 msgid "Indic" -msgstr "" +msgstr "印度語" #: dlls/kernelbase/kernelbase.rc:44 msgid "Georgian" -msgstr "" +msgstr "喬治亞語" #: dlls/kernelbase/kernelbase.rc:45 msgid "Armenian" -msgstr "" +msgstr "亞美尼亞語" #: dlls/kernelbase/winerror.mc:28 msgid "Success.\n" @@ -6962,54 +6952,40 @@ msgid "This network connection does not exist.\n" msgstr "這個網路連線不存在。\n" #: dlls/kernelbase/winerror.mc:3748 -#, fuzzy -#| msgid "Invalid at interrupt time.\n" msgid "Call interrupted.\n" -msgstr "於插斷時間無效。\n" +msgstr "呼叫已中斷。\n" #: dlls/kernelbase/winerror.mc:3753 -#, fuzzy -#| msgid "Invalid handle.\n" msgid "Invalid file handle.\n" -msgstr "無效的控制代碼。\n" +msgstr "無效的檔案控制代碼。\n" #: dlls/kernelbase/winerror.mc:3763 -#, fuzzy -#| msgid "Invalid network address.\n" msgid "Invalid pointer address.\n" -msgstr "無效的網路位址。\n" +msgstr "無效的指標位址。\n" #: dlls/kernelbase/winerror.mc:3768 -#, fuzzy -#| msgid "Invalid name.\n" msgid "Invalid argument.\n" -msgstr "無效的名稱。\n" +msgstr "無效的引數。\n" #: dlls/kernelbase/winerror.mc:3778 msgid "Connection reset by peer.\n" msgstr "連線被同儕節點重設。\n" #: dlls/kernelbase/winerror.mc:3788 -#, fuzzy -#| msgid "Point not found.\n" msgid "Host not found.\n" -msgstr "找不到點。\n" +msgstr "找不到主機。\n" #: dlls/kernelbase/winerror.mc:3793 -#, fuzzy -#| msgid "Attribute is not found.\n" msgid "Nonauthoritative host not found.\n" -msgstr "找不到屬性。\n" +msgstr "找不到未授權的主機。\n" #: dlls/kernelbase/winerror.mc:3798 -#, fuzzy -#| msgid "Unrecoverable error occurred.\n" msgid "Nonrecoverable error.\n" -msgstr "發生致命錯誤。\n" +msgstr "無法復原的錯誤。\n" #: dlls/kernelbase/winerror.mc:3803 msgid "Name valid, no data record.\n" -msgstr "" +msgstr "名稱有效，無資料記錄。\n" #: dlls/kernelbase/winerror.mc:3817 msgid "Not implemented.\n" @@ -7695,7 +7671,7 @@ msgstr "不支援的狀態轉換。\n" #: dlls/mferror/mferror.mc:291 msgid "Unrecoverable error occurred.\n" -msgstr "發生致命錯誤。\n" +msgstr "發生無法復原的錯誤。\n" #: dlls/mferror/mferror.mc:298 msgid "Sample has too many buffers.\n"

1 0

Jacek Caban : win32u: Remove no longer used __wine_set_user_driver PE entry point.
by Alexandre Julliard June 9, 2022

June 9, 2022

Module: wine Branch: master Commit: ff66d8ee0fb80ca0b23c8cc2c33a4a53068ecc6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff66d8ee0fb80ca0b23c8cc2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 8 18:03:27 2022 +0200 win32u: Remove no longer used __wine_set_user_driver PE entry point. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/driver.c | 4 ++-- dlls/win32u/gdiobj.c | 1 - dlls/win32u/win32u.spec | 1 - dlls/win32u/win32u_private.h | 1 - dlls/win32u/wrappers.c | 9 --------- include/wine/gdi_driver.h | 12 ++++++------ 6 files changed, 8 insertions(+), 20 deletions(-) diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 1f538d100ed..4a853b516f4 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -1223,9 +1223,9 @@ static const struct user_driver_funcs lazy_load_driver = const struct user_driver_funcs *user_driver = &lazy_load_driver; /****************************************************************************** - * __wine_set_user_driver (win32u.@) + * __wine_set_user_driver (win32u.so) */ -void CDECL __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT version ) +void __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT version ) { struct user_driver_funcs *driver, *prev; diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index edb21456d8d..c29e7773e6c 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1249,7 +1249,6 @@ static struct unix_funcs unix_funcs = __wine_get_vulkan_driver, __wine_get_wgl_driver, __wine_send_input, - __wine_set_user_driver, }; NTSTATUS gdi_init(void) diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 17be6894508..8584fc4e5c3 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1322,7 +1322,6 @@ # Graphics drivers @ cdecl __wine_send_input(long ptr ptr) -@ cdecl __wine_set_user_driver(ptr long) # OpenGL @ cdecl __wine_get_wgl_driver(long long) diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index fd6dba82da2..c5303010ef3 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -328,7 +328,6 @@ struct unix_funcs const struct vulkan_funcs * (CDECL *get_vulkan_driver)( UINT version ); struct opengl_funcs * (CDECL *get_wgl_driver)( HDC hdc, UINT version ); BOOL (CDECL *wine_send_input)( HWND hwnd, const INPUT *input, const RAWINPUT *rawinput ); - void (CDECL *set_user_driver)( const struct user_driver_funcs *funcs, UINT version ); }; /* clipboard.c */ diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 13b4b7164ab..b336059fe96 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -1408,15 +1408,6 @@ BOOL CDECL __wine_send_input( HWND hwnd, const INPUT *input, const RAWINPUT *raw return unix_funcs->wine_send_input( hwnd, input, rawinput ); } -/*********************************************************************** - * __wine_set_user_driver (win32u.@) - */ -void CDECL __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT version ) -{ - if (!unix_funcs) return; - return unix_funcs->set_user_driver( funcs, version ); -} - extern void wrappers_init( unixlib_handle_t handle ) { const void *args; diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 52fd6fe49d3..998aa3ed3e9 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -168,7 +168,7 @@ struct gdi_dc_funcs }; /* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 79 +#define WINE_GDI_DRIVER_VERSION 80 #define GDI_PRIORITY_NULL_DRV 0 /* null driver */ #define GDI_PRIORITY_FONT_DRV 100 /* any font driver */ @@ -196,9 +196,9 @@ static inline void push_dc_driver( PHYSDEV *dev, PHYSDEV physdev, const struct g /* support for window surfaces */ -struct window_surface; +#ifdef WINE_UNIX_LIB -#ifndef __WINE_USE_MSVCRT +struct window_surface; struct window_surface_funcs { @@ -333,10 +333,10 @@ struct user_driver_funcs void (*pThreadDetach)(void); }; -#endif /* __WINE_USE_MSVCRT */ +extern void __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT version ); + +#endif /* WINE_UNIX_LIB */ -struct user_driver_funcs; -extern void CDECL __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT version ); extern struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version ); extern const struct vulkan_funcs * CDECL __wine_get_vulkan_driver( UINT version );

1 0

Jacek Caban : win32u: Move NtUserDragDetect implementation from user32.
by Alexandre Julliard June 9, 2022

June 9, 2022

Module: wine Branch: master Commit: a8ed1c94b397cfb83e345ff41f37db62f91e8d5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8ed1c94b397cfb83e345ff4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 8 20:27:26 2022 +0200 win32u: Move NtUserDragDetect implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/win.c | 42 ++--------------------------------------- dlls/win32u/gdiobj.c | 1 + dlls/win32u/input.c | 45 ++++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 ++++++ include/ntuser.h | 1 + 7 files changed, 57 insertions(+), 41 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 4adffc37d6b..7b0fc884402 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1482,47 +1482,9 @@ BOOL WINAPI SetWindowContextHelpId( HWND hwnd, DWORD id ) /******************************************************************* * DragDetect (USER32.@) */ -BOOL WINAPI DragDetect( HWND hWnd, POINT pt ) +BOOL WINAPI DragDetect( HWND hwnd, POINT pt ) { - MSG msg; - RECT rect; - WORD wDragWidth, wDragHeight; - - TRACE( "%p,%s\n", hWnd, wine_dbgstr_point( &pt ) ); - - if (!(NtUserGetKeyState( VK_LBUTTON ) & 0x8000)) - return FALSE; - - wDragWidth = GetSystemMetrics(SM_CXDRAG); - wDragHeight= GetSystemMetrics(SM_CYDRAG); - SetRect(&rect, pt.x - wDragWidth, pt.y - wDragHeight, pt.x + wDragWidth, pt.y + wDragHeight); - - NtUserSetCapture( hWnd ); - - while(1) - { - while (PeekMessageW( &msg, 0, WM_MOUSEFIRST, WM_MOUSELAST, PM_REMOVE )) - { - if( msg.message == WM_LBUTTONUP ) - { - ReleaseCapture(); - return FALSE; - } - if( msg.message == WM_MOUSEMOVE ) - { - POINT tmp; - tmp.x = (short)LOWORD(msg.lParam); - tmp.y = (short)HIWORD(msg.lParam); - if( !PtInRect( &rect, tmp )) - { - ReleaseCapture(); - return TRUE; - } - } - } - WaitMessage(); - } - return FALSE; + return NtUserDragDetect( hwnd, pt.x, pt.y ); } /****************************************************************************** diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 222b74b45d6..7d9adcdec6a 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1158,6 +1158,7 @@ static struct unix_funcs unix_funcs = NtUserDestroyMenu, NtUserDestroyWindow, NtUserDispatchMessage, + NtUserDragDetect, NtUserDrawIconEx, NtUserEmptyClipboard, NtUserEnableMenuItem, diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index 2b196fb5b1d..6f0e4f45501 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -1394,6 +1394,51 @@ BOOL WINAPI NtUserTrackMouseEvent( TRACKMOUSEEVENT *info ) return TRUE; } +/******************************************************************* + * NtUserDragDetect (win32u.@) + */ +BOOL WINAPI NtUserDragDetect( HWND hwnd, int x, int y ) +{ + WORD width, height; + RECT rect; + MSG msg; + + TRACE( "%p (%d,%d)\n", hwnd, x, y ); + + if (!(NtUserGetKeyState( VK_LBUTTON ) & 0x8000)) return FALSE; + + width = get_system_metrics( SM_CXDRAG ); + height = get_system_metrics( SM_CYDRAG ); + SetRect( &rect, x - width, y - height, x + width, y + height ); + + NtUserSetCapture( hwnd ); + + for (;;) + { + while (NtUserPeekMessage( &msg, 0, WM_MOUSEFIRST, WM_MOUSELAST, PM_REMOVE )) + { + if (msg.message == WM_LBUTTONUP) + { + release_capture(); + return FALSE; + } + if (msg.message == WM_MOUSEMOVE) + { + POINT tmp; + tmp.x = (short)LOWORD( msg.lParam ); + tmp.y = (short)HIWORD( msg.lParam ); + if (!PtInRect( &rect, tmp )) + { + release_capture(); + return TRUE; + } + } + } + NtUserMsgWaitForMultipleObjectsEx( 0, NULL, INFINITE, QS_ALLINPUT, 0 ); + } + return FALSE; +} + /********************************************************************** * set_capture_window */ diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 86d359b8386..28c839f5901 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -845,7 +845,7 @@ @ stub NtUserDoSoundConnect @ stub NtUserDoSoundDisconnect @ stub NtUserDownlevelTouchpad -@ stub NtUserDragDetect +@ stdcall NtUserDragDetect(long long long) @ stub NtUserDragObject @ stub NtUserDrawAnimatedRects @ stub NtUserDrawCaption diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 2394a8850a5..e72ab8ff1d7 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -214,6 +214,7 @@ struct unix_funcs BOOL (WINAPI *pNtUserDestroyMenu)( HMENU handle ); BOOL (WINAPI *pNtUserDestroyWindow)( HWND hwnd ); LRESULT (WINAPI *pNtUserDispatchMessage)( const MSG *msg ); + BOOL (WINAPI *pNtUserDragDetect)( HWND hwnd, int x, int y ); BOOL (WINAPI *pNtUserDrawIconEx)( HDC hdc, INT x0, INT y0, HICON icon, INT width, INT height, UINT istep, HBRUSH hbr, UINT flags ); BOOL (WINAPI *pNtUserEmptyClipboard)(void); diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 679cce95b9a..e4219ed5648 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -855,6 +855,12 @@ LRESULT WINAPI NtUserDispatchMessage( const MSG *msg ) return unix_funcs->pNtUserDispatchMessage( msg ); } +BOOL WINAPI NtUserDragDetect( HWND hwnd, int x, int y ) +{ + if (!unix_funcs) return FALSE; + return unix_funcs->pNtUserDragDetect( hwnd, x, y ); +} + BOOL WINAPI NtUserDrawIconEx( HDC hdc, INT x0, INT y0, HICON icon, INT width, INT height, UINT istep, HBRUSH hbr, UINT flags ) { diff --git a/include/ntuser.h b/include/ntuser.h index 482bdbcbddd..7451d649702 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -513,6 +513,7 @@ BOOL WINAPI NtUserDestroyCursor( HCURSOR cursor, ULONG arg ); BOOL WINAPI NtUserDestroyMenu( HMENU menu ); BOOL WINAPI NtUserDestroyWindow( HWND hwnd ); LRESULT WINAPI NtUserDispatchMessage( const MSG *msg ); +BOOL WINAPI NtUserDragDetect( HWND hwnd, int x, int y ); BOOL WINAPI NtUserDrawIconEx( HDC hdc, INT x0, INT y0, HICON icon, INT width, INT height, UINT istep, HBRUSH hbr, UINT flags ); BOOL WINAPI NtUserEmptyClipboard(void);

1 0

Rémi Bernon : dinput/tests: Avoid requiring foreground window in SetCooperativeLevel tests.
by Alexandre Julliard June 9, 2022

June 9, 2022

Module: wine Branch: master Commit: 4e04c710ad4d63163e1452919eeff6e1084bca15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e04c710ad4d63163e145291… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 8 18:03:46 2022 +0200 dinput/tests: Avoid requiring foreground window in SetCooperativeLevel tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/tests/joystick8.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 070d9cc2361..e4c676c4b33 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -1252,7 +1252,6 @@ static void test_simple_joystick( DWORD version ) hwnd = CreateWindowW( L"static", L"dinput", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 10, 10, 200, 200, NULL, NULL, NULL, NULL ); - SetForegroundWindow( hwnd ); hr = IDirectInputDevice8_SetCooperativeLevel( device, hwnd, DISCL_FOREGROUND | DISCL_NONEXCLUSIVE ); ok( hr == DI_OK, "SetCooperativeLevel returned: %#lx\n", hr ); @@ -1261,6 +1260,8 @@ static void test_simple_joystick( DWORD version ) hr = IDirectInputDevice8_SetCooperativeLevel( device, hwnd, DISCL_FOREGROUND | DISCL_EXCLUSIVE ); ok( hr == DI_OK, "SetCooperativeLevel returned: %#lx\n", hr ); + hr = IDirectInputDevice8_SetCooperativeLevel( device, NULL, DISCL_BACKGROUND | DISCL_NONEXCLUSIVE ); + ok( hr == DI_OK, "SetCooperativeLevel returned: %#lx\n", hr ); hr = IDirectInputDevice8_Unacquire( device ); ok( hr == DI_NOEFFECT, "Unacquire returned: %#lx\n", hr ); hr = IDirectInputDevice8_Acquire( device );

1 0

Georg Lehmann : winevulkan: Update to VK spec version 1.3.217.
by Alexandre Julliard June 9, 2022

June 9, 2022

Module: wine Branch: master Commit: 86d893f931ad339408c4b7d99c14ef41e8a5ce09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86d893f931ad339408c4b7d9… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Thu Jun 9 14:56:25 2022 +0200 winevulkan: Update to VK spec version 1.3.217. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 3 ++- dlls/winevulkan/vulkan_thunks.c | 17 ++++++++++++++++ dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 44 +++++++++++++++++++++++++++++++++-------- 4 files changed, 56 insertions(+), 10 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index b031492fbfd..69e2f0cd256 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -64,7 +64,7 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) -VK_XML_VERSION = "1.3.215" +VK_XML_VERSION = "1.3.217" WINE_VK_VERSION = (1, 3) # Filenames to create. @@ -107,6 +107,7 @@ UNSUPPORTED_EXTENSIONS = [ # Extensions for other platforms "VK_EXT_external_memory_dma_buf", "VK_EXT_image_drm_format_modifier", + "VK_EXT_metal_objects", "VK_EXT_physical_device_drm", "VK_GOOGLE_surfaceless_query", "VK_KHR_external_fence_fd", diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 68fd1aa0449..c3df8357431 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -4954,6 +4954,22 @@ VkResult convert_VkDeviceCreateInfo_struct_chain(const void *pNext, VkDeviceCrea break; } + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_NON_SEAMLESS_CUBE_MAP_FEATURES_EXT: + { + const VkPhysicalDeviceNonSeamlessCubeMapFeaturesEXT *in = (const VkPhysicalDeviceNonSeamlessCubeMapFeaturesEXT *)in_header; + VkPhysicalDeviceNonSeamlessCubeMapFeaturesEXT *out; + + if (!(out = malloc(sizeof(*out)))) goto out_of_memory; + + out->sType = in->sType; + out->pNext = NULL; + out->nonSeamlessCubeMap = in->nonSeamlessCubeMap; + + out_header->pNext = (VkBaseOutStructure *)out; + out_header = out_header->pNext; + break; + } + default: FIXME("Application requested a linked structure of type %u.\n", in_header->sType); } @@ -9890,6 +9906,7 @@ static const char * const vk_device_extensions[] = "VK_EXT_memory_budget", "VK_EXT_memory_priority", "VK_EXT_multi_draw", + "VK_EXT_non_seamless_cube_map", "VK_EXT_pageable_device_local_memory", "VK_EXT_pci_bus_info", "VK_EXT_pipeline_creation_cache_control", diff --git a/dlls/winevulkan/winevulkan.json b/dlls/winevulkan/winevulkan.json index b0e825c6e3e..9165c08b55e 100644 --- a/dlls/winevulkan/winevulkan.json +++ b/dlls/winevulkan/winevulkan.json @@ -2,6 +2,6 @@ "file_format_version": "1.0.0", "ICD": { "library_path": ".\\winevulkan.dll", - "api_version": "1.3.215" + "api_version": "1.3.217" } } diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index 2edcf9d03cf..bf6fead4b8c 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -511,13 +511,15 @@ #define VK_KHR_MAINTENANCE_4_EXTENSION_NAME "VK_KHR_maintenance4" #define VK_VALVE_DESCRIPTOR_SET_HOST_MAPPING_SPEC_VERSION 1 #define VK_VALVE_DESCRIPTOR_SET_HOST_MAPPING_EXTENSION_NAME "VK_VALVE_descriptor_set_host_mapping" +#define VK_EXT_NON_SEAMLESS_CUBE_MAP_SPEC_VERSION 1 +#define VK_EXT_NON_SEAMLESS_CUBE_MAP_EXTENSION_NAME "VK_EXT_non_seamless_cube_map" #define VK_QCOM_FRAGMENT_DENSITY_MAP_OFFSET_SPEC_VERSION 1 #define VK_QCOM_FRAGMENT_DENSITY_MAP_OFFSET_EXTENSION_NAME "VK_QCOM_fragment_density_map_offset" #define VK_NV_LINEAR_COLOR_ATTACHMENT_SPEC_VERSION 1 #define VK_NV_LINEAR_COLOR_ATTACHMENT_EXTENSION_NAME "VK_NV_linear_color_attachment" #define VK_EXT_IMAGE_COMPRESSION_CONTROL_SWAPCHAIN_SPEC_VERSION 1 #define VK_EXT_IMAGE_COMPRESSION_CONTROL_SWAPCHAIN_EXTENSION_NAME "VK_EXT_image_compression_control_swapchain" -#define VK_EXT_SUBPASS_MERGE_FEEDBACK_SPEC_VERSION 1 +#define VK_EXT_SUBPASS_MERGE_FEEDBACK_SPEC_VERSION 2 #define VK_EXT_SUBPASS_MERGE_FEEDBACK_EXTENSION_NAME "VK_EXT_subpass_merge_feedback" #define VK_KHR_ACCELERATION_STRUCTURE_SPEC_VERSION 13 #define VK_KHR_ACCELERATION_STRUCTURE_EXTENSION_NAME "VK_KHR_acceleration_structure" @@ -541,7 +543,7 @@ #define VK_API_VERSION_1_1 VK_MAKE_API_VERSION(0, 1, 1, 0) #define VK_API_VERSION_1_2 VK_MAKE_API_VERSION(0, 1, 2, 0) #define VK_API_VERSION_1_3 VK_MAKE_API_VERSION(0, 1, 3, 0) -#define VK_HEADER_VERSION 215 +#define VK_HEADER_VERSION 217 #define VK_HEADER_VERSION_COMPLETE VK_MAKE_API_VERSION(0, 1, 3, VK_HEADER_VERSION) #define VK_DEFINE_HANDLE(object) typedef struct object##_T* object; #define VK_USE_64_BIT_PTR_DEFINES 0 @@ -615,6 +617,12 @@ VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkValidationCacheEXT) struct AHardwareBuffer; struct ANativeWindow; struct CAMetalLayer; +struct IOSurfaceRef; +struct MTLBuffer_id; +struct MTLCommandQueue_id; +struct MTLDevice_id; +struct MTLSharedEvent_id; +struct MTLTexture_id; typedef uint32_t VkBool32; typedef uint64_t VkDeviceAddress; typedef uint64_t VkDeviceSize; @@ -670,6 +678,7 @@ typedef VkFlags VkDisplayModeCreateFlagsKHR; typedef VkFlags VkDisplayPlaneAlphaFlagsKHR; typedef VkFlags VkDisplaySurfaceCreateFlagsKHR; typedef VkFlags VkEventCreateFlags; +typedef VkFlags VkExportMetalObjectTypeFlagsEXT; typedef VkFlags VkExternalFenceFeatureFlags; typedef VkExternalFenceFeatureFlags VkExternalFenceFeatureFlagsKHR; typedef VkFlags VkExternalFenceHandleTypeFlags; @@ -3154,6 +3163,7 @@ typedef enum VkSamplerCreateFlagBits { VK_SAMPLER_CREATE_SUBSAMPLED_BIT_EXT = 0x00000001, VK_SAMPLER_CREATE_SUBSAMPLED_COARSE_RECONSTRUCTION_BIT_EXT = 0x00000002, + VK_SAMPLER_CREATE_NON_SEAMLESS_CUBE_MAP_BIT_EXT = 0x00000004, VK_SAMPLER_CREATE_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkSamplerCreateFlagBits; @@ -3850,6 +3860,7 @@ typedef enum VkStructureType VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_SET_HOST_MAPPING_FEATURES_VALVE = 1000420000, VK_STRUCTURE_TYPE_DESCRIPTOR_SET_BINDING_REFERENCE_VALVE = 1000420001, VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_HOST_MAPPING_INFO_VALVE = 1000420002, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_NON_SEAMLESS_CUBE_MAP_FEATURES_EXT = 1000422000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_FEATURES_QCOM = 1000425000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_PROPERTIES_QCOM = 1000425001, VK_STRUCTURE_TYPE_SUBPASS_FRAGMENT_DENSITY_MAP_OFFSET_END_INFO_QCOM = 1000425002, @@ -3857,8 +3868,8 @@ typedef enum VkStructureType VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_COMPRESSION_CONTROL_SWAPCHAIN_FEATURES_EXT = 1000437000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBPASS_MERGE_FEEDBACK_FEATURES_EXT = 1000458000, VK_STRUCTURE_TYPE_RENDER_PASS_CREATION_CONTROL_EXT = 1000458001, - VK_STRUCTURE_TYPE_RENDER_PASS_CREATION_FEEDBACK_INFO_EXT = 1000458002, - VK_STRUCTURE_TYPE_RENDER_PASS_SUBPASS_FEEDBACK_INFO_EXT = 1000458003, + VK_STRUCTURE_TYPE_RENDER_PASS_CREATION_FEEDBACK_CREATE_INFO_EXT = 1000458002, + VK_STRUCTURE_TYPE_RENDER_PASS_SUBPASS_FEEDBACK_CREATE_INFO_EXT = 1000458003, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTER_FEATURES = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DRAW_PARAMETER_FEATURES = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DRAW_PARAMETERS_FEATURES, VK_STRUCTURE_TYPE_DEBUG_REPORT_CREATE_INFO_EXT = VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT, @@ -7059,6 +7070,13 @@ typedef struct VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE VkBool32 mutableDescriptorType; } VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE; +typedef struct VkPhysicalDeviceNonSeamlessCubeMapFeaturesEXT +{ + VkStructureType sType; + void *pNext; + VkBool32 nonSeamlessCubeMap; +} VkPhysicalDeviceNonSeamlessCubeMapFeaturesEXT; + typedef struct VkPhysicalDevicePCIBusInfoPropertiesEXT { VkStructureType sType; @@ -8577,8 +8595,6 @@ typedef struct VkRenderPassCreationControlEXT typedef struct VkRenderPassCreationFeedbackInfoEXT { - VkStructureType sType; - const void *pNext; uint32_t postMergeSubpassCount; } VkRenderPassCreationFeedbackInfoEXT; @@ -8613,8 +8629,6 @@ typedef VkRenderPassMultiviewCreateInfo VkRenderPassMultiviewCreateInfoKHR; typedef struct VkRenderPassSubpassFeedbackInfoEXT { - VkStructureType sType; - const void *pNext; VkSubpassMergeStatusEXT subpassMergeStatus; char description[VK_MAX_DESCRIPTION_SIZE]; uint32_t postMergeIndex; @@ -9953,6 +9967,13 @@ typedef struct VkRenderPassCreateInfo2 } VkRenderPassCreateInfo2; typedef VkRenderPassCreateInfo2 VkRenderPassCreateInfo2KHR; +typedef struct VkRenderPassCreationFeedbackCreateInfoEXT +{ + VkStructureType sType; + const void *pNext; + VkRenderPassCreationFeedbackInfoEXT *pRenderPassFeedback; +} VkRenderPassCreationFeedbackCreateInfoEXT; + typedef struct VkRenderPassSampleLocationsBeginInfoEXT { VkStructureType sType; @@ -9963,6 +9984,13 @@ typedef struct VkRenderPassSampleLocationsBeginInfoEXT const VkSubpassSampleLocationsEXT *pPostSubpassSampleLocations; } VkRenderPassSampleLocationsBeginInfoEXT; +typedef struct VkRenderPassSubpassFeedbackCreateInfoEXT +{ + VkStructureType sType; + const void *pNext; + VkRenderPassSubpassFeedbackInfoEXT *pSubpassFeedback; +} VkRenderPassSubpassFeedbackCreateInfoEXT; + typedef struct VkResolveImageInfo2 { VkStructureType sType;

1 0

Jacek Caban : win32u: Move SC_SIZE and SC_MOVE handling from user32.
by Alexandre Julliard June 9, 2022

June 9, 2022

Module: wine Branch: master Commit: 61ad0b844d07c7f9f398b96b0ff049a19560079e URL: https://source.winehq.org/git/wine.git/?a=commit;h=61ad0b844d07c7f9f398b96b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 8 21:25:00 2022 +0200 win32u: Move SC_SIZE and SC_MOVE handling from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/nonclient.c | 5 - dlls/user32/win.h | 1 - dlls/user32/winpos.c | 406 ---------------------------------------- dlls/win32u/dc.c | 10 + dlls/win32u/defwnd.c | 437 +++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/win32u_private.h | 2 + dlls/win32u/window.c | 8 +- include/ntgdi.h | 2 + include/ntuser.h | 8 - 9 files changed, 453 insertions(+), 426 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=61ad0b844d07c7f9f398…

1 0

Paul Gofman : winhttp: Introduce netconn_wait_overlapped_result() helper.
by Alexandre Julliard June 9, 2022

June 9, 2022

Module: wine Branch: master Commit: dae64e2db5124459ff839069c17d5e2c8e2df99c URL: https://source.winehq.org/git/wine.git/?a=commit;h=dae64e2db5124459ff839069… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jun 8 11:32:04 2022 -0500 winhttp: Introduce netconn_wait_overlapped_result() helper. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/winhttp/net.c | 7 +++++++ dlls/winhttp/request.c | 4 ++-- dlls/winhttp/winhttp_private.h | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 17520a54f63..a17582c90a6 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -51,6 +51,13 @@ static int sock_send(int fd, const void *msg, size_t len, WSAOVERLAPPED *ovr) return -1; } +BOOL netconn_wait_overlapped_result( struct netconn *conn, WSAOVERLAPPED *ovr, DWORD *len ) +{ + DWORD retflags; + + return WSAGetOverlappedResult( conn->socket, ovr, len, TRUE, &retflags ); +} + static int sock_recv(int fd, void *msg, size_t len, int flags) { int ret; diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 2754dc29163..7fb582362aa 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3336,9 +3336,9 @@ static DWORD send_frame( struct socket *socket, enum socket_opcode opcode, USHOR static DWORD complete_send_frame( struct socket *socket, WSAOVERLAPPED *ovr, const char *buf ) { - DWORD ret, retflags, len, i; + DWORD ret, len, i; - if (!WSAGetOverlappedResult( socket->request->netconn->socket, ovr, &len, TRUE, &retflags )) + if (!netconn_wait_overlapped_result( socket->request->netconn, ovr, &len )) return WSAGetLastError(); if (socket->bytes_in_send_frame_buffer) diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 98e05f068ba..6c381af627f 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -371,6 +371,7 @@ DWORD netconn_recv( struct netconn *, void *, size_t, int, int * ) DECLSPEC_HIDD DWORD netconn_resolve( WCHAR *, INTERNET_PORT, struct sockaddr_storage *, int ) DECLSPEC_HIDDEN; DWORD netconn_secure_connect( struct netconn *, WCHAR *, DWORD, CredHandle *, BOOL ) DECLSPEC_HIDDEN; DWORD netconn_send( struct netconn *, const void *, size_t, int *, WSAOVERLAPPED * ) DECLSPEC_HIDDEN; +BOOL netconn_wait_overlapped_result( struct netconn *conn, WSAOVERLAPPED *ovr, DWORD *len ) DECLSPEC_HIDDEN; void netconn_cancel_io( struct netconn *conn ) DECLSPEC_HIDDEN; DWORD netconn_set_timeout( struct netconn *, BOOL, int ) DECLSPEC_HIDDEN; BOOL netconn_is_alive( struct netconn * ) DECLSPEC_HIDDEN;

1 0

Rémi Bernon : dinput/tests: Merge device.c tests into device8.c.
by Alexandre Julliard June 9, 2022

June 9, 2022

Module: wine Branch: master Commit: a53298f4d0c847fd429c3ace48d8d3f387ca1a39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a53298f4d0c847fd429c3ace… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 2 14:04:45 2022 +0200 dinput/tests: Merge device.c tests into device8.c. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/tests/Makefile.in | 1 - dlls/dinput/tests/device.c | 533 ------------------------------------------ dlls/dinput/tests/device8.c | 372 ++++++++++++++++++++++++++++- 3 files changed, 361 insertions(+), 545 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a53298f4d0c847fd429c…

1 0