generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-11-27 01:14:44 +01:00
Code Issues Projects Releases Wiki Activity

submitted 1.2.0

Browse Source
This commit is contained in:
Guenter Obiltschnig
2006-08-29 07:10:35 +00:00
parent f476bd6b32
commit 2d4078f392
1428 changed files with 25715 additions and 12456 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Foundation/src/Environment_WIN32U.cpp
View File

@@ -1,7 +1,7 @@
//
// Environment_WIN32U.cpp
//
// $Id: //poco/1.1.0/Foundation/src/Environment_WIN32U.cpp#2 $
// $Id: //poco/1.2/Foundation/src/Environment_WIN32U.cpp#1 $
//
// Library: Foundation
// Package: Core
@@ -34,16 +34,16 @@
//
#include "Foundation/Environment_WIN32U.h"
#include "Foundation/Exception.h"
#include "Foundation/UnicodeConverter.h"
#include "Foundation/Buffer.h"
#include "Poco/Environment_WIN32U.h"
#include "Poco/Exception.h"
#include "Poco/UnicodeConverter.h"
#include "Poco/Buffer.h"
#include <sstream>
#include <string.h>
#include <windows.h>
Foundation_BEGIN
namespace Poco {
std::string EnvironmentImpl::getImpl(const std::string& name)
@@ -110,7 +110,9 @@ std::string EnvironmentImpl::osVersionImpl()
if (GetVersionEx(&vi) == 0) throw SystemException("Cannot get OS version information");
std::ostringstream str;
str << vi.dwMajorVersion << "." << vi.dwMinorVersion << " (Build " << (vi.dwBuildNumber & 0xFFFF);
if (vi.szCSDVersion[0]) str << ": " << vi.szCSDVersion;
std::string version;
UnicodeConverter::toUTF8(vi.szCSDVersion, version);
if (!version.empty()) str << ": " << version;
str << ")";
return str.str();
}
@@ -157,4 +159,4 @@ std::string EnvironmentImpl::nodeNameImpl()
}
Foundation_END
} // namespace Poco