Changeset 21464 for trunk/src

Timestamp:

Sep 29, 2010, 5:09:55 PM (15 years ago)

Author:

dmik

Message:

Added argcA and argvA (valid only after WinMain() is entered) that may be used by applications to access ANSI versions of command line arguments w/o performing manual command line conversion and parsing. The standard argc and argv arguments, as opposed, are always in the OEM codepage.

Location:

trunk/src

Files:

• kernel32/KERNEL32.DEF (modified) (1 diff)
• kernel32/kernel32dbg.def (modified) (1 diff)
• kernel32/wprocess.cpp (modified) (6 diffs)
• shell32/dbgwrap.cpp (modified) (1 diff)
• shell32/shell32.def (modified) (2 diffs)
• shell32/shell32_main.c (modified) (28 diffs)
• shell32/shell32dbg.def (modified) (2 diffs)

trunk/src/kernel32/KERNEL32.DEF

@@ -1227 +1227 @@
     sprintfW                              @2032 NONAME
 
+    __argcA                               @2033 NONAME
+    __argvA                               @2034 NONAME
+    _CommandLineToArgvW@8                 @2035 NONAME
+    
 ; custom dll hook installer
     _ODIN_SetDllLoadCallback@4                                    @2100 NONAME

trunk/src/kernel32/kernel32dbg.def

@@ -1229 +1229 @@
     sprintfW                              @2032 NONAME
 
+    __argcA                               @2033 NONAME
+    __argvA                               @2034 NONAME
+    _CommandLineToArgvW@8                 @2035 NONAME
+
 ; custom dll hook installer
     _ODIN_SetDllLoadCallback@4                                    @2100 NONAME

trunk/src/kernel32/wprocess.cpp

@@ -50 +50 @@
 #include "initterm.h"
 #include "directory.h"
+#include "shellapi.h"
 
 #include <win\ntddk.h>
@@ -85 +86 @@
 PCSTR   pszCmdLineA;                    /* ASCII/ANSII commandline. */
 PCWSTR  pszCmdLineW;                    /* Unicode commandline. */
+char    **__argvA = NULL;               /* command line arguments in ANSI */
+int     __argcA = 0;                    /* number of arguments in __argcA */
 
 //Process database
