March 2022 - Wine-commits - list.winehq.org

Alexandre Julliard : make_unicode: Generate locale.nls using the Unicode CLDR data.
by Alexandre Julliard 21 Mar '22

21 Mar '22

Module: wine Branch: master Commit: 8cdb593f5a7e026caee10b6787cf686f3276b65b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8cdb593f5a7e026caee10b67… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 21 11:45:05 2022 +0100 make_unicode: Generate locale.nls using the Unicode CLDR data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 1 + nls/Makefile.in | 1 + nls/locale.nls | Bin 0 -> 625428 bytes tools/make_unicode | 1874 +++++++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 1875 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8cdb593f5a7e026caee1…

1 0

Alexandre Julliard : ntdll: Add a helper function to map a section.
by Alexandre Julliard 21 Mar '22

21 Mar '22

Module: wine Branch: master Commit: cd4fcf9a112181149c5dde9cbd0b481de6161b4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd4fcf9a112181149c5dde9c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 21 11:50:33 2022 +0100 ntdll: Add a helper function to map a section. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 7 +++---- dlls/ntdll/unix/loader.c | 6 +----- dlls/ntdll/unix/unix_private.h | 8 ++++++++ 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 3f9f7f1b3b7..227bcdbfa0f 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -2458,10 +2458,9 @@ NTSTATUS WINAPI NtGetNlsSectionPtr( ULONG type, ULONG id, void *unknown, void ** } if (!status) { - *ptr = NULL; - *size = 0; - status = NtMapViewOfSection( handle, GetCurrentProcess(), ptr, 0, 0, NULL, size, - ViewShare, 0, PAGE_READONLY ); + status = map_section( handle, ptr, size, PAGE_READONLY ); + NtClose( handle ); + } } NtClose( handle ); return status; diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 5eb201bd90b..97fb624d6d2 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -2032,11 +2032,7 @@ static void load_apiset_dll(void) } if (!status) { - ptr = NULL; - size = 0; - status = NtMapViewOfSection( mapping, NtCurrentProcess(), &ptr, - is_win64 && wow_peb ? 0x7fffffff : 0, 0, NULL, - &size, ViewShare, 0, PAGE_READONLY ); + status = map_section( mapping, &ptr, &size, PAGE_READONLY ); NtClose( mapping ); } if (!status) diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index b1595c792c0..434f98cdc5a 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -450,4 +450,12 @@ static inline void init_unicode_string( UNICODE_STRING *str, const WCHAR *data ) str->Buffer = (WCHAR *)data; } +static inline NTSTATUS map_section( HANDLE mapping, void **ptr, SIZE_T *size, ULONG protect ) +{ + *ptr = NULL; + *size = 0; + return NtMapViewOfSection( mapping, NtCurrentProcess(), ptr, is_win64 && wow_peb ? 0x7fffffff : 0, + 0, NULL, size, ViewShare, 0, protect ); +} + #endif /* __NTDLL_UNIX_PRIVATE_H */

1 0

Alexandre Julliard : ntdll: Implement NtInitializeNlsFiles().
by Alexandre Julliard 21 Mar '22

21 Mar '22

