[ros-diffs] [tkreuzer] 32430: Patch by Stefan Ginsberg (stefan__100__ AT hotmail DOT com): - move bad ntuser syscalls in ntuser.h to the bottom - sort win32k export list alphabetically - remove Win32kInitialize and NtGdiGetAspectRatioFilterEx by myself: - add missing exports to win32k.def (all from xp)

Author: tkreuzer
Date: Wed Feb 20 06:01:46 2008
New Revision: 32430

URL: http://svn.reactos.org/svn/reactos?rev=32430&view=rev
Log:
Patch by Stefan Ginsberg (stefan__100__ AT hotmail DOT com):
- move bad ntuser syscalls in ntuser.h to the bottom
- sort win32k export list alphabetically
- remove Win32kInitialize and NtGdiGetAspectRatioFilterEx
by myself:
- add missing exports to win32k.def (all from xp)

Modified:
    trunk/reactos/include/reactos/win32k/ntgdibad.h
    trunk/reactos/include/reactos/win32k/ntuser.h
    trunk/reactos/subsystems/win32/win32k/main/dllmain.c
    trunk/reactos/subsystems/win32/win32k/objects/dc.c
    trunk/reactos/subsystems/win32/win32k/w32ksvc.db
    trunk/reactos/subsystems/win32/win32k/win32k.def

Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg…
==============================================================================
--- trunk/reactos/include/reactos/win32k/ntgdibad.h (original)
+++ trunk/reactos/include/reactos/win32k/ntgdibad.h Wed Feb 20 06:01:46 2008
@@ -70,12 +70,6 @@
 	CONST BITMAPINFO	* bmi,
 	UINT			Usage
 	);
-
-/* Should be done in user-mode. */
-BOOL
-STDCALL
-NtGdiGetAspectRatioFilterEx(HDC  hDC,
-                                 LPSIZE  AspectRatio);
 
 /* Use NtGdiGetDCPoint with GdiGetViewPortExt */
 BOOL STDCALL  NtGdiGetViewportExtEx(HDC  hDC, LPSIZE viewportExt);

Modified: trunk/reactos/include/reactos/win32k/ntuser.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu…
==============================================================================
--- trunk/reactos/include/reactos/win32k/ntuser.h (original)
+++ trunk/reactos/include/reactos/win32k/ntuser.h Wed Feb 20 06:01:46 2008
@@ -249,14 +249,6 @@
 
 DWORD
 NTAPI
-NtUserBuildMenuItemList(
- HMENU hMenu,
- PVOID Buffer,
- ULONG nBufSize,
- DWORD Reserved);
-
-DWORD
-NTAPI
 NtUserCalcMenuBar(
     DWORD dwUnknown1,
     DWORD dwUnknown2,
@@ -306,28 +298,9 @@
   UINT uIDEnableItem,
   UINT uEnable);
 
-UINT
-NTAPI
-NtUserEnumClipboardFormats(
-  UINT format);
-
-DWORD
-NTAPI
-NtUserInsertMenuItem(
-  HMENU hMenu,
-  UINT uItem,
-  BOOL fByPosition,
-  LPCMENUITEMINFOW lpmii);
-
 BOOL
 NTAPI
 NtUserEndMenu(VOID);
-
-UINT NTAPI
-NtUserGetMenuDefaultItem(
-  HMENU hMenu,
-  UINT fByPos,
-  UINT gmdiFlags);
 
 BOOL
 NTAPI
@@ -365,14 +338,6 @@
   UINT uItemHilite,
   UINT uHilite);
 
-BOOL
-NTAPI
-NtUserMenuInfo(
- HMENU hmenu,
- PROSMENUINFO lpmi,
- BOOL fsog
-);
-
 int
 NTAPI
 NtUserMenuItemFromPoint(
@@ -380,16 +345,6 @@
   HMENU hMenu,
   DWORD X,
   DWORD Y);
-
-BOOL
-NTAPI
-NtUserMenuItemInfo(
- HMENU hMenu,
- UINT uItem,
- BOOL fByPosition,
- PROSMENUITEMINFO lpmii,
- BOOL fsog
-);
 
 BOOL
 NTAPI
@@ -454,32 +409,6 @@
   int y,
   HWND hwnd,
   LPTPMPARAMS lptpm);
