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

Alex Henrie : ntdll: Fix multi-string callbacks in RtlQueryRegistryValues.
by Alexandre Julliard 17 Jun '24

17 Jun '24

Module: wine Branch: master Commit: 0b51dbf7eb09e42b9b5b079c82aade8252581b7e URL: https://gitlab.winehq.org/wine/wine/-/commit/0b51dbf7eb09e42b9b5b079c82aade… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Jun 14 23:26:38 2024 -0600 ntdll: Fix multi-string callbacks in RtlQueryRegistryValues. --- dlls/ntdll/reg.c | 39 ++++++--------------------------------- dlls/ntdll/tests/reg.c | 14 +++++++------- 2 files changed, 13 insertions(+), 40 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 3cbd055f367..ec4ec41c5fb 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -250,8 +250,6 @@ static NTSTATUS RTL_ReportRegistryValue(PKEY_VALUE_FULL_INFORMATION pInfo, DWORD res; NTSTATUS status = STATUS_SUCCESS; ULONG len; - LPWSTR String; - ULONG count = 0; if (pInfo == NULL) { @@ -381,38 +379,13 @@ static NTSTATUS RTL_ReportRegistryValue(PKEY_VALUE_FULL_INFORMATION pInfo, } else /* REG_MULTI_SZ */ { - if(pQuery->Flags & RTL_QUERY_REGISTRY_NOEXPAND) + for (offset = 0; offset < pInfo->DataLength; offset += len) { - for (offset = 0; offset <= pInfo->DataLength; offset += len + sizeof(WCHAR)) - { - wstr = (WCHAR*)(((CHAR*)pInfo) + offset); - len = wcslen(wstr) * sizeof(WCHAR); - status = pQuery->QueryRoutine(pQuery->Name, pInfo->Type, wstr, len, - pContext, pQuery->EntryContext); - if(status != STATUS_SUCCESS && status != STATUS_BUFFER_TOO_SMALL) - return status; - } - } - else - { - while(count<=pInfo->DataLength) - { - String = (WCHAR*)(((CHAR*)pInfo) + pInfo->DataOffset)+count; - count+=wcslen(String)+1; - RtlInitUnicodeString(&src, (WCHAR*)(((CHAR*)pInfo) + pInfo->DataOffset)); - res = 0; - dst.MaximumLength = 0; - RtlExpandEnvironmentStrings_U(pEnvironment, &src, &dst, &res); - dst.Length = 0; - dst.MaximumLength = res; - dst.Buffer = RtlAllocateHeap(GetProcessHeap(), 0, res * sizeof(WCHAR)); - RtlExpandEnvironmentStrings_U(pEnvironment, &src, &dst, &res); - status = pQuery->QueryRoutine(pQuery->Name, pInfo->Type, dst.Buffer, - dst.Length, pContext, pQuery->EntryContext); - RtlFreeHeap(GetProcessHeap(), 0, dst.Buffer); - if(status != STATUS_SUCCESS && status != STATUS_BUFFER_TOO_SMALL) - return status; - } + wstr = (WCHAR*)((char*)pInfo + pInfo->DataOffset + offset); + len = (wcslen(wstr) + 1) * sizeof(WCHAR); + status = pQuery->QueryRoutine(pQuery->Name, REG_SZ, wstr, len, pContext, pQuery->EntryContext); + if (status != STATUS_SUCCESS && status != STATUS_BUFFER_TOO_SMALL) + return status; } } } diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 14227db755c..50e32cf901a 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -2644,7 +2644,7 @@ static struct query_reg_values_test query_reg_values_tests[] = /* The query routine is called for every value in current key */ { {{ query_routine }}, - STATUS_SUCCESS, 4, SKIP_NAME_CHECK | SKIP_DATA_CHECK | WINE_TODO_CALLS + STATUS_SUCCESS, 4, SKIP_NAME_CHECK | SKIP_DATA_CHECK }, /* NOVALUE is ignored when the name is not null */ { @@ -2686,7 +2686,7 @@ static struct query_reg_values_test query_reg_values_tests[] = { {{ NULL, RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_NOEXPAND, (WCHAR*)L"CapitalsOfEurope", &query_reg_values_direct_str }}, - STATUS_SUCCESS, 0, WINE_TODO_DATA, REG_SZ, L"Brussels\0Paris\0Madrid\0", sizeof(L"Brussels\0Paris\0Madrid\0") + STATUS_SUCCESS, 0, WINE_TODO_DATA, REG_SZ, L"Brussels\0Paris\0%PATH%\0", sizeof(L"Brussels\0Paris\0%PATH%\0") }, /* DIRECT with a null buffer crashes on Windows */ /* { @@ -2710,14 +2710,14 @@ static struct query_reg_values_test query_reg_values_tests[] = {{ query_routine, RTL_QUERY_REGISTRY_NOEXPAND, (WCHAR*)L"WindowsDrive" }}, STATUS_SUCCESS, 1, 0, REG_EXPAND_SZ, L"%SYSTEMDRIVE%" }, - /* NOEXPAND calls the query routine once for each string in a multi-string */ + /* NOEXPAND calls the query routine only once instead of once for each string in a multi-string */ { {{ query_routine, 0, (WCHAR*)L"CapitalsOfEurope" }}, - STATUS_SUCCESS, 3, SPLIT_MULTI | WINE_TODO_CALLS | WINE_TODO_TYPE | WINE_TODO_SIZE | WINE_TODO_DATA, REG_SZ, L"Brussels\0Paris\0Madrid\0" + STATUS_SUCCESS, 3, SPLIT_MULTI, REG_SZ, L"Brussels\0Paris\0%PATH%\0" }, { {{ query_routine, RTL_QUERY_REGISTRY_NOEXPAND, (WCHAR*)L"CapitalsOfEurope" }}, - STATUS_SUCCESS, 1, WINE_TODO_SIZE, REG_MULTI_SZ, L"Brussels\0Paris\0Madrid\0", sizeof(L"Brussels\0Paris\0Madrid\0") + STATUS_SUCCESS, 1, WINE_TODO_SIZE, REG_MULTI_SZ, L"Brussels\0Paris\0%PATH%\0", sizeof(L"Brussels\0Paris\0%PATH%\0") }, /* The default value is used if the registry value does not exist */ { @@ -2733,7 +2733,7 @@ static struct query_reg_values_test query_reg_values_tests[] = STATUS_SUCCESS, 1, WINE_TODO_TYPE | WINE_TODO_SIZE, REG_SZ, L"C:" }, { - {{ query_routine, 0, (WCHAR*)L"I don't exist", NULL, REG_MULTI_SZ, (WCHAR*)L"Brussels\0Paris\0Madrid\0" }}, + {{ query_routine, 0, (WCHAR*)L"I don't exist", NULL, REG_MULTI_SZ, (WCHAR*)L"Brussels\0Paris\0%PATH%\0" }}, STATUS_SUCCESS, 3, EXPECT_DEFAULT_DATA | SPLIT_MULTI | WINE_TODO_CALLS | WINE_TODO_TYPE | WINE_TODO_SIZE }, { @@ -2818,7 +2818,7 @@ static void test_RtlQueryRegistryValues(void) ok(status == ERROR_SUCCESS, "Failed to create registry value WindowsDrive: %lu\n", status); status = RegSetKeyValueW(HKEY_CURRENT_USER, L"WineTest", L"CapitalsOfEurope", REG_MULTI_SZ, - L"Brussels\0Paris\0Madrid", sizeof(L"Brussels\0Paris\0Madrid")); + L"Brussels\0Paris\0%PATH%", sizeof(L"Brussels\0Paris\0%PATH%")); ok(status == ERROR_SUCCESS, "Failed to create registry value CapitalsOfEurope: %lu\n", status); status = RegSetKeyValueW(HKEY_CURRENT_USER, L"WineTest\\subkey", L"Color", REG_SZ,

