May 2024 - Wine-commits - list.winehq.org

Eric Pouech : cmd/tests: Test success/failure of commands.
by Alexandre Julliard 07 May '24

07 May '24

Module: wine Branch: master Commit: 6f0e9e5e4e5db8cfbddad65d9bd10b00e1666dfd URL: https://gitlab.winehq.org/wine/wine/-/commit/6f0e9e5e4e5db8cfbddad65d9bd10b… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Sun May 5 09:08:23 2024 +0200 cmd/tests: Test success/failure of commands. The || and && operators to chain commands rely on the LHS command to be successful (or unsucessful) to decide upon launching the RHS command. Unfortunately, success/failure is not always when errorlevel is 0 (non zero). Some exmaples: - if a redirection fails (eg. appending to a non existing file), the command (builtin/external) is always unsuccessful (and the error level is untouched, - external command (when redirection is ok) is succesful when program exit code is zero, - ditto for a call to a label inside the batch file, with the 'exit /b' parameter, - it's way more complicated for builtins. Eg 'type' is unsuccessful on a non existing file, while 'dir' (on the same unexisting file) succeeds. So start adding some tests about success / failure of some commands. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/tests/test_builtins.cmd | 9 +++++++++ programs/cmd/tests/test_builtins.cmd.exp | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 77207318223..8fa724c2682 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -450,6 +450,15 @@ if 1==0 (echo o1) else echo o2&&echo o3 if 1==0 (echo p1) else echo p2||echo p3 echo --- if 1==0 (echo q1) else echo q2&echo q3 +echo ------------- Testing internal commands return codes +call :setError 0 &&echo SUCCESS||echo FAILURE %errorlevel% +call :setError 33 &&echo SUCCESS||echo FAILURE %errorlevel% +call :setError 666 +echo foo &&echo SUCCESS||echo FAILURE %errorlevel% +echo foo >> h:\i\dont\exist\at\all.txt &&echo SUCCESS||echo FAILURE %errorlevel% +type NUL &&echo SUCCESS||echo FAILURE %errorlevel% +type h:\i\dont\exist\at\all.txt &&echo SUCCESS||echo FAILURE %errorlevel% +echo --- echo ------------ Testing 'set' ------------ call :setError 0 rem Remove any WINE_FOO* WINE_BA* environment variables from shell before proceeding diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 026befada11..76665765b26 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -449,6 +449,15 @@ p2 @todo_wine(a)--- q2 q3 +------------- Testing internal commands return codes +SUCCESS +FAILURE 0 +(a)todo_wine@foo(a)space@ +(a)todo_wine@SUCCESS +(a)todo_wine@FAILURE 666 +SUCCESS +(a)todo_wine@FAILURE 0 +(a)todo_wine@--- ------------ Testing 'set' ------------ 1 0

1 0

Zebediah Figura : ddraw: Use system memory for version 4 vertex buffers.
by Alexandre Julliard 07 May '24

07 May '24

