February 2024 - Wine-commits

Conor McCarthy : tests/d3d12: Add a test for zero description count in test_resource_allocation_info().
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: vkd3d Branch: master Commit: 99947deeb7a93dfa5aa45e6de3a5fa8923f5667b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/99947deeb7a93dfa5aa45e6de3a5f… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Feb 6 10:39:22 2024 +1000 tests/d3d12: Add a test for zero description count in test_resource_allocation_info(). --- tests/d3d12.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index ac40c641..d7933ed6 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -32214,6 +32214,10 @@ static void test_resource_allocation_info(void) return; } + info = ID3D12Device_GetResourceAllocationInfo(device, 0, 0, &desc); + ok(info.SizeInBytes == 0, "Got unexpected size %"PRIu64".\n", info.SizeInBytes); + /* Alignment on AMD Windows is 1, but this doesn't seem important to check. */ + desc.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER; desc.Alignment = 0; desc.Width = 32;

1 0

Conor McCarthy : vkd3d: Implement ID3D12Resource2.
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: vkd3d Branch: master Commit: 6d4782ed7f7e06cff31313c3170ea5e6bc281254 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6d4782ed7f7e06cff31313c3170ea… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Feb 5 14:57:35 2024 +1000 vkd3d: Implement ID3D12Resource2. --- include/vkd3d.h | 2 +- libs/vkd3d/command.c | 14 ++--- libs/vkd3d/device.c | 107 +++++++++++++++++++++++++++++--------- libs/vkd3d/resource.c | 125 +++++++++++++++++++++++++-------------------- libs/vkd3d/vkd3d_private.h | 34 ++++++------ 5 files changed, 179 insertions(+), 103 deletions(-)

1 0

Eric Pouech : winedump: Don't crash on non-effective runtime function entries.
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: wine Branch: master Commit: 9119e3102b2477a93ab97ec900ec35495b5c9a7a URL: https://gitlab.winehq.org/wine/wine/-/commit/9119e3102b2477a93ab97ec900ec35… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Feb 13 08:58:37 2024 +0100 winedump: Don't crash on non-effective runtime function entries. MSVC generates zeroed out entries when EditAndContinue (aka HotPatch) is enabled. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- tools/winedump/pe.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 1879dd0ce2a..1104072a2c2 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -863,6 +863,11 @@ static void dump_x86_64_unwind_info( const struct runtime_function_x86_64 *funct } info = RVA( function->UnwindData, sizeof(*info) ); + if (!info) + { + printf( " no unwind info (%x)\n", function->UnwindData ); + return; + } printf( " unwind info at %08x\n", function->UnwindData ); if (info->version > 2) {

1 0

Gabriel Ivăncescu : explorer: Set layered style on systray icons before calling into the driver.
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: wine Branch: master Commit: 8a71a4a30495635bdc905af41869d8ed9e43009f URL: https://gitlab.winehq.org/wine/wine/-/commit/8a71a4a30495635bdc905af41869d8… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Feb 15 17:41:43 2024 +0200 explorer: Set layered style on systray icons before calling into the driver. Fixes a regression introduced by b5c57b9a62c396068d18237bd6e82b37c169fdc5, which broke the systray integration outside of virtual desktops on some DEs like XFCE. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- programs/explorer/systray.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index c76ebdd0c92..275c683e3ff 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -619,13 +619,23 @@ static BOOL show_icon(struct icon *icon) if (icon->display != ICON_DISPLAY_HIDDEN) return TRUE; /* already displayed */ - if (!enable_taskbar && NtUserMessageCall( icon->window, WINE_SYSTRAY_DOCK_INSERT, icon_cx, icon_cy, - icon, NtUserSystemTrayCall, FALSE )) + if (!enable_taskbar) { - icon->display = ICON_DISPLAY_DOCKED; - icon->layered = TRUE; - SetWindowLongW( icon->window, GWL_EXSTYLE, GetWindowLongW( icon->window, GWL_EXSTYLE ) | WS_EX_LAYERED ); - SendMessageW( icon->window, WM_SIZE, SIZE_RESTORED, MAKELONG( icon_cx, icon_cy ) ); + DWORD old_exstyle = GetWindowLongW( icon->window, GWL_EXSTYLE ); + + /* make sure it is layered before calling into the driver */ + SetWindowLongW( icon->window, GWL_EXSTYLE, old_exstyle | WS_EX_LAYERED ); + paint_layered_icon( icon ); + + if (!NtUserMessageCall( icon->window, WINE_SYSTRAY_DOCK_INSERT, icon_cx, icon_cy, + icon, NtUserSystemTrayCall, FALSE )) + SetWindowLongW( icon->window, GWL_EXSTYLE, old_exstyle ); + else + { + icon->display = ICON_DISPLAY_DOCKED; + icon->layered = TRUE; + SendMessageW( icon->window, WM_SIZE, SIZE_RESTORED, MAKELONG( icon_cx, icon_cy ) ); + } } systray_add_icon( icon );

