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

Rémi Bernon : winedbg: Support qXfer:features:read request.
by Alexandre Julliard April 3, 2020

April 3, 2020

Module: wine Branch: master Commit: 99b7e2bb32caa407bc53fcf29f6c6900c639f857 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99b7e2bb32caa407bc53fcf2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 3 15:35:50 2020 +0200 winedbg: Support qXfer:features:read request. This reports the full register sets to gdb, telling it about custom offsets and sizes. It will make the gdb specific register length not required anymore. We also have to report architecture specific vector types and flags that are normally builtin in gdb as it does not load them anymore when custom register set is reported. This makes gdb stop using its incorrect heuristics and actually request the library list, it now correctly gets PE modules information and is able to correctly use debug info from mixed modules. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 168 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 131 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=99b7e2bb32caa407bc53…

1 0

Rémi Bernon : winedbg: Support qXfer:threads:read request.
by Alexandre Julliard April 3, 2020

April 3, 2020

Module: wine Branch: master Commit: c2a381fbed6e823344fc6e76a1d1d20509ffd3c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2a381fbed6e823344fc6e76… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 3 15:35:46 2020 +0200 winedbg: Support qXfer:threads:read request. As we don't report fork/vfork/exec events, this allows gdb to request the list of known threads. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 0c154d0b21..2bc6963992 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1522,6 +1522,24 @@ static void packet_query_libraries(struct gdb_context* gdbctx) packet_reply_add(gdbctx, "</library-list>"); } +static void packet_query_threads(struct gdb_context* gdbctx) +{ + struct dbg_process* process = gdbctx->process; + struct dbg_thread* thread; + + packet_reply_add(gdbctx, "<threads>"); + LIST_FOR_EACH_ENTRY(thread, &process->threads, struct dbg_thread, entry) + { + packet_reply_add(gdbctx, "<thread "); + packet_reply_add(gdbctx, "id=\""); + packet_reply_val(gdbctx, thread->tid, 4); + packet_reply_add(gdbctx, "\" name=\""); + packet_reply_add(gdbctx, thread->name); + packet_reply_add(gdbctx, "\"/>"); + } + packet_reply_add(gdbctx, "</threads>"); +} + static enum packet_return packet_query(struct gdb_context* gdbctx) { int off, len; @@ -1614,6 +1632,7 @@ static enum packet_return packet_query(struct gdb_context* gdbctx) packet_reply_open(gdbctx); packet_reply_add(gdbctx, "QStartNoAckMode+;"); packet_reply_add(gdbctx, "qXfer:libraries:read+;"); + packet_reply_add(gdbctx, "qXfer:threads:read+;"); if (*target_xml) packet_reply_add(gdbctx, "PacketSize=400;qXfer:features:read+"); packet_reply_close(gdbctx); return packet_done; @@ -1655,6 +1674,16 @@ static enum packet_return packet_query(struct gdb_context* gdbctx) return packet_done; } + if (sscanf(gdbctx->in_packet, "Xfer:threads:read::%x,%x", &off, &len) == 2) + { + if (!gdbctx->process) return packet_error; + + packet_reply_open_xfer(gdbctx); + packet_query_threads(gdbctx); + packet_reply_close_xfer(gdbctx, off, len); + return packet_done; + } + if (*target_xml && strncmp(gdbctx->in_packet, "Xfer:features:read:target.xml", 29) == 0) return packet_reply(gdbctx, target_xml); break;

1 0

Jacek Caban : dbghelp: Use mount manager to lookup dsym by uuid.
by Alexandre Julliard April 3, 2020

April 3, 2020

