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

Alexandre Julliard : server: Use a 64-bit machine for IL executables.
by Alexandre Julliard April 27, 2021

April 27, 2021

Module: wine Branch: master Commit: 94d19eff22cc8bad73c9165e5e7142c4c1c822c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94d19eff22cc8bad73c9165e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 27 10:39:57 2021 +0200 server: Use a 64-bit machine for IL executables. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51067 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/mapping.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/server/mapping.c b/server/mapping.c index a8de45482c9..c9d64856024 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -349,6 +349,18 @@ struct memory_view *get_exe_view( struct process *process ) return LIST_ENTRY( list_head( &process->views ), struct memory_view, entry ); } +static void set_process_machine( struct process *process, struct memory_view *view ) +{ + unsigned short machine = view->image.machine; + + if (machine == IMAGE_FILE_MACHINE_I386 && (view->image.image_flags & IMAGE_FLAGS_ComPlusNativeReady)) + { + if (is_machine_supported( IMAGE_FILE_MACHINE_AMD64 )) machine = IMAGE_FILE_MACHINE_AMD64; + else if (is_machine_supported( IMAGE_FILE_MACHINE_ARM64 )) machine = IMAGE_FILE_MACHINE_ARM64; + } + process->machine = machine; +} + /* add a view to the process list */ static void add_process_view( struct thread *thread, struct memory_view *view ) { @@ -362,7 +374,7 @@ static void add_process_view( struct thread *thread, struct memory_view *view ) else if (!(view->image.image_charact & IMAGE_FILE_DLL)) { /* main exe */ - process->machine = view->image.machine; + set_process_machine( process, view ); list_add_head( &process->views, &view->entry ); if (get_view_nt_name( view, &name ) && (process->image = memdup( name.str, name.len ))) process->imagelen = name.len;

1 0

Alexandre Julliard : server: Check the supported machines list to validate an image mapping.
by Alexandre Julliard April 27, 2021

April 27, 2021

Module: wine Branch: master Commit: 8d50c3465579eeda92580f3c2153b6a07b0bd1f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d50c3465579eeda92580f3c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 27 10:35:16 2021 +0200 server: Check the supported machines list to validate an image mapping. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/mapping.c | 32 ++++++++------------------------ server/object.h | 15 +++++++++++++++ server/thread.c | 6 ------ server/thread.h | 1 - 4 files changed, 23 insertions(+), 31 deletions(-) diff --git a/server/mapping.c b/server/mapping.c index 3c4b707f282..a8de45482c9 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -642,7 +642,7 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s off_t pos; int size, opt_size; size_t mz_size, clr_va, clr_size; - unsigned int i, cpu_mask = get_supported_cpu_mask(); + unsigned int i; /* load the headers */ @@ -671,17 +671,9 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s switch (nt.opt.hdr32.Magic) { case IMAGE_NT_OPTIONAL_HDR32_MAGIC: - switch (nt.FileHeader.Machine) - { - case IMAGE_FILE_MACHINE_I386: - if (cpu_mask & (CPU_FLAG(CPU_x86) | CPU_FLAG(CPU_x86_64))) break; - return STATUS_INVALID_IMAGE_FORMAT; - case IMAGE_FILE_MACHINE_ARMNT: - if (cpu_mask & (CPU_FLAG(CPU_ARM) | CPU_FLAG(CPU_ARM64))) break; - return STATUS_INVALID_IMAGE_FORMAT; - default: - return STATUS_INVALID_IMAGE_FORMAT; - } + if (!is_machine_32bit( nt.FileHeader.Machine )) return STATUS_INVALID_IMAGE_FORMAT; + if (!is_machine_supported( nt.FileHeader.Machine )) return STATUS_INVALID_IMAGE_FORMAT; + clr_va = nt.opt.hdr32.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress; clr_size = nt.opt.hdr32.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].Size; @@ -710,18 +702,10 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s break; case IMAGE_NT_OPTIONAL_HDR64_MAGIC: - if (!(cpu_mask & CPU_64BIT_MASK)) return STATUS_INVALID_IMAGE_WIN_64; - switch (nt.FileHeader.Machine) - { - case IMAGE_FILE_MACHINE_AMD64: - if (cpu_mask & (CPU_FLAG(CPU_x86) | CPU_FLAG(CPU_x86_64))) break; - return STATUS_INVALID_IMAGE_FORMAT; - case IMAGE_FILE_MACHINE_ARM64: - if (cpu_mask & (CPU_FLAG(CPU_ARM) | CPU_FLAG(CPU_ARM64))) break; - return STATUS_INVALID_IMAGE_FORMAT; - default: - return STATUS_INVALID_IMAGE_FORMAT; - } + if (!is_machine_64bit( supported_machines[0] )) return STATUS_INVALID_IMAGE_WIN_64; + if (!is_machine_64bit( nt.FileHeader.Machine )) return STATUS_INVALID_IMAGE_FORMAT; + if (!is_machine_supported( nt.FileHeader.Machine )) return STATUS_INVALID_IMAGE_FORMAT; + clr_va = nt.opt.hdr64.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress; clr_size = nt.opt.hdr64.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].Size; diff --git a/server/object.h b/server/object.h index 604362d6e2c..89e39a7fa00 100644 --- a/server/object.h +++ b/server/object.h @@ -244,6 +244,21 @@ extern unsigned short supported_machines[8]; extern void init_registry(void); extern void flush_registry(void); +static inline int is_machine_32bit( unsigned short machine ) +{ + return machine == IMAGE_FILE_MACHINE_I386 || machine == IMAGE_FILE_MACHINE_ARMNT; +} +static inline int is_machine_64bit( unsigned short machine ) +{ + return machine == IMAGE_FILE_MACHINE_AMD64 || machine == IMAGE_FILE_MACHINE_ARM64; +} +static inline int is_machine_supported( unsigned short machine ) +{ + unsigned int i; + for (i = 0; i < supported_machines_count; i++) if (supported_machines[i] == machine) return 1; + return 0; +} + /* signal functions */ extern void start_watchdog(void); diff --git a/server/thread.c b/server/thread.c index a649dc432f6..3c438a2002a 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1341,12 +1341,6 @@ int is_cpu_supported( enum cpu_type cpu ) return 0; } -/* return the cpu mask for supported cpus */ -unsigned int get_supported_cpu_mask(void) -{ - return supported_cpus & get_prefix_cpu_mask(); -} - /* create a new thread */ DECL_HANDLER(new_thread) { diff --git a/server/thread.h b/server/thread.h index 5f8eeeb3c50..0ae0a354695 100644 --- a/server/thread.h +++ b/server/thread.h @@ -120,7 +120,6 @@ extern int thread_get_inflight_fd( struct thread *thread, int client ); extern struct token *thread_get_impersonation_token( struct thread *thread ); extern int set_thread_affinity( struct thread *thread, affinity_t affinity ); extern int is_cpu_supported( enum cpu_type cpu ); -extern unsigned int get_supported_cpu_mask(void); extern int suspend_thread( struct thread *thread ); extern int resume_thread( struct thread *thread );

1 0

Ziqing Hui : user32/tests: Add tests for maximizing and restoring windows without WS_CAPTION.
by Alexandre Julliard April 27, 2021

April 27, 2021

Module: wine Branch: master Commit: 1ab8710016d4dc0cb0c61280dd7443b2a89b6b79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ab8710016d4dc0cb0c61280… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Apr 23 11:31:36 2021 +0800 user32/tests: Add tests for maximizing and restoring windows without WS_CAPTION. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index dbb5f4ce5b5..a37afd2dc5e 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6649,6 +6649,21 @@ static void test_ShowWindow(void) RECT rcMain, rc, rcMinimized, rcClient, rcEmpty, rcMaximized, rcResized, rcNonClient; LPARAM ret; MONITORINFO mon_info; + unsigned int i; + + DWORD test_style[] = + { + WS_OVERLAPPED | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_THICKFRAME, + WS_OVERLAPPED | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX | WS_THICKFRAME, + WS_OVERLAPPED | WS_VISIBLE | WS_SYSMENU | WS_MAXIMIZEBOX | WS_THICKFRAME, + WS_OVERLAPPED | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX, + WS_OVERLAPPED | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX, + WS_OVERLAPPED | WS_VISIBLE | WS_SYSMENU | WS_MAXIMIZEBOX, + WS_OVERLAPPED | WS_VISIBLE | WS_SYSMENU | WS_THICKFRAME, + WS_OVERLAPPED | WS_VISIBLE | WS_SYSMENU, + WS_OVERLAPPED | WS_VISIBLE | WS_THICKFRAME, + WS_OVERLAPPED | WS_VISIBLE + }; SetRect(&rcClient, 0, 0, 90, 90); rcMain = rcClient; @@ -6905,6 +6920,50 @@ static void test_ShowWindow(void) DestroyWindow(hwnd); flush_events(TRUE); + + /* test maximize and restore windows without setting WS_CAPTION */ + + for (i = 0; i < ARRAY_SIZE(test_style); ++i) + { + SetRect(&rcMain, 0, 0, 90, 90); + OffsetRect(&rcMain, 120, 120); + hwnd = CreateWindowExA(0, "MainWindowClass", NULL, test_style[i], + rcMain.left, rcMain.top, + rcMain.right - rcMain.left, rcMain.bottom - rcMain.top, + 0, 0, 0, NULL); + ok(hwnd != NULL, "Test %u: failed to create window with error %u\n", i, GetLastError()); + + GetWindowRect(hwnd, &rcMain); + ok(rcMain.left > mon_info.rcMonitor.left && + rcMain.right < mon_info.rcMonitor.right && + rcMain.top > mon_info.rcMonitor.top && + rcMain.bottom < mon_info.rcMonitor.bottom, + "Test %u: window should not be fullscreen\n", i); + + rcMaximized = (test_style[i] & WS_MAXIMIZEBOX) ? mon_info.rcWork : mon_info.rcMonitor; + AdjustWindowRectEx(&rcMaximized, GetWindowLongA(hwnd, GWL_STYLE) & ~WS_BORDER, + 0, GetWindowLongA(hwnd, GWL_EXSTYLE)); + + ret = ShowWindow(hwnd, SW_MAXIMIZE); + ok(ret, "unexpected ret: %lu\n", ret); + style = GetWindowLongA(hwnd, GWL_STYLE); + ok(style & WS_MAXIMIZE, "Test %u: window should be maximized\n", i); + GetWindowRect(hwnd, &rc); + ok(EqualRect(&rcMaximized, &rc), "Test %u: expected %s, got %s\n", + i, wine_dbgstr_rect(&rcMaximized), wine_dbgstr_rect(&rc)); + + ret = ShowWindow(hwnd, SW_RESTORE); + ok(ret, "unexpected ret: %lu\n", ret); + style = GetWindowLongA(hwnd, GWL_STYLE); + ok(!(style & WS_MAXIMIZE), "Test %u: window should not be maximized\n", i); + GetWindowRect(hwnd, &rc); + ok(EqualRect(&rcMain, &rc), "Test %u: expected %s, got %s\n", + i, wine_dbgstr_rect(&rcMain), wine_dbgstr_rect(&rc)); + + DestroyWindow(hwnd); + + flush_events(TRUE); + } } static void test_ShowWindow_owned(HWND hwndMain)

