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

Robin Kertels : d3d9/tests: Skip desktop window tests if device creation fails.
by Alexandre Julliard March 15, 2024

March 15, 2024

Module: wine Branch: master Commit: f166b298ec8ff47c0bf6d72372177e219927b4af URL: https://gitlab.winehq.org/wine/wine/-/commit/f166b298ec8ff47c0bf6d72372177e… Author: Robin Kertels <robin.kertels(a)gmail.com> Date: Thu Mar 7 16:55:13 2024 +0100 d3d9/tests: Skip desktop window tests if device creation fails. Signed-off-by: Robin Kertels <robin.kertels(a)gmail.com> --- dlls/d3d9/tests/visual.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 8f7fa4be12b..d05649ab92e 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -26438,16 +26438,23 @@ static void test_desktop_window(void) device = create_device(d3d, GetDesktopWindow(), GetDesktopWindow(), TRUE); ok(!!device, "Failed to create a D3D device.\n"); - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 1.0f, 0); - ok(SUCCEEDED(hr), "Failed to clear, hr %#lx.\n", hr); - color = getPixelColor(device, 1, 1); - ok(color == 0x00ff0000, "Got unexpected color 0x%08x.\n", color); + if (device) + { + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#lx.\n", hr); + color = getPixelColor(device, 1, 1); + ok(color == 0x00ff0000, "Got unexpected color 0x%08x.\n", color); - hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - ok(SUCCEEDED(hr), "Failed to present, hr %#lx.\n", hr); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#lx.\n", hr); - refcount = IDirect3DDevice9_Release(device); - ok(!refcount, "Device has %lu references left.\n", refcount); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %lu references left.\n", refcount); + } + else + { + skip("Failed to create a D3D device for the desktop window, skipping tests.\n"); + } /* test device with NULL HWND */ device = create_device(d3d, NULL, NULL, TRUE);

1 0

Hans Leidekker : ntdll/tests: Fix a test failure.
by Alexandre Julliard March 15, 2024

March 15, 2024

Module: wine Branch: master Commit: 498b6328991c3c458cadd668aa2e504e4e93c5fe URL: https://gitlab.winehq.org/wine/wine/-/commit/498b6328991c3c458cadd668aa2e50… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Mar 14 10:12:48 2024 +0100 ntdll/tests: Fix a test failure. --- dlls/ntdll/tests/info.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 5028dd11e99..6771bbe4e3f 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -3754,7 +3754,8 @@ static void test_system_debug_control(void) } else { - ok( status == STATUS_DEBUGGER_INACTIVE || status == STATUS_ACCESS_DENIED, "class %d, got %#lx.\n", class, status ); + ok( status == STATUS_DEBUGGER_INACTIVE || status == STATUS_ACCESS_DENIED || status == STATUS_INFO_LENGTH_MISMATCH, + "class %d, got %#lx.\n", class, status ); } } }

1 0

Rémi Bernon : mfplat/tests: Test each VIDEOINFOHEADER field conversion separately.
by Alexandre Julliard March 15, 2024

March 15, 2024

Module: wine Branch: master Commit: 2692cd8b049928458030929123929578722fb49b URL: https://gitlab.winehq.org/wine/wine/-/commit/2692cd8b0499284580309291239295… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Feb 17 12:27:14 2024 +0100 mfplat/tests: Test each VIDEOINFOHEADER field conversion separately. --- dlls/mfplat/tests/mfplat.c | 200 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 154 insertions(+), 46 deletions(-)

1 0

Kyrylo Babikov : dbghelp: Fix PDB processing using the FPO stream instead of FPOEXT.
by Alexandre Julliard March 15, 2024

March 15, 2024

Module: wine Branch: master Commit: b16b366327621cc50980065df044aed66661ad98 URL: https://gitlab.winehq.org/wine/wine/-/commit/b16b366327621cc50980065df044ae… Author: Kyrylo Babikov <kirill.babikov28(a)gmail.com> Date: Thu Mar 14 18:45:59 2024 +0100 dbghelp: Fix PDB processing using the FPO stream instead of FPOEXT. --- dlls/dbghelp/msc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index d7c22075428..b14af240302 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -3787,8 +3787,8 @@ static BOOL pdb_process_internal(const struct process *pcs, symbols.module_size + symbols.sectcontrib_size + symbols.segmap_size + symbols.srcmodule_size + symbols.pdbimport_size + symbols.unknown2_size); - if (PDB_SIDX_FPO < num_sub_streams) - pdb_file->fpoext_stream = sub_streams[PDB_SIDX_FPO]; + if (PDB_SIDX_FPOEXT < num_sub_streams) + pdb_file->fpoext_stream = sub_streams[PDB_SIDX_FPOEXT]; files_image = pdb_read_strings(pdb_file);

1 0