Module: wine Branch: master Commit: 5ed078dc14c7c40815c3f65a8718207d861d0320 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ed078dc14c7c40815c3f65a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 21 11:51:13 2022 +0100 ntdll: Implement NtInitializeNlsFiles(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/unix/env.c | 63 +++++++++++++++++++++++++++++++++++------------- dlls/ntdll/unix/loader.c | 3 ++- include/winternl.h | 1 + 4 files changed, 51 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index d514bca5e11..6d134770596 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -235,6 +235,7 @@ @ stdcall -syscall NtImpersonateAnonymousToken(long) # @ stub NtImpersonateClientOfPort # @ stub NtImpersonateThread +@ stdcall -syscall NtInitializeNlsFiles(ptr ptr ptr) # @ stub NtInitializeRegistry @ stdcall -syscall NtInitiatePowerAction (long long long long) @ stdcall -syscall NtIsProcessInJob(long long) @@ -1257,6 +1258,7 @@ @ stdcall -private -syscall ZwImpersonateAnonymousToken(long) NtImpersonateAnonymousToken # @ stub ZwImpersonateClientOfPort # @ stub ZwImpersonateThread +@ stdcall -private -syscall ZwInitializeNlsFiles(ptr ptr ptr) NtInitializeNlsFiles # @ stub ZwInitializeRegistry @ stdcall -private -syscall ZwInitiatePowerAction(long long long long) NtInitiatePowerAction @ stdcall -private -syscall ZwIsProcessInJob(long long) NtIsProcessInJob diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 227bcdbfa0f..2302ee46e86 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -153,22 +153,15 @@ static void *read_nls_file( ULONG type, ULONG id ) return ret; } -static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file ) +static NTSTATUS open_nls_data_file( const char *path, const WCHAR *sysdir, HANDLE *file ) { - static const WCHAR sortdirW[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\', - 'g','l','o','b','a','l','i','z','a','t','i','o','n','\\', - 's','o','r','t','i','n','g','\\',0}; - NTSTATUS status = STATUS_OBJECT_NAME_NOT_FOUND; OBJECT_ATTRIBUTES attr; UNICODE_STRING valueW; - WCHAR buffer[ARRAY_SIZE(sortdirW) + 16]; - char *p, *path = get_nls_file_path( type, id ); - - if (!path) return STATUS_OBJECT_NAME_NOT_FOUND; + WCHAR buffer[64]; + char *p, *ntpath; - /* try to open file in system dir */ - wcscpy( buffer, type == NLS_SECTION_SORTKEYS ? sortdirW : system_dir ); + wcscpy( buffer, system_dir ); p = strrchr( path, '/' ) + 1; ascii_to_unicode( buffer + wcslen(buffer), p, strlen(p) + 1 ); init_unicode_string( &valueW, buffer ); @@ -176,13 +169,12 @@ static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file ) status = open_unix_file( file, path, GENERIC_READ, &attr, 0, FILE_SHARE_READ, FILE_OPEN, FILE_SYNCHRONOUS_IO_ALERT, NULL, 0 ); - free( path ); if (status != STATUS_NO_SUCH_FILE) return status; - if ((status = nt_to_unix_file_name( &attr, &path, FILE_OPEN ))) return status; - status = open_unix_file( file, path, GENERIC_READ, &attr, 0, FILE_SHARE_READ, + if ((status = nt_to_unix_file_name( &attr, &ntpath, FILE_OPEN ))) return status; + status = open_unix_file( file, ntpath, GENERIC_READ, &attr, 0, FILE_SHARE_READ, FILE_OPEN, FILE_SYNCHRONOUS_IO_ALERT, NULL, 0 ); - free( path ); + free( ntpath ); return status; } @@ -2438,6 +2430,9 @@ void *create_startup_info( const UNICODE_STRING *nt_image, const RTL_USER_PROCES */ NTSTATUS WINAPI NtGetNlsSectionPtr( ULONG type, ULONG id, void *unknown, void **ptr, SIZE_T *size ) { + static const WCHAR sortdirW[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\', + 'g','l','o','b','a','l','i','z','a','t','i','o','n','\\', + 's','o','r','t','i','n','g','\\',0}; UNICODE_STRING nameW; OBJECT_ATTRIBUTES attr; WCHAR name[32]; @@ -2450,7 +2445,12 @@ NTSTATUS WINAPI NtGetNlsSectionPtr( ULONG type, ULONG id, void *unknown, void ** InitializeObjectAttributes( &attr, &nameW, 0, 0, NULL ); if ((status = NtOpenSection( &handle, SECTION_MAP_READ, &attr ))) { - if ((status = open_nls_data_file( type, id, &file ))) return status; + char *path = get_nls_file_path( type, id ); + + if (!path) return STATUS_OBJECT_NAME_NOT_FOUND; + status = open_nls_data_file( path, type == NLS_SECTION_SORTKEYS ? sortdirW : system_dir, &file ); + free( path ); + if (status) return status; attr.Attributes = OBJ_OPENIF | OBJ_PERMANENT; status = NtCreateSection( &handle, SECTION_MAP_READ, &attr, NULL, PAGE_READONLY, SEC_COMMIT, file ); NtClose( file ); @@ -2461,8 +2461,37 @@ NTSTATUS WINAPI NtGetNlsSectionPtr( ULONG type, ULONG id, void *unknown, void ** status = map_section( handle, ptr, size, PAGE_READONLY ); NtClose( handle ); } + return status; +} + + +/************************************************************************** + * NtInitializeNlsFiles (NTDLL.@) + */ +NTSTATUS WINAPI NtInitializeNlsFiles( void **ptr, LCID *lcid, LARGE_INTEGER *size ) +{ + const char *dir = build_dir ? build_dir : data_dir; + char *path; + HANDLE handle, file; + SIZE_T mapsize; + NTSTATUS status; + + if (!(path = malloc( strlen(dir) + sizeof("/nls/locale.nls") ))) return STATUS_NO_MEMORY; + strcpy( path, dir ); + strcat( path, "/nls/locale.nls" ); + status = open_nls_data_file( path, system_dir, &file ); + free( path ); + if (!status) + { + status = NtCreateSection( &handle, SECTION_MAP_READ, NULL, NULL, PAGE_READONLY, SEC_COMMIT, file ); + NtClose( file ); + } + if (!status) + { + status = map_section( handle, ptr, &mapsize, PAGE_READONLY ); + NtClose( handle ); } - NtClose( handle ); + *lcid = system_lcid; return status; } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 97fb624d6d2..d1c42ddc0f3 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -196,7 +196,8 @@ static void * const syscalls[] = NtGetNlsSectionPtr, NtGetWriteWatch, NtImpersonateAnonymousToken, - NtInitiatePowerAction , + NtInitializeNlsFiles, + NtInitiatePowerAction, NtIsProcessInJob, NtListenPort, NtLoadDriver, diff --git a/include/winternl.h b/include/winternl.h index 4c49f5eae47..68c174d6086 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3995,6 +3995,7 @@ NTSYSAPI NTSTATUS WINAPI NtGetWriteWatch(HANDLE,ULONG,PVOID,SIZE_T,PVOID*,ULONG NTSYSAPI NTSTATUS WINAPI NtImpersonateAnonymousToken(HANDLE); NTSYSAPI NTSTATUS WINAPI NtImpersonateClientOfPort(HANDLE,PPORT_MESSAGE); NTSYSAPI NTSTATUS WINAPI NtImpersonateThread(HANDLE,HANDLE,PSECURITY_QUALITY_OF_SERVICE); +NTSYSAPI NTSTATUS WINAPI NtInitializeNlsFiles(void**,LCID*,LARGE_INTEGER*); NTSYSAPI NTSTATUS WINAPI NtInitializeRegistry(BOOLEAN); NTSYSAPI NTSTATUS WINAPI NtInitiatePowerAction(POWER_ACTION,SYSTEM_POWER_STATE,ULONG,BOOLEAN); NTSYSAPI NTSTATUS WINAPI NtIsProcessInJob(HANDLE,HANDLE);

1 0

Alexandre Julliard : wow64: Add a wrapper for NtInitializeNlsFiles().
by Alexandre Julliard 21 Mar '22

21 Mar '22

Module: wine Branch: master Commit: 4258f98244f21cb80a588c4ebaaff738ec9b01f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4258f98244f21cb80a588c4e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 21 11:51:41 2022 +0100 wow64: Add a wrapper for NtInitializeNlsFiles(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/syscall.h | 1 + dlls/wow64/virtual.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index 0c2ba574031..a3af9174c49 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -97,6 +97,7 @@ SYSCALL_ENTRY( NtGetNlsSectionPtr ) \ SYSCALL_ENTRY( NtGetWriteWatch ) \ SYSCALL_ENTRY( NtImpersonateAnonymousToken ) \ + SYSCALL_ENTRY( NtInitializeNlsFiles ) \ SYSCALL_ENTRY( NtInitiatePowerAction ) \ SYSCALL_ENTRY( NtIsProcessInJob ) \ SYSCALL_ENTRY( NtListenPort ) \ diff --git a/dlls/wow64/virtual.c b/dlls/wow64/virtual.c index fc470c07923..e89373f4239 100644 --- a/dlls/wow64/virtual.c +++ b/dlls/wow64/virtual.c @@ -208,6 +208,24 @@ NTSTATUS WINAPI wow64_NtGetWriteWatch( UINT *args ) } +/********************************************************************** + * wow64_NtInitializeNlsFiles + */ +NTSTATUS WINAPI wow64_NtInitializeNlsFiles( UINT *args ) +{ + ULONG *addr32 = get_ptr( &args ); + LCID *lcid = get_ptr( &args ); + LARGE_INTEGER *size = get_ptr( &args ); + + void *addr; + NTSTATUS status; + + status = NtInitializeNlsFiles( addr_32to64( &addr, addr32 ), lcid, size ); + if (!status) put_addr( addr32, addr ); + return status; +} + + /********************************************************************** * wow64_NtLockVirtualMemory */

1 0

Alexandre Julliard : ntdll: Implement RtlGetLocaleFileMappingAddress().
by Alexandre Julliard 21 Mar '22

21 Mar '22

Module: wine Branch: master Commit: c13d88ba971c540c525ab9adbbd1d663cf6fc6d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c13d88ba971c540c525ab9ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 21 11:52:22 2022 +0100 ntdll: Implement RtlGetLocaleFileMappingAddress(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/locale.c | 23 +++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 1 + include/winternl.h | 1 + 3 files changed, 25 insertions(+) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index fe185d403f2..360496dd7e1 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -701,6 +701,29 @@ void WINAPI RtlResetRtlTranslations( const NLSTABLEINFO *info ) } +/************************************************************************** + * RtlGetLocaleFileMappingAddress (NTDLL.@) + */ +NTSTATUS WINAPI RtlGetLocaleFileMappingAddress( void **ptr, LCID *lcid, LARGE_INTEGER *size ) +{ + static void *cached_ptr; + static LCID cached_lcid; + + if (!cached_ptr) + { + void *addr; + NTSTATUS status = NtInitializeNlsFiles( &addr, &cached_lcid, size ); + + if (status) return status; + if (InterlockedCompareExchangePointer( &cached_ptr, addr, NULL )) + NtUnmapViewOfSection( GetCurrentProcess(), addr ); + } + *ptr = cached_ptr; + *lcid = cached_lcid; + return STATUS_SUCCESS; +} + + /************************************************************************** * RtlAnsiCharToUnicodeChar (NTDLL.@) */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 6d134770596..4c7b9be1d9f 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -726,6 +726,7 @@ # @ stub RtlGetLengthWithoutLastFullDosOrNtPathElement # Yes, Microsoft really misspelled this one! # @ stub RtlGetLengthWithoutTrailingPathSeperators +@ stdcall RtlGetLocaleFileMappingAddress(ptr ptr ptr) @ stdcall RtlGetLongestNtPathLength() @ stdcall -syscall -arch=win32 RtlGetNativeSystemInformation(long ptr long ptr) NtWow64GetNativeSystemInformation @ stdcall -syscall -arch=win64 RtlGetNativeSystemInformation(long ptr long ptr) NtQuerySystemInformation diff --git a/include/winternl.h b/include/winternl.h index 68c174d6086..3fa5fad9b46 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4346,6 +4346,7 @@ NTSYSAPI ULONG WINAPI RtlGetFullPathName_U(PCWSTR,ULONG,PWSTR,PWSTR*); NTSYSAPI NTSTATUS WINAPI RtlGetGroupSecurityDescriptor(PSECURITY_DESCRIPTOR,PSID *,PBOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlGetLastNtStatus(void); NTSYSAPI DWORD WINAPI RtlGetLastWin32Error(void); +NTSYSAPI NTSTATUS WINAPI RtlGetLocaleFileMappingAddress(void**,LCID*,LARGE_INTEGER*); NTSYSAPI DWORD WINAPI RtlGetLongestNtPathLength(void); NTSYSAPI ULONG WINAPI RtlGetNtGlobalFlags(void); NTSYSAPI BOOLEAN WINAPI RtlGetNtProductType(LPDWORD);

1 0

Alexandre Julliard : kernel32/tests: Add tests for NtInitializeNlsFiles() and RtlGetLocaleFileMappingAddress().
by Alexandre Julliard 21 Mar '22

21 Mar '22

Module: wine Branch: master Commit: e195a9b0c398c12f87a5bf645fdbe94f68666ca0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e195a9b0c398c12f87a5bf64… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 21 11:53:24 2022 +0100 kernel32/tests: Add tests for NtInitializeNlsFiles() and RtlGetLocaleFileMappingAddress(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 54 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index ee9aad33312..ad644cf5a3e 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -94,6 +94,8 @@ static DWORD (WINAPI *pIsValidNLSVersion)(NLS_FUNCTION,LPCWSTR,NLSVERSIONINFOEX* static NTSTATUS (WINAPI *pRtlNormalizeString)(ULONG, LPCWSTR, INT, LPWSTR, INT*); static NTSTATUS (WINAPI *pRtlIsNormalizedString)(ULONG, LPCWSTR, INT, BOOLEAN*); static NTSTATUS (WINAPI *pNtGetNlsSectionPtr)(ULONG,ULONG,void*,void**,SIZE_T*); +static NTSTATUS (WINAPI *pNtInitializeNlsFiles)(void**,LCID*,LARGE_INTEGER*); +static NTSTATUS (WINAPI *pRtlGetLocaleFileMappingAddress)(void**,LCID*,LARGE_INTEGER*); static void (WINAPI *pRtlInitCodePageTable)(USHORT*,CPTABLEINFO*); static NTSTATUS (WINAPI *pRtlCustomCPToUnicodeN)(CPTABLEINFO*,WCHAR*,DWORD,DWORD*,const char*,DWORD); static NTSTATUS (WINAPI *pRtlGetSystemPreferredUILanguages)(DWORD,ULONG,ULONG*,WCHAR*,ULONG*); @@ -146,8 +148,10 @@ static void InitFunctionPointers(void) X(RtlNormalizeString); X(RtlIsNormalizedString); X(NtGetNlsSectionPtr); + X(NtInitializeNlsFiles); X(RtlInitCodePageTable); X(RtlCustomCPToUnicodeN); + X(RtlGetLocaleFileMappingAddress); X(RtlGetSystemPreferredUILanguages); X(RtlGetThreadPreferredUILanguages); X(RtlGetUserPreferredUILanguages); @@ -6804,6 +6808,55 @@ static void test_NLSVersion(void) else win_skip( "IsValidNLSVersion not available\n" ); } +static void test_locale_nls(void) +{ + NTSTATUS status; + void *addr, *addr2; + UINT *ptr; + LCID lcid; + LARGE_INTEGER size; + + if (!pNtInitializeNlsFiles || !pRtlGetLocaleFileMappingAddress) + { + win_skip( "locale.nls functions not supported\n" ); + return; + } + size.QuadPart = 0xdeadbeef; + status = pNtInitializeNlsFiles( &addr, &lcid, &size ); + ok( !status, "NtInitializeNlsFiles failed %lx\n", status ); + trace( "locale %04lx size %I64x\n", lcid, size.QuadPart ); + ptr = addr; + ok( size.QuadPart == 0xdeadbeef || size.QuadPart == ptr[4] || size.QuadPart == ptr[4] + 8, + "wrong offset %x / %I64x\n", ptr[4], size.QuadPart ); + ptr = (UINT *)((char *)addr + ptr[4]); + ok( ptr[0] == 8, "wrong offset %u\n", ptr[0] ); + ok( ptr[3] == 0x5344534e, "wrong magic %x\n", ptr[3] ); + + status = pNtInitializeNlsFiles( &addr2, &lcid, &size ); + ok( !status, "NtInitializeNlsFiles failed %lx\n", status ); + ok( addr != addr2, "got same address %p\n", addr ); + ok( !memcmp( addr, addr2, ptr[4] ), "contents differ\n" ); + status = NtUnmapViewOfSection( GetCurrentProcess(), addr ); + ok( !status, "NtUnmapViewOfSection failed %lx\n", status ); + status = NtUnmapViewOfSection( GetCurrentProcess(), addr2 ); + ok( !status, "NtUnmapViewOfSection failed %lx\n", status ); + + size.QuadPart = 0xdeadbeef; + status = pRtlGetLocaleFileMappingAddress( &addr, &lcid, &size ); + ok( !status, "NtInitializeNlsFiles failed %lx\n", status ); + ptr = addr; + ok( size.QuadPart == 0xdeadbeef || size.QuadPart == ptr[4] || size.QuadPart == ptr[4] + 8, + "wrong offset %x / %I64x\n", ptr[4], size.QuadPart ); + ptr = (UINT *)((char *)addr + ptr[4]); + ok( ptr[0] == 8, "wrong offset %u\n", ptr[0] ); + ok( ptr[3] == 0x5344534e, "wrong magic %x\n", ptr[3] ); + + /* RtlGetLocaleFileMappingAddress caches the pointer */ + status = pRtlGetLocaleFileMappingAddress( &addr2, &lcid, &size ); + ok( !status, "NtInitializeNlsFiles failed %lx\n", status ); + ok( addr == addr2, "got different address %p / %p\n", addr, addr2 ); +} + static void test_geo_name(void) { WCHAR reg_name[32], buf[32], set_name[32], nation[32], region[32]; @@ -7192,6 +7245,7 @@ START_TEST(locale) test_NormalizeString(); test_SpecialCasing(); test_NLSVersion(); + test_locale_nls(); test_geo_name(); test_sorting(); test_EnumCalendarInfoA();

1 0

Paul Gofman : winhttp: Avoid freeing potentially uninitialized context in netconn_secure_connect().
by Alexandre Julliard 21 Mar '22

21 Mar '22

Module: wine Branch: master Commit: bc4edb8a70a66c967b354c9b2bacc0804db6ba11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc4edb8a70a66c967b354c9b… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Mar 21 16:51:49 2022 +0300 winhttp: Avoid freeing potentially uninitialized context in netconn_secure_connect(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/net.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 2fc48476513..07a65c5465f 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -293,6 +293,7 @@ DWORD netconn_secure_connect( struct netconn *conn, WCHAR *hostname, DWORD secur if (!(read_buf = malloc( read_buf_size ))) return ERROR_OUTOFMEMORY; + memset( &ctx, 0, sizeof(ctx) ); status = InitializeSecurityContextW(cred_handle, NULL, hostname, isc_req_flags, 0, 0, NULL, 0, &ctx, &out_desc, &attrs, NULL);

1 0

Jacek Caban : win32u: Move dib.drv implementation from gdi.exe.
by Alexandre Julliard 21 Mar '22

21 Mar '22

Module: wine Branch: master Commit: 39ef9c3ad83e715611ebc2204ec09d83f3d5490f URL: https://source.winehq.org/git/wine.git/?a=commit;h=39ef9c3ad83e715611ebc220… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 21 14:13:56 2022 +0100 win32u: Move dib.drv implementation from gdi.exe. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi.exe16/gdi.c | 141 +------------------------------------------ dlls/win32u/clipping.c | 6 +- dlls/win32u/dc.c | 7 +++ dlls/win32u/dce.c | 132 +++++++++++++++++++++++++++++++++++++++- dlls/win32u/gdiobj.c | 1 - dlls/win32u/ntgdi_private.h | 2 + dlls/win32u/win32u.spec | 3 - dlls/win32u/win32u_private.h | 3 +- dlls/win32u/wrappers.c | 7 --- include/ntgdi.h | 3 + include/wine/gdi_driver.h | 2 - 11 files changed, 149 insertions(+), 158 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=39ef9c3ad83e715611eb…

1 0

Jacek Caban : win32u: Don't use CDECL for window surface functions.
by Alexandre Julliard 21 Mar '22

21 Mar '22

Module: wine Branch: master Commit: 747f7b543ca777e4596a3f3f6811fcbec73a07f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=747f7b543ca777e4596a3f3f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 21 14:14:10 2022 +0100 win32u: Don't use CDECL for window surface functions. They are no longer used from PE code. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/dce.c | 42 +++++++++++++++++++++--------------------- dlls/wineandroid.drv/window.c | 14 +++++++------- dlls/winemac.drv/surface.c | 14 +++++++------- dlls/winex11.drv/bitblt.c | 14 +++++++------- include/wine/gdi_driver.h | 20 ++++++++++++-------- 5 files changed, 54 insertions(+), 50 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=747f7b543ca777e4596a…

1 0

Jacek Caban : user.exe: Use win32u directly for cursor icon handle support.
by Alexandre Julliard 21 Mar '22

21 Mar '22

Module: wine Branch: master Commit: 0b87623819baec326cb48d605bc0087614cb8974 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b87623819baec326cb48d60… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 21 14:14:30 2022 +0100 user.exe: Use win32u directly for cursor icon handle support. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user.exe16/message.c | 11 +++++------ dlls/user.exe16/user.c | 7 ++++--- dlls/user.exe16/user_private.h | 3 --- dlls/user32/controls.h | 6 ------ dlls/user32/cursoricon.c | 10 ---------- dlls/user32/user_main.c | 6 ------ dlls/user32/winproc.c | 3 --- 7 files changed, 9 insertions(+), 37 deletions(-) diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index 6d3de0f77e6..915585267d6 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -2590,17 +2590,15 @@ HWND create_window16( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE instance, } -/*********************************************************************** - * free_icon_param - */ -static void free_icon_param( ULONG_PTR param ) +static void WINAPI User16CallFreeIcon( ULONG *param, ULONG size ) { - GlobalFree16( LOWORD(param) ); + GlobalFree16( LOWORD(*param) ); } void register_wow_handlers(void) { + void **callback_table = NtCurrentTeb()->Peb->KernelCallbackTable; static const struct wow_handlers16 handlers16 = { button_proc16, @@ -2614,8 +2612,9 @@ void register_wow_handlers(void) create_window16, call_window_proc_Ato16, call_dialog_proc_Ato16, - free_icon_param }; + callback_table[NtUserCallFreeIcon] = User16CallFreeIcon; + UserRegisterWowHandlers( &handlers16, &wow_handlers32 ); } diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index 4a56a67389b..39adb874125 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -31,6 +31,7 @@ #include "winbase.h" #include "wownt32.h" #include "user_private.h" +#include "ntuser.h" #include "wine/list.h" #include "wine/debug.h" @@ -299,7 +300,7 @@ static HICON store_icon_32( HICON16 icon16, HICON icon ) { memcpy( &ret, (char *)(ptr + 1) + and_size + xor_size, sizeof(ret) ); memcpy( (char *)(ptr + 1) + and_size + xor_size, &icon, sizeof(icon) ); - wow_handlers32.set_icon_param( icon, icon16 ); + NtUserCallTwoParam( HandleToUlong(icon), icon16, NtUserSetIconParam ); } release_icon_ptr( icon16, ptr ); } @@ -341,7 +342,7 @@ HICON get_icon_32( HICON16 icon16 ) DeleteObject( iinfo.hbmMask ); DeleteObject( iinfo.hbmColor ); memcpy( (char *)(ptr + 1) + xor_size + and_size, &ret, sizeof(ret) ); - wow_handlers32.set_icon_param( ret, icon16 ); + NtUserCallTwoParam( HandleToUlong(ret), icon16, NtUserSetIconParam ); } } release_icon_ptr( icon16, ptr ); @@ -352,7 +353,7 @@ HICON get_icon_32( HICON16 icon16 ) /* retrieve the 16-bit counterpart of a 32-bit icon, creating it if needed */ HICON16 get_icon_16( HICON icon ) { - HICON16 ret = wow_handlers32.get_icon_param( icon ); + HICON16 ret = NtUserCallOneParam( HandleToUlong(icon), NtUserGetIconParam ); if (!ret) { diff --git a/dlls/user.exe16/user_private.h b/dlls/user.exe16/user_private.h index afd75f0b096..83c57379d35 100644 --- a/dlls/user.exe16/user_private.h +++ b/dlls/user.exe16/user_private.h @@ -45,7 +45,6 @@ struct wow_handlers16 HWND (*create_window)(CREATESTRUCTW*,LPCWSTR,HINSTANCE,BOOL); LRESULT (*call_window_proc)(HWND,UINT,WPARAM,LPARAM,LRESULT*,void*); LRESULT (*call_dialog_proc)(HWND,UINT,WPARAM,LPARAM,LRESULT*,void*); - void (*free_icon_param)(ULONG_PTR); }; struct wow_handlers32 @@ -63,8 +62,6 @@ struct wow_handlers32 WNDPROC (*alloc_winproc)(WNDPROC,BOOL); struct tagDIALOGINFO *(*get_dialog_info)(HWND,BOOL); INT (*dialog_box_loop)(HWND,HWND); - ULONG_PTR (*get_icon_param)(HICON); - ULONG_PTR (*set_icon_param)(HICON,ULONG_PTR); }; extern struct wow_handlers32 wow_handlers32 DECLSPEC_HIDDEN; diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 574143de438..47375590e29 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -73,7 +73,6 @@ struct wow_handlers16 HWND (*create_window)(CREATESTRUCTW*,LPCWSTR,HINSTANCE,BOOL); LRESULT (*call_window_proc)(HWND,UINT,WPARAM,LPARAM,LRESULT*,void*); LRESULT (*call_dialog_proc)(HWND,UINT,WPARAM,LPARAM,LRESULT*,void*); - void (*free_icon_param)(ULONG_PTR); }; struct wow_handlers32 @@ -91,8 +90,6 @@ struct wow_handlers32 WNDPROC (*alloc_winproc)(WNDPROC,BOOL); struct tagDIALOGINFO *(*get_dialog_info)(HWND,BOOL); INT (*dialog_box_loop)(HWND,HWND); - ULONG_PTR (*get_icon_param)(HICON); - ULONG_PTR (*set_icon_param)(HICON,ULONG_PTR); }; extern struct wow_handlers16 wow_handlers DECLSPEC_HIDDEN; @@ -105,9 +102,6 @@ extern LRESULT MDIClientWndProc_common(HWND,UINT,WPARAM,LPARAM,BOOL) DECLSPEC_HI extern LRESULT ScrollBarWndProc_common(HWND,UINT,WPARAM,LPARAM,BOOL) DECLSPEC_HIDDEN; extern LRESULT StaticWndProc_common(HWND,UINT,WPARAM,LPARAM,BOOL) DECLSPEC_HIDDEN; -extern ULONG_PTR get_icon_param( HICON handle ) DECLSPEC_HIDDEN; -extern ULONG_PTR set_icon_param( HICON handle, ULONG_PTR param ) DECLSPEC_HIDDEN; - /* Class functions */ struct tagCLASS; /* opaque structure */ struct tagWND; diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index abf3a5dac53..9e6712f606b 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -79,16 +79,6 @@ static void free_icon_frame( struct cursoricon_frame *frame ) if (frame->mask) DeleteObject( frame->mask ); } -ULONG_PTR get_icon_param( HICON handle ) -{ - return NtUserCallOneParam( HandleToUlong(handle), NtUserGetIconParam ); -} - -ULONG_PTR set_icon_param( HICON handle, ULONG_PTR param ) -{ - return NtUserCallTwoParam( HandleToUlong(handle), param, NtUserSetIconParam ); -} - /*********************************************************************** * map_fileW diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 93274a773cc..88e2fc4eec1 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -185,11 +185,6 @@ static const struct user_callbacks user_funcs = unregister_imm, }; -static void WINAPI User32CallFreeIcon( ULONG *param, ULONG size ) -{ - wow_handlers.free_icon_param( *param ); -} - static BOOL WINAPI User32LoadDriver( const WCHAR *path, ULONG size ) { return LoadLibraryW( path ) != NULL; @@ -201,7 +196,6 @@ static const void *kernel_callback_table[NtUserCallCount] = User32CallWinEventHook, User32CallWindowsHook, User32LoadDriver, - User32CallFreeIcon, }; diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 1e12efe890b..cc547427270 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -1031,8 +1031,6 @@ void WINAPI UserRegisterWowHandlers( const struct wow_handlers16 *new, struct wo orig->alloc_winproc = WINPROC_AllocProc; orig->get_dialog_info = DIALOG_get_info; orig->dialog_box_loop = DIALOG_DoDialogBox; - orig->get_icon_param = get_icon_param; - orig->set_icon_param = set_icon_param; wow_handlers = *new; } @@ -1050,7 +1048,6 @@ struct wow_handlers16 wow_handlers = WIN_CreateWindowEx, NULL, /* call_window_proc */ NULL, /* call_dialog_proc */ - NULL, /* free_icon_param */ }; static const struct user_client_procs client_procsA =

1 0