1 0

Alex Henrie : ntdll: Double-null-terminate multi-strings when using RTL_QUERY_REGISTRY_DIRECT.
by Alexandre Julliard 17 Jun '24

17 Jun '24

Module: wine Branch: master Commit: 2821a850d401dfabc5d76a4f40b0d6a42045fc5e URL: https://gitlab.winehq.org/wine/wine/-/commit/2821a850d401dfabc5d76a4f40b0d6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Jun 14 23:26:38 2024 -0600 ntdll: Double-null-terminate multi-strings when using RTL_QUERY_REGISTRY_DIRECT. --- dlls/ntdll/reg.c | 3 +++ dlls/ntdll/tests/reg.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index ec4ec41c5fb..41dd1853c17 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -321,13 +321,16 @@ static NTSTATUS RTL_ReportRegistryValue(PKEY_VALUE_FULL_INFORMATION pInfo, if (!(pQuery->Flags & RTL_QUERY_REGISTRY_NOEXPAND)) return STATUS_INVALID_PARAMETER; + len += sizeof(WCHAR); if (str->Buffer == NULL) { str->Buffer = RtlAllocateHeap(GetProcessHeap(), 0, len); str->MaximumLength = len; } len = min(len, str->MaximumLength); + len -= sizeof(WCHAR); memcpy(str->Buffer, ((CHAR*)pInfo) + pInfo->DataOffset, len); + str->Buffer[len / sizeof(WCHAR)] = 0; str->Length = len; break; diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 50e32cf901a..85bcaf5ba7d 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -2686,7 +2686,7 @@ static struct query_reg_values_test query_reg_values_tests[] = { {{ NULL, RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_NOEXPAND, (WCHAR*)L"CapitalsOfEurope", &query_reg_values_direct_str }}, - STATUS_SUCCESS, 0, WINE_TODO_DATA, REG_SZ, L"Brussels\0Paris\0%PATH%\0", sizeof(L"Brussels\0Paris\0%PATH%\0") + STATUS_SUCCESS, 0, 0, REG_SZ, L"Brussels\0Paris\0%PATH%\0", sizeof(L"Brussels\0Paris\0%PATH%\0") }, /* DIRECT with a null buffer crashes on Windows */ /* {

1 0

Rémi Bernon : winewayland: Avoid crashing when the dummy window surface is used.
by Alexandre Julliard 17 Jun '24

17 Jun '24

Module: wine Branch: master Commit: 1e701a6b3798ecfd688ad1ff405dbb62b3d214c6 URL: https://gitlab.winehq.org/wine/wine/-/commit/1e701a6b3798ecfd688ad1ff405dbb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jun 15 18:36:50 2024 +0200 winewayland: Avoid crashing when the dummy window surface is used. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56840 --- dlls/winewayland.drv/window_surface.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/winewayland.drv/window_surface.c b/dlls/winewayland.drv/window_surface.c index fb3b8750001..888fa74c085 100644 --- a/dlls/winewayland.drv/window_surface.c +++ b/dlls/winewayland.drv/window_surface.c @@ -489,8 +489,12 @@ failed: void wayland_window_surface_update_wayland_surface(struct window_surface *window_surface, struct wayland_surface *wayland_surface) { - struct wayland_window_surface *wws = wayland_window_surface_cast(window_surface); + struct wayland_window_surface *wws; + + /* ignore calls with the dummy surface */ + if (window_surface->funcs != &wayland_window_surface_funcs) return; + wws = wayland_window_surface_cast(window_surface); window_surface_lock(window_surface); TRACE("surface=%p hwnd=%p wayland_surface=%p\n", wws, window_surface->hwnd, wayland_surface);

1 0

Rémi Bernon : win32u: Avoid setting the SWP_NOSIZE flag on the initial WM_DISPLAYCHANGE.
by Alexandre Julliard 17 Jun '24

17 Jun '24

Module: wine Branch: master Commit: 6b1becc3e0731357f81963c7630fbb2cf1ab2bfd URL: https://gitlab.winehq.org/wine/wine/-/commit/6b1becc3e0731357f81963c7630fbb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 17 10:31:15 2024 +0200 win32u: Avoid setting the SWP_NOSIZE flag on the initial WM_DISPLAYCHANGE. By initializing the desktop window proc virtual rect cache. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56841 --- dlls/win32u/defwnd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index f549f922fd7..003ba7c0846 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -2977,7 +2977,7 @@ LRESULT desktop_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) return 0; case WM_DISPLAYCHANGE: { - static RECT virtual_rect; + static RECT virtual_rect = {INT_MIN,INT_MIN,INT_MAX,INT_MAX}; RECT new_rect = NtUserGetVirtualScreenRect(), old_rect = virtual_rect; UINT context, flags = 0;

