Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-20 12:29:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WIN32KDLL_2K3SP2]

Browse source 
- "Fix" an export name: NtUserGetClassInfoEx on 2k3 is the same as NtUserGetClassInfo on XP (note that we currently use the default, aka ros specific, win32kdll on the WHS testbot, but it's mostly identical.

[WIN32KNT_APITEST]
- Fix a typo
- add missing tests to testlist.c

svn path=/trunk/; revision=70462
This commit is contained in:
Timo Kreuzer 2015-12-28 23:03:04 +00:00
parent 7e81805878
commit 0c24f4ecd6
4 changed files with 115 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rostests/apitests/win32kdll/win32kdll_2k3sp2/win32kdll_2k3sp2.spec
View file

@ -390,7 +390,7 @@
@ stdcall NtUserGetAtomName(long ptr) @ stdcall NtUserGetAtomName(long ptr)
@ stdcall NtUserGetCaretBlinkTime() @ stdcall NtUserGetCaretBlinkTime()
@ stdcall NtUserGetCaretPos(ptr) @ stdcall NtUserGetCaretPos(ptr)
@ stdcall NtUserGetClassInfoEx(ptr ptr ptr ptr long) @ stdcall NtUserGetClassInfo(ptr ptr ptr ptr long) # called NtUserGetClassInfoEx on 2k3,but identical to XP
@ stdcall NtUserGetClassName(ptr long ptr) @ stdcall NtUserGetClassName(ptr long ptr)
@ stdcall NtUserGetClipboardData(long ptr) @ stdcall NtUserGetClipboardData(long ptr)
@ stdcall NtUserGetClipboardFormatName(long wstr ptr) @ stdcall NtUserGetClipboardFormatName(long wstr ptr)

2
rostests/apitests/win32kdll/win32kdll_2k3sp2/win32ksvc-2k3sp2.h
View file

@ -388,7 +388,7 @@ SVC_(UserGetAsyncKeyState, 1)
SVC_(UserGetAtomName, 2) SVC_(UserGetAtomName, 2)
SVC_(UserGetCaretBlinkTime, 0) SVC_(UserGetCaretBlinkTime, 0)
SVC_(UserGetCaretPos, 1) SVC_(UserGetCaretPos, 1)
SVC_(UserGetClassInfoEx, 5) SVC_(UserGetClassInfo, 5) // called UserGetClassInfoEx on 2k3, but identical to XP
SVC_(UserGetClassName, 3) SVC_(UserGetClassName, 3)
SVC_(UserGetClipboardData, 2) SVC_(UserGetClipboardData, 2)
SVC_(UserGetClipboardFormatName, 3) SVC_(UserGetClipboardFormatName, 3)

5
rostests/apitests/win32nt/ntuser/NtUserFindExistingCursorIcon.c
View file

@ -1,15 +1,14 @@
/* /*
* PROJECT: ReactOS api tests * PROJECT: ReactOS api tests
* LICENSE: GPL - See COPYING in the top level directory * LICENSE: GPL - See COPYING in the top level directory
* PURPOSE: Test for NtUserFindExistingCursoricon * PURPOSE: Test for NtUserFindExistingCursorIcon
* PROGRAMMERS: * PROGRAMMERS:
*/ */
#include <win32nt.h> #include <win32nt.h>
START_TEST(NtUserFindExistingCursoricon) START_TEST(NtUserFindExistingCursorIcon)
{ {
} }

111
rostests/apitests/win32nt/testlist.c
View file

@ -4,10 +4,121 @@
#include <apitest.h> #include <apitest.h>
extern void func_NtGdiDdCreateDirectDrawObject(void); extern void func_NtGdiDdCreateDirectDrawObject(void);
extern void func_NtGdiDdCreateDirectDrawObject(void);
extern void func_NtGdiDdDeleteDirectDrawObject(void);
extern void func_NtGdiDdQueryDirectDrawObject(void);
extern void func_NtGdiArcInternal(void);
extern void func_NtGdiBitBlt(void);
extern void func_NtGdiCombineRgn(void);
extern void func_NtGdiCreateBitmap(void);
extern void func_NtGdiCreateCompatibleBitmap(void);
extern void func_NtGdiCreateCompatibleDC(void);
extern void func_NtGdiCreateDIBSection(void);
extern void func_NtGdiDeleteObjectApp(void);
extern void func_NtGdiDoPalette(void);
extern void func_NtGdiEngCreatePalette(void);
extern void func_NtGdiEnumFontOpen(void);
//extern void func_NtGdiExtSelectClipRgn(void);
extern void func_NtGdiExtTextOutW(void);
//extern void func_NtGdiFlushUserBatch(void);
extern void func_NtGdiGetBitmapBits(void);
extern void func_NtGdiGetDIBitsInternal(void);
extern void func_NtGdiGetFontResourceInfoInternalW(void);
extern void func_NtGdiGetRandomRgn(void);
extern void func_NtGdiGetStockObject(void);
extern void func_NtGdiPolyPolyDraw(void);
extern void func_NtGdiRestoreDC(void);
extern void func_NtGdiSaveDC(void);
extern void func_NtGdiSelectBitmap(void);
extern void func_NtGdiSelectBrush(void);
extern void func_NtGdiSelectFont(void);
extern void func_NtGdiSelectPen(void);
extern void func_NtGdiSetBitmapBits(void);
extern void func_NtGdiSetDIBitsToDeviceInternal(void);
//extern void func_NtUserCallHwnd(void);
//extern void func_NtUserCallHwndLock(void);
//extern void func_NtUserCallHwndOpt(void);
//extern void func_NtUserCallHwndParam(void);
//extern void func_NtUserCallHwndParamLock(void);
//extern void func_NtUserCallNoParam(void);
//extern void func_NtUserCallOneParam(void);
extern void func_NtUserCountClipboardFormats(void);
//extern void func_NtUserEnumDisplayMonitors(void);
extern void func_NtUserEnumDisplaySettings(void);
extern void func_NtUserFindExistingCursorIcon(void);
extern void func_NtUserGetClassInfo(void);
//extern void func_NtUserGetIconInfo(void);
extern void func_NtUserGetTitleBarInfo(void);
extern void func_NtUserProcessConnect(void);
extern void func_NtUserRedrawWindow(void);
extern void func_NtUserScrollDC(void);
extern void func_NtUserSelectPalette(void);
extern void func_NtUserSetTimer(void);
extern void func_NtUserSystemParametersInfo(void);
extern void func_NtUserToUnicodeEx(void);
extern void func_NtUserUpdatePerUserSystemParameters(void);
const struct test winetest_testlist[] = const struct test winetest_testlist[] =
{ {
/* ntdd*/
{ "NtGdiDdCreateDirectDrawObject", func_NtGdiDdCreateDirectDrawObject }, { "NtGdiDdCreateDirectDrawObject", func_NtGdiDdCreateDirectDrawObject },
{ "NtGdiDdDeleteDirectDrawObject", func_NtGdiDdDeleteDirectDrawObject },
{ "NtGdiDdQueryDirectDrawObject", func_NtGdiDdQueryDirectDrawObject },
{ "NtGdiArcInternal", func_NtGdiArcInternal },
/* ntgdi */
{ "NtGdiBitBlt", func_NtGdiBitBlt },
{ "NtGdiCombineRgn", func_NtGdiCombineRgn },
{ "NtGdiCreateBitmap", func_NtGdiCreateBitmap },
{ "NtGdiCreateCompatibleBitmap", func_NtGdiCreateCompatibleBitmap },
{ "NtGdiCreateCompatibleDC", func_NtGdiCreateCompatibleDC },
{ "NtGdiCreateDIBSection", func_NtGdiCreateDIBSection },
{ "NtGdiDeleteObjectApp", func_NtGdiDeleteObjectApp },
{ "NtGdiDoPalette", func_NtGdiDoPalette },
{ "NtGdiEngCreatePalette", func_NtGdiEngCreatePalette },
{ "NtGdiEnumFontOpen", func_NtGdiEnumFontOpen },
//{ "NtGdiExtSelectClipRgn", func_NtGdiExtSelectClipRgn },
{ "NtGdiExtTextOutW", func_NtGdiExtTextOutW },
//{ "NtGdiFlushUserBatch", func_NtGdiFlushUserBatch },
{ "NtGdiGetBitmapBits", func_NtGdiGetBitmapBits },
{ "NtGdiGetDIBitsInternal", func_NtGdiGetDIBitsInternal },
{ "NtGdiGetFontResourceInfoInternalW", func_NtGdiGetFontResourceInfoInternalW },
{ "NtGdiGetRandomRgn", func_NtGdiGetRandomRgn },
{ "NtGdiGetStockObject", func_NtGdiGetStockObject },
{ "NtGdiPolyPolyDraw", func_NtGdiPolyPolyDraw },
{ "NtGdiRestoreDC", func_NtGdiRestoreDC },
{ "NtGdiSaveDC", func_NtGdiSaveDC },
{ "NtGdiSelectBitmap", func_NtGdiSelectBitmap },
{ "NtGdiSelectBrush", func_NtGdiSelectBrush },
{ "NtGdiSelectFont", func_NtGdiSelectFont },
{ "NtGdiSelectPen", func_NtGdiSelectPen },
{ "NtGdiSetBitmapBits", func_NtGdiSetBitmapBits },
{ "NtGdiSetDIBitsToDeviceInternal", func_NtGdiSetDIBitsToDeviceInternal },
/* ntuser */
//{ "NtUserCallHwnd", func_NtUserCallHwnd },
//{ "NtUserCallHwndLock", func_NtUserCallHwndLock },
//{ "NtUserCallHwndOpt", func_NtUserCallHwndOpt },
//{ "NtUserCallHwndParam", func_NtUserCallHwndParam },
//{ "NtUserCallHwndParamLock", func_NtUserCallHwndParamLock },
//{ "NtUserCallNoParam", func_NtUserCallNoParam },
//{ "NtUserCallOneParam", func_NtUserCallOneParam },
{ "NtUserCountClipboardFormats", func_NtUserCountClipboardFormats },
//{ "NtUserEnumDisplayMonitors", func_NtUserEnumDisplayMonitors },
{ "NtUserEnumDisplaySettings", func_NtUserEnumDisplaySettings },
{ "NtUserFindExistingCursorIcon", func_NtUserFindExistingCursorIcon },
{ "NtUserGetClassInfo", func_NtUserGetClassInfo },
//{ "NtUserGetIconInfo", func_NtUserGetIconInfo },
{ "NtUserGetTitleBarInfo", func_NtUserGetTitleBarInfo },
{ "NtUserProcessConnect", func_NtUserProcessConnect },
{ "NtUserRedrawWindow", func_NtUserRedrawWindow },
{ "NtUserScrollDC", func_NtUserScrollDC },
{ "NtUserSelectPalette", func_NtUserSelectPalette },
{ "NtUserSetTimer", func_NtUserSetTimer },
{ "NtUserSystemParametersInfo", func_NtUserSystemParametersInfo },
{ "NtUserToUnicodeEx", func_NtUserToUnicodeEx },
{ "NtUserUpdatePerUserSystemParameters", func_NtUserUpdatePerUserSystemParameters },
{ 0, 0 } { 0, 0 }
}; };