Subject: [PATCH] [Driver] fix windows SDK detect

[comicfans44]

Summary

1. readFullStringValue returns bool, should not compared with ERROR_SUCCESS
2. RegQueryValueExW string may contain null terminating char ,should be trimmed

these leads getSystemRegistryString return incorrect result, and following
getWindows10SDKVersion gives incorrect result for string append, prevents correct
SDK detected.

[zturner]

Looks good, do you have commit access to commit this?

[comicfans44]

I've not commited to cfe before, so I think I havn't commit access permission.

[zturner]

In D21946#473070, @comicfans44 wrote:

I've not commited to cfe before, so I think I havn't commit access permission.

If you've committed anywhere in LLVM, you should have commit access to cfe. Feel free to give it a try, as I won't be able to commit until Wednesday of next week at the earliest anyway due to the upcoming holiday.

[comicfans44]

neither did I commited to LLVM ... so I'll wait.

[comicfans44]

In D21946#473071, @zturner wrote:

In D21946#473070, @comicfans44 wrote:

I've not commited to cfe before, so I think I havn't commit access permission.

If you've committed anywhere in LLVM, you should have commit access to cfe. Feel free to give it a try, as I won't be able to commit until Wednesday of next week at the earliest anyway due to the upcoming holiday.

ping ?

cfe/trunk/lib/Driver/MSVCToolChain.cpp

static bool readFullStringValue(HKEY hkey, const char *valueName,
   if (result != ERROR_SUCCESS || type != REG_SZ || !valueSize)
     return false;
   std::vector<BYTE> buffer(valueSize);
   result = RegQueryValueExW(hkey, WideValueName.c_str(), NULL, NULL, &buffer[0],
                             &valueSize);
   if (result == ERROR_SUCCESS) {
     std::wstring WideValue(reinterpret_cast<const wchar_t *>(buffer.data()),
                            valueSize / sizeof(wchar_t));
+    if (valueSize && WideValue.back() == L'\0') {
+        WideValue.pop_back();
+    }
     // The destination buffer must be empty as an invariant of the conversion
     // function; but this function is sometimes called in a loop that passes in
     // the same buffer, however. Simply clear it out so we can overwrite it.
     value.clear();
     return llvm::convertWideToUTF8(WideValue, value);
   }
   return false;
 }
if (lResult == ERROR_SUCCESS) {
           // Test that InstallDir is indeed there before keeping this index.
           // Open the chosen key path remainder.
           bestName = keyName;
           // Append rest of key.
           bestName.append(nextKey);
           lResult = RegOpenKeyExA(hTopKey, bestName.c_str(), 0,
                                   KEY_READ | KEY_WOW64_32KEY, &hKey);
           if (lResult == ERROR_SUCCESS) {
-            lResult = readFullStringValue(hKey, valueName, value);
-            if (lResult == ERROR_SUCCESS) {
+            if (readFullStringValue(hKey, valueName, value)) {
               bestValue = dvalue;
               if (phValue)
                 *phValue = bestName;
               returnValue = true;
             }
             RegCloseKey(hKey);
           }
         }
         size = sizeof(keyName) - 1;
       }
       RegCloseKey(hTopKey);
     }
   } else {
     lResult =
         RegOpenKeyExA(hRootKey, keyPath, 0, KEY_READ | KEY_WOW64_32KEY, &hKey);
     if (lResult == ERROR_SUCCESS) {
-      lResult = readFullStringValue(hKey, valueName, value);
-      if (lResult == ERROR_SUCCESS)
+      if (readFullStringValue(hKey, valueName, value))
         returnValue = true;
       if (phValue)
         phValue->clear();
       RegCloseKey(hKey);
     }
   }
   return returnValue;
 #endif // USE_WIN32