1 0

Rémi Bernon : win32u: Fix a deadlock when locking the same surface on different DCs.
by Alexandre Julliard 17 Jun '24

17 Jun '24

Module: wine Branch: master Commit: 1770f48d0fdcd8db3e46fc9913297ed679dff958 URL: https://gitlab.winehq.org/wine/wine/-/commit/1770f48d0fdcd8db3e46fc9913297e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 17 15:38:28 2024 +0200 win32u: Fix a deadlock when locking the same surface on different DCs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56771 --- dlls/win32u/dibdrv/dc.c | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/win32u/dibdrv/dc.c b/dlls/win32u/dibdrv/dc.c index 48320f5b676..ea7512b01ca 100644 --- a/dlls/win32u/dibdrv/dc.c +++ b/dlls/win32u/dibdrv/dc.c @@ -769,6 +769,20 @@ static inline void unlock_surface( struct windrv_physdev *dev ) } } +static inline void lock_surfaces( struct windrv_physdev *dst_dev, struct windrv_physdev *src_dev ) +{ + lock_surface( dst_dev ); + if (src_dev && !src_dev->lock_count++ && dst_dev->surface != src_dev->surface) + window_surface_lock( src_dev->surface ); +} + +static inline void unlock_surfaces( struct windrv_physdev *dst_dev, struct windrv_physdev *src_dev ) +{ + if (src_dev && !--src_dev->lock_count && dst_dev->surface != src_dev->surface) + window_surface_unlock( src_dev->surface ); + unlock_surface( dst_dev ); +} + static void unlock_windrv_bits( struct gdi_image_bits *bits ) { unlock_surface( bits->param ); @@ -820,13 +834,16 @@ void dibdrv_set_window_surface( DC *dc, struct window_surface *surface ) static BOOL windrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, PHYSDEV src_dev, struct bitblt_coords *src, BLENDFUNCTION func ) { - struct windrv_physdev *physdev = get_windrv_physdev( dst_dev ); + struct windrv_physdev *dst_physdev = get_windrv_physdev( dst_dev ), *src_physdev; BOOL ret; - lock_surface( physdev ); + if (src_dev->funcs == &window_driver) src_physdev = get_windrv_physdev( src_dev ); + else src_physdev = NULL; + + lock_surfaces( dst_physdev, src_physdev ); dst_dev = GET_NEXT_PHYSDEV( dst_dev, pAlphaBlend ); ret = dst_dev->funcs->pAlphaBlend( dst_dev, dst, src_dev, src, func ); - unlock_surface( physdev ); + unlock_surfaces( dst_physdev, src_physdev ); return ret; } @@ -1166,13 +1183,16 @@ static COLORREF windrv_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) static BOOL windrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop ) { - struct windrv_physdev *physdev = get_windrv_physdev( dst_dev ); + struct windrv_physdev *dst_physdev = get_windrv_physdev( dst_dev ), *src_physdev; BOOL ret; - lock_surface( physdev ); + if (src_dev->funcs == &window_driver) src_physdev = get_windrv_physdev( src_dev ); + else src_physdev = NULL; + + lock_surfaces( dst_physdev, src_physdev ); dst_dev = GET_NEXT_PHYSDEV( dst_dev, pStretchBlt ); ret = dst_dev->funcs->pStretchBlt( dst_dev, dst, src_dev, src, rop ); - unlock_surface( physdev ); + unlock_surfaces( dst_physdev, src_physdev ); return ret; }

1 0

Davide Beatrici : mmdevapi: Set the default period to a minimum of 10 ms.
by Alexandre Julliard 17 Jun '24

17 Jun '24