1 0

Fabian Maurer : wineoss: Remove superflous check.
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: wine Branch: master Commit: e75d1b38b5d80703225fdab46cb13020ee52c0fb URL: https://gitlab.winehq.org/wine/wine/-/commit/e75d1b38b5d80703225fdab46cb130… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Jun 20 19:58:53 2023 +0200 wineoss: Remove superflous check. --- dlls/wineoss.drv/oss.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 9a7a0fbb5d9..89e626f39d6 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -551,7 +551,7 @@ static HRESULT setup_oss_device(AUDCLNT_SHAREMODE share, int fd, if(ret == S_FALSE && !out) ret = AUDCLNT_E_UNSUPPORTED_FORMAT; - if(ret == S_FALSE && out){ + if(ret == S_FALSE){ closest->Format.nBlockAlign = closest->Format.nChannels * closest->Format.wBitsPerSample / 8; closest->Format.nAvgBytesPerSec =

1 0

Fabian Maurer : winealsa: Remove superflous check.
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: wine Branch: master Commit: c62ca5fceda40ea769b7c3750680255caf78cfc1 URL: https://gitlab.winehq.org/wine/wine/-/commit/c62ca5fceda40ea769b7c375068025… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Wed Jul 26 19:11:15 2023 +0200 winealsa: Remove superflous check. --- dlls/winealsa.drv/alsa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 94fc3c6fa4b..aa1ad4abe6c 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -2014,7 +2014,7 @@ exit: if(params->result == S_FALSE && !params->fmt_out) params->result = AUDCLNT_E_UNSUPPORTED_FORMAT; - if(params->result == S_FALSE && params->fmt_out) { + if(params->result == S_FALSE) { closest->Format.nBlockAlign = closest->Format.nChannels * closest->Format.wBitsPerSample / 8; closest->Format.nAvgBytesPerSec = closest->Format.nBlockAlign * closest->Format.nSamplesPerSec; if(closest->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE)

1 0

Fabian Maurer : mmdevapi/tests: Add test for invalid format with exclusive mode.
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: wine Branch: master Commit: 231670e8998202c1d2f1f881e98c4092f76fb2c8 URL: https://gitlab.winehq.org/wine/wine/-/commit/231670e8998202c1d2f1f881e98c40… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Jun 19 21:04:29 2023 +0200 mmdevapi/tests: Add test for invalid format with exclusive mode. --- dlls/mmdevapi/tests/render.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 8e000f03acb..3e24ac45944 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -139,11 +139,23 @@ static void test_audioclient(void) HRESULT hr; ULONG ref; WAVEFORMATEX *pwfx, *pwfx2; + WAVEFORMATEXTENSIBLE format_float_error; REFERENCE_TIME t1, t2; HANDLE handle; BOOL offload_capable; AudioClientProperties client_props; + format_float_error.Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE); + format_float_error.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; + format_float_error.Format.nAvgBytesPerSec = 384000; + format_float_error.Format.nBlockAlign = 8; + format_float_error.Format.nChannels = 2; + format_float_error.Format.nSamplesPerSec = 48000; + format_float_error.Format.wBitsPerSample = 32; + format_float_error.Samples.wValidBitsPerSample = 4; + format_float_error.dwChannelMask = 3; + format_float_error.SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; + hr = IMMDevice_Activate(dev, &IID_IAudioClient3, CLSCTX_INPROC_SERVER, NULL, (void**)&ac3); ok(hr == S_OK || @@ -258,6 +270,10 @@ static void test_audioclient(void) "IsFormatSupported(Exclusive) call returns %08lx\n", hr); hexcl = hr; + hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_EXCLUSIVE, &format_float_error.Format, NULL); + ok(hr == S_OK || hr == AUDCLNT_E_UNSUPPORTED_FORMAT || hr == AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED, + "IsFormatSupported(Exclusive) call returns %08lx\n", hr); + pwfx2 = (WAVEFORMATEX*)0xDEADF00D; hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_EXCLUSIVE, pwfx, &pwfx2); ok(hr == hexcl, "IsFormatSupported(Exclusive) call returns %08lx\n", hr);

