April 2020 - Wine-commits - list.winehq.org

Alexandre Julliard : ntdll: Avoid using wine_get_config_dir() from libwine.
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: e5030a4ac0a303d6788ae79ffdcd88e66cf78bd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5030a4ac0a303d6788ae79f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 27 12:34:07 2020 +0200 ntdll: Avoid using wine_get_config_dir() from libwine. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/directory.c | 7 +--- dlls/ntdll/env.c | 2 +- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/server.c | 101 +++++++++++++++++++++++++++++++++--------------- 4 files changed, 72 insertions(+), 39 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index b8cfe507ed..1adc0c9b0d 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -106,7 +106,6 @@ #include "ntdll_misc.h" #include "wine/server.h" #include "wine/list.h" -#include "wine/library.h" #include "wine/debug.h" #include "wine/exception.h" @@ -564,7 +563,6 @@ unsigned int DIR_get_drives_info( struct drive_info info[MAX_DOS_DRIVES] ) RtlEnterCriticalSection( &dir_section ); if (now != last_update) { - const char *config_dir = wine_get_config_dir(); char *buffer, *p; struct stat st; unsigned int i; @@ -1261,7 +1259,7 @@ static DWORD WINAPI init_options( RTL_RUN_ONCE *once, void *param, void **contex NtClose( root ); /* a couple of directories that we don't want to return in directory searches */ - ignore_file( wine_get_config_dir() ); + ignore_file( config_dir ); ignore_file( "/dev" ); ignore_file( "/proc" ); #ifdef linux @@ -2219,7 +2217,6 @@ static unsigned int nb_redirects; static void init_redirects(void) { static const char windows_dir[] = "/dosdevices/c:/windows"; - const char *config_dir = wine_get_config_dir(); char *dir; struct stat st; @@ -2322,7 +2319,6 @@ void init_directories(void) */ static NTSTATUS get_dos_device( const WCHAR *name, UINT name_len, ANSI_STRING *unix_name_ret ) { - const char *config_dir = wine_get_config_dir(); struct stat st; char *unix_name, *new_name, *dev; unsigned int i; @@ -2747,7 +2743,6 @@ NTSTATUS CDECL wine_nt_to_unix_file_name( const UNICODE_STRING *nameW, ANSI_STRI static const WCHAR invalid_charsW[] = { INVALID_NT_CHARS, 0 }; NTSTATUS status = STATUS_SUCCESS; - const char *config_dir = wine_get_config_dir(); const WCHAR *name, *p; struct stat st; char *unix_name; diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 6670786def..efb5270a2c 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -396,7 +396,7 @@ static void set_wow64_environment( WCHAR **env ) set_wine_path_variable( env, winedatadirW, wine_get_data_dir() ); set_wine_path_variable( env, winehomedirW, getenv("HOME") ); set_wine_path_variable( env, winebuilddirW, wine_get_build_dir() ); - set_wine_path_variable( env, wineconfigdirW, wine_get_config_dir() ); + set_wine_path_variable( env, wineconfigdirW, config_dir ); for (i = 0; (p = wine_dll_enum_load_path( i )); i++) { NTDLL_swprintf( buf, winedlldirW, i ); diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 7dca506aad..11ff0d7bb3 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -104,6 +104,7 @@ extern char **__wine_main_argv; extern WCHAR **__wine_main_wargv; /* server support */ +extern const char *config_dir DECLSPEC_HIDDEN; extern timeout_t server_start_time DECLSPEC_HIDDEN; extern unsigned int server_cpus DECLSPEC_HIDDEN; extern BOOL is_wow64 DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index c0dd0f35fc..4beee9e6e1 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -34,6 +34,9 @@ #ifdef HAVE_PTHREAD_NP_H # include <pthread_np.h> #endif +#ifdef HAVE_PWD_H +# include <pwd.h> +#endif #include <signal.h> #include <stdarg.h> #include <stdio.h> @@ -110,6 +113,8 @@ static const enum cpu_type client_cpu = CPU_ARM64; #error Unsupported CPU #endif +const char *config_dir = NULL; + unsigned int server_cpus = 0; BOOL is_wow64 = FALSE; @@ -171,6 +176,17 @@ static void fatal_perror( const char *err, ... ) exit(1); } +/* build a path from the specified dir and name */ +static char *build_path( const char *dir, const char *name ) +{ + size_t len = strlen( dir ); + char *ret = malloc( len + strlen( name ) + 2 ); + + memcpy( ret, dir, len ); + if (len && ret[len - 1] != '/') ret[len++] = '/'; + strcpy( ret + len, name ); + return ret; +} /*********************************************************************** * server_protocol_error @@ -1199,6 +1215,37 @@ static void start_server(void) } +/*********************************************************************** + * init_config_dir + */ +static const char *init_config_dir(void) +{ + char *p, *dir; + const char *prefix = getenv( "WINEPREFIX" ); + + if (prefix) + { + if (prefix[0] != '/') + fatal_error( "invalid directory %s in WINEPREFIX: not an absolute path\n", prefix ); + dir = strdup( prefix ); + for (p = dir + strlen(dir) - 1; p > dir && *p == '/'; p--) *p = 0; + } + else + { + const char *home = getenv( "HOME" ); + if (!home) + { + struct passwd *pwd = getpwuid( getuid() ); + if (pwd) home = pwd->pw_dir; + } + if (!home) fatal_error( "could not determine your home directory\n" ); + if (home[0] != '/') fatal_error( "your home directory %s is not an absolute path\n", home ); + dir = build_path( home, ".wine" ); + } + return dir; +} + + /*********************************************************************** * setup_config_dir * @@ -1206,46 +1253,38 @@ static void start_server(void) */ static int setup_config_dir(void) { - const char *p, *config_dir = wine_get_config_dir(); + char *p; + struct stat st; int fd_cwd = open( ".", O_RDONLY ); if (chdir( config_dir ) == -1) { - if (errno != ENOENT) fatal_perror( "chdir to %s", config_dir ); - + if (errno != ENOENT) fatal_perror( "cannot use directory %s", config_dir ); if ((p = strrchr( config_dir, '/' )) && p != config_dir) { - struct stat st; - char *tmp_dir; - - if (!(tmp_dir = malloc( p + 1 - config_dir ))) fatal_error( "out of memory\n" ); - memcpy( tmp_dir, config_dir, p - config_dir ); - tmp_dir[p - config_dir] = 0; - if (!stat( tmp_dir, &st ) && st.st_uid != getuid()) + while (p > config_dir + 1 && p[-1] == '/') p--; + *p = 0; + if (!stat( config_dir, &st ) && st.st_uid != getuid()) fatal_error( "'%s' is not owned by you, refusing to create a configuration directory there\n", - tmp_dir ); - free( tmp_dir ); + config_dir ); + *p = '/'; } - mkdir( config_dir, 0777 ); if (chdir( config_dir ) == -1) fatal_perror( "chdir to %s", config_dir ); - MESSAGE( "wine: created the configuration directory '%s'\n", config_dir ); } - if (mkdir( "dosdevices", 0777 ) == -1) + if (stat( ".", &st ) == -1) fatal_perror( "stat %s", config_dir ); + if (st.st_uid != getuid()) fatal_error( "'%s' is not owned by you\n", config_dir ); + + if (!mkdir( "dosdevices", 0777 )) { - if (errno == EEXIST) goto done; - fatal_perror( "cannot create %s/dosdevices", config_dir ); + mkdir( "drive_c", 0777 ); + symlink( "../drive_c", "dosdevices/c:" ); + symlink( "/", "dosdevices/z:" ); } + else if (errno != EEXIST) fatal_perror( "cannot create %s/dosdevices", config_dir ); - /* create the drive symlinks */ - - mkdir( "drive_c", 0777 ); - symlink( "../drive_c", "dosdevices/c:" ); - symlink( "/", "dosdevices/z:" ); - -done: if (fd_cwd == -1) fd_cwd = open( "dosdevices/c:", O_RDONLY ); fcntl( fd_cwd, F_SETFD, FD_CLOEXEC ); return fd_cwd; @@ -1452,6 +1491,8 @@ void server_init_process(void) obj_handle_t version; const char *env_socket = getenv( "WINESERVERSOCKET" ); + config_dir = init_config_dir(); + server_pid = -1; if (env_socket) { @@ -1610,19 +1651,15 @@ size_t server_init_thread( void *entry_point, BOOL *suspend ) if (arch) { if (!strcmp( arch, "win32" ) && (is_win64 || is_wow64)) - fatal_error( "WINEARCH set to win32 but '%s' is a 64-bit installation.\n", - wine_get_config_dir() ); + fatal_error( "WINEARCH set to win32 but '%s' is a 64-bit installation.\n", config_dir ); if (!strcmp( arch, "win64" ) && !is_win64 && !is_wow64) - fatal_error( "WINEARCH set to win64 but '%s' is a 32-bit installation.\n", - wine_get_config_dir() ); + fatal_error( "WINEARCH set to win64 but '%s' is a 32-bit installation.\n", config_dir ); } return info_size; case STATUS_INVALID_IMAGE_WIN_64: - fatal_error( "'%s' is a 32-bit installation, it cannot support 64-bit applications.\n", - wine_get_config_dir() ); + fatal_error( "'%s' is a 32-bit installation, it cannot support 64-bit applications.\n", config_dir ); case STATUS_NOT_SUPPORTED: - fatal_error( "'%s' is a 64-bit installation, it cannot be used with a 32-bit wineserver.\n", - wine_get_config_dir() ); + fatal_error( "'%s' is a 64-bit installation, it cannot be used with a 32-bit wineserver.\n", config_dir ); case STATUS_INVALID_IMAGE_FORMAT: fatal_error( "wineserver doesn't support the %s architecture\n", cpu_names[client_cpu] ); default:

1 0

Alexandre Julliard : ntdll: Avoid using wine_get_server_dir() from libwine.
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: 73211637c15b1dbd298364b5dd22161ce55f8145 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73211637c15b1dbd298364b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 27 12:34:30 2020 +0200 ntdll: Avoid using wine_get_server_dir() from libwine. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/server.c | 59 +++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 46 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 4beee9e6e1..d15ece3f4e 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -114,6 +114,7 @@ static const enum cpu_type client_cpu = CPU_ARM64; #endif const char *config_dir = NULL; +static const char *server_dir; unsigned int server_cpus = 0; BOOL is_wow64 = FALSE; @@ -1215,6 +1216,38 @@ static void start_server(void) } +/*********************************************************************** + * init_server_dir + */ +static const char *init_server_dir( dev_t dev, ino_t ino ) +{ + char *p, *dir; + size_t len = sizeof("/server-") + 2 * sizeof(dev) + 2 * sizeof(ino) + 2; + +#ifdef __ANDROID__ /* there's no /tmp dir on Android */ + len += strlen( config_dir ) + sizeof("/.wineserver"); + dir = malloc( len ); + strcpy( dir, config_dir ); + strcat( dir, "/.wineserver/server-" ); +#else + len += sizeof("/tmp/.wine-") + 12; + dir = malloc( len ); + sprintf( dir, "/tmp/.wine-%u/server-", getuid() ); +#endif + p = dir + strlen( dir ); + if (dev != (unsigned long)dev) + p += sprintf( p, "%lx%08lx-", (unsigned long)((unsigned long long)dev >> 32), (unsigned long)dev ); + else + p += sprintf( p, "%lx-", (unsigned long)dev ); + + if (ino != (unsigned long)ino) + sprintf( p, "%lx%08lx", (unsigned long)((unsigned long long)ino >> 32), (unsigned long)ino ); + else + sprintf( p, "%lx", (unsigned long)ino ); + return dir; +} + + /*********************************************************************** * init_config_dir */ @@ -1277,6 +1310,8 @@ static int setup_config_dir(void) if (stat( ".", &st ) == -1) fatal_perror( "stat %s", config_dir ); if (st.st_uid != getuid()) fatal_error( "'%s' is not owned by you\n", config_dir ); + server_dir = init_server_dir( st.st_dev, st.st_ino ); + if (!mkdir( "dosdevices", 0777 )) { mkdir( "drive_c", 0777 ); @@ -1332,26 +1367,24 @@ static void server_connect_error( const char *serverdir ) */ static int server_connect(void) { - const char *serverdir; struct sockaddr_un addr; struct stat st; int s, slen, retry, fd_cwd; fd_cwd = setup_config_dir(); - serverdir = wine_get_server_dir(); /* chdir to the server directory */ - if (chdir( serverdir ) == -1) + if (chdir( server_dir ) == -1) { - if (errno != ENOENT) fatal_perror( "chdir to %s", serverdir ); + if (errno != ENOENT) fatal_perror( "chdir to %s", server_dir ); start_server(); - if (chdir( serverdir ) == -1) fatal_perror( "chdir to %s", serverdir ); + if (chdir( server_dir ) == -1) fatal_perror( "chdir to %s", server_dir ); } /* make sure we are at the right place */ - if (stat( ".", &st ) == -1) fatal_perror( "stat %s", serverdir ); - if (st.st_uid != getuid()) fatal_error( "'%s' is not owned by you\n", serverdir ); - if (st.st_mode & 077) fatal_error( "'%s' must not be accessible by other users\n", serverdir ); + if (stat( ".", &st ) == -1) fatal_perror( "stat %s", server_dir ); + if (st.st_uid != getuid()) fatal_error( "'%s' is not owned by you\n", server_dir ); + if (st.st_mode & 077) fatal_error( "'%s' must not be accessible by other users\n", server_dir ); for (retry = 0; retry < 6; retry++) { @@ -1364,16 +1397,16 @@ static int server_connect(void) } else if (lstat( SOCKETNAME, &st ) == -1) /* check for an already existing socket */ { - if (errno != ENOENT) fatal_perror( "lstat %s/%s", serverdir, SOCKETNAME ); + if (errno != ENOENT) fatal_perror( "lstat %s/%s", server_dir, SOCKETNAME ); start_server(); if (lstat( SOCKETNAME, &st ) == -1) continue; /* still no socket, wait a bit more */ } /* make sure the socket is sane (ISFIFO needed for Solaris) */ if (!S_ISSOCK(st.st_mode) && !S_ISFIFO(st.st_mode)) - fatal_error( "'%s/%s' is not a socket\n", serverdir, SOCKETNAME ); + fatal_error( "'%s/%s' is not a socket\n", server_dir, SOCKETNAME ); if (st.st_uid != getuid()) - fatal_error( "'%s/%s' is not owned by you\n", serverdir, SOCKETNAME ); + fatal_error( "'%s/%s' is not owned by you\n", server_dir, SOCKETNAME ); /* try to connect to it */ addr.sun_family = AF_UNIX; @@ -1403,7 +1436,7 @@ static int server_connect(void) } close( s ); } - server_connect_error( serverdir ); + server_connect_error( server_dir ); } @@ -1426,7 +1459,7 @@ static void send_server_task_port(void) if (task_get_bootstrap_port(mach_task_self(), &bootstrap_port) != KERN_SUCCESS) return; - kret = bootstrap_look_up(bootstrap_port, (char*)wine_get_server_dir(), &wineserver_port); + kret = bootstrap_look_up(bootstrap_port, server_dir, &wineserver_port); if (kret != KERN_SUCCESS) fatal_error( "cannot find the server port: 0x%08x\n", kret );

