From 6d3c6eba1127dfb6e7cfe253fc5df3967160832d Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Thu, 14 Aug 2003 10:43:42 +0000
Subject: [PATCH] Fixed a lot of discrepancies (cdecl vs. stdcall).

svn path=/trunk/; revision=5568
---
 reactos/subsys/win32k/win32k.def | 112 +++++++++++++++----------------
 reactos/subsys/win32k/win32k.edf |   7 +-
 2 files changed, 58 insertions(+), 61 deletions(-)

diff --git a/reactos/subsys/win32k/win32k.def b/reactos/subsys/win32k/win32k.def
index 42abf863248..bb7c7af876d 100644
--- a/reactos/subsys/win32k/win32k.def
+++ b/reactos/subsys/win32k/win32k.def
@@ -1,4 +1,4 @@
-; $Id: win32k.def,v 1.18 2003/07/12 12:45:29 gvg Exp $
+; $Id: win32k.def,v 1.19 2003/08/14 10:43:42 ekohl Exp $
 ;
 ; win32k.def
 ;
@@ -13,82 +13,81 @@ BRUSHOBJ_ulGetBrushColor
 CLIPOBJ_bEnum@12
 CLIPOBJ_cEnumStart@20
 CLIPOBJ_ppoGetPath
-EngAcquireSemaphore
+EngAcquireSemaphore@4
 EngAllocMem@12
 EngAllocUserMem@8
 EngAssociateSurface@12
 EngBitBlt@44
-EngCheckAbort
-EngComputeGlyphSet
+EngCheckAbort@4
+EngComputeGlyphSet@12
 EngCopyBits@24
 EngCreateBitmap@24
 EngCreateClip@0
 EngCreateDeviceBitmap@16
 EngCreateDeviceSurface@16
-EngCreateDriverObj
-EngCreateEvent
+EngCreateDriverObj@12
+EngCreateEvent@4
 EngCreatePalette@24
-EngCreatePath
-EngCreateSemaphore
-EngCreateWnd
+EngCreatePath@0
+EngCreateSemaphore@0
+EngCreateWnd@20
 EngDebugBreak@0
 EngDebugPrint@12
 EngDeleteClip@4
-EngDeleteDriverObj
-EngDeleteEvent
+EngDeleteDriverObj@12
+EngDeleteEvent@4
 EngDeletePalette@4
-EngDeletePath
-EngDeleteSemaphore
+EngDeletePath@4
+EngDeleteSemaphore@4
 EngDeleteSurface@4
-EngDeleteWnd
+EngDeleteWnd@4
 EngDeviceIoControl@28
-EngEnumForms
+EngEnumForms@24
 EngEraseSurface@12
-EngFillPath
-EngFindImageProcAddress
-EngFindResource
+EngFillPath@28
+EngFindImageProcAddress@8
+EngFindResource@16
 EngFreeMem@4
-EngFreeModule
+EngFreeModule@4
 EngFreeUserMem@4
 EngGetCurrentCodePage@8
-EngGetDriverName
-EngGetFileChangeTime
-EngGetFilePath
-EngGetForm
-EngGetLastError
-EngGetPrinter
-EngGetPrinterData
-EngGetPrinterDataFileName
-EngGetProcessHandle
-EngGetType1FontList
+EngGetDriverName@4
+EngGetFileChangeTime@8
+EngGetFilePath@8
+EngGetForm@24
+EngGetLastError@0
+EngGetPrinter@20
+EngGetPrinterData@24
+EngGetPrinterDataFileName@4
+EngGetProcessHandle@0
+EngGetType1FontList@24
 EngLineTo@36
 EngLoadImage@4
 EngLoadModule@4
-EngLoadModuleForWrite
-EngLockDriverObj
+EngLoadModuleForWrite@8
+EngLockDriverObj@4
 EngLockSurface@4