1 0

Nikola Kuburović : kernelbase: Reduce FIXME to TRACE if params is null.
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: wine Branch: master Commit: fddea5da0130e0457fe09028eed1fda7a295bba0 URL: https://gitlab.winehq.org/wine/wine/-/commit/fddea5da0130e0457fe09028eed1fd… Author: Nikola Kuburović <nikola.kuburovic123(a)gmail.com> Date: Thu Feb 15 12:59:26 2024 +0100 kernelbase: Reduce FIXME to TRACE if params is null. If CREATEFILE2_EXTENDED_PARAMS struct pointer is null, we just forward to CreateFileW and we don't need FIXME's. --- dlls/kernelbase/file.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index cef861492e0..67a7a34249a 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -687,7 +687,8 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateFile2( LPCWSTR name, DWORD access, DWORD s DWORD attributes = params ? params->dwFileAttributes : 0; DWORD flags = params ? params->dwFileFlags : 0; - FIXME( "(%s %lx %lx %lx %p), partial stub\n", debugstr_w(name), access, sharing, creation, params ); + TRACE( "%s %#lx %#lx %#lx %p", debugstr_w(name), access, sharing, creation, params ); + if (params) FIXME( "Ignoring extended parameters %p\n", params ); if (attributes & ~attributes_mask) FIXME( "unsupported attributes %#lx\n", attributes ); if (flags & ~flags_mask) FIXME( "unsupported flags %#lx\n", flags );

1 0

