November 2018 - Wine-commits

Alexandre Julliard : wineandroid: Avoid using deprecated Build.CPU_ABI.
by Alexandre Julliard 26 Nov '18

26 Nov '18

Module: wine Branch: master Commit: 996f7a192d6148c9eb017d87d220d1af5841c54b URL: https://source.winehq.org/git/wine.git/?a=commit;h=996f7a192d6148c9eb017d87… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 26 14:40:33 2018 +0100 wineandroid: Avoid using deprecated Build.CPU_ABI. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 38 +++++++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/dlls/wineandroid.drv/WineActivity.java b/dlls/wineandroid.drv/WineActivity.java index 1d5b346..e9ab1f2 100644 --- a/dlls/wineandroid.drv/WineActivity.java +++ b/dlls/wineandroid.drv/WineActivity.java @@ -20,6 +20,7 @@ package org.winehq.wine; +import android.annotation.TargetApi; import android.app.Activity; import android.app.ProgressDialog; import android.content.Context; @@ -74,18 +75,38 @@ public class WineActivity extends Activity new Thread( new Runnable() { public void run() { loadWine( null ); }} ).start(); } + @TargetApi(21) + @SuppressWarnings("deprecation") + private String[] get_supported_abis() + { + if (Build.VERSION.SDK_INT >= 21) return Build.SUPPORTED_ABIS; + return new String[]{ Build.CPU_ABI }; + } + + private String get_wine_abi() + { + for (String abi : get_supported_abis()) + { + File server = new File( getFilesDir(), abi + "/bin/wineserver" ); + if (server.canExecute()) return abi; + } + Log.e( LOGTAG, "could not find a supported ABI" ); + return null; + } + private void loadWine( String cmdline ) { - File bindir = new File( getFilesDir(), Build.CPU_ABI + "/bin" ); - File libdir = new File( getFilesDir(), Build.CPU_ABI + "/lib" ); + copyAssetFiles(); + + String wine_abi = get_wine_abi(); + File bindir = new File( getFilesDir(), wine_abi + "/bin" ); + File libdir = new File( getFilesDir(), wine_abi + "/lib" ); File dlldir = new File( libdir, "wine" ); File prefix = new File( getFilesDir(), "prefix" ); File loader = new File( bindir, "wine" ); String locale = Locale.getDefault().getLanguage() + "_" + Locale.getDefault().getCountry() + ".UTF-8"; - copyAssetFiles(); - HashMap<String,String> env = new HashMap<String,String>(); env.put( "WINELOADER", loader.toString() ); env.put( "WINEPREFIX", prefix.toString() ); @@ -166,15 +187,18 @@ public class WineActivity extends Activity { if (name.equals( "files.sum" )) return true; if (name.startsWith( "share/" )) return true; - if (name.startsWith( Build.CPU_ABI + "/system/" )) return false; - if (name.startsWith( Build.CPU_ABI + "/" )) return true; + for (String abi : get_supported_abis()) + { + if (name.startsWith( abi + "/system/" )) return false; + if (name.startsWith( abi + "/" )) return true; + } if (name.startsWith( "x86/" )) return true; return false; } private final boolean isFileExecutable( String name ) { - return name.startsWith( Build.CPU_ABI + "/" ) || name.startsWith( "x86/" ); + return !name.equals( "files.sum" ) && !name.startsWith( "share/" ); } private final HashMap<String,String> readMapFromInputStream( InputStream in )

1 0

Alexandre Julliard : wineandroid: Wrap Java calls to preserve %gs on x86_64.
by Alexandre Julliard 26 Nov '18

26 Nov '18

