X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8fb3a512a85572ebf4b4f46eaf536727dfe4e01e..aa21388719bc324227895bd2f1328d533dc130e2:/src/msw/utils.cpp diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp index 3555808464..d9996a0453 100644 --- a/src/msw/utils.cpp +++ b/src/msw/utils.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: utils.cpp +// Name: msw/utils.cpp // Purpose: Various utilities // Author: Julian Smart // Modified by: @@ -9,6 +9,14 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// +// ============================================================================ +// declarations +// ============================================================================ + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + #ifdef __GNUG__ // #pragma implementation "utils.h" // Note: this is done in utilscmn.cpp now. #endif @@ -21,18 +29,16 @@ #endif #ifndef WX_PRECOMP - #include "wx/setup.h" #include "wx/utils.h" #include "wx/app.h" #include "wx/cursor.h" #endif //WX_PRECOMP -#include "wx/msw/private.h" +#include "wx/msw/private.h" // includes + #include "wx/timer.h" #include "wx/intl.h" -#include - #include #if !defined(__GNUWIN32__) && !defined(__WXWINE__) && !defined(__SALFORDC__) @@ -118,36 +124,61 @@ // __VISUALC__ /// END for console support +// ---------------------------------------------------------------------------- +// constants +// ---------------------------------------------------------------------------- + // In the WIN.INI file static const wxChar WX_SECTION[] = wxT("wxWindows"); +static const wxChar eUSERNAME[] = wxT("UserName"); + +// these are only used under Win16 +#ifndef __WIN32__ static const wxChar eHOSTNAME[] = wxT("HostName"); static const wxChar eUSERID[] = wxT("UserId"); -static const wxChar eUSERNAME[] = wxT("UserName"); +#endif // !Win32 + +// ============================================================================ +// implementation +// ============================================================================ -// For the following functions we SHOULD fill in support -// for Windows-NT (which I don't know) as I assume it begin -// a POSIX Unix (so claims MS) that it has some special -// functions beyond those provided by WinSock +// ---------------------------------------------------------------------------- +// get host name and related +// ---------------------------------------------------------------------------- // Get full hostname (eg. DoDo.BSn-Germany.crg.de) bool wxGetHostName(wxChar *buf, int maxSize) { #if defined(__WIN32__) && !defined(__TWIN32__) - DWORD nSize = maxSize; - return (::GetComputerName(buf, &nSize) != 0); + // TODO should use GetComputerNameEx() when available + + DWORD nSize = maxSize; + if ( !::GetComputerName(buf, &nSize) ) + { + wxLogLastError("GetComputerName"); + + return FALSE; + } + + return TRUE; #else - wxChar *sysname; - const wxChar *default_host = wxT("noname"); - - if ((sysname = wxGetenv(wxT("SYSTEM_NAME"))) == NULL) { - GetProfileString(WX_SECTION, eHOSTNAME, default_host, buf, maxSize - 1); - } else - wxStrncpy(buf, sysname, maxSize - 1); - buf[maxSize] = wxT('\0'); - return *buf ? TRUE : FALSE; + wxChar *sysname; + const wxChar *default_host = wxT("noname"); + + if ((sysname = wxGetenv(wxT("SYSTEM_NAME"))) == NULL) { + GetProfileString(WX_SECTION, eHOSTNAME, default_host, buf, maxSize - 1); + } else + wxStrncpy(buf, sysname, maxSize - 1); + buf[maxSize] = wxT('\0'); + return *buf ? TRUE : FALSE; #endif } +bool wxGetFullHostName(wxChar *buf, int maxSize) +{ + return wxGetHostName(buf, maxSize); +} + // Get user ID e.g. jacs bool wxGetUserId(wxChar *buf, int maxSize) { @@ -166,23 +197,23 @@ bool wxGetUserId(wxChar *buf, int maxSize) return TRUE; #else // Win16 or Win32s - wxChar *user; - const wxChar *default_id = wxT("anonymous"); - - // Can't assume we have NIS (PC-NFS) or some other ID daemon - // So we ... - if ( (user = wxGetenv(wxT("USER"))) == NULL && - (user = wxGetenv(wxT("LOGNAME"))) == NULL ) - { - // Use wxWindows configuration data (comming soon) - GetProfileString(WX_SECTION, eUSERID, default_id, buf, maxSize - 1); - } - else - { - wxStrncpy(buf, user, maxSize - 1); - } + wxChar *user; + const wxChar *default_id = wxT("anonymous"); + + // Can't assume we have NIS (PC-NFS) or some other ID daemon + // So we ... + if ( (user = wxGetenv(wxT("USER"))) == NULL && + (user = wxGetenv(wxT("LOGNAME"))) == NULL ) + { + // Use wxWindows configuration data (comming soon) + GetProfileString(WX_SECTION, eUSERID, default_id, buf, maxSize - 1); + } + else + { + wxStrncpy(buf, user, maxSize - 1); + } - return *buf ? TRUE : FALSE; + return *buf ? TRUE : FALSE; #endif } @@ -190,149 +221,380 @@ bool wxGetUserId(wxChar *buf, int maxSize) bool wxGetUserName(wxChar *buf, int maxSize) { #if wxUSE_PENWINDOWS && !defined(__WATCOMC__) && !defined(__GNUWIN32__) - extern HANDLE g_hPenWin; // PenWindows Running? - if (g_hPenWin) - { - // PenWindows Does have a user concept! - // Get the current owner of the recognizer - GetPrivateProfileString("Current", "User", default_name, wxBuffer, maxSize - 1, "PENWIN.INI"); - strncpy(buf, wxBuffer, maxSize - 1); - } - else + extern HANDLE g_hPenWin; // PenWindows Running? + if (g_hPenWin) + { + // PenWindows Does have a user concept! + // Get the current owner of the recognizer + GetPrivateProfileString("Current", "User", default_name, wxBuffer, maxSize - 1, "PENWIN.INI"); + strncpy(buf, wxBuffer, maxSize - 1); + } + else #endif - { + { #ifdef USE_NET_API - CHAR szUserName[256]; - if ( !wxGetUserId(szUserName, WXSIZEOF(szUserName)) ) - return FALSE; + CHAR szUserName[256]; + if ( !wxGetUserId(szUserName, WXSIZEOF(szUserName)) ) + return FALSE; - // TODO how to get the domain name? - CHAR *szDomain = ""; + // TODO how to get the domain name? + CHAR *szDomain = ""; - // the code is based on the MSDN example (also see KB article Q119670) - WCHAR wszUserName[256]; // Unicode user name - WCHAR wszDomain[256]; - LPBYTE ComputerName; + // the code is based on the MSDN example (also see KB article Q119670) + WCHAR wszUserName[256]; // Unicode user name + WCHAR wszDomain[256]; + LPBYTE ComputerName; - USER_INFO_2 *ui2; // User structure + USER_INFO_2 *ui2; // User structure - // Convert ANSI user name and domain to Unicode - MultiByteToWideChar( CP_ACP, 0, szUserName, strlen(szUserName)+1, - wszUserName, WXSIZEOF(wszUserName) ); - MultiByteToWideChar( CP_ACP, 0, szDomain, strlen(szDomain)+1, - wszDomain, WXSIZEOF(wszDomain) ); + // Convert ANSI user name and domain to Unicode + MultiByteToWideChar( CP_ACP, 0, szUserName, strlen(szUserName)+1, + wszUserName, WXSIZEOF(wszUserName) ); + MultiByteToWideChar( CP_ACP, 0, szDomain, strlen(szDomain)+1, + wszDomain, WXSIZEOF(wszDomain) ); - // Get the computer name of a DC for the domain. - if ( NetGetDCName( NULL, wszDomain, &ComputerName ) != NERR_Success ) - { - wxLogError(wxT("Can not find domain controller")); + // Get the computer name of a DC for the domain. + if ( NetGetDCName( NULL, wszDomain, &ComputerName ) != NERR_Success ) + { + wxLogError(wxT("Can not find domain controller")); - goto error; - } + goto error; + } - // Look up the user on the DC - NET_API_STATUS status = NetUserGetInfo( (LPWSTR)ComputerName, - (LPWSTR)&wszUserName, - 2, // level - we want USER_INFO_2 - (LPBYTE *) &ui2 ); - switch ( status ) - { - case NERR_Success: - // ok - break; + // Look up the user on the DC + NET_API_STATUS status = NetUserGetInfo( (LPWSTR)ComputerName, + (LPWSTR)&wszUserName, + 2, // level - we want USER_INFO_2 + (LPBYTE *) &ui2 ); + switch ( status ) + { + case NERR_Success: + // ok + break; - case NERR_InvalidComputer: - wxLogError(wxT("Invalid domain controller name.")); + case NERR_InvalidComputer: + wxLogError(wxT("Invalid domain controller name.")); - goto error; + goto error; - case NERR_UserNotFound: - wxLogError(wxT("Invalid user name '%s'."), szUserName); + case NERR_UserNotFound: + wxLogError(wxT("Invalid user name '%s'."), szUserName); - goto error; + goto error; - default: - wxLogSysError(wxT("Can't get information about user")); + default: + wxLogSysError(wxT("Can't get information about user")); - goto error; - } + goto error; + } - // Convert the Unicode full name to ANSI - WideCharToMultiByte( CP_ACP, 0, ui2->usri2_full_name, -1, - buf, maxSize, NULL, NULL ); + // Convert the Unicode full name to ANSI + WideCharToMultiByte( CP_ACP, 0, ui2->usri2_full_name, -1, + buf, maxSize, NULL, NULL ); - return TRUE; + return TRUE; error: - wxLogError(wxT("Couldn't look up full user name.")); + wxLogError(wxT("Couldn't look up full user name.")); - return FALSE; + return FALSE; #else // !USE_NET_API - // Could use NIS, MS-Mail or other site specific programs - // Use wxWindows configuration data - bool ok = GetProfileString(WX_SECTION, eUSERNAME, wxT(""), buf, maxSize - 1) != 0; - if ( !ok ) - { - ok = wxGetUserId(buf, maxSize); + // Could use NIS, MS-Mail or other site specific programs + // Use wxWindows configuration data + bool ok = GetProfileString(WX_SECTION, eUSERNAME, wxT(""), buf, maxSize - 1) != 0; + if ( !ok ) + { + ok = wxGetUserId(buf, maxSize); + } + + if ( !ok ) + { + wxStrncpy(buf, wxT("Unknown User"), maxSize); + } +#endif // Win32/16 } - if ( !ok ) - { - wxStrncpy(buf, wxT("Unknown User"), maxSize); + return TRUE; +} + +const wxChar* wxGetHomeDir(wxString *pstr) +{ + wxString& strDir = *pstr; + + #if defined(__UNIX__) && !defined(__TWIN32__) + const wxChar *szHome = wxGetenv("HOME"); + if ( szHome == NULL ) { + // we're homeless... + wxLogWarning(_("can't find user's HOME, using current directory.")); + strDir = wxT("."); } + else + strDir = szHome; + + // add a trailing slash if needed + if ( strDir.Last() != wxT('/') ) + strDir << wxT('/'); + #else // Windows + #ifdef __WIN32__ + const wxChar *szHome = wxGetenv(wxT("HOMEDRIVE")); + if ( szHome != NULL ) + strDir << szHome; + szHome = wxGetenv(wxT("HOMEPATH")); + if ( szHome != NULL ) { + strDir << szHome; + + // the idea is that under NT these variables have default values + // of "%systemdrive%:" and "\\". As we don't want to create our + // config files in the root directory of the system drive, we will + // create it in our program's dir. However, if the user took care + // 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 ) + return strDir.c_str(); + } + + #else // Win16 + // Win16 has no idea about home, so use the working directory instead + #endif // WIN16/32 + + // 260 was taken from windef.h + #ifndef MAX_PATH + #define MAX_PATH 260 + #endif + + wxString strPath; + ::GetModuleFileName(::GetModuleHandle(NULL), + strPath.GetWriteBuf(MAX_PATH), MAX_PATH); + strPath.UngetWriteBuf(); + + // extract the dir name + wxSplitPath(strPath, &strDir, NULL, NULL); + + #endif // UNIX/Win + + return strDir.c_str(); +} + +wxChar *wxGetUserHome(const wxString& user) +{ + // VZ: the old code here never worked for user != "" anyhow! Moreover, it + // returned sometimes a malloc()'d pointer, sometimes a pointer to a + // static buffer and sometimes I don't even know what. + static wxString s_home; + + return (wxChar *)wxGetHomeDir(&s_home); +} + +bool wxDirExists(const wxString& dir) +{ +#if defined(__WIN32__) + WIN32_FIND_DATA fileInfo; +#else // Win16 + #ifdef __BORLANDC__ + struct ffblk fileInfo; + #else + struct find_t fileInfo; + #endif #endif // Win32/16 - } - return TRUE; +#if defined(__WIN32__) + HANDLE h = ::FindFirstFile(dir, &fileInfo); + + if ( h == INVALID_HANDLE_VALUE ) + { + wxLogLastError("FindFirstFile"); + + return FALSE; + } + + ::FindClose(h); + + return (fileInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0; +#else // Win16 + // 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 } +// ---------------------------------------------------------------------------- +// process management +// ---------------------------------------------------------------------------- + int wxKill(long pid, int sig) { - return 0; + // TODO use SendMessage(WM_QUIT) and TerminateProcess() if needed + + return 0; } -// // Execute a program in an Interactive Shell -// -bool -wxShell(const wxString& command) +bool wxShell(const wxString& command) { - wxChar *shell; - if ((shell = wxGetenv(wxT("COMSPEC"))) == NULL) - shell = wxT("\\COMMAND.COM"); + wxChar *shell = wxGetenv(wxT("COMSPEC")); + if ( !shell ) + shell = wxT("\\COMMAND.COM"); - wxChar tmp[255]; - if (command != wxT("")) - wxSprintf(tmp, wxT("%s /c %s"), shell, WXSTRINGCAST command); - else - wxStrcpy(tmp, shell); + wxString cmd; + if ( !command ) + { + // just the shell + cmd = shell; + } + else + { + // pass the command to execute to the command processor + cmd.Printf(wxT("%s /c %s"), shell, command.c_str()); + } - return (wxExecute((wxChar *)tmp, FALSE) != 0); + return wxExecute(cmd, FALSE) != 0; } +// ---------------------------------------------------------------------------- +// misc +// ---------------------------------------------------------------------------- + // Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX) long wxGetFreeMemory() { #if defined(__WIN32__) && !defined(__BORLANDC__) && !defined(__TWIN32__) - MEMORYSTATUS memStatus; - memStatus.dwLength = sizeof(MEMORYSTATUS); - GlobalMemoryStatus(&memStatus); - return memStatus.dwAvailPhys; + MEMORYSTATUS memStatus; + memStatus.dwLength = sizeof(MEMORYSTATUS); + GlobalMemoryStatus(&memStatus); + return memStatus.dwAvailPhys; #else - return (long)GetFreeSpace(0); + return (long)GetFreeSpace(0); +#endif +} + +// Emit a beeeeeep +void wxBell() +{ + ::MessageBeep((UINT)-1); // default sound +} + +wxString wxGetOsDescription() +{ +#ifdef __WIN32__ + wxString str; + + OSVERSIONINFO info; + wxZeroMemory(info); + + info.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + if ( ::GetVersionEx(&info) ) + { + switch ( info.dwPlatformId ) + { + case VER_PLATFORM_WIN32s: + str = _("Win32s on Windows 3.1"); + break; + + case VER_PLATFORM_WIN32_WINDOWS: + str.Printf(_("Windows 9%c"), + info.dwMinorVersion == 0 ? _T('5') : _T('9')); + if ( !wxIsEmpty(info.szCSDVersion) ) + { + str << _T(" (") << info.szCSDVersion << _T(')'); + } + break; + + case VER_PLATFORM_WIN32_NT: + str.Printf(_T("Windows NT %lu.%lu (build %lu"), + info.dwMajorVersion, + info.dwMinorVersion, + info.dwBuildNumber); + if ( !wxIsEmpty(info.szCSDVersion) ) + { + str << _T(", ") << info.szCSDVersion; + } + str << _T(')'); + break; + } + } + else + { + wxFAIL_MSG( _T("GetVersionEx() failed") ); // should never happen + } + + return str; +#else // Win16 + return _("Windows 3.1"); +#endif // Win32/16 +} + +int wxGetOsVersion(int *majorVsn, int *minorVsn) +{ +#if defined(__WIN32__) && !defined(__SC__) + OSVERSIONINFO info; + wxZeroMemory(info); + + info.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + if ( ::GetVersionEx(&info) ) + { + if (majorVsn) + *majorVsn = info.dwMajorVersion; + if (minorVsn) + *minorVsn = info.dwMinorVersion; + + switch ( info.dwPlatformId ) + { + case VER_PLATFORM_WIN32s: + return wxWIN32S; + + case VER_PLATFORM_WIN32_WINDOWS: + return wxWIN95; + + case VER_PLATFORM_WIN32_NT: + return wxWINDOWS_NT; + } + } + + return wxWINDOWS; // error if we get here, return generic value +#else // Win16 + int retValue = wxWINDOWS; + #ifdef __WINDOWS_386__ + retValue = wxWIN386; + #else + #if !defined(__WATCOMC__) && !defined(GNUWIN32) && wxUSE_PENWINDOWS + extern HANDLE g_hPenWin; + retValue = g_hPenWin ? wxPENWINDOWS : wxWINDOWS; + #endif + #endif + + if (majorVsn) + *majorVsn = 3; + if (minorVsn) + *minorVsn = 1; + + return retValue; #endif } +// ---------------------------------------------------------------------------- +// sleep functions +// ---------------------------------------------------------------------------- + +#if wxUSE_GUI + // Sleep for nSecs seconds. Attempt a Windows implementation using timers. -static bool inTimer = FALSE; +static bool gs_inTimer = FALSE; + class wxSleepTimer: public wxTimer { - public: - inline void Notify() - { - inTimer = FALSE; - Stop(); - } +public: + virtual void Notify() + { + gs_inTimer = FALSE; + Stop(); + } }; static wxTimer *wxTheSleepTimer = NULL; @@ -342,41 +604,37 @@ void wxUsleep(unsigned long milliseconds) #ifdef __WIN32__ ::Sleep(milliseconds); #else - if (inTimer) - return; - - wxTheSleepTimer = new wxSleepTimer; - inTimer = TRUE; - wxTheSleepTimer->Start(milliseconds); - while (inTimer) - { - if (wxTheApp->Pending()) - wxTheApp->Dispatch(); - } - delete wxTheSleepTimer; - wxTheSleepTimer = NULL; + if (gs_inTimer) + return; + + wxTheSleepTimer = new wxSleepTimer; + gs_inTimer = TRUE; + wxTheSleepTimer->Start(milliseconds); + while (gs_inTimer) + { + if (wxTheApp->Pending()) + wxTheApp->Dispatch(); + } + delete wxTheSleepTimer; + wxTheSleepTimer = NULL; #endif } void wxSleep(int nSecs) { -#if 0 // WIN32 hangs app - Sleep( 1000*nSecs ); -#else - if (inTimer) - return; - - wxTheSleepTimer = new wxSleepTimer; - inTimer = TRUE; - wxTheSleepTimer->Start(nSecs*1000); - while (inTimer) - { - if (wxTheApp->Pending()) - wxTheApp->Dispatch(); - } - delete wxTheSleepTimer; - wxTheSleepTimer = NULL; -#endif + if (gs_inTimer) + return; + + wxTheSleepTimer = new wxSleepTimer; + gs_inTimer = TRUE; + wxTheSleepTimer->Start(nSecs*1000); + while (gs_inTimer) + { + if (wxTheApp->Pending()) + wxTheApp->Dispatch(); + } + delete wxTheSleepTimer; + wxTheSleepTimer = NULL; } // Consume all events until no more left @@ -385,6 +643,26 @@ void wxFlushEvents() // wxYield(); } +#elif defined(__WIN32__) // wxUSE_GUI + +void wxUsleep(unsigned long milliseconds) +{ + ::Sleep(milliseconds); +} + +void wxSleep(int nSecs) +{ + wxUsleep(1000*nSecs); +} + +#endif // wxUSE_GUI/!wxUSE_GUI + +// ---------------------------------------------------------------------------- +// deprecated (in favour of wxLog) log functions +// ---------------------------------------------------------------------------- + +#if wxUSE_GUI + // Output a debug mess., in a system dependent fashion. void wxDebugMsg(const wxChar *fmt ...) { @@ -418,64 +696,9 @@ void wxFatalError(const wxString& msg, const wxString& title) FatalAppExit(0, (LPCTSTR)wxBuffer); } -// Emit a beeeeeep -void wxBell() -{ - // Removed by RD because IHMO syncronous sound is a Bad Thing. MessageBeep - // will do a similar thing anyway if there is no sound card... -//#ifdef __WIN32__ -// Beep(1000,1000) ; // 1kHz during 1 sec. -//#else - MessageBeep((UINT)-1) ; -//#endif -} - -// Chris Breeze 27/5/98: revised WIN32 code to -// detect WindowsNT correctly -int wxGetOsVersion(int *majorVsn, int *minorVsn) -{ - if (majorVsn) *majorVsn = 0; - if (minorVsn) *minorVsn = 0; - -#if defined(__WIN32__) && !defined(__SC__) - OSVERSIONINFO info; - memset(&info, 0, sizeof(OSVERSIONINFO)); - info.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - if (GetVersionEx(&info)) - { - if (majorVsn) *majorVsn = info.dwMajorVersion; - if (minorVsn) *minorVsn = info.dwMinorVersion; - switch (info.dwPlatformId) - { - case VER_PLATFORM_WIN32s: - return wxWIN32S; - break; - case VER_PLATFORM_WIN32_WINDOWS: - return wxWIN95; - break; - case VER_PLATFORM_WIN32_NT: - return wxWINDOWS_NT; - break; - } - } - return wxWINDOWS; // error if we get here, return generic value -#else - // Win16 code... - int retValue = 0; -# ifdef __WINDOWS_386__ - retValue = wxWIN386; -# else -# if !defined(__WATCOMC__) && !defined(GNUWIN32) && wxUSE_PENWINDOWS - extern HANDLE g_hPenWin; - retValue = g_hPenWin ? wxPENWINDOWS : wxWINDOWS ; -# endif -# endif - // @@@@ To be completed. I don't have the manual here... - if (majorVsn) *majorVsn = 3 ; - if (minorVsn) *minorVsn = 1 ; - return retValue ; -#endif -} +// ---------------------------------------------------------------------------- +// functions to work with .INI files +// ---------------------------------------------------------------------------- // Reading and writing resources (eg WIN.INI, .Xdefaults) #if wxUSE_RESOURCES @@ -495,84 +718,87 @@ bool wxWriteResource(const wxString& section, const wxString& entry, const wxStr bool wxWriteResource(const wxString& section, const wxString& entry, float value, const wxString& file) { - wxChar buf[50]; - wxSprintf(buf, wxT("%.4f"), value); - return wxWriteResource(section, entry, buf, file); + wxString buf; + buf.Printf(wxT("%.4f"), value); + + return wxWriteResource(section, entry, buf, file); } bool wxWriteResource(const wxString& section, const wxString& entry, long value, const wxString& file) { - wxChar buf[50]; - wxSprintf(buf, wxT("%ld"), value); - return wxWriteResource(section, entry, buf, file); + wxString buf; + buf.Printf(wxT("%ld"), value); + + return wxWriteResource(section, entry, buf, file); } bool wxWriteResource(const wxString& section, const wxString& entry, int value, const wxString& file) { - wxChar buf[50]; - wxSprintf(buf, wxT("%d"), value); - return wxWriteResource(section, entry, buf, file); + wxString buf; + buf.Printf(wxT("%d"), value); + + return wxWriteResource(section, entry, buf, file); } bool wxGetResource(const wxString& section, const wxString& entry, wxChar **value, const wxString& file) { - static const wxChar defunkt[] = wxT("$$default"); - if (file != wxT("")) - { - int n = GetPrivateProfileString((LPCTSTR)WXSTRINGCAST section, (LPCTSTR)WXSTRINGCAST entry, (LPCTSTR)defunkt, - (LPTSTR)wxBuffer, 1000, (LPCTSTR)WXSTRINGCAST file); - if (n == 0 || wxStrcmp(wxBuffer, defunkt) == 0) - return FALSE; - } - else - { - int n = GetProfileString((LPCTSTR)WXSTRINGCAST section, (LPCTSTR)WXSTRINGCAST entry, (LPCTSTR)defunkt, - (LPTSTR)wxBuffer, 1000); - if (n == 0 || wxStrcmp(wxBuffer, defunkt) == 0) - return FALSE; - } - if (*value) delete[] (*value); - *value = copystring(wxBuffer); - return TRUE; + static const wxChar defunkt[] = wxT("$$default"); + if (file != wxT("")) + { + int n = GetPrivateProfileString((LPCTSTR)WXSTRINGCAST section, (LPCTSTR)WXSTRINGCAST entry, (LPCTSTR)defunkt, + (LPTSTR)wxBuffer, 1000, (LPCTSTR)WXSTRINGCAST file); + if (n == 0 || wxStrcmp(wxBuffer, defunkt) == 0) + return FALSE; } + else + { + int n = GetProfileString((LPCTSTR)WXSTRINGCAST section, (LPCTSTR)WXSTRINGCAST entry, (LPCTSTR)defunkt, + (LPTSTR)wxBuffer, 1000); + if (n == 0 || wxStrcmp(wxBuffer, defunkt) == 0) + return FALSE; + } + if (*value) delete[] (*value); + *value = copystring(wxBuffer); + return TRUE; +} bool wxGetResource(const wxString& section, const wxString& entry, float *value, const wxString& file) { - wxChar *s = NULL; - bool succ = wxGetResource(section, entry, (wxChar **)&s, file); - if (succ) - { - *value = (float)wxStrtod(s, NULL); - delete[] s; - return TRUE; - } - else return FALSE; + wxChar *s = NULL; + bool succ = wxGetResource(section, entry, (wxChar **)&s, file); + if (succ) + { + *value = (float)wxStrtod(s, NULL); + delete[] s; + return TRUE; + } + else return FALSE; } bool wxGetResource(const wxString& section, const wxString& entry, long *value, const wxString& file) { - wxChar *s = NULL; - bool succ = wxGetResource(section, entry, (wxChar **)&s, file); - if (succ) - { - *value = wxStrtol(s, NULL, 10); - delete[] s; - return TRUE; - } - else return FALSE; + wxChar *s = NULL; + bool succ = wxGetResource(section, entry, (wxChar **)&s, file); + if (succ) + { + *value = wxStrtol(s, NULL, 10); + delete[] s; + return TRUE; + } + else return FALSE; } bool wxGetResource(const wxString& section, const wxString& entry, int *value, const wxString& file) { - wxChar *s = NULL; - bool succ = wxGetResource(section, entry, (wxChar **)&s, file); - if (succ) - { - *value = (int)wxStrtol(s, NULL, 10); - delete[] s; - return TRUE; - } - else return FALSE; + wxChar *s = NULL; + bool succ = wxGetResource(section, entry, (wxChar **)&s, file); + if (succ) + { + *value = (int)wxStrtol(s, NULL, 10); + delete[] s; + return TRUE; + } + else return FALSE; } #endif // wxUSE_RESOURCES @@ -615,228 +841,96 @@ bool wxIsBusy() return (gs_wxBusyCursorCount > 0); } -// --------------------------------------------------------------------------- -const wxChar* wxGetHomeDir(wxString *pstr) -{ - wxString& strDir = *pstr; - - #if defined(__UNIX__) && !defined(__TWIN32__) - const wxChar *szHome = wxGetenv("HOME"); - if ( szHome == NULL ) { - // we're homeless... - wxLogWarning(_("can't find user's HOME, using current directory.")); - strDir = wxT("."); - } - else - strDir = szHome; - - // add a trailing slash if needed - if ( strDir.Last() != wxT('/') ) - strDir << wxT('/'); - #else // Windows - #ifdef __WIN32__ - const wxChar *szHome = wxGetenv(wxT("HOMEDRIVE")); - if ( szHome != NULL ) - strDir << szHome; - szHome = wxGetenv(wxT("HOMEPATH")); - if ( szHome != NULL ) { - strDir << szHome; - - // the idea is that under NT these variables have default values - // of "%systemdrive%:" and "\\". As we don't want to create our - // config files in the root directory of the system drive, we will - // create it in our program's dir. However, if the user took care - // 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 ) - return strDir.c_str(); - } - - #else // Win16 - // Win16 has no idea about home, so use the working directory instead - #endif // WIN16/32 - - // 260 was taken from windef.h - #ifndef MAX_PATH - #define MAX_PATH 260 - #endif - - wxString strPath; - ::GetModuleFileName(::GetModuleHandle(NULL), - strPath.GetWriteBuf(MAX_PATH), MAX_PATH); - strPath.UngetWriteBuf(); - - // extract the dir name - wxSplitPath(strPath, &strDir, NULL, NULL); - - #endif // UNIX/Win - - return strDir.c_str(); -} - -// Hack for MS-DOS -wxChar *wxGetUserHome (const wxString& user) -{ - wxChar *home; - wxString user1(user); - - if (user1 != wxT("")) { - wxChar tmp[64]; - if (wxGetUserId(tmp, sizeof(tmp)/sizeof(char))) { - // Guests belong in the temp dir - if (wxStricmp(tmp, wxT("annonymous")) == 0) { - if ((home = wxGetenv(wxT("TMP"))) != NULL || - (home = wxGetenv(wxT("TMPDIR"))) != NULL || - (home = wxGetenv(wxT("TEMP"))) != NULL) - return *home ? home : (wxChar*)wxT("\\"); - } - if (wxStricmp(tmp, WXSTRINGCAST user1) == 0) - user1 = wxT(""); - } - } - if (user1 == wxT("")) - if ((home = wxGetenv(wxT("HOME"))) != NULL) - { - wxStrcpy(wxBuffer, home); - Unix2DosFilename(wxBuffer); - return wxBuffer; - } - return NULL; // No home known! -} - // Check whether this window wants to process messages, e.g. Stop button // in long calculations. bool wxCheckForInterrupt(wxWindow *wnd) { - if(wnd){ + wxCHECK( wnd, FALSE ); + MSG msg; - HWND win= (HWND) wnd->GetHWND(); - while(PeekMessage(&msg,win,0,0,PM_REMOVE)){ - TranslateMessage(&msg); - DispatchMessage(&msg); + while ( ::PeekMessage(&msg, GetHwndOf(wnd), 0, 0, PM_REMOVE) ) + { + ::TranslateMessage(&msg); + ::DispatchMessage(&msg); } - return TRUE;//*** temporary? - } - else{ - wxFAIL_MSG(wxT("wnd==NULL !!!")); - return FALSE;//*** temporary? - } + return TRUE; } +#endif // wxUSE_GUI + // MSW only: get user-defined resource from the .res file. // Returns NULL or newly-allocated memory, so use delete[] to clean up. -#ifdef __WXMSW__ wxChar *wxLoadUserResource(const wxString& resourceName, const wxString& resourceType) { - wxChar *s = NULL; -#if !defined(__WIN32__) || defined(__TWIN32__) - HRSRC hResource = ::FindResource(wxGetInstance(), WXSTRINGCAST resourceName, WXSTRINGCAST resourceType); -#else -#ifdef UNICODE - HRSRC hResource = ::FindResourceW(wxGetInstance(), WXSTRINGCAST resourceName, WXSTRINGCAST resourceType); -#else - HRSRC hResource = ::FindResourceA(wxGetInstance(), WXSTRINGCAST resourceName, WXSTRINGCAST resourceType); -#endif -#endif + HRSRC hResource = ::FindResource(wxGetInstance(), resourceName, resourceType); + if ( hResource == 0 ) + return NULL; + + HGLOBAL hData = ::LoadResource(wxGetInstance(), hResource); + if ( hData == 0 ) + return NULL; - if (hResource == 0) - return NULL; - HGLOBAL hData = ::LoadResource(wxGetInstance(), hResource); - if (hData == 0) - return NULL; - wxChar *theText = (wxChar *)LockResource(hData); - if (!theText) - return NULL; + wxChar *theText = (wxChar *)::LockResource(hData); + if ( !theText ) + return NULL; - s = copystring(theText); + // Not all compilers put a zero at the end of the resource (e.g. BC++ doesn't). + // so we need to find the length of the resource. + int len = ::SizeofResource(wxGetInstance(), hResource); + wxChar *s = new wxChar[len+1]; + wxStrncpy(s,theText,len); + s[len]=0; - // Obsolete in WIN32 + // wxChar *s = copystring(theText); + + // Obsolete in WIN32 #ifndef __WIN32__ - UnlockResource(hData); + UnlockResource(hData); #endif - // No need?? -// GlobalFree(hData); + // No need?? + // GlobalFree(hData); - return s; + return s; } -#endif + +// ---------------------------------------------------------------------------- +// get display info +// ---------------------------------------------------------------------------- void wxGetMousePosition( int* x, int* y ) { - POINT pt; - GetCursorPos( & pt ); - *x = pt.x; - *y = pt.y; + POINT pt; + GetCursorPos( & pt ); + if ( x ) *x = pt.x; + if ( y ) *y = pt.y; }; // Return TRUE if we have a colour display bool wxColourDisplay() { - HDC dc = ::GetDC((HWND) NULL); - bool flag; - int noCols = GetDeviceCaps(dc, NUMCOLORS); - if ((noCols == -1) || (noCols > 2)) - flag = TRUE; - else - flag = FALSE; - ReleaseDC((HWND) NULL, dc); - return flag; + ScreenHDC dc; + int noCols = GetDeviceCaps(dc, NUMCOLORS); + + return (noCols == -1) || (noCols > 2); } // Returns depth of screen int wxDisplayDepth() { - HDC dc = ::GetDC((HWND) NULL); - int planes = GetDeviceCaps(dc, PLANES); - int bitsPerPixel = GetDeviceCaps(dc, BITSPIXEL); - int depth = planes*bitsPerPixel; - ReleaseDC((HWND) NULL, dc); - return depth; + ScreenHDC dc; + return GetDeviceCaps(dc, PLANES) * GetDeviceCaps(dc, BITSPIXEL); } // Get size of display void wxDisplaySize(int *width, int *height) { - HDC dc = ::GetDC((HWND) NULL); - *width = GetDeviceCaps(dc, HORZRES); *height = GetDeviceCaps(dc, VERTRES); - ReleaseDC((HWND) NULL, dc); -} - -bool wxDirExists(const wxString& dir) -{ - /* MATTHEW: [6] Always use same code for Win32, call FindClose */ -#if defined(__WIN32__) - WIN32_FIND_DATA fileInfo; -#else -#ifdef __BORLANDC__ - struct ffblk fileInfo; -#else - struct find_t fileInfo; -#endif -#endif - -#if defined(__WIN32__) - HANDLE h = FindFirstFile((LPTSTR) WXSTRINGCAST dir,(LPWIN32_FIND_DATA)&fileInfo); + ScreenHDC dc; - if (h==INVALID_HANDLE_VALUE) - return FALSE; - else { - FindClose(h); - return ((fileInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == FILE_ATTRIBUTE_DIRECTORY); - } -#else - // 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(WXSTRINGCAST dir, &fileInfo, _A_SUBDIR) == 0 && (fileInfo.ff_attrib & _A_SUBDIR) != 0)); -#else - return (((_dos_findfirst(WXSTRINGCAST dir, _A_SUBDIR, &fileInfo) == 0) && (fileInfo.attrib & _A_SUBDIR)) != 0); -#endif -#endif + if ( width ) *width = GetDeviceCaps(dc, HORZRES); + if ( height ) *height = GetDeviceCaps(dc, VERTRES); } // --------------------------------------------------------------------------- @@ -1064,140 +1158,6 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special ) #endif -#if defined(__WIN95__) && defined(__WXDEBUG__) && wxUSE_DBWIN32 - -/* -When I started programming with Visual C++ v4.0, I missed one of my favorite -tools -- DBWIN. Finding the code for a simple debug trace utility, DBMON, -on MSDN was a step in the right direction, but it is a console application -and thus has limited features and extensibility. DBWIN32 is my creation -to solve this problem. - -The code is essentially a merging of a stripped down version of the DBWIN code -from VC 1.5 and DBMON.C with a few 32 bit changes. - -As of version 1.2B, DBWIN32 supports both Win95 and NT. The NT support is -built into the operating system and works just by running DBWIN32. The Win95 -team decided not to support this hook, so I have provided code that will do -this for you. See the file WIN95.TXT for instructions on installing this. - -If you have questions, problems or suggestions about DBWIN32, I welcome your -feedback and plan to actively maintain the code. - -Andrew Tucker -ast@halcyon.com - -To download dbwin32, see e.g.: - -http://ftp.digital.com/pub/micro/NT/WinSite/programr/dbwin32.zip -*/ - -#if !defined(__MWERKS__) && !defined(__SALFORDC__) && !defined(__TWIN32__) -#include -#endif - -void OutputDebugStringW95(const wxChar* lpOutputString, ...) -{ - HANDLE heventDBWIN; /* DBWIN32 synchronization object */ - HANDLE heventData; /* data passing synch object */ - HANDLE hSharedFile; /* memory mapped file shared data */ - LPSTR lpszSharedMem; - wxChar achBuffer[500]; - - /* create the output buffer */ - va_list args; - va_start(args, lpOutputString); - wxVsprintf(achBuffer, lpOutputString, args); - va_end(args); - - /* - Do a regular OutputDebugString so that the output is - still seen in the debugger window if it exists. - - This ifdef is necessary to avoid infinite recursion - from the inclusion of W95TRACE.H - */ -#ifdef _UNICODE - ::OutputDebugStringW(achBuffer); -#else -#ifdef __TWIN32__ - ::OutputDebugString(achBuffer); -#else - ::OutputDebugStringA(achBuffer); -#endif -#endif - - /* bail if it's not Win95 */ - { - OSVERSIONINFO VerInfo; - VerInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - GetVersionEx(&VerInfo); - if ( VerInfo.dwPlatformId != VER_PLATFORM_WIN32_WINDOWS ) - return; - } - - /* make sure DBWIN is open and waiting */ - heventDBWIN = OpenEvent(EVENT_MODIFY_STATE, FALSE, wxT("DBWIN_BUFFER_READY")); - if ( !heventDBWIN ) - { - //MessageBox(NULL, wxT("DBWIN_BUFFER_READY nonexistent"), NULL, MB_OK); - return; - } - - /* get a handle to the data synch object */ - heventData = OpenEvent(EVENT_MODIFY_STATE, FALSE, wxT("DBWIN_DATA_READY")); - if ( !heventData ) - { - // MessageBox(NULL, wxT("DBWIN_DATA_READY nonexistent"), NULL, MB_OK); - CloseHandle(heventDBWIN); - return; - } - - hSharedFile = CreateFileMapping((HANDLE)-1, NULL, PAGE_READWRITE, 0, 4096, wxT("DBWIN_BUFFER")); - if (!hSharedFile) - { - //MessageBox(NULL, wxT("DebugTrace: Unable to create file mapping object DBWIN_BUFFER"), wxT("Error"), MB_OK); - CloseHandle(heventDBWIN); - CloseHandle(heventData); - return; - } - - lpszSharedMem = (LPSTR)MapViewOfFile(hSharedFile, FILE_MAP_WRITE, 0, 0, 512); - if (!lpszSharedMem) - { - //MessageBox(NULL, wxT("DebugTrace: Unable to map shared memory"), wxT("Error"), MB_OK); - CloseHandle(heventDBWIN); - CloseHandle(heventData); - return; - } - - /* wait for buffer event */ - WaitForSingleObject(heventDBWIN, INFINITE); - - /* write it to the shared memory */ -#if defined( __BORLANDC__ ) || defined( __MWERKS__ ) || defined(__SALFORDC__) - *((LPDWORD)lpszSharedMem) = getpid(); -#else - *((LPDWORD)lpszSharedMem) = _getpid(); -#endif - - wsprintf((LPTSTR)(lpszSharedMem + sizeof(DWORD)), wxT("%s"), achBuffer); - - /* signal data ready event */ - SetEvent(heventData); - - /* clean up handles */ - CloseHandle(hSharedFile); - CloseHandle(heventData); - CloseHandle(heventDBWIN); - - return; -} - - -#endif - - #if 0 // maximum mumber of lines the output console should have