[vlc-devel] commit: Win32: fix version checks (Geoffroy Couprie )

[git version control]

vlc | branch: master | Geoffroy Couprie <geal at videolan.org> | Tue Sep  8 21:32:35 2009 +0200| [1d100357067c95fa11563b9aea1ce2c8f36fcd4e] | committer: Geoffroy Couprie 

Win32: fix version checks

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1d100357067c95fa11563b9aea1ce2c8f36fcd4e
---

 modules/gui/qt4/components/interface_widgets.cpp |    2 +-
 modules/gui/qt4/main_interface.cpp               |    2 +-
 modules/video_output/msw/events.c                |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index d134256..6d2816e 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 ef13e61..9eadbc8 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 2f7c1f5..cb7356c 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 );