[ros-diffs] [sginsberg] 36624: - Add missing APIENTRY to ntgdi.h, syscalls are always stdcall. - Update gdi32 after NtGdiDoPalette change - Add parameters for NtGdiGetSpoolMessage

Author: sginsberg
Date: Thu Oct  2 08:33:51 2008
New Revision: 36624

URL: http://svn.reactos.org/svn/reactos?rev=36624&view=rev
Log:
- Add missing APIENTRY to ntgdi.h, syscalls are always stdcall.
- Update gdi32 after NtGdiDoPalette change
- Add parameters for NtGdiGetSpoolMessage

Modified:
    branches/nwin32/dll/win32/gdi32/objects/palette.c
    branches/nwin32/include/psdk/ntgdi.h
    branches/nwin32/include/reactos/win32k/ntgdityp.h
    branches/nwin32/subsystems/win32/win32k/ntgdi/gdibrush.c
    branches/nwin32/subsystems/win32/win32k/ntgdi/gdicoord.c
    branches/nwin32/subsystems/win32/win32k/ntgdi/gdiprint.c

Modified: branches/nwin32/dll/win32/gdi32/objects/palette.c
URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/gdi32/objects/p...
==============================================================================
--- branches/nwin32/dll/win32/gdi32/objects/palette.c [iso-8859-1] (original)
+++ branches/nwin32/dll/win32/gdi32/objects/palette.c [iso-8859-1] Thu Oct  2 08:33:51 2008
@@ -50,7 +50,7 @@
                         UINT cEntries,
                         LPPALETTEENTRY ppe)
 {
-    return NtGdiDoPalette(hDC, iStartIndex, cEntries, ppe, GdiPalGetSystemEntries, FALSE);
+    return NtGdiDoPalette((HPALETTE)hDC, iStartIndex, cEntries, ppe, GdiPalGetSystemEntries, FALSE);
 }

UINT
@@ -60,7 +60,7 @@
                  UINT cEntries,
                  RGBQUAD *pColors)
 {
-    return NtGdiDoPalette(hDC, iStartIndex, cEntries, pColors, GdiPalGetColorTable, FALSE);
+    return NtGdiDoPalette((HPALETTE)hDC, iStartIndex, cEntries, (PALETTEENTRY*)pColors, GdiPalGetColorTable, FALSE);
 }

/*
@@ -116,7 +116,7 @@

if (cEntries)
     {
-        retValue = NtGdiDoPalette(hDC, iStartIndex, cEntries, (RGBQUAD*)pColors, GdiPalSetColorTable, TRUE);
+        retValue = NtGdiDoPalette((HPALETTE)hDC, iStartIndex, cEntries, (PALETTEENTRY*)pColors, GdiPalSetColorTable, TRUE);
     }

return retValue;

Modified: branches/nwin32/include/psdk/ntgdi.h
URL: http://svn.reactos.org/svn/reactos/branches/nwin32/include/psdk/ntgdi.h?rev=...
==============================================================================
--- branches/nwin32/include/psdk/ntgdi.h [iso-8859-1] (original)
+++ branches/nwin32/include/psdk/ntgdi.h [iso-8859-1] Thu Oct  2 08:33:51 2008
@@ -3539,6 +3539,7 @@

W32KAPI
 BOOL
+APIENTRY
 NtGdiUpdateTransform(
     IN HDC hdc
 );
@@ -3568,6 +3569,7 @@

W32KAPI
 BOOL
+APIENTRY
 NtGdiSetPUMPDOBJ(
     IN HUMPD humpd,
     IN BOOL bStoreID,
@@ -3577,6 +3579,7 @@

W32KAPI
 BOOL
+APIENTRY
 NtGdiBRUSHOBJ_DeleteRbrush(
     IN BRUSHOBJ *pbo,
     IN BRUSHOBJ *pboB
@@ -3584,6 +3587,7 @@

W32KAPI
 BOOL
+APIENTRY
 NtGdiUMPDEngFreeUserMem(
     IN KERNEL_PVOID *ppv
 );

Modified: branches/nwin32/include/reactos/win32k/ntgdityp.h
URL: http://svn.reactos.org/svn/reactos/branches/nwin32/include/reactos/win32k/nt...
==============================================================================
--- branches/nwin32/include/reactos/win32k/ntgdityp.h [iso-8859-1] (original)
+++ branches/nwin32/include/reactos/win32k/ntgdityp.h [iso-8859-1] Thu Oct  2 08:33:51 2008
@@ -189,14 +189,15 @@
     VOID
 );

-/* FIXME: prototypes */
 W32KAPI
 INT
 APIENTRY