Module: wine Branch: master Commit: 88edff846714422c9f875fe6c9e509ee34072d27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88edff846714422c9f875fe6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 3 15:23:40 2020 +0200 dbghelp: Use mount manager to lookup dsym by uuid. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/macho_module.c | 88 ++++++++++++++++++++++----------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 6fad0e0be5..ff0072d5a9 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -24,15 +24,6 @@ #include "config.h" #include "wine/port.h" -#ifdef HAVE_MACH_O_LOADER_H -#include <CoreFoundation/CFString.h> -#define LoadResource mac_LoadResource -#define GetCurrentThread mac_GetCurrentThread -#include <CoreServices/CoreServices.h> -#undef LoadResource -#undef GetCurrentThread -#endif - #include <stdio.h> #include <assert.h> #include <stdarg.h> @@ -41,10 +32,15 @@ #include "ntstatus.h" #define WIN32_NO_STATUS #include "dbghelp_private.h" +#include "image_private.h" + #include "winternl.h" +#include "winioctl.h" +#define WINE_MOUNTMGR_EXTENSIONS +#include "ddk/mountmgr.h" + #include "wine/debug.h" #include "wine/heap.h" -#include "image_private.h" #ifdef HAVE_MACH_O_LOADER_H @@ -1241,42 +1237,46 @@ static BOOL try_dsym(struct process *pcs, const WCHAR* path, struct macho_file_m return FALSE; } -static const WCHAR dsym_subpath[] = {'/','C','o','n','t','e','n','t','s', - '/','R','e','s','o','u','r','c','e','s', - '/','D','W','A','R','F','/',0}; +static const WCHAR dsym_subpath[] = {'\\','C','o','n','t','e','n','t','s', + '\\','R','e','s','o','u','r','c','e','s', + '\\','D','W','A','R','F','\\',0}; -static WCHAR *query_dsym(const UINT8 *uuid, const WCHAR *filename) +static WCHAR *query_dsym(const GUID *uuid, const WCHAR *filename) { - char uuid_string[UUID_STRING_LEN]; - CFStringRef uuid_cfstring; - CFStringRef query_string; - MDQueryRef query = NULL; - WCHAR *path = NULL; - - format_uuid(uuid, uuid_string); - uuid_cfstring = CFStringCreateWithCString(NULL, uuid_string, kCFStringEncodingASCII); - query_string = CFStringCreateWithFormat(NULL, NULL, CFSTR("com_apple_xcode_dsym_uuids == \"%@\""), uuid_cfstring); - CFRelease(uuid_cfstring); - query = MDQueryCreate(NULL, query_string, NULL, NULL); - CFRelease(query_string); - MDQuerySetMaxCount(query, 1); - if (MDQueryExecute(query, kMDQuerySynchronous) && MDQueryGetResultCount(query) >= 1) + MOUNTMGR_TARGET_NAME *query; + WCHAR *ret = NULL; + char buf[1024]; + HANDLE mgr; + BOOL res; + + mgr = CreateFileW(MOUNTMGR_DOS_DEVICE_NAME, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, 0); + if (mgr == INVALID_HANDLE_VALUE) return NULL; + + query = (void *)buf; + res = DeviceIoControl( mgr, IOCTL_MOUNTMGR_QUERY_SYMBOL_FILE, (void*)uuid, sizeof(*uuid), query, sizeof(buf), NULL, NULL ); + if (!res && GetLastError() == ERROR_MORE_DATA) { - MDItemRef item = (MDItemRef)MDQueryGetResultAtIndex(query, 0); - CFStringRef item_path = MDItemCopyAttribute(item, kMDItemPath); - if (item_path) - { - CFIndex item_path_len = CFStringGetLength(item_path); - size_t len = item_path_len + strlenW(dsym_subpath) + strlenW(filename) + 1; - path = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - CFStringGetCharacters(item_path, CFRangeMake(0, item_path_len), (UniChar*)path); - strcpyW(path + item_path_len, dsym_subpath); - strcatW(path, filename); - CFRelease(item_path); - } + size_t size = FIELD_OFFSET(MOUNTMGR_TARGET_NAME, DeviceName[query->DeviceNameLength]); + query = HeapAlloc(GetProcessHeap(), 0, size); + if (query) + res = DeviceIoControl( mgr, IOCTL_MOUNTMGR_QUERY_SYMBOL_FILE, (void*)uuid, sizeof(*uuid), query, size, NULL, NULL ); } - CFRelease(query); - return path; + CloseHandle(mgr); + + if (res && (ret = HeapAlloc(GetProcessHeap(), 0, + query->DeviceNameLength + sizeof(dsym_subpath) + lstrlenW(filename) * sizeof(WCHAR)))) + { + WCHAR *p = ret; + memcpy(p, query->DeviceName, query->DeviceNameLength); + p += query->DeviceNameLength / sizeof(WCHAR); + memcpy(p, dsym_subpath, sizeof(dsym_subpath)); + p += ARRAY_SIZE(dsym_subpath) - 1; + strcpyW(p, filename); + } + + if (query != (void *)buf) HeapFree(GetProcessHeap(), 0, query); + return ret; } /****************************************************************** @@ -1323,7 +1323,7 @@ static void find_and_map_dsym(struct process *pcs, struct module* module) goto found; HeapFree(GetProcessHeap(), 0, path); - if ((path = query_dsym(fmap->uuid->uuid, p))) try_dsym(pcs, path, fmap); + if ((path = query_dsym((const GUID *)fmap->uuid->uuid, p))) try_dsym(pcs, path, fmap); found: HeapFree(GetProcessHeap(), 0, path); @@ -1843,7 +1843,7 @@ static BOOL macho_search_loader(struct process* pcs, struct macho_info* macho_in union wine_all_image_infos image_infos; union wine_image_info image_info; unsigned int len; - char path[PATH_MAX]; + char path[1024]; BOOL got_path = FALSE; if (pcs->is_64bit)

1 0

Jacek Caban : dbghelp: Factor out query_dsym.
by Alexandre Julliard April 3, 2020

April 3, 2020

