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

[Alex Henrie (＠alexhenrie)]

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10065

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

[Alex Henrie]

From: Alex Henrie <[e-mail]>

---
 programs/winecfg/theme.c   | 14 ++++----------
 programs/winecfg/winecfg.c | 10 +---------
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c
index cc1a3c66820..87d91807bb9 100644
--- a/programs/winecfg/theme.c
+++ b/programs/winecfg/theme.c
@@ -94,11 +94,8 @@ static void color_or_size_dsa_add (WrappedDsa* wdsa, const WCHAR* name,
 {
     ThemeColorOrSize item;
 
-    item.name = malloc ((wcslen (name) + 1) * sizeof(WCHAR));
-    lstrcpyW (item.name, name);
-
-    item.fancyName = malloc ((wcslen (fancyName) + 1) * sizeof(WCHAR));
-    lstrcpyW (item.fancyName, fancyName);
+    item.name = wcsdup (name);
+    item.fancyName = wcsdup (fancyName);
 
     DSA_InsertItem (wdsa->dsa, wdsa->count, &item);
     wdsa->count++;
@@ -206,12 +203,9 @@ static BOOL CALLBACK myEnumThemeProc (LPVOID lpReserved,
     create_color_or_size_dsa (&newEntry.sizes);
     fill_theme_string_array (pszThemeFileName, &newEntry.sizes, EnumThemeSizes);
 
-    newEntry.themeFileName = malloc ((wcslen (pszThemeFileName) + 1) * sizeof(WCHAR));
-    lstrcpyW (newEntry.themeFileName, pszThemeFileName);
+    newEntry.themeFileName = wcsdup (pszThemeFileName);
+    newEntry.fancyName = wcsdup (pszThemeName);
 
-    newEntry.fancyName = malloc ((wcslen (pszThemeName) + 1) * sizeof(WCHAR));
-    lstrcpyW (newEntry.fancyName, pszThemeName);
-  
     /*list_add_tail (&themeFiles, &newEntry->entry);*/
     DSA_InsertItem (themeFiles, themeFilesCount, &newEntry);
     themeFilesCount++;
diff --git a/programs/winecfg/winecfg.c b/programs/winecfg/winecfg.c
index 17104fa7dbd..47b13a1be4b 100644
--- a/programs/winecfg/winecfg.c
+++ b/programs/winecfg/winecfg.c
@@ -76,16 +76,8 @@ void set_window_title(HWND dialog)
 WCHAR* load_string (UINT id)
 {
     WCHAR buf[1024];
-    int len;
-    WCHAR* newStr;
-
     LoadStringW(GetModuleHandleW(NULL), id, buf, ARRAY_SIZE(buf));
-
-    len = wcslen(buf);
-    newStr = malloc((len + 1) * sizeof(WCHAR));
-    memcpy(newStr, buf, len * sizeof(WCHAR));
-    newStr[len] = 0;
-    return newStr;
+    return wcsdup(buf);
 }
 
 /**
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/10065