X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5bc3ef05b8c6ac080208333f620ce68fe9ff7203..fcdd53359135f790b85728c4254b97095a56dad8:/src/msw/utils.cpp diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp index be4a4d481b..328839265a 100644 --- a/src/msw/utils.cpp +++ b/src/msw/utils.cpp @@ -55,7 +55,7 @@ #include #endif -#if !defined(__GNUWIN32__) && !defined(__SALFORDC__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__) +#if !defined(__GNUWIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__) #include #ifndef __MWERKS__ @@ -132,7 +132,7 @@ bool wxGetHostName(wxChar *WXUNUSED_IN_WINCE(buf), #if defined(__WXWINCE__) // TODO-CE return false; -#elif defined(__WIN32__) && !defined(__WXMICROWIN__) +#else DWORD nSize = maxSize; if ( !::GetComputerName(buf, &nSize) ) { @@ -142,16 +142,6 @@ bool wxGetHostName(wxChar *WXUNUSED_IN_WINCE(buf), } 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; #endif } @@ -228,7 +218,7 @@ bool wxGetFullHostName(wxChar *buf, int maxSize) if ( !host.empty() ) { - wxStrncpy(buf, host, maxSize); + wxStrlcpy(buf, host.c_str(), maxSize); return true; } @@ -246,7 +236,7 @@ bool wxGetUserId(wxChar *WXUNUSED_IN_WINCE(buf), #if defined(__WXWINCE__) // TODO-CE return false; -#elif defined(__WIN32__) && !defined(__WXMICROWIN__) +#else DWORD nSize = maxSize; if ( ::GetUserName(buf, &nSize) == 0 ) { @@ -260,24 +250,6 @@ bool wxGetUserId(wxChar *WXUNUSED_IN_WINCE(buf), } return true; -#else // __WXMICROWIN__ - 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 wxWidgets configuration data (comming soon) - GetProfileString(WX_SECTION, eUSERID, default_id, buf, maxSize - 1); - } - else - { - wxStrncpy(buf, user, maxSize - 1); - } - - return *buf ? true : false; #endif } @@ -294,8 +266,7 @@ bool wxGetUserName(wxChar *buf, int maxSize) wxString name; if(!key.QueryValue(wxT("Owner"),name)) return false; - wxStrncpy(buf, name.c_str(), maxSize-1); - buf[maxSize-1] = _T('\0'); + wxStrlcpy(buf, name.c_str(), maxSize); return true; #elif defined(USE_NET_API) CHAR szUserName[256]; @@ -374,7 +345,7 @@ error: if ( !ok ) { - wxStrncpy(buf, wxT("Unknown User"), maxSize); + wxStrlcpy(buf, wxT("Unknown User"), maxSize); } return true; @@ -467,14 +438,14 @@ const wxChar* wxGetHomeDir(wxString *pstr) return strDir.c_str(); } -wxChar *wxGetUserHome(const wxString& WXUNUSED(user)) +wxString 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; + wxString home; + + if ( user.empty() || user == wxGetUserId() ) + wxGetHomeDir(&home); - return (wxChar *)wxGetHomeDir(&s_home); + return home; } bool wxGetDiskSpace(const wxString& WXUNUSED_IN_WINCE(path), @@ -608,7 +579,7 @@ bool wxGetEnv(const wxString& WXUNUSED_IN_WINCE(var), return false; #else // Win32 // first get the size of the buffer - DWORD dwRet = ::GetEnvironmentVariable(var.wx_str(), NULL, 0); + DWORD dwRet = ::GetEnvironmentVariable(var.t_str(), NULL, 0); if ( !dwRet ) { // this means that there is no such variable @@ -617,7 +588,7 @@ bool wxGetEnv(const wxString& WXUNUSED_IN_WINCE(var), if ( value ) { - (void)::GetEnvironmentVariable(var.wx_str(), + (void)::GetEnvironmentVariable(var.t_str(), wxStringBuffer(*value, dwRet), dwRet); } @@ -635,7 +606,7 @@ bool wxDoSetEnv(const wxString& WXUNUSED_IN_WINCE(var), // no environment variables under CE return false; #else - if ( !::SetEnvironmentVariable(var.wx_str(), value) ) + if ( !::SetEnvironmentVariable(var.t_str(), value) ) { wxLogLastError(_T("SetEnvironmentVariable")); @@ -648,7 +619,7 @@ bool wxDoSetEnv(const wxString& WXUNUSED_IN_WINCE(var), bool wxSetEnv(const wxString& variable, const wxString& value) { - return wxDoSetEnv(variable, value.wx_str()); + return wxDoSetEnv(variable, value.t_str()); } bool wxUnsetEnv(const wxString& variable) @@ -953,7 +924,7 @@ bool wxShell(const wxString& command) } // Shutdown or reboot the PC -bool wxShutdown(wxShutdownFlags WXUNUSED_IN_WINCE(wFlags)) +bool wxShutdown(int WXUNUSED_IN_WINCE(flags)) { #ifdef __WXWINCE__ // TODO-CE @@ -973,32 +944,47 @@ bool wxShutdown(wxShutdownFlags WXUNUSED_IN_WINCE(wFlags)) TOKEN_PRIVILEGES tkp; // Get the LUID for the shutdown privilege. - ::LookupPrivilegeValue(NULL, SE_SHUTDOWN_NAME, - &tkp.Privileges[0].Luid); + bOK = ::LookupPrivilegeValue(NULL, SE_SHUTDOWN_NAME, + &tkp.Privileges[0].Luid) != 0; - tkp.PrivilegeCount = 1; // one privilege to set - tkp.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; + if ( bOK ) + { + tkp.PrivilegeCount = 1; // one privilege to set + tkp.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; - // Get the shutdown privilege for this process. - ::AdjustTokenPrivileges(hToken, FALSE, &tkp, 0, - (PTOKEN_PRIVILEGES)NULL, 0); + // Get the shutdown privilege for this process. + ::AdjustTokenPrivileges(hToken, FALSE, &tkp, 0, + (PTOKEN_PRIVILEGES)NULL, 0); - // Cannot test the return value of AdjustTokenPrivileges. - bOK = ::GetLastError() == ERROR_SUCCESS; + // Cannot test the return value of AdjustTokenPrivileges. + bOK = ::GetLastError() == ERROR_SUCCESS; + } + + ::CloseHandle(hToken); } } if ( bOK ) { - UINT flags = EWX_SHUTDOWN | EWX_FORCE; - switch ( wFlags ) + UINT wFlags = 0; + if ( flags & wxSHUTDOWN_FORCE ) + { + wFlags = EWX_FORCE; + flags &= ~wxSHUTDOWN_FORCE; + } + + switch ( flags ) { case wxSHUTDOWN_POWEROFF: - flags |= EWX_POWEROFF; + wFlags |= EWX_POWEROFF; break; case wxSHUTDOWN_REBOOT: - flags |= EWX_REBOOT; + wFlags |= EWX_REBOOT; + break; + + case wxSHUTDOWN_LOGOFF: + wFlags |= EWX_LOGOFF; break; default: @@ -1006,11 +992,11 @@ bool wxShutdown(wxShutdownFlags WXUNUSED_IN_WINCE(wFlags)) return false; } - bOK = ::ExitWindowsEx(flags, 0) != 0; + bOK = ::ExitWindowsEx(wFlags, 0) != 0; } return bOK; -#endif // Win32/16 +#endif // WinCE/!WinCE } // ---------------------------------------------------------------------------- @@ -1067,6 +1053,41 @@ bool wxIsDebuggerRunning() // OS version // ---------------------------------------------------------------------------- +// check if we're running under a server or workstation Windows system: it +// returns true or false with obvious meaning as well as -1 if the system type +// couldn't be determined +// +// this function is currently private but we may want to expose it later if +// it's really useful +namespace +{ + +int wxIsWindowsServer() +{ +#ifdef VER_NT_WORKSTATION + OSVERSIONINFOEX info; + wxZeroMemory(info); + + info.dwOSVersionInfoSize = sizeof(info); + if ( ::GetVersionEx(reinterpret_cast(&info)) ) + { + switch ( info.wProductType ) + { + case VER_NT_WORKSTATION: + return false; + + case VER_NT_SERVER: + case VER_NT_DOMAIN_CONTROLLER: + return true; + } + } +#endif // VER_NT_WORKSTATION + + return -1; +} + +} // anonymous namespace + wxString wxGetOsDescription() { wxString str; @@ -1131,24 +1152,44 @@ wxString wxGetOsDescription() break; case VER_PLATFORM_WIN32_NT: - if ( info.dwMajorVersion == 5 ) + switch ( info.dwMajorVersion ) { - switch ( info.dwMinorVersion ) - { - case 0: - str.Printf(_("Windows 2000 (build %lu"), - info.dwBuildNumber); - break; - case 1: - str.Printf(_("Windows XP (build %lu"), - info.dwBuildNumber); - break; - case 2: - str.Printf(_("Windows Server 2003 (build %lu"), + case 5: + switch ( info.dwMinorVersion ) + { + case 0: + str.Printf(_("Windows 2000 (build %lu"), + info.dwBuildNumber); + break; + + case 2: + // we can't distinguish between XP 64 and 2003 + // as they both are 5.2, so examine the product + // type to resolve this ambiguity + if ( wxIsWindowsServer() == 1 ) + { + str.Printf(_("Windows Server 2003 (build %lu"), + info.dwBuildNumber); + break; + } + //else: must be XP, fall through + + case 1: + str.Printf(_("Windows XP (build %lu"), + info.dwBuildNumber); + break; + } + break; + + case 6: + if ( info.dwMinorVersion == 0 ) + { + str.Printf(_("Windows Vista (build %lu"), info.dwBuildNumber); - break; - } + } + break; } + if ( str.empty() ) { str.Printf(_("Windows NT %lu.%lu (build %lu"), @@ -1156,11 +1197,15 @@ wxString wxGetOsDescription() info.dwMinorVersion, info.dwBuildNumber); } + if ( !wxIsEmpty(info.szCSDVersion) ) { str << _T(", ") << info.szCSDVersion; } str << _T(')'); + + if ( wxIsPlatform64Bit() ) + str << _(", 64-bit edition"); break; } } @@ -1439,8 +1484,10 @@ extern WXDLLIMPEXP_BASE long wxEncodingToCodepage(wxFontEncoding encoding) case wxFONTENCODING_ISO8859_13: ret = 28603; break; // case wxFONTENCODING_ISO8859_14: ret = 28604; break; // no correspondence on Windows case wxFONTENCODING_ISO8859_15: ret = 28605; break; + case wxFONTENCODING_KOI8: ret = 20866; break; case wxFONTENCODING_KOI8_U: ret = 21866; break; + case wxFONTENCODING_CP437: ret = 437; break; case wxFONTENCODING_CP850: ret = 850; break; case wxFONTENCODING_CP852: ret = 852; break; @@ -1459,7 +1506,9 @@ extern WXDLLIMPEXP_BASE long wxEncodingToCodepage(wxFontEncoding encoding) case wxFONTENCODING_CP1255: ret = 1255; break; case wxFONTENCODING_CP1256: ret = 1256; break; case wxFONTENCODING_CP1257: ret = 1257; break; + case wxFONTENCODING_EUC_JP: ret = 20932; break; + case wxFONTENCODING_MACROMAN: ret = 10000; break; case wxFONTENCODING_MACJAPANESE: ret = 10001; break; case wxFONTENCODING_MACCHINESETRAD: ret = 10002; break; @@ -1474,8 +1523,12 @@ extern WXDLLIMPEXP_BASE long wxEncodingToCodepage(wxFontEncoding encoding) case wxFONTENCODING_MACCROATIAN: ret = 10082; break; case wxFONTENCODING_MACICELANDIC: ret = 10079; break; case wxFONTENCODING_MACROMANIAN: ret = 10009; break; + + case wxFONTENCODING_ISO2022_JP: ret = 50222; break; + case wxFONTENCODING_UTF7: ret = 65000; break; case wxFONTENCODING_UTF8: ret = 65001; break; + default: return -1; }