June 2022 - Wine-Devel - list.winehq.org

[PATCH v2 0/2] MR325: pulse/alsa: Set device path for all devices

by Arek Hiler (＠ivyl)

Required by Cyberpunk 2077 for 4.0 audio setups (`PKEY_AudioEndpoint_PhysicalSpeakers` is `SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT`) as it then dereferences the device path property (`{b3f8fa53-0004-438e-9003-51a46e139bfc},2`) without checking if is is non-NULL. The patches use `{1}.ROOT\MEDIA\%04u` which is used on Windows for virtual audio devices (e.g. the ones created Voicemeeter Banana). -- v2: winealsa.drv: Set device path for all devices. winepulse.drv: Set device path for all devices. https://gitlab.winehq.org/wine/wine/-/merge_requests/325

June 28, 2022

Re: [PATCH 0/2] MR325: pulse/alsa: Set device path for all devices

by Andrew Eikum (＠aeikum)

Andrew Eikum (@aeikum) commented about dlls/winealsa.drv/alsa.c: > - WARN("Could not open %s for reading\n", uevent); > - params->result = E_NOTIMPL; > + /* As hardly any audio devices have serial numbers, Windows instead > + appears to use a persistent random number. We emulate this here > + by instead using the last 8 hex digits of the GUID. */ > + serial_number = (guid->Data4[4] << 24) | (guid->Data4[5] << 16) | (guid->Data4[6] << 8) | guid->Data4[7]; > + > + if(connection == AudioDeviceConnectionType_USB) > + sprintf(buf, "{1}.USB\\VID_%04X&PID_%04X\\%u&%08X", > + vendor_id, product_id, device, serial_number); > + else if (connection == AudioDeviceConnectionType_PCI) > + sprintf(buf, "{1}.HDAUDIO\\FUNC_01&VEN_%04X&DEV_%04X\\%u&%08X", > + vendor_id, product_id, device, serial_number); > + else > + { > + ERR("name: %s\n", name); Is this ERR intentional? If so it should be a bit more descriptive I think. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/325#note_2862

June 28, 2022

Re: [PATCH v2 0/1] MR331: winecfg: Support color profiles larger than MAX_PATH chars. - approved

by Zhiyi Zhang (＠zhiyi)

This merge request was approved by Zhiyi Zhang. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/331

June 28, 2022

[PATCH v2 1/1] winecfg: Support color profiles larger than MAX_PATH chars.

by Stefan Dösinger

From: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- GetPrivateProfileStringW looks rather awkward to me, and we are dealing with external input here, so if there is a better way to handle this please let me know. A theme description I copypasted out of the registry has 384 characters, so a larger array than MAX_PATH is needed to import it correctly. A maliciously crafted ini file could have any size. --- programs/winecfg/theme.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 9c8737caf64..78bbf71dbfa 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -22,6 +22,7 @@ * */ +#include <assert.h> #include <stdarg.h> #include <stdlib.h> #include <stdio.h> @@ -554,15 +555,25 @@ static void set_color_from_theme(const WCHAR *keyName, COLORREF color) static void do_parse_theme(WCHAR *file) { - WCHAR keyName[MAX_PATH], keyNameValue[MAX_PATH]; + WCHAR *keyName, keyNameValue[MAX_PATH]; + DWORD len, allocLen = 512; WCHAR *keyNamePtr = NULL; int red = 0, green = 0, blue = 0; COLORREF color; WINE_TRACE("%s\n", wine_dbgstr_w(file)); + keyName = malloc(sizeof(*keyName) * allocLen); + for (;;) + { + assert(keyName); + len = GetPrivateProfileStringW(L"Control Panel\\Colors", NULL, NULL, keyName, + allocLen, file); + if (len < allocLen - 2) + break; - GetPrivateProfileStringW(L"Control Panel\\Colors", NULL, NULL, keyName, - MAX_PATH, file); + allocLen *= 2; + keyName = realloc(keyName, sizeof(*keyName) * allocLen); + } keyNamePtr = keyName; while (*keyNamePtr!=0) { @@ -580,6 +591,7 @@ static void do_parse_theme(WCHAR *file) keyNamePtr+=lstrlenW(keyNamePtr); keyNamePtr++; } + free(keyName); } static void on_theme_install(HWND dialog) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/331

June 28, 2022

[PATCH v2 0/1] MR331: winecfg: Support color profiles larger than MAX_PATH chars.

by Stefan Dösinger

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- GetPrivateProfileStringW looks rather awkward to me, and we are dealing with external input here, so if there is a better way to handle this please let me know. A theme description I copypasted out of the registry has 384 characters, so a larger array than MAX_PATH is needed to import it correctly. A maliciously crafted ini file could have any size. -- v2: winecfg: Support color profiles larger than MAX_PATH chars. https://gitlab.winehq.org/wine/wine/-/merge_requests/331

June 28, 2022

Re: [PATCH 0/1] MR331: winecfg: Support color profiles larger than MAX_PATH chars.

by Zhiyi Zhang (＠zhiyi)

Zhiyi Zhang (@zhiyi) commented about programs/winecfg/theme.c: > static void do_parse_theme(WCHAR *file) > { > - WCHAR keyName[MAX_PATH], keyNameValue[MAX_PATH]; > + WCHAR *keyName, keyNameValue[MAX_PATH]; > + DWORD len, allocLen = 512; > WCHAR *keyNamePtr = NULL; > int red = 0, green = 0, blue = 0; > COLORREF color; > > - WINE_TRACE("%s\n", wine_dbgstr_w(file)); > + keyName = malloc(sizeof(*keyName) * allocLen); > + for (;;) > + { > + assert(keyName); > + len = GetPrivateProfileStringW(L"Control Panel\\Colors", NULL, NULL, keyName, > + allocLen, file); Formatting. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/331#note_2853

June 28, 2022

Re: [PATCH 0/1] MR331: winecfg: Support color profiles larger than MAX_PATH chars.

by Zhiyi Zhang (＠zhiyi)

Zhiyi Zhang (@zhiyi) commented about programs/winecfg/theme.c: > > static void do_parse_theme(WCHAR *file) > { > - WCHAR keyName[MAX_PATH], keyNameValue[MAX_PATH]; > + WCHAR *keyName, keyNameValue[MAX_PATH]; > + DWORD len, allocLen = 512; > WCHAR *keyNamePtr = NULL; > int red = 0, green = 0, blue = 0; > COLORREF color; > > - WINE_TRACE("%s\n", wine_dbgstr_w(file)); Please don't remove this trace. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/331#note_2852

June 28, 2022

Re: [PATCH vkd3d 1/6] vkd3d-shader/hlsl: Fold constant swizzles.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

June 28, 2022

Re: [PATCH vkd3d 3/6] vkd3d-shader/hlsl: Fold constant integral min().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

June 28, 2022

Re: [PATCH vkd3d 5/6] vkd3d-shader/hlsl: Fold constant integral bitwise and.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

June 28, 2022