Eric Pouech : dbghelp: Convert of couple more of string literals.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 69108af65496021157daa4bcaaaa53ab15e8901a
URL:    https://gitlab.winehq.org/wine/wine/-/commit/69108af65496021157daa4bcaaaa53a...

Author: Eric Pouech 
Date:   Mon Nov 21 16:42:21 2022 +0100

dbghelp: Convert of couple more of string literals.

Signed-off-by: Eric Pouech

---

dlls/dbghelp/path.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c
index 2320c9da5c3..d23a4b5733e 100644
--- a/dlls/dbghelp/path.c
+++ b/dlls/dbghelp/path.c
@@ -741,17 +741,14 @@ BOOL search_dll_path(const struct process *process, const WCHAR *name, BOOL (*ma

if ((env = process_getenv(process, L"WINEBUILDDIR")))
     {
-        const WCHAR dllsW[] = { '\','d','l','l','s','\' };
-        const WCHAR programsW[] = { '\','p','r','o','g','r','a','m','s','\' };
-
         len = lstrlenW(env);
-        if (!(buf = heap_alloc((len + ARRAY_SIZE(programsW) + machine_dir_len +
+        if (!(buf = heap_alloc((len + wcslen(L"\programs\") + machine_dir_len +
                                 2 * lstrlenW(name) + 1) * sizeof(WCHAR)))) return FALSE;
         wcscpy(buf, env);
         end = buf + len;

-        memcpy(end, dllsW, sizeof(dllsW));
-        lstrcpyW(end + ARRAY_SIZE(dllsW), name);
+        wcscpy(end, L"\dlls\");
+        wcscat(end, name);
         if ((p = wcsrchr(end, '.')) && !lstrcmpW(p, L".so")) *p = 0;
         if ((p = wcsrchr(end, '.')) && !lstrcmpW(p, L".dll")) *p = 0;
         p = end + lstrlenW(end);
@@ -764,9 +761,9 @@ BOOL search_dll_path(const struct process *process, const WCHAR *name, BOOL (*ma
         lstrcpyW(p, name);
         if (try_match_file(buf, match, param)) goto found;

-        memcpy(end, programsW, sizeof(programsW));
-        end += ARRAY_SIZE(programsW);
-        lstrcpyW(end, name);
+        wcscpy(end, L"\programs\");
+        end += wcslen(end);
+        wcscpy(end, name);
         if ((p = wcsrchr(end, '.')) && !lstrcmpW(p, L".so")) *p = 0;
         if ((p = wcsrchr(end, '.')) && !lstrcmpW(p, L".exe")) *p = 0;
         p = end + lstrlenW(end);