wine-commits March 2021

2 participants
1163 discussions

Zhiyi Zhang : comctl32/listbox: Actually draw themed frame.

by Alexandre Julliard

Module: wine Branch: master Commit: 7fba4ebba3e8659608da8ceaecd8849c20afe75e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7fba4ebba3e8659608da8cea… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Mar 1 11:09:40 2021 +0800 comctl32/listbox: Actually draw themed frame. Previously, LISTBOX_NCPaint() is called and themed frame is drawn. And then DefWindowProcW() is called with original clip region, overwriting the drawn themed frame. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index b905beee325..137b08ce678 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -1186,7 +1186,7 @@ static LRESULT LISTBOX_Paint( LB_DESCR *descr, HDC hdc ) return 0; } -static void LISTBOX_NCPaint( LB_DESCR *descr, HRGN region ) +static LRESULT LISTBOX_NCPaint( LB_DESCR *descr, HRGN region ) { DWORD exstyle = GetWindowLongW( descr->self, GWL_EXSTYLE); HTHEME theme = GetWindowTheme( descr->self ); @@ -1196,7 +1196,7 @@ static void LISTBOX_NCPaint( LB_DESCR *descr, HRGN region ) RECT r; if (!theme || !(exstyle & WS_EX_CLIENTEDGE)) - return; + return DefWindowProcW(descr->self, WM_NCPAINT, (WPARAM)region, 0); cxEdge = GetSystemMetrics(SM_CXEDGE); cyEdge = GetSystemMetrics(SM_CYEDGE); @@ -1217,6 +1217,11 @@ static void LISTBOX_NCPaint( LB_DESCR *descr, HRGN region ) DrawThemeParentBackground(descr->self, hdc, &r); DrawThemeBackground (theme, hdc, 0, 0, &r, 0); ReleaseDC(descr->self, hdc); + + /* Call default proc to get the scrollbars etc. also painted */ + DefWindowProcW(descr->self, WM_NCPAINT, (WPARAM)cliprgn, 0); + DeleteObject(cliprgn); + return 0; } /*********************************************************************** @@ -2976,8 +2981,7 @@ static LRESULT CALLBACK LISTBOX_WindowProc( HWND hwnd, UINT msg, WPARAM wParam, return ret; case WM_NCPAINT: - LISTBOX_NCPaint( descr, (HRGN)wParam ); - break; + return LISTBOX_NCPaint( descr, (HRGN)wParam ); case WM_SIZE: LISTBOX_UpdateSize( descr );

3 years, 2 months

Esme Povirk : mscoree: Add an option to enable the interpreter.

by Alexandre Julliard

Module: wine Branch: master Commit: 76f87fe30c0425332740c6a59786cf3c5a55f5c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=76f87fe30c0425332740c6a5… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sun Feb 28 15:45:05 2021 -0600 mscoree: Add an option to enable the interpreter. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/metahost.c | 28 ++++++++++++++++++++++++++++ dlls/mscoree/mscoree_private.h | 12 ++++++++++++ 2 files changed, 40 insertions(+) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index d9b599fadc7..907d8af9791 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -106,6 +106,7 @@ MonoImage* (CDECL *mono_image_open_from_module_handle)(HMODULE module_handle, ch static void (CDECL *mono_install_assembly_preload_hook)(MonoAssemblyPreLoadFunc func, void *user_data); int (CDECL *mono_jit_exec)(MonoDomain *domain, MonoAssembly *assembly, int argc, char *argv[]); MonoDomain* (CDECL *mono_jit_init_version)(const char *domain_name, const char *runtime_version); +static void (CDECL *mono_jit_set_aot_mode)(MonoAotMode mode); static int (CDECL *mono_jit_set_trace_options)(const char* options); void* (CDECL *mono_marshal_get_vtfixup_ftnptr)(MonoImage *image, DWORD token, WORD type); MonoDomain* (CDECL *mono_object_get_domain)(MonoObject *obj); @@ -158,6 +159,8 @@ static HRESULT load_mono(LPCWSTR mono_path) WCHAR mono_dll_path[MAX_PATH+16]; WCHAR mono_lib_path[MAX_PATH+4], mono_etc_path[MAX_PATH+4]; char mono_lib_path_a[MAX_PATH], mono_etc_path_a[MAX_PATH]; + int aot_size; + char aot_setting[256]; int trace_size; char trace_setting[256]; int verbose_size; @@ -239,6 +242,7 @@ static HRESULT load_mono(LPCWSTR mono_path) LOAD_OPT_MONO_FUNCTION(mono_callspec_set_assembly, NULL); LOAD_OPT_MONO_FUNCTION(mono_image_open_from_module_handle, image_open_module_handle_dummy); + LOAD_OPT_MONO_FUNCTION(mono_jit_set_aot_mode, NULL); LOAD_OPT_MONO_FUNCTION(mono_profiler_create, NULL); LOAD_OPT_MONO_FUNCTION(mono_profiler_install, NULL); LOAD_OPT_MONO_FUNCTION(mono_profiler_set_runtime_shutdown_begin_callback, NULL); @@ -277,6 +281,30 @@ static HRESULT load_mono(LPCWSTR mono_path) mono_install_assembly_preload_hook(mono_assembly_preload_hook_fn, NULL); + aot_size = GetEnvironmentVariableA("WINE_MONO_AOT", aot_setting, sizeof(aot_setting)); + + if (aot_size) + { + MonoAotMode mode; + if (strcmp(aot_setting, "interp") == 0) + mode = MONO_AOT_MODE_INTERP_ONLY; + else if (strcmp(aot_setting, "none") == 0) + mode = MONO_AOT_MODE_NONE; + else + { + ERR("unknown WINE_MONO_AOT setting, valid settings are interp and none\n"); + mode = MONO_AOT_MODE_NONE; + } + if (mono_jit_set_aot_mode != NULL) + { + mono_jit_set_aot_mode(mode); + } + else + { + ERR("mono_jit_set_aot_mode export not found\n"); + } + } + trace_size = GetEnvironmentVariableA("WINE_MONO_TRACE", trace_setting, sizeof(trace_setting)); if (trace_size) diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index da587285cfe..69c30e5e3e0 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -147,6 +147,18 @@ typedef void (CDECL *MonoProfileFunc)(MonoProfiler *prof); typedef void (CDECL *MonoPrintCallback) (const char *string, INT is_stdout); +typedef enum { + MONO_AOT_MODE_NONE, + MONO_AOT_MODE_NORMAL, + MONO_AOT_MODE_HYBRID, + MONO_AOT_MODE_FULL, + MONO_AOT_MODE_LLVMONLY, + MONO_AOT_MODE_INTERP, + MONO_AOT_MODE_INTERP_LLVMONLY, + MONO_AOT_MODE_LLVMONLY_INTERP, + MONO_AOT_MODE_INTERP_ONLY +} MonoAotMode; + extern BOOL is_mono_started DECLSPEC_HIDDEN; extern MonoImage* (CDECL *mono_assembly_get_image)(MonoAssembly *assembly) DECLSPEC_HIDDEN;

3 years, 2 months

Alexandre Julliard : ntdll: Store the locales in Wine-specific environment variables.

by Alexandre Julliard

Module: wine Branch: master Commit: ff6a3433c5cc8991b6716c502ad9c69d495bf07f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff6a3433c5cc8991b6716c50… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Feb 28 11:30:37 2021 +0100 ntdll: Store the locales in Wine-specific environment variables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 43 ++++++++++++++++++++++++++++++++++++------ dlls/ntdll/locale.c | 36 ----------------------------------- dlls/ntdll/unix/env.c | 19 ++++++------------- dlls/ntdll/unix/loader.c | 1 - dlls/ntdll/unix/unix_private.h | 1 - dlls/ntdll/unixlib.h | 5 +---- 6 files changed, 44 insertions(+), 61 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index ac473ccd63a..b746feca639 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -696,6 +696,27 @@ done: } +static LCID locale_to_lcid( WCHAR *win_name ) +{ + WCHAR *p; + LCID lcid; + + if (!RtlLocaleNameToLcid( win_name, &lcid, 0 )) return lcid; + + /* try neutral name */ + if ((p = wcsrchr( win_name, '-' ))) + { + *p = 0; + if (!RtlLocaleNameToLcid( win_name, &lcid, 2 )) + { + if (SUBLANGID(lcid) == SUBLANG_NEUTRAL) + lcid = MAKELANGID( PRIMARYLANGID(lcid), SUBLANG_DEFAULT ); + return lcid; + } + } + return 0; +} + /*********************************************************************** * init_locale */ @@ -704,8 +725,8 @@ void init_locale(void) UINT ansi_cp = 0, oem_cp = 0; USHORT *ansi_ptr, *oem_ptr; void *sort_ptr; - LCID lcid = GetUserDefaultLCID(); - WCHAR bufferW[80]; + LCID user_lcid = 0, system_lcid = 0; + WCHAR bufferW[LOCALE_NAME_MAX_LENGTH]; DYNAMIC_TIME_ZONE_INFORMATION timezone; GEOID geoid = GEOID_NOT_AVAILABLE; DWORD count, dispos, i; @@ -714,6 +735,16 @@ void init_locale(void) if (GetEnvironmentVariableW( L"WINEUNIXCP", bufferW, ARRAY_SIZE(bufferW) )) unix_cp = wcstoul( bufferW, NULL, 10 ); + if (GetEnvironmentVariableW( L"WINELOCALE", bufferW, ARRAY_SIZE(bufferW) )) + system_lcid = locale_to_lcid( bufferW ); + if (GetEnvironmentVariableW( L"WINEUSERLOCALE", bufferW, ARRAY_SIZE(bufferW) )) + user_lcid = locale_to_lcid( bufferW ); + if (!system_lcid) system_lcid = MAKELCID( MAKELANGID(LANG_ENGLISH,SUBLANG_DEFAULT), SORT_DEFAULT ); + if (!user_lcid) user_lcid = system_lcid; + + NtSetDefaultUILanguage( LANGIDFROMLCID(user_lcid) ); + NtSetDefaultLocale( TRUE, user_lcid ); + NtSetDefaultLocale( FALSE, system_lcid ); kernel32_handle = GetModuleHandleW( L"kernel32.dll" ); @@ -775,11 +806,11 @@ void init_locale(void) count = sizeof(bufferW); if (!RegQueryValueExW( intl_key, L"Locale", NULL, NULL, (BYTE *)bufferW, &count )) { - if (wcstoul( bufferW, NULL, 16 ) == lcid) return; /* already set correctly */ - TRACE( "updating registry, locale changed %s -> %08x\n", debugstr_w(bufferW), lcid ); + if (wcstoul( bufferW, NULL, 16 ) == user_lcid) return; /* already set correctly */ + TRACE( "updating registry, locale changed %s -> %08x\n", debugstr_w(bufferW), user_lcid ); } - else TRACE( "updating registry, locale changed none -> %08x\n", lcid ); - swprintf( bufferW, ARRAY_SIZE(bufferW), L"%08x", lcid ); + else TRACE( "updating registry, locale changed none -> %08x\n", user_lcid ); + swprintf( bufferW, ARRAY_SIZE(bufferW), L"%08x", user_lcid ); RegSetValueExW( intl_key, L"Locale", 0, REG_SZ, (BYTE *)bufferW, (lstrlenW(bufferW) + 1) * sizeof(WCHAR) ); diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 758789a533c..19626a48b72 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -533,48 +533,12 @@ static unsigned int compose_string( const struct norm_table *info, WCHAR *str, u } -static LCID locale_to_lcid( WCHAR *win_name ) -{ - WCHAR *p; - LCID lcid; - - if (!RtlLocaleNameToLcid( win_name, &lcid, 0 )) return lcid; - - /* try neutral name */ - if ((p = wcsrchr( win_name, '-' ))) - { - *p = 0; - if (!RtlLocaleNameToLcid( win_name, &lcid, 2 )) - { - if (SUBLANGID(lcid) == SUBLANG_NEUTRAL) - lcid = MAKELANGID( PRIMARYLANGID(lcid), SUBLANG_DEFAULT ); - return lcid; - } - } - return 0; -} - - /****************************************************************** * init_locale */ void init_locale( HMODULE module ) { - WCHAR system_locale[LOCALE_NAME_MAX_LENGTH]; - WCHAR user_locale[LOCALE_NAME_MAX_LENGTH]; - kernel32_handle = module; - - unix_funcs->get_locales( system_locale, user_locale ); - system_lcid = locale_to_lcid( system_locale ); - user_lcid = locale_to_lcid( user_locale ); - if (!system_lcid) system_lcid = MAKELCID( MAKELANGID(LANG_ENGLISH,SUBLANG_DEFAULT), SORT_DEFAULT ); - if (!user_lcid) user_lcid = system_lcid; - - NtSetDefaultUILanguage( LANGIDFROMLCID(user_lcid) ); - NtSetDefaultLocale( TRUE, user_lcid ); - NtSetDefaultLocale( FALSE, system_lcid ); - TRACE( "system=%04x user=%04x\n", system_lcid, user_lcid ); } diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 84d5ab298a4..cca334865e4 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -545,6 +545,8 @@ static BOOL is_dynamic_env_var( const char *var ) STARTS_WITH( var, "WINECONFIGDIR=" ) || STARTS_WITH( var, "WINEDLLDIR" ) || STARTS_WITH( var, "WINEUNIXCP=" ) || + STARTS_WITH( var, "WINELOCALE=" ) || + STARTS_WITH( var, "WINEUSERLOCALE=" ) || STARTS_WITH( var, "WINEUSERNAME=" ) || STARTS_WITH( var, "WINEPRELOADRESERVE=" ) || STARTS_WITH( var, "WINELOADERNOEXEC=" ) || @@ -1197,13 +1199,14 @@ static WCHAR *get_dynamic_environment( SIZE_T *size ) DWORD i; char str[22]; - alloc = 20 * 8; /* 8 variable names */ + alloc = 20 * 10; /* 10 variable names */ if (data_dir) alloc += strlen( data_dir ) + 9; if (home_dir) alloc += strlen( home_dir ) + 9; if (build_dir) alloc += strlen( build_dir ) + 9; if (config_dir) alloc += strlen( config_dir ) + 9; if (user_name) alloc += strlen( user_name ); if (overrides) alloc += strlen( overrides ); + alloc += strlen(system_locale) + strlen(user_locale); for (i = 0; dll_paths[i]; i++) alloc += 20 + strlen( dll_paths[i] ) + 9; if (!(buffer = malloc( alloc * sizeof(WCHAR) ))) return NULL; @@ -1223,6 +1226,8 @@ static WCHAR *get_dynamic_environment( SIZE_T *size ) sprintf( str, "%u", unix_cp.data[1] ); append_envA( buffer, &pos, "WINEUNIXCP", str ); } + append_envA( buffer, &pos, "WINELOCALE", system_locale ); + if (strcmp( user_locale, system_locale )) append_envA( buffer, &pos, "WINEUSERLOCALE", user_locale ); assert( pos <= alloc ); *size = pos * sizeof(WCHAR); return buffer; @@ -1355,18 +1360,6 @@ static void get_initial_directory( UNICODE_STRING *dir ) } -/************************************************************************* - * get_locales - * - * Return the system and user locales. Buffers must be at least LOCALE_NAME_MAX_LENGTH chars long. - */ -void CDECL get_locales( WCHAR *sys, WCHAR *user ) -{ - ntdll_umbstowcs( system_locale, strlen(system_locale) + 1, sys, LOCALE_NAME_MAX_LENGTH ); - ntdll_umbstowcs( user_locale, strlen(user_locale) + 1, user, LOCALE_NAME_MAX_LENGTH ); -} - - /*********************************************************************** * build_command_line * diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 21e1e1893c0..b7e1432535d 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1715,7 +1715,6 @@ static struct unix_funcs unix_funcs = ntdll_sin, ntdll_sqrt, ntdll_tan, - get_locales, virtual_release_address_space, load_so_dll, load_builtin_dll, diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index d56fc9b0f19..031f9ed3d33 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -100,7 +100,6 @@ extern LONGLONG CDECL fast_RtlGetSystemTimePrecise(void) DECLSPEC_HIDDEN; extern NTSTATUS CDECL fast_wait_cv( RTL_CONDITION_VARIABLE *variable, const void *value, const LARGE_INTEGER *timeout ) DECLSPEC_HIDDEN; -extern void CDECL get_locales( WCHAR *sys, WCHAR *user ) DECLSPEC_HIDDEN; extern void CDECL virtual_release_address_space(void) DECLSPEC_HIDDEN; extern NTSTATUS CDECL unwind_builtin_dll( ULONG type, struct _DISPATCHER_CONTEXT *dispatch, diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 6a7f008ed9c..290379a9310 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -26,7 +26,7 @@ struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 114 +#define NTDLL_UNIXLIB_VERSION 115 struct unix_funcs { @@ -69,9 +69,6 @@ struct unix_funcs double (CDECL *sqrt)( double d ); double (CDECL *tan)( double d ); - /* environment functions */ - void (CDECL *get_locales)( WCHAR *sys, WCHAR *user ); - /* virtual memory functions */ void (CDECL *virtual_release_address_space)(void);

3 years, 2 months

Alexandre Julliard : ntdll: Remove no longer needed Unix codepage functions from the PE side.

by Alexandre Julliard

Module: wine Branch: master Commit: 65cff869513f8f66655b602ab2bc62e1c3b69c51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65cff869513f8f66655b602a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Feb 28 11:29:46 2021 +0100 ntdll: Remove no longer needed Unix codepage functions from the PE side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 1 - dlls/ntdll/locale.c | 74 ------------------------------------------ dlls/ntdll/ntdll_misc.h | 3 -- dlls/ntdll/unix/env.c | 11 ------- dlls/ntdll/unix/loader.c | 1 - dlls/ntdll/unix/unix_private.h | 1 - dlls/ntdll/unixlib.h | 3 +- 7 files changed, 1 insertion(+), 93 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index c21c62c10b0..2a6b8467812 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3968,7 +3968,6 @@ static NTSTATUS process_init(void) is_wow64 = !!NtCurrentTeb64(); #endif - init_unix_codepage(); init_user_process_params(); params = peb->ProcessParameters; diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 892f3fe9e70..758789a533c 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -104,7 +104,6 @@ LCID user_lcid = 0, system_lcid = 0; static NLSTABLEINFO nls_info; static HMODULE kernel32_handle; -static CPTABLEINFO unix_table; static struct norm_table *norm_tables[16]; @@ -534,13 +533,6 @@ static unsigned int compose_string( const struct norm_table *info, WCHAR *str, u } -void init_unix_codepage(void) -{ - USHORT *data = unix_funcs->get_unix_codepage_data(); - if (data) RtlInitCodePageTable( data, &unix_table ); -} - - static LCID locale_to_lcid( WCHAR *win_name ) { WCHAR *p; @@ -586,72 +578,6 @@ void init_locale( HMODULE module ) } -/****************************************************************** - * ntdll_umbstowcs - */ -DWORD ntdll_umbstowcs( const char *src, DWORD srclen, WCHAR *dst, DWORD dstlen ) -{ - DWORD reslen; - - if (unix_table.CodePage) - RtlCustomCPToUnicodeN( &unix_table, dst, dstlen * sizeof(WCHAR), &reslen, src, srclen ); - else - RtlUTF8ToUnicodeN( dst, dstlen * sizeof(WCHAR), &reslen, src, srclen ); - return reslen / sizeof(WCHAR); -} - - -/****************************************************************** - * ntdll_wcstoumbs - */ -int ntdll_wcstoumbs( const WCHAR *src, DWORD srclen, char *dst, DWORD dstlen, BOOL strict ) -{ - DWORD i, reslen; - - if (!unix_table.CodePage) - RtlUnicodeToUTF8N( dst, dstlen, &reslen, src, srclen * sizeof(WCHAR) ); - else if (!strict) - RtlUnicodeToCustomCPN( &unix_table, dst, dstlen, &reslen, src, srclen * sizeof(WCHAR) ); - else /* do it by hand to make sure every character roundtrips correctly */ - { - if (unix_table.DBCSOffsets) - { - const unsigned short *uni2cp = unix_table.WideCharTable; - for (i = dstlen; srclen && i; i--, srclen--, src++) - { - unsigned short ch = uni2cp[*src]; - if (ch >> 8) - { - if (unix_table.DBCSOffsets[unix_table.DBCSOffsets[ch >> 8] + (ch & 0xff)] != *src) - return -1; - if (i == 1) break; /* do not output a partial char */ - i--; - *dst++ = ch >> 8; - } - else - { - if (unix_table.MultiByteTable[ch] != *src) return -1; - *dst++ = (char)ch; - } - } - reslen = dstlen - i; - } - else - { - const unsigned char *uni2cp = unix_table.WideCharTable; - reslen = min( srclen, dstlen ); - for (i = 0; i < reslen; i++) - { - unsigned char ch = uni2cp[src[i]]; - if (unix_table.MultiByteTable[ch] != src[i]) return -1; - dst[i] = ch; - } - } - } - return reslen; -} - - 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 aebea12e6ba..72340a171c9 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_unix_codepage(void) 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; @@ -88,8 +87,6 @@ extern struct _KUSER_SHARED_DATA *user_shared_data DECLSPEC_HIDDEN; /* locale */ extern LCID user_lcid, system_lcid; -extern DWORD ntdll_umbstowcs( const char* src, DWORD srclen, WCHAR* dst, DWORD dstlen ) DECLSPEC_HIDDEN; -extern int ntdll_wcstoumbs( const WCHAR* src, DWORD srclen, char* dst, DWORD dstlen, BOOL strict ) DECLSPEC_HIDDEN; extern int CDECL NTDLL__vsnprintf( char *str, SIZE_T len, const char *format, __ms_va_list args ) DECLSPEC_HIDDEN; extern int CDECL NTDLL__vsnwprintf( WCHAR *str, SIZE_T len, const WCHAR *format, __ms_va_list args ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index a8f490e8740..84d5ab298a4 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1355,17 +1355,6 @@ static void get_initial_directory( UNICODE_STRING *dir ) } -/************************************************************************* - * get_unix_codepage_data - * - * Return the Unix codepage data. - */ -USHORT * CDECL get_unix_codepage_data(void) -{ - return unix_cp.data; -} - - /************************************************************************* * get_locales * diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index df8d99ce489..21e1e1893c0 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1715,7 +1715,6 @@ static struct unix_funcs unix_funcs = ntdll_sin, ntdll_sqrt, ntdll_tan, - get_unix_codepage_data, get_locales, virtual_release_address_space, load_so_dll, diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 529cb6edb69..d56fc9b0f19 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -100,7 +100,6 @@ extern LONGLONG CDECL fast_RtlGetSystemTimePrecise(void) DECLSPEC_HIDDEN; extern NTSTATUS CDECL fast_wait_cv( RTL_CONDITION_VARIABLE *variable, const void *value, const LARGE_INTEGER *timeout ) DECLSPEC_HIDDEN; -extern USHORT * CDECL get_unix_codepage_data(void) DECLSPEC_HIDDEN; extern void CDECL get_locales( WCHAR *sys, WCHAR *user ) DECLSPEC_HIDDEN; extern void CDECL virtual_release_address_space(void) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index bd2512030c2..6a7f008ed9c 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -26,7 +26,7 @@ struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 113 +#define NTDLL_UNIXLIB_VERSION 114 struct unix_funcs { @@ -70,7 +70,6 @@ struct unix_funcs double (CDECL *tan)( double d ); /* environment functions */ - USHORT * (CDECL *get_unix_codepage_data)(void); void (CDECL *get_locales)( WCHAR *sys, WCHAR *user ); /* virtual memory functions */

