From: Geoffroy Couprie <geal@videolan.org>
Date: Tue, 8 Sep 2009 19:32:35 +0000 (+0200)
Subject: Win32: fix version checks
X-Git-Tag: 1.1.0-ff~3437
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=1d100357067c95fa11563b9aea1ce2c8f36fcd4e;p=vlc

Win32: fix version checks
---

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index d134256af3..6d2816e8d9 100644
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -247,7 +247,7 @@ void VideoWidget::release( void )
     LPTASKBARLIST3 p_taskbl;
     OSVERSIONINFO winVer;
     winVer.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-    if( GetVersionEx(&winVer) && winVer.dwMajorVersion > 5 && winVer.dwMajorVersion > 0 )
+    if( GetVersionEx(&winVer) && winVer.dwMajorVersion > 5 )
     {
         CoInitialize( 0 );
 
diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index ef13e6127f..9eadbc86a0 100644
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -486,7 +486,7 @@ void MainInterface::createTaskBarButtons()
     */
     OSVERSIONINFO winVer;
     winVer.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-    if( GetVersionEx(&winVer) && winVer.dwMajorVersion > 5 && winVer.dwMajorVersion > 0 )
+    if( GetVersionEx(&winVer) && winVer.dwMajorVersion > 5 )
     {
         if(himl = ImageList_Create( 15, //cx
                                     18, //cy
diff --git a/modules/video_output/msw/events.c b/modules/video_output/msw/events.c
index 2f7c1f5e77..cb7356cd4f 100644
--- a/modules/video_output/msw/events.c
+++ b/modules/video_output/msw/events.c
@@ -802,7 +802,7 @@ void UpdateRects( vout_thread_t *p_vout, bool b_force )
     LPTASKBARLIST3 p_taskbl;
     OSVERSIONINFO winVer;
     winVer.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-    if( GetVersionEx(&winVer) && winVer.dwMajorVersion > 5 && winVer.dwMajorVersion > 0 )
+    if( GetVersionEx(&winVer) && winVer.dwMajorVersion > 5 )
     {
         CoInitialize( 0 );