X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3c302c07bc17b1c1e4ad54071dd19b63fd31bb5f..cc8cc54f8308660af5730d8c3da5ba4710dc0dbb:/src/msw/utils.cpp diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp index 97f1369e3c..9d83179e0a 100644 --- a/src/msw/utils.cpp +++ b/src/msw/utils.cpp @@ -34,6 +34,8 @@ #include "wx/apptrait.h" #include "wx/dynload.h" +#include "wx/confbase.h" // for wxExpandEnvVars() + #include "wx/msw/private.h" // includes #include "wx/msw/missing.h" // CHARSET_HANGUL @@ -92,6 +94,11 @@ #endif #endif +// 260 was taken from windef.h +#ifndef MAX_PATH + #define MAX_PATH 260 +#endif + // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- @@ -100,12 +107,6 @@ static const wxChar WX_SECTION[] = wxT("wxWindows"); static const wxChar eUSERNAME[] = wxT("UserName"); -// these are only used under Win16 -#if !defined(__WIN32__) && !defined(__WXMICROWIN__) -static const wxChar eHOSTNAME[] = wxT("HostName"); -static const wxChar eUSERID[] = wxT("UserId"); -#endif // !Win32 - // ============================================================================ // implementation // ============================================================================ @@ -118,14 +119,14 @@ static const wxChar eUSERID[] = wxT("UserId"); bool wxGetHostName(wxChar *buf, int maxSize) { #if defined(__WXWINCE__) - return FALSE; + return false; #elif defined(__WIN32__) && !defined(__WXMICROWIN__) DWORD nSize = maxSize; if ( !::GetComputerName(buf, &nSize) ) { wxLogLastError(wxT("GetComputerName")); - return FALSE; + return false; } return TRUE; @@ -149,7 +150,10 @@ bool wxGetFullHostName(wxChar *buf, int maxSize) // TODO should use GetComputerNameEx() when available // we don't want to always link with Winsock DLL as we might not use it at - // all, so load it dynamically here if needed + // all, so load it dynamically here if needed (and don't complain if it is + // missing, we handle this) + wxLogNull noLog; + wxDynamicLibrary dllWinsock(_T("ws2_32.dll"), wxDL_VERBATIM); if ( dllWinsock.IsLoaded() ) { @@ -227,8 +231,8 @@ bool wxGetFullHostName(wxChar *buf, int maxSize) bool wxGetUserId(wxChar *buf, int maxSize) { #if defined(__WXWINCE__) - return FALSE; -#elif defined(__WIN32__) && !defined(__win32s__) && !defined(__WXMICROWIN__) + return false; +#elif defined(__WIN32__) && !defined(__WXMICROWIN__) DWORD nSize = maxSize; if ( ::GetUserName(buf, &nSize) == 0 ) { @@ -242,7 +246,7 @@ bool wxGetUserId(wxChar *buf, int maxSize) } return TRUE; -#else // Win16 or Win32s +#else // __WXMICROWIN__ wxChar *user; const wxChar *default_id = wxT("anonymous"); @@ -251,7 +255,7 @@ bool wxGetUserId(wxChar *buf, int maxSize) if ( (user = wxGetenv(wxT("USER"))) == NULL && (user = wxGetenv(wxT("LOGNAME"))) == NULL ) { - // Use wxWindows configuration data (comming soon) + // Use wxWidgets configuration data (comming soon) GetProfileString(WX_SECTION, eUSERID, default_id, buf, maxSize - 1); } else @@ -267,11 +271,11 @@ bool wxGetUserId(wxChar *buf, int maxSize) bool wxGetUserName(wxChar *buf, int maxSize) { #if defined(__WXWINCE__) - return FALSE; + return false; #elif defined(USE_NET_API) CHAR szUserName[256]; if ( !wxGetUserId(szUserName, WXSIZEOF(szUserName)) ) - return FALSE; + return false; // TODO how to get the domain name? CHAR *szDomain = ""; @@ -336,7 +340,7 @@ error: return FALSE; #else // !USE_NET_API // Could use NIS, MS-Mail or other site specific programs - // Use wxWindows configuration data + // Use wxWidgets configuration data bool ok = GetProfileString(WX_SECTION, eUSERNAME, wxEmptyString, buf, maxSize - 1) != 0; if ( !ok ) { @@ -354,8 +358,9 @@ error: const wxChar* wxGetHomeDir(wxString *pstr) { - wxString& strDir = *pstr; + wxString& strDir = *pstr; + // first branch is for Cygwin #if defined(__UNIX__) const wxChar *szHome = wxGetenv("HOME"); if ( szHome == NULL ) { @@ -371,34 +376,33 @@ const wxChar* wxGetHomeDir(wxString *pstr) strDir << wxT('/'); #ifdef __CYGWIN__ - // Cygwin returns unix type path but that does not work well - static wxChar windowsPath[MAX_PATH]; - cygwin_conv_to_full_win32_path(strDir, windowsPath); - strDir = windowsPath; + // Cygwin returns unix type path but that does not work well + static wxChar windowsPath[MAX_PATH]; + cygwin_conv_to_full_win32_path(strDir, windowsPath); + strDir = windowsPath; #endif #elif defined(__WXWINCE__) // Nothing #else - #ifdef __WIN32__ - strDir.clear(); + strDir.clear(); - // If we have a valid HOME directory, as is used on many machines that - // have unix utilities on them, we should use that. - const wxChar *szHome = wxGetenv(wxT("HOME")); + // If we have a valid HOME directory, as is used on many machines that + // have unix utilities on them, we should use that. + const wxChar *szHome = wxGetenv(wxT("HOME")); - if ( szHome != NULL ) - { + if ( szHome != NULL ) + { strDir = szHome; - } - else // no HOME, try HOMEDRIVE/PATH - { - szHome = wxGetenv(wxT("HOMEDRIVE")); - if ( szHome != NULL ) + } + else // no HOME, try HOMEDRIVE/PATH + { + szHome = wxGetenv(wxT("HOMEDRIVE")); + if ( szHome != NULL ) strDir << szHome; - szHome = wxGetenv(wxT("HOMEPATH")); + szHome = wxGetenv(wxT("HOMEPATH")); - if ( szHome != NULL ) - { + if ( szHome != NULL ) + { strDir << szHome; // the idea is that under NT these variables have default values @@ -408,44 +412,38 @@ const wxChar* wxGetHomeDir(wxString *pstr) // to set HOMEPATH to something other than "\\", we suppose that he // knows what he is doing and use the supplied value. if ( wxStrcmp(szHome, wxT("\\")) == 0 ) - strDir.clear(); - } - } + strDir.clear(); + } + } - if ( strDir.empty() ) - { - // If we have a valid USERPROFILE directory, as is the case in - // Windows NT, 2000 and XP, we should use that as our home directory. - szHome = wxGetenv(wxT("USERPROFILE")); + if ( strDir.empty() ) + { + // If we have a valid USERPROFILE directory, as is the case in + // Windows NT, 2000 and XP, we should use that as our home directory. + szHome = wxGetenv(wxT("USERPROFILE")); - if ( szHome != NULL ) + if ( szHome != NULL ) strDir = szHome; - } - - if ( !strDir.empty() ) - { - return strDir.c_str(); - } - //else: fall back to the prograrm directory - #else // Win16 - // Win16 has no idea about home, so use the executable directory instead - #endif // WIN16/32 - - // 260 was taken from windef.h - #ifndef MAX_PATH - #define MAX_PATH 260 - #endif - - wxString strPath; - ::GetModuleFileName(::GetModuleHandle(NULL), - wxStringBuffer(strPath, MAX_PATH), MAX_PATH); + } - // extract the dir name - wxSplitPath(strPath, &strDir, NULL, NULL); + if ( !strDir.empty() ) + { + // sometimes the value of HOME may be "%USERPROFILE%", so reexpand the + // value once again, it shouldn't hurt anyhow + strDir = wxExpandEnvVars(strDir); + } + else // fall back to the program directory + { + wxString strPath; + ::GetModuleFileName(::GetModuleHandle(NULL), + wxStringBuffer(strPath, MAX_PATH), MAX_PATH); + // extract the dir name + wxSplitPath(strPath, &strDir, NULL, NULL); + } #endif // UNIX/Win - return strDir.c_str(); + return strDir.c_str(); } wxChar *wxGetUserHome(const wxString& WXUNUSED(user)) @@ -465,32 +463,16 @@ bool wxDirExists(const wxString& dir) #elif defined(__WIN32__) DWORD attribs = GetFileAttributes(dir); return ((attribs != (DWORD)-1) && (attribs & FILE_ATTRIBUTE_DIRECTORY)); -#else // Win16 - #ifdef __BORLANDC__ - struct ffblk fileInfo; - #else - struct find_t fileInfo; - #endif - // In Borland findfirst has a different argument - // ordering from _dos_findfirst. But _dos_findfirst - // _should_ be ok in both MS and Borland... why not? - #ifdef __BORLANDC__ - return (findfirst(dir, &fileInfo, _A_SUBDIR) == 0 && - (fileInfo.ff_attrib & _A_SUBDIR) != 0); - #else - return (_dos_findfirst(dir, _A_SUBDIR, &fileInfo) == 0) && - ((fileInfo.attrib & _A_SUBDIR) != 0); - #endif -#endif // Win32/16 +#endif // Win32/__WXMICROWIN__ } bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree) { #ifdef __WXWINCE__ - return FALSE; + return false; #else if ( path.empty() ) - return FALSE; + return false; // old w32api don't have ULARGE_INTEGER #if defined(__WIN32__) && \ @@ -600,17 +582,6 @@ bool wxGetEnv(const wxString& var, wxString *value) { #ifdef __WXWINCE__ return FALSE; -#elif defined(__WIN16__) - const wxChar* ret = wxGetenv(var); - if ( !ret ) - return FALSE; - - if ( value ) - { - *value = ret; - } - - return TRUE; #else // Win32 // first get the size of the buffer DWORD dwRet = ::GetEnvironmentVariable(var, NULL, 0); @@ -627,7 +598,7 @@ bool wxGetEnv(const wxString& var, wxString *value) } return TRUE; -#endif // Win16/32 +#endif // WinCE/32 } bool wxSetEnv(const wxString& var, const wxChar *value) @@ -846,14 +817,15 @@ int wxKill(long pid, wxSignal sig, wxKillError *krc) // Execute a program in an Interactive Shell bool wxShell(const wxString& command) { + wxString cmd; + #ifdef __WXWINCE__ - return FALSE; + cmd = command; #else wxChar *shell = wxGetenv(wxT("COMSPEC")); if ( !shell ) shell = (wxChar*) wxT("\\COMMAND.COM"); - wxString cmd; if ( !command ) { // just the shell @@ -864,9 +836,9 @@ bool wxShell(const wxString& command) // pass the command to execute to the command processor cmd.Printf(wxT("%s /c %s"), shell, command.c_str()); } +#endif return wxExecute(cmd, wxEXEC_SYNC) == 0; -#endif } // Shutdown or reboot the PC @@ -922,12 +894,10 @@ bool wxShutdown(wxShutdownFlags wFlags) return FALSE; } - bOK = ::ExitWindowsEx(EWX_SHUTDOWN | EWX_FORCE | EWX_REBOOT, 0) != 0; + bOK = ::ExitWindowsEx(flags, 0) != 0; } return bOK; -#else // Win16 - return FALSE; #endif // Win32/16 } @@ -950,11 +920,7 @@ long wxGetFreeMemory() unsigned long wxGetProcessId() { -#ifdef __WIN32__ return ::GetCurrentProcessId(); -#else - return 0; -#endif } // Emit a beeeeeep @@ -965,7 +931,6 @@ void wxBell() wxString wxGetOsDescription() { -#ifdef __WIN32__ wxString str; OSVERSIONINFO info; @@ -1008,9 +973,6 @@ wxString wxGetOsDescription() } return str; -#else // Win16 - return _("Windows 3.1"); -#endif // Win32/16 } wxToolkitInfo& wxAppTraits::GetToolkitInfo() @@ -1052,12 +1014,12 @@ wxToolkitInfo& wxAppTraits::GetToolkitInfo() case VER_PLATFORM_WIN32_CE: s_ver = wxWINDOWS_CE; break; -#endif +#endif } } } - static wxToolkitInfo info; + static wxToolkitInfo info; info.versionMajor = s_major; info.versionMinor = s_minor; info.os = s_ver; @@ -1069,14 +1031,19 @@ wxToolkitInfo& wxAppTraits::GetToolkitInfo() // sleep functions // ---------------------------------------------------------------------------- -void wxUsleep(unsigned long milliseconds) +void wxMilliSleep(unsigned long milliseconds) { ::Sleep(milliseconds); } +void wxMicroSleep(unsigned long microseconds) +{ + wxMilliSleep(microseconds/1000); +} + void wxSleep(int nSecs) { - wxUsleep(1000*nSecs); + wxMilliSleep(1000*nSecs); } // ---------------------------------------------------------------------------- @@ -1232,3 +1199,62 @@ extern long wxCharsetToCodepage(const wxChar *name) #endif // wxUSE_FONTMAP/!wxUSE_FONTMAP +/* + Creates a hidden window with supplied window proc registering the class for + it if necesssary (i.e. the first time only). Caller is responsible for + destroying the window and unregistering the class (note that this must be + done because wxWidgets may be used as a DLL and so may be loaded/unloaded + multiple times into/from the same process so we cna't rely on automatic + Windows class unregistration). + + pclassname is a pointer to a caller stored classname, which must initially be + NULL. classname is the desired wndclass classname. If function succesfully + registers the class, pclassname will be set to classname. + */ +extern "C" WXDLLIMPEXP_BASE HWND +wxCreateHiddenWindow(LPCTSTR *pclassname, LPCTSTR classname, WNDPROC wndproc) +{ + wxCHECK_MSG( classname && pclassname && wndproc, NULL, + _T("NULL parameter in wxCreateHiddenWindow") ); + + // register the class fi we need to first + if ( *pclassname == NULL ) + { + WNDCLASS wndclass; + wxZeroMemory(wndclass); + + wndclass.lpfnWndProc = wndproc; + wndclass.hInstance = wxGetInstance(); + wndclass.lpszClassName = classname; + + if ( !::RegisterClass(&wndclass) ) + { + wxLogLastError(wxT("RegisterClass() in wxCreateHiddenWindow")); + + return NULL; + } + + *pclassname = classname; + } + + // next create the window + HWND hwnd = ::CreateWindow + ( + *pclassname, + NULL, + 0, 0, 0, 0, + 0, + (HWND) NULL, + (HMENU)NULL, + wxGetInstance(), + (LPVOID) NULL + ); + + if ( !hwnd ) + { + wxLogLastError(wxT("CreateWindow() in wxCreateHiddenWindow")); + } + + return hwnd; +} +