Merge 48064 from yarotows
authorJérôme Gardou <jerome.gardou@reactos.org>
Thu, 15 Jul 2010 19:19:48 +0000 (19:19 +0000)
committerJérôme Gardou <jerome.gardou@reactos.org>
Thu, 15 Jul 2010 19:19:48 +0000 (19:19 +0000)
This had nothing to do in yarotows in the first place

svn path=/trunk/; revision=48065

reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp
reactos/subsystems/win32/win32k/ntuser/cursoricon.c

index 730b6a3..dc030ed 100644 (file)
@@ -354,7 +354,7 @@ DECLARE_INTERFACE_(IIrpQueue, IUnknown)
 
     STDMETHOD_(BOOLEAN, GetAcquiredTagRange)(THIS_
         IN PVOID * FirstTag,
 
     STDMETHOD_(BOOLEAN, GetAcquiredTagRange)(THIS_
         IN PVOID * FirstTag,
-        IN PVOID * LastTag);
+        IN PVOID * LastTag) PURE;
 
 };
 
 
 };
 
index 03f0053..b4446cd 100644 (file)
@@ -1390,7 +1390,7 @@ UserDrawIconEx(
                           IconSize.cy,
                           SRCCOPY,
                           0,
                           IconSize.cy,
                           SRCCOPY,
                           0,
-                          hdcMask,
+                                                 bAlpha ? 0 : hdcMask,
                           0,
                           hdcImage ? 0 : IconSize.cy);
     }
                           0,
                           hdcImage ? 0 : IconSize.cy);
     }