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

windows fixes

metadata
Wenzel Jakob 2013-12-19 23:17:29 +01:00
parent c97ea5f1cb
commit d1638ca45c
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libcore/fstream.cpp
View File

@ -387,7 +387,7 @@ ref<FileStream> FileStream::createTemporary() {
0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
if (result->d->file == INVALID_HANDLE_VALUE) if (result->d->file == INVALID_HANDLE_VALUE)
Log(EError, "Error while trying to create temporary file \"%s\": %s", Log(EError, "Error while trying to create temporary file: %s",
lastErrorText().c_str()); lastErrorText().c_str());
result->d->path = fs::path(filename); result->d->path = fs::path(filename);

12
src/libcore/mmap.cpp
View File

@ -85,24 +85,24 @@ struct MemoryMappedFile::MemoryMappedFilePrivate {
Log(EError, "close(): unable to close file!"); Log(EError, "close(): unable to close file!");
#elif defined(__WINDOWS__) #elif defined(__WINDOWS__)
WCHAR tempPath[MAX_PATH]; WCHAR tempPath[MAX_PATH];
WCHAR filename[MAX_PATH]; WCHAR tempFilename[MAX_PATH];
unsigned int ret = GetTempPathW(MAX_PATH, tempPath); unsigned int ret = GetTempPathW(MAX_PATH, tempPath);
if (ret == 0 || ret > MAX_PATH) if (ret == 0 || ret > MAX_PATH)
SLog(EError, "GetTempPath failed(): %s", lastErrorText().c_str()); SLog(EError, "GetTempPath failed(): %s", lastErrorText().c_str());
ret = GetTempFileNameW(tempPath, TEXT("mitsuba"), 0, filename); ret = GetTempFileNameW(tempPath, L"mitsuba", 0, tempFilename);
if (ret == 0) if (ret == 0)
SLog(EError, "GetTempFileName failed(): %s", lastErrorText().c_str()); SLog(EError, "GetTempFileName failed(): %s", lastErrorText().c_str());
file = CreateFileW(filename, GENERIC_READ | GENERIC_WRITE, file = CreateFileW(tempFilename, GENERIC_READ | GENERIC_WRITE,
0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
if (file == INVALID_HANDLE_VALUE) if (file == INVALID_HANDLE_VALUE)
SLog(EError, "Error while trying to create temporary file \"%s\": %s", Log(EError, "Error while trying to create temporary file: %s",
d->path.string().c_str(), lastErrorText().c_str()); lastErrorText().c_str());
filename = fs::path(filename); filename = fs::path(tempFilename);
fileMapping = CreateFileMapping(file, NULL, PAGE_READWRITE, 0, fileMapping = CreateFileMapping(file, NULL, PAGE_READWRITE, 0,
static_cast<DWORD>(size), NULL); static_cast<DWORD>(size), NULL);