Default to using program files if where.exe doesn't find dotnet.exe (#578)

src/CommonLib/hostfxr_utility.cpp

@@ -145,10 +145,6 @@ HOSTFXR_UTILITY::GetStandaloneHostfxrParameters(
     {
         goto Finished;
     }
-    if (FAILED(hr = struHostFxrDllLocation->Copy(struDllPath)))
-    {
-        goto Finished;
-    }
 
 Finished:
 
@@ -479,6 +475,7 @@ HOSTFXR_UTILITY::FindDotnetExePath(
     DWORD               dwNumBytesRead;
     DWORD               dwFilePointer;
     DWORD               dwBinaryType;
+    DWORD               dwPathSize = MAX_PATH;
     INT                 index = 0;
     INT                 prevIndex = 0;
     BOOL                fResult = FALSE;
@@ -545,30 +542,27 @@ HOSTFXR_UTILITY::FindDotnetExePath(
     }
 
     //
-    // where.exe will return 1 if the file is not found
+    // where.exe will return 0 on success, 1 if the file is not found
     // and 2 if there was an error. Check if the exit code is 1 and set
     // a new hr result saying it couldn't find dotnet.exe
     // 
-    if (!GetExitCodeProcess(processInformation.hProcess, &dwExitCode) ||
+    if (!GetExitCodeProcess(processInformation.hProcess, &dwExitCode))
-        dwExitCode != 0)
     {
-        if (dwExitCode == 1)
+        goto Fallback;
-        {
-            hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND);
-        }
-        else
-        {
-            hr = HRESULT_FROM_WIN32(GetLastError());
-        }
-        goto Finished;
     }
 
+    //
+    // In this block, if anything fails, we will goto our fallback of
+    // looking in C:/Program Files/
+    // 
+    if (dwExitCode == 0)
+    {
+        // Where succeeded. 
         // Reset file pointer to the beginning of the file. 
         dwFilePointer = SetFilePointer(hStdOutReadPipe, 0, NULL, FILE_BEGIN);
         if (dwFilePointer == INVALID_SET_FILE_POINTER)
         {
-        hr = HRESULT_FROM_WIN32(ERROR_FILE_INVALID);
+            goto Fallback;
-        goto Finished;
         }
 
         //
@@ -577,15 +571,13 @@ HOSTFXR_UTILITY::FindDotnetExePath(
         //
         if (!ReadFile(hStdOutReadPipe, pzFileContents, READ_BUFFER_SIZE, &dwNumBytesRead, NULL))
         {
-        hr = HRESULT_FROM_WIN32(ERROR_FILE_INVALID);
+            goto Fallback;
-        goto Finished;
         }
         if (dwNumBytesRead >= READ_BUFFER_SIZE)
         {
             // This shouldn't ever be this large. We could continue to call ReadFile in a loop,
             // however I'd rather error out here and report an issue.
-        hr = HRESULT_FROM_WIN32(ERROR_FILE_TOO_LARGE);
+            goto Fallback;
-        goto Finished;
         }
 
         if (FAILED(hr = struDotnetLocationsString.CopyA(pzFileContents, dwNumBytesRead)))
@@ -626,24 +618,59 @@ HOSTFXR_UTILITY::FindDotnetExePath(
             }
             prevIndex = index;
 
-        if (!GetBinaryTypeW(struDotnetSubstring.QueryStr(), &dwBinaryType))
+            if (GetBinaryTypeW(struDotnetSubstring.QueryStr(), &dwBinaryType) &&
+                fIsCurrentProcess64Bit == (dwBinaryType == SCS_64BIT_BINARY)) {
+                // Found a valid dotnet.
+                if (FAILED(hr = struDotnetPath->Copy(struDotnetSubstring)))
+                {
+                    goto Finished;
+                }
+                fFound = TRUE;
+            }
+        }
+    }
+
+Fallback:
+
+    // Look in ProgramFiles
+    while (!fFound)
+    {
+        if (FAILED(hr = struDotnetSubstring.Resize(dwPathSize)))
+        {
+            goto Finished;
+        }
+
+        // Program files will changes based on the 
+        dwNumBytesRead = GetEnvironmentVariable(L"ProgramFiles", struDotnetSubstring.QueryStr(), dwPathSize);
+        if (dwNumBytesRead == 0)
         {
-            // TODO should we ignore this failure and continue to trying the next dotnet.exe?
             hr = HRESULT_FROM_WIN32(GetLastError());
             goto Finished;
         }
-        if (fIsCurrentProcess64Bit == (dwBinaryType == SCS_64BIT_BINARY)) {
+        else if (dwNumBytesRead == dwPathSize)
-            // Found a valid dotnet.
+        {
-            struDotnetPath->Copy(struDotnetSubstring);
+            dwPathSize *= 2 + 30; // for dotnet substring
+        }
+        else
+        {
+            if (FAILED(hr = struDotnetSubstring.SyncWithBuffer()) ||
+                FAILED(hr = struDotnetSubstring.Append(L"\\dotnet\\dotnet.exe")))
+            {
+                goto Finished;
+            }
+            if (!UTILITY::CheckIfFileExists(struDotnetSubstring.QueryStr()))
+            {
+                hr = HRESULT_FROM_WIN32( GetLastError() );
+                goto Finished;
+            }
+            if (FAILED(hr = struDotnetPath->Copy(struDotnetSubstring)))
+            {
+                goto Finished;
+            }
             fFound = TRUE;
         }
     }
 
-    if (!fFound)
-    {
-        hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND);
-        goto Finished;
-    }
 
 Finished: