wine-commits March 2021

wine-commits@winehq.org

2 participants
1163 discussions

Alexandre Julliard : ntdll: Move kernel32 loading into LdrInitializeThunk().
by Alexandre Julliard 31 Mar '21

31 Mar '21

Module: wine Branch: master Commit: 2a8a4cbbe636fc90ecf55c965e909a4684d42fff URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a8a4cbbe636fc90ecf55c96… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 31 10:20:02 2021 +0200 ntdll: Move kernel32 loading into LdrInitializeThunk(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 45 ++++++++++++++++++++------------------------- dlls/ntdll/locale.c | 10 ---------- dlls/ntdll/ntdll_misc.h | 2 +- 3 files changed, 21 insertions(+), 36 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 5edccd6a29e..336b11c6344 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -68,6 +68,7 @@ const WCHAR windows_dir[] = L"C:\\windows"; const WCHAR system_dir[] = L"C:\\windows\\system32\\"; const WCHAR syswow64_dir[] = L"C:\\windows\\syswow64\\"; +HMODULE kernel32_handle = 0; BOOL is_wow64 = FALSE; /* system search path */ @@ -3517,6 +3518,23 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR if (!imports_fixup_done) { + ANSI_STRING func_name; + WINE_MODREF *kernel32; + + if ((status = load_dll( NULL, L"kernel32.dll", NULL, 0, &kernel32 )) != STATUS_SUCCESS) + { + MESSAGE( "wine: could not load kernel32.dll, status %x\n", status ); + NtTerminateProcess( GetCurrentProcess(), status ); + } + kernel32_handle = kernel32->ldr.DllBase; + RtlInitAnsiString( &func_name, "BaseThreadInitThunk" ); + if ((status = LdrGetProcedureAddress( kernel32_handle, &func_name, + 0, (void **)&pBaseThreadInitThunk )) != STATUS_SUCCESS) + { + MESSAGE( "wine: could not find BaseThreadInitThunk in kernel32.dll, status %x\n", status ); + NtTerminateProcess( GetCurrentProcess(), status ); + } + actctx_init(); if (wm->ldr.Flags & LDR_COR_ILONLY) status = fixup_imports_ilonly( wm, NULL, entry ); @@ -4002,9 +4020,6 @@ static void map_wow64cpu(void) */ static NTSTATUS process_init(void) { - WINE_MODREF *wm; - NTSTATUS status; - ANSI_STRING func_name; INITIAL_TEB stack; TEB *teb = NtCurrentTeb(); PEB *peb = teb->Peb; @@ -4039,6 +4054,7 @@ static NTSTATUS process_init(void) load_global_options(); version_init(); build_main_module(); + build_ntdll_module(); #ifndef _WIN64 if (NtCurrentTeb64()) @@ -4050,30 +4066,9 @@ static NTSTATUS process_init(void) peb64->OSBuildNumber = peb->OSBuildNumber; peb64->OSPlatformId = peb->OSPlatformId; peb64->SessionId = peb->SessionId; - } -#endif - - build_ntdll_module(); - -#ifndef _WIN64 - if (is_wow64) map_wow64cpu(); -#endif - - if ((status = load_dll( NULL, L"C:\\windows\\system32\\kernel32.dll", NULL, 0, &wm )) != STATUS_SUCCESS) - { - MESSAGE( "wine: could not load kernel32.dll, status %x\n", status ); - NtTerminateProcess( GetCurrentProcess(), status ); - } - RtlInitAnsiString( &func_name, "BaseThreadInitThunk" ); - if ((status = LdrGetProcedureAddress( wm->ldr.DllBase, &func_name, - 0, (void **)&pBaseThreadInitThunk )) != STATUS_SUCCESS) - { - MESSAGE( "wine: could not find BaseThreadInitThunk in kernel32.dll, status %x\n", status ); - NtTerminateProcess( GetCurrentProcess(), status ); } - - init_locale( wm->ldr.DllBase ); +#endif RtlCreateUserStack( 0, 0, 0, 0x10000, 0x10000, &stack ); teb->Tib.StackBase = stack.StackBase; diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index b3a225a30c3..fe185d403f2 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -101,7 +101,6 @@ struct norm_table }; static NLSTABLEINFO nls_info; -static HMODULE kernel32_handle; static struct norm_table *norm_tables[16]; @@ -531,15 +530,6 @@ static unsigned int compose_string( const struct norm_table *info, WCHAR *str, u } -/****************************************************************** - * init_locale - */ -void init_locale( HMODULE module ) -{ - kernel32_handle = module; -} - - static NTSTATUS get_dummy_preferred_ui_language( DWORD flags, LANGID lang, ULONG *count, WCHAR *buffer, ULONG *size ) { diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index b8f9dc28e63..400ac9398a5 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -61,7 +61,6 @@ extern void version_init(void) DECLSPEC_HIDDEN; extern void debug_init(void) DECLSPEC_HIDDEN; extern void actctx_init(void) DECLSPEC_HIDDEN; extern void heap_set_debug_flags( HANDLE handle ) DECLSPEC_HIDDEN; -extern void init_locale( HMODULE module ) DECLSPEC_HIDDEN; extern void init_user_process_params(void) DECLSPEC_HIDDEN; extern void CDECL DECLSPEC_NORETURN signal_start_thread( CONTEXT *ctx ) DECLSPEC_HIDDEN; @@ -79,6 +78,7 @@ extern void SNOOP_SetupDLL( HMODULE hmod ) DECLSPEC_HIDDEN; extern const WCHAR windows_dir[] DECLSPEC_HIDDEN; extern const WCHAR system_dir[] DECLSPEC_HIDDEN; extern const WCHAR syswow64_dir[] DECLSPEC_HIDDEN; +extern HMODULE kernel32_handle DECLSPEC_HIDDEN; extern void (FASTCALL *pBaseThreadInitThunk)(DWORD,LPTHREAD_START_ROUTINE,void *) DECLSPEC_HIDDEN; extern const struct unix_funcs *unix_funcs DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : ntdll: Return system dir path for PE mapping bootstrap placeholders.
by Alexandre Julliard 31 Mar '21

31 Mar '21

Module: wine Branch: master Commit: 0bbbf016b1eb1c90a98c58afc2760319050a04d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bbbf016b1eb1c90a98c58af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 31 21:12:55 2021 +0200 ntdll: Return system dir path for PE mapping bootstrap placeholders. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 964a3e0eaa4..5edccd6a29e 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2577,10 +2577,10 @@ static NTSTATUS find_builtin_without_file( const WCHAR *name, UNICODE_STRING *ne RtlAppendUnicodeToString( new_name, L"\\" ); RtlAppendUnicodeToString( new_name, name ); status = open_dll_file( new_name, pwm, mapping, image_info, id ); - if (status != STATUS_DLL_NOT_FOUND) return status; + if (status != STATUS_DLL_NOT_FOUND) goto done; RtlAppendUnicodeToString( new_name, L".fake" ); status = open_dll_file( new_name, pwm, mapping, image_info, id ); - if (status != STATUS_DLL_NOT_FOUND) return status; + if (status != STATUS_DLL_NOT_FOUND) goto done; RtlFreeUnicodeString( new_name ); } for (i = 0; ; i++) @@ -2592,16 +2592,27 @@ static NTSTATUS find_builtin_without_file( const WCHAR *name, UNICODE_STRING *ne RtlAppendUnicodeToString( new_name, name ); status = open_dll_file( new_name, pwm, mapping, image_info, id ); if (status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH) found_image = TRUE; - else if (status != STATUS_DLL_NOT_FOUND) return status; + else if (status != STATUS_DLL_NOT_FOUND) goto done; new_name->Length = len; RtlAppendUnicodeToString( new_name, L"\\fakedlls\\" ); RtlAppendUnicodeToString( new_name, name ); status = open_dll_file( new_name, pwm, mapping, image_info, id ); if (status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH) found_image = TRUE; - else if (status != STATUS_DLL_NOT_FOUND) return status; + else if (status != STATUS_DLL_NOT_FOUND) goto done; RtlFreeUnicodeString( new_name ); } if (found_image) status = STATUS_IMAGE_MACHINE_TYPE_MISMATCH; + +done: + RtlFreeUnicodeString( new_name ); + if (!status) + { + new_name->Length = (4 + wcslen(system_dir) + wcslen(name)) * sizeof(WCHAR); + new_name->Buffer = RtlAllocateHeap( GetProcessHeap(), 0, new_name->Length + sizeof(WCHAR) ); + wcscpy( new_name->Buffer, L"\\??\\" ); + wcscat( new_name->Buffer, system_dir ); + wcscat( new_name->Buffer, name ); + } return status; }

1 0

Alexandre Julliard : ntdll: Fail to load non-existent dlls, except during prefix bootstrap.
by Alexandre Julliard 31 Mar '21

31 Mar '21

Module: wine Branch: master Commit: 42de71c38780931c510ada6d7ee8681c99bbc60b URL: https://source.winehq.org/git/wine.git/?a=commit;h=42de71c38780931c510ada6d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 31 10:19:10 2021 +0200 ntdll: Fail to load non-existent dlls, except during prefix bootstrap. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/module.c | 6 +++--- dlls/ntdll/loader.c | 7 ++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 96577989431..0066f7de5a8 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -1093,7 +1093,7 @@ static void test_SetDefaultDllDirectories(void) ret = pSetDefaultDllDirectories( LOAD_LIBRARY_SEARCH_USER_DIRS ); ok( ret, "SetDefaultDllDirectories failed err %u\n", GetLastError() ); mod = LoadLibraryA( "authz.dll" ); - todo_wine ok( !mod, "loading authz succeeded\n" ); + ok( !mod, "loading authz succeeded\n" ); FreeLibrary( mod ); ret = pSetDefaultDllDirectories( LOAD_LIBRARY_SEARCH_SYSTEM32 ); ok( ret, "SetDefaultDllDirectories failed err %u\n", GetLastError() ); @@ -1101,12 +1101,12 @@ static void test_SetDefaultDllDirectories(void) ok( mod != NULL, "loading authz failed\n" ); FreeLibrary( mod ); mod = LoadLibraryExA( "authz.dll", 0, LOAD_LIBRARY_SEARCH_APPLICATION_DIR ); - todo_wine ok( !mod, "loading authz succeeded\n" ); + ok( !mod, "loading authz succeeded\n" ); FreeLibrary( mod ); ret = pSetDefaultDllDirectories( LOAD_LIBRARY_SEARCH_APPLICATION_DIR ); ok( ret, "SetDefaultDllDirectories failed err %u\n", GetLastError() ); mod = LoadLibraryA( "authz.dll" ); - todo_wine ok( !mod, "loading authz succeeded\n" ); + ok( !mod, "loading authz succeeded\n" ); FreeLibrary( mod ); ret = pSetDefaultDllDirectories( LOAD_LIBRARY_SEARCH_DEFAULT_DIRS ); ok( ret, "SetDefaultDllDirectories failed err %u\n", GetLastError() ); diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index e8b53778284..964a3e0eaa4 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -73,6 +73,7 @@ BOOL is_wow64 = FALSE; /* system search path */ static const WCHAR system_path[] = L"C:\\windows\\system32;C:\\windows\\system;C:\\windows"; +static BOOL is_prefix_bootstrap; /* are we bootstrapping the prefix? */ static BOOL imports_fixup_done = FALSE; /* set once the imports have been fixed up, before attaching them */ static BOOL process_detaching = FALSE; /* set on process detach to avoid deadlocks with thread detach */ static int free_lib_count; /* recursion depth of LdrUnloadDll calls */ @@ -1918,10 +1919,14 @@ static NTSTATUS build_module( LPCWSTR load_path, const UNICODE_STRING *nt_name, static void build_ntdll_module(void) { MEMORY_BASIC_INFORMATION meminfo; + FILE_BASIC_INFORMATION basic_info; UNICODE_STRING nt_name; + OBJECT_ATTRIBUTES attr; WINE_MODREF *wm; RtlInitUnicodeString( &nt_name, L"\\??\\C:\\windows\\system32\\ntdll.dll" ); + InitializeObjectAttributes( &attr, &nt_name, OBJ_CASE_INSENSITIVE, 0, NULL ); + is_prefix_bootstrap = NtQueryAttributesFile( &attr, &basic_info) != STATUS_SUCCESS; NtQueryVirtualMemory( GetCurrentProcess(), build_ntdll_module, MemoryBasicInformation, &meminfo, sizeof(meminfo), NULL ); wm = alloc_module( meminfo.AllocationBase, &nt_name, TRUE ); @@ -2647,7 +2652,7 @@ static NTSTATUS search_dll_file( LPCWSTR paths, LPCWSTR search, UNICODE_STRING * if (found_image) status = STATUS_IMAGE_MACHINE_TYPE_MISMATCH; - else if (!wcspbrk( search, L":/\\" )) + else if (is_prefix_bootstrap && !wcspbrk( search, L":/\\" )) status = find_builtin_without_file( search, nt_name, pwm, mapping, image_info, id ); done:

1 0

Alexandre Julliard : ntdll: Also check syswow64 to determine if the prefix was initialized.
by Alexandre Julliard 31 Mar '21

31 Mar '21

Module: wine Branch: master Commit: 8bcb44a99bc8d88858ba07c5f462db6fefb414f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bcb44a99bc8d88858ba07c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 31 11:49:14 2021 +0200 ntdll: Also check syswow64 to determine if the prefix was initialized. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 4c76865019b..5b0004b6d01 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -118,7 +118,6 @@ static char *argv0; static const char *bin_dir; static const char *dll_dir; static SIZE_T dll_path_maxlen; -static BOOL is_prefix_bootstrap; const char *home_dir = NULL; const char *data_dir = NULL; @@ -311,8 +310,6 @@ static void set_config_dir(void) static void init_paths( char *argv[] ) { Dl_info info; - struct stat st; - char *ntdll; argv0 = strdup( argv[0] ); @@ -335,10 +332,6 @@ static void init_paths( char *argv[] ) set_dll_path(); set_home_dir(); set_config_dir(); - - ntdll = build_path( config_dir, "dosdevices/c:/windows/system32/ntdll.dll" ); - is_prefix_bootstrap = stat( ntdll, &st ) == -1; - free( ntdll ); } @@ -1437,9 +1430,10 @@ BOOL is_builtin_path( const UNICODE_STRING *path, WORD *machine ) { static const WCHAR wow64W[] = {'\\','?','?','\\','c',':','\\','w','i','n','d','o','w','s','\\', 's','y','s','w','o','w','6','4'}; + BOOL is_prefix_bootstrap; unsigned int len; - - if (!is_prefix_bootstrap) return FALSE; + struct stat st; + char *ntdll; *machine = current_machine; if (path->Length > wcslen(system_dir) * sizeof(WCHAR) && @@ -1464,7 +1458,15 @@ found: len = wcslen(system_dir); while (len < path->Length / sizeof(WCHAR) && path->Buffer[len] == '\\') len++; while (len < path->Length / sizeof(WCHAR) && path->Buffer[len] != '\\') len++; - return len == path->Length / sizeof(WCHAR); + if (len != path->Length / sizeof(WCHAR)) return FALSE; + + /* if the corresponding ntdll exists, don't fake the existence of the builtin */ + ntdll = build_path( config_dir, *machine == IMAGE_FILE_MACHINE_I386 ? + "dosdevices/c:/windows/syswow64/ntdll.dll" : + "dosdevices/c:/windows/system32/ntdll.dll" ); + is_prefix_bootstrap = stat( ntdll, &st ) == -1; + free( ntdll ); + return is_prefix_bootstrap; }

1 0

Alexandre Julliard : gdi32: Try to load the printer driver from the printer driver directory.
by Alexandre Julliard 31 Mar '21

31 Mar '21

Module: wine Branch: master Commit: 23389127ecd0cedb8d6d020c2fa1f7dc00dc9b2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=23389127ecd0cedb8d6d020c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 31 10:18:54 2021 +0200 gdi32: Try to load the printer driver from the printer driver directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/driver.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index e146a3a4f85..09b051cd6fa 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -177,6 +177,18 @@ static void release_display_device_init_mutex( HANDLE mutex ) CloseHandle( mutex ); } +#ifdef __i386__ +static const WCHAR printer_env[] = L"w32x86"; +#elif defined __x86_64__ +static const WCHAR printer_env[] = L"x64"; +#elif defined __arm__ +static const WCHAR printer_env[] = L"arm"; +#elif defined __aarch64__ +static const WCHAR printer_env[] = L"arm64"; +#else +#error not defined for this cpu +#endif + /********************************************************************** * DRIVER_load_driver */ @@ -200,7 +212,15 @@ const struct gdi_dc_funcs *DRIVER_load_driver( LPCWSTR name ) LeaveCriticalSection( &driver_section ); } - if (!(module = LoadLibraryW( name ))) return NULL; + if (!(module = LoadLibraryW( name ))) + { + WCHAR path[MAX_PATH]; + + GetSystemDirectoryW( path, MAX_PATH ); + swprintf( path + wcslen(path), MAX_PATH - wcslen(path), L"\\spool\\drivers\\%s\\3\\%s", + printer_env, name ); + if (!(module = LoadLibraryW( path ))) return NULL; + } if (!(new_driver = create_driver( module ))) {

1 0

Zhiyi Zhang : gdi32: Fix handling of ModifyWorldTransform( MWT_IDENTITY ) on an emf dc.
by Alexandre Julliard 31 Mar '21

31 Mar '21

Module: wine Branch: master Commit: efdd6f46c9525366fe6d562caa0e19bce27ef015 URL: https://source.winehq.org/git/wine.git/?a=commit;h=efdd6f46c9525366fe6d562c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Mar 31 08:55:13 2021 +0100 gdi32: Fix handling of ModifyWorldTransform( MWT_IDENTITY ) on an emf dc. When the mode parameter is MWT_IDENTITY, the xform parameter can be NULL because it should be ignored and use the identity matrix. Fix Tally crashing when exporting a JPEG image. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/dc.c | 14 +++++++++++++- dlls/gdi32/tests/metafile.c | 15 +++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 16251939714..2a749418829 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -362,7 +362,19 @@ BOOL CDECL EMFDRV_ModifyWorldTransform( PHYSDEV dev, const XFORM *xform, DWORD m emr.emr.iType = EMR_MODIFYWORLDTRANSFORM; emr.emr.nSize = sizeof(emr); - emr.xform = *xform; + if (mode == MWT_IDENTITY) + { + emr.xform.eM11 = 1.0f; + emr.xform.eM12 = 0.0f; + emr.xform.eM21 = 0.0f; + emr.xform.eM22 = 1.0f; + emr.xform.eDx = 0.0f; + emr.xform.eDy = 0.0f; + } + else + { + emr.xform = *xform; + } emr.iMode = mode; if (!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE; diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index e81cff1ae57..648e9369803 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -4158,6 +4158,18 @@ static INT CALLBACK enum_emf_WorldTransform(HDC hdc, HANDLETABLE *ht, CombineTransform(&test_data->expected, &test_data->stored, &test_data->scale); } + else if(lpXfrm->iMode == MWT_IDENTITY) + { + /* reset to identity matrix also does discard */ + test_data->stored.eM11 = 1.0f; + test_data->stored.eM12 = 0.0f; + test_data->stored.eM21 = 0.0f; + test_data->stored.eM22 = 1.0f; + test_data->stored.eDx = 0.0f; + test_data->stored.eDy = 0.0f; + + CombineTransform(&test_data->expected, &test_data->stored, &test_data->scale); + } /* verify it is updated immediately */ ret = GetWorldTransform(hdc, &xform); @@ -4265,6 +4277,9 @@ static void test_emf_WorldTransform(void) ret = SetWorldTransform(hdcMetafile, &xform); /* EMR_SETWORLDTRANSFORM */ ok(ret == TRUE, "SetWorldTransform failed\n"); + ret = ModifyWorldTransform(hdcMetafile, NULL, MWT_IDENTITY); /* EMR_MODIFYWORLDTRANSFORM */ + ok(ret == TRUE, "ModifyWorldTransform failed\n"); + set_rotation_xform(&xform, M_PI / 2.f, -2, -3); ret = ModifyWorldTransform(hdcMetafile, &xform, MWT_LEFTMULTIPLY); /* EMR_MODIFYWORLDTRANSFORM */ ok(ret == TRUE, "ModifyWorldTransform failed\n");

1 0

Jacek Caban : conhost: Delay window refresh on output update.
by Alexandre Julliard 31 Mar '21

31 Mar '21

Module: wine Branch: master Commit: 8ccf24ccb0a4362c407aea61927e604e60d41f6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ccf24ccb0a4362c407aea61… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 30 21:28:01 2021 +0200 conhost: Delay window refresh on output update. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 8 ++++---- programs/conhost/conhost.h | 2 +- programs/conhost/window.c | 15 +++++++++++---- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index fbee37d9c01..39544fb8a9d 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -1211,7 +1211,7 @@ static void update_read_output( struct console *console ) if (console->is_unix) set_tty_cursor_relative( screen_buffer->console, screen_buffer->cursor_x, screen_buffer->cursor_y ); tty_sync( screen_buffer->console ); - update_window_config( screen_buffer->console ); + update_window_config( screen_buffer->console, TRUE ); } static NTSTATUS process_console_input( struct console *console ) @@ -1703,7 +1703,7 @@ static NTSTATUS screen_buffer_activate( struct screen_buffer *screen_buffer ) SetRect( &update_rect, 0, 0, screen_buffer->width - 1, screen_buffer->height - 1 ); update_output( screen_buffer, &update_rect ); tty_sync( screen_buffer->console ); - update_window_config( screen_buffer->console ); + update_window_config( screen_buffer->console, FALSE ); return STATUS_SUCCESS; } @@ -1896,7 +1896,7 @@ static NTSTATUS set_output_info( struct screen_buffer *screen_buffer, if (is_active( screen_buffer )) { tty_sync( screen_buffer->console ); - update_window_config( screen_buffer->console ); + update_window_config( screen_buffer->console, FALSE ); } return STATUS_SUCCESS; } @@ -1955,7 +1955,7 @@ static NTSTATUS write_console( struct screen_buffer *screen_buffer, const WCHAR scroll_to_cursor( screen_buffer ); update_output( screen_buffer, &update_rect ); tty_sync( screen_buffer->console ); - update_window_config( screen_buffer->console ); + update_window_config( screen_buffer->console, TRUE ); return STATUS_SUCCESS; } diff --git a/programs/conhost/conhost.h b/programs/conhost/conhost.h index 6f3985352e2..6446cd1d767 100644 --- a/programs/conhost/conhost.h +++ b/programs/conhost/conhost.h @@ -132,7 +132,7 @@ struct screen_buffer BOOL init_window( struct console *console ); void update_window_region( struct console *console, const RECT *update ); -void update_window_config( struct console *console ); +void update_window_config( struct console *console, BOOL delay ); NTSTATUS write_console_input( struct console *console, const INPUT_RECORD *records, unsigned int count, BOOL flush ); diff --git a/programs/conhost/window.c b/programs/conhost/window.c index a665cbb84d4..0ea929df943 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -2170,8 +2170,10 @@ static LRESULT WINAPI window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp PostQuitMessage( 0 ); break; + case WM_TIMER: case WM_UPDATE_CONFIG: - update_window( console ); + if (console->window->update_state == UPDATE_PENDING) + update_window( console ); break; case WM_PAINT: @@ -2457,11 +2459,16 @@ static LRESULT WINAPI window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp return 0; } -void update_window_config( struct console *console ) +void update_window_config( struct console *console, BOOL delay ) { + const int delay_timeout = 50; + if (!console->win || console->window->update_state != UPDATE_NONE) return; console->window->update_state = UPDATE_PENDING; - PostMessageW( console->win, WM_UPDATE_CONFIG, 0, 0 ); + if (delay) + SetTimer( console->win, 1, delay_timeout, NULL ); + else + PostMessageW( console->win, WM_UPDATE_CONFIG, 0, 0 ); } void update_window_region( struct console *console, const RECT *update ) @@ -2471,7 +2478,7 @@ void update_window_region( struct console *console, const RECT *update ) window_rect->top = min( window_rect->top, update->top ); window_rect->right = max( window_rect->right, update->right ); window_rect->bottom = max( window_rect->bottom, update->bottom ); - update_window_config( console ); + update_window_config( console, TRUE ); } BOOL init_window( struct console *console )

