Win32: fix version checks
authorGeoffroy Couprie <geal@videolan.org>
Tue, 8 Sep 2009 19:32:35 +0000 (21:32 +0200)
committerGeoffroy Couprie <geal@videolan.org>
Tue, 8 Sep 2009 19:33:08 +0000 (21:33 +0200)
modules/gui/qt4/components/interface_widgets.cpp
modules/gui/qt4/main_interface.cpp
modules/video_output/msw/events.c

index d134256..6d2816e 100644 (file)
@@ -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 );
 
index ef13e61..9eadbc8 100644 (file)
@@ -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
index 2f7c1f5..cb7356c 100644 (file)
@@ -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 );