Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-17 19:27:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WLDAP32] Sync with Wine Staging 4.18. CORE-16441

Browse source
This commit is contained in:
Amine Khaldi 2019-12-07 13:09:39 +01:00
parent cb01e5ecac
commit 6b9bd93fe6
5 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dll/win32/wldap32/error.c
View file

@ -303,7 +303,7 @@ ULONG CDECL LdapMapErrorToWin32( ULONG err )
{ {
TRACE( "(0x%08x)\n", err ); TRACE( "(0x%08x)\n", err );
if (err >= sizeof(WLDAP32_errormap)/sizeof(WLDAP32_errormap[0])) if (err >= ARRAY_SIZE( WLDAP32_errormap ))
return ERROR_DS_GENERIC_ERROR; return ERROR_DS_GENERIC_ERROR;
return WLDAP32_errormap[err]; return WLDAP32_errormap[err];
} }

9
dll/win32/wldap32/init.c
View file

@ -30,6 +30,7 @@
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winnls.h" #include "winnls.h"
#include "wine/winternl.h"
#include "winldap_private.h" #include "winldap_private.h"
#include "wldap32.h" #include "wldap32.h"
@ -114,10 +115,10 @@ oom:
/* Determine if a URL starts with a known LDAP scheme */ /* Determine if a URL starts with a known LDAP scheme */
static BOOL has_ldap_scheme( char *url ) static BOOL has_ldap_scheme( char *url )
{ {
return !strncasecmp( url, "ldap://", 7 ) || return !_strnicmp( url, "ldap://", 7 ) ||
!strncasecmp( url, "ldaps://", 8 ) || !_strnicmp( url, "ldaps://", 8 ) ||
!strncasecmp( url, "ldapi://", 8 ) || !_strnicmp( url, "ldapi://", 8 ) ||
!strncasecmp( url, "cldap://", 8 ); !_strnicmp( url, "cldap://", 8 );
} }
/* Flatten an array of hostnames into a space separated string of URLs. /* Flatten an array of hostnames into a space separated string of URLs.

2
dll/win32/wldap32/parse.c
View file

@ -258,7 +258,7 @@ ULONG CDECL ldap_parse_resultW( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *result,
ldap_memfree( matchedU ); ldap_memfree( matchedU );
ldap_memfree( errorU ); ldap_memfree( errorU );
strarrayfreeU( referralsU ); ldap_memvfree( (void **)referralsU );
ldap_controls_free( serverctrlsU ); ldap_controls_free( serverctrlsU );
#endif #endif

18
dll/win32/wldap32/winldap_private.h
View file

@ -191,16 +191,18 @@ typedef struct WLDAP32_berval
} LDAP_BERVAL, *PLDAP_BERVAL, BERVAL, *PBERVAL, WLDAP32_BerValue; } LDAP_BERVAL, *PLDAP_BERVAL, BERVAL, *PBERVAL, WLDAP32_BerValue;
#define LDAP_PAGED_RESULT_OID_STRING "1.2.840.113556.1.4.319" #define LDAP_PAGED_RESULT_OID_STRING "1.2.840.113556.1.4.319"
#define LDAP_PAGED_RESULT_OID_STRING_W (const WCHAR []){'1','.','2','.', \
'8','4','0','.','1','1','3','5','5','6','.','1','.','4','.','3','1','9',0}
#define LDAP_SERVER_RESP_SORT_OID "1.2.840.113556.1.4.474" #define LDAP_SERVER_RESP_SORT_OID "1.2.840.113556.1.4.474"
#define LDAP_SERVER_RESP_SORT_OID_W (const WCHAR []){'1','.','2','.', \
'8','4','0','.','1','1','3','5','5','6','.','1','.','4','.','4','7','4',0}
#define LDAP_CONTROL_VLVRESPONSE "2.16.840.1.113730.3.4.10" #define LDAP_CONTROL_VLVRESPONSE "2.16.840.1.113730.3.4.10"
#define LDAP_CONTROL_VLVRESPONSE_W (const WCHAR []){'2','.','1','6','.', \
'8','4','0','.','1','.','1','1','3','7','3','0','.','3','.','4','.','1','0',0} #if defined(_MSC_VER) || defined(__MINGW32__)
#define LDAP_PAGED_RESULT_OID_STRING_W L"1.2.840.113556.1.4.319"
#define LDAP_SERVER_RESP_SORT_OID_W L"1.2.840.113556.1.4.474"
#define LDAP_CONTROL_VLVRESPONSE_W L"2.16.840.1.113730.3.4.10"
#else
static const WCHAR LDAP_PAGED_RESULT_OID_STRING_W[] = {'1','.','2','.','8','4','0','.','1','1','3','5','5','6','.','1','.','4','.','3','1','9',0};
static const WCHAR LDAP_SERVER_RESP_SORT_OID_W[] = {'1','.','2','.','8','4','0','.','1','1','3','5','5','6','.','1','.','4','.','4','7','4',0};
static const WCHAR LDAP_CONTROL_VLVRESPONSE_W[] = {'2','.','1','6','.','8','4','0','.','1','.','1','1','3','7','3','0','.','3','.','4','.','1','0',0};
#endif
typedef struct ldapcontrolA typedef struct ldapcontrolA
{ {

2
media/doc/README.WINE
View file

@ -208,7 +208,7 @@ dll/win32/winmm/midimap # Forked at Wine-20050628
dll/win32/winmm/wavemap # Forked at Wine-20050628 dll/win32/winmm/wavemap # Forked at Wine-20050628
dll/win32/winscard # Synced to WineStaging-4.18 dll/win32/winscard # Synced to WineStaging-4.18
dll/win32/wintrust # Synced to WineStaging-4.18 dll/win32/wintrust # Synced to WineStaging-4.18
dll/win32/wldap32 # Synced to WineStaging-3.3 dll/win32/wldap32 # Synced to WineStaging-4.18
dll/win32/wmi # Synced to WineStaging-2.9 dll/win32/wmi # Synced to WineStaging-2.9
dll/win32/wmiutils # Synced to WineStaging-3.3 dll/win32/wmiutils # Synced to WineStaging-3.3
dll/win32/wmvcore # Synced to WineStaging-3.9 dll/win32/wmvcore # Synced to WineStaging-3.9