March 2023 - Wine-Commits - list.winehq.org

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

Zebediah Figura : ddraw: Forbid DDSCAPS_COMPLEX without any caps that merit a complex surface.
by Alexandre Julliard March 2, 2023

March 2, 2023

Module: wine Branch: master Commit: 9bfdd9141c18f42cfe0de95cf7c1679a5edfe5c6 URL: https://gitlab.winehq.org/wine/wine/-/commit/9bfdd9141c18f42cfe0de95cf7c167… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Dec 20 21:33:10 2022 -0600 ddraw: Forbid DDSCAPS_COMPLEX without any caps that merit a complex surface. --- dlls/ddraw/surface.c | 9 +++++++++ dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 4a95067996f..cdb1cfe109d 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6117,6 +6117,15 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ /* Ensure DDSD_CAPS is always set. */ desc->dwFlags |= DDSD_CAPS; + if ((desc->ddsCaps.dwCaps & DDSCAPS_COMPLEX) + && !(desc->ddsCaps.dwCaps & (DDSCAPS_FLIP | DDSCAPS_MIPMAP)) + && !(desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP)) + { + WARN("DDSCAPS_COMPLEX specified for a surface which is neither flippable, mipmapped, nor a cubemap.\n"); + heap_free(texture); + return DDERR_INVALIDCAPS; + } + if (desc->ddsCaps.dwCaps & DDSCAPS_FLIP) { if (!(desc->dwFlags & DDSD_BACKBUFFERCOUNT) || !desc->u5.dwBackBufferCount) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 258670f1db5..2d7d350517e 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -6323,7 +6323,7 @@ static void test_mipmap(void) if (tests[i].flags & DDSD_MIPMAPCOUNT) U2(surface_desc).dwMipMapCount = tests[i].mipmap_count_in; hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &surface, NULL); - todo_wine_if (i == 1 || i == 4 || i == 7 || i == 8) + todo_wine_if (i == 7 || i == 8) ok(hr == tests[i].hr, "Test %u: Got unexpected hr %#lx.\n", i, hr); if (FAILED(hr)) continue; diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 9427dea535e..5733c879b4e 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -7452,7 +7452,7 @@ static void test_mipmap(void) if (tests[i].flags & DDSD_MIPMAPCOUNT) U2(surface_desc).dwMipMapCount = tests[i].mipmap_count_in; hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface1, NULL); - todo_wine_if (i == 1 || i == 4 || i == 7 || i == 8) + todo_wine_if (i == 7 || i == 8) ok(hr == tests[i].hr, "Test %u: Got unexpected hr %#lx.\n", i, hr); if (FAILED(hr)) continue; diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index aca9a456078..81bf170711d 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -9353,7 +9353,7 @@ static void test_mipmap(void) if (tests[i].flags & DDSD_MIPMAPCOUNT) U2(surface_desc).dwMipMapCount = tests[i].mipmap_count_in; hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &surface, NULL); - todo_wine_if (i == 1 || i == 4 || i == 7 || i == 8) + todo_wine_if (i == 7 || i == 8) ok(hr == tests[i].hr, "Test %u: Got unexpected hr %#lx.\n", i, hr); if (FAILED(hr)) continue; diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index e9574cdec2c..229448d135a 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -9197,7 +9197,7 @@ static void test_mipmap(void) if (tests[i].flags & DDSD_MIPMAPCOUNT) U2(surface_desc).dwMipMapCount = tests[i].mipmap_count_in; hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); - todo_wine_if (i == 1 || i == 4 || i == 7 || i == 8) + todo_wine_if (i == 7 || i == 8) ok(hr == tests[i].hr, "Test %u: Got unexpected hr %#lx.\n", i, hr); if (FAILED(hr)) continue;

1 0

Zebediah Figura : ddraw/tests: Add more tests for mipmap surface creation flags.
by Alexandre Julliard March 2, 2023

March 2, 2023

Module: wine Branch: master Commit: df8c73e9065bf287f07119ea7feff63a9469bcec URL: https://gitlab.winehq.org/wine/wine/-/commit/df8c73e9065bf287f07119ea7feff6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Dec 20 20:19:07 2022 -0600 ddraw/tests: Add more tests for mipmap surface creation flags. --- dlls/ddraw/tests/ddraw1.c | 21 +++++++++++++++++---- dlls/ddraw/tests/ddraw2.c | 21 +++++++++++++++++---- dlls/ddraw/tests/ddraw4.c | 21 +++++++++++++++++---- dlls/ddraw/tests/ddraw7.c | 21 +++++++++++++++++---- 4 files changed, 68 insertions(+), 16 deletions(-)

1 0

Zebediah Figura : ddraw: Forbid DDSD_MIPMAPCOUNT without DDSCAPS_COMPLEX.
by Alexandre Julliard March 2, 2023

March 2, 2023

Module: wine Branch: master Commit: c86263aa5d3bea75f089fd5deeba6235e1d122f6 URL: https://gitlab.winehq.org/wine/wine/-/commit/c86263aa5d3bea75f089fd5deeba62… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Dec 20 21:44:43 2022 -0600 ddraw: Forbid DDSD_MIPMAPCOUNT without DDSCAPS_COMPLEX. --- dlls/ddraw/surface.c | 8 ++++++++ dlls/ddraw/tests/ddraw1.c | 9 +-------- dlls/ddraw/tests/ddraw2.c | 9 +-------- dlls/ddraw/tests/ddraw4.c | 9 +-------- dlls/ddraw/tests/ddraw7.c | 9 +-------- 5 files changed, 12 insertions(+), 32 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index cdb1cfe109d..ddbe08f2260 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6126,6 +6126,14 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ return DDERR_INVALIDCAPS; } + if ((desc->dwFlags & DDSD_MIPMAPCOUNT) && !(desc->ddsCaps.dwCaps & DDSCAPS_COMPLEX)) + { + /* This is illegal even if there is only one mipmap level. */ + WARN("DDSD_MIPMAPCOUNT specified without DDSCAPS_COMPLEX.\n"); + heap_free(texture); + return DDERR_INVALIDCAPS; + } + if (desc->ddsCaps.dwCaps & DDSCAPS_FLIP) { if (!(desc->dwFlags & DDSD_BACKBUFFERCOUNT) || !desc->u5.dwBackBufferCount) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 2d7d350517e..4f950d775b2 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -6323,17 +6323,10 @@ static void test_mipmap(void) if (tests[i].flags & DDSD_MIPMAPCOUNT) U2(surface_desc).dwMipMapCount = tests[i].mipmap_count_in; hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &surface, NULL); - todo_wine_if (i == 7 || i == 8) - ok(hr == tests[i].hr, "Test %u: Got unexpected hr %#lx.\n", i, hr); + ok(hr == tests[i].hr, "Test %u: Got unexpected hr %#lx.\n", i, hr); if (FAILED(hr)) continue; - if (FAILED(tests[i].hr)) - { - IDirectDrawSurface_Release(surface); - continue; - } - memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 5733c879b4e..476531d41a5 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -7452,17 +7452,10 @@ static void test_mipmap(void) if (tests[i].flags & DDSD_MIPMAPCOUNT) U2(surface_desc).dwMipMapCount = tests[i].mipmap_count_in; hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface1, NULL); - todo_wine_if (i == 7 || i == 8) - ok(hr == tests[i].hr, "Test %u: Got unexpected hr %#lx.\n", i, hr); + ok(hr == tests[i].hr, "Test %u: Got unexpected hr %#lx.\n", i, hr); if (FAILED(hr)) continue; - if (FAILED(tests[i].hr)) - { - IDirectDrawSurface_Release(surface); - continue; - } - hr = IDirectDrawSurface_QueryInterface(surface1, &IID_IDirectDrawSurface2, (void **)&surface); ok(SUCCEEDED(hr), "Test %u: Failed to get IDirectDrawSurface2 interface, hr %#lx.\n", i, hr); IDirectDrawSurface_Release(surface1); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 81bf170711d..71052214baf 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -9353,17 +9353,10 @@ static void test_mipmap(void) if (tests[i].flags & DDSD_MIPMAPCOUNT) U2(surface_desc).dwMipMapCount = tests[i].mipmap_count_in; hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &surface, NULL); - todo_wine_if (i == 7 || i == 8) - ok(hr == tests[i].hr, "Test %u: Got unexpected hr %#lx.\n", i, hr); + ok(hr == tests[i].hr, "Test %u: Got unexpected hr %#lx.\n", i, hr); if (FAILED(hr)) continue; - if (FAILED(tests[i].hr)) - { - IDirectDrawSurface4_Release(surface); - continue; - } - memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface4_GetSurfaceDesc(surface, &surface_desc); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 229448d135a..8ac62b303e1 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -9197,17 +9197,10 @@ static void test_mipmap(void) if (tests[i].flags & DDSD_MIPMAPCOUNT) U2(surface_desc).dwMipMapCount = tests[i].mipmap_count_in; hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); - todo_wine_if (i == 7 || i == 8) - ok(hr == tests[i].hr, "Test %u: Got unexpected hr %#lx.\n", i, hr); + ok(hr == tests[i].hr, "Test %u: Got unexpected hr %#lx.\n", i, hr); if (FAILED(hr)) continue; - if (FAILED(tests[i].hr)) - { - IDirectDrawSurface7_Release(surface); - continue; - } - memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface7_GetSurfaceDesc(surface, &surface_desc);