Module: wine Branch: master Commit: 2b8d787b176d2f977c88925542fd5bbdb20261d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b8d787b176d2f977c889255… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 26 14:42:18 2018 +0100 wineandroid: Wrap Java calls to preserve %gs on x86_64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/device.c | 40 ++++++++++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index c0ff072..c9a9a95 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -240,13 +240,39 @@ static inline BOOL is_client_in_process(void) return current_client_id() == GetCurrentProcessId(); } -#ifdef __i386__ /* the Java VM uses %fs for its own purposes, so we need to wrap the calls */ +#ifdef __i386__ /* the Java VM uses %fs/%gs for its own purposes, so we need to wrap the calls */ + static WORD orig_fs, java_fs; static inline void wrap_java_call(void) { wine_set_fs( java_fs ); } static inline void unwrap_java_call(void) { wine_set_fs( orig_fs ); } +static inline void init_java_thread( JavaVM *java_vm ) +{ + orig_fs = wine_get_fs(); + (*java_vm)->AttachCurrentThread( java_vm, &jni_env, 0 ); + java_fs = wine_get_fs(); + wine_set_fs( orig_fs ); +} + +#elif defined(__x86_64__) + +#include <asm/prctl.h> +#include <asm/unistd.h> +static void *orig_teb, *java_teb; +static inline int arch_prctl( int func, void *ptr ) { return syscall( __NR_arch_prctl, func, ptr ); } +static inline void wrap_java_call(void) { arch_prctl( ARCH_SET_GS, java_teb ); } +static inline void unwrap_java_call(void) { arch_prctl( ARCH_SET_GS, orig_teb ); } +static inline void init_java_thread( JavaVM *java_vm ) +{ + arch_prctl( ARCH_GET_GS, &orig_teb ); + (*java_vm)->AttachCurrentThread( java_vm, &jni_env, 0 ); + arch_prctl( ARCH_GET_GS, &java_teb ); + arch_prctl( ARCH_SET_GS, orig_teb ); +} + #else static inline void wrap_java_call(void) { } static inline void unwrap_java_call(void) { } +static inline void init_java_thread( JavaVM *java_vm ) { (*java_vm)->AttachCurrentThread( java_vm, &jni_env, 0 ); } #endif /* __i386__ */ static struct native_win_data *data_map[65536]; @@ -1092,15 +1118,7 @@ static DWORD CALLBACK device_thread( void *arg ) if (!(java_vm = wine_get_java_vm())) return 0; /* not running under Java */ -#ifdef __i386__ - orig_fs = wine_get_fs(); - (*java_vm)->AttachCurrentThread( java_vm, &jni_env, 0 ); - java_fs = wine_get_fs(); - wine_set_fs( orig_fs ); - if (java_fs != orig_fs) TRACE( "%%fs changed from %04x to %04x by Java VM\n", orig_fs, java_fs ); -#else - (*java_vm)->AttachCurrentThread( java_vm, &jni_env, 0 ); -#endif + init_java_thread( java_vm ); create_desktop_window( GetDesktopWindow() ); @@ -1116,7 +1134,9 @@ static DWORD CALLBACK device_thread( void *arg ) ret = wine_ntoskrnl_main_loop( stop_event ); + wrap_java_call(); (*java_vm)->DetachCurrentThread( java_vm ); + unwrap_java_call(); return ret; }

1 0

Alexandre Julliard : wineandroid: Support for setting the cursor on Android >= N.
by Alexandre Julliard 26 Nov '18

26 Nov '18

Module: wine Branch: master Commit: 61888e001279d28ba6e95c81b47db4e009148da2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61888e001279d28ba6e95c81… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 26 16:11:44 2018 +0100 wineandroid: Support for setting the cursor on Android >= N. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 28 ++++ dlls/wineandroid.drv/android.h | 4 +- dlls/wineandroid.drv/build.gradle.in | 2 +- dlls/wineandroid.drv/device.c | 72 ++++++++ dlls/wineandroid.drv/window.c | 266 ++++++++++++++++++++++++++++++ dlls/wineandroid.drv/wineandroid.drv.spec | 1 + 6 files changed, 371 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=61888e001279d28ba6e9…

1 0

Nikolay Sivov : dwrite/tests: Add some tests for GetUnicodeRanges().
by Alexandre Julliard 26 Nov '18

26 Nov '18

