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

[PATCH 2/3] dbghelp: Factor out query_dsym.
by Jacek Caban 03 Apr '20

03 Apr '20

--- 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); } /****************************************************************** -- 2.21.0

2 1

[PATCH 1/3] mountmgr: Add mac-specific ioctl to lookup symbol files.
by Jacek Caban 03 Apr '20

03 Apr '20

--- 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 -- 2.21.0

2 1

[PATCH 3/3] wldap32: Locally cache "supportedControl" rootDSE attribute, and check it in ldap_set_option(LDAP_OPT_SERVER_CONTROLS).
by Dmitry Timoshkov 03 Apr '20

03 Apr '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- 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 { -- 2.25.1

2 1

[PATCH 2/3] wldap32: Actually use private LDAP structure for internal storage.
by Dmitry Timoshkov 03 Apr '20

03 Apr '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wldap32/add.c | 8 ++++---- dlls/wldap32/bind.c | 24 +++++++++++++++--------- dlls/wldap32/compare.c | 8 ++++---- dlls/wldap32/control.c | 4 ++-- dlls/wldap32/delete.c | 8 ++++---- dlls/wldap32/dn.c | 2 +- dlls/wldap32/error.c | 2 +- dlls/wldap32/extended.c | 4 ++-- dlls/wldap32/init.c | 25 ++++++++++++++++--------- dlls/wldap32/misc.c | 20 ++++++++++---------- dlls/wldap32/modify.c | 8 ++++---- dlls/wldap32/modrdn.c | 8 ++++---- dlls/wldap32/option.c | 10 +++++----- dlls/wldap32/parse.c | 16 ++++++++-------- dlls/wldap32/rename.c | 4 ++-- dlls/wldap32/search.c | 10 +++++----- dlls/wldap32/value.c | 4 ++-- dlls/wldap32/winldap_private.h | 5 ++++- 18 files changed, 93 insertions(+), 77 deletions(-) diff --git a/dlls/wldap32/add.c b/dlls/wldap32/add.c index 270311e561..0d0c8bfa11 100644 --- a/dlls/wldap32/add.c +++ b/dlls/wldap32/add.c @@ -120,7 +120,7 @@ ULONG CDECL ldap_addW( WLDAP32_LDAP *ld, PWCHAR dn, LDAPModW *attrs[] ) if (!attrsU) goto exit; } - ret = ldap_add_ext( ld, dn ? dnU : "", attrs ? attrsU : nullattrs, NULL, NULL, &msg ); + ret = ldap_add_ext( ld->ld, dn ? dnU : "", attrs ? attrsU : nullattrs, NULL, NULL, &msg ); if (ret == LDAP_SUCCESS) ret = msg; @@ -242,7 +242,7 @@ ULONG CDECL ldap_add_extW( WLDAP32_LDAP *ld, PWCHAR dn, LDAPModW *attrs[], if (!clientctrlsU) goto exit; } - ret = map_error( ldap_add_ext( ld, dn ? dnU : "", attrs ? attrsU : nullattrs, serverctrlsU, + ret = map_error( ldap_add_ext( ld->ld, dn ? dnU : "", attrs ? attrsU : nullattrs, serverctrlsU, clientctrlsU, message ? (int *)message : &dummy )); exit: @@ -359,7 +359,7 @@ ULONG CDECL ldap_add_ext_sW( WLDAP32_LDAP *ld, PWCHAR dn, LDAPModW *attrs[], if (!clientctrlsU) goto exit; } - ret = map_error( ldap_add_ext_s( ld, dn ? dnU : "", attrs ? attrsU : nullattrs, + ret = map_error( ldap_add_ext_s( ld->ld, dn ? dnU : "", attrs ? attrsU : nullattrs, serverctrlsU, clientctrlsU )); exit: @@ -446,7 +446,7 @@ ULONG CDECL ldap_add_sW( WLDAP32_LDAP *ld, PWCHAR dn, LDAPModW *attrs[] ) if (!attrsU) goto exit; } - ret = map_error( ldap_add_ext_s( ld, dn ? dnU : "", attrs ? attrsU : nullattrs, NULL, NULL )); + ret = map_error( ldap_add_ext_s( ld->ld, dn ? dnU : "", attrs ? attrsU : nullattrs, NULL, NULL )); exit: strfreeU( dnU ); diff --git a/dlls/wldap32/bind.c b/dlls/wldap32/bind.c index 46b866fd31..aedda13634 100644 --- a/dlls/wldap32/bind.c +++ b/dlls/wldap32/bind.c @@ -123,7 +123,7 @@ ULONG CDECL ldap_bindW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR cred, ULONG method ) pwd.bv_val = credU; } - ret = ldap_sasl_bind( ld, dnU, LDAP_SASL_SIMPLE, &pwd, NULL, NULL, &msg ); + ret = ldap_sasl_bind( ld->ld, dnU, LDAP_SASL_SIMPLE, &pwd, NULL, NULL, &msg ); if (ret == LDAP_SUCCESS) ret = msg; @@ -265,7 +265,7 @@ ULONG CDECL ldap_bind_sW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR cred, ULONG method pwd.bv_val = credU; } - ret = map_error( ldap_sasl_bind_s( ld, dnU, LDAP_SASL_SIMPLE, &pwd, NULL, NULL, NULL )); + ret = map_error( ldap_sasl_bind_s( ld->ld, dnU, LDAP_SASL_SIMPLE, &pwd, NULL, NULL, NULL )); } else if (method == WLDAP32_LDAP_AUTH_NEGOTIATE) { @@ -292,7 +292,7 @@ ULONG CDECL ldap_bind_sW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR cred, ULONG method idU.Password = (unsigned char *)strnWtoU( id->Password, id->PasswordLength, &idU.PasswordLength ); } - ret = map_error( ldap_sasl_interactive_bind_s( ld, + ret = map_error( ldap_sasl_interactive_bind_s( ld->ld, NULL /* server will ignore DN anyway */, NULL /* query supportedSASLMechanisms */, NULL, NULL, LDAP_SASL_QUIET, sasl_interact, &idU )); @@ -429,7 +429,7 @@ ULONG CDECL ldap_sasl_bindW( WLDAP32_LDAP *ld, const PWCHAR dn, credU.bv_len = cred->bv_len; credU.bv_val = cred->bv_val; - ret = map_error( ldap_sasl_bind( ld, dnU, mechanismU, &credU, + ret = map_error( ldap_sasl_bind( ld->ld, dnU, mechanismU, &credU, serverctrlsU, clientctrlsU, message )); exit: @@ -549,7 +549,7 @@ ULONG CDECL ldap_sasl_bind_sW( WLDAP32_LDAP *ld, const PWCHAR dn, credU.bv_len = cred->bv_len; credU.bv_val = cred->bv_val; - ret = map_error( ldap_sasl_bind_s( ld, dnU, mechanismU, &credU, + ret = map_error( ldap_sasl_bind_s( ld->ld, dnU, mechanismU, &credU, serverctrlsU, clientctrlsU, (struct berval **)serverdata )); exit: @@ -641,7 +641,7 @@ ULONG CDECL ldap_simple_bindW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR passwd ) pwd.bv_val = passwdU; } - ret = ldap_sasl_bind( ld, dnU, LDAP_SASL_SIMPLE, &pwd, NULL, NULL, &msg ); + ret = ldap_sasl_bind( ld->ld, dnU, LDAP_SASL_SIMPLE, &pwd, NULL, NULL, &msg ); if (ret == LDAP_SUCCESS) ret = msg; @@ -734,7 +734,7 @@ ULONG CDECL ldap_simple_bind_sW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR passwd ) pwd.bv_val = passwdU; } - ret = map_error( ldap_sasl_bind_s( ld, dnU, LDAP_SASL_SIMPLE, &pwd, NULL, NULL, NULL )); + ret = map_error( ldap_sasl_bind_s( ld->ld, dnU, LDAP_SASL_SIMPLE, &pwd, NULL, NULL, NULL )); exit: strfreeU( dnU ); @@ -764,7 +764,10 @@ ULONG CDECL WLDAP32_ldap_unbind( WLDAP32_LDAP *ld ) TRACE( "(%p)\n", ld ); if (ld) - ret = map_error( ldap_unbind_ext( ld, NULL, NULL )); + { + ret = map_error( ldap_unbind_ext( ld->ld, NULL, NULL )); + heap_free( ld ); + } else ret = WLDAP32_LDAP_PARAM_ERROR; @@ -792,7 +795,10 @@ ULONG CDECL WLDAP32_ldap_unbind_s( WLDAP32_LDAP *ld ) TRACE( "(%p)\n", ld ); if (ld) - ret = map_error( ldap_unbind_ext_s( ld, NULL, NULL )); + { + ret = map_error( ldap_unbind_ext_s( ld->ld, NULL, NULL )); + heap_free( ld ); + } else ret = WLDAP32_LDAP_PARAM_ERROR; diff --git a/dlls/wldap32/compare.c b/dlls/wldap32/compare.c index a7eab26d96..c725aa3a71 100644 --- a/dlls/wldap32/compare.c +++ b/dlls/wldap32/compare.c @@ -126,7 +126,7 @@ ULONG CDECL ldap_compareW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR attr, PWCHAR valu val.bv_val = valueU; } - ret = ldap_compare_ext( ld, dn ? dnU : "", attrU, &val, NULL, NULL, &msg ); + ret = ldap_compare_ext( ld->ld, dn ? dnU : "", attrU, &val, NULL, NULL, &msg ); if (ret == LDAP_SUCCESS) ret = msg; @@ -268,7 +268,7 @@ ULONG CDECL ldap_compare_extW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR attr, PWCHAR if (!clientctrlsU) goto exit; } - ret = map_error( ldap_compare_ext( ld, dn ? dnU : "", attrU, data ? (struct berval *)data : &val, + ret = map_error( ldap_compare_ext( ld->ld, dn ? dnU : "", attrU, data ? (struct berval *)data : &val, serverctrlsU, clientctrlsU, (int *)message )); exit: @@ -404,7 +404,7 @@ ULONG CDECL ldap_compare_ext_sW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR attr, PWCHA if (!clientctrlsU) goto exit; } - ret = map_error( ldap_compare_ext_s( ld, dn ? dnU : "", attr ? attrU : "", + ret = map_error( ldap_compare_ext_s( ld->ld, dn ? dnU : "", attr ? attrU : "", data ? (struct berval *)data : &val, serverctrlsU, clientctrlsU )); @@ -506,7 +506,7 @@ ULONG CDECL ldap_compare_sW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR attr, PWCHAR va val.bv_val = valueU; } - ret = map_error( ldap_compare_ext_s( ld, dn ? dnU : "", attr ? attrU : "", &val, NULL, NULL )); + ret = map_error( ldap_compare_ext_s( ld->ld, dn ? dnU : "", attr ? attrU : "", &val, NULL, NULL )); exit: strfreeU( dnU ); diff --git a/dlls/wldap32/control.c b/dlls/wldap32/control.c index ffbf41ef68..f0e0b05c0d 100644 --- a/dlls/wldap32/control.c +++ b/dlls/wldap32/control.c @@ -189,7 +189,7 @@ ULONG CDECL ldap_create_sort_controlW( WLDAP32_LDAP *ld, PLDAPSortKeyW *sortkey, sortkeyU = sortkeyarrayWtoU( sortkey ); if (!sortkeyU) return WLDAP32_LDAP_NO_MEMORY; - ret = map_error( ldap_create_sort_control( ld, sortkeyU, critical, &controlU )); + ret = map_error( ldap_create_sort_control( ld->ld, sortkeyU, critical, &controlU )); *control = controlUtoW( controlU ); if (!*control) ret = WLDAP32_LDAP_NO_MEMORY; @@ -263,7 +263,7 @@ INT CDECL ldap_create_vlv_controlW( WLDAP32_LDAP *ld, WLDAP32_LDAPVLVInfo *info, if (!ld || !control) return ~0u; - ret = map_error( ldap_create_vlv_control( ld, (LDAPVLVInfo *)info, &controlU )); + ret = map_error( ldap_create_vlv_control( ld->ld, (LDAPVLVInfo *)info, &controlU )); if (ret == WLDAP32_LDAP_SUCCESS) { diff --git a/dlls/wldap32/delete.c b/dlls/wldap32/delete.c index 7d62edc8ac..95d636e487 100644 --- a/dlls/wldap32/delete.c +++ b/dlls/wldap32/delete.c @@ -99,7 +99,7 @@ ULONG CDECL ldap_deleteW( WLDAP32_LDAP *ld, PWCHAR dn ) if (!dnU) return WLDAP32_LDAP_NO_MEMORY; } - ret = ldap_delete_ext( ld, dn ? dnU : "", NULL, NULL, &msg ); + ret = ldap_delete_ext( ld->ld, dn ? dnU : "", NULL, NULL, &msg ); if (ret == LDAP_SUCCESS) ret = msg; @@ -206,7 +206,7 @@ ULONG CDECL ldap_delete_extW( WLDAP32_LDAP *ld, PWCHAR dn, PLDAPControlW *server if (!clientctrlsU) goto exit; } - ret = map_error( ldap_delete_ext( ld, dn ? dnU : "", serverctrlsU, clientctrlsU, + ret = map_error( ldap_delete_ext( ld->ld, dn ? dnU : "", serverctrlsU, clientctrlsU, message ? (int *)message : &dummy )); exit: @@ -305,7 +305,7 @@ ULONG CDECL ldap_delete_ext_sW( WLDAP32_LDAP *ld, PWCHAR dn, PLDAPControlW *serv if (!clientctrlsU) goto exit; } - ret = map_error( ldap_delete_ext_s( ld, dn ? dnU : "", serverctrlsU, clientctrlsU )); + ret = map_error( ldap_delete_ext_s( ld->ld, dn ? dnU : "", serverctrlsU, clientctrlsU )); exit: strfreeU( dnU ); @@ -371,7 +371,7 @@ ULONG CDECL ldap_delete_sW( WLDAP32_LDAP *ld, PWCHAR dn ) if (!dnU) return WLDAP32_LDAP_NO_MEMORY; } - ret = map_error( ldap_delete_ext_s( ld, dn ? dnU : "", NULL, NULL )); + ret = map_error( ldap_delete_ext_s( ld->ld, dn ? dnU : "", NULL, NULL )); strfreeU( dnU ); #endif diff --git a/dlls/wldap32/dn.c b/dlls/wldap32/dn.c index 1303eb5057..6d1a971101 100644 --- a/dlls/wldap32/dn.c +++ b/dlls/wldap32/dn.c @@ -214,7 +214,7 @@ PWCHAR CDECL ldap_get_dnW( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry ) if (!ld || !entry) return NULL; - retU = ldap_get_dn( ld, entry ); + retU = ldap_get_dn( ld->ld, entry ); ret = strUtoW( retU ); ldap_memfree( retU ); diff --git a/dlls/wldap32/error.c b/dlls/wldap32/error.c index fbbd124d23..11ecaf8763 100644 --- a/dlls/wldap32/error.c +++ b/dlls/wldap32/error.c @@ -159,7 +159,7 @@ ULONG CDECL WLDAP32_ldap_result2error( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *re if (!ld || !res) return ~0u; - ret = ldap_parse_result( ld, res, &error, NULL, NULL, NULL, NULL, free ); + ret = ldap_parse_result( ld->ld, res, &error, NULL, NULL, NULL, NULL, free ); if (ret == LDAP_SUCCESS) ret = error; diff --git a/dlls/wldap32/extended.c b/dlls/wldap32/extended.c index b05c3c5f1a..4600109182 100644 --- a/dlls/wldap32/extended.c +++ b/dlls/wldap32/extended.c @@ -158,7 +158,7 @@ ULONG CDECL ldap_extended_operationW( WLDAP32_LDAP *ld, PWCHAR oid, struct WLDAP if (!clientctrlsU) goto exit; } - ret = map_error( ldap_extended_operation( ld, oid ? oidU : "", (struct berval *)data, + ret = map_error( ldap_extended_operation( ld->ld, oid ? oidU : "", (struct berval *)data, serverctrlsU, clientctrlsU, (int *)message )); exit: @@ -275,7 +275,7 @@ ULONG CDECL ldap_extended_operation_sW( WLDAP32_LDAP *ld, PWCHAR oid, struct WLD if (!clientctrlsU) goto exit; } - ret = map_error( ldap_extended_operation_s( ld, oid ? oidU : "", (struct berval *)data, serverctrlsU, + ret = map_error( ldap_extended_operation_s( ld->ld, oid ? oidU : "", (struct berval *)data, serverctrlsU, clientctrlsU, &retoidU, (struct berval **)retdata )); if (retoid && retoidU) { diff --git a/dlls/wldap32/init.c b/dlls/wldap32/init.c index d3508e33ef..afaef3b52f 100644 --- a/dlls/wldap32/init.c +++ b/dlls/wldap32/init.c @@ -205,12 +205,19 @@ static char *urlify_hostnames( const char *scheme, char *hostnames, ULONG port ) WINE_DEFAULT_DEBUG_CHANNEL(wldap32); #ifdef HAVE_LDAP -static LDAP *create_context( const char *url ) +static WLDAP32_LDAP *create_context( const char *url ) { - LDAP *ld; + WLDAP32_LDAP *ld; int version = LDAP_VERSION3; - if (ldap_initialize( &ld, url ) != LDAP_SUCCESS) return NULL; - ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION, &version ); + + ld = heap_alloc_zero( sizeof( *ld )); + if (!ld) return NULL; + if (ldap_initialize( &ld->ld, url ) != LDAP_SUCCESS) + { + heap_free( ld ); + return NULL; + } + ldap_set_option( ld->ld, LDAP_OPT_PROTOCOL_VERSION, &version ); return ld; } #endif @@ -268,7 +275,7 @@ exit: WLDAP32_LDAP * CDECL cldap_openW( PWCHAR hostname, ULONG portnumber ) { #ifdef HAVE_LDAP - LDAP *ld = NULL; + WLDAP32_LDAP *ld = NULL; char *hostnameU = NULL, *url = NULL; TRACE( "(%s, %d)\n", debugstr_w(hostname), portnumber ); @@ -377,7 +384,7 @@ exit: WLDAP32_LDAP * CDECL ldap_initW( const PWCHAR hostname, ULONG portnumber ) { #ifdef HAVE_LDAP - LDAP *ld = NULL; + WLDAP32_LDAP *ld = NULL; char *hostnameU = NULL, *url = NULL; TRACE( "(%s, %d)\n", debugstr_w(hostname), portnumber ); @@ -459,7 +466,7 @@ exit: WLDAP32_LDAP * CDECL ldap_openW( PWCHAR hostname, ULONG portnumber ) { #ifdef HAVE_LDAP - LDAP *ld = NULL; + WLDAP32_LDAP *ld = NULL; char *hostnameU = NULL, *url = NULL; TRACE( "(%s, %d)\n", debugstr_w(hostname), portnumber ); @@ -562,7 +569,7 @@ WLDAP32_LDAP * CDECL ldap_sslinitW( PWCHAR hostname, ULONG portnumber, int secur url = urlify_hostnames( "ldap://", hostnameU, portnumber ); if (!url) goto exit; - ldap_initialize( &ld, url ); + ldap_initialize( &ld->ld, url ); exit: strfreeU( hostnameU ); @@ -652,7 +659,7 @@ ULONG CDECL ldap_start_tls_sW( WLDAP32_LDAP *ld, PULONG retval, WLDAP32_LDAPMess if (!clientctrlsU) goto exit; } - ret = map_error( ldap_start_tls_s( ld, serverctrlsU, clientctrlsU )); + ret = map_error( ldap_start_tls_s( ld->ld, serverctrlsU, clientctrlsU )); exit: controlarrayfreeU( serverctrlsU ); diff --git a/dlls/wldap32/misc.c b/dlls/wldap32/misc.c index 9c421f9470..3964296095 100644 --- a/dlls/wldap32/misc.c +++ b/dlls/wldap32/misc.c @@ -58,7 +58,7 @@ ULONG CDECL WLDAP32_ldap_abandon( WLDAP32_LDAP *ld, ULONG msgid ) TRACE( "(%p, 0x%08x)\n", ld, msgid ); if (!ld) return ~0u; - ret = map_error( ldap_abandon_ext( ld, msgid, NULL, NULL )); + ret = map_error( ldap_abandon_ext( ld->ld, msgid, NULL, NULL )); #endif return ret; @@ -161,7 +161,7 @@ ULONG CDECL WLDAP32_ldap_count_entries( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *r TRACE( "(%p, %p)\n", ld, res ); if (!ld) return ~0u; - ret = ldap_count_entries( ld, res ); + ret = ldap_count_entries( ld->ld, res ); #endif return ret; @@ -188,7 +188,7 @@ ULONG CDECL WLDAP32_ldap_count_references( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage TRACE( "(%p, %p)\n", ld, res ); if (!ld) return 0; - ret = ldap_count_references( ld, res ); + ret = ldap_count_references( ld->ld, res ); #endif return ret; @@ -333,7 +333,7 @@ PWCHAR CDECL ldap_first_attributeW( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry TRACE( "(%p, %p, %p)\n", ld, entry, ptr ); if (!ld || !entry) return NULL; - retU = ldap_first_attribute( ld, entry, ptr ); + retU = ldap_first_attribute( ld->ld, entry, ptr ); ret = strUtoW( retU ); ldap_memfree( retU ); @@ -365,7 +365,7 @@ WLDAP32_LDAPMessage * CDECL WLDAP32_ldap_first_entry( WLDAP32_LDAP *ld, WLDAP32_ TRACE( "(%p, %p)\n", ld, res ); if (!ld || !res) return NULL; - return ldap_first_entry( ld, res ); + return ldap_first_entry( ld->ld, res ); #else return NULL; @@ -392,7 +392,7 @@ WLDAP32_LDAPMessage * CDECL WLDAP32_ldap_first_reference( WLDAP32_LDAP *ld, WLDA TRACE( "(%p, %p)\n", ld, res ); if (!ld) return NULL; - return ldap_first_reference( ld, res ); + return ldap_first_reference( ld->ld, res ); #else return NULL; @@ -496,7 +496,7 @@ PWCHAR CDECL ldap_next_attributeW( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry, TRACE( "(%p, %p, %p)\n", ld, entry, ptr ); if (!ld || !entry || !ptr) return NULL; - retU = ldap_next_attribute( ld, entry, ptr ); + retU = ldap_next_attribute( ld->ld, entry, ptr ); ret = strUtoW( retU ); ldap_memfree( retU ); @@ -528,7 +528,7 @@ WLDAP32_LDAPMessage * CDECL WLDAP32_ldap_next_entry( WLDAP32_LDAP *ld, WLDAP32_L TRACE( "(%p, %p)\n", ld, entry ); if (!ld || !entry) return NULL; - return ldap_next_entry( ld, entry ); + return ldap_next_entry( ld->ld, entry ); #else return NULL; @@ -558,7 +558,7 @@ WLDAP32_LDAPMessage * CDECL WLDAP32_ldap_next_reference( WLDAP32_LDAP *ld, WLDAP TRACE( "(%p, %p)\n", ld, entry ); if (!ld || !entry) return NULL; - return ldap_next_reference( ld, entry ); + return ldap_next_reference( ld->ld, entry ); #else return NULL; @@ -610,7 +610,7 @@ ULONG CDECL WLDAP32_ldap_result( WLDAP32_LDAP *ld, ULONG msgid, ULONG all, TRACE( "(%p, 0x%08x, 0x%08x, %p, %p)\n", ld, msgid, all, timeout, res ); if (!ld || !res || msgid == ~0u) return ~0u; - ret = ldap_result( ld, msgid, all, (struct timeval *)timeout, res ); + ret = ldap_result( ld->ld, msgid, all, (struct timeval *)timeout, res ); #endif return ret; diff --git a/dlls/wldap32/modify.c b/dlls/wldap32/modify.c index defc32af9c..7269df9da9 100644 --- a/dlls/wldap32/modify.c +++ b/dlls/wldap32/modify.c @@ -120,7 +120,7 @@ ULONG CDECL ldap_modifyW( WLDAP32_LDAP *ld, PWCHAR dn, LDAPModW *mods[] ) if (!modsU) goto exit; } - ret = ldap_modify_ext( ld, dn ? dnU : "", mods ? modsU : nullmods, + ret = ldap_modify_ext( ld->ld, dn ? dnU : "", mods ? modsU : nullmods, NULL, NULL, &msg ); if (ret == LDAP_SUCCESS) @@ -243,7 +243,7 @@ ULONG CDECL ldap_modify_extW( WLDAP32_LDAP *ld, PWCHAR dn, LDAPModW *mods[], if (!clientctrlsU) goto exit; } - ret = map_error( ldap_modify_ext( ld, dn ? dnU : "", mods ? modsU : nullmods, serverctrlsU, + ret = map_error( ldap_modify_ext( ld->ld, dn ? dnU : "", mods ? modsU : nullmods, serverctrlsU, clientctrlsU, message ? (int *)message : &dummy )); exit: @@ -360,7 +360,7 @@ ULONG CDECL ldap_modify_ext_sW( WLDAP32_LDAP *ld, PWCHAR dn, LDAPModW *mods[], if (!clientctrlsU) goto exit; } - ret = map_error( ldap_modify_ext_s( ld, dn ? dnU : "", mods ? modsU : nullmods, + ret = map_error( ldap_modify_ext_s( ld->ld, dn ? dnU : "", mods ? modsU : nullmods, serverctrlsU, clientctrlsU )); exit: @@ -447,7 +447,7 @@ ULONG CDECL ldap_modify_sW( WLDAP32_LDAP *ld, PWCHAR dn, LDAPModW *mods[] ) if (!modsU) goto exit; } - ret = map_error( ldap_modify_ext_s( ld, dn ? dnU : "", mods ? modsU : nullmods, NULL, NULL )); + ret = map_error( ldap_modify_ext_s( ld->ld, dn ? dnU : "", mods ? modsU : nullmods, NULL, NULL )); exit: strfreeU( dnU ); diff --git a/dlls/wldap32/modrdn.c b/dlls/wldap32/modrdn.c index 97ab0a9258..c9e232140c 100644 --- a/dlls/wldap32/modrdn.c +++ b/dlls/wldap32/modrdn.c @@ -113,7 +113,7 @@ ULONG CDECL ldap_modrdnW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR newdn ) newdnU = strWtoU( newdn ); if (!newdnU) goto exit; - ret = ldap_rename( ld, dn ? dnU : "", newdnU, NULL, 1, NULL, NULL, &msg ); + ret = ldap_rename( ld->ld, dn ? dnU : "", newdnU, NULL, 1, NULL, NULL, &msg ); if (ret == LDAP_SUCCESS) ret = msg; @@ -204,7 +204,7 @@ ULONG CDECL ldap_modrdn2W( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR newdn, INT delete newdnU = strWtoU( newdn ); if (!newdnU) goto exit; - ret = ldap_rename( ld, dn ? dnU : "", newdnU, NULL, delete, NULL, NULL, &msg ); + ret = ldap_rename( ld->ld, dn ? dnU : "", newdnU, NULL, delete, NULL, NULL, &msg ); if (ret == LDAP_SUCCESS) ret = msg; @@ -289,7 +289,7 @@ ULONG CDECL ldap_modrdn2_sW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR newdn, INT dele newdnU = strWtoU( newdn ); if (!newdnU) goto exit; - ret = map_error( ldap_rename_s( ld, dn ? dnU : "", newdnU, NULL, delete, NULL, NULL )); + ret = map_error( ldap_rename_s( ld->ld, dn ? dnU : "", newdnU, NULL, delete, NULL, NULL )); exit: strfreeU( dnU ); @@ -368,7 +368,7 @@ ULONG CDECL ldap_modrdn_sW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR newdn ) newdnU = strWtoU( newdn ); if (!newdnU) goto exit; - ret = map_error( ldap_rename_s( ld, dn ? dnU : "", newdnU, NULL, 1, NULL, NULL )); + ret = map_error( ldap_rename_s( ld->ld, dn ? dnU : "", newdnU, NULL, 1, NULL, NULL )); exit: strfreeU( dnU ); diff --git a/dlls/wldap32/option.c b/dlls/wldap32/option.c index 4b7ec36c38..8a8a86b579 100644 --- a/dlls/wldap32/option.c +++ b/dlls/wldap32/option.c @@ -206,7 +206,7 @@ ULONG CDECL ldap_get_optionW( WLDAP32_LDAP *ld, int option, void *value ) if (!featureU.ldapaif_name) return WLDAP32_LDAP_NO_MEMORY; - ret = map_error( ldap_get_option( ld, option, &featureU )); + ret = map_error( ldap_get_option( ld->ld, option, &featureU )); featureW->ldapaif_version = featureU.ldapaif_version; strfreeU( featureU.ldapaif_name ); @@ -220,7 +220,7 @@ ULONG CDECL ldap_get_optionW( WLDAP32_LDAP *ld, int option, void *value ) memset( &infoU, 0, sizeof(LDAPAPIInfo) ); infoU.ldapai_info_version = infoW->ldapai_info_version; - ret = map_error( ldap_get_option( ld, option, &infoU )); + ret = map_error( ldap_get_option( ld->ld, option, &infoU )); infoW->ldapai_api_version = infoU.ldapai_api_version; infoW->ldapai_protocol_version = infoU.ldapai_protocol_version; @@ -253,7 +253,7 @@ ULONG CDECL ldap_get_optionW( WLDAP32_LDAP *ld, int option, void *value ) case WLDAP32_LDAP_OPT_REFERRALS: case WLDAP32_LDAP_OPT_SIZELIMIT: case WLDAP32_LDAP_OPT_TIMELIMIT: - return map_error( ldap_get_option( ld, option, value )); + return map_error( ldap_get_option( ld->ld, option, value )); case WLDAP32_LDAP_OPT_CACHE_ENABLE: case WLDAP32_LDAP_OPT_CACHE_FN_PTRS: @@ -433,7 +433,7 @@ 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, option, ctrlsU )); + ret = map_error( ldap_set_option( ld->ld, option, ctrlsU )); controlarrayfreeU( ctrlsU ); return ret; } @@ -444,7 +444,7 @@ ULONG CDECL ldap_set_optionW( WLDAP32_LDAP *ld, int option, void *value ) case WLDAP32_LDAP_OPT_REFERRALS: case WLDAP32_LDAP_OPT_SIZELIMIT: case WLDAP32_LDAP_OPT_TIMELIMIT: - return map_error( ldap_set_option( ld, option, value )); + return map_error( ldap_set_option( ld->ld, option, value )); case WLDAP32_LDAP_OPT_CACHE_ENABLE: case WLDAP32_LDAP_OPT_CACHE_FN_PTRS: diff --git a/dlls/wldap32/parse.c b/dlls/wldap32/parse.c index 88464a3b13..6bde8542be 100644 --- a/dlls/wldap32/parse.c +++ b/dlls/wldap32/parse.c @@ -99,7 +99,7 @@ ULONG CDECL ldap_parse_extended_resultW( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage * if (!ld) return WLDAP32_LDAP_PARAM_ERROR; if (!result) return WLDAP32_LDAP_NO_RESULTS_RETURNED; - ret = map_error( ldap_parse_extended_result( ld, result, &oidU, (struct berval **)data, free ) ); + ret = map_error( ldap_parse_extended_result( ld->ld, result, &oidU, (struct berval **)data, free ) ); if (oid) { *oid = strUtoW( oidU ); @@ -163,8 +163,8 @@ ULONG CDECL ldap_parse_referenceW( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *messag TRACE( "(%p, %p, %p)\n", ld, message, referrals ); if (!ld) return ~0u; - - ret = map_error( ldap_parse_reference( ld, message, &referralsU, NULL, 0 )); + + ret = map_error( ldap_parse_reference( ld->ld, message, &referralsU, NULL, 0 )); *referrals = strarrayUtoW( referralsU ); ldap_memfree( referralsU ); @@ -249,7 +249,7 @@ ULONG CDECL ldap_parse_resultW( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *result, if (!ld) return WLDAP32_LDAP_PARAM_ERROR; - ret = map_error( ldap_parse_result( ld, result, (int *)retcode, &matchedU, &errorU, + ret = map_error( ldap_parse_result( ld->ld, result, (int *)retcode, &matchedU, &errorU, &referralsU, &serverctrlsU, free )); if (matched) *matched = strUtoW( matchedU ); @@ -339,7 +339,7 @@ ULONG CDECL ldap_parse_sort_controlW( WLDAP32_LDAP *ld, PLDAPControlW *control, if (!controlU) return WLDAP32_LDAP_NO_MEMORY; #ifdef HAVE_LDAP_PARSE_SORT_CONTROL - if (!(ret = ldap_parse_sort_control( ld, controlU, &res, &attrU ))) + if (!(ret = ldap_parse_sort_control( ld->ld, controlU, &res, &attrU ))) { *result = res; *attr = strUtoW( attrU ); @@ -355,7 +355,7 @@ ULONG CDECL ldap_parse_sort_controlW( WLDAP32_LDAP *ld, PLDAPControlW *control, controlarrayfreeU( controlU ); return WLDAP32_LDAP_CONTROL_NOT_FOUND; } - if (!(ret = ldap_parse_sortresponse_control( ld, sortcontrol, &res, &attrU ))) + if (!(ret = ldap_parse_sortresponse_control( ld->ld, sortcontrol, &res, &attrU ))) { *result = res; *attr = strUtoW( attrU ); @@ -443,7 +443,7 @@ INT CDECL ldap_parse_vlv_controlW( WLDAP32_LDAP *ld, PLDAPControlW *control, if (!controlU) return WLDAP32_LDAP_NO_MEMORY; #ifdef HAVE_LDAP_PARSE_VLV_CONTROL - if (!(ret = ldap_parse_vlv_control( ld, controlU, &pos, &count, + if (!(ret = ldap_parse_vlv_control( ld->ld, controlU, &pos, &count, (struct berval **)context, errcode ))) { *targetpos = pos; @@ -460,7 +460,7 @@ INT CDECL ldap_parse_vlv_controlW( WLDAP32_LDAP *ld, PLDAPControlW *control, controlarrayfreeU( controlU ); return WLDAP32_LDAP_CONTROL_NOT_FOUND; } - if (!(ret = ldap_parse_vlvresponse_control( ld, vlvcontrol, &pos, &count, + if (!(ret = ldap_parse_vlvresponse_control( ld->ld, vlvcontrol, &pos, &count, (struct berval **)context, errcode ))) { *targetpos = pos; diff --git a/dlls/wldap32/rename.c b/dlls/wldap32/rename.c index f8cac439a9..b978daa8ab 100644 --- a/dlls/wldap32/rename.c +++ b/dlls/wldap32/rename.c @@ -157,7 +157,7 @@ ULONG CDECL ldap_rename_extW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR newrdn, if (!clientctrlsU) goto exit; } - ret = map_error( ldap_rename( ld, dn ? dnU : "", newrdn ? newrdnU : "", newparentU, + ret = map_error( ldap_rename( ld->ld, dn ? dnU : "", newrdn ? newrdnU : "", newparentU, delete, serverctrlsU, clientctrlsU, (int *)message )); exit: @@ -283,7 +283,7 @@ ULONG CDECL ldap_rename_ext_sW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR newrdn, if (!clientctrlsU) goto exit; } - ret = map_error( ldap_rename_s( ld, dn ? dnU : "", newrdn ? newrdnU : "", newparentU, + ret = map_error( ldap_rename_s( ld->ld, dn ? dnU : "", newrdn ? newrdnU : "", newparentU, delete, serverctrlsU, clientctrlsU )); exit: diff --git a/dlls/wldap32/search.c b/dlls/wldap32/search.c index f3d3eb48d4..88ecb541c9 100644 --- a/dlls/wldap32/search.c +++ b/dlls/wldap32/search.c @@ -132,7 +132,7 @@ ULONG CDECL ldap_searchW( WLDAP32_LDAP *ld, PWCHAR base, ULONG scope, PWCHAR fil if (!attrsU) goto exit; } - ret = ldap_search_ext( ld, baseU, scope, filterU, attrsU, attrsonly, + ret = ldap_search_ext( ld->ld, baseU, scope, filterU, attrsU, attrsonly, NULL, NULL, NULL, 0, &msg ); if (ret == LDAP_SUCCESS) @@ -281,7 +281,7 @@ ULONG CDECL ldap_search_extW( WLDAP32_LDAP *ld, PWCHAR base, ULONG scope, tvp = &tv; } - ret = map_error( ldap_search_ext( ld, baseU, scope, filterU, attrsU, attrsonly, + ret = map_error( ldap_search_ext( ld->ld, baseU, scope, filterU, attrsU, attrsonly, serverctrlsU, clientctrlsU, tvp, sizelimit, (int *)message )); exit: @@ -416,7 +416,7 @@ ULONG CDECL ldap_search_ext_sW( WLDAP32_LDAP *ld, PWCHAR base, ULONG scope, if (!clientctrlsU) goto exit; } - ret = map_error( ldap_search_ext_s( ld, baseU, scope, filterU, attrsU, attrsonly, + ret = map_error( ldap_search_ext_s( ld->ld, baseU, scope, filterU, attrsU, attrsonly, serverctrlsU, clientctrlsU, (struct timeval *)timeout, sizelimit, res )); @@ -523,7 +523,7 @@ ULONG CDECL ldap_search_sW( WLDAP32_LDAP *ld, PWCHAR base, ULONG scope, PWCHAR f if (!attrsU) goto exit; } - ret = map_error( ldap_search_ext_s( ld, baseU, scope, filterU, attrsU, attrsonly, + ret = map_error( ldap_search_ext_s( ld->ld, baseU, scope, filterU, attrsU, attrsonly, NULL, NULL, NULL, 0, res )); exit: @@ -633,7 +633,7 @@ ULONG CDECL ldap_search_stW( WLDAP32_LDAP *ld, const PWCHAR base, ULONG scope, if (!attrsU) goto exit; } - ret = map_error( ldap_search_ext_s( ld, baseU, scope, filterU, attrsU, attrsonly, + ret = map_error( ldap_search_ext_s( ld->ld, baseU, scope, filterU, attrsU, attrsonly, NULL, NULL, (struct timeval *)timeout, 0, res )); exit: diff --git a/dlls/wldap32/value.c b/dlls/wldap32/value.c index 4e1701c926..ff13289b30 100644 --- a/dlls/wldap32/value.c +++ b/dlls/wldap32/value.c @@ -228,7 +228,7 @@ PWCHAR * CDECL ldap_get_valuesW( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry, P attrU = strWtoU( attr ); if (!attrU) return NULL; - bv = ldap_get_values_len( ld, entry, attrU ); + bv = ldap_get_values_len( ld->ld, entry, attrU ); if (bv) { retU = bv2str_array( bv ); @@ -305,7 +305,7 @@ struct WLDAP32_berval ** CDECL ldap_get_values_lenW( WLDAP32_LDAP *ld, attrU = strWtoU( attr ); if (!attrU) return NULL; - ret = ldap_get_values_len( ld, message, attrU ); + ret = ldap_get_values_len( ld->ld, message, attrU ); strfreeU( attrU ); return (struct WLDAP32_berval **)ret; diff --git a/dlls/wldap32/winldap_private.h b/dlls/wldap32/winldap_private.h index df257dafec..0332deafa2 100644 --- a/dlls/wldap32/winldap_private.h +++ b/dlls/wldap32/winldap_private.h @@ -103,8 +103,11 @@ typedef struct berelement #define WLDAP32_LDAP_AUTH_NEGOTIATE 0x486 -typedef struct ldap +typedef struct wldap32 { +#ifdef HAVE_LDAP + LDAP *ld; +#endif struct { UINT_PTR sb_sd; -- 2.25.1

1 0

[PATCH 1/3] wldap32/tests: Test setting a not supported server control.
by Dmitry Timoshkov 03 Apr '20

03 Apr '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wldap32/tests/parse.c | 51 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c index d96ae654bf..c2435809d2 100644 --- a/dlls/wldap32/tests/parse.c +++ b/dlls/wldap32/tests/parse.c @@ -31,6 +31,10 @@ #define LDAP_AUTH_SIMPLE 0x80 #endif +#ifndef LDAP_OPT_SERVER_CONTROLS +#define LDAP_OPT_SERVER_CONTROLS 0x0012 +#endif + static void test_ldap_parse_sort_control( LDAP *ld ) { ULONG ret, result; @@ -164,10 +168,57 @@ static void test_ldap_bind_sA( void ) ldap_unbind( ld ); } +static void test_ldap_server_control( void ) +{ + /* SEQUENCE { INTEGER :: 0x07 } */ + static char mask_ber[5] = {0x30,0x03,0x02,0x01,0x07}; + LDAP *ld; + ULONG ret; + int version; + LDAPControlW *ctrls[2], mask; + LDAPMessage *res; + + ld = ldap_initA( (char *)"ldap.forumsys.com", 389 ); + ok( ld != NULL, "ldap_init failed\n" ); + + version = LDAP_VERSION3; + ret = ldap_set_optionW( ld, LDAP_OPT_PROTOCOL_VERSION, &version ); + if (ret == LDAP_SERVER_DOWN || ret == LDAP_UNAVAILABLE) + { + skip( "test server can't be reached\n" ); + ldap_unbind( ld ); + return; + } + + ret = ldap_connect( ld, NULL ); + ok( !ret, "ldap_connect failed 0x%08x\n", ret ); + + /* test setting a not supported server control */ + mask.ldctl_oid = (WCHAR *)L"1.2.840.113556.1.4.801"; + mask.ldctl_iscritical = TRUE; + mask.ldctl_value.bv_val = mask_ber; + mask.ldctl_value.bv_len = sizeof(mask_ber); + 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" ); + + ldap_msgfree( res ); + ldap_unbind( ld ); +} + START_TEST (parse) { LDAP *ld; + test_ldap_server_control(); test_ldap_bind_sA(); ld = ldap_initA((char *)"ldap.itd.umich.edu", 389 ); -- 2.25.1

1 0

[PATCH 1/5] quartz: Return void from basic_video_init().
by Zebediah Figura 03 Apr '20

03 Apr '20

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/quartz_private.h | 2 +- dlls/quartz/video.c | 4 +--- dlls/quartz/videorenderer.c | 4 +--- dlls/quartz/vmr9.c | 4 +--- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index 946daeb4848..8563edeaae3 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -214,7 +214,7 @@ typedef struct BaseControlVideoFuncTable BaseControlVideo_SetTargetRect pfnSetTargetRect; } BaseControlVideoFuncTable; -HRESULT basic_video_init(BaseControlVideo *video, struct strmbase_filter *filter, +void basic_video_init(BaseControlVideo *video, struct strmbase_filter *filter, struct strmbase_pin *pin, const BaseControlVideoFuncTable *func_table) DECLSPEC_HIDDEN; HRESULT WINAPI BaseControlVideo_Destroy(BaseControlVideo *pControlVideo) DECLSPEC_HIDDEN; diff --git a/dlls/quartz/video.c b/dlls/quartz/video.c index f59c2dee0cc..0f400df4812 100644 --- a/dlls/quartz/video.c +++ b/dlls/quartz/video.c @@ -647,13 +647,11 @@ static const IBasicVideoVtbl basic_video_vtbl = basic_video_IsUsingDefaultDestination }; -HRESULT basic_video_init(BaseControlVideo *video, struct strmbase_filter *filter, +void basic_video_init(BaseControlVideo *video, struct strmbase_filter *filter, struct strmbase_pin *pin, const BaseControlVideoFuncTable *func_table) { video->IBasicVideo_iface.lpVtbl = &basic_video_vtbl; video->pFilter = filter; video->pPin = pin; video->pFuncsTable = func_table; - - return S_OK; } diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 73c23603f84..cdb496ba298 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -716,10 +716,8 @@ HRESULT video_renderer_create(IUnknown *outer, IUnknown **out) if (FAILED(hr)) goto fail; - hr = basic_video_init(&object->baseControlVideo, &object->renderer.filter, + basic_video_init(&object->baseControlVideo, &object->renderer.filter, &object->renderer.sink.pin, &renderer_BaseControlVideoFuncTable); - if (FAILED(hr)) - goto fail; if (FAILED(hr = BaseWindowImpl_PrepareWindow(&object->baseControlWindow.baseWindow))) goto fail; diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 07a3dbc241b..bdf709cafcb 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -2326,10 +2326,8 @@ static HRESULT vmr_create(IUnknown *outer, IUnknown **out, const CLSID *clsid) if (FAILED(hr = BaseWindowImpl_PrepareWindow(&object->baseControlWindow.baseWindow))) goto fail; - hr = basic_video_init(&object->baseControlVideo, &object->renderer.filter, + basic_video_init(&object->baseControlVideo, &object->renderer.filter, &object->renderer.sink.pin, &renderer_BaseControlVideoFuncTable); - if (FAILED(hr)) - goto fail; object->run_event = CreateEventW(NULL, TRUE, FALSE, NULL); -- 2.26.0

1 4

[PATCH v2] d3dx9_36: Support D3DFMT_P8 for DDS files
by Alistair Leslie-Hughes 03 Apr '20

03 Apr '20

Test image is of my own creation. Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=48731 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/d3dx9_36/surface.c | 12 +++++ dlls/d3dx9_36/tests/surface.c | 92 +++++++++++++++++++++++++++++++++++ 2 files changed, 104 insertions(+) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 42e7bf16f1..49a1b871bb 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -108,6 +108,7 @@ static const GUID *d3dformat_to_wic_guid(D3DFORMAT format) #define DDS_PF_ALPHA 0x1 #define DDS_PF_ALPHA_ONLY 0x2 #define DDS_PF_FOURCC 0x4 +#define DDS_PF_INDEXED 0x20 #define DDS_PF_RGB 0x40 #define DDS_PF_YUV 0x200 #define DDS_PF_LUMINANCE 0x20000 @@ -349,6 +350,15 @@ static D3DFORMAT dds_alpha_to_d3dformat(const struct dds_pixel_format *pixel_for return D3DFMT_UNKNOWN; } +static D3DFORMAT dds_palette_to_d3dformat(const struct dds_pixel_format *pixel_format) +{ + if (pixel_format->bpp == 8) + return D3DFMT_P8; + + WARN("Unknown palette pixel format (%u).\n", pixel_format->bpp); + return D3DFMT_UNKNOWN; +} + static D3DFORMAT dds_bump_to_d3dformat(const struct dds_pixel_format *pixel_format) { if (pixel_format->bpp == 16 && pixel_format->rmask == 0x00ff && pixel_format->gmask == 0xff00) @@ -381,6 +391,8 @@ static D3DFORMAT dds_pixel_format_to_d3dformat(const struct dds_pixel_format *pi if (pixel_format->flags & DDS_PF_FOURCC) return dds_fourcc_to_d3dformat(pixel_format->fourcc); + if (pixel_format->flags & DDS_PF_INDEXED) + return dds_palette_to_d3dformat(pixel_format); if (pixel_format->flags & DDS_PF_RGB) return dds_rgb_to_d3dformat(pixel_format); if (pixel_format->flags & DDS_PF_LUMINANCE) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index d5d3d6d211..e9b9e04178 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -107,6 +107,87 @@ static const unsigned char noimage[4] = { 0x11,0x22,0x33,0x44 }; +/* 16x4 8-bit dds */ +static const unsigned char dds_8bit[] = +{ + 0x44,0x44,0x53,0x20,0x7c,0x00,0x00,0x00,0x0f,0x10,0x00,0x00,0x04,0x00,0x00,0x00, + 0x10,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00, + 0x47,0x49,0x4d,0x50,0x2d,0x44,0x44,0x53,0x5a,0x09,0x03,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00, + 0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0x8c,0xcd,0x12,0xff, + 0x78,0x01,0x14,0xff,0x50,0xcd,0x12,0xff,0x00,0x3d,0x8c,0xff,0x02,0x00,0x00,0xff, + 0x47,0x00,0x00,0xff,0xda,0x07,0x02,0xff,0x50,0xce,0x12,0xff,0xea,0x11,0x01,0xff, + 0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x08,0x3d,0x8c,0xff,0x08,0x01,0x00,0xff, + 0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x60,0xcc,0x12,0xff, + 0xa1,0xb2,0xd4,0xff,0xda,0x07,0x02,0xff,0x47,0x00,0x00,0xff,0x00,0x00,0x00,0xff, + 0x50,0xce,0x12,0xff,0x00,0x00,0x14,0xff,0xa8,0xcc,0x12,0xff,0x3c,0xb2,0xd4,0xff, + 0xda,0x07,0x02,0xff,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x00,0x00,0x01,0xff, + 0x21,0x00,0x00,0xff,0xd8,0xcb,0x12,0xff,0x54,0xcd,0x12,0xff,0x8b,0x4f,0xd5,0xff, + 0x00,0x04,0xda,0xff,0x00,0x00,0x00,0xff,0x3d,0x04,0x91,0xff,0x70,0xce,0x18,0xff, + 0xb4,0xcc,0x12,0xff,0x6b,0x4e,0xd5,0xff,0xb0,0xcc,0x12,0xff,0x00,0x00,0x00,0xff, + 0xc8,0x05,0x91,0xff,0x98,0xc7,0xcc,0xff,0x7c,0xcd,0x12,0xff,0x51,0x05,0x91,0xff, + 0x48,0x07,0x14,0xff,0x6d,0x05,0x91,0xff,0x00,0x07,0xda,0xff,0xa0,0xc7,0xcc,0xff, + 0x00,0x07,0xda,0xff,0x3a,0x77,0xd5,0xff,0xda,0x07,0x02,0xff,0x7c,0x94,0xd4,0xff, + 0xe0,0xce,0xd6,0xff,0x0a,0x80,0x00,0xff,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff, + 0x78,0x9a,0xab,0xff,0xde,0x08,0x18,0xff,0xda,0x07,0x02,0xff,0x30,0x00,0x00,0xff, + 0x00,0x00,0x00,0xff,0x50,0xce,0x12,0xff,0x8c,0xcd,0x12,0xff,0xd0,0xb7,0xd8,0xff, + 0x00,0x00,0x00,0xff,0x60,0x32,0xd9,0xff,0x30,0xc1,0x1a,0xff,0xa8,0xcd,0x12,0xff, + 0xa4,0xcd,0x12,0xff,0xc0,0x1d,0x4b,0xff,0x46,0x71,0x0e,0xff,0xc0,0x1d,0x4b,0xff, + 0x09,0x87,0xd4,0xff,0x00,0x00,0x00,0xff,0xf6,0x22,0x00,0xff,0x64,0xcd,0x12,0xff, + 0x00,0x00,0x00,0xff,0xca,0x1d,0x4b,0xff,0x09,0x87,0xd4,0xff,0xaa,0x02,0x05,0xff, + 0x82,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0xc0,0x1d,0x4b,0xff, + 0xcd,0xab,0xba,0xff,0x00,0x00,0x00,0xff,0xa4,0xcd,0x12,0xff,0xc0,0x1d,0x4b,0xff, + 0xd4,0xcd,0x12,0xff,0xa6,0x4c,0xd5,0xff,0x00,0xf0,0xfd,0xff,0xd4,0xcd,0x12,0xff, + 0xf4,0x4c,0xd5,0xff,0x90,0xcd,0x12,0xff,0xc2,0x4c,0xd5,0xff,0x82,0x00,0x00,0xff, + 0xaa,0x02,0x05,0xff,0x88,0xd4,0xba,0xff,0x14,0x00,0x00,0xff,0x01,0x00,0x00,0xff, + 0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x10,0x00,0x00,0xff,0x00,0x00,0x00,0xff, + 0x0c,0x08,0x13,0xff,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff, + 0xd0,0xcd,0x12,0xff,0xc6,0x84,0xf1,0xff,0x7c,0x84,0xf1,0xff,0x20,0x20,0xf5,0xff, + 0x00,0x00,0x0a,0xff,0xf0,0xb0,0x94,0xff,0x64,0x6c,0xf1,0xff,0x85,0x6c,0xf1,0xff, + 0x8b,0x4f,0xd5,0xff,0x00,0x04,0xda,0xff,0x88,0xd4,0xba,0xff,0x82,0x00,0x00,0xff, + 0x39,0xde,0xd4,0xff,0x10,0x50,0xd5,0xff,0xaa,0x02,0x05,0xff,0x00,0x00,0x00,0xff, + 0x4f,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x5c,0xce,0x12,0xff,0x00,0x00,0x00,0xff, + 0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x5c,0xce,0x12,0xff, + 0xaa,0x02,0x05,0xff,0x4c,0xce,0x12,0xff,0x39,0xe6,0xd4,0xff,0x00,0x00,0x00,0xff, + 0x82,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x5b,0xe6,0xd4,0xff,0x00,0x00,0x00,0xff, + 0x00,0x00,0x00,0xff,0x68,0x50,0xcd,0xff,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff, + 0x00,0x00,0x00,0xff,0x10,0x00,0x00,0xff,0xe3,0xea,0x90,0xff,0x5c,0xce,0x12,0xff, + 0x18,0x00,0x00,0xff,0x88,0xd4,0xba,0xff,0x82,0x00,0x00,0xff,0x00,0x00,0x00,0xff, + 0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, + 0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, + 0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, + 0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01 +}; + /* 2x2 24-bit dds, 2 mipmaps */ static const unsigned char dds_24bit[] = { 0x44,0x44,0x53,0x20,0x7c,0x00,0x00,0x00,0x07,0x10,0x0a,0x00,0x02,0x00,0x00,0x00, @@ -650,6 +731,17 @@ static void test_D3DXGetImageInfo(void) ok(info.ImageFileFormat == D3DXIFF_DDS, "Got image file format %#x, expected %#x\n", info.ImageFileFormat, D3DXIFF_DDS); } else skip("Couldn't get image info from 16-bit DDS file in memory\n"); + memset(&info, 0, sizeof(info)); + hr = D3DXGetImageInfoFromFileInMemory(dds_8bit, sizeof(dds_8bit), &info); + ok(hr == D3D_OK, "D3DXGetImageInfoFromFileInMemory returned %#x\n", hr); + ok(info.Width == 16, "Got width %u.\n", info.Width); + ok(info.Height == 4, "Got height %u.\n", info.Height); + ok(info.Depth == 1, "Got depth %u.\n", info.Depth); + ok(info.MipLevels == 1, "Got miplevels %u.\n", info.MipLevels); + ok(info.Format == D3DFMT_P8, "Got format %#x.\n", info.Format); + ok(info.ResourceType == D3DRTYPE_TEXTURE, "Got resource type %#x.\n", info.ResourceType); + ok(info.ImageFileFormat == D3DXIFF_DDS, "Got image file format %#x.\n", info.ImageFileFormat); + hr = D3DXGetImageInfoFromFileInMemory(dds_cube_map, sizeof(dds_cube_map), &info); ok(hr == D3D_OK, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); if (hr == D3D_OK) { -- 2.25.1

1 0

[PATCH] msvfw32: Fix a debug trace.
by Zebediah Figura 02 Apr '20

02 Apr '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msvfw32/msvideo_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index 346dbade43..e3a3300e5a 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -322,7 +322,7 @@ BOOL VFWAPI ICInfo(DWORD type, DWORD handler, ICINFO *info) info->fccType = ret_type; info->fccHandler = ret_handler; MultiByteToWideChar(CP_ACP, 0, s + 10, -1, info->szDriver, ARRAY_SIZE(info->szDriver)); - TRACE("Returning codec %s, driver %s.\n", debugstr_an(s, 8), debugstr_a(s + 10)); + TRACE("Returning codec %s, driver %s.\n", debugstr_an(s, 9), debugstr_a(s + 10)); return TRUE; } } -- 2.26.0

1 0

[PATCH] ntdll: Synchronize ZwSetLdtEntries spec entry with NtSetLdtEntries.
by Zebediah Figura 02 Apr '20

02 Apr '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/ntdll.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index e766523d4b..a43e419ab8 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1350,7 +1350,7 @@ @ stdcall -private ZwSetInformationToken(long long ptr long) NtSetInformationToken @ stdcall -private ZwSetIntervalProfile(long long) NtSetIntervalProfile @ stdcall -private ZwSetIoCompletion(ptr long long long long) NtSetIoCompletion -@ stdcall -private ZwSetLdtEntries(long long long long long long) NtSetLdtEntries +@ stdcall -private ZwSetLdtEntries(long int64 long int64) NtSetLdtEntries @ stub ZwSetLowEventPair @ stub ZwSetLowWaitHighEventPair @ stub ZwSetLowWaitHighThread -- 2.26.0

1 0

[PATCH v3 1/3] mf/tests: Sink objects are stream sinks, not media sinks.
by Sergio Gómez Del Real 02 Apr '20

02 Apr '20

Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> --- dlls/mf/tests/mf.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index dfbd928f60..6f225745d6 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1246,6 +1246,7 @@ static void test_topology_loader(void) IMFPresentationDescriptor *pd; IMFSourceResolver *resolver; IMFActivate *sink_activate; + IMFStreamSink *stream_sink; unsigned int count, value; IMFMediaType *media_type; IMFStreamDescriptor *sd; @@ -1358,7 +1359,10 @@ todo_wine hr = IMFActivate_ActivateObject(sink_activate, &IID_IMFMediaSink, (void **)&sink); ok(hr == S_OK, "Failed to activate, hr %#x.\n", hr); - hr = IMFTopologyNode_SetObject(sink_node, (IUnknown *)sink); + hr = IMFMediaSink_GetStreamSinkByIndex(sink, 0, &stream_sink); + ok(hr == S_OK, "Failed to get stream sink, hr %#x.\n", hr); + + hr = IMFTopologyNode_SetObject(sink_node, (IUnknown *)stream_sink); ok(hr == S_OK, "Failed to set object, hr %#x.\n", hr); hr = IMFTopology_GetCount(topology, &count); @@ -1366,7 +1370,6 @@ todo_wine ok(count == 0, "Unexpected count %u.\n", count); hr = IMFTopoLoader_Load(loader, topology, &full_topology, NULL); -todo_wine ok(hr == S_OK, "Failed to resolve topology, hr %#x.\n", hr); ok(full_topology != topology, "Unexpected instance.\n"); -- 2.17.1

4 7