mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS prdiscw (1.11.62); FILE MERGED

Browse Source 
2006/11/10 13:59:54 pl 1.11.62.1: #i65167# call GetVersionEx only once
This commit is contained in:
Ivo Hinkelmann
2006-12-20 17:32:53 +00:00
parent 225c3c4ea3
commit a10f1b87e1
1 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
vcl/win/source/app/salinfo.cxx
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: salinfo.cxx,v $ * $RCSfile: salinfo.cxx,v $
* *
* $Revision: 1.11 $ * $Revision: 1.12 $
* *
* last change: $Author: kz $ $Date: 2006-10-06 10:08:15 $ * last change: $Author: ihi $ $Date: 2006-12-20 18:32:53 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -51,6 +51,7 @@
#include <salsys.hxx> #include <salsys.hxx>
#include <salframe.h> #include <salframe.h>
#include <salinst.h> #include <salinst.h>
#include <saldata.hxx>
#include <tools/debug.hxx> #include <tools/debug.hxx>
#include <svdata.hxx> #include <svdata.hxx>
#include <window.hxx> #include <window.hxx>
@@ -124,21 +125,16 @@ bool WinSalSystem::initMonitors()
bool winVerOk = true; bool winVerOk = true;
// multi monitor calls not available on Win95/NT // multi monitor calls not available on Win95/NT
OSVERSIONINFO aVerInfo; if ( aSalShlData.maVersionInfo.dwPlatformId == VER_PLATFORM_WIN32_NT )
aVerInfo.dwOSVersionInfoSize = sizeof( aVerInfo );
if ( GetVersionEx( &aVerInfo ) )
{ {
if ( aVerInfo.dwPlatformId == VER_PLATFORM_WIN32_NT ) if ( aSalShlData.maVersionInfo.dwMajorVersion <= 4 )
{
if ( aVerInfo.dwMajorVersion <= 4 )
winVerOk = false; // NT winVerOk = false; // NT
} }
else if( aVerInfo.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS ) else if( aSalShlData.maVersionInfo.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS )
{ {
if ( aVerInfo.dwMajorVersion == 4 && aVerInfo.dwMinorVersion == 0 ) if ( aSalShlData.maVersionInfo.dwMajorVersion == 4 && aSalShlData.maVersionInfo.dwMinorVersion == 0 )
winVerOk = false; // Win95 winVerOk = false; // Win95
} }
}
if( winVerOk ) if( winVerOk )
{ {
int nMonitors = GetSystemMetrics( SM_CMONITORS ); int nMonitors = GetSystemMetrics( SM_CMONITORS );