Module: wine Branch: master Commit: 498f0f115db61b7259dde738aef6804d4c062fcd URL: https://gitlab.winehq.org/wine/wine/-/commit/498f0f115db61b7259dde738aef680… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 13 20:00:11 2023 -0600 ddraw: Use system memory for version 4 vertex buffers. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44863 --- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/device.c | 4 ++-- dlls/ddraw/vertexbuffer.c | 15 ++++++++++++++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 1f0c94a9c6e..7d08ffea361 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -595,6 +595,7 @@ struct d3d_vertex_buffer DWORD size; BOOL dynamic; bool discarded; + bool sysmem; }; HRESULT d3d_vertex_buffer_create(struct d3d_vertex_buffer **buffer, struct ddraw *ddraw, diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index f64db3aa633..a744d361bd7 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4128,7 +4128,7 @@ static HRESULT d3d_device7_DrawPrimitiveVB(IDirect3DDevice7 *iface, D3DPRIMITIVE stride = get_flexible_vertex_size(vb_impl->fvf); - if (vb_impl->Caps & D3DVBCAPS_SYSTEMMEMORY) + if (vb_impl->sysmem) { TRACE("Drawing from D3DVBCAPS_SYSTEMMEMORY vertex buffer, forwarding to DrawPrimitive().\n"); wined3d_mutex_lock(); @@ -4246,7 +4246,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, vb_impl->discarded = false; - if (vb_impl->Caps & D3DVBCAPS_SYSTEMMEMORY) + if (vb_impl->sysmem) { TRACE("Drawing from D3DVBCAPS_SYSTEMMEMORY vertex buffer, forwarding to DrawIndexedPrimitive().\n"); wined3d_mutex_lock(); diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index 73cf0a37991..c02d7e6e354 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -120,7 +120,7 @@ static HRESULT d3d_vertex_buffer_create_wined3d_buffer(struct d3d_vertex_buffer if (dynamic) desc.usage |= WINED3DUSAGE_DYNAMIC; desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; - if (buffer->Caps & D3DVBCAPS_SYSTEMMEMORY) + if (buffer->sysmem) desc.access = WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; else desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; @@ -466,6 +466,19 @@ HRESULT d3d_vertex_buffer_create(struct d3d_vertex_buffer **vertex_buf, buffer->fvf = desc->dwFVF; buffer->size = get_flexible_vertex_size(desc->dwFVF) * desc->dwNumVertices; + /* ddraw4 vertex buffers ignore DISCARD and NOOVERWRITE, even on + * pretransformed geometry, which means that a GPU-based buffer cannot + * perform well. + * + * While at least one contemporaneous card (Geforce 4) does seem to show a + * difference in its performance characteristics based on whether + * D3DVBCAPS_SYSTEMMEMORY is set, it also doesn't *improve* performance to + * use a non-SYSTEMMEMORY buffer with ddraw4. For wined3d it should always + * be better to use sysmem. + * + * This improves performance in Prince of Persia 3D. */ + buffer->sysmem = ((buffer->Caps & D3DVBCAPS_SYSTEMMEMORY) || buffer->version < 7); + wined3d_mutex_lock(); if (FAILED(hr = d3d_vertex_buffer_create_wined3d_buffer(buffer, FALSE, &buffer->wined3d_buffer)))

1 0

Zebediah Figura : ddraw: Upload only the used range of indices in d3d_device7_DrawIndexedPrimitive().
by Alexandre Julliard 07 May '24

07 May '24

Module: wine Branch: master Commit: 4d289c0cb833384a07e85976d98d30e52b3686bd URL: https://gitlab.winehq.org/wine/wine/-/commit/4d289c0cb833384a07e85976d98d30… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 13 20:03:36 2023 -0600 ddraw: Upload only the used range of indices in d3d_device7_DrawIndexedPrimitive(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44863 --- dlls/ddraw/device.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index a744d361bd7..eb1ad90ee0f 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3582,9 +3582,11 @@ static HRESULT d3d_device7_DrawIndexedPrimitive(IDirect3DDevice7 *iface, WORD *indices, DWORD index_count, DWORD flags) { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); + unsigned int idx_size = index_count * sizeof(*indices); + unsigned short min_index = USHRT_MAX, max_index = 0; + unsigned int i; HRESULT hr; UINT stride = get_flexible_vertex_size(fvf); - UINT vtx_size = stride * vertex_count, idx_size = index_count * sizeof(*indices); UINT vb_pos, ib_pos; TRACE("iface %p, primitive_type %#x, fvf %#lx, vertices %p, vertex_count %lu, " @@ -3597,11 +3599,19 @@ static HRESULT d3d_device7_DrawIndexedPrimitive(IDirect3DDevice7 *iface, return D3D_OK; } + /* Prince of Persia 3D creates large vertex buffers but only actually uses + * a few vertices from them. This improves performance dramatically. */ + for (i = 0; i < index_count; ++i) + { + min_index = min(min_index, indices[i]); + max_index = max(max_index, indices[i]); + } + /* Set the D3DDevice's FVF */ wined3d_mutex_lock(); - if (FAILED(hr = wined3d_streaming_buffer_upload(device->wined3d_device, - &device->vertex_buffer, vertices, vtx_size, stride, &vb_pos))) + if (FAILED(hr = wined3d_streaming_buffer_upload(device->wined3d_device, &device->vertex_buffer, + (char *)vertices + (min_index * stride), (max_index + 1 - min_index) * stride, stride, &vb_pos))) goto done; if (FAILED(hr = wined3d_streaming_buffer_upload(device->wined3d_device, @@ -3618,7 +3628,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitive(IDirect3DDevice7 *iface, wined3d_primitive_type_from_ddraw(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); d3d_device_sync_surfaces(device); - wined3d_device_context_draw_indexed(device->immediate_context, vb_pos / stride, + wined3d_device_context_draw_indexed(device->immediate_context, (int)(vb_pos / stride) - min_index, ib_pos / sizeof(*indices), index_count, 0, 0); done:

1 0

Zebediah Figura : ddraw/tests: Test GetVertexBufferDesc().
by Alexandre Julliard 07 May '24

07 May '24

Module: wine Branch: master Commit: 08c34e3f83ffb27c8fc41ecdeadc8b38bb028305 URL: https://gitlab.winehq.org/wine/wine/-/commit/08c34e3f83ffb27c8fc41ecdeadc8b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Apr 19 14:13:22 2024 -0500 ddraw/tests: Test GetVertexBufferDesc(). --- dlls/ddraw/tests/ddraw4.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 142 insertions(+) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 6cf58c3b29a..a0e4fe18c31 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -19663,6 +19663,76 @@ static void test_multiple_devices(void) DestroyWindow(window); } +static void test_vb_desc(void) +{ + IDirect3DVertexBuffer *vb; + D3DVERTEXBUFFERDESC desc; + IDirectDraw4 *ddraw; + IDirect3D3 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + + static const DWORD caps_tests[] = + { + 0, + D3DVBCAPS_WRITEONLY, + D3DVBCAPS_SYSTEMMEMORY, + D3DVBCAPS_SYSTEMMEMORY | D3DVBCAPS_WRITEONLY + }; + + static const DWORD fvf_tests[] = {D3DFVF_XYZ, D3DFVF_XYZRHW}; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#lx.\n", hr); + + hr = IDirectDraw4_QueryInterface(ddraw, &IID_IDirect3D3, (void **)&d3d); + if (FAILED(hr)) + { + skip("D3D interface is not available, skipping test.\n"); + IDirectDraw4_Release(ddraw); + return; + } + + for (unsigned int i = 0; i < ARRAY_SIZE(caps_tests); ++i) + { + for (unsigned int j = 0; j < ARRAY_SIZE(fvf_tests); ++j) + { + winetest_push_context("caps %#lx, fvf %#lx", caps_tests[i], fvf_tests[j]); + + desc.dwSize = sizeof(desc); + desc.dwCaps = caps_tests[i]; + desc.dwFVF = fvf_tests[j]; + desc.dwNumVertices = 256; + + hr = IDirect3D3_CreateVertexBuffer(d3d, &desc, &vb, 0, NULL); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + memset(&desc, 0, sizeof(desc)); + hr = IDirect3DVertexBuffer_GetVertexBufferDesc(vb, &desc); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + ok(!desc.dwSize, "Got size %lu.\n", desc.dwSize); + ok(desc.dwCaps == caps_tests[i], "Got caps %#lx.\n", desc.dwCaps); + ok(desc.dwFVF == fvf_tests[j], "Got FVF %#lx.\n", desc.dwFVF); + ok(desc.dwNumVertices == 256, "Got %lu vertices.\n", desc.dwNumVertices); + + IDirect3DVertexBuffer_Release(vb); + + winetest_pop_context(); + } + } + + IDirect3D3_Release(d3d); + DestroyWindow(window); + refcount = IDirectDraw4_Release(ddraw); + ok(!refcount, "Device has %lu references left.\n", refcount); +} + START_TEST(ddraw4) { DDDEVICEIDENTIFIER identifier; @@ -19805,4 +19875,5 @@ START_TEST(ddraw4) test_filling_convention(); test_enum_devices(); test_multiple_devices(); + test_vb_desc(); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 3b2bc281328..e222e798ffe 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -20119,6 +20119,76 @@ static void test_multiple_devices(void) DestroyWindow(window); } +static void test_vb_desc(void) +{ + IDirect3DVertexBuffer7 *vb; + D3DVERTEXBUFFERDESC desc; + IDirectDraw7 *ddraw; + IDirect3D7 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + + static const DWORD caps_tests[] = + { + 0, + D3DVBCAPS_WRITEONLY, + D3DVBCAPS_SYSTEMMEMORY, + D3DVBCAPS_SYSTEMMEMORY | D3DVBCAPS_WRITEONLY + }; + + static const DWORD fvf_tests[] = {D3DFVF_XYZ, D3DFVF_XYZRHW}; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#lx.\n", hr); + + hr = IDirectDraw7_QueryInterface(ddraw, &IID_IDirect3D7, (void **)&d3d); + if (FAILED(hr)) + { + skip("D3D interface is not available, skipping test.\n"); + IDirectDraw7_Release(ddraw); + return; + } + + for (unsigned int i = 0; i < ARRAY_SIZE(caps_tests); ++i) + { + for (unsigned int j = 0; j < ARRAY_SIZE(fvf_tests); ++j) + { + winetest_push_context("caps %#lx, fvf %#lx", caps_tests[i], fvf_tests[j]); + + desc.dwSize = sizeof(desc); + desc.dwCaps = caps_tests[i]; + desc.dwFVF = fvf_tests[j]; + desc.dwNumVertices = 256; + + hr = IDirect3D7_CreateVertexBuffer(d3d, &desc, &vb, 0); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + memset(&desc, 0, sizeof(desc)); + hr = IDirect3DVertexBuffer7_GetVertexBufferDesc(vb, &desc); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + ok(!desc.dwSize, "Got size %lu.\n", desc.dwSize); + ok(desc.dwCaps == caps_tests[i], "Got caps %#lx.\n", desc.dwCaps); + ok(desc.dwFVF == fvf_tests[j], "Got FVF %#lx.\n", desc.dwFVF); + ok(desc.dwNumVertices == 256, "Got %lu vertices.\n", desc.dwNumVertices); + + IDirect3DVertexBuffer7_Release(vb); + + winetest_pop_context(); + } + } + + IDirect3D7_Release(d3d); + DestroyWindow(window); + refcount = IDirectDraw7_Release(ddraw); + ok(!refcount, "Device has %lu references left.\n", refcount); +} + START_TEST(ddraw7) { DDDEVICEIDENTIFIER2 identifier; @@ -20295,4 +20365,5 @@ START_TEST(ddraw7) run_for_each_device_type(test_user_memory); test_flip_3d(); test_multiple_devices(); + test_vb_desc(); }

