September 2021 - Wine-commits

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

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 : 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 : 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

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

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 load_system_bitmap_fonts and load_file_system_fonts.
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: e3d7e1f539b9a336e99e91c6d7faa9122fb03976 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3d7e1f539b9a336e99e91c6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 27 13:05:07 2021 +0200 gdi32: Directly use ntdll in load_system_bitmap_fonts and load_file_system_fonts. 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 | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 700a7e1c327..9132c9b6849 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -125,6 +125,18 @@ static const WCHAR software_config_keyW[] = '\\','S','o','f','t','w','a','r','e', }; +static const WCHAR fonts_config_keyW[] = +{ + '\\','R','e','g','i','s','t','r','y', + '\\','M','a','c','h','i','n','e', + '\\','S','y','s','t','e','m', + '\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t', + '\\','H','a','r','d','w','a','r','e',' ','P','r','o','f','i','l','e','s', + '\\','C','u','r','r','e','n','t', + '\\','S','o','f','t','w','a','r','e', + '\\','F','o','n','t','s' +}; + static const WCHAR fonts_win9x_config_keyW[] = { '\\','R','e','g','i','s','t','r','y', @@ -5860,19 +5872,19 @@ static BOOL remove_font_resource( LPCWSTR file, DWORD flags ) static void load_system_bitmap_fonts(void) { - static const WCHAR * const fonts[] = { L"FONTS.FON", L"OEMFONT.FON", L"FIXEDFON.FON" }; + static const char * const fonts[] = { "FONTS.FON", "OEMFONT.FON", "FIXEDFON.FON" }; + char value_buffer[FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[MAX_PATH * sizeof(WCHAR)])]; + KEY_VALUE_PARTIAL_INFORMATION *info = (void *)value_buffer; HKEY hkey; - WCHAR data[MAX_PATH]; - DWORD i, dlen, type; + DWORD i; - if (RegOpenKeyW( HKEY_CURRENT_CONFIG, L"Software\\Fonts", &hkey )) return; + if (!(hkey = reg_open_key( NULL, fonts_config_keyW, sizeof(fonts_config_keyW) ))) return; for (i = 0; i < ARRAY_SIZE(fonts); i++) { - dlen = sizeof(data); - if (!RegQueryValueExW( hkey, fonts[i], 0, &type, (BYTE *)data, &dlen ) && type == REG_SZ) - add_system_font_resource( data, ADDFONT_ALLOW_BITMAP ); + if (query_reg_ascii_value( hkey, fonts[i], info, sizeof(value_buffer) ) && info->Type == REG_SZ) + add_system_font_resource( (const WCHAR *)info->Data, ADDFONT_ALLOW_BITMAP ); } - RegCloseKey( hkey ); + NtClose( hkey ); } static void load_directory_fonts( WCHAR *path, UINT flags ) @@ -5927,8 +5939,9 @@ static void load_directory_fonts( WCHAR *path, UINT flags ) static void load_file_system_fonts(void) { - WCHAR *ptr, *next, path[MAX_PATH + ARRAYSIZE(nt_prefixW)], value[1024]; - DWORD len = sizeof(value); + char value_buffer[FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[1024 * sizeof(WCHAR)])]; + KEY_VALUE_PARTIAL_INFORMATION *info = (void *)value_buffer; + WCHAR *ptr, *next, path[MAX_PATH]; /* Windows directory */ get_fonts_win_dir_path( NULL, path ); @@ -5940,9 +5953,10 @@ static void load_file_system_fonts(void) /* custom paths */ /* @@ Wine registry key: HKCU\Software\Wine\Fonts */ - if (!RegQueryValueExW( wine_fonts_key, L"Path", NULL, NULL, (BYTE *)value, &len )) + if (query_reg_ascii_value( wine_fonts_key, "Path", info, sizeof(value_buffer) ) && + info->Type == REG_SZ) { - for (ptr = value; ptr; ptr = next) + for (ptr = (WCHAR *)info->Data; ptr; ptr = next) { if ((next = wcschr( ptr, ';' ))) *next++ = 0; if (next && next - ptr < 2) continue;

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: 8a9ecefcac1f4289d68b94793b17444910bccfe9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a9ecefcac1f4289d68b9479… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Sat Sep 25 10:48:31 2021 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/po/lt.po b/po/lt.po index 55b3076df12..cf2a4a59040 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-09-11 13:26+0300\n" +"PO-Revision-Date: 2021-09-25 10:47+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -3711,30 +3711,24 @@ msgid "&Disable" msgstr "&Išjungti" #: dlls/joy.cpl/joy.rc:41 -#, fuzzy -#| msgid "Reset" msgid "&Reset" -msgstr "Atkurti" +msgstr "&Atkurti" #: dlls/joy.cpl/joy.rc:42 msgid "&Enable" msgstr "Įj&ungti" #: dlls/joy.cpl/joy.rc:43 -#, fuzzy -#| msgid "Edit Override" msgid "&Override" -msgstr "Redaguoti nustelbimą" +msgstr "&Nustelbti" #: dlls/joy.cpl/joy.rc:44 msgid "Connected" msgstr "Prijungta" #: dlls/joy.cpl/joy.rc:46 -#, fuzzy -#| msgid "Voice input device:" msgid "Connected (xinput device)" -msgstr "Balso įvedimo įtaisas:" +msgstr "Prijungta (xinput įrenginys)" #: dlls/joy.cpl/joy.rc:48 msgid "Disabled"

1 0

Floris Renaud : po: Update Dutch translation.
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: 2d47d9fecd582736b301dd2b33ec02cfe4ce7ad7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d47d9fecd582736b301dd2b… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Sat Sep 25 23:23:15 2021 +0200 po: Update Dutch translation. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nl.po | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/po/nl.po b/po/nl.po index e4616d5aacf..e0daa9dff21 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-09-11 20:20+0200\n" +"PO-Revision-Date: 2021-09-25 22:40+0200\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -787,7 +787,7 @@ msgstr "Gelijke &hoofd-/kleine letters" #: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76 msgid "Direction" -msgstr "Zoekrichting" +msgstr "Oriëntatie" #: dlls/comdlg32/comdlg32.rc:326 programs/view/view.rc:42 msgid "&Up" @@ -3722,34 +3722,28 @@ msgid "&Disable" msgstr "&Uitzetten" #: dlls/joy.cpl/joy.rc:41 -#, fuzzy -#| msgid "Reset" msgid "&Reset" -msgstr "Terugzetten" +msgstr "&Terugzetten" #: dlls/joy.cpl/joy.rc:42 msgid "&Enable" -msgstr "Activ&eren" +msgstr "&Activeren" #: dlls/joy.cpl/joy.rc:43 -#, fuzzy -#| msgid "Edit Override" msgid "&Override" -msgstr "DLL Bewerken" +msgstr "&Overschrijven" #: dlls/joy.cpl/joy.rc:44 msgid "Connected" msgstr "Verbonden" #: dlls/joy.cpl/joy.rc:46 -#, fuzzy -#| msgid "Voice input device:" msgid "Connected (xinput device)" -msgstr "Steminvoer apparaat:" +msgstr "Verbonden (xinput apparaat)" #: dlls/joy.cpl/joy.rc:48 msgid "Disabled" -msgstr "Deactiveren" +msgstr "Uitgeschakeld" #: dlls/joy.cpl/joy.rc:50 msgid "" @@ -3757,7 +3751,7 @@ msgid "" "updated here until you restart this applet." msgstr "" "Na het uit- of inschakelen van een apparaat zullen de aangesloten joysticks " -"niet vernieuwd worden totdat u deze applet herstart." +"niet vernieuwd worden totdat deze applicatie herstart wordt." #: dlls/joy.cpl/joy.rc:55 msgid "Test Joystick"

1 0

Rémi Bernon : dinput: Use a custom HID joystick state instead of DIJOYSTATE2.
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: d682b3a9d3253f935ee53cca3c2005c1b5b6c9ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=d682b3a9d3253f935ee53cca… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 27 09:43:03 2021 +0200 dinput: Use a custom HID joystick state instead of DIJOYSTATE2. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 85 +++++++++++++++++----------------------------- 1 file changed, 32 insertions(+), 53 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 30e63c16cb8..7fe2e5f246c 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -136,10 +136,11 @@ static inline const char *debugstr_hid_caps( struct hid_caps *caps ) return "(unknown type)"; } +#define DEVICE_STATE_MAX_SIZE 1024 + struct hid_joystick { IDirectInputDeviceImpl base; - DIJOYSTATE2 state; HANDLE device; OVERLAPPED read_ovl; @@ -160,6 +161,7 @@ struct hid_joystick ULONG usages_count; BYTE device_state_report_id; + BYTE device_state[DEVICE_STATE_MAX_SIZE]; }; static inline struct hid_joystick *impl_from_IDirectInputDevice8W( IDirectInputDevice8W *iface ) @@ -660,7 +662,7 @@ static HRESULT WINAPI hid_joystick_GetDeviceState( IDirectInputDevice8W *iface, EnterCriticalSection( &impl->base.crit ); if (!impl->base.acquired) hr = DIERR_NOTACQUIRED; - else fill_DataFormat( ptr, len, &impl->state, &impl->base.data_format ); + else fill_DataFormat( ptr, len, impl->device_state, &impl->base.data_format ); LeaveCriticalSection( &impl->base.crit ); return hr; @@ -796,7 +798,8 @@ static const IDirectInputDevice8WVtbl hid_joystick_vtbl = struct parse_device_state_params { - DIJOYSTATE2 old_state; + BYTE old_state[DEVICE_STATE_MAX_SIZE]; + BYTE buttons[128]; DWORD time; DWORD seq; }; @@ -806,12 +809,18 @@ static BOOL check_device_state_button( struct hid_joystick *impl, struct hid_cap { IDirectInputDevice8W *iface = &impl->base.IDirectInputDevice8W_iface; struct parse_device_state_params *params = data; - DWORD i = DIDFT_GETINSTANCE( instance->dwType ); + BYTE old_value, value; if (!(instance->dwType & DIDFT_BUTTON)) FIXME( "unexpected object type %#x, expected DIDFT_BUTTON\n", instance->dwType ); - else if (params->old_state.rgbButtons[i] != impl->state.rgbButtons[i]) - queue_event( iface, instance->dwType, impl->state.rgbButtons[i], params->time, params->seq ); + else + { + value = params->buttons[instance->wUsage - 1]; + old_value = params->old_state[instance->dwOfs]; + impl->device_state[instance->dwOfs] = value; + if (old_value != value) + queue_event( iface, instance->dwType, value, params->time, params->seq ); + } return DIENUM_CONTINUE; } @@ -842,8 +851,8 @@ static BOOL read_device_state_value( struct hid_joystick *impl, struct hid_caps struct parse_device_state_params *params = data; char *report_buf = impl->input_report_buf; HIDP_VALUE_CAPS *value_caps = caps->value; + LONG old_value, value; NTSTATUS status; - LONG value; if (!(instance->dwType & (DIDFT_POV | DIDFT_AXIS))) FIXME( "unexpected object type %#x, expected DIDFT_POV | DIDFT_AXIS\n", instance->dwType ); @@ -855,47 +864,10 @@ static BOOL read_device_state_value( struct hid_joystick *impl, struct hid_caps instance->wUsagePage, instance->wUsage, status ); value = scale_value( logical_value, value_caps, value_caps->PhysicalMin, value_caps->PhysicalMax ); - switch (instance->dwOfs) - { - case DIJOFS_X: - if (impl->state.lX == value) break; - impl->state.lX = value; - queue_event( iface, instance->dwType, value, params->time, params->seq ); - break; - case DIJOFS_Y: - if (impl->state.lY == value) break; - impl->state.lY = value; - queue_event( iface, instance->dwType, value, params->time, params->seq ); - break; - case DIJOFS_Z: - if (impl->state.lZ == value) break; - impl->state.lZ = value; - queue_event( iface, instance->dwType, value, params->time, params->seq ); - break; - case DIJOFS_RX: - if (impl->state.lRx == value) break; - impl->state.lRx = value; + old_value = *(LONG *)(params->old_state + instance->dwOfs); + *(LONG *)(impl->device_state + instance->dwOfs) = value; + if (old_value != value) queue_event( iface, instance->dwType, value, params->time, params->seq ); - break; - case DIJOFS_RY: - if (impl->state.lRy == value) break; - impl->state.lRy = value; - queue_event( iface, instance->dwType, value, params->time, params->seq ); - break; - case DIJOFS_RZ: - if (impl->state.lRz == value) break; - impl->state.lRz = value; - queue_event( iface, instance->dwType, value, params->time, params->seq ); - break; - case DIJOFS_POV( 0 ): - if (impl->state.rgdwPOV[0] == value) break; - impl->state.rgdwPOV[0] = value; - queue_event( iface, instance->dwType, value, params->time, params->seq ); - break; - default: - FIXME( "unimplemented offset %#x.\n", instance->dwOfs ); - break; - } } return DIENUM_CONTINUE; @@ -911,7 +883,8 @@ static HRESULT hid_joystick_read_state( IDirectInputDevice8W *iface ) }; struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); ULONG i, count, report_len = impl->caps.InputReportByteLength; - struct parse_device_state_params params = {0}; + DIDATAFORMAT *format = impl->base.data_format.wine_df; + struct parse_device_state_params params = {{0}}; char *report_buf = impl->input_report_buf; USAGE_AND_PAGE *usages; NTSTATUS status; @@ -944,11 +917,11 @@ static HRESULT hid_joystick_read_state( IDirectInputDevice8W *iface ) if (report_buf[0] == impl->device_state_report_id) { - params.old_state = impl->state; params.time = GetCurrentTime(); params.seq = impl->base.dinput->evsequence++; + memcpy( params.old_state, impl->device_state, format->dwDataSize ); + memset( impl->device_state, 0, format->dwDataSize ); - memset( impl->state.rgbButtons, 0, sizeof(impl->state.rgbButtons) ); while (count--) { usages = impl->usages_buf + count; @@ -957,12 +930,12 @@ static HRESULT hid_joystick_read_state( IDirectInputDevice8W *iface ) else if (usages->Usage >= 128) FIXME( "ignoring extraneous button %d.\n", usages->Usage ); else - impl->state.rgbButtons[usages->Usage - 1] = 0x80; + params.buttons[usages->Usage - 1] = 0x80; } enum_value_objects( impl, &filter, DIDFT_ALL, read_device_state_value, &params ); enum_button_objects( impl, &filter, DIDFT_ALL, check_device_state_button, &params ); - if (memcmp( &params.old_state, &impl->state, sizeof(impl->state) ) && impl->base.hEvent) + if (impl->base.hEvent && memcmp( &params.old_state, impl->device_state, format->dwDataSize )) SetEvent( impl->base.hEvent ); } @@ -1231,6 +1204,7 @@ static BOOL init_objects( struct hid_joystick *impl, struct hid_caps *caps, DIDATAFORMAT *format = impl->base.data_format.wine_df; format->dwNumObjs++; + format->dwDataSize = max( format->dwDataSize, instance->dwOfs + sizeof(LONG) ); if (instance->dwType & DIDFT_BUTTON) impl->dev_caps.dwButtons++; if (instance->dwType & DIDFT_AXIS) impl->dev_caps.dwAxes++; if (instance->dwType & DIDFT_POV) impl->dev_caps.dwPOVs++; @@ -1360,12 +1334,17 @@ static HRESULT hid_joystick_create_device( IDirectInputImpl *dinput, const GUID enum_button_objects( impl, &filter, DIDFT_ALL, init_objects, NULL ); format = impl->base.data_format.wine_df; + if (format->dwDataSize > DEVICE_STATE_MAX_SIZE) + { + FIXME( "unable to create device, state is too large\n" ); + goto failed; + } + size = format->dwNumObjs * sizeof(*format->rgodf); if (!(format->rgodf = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size ))) goto failed; format->dwSize = sizeof(*format); format->dwObjSize = sizeof(*format->rgodf); format->dwFlags = DIDF_ABSAXIS; - format->dwDataSize = sizeof(impl->state); index = 0; enum_value_objects( impl, &filter, DIDFT_ALL, init_data_format, &index );

1 0