Module: wine Branch: master Commit: 86ac5f5638f90388d5f484aea1cb8e0b1c945e4c URL: https://gitlab.winehq.org/wine/wine/-/commit/86ac5f5638f90388d5f484aea1cb8e… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Fri Jun 14 22:41:15 2024 +0200 mmdevapi: Set the default period to a minimum of 10 ms. --- dlls/mmdevapi/client.c | 55 ++++++++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 26 deletions(-) diff --git a/dlls/mmdevapi/client.c b/dlls/mmdevapi/client.c index 0b849e47e3d..ed635bcf98a 100644 --- a/dlls/mmdevapi/client.c +++ b/dlls/mmdevapi/client.c @@ -99,25 +99,36 @@ static inline struct audio_client *impl_from_IAudioStreamVolume(IAudioStreamVolu return CONTAINING_RECORD(iface, struct audio_client, IAudioStreamVolume_iface); } -static HRESULT adjust_timing(struct audio_client *This, +static HRESULT get_periods(struct audio_client *client, + REFERENCE_TIME *def_period, REFERENCE_TIME *min_period) +{ + static const REFERENCE_TIME min_def_period = 100000; /* 10 ms */ + struct get_device_period_params params; + + params.device = client->device_name; + params.flow = client->dataflow; + params.def_period = def_period; + params.min_period = min_period; + + wine_unix_call(get_device_period, &params); + + if (def_period) *def_period = max(*def_period, min_def_period); + + return params.result; +} + +static HRESULT adjust_timing(struct audio_client *client, REFERENCE_TIME *duration, REFERENCE_TIME *period, const AUDCLNT_SHAREMODE mode, const DWORD flags, const WAVEFORMATEX *fmt) { - struct get_device_period_params params; REFERENCE_TIME def_period, min_period; + HRESULT hr; TRACE("Requested duration %lu and period %lu\n", (ULONG)*duration, (ULONG)*period); - params.device = This->device_name; - params.flow = This->dataflow; - params.def_period = &def_period; - params.min_period = &min_period; - - wine_unix_call(get_device_period, &params); - - if (FAILED(params.result)) - return params.result; + if (FAILED(hr = get_periods(client, &def_period, &min_period))) + return hr; TRACE("Device periods: %lu default and %lu minimum\n", (ULONG)def_period, (ULONG)min_period); @@ -129,21 +140,21 @@ static HRESULT adjust_timing(struct audio_client *This, const WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE *)fmt; if (fmtex->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE && (fmtex->dwChannelMask == 0 || fmtex->dwChannelMask & SPEAKER_RESERVED)) - params.result = AUDCLNT_E_UNSUPPORTED_FORMAT; + hr = AUDCLNT_E_UNSUPPORTED_FORMAT; else { if (*period == 0) *period = def_period; if (*period < min_period || *period > 5000000) - params.result = AUDCLNT_E_INVALID_DEVICE_PERIOD; + hr = AUDCLNT_E_INVALID_DEVICE_PERIOD; else if (*duration > 20000000) /* The smaller the period, the lower this limit. */ - params.result = AUDCLNT_E_BUFFER_SIZE_ERROR; + hr = AUDCLNT_E_BUFFER_SIZE_ERROR; else if (flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK) { if (*duration != *period) - params.result = AUDCLNT_E_BUFDURATION_PERIOD_NOT_EQUAL; + hr = AUDCLNT_E_BUFDURATION_PERIOD_NOT_EQUAL; FIXME("EXCLUSIVE mode with EVENTCALLBACK\n"); - params.result = AUDCLNT_E_DEVICE_IN_USE; + hr = AUDCLNT_E_DEVICE_IN_USE; } else if (*duration < 8 * *period) *duration = 8 * *period; /* May grow above 2s. */ } @@ -151,7 +162,7 @@ static HRESULT adjust_timing(struct audio_client *This, TRACE("Adjusted duration %lu and period %lu\n", (ULONG)*duration, (ULONG)*period); - return params.result; + return hr; } static void dump_fmt(const WAVEFORMATEX *fmt) @@ -748,21 +759,13 @@ static HRESULT WINAPI client_GetDevicePeriod(IAudioClient3 *iface, REFERENCE_TIM REFERENCE_TIME *minperiod) { struct audio_client *This = impl_from_IAudioClient3(iface); - struct get_device_period_params params; TRACE("(%p)->(%p, %p)\n", This, defperiod, minperiod); if (!defperiod && !minperiod) return E_POINTER; - params.device = This->device_name; - params.flow = This->dataflow; - params.def_period = defperiod; - params.min_period = minperiod; - - wine_unix_call(get_device_period, &params); - - return params.result; + return get_periods(This, defperiod, minperiod); } static HRESULT WINAPI client_Start(IAudioClient3 *iface)

