[PATCH 0/1] MR1469: wldap32: Use the wcsdup function instead of reimplementing it.

[PATCH 1/1] wldap32: Use the wcsdup function instead of reimplementing it.

[Alex Henrie]

From: Alex Henrie

---
 dlls/wldap32/control.c         |  2 +-
 dlls/wldap32/page.c            |  4 ++--
 dlls/wldap32/winldap_private.h | 12 ++----------
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/dlls/wldap32/control.c b/dlls/wldap32/control.c
index 746ef6049ce..ba1cefe9a45 100644
--- a/dlls/wldap32/control.c
+++ b/dlls/wldap32/control.c
@@ -215,7 +215,7 @@ ULONG CDECL ldap_encode_sort_controlW( LDAP *ld, LDAPSortKeyW **sortkeys, LDAPCo

if ((result = ldap_create_sort_controlW( ld, sortkeys, critical, &control )) == WLDAP32_LDAP_SUCCESS)
     {
-        ret->ldctl_oid = strdupW(control->ldctl_oid);
+        ret->ldctl_oid = wcsdup( control->ldctl_oid );
         bv_val_dup( &control->ldctl_value, &ret->ldctl_value );
         ret->ldctl_iscritical = control->ldctl_iscritical;
         ldap_control_freeW( control );
diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c
index 7e066015d7e..64972b9829f 100644
--- a/dlls/wldap32/page.c
+++ b/dlls/wldap32/page.c
@@ -297,8 +297,8 @@ LDAPSearch * CDECL ldap_search_init_pageW( LDAP *ld, WCHAR *dn, ULONG scope, WCH
         return NULL;
     }

-    if (dn && !(search->dn = strdupW( dn ))) goto fail;
-    if (filter && !(search->filter = strdupW( filter ))) goto fail;
+    if (dn && !(search->dn = wcsdup( dn ))) goto fail;
+    if (filter && !(search->filter = wcsdup( filter ))) goto fail;
     if (attrs && !(search->attrs = strarraydupW( attrs ))) goto fail;

len = serverctrls ? controlarraylenW( serverctrls ) : 0;
diff --git a/dlls/wldap32/winldap_private.h b/dlls/wldap32/winldap_private.h
index 49114dcf4ba..886c7933e9f 100644
--- a/dlls/wldap32/winldap_private.h
+++ b/dlls/wldap32/winldap_private.h
@@ -542,14 +542,6 @@ static inline char *strdupU( const char *src )
     return dst;
 }

-static inline WCHAR *strdupW( const WCHAR *src )
-{
-    WCHAR *dst;
-    if (!src) return NULL;
-    if ((dst = malloc( (lstrlenW( src ) + 1) * sizeof(WCHAR) ))) lstrcpyW( dst, src );
-    return dst;
-}
-
 static inline char *strWtoU( const WCHAR *str )
 {
     char *ret = NULL;
@@ -652,7 +644,7 @@ static inline WCHAR **strarraydupW( WCHAR **strarray )
         {
             WCHAR **p = strarray, **q = ret;

-            while (*p) *q++ = strdupW( *p++ );
+            while (*p) *q++ = wcsdup( *p++ );
             *q = NULL;
         }
     }
@@ -1225,7 +1217,7 @@ static inline LDAPControlW *controldupW( LDAPControlW *control )
         return NULL;
     }

-    ret->ldctl_oid = strdupW( control->ldctl_oid );
+    ret->ldctl_oid = wcsdup( control->ldctl_oid );
     ret->ldctl_value.bv_len = len;
     ret->ldctl_value.bv_val = val;
     ret->ldctl_iscritical = control->ldctl_iscritical;

[PATCH 1/1] wldap32: Use the wcsdup function instead of reimplementing it.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=126531

Your paranoid android.

=== debian11 (32 bit report) ===

d3d8:
stateblock: Timeout
visual: Timeout

d3d9:
d3d9ex: Timeout
device: Timeout
stateblock: Timeout
visual: Timeout

d3dcompiler_43:
asm: Timeout
blob: Timeout
hlsl_d3d11: Timeout
hlsl_d3d9: Timeout
reflection: Timeout

d3dcompiler_46:
asm: Timeout
blob: Timeout
hlsl_d3d11: Timeout
hlsl_d3d9: Timeout
reflection: Timeout

d3dcompiler_47:
asm: Timeout
blob: Timeout
hlsl_d3d11: Timeout
hlsl_d3d9: Timeout
reflection: Timeout

d3drm:
d3drm: Timeout
vector: Timeout

Report validation errors:
d3dx10: Timeout

=== debian11 (build log) ===

WineRunWineTest.pl:error: The task timed out

[PATCH 0/1] MR1469: wldap32: Use the wcsdup function instead of reimplementing it. - approved

[Hans Leidekker (＠hans)]

This merge request was approved by Hans Leidekker.