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

[PATCH v3 1/7] wldap32: Implement ldap_search_init_pageW.
by Dmitry Timoshkov 17 Apr '20

17 Apr '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wldap32/page.c | 64 ++++++++++++++++++++++++++++++- dlls/wldap32/winldap_private.h | 11 +++++- dlls/wldap32/wldap32.h | 70 +++++++++++++++++++++++++++++++++- 3 files changed, 140 insertions(+), 5 deletions(-) diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c index 7cf7d93245..d2d86e34af 100644 --- a/dlls/wldap32/page.c +++ b/dlls/wldap32/page.c @@ -281,7 +281,67 @@ PLDAPSearch CDECL ldap_search_init_pageW( WLDAP32_LDAP *ld, PWCHAR dn, ULONG sco PWCHAR filter, PWCHAR attrs[], ULONG attrsonly, PLDAPControlW *serverctrls, PLDAPControlW *clientctrls, ULONG timelimit, ULONG sizelimit, PLDAPSortKeyW *sortkeys ) { - FIXME( "(%p, %s, 0x%08x, %s, %p, 0x%08x)\n", ld, debugstr_w(dn), - scope, debugstr_w(filter), attrs, attrsonly ); +#ifdef HAVE_LDAP + LDAPSearch *search; + DWORD i, len; + + TRACE( "(%p, %s, 0x%08x, %s, %p, 0x%08x, %p, %p, 0x%08x, 0x%08x, %p)\n", + ld, debugstr_w(dn), scope, debugstr_w(filter), attrs, attrsonly, + serverctrls, clientctrls, timelimit, sizelimit, sortkeys ); + + search = heap_alloc_zero( sizeof(*search) ); + if (!search) + { + ld->ld_errno = WLDAP32_LDAP_NO_MEMORY; + return NULL; + } + + if (dn) + { + search->dn = strdupW( dn ); + if (!search->dn) goto fail; + } + if (filter) + { + search->filter = strdupW( filter ); + if (!search->filter) goto fail; + } + if (attrs) + { + search->attrs = strarraydupW( attrs ); + if (!search->attrs) goto fail; + } + + len = serverctrls ? controlarraylenW( serverctrls ) : 0; + search->serverctrls = heap_alloc( sizeof(LDAPControl *) * (len + 2) ); + if (!search->serverctrls) goto fail; + search->serverctrls[0] = NULL; /* reserve 0 for page control */ + for (i = 0; i < len; i++) + { + search->serverctrls[i + 1] = controldupW( serverctrls[i] ); + if (!search->serverctrls[i + 1]) goto fail; + } + search->serverctrls[len + 1] = NULL; + + if (clientctrls) + { + search->clientctrls = controlarraydupW( clientctrls ); + if (!search->clientctrls) goto fail; + } + + search->scope = scope; + search->attrsonly = attrsonly; + search->timeout.tv_sec = timelimit; + search->timeout.tv_usec = 0; + search->sizelimit = sizelimit; + search->cookie = NULL; + + return search; + +fail: + ldap_search_abandon_page( ld, search ); + ld->ld_errno = WLDAP32_LDAP_NO_MEMORY; + +#endif return NULL; } diff --git a/dlls/wldap32/winldap_private.h b/dlls/wldap32/winldap_private.h index 30c12a909c..6903505096 100644 --- a/dlls/wldap32/winldap_private.h +++ b/dlls/wldap32/winldap_private.h @@ -234,7 +234,16 @@ typedef struct WLDAP32_ldapvlvinfo VOID *ldvlv_extradata; } WLDAP32_LDAPVLVInfo, *WLDAP32_PLDAPVLVInfo; -typedef struct ldapsearch LDAPSearch, *PLDAPSearch; +typedef struct ldapsearch +{ + WCHAR *dn, *filter, **attrs; + ULONG scope, attrsonly; + LDAPControlW **serverctrls; + LDAPControlW **clientctrls; + struct l_timeval timeout; + ULONG sizelimit; + struct berval *cookie; +} LDAPSearch, *PLDAPSearch; typedef struct ldapsortkeyA { diff --git a/dlls/wldap32/wldap32.h b/dlls/wldap32/wldap32.h index c329a5b76b..537de67a87 100644 --- a/dlls/wldap32/wldap32.h +++ b/dlls/wldap32/wldap32.h @@ -241,6 +241,26 @@ static inline LPWSTR *strarrayUtoW( char **strarray ) return strarrayW; } +static inline LPWSTR *strarraydupW( LPWSTR *strarray ) +{ + LPWSTR *strarrayW = NULL; + DWORD size; + + if (strarray) + { + size = sizeof(WCHAR*) * (strarraylenW( strarray ) + 1); + if ((strarrayW = heap_alloc( size ))) + { + LPWSTR *p = strarray; + LPWSTR *q = strarrayW; + + while (*p) *q++ = strdupW( *p++ ); + *q = NULL; + } + } + return strarrayW; +} + static inline void strarrayfreeA( LPSTR *strarray ) { if (strarray) @@ -546,8 +566,34 @@ static inline LDAPControlW *controlUtoW( LDAPControl *control ) } controlW->ldctl_oid = strUtoW( control->ldctl_oid ); - controlW->ldctl_value.bv_len = len; - controlW->ldctl_value.bv_val = val; + controlW->ldctl_value.bv_len = len; + controlW->ldctl_value.bv_val = val; + controlW->ldctl_iscritical = control->ldctl_iscritical; + + return controlW; +} + +static inline LDAPControlW *controldupW( LDAPControlW *control ) +{ + LDAPControlW *controlW; + DWORD len = control->ldctl_value.bv_len; + char *val = NULL; + + if (control->ldctl_value.bv_val) + { + if (!(val = heap_alloc( len ))) return NULL; + memcpy( val, control->ldctl_value.bv_val, len ); + } + + if (!(controlW = heap_alloc( sizeof(LDAPControlW) ))) + { + heap_free( val ); + return NULL; + } + + controlW->ldctl_oid = strdupW( control->ldctl_oid ); + controlW->ldctl_value.bv_len = len; + controlW->ldctl_value.bv_val = val; controlW->ldctl_iscritical = control->ldctl_iscritical; return controlW; @@ -684,6 +730,26 @@ static inline LDAPControlW **controlarrayUtoW( LDAPControl **controlarray ) return controlarrayW; } +static inline LDAPControlW **controlarraydupW( LDAPControlW **controlarray ) +{ + LDAPControlW **controlarrayW = NULL; + DWORD size; + + if (controlarray) + { + size = sizeof(LDAPControlW*) * (controlarraylenW( controlarray ) + 1); + if ((controlarrayW = heap_alloc( size ))) + { + LDAPControlW **p = controlarray; + LDAPControlW **q = controlarrayW; + + while (*p) *q++ = controldupW( *p++ ); + *q = NULL; + } + } + return controlarrayW; +} + static inline void controlarrayfreeA( LDAPControlA **controlarray ) { if (controlarray) -- 2.25.2

1 0

[PATCH] comctl32/tests: Remove duplicate ImageList_DrawIndirect() tests.
by Ziqing Hui 17 Apr '20

17 Apr '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/comctl32/tests/imagelist.c | 4 ---- 1 file changed, 4 deletions(-)

2 1

[PATCH] d3d10: Remove superfluous TRUE : FALSE conditional expression
by Michael Stefaniuc 17 Apr '20

17 Apr '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d10/effect.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 04376efe9c..86ef50aac0 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -5337,7 +5337,7 @@ static void write_matrix_to_buffer(struct d3d10_effect_variable *variable, void { unsigned int col_count = !transpose ? variable->type->column_count : variable->type->row_count; unsigned int row_count = !transpose ? variable->type->row_count : variable->type->column_count; - BOOL major = variable->type->type_class == D3D10_SVC_MATRIX_COLUMNS ? TRUE : FALSE; + BOOL major = variable->type->type_class == D3D10_SVC_MATRIX_COLUMNS; float *dst = dst_void; unsigned int row, col; @@ -5415,7 +5415,7 @@ static void read_matrix_from_buffer(struct d3d10_effect_variable *variable, void { unsigned int col_count = !transpose ? variable->type->column_count : variable->type->row_count; unsigned int row_count = !transpose ? variable->type->row_count : variable->type->column_count; - BOOL major = variable->type->type_class == D3D10_SVC_MATRIX_COLUMNS ? TRUE : FALSE; + BOOL major = variable->type->type_class == D3D10_SVC_MATRIX_COLUMNS; float *src = src_void; unsigned int row, col; -- 2.25.2

2 1

[PATCH v2 3/3] windowscodecs/tests: Avoid using SUCCEEDED() and FAILED() in ddsformat.c
by Ziqing Hui 17 Apr '20

17 Apr '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)

1 0

[PATCH v2 2/3] windowscodecs: Implement global property functions for DdsDecoder.
by Ziqing Hui 17 Apr '20

17 Apr '20

v2: Fix a spell fault Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 20 +++++++++++--------- dlls/windowscodecs/tests/ddsformat.c | 6 +----- 2 files changed, 12 insertions(+), 14 deletions(-)

1 0

[PATCH 3/3] windowscodecs/tests: Avoid using SUCCEEDED() and FAILED() in ddsformat.c
by Ziqing Hui 17 Apr '20

17 Apr '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)

2 1

[PATCH 2/3] windowscodecs: Implement global property functions for DdsDecoder.
by Ziqing Hui 17 Apr '20

17 Apr '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 20 +++++++++++--------- dlls/windowscodecs/tests/ddsformat.c | 6 +----- 2 files changed, 12 insertions(+), 14 deletions(-)

2 1

[PATCH 1/3] windowscodecs/tests: Add tests for global properties of DdsDecoder.
by Ziqing Hui 17 Apr '20

17 Apr '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 44 ++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+)

1 0

[PATCH] kernelbase: Implement LoadAppInitDlls
by Alex Henrie 17 Apr '20

17 Apr '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47061 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- According to MSDN,[1] this feature does not work on Windows 8 and later when secure boot is enabled, so we don't need to bother with a real implementation. [1] https://docs.microsoft.com/en-us/windows/win32/dlls/secure-boot-and-appinit… --- .../api-ms-win-core-appinit-l1-1-0.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/loader.c | 9 +++++++++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-appinit-l1-1-0/api-ms-win-core-appinit-l1-1-0.spec b/dlls/api-ms-win-core-appinit-l1-1-0/api-ms-win-core-appinit-l1-1-0.spec index 7ace09e92c..e8f2acefad 100644 --- a/dlls/api-ms-win-core-appinit-l1-1-0/api-ms-win-core-appinit-l1-1-0.spec +++ b/dlls/api-ms-win-core-appinit-l1-1-0/api-ms-win-core-appinit-l1-1-0.spec @@ -1 +1 @@ -@ stub LoadAppInitDlls +@ stdcall LoadAppInitDlls() kernel32.LoadAppInitDlls diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 01bfdd37f1..86575c2b99 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1044,7 +1044,7 @@ @ stdcall LZStart() @ stdcall LeaveCriticalSection(ptr) ntdll.RtlLeaveCriticalSection @ stdcall LeaveCriticalSectionWhenCallbackReturns(ptr ptr) ntdll.TpCallbackLeaveCriticalSectionOnCompletion -# @ stub LoadAppInitDlls +@ stdcall -import LoadAppInitDlls() @ stdcall -import LoadLibraryA(str) @ stdcall -import LoadLibraryExA( str long long) @ stdcall -import LoadLibraryExW(wstr long long) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 631e5c02c7..fe687c132c 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -920,7 +920,7 @@ # @ stub LeaveCriticalPolicySectionInternal @ stdcall LeaveCriticalSection(ptr) ntdll.RtlLeaveCriticalSection @ stdcall LeaveCriticalSectionWhenCallbackReturns(ptr ptr) ntdll.TpCallbackLeaveCriticalSectionOnCompletion -# @ stub LoadAppInitDlls +@ stdcall LoadAppInitDlls() # @ stub LoadEnclaveData @ stdcall LoadLibraryA(str) @ stdcall LoadLibraryExA( str long long) diff --git a/dlls/kernelbase/loader.c b/dlls/kernelbase/loader.c index 59b775b844..db36873e73 100644 --- a/dlls/kernelbase/loader.c +++ b/dlls/kernelbase/loader.c @@ -544,6 +544,15 @@ HMODULE WINAPI /* DECLSPEC_HOTPATCH */ LoadPackagedLibrary( LPCWSTR name, DWORD } +/*********************************************************************** + * LoadAppInitDlls (kernelbase.@) + */ +void WINAPI LoadAppInitDlls( void ) +{ + TRACE( "\n" ); +} + + /**************************************************************************** * RemoveDllDirectory (kernelbase.@) */ -- 2.26.1

2 1

[PATCH v4 1/3] ntdll: Implement RtlIpv6StringToAddress(Ex)[AW]
by Alex Henrie 17 Apr '20

17 Apr '20

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v4: Update ntoskrnl.exe.spec --- dlls/ntdll/ntdll.spec | 6 +- dlls/ntdll/rtl.c | 221 ++++++++++++++++++++++++++-- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 6 +- 3 files changed, 216 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 4f5fa8c21d..b56a076b64 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -781,10 +781,10 @@ # @ stub RtlIpv6AddressToStringExA # @ stub RtlIpv6AddressToStringExW # @ stub RtlIpv6AddressToStringW -# @ stub RtlIpv6StringToAddressA -# @ stub RtlIpv6StringToAddressExA +@ stdcall RtlIpv6StringToAddressA(str ptr ptr) +@ stdcall RtlIpv6StringToAddressExA(str ptr ptr ptr) @ stdcall RtlIpv6StringToAddressExW(wstr ptr ptr ptr) -# @ stub RtlIpv6StringToAddressW +@ stdcall RtlIpv6StringToAddressW(wstr ptr ptr) @ stdcall RtlIsActivationContextActive(ptr) @ stdcall RtlIsCriticalSectionLocked(ptr) @ stdcall RtlIsCriticalSectionLockedByThread(ptr) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 64853369a3..a4e220bcf2 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -97,6 +97,16 @@ static const DWORD CRC_table[256] = 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d }; +static const int hex_table[] = { + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x00-0x0F */ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x10-0x1F */ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x20-0x2F */ + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1, -1, -1, -1, -1, -1, /* 0x30-0x3F */ + -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x40-0x4F */ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x50-0x5F */ + -1, 10, 11, 12, 13, 14, 15 /* 0x60-0x66 */ +}; + /* * resource functions */ @@ -885,15 +895,6 @@ void WINAPI RtlCopyLuidAndAttributesArray( static BOOL parse_ipv4_component(const WCHAR **str, BOOL strict, ULONG *value) { - static const int hex_table[] = { - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x00-0x0F */ - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x10-0x1F */ - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x20-0x2F */ - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1, -1, -1, -1, -1, -1, /* 0x30-0x3F */ - -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x40-0x4F */ - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x50-0x5F */ - -1, 10, 11, 12, 13, 14, 15 /* 0x60-0x66 */ - }; int base = 10, d; WCHAR c; ULONG cur_value, prev_value = 0; @@ -1073,13 +1074,211 @@ NTSTATUS WINAPI RtlIpv4StringToAddressA(const char *str, BOOLEAN strict, const c return ret; } +static BOOL parse_ipv6_component(const WCHAR **str, int base, ULONG *value) +{ + WCHAR *terminator; + if (**str >= ARRAY_SIZE(hex_table) || hex_table[**str] == -1) return FALSE; + *value = min(wcstoul(*str, &terminator, base), 0x7FFFFFFF); + if (*terminator == '0') terminator++; /* "0x" but nothing valid after */ + else if (terminator == *str) return FALSE; + *str = terminator; + return TRUE; +} + +static NTSTATUS ipv6_string_to_address(const WCHAR *str, BOOL ex, + const WCHAR **terminator, IN6_ADDR *address, ULONG *scope, USHORT *port) +{ + BOOL expecting_port = FALSE, has_0x = FALSE, too_big = FALSE; + int n_bytes = 0, n_ipv4_bytes = 0, gap = -1; + ULONG ip_component, scope_component = 0, port_component = 0; + const WCHAR *prev_str; + + if (str[0] == '[') + { + if (!ex) goto error; + expecting_port = TRUE; + str++; + } + + if (str[0] == ':') + { + if (str[1] != ':') goto error; + str++; + /* Windows bug: a double colon at the beginning is treated as 4 bytes of zeros instead of 2 */ + address->u.Word[0] = 0; + n_bytes = 2; + } + + for (;;) + { + if (!n_ipv4_bytes && *str == ':') + { + /* double colon */ + if (gap != -1) goto error; + str++; + prev_str = str; + gap = n_bytes; + if (n_bytes == 14 || !parse_ipv6_component(&str, 16, &ip_component)) break; + str = prev_str; + } + else + { + prev_str = str; + } + + if (!n_ipv4_bytes && n_bytes <= (gap != -1 ? 10 : 12)) + { + if (parse_ipv6_component(&str, 10, &ip_component) && *str == '.') + n_ipv4_bytes = 1; + str = prev_str; + } + + if (n_ipv4_bytes) + { + /* IPv4 component */ + if (!parse_ipv6_component(&str, 10, &ip_component)) goto error; + if (str - prev_str > 3 || ip_component > 255) + { + too_big = TRUE; + } + else + { + if (*str != '.' && (n_ipv4_bytes < 4 || (n_bytes < 15 && gap == -1))) goto error; + address->u.Byte[n_bytes] = ip_component; + n_bytes++; + } + if (n_ipv4_bytes == 4 || *str != '.') break; + n_ipv4_bytes++; + } + else + { + /* IPv6 component */ + if (!parse_ipv6_component(&str, 16, &ip_component)) goto error; + if (prev_str[0] == '0' && (prev_str[1] == 'x' || prev_str[1] == 'X')) + { + /* Windows "feature": the last IPv6 component can start with "0x" and be longer than 4 digits */ + if (terminator) *terminator = prev_str + 1; /* Windows says that the "x" is the terminator */ + if (n_bytes < 14 && gap == -1) return STATUS_INVALID_PARAMETER; + address->u.Word[n_bytes/2] = htons(ip_component); + n_bytes += 2; + has_0x = TRUE; + goto fill_gap; + } + if (*str != ':' && n_bytes < 14 && gap == -1) goto error; + if (str - prev_str > 4) + too_big = TRUE; + else + address->u.Word[n_bytes/2] = htons(ip_component); + n_bytes += 2; + if (*str != ':' || (gap != -1 && str[1] == ':')) break; + } + if (n_bytes == (gap != -1 ? 14 : 16)) break; + if (too_big) return STATUS_INVALID_PARAMETER; + str++; + } + + if (terminator) *terminator = str; + if (too_big) return STATUS_INVALID_PARAMETER; + +fill_gap: + if (gap == -1) + { + if (n_bytes < 16) goto error; + } + else + { + memmove(address->u.Byte + 16 - (n_bytes - gap), address->u.Byte + gap, n_bytes - gap); + memset(address->u.Byte + gap, 0, 16 - n_bytes); + } + + if (ex) + { + if (has_0x) goto error; + + if (*str == '%') + { + str++; + if (!parse_ipv4_component(&str, TRUE, &scope_component)) goto error; + } + + if (expecting_port) + { + if (*str != ']') goto error; + str++; + if (*str == ':') + { + str++; + if (!parse_ipv4_component(&str, FALSE, &port_component)) goto error; + if (!port_component || port_component > 0xFFFF || *str) goto error; + port_component = htons(port_component); + } + } + } + + if (!terminator && *str) return STATUS_INVALID_PARAMETER; + + if (scope) *scope = scope_component; + if (port) *port = port_component; + + return STATUS_SUCCESS; + +error: + if (terminator) *terminator = str; + return STATUS_INVALID_PARAMETER; +} + /*********************************************************************** * RtlIpv6StringToAddressExW [NTDLL.@] */ NTSTATUS NTAPI RtlIpv6StringToAddressExW(const WCHAR *str, IN6_ADDR *address, ULONG *scope, USHORT *port) { - FIXME("(%s, %p, %p, %p): stub\n", debugstr_w(str), address, scope, port); - return STATUS_NOT_IMPLEMENTED; + TRACE("(%s, %p, %p, %p)\n", debugstr_w(str), address, scope, port); + if (!str || !address || !scope || !port) return STATUS_INVALID_PARAMETER; + return ipv6_string_to_address(str, TRUE, NULL, address, scope, port); +} + +/*********************************************************************** + * RtlIpv6StringToAddressW [NTDLL.@] + */ +NTSTATUS WINAPI RtlIpv6StringToAddressW(const WCHAR *str, const WCHAR **terminator, IN6_ADDR *address) +{ + TRACE("(%s, %p, %p)\n", debugstr_w(str), terminator, address); + return ipv6_string_to_address(str, FALSE, terminator, address, NULL, NULL); +} + +/*********************************************************************** + * RtlIpv6StringToAddressExA [NTDLL.@] + */ +NTSTATUS WINAPI RtlIpv6StringToAddressExA(const char *str, IN6_ADDR *address, ULONG *scope, USHORT *port) +{ + WCHAR wstr[64]; + + TRACE("(%s, %p, %p, %p)\n", debugstr_a(str), address, scope, port); + + if (!str || !address || !scope || !port) + return STATUS_INVALID_PARAMETER; + + RtlMultiByteToUnicodeN(wstr, sizeof(wstr), NULL, str, strlen(str) + 1); + wstr[ARRAY_SIZE(wstr) - 1] = 0; + return ipv6_string_to_address(wstr, TRUE, NULL, address, scope, port); +} + +/*********************************************************************** + * RtlIpv6StringToAddressA [NTDLL.@] + */ +NTSTATUS WINAPI RtlIpv6StringToAddressA(const char *str, const char **terminator, IN6_ADDR *address) +{ + WCHAR wstr[64]; + const WCHAR *wterminator = NULL; + NTSTATUS ret; + + TRACE("(%s, %p, %p)\n", debugstr_a(str), terminator, address); + + RtlMultiByteToUnicodeN(wstr, sizeof(wstr), NULL, str, strlen(str) + 1); + wstr[ARRAY_SIZE(wstr) - 1] = 0; + ret = ipv6_string_to_address(wstr, FALSE, &wterminator, address, NULL, NULL); + if (terminator && wterminator) *terminator = str + (wterminator - wstr); + return ret; } /*********************************************************************** diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 40341d8f0c..598669f93d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1110,10 +1110,10 @@ @ stub RtlIpv6AddressToStringExA @ stub RtlIpv6AddressToStringExW @ stub RtlIpv6AddressToStringW -@ stub RtlIpv6StringToAddressA -@ stub RtlIpv6StringToAddressExA +@ stdcall RtlIpv6StringToAddressA(str ptr ptr) ntdll.RtlIpv6StringToAddressA +@ stdcall RtlIpv6StringToAddressExA(str ptr ptr ptr) ntdll.RtlIpv6StringToAddressExA @ stdcall RtlIpv6StringToAddressExW(wstr ptr ptr ptr) -@ stub RtlIpv6StringToAddressW +@ stdcall RtlIpv6StringToAddressW(wstr ptr ptr) ntdll.RtlIpv6StringToAddressW @ stub RtlIsGenericTableEmpty @ stub RtlIsGenericTableEmptyAvl @ stdcall RtlIsNameLegalDOS8Dot3(ptr ptr ptr) -- 2.26.1

1 0