1 0

Giovanni Mascellani : advapi32/tests: Check that registry time zone records have a display name.
by Alexandre Julliard April 27, 2021

April 27, 2021

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

Alexandre Julliard : ntdll: Add separate helpers for loading pe and so builtins.
by Alexandre Julliard April 27, 2021

April 27, 2021

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 : server: Create the Wow64 key and system directory for all supported architectures.
by Alexandre Julliard April 27, 2021

April 27, 2021

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

Ziqing Hui : winex11.drv: Correct a full screen condition.
by Alexandre Julliard April 27, 2021

April 27, 2021

Module: wine Branch: master Commit: 57b1b21a84b15f121eef998a31151d760beb8c1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=57b1b21a84b15f121eef998a… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Apr 23 11:31:50 2021 +0800 winex11.drv: Correct a full screen condition. The if condition here came from 47c54c4ae7f235780a55ddf670503db4afc11055, which is to detect full screen window. However, according to tests in previous commit, there is possibility that a window without setting WS_CAPTION is not full screen, for example, main window of Tencent WeChat. And windows like this can also be maximized or restored. So that we can not treat WS_CAPTION as our full screen condition. This fixes maximizing Tencent WeChat by dragging it to screen edge. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 99943478729..1772a27c48b 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -1163,7 +1163,7 @@ static BOOL X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) data->window_rect.bottom - data->window_rect.top, cx, cy ); style = GetWindowLongW( data->hwnd, GWL_STYLE ); - if ((style & WS_CAPTION) == WS_CAPTION) + if ((style & WS_CAPTION) == WS_CAPTION || !is_window_rect_full_screen( &data->whole_rect )) { read_net_wm_states( event->display, data ); if ((data->net_wm_state & (1 << NET_WM_STATE_MAXIMIZED)))

1 0

Alexandre Julliard : ntdll: Always allocate space for both 32- and 64-bit PEB.
by Alexandre Julliard April 27, 2021

April 27, 2021

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

Rémi Bernon : user32/tests: Add more GetKeyboardLayout(Name) tests.
by Alexandre Julliard April 27, 2021

April 27, 2021

Module: wine Branch: master Commit: 60c7823dcba837846853d621456ae6997174a885 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60c7823dcba837846853d621… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 27 12:06:50 2021 +0200 user32/tests: Add more GetKeyboardLayout(Name) tests. At least on recent Windows, the HKL values are a combination of user selected UI language in the low word, and keyboard layout id in the high word. The keyboard layout id used in HKL is sometimes different from its name, as returned by GetKeyboardLayoutName, in which case it's the "Layout Id" value in the corresponding registry key under the layout name. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 53 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 47 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 2397b4104e4..c4c361575cd 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -53,6 +53,7 @@ #include "wingdi.h" #include "winuser.h" #include "winnls.h" +#include "winreg.h" #include "ddk/hidsdi.h" #include "wine/test.h" @@ -3034,8 +3035,11 @@ static void test_get_async_key_state(void) static void test_keyboard_layout_name(void) { + WCHAR klid[KL_NAMELENGTH], tmpklid[KL_NAMELENGTH], layout_path[MAX_PATH], value[5]; + HKL layout, tmplayout, layouts[64]; + DWORD status, value_size; + int i, len; BOOL ret; - char klid[KL_NAMELENGTH]; if (0) /* crashes on native system */ ret = GetKeyboardLayoutNameA(NULL); @@ -3045,12 +3049,49 @@ static void test_keyboard_layout_name(void) ok(!ret, "got %d\n", ret); ok(GetLastError() == ERROR_NOACCESS, "got %d\n", GetLastError()); - if (GetKeyboardLayout(0) != (HKL)(ULONG_PTR)0x04090409) return; + layout = GetKeyboardLayout(0); + + len = GetKeyboardLayoutList(ARRAY_SIZE(layouts), layouts); + ok(len > 0, "GetKeyboardLayoutList returned %d\n", len); + + for (i = len - 1; i >= 0; --i) + { + UINT id = (UINT_PTR)layouts[i]; + ActivateKeyboardLayout(layouts[i], 0); + GetKeyboardLayoutNameW(klid); + + if (id & 0x80000000) + { + todo_wine ok((id >> 28) == 0xf, "hkl high bits %#x, expected 0xf\n", id >> 28); + + value_size = sizeof(value); + wcscpy(layout_path, L"System\\CurrentControlSet\\Control\\Keyboard Layouts\\"); + wcscat(layout_path, klid); + status = RegGetValueW(HKEY_LOCAL_MACHINE, layout_path, L"Layout Id", RRF_RT_REG_SZ, NULL, (void *)&value, &value_size); + todo_wine ok(!status, "RegGetValueW returned %x\n", status); + ok(value_size == 5 * sizeof(WCHAR), "RegGetValueW returned size %d\n", value_size); + + swprintf(tmpklid, KL_NAMELENGTH, L"%04X", (id >> 16) & 0x0fff); + todo_wine ok(!wcsicmp(value, tmpklid), "RegGetValueW returned %s, expected %s\n", debugstr_w(value), debugstr_w(tmpklid)); + } + else + { + swprintf(tmpklid, KL_NAMELENGTH, L"%08X", id >> 16); + ok(!wcsicmp(klid, tmpklid), "GetKeyboardLayoutNameW returned %s, expected %s\n", debugstr_w(klid), debugstr_w(tmpklid)); + } + + ActivateKeyboardLayout(layout, 0); + tmplayout = LoadKeyboardLayoutW(klid, KLF_ACTIVATE); + + /* The low word of HKL is the selected user lang and may be different as LoadKeyboardLayoutW also selects the default lang from the layout */ + ok(((UINT_PTR)tmplayout & ~0xffff) == ((UINT_PTR)layouts[i] & ~0xffff), "GetKeyboardLayout returned %p, expected %p\n", tmplayout, layouts[i]); + + /* The layout name only depends on the keyboard layout: the high word of HKL. */ + GetKeyboardLayoutNameW(tmpklid); + ok(!wcsicmp(klid, tmpklid), "GetKeyboardLayoutNameW returned %s, expected %s\n", debugstr_w(tmpklid), debugstr_w(klid)); + } - klid[0] = 0; - ret = GetKeyboardLayoutNameA(klid); - ok(ret, "GetKeyboardLayoutNameA failed %u\n", GetLastError()); - ok(!strcmp(klid, "00000409"), "expected 00000409, got %s\n", klid); + ActivateKeyboardLayout(layout, 0); } static void test_key_names(void)

1 0

Giovanni Mascellani : kernel32/tests: Test for quirks in a few different time zones.
by Alexandre Julliard April 27, 2021

April 27, 2021

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