February 2020 - Wine-Commits

Zebediah Figura : d3d9: Retrieve stream frequency state from the primary stateblock.
by Alexandre Julliard Feb. 6, 2020

Feb. 6, 2020

Module: wine Branch: master Commit: 8ff3041dd4276571b246dc08bf210a45de80a3ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ff3041dd4276571b246dc08… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 3 21:17:44 2020 -0600 d3d9: Retrieve stream frequency state from the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 880e90a2ff..87d7db3d00 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3747,15 +3747,16 @@ static HRESULT WINAPI d3d9_device_SetStreamSourceFreq(IDirect3DDevice9Ex *iface, static HRESULT WINAPI d3d9_device_GetStreamSourceFreq(IDirect3DDevice9Ex *iface, UINT stream_idx, UINT *freq) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; + const struct wined3d_stream_state *stream; TRACE("iface %p, stream_idx %u, freq %p.\n", iface, stream_idx, freq); wined3d_mutex_lock(); - hr = wined3d_device_get_stream_source_freq(device->wined3d_device, stream_idx, freq); + stream = &wined3d_stateblock_get_state(device->state)->streams[stream_idx]; + *freq = stream->flags | stream->frequency; wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_SetIndices(IDirect3DDevice9Ex *iface, IDirect3DIndexBuffer9 *buffer)

1 0

Michael Stefaniuc : shlwapi/tests: Get rid of strcmp_wa().
by Alexandre Julliard Feb. 6, 2020

Feb. 6, 2020

Module: wine Branch: master Commit: 65f5a834dad4bb87f38496afc012ce2d28b407d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65f5a834dad4bb87f38496af… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Feb 6 22:41:16 2020 +0200 shlwapi/tests: Get rid of strcmp_wa(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/ordinal.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 135d82ead1..f1527eb6b8 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -95,13 +95,6 @@ static const CHAR ie_international[] = { static const CHAR acceptlanguage[] = { 'A','c','c','e','p','t','L','a','n','g','u','a','g','e',0}; -static int strcmp_wa(LPCWSTR strw, const char *stra) -{ - CHAR buf[512]; - WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL); - return lstrcmpA(stra, buf); -} - typedef struct { int id; const void *args[5]; @@ -2740,11 +2733,11 @@ static void test_SHGetIniString(void) ret = pSHGetIniStringW(TestAppW, AKeyW, out, ARRAY_SIZE(out), pathW); ok(ret == 1, "SHGetIniStringW should have given 1, instead: %d\n", ret); - ok(!strcmp_wa(out, "1"), "Expected L\"1\", got: %s\n", wine_dbgstr_w(out)); + ok(!lstrcmpW(out, L"1"), "Expected L\"1\", got: %s\n", wine_dbgstr_w(out)); ret = pSHGetIniStringW(TestAppW, AnotherKeyW, out, ARRAY_SIZE(out), pathW); ok(ret == 4, "SHGetIniStringW should have given 4, instead: %d\n", ret); - ok(!strcmp_wa(out, "asdf"), "Expected L\"asdf\", got: %s\n", wine_dbgstr_w(out)); + ok(!lstrcmpW(out, L"asdf"), "Expected L\"asdf\", got: %s\n", wine_dbgstr_w(out)); out[0] = 1; ret = pSHGetIniStringW(TestAppW, JunkKeyW, out, ARRAY_SIZE(out), pathW);

1 0

Zebediah Figura : d3d9: Stop setting the device state in d3d9_device_SetIndices().
by Alexandre Julliard Feb. 6, 2020

Feb. 6, 2020

Module: wine Branch: master Commit: 7c362357a5decf6fdb9c998a45a082678e02ddc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c362357a5decf6fdb9c998a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 3 21:17:43 2020 -0600 d3d9: Stop setting the device state in d3d9_device_SetIndices(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index f9d37ae8a9..880e90a2ff 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3776,10 +3776,7 @@ static HRESULT WINAPI d3d9_device_SetIndices(IDirect3DDevice9Ex *iface, IDirect3 wined3d_mutex_lock(); wined3d_stateblock_set_index_buffer(device->update_state, wined3d_buffer, ib ? ib->format : WINED3DFMT_UNKNOWN); if (!device->recording) - { - wined3d_device_set_index_buffer(device->wined3d_device, wined3d_buffer, ib ? ib->format : WINED3DFMT_UNKNOWN, 0); device->sysmem_ib = ib && ib->draw_buffer; - } wined3d_mutex_unlock(); return D3D_OK;

1 0

Jacek Caban : setupapi: Fix hex digit check in SetupGetBinaryField.
by Alexandre Julliard Feb. 6, 2020

Feb. 6, 2020

Module: wine Branch: master Commit: d580d2c2fdad7f6f00dd12923e475298c019b660 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d580d2c2fdad7f6f00dd1292… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 6 14:00:33 2020 +0100 setupapi: Fix hex digit check in SetupGetBinaryField. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/parser.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c index 193e5e1f97..560c2401b8 100644 --- a/dlls/setupapi/parser.c +++ b/dlls/setupapi/parser.c @@ -1803,6 +1803,15 @@ BOOL WINAPI SetupGetIntField( PINFCONTEXT context, DWORD index, PINT result ) } +static int xdigit_to_int(WCHAR c) +{ + if ('0' <= c && c <= '9') return c - '0'; + if ('a' <= c && c <= 'f') return c - 'a' + 10; + if ('A' <= c && c <= 'F') return c - 'A' + 10; + return -1; +} + + /*********************************************************************** * SetupGetBinaryField (SETUPAPI.@) */ @@ -1837,15 +1846,15 @@ BOOL WINAPI SetupGetBinaryField( PINFCONTEXT context, DWORD index, BYTE *buffer, { const WCHAR *p; DWORD value = 0; - for (p = field->text; *p && iswxdigit(*p); p++) + int d; + for (p = field->text; *p && (d = xdigit_to_int(*p)) != -1; p++) { if ((value <<= 4) > 255) { SetLastError( ERROR_INVALID_DATA ); return FALSE; } - if (*p <= '9') value |= (*p - '0'); - else value |= (towlower(*p) - 'a' + 10); + value |= d; } buffer[i - index] = value; }

1 0

Jacek Caban : propsys: Allow only ASCII digits in PSPropertyKeyFromString.
by Alexandre Julliard Feb. 6, 2020

Feb. 6, 2020

Module: wine Branch: master Commit: 6e8c2d836e637e1fbd83c231cfd846ecb9333964 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e8c2d836e637e1fbd83c231… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 6 14:00:25 2020 +0100 propsys: Allow only ASCII digits in PSPropertyKeyFromString. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propsys_main.c | 2 +- dlls/propsys/tests/propsys.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index 7ae3870efb..75963d7b6c 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -495,7 +495,7 @@ HRESULT WINAPI PSPropertyKeyFromString(LPCWSTR pszString, PROPERTYKEY *pkey) } /* Overflow is not checked. */ - while (iswdigit(*pszString)) + while ('0' <= *pszString && *pszString <= '9') { pkey->pid *= 10; pkey->pid += (*pszString - '0'); diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 191a154744..ccd075a959 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -346,6 +346,9 @@ static void test_PSPropertyKeyFromString(void) static const WCHAR fmtid_normalpidW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-', '1','2','3','4','-','1','2','3','4','-', '1','2','3','4','5','6','7','8','9','0','1','2','}',' ','1','3','5','7','9',0}; + static const WCHAR fmtid_udigitW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-', + '1','2','3','4','-','1','2','3','4','-', + '1','2','3','4','5','6','7','8','9','0','1','2','}',' ','1','2','3',0x661,'5','7','9',0}; PROPERTYKEY out_init = {GUID_MEMBERS(dummy_guid), 0xdeadbeef}; PROPERTYKEY out; HRESULT ret; @@ -422,6 +425,7 @@ static void test_PSPropertyKeyFromString(void) {fmtid_commanegspcpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 0U}}, {fmtid_negcommapidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 0}}, {fmtid_normalpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 13579}}, + {fmtid_udigitW, &out, S_OK, {GUID_MEMBERS(expect_guid), 123}}, }; int i;