-EngMapEvent
-EngMapFontFile
-EngMapModule
-EngMarkBandingSurface
-EngMovePointer
+EngMapEvent@20
+EngMapFontFile@12
+EngMapModule@8
+EngMarkBandingSurface@4
+EngMovePointer@16
 EngMulDiv@12
 EngMultiByteToUnicodeN@20
 EngMultiByteToWideChar
 EngPaint@20
-EngProbeForRead
-; EngProbeForReadAndWrite = NTOSKRNL.ProbeForWrite
-EngProbeForReadAndWrite
+EngProbeForRead@12
+EngProbeForReadAndWrite@12
 EngQueryLocalTime
 EngQueryPalette
-EngQueryPerformanceCounter
-EngQueryPerformanceFrequency
-EngReleaseSemaphore
+EngQueryPerformanceCounter@4
+EngQueryPerformanceFrequency@4
+EngReleaseSemaphore@4
 EngRestoreFloatingPointState
 EngSaveFloatingPointState
-EngSecureMem
-EngSetEvent
-EngSetLastError
+EngSecureMem@8
+EngSetEvent@4
+EngSetLastError@4
 EngSetPointerShape
 EngSetPointerTag
 EngSetPrinterData
@@ -96,17 +95,16 @@ EngSort@16
 EngStretchBlt
 EngStrokeAndFillPath
 EngStrokePath
-EngTextOut
+EngTextOut@44
 EngTransparentBlt@32
 EngUnicodeToMultiByteN@20
 EngUnloadImage
 EngUnlockDriverObj
 EngUnlockSurface@4
-EngUnmapEvent
-EngUnmapFontFile
-; EngUnsecureMem = NTOSKRNL.MmUnsecureVirtualMemory
-EngUnsecureMem
-EngWaitForSingleObject
+EngUnmapEvent@4
+EngUnmapFontFile@4
+EngUnsecureMem@4
+EngWaitForSingleObject@8
 EngWideCharToMultiByte
 EngWritePrinter
 FLOATOBJ_Add
@@ -136,12 +134,12 @@ FLOATOBJ_Sub
 FLOATOBJ_SubFloat
 FLOATOBJ_SubFloatObj
 FLOATOBJ_SubLong
-FONTOBJ_cGetAllGlyphHandles
-FONTOBJ_cGetGlyphs
-FONTOBJ_pifi
-FONTOBJ_pvTrueTypeFontFile
-FONTOBJ_pxoGetXform
-FONTOBJ_vGetInfo
+FONTOBJ_cGetAllGlyphHandles@8
+FONTOBJ_cGetGlyphs@20
+FONTOBJ_pifi@4
+FONTOBJ_pvTrueTypeFontFile@8
+FONTOBJ_pxoGetXform@4
+FONTOBJ_vGetInfo@12
 HT_ComputeRGBGammaTable
 HT_Get8BPPFormatPalette
 PALOBJ_cGetColors@16
diff --git a/reactos/subsys/win32k/win32k.edf b/reactos/subsys/win32k/win32k.edf
index 867d0e30e0a..9626f2561b8 100644
--- a/reactos/subsys/win32k/win32k.edf
+++ b/reactos/subsys/win32k/win32k.edf
@@ -1,4 +1,4 @@
-; $Id: win32k.edf,v 1.14 2003/08/13 16:32:55 royce Exp $
+; $Id: win32k.edf,v 1.15 2003/08/14 10:43:42 ekohl Exp $
 ;
 ; win32k.def
 ;
@@ -76,9 +76,8 @@ EngMulDiv=EngMulDiv@12
 EngMultiByteToUnicodeN=EngMultiByteToUnicodeN@20
 EngMultiByteToWideChar
 EngPaint=EngPaint@20
-EngProbeForRead
-; EngProbeForReadAndWrite = NTOSKRNL.ProbeForWrite
-EngProbeForReadAndWrite
+EngProbeForRead = NTOSKRNL.ProbeForRead
+EngProbeForReadAndWrite = NTOSKRNL.ProbeForWrite
 EngQueryLocalTime
 EngQueryPalette
 EngQueryPerformanceCounter=EngQueryPerformanceCounter@4