- Wine-Commits - list.winehq.org

Mohamad Al-Jaf : d3d12core: Add stub DLL.
by Alexandre Julliard Feb. 10, 2023

Feb. 10, 2023

Module: wine Branch: master Commit: 9acf1bd6a85a02da201a018e1b3e586ac74ec8d6 URL: https://gitlab.winehq.org/wine/wine/-/commit/9acf1bd6a85a02da201a018e1b3e58… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Jan 26 18:43:05 2023 -0500 d3d12core: Add stub DLL. Forspoken checks for the existence of this DLL. --- MAINTAINERS | 1 + configure | 2 ++ configure.ac | 1 + dlls/d3d12core/Makefile.in | 1 + dlls/d3d12core/d3d12core.spec | 2 ++ 5 files changed, 7 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 8c30f8c6d1d..50f75e04e6f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -72,6 +72,7 @@ P: Matteo Bruni <mbruni(a)codeweavers.com> F: dlls/d3d10core/ F: dlls/d3d11/ F: dlls/d3d12/ +F: dlls/d3d12core/ F: dlls/d3d8/ F: dlls/d3d9/ F: dlls/d3drm/ diff --git a/configure b/configure index 25bffe3c8eb..caa0f30a71c 100755 --- a/configure +++ b/configure @@ -1015,6 +1015,7 @@ enable_d3d10_1 enable_d3d10core enable_d3d11 enable_d3d12 +enable_d3d12core enable_d3d8 enable_d3d8thk enable_d3d9 @@ -21062,6 +21063,7 @@ wine_fn_config_makefile dlls/d3d11 enable_d3d11 wine_fn_config_makefile dlls/d3d11/tests enable_tests wine_fn_config_makefile dlls/d3d12 enable_d3d12 wine_fn_config_makefile dlls/d3d12/tests enable_tests +wine_fn_config_makefile dlls/d3d12core enable_d3d12core wine_fn_config_makefile dlls/d3d8 enable_d3d8 wine_fn_config_makefile dlls/d3d8/tests enable_tests wine_fn_config_makefile dlls/d3d8thk enable_d3d8thk diff --git a/configure.ac b/configure.ac index 8a6d21702cc..09cbf7533c3 100644 --- a/configure.ac +++ b/configure.ac @@ -2432,6 +2432,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3d11) WINE_CONFIG_MAKEFILE(dlls/d3d11/tests) WINE_CONFIG_MAKEFILE(dlls/d3d12) WINE_CONFIG_MAKEFILE(dlls/d3d12/tests) +WINE_CONFIG_MAKEFILE(dlls/d3d12core) WINE_CONFIG_MAKEFILE(dlls/d3d8) WINE_CONFIG_MAKEFILE(dlls/d3d8/tests) WINE_CONFIG_MAKEFILE(dlls/d3d8thk) diff --git a/dlls/d3d12core/Makefile.in b/dlls/d3d12core/Makefile.in new file mode 100644 index 00000000000..8778b66138b --- /dev/null +++ b/dlls/d3d12core/Makefile.in @@ -0,0 +1 @@ +MODULE = d3d12core.dll diff --git a/dlls/d3d12core/d3d12core.spec b/dlls/d3d12core/d3d12core.spec new file mode 100644 index 00000000000..c9c73bd4ee4 --- /dev/null +++ b/dlls/d3d12core/d3d12core.spec @@ -0,0 +1,2 @@ +@ stub D3D12GetInterface +@ stub D3D12SDKVersion

1 0

Mohamad Al-Jaf : include: Add DirectX 12 Agility SDK definitions.
by Alexandre Julliard Feb. 10, 2023

Feb. 10, 2023

