From 5cbc4609906bbd0484344f96643840ffdc723d69 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Date: Wed, 9 Mar 2016 09:14:23 +0100
Subject: Windows QPA: Increase API level to 0x600 (Windows Vista).

- Directly link against dwmapi which should be present on
  Windows Vista and remove duplicated header constants.
- Remove struct QWindowsShell32DL since all required functions
  are present on Windows Vista.
- Remove functions that are no longer needed from QWindowsUser32DLL
  with exception of the clipboard functions which are not present
  in the MinGW stub libraries until v5.

Task-number: QTBUG-51673
Change-Id: Ia4a8a3f1db0f0d02322317d547e61ae39f9008b5
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
---
 src/plugins/platforms/windows/qwindowsdialoghelpers.cpp | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'src/plugins/platforms/windows/qwindowsdialoghelpers.cpp')

diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
index f2beeb6f54..e1b0d36922 100644
--- a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
+++ b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
@@ -988,22 +988,18 @@ void QWindowsNativeFileDialogBase::setWindowTitle(const QString &title)
 IShellItem *QWindowsNativeFileDialogBase::shellItem(const QUrl &url)
 {
     if (url.isLocalFile()) {
-        if (!QWindowsContext::shell32dll.sHCreateItemFromParsingName)
-            return Q_NULLPTR;
         IShellItem *result = Q_NULLPTR;
         const QString native = QDir::toNativeSeparators(url.toLocalFile());
         const HRESULT hr =
-                QWindowsContext::shell32dll.sHCreateItemFromParsingName(reinterpret_cast<const wchar_t *>(native.utf16()),
-                                                                        NULL, IID_IShellItem,
-                                                                        reinterpret_cast<void **>(&result));
+                SHCreateItemFromParsingName(reinterpret_cast<const wchar_t *>(native.utf16()),
+                                            NULL, IID_IShellItem,
+                                            reinterpret_cast<void **>(&result));
         if (FAILED(hr)) {
             qErrnoWarning("%s: SHCreateItemFromParsingName(%s)) failed", __FUNCTION__, qPrintable(url.toString()));
             return Q_NULLPTR;
         }
         return result;
     } else if (url.scheme() == QLatin1String("clsid")) {
-        if (!QWindowsContext::shell32dll.sHGetKnownFolderIDList || !QWindowsContext::shell32dll.sHCreateItemFromIDList)
-            return Q_NULLPTR;
         // Support for virtual folders via GUID
         // (see https://msdn.microsoft.com/en-us/library/windows/desktop/dd378457(v=vs.85).aspx)
         // specified as "clsid:<GUID>" (without '{', '}').
@@ -1014,12 +1010,12 @@ IShellItem *QWindowsNativeFileDialogBase::shellItem(const QUrl &url)
             return Q_NULLPTR;
         }
         PIDLIST_ABSOLUTE idList;
-        HRESULT hr = QWindowsContext::shell32dll.sHGetKnownFolderIDList(uuid, 0, 0, &idList);
+        HRESULT hr = SHGetKnownFolderIDList(uuid, 0, 0, &idList);
         if (FAILED(hr)) {
             qErrnoWarning("%s: SHGetKnownFolderIDList(%s)) failed", __FUNCTION__, qPrintable(url.toString()));
             return Q_NULLPTR;
         }
-        hr = QWindowsContext::shell32dll.sHCreateItemFromIDList(idList, IID_IShellItem, reinterpret_cast<void **>(&result));
+        hr = SHCreateItemFromIDList(idList, IID_IShellItem, reinterpret_cast<void **>(&result));
         CoTaskMemFree(idList);
         if (FAILED(hr)) {
             qErrnoWarning("%s: SHCreateItemFromIDList(%s)) failed", __FUNCTION__, qPrintable(url.toString()));
-- 
cgit v1.2.3