merge from HEAD

reactos/subsys/win32k

diff -u -r1.26 -r1.26.14.1
--- win32k.def	7 Mar 2004 12:49:27 -0000	1.26
+++ win32k.def	20 Sep 2004 17:47:41 -0000	1.26.14.1
@@ -1,4 +1,4 @@

-; $Id: win32k.def,v 1.26 2004/03/07 12:49:27 dwelch Exp $

+; $Id: win32k.def,v 1.26.14.1 2004/09/20 17:47:41 weiden Exp $

 ;
 ; win32k.def
 ;

@@ -32,7 +32,7 @@

 EngCreatePath@0
 EngCreateSemaphore@0
 EngCreateWnd@20

-EngDebugBreak@0

+EngDebugBreak@12=NTOSKRNL.DbgBreakPoint

 EngDebugPrint@12
 EngDeleteClip@4
 EngDeleteDriverObj@12

@@ -52,7 +52,7 @@

 EngFreeMem@4
 EngFreeModule@4
 EngFreeUserMem@4

-EngGetCurrentCodePage@8

+EngGetCurrentCodePage@8=ntoskrnl.RtlGetCurrentCodePage

 EngGetCurrentProcessId@0
 EngGetCurrentThreadId@0
 EngGetDriverName@4

@@ -79,11 +79,11 @@

 EngModifySurface@32
 EngMovePointer@16
 EngMulDiv@12

-EngMultiByteToUnicodeN@20

+EngMultiByteToUnicodeN@20=ntoskrnl.RtlMultiByteToUnicodeN

 EngMultiByteToWideChar@20
 EngPaint@20

-EngProbeForRead@12
-EngProbeForReadAndWrite@12

+EngProbeForRead@12=NTOSKRNL.ProbeForRead
+EngProbeForReadAndWrite@12=NTOSKRNL.ProbeForWrite

 EngQueryLocalTime@4
 EngQueryPalette@16
 EngQueryPerformanceCounter@4

@@ -104,7 +104,7 @@

 EngStrokePath@32
 EngTextOut@40
 EngTransparentBlt@32

-EngUnicodeToMultiByteN@20

+EngUnicodeToMultiByteN@20=ntoskrnl.RtlUnicodeToMultiByteN

 EngUnloadImage@4
 EngUnlockDriverObj@4
 EngUnlockSurface@4

@@ -149,7 +149,7 @@

 FONTOBJ_vGetInfo@12
 HeapVidMemAllocAligned@20
 HT_ComputeRGBGammaTable@24

-HT_Get8BPPFormatPalette

+HT_Get8BPPFormatPalette@16

 PALOBJ_cGetColors@16
 PATHOBJ_bCloseFigure@4
 PATHOBJ_bEnum@8

@@ -160,14 +160,14 @@

 PATHOBJ_vEnumStart@4
 PATHOBJ_vEnumStartClipLines@16
 PATHOBJ_vGetBounds@8

-RtlAnsiCharToUnicodeChar@4
-RtlMultiByteToUnicodeN@20
-RtlRaiseException@4
-RtlUnicodeToMultiByteN@20
-RtlUnicodeToMultiByteSize@12
-RtlUnwind@16
-RtlUpcaseUnicodeChar@4
-RtlUpcaseUnicodeToMultiByteN@20

+RtlAnsiCharToUnicodeChar@4=NTOSKRNL.RtlAnsiCharToUnicodeChar
+RtlMultiByteToUnicodeN@20=NTOSKRNL.RtlMultiByteToUnicodeN
+RtlRaiseException@4=NTOSKRNL.RtlRaiseException
+RtlUnicodeToMultiByteN@20=NTOSKRNL.RtlUnicodeToMultiByteN
+RtlUnicodeToMultiByteSize@12=NTOSKRNL.RtlUnicodeToMultiByteSize
+RtlUnwind@16=NTOSKRNL.RtlUnwind
+RtlUpcaseUnicodeChar@4=NTOSKRNL.RtlUpcaseUnicodeChar
+RtlUpcaseUnicodeToMultiByteN@20=NTOSKRNL.RtlUpcaseUnicodeToMultiByteN

 STROBJ_bEnum@12
 STROBJ_dwGetCodePage@4
 STROBJ_vEnumStart@4

@@ -182,8 +182,8 @@

 XLATEOBJ_cGetPalette@16
 XLATEOBJ_iXlate@8
 XLATEOBJ_piVector@4

