- Wine-Devel - list.winehq.org

[PATCH 0/2] MR300: d2d1: Implement IsBufferPrecisionSupported().
by Nikolay Sivov (＠nsivov) June 23, 2022

June 23, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/300

2 2

[PATCH 0/1] MR296: nsiproxy.sys: Add static ARP entries which are always present on Windows.
by Paul Gofman (＠gofman) June 23, 2022

June 23, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53175 Split off from MR https://gitlab.winehq.org/wine/wine/-/merge_requests/286. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/296

3 9

[PATCH v2] ntdll: Add RtlGetDeviceFamilyInfoEnum and RtlConvertDeviceFamilyInfoToString
by Kacper Raczy June 22, 2022

June 22, 2022

APIs introduced in Windows 10 (NT10.0). Device form and family is fixed to Desktop configuration. Unit tests included in dlls/ntdll/tests/version.c Signed-off-by: Kacper Raczy <gfw.kra(a)gmail.com> --- dlls/ntdll/ntdll.spec | 2 + dlls/ntdll/rtl.c | 2 +- dlls/ntdll/tests/Makefile.in | 3 +- dlls/ntdll/tests/version.c | 71 ++++++++++++++++++++++++++++++++++++ dlls/ntdll/version.c | 48 +++++++++++++++++++++++- include/winnt.h | 10 +++++ 6 files changed, 133 insertions(+), 3 deletions(-) create mode 100644 dlls/ntdll/tests/version.c diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index b1650ab4306..4539a9bd0ed 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -712,6 +712,8 @@ @ stdcall RtlGetCurrentProcessorNumberEx(ptr) @ stdcall RtlGetCurrentTransaction() @ stdcall RtlGetDaclSecurityDescriptor(ptr ptr ptr ptr) +@ stdcall RtlGetDeviceFamilyInfoEnum(ptr ptr ptr) +@ stdcall RtlConvertDeviceFamilyInfoToString(ptr ptr ptr ptr) @ stdcall RtlGetElementGenericTable(ptr long) # @ stub RtlGetElementGenericTableAvl @ stdcall RtlGetEnabledExtendedFeatures(int64) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 11067f44941..421cf377d32 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -2211,4 +2211,4 @@ char WINAPI RtlQueryProcessPlaceholderCompatibilityMode(void) { FIXME("stub\n"); return PHCM_APPLICATION_DEFAULT; -} +} \ No newline at end of file diff --git a/dlls/ntdll/tests/Makefile.in b/dlls/ntdll/tests/Makefile.in index 90deb5865f8..e64b70b15e4 100644 --- a/dlls/ntdll/tests/Makefile.in +++ b/dlls/ntdll/tests/Makefile.in @@ -25,5 +25,6 @@ C_SRCS = \ thread.c \ threadpool.c \ time.c \ + version.c \ virtual.c \ - wow64.c + wow64.c \ No newline at end of file diff --git a/dlls/ntdll/tests/version.c b/dlls/ntdll/tests/version.c new file mode 100644 index 00000000000..6b2d86e3464 --- /dev/null +++ b/dlls/ntdll/tests/version.c @@ -0,0 +1,71 @@ +/* + * Unit test suite for Rtl* Version API functions + * + * Copyright 2022 Kacper Rączy + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "ntdll_test.h" +#include "wine/test.h" + +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( form == DEVICEFAMILYDEVICEFORM_DESKTOP, + "Device form does not match Desktop value: %lx\n", form ); + ok( family == DEVICEFAMILYINFOENUM_DESKTOP, + "Device family does not match Windows.Desktop value: %lx\n", family ); +} + +static void test_RtlConvertDeviceFamilyInfoToString(void) +{ + DWORD family_bufsize = 0, form_bufsize = 0; + WCHAR *family, *form; + + RtlConvertDeviceFamilyInfoToString(&family_bufsize, &form_bufsize, NULL, NULL); + ok( family_bufsize == sizeof(WCHAR) * 16, /* Windows.Desktop length */ + "Device family bufsize does not match: %u\n", family_bufsize ); + ok( form_bufsize == sizeof(WCHAR) * 8, /* Desktop length */ + "Device family bufsize does not match: %u\n", form_bufsize ); + + family = (WCHAR*)malloc(family_bufsize); + form = (WCHAR*)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", family ); + ok( wcscmp(form, L"Desktop") == 0, + "Device form string is not equal to Desktop: %ls", form ); + + free(family); + free(form); +} + +START_TEST(version) +{ + test_RtlGetDeviceFamilyInfoEnum(); + test_RtlConvertDeviceFamilyInfoToString(); +} \ No newline at end of file diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 492c24cc636..e988a17311b 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -609,7 +609,6 @@ void WINAPI RtlGetNtVersionNumbers( LPDWORD major, LPDWORD minor, LPDWORD build if (build) *build = (0xF0000000 | current_version->dwBuildNumber); } - /****************************************************************************** * RtlGetNtProductType (NTDLL.@) */ @@ -760,6 +759,53 @@ NTSTATUS WINAPI RtlVerifyVersionInfo( const RTL_OSVERSIONINFOEXW *info, return STATUS_SUCCESS; } +/********************************************************************* + * RtlGetDeviceFamilyInfoEnum (NTDLL.@) + * + * NOTES + * Introduced in Windows 10 (NT10.0) + */ +void WINAPI RtlGetDeviceFamilyInfoEnum( ULONGLONG *uap_info, DWORD *device_family, DWORD *device_form ) +{ + if (device_form) + *device_form = DEVICEFAMILYDEVICEFORM_DESKTOP; + 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. UBR + */ + *uap_info = 0; + *uap_info |= (((ULONGLONG)current_version->dwMajorVersion & 0xffff) << 48); /* os version major */ + *uap_info |= (((ULONGLONG)current_version->dwMinorVersion & 0xffff) << 32); /* os version minor */ + *uap_info |= (((ULONGLONG)current_version->dwBuildNumber & 0xffff) << 16); /* current build number */ + /* UBR not available */ +} + +/********************************************************************* + * RtlConvertDeviceFamilyInfoToString (NTDLL.@) + * + * NOTES + * Introduced in Windows 10 (NT10.0) + */ +void WINAPI RtlConvertDeviceFamilyInfoToString( DWORD *device_family_bufsize, DWORD *device_form_bufsize, + const WCHAR *device_family, const WCHAR *device_form) +{ + DWORD device_family_len = (wcslen( DEVICEFAMILYINFOENUM_DESKTOP_STR ) + 1) * sizeof(WCHAR); + DWORD device_form_len = (wcslen( DEVICEFAMILYDEVICEFORM_DESKTOP_STR ) + 1) * sizeof(WCHAR); + if (*device_family_bufsize >= device_family_len) + wcscpy( device_family, DEVICEFAMILYINFOENUM_DESKTOP_STR ); + if (*device_form_bufsize >= device_form_len) + wcscpy( device_form, DEVICEFAMILYDEVICEFORM_DESKTOP_STR ); + *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 87c4b4da92d..eeb4e1cb494 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6224,6 +6224,16 @@ typedef struct _SYSTEM_CPU_SET_INFORMATION } DUMMYUNIONNAME; } SYSTEM_CPU_SET_INFORMATION, *PSYSTEM_CPU_SET_INFORMATION; +/* Windows 10 Rtl apis */ + +#define DEVICEFAMILYDEVICEFORM_DESKTOP 0x00000003 +#define DEVICEFAMILYINFOENUM_DESKTOP 0x00000003 +#define DEVICEFAMILYDEVICEFORM_DESKTOP_STR L"Desktop" +#define DEVICEFAMILYINFOENUM_DESKTOP_STR L"Windows.Desktop" + +NTSYSAPI VOID WINAPI RtlGetDeviceFamilyInfoEnum(ULONGLONG*, DWORD*, DWORD*); +NTSYSAPI VOID WINAPI RtlConvertDeviceFamilyInfoToString(DWORD*, DWORD*, const WCHAR*, const WCHAR*); + /* Threadpool things */ typedef DWORD TP_VERSION,*PTP_VERSION; -- 2.36.1

