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

Jacek Caban : wine/asm.h: Introduce __ASM_USE_THISCALL_WRAPPER macro.
by Alexandre Julliard April 27, 2020

April 27, 2020

Module: wine Branch: master Commit: aa6c442cac0a89a5e1eee94fdb111022b4c4ffe7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa6c442cac0a89a5e1eee94f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 27 02:30:26 2020 +0200 wine/asm.h: Introduce __ASM_USE_THISCALL_WRAPPER macro. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/asm.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/wine/asm.h b/include/wine/asm.h index 2a4f06cb92..7165f47e96 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -102,6 +102,7 @@ #if defined(__i386__) && !defined(__MINGW32__) && (!defined(_MSC_VER) || !defined(__clang__)) +#define __ASM_USE_THISCALL_WRAPPER # ifdef _MSC_VER # define DEFINE_THISCALL_WRAPPER(func,args) \ __declspec(naked) void __thiscall_##func(void) \

1 0

Alexandre Julliard : ntdll: Avoid using wine_get_build/data_dir() from libwine.
by Alexandre Julliard April 27, 2020

April 27, 2020

Module: wine Branch: master Commit: 3e0c90e4c700d79124c6a7a14050799baa531879 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e0c90e4c700d79124c6a7a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 27 12:35:19 2020 +0200 ntdll: Avoid using wine_get_build/data_dir() from libwine. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/Makefile.in | 7 +++++ dlls/ntdll/env.c | 4 +-- dlls/ntdll/loader.c | 2 +- dlls/ntdll/locale.c | 3 --- dlls/ntdll/ntdll_misc.h | 3 +++ dlls/ntdll/process.c | 2 +- dlls/ntdll/server.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++-- dlls/ntdll/thread.c | 1 + 8 files changed, 83 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index a67809a6c2..7971ef98cf 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -56,3 +56,10 @@ C_SRCS = \ wcstring.c RC_SRCS = version.rc + +server_EXTRADEFS = \ + -DBINDIR=\"${bindir}\" \ + -DDLLDIR=\"${dlldir}\" \ + -DBIN_TO_DLLDIR=\"`$(MAKEDEP) -R ${bindir} ${dlldir}`\" \ + -DDLL_TO_BINDIR=\"`$(MAKEDEP) -R ${dlldir} ${bindir}`\" \ + -DBIN_TO_DATADIR=\"`$(MAKEDEP) -R ${bindir} ${datadir}/wine`\" diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index ff0c8fbe90..eabebbcc28 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -408,9 +408,9 @@ static void set_wow64_environment( WCHAR **env ) /* set the Wine paths */ - set_wine_path_variable( env, winedatadirW, wine_get_data_dir() ); + set_wine_path_variable( env, winedatadirW, data_dir ); set_wine_path_variable( env, winehomedirW, home ); - set_wine_path_variable( env, winebuilddirW, wine_get_build_dir() ); + set_wine_path_variable( env, winebuilddirW, build_dir ); set_wine_path_variable( env, wineconfigdirW, config_dir ); for (i = 0; (p = wine_dll_enum_load_path( i )); i++) { diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 38c893e3eb..4d69e33b09 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2715,7 +2715,7 @@ static NTSTATUS find_builtin_dll( const WCHAR *name, WINE_MODREF **pwm, void **module, pe_image_info_t *image_info, struct stat *st, char **so_name ) { - const char *path, *build_dir = wine_get_build_dir(); + const char *path; unsigned int i, pos, len, namelen, maxlen = 0; char *ptr, *file; NTSTATUS status = STATUS_DLL_NOT_FOUND; diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index a28f5d0f58..0d0c1194d2 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -39,7 +39,6 @@ #include "winbase.h" #include "winnls.h" #include "ntdll_misc.h" -#include "wine/library.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(nls); @@ -758,8 +757,6 @@ static const struct { const char *name; UINT cp; } charset_names[] = static void load_unix_cptable( unsigned int cp ) { - const char *build_dir = wine_get_build_dir(); - const char *data_dir = wine_get_data_dir(); const char *dir = build_dir ? build_dir : data_dir; struct stat st; char *name; diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 11ff0d7bb3..fc12bf47ef 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -96,6 +96,7 @@ extern void heap_set_debug_flags( HANDLE handle ) DECLSPEC_HIDDEN; extern void init_unix_codepage(void) DECLSPEC_HIDDEN; extern void init_locale( HMODULE module ) DECLSPEC_HIDDEN; extern void init_user_process_params( SIZE_T data_size ) DECLSPEC_HIDDEN; +extern void init_paths(void) DECLSPEC_HIDDEN; extern char **build_envp( const WCHAR *envW ) DECLSPEC_HIDDEN; extern NTSTATUS restart_process( RTL_USER_PROCESS_PARAMETERS *params, NTSTATUS status ) DECLSPEC_HIDDEN; @@ -104,6 +105,8 @@ extern char **__wine_main_argv; extern WCHAR **__wine_main_wargv; /* server support */ +extern const char *build_dir DECLSPEC_HIDDEN; +extern const char *data_dir DECLSPEC_HIDDEN; extern const char *config_dir DECLSPEC_HIDDEN; extern timeout_t server_start_time DECLSPEC_HIDDEN; extern unsigned int server_cpus DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 28aa671f47..d2a3421ac5 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -1008,7 +1008,7 @@ static const char *get_alternate_loader( char **ret_env ) *ret_env = NULL; - if (wine_get_build_dir()) loader = is_win64 ? "loader/wine" : "loader/wine64"; + if (build_dir) loader = is_win64 ? "loader/wine" : "loader/wine64"; if (loader_env) { diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index d15ece3f4e..429a41c397 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -113,8 +113,11 @@ static const enum cpu_type client_cpu = CPU_ARM64; #error Unsupported CPU #endif +const char *build_dir = NULL; +const char *data_dir = NULL; const char *config_dir = NULL; static const char *server_dir; +static const char *bin_dir; unsigned int server_cpus = 0; BOOL is_wow64 = FALSE; @@ -177,6 +180,35 @@ static void fatal_perror( const char *err, ... ) exit(1); } +/* canonicalize path and return its directory name */ +static char *realpath_dirname( const char *name ) +{ + char *p, *fullpath = realpath( name, NULL ); + + if (fullpath) + { + p = strrchr( fullpath, '/' ); + if (p == fullpath) p++; + if (p) *p = 0; + } + return fullpath; +} + +/* if string ends with tail, remove it */ +static char *remove_tail( const char *str, const char *tail ) +{ + size_t len = strlen( str ); + size_t tail_len = strlen( tail ); + char *ret; + + if (len < tail_len) return NULL; + if (strcmp( str + len - tail_len, tail )) return NULL; + ret = malloc( len - tail_len + 1 ); + memcpy( ret, str, len - tail_len ); + ret[len - tail_len] = 0; + return ret; +} + /* build a path from the specified dir and name */ static char *build_path( const char *dir, const char *name ) { @@ -1279,6 +1311,42 @@ static const char *init_config_dir(void) } +/*********************************************************************** + * init_paths + */ +void init_paths(void) +{ + const char *dll_dir = NULL; + +#ifdef HAVE_DLADDR + Dl_info info; + + if (dladdr( init_paths, &info ) && info.dli_fname[0] == '/') + dll_dir = realpath_dirname( info.dli_fname ); +#endif + +#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) + bin_dir = realpath_dirname( "/proc/self/exe" ); +#elif defined (__FreeBSD__) || defined(__DragonFly__) + bin_dir = realpath_dirname( "/proc/curproc/file" ); +#else + bin_dir = realpath_dirname( __wine_main_argv[0] ); +#endif + + if (dll_dir) build_dir = remove_tail( dll_dir, "/dlls/ntdll" ); + else if (bin_dir) build_dir = remove_tail( bin_dir, "/loader" ); + + if (!build_dir) + { + if (!bin_dir) bin_dir = dll_dir ? build_path( dll_dir, DLL_TO_BINDIR ) : BINDIR; + else if (!dll_dir) dll_dir = build_path( bin_dir, BIN_TO_DLLDIR ); + data_dir = build_path( bin_dir, BIN_TO_DATADIR ); + } + + config_dir = init_config_dir(); +} + + /*********************************************************************** * setup_config_dir * @@ -1524,8 +1592,6 @@ 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) { diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index e27b3a0c6d..73b5c9ebca 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -299,6 +299,7 @@ TEB *thread_init(void) signal_init_thread( teb ); virtual_init_threading(); debug_init(); + init_paths(); set_process_name( __wine_main_argc, __wine_main_argv ); /* initialize time values in user_shared_data */

1 0

Alexandre Julliard : ntdll: Avoid using wine_get_user_name() from libwine.
by Alexandre Julliard April 27, 2020

April 27, 2020

Module: wine Branch: master Commit: 9122bc1096f3231c5f6b8ffc0d7ad3e700f18af1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9122bc1096f3231c5f6b8ffc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 27 12:34:45 2020 +0200 ntdll: Avoid using wine_get_user_name() from libwine. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index efb5270a2c..ff0c8fbe90 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -27,6 +27,9 @@ #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #endif +#ifdef HAVE_PWD_H +# include <pwd.h> +#endif #ifdef HAVE_UNISTD_H # include <unistd.h> #endif @@ -386,15 +389,27 @@ static void set_wow64_environment( WCHAR **env ) UNICODE_STRING valW = { 0, sizeof(buf), buf }; OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; - const char *p, *name; + const char *p; + const char *home = getenv( "HOME" ); + const char *name = getenv( "USER" ); WCHAR *val; HANDLE hkey; DWORD i; + if (!home || !name) + { + struct passwd *pwd = getpwuid( getuid() ); + if (pwd) + { + if (!home) home = pwd->pw_dir; + if (!name) name = pwd->pw_name; + } + } + /* set the Wine paths */ set_wine_path_variable( env, winedatadirW, wine_get_data_dir() ); - set_wine_path_variable( env, winehomedirW, getenv("HOME") ); + set_wine_path_variable( env, winehomedirW, home ); set_wine_path_variable( env, winebuilddirW, wine_get_build_dir() ); set_wine_path_variable( env, wineconfigdirW, config_dir ); for (i = 0; (p = wine_dll_enum_load_path( i )); i++) @@ -407,7 +422,7 @@ static void set_wow64_environment( WCHAR **env ) /* set user name */ - name = wine_get_user_name(); + if (!name) name = "wine"; if ((p = strrchr( name, '/' ))) name = p + 1; if ((p = strrchr( name, '\\' ))) name = p + 1; ntdll_umbstowcs( name, strlen(name) + 1, buf, ARRAY_SIZE(buf) );

1 0

Alexandre Julliard : ntdll: Avoid using wine_get_server_dir() from libwine.
by Alexandre Julliard April 27, 2020

April 27, 2020

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

Rémi Bernon : mfplat: Signal synchronous resolver methods on handler failure.
by Alexandre Julliard April 27, 2020

April 27, 2020

Module: wine Branch: master Commit: 66bfd5f40ce6365ec830ccf8ff45ebc3057325e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66bfd5f40ce6365ec830ccf8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 27 10:44:40 2020 +0300 mfplat: Signal synchronous resolver methods on handler failure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 45 ++++++++++++++++++++------------------------- dlls/mfplat/tests/mfplat.c | 4 ++++ 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 923905399b..0a5958acb2 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -5883,6 +5883,7 @@ static HRESULT resolver_handler_end_create(struct source_resolver *resolver, enu IRtwqAsyncResult *result) { IRtwqAsyncResult *inner_result = (IRtwqAsyncResult *)IRtwqAsyncResult_GetStateNoAddRef(result); + RTWQASYNCRESULT *data = (RTWQASYNCRESULT *)inner_result; struct resolver_queued_result *queued_result; union { @@ -5891,7 +5892,8 @@ static HRESULT resolver_handler_end_create(struct source_resolver *resolver, enu IMFSchemeHandler *scheme_handler; } handler; - queued_result = heap_alloc_zero(sizeof(*queued_result)); + if (!(queued_result = heap_alloc_zero(sizeof(*queued_result)))) + return E_OUTOFMEMORY; IRtwqAsyncResult_GetObject(inner_result, &handler.handler); @@ -5911,37 +5913,30 @@ static HRESULT resolver_handler_end_create(struct source_resolver *resolver, enu IUnknown_Release(handler.handler); - if (SUCCEEDED(queued_result->hr)) + if (data->hEvent) { - RTWQASYNCRESULT *data = (RTWQASYNCRESULT *)inner_result; + queued_result->inner_result = inner_result; + IRtwqAsyncResult_AddRef(queued_result->inner_result); + } - if (data->hEvent) - { - queued_result->inner_result = inner_result; - IRtwqAsyncResult_AddRef(queued_result->inner_result); - } + /* Push resolved object type and created object, so we don't have to guess on End*() call. */ + EnterCriticalSection(&resolver->cs); + list_add_tail(&resolver->pending, &queued_result->entry); + LeaveCriticalSection(&resolver->cs); - /* Push resolved object type and created object, so we don't have to guess on End*() call. */ - EnterCriticalSection(&resolver->cs); - list_add_tail(&resolver->pending, &queued_result->entry); - LeaveCriticalSection(&resolver->cs); + if (data->hEvent) + SetEvent(data->hEvent); + else + { + IUnknown *caller_state = IRtwqAsyncResult_GetStateNoAddRef(inner_result); + IRtwqAsyncResult *caller_result; - if (data->hEvent) - SetEvent(data->hEvent); - else + if (SUCCEEDED(RtwqCreateAsyncResult(queued_result->object, data->pCallback, caller_state, &caller_result))) { - IUnknown *caller_state = IRtwqAsyncResult_GetStateNoAddRef(inner_result); - IRtwqAsyncResult *caller_result; - - if (SUCCEEDED(RtwqCreateAsyncResult(queued_result->object, data->pCallback, caller_state, &caller_result))) - { - RtwqInvokeCallback(caller_result); - IRtwqAsyncResult_Release(caller_result); - } + RtwqInvokeCallback(caller_result); + IRtwqAsyncResult_Release(caller_result); } } - else - heap_free(queued_result); return S_OK; } diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index e623b4c0ed..4bc0813624 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -605,6 +605,10 @@ skip_source_tests: /* Create from URL. */ callback.event = CreateEventA(NULL, FALSE, FALSE, NULL); + hr = IMFSourceResolver_CreateObjectFromURL(resolver, L"nonexisting.mp4", MF_RESOLUTION_BYTESTREAM, NULL, &obj_type, + (IUnknown **)&stream); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Unexpected hr %#x.\n", hr); + hr = IMFSourceResolver_CreateObjectFromURL(resolver, filename, MF_RESOLUTION_BYTESTREAM, NULL, &obj_type, (IUnknown **)&stream); ok(hr == S_OK, "Failed to resolve url, hr %#x.\n", hr);

1 0

Jacek Caban : msvcp: Get rid of no longer needed hack.
by Alexandre Julliard April 27, 2020

April 27, 2020

Module: wine Branch: master Commit: 1cc92377a16fb1316cd3d7d28a84c11485c67981 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cc92377a16fb1316cd3d7d2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 24 20:15:11 2020 +0200 msvcp: Get rid of no longer needed hack. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/msvcp_main.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/msvcp90/msvcp_main.c b/dlls/msvcp90/msvcp_main.c index 816a95c29e..e33fc6434f 100644 --- a/dlls/msvcp90/msvcp_main.c +++ b/dlls/msvcp90/msvcp_main.c @@ -225,8 +225,3 @@ __int64 * __cdecl std_Fpz_func(void) { return &std_Fpz; } - -#if defined(__MINGW32__) && _MSVCP_VER >= 80 && _MSVCP_VER <= 90 -/* Hack: prevent Mingw from importing mingw_helpers.o which conflicts with encode/decode_pointer */ -int mingw_app_type = 0; -#endif

1 0

Rémi Bernon : ntdll/tests: Test that ptids are multiples of four.
by Alexandre Julliard April 27, 2020

April 27, 2020

Module: wine Branch: master Commit: 8bb684c63e02cabde0908b9b22d0bad3f044b214 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bb684c63e02cabde0908b9b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Apr 25 10:05:08 2020 +0200 ntdll/tests: Test that ptids are multiples of four. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 8dc8bad645..1576f5ca97 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -319,6 +319,11 @@ static void test_query_process(void) int i = 0, k = 0; BOOL is_nt = FALSE; SYSTEM_BASIC_INFORMATION sbi; + PROCESS_BASIC_INFORMATION pbi; + THREAD_BASIC_INFORMATION tbi; + OBJECT_ATTRIBUTES attr; + CLIENT_ID cid; + HANDLE handle; /* Copy of our winternl.h structure turned into a private one */ typedef struct _SYSTEM_PROCESS_INFORMATION_PRIVATE { @@ -401,13 +406,21 @@ static void test_query_process(void) if (!is_nt) { + DWORD_PTR tid; DWORD j; + + todo_wine_if(last_pid & 3) + ok(!(last_pid & 3), "Unexpected PID low bits: %p\n", spi->UniqueProcessId); for ( j = 0; j < spi->dwThreadCount; j++) { k++; ok ( spi->ti[j].ClientId.UniqueProcess == spi->UniqueProcessId, "The owning pid of the thread (%p) doesn't equal the pid (%p) of the process\n", spi->ti[j].ClientId.UniqueProcess, spi->UniqueProcessId); + + tid = (DWORD_PTR)spi->ti[j].ClientId.UniqueThread; + todo_wine_if(tid & 3) + ok(!(tid & 3), "Unexpected TID low bits: %p\n", spi->ti[j].ClientId.UniqueThread); } } @@ -423,6 +436,52 @@ static void test_query_process(void) if (one_before_last_pid == 0) one_before_last_pid = last_pid; HeapFree( GetProcessHeap(), 0, spi_buf); + + if (is_nt) + { + win_skip("skipping ptids low bits tests\n"); + return; + } + + for (i = 1; i < 4; ++i) + { + InitializeObjectAttributes( &attr, NULL, 0, NULL, NULL ); + cid.UniqueProcess = ULongToHandle(GetCurrentProcessId() + i); + cid.UniqueThread = 0; + + status = NtOpenProcess( &handle, PROCESS_QUERY_LIMITED_INFORMATION, &attr, &cid ); + todo_wine_if( status != STATUS_SUCCESS ) + ok( status == STATUS_SUCCESS || broken( status == STATUS_ACCESS_DENIED ) /* wxppro */, + "NtOpenProcess returned:%x\n", status ); + if (status != STATUS_SUCCESS) continue; + + status = pNtQueryInformationProcess( handle, ProcessBasicInformation, &pbi, sizeof(pbi), NULL ); + ok( status == STATUS_SUCCESS, "NtQueryInformationProcess returned:%x\n", status ); + ok( pbi.UniqueProcessId == GetCurrentProcessId(), + "Expected pid %p, got %p\n", ULongToHandle(GetCurrentProcessId()), ULongToHandle(pbi.UniqueProcessId) ); + + NtClose( handle ); + } + + for (i = 1; i < 4; ++i) + { + InitializeObjectAttributes( &attr, NULL, 0, NULL, NULL ); + cid.UniqueProcess = 0; + cid.UniqueThread = ULongToHandle(GetCurrentThreadId() + i); + + status = NtOpenThread( &handle, THREAD_QUERY_LIMITED_INFORMATION, &attr, &cid ); + todo_wine_if( status != STATUS_SUCCESS ) + ok( status == STATUS_SUCCESS || broken( status == STATUS_ACCESS_DENIED ) /* wxppro */, + "NtOpenThread returned:%x\n", status ); + if (status != STATUS_SUCCESS) continue; + + status = pNtQueryInformationThread( handle, ThreadBasicInformation, &tbi, sizeof(tbi), NULL ); + ok( status == STATUS_SUCCESS, "NtQueryInformationThread returned:%x\n", status ); + ok( tbi.ClientId.UniqueThread == ULongToHandle(GetCurrentThreadId()), + "Expected tid %p, got %p\n", ULongToHandle(GetCurrentThreadId()), tbi.ClientId.UniqueThread ); + + NtClose( handle ); + } } static void test_query_procperf(void)

1 0

Rémi Bernon : server: Make sure pids/tids are multiples of four.
by Alexandre Julliard April 27, 2020

April 27, 2020

Module: wine Branch: master Commit: daa120309e1f674a251497ff6a014168d339c90c URL: https://source.winehq.org/git/wine.git/?a=commit;h=daa120309e1f674a251497ff… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Apr 25 10:05:10 2020 +0200 server: Make sure pids/tids are multiples of four. Street Fighter V unpacker relies on it when validating other processes for its anti-debug checks, it uses (PID&0xfffffffc)>>2 as an array index and then checks back indexes against PIDs, and terminates early if some PIDs do not match. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 4 ---- server/process.c | 31 ++++++++++++++++++------------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 1576f5ca97..e28eefa986 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -409,7 +409,6 @@ static void test_query_process(void) DWORD_PTR tid; DWORD j; - todo_wine_if(last_pid & 3) ok(!(last_pid & 3), "Unexpected PID low bits: %p\n", spi->UniqueProcessId); for ( j = 0; j < spi->dwThreadCount; j++) { @@ -419,7 +418,6 @@ static void test_query_process(void) spi->ti[j].ClientId.UniqueProcess, spi->UniqueProcessId); tid = (DWORD_PTR)spi->ti[j].ClientId.UniqueThread; - todo_wine_if(tid & 3) ok(!(tid & 3), "Unexpected TID low bits: %p\n", spi->ti[j].ClientId.UniqueThread); } } @@ -450,7 +448,6 @@ static void test_query_process(void) cid.UniqueThread = 0; status = NtOpenProcess( &handle, PROCESS_QUERY_LIMITED_INFORMATION, &attr, &cid ); - todo_wine_if( status != STATUS_SUCCESS ) ok( status == STATUS_SUCCESS || broken( status == STATUS_ACCESS_DENIED ) /* wxppro */, "NtOpenProcess returned:%x\n", status ); if (status != STATUS_SUCCESS) continue; @@ -470,7 +467,6 @@ static void test_query_process(void) cid.UniqueThread = ULongToHandle(GetCurrentThreadId() + i); status = NtOpenThread( &handle, THREAD_QUERY_LIMITED_INFORMATION, &attr, &cid ); - todo_wine_if( status != STATUS_SUCCESS ) ok( status == STATUS_SUCCESS || broken( status == STATUS_ACCESS_DENIED ) /* wxppro */, "NtOpenThread returned:%x\n", status ); if (status != STATUS_SUCCESS) continue; diff --git a/server/process.c b/server/process.c index 73984f363f..211207ed03 100644 --- a/server/process.c +++ b/server/process.c @@ -339,21 +339,24 @@ static void kill_all_processes(void); #define PTID_OFFSET 8 /* offset for first ptid value */ +static unsigned int index_from_ptid(unsigned int id) { return id / 4; } +static unsigned int ptid_from_index(unsigned int index) { return index * 4; } + /* allocate a new process or thread id */ unsigned int alloc_ptid( void *ptr ) { struct ptid_entry *entry; - unsigned int id; + unsigned int index; if (used_ptid_entries < alloc_ptid_entries) { - id = used_ptid_entries + PTID_OFFSET; + index = used_ptid_entries + PTID_OFFSET; entry = &ptid_entries[used_ptid_entries++]; } else if (next_free_ptid && num_free_ptids >= 256) { - id = next_free_ptid; - entry = &ptid_entries[id - PTID_OFFSET]; + index = next_free_ptid; + entry = &ptid_entries[index - PTID_OFFSET]; if (!(next_free_ptid = entry->next)) last_free_ptid = 0; num_free_ptids--; } @@ -368,35 +371,37 @@ unsigned int alloc_ptid( void *ptr ) } ptid_entries = entry; alloc_ptid_entries = count; - id = used_ptid_entries + PTID_OFFSET; + index = used_ptid_entries + PTID_OFFSET; entry = &ptid_entries[used_ptid_entries++]; } entry->ptr = ptr; - return id; + return ptid_from_index( index ); } /* free a process or thread id */ void free_ptid( unsigned int id ) { - struct ptid_entry *entry = &ptid_entries[id - PTID_OFFSET]; + unsigned int index = index_from_ptid( id ); + struct ptid_entry *entry = &ptid_entries[index - PTID_OFFSET]; entry->ptr = NULL; entry->next = 0; /* append to end of free list so that we don't reuse it too early */ - if (last_free_ptid) ptid_entries[last_free_ptid - PTID_OFFSET].next = id; - else next_free_ptid = id; - last_free_ptid = id; + if (last_free_ptid) ptid_entries[last_free_ptid - PTID_OFFSET].next = index; + else next_free_ptid = index; + last_free_ptid = index; num_free_ptids++; } /* retrieve the pointer corresponding to a process or thread id */ void *get_ptid_entry( unsigned int id ) { - if (id < PTID_OFFSET) return NULL; - if (id - PTID_OFFSET >= used_ptid_entries) return NULL; - return ptid_entries[id - PTID_OFFSET].ptr; + unsigned int index = index_from_ptid( id ); + if (index < PTID_OFFSET) return NULL; + if (index - PTID_OFFSET >= used_ptid_entries) return NULL; + return ptid_entries[index - PTID_OFFSET].ptr; } /* return the main thread of the process */

1 0

Zebediah Figura : advapi32: Move event tracing APIs to sechost.
by Alexandre Julliard April 27, 2020

April 27, 2020

Module: wine Branch: master Commit: aa6e060172532e407796fba9219a3ae678150ad2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa6e060172532e407796fba9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 25 15:40:24 2020 -0500 advapi32: Move event tracing APIs to sechost. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/Makefile.in | 2 +- dlls/advapi32/advapi32.spec | 24 +++---- dlls/advapi32/eventlog.c | 142 ---------------------------------------- dlls/sechost/Makefile.in | 5 ++ dlls/sechost/sechost.spec | 24 +++---- dlls/sechost/trace.c | 155 ++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 185 insertions(+), 167 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aa6e060172532e407796…

1 0

Dmitry Kislyuk : wshom.ocx: Use wide character string literals.
by Alexandre Julliard April 27, 2020

April 27, 2020

Module: wine Branch: master Commit: 7d0c23f60ef4382eb89cd2facd99b8bcec0530cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d0c23f60ef4382eb89cd2fa… Author: Dmitry Kislyuk <dimaki(a)rocketmail.com> Date: Sat Apr 25 23:10:36 2020 -0500 wshom.ocx: Use wide character string literals. Signed-off-by: Dmitry Kislyuk <dimaki(a)rocketmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wshom.ocx/shell.c | 38 ++++++++++++++------------------------ 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 543d951ea0..f05ce31ee9 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -637,9 +637,6 @@ static HRESULT WINAPI WshCollection_Invoke(IWshCollection *iface, DISPID dispIdM static HRESULT WINAPI WshCollection_Item(IWshCollection *iface, VARIANT *index, VARIANT *value) { WshCollection *This = impl_from_IWshCollection(iface); - static const WCHAR allusersdesktopW[] = {'A','l','l','U','s','e','r','s','D','e','s','k','t','o','p',0}; - static const WCHAR allusersprogramsW[] = {'A','l','l','U','s','e','r','s','P','r','o','g','r','a','m','s',0}; - static const WCHAR desktopW[] = {'D','e','s','k','t','o','p',0}; PIDLIST_ABSOLUTE pidl; WCHAR pathW[MAX_PATH]; int kind = 0; @@ -655,11 +652,11 @@ static HRESULT WINAPI WshCollection_Item(IWshCollection *iface, VARIANT *index, } folder = V_BSTR(index); - if (!wcsicmp(folder, desktopW)) + if (!wcsicmp(folder, L"Desktop")) kind = CSIDL_DESKTOP; - else if (!wcsicmp(folder, allusersdesktopW)) + else if (!wcsicmp(folder, L"AllUsersDesktop")) kind = CSIDL_COMMON_DESKTOPDIRECTORY; - else if (!wcsicmp(folder, allusersprogramsW)) + else if (!wcsicmp(folder, L"AllUsersPrograms")) kind = CSIDL_COMMON_PROGRAMS; else { @@ -908,7 +905,6 @@ static HRESULT WINAPI WshShortcut_put_Hotkey(IWshShortcut *iface, BSTR Hotkey) static HRESULT WINAPI WshShortcut_get_IconLocation(IWshShortcut *iface, BSTR *IconPath) { - static const WCHAR fmtW[] = {'%','s',',',' ','%','d',0}; WshShortcut *This = impl_from_IWshShortcut(iface); WCHAR buffW[MAX_PATH], pathW[MAX_PATH]; INT icon = 0; @@ -922,7 +918,7 @@ static HRESULT WINAPI WshShortcut_get_IconLocation(IWshShortcut *iface, BSTR *Ic hr = IShellLinkW_GetIconLocation(This->link, buffW, ARRAY_SIZE(buffW), &icon); if (FAILED(hr)) return hr; - swprintf(pathW, ARRAY_SIZE(pathW), fmtW, buffW, icon); + swprintf(pathW, ARRAY_SIZE(pathW), L"%s, %d", buffW, icon); *IconPath = SysAllocString(pathW); if (!*IconPath) return E_OUTOFMEMORY; @@ -1318,11 +1314,10 @@ struct popup_thread_param static DWORD WINAPI popup_thread_proc(void *arg) { - static const WCHAR defaulttitleW[] = {'W','i','n','d','o','w','s',' ','S','c','r','i','p','t',' ','H','o','s','t',0}; struct popup_thread_param *param = (struct popup_thread_param *)arg; param->button = MessageBoxW(NULL, param->text, is_optional_argument(&param->title) ? - defaulttitleW : V_BSTR(&param->title), V_I4(&param->type)); + L"Windows Script Host" : V_BSTR(&param->title), V_I4(&param->type)); return 0; } @@ -1420,11 +1415,11 @@ static HKEY get_root_key(const WCHAR *path) const WCHAR abbrev[5]; HKEY hkey; } rootkeys[] = { - { {'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R',0}, {'H','K','C','U',0}, HKEY_CURRENT_USER }, - { {'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E',0}, {'H','K','L','M',0}, HKEY_LOCAL_MACHINE }, - { {'H','K','E','Y','_','C','L','A','S','S','E','S','_','R','O','O','T',0}, {'H','K','C','R',0}, HKEY_CLASSES_ROOT }, - { {'H','K','E','Y','_','U','S','E','R','S',0}, {0}, HKEY_USERS }, - { {'H','K','E','Y','_','C','U','R','R','E','N','T','_','C','O','N','F','I','G',0}, {0}, HKEY_CURRENT_CONFIG } + { L"HKEY_CURRENT_USER", L"HKCU", HKEY_CURRENT_USER }, + { L"HKEY_LOCAL_MACHINE", L"HKLM", HKEY_LOCAL_MACHINE }, + { L"HKEY_CLASSES_ROOT", L"HKCR", HKEY_CLASSES_ROOT }, + { L"HKEY_USERS", {0}, HKEY_USERS }, + { L"HKEY_CURRENT_CONFIG", {0}, HKEY_CURRENT_CONFIG } }; int i; @@ -1612,11 +1607,6 @@ fail: static HRESULT WINAPI WshShell3_RegWrite(IWshShell3 *iface, BSTR name, VARIANT *value, VARIANT *type) { - static const WCHAR regexpandszW[] = {'R','E','G','_','E','X','P','A','N','D','_','S','Z',0}; - static const WCHAR regszW[] = {'R','E','G','_','S','Z',0}; - static const WCHAR regdwordW[] = {'R','E','G','_','D','W','O','R','D',0}; - static const WCHAR regbinaryW[] = {'R','E','G','_','B','I','N','A','R','Y',0}; - DWORD regtype, data_len; WCHAR *subkey, *val; const BYTE *data; @@ -1641,13 +1631,13 @@ static HRESULT WINAPI WshShell3_RegWrite(IWshShell3 *iface, BSTR name, VARIANT * if (V_VT(type) != VT_BSTR) return E_INVALIDARG; - if (!wcscmp(V_BSTR(type), regszW)) + if (!wcscmp(V_BSTR(type), L"REG_SZ")) regtype = REG_SZ; - else if (!wcscmp(V_BSTR(type), regdwordW)) + else if (!wcscmp(V_BSTR(type), L"REG_DWORD")) regtype = REG_DWORD; - else if (!wcscmp(V_BSTR(type), regexpandszW)) + else if (!wcscmp(V_BSTR(type), L"REG_EXPAND_SZ")) regtype = REG_EXPAND_SZ; - else if (!wcscmp(V_BSTR(type), regbinaryW)) + else if (!wcscmp(V_BSTR(type), L"REG_BINARY")) regtype = REG_BINARY; else { FIXME("unrecognized value type %s\n", debugstr_w(V_BSTR(type)));

1 0