Module: wine Branch: master Commit: 83625459c8227b0bd7b86c18946a35d3a806c80d URL: https://gitlab.winehq.org/wine/wine/-/commit/83625459c8227b0bd7b86c18946a35… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Tue Jan 31 02:22:12 2023 -0500 include: Add DirectX 12 Agility SDK definitions. --- include/d3d12.idl | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/include/d3d12.idl b/include/d3d12.idl index 082a436c9ec..816ff283ee8 100644 --- a/include/d3d12.idl +++ b/include/d3d12.idl @@ -66,6 +66,7 @@ const UINT D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT = 256; const UINT D3D12_DEFAULT_MSAA_RESOURCE_PLACEMENT_ALIGNMENT = 4194304; const UINT D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT = 65536; const UINT D3D12_RAW_UAV_SRV_BYTE_ALIGNMENT = 16; +const UINT D3D12_SDK_VERSION = 4; const UINT D3D12_SMALL_MSAA_RESOURCE_PLACEMENT_ALIGNMENT = 65536; const UINT D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT = 4096; const UINT D3D12_STANDARD_MAXIMUM_ELEMENT_ALIGNMENT_BYTE_MULTIPLE = 4; @@ -2589,3 +2590,55 @@ typedef HRESULT (__stdcall *PFN_D3D12_GET_DEBUG_INTERFACE)(REFIID iid, void **de [local] HRESULT __stdcall D3D12EnableExperimentalFeatures(UINT feature_count, const IID *iids, void *configurations, UINT *configurations_sizes); + +cpp_quote("DEFINE_GUID(CLSID_D3D12Debug, 0xf2352aeb, 0xdd84, 0x49fe, 0xb9, 0x7b, 0xa9, 0xdc, 0xfd, 0xcc, 0x1b, 0x4f);") +cpp_quote("DEFINE_GUID(CLSID_D3D12Tools, 0xe38216b1, 0x3c8c, 0x4833, 0xaa, 0x09, 0x0a, 0x06, 0xb6, 0x5d, 0x96, 0xc8);") +cpp_quote("DEFINE_GUID(CLSID_D3D12DeviceRemovedExtendedData, 0x4a75bbc4, 0x9ff4, 0x4ad8, 0x9f, 0x18, 0xab, 0xae, 0x84, 0xdc, 0x5f, 0xf2);") +cpp_quote("DEFINE_GUID(CLSID_D3D12SDKConfiguration, 0x7cda6aca, 0xa03e, 0x49c8, 0x94, 0x58, 0x03, 0x34, 0xd2, 0x0e, 0x07, 0xce);") + +typedef enum D3D12_DRED_ENABLEMENT +{ + D3D12_DRED_ENABLEMENT_SYSTEM_CONTROLLED = 0, + D3D12_DRED_ENABLEMENT_FORCED_OFF = 1, + D3D12_DRED_ENABLEMENT_FORCED_ON = 2, +} D3D12_DRED_ENABLEMENT; + +typedef HRESULT (__stdcall *PFN_D3D12_GET_INTERFACE)(REFCLSID clsid, REFIID iid, void **debug); + +[local] HRESULT __stdcall D3D12GetInterface(REFCLSID clsid, REFIID iid, void **debug); + +[ + uuid(7071e1f0-e84b-4b33-974f-12fa49de65c5), + object, + local, + pointer_default(unique) +] +interface ID3D12Tools : IUnknown +{ + void EnableShaderInstrumentation(BOOL enable); + BOOL ShaderInstrumentationEnabled(); +} + +[ + uuid(82bc481c-6b9b-4030-aedb-7ee3d1df1e63), + object, + local, + pointer_default(unique) +] +interface ID3D12DeviceRemovedExtendedDataSettings : IUnknown +{ + void SetAutoBreadcrumbsEnablement(D3D12_DRED_ENABLEMENT enablement); + void SetPageFaultEnablement(D3D12_DRED_ENABLEMENT enablement); + void SetWatsonDumpEnablement(D3D12_DRED_ENABLEMENT enablement); +}; + +[ + uuid(e9eb5314-33aa-42b2-a718-d77f58b1f1c7), + object, + local, + pointer_default(unique) +] +interface ID3D12SDKConfiguration : IUnknown +{ + HRESULT SetSDKVersion(UINT version, const char *path); +}

1 0

Zebediah Figura : user32/tests: Add a register_class() helper.
by Alexandre Julliard Feb. 10, 2023

Feb. 10, 2023

Module: wine Branch: master Commit: 77efd7ac5a87ff20719c0d011d5b800111ecea79 URL: https://gitlab.winehq.org/wine/wine/-/commit/77efd7ac5a87ff20719c0d011d5b80… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 5 20:07:04 2023 -0600 user32/tests: Add a register_class() helper. --- dlls/user32/tests/msg.c | 80 +++++++++++++++++++++++++------------------------ 1 file changed, 41 insertions(+), 39 deletions(-)

1 0

Alex Henrie : services: Avoid calling RtlInitUnicodeString on a static constant.
by Alexandre Julliard Feb. 10, 2023

Feb. 10, 2023

