November 2018 - Wine-commits

Hans Leidekker : winhttp: Make sure the COM request object is properly initialized.
by Alexandre Julliard 26 Nov '18

26 Nov '18

Module: wine Branch: master Commit: 911316e7c8819c486704b75c71562db600e3168e URL: https://source.winehq.org/git/wine.git/?a=commit;h=911316e7c8819c486704b75c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 26 12:08:55 2018 +0100 winhttp: Make sure the COM request object is properly initialized. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 47 ++++++++++++++--------------------------------- 1 file changed, 14 insertions(+), 33 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index edfebac..f78cb2e 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3049,7 +3049,6 @@ BOOL WINAPI WinHttpWriteData( HINTERNET hrequest, LPCVOID buffer, DWORD to_write enum request_state { - REQUEST_STATE_UNINITIALIZED, REQUEST_STATE_INITIALIZED, REQUEST_STATE_CANCELLED, REQUEST_STATE_OPEN, @@ -3113,10 +3112,6 @@ static void cancel_request( struct winhttp_request *request ) CloseHandle( request->thread ); request->thread = NULL; - CloseHandle( request->wait ); - request->wait = NULL; - CloseHandle( request->cancel ); - request->cancel = NULL; } /* critical section must be held */ @@ -3453,25 +3448,8 @@ done: static void initialize_request( struct winhttp_request *request ) { - request->hrequest = NULL; - request->hconnect = NULL; - request->hsession = NULL; - request->thread = NULL; - request->wait = NULL; - request->cancel = NULL; - request->buffer = NULL; - request->verb = NULL; - request->offset = 0; - request->bytes_available = 0; - request->bytes_read = 0; - request->error = ERROR_SUCCESS; - request->async = FALSE; - request->logon_policy = WINHTTP_AUTOLOGON_SECURITY_LEVEL_MEDIUM; - request->disable_feature = 0; - request->proxy.dwAccessType = WINHTTP_ACCESS_TYPE_DEFAULT_PROXY; - request->proxy.lpszProxy = NULL; - request->proxy.lpszProxyBypass = NULL; - request->resolve_timeout = 0; + request->wait = CreateEventW( NULL, FALSE, FALSE, NULL ); + request->cancel = CreateEventW( NULL, FALSE, FALSE, NULL ); request->connect_timeout = 60000; request->send_timeout = 30000; request->receive_timeout = 30000; @@ -3495,8 +3473,17 @@ static void reset_request( struct winhttp_request *request ) request->bytes_available = 0; request->bytes_read = 0; request->error = ERROR_SUCCESS; + request->logon_policy = 0; + request->disable_feature = 0; request->async = FALSE; + request->connect_timeout = 60000; + request->send_timeout = 30000; + request->receive_timeout = 30000; request->url_codepage = CP_UTF8; + heap_free( request->proxy.lpszProxy ); + request->proxy.lpszProxy = NULL; + heap_free( request->proxy.lpszProxyBypass ); + request->proxy.lpszProxyBypass = NULL; VariantClear( &request->data ); request->state = REQUEST_STATE_INITIALIZED; } @@ -3533,8 +3520,7 @@ static HRESULT WINAPI winhttp_request_Open( if (!WinHttpCrackUrl( url, 0, 0, &uc )) return HRESULT_FROM_WIN32( GetLastError() ); EnterCriticalSection( &request->cs ); - if (request->state < REQUEST_STATE_INITIALIZED) initialize_request( request ); - else reset_request( request ); + reset_request( request ); if (!(hostname = heap_alloc( (uc.dwHostNameLength + 1) * sizeof(WCHAR) ))) goto error; memcpy( hostname, uc.lpszHostName, uc.dwHostNameLength * sizeof(WCHAR) ); @@ -4008,8 +3994,6 @@ static HRESULT WINAPI winhttp_request_Send( LeaveCriticalSection( &request->cs ); return HRESULT_FROM_WIN32( GetLastError() ); } - request->wait = CreateEventW( NULL, FALSE, FALSE, NULL ); - request->cancel = CreateEventW( NULL, FALSE, FALSE, NULL ); if (!request->async) { hr = HRESULT_FROM_WIN32( request_wait( request, INFINITE ) ); @@ -4613,15 +4597,12 @@ HRESULT WinHttpRequest_create( void **obj ) TRACE("%p\n", obj); - if (!(request = heap_alloc( sizeof(*request) ))) return E_OUTOFMEMORY; + if (!(request = heap_alloc_zero( sizeof(*request) ))) return E_OUTOFMEMORY; request->IWinHttpRequest_iface.lpVtbl = &winhttp_request_vtbl; request->refs = 1; - request->state = REQUEST_STATE_UNINITIALIZED; - request->proxy.lpszProxy = NULL; - request->proxy.lpszProxyBypass = NULL; - request->url_codepage = CP_UTF8; InitializeCriticalSection( &request->cs ); request->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": winhttp_request.cs"); + initialize_request( request ); *obj = &request->IWinHttpRequest_iface; TRACE("returning iface %p\n", *obj);