1 0

Davide Beatrici : winepulse: Don't set a floor for the period(s).
by Alexandre Julliard 17 Jun '24

17 Jun '24

Module: wine Branch: master Commit: 28818e6bd58512530b339a1a9232af82c252c7c9 URL: https://gitlab.winehq.org/wine/wine/-/commit/28818e6bd58512530b339a1a9232af… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Fri Jun 7 20:12:58 2024 +0200 winepulse: Don't set a floor for the period(s). This driver, unlike the others, queries the engine for the actual device period. The default period floor is not needed anymore because it now lives in mmdevapi. The minimum period floor never mattered because exclusive mode is not supported. --- dlls/winepulse.drv/pulse.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index dd8d0b4441d..068245f03b2 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -113,9 +113,6 @@ static pa_mainloop *pulse_ml; static struct list g_phys_speakers = LIST_INIT(g_phys_speakers); static struct list g_phys_sources = LIST_INIT(g_phys_sources); -static const REFERENCE_TIME MinimumPeriod = 30000; -static const REFERENCE_TIME DefaultPeriod = 100000; - static pthread_mutex_t pulse_mutex; static pthread_cond_t pulse_cond = PTHREAD_COND_INITIALIZER; @@ -750,12 +747,6 @@ static void pulse_probe_settings(int render, const char *pulse_name, WAVEFORMATE if (length) *def_period = *min_period = pa_bytes_to_usec(10 * length, &ss); - if (*min_period < MinimumPeriod) - *min_period = MinimumPeriod; - - if (*def_period < DefaultPeriod) - *def_period = DefaultPeriod; - wfx->wFormatTag = WAVE_FORMAT_EXTENSIBLE; wfx->cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX);

1 0

Giovanni Mascellani : ci: Assume an Apple Silicon-based environment for the macOS CI job.
by Alexandre Julliard 17 Jun '24

17 Jun '24