Module: wine Branch: master Commit: dccc6a60b67db35c3cdc6333aa0146a5ab4bae2c URL: https://gitlab.winehq.org/wine/wine/-/commit/dccc6a60b67db35c3cdc6333aa0146… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Feb 9 23:04:17 2023 -0700 services: Avoid calling RtlInitUnicodeString on a static constant. --- programs/services/services.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index 6bda0a4008b..8a3ff754329 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -1074,9 +1074,9 @@ found: CreateEnvironmentBlock(&environment, token, FALSE); if (GetEnvironmentVariableW( L"WINEBOOTSTRAPMODE", val, ARRAY_SIZE(val) )) { - UNICODE_STRING name, value; + UNICODE_STRING name = RTL_CONSTANT_STRING(L"WINEBOOTSTRAPMODE"); + UNICODE_STRING value; - RtlInitUnicodeString( &name, L"WINEBOOTSTRAPMODE" ); RtlInitUnicodeString( &value, val ); RtlSetEnvironmentVariable( (WCHAR **)&environment, &name, &value ); }

1 0

Zebediah Figura : user32/tests: Use ok() instead of assert().
by Alexandre Julliard Feb. 10, 2023

Feb. 10, 2023

Module: wine Branch: master Commit: 366b84295d27b363a698f4a8e6779c0f09606b7e URL: https://gitlab.winehq.org/wine/wine/-/commit/366b84295d27b363a698f4a8e6779c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 5 20:14:34 2023 -0600 user32/tests: Use ok() instead of assert(). --- dlls/user32/tests/msg.c | 108 ++++++++++++++++++++++++++---------------------- 1 file changed, 59 insertions(+), 49 deletions(-)

1 0

Zebediah Figura : user32/tests: Test WM_DEVICECHANGE Unicode conversion.
by Alexandre Julliard Feb. 10, 2023

Feb. 10, 2023

