From af95756f0232e774c9fa85d819f419865aaa4e2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gardou?= Date: Thu, 15 Jul 2010 19:19:48 +0000 Subject: [PATCH] Merge 48064 from yarotows This had nothing to do in yarotows in the first place svn path=/trunk/; revision=48065 --- reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp | 2 +- reactos/subsystems/win32/win32k/ntuser/cursoricon.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp b/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp index 730b6a3adfb..dc030ed1168 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp +++ b/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp @@ -354,7 +354,7 @@ DECLARE_INTERFACE_(IIrpQueue, IUnknown) STDMETHOD_(BOOLEAN, GetAcquiredTagRange)(THIS_ IN PVOID * FirstTag, - IN PVOID * LastTag); + IN PVOID * LastTag) PURE; }; diff --git a/reactos/subsystems/win32/win32k/ntuser/cursoricon.c b/reactos/subsystems/win32/win32k/ntuser/cursoricon.c index 03f00530dee..b4446cd1213 100644 --- a/reactos/subsystems/win32/win32k/ntuser/cursoricon.c +++ b/reactos/subsystems/win32/win32k/ntuser/cursoricon.c @@ -1390,7 +1390,7 @@ UserDrawIconEx( IconSize.cy, SRCCOPY, 0, - hdcMask, + bAlpha ? 0 : hdcMask, 0, hdcImage ? 0 : IconSize.cy); }