- Wine-Commits - list.winehq.org

Rémi Bernon : win32u: Check GUID_NULL display device if desktop atom is missing.
by Alexandre Julliard March 3, 2023

March 3, 2023

Module: wine Branch: master Commit: 9c22a5ea63c6be01e257f05bbed23e03d5a7f407 URL: https://gitlab.winehq.org/wine/wine/-/commit/9c22a5ea63c6be01e257f05bbed23e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 3 09:30:37 2023 +0100 win32u: Check GUID_NULL display device if desktop atom is missing. When using nulldrv, there's no module to call __wine_set_user_driver and the user driver is still lazy_load_driver when get_display_driver gets called during desktop windows creation. Then, load_desktop_driver fails as it cannot find the not-yet-created desktop window atom, and fails later explorer.exe window creations such as the systray window. Other processes don't suffer from this as they wait for the desktop window to be fully created, and its atom will be eventually set. This change makes sure that we succeed in the case nulldrv was selected by explorer.exe, while still failing in case of error with another user driver as it would fail to open the right display device GUID. --- dlls/win32u/driver.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 3f676dc5796..eb736de272d 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -923,6 +923,8 @@ static const WCHAR guid_key_suffixW[] = {'}','\\','0','0','0','0'}; static BOOL load_desktop_driver( HWND hwnd ) { + static const WCHAR guid_nullW[] = {'0','0','0','0','0','0','0','0','-','0','0','0','0','-','0','0','0','0','-', + '0','0','0','0','-','0','0','0','0','0','0','0','0','0','0','0','0',0}; WCHAR key[ARRAYSIZE(guid_key_prefixW) + 40 + ARRAYSIZE(guid_key_suffixW)], *ptr; char buf[4096]; KEY_VALUE_PARTIAL_INFORMATION *info = (void *)buf; @@ -946,9 +948,15 @@ static BOOL load_desktop_driver( HWND hwnd ) memcpy( key, guid_key_prefixW, sizeof(guid_key_prefixW) ); ptr = key + ARRAYSIZE(guid_key_prefixW); if (NtQueryInformationAtom( guid_atom, AtomBasicInformation, buf, sizeof(buf), NULL )) - return FALSE; - memcpy( ptr, abi->Name, abi->NameLength ); - ptr += abi->NameLength / sizeof(WCHAR); + { + wcscpy( ptr, guid_nullW ); + ptr += ARRAY_SIZE(guid_nullW) - 1; + } + else + { + memcpy( ptr, abi->Name, abi->NameLength ); + ptr += abi->NameLength / sizeof(WCHAR); + } memcpy( ptr, guid_key_suffixW, sizeof(guid_key_suffixW) ); ptr += ARRAY_SIZE(guid_key_suffixW);

1 0

Rémi Bernon : win32u: Map VK_MENU / KBDALT in kbdus_tables pCharModifiers.
by Alexandre Julliard March 3, 2023

March 3, 2023

Module: wine Branch: master Commit: 2a6b80b508c6fd983729835a3d5c10f87a49f55b URL: https://gitlab.winehq.org/wine/wine/-/commit/2a6b80b508c6fd983729835a3d5c10… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 3 09:59:51 2023 +0100 win32u: Map VK_MENU / KBDALT in kbdus_tables pCharModifiers. --- dlls/win32u/input.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index f768453594f..d7e502a4513 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -135,8 +135,8 @@ static const VK_TO_BIT vk_to_bit[] = static const MODIFIERS modifiers = { .pVkToBit = (VK_TO_BIT *)vk_to_bit, - .wMaxModBits = 3, - .ModNumber = {0, 1, 2, 3}, + .wMaxModBits = 7, + .ModNumber = {0, 1, 2, 3, 0, 1, 0, 0}, }; static const VK_TO_WCHARS2 vk_to_wchars2[] =

1 0

Rémi Bernon : user32/tests: Test VK_MENU effect on ToUnicode.
by Alexandre Julliard March 3, 2023

March 3, 2023

