Fix directory searching

Author: brycehutchings

src/common/filesystem_utils.cpp

@@ -230,12 +230,11 @@ bool FileSysUtilsParsePathList(std::string& path_list, std::vector<std::string>&
 }
 
 bool FileSysUtilsFindFilesInPath(const std::string& path, std::vector<std::string>& files) {
-    // Append "\\*" to file name to list folder contents. This appears to contradict the
-    // MS documentation and example code, but verified empirically
-    std::string starred_path = path + DIRECTORY_SYMBOL + "*";
+    std::string searchPath;
+    FileSysUtilsCombinePaths(path, "*", searchPath);
 
     WIN32_FIND_DATAW file_data;
-    HANDLE file_handle = FindFirstFileW(utf8_to_wide(starred_path).c_str(), &file_data);
+    HANDLE file_handle = FindFirstFileW(utf8_to_wide(searchPath).c_str(), &file_data);
     if (file_handle != INVALID_HANDLE_VALUE) {
         do {
             if (!(file_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) {

src/common/platform_utils.hpp

@@ -226,18 +226,20 @@ static inline std::string PlatformUtilsGetEnv(const char* name) {
 
     // GetEnvironmentVariable returns string length, excluding null terminator for "get value" call.
     const int length = ::GetEnvironmentVariableW(wname.c_str(), wValueData, (DWORD)wValue.size());
-    if (!length) {
+    if (length == 0) {
         LogError("GetEnvironmentVariable get value error: " + std::to_string(::GetLastError()));
         return {};
     }
 
+    wValue.resize(length); // Strip the null terminator.
+
     return wide_to_utf8(wValue);
 }
 
 static inline std::string PlatformUtilsGetSecureEnv(const char* name) {
     // Do not allow high integrity processes to act on data that can be controlled by medium integrity processes.
     if (IsHighIntegrityLevel()) {
-        return nullptr;
+        return {};
     }
 
     // No secure version for Windows so the above integrity check is needed.