September 2023 - Wine-Commits

Stefan Dösinger : d3d9/tests: Mark hidden window WM_WINDOWPOSCHANGED tests unconditionally flaky.
by Alexandre Julliard Sept. 14, 2023

Sept. 14, 2023

Module: wine Branch: master Commit: b059052ece66e59da5cf821e9b83d7decd6a669c URL: https://gitlab.winehq.org/wine/wine/-/commit/b059052ece66e59da5cf821e9b83d7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 7 15:23:01 2023 +0300 d3d9/tests: Mark hidden window WM_WINDOWPOSCHANGED tests unconditionally flaky. kwin resizes hidden windows most of the time. I see the existing flaky markers triggered on Windows 11 occasionally. --- dlls/d3d9/tests/d3d9ex.c | 9 ++++++++- dlls/d3d9/tests/device.c | 6 +++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 17161b4bfec..b79481fafbf 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -3013,7 +3013,11 @@ static void test_wndproc(void) SetForegroundWindow(GetDesktopWindow()); ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", expect_messages->message, expect_messages->window, i); + + /* kwin sometimes resizes hidden windows. */ + flaky ok(!windowposchanged_received, "Received WM_WINDOWPOSCHANGED but did not expect it, i=%u.\n", i); + expect_messages = NULL; ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); @@ -3121,8 +3125,11 @@ static void test_wndproc(void) flaky_wine ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", expect_messages->message, expect_messages->window, i); - flaky_if(i == 0 || i == 1) + + /* kwin and Win8+ sometimes resize hidden windows. */ + flaky ok(!windowposchanged_received, "Received WM_WINDOWPOSCHANGED but did not expect it, i=%u.\n", i); + expect_messages = NULL; /* The window is iconic even though no message was sent. */ diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index a90e6a3a7a4..e061b8b2a07 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -4281,6 +4281,7 @@ static void test_wndproc(void) SetForegroundWindow(GetDesktopWindow()); ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", expect_messages->message, expect_messages->window, i); + flaky ok(!windowposchanged_received, "Received WM_WINDOWPOSCHANGED but did not expect it.\n"); expect_messages = NULL; flush_events(); @@ -4371,8 +4372,11 @@ static void test_wndproc(void) SetForegroundWindow(GetDesktopWindow()); ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", expect_messages->message, expect_messages->window, i); - flaky_if(i == 0) + + /* kwin and Win8+ sometimes resize hidden windows. */ + flaky ok(!windowposchanged_received, "Received WM_WINDOWPOSCHANGED but did not expect it, i=%u.\n", i); + expect_messages = NULL; /* The window is iconic even though no message was sent. */

1 0

Stefan Dösinger : d3d8/tests: Mark the hidden test WM_WINDOWPOSCHANGED test flaky.
by Alexandre Julliard Sept. 14, 2023

Sept. 14, 2023

Module: wine Branch: master Commit: 48a4f670d1a8e6c940e629b6cf9c49677d1409a4 URL: https://gitlab.winehq.org/wine/wine/-/commit/48a4f670d1a8e6c940e629b6cf9c49… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 7 15:21:12 2023 +0300 d3d8/tests: Mark the hidden test WM_WINDOWPOSCHANGED test flaky. --- dlls/d3d8/tests/device.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index ae7d3b28a10..df7ff865835 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -3246,7 +3246,12 @@ static void test_wndproc(void) SetForegroundWindow(GetDesktopWindow()); ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it.\n", expect_messages->message, expect_messages->window); + + /* kwin sometimes resizes hidden windows. The d3d8 version of this test has been reliable on + * Windows so far, but the d3d9 equivalent rarely fails since Windows 8. */ + flaky ok(!windowposchanged_received, "Received WM_WINDOWPOSCHANGED but did not expect it.\n"); + expect_messages = NULL; flush_events();

1 0

Stefan Dösinger : d3d9/tests: Fix skipping ATI2N in test_resource_access.
by Alexandre Julliard Sept. 14, 2023

Sept. 14, 2023

