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

Piotr Caban : ucrtbase/tests: Set invalid_parameter_handler once.
by Alexandre Julliard March 26, 2020

March 26, 2020

Module: wine Branch: master Commit: e115d5c71844dd4255785279ccc8cbe9b6a07a3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e115d5c71844dd4255785279… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 26 11:42:00 2020 +0100 ucrtbase/tests: Set invalid_parameter_handler once. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/printf.c | 9 +++------ dlls/ucrtbase/tests/string.c | 27 +++------------------------ 2 files changed, 6 insertions(+), 30 deletions(-) diff --git a/dlls/ucrtbase/tests/printf.c b/dlls/ucrtbase/tests/printf.c index d6a1aa048e..8cacbbb79a 100644 --- a/dlls/ucrtbase/tests/printf.c +++ b/dlls/ucrtbase/tests/printf.c @@ -376,9 +376,6 @@ static void test_fwprintf(void) fclose(fp); unlink(file_name); - ok(_set_invalid_parameter_handler(test_invalid_parameter_handler) == NULL, - "Invalid parameter handler was already set\n"); - /* NULL format */ errno = 0xdeadbeef; SET_EXPECT(invalid_parameter_handler); @@ -398,9 +395,6 @@ static void test_fwprintf(void) /* format using % with NULL arglist*/ /* crashes on Windows */ /* ret = __stdio_common_vfwprintf(0, fp, cont_fmt, NULL, NULL); */ - - ok(_set_invalid_parameter_handler(NULL) == test_invalid_parameter_handler, - "Cannot reset invalid parameter handler\n"); } static int WINAPIV _vsnprintf_s_wrapper(char *str, size_t sizeOfBuffer, @@ -628,6 +622,9 @@ static void test_printf_natural_string(void) START_TEST(printf) { + ok(_set_invalid_parameter_handler(test_invalid_parameter_handler) == NULL, + "Invalid parameter handler was already set\n"); + test_snprintf(); test_swprintf(); test_fprintf(); diff --git a/dlls/ucrtbase/tests/string.c b/dlls/ucrtbase/tests/string.c index 74f0f56be0..6e6f1e80e2 100644 --- a/dlls/ucrtbase/tests/string.c +++ b/dlls/ucrtbase/tests/string.c @@ -150,9 +150,6 @@ static void test__memicmp(void) static const char *s2 = "aBd"; int ret; - ok(_set_invalid_parameter_handler(test_invalid_parameter_handler) == NULL, - "Invalid parameter handler was already set\n"); - ret = _memicmp(NULL, NULL, 0); ok(!ret, "got %d\n", ret); @@ -182,9 +179,6 @@ static void test__memicmp(void) ret = _memicmp(s1, s2, 3); ok(ret == -1, "got %d\n", ret); - - ok(_set_invalid_parameter_handler(NULL) == test_invalid_parameter_handler, - "Cannot reset invalid parameter handler\n"); } static void test__memicmp_l(void) @@ -193,9 +187,6 @@ static void test__memicmp_l(void) static const char *s2 = "aBd"; int ret; - ok(_set_invalid_parameter_handler(test_invalid_parameter_handler) == NULL, - "Invalid parameter handler was already set\n"); - ret = _memicmp_l(NULL, NULL, 0, NULL); ok(!ret, "got %d\n", ret); @@ -225,9 +216,6 @@ static void test__memicmp_l(void) ret = _memicmp_l(s1, s2, 3, NULL); ok(ret == -1, "got %d\n", ret); - - ok(_set_invalid_parameter_handler(NULL) == test_invalid_parameter_handler, - "Cannot reset invalid parameter handler\n"); } @@ -255,17 +243,11 @@ static void test___strncnt(void) ok(ret == strncnt_tests[i].ret, "%u: unexpected return value %u.\n", i, (int)ret); } - ok(_set_invalid_parameter_handler(test_invalid_parameter_handler) == NULL, - "Invalid parameter handler was already set\n"); - if (0) /* crashes */ { ret = __strncnt(NULL, 0); ret = __strncnt(NULL, 1); } - - ok(_set_invalid_parameter_handler(NULL) == test_invalid_parameter_handler, - "Cannot reset invalid parameter handler\n"); } static void test_C_locale(void) @@ -436,9 +418,6 @@ static void test__strnicmp(void) static const char str2[] = "test"; int ret; - ok(_set_invalid_parameter_handler(test_invalid_parameter_handler) == NULL, - "Invalid parameter handler was already set\n"); - SET_EXPECT(invalid_parameter_handler); errno = 0xdeadbeef; ret = _strnicmp(str1, str2, -1); @@ -448,13 +427,13 @@ static void test__strnicmp(void) ret = _strnicmp(str1, str2, 0x7fffffff); ok(!ret, "got %d.\n", ret); - - ok(_set_invalid_parameter_handler(NULL) == test_invalid_parameter_handler, - "Cannot reset invalid parameter handler\n"); } START_TEST(string) { + ok(_set_invalid_parameter_handler(test_invalid_parameter_handler) == NULL, + "Invalid parameter handler was already set\n"); + test_strtod(); test__memicmp(); test__memicmp_l();

1 0

Paul Gofman : ddraw: Deny locking lost surfaces.
by Alexandre Julliard March 26, 2020

March 26, 2020

Module: wine Branch: master Commit: 530a3d94de949030f8d74bacd6c20986b32f1a31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=530a3d94de949030f8d74bac… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Mar 26 16:09:41 2020 +0300 ddraw: Deny locking lost surfaces. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 18 ++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 13 +++++++++++++ 2 files changed, 31 insertions(+) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index b6a7ebb734..9850a1e8c9 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1110,6 +1110,12 @@ static HRESULT WINAPI ddraw_surface7_Lock(IDirectDrawSurface7 *iface, if (!surface_validate_lock_desc(surface, (DDSURFACEDESC *)surface_desc, &surface_desc_size)) return DDERR_INVALIDPARAMS; + if (ddraw_surface_is_lost(surface)) + { + WARN("Surface is lost.\n"); + return DDERR_SURFACELOST; + } + return surface_lock(surface, rect, surface_desc, surface_desc_size, flags, h); } @@ -1125,6 +1131,12 @@ static HRESULT WINAPI ddraw_surface4_Lock(IDirectDrawSurface4 *iface, RECT *rect if (!surface_validate_lock_desc(surface, (DDSURFACEDESC *)surface_desc, &surface_desc_size)) return DDERR_INVALIDPARAMS; + if (ddraw_surface_is_lost(surface)) + { + WARN("Surface is lost.\n"); + return DDERR_SURFACELOST; + } + return surface_lock(surface, rect, surface_desc, surface_desc_size, flags, h); } @@ -1138,6 +1150,12 @@ static HRESULT ddraw_surface_lock_ddsd(struct ddraw_surface *surface, RECT *rect if (!surface_validate_lock_desc(surface, surface_desc, &surface_desc_size)) return DDERR_INVALIDPARAMS; + if (ddraw_surface_is_lost(surface)) + { + WARN("Surface is lost.\n"); + return DDERR_SURFACELOST; + } + surface_desc2.dwSize = surface_desc->dwSize; surface_desc2.dwFlags = 0; hr = surface_lock(surface, rect, &surface_desc2, surface_desc_size, flags, h); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 5c0c5bb7c3..abe5249cc0 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -1056,6 +1056,7 @@ static void test_coop_level_d3d_state(void) IDirectDrawSurface7 *rt, *surface; IDirect3DDevice7 *device; IDirectDraw7 *ddraw; + DDSURFACEDESC2 lock; IDirect3D7 *d3d; D3DCOLOR color; DDSCAPS2 caps; @@ -1116,6 +1117,13 @@ static void test_coop_level_d3d_state(void) hr = IDirectDrawSurface7_IsLost(rt); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + memset(&lock, 0, sizeof(lock)); + lock.dwSize = sizeof(lock); + lock.lpSurface = (void *)0xdeadbeef; + hr = IDirectDrawSurface7_Lock(rt, NULL, &lock, DDLOCK_READONLY, NULL); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + ok(lock.lpSurface == (void *)0xdeadbeef, "Got unexpected lock.lpSurface %p.\n", lock.lpSurface); + memset(&caps, 0, sizeof(caps)); caps.dwCaps = DDSCAPS_ZBUFFER; hr = IDirectDrawSurface7_GetAttachedSurface(rt, &caps, &surface); @@ -1127,6 +1135,11 @@ static void test_coop_level_d3d_state(void) hr = IDirectDraw7_RestoreAllSurfaces(ddraw); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_Lock(rt, NULL, &lock, DDLOCK_READONLY, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_Unlock(rt, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + caps.dwCaps = DDSCAPS_ZBUFFER; hr = IDirectDrawSurface7_GetAttachedSurface(rt, &caps, &surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : mf: Clean traces format for topology methods.
by Alexandre Julliard March 26, 2020

March 26, 2020

Module: wine Branch: master Commit: 979c9b2ba2a5a04ff39b2d07a4cd541a43492509 URL: https://source.winehq.org/git/wine.git/?a=commit;h=979c9b2ba2a5a04ff39b2d07… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 26 16:17:15 2020 +0300 mf: Clean traces format for topology methods. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/topology.c | 166 ++++++++++++++++++++++++++--------------------------- 1 file changed, 83 insertions(+), 83 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=979c9b2ba2a5a04ff39b…

1 0

Paul Gofman : ddraw/tests: Test locking lost surface for ddraw1.
by Alexandre Julliard March 26, 2020

March 26, 2020

Module: wine Branch: master Commit: 792dc34978c6bcc4bd08a39cb6b4ef9510e3dabe URL: https://source.winehq.org/git/wine.git/?a=commit;h=792dc34978c6bcc4bd08a39c… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Mar 26 16:09:44 2020 +0300 ddraw/tests: Test locking lost surface for ddraw1. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 5bfca43008..ff100c64aa 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -1085,6 +1085,7 @@ static void test_coop_level_d3d_state(void) IDirect3DViewport *viewport; IDirect3DDevice *device; D3DMATERIAL material; + DDSURFACEDESC lock; IDirectDraw *ddraw; D3DCOLOR color; HWND window; @@ -1106,18 +1107,31 @@ static void test_coop_level_d3d_state(void) viewport_set_background(device, viewport, background); hr = IDirect3DDevice_QueryInterface(device, &IID_IDirectDrawSurface, (void **)&rt); - ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DViewport_Clear(viewport, 1, &clear_rect, D3DCLEAR_TARGET); - ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); color = get_surface_color(rt, 320, 240); ok(compare_color(color, 0x00ff0000, 1), "Got unexpected color 0x%08x.\n", color); hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); - ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(rt); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + + memset(&lock, 0, sizeof(lock)); + lock.dwSize = sizeof(lock); + lock.lpSurface = (void *)0xdeadbeef; + hr = IDirectDrawSurface_Lock(rt, NULL, &lock, DDLOCK_READONLY, NULL); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + ok(lock.lpSurface == (void *)0xdeadbeef, "Got unexpected lock.lpSurface %p.\n", lock.lpSurface); + hr = restore_surfaces(ddraw); - ok(SUCCEEDED(hr), "Failed to restore surfaces, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDrawSurface_Lock(rt, NULL, &lock, DDLOCK_READONLY, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface2_Unlock(rt, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); memset(&material, 0, sizeof(material)); material.dwSize = sizeof(material); @@ -1126,13 +1140,13 @@ static void test_coop_level_d3d_state(void) U3(U(material).diffuse).b = 0.0f; U4(U(material).diffuse).a = 1.0f; hr = IDirect3DMaterial_SetMaterial(background, &material); - ok(SUCCEEDED(hr), "Failed to set material data, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice_QueryInterface(device, &IID_IDirectDrawSurface, (void **)&surface); - ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(surface == rt, "Got unexpected surface %p.\n", surface); hr = IDirect3DViewport_Clear(viewport, 1, &clear_rect, D3DCLEAR_TARGET); - ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); color = get_surface_color(rt, 320, 240); ok(compare_color(color, 0x0000ff00, 1) || broken(compare_color(color, 0x00000000, 1)), "Got unexpected color 0x%08x.\n", color);

1 0

Jacek Caban : dbghelp: Use LONG_PTR instead of long type.
by Alexandre Julliard March 26, 2020

March 26, 2020

Module: wine Branch: master Commit: f803da493aeb4cf118fb9b076e8042c2535fbcdb URL: https://source.winehq.org/git/wine.git/?a=commit;h=f803da493aeb4cf118fb9b07… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 26 16:51:49 2020 +0100 dbghelp: Use LONG_PTR instead of long type. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/cpu_i386.c | 2 +- dlls/dbghelp/dbghelp_private.h | 68 ++++++++++++++-------------- dlls/dbghelp/dwarf.c | 100 ++++++++++++++++++++--------------------- dlls/dbghelp/elf_module.c | 50 ++++++++++----------- dlls/dbghelp/image_private.h | 2 +- dlls/dbghelp/macho_module.c | 70 ++++++++++++++--------------- dlls/dbghelp/minidump.c | 2 +- dlls/dbghelp/module.c | 4 +- dlls/dbghelp/msc.c | 6 +-- dlls/dbghelp/stabs.c | 54 +++++++++++----------- dlls/dbghelp/storage.c | 8 ++-- dlls/dbghelp/symbol.c | 18 ++++---- dlls/dbghelp/type.c | 2 +- 13 files changed, 193 insertions(+), 193 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f803da493aeb4cf118fb…

1 0

Matteo Bruni : wined3d: Fix ARB_TEXTURE_STORAGE_MULTISAMPLE core_extension[] entry.
by Alexandre Julliard March 26, 2020

March 26, 2020

Module: wine Branch: master Commit: a281544bde79592bdd128e8691ce310ce260c3da URL: https://source.winehq.org/git/wine.git/?a=commit;h=a281544bde79592bdd128e86… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 26 13:25:59 2020 +0100 wined3d: Fix ARB_TEXTURE_STORAGE_MULTISAMPLE core_extension[] entry. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 33ba2c01ca..77fe4ca720 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3423,7 +3423,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_STENCIL_TEXTURING, MAKEDWORD_VERSION(4, 3)}, {ARB_TEXTURE_BUFFER_RANGE, MAKEDWORD_VERSION(4, 3)}, {ARB_TEXTURE_QUERY_LEVELS, MAKEDWORD_VERSION(4, 3)}, - {ARB_TEXTURE_STORAGE_MULTISAMPLE, MAKEDWORD_VERSION(4, 2)}, + {ARB_TEXTURE_STORAGE_MULTISAMPLE, MAKEDWORD_VERSION(4, 3)}, {ARB_TEXTURE_VIEW, MAKEDWORD_VERSION(4, 3)}, {ARB_BUFFER_STORAGE, MAKEDWORD_VERSION(4, 4)},

1 0

Paul Gofman : ddraw: Factor out ddraw_surface_lock_ddsd() function.
by Alexandre Julliard March 26, 2020

March 26, 2020

Module: wine Branch: master Commit: 62ff00b066bc248cc877afb9249dfb4fb88fa23d URL: https://source.winehq.org/git/wine.git/?a=commit;h=62ff00b066bc248cc877afb9… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Mar 26 16:09:40 2020 +0300 ddraw: Factor out ddraw_surface_lock_ddsd() function. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 43 ++++++++++++++----------------------------- 1 file changed, 14 insertions(+), 29 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 9d937414ae..b6a7ebb734 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1128,17 +1128,13 @@ static HRESULT WINAPI ddraw_surface4_Lock(IDirectDrawSurface4 *iface, RECT *rect return surface_lock(surface, rect, surface_desc, surface_desc_size, flags, h); } -static HRESULT WINAPI ddraw_surface3_Lock(IDirectDrawSurface3 *iface, RECT *rect, +static HRESULT ddraw_surface_lock_ddsd(struct ddraw_surface *surface, RECT *rect, DDSURFACEDESC *surface_desc, DWORD flags, HANDLE h) { - struct ddraw_surface *surface = impl_from_IDirectDrawSurface3(iface); unsigned int surface_desc_size; DDSURFACEDESC2 surface_desc2; HRESULT hr; - TRACE("iface %p, rect %s, surface_desc %p, flags %#x, h %p.\n", - iface, wine_dbgstr_rect(rect), surface_desc, flags, h); - if (!surface_validate_lock_desc(surface, surface_desc, &surface_desc_size)) return DDERR_INVALIDPARAMS; @@ -1150,48 +1146,37 @@ static HRESULT WINAPI ddraw_surface3_Lock(IDirectDrawSurface3 *iface, RECT *rect return hr; } +static HRESULT WINAPI ddraw_surface3_Lock(IDirectDrawSurface3 *iface, RECT *rect, + DDSURFACEDESC *surface_desc, DWORD flags, HANDLE h) +{ + struct ddraw_surface *surface = impl_from_IDirectDrawSurface3(iface); + + TRACE("iface %p, rect %s, surface_desc %p, flags %#x, h %p.\n", + iface, wine_dbgstr_rect(rect), surface_desc, flags, h); + + return ddraw_surface_lock_ddsd(surface, rect, surface_desc, flags, h); +} + static HRESULT WINAPI ddraw_surface2_Lock(IDirectDrawSurface2 *iface, RECT *rect, DDSURFACEDESC *surface_desc, DWORD flags, HANDLE h) { struct ddraw_surface *surface = impl_from_IDirectDrawSurface2(iface); - unsigned int surface_desc_size; - DDSURFACEDESC2 surface_desc2; - HRESULT hr; TRACE("iface %p, rect %s, surface_desc %p, flags %#x, h %p.\n", iface, wine_dbgstr_rect(rect), surface_desc, flags, h); - if (!surface_validate_lock_desc(surface, surface_desc, &surface_desc_size)) - return DDERR_INVALIDPARAMS; - - surface_desc2.dwSize = surface_desc->dwSize; - surface_desc2.dwFlags = 0; - hr = surface_lock(surface, rect, &surface_desc2, surface_desc_size, flags, h); - DDSD2_to_DDSD(&surface_desc2, surface_desc); - surface_desc->dwSize = surface_desc2.dwSize; - return hr; + return ddraw_surface_lock_ddsd(surface, rect, surface_desc, flags, h); } static HRESULT WINAPI ddraw_surface1_Lock(IDirectDrawSurface *iface, RECT *rect, DDSURFACEDESC *surface_desc, DWORD flags, HANDLE h) { struct ddraw_surface *surface = impl_from_IDirectDrawSurface(iface); - unsigned int surface_desc_size; - DDSURFACEDESC2 surface_desc2; - HRESULT hr; TRACE("iface %p, rect %s, surface_desc %p, flags %#x, h %p.\n", iface, wine_dbgstr_rect(rect), surface_desc, flags, h); - if (!surface_validate_lock_desc(surface, surface_desc, &surface_desc_size)) - return DDERR_INVALIDPARAMS; - - surface_desc2.dwSize = surface_desc->dwSize; - surface_desc2.dwFlags = 0; - hr = surface_lock(surface, rect, &surface_desc2, surface_desc_size, flags, h); - DDSD2_to_DDSD(&surface_desc2, surface_desc); - surface_desc->dwSize = surface_desc2.dwSize; - return hr; + return ddraw_surface_lock_ddsd(surface, rect, surface_desc, flags, h); } /*****************************************************************************

1 0

Paul Gofman : ddraw/tests: Test locking lost surface for ddraw2.
by Alexandre Julliard March 26, 2020

March 26, 2020

Module: wine Branch: master Commit: 98b8f680b18a1c073ae6ec9eb07826789a6e68b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98b8f680b18a1c073ae6ec9e… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Mar 26 16:09:43 2020 +0300 ddraw/tests: Test locking lost surface for ddraw2. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw2.c | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index b472b3d588..5bb5b1baad 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -924,6 +924,7 @@ static void test_coop_level_d3d_state(void) IDirect3DDevice2 *device; D3DMATERIAL material; IDirectDraw2 *ddraw; + DDSURFACEDESC lock; D3DCOLOR color; DWORD value; HWND window; @@ -958,26 +959,39 @@ static void test_coop_level_d3d_state(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice2_GetRenderTarget(device, &rt); - ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice2_GetRenderState(device, D3DRENDERSTATE_ZENABLE, &value); - ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(!!value, "Got unexpected z-enable state %#x.\n", value); hr = IDirect3DDevice2_GetRenderState(device, D3DRENDERSTATE_ALPHABLENDENABLE, &value); - ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(!value, "Got unexpected alpha blend enable state %#x.\n", value); hr = IDirect3DDevice2_SetRenderState(device, D3DRENDERSTATE_ALPHABLENDENABLE, TRUE); - ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DViewport2_Clear(viewport, 1, &clear_rect, D3DCLEAR_TARGET); - ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); color = get_surface_color(rt, 320, 240); ok(compare_color(color, 0x00ff0000, 1), "Got unexpected color 0x%08x.\n", color); hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); - ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(rt); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + + memset(&lock, 0, sizeof(lock)); + lock.dwSize = sizeof(lock); + lock.lpSurface = (void *)0xdeadbeef; + hr = IDirectDrawSurface2_Lock(rt, NULL, &lock, DDLOCK_READONLY, NULL); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + ok(lock.lpSurface == (void *)0xdeadbeef, "Got unexpected lock.lpSurface %p.\n", lock.lpSurface); + hr = restore_surfaces(ddraw); - ok(SUCCEEDED(hr), "Failed to restore surfaces, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDrawSurface2_Lock(rt, NULL, &lock, DDLOCK_READONLY, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface2_Unlock(rt, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); memset(&material, 0, sizeof(material)); material.dwSize = sizeof(material); @@ -986,19 +1000,19 @@ static void test_coop_level_d3d_state(void) U3(U(material).diffuse).b = 0.0f; U4(U(material).diffuse).a = 1.0f; hr = IDirect3DMaterial2_SetMaterial(background, &material); - ok(SUCCEEDED(hr), "Failed to set material data, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice2_GetRenderTarget(device, &surface); - ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(surface == rt, "Got unexpected surface %p.\n", surface); hr = IDirect3DDevice2_GetRenderState(device, D3DRENDERSTATE_ZENABLE, &value); - ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(!!value, "Got unexpected z-enable state %#x.\n", value); hr = IDirect3DDevice2_GetRenderState(device, D3DRENDERSTATE_ALPHABLENDENABLE, &value); - ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(!!value, "Got unexpected alpha blend enable state %#x.\n", value); hr = IDirect3DViewport2_Clear(viewport, 1, &clear_rect, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER); - ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); color = get_surface_color(rt, 320, 240); ok(compare_color(color, 0x0000ff00, 1) || broken(compare_color(color, 0x00000000, 1)), "Got unexpected color 0x%08x.\n", color);

1 0

Paul Gofman : ddraw/tests: Test locking lost surface for ddraw4.
by Alexandre Julliard March 26, 2020

March 26, 2020

Module: wine Branch: master Commit: d79f5a2a9f4ad18dd4c83dce30c09f9df11c4fc3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d79f5a2a9f4ad18dd4c83dce… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Mar 26 16:09:42 2020 +0300 ddraw/tests: Test locking lost surface for ddraw4. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw4.c | 40 +++++++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 1e6cf4c446..fc3a415433 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -1111,6 +1111,7 @@ static void test_coop_level_d3d_state(void) IDirect3DViewport3 *viewport; IDirect3DDevice3 *device; IDirectDraw4 *ddraw; + DDSURFACEDESC2 lock; IDirect3D3 *d3d; D3DCOLOR color; DWORD value; @@ -1146,43 +1147,56 @@ static void test_coop_level_d3d_state(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice3_GetRenderTarget(device, &rt); - ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice3_GetRenderState(device, D3DRENDERSTATE_ZENABLE, &value); - ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(!!value, "Got unexpected z-enable state %#x.\n", value); hr = IDirect3DDevice3_GetRenderState(device, D3DRENDERSTATE_ALPHABLENDENABLE, &value); - ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(!value, "Got unexpected alpha blend enable state %#x.\n", value); hr = IDirect3DDevice3_SetRenderState(device, D3DRENDERSTATE_ALPHABLENDENABLE, TRUE); - ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DViewport3_Clear2(viewport, 1, &clear_rect, D3DCLEAR_TARGET, 0xffff0000, 0.0f, 0); - ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); color = get_surface_color(rt, 320, 240); ok(compare_color(color, 0x00ff0000, 1), "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice3_GetDirect3D(device, &d3d); - ok(SUCCEEDED(hr), "Failed to get d3d interface, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3D3_QueryInterface(d3d, &IID_IDirectDraw4, (void **)&ddraw); - ok(SUCCEEDED(hr), "Failed to get ddraw interface, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); IDirect3D3_Release(d3d); hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); - ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(rt); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + + memset(&lock, 0, sizeof(lock)); + lock.dwSize = sizeof(lock); + lock.lpSurface = (void *)0xdeadbeef; + hr = IDirectDrawSurface4_Lock(rt, NULL, &lock, DDLOCK_READONLY, NULL); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + ok(lock.lpSurface == (void *)0xdeadbeef, "Got unexpected lock.lpSurface %p.\n", lock.lpSurface); + hr = IDirectDraw4_RestoreAllSurfaces(ddraw); - ok(SUCCEEDED(hr), "Failed to restore surfaces, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDrawSurface4_Lock(rt, NULL, &lock, DDLOCK_READONLY, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_Unlock(rt, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice3_GetRenderTarget(device, &surface); - ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(surface == rt, "Got unexpected surface %p.\n", surface); hr = IDirect3DDevice3_GetRenderState(device, D3DRENDERSTATE_ZENABLE, &value); - ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(!!value, "Got unexpected z-enable state %#x.\n", value); hr = IDirect3DDevice3_GetRenderState(device, D3DRENDERSTATE_ALPHABLENDENABLE, &value); - ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(!!value, "Got unexpected alpha blend enable state %#x.\n", value); hr = IDirect3DViewport3_Clear2(viewport, 1, &clear_rect, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff00ff00, 1.0f, 0); - ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); color = get_surface_color(rt, 320, 240); ok(compare_color(color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", color);

1 0

Paul Gofman : ddraw: Factor out ddraw_surface_is_lost() function.
by Alexandre Julliard March 26, 2020

March 26, 2020

Module: wine Branch: master Commit: d36a45e55387efc017b32da3ba7fdd9e8f505aa6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d36a45e55387efc017b32da3… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Mar 26 16:09:39 2020 +0300 ddraw: Factor out ddraw_surface_is_lost() function. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 85c1ef4966..9d937414ae 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -33,6 +33,11 @@ static inline struct ddraw_surface *impl_from_IDirectDrawGammaControl(IDirectDra return CONTAINING_RECORD(iface, struct ddraw_surface, IDirectDrawGammaControl_iface); } +static BOOL ddraw_surface_is_lost(const struct ddraw_surface *surface) +{ + return surface->ddraw->device_state != DDRAW_DEVICE_STATE_OK || surface->is_lost; +} + /* This is slow, of course. Also, in case of locks, we can't prevent other * applications from drawing to the screen while we've locked the frontbuffer. * We'd like to do this in wined3d instead, but for that to work wined3d needs @@ -766,7 +771,7 @@ static HRESULT WINAPI ddraw_surface7_GetAttachedSurface(IDirectDrawSurface7 *ifa TRACE("iface %p, caps %p, attachment %p.\n", iface, caps, surface); - if (IDirectDrawSurface7_IsLost(&head_surface->IDirectDrawSurface7_iface) != DD_OK) + if (ddraw_surface_is_lost(head_surface)) { WARN("Surface %p is lost.\n", head_surface); @@ -1291,7 +1296,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 if (src == iface || !(dst_impl->surface_desc.ddsCaps.dwCaps & (DDSCAPS_FRONTBUFFER | DDSCAPS_OVERLAY))) return DDERR_NOTFLIPPABLE; - if (IDirectDrawSurface7_IsLost(iface) == DDERR_SURFACELOST) + if (ddraw_surface_is_lost(dst_impl)) return DDERR_SURFACELOST; wined3d_mutex_lock(); @@ -3681,10 +3686,7 @@ static HRESULT WINAPI ddraw_surface7_IsLost(IDirectDrawSurface7 *iface) TRACE("iface %p.\n", iface); - if (surface->ddraw->device_state != DDRAW_DEVICE_STATE_OK || surface->is_lost) - return DDERR_SURFACELOST; - - return DD_OK; + return ddraw_surface_is_lost(surface) ? DDERR_SURFACELOST : DD_OK; } static HRESULT WINAPI ddraw_surface4_IsLost(IDirectDrawSurface4 *iface) @@ -3693,7 +3695,7 @@ static HRESULT WINAPI ddraw_surface4_IsLost(IDirectDrawSurface4 *iface) TRACE("iface %p.\n", iface); - return ddraw_surface7_IsLost(&surface->IDirectDrawSurface7_iface); + return ddraw_surface_is_lost(surface) ? DDERR_SURFACELOST : DD_OK; } static HRESULT WINAPI ddraw_surface3_IsLost(IDirectDrawSurface3 *iface) @@ -3702,7 +3704,7 @@ static HRESULT WINAPI ddraw_surface3_IsLost(IDirectDrawSurface3 *iface) TRACE("iface %p.\n", iface); - return ddraw_surface7_IsLost(&surface->IDirectDrawSurface7_iface); + return ddraw_surface_is_lost(surface) ? DDERR_SURFACELOST : DD_OK; } static HRESULT WINAPI ddraw_surface2_IsLost(IDirectDrawSurface2 *iface) @@ -3711,7 +3713,7 @@ static HRESULT WINAPI ddraw_surface2_IsLost(IDirectDrawSurface2 *iface) TRACE("iface %p.\n", iface); - return ddraw_surface7_IsLost(&surface->IDirectDrawSurface7_iface); + return ddraw_surface_is_lost(surface) ? DDERR_SURFACELOST : DD_OK; } static HRESULT WINAPI ddraw_surface1_IsLost(IDirectDrawSurface *iface) @@ -3720,7 +3722,7 @@ static HRESULT WINAPI ddraw_surface1_IsLost(IDirectDrawSurface *iface) TRACE("iface %p.\n", iface); - return ddraw_surface7_IsLost(&surface->IDirectDrawSurface7_iface); + return ddraw_surface_is_lost(surface) ? DDERR_SURFACELOST : DD_OK; } /***************************************************************************** @@ -4774,7 +4776,7 @@ static HRESULT WINAPI ddraw_surface7_GetPalette(IDirectDrawSurface7 *iface, IDir if (!palette) return DDERR_INVALIDPARAMS; - if (IDirectDrawSurface7_IsLost(iface) == DDERR_SURFACELOST) + if (ddraw_surface_is_lost(surface)) { WARN("Surface lost, returning DDERR_SURFACELOST.\n"); return DDERR_SURFACELOST; @@ -4970,7 +4972,7 @@ static HRESULT WINAPI ddraw_surface7_SetPalette(IDirectDrawSurface7 *iface, IDir if (surface->surface_desc.ddsCaps.dwCaps2 & DDSCAPS2_MIPMAPSUBLEVEL) return DDERR_NOTONMIPMAPSUBLEVEL; - if (IDirectDrawSurface7_IsLost(iface) == DDERR_SURFACELOST) + if (ddraw_surface_is_lost(surface)) { WARN("Surface lost, returning DDERR_SURFACELOST.\n"); return DDERR_SURFACELOST; @@ -4985,7 +4987,7 @@ static HRESULT WINAPI ddraw_surface4_SetPalette(IDirectDrawSurface4 *iface, IDir TRACE("iface %p, palette %p.\n", iface, palette); - if (IDirectDrawSurface4_IsLost(iface) == DDERR_SURFACELOST) + if (ddraw_surface_is_lost(surface)) { WARN("Surface lost, returning DDERR_SURFACELOST.\n"); return DDERR_SURFACELOST; @@ -5000,7 +5002,7 @@ static HRESULT WINAPI ddraw_surface3_SetPalette(IDirectDrawSurface3 *iface, IDir TRACE("iface %p, palette %p.\n", iface, palette); - if (IDirectDrawSurface3_IsLost(iface) == DDERR_SURFACELOST) + if (ddraw_surface_is_lost(surface)) { WARN("Surface lost, returning DDERR_SURFACELOST.\n"); return DDERR_SURFACELOST; @@ -5015,7 +5017,7 @@ static HRESULT WINAPI ddraw_surface2_SetPalette(IDirectDrawSurface2 *iface, IDir TRACE("iface %p, palette %p.\n", iface, palette); - if (IDirectDrawSurface2_IsLost(iface) == DDERR_SURFACELOST) + if (ddraw_surface_is_lost(surface)) { WARN("Surface lost, returning DDERR_SURFACELOST.\n"); return DDERR_SURFACELOST; @@ -5030,7 +5032,7 @@ static HRESULT WINAPI ddraw_surface1_SetPalette(IDirectDrawSurface *iface, IDire TRACE("iface %p, palette %p.\n", iface, palette); - if (IDirectDrawSurface_IsLost(iface) == DDERR_SURFACELOST) + if (ddraw_surface_is_lost(surface)) { WARN("Surface lost, returning DDERR_SURFACELOST.\n"); return DDERR_SURFACELOST;

1 0