Andrew Nguyen : ddraw: Release only valid texture parents on ddraw_texture_init failure.
by Alexandre Julliard March 15, 2024

March 15, 2024

Module: wine Branch: master Commit: 1600f2e6bd0d4624dad10f61d08439aca967ce95 URL: https://gitlab.winehq.org/wine/wine/-/commit/1600f2e6bd0d4624dad10f61d08439… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Wed Mar 13 22:51:23 2024 -0500 ddraw: Release only valid texture parents on ddraw_texture_init failure. When ddraw_texture_init needs to clean up on failure, it will call the wined3d_texture_get_sub_resource_parent function on draw_texture in order to retrieve its parent for a IDirectDrawSurface release call. However, if draw_texture is NULL, then the function call will crash due to a null pointer dereference. Therefore, on failure cleanup, the release operation on the texture parent should only be performed if draw_texture is not NULL. This fixes a crash in the Virtual Insanity game demo. --- dlls/ddraw/surface.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index d0c4bf67cbc..a096c5d7d8e 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6519,15 +6519,17 @@ static HRESULT ddraw_texture_init(struct ddraw_texture *texture, struct ddraw *d fail: if (draw_texture) + { wined3d_texture_decref(draw_texture); - parent = wined3d_texture_get_sub_resource_parent(draw_texture, 0); - if (texture->version == 7) - IDirectDrawSurface7_Release(&parent->IDirectDrawSurface7_iface); - else if (texture->version == 4) - IDirectDrawSurface4_Release(&parent->IDirectDrawSurface4_iface); - else - IDirectDrawSurface_Release(&parent->IDirectDrawSurface_iface); + parent = wined3d_texture_get_sub_resource_parent(draw_texture, 0); + if (texture->version == 7) + IDirectDrawSurface7_Release(&parent->IDirectDrawSurface7_iface); + else if (texture->version == 4) + IDirectDrawSurface4_Release(&parent->IDirectDrawSurface4_iface); + else + IDirectDrawSurface_Release(&parent->IDirectDrawSurface_iface); + } return hr; }

1 0

Henri Verbeet : wined3d: Do not check the input signature element count for sm4+ shaders in shader_spirv_compile_arguments_init().
by Alexandre Julliard March 15, 2024

March 15, 2024

Module: wine Branch: master Commit: 47be32f3d1fc6fbbcd2faae96ae1f8a3d617c0fe URL: https://gitlab.winehq.org/wine/wine/-/commit/47be32f3d1fc6fbbcd2faae96ae1f8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 13 13:15:53 2024 +0100 wined3d: Do not check the input signature element count for sm4+ shaders in shader_spirv_compile_arguments_init(). Shader model 4 fragment shaders can have more than 12 input varyings. That's fine though, because we don't need to build a varying map for them in the first place. Note that in principle the ERR in question could still be triggered by e.g. attempting to use a shader model 4 fragment shader with a shader model 3 vertex shader. --- dlls/wined3d/shader_spirv.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index 7b054c7cd9d..4e9b291a0ce 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -169,16 +169,15 @@ static void shader_spirv_compile_arguments_init(struct shader_spirv_compile_argu { struct wined3d_shader *ps = state->shader[WINED3D_SHADER_TYPE_PIXEL]; - if (ps) + if (shader->reg_maps.shader_version.major < 4 && ps) { struct shader_spirv_graphics_program_vk *vs_program = shader->backend_data; struct shader_spirv_graphics_program_vk *ps_program = ps->backend_data; if (ps_program->signature_info.input.element_count > ARRAY_SIZE(args->u.vs.varying_map)) ERR("Unexpected inter-stage varying count %u.\n", ps_program->signature_info.input.element_count); - if (shader->reg_maps.shader_version.major < 4) - vkd3d_shader_build_varying_map(&vs_program->signature_info.output, - &ps_program->signature_info.input, &args->u.vs.varying_count, args->u.vs.varying_map); + vkd3d_shader_build_varying_map(&vs_program->signature_info.output, + &ps_program->signature_info.input, &args->u.vs.varying_count, args->u.vs.varying_map); } break; }

1 0

Zhiyi Zhang : win32u: Fix a possible condition that makes EnumDisplayMonitors() not reporting any monitors.
by Alexandre Julliard March 15, 2024

March 15, 2024

Module: wine Branch: master Commit: 6505403e58a67ac02b2587f442ac68184935f3f5 URL: https://gitlab.winehq.org/wine/wine/-/commit/6505403e58a67ac02b2587f442ac68… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Mar 15 11:56:30 2024 +0800 win32u: Fix a possible condition that makes EnumDisplayMonitors() not reporting any monitors. When there are two monitors and they are mirrored, both of them are considered primary. When the first primary monitor happens to be a clone, EnumDisplayMonitors() ends up not reporting any monitors because should_enumerate_monitor() returns FALSE and we break out the loop to enumerate primary monitors after that. This is a regression from b59619d and my review comments. My indent was to break out of the loop after finding the *master* primary monitor, not cloned primary monitors, to avoid unnecessary iterations. However, the primary monitor count is small and it's cleaner this way so let's break when should_enumerate_monitor() returns TRUE. --- dlls/win32u/sysparams.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 7cefb3822a3..d2f7396971b 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -3459,8 +3459,10 @@ BOOL WINAPI NtUserEnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC proc { if (!is_monitor_primary( monitor )) continue; if (should_enumerate_monitor( monitor, &origin, &limit, &enum_info[count].rect )) + { enum_info[count++].handle = monitor->handle; - break; + break; + } } /* then non-primary monitors */

1 0

Zhiyi Zhang : win32u: Don't enumerate mirrored monitor clones for GetSystemMetrics(SM_CMONITORS).
by Alexandre Julliard March 15, 2024

March 15, 2024

Module: wine Branch: master Commit: 793e4640e49d367906c4a9e7f35c46bf3df6a5b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/793e4640e49d367906c4a9e7f35c46… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Mar 15 10:50:40 2024 +0800 win32u: Don't enumerate mirrored monitor clones for GetSystemMetrics(SM_CMONITORS). Only one monitor in a mirrored monitor set contributes to the result of GetSystemMetrics(SM_CMONITORS). Tested manually on Win7 and Win10. --- dlls/win32u/sysparams.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index d2f7396971b..6e638922629 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -3348,15 +3348,15 @@ struct monitor_enum_info RECT rect; }; -static unsigned int active_monitor_count(void) +static unsigned int active_unique_monitor_count(void) { struct monitor *monitor; unsigned int count = 0; LIST_FOR_EACH_ENTRY(monitor, &monitors, struct monitor, entry) { - if (!is_monitor_active( monitor )) continue; - count++; + if (is_monitor_active( monitor ) && !monitor->is_clone) + count++; } return count; } @@ -5941,7 +5941,7 @@ int get_system_metrics( int index ) return rect.bottom - rect.top; case SM_CMONITORS: if (!lock_display_devices()) return FALSE; - ret = active_monitor_count(); + ret = active_unique_monitor_count(); unlock_display_devices(); return ret; case SM_SAMEDISPLAYFORMAT:

1 0

Zhiyi Zhang : win32u: Don't enumerate mirrored monitor clones when unnecessary.
by Alexandre Julliard March 15, 2024

March 15, 2024

Module: wine Branch: master Commit: d6ac41a9f40539645483f111aab2f2a1386c14b2 URL: https://gitlab.winehq.org/wine/wine/-/commit/d6ac41a9f40539645483f111aab2f2… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Mar 15 11:02:05 2024 +0800 win32u: Don't enumerate mirrored monitor clones when unnecessary. These functions don't need to enumerate mirrored monitor clones. --- dlls/win32u/sysparams.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 6e638922629..07b9d46d9eb 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -2248,7 +2248,7 @@ RECT get_virtual_screen_rect( UINT dpi ) LIST_FOR_EACH_ENTRY( monitor, &monitors, struct monitor, entry ) { - if (!is_monitor_active( monitor )) continue; + if (!is_monitor_active( monitor ) || monitor->is_clone) continue; union_rect( &rect, &rect, &monitor->rc_monitor ); } @@ -2269,7 +2269,7 @@ static BOOL is_window_rect_full_screen( const RECT *rect ) { RECT monrect; - if (!is_monitor_active( monitor )) continue; + if (!is_monitor_active( monitor ) || monitor->is_clone) continue; monrect = map_dpi_rect( monitor->rc_monitor, get_monitor_dpi( monitor->handle ), get_thread_dpi() ); @@ -3558,7 +3558,7 @@ HMONITOR monitor_from_rect( const RECT *rect, UINT flags, UINT dpi ) { RECT intersect, monitor_rect; - if (!is_monitor_active( monitor )) continue; + if (!is_monitor_active( monitor ) || monitor->is_clone) continue; monitor_rect = map_dpi_rect( monitor->rc_monitor, get_monitor_dpi( monitor->handle ), system_dpi ); if (intersect_rect( &intersect, &monitor_rect, &r ))

1 0

Alexandre Julliard : include: Add some new status codes.
by Alexandre Julliard March 15, 2024

March 15, 2024

Module: wine Branch: master Commit: 08f46b8de08310890df29cbb014f79f978477f12 URL: https://gitlab.winehq.org/wine/wine/-/commit/08f46b8de08310890df29cbb014f79… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 15 12:39:12 2024 +0100 include: Add some new status codes. And sort everything consistently. --- include/ntstatus.h | 1472 +++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 1337 insertions(+), 135 deletions(-)

1 0