1 0

Jacek Caban : atl: Allow only ASCII digit for registrar binary values.
by Alexandre Julliard Feb. 6, 2020

Feb. 6, 2020

Module: wine Branch: master Commit: ffbb1c4eb44c569a4c27ef69d2f4b787dc5e6566 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffbb1c4eb44c569a4c27ef69… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 6 14:13:21 2020 +0100 atl: Allow only ASCII digit for registrar binary values. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atl/registrar.c | 17 +++++++++++------ dlls/atl/tests/registrar.c | 4 ++-- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index 612274d1a9..586cce3201 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -99,6 +99,14 @@ static void strbuf_write(LPCOLESTR str, strbuf *buf, int len) buf->str[buf->len] = '\0'; } +static int xdigit_to_int(WCHAR c) +{ + if('0' <= c && c <= '9') return c - '0'; + if('a' <= c && c <= 'f') return c - 'a' + 10; + if('A' <= c && c <= 'F') return c - 'A' + 10; + return -1; +} + static HRESULT get_word(LPCOLESTR *str, strbuf *buf) { LPCOLESTR iter, iter2 = *str; @@ -303,15 +311,12 @@ static HRESULT do_process_key(LPCOLESTR *pstr, HKEY parent_key, strbuf *buf, BOO break; } for(i = 0; i < count && buf->str[2*i]; i++) { - WCHAR digits[3]; - if(!iswxdigit(buf->str[2*i]) || !iswxdigit(buf->str[2*i + 1])) { + int d1, d2; + if((d1 = xdigit_to_int(buf->str[2*i])) == -1 || (d2 = xdigit_to_int(buf->str[2*i + 1])) == -1) { hres = E_FAIL; break; } - digits[0] = buf->str[2*i]; - digits[1] = buf->str[2*i + 1]; - digits[2] = 0; - bytes[i] = (BYTE) wcstoul(digits, NULL, 16); + bytes[i] = (d1 << 4) | d2; } if(SUCCEEDED(hres)) { lres = RegSetValueExW(hkey, name.len ? name.str : NULL, 0, REG_BINARY, diff --git a/dlls/atl/tests/registrar.c b/dlls/atl/tests/registrar.c index 4ecb092fd6..f9ec9529dd 100644 --- a/dlls/atl/tests/registrar.c +++ b/dlls/atl/tests/registrar.c @@ -48,7 +48,7 @@ static const char textA[] = " val 'dword_quoted_hex' = d '0xA' \n" " val 'dword_unquoted_hex' = d 0xA \n" " val 'binary_quoted' = b 'deadbeef' \n" -" val 'binary_unquoted' = b deadbeef \n" +" val 'binary_unquoted' = b dead0123 \n" " } \n" "}"; @@ -124,7 +124,7 @@ static void test_registrar(void) size = 4; lret = RegQueryValueExA(key, "binary_unquoted", NULL, NULL, bytes, &size); ok(lret == ERROR_SUCCESS, "RegQueryValueA, failed, error %d\n", lret); - ok(bytes[0] == 0xde && bytes[1] == 0xad && bytes[2] == 0xbe && bytes[3] == 0xef, + ok(bytes[0] == 0xde && bytes[1] == 0xad && bytes[2] == 0x01 && bytes[3] == 0x23, "binary unquoted value was not preserved (it's 0x%02X%02X%02X%02X)\n", 0xff & bytes[0], 0xff & bytes[1], 0xff & bytes[2], 0xff & bytes[3]);

1 0

Zebediah Figura : d3d9: Stop setting the device state in d3d9_device_SetStreamSource().
by Alexandre Julliard Feb. 6, 2020

Feb. 6, 2020

Module: wine Branch: master Commit: 57c57fb5a1851480e78616f189ee9e780a2d86d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57c57fb5a1851480e78616f1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 3 21:17:42 2020 -0600 d3d9: Stop setting the device state in d3d9_device_SetStreamSource(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index dcd54cac48..f9d37ae8a9 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3680,14 +3680,10 @@ static HRESULT WINAPI d3d9_device_SetStreamSource(IDirect3DDevice9Ex *iface, hr = wined3d_stateblock_set_stream_source(device->update_state, stream_idx, wined3d_buffer, offset, stride); if (SUCCEEDED(hr) && !device->recording) { - hr = wined3d_device_set_stream_source(device->wined3d_device, stream_idx, wined3d_buffer, offset, stride); - if (SUCCEEDED(hr)) - { - if (buffer_impl && buffer_impl->draw_buffer) - device->sysmem_vb |= (1u << stream_idx); - else - device->sysmem_vb &= ~(1u << stream_idx); - } + if (buffer_impl && buffer_impl->draw_buffer) + device->sysmem_vb |= (1u << stream_idx); + else + device->sysmem_vb &= ~(1u << stream_idx); } wined3d_mutex_unlock();

1 0

Zebediah Figura : d3d9: Set the primary stateblock when executing draw calls.
by Alexandre Julliard Feb. 6, 2020

Feb. 6, 2020

Module: wine Branch: master Commit: 821ba100609ddd44c1a502ae1bc45ceb68a475be URL: https://source.winehq.org/git/wine.git/?a=commit;h=821ba100609ddd44c1a502ae… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 3 21:17:41 2020 -0600 d3d9: Set the primary stateblock when executing draw calls. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 111 ++++++++++++++++++++++++++++------------------------- 1 file changed, 59 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=821ba100609ddd44c1a5…

1 0

Zebediah Figura : ddraw: Stop setting the device state when setting some default render states.
by Alexandre Julliard Feb. 6, 2020

Feb. 6, 2020

Module: wine Branch: master Commit: dd561ba229e5c97f994943534a85ac5d9ca41e45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd561ba229e5c97f99494353… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 30 21:26:07 2020 -0600 ddraw: Stop setting the device state when setting some default render states. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 10 ---------- dlls/ddraw/surface.c | 2 -- 2 files changed, 12 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 3a35eaeb5e..03b03f4584 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3578,7 +3578,6 @@ static void setup_lighting(const struct d3d_device *device, DWORD fvf, DWORD fla enable = FALSE; wined3d_stateblock_set_render_state(device->state, WINED3D_RS_LIGHTING, enable); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_LIGHTING, enable); } @@ -7060,22 +7059,13 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, wined3d_stateblock_set_render_state(ddraw->state, WINED3D_RS_ZENABLE, d3d_device_update_depth_stencil(device)); - wined3d_device_set_render_state(ddraw->wined3d_device, WINED3D_RS_ZENABLE, - d3d_device_update_depth_stencil(device)); if (version == 1) /* Color keying is initially enabled for version 1 devices. */ - { wined3d_stateblock_set_render_state(ddraw->state, WINED3D_RS_COLORKEYENABLE, TRUE); - wined3d_device_set_render_state(ddraw->wined3d_device, WINED3D_RS_COLORKEYENABLE, TRUE); - } else if (version == 2) - { wined3d_stateblock_set_render_state(ddraw->state, WINED3D_RS_SPECULARENABLE, TRUE); - wined3d_device_set_render_state(ddraw->wined3d_device, WINED3D_RS_SPECULARENABLE, TRUE); - } if (version < 7) { wined3d_stateblock_set_render_state(ddraw->state, WINED3D_RS_NORMALIZENORMALS, TRUE); - wined3d_device_set_render_state(ddraw->wined3d_device, WINED3D_RS_NORMALIZENORMALS, TRUE); IDirect3DDevice3_SetRenderState(&device->IDirect3DDevice3_iface, D3DRENDERSTATE_TEXTUREMAPBLEND, D3DTBLEND_MODULATE); } diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 03546e17f1..442aeed67b 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6089,8 +6089,6 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ wined3d_stateblock_set_render_state(ddraw->state, WINED3D_RS_ZENABLE, !!swapchain_desc.enable_auto_depth_stencil); - wined3d_device_set_render_state(ddraw->wined3d_device, WINED3D_RS_ZENABLE, - !!swapchain_desc.enable_auto_depth_stencil); } }

1 0

Sven Baars : ddraw/tests: Reverse cleanup order in test_coop_level_threaded().
by Alexandre Julliard Feb. 6, 2020

Feb. 6, 2020

Module: wine Branch: master Commit: 7aa9d6970ca1c04a80137f4189748661456e608d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7aa9d6970ca1c04a80137f41… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sun Feb 2 14:45:52 2020 +0100 ddraw/tests: Reverse cleanup order in test_coop_level_threaded(). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 16c0cfb4e5..45a24e3ffb 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -1254,8 +1254,8 @@ static void test_coop_level_threaded(void) hr = IDirectDraw_SetCooperativeLevel(ddraw, p.window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); - IDirectDraw_Release(ddraw); destroy_window_thread(&p); + IDirectDraw_Release(ddraw); } static ULONG get_refcount(IUnknown *test_iface) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index f0ae458d85..3fccd02f1e 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -1142,8 +1142,8 @@ static void test_coop_level_threaded(void) hr = IDirectDraw2_SetCooperativeLevel(ddraw, p.window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); - IDirectDraw2_Release(ddraw); destroy_window_thread(&p); + IDirectDraw2_Release(ddraw); } static void test_depth_blit(void) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index b6cb97c3c9..d97834e542 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -1314,8 +1314,8 @@ static void test_coop_level_threaded(void) hr = IDirectDraw4_SetCooperativeLevel(ddraw, p.window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); - IDirectDraw4_Release(ddraw); destroy_window_thread(&p); + IDirectDraw4_Release(ddraw); } static void test_depth_blit(void) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 0afbe76b6c..bbc61087ca 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -1268,8 +1268,8 @@ static void test_coop_level_threaded(void) hr = IDirectDraw7_SetCooperativeLevel(ddraw, p.window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); - IDirectDraw7_Release(ddraw); destroy_window_thread(&p); + IDirectDraw7_Release(ddraw); } static void test_depth_blit(void)

1 0