Module: vkd3d Branch: master Commit: 46a1b66df74f34693eed06859944f584a0ec2711 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/46a1b66df74f34693eed06859944f… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Jun 12 15:51:22 2024 +0200 ci: Assume an Apple Silicon-based environment for the macOS CI job. The previous Intel-based macOS runner was replaced with another one running as a virtual machine on top of an Apple Silicon host. Since the current macOS runner is not yet able to deal with different exit codes, we temporarily allow failure unconditionally. This will be reverted as soon as the runner issue is fixed. --- gitlab/build-mac | 2 +- gitlab/build.yml | 24 ++++++++++++------------ gitlab/image.yml | 28 +++++++++++++++++++++------- gitlab/patch_moltenvk_icd.sh | 12 ------------ 4 files changed, 34 insertions(+), 32 deletions(-) diff --git a/gitlab/build-mac b/gitlab/build-mac index c0efbdf0..5d7d5845 100755 --- a/gitlab/build-mac +++ b/gitlab/build-mac @@ -10,7 +10,7 @@ set -Eeuxo pipefail rm -fr build mkdir build cd build -if ../configure CFLAGS="-g -O2 -Wno-implicit-fallthrough -Werror" && \ +if ../configure CFLAGS="-I/opt/homebrew/opt/vulkan-headers/include -I/opt/homebrew/opt/spirv-headers/include -g -O2 -Wno-implicit-fallthrough -Wno-ignored-attributes -Wno-unknown-attributes -Wno-unused-but-set-variable -Werror" VULKAN_LIBS=-L/opt/homebrew/opt/vulkan-loader/lib --with-spirv-tools && \ make -j$(sysctl -n hw.ncpu) ; then make -j$(sysctl -n hw.ncpu) AM_COLOR_TESTS=always check || \ touch ../tests_failed diff --git a/gitlab/build.yml b/gitlab/build.yml index fb8a6879..c6ce6b62 100644 --- a/gitlab/build.yml +++ b/gitlab/build.yml @@ -137,9 +137,11 @@ build-mac: stage: build rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - allow_failure: - exit_codes: - - 2 + image: winehq-sonoma-pristine + variables: + TART_EXECUTOR_SSH_USERNAME: "gitlab" + TART_EXECUTOR_SSH_PASSWORD: "gitlab" + allow_failure: true interruptible: true needs: - job: image-mac @@ -148,28 +150,26 @@ build-mac: tags: - mac script: + - brew install vulkan-tools libtool spirv-headers vulkan-loader - git config --global --add safe.directory $CI_PROJECT_DIR - git clean -fdx - git reset --hard - rm -fr .git/rebase-merge - # We use a custom ICD which is not marked as a portability driver, - # so that test programs are not confused. - - ./gitlab/patch_moltenvk_icd.sh - - export VK_DRIVER_FILES="$PWD/gitlab/MoltenVK_icd.json" + - curl -o image.zip https://gitlab.winehq.org/api/v4/projects/giomasce%2Fvkd3d/jobs/artifacts/c… + - unzip image.zip - mkdir artifacts + - export PATH="/opt/homebrew/opt/bison/bin:/opt/homebrew/opt/flex/bin:$PWD/image/bin:$PATH" + - export VK_DRIVER_FILES="$PWD/image/moltenvk/MoltenVK_icd.json" - system_profiler SPSoftwareDataType SPHardwareDataType > artifacts/systeminfo.txt - vulkaninfo > artifacts/vulkaninfo.txt - - export PATH="/usr/local/opt/bison/bin:/usr/local/opt/flex/bin:$PATH" - - curl -o image.zip https://gitlab.winehq.org/api/v4/projects/wine%2Fvkd3d/jobs/artifacts/maste… - - unzip image.zip - - export PATH="$PWD/image/bin:$PATH" - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./gitlab/build-mac - if [ -f build_failed ] ; then exit 1 ; fi - if [ -f tests_failed ] ; then exit 2 ; fi variables: VKD3D_DISABLE_EXTENSIONS: "VK_EXT_descriptor_indexing" VKD3D_SHADER_CONFIG: 'force_validation' - MVK_CONFIG_LOG_LEVEL: 1 + MVK_CONFIG_LOG_LEVEL: 2 + SONAME_LIBVULKAN: "/opt/homebrew/opt/vulkan-loader/lib/libvulkan.1.dylib" artifacts: when: always paths: diff --git a/gitlab/image.yml b/gitlab/image.yml index 8b235a66..5cf64d07 100644 --- a/gitlab/image.yml +++ b/gitlab/image.yml @@ -31,24 +31,38 @@ image-mac: - .gitlab-ci.yml - gitlab/image.yml - gitlab/image.docker + image: winehq-sonoma-pristine + variables: + TART_EXECUTOR_SSH_USERNAME: "gitlab" + TART_EXECUTOR_SSH_PASSWORD: "gitlab" interruptible: true tags: - mac script: - mkdir image - - cd image - - mkdir bin + - mkdir image/bin + - mkdir image/moltenvk - export PATH="/usr/local/opt/bison/bin:/usr/local/opt/flex/bin:$PATH" + + - git clone --depth 1 --branch v1.2.9 https://github.com/KhronosGroup/MoltenVK.git + - cd MoltenVK + - ./fetchDependencies --macos + - make macos + # Do not mark MoltenVK as a portability driver, otherwise it will be harder for vkd3d to find + # it. Since editing JSON properly is hard, we just rename the key. + - 'sed -i -e "s|is_portability_driver|_is_portability_driver|g" Package/Release/MoltenVK/dylib/macOS/MoltenVK_icd.json' + - cd .. + - cp MoltenVK/Package/Release/MoltenVK/dylib/macOS/MoltenVK_icd.json image/moltenvk + - cp MoltenVK/Package/Release/MoltenVK/dylib/macOS/libMoltenVK.dylib image/moltenvk + - git clone --depth 1 --branch wine-3.21 https://gitlab.winehq.org/wine/wine.git - cd wine - mkdir build - cd build - - ../configure --enable-win64 --without-x --without-freetype - - make tools/widl/widl + - arch -x86_64 ../configure --enable-win64 --without-x --without-freetype + - arch -x86_64 make tools/widl/widl - cd ../.. - - cp wine/build/tools/widl/widl bin - - rm -fr wine - - cd .. + - cp wine/build/tools/widl/widl image/bin artifacts: paths: - image diff --git a/gitlab/patch_moltenvk_icd.sh b/gitlab/patch_moltenvk_icd.sh deleted file mode 100755 index ad90a4ea..00000000 --- a/gitlab/patch_moltenvk_icd.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -BASE_PATH="/usr/local/opt/molten-vk/share/vulkan/icd.d" - -cp "$BASE_PATH/MoltenVK_icd.json" gitlab/MoltenVK_icd.json - -# The driver path is relative -sed -i -e 's|"library_path" *: "|"library_path" : "'"$BASE_PATH/"'|g' gitlab/MoltenVK_icd.json - -# We pretend this is not a portability driver, otherwise vkd3d won't -# find it -sed -i -e 's|"is_portability_driver" *: *true|"is_portability_driver" : false|g' gitlab/MoltenVK_icd.json