1 0

Zebediah Figura : wineusb.sys: Avoid touching the IRP structure after queueing it.
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: c2854d8be29b701515acd5990515b96692af03aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2854d8be29b701515acd599… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 25 10:37:19 2020 -0500 wineusb.sys: Avoid touching the IRP structure after queueing it. Spotted by Thomas Faber. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineusb.sys/wineusb.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index d79112b479..3e6a959a78 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -498,8 +498,9 @@ static void transfer_cb(struct libusb_transfer *transfer) static void queue_irp(struct usb_device *device, IRP *irp, struct libusb_transfer *transfer) { - EnterCriticalSection(&wineusb_cs); + IoMarkIrpPending(irp); irp->Tail.Overlay.DriverContext[0] = transfer; + EnterCriticalSection(&wineusb_cs); InsertTailList(&device->irp_list, &irp->Tail.Overlay.ListEntry); LeaveCriticalSection(&wineusb_cs); } @@ -729,11 +730,7 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device_obj, IRP *irp code, code >> 16, (code >> 14) & 3, (code >> 2) & 0xfff, code & 3); } - if (status == STATUS_PENDING) - { - IoMarkIrpPending(irp); - } - else + if (status != STATUS_PENDING) { irp->IoStatus.Status = status; IoCompleteRequest(irp, IO_NO_INCREMENT);

1 0

Jacek Caban : server: Fix setting context flags in get_thread_context.
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: c3fac6e36caab168974dd04a60ae1bbb1a0fd919 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3fac6e36caab168974dd04a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Apr 25 21:13:33 2020 +0200 server: Fix setting context flags in get_thread_context. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49011 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/thread.c | 15 +++++++++++++++ server/thread.c | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index b6a65a4207..e068797ff5 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1175,6 +1175,20 @@ static void test_SetThreadContext(void) CloseHandle( thread ); } +static void test_GetThreadContext(void) +{ + CONTEXT ctx; + BOOL ret; + + memset(&ctx, 0xcc, sizeof(ctx)); + ctx.ContextFlags = CONTEXT_DEBUG_REGISTERS; + ret = GetThreadContext(GetCurrentThread(), &ctx); + ok(ret, "GetThreadContext failed: %u\n", GetLastError()); + ok(ctx.ContextFlags == CONTEXT_DEBUG_REGISTERS, "ContextFlags = %x\n", ctx.ContextFlags); + ok(!ctx.Dr0, "Dr0 = %x\n", ctx.Dr0); + ok(!ctx.Dr1, "Dr0 = %x\n", ctx.Dr0); +} + static void test_GetThreadSelectorEntry(void) { LDT_ENTRY entry; @@ -2379,6 +2393,7 @@ START_TEST(thread) #ifdef __i386__ test_SetThreadContext(); test_GetThreadSelectorEntry(); + test_GetThreadContext(); #endif test_QueueUserWorkItem(); test_RegisterWaitForSingleObject(); diff --git a/server/thread.c b/server/thread.c index cfdf42c756..7c1c1108eb 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1848,7 +1848,7 @@ DECL_HANDLER(get_thread_context) { assert( reply->self ); memset( context, 0, sizeof(context_t) ); - context->cpu = thread_context->regs.cpu; + context->cpu = thread->process->cpu; if (req->flags & system_flags) { get_thread_context( thread, context, req->flags & system_flags );

1 0

Zebediah Figura : cmd: Use _wsplitpath() from msvcrt.
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: 60b3db6b98bd91f2d5c7b6093c4df7ab4ba72c17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60b3db6b98bd91f2d5c7b609… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 25 22:53:36 2020 -0500 cmd: Use _wsplitpath() from msvcrt. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/batch.c | 54 +----------------------------------------------- programs/cmd/builtins.c | 10 ++++----- programs/cmd/directory.c | 6 +++--- programs/cmd/wcmd.h | 1 - 4 files changed, 9 insertions(+), 62 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 371f75af54..06437ecf1b 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -301,58 +301,6 @@ WCHAR *WCMD_fgets(WCHAR *buf, DWORD noChars, HANDLE h) return buf; } -/* WCMD_splitpath - copied from winefile as no obvious way to use it otherwise */ -void WCMD_splitpath(const WCHAR* path, WCHAR* drv, WCHAR* dir, WCHAR* name, WCHAR* ext) -{ - const WCHAR* end; /* end of processed string */ - const WCHAR* p; /* search pointer */ - const WCHAR* s; /* copy pointer */ - - /* extract drive name */ - if (path[0] && path[1]==':') { - if (drv) { - *drv++ = *path++; - *drv++ = *path++; - *drv = '\0'; - } - } else if (drv) - *drv = '\0'; - - end = path + lstrlenW(path); - - /* search for begin of file extension */ - for(p=end; p>path && *--p!='\\' && *p!='/'; ) - if (*p == '.') { - end = p; - break; - } - - if (ext) - for(s=end; (*ext=*s++); ) - ext++; - - /* search for end of directory name */ - for(p=end; p>path; ) - if (*--p=='\\' || *p=='/') { - p++; - break; - } - - if (name) { - for(s=p; s<end; ) - *name++ = *s++; - - *name = '\0'; - } - - if (dir) { - for(s=path; s<p; ) - *dir++ = *s++; - - *dir = '\0'; - } -} - /**************************************************************************** * WCMD_HandleTildaModifiers * @@ -627,7 +575,7 @@ void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute) BOOL addSpace = (finaloutput[0] != 0x00); /* Split into components */ - WCMD_splitpath(fullfilename, drive, dir, fname, ext); + _wsplitpath(fullfilename, drive, dir, fname, ext); /* 5. Handle 'd' : Drive Letter */ if (wmemchr(firstModifier, 'd', modifierLen) != NULL) { diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 43c4d9efef..1870e5688d 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1217,7 +1217,7 @@ static BOOL WCMD_delete_confirm_wildcard(const WCHAR *filename, BOOL *pPrompted) /* Convert path into actual directory spec */ GetFullPathNameW(filename, ARRAY_SIZE(fpath), fpath, NULL); - WCMD_splitpath(fpath, drive, dir, fname, ext); + _wsplitpath(fpath, drive, dir, fname, ext); /* Only prompt for * and *.*, not *a, a*, *.a* etc */ if ((lstrcmpW(fname, starW) == 0) && @@ -1352,7 +1352,7 @@ static BOOL WCMD_delete_one (const WCHAR *thisArg) { /* Convert path into actual directory spec */ GetFullPathNameW(argCopy, ARRAY_SIZE(thisDir), thisDir, NULL); - WCMD_splitpath(thisDir, drive, dir, fname, ext); + _wsplitpath(thisDir, drive, dir, fname, ext); lstrcpyW(thisDir, drive); lstrcatW(thisDir, dir); @@ -2986,7 +2986,7 @@ void WCMD_move (void) wine_dbgstr_w(param1), wine_dbgstr_w(output)); /* Split into components */ - WCMD_splitpath(input, drive, dir, fname, ext); + _wsplitpath(input, drive, dir, fname, ext); hff = FindFirstFileW(input, &fd); if (hff == INVALID_HANDLE_VALUE) @@ -3207,7 +3207,7 @@ void WCMD_rename (void) dotDst = wcschr(param2, '.'); /* Split into components */ - WCMD_splitpath(input, drive, dir, fname, ext); + _wsplitpath(input, drive, dir, fname, ext); hff = FindFirstFileW(input, &fd); if (hff == INVALID_HANDLE_VALUE) @@ -3492,7 +3492,7 @@ void WCMD_setshow_default (const WCHAR *args) { /* Convert path into actual directory spec */ GetFullPathNameW(string, ARRAY_SIZE(fpath), fpath, NULL); - WCMD_splitpath(fpath, drive, dir, fname, ext); + _wsplitpath(fpath, drive, dir, fname, ext); /* Rebuild path */ wsprintfW(string, fmt, drive, dir, fd.cFileName); diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 41e1f4e929..2d35f8eb1d 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -166,8 +166,8 @@ static int __cdecl WCMD_dir_sort (const void *a, const void *b) WCHAR extB[MAX_PATH]; /* Split into components */ - WCMD_splitpath(filea->cFileName, drive, dir, fname, extA); - WCMD_splitpath(fileb->cFileName, drive, dir, fname, extB); + _wsplitpath(filea->cFileName, drive, dir, fname, extA); + _wsplitpath(fileb->cFileName, drive, dir, fname, extB); result = lstrcmpiW(extA, extB); } @@ -819,7 +819,7 @@ void WCMD_directory (WCHAR *args) thisEntry->next = NULL; /* Split into components */ - WCMD_splitpath(path, drive, dir, fname, ext); + _wsplitpath(path, drive, dir, fname, ext); WINE_TRACE("Path Parts: drive: '%s' dir: '%s' name: '%s' ext:'%s'\n", wine_dbgstr_w(drive), wine_dbgstr_w(dir), wine_dbgstr_w(fname), wine_dbgstr_w(ext)); diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 112fc1a1ea..247f3dfdf3 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -117,7 +117,6 @@ WCHAR *WCMD_skip_leading_spaces (WCHAR *string); BOOL WCMD_keyword_ws_found(const WCHAR *keyword, int len, const WCHAR *ptr); void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute); -void WCMD_splitpath(const WCHAR* path, WCHAR* drv, WCHAR* dir, WCHAR* name, WCHAR* ext); WCHAR *WCMD_strip_quotes(WCHAR *cmd); WCHAR *WCMD_LoadMessage(UINT id); void WCMD_strsubstW(WCHAR *start, const WCHAR* next, const WCHAR* insert, int len);

1 0

Zebediah Figura : cmd: Fix the spelling of "tilde".
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: 16c938cb6611c7d0b5d270e2b35aab383570e8eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=16c938cb6611c7d0b5d270e2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 25 22:53:37 2020 -0500 cmd: Fix the spelling of "tilde". Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/batch.c | 4 ++-- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 06437ecf1b..3aa40874ae 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -302,7 +302,7 @@ WCHAR *WCMD_fgets(WCHAR *buf, DWORD noChars, HANDLE h) } /**************************************************************************** - * WCMD_HandleTildaModifiers + * WCMD_HandleTildeModifiers * * Handle the ~ modifiers when expanding %0-9 or (%a-z/A-Z in for command) * %~xxxxxV (V=0-9 or A-Z, a-z) @@ -333,7 +333,7 @@ WCHAR *WCMD_fgets(WCHAR *buf, DWORD noChars, HANDLE h) * Hence search forwards until find an invalid modifier, and then * backwards until find for variable or 0-9 */ -void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute) +void WCMD_HandleTildeModifiers(WCHAR **start, BOOL atExecute) { #define NUMMODIFIERS 11 diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 247f3dfdf3..9ae87ea706 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -115,7 +115,7 @@ WCHAR *WCMD_parameter_with_delims (WCHAR *s, int n, WCHAR **start, BOOL raw, BOOL wholecmdline, const WCHAR *delims); WCHAR *WCMD_skip_leading_spaces (WCHAR *string); BOOL WCMD_keyword_ws_found(const WCHAR *keyword, int len, const WCHAR *ptr); -void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute); +void WCMD_HandleTildeModifiers(WCHAR **start, BOOL atExecute); WCHAR *WCMD_strip_quotes(WCHAR *cmd); WCHAR *WCMD_LoadMessage(UINT id); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 2834986bf9..90df222b16 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -853,7 +853,7 @@ static void handleExpansion(WCHAR *cmd, BOOL atExecute, BOOL delayed) { /* Replace %~ modifications if in batch program */ } else if (*(p+1) == '~') { - WCMD_HandleTildaModifiers(&p, atExecute); + WCMD_HandleTildeModifiers(&p, atExecute); p++; /* Replace use of %0...%9 if in batch program*/

1 0

Zebediah Figura : cmd: Ignore quotes when parsing command line parameters.
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: 2e45fdb194efe383189c9ce44c6c51b4be837c79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e45fdb194efe383189c9ce4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 25 22:53:38 2020 -0500 cmd: Ignore quotes when parsing command line parameters. This fixes a hang in the WinTV 8.5 installer. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/tests/test_cmdline.cmd | 19 +++++-- programs/cmd/tests/test_cmdline.cmd.exp | 12 +++- programs/cmd/wcmdmain.c | 97 +++++++++++++++------------------ 3 files changed, 68 insertions(+), 60 deletions(-) diff --git a/programs/cmd/tests/test_cmdline.cmd b/programs/cmd/tests/test_cmdline.cmd index 32a1ef2e48..7a7f8d7b63 100644 --- a/programs/cmd/tests/test_cmdline.cmd +++ b/programs/cmd/tests/test_cmdline.cmd @@ -183,12 +183,19 @@ echo ------- Testing CMD /C qualifier treatment ------------ rem no need for space after /c cmd /csay one cmd /c"say one" -rem ignore quote before qualifier -rem FIXME the next command in wine starts a sub-CMD -echo THIS FAILS: cmd "/c"say one -rem ignore anything before /c -rem FIXME the next command in wine starts a sub-CMD -echo THIS FAILS: cmd ignoreme/c say one +cmd /c"say one +cmd /c=say one +cmd /c,say one +cmd /c;say one +rem non-options are ignored before /c; quotes are not treated specially +cmd "/c"say one +cmd ignoreme/c say one +cmd abc "def ghi/c say one" +cmd -\@$*'"/c say one +echo echo bar > foo.bat +cmd /qq/c foo +cmd /q "xyz /c foo" +del foo.bat echo --------- Testing special characters -------------- echo @echo amp > "say&.bat" diff --git a/programs/cmd/tests/test_cmdline.cmd.exp b/programs/cmd/tests/test_cmdline.cmd.exp index 980f67411c..7978a249c9 100644 --- a/programs/cmd/tests/test_cmdline.cmd.exp +++ b/programs/cmd/tests/test_cmdline.cmd.exp @@ -90,8 +90,16 @@ Passed ------- Testing CMD /C qualifier treatment ------------ 0(a)space@ 1(a)space@ -THIS FAILS: cmd "/c"say one -THIS FAILS: cmd ignoreme/c say one +0(a)space@ +0(a)space@ +0(a)space@ +0(a)space@ +0(a)space@ +0(a)space@ +0(a)space@ +0(a)space@ +bar(a)space@ +bar(a)space@ --------- Testing special characters -------------- 0(a)space@ 0(a)space@ diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 90df222b16..2819f7fa99 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2421,10 +2421,8 @@ void WCMD_free_commands(CMD_LIST *cmds) { int __cdecl wmain (int argc, WCHAR *argvW[]) { - int args; WCHAR *cmdLine = NULL; WCHAR *cmd = NULL; - WCHAR *argPos = NULL; WCHAR string[1024]; WCHAR envvar[4]; BOOL promptNewLine = TRUE; @@ -2440,6 +2438,7 @@ int __cdecl wmain (int argc, WCHAR *argvW[]) RTL_OSVERSIONINFOEXW osv; char osver[50]; STARTUPINFOW startupInfo; + const WCHAR *arg; if (!GetEnvironmentVariableW(comspecW, comspec, ARRAY_SIZE(comspec))) { @@ -2467,57 +2466,55 @@ int __cdecl wmain (int argc, WCHAR *argvW[]) */ cmdLine = GetCommandLineW(); WINE_TRACE("Full commandline '%s'\n", wine_dbgstr_w(cmdLine)); - args = 0; + + while (*cmdLine && *cmdLine != '/') ++cmdLine; opt_c = opt_k = opt_q = opt_s = FALSE; - WCMD_parameter(cmdLine, args, &argPos, TRUE, TRUE); - while (argPos && argPos[0] != 0x00) - { - WCHAR c; - WINE_TRACE("Command line parm: '%s'\n", wine_dbgstr_w(argPos)); - if (argPos[0]!='/' || argPos[1]=='\0') { - args++; - WCMD_parameter(cmdLine, args, &argPos, TRUE, TRUE); - continue; - } - c=argPos[1]; - if (towlower(c)=='c') { - opt_c = TRUE; - } else if (towlower(c)=='q') { - opt_q = TRUE; - } else if (towlower(c)=='k') { - opt_k = TRUE; - } else if (towlower(c)=='s') { - opt_s = TRUE; - } else if (towlower(c)=='a') { - unicodeOutput = FALSE; - } else if (towlower(c)=='u') { - unicodeOutput = TRUE; - } else if (towlower(c)=='v' && argPos[2]==':') { - delayedsubst = wcsnicmp(&argPos[3], offW, 3); - if (delayedsubst) WINE_TRACE("Delayed substitution is on\n"); - } else if (towlower(c)=='t' && argPos[2]==':') { - opt_t=wcstoul(&argPos[3], NULL, 16); - } else if (towlower(c)=='x' || towlower(c)=='y') { - /* Ignored for compatibility with Windows */ - } + for (arg = cmdLine; *arg; ++arg) + { + if (arg[0] != '/') + continue; - if (argPos[2]==0 || argPos[2]==' ' || argPos[2]=='\t' || - towlower(c)=='v') { - args++; - WCMD_parameter(cmdLine, args, &argPos, TRUE, TRUE); - } - else /* handle `cmd /cnotepad.exe` and `cmd /x/c ...` */ - { - /* Do not step to next parameter, instead carry on parsing this one */ - argPos+=2; - } + switch (towlower(arg[1])) + { + case 'a': + unicodeOutput = FALSE; + break; + case 'c': + opt_c = TRUE; + break; + case 'k': + opt_k = TRUE; + break; + case 'q': + opt_q = TRUE; + break; + case 's': + opt_s = TRUE; + break; + case 't': + if (arg[2] == ':') + opt_t = wcstoul(&arg[3], NULL, 16); + break; + case 'u': + unicodeOutput = TRUE; + break; + case 'v': + if (arg[2] == ':') + delayedsubst = wcsnicmp(&arg[3], L"OFF", 3); + break; + } - if (opt_c || opt_k) /* break out of parsing immediately after c or k */ - break; + if (opt_c || opt_k) + { + arg += 2; + break; + } } + while (*arg && wcschr(L" \t,=;", *arg)) arg++; + if (opt_q) { WCMD_echo(offW); } @@ -2531,12 +2528,8 @@ int __cdecl wmain (int argc, WCHAR *argvW[]) int len; WCHAR *q1 = NULL,*q2 = NULL,*p; - /* Handle very edge case error scenario, "cmd.exe /c" ie when there are no - * parameters after the /C or /K by pretending there was a single space */ - if (argPos == NULL) argPos = (WCHAR *)spaceW; - /* Take a copy */ - cmd = heap_strdupW(argPos); + cmd = heap_strdupW(arg); /* opt_s left unflagged if the command starts with and contains exactly * one quoted string (exactly two quote characters). The quoted string @@ -2545,7 +2538,7 @@ int __cdecl wmain (int argc, WCHAR *argvW[]) if (!opt_s) { /* 1. Confirm there is at least one quote */ - q1 = wcschr(argPos, '"'); + q1 = wcschr(arg, '"'); if (!q1) opt_s=1; }

1 0

Zebediah Figura : wine.inf: Install WMI DLLs in the wbem subdirectory in WoW64 too.
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: d7c9cd2e2f12d18b54a56fff26a9a544e3f8027a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7c9cd2e2f12d18b54a56fff… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Apr 26 09:13:19 2020 -0500 wine.inf: Install WMI DLLs in the wbem subdirectory in WoW64 too. Hauppauge WinTV 8.5 expects to find wmic.exe here. Without this patch it incorrectly reports that a device is connected. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index dbdec4c38a..e602546da8 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2603,6 +2603,10 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,gecko\plugin,npmshtml.dll 11,Speech\Common,sapi.dll 11,wbem,mofcomp.exe +11,wbem,wbemdisp.dll +11,wbem,wbemprox.dll +11,wbem,wmic.exe +11,wbem,wmiutils.dll 11,WindowsPowerShell\v1.0,powershell.exe 10,syswow64,stdole2.tlb 11,,iexplore.exe

1 0

Zebediah Figura : http.sys: Avoid touching the IRP structure after queueing it.
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: a7908da4cdce5acc5fa213bc969596368bc8a3bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7908da4cdce5acc5fa213bc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Apr 26 21:13:18 2020 -0500 http.sys: Avoid touching the IRP structure after queueing it. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/http.sys/http.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index f424a4fecc..46590f972f 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -1233,6 +1233,7 @@ static NTSTATUS http_receive_request(struct request_queue *queue, IRP *irp) } else { + IoMarkIrpPending(irp); InsertTailList(&queue->irp_queue, &irp->Tail.Overlay.ListEntry); ret = STATUS_PENDING; } @@ -1362,8 +1363,6 @@ static NTSTATUS WINAPI dispatch_ioctl(DEVICE_OBJECT *device, IRP *irp) irp->IoStatus.Status = ret; IoCompleteRequest(irp, IO_NO_INCREMENT); } - else - IoMarkIrpPending(irp); return ret; }

1 0

Nikolay Sivov : mfuuid: Add file scheme handler CLSID to static library.
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: 17db99e318cbf95674ae424d332f5873d9033c6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=17db99e318cbf95674ae424d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 27 10:44:38 2020 +0300 mfuuid: Add file scheme handler CLSID to static library. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/main.c | 8 ++------ dlls/mf/mf.idl | 4 ++-- dlls/mfuuid/mfuuid.c | 1 + 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/mf/main.c b/dlls/mf/main.c index 01fe17866c..15c9e5e3c9 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -26,11 +26,6 @@ #include "mfidl.h" #include "rpcproxy.h" -#include "initguid.h" -#include "mf.h" - -#undef INITGUID -#include <guiddef.h> #include "mfapi.h" #include "mferror.h" @@ -43,6 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); static HINSTANCE mf_instance; +extern const GUID CLSID_FileSchemePlugin; struct activate_object { @@ -1032,7 +1028,7 @@ static const struct class_object } class_objects[] = { - { &CLSID_FileSchemeHandler, &file_scheme_handler_factory.IClassFactory_iface }, + { &CLSID_FileSchemePlugin, &file_scheme_handler_factory.IClassFactory_iface }, }; /******************************************************************************* diff --git a/dlls/mf/mf.idl b/dlls/mf/mf.idl index 824c246d30..289a521b4f 100644 --- a/dlls/mf/mf.idl +++ b/dlls/mf/mf.idl @@ -16,11 +16,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma makedep header register +#pragma makedep register [ helpstring("File scheme handler"), threading(both), uuid(477ec299-1421-4bdd-971f-7ccb933f21ad) ] -coclass FileSchemeHandler { } +coclass FileSchemePlugin { } diff --git a/dlls/mfuuid/mfuuid.c b/dlls/mfuuid/mfuuid.c index 8801eac8b8..537eaef642 100644 --- a/dlls/mfuuid/mfuuid.c +++ b/dlls/mfuuid/mfuuid.c @@ -34,3 +34,4 @@ #include "mfmediaengine.h" DEFINE_GUID(MF_SCRUBBING_SERVICE, 0xdd0ac3d8,0x40e3,0x4128,0xac,0x48,0xc0,0xad,0xd0,0x67,0xb7,0x14); +DEFINE_GUID(CLSID_FileSchemePlugin, 0x477ec299,0x1421,0x4bdd,0x97,0x1f,0x7c,0xcb,0x93,0x3f,0x21,0xad);

1 0