December 2019 - Wine-commits

Paul Gofman : kernel32/tests: Add a basic test for PROC_THREAD_ATTRIBUTE_PARENT_PROCESS process creation attribute.
by Alexandre Julliard 05 Dec '19

05 Dec '19

Module: wine Branch: master Commit: 52d8ea3aa8e576ac626cb309686dfdbe14ee4d9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=52d8ea3aa8e576ac626cb309… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Dec 5 16:38:54 2019 +0300 kernel32/tests: Add a basic test for PROC_THREAD_ATTRIBUTE_PARENT_PROCESS process creation attribute. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 126 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 124 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index f181536e7a..a3118d11bf 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -36,6 +36,7 @@ #include "tlhelp32.h" #include "wine/test.h" +#include "wine/heap.h" /* PROCESS_ALL_ACCESS in Vista+ PSDKs is incompatible with older Windows versions */ #define PROCESS_ALL_ACCESS_NT4 (PROCESS_ALL_ACCESS & ~0xf000) @@ -3808,6 +3809,120 @@ static void test_ProcThreadAttributeList(void) pDeleteProcThreadAttributeList(&list); } +/* level 0: Main test process + * level 1: Process created by level 0 process without handle inheritance + * level 2: Process created by level 1 process with handle inheritance and level 0 + * process parent substitute. */ +void test_parent_process_attribute(unsigned int level, HANDLE read_pipe) +{ + PROCESS_BASIC_INFORMATION pbi; + char buffer[MAX_PATH + 64]; + HANDLE write_pipe = NULL; + PROCESS_INFORMATION info; + SECURITY_ATTRIBUTES sa; + STARTUPINFOEXA si; + DWORD parent_id; + NTSTATUS status; + ULONG pbi_size; + HANDLE parent; + DWORD size; + BOOL ret; + + struct + { + HANDLE parent; + DWORD parent_id; + } + parent_data; + + if (!pInitializeProcThreadAttributeList) + { + win_skip("No support for ProcThreadAttributeList.\n"); + return; + } + + memset(&sa, 0, sizeof(sa)); + sa.nLength = sizeof(sa); + sa.bInheritHandle = TRUE; + + if (!level) + { + ret = CreatePipe(&read_pipe, &write_pipe, &sa, 0); + ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + + parent_data.parent = OpenProcess(PROCESS_CREATE_PROCESS | PROCESS_QUERY_INFORMATION, TRUE, GetCurrentProcessId()); + parent_data.parent_id = GetCurrentProcessId(); + } + else + { + status = NtQueryInformationProcess(GetCurrentProcess(), ProcessBasicInformation, &pbi, sizeof(pbi), &pbi_size); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + parent_id = pbi.InheritedFromUniqueProcessId; + + memset(&parent_data, 0, sizeof(parent_data)); + ret = ReadFile(read_pipe, &parent_data, sizeof(parent_data), &size, NULL); + todo_wine_if(level == 2) ok((level == 2 && ret) || (level == 1 && !ret && GetLastError() == ERROR_INVALID_HANDLE), + "Got unexpected ret %#x, level %u, GetLastError() %u.\n", + ret, level, GetLastError()); + } + + if (level == 2) + { + todo_wine ok(parent_id == parent_data.parent_id, "Got parent id %u, parent_data.parent_id %u.\n", + parent_id, parent_data.parent_id); + return; + } + + memset(&si, 0, sizeof(si)); + si.StartupInfo.cb = sizeof(si.StartupInfo); + + if (level) + { + SIZE_T size; + + ret = pInitializeProcThreadAttributeList(NULL, 1, 0, &size); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + si.lpAttributeList = heap_alloc(size); + ret = pInitializeProcThreadAttributeList(si.lpAttributeList, 1, 0, &size); + ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + + parent = OpenProcess(PROCESS_CREATE_PROCESS, FALSE, parent_id); + + ret = pUpdateProcThreadAttribute(si.lpAttributeList, 0, PROC_THREAD_ATTRIBUTE_PARENT_PROCESS, + &parent, sizeof(parent), NULL, NULL); + ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + } + + sprintf(buffer, "\"%s\" tests/process.c parent %u %p", selfname, level + 1, read_pipe); + ret = CreateProcessA(NULL, buffer, NULL, NULL, level == 1, level == 1 ? EXTENDED_STARTUPINFO_PRESENT : 0, + NULL, NULL, (STARTUPINFOA *)&si, &info); + ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + + if (level) + { + pDeleteProcThreadAttributeList(si.lpAttributeList); + heap_free(si.lpAttributeList); + CloseHandle(parent); + } + else + { + ret = WriteFile(write_pipe, &parent_data, sizeof(parent_data), &size, NULL); + } + + /* wait for child to terminate */ + ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); + + if (!level) + { + CloseHandle(read_pipe); + CloseHandle(write_pipe); + CloseHandle(parent_data.parent); + } +} + START_TEST(process) { HANDLE job; @@ -3851,11 +3966,18 @@ START_TEST(process) CloseHandle(info.hThread); return; } + else if (!strcmp(myARGV[2], "parent") && myARGC >= 5) + { + HANDLE h; + + sscanf(myARGV[4], "%p", &h); + test_parent_process_attribute(atoi(myARGV[3]), h); + return; + } ok(0, "Unexpected command %s\n", myARGV[2]); return; } - hproc = OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION, FALSE, GetCurrentProcessId()); if (hproc) { @@ -3865,7 +3987,6 @@ START_TEST(process) else win_skip("PROCESS_QUERY_LIMITED_INFORMATION is not supported on this platform\n"); test_process_info(GetCurrentProcess()); - test_TerminateProcess(); test_Startup(); test_CommandLine(); @@ -3919,4 +4040,5 @@ START_TEST(process) test_jobInheritance(job); test_BreakawayOk(job); CloseHandle(job); + test_parent_process_attribute(0, NULL); }