Module: wine Branch: master Commit: b14d7f2fa865f820e2156213d640956985f41fec URL: https://gitlab.winehq.org/wine/wine/-/commit/b14d7f2fa865f820e2156213d64095… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Sep 9 16:15:42 2023 +0300 d3d9/tests: Fix skipping ATI2N in test_resource_access. --- dlls/d3d9/tests/device.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 85d72fff8f7..a90e6a3a7a4 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -13584,6 +13584,7 @@ static void test_resource_access(void) D3DADAPTER_IDENTIFIER9 identifier; struct device_desc device_desc; D3DSURFACE_DESC surface_desc; + BOOL skip_ati2n_once = FALSE; IDirect3DDevice9 *device; unsigned int i, j; IDirect3D9 *d3d; @@ -13735,7 +13736,11 @@ static void test_resource_access(void) if (tests[j].format == FORMAT_ATI2 && FAILED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, D3DRTYPE_TEXTURE, format))) { - skip("ATI2N texture not supported.\n"); + if (!skip_ati2n_once) + { + skip("ATI2N texture not supported.\n"); + skip_ati2n_once = TRUE; + } continue; } @@ -13893,6 +13898,17 @@ static void test_resource_access(void) else format = colour_format; + if (tests[i].format == FORMAT_ATI2 && FAILED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, + D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, D3DRTYPE_VOLUMETEXTURE, format))) + { + if (!skip_ati2n_once) + { + skip("ATI2N texture not supported.\n"); + skip_ati2n_once = TRUE; + } + continue; + } + hr = IDirect3DDevice9_CreateVolumeTexture(device, 16, 16, 1, 1, tests[i].usage, format, tests[i].pool, &texture, NULL); ok((hr == (!(tests[i].usage & ~D3DUSAGE_DYNAMIC)

1 0

Stefan Dösinger : d3d8/tests: Fix skipping ATI2N in test_resource_access.
by Alexandre Julliard Sept. 14, 2023

Sept. 14, 2023

Module: wine Branch: master Commit: 7bbf29644cbf1e01603d2a123b493c19e60be923 URL: https://gitlab.winehq.org/wine/wine/-/commit/7bbf29644cbf1e01603d2a123b493c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 7 19:45:02 2023 +0300 d3d8/tests: Fix skipping ATI2N in test_resource_access. --- dlls/d3d8/tests/device.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index e915272b870..ae7d3b28a10 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -9727,6 +9727,7 @@ static void test_resource_access(void) D3DADAPTER_IDENTIFIER8 identifier; struct device_desc device_desc; D3DSURFACE_DESC surface_desc; + BOOL skip_ati2n_once = FALSE; IDirect3DDevice8 *device; unsigned int i, j; IDirect3D8 *d3d; @@ -9878,7 +9879,11 @@ static void test_resource_access(void) if (tests[j].format == FORMAT_ATI2 && FAILED(IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, D3DRTYPE_TEXTURE, format))) { - skip("ATI2N texture not supported.\n"); + if (!skip_ati2n_once) + { + skip("ATI2N texture not supported.\n"); + skip_ati2n_once = TRUE; + } continue; } @@ -10034,6 +10039,17 @@ static void test_resource_access(void) else format = colour_format; + if (tests[i].format == FORMAT_ATI2 && FAILED(IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, + D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, D3DRTYPE_VOLUMETEXTURE, format))) + { + if (!skip_ati2n_once) + { + skip("ATI2N texture not supported.\n"); + skip_ati2n_once = TRUE; + } + continue; + } + hr = IDirect3DDevice8_CreateVolumeTexture(device, 16, 16, 1, 1, tests[i].usage, format, tests[i].pool, &texture); ok((hr == ((!(tests[i].usage & ~D3DUSAGE_DYNAMIC) && tests[i].format != FORMAT_ATI2)

1 0

Stefan Dösinger : d3d9/tests: Zero stride tests crash on Windows XP, r200 GPU.
by Alexandre Julliard Sept. 14, 2023

Sept. 14, 2023

