- Wine-Commits - list.winehq.org

Rémi Bernon : user32/tests: Add flaky_wine to some SetActiveWindow tests.
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: wine Branch: master Commit: 85dac24e64aaed972c031bef01da5308a7bd2b5c URL: https://gitlab.winehq.org/wine/wine/-/commit/85dac24e64aaed972c031bef01da53… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jan 13 20:30:03 2024 +0100 user32/tests: Add flaky_wine to some SetActiveWindow tests. They are constantly failing on Gitlab, and may be caused various race conditions around window focus, both in Wine and in Fvwm. It would be nice to fix them but it's been going for many years now and unlikely to be the case soon. --- dlls/user32/tests/win.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 2fd31be3314..8dad718e357 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3814,10 +3814,13 @@ static void test_SetActiveWindow_0( char **argv ) flush_events( TRUE ); tmp = GetForegroundWindow(); + flaky_wine ok( tmp == hwnd, "GetForegroundWindow returned %p\n", tmp ); tmp = GetActiveWindow(); + flaky_wine ok( tmp == hwnd, "GetActiveWindow returned %p\n", tmp ); tmp = GetFocus(); + flaky_wine ok( tmp == hwnd, "GetFocus returned %p\n", tmp ); events[1] = CreateEventW( NULL, FALSE, FALSE, L"test_SetActiveWindow_0_start" );

1 0

Rémi Bernon : user32/tests: Run SendInput tests in a separate desktop.
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: wine Branch: master Commit: a02acadc44ce12733a0af5baa62fc3a20cbff7eb URL: https://gitlab.winehq.org/wine/wine/-/commit/a02acadc44ce12733a0af5baa62fc3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 12 18:17:27 2024 +0100 user32/tests: Run SendInput tests in a separate desktop. --- dlls/user32/tests/input.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index f92b839f1cb..30e0ad06823 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -5386,6 +5386,21 @@ static void test_ClipCursor( char **argv ) if (!EqualRect( &rect, &virtual_rect )) ok_ret( 1, ClipCursor( NULL ) ); } +/* run the tests in a separate desktop to avoid interaction with other + * tests, current desktop state, or user actions. */ +static void test_input_desktop( char **argv ) +{ + POINT pos; + + ok_ret( 1, GetCursorPos( &pos ) ); + + test_SendInput(); + test_Input_blackbox(); + test_Input_whitebox(); + + ok_ret( 1, SetCursorPos( pos.x, pos.y ) ); +} + START_TEST(input) { char **argv; @@ -5408,10 +5423,10 @@ START_TEST(input) return test_ClipCursor_process(); if (argc >= 3 && !strcmp( argv[2], "test_ClipCursor_desktop" )) return test_ClipCursor_desktop( argv ); + if (argc >= 3 && !strcmp( argv[2], "test_input_desktop" )) + return test_input_desktop( argv ); - test_SendInput(); - test_Input_blackbox(); - test_Input_whitebox(); + run_in_desktop( argv, "test_input_desktop", 1 ); test_Input_unicode(); test_Input_mouse(); test_keynames();

1 0

