mingzailao
/
mitsuba
mirror of https://github.com/Quartenia/mitsuba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix a ridiculous error with Windows XP.

metadata
Edgar Velazquez-Armendariz 2012-10-03 15:24:39 -04:00
parent 3d56c61b16
commit 5f06699361
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/libcore/fresolver.cpp
View File

@ -2,6 +2,7 @@
#if defined(__WINDOWS__) #if defined(__WINDOWS__)
# include <windows.h> # include <windows.h>
# include <vector>
#endif #endif
MTS_NAMESPACE_BEGIN MTS_NAMESPACE_BEGIN
@ -28,13 +29,25 @@ FileResolver::FileResolver() {
prependPath(__mts_bundlepath()); prependPath(__mts_bundlepath());
MTS_AUTORELEASE_END() MTS_AUTORELEASE_END()
#elif defined(__WINDOWS__) #elif defined(__WINDOWS__)
WCHAR lpFilename[MAX_PATH]; std::vector<WCHAR> lpFilename(MAX_PATH);
const DWORD nSize = static_cast<DWORD>(sizeof(lpFilename)/sizeof(WCHAR));
if (GetModuleFileNameW(NULL, lpFilename, nSize) != 0 && // Try to get the path with the default MAX_PATH length (260 chars)
GetLastError() == ERROR_SUCCESS) DWORD nSize = GetModuleFileNameW(NULL, &lpFilename[0], MAX_PATH);
// Adjust the buffer size in case if was too short
while (nSize == lpFilename.size()) {
lpFilename.resize(nSize * 2);
nSize = GetModuleFileNameW(NULL, &lpFilename[0], nSize);
}
// There is an error if and only if the function returns 0
if (nSize != 0) {
prependPath(fs::path(lpFilename).parent_path()); prependPath(fs::path(lpFilename).parent_path());
else }
Log(EError, "Could not detect the executable path!"); else {
const std::string msg(lastErrorText());
Log(EError, "Could not detect the executable path! (%s)", msg.c_str());
}
#endif #endif
} }