1 0

Zebediah Figura : wined3d: Fix GLSL version comparison.
by Alexandre Julliard 07 May '24

07 May '24

Module: wine Branch: master Commit: cfe177f5cfa96f77bf060f3d4dadf5d7ffabbd72 URL: https://gitlab.winehq.org/wine/wine/-/commit/cfe177f5cfa96f77bf060f3d4dadf5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Apr 29 12:54:01 2024 -0500 wined3d: Fix GLSL version comparison. Fixes: 010008f629dd0590978095942ded8851ee3a9e17 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56615 --- 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 b34b5f9374a..af1a833e410 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -5340,7 +5340,7 @@ static BOOL wined3d_adapter_gl_init(struct wined3d_adapter_gl *adapter_gl, return FALSE; } - if (gl_info->glsl_version <= MAKEDWORD_VERSION(1, 20)) + if (gl_info->glsl_version < MAKEDWORD_VERSION(1, 20)) { ERR("GLSL version %s is too low; 1.20 is required.\n", (const char *)gl_info->gl_ops.gl.p_glGetString(GL_SHADING_LANGUAGE_VERSION_ARB));

1 0

Dmitry Timoshkov : kernelbase: Add support for FileDispositionInfoEx to SetFileInformationByHandle().
by Alexandre Julliard 07 May '24

07 May '24

Module: wine Branch: master Commit: fcdd73df193d6aa3f0704bc3496befb4e1242622 URL: https://gitlab.winehq.org/wine/wine/-/commit/fcdd73df193d6aa3f0704bc3496bef… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue May 7 11:42:15 2024 +0300 kernelbase: Add support for FileDispositionInfoEx to SetFileInformationByHandle(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernelbase/file.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index 7806ad2ec1f..f842f549061 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -3745,6 +3745,9 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetFileInformationByHandle( HANDLE file, FILE_INFO case FileDispositionInfo: status = NtSetInformationFile( file, &io, info, size, FileDispositionInformation ); break; + case FileDispositionInfoEx: + status = NtSetInformationFile( file, &io, info, size, FileDispositionInformationEx ); + break; case FileIoPriorityHintInfo: status = NtSetInformationFile( file, &io, info, size, FileIoPriorityHintInformation ); break;