1 0

Jacek Caban : d3d11: Use nameless unions.
by Alexandre Julliard 31 Mar '21

31 Mar '21

Module: wine Branch: master Commit: 68f8c454ecd09fc79b3ce14b595e7c16dde56c14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68f8c454ecd09fc79b3ce14b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 30 20:09:55 2021 +0200 d3d11: Use nameless unions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/Makefile.in | 1 - dlls/d3d11/device.c | 1 + dlls/d3d11/view.c | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/Makefile.in b/dlls/d3d11/Makefile.in index 5f664007444..db9e40d2e60 100644 --- a/dlls/d3d11/Makefile.in +++ b/dlls/d3d11/Makefile.in @@ -1,7 +1,6 @@ MODULE = d3d11.dll IMPORTLIB = d3d11 IMPORTS = dxguid uuid dxgi wined3d -EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 4c8aa8c854c..f154bfdf480 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -18,6 +18,7 @@ */ #define NONAMELESSUNION +#define WINE_NO_NAMELESS_EXTENSION #include "d3d11_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d11); diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 4393d6540e3..734c9619e5b 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -18,6 +18,7 @@ */ #define NONAMELESSUNION +#define WINE_NO_NAMELESS_EXTENSION #include "d3d11_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d11);

1 0

Jacek Caban : dsound/tests: Use nameless unions.
by Alexandre Julliard 31 Mar '21

