Win32: fix version checks

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index d134256af32f0a4c6daae8d51dacbf0df5fded00..6d2816e8d957988a5eb0a49f3498d1d2b1915dc0 100644 (file)
--- 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 ef13e6127f7acf88a023444666f16d333a60d173..9eadbc86a0f3fac66e740d3b61a7a6f1b48cd723 100644 (file)
--- 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 2f7c1f5e771451a4bf5a2109c317a19638fb7110..cb7356cd4fe0c2c56d50a1cadc5c8ac355f4d189 100644 (file)
--- 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 );