X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/04ef50df3a0fa3c343800c554e609f98fc7575cc..abfcca57dd0d805ceec9e19c4be207614d79252a:/src/msw/utils.cpp diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp index b117cb09c1..d34d0ede3e 100644 --- a/src/msw/utils.cpp +++ b/src/msw/utils.cpp @@ -31,9 +31,11 @@ #ifndef WX_PRECOMP #include "wx/utils.h" #include "wx/app.h" - #include "wx/cursor.h" #include "wx/intl.h" #include "wx/log.h" +#if wxUSE_GUI + #include "wx/cursor.h" +#endif #endif //WX_PRECOMP // In some mingws there is a missing extern "C" int the winsock header, @@ -449,6 +451,99 @@ bool wxDirExists(const wxString& dir) #endif // Win32/16 } +bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree) +{ + if ( path.empty() ) + return FALSE; + +#ifdef __WIN32__ + // GetDiskFreeSpaceEx() is not available under original Win95, check for + // it + typedef BOOL (*GetDiskFreeSpaceEx_t)(LPCTSTR, + PULARGE_INTEGER, + PULARGE_INTEGER, + PULARGE_INTEGER); + + GetDiskFreeSpaceEx_t + pGetDiskFreeSpaceEx = (GetDiskFreeSpaceEx_t)::GetProcAddress + ( + ::GetModuleHandle(_T("kernel32.dll")), +#if wxUSE_UNICODE + "GetDiskFreeSpaceExW" +#else + "GetDiskFreeSpaceExA" +#endif + ); + + if ( pGetDiskFreeSpaceEx ) + { + ULARGE_INTEGER bytesFree, bytesTotal; + + // may pass the path as is, GetDiskFreeSpaceEx() is smart enough + if ( !pGetDiskFreeSpaceEx(path, + &bytesFree, + &bytesTotal, + NULL) ) + { + wxLogLastError(_T("GetDiskFreeSpaceEx")); + + return FALSE; + } + + if ( pTotal ) + { + *pTotal = wxLongLong(bytesTotal.HighPart, bytesTotal.LowPart); + } + + if ( pFree ) + { + *pFree = wxLongLong(bytesFree.HighPart, bytesFree.LowPart); + } + } + else +#endif // Win32 + { + // there's a problem with drives larger than 2GB, GetDiskFreeSpaceEx() + // should be used instead - but if it's not available, fall back on + // GetDiskFreeSpace() nevertheless... + + DWORD lSectorsPerCluster, + lBytesPerSector, + lNumberOfFreeClusters, + lTotalNumberOfClusters; + + // FIXME: this is wrong, we should extract the root drive from path + // instead, but this is the job for wxFileName... + if ( !::GetDiskFreeSpace(path, + &lSectorsPerCluster, + &lBytesPerSector, + &lNumberOfFreeClusters, + &lTotalNumberOfClusters) ) + { + wxLogLastError(_T("GetDiskFreeSpace")); + + return FALSE; + } + + wxLongLong lBytesPerCluster = lSectorsPerCluster; + lBytesPerCluster *= lBytesPerSector; + + if ( pTotal ) + { + *pTotal = lBytesPerCluster; + *pTotal *= lTotalNumberOfClusters; + } + + if ( pFree ) + { + *pFree = lBytesPerCluster; + *pFree *= lNumberOfFreeClusters; + } + } + + return TRUE; +} + // ---------------------------------------------------------------------------- // env vars // ---------------------------------------------------------------------------- @@ -1233,8 +1328,12 @@ int wxDisplayDepth() void wxDisplaySize(int *width, int *height) { #ifdef __WXMICROWIN__ - // MICROWIN_TODO - *width = 0; * height = 0; + RECT rect; + HWND hWnd = GetDesktopWindow(); + ::GetWindowRect(hWnd, & rect); + + *width = rect.right - rect.left; + *height = rect.bottom - rect.top; #else ScreenHDC dc;