Module: wine Branch: master Commit: 8675cad31c66b6620150a897545f705c1d17a59f URL: https://gitlab.winehq.org/wine/wine/-/commit/8675cad31c66b6620150a897545f70… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 5 20:23:08 2023 -0600 user32/tests: Test WM_DEVICECHANGE Unicode conversion. --- dlls/user32/tests/msg.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 268ed9d8b8f..cca211cc22a 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -22,6 +22,7 @@ #include <limits.h> #include <stdarg.h> +#include <stdbool.h> #include <stdio.h> #include "windef.h" @@ -11038,8 +11039,14 @@ static void CALLBACK win_event_proc(HWINEVENTHOOK hevent, static const WCHAR wszUnicode[] = {'U','n','i','c','o','d','e',0}; static const WCHAR wszAnsi[] = {'U',0}; +static const GUID iface_guid = {0x66666666}; +static bool got_device_broadcast; + static LRESULT CALLBACK MsgConversionProcW(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { + const DEV_BROADCAST_DEVICEINTERFACE_A *ifaceA = (const void *)lParam; + const DEV_BROADCAST_DEVICEINTERFACE_W *ifaceW = (const void *)lParam; + switch (uMsg) { case CB_FINDSTRINGEXACT: @@ -11048,6 +11055,30 @@ static LRESULT CALLBACK MsgConversionProcW(HWND hwnd, UINT uMsg, WPARAM wParam, if (!lstrcmpW((LPCWSTR)lParam, wszAnsi)) return 0; return -1; + + case WM_DEVICECHANGE: + if (wParam == DBT_DEVICEARRIVAL && IsEqualGUID(&ifaceA->dbcc_classguid, &iface_guid)) + { + DWORD expect_size = offsetof(DEV_BROADCAST_DEVICEINTERFACE_A, dbcc_name[strlen(ifaceA->dbcc_name)]); + + ok(ifaceA->dbcc_size == expect_size, "Expected %lu, got %lu.\n", expect_size, ifaceA->dbcc_size); + ok(ifaceA->dbcc_devicetype == DBT_DEVTYP_DEVICEINTERFACE, + "Got notification type %#lx.\n", ifaceA->dbcc_devicetype); + ok(!ifaceA->dbcc_reserved, "Got reserved %#lx.\n", ifaceA->dbcc_reserved); + ok(!strcmp(ifaceA->dbcc_name, "test name"), "Got name %s.\n", debugstr_a(ifaceA->dbcc_name)); + return 2; + } + else if (wParam == DBT_CUSTOMEVENT && IsEqualGUID(&ifaceA->dbcc_classguid, &iface_guid)) + { + DWORD expect_size = offsetof(DEV_BROADCAST_DEVICEINTERFACE_W, dbcc_name[wcslen(ifaceW->dbcc_name) + 1]); + + ok(ifaceW->dbcc_size == expect_size, "Expected %lu, got %lu.\n", expect_size, ifaceW->dbcc_size); + ok(ifaceW->dbcc_devicetype == DBT_DEVTYP_DEVICEINTERFACE, + "Got notification type %#lx.\n", ifaceW->dbcc_devicetype); + ok(!ifaceW->dbcc_reserved, "Got reserved %#lx.\n", ifaceW->dbcc_reserved); + ok(!wcscmp(ifaceW->dbcc_name, L"test name"), "Got name %s.\n", debugstr_w(ifaceW->dbcc_name)); + got_device_broadcast = true; + } } return DefWindowProcW(hwnd, uMsg, wParam, lParam); } @@ -11079,6 +11110,8 @@ static void test_message_conversion(void) { static const WCHAR wszMsgConversionClass[] = {'M','s','g','C','o','n','v','e','r','s','i','o','n','C','l','a','s','s',0}; + char buffer[200]; + DEV_BROADCAST_DEVICEINTERFACE_A *dev_interface = (void *)buffer; WNDCLASSW cls; LRESULT lRes; HWND hwnd; @@ -11161,6 +11194,20 @@ static void test_message_conversion(void) ok(lRes == 0 && (GetLastError() == ERROR_MESSAGE_SYNC_ONLY || GetLastError() == ERROR_INVALID_PARAMETER), "SendMessageCallback on sync only message returned %Id, last error %ld\n", lRes, GetLastError()); + /* Test WM_DEVICECHANGE. */ + + dev_interface->dbcc_devicetype = DBT_DEVTYP_DEVICEINTERFACE; + dev_interface->dbcc_reserved = 0; + dev_interface->dbcc_classguid = iface_guid; + strcpy(dev_interface->dbcc_name, "test name"); + dev_interface->dbcc_size = offsetof(DEV_BROADCAST_DEVICEINTERFACE_A, + dbcc_name[strlen(dev_interface->dbcc_name)]); + lRes = SendMessageA(hwnd, WM_DEVICECHANGE, DBT_DEVICEARRIVAL, (LPARAM)dev_interface); + ok(lRes == 2, "Got %Id, error %lu.\n", lRes, GetLastError()); + lRes = BroadcastSystemMessageA(0, NULL, WM_DEVICECHANGE, DBT_CUSTOMEVENT, (LPARAM)dev_interface); + todo_wine ok(!lRes, "Got %Id, error %lu.\n", lRes, GetLastError()); + todo_wine ok(got_device_broadcast, "Device broadcast was not received.\n"); + DestroyWindow(hwnd); /* Check WM_GETTEXTLENGTH A->W behaviour, whether WM_GETTEXT is also sent or not */

1 0

Zebediah Figura : user32/tests: Avoid leaking a window in test_message_conversion().
by Alexandre Julliard Feb. 10, 2023

Feb. 10, 2023

Module: wine Branch: master Commit: ea2935add7936472ba091a9f39889ab42d3ae1d3 URL: https://gitlab.winehq.org/wine/wine/-/commit/ea2935add7936472ba091a9f39889a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 5 20:22:33 2023 -0600 user32/tests: Avoid leaking a window in test_message_conversion(). --- dlls/user32/tests/msg.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index e4174ebff2b..268ed9d8b8f 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -11161,6 +11161,8 @@ static void test_message_conversion(void) ok(lRes == 0 && (GetLastError() == ERROR_MESSAGE_SYNC_ONLY || GetLastError() == ERROR_INVALID_PARAMETER), "SendMessageCallback on sync only message returned %Id, last error %ld\n", lRes, GetLastError()); + DestroyWindow(hwnd); + /* Check WM_GETTEXTLENGTH A->W behaviour, whether WM_GETTEXT is also sent or not */ hwnd = CreateWindowW (testWindowClassW, wszUnicode,

1 0

Alex Henrie : http: Avoid calling RtlInitUnicodeString on a constant.
by Alexandre Julliard Feb. 10, 2023

Feb. 10, 2023