Module: wine Branch: master Commit: da264c4d0041eae62476f9e49f93a6af7add2b21 URL: https://gitlab.winehq.org/wine/wine/-/commit/da264c4d0041eae62476f9e49f93a6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 7 19:28:04 2023 +0300 d3d9/tests: Zero stride tests crash on Windows XP, r200 GPU. --- dlls/d3d9/tests/device.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index c972e97f572..2347841b66f 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3172,10 +3172,14 @@ static void test_draw_primitive(void) hr = IDirect3DDevice9_DrawPrimitive(device, D3DPT_TRIANGLELIST, 0, 2); ok(SUCCEEDED(hr), "DrawPrimitive failed, hr %#lx.\n", hr); - hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLELIST, 2, quad, 0); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); - hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, quad, 0); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); + /* Crashes on r200, Windows XP with STATUS_INTEGER_DIVIDE_BY_ZERO. */ + if (0) + { + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLELIST, 2, quad, 0); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, quad, 0); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); + } hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLELIST, 2, quad, sizeof(*quad)); ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#lx.\n", hr); @@ -3205,12 +3209,16 @@ static void test_draw_primitive(void) ok(current_ib == index_buffer, "Unexpected index buffer %p.\n", current_ib); IDirect3DIndexBuffer9_Release(current_ib); - hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, 2, - indices, D3DFMT_INDEX16, quad, 0); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); - hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, 0, - indices, D3DFMT_INDEX16, quad, 0); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); + /* Crashes on r200, Windows XP with STATUS_INTEGER_DIVIDE_BY_ZERO. */ + if (0) + { + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, 2, + indices, D3DFMT_INDEX16, quad, 0); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, 0, + indices, D3DFMT_INDEX16, quad, 0); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); + } hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, 2, indices, D3DFMT_INDEX16, quad, sizeof(*quad));

1 0

Stefan Dösinger : d3d8/tests: Zero stride tests crash on Windows XP, r200 GPU.
by Alexandre Julliard Sept. 14, 2023

Sept. 14, 2023

Module: wine Branch: master Commit: b3e98cadfaff09cd3c3ef53b9377488aa80b82f5 URL: https://gitlab.winehq.org/wine/wine/-/commit/b3e98cadfaff09cd3c3ef53b937748… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 7 20:00:32 2023 +0300 d3d8/tests: Zero stride tests crash on Windows XP, r200 GPU. --- dlls/d3d8/tests/device.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index b61ad207cc9..e915272b870 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -10329,8 +10329,12 @@ static void test_draw_primitive(void) ok(stride == sizeof(*quad), "Unexpected stride %u.\n", stride); IDirect3DVertexBuffer8_Release(current_vb); - hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, quad, 0); - ok(hr == D3D_OK, "DrawPrimitiveUP failed, hr %#lx.\n", hr); + /* Crashes on r200, Windows XP with STATUS_INTEGER_DIVIDE_BY_ZERO. */ + if (0) + { + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, quad, 0); + ok(hr == D3D_OK, "DrawPrimitiveUP failed, hr %#lx.\n", hr); + } hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, quad, sizeof(*quad)); ok(hr == D3D_OK, "DrawPrimitiveUP failed, hr %#lx.\n", hr); @@ -10360,12 +10364,16 @@ static void test_draw_primitive(void) ok(base_vertex_index == 1, "Unexpected base vertex index %u.\n", base_vertex_index); IDirect3DIndexBuffer8_Release(current_ib); - hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, 0, - indices, D3DFMT_INDEX16, quad, 0); - ok(SUCCEEDED(hr), "DrawIndexedPrimitiveUP failed, hr %#lx.\n", hr); - hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, 2, - indices, D3DFMT_INDEX16, quad, 0); - ok(SUCCEEDED(hr), "DrawIndexedPrimitiveUP failed, hr %#lx.\n", hr); + /* Crashes on r200, Windows XP with STATUS_INTEGER_DIVIDE_BY_ZERO. */ + if (0) + { + hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, 0, + indices, D3DFMT_INDEX16, quad, 0); + ok(SUCCEEDED(hr), "DrawIndexedPrimitiveUP failed, hr %#lx.\n", hr); + hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, 2, + indices, D3DFMT_INDEX16, quad, 0); + ok(SUCCEEDED(hr), "DrawIndexedPrimitiveUP failed, hr %#lx.\n", hr); + } hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, 2, indices, D3DFMT_INDEX16, quad, sizeof(*quad));

1 0

Stefan Dösinger : d3d9/tests: Request a 3 mip level cube texture in test_getdc().
by Alexandre Julliard Sept. 14, 2023

Sept. 14, 2023

