diff --git a/rostests/apitests/w32knapi/w32knapi.c b/rostests/apitests/w32knapi/w32knapi.c
index aa4f1bfbc3f..be98d5ced9a 100644
--- a/rostests/apitests/w32knapi/w32knapi.c
+++ b/rostests/apitests/w32knapi/w32knapi.c
@@ -44,6 +44,14 @@ InitOsVersion()
 		return TRUE;
 	}
 
+	if (osv.dwMajorVersion == 5 && osv.dwMinorVersion == 0 && osv.dwBuildNumber == 2195)
+	{
+		printf("Running on Windows 2000, build 2195\n");
+		g_nOs = OS_WINDOWS;
+		g_SyscallTable = SyscallTable_2K_2195;
+		return TRUE;
+	}
+
 	printf("Unsupported OS\n");
 
 	return FALSE;
diff --git a/rostests/apitests/w32knapi/w32knapi.h b/rostests/apitests/w32knapi/w32knapi.h
index bf915ff9b07..f66ca5a05de 100644
--- a/rostests/apitests/w32knapi/w32knapi.h
+++ b/rostests/apitests/w32knapi/w32knapi.h
@@ -27,6 +27,7 @@ typedef struct
 
 extern HINSTANCE g_hInstance;
 extern SYCALL_ENTRY SyscallTable_XP_2600[];
+extern SYCALL_ENTRY SyscallTable_2K_2195[];
 extern HMODULE g_hModule;
 extern INT g_nOsVer;
 
diff --git a/rostests/apitests/w32knapi/w32knapi.rbuild b/rostests/apitests/w32knapi/w32knapi.rbuild
index 8f4524bc9e8..a5cefde419a 100644
--- a/rostests/apitests/w32knapi/w32knapi.rbuild
+++ b/rostests/apitests/w32knapi/w32knapi.rbuild
@@ -9,5 +9,6 @@
 	<library>shell32</library>
 	<file>w32knapi.c</file>
 	<file>testlist.c</file>
-	<file>xp-2600.c</file>
+	<file>winxp-sp2-2600.c</file>
+	<file>win2k-sp4-2195.c</file>
 </module>
diff --git a/rostests/apitests/w32knapi/win2k-sp4-2195.c b/rostests/apitests/w32knapi/win2k-sp4-2195.c
new file mode 100644
index 00000000000..7da6dc5933f
--- /dev/null
+++ b/rostests/apitests/w32knapi/win2k-sp4-2195.c
@@ -0,0 +1,646 @@
+#include "w32knapi.h"
+
+SYCALL_ENTRY
+SyscallTable_2K_2195[] =
+{
+	{L"NtGdiAbortDoc",0x1000,1},
+	{L"NtGdiAbortPath",0x1001,1},
+	{L"NtGdiAddFontResourceW",0x1002,6},
+	{L"NtGdiAddRemoteFontToDC",0x1003,4},
+	{L"NtGdiAddFontMemResourceEx",0x1004,5},
+	{L"NtGdiRemoveMergeFont",0x1005,2},
+	{L"NtGdiAddRemoteMMInstanceToDC",0x1006,3},
+	{L"NtGdiAlphaBlend",0x1007,12},
+	{L"NtGdiAngleArc",0x1008,6},
+	{L"NtGdiAnyLinkedFonts",0x1009,0},
+	{L"NtGdiFontIsLinked",0x100A,1},
+	{L"NtGdiArcInternal",0x100B,10},
+	{L"NtGdiBeginPath",0x100C,1},
+	{L"NtGdiBitBlt",0x100D,11},
+	{L"NtGdiCancelDC",0x100E,1},
+	{L"NtGdiCheckBitmapBits",0x100F,8},
+	{L"NtGdiCloseFigure",0x1010,1},
+	{L"NtGdiColorCorrectPalette",0x1011,6},
+	{L"NtGdiCombineRgn",0x1012,4},
+	{L"NtGdiCombineTransform",0x1013,3},
+	{L"NtGdiComputeXformCoefficients",0x1014,1},
+	{L"NtGdiConsoleTextOut",0x1015,4},
+	{L"NtGdiConvertMetafileRect",0x1016,2},
+	{L"NtGdiCreateBitmap",0x1017,5},
+	{L"NtGdiCreateClientObj",0x1018,1},
+	{L"NtGdiCreateColorSpace",0x1019,1},
+	{L"NtGdiCreateColorTransform",0x101A,8},
+	{L"NtGdiCreateCompatibleBitmap",0x101B,3},
+	{L"NtGdiCreateCompatibleDC",0x101C,1},
+	{L"NtGdiCreateDIBBrush",0x101D,6},
+	{L"NtGdiCreateDIBitmapInternal",0x101E,11},
+	{L"NtGdiCreateDIBSection",0x101F,9},
+	{L"NtGdiCreateEllipticRgn",0x1020,4},
+	{L"NtGdiCreateHalftonePalette",0x1021,1},
+	{L"NtGdiCreateHatchBrushInternal",0x1022,3},
+	{L"NtGdiCreateMetafileDC",0x1023,1},
+	{L"NtGdiCreatePaletteInternal",0x1024,2},
+	{L"NtGdiCreatePatternBrushInternal",0x1025,3},
+	{L"NtGdiCreatePen",0x1026,4},
+	{L"NtGdiCreateRectRgn",0x1027,4},
+	{L"NtGdiCreateRoundRectRgn",0X1028,6},
+	{L"NtGdiCreateServerMetaFile",0X1029,6},
+	{L"NtGdiCreateSolidBrush",0x102A,2},
+	{L"NtGdiD3dContextCreate",0x102B,4},
+	{L"NtGdiD3dContextDestroy",0x102C,1},
+	{L"NtGdiD3dContextDestroyAll",0x102D,1},
+	{L"NtGdiD3dValidateTextureStageState",0x102E,1},
+	{L"NtGdiD3dDrawPrimitives2",0X102F,7},
+	{L"NtGdiDdGetDriverState",0x1030,1},
+	{L"NtGdiDdAddAttachedSurface",0x1031,3},
+	{L"NtGdiDdAlphaBlt",0x1032,3},
+	{L"NtGdiDdAttachSurface",0x1033,2},
+	{L"NtGdiDdBeginMoCompFrame",0x1034,2},
+	{L"NtGdiDdBlt",0x1035,3},
+	{L"NtGdiDdCanCreateSurface",0x1036,2},
+	{L"NtGdiDdCanCreateD3DBuffer",0x1037,2},
+	{L"NtGdiDdColorControl",0x1038,2},
+	{L"NtGdiDdCreateDirectDrawObject",0x1039,1},
+	{L"NtGdiDdCreateSurface",0X103A,8},
+	{L"NtGdiDdCreateD3DBuffer",0X103B,8},
+	{L"NtGdiDdCreateMoComp",0X103C,2},
+	{L"NtGdiDdCreateSurfaceObject",0X103D,6},
+	{L"NtGdiDdDeleteDirectDrawObject",0x103E,1},
+	{L"NtGdiDdDeleteSurfaceObject",0x103F,1},
+	{L"NtGdiDdDestroyMoComp",0x1040,2},
+	{L"NtGdiDdDestroySurface",0x1041,2},
+	{L"NtGdiDdDestroyD3DBuffer",0x1042,1},
+	{L"NtGdiDdEndMoCompFrame",0x1043,2},
+	{L"NtGdiDdFlip",0x1044,5},
+	{L"NtGdiDdFlipToGDISurface",0x1045,2},
+	{L"NtGdiDdGetAvailDriverMemory",0x1046,2},
+	{L"NtGdiDdGetBltStatus",0x1047,2},
+	{L"NtGdiDdGetDC",0x1048,2},
+	{L"NtGdiDdGetDriverInfo",0x1049,2},
+	{L"NtGdiDdGetDxHandle",0x104A,3},
+	{L"NtGdiDdGetFlipStatus",0x104B,2},
+	{L"NtGdiDdGetInternalMoCompInfo",0x104C,2},
+	{L"NtGdiDdGetMoCompBuffInfo",0x104D,2},
+	{L"NtGdiDdGetMoCompGuids",0x104E,2},
+	{L"NtGdiDdGetMoCompFormats",0x104F,2},
+	{L"NtGdiDdGetScanLine",0x1050,2},
+	{L"NtGdiDdLock",0x1051,3},
+	{L"NtGdiDdLockD3D",0x1052,2},
+	{L"NtGdiDdQueryDirectDrawObject",0X1053,11},
+	{L"NtGdiDdQueryMoCompStatus",0x1054,2},
+	{L"NtGdiDdReenableDirectDrawObject",0x1055,2},
+	{L"NtGdiDdReleaseDC",0x1056,1},
+	{L"NtGdiDdRenderMoComp",0x1057,2},
+	{L"NtGdiDdResetVisrgn",0x1058,2},
+	{L"NtGdiDdSetColorKey",0x1059,2},
+	{L"NtGdiDdSetExclusiveMode",0x105A,2},
+	{L"NtGdiDdSetGammaRamp",0x105B,3},
+	{L"NtGdiDdCreateSurfaceEx",0x105C,3},
+	{L"NtGdiDdSetOverlayPosition",0x105D,3},
+	{L"NtGdiDdUnattachSurface",0x105E,2},
+	{L"NtGdiDdUnlock",0x105F,2},
+	{L"NtGdiDdUnlockD3D",0x1060,2},
+	{L"NtGdiDdUpdateOverlay",0x1061,3},
+	{L"NtGdiDdWaitForVerticalBlank",0x1062,2},
+	{L"NtGdiDvpCanCreateVideoPort",0x1063,2},
+	{L"NtGdiDvpColorControl",0x1064,2},
+	{L"NtGdiDvpCreateVideoPort",0x1065,2},
+	{L"NtGdiDvpDestroyVideoPort",0x1066,2},
+	{L"NtGdiDvpFlipVideoPort",0x1067,4},
+	{L"NtGdiDvpGetVideoPortBandwidth",0x1068,2},
+	{L"NtGdiDvpGetVideoPortField",0x1069,2},
+	{L"NtGdiDvpGetVideoPortFlipStatus",0x106A,2},
+	{L"NtGdiDvpGetVideoPortInputFormats",0x106B,2},
+	{L"NtGdiDvpGetVideoPortLine",0x106C,2},
+	{L"NtGdiDvpGetVideoPortOutputFormats",0x106D,2},
+	{L"NtGdiDvpGetVideoPortConnectInfo",0x106E,2},
+	{L"NtGdiDvpGetVideoSignalStatus",0x106F,2},
+	{L"NtGdiDvpUpdateVideoPort",0x1070,4},
+	{L"NtGdiDvpWaitForVideoPortSync",0x1071,2},
+	{L"NtGdiDeleteClientObj",0x1072,1},
+	{L"NtGdiDeleteColorSpace",0x1073,1},
+	{L"NtGdiDeleteColorTransform",0x1074,2},
+	{L"NtGdiDeleteObjectApp",0x1075,1},
+	{L"NtGdiDescribePixelFormat",0x1076,4},
+	{L"NtGdiGetPerBandInfo",0x1077,2},
+	{L"NtGdiDoBanding",0x1078,4},
+	{L"NtGdiDoPalette",0X1079,6},
+	{L"NtGdiDrawEscape",0x107A,4},
+	{L"NtGdiEllipse",0x107B,5},
+	{L"NtGdiEnableEudc",0x107C,1},
+	{L"NtGdiEndDoc",0x107D,1},
+	{L"NtGdiEndPage",0x107E,1},
+	{L"NtGdiEndPath",0x107F,1},
+	{L"NtGdiEnumFontChunk",0x1080,5},
+	{L"NtGdiEnumFontClose",0x1081,1},
+	{L"NtGdiEnumFontOpen",0x1082,7},
+	{L"NtGdiEnumObjects",0x1083,4},
+	{L"NtGdiEqualRgn",0x1084,2},
+	{L"NtGdiEudcEnumFaceNameLinkW ",0x1085,4},
+	{L"NtGdiEudcLoadUnloadLink",0X1086,7},
+	{L"NtGdiExcludeClipRect",0x1087,5},
+	{L"NtGdiExtCreatePen",0X1088,11},
+	{L"NtGdiExtCreateRegion",0x1089,3},
+	{L"NtGdiExtEscape",0X108A,8},
+	{L"NtGdiExtFloodFill",0x108B,5},
+	{L"NtGdiExtGetObjectW",0x108C,3},
+	{L"NtGdiExtSelectClipRgn",0x108D,3},
+	{L"NtGdiExtTextOutW",0x108E,9},
+	{L"NtGdiFillPath",0x108F,1},
+	{L"NtGdiFillRgn",0x1090,3},
+	{L"NtGdiFlattenPath",0x1091,1},
+	{L"NtGdiFlushUserBatch ",0x1092,0},
+	{L"NtGdiFlush",0x1093,0},
+	{L"NtGdiForceUFIMapping",0x1094,2},
+	{L"NtGdiFrameRgn",0x1095,5},
+	{L"NtGdiFullscreenControl",0x1096,5},
+	{L"NtGdiGetAndSetDCDword",0x1097,4},
+	{L"NtGdiGetAppClipBox",0x1098,2},
+	{L"NtGdiGetBitmapBits",0x1099,3},
+	{L"NtGdiGetBitmapDimension",0x109A,2},
+	{L"NtGdiGetBoundsRect",0x109B,3},
+	{L"NtGdiGetCharABCWidthsW",0X109C,6},
+	{L"NtGdiGetCharacterPlacementW",0X109D,6},
+	{L"NtGdiGetCharSet",0x109E,1},
+	{L"NtGdiGetCharWidthW",0x109F,6},
+	{L"NtGdiGetCharWidthInfo",0x10A0,2},
+	{L"NtGdiGetColorAdjustment",0x10A1,2},
+	{L"NtGdiGetColorSpaceforBitmap ",0x10A2,1},
+	{L"NtGdiGetDCDword",0x10A3,3},
+	{L"NtGdiGetDCforBitmap",0x10A4,1},
+	{L"NtGdiGetDCObject",0x10A5,2},
+	{L"NtGdiGetDCPoint",0x10A6,3},
+	{L"NtGdiGetDeviceCaps",0x10A7,2},
+	{L"NtGdiGetDeviceGammaRamp",0x10A8,2},
+	{L"NtGdiGetDeviceCapsAll",0x10A9,2},
+	{L"NtGdiGetDIBitsInternal",0x10AA,9},
+	{L"NtGdiGetETM",0x10AB,2},
+	{L"NtGdiGetEudcTimeStampEx",0x10AC,3},
+	{L"NtGdiGetFontData",0x10AD,5},
+	{L"NtGdiGetFontResourceInfoInternalW",0X10AE,7},
+	{L"NtGdiGetGlyphIndicesW",0x10AF,5},
+	{L"NtGdiGetGlyphIndicesWInternal",0x10B0,6},
+	{L"NtGdiGetGlyphOutline",0X10B1,8},
+	{L"NtGdiGetKerningPairs",0x10B2,3},
+	{L"NtGdiGetLinkedUFIs",0x10B3,3},
+	{L"NtGdiGetMiterLimit",0x10B4,2},
+	{L"NtGdiGetMonitorID",0x10B5,3},
+	{L"NtGdiGetNearestColor",0x10B6,2},
+	{L"NtGdiGetNearestPaletteIndex",0x10B7,2},
+	{L"NtGdiGetObjectBitmapHandle",0x10B8,2},
+	{L"NtGdiGetOutlineTextMetricsInternalW",0x10B9,4},
+	{L"NtGdiGetPath",0x10BA,4},
+	{L"NtGdiGetPixel",0x10BB,3},
+	{L"NtGdiGetRandomRgn",0x10BC,3},
+	{L"NtGdiGetRasterizerCaps",0x10BD,2},
+	{L"NtGdiGetRealizationInfo",0x10BE,2},
+	{L"NtGdiGetRegionData",0x10BF,3},
+	{L"NtGdiGetRgnBox",0x10C0,2},
+	{L"NtGdiGetServerMetaFileBits",0x10C1,7},
+	{L"NtGdiGetSpoolMessage",0x10C2,4},
+	{L"NtGdiGetStats ",0x10C3,5},
+	{L"NtGdiGetStockObject",0x10C4,1},
+	{L"NtGdiGetStringBitmapW",0x10C5,5},
+	{L"NtGdiGetSystemPaletteUse",0x10C6,1},
+	{L"NtGdiGetTextCharsetInfo",0x10C7,3},
+	{L"NtGdiGetTextExtent",0x10C8,5},
+	{L"NtGdiGetTextExtentExW",0x10C9,8},
+	{L"NtGdiGetTextFaceW",0x10CA,4},
+	{L"NtGdiGetTextMetricsW",0x10CB,3},
+	{L"NtGdiGetTransform",0x10CC,3},
+	{L"NtGdiGetUFI",0X10CD,6},
+	{L"NtGdiGetUFIPathname",0x10CE,10},
+	{L"NtGdiGetFontUnicodeRanges",0x10CF,2},
+	{L"NtGdiGetWidthTable",0x10D0,7},
+	{L"NtGdiGradientFill",0x10D1,6},
+	{L"NtGdiHfontCreate",0x10D2,5},
+	{L"NtGdiIcmBrushInfo",0x10D3,8},
+	{L"NtGdiInit",0x10D4,0},
+	{L"NtGdiInitSpool",0x10D5,0},
+	{L"NtGdiIntersectClipRect",0x10D6,5},
+	{L"NtGdiInvertRgn",0x10D7,2},
+	{L"NtGdiLineTo",0x10D8,3},
+	{L"NtGdiMakeFontDir",0x10D9,5},
+	{L"NtGdiMakeInfoDC",0x10DA,2},
+	{L"NtGdiMaskBlt",0x10DB,13},
+	{L"NtGdiModifyWorldTransform",0x10DC,3},
+	{L"NtGdiMonoBitmap",0x10DD,1},
+	{L"NtGdiMoveTo ",0x10DE,4},
+	{L"NtGdiOffsetClipRgn",0x10DF,3},
+	{L"NtGdiOffsetRgn",0x10E0,3},
+	{L"NtGdiOpenDCW",0x10E1,7},
+	{L"NtGdiPatBlt",0x10E2,6},
+	{L"NtGdiPolyPatBlt",0x10E3,5},
+	{L"NtGdiPathToRegion",0x10E4,1},
+	{L"NtGdiPlgBlt",0x10E5,11},
+	{L"NtGdiPolyDraw",0x10E6,4},
+	{L"NtGdiPolyPolyDraw",0x10E7,5},
+	{L"NtGdiPolyTextOutW",0X10E8,4},
+	{L"NtGdiPtInRegion",0X10E9,3},
+	{L"NtGdiPtVisible",0X10EA,3},
+	{L"NtGdiQueryFonts",0X10EB,3},
+	{L"NtGdiQueryFontAssocInfo",0X10EC,1},
+	{L"NtGdiRectangle",0X10ED,5},
+	{L"NtGdiRectInRegion",0X10EE,2},
+	{L"NtGdiRectVisible",0x10EF,2},
+	{L"NtGdiRemoveFontResourceW",0X10F0,6},
+	{L"NtGdiRemoveFontMemResourceEx",0X10F1,1},
+	{L"NtGdiResetDC",0X10F2,5},
+	{L"NtGdiResizePalette",0X10F3,2},
+	{L"NtGdiRestoreDC",0x10F4,2},
+	{L"NtGdiRoundRect",0x10F5,7},
+	{L"NtGdiSaveDC",0x10F6,1},
+	{L"NtGdiScaleViewportExtEx",0x10F7,6},
+	{L"NtGdiScaleWindowExtEx",0x10F8,6},
+	{L"NtGdiSelectBitmap",0x10F9,2},
+	{L"NtGdiSelectBrush ",0x10FA,2},
+	{L"NtGdiSelectClipPath",0x10FB,2},
+	{L"NtGdiSelectFont",0x10FC,2},
+	{L"NtGdiSelectPen",0x10FD,2},
+	{L"NtGdiSetBitmapBits",0x10FE,3},
+	{L"NtGdiSetBitmapDimension",0x10FF,4},
+	{L"NtGdiSetBoundsRect",0x1100,3},
+	{L"NtGdiSetBrushOrg",0x1101,4},
+	{L"NtGdiSetColorAdjustment",0x1102,2},
+	{L"NtGdiSetColorSpace",0x1103,2},
+	{L"NtGdiSetDeviceGammaRamp",0x1104,2},
+	{L"NtGdiSetDIBitsToDeviceInternal",0x1105,16},
+	{L"NtGdiSetFontEnumeration",0x1106,1},
+	{L"NtGdiSetFontXform",0x1107,3},
+	{L"NtGdiSetIcmMode",0x1108,3},
+	{L"NtGdiSetLinkedUFIs",0x1109,3},
+	{L"NtGdiSetMagicColors",0x110A,3},
+	{L"NtGdiSetMetaRgn",0x110B,1},
+	{L"NtGdiSetMiterLimit",0x110C,3},
+	{L"NtGdiGetDeviceWidth",0x110D,1},
+	{L"NtGdiMirrorWindowOrg",0x110E,1},
+	{L"NtGdiSetLayout",0x110F,3},
+	{L"NtGdiSetPixel",0x1110,4},
+	{L"NtGdiSetPixelFormat",0X1111,2},
+	{L"NtGdiSetRectRgn",0X1112,5},
+	{L"NtGdiSetSystemPaletteUse",0X1113,2},
+	{L"NtGdiSetTextJustification ",0x1114,3},
+	{L"NtGdiSetupPublicCFONT",0x1115,3},
+	{L"NtGdiSetVirtualResolution",0X1116,5},
+	{L"NtGdiSetSizeDevice",0X1117,3},
+	{L"NtGdiStartDoc",0X1118,4},
+	{L"NtGdiStartPage",0X1119,1},
+	{L"NtGdiStretchBlt",0x111A,12},
+	{L"NtGdiStretchDIBitsInternal",0x111B,16},
+	{L"NtGdiStrokeAndFillPath",0X111C,1},
+	{L"NtGdiStrokePath",0X111D,1},
+	{L"NtGdiSwapBuffers",0X111E,1},
+	{L"NtGdiTransformPoints",0X111F,5},
+	{L"NtGdiTransparentBlt",0x1120,11},
+	{L"NtGdiUnloadPrinterDriver",0X1121,2},
+	{L"NtGdiUnmapMemFont ",0x1122,1},
+	{L"NtGdiUnrealizeObject",0X1123,1},
+	{L"NtGdiUpdateColors",0X1124,1},
+	{L"NtGdiWidenPath",0X1125,1},
+	{L"NtUserActivateKeyboardLayout",0x1126,2},
+	{L"NtUserAlterWindowStyle",0x1127,3},
+	{L"NtUserAssociateInputContext ",0X1128,3},
+	{L"NtUserAttachThreadInput",0x1129,3},
+	{L"NtUserBeginPaint",0x112A,2},
+	{L"NtUserBitBltSysBmp",0x112B,8},
+	{L"NtUserBlockInput",0x112C,1},
+	{L"NtUserBuildHimcList ",0x112D,4},
+	{L"NtUserBuildHwndList",0x112E,7},
+	{L"NtUserBuildNameList",0x112F,4},
+	{L"NtUserBuildPropList",0x1130,4},
+	{L"NtUserCallHwnd",0x1131,2},
+	{L"NtUserCallHwndLock",0x1132,2},
+	{L"NtUserCallHwndOpt",0x1133,2},
+	{L"NtUserCallHwndParam",0x1134,3},
+	{L"NtUserCallHwndParamLock",0x1135,3},
+	{L"NtUserCallMsgFilter",0x1136,2},
+	{L"NtUserCallNextHookEx",0x1137,4},
+	{L"NtUserCallNoParam",0x1138,1},
+	{L"NtUserCallOneParam",0x1139,1},
+	{L"NtUserCallTwoParam",0x113A,3},
+	{L"NtUserChangeClipboardChain",0x113B,2},
+	{L"NtUserChangeDisplaySettings",0x113C,5},
+	{L"NtUserCheckImeHotKey ",0x113D,3},
+	{L"NtUserCheckMenuItem",0x113E,3},
+	{L"NtUserChildWindowFromPointEx",0x113F,4},
+	{L"NtUserClipCursor",0x1140,1},
+	{L"NtUserCloseClipboard",0x1141,0},
+	{L"NtUserCloseDesktop",0x1142,1},
+	{L"NtUserCloseWindowStation",0x1143,1},
+	{L"NtUserConsoleControl ",0x1144,3},
+	{L"NtUserConvertMemHandle",0x1145,2},
+	{L"NtUserCopyAcceleratorTable",0x1146,3},
+	{L"NtUserCountClipboardFormats",0x1147,1},
+	{L"NtUserCreateAcceleratorTable",0x1148,2},
+	{L"NtUserCreateCaret",0x1149,4},
+	{L"NtUserCreateDesktop",0x114A,5},
+	{L"NtUserCreateInputContext ",0x114B,1},
+	{L"NtUserCreateLocalMemHandle",0x114C,4},
+	{L"NtUserCreateWindowEx",0x114D,13},
+	{L"NtUserCreateWindowStation",0x114E,6},
+	{L"NtUserDdeGetQualityOfService",0x114F,3},
+	{L"NtUserDdeInitialize",0x1150,5},
+	{L"NtUserDdeSetQualityOfService",0x1151,3},
+	{L"NtUserDeferWindowPos",0x1152,8},
+	{L"NtUserDefSetText",0x1153,2},
+	{L"NtUserDeleteMenu",0x1154,3},
+	{L"NtUserDestroyAcceleratorTable",0x1155,1},
+	{L"NtUserDestroyCursor",0x1156,2},
+	{L"NtUserDestroyInputContext ",0x1157,1},
+	{L"NtUserDestroyMenu",0x1158,1},
+	{L"NtUserDestroyWindow",0x1159,1},
+	{L"NtUserDisableThreadIme ",0x115A,1},
+	{L"NtUserDispatchMessage",0x115B,1},
+	{L"NtUserDragDetect",0x115C,3},
+	{L"NtUserDragObject",0x115D,5},
+	{L"NtUserDrawAnimatedRects",0x115E,4},
+	{L"NtUserDrawCaption",0x115F,4},
+	{L"NtUserDrawCaptionTemp",0x1160,7},
+	{L"NtUserDrawIconEx",0x1161,11},
+	{L"NtUserDrawMenuBarTemp",0x1162,5},
+	{L"NtUserEmptyClipboard",0x1163,0},
+	{L"NtUserEnableMenuItem",0x1164,3},
+	{L"NtUserEnableScrollBar",0x1165,3},
+	{L"NtUserEndDeferWindowPosEx",0x1166,2},
+	{L"NtUserEndMenu",0x1167,0},
+	{L"NtUserEndPaint",0x1168,2},
+	{L"NtUserEnumDisplayDevices",0x1169,4},
+	{L"NtUserEnumDisplayMonitors",0x116A,4},
+	{L"NtUserEnumDisplaySettings",0x116B,4},
+	{L"NtUserEvent",0x116C,1},
+	{L"NtUserExcludeUpdateRgn",0x116D,2},
+	{L"NtUserFillWindow",0x116E,4},
+	{L"NtUserFindExistingCursorIcon",0x116F,3},
+	{L"NtUserFindWindowEx",0x1170,5},
+	{L"NtUserFlashWindowEx",0x1171,1},
+	{L"NtUserGetAltTabInfo",0x1172,6},
+	{L"NtUserGetAncestor",0x1173,2},
+	{L"NtUserGetAppImeLevel ",0x1174,1},
+	{L"NtUserGetAsyncKeyState",0x1175,1},
+	{L"NtUserGetCaretBlinkTime",0x1176,0},
+	{L"NtUserGetCaretPos",0x1177,1},
+	{L"NtUserGetClassInfo",0x1178,5},
+	{L"NtUserGetClassName",0x1179,3},
+	{L"NtUserGetClipboardData",0x117A,2},
+	{L"NtUserGetClipboardFormatName",0x117B,3},
+	{L"NtUserGetClipboardOwner",0x117C,0},
+	{L"NtUserGetClipboardSequenceNumber",0x117D,0},
+	{L"NtUserGetClipboardViewer",0x117E,0},
+	{L"NtUserGetClipCursor",0x117F,1},
+	{L"NtUserGetComboBoxInfo",0x1180,2},
+	{L"NtUserGetControlBrush",0x1181,3},
+	{L"NtUserGetControlColor",0x1182,4},
+	{L"NtUserGetCPD",0x1183,3},
+	{L"NtUserGetCursorFrameInfo",0x1184,4},
+	{L"NtUserGetCursorInfo",0x1185,1},
+	{L"NtUserGetDC",0x1186,1},
+	{L"NtUserGetDCEx",0x1187,3},
+	{L"NtUserGetDoubleClickTime",0x1188,0},
+	{L"NtUserGetForegroundWindow",0x1189,0},
+	{L"NtUserGetGuiResources",0x118A,2},
+	{L"NtUserGetGUIThreadInfo",0x118B,2},
+	{L"NtUserGetIconInfo",0x118C,6},
+	{L"NtUserGetIconSize",0x118D,4},
+	{L"NtUserGetImeHotKey",0x118E,4},
+	{L"NtUserGetImeInfoEx ",0x118F,2},
+	{L"NtUserGetInternalWindowPos",0x1190,3},
+	{L"NtUserGetKeyboardLayoutList",0x1191,2},
+	{L"NtUserGetKeyboardLayoutName",0x1192,1},
+	{L"NtUserGetKeyboardState",0x1193,1},
+	{L"NtUserGetKeyNameText",0x1194,3},
+	{L"NtUserGetKeyState",0x1195,1},
+	{L"NtUserGetListBoxInfo",0x1196,1},
+	{L"NtUserGetMenuBarInfo",0x1197,4},
+	{L"NtUserGetMenuIndex",0x1198,2},
+	{L"NtUserGetMenuItemRect",0x1199,4},
+	{L"NtUserGetMessage",0x119A,4},
+	{L"NtUserGetMouseMovePointsEx",0x119B,5},
+	{L"NtUserGetObjectInformation",0x119C,5},
+	{L"NtUserGetOpenClipboardWindow",0x119D,0},
+	{L"NtUserGetPriorityClipboardFormat",0x119E,2},
+	{L"NtUserGetProcessWindowStation",0x119F,0},
+	{L"NtUserGetScrollBarInfo",0x11A0,3},
+	{L"NtUserGetSystemMenu",0x11A1,2},
+	{L"NtUserGetThreadDesktop",0x11A2,2},
+	{L"NtUserGetThreadState",0x11A3,1},
+	{L"NtUserGetTitleBarInfo",0x11A4,2},
+	{L"NtUserGetUpdateRect",0x11A5,3},
+	{L"NtUserGetUpdateRgn",0x11A6,3},
+	{L"NtUserGetWindowDC",0x11A7,1},
+	{L"NtUserGetWindowPlacement",0x11A8,2},
+	{L"NtUserGetWOWClass",0x11A9,2},
+	{L"NtUserHardErrorControl ",0x11AA,3},
+	{L"NtUserHideCaret",0x11AB,1},
+	{L"NtUserHiliteMenuItem",0x11AC,4},
+	{L"NtUserImpersonateDdeClientWindow",0x11AD,2},
+	{L"NtUserInitialize ",0x11AE,3},
+	{L"NtUserInitializeClientPfnArrays",0x11AF,4},
+	{L"NtUserInitTask",0x11B0,11},
+	{L"NtUserInternalGetWindowText",0x11B1,3},
+	{L"NtUserInvalidateRect",0x11B2,3},
+	{L"NtUserInvalidateRgn",0x11B3,3},
+	{L"NtUserIsClipboardFormatAvailable",0x11B4,1},
+	{L"NtUserKillTimer",0x11B5,2},
+	{L"NtUserLoadKeyboardLayoutEx",0x11B6,6},
+	{L"NtUserLockWindowStation",0x11B7,1},
+	{L"NtUserLockWindowUpdate",0x11B8,1},
+	{L"NtUserLockWorkStation",0x11B9,0},
+	{L"NtUserMapVirtualKeyEx",0x11BA,4},
+	{L"NtUserMenuItemFromPoint",0x11BB,4},
+	{L"NtUserMessageCall",0x11BC,7},
+	{L"NtUserMinMaximize",0x11BD,3},
+	{L"NtUserMNDragLeave",0x11BE,1},
+	{L"NtUserMNDragOver",0x11BF,2},
+	{L"NtUserModifyUserStartupInfoFlags",0x11C0,2},
+	{L"NtUserMoveWindow",0x11C1,6},
+	{L"NtUserNotifyIMEStatus",0x11C2,3},
+	{L"NtUserNotifyProcessCreate ",0x11C3,4},
+	{L"NtUserNotifyWinEvent",0x11C4,4},
+	{L"NtUserOpenClipboard",0x11C5,2},
+	{L"NtUserOpenDesktop",0x11C6,3},
+	{L"NtUserOpenInputDesktop",0x11C7,3},
+	{L"NtUserOpenWindowStation",0x11C8,2},
+	{L"NtUserPaintDesktop",0x11C9,1},
+	{L"NtUserPeekMessage",0x11CA,5},
+	{L"NtUserPostMessage",0x11CB,4},
+	{L"NtUserPostThreadMessage",0x11CC,4},
+	{L"NtUserProcessConnect",0x11CD,3},
+	{L"NtUserQueryInformationThread ",0x11CE,5},
+	{L"NtUserQueryInputContext ",0x11CF,2},
+	{L"NtUserQuerySendMessage",0x11D0,1},
+	{L"NtUserQueryUserCounters",0x11D1,5},
+	{L"NtUserQueryWindow",0x11D2,2},
+	{L"NtUserRealChildWindowFromPoint",0x11D3,3},
+	{L"NtUserRedrawWindow",0x11D4,4},
+	{L"NtUserRegisterClassExWOW",0x11D5,6},
+	{L"NtUserRegisterHotKey",0x11D6,4},
+	{L"NtUserRegisterTasklist",0x11D7,1},
+	{L"NtUserRegisterWindowMessage",0x11D8,1},
+	{L"NtUserRemoveMenu",0x11D9,3},
+	{L"NtUserRemoveProp",0x11DA,2},
+	{L"NtUserResolveDesktop ",0x11DB,4},
+	{L"NtUserResolveDesktopForWOW",0x11DC,1},
+	{L"NtUserSBGetParms",0x11DD,4},
+	{L"NtUserScrollDC",0x11DE,7},
+	{L"NtUserScrollWindowEx",0x11DF,8},
+	{L"NtUserSelectPalette",0x11E0,3},
+	{L"NtUserSendInput",0x11E1,3},
+	{L"NtUserSendMessageCallback",0x11E2,6},
+	{L"NtUserSendNotifyMessage",0x11E3,4},
+	{L"NtUserSetActiveWindow",0x11E4,1},
+	{L"NtUserSetAppImeLevel ",0x11E5,2},
+	{L"NtUserSetCapture",0x11E6,1},
+	{L"NtUserSetClassLong",0x11E7,4},
+	{L"NtUserSetClassWord",0x11E8,3},
+	{L"NtUserSetClipboardData",0x11E9,3},
+	{L"NtUserSetClipboardViewer",0x11EA,1},
+	{L"NtUserSetConsoleReserveKeys",0x11EB,2},
+	{L"NtUserSetCursor",0x11EC,1},
+	{L"NtUserSetCursorContents",0x11ED,2},
+	{L"NtUserSetCursorIconData",0x11EE,4},
+	{L"NtUserSetDbgTag",0x11EF,2},
+	{L"NtUserSetFocus",0x11F0,1},
+	{L"NtUserSetImeHotKey",0x11F1,5},
+	{L"NtUserSetImeInfoEx ",0x11F2,1},
+	{L"NtUserSetImeOwnerWindow",0x11F3,2},
+	{L"NtUserSetInformationProcess ",0x11F4,4},
+	{L"NtUserSetInformationThread ",0x11F5,5},
+	{L"NtUserSetInternalWindowPos",0x11F6,4},
+	{L"NtUserSetKeyboardState",0x11F7,1},
+	{L"NtUserSetLogonNotifyWindow",0x11F8,1},
+	{L"NtUserSetMenu",0x11F9,3},
+	{L"NtUserSetMenuContextHelpId",0x11FA,2},
+	{L"NtUserSetMenuDefaultItem",0x11FB,3},
+	{L"NtUserSetMenuFlagRtoL",0x11FC,1},
+	{L"NtUserSetObjectInformation",0x11FD,4},
+	{L"NtUserSetParent",0x11FE,2},
+	{L"NtUserSetProcessWindowStation",0x11FF,1},
+	{L"NtUserSetProp",0x1200,3},
+	{L"NtUserSetRipFlags",0x1201,2},
+	{L"NtUserSetScrollInfo",0x1202,4},
+	{L"NtUserSetShellWindowEx",0x1203,2},
+	{L"NtUserSetSysColors",0x1204,4},
+	{L"NtUserSetSystemCursor",0x1205,2},
+	{L"NtUserSetSystemMenu",0x1206,2},
+	{L"NtUserSetSystemTimer",0x1207,4},
+	{L"NtUserSetThreadDesktop",0x1208,1},
+	{L"NtUserSetThreadLayoutHandles ",0x1209,2},
+	{L"NtUserSetThreadState",0x120A,2},
+	{L"NtUserSetTimer",0x120B,4},
+	{L"NtUserSetWindowFNID",0x120C,2},
+	{L"NtUserSetWindowLong",0x120D,4},
+	{L"NtUserSetWindowPlacement",0x120E,2},
+	{L"NtUserSetWindowPos",0x120F,7},
+	{L"NtUserSetWindowRgn",0x1210,3},
+	{L"NtUserSetWindowsHookAW",0x1211,3},
+	{L"NtUserSetWindowsHookEx",0x1212,6},
+	{L"NtUserSetWindowStationUser",0x1213,4},
+	{L"NtUserSetWindowWord",0x1214,3},
+	{L"NtUserSetWinEventHook",0x1215,8},
+	{L"NtUserShowCaret",0x1216,1},
+	{L"NtUserShowScrollBar",0x1217,3},
+	{L"NtUserShowWindow",0x1218,2},
+	{L"NtUserShowWindowAsync",0x1219,2},
+	{L"NtUserSetThreadState ",0x121A,2},
+	{L"NtUserSwitchDesktop",0x121B,1},
+	{L"NtUserSystemParametersInfo",0x121C,4},
+	{L"NtUserTestForInteractiveUser ",0x121D,1},
+	{L"NtUserThunkedMenuInfo",0x121E,2},
+	{L"NtUserThunkedMenuItemInfo",0x121F,6},
+	{L"NtUserToUnicodeEx",0x1220,7},
+	{L"NtUserTrackMouseEvent",0x1221,1},
+	{L"NtUserTrackPopupMenuEx",0x1222,6},
+	{L"NtUserTranslateAccelerator",0x1223,3},
+	{L"NtUserTranslateMessage",0x1224,2},
+	{L"NtUserUnhookWindowsHookEx",0x1225,1},
+	{L"NtUserUnhookWinEvent",0x1226,1},
+	{L"NtUserUnloadKeyboardLayout",0x1227,1},
+	{L"NtUserUnlockWindowStation",0x1228,1},
+	{L"NtUserUnregisterClass",0x1229,3},
+	{L"NtUserUnregisterHotKey",0x122A,2},
+	{L"NtUserUpdateInputContext",0x122B,3},
+	{L"NtUserUpdateInstance",0x122C,3},
+	{L"NtUserUpdateLayeredWindow",0x122D,9},
+	{L"NtUserSetLayeredWindowAttributes",0x122E,4},
+	{L"NtUserUpdatePerUserSystemParameters",0x122F,2},
+	{L"NtUserUserHandleGrantAccess",0x1230,3},
+	{L"NtUserValidateHandleSecure",0x1231,1},
+	{L"NtUserValidateRect",0x1232,2},
+	{L"NtUserVkKeyScanEx",0x1233,3},
+	{L"NtUserWaitForInputIdle",0x1234,3},
+	{L"NtUserWaitForMsgAndEvent",0x1235,1},
+	{L"NtUserWaitMessage",0x1236,0},
+	{L"NtUserWin32PoolAllocationStats",0x1237,6},
+	{L"NtUserWindowFromPoint",0x1238,2},
+	{L"NtUserYieldTask",0x1239,0},
+	{L"NtUserRemoteConnect ",0x123A,3},
+	{L"NtUserRemoteRedrawRectangle ",0x123B,4},
+	{L"NtUserRemoteRedrawScreen ",0x123C,0},
+	{L"NtUserRemoteStopScreenUpdates ",0x123D,0},
+	{L"NtUserCtxDisplayIOCtl ",0x123E,3},
+	{L"NtGdiEngAssociateSurface",0X123F,3},
+	{L"NtGdiEngCreateBitmap",0X1240,6},
+	{L"NtGdiEngCreateDeviceSurface",0X1241,4},
+	{L"NtGdiEngCreateDeviceBitmap",0X1242,4},
+	{L"NtGdiEngCreatePalette",0X1243,6},
+	{L"NtGdiEngComputeGlyphSet",0X1244,3},
+	{L"NtGdiEngCopyBits",0x1245,6},
+	{L"NtGdiEngDeletePalette",0X1246,1},
+	{L"NtGdiEngDeleteSurface",0X1247,1},
+	{L"NtGdiEngEraseSurface",0X1248,3},
+	{L"NtGdiEngUnlockSurface",0X1249,1},
+	{L"NtGdiEngLockSurface",0X124A,1},
+	{L"NtGdiEngBitBlt",0x124B,11},
+	{L"NtGdiEngStretchBlt",0x124C,11},
+	{L"NtGdiEngPlgBlt",0x124D,11},
+	{L"NtGdiEngMarkBandingSurface",0X124E,1},
+	{L"NtGdiEngStrokePath",0x124F,8},
+	{L"NtGdiEngFillPath",0x1250,7},
+	{L"NtGdiEngStrokeAndFillPath",0x1251,10},
+	{L"NtGdiEngPaint",0X1252,5},
+	{L"NtGdiEngLineTo",0x1253,9},
+	{L"NtGdiEngAlphaBlend",0X1254,7},
+	{L"NtGdiEngGradientFill",0x1255,10},
+	{L"NtGdiEngTransparentBlt",0x1256,8},
+	{L"NtGdiEngTextOut",0x1257,10},
+	{L"NtGdiEngStretchBltROP",0x1258,13},
+	{L"NtGdiXLATEOBJ_cGetPalette",0X1259,4},
+	{L"NtGdiXLATEOBJ_iXlate",0X125A,2},
+	{L"NtGdiXLATEOBJ_hGetColorTransform",0X125B,1},
+	{L"NtGdiCLIPOBJ_bEnum",0X125C,3},
+	{L"NtGdiCLIPOBJ_cEnumStart",0X125D,5},
+	{L"NtGdiCLIPOBJ_ppoGetPath",0X125E,1},
+	{L"NtGdiEngDeletePath",0X125F,1},
+	{L"NtGdiEngCreateClip",0X1260,0},
+	{L"NtGdiEngDeleteClip",0X1261,1},
+	{L"NtGdiBRUSHOBJ_ulGetBrushColor",0X1262,1},
+	{L"NtGdiBRUSHOBJ_pvAllocRbrush",0X1263,2},
+	{L"NtGdiBRUSHOBJ_pvGetRbrush",0X1264,1},
+	{L"NtGdiBRUSHOBJ_hGetColorTransform",0X1265,1},
+	{L"NtGdiXFORMOBJ_bApplyXform",0X1266,5},
+	{L"NtGdiXFORMOBJ_iGetXform",0X1267,2},
+	{L"NtGdiFONTOBJ_vGetInfo",0X1268,3},
+	{L"NtGdiFONTOBJ_pxoGetXform",0X1269,1},
+	{L"NtGdiFONTOBJ_cGetGlyphs",0X126A,5},
+	{L"NtGdiFONTOBJ_pifi",0X126B,1},
+	{L"NtGdiFONTOBJ_pfdg",0X126C,1},
+	{L"NtGdiFONTOBJ_pQueryGlyphAttrs",0X126D,2},
+	{L"NtGdiFONTOBJ_pvTrueTypeFontFile",0x126E,2},
+	{L"NtGdiFONTOBJ_cGetAllGlyphHandles",0x126F,2},
+	{L"NtGdiSTROBJ_bEnum",0x1270,3},
+	{L"NtGdiSTROBJ_bEnumPositionsOnly",0x1271,3},
+	{L"NtGdiSTROBJ_bGetAdvanceWidths",0x1272,4},
+	{L"NtGdiSTROBJ_vEnumStart",0x1273,1},
+	{L"NtGdiSTROBJ_dwGetCodePage",0x1274,1},
+	{L"NtGdiPATHOBJ_vGetBounds",0x1275,2},
+	{L"NtGdiPATHOBJ_bEnum",0x1276,2},
+	{L"NtGdiPATHOBJ_vEnumStart",0x1277,1},
+	{L"NtGdiPATHOBJ_vEnumStartClipLines",0x1278,4},
+	{L"NtGdiPATHOBJ_bEnumClipLines",0x1279,3},
+	{L"NtGdiGetDhpdev",0x127A,1},
+	{L"NtGdiEngCheckAbort",0x127B,1},
+	{L"NtGdiHT_Get8BPPFormatPalette",0x127C,4},
+	{L"NtGdiHT_Get8BPPMaskPalette",0x127D,6},
+	{L"NtGdiUpdateTransform",0x127E,1},
+	{L"NtUserValidateTimerCallback",0x127F,3}
+};
diff --git a/rostests/apitests/w32knapi/xp-2600.c b/rostests/apitests/w32knapi/winxp-sp2-2600.c
similarity index 100%
rename from rostests/apitests/w32knapi/xp-2600.c
rename to rostests/apitests/w32knapi/winxp-sp2-2600.c