1 0

Zebediah Figura : ddraw/tests: Test that surface properties are retained across SetSurfaceDesc() calls.
by Alexandre Julliard March 2, 2023

March 2, 2023

Module: wine Branch: master Commit: 1cea45a183559d9b7f6f43c3f4a63b42558b450b URL: https://gitlab.winehq.org/wine/wine/-/commit/1cea45a183559d9b7f6f43c3f4a63b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Dec 11 19:59:42 2022 -0600 ddraw/tests: Test that surface properties are retained across SetSurfaceDesc() calls. --- dlls/ddraw/tests/ddraw2.c | 28 ++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 28 ++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 28 ++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index eddf846e54b..e48d4c54f1c 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -6203,6 +6203,34 @@ static void test_set_surface_desc(void) hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); ok(hr == DDERR_INVALIDPARAMS, "Got hr %#lx.\n", hr); + /* Check that other surface properties are retained. */ + + ddsd.ddckCKSrcBlt.dwColorSpaceLowValue = 0x00ff00ff; + ddsd.ddckCKSrcBlt.dwColorSpaceHighValue = 0x0000ff00; + hr = IDirectDrawSurface3_SetColorKey(surface3, DDCKEY_SRCBLT, &ddsd.ddckCKSrcBlt); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_PITCH | DDSD_HEIGHT | DDSD_PIXELFORMAT | DDSD_LPSURFACE; + ddsd.dwWidth = 8; + U1(ddsd).lPitch = 8 * 2; + ddsd.dwHeight = 8; + ddsd.lpSurface = data; + U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); + U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_RGB; /* D3DFMT_R5G6B5 */ + U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 16; + U2(U4(ddsd).ddpfPixelFormat).dwRBitMask = 0xf800; + U3(U4(ddsd).ddpfPixelFormat).dwGBitMask = 0x07e0; + U4(U4(ddsd).ddpfPixelFormat).dwBBitMask = 0x001f; + hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + memset(&ddsd.ddckCKSrcBlt, 0xcc, sizeof(ddsd.ddckCKSrcBlt)); + hr = IDirectDrawSurface3_GetColorKey(surface3, DDCKEY_SRCBLT, &ddsd.ddckCKSrcBlt); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(ddsd.ddckCKSrcBlt.dwColorSpaceLowValue == 0x00ff00ff, + "Got low color key value %#lx.\n", ddsd.ddckCKSrcBlt.dwColorSpaceLowValue); + IDirectDrawSurface3_Release(surface3); /* Test mipmap texture. */ diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index a658de37b94..657ea982154 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -7861,6 +7861,34 @@ static void test_set_surface_desc(void) hr = IDirectDrawSurface4_SetSurfaceDesc(surface, &ddsd, 0); ok(hr == DDERR_INVALIDPARAMS, "Got hr %#lx.\n", hr); + /* Check that other surface properties are retained. */ + + ddsd.ddckCKSrcBlt.dwColorSpaceLowValue = 0x00ff00ff; + ddsd.ddckCKSrcBlt.dwColorSpaceHighValue = 0x0000ff00; + hr = IDirectDrawSurface4_SetColorKey(surface, DDCKEY_SRCBLT, &ddsd.ddckCKSrcBlt); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_PITCH | DDSD_HEIGHT | DDSD_PIXELFORMAT | DDSD_LPSURFACE; + ddsd.dwWidth = 8; + U1(ddsd).lPitch = 8 * 2; + ddsd.dwHeight = 8; + ddsd.lpSurface = data; + U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); + U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_RGB; /* D3DFMT_R5G6B5 */ + U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 16; + U2(U4(ddsd).ddpfPixelFormat).dwRBitMask = 0xf800; + U3(U4(ddsd).ddpfPixelFormat).dwGBitMask = 0x07e0; + U4(U4(ddsd).ddpfPixelFormat).dwBBitMask = 0x001f; + hr = IDirectDrawSurface4_SetSurfaceDesc(surface, &ddsd, 0); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + memset(&ddsd.ddckCKSrcBlt, 0xcc, sizeof(ddsd.ddckCKSrcBlt)); + hr = IDirectDrawSurface4_GetColorKey(surface, DDCKEY_SRCBLT, &ddsd.ddckCKSrcBlt); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(ddsd.ddckCKSrcBlt.dwColorSpaceLowValue == 0x00ff00ff, + "Got low color key value %#lx.\n", ddsd.ddckCKSrcBlt.dwColorSpaceLowValue); + IDirectDrawSurface4_Release(surface); /* Test mipmap texture. */ diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index a1c791a9116..d642a644e97 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -7718,6 +7718,34 @@ static void test_set_surface_desc(void) hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 0); ok(hr == DDERR_INVALIDPARAMS, "Got hr %#lx.\n", hr); + /* Check that other surface properties are retained. */ + + ddsd.ddckCKSrcBlt.dwColorSpaceLowValue = 0x00ff00ff; + ddsd.ddckCKSrcBlt.dwColorSpaceHighValue = 0x0000ff00; + hr = IDirectDrawSurface7_SetColorKey(surface, DDCKEY_SRCBLT, &ddsd.ddckCKSrcBlt); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_PITCH | DDSD_HEIGHT | DDSD_PIXELFORMAT | DDSD_LPSURFACE; + ddsd.dwWidth = 8; + U1(ddsd).lPitch = 8 * 2; + ddsd.dwHeight = 8; + ddsd.lpSurface = data; + U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); + U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_RGB; /* D3DFMT_R5G6B5 */ + U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 16; + U2(U4(ddsd).ddpfPixelFormat).dwRBitMask = 0xf800; + U3(U4(ddsd).ddpfPixelFormat).dwGBitMask = 0x07e0; + U4(U4(ddsd).ddpfPixelFormat).dwBBitMask = 0x001f; + hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 0); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + memset(&ddsd.ddckCKSrcBlt, 0xcc, sizeof(ddsd.ddckCKSrcBlt)); + hr = IDirectDrawSurface7_GetColorKey(surface, DDCKEY_SRCBLT, &ddsd.ddckCKSrcBlt); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(ddsd.ddckCKSrcBlt.dwColorSpaceLowValue == 0x00ff00ff, + "Got low color key value %#lx.\n", ddsd.ddckCKSrcBlt.dwColorSpaceLowValue); + IDirectDrawSurface7_Release(surface); /* Test mipmap texture. */

1 0