Issue #1653 - Part 2: Stop indirectly loading DWM functions through WinUtils.

1 files changed, 7 insertions, 7 deletions

diff --git a/widget/windows/TaskbarPreview.cpp b/widget/windows/TaskbarPreview.cpp
index 6c15df2e0..b07b8039f 100644
--- a/widget/windows/TaskbarPreview.cpp
+++ b/widget/windows/TaskbarPreview.cpp
@@ -139,7 +139,7 @@ TaskbarPreview::Invalidate() {
     return NS_OK;
 
   HWND previewWindow = PreviewWindow();
-  return FAILED(WinUtils::dwmInvalidateIconicBitmapsPtr(previewWindow))
+  return FAILED(DwmInvalidateIconicBitmaps(previewWindow))
        ? NS_ERROR_FAILURE
        : NS_OK;
 }
@@ -284,13 +284,13 @@ TaskbarPreview::GetWindowHook() {
 void
 TaskbarPreview::EnableCustomDrawing(HWND aHWND, bool aEnable) {
   BOOL enabled = aEnable;
-  WinUtils::dwmSetWindowAttributePtr(
+  DwmSetWindowAttribute(
       aHWND,
       DWMWA_FORCE_ICONIC_REPRESENTATION,
       &enabled,
       sizeof(enabled));
 
-  WinUtils::dwmSetWindowAttributePtr(
+  DwmSetWindowAttribute(
       aHWND,
       DWMWA_HAS_ICONIC_BITMAP,
       &enabled,
@@ -385,11 +385,11 @@ TaskbarPreviewCallback::Done(nsISupports *aCanvas, bool aDrawBorder) {
   POINT pptClient = { 0, 0 };
   HRESULT hr;
   if (!mIsThumbnail) {
-    hr = WinUtils::dwmSetIconicLivePreviewBitmapPtr(mPreview->PreviewWindow(),
-                                                    hBitmap, &pptClient, flags);
+    hr = DwmSetIconicLivePreviewBitmap(mPreview->PreviewWindow(),
+                                       hBitmap, &pptClient, flags);
   } else {
-    hr = WinUtils::dwmSetIconicThumbnailPtr(mPreview->PreviewWindow(),
-                                            hBitmap, flags);
+    hr = DwmSetIconicThumbnail(mPreview->PreviewWindow(),
+                               hBitmap, flags);
   }
   MOZ_ASSERT(SUCCEEDED(hr));
   return NS_OK;