April 2021 - Wine-commits - list.winehq.org

Alexandre Julliard : server: Get rid of the CPU type and functions.
by Alexandre Julliard 27 Apr '21

27 Apr '21

Module: wine Branch: master Commit: 339ed576430fa0b7096563c5b19608ba87cba320 URL: https://source.winehq.org/git/wine.git/?a=commit;h=339ed576430fa0b7096563c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 27 10:42:04 2021 +0200 server: Get rid of the CPU type and functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/process.c | 22 ++-------------------- dlls/ntdll/unix/server.c | 1 - dlls/ntdll/unix/unix_private.h | 4 ---- include/wine/server_protocol.h | 14 +++----------- server/debugger.c | 2 +- server/mach.c | 2 +- server/object.h | 1 - server/process.c | 5 ----- server/process.h | 4 ---- server/protocol.def | 10 +--------- server/registry.c | 30 +----------------------------- server/request.h | 6 ++---- server/thread.c | 28 ---------------------------- server/thread.h | 1 - server/trace.c | 17 +---------------- tools/make_requests | 1 - 16 files changed, 12 insertions(+), 136 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=339ed576430fa0b70965…

1 0

Alexandre Julliard : server: Create the Wow64 key and system directory for all supported architectures.
by Alexandre Julliard 27 Apr '21

27 Apr '21