1 0

Jacek Caban : jscript: Import to_int32 implementation from WebKit.
by Alexandre Julliard 05 Dec '19

05 Dec '19

Module: wine Branch: master Commit: cac0fedd339e79e16d8890bbc5e5a4fb0eb7d94f URL: https://source.winehq.org/git/wine.git/?a=commit;h=cac0fedd339e79e16d8890bb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 5 15:40:48 2019 +0100 jscript: Import to_int32 implementation from WebKit. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jsutils.c | 63 +++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 50 insertions(+), 13 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 0702c4e0be..a36c9c1e5b 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -657,37 +657,74 @@ HRESULT to_integer(script_ctx_t *ctx, jsval_t v, double *ret) return S_OK; } +static INT32 double_to_int32(double number) +{ + INT32 exp, result; + union { + double d; + INT64 n; + } bits; + + bits.d = number; + exp = ((INT32)(bits.n >> 52) & 0x7ff) - 0x3ff; + + /* If exponent < 0 there will be no bits to the left of the decimal point + * after rounding; if the exponent is > 83 then no bits of precision can be + * left in the low 32-bit range of the result (IEEE-754 doubles have 52 bits + * of fractional precision). + * Note this case handles 0, -0, and all infinte, NaN, & denormal value. */ + if(exp < 0 || exp > 83) + return 0; + + /* Select the appropriate 32-bits from the floating point mantissa. If the + * exponent is 52 then the bits we need to select are already aligned to the + * lowest bits of the 64-bit integer representation of tghe number, no need + * to shift. If the exponent is greater than 52 we need to shift the value + * left by (exp - 52), if the value is less than 52 we need to shift right + * accordingly. */ + result = (exp > 52) ? bits.n << (exp - 52) : bits.n >> (52 - exp); + + /* IEEE-754 double precision values are stored omitting an implicit 1 before + * the decimal point; we need to reinsert this now. We may also the shifted + * invalid bits into the result that are not a part of the mantissa (the sign + * and exponent bits from the floatingpoint representation); mask these out. */ + if(exp < 32) { + INT32 missing_one = 1 << exp; + result &= missing_one - 1; + result += missing_one; + } + + /* If the input value was negative (we could test either 'number' or 'bits', + * but testing 'bits' is likely faster) invert the result appropriately. */ + return bits.n < 0 ? -result : result; +} + /* ECMA-262 3rd Edition 9.5 */ HRESULT to_int32(script_ctx_t *ctx, jsval_t v, INT *ret) { double n; HRESULT hres; - const double p32 = (double)0xffffffff + 1; - hres = to_number(ctx, v, &n); if(FAILED(hres)) return hres; - if(is_finite(n)) - n = n > 0 ? fmod(n, p32) : -fmod(-n, p32); - else - n = 0; - - *ret = (UINT32)n; + *ret = double_to_int32(n); return S_OK; } /* ECMA-262 3rd Edition 9.6 */ HRESULT to_uint32(script_ctx_t *ctx, jsval_t val, UINT32 *ret) { - INT32 n; + double n; HRESULT hres; - hres = to_int32(ctx, val, &n); - if(SUCCEEDED(hres)) - *ret = n; - return hres; + hres = to_number(ctx, val, &n); + if(FAILED(hres)) + return hres; + + *ret = double_to_int32(n); + return S_OK; } HRESULT double_to_string(double n, jsstr_t **str)

1 0

Vincent Povirk : mscoree: Ignore empty privatePath.
by Alexandre Julliard 05 Dec '19

05 Dec '19

