[prev in list] [next in list] [prev in thread] [next in thread] 

List:       ros-diffs
Subject:    [ros-diffs] [sginsberg] 36590: - Fix the last ntgdi.h issue -- MS'
From:       sginsberg () svn ! reactos ! org
Date:       2008-09-29 13:16:50
Message-ID: 20080929141346.B251E98A11 () mail ! reactos ! org
[Download RAW message or body]

Author: sginsberg
Date: Mon Sep 29 08:16:17 2008
New Revision: 36590

URL: http://svn.reactos.org/svn/reactos?rev=36590&view=rev
Log:
- Fix the last ntgdi.h issue -- MS' ntgdi.h defines 2 NtGdiDoPalette argument types \
slightly wrong, so we must do so too. Add a note about this in the function as it is \
just a matter of cast

Modified:
    branches/nwin32/include/psdk/ntgdi.h
    branches/nwin32/subsystems/win32/win32k/ntgdi/gdipal.c

Modified: branches/nwin32/include/psdk/ntgdi.h
URL: http://svn.reactos.org/svn/reactos/branches/nwin32/include/psdk/ntgdi.h?rev=36590&r1=36589&r2=36590&view=diff
 ==============================================================================
--- branches/nwin32/include/psdk/ntgdi.h [iso-8859-1] (original)
+++ branches/nwin32/include/psdk/ntgdi.h [iso-8859-1] Mon Sep 29 08:16:17 2008
@@ -385,10 +385,10 @@
 LONG
 APIENTRY
 NtGdiDoPalette(
-    IN HGDIOBJ hObj,
+    IN HPALETTE hObj,
     IN WORD iStart,
     IN WORD cEntries,
-    IN LPVOID pEntries,
+    IN PALETTEENTRY* pEntries,
     IN DWORD iFunc,
     IN BOOL bInbound
 );

Modified: branches/nwin32/subsystems/win32/win32k/ntgdi/gdipal.c
URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/ntgdi/gdipal.c?rev=36590&r1=36589&r2=36590&view=diff
 ==============================================================================
--- branches/nwin32/subsystems/win32/win32k/ntgdi/gdipal.c [iso-8859-1] (original)
+++ branches/nwin32/subsystems/win32/win32k/ntgdi/gdipal.c [iso-8859-1] Mon Sep 29 \
08:16:17 2008 @@ -46,13 +46,17 @@
 
 LONG
 APIENTRY
-NtGdiDoPalette(IN HGDIOBJ hObj,
+NtGdiDoPalette(IN HPALETTE hObj,
                IN WORD iStart,
                IN WORD cEntries,
-               IN LPVOID pEntries,
+               IN PALETTEENTRY* pEntries,
                IN DWORD iFunc,
                IN BOOL bInbound)
 {
+    /*
+     * NOTE: hObj is a DC handle (HDC) for GdiPalGetSystemEntries and \
GdiPalGet/SetColorTable +     * pEntries is RGBQUAD* for GdiPalGet/SetColorTable
+     * We do this to keep compatibility with MS ntgdi.h */
     UNIMPLEMENTED;
     return 0;
 }


[prev in list] [next in list] [prev in thread] [next in thread]