shlwapi: Use CharNextA to iterate through characters in PathAddBackslashA. Fixes…

shlwapi: Use CharNextA to iterate through characters in PathAddBackslashA. Fixes problems with MBCS paths.

shlwapi: Use CharNextA to iterate through characters in PathAddBackslashA. Fixes…
87c3df15 · Juan Lang · Alexandre Julliard · 53320cfc · 87c3df15
Commit 87c3df15 authored Jul 25, 2008 by Juan Lang Committed by Alexandre Julliard Jul 28, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 4 deletions

path.c dlls/shlwapi/path.c +9 -4

No files found.
--- a/dlls/shlwapi/path.c
+++ b/dlls/shlwapi/path.c
@@ -235,6 +235,7 @@ LPWSTR WINAPI PathCombineW(LPWSTR lpszDest, LPCWSTR lpszDir, LPCWSTR lpszFile)
 LPSTR WINAPI PathAddBackslashA(LPSTR lpszPath)
 {
  size_t iLen;
+  LPSTR prev = lpszPath;

  TRACE("(%s)\n",debugstr_a(lpszPath));

@@ -243,11 +244,15 @@ LPSTR WINAPI PathAddBackslashA(LPSTR lpszPath)

  if (iLen)
  {
-    lpszPath += iLen;
-    if (lpszPath[-1] != '\\')
+    do {
+      lpszPath = CharNextA(prev);
+      if (*lpszPath)
+        prev = lpszPath;
+    } while (*lpszPath);
+    if (*prev != '\\')
    {
-     *lpszPath++ = '\\';
-     *lpszPath = '\0';
+      *lpszPath++ = '\\';
+      *lpszPath = '\0';
    }
  }
  return lpszPath;