-NtGdiGetSpoolMessage(DWORD u1,
-                     DWORD u2,
-                     DWORD u3,
-                     DWORD u4);
+NtGdiGetSpoolMessage(
+    IN PVOID InputBuffer,
+    IN ULONG InputBufferSize,
+    OUT PVOID OutputBuffer,
+    IN ULONG OutputBufferSize
+);

#define GDIBATCHBUFSIZE 0x136*4
 #define GDI_BATCH_LIMIT 20

Modified: branches/nwin32/subsystems/win32/win32k/ntgdi/gdibrush.c
URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/n...
==============================================================================
--- branches/nwin32/subsystems/win32/win32k/ntgdi/gdibrush.c [iso-8859-1] (original)
+++ branches/nwin32/subsystems/win32/win32k/ntgdi/gdibrush.c [iso-8859-1] Thu Oct  2 08:33:51 2008
@@ -110,7 +110,7 @@
 }

BOOL
-/* Missing APIENTRY! */
+APIENTRY
 NtGdiBRUSHOBJ_DeleteRbrush(IN BRUSHOBJ *pbo,
                            IN BRUSHOBJ *pboB)
 {

Modified: branches/nwin32/subsystems/win32/win32k/ntgdi/gdicoord.c
URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/n...
==============================================================================
--- branches/nwin32/subsystems/win32/win32k/ntgdi/gdicoord.c [iso-8859-1] (original)
+++ branches/nwin32/subsystems/win32/win32k/ntgdi/gdicoord.c [iso-8859-1] Thu Oct  2 08:33:51 2008
@@ -121,9 +121,8 @@
 }

-
 BOOL
-/* Missing APIENTRY! */
+APIENTRY
 NtGdiUpdateTransform(IN HDC hdc)
 {
     UNIMPLEMENTED;

Modified: branches/nwin32/subsystems/win32/win32k/ntgdi/gdiprint.c
URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/n...
==============================================================================
--- branches/nwin32/subsystems/win32/win32k/ntgdi/gdiprint.c [iso-8859-1] (original)
+++ branches/nwin32/subsystems/win32/win32k/ntgdi/gdiprint.c [iso-8859-1] Thu Oct  2 08:33:51 2008
@@ -101,20 +101,19 @@
     return FALSE;
 }

-/* FIXME: Parameters! */
 INT
 APIENTRY
-NtGdiGetSpoolMessage( DWORD u1,
-                      DWORD u2,
-                      DWORD u3,
-                      DWORD u4)
+NtGdiGetSpoolMessage(IN PVOID InputBuffer,
+                     IN ULONG InputBufferSize,
+                     OUT PVOID OutputBuffer,
+                     IN ULONG OutputBufferSize)
 {
     UNIMPLEMENTED;
     return 0;
 }

BOOL
-/* Missing APIENTRY! */
+APIENTRY
 NtGdiSetPUMPDOBJ(IN HUMPD humpd,
                  IN BOOL bStoreID,
                  OUT HUMPD *phumpd,
@@ -125,7 +124,7 @@
 }

BOOL
-/* Missing APIENTRY! */
+APIENTRY
 NtGdiUMPDEngFreeUserMem(IN KERNEL_PVOID *ppv)
 {
     UNIMPLEMENTED;