mirror of
https://github.com/pocoproject/poco.git
synced 2025-10-27 02:53:10 +01:00
latest changes from main repository
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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.
|
||||
//
|
||||
|
||||
Reference in New Issue
Block a user