From 35a75878d6fe56ab3ce530690dc2868f4d2ad3aa Mon Sep 17 00:00:00 2001 From: Aleksey Bragin Date: Sun, 24 Aug 2003 21:45:40 +0000 Subject: [PATCH] Fixing some obvious bugs in NtGdiRealizePalette (mentioned in the email to ros-kernel list) svn path=/trunk/; revision=5838 --- reactos/subsys/win32k/objects/color.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/reactos/subsys/win32k/objects/color.c b/reactos/subsys/win32k/objects/color.c index 4e39d9293a4..c0a238fb629 100644 --- a/reactos/subsys/win32k/objects/color.c +++ b/reactos/subsys/win32k/objects/color.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: color.c,v 1.21 2003/08/20 07:45:02 gvg Exp $ */ +/* $Id: color.c,v 1.22 2003/08/24 21:45:40 fireball Exp $ */ // FIXME: Use PXLATEOBJ logicalToSystem instead of int *mapping @@ -335,9 +335,9 @@ UINT STDCALL NtGdiRealizePalette(HDC hDC) return 0; palPtr = (PPALOBJ)AccessUserObject((ULONG)dc->w.hPalette); - SurfGDI = (PSURFGDI)AccessInternalObjectFromUserObject(dc->Surface); + SurfGDI = (PSURFGDI)AccessInternalObject((ULONG)dc->Surface); systemPalette = NtGdiGetStockObject((INT)DEFAULT_PALETTE); - sysPtr = (PPALOBJ)AccessInternalObject((ULONG)systemPalette); + sysPtr = (PPALOBJ)AccessUserObject((ULONG)systemPalette); palGDI = (PPALGDI)AccessInternalObject((ULONG)dc->w.hPalette); sysGDI = (PPALGDI)AccessInternalObject((ULONG)systemPalette); @@ -369,7 +369,7 @@ UINT STDCALL NtGdiRealizePalette(HDC hDC) } // GDI_ReleaseObj(dc->w.hPalette); -// GDI_ReleaseObj(hdc); + DC_UnlockDc(hDC); return realized; }