-
-ULONG NTAPI
-NtUserGetSystemMetrics(ULONG Index);
-
-ULONG_PTR NTAPI
-NtUserGetClassLong(HWND hWnd, INT Offset, BOOL Ansi);
-
-LONG NTAPI
-NtUserGetWindowLong(HWND hWnd, DWORD Index, BOOL Ansi);
-
-BOOL NTAPI
-NtUserGetWindowRect(HWND hWnd, LPRECT Rect);
-
-BOOL NTAPI
-NtUserGetClientRect(HWND hWnd, LPRECT Rect);
-
-HANDLE NTAPI
-NtUserGetProp(HWND hWnd, ATOM Atom);
-
-BOOL NTAPI
-NtUserGetClientOrigin(HWND hWnd, LPPOINT Point);
-
-NTSTATUS
-NTAPI
-NtUserAcquireOrReleaseInputOwnership(
-  BOOLEAN Release);
 
 HKL
 NTAPI
@@ -771,12 +700,6 @@
   int nWidth,
   int nHeight);
 
-HANDLE
-NTAPI
-NtUserCreateCursorIconHandle(
-  PICONINFO IconInfo,
-  BOOL Indirect);
-
 HDESK
 NTAPI
 NtUserCreateDesktop(
@@ -993,7 +916,7 @@
   LPCRECT lprcClip,
   MONITORENUMPROC lpfnEnum,
   LPARAM dwData );*/
-
+/* FIXME:  The call below is ros-specific and should be rewritten to use the same params
as the correct call above.  */ 
 INT
 NTAPI
 NtUserEnumDisplayMonitors(
@@ -1282,11 +1205,6 @@
 NtUserGetKeyState(
   DWORD Unknown0);
 
-BOOL
-NTAPI
-NtUserGetLastInputInfo(
-    PLASTINPUTINFO plii);
-
 DWORD
 NTAPI
 NtUserGetLayeredWindowAttributes(
@@ -1313,12 +1231,6 @@
   HWND hWnd,
   UINT wMsgFilterMin,
   UINT wMsgFilterMax);
-
-BOOL
-NTAPI
-NtUserGetMonitorInfo(
-  IN HMONITOR hMonitor,
-  OUT LPMONITORINFO pMonitorInfo);
 
 DWORD
 NTAPI
@@ -1396,13 +1308,6 @@
   HWND hWnd,
   LONG idObject,
   PSCROLLBARINFO psbi);
-
-BOOL
-NTAPI
-NtUserGetScrollInfo(
-  HWND hwnd,
-  int fnBar,
-  LPSCROLLINFO lpsi);
 
 HDESK
 NTAPI
@@ -1525,14 +1430,6 @@
 
 BOOL
 NTAPI
-NtUserKillSystemTimer
-(
- HWND hWnd,
- UINT_PTR uIDEvent
-);
-
-BOOL
-NTAPI
 NtUserKillTimer
 (
  HWND hWnd,
@@ -1589,13 +1486,6 @@
     DWORD dwUnknown2,
     DWORD dwUnknown3);
 
-BOOL
-NTAPI
-NtUserGetMinMaxInfo(
-  HWND hwnd,
-  MINMAXINFO *MinMaxInfo,
-  BOOL SendMessage);
-
 DWORD
 NTAPI
 NtUserMNDragLeave(VOID);
@@ -1611,25 +1501,6 @@
 NtUserModifyUserStartupInfoFlags(
   DWORD Unknown0,
   DWORD Unknown1);
-
-HMONITOR
-NTAPI
-NtUserMonitorFromPoint(
-  IN POINT point,
-  IN DWORD dwFlags);
-
-HMONITOR
-NTAPI
-NtUserMonitorFromRect(
-  IN LPCRECT pRect,
-  IN DWORD dwFlags);
-
-HMONITOR
-NTAPI
-NtUserMonitorFromWindow(
-  IN HWND hWnd,
-  IN DWORD dwFlags);
-
 
 BOOL
 NTAPI
@@ -1844,24 +1715,6 @@
     DWORD dwUnknown1,
     DWORD dwUnknown2);
 