Module: wine Branch: master Commit: 3785dd1f37534777a0e20f162aee3d5d2e82eb3a URL: https://gitlab.winehq.org/wine/wine/-/commit/3785dd1f37534777a0e20f162aee3d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 3 10:04:07 2023 +0100 user32/tests: Test VK_MENU effect on ToUnicode. --- dlls/user32/tests/input.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index be41078bf29..c534880679a 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -3042,6 +3042,7 @@ static void test_key_map(void) #define shift 1 #define ctrl 2 +#define menu 4 static const struct tounicode_tests { @@ -3054,6 +3055,9 @@ static const struct tounicode_tests { { 0, 0, 'a', 1, {'a',0}}, { 0, shift, 'a', 1, {'A',0}}, + { 0, menu, 'a', 1, {'a',0}}, + { 0, shift|menu, 'a', 1, {'A',0}}, + { 0, shift|ctrl|menu, 'a', 0, {}}, { 0, ctrl, 'a', 1, {1, 0}}, { 0, shift|ctrl, 'a', 1, {1, 0}}, { VK_TAB, ctrl, 0, 0, {}}, @@ -3142,6 +3146,7 @@ static void test_ToUnicode(void) state[VK_SHIFT] = state[VK_LSHIFT] = (mod & shift) ? HIGHEST_BIT : 0; state[VK_CONTROL] = state[VK_LCONTROL] = (mod & ctrl) ? HIGHEST_BIT : 0; + state[VK_MENU] = state[VK_LMENU] = (mod & menu) ? HIGHEST_BIT : 0; ret = ToUnicode(vk, scan, state, wStr, 4, 0); ok(ret == utests[i].expect_ret, "%d: got %d expected %d\n", i, ret, utests[i].expect_ret);

1 0

Rémi Bernon : win32u: Return the current display mode depth with nulldrv.
by Alexandre Julliard March 3, 2023

March 3, 2023

Module: wine Branch: master Commit: 8531f23a41956dcc3c68d6b02401f5c78db8ec60 URL: https://gitlab.winehq.org/wine/wine/-/commit/8531f23a41956dcc3c68d6b02401f5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 3 10:26:37 2023 +0100 win32u: Return the current display mode depth with nulldrv. --- dlls/win32u/driver.c | 2 +- dlls/win32u/sysparams.c | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 1c0708461a1..3f676dc5796 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -761,7 +761,7 @@ static BOOL nulldrv_GetCurrentDisplaySettings( LPCWSTR name, BOOL is_primary, LP static INT nulldrv_GetDisplayDepth( LPCWSTR name, BOOL is_primary ) { - return 32; + return -1; /* use default implementation */ } static BOOL nulldrv_UpdateDisplayDevices( const struct gdi_device_manager *manager, BOOL force, void *param ) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index bcdb8c5103b..60b12321953 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -2727,6 +2727,7 @@ static unsigned int active_monitor_count(void) INT get_display_depth( UNICODE_STRING *name ) { struct display_device *device; + BOOL is_primary; INT depth; if (!lock_display_devices()) @@ -2743,8 +2744,16 @@ INT get_display_depth( UNICODE_STRING *name ) return 32; } - depth = user_driver->pGetDisplayDepth( device->device_name, - !!(device->state_flags & DISPLAY_DEVICE_PRIMARY_DEVICE) ); + is_primary = !!(device->state_flags & DISPLAY_DEVICE_PRIMARY_DEVICE); + if ((depth = user_driver->pGetDisplayDepth( device->device_name, is_primary )) < 0) + { + struct adapter *adapter = CONTAINING_RECORD( device, struct adapter, dev ); + DEVMODEW current_mode = {.dmSize = sizeof(DEVMODEW)}; + + if (!adapter_get_current_settings( adapter, &current_mode )) depth = 32; + else depth = current_mode.dmBitsPerPel; + } + unlock_display_devices(); return depth; }

1 0

Zebediah Figura : d3d8/tests: Do not check for WM_MOVE in sc_maximize_messages.
by Alexandre Julliard March 3, 2023

March 3, 2023

Module: wine Branch: master Commit: 45f69f73bf335fa49770be8bcc61e676aab5c2e5 URL: https://gitlab.winehq.org/wine/wine/-/commit/45f69f73bf335fa49770be8bcc61e6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 2 19:48:07 2023 -0600 d3d8/tests: Do not check for WM_MOVE in sc_maximize_messages. --- dlls/d3d8/tests/device.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index c8f52484054..804dd6955de 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -2973,7 +2973,20 @@ static void test_wndproc(void) {WM_SYSCOMMAND, FOCUS_WINDOW, TRUE, SC_MAXIMIZE}, {WM_WINDOWPOSCHANGING, FOCUS_WINDOW, FALSE, 0}, {WM_WINDOWPOSCHANGED, FOCUS_WINDOW, FALSE, 0}, - {WM_MOVE, FOCUS_WINDOW, FALSE, 0}, + /* Windows always sends WM_MOVE here. + * + * In the first case, we are maximizing from a minimized state, and + * hence the client rect moves from the minimized position to (0, 0). + * + * In the second case, we are maximizing from an on-screen restored + * state. The window is at (0, 0), but it has a caption, so the client + * rect is offset, and the *client* will move to (0, 0) when maximized. + * + * Wine doesn't send WM_MOVE here because it messes with the window + * styles when switching to fullscreen, and hence the client rect is + * already at (0, 0). Obviously Wine shouldn't do this, but it's hard to + * fix, and the WM_MOVE is not particularly interesting, so just ignore + * it. */ {WM_SIZE, FOCUS_WINDOW, TRUE, SIZE_MAXIMIZED}, {0, 0, FALSE, 0}, };

1 0

Zebediah Figura : d3d9/tests: Restore the focus window before sending SC_MAXIMIZE to it.
by Alexandre Julliard March 3, 2023

March 3, 2023

Module: wine Branch: master Commit: ff752311cd1feff44b60aa72cc0a27b77c10c226 URL: https://gitlab.winehq.org/wine/wine/-/commit/ff752311cd1feff44b60aa72cc0a27… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 2 19:51:39 2023 -0600 d3d9/tests: Restore the focus window before sending SC_MAXIMIZE to it. To match d3d8. The original patch [1] claims "WM_SIZE(SIZE_MAXIMIZED) is reliable here. The unreliable behavior occured only with NOWINDOWCHANGES." but this doesn't match my testing. Probably when that patch was submitted, this very fix was applied to the d3d8 tests but forgotten for the d3d9 tests, and then the wrong conclusions were drawn. [1] https://www.winehq.org/pipermail/wine-patches/2014-December/135964.html --- dlls/d3d9/tests/device.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 0e361b3ac23..e0f3fa45898 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3962,8 +3962,21 @@ static void test_wndproc(void) {WM_SYSCOMMAND, FOCUS_WINDOW, TRUE, SC_MAXIMIZE}, {WM_WINDOWPOSCHANGING, FOCUS_WINDOW, FALSE, 0}, {WM_WINDOWPOSCHANGED, FOCUS_WINDOW, FALSE, 0}, - {WM_MOVE, FOCUS_WINDOW, FALSE, 0}, - /* WM_SIZE(SIZE_MAXIMIZED) is unreliable on native. */ + /* Windows always sends WM_MOVE here. + * + * In the first case, we are maximizing from a minimized state, and + * hence the client rect moves from the minimized position to (0, 0). + * + * In the second case, we are maximizing from an on-screen restored + * state. The window is at (0, 0), but it has a caption, so the client + * rect is offset, and the *client* will move to (0, 0) when maximized. + * + * Wine doesn't send WM_MOVE here because it messes with the window + * styles when switching to fullscreen, and hence the client rect is + * already at (0, 0). Obviously Wine shouldn't do this, but it's hard to + * fix, and the WM_MOVE is not particularly interesting, so just ignore + * it. */ + {WM_SIZE, FOCUS_WINDOW, TRUE, SIZE_MAXIMIZED}, {0, 0, FALSE, 0}, }; static const struct message mode_change_messages[] = @@ -4376,6 +4389,9 @@ static void test_wndproc(void) ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", expect_messages->message, expect_messages->window, i); expect_messages = NULL; + /* Needed to make the next test reliably send WM_SIZE(SIZE_MAXIMIZED). Without + * this call it sends WM_SIZE(SIZE_RESTORED). */ + ShowWindow(focus_window, SW_RESTORE); flush_events(); expect_messages = sc_maximize_messages;

1 0

Rémi Bernon : explorer: Use GUID_NULL display device GUID for nulldrv.
by Alexandre Julliard March 3, 2023

March 3, 2023