@@ -1362 +1365 @@
 
 
+/*************************************************************************
+ * CommandLineToArgvW (re-exported as [SHELL32.7])
+ */
+/*************************************************************************
+*
+* We must interpret the quotes in the command line to rebuild the argv
+* array correctly:
+* - arguments are separated by spaces or tabs
+* - quotes serve as optional argument delimiters
+*   '"a b"'   -> 'a b'
+* - escaped quotes must be converted back to '"'
+*   '\"'      -> '"'
+* - an odd number of '\'s followed by '"' correspond to half that number
+*   of '\' followed by a '"' (extension of the above)
+*   '\\\"'    -> '\"'
+*   '\\\\\"'  -> '\\"'
+* - an even number of '\'s followed by a '"' correspond to half that number
+*   of '\', plus a regular quote serving as an argument delimiter (which
+*   means it does not appear in the result)
+*   'a\\"b c"'   -> 'a\b c'
+*   'a\\\\"b c"' -> 'a\\b c'
+* - '\' that are not followed by a '"' are copied literally
+*   'a\b'     -> 'a\b'
+*   'a\\b'    -> 'a\\b'
+*
+* Note:
+* '\t' == 0x0009
+* ' '  == 0x0020
+* '"'  == 0x0022
+* '\\' == 0x005c
+*/
+LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs)
+{
+  DWORD argc;
+  HGLOBAL hargv;
+  LPWSTR  *argv;
+  LPCWSTR cs;
+  LPWSTR arg,s,d;
+  LPWSTR cmdline;
+  int in_quotes,bcount;
+
+  if (*lpCmdline==0) {
+  /* Return the path to the executable */
+    DWORD size;
+
+    hargv=0;
+    size=16;
+    do {
+      size*=2;
+      hargv=GlobalReAlloc(hargv, size, 0);
+      argv=(LPWSTR*)GlobalLock(hargv);
+    } while (GetModuleFileNameW((HMODULE)0, (LPWSTR)(argv+1), size-sizeof(LPWSTR)) == 0);
+    argv[0]=(LPWSTR)(argv+1);
+    if (numargs)
+      *numargs=2;
+
+    return argv;
+  }
+
+  /* to get a writeable copy */
+  argc=0;
+  bcount=0;
+  in_quotes=0;
+  cs=lpCmdline;
+  while (1) {
+    if (*cs==0 || ((*cs==0x0009 || *cs==0x0020) && !in_quotes)) {
+    /* space */
+      argc++;
+      /* skip the remaining spaces */
+      while (*cs==0x0009 || *cs==0x0020) {
+        cs++;
+      }
+      if (*cs==0)
+        break;
+      bcount=0;
+      continue;
+    } else if (*cs==0x005c) {
+    /* '\', count them */
+      bcount++;
+    } else if ((*cs==0x0022) && ((bcount & 1)==0)) {
+    /* unescaped '"' */
+      in_quotes=!in_quotes;
+      bcount=0;
+    } else {
+    /* a regular character */
+      bcount=0;
+    }
+    cs++;
+  }
+  /* 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=(LPWSTR*)GlobalLock(hargv);
+  if (!argv)
+    return NULL;
+  cmdline=(LPWSTR)(argv+argc);
+  strcpyW(cmdline, lpCmdline);
+
+  argc=0;
+  bcount=0;
+  in_quotes=0;
+  arg=d=s=cmdline;
+  while (*s) {
+    if ((*s==0x0009 || *s==0x0020) && !in_quotes) {
+    /* Close the argument and copy it */
+      *d=0;
+      argv[argc++]=arg;
+
+      /* skip the remaining spaces */
+      do {
+        s++;
+      } while (*s==0x0009 || *s==0x0020);
+
+      /* Start with a new argument */
+      arg=d=s;
+      bcount=0;
+    } else if (*s==0x005c) {
+    /* '\\' */
+      *d++=*s++;
+      bcount++;
+    } else if (*s==0x0022) {
+    /* '"' */
+      if ((bcount & 1)==0) {
+      /* Preceeded by an even number of '\', this is half that
+        * number of '\', plus a quote which we erase.
+          */
+          d-=bcount/2;
+        in_quotes=!in_quotes;
+        s++;
+      } else {
+      /* Preceeded by an odd number of '\', this is half that
+        * number of '\' followed by a '"'
+          */
+          d=d-bcount/2-1;
+        *d++='"';
+        s++;
+      }
+      bcount=0;
+    } else {
+    /* a regular character */
+      *d++=*s++;
+      bcount=0;
+    }
+  }
+  if (*arg) {
+    *d='\0';
+    argv[argc++]=arg;
+  }
+  if (numargs)
+    *numargs=argc;
+
+  return argv;
+}
+
 /**
  * Internal function which gets the commandline (string) used to start the current process.
@@ -1383 +1541 @@
     APIRET  rc;                         /* OS/2 return code. */
     BOOL    fQuotes;                    /* Flag used to remember if the exe filename should be in quotes. */
