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

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

[Alex Henrie]

From: Alex Henrie

---
 dlls/localspl/provider.c | 26 ++++----------------------
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c
index 4faf38c9c61..b33abd723c9 100644
--- a/dlls/localspl/provider.c
+++ b/dlls/localspl/provider.c
@@ -275,24 +275,6 @@ static const DWORD di_sizeof[] = {0, sizeof(DRIVER_INFO_1W), sizeof(DRIVER_INFO_
                                   0, sizeof(DRIVER_INFO_8W)};

-/******************************************************************
- * strdupW [internal]
- *
- * create a copy of a unicode-string
- *
- */
-static LPWSTR strdupW(LPCWSTR p)
-{
-    LPWSTR ret;
-    DWORD len;
-
-    if(!p) return NULL;
-    len = (wcslen(p) + 1) * sizeof(WCHAR);
-    ret = malloc(len);
-    if (ret) memcpy(ret, p, len);
-    return ret;
-}
-
 /******************************************************************
  *  apd_copyfile [internal]
  *
@@ -618,8 +600,8 @@ static monitor_t * monitor_load(LPCWSTR name, LPWSTR dllname)
                 WARN("%s not found\n", debugstr_w(regroot));
         }

-        pm->name = strdupW(name);
-        pm->dllname = strdupW(driver);
+        pm->name = wcsdup(name);
+        pm->dllname = wcsdup(driver);

if ((name && (!regroot || !pm->name)) || !pm->dllname) {
             monitor_unload(pm);
@@ -1427,10 +1409,10 @@ static HANDLE printer_alloc_handle(LPCWSTR name, LPPRINTER_DEFAULTSW pDefault)
     if (!printer) goto end;

/* clone the base name. This is NULL for the printserver */
-    printer->printername = strdupW(printername);
+    printer->printername = wcsdup(printername);

/* clone the full name */
-    printer->name = strdupW(name);
+    printer->name = wcsdup(name);
     if (name && (!printer->name)) {
         printer_free(printer);
         printer = NULL;

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

[Piotr Caban (＠piotr)]

This merge request was approved by Piotr Caban.

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

[Huw Davies (＠huw)]

This merge request was approved by Huw Davies.