Module: wine Branch: master Commit: c3ea5664b6e723c092363133106cf28ee00d2139 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3ea5664b6e723c092363133… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 26 11:43:09 2018 +0300 dwrite/tests: Add some tests for GetUnicodeRanges(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 356 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 355 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c3ea5664b6e723c09236…

1 0

Nikolay Sivov : shcore: Turn COM exports to stubs.
by Alexandre Julliard 26 Nov '18

26 Nov '18

Module: wine Branch: master Commit: 35216c7938af866467db6e2fd8fda3f4c0296661 URL: https://source.winehq.org/git/wine.git/?a=commit;h=35216c7938af866467db6e2f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 26 11:53:10 2018 +0300 shcore: Turn COM exports to stubs. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shcore/shcore.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index 0b20781..dac4274 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -3,9 +3,9 @@ @ stub CreateRandomAccessStreamOnFile @ stub CreateRandomAccessStreamOverStream @ stub CreateStreamOverRandomAccessStream -@ stdcall -private DllCanUnloadNow() shell32.DllCanUnloadNow +@ stub DllCanUnloadNow @ stub DllGetActivationFactory -@ stdcall -private DllGetClassObject(ptr ptr ptr) shell32.DllGetClassObject +@ stub DllGetClassObject @ stdcall GetCurrentProcessExplicitAppUserModelID(ptr) shell32.GetCurrentProcessExplicitAppUserModelID @ stdcall GetDpiForMonitor(long long ptr ptr) @ stub GetDpiForShellUIComponent

1 0

Nikolay Sivov : shcore: Add AppUserModelID stubs.
by Alexandre Julliard 26 Nov '18

26 Nov '18

Module: wine Branch: master Commit: aa6b80723c6b55fedc6e874345a0ebca64e79e6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa6b80723c6b55fedc6e8743… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 26 11:53:11 2018 +0300 shcore: Add AppUserModelID stubs. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shcore/main.c | 13 +++++++++++++ dlls/shcore/shcore.spec | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index aa513ee..ccea518 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -221,3 +221,16 @@ HRESULT WINAPI IUnknown_SetSite(IUnknown *obj, IUnknown *site) return hr; } + +HRESULT WINAPI SetCurrentProcessExplicitAppUserModelID(const WCHAR *appid) +{ + FIXME("%s: stub\n", debugstr_w(appid)); + return E_NOTIMPL; +} + +HRESULT WINAPI GetCurrentProcessExplicitAppUserModelID(const WCHAR **appid) +{ + FIXME("%p: stub\n", appid); + *appid = NULL; + return E_NOTIMPL; +} diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index dac4274..2f3ca99 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -6,7 +6,7 @@ @ stub DllCanUnloadNow @ stub DllGetActivationFactory @ stub DllGetClassObject -@ stdcall GetCurrentProcessExplicitAppUserModelID(ptr) shell32.GetCurrentProcessExplicitAppUserModelID +@ stdcall GetCurrentProcessExplicitAppUserModelID(ptr) @ stdcall GetDpiForMonitor(long long ptr ptr) @ stub GetDpiForShellUIComponent @ stdcall GetProcessDpiAwareness(long ptr) @@ -77,7 +77,7 @@ @ stdcall SHStrDupW(wstr ptr) shlwapi.SHStrDupW @ stdcall SHUnicodeToAnsi(wstr ptr ptr) shlwapi.SHUnicodeToAnsi @ stdcall SHUnicodeToUnicode(wstr ptr long) shlwapi.SHUnicodeToUnicode -@ stdcall SetCurrentProcessExplicitAppUserModelID(wstr) shell32.SetCurrentProcessExplicitAppUserModelID +@ stdcall SetCurrentProcessExplicitAppUserModelID(wstr) @ stdcall SetProcessDpiAwareness(long) @ stub SetProcessReference @ stub UnregisterScaleChangeEvent

1 0

Nikolay Sivov : shcore: Add CommandLineToArgvW().
by Alexandre Julliard 26 Nov '18

26 Nov '18