-/* FIXME: These flag constans aren't what Windows uses. */
-#define REGISTERCLASS_ANSI	2
-#define REGISTERCLASS_ALL	(REGISTERCLASS_ANSI)
-
-RTL_ATOM NTAPI
-NtUserRegisterClassEx(
-   CONST WNDCLASSEXW* lpwcx,
-   PUNICODE_STRING ClassName,
-   PUNICODE_STRING MenuName,
-   WNDPROC wpExtra,
-   DWORD Flags,
-   HMENU hMenu);
-
-UINT
-NTAPI
-NtUserRegisterClipboardFormat(
-    PUNICODE_STRING format);
-
 BOOL
 NTAPI
 NtUserRegisterHotKey(HWND hWnd,
@@ -1951,54 +1804,9 @@
   LPINPUT pInput,
   INT cbSize);
 
-typedef struct tagNTUSERSENDMESSAGEINFO
-{
-  BOOL HandledByKernel;
-  BOOL Ansi;
-  WNDPROC Proc;
-} NTUSERSENDMESSAGEINFO, *PNTUSERSENDMESSAGEINFO;
-
-LRESULT NTAPI
-NtUserSendMessage(HWND hWnd,
-		  UINT Msg,
-		  WPARAM wParam,
-		  LPARAM lParam,
-                  PNTUSERSENDMESSAGEINFO Info);
-
-BOOL
-NTAPI
-NtUserSendMessageCallback(
-  HWND hWnd,
-  UINT Msg,
-  WPARAM wParam,
-  LPARAM lParam,
-  SENDASYNCPROC lpCallBack,
-  ULONG_PTR dwData);
-
-LRESULT NTAPI
-NtUserSendMessageTimeout(HWND hWnd,
-			 UINT Msg,
-			 WPARAM wParam,
-			 LPARAM lParam,
-			 UINT uFlags,
-			 UINT uTimeout,
-			 ULONG_PTR *uResult,
-             PNTUSERSENDMESSAGEINFO Info);
-
-BOOL
-NTAPI
-NtUserSendNotifyMessage(
-  HWND hWnd,
-  UINT Msg,
-  WPARAM wParam,
-  LPARAM lParam);
-
 HWND NTAPI
 NtUserSetActiveWindow(HWND Wnd);
 
-HWND NTAPI
-NtUserGetActiveWindow(VOID);
-
 DWORD
 NTAPI
 NtUserSetAppImeLevel(
@@ -2007,9 +1815,6 @@
 
 HWND NTAPI
 NtUserSetCapture(HWND Wnd);
-
-HWND NTAPI
-NtUserGetCapture(VOID);
 
 ULONG_PTR NTAPI
 NtUserSetClassLong(
@@ -2186,10 +1991,6 @@
 NtUserSetShellWindowEx(
   HWND hwndShell,
   HWND hwndShellListView);
-
-HWND
-NTAPI
-NtUserGetShellWindow();
 
 DWORD
 NTAPI
@@ -2535,30 +2336,6 @@
 NTAPI
 NtUserYieldTask(VOID);
 
-DWORD NTAPI
-NtUserGetWindowThreadProcessId(HWND hWnd, LPDWORD UnsafePid);
-
-DWORD NTAPI
-NtUserGetQueueStatus(BOOL ClearChanges);
-
-HWND NTAPI
-NtUserGetWindow(HWND hWnd, UINT Relationship);
-
-HWND NTAPI
-NtUserGetLastActivePopup(HWND hWnd);
-
-typedef struct _WNDPROC_INFO
-{
-    WNDPROC WindowProc;
-    BOOL IsUnicode;
-} WNDPROC_INFO, *PWNDPROC_INFO;
-
-BOOL NTAPI
-NtUserDereferenceWndProcHandle(IN HANDLE wpHandle, OUT PWNDPROC_INFO wpInfo);
-
-VOID NTAPI
-NtUserManualGuiCheck(LONG Check);
-
 #define NtUserGetDCBrushColor(hbr) \
   (COLORREF)NtUserCallTwoParam((DWORD)(hbr), OBJ_BRUSH, TWOPARAM_ROUTINE_GETDCCOLOR)
 
@@ -2570,20 +2347,6 @@
 
 #define NtUserSetDCPenColor(hbr, crColor) \
   (COLORREF)NtUserCallTwoParam((DWORD)(hbr), (DWORD)crColor,
TWOPARAM_ROUTINE_SETDCPENCOLOR)
-
-typedef struct _SETSCROLLBARINFO
-{
-  int nTrackPos;
-  int reserved;
-  DWORD rgstate[CCHILDREN_SCROLLBAR+1];
-} SETSCROLLBARINFO, *PSETSCROLLBARINFO;
-
-BOOL
-NTAPI
-NtUserSetScrollBarInfo(
-  HWND hwnd,
-  LONG idObject,
-  SETSCROLLBARINFO *info);
 
 /* lParam of DDE messages */
 typedef struct tagKMDDEEXECUTEDATA
@@ -2607,6 +2370,273 @@
     } Value;
 } KMDDELPARAM, *PKMDDELPARAM;
 