Zebediah Figura : ddraw: Sync to sysmem after performing a color fill.
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: wine Branch: master Commit: b712d6c8464681ca82f11cf49051401b874814c6 URL: https://gitlab.winehq.org/wine/wine/-/commit/b712d6c8464681ca82f11cf4905140… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 3 20:45:58 2024 -0600 ddraw: Sync to sysmem after performing a color fill. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56119 --- dlls/ddraw/surface.c | 32 +++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw1.c | 4 ++-- 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 5836a49f4fd..d0c4bf67cbc 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1531,6 +1531,33 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface2_Flip(IDirectDrawSurface2 src_impl ? &src_impl->IDirectDrawSurface_iface : NULL, flags); } +/* Emperor: Rise of the Middle Kingdom accesses the map pointer outside of + * Lock()/Unlock(), and expects those updates to be propagated by a Blt(). + * It also blits to the surface, and color-fills it. + * + * This function is called after a color-fill that might update the GPU side. + * We need to make sure the sysmem surface is synchronized. */ +static void ddraw_surface_sync_pinned_sysmem(struct ddraw_surface *surface) +{ + RECT rect; + + if (!surface->draw_texture) + return; + + if (!(surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY)) + return; + + SetRect(&rect, 0, 0, surface->surface_desc.dwWidth, surface->surface_desc.dwHeight); + wined3d_device_context_blt(surface->ddraw->immediate_context, + surface->wined3d_texture, surface->sub_resource_idx, &rect, + surface->draw_texture, surface->sub_resource_idx, &rect, + WINED3D_BLT_SYNCHRONOUS, NULL, WINED3D_TEXF_POINT); + + /* The sysmem surface may be updated at any time, so we must invalidate the + * draw texture location here. */ + surface->texture_location = DDRAW_SURFACE_LOCATION_DEFAULT; +} + static HRESULT ddraw_surface_blt(struct ddraw_surface *dst_surface, const RECT *dst_rect, struct ddraw_surface *src_surface, const RECT *src_rect, DWORD flags, DWORD fill_colour, const struct wined3d_blt_fx *fx, enum wined3d_texture_filter_type filter) @@ -1539,6 +1566,7 @@ static HRESULT ddraw_surface_blt(struct ddraw_surface *dst_surface, const RECT * struct wined3d_device *wined3d_device = ddraw->wined3d_device; struct wined3d_color colour; DWORD wined3d_flags; + HRESULT hr; if (flags & DDBLT_COLORFILL) { @@ -1552,9 +1580,11 @@ static HRESULT ddraw_surface_blt(struct ddraw_surface *dst_surface, const RECT * wined3d_device_apply_stateblock(wined3d_device, ddraw->state); ddraw_surface_get_draw_texture(dst_surface, dst_rect ? DDRAW_SURFACE_RW : DDRAW_SURFACE_WRITE); - return wined3d_device_context_clear_rendertarget_view(ddraw->immediate_context, + hr = wined3d_device_context_clear_rendertarget_view(ddraw->immediate_context, ddraw_surface_get_rendertarget_view(dst_surface), dst_rect, wined3d_flags, &colour, 0.0f, 0); + ddraw_surface_sync_pinned_sysmem(dst_surface); + return hr; } if (flags & DDBLT_DEPTHFILL) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 449d1873e5c..d8fcb188c40 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -15507,7 +15507,7 @@ static void test_pinned_sysmem(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); color = ((unsigned short *)surface_desc.lpSurface)[0]; - todo_wine ok(color == 0xface, "Got color %04x.\n", color); + ok(color == 0xface, "Got color %04x.\n", color); memset(surface_desc.lpSurface, 0x55, 32 * 16 * 2); @@ -15517,7 +15517,7 @@ static void test_pinned_sysmem(void) hr = IDirectDrawSurface_Lock(surface2, NULL, &surface_desc, DDLOCK_WAIT, NULL); ok(hr == S_OK, "Got hr %#lx.\n", hr); color = ((unsigned short *)surface_desc.lpSurface)[0]; - todo_wine ok(color == 0x5555, "Got color %04x.\n", color); + ok(color == 0x5555, "Got color %04x.\n", color); color = ((unsigned short *)surface_desc.lpSurface)[32 * 16]; ok(color == 0xface, "Got color %04x.\n", color); hr = IDirectDrawSurface_Unlock(surface2, NULL);

1 0