Module: wine Branch: master Commit: e4115e36c4c42df1b1aa357bc8f172e2424b8b93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4115e36c4c42df1b1aa357b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 26 11:53:12 2018 +0300 shcore: Add CommandLineToArgvW(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shcore/main.c | 258 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/shcore/shcore.spec | 2 +- 2 files changed, 259 insertions(+), 1 deletion(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index ccea518..8f674a2 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -29,6 +29,7 @@ #include "ocidl.h" #include "shellscalingapi.h" #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(shcore); @@ -234,3 +235,260 @@ HRESULT WINAPI GetCurrentProcessExplicitAppUserModelID(const WCHAR **appid) *appid = NULL; return E_NOTIMPL; } + +/************************************************************************* + * CommandLineToArgvW [SHCORE.@] + * + * We must interpret the quotes in the command line to rebuild the argv + * array correctly: + * - arguments are separated by spaces or tabs + * - quotes serve as optional argument delimiters + * '"a b"' -> 'a b' + * - escaped quotes must be converted back to '"' + * '\"' -> '"' + * - consecutive backslashes preceding a quote see their number halved with + * the remainder escaping the quote: + * 2n backslashes + quote -> n backslashes + quote as an argument delimiter + * 2n+1 backslashes + quote -> n backslashes + literal quote + * - backslashes that are not followed by a quote are copied literally: + * 'a\b' -> 'a\b' + * 'a\\b' -> 'a\\b' + * - in quoted strings, consecutive quotes see their number divided by three + * with the remainder modulo 3 deciding whether to close the string or not. + * Note that the opening quote must be counted in the consecutive quotes, + * that's the (1+) below: + * (1+) 3n quotes -> n quotes + * (1+) 3n+1 quotes -> n quotes plus closes the quoted string + * (1+) 3n+2 quotes -> n+1 quotes plus closes the quoted string + * - in unquoted strings, the first quote opens the quoted string and the + * remaining consecutive quotes follow the above rule. + */ +WCHAR** WINAPI CommandLineToArgvW(const WCHAR *cmdline, int *numargs) +{ + int qcount, bcount; + const WCHAR *s; + WCHAR **argv; + DWORD argc; + WCHAR *d; + + if (!numargs) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + + if (*cmdline == 0) + { + /* Return the path to the executable */ + DWORD len, deslen = MAX_PATH, size; + + size = sizeof(WCHAR *) * 2 + deslen * sizeof(WCHAR); + for (;;) + { + if (!(argv = LocalAlloc(LMEM_FIXED, size))) return NULL; + len = GetModuleFileNameW(0, (WCHAR *)(argv + 2), deslen); + if (!len) + { + LocalFree(argv); + return NULL; + } + if (len < deslen) break; + deslen *= 2; + size = sizeof(WCHAR *) * 2 + deslen * sizeof(WCHAR); + LocalFree(argv); + } + argv[0] = (WCHAR *)(argv + 2); + argv[1] = NULL; + *numargs = 1; + + return argv; + } + + /* --- First count the arguments */ + argc = 1; + s = cmdline; + /* The first argument, the executable path, follows special rules */ + if (*s == '"') + { + /* The executable path ends at the next quote, no matter what */ + s++; + while (*s) + if (*s++ == '"') + break; + } + else + { + /* The executable path ends at the next space, no matter what */ + while (*s && *s != ' ' && *s != '\t') + s++; + } + /* skip to the first argument, if any */ + while (*s == ' ' || *s == '\t') + s++; + if (*s) + argc++; + + /* Analyze the remaining arguments */ + qcount = bcount = 0; + while (*s) + { + if ((*s == ' ' || *s == '\t') && qcount == 0) + { + /* skip to the next argument and count it if any */ + while (*s == ' ' || *s == '\t') + s++; + if (*s) + argc++; + bcount = 0; + } + else if (*s == '\\') + { + /* '\', count them */ + bcount++; + s++; + } + else if (*s == '"') + { + /* '"' */ + if ((bcount & 1) == 0) + qcount++; /* unescaped '"' */ + s++; + bcount = 0; + /* consecutive quotes, see comment in copying code below */ + while (*s == '"') + { + qcount++; + s++; + } + qcount = qcount % 3; + if (qcount == 2) + qcount = 0; + } + else + { + /* a regular character */ + bcount = 0; + s++; + } + } + + /* Allocate in a single lump, the string array, and the strings that go + * with it. This way the caller can make a single LocalFree() call to free + * both, as per MSDN. + */ + argv = LocalAlloc(LMEM_FIXED, (argc + 1) * sizeof(WCHAR *) + (strlenW(cmdline) + 1) * sizeof(WCHAR)); + if (!argv) + return NULL; + + /* --- Then split and copy the arguments */ + argv[0] = d = strcpyW((WCHAR *)(argv + argc + 1), cmdline); + argc = 1; + /* The first argument, the executable path, follows special rules */ + if (*d == '"') + { + /* The executable path ends at the next quote, no matter what */ + s = d + 1; + while (*s) + { + if (*s == '"') + { + s++; + break; + } + *d++ = *s++; + } + } + else + { + /* The executable path ends at the next space, no matter what */ + while (*d && *d != ' ' && *d != '\t') + d++; + s = d; + if (*s) + s++; + } + /* close the executable path */ + *d++ = 0; + /* skip to the first argument and initialize it if any */ + while (*s == ' ' || *s == '\t') + s++; + if (!*s) + { + /* There are no parameters so we are all done */ + argv[argc] = NULL; + *numargs = argc; + return argv; + } + + /* Split and copy the remaining arguments */ + argv[argc++] = d; + qcount = bcount = 0; + while (*s) + { + if ((*s == ' ' || *s == '\t') && qcount == 0) + { + /* close the argument */ + *d++ = 0; + bcount = 0; + + /* skip to the next one and initialize it if any */ + do { + s++; + } while (*s == ' ' || *s == '\t'); + if (*s) + argv[argc++] = d; + } + else if (*s=='\\') + { + *d++ = *s++; + bcount++; + } + else if (*s == '"') + { + if ((bcount & 1) == 0) + { + /* Preceded by an even number of '\', this is half that + * number of '\', plus a quote which we erase. + */ + d -= bcount / 2; + qcount++; + } + else + { + /* Preceded by an odd number of '\', this is half that + * number of '\' followed by a '"' + */ + d = d - bcount / 2 - 1; + *d++ = '"'; + } + s++; + bcount = 0; + /* Now count the number of consecutive quotes. Note that qcount + * already takes into account the opening quote if any, as well as + * the quote that lead us here. + */ + while (*s == '"') + { + if (++qcount == 3) + { + *d++ = '"'; + qcount = 0; + } + s++; + } + if (qcount == 2) + qcount = 0; + } + else + { + /* a regular character */ + *d++ = *s++; + bcount = 0; + } + } + *d = '\0'; + argv[argc] = NULL; + *numargs = argc; + + return argv; +} diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index 2f3ca99..1266a02 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -1,5 +1,5 @@ 1 stub @ -@ stdcall CommandLineToArgvW(wstr ptr) shell32.CommandLineToArgvW +@ stdcall CommandLineToArgvW(wstr ptr) @ stub CreateRandomAccessStreamOnFile @ stub CreateRandomAccessStreamOverStream @ stub CreateStreamOverRandomAccessStream

1 0

Nikolay Sivov : shell32: Forward some functions to shcore.dll.
by Alexandre Julliard 26 Nov '18

26 Nov '18

Module: wine Branch: master Commit: 74042733b132ff52e5d8a12785442fbfaac2a8f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74042733b132ff52e5d8a127… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 26 11:53:13 2018 +0300 shell32: Forward some functions to shcore.dll. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.spec | 6 +- dlls/shell32/shell32_main.c | 279 -------------------------------------------- tools/make_specfiles | 14 +-- 3 files changed, 10 insertions(+), 289 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=74042733b132ff52e5d8…

1 0

Brendan McGrath : msi: Set stale function pointers to NULL.
by Alexandre Julliard 26 Nov '18

26 Nov '18

Module: wine Branch: master Commit: 256ca317a2871c62ca121e49f29fc37a64b4fb64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=256ca317a2871c62ca121e49… Author: Brendan McGrath <brendan(a)redmandi.com> Date: Mon Nov 26 20:23:34 2018 +1100 msi: Set stale function pointers to NULL. A crash occurs during install of dotnet35 on a 64-bit prefix as when msi_destroy_assembly_caches is called, the mscoree library is unloaded but the function pointers are not set back to NULL. Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/assembly.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index 7857e8b..f46ff02 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -36,7 +36,6 @@ static HRESULT (WINAPI *pCreateAssemblyCacheNet11)( IAssemblyCache **, DWORD ); static HRESULT (WINAPI *pCreateAssemblyCacheNet20)( IAssemblyCache **, DWORD ); static HRESULT (WINAPI *pCreateAssemblyCacheNet40)( IAssemblyCache **, DWORD ); static HRESULT (WINAPI *pCreateAssemblyCacheSxs)( IAssemblyCache **, DWORD ); -static HRESULT (WINAPI *pLoadLibraryShim)( LPCWSTR, LPCWSTR, LPVOID, HMODULE * ); static HRESULT (WINAPI *pGetFileVersion)( LPCWSTR, LPWSTR, DWORD, DWORD * ); static HRESULT (WINAPI *pCreateAssemblyNameObject)( IAssemblyName **, LPCWSTR, DWORD, LPVOID ); static HRESULT (WINAPI *pCreateAssemblyEnum)( IAssemblyEnum **, IUnknown *, IAssemblyName *, DWORD, LPVOID ); @@ -52,6 +51,7 @@ static BOOL init_function_pointers( void ) static const WCHAR szVersion11[] = {'v','1','.','1','.','4','3','2','2',0}; static const WCHAR szVersion20[] = {'v','2','.','0','.','5','0','7','2','7',0}; static const WCHAR szVersion40[] = {'v','4','.','0','.','3','0','3','1','9',0}; + HRESULT (WINAPI *pLoadLibraryShim)( LPCWSTR, LPCWSTR, LPVOID, HMODULE * ); WCHAR path[MAX_PATH]; DWORD len = GetSystemDirectoryW( path, MAX_PATH ); @@ -121,6 +121,9 @@ void msi_destroy_assembly_caches( MSIPACKAGE *package ) pCreateAssemblyCacheNet11 = NULL; pCreateAssemblyCacheNet20 = NULL; pCreateAssemblyCacheNet40 = NULL; + pGetFileVersion = NULL; + pCreateAssemblyNameObject = NULL; + pCreateAssemblyEnum = NULL; FreeLibrary( hfusion10 ); FreeLibrary( hfusion11 ); FreeLibrary( hfusion20 );

1 0

Hans Leidekker : winhttp: Use the thread pool for the connection collector.
by Alexandre Julliard 26 Nov '18

26 Nov '18

Module: wine Branch: master Commit: 682ddd826a6efb53827c7979be6716b8ce6c7d50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=682ddd826a6efb53827c7979… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 26 12:08:54 2018 +0100 winhttp: Use the thread pool for the connection collector. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 61af6ea..edfebac 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1457,7 +1457,7 @@ void release_host( struct hostdata *host ) static BOOL connection_collector_running; -static DWORD WINAPI connection_collector(void *arg) +static void CALLBACK connection_collector( TP_CALLBACK_INSTANCE *instance, void *ctx ) { unsigned int remaining_connections; struct netconn *netconn, *next_netconn; @@ -1483,10 +1483,7 @@ static DWORD WINAPI connection_collector(void *arg) list_remove(&netconn->entry); netconn_close(netconn); } - else - { - remaining_connections++; - } + else remaining_connections++; } } @@ -1495,7 +1492,7 @@ static DWORD WINAPI connection_collector(void *arg) LeaveCriticalSection(&connection_pool_cs); } while(remaining_connections); - FreeLibraryAndExitThread( winhttp_instance, 0 ); + FreeLibraryWhenCallbackReturns( instance, winhttp_instance ); } static void cache_connection( struct netconn *netconn ) @@ -1510,20 +1507,11 @@ static void cache_connection( struct netconn *netconn ) if (!connection_collector_running) { HMODULE module; - HANDLE thread; - GetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (const WCHAR*)winhttp_instance, &module ); + GetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (const WCHAR *)winhttp_instance, &module ); - thread = CreateThread(NULL, 0, connection_collector, NULL, 0, NULL); - if (thread) - { - CloseHandle( thread ); - connection_collector_running = TRUE; - } - else - { - FreeLibrary( winhttp_instance ); - } + if (TrySubmitThreadpoolCallback( connection_collector, NULL, NULL )) connection_collector_running = TRUE; + else FreeLibrary( winhttp_instance ); } LeaveCriticalSection( &connection_pool_cs );

1 0