Krzysztof Bogacki : gdi32/tests: Add D3DKMTEnumAdapters2 tests.
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: wine Branch: master Commit: 842461979cc8da2155e466cf83b33de574062749 URL: https://gitlab.winehq.org/wine/wine/-/commit/842461979cc8da2155e466cf83b33d… Author: Krzysztof Bogacki <krzysztof.bogacki(a)leancode.pl> Date: Fri Jan 5 19:29:30 2024 +0100 gdi32/tests: Add D3DKMTEnumAdapters2 tests. Signed-off-by: Krzysztof Bogacki <krzysztof.bogacki(a)leancode.pl> --- dlls/gdi32/tests/driver.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 0c976a87c62..f42595126c2 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -46,6 +46,7 @@ static NTSTATUS (WINAPI *pD3DKMTCheckVidPnExclusiveOwnership)(const D3DKMT_CHECK static NTSTATUS (WINAPI *pD3DKMTCloseAdapter)(const D3DKMT_CLOSEADAPTER *); static NTSTATUS (WINAPI *pD3DKMTCreateDevice)(D3DKMT_CREATEDEVICE *); static NTSTATUS (WINAPI *pD3DKMTDestroyDevice)(const D3DKMT_DESTROYDEVICE *); +static NTSTATUS (WINAPI *pD3DKMTEnumAdapters2)(D3DKMT_ENUMADAPTERS2 *); static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromDeviceName)(D3DKMT_OPENADAPTERFROMDEVICENAME *); static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromGdiDisplayName)(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *); static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromHdc)(D3DKMT_OPENADAPTERFROMHDC *); @@ -189,6 +190,58 @@ static void test_D3DKMTOpenAdapterFromHdc(void) } } +static void test_D3DKMTEnumAdapters2(void) +{ + D3DKMT_ENUMADAPTERS2 enum_adapters_2_desc = {0}; + D3DKMT_CLOSEADAPTER close_adapter_desc; + NTSTATUS status; + UINT i; + + if (!pD3DKMTEnumAdapters2 || pD3DKMTEnumAdapters2(&enum_adapters_2_desc) == STATUS_PROCEDURE_NOT_FOUND) + { + skip("D3DKMTEnumAdapters2() is unavailable.\n"); + return; + } + + /* Invalid parameters */ + status = pD3DKMTEnumAdapters2(NULL); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#lx.\n", status); + + /* Query the array to allocate */ + memset(&enum_adapters_2_desc, 0, sizeof(enum_adapters_2_desc)); + status = pD3DKMTEnumAdapters2(&enum_adapters_2_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#lx.\n", status); + ok(enum_adapters_2_desc.NumAdapters == 32 /* win10 and older */ || enum_adapters_2_desc.NumAdapters == 34 /* win11 */, + "Got unexpected value %lu.\n", enum_adapters_2_desc.NumAdapters); + + /* Allocate the array */ + enum_adapters_2_desc.pAdapters = calloc(enum_adapters_2_desc.NumAdapters, sizeof(D3DKMT_ADAPTERINFO)); + ok(!!enum_adapters_2_desc.pAdapters, "Expect not null.\n"); + + /* Enumerate adapters */ + status = pD3DKMTEnumAdapters2(&enum_adapters_2_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#lx.\n", status); + ok(enum_adapters_2_desc.NumAdapters, "Expect not zero.\n"); + + for (i = 0; i < enum_adapters_2_desc.NumAdapters; ++i) + { + ok(enum_adapters_2_desc.pAdapters[i].hAdapter, "Expect not null.\n"); + ok(enum_adapters_2_desc.pAdapters[i].AdapterLuid.LowPart || enum_adapters_2_desc.pAdapters[i].AdapterLuid.HighPart, + "Expect LUID not zero.\n"); + + close_adapter_desc.hAdapter = enum_adapters_2_desc.pAdapters[i].hAdapter; + status = pD3DKMTCloseAdapter(&close_adapter_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#lx.\n", status); + } + + /* Check for insufficient buffer */ + enum_adapters_2_desc.NumAdapters = 0; + status = pD3DKMTEnumAdapters2(&enum_adapters_2_desc); + ok(status == STATUS_BUFFER_TOO_SMALL, "Got unexpected return code %#lx.\n", status); + + free(enum_adapters_2_desc.pAdapters); +} + static void test_D3DKMTCloseAdapter(void) { D3DKMT_CLOSEADAPTER close_adapter_desc; @@ -1077,6 +1130,7 @@ START_TEST(driver) pD3DKMTCloseAdapter = (void *)GetProcAddress(gdi32, "D3DKMTCloseAdapter"); pD3DKMTCreateDevice = (void *)GetProcAddress(gdi32, "D3DKMTCreateDevice"); pD3DKMTDestroyDevice = (void *)GetProcAddress(gdi32, "D3DKMTDestroyDevice"); + pD3DKMTEnumAdapters2 = (void *)GetProcAddress(gdi32, "D3DKMTEnumAdapters2"); pD3DKMTOpenAdapterFromDeviceName = (void *)GetProcAddress(gdi32, "D3DKMTOpenAdapterFromDeviceName"); pD3DKMTOpenAdapterFromGdiDisplayName = (void *)GetProcAddress(gdi32, "D3DKMTOpenAdapterFromGdiDisplayName"); pD3DKMTOpenAdapterFromHdc = (void *)GetProcAddress(gdi32, "D3DKMTOpenAdapterFromHdc"); @@ -1088,6 +1142,7 @@ START_TEST(driver) test_D3DKMTOpenAdapterFromGdiDisplayName(); test_D3DKMTOpenAdapterFromHdc(); + test_D3DKMTEnumAdapters2(); test_D3DKMTCloseAdapter(); test_D3DKMTCreateDevice(); test_D3DKMTDestroyDevice();

1 0

Krzysztof Bogacki : gdi32: Add D3DKMTEnumAdapters2() stub.
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: wine Branch: master Commit: 10db5b67b83f75423a06852de492ba8e81b0ab98 URL: https://gitlab.winehq.org/wine/wine/-/commit/10db5b67b83f75423a06852de492ba… Author: Krzysztof Bogacki <krzysztof.bogacki(a)leancode.pl> Date: Fri Jan 5 19:45:53 2024 +0100 gdi32: Add D3DKMTEnumAdapters2() stub. Signed-off-by: Krzysztof Bogacki <krzysztof.bogacki(a)leancode.pl> --- dlls/gdi32/gdi32.spec | 1 + dlls/win32u/main.c | 5 + dlls/win32u/sysparams.c | 9 + dlls/win32u/win32syscalls.h | 1466 ++++++++++++++++++++++--------------------- dlls/win32u/win32u.spec | 2 +- dlls/wow64win/gdi.c | 22 + include/ddk/d3dkmthk.h | 1 + include/ntgdi.h | 1 + 8 files changed, 774 insertions(+), 733 deletions(-)

1 0