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

Rémi Bernon : dinput/tests: Enforce ioctl buffer sizes to avoid overflows.
by Alexandre Julliard 02 Jun '22

02 Jun '22

Module: wine Branch: master Commit: 01e8a9d03b17cbfe97663cf4b1e6d2c6fd67ca2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=01e8a9d03b17cbfe97663cf4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 1 10:24:49 2022 +0200 dinput/tests: Enforce ioctl buffer sizes to avoid overflows. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/tests/driver_bus.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/tests/driver_bus.c b/dlls/dinput/tests/driver_bus.c index dc9b549e1d8..64ca33e7c89 100644 --- a/dlls/dinput/tests/driver_bus.c +++ b/dlls/dinput/tests/driver_bus.c @@ -1251,18 +1251,22 @@ static NTSTATUS pdo_handle_ioctl( struct phys_device *impl, IRP *irp, ULONG code switch (code) { case IOCTL_WINETEST_HID_SET_EXPECT: + if (in_size > EXPECT_QUEUE_BUFFER_SIZE) return STATUS_BUFFER_OVERFLOW; expect_queue_reset( &impl->expect_queue, in_buffer, in_size ); return STATUS_SUCCESS; case IOCTL_WINETEST_HID_WAIT_EXPECT: { - struct wait_expect_params wait_params = *(struct wait_expect_params *)in_buffer; - if (!wait_params.wait_pending) return expect_queue_wait( &impl->expect_queue, irp ); + struct wait_expect_params *wait_params = (struct wait_expect_params *)in_buffer; + if (in_size < sizeof(*wait_params)) return STATUS_BUFFER_TOO_SMALL; + if (!wait_params->wait_pending) return expect_queue_wait( &impl->expect_queue, irp ); else return expect_queue_wait_pending( &impl->expect_queue, irp ); } case IOCTL_WINETEST_HID_SEND_INPUT: + if (in_size > EXPECT_QUEUE_BUFFER_SIZE) return STATUS_BUFFER_OVERFLOW; input_queue_reset( &impl->input_queue, in_buffer, in_size ); return STATUS_SUCCESS; case IOCTL_WINETEST_HID_SET_CONTEXT: + if (in_size > sizeof(impl->expect_queue.context)) return STATUS_BUFFER_OVERFLOW; KeAcquireSpinLock( &impl->expect_queue.lock, &irql ); memcpy( impl->expect_queue.context, in_buffer, in_size ); KeReleaseSpinLock( &impl->expect_queue.lock, irql );

1 0

Rémi Bernon : dinput/tests: Fix source file in driver test context.
by Alexandre Julliard 02 Jun '22

02 Jun '22

Module: wine Branch: master Commit: 5611335198f62545f2a383c2036c12ca674afe0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5611335198f62545f2a383c2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 1 12:10:20 2022 +0200 dinput/tests: Fix source file in driver test context. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/tests/dinput_test.h | 12 ++---------- dlls/dinput/tests/force_feedback.c | 6 +++--- dlls/dinput/tests/hid.c | 20 +++++++++++++++----- dlls/dinput/tests/hotplug.c | 4 ++-- dlls/dinput/tests/joystick8.c | 14 +++++++------- 5 files changed, 29 insertions(+), 27 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5611335198f62545f2a3…

1 0

Rémi Bernon : dinput/tests: Support test IOCTLs on the bus control interface.
by Alexandre Julliard 02 Jun '22

02 Jun '22

Module: wine Branch: master Commit: c76915958bce016035d5fd14c0dc07be5471d25d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c76915958bce016035d5fd14… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 1 12:11:59 2022 +0200 dinput/tests: Support test IOCTLs on the bus control interface. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/tests/dinput_test.h | 25 +++++++++++------- dlls/dinput/tests/driver_bus.c | 30 ++++++++++++++++------ dlls/dinput/tests/driver_hid.h | 2 ++ dlls/dinput/tests/hid.c | 57 +++++++++++++++++++++++++++++++---------- 4 files changed, 84 insertions(+), 30 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c76915958bce016035d5…

1 0

Rémi Bernon : dinput/tests: Add a test for multiple top-level collections.
by Alexandre Julliard 02 Jun '22

02 Jun '22

Module: wine Branch: master Commit: fab2af1529688dc56d1e538d6f20ad2d06ae4018 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fab2af1529688dc56d1e538d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 31 19:45:54 2022 +0200 dinput/tests: Add a test for multiple top-level collections. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/tests/hid.c | 384 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 292 insertions(+), 92 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fab2af1529688dc56d1e…

1 0

Nikolay Sivov : secur32: Remove unused argument from buffer iteration helpers.
by Alexandre Julliard 02 Jun '22

02 Jun '22

Module: wine Branch: master Commit: 3f2cdb6820f165706363aa9982c578c10248993e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f2cdb6820f165706363aa99… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 29 18:49:29 2022 +0300 secur32: Remove unused argument from buffer iteration helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/secur32/schannel_gnutls.c | 28 ++++++++++++++-------------- dlls/secur32/secur32_priv.h | 4 +--- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 2e462b409d8..a79ca7040a5 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -211,7 +211,7 @@ static void compat_gnutls_dtls_set_timeouts(gnutls_session_t session, unsigned i } static void init_schan_buffers(struct schan_buffers *s, const PSecBufferDesc desc, - int (*get_next_buffer)(const struct schan_transport *, struct schan_buffers *)) + int (*get_next_buffer)(struct schan_buffers *)) { s->offset = 0; s->limit = ~0UL; @@ -236,14 +236,14 @@ static int schan_find_sec_buffer_idx(const SecBufferDesc *desc, unsigned int sta return -1; } -static int handshake_get_next_buffer(const struct schan_transport *t, struct schan_buffers *s) +static int handshake_get_next_buffer(struct schan_buffers *s) { if (s->current_buffer_idx != -1) return -1; return schan_find_sec_buffer_idx(s->desc, 0, SECBUFFER_TOKEN); } -static int handshake_get_next_buffer_alloc(const struct schan_transport *t, struct schan_buffers *s) +static int handshake_get_next_buffer_alloc(struct schan_buffers *s) { if (s->current_buffer_idx == -1) { @@ -262,7 +262,7 @@ static int handshake_get_next_buffer_alloc(const struct schan_transport *t, stru return -1; } -static int send_message_get_next_buffer(const struct schan_transport *t, struct schan_buffers *s) +static int send_message_get_next_buffer(struct schan_buffers *s) { SecBuffer *b; @@ -280,7 +280,7 @@ static int send_message_get_next_buffer(const struct schan_transport *t, struct return -1; } -static int send_message_get_next_buffer_token(const struct schan_transport *t, struct schan_buffers *s) +static int send_message_get_next_buffer_token(struct schan_buffers *s) { SecBuffer *b; @@ -307,14 +307,14 @@ static int send_message_get_next_buffer_token(const struct schan_transport *t, s return -1; } -static int recv_message_get_next_buffer(const struct schan_transport *t, struct schan_buffers *s) +static int recv_message_get_next_buffer(struct schan_buffers *s) { if (s->current_buffer_idx != -1) return -1; return schan_find_sec_buffer_idx(s->desc, 0, SECBUFFER_DATA); } -static char *get_buffer(const struct schan_transport *t, struct schan_buffers *s, SIZE_T *count) +static char *get_buffer(struct schan_buffers *s, SIZE_T *count) { SIZE_T max_count; PSecBuffer buffer; @@ -328,7 +328,7 @@ static char *get_buffer(const struct schan_transport *t, struct schan_buffers *s if (s->current_buffer_idx == -1) { /* Initial buffer */ - int buffer_idx = s->get_next_buffer(t, s); + int buffer_idx = s->get_next_buffer(s); if (buffer_idx == -1) { TRACE("No next buffer\n"); @@ -349,7 +349,7 @@ static char *get_buffer(const struct schan_transport *t, struct schan_buffers *s { int buffer_idx; - buffer_idx = s->get_next_buffer(t, s); + buffer_idx = s->get_next_buffer(s); if (buffer_idx == -1) { TRACE("No next buffer\n"); @@ -380,7 +380,7 @@ static ssize_t pull_adapter(gnutls_transport_ptr_t transport, void *buff, size_t TRACE("Pull %lu bytes\n", len); - b = get_buffer(t, &t->in, &len); + b = get_buffer(&t->in, &len); if (!b) { pgnutls_transport_set_errno(s, EAGAIN); @@ -401,7 +401,7 @@ static ssize_t push_adapter(gnutls_transport_ptr_t transport, const void *buff, TRACE("Push %lu bytes\n", len); - b = get_buffer(t, &t->out, &len); + b = get_buffer(&t->out, &len); if (!b) { pgnutls_transport_set_errno(s, EAGAIN); @@ -471,7 +471,7 @@ static int pull_timeout(gnutls_transport_ptr_t transport, unsigned int timeout) TRACE("\n"); - if (get_buffer(t, &t->in, &count)) return 1; + if (get_buffer(&t->in, &count)) return 1; return 0; } @@ -856,7 +856,7 @@ static NTSTATUS schan_send( void *args ) { SIZE_T count = 0; - if (get_buffer(t, &t->out, &count)) continue; + if (get_buffer(&t->out, &count)) continue; return SEC_I_CONTINUE_NEEDED; } else @@ -893,7 +893,7 @@ static NTSTATUS schan_recv( void *args ) { SIZE_T count = 0; - if (!get_buffer(t, &t->in, &count)) break; + if (!get_buffer(&t->in, &count)) break; } else if (ret == GNUTLS_E_REHANDSHAKE) { diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index e58303a4e1b..fcc007f77ef 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -88,8 +88,6 @@ typedef struct schan_credentials DWORD enabled_protocols; } schan_credentials; -struct schan_transport; - struct schan_buffers { SIZE_T offset; @@ -97,7 +95,7 @@ struct schan_buffers const SecBufferDesc *desc; SecBuffer *alloc_buffer; int current_buffer_idx; - int (*get_next_buffer)(const struct schan_transport *, struct schan_buffers *); + int (*get_next_buffer)(struct schan_buffers *); }; struct schan_transport

1 0

Nikolay Sivov : secur32: Manage gnutls transport data in unixlib.
by Alexandre Julliard 02 Jun '22

02 Jun '22

Module: wine Branch: master Commit: c1d9d6e06e2d9728c7b51414d29819d226e92dcb URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1d9d6e06e2d9728c7b51414… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 30 15:53:27 2022 +0300 secur32: Manage gnutls transport data in unixlib. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/secur32/schannel.c | 66 ++++++++++++++++---------------- dlls/secur32/schannel_gnutls.c | 86 +++++++++++++++++++++++++++++------------- dlls/secur32/secur32_priv.h | 21 ++--------- 3 files changed, 97 insertions(+), 76 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c1d9d6e06e2d9728c7b5…

1 0

Nikolay Sivov : secur32: Pass single input and output buffers for handshake call.
by Alexandre Julliard 02 Jun '22

02 Jun '22

Module: wine Branch: master Commit: fee52bd43c43259d3ad9bdabb9b4145c15282843 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fee52bd43c43259d3ad9bdab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 30 21:17:46 2022 +0300 secur32: Pass single input and output buffers for handshake call. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/secur32/schannel.c | 35 +++++++++++++++++++++++++++++------ dlls/secur32/schannel_gnutls.c | 26 ++------------------------ dlls/secur32/secur32_priv.h | 1 - 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 3242aebebbe..6a8d667a32f 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -767,6 +767,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( int output_buffer_idx = -1; int idx, i; ULONG input_offset = 0, output_offset = 0; + SecBufferDesc input_desc, output_desc; TRACE("%p %p %s 0x%08lx %ld %ld %p %ld %p %p %p %p\n", phCredential, phContext, debugstr_w(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput, @@ -917,11 +918,30 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( alloc_buffer.BufferType = SECBUFFER_TOKEN; alloc_buffer.pvBuffer = RtlAllocateHeap( GetProcessHeap(), 0, extra_size ); } + + memset(&input_desc, 0, sizeof(input_desc)); + if (pInput && (idx = schan_find_sec_buffer_idx(pInput, 0, SECBUFFER_TOKEN)) != -1) + { + input_desc.cBuffers = 1; + input_desc.pBuffers = &pInput->pBuffers[idx]; + } + + memset(&output_desc, 0, sizeof(output_desc)); + idx = schan_find_sec_buffer_idx(pOutput, 0, SECBUFFER_TOKEN); + if (idx == -1) + idx = schan_find_sec_buffer_idx(pOutput, 0, SECBUFFER_EMPTY); + if (idx != -1) + { + output_desc.cBuffers = 1; + output_desc.pBuffers = &pOutput->pBuffers[idx]; + if (!output_desc.pBuffers->pvBuffer) + output_desc.pBuffers = &alloc_buffer; + } + params.session = ctx->session; - params.input = pInput; + params.input = pInput ? &input_desc : NULL; params.input_size = expected_size; - params.output = pOutput; - params.alloc_buffer = &alloc_buffer; + params.output = &output_desc; params.input_offset = &input_offset; params.output_buffer_idx = &output_buffer_idx; params.output_offset = &output_offset; @@ -929,12 +949,15 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( if (output_buffer_idx != -1) { - SecBuffer *buffer = &pOutput->pBuffers[output_buffer_idx]; + SecBuffer *buffer = &pOutput->pBuffers[idx]; + buffer->BufferType = SECBUFFER_TOKEN; buffer->cbBuffer = output_offset; - if (buffer->pvBuffer == alloc_buffer.pvBuffer) + if (output_desc.pBuffers == &alloc_buffer) { RtlReAllocateHeap( GetProcessHeap(), HEAP_REALLOC_IN_PLACE_ONLY, - buffer->pvBuffer, buffer->cbBuffer ); + alloc_buffer.pvBuffer, buffer->cbBuffer ); + + buffer->pvBuffer = alloc_buffer.pvBuffer; alloc_buffer.pvBuffer = NULL; } } diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 098ca239598..696790f44dc 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -146,7 +146,6 @@ struct schan_buffers SIZE_T offset; SIZE_T limit; const SecBufferDesc *desc; - SecBuffer *alloc_buffer; int current_buffer_idx; int (*get_next_buffer)(struct schan_buffers *); }; @@ -234,7 +233,6 @@ static void init_schan_buffers(struct schan_buffers *s, const PSecBufferDesc des s->limit = ~0UL; s->desc = desc; s->current_buffer_idx = -1; - s->alloc_buffer = NULL; s->get_next_buffer = get_next_buffer; } @@ -257,26 +255,7 @@ static int handshake_get_next_buffer(struct schan_buffers *s) { if (s->current_buffer_idx != -1) return -1; - return schan_find_sec_buffer_idx(s->desc, 0, SECBUFFER_TOKEN); -} - -static int handshake_get_next_buffer_alloc(struct schan_buffers *s) -{ - if (s->current_buffer_idx == -1) - { - int idx = schan_find_sec_buffer_idx(s->desc, 0, SECBUFFER_TOKEN); - if (idx == -1) - { - idx = schan_find_sec_buffer_idx(s->desc, 0, SECBUFFER_EMPTY); - if (idx != -1) s->desc->pBuffers[idx].BufferType = SECBUFFER_TOKEN; - } - if (idx != -1 && !s->desc->pBuffers[idx].pvBuffer && s->alloc_buffer) - { - s->desc->pBuffers[idx] = *s->alloc_buffer; - } - return idx; - } - return -1; + return s->desc->cBuffers ? 0 : -1; } static int send_message_get_next_buffer(struct schan_buffers *s) @@ -606,8 +585,7 @@ static NTSTATUS schan_handshake( void *args ) init_schan_buffers(&t->in, params->input, handshake_get_next_buffer); t->in.limit = params->input_size; - init_schan_buffers(&t->out, params->output, handshake_get_next_buffer_alloc ); - t->out.alloc_buffer = params->alloc_buffer; + init_schan_buffers(&t->out, params->output, handshake_get_next_buffer); while (1) { diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 8a59458e875..574d3d51cb5 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -147,7 +147,6 @@ struct handshake_params SecBufferDesc *input; SIZE_T input_size; SecBufferDesc *output; - SecBuffer *alloc_buffer; ULONG *input_offset; int *output_buffer_idx; ULONG *output_offset;

1 0

Nikolay Sivov : secur32: Simplify input buffer handling for schan_recv() call.
by Alexandre Julliard 02 Jun '22

02 Jun '22

Module: wine Branch: master Commit: 1c894ec973dcc5ff2cee32d239e171f61a48e3ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c894ec973dcc5ff2cee32d2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 31 09:12:05 2022 +0300 secur32: Simplify input buffer handling for schan_recv() call. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/secur32/schannel.c | 6 +++++- dlls/secur32/schannel_gnutls.c | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 6a8d667a32f..1f4a1005550 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -1409,6 +1409,7 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle SIZE_T received = 0; int idx; unsigned char *buf_ptr; + SecBufferDesc input_desc = { 0 }; TRACE("context_handle %p, message %p, message_seq_no %ld, quality %p\n", context_handle, message, message_seq_no, quality); @@ -1446,8 +1447,11 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle received = data_size; + input_desc.cBuffers = 1; + input_desc.pBuffers = &message->pBuffers[idx]; + params.session = ctx->session; - params.input = message; + params.input = &input_desc; params.input_size = expected_size; params.buffer = data; params.length = &received; diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 696790f44dc..82437207982 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -307,7 +307,7 @@ static int recv_message_get_next_buffer(struct schan_buffers *s) { if (s->current_buffer_idx != -1) return -1; - return schan_find_sec_buffer_idx(s->desc, 0, SECBUFFER_DATA); + return s->desc->cBuffers ? 0 : -1; } static char *get_buffer(struct schan_buffers *s, SIZE_T *count)

1 0

Andrew Eikum : d3d9/tests: Add desktop window tests for IDirect3DDevice9Ex.
by Alexandre Julliard 02 Jun '22

02 Jun '22

Module: wine Branch: master Commit: de61c58308acae5a5c71e3935d3536bd942d2dcf URL: https://source.winehq.org/git/wine.git/?a=commit;h=de61c58308acae5a5c71e393… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jun 1 13:05:15 2022 -0500 d3d9/tests: Add desktop window tests for IDirect3DDevice9Ex. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/d3d9ex.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 2afe73088c7..fc148aca4a8 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -4923,6 +4923,39 @@ static void test_pinned_buffers(void) DestroyWindow(window); } +static void test_desktop_window(void) +{ + IDirect3DDevice9Ex *device; + D3DCOLOR color; + ULONG refcount; + HWND window; + HRESULT hr; + + window = create_window(); + if (!(device = create_device(window, NULL))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + DestroyWindow(window); + return; + } + IDirect3DDevice9Ex_Release(device); + DestroyWindow(window); + + device = create_device(GetDesktopWindow(), NULL); + ok(!!device, "Failed to create a D3D device.\n"); + + hr = IDirect3DDevice9Ex_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + color = get_pixel_color(device, 1, 1); + ok(color == 0x00ff0000, "Got unexpected color 0x%08x.\n", color); + + hr = IDirect3DDevice9Ex_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + refcount = IDirect3DDevice9Ex_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(d3d9ex) { DEVMODEW current_mode; @@ -4982,6 +5015,7 @@ START_TEST(d3d9ex) test_resource_access(); test_sysmem_draw(); test_pinned_buffers(); + test_desktop_window(); UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); }

1 0

Andrew Eikum : d3d9/tests: Demonstrate that NULL HWNDs don't prevent device creation.
by Alexandre Julliard 02 Jun '22

02 Jun '22

Module: wine Branch: master Commit: a64ec46e4e33aea801cfbe033e68591abdddfb14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a64ec46e4e33aea801cfbe03… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jun 1 13:05:25 2022 -0500 d3d9/tests: Demonstrate that NULL HWNDs don't prevent device creation. The game Planetary Annihilation: TITANS depends on this. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/d3d9ex.c | 22 ++++++++++++++++++++++ dlls/d3d9/tests/visual.c | 22 ++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index fc148aca4a8..86ac7cf5109 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -4925,12 +4925,24 @@ static void test_pinned_buffers(void) static void test_desktop_window(void) { + IDirect3DVertexShader9 *shader; IDirect3DDevice9Ex *device; D3DCOLOR color; ULONG refcount; HWND window; HRESULT hr; + static const DWORD simple_vs[] = + { + 0xfffe0101, /* vs_1_1 */ + 0x0000001f, 0x80000000, 0x900f0000, /* dcl_position0 v0 */ + 0x00000009, 0xc0010000, 0x90e40000, 0xa0e40000, /* dp4 oPos.x, v0, c0 */ + 0x00000009, 0xc0020000, 0x90e40000, 0xa0e40001, /* dp4 oPos.y, v0, c1 */ + 0x00000009, 0xc0040000, 0x90e40000, 0xa0e40002, /* dp4 oPos.z, v0, c2 */ + 0x00000009, 0xc0080000, 0x90e40000, 0xa0e40003, /* dp4 oPos.w, v0, c3 */ + 0x0000ffff, /* end */ + }; + window = create_window(); if (!(device = create_device(window, NULL))) { @@ -4954,6 +4966,16 @@ static void test_desktop_window(void) refcount = IDirect3DDevice9Ex_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); + + /* test device with NULL HWND */ + device = create_device(NULL, NULL); + ok(!!device, "Failed to create a D3D device\n"); + + hr = IDirect3DDevice9Ex_CreateVertexShader(device, simple_vs, &shader); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + IDirect3DVertexShader9_Release(shader); + + IDirect3DDevice9Ex_Release(device); } START_TEST(d3d9ex) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 5d8fe10fc79..025cd556ee4 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -26202,6 +26202,7 @@ static void test_nrm_instruction(void) static void test_desktop_window(void) { + IDirect3DVertexShader9 *shader; IDirect3DDevice9 *device; IDirect3D9 *d3d; D3DCOLOR color; @@ -26209,6 +26210,17 @@ static void test_desktop_window(void) HWND window; HRESULT hr; + static const DWORD simple_vs[] = + { + 0xfffe0101, /* vs_1_1 */ + 0x0000001f, 0x80000000, 0x900f0000, /* dcl_position0 v0 */ + 0x00000009, 0xc0010000, 0x90e40000, 0xa0e40000, /* dp4 oPos.x, v0, c0 */ + 0x00000009, 0xc0020000, 0x90e40000, 0xa0e40001, /* dp4 oPos.y, v0, c1 */ + 0x00000009, 0xc0040000, 0x90e40000, 0xa0e40002, /* dp4 oPos.z, v0, c2 */ + 0x00000009, 0xc0080000, 0x90e40000, 0xa0e40003, /* dp4 oPos.w, v0, c3 */ + 0x0000ffff, /* end */ + }; + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); @@ -26236,6 +26248,16 @@ static void test_desktop_window(void) refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); + /* test device with NULL HWND */ + device = create_device(d3d, NULL, NULL, TRUE); + ok(device != NULL, "Failed to create a D3D device\n"); + + hr = IDirect3DDevice9_CreateVertexShader(device, simple_vs, &shader); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + IDirect3DVertexShader9_Release(shader); + + IDirect3DDevice9_Release(device); + IDirect3D9_Release(d3d); }

1 0