1 0

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

26 Nov '18

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 26 Nov '18

26 Nov '18

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

Józef Kucia : winevulkan: Update vk.xml to 1.1.94.
by Alexandre Julliard 26 Nov '18

26 Nov '18

Module: wine Branch: master Commit: eb39d3dbcac7a8d9c17211ab358cda4b7e07708a URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb39d3dbcac7a8d9c17211ab… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 26 12:13:45 2018 +0100 winevulkan: Update vk.xml to 1.1.94. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 3 +- dlls/winevulkan/vulkan_thunks.c | 335 ++++++ dlls/winevulkan/vulkan_thunks.h | 148 ++- include/wine/vulkan.h | 2210 ++++++++++++++++++++++----------------- 4 files changed, 1748 insertions(+), 948 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eb39d3dbcac7a8d9c172…

1 0

Andreas Maier : dbghelp: Use correct record in codeview_snarf_public.
by Alexandre Julliard 26 Nov '18

26 Nov '18

Module: wine Branch: master Commit: dbcf9728fa13ade68cc9d380002a5f6ae50fc0c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbcf9728fa13ade68cc9d380… Author: Andreas Maier <staubim(a)quantentunnel.de> Date: Sun Nov 25 10:15:46 2018 +0100 dbghelp: Use correct record in codeview_snarf_public. Use public_vx iststead of data_vx for public symbols. Signed-off-by: Andreas Maier <staubim(a)quantentunnel.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/msc.c | 18 +++++++++--------- include/wine/mscvpdb.h | 10 ++++++++++ 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 493c440..ae51884 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2067,29 +2067,29 @@ static BOOL codeview_snarf_public(const struct msc_debug_info* msc_dbg, const BY switch (sym->generic.id) { - case S_PUB_V1: /* FIXME is this really a 'data_v1' structure ?? */ + case S_PUB_V1: if (!(dbghelp_options & SYMOPT_NO_PUBLICS)) { symt_new_public(msc_dbg->module, compiland, - terminate_string(&sym->data_v1.p_name), - codeview_get_address(msc_dbg, sym->data_v1.segment, sym->data_v1.offset), 1); + terminate_string(&sym->public_v1.p_name), + codeview_get_address(msc_dbg, sym->public_v1.segment, sym->public_v1.offset), 1); } break; - case S_PUB_V2: /* FIXME is this really a 'data_v2' structure ?? */ + case S_PUB_V2: if (!(dbghelp_options & SYMOPT_NO_PUBLICS)) { symt_new_public(msc_dbg->module, compiland, - terminate_string(&sym->data_v2.p_name), - codeview_get_address(msc_dbg, sym->data_v2.segment, sym->data_v2.offset), 1); + terminate_string(&sym->public_v2.p_name), + codeview_get_address(msc_dbg, sym->public_v2.segment, sym->public_v2.offset), 1); } - break; + break; case S_PUB_V3: if (!(dbghelp_options & SYMOPT_NO_PUBLICS)) { symt_new_public(msc_dbg->module, compiland, - sym->data_v3.name, - codeview_get_address(msc_dbg, sym->data_v3.segment, sym->data_v3.offset), 1); + sym->public_v3.name, + codeview_get_address(msc_dbg, sym->public_v3.segment, sym->public_v3.offset), 1); } break; case S_PUB_FUNC1_V3: diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 2f0b479..7a4a69b 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -1352,6 +1352,16 @@ union codeview_symbol { short int len; short int id; + unsigned int offset; + unsigned short segment; + unsigned short symtype; + struct p_string p_name; + } public_v1; + + struct + { + short int len; + short int id; unsigned int symtype; unsigned int offset; unsigned short segment;

1 0

Andreas Maier : dbghelp: Add SYMFLAG_- and SYMTYPE_-defines.
by Alexandre Julliard 26 Nov '18

26 Nov '18

Module: wine Branch: master Commit: 3b01149d8677fa86addfb67414d793684779c5ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b01149d8677fa86addfb674… Author: Andreas Maier <staubim(a)quantentunnel.de> Date: Sun Nov 25 10:15:47 2018 +0100 dbghelp: Add SYMFLAG_- and SYMTYPE_-defines. Signed-off-by: Andreas Maier <staubim(a)quantentunnel.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dbghelp.h | 7 +++++++ include/wine/mscvpdb.h | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/include/dbghelp.h b/include/dbghelp.h index e6015ff..6e8d375 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -951,6 +951,13 @@ BOOL WINAPI SymUnloadModule64(HANDLE, DWORD64); #define SYMFLAG_THUNK 0x00002000 #define SYMFLAG_TLSREL 0x00004000 #define SYMFLAG_SLOT 0x00008000 +#define SYMFLAG_ILREL 0x00010000 +#define SYMFLAG_METADATA 0x00020000 +#define SYMFLAG_CLR_TOKEN 0x00040000 +#define SYMFLAG_NULL 0x00080000 +#define SYMFLAG_FUNC_NO_RETURN 0x00100000 +#define SYMFLAG_SYNTHETIC_ZEROBASE 0x00200000 +#define SYMFLAG_PUBLIC_CODE 0x00400000 #define MAX_SYM_NAME 2000 diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 7a4a69b..a44331b 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -1227,6 +1227,13 @@ union codeview_fieldtype #define LF_COMPLEX128 0x800f #define LF_VARSTRING 0x8010 +/* symtype e.g. for public_vx.symtype */ +#define SYMTYPE_NONE 0x0000 +#define SYMTYPE_CODE 0x0001 +#define SYMTYPE_FUNCTION 0x0002 +#define SYMTYPE_MANAGED 0x0004 +#define SYMTYPE_MSIL 0x0008 + /* ======================================== * * Symbol information * ======================================== */

1 0

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

26 Nov '18

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 26 Nov '18

26 Nov '18

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

Andreas Maier : dbghelp: SymFromAddr: Handle 2 or more symbols at the same address correct.
by Alexandre Julliard 26 Nov '18

26 Nov '18

Module: wine Branch: master Commit: d614ac46718311f49541b32ac726c17a06077ae1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d614ac46718311f49541b32a… Author: Andreas Maier <staubim(a)quantentunnel.de> Date: Sun Nov 25 10:15:50 2018 +0100 dbghelp: SymFromAddr: Handle 2 or more symbols at the same address correct. Signed-off-by: Andreas Maier <staubim(a)quantentunnel.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/symbol.c | 54 +++++++++++++++++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 19 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 05aea05..c9585c5 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -850,6 +850,33 @@ static void symt_get_length(struct module* module, const struct symt* symt, ULON *size = 0x1000; /* arbitrary value */ } +/* neede by symt_find_nearest */ +int symt_get_best_at(struct module* module, int idx_sorttab) +{ + ULONG64 ref_addr; + int idx_sorttab_orig = idx_sorttab; + if (module->addr_sorttab[idx_sorttab]->symt.tag == SymTagPublicSymbol) + { + symt_get_address(&module->addr_sorttab[idx_sorttab]->symt, &ref_addr); + while (idx_sorttab > 0 && + module->addr_sorttab[idx_sorttab]->symt.tag == SymTagPublicSymbol && + !cmp_sorttab_addr(module, idx_sorttab - 1, ref_addr)) + idx_sorttab--; + if (module->addr_sorttab[idx_sorttab]->symt.tag == SymTagPublicSymbol) + { + idx_sorttab = idx_sorttab_orig; + while (idx_sorttab < module->num_sorttab - 1 && + module->addr_sorttab[idx_sorttab]->symt.tag == SymTagPublicSymbol && + !cmp_sorttab_addr(module, idx_sorttab + 1, ref_addr)) + idx_sorttab++; + } + /* if no better symbol fond restore original */ + if (module->addr_sorttab[idx_sorttab]->symt.tag == SymTagPublicSymbol) + idx_sorttab = idx_sorttab_orig; + } + return idx_sorttab; +} + /* assume addr is in module */ struct symt_ht* symt_find_nearest(struct module* module, DWORD_PTR addr) { @@ -868,7 +895,12 @@ struct symt_ht* symt_find_nearest(struct module* module, DWORD_PTR addr) high = module->num_sorttab; symt_get_address(&module->addr_sorttab[0]->symt, &ref_addr); - if (addr < ref_addr) return NULL; + if (addr <= ref_addr) + { + low = symt_get_best_at(module, 0); + return module->addr_sorttab[low]; + } + if (high) { symt_get_address(&module->addr_sorttab[high - 1]->symt, &ref_addr); @@ -891,23 +923,7 @@ struct symt_ht* symt_find_nearest(struct module* module, DWORD_PTR addr) /* If found symbol is a public symbol, check if there are any other entries that * might also have the same address, but would get better information */ - if (module->addr_sorttab[low]->symt.tag == SymTagPublicSymbol) - { - symt_get_address(&module->addr_sorttab[low]->symt, &ref_addr); - if (low > 0 && - module->addr_sorttab[low - 1]->symt.tag != SymTagPublicSymbol && - !cmp_sorttab_addr(module, low - 1, ref_addr)) - low--; - else if (low < module->num_sorttab - 1 && - module->addr_sorttab[low + 1]->symt.tag != SymTagPublicSymbol && - !cmp_sorttab_addr(module, low + 1, ref_addr)) - low++; - } - /* finally check that we fit into the found symbol */ - symt_get_address(&module->addr_sorttab[low]->symt, &ref_addr); - if (addr < ref_addr) return NULL; - symt_get_length(module, &module->addr_sorttab[low]->symt, &ref_size); - if (addr >= ref_addr + ref_size) return NULL; + low = symt_get_best_at(module, low); return module->addr_sorttab[low]; } @@ -1236,7 +1252,7 @@ BOOL WINAPI SymFromAddr(HANDLE hProcess, DWORD64 Address, symt_fill_sym_info(&pair, NULL, &sym->symt, Symbol); if (Displacement) - *Displacement = Address - Symbol->Address; + *Displacement = (Address >= Symbol->Address) ? (Address - Symbol->Address) : (DWORD64)-1; return TRUE; }

1 0

Zebediah Figura : setupapi/tests: Remove workarounds in testSetupDiGetINFClassA().
by Alexandre Julliard 26 Nov '18

26 Nov '18

Module: wine Branch: master Commit: 3fef0ace1661f609f41fa38d7af09030208b0884 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fef0ace1661f609f41fa38d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Nov 25 23:20:22 2018 -0600 setupapi/tests: Remove workarounds in testSetupDiGetINFClassA(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/devinst.c | 55 ++++++++++--------------------------------- 1 file changed, 12 insertions(+), 43 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index c58e35f..b24480c 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -37,7 +37,6 @@ static HDEVINFO (WINAPI *pSetupDiCreateDeviceInfoListExW)(GUID*,HWND,PCWSTR,PVOID); static BOOL (WINAPI *pSetupDiCallClassInstaller)(DI_FUNCTION, HDEVINFO, PSP_DEVINFO_DATA); static BOOL (WINAPI *pSetupDiDestroyDeviceInfoList)(HDEVINFO); -static BOOL (WINAPI *pSetupDiGetINFClassA)(PCSTR, LPGUID, PSTR, DWORD, PDWORD); static HKEY (WINAPI *pSetupDiOpenClassRegKeyExA)(GUID*,REGSAM,DWORD,PCSTR,PVOID); /* This is a unique guid for testing purposes */ @@ -52,7 +51,6 @@ static void init_function_pointers(void) pSetupDiDestroyDeviceInfoList = (void *)GetProcAddress(hSetupAPI, "SetupDiDestroyDeviceInfoList"); pSetupDiCallClassInstaller = (void *)GetProcAddress(hSetupAPI, "SetupDiCallClassInstaller"); pSetupDiOpenClassRegKeyExA = (void *)GetProcAddress(hSetupAPI, "SetupDiOpenClassRegKeyExA"); - pSetupDiGetINFClassA = (void *)GetProcAddress(hSetupAPI, "SetupDiGetINFClassA"); } static LSTATUS devinst_RegDeleteTreeW(HKEY hKey, LPCWSTR lpszSubKey) @@ -1157,7 +1155,7 @@ todo_wine } } -static void testSetupDiGetINFClassA(void) +static void test_get_inf_class(void) { static const char inffile[] = "winetest.inf"; static const char content[] = "[Version]\r\n\r\n"; @@ -1171,19 +1169,7 @@ static void testSetupDiGetINFClassA(void) HANDLE h; int i; - if(!pSetupDiGetINFClassA) - { - win_skip("SetupDiGetINFClassA not present\n"); - return; - } - - count = GetTempPathA(MAX_PATH, filename); - if(!count) - { - win_skip("GetTempPathA failed\n"); - return; - } - + GetTempPathA(MAX_PATH, filename); strcat(filename, inffile); DeleteFileA(filename); @@ -1191,11 +1177,6 @@ static void testSetupDiGetINFClassA(void) SetLastError(0xdeadbeef); retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - if (ERROR_CALL_NOT_IMPLEMENTED == GetLastError()) - { - skip("SetupDiGetINFClassA is not implemented\n"); - return; - } ok(ERROR_FILE_NOT_FOUND == GetLastError(), "expected error ERROR_FILE_NOT_FOUND, got %u\n", GetLastError()); @@ -1227,12 +1208,8 @@ static void testSetupDiGetINFClassA(void) /* test file content */ h = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - if(h == INVALID_HANDLE_VALUE) - { - win_skip("failed to create file %s (error %u)\n", filename, GetLastError()); - return; - } - CloseHandle( h); + ok(h != INVALID_HANDLE_VALUE, "Failed to create file, error %#x.\n", GetLastError()); + CloseHandle(h); retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); @@ -1242,13 +1219,9 @@ static void testSetupDiGetINFClassA(void) trace("testing signature %s\n", signatures[i]); h = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - if(h == INVALID_HANDLE_VALUE) - { - win_skip("failed to create file %s (error %u)\n", filename, GetLastError()); - return; - } - WriteFile( h, content, sizeof(content), &count, NULL); - CloseHandle( h); + ok(h != INVALID_HANDLE_VALUE, "Failed to create file, error %#x.\n", GetLastError()); + WriteFile(h, content, sizeof(content), &count, NULL); + CloseHandle(h); retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); @@ -1300,10 +1273,8 @@ static void testSetupDiGetINFClassA(void) SetLastError(0xdeadbeef); retval = SetupDiGetINFClassA(filename, &guid, cn, 0, &count); ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - ok(ERROR_INSUFFICIENT_BUFFER == GetLastError() || - ERROR_INVALID_PARAMETER == GetLastError(), - "expected error ERROR_INSUFFICIENT_BUFFER or ERROR_INVALID_PARAMETER, " - "got %u\n", GetLastError()); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER || GetLastError() == ERROR_INVALID_PARAMETER /* 2k3+ */, + "Got unexpected error %#x.\n", GetLastError()); DeleteFileA(filename); @@ -1313,10 +1284,8 @@ static void testSetupDiGetINFClassA(void) SetLastError(0xdeadbeef); retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - ok(RPC_S_INVALID_STRING_UUID == GetLastError() || - ERROR_INVALID_PARAMETER == GetLastError(), - "expected error RPC_S_INVALID_STRING_UUID or ERROR_INVALID_PARAMETER, " - "got %u\n", GetLastError()); + ok(GetLastError() == RPC_S_INVALID_STRING_UUID || GetLastError() == ERROR_INVALID_PARAMETER /* 7+ */, + "Got unexpected error %#x.\n", GetLastError()); /* network adapter guid */ WritePrivateProfileStringA("Version", "ClassGUID", @@ -1440,7 +1409,7 @@ START_TEST(devinst) test_register_device_iface(); test_registry_property_a(); test_registry_property_w(); - testSetupDiGetINFClassA(); + test_get_inf_class(); test_devnode(); test_device_interface_key(); }

1 0