+    LPWSTR *argvW;
+    int     i;
+    ULONG   cb;
 
     /** @sketch
@@ -1528 +1689 @@
             WideCharToMultiByte(CP_ACP, 0, pszCmdLineW, -1, (LPSTR)pszCmdLineA, cch-1, 0, NULL);
             ((LPSTR)pszCmdLineA)[cch-1] = 0;
+
+            // now, initialize __argcA and __argvA. These global variables are for the convenience
+            // of applications that want to access the ANSI version of command line arguments w/o
+            // using the lpCommandLine parameter of WinMain and parsing it manually
+            LPWSTR *argvW = CommandLineToArgvW(pszCmdLineW, &__argcA);
+            if (argvW != NULL)
+            {
+                // Allocate space for both the argument array and the arguments
+                // Note: intentional memory leak, pszCmdLineW will not be freed
+                // or allocated after process startup
+                cb = sizeof(char*) * __argcA + cch + __argcA;
+                __argvA = (char **)malloc(cb);
+                if (__argvA != NULL)
+                {
+                    psz = ((char *)__argvA) + sizeof(char*) * __argcA;
+                    cb -= sizeof(char*) * __argcA;
+                    for (i = 0; i < __argcA; ++i)
+                    {
+                        cch = WideCharToMultiByte(CP_ACP, 0, argvW[i], -1, psz, cb, 0, NULL);
+                        if (!cch)
+                        {
+                            DebugInt3();
+                            dprintf(("KERNEL32: InitCommandLine(%p): WideCharToMultiByte() failed\n", pszPeExe));
+                            rc = ERROR_NOT_ENOUGH_MEMORY;
+                            break;
+                        }
+                        psz[cch++] = '\0';
+                        __argvA[i] = psz;
+                        psz += cch;
+                        cb -= cch;
+                    }
+                }
+                else
+                {
+                    DebugInt3();
+                    dprintf(("KERNEL32: InitCommandLine(%p): malloc(%d) failed (3)\n", pszPeExe, cch));
+                    rc = ERROR_NOT_ENOUGH_MEMORY;
+                }
+            }
+            else
+            {
+                DebugInt3();
+                dprintf(("KERNEL32: InitCommandLine(%p): CommandLineToArgvW() failed\n", pszPeExe));
+                rc = ERROR_NOT_ENOUGH_MEMORY;
+            }
         }
         else
         {
             DebugInt3();
-            dprintf(("KERNEL32: InitCommandLine(%p): malloc(%d) failed (2)\n", pszPeExe, cch));
+            dprintf(("KERNEL32: InitCommandLine(%p): malloc(%d) failed (2)\n", pszPeExe, cch * 2));
             rc = ERROR_NOT_ENOUGH_MEMORY;
         }
@@ -1979 +2185 @@
     FREE_OEM(lpCommandLine)
     FREE_OEM(lpApplicationName)
+
+    #undef FREE_OEM
+    #undef ALLOC_OEM
 
     return rc;

trunk/src/shell32/dbgwrap.cpp

@@ -31 +31 @@
 DEBUGWRAP4(SHChangeNotifyDeregister)
 NODEF_DEBUGWRAP8(CheckEscapesW)
-NODEF_DEBUGWRAP8(CommandLineToArgvW)
+DEBUGWRAP8(CommandLineToArgvW)
 NODEF_DEBUGWRAP16(Control_FillCache_RunDLL)
 DEBUGWRAP8(ILGetDisplayName)

trunk/src/shell32/shell32.def

@@ -6 +6 @@
 DATA MULTIPLE NONSHARED
 
+
+IMPORTS
+
+    CommandLineToArgvW                =  KERNEL32.2035
 
 EXPORTS
@@ -14 +18 @@
 ;   SHChangeNotifyUpdateEntryList     = _SHChangeNotifyUpdateEntryList@16     @5
     CheckEscapesW                     = _CheckEscapesW@8                      @6
-    CommandLineToArgvW                = _CommandLineToArgvW@8                 @7
+    CommandLineToArgvW                                                        @7 ; forwarder to KERNEL32
     Control_FillCache_RunDLL          = _Control_FillCache_RunDLL@16          @8
 ;   PifMgr_OpenProperties             = _PifMgr_OpenProperties@16             @9

trunk/src/shell32/shell32_main.c

@@ -46 +46 @@
  * CommandLineToArgvW                   [SHELL32.7]
  */