31 Mar '21

Module: wine Branch: master Commit: fa54a0b30602349dba922481303704546999ca99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa54a0b30602349dba922481… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 30 20:09:48 2021 +0200 dsound/tests: Use nameless unions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/tests/Makefile.in | 1 - dlls/dsound/tests/dsound8.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/dsound/tests/Makefile.in b/dlls/dsound/tests/Makefile.in index 733516853bb..234b49b1bba 100644 --- a/dlls/dsound/tests/Makefile.in +++ b/dlls/dsound/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = dsound.dll IMPORTS = dmoguids dsound msdmo ole32 version user32 -EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION C_SRCS = \ capture.c \ diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index 85272dd9b55..e3adbfbe70e 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -1112,7 +1112,7 @@ static void test_first_device(void) hr = IPropertyStore_GetValue(ps, &PKEY_AudioEndpoint_GUID, &pv); ok(hr == S_OK, "GetValue failed: %08x\n", hr); - CLSIDFromString(pv.u.pwszVal, &default_info.guid); + CLSIDFromString(pv.pwszVal, &default_info.guid); PropVariantClear(&pv); IPropertyStore_Release(ps);

1 0

Jacek Caban : dsound: Use nameless unions.
by Alexandre Julliard 31 Mar '21

31 Mar '21