Zebediah Figura : ddraw/tests: Add tests for map pointer coherency.
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: wine Branch: master Commit: 48ecde18e047cd84a568324652be85d70f7a50ff URL: https://gitlab.winehq.org/wine/wine/-/commit/48ecde18e047cd84a568324652be85… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 3 20:44:22 2024 -0600 ddraw/tests: Add tests for map pointer coherency. --- dlls/ddraw/tests/ddraw1.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 02d6adbb433..449d1873e5c 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -1403,6 +1403,16 @@ static BOOL compare_mode_rect(const DEVMODEW *mode1, const DEVMODEW *mode2) && mode1->dmPelsHeight == mode2->dmPelsHeight; } +static void init_format_b5g6r5(DDPIXELFORMAT *format) +{ + format->dwSize = sizeof(*format); + format->dwFlags = DDPF_RGB; + format->dwRGBBitCount = 16; + format->dwRBitMask = 0xf800; + format->dwGBitMask = 0x07e0; + format->dwBBitMask = 0x001f; +} + static ULONG get_refcount(IUnknown *test_iface) { IUnknown_AddRef(test_iface); @@ -15457,6 +15467,69 @@ static void test_enum_devices(void) ok(!refcount, "Device has %lu references left.\n", refcount); } +/* Emperor: Rise of the Middle Kingdom locks a sysmem surface and then accesses + * the pointer after unlocking it. This test roughly replicates the calls that + * it makes. */ +static void test_pinned_sysmem(void) +{ + DDBLTFX fx = {.dwSize = sizeof(fx), .dwFillColor = 0xface}; + IDirectDrawSurface *surface, *surface2; + DDSURFACEDESC surface_desc; + unsigned int color; + IDirectDraw *ddraw; + ULONG refcount; + HWND window; + HRESULT hr; + + window = create_window(); + ddraw = create_ddraw(); + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY; + surface_desc.dwWidth = 32; + surface_desc.dwHeight = 32; + init_format_b5g6r5(&surface_desc.ddpfPixelFormat); + hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &surface, NULL); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &surface2, NULL); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IDirectDrawSurface_Lock(surface, NULL, &surface_desc, DDLOCK_WAIT, NULL); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirectDrawSurface_Unlock(surface, NULL); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IDirectDrawSurface_Blt(surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + color = ((unsigned short *)surface_desc.lpSurface)[0]; + todo_wine ok(color == 0xface, "Got color %04x.\n", color); + + memset(surface_desc.lpSurface, 0x55, 32 * 16 * 2); + + hr = IDirectDrawSurface_BltFast(surface2, 0, 0, surface, NULL, DDBLTFAST_WAIT); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IDirectDrawSurface_Lock(surface2, NULL, &surface_desc, DDLOCK_WAIT, NULL); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + color = ((unsigned short *)surface_desc.lpSurface)[0]; + todo_wine ok(color == 0x5555, "Got color %04x.\n", color); + color = ((unsigned short *)surface_desc.lpSurface)[32 * 16]; + ok(color == 0xface, "Got color %04x.\n", color); + hr = IDirectDrawSurface_Unlock(surface2, NULL); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + IDirectDrawSurface_Release(surface2); + IDirectDrawSurface_Release(surface); + refcount = IDirectDraw_Release(ddraw); + ok(!refcount, "Device has %lu references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw1) { DDDEVICEIDENTIFIER identifier; @@ -15576,4 +15649,5 @@ START_TEST(ddraw1) run_for_each_device_type(test_texture_wrong_caps); test_filling_convention(); test_enum_devices(); + test_pinned_sysmem(); }

1 0

Rémi Bernon : user32/tests: Remove old Windows versions broken cursoricon results.
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: wine Branch: master Commit: edc41d6db5d5da0fd5a1bbd0adf724f4331e46f9 URL: https://gitlab.winehq.org/wine/wine/-/commit/edc41d6db5d5da0fd5a1bbd0adf724… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jan 15 13:29:11 2024 +0100 user32/tests: Remove old Windows versions broken cursoricon results. They most of the time let any result pass and defeat the purpose of the test. --- dlls/user32/tests/cursoricon.c | 113 ++++++++++++----------------------------- 1 file changed, 33 insertions(+), 80 deletions(-)

1 0

Rémi Bernon : user32/tests: Fix cursoricon tests on recent Windows versions.
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: wine Branch: master Commit: 0ab411a047b7c12abfa8906da87b410ef29f013c URL: https://gitlab.winehq.org/wine/wine/-/commit/0ab411a047b7c12abfa8906da87b41… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jan 15 11:58:19 2024 +0100 user32/tests: Fix cursoricon tests on recent Windows versions. This will now fail on older, unsupported versions, but the test_monochrome_icon test would be pointless otherwise. --- dlls/user32/tests/cursoricon.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 08973e83b1f..5064d0167ed 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1115,11 +1115,10 @@ static unsigned char bmpimage[70] = { 0xFF,0xFF,0x00,0x00,0x00,0x00 }; -/* 1x1 pixel bmp using BITMAPCOREHEADER */ +/* 1x1 pixel bmp using BITMAPCOREHEADER with 24 bits colors (1 bit color fails to load) */ static const unsigned char bmpcoreimage[38] = { -0x42,0x4d,0x26,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x22,0x00,0x00,0x00,0x0c,0x00, -0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xff,0xff,0xff,0x00,0x55,0x55, -0x55,0x00,0x00,0x00,0x00,0x00 +0x42,0x4d,0x1e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1a,0x00,0x00,0x00,0x0c,0x00, +0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x18,0x00,0xff,0xff,0xff,0x00 }; /* 2x2 pixel gif */ @@ -1219,7 +1218,8 @@ static void test_LoadImageFile(const char * test_desc, const unsigned char * ima ok(error == 0, "Last error: %lu\n", error); if (expect_success) { - ok(handle != NULL, "IMAGE_BITMAP failed\n"); + ok(handle != NULL || broken(image_data == bmpcoreimage) /* pre-security update */, + "IMAGE_BITMAP failed\n"); if (handle != NULL) test_LoadImageBitmap(handle); } else ok(handle == NULL, "IMAGE_BITMAP succeeded incorrectly\n"); @@ -2867,9 +2867,8 @@ static void test_monochrome_icon(void) CloseHandle(handle); handle = LoadImageA(NULL, "icon.ico", IMAGE_ICON, 0, 0, LR_LOADFROMFILE); - ok(handle != NULL || - broken(use_core_info && handle == NULL), /* Win 8, 10 */ - "LoadImage() failed with %lu.\n", GetLastError()); + if (!monochrome && !use_core_info) ok(handle != NULL, "LoadImage() failed with %lu.\n", GetLastError()); + else todo_wine ok(handle == NULL || broken(!use_core_info) /* Win7 */, "LoadImage() failed with %lu.\n", GetLastError()); if (handle == NULL) { skip("Icon failed to load: %s, %s\n",

1 0