Module: wine Branch: master Commit: c3c2cda9d2792f8c9c612b5bd6e9fd4d08cbb073 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3c2cda9d2792f8c9c612b5b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 3 15:23:36 2020 +0200 dbghelp: Factor out query_dsym. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/macho_module.c | 75 ++++++++++++++++++++++++--------------------- 1 file changed, 40 insertions(+), 35 deletions(-) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 413a25c663..6fad0e0be5 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -1241,6 +1241,44 @@ static BOOL try_dsym(struct process *pcs, const WCHAR* path, struct macho_file_m return FALSE; } +static const WCHAR dsym_subpath[] = {'/','C','o','n','t','e','n','t','s', + '/','R','e','s','o','u','r','c','e','s', + '/','D','W','A','R','F','/',0}; + +static WCHAR *query_dsym(const UINT8 *uuid, const WCHAR *filename) +{ + char uuid_string[UUID_STRING_LEN]; + CFStringRef uuid_cfstring; + CFStringRef query_string; + MDQueryRef query = NULL; + WCHAR *path = NULL; + + format_uuid(uuid, uuid_string); + uuid_cfstring = CFStringCreateWithCString(NULL, uuid_string, kCFStringEncodingASCII); + query_string = CFStringCreateWithFormat(NULL, NULL, CFSTR("com_apple_xcode_dsym_uuids == \"%@\""), uuid_cfstring); + CFRelease(uuid_cfstring); + query = MDQueryCreate(NULL, query_string, NULL, NULL); + CFRelease(query_string); + MDQuerySetMaxCount(query, 1); + if (MDQueryExecute(query, kMDQuerySynchronous) && MDQueryGetResultCount(query) >= 1) + { + MDItemRef item = (MDItemRef)MDQueryGetResultAtIndex(query, 0); + CFStringRef item_path = MDItemCopyAttribute(item, kMDItemPath); + if (item_path) + { + CFIndex item_path_len = CFStringGetLength(item_path); + size_t len = item_path_len + strlenW(dsym_subpath) + strlenW(filename) + 1; + path = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + CFStringGetCharacters(item_path, CFRangeMake(0, item_path_len), (UniChar*)path); + strcpyW(path + item_path_len, dsym_subpath); + strcatW(path, filename); + CFRelease(item_path); + } + } + CFRelease(query); + return path; +} + /****************************************************************** * find_and_map_dsym * @@ -1255,16 +1293,11 @@ static BOOL try_dsym(struct process *pcs, const WCHAR* path, struct macho_file_m static void find_and_map_dsym(struct process *pcs, struct module* module) { static const WCHAR dot_dsym[] = {'.','d','S','Y','M',0}; - static const WCHAR dsym_subpath[] = {'/','C','o','n','t','e','n','t','s','/','R','e','s','o','u','r','c','e','s','/','D','W','A','R','F','/',0}; static const WCHAR dot_dwarf[] = {'.','d','w','a','r','f',0}; struct macho_file_map* fmap = &module->format_info[DFI_MACHO]->u.macho_info->file_map.u.macho; const WCHAR* p; size_t len; WCHAR* path = NULL; - char uuid_string[UUID_STRING_LEN]; - CFStringRef uuid_cfstring; - CFStringRef query_string; - MDQueryRef query = NULL; /* Without a UUID, we can't verify that any debug info file we find corresponds to this file. Better to have no debug info than incorrect debug info. */ @@ -1289,39 +1322,11 @@ static void find_and_map_dsym(struct process *pcs, struct module* module) if (try_dsym(pcs, path, fmap)) goto found; - format_uuid(fmap->uuid->uuid, uuid_string); - uuid_cfstring = CFStringCreateWithCString(NULL, uuid_string, kCFStringEncodingASCII); - query_string = CFStringCreateWithFormat(NULL, NULL, CFSTR("com_apple_xcode_dsym_uuids == \"%@\""), uuid_cfstring); - CFRelease(uuid_cfstring); - query = MDQueryCreate(NULL, query_string, NULL, NULL); - CFRelease(query_string); - MDQuerySetMaxCount(query, 1); - if (MDQueryExecute(query, kMDQuerySynchronous) && MDQueryGetResultCount(query) >= 1) - { - MDItemRef item = (MDItemRef)MDQueryGetResultAtIndex(query, 0); - CFStringRef item_path = MDItemCopyAttribute(item, kMDItemPath); - if (item_path) - { - CFIndex item_path_len = CFStringGetLength(item_path); - if (item_path_len + strlenW(dsym_subpath) + strlenW(p) >= len) - { - HeapFree(GetProcessHeap(), 0, path); - len = item_path_len + strlenW(dsym_subpath) + strlenW(p) + 1; - path = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - } - CFStringGetCharacters(item_path, CFRangeMake(0, item_path_len), (UniChar*)path); - strcpyW(path + item_path_len, dsym_subpath); - strcatW(path, p); - CFRelease(item_path); - - if (try_dsym(pcs, path, fmap)) - goto found; - } - } + HeapFree(GetProcessHeap(), 0, path); + if ((path = query_dsym(fmap->uuid->uuid, p))) try_dsym(pcs, path, fmap); found: HeapFree(GetProcessHeap(), 0, path); - if (query) CFRelease(query); } /******************************************************************

1 0

Jacek Caban : mountmgr: Add mac-specific ioctl to lookup symbol files.
by Alexandre Julliard April 3, 2020

April 3, 2020

Module: wine Branch: master Commit: ce2257b55c377f32d9b1e1f418c4dff504edae80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce2257b55c377f32d9b1e1f4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 3 15:23:27 2020 +0200 mountmgr: Add mac-specific ioctl to lookup symbol files. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/mountmgr.c | 111 +++++++++++++++++++++++++++++++++++++++++++ include/ddk/mountmgr.h | 2 + 2 files changed, 113 insertions(+) diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index 222395fadf..3d84af47a6 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -18,6 +18,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifdef __APPLE__ +#include <CoreFoundation/CFString.h> +#define LoadResource mac_LoadResource +#define GetCurrentThread mac_GetCurrentThread +#include <CoreServices/CoreServices.h> +#undef LoadResource +#undef GetCurrentThread +#endif + #include <stdarg.h> #include <unistd.h> @@ -391,6 +400,96 @@ static NTSTATUS query_dhcp_request_params( void *buff, SIZE_T insize, return STATUS_SUCCESS; } +/* implementation of Wine extension to use host APIs to find symbol file by GUID */ +#ifdef __APPLE__ +static void WINAPI query_symbol_file( TP_CALLBACK_INSTANCE *instance, void *context ) +{ + IRP *irp = context; + MOUNTMGR_TARGET_NAME *result; + CFStringRef query_cfstring; + WCHAR *unix_buf = NULL; + ANSI_STRING unix_path; + UNICODE_STRING path; + MDQueryRef mdquery; + const GUID *id; + size_t size; + NTSTATUS status = STATUS_NO_MEMORY; + + static const WCHAR formatW[] = { 'c','o','m','_','a','p','p','l','e','_','x','c','o','d','e', + '_','d','s','y','m','_','u','u','i','d','s',' ','=','=',' ', + '"','%','0','8','X','-','%','0','4','X','-', + '%','0','4','X','-','%','0','2','X','%','0','2','X','-', + '%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X', + '%','0','2','X','%','0','2','X','"',0 }; + WCHAR query_string[ARRAY_SIZE(formatW)]; + + id = irp->AssociatedIrp.SystemBuffer; + sprintfW( query_string, formatW, id->Data1, id->Data2, id->Data3, + id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3], + id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7] ); + if (!(query_cfstring = CFStringCreateWithCharacters(NULL, query_string, lstrlenW(query_string)))) goto done; + + mdquery = MDQueryCreate(NULL, query_cfstring, NULL, NULL); + CFRelease(query_cfstring); + if (!mdquery) goto done; + + MDQuerySetMaxCount(mdquery, 1); + TRACE("Executing %s\n", debugstr_w(query_string)); + if (MDQueryExecute(mdquery, kMDQuerySynchronous)) + { + if (MDQueryGetResultCount(mdquery) >= 1) + { + MDItemRef item = (MDItemRef)MDQueryGetResultAtIndex(mdquery, 0); + CFStringRef item_path = MDItemCopyAttribute(item, kMDItemPath); + + if (item_path) + { + CFIndex item_path_len = CFStringGetLength(item_path); + if ((unix_buf = HeapAlloc(GetProcessHeap(), 0, (item_path_len + 1) * sizeof(WCHAR)))) + { + CFStringGetCharacters(item_path, CFRangeMake(0, item_path_len), unix_buf); + unix_buf[item_path_len] = 0; + TRACE("found %s\n", debugstr_w(unix_buf)); + } + CFRelease(item_path); + } + } + else status = STATUS_NO_MORE_ENTRIES; + } + CFRelease(mdquery); + if (!unix_buf) goto done; + + RtlInitUnicodeString( &path, unix_buf ); + status = RtlUnicodeStringToAnsiString( &unix_path, &path, TRUE ); + HeapFree( GetProcessHeap(), 0, unix_buf ); + if (status) goto done; + + status = wine_unix_to_nt_file_name( &unix_path, &path ); + RtlFreeAnsiString( &unix_path ); + if (status) goto done; + + result = irp->AssociatedIrp.SystemBuffer; + result->DeviceNameLength = path.Length; + size = FIELD_OFFSET(MOUNTMGR_TARGET_NAME, DeviceName[path.Length / sizeof(WCHAR)]); + if (size <= IoGetCurrentIrpStackLocation(irp)->Parameters.DeviceIoControl.OutputBufferLength) + { + memcpy( result->DeviceName, path.Buffer, path.Length ); + irp->IoStatus.Information = size; + status = STATUS_SUCCESS; + } + else + { + irp->IoStatus.Information = sizeof(*result); + status = STATUS_BUFFER_OVERFLOW; + } + RtlFreeUnicodeString( &path ); + +done: + irp->IoStatus.u.Status = status; + IoCompleteRequest( irp, IO_NO_INCREMENT ); +} +#endif /* __APPLE__ */ + /* handler for ioctls on the mount manager device */ static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp ) { @@ -446,6 +545,18 @@ static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp ) irpsp->Parameters.DeviceIoControl.OutputBufferLength, &irp->IoStatus ); break; +#ifdef __APPLE__ + case IOCTL_MOUNTMGR_QUERY_SYMBOL_FILE: + if (irpsp->Parameters.DeviceIoControl.InputBufferLength != sizeof(GUID) + || irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(MOUNTMGR_TARGET_NAME)) + { + irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + break; + } + if (TrySubmitThreadpoolCallback( query_symbol_file, irp, NULL )) return STATUS_PENDING; + irp->IoStatus.u.Status = STATUS_NO_MEMORY; + break; +#endif default: FIXME( "ioctl %x not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED; diff --git a/include/ddk/mountmgr.h b/include/ddk/mountmgr.h index cb5822bf3d..d6b0ed21df 100644 --- a/include/ddk/mountmgr.h +++ b/include/ddk/mountmgr.h @@ -82,6 +82,8 @@ struct mountmgr_dhcp_request_params struct mountmgr_dhcp_request_param params[1]; }; +#define IOCTL_MOUNTMGR_QUERY_SYMBOL_FILE CTL_CODE(MOUNTMGRCONTROLTYPE, 80, METHOD_BUFFERED, FILE_READ_ACCESS) + #endif typedef struct _MOUNTMGR_CREATE_POINT_INPUT