Module: wine Branch: master Commit: ac85fa8d0f85c8b9fb6ca7b4be027d0ba5270100 URL: https://gitlab.winehq.org/wine/wine/-/commit/ac85fa8d0f85c8b9fb6ca7b4be027d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 7 19:32:36 2023 +0300 d3d9/tests: Request a 3 mip level cube texture in test_getdc(). If we let d3d9 decide we get a single-level texture on HW that does not support mipmapped cubes, e.g. r200 GPUs. By explicitly requesting the 3 levels we need we'll skip the test. The test demonstrates that only one subresource can be locked / have a DC, so it makes sense to show that this applies to the whole texture and not just one level. --- dlls/d3d9/tests/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 2347841b66f..85d72fff8f7 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -9113,7 +9113,7 @@ static void test_getdc(void) if (!testdata[i].getdc_supported) continue; - if (FAILED(hr = IDirect3DDevice9_CreateCubeTexture(device, 64, 0, 0, + if (FAILED(hr = IDirect3DDevice9_CreateCubeTexture(device, 64, 3, 0, testdata[i].format, D3DPOOL_MANAGED, &cube_texture, NULL))) { skip("Failed to create cube texture for format %s (hr %#lx), skipping tests.\n", testdata[i].name, hr);

1 0

Arkadiusz Hiler : dsound: Get rid of DSOUND_capturers and related lock.
by Alexandre Julliard Sept. 14, 2023

Sept. 14, 2023

Module: wine Branch: master Commit: 0b7b6d10506aa4c97f6e25ef7e3577cdd5221f3f URL: https://gitlab.winehq.org/wine/wine/-/commit/0b7b6d10506aa4c97f6e25ef7e3577… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Wed Sep 13 19:08:50 2023 +0300 dsound: Get rid of DSOUND_capturers and related lock. Ever since dcaeb6b4fdf8 ("dsound: Allow multiple buffers to capture from the same device.") it's not used for anything. --- dlls/dsound/capture.c | 12 ------------ dlls/dsound/dsound_main.c | 11 ----------- dlls/dsound/dsound_private.h | 2 -- 3 files changed, 25 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 9efef54a2bd..ca01543f358 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -848,10 +848,6 @@ static ULONG DirectSoundCaptureDevice_Release( if (!ref) { TRACE("deleting object\n"); - EnterCriticalSection(&DSOUND_capturers_lock); - list_remove(&device->entry); - LeaveCriticalSection(&DSOUND_capturers_lock); - if (device->capture_buffer) IDirectSoundCaptureBufferImpl_Release(&device->capture_buffer->IDirectSoundCaptureBuffer8_iface); @@ -1027,12 +1023,9 @@ static HRESULT DirectSoundCaptureDevice_Initialize( if(FAILED(hr)) return hr; - EnterCriticalSection(&DSOUND_capturers_lock); - hr = DirectSoundCaptureDevice_Create(&device); if (hr != DS_OK) { WARN("DirectSoundCaptureDevice_Create failed\n"); - LeaveCriticalSection(&DSOUND_capturers_lock); return hr; } @@ -1050,7 +1043,6 @@ static HRESULT DirectSoundCaptureDevice_Initialize( device->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&device->lock); free(device); - LeaveCriticalSection(&DSOUND_capturers_lock); return DSERR_NODRIVER; } @@ -1063,12 +1055,8 @@ static HRESULT DirectSoundCaptureDevice_Initialize( } IAudioClient_Release(client); - list_add_tail(&DSOUND_capturers, &device->entry); - *ppDevice = device; - LeaveCriticalSection(&DSOUND_capturers_lock); - return S_OK; } diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index f0ceb2ce0b8..84a118f43aa 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -73,16 +73,6 @@ static CRITICAL_SECTION_DEBUG DSOUND_renderers_lock_debug = }; CRITICAL_SECTION DSOUND_renderers_lock = { &DSOUND_renderers_lock_debug, -1, 0, 0, 0, 0 }; -struct list DSOUND_capturers = LIST_INIT(DSOUND_capturers); -CRITICAL_SECTION DSOUND_capturers_lock; -static CRITICAL_SECTION_DEBUG DSOUND_capturers_lock_debug = -{ - 0, 0, &DSOUND_capturers_lock, - { &DSOUND_capturers_lock_debug.ProcessLocksList, &DSOUND_capturers_lock_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": DSOUND_capturers_lock") } -}; -CRITICAL_SECTION DSOUND_capturers_lock = { &DSOUND_capturers_lock_debug, -1, 0, 0, 0, 0 }; - GUID DSOUND_renderer_guids[MAXWAVEDRIVERS]; GUID DSOUND_capture_guids[MAXWAVEDRIVERS]; @@ -779,7 +769,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) case DLL_PROCESS_DETACH: if (lpvReserved) break; DeleteCriticalSection(&DSOUND_renderers_lock); - DeleteCriticalSection(&DSOUND_capturers_lock); break; } return TRUE; diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 80e6725fd27..46c150fc9fc 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -253,8 +253,6 @@ HRESULT IDirectSoundCaptureImpl_Create(IUnknown *outer_unk, REFIID riid, void ** #define STATE_STOPPING 3 extern CRITICAL_SECTION DSOUND_renderers_lock; -extern CRITICAL_SECTION DSOUND_capturers_lock; -extern struct list DSOUND_capturers; extern struct list DSOUND_renderers; extern GUID DSOUND_renderer_guids[MAXWAVEDRIVERS];

