godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

-Corrected DirAccessWindows functions, fixes #1872, properly fixes #791.

Browse Source
This commit is contained in:
Juan Linietsky 2015-05-09 13:05:34 -03:00
parent 6565751d0f
commit 1a7d370fcf
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/windows/dir_access_windows.cpp
View File

@ -191,9 +191,9 @@ Error DirAccessWindows::make_dir(String p_dir) {
#else #else
//p_dir=fix_path(p_dir); p_dir=fix_path(p_dir);
p_dir.replace("/","\\"); //p_dir.replace("/","\\");
bool success; bool success;
int err; int err;
@ -250,14 +250,14 @@ bool DirAccessWindows::file_exists(String p_file) {
p_file=fix_path(p_file); p_file=fix_path(p_file);
p_file.replace("/","\\"); //p_file.replace("/","\\");
WIN32_FILE_ATTRIBUTE_DATA fileInfo; //WIN32_FILE_ATTRIBUTE_DATA fileInfo;
DWORD fileAttr; DWORD fileAttr;
fileAttr = GetFileAttributesExW(p_file.c_str(), GetFileExInfoStandard, &fileInfo); fileAttr = GetFileAttributesW(p_file.c_str());
if (0 == fileAttr) if (INVALID_FILE_ATTRIBUTES == fileAttr)
return false; return false;
return !(fileAttr&FILE_ATTRIBUTE_DIRECTORY); return !(fileAttr&FILE_ATTRIBUTE_DIRECTORY);
@ -273,17 +273,16 @@ bool DirAccessWindows::dir_exists(String p_dir) {
else else
p_dir=fix_path(p_dir); p_dir=fix_path(p_dir);
p_dir.replace("/","\\"); //p_dir.replace("/","\\");
WIN32_FILE_ATTRIBUTE_DATA fileInfo; //WIN32_FILE_ATTRIBUTE_DATA fileInfo;
DWORD fileAttr; DWORD fileAttr;
fileAttr = GetFileAttributesExW(p_dir.c_str(), GetFileExInfoStandard, &fileInfo); fileAttr = GetFileAttributesW(p_dir.c_str());
if (0 == fileAttr) if (INVALID_FILE_ATTRIBUTES == fileAttr)
return false; return false;
return (fileAttr&FILE_ATTRIBUTE_DIRECTORY); return (fileAttr&FILE_ATTRIBUTE_DIRECTORY);
} }
@ -314,12 +313,15 @@ Error DirAccessWindows::remove(String p_path) {
p_path=fix_path(p_path); p_path=fix_path(p_path);
printf("erasing %s\n",p_path.utf8().get_data()); printf("erasing %s\n",p_path.utf8().get_data());
WIN32_FILE_ATTRIBUTE_DATA fileInfo; //WIN32_FILE_ATTRIBUTE_DATA fileInfo;
DWORD fileAttr = GetFileAttributesExW(p_path.c_str(), GetFileExInfoStandard, &fileInfo); //DWORD fileAttr = GetFileAttributesExW(p_path.c_str(), GetFileExInfoStandard, &fileInfo);
if (fileAttr == INVALID_FILE_ATTRIBUTES)
return FAILED;
if (fileAttr & FILE_ATTRIBUTE_DIRECTORY) DWORD fileAttr;
fileAttr = GetFileAttributesW(p_path.c_str());
if (INVALID_FILE_ATTRIBUTES == fileAttr)
return FAILED;
if ((fileAttr&FILE_ATTRIBUTE_DIRECTORY))
return ::_wrmdir(p_path.c_str())==0?OK:FAILED; return ::_wrmdir(p_path.c_str())==0?OK:FAILED;
else else
return ::_wunlink(p_path.c_str())==0?OK:FAILED; return ::_wunlink(p_path.c_str())==0?OK:FAILED;