[ROSTESTS]

Silence some warnings, fix compilation of w32kdll with MSVC, give dllexport_test dlls a base address.

svn path=/trunk/; revision=63515

diff --git a/rostests/apitests/CMakeLists.txt b/rostests/apitests/CMakeLists.txt
index 45f4c60..99a8bf9 100644 (file)
--- a/rostests/apitests/CMakeLists.txt
+++ b/rostests/apitests/CMakeLists.txt
@@ -19,7 +19,7 @@ add_subdirectory(setupapi)
 add_subdirectory(shell32)
 add_subdirectory(psapi)
 add_subdirectory(user32)
-if((NOT MSVC) AND (ARCH STREQUAL "i386"))
+if(NOT ARCH STREQUAL "amd64")
     add_subdirectory(w32kdll)
     add_subdirectory(w32knapi)
 endif()

diff --git a/rostests/apitests/w32kdll/CMakeLists.txt b/rostests/apitests/w32kdll/CMakeLists.txt
index a2c1b14..0d4f458 100644 (file)
--- a/rostests/apitests/w32kdll/CMakeLists.txt
+++ b/rostests/apitests/w32kdll/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 add_subdirectory(w32kdll_ros)
 add_subdirectory(w32kdll_xpsp2)
-add_subdirectory(w32kdll_2ksp4)
+#add_subdirectory(w32kdll_2ksp4)
 add_subdirectory(w32kdll_2k3sp2)
-add_subdirectory(w32kdll_vista)
+#add_subdirectory(w32kdll_vista)

diff --git a/rostests/apitests/w32kdll/w32kdll_2k3sp2/CMakeLists.txt b/rostests/apitests/w32kdll/w32kdll_2k3sp2/CMakeLists.txt
index aca0aa3..84cc534 100644 (file)
--- a/rostests/apitests/w32kdll/w32kdll_2k3sp2/CMakeLists.txt
+++ b/rostests/apitests/w32kdll/w32kdll_2k3sp2/CMakeLists.txt
@@ -3,9 +3,9 @@ spec2def(w32kdll_2k3sp2.dll w32kdll_2k3sp2.spec ADD_IMPORTLIB)
 
 add_library(w32kdll_2k3sp2 SHARED
     main.c
-    w32kdll_2k3sp2.S
+    sys-stubs.S
     ${CMAKE_CURRENT_BINARY_DIR}/w32kdll_2k3sp2.def)
 
 set_entrypoint(w32kdll_2k3sp2 0)
 
-add_dependencies(w32kdll_2k3sp2 psdk )
+add_dependencies(w32kdll_2k3sp2 psdk)

diff --git a/rostests/apitests/w32kdll/w32kdll_2k3sp2/sys-stubs.S b/rostests/apitests/w32kdll/w32kdll_2k3sp2/sys-stubs.S
new file mode 100644 (file)
index 0000000..8913700
--- /dev/null
+++ b/rostests/apitests/w32kdll/w32kdll_2k3sp2/sys-stubs.S
@@ -0,0 +1,12 @@
+
+#include <asm.inc>
+#include <syscalls.inc>
+
+.code
+
+SyscallId = HEX(1000)
+#define SVC_(name, argcount) STUB_U name, argcount
+
+#include "w32ksvc-2k3sp2.h"
+
+END

diff --git a/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32ksvc-2k3sp2.h b/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32ksvc-2k3sp2.h
new file mode 100644 (file)
index 0000000..1e3f1ca
--- /dev/null
+++ b/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32ksvc-2k3sp2.h
@@ -0,0 +1,669 @@
+// SVC_(<NAME>, <ARG_COUNT>)
+//
+// Funcs, order, should, match, Windows, XP, 5.1.2600, SP2)
+//
+SVC_(GdiAbortDoc, 1)
+SVC_(GdiAbortPath, 1)
+SVC_(GdiAddFontResourceW, 6)
+SVC_(GdiAddRemoteFontToDC, 4)
+SVC_(GdiAddFontMemResourceEx, 5)
+SVC_(GdiRemoveMergeFont, 2)
+SVC_(GdiAddRemoteMMInstanceToDC, 3)
+SVC_(GdiAlphaBlend, 12)
+SVC_(GdiAngleArc, 6)
+SVC_(GdiAnyLinkedFonts, 0)
+SVC_(GdiFontIsLinked, 1)
+SVC_(GdiArcInternal, 10)
+SVC_(GdiBeginPath, 1)
+SVC_(GdiBitBlt, 11)
+SVC_(GdiCancelDC, 1)
+SVC_(GdiCheckBitmapBits, 8)
+SVC_(GdiCloseFigure, 1)
+SVC_(GdiClearBitmapAttributes, 2)
+SVC_(GdiClearBrushAttributes, 2)
+SVC_(GdiColorCorrectPalette, 6)
+SVC_(GdiCombineRgn, 4)
+SVC_(GdiCombineTransform, 3)
+SVC_(GdiComputeXformCoefficients, 1)
+SVC_(GdiConsoleTextOut, 4)
+SVC_(GdiConvertMetafileRect, 2)
+SVC_(GdiCreateBitmap, 5)
+SVC_(GdiCreateClientObj, 1)
+SVC_(GdiCreateColorSpace, 1)
+SVC_(GdiCreateColorTransform, 8)
+SVC_(GdiCreateCompatibleBitmap, 3)
+SVC_(GdiCreateCompatibleDC, 1)
+SVC_(GdiCreateDIBBrush, 6)
+SVC_(GdiCreateDIBitmapInternal, 11)
+SVC_(GdiCreateDIBSection, 9)
+SVC_(GdiCreateEllipticRgn, 4)
+SVC_(GdiCreateHalftonePalette, 1)
+SVC_(GdiCreateHatchBrushInternal, 3)
+SVC_(GdiCreateMetafileDC, 1)
+SVC_(GdiCreatePaletteInternal, 2)
+SVC_(GdiCreatePatternBrushInternal, 3)
+SVC_(GdiCreatePen, 4)
+SVC_(GdiCreateRectRgn, 4)
+SVC_(GdiCreateRoundRectRgn, 6)
+SVC_(GdiCreateServerMetaFile, 6)
+SVC_(GdiCreateSolidBrush, 2)
+SVC_(GdiD3dContextCreate, 4)
+SVC_(GdiD3dContextDestroy, 1)
+SVC_(GdiD3dContextDestroyAll, 1)
+SVC_(GdiD3dValidateTextureStageState, 1)
+SVC_(GdiD3dDrawPrimitives2, 7)
+SVC_(GdiDdGetDriverState, 1)
+SVC_(GdiDdAddAttachedSurface, 3)
+SVC_(GdiDdAlphaBlt, 3)
+SVC_(GdiDdAttachSurface, 2)
+SVC_(GdiDdBeginMoCompFrame, 2)
+SVC_(GdiDdBlt, 3)
+SVC_(GdiDdCanCreateSurface, 2)
+SVC_(GdiDdCanCreateD3DBuffer, 2)
+SVC_(GdiDdColorControl, 2)
+SVC_(GdiDdCreateDirectDrawObject, 1)
+SVC_(GdiDdCreateSurface, 8)
+SVC_(GdiDdCreateD3DBuffer, 8)
+SVC_(GdiDdCreateMoComp, 2)
+SVC_(GdiDdCreateSurfaceObject, 6)
+SVC_(GdiDdDeleteDirectDrawObject, 1)
+SVC_(GdiDdDeleteSurfaceObject, 1)
+SVC_(GdiDdDestroyMoComp, 2)
+SVC_(GdiDdDestroySurface, 2)
+SVC_(GdiDdDestroyD3DBuffer, 1)
+SVC_(GdiDdEndMoCompFrame, 2)
+SVC_(GdiDdFlip, 5)
+SVC_(GdiDdFlipToGDISurface, 2)
+SVC_(GdiDdGetAvailDriverMemory, 2)
+SVC_(GdiDdGetBltStatus, 2)
+SVC_(GdiDdGetDC, 2)
+SVC_(GdiDdGetDriverInfo, 2)
+SVC_(GdiDdGetDxHandle, 3)
+SVC_(GdiDdGetFlipStatus, 2)
+SVC_(GdiDdGetInternalMoCompInfo, 2)
+SVC_(GdiDdGetMoCompBuffInfo, 2)
+SVC_(GdiDdGetMoCompGuids, 2)
+SVC_(GdiDdGetMoCompFormats, 2)
+SVC_(GdiDdGetScanLine, 2)
+SVC_(GdiDdLock, 3)
+SVC_(GdiDdLockD3D, 2)
+SVC_(GdiDdQueryDirectDrawObject, 11)
+SVC_(GdiDdQueryMoCompStatus, 2)
+SVC_(GdiDdReenableDirectDrawObject, 2)
+SVC_(GdiDdReleaseDC, 1)
+SVC_(GdiDdRenderMoComp, 2)
+SVC_(GdiDdResetVisrgn, 2)
+SVC_(GdiDdSetColorKey, 2)
+SVC_(GdiDdSetExclusiveMode, 2)
+SVC_(GdiDdSetGammaRamp, 3)
+SVC_(GdiDdCreateSurfaceEx, 3)
+SVC_(GdiDdSetOverlayPosition, 3)
+SVC_(GdiDdUnattachSurface, 2)
+SVC_(GdiDdUnlock, 2)
+SVC_(GdiDdUnlockD3D, 2)
+SVC_(GdiDdUpdateOverlay, 3)
+SVC_(GdiDdWaitForVerticalBlank, 2)
+SVC_(GdiDvpCanCreateVideoPort, 2)
+SVC_(GdiDvpColorControl, 2)
+SVC_(GdiDvpCreateVideoPort, 2)
+SVC_(GdiDvpDestroyVideoPort, 2)
+SVC_(GdiDvpFlipVideoPort, 4)
+SVC_(GdiDvpGetVideoPortBandwidth, 2)
+SVC_(GdiDvpGetVideoPortField, 2)
+SVC_(GdiDvpGetVideoPortFlipStatus, 2)
+SVC_(GdiDvpGetVideoPortInputFormats, 2)
+SVC_(GdiDvpGetVideoPortLine, 2)
+SVC_(GdiDvpGetVideoPortOutputFormats, 2)
+SVC_(GdiDvpGetVideoPortConnectInfo, 2)
+SVC_(GdiDvpGetVideoSignalStatus, 2)
+SVC_(GdiDvpUpdateVideoPort, 4)
+SVC_(GdiDvpWaitForVideoPortSync, 2)
+SVC_(GdiDvpAcquireNotification, 3)
+SVC_(GdiDvpReleaseNotification, 2)
+SVC_(GdiDxgGenericThunk, 6)
+SVC_(GdiDeleteClientObj, 1)
+SVC_(GdiDeleteColorSpace, 1)
+SVC_(GdiDeleteColorTransform, 2)
+SVC_(GdiDeleteObjectApp, 1)
+SVC_(GdiDescribePixelFormat, 4)
+SVC_(GdiGetPerBandInfo, 2)
+SVC_(GdiDoBanding, 4)
+SVC_(GdiDoPalette, 6)
+SVC_(GdiDrawEscape, 4)
+SVC_(GdiEllipse, 5)
+SVC_(GdiEnableEudc, 1)
+SVC_(GdiEndDoc, 1)
+SVC_(GdiEndPage, 1)
+SVC_(GdiEndPath, 1)
+SVC_(GdiEnumFontChunk, 5)
+SVC_(GdiEnumFontClose, 1)
+SVC_(GdiEnumFontOpen, 7)
+SVC_(GdiEnumObjects, 4)
+SVC_(GdiEqualRgn, 2)
+SVC_(GdiEudcLoadUnloadLink, 7)
+SVC_(GdiExcludeClipRect, 5)
+SVC_(GdiExtCreatePen, 11)
+SVC_(GdiExtCreateRegion, 3)
+SVC_(GdiExtEscape, 8)
+SVC_(GdiExtFloodFill, 5)
+SVC_(GdiExtGetObjectW, 3)
+SVC_(GdiExtSelectClipRgn, 3)
+SVC_(GdiExtTextOutW, 9)
+SVC_(GdiFillPath, 1)
+SVC_(GdiFillRgn, 3)
+SVC_(GdiFlattenPath, 1)
+SVC_(GdiFlush, 0)
+SVC_(GdiForceUFIMapping, 2)
+SVC_(GdiFrameRgn, 5)
+SVC_(GdiFullscreenControl, 5)
+SVC_(GdiGetAndSetDCDword, 4)
+SVC_(GdiGetAppClipBox, 2)
+SVC_(GdiGetBitmapBits, 3)
+SVC_(GdiGetBitmapDimension, 2)
+SVC_(GdiGetBoundsRect, 3)
+SVC_(GdiGetCharABCWidthsW, 6)
+SVC_(GdiGetCharacterPlacementW, 6)
+SVC_(GdiGetCharSet, 1)
+SVC_(GdiGetCharWidthW, 6)
+SVC_(GdiGetCharWidthInfo, 2)
+SVC_(GdiGetColorAdjustment, 2)
+SVC_(GdiGetColorSpaceforBitmap, 1)
+SVC_(GdiGetDCDword, 3)
+SVC_(GdiGetDCforBitmap, 1)
+SVC_(GdiGetDCObject, 2)
+SVC_(GdiGetDCPoint, 3)
+SVC_(GdiGetDeviceCaps, 2)
+SVC_(GdiGetDeviceGammaRamp, 2)
+SVC_(GdiGetDeviceCapsAll, 2)
+SVC_(GdiGetDIBitsInternal, 9)
+SVC_(GdiGetETM, 2)
+SVC_(GdiGetEudcTimeStampEx, 3)
+SVC_(GdiGetFontData, 5)
+SVC_(GdiGetFontResourceInfoInternalW, 7)
+SVC_(GdiGetGlyphIndicesW, 5)
+SVC_(GdiGetGlyphIndicesWInternal, 6)
+SVC_(GdiGetGlyphOutline, 8)
+SVC_(GdiGetKerningPairs, 3)
+SVC_(GdiGetLinkedUFIs, 3)
+SVC_(GdiGetMiterLimit, 2)
+SVC_(GdiGetMonitorID, 3)
+SVC_(GdiGetNearestColor, 2)
+SVC_(GdiGetNearestPaletteIndex, 2)
+SVC_(GdiGetObjectBitmapHandle, 2)
+SVC_(GdiGetOutlineTextMetricsInternalW, 4)
+SVC_(GdiGetPath, 4)
+SVC_(GdiGetPixel, 3)
+SVC_(GdiGetRandomRgn, 3)
+SVC_(GdiGetRasterizerCaps, 2)
+SVC_(GdiGetRealizationInfo, 3)
+SVC_(GdiGetRegionData, 3)
+SVC_(GdiGetRgnBox, 2)
+SVC_(GdiGetServerMetaFileBits, 7)
+SVC_(GdiGetSpoolMessage, 4)
+SVC_(GdiGetStats, 5)
+SVC_(GdiGetStockObject, 1)
+SVC_(GdiGetStringBitmapW, 5)
+SVC_(GdiGetSystemPaletteUse, 1)
+SVC_(GdiGetTextCharsetInfo, 3)
+SVC_(GdiGetTextExtent, 5)
+SVC_(GdiGetTextExtentExW, 8)
+SVC_(GdiGetTextFaceW, 4)
+SVC_(GdiGetTextMetricsW, 3)
+SVC_(GdiGetTransform, 3)
+SVC_(GdiGetUFI, 6)
+SVC_(GdiGetEmbUFI, 7)
+SVC_(GdiGetUFIPathname, 10)
+SVC_(GdiGetEmbedFonts, 0)
+SVC_(GdiChangeGhostFont, 2)
+SVC_(GdiAddEmbFontToDC, 2)
+SVC_(GdiGetFontUnicodeRanges, 2)
+SVC_(GdiGetWidthTable, 7)
+SVC_(GdiGradientFill, 6)
+SVC_(GdiHfontCreate, 5)
+SVC_(GdiIcmBrushInfo, 8)
+SVC_(GdiInit, 0)
+SVC_(GdiInitSpool, 0)
+SVC_(GdiIntersectClipRect, 5)
+SVC_(GdiInvertRgn, 2)
+SVC_(GdiLineTo, 3)
+SVC_(GdiMakeFontDir, 5)
+SVC_(GdiMakeInfoDC, 2)
+SVC_(GdiMaskBlt, 13)
+SVC_(GdiModifyWorldTransform, 3)
+SVC_(GdiMonoBitmap, 1)
+SVC_(GdiMoveTo, 4)
+SVC_(GdiOffsetClipRgn, 3)
+SVC_(GdiOffsetRgn, 3)
+SVC_(GdiOpenDCW, 7)
+SVC_(GdiPatBlt, 6)
+SVC_(GdiPolyPatBlt, 5)
+SVC_(GdiPathToRegion, 1)
+SVC_(GdiPlgBlt, 11)
+SVC_(GdiPolyDraw, 4)
+SVC_(GdiPolyPolyDraw, 5)
+SVC_(GdiPolyTextOutW, 4)
+SVC_(GdiPtInRegion, 3)
+SVC_(GdiPtVisible, 3)
+SVC_(GdiQueryFonts, 3)
+SVC_(GdiQueryFontAssocInfo, 1)
+SVC_(GdiRectangle, 5)
+SVC_(GdiRectInRegion, 2)
+SVC_(GdiRectVisible, 2)
+SVC_(GdiRemoveFontResourceW, 6)
+SVC_(GdiRemoveFontMemResourceEx, 1)
+SVC_(GdiResetDC, 5)
+SVC_(GdiResizePalette, 2)
+SVC_(GdiRestoreDC, 2)
+SVC_(GdiRoundRect, 7)
+SVC_(GdiSaveDC, 1)
+SVC_(GdiScaleViewportExtEx, 6)
+SVC_(GdiScaleWindowExtEx, 6)
+SVC_(GdiSelectBitmap, 2)
+SVC_(GdiSelectBrush, 2)
+SVC_(GdiSelectClipPath, 2)
+SVC_(GdiSelectFont, 2)
+SVC_(GdiSelectPen, 2)
+SVC_(GdiSetBitmapAttributes, 2)
+SVC_(GdiSetBitmapBits, 3)
+SVC_(GdiSetBitmapDimension, 4)
+SVC_(GdiSetBoundsRect, 3)
+SVC_(GdiSetBrushAttributes, 2)
+SVC_(GdiSetBrushOrg, 4)
+SVC_(GdiSetColorAdjustment, 2)
+SVC_(GdiSetColorSpace, 2)
+SVC_(GdiSetDeviceGammaRamp, 2)
+SVC_(GdiSetDIBitsToDeviceInternal, 16)
+SVC_(GdiSetFontEnumeration, 1)
+SVC_(GdiSetFontXform, 3)
+SVC_(GdiSetIcmMode, 3)
+SVC_(GdiSetLinkedUFIs, 3)
+SVC_(GdiSetMagicColors, 3)
+SVC_(GdiSetMetaRgn, 1)
+SVC_(GdiSetMiterLimit, 3)
+SVC_(GdiGetDeviceWidth, 1)
+SVC_(GdiMirrorWindowOrg, 1)
+SVC_(GdiSetLayout, 3)
+SVC_(GdiSetPixel, 4)
+SVC_(GdiSetPixelFormat, 2)
+SVC_(GdiSetRectRgn, 5)
+SVC_(GdiSetSystemPaletteUse, 2)
+SVC_(GdiSetTextJustification, 3)
+SVC_(GdiSetupPublicCFONT, 3)
+SVC_(GdiSetVirtualResolution, 5)
+SVC_(GdiSetSizeDevice, 3)
+SVC_(GdiStartDoc, 4)
+SVC_(GdiStartPage, 1)
+SVC_(GdiStretchBlt, 12)
+SVC_(GdiStretchDIBitsInternal, 16)
+SVC_(GdiStrokeAndFillPath, 1)
+SVC_(GdiStrokePath, 1)
+SVC_(GdiSwapBuffers, 1)
+SVC_(GdiTransformPoints, 5)
+SVC_(GdiTransparentBlt, 11)
+SVC_(GdiUnloadPrinterDriver, 2)
+SVC_(GdiUnmapMemFont, 1)
+SVC_(GdiUnrealizeObject, 1)
+SVC_(GdiUpdateColors, 1)
+SVC_(GdiWidenPath, 1)
+SVC_(UserActivateKeyboardLayout, 2)
+SVC_(UserAlterWindowStyle, 3)
+SVC_(UserAssociateInputContext, 3)
+SVC_(UserAttachThreadInput, 3)
+SVC_(UserBeginPaint, 2)
+SVC_(UserBitBltSysBmp, 8)
+SVC_(UserBlockInput, 1)
+SVC_(UserBuildHimcList, 4)
+SVC_(UserBuildHwndList, 7)
+SVC_(UserBuildNameList, 4)
+SVC_(UserBuildPropList, 4)
+SVC_(UserCallHwnd, 2)
+SVC_(UserCallHwndLock, 2)
+SVC_(UserCallHwndOpt, 2)
+SVC_(UserCallHwndParam, 3)
+SVC_(UserCallHwndParamLock, 3)
+SVC_(UserCallMsgFilter, 2)
+SVC_(UserCallNextHookEx, 4)
+SVC_(UserCallNoParam, 1)
+SVC_(UserCallOneParam, 2)
+SVC_(UserCallTwoParam, 3)
+SVC_(UserChangeClipboardChain, 2)
+SVC_(UserChangeDisplaySettings, 4)
+SVC_(UserCheckImeHotKey, 2)
+SVC_(UserCheckMenuItem, 3)
+SVC_(UserChildWindowFromPointEx, 4)
+SVC_(UserClipCursor, 1)
+SVC_(UserCloseClipboard, 0)
+SVC_(UserCloseDesktop, 1)
+SVC_(UserCloseWindowStation, 1)
+SVC_(UserConsoleControl, 3)
+SVC_(UserConvertMemHandle, 2)
+SVC_(UserCopyAcceleratorTable, 3)
+SVC_(UserCountClipboardFormats, 0)
+SVC_(UserCreateAcceleratorTable, 2)
+SVC_(UserCreateCaret, 4)
+SVC_(UserCreateDesktop, 5)
+SVC_(UserCreateInputContext, 1)
+SVC_(UserCreateLocalMemHandle, 4)
+SVC_(UserCreateWindowEx, 15)
+SVC_(UserCreateWindowStation, 7)
+SVC_(UserDdeGetQualityOfService, 3)
+SVC_(UserDdeInitialize, 5)
+SVC_(UserDdeSetQualityOfService, 3)
+SVC_(UserDeferWindowPos, 8)
+SVC_(UserDefSetText, 2)
+SVC_(UserDeleteMenu, 3)
+SVC_(UserDestroyAcceleratorTable, 1)
+SVC_(UserDestroyCursor, 2)
+SVC_(UserDestroyInputContext, 1)
+SVC_(UserDestroyMenu, 1)
+SVC_(UserDestroyWindow, 1)
+SVC_(UserDisableThreadIme, 1)
+SVC_(UserDispatchMessage, 1)
+SVC_(UserDragDetect, 3)
+SVC_(UserDragObject, 5)
+SVC_(UserDrawAnimatedRects, 4)
+SVC_(UserDrawCaption, 4)
+SVC_(UserDrawCaptionTemp, 7)
+SVC_(UserDrawIconEx, 11)
+SVC_(UserDrawMenuBarTemp, 5)
+SVC_(UserEmptyClipboard, 0)
+SVC_(UserEnableMenuItem, 3)
+SVC_(UserEnableScrollBar, 3)
+SVC_(UserEndDeferWindowPosEx, 2)
+SVC_(UserEndMenu, 0)
+SVC_(UserEndPaint, 2)
+SVC_(UserEnumDisplayDevices, 4)
+SVC_(UserEnumDisplayMonitors, 4)
+SVC_(UserEnumDisplaySettings, 4)
+SVC_(UserEvent, 1)
+SVC_(UserExcludeUpdateRgn, 2)
+SVC_(UserFillWindow, 4)
+SVC_(UserFindExistingCursorIcon, 3)
+SVC_(UserFindWindowEx, 5)
+SVC_(UserFlashWindowEx, 1)
+SVC_(UserGetAltTabInfo, 6)
+SVC_(UserGetAncestor, 2)
+SVC_(UserGetAppImeLevel, 1)
+SVC_(UserGetAsyncKeyState, 1)
+SVC_(UserGetAtomName, 2)
+SVC_(UserGetCaretBlinkTime, 0)
+SVC_(UserGetCaretPos, 1)
+SVC_(UserGetClassInfoEx, 5)
+SVC_(UserGetClassName, 3)
+SVC_(UserGetClipboardData, 2)
+SVC_(UserGetClipboardFormatName, 3)
+SVC_(UserGetClipboardOwner, 0)
+SVC_(UserGetClipboardSequenceNumber, 0)
+SVC_(UserGetClipboardViewer, 0)
+SVC_(UserGetClipCursor, 1)
+SVC_(UserGetComboBoxInfo, 2)
+SVC_(UserGetControlBrush, 3)
+SVC_(UserGetControlColor, 4)
+SVC_(UserGetCPD, 3)
+SVC_(UserGetCursorFrameInfo, 4)
+SVC_(UserGetCursorInfo, 1)
+SVC_(UserGetDC, 1)
+SVC_(UserGetDCEx, 3)
+SVC_(UserGetDoubleClickTime, 0)
+SVC_(UserGetForegroundWindow, 0)
+SVC_(UserGetGuiResources, 2)
+SVC_(UserGetGUIThreadInfo, 2)
+SVC_(UserGetIconInfo, 6)
+SVC_(UserGetIconSize, 4)
+SVC_(UserGetImeHotKey, 4)
+SVC_(UserGetImeInfoEx, 2)
+SVC_(UserGetInternalWindowPos, 3)
+SVC_(UserGetKeyboardLayoutList, 2)
+SVC_(UserGetKeyboardLayoutName, 1)
+SVC_(UserGetKeyboardState, 1)
+SVC_(UserGetKeyNameText, 3)
+SVC_(UserGetKeyState, 1)
+SVC_(UserGetListBoxInfo, 1)
+SVC_(UserGetMenuBarInfo, 4)
+SVC_(UserGetMenuIndex, 2)
+SVC_(UserGetMenuItemRect, 4)
+SVC_(UserGetMessage, 4)
+SVC_(UserGetMouseMovePointsEx, 5)
+SVC_(UserGetObjectInformation, 5)
+SVC_(UserGetOpenClipboardWindow, 0)
+SVC_(UserGetPriorityClipboardFormat, 2)
+SVC_(UserGetProcessWindowStation, 0)
+SVC_(UserGetRawInputBuffer, 3)
+SVC_(UserGetRawInputData, 5)
+SVC_(UserGetRawInputDeviceInfo, 4)
+SVC_(UserGetRawInputDeviceList, 3)
+SVC_(UserGetRegisteredRawInputDevices, 3)
+SVC_(UserGetScrollBarInfo, 3)
+SVC_(UserGetSystemMenu, 2)
+SVC_(UserGetThreadDesktop, 2)
+SVC_(UserGetThreadState, 1)
+SVC_(UserGetTitleBarInfo, 2)
+SVC_(UserGetUpdateRect, 3)
+SVC_(UserGetUpdateRgn, 3)
+SVC_(UserGetWindowDC, 1)
+SVC_(UserGetWindowPlacement, 2)
+SVC_(UserGetWOWClass, 2)
+SVC_(UserHardErrorControl, 3)
+SVC_(UserHideCaret, 1)
+SVC_(UserHiliteMenuItem, 4)
+SVC_(UserImpersonateDdeClientWindow, 2)
+SVC_(UserInitialize, 3)
+SVC_(UserInitializeClientPfnArrays, 4)
+SVC_(UserInitTask, 12)
+SVC_(UserInternalGetWindowText, 3)
+SVC_(UserInvalidateRect, 3)
+SVC_(UserInvalidateRgn, 3)
+SVC_(UserIsClipboardFormatAvailable, 1)
+SVC_(UserKillTimer, 2)
+SVC_(UserLoadKeyboardLayoutEx, 7)
+SVC_(UserLockWindowStation, 1)
+SVC_(UserLockWindowUpdate, 1)
+SVC_(UserLockWorkStation, 0)
+SVC_(UserMapVirtualKeyEx, 4)
+SVC_(UserMenuItemFromPoint, 4)
+SVC_(UserMessageCall, 7)
+SVC_(UserMinMaximize, 3)
+SVC_(UserMNDragLeave, 0)
+SVC_(UserMNDragOver, 2)
+SVC_(UserModifyUserStartupInfoFlags, 2)
+SVC_(UserMoveWindow, 6)
+SVC_(UserNotifyIMEStatus, 3)
+SVC_(UserNotifyProcessCreate, 4)
+SVC_(UserNotifyWinEvent, 4)
+SVC_(UserOpenClipboard, 2)
+SVC_(UserOpenDesktop, 3)
+SVC_(UserOpenInputDesktop, 3)
+SVC_(UserOpenWindowStation, 2)
+SVC_(UserPaintDesktop, 1)
+SVC_(UserPeekMessage, 5)
+SVC_(UserPostMessage, 4)
+SVC_(UserPostThreadMessage, 4)
+SVC_(UserPrintWindow, 3)
+SVC_(UserProcessConnect, 3)
+SVC_(UserQueryInformationThread, 4)
+SVC_(UserQueryInputContext, 2)
+SVC_(UserQuerySendMessage, 1)
+SVC_(UserQueryWindow, 2)
+SVC_(UserRealChildWindowFromPoint, 3)
+SVC_(UserRealInternalGetMessage, 6)
+SVC_(UserRealWaitMessageEx, 2)
+SVC_(UserRedrawWindow, 4)
+SVC_(UserRegisterClassExWOW, 7)
+SVC_(UserRegisterUserApiHook, 4)
+SVC_(UserRegisterHotKey, 4)
+SVC_(UserRegisterRawInputDevices, 3)
+SVC_(UserRegisterTasklist, 1)
+SVC_(UserRegisterWindowMessage, 1)
+SVC_(UserRemoveMenu, 3)
+SVC_(UserRemoveProp, 2)
+SVC_(UserResolveDesktop, 4)
+SVC_(UserResolveDesktopForWOW, 1)
+SVC_(UserSBGetParms, 4)
+SVC_(UserScrollDC, 7)
+SVC_(UserScrollWindowEx, 8)
+SVC_(UserSelectPalette, 3)
+SVC_(UserSendInput, 3)
+SVC_(UserSetActiveWindow, 1)
+SVC_(UserSetAppImeLevel, 2)
+SVC_(UserSetCapture, 1)
+SVC_(UserSetClassLong, 4)
+SVC_(UserSetClassWord, 3)
+SVC_(UserSetClipboardData, 3)
+SVC_(UserSetClipboardViewer, 1)
+SVC_(UserSetConsoleReserveKeys, 2)
+SVC_(UserSetCursor, 1)
+SVC_(UserSetCursorContents, 2)
+SVC_(UserSetCursorIconData, 4)
+SVC_(UserSetFocus, 1)
+SVC_(UserSetImeHotKey, 5)
+SVC_(UserSetImeInfoEx, 1)
+SVC_(UserSetImeOwnerWindow, 2)
+SVC_(UserSetInformationProcess, 4)
+SVC_(UserSetInformationThread, 4)
+SVC_(UserSetInternalWindowPos, 4)
+SVC_(UserSetKeyboardState, 1)
+SVC_(UserSetLogonNotifyWindow, 1)
+SVC_(UserSetMenu, 3)
+SVC_(UserSetMenuContextHelpId, 2)
+SVC_(UserSetMenuDefaultItem, 3)
+SVC_(UserSetMenuFlagRtoL, 1)
+SVC_(UserSetObjectInformation, 4)
+SVC_(UserSetParent, 2)
+SVC_(UserSetProcessWindowStation, 1)
+SVC_(UserSetProp, 3)
+SVC_(UserSetScrollInfo, 4)
+SVC_(UserSetShellWindowEx, 2)
+SVC_(UserSetSysColors, 4)
+SVC_(UserSetSystemCursor, 2)
+SVC_(UserSetSystemMenu, 2)
+SVC_(UserSetSystemTimer, 4)
+SVC_(UserSetThreadDesktop, 1)
+SVC_(UserSetThreadLayoutHandles, 2)
+SVC_(UserSetThreadState, 2)
+SVC_(UserSetTimer, 4)
+SVC_(UserSetWindowFNID, 2)
+SVC_(UserSetWindowLong, 4)
+SVC_(UserSetWindowPlacement, 2)
+SVC_(UserSetWindowPos, 7)
+SVC_(UserSetWindowRgn, 3)
+SVC_(UserSetWindowsHookAW, 3)
+SVC_(UserSetWindowsHookEx, 6)
+SVC_(UserSetWindowStationUser, 4)
+SVC_(UserSetWindowWord, 3)
+SVC_(UserSetWinEventHook, 8)
+SVC_(UserShowCaret, 1)
+SVC_(UserShowScrollBar, 3)
+SVC_(UserShowWindow, 2)
+SVC_(UserShowWindowAsync, 2)
+SVC_(UserSoundSentry, 0)
+SVC_(UserSwitchDesktop, 1)
+SVC_(UserSystemParametersInfo, 4)
+SVC_(UserTestForInteractiveUser, 1)
+SVC_(UserThunkedMenuInfo, 2)
+SVC_(UserThunkedMenuItemInfo, 6)
+SVC_(UserToUnicodeEx, 7)
+SVC_(UserTrackMouseEvent, 1)
+SVC_(UserTrackPopupMenuEx, 6)
+SVC_(UserCalcMenuBar, 5)
+SVC_(UserPaintMenuBar, 6)
+SVC_(UserTranslateAccelerator, 3)
+SVC_(UserTranslateMessage, 2)
+SVC_(UserUnhookWindowsHookEx, 1)
+SVC_(UserUnhookWinEvent, 1)
+SVC_(UserUnloadKeyboardLayout, 1)
+SVC_(UserUnlockWindowStation, 1)
+SVC_(UserUnregisterClass, 3)
+SVC_(UserUnregisterUserApiHook, 0)
+SVC_(UserUnregisterHotKey, 2)
+SVC_(UserUpdateInputContext, 3)
+SVC_(UserUpdateInstance, 3)
+SVC_(UserUpdateLayeredWindow, 10)
+SVC_(UserGetLayeredWindowAttributes, 4)
+SVC_(UserSetLayeredWindowAttributes, 4)
+SVC_(UserUpdatePerUserSystemParameters, 2)
+SVC_(UserUserHandleGrantAccess, 3)
+SVC_(UserValidateHandleSecure, 1)
+SVC_(UserValidateRect, 2)
+SVC_(UserValidateTimerCallback, 1)
+SVC_(UserVkKeyScanEx, 3)
+SVC_(UserWaitForInputIdle, 3)
+SVC_(UserWaitForMsgAndEvent, 1)
+SVC_(UserWaitMessage, 0)
+SVC_(UserWin32PoolAllocationStats, 6)
+SVC_(UserWindowFromPoint, 2)
+SVC_(UserYieldTask, 0)
+SVC_(UserRemoteConnect, 3)
+SVC_(UserRemoteRedrawRectangle, 4)
+SVC_(UserRemoteRedrawScreen, 0)
+SVC_(UserRemoteStopScreenUpdates, 0)
+SVC_(UserCtxDisplayIOCtl, 3)
+SVC_(GdiEngAssociateSurface, 3)
+SVC_(GdiEngCreateBitmap, 6)
+SVC_(GdiEngCreateDeviceSurface, 4)
+SVC_(GdiEngCreateDeviceBitmap, 4)
+SVC_(GdiEngCreatePalette, 6)
+SVC_(GdiEngComputeGlyphSet, 3)
+SVC_(GdiEngCopyBits, 6)
+SVC_(GdiEngDeletePalette, 1)
+SVC_(GdiEngDeleteSurface, 1)
+SVC_(GdiEngEraseSurface, 3)
+SVC_(GdiEngUnlockSurface, 1)
+SVC_(GdiEngLockSurface, 1)
+SVC_(GdiEngBitBlt, 11)
+SVC_(GdiEngStretchBlt, 11)
+SVC_(GdiEngPlgBlt, 11)
+SVC_(GdiEngMarkBandingSurface, 1)
+SVC_(GdiEngStrokePath, 8)
+SVC_(GdiEngFillPath, 7)
+SVC_(GdiEngStrokeAndFillPath, 10)
+SVC_(GdiEngPaint, 5)
+SVC_(GdiEngLineTo, 9)
+SVC_(GdiEngAlphaBlend, 7)
+SVC_(GdiEngGradientFill, 10)
+SVC_(GdiEngTransparentBlt, 8)
+SVC_(GdiEngTextOut, 10)
+SVC_(GdiEngStretchBltROP, 13)
+SVC_(GdiXLATEOBJ_cGetPalette, 4)
+SVC_(GdiXLATEOBJ_iXlate, 2)
+SVC_(GdiXLATEOBJ_hGetColorTransform, 1)
+SVC_(GdiCLIPOBJ_bEnum, 3)
+SVC_(GdiCLIPOBJ_cEnumStart, 5)
+SVC_(GdiCLIPOBJ_ppoGetPath, 1)
+SVC_(GdiEngDeletePath, 1)
+SVC_(GdiEngCreateClip, 0)
+SVC_(GdiEngDeleteClip, 1)
+SVC_(GdiBRUSHOBJ_ulGetBrushColor, 1)
+SVC_(GdiBRUSHOBJ_pvAllocRbrush, 2)
+SVC_(GdiBRUSHOBJ_pvGetRbrush, 1)
+SVC_(GdiBRUSHOBJ_hGetColorTransform, 1)
+SVC_(GdiXFORMOBJ_bApplyXform, 5)
+SVC_(GdiXFORMOBJ_iGetXform, 2)
+SVC_(GdiFONTOBJ_vGetInfo, 3)
+SVC_(GdiFONTOBJ_pxoGetXform, 1)
+SVC_(GdiFONTOBJ_cGetGlyphs, 5)
+SVC_(GdiFONTOBJ_pifi, 1)
+SVC_(GdiFONTOBJ_pfdg, 1)
+SVC_(GdiFONTOBJ_pQueryGlyphAttrs, 2)
+SVC_(GdiFONTOBJ_pvTrueTypeFontFile, 2)
+SVC_(GdiFONTOBJ_cGetAllGlyphHandles, 2)
+SVC_(GdiSTROBJ_bEnum, 3)
+SVC_(GdiSTROBJ_bEnumPositionsOnly, 3)
+SVC_(GdiSTROBJ_bGetAdvanceWidths, 4)
+SVC_(GdiSTROBJ_vEnumStart, 1)
+SVC_(GdiSTROBJ_dwGetCodePage, 1)
+SVC_(GdiPATHOBJ_vGetBounds, 2)
+SVC_(GdiPATHOBJ_bEnum, 2)
+SVC_(GdiPATHOBJ_vEnumStart, 1)
+SVC_(GdiPATHOBJ_vEnumStartClipLines, 4)
+SVC_(GdiPATHOBJ_bEnumClipLines, 3)
+SVC_(GdiGetDhpdev, 1)
+SVC_(GdiEngCheckAbort, 1)
+SVC_(GdiHT_Get8BPPFormatPalette, 4)
+SVC_(GdiHT_Get8BPPMaskPalette, 6)
+SVC_(GdiUpdateTransform, 1)
+SVC_(GdiSetPUMPDOBJ, 4)
+SVC_(GdiBRUSHOBJ_DeleteRbrush, 2)
+SVC_(GdiUMPDEngFreeUserMem, 1)
+SVC_(GdiDrawStream, 3)
+SVC_(GdiMakeObjectXferable, 2)
+SVC_(GdiMakeObjectUnXferable, 1)

diff --git a/rostests/apitests/w32kdll/w32kdll_ros/CMakeLists.txt b/rostests/apitests/w32kdll/w32kdll_ros/CMakeLists.txt
index a7dc46d..67b4902 100644 (file)
--- a/rostests/apitests/w32kdll/w32kdll_ros/CMakeLists.txt
+++ b/rostests/apitests/w32kdll/w32kdll_ros/CMakeLists.txt
@@ -1,12 +1,11 @@
 
 spec2def(w32kdll_ros.dll w32kdll_ros.spec ADD_IMPORTLIB)
 
-add_library(w32kdll_ros SHARED
+add_library(w32kdll_ros SHARED 
     main.c
+    sys-stubs.S
     ${CMAKE_CURRENT_BINARY_DIR}/w32kdll_ros.def)
 
 set_entrypoint(w32kdll_ros 0)
 
-target_link_libraries(w32kdll_ros win32ksys)
-
 add_dependencies(w32kdll_ros psdk)

diff --git a/rostests/apitests/w32kdll/w32kdll_ros/sys-stubs.S b/rostests/apitests/w32kdll/w32kdll_ros/sys-stubs.S
new file mode 100644 (file)
index 0000000..97c39b0
--- /dev/null
+++ b/rostests/apitests/w32kdll/w32kdll_ros/sys-stubs.S
@@ -0,0 +1,12 @@
+
+#include <asm.inc>
+#include <syscalls.inc>
+
+.code
+
+SyscallId = HEX(1000)
+#define SVC_(name, argcount) STUB_U name, argcount
+
+#include "win32ksvc-ros.h"
+
+END

diff --git a/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.spec b/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.spec
index 81d3b85..20f67f5 100644 (file)
--- a/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.spec
+++ b/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.spec
@@ -238,7 +238,7 @@
 @ stdcall NtGdiMoveTo(ptr long long ptr)
 @ stdcall NtGdiOffsetClipRgn(ptr long long)
 @ stdcall NtGdiOffsetRgn(ptr long long)
-@ stdcall NtGdiOpenDCW(ptr ptr ptr long ptr long ptr ptr)
+@ stdcall NtGdiOpenDCW(ptr ptr ptr long ptr long ptr ptr) # FIXME: 7 params on XP
 @ stdcall NtGdiPatBlt(ptr long long long long long)
 @ stdcall NtGdiPolyPatBlt(ptr long ptr long long)
 @ stdcall NtGdiPathToRegion(ptr)
@@ -377,22 +377,22 @@
 @ stdcall NtUserEndMenu()
 @ stdcall NtUserEndPaint(ptr ptr)
 @ stdcall NtUserEnumDisplayDevices(ptr long ptr long)
-; @ stdcall NtUserEnumDisplayMonitors(ptr ptr ptr ptr)
+@ stdcall NtUserEnumDisplayMonitors(ptr ptr ptr ptr) # FIXME: 4 on XP
 @ stdcall NtUserEnumDisplaySettings(ptr long ptr long)
 @ stdcall NtUserEvent(long)
 @ stdcall NtUserExcludeUpdateRgn(ptr ptr)
 @ stdcall NtUserFillWindow(ptr ptr ptr ptr)
-; @ stdcall NtUserFindExistingCursorIcon(ptr ptr ptr)
+@ stdcall NtUserFindExistingCursorIcon(ptr ptr ptr ptr) # FIXME: 3 on XP
 @ stdcall NtUserFindWindowEx(ptr ptr ptr ptr long)
 @ stdcall NtUserFlashWindowEx(ptr)
 @ stdcall NtUserGetAltTabInfo(ptr long ptr wstr long long)
 @ stdcall NtUserGetAncestor(ptr long)
-; @ stdcall NtUserGetAppImeLevel(long)
+@ stdcall NtUserGetAppImeLevel(long)
 @ stdcall NtUserGetAsyncKeyState(long)
 @ stdcall NtUserGetAtomName(long ptr)
 @ stdcall NtUserGetCaretBlinkTime()
 @ stdcall NtUserGetCaretPos(ptr)
-; @ stdcall NtUserGetClassInfo(ptr ptr ptr ptr long)
+@ stdcall NtUserGetClassInfo(ptr ptr ptr ptr long)
 @ stdcall NtUserGetClassName(ptr long ptr)
 @ stdcall NtUserGetClipboardData(long ptr)
 @ stdcall NtUserGetClipboardFormatName(long wstr ptr)
@@ -494,7 +494,7 @@
 @ stdcall NtUserRealWaitMessageEx(long long)
 @ stdcall NtUserRedrawWindow(ptr ptr ptr long)
 @ stdcall NtUserRegisterClassExWOW(ptr ptr ptr ptr long long ptr)
-@ stdcall NtUserRegisterUserApiHook(ptr ptr long long)
+@ stdcall NtUserRegisterUserApiHook(ptr ptr long long) # FIXME: 2 params on XP
 @ stdcall NtUserRegisterHotKey(ptr long long long)
 @ stdcall NtUserRegisterRawInputDevices(ptr long long)
 @ stdcall NtUserRegisterTasklist(long)
@@ -518,7 +518,7 @@
 @ stdcall NtUserSetConsoleReserveKeys(long long)
 @ stdcall NtUserSetCursor(ptr)
 @ stdcall NtUserSetCursorContents(ptr ptr)
-; @ stdcall NtUserSetCursorIconData(ptr ptr ptr ptr)
+; @ stdcall NtUserSetCursorIconData(ptr ptr ptr ptr) # FIXME 4 with new iconcursor / XP
 @ stdcall NtUserSetDbgTag(long long)
 @ stdcall NtUserSetFocus(ptr)
 @ stdcall NtUserSetImeHotKey(long long long long long)
@@ -579,12 +579,12 @@
 @ stdcall NtUserUnhookWinEvent(ptr)
 @ stdcall NtUserUnloadKeyboardLayout(ptr)
 @ stdcall NtUserUnlockWindowStation(ptr)
-; @ stdcall NtUserUnregisterClass(ptr ptr ptr)
+@ stdcall NtUserUnregisterClass(ptr ptr ptr)
 @ stdcall NtUserUnregisterUserApiHook()
 @ stdcall NtUserUnregisterHotKey(ptr long)
 @ stdcall NtUserUpdateInputContext(long long long)
 @ stdcall NtUserUpdateInstance(long long long)
-@ stdcall NtUserUpdateLayeredWindow(ptr ptr ptr ptr ptr ptr long ptr long ptr)
+@ stdcall NtUserUpdateLayeredWindow(ptr ptr ptr ptr ptr ptr long ptr long ptr) # FIXME: 9 params on XP
 @ stdcall NtUserGetLayeredWindowAttributes(ptr ptr ptr ptr)
 @ stdcall NtUserSetLayeredWindowAttributes(ptr long long long)
 @ stdcall NtUserUpdatePerUserSystemParameters(long long)
@@ -597,6 +597,7 @@
 @ stdcall NtUserWaitForMsgAndEvent(long)
 @ stdcall NtUserWaitMessage()
 @ stdcall NtUserWin32PoolAllocationStats(long long long long long long)
+@ stdcall NtUserWindowFromPhysicalPoint(ptr ptr) # Vista
 @ stdcall NtUserWindowFromPoint(long long)
 @ stdcall NtUserYieldTask()
 @ stdcall NtUserRemoteConnect(long long long)
@@ -671,5 +672,5 @@
 @ stdcall NtGdiSetPUMPDOBJ(ptr long ptr ptr)
 @ stdcall NtGdiBRUSHOBJ_DeleteRbrush(ptr ptr)
 @ stdcall NtGdiUMPDEngFreeUserMem(ptr)
-@ stdcall NtGdiUnmapMemFont(ptr)
 @ stdcall NtGdiDrawStream(ptr long ptr)
+

diff --git a/rostests/apitests/w32kdll/w32kdll_ros/win32ksvc-ros.h b/rostests/apitests/w32kdll/w32kdll_ros/win32ksvc-ros.h
new file mode 100644 (file)
index 0000000..1dac35f
--- /dev/null
+++ b/rostests/apitests/w32kdll/w32kdll_ros/win32ksvc-ros.h
@@ -0,0 +1,698 @@
+// SVC_(<NAME>, <ARG_COUNT>)
+//
+// Funcs order, should, match, Windows, XP, 5.1.2600, SP2)
+//
+SVC_(GdiAbortDoc, 1)
+SVC_(GdiAbortPath, 1)
+SVC_(GdiAddFontResourceW, 6)
+SVC_(GdiAddRemoteFontToDC, 4)
+SVC_(GdiAddFontMemResourceEx, 5)
+SVC_(GdiRemoveMergeFont, 2)
+SVC_(GdiAddRemoteMMInstanceToDC, 3)
+SVC_(GdiAlphaBlend, 12)
+SVC_(GdiAngleArc, 6)
+SVC_(GdiAnyLinkedFonts, 0)
+SVC_(GdiFontIsLinked, 1)
+SVC_(GdiArcInternal, 10)
+SVC_(GdiBeginPath, 1)
+SVC_(GdiBitBlt, 11)
+SVC_(GdiCancelDC, 1)
+SVC_(GdiCheckBitmapBits, 8)
+SVC_(GdiCloseFigure, 1)
+SVC_(GdiClearBitmapAttributes, 2)
+SVC_(GdiClearBrushAttributes, 2)
+SVC_(GdiColorCorrectPalette, 6)
+SVC_(GdiCombineRgn, 4)
+SVC_(GdiCombineTransform, 3)
+SVC_(GdiComputeXformCoefficients, 1)
+SVC_(GdiConsoleTextOut, 4)
+SVC_(GdiConvertMetafileRect, 2)
+SVC_(GdiCreateBitmap, 5)
+SVC_(GdiCreateClientObj, 1)
+SVC_(GdiCreateColorSpace, 1)
+SVC_(GdiCreateColorTransform, 8)
+SVC_(GdiCreateCompatibleBitmap, 3)
+SVC_(GdiCreateCompatibleDC, 1)
+SVC_(GdiCreateDIBBrush, 6)
+SVC_(GdiCreateDIBitmapInternal, 11)
+SVC_(GdiCreateDIBSection, 9)
+SVC_(GdiCreateEllipticRgn, 4)
+SVC_(GdiCreateHalftonePalette, 1)
+SVC_(GdiCreateHatchBrushInternal, 3)
+SVC_(GdiCreateMetafileDC, 1)
+SVC_(GdiCreatePaletteInternal, 2)
+SVC_(GdiCreatePatternBrushInternal, 3)
+SVC_(GdiCreatePen, 4)
+SVC_(GdiCreateRectRgn, 4)
+SVC_(GdiCreateRoundRectRgn, 6)
+SVC_(GdiCreateServerMetaFile, 6)
+SVC_(GdiCreateSolidBrush, 2)
+SVC_(GdiD3dContextCreate, 4)
+SVC_(GdiD3dContextDestroy, 1)
+SVC_(GdiD3dContextDestroyAll, 1)
+SVC_(GdiD3dValidateTextureStageState, 1)
+SVC_(GdiD3dDrawPrimitives2, 7)
+SVC_(GdiDdGetDriverState, 1)
+SVC_(GdiDdAddAttachedSurface, 3)
+SVC_(GdiDdAlphaBlt, 3)
+SVC_(GdiDdAttachSurface, 2)
+SVC_(GdiDdBeginMoCompFrame, 2)
+SVC_(GdiDdBlt, 3)
+SVC_(GdiDdCanCreateSurface, 2)
+SVC_(GdiDdCanCreateD3DBuffer, 2)
+SVC_(GdiDdColorControl, 2)
+SVC_(GdiDdCreateDirectDrawObject, 1)
+SVC_(GdiDdCreateSurface, 8)
+SVC_(GdiDdCreateD3DBuffer, 8)
+SVC_(GdiDdCreateMoComp, 2)
+SVC_(GdiDdCreateSurfaceObject, 6)
+SVC_(GdiDdDeleteDirectDrawObject, 1)
+SVC_(GdiDdDeleteSurfaceObject, 1)
+SVC_(GdiDdDestroyMoComp, 2)
+SVC_(GdiDdDestroySurface, 2)
+SVC_(GdiDdDestroyD3DBuffer, 1)
+SVC_(GdiDdEndMoCompFrame, 2)
+SVC_(GdiDdFlip, 5)
+SVC_(GdiDdFlipToGDISurface, 2)
+SVC_(GdiDdGetAvailDriverMemory, 2)
+SVC_(GdiDdGetBltStatus, 2)
+SVC_(GdiDdGetDC, 2)
+SVC_(GdiDdGetDriverInfo, 2)
+SVC_(GdiDdGetDxHandle, 3)
+SVC_(GdiDdGetFlipStatus, 2)
+SVC_(GdiDdGetInternalMoCompInfo, 2)
+SVC_(GdiDdGetMoCompBuffInfo, 2)
+SVC_(GdiDdGetMoCompGuids, 2)
+SVC_(GdiDdGetMoCompFormats, 2)
+SVC_(GdiDdGetScanLine, 2)
+SVC_(GdiDdLock, 3)
+SVC_(GdiDdLockD3D, 2)
+SVC_(GdiDdQueryDirectDrawObject, 11)
+SVC_(GdiDdQueryMoCompStatus, 2)
+SVC_(GdiDdReenableDirectDrawObject, 2)
+SVC_(GdiDdReleaseDC, 1)
+SVC_(GdiDdRenderMoComp, 2)
+SVC_(GdiDdResetVisrgn, 2)
+SVC_(GdiDdSetColorKey, 2)
+SVC_(GdiDdSetExclusiveMode, 2)
+SVC_(GdiDdSetGammaRamp, 3)
+SVC_(GdiDdCreateSurfaceEx, 3)
+SVC_(GdiDdSetOverlayPosition, 3)
+SVC_(GdiDdUnattachSurface, 2)
+SVC_(GdiDdUnlock, 2)
+SVC_(GdiDdUnlockD3D, 2)
+SVC_(GdiDdUpdateOverlay, 3)
+SVC_(GdiDdWaitForVerticalBlank, 2)
+SVC_(GdiDvpCanCreateVideoPort, 2)
+SVC_(GdiDvpColorControl, 2)
+SVC_(GdiDvpCreateVideoPort, 2)
+SVC_(GdiDvpDestroyVideoPort, 2)
+SVC_(GdiDvpFlipVideoPort, 4)
+SVC_(GdiDvpGetVideoPortBandwidth, 2)
+SVC_(GdiDvpGetVideoPortField, 2)
+SVC_(GdiDvpGetVideoPortFlipStatus, 2)
+SVC_(GdiDvpGetVideoPortInputFormats, 2)
+SVC_(GdiDvpGetVideoPortLine, 2)
+SVC_(GdiDvpGetVideoPortOutputFormats, 2)
+SVC_(GdiDvpGetVideoPortConnectInfo, 2)
+SVC_(GdiDvpGetVideoSignalStatus, 2)
+SVC_(GdiDvpUpdateVideoPort, 4)
+SVC_(GdiDvpWaitForVideoPortSync, 2)
+SVC_(GdiDvpAcquireNotification, 3)
+SVC_(GdiDvpReleaseNotification, 2)
+SVC_(GdiDxgGenericThunk, 6)
+SVC_(GdiDeleteClientObj, 1)
+SVC_(GdiDeleteColorSpace, 1)
+SVC_(GdiDeleteColorTransform, 2)
+SVC_(GdiDeleteObjectApp, 1)
+SVC_(GdiDescribePixelFormat, 4)
+SVC_(GdiGetPerBandInfo, 2)
+SVC_(GdiDoBanding, 4)
+SVC_(GdiDoPalette, 6)
+SVC_(GdiDrawEscape, 4)
+SVC_(GdiEllipse, 5)
+SVC_(GdiEnableEudc, 1)
+SVC_(GdiEndDoc, 1)
+SVC_(GdiEndPage, 1)
+SVC_(GdiEndPath, 1)
+SVC_(GdiEnumFontChunk, 5)
+SVC_(GdiEnumFontClose, 1)
+SVC_(GdiEnumFontOpen, 7)
+SVC_(GdiEnumObjects, 4)
+SVC_(GdiEqualRgn, 2)
+SVC_(GdiEudcLoadUnloadLink, 7)
+SVC_(GdiExcludeClipRect, 5)
+SVC_(GdiExtCreatePen, 11)
+SVC_(GdiExtCreateRegion, 3)
+SVC_(GdiExtEscape, 8)
+SVC_(GdiExtFloodFill, 5)
+SVC_(GdiExtGetObjectW, 3)
+SVC_(GdiExtSelectClipRgn, 3)
+SVC_(GdiExtTextOutW, 9)
+SVC_(GdiFillPath, 1)
+SVC_(GdiFillRgn, 3)
+SVC_(GdiFlattenPath, 1)
+SVC_(GdiFlushUserBatch, 0)
+SVC_(GdiFlush, 0)
+SVC_(GdiForceUFIMapping, 2)
+SVC_(GdiFrameRgn, 5)
+SVC_(GdiFullscreenControl, 5)
+SVC_(GdiGetAndSetDCDword, 4)
+SVC_(GdiGetAppClipBox, 2)
+SVC_(GdiGetBitmapBits, 3)
+SVC_(GdiGetBitmapDimension, 2)
+SVC_(GdiGetBoundsRect, 3)
+SVC_(GdiGetCharABCWidthsW, 6)
+SVC_(GdiGetCharacterPlacementW, 6)
+SVC_(GdiGetCharSet, 1)
+SVC_(GdiGetCharWidthW, 6)
+SVC_(GdiGetCharWidthInfo, 2)
+SVC_(GdiGetColorAdjustment, 2)
+SVC_(GdiGetColorSpaceforBitmap, 1)
+SVC_(GdiGetDCDword, 3)
+SVC_(GdiGetDCforBitmap, 1)
+SVC_(GdiGetDCObject, 2)
+SVC_(GdiGetDCPoint, 3)
+SVC_(GdiGetDeviceCaps, 2)
+SVC_(GdiGetDeviceGammaRamp, 2)
+SVC_(GdiGetDeviceCapsAll, 2)
+SVC_(GdiGetDIBitsInternal, 9)
+SVC_(GdiGetETM, 2)
+SVC_(GdiGetEudcTimeStampEx, 3)
+SVC_(GdiGetFontData, 5)
+SVC_(GdiGetFontResourceInfoInternalW, 7)
+SVC_(GdiGetGlyphIndicesW, 5)
+SVC_(GdiGetGlyphIndicesWInternal, 6)
+SVC_(GdiGetGlyphOutline, 8)
+SVC_(GdiGetKerningPairs, 3)
+SVC_(GdiGetLinkedUFIs, 3)
+SVC_(GdiGetMiterLimit, 2)
+SVC_(GdiGetMonitorID, 3)
+SVC_(GdiGetNearestColor, 2)
+SVC_(GdiGetNearestPaletteIndex, 2)
+SVC_(GdiGetObjectBitmapHandle, 2)
+SVC_(GdiGetOutlineTextMetricsInternalW, 4)
+SVC_(GdiGetPath, 4)
+SVC_(GdiGetPixel, 3)
+SVC_(GdiGetRandomRgn, 3)
+SVC_(GdiGetRasterizerCaps, 2)
+SVC_(GdiGetRealizationInfo, 3)
+SVC_(GdiGetRegionData, 3)
+SVC_(GdiGetRgnBox, 2)
+SVC_(GdiGetServerMetaFileBits, 7)
+SVC_(GdiGetSpoolMessage, 4)
+SVC_(GdiGetStats, 5)
+SVC_(GdiGetStockObject, 1)
+SVC_(GdiGetStringBitmapW, 5)
+SVC_(GdiGetSystemPaletteUse, 1)
+SVC_(GdiGetTextCharsetInfo, 3)
+SVC_(GdiGetTextExtent, 5)
+SVC_(GdiGetTextExtentExW, 8)
+SVC_(GdiGetTextFaceW, 4)
+SVC_(GdiGetTextMetricsW, 3)
+SVC_(GdiGetTransform, 3)
+SVC_(GdiGetUFI, 6)
+SVC_(GdiGetEmbUFI, 7)
+SVC_(GdiGetUFIPathname, 10)
+SVC_(GdiGetEmbedFonts, 0)
+SVC_(GdiChangeGhostFont, 2)
+SVC_(GdiAddEmbFontToDC, 2)
+SVC_(GdiGetFontUnicodeRanges, 2)
+SVC_(GdiGetWidthTable, 7)
+SVC_(GdiGradientFill, 6)
+SVC_(GdiHfontCreate, 5)
+SVC_(GdiIcmBrushInfo, 8)
+SVC_(GdiInit, 0)
+SVC_(GdiInitSpool, 0)
+SVC_(GdiIntersectClipRect, 5)
+SVC_(GdiInvertRgn, 2)
+SVC_(GdiLineTo, 3)
+SVC_(GdiMakeFontDir, 5)
+SVC_(GdiMakeInfoDC, 2)
+SVC_(GdiMaskBlt, 13)
+SVC_(GdiModifyWorldTransform, 3)
+SVC_(GdiMonoBitmap, 1)
+SVC_(GdiMoveTo, 4)
+SVC_(GdiOffsetClipRgn, 3)
+SVC_(GdiOffsetRgn, 3)
+SVC_(GdiOpenDCW, 8) /* FIXME: 7 params on XP */
+SVC_(GdiPatBlt, 6)
+SVC_(GdiPolyPatBlt, 5)
+SVC_(GdiPathToRegion, 1)
+SVC_(GdiPlgBlt, 11)
+SVC_(GdiPolyDraw, 4)
+SVC_(GdiPolyPolyDraw, 5)
+SVC_(GdiPolyTextOutW, 4)
+SVC_(GdiPtInRegion, 3)
+SVC_(GdiPtVisible, 3)
+SVC_(GdiQueryFonts, 3)
+SVC_(GdiQueryFontAssocInfo, 1)
+SVC_(GdiRectangle, 5)
+SVC_(GdiRectInRegion, 2)
+SVC_(GdiRectVisible, 2)
+SVC_(GdiRemoveFontResourceW, 6)
+SVC_(GdiRemoveFontMemResourceEx, 1)
+SVC_(GdiResetDC, 5)
+SVC_(GdiResizePalette, 2)
+SVC_(GdiRestoreDC, 2)
+SVC_(GdiRoundRect, 7)
+SVC_(GdiSaveDC, 1)
+SVC_(GdiScaleViewportExtEx, 6)
+SVC_(GdiScaleWindowExtEx, 6)
+SVC_(GdiSelectBitmap, 2)
+SVC_(GdiSelectBrush, 2)
+SVC_(GdiSelectClipPath, 2)
+SVC_(GdiSelectFont, 2)
+SVC_(GdiSelectPen, 2)
+SVC_(GdiSetBitmapAttributes, 2)
+SVC_(GdiSetBitmapBits, 3)
+SVC_(GdiSetBitmapDimension, 4)
+SVC_(GdiSetBoundsRect, 3)
+SVC_(GdiSetBrushAttributes, 2)
+SVC_(GdiSetBrushOrg, 4)
+SVC_(GdiSetColorAdjustment, 2)
+SVC_(GdiSetColorSpace, 2)
+SVC_(GdiSetDeviceGammaRamp, 2)
+SVC_(GdiSetDIBitsToDeviceInternal, 16)
+SVC_(GdiSetFontEnumeration, 1)
+SVC_(GdiSetFontXform, 3)
+SVC_(GdiSetIcmMode, 3)
+SVC_(GdiSetLinkedUFIs, 3)
+SVC_(GdiSetMagicColors, 3)
+SVC_(GdiSetMetaRgn, 1)
+SVC_(GdiSetMiterLimit, 3)
+SVC_(GdiGetDeviceWidth, 1)
+SVC_(GdiMirrorWindowOrg, 1)
+SVC_(GdiSetLayout, 3)
+SVC_(GdiSetPixel, 4)
+SVC_(GdiSetPixelFormat, 2)
+SVC_(GdiSetRectRgn, 5)
+SVC_(GdiSetSystemPaletteUse, 2)
+SVC_(GdiSetTextJustification, 3)
+SVC_(GdiSetupPublicCFONT, 3)
+SVC_(GdiSetVirtualResolution, 5)
+SVC_(GdiSetSizeDevice, 3)
+SVC_(GdiStartDoc, 4)
+SVC_(GdiStartPage, 1)
+SVC_(GdiStretchBlt, 12)
+SVC_(GdiStretchDIBitsInternal, 16)
+SVC_(GdiStrokeAndFillPath, 1)
+SVC_(GdiStrokePath, 1)
+SVC_(GdiSwapBuffers, 1)
+SVC_(GdiTransformPoints, 5)
+SVC_(GdiTransparentBlt, 11)
+SVC_(GdiUnloadPrinterDriver, 2)
+SVC_(GdiUnmapMemFont, 1)
+SVC_(GdiUnrealizeObject, 1)
+SVC_(GdiUpdateColors, 1)
+SVC_(GdiWidenPath, 1)
+SVC_(UserActivateKeyboardLayout, 2)
+SVC_(UserAlterWindowStyle, 3)
+SVC_(UserAssociateInputContext, 3)
+SVC_(UserAttachThreadInput, 3)
+SVC_(UserBeginPaint, 2)
+SVC_(UserBitBltSysBmp, 8)
+SVC_(UserBlockInput, 1)
+SVC_(UserBuildHimcList, 4)
+SVC_(UserBuildHwndList, 7)
+SVC_(UserBuildNameList, 4)
+SVC_(UserBuildPropList, 4)
+SVC_(UserCallHwnd, 2)
+SVC_(UserCallHwndLock, 2)
+SVC_(UserCallHwndOpt, 2)
+SVC_(UserCallHwndParam, 3)
+SVC_(UserCallHwndParamLock, 3)
+SVC_(UserCallMsgFilter, 2)
+SVC_(UserCallNextHookEx, 4)
+SVC_(UserCallNoParam, 1)
+SVC_(UserCallOneParam, 2)
+SVC_(UserCallTwoParam, 3)
+SVC_(UserChangeClipboardChain, 2)
+SVC_(UserChangeDisplaySettings, 5)
+SVC_(UserCheckImeHotKey, 2)
+SVC_(UserCheckMenuItem, 3)
+SVC_(UserChildWindowFromPointEx, 4)
+SVC_(UserClipCursor, 1)
+SVC_(UserCloseClipboard, 0)
+SVC_(UserCloseDesktop, 1)
+SVC_(UserCloseWindowStation, 1)
+SVC_(UserConsoleControl, 3)
+SVC_(UserConvertMemHandle, 2)
+SVC_(UserCopyAcceleratorTable, 3)
+SVC_(UserCountClipboardFormats, 0)
+SVC_(UserCreateAcceleratorTable, 2)
+SVC_(UserCreateCaret, 4)
+SVC_(UserCreateDesktop, 5)
+SVC_(UserCreateInputContext, 1)
+SVC_(UserCreateLocalMemHandle, 4)
+SVC_(UserCreateWindowEx, 15)
+SVC_(UserCreateWindowStation, 7)
+SVC_(UserDdeGetQualityOfService, 3)
+SVC_(UserDdeInitialize, 5)
+SVC_(UserDdeSetQualityOfService, 3)
+SVC_(UserDeferWindowPos, 8)
+SVC_(UserDefSetText, 2)
+SVC_(UserDeleteMenu, 3)
+SVC_(UserDestroyAcceleratorTable, 1)
+SVC_(UserDestroyCursor, 2)
+SVC_(UserDestroyInputContext, 1)
+SVC_(UserDestroyMenu, 1)
+SVC_(UserDestroyWindow, 1)
+SVC_(UserDisableThreadIme, 1)
+SVC_(UserDispatchMessage, 1)
+SVC_(UserDragDetect, 3)
+SVC_(UserDragObject, 5)
+SVC_(UserDrawAnimatedRects, 4)
+SVC_(UserDrawCaption, 4)
+SVC_(UserDrawCaptionTemp, 7)
+SVC_(UserDrawIconEx, 11)
+SVC_(UserDrawMenuBarTemp, 5)
+SVC_(UserEmptyClipboard, 0)
+SVC_(UserEnableMenuItem, 3)
+SVC_(UserEnableScrollBar, 3)
+SVC_(UserEndDeferWindowPosEx, 2)
+SVC_(UserEndMenu, 0)
+SVC_(UserEndPaint, 2)
+SVC_(UserEnumDisplayDevices, 4)
+SVC_(UserEnumDisplayMonitors, 5) /* FIXME: 4 on XP */
+SVC_(UserEnumDisplaySettings, 4)
+SVC_(UserEvent, 1)
+SVC_(UserExcludeUpdateRgn, 2)
+SVC_(UserFillWindow, 4)
+#ifdef NEW_CURSORICON
+SVC_(UserFindExistingCursorIcon, 3)
+#else
+SVC_(UserFindExistingCursorIcon, 4)
+#endif
+SVC_(UserFindWindowEx, 5)
+SVC_(UserFlashWindowEx, 1)
+SVC_(UserGetAltTabInfo, 6)
+SVC_(UserGetAncestor, 2)
+SVC_(UserGetAppImeLevel, 1)
+SVC_(UserGetAsyncKeyState, 1)
+SVC_(UserGetAtomName, 2)
+SVC_(UserGetCaretBlinkTime, 0)
+SVC_(UserGetCaretPos, 1)
+SVC_(UserGetClassInfo, 5)
+SVC_(UserGetClassName, 3)
+SVC_(UserGetClipboardData, 2)
+SVC_(UserGetClipboardFormatName, 3)
+SVC_(UserGetClipboardOwner, 0)
+SVC_(UserGetClipboardSequenceNumber, 0)
+SVC_(UserGetClipboardViewer, 0)
+SVC_(UserGetClipCursor, 1)
+SVC_(UserGetComboBoxInfo, 2)
+SVC_(UserGetControlBrush, 3)
+SVC_(UserGetControlColor, 4)
+SVC_(UserGetCPD, 3)
+SVC_(UserGetCursorFrameInfo, 4)
+SVC_(UserGetCursorInfo, 1)
+SVC_(UserGetDC, 1)
+SVC_(UserGetDCEx, 3)
+SVC_(UserGetDoubleClickTime, 0)
+SVC_(UserGetForegroundWindow, 0)
+SVC_(UserGetGuiResources, 2)
+SVC_(UserGetGUIThreadInfo, 2)
+SVC_(UserGetIconInfo, 6)
+SVC_(UserGetIconSize, 4)
+SVC_(UserGetImeHotKey, 4)
+SVC_(UserGetImeInfoEx, 2)
+SVC_(UserGetInternalWindowPos, 3)
+SVC_(UserGetKeyboardLayoutList, 2)
+SVC_(UserGetKeyboardLayoutName, 1)
+SVC_(UserGetKeyboardState, 1)
+SVC_(UserGetKeyNameText, 3)
+SVC_(UserGetKeyState, 1)
+SVC_(UserGetListBoxInfo, 1)
+SVC_(UserGetMenuBarInfo, 4)
+SVC_(UserGetMenuIndex, 2)
+SVC_(UserGetMenuItemRect, 4)
+SVC_(UserGetMessage, 4)
+SVC_(UserGetMouseMovePointsEx, 5)
+SVC_(UserGetObjectInformation, 5)
+SVC_(UserGetOpenClipboardWindow, 0)
+SVC_(UserGetPriorityClipboardFormat, 2)
+SVC_(UserGetProcessWindowStation, 0)
+SVC_(UserGetRawInputBuffer, 3)
+SVC_(UserGetRawInputData, 5)
+SVC_(UserGetRawInputDeviceInfo, 4)
+SVC_(UserGetRawInputDeviceList, 3)
+SVC_(UserGetRegisteredRawInputDevices, 3)
+SVC_(UserGetScrollBarInfo, 3)
+SVC_(UserGetSystemMenu, 2)
+SVC_(UserGetThreadDesktop, 2)
+SVC_(UserGetThreadState, 1)
+SVC_(UserGetTitleBarInfo, 2)
+SVC_(UserGetUpdateRect, 3)
+SVC_(UserGetUpdateRgn, 3)
+SVC_(UserGetWindowDC, 1)
+SVC_(UserGetWindowPlacement, 2)
+SVC_(UserGetWOWClass, 2)
+SVC_(UserHardErrorControl, 3)
+SVC_(UserHideCaret, 1)
+SVC_(UserHiliteMenuItem, 4)
+SVC_(UserImpersonateDdeClientWindow, 2)
+SVC_(UserInitialize, 3)
+SVC_(UserInitializeClientPfnArrays, 4)
+SVC_(UserInitTask, 12)
+SVC_(UserInternalGetWindowText, 3)
+SVC_(UserInvalidateRect, 3)
+SVC_(UserInvalidateRgn, 3)
+SVC_(UserIsClipboardFormatAvailable, 1)
+SVC_(UserKillTimer, 2)
+SVC_(UserLoadKeyboardLayoutEx, 7)
+SVC_(UserLockWindowStation, 1)
+SVC_(UserLockWindowUpdate, 1)
+SVC_(UserLockWorkStation, 0)
+SVC_(UserMapVirtualKeyEx, 4)
+SVC_(UserMenuItemFromPoint, 4)
+SVC_(UserMessageCall, 7)
+SVC_(UserMinMaximize, 3)
+SVC_(UserMNDragLeave, 0)
+SVC_(UserMNDragOver, 2)
+SVC_(UserModifyUserStartupInfoFlags, 2)
+SVC_(UserMoveWindow, 6)
+SVC_(UserNotifyIMEStatus, 3)
+SVC_(UserNotifyProcessCreate, 4)
+SVC_(UserNotifyWinEvent, 4)
+SVC_(UserOpenClipboard, 2)
+SVC_(UserOpenDesktop, 3)
+SVC_(UserOpenInputDesktop, 3)
+SVC_(UserOpenWindowStation, 2)
+SVC_(UserPaintDesktop, 1)
+SVC_(UserPeekMessage, 5)
+SVC_(UserPostMessage, 4)
+SVC_(UserPostThreadMessage, 4)
+SVC_(UserPrintWindow, 3)
+SVC_(UserProcessConnect, 3)
+SVC_(UserQueryInformationThread, 5)
+SVC_(UserQueryInputContext, 2)
+SVC_(UserQuerySendMessage, 1)
+SVC_(UserQueryUserCounters, 5)
+SVC_(UserQueryWindow, 2)
+SVC_(UserRealChildWindowFromPoint, 3)
+SVC_(UserRealInternalGetMessage, 6)
+SVC_(UserRealWaitMessageEx, 2)
+SVC_(UserRedrawWindow, 4)
+SVC_(UserRegisterClassExWOW, 7)
+SVC_(UserRegisterUserApiHook, 4) /* FIXME: 2 params on XP */
+SVC_(UserRegisterHotKey, 4)
+SVC_(UserRegisterRawInputDevices, 3)
+SVC_(UserRegisterTasklist, 1)
+SVC_(UserRegisterWindowMessage, 1)
+SVC_(UserRemoveMenu, 3)
+SVC_(UserRemoveProp, 2)
+SVC_(UserResolveDesktop, 4)
+SVC_(UserResolveDesktopForWOW, 1)
+SVC_(UserSBGetParms, 4)
+SVC_(UserScrollDC, 7)
+SVC_(UserScrollWindowEx, 8)
+SVC_(UserSelectPalette, 3)
+SVC_(UserSendInput, 3)
+SVC_(UserSetActiveWindow, 1)
+SVC_(UserSetAppImeLevel, 2)
+SVC_(UserSetCapture, 1)
+SVC_(UserSetClassLong, 4)
+SVC_(UserSetClassWord, 3)
+SVC_(UserSetClipboardData, 3)
+SVC_(UserSetClipboardViewer, 1)
+SVC_(UserSetConsoleReserveKeys, 2)
+SVC_(UserSetCursor, 1)
+SVC_(UserSetCursorContents, 2)
+#ifdef NEW_CURSORICON
+SVC_(UserSetCursorIconData, 4)
+#else
+SVC_(UserSetCursorIconData, 6)
+#endif
+SVC_(UserSetDbgTag, 2)
+SVC_(UserSetFocus, 1)
+SVC_(UserSetImeHotKey, 5)
+SVC_(UserSetImeInfoEx, 1)
+SVC_(UserSetImeOwnerWindow, 2)
+SVC_(UserSetInformationProcess, 4)
+SVC_(UserSetInformationThread, 4)
+SVC_(UserSetInternalWindowPos, 4)
+SVC_(UserSetKeyboardState, 1)
+SVC_(UserSetLogonNotifyWindow, 1)
+SVC_(UserSetMenu, 3)
+SVC_(UserSetMenuContextHelpId, 2)
+SVC_(UserSetMenuDefaultItem, 3)
+SVC_(UserSetMenuFlagRtoL, 1)
+SVC_(UserSetObjectInformation, 4)
+SVC_(UserSetParent, 2)
+SVC_(UserSetProcessWindowStation, 1)
+SVC_(UserSetProp, 3)
+SVC_(UserSetRipFlags, 2)
+SVC_(UserSetScrollInfo, 4)
+SVC_(UserSetShellWindowEx, 2)
+SVC_(UserSetSysColors, 4)
+SVC_(UserSetSystemCursor, 2)
+SVC_(UserSetSystemMenu, 2)
+SVC_(UserSetSystemTimer, 4)
+SVC_(UserSetThreadDesktop, 1)
+SVC_(UserSetThreadLayoutHandles, 2)
+SVC_(UserSetThreadState, 2)
+SVC_(UserSetTimer, 4)
+SVC_(UserSetWindowFNID, 2)
+SVC_(UserSetWindowLong, 4)
+SVC_(UserSetWindowPlacement, 2)
+SVC_(UserSetWindowPos, 7)
+SVC_(UserSetWindowRgn, 3)
+SVC_(UserSetWindowsHookAW, 3)
+SVC_(UserSetWindowsHookEx, 6)
+SVC_(UserSetWindowStationUser, 4)
+SVC_(UserSetWindowWord, 3)
+SVC_(UserSetWinEventHook, 8)
+SVC_(UserShowCaret, 1)
+SVC_(UserShowScrollBar, 3)
+SVC_(UserShowWindow, 2)
+SVC_(UserShowWindowAsync, 2)
+SVC_(UserSoundSentry, 0)
+SVC_(UserSwitchDesktop, 1)
+SVC_(UserSystemParametersInfo, 4)
+SVC_(UserTestForInteractiveUser, 1)
+SVC_(UserThunkedMenuInfo, 2)
+SVC_(UserThunkedMenuItemInfo, 6)
+SVC_(UserToUnicodeEx, 7)
+SVC_(UserTrackMouseEvent, 1)
+SVC_(UserTrackPopupMenuEx, 6)
+SVC_(UserCalcMenuBar, 5)
+SVC_(UserPaintMenuBar, 6)
+SVC_(UserTranslateAccelerator, 3)
+SVC_(UserTranslateMessage, 2)
+SVC_(UserUnhookWindowsHookEx, 1)
+SVC_(UserUnhookWinEvent, 1)
+SVC_(UserUnloadKeyboardLayout, 1)
+SVC_(UserUnlockWindowStation, 1)
+SVC_(UserUnregisterClass, 3)
+SVC_(UserUnregisterUserApiHook, 0)
+SVC_(UserUnregisterHotKey, 2)
+SVC_(UserUpdateInputContext, 3)
+SVC_(UserUpdateInstance, 3)
+SVC_(UserUpdateLayeredWindow, 10) /* FIXME: 9 params on XP */
+SVC_(UserGetLayeredWindowAttributes, 4)
+SVC_(UserSetLayeredWindowAttributes, 4)
+SVC_(UserUpdatePerUserSystemParameters, 2)
+SVC_(UserUserHandleGrantAccess, 3)
+SVC_(UserValidateHandleSecure, 2)
+SVC_(UserValidateRect, 2)
+SVC_(UserValidateTimerCallback, 3)
+SVC_(UserVkKeyScanEx, 3)
+SVC_(UserWaitForInputIdle, 3)
+SVC_(UserWaitForMsgAndEvent, 1)
+SVC_(UserWaitMessage, 0)
+SVC_(UserWin32PoolAllocationStats, 6)
+SVC_(UserWindowFromPhysicalPoint, 2) // Vista
+SVC_(UserWindowFromPoint, 2)
+SVC_(UserYieldTask, 0)
+SVC_(UserRemoteConnect, 3)
+SVC_(UserRemoteRedrawRectangle, 4)
+SVC_(UserRemoteRedrawScreen, 0)
+SVC_(UserRemoteStopScreenUpdates, 0)
+SVC_(UserCtxDisplayIOCtl, 3)
+SVC_(GdiEngAssociateSurface, 3)
+SVC_(GdiEngCreateBitmap, 6)
+SVC_(GdiEngCreateDeviceSurface, 4)
+SVC_(GdiEngCreateDeviceBitmap, 4)
+SVC_(GdiEngCreatePalette, 6)
+SVC_(GdiEngComputeGlyphSet, 3)
+SVC_(GdiEngCopyBits, 6)
+SVC_(GdiEngDeletePalette, 1)
+SVC_(GdiEngDeleteSurface, 1)
+SVC_(GdiEngEraseSurface, 3)
+SVC_(GdiEngUnlockSurface, 1)
+SVC_(GdiEngLockSurface, 1)
+SVC_(GdiEngBitBlt, 11)
+SVC_(GdiEngStretchBlt, 11)
+SVC_(GdiEngPlgBlt, 11)
+SVC_(GdiEngMarkBandingSurface, 1)
+SVC_(GdiEngStrokePath, 8)
+SVC_(GdiEngFillPath, 7)
+SVC_(GdiEngStrokeAndFillPath, 10)
+SVC_(GdiEngPaint, 5)
+SVC_(GdiEngLineTo, 9)
+SVC_(GdiEngAlphaBlend, 7)
+SVC_(GdiEngGradientFill, 10)
+SVC_(GdiEngTransparentBlt, 8)
+SVC_(GdiEngTextOut, 10)
+SVC_(GdiEngStretchBltROP, 13)
+SVC_(GdiXLATEOBJ_cGetPalette, 4)
+SVC_(GdiXLATEOBJ_iXlate, 2)
+SVC_(GdiXLATEOBJ_hGetColorTransform, 1)
+SVC_(GdiCLIPOBJ_bEnum, 3)
+SVC_(GdiCLIPOBJ_cEnumStart, 5)
+SVC_(GdiCLIPOBJ_ppoGetPath, 1)
+SVC_(GdiEngDeletePath, 1)
+SVC_(GdiEngCreateClip, 0)
+SVC_(GdiEngDeleteClip, 1)
+SVC_(GdiBRUSHOBJ_ulGetBrushColor, 1)
+SVC_(GdiBRUSHOBJ_pvAllocRbrush, 2)
+SVC_(GdiBRUSHOBJ_pvGetRbrush, 1)
+SVC_(GdiBRUSHOBJ_hGetColorTransform, 1)
+SVC_(GdiXFORMOBJ_bApplyXform, 5)
+SVC_(GdiXFORMOBJ_iGetXform, 2)
+SVC_(GdiFONTOBJ_vGetInfo, 3)
+SVC_(GdiFONTOBJ_pxoGetXform, 1)
+SVC_(GdiFONTOBJ_cGetGlyphs, 5)
+SVC_(GdiFONTOBJ_pifi, 1)
+SVC_(GdiFONTOBJ_pfdg, 1)
+SVC_(GdiFONTOBJ_pQueryGlyphAttrs, 2)
+SVC_(GdiFONTOBJ_pvTrueTypeFontFile, 2)
+SVC_(GdiFONTOBJ_cGetAllGlyphHandles, 2)
+SVC_(GdiSTROBJ_bEnum, 3)
+SVC_(GdiSTROBJ_bEnumPositionsOnly, 3)
+SVC_(GdiSTROBJ_bGetAdvanceWidths, 4)
+SVC_(GdiSTROBJ_vEnumStart, 1)
+SVC_(GdiSTROBJ_dwGetCodePage, 1)
+SVC_(GdiPATHOBJ_vGetBounds, 2)
+SVC_(GdiPATHOBJ_bEnum, 2)
+SVC_(GdiPATHOBJ_vEnumStart, 1)
+SVC_(GdiPATHOBJ_vEnumStartClipLines, 4)
+SVC_(GdiPATHOBJ_bEnumClipLines, 3)
+SVC_(GdiGetDhpdev, 1)
+SVC_(GdiEngCheckAbort, 1)
+SVC_(GdiHT_Get8BPPFormatPalette, 4)
+SVC_(GdiHT_Get8BPPMaskPalette, 6)
+SVC_(GdiUpdateTransform, 1)
+SVC_(GdiSetPUMPDOBJ, 4)
+SVC_(GdiBRUSHOBJ_DeleteRbrush, 2)
+SVC_(GdiUMPDEngFreeUserMem, 1)
+SVC_(GdiDrawStream, 3)
+
+
+// ReactOS, specific, syscalls)
+SVC_(GdiSetViewportOrgEx, 4)
+SVC_(GdiSetWindowOrgEx, 4)
+SVC_(GdiGetFontFamilyInfo, 4)
+SVC_(GdiOffsetViewportOrgEx, 4)
+SVC_(GdiOffsetWindowOrgEx, 4)
+
+SVC_(UserBuildMenuItemList, 4)
+SVC_(UserGetMenuDefaultItem, 3)
+SVC_(UserGetMonitorInfo, 2)
+SVC_(UserMenuInfo, 3)
+SVC_(UserMenuItemInfo, 5)
+SVC_(UserMonitorFromPoint, 3)
+SVC_(UserMonitorFromRect, 2)
+SVC_(UserMonitorFromWindow, 2)
+SVC_(UserSetScrollBarInfo, 3)

diff --git a/rostests/tests/dllexport/CMakeLists.txt b/rostests/tests/dllexport/CMakeLists.txt
index 6e82a43..14a23c9 100644 (file)
--- a/rostests/tests/dllexport/CMakeLists.txt
+++ b/rostests/tests/dllexport/CMakeLists.txt
@@ -2,18 +2,19 @@
 spec2def(dllexport_test_dll1.dll dllexport_test_dll1.spec ADD_IMPORTLIB)
 spec2def(dllexport_test_dll2.dll dllexport_test_dll2.spec ADD_IMPORTLIB)
 
+set(baseaddress_dllexport_test_dll1 0x1000000)
 add_library(dllexport_test_dll1 SHARED
     dllexport_test_dll1.c
     ${CMAKE_CURRENT_BINARY_DIR}/dllexport_test_dll1.def)
 set_module_type(dllexport_test_dll1 win32dll ENTRYPOINT 0)
 add_importlibs(dllexport_test_dll1 dllexport_test_dll2)
 
+set(baseaddress_dllexport_test_dll2 0x2000000)
 add_library(dllexport_test_dll2 SHARED
     dllexport_test_dll2.c
     ${CMAKE_CURRENT_BINARY_DIR}/dllexport_test_dll2.def)
 set_module_type(dllexport_test_dll2 win32dll ENTRYPOINT 0)
 
-
 add_executable(dllexport_test
     dllexport_test.c)
 

diff --git a/rostests/winetests/winmm/CMakeLists.txt b/rostests/winetests/winmm/CMakeLists.txt
index 4f6743c..914ee71 100644 (file)
--- a/rostests/winetests/winmm/CMakeLists.txt
+++ b/rostests/winetests/winmm/CMakeLists.txt
@@ -17,5 +17,5 @@ add_importlibs(winmm_winetest winmm user32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET winmm_winetest DESTINATION reactos/bin FOR all)
 
 if(NOT MSVC)
-    add_target_compile_flags(winmm_winetest "-Wno-error=format -Wno-error=unused-but-set-variable")
+    add_target_compile_flags(winmm_winetest "-Wno-format -Wno-unused-but-set-variable")
 endif()