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

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

[Alex Henrie]

From: Alex Henrie

---
 dlls/secur32/secur32.c | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c
index b14fc0e05b7..4875ce85651 100644
--- a/dlls/secur32/secur32.c
+++ b/dlls/secur32/secur32.c
@@ -174,13 +174,6 @@ PSecurityFunctionTableW WINAPI InitSecurityInterfaceW(void)
     return &securityFunctionTableW;
 }

-static WCHAR *strdupW( const WCHAR *str )
-{
-    WCHAR *ret = NULL;
-    if (str && (ret = malloc( (wcslen(str) + 1) * sizeof(WCHAR) ))) wcscpy( ret, str );
-    return ret;
-}
-
 static void _makeFnTableA(PSecurityFunctionTableA fnTableA,
  const SecurityFunctionTableA *inFnTableA,
  const SecurityFunctionTableW *inFnTableW)
@@ -345,8 +338,8 @@ static void _copyPackageInfo(PSecPkgInfoW info, const SecPkgInfoA *inInfoA,
         memcpy(info, inInfoW ? inInfoW : (const SecPkgInfoW *)inInfoA, sizeof(*info));
         if (inInfoW)
         {
-            info->Name = strdupW(inInfoW->Name);
-            info->Comment = strdupW(inInfoW->Comment);
+            info->Name = wcsdup(inInfoW->Name);
+            info->Comment = wcsdup(inInfoW->Comment);
         }
         else
         {
@@ -385,14 +378,14 @@ SecureProvider *SECUR32_addProvider(const SecurityFunctionTableA *fnTableA,

if (fnTableA || fnTableW)
     {
-        ret->moduleName = moduleName ? strdupW(moduleName) : NULL;
+        ret->moduleName = wcsdup(moduleName);
         _makeFnTableA(&ret->fnTableA, fnTableA, fnTableW);
         _makeFnTableW(&ret->fnTableW, fnTableA, fnTableW);
         ret->loaded = !moduleName;
     }
     else
     {
-        ret->moduleName = strdupW(moduleName);
+        ret->moduleName = wcsdup(moduleName);
         ret->loaded = FALSE;
     }

[PATCH 1/1] secur32: 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=126529

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] MR1465: secur32: Use the wcsdup function instead of reimplementing it. - approved

[Hans Leidekker (＠hans)]

This merge request was approved by Hans Leidekker.