+
+
+
+
+/* NtUserBad
+*   ReactOS-specific NtUser calls which shouldn't exist.
+ */
+
+
+NTSTATUS
+NTAPI
+NtUserAcquireOrReleaseInputOwnership(
+  BOOLEAN Release);
+
+DWORD
+NTAPI
+NtUserBuildMenuItemList(
+ HMENU hMenu,
+ PVOID Buffer,
+ ULONG nBufSize,
+ DWORD Reserved); 
+
+HANDLE
+NTAPI
+NtUserCreateCursorIconHandle(
+  PICONINFO IconInfo,
+  BOOL Indirect); 
+
+
+typedef struct _WNDPROC_INFO
+{
+    WNDPROC WindowProc;
+    BOOL IsUnicode;
+} WNDPROC_INFO, *PWNDPROC_INFO;
+
+BOOL
+NTAPI
+NtUserDereferenceWndProcHandle(IN HANDLE wpHandle, OUT PWNDPROC_INFO wpInfo);
+
+
+UINT
+NTAPI
+NtUserEnumClipboardFormats(
+  UINT format);
+
+HWND
+NTAPI
+NtUserGetActiveWindow(VOID);
+
+HWND
+NTAPI
+NtUserGetCapture(VOID);
+
+ULONG_PTR
+NTAPI
+NtUserGetClassLong(HWND hWnd, INT Offset, BOOL Ansi);
+
+BOOL
+NTAPI
+NtUserGetClientOrigin(HWND hWnd, LPPOINT Point);
+
+BOOL
+NTAPI
+NtUserGetClientRect(HWND hWnd, LPRECT Rect);
+
+UINT
+NTAPI
+NtUserGetMenuDefaultItem(
+  HMENU hMenu,
+  UINT fByPos,
+  UINT gmdiFlags);
+
+HWND
+NTAPI
+NtUserGetLastActivePopup(HWND hWnd);
+
+BOOL
+NTAPI
+NtUserGetLastInputInfo(
+    PLASTINPUTINFO plii);
+
+BOOL
+NTAPI
+NtUserGetMinMaxInfo(
+  HWND hwnd,
+  MINMAXINFO *MinMaxInfo,
+  BOOL SendMessage);
+
+BOOL
+NTAPI
+NtUserGetMonitorInfo(
+  IN HMONITOR hMonitor,
+  OUT LPMONITORINFO pMonitorInfo);
+
+HANDLE
+NTAPI
+NtUserGetProp(HWND hWnd, ATOM Atom);
+
+DWORD
+NTAPI
+NtUserGetQueueStatus(BOOL ClearChanges);
+
+BOOL
+NTAPI
+NtUserGetScrollInfo(
+  HWND hwnd,
+  int fnBar,
+  LPSCROLLINFO lpsi);
+
+HWND
+NTAPI
+NtUserGetShellWindow();
+
+ULONG
+NTAPI
+NtUserGetSystemMetrics(ULONG Index);
+
+HWND
+NTAPI
+NtUserGetWindow(HWND hWnd, UINT Relationship);
+
+LONG
+NTAPI
+NtUserGetWindowLong(HWND hWnd, DWORD Index, BOOL Ansi);
+
+BOOL
+NTAPI
+NtUserGetWindowRect(HWND hWnd, LPRECT Rect);
+
+DWORD
+NTAPI
+NtUserGetWindowThreadProcessId(HWND hWnd, LPDWORD UnsafePid);
+
+DWORD
+NTAPI
+NtUserInsertMenuItem(
+  HMENU hMenu,
+  UINT uItem,
+  BOOL fByPosition,
+  LPCMENUITEMINFOW lpmii);
+
+BOOL
+NTAPI
+NtUserKillSystemTimer(HWND hWnd, UINT_PTR uIDEvent);
+
+VOID
+NTAPI
+NtUserManualGuiCheck(LONG Check);
+
+BOOL
+NTAPI
+NtUserMenuInfo(
+ HMENU hmenu,
+ PROSMENUINFO lpmi,
+ BOOL fsog
+);
+
+BOOL
+NTAPI
+NtUserMenuItemInfo(
+ HMENU hMenu,
+ UINT uItem,
+ BOOL fByPosition,
+ PROSMENUITEMINFO lpmii,
+ BOOL fsog
+);
+
+HMONITOR
+NTAPI
+NtUserMonitorFromPoint(
+  IN POINT point,
+  IN DWORD dwFlags);
+
+HMONITOR
+NTAPI
+NtUserMonitorFromRect(
+  IN LPCRECT pRect,
+  IN DWORD dwFlags);
+
+HMONITOR
+NTAPI
+NtUserMonitorFromWindow(
+  IN HWND hWnd,
+  IN DWORD dwFlags);
+
+
+/* FIXME: These flag constans aren't what Windows uses. */
+#define REGISTERCLASS_ANSI	2
+#define REGISTERCLASS_ALL	(REGISTERCLASS_ANSI)
+
+RTL_ATOM
+NTAPI
+NtUserRegisterClassEx(
+   CONST WNDCLASSEXW* lpwcx,
+   PUNICODE_STRING ClassName,
+   PUNICODE_STRING MenuName,
+   WNDPROC wpExtra,
+   DWORD Flags,
+   HMENU hMenu);
+
+
+UINT
+NTAPI
+NtUserRegisterClipboardFormat(
+    PUNICODE_STRING format);
+
+
+typedef struct tagNTUSERSENDMESSAGEINFO
+{
+  BOOL HandledByKernel;
+  BOOL Ansi;
+  WNDPROC Proc;
+} NTUSERSENDMESSAGEINFO, *PNTUSERSENDMESSAGEINFO;
+
+LRESULT NTAPI
+NtUserSendMessage(HWND hWnd,
+		  UINT Msg,
+		  WPARAM wParam,
+		  LPARAM lParam,
+          PNTUSERSENDMESSAGEINFO Info);
+
+BOOL
+NTAPI
+NtUserSendMessageCallback(
+  HWND hWnd,
+  UINT Msg,
+  WPARAM wParam,
+  LPARAM lParam,
+  SENDASYNCPROC lpCallBack,
+  ULONG_PTR dwData);
+
+LRESULT NTAPI
+NtUserSendMessageTimeout(HWND hWnd,
+			 UINT Msg,
+			 WPARAM wParam,
+			 LPARAM lParam,
+			 UINT uFlags,
+			 UINT uTimeout,
+			 ULONG_PTR *uResult,
+             PNTUSERSENDMESSAGEINFO Info);
+
+
+BOOL
+NTAPI
+NtUserSendNotifyMessage(
+  HWND hWnd,
+  UINT Msg,
+  WPARAM wParam,
+  LPARAM lParam);
+
+
+typedef struct _SETSCROLLBARINFO
+{
+  int nTrackPos;
+  int reserved;
+  DWORD rgstate[CCHILDREN_SCROLLBAR+1];
+} SETSCROLLBARINFO, *PSETSCROLLBARINFO;
+
+BOOL
+NTAPI
+NtUserSetScrollBarInfo(
+  HWND hwnd,
+  LONG idObject,
+  SETSCROLLBARINFO *info);
+
+
+
 #endif /* __WIN32K_NTUSER_H */
 
 /* EOF */

Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/main/dllmain.c (original)
+++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c Wed Feb 20 06:01:46 2008
@@ -527,11 +527,4 @@
   return STATUS_SUCCESS;
 }
 
