Win32: get rid of calls to GetVersion (CoCreateInstance will fail anyway if the featu...

[vlc] / modules / gui / qt4 / components / interface_widgets.cpp

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index 930b6ded7f4dd1cea0c43e2092c3e5ef8be93138..50c16477bf6975f8099024684e4359d9b5178a6f 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -239,28 +239,25 @@ void VideoWidget::release( void )
 #ifdef WIN32
     /* Come back to default thumbnail for Windows 7 taskbar */
     LPTASKBARLIST3 p_taskbl;
-    OSVERSIONINFO winVer;
-    winVer.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-    if( GetVersionEx(&winVer) && winVer.dwMajorVersion > 5 )
-    {
-        CoInitialize( 0 );
 
-        if( S_OK == CoCreateInstance( &clsid_ITaskbarList,
-                    NULL, CLSCTX_INPROC_SERVER,
-                    &IID_ITaskbarList3,
-                    (void **)&p_taskbl) )
-        {
-            p_taskbl->vt->HrInit(p_taskbl);
+    CoInitialize( 0 );
+
+    if( S_OK == CoCreateInstance( &clsid_ITaskbarList,
+                NULL, CLSCTX_INPROC_SERVER,
+                &IID_ITaskbarList3,
+                (void **)&p_taskbl) )
+    {
+        p_taskbl->vt->HrInit(p_taskbl);
 
-            HWND hroot = GetAncestor(reparentable->winId(),GA_ROOT);
+        HWND hroot = GetAncestor(reparentable->winId(),GA_ROOT);
 
-            if (S_OK != p_taskbl->vt->SetThumbnailClip(p_taskbl, hroot, NULL))
-                msg_Err(p_intf, "SetThumbNailClip failed");
-            msg_Err(p_intf, "Releasing taskbar | root handle = %08x", hroot);
-            p_taskbl->vt->Release(p_taskbl);
-        }
-        CoUninitialize();
+        if (S_OK != p_taskbl->vt->SetThumbnailClip(p_taskbl, hroot, NULL))
+            msg_Err(p_intf, "SetThumbNailClip failed");
+        msg_Err(p_intf, "Releasing taskbar | root handle = %08x", hroot);
+        p_taskbl->vt->Release(p_taskbl);
     }
+    CoUninitialize();
+
 #endif
 
     delete reparentable;