Eric Pouech : dbghelp: Support redefinition of a range statement.
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: wine Branch: master Commit: 585e9d49851a0dd81932d96c43dabc32bad487b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/585e9d49851a0dd81932d96c43dabc… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Jan 15 11:55:36 2024 +0100 dbghelp: Support redefinition of a range statement. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56168 Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/stabs.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index 552b334f2da..20d5623f391 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -819,9 +819,15 @@ static int stabs_pts_read_type_def(struct ParseTypedefData* ptd, const char* typ PTS_ABORTIF(ptd, stabs_pts_read_array(ptd, &new_dt) == -1); break; case 'r': - PTS_ABORTIF(ptd, stabs_pts_read_range(ptd, typename, &new_dt) == -1); - assert(!*stabs_find_ref(filenr1, subnr1)); - *stabs_find_ref(filenr1, subnr1) = new_dt; + { + struct symt** prev_dt; + PTS_ABORTIF(ptd, stabs_pts_read_range(ptd, typename, &new_dt) == -1); + + prev_dt = stabs_find_ref(filenr1, subnr1); + /* allow redefining with same base type */ + if (*prev_dt && *prev_dt != new_dt) WARN("Multiple range def in %ls\n", ptd->module->module.ModuleName); + else *prev_dt = new_dt; + } break; case 'f': PTS_ABORTIF(ptd, stabs_pts_read_type_def(ptd, NULL, &ref_dt) == -1);

1 0

Henri Verbeet : vkd3d-utils: Use debugstr_hresult() in D3DStripShader().
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: vkd3d Branch: master Commit: cd77b2a9be23b9a34d2d6a5cb566ac3873ff29b5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/cd77b2a9be23b9a34d2d6a5cb566a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 11 21:42:31 2024 +0100 vkd3d-utils: Use debugstr_hresult() in D3DStripShader(). --- libs/vkd3d-utils/vkd3d_utils_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 09fa8fae..349523e0 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -911,7 +911,7 @@ HRESULT WINAPI D3DStripShader(const void *data, SIZE_T data_size, UINT flags, ID } if (FAILED(hr = D3DCreateBlob(dst_dxbc.size, blob))) - WARN("Failed to create blob, hr %#x.\n", hr); + WARN("Failed to create blob, hr %s.\n", debugstr_hresult(hr)); else memcpy(ID3D10Blob_GetBufferPointer(*blob), dst_dxbc.code, dst_dxbc.size); vkd3d_shader_free_shader_code(&dst_dxbc);

1 0

Henri Verbeet : include: Introduce a debug helper for HRESULTs.
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: vkd3d Branch: master Commit: cd9610bbe0d4c4a68320d9cf1684a518d0389d87 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/cd9610bbe0d4c4a68320d9cf1684a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 11 21:17:15 2024 +0100 include: Introduce a debug helper for HRESULTs. --- include/private/vkd3d_debug.h | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/include/private/vkd3d_debug.h b/include/private/vkd3d_debug.h index 6708cad3..663fc311 100644 --- a/include/private/vkd3d_debug.h +++ b/include/private/vkd3d_debug.h @@ -104,6 +104,29 @@ static inline const char *debugstr_guid(const GUID *guid) guid->Data4[5], guid->Data4[6], guid->Data4[7]); } +static inline const char *debugstr_hresult(HRESULT hr) +{ + switch (hr) + { +#define TO_STR(u) case u: return #u; + TO_STR(S_OK) + TO_STR(S_FALSE) + TO_STR(E_NOTIMPL) + TO_STR(E_NOINTERFACE) + TO_STR(E_POINTER) + TO_STR(E_ABORT) + TO_STR(E_FAIL) + TO_STR(E_OUTOFMEMORY) + TO_STR(E_INVALIDARG) + TO_STR(DXGI_ERROR_NOT_FOUND) + TO_STR(DXGI_ERROR_MORE_DATA) + TO_STR(DXGI_ERROR_UNSUPPORTED) +#undef TO_STR + default: + return vkd3d_dbg_sprintf("%#x", (int)hr); + } +} + unsigned int vkd3d_env_var_as_uint(const char *name, unsigned int default_value); struct vkd3d_debug_option

1 0

Henri Verbeet : vkd3d-utils: Use debugstr_hresult() in get_blob_part().
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: vkd3d Branch: master Commit: 1b3aa005dbf6b9f8d7eac7bf27e261d753252c47 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1b3aa005dbf6b9f8d7eac7bf27e26… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 11 21:41:09 2024 +0100 vkd3d-utils: Use debugstr_hresult() in get_blob_part(). --- libs/vkd3d-utils/vkd3d_utils_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index f1d6c1a5..09fa8fae 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -780,7 +780,7 @@ static HRESULT get_blob_part(const void *data, SIZE_T data_size, } if (FAILED(hr = D3DCreateBlob(dst_dxbc.size, blob))) - WARN("Failed to create blob, hr %#x.\n", hr); + WARN("Failed to create blob, hr %s.\n", debugstr_hresult(hr)); else memcpy(ID3D10Blob_GetBufferPointer(*blob), dst_dxbc.code, dst_dxbc.size); if (dst_dxbc.code != sections[0].data.code)

1 0