Module: wine Branch: master Commit: 992d60e1222ef6e6e835ed10e80556235e257bd4 URL: https://gitlab.winehq.org/wine/wine/-/commit/992d60e1222ef6e6e835ed10e80556… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 3 09:30:37 2023 +0100 explorer: Use GUID_NULL display device GUID for nulldrv. --- programs/explorer/desktop.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 96673adc254..81eb0d1d01b 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -876,7 +876,7 @@ static BOOL get_default_enable_shell( const WCHAR *name ) return result; } -static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) +static HMODULE load_graphics_driver( const WCHAR *driver, GUID *guid ) { static const WCHAR device_keyW[] = { 'S','y','s','t','e','m','\\', @@ -921,6 +921,7 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) if (!wcscmp( name, L"null" )) { + memset( guid, 0, sizeof(*guid) ); TRACE( "display %s using null driver\n", debugstr_guid(guid) ); wcscpy( libname, L"null" ); null_driver = TRUE;

1 0

Mohamad Al-Jaf : include: Add more Windows.Foundation.Numerics structs.
by Alexandre Julliard March 3, 2023

March 3, 2023

Module: wine Branch: master Commit: c78cd3f554084911a1cd889175c3785c2914d4b8 URL: https://gitlab.winehq.org/wine/wine/-/commit/c78cd3f554084911a1cd889175c378… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sun Dec 18 19:17:21 2022 -0500 include: Add more Windows.Foundation.Numerics structs. --- include/windows.foundation.numerics.idl | 76 +++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/include/windows.foundation.numerics.idl b/include/windows.foundation.numerics.idl index eca99ca29bc..f74eb4fd889 100644 --- a/include/windows.foundation.numerics.idl +++ b/include/windows.foundation.numerics.idl @@ -27,7 +27,51 @@ import "windowscontracts.idl"; import "windows.foundation.idl"; namespace Windows.Foundation.Numerics { + typedef struct Matrix3x2 Matrix3x2; + typedef struct Matrix4x4 Matrix4x4; + typedef struct Plane Plane; + typedef struct Quaternion Quaternion; + typedef struct Vector2 Vector2; typedef struct Vector3 Vector3; + typedef struct Vector4 Vector4; + + declare { + interface Windows.Foundation.IReference<Windows.Foundation.Numerics.Matrix4x4>; + interface Windows.Foundation.IReference<Windows.Foundation.Numerics.Vector2>; + interface Windows.Foundation.IReference<Windows.Foundation.Numerics.Vector3>; + } + + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + struct Matrix3x2 + { + FLOAT M11; + FLOAT M12; + FLOAT M21; + FLOAT M22; + FLOAT M31; + FLOAT M32; + }; + + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + struct Matrix4x4 + { + FLOAT M11; + FLOAT M12; + FLOAT M13; + FLOAT M14; + FLOAT M21; + FLOAT M22; + FLOAT M23; + FLOAT M24; + FLOAT M31; + FLOAT M32; + FLOAT M33; + FLOAT M34; + FLOAT M41; + FLOAT M42; + FLOAT M43; + FLOAT M44; + }; [contract(Windows.Foundation.UniversalApiContract, 1.0)] struct Vector3 @@ -36,4 +80,36 @@ namespace Windows.Foundation.Numerics { FLOAT Y; FLOAT Z; }; + + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + struct Plane + { + Windows.Foundation.Numerics.Vector3 Normal; + FLOAT D; + }; + + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + struct Quaternion + { + FLOAT X; + FLOAT Y; + FLOAT Z; + FLOAT W; + }; + + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + struct Vector2 + { + FLOAT X; + FLOAT Y; + }; + + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + struct Vector4 + { + FLOAT X; + FLOAT Y; + FLOAT Z; + FLOAT W; + }; }

1 0

Etaash Mathamsetty : ntoskrnl.exe/tests: Add Driver Object Extension Tests.
by Alexandre Julliard March 2, 2023

March 2, 2023

