latest changes from main repository

This commit is contained in:
Guenter Obiltschnig
2007-04-27 13:25:16 +00:00
parent 5caf218376
commit 4d80e24d44
28 changed files with 244 additions and 165 deletions

View File

@@ -1,7 +1,7 @@
//
// Environment_WIN32U.cpp
//
// $Id: //poco/Main/Foundation/src/Environment_WIN32U.cpp#6 $
// $Id: //poco/Main/Foundation/src/Environment_WIN32U.cpp#7 $
//
// Library: Foundation
// Package: Core
@@ -105,9 +105,9 @@ std::string EnvironmentImpl::osNameImpl()
std::string EnvironmentImpl::osVersionImpl()
{
OSVERSIONINFO vi;
OSVERSIONINFOW vi;
vi.dwOSVersionInfoSize = sizeof(vi);
if (GetVersionEx(&vi) == 0) throw SystemException("Cannot get OS version information");
if (GetVersionExW(&vi) == 0) throw SystemException("Cannot get OS version information");
std::ostringstream str;
str << vi.dwMajorVersion << "." << vi.dwMinorVersion << " (Build " << (vi.dwBuildNumber & 0xFFFF);
std::string version;

View File

@@ -1,7 +1,7 @@
//
// pocomsg.mc[.h]
//
// $Id: //poco/Main/Foundation/src/pocomsg.h#20 $
// $Id: //poco/Main/Foundation/src/pocomsg.mc#7 $
//
// The Poco message source/header file.
//