X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/49a70977b32f6d56ad412292c4db34d827bb490f..5bcdac458c0d5bff7c499ae3c2b7cba40c4ad802:/src/common/filename.cpp?ds=inline

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index 52a8dcd296..3c5764a6bb 100644
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -2331,14 +2331,11 @@ wxULongLong wxFileName::GetSize(const wxString &filename)
 
     DWORD lpFileSizeHigh;
     DWORD ret = GetFileSize(f, &lpFileSizeHigh);
-    if (ret == INVALID_FILE_SIZE)
+    if ( ret == INVALID_FILE_SIZE && ::GetLastError() != NO_ERROR )
         return wxInvalidSize;
 
-    // compose the low-order and high-order byte sizes
-    return wxULongLong(ret | (lpFileSizeHigh << sizeof(WORD)*2));
-
-#else           // ! __WIN32__
-
+    return wxULongLong(lpFileSizeHigh, ret);
+#else // ! __WIN32__
     wxStructStat st;
 #ifndef wxNEED_WX_UNISTD_H
     if (wxStat( filename.fn_str() , &st) != 0)