1 0

Francois Gouget : testbot/web: Allow getting the VMs configuration on the main page.
by Alexandre Julliard Sept. 14, 2023

Sept. 14, 2023

Module: tools Branch: master Commit: f0fbb85fd4645e05d1aead1154ebcd5630f482cb URL: https://gitlab.winehq.org/winehq/tools/-/commit/f0fbb85fd4645e05d1aead1154e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Aug 4 12:25:09 2023 +0200 testbot/web: Allow getting the VMs configuration on the main page. Provide access to the configuration through the same expansion mechanism as in the submit and job details pages. --- testbot/web/index.pl | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index a2bd5246..9d7cd976 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -242,6 +242,24 @@ sub DisplayProperty($$) ""; } +sub GenerateDataView($$$) +{ + my ($self, $Row, $Col) = @_; + + my $PropertyName = $Col->{Descriptor}->GetName(); + if ($PropertyName eq "Description") + { + my $VM = $Row->{Item}; + print "<details><summary>", + $self->escapeHTML($VM->Description || $VM->Name), + "</summary>", $self->escapeHTML($VM->Details || "No details!"), + "</details>"; + } + else + { + $self->SUPER::GenerateDataView($Row, $Col); + } +} package StatusPage;

1 0

Brendan Shanks : dwrite: Ensure unixlib function tables and enum stay in sync.
by Alexandre Julliard Sept. 14, 2023

Sept. 14, 2023

Module: wine Branch: master Commit: e8ea81cf7a0cabb8655e1c14d84328a1ba813fb3 URL: https://gitlab.winehq.org/wine/wine/-/commit/e8ea81cf7a0cabb8655e1c14d84328… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Sep 13 15:15:11 2023 -0700 dwrite: Ensure unixlib function tables and enum stay in sync. --- dlls/dwrite/freetype.c | 4 ++++ dlls/dwrite/unixlib.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index f50cf36fc18..181b6437f37 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -815,6 +815,8 @@ const unixlib_entry_t __wine_unix_call_funcs[] = get_design_glyph_metrics, }; +C_ASSERT( ARRAYSIZE(__wine_unix_call_funcs) == unix_funcs_count ); + #ifdef _WIN64 typedef ULONG PTR32; @@ -1041,4 +1043,6 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = wow64_get_design_glyph_metrics, }; +C_ASSERT( ARRAYSIZE(__wine_unix_call_wow64_funcs) == unix_funcs_count ); + #endif /* _WIN64 */ diff --git a/dlls/dwrite/unixlib.h b/dlls/dwrite/unixlib.h index 33a9690b160..1b9938f08c5 100644 --- a/dlls/dwrite/unixlib.h +++ b/dlls/dwrite/unixlib.h @@ -107,6 +107,7 @@ enum font_backend_funcs unix_get_glyph_bbox, unix_get_glyph_bitmap, unix_get_design_glyph_metrics, + unix_funcs_count, }; #define UNIX_CALL( func, params ) WINE_UNIX_CALL( unix_ ## func, params )

1 0