2 2

[PATCH 0/6] MR299: uxtheme: Support parsing more tab parts.
by Zhiyi Zhang (＠zhiyi) June 22, 2022

June 22, 2022

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/299

2 6

Re: [PATCH v2 0/2] MR270: include: Add interface declarations in dxgidebug.idl - approved
by Alexandre Julliard (＠julliard) June 22, 2022

June 22, 2022

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/270

1 0

Re: [PATCH v3 0/2] MR132: opengl32: Don't prioritize low bit depth formats with non-matching stencil. - approved
by Alexandre Julliard (＠julliard) June 22, 2022

June 22, 2022

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/132

1 0

Re: [PATCH v2 0/5] MR297: uxtheme: Support parsing more listview parts and states. - approved
by Alexandre Julliard (＠julliard) June 22, 2022

June 22, 2022

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/297

1 0

[PATCH resend] ntdll: Add RtlGetDeviceFamilyInfoEnum and RtlGetDeviceFamilyInfoEnum
by Kacper Raczy June 22, 2022

June 22, 2022

APIs introduced in Windows 10 (NT10.0). DeviceForm and Family is fixed to Desktop configuration. Signed-off-by: Kacper Raczy <gfw.kra(a)gmail.com> --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/rtl.c | 2 +- dlls/ntdll/version.c | 54 ++++++++++++++++++++++++++++++++++++++++++- include/winnt.h | 10 ++++++++ 4 files changed, 66 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index b1650ab4306..4539a9bd0ed 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -712,6 +712,8 @@ @ stdcall RtlGetCurrentProcessorNumberEx(ptr) @ stdcall RtlGetCurrentTransaction() @ stdcall RtlGetDaclSecurityDescriptor(ptr ptr ptr ptr) +@ stdcall RtlGetDeviceFamilyInfoEnum(ptr ptr ptr) +@ stdcall RtlConvertDeviceFamilyInfoToString(ptr ptr ptr ptr) @ stdcall RtlGetElementGenericTable(ptr long) # @ stub RtlGetElementGenericTableAvl @ stdcall RtlGetEnabledExtendedFeatures(int64) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 11067f44941..421cf377d32 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -2211,4 +2211,4 @@ char WINAPI RtlQueryProcessPlaceholderCompatibilityMode(void) { FIXME("stub\n"); return PHCM_APPLICATION_DEFAULT; -} +} \ No newline at end of file diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 492c24cc636..b9af53452a2 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -609,7 +609,6 @@ void WINAPI RtlGetNtVersionNumbers( LPDWORD major, LPDWORD minor, LPDWORD build if (build) *build = (0xF0000000 | current_version->dwBuildNumber); } - /****************************************************************************** * RtlGetNtProductType (NTDLL.@) */ @@ -760,6 +759,59 @@ NTSTATUS WINAPI RtlVerifyVersionInfo( const RTL_OSVERSIONINFOEXW *info, return STATUS_SUCCESS; } +/********************************************************************* + * RtlGetDeviceFamilyInfoEnum (NTDLL.@) + * + * NOTES + * Introduced in Windows 10 (NT10.0) + */ +VOID WINAPI RtlGetDeviceFamilyInfoEnum(ULONGLONG *uap_info, DWORD *device_family, DWORD *device_form) +{ + ULONGLONG uap_info_temp; + + if (device_form != NULL) + *device_form = DEVICEFAMILYDEVICEFORM_DESKTOP; + if (device_family != NULL) + *device_family = DEVICEFAMILYINFOENUM_DESKTOP; + if (uap_info == NULL) + 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. UBR + */ + uap_info_temp = 0; + uap_info_temp |= (((ULONGLONG) current_version->dwMajorVersion & 0xffff) << 48); /* os version major */ + uap_info_temp |= (((ULONGLONG) current_version->dwMinorVersion & 0xffff) << 32); /* os version minor */ + uap_info_temp |= (((ULONGLONG) current_version->dwBuildNumber & 0xffff) << 16); /* current build number */ + /* UBR not available */ + *uap_info = uap_info_temp; +} + +/********************************************************************* + * RtlConvertDeviceFamilyInfoToString (NTDLL.@) + * + * NOTES + * Introduced in Windows 10 (NT10.0) + */ +VOID WINAPI RtlConvertDeviceFamilyInfoToString( + DWORD *device_family_bufsize, + DWORD *device_form_bufsize, + const LPWSTR device_family, + const LPWSTR device_form +) { + if (device_family_bufsize != NULL) + *device_family_bufsize = (DWORD)wcslen(DEVICEFAMILYDEVICEFORM_DESKTOP_STR) + 1; + if (device_family != NULL) + wcscpy(device_family, DEVICEFAMILYDEVICEFORM_DESKTOP_STR); + if (device_form_bufsize != NULL) + *device_form_bufsize = (DWORD)wcslen(DEVICEFAMILYINFOENUM_DESKTOP_STR) + 1; + if (device_form != NULL) + wcscpy(device_form, DEVICEFAMILYINFOENUM_DESKTOP_STR); +} /****************************************************************************** * VerSetConditionMask (NTDLL.@) diff --git a/include/winnt.h b/include/winnt.h index 87c4b4da92d..b07df911c69 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6224,6 +6224,16 @@ typedef struct _SYSTEM_CPU_SET_INFORMATION } DUMMYUNIONNAME; } SYSTEM_CPU_SET_INFORMATION, *PSYSTEM_CPU_SET_INFORMATION; +/* Windows 10 Rtl apis */ + +#define DEVICEFAMILYDEVICEFORM_DESKTOP 0x00000003 +#define DEVICEFAMILYINFOENUM_DESKTOP 0x00000003 +#define DEVICEFAMILYDEVICEFORM_DESKTOP_STR L"Desktop" +#define DEVICEFAMILYINFOENUM_DESKTOP_STR L"Windows.Desktop" + +NTSYSAPI VOID WINAPI RtlGetDeviceFamilyInfoEnum(ULONGLONG*, DWORD*, DWORD*); +NTSYSAPI VOID WINAPI RtlConvertDeviceFamilyInfoToString(DWORD*, DWORD*, const LPWSTR, const LPWSTR); + /* Threadpool things */ typedef DWORD TP_VERSION,*PTP_VERSION; -- 2.36.1