Module: wine Branch: master Commit: 0536299a9981246425785f2501b7894af08da854 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0536299a9981246425785f25… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 30 20:09:43 2021 +0200 dsound: Use nameless unions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/Makefile.in | 1 - dlls/dsound/dsound_main.c | 6 +++--- dlls/dsound/primary.c | 2 +- dlls/dsound/propset.c | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/dsound/Makefile.in b/dlls/dsound/Makefile.in index f9f61e501f0..909b38c0632 100644 --- a/dlls/dsound/Makefile.in +++ b/dlls/dsound/Makefile.in @@ -1,7 +1,6 @@ MODULE = dsound.dll IMPORTLIB = dsound IMPORTS = dxguid uuid winmm ole32 advapi32 user32 -EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index ca33ba48046..25c5f7bbf46 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -213,7 +213,7 @@ static HRESULT get_mmdevice_guid(IMMDevice *device, IPropertyStore *ps, return hr; } - CLSIDFromString(pv.u.pwszVal, guid); + CLSIDFromString(pv.pwszVal, guid); PropVariantClear(&pv); IPropertyStore_Release(ps); @@ -432,9 +432,9 @@ static BOOL send_device(IMMDevice *device, GUID *guid, } TRACE("Calling back with %s (%s)\n", wine_dbgstr_guid(guid), - wine_dbgstr_w(pv.u.pwszVal)); + wine_dbgstr_w(pv.pwszVal)); - keep_going = cb(guid, pv.u.pwszVal, wine_vxd_drv, user); + keep_going = cb(guid, pv.pwszVal, wine_vxd_drv, user); PropVariantClear(&pv); IPropertyStore_Release(ps); diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 655f730b375..e7da015a533 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -90,7 +90,7 @@ static DWORD DSOUND_FindSpeakerConfig(IMMDevice *mmdevice, int channels) return def; } - phys_speakers = pv.u.ulVal; + phys_speakers = pv.ulVal; PropVariantClear(&pv); IPropertyStore_Release(store); diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index f1f71bef135..959256f8c4e 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -246,7 +246,7 @@ static HRESULT DSPROPERTY_DescriptionW( return hr; } - ppd->Description = strdupW(pv.u.pwszVal); + ppd->Description = strdupW(pv.pwszVal); ppd->Module = strdupW(wine_vxd_drv); ppd->Interface = strdupW(wInterface); ppd->Type = DIRECTSOUNDDEVICE_TYPE_VXD;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2021