November 2018 - Wine-Commits

Alexandre Julliard : wineandroid: Avoid using deprecated Build.CPU_ABI.
by Alexandre Julliard Nov. 26, 2018

Nov. 26, 2018

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 : makefiles: Create 64-bit winewrapper symlink in the WoW64 build tree.
by Alexandre Julliard Nov. 26, 2018

Nov. 26, 2018

Module: wine Branch: master Commit: faac33827c640c3884974d73f36d1582d97a0577 URL: https://source.winehq.org/git/wine.git/?a=commit;h=faac33827c640c3884974d73… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 26 14:20:39 2018 +0100 makefiles: Create 64-bit winewrapper symlink in the WoW64 build tree. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 2 +- configure | 2 +- configure.ac | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 289ee92..25ac678 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -257,7 +257,7 @@ dnl dnl Usage: WINE_CONFIG_SYMLINK(target,src,files,enable,srcfile) dnl AC_DEFUN([WINE_CONFIG_SYMLINK],[AC_REQUIRE([WINE_CONFIG_HELPERS])dnl -m4_ifval([$4],[if test "x$[$4]" != xno; then +m4_ifval([$4],[if test $4; then ])m4_foreach([f],[$3], [AC_CONFIG_LINKS(m4_ifval([$1],[$1/])f[:]m4_ifval([$2],[$2/])m4_ifval([$5],[$5],f))])dnl m4_if([$1],[$2],[test "$srcdir" = "." || ])dnl diff --git a/configure b/configure index 63f4633..bb2817c 100755 --- a/configure +++ b/configure @@ -18977,7 +18977,7 @@ ac_config_links="$ac_config_links loader/l_intl.nls:loader/l_intl.nls" test "$srcdir" = "." || wine_fn_config_symlink loader/l_intl.nls ac_config_links="$ac_config_links wine:tools/winewrapper" wine_fn_config_symlink wine -if test "x$enable_win64" != xno; then +if test "x$enable_win64" != xno -o -n "$with_wine64"; then ac_config_links="$ac_config_links wine64:tools/winewrapper" wine_fn_config_symlink wine64 fi diff --git a/configure.ac b/configure.ac index 39cabf2..8bf5e10 100644 --- a/configure.ac +++ b/configure.ac @@ -2832,10 +2832,10 @@ Makefile: $srcdir/Makefile.in config.status \$(MAKEDEP) depend: \$(MAKEDEP) dummy \$(MAKEDEP)]) -WINE_CONFIG_SYMLINK(fonts,fonts,[marlett.ttf,symbol.ttf,tahoma.ttf,tahomabd.ttf,wingding.ttf],enable_fonts) +WINE_CONFIG_SYMLINK(fonts,fonts,[marlett.ttf,symbol.ttf,tahoma.ttf,tahomabd.ttf,wingding.ttf],["x$enable_fonts" != xno]) WINE_CONFIG_SYMLINK(loader,loader,[l_intl.nls]) WINE_CONFIG_SYMLINK(,tools,[wine],,winewrapper) -WINE_CONFIG_SYMLINK(,tools,[wine64],enable_win64,winewrapper) +WINE_CONFIG_SYMLINK(,tools,[wine64],["x$enable_win64" != xno -o -n "$with_wine64"],winewrapper) WINE_CONFIG_MAKEFILE(dlls/acledit) WINE_CONFIG_MAKEFILE(dlls/aclui)

1 0

Zebediah Figura : ntoskrnl.exe: Implement KeSetEvent().
by Alexandre Julliard Nov. 26, 2018

Nov. 26, 2018