2 2

[PATCH 0/6] MR298: Improve support for types out of PDB files
by eric pouech (＠epo) June 22, 2022

June 22, 2022

Current dbghelp support for reading C/C++ types out of PDB files suffer from some defaults: - several records for the same type (ie struct/class/union/enum with same name) can be present in a PDB file. This can happen when recompiling a compilation unit after modifying the definition of such type (eg adding a field a struct). The PDB file seems to be incrementally modified, and ends up with the old and new definition of such type inside the PDB file. - this of course can lead to erroneous information out of dbghelp. When looking for a type by name, dbghelp must return the new definition. - such errors have been experienced in two situations: + some type definition are stored in two different records in PDB file. A simple example is 'struct list { struct list* next; };' where the circular reference is broken by first generating a forward record for struct list, followed by the full definition of struct list (using the forward record as the type for the 'next' field. Resolution from forward record to find implementation record is done by name lookup. + finding a type by its name (SymGetTypeFromName) - PDB uses the order of elements in its hash table to pick up the "newest" one. - the incremental linker can also modify the hash table order (but I didn't find out yet what triggers it), using specific entries (ie like patching the hash table order). This series: - improve winedump to dump information stored in stream of types' hash - cleans up some type handling related code - modifies type loader out of PDB files to handle correctly the defaults listed above. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/298

2 6

[PATCH] wined3d: Restore the vkd3d-shader version TRACE.
by Henri Verbeet June 22, 2022

June 22, 2022

This was lost in commit 24432a24d5e922cbd824b0af8f7b0c66ff2b66e8, but is useful, particularly when using external vkd3d-shader. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/shader_spirv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index cf07b81711e..14665dee0f2 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -1089,6 +1089,8 @@ static const struct wined3d_shader_backend_ops spirv_shader_backend_vk = const struct wined3d_shader_backend_ops *wined3d_spirv_shader_backend_init_vk(void) { + TRACE("Using %s.\n", vkd3d_shader_get_version(NULL, NULL)); + return &spirv_shader_backend_vk; } -- 2.30.2

1 0