- /*************************************************************************
-* CommandLineToArgvW[SHELL32.@]
-*
-* We must interpret the quotes in the command line to rebuild the argv
-* array correctly:
-* - arguments are separated by spaces or tabs
-* - quotes serve as optional argument delimiters
-*   '"a b"'   -> 'a b'
-* - escaped quotes must be converted back to '"'
-*   '\"'      -> '"'
-* - an odd number of '\'s followed by '"' correspond to half that number
-*   of '\' followed by a '"' (extension of the above)
-*   '\\\"'    -> '\"'
-*   '\\\\\"'  -> '\\"'
-* - an even number of '\'s followed by a '"' correspond to half that number
-*   of '\', plus a regular quote serving as an argument delimiter (which
-*   means it does not appear in the result)
-*   'a\\"b c"'   -> 'a\b c'
-*   'a\\\\"b c"' -> 'a\\b c'
-* - '\' that are not followed by a '"' are copied literally
-*   'a\b'     -> 'a\b'
-*   'a\\b'    -> 'a\\b'
-*
-* Note:
-* '\t' == 0x0009
-* ' '  == 0x0020
-* '"'  == 0x0022
-* '\\' == 0x005c
-*/
-LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs)
-{
-  DWORD argc;
-  HGLOBAL hargv;
-  LPWSTR  *argv;
-  LPCWSTR cs;
-  LPWSTR arg,s,d;
-  LPWSTR cmdline;
-  int in_quotes,bcount;
-  
-  if (*lpCmdline==0) {
-  /* Return the path to the executable */
-    DWORD size;
-    
-    hargv=0;
-    size=16;
-    do {
-      size*=2;
-      hargv=GlobalReAlloc(hargv, size, 0);
-      argv=GlobalLock(hargv);
-    } while (GetModuleFileNameW((HMODULE)0, (LPWSTR)(argv+1), size-sizeof(LPWSTR)) == 0);
-    argv[0]=(LPWSTR)(argv+1);
-    if (numargs)
-      *numargs=2;
-    
-    return argv;
-  }
-  
-  /* to get a writeable copy */
-  argc=0;
-  bcount=0;
-  in_quotes=0;
-  cs=lpCmdline;
-  while (1) {
-    if (*cs==0 || ((*cs==0x0009 || *cs==0x0020) && !in_quotes)) {
-    /* space */
-      argc++;
-      /* skip the remaining spaces */
-      while (*cs==0x0009 || *cs==0x0020) {
-        cs++;
-      }
-      if (*cs==0)
-        break;
-      bcount=0;
-      continue;
-    } else if (*cs==0x005c) {
-    /* '\', count them */
-      bcount++;
-    } else if ((*cs==0x0022) && ((bcount & 1)==0)) {
-    /* unescaped '"' */
-      in_quotes=!in_quotes;
-      bcount=0;
-    } else {
-    /* a regular character */
-      bcount=0;
-    }
-    cs++;
-  }
-  /* 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);
-  if (!argv)
-    return NULL;
-  cmdline=(LPWSTR)(argv+argc);
-  strcpyW(cmdline, lpCmdline);
-  
-  argc=0;
-  bcount=0;
-  in_quotes=0;
-  arg=d=s=cmdline;
-  while (*s) {
-    if ((*s==0x0009 || *s==0x0020) && !in_quotes) {
-    /* Close the argument and copy it */
-      *d=0;
-      argv[argc++]=arg;
-      
-      /* skip the remaining spaces */
-      do {
-        s++;
-      } while (*s==0x0009 || *s==0x0020);
-      
-      /* Start with a new argument */
-      arg=d=s;
-      bcount=0;
-    } else if (*s==0x005c) {
-    /* '\\' */
-      *d++=*s++;
-      bcount++;
-    } else if (*s==0x0022) {
-    /* '"' */
-      if ((bcount & 1)==0) {
-      /* Preceeded by an even number of '\', this is half that
-        * number of '\', plus a quote which we erase.
-          */
-          d-=bcount/2;
-        in_quotes=!in_quotes;
-        s++;
-      } else {
-      /* Preceeded by an odd number of '\', this is half that
-        * number of '\' followed by a '"'
-          */
-          d=d-bcount/2-1;
-        *d++='"';
-        s++;
-      }
-      bcount=0;
-    } else {
-    /* a regular character */
-      *d++=*s++;
-      bcount=0;
-    }
-  }
-  if (*arg) {
-    *d='\0';
-    argv[argc++]=arg;
-  }
-  if (numargs)
-    *numargs=argc;
-  
-  return argv;
-}
+/*************************************************************************
+ * CommandLineToArgvW[SHELL32.@]
+ *
+ * NOTE: The procedure is moved to KERNEL32.DLL (wprocess.cpp) and is now simply
+ * re-exported from SHELL32.DLL by importing it from there.
+ */
 
 /*************************************************************************
@@ -217 +71 @@
         BOOL IconNotYetLoaded=TRUE;
 
-        TRACE("(%s fattr=0x%lx sfi=%p(attr=0x%08lx) size=0x%x flags=0x%x)\n", 
+        TRACE("(%s fattr=0x%lx sfi=%p(attr=0x%08lx) size=0x%x flags=0x%x)\n",
           (flags & SHGFI_PIDL)? "pidl" : path, dwFileAttributes, psfi, psfi->dwAttributes, sizeofpsfi, flags);
 
         if ((flags & SHGFI_USEFILEATTRIBUTES) && (flags & (SHGFI_ATTRIBUTES|SHGFI_EXETYPE|SHGFI_PIDL)))
           return FALSE;
-        
+
         /* windows initializes this values regardless of the flags */
         psfi->szDisplayName[0] = '\0';