Module: wine Branch: master Commit: 469c2fd4d73ae84c716a61630efb79e377236a04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=469c2fd4d73ae84c716a6163… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 24 22:34:40 2018 -0600 ntoskrnl.exe: Implement KeSetEvent(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 ---------- dlls/ntoskrnl.exe/sync.c | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index eb984bd..189f303 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2440,16 +2440,6 @@ LONG WINAPI KeResetEvent( PRKEVENT Event ) /*********************************************************************** - * KeSetEvent (NTOSKRNL.EXE.@) - */ -LONG WINAPI KeSetEvent( PRKEVENT Event, KPRIORITY Increment, BOOLEAN Wait ) -{ - FIXME("(%p, %d, %d): stub\n", Event, Increment, Wait); - return 0; -} - - -/*********************************************************************** * KeSetPriorityThread (NTOSKRNL.EXE.@) */ KPRIORITY WINAPI KeSetPriorityThread( PKTHREAD Thread, KPRIORITY Priority ) diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index e7ff7ec..6bea027 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -125,3 +125,22 @@ void WINAPI KeInitializeEvent( PRKEVENT event, EVENT_TYPE type, BOOLEAN state ) event->Header.WaitListHead.Blink = NULL; event->Header.WaitListHead.Flink = NULL; } + +/*********************************************************************** + * KeSetEvent (NTOSKRNL.EXE.@) + */ +LONG WINAPI KeSetEvent( PRKEVENT event, KPRIORITY increment, BOOLEAN wait ) +{ + HANDLE handle = event->Header.WaitListHead.Blink; + LONG ret; + + TRACE("event %p, increment %d, wait %u.\n", event, increment, wait); + + EnterCriticalSection( &sync_cs ); + ret = InterlockedExchange( &event->Header.SignalState, TRUE ); + if (handle) + SetEvent( handle ); + LeaveCriticalSection( &sync_cs ); + + return ret; +}

1 0

Dmitry Timoshkov : user32: Don't force a combobox repaint on WM_SIZE.
by Alexandre Julliard Nov. 26, 2018

Nov. 26, 2018

Module: wine Branch: master Commit: 2d9e3236ea8ae752184b8a285f9d616ec94afb8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d9e3236ea8ae752184b8a28… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sun Nov 25 20:57:53 2018 +0300 user32: Don't force a combobox repaint on WM_SIZE. This breaks z-order based painting and causes side effects for applications that during the WM_PAINT processing reference internal data associated with a not fully initialized window. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/combo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 31ec6af..59c2e64 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -1536,7 +1536,7 @@ static void COMBO_Size( LPHEADCOMBO lphc ) &lphc->buttonRect, &lphc->droppedRect); - CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, TRUE ); + CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, FALSE ); }

1 0

Nikolay Sivov : shcore: Add CommandLineToArgvW().
by Alexandre Julliard Nov. 26, 2018

Nov. 26, 2018

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 Nov. 26, 2018

Nov. 26, 2018

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

Hans Leidekker : winhttp: Use the thread pool for COM object requests.
by Alexandre Julliard Nov. 26, 2018

Nov. 26, 2018

Module: wine Branch: master Commit: c81fa0175186bce7f15941bead9dbd2d746818b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c81fa0175186bce7f15941be… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 26 12:08:56 2018 +0100 winhttp: Use the thread pool for COM object requests. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 52 ++++++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index f78cb2e..a081b60 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3067,9 +3067,10 @@ struct winhttp_request HINTERNET hrequest; VARIANT data; WCHAR *verb; - HANDLE thread; + HANDLE done; HANDLE wait; HANDLE cancel; + BOOL proc_running; char *buffer; DWORD offset; DWORD bytes_available; @@ -3103,15 +3104,16 @@ static void cancel_request( struct winhttp_request *request ) { if (request->state <= REQUEST_STATE_CANCELLED) return; - SetEvent( request->cancel ); - LeaveCriticalSection( &request->cs ); - WaitForSingleObject( request->thread, INFINITE ); - EnterCriticalSection( &request->cs ); + if (request->proc_running) + { + SetEvent( request->cancel ); + LeaveCriticalSection( &request->cs ); - request->state = REQUEST_STATE_CANCELLED; + WaitForSingleObject( request->done, INFINITE ); - CloseHandle( request->thread ); - request->thread = NULL; + EnterCriticalSection( &request->cs ); + } + request->state = REQUEST_STATE_CANCELLED; } /* critical section must be held */ @@ -3121,7 +3123,7 @@ static void free_request( struct winhttp_request *request ) WinHttpCloseHandle( request->hrequest ); WinHttpCloseHandle( request->hconnect ); WinHttpCloseHandle( request->hsession ); - CloseHandle( request->thread ); + CloseHandle( request->done ); CloseHandle( request->wait ); CloseHandle( request->cancel ); heap_free( request->proxy.lpszProxy ); @@ -3450,6 +3452,7 @@ static void initialize_request( struct winhttp_request *request ) { request->wait = CreateEventW( NULL, FALSE, FALSE, NULL ); request->cancel = CreateEventW( NULL, FALSE, FALSE, NULL ); + request->done = CreateEventW( NULL, FALSE, FALSE, NULL ); request->connect_timeout = 60000; request->send_timeout = 30000; request->receive_timeout = 30000; @@ -3747,19 +3750,22 @@ static void wait_set_status_callback( struct winhttp_request *request, DWORD sta static DWORD wait_for_completion( struct winhttp_request *request ) { HANDLE handles[2] = { request->wait, request->cancel }; + DWORD ret; switch (WaitForMultipleObjects( 2, handles, FALSE, INFINITE )) { case WAIT_OBJECT_0: + ret = request->error; break; case WAIT_OBJECT_0 + 1: - request->error = ERROR_CANCELLED; + ret = request->error = ERROR_CANCELLED; + SetEvent( request->done ); break; default: - request->error = GetLastError(); + ret = request->error = GetLastError(); break; } - return request->error; + return ret; } static HRESULT request_receive( struct winhttp_request *request ) @@ -3917,27 +3923,21 @@ error: return HRESULT_FROM_WIN32( err ); } -static HRESULT request_send_and_receive( struct winhttp_request *request ) -{ - HRESULT hr = request_send( request ); - if (hr == S_OK) hr = request_receive( request ); - return hr; -} - -static DWORD CALLBACK send_and_receive_proc( void *arg ) +static void CALLBACK send_and_receive_proc( TP_CALLBACK_INSTANCE *instance, void *ctx ) { - struct winhttp_request *request = (struct winhttp_request *)arg; - return request_send_and_receive( request ); + struct winhttp_request *request = (struct winhttp_request *)ctx; + if (request_send( request ) == S_OK) request_receive( request ); + SetEvent( request->done ); } /* critical section must be held */ static DWORD request_wait( struct winhttp_request *request, DWORD timeout ) { - HANDLE thread = request->thread; + HANDLE done = request->done; DWORD err, ret; LeaveCriticalSection( &request->cs ); - while ((err = MsgWaitForMultipleObjects( 1, &thread, FALSE, timeout, QS_ALLINPUT )) == WAIT_OBJECT_0 + 1) + while ((err = MsgWaitForMultipleObjects( 1, &done, FALSE, timeout, QS_ALLINPUT )) == WAIT_OBJECT_0 + 1) { MSG msg; while (PeekMessageW( &msg, NULL, 0, 0, PM_REMOVE )) @@ -3960,6 +3960,7 @@ static DWORD request_wait( struct winhttp_request *request, DWORD timeout ) break; } EnterCriticalSection( &request->cs ); + if (!ret) request->proc_running = FALSE; return ret; } @@ -3989,11 +3990,12 @@ static HRESULT WINAPI winhttp_request_Send( LeaveCriticalSection( &request->cs ); return hr; } - if (!(request->thread = CreateThread( NULL, 0, send_and_receive_proc, request, 0, NULL ))) + if (!TrySubmitThreadpoolCallback( send_and_receive_proc, request, NULL )) { LeaveCriticalSection( &request->cs ); return HRESULT_FROM_WIN32( GetLastError() ); } + request->proc_running = TRUE; if (!request->async) { hr = HRESULT_FROM_WIN32( request_wait( request, INFINITE ) );

1 0

Hans Leidekker : winhttp: Store Accept headers like the other headers.
by Alexandre Julliard Nov. 26, 2018

Nov. 26, 2018

Module: wine Branch: master Commit: 2f752970360977597cdd450d7793b7d0e2a53b51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f752970360977597cdd450d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 26 12:08:57 2018 +0100 winhttp: Store Accept headers like the other headers. Based on a patch by Sebastian Lackner. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 10 ++-------- dlls/winhttp/session.c | 31 +++++-------------------------- dlls/winhttp/winhttp_private.h | 5 ++--- 3 files changed, 9 insertions(+), 37 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index a081b60..5525c1c 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -398,8 +398,7 @@ static BOOL delete_header( struct request *request, DWORD index ) return TRUE; } -static BOOL process_header( struct request *request, const WCHAR *field, const WCHAR *value, DWORD flags, - BOOL request_only ) +BOOL process_header( struct request *request, const WCHAR *field, const WCHAR *value, DWORD flags, BOOL request_only ) { int index; struct header hdr; @@ -2180,16 +2179,11 @@ static BOOL send_request( struct request *request, const WCHAR *headers, DWORD h struct session *session = connect->session; char *wire_req; int bytes_sent; - DWORD len, i, flags; + DWORD len; clear_response_headers( request ); drain_content( request ); - flags = WINHTTP_ADDREQ_FLAG_ADD|WINHTTP_ADDREQ_FLAG_COALESCE_WITH_COMMA; - for (i = 0; i < request->num_accept_types; i++) - { - process_header( request, attr_accept, request->accept_types[i], flags, TRUE ); - } if (session->agent) process_header( request, attr_user_agent, session->agent, WINHTTP_ADDREQ_FLAG_ADD_IF_NEW, TRUE ); diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index f8d98d0..39e8d82 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -626,8 +626,6 @@ static void request_destroy( struct object_header *hdr ) heap_free( request->headers[i].value ); } heap_free( request->headers ); - for (i = 0; i < request->num_accept_types; i++) heap_free( request->accept_types[i] ); - heap_free( request->accept_types ); for (i = 0; i < TARGET_MAX; i++) { for (j = 0; j < SCHEME_MAX; j++) @@ -1042,34 +1040,15 @@ static const struct object_vtbl request_vtbl = request_set_option }; -static BOOL store_accept_types( struct request *request, const WCHAR **accept_types ) +static BOOL add_accept_types_header( struct request *request, const WCHAR **types ) { - const WCHAR **types = accept_types; - DWORD i; + static const WCHAR acceptW[] = {'A','c','c','e','p','t',0}; + static const DWORD flags = WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_COALESCE_WITH_COMMA; if (!types) return TRUE; while (*types) { - request->num_accept_types++; - types++; - } - if (!request->num_accept_types) return TRUE; - if (!(request->accept_types = heap_alloc( request->num_accept_types * sizeof(WCHAR *)))) - { - request->num_accept_types = 0; - return FALSE; - } - types = accept_types; - for (i = 0; i < request->num_accept_types; i++) - { - if (!(request->accept_types[i] = strdupW( *types ))) - { - for ( ; i > 0; --i) heap_free( request->accept_types[i - 1] ); - heap_free( request->accept_types ); - request->accept_types = NULL; - request->num_accept_types = 0; - return FALSE; - } + if (!process_header( request, acceptW, *types, flags, TRUE )) return FALSE; types++; } return TRUE; @@ -1151,7 +1130,7 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o if (!version || !version[0]) version = http1_1; if (!(request->version = strdupW( version ))) goto end; - if (!(store_accept_types( request, types ))) goto end; + if (!(add_accept_types_header( request, types ))) goto end; if (!(hrequest = alloc_handle( &request->hdr ))) goto end; request->hdr.handle = hrequest; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 14cee44..b46f708 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -198,8 +198,6 @@ struct request char read_buf[8192]; /* buffer for already read but not returned data */ struct header *headers; DWORD num_headers; - WCHAR **accept_types; - DWORD num_accept_types; struct authinfo *authinfo; struct authinfo *proxy_authinfo; HANDLE task_wait; @@ -288,7 +286,8 @@ void destroy_cookies( struct session * ) DECLSPEC_HIDDEN; BOOL set_server_for_hostname( struct connect *, const WCHAR *, INTERNET_PORT ) DECLSPEC_HIDDEN; void destroy_authinfo( struct authinfo * ) DECLSPEC_HIDDEN; -void release_host( struct hostdata *host ) DECLSPEC_HIDDEN; +void release_host( struct hostdata * ) DECLSPEC_HIDDEN; +BOOL process_header( struct request *, const WCHAR *, const WCHAR *, DWORD, BOOL ) DECLSPEC_HIDDEN; extern HRESULT WinHttpRequest_create( void ** ) DECLSPEC_HIDDEN; void release_typelib( void ) DECLSPEC_HIDDEN;

1 0

Andreas Maier : dbghelp: Set correct values in symt_fill_sym_info ( SYMBOL_INFO).
by Alexandre Julliard Nov. 26, 2018

Nov. 26, 2018

Module: wine Branch: master Commit: 8d096fb5e262e5e87866d1a4a397da144a09b635 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d096fb5e262e5e87866d1a4… Author: Andreas Maier <staubim(a)quantentunnel.de> Date: Sun Nov 25 10:15:48 2018 +0100 dbghelp: Set correct values in symt_fill_sym_info (SYMBOL_INFO). Signed-off-by: Andreas Maier <staubim(a)quantentunnel.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp_private.h | 5 ++++- dlls/dbghelp/elf_module.c | 1 + dlls/dbghelp/msc.c | 5 ++++- dlls/dbghelp/pe_module.c | 11 ++++++----- dlls/dbghelp/symbol.c | 13 ++++++++++--- 5 files changed, 25 insertions(+), 10 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 7b872fe..ae8bc50 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -227,6 +227,7 @@ struct symt_public struct symt symt; struct hash_table_elt hash_elt; struct symt* container; /* compiland */ + BOOL is_function; unsigned long address; unsigned long size; }; @@ -716,7 +717,9 @@ extern struct symt_public* symt_new_public(struct module* module, struct symt_compiland* parent, const char* typename, - unsigned long address, unsigned size) DECLSPEC_HIDDEN; + BOOL is_function, + unsigned long address, + unsigned size) DECLSPEC_HIDDEN; extern struct symt_data* symt_new_global_variable(struct module* module, struct symt_compiland* parent, diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 6b8d47a..96b16fd 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -927,6 +927,7 @@ static int elf_new_public_symbols(struct module* module, const struct hash_table while ((ste = hash_table_iter_up(&hti))) { symt_new_public(module, ste->compiland, ste->ht_elt.name, + FALSE, module->reloc_delta + ste->sym.st_value, ste->sym.st_size); } diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index ae51884..adb66d6 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2072,6 +2072,7 @@ static BOOL codeview_snarf_public(const struct msc_debug_info* msc_dbg, const BY { symt_new_public(msc_dbg->module, compiland, terminate_string(&sym->public_v1.p_name), + sym->public_v1.symtype == SYMTYPE_FUNCTION, codeview_get_address(msc_dbg, sym->public_v1.segment, sym->public_v1.offset), 1); } break; @@ -2080,6 +2081,7 @@ static BOOL codeview_snarf_public(const struct msc_debug_info* msc_dbg, const BY { symt_new_public(msc_dbg->module, compiland, terminate_string(&sym->public_v2.p_name), + sym->public_v2.symtype == SYMTYPE_FUNCTION, codeview_get_address(msc_dbg, sym->public_v2.segment, sym->public_v2.offset), 1); } break; @@ -2089,6 +2091,7 @@ static BOOL codeview_snarf_public(const struct msc_debug_info* msc_dbg, const BY { symt_new_public(msc_dbg->module, compiland, sym->public_v3.name, + sym->public_v3.symtype == SYMTYPE_FUNCTION, codeview_get_address(msc_dbg, sym->public_v3.segment, sym->public_v3.offset), 1); } break; @@ -2885,7 +2888,7 @@ static BOOL pdb_process_file(const struct process* pcs, if (ret) { struct pdb_module_info* pdb_info = msc_dbg->module->format_info[DFI_PDB]->u.pdb_info; - msc_dbg->module->module.SymType = SymCv; + msc_dbg->module->module.SymType = SymPdb; if (pdb_info->pdb_files[0].kind == PDB_JG) msc_dbg->module->module.PdbSig = pdb_info->pdb_files[0].u.jg.timestamp; else diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 025cd60..c077c07 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -442,7 +442,7 @@ static BOOL pe_load_coff_symbol_table(struct module* module) source_new(module, NULL, lastfilename)); if (!(dbghelp_options & SYMOPT_NO_PUBLICS)) - symt_new_public(module, compiland, name, + symt_new_public(module, compiland, name, FALSE, module->module.BaseOfImage + sect[isym->SectionNumber - 1].VirtualAddress + isym->Value, 1); @@ -635,11 +635,11 @@ static BOOL pe_load_export_debug_info(const struct process* pcs, struct module* #if 0 /* Add start of DLL (better use the (yet unimplemented) Exe SymTag for this) */ /* FIXME: module.ModuleName isn't correctly set yet if it's passed in SymLoadModule */ - symt_new_public(module, NULL, module->module.ModuleName, base, 1); + symt_new_public(module, NULL, module->module.ModuleName, FALSE, base, 1); #endif /* Add entry point */ - symt_new_public(module, NULL, "EntryPoint", + symt_new_public(module, NULL, "EntryPoint", FALSE, base + nth->OptionalHeader.AddressOfEntryPoint, 1); #if 0 /* FIXME: we'd better store addresses linked to sections rather than @@ -650,7 +650,7 @@ static BOOL pe_load_export_debug_info(const struct process* pcs, struct module* ((char*)&nth->OptionalHeader + nth->FileHeader.SizeOfOptionalHeader); for (i = 0; i < nth->FileHeader.NumberOfSections; i++, section++) { - symt_new_public(module, NULL, section->Name, + symt_new_public(module, NULL, section->Name, FALSE, RtlImageRvaToVa(nth, mapping, section->VirtualAddress, NULL), 1); } #endif @@ -676,6 +676,7 @@ static BOOL pe_load_export_debug_info(const struct process* pcs, struct module* if (!names[i]) continue; symt_new_public(module, NULL, RtlImageRvaToVa(nth, mapping, names[i], NULL), + FALSE, base + functions[ordinals[i]], 1); } @@ -687,7 +688,7 @@ static BOOL pe_load_export_debug_info(const struct process* pcs, struct module* if ((ordinals[j] == i) && names[j]) break; if (j < exports->NumberOfNames) continue; snprintf(buffer, sizeof(buffer), "%d", i + exports->Base); - symt_new_public(module, NULL, buffer, base + (DWORD)functions[i], 1); + symt_new_public(module, NULL, buffer, FALSE, base + (DWORD)functions[i], 1); } } } diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index de871ec..05aea05 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -202,6 +202,7 @@ struct symt_compiland* symt_new_compiland(struct module* module, struct symt_public* symt_new_public(struct module* module, struct symt_compiland* compiland, const char* name, + BOOL is_function, unsigned long address, unsigned size) { struct symt_public* sym; @@ -217,6 +218,7 @@ struct symt_public* symt_new_public(struct module* module, sym->symt.tag = SymTagPublicSymbol; sym->hash_elt.name = pool_strdup(&module->pool, name); sym->container = compiland ? &compiland->symt : NULL; + sym->is_function = is_function; sym->address = address; sym->size = size; symt_add_module_ht(module, (struct symt_ht*)sym); @@ -673,11 +675,16 @@ static void symt_fill_sym_info(struct module_pair* pair, } break; case SymTagPublicSymbol: - sym_info->Flags |= SYMFLAG_EXPORT; - symt_get_address(sym, &sym_info->Address); + { + const struct symt_public* pub = (const struct symt_public*)sym; + if (pub->is_function) + sym_info->Flags |= SYMFLAG_PUBLIC_CODE; + else + sym_info->Flags |= SYMFLAG_EXPORT; + symt_get_address(sym, &sym_info->Address); + } break; case SymTagFunction: - sym_info->Flags |= SYMFLAG_FUNCTION; symt_get_address(sym, &sym_info->Address); break; case SymTagThunk:

1 0

Andreas Maier : dbghelp: Set last error for SymGetModuleBase-calls to ERROR_MOD_NOT_FOUND.
by Alexandre Julliard Nov. 26, 2018

Nov. 26, 2018

Module: wine Branch: master Commit: 6c3418914df3196bf5a464649ef302a5e942dd90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c3418914df3196bf5a46464… Author: Andreas Maier <staubim(a)quantentunnel.de> Date: Sun Nov 25 10:15:49 2018 +0100 dbghelp: Set last error for SymGetModuleBase-calls to ERROR_MOD_NOT_FOUND. Signed-off-by: Andreas Maier <staubim(a)quantentunnel.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 98fc10c..cfbb586 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -436,7 +436,7 @@ struct module* module_find_by_addr(const struct process* pcs, DWORD64 addr, return module; } } - SetLastError(ERROR_INVALID_ADDRESS); + SetLastError(ERROR_MOD_NOT_FOUND); return module; }

1 0