1 0

Alexandre Julliard : atl: Remove empty clsid registration.
by Alexandre Julliard 07 May '24

07 May '24

Module: wine Branch: master Commit: 32c2f815d5b691f574b2eab2065f0ac606bc049f URL: https://gitlab.winehq.org/wine/wine/-/commit/32c2f815d5b691f574b2eab2065f0a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 5 12:48:34 2024 +0200 atl: Remove empty clsid registration. --- dlls/atl/atl_lib.idl | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/atl/atl_lib.idl b/dlls/atl/atl_lib.idl index 918416c5ee2..e3a4674f6cd 100644 --- a/dlls/atl/atl_lib.idl +++ b/dlls/atl/atl_lib.idl @@ -17,7 +17,6 @@ */ #pragma makedep regtypelib -#pragma makedep register import "atliface.idl";

1 0

Alexandre Julliard : dhtmled.ocx: Remove empty clsid registration.
by Alexandre Julliard 07 May '24

07 May '24

Module: wine Branch: master Commit: b2ed4e3859714ab02a78bbf4c50a54589d105531 URL: https://gitlab.winehq.org/wine/wine/-/commit/b2ed4e3859714ab02a78bbf4c50a54… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 5 12:52:20 2024 +0200 dhtmled.ocx: Remove empty clsid registration. --- dlls/dhtmled.ocx/dhtmled_tlb.idl | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/dhtmled.ocx/dhtmled_tlb.idl b/dlls/dhtmled.ocx/dhtmled_tlb.idl index 96a9444a13f..52bbb5bbfc3 100644 --- a/dlls/dhtmled.ocx/dhtmled_tlb.idl +++ b/dlls/dhtmled.ocx/dhtmled_tlb.idl @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma makedep register #pragma makedep regtypelib #include "dhtmled.idl"

1 0

Alexandre Julliard : widl: Don't generate empty interface registrations.
by Alexandre Julliard 07 May '24

07 May '24

Module: wine Branch: master Commit: 6b4ab3be9754ede8cb062313f0018481db3c8805 URL: https://gitlab.winehq.org/wine/wine/-/commit/6b4ab3be9754ede8cb062313f00184… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 5 12:40:44 2024 +0200 widl: Don't generate empty interface registrations. --- tools/widl/register.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tools/widl/register.c b/tools/widl/register.c index 66a07aeb5c4..02861f3f1d0 100644 --- a/tools/widl/register.c +++ b/tools/widl/register.c @@ -273,11 +273,14 @@ void write_regscript( const statement_list_t *stmts ) put_str( indent, "HKCR\n" ); put_str( indent++, "{\n" ); - put_str( indent, "NoRemove Interface\n" ); - put_str( indent++, "{\n" ); ps_factory = find_ps_factory( stmts ); - if (ps_factory) write_interfaces( stmts, ps_factory ); - put_str( --indent, "}\n" ); + if (ps_factory) + { + put_str( indent, "NoRemove Interface\n" ); + put_str( indent++, "{\n" ); + write_interfaces( stmts, ps_factory ); + put_str( --indent, "}\n" ); + } put_str( indent, "NoRemove CLSID\n" ); put_str( indent++, "{\n" );

1 0

Rémi Bernon : winex11: Only request display modes driver data when needed.
by Alexandre Julliard 07 May '24

07 May '24

Module: wine Branch: master Commit: f74900ad1a580eda8fd4923cbd4881b42b042733 URL: https://gitlab.winehq.org/wine/wine/-/commit/f74900ad1a580eda8fd4923cbd4881… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 11 16:02:02 2024 +0200 winex11: Only request display modes driver data when needed. --- dlls/winex11.drv/display.c | 7 +++---- dlls/winex11.drv/x11drv.h | 4 +++- dlls/winex11.drv/xrandr.c | 32 ++++++++++++++++---------------- dlls/winex11.drv/xvidmode.c | 14 +++++++------- 4 files changed, 29 insertions(+), 28 deletions(-)

1 0