-
-BOOLEAN STDCALL
-Win32kInitialize (VOID)
-{
-  return TRUE;
-}
-
 /* EOF */

Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Wed Feb 20 06:01:46 2008
@@ -1111,6 +1111,14 @@
   return  TRUE;
 }
 
+BOOL FASTCALL
+IntGetAspectRatioFilter(PDC pDC,
+                        LPSIZE AspectRatio)
+{
+  UNIMPLEMENTED;
+  return FALSE;
+}
+
 BOOL STDCALL
 NtGdiGetDCPoint( HDC hDC, UINT iPoint, PPOINTL Point)
 {
@@ -1157,6 +1165,10 @@
       Ret = IntGdiGetDCOrgEx(dc, &SafePoint);
       break;
     case GdiGetAspectRatioFilter:
+      Ret = IntGetAspectRatioFilter(dc, &Size);
+      SafePoint.x = Size.cx;
+      SafePoint.y = Size.cy;
+      break;
     default:
       SetLastWin32Error(ERROR_INVALID_PARAMETER);
       Ret = FALSE;
@@ -3339,15 +3351,6 @@
   return  DCB_DISABLE;   /* bounding rectangle always empty */
 }
 
-BOOL
-STDCALL
-NtGdiGetAspectRatioFilterEx(HDC  hDC,
-                                 LPSIZE  AspectRatio)
-{
-  UNIMPLEMENTED;
-  return FALSE;
-}
-
 /*
  * @implemented
  */

Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original)
+++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Wed Feb 20 06:01:46 2008
@@ -719,7 +719,6 @@
 NtUserSendNotifyMessage                 4
 NtUserSetScrollBarInfo                  3
 NtGdiCreateDIBitmap                     6