@@ -255 +109 @@
          */
 
-          SetFilePointer( hfile, 0, NULL, SEEK_SET );  
+          SetFilePointer( hfile, 0, NULL, SEEK_SET );
           ReadFile( hfile, &mz_header, sizeof(mz_header), &len, NULL );
 
@@ -262 +116 @@
          if ( *(DWORD*)magic      == IMAGE_NT_SIGNATURE )
          {
-             SetFilePointer( hfile, mz_header.e_lfanew, NULL, SEEK_SET ); 
+             SetFilePointer( hfile, mz_header.e_lfanew, NULL, SEEK_SET );
              ReadFile( hfile, &nt, sizeof(nt), &len, NULL );
               CloseHandle( hfile );
@@ -275 +129 @@
          {
              IMAGE_OS2_HEADER ne;
-             SetFilePointer( hfile, mz_header.e_lfanew, NULL, SEEK_SET ); 
+             SetFilePointer( hfile, mz_header.e_lfanew, NULL, SEEK_SET );
              ReadFile( hfile, &ne, sizeof(ne), &len, NULL );
               CloseHandle( hfile );
@@ -286 +140 @@
       }
 
-        
-        /* translate the path into a pidl only when SHGFI_USEFILEATTRIBUTES in not specified 
+
+        /* translate the path into a pidl only when SHGFI_USEFILEATTRIBUTES in not specified
            the pidl functions fail on not existing file names */
         if (flags & SHGFI_PIDL)
@@ -303 +157 @@
           /* note: the attributes in ISF::ParseDisplayName are not implemented */
         }
-        
+
         /* get the parent shellfolder */
         if (pidl)
@@ -309 +163 @@
           hr = SHBindToParent( pidl, &IID_IShellFolder, (LPVOID*)&psfParent, &pidlLast);
         }
-        
+
         /* get the attributes of the child */
         if (SUCCEEDED(hr) && (flags & SHGFI_ATTRIBUTES))
@@ -322 +176 @@
         /* get the displayname */
         if (SUCCEEDED(hr) && (flags & SHGFI_DISPLAYNAME))