1 0

Danyil Blyschak : opcservices: Provide memory allocator functions to zlib.
by Alexandre Julliard 14 Jun '24

14 Jun '24

Module: wine Branch: master Commit: 6b01563bd06988de4c384f29f77430b3c31ad494 URL: https://gitlab.winehq.org/wine/wine/-/commit/6b01563bd06988de4c384f29f77430… Author: Danyil Blyschak <dblyschak(a)codeweavers.com> Date: Thu Jun 13 12:31:56 2024 -0500 opcservices: Provide memory allocator functions to zlib. --- dlls/opcservices/compress.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/opcservices/compress.c b/dlls/opcservices/compress.c index 37a90716a74..186469a782c 100644 --- a/dlls/opcservices/compress.c +++ b/dlls/opcservices/compress.c @@ -184,6 +184,16 @@ void compress_finalize_archive(struct zip_archive *archive) free(archive); } +static void *zalloc(void *opaque, unsigned int items, unsigned int size) +{ + return malloc(items * size); +} + +static void zfree(void *opaque, void *ptr) +{ + free(ptr); +} + static void compress_write_content(struct zip_archive *archive, IStream *content, OPC_COMPRESSION_OPTIONS options, struct data_descriptor *data_desc) { @@ -220,6 +230,8 @@ static void compress_write_content(struct zip_archive *archive, IStream *content } memset(&z_str, 0, sizeof(z_str)); + z_str.zalloc = zalloc; + z_str.zfree = zfree; deflateInit2(&z_str, level, Z_DEFLATED, -MAX_WBITS, MAX_MEM_LEVEL, Z_DEFAULT_STRATEGY); do

1 0

Danyil Blyschak : opcservices: Suppress unnecessary zlib deflate warnings.
by Alexandre Julliard 14 Jun '24

14 Jun '24

Module: wine Branch: master Commit: 333eea8331b19b9b9276bfeefe6c8ffbd5a8844f URL: https://gitlab.winehq.org/wine/wine/-/commit/333eea8331b19b9b9276bfeefe6c8f… Author: Danyil Blyschak <dblyschak(a)codeweavers.com> Date: Thu Jun 13 12:40:23 2024 -0500 opcservices: Suppress unnecessary zlib deflate warnings. Zlib documents that negative return values for this function are errors and positive ones are special but normal events. --- dlls/opcservices/compress.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/opcservices/compress.c b/dlls/opcservices/compress.c index 186469a782c..841c674c26c 100644 --- a/dlls/opcservices/compress.c +++ b/dlls/opcservices/compress.c @@ -257,7 +257,7 @@ static void compress_write_content(struct zip_archive *archive, IStream *content z_str.avail_out = sizeof(archive->output_buffer); z_str.next_out = archive->output_buffer; - if ((ret = deflate(&z_str, flush))) + if ((ret = deflate(&z_str, flush)) < 0) WARN("Failed to deflate, ret %d.\n", ret); have = sizeof(archive->output_buffer) - z_str.avail_out; compress_write(archive, archive->output_buffer, have);

1 0