-NtGdiGetAspectRatioFilterEx             2
 NtGdiGetFontFamilyInfo                  4
 NtGdiOffsetViewportOrgEx                4
 NtGdiOffsetWindowOrgEx                  4

Modified: trunk/reactos/subsystems/win32/win32k/win32k.def
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/win32k.def (original)
+++ trunk/reactos/subsystems/win32/win32k/win32k.def Wed Feb 20 06:01:46 2008
@@ -2,23 +2,30 @@
 ;
 ; win32k.def
 ;
-; ReactOS win32k.sys
+; ReactOS win32k.sys exports
+;
+; Currently all exports from windows xp are listed, sorted by name
 ;
 LIBRARY win32k
 EXPORTS
+;BRUSHOBJ_hGetColorTransform@4
 BRUSHOBJ_pvAllocRbrush@8
 BRUSHOBJ_pvGetRbrush@4
 BRUSHOBJ_ulGetBrushColor@4
 CLIPOBJ_bEnum@12
 CLIPOBJ_cEnumStart@20
 CLIPOBJ_ppoGetPath@4
-EngAlphaBlend@28
 EngAcquireSemaphore@4
 EngAllocMem@12
+EngAllocPrivateUserMem@12
+;EngAllocSectionMem
 EngAllocUserMem@8
+EngAlphaBlend@28
 EngAssociateSurface@12
 EngBitBlt@44
+;EngBugCheckEx@20
 EngCheckAbort@4
+;EngClearEvent@4
 EngComputeGlyphSet@12
 EngControlSprites@8
 EngCopyBits@24
@@ -37,6 +44,7 @@
 EngDeleteClip@4
 EngDeleteDriverObj@12
 EngDeleteEvent@4
+;EngDeleteFile@4
 EngDeletePalette@4
 EngDeletePath@4
 EngDeleteSafeSemaphore@4
@@ -45,13 +53,21 @@
 EngDeleteWnd@4
 EngDeviceIoControl@28
 EngDitherColor@16
+EngDxIoctl@12
 EngEnumForms@24
 EngEraseSurface@12
+;EngFileIoControl
+;EngFileWrite
 EngFillPath@28
 EngFindImageProcAddress@8
 EngFindResource@16
+;EngFntCacheAlloc@8
+;EngFntCacheFault@8
+;EngFntCacheLookUp@8
 EngFreeMem@4
 EngFreeModule@4
+EngFreePrivateUserMem@8
+;EngFreeSectionMem
 EngFreeUserMem@4
 EngGetCurrentCodePage(a)8=ntoskrnl.RtlGetCurrentCodePage
 EngGetCurrentProcessId@0
@@ -64,33 +80,45 @@
 EngGetPrinter@20
 EngGetPrinterData@24
 EngGetPrinterDataFileName@4
+;EngGetPrinterDriver@24
 EngGetProcessHandle@0
+;EngGetTickCount
 EngGetType1FontList@24
 EngGradientFill@40
+;EngHangNotification@8
 EngInitializeSafeSemaphore@4
+;EngIsSemaphoreOwned@4
+;EngIsSemaphoreOwnedByCurrentThread@4
 EngLineTo@36
 EngLoadImage@4
 EngLoadModule@4
 EngLoadModuleForWrite@8
+EngLockDirectDrawSurface@4
 EngLockDriverObj@4
 EngLockSurface@4
+;EngLpkInstalled@0
 EngMapEvent@20
 EngMapFontFile@12
+;EngMapFontFileFD@12
 EngMapModule@8
