1 files changed, 25 insertions, 38 deletions

diff --git a/src/winextras/qwinfunctions.cpp b/src/winextras/qwinfunctions.cpp
index ad6430a..692bcb0 100644
--- a/src/winextras/qwinfunctions.cpp
+++ b/src/winextras/qwinfunctions.cpp
@@ -1430,9 +1430,7 @@ QColor QtWin::colorizationColor(bool *opaqueBlend)
 
     DWORD colorization = 0;
     BOOL dummy = false;
-    qtDwmApiDll.init();
-    if (qtDwmApiDll.dwmGetColorizationColor)
-        qtDwmApiDll.dwmGetColorizationColor(&colorization, &dummy);
+    DwmGetColorizationColor(&colorization, &dummy);
     if (opaqueBlend)
         *opaqueBlend = dummy;
     return QColor::fromRgba(colorization);
@@ -1552,8 +1550,8 @@ void QtWin::setWindowFlip3DPolicy(QWindow *window, QtWin::WindowFlip3DPolicy pol
     HWND handle = reinterpret_cast<HWND>(window->winId());
 
     // Policy should be defaulted first, bug or smth.
-    DWORD value = qt_DWMFLIP3D_DEFAULT;
-    QtDwmApiDll::setWindowAttribute(handle, qt_DWMWA_FLIP3D_POLICY, value);
+    DWORD value = DWMFLIP3D_DEFAULT;
+    QtDwmApiDll::setWindowAttribute(handle, DWMWA_FLIP3D_POLICY, value);
 
     switch (policy) {
     default :
@@ -1561,15 +1559,15 @@ void QtWin::setWindowFlip3DPolicy(QWindow *window, QtWin::WindowFlip3DPolicy pol
         value = -1;
         break;
     case FlipExcludeBelow :
-        value = qt_DWMFLIP3D_EXCLUDEBELOW;
+        value = DWMFLIP3D_EXCLUDEBELOW;
         break;
     case FlipExcludeAbove :
-        value = qt_DWMFLIP3D_EXCLUDEABOVE;
+        value = DWMFLIP3D_EXCLUDEABOVE;
         break;
     }
 
-    if (qt_DWMFLIP3D_DEFAULT != value)
-        QtDwmApiDll::setWindowAttribute(handle, qt_DWMWA_FLIP3D_POLICY, value);
+    if (DWMFLIP3D_DEFAULT != value)
+        QtDwmApiDll::setWindowAttribute(handle, DWMWA_FLIP3D_POLICY, value);
 }
 
 /*!
@@ -1589,13 +1587,13 @@ QtWin::WindowFlip3DPolicy QtWin::windowFlip3DPolicy(QWindow *window)
 
     const DWORD value =
         QtDwmApiDll::windowAttribute<DWORD>(reinterpret_cast<HWND>(window->winId()),
-                                            qt_DWMWA_FLIP3D_POLICY, DWORD(qt_DWMFLIP3D_DEFAULT));
+                                            DWMWA_FLIP3D_POLICY, DWORD(DWMFLIP3D_DEFAULT));
     QtWin::WindowFlip3DPolicy policy = QtWin::FlipDefault;
     switch (value) {
-    case qt_DWMFLIP3D_EXCLUDEABOVE :
+    case DWMFLIP3D_EXCLUDEABOVE :
         policy = QtWin::FlipExcludeAbove;
         break;
-    case qt_DWMFLIP3D_EXCLUDEBELOW :
+    case DWMFLIP3D_EXCLUDEBELOW :
         policy = QtWin::FlipExcludeBelow;
         break;
     default :
@@ -1607,12 +1605,8 @@ QtWin::WindowFlip3DPolicy QtWin::windowFlip3DPolicy(QWindow *window)
 void qt_ExtendFrameIntoClientArea(QWindow *window, int left, int top, int right, int bottom)
 {
     QWinEventFilter::setup();
-
-    qtDwmApiDll.init();
-    if (qtDwmApiDll.dwmExtendFrameIntoClientArea) {
-        MARGINS margins = {left, right, top, bottom};
-        qtDwmApiDll.dwmExtendFrameIntoClientArea(reinterpret_cast<HWND>(window->winId()), &margins);
-    }
+    MARGINS margins = {left, right, top, bottom};
+    DwmExtendFrameIntoClientArea(reinterpret_cast<HWND>(window->winId()), &margins);
 }
 
 /*! \fn void QtWin::extendFrameIntoClientArea(QWidget *window, int left, int top, int right, int bottom)
@@ -1706,22 +1700,18 @@ void QtWin::enableBlurBehindWindow(QWindow *window, const QRegion &region)
 {
     Q_ASSERT_X(window, Q_FUNC_INFO, "window is null");
 
-    qtDwmApiDll.init();
-    if (!qtDwmApiDll.dwmEnableBlurBehindWindow)
-        return;
-
-    qt_DWM_BLURBEHIND dwmbb = {0, 0, 0, 0};
-    dwmbb.dwFlags = qt_DWM_BB_ENABLE;
+    DWM_BLURBEHIND dwmbb = {0, 0, 0, 0};
+    dwmbb.dwFlags = DWM_BB_ENABLE;
     dwmbb.fEnable = TRUE;
     HRGN rgn = 0;
     if (!region.isNull()) {
         rgn = toHRGN(region);
         if (rgn) {
             dwmbb.hRgnBlur = rgn;
-            dwmbb.dwFlags |= qt_DWM_BB_BLURREGION;
+            dwmbb.dwFlags |= DWM_BB_BLURREGION;
         }
     }
-    qtDwmApiDll.dwmEnableBlurBehindWindow(reinterpret_cast<HWND>(window->winId()), &dwmbb);
+    DwmEnableBlurBehindWindow(reinterpret_cast<HWND>(window->winId()), &dwmbb);
     if (rgn)
         DeleteObject(rgn);
 }
@@ -1760,12 +1750,9 @@ void QtWin::enableBlurBehindWindow(QWindow *window)
 void QtWin::disableBlurBehindWindow(QWindow *window)
 {
     Q_ASSERT_X(window, Q_FUNC_INFO, "window is null");
-    qt_DWM_BLURBEHIND dwmbb = {0, 0, 0, 0};
-    dwmbb.dwFlags = qt_DWM_BB_ENABLE;
-    dwmbb.fEnable = FALSE;
-    qtDwmApiDll.init();
-    if (qtDwmApiDll.dwmEnableBlurBehindWindow)
-        qtDwmApiDll.dwmEnableBlurBehindWindow(reinterpret_cast<HWND>(window->winId()), &dwmbb);
+    DWM_BLURBEHIND dwmbb = {0, 0, 0, 0};
+    dwmbb.dwFlags = DWM_BB_ENABLE;
+    DwmEnableBlurBehindWindow(reinterpret_cast<HWND>(window->winId()), &dwmbb);
 }
 
 /*!
@@ -1778,9 +1765,7 @@ bool QtWin::isCompositionEnabled()
     QWinEventFilter::setup();
 
     BOOL enabled = FALSE;
-    qtDwmApiDll.init();
-    if (qtDwmApiDll.dwmIsCompositionEnabled)
-        qtDwmApiDll.dwmIsCompositionEnabled(&enabled);
+    DwmIsCompositionEnabled(&enabled);
     return enabled;
 }
 
@@ -1792,15 +1777,17 @@ bool QtWin::isCompositionEnabled()
     \note The underlying function was declared deprecated as of Windows 8 and
     takes no effect.
  */
+
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_MSVC(4995)
 void QtWin::setCompositionEnabled(bool enabled)
 {
     QWinEventFilter::setup();
 
     UINT compositionEnabled = enabled;
-    qtDwmApiDll.init();
-    if (qtDwmApiDll.dwmEnableComposition)
-        qtDwmApiDll.dwmEnableComposition(compositionEnabled);
+    DwmEnableComposition(compositionEnabled);
 }
+QT_WARNING_POP
 
 /*!
     \since 5.2