-_abnormal_termination
-_except_handler2
-_global_unwind2
-_local_unwind2

+_abnormal_termination=NTOSKRNL._abnormal_termination
+_except_handler2=NTOSKRNL._except_handler2
+_global_unwind2=NTOSKRNL._global_unwind2
+_local_unwind2=NTOSKRNL._local_unwind2

 ;EOF

reactos/subsys/win32k

diff -N win32k.edf
--- win32k.edf	3 Jul 2004 13:55:36 -0000	1.23
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,190 +0,0 @@

-; $Id: win32k.edf,v 1.23 2004/07/03 13:55:36 navaraf Exp $
-;
-; win32k.def
-;
-; ReactOS win32k.sys
-;
-LIBRARY win32k
-EXPORTS
-BRUSHOBJ_pvAllocRbrush=BRUSHOBJ_pvAllocRbrush@8
-BRUSHOBJ_pvGetRbrush=BRUSHOBJ_pvGetRbrush@4
-BRUSHOBJ_ulGetBrushColor=BRUSHOBJ_ulGetBrushColor@4
-CLIPOBJ_bEnum=CLIPOBJ_bEnum@12
-CLIPOBJ_cEnumStart=CLIPOBJ_cEnumStart@20
-CLIPOBJ_ppoGetPath=CLIPOBJ_ppoGetPath@4
-EngAcquireSemaphore=EngAcquireSemaphore@4
-EngAllocMem=EngAllocMem@12
-EngAllocUserMem=EngAllocUserMem@8
-EngAlphaBlend=EngAlphaBlend@28
-EngAssociateSurface=EngAssociateSurface@12
-EngBitBlt=EngBitBlt@44
-EngCheckAbort=EngCheckAbort@4
-EngComputeGlyphSet=EngComputeGlyphSet@12
-EngControlSprites=EngControlSprites@8
-EngCopyBits=EngCopyBits@24
-EngCreateBitmap=EngCreateBitmap@24
-EngCreateClip=EngCreateClip@0
-EngCreateDeviceBitmap=EngCreateDeviceBitmap@16
-EngCreateDeviceSurface=EngCreateDeviceSurface@16
-EngCreateDriverObj=EngCreateDriverObj@12
-EngCreateEvent=EngCreateEvent@4
-EngCreatePalette=EngCreatePalette@24
-EngCreatePath=EngCreatePath@0
-EngCreateSemaphore=EngCreateSemaphore@0
-EngCreateWnd=EngCreateWnd@20
-EngDebugBreak=NTOSKRNL.DbgBreakPoint
-EngDebugPrint=EngDebugPrint@12
-EngDeleteClip=EngDeleteClip@4
-EngDeleteDriverObj=EngDeleteDriverObj@12
-EngDeleteEvent=EngDeleteEvent@4
-EngDeletePalette=EngDeletePalette@4
-EngDeletePath=EngDeletePath@4
-EngDeleteSemaphore=EngDeleteSemaphore@4
-EngDeleteSurface=EngDeleteSurface@4
-EngDeleteWnd=EngDeleteWnd@4
-EngDeviceIoControl=EngDeviceIoControl@28
-EngDitherColor=EngDitherColor@16
-EngEnumForms=EngEnumForms@24
-EngEraseSurface=EngEraseSurface@12
-EngFillPath=EngFillPath@28
-EngFindImageProcAddress=EngFindImageProcAddress@8
-EngFindResource=EngFindResource@16
-EngFreeMem=EngFreeMem@4
-EngFreeModule=EngFreeModule@4
-EngFreeUserMem=EngFreeUserMem@4
-EngGetCurrentCodePage=ntoskrnl.RtlGetCurrentCodePage
-EngGetCurrentProcessId=EngGetCurrentProcessId@0
-EngGetCurrentThreadId=EngGetCurrentThreadId@0
-EngGetDriverName=EngGetDriverName@4
-EngGetFileChangeTime=EngGetFileChangeTime@8
-EngGetFilePath=EngGetFilePath@8 
-EngGetForm=EngGetForm@24
-EngGetLastError=EngGetLastError@0
-EngGetPrinter=EngGetPrinter@20
-EngGetPrinterData=EngGetPrinterData@24
-EngGetPrinterDataFileName=EngGetPrinterDataFileName@4
-EngGetProcessHandle=EngGetProcessHandle@0
-EngGetType1FontList=EngGetType1FontList@24
-EngGradientFill=EngGradientFill@40
-EngLineTo=EngLineTo@36
-EngLoadImage=EngLoadImage@4
-EngLoadModule=EngLoadModule@4
-EngLoadModuleForWrite=EngLoadModuleForWrite@8
-EngLockDriverObj=EngLockDriverObj@4
-EngLockSurface=EngLockSurface@4
-EngMapEvent=EngMapEvent@20
-EngMapFontFile=EngMapFontFile@12
-EngMapModule=EngMapModule@8
-EngMarkBandingSurface=EngMarkBandingSurface@4
-EngModifySurface=EngModifySurface@32
-EngMovePointer=EngMovePointer@16
-EngMulDiv=EngMulDiv@12
-EngMultiByteToUnicodeN=ntoskrnl.RtlMultiByteToUnicodeN
-EngMultiByteToWideChar=EngMultiByteToWideChar@20
-EngPaint=EngPaint@20
-EngProbeForRead=NTOSKRNL.ProbeForRead
-EngProbeForReadAndWrite=NTOSKRNL.ProbeForWrite
-EngQueryLocalTime=EngQueryLocalTime@4
-EngQueryPalette=EngQueryPalette@16
-EngQueryPerformanceCounter=EngQueryPerformanceCounter@4
-EngQueryPerformanceFrequency=EngQueryPerformanceFrequency@4
-EngQuerySystemAttribute=EngQuerySystemAttribute@8
-EngReleaseSemaphore=EngReleaseSemaphore@4
-EngRestoreFloatingPointState=EngRestoreFloatingPointState@4
-EngSaveFloatingPointState=EngSaveFloatingPointState@8
-EngSecureMem=EngSecureMem@8
-EngSetEvent=EngSetEvent@4
-EngSetLastError=EngSetLastError@4
-EngSetPointerShape=EngSetPointerShape@40
-EngSetPointerTag=EngSetPointerTag@20
-EngSetPrinterData=EngSetPrinterData@20
-EngSort=EngSort@16
-EngStretchBlt=EngStretchBlt@44
-EngStrokeAndFillPath=EngStrokeAndFillPath@40
-EngStrokePath=EngStrokePath@32
-EngTextOut=EngTextOut@40
-EngTransparentBlt=EngTransparentBlt@32
-EngUnicodeToMultiByteN=ntoskrnl.RtlUnicodeToMultiByteN
-EngUnloadImage=EngUnloadImage@4
-EngUnlockDriverObj=EngUnlockDriverObj@4
-EngUnlockSurface=EngUnlockSurface@4
-EngUnmapEvent=EngUnmapEvent@4
-EngUnmapFontFile=EngUnmapFontFile@4
-;EngUnsecureMem = NTOSKRNL.MmUnsecureVirtualMemory
-EngUnsecureMem=EngUnsecureMem@4
-EngWaitForSingleObject=EngWaitForSingleObject@8
-EngWideCharToMultiByte=EngWideCharToMultiByte@20
-EngWritePrinter=EngWritePrinter@16
-FLOATOBJ_Add=FLOATOBJ_Add@8
-FLOATOBJ_AddFloat=FLOATOBJ_AddFloat@8
-FLOATOBJ_AddFloatObj
-FLOATOBJ_AddLong=FLOATOBJ_AddLong@8
-FLOATOBJ_Div=FLOATOBJ_Div@8
-FLOATOBJ_DivFloat=FLOATOBJ_DivFloat@8
-FLOATOBJ_DivFloatObj
-FLOATOBJ_DivLong=FLOATOBJ_DivLong@8
-FLOATOBJ_Equal=FLOATOBJ_Equal@8
-FLOATOBJ_EqualLong=FLOATOBJ_EqualLong@8
-FLOATOBJ_GetFloat=FLOATOBJ_GetFloat@4
-FLOATOBJ_GetLong=FLOATOBJ_GetLong@4
-FLOATOBJ_GreaterThan=FLOATOBJ_GreaterThan@8
-FLOATOBJ_GreaterThanLong=FLOATOBJ_GreaterThanLong@8
-FLOATOBJ_LessThan=FLOATOBJ_LessThan@8
-FLOATOBJ_LessThanLong=FLOATOBJ_LessThanLong@8
-FLOATOBJ_Mul=FLOATOBJ_Mul@8
-FLOATOBJ_MulFloat=FLOATOBJ_MulFloat@8
-FLOATOBJ_MulFloatObj
-FLOATOBJ_MulLong=FLOATOBJ_MulLong@8
-FLOATOBJ_Neg=FLOATOBJ_Neg@4
-FLOATOBJ_SetFloat=FLOATOBJ_SetFloat@8
-FLOATOBJ_SetLong=FLOATOBJ_SetLong@8
-FLOATOBJ_Sub=FLOATOBJ_Sub@8
-FLOATOBJ_SubFloat=FLOATOBJ_SubFloat@8
-FLOATOBJ_SubFloatObj
-FLOATOBJ_SubLong=FLOATOBJ_SubLong@8
-FONTOBJ_cGetAllGlyphHandles=FONTOBJ_cGetAllGlyphHandles@8
-FONTOBJ_cGetGlyphs=FONTOBJ_cGetGlyphs@20
-FONTOBJ_pifi=FONTOBJ_pifi@4
-FONTOBJ_pvTrueTypeFontFile=FONTOBJ_pvTrueTypeFontFile@8
-FONTOBJ_pxoGetXform=FONTOBJ_pxoGetXform@4
-FONTOBJ_vGetInfo=FONTOBJ_vGetInfo@12
-HeapVidMemAllocAligned=HeapVidMemAllocAligned@20
-HT_ComputeRGBGammaTable=HT_ComputeRGBGammaTable@24
-HT_Get8BPPFormatPalette=HT_Get8BPPFormatPalette@16
-PALOBJ_cGetColors=PALOBJ_cGetColors@16
-PATHOBJ_bCloseFigure=PATHOBJ_bCloseFigure@4
-PATHOBJ_bEnum=PATHOBJ_bEnum@8
-PATHOBJ_bEnumClipLines=PATHOBJ_bEnumClipLines@12
-PATHOBJ_bMoveTo=PATHOBJ_bMoveTo@12
-PATHOBJ_bPolyBezierTo=PATHOBJ_bPolyBezierTo@12
-PATHOBJ_bPolyLineTo=PATHOBJ_bPolyLineTo@12
-PATHOBJ_vEnumStart=PATHOBJ_vEnumStart@4
-PATHOBJ_vEnumStartClipLines=PATHOBJ_vEnumStartClipLines@16
-PATHOBJ_vGetBounds=PATHOBJ_vGetBounds@8
-RtlAnsiCharToUnicodeChar=NTOSKRNL.RtlAnsiCharToUnicodeChar
-RtlMultiByteToUnicodeN=NTOSKRNL.RtlMultiByteToUnicodeN
-RtlRaiseException=NTOSKRNL.RtlRaiseException
-RtlUnicodeToMultiByteN=NTOSKRNL.RtlUnicodeToMultiByteN
-RtlUnicodeToMultiByteSize=NTOSKRNL.RtlUnicodeToMultiByteSize
-RtlUnwind=NTOSKRNL.RtlUnwind
-RtlUpcaseUnicodeChar=NTOSKRNL.RtlUpcaseUnicodeChar
-RtlUpcaseUnicodeToMultiByteN=NTOSKRNL.RtlUpcaseUnicodeToMultiByteN
-STROBJ_bEnum=STROBJ_bEnum@12
-STROBJ_dwGetCodePage=STROBJ_dwGetCodePage@4
-STROBJ_vEnumStart=STROBJ_vEnumStart@4
-VidMemFree=VidMemFree@8
-Win32kInitialize=Win32kInitialize@0
-WNDOBJ_bEnum=WNDOBJ_bEnum@12
-WNDOBJ_cEnumStart=WNDOBJ_cEnumStart@16
-WNDOBJ_vSetConsumer=WNDOBJ_vSetConsumer@8
-XFORMOBJ_bApplyXform=XFORMOBJ_bApplyXform@20
-XFORMOBJ_iGetFloatObjXform=XFORMOBJ_iGetFloatObjXform@8
-XFORMOBJ_iGetXform=XFORMOBJ_iGetXform@8
-XLATEOBJ_cGetPalette=XLATEOBJ_cGetPalette@16
-XLATEOBJ_iXlate=XLATEOBJ_iXlate@8
-XLATEOBJ_piVector=XLATEOBJ_piVector@4
-_abnormal_termination=NTOSKRNL._abnormal_termination
-_except_handler2=NTOSKRNL._except_handler2
-_global_unwind2=NTOSKRNL._global_unwind2
-_local_unwind2=NTOSKRNL._local_unwind2
-; EOF