3 years, 2 months

Alexandre Julliard : ntdll: Check for existing Unix path name in RtlGetFullPathName_U().

by Alexandre Julliard

Module: wine Branch: master Commit: 45bfa4eec3f52a00f4a92b1d533d5fe39edeec3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=45bfa4eec3f52a00f4a92b1d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Feb 28 11:29:17 2021 +0100 ntdll: Check for existing Unix path name in RtlGetFullPathName_U(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/path.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index 86760f178e1..9d707d883b2 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -543,16 +543,18 @@ static ULONG get_full_path_helper(LPCWSTR name, LPWSTR buffer, ULONG size) WCHAR *nt_str; SIZE_T buflen; NTSTATUS status; - - unix_name = RtlAllocateHeap( GetProcessHeap(), 0, 3 * wcslen(name) + 1 ); - ntdll_wcstoumbs( name, wcslen(name) + 1, unix_name, 3 * wcslen(name) + 1, FALSE ); - buflen = strlen(unix_name) + 10; - for (;;) + UNICODE_STRING str; + + nt_str = RtlAllocateHeap( GetProcessHeap(), 0, (wcslen(name) + 9) * sizeof(WCHAR) ); + wcscpy( nt_str, L"\\??\\unix" ); + wcscat( nt_str, name ); + RtlInitUnicodeString( &str, nt_str ); + buflen = 3 * wcslen(name) + 1; + unix_name = RtlAllocateHeap( GetProcessHeap(), 0, buflen ); + if (!(status = wine_nt_to_unix_file_name( &str, unix_name, &buflen, FILE_OPEN ))) { - if (!(nt_str = RtlAllocateHeap( GetProcessHeap(), 0, buflen * sizeof(WCHAR) ))) break; + buflen = wcslen(name) + 9; status = wine_unix_to_nt_file_name( unix_name, nt_str, &buflen ); - if (status != STATUS_BUFFER_TOO_SMALL) break; - RtlFreeHeap( GetProcessHeap(), 0, nt_str ); } RtlFreeHeap( GetProcessHeap(), 0, unix_name ); if (!status && buflen > 6 && nt_str[5] == ':')

3 years, 2 months

Alexandre Julliard : ntdll: Store the Unix codepage in a Wine-specific environment variable.

by Alexandre Julliard

Module: wine Branch: master Commit: 0d173e5710c71d90b1228857bfe4b89672d9d911 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d173e5710c71d90b1228857… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Feb 28 11:22:41 2021 +0100 ntdll: Store the Unix codepage in a Wine-specific environment variable. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 14 ++++++++------ dlls/ntdll/locale.c | 10 ---------- dlls/ntdll/ntdll.spec | 3 --- dlls/ntdll/unix/env.c | 14 ++++++++++---- 4 files changed, 18 insertions(+), 23 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index d2f71c97ac7..ac473ccd63a 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -42,8 +42,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(nls); #define CALINFO_MAX_YEAR 2029 -extern UINT CDECL __wine_get_unix_codepage(void); - extern const unsigned int collation_table[] DECLSPEC_HIDDEN; static HANDLE kernel32_handle; @@ -568,6 +566,7 @@ struct norm_table }; static NLSTABLEINFO nls_info; +static UINT unix_cp = CP_UTF8; static UINT mac_cp = 10000; static HKEY intl_key; static HKEY nls_key; @@ -713,6 +712,9 @@ void init_locale(void) SIZE_T size; HKEY hkey; + if (GetEnvironmentVariableW( L"WINEUNIXCP", bufferW, ARRAY_SIZE(bufferW) )) + unix_cp = wcstoul( bufferW, NULL, 10 ); + kernel32_handle = GetModuleHandleW( L"kernel32.dll" ); GetLocaleInfoW( LOCALE_SYSTEM_DEFAULT, LOCALE_IDEFAULTANSICODEPAGE | LOCALE_RETURN_NUMBER, @@ -5532,8 +5534,7 @@ INT WINAPI DECLSPEC_HOTPATCH MultiByteToWideChar( UINT codepage, DWORD flags, co ret = mbstowcs_utf8( flags, src, srclen, dst, dstlen ); break; case CP_UNIXCP: - codepage = __wine_get_unix_codepage(); - if (codepage == CP_UTF8) + if (unix_cp == CP_UTF8) { ret = mbstowcs_utf8( flags, src, srclen, dst, dstlen ); #ifdef __APPLE__ /* work around broken Mac OS X filesystem that enforces decomposed Unicode */ @@ -5541,6 +5542,7 @@ INT WINAPI DECLSPEC_HOTPATCH MultiByteToWideChar( UINT codepage, DWORD flags, co #endif break; } + codepage = unix_cp; /* fall through */ default: ret = mbstowcs_codepage( codepage, flags, src, srclen, dst, dstlen ); @@ -5829,13 +5831,13 @@ INT WINAPI DECLSPEC_HOTPATCH WideCharToMultiByte( UINT codepage, DWORD flags, LP ret = wcstombs_utf8( flags, src, srclen, dst, dstlen, defchar, used ); break; case CP_UNIXCP: - codepage = __wine_get_unix_codepage(); - if (codepage == CP_UTF8) + if (unix_cp == CP_UTF8) { if (used) *used = FALSE; ret = wcstombs_utf8( flags, src, srclen, dst, dstlen, NULL, NULL ); break; } + codepage = unix_cp; /* fall through */ default: ret = wcstombs_codepage( codepage, flags, src, srclen, dst, dstlen, defchar, used ); diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index e4d90a8b1d5..892f3fe9e70 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -652,16 +652,6 @@ int ntdll_wcstoumbs( const WCHAR *src, DWORD srclen, char *dst, DWORD dstlen, BO } -/****************************************************************** - * __wine_get_unix_codepage (NTDLL.@) - */ -UINT CDECL __wine_get_unix_codepage(void) -{ - if (!unix_table.CodePage) return CP_UTF8; - return unix_table.CodePage; -} - - static NTSTATUS get_dummy_preferred_ui_language( DWORD flags, LANGID lang, ULONG *count, WCHAR *buffer, ULONG *size ) { diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 185dd6767eb..78f06881832 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1625,9 +1625,6 @@ @ cdecl -syscall wine_get_build_id() @ cdecl -syscall wine_get_host_version(ptr ptr) -# Codepages -@ cdecl __wine_get_unix_codepage() - # Filesystem @ cdecl -syscall wine_nt_to_unix_file_name(ptr ptr ptr long) @ cdecl -syscall wine_unix_to_nt_file_name(str ptr ptr) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 845abd69a79..a8f490e8740 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -544,6 +544,7 @@ static BOOL is_dynamic_env_var( const char *var ) STARTS_WITH( var, "WINEBUILDDIR=" ) || STARTS_WITH( var, "WINECONFIGDIR=" ) || STARTS_WITH( var, "WINEDLLDIR" ) || + STARTS_WITH( var, "WINEUNIXCP=" ) || STARTS_WITH( var, "WINEUSERNAME=" ) || STARTS_WITH( var, "WINEPRELOADRESERVE=" ) || STARTS_WITH( var, "WINELOADERNOEXEC=" ) || @@ -1194,9 +1195,9 @@ static WCHAR *get_dynamic_environment( SIZE_T *size ) SIZE_T alloc, pos = 0; WCHAR *buffer; DWORD i; - char dlldir[22]; + char str[22]; - alloc = 20 * 7; /* 7 variable names */ + alloc = 20 * 8; /* 8 variable names */ if (data_dir) alloc += strlen( data_dir ) + 9; if (home_dir) alloc += strlen( home_dir ) + 9; if (build_dir) alloc += strlen( build_dir ) + 9; @@ -1212,11 +1213,16 @@ static WCHAR *get_dynamic_environment( SIZE_T *size ) if (config_dir) add_path_var( buffer, &pos, "WINECONFIGDIR", config_dir ); for (i = 0; dll_paths[i]; i++) { - sprintf( dlldir, "WINEDLLDIR%u", i ); - add_path_var( buffer, &pos, dlldir, dll_paths[i] ); + sprintf( str, "WINEDLLDIR%u", i ); + add_path_var( buffer, &pos, str, dll_paths[i] ); } if (user_name) append_envA( buffer, &pos, "WINEUSERNAME", user_name ); if (overrides) append_envA( buffer, &pos, "WINEDLLOVERRIDES", overrides ); + if (unix_cp.data) + { + sprintf( str, "%u", unix_cp.data[1] ); + append_envA( buffer, &pos, "WINEUNIXCP", str ); + } assert( pos <= alloc ); *size = pos * sizeof(WCHAR); return buffer;

3 years, 2 months

Alexandre Julliard : ntdll: Adjust environment size for dynamic strings.

by Alexandre Julliard

Module: wine Branch: master Commit: 5828d7c136cf4c22e1f999929f9e97c91c555123 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5828d7c136cf4c22e1f99992… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 27 17:42:26 2021 +0100 ntdll: Adjust environment size for dynamic strings. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50732 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index f5979a980ea..845abd69a79 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1591,7 +1591,6 @@ void init_startup_info(void) params->AllocationSize = size; params->Size = size; params->Flags = PROCESS_PARAMS_FLAG_NORMALIZED; - params->EnvironmentSize = env_size; params->DebugFlags = info->debug_flags; params->ConsoleHandle = wine_server_ptr_handle( info->console ); params->ConsoleFlags = info->console_flags; @@ -1637,7 +1636,8 @@ void init_startup_info(void) dst += copy_environment( dst, src ); memcpy( dst, dyn_env, dyn_size ); dst += dyn_size / sizeof(WCHAR); - *dst = 0; + *dst++ = 0; + params->EnvironmentSize = (dst - params->Environment) * sizeof(WCHAR); free( dyn_env ); free( info ); NtCurrentTeb()->Peb->ProcessParameters = params;

3 years, 2 months

Alexandre Julliard : ntdll: Pass correct pointer to build_module().

by Alexandre Julliard

Module: wine Branch: master Commit: 1e2b060eb15fa5216e9745cf48eb986a7721df61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e2b060eb15fa5216e9745cf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 27 17:41:27 2021 +0100 ntdll: Pass correct pointer to build_module(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50731 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 644eee1e9d7..c21c62c10b0 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2325,7 +2325,7 @@ static NTSTATUS load_so_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name, SECTION_IMAGE_INFORMATION image_info = { 0 }; image_info.u.s.WineBuiltin = 1; - if ((status = build_module( load_path, &win_name, &module, &image_info, NULL, flags, pwm ))) + if ((status = build_module( load_path, &win_name, &module, &image_info, NULL, flags, &wm ))) { if (module) unix_funcs->unload_builtin_dll( module ); return status;

3 years, 2 months

Henri Verbeet : vkd3d-shader: Keep track of declared SPIR-V output components.

by Alexandre Julliard

Module: vkd3d Branch: master Commit: 6d032f6d1c1269d8e622f2d30975537246a2f92b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6d032f6d1c1269d8e622f2d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 26 15:14:53 2021 +0100 vkd3d-shader: Keep track of declared SPIR-V output components. Much like we do for input components, for much of the same reasons. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 93 +++++++++++++++++++---------------------------- 1 file changed, 37 insertions(+), 56 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 1448d3b..a7361aa 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4657,6 +4657,7 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler enum vkd3d_shader_component_type component_type; const struct vkd3d_spirv_builtin *builtin; const struct vkd3d_shader_phase *phase; + struct vkd3d_symbol *symbol = NULL; struct vkd3d_symbol reg_symbol; SpvStorageClass storage_class; struct rb_entry *entry = NULL; @@ -4692,6 +4693,7 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler component_type = builtin->component_type; if (!builtin->spirv_array_size) output_component_count = builtin->component_count; + component_idx = 0; } else { @@ -4717,23 +4719,24 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler vkd3d_symbol_make_register(&reg_symbol, reg); - if (compiler->output_info[signature_idx].id) - { - id = compiler->output_info[signature_idx].id; - if (compiler->output_info[signature_idx].array_element_mask) - { - use_private_variable = true; - write_mask = VKD3DSP_WRITEMASK_ALL; - entry = rb_get(&compiler->symbol_table, &reg_symbol); - } - } - else if (!use_private_variable && (entry = rb_get(&compiler->symbol_table, &reg_symbol))) + if ((entry = rb_get(&compiler->symbol_table, &reg_symbol))) { - id = RB_ENTRY_VALUE(entry, const struct vkd3d_symbol, entry)->id; + symbol = RB_ENTRY_VALUE(entry, struct vkd3d_symbol, entry); + id = symbol->id; } - else + + if (!symbol || ~symbol->info.reg.dcl_mask & signature_element->mask) { - if (builtin) + if (compiler->output_info[signature_idx].id) + { + id = compiler->output_info[signature_idx].id; + if (compiler->output_info[signature_idx].array_element_mask) + { + use_private_variable = true; + write_mask = VKD3DSP_WRITEMASK_ALL; + } + } + else if (builtin) { if (phase) id = vkd3d_dxbc_compiler_emit_shader_phase_builtin_variable(compiler, phase, builtin); @@ -4745,9 +4748,6 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler calculate_sysval_array_mask(compiler, shader_signature, sysval); vkd3d_dxbc_compiler_emit_register_execution_mode(compiler, &dst->reg); - - if (component_idx) - FIXME("Unhandled component index %u.\n", component_idx); } else { @@ -4778,25 +4778,22 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler vkd3d_spirv_build_op_decorate(builder, id, SpvDecorationPatch, NULL, 0); vkd3d_dxbc_compiler_decorate_xfb_output(compiler, id, output_component_count, signature_element); - } - - compiler->output_info[signature_idx].id = id; - compiler->output_info[signature_idx].component_type = component_type; - if (use_private_variable) - storage_class = SpvStorageClassPrivate; + compiler->output_info[signature_idx].id = id; + compiler->output_info[signature_idx].component_type = component_type; + } - if (entry) - var_id = RB_ENTRY_VALUE(entry, const struct vkd3d_symbol, entry)->id; - else if (!use_private_variable) - var_id = id; - else if (is_patch_constant) - var_id = compiler->hs.patch_constants_id; - else - var_id = vkd3d_dxbc_compiler_emit_variable(compiler, &builder->global_stream, - storage_class, VKD3D_SHADER_COMPONENT_FLOAT, VKD3D_VEC4_SIZE); - if (!entry) + if (!symbol) { + var_id = id; + if (use_private_variable) + storage_class = SpvStorageClassPrivate; + if (is_patch_constant) + var_id = compiler->hs.patch_constants_id; + else if (use_private_variable) + var_id = vkd3d_dxbc_compiler_emit_variable(compiler, &builder->global_stream, + storage_class, VKD3D_SHADER_COMPONENT_FLOAT, VKD3D_VEC4_SIZE); + vkd3d_symbol_set_register_info(&reg_symbol, var_id, storage_class, use_private_variable ? VKD3D_SHADER_COMPONENT_FLOAT : component_type, write_mask); reg_symbol.info.reg.is_aggregate = use_private_variable ? is_patch_constant : array_size; @@ -4816,6 +4813,11 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler if (!is_patch_constant) vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); } + else + { + symbol->info.reg.dcl_mask |= signature_element->mask; + var_id = symbol->id; + } if (use_private_variable) { @@ -6100,33 +6102,12 @@ static void vkd3d_dxbc_compiler_leave_shader_phase(struct vkd3d_dxbc_compiler *c } } - if (phase->type == VKD3DSIH_HS_FORK_PHASE || phase->type == VKD3DSIH_HS_JOIN_PHASE) - { - signature = compiler->patch_constant_signature; - - memset(&reg, 0, sizeof(reg)); - reg.idx[1].offset = ~0u; - - for (i = 0; i < signature->element_count; ++i) - { - const struct vkd3d_shader_signature_element *e = &signature->elements[i]; - - reg.type = VKD3DSPR_OUTPUT; - reg.idx[0].offset = e->register_index; - vkd3d_symbol_make_register(&reg_symbol, &reg); - - if ((entry = rb_get(&compiler->symbol_table, &reg_symbol))) - { - rb_remove(&compiler->symbol_table, entry); - vkd3d_symbol_free(entry, NULL); - } - } - } - if (phase->instance_count) { + memset(&reg, 0, sizeof(reg)); reg.type = phase->type == VKD3DSIH_HS_FORK_PHASE ? VKD3DSPR_FORKINSTID : VKD3DSPR_JOININSTID; reg.idx[0].offset = ~0u; + reg.idx[1].offset = ~0u; vkd3d_symbol_make_register(&reg_symbol, &reg); if ((entry = rb_get(&compiler->symbol_table, &reg_symbol))) {

3 years, 2 months

Francois Gouget : testbot/LibvirtTool: Allow cleanly powering off VMs.

by Alexandre Julliard

Module: tools Branch: master Commit: 9fcde072a9be44154fecd49cdbe36430810e5c7a URL: https://source.winehq.org/git/tools.git/?a=commit;h=9fcde072a9be44154fecd49… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 1 16:28:07 2021 +0100 testbot/LibvirtTool: Allow cleanly powering off VMs. If a snapshot has the '-off' suffix, try cleanly powering of the VM after running the tests. This may avoid perma-crashing the GPU when using PCI-passthrough. Forcefully power of the VM as usual if it does not cleanly shuts down within $WaitForShutdown seconds. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 50 +++++++++++++++++++++++++++++++++++++-- testbot/lib/WineTestBot/Config.pm | 9 ++++--- 2 files changed, 54 insertions(+), 5 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index a2939e7..59adf2f 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -323,9 +323,55 @@ sub Monitor() sub PowerOff() { - # Power off VMs no matter what their initial status is + my $Domain = $VM->GetDomain(); + if ($VM->IdleSnapshot =~ /-off$/ and $Domain->IsPoweredOn()) + { + # Attempt to perform a clean shutdown. + # Use SetTime() to detect if privileged operations are allowed. + my $TA = $VM->GetAgent(); + if (!$TA->SetTime()) + { + # Not a fatal error. Try the next port in case the VM runs a privileged + # TestAgentd daemon there. + $TA->Disconnect(); + $TA = $VM->GetAgent(1); + if (!$TA->SetTime()) + { + Error "Unable to get a privileged TestAgent: ". $TA->GetLastError() ."\n"; + $TA->Disconnect(); + $TA = undef; + } + } + if ($TA) + { + my $Cmd = $VM->Type =~ /^win(?:32|64)$/ ? + ["shutdown.exe", "/p", "/d", "00:00"] : + ["/sbin/shutdown", "--poweroff", "now"]; + Debug(Elapsed($Start), " Running @$Cmd\n"); + if (!$TA->Run($Cmd, 0)) + { + Error "Could not run @$Cmd: ". $TA->GetLastError() ."\n"; + } + else + { + Debug(Elapsed($Start), " Waiting for the VM to power off\n"); + my $Deadline = time() + $WaitForShutdown; + while ($Domain->IsPoweredOn()) + { + if (time() >= $Deadline) + { + Error "Timed out waiting for ". $VM->Name ." to perform a clean shutdown. Forcefully shutting down now...\n"; + last; + } + sleep(1); + } + } + } + } + + # Power off the VM no matter what its initial status is $CurrentStatus = $VM->Status; - my $ErrMessage = $VM->GetDomain()->PowerOff(); + my $ErrMessage = $Domain->PowerOff(); FatalError("$ErrMessage\n") if (defined $ErrMessage); return ChangeStatus(undef, "off", "done"); diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index 252c63c..fe4a27c 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -29,7 +29,8 @@ use vars qw (@ISA @EXPORT @EXPORT_OK $UseSSL $LogDir $DataDir $BinDir %RepoURLs $DbDataSource $DbUsername $DbPassword $MaxRevertingVMs $MaxRevertsWhileRunningVMs $MaxActiveVMs $MaxRunningVMs $MaxVMsWhenIdle $WaitForBoot $SleepAfterBoot $SleepAfterRevert - $VMToolTimeout $MaxVMErrors $MaxTaskTries $AdminEMail $RobotEMail + $VMToolTimeout $WaitForShutdown $MaxVMErrors $MaxTaskTries + $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc $ReconfigBuildTimeout $ExeBuildTimeout $ExeModuleTimeout $WineBuildTimeout $WineModuleTimeout $TimeoutMargin @@ -45,8 +46,8 @@ require Exporter; @EXPORT = qw($UseSSL $LogDir $DataDir $BinDir %RepoURLs $MaxRevertingVMs $MaxRevertsWhileRunningVMs $MaxActiveVMs $MaxRunningVMs $MaxVMsWhenIdle $WaitForBoot $SleepAfterBoot - $SleepAfterRevert - $VMToolTimeout $MaxVMErrors $MaxTaskTries $AdminEMail + $SleepAfterRevert $VMToolTimeout $WaitForShutdown + $MaxVMErrors $MaxTaskTries $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc $SuiteTimeout $ReconfigBuildTimeout $ExeBuildTimeout $ExeModuleTimeout $WineBuildTimeout $WineModuleTimeout $TimeoutMargin @@ -101,6 +102,8 @@ $SleepAfterRevert = 0; # How long to wait before considering a VM operation is stuck. In particular # for reverts this should take into account the time it may need to boot. $VMToolTimeout = 6 * 60; +# How long to wait for the VM to perform a clean shutdown. +$WaitForShutdown = 30; # Notify the administrator that a VM probably needs manual fixing after # $MaxVMErrors consecutive revert errors.

3 years, 2 months

Jump to page:

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