- Wine-Devel - list.winehq.org

[PATCH 0/3] MR358: atl: Avoid NULL pointer reference in AtlComModuleGetClassObject().
by Zhiyi Zhang (＠zhiyi) July 6, 2022

July 6, 2022

Fix crash in CAXA CAD when clicking component library. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/358

3 6

[PATCH 0/3] MR392: regedit: Code clean-up and invalid read fix
by Hugh McMaster (＠hmc) July 6, 2022

July 6, 2022

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/392

2 3

[PATCH v2] sechost: Support decimal access rights in ConvertStringSecurityDescriptorToSecurityDescriptor.
by Dmitry Timoshkov July 6, 2022

July 6, 2022

v2: Add a test with leading zero. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/advapi32/tests/security.c | 2 ++ dlls/sechost/security.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index ed91ccc39d3..547daef2bd6 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4240,6 +4240,8 @@ static void test_ConvertStringSecurityDescriptor(void) { "D:(D;;GA;;;WD )", SDDL_REVISION_1, TRUE }, /* test ACE string access rights */ { "D:(A;;GA;;;WD)", SDDL_REVISION_1, TRUE }, + { "D:(A;;1;;;WD)", SDDL_REVISION_1, TRUE }, + { "D:(A;;01;;;WD)", SDDL_REVISION_1, TRUE }, { "D:(A;;GRGWGX;;;WD)", SDDL_REVISION_1, TRUE }, { "D:(A;;RCSDWDWO;;;WD)", SDDL_REVISION_1, TRUE }, { "D:(A;;RPWPCCDCLCSWLODTCR;;;WD)", SDDL_REVISION_1, TRUE }, diff --git a/dlls/sechost/security.c b/dlls/sechost/security.c index 6916b3ad662..f6fcffd9cfc 100644 --- a/dlls/sechost/security.c +++ b/dlls/sechost/security.c @@ -903,6 +903,9 @@ static DWORD parse_ace_right( const WCHAR **string_ptr ) if (string[0] == '0' && string[1] == 'x') return wcstoul( string, (WCHAR **)string_ptr, 16 ); + if (iswdigit( string[0] )) + return wcstoul( string, (WCHAR **)string_ptr, 10 ); + for (i = 0; i < ARRAY_SIZE(ace_rights); ++i) { if (!wcsncmp( string, ace_rights[i].str, 2 )) -- 2.36.1

2 2

[PATCH v6 0/6] MR355: win32u: Move more display mode logic out of graphics drivers.
by Rémi Bernon July 6, 2022

July 6, 2022

-- v6: win32u: Move writing mode to registry out of graphics drivers. win32u: Move NtUserChangeDisplaySettings mode validation to a separate helper. win32u: Move reading mode from registry out of graphics drivers. win32u: Set generic DEVMODEW fields in NtUserEnumDisplaySettings. win32u: Move default UpdateDisplayDevices implementation out of nulldrv. win32u: Add invisible winstation virtual monitor outside of nulldrv. https://gitlab.winehq.org/wine/wine/-/merge_requests/355

2 9

Re: [PATCH v14 0/8] MR337: winepulse: Return device-specific values for GetMixFormat and GetDevicePeriod - approved
by Huw Davies (＠huw) July 6, 2022

July 6, 2022

This merge request was approved by Huw Davies. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/337

1 0

Re: [PATCH v14 0/8] MR337: winepulse: Return device-specific values for GetMixFormat and GetDevicePeriod
by Claire (＠ClearlyClaire) July 6, 2022

July 6, 2022

Reverted to the previous set. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/337#note_3441

1 0

[PATCH v13 0/9] MR337: winepulse: Return device-specific values for GetMixFormat and GetDevicePeriod
by Claire (＠ClearlyClaire) July 6, 2022

July 6, 2022

When `GetMixFormat` or `GetDevicePeriod` are used, return values specific to the selected device instead of those of the default one. This is especially useful when the audio devices features less channels than one specifically selected by the application. This patch is part of an attempt to get Sony's DualSense controllers to work with Windows games through Wine. This is not enough by itself, but getting the proper mix format is required for most of those games to correctly use the haptic feedback features of the DualSense (which go through an audio output with 4 audio devices). -- v13: winepulse: Don't probe default devices twice winepulse: Log errors when failing to probe a device winepulse: Use stream-specific period in pulse_get_latency winepulse: Store and use device period on stream creation winepulse: Fix memory leak in pulse_create_stream in some error cases winepulse: Remove unused pulse_config winepulse: Return device-specific values for GetDevicePeriod winepulse: Return device-specific values for GetMixFormat winepulse: Store device-specific format and periods https://gitlab.winehq.org/wine/wine/-/merge_requests/337

3 10

[PATCH v3 0/10] MR343: scrrun: Implement MoveFolder().
by Robert Wilhelm (＠sloper42) July 6, 2022

July 6, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52128 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> -- v3: scrrun: Support wildcards in MoveFolder(). scrrun: Move source dir into destination dir if destination ends with separator in MoveFolder(). https://gitlab.winehq.org/wine/wine/-/merge_requests/343

3 14

[PATCH v12 0/8] MR337: winepulse: Return device-specific values for GetMixFormat and GetDevicePeriod
by Claire (＠ClearlyClaire) July 6, 2022

July 6, 2022

When `GetMixFormat` or `GetDevicePeriod` are used, return values specific to the selected device instead of those of the default one. This is especially useful when the audio devices features less channels than one specifically selected by the application. This patch is part of an attempt to get Sony's DualSense controllers to work with Windows games through Wine. This is not enough by itself, but getting the proper mix format is required for most of those games to correctly use the haptic feedback features of the DualSense (which go through an audio output with 4 audio devices). -- v12: winepulse: Don't probe default devices twice winepulse: Use stream-specific period in pulse_get_latency winepulse: Store and use device period on stream creation winepulse: Fix memory leak in pulse_create_stream in some error cases winepulse: Remove unused pulse_config winepulse: Return device-specific values for GetDevicePeriod https://gitlab.winehq.org/wine/wine/-/merge_requests/337

4 16

[PATCH v4] ntdll: Add RtlGetDeviceFamilyInfoEnum and RtlConvertDeviceFamilyInfoToString
by Kacper Rączy July 6, 2022

July 6, 2022

APIs introduced in Windows 10 (NT10.0). Device form and family are hardcoded to Unknown and Windows.Desktop respectively. Unit tests included in dlls/ntdll/tests/env.c Signed-off-by: Kacper Rączy <gfw.kra(a)gmail.com> --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/tests/env.c | 61 ++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/version.c | 49 +++++++++++++++++++++++++++++++++ include/winnt.h | 9 +++++++ 4 files changed, 121 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 1862358e593..00dae98b9ad 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -530,6 +530,7 @@ # @ stub RtlComputeImportTableHash # @ stub RtlComputePrivatizedDllName_U @ stub RtlConsoleMultiByteToUnicodeN +@ stdcall RtlConvertDeviceFamilyInfoToString(ptr ptr ptr ptr) @ stub RtlConvertExclusiveToShared @ stdcall -arch=win32 -ret64 RtlConvertLongToLargeInteger(long) # @ stub RtlConvertPropertyToVariant @@ -712,6 +713,7 @@ @ stdcall RtlGetCurrentProcessorNumberEx(ptr) @ stdcall RtlGetCurrentTransaction() @ stdcall RtlGetDaclSecurityDescriptor(ptr ptr ptr ptr) +@ stdcall RtlGetDeviceFamilyInfoEnum(ptr ptr ptr) @ stdcall RtlGetElementGenericTable(ptr long) # @ stub RtlGetElementGenericTableAvl @ stdcall RtlGetEnabledExtendedFeatures(int64) diff --git a/dlls/ntdll/tests/env.c b/dlls/ntdll/tests/env.c index e998880f03b..050320d0182 100644 --- a/dlls/ntdll/tests/env.c +++ b/dlls/ntdll/tests/env.c @@ -654,6 +654,65 @@ static void test_RtlSetEnvironmentVariable(void) ok(!status, "got %#lx\n", status); } +static void test_RtlGetDeviceFamilyInfoEnum(void) +{ + DWORD family, form; + ULONGLONG uap; + RTL_OSVERSIONINFOEXW version; + + RtlGetVersion(&version); + RtlGetDeviceFamilyInfoEnum(&uap, &family, &form); + ok( ((uap >> 48) & 0xffff) == version.dwMajorVersion, + "First 16-bit chunk of UAP does not match major system version %llx\n", uap ); + ok( ((uap >> 32) & 0xffff) == version.dwMinorVersion, + "Second 16-bit chunk of UAP does not match minor system version %llx\n", uap ); + ok( ((uap >> 16) & 0xffff) == version.dwBuildNumber, + "Third 16-bit chunk of UAP does not match build number %llx\n", uap ); + ok( family <= DEVICEFAMILYINFOENUM_MAX, + "Device family is not valid: %lx\n", family ); + ok( form <= DEVICEFAMILYDEVICEFORM_MAX, + "Device form is not valid: %lx\n", form ); +} + +static void test_RtlConvertDeviceFamilyInfoToString(void) +{ + static const WCHAR *DeviceForms[] = { + L"Unknown", L"Phone", L"Tablet", L"Desktop", L"Notebook", + L"Convertible", L"Detachable", L"All-in-One", L"Stick PC", L"Puck", + L"Surface Hub", L"Head-mounted display", L"Industry handheld", L"Industry tablet", L"Banking", + L"Building automation", L"Digital signage", L"Gaming", L"Home automation", L"Industrial automation", + L"Kiosk", L"Maker board", L"Medical", L"Networking", L"Point of Service", + L"Printing", L"Thin client", L"Toy", L"Vending", L"Industry other" + }; + + DWORD family_bufsize = 0, form_bufsize = 0; + WCHAR *family, *form; + BOOL form_valid = FALSE; + + RtlConvertDeviceFamilyInfoToString(&family_bufsize, &form_bufsize, NULL, NULL); + ok( family_bufsize == sizeof( L"Windows.Desktop" ), + "Device family bufsize does not match: %lu\n", family_bufsize ); + ok( form_bufsize > 0, "Device form bufsize is invalid: %lu\n", form_bufsize ); + + family = malloc(family_bufsize); + form = malloc(form_bufsize); + RtlConvertDeviceFamilyInfoToString(&family_bufsize, &form_bufsize, family, form); + ok( wcscmp(family, L"Windows.Desktop") == 0, + "Device family string is not equal to Windows.Desktop: %ls\n", family ); + /* Device form depends on OEM setting in registry, + * lets check all possible values to make it work on Windows */ + for (int i = 0; i < sizeof(DeviceForms) / sizeof(WCHAR*); i++) { + if (wcscmp(form, DeviceForms[i]) == 0) { + form_valid = TRUE; + break; + } + } + ok( form_valid, "Device form string is not valid or known: %ls\n", form); + + free(family); + free(form); +} + START_TEST(env) { HMODULE mod = GetModuleHandleA("ntdll.dll"); @@ -672,4 +731,6 @@ START_TEST(env) test_process_params(); test_RtlSetCurrentEnvironment(); test_RtlSetEnvironmentVariable(); + test_RtlGetDeviceFamilyInfoEnum(); + test_RtlConvertDeviceFamilyInfoToString(); } diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index b9eabb31154..885258f00f2 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -761,6 +761,55 @@ NTSTATUS WINAPI RtlVerifyVersionInfo( const RTL_OSVERSIONINFOEXW *info, } +/********************************************************************* + * RtlGetDeviceFamilyInfoEnum (NTDLL.@) + */ +void WINAPI RtlGetDeviceFamilyInfoEnum( ULONGLONG *uap_info, DWORD *device_family, DWORD *device_form ) +{ + TRACE("(%p,%p,%p)\n", uap_info, device_family, device_form); + + if (device_form) + *device_form = DEVICEFAMILYDEVICEFORM_UNKNOWN; + if (device_family) + *device_family = DEVICEFAMILYINFOENUM_DESKTOP; + if (!uap_info) + return; + + /** + * UAP info is 64 bit unsigned integer which contains four 16-bit chunks: + * 1. os version major + * 2. os version minor + * 3. current build number + * 4. update build revision + */ + *uap_info = 0; + *uap_info |= (((ULONGLONG)current_version->dwMajorVersion & 0xffff) << 48); + *uap_info |= (((ULONGLONG)current_version->dwMinorVersion & 0xffff) << 32); + *uap_info |= (((ULONGLONG)current_version->dwBuildNumber & 0xffff) << 16); + /* UBR not available */ +} + + +/********************************************************************* + * RtlConvertDeviceFamilyInfoToString (NTDLL.@) + */ +void WINAPI RtlConvertDeviceFamilyInfoToString( DWORD *device_family_bufsize, DWORD *device_form_bufsize, + WCHAR *device_family, WCHAR *device_form ) +{ + static const DWORD device_family_len = sizeof( L"Windows.Desktop" ); + static const DWORD device_form_len = sizeof( L"Unknown" ); + + TRACE("(%p,%p,%p,%p)\n", device_family_bufsize, device_form_bufsize, device_family, device_form); + + if (*device_family_bufsize >= device_family_len) + wcscpy( device_family, L"Windows.Desktop" ); + if (*device_form_bufsize >= device_form_len) + wcscpy( device_form, L"Unknown" ); + *device_family_bufsize = device_family_len; + *device_form_bufsize = device_form_len; +} + + /****************************************************************************** * VerSetConditionMask (NTDLL.@) */ diff --git a/include/winnt.h b/include/winnt.h index 50f6452b145..c2945f31925 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6224,6 +6224,15 @@ typedef struct _SYSTEM_CPU_SET_INFORMATION } DUMMYUNIONNAME; } SYSTEM_CPU_SET_INFORMATION, *PSYSTEM_CPU_SET_INFORMATION; +#define DEVICEFAMILYINFOENUM_DESKTOP 0x00000003 +#define DEVICEFAMILYINFOENUM_MAX 0x00000011 + +#define DEVICEFAMILYDEVICEFORM_UNKNOWN 0x00000000 +#define DEVICEFAMILYDEVICEFORM_MAX 0x00000021 + +NTSYSAPI VOID WINAPI RtlGetDeviceFamilyInfoEnum(ULONGLONG*, DWORD*, DWORD*); +NTSYSAPI VOID WINAPI RtlConvertDeviceFamilyInfoToString(DWORD*, DWORD*, WCHAR*, WCHAR*); + /* Threadpool things */ typedef DWORD TP_VERSION,*PTP_VERSION; -- 2.37.0

2 2