and bail out if it failed. That way we won't use and cache in the registry an invalid-expanded string.
CORE-14981
#ifndef __REACTOS__
_SHExpandEnvironmentStrings(path, szTemp);
#else
#ifndef __REACTOS__
_SHExpandEnvironmentStrings(path, szTemp);
#else
- _SHExpandEnvironmentStrings(hToken, path, szTemp, _countof(szTemp));
+ hr = _SHExpandEnvironmentStrings(hToken, path, szTemp, _countof(szTemp));
+ if (FAILED(hr))
+ goto end;
#endif
lstrcpynW(path, szTemp, MAX_PATH);
}
#endif
lstrcpynW(path, szTemp, MAX_PATH);
}
+#ifdef __REACTOS__
+end:
+#endif
RegCloseKey(shellFolderKey);
RegCloseKey(userShellFolderKey);
TRACE("returning 0x%08x\n", hr);
RegCloseKey(shellFolderKey);
RegCloseKey(userShellFolderKey);
TRACE("returning 0x%08x\n", hr);