wine-commits September 2021

wine-commits@winehq.org

2 participants
1030 discussions

Jacek Caban : gdi32: Directly use ntdll in init_font_options.
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: 1cdc74b2d62d1c94005c46f9c8f4b566aa8bdcbd URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cdc74b2d62d1c94005c46f9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 27 13:08:46 2021 +0200 gdi32: Directly use ntdll in init_font_options. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 61 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 26 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index f81af591e33..5fefa1ea01e 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -4137,37 +4137,42 @@ const struct gdi_dc_funcs font_driver = GDI_PRIORITY_FONT_DRV /* priority */ }; -static DWORD get_key_value( HKEY key, const WCHAR *name, DWORD *value ) +static BOOL get_key_value( HKEY key, const char *name, DWORD *value ) { - WCHAR buf[12]; - DWORD count = sizeof(buf), type, err; + char value_buffer[FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[12 * sizeof(WCHAR)])]; + KEY_VALUE_PARTIAL_INFORMATION *info = (void *)value_buffer; + DWORD count; - err = RegQueryValueExW( key, name, NULL, &type, (BYTE *)buf, &count ); - if (!err) + count = query_reg_ascii_value( key, name, info, sizeof(value_buffer) ); + if (count) { - if (type == REG_DWORD) memcpy( value, buf, sizeof(*value) ); - else *value = wcstol( buf, NULL, 10 ); + if (info->Type == REG_DWORD) memcpy( value, info->Data, sizeof(*value) ); + else *value = wcstol( (const WCHAR *)info->Data, NULL, 10 ); } - return err; + return !!count; } -static void init_font_options(void) +static void init_font_options( HKEY hkcu ) { + char value_buffer[FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[20 * sizeof(WCHAR)])]; + KEY_VALUE_PARTIAL_INFORMATION *info = (void *)value_buffer; HKEY key; - DWORD i, type, size, val, gamma = 1400; - WCHAR buffer[20]; + DWORD i, val, gamma = 1400; + + static const WCHAR desktop_keyW[] = + { 'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','D','e','s','k','t','o','p' }; - size = sizeof(buffer); - if (!RegQueryValueExW( wine_fonts_key, L"AntialiasFakeBoldOrItalic", NULL, - &type, (BYTE *)buffer, &size) && type == REG_SZ && size >= 1) + if (query_reg_ascii_value( wine_fonts_key, "AntialiasFakeBoldOrItalic", + info, sizeof(value_buffer) ) && info->Type == REG_SZ) { - antialias_fakes = (wcschr(L"yYtT1", buffer[0]) != NULL); + static const WCHAR valsW[] = {'y','Y','t','T','1',0}; + antialias_fakes = (wcschr( valsW, *(const WCHAR *)info->Data ) != NULL); } - if (!RegOpenKeyW( HKEY_CURRENT_USER, L"Control Panel\\Desktop", &key )) + if ((key = reg_open_key( hkcu, desktop_keyW, sizeof(desktop_keyW) ))) { /* FIXME: handle vertical orientations even though Windows doesn't */ - if (!get_key_value( key, L"FontSmoothingOrientation", &val )) + if (get_key_value( key, "FontSmoothingOrientation", &val )) { switch (val) { @@ -4179,18 +4184,18 @@ static void init_font_options(void) break; } } - if (!get_key_value( key, L"FontSmoothing", &val ) && val /* enabled */) + if (get_key_value( key, "FontSmoothing", &val ) && val /* enabled */) { - if (!get_key_value( key, L"FontSmoothingType", &val ) && val == 2 /* FE_FONTSMOOTHINGCLEARTYPE */) + if (get_key_value( key, "FontSmoothingType", &val ) && val == 2 /* FE_FONTSMOOTHINGCLEARTYPE */) font_smoothing = subpixel_orientation; else font_smoothing = GGO_GRAY4_BITMAP; } - if (!get_key_value( key, L"FontSmoothingGamma", &val ) && val) + if (get_key_value( key, "FontSmoothingGamma", &val ) && val) { gamma = min( max( val, 1000 ), 2200 ); } - RegCloseKey( key ); + NtClose( key ); } /* Calibrating the difference between the registry value and the Wine gamma value. @@ -6091,19 +6096,23 @@ void font_init(void) { OBJECT_ATTRIBUTES attr = { sizeof(attr) }; UNICODE_STRING name; - HANDLE mutex; + HANDLE mutex, hkcu; DWORD disposition; static WCHAR wine_font_mutexW[] = {'\\','B','a','s','e','N','a','m','e','d','O','b','j','e','c','t','s', '\\','_','_','W','I','N','E','_','F','O','N','T','_','M','U','T','E','X','_','_'}; + static const WCHAR wine_fonts_keyW[] = + {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\','F','o','n','t','s'}; - if (RegCreateKeyExW( HKEY_CURRENT_USER, L"Software\\Wine\\Fonts", 0, NULL, 0, - KEY_ALL_ACCESS, NULL, &wine_fonts_key, NULL )) - return; + if (RtlOpenCurrentUser( MAXIMUM_ALLOWED, &hkcu )) return; - init_font_options(); + wine_fonts_key = reg_create_key( hkcu, wine_fonts_keyW, sizeof(wine_fonts_keyW), 0, NULL ); + if (wine_fonts_key) init_font_options( hkcu ); + NtClose( hkcu ); + if (!wine_fonts_key) return; update_codepage(); + if (__wine_init_unix_lib( gdi32_module, DLL_PROCESS_ATTACH, &callback_funcs, &font_funcs )) return; load_system_bitmap_fonts();

1 0

Jacek Caban : gdi32: Directly use ntdll in update_codepage.
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: 4dbc6a746814dbd5b84835540f8924170597efbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=4dbc6a746814dbd5b8483554… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 27 13:04:39 2021 +0200 gdi32: Directly use ntdll in update_codepage. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 128 +++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 89 insertions(+), 39 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4dbc6a746814dbd5b848…

1 0

Jacek Caban : gdi32: Directly use ntdll in update_font_system_link_info.
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: 3671eb44342d69cadea18de1e866bdfbefbfc646 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3671eb44342d69cadea18de1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 27 13:04:31 2021 +0200 gdi32: Directly use ntdll in update_font_system_link_info. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 89 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 51 insertions(+), 38 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 805fbe7abcc..0a5f69325cb 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -132,6 +132,11 @@ static struct font_gamma_ramp font_gamma_ramp; static void add_face_to_cache( struct gdi_font_face *face ); static void remove_face_from_cache( struct gdi_font_face *face ); +static void ascii_to_unicode( WCHAR *dst, const char *src, size_t len ) +{ + while (len--) *dst++ = (unsigned char)*src++; +} + static UINT asciiz_to_unicode( WCHAR *dst, const char *src ) { WCHAR *p = dst; @@ -1410,11 +1415,18 @@ static void add_gdi_font_link_entry( struct gdi_font_link *link, const WCHAR *fa list_add_tail( &link->links, &entry->entry ); } +static const WCHAR lucida_sans_unicodeW[] = + {'L','u','c','i','d','a',' ','S','a','n','s',' ','U','n','i','c','o','d','e',0}; +static const WCHAR microsoft_sans_serifW[] = + {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f',0}; +static const WCHAR tahomaW[] = + {'T','a','h','o','m','a',0}; + static const WCHAR * const font_links_list[] = { - L"Lucida Sans Unicode", - L"Microsoft Sans Serif", - L"Tahoma" + lucida_sans_unicodeW, + microsoft_sans_serifW, + tahomaW }; static const struct font_links_defaults_list @@ -2531,47 +2543,48 @@ static void update_font_association_info(UINT current_ansi_codepage) reg_delete_tree( NULL, font_assoc_keyW, sizeof(font_assoc_keyW) ); } -static void set_multi_value_key(HKEY hkey, const WCHAR *name, const WCHAR *value, DWORD len) +static void set_multi_value_key( HKEY hkey, const WCHAR *name, const char *value, DWORD len ) { + WCHAR valueW[256]; + ascii_to_unicode( valueW, value, len ); if (value) - RegSetValueExW(hkey, name, 0, REG_MULTI_SZ, (const BYTE *)value, len); + set_reg_value( hkey, name, REG_MULTI_SZ, valueW, len * sizeof(WCHAR) ); else if (name) - RegDeleteValueW(hkey, name); + reg_delete_value( hkey, name ); } static void update_font_system_link_info(UINT current_ansi_codepage) { - static const WCHAR system_link_simplified_chinese[] = - L"SIMSUN.TTC,SimSun\0" - L"MINGLIU.TTC,PMingLiu\0" - L"MSGOTHIC.TTC,MS UI Gothic\0" - L"BATANG.TTC,Batang\0"; - static const WCHAR system_link_traditional_chinese[] = - L"MINGLIU.TTC,PMingLiu\0" - L"SIMSUN.TTC,SimSun\0" - L"MSGOTHIC.TTC,MS UI Gothic\0" - L"BATANG.TTC,Batang\0"; - static const WCHAR system_link_japanese[] = - L"MSGOTHIC.TTC,MS UI Gothic\0" - L"MINGLIU.TTC,PMingLiU\0" - L"SIMSUN.TTC,SimSun\0" - L"GULIM.TTC,Gulim\0"; - static const WCHAR system_link_korean[] = - L"GULIM.TTC,Gulim\0" - L"MSGOTHIC.TTC,MS UI Gothic\0" - L"MINGLIU.TTC,PMingLiU\0" - L"SIMSUN.TTC,SimSun\0"; - static const WCHAR system_link_non_cjk[] = - L"MSGOTHIC.TTC,MS UI Gothic\0" - L"MINGLIU.TTC,PMingLiU\0" - L"SIMSUN.TTC,SimSun\0" - L"GULIM.TTC,Gulim\0"; + static const char system_link_simplified_chinese[] = + "SIMSUN.TTC,SimSun\0" + "MINGLIU.TTC,PMingLiu\0" + "MSGOTHIC.TTC,MS UI Gothic\0" + "BATANG.TTC,Batang\0"; + static const char system_link_traditional_chinese[] = + "MINGLIU.TTC,PMingLiu\0" + "SIMSUN.TTC,SimSun\0" + "MSGOTHIC.TTC,MS UI Gothic\0" + "BATANG.TTC,Batang\0"; + static const char system_link_japanese[] = + "MSGOTHIC.TTC,MS UI Gothic\0" + "MINGLIU.TTC,PMingLiU\0" + "SIMSUN.TTC,SimSun\0" + "GULIM.TTC,Gulim\0"; + static const char system_link_korean[] = + "GULIM.TTC,Gulim\0" + "MSGOTHIC.TTC,MS UI Gothic\0" + "MINGLIU.TTC,PMingLiU\0" + "SIMSUN.TTC,SimSun\0"; + static const char system_link_non_cjk[] = + "MSGOTHIC.TTC,MS UI Gothic\0" + "MINGLIU.TTC,PMingLiU\0" + "SIMSUN.TTC,SimSun\0" + "GULIM.TTC,Gulim\0"; HKEY hkey; - if (!RegCreateKeyW(HKEY_LOCAL_MACHINE, - L"Software\\Microsoft\\Windows NT\\CurrentVersion\\FontLink\\SystemLink", &hkey)) + if ((hkey = reg_create_key( NULL, system_link_keyW, sizeof(system_link_keyW), 0, NULL ))) { - const WCHAR *link; + const char *link; DWORD len; switch (current_ansi_codepage) @@ -2596,10 +2609,10 @@ static void update_font_system_link_info(UINT current_ansi_codepage) link = system_link_non_cjk; len = sizeof(system_link_non_cjk); } - set_multi_value_key(hkey, L"Lucida Sans Unicode", link, len); - set_multi_value_key(hkey, L"Microsoft Sans Serif", link, len); - set_multi_value_key(hkey, L"Tahoma", link, len); - RegCloseKey(hkey); + set_multi_value_key(hkey, lucida_sans_unicodeW, link, len); + set_multi_value_key(hkey, microsoft_sans_serifW, link, len); + set_multi_value_key(hkey, tahomaW, link, len); + NtClose( hkey ); } }

1 0

Alexandre Julliard : winebrowser: Build with msvcrt.
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: 72449b76e8e40f1690762545fd2c0021647da140 URL: https://source.winehq.org/git/wine.git/?a=commit;h=72449b76e8e40f1690762545… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 27 12:33:09 2021 +0200 winebrowser: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winebrowser/Makefile.in | 2 +- programs/winebrowser/main.c | 227 +++++++++++++++------------------------ 2 files changed, 87 insertions(+), 142 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=72449b76e8e40f169076…

1 0

Alexandre Julliard : winevdm: Build with msvcrt.
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: cd3e6db5a557db306db9d12e5e4ec465c706cf1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd3e6db5a557db306db9d12e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 27 12:31:50 2021 +0200 winevdm: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winevdm/Makefile.in | 2 +- programs/winevdm/winevdm.c | 96 ++++++++------------------------------------ 2 files changed, 18 insertions(+), 80 deletions(-) diff --git a/programs/winevdm/Makefile.in b/programs/winevdm/Makefile.in index bce66758a7a..cc3dddb09c6 100644 --- a/programs/winevdm/Makefile.in +++ b/programs/winevdm/Makefile.in @@ -1,7 +1,7 @@ MODULE = winevdm.exe IMPORTS = user32 kernel comctl32 -EXTRADLLFLAGS = -mwindows -mcygwin +EXTRADLLFLAGS = -mwindows C_SRCS = \ winevdm.c diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c index 1ab91f41d66..19f3c778513 100644 --- a/programs/winevdm/winevdm.c +++ b/programs/winevdm/winevdm.c @@ -18,20 +18,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include <stdarg.h> #include <stdio.h> #include <stdlib.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "wine/winbase16.h" #include "winuser.h" #include "wincon.h" #include "commctrl.h" -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(winevdm); @@ -106,75 +104,32 @@ typedef struct { #include "poppack.h" -/*********************************************************************** - * find_dosbox - */ -static char *find_dosbox(void) -{ - const char *envpath = getenv( "PATH" ); - struct stat st; - char *path, *p, *buffer, *dir; - size_t envpath_len; - - if (!envpath) return NULL; - - envpath_len = strlen( envpath ); - path = HeapAlloc( GetProcessHeap(), 0, envpath_len + 1 ); - buffer = HeapAlloc( GetProcessHeap(), 0, envpath_len + strlen(DOSBOX) + 2 ); - strcpy( path, envpath ); - - p = path; - while (*p) - { - while (*p == ':') p++; - if (!*p) break; - dir = p; - while (*p && *p != ':') p++; - if (*p == ':') *p++ = 0; - strcpy( buffer, dir ); - strcat( buffer, "/" DOSBOX ); - if (!stat( buffer, &st )) - { - HeapFree( GetProcessHeap(), 0, path ); - return buffer; - } - } - HeapFree( GetProcessHeap(), 0, buffer ); - HeapFree( GetProcessHeap(), 0, path ); - return NULL; -} - - /*********************************************************************** * start_dosbox */ static void start_dosbox( const char *appname, const char *args ) { - static const WCHAR cfgW[] = {'c','f','g',0}; - const char *home = getenv( "HOME" ); - const char *prefix = getenv( "WINEPREFIX" ); + const WCHAR *config_dir = _wgetenv( L"WINECONFIGDIR" ); WCHAR path[MAX_PATH], config[MAX_PATH]; HANDLE file; - char *p, *buffer, app[MAX_PATH]; - int i, len; - int ret = 1; + char *p, *prefix, *buffer, app[MAX_PATH]; + int i; + NTSTATUS ret = STATUS_OBJECT_NAME_NOT_FOUND; DWORD written, drives = GetLogicalDrives(); - char *dosbox = find_dosbox(); - if (!dosbox) return; + if (!config_dir || !(prefix = wine_get_unix_file_name( config_dir ))) return; if (!GetTempPathW( MAX_PATH, path )) return; - if (!GetTempFileNameW( path, cfgW, 0, config )) return; + if (!GetTempFileNameW( path, L"cfg", 0, config )) return; if (!GetCurrentDirectoryW( MAX_PATH, path )) return; if (!GetShortPathNameA( appname, app, MAX_PATH )) return; GetShortPathNameW( path, path, MAX_PATH ); file = CreateFileW( config, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0 ); if (file == INVALID_HANDLE_VALUE) return; - len = prefix ? strlen(prefix) : strlen(home) + strlen("/.wine"); buffer = HeapAlloc( GetProcessHeap(), 0, sizeof("[autoexec]") + sizeof("mount -z c") + sizeof("config -securemode") + - 25 * (len + sizeof("mount c /dosdevices/c:")) + - 4 * strlenW( path ) + + 26 * (strlen(prefix) + sizeof("mount c /dosdevices/c:")) + + 4 * lstrlenW( path ) + 6 + strlen( app ) + strlen( args ) + 20 ); p = buffer; p += sprintf( p, "[autoexec]\n" ); @@ -187,13 +142,10 @@ static void start_dosbox( const char *appname, const char *args ) for (i = 0; i <= 25; i++) { if (!(drives & (1 << i))) continue; - if (prefix) - p += sprintf( p, "mount %c %s/dosdevices/%c:\n", 'a' + i, prefix, 'a' + i ); - else - p += sprintf( p, "mount %c %s/.wine/dosdevices/%c:\n", 'a' + i, home, 'a' + i ); + p += sprintf( p, "mount %c %s/dosdevices/%c:\n", 'a' + i, prefix, 'a' + i ); } p += sprintf( p, "%c:\ncd ", path[0] ); - p += WideCharToMultiByte( CP_UNIXCP, 0, path + 2, -1, p, 4 * strlenW(path), NULL, NULL ) - 1; + p += WideCharToMultiByte( CP_UNIXCP, 0, path + 2, -1, p, 4 * lstrlenW(path), NULL, NULL ) - 1; p += sprintf( p, "\nconfig -securemode\n" ); p += sprintf( p, "%s %s\n", app, args ); p += sprintf( p, "exit\n" ); @@ -201,30 +153,21 @@ static void start_dosbox( const char *appname, const char *args ) { const char *args[5]; char *config_file = wine_get_unix_file_name( config ); - args[0] = dosbox; + args[0] = DOSBOX; args[1] = "-userconf"; args[2] = "-conf"; args[3] = config_file; args[4] = NULL; - ret = _spawnvp( _P_WAIT, args[0], args ); + ret = __wine_unix_spawnvp( (char **)args, TRUE ); } CloseHandle( file ); DeleteFileW( config ); HeapFree( GetProcessHeap(), 0, buffer ); + if (FAILED(ret)) MESSAGE( "winevdm: %s is a DOS application, you need to install DOSBox.\n", appname ); ExitProcess( ret ); } -/*********************************************************************** - * start_dos_exe - */ -static void start_dos_exe( LPCSTR filename, LPCSTR cmdline ) -{ - start_dosbox( filename, cmdline ); - WINE_MESSAGE( "winevdm: %s is a DOS application, you need to install DOSBox.\n", filename ); - ExitProcess(1); -} - /*********************************************************************** * read_pif_file *pif386rec_tu @@ -367,7 +310,7 @@ static VOID pif_cmd( char *filename, char *cmdline) * - hot key's * - etc. */ - start_dos_exe( progpath, cmdline ); + start_dosbox( progpath, cmdline ); } /*********************************************************************** @@ -561,13 +504,8 @@ int main( int argc, char *argv[] ) if( ( p = strrchr( appname, '.' )) && !strcasecmp( p, ".pif")) pif_cmd( appname, cmdline + 1); else - { /* try DOS format */ - /* loader expects arguments to be regular C strings */ - start_dos_exe( appname, cmdline + 1 ); - } - /* if we get back here it failed */ - instance = GetLastError(); + start_dosbox( appname, cmdline + 1 ); } WINE_MESSAGE( "winevdm: can't exec '%s': ", appname );

