godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-13 13:31:48 +00:00
Code Releases Wiki Activity

Somewhat fixed Directory::get_space_left() return values.

Browse Source
This commit is contained in:
J08nY
2016-06-06 07:30:23 +02:00
parent 63ab89d28c
commit 3fb3b7c1f7
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/windows/dir_access_windows.cpp
View File

@@ -69,7 +69,7 @@ bool DirAccessWindows::list_dir_begin() {
_cisdir=false; _cisdir=false;
_cishidden=false; _cishidden=false;
list_dir_end(); list_dir_end();
p->h = FindFirstFileExW((current_dir+"\\*").c_str(), FindExInfoStandard, &p->fu, FindExSearchNameMatch, NULL, 0); p->h = FindFirstFileExW((current_dir+"\\*").c_str(), FindExInfoStandard, &p->fu, FindExSearchNameMatch, NULL, 0);
@@ -83,7 +83,7 @@ String DirAccessWindows::get_next() {
if (p->h==INVALID_HANDLE_VALUE) if (p->h==INVALID_HANDLE_VALUE)
return ""; return "";
_cisdir=(p->fu.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY); _cisdir=(p->fu.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY);
_cishidden=(p->fu.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN); _cishidden=(p->fu.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN);
@@ -192,7 +192,7 @@ 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;
@@ -249,7 +249,7 @@ bool DirAccessWindows::file_exists(String p_file) {
p_file=get_current_dir().plus_file(p_file); p_file=get_current_dir().plus_file(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;
@@ -359,8 +359,12 @@ FileType DirAccessWindows::get_file_type(const String& p_file) const {
*/ */
size_t DirAccessWindows::get_space_left() { size_t DirAccessWindows::get_space_left() {
return -1; uint64_t bytes = 0;
}; GetDiskFreeSpaceEx(NULL,(PULARGE_INTEGER)&bytes,NULL,NULL);
//this is either 0 or a value in bytes.
return (size_t)bytes;
}
DirAccessWindows::DirAccessWindows() { DirAccessWindows::DirAccessWindows() {

4
platform/osx/dir_access_osx.mm
View File

@@ -319,10 +319,10 @@ size_t DirAccessOSX::get_space_left() {
struct statvfs vfs; struct statvfs vfs;
if (statvfs(current_dir.utf8().get_data(), &vfs) != 0) { if (statvfs(current_dir.utf8().get_data(), &vfs) != 0) {
return -1; return 0;
}; };
return vfs.f_bfree * vfs.f_bsize; return (size_t) (vfs.f_bavail * vfs.f_bsize);
#else #else
#warning THIS IS BROKEN #warning THIS IS BROKEN
return 0; return 0;