shell32: Memory allocated by CommandLineToArgvW should be that got from…

shell32: Memory allocated by CommandLineToArgvW should be that got from LocalAlloc/LocalReAlloc, not from GlobalAlloc. Use LMEM_FIXED instead of 0 in calls to LocalAlloc to emphasise that we're getting a direct pointer, not a handle to memory. Remove hargv as it is confusing and unnecessary.

shell32: Memory allocated by CommandLineToArgvW should be that got from…
4510346b · Rob Shearman · Alexandre Julliard · 3d55b590 · 4510346b
Commit 4510346b authored Feb 14, 2008 by Rob Shearman Committed by Alexandre Julliard Feb 15, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 8 deletions

shell32_main.c dlls/shell32/shell32_main.c +4 -8

No files found.
--- a/dlls/shell32/shell32_main.c
+++ b/dlls/shell32/shell32_main.c
@@ -85,7 +85,6 @@ extern const char * const SHELL_Authors[];
 LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs)
 {
    DWORD argc;
-    HGLOBAL hargv;
    LPWSTR  *argv;
    LPCWSTR cs;
    LPWSTR arg,s,d;
@@ -97,20 +96,18 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs)
        /* Return the path to the executable */
        DWORD len, size=16;

-        hargv=LocalAlloc(0, size);
-        argv=LocalLock(hargv);
+        argv=LocalAlloc(LMEM_FIXED, size);
        for (;;)
        {
            len = GetModuleFileNameW(0, (LPWSTR)(argv+1), (size-sizeof(LPWSTR))/sizeof(WCHAR));
            if (!len)
            {
-                LocalFree(hargv);
+                LocalFree(argv);
                return NULL;
            }
            if (len < size) break;
            size*=2;
-            hargv=LocalReAlloc(hargv, size, 0);
-            argv=LocalLock(hargv);
+            argv=LocalReAlloc(argv, size, 0);
        }
        argv[0]=(LPWSTR)(argv+1);
        if (numargs)
@@ -160,8 +157,7 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs)
    /* Allocate in a single lump, the string array, and the strings that go with it.
     * This way the caller can make a single GlobalFree call to free both, as per MSDN.
     */
-    hargv=GlobalAlloc(0, argc*sizeof(LPWSTR)+(strlenW(lpCmdline)+1)*sizeof(WCHAR));
-    argv=GlobalLock(hargv);
+    argv=LocalAlloc(LMEM_FIXED, argc*sizeof(LPWSTR)+(strlenW(lpCmdline)+1)*sizeof(WCHAR));
    if (!argv)
        return NULL;
    cmdline=(LPWSTR)(argv+argc);