+;EngMapSection
 EngMarkBandingSurface@4
 EngModifySurface@32
 EngMovePointer@16
 EngMulDiv@12
 EngMultiByteToUnicodeN(a)20=ntoskrnl.RtlMultiByteToUnicodeN
 EngMultiByteToWideChar@20
+;EngNineGrid
 EngPaint@20
 EngProbeForRead(a)12=NTOSKRNL.ProbeForRead
 EngProbeForReadAndWrite(a)12=NTOSKRNL.ProbeForWrite
+;EngQueryDeviceAttribute@24
 EngQueryLocalTime@4
 EngQueryPalette@16
 EngQueryPerformanceCounter@4
 EngQueryPerformanceFrequency@4
 EngQuerySystemAttribute@8
+;EngReadStateEvent@4
 EngReleaseSemaphore@4
 EngRestoreFloatingPointState@4
 EngSaveFloatingPointState@8
@@ -102,16 +130,19 @@
 EngSetPrinterData@20
 EngSort@16
 EngStretchBlt@44
+;EngStretchBltROP@52
 EngStrokeAndFillPath@40
 EngStrokePath@32
 EngTextOut@40
 EngTransparentBlt@32
 EngUnicodeToMultiByteN(a)20=ntoskrnl.RtlUnicodeToMultiByteN
 EngUnloadImage@4
+EngUnlockDirectDrawSurface@4
 EngUnlockDriverObj@4
 EngUnlockSurface@4
 EngUnmapEvent@4
 EngUnmapFontFile@4
+;EngUnmapFontFileFD@4
 EngUnsecureMem@4
 EngWaitForSingleObject@8
 EngWideCharToMultiByte@20
@@ -145,12 +176,18 @@
 FLOATOBJ_SubLong@8
 FONTOBJ_cGetAllGlyphHandles@8
 FONTOBJ_cGetGlyphs@20
+;FONTOBJ_pQueryGlyphAttrs@8
+;FONTOBJ_pfdg@4
 FONTOBJ_pifi@4
+;FONTOBJ_pjOpenTypeTablePointer@12
 FONTOBJ_pvTrueTypeFontFile@8
+;FONTOBJ_pwszFontFilePaths@4
 FONTOBJ_pxoGetXform@4
 FONTOBJ_vGetInfo@12
+HeapVidMemAllocAligned@20
 HT_ComputeRGBGammaTable@24
 HT_Get8BPPFormatPalette@16
+;HT_Get8BPPMaskPalette@24
 PALOBJ_cGetColors@16
 PATHOBJ_bCloseFigure@4
 PATHOBJ_bEnum@8
@@ -170,9 +207,13 @@
 RtlUpcaseUnicodeChar(a)4=NTOSKRNL.RtlUpcaseUnicodeChar
 RtlUpcaseUnicodeToMultiByteN(a)20=NTOSKRNL.RtlUpcaseUnicodeToMultiByteN
 STROBJ_bEnum@12
+;STROBJ_bEnumPositionsOnly@12
+;STROBJ_bGetAdvanceWidths@16
 STROBJ_dwGetCodePage@4
+;STROBJ_fxBreakExtra@4
+;STROBJ_fxCharacterExtra@4
 STROBJ_vEnumStart@4
-Win32kInitialize@0
+VidMemFree@8
 WNDOBJ_bEnum@12
 WNDOBJ_cEnumStart@16
 WNDOBJ_vSetConsumer@8
@@ -180,18 +221,14 @@
 XFORMOBJ_iGetFloatObjXform@8
 XFORMOBJ_iGetXform@8
 XLATEOBJ_cGetPalette@16
+;XLATEOBJ_hGetColorTransform@4
 XLATEOBJ_iXlate@8
 XLATEOBJ_piVector@4
 _abnormal_termination=NTOSKRNL._abnormal_termination
 _except_handler2=NTOSKRNL._except_handler2
 _global_unwind2=NTOSKRNL._global_unwind2
+;_itoa@12
+;_itow@12
 _local_unwind2=NTOSKRNL._local_unwind2
-EngLockDirectDrawSurface@4
-EngUnlockDirectDrawSurface@4
-EngDxIoctl@12
-EngAllocPrivateUserMem@12
-HeapVidMemAllocAligned@20
-VidMemFree@8
-EngFreePrivateUserMem@8
 
 ;EOF