1 0

Alexandre Julliard : ntdll: Add a __wine_unix_spawnvp syscall.
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: c1b3d6eb108a85e4bc8262b86de5dff9600eeca5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1b3d6eb108a85e4bc8262b8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 27 12:30:25 2021 +0200 ntdll: Add a __wine_unix_spawnvp syscall. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/unix/loader.c | 1 + dlls/ntdll/unix/process.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/window.c | 2 +- dlls/wow64/syscall.c | 19 +++++++++++++++++ dlls/wow64/syscall.h | 1 + include/winternl.h | 1 + 7 files changed, 77 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 9837b09fd51..c822db14572 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1622,6 +1622,7 @@ # Unix interface @ stdcall -syscall __wine_unix_call(int64 long ptr) +@ stdcall -syscall __wine_unix_spawnvp(long ptr) @ cdecl __wine_set_unix_funcs(long ptr) @ cdecl __wine_init_unix_lib(long long ptr ptr) @ stdcall __wine_ctrl_routine(ptr) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 5e39209eddc..dfc0d4c9a09 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -344,6 +344,7 @@ static void * const syscalls[] = NtYieldExecution, __wine_dbg_write, __wine_unix_call, + __wine_unix_spawnvp, wine_nt_to_unix_file_name, wine_server_call, wine_server_fd_to_handle, diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index f5b8b5315cd..1a53741de57 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -481,6 +481,59 @@ static NTSTATUS spawn_process( const RTL_USER_PROCESS_PARAMETERS *params, int so } +/*********************************************************************** + * __wine_unix_spawnvp + */ +NTSTATUS WINAPI __wine_unix_spawnvp( char * const argv[], int wait ) +{ + pid_t pid, wret; + int fd[2], status, err; + +#ifdef HAVE_PIPE2 + if (pipe2( fd, O_CLOEXEC ) == -1) +#endif + { + if (pipe(fd) == -1) return STATUS_TOO_MANY_OPENED_FILES; + fcntl( fd[0], F_SETFD, FD_CLOEXEC ); + fcntl( fd[1], F_SETFD, FD_CLOEXEC ); + } + + if (!(pid = fork())) + { + /* in child */ + close( fd[0] ); + signal( SIGPIPE, SIG_DFL ); + if (!wait) + { + if (!(pid = fork())) execvp( argv[0], argv ); /* in grandchild */ + if (pid > 0) _exit(0); /* exit child if fork succeeded */ + } + else execvp( argv[0], argv ); + + err = errno_to_status( errno ); + write( fd[1], &err, sizeof(err) ); + _exit(1); + } + close( fd[1] ); + + if (pid != -1) + { + while (pid != (wret = waitpid( pid, &status, 0 ))) + if (wret == -1 && errno != EINTR) break; + + if (read( fd[0], &err, sizeof(err) ) <= 0) /* if we read something, exec or second fork failed */ + { + if (pid == wret && WIFEXITED(status)) err = WEXITSTATUS(status); + else err = 255; /* abnormal exit with an abort or an interrupt */ + } + } + else err = errno_to_status( errno ); + + close( fd[0] ); + return err; +} + + /*********************************************************************** * fork_and_exec * diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 4e856a41865..0057a341525 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2854,7 +2854,7 @@ static LRESULT start_screensaver(void) if (!is_virtual_desktop()) { const char *argv[3] = { "xdg-screensaver", "activate", NULL }; - int pid = _spawnvp( _P_DETACH, argv[0], argv ); + int pid = __wine_unix_spawnvp( (char **)argv, FALSE ); if (pid > 0) { TRACE( "started process %d\n", pid ); diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index cc2ab1c48b3..952b862a37d 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -284,6 +284,25 @@ NTSTATUS WINAPI wow64___wine_unix_call( UINT *args ) } +/********************************************************************** + * wow64___wine_unix_spawnvp + */ +NTSTATUS WINAPI wow64___wine_unix_spawnvp( UINT *args ) +{ + ULONG *argv32 = get_ptr( &args ); + int wait = get_ulong( &args ); + + unsigned int i, count = 0; + char **argv; + + while (argv32[count]) count++; + argv = Wow64AllocateTemp( (count + 1) * sizeof(*argv) ); + for (i = 0; i < count; i++) argv[i] = ULongToPtr( argv32[i] ); + argv[count] = NULL; + return __wine_unix_spawnvp( argv, wait ); +} + + /********************************************************************** * wow64_wine_server_call */ diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index be0ca780b9b..bc403dd6d31 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -245,6 +245,7 @@ SYSCALL_ENTRY( NtYieldExecution ) \ SYSCALL_ENTRY( __wine_dbg_write ) \ SYSCALL_ENTRY( __wine_unix_call ) \ + SYSCALL_ENTRY( __wine_unix_spawnvp ) \ SYSCALL_ENTRY( wine_nt_to_unix_file_name ) \ SYSCALL_ENTRY( wine_server_call ) \ SYSCALL_ENTRY( wine_server_fd_to_handle ) \ diff --git a/include/winternl.h b/include/winternl.h index 9e96591ad8e..f119ce6f4f6 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4603,6 +4603,7 @@ static inline PLIST_ENTRY RemoveTailList(PLIST_ENTRY le) /* Wine internal functions */ extern NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out ); +extern NTSTATUS WINAPI __wine_unix_spawnvp( char * const argv[], int wait ); /* The thread information for 16-bit threads */ /* NtCurrentTeb()->SubSystemTib points to this */

1 0

Alexandre Julliard : ntdll: Return a cleaner Unix path for z: drive in wine_nt_to_unix_file_name().
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: a851703ed79a4f42838c84a8d15234994999a98c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a851703ed79a4f42838c84a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 27 16:58:46 2021 +0200 ntdll: Return a cleaner Unix path for z: drive in wine_nt_to_unix_file_name(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index e6f813966a5..43e85b0c955 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -3445,9 +3445,24 @@ NTSTATUS WINAPI wine_nt_to_unix_file_name( const OBJECT_ATTRIBUTES *attr, char * if (buffer) { - if (*size > strlen(buffer)) strcpy( nameA, buffer ); + struct stat st1, st2; + char *name = buffer; + + /* remove dosdevices prefix for z: drive if it points to the Unix root */ + if (!strncmp( buffer, config_dir, strlen(config_dir) ) && + !strncmp( buffer + strlen(config_dir), "/dosdevices/z:/", 15 )) + { + char *p = buffer + strlen(config_dir) + 14; + *p = 0; + if (!stat( buffer, &st1 ) && !stat( "/", &st2 ) && + st1.st_dev == st2.st_dev && st1.st_ino == st2.st_ino) + name = p; + *p = '/'; + } + + if (*size > strlen(name)) strcpy( nameA, name ); else status = STATUS_BUFFER_TOO_SMALL; - *size = strlen(buffer) + 1; + *size = strlen(name) + 1; free( buffer ); } free( redir.Buffer );

1 0

Rémi Bernon : winebus.sys: Move hidraw_device code around.
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: 55e978168e7f3d6ac48046002ec92bf631ddaf58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55e978168e7f3d6ac4804600… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 27 11:32:48 2021 +0200 winebus.sys: Move hidraw_device code around. To keep lnxev_device functions and related helpers all together. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 375 ++++++++++++++++++++++---------------------- 1 file changed, 186 insertions(+), 189 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=55e978168e7f3d6ac480…

1 0

Gerald Pfeifer : winebus.sys: Fix non-Linux builds.
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: 0c81dc223d2a63eae38fe54b6cbbf6422265e7c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c81dc223d2a63eae38fe54b… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Sep 27 11:32:47 2021 +0200 winebus.sys: Fix non-Linux builds. commit 40a9f69a1de088fb72c6b8966bc4333dea5fdfff winebus.sys: Rename UDEV bus device variables to be consistent. Introducing a struct base_device, and hidraw_device / lnxev_device depending on the sub-type of the device. moved an existing use of ABS_VOLUME that was guarded by #ifdef HAS_PROPER_INPUT_HEADER outside that guard, breaking the build on non-Linux platforms. Address this by putting appropriate guards in place. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 48 ++++++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 88db78360e2..fce3a7672d9 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -110,11 +110,23 @@ struct base_device int device_fd; }; +static inline struct base_device *impl_from_unix_device(struct unix_device *iface) +{ + return CONTAINING_RECORD(iface, struct base_device, unix_device); +} + struct hidraw_device { struct base_device base; }; +static inline struct hidraw_device *hidraw_impl_from_unix_device(struct unix_device *iface) +{ + return CONTAINING_RECORD(impl_from_unix_device(iface), struct hidraw_device, base); +} + +#ifdef HAS_PROPER_INPUT_HEADER + #define HID_REL_MAX (REL_MISC+1) #define HID_ABS_MAX (ABS_VOLUME+1) @@ -130,21 +142,13 @@ struct lnxev_device int haptic_effect_id; }; -static inline struct base_device *impl_from_unix_device(struct unix_device *iface) -{ - return CONTAINING_RECORD(iface, struct base_device, unix_device); -} - -static inline struct hidraw_device *hidraw_impl_from_unix_device(struct unix_device *iface) -{ - return CONTAINING_RECORD(impl_from_unix_device(iface), struct hidraw_device, base); -} - static inline struct lnxev_device *lnxev_impl_from_unix_device(struct unix_device *iface) { return CONTAINING_RECORD(impl_from_unix_device(iface), struct lnxev_device, base); } +#endif /* HAS_PROPER_INPUT_HEADER */ + #define MAX_DEVICES 128 static int close_fds[MAX_DEVICES]; static struct pollfd poll_fds[MAX_DEVICES]; @@ -201,6 +205,18 @@ static struct base_device *find_device_from_fd(int fd) return NULL; } +static struct base_device *find_device_from_udev(struct udev_device *dev) +{ + struct base_device *impl; + + LIST_FOR_EACH_ENTRY(impl, &device_list, struct base_device, unix_device.entry) + if (impl->udev_device == dev) return impl; + + return NULL; +} + +#ifdef HAS_PROPER_INPUT_HEADER + static const char *get_device_syspath(struct udev_device *dev) { struct udev_device *parent; @@ -224,18 +240,6 @@ static struct base_device *find_device_from_syspath(const char *path) return NULL; } -static struct base_device *find_device_from_udev(struct udev_device *dev) -{ - struct base_device *impl; - - LIST_FOR_EACH_ENTRY(impl, &device_list, struct base_device, unix_device.entry) - if (impl->udev_device == dev) return impl; - - return NULL; -} - -#ifdef HAS_PROPER_INPUT_HEADER - static const BYTE ABS_TO_HID_MAP[][2] = { {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_X}, /*ABS_X*/ {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_Y}, /*ABS_Y*/

1 0

Nikolay Sivov : d3d10/tests: Regenerate state group test effect with newer compiler.
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: 5227259043a8168b533107875f6f46911dc68279 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5227259043a8168b53310787… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 24 08:10:15 2021 +0300 d3d10/tests: Regenerate state group test effect with newer compiler. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/tests/effect.c | 186 ++++++++++++++++------------------------------ 1 file changed, 62 insertions(+), 124 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5227259043a8168b5331…

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 September 2021