1 0

Dmitry Timoshkov : wldap32: Locally cache "supportedControl" rootDSE attribute, and check it in ldap_set_option(LDAP_OPT_SERVER_CONTROLS).
by Alexandre Julliard April 3, 2020

April 3, 2020

Module: wine Branch: master Commit: 07b18a7672308ddc5124749603ea7f5c8b5ee254 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07b18a7672308ddc51247496… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 3 16:57:03 2020 +0800 wldap32: Locally cache "supportedControl" rootDSE attribute, and check it in ldap_set_option(LDAP_OPT_SERVER_CONTROLS). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/tests/ldap.c | 3 --- dlls/wldap32/bind.c | 4 +++ dlls/wldap32/option.c | 57 +++++++++++++++++++++++++++++++++++++++++- dlls/wldap32/tests/parse.c | 2 -- dlls/wldap32/winldap_private.h | 1 + 5 files changed, 61 insertions(+), 6 deletions(-) diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index 80815b07a0..208a9fa2fe 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -498,15 +498,12 @@ todo_wine pref[1].vValue.Integer = ADS_SECURITY_INFO_OWNER | ADS_SECURITY_INFO_GROUP | ADS_SECURITY_INFO_DACL; pref[1].dwStatus = 0xdeadbeef; hr = IDirectorySearch_SetSearchPreference(ds, pref, ARRAY_SIZE(pref)); -todo_wine ok(hr == S_ADS_ERRORSOCCURRED, "got %#x\n", hr); ok(pref[0].dwStatus == ADS_STATUS_S_OK, "got %d\n", pref[0].dwStatus); /* ldap.forumsys.com doesn't support NT security, real ADs DC - does */ -todo_wine ok(pref[1].dwStatus == ADS_STATUS_INVALID_SEARCHPREF, "got %d\n", pref[1].dwStatus); hr = IDirectorySearch_ExecuteSearch(ds, (WCHAR *)L"(objectClass=*)", NULL, ~0, &sh); -todo_wine ok(hr == S_OK, "got %#x\n", hr); if (hr != S_OK) goto fail; diff --git a/dlls/wldap32/bind.c b/dlls/wldap32/bind.c index aedda13634..1498dc49fe 100644 --- a/dlls/wldap32/bind.c +++ b/dlls/wldap32/bind.c @@ -766,6 +766,8 @@ ULONG CDECL WLDAP32_ldap_unbind( WLDAP32_LDAP *ld ) if (ld) { ret = map_error( ldap_unbind_ext( ld->ld, NULL, NULL )); + if ( ld->ld_server_ctrls ) + ldap_value_free_len( ld->ld_server_ctrls ); heap_free( ld ); } else @@ -797,6 +799,8 @@ ULONG CDECL WLDAP32_ldap_unbind_s( WLDAP32_LDAP *ld ) if (ld) { ret = map_error( ldap_unbind_ext_s( ld->ld, NULL, NULL )); + if ( ld->ld_server_ctrls ) + ldap_value_free_len( ld->ld_server_ctrls ); heap_free( ld ); } else diff --git a/dlls/wldap32/option.c b/dlls/wldap32/option.c index 8a8a86b579..87eb779953 100644 --- a/dlls/wldap32/option.c +++ b/dlls/wldap32/option.c @@ -398,6 +398,58 @@ ULONG CDECL ldap_set_optionA( WLDAP32_LDAP *ld, int option, void *value ) return ret; } +#ifdef HAVE_LDAP + +static BOOL query_supported_server_ctrls( WLDAP32_LDAP *ld ) +{ + char *attrs[] = { (char *)"supportedControl", NULL }; + LDAPMessage *res, *entry; + + if ( ld->ld_server_ctrls ) return TRUE; + + if (ldap_search_ext_s( ld->ld, (char *)"", LDAP_SCOPE_BASE, (char *)"(objectClass=*)", attrs, FALSE, + NULL, NULL, NULL, 0, &res ) != LDAP_SUCCESS) + return FALSE; + + entry = ldap_first_entry( ld->ld, res ); + if (entry) + { + ULONG count, i; + + ld->ld_server_ctrls = ldap_get_values_len( ld->ld, entry, attrs[0] ); + count = ldap_count_values_len( ld->ld_server_ctrls ); + for (i = 0; i < count; i++) + TRACE("%u: %s\n", i, debugstr_an( ld->ld_server_ctrls[i]->bv_val, ld->ld_server_ctrls[i]->bv_len )); + } + + ldap_msgfree( res ); + + return ld->ld_server_ctrls != NULL; +} + +static BOOL is_supported_server_ctrls( WLDAP32_LDAP *ld, LDAPControl **ctrls ) +{ + ULONG user_count, server_count, i, n, supported = 0; + + if (!query_supported_server_ctrls( ld )) + return TRUE; /* can't verify, let the server handle it on next query */ + + user_count = controlarraylenU( ctrls ); + server_count = ldap_count_values_len( ld->ld_server_ctrls ); + + for (n = 0; n < user_count; n++) + { + for (i = 0; i < server_count; i++) + { + if (!strncmp( ctrls[n]->ldctl_oid, ld->ld_server_ctrls[i]->bv_val, ld->ld_server_ctrls[i]->bv_len)) + supported++; + } + } + + return supported == user_count; +} +#endif + /*********************************************************************** * ldap_set_optionW (WLDAP32.@) * @@ -433,7 +485,10 @@ ULONG CDECL ldap_set_optionW( WLDAP32_LDAP *ld, int option, void *value ) ctrlsU = controlarrayWtoU( value ); if (!ctrlsU) return WLDAP32_LDAP_NO_MEMORY; - ret = map_error( ldap_set_option( ld->ld, option, ctrlsU )); + if (!is_supported_server_ctrls( ld, ctrlsU )) + ret = WLDAP32_LDAP_PARAM_ERROR; + else + ret = map_error( ldap_set_option( ld->ld, option, ctrlsU )); controlarrayfreeU( ctrlsU ); return ret; } diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c index c2435809d2..5a49b9c69d 100644 --- a/dlls/wldap32/tests/parse.c +++ b/dlls/wldap32/tests/parse.c @@ -201,12 +201,10 @@ static void test_ldap_server_control( void ) ctrls[0] = &mask; ctrls[1] = NULL; ret = ldap_set_optionW(ld, LDAP_OPT_SERVER_CONTROLS, ctrls); -todo_wine ok( ret == LDAP_PARAM_ERROR, "ldap_set_optionW should fail: 0x%x\n", ret ); res = NULL; ret = ldap_search_sA( ld, (char *)"OU=scientists,DC=example,DC=com", LDAP_SCOPE_BASE, (char *)"(objectclass=*)", NULL, FALSE, &res ); -todo_wine ok( !ret, "ldap_search_sA failed 0x%x\n", ret ); ok( res != NULL, "expected res != NULL\n" ); diff --git a/dlls/wldap32/winldap_private.h b/dlls/wldap32/winldap_private.h index 0332deafa2..30c12a909c 100644 --- a/dlls/wldap32/winldap_private.h +++ b/dlls/wldap32/winldap_private.h @@ -131,6 +131,7 @@ typedef struct wldap32 ULONG ld_cldaptimeout; ULONG ld_refhoplimit; ULONG ld_options; + struct berval **ld_server_ctrls; } WLDAP32_LDAP, *WLDAP32_PLDAP; typedef struct ldapmodA {