Module: wine Branch: master Commit: ea2d9c0406187c0a7856cb9fc178c29c8eb0c410 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea2d9c0406187c0a7856cb9f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 27 10:43:35 2021 +0200 server: Create the Wow64 key and system directory for all supported architectures. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/registry.c | 43 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/server/registry.c b/server/registry.c index 17281f24634..68ec4f9e39a 100644 --- a/server/registry.c +++ b/server/registry.c @@ -1797,17 +1797,26 @@ void init_registry(void) { static const WCHAR HKLM[] = { 'M','a','c','h','i','n','e' }; static const WCHAR HKU_default[] = { 'U','s','e','r','\\','.','D','e','f','a','u','l','t' }; - static const WCHAR classes[] = {'S','o','f','t','w','a','r','e','\\', - 'C','l','a','s','s','e','s','\\', - 'W','o','w','6','4','3','2','N','o','d','e'}; + static const WCHAR classes_i386[] = {'S','o','f','t','w','a','r','e','\\', + 'C','l','a','s','s','e','s','\\', + 'W','o','w','6','4','3','2','N','o','d','e'}; + static const WCHAR classes_amd64[] = {'S','o','f','t','w','a','r','e','\\', + 'C','l','a','s','s','e','s','\\', + 'W','o','w','6','4','6','4','N','o','d','e'}; + static const WCHAR classes_arm[] = {'S','o','f','t','w','a','r','e','\\', + 'C','l','a','s','s','e','s','\\', + 'W','o','w','A','A','3','2','N','o','d','e'}; + static const WCHAR classes_arm64[] = {'S','o','f','t','w','a','r','e','\\', + 'C','l','a','s','s','e','s','\\', + 'W','o','w','A','A','6','4','N','o','d','e'}; static const struct unicode_str root_name = { NULL, 0 }; static const struct unicode_str HKLM_name = { HKLM, sizeof(HKLM) }; static const struct unicode_str HKU_name = { HKU_default, sizeof(HKU_default) }; - static const struct unicode_str classes_name = { classes, sizeof(classes) }; WCHAR *current_user_path; struct unicode_str current_user_str; struct key *key, *hklm, *hkcu; + unsigned int i; char *p; /* switch to the config dir */ @@ -1854,10 +1863,19 @@ void init_registry(void) free( current_user_path ); load_init_registry_from_file( "user.reg", hkcu ); - /* set the shared flag on Software\Classes\Wow6432Node */ - if (prefix_type == PREFIX_64BIT) + /* set the shared flag on Software\Classes\Wow6432Node for all platforms */ + for (i = 1; i < supported_machines_count; i++) { - if ((key = create_key_recursive( hklm, &classes_name, current_time ))) + struct unicode_str name; + + switch (supported_machines[i]) + { + case IMAGE_FILE_MACHINE_I386: name.str = classes_i386; name.len = sizeof(classes_i386); break; + case IMAGE_FILE_MACHINE_ARMNT: name.str = classes_arm; name.len = sizeof(classes_arm); break; + case IMAGE_FILE_MACHINE_AMD64: name.str = classes_amd64; name.len = sizeof(classes_amd64); break; + case IMAGE_FILE_MACHINE_ARM64: name.str = classes_arm64; name.len = sizeof(classes_arm64); break; + } + if ((key = create_key_recursive( hklm, &name, current_time ))) { key->flags |= KEY_WOWSHARE; release_object( key ); @@ -1876,7 +1894,16 @@ void init_registry(void) if (!mkdir( "drive_c/windows", 0777 )) { mkdir( "drive_c/windows/system32", 0777 ); - if (prefix_type == PREFIX_64BIT) mkdir( "drive_c/windows/syswow64", 0777 ); + for (i = 1; i < supported_machines_count; i++) + { + switch (supported_machines[i]) + { + case IMAGE_FILE_MACHINE_I386: mkdir( "drive_c/windows/syswow64", 0777 ); break; + case IMAGE_FILE_MACHINE_ARMNT: mkdir( "drive_c/windows/sysarm32", 0777 ); break; + case IMAGE_FILE_MACHINE_AMD64: mkdir( "drive_c/windows/sysx8664", 0777 ); break; + case IMAGE_FILE_MACHINE_ARM64: mkdir( "drive_c/windows/sysarm64", 0777 ); break; + } + } } /* go back to the server dir */

1 0

Alexandre Julliard : ntdll: Add separate helpers for loading pe and so builtins.
by Alexandre Julliard 27 Apr '21

27 Apr '21

Module: wine Branch: master Commit: 79a148e1fa8b5ada2dc8fec03cf866a3d78c0d54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=79a148e1fa8b5ada2dc8fec0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 27 14:34:36 2021 +0200 ntdll: Add separate helpers for loading pe and so builtins. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 98 ++++++++++++++++++++++++++++-------------------- 1 file changed, 57 insertions(+), 41 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 30e1f972ae1..e6a6cd26779 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1191,7 +1191,7 @@ static inline char *prepend( char *buffer, const char *str, size_t len ) /*********************************************************************** * open_dll_file * - * Open a file for a new dll. Helper for open_builtin_file. + * Open a file for a new dll. Helper for open_builtin_pe_file. */ static NTSTATUS open_dll_file( const char *name, OBJECT_ATTRIBUTES *attr, HANDLE *mapping ) { @@ -1223,14 +1223,14 @@ static NTSTATUS open_dll_file( const char *name, OBJECT_ATTRIBUTES *attr, HANDLE /*********************************************************************** - * open_builtin_file + * open_builtin_pe_file */ -static NTSTATUS open_builtin_file( char *name, OBJECT_ATTRIBUTES *attr, void **module, SIZE_T *size, - SECTION_IMAGE_INFORMATION *image_info, WORD machine, BOOL prefer_native ) +static NTSTATUS open_builtin_pe_file( const char *name, OBJECT_ATTRIBUTES *attr, void **module, + SIZE_T *size, SECTION_IMAGE_INFORMATION *image_info, + WORD machine, BOOL prefer_native ) { NTSTATUS status; HANDLE mapping; - int fd; *module = NULL; status = open_dll_file( name, attr, &mapping ); @@ -1239,28 +1239,37 @@ static NTSTATUS open_builtin_file( char *name, OBJECT_ATTRIBUTES *attr, void **m status = virtual_map_builtin_module( mapping, module, size, image_info, machine, prefer_native ); NtClose( mapping ); } - if (status != STATUS_DLL_NOT_FOUND) return status; + return status; +} - /* try .so file */ - strcat( name, ".so" ); - if ((fd = open( name, O_RDONLY )) != -1) +/*********************************************************************** + * open_builtin_so_file + */ +static NTSTATUS open_builtin_so_file( const char *name, OBJECT_ATTRIBUTES *attr, void **module, + SECTION_IMAGE_INFORMATION *image_info, BOOL prefer_native ) +{ + NTSTATUS status; + int fd; + + *module = NULL; + if ((fd = open( name, O_RDONLY )) == -1) return STATUS_DLL_NOT_FOUND; + + if (check_library_arch( fd )) { - if (check_library_arch( fd )) - { - pe_image_info_t info; + pe_image_info_t info; - status = dlopen_dll( name, attr->ObjectName, module, &info, prefer_native ); - if (!status) virtual_fill_image_information( &info, image_info ); - else if (status != STATUS_IMAGE_ALREADY_LOADED) - { - ERR( "failed to load .so lib %s\n", debugstr_a(name) ); - status = STATUS_PROCEDURE_NOT_FOUND; - } + status = dlopen_dll( name, attr->ObjectName, module, &info, prefer_native ); + if (!status) virtual_fill_image_information( &info, image_info ); + else if (status != STATUS_IMAGE_ALREADY_LOADED) + { + ERR( "failed to load .so lib %s\n", debugstr_a(name) ); + status = STATUS_PROCEDURE_NOT_FOUND; } - else status = STATUS_IMAGE_MACHINE_TYPE_MISMATCH; - close( fd ); } + else status = STATUS_IMAGE_MACHINE_TYPE_MISMATCH; + + close( fd ); return status; } @@ -1311,7 +1320,10 @@ static NTSTATUS find_builtin_dll( UNICODE_STRING *nt_name, void **module, SIZE_T ptr = prepend( ptr, ptr, namelen ); ptr = prepend( ptr, "/dlls", sizeof("/dlls") - 1 ); ptr = prepend( ptr, build_dir, strlen(build_dir) ); - status = open_builtin_file( ptr, &attr, module, size_ptr, image_info, machine, prefer_native ); + status = open_builtin_pe_file( ptr, &attr, module, size_ptr, image_info, machine, prefer_native ); + if (status != STATUS_DLL_NOT_FOUND) goto done; + strcpy( file + pos + len + 1, ".so" ); + status = open_builtin_so_file( ptr, &attr, module, image_info, prefer_native ); if (status != STATUS_DLL_NOT_FOUND) goto done; /* now as a program */ @@ -1322,7 +1334,10 @@ static NTSTATUS find_builtin_dll( UNICODE_STRING *nt_name, void **module, SIZE_T ptr = prepend( ptr, ptr, namelen ); ptr = prepend( ptr, "/programs", sizeof("/programs") - 1 ); ptr = prepend( ptr, build_dir, strlen(build_dir) ); - status = open_builtin_file( ptr, &attr, module, size_ptr, image_info, machine, prefer_native ); + status = open_builtin_pe_file( ptr, &attr, module, size_ptr, image_info, machine, prefer_native ); + if (status != STATUS_DLL_NOT_FOUND) goto done; + strcpy( file + pos + len + 1, ".so" ); + status = open_builtin_so_file( ptr, &attr, module, image_info, prefer_native ); if (status != STATUS_DLL_NOT_FOUND) goto done; } @@ -1332,13 +1347,19 @@ static NTSTATUS find_builtin_dll( UNICODE_STRING *nt_name, void **module, SIZE_T file[pos + len + 1] = 0; ptr = prepend( ptr, pe_dir, strlen(pe_dir) ); ptr = prepend( ptr, dll_paths[i], strlen(dll_paths[i]) ); - status = open_builtin_file( ptr, &attr, module, size_ptr, image_info, machine, prefer_native ); + status = open_builtin_pe_file( ptr, &attr, module, size_ptr, image_info, machine, prefer_native ); /* use so dir for unix lib */ - ptr = file + pos; - file[pos + len + 1] = 0; ptr = prepend( file + pos, dll_paths[i], strlen(dll_paths[i]) ); if (status != STATUS_DLL_NOT_FOUND) goto done; - status = open_builtin_file( ptr, &attr, module, size_ptr, image_info, machine, prefer_native ); + status = open_builtin_pe_file( ptr, &attr, module, size_ptr, image_info, machine, prefer_native ); + if (status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH) + { + found_image = TRUE; + continue; + } + if (status != STATUS_DLL_NOT_FOUND) goto done; + strcpy( file + pos + len + 1, ".so" ); + status = open_builtin_so_file( ptr, &attr, module, image_info, prefer_native ); if (status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH) found_image = TRUE; else if (status != STATUS_DLL_NOT_FOUND) goto done; } @@ -1672,6 +1693,7 @@ static void load_ntdll(void) { static WCHAR path[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\', 's','y','s','t','e','m','3','2','\\','n','t','d','l','l','.','d','l','l',0}; + const char *pe_dir = get_pe_dir( current_machine ); NTSTATUS status; SECTION_IMAGE_INFORMATION info; OBJECT_ATTRIBUTES attr; @@ -1680,24 +1702,18 @@ static void load_ntdll(void) SIZE_T size = 0; char *name; - if (!build_dir) - { - char *dir = build_path( dll_dir, get_pe_dir(current_machine) ); - name = build_path( dir, "ntdll.dll.so" ); - free( dir ); - } - else name = build_path( build_dir, "dlls/ntdll/ntdll.dll.so" ); - init_unicode_string( &str, path ); InitializeObjectAttributes( &attr, &str, 0, 0, NULL ); - name[strlen(name) - 3] = 0; /* remove .so */ - status = open_builtin_file( name, &attr, &module, &size, &info, current_machine, FALSE ); - if (status == STATUS_IMAGE_NOT_AT_BASE) relocate_ntdll( module ); - else if (status == STATUS_DLL_NOT_FOUND) + + name = malloc( strlen( dll_dir ) + strlen( pe_dir ) + sizeof("/ntdll.dll.so") ); + sprintf( name, "%s%s/ntdll.dll", dll_dir, build_dir ? "" : pe_dir ); + status = open_builtin_pe_file( name, &attr, &module, &size, &info, current_machine, FALSE ); + if (status == STATUS_DLL_NOT_FOUND) { - free( name ); - name = build_path( dll_dir, "ntdll.dll.so" ); + sprintf( name, "%s/ntdll.dll.so", dll_dir ); + status = open_builtin_so_file( name, &attr, &module, &info, FALSE ); } + if (status == STATUS_IMAGE_NOT_AT_BASE) relocate_ntdll( module ); else if (status) fatal_error( "failed to load %s error %x\n", name, status ); free( name ); load_ntdll_functions( module );

1 0

Alexandre Julliard : ntdll: Always allocate space for both 32- and 64-bit PEB.
by Alexandre Julliard 27 Apr '21

27 Apr '21

Module: wine Branch: master Commit: cda02cdddb690104e67abc55ac44d410bef3e233 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cda02cdddb690104e67abc55… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 27 12:20:19 2021 +0200 ntdll: Always allocate space for both 32- and 64-bit PEB. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/virtual.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 8521dc11258..bb630765c3e 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2818,13 +2818,21 @@ NTSTATUS virtual_create_builtin_view( void *module, const UNICODE_STRING *nt_nam /* set some initial values in the new PEB */ -static void init_peb( PEB *peb ) +static PEB *init_peb( void *ptr ) { - peb->OSMajorVersion = 6; - peb->OSMinorVersion = 1; - peb->OSBuildNumber = 0x1db1; - peb->OSPlatformId = VER_PLATFORM_WIN32_NT; - peb->SessionId = 1; + PEB32 *peb32 = ptr; + PEB64 *peb64 = (PEB64 *)((char *)ptr + page_size); + + peb32->OSMajorVersion = peb64->OSMajorVersion = 6; + peb32->OSMinorVersion = peb64->OSMinorVersion = 1; + peb32->OSBuildNumber = peb64->OSBuildNumber = 0x1db1; + peb32->OSPlatformId = peb64->OSPlatformId = VER_PLATFORM_WIN32_NT; + peb32->SessionId = peb64->SessionId = 1; +#ifdef _WIN64 + return (PEB *)peb64; +#else + return (PEB *)peb32; +#endif } @@ -2872,7 +2880,6 @@ TEB *virtual_alloc_first_teb(void) void *ptr; NTSTATUS status; SIZE_T data_size = page_size; - SIZE_T peb_size = page_size * (is_win64 ? 1 : 2); SIZE_T block_size = signal_stack_mask + 1; SIZE_T total = 32 * block_size; @@ -2888,12 +2895,11 @@ TEB *virtual_alloc_first_teb(void) NtAllocateVirtualMemory( NtCurrentProcess(), &teb_block, 0, &total, MEM_RESERVE | MEM_TOP_DOWN, PAGE_READWRITE ); teb_block_pos = 30; - ptr = ((char *)teb_block + 30 * block_size); + ptr = (char *)teb_block + 30 * block_size; teb = (TEB *)((char *)ptr + teb_offset); - peb = (PEB *)((char *)teb_block + 32 * block_size - peb_size); - NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&ptr, 0, &block_size, MEM_COMMIT, PAGE_READWRITE ); - NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&peb, 0, &peb_size, MEM_COMMIT, PAGE_READWRITE ); - init_peb( peb ); + data_size = 2 * block_size; + NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&ptr, 0, &data_size, MEM_COMMIT, PAGE_READWRITE ); + peb = init_peb( (char *)teb_block + 31 * block_size ); init_teb( teb, peb ); *(ULONG_PTR *)&peb->CloudFileFlags = get_image_address(); return teb;

1 0

Alexandre Julliard : ntdll: Always allocate space for both 32- and 64-bit TEB.
by Alexandre Julliard 27 Apr '21

27 Apr '21

Module: wine Branch: master Commit: 6a9e19344dae44e97361041996f237f4bfd905c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a9e19344dae44e973610419… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 27 12:21:47 2021 +0200 ntdll: Always allocate space for both 32- and 64-bit TEB. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 4 ++++ dlls/ntdll/unix/server.c | 1 + dlls/ntdll/unix/unix_private.h | 12 +++--------- dlls/ntdll/unix/virtual.c | 37 +++++++++++++++++++++++++------------ 4 files changed, 33 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 3a71a9f245c..b68edfa64dc 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -3096,6 +3096,10 @@ static void test_wow64(void) "wrong WowTebOffset %x (%p/%p)\n", NtCurrentTeb()->WowTebOffset, teb64, NtCurrentTeb() ); ok( (char *)teb64 + 0x2000 == (char *)NtCurrentTeb(), "unexpected diff %p / %p\n", teb64, NtCurrentTeb() ); + ok( (char *)teb64 + teb64->WowTebOffset == (char *)NtCurrentTeb() || + broken( NtCurrentTeb()->WowTebOffset == 1 ), /* vista */ + "wrong WowTebOffset %x (%p/%p)\n", teb64->WowTebOffset, teb64, NtCurrentTeb() ); + ok( !teb64->GdiBatchCount, "GdiBatchCount set %x\n", teb64->GdiBatchCount ); ok( teb64->Tib.ExceptionList == PtrToUlong( NtCurrentTeb() ), "wrong Tib.ExceptionList %s / %p\n", wine_dbgstr_longlong(teb64->Tib.ExceptionList), NtCurrentTeb() ); ok( teb64->Tib.Self == PtrToUlong( teb64 ), "wrong Tib.Self %s / %p\n", diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 1ee903e1bf4..b13e2997962 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -1459,6 +1459,7 @@ static void init_teb64( TEB *teb ) teb->WowTebOffset = -teb_offset; teb64->ClientId.UniqueProcess = PtrToUlong( teb->ClientId.UniqueProcess ); teb64->ClientId.UniqueThread = PtrToUlong( teb->ClientId.UniqueThread ); + teb64->WowTebOffset = teb_offset; #endif } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 9a7e9ca01d6..a5bade02b8a 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -70,16 +70,10 @@ static inline struct ntdll_thread_data *ntdll_get_thread_data(void) } static const SIZE_T page_size = 0x1000; +static const SIZE_T teb_size = 0x3000; /* TEB64 + TEB32 */ static const SIZE_T signal_stack_mask = 0xffff; -#ifdef _WIN64 -static const SIZE_T teb_size = 0x2000; -static const SIZE_T teb_offset = 0; -static const SIZE_T signal_stack_size = 0x10000 - 0x2000; -#else -static const SIZE_T teb_size = 0x3000; /* TEB64 + TEB */ -static const SIZE_T teb_offset = 0x2000; static const SIZE_T signal_stack_size = 0x10000 - 0x3000; -#endif +static const LONG teb_offset = 0x2000; /* callbacks to PE ntdll from the Unix side */ extern void (WINAPI *pDbgUiRemoteBreakin)( void *arg ) DECLSPEC_HIDDEN; @@ -298,7 +292,7 @@ static inline void ascii_to_unicode( WCHAR *dst, const char *src, size_t len ) static inline void *get_signal_stack(void) { - return (char *)NtCurrentTeb() + teb_size - teb_offset; + return (void *)(((ULONG_PTR)NtCurrentTeb() & ~signal_stack_mask) + teb_size); } static inline void mutex_lock( pthread_mutex_t *mutex ) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index bb630765c3e..182f9089dbf 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2837,16 +2837,29 @@ static PEB *init_peb( void *ptr ) /* set some initial values in a new TEB */ -static void init_teb( TEB *teb, PEB *peb ) +static TEB *init_teb( void *ptr, PEB *peb ) { - struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)&teb->GdiTebBatch; - -#ifndef _WIN64 - TEB64 *teb64 = (TEB64 *)((char *)teb - teb_offset); + struct ntdll_thread_data *thread_data; + TEB *teb; + TEB64 *teb64 = ptr; + TEB32 *teb32 = (TEB32 *)((char *)ptr + teb_offset); +#ifdef _WIN64 + teb = (TEB *)teb64; + teb32->Peb = PtrToUlong( (char *)peb - page_size ); + teb32->Tib.Self = PtrToUlong( teb32 ); + teb32->Tib.ExceptionList = ~0u; + teb32->ActivationContextStackPointer = PtrToUlong( &teb32->ActivationContextStack ); + teb32->ActivationContextStack.FrameListCache.Flink = + teb32->ActivationContextStack.FrameListCache.Blink = + PtrToUlong( &teb32->ActivationContextStack.FrameListCache ); + teb32->StaticUnicodeString.Buffer = PtrToUlong( teb32->StaticUnicodeBuffer ); + teb32->StaticUnicodeString.MaximumLength = sizeof( teb32->StaticUnicodeBuffer ); +#else + teb = (TEB *)teb32; teb64->Peb = PtrToUlong( (char *)peb + page_size ); teb64->Tib.Self = PtrToUlong( teb64 ); - teb64->Tib.ExceptionList = PtrToUlong( teb ); + teb64->Tib.ExceptionList = PtrToUlong( teb32 ); teb64->ActivationContextStackPointer = PtrToUlong( &teb64->ActivationContextStack ); teb64->ActivationContextStack.FrameListCache.Flink = teb64->ActivationContextStack.FrameListCache.Blink = @@ -2862,11 +2875,13 @@ static void init_teb( TEB *teb, PEB *peb ) InitializeListHead( &teb->ActivationContextStack.FrameListCache ); teb->StaticUnicodeString.Buffer = teb->StaticUnicodeBuffer; teb->StaticUnicodeString.MaximumLength = sizeof(teb->StaticUnicodeBuffer); + thread_data = (struct ntdll_thread_data *)&teb->GdiTebBatch; thread_data->request_fd = -1; thread_data->reply_fd = -1; thread_data->wait_fd[0] = -1; thread_data->wait_fd[1] = -1; list_add_head( &teb_list, &thread_data->entry ); + return teb; } @@ -2896,11 +2911,10 @@ TEB *virtual_alloc_first_teb(void) MEM_RESERVE | MEM_TOP_DOWN, PAGE_READWRITE ); teb_block_pos = 30; ptr = (char *)teb_block + 30 * block_size; - teb = (TEB *)((char *)ptr + teb_offset); data_size = 2 * block_size; NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&ptr, 0, &data_size, MEM_COMMIT, PAGE_READWRITE ); peb = init_peb( (char *)teb_block + 31 * block_size ); - init_teb( teb, peb ); + teb = init_teb( ptr, peb ); *(ULONG_PTR *)&peb->CloudFileFlags = get_image_address(); return teb; } @@ -2943,8 +2957,7 @@ NTSTATUS virtual_alloc_teb( TEB **ret_teb ) NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&ptr, 0, &block_size, MEM_COMMIT, PAGE_READWRITE ); } - *ret_teb = teb = (TEB *)((char *)ptr + teb_offset); - init_teb( teb, NtCurrentTeb()->Peb ); + *ret_teb = teb = init_teb( ptr, NtCurrentTeb()->Peb ); server_leave_uninterrupted_section( &virtual_mutex, &sigset ); if ((status = signal_alloc_thread( teb ))) @@ -2964,7 +2977,7 @@ NTSTATUS virtual_alloc_teb( TEB **ret_teb ) void virtual_free_teb( TEB *teb ) { struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)&teb->GdiTebBatch; - void *ptr; + void *ptr = teb; SIZE_T size; sigset_t sigset; @@ -2982,7 +2995,7 @@ void virtual_free_teb( TEB *teb ) server_enter_uninterrupted_section( &virtual_mutex, &sigset ); list_remove( &thread_data->entry ); - ptr = (char *)teb - teb_offset; + if (!is_win64) ptr = (char *)ptr - teb_offset; *(void **)ptr = next_free_teb; next_free_teb = ptr; server_leave_uninterrupted_section( &virtual_mutex, &sigset );

1 0

Alexandre Julliard : ntdll: Allocate TEBs and stacks in the low 2G.
by Alexandre Julliard 27 Apr '21

27 Apr '21

Module: wine Branch: master Commit: 789c1db18a4e192425da3771cac4726cda77130b URL: https://source.winehq.org/git/wine.git/?a=commit;h=789c1db18a4e192425da3771… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 27 13:00:40 2021 +0200 ntdll: Allocate TEBs and stacks in the low 2G. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/virtual.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 182f9089dbf..14c984b27bf 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2907,7 +2907,7 @@ TEB *virtual_alloc_first_teb(void) exit(1); } - NtAllocateVirtualMemory( NtCurrentProcess(), &teb_block, 0, &total, + NtAllocateVirtualMemory( NtCurrentProcess(), &teb_block, is_win64 ? 0x7fffffff : 0, &total, MEM_RESERVE | MEM_TOP_DOWN, PAGE_READWRITE ); teb_block_pos = 30; ptr = (char *)teb_block + 30 * block_size; @@ -2944,8 +2944,8 @@ NTSTATUS virtual_alloc_teb( TEB **ret_teb ) { SIZE_T total = 32 * block_size; - if ((status = NtAllocateVirtualMemory( NtCurrentProcess(), &ptr, 0, &total, - MEM_RESERVE, PAGE_READWRITE ))) + if ((status = NtAllocateVirtualMemory( NtCurrentProcess(), &ptr, is_win64 ? 0x7fffffff : 0, + &total, MEM_RESERVE, PAGE_READWRITE ))) { server_leave_uninterrupted_section( &virtual_mutex, &sigset ); return status; @@ -3060,7 +3060,7 @@ NTSTATUS virtual_alloc_thread_stack( INITIAL_TEB *stack, SIZE_T reserve_size, SI server_enter_uninterrupted_section( &virtual_mutex, &sigset ); if ((status = map_view( &view, NULL, size + extra_size, FALSE, - VPROT_READ | VPROT_WRITE | VPROT_COMMITTED, 0 )) != STATUS_SUCCESS) + VPROT_READ | VPROT_WRITE | VPROT_COMMITTED, 33 )) != STATUS_SUCCESS) goto done; #ifdef VALGRIND_STACK_REGISTER

1 0

Alexandre Julliard : ntdll: Store the debug info for the initial thread next to the PEB.
by Alexandre Julliard 27 Apr '21

27 Apr '21

Module: wine Branch: master Commit: 616415a6df9e23ed0dfa83b74de90b95f7fabbc8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=616415a6df9e23ed0dfa83b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 27 12:41:10 2021 +0200 ntdll: Store the debug info for the initial thread next to the PEB. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/debug.c | 1 - dlls/ntdll/unix/virtual.c | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/debug.c b/dlls/ntdll/unix/debug.c index 368baac46f4..e6c3f67523e 100644 --- a/dlls/ntdll/unix/debug.c +++ b/dlls/ntdll/unix/debug.c @@ -294,6 +294,5 @@ void dbg_init(void) { setbuf( stdout, NULL ); setbuf( stderr, NULL ); - ntdll_get_thread_data()->debug_info = &initial_info; init_done = TRUE; } diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 14c984b27bf..f3e6b612b93 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2890,6 +2890,7 @@ static TEB *init_teb( void *ptr, PEB *peb ) */ TEB *virtual_alloc_first_teb(void) { + struct ntdll_thread_data *thread_data; TEB *teb; PEB *peb; void *ptr; @@ -2916,6 +2917,8 @@ TEB *virtual_alloc_first_teb(void) peb = init_peb( (char *)teb_block + 31 * block_size ); teb = init_teb( ptr, peb ); *(ULONG_PTR *)&peb->CloudFileFlags = get_image_address(); + thread_data = (struct ntdll_thread_data *)&teb->GdiTebBatch; + thread_data->debug_info = (struct debug_info *)((char *)teb_block + 31 * block_size + 2 * page_size); return teb; }

1 0

Giovanni Mascellani : advapi32/tests: Check that registry time zone records have a display name.
by Alexandre Julliard 27 Apr '21

27 Apr '21

Module: wine Branch: master Commit: 4581f5081940a8ea27d50e2801124d822fd62e92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4581f5081940a8ea27d50e28… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Apr 12 11:17:15 2021 +0200 advapi32/tests: Check that registry time zone records have a display name. While the display name is not a member of TIME_ZONE_INFORMATION, it is still available in the registry. In English it corresponds to the comments preceding groups of time zones in Unicode CLDR's windowsZones.xml. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 534982565d9..66382876fa5 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -4014,6 +4014,7 @@ static void test_EnumDynamicTimeZoneInformation(void) HKEY key, subkey; WCHAR name[32]; WCHAR keyname[128]; + WCHAR displayname[128]; WCHAR sysdir[MAX_PATH]; DWORD index, ret, gle, size; DYNAMIC_TIME_ZONE_INFORMATION bogus_dtzi, dtzi; @@ -4095,6 +4096,14 @@ static void test_EnumDynamicTimeZoneInformation(void) ok(status == ERROR_SUCCESS, "status %d name %s\n", status, wine_dbgstr_w(name)); ok(!memcmp(&dtzi.DaylightName, name, size), "expected %s, got %s\n", wine_dbgstr_w(name), wine_dbgstr_w(dtzi.DaylightName)); + + size = sizeof(displayname); + memset(displayname, 0, sizeof(displayname)); + if (pRegLoadMUIStringW) + status = pRegLoadMUIStringW(subkey, L"MUI_Display", displayname, size, &size, 0, sysdir); + else + status = pRegGetValueW(subkey, NULL, L"Display", RRF_RT_REG_SZ, NULL, displayname, &size); + todo_wine ok(status == ERROR_SUCCESS, "status %d displayname %s\n", status, wine_dbgstr_w(displayname)); } else {

1 0

Giovanni Mascellani : kernel32/tests: Test for quirks in a few different time zones.
by Alexandre Julliard 27 Apr '21

27 Apr '21

Module: wine Branch: master Commit: d1b80f4d635b01498e4d852cb3d6f314983682b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1b80f4d635b01498e4d852c… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Apr 12 11:17:16 2021 +0200 kernel32/tests: Test for quirks in a few different time zones. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/time.c | 127 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 97 insertions(+), 30 deletions(-) diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c index 28312bac3ce..7283075dc5e 100644 --- a/dlls/kernel32/tests/time.c +++ b/dlls/kernel32/tests/time.c @@ -894,6 +894,9 @@ static WORD day_of_month(const SYSTEMTIME* systemtime, WORD year) if (systemtime->wYear != 0) return systemtime->wDay; + if (systemtime->wMonth == 0) + return 0; + first_of_month.wYear = year; first_of_month.wMonth = systemtime->wMonth; first_of_month.wDay = 1; @@ -926,13 +929,37 @@ static WORD day_of_month(const SYSTEMTIME* systemtime, WORD year) static void test_GetTimeZoneInformationForYear(void) { - BOOL ret; + BOOL ret, broken_test = FALSE; SYSTEMTIME systemtime; TIME_ZONE_INFORMATION local_tzinfo, tzinfo, tzinfo2; DYNAMIC_TIME_ZONE_INFORMATION dyn_tzinfo; - static const WCHAR std_tzname[] = {'G','r','e','e','n','l','a','n','d',' ','S','t','a','n','d','a','r','d',' ','T','i','m','e',0}; - static const WCHAR dlt_tzname[] = {'G','r','e','e','n','l','a','n','d',' ','D','a','y','l','i','g','h','t',' ','T','i','m','e',0}; WORD std_day, dlt_day; + unsigned i; + static const struct + { + const WCHAR *tzname; + USHORT year; + LONG bias, std_bias, dlt_bias; + WORD std_month, std_day, dlt_month, dlt_day; + int tzinfo_todo : 1, bias_todo : 1, std_bias_todo : 1, dlt_bias_todo : 1; + int std_month_todo : 1, std_day_todo : 1, dlt_month_todo : 1, dlt_day_todo : 1; + } + test_data[] = + { + { L"Greenland Standard Time", 2015, 180, 0, -60, 10, 24, 3, 28 }, + { L"Greenland Standard Time", 2016, 180, 0, -60, 10, 29, 3, 26 }, + { L"Greenland Standard Time", 2017, 180, 0, -60, 10, 28, 3, 25 }, + { L"Easter Island Standard Time", 2014, 360, 0, -60, 4, 26, 9, 6, 0, 1, 0, 1, 1, 1, 1, 1 }, + { L"Easter Island Standard Time", 2015, 300, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1 }, + { L"Easter Island Standard Time", 2016, 360, 0, -60, 5, 14, 8, 13, 0, 1, 0, 1, 1, 1, 1, 1 }, + { L"Egypt Standard Time", 2013, -120, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1 }, + { L"Egypt Standard Time", 2014, -120, 0, -60, 9, 25, 5, 15, 0, 0, 0, 0, 1, 1, 1, 1 }, + { L"Egypt Standard Time", 2015, -120, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1 }, + { L"Egypt Standard Time", 2016, -120, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1 }, + { L"Altai Standard Time", 2016, -420, 0, 60, 3, 27, 1, 1, 1 }, + { L"Altai Standard Time", 2017, -420, 0, -60, 0, 0, 0, 0, 1 }, + { L"Altai Standard Time", 2018, -420, 0, -60, 0, 0, 0, 0, 1 }, + }; if (!pGetTimeZoneInformationForYear || !pGetDynamicTimeZoneInformation) { @@ -971,38 +998,78 @@ static void test_GetTimeZoneInformationForYear(void) ok(tzinfo.DaylightBias == local_tzinfo.DaylightBias, "Expected DaylightBias %d, got %d\n", local_tzinfo.DaylightBias, tzinfo.DaylightBias); memset(&dyn_tzinfo, 0xaa, sizeof(dyn_tzinfo)); - lstrcpyW(dyn_tzinfo.TimeZoneKeyName, std_tzname); - dyn_tzinfo.DynamicDaylightTimeDisabled = FALSE; - + lstrcpyW(dyn_tzinfo.TimeZoneKeyName, L"Greenland Daylight Time"); + SetLastError(0xdeadbeef); ret = pGetTimeZoneInformationForYear(2015, &dyn_tzinfo, &tzinfo); - ok(ret == TRUE, "GetTimeZoneInformationForYear failed, err %u\n", GetLastError()); - ok(tzinfo.Bias == 180, "Expected Bias 180, got %d\n", tzinfo.Bias); - ok(tzinfo.StandardDate.wMonth == 10, "Expected standard month 10, got %d\n", tzinfo.StandardDate.wMonth); - std_day = day_of_month(&tzinfo.StandardDate, 2015); - ok(std_day == 24, "Expected standard day 24, got %d\n", std_day); - ok(tzinfo.StandardBias == 0, "Expected StandardBias 0, got %d\n", tzinfo.StandardBias); - ok(tzinfo.DaylightDate.wMonth == 3, "Expected daylight month 3, got %d\n", tzinfo.DaylightDate.wMonth); - dlt_day = day_of_month(&tzinfo.DaylightDate, 2015); - ok(dlt_day == 28, "Expected daylight day 28, got %d\n", dlt_day); - ok(tzinfo.DaylightBias == -60, "Expected DaylightBias -60, got %d\n", tzinfo.DaylightBias); - - ret = pGetTimeZoneInformationForYear(2016, &dyn_tzinfo, &tzinfo2); - ok(ret == TRUE, "GetTimeZoneInformationForYear failed, err %u\n", GetLastError()); - ok(!lstrcmpW(tzinfo.StandardName, tzinfo2.StandardName), - "Got differing StandardName values %s and %s\n", - wine_dbgstr_w(tzinfo.StandardName), wine_dbgstr_w(tzinfo2.StandardName)); - ok(!lstrcmpW(tzinfo.DaylightName, tzinfo2.DaylightName), - "Got differing DaylightName values %s and %s\n", - wine_dbgstr_w(tzinfo.DaylightName), wine_dbgstr_w(tzinfo2.DaylightName)); + if (ret) + broken_test = TRUE; + ok((ret == FALSE && GetLastError() == ERROR_FILE_NOT_FOUND) || + broken(broken_test) /* vista,7 */, + "GetTimeZoneInformationForYear err %u\n", GetLastError()); memset(&dyn_tzinfo, 0xaa, sizeof(dyn_tzinfo)); - lstrcpyW(dyn_tzinfo.TimeZoneKeyName, dlt_tzname); - + lstrcpyW(dyn_tzinfo.TimeZoneKeyName, L"Altai Standard Time"); SetLastError(0xdeadbeef); ret = pGetTimeZoneInformationForYear(2015, &dyn_tzinfo, &tzinfo); - ok((ret == FALSE && GetLastError() == ERROR_FILE_NOT_FOUND) || - broken(ret == TRUE) /* vista,7 */, - "GetTimeZoneInformationForYear err %u\n", GetLastError()); + if (!ret && GetLastError() == ERROR_FILE_NOT_FOUND) + broken_test = TRUE; + todo_wine ok(ret == TRUE || broken(broken_test) /* before 10 1809 */, + "GetTimeZoneInformationForYear err %u\n", GetLastError()); + + if (broken(broken_test)) + { + win_skip("Old Windows version\n"); + return; + } + + for (i = 0; i < ARRAY_SIZE(test_data); i++) + { + memset(&dyn_tzinfo, 0xaa, sizeof(dyn_tzinfo)); + memset(&tzinfo, 0xbb, sizeof(tzinfo)); + lstrcpyW(dyn_tzinfo.TimeZoneKeyName, test_data[i].tzname); + dyn_tzinfo.DynamicDaylightTimeDisabled = FALSE; + + ret = pGetTimeZoneInformationForYear(test_data[i].year, &dyn_tzinfo, &tzinfo); + todo_wine_if(test_data[i].tzinfo_todo) + ok(ret == TRUE, "GetTimeZoneInformationForYear failed, err %u, for %s\n", GetLastError(), wine_dbgstr_w(test_data[i].tzname)); + if (!ret) + continue; + todo_wine_if(test_data[i].bias_todo) + ok(tzinfo.Bias == test_data[i].bias, "Expected bias %d, got %d, for %s\n", + test_data[i].bias, tzinfo.Bias, wine_dbgstr_w(test_data[i].tzname)); + todo_wine_if(test_data[i].std_month_todo) + ok(tzinfo.StandardDate.wMonth == test_data[i].std_month, "Expected standard month %d, got %d, for %s\n", + test_data[i].std_month, tzinfo.StandardDate.wMonth, wine_dbgstr_w(test_data[i].tzname)); + std_day = day_of_month(&tzinfo.StandardDate, test_data[i].year); + todo_wine_if(test_data[i].std_day_todo) + ok(std_day == test_data[i].std_day, "Expected standard day %d, got %d, for %s\n", + test_data[i].std_day, std_day, wine_dbgstr_w(test_data[i].tzname)); + todo_wine_if(test_data[i].std_bias_todo) + ok(tzinfo.StandardBias == test_data[i].std_bias, "Expected standard bias %d, got %d, for %s\n", + test_data[i].std_bias, tzinfo.StandardBias, wine_dbgstr_w(test_data[i].tzname)); + todo_wine_if(test_data[i].dlt_month_todo) + ok(tzinfo.DaylightDate.wMonth == test_data[i].dlt_month, "Expected daylight month %d, got %d, for %s\n", + test_data[i].dlt_month, tzinfo.DaylightDate.wMonth, wine_dbgstr_w(test_data[i].tzname)); + dlt_day = day_of_month(&tzinfo.DaylightDate, test_data[i].year); + todo_wine_if(test_data[i].dlt_day_todo) + ok(dlt_day == test_data[i].dlt_day, "Expected daylight day %d, got %d, for %s\n", + test_data[i].dlt_day, dlt_day, wine_dbgstr_w(test_data[i].tzname)); + todo_wine_if(test_data[i].dlt_bias_todo) + ok(tzinfo.DaylightBias == test_data[i].dlt_bias, "Expected daylight bias %d, got %d, for %s\n", + test_data[i].dlt_bias, tzinfo.DaylightBias, wine_dbgstr_w(test_data[i].tzname)); + + if (i > 0 && test_data[i-1].tzname == test_data[i].tzname) + { + ok(!lstrcmpW(tzinfo.StandardName, tzinfo2.StandardName), + "Got differing StandardName values %s and %s\n", + wine_dbgstr_w(tzinfo.StandardName), wine_dbgstr_w(tzinfo2.StandardName)); + ok(!lstrcmpW(tzinfo.DaylightName, tzinfo2.DaylightName), + "Got differing DaylightName values %s and %s\n", + wine_dbgstr_w(tzinfo.DaylightName), wine_dbgstr_w(tzinfo2.DaylightName)); + } + + memcpy(&tzinfo2, &tzinfo, sizeof(tzinfo2)); + } } static void test_GetTickCount(void)

1 0

Paul Gofman : kernel32: Do not impose 32 bit limits on Win64 in GlobalMemoryStatus().
by Alexandre Julliard 27 Apr '21

27 Apr '21

Module: wine Branch: master Commit: 72c562ce9c481e73a01f50e17b624095aab11bdc URL: https://source.winehq.org/git/wine.git/?a=commit;h=72c562ce9c481e73a01f50e1… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Apr 21 17:58:26 2021 +0300 kernel32: Do not impose 32 bit limits on Win64 in GlobalMemoryStatus(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/heap.c | 21 +++++++++++---------- dlls/kernel32/tests/heap.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index b7bd6f5f91d..02f4587d43b 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -543,7 +543,9 @@ VOID WINAPI GlobalMemoryStatus( LPMEMORYSTATUS lpBuffer ) { MEMORYSTATUSEX memstatus; OSVERSIONINFOW osver; +#ifndef _WIN64 IMAGE_NT_HEADERS *nt = RtlImageNtHeader( GetModuleHandleW(0) ); +#endif /* Because GlobalMemoryStatus is identical to GlobalMemoryStatusEX save for one extra field in the struct, and the lack of a bug, we simply @@ -561,6 +563,14 @@ VOID WINAPI GlobalMemoryStatus( LPMEMORYSTATUS lpBuffer ) osver.dwOSVersionInfoSize = sizeof(osver); GetVersionExW(&osver); + lpBuffer->dwTotalPhys = memstatus.ullTotalPhys; + lpBuffer->dwAvailPhys = memstatus.ullAvailPhys; + lpBuffer->dwTotalPageFile = memstatus.ullTotalPageFile; + lpBuffer->dwAvailPageFile = memstatus.ullAvailPageFile; + lpBuffer->dwTotalVirtual = memstatus.ullTotalVirtual; + lpBuffer->dwAvailVirtual = memstatus.ullAvailVirtual; + +#ifndef _WIN64 if ( osver.dwMajorVersion >= 5 || osver.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS ) { lpBuffer->dwTotalPhys = min( memstatus.ullTotalPhys, MAXDWORD ); @@ -570,16 +580,6 @@ VOID WINAPI GlobalMemoryStatus( LPMEMORYSTATUS lpBuffer ) lpBuffer->dwAvailPageFile = min( memstatus.ullAvailPageFile, MAXDWORD ); lpBuffer->dwTotalVirtual = min( memstatus.ullTotalVirtual, MAXDWORD ); lpBuffer->dwAvailVirtual = min( memstatus.ullAvailVirtual, MAXDWORD ); - - } - else /* duplicate NT bug */ - { - lpBuffer->dwTotalPhys = memstatus.ullTotalPhys; - lpBuffer->dwAvailPhys = memstatus.ullAvailPhys; - lpBuffer->dwTotalPageFile = memstatus.ullTotalPageFile; - lpBuffer->dwAvailPageFile = memstatus.ullAvailPageFile; - lpBuffer->dwTotalVirtual = memstatus.ullTotalVirtual; - lpBuffer->dwAvailVirtual = memstatus.ullAvailVirtual; } /* values are limited to 2Gb unless the app has the IMAGE_FILE_LARGE_ADDRESS_AWARE flag */ @@ -603,6 +603,7 @@ VOID WINAPI GlobalMemoryStatus( LPMEMORYSTATUS lpBuffer ) if (lpBuffer->dwTotalPageFile > MAXLONG) lpBuffer->dwTotalPageFile = MAXLONG; if (lpBuffer->dwAvailPageFile > MAXLONG) lpBuffer->dwAvailPageFile = MAXLONG; } +#endif TRACE("Length %u, MemoryLoad %u, TotalPhys %lx, AvailPhys %lx," " TotalPageFile %lx, AvailPageFile %lx, TotalVirtual %lx, AvailVirtual %lx\n", diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index fa372b14e21..0a4e3367f60 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -1213,6 +1213,51 @@ static void test_GetPhysicallyInstalledSystemMemory(void) "expected total_memory >= memstatus.ullTotalPhys / 1024\n"); } +static BOOL compare_ulong64(ULONG64 v1, ULONG64 v2, ULONG64 max_diff) +{ + ULONG64 diff = v1 > v2 ? v1 - v2 : v2 - v1; + + return diff <= max_diff; +} + +static void test_GlobalMemoryStatus(void) +{ + static const ULONG64 max_diff = 0x200000; + MEMORYSTATUSEX memex; + MEMORYSTATUS mem; + SIZE_T size; + + mem.dwLength = sizeof(mem); + GlobalMemoryStatus(&mem); + memex.dwLength = sizeof(memex); + GlobalMemoryStatusEx(&memex); + + /* Compare values approximately as the available memory may change between + * GlobalMemoryStatus() and GlobalMemoryStatusEx() calls. */ + + size = min(memex.ullTotalPhys, ~(SIZE_T)0 >> 1); + ok(compare_ulong64(mem.dwTotalPhys, size, max_diff), "Got unexpected dwTotalPhys %s, size %s.\n", + wine_dbgstr_longlong(mem.dwTotalPhys), wine_dbgstr_longlong(size)); + size = min(memex.ullAvailPhys, ~(SIZE_T)0 >> 1); + ok(compare_ulong64(mem.dwAvailPhys, size, max_diff), "Got unexpected dwAvailPhys %s, size %s.\n", + wine_dbgstr_longlong(mem.dwAvailPhys), wine_dbgstr_longlong(size)); + + size = min(memex.ullTotalPageFile, ~(SIZE_T)0); + ok(compare_ulong64(mem.dwTotalPageFile, size, max_diff), + "Got unexpected dwTotalPageFile %s, size %s.\n", + wine_dbgstr_longlong(mem.dwTotalPageFile), wine_dbgstr_longlong(size)); + size = min(memex.ullAvailPageFile, ~(SIZE_T)0); + ok(compare_ulong64(mem.dwAvailPageFile, size, max_diff), "Got unexpected dwAvailPageFile %s, size %s.\n", + wine_dbgstr_longlong(mem.dwAvailPageFile), wine_dbgstr_longlong(size)); + + ok(compare_ulong64(mem.dwTotalVirtual, memex.ullTotalVirtual, max_diff), + "Got unexpected dwTotalVirtual %s, ullTotalVirtual %s.\n", + wine_dbgstr_longlong(mem.dwTotalVirtual), wine_dbgstr_longlong(memex.ullTotalVirtual)); + ok(compare_ulong64(mem.dwAvailVirtual, memex.ullAvailVirtual, max_diff), + "Got unexpected dwAvailVirtual %s, ullAvailVirtual %s.\n", + wine_dbgstr_longlong(mem.dwAvailVirtual), wine_dbgstr_longlong(memex.ullAvailVirtual)); +} + START_TEST(heap) { int argc; @@ -1246,6 +1291,7 @@ START_TEST(heap) test_HeapQueryInformation(); test_GetPhysicallyInstalledSystemMemory(); + test_GlobalMemoryStatus(); if (pRtlGetNtGlobalFlags) {

1 0