Module: wine Branch: master Commit: 10765f2956d6f9fc2d16bb2bec476b12a31786f6 URL: https://gitlab.winehq.org/wine/wine/-/commit/10765f2956d6f9fc2d16bb2bec476b… Author: Etaash Mathamsetty <etaash.mathamsetty(a)gmail.com> Date: Sun Dec 25 14:10:39 2022 -0500 ntoskrnl.exe/tests: Add Driver Object Extension Tests. --- dlls/ntoskrnl.exe/tests/driver.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index d55ad846ef7..a80bef78fab 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -2294,6 +2294,38 @@ static void test_permanence(void) ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "got %#lx\n", status); } +static void test_driver_object_extension(void) +{ + NTSTATUS (WINAPI *pIoAllocateDriverObjectExtension)(PDRIVER_OBJECT, PVOID, ULONG, PVOID *); + PVOID (WINAPI *pIoGetDriverObjectExtension)(PDRIVER_OBJECT, PVOID); + NTSTATUS status; + void *driver_obj_ext = NULL; + void *get_obj_ext = NULL; + + pIoAllocateDriverObjectExtension = get_proc_address("IoAllocateDriverObjectExtension"); + pIoGetDriverObjectExtension = get_proc_address("IoGetDriverObjectExtension"); + + if (!pIoAllocateDriverObjectExtension) + { + win_skip("IoAllocateDriverObjectExtension is not available.\n"); + return; + } + + status = pIoAllocateDriverObjectExtension(driver_obj, NULL, 100, &driver_obj_ext); + todo_wine ok(status == STATUS_SUCCESS, "got %#lx\n", status); + todo_wine ok(driver_obj_ext != NULL, "got NULL\n"); + + get_obj_ext = pIoGetDriverObjectExtension(driver_obj, NULL); + todo_wine ok(get_obj_ext == driver_obj_ext && get_obj_ext != NULL, "got %p != %p\n", get_obj_ext, driver_obj_ext); + + status = pIoAllocateDriverObjectExtension(driver_obj, NULL, 100, &driver_obj_ext); + todo_wine ok(status == STATUS_OBJECT_NAME_COLLISION, "got %#lx\n", status); + ok(driver_obj_ext == NULL, "got %p\n", driver_obj_ext); + + get_obj_ext = pIoGetDriverObjectExtension(driver_obj, (void *)0xdead); + ok(get_obj_ext == NULL, "got %p\n", get_obj_ext); +} + static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack) { void *buffer = irp->AssociatedIrp.SystemBuffer; @@ -2337,6 +2369,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st test_dpc(); test_process_memory(test_input); test_permanence(); + test_driver_object_extension(); IoMarkIrpPending(irp); IoQueueWorkItem(work_item, main_test_task, DelayedWorkQueue, irp);

1 0

Zebediah Figura : ddraw: Remove the redundant "desc" parameter to ddraw_surface_create_wined3d_texture().
by Alexandre Julliard March 2, 2023

March 2, 2023

Module: wine Branch: master Commit: 2f3c7e872539831d5c48138eaf9f3804615c6c87 URL: https://gitlab.winehq.org/wine/wine/-/commit/2f3c7e872539831d5c48138eaf9f38… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 22 16:00:34 2022 -0600 ddraw: Remove the redundant "desc" parameter to ddraw_surface_create_wined3d_texture(). --- dlls/ddraw/surface.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index ddbe08f2260..aec0bba8dc3 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5995,10 +5995,11 @@ static HRESULT ddraw_surface_reserve_memory(struct wined3d_texture *wined3d_text return hr; } -static HRESULT ddraw_surface_create_wined3d_texture(DDSURFACEDESC2 *desc, struct wined3d_device *wined3d_device, +static HRESULT ddraw_surface_create_wined3d_texture(struct wined3d_device *wined3d_device, const struct wined3d_resource_desc *wined3d_desc, unsigned int layers, unsigned int levels, struct ddraw_texture *texture, struct wined3d_texture **wined3d_texture) { + const DDSURFACEDESC2 *desc = &texture->surface_desc; struct wined3d_resource_desc draw_texture_desc; struct wined3d_texture *draw_texture; struct ddraw_surface *parent; @@ -6589,7 +6590,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ layers = 6; } - if (FAILED(hr = ddraw_surface_create_wined3d_texture(desc, ddraw->wined3d_device, &wined3d_desc, layers, levels, + if (FAILED(hr = ddraw_surface_create_wined3d_texture(ddraw->wined3d_device, &wined3d_desc, layers, levels, texture, &wined3d_texture))) { WARN("Failed to create wined3d texture, hr %#lx.\n", hr); @@ -6723,7 +6724,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ desc->ddsCaps.dwCaps |= DDSCAPS_BACKBUFFER; desc->u5.dwBackBufferCount = 0; - if (FAILED(hr = ddraw_surface_create_wined3d_texture(desc, ddraw->wined3d_device, &wined3d_desc, 1, 1, + if (FAILED(hr = ddraw_surface_create_wined3d_texture(ddraw->wined3d_device, &wined3d_desc, 1, 1, texture, &wined3d_texture))) { heap_free(texture);

1 0