Module: wine Branch: master Commit: 51bc735f7013b50e9b6bb55d9c2e131b657b7e11 URL: https://gitlab.winehq.org/wine/wine/-/commit/51bc735f7013b50e9b6bb55d9c2e13… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Feb 8 21:23:01 2023 -0700 http: Avoid calling RtlInitUnicodeString on a constant. --- dlls/http.sys/http.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index 680ef30730c..c2234aa14ad 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -1199,19 +1199,18 @@ static void WINAPI unload(DRIVER_OBJECT *driver) NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) { OBJECT_ATTRIBUTES attr = {sizeof(attr)}; - UNICODE_STRING string; + UNICODE_STRING device_http = RTL_CONSTANT_STRING(L"\\Device\\Http"); + UNICODE_STRING device_http_req_queue = RTL_CONSTANT_STRING(L"\\Device\\Http\\ReqQueue"); WSADATA wsadata; NTSTATUS ret; TRACE("driver %p, path %s.\n", driver, debugstr_w(path->Buffer)); - RtlInitUnicodeString(&string, L"\\Device\\Http"); - attr.ObjectName = &string; + attr.ObjectName = &device_http; if ((ret = NtCreateDirectoryObject(&directory_obj, 0, &attr)) && ret != STATUS_OBJECT_NAME_COLLISION) ERR("Failed to create \\Device\\Http directory, status %#lx.\n", ret); - RtlInitUnicodeString(&string, L"\\Device\\Http\\ReqQueue"); - if ((ret = IoCreateDevice(driver, 0, &string, FILE_DEVICE_UNKNOWN, 0, FALSE, &device_obj))) + if ((ret = IoCreateDevice(driver, 0, &device_http_req_queue, FILE_DEVICE_UNKNOWN, 0, FALSE, &device_obj))) { ERR("Failed to create request queue device, status %#lx.\n", ret); NtClose(directory_obj);

1 0

Alexandre Julliard : wow64: Preserve the CPURESERVED flags across user callbacks.
by Alexandre Julliard Feb. 10, 2023

Feb. 10, 2023

Module: wine Branch: master Commit: 51c3cfddfe03fa35ab21aeac6230c28d877b20f1 URL: https://gitlab.winehq.org/wine/wine/-/commit/51c3cfddfe03fa35ab21aeac6230c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 10 13:55:54 2023 +0100 wow64: Preserve the CPURESERVED flags across user callbacks. --- dlls/wow64/syscall.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 41860aeb281..d2242134819 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -1044,9 +1044,11 @@ void WINAPI Wow64ApcRoutine( ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, CON NTSTATUS WINAPI Wow64KiUserCallbackDispatcher( ULONG id, void *args, ULONG len, void **ret_ptr, ULONG *ret_len ) { + WOW64_CPURESERVED *cpu = NtCurrentTeb()->TlsSlots[WOW64_TLS_CPURESERVED]; TEB32 *teb32 = (TEB32 *)((char *)NtCurrentTeb() + NtCurrentTeb()->WowTebOffset); ULONG teb_frame = teb32->Tib.ExceptionList; struct user_callback_frame frame; + USHORT flags = cpu->Flags; frame.prev_frame = NtCurrentTeb()->TlsSlots[WOW64_TLS_USERCALLBACKDATA]; frame.temp_list = NtCurrentTeb()->TlsSlots[WOW64_TLS_TEMPLIST]; @@ -1115,6 +1117,7 @@ NTSTATUS WINAPI Wow64KiUserCallbackDispatcher( ULONG id, void *args, ULONG len, teb32->Tib.ExceptionList = teb_frame; NtCurrentTeb()->TlsSlots[WOW64_TLS_USERCALLBACKDATA] = frame.prev_frame; NtCurrentTeb()->TlsSlots[WOW64_TLS_TEMPLIST] = frame.temp_list; + cpu->Flags = flags; return frame.status; }

1 0

Alexandre Julliard : wow64: Call the CPU backend to get/set the current thread context.
by Alexandre Julliard Feb. 10, 2023

Feb. 10, 2023

Module: wine Branch: master Commit: f555ee3b0380acbf5a098ef224e54e7e1d664e7b URL: https://gitlab.winehq.org/wine/wine/-/commit/f555ee3b0380acbf5a098ef224e54e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 10 12:55:36 2023 +0100 wow64: Call the CPU backend to get/set the current thread context. --- dlls/wow64/syscall.c | 100 +++++++++++++++++++++++---------------------------- dlls/wow64cpu/cpu.c | 4 +-- 2 files changed, 47 insertions(+), 57 deletions(-)

1 0