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

Merge pull request #574 from marynate/PR-fix-change-dir

Browse Source 
Fixed DirAccessWindows::change_dir not working properly;
This commit is contained in:
Juan Linietsky 2014-09-17 10:44:51 -03:00
commit 7de53cf242
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/windows/dir_access_windows.cpp
View File

@ -189,9 +189,10 @@ Error DirAccessWindows::change_dir(String p_dir) {
current_dir=real_current_dir_name; // TODO, utf8 parser
current_dir=current_dir.replace("\\","/");
}
} else {
SetCurrentDirectoryW(prev_dir.c_str());
SetCurrentDirectoryW(prev_dir.c_str());
}
return worked?OK:ERR_INVALID_PARAMETER;
} else {
@ -209,9 +210,10 @@ Error DirAccessWindows::change_dir(String p_dir) {
current_dir=real_current_dir_name; // TODO, utf8 parser
current_dir=current_dir.replace("\\","/");
}
} else {
SetCurrentDirectoryA(prev_dir.ascii().get_data());
SetCurrentDirectoryA(prev_dir.ascii().get_data());
}
return worked?OK:ERR_INVALID_PARAMETER;
@ -299,8 +301,9 @@ bool DirAccessWindows::file_exists(String p_file) {
GLOBAL_LOCK_FUNCTION
if (!p_file.is_abs_path())
p_file=get_current_dir()+"/"+p_file;
if (!p_file.is_abs_path())
p_file=get_current_dir()+"/"+p_file;
p_file=fix_path(p_file);
p_file.replace("/","\\");
@ -309,21 +312,22 @@ bool DirAccessWindows::file_exists(String p_file) {
if (unicode) {
DWORD fileAttr;
DWORD fileAttr;
fileAttr = GetFileAttributesExW(p_file.c_str(), GetFileExInfoStandard, &fileInfo);
if (0xFFFFFFFF == fileAttr)
return false;
return !(fileAttr&FILE_ATTRIBUTE_DIRECTORY);
return !(fileAttr&FILE_ATTRIBUTE_DIRECTORY);
} else {
DWORD fileAttr;
DWORD fileAttr;
fileAttr = GetFileAttributesExA(p_file.ascii().get_data(), GetFileExInfoStandard, &fileInfo);
if (0xFFFFFFFF == fileAttr)
return false;
return !(fileAttr&FILE_ATTRIBUTE_DIRECTORY);
return !(fileAttr&FILE_ATTRIBUTE_DIRECTORY);
}
@ -334,8 +338,9 @@ bool DirAccessWindows::dir_exists(String p_dir) {
GLOBAL_LOCK_FUNCTION
if (!p_dir.is_abs_path())
p_dir=get_current_dir()+"/"+p_dir;
if (!p_dir.is_abs_path())
p_dir=get_current_dir()+"/"+p_dir;
p_dir=fix_path(p_dir);
p_dir.replace("/","\\");
@ -344,7 +349,7 @@ bool DirAccessWindows::dir_exists(String p_dir) {
if (unicode) {
DWORD fileAttr;
DWORD fileAttr;
fileAttr = GetFileAttributesExW(p_dir.c_str(), GetFileExInfoStandard, &fileInfo);
if (0xFFFFFFFF == fileAttr)
@ -353,11 +358,12 @@ bool DirAccessWindows::dir_exists(String p_dir) {
return (fileAttr&FILE_ATTRIBUTE_DIRECTORY);
} else {
DWORD fileAttr;
DWORD fileAttr;
fileAttr = GetFileAttributesExA(p_dir.ascii().get_data(), GetFileExInfoStandard, &fileInfo);
if (0xFFFFFFFF == fileAttr)
return false;
return (fileAttr&FILE_ATTRIBUTE_DIRECTORY);
}