1 0

Alexandre Julliard : libwine: Make the LDT functions obsolete.
by Alexandre Julliard April 3, 2020

April 3, 2020

Module: wine Branch: master Commit: 3b16f35413f3a6641df42b782ead294f343e7d5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b16f35413f3a6641df42b78… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 3 10:48:41 2020 +0200 libwine: Make the LDT functions obsolete. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/library.h | 110 ------------------------------ libs/wine/ldt.c | 177 +++++++++++++++++++++++++++++++++++-------------- libs/wine/wine.map | 40 +++++------ 3 files changed, 149 insertions(+), 178 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3b16f35413f3a6641df4…

1 0

Alexandre Julliard : ntdll: Avoid using the selector functions from libwine.
by Alexandre Julliard April 3, 2020

April 3, 2020

Module: wine Branch: master Commit: 1124236c20c16eb129919cd02d2fae2b73570741 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1124236c20c16eb129919cd0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 3 10:47:58 2020 +0200 ntdll: Avoid using the selector functions from libwine. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 81 ++++++++++++++++++++++++++---------------------- 1 file changed, 44 insertions(+), 37 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 0e033d53ba..c953d18a65 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -550,6 +550,13 @@ static inline struct x86_thread_data *x86_thread_data(void) return (struct x86_thread_data *)NtCurrentTeb()->SystemReserved2; } +static inline WORD get_cs(void) { WORD res; __asm__( "movw %%cs,%0" : "=r" (res) ); return res; } +static inline WORD get_ds(void) { WORD res; __asm__( "movw %%ds,%0" : "=r" (res) ); return res; } +static inline WORD get_fs(void) { WORD res; __asm__( "movw %%fs,%0" : "=r" (res) ); return res; } +static inline WORD get_gs(void) { WORD res; __asm__( "movw %%gs,%0" : "=r" (res) ); return res; } +static inline void set_fs( WORD val ) { __asm__( "mov %0,%%fs" :: "r" (val)); } +static inline void set_gs( WORD val ) { __asm__( "mov %0,%%gs" :: "r" (val)); } + /* Exception record for handling exceptions happening inside exception handlers */ typedef struct { @@ -836,8 +843,8 @@ static void wine_sigacthandler( int signal, siginfo_t *siginfo, void *sigcontext __asm__ __volatile__("mov %ss,%ax; mov %ax,%ds; mov %ax,%es"); thread_data = (struct x86_thread_data *)get_current_teb()->SystemReserved2; - wine_set_fs( thread_data->fs ); - wine_set_gs( thread_data->gs ); + set_fs( thread_data->fs ); + set_gs( thread_data->gs ); libc_sigacthandler( signal, siginfo, sigcontext ); } @@ -885,19 +892,19 @@ static inline void *init_handler( const ucontext_t *sigcontext, WORD *fs, WORD * #ifdef FS_sig *fs = LOWORD(FS_sig(sigcontext)); #else - *fs = wine_get_fs(); + *fs = get_fs(); #endif #ifdef GS_sig *gs = LOWORD(GS_sig(sigcontext)); #else - *gs = wine_get_gs(); + *gs = get_gs(); #endif #ifndef __sun /* see above for Solaris handling */ { struct x86_thread_data *thread_data = (struct x86_thread_data *)teb->SystemReserved2; - wine_set_fs( thread_data->fs ); - wine_set_gs( thread_data->gs ); + set_fs( thread_data->fs ); + set_gs( thread_data->gs ); } #endif @@ -1133,12 +1140,12 @@ static inline void restore_context( const CONTEXT *context, ucontext_t *sigconte #ifdef GS_sig GS_sig(sigcontext) = context->SegGs; #else - wine_set_gs( context->SegGs ); + set_gs( context->SegGs ); #endif #ifdef FS_sig FS_sig(sigcontext) = context->SegFs; #else - wine_set_fs( context->SegFs ); + set_fs( context->SegFs ); #endif if (fpu) *fpu = context->FloatSave; @@ -1266,10 +1273,10 @@ void DECLSPEC_HIDDEN set_cpu_context( const CONTEXT *context ) else { CONTEXT newcontext = *context; - newcontext.SegDs = wine_get_ds(); - newcontext.SegEs = wine_get_es(); - newcontext.SegFs = wine_get_fs(); - newcontext.SegGs = wine_get_gs(); + newcontext.SegDs = get_ds(); + newcontext.SegEs = get_ds(); + newcontext.SegFs = get_fs(); + newcontext.SegGs = get_gs(); set_full_cpu_context( &newcontext ); } } @@ -1513,17 +1520,17 @@ NTSTATUS CDECL DECLSPEC_HIDDEN __regs_NtGetContextThread( DWORD edi, DWORD esi, context->Ebp = ebp; context->Esp = (DWORD)&retaddr; context->Eip = *(&edi - 1); - context->SegCs = wine_get_cs(); - context->SegSs = wine_get_ss(); + context->SegCs = get_cs(); + context->SegSs = get_ds(); context->EFlags = eflags; context->ContextFlags |= CONTEXT_CONTROL; } if (needed_flags & CONTEXT_SEGMENTS) { - context->SegDs = wine_get_ds(); - context->SegEs = wine_get_es(); - context->SegFs = wine_get_fs(); - context->SegGs = wine_get_gs(); + context->SegDs = get_ds(); + context->SegEs = get_ds(); + context->SegFs = get_fs(); + context->SegGs = get_gs(); context->ContextFlags |= CONTEXT_SEGMENTS; } if (needed_flags & CONTEXT_FLOATING_POINT) save_fpu( context ); @@ -1937,12 +1944,12 @@ static void setup_raise_exception( ucontext_t *sigcontext, struct stack_layout * EIP_sig(sigcontext) = (DWORD)raise_generic_exception; /* clear single-step, direction, and align check flag */ EFL_sig(sigcontext) &= ~(0x100|0x400|0x40000); - CS_sig(sigcontext) = wine_get_cs(); - DS_sig(sigcontext) = wine_get_ds(); - ES_sig(sigcontext) = wine_get_es(); - FS_sig(sigcontext) = wine_get_fs(); - GS_sig(sigcontext) = wine_get_gs(); - SS_sig(sigcontext) = wine_get_ss(); + CS_sig(sigcontext) = get_cs(); + DS_sig(sigcontext) = get_ds(); + ES_sig(sigcontext) = get_ds(); + FS_sig(sigcontext) = get_fs(); + GS_sig(sigcontext) = get_gs(); + SS_sig(sigcontext) = get_ds(); stack->ret_addr = (void *)0xdeadbabe; /* raise_generic_exception must not return */ stack->rec_ptr = &stack->rec; /* arguments for raise_generic_exception */ stack->context_ptr = &stack->context; @@ -2435,7 +2442,7 @@ static void ldt_init(void) { #ifdef __linux__ /* the preloader may have allocated it already */ - gdt_fs_sel = wine_get_fs(); + gdt_fs_sel = get_fs(); if (!gdt_fs_sel || !is_gdt_sel( gdt_fs_sel )) { struct modify_ldt_s ldt_info = { -1 }; @@ -2462,7 +2469,7 @@ WORD ldt_alloc_fs( TEB *teb, int first_thread ) if (first_thread) /* no locking for first thread */ { /* leave some space if libc is using the LDT for %gs */ - if (!is_gdt_sel( wine_get_gs() )) first_ldt_entry = 512; + if (!is_gdt_sel( get_gs() )) first_ldt_entry = 512; idx = first_ldt_entry; ldt_set_entry( (idx << 3) | 7, entry ); } @@ -2505,7 +2512,7 @@ static void ldt_set_fs( WORD sel, TEB *teb ) i386_set_fsbase( teb ); #endif } - wine_set_fs( sel ); + set_fs( sel ); } @@ -2524,11 +2531,11 @@ NTSTATUS get_thread_ldt_entry( HANDLE handle, void *data, ULONG len, ULONG *ret_ { if (!(info->Selector & ~3)) info->Entry = null_entry; - else if ((info->Selector | 3) == wine_get_cs()) + else if ((info->Selector | 3) == get_cs()) info->Entry = ldt_make_entry( 0, ~0u, LDT_FLAGS_CODE | LDT_FLAGS_32BIT ); - else if ((info->Selector | 3) == wine_get_ds()) + else if ((info->Selector | 3) == get_ds()) info->Entry = ldt_make_entry( 0, ~0u, LDT_FLAGS_DATA | LDT_FLAGS_32BIT ); - else if ((info->Selector | 3) == wine_get_fs()) + else if ((info->Selector | 3) == get_fs()) info->Entry = ldt_make_entry( NtCurrentTeb(), 0xfff, LDT_FLAGS_DATA | LDT_FLAGS_32BIT ); else return STATUS_UNSUCCESSFUL; @@ -2654,7 +2661,7 @@ void signal_init_thread( TEB *teb ) if (sigaltstack(&ss, NULL) == -1) perror( "sigaltstack" ); ldt_set_fs( thread_data->fs, teb ); - thread_data->gs = wine_get_gs(); + thread_data->gs = get_gs(); #ifdef __GNUC__ __asm__ volatile ("fninit; fldcw %0" : : "m" (fpu_cw)); @@ -3000,12 +3007,12 @@ void DECLSPEC_HIDDEN call_thread_func( LPTHREAD_START_ROUTINE entry, void *arg ) */ static void init_thread_context( CONTEXT *context, LPTHREAD_START_ROUTINE entry, void *arg, void *relay ) { - context->SegCs = wine_get_cs(); - context->SegDs = wine_get_ds(); - context->SegEs = wine_get_es(); - context->SegFs = wine_get_fs(); - context->SegGs = wine_get_gs(); - context->SegSs = wine_get_ss(); + context->SegCs = get_cs(); + context->SegDs = get_ds(); + context->SegEs = get_ds(); + context->SegFs = get_fs(); + context->SegGs = get_gs(); + context->SegSs = get_ds(); context->EFlags = 0x202; context->Eax = (DWORD)entry; context->Ebx = (DWORD)arg;

1 0

Rémi Bernon : winedbg: Add gdb feature names to the register maps.
by Alexandre Julliard April 3, 2020

April 3, 2020

Module: wine Branch: master Commit: 6bfaa76caae76274f0d99de79d9bc18bafe80d23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bfaa76caae76274f0d99de7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 3 15:35:47 2020 +0200 winedbg: Add gdb feature names to the register maps. In order not to repeat the features, registers are expected to be ordered and grouped by feature. If feature name is set only on the first register of a new feature. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/be_arm.c | 36 +++++------ programs/winedbg/be_arm64.c | 70 ++++++++++----------- programs/winedbg/be_cpu.h | 1 + programs/winedbg/be_i386.c | 85 ++++++++++++------------- programs/winedbg/be_ppc.c | 146 ++++++++++++++++++++++--------------------- programs/winedbg/be_x86_64.c | 117 +++++++++++++++++----------------- 6 files changed, 230 insertions(+), 225 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6bfaa76caae76274f0d9…

1 0

Rémi Bernon : winedbg: Add gdb register names to the register maps.
by Alexandre Julliard April 3, 2020

April 3, 2020

Module: wine Branch: master Commit: a650b3d80a4004874d2ca845df45e8c7cdf6e27c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a650b3d80a4004874d2ca845… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 3 15:35:48 2020 +0200 winedbg: Add gdb register names to the register maps. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/be_arm.c | 36 +++++------ programs/winedbg/be_arm64.c | 70 ++++++++++----------- programs/winedbg/be_cpu.h | 1 + programs/winedbg/be_i386.c | 86 ++++++++++++------------- programs/winedbg/be_ppc.c | 146 +++++++++++++++++++++---------------------- programs/winedbg/be_x86_64.c | 118 +++++++++++++++++----------------- 6 files changed, 229 insertions(+), 228 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a650b3d80a4004874d2c…

1 0