Module: wine Branch: master Commit: a391492a96b2e528067b1925486567578d0bfc34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a391492a96b2e528067b1925… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Dec 5 11:11:54 2019 -0600 mscoree: Ignore empty privatePath. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/corruntimehost.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index e932a7f58b..a900ed6a3e 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1478,7 +1478,7 @@ __int32 WINAPI _CorExeMain(void) wcscat(config_file, dotconfig); hr = parse_config_file(config_file, &parsed_config); - if (SUCCEEDED(hr) && parsed_config.private_path) + if (SUCCEEDED(hr) && parsed_config.private_path && parsed_config.private_path[0]) { for(i = 0; parsed_config.private_path[i] != 0; i++) if (parsed_config.private_path[i] == ';') number_of_private_paths++;

1 0

Alexandre Julliard : server: Determine the server directory in the server itself.
by Alexandre Julliard 05 Dec '19

05 Dec '19

Module: wine Branch: master Commit: fe13f7a3b0d0ad709676aa046cb4c9da260900cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe13f7a3b0d0ad709676aa04… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 5 21:57:52 2019 +0100 server: Determine the server directory in the server itself. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/mach.c | 2 +- server/request.c | 80 +++++++++++++++++++++++++++++++++++--------------------- server/request.h | 1 + 3 files changed, 52 insertions(+), 31 deletions(-) diff --git a/server/mach.c b/server/mach.c index 9d8d911cb7..e5a532dc6c 100644 --- a/server/mach.c +++ b/server/mach.c @@ -90,7 +90,7 @@ void init_tracing_mechanism(void) server_mach_port, MACH_MSG_TYPE_MAKE_SEND ) != KERN_SUCCESS) fatal_error("Error inserting rights\n"); - if (bootstrap_register(bp, (char*)wine_get_server_dir(), server_mach_port) != KERN_SUCCESS) + if (bootstrap_register(bp, server_dir, server_mach_port) != KERN_SUCCESS) fatal_error("Can't check in server_mach_port\n"); mach_port_deallocate(mach_task_self(), bp); } diff --git a/server/request.c b/server/request.c index 5610d392cf..4aad126eec 100644 --- a/server/request.c +++ b/server/request.c @@ -127,6 +127,7 @@ static const struct fd_ops master_socket_fd_ops = struct thread *current = NULL; /* thread handling the current request */ unsigned int global_error = 0; /* global error code for when no thread is current */ timeout_t server_start_time = 0; /* server startup time */ +char *server_dir = NULL; /* server directory */ int server_dir_fd = -1; /* file descriptor for the server dir */ int config_dir_fd = -1; /* file descriptor for the config dir */ @@ -603,7 +604,7 @@ static void create_dir( const char *name, struct stat *st ) if (lstat( name, st ) == -1) { if (errno != ENOENT) - fatal_error( "lstat %s: %s", name, strerror( errno )); + fatal_error( "lstat %s: %s\n", name, strerror( errno )); if (mkdir( name, 0700 ) == -1 && errno != EEXIST) fatal_error( "mkdir %s: %s\n", name, strerror( errno )); if (lstat( name, st ) == -1) @@ -615,22 +616,52 @@ static void create_dir( const char *name, struct stat *st ) } /* create the server directory and chdir to it */ -static void create_server_dir( const char *dir ) +static char *create_server_dir( int force ) { - char *p, *server_dir; + const char *config_dir = wine_get_config_dir(); + char *p; struct stat st, st2; + size_t len = sizeof("/server-") + 2 * sizeof(st.st_dev) + 2 * sizeof(st.st_ino) + 2; - if (!(server_dir = strdup( dir ))) fatal_error( "out of memory\n" ); - - /* first create the base directory if needed */ + if (chdir( config_dir ) == -1) + { + if (errno != ENOENT || force) fatal_error( "chdir to %s: %s\n", config_dir, strerror( errno )); + return NULL; + } + if ((config_dir_fd = open( ".", O_RDONLY )) == -1) + fatal_error( "open %s: %s\n", config_dir, strerror( errno )); - p = strrchr( server_dir, '/' ); - *p = 0; - create_dir( server_dir, &st ); + /* create the base directory if needed */ + +#ifdef __ANDROID__ /* there's no /tmp dir on Android */ + len += strlen( config_dir ) + sizeof("/.wineserver"); + if (!(server_dir = malloc( len ))) fatal_error( "out of memory\n" ); + strcpy( server_dir, config_dir ); + strcat( server_dir, "/.wineserver" ); +#else + len += sizeof("/tmp/.wine-") + 12; + if (!(server_dir = malloc( len ))) fatal_error( "out of memory\n" ); + sprintf( server_dir, "/tmp/.wine-%u", getuid() ); +#endif + create_dir( server_dir, &st2 ); /* now create the server directory */ - *p = '/'; + strcat( server_dir, "/server-" ); + p = server_dir + strlen(server_dir); + + if (st.st_dev != (unsigned long)st.st_dev) + p += sprintf( p, "%lx%08lx-", (unsigned long)((unsigned long long)st.st_dev >> 32), + (unsigned long)st.st_dev ); + else + p += sprintf( p, "%lx-", (unsigned long)st.st_dev ); + + if (st.st_ino != (unsigned long)st.st_ino) + sprintf( p, "%lx%08lx", (unsigned long)((unsigned long long)st.st_ino >> 32), + (unsigned long)st.st_ino ); + else + sprintf( p, "%lx", (unsigned long)st.st_ino ); + create_dir( server_dir, &st ); if (chdir( server_dir ) == -1) @@ -642,7 +673,7 @@ static void create_server_dir( const char *dir ) if (st.st_dev != st2.st_dev || st.st_ino != st2.st_ino) fatal_error( "chdir did not end up in %s\n", server_dir ); - free( server_dir ); + return server_dir; } /* create the lock file and return its file descriptor */ @@ -654,29 +685,28 @@ static int create_server_lock(void) if (lstat( server_lock_name, &st ) == -1) { if (errno != ENOENT) - fatal_error( "lstat %s/%s: %s", wine_get_server_dir(), server_lock_name, strerror( errno )); + fatal_error( "lstat %s/%s: %s\n", server_dir, server_lock_name, strerror( errno )); } else { if (!S_ISREG(st.st_mode)) - fatal_error( "%s/%s is not a regular file\n", wine_get_server_dir(), server_lock_name ); + fatal_error( "%s/%s is not a regular file\n", server_dir, server_lock_name ); } if ((fd = open( server_lock_name, O_CREAT|O_TRUNC|O_WRONLY, 0600 )) == -1) - fatal_error( "error creating %s/%s: %s", wine_get_server_dir(), server_lock_name, strerror( errno )); + fatal_error( "error creating %s/%s: %s\n", server_dir, server_lock_name, strerror( errno )); return fd; } /* wait for the server lock */ int wait_for_lock(void) { - const char *server_dir = wine_get_server_dir(); int fd, r; struct flock fl; + server_dir = create_server_dir( 0 ); if (!server_dir) return 0; /* no server dir, so no lock to wait on */ - create_server_dir( server_dir ); fd = create_server_lock(); fl.l_type = F_WRLCK; @@ -692,14 +722,13 @@ int wait_for_lock(void) /* kill the wine server holding the lock */ int kill_lock_owner( int sig ) { - const char *server_dir = wine_get_server_dir(); int fd, i, ret = 0; pid_t pid = 0; struct flock fl; + server_dir = create_server_dir( 0 ); if (!server_dir) return 0; /* no server dir, nothing to do */ - create_server_dir( server_dir ); fd = create_server_lock(); for (i = 1; i <= 20; i++) @@ -760,7 +789,7 @@ static void acquire_lock(void) "Warning: a previous instance of the wine server seems to have crashed.\n" "Please run 'gdb %s %s/core',\n" "type 'backtrace' at the gdb prompt and report the results. Thanks.\n\n", - server_argv0, wine_get_server_dir() ); + server_argv0, server_dir ); } unlink( server_socket_name ); /* we got the lock, we can safely remove the socket */ got_lock = 1; @@ -780,7 +809,7 @@ static void acquire_lock(void) case EAGAIN: exit(2); /* we didn't get the lock, exit with special status */ default: - fatal_error( "fcntl %s/%s: %s", wine_get_server_dir(), server_lock_name, strerror( errno )); + fatal_error( "fcntl %s/%s: %s\n", server_dir, server_lock_name, strerror( errno )); } /* it seems we can't use locks on this fs, so we will use the socket existence as lock */ close( fd ); @@ -817,8 +846,6 @@ static void acquire_lock(void) /* open the master server socket and start waiting for new clients */ void open_master_socket(void) { - const char *server_dir = wine_get_server_dir(); - const char *config_dir = wine_get_config_dir(); int fd, pid, status, sync_pipe[2]; char dummy; @@ -830,14 +857,7 @@ void open_master_socket(void) fd = open( "/dev/null", O_RDWR ); while (fd >= 0 && fd <= 2) fd = dup( fd ); - if (!server_dir) - fatal_error( "directory %s cannot be accessed\n", config_dir ); - if (chdir( config_dir ) == -1) - fatal_error( "chdir to %s: %s\n", config_dir, strerror( errno )); - if ((config_dir_fd = open( ".", O_RDONLY )) == -1) - fatal_error( "open %s: %s\n", config_dir, strerror( errno )); - - create_server_dir( server_dir ); + server_dir = create_server_dir( 1 ); if (!foreground) { diff --git a/server/request.h b/server/request.h index 2930b31d72..90a3180a6c 100644 --- a/server/request.h +++ b/server/request.h @@ -60,6 +60,7 @@ extern void close_master_socket( timeout_t timeout ); extern void shutdown_master_socket(void); extern int wait_for_lock(void); extern int kill_lock_owner( int sig ); +extern char *server_dir; extern int server_dir_fd, config_dir_fd; extern void trace_request(void);

1 0

Alexandre Julliard : server: Determine the prefix directory in the server itself.
by Alexandre Julliard 05 Dec '19

05 Dec '19

Module: wine Branch: master Commit: 763d16027573eb83954236d15ce2606d2a89fcac URL: https://source.winehq.org/git/wine.git/?a=commit;h=763d16027573eb83954236d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 5 21:58:08 2019 +0100 server: Determine the prefix directory in the server itself. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/request.c | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/server/request.c b/server/request.c index 4aad126eec..4d3263917c 100644 --- a/server/request.c +++ b/server/request.c @@ -618,11 +618,37 @@ static void create_dir( const char *name, struct stat *st ) /* create the server directory and chdir to it */ static char *create_server_dir( int force ) { - const char *config_dir = wine_get_config_dir(); - char *p; + const char *prefix = getenv( "WINEPREFIX" ); + char *p, *config_dir; struct stat st, st2; size_t len = sizeof("/server-") + 2 * sizeof(st.st_dev) + 2 * sizeof(st.st_ino) + 2; + /* open the configuration directory */ + + if (prefix) + { + if (!(config_dir = strdup( prefix ))) fatal_error( "out of memory\n" ); + for (p = config_dir + strlen(config_dir); p > config_dir; p--) if (p[-1] != '/') break; + if (p > config_dir) *p = 0; + if (config_dir[0] != '/') + fatal_error( "invalid directory %s in WINEPREFIX: not an absolute path\n", prefix ); + } + 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 ); + if (!(config_dir = malloc( strlen(home) + sizeof("/.wine") ))) fatal_error( "out of memory\n" ); + strcpy( config_dir, home ); + for (p = config_dir + strlen(config_dir); p > config_dir; p--) if (p[-1] != '/') break; + strcpy( p, "/.wine" ); + } + if (chdir( config_dir ) == -1) { if (errno != ENOENT || force) fatal_error( "chdir to %s: %s\n", config_dir, strerror( errno )); @@ -630,6 +656,10 @@ static char *create_server_dir( int force ) } if ((config_dir_fd = open( ".", O_RDONLY )) == -1) fatal_error( "open %s: %s\n", config_dir, strerror( errno )); + if (fstat( config_dir_fd, &st ) == -1) + fatal_error( "stat %s: %s\n", config_dir, strerror( errno )); + if (st.st_uid != getuid()) + fatal_error( "%s is not owned by you\n", config_dir ); /* create the base directory if needed */ @@ -673,6 +703,7 @@ static char *create_server_dir( int force ) if (st.st_dev != st2.st_dev || st.st_ino != st2.st_ino) fatal_error( "chdir did not end up in %s\n", server_dir ); + free( config_dir ); return server_dir; }

1 0

Alexandre Julliard : server: No longer depend on libwine.
by Alexandre Julliard 05 Dec '19

05 Dec '19

Module: wine Branch: master Commit: fc17535eb98a4b200d6a418337a7e280568c7cfd URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc17535eb98a4b200d6a4183… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 5 22:17:44 2019 +0100 server: No longer depend on libwine. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/Makefile.in | 2 +- server/mach.c | 1 - server/main.c | 3 +-- server/registry.c | 1 - server/request.c | 1 - 5 files changed, 2 insertions(+), 6 deletions(-) diff --git a/server/Makefile.in b/server/Makefile.in index b39bd30305..3f3761faab 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -50,4 +50,4 @@ MANPAGES = \ wineserver.fr.UTF-8.man.in \ wineserver.man.in -EXTRALIBS = $(LDEXECFLAGS) -lwine $(POLL_LIBS) $(RT_LIBS) $(INOTIFY_LIBS) +EXTRALIBS = $(LDEXECFLAGS) $(POLL_LIBS) $(RT_LIBS) $(INOTIFY_LIBS) diff --git a/server/mach.c b/server/mach.c index e5a532dc6c..3690b29004 100644 --- a/server/mach.c +++ b/server/mach.c @@ -41,7 +41,6 @@ #include "process.h" #include "thread.h" #include "request.h" -#include "wine/library.h" #ifdef USE_MACH diff --git a/server/main.c b/server/main.c index 7aed338e96..26986d34b3 100644 --- a/server/main.c +++ b/server/main.c @@ -36,7 +36,6 @@ #include "file.h" #include "thread.h" #include "request.h" -#include "wine/library.h" /* command-line options */ int debug_level = 0; @@ -108,7 +107,7 @@ static void parse_args( int argc, char *argv[] ) master_socket_timeout = TIMEOUT_INFINITE; break; case 'v': - fprintf( stderr, "%s\n", wine_get_build_id()); + fprintf( stderr, "%s\n", PACKAGE_STRING ); exit(0); case 'w': wait_for_lock(); diff --git a/server/registry.c b/server/registry.c index 48a0f28c97..964e2ebd58 100644 --- a/server/registry.c +++ b/server/registry.c @@ -48,7 +48,6 @@ #include "security.h" #include "winternl.h" -#include "wine/library.h" struct notify { diff --git a/server/request.c b/server/request.c index 4d3263917c..200c2697db 100644 --- a/server/request.c +++ b/server/request.c @@ -61,7 +61,6 @@ #include "winbase.h" #include "wincon.h" #include "winternl.h" -#include "wine/library.h" #include "file.h" #include "process.h"

1 0

Alex Henrie : shell32: Symlink the Downloads and Templates folders too.
by Alexandre Julliard 05 Dec '19

05 Dec '19

Module: wine Branch: master Commit: 477ff7e034e882cf0dc24aa0b459ec957608a1c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=477ff7e034e882cf0dc24aa0… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 2 19:17:56 2019 -0700 shell32: Symlink the Downloads and Templates folders too. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 52 +++++++++++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 18 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index d9d65cbaed..06be794812 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -4366,6 +4366,12 @@ static inline BOOL _SHAppendToUnixPath(char *szBasePath, LPCWSTR pwszSubPath) { case IDS_MYVIDEOS: lstrcpyW(wszSubPath, My_VideosW); break; + case IDS_DOWNLOADS: + lstrcpyW(wszSubPath, DownloadsW); + break; + case IDS_TEMPLATES: + lstrcpyW(wszSubPath, TemplatesW); + break; default: ERR("LoadString(%d) failed!\n", LOWORD(pwszSubPath)); return FALSE; @@ -4392,21 +4398,21 @@ static inline BOOL _SHAppendToUnixPath(char *szBasePath, LPCWSTR pwszSubPath) { /****************************************************************************** * _SHCreateSymbolicLinks [Internal] * - * Sets up symbol links for various shell folders to point into the users home + * Sets up symbol links for various shell folders to point into the user's home * directory. We do an educated guess about what the user would probably want: * - If there is a 'My Documents' directory in $HOME, the user probably wants - * wine's 'My Documents' to point there. Furthermore, we imply that the user - * is a Windows lover and has no problem with wine creating 'My Pictures', - * 'My Music' and 'My Videos' subfolders under '$HOME/My Documents', if those - * do not already exits. We put appropriate symbolic links in place for those, - * too. + * wine's 'My Documents' to point there. Furthermore, we infer that the user + * is a Windows lover and has no problem with wine creating subfolders for + * 'My Pictures', 'My Music', 'My Videos' etc. under '$HOME/My Documents', if + * those do not already exist. We put appropriate symbolic links in place for + * those, too. * - If there is no 'My Documents' directory in $HOME, we let 'My Documents' * point directly to $HOME. We assume the user to be a unix hacker who does not * want wine to create anything anywhere besides the .wine directory. So, if * there already is a 'My Music' directory in $HOME, we symlink the 'My Music' * shell folder to it. But if not, then we check XDG_MUSIC_DIR - "well known" * directory, and try to link to that. If that fails, then we symlink to - * $HOME directly. The same holds fo 'My Pictures' and 'My Videos'. + * $HOME directly. The same holds for 'My Pictures', 'My Videos' etc. * - The Desktop shell folder is symlinked to XDG_DESKTOP_DIR. If that does not * exist, then we try '$HOME/Desktop'. If that does not exist, then we leave * it alone. @@ -4414,10 +4420,18 @@ static inline BOOL _SHAppendToUnixPath(char *szBasePath, LPCWSTR pwszSubPath) { */ static void _SHCreateSymbolicLinks(void) { - UINT aidsMyStuff[] = { IDS_MYPICTURES, IDS_MYVIDEOS, IDS_MYMUSIC }, i; - const WCHAR* MyOSXStuffW[] = { PicturesW, MoviesW, MusicW }; - int acsidlMyStuff[] = { CSIDL_MYPICTURES, CSIDL_MYVIDEO, CSIDL_MYMUSIC }; - static const char * const xdg_dirs[] = { "PICTURES", "VIDEOS", "MUSIC", "DOCUMENTS", "DESKTOP" }; + static const UINT aidsMyStuff[] = { + IDS_MYPICTURES, IDS_MYVIDEOS, IDS_MYMUSIC, IDS_DOWNLOADS, IDS_TEMPLATES + }; + static const WCHAR * const MyOSXStuffW[] = { + PicturesW, MoviesW, MusicW, DownloadsW, TemplatesW + }; + static const int acsidlMyStuff[] = { + CSIDL_MYPICTURES, CSIDL_MYVIDEO, CSIDL_MYMUSIC, CSIDL_DOWNLOADS, CSIDL_TEMPLATES + }; + static const char * const xdg_dirs[] = { + "PICTURES", "VIDEOS", "MUSIC", "DOWNLOAD", "TEMPLATES", "DOCUMENTS", "DESKTOP" + }; static const unsigned int num = ARRAY_SIZE(xdg_dirs); WCHAR wszTempPath[MAX_PATH]; char szPersonalTarget[FILENAME_MAX], *pszPersonal; @@ -4428,6 +4442,7 @@ static void _SHCreateSymbolicLinks(void) HRESULT hr; char ** xdg_results; char * xdg_desktop_dir; + UINT i; /* Create all necessary profile sub-dirs up to 'My Documents' and get the unix path. */ hr = SHGetFolderPathW(NULL, CSIDL_PERSONAL|CSIDL_FLAG_CREATE, NULL, @@ -4449,9 +4464,9 @@ static void _SHCreateSymbolicLinks(void) if (_SHAppendToUnixPath(szPersonalTarget, MAKEINTRESOURCEW(IDS_PERSONAL)) && !stat(szPersonalTarget, &statFolder) && S_ISDIR(statFolder.st_mode)) { - /* '$HOME/My Documents' exists. Create 'My Pictures', - * 'My Videos' and 'My Music' subfolders or fail silently if - * they already exist. + /* '$HOME/My Documents' exists. Create subfolders for + * 'My Pictures', 'My Videos', 'My Music' etc. or fail silently + * if they already exist. */ for (i = 0; i < ARRAY_SIZE(aidsMyStuff); i++) { @@ -4489,8 +4504,9 @@ static void _SHCreateSymbolicLinks(void) } else { - /* '$HOME' doesn't exist. Create 'My Pictures', 'My Videos' and 'My Music' subdirs - * in '%USERPROFILE%\\My Documents' or fail silently if they already exist. */ + /* '$HOME' doesn't exist. Create subdirs for 'My Pictures', 'My Videos', + * 'My Music' etc. in '%USERPROFILE%\My Documents' or fail silently if + * they already exist. */ pszHome = NULL; strcpy(szPersonalTarget, pszPersonal); for (i = 0; i < ARRAY_SIZE(aidsMyStuff); i++) { @@ -4500,7 +4516,7 @@ static void _SHCreateSymbolicLinks(void) } } - /* Create symbolic links for 'My Pictures', 'My Videos' and 'My Music'. */ + /* Create symbolic links for 'My Pictures', 'My Videos', 'My Music' etc. */ for (i=0; i < ARRAY_SIZE(aidsMyStuff); i++) { /* Create the current 'My Whatever' folder and get its unix path. */ @@ -6136,7 +6152,7 @@ HRESULT SHELL_RegisterShellFolders(void) HRESULT hr; /* Set up '$HOME' targeted symlinks for 'My Documents', 'My Pictures', - * 'My Videos', 'My Music' and 'Desktop' in advance, so that the + * 'My Videos', 'My Music', 'Desktop' etc. in advance, so that the * _SHRegister*ShellFolders() functions will find everything nice and clean * and thus will not attempt to create them in the profile directory. */ _SHCreateSymbolicLinks();

1 0

Piotr Caban : kernel32: Set all %eax bits on Wow64EnableWow64FsRedirection return.
by Alexandre Julliard 05 Dec '19

05 Dec '19

Module: wine Branch: master Commit: 7ca1c4900e42d608150822ef87a7ce2847a59b6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ca1c4900e42d608150822ef… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 5 20:09:04 2019 +0100 kernel32: Set all %eax bits on Wow64EnableWow64FsRedirection return. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47565 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/path.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 172be2a6e2..04fa5f2e7a 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1603,7 +1603,7 @@ # @ stub WerpStringLookup @ stdcall WideCharToMultiByte(long long wstr long ptr long ptr ptr) @ stdcall WinExec(str long) -@ stdcall Wow64EnableWow64FsRedirection(long) +@ stdcall Wow64EnableWow64FsRedirection(long) KERNEL32_Wow64EnableWow64FsRedirection @ stdcall -import Wow64DisableWow64FsRedirection(ptr) @ stdcall Wow64GetThreadContext(long ptr) # @ stub Wow64GetThreadSelectorEntry diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 4f05118739..c50b631d7c 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -851,8 +851,10 @@ UINT WINAPI GetSystemDirectoryA( LPSTR path, UINT count ) /*********************************************************************** * Wow64EnableWow64FsRedirection (KERNEL32.@) + * + * Microsoft C++ Redistributable installers are depending on all %eax bits being set. */ -BOOLEAN WINAPI Wow64EnableWow64FsRedirection( BOOLEAN enable ) +DWORD /*BOOLEAN*/ WINAPI KERNEL32_Wow64EnableWow64FsRedirection( BOOLEAN enable ) { return set_ntstatus( RtlWow64EnableFsRedirection( enable )); }

1 0

Zebediah Figura : qcap/avico: Use strmbase filter state change methods.
by Alexandre Julliard 05 Dec '19

05 Dec '19

Module: wine Branch: master Commit: f815626640a0dd99d4c5f03b2ad68be5b8d7080d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f815626640a0dd99d4c5f03b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Dec 4 23:03:28 2019 -0600 qcap/avico: Use strmbase filter state change methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avico.c | 81 ++++++++++++++++++------------------------------- dlls/qcap/tests/avico.c | 8 ++--- 2 files changed, 33 insertions(+), 56 deletions(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index f0f60ae439..f65f33fe44 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -56,12 +56,6 @@ static inline AVICompressor *impl_from_strmbase_filter(struct strmbase_filter *f return CONTAINING_RECORD(filter, AVICompressor, filter); } -static inline AVICompressor *impl_from_IBaseFilter(IBaseFilter *iface) -{ - struct strmbase_filter *filter = CONTAINING_RECORD(iface, struct strmbase_filter, IBaseFilter_iface); - return impl_from_strmbase_filter(filter); -} - static inline AVICompressor *impl_from_strmbase_pin(struct strmbase_pin *pin) { return impl_from_strmbase_filter(pin->filter); @@ -117,57 +111,14 @@ static HRESULT fill_format_info(AVICompressor *This, VIDEOINFOHEADER *src_videoi return S_OK; } -static HRESULT WINAPI AVICompressor_Stop(IBaseFilter *iface) -{ - AVICompressor *This = impl_from_IBaseFilter(iface); - - TRACE("(%p)\n", This); - - if(This->filter.state == State_Stopped) - return S_OK; - - ICCompressEnd(This->hic); - This->filter.state = State_Stopped; - return S_OK; -} - -static HRESULT WINAPI AVICompressor_Pause(IBaseFilter *iface) -{ - AVICompressor *This = impl_from_IBaseFilter(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; -} - -static HRESULT WINAPI AVICompressor_Run(IBaseFilter *iface, REFERENCE_TIME tStart) -{ - AVICompressor *This = impl_from_IBaseFilter(iface); - HRESULT hres; - - TRACE("(%p)->(%s)\n", This, wine_dbgstr_longlong(tStart)); - - if(This->filter.state == State_Running) - return S_OK; - - if (This->source.pAllocator && FAILED(hres = IMemAllocator_Commit(This->source.pAllocator))) - { - FIXME("Commit failed: %08x\n", hres); - return hres; - } - - This->frame_cnt = 0; - - This->filter.state = State_Running; - return S_OK; -} - static const IBaseFilterVtbl AVICompressorVtbl = { BaseFilterImpl_QueryInterface, BaseFilterImpl_AddRef, BaseFilterImpl_Release, BaseFilterImpl_GetClassID, - AVICompressor_Stop, - AVICompressor_Pause, - AVICompressor_Run, + BaseFilterImpl_Stop, + BaseFilterImpl_Pause, + BaseFilterImpl_Run, BaseFilterImpl_GetState, BaseFilterImpl_SetSyncSource, BaseFilterImpl_GetSyncSource, @@ -215,11 +166,37 @@ static HRESULT avi_compressor_query_interface(struct strmbase_filter *iface, REF return S_OK; } +static HRESULT avi_compressor_init_stream(struct strmbase_filter *iface) +{ + AVICompressor *filter = impl_from_strmbase_filter(iface); + HRESULT hr; + + if (filter->source.pAllocator && FAILED(hr = IMemAllocator_Commit(filter->source.pAllocator))) + { + ERR("Failed to commit allocator, hr %#x.\n", hr); + return hr; + } + + filter->frame_cnt = 0; + + return S_OK; +} + +static HRESULT avi_compressor_cleanup_stream(struct strmbase_filter *iface) +{ + AVICompressor *filter = impl_from_strmbase_filter(iface); + + ICCompressEnd(filter->hic); + return S_OK; +} + static const struct strmbase_filter_ops filter_ops = { .filter_get_pin = avi_compressor_get_pin, .filter_destroy = avi_compressor_destroy, .filter_query_interface = avi_compressor_query_interface, + .filter_init_stream = avi_compressor_init_stream, + .filter_cleanup_stream = avi_compressor_cleanup_stream, }; static AVICompressor *impl_from_IPersistPropertyBag(IPersistPropertyBag *iface) diff --git a/dlls/qcap/tests/avico.c b/dlls/qcap/tests/avico.c index 5c6d4aa54f..b4f52f1021 100644 --- a/dlls/qcap/tests/avico.c +++ b/dlls/qcap/tests/avico.c @@ -665,11 +665,11 @@ static void test_unconnected_filter_state(IBaseFilter *filter) ok(state == State_Stopped, "Got state %u.\n", state); hr = IBaseFilter_Pause(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Paused, "Got state %u.\n", state); + ok(state == State_Paused, "Got state %u.\n", state); hr = IBaseFilter_Run(filter, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -679,11 +679,11 @@ static void test_unconnected_filter_state(IBaseFilter *filter) ok(state == State_Running, "Got state %u.\n", state); hr = IBaseFilter_Pause(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Paused, "Got state %u.\n", state); + ok(state == State_Paused, "Got state %u.\n", state); hr = IBaseFilter_Stop(filter); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Zebediah Figura : qcap/avimux: Use strmbase filter state change methods.
by Alexandre Julliard 05 Dec '19

05 Dec '19

Module: wine Branch: master Commit: 74df86d8ed82de59f2a41dabdd6d5c699680cfcb URL: https://source.winehq.org/git/wine.git/?a=commit;h=74df86d8ed82de59f2a41dab… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Dec 4 23:03:29 2019 -0600 qcap/avimux: Use strmbase filter state change methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avimux.c | 58 +++++++++++++++--------------------------------------- 1 file changed, 16 insertions(+), 42 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index 1995358ac2..a7a9ac7ced 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -167,19 +167,6 @@ static HRESULT avi_mux_query_interface(struct strmbase_filter *iface, REFIID iid return S_OK; } -static const struct strmbase_filter_ops filter_ops = -{ - .filter_get_pin = avi_mux_get_pin, - .filter_destroy = avi_mux_destroy, - .filter_query_interface = avi_mux_query_interface, -}; - -static inline AviMux* impl_from_IBaseFilter(IBaseFilter *iface) -{ - struct strmbase_filter *filter = CONTAINING_RECORD(iface, struct strmbase_filter, IBaseFilter_iface); - return impl_from_strmbase_filter(filter); -} - static HRESULT out_flush(AviMux *This) { ULONG written; @@ -420,17 +407,12 @@ static HRESULT queue_sample(AviMux *avimux, AviMuxIn *avimuxin, IMediaSample *sa return flush_queue(avimux, avimuxin, FALSE); } -static HRESULT WINAPI AviMux_Stop(IBaseFilter *iface) +static HRESULT avi_mux_cleanup_stream(struct strmbase_filter *iface) { - AviMux *This = impl_from_IBaseFilter(iface); + AviMux *This = impl_from_strmbase_filter(iface); HRESULT hr; int i; - TRACE("(%p)\n", This); - - if(This->filter.state == State_Stopped) - return S_OK; - if (This->stream) { AVIEXTHEADER dmlh; @@ -559,36 +541,20 @@ static HRESULT WINAPI AviMux_Stop(IBaseFilter *iface) This->stream = NULL; } - This->filter.state = State_Stopped; return S_OK; } -static HRESULT WINAPI AviMux_Pause(IBaseFilter *iface) +static HRESULT avi_mux_init_stream(struct strmbase_filter *iface) { - AviMux *This = impl_from_IBaseFilter(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; -} - -static HRESULT WINAPI AviMux_Run(IBaseFilter *iface, REFERENCE_TIME tStart) -{ - AviMux *This = impl_from_IBaseFilter(iface); + AviMux *This = impl_from_strmbase_filter(iface); HRESULT hr; int i, stream_id; - TRACE("(%p)->(%s)\n", This, wine_dbgstr_longlong(tStart)); - - if(This->filter.state == State_Running) - return S_OK; - if(This->mode != INTERLEAVE_FULL) { FIXME("mode not supported (%d)\n", This->mode); return E_NOTIMPL; } - if(tStart) - FIXME("tStart parameter ignored\n"); - for(i=0; i<This->input_pin_no; i++) { IMediaSeeking *ms; LONGLONG cur, stop; @@ -694,18 +660,26 @@ static HRESULT WINAPI AviMux_Run(IBaseFilter *iface, REFERENCE_TIME tStart) This->avih.dwWidth = ((BITMAPINFOHEADER*)This->in[0]->strf->data)->biWidth; This->avih.dwHeight = ((BITMAPINFOHEADER*)This->in[0]->strf->data)->biHeight; - This->filter.state = State_Running; return S_OK; } +static const struct strmbase_filter_ops filter_ops = +{ + .filter_get_pin = avi_mux_get_pin, + .filter_destroy = avi_mux_destroy, + .filter_query_interface = avi_mux_query_interface, + .filter_init_stream = avi_mux_init_stream, + .filter_cleanup_stream = avi_mux_cleanup_stream, +}; + static const IBaseFilterVtbl AviMuxVtbl = { BaseFilterImpl_QueryInterface, BaseFilterImpl_AddRef, BaseFilterImpl_Release, BaseFilterImpl_GetClassID, - AviMux_Stop, - AviMux_Pause, - AviMux_Run, + BaseFilterImpl_Stop, + BaseFilterImpl_Pause, + BaseFilterImpl_Run, BaseFilterImpl_GetState, BaseFilterImpl_SetSyncSource, BaseFilterImpl_GetSyncSource,

1 0