Improved cmdline parsing

CrashReport.cpp

@@ -86,28 +86,32 @@ BOOL HandleCrashDump(_In_z_ LPCWSTR szModuleNameW)
   if (sW == NULL || *sW == 0)
     return FALSE;
 
-  while (*sW != 0)
+  //skip spaces before
+  while (*sW != 0 && *((LPWORD)sW) <= 32)
+    sW++;
+
+  //inside quotes?
+  if (*sW == L'"')
   {
-    if (*sW == L'"')
-    {
+    sW++;
+    //skip until the closing quotes
+    while (*sW != 0 && *sW != L'"')
       sW++;
-      while (*sW != 0 && *sW != L'"')
-        sW++;
-      if (*sW == L'"')
-        sW++;
-    }
-    else if (*sW == L' ')
-    {
-      while (*sW != 0 && *sW <= 32)
-        sW++;
-      break;
-    }
-    else
-    {
+    if (*sW == L'"')
+      sW++; //skip the closing quote
+  }
+  else
+  {
+    //skip until the first blank space
+    while (*((LPWORD)sW) > 32)
       sW++;
-    }
   }
 
+  //skip spaces after
+  while (*sW != 0 && *((LPWORD)sW) <= 32)
+    sW++;
+
+  //check parameter
   if (StrNCompareW(sW, L"/crash:", 7) != 0)
     return FALSE; //not a crash handler
   sW += 7;

Process.cpp

@@ -60,6 +60,7 @@ HRESULT ResolveChildProcessFileName(_Out_ CStringW &cStrFullNameW, _In_ LPCWSTR
     LPCWSTR szNameStartW, szNameEndW;
     SIZE_T nTempBufLen = 1024;
 
+    //NOTE: Assume szCommandLineW is the full command line
     szNameStartW = szCommandLineW;
     if (*szCommandLineW == L'"')
     {
@@ -70,9 +71,10 @@ HRESULT ResolveChildProcessFileName(_Out_ CStringW &cStrFullNameW, _In_ LPCWSTR
     else
     {
       szNameEndW = szNameStartW;
-      while (*szNameEndW != 0 && *szNameEndW != L' ' && *szNameEndW != L'\t')
+      while (*((LPWORD)szNameEndW) > 32)
         szNameEndW++;
     }
+
     //get the path list to check (based on https://msdn.microsoft.com/en-us/library/ms682425.aspx)
     //1. The directory from which the application loaded.
     hRes = FileRoutines::GetAppFolderPath(cStrSearchPathW);