-        { 
+        {
           if (flags & SHGFI_USEFILEATTRIBUTES)
           {
@@ -378 +232 @@
             else
               ret = FALSE;
-              
+
             IExtractIconA_Release(pei);
           }
@@ -416 +270 @@
             {
               psfi->iIcon = 0;
-            }          
+            }
           }
           else
           {
-            if (!(PidlToSicIndex(psfParent, pidlLast, (flags & SHGFI_LARGEICON), 
+            if (!(PidlToSicIndex(psfParent, pidlLast, (flags & SHGFI_LARGEICON),
               (flags & SHGFI_OPENICON)? GIL_OPENICON : 0, &(psfi->iIcon))))
             {
@@ -426 +280 @@
             }
           }
-          if (ret) 
+          if (ret)
           {
             ret = (DWORD) ((flags & SHGFI_LARGEICON) ? ShellBigIconList : ShellSmallIconList);
@@ -447 +301 @@
         if(pidlLast) SHFree(pidlLast);
 #ifdef MORE_DEBUG
-        TRACE ("icon=0x%08x index=0x%08x attr=0x%08lx name=%s type=%s ret=0x%08lx\n", 
+        TRACE ("icon=0x%08x index=0x%08x attr=0x%08lx name=%s type=%s ret=0x%08lx\n",
                 psfi->hIcon, psfi->iIcon, psfi->dwAttributes, psfi->szDisplayName, psfi->szTypeName, ret);
 #endif
         return ret;
-} 
+}
 
 /*************************************************************************
@@ -478 +332 @@
 
         HeapFree(GetProcessHeap(), 0, temppath);
-        
+
         return ret;
 }
@@ -512 +366 @@
 
         /* clean up hbmMask and hbmColor */
-        DeleteObject(IconInfo.hbmMask);        
-        DeleteObject(IconInfo.hbmColor);        
+        DeleteObject(IconInfo.hbmMask);
+        DeleteObject(IconInfo.hbmColor);
     }
- 
+
     return hDupIcon;
 }
-    
+
 
 /*************************************************************************
@@ -586 +440 @@
     char old_dir[1024];
 
-  TRACE("File %s, Dir %s\n", 
-                 (lpFile != NULL?lpFile:"-"), 
+  TRACE("File %s, Dir %s\n",
+                 (lpFile != NULL?lpFile:"-"),
                  (lpDirectory != NULL?lpDirectory:"-"));
 
@@ -682 +536 @@
           case ABM_SETAUTOHIDEBAR:
                SetWindowPos(data->hWnd,HWND_TOP,rec.left+1000,rec.top,
-                                       width,height,SWP_SHOWWINDOW);          
+                                       width,height,SWP_SHOWWINDOW);
                return TRUE;
           case ABM_SETPOS:
@@ -710 +564 @@
 /*************************************************************************
  * SHLoadInProc                         [SHELL32.225]
- * Create an instance of specified object class from within 
+ * Create an instance of specified object class from within
  * the shell process and release it immediately
  */
@@ -745 +599 @@
  * ShellExecuteW                        [SHELL32.294]
  * from shellapi.h
- * WINSHELLAPI HINSTANCE APIENTRY ShellExecuteW(HWND hwnd, LPCWSTR lpOperation, 
- * LPCWSTR lpFile, LPCWSTR lpParameters, LPCWSTR lpDirectory, INT nShowCmd);   
- */
-HINSTANCE WINAPI 
+ * WINSHELLAPI HINSTANCE APIENTRY ShellExecuteW(HWND hwnd, LPCWSTR lpOperation,
+ * LPCWSTR lpFile, LPCWSTR lpParameters, LPCWSTR lpDirectory, INT nShowCmd);
+ */
+HINSTANCE WINAPI
 ShellExecuteW(
-       HWND hwnd, 
-       LPCWSTR lpOperation, 
-       LPCWSTR lpFile, 
-       LPCWSTR lpParameters, 
-       LPCWSTR lpDirectory, 
+       HWND hwnd,
+       LPCWSTR lpOperation,
+       LPCWSTR lpFile,
+       LPCWSTR lpParameters,
+       LPCWSTR lpDirectory,
        INT nShowCmd) {
 
@@ -875 +729 @@
           { char* pch = Template + strlen(Template) - strlen(__appendix_str);
                         *pch = '\0';
-                        SendMessageA( GetDlgItem(hWnd, IDC_LISTBOX), LB_ADDSTRING, 
+                        SendMessageA( GetDlgItem(hWnd, IDC_LISTBOX), LB_ADDSTRING,
                                         (WPARAM)-1, (LPARAM)Template );
                     }
@@ -939 +793 @@
 
     TRACE("\n");
-    
+
     if(!(hRes = FindResourceA(shell32_hInstance, "SHELL_ABOUT_MSGBOX", RT_DIALOGA)))
         return FALSE;
@@ -982 +836 @@
 HRESULT WINAPI SHELL32_DllGetVersion (DLLVERSIONINFO *pdvi)
 {
-        if (pdvi->cbSize != sizeof(DLLVERSIONINFO)) 
+        if (pdvi->cbSize != sizeof(DLLVERSIONINFO))
         {
           WARN("wrong DLLVERSIONINFO size from app");
@@ -1008 +862 @@
 BOOL    (* WINAPI pCOMCTL32_Free) (LPVOID);
 
-/* 2001-10-17 @@@PH 
+/* 2001-10-17 @@@PH
    either me or VAC308 seems to be confused here:
    if complains about redeclaration of the corresponding functions
    in commctrl.h
-   
+
    Even more strangely, all variables "pFunction" are automatically
    percieved as "Function".
@@ -1035 +889 @@
 
 LONG            shell32_ObjCount = 0;
-HINSTANCE       shell32_hInstance = 0; 
+HINSTANCE       shell32_hInstance = 0;
 HIMAGELIST      ShellSmallIconList = 0;
 HIMAGELIST      ShellBigIconList = 0;
@@ -1058 +912 @@
 
             shell32_hInstance = hinstDLL;
-            hComctl32 = GetModuleHandleA("COMCTL32.DLL");       
+            hComctl32 = GetModuleHandleA("COMCTL32.DLL");
             DisableThreadLibraryCalls(shell32_hInstance);
 
@@ -1110 +964 @@
 
             if ( !shell32_RefCount )
-            { 
+            {
               shell32_hInstance = 0;
 
-              if (pdesktopfolder) 
+              if (pdesktopfolder)
               {
                 IShellFolder_Release(pdesktopfolder);
@@ -1121 +975 @@
               SIC_Destroy();
               FreeChangeNotifications();
-              
+
               /* this one is here to check if AddRef/Release is balanced */
               if (shell32_ObjCount)
@@ -1139 +993 @@
  *
  * PARAMETERS
- *   
+ *
  *    BOOL bInstall - TRUE for install, FALSE for uninstall
  *    LPCWSTR pszCmdLine - command line (unused by shell32?)

trunk/src/shell32/shell32dbg.def

@@ -5 +5 @@
 DESCRIPTION 'Odin32 System DLL - Shell32'
 DATA MULTIPLE NONSHARED
+
+
+IMPORTS
+
+    CommandLineToArgvW                =  KERNEL32.2035
 
 
@@ -14 +19 @@
 ;   SHChangeNotifyUpdateEntryList     = _DbgSHChangeNotifyUpdateEntryList@16     @5
     CheckEscapesW                     = _DbgCheckEscapesW@8                      @6
-    CommandLineToArgvW                = _DbgCommandLineToArgvW@8                 @7
+    CommandLineToArgvW                                                           @7 ; forwarder to KERNEL32
     Control_FillCache_RunDLL          = _DbgControl_FillCache_RunDLL@16          @8
 ;   PifMgr_OpenProperties             = _DbgPifMgr_OpenProperties@16             @9