Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 70462: [WIN32KDLL_2K3SP2] - "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...
by tkreuzer＠svn.reactos.org 28 Dec '15

28 Dec '15

Author: tkreuzer Date: Mon Dec 28 23:03:04 2015 New Revision: 70462 URL: http://svn.reactos.org/svn/reactos?rev=70462&view=rev Log: [WIN32KDLL_2K3SP2] - "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 Modified: trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/win32kdll_2k3sp2.spec trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/win32ksvc-2k3sp2.h trunk/rostests/apitests/win32nt/ntuser/NtUserFindExistingCursorIcon.c trunk/rostests/apitests/win32nt/testlist.c Modified: trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/win32kdll_2k3sp2.spec URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32kdll/win32k… ============================================================================== --- trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/win32kdll_2k3sp2.spec [iso-8859-1] (original) +++ trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/win32kdll_2k3sp2.spec [iso-8859-1] Mon Dec 28 23:03:04 2015 @@ -390,7 +390,7 @@ @ stdcall NtUserGetAtomName(long ptr) @ stdcall NtUserGetCaretBlinkTime() @ 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 NtUserGetClipboardData(long ptr) @ stdcall NtUserGetClipboardFormatName(long wstr ptr) Modified: trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/win32ksvc-2k3sp2.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32kdll/win32k… ============================================================================== --- trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/win32ksvc-2k3sp2.h [iso-8859-1] (original) +++ trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/win32ksvc-2k3sp2.h [iso-8859-1] Mon Dec 28 23:03:04 2015 @@ -388,7 +388,7 @@ SVC_(UserGetAtomName, 2) SVC_(UserGetCaretBlinkTime, 0) SVC_(UserGetCaretPos, 1) -SVC_(UserGetClassInfoEx, 5) +SVC_(UserGetClassInfo, 5) // called UserGetClassInfoEx on 2k3, but identical to XP SVC_(UserGetClassName, 3) SVC_(UserGetClipboardData, 2) SVC_(UserGetClipboardFormatName, 3) Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserFindExistingCursorIcon.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntuser/N… ============================================================================== --- trunk/rostests/apitests/win32nt/ntuser/NtUserFindExistingCursorIcon.c [iso-8859-1] (original) +++ trunk/rostests/apitests/win32nt/ntuser/NtUserFindExistingCursorIcon.c [iso-8859-1] Mon Dec 28 23:03:04 2015 @@ -1,15 +1,14 @@ /* * PROJECT: ReactOS api tests * LICENSE: GPL - See COPYING in the top level directory - * PURPOSE: Test for NtUserFindExistingCursoricon + * PURPOSE: Test for NtUserFindExistingCursorIcon * PROGRAMMERS: */ #include <win32nt.h> -START_TEST(NtUserFindExistingCursoricon) +START_TEST(NtUserFindExistingCursorIcon) { } - Modified: trunk/rostests/apitests/win32nt/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/testlist… ============================================================================== --- trunk/rostests/apitests/win32nt/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/win32nt/testlist.c [iso-8859-1] Mon Dec 28 23:03:04 2015 @@ -4,10 +4,121 @@ #include <apitest.h> 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[] = { + /* ntdd*/ { "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 } };

1 0

[tkreuzer] 70461: [GDITOOLS] 3rd try to fix WHS rostests build
by tkreuzer＠svn.reactos.org 28 Dec '15

28 Dec '15

Author: tkreuzer Date: Mon Dec 28 20:53:34 2015 New Revision: 70461 URL: http://svn.reactos.org/svn/reactos?rev=70461&view=rev Log: [GDITOOLS] 3rd try to fix WHS rostests build Modified: trunk/rostests/apitests/gditools/CMakeLists.txt Modified: trunk/rostests/apitests/gditools/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gditools/CMakeLi… ============================================================================== --- trunk/rostests/apitests/gditools/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/gditools/CMakeLists.txt [iso-8859-1] Mon Dec 28 20:53:34 2015 @@ -3,3 +3,5 @@ add_library(gditools gditools.c) + +add_dependencies(gditools xdk)

1 0

[tkreuzer] 70460: [WIN32NT_APITEST] 2nd try to fix WHS rostests build
by tkreuzer＠svn.reactos.org 28 Dec '15

28 Dec '15

Author: tkreuzer Date: Mon Dec 28 20:51:28 2015 New Revision: 70460 URL: http://svn.reactos.org/svn/reactos?rev=70460&view=rev Log: [WIN32NT_APITEST] 2nd try to fix WHS rostests build Modified: trunk/rostests/apitests/win32nt/CMakeLists.txt Modified: trunk/rostests/apitests/win32nt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/CMakeLis… ============================================================================== --- trunk/rostests/apitests/win32nt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/win32nt/CMakeLists.txt [iso-8859-1] Mon Dec 28 20:51:28 2015 @@ -1,6 +1,6 @@ add_definitions(-D_DLL -D__USE_CRTIMP) -include_directories(${REACTOS_SOURCE_DIR}/win32ss/include ${REACTOS_SOURCE_DIR}/win32ss/include/psdk ../gditools) +include_directories(${REACTOS_SOURCE_DIR}/win32ss/include ../gditools) list(APPEND SOURCE ntdd/NtGdiDdCreateDirectDrawObject.c @@ -76,4 +76,5 @@ kernel32 ntdll) +add_dependencies(win32knt_apitest xdk) add_cd_file(TARGET win32knt_apitest DESTINATION reactos/bin FOR all)

1 0

[tkreuzer] 70459: [WIN32NT_APITEST] Try to fix WHS rostests build
by tkreuzer＠svn.reactos.org 28 Dec '15

28 Dec '15

Author: tkreuzer Date: Mon Dec 28 20:46:05 2015 New Revision: 70459 URL: http://svn.reactos.org/svn/reactos?rev=70459&view=rev Log: [WIN32NT_APITEST] Try to fix WHS rostests build Modified: trunk/rostests/apitests/win32nt/CMakeLists.txt Modified: trunk/rostests/apitests/win32nt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/CMakeLis… ============================================================================== --- trunk/rostests/apitests/win32nt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/win32nt/CMakeLists.txt [iso-8859-1] Mon Dec 28 20:46:05 2015 @@ -1,6 +1,6 @@ add_definitions(-D_DLL -D__USE_CRTIMP) -include_directories(${REACTOS_SOURCE_DIR}/win32ss/include ../gditools) +include_directories(${REACTOS_SOURCE_DIR}/win32ss/include ${REACTOS_SOURCE_DIR}/win32ss/include/psdk ../gditools) list(APPEND SOURCE ntdd/NtGdiDdCreateDirectDrawObject.c

1 0

[tkreuzer] 70458: [APOTESTS] - Convert win32k native api test to actual wine style api-tests - Hack around a bit with the win32k dlls, some renaming, etc. - Delete old apitest stuff
by tkreuzer＠svn.reactos.org 28 Dec '15

28 Dec '15

Author: tkreuzer Date: Mon Dec 28 20:31:10 2015 New Revision: 70458 URL: http://svn.reactos.org/svn/reactos?rev=70458&view=rev Log: [APOTESTS] - Convert win32k native api test to actual wine style api-tests - Hack around a bit with the win32k dlls, some renaming, etc. - Delete old apitest stuff Added: trunk/rostests/apitests/win32kdll/ - copied from r70457, trunk/rostests/apitests/w32kdll/ trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/ - copied from r70405, trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/ trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/win32kdll_2k3sp2.spec - copied unchanged from r70405, trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.spec trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/win32ksvc-2k3sp2.h - copied unchanged from r70405, trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32ksvc-2k3sp2.h trunk/rostests/apitests/win32kdll/win32kdll_2ksp4/ - copied from r70405, trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/ trunk/rostests/apitests/win32kdll/win32kdll_2ksp4/win32kdll_2ksp4.S - copied unchanged from r70405, trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/w32kdll_2ksp4.S trunk/rostests/apitests/win32kdll/win32kdll_2ksp4/win32kdll_2ksp4.def - copied unchanged from r70405, trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/w32kdll_2ksp4.def trunk/rostests/apitests/win32kdll/win32kdll_2ksp4/win32kdll_2ksp4.spec - copied unchanged from r70405, trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/w32kdll_2ksp4.spec trunk/rostests/apitests/win32kdll/win32kdll_ros/ - copied from r70405, trunk/rostests/apitests/w32kdll/w32kdll_ros/ trunk/rostests/apitests/win32kdll/win32kdll_ros/win32kdll_ros.spec - copied, changed from r70405, trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.spec trunk/rostests/apitests/win32kdll/win32kdll_vista/ - copied from r70405, trunk/rostests/apitests/w32kdll/w32kdll_vista/ trunk/rostests/apitests/win32kdll/win32kdll_vista/win32kdll_vista.S - copied unchanged from r70405, trunk/rostests/apitests/w32kdll/w32kdll_vista/w32kdll_vista.S trunk/rostests/apitests/win32kdll/win32kdll_vista/win32kdll_vista.def - copied unchanged from r70405, trunk/rostests/apitests/w32kdll/w32kdll_vista/w32kdll_vista.def trunk/rostests/apitests/win32kdll/win32kdll_vista/win32kdll_vista.spec - copied unchanged from r70405, trunk/rostests/apitests/w32kdll/w32kdll_vista/w32kdll_vista.spec trunk/rostests/apitests/win32kdll/win32kdll_xpsp2/ - copied from r70405, trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/ trunk/rostests/apitests/win32kdll/win32kdll_xpsp2/win32kdll_xpsp2.spec - copied unchanged from r70405, trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/w32kdll_xpsp2.spec trunk/rostests/apitests/win32nt/ - copied from r70457, trunk/rostests/apitests/w32knapi/ trunk/rostests/apitests/win32nt/win32nt.h (with props) Removed: trunk/rostests/apitests/apitest.c trunk/rostests/apitests/apitest.h trunk/rostests/apitests/w32kdll/ trunk/rostests/apitests/w32knapi/ trunk/rostests/apitests/win32kdll/w32kdll_2k3sp2/ trunk/rostests/apitests/win32kdll/w32kdll_2ksp4/ trunk/rostests/apitests/win32kdll/w32kdll_ros/ trunk/rostests/apitests/win32kdll/w32kdll_vista/ trunk/rostests/apitests/win32kdll/w32kdll_xpsp2/ trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/w32kdll_2k3sp2.spec trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/w32ksvc-2k3sp2.h trunk/rostests/apitests/win32kdll/win32kdll_2ksp4/w32k_2ksp4-x86.db trunk/rostests/apitests/win32kdll/win32kdll_2ksp4/w32kdll_2ksp4.S trunk/rostests/apitests/win32kdll/win32kdll_2ksp4/w32kdll_2ksp4.def trunk/rostests/apitests/win32kdll/win32kdll_2ksp4/w32kdll_2ksp4.spec trunk/rostests/apitests/win32kdll/win32kdll_ros/w32kdll_ros.spec trunk/rostests/apitests/win32kdll/win32kdll_vista/w32kdll_vista-x86.db trunk/rostests/apitests/win32kdll/win32kdll_vista/w32kdll_vista.S trunk/rostests/apitests/win32kdll/win32kdll_vista/w32kdll_vista.def trunk/rostests/apitests/win32kdll/win32kdll_vista/w32kdll_vista.spec trunk/rostests/apitests/win32kdll/win32kdll_xpsp2/w32kdll_xpsp2.spec Modified: trunk/rostests/apitests/CMakeLists.txt trunk/rostests/apitests/win32kdll/CMakeLists.txt trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/CMakeLists.txt trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/sys-stubs.S trunk/rostests/apitests/win32kdll/win32kdll_2ksp4/CMakeLists.txt trunk/rostests/apitests/win32kdll/win32kdll_ros/CMakeLists.txt trunk/rostests/apitests/win32kdll/win32kdll_ros/sys-stubs.S trunk/rostests/apitests/win32kdll/win32kdll_vista/CMakeLists.txt trunk/rostests/apitests/win32kdll/win32kdll_xpsp2/CMakeLists.txt trunk/rostests/apitests/win32nt/CMakeLists.txt trunk/rostests/apitests/win32nt/ntdd/NtGdiDdCreateDirectDrawObject.c trunk/rostests/apitests/win32nt/ntdd/NtGdiDdDeleteDirectDrawObject.c trunk/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiArcInternal.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiBitBlt.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiCombineRgn.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiCreateBitmap.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiCreateCompatibleBitmap.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiCreateCompatibleDC.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiCreateDIBSection.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiDeleteObjectApp.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiDoPalette.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiEngCreatePalette.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiEnumFontOpen.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiExtTextOutW.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiFlushUserBatch.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiGetBitmapBits.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiGetDIBits.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiGetFontResourceInfoInternalW.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiGetRandomRgn.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiGetStockObject.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiPolyPolyDraw.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiRestoreDC.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiSaveDC.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiSelectBitmap.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiSelectBrush.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiSelectFont.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiSelectPen.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiSetBitmapBits.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiSetDIBitsToDeviceInternal.c trunk/rostests/apitests/win32nt/ntuser/NtUserCallHwnd.c trunk/rostests/apitests/win32nt/ntuser/NtUserCallHwndLock.c trunk/rostests/apitests/win32nt/ntuser/NtUserCallHwndOpt.c trunk/rostests/apitests/win32nt/ntuser/NtUserCallHwndParam.c trunk/rostests/apitests/win32nt/ntuser/NtUserCallHwndParamLock.c trunk/rostests/apitests/win32nt/ntuser/NtUserCallNoParam.c trunk/rostests/apitests/win32nt/ntuser/NtUserCallOneParam.c trunk/rostests/apitests/win32nt/ntuser/NtUserCountClipboardFormats.c trunk/rostests/apitests/win32nt/ntuser/NtUserEnumDisplayMonitors.c trunk/rostests/apitests/win32nt/ntuser/NtUserEnumDisplaySettings.c trunk/rostests/apitests/win32nt/ntuser/NtUserFindExistingCursorIcon.c trunk/rostests/apitests/win32nt/ntuser/NtUserGetClassInfo.c trunk/rostests/apitests/win32nt/ntuser/NtUserGetIconInfo.c trunk/rostests/apitests/win32nt/ntuser/NtUserGetTitleBarInfo.c trunk/rostests/apitests/win32nt/ntuser/NtUserProcessConnect.c trunk/rostests/apitests/win32nt/ntuser/NtUserRedrawWindow.c trunk/rostests/apitests/win32nt/ntuser/NtUserScrollDC.c trunk/rostests/apitests/win32nt/ntuser/NtUserSelectPalette.c trunk/rostests/apitests/win32nt/ntuser/NtUserSetTimer.c trunk/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c trunk/rostests/apitests/win32nt/ntuser/NtUserToUnicodeEx.c trunk/rostests/apitests/win32nt/ntuser/NtUserUpdatePerUserSystemParameters.c trunk/rostests/apitests/win32nt/testlist.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/apitests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/CMakeLists.txt?r… Removed: trunk/rostests/apitests/apitest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apitest.c?rev=70… Removed: trunk/rostests/apitests/apitest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apitest.h?rev=70… Modified: trunk/rostests/apitests/win32kdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32kdll/CMakeL… Modified: trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32kdll/win32k… Modified: trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/sys-stubs.S URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32kdll/win32k… Removed: trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/w32kdll_2k3sp2.spec URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Removed: trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/w32ksvc-2k3sp2.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Modified: trunk/rostests/apitests/win32kdll/win32kdll_2ksp4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32kdll/win32k… Removed: trunk/rostests/apitests/win32kdll/win32kdll_2ksp4/w32k_2ksp4-x86.db URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Removed: trunk/rostests/apitests/win32kdll/win32kdll_2ksp4/w32kdll_2ksp4.S URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Removed: trunk/rostests/apitests/win32kdll/win32kdll_2ksp4/w32kdll_2ksp4.def URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Removed: trunk/rostests/apitests/win32kdll/win32kdll_2ksp4/w32kdll_2ksp4.spec URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Modified: trunk/rostests/apitests/win32kdll/win32kdll_ros/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32kdll/win32k… Modified: trunk/rostests/apitests/win32kdll/win32kdll_ros/sys-stubs.S URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32kdll/win32k… Removed: trunk/rostests/apitests/win32kdll/win32kdll_ros/w32kdll_ros.spec URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Copied: trunk/rostests/apitests/win32kdll/win32kdll_ros/win32kdll_ros.spec (from r70405, trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.spec) URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32kdll/win32k… Modified: trunk/rostests/apitests/win32kdll/win32kdll_vista/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32kdll/win32k… Removed: trunk/rostests/apitests/win32kdll/win32kdll_vista/w32kdll_vista-x86.db URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Removed: trunk/rostests/apitests/win32kdll/win32kdll_vista/w32kdll_vista.S URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Removed: trunk/rostests/apitests/win32kdll/win32kdll_vista/w32kdll_vista.def URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Removed: trunk/rostests/apitests/win32kdll/win32kdll_vista/w32kdll_vista.spec URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Modified: trunk/rostests/apitests/win32kdll/win32kdll_xpsp2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32kdll/win32k… Removed: trunk/rostests/apitests/win32kdll/win32kdll_xpsp2/w32kdll_xpsp2.spec URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Modified: trunk/rostests/apitests/win32nt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/CMakeLis… Modified: trunk/rostests/apitests/win32nt/ntdd/NtGdiDdCreateDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntdd/NtG… Modified: trunk/rostests/apitests/win32nt/ntdd/NtGdiDdDeleteDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntdd/NtG… Modified: trunk/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntdd/NtG… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiArcInternal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiBitBlt.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiCombineRgn.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiCreateBitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiCreateCompatibleBitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiCreateCompatibleDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiCreateDIBSection.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiDeleteObjectApp.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiDoPalette.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiEngCreatePalette.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiEnumFontOpen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiExtTextOutW.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiFlushUserBatch.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiGetBitmapBits.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiGetDIBits.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiGetFontResourceInfoInternalW.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiGetRandomRgn.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiGetStockObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiPolyPolyDraw.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiRestoreDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiSaveDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiSelectBitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiSelectBrush.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiSelectFont.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiSelectPen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiSetBitmapBits.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiSetDIBitsToDeviceInternal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserCallHwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntuser/N… Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserCallHwndLock.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntuser/N… Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserCallHwndOpt.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntuser/N… Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserCallHwndParam.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntuser/N… Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserCallHwndParamLock.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntuser/N… Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserCallNoParam.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntuser/N… Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserCallOneParam.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntuser/N… Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserCountClipboardFormats.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntuser/N… Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserEnumDisplayMonitors.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntuser/N… Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserEnumDisplaySettings.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntuser/N… Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserFindExistingCursorIcon.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntuser/N… Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserGetClassInfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntuser/N… Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserGetIconInfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntuser/N… Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserGetTitleBarInfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntuser/N… Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserProcessConnect.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntuser/N… Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserRedrawWindow.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntuser/N… Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserScrollDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntuser/N… Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserSelectPalette.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntuser/N… Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserSetTimer.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntuser/N… Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntuser/N… Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserToUnicodeEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntuser/N… Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserUpdatePerUserSystemParameters.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntuser/N… Modified: trunk/rostests/apitests/win32nt/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/testlist… Added: trunk/rostests/apitests/win32nt/win32nt.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/win32nt.…

1 0

[tkreuzer] 70457: [GDITOOLS] Add a library with some helper routines for GDI tests
by tkreuzer＠svn.reactos.org 28 Dec '15

28 Dec '15

Author: tkreuzer Date: Mon Dec 28 20:24:57 2015 New Revision: 70457 URL: http://svn.reactos.org/svn/reactos?rev=70457&view=rev Log: [GDITOOLS] Add a library with some helper routines for GDI tests Added: trunk/rostests/apitests/gditools/ trunk/rostests/apitests/gditools/CMakeLists.txt (with props) trunk/rostests/apitests/gditools/gditools.c (with props) trunk/rostests/apitests/gditools/gditools.h (with props) Added: trunk/rostests/apitests/gditools/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gditools/CMakeLi… ============================================================================== --- trunk/rostests/apitests/gditools/CMakeLists.txt (added) +++ trunk/rostests/apitests/gditools/CMakeLists.txt [iso-8859-1] Mon Dec 28 20:24:57 2015 @@ -0,0 +1,5 @@ + +include_directories(${REACTOS_SOURCE_DIR}/win32ss/include) + +add_library(gditools + gditools.c) Propchange: trunk/rostests/apitests/gditools/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/gditools/gditools.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gditools/gditool… ============================================================================== --- trunk/rostests/apitests/gditools/gditools.c (added) +++ trunk/rostests/apitests/gditools/gditools.c [iso-8859-1] Mon Dec 28 20:24:57 2015 @@ -0,0 +1,82 @@ + + +/* SDK/DDK/NDK Headers. */ +#define WIN32_NO_STATUS +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <winddi.h> +#include <prntfont.h> + +#define NTOS_MODE_USER +#include <ndk/ntndk.h> + +/* Public Win32K Headers */ +#include <ntgdityp.h> +#include <ntgdi.h> +#include <ntgdihdl.h> + +PENTRY +GdiQueryTable( + VOID) +{ + PTEB pTeb = NtCurrentTeb(); + PPEB pPeb = pTeb->ProcessEnvironmentBlock; + return pPeb->GdiSharedHandleTable; +} + +BOOL +GdiIsHandleValid( + _In_ HGDIOBJ hobj) +{ + PENTRY pentHmgr = GdiQueryTable(); + USHORT Index = (ULONG_PTR)hobj & 0xFFFF; + PENTRY pentry = &pentHmgr[Index]; + + if ((pentry->einfo.pobj == NULL) || + ((LONG_PTR)pentry->einfo.pobj > 0) || + (pentry->FullUnique != (USHORT)((ULONG_PTR)hobj >> 16))) + { + return FALSE; + } + + return TRUE; +} + +BOOL +GdiIsHandleValidEx( + _In_ HGDIOBJ hobj, + _In_ GDILOOBJTYPE ObjectType) +{ + PENTRY pentHmgr = GdiQueryTable(); + USHORT Index = (ULONG_PTR)hobj & 0xFFFF; + PENTRY pentry = &pentHmgr[Index]; + + if ((pentry->einfo.pobj == NULL) || + ((LONG_PTR)pentry->einfo.pobj > 0) || + (pentry->FullUnique != (USHORT)((ULONG_PTR)hobj >> 16)) || + (pentry->Objt != (UCHAR)(ObjectType >> 16)) || + (pentry->Flags != (UCHAR)(ObjectType >> 24))) + { + return FALSE; + } + + return TRUE; +} + +PVOID +GdiGetHandleUserData( + _In_ HGDIOBJ hobj) +{ + PENTRY pentHmgr = GdiQueryTable(); + USHORT Index = (ULONG_PTR)hobj; + PENTRY pentry = &pentHmgr[Index]; + + if (!GdiIsHandleValid(hobj)) + { + return NULL; + } + + return pentry->pUser; +} + Propchange: trunk/rostests/apitests/gditools/gditools.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/gditools/gditools.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gditools/gditool… ============================================================================== --- trunk/rostests/apitests/gditools/gditools.h (added) +++ trunk/rostests/apitests/gditools/gditools.h [iso-8859-1] Mon Dec 28 20:24:57 2015 @@ -0,0 +1,20 @@ + +#pragma once + +PENTRY +GdiQueryTable( + VOID); + +BOOL +GdiIsHandleValid( + _In_ HGDIOBJ hobj); + +BOOL +GdiIsHandleValidEx( + _In_ HGDIOBJ hobj, + _In_ GDILOOBJTYPE ObjectType); + +PVOID +GdiGetHandleUserData( + _In_ HGDIOBJ hobj); + Propchange: trunk/rostests/apitests/gditools/gditools.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 70456: [CRT_APITEST] Fix sprintf tests to succeed on W2K3
by tkreuzer＠svn.reactos.org 28 Dec '15

28 Dec '15

Author: tkreuzer Date: Mon Dec 28 15:49:29 2015 New Revision: 70456 URL: http://svn.reactos.org/svn/reactos?rev=70456&view=rev Log: [CRT_APITEST] Fix sprintf tests to succeed on W2K3 Modified: trunk/rostests/apitests/crt/sprintf.c Modified: trunk/rostests/apitests/crt/sprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/sprintf.c?re… ============================================================================== --- trunk/rostests/apitests/crt/sprintf.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/sprintf.c [iso-8859-1] Mon Dec 28 15:49:29 2015 @@ -85,20 +85,12 @@ StartSeh() Length = sprintf(NULL, ""); ok_int(Length, 0); -#if defined(TEST_CRTDLL) || defined(TEST_USER32) - EndSeh(STATUS_ACCESS_VIOLATION); -#else - EndSeh(STATUS_SUCCESS); -#endif + EndSeh(STATUS_ACCESS_VIOLATION); StartSeh() Length = sprintf(NULL, "Hello"); ok_int(Length, 5); -#if defined(TEST_CRTDLL) || defined(TEST_USER32) - EndSeh(STATUS_ACCESS_VIOLATION); -#else - EndSeh(STATUS_SUCCESS); -#endif + EndSeh(STATUS_ACCESS_VIOLATION); /* some basic formats */ Length = sprintf(Buffer, "abcde");

1 0

[tkreuzer] 70455: [CRT_APITEST] Add tests for _snprintf, _snwprintf, strtoul, wcstoul Patch by Thomas Faber (slightly modified by me) CORE-6510
by tkreuzer＠svn.reactos.org 28 Dec '15

28 Dec '15

Author: tkreuzer Date: Mon Dec 28 15:24:47 2015 New Revision: 70455 URL: http://svn.reactos.org/svn/reactos?rev=70455&view=rev Log: [CRT_APITEST] Add tests for _snprintf, _snwprintf, strtoul, wcstoul Patch by Thomas Faber (slightly modified by me) CORE-6510 Added: trunk/rostests/apitests/crt/_snprintf.c (with props) trunk/rostests/apitests/crt/_sntprintf.h (with props) trunk/rostests/apitests/crt/_snwprintf.c (with props) trunk/rostests/apitests/crt/strtoul.c (with props) trunk/rostests/apitests/crt/tcstoul.h (with props) trunk/rostests/apitests/crt/wcstoul.c (with props) Modified: trunk/rostests/apitests/crt/crtdll_crt_apitest.cmake trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake trunk/rostests/apitests/crt/ntdll_crt_apitest.cmake trunk/rostests/apitests/crt/testlist.c Added: trunk/rostests/apitests/crt/_snprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/_snprintf.c?… ============================================================================== --- trunk/rostests/apitests/crt/_snprintf.c (added) +++ trunk/rostests/apitests/crt/_snprintf.c [iso-8859-1] Mon Dec 28 15:24:47 2015 @@ -0,0 +1,2 @@ +#define func__sntprintf func__snprintf +#include "_sntprintf.h" Propchange: trunk/rostests/apitests/crt/_snprintf.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/crt/_sntprintf.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/_sntprintf.h… ============================================================================== --- trunk/rostests/apitests/crt/_sntprintf.h (added) +++ trunk/rostests/apitests/crt/_sntprintf.h [iso-8859-1] Mon Dec 28 15:24:47 2015 @@ -0,0 +1,88 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for _sntprintf + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#define WIN32_NO_STATUS +#include <wine/test.h> +#include <stdio.h> +#include <tchar.h> +#include <pseh/pseh2.h> +#include <ndk/mmfuncs.h> +#include <ndk/rtlfuncs.h> + +#define StartSeh() ExceptionStatus = STATUS_SUCCESS; _SEH2_TRY { +#define EndSeh(ExpectedStatus) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { ExceptionStatus = _SEH2_GetExceptionCode(); } _SEH2_END; ok(ExceptionStatus == ExpectedStatus, "Exception %lx, expected %lx\n", ExceptionStatus, ExpectedStatus) + +/* winetest_platform is "windows" for us, so broken() doesn't do what it should :( */ +#undef broken +#define broken(x) 0 + +START_TEST(_sntprintf) +{ + NTSTATUS ExceptionStatus; + _TCHAR Buffer[128]; + size_t BufferSize = sizeof(Buffer) / sizeof(Buffer[0]); + int Result; + + StartSeh() + Result = _sntprintf(NULL, 0, _T("Hello")); +#ifdef TEST_CRTDLL + ok_int(Result, -1); +#else + ok_int(Result, 5); +#endif + EndSeh(STATUS_SUCCESS); + + StartSeh() + Result = _sntprintf(NULL, 1, _T("Hello")); + ok(Result == 5 || + broken(Result == -1) /* Win7 */, "Result = %d\n", Result); +#if defined(_UNICODE) || defined(TEST_CRTDLL) + EndSeh(STATUS_ACCESS_VIOLATION); +#else + EndSeh(STATUS_SUCCESS); +#endif + + StartSeh() + FillMemory(Buffer, sizeof(Buffer), 0x55); + Result = _sntprintf(Buffer, BufferSize, _T("Hello")); + ok_int(Result, 5); + ok(Buffer[0] == _T('H'), "\n"); + ok(Buffer[1] == _T('e'), "\n"); + ok(Buffer[2] == _T('l'), "\n"); + ok(Buffer[3] == _T('l'), "\n"); + ok(Buffer[4] == _T('o'), "\n"); + ok(Buffer[5] == _T('\0'), "\n"); + ok(Buffer[6] == (_TCHAR)0x5555, "\n"); + EndSeh(STATUS_SUCCESS); + + StartSeh() + FillMemory(Buffer, sizeof(Buffer), 0x55); + Result = _sntprintf(Buffer, 5, _T("Hello")); + ok_int(Result, 5); + ok(Buffer[0] == _T('H'), "\n"); + ok(Buffer[1] == _T('e'), "\n"); + ok(Buffer[2] == _T('l'), "\n"); + ok(Buffer[3] == _T('l'), "\n"); + ok(Buffer[4] == _T('o'), "\n"); + ok(Buffer[5] == (_TCHAR)0x5555, "\n"); + EndSeh(STATUS_SUCCESS); + + StartSeh() + FillMemory(Buffer, sizeof(Buffer), 0x55); + Result = _sntprintf(Buffer, 1, _T("Hello")); + ok_int(Result, -1); + ok(Buffer[0] == _T('H'), "\n"); + ok(Buffer[1] == (_TCHAR)0x5555, "\n"); + EndSeh(STATUS_SUCCESS); + + StartSeh() + FillMemory(Buffer, sizeof(Buffer), 0x55); + Result = _sntprintf(Buffer, 0, _T("Hello")); + ok_int(Result, -1); + ok(Buffer[0] == (_TCHAR)0x5555, "\n"); + EndSeh(STATUS_SUCCESS); +} Propchange: trunk/rostests/apitests/crt/_sntprintf.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/crt/_snwprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/_snwprintf.c… ============================================================================== --- trunk/rostests/apitests/crt/_snwprintf.c (added) +++ trunk/rostests/apitests/crt/_snwprintf.c [iso-8859-1] Mon Dec 28 15:24:47 2015 @@ -0,0 +1,3 @@ +#define _UNICODE +#define func__sntprintf func__snwprintf +#include "_sntprintf.h" Propchange: trunk/rostests/apitests/crt/_snwprintf.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/crt/crtdll_crt_apitest.cmake URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/crtdll_crt_a… ============================================================================== --- trunk/rostests/apitests/crt/crtdll_crt_apitest.cmake [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/crtdll_crt_apitest.cmake [iso-8859-1] Mon Dec 28 15:24:47 2015 @@ -264,9 +264,8 @@ # _setmode.c # _setsystime.c # _sleep.c -# _snprintf.c -# _snwprintf.c -# _sopen.c + _snprintf.c + _snwprintf.c# _sopen.c # _spawnl.c # _spawnle.c # _spawnlp.c @@ -477,7 +476,7 @@ # strtod.c # strtok.c # strtol.c -# strtoul.c + strtoul.c # strxfrm.c # swprintf.c # swscanf.c @@ -518,7 +517,7 @@ # wcstok.c # wcstol.c wcstombs.c -# wcstoul.c + wcstoul.c # wcsxfrm.c # wctomb.c # wprintf.c Modified: trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/msvcrt_crt_a… ============================================================================== --- trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake [iso-8859-1] Mon Dec 28 15:24:47 2015 @@ -679,7 +679,7 @@ # _setmode.c # _setsystime.c # _sleep.c -# _snprintf.c + _snprintf.c # _snprintf_c # _snprintf_c_l # _snprintf_l @@ -689,7 +689,7 @@ # _snscanf_l # _snscanf_s # _snscanf_s_l -# _snwprintf.c + _snwprintf.c # _snwprintf_l # _snwprintf_s # _snwprintf_s_l @@ -1188,7 +1188,7 @@ # strtok.c # strtok_s.c # strtol.c -# strtoul.c + strtoul.c # strxfrm.c # swprintf.c # swprintf_s.c @@ -1252,7 +1252,7 @@ # wcstol.c wcstombs.c # wcstombs_s.c Not exported in 2k3 Sp1 -# wcstoul.c + wcstoul.c # wcsxfrm.c # wctob # wctomb.c Modified: trunk/rostests/apitests/crt/ntdll_crt_apitest.cmake URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/ntdll_crt_ap… ============================================================================== --- trunk/rostests/apitests/crt/ntdll_crt_apitest.cmake [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/ntdll_crt_apitest.cmake [iso-8859-1] Mon Dec 28 15:24:47 2015 @@ -19,8 +19,8 @@ # _ltow.c # _memccpy.c # _memicmp.c -# _snprintf.c -# _snwprintf.c + _snprintf.c + _snwprintf.c # _splitpath.c # _strcmpi == _stricmp # _stricmp.c @@ -97,7 +97,7 @@ # strspn.c # strstr.c # strtol.c -# strtoul.c + strtoul.c # swprintf.c # tan.c # tolower.c @@ -121,7 +121,7 @@ # wcstok.c # wcstol.c wcstombs.c -# wcstoul.c + wcstoul.c ) if(ARCH STREQUAL "i386") Added: trunk/rostests/apitests/crt/strtoul.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/strtoul.c?re… ============================================================================== --- trunk/rostests/apitests/crt/strtoul.c (added) +++ trunk/rostests/apitests/crt/strtoul.c [iso-8859-1] Mon Dec 28 15:24:47 2015 @@ -0,0 +1,2 @@ +#define func_tcstoul func_strtoul +#include "tcstoul.h" Propchange: trunk/rostests/apitests/crt/strtoul.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/crt/tcstoul.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/tcstoul.h?re… ============================================================================== --- trunk/rostests/apitests/crt/tcstoul.h (added) +++ trunk/rostests/apitests/crt/tcstoul.h [iso-8859-1] Mon Dec 28 15:24:47 2015 @@ -0,0 +1,102 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for _tcstoul + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#define WIN32_NO_STATUS +#include <wine/test.h> +#include <tchar.h> +#include <pseh/pseh2.h> +#include <ndk/mmfuncs.h> +#include <ndk/rtlfuncs.h> + +#define StartSeh() ExceptionStatus = STATUS_SUCCESS; _SEH2_TRY { +#define EndSeh(ExpectedStatus) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { ExceptionStatus = _SEH2_GetExceptionCode(); } _SEH2_END; ok(ExceptionStatus == ExpectedStatus, "Exception %lx, expected %lx\n", ExceptionStatus, ExpectedStatus) + +#define ok_ulong(expression, result) \ + do { \ + unsigned long _value = (expression); \ + ok(_value == (result), "Wrong value for '%s', expected: " #result " (%lu), got: %lu\n", \ + #expression, (unsigned long)(result), _value); \ + } while (0) + +START_TEST(tcstoul) +{ + NTSTATUS ExceptionStatus; + ULONG Result; + _TCHAR Dummy; + _TCHAR *End; + struct + { + const _TCHAR *Input; + int ExpectedLength0; + ULONG Expected0; + int ExpectedLength10; + ULONG Expected10; + } Tests[] = + { + { _T(""), 0, 0, 0, 0 }, + { _T(" "), 0, 0, 0, 0 }, + { _T(" 0"), 2, 0, 2, 0 }, + { _T("0 "), 1, 0, 1, 0 }, + { _T("0"), 1, 0, 1, 0 }, + { _T("1"), 1, 1, 1, 1 }, + { _T("10"), 2, 10, 2, 10 }, + { _T("01"), 2, 1, 2, 1 }, + { _T("010"), 3, 8, 3, 10 }, + { _T("08"), 1, 0, 2, 8 }, + { _T("008"), 2, 0, 3, 8 }, + { _T("-1"), 2, -1, 2, -1 }, + { _T("+1"), 2, 1, 2, 1 }, + { _T("--1"), 0, 0, 0, 0 }, + { _T("++1"), 0, 0, 0, 0 }, + { _T("0a"), 1, 0, 1, 0 }, + { _T("0x"), 0, 0, 1, 0 }, + { _T("0x0"), 3, 0, 1, 0 }, + { _T("0xFFFFFFFF"), 10, -1, 1, 0 }, + { _T("0xFFFFFFFFF"),11, -1, 1, 0 }, + { _T("4294967295"), 10, -1, 10, -1 }, + { _T("4294967296"), 10, -1, 10, -1 }, + { _T("4294967297"), 10, -1, 10, -1 }, + { _T("42949672951"),11, -1, 11, -1 }, + }; + const INT TestCount = sizeof(Tests) / sizeof(Tests[0]); + INT i; + + StartSeh() + Result = _tcstoul(NULL, NULL, 0); + EndSeh(STATUS_ACCESS_VIOLATION); + + StartSeh() + Result = _tcstoul(_T(""), NULL, 0); + ok_ulong(Result, 0); + EndSeh(STATUS_SUCCESS); + + StartSeh() + Result = _tcstoul(_T("1"), NULL, 0); + ok_ulong(Result, 1); + EndSeh(STATUS_SUCCESS); + + Result = _tcstoul(_T("1"), &End, 0); + ok_ulong(Result, 1); + + for (i = 0; i < TestCount; i++) + { +#ifdef _UNICODE + trace("%d: '%ls'\n", i, Tests[i].Input); +#else + trace("%d: '%s'\n", i, Tests[i].Input); +#endif + End = &Dummy; + Result = _tcstoul(Tests[i].Input, &End, 0); + ok_ulong(Result, Tests[i].Expected0); + ok_ptr(End, Tests[i].Input + Tests[i].ExpectedLength0); + + End = &Dummy; + Result = _tcstoul(Tests[i].Input, &End, 10); + ok_ulong(Result, Tests[i].Expected10); + ok_ptr(End, Tests[i].Input + Tests[i].ExpectedLength10); + } +} Propchange: trunk/rostests/apitests/crt/tcstoul.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/crt/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/testlist.c?r… ============================================================================== --- trunk/rostests/apitests/crt/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/testlist.c [iso-8859-1] Mon Dec 28 15:24:47 2015 @@ -10,13 +10,21 @@ #if defined(TEST_NTDLL) extern void func__vscwprintf(void); #endif +extern void func_fputc(void); +extern void func_fputwc(void); +extern void func__snprintf(void); +extern void func__snwprintf(void); extern void func__vsnprintf(void); extern void func__vsnwprintf(void); extern void func_mbstowcs(void); extern void func_sprintf(void); extern void func_strcpy(void); extern void func_strlen(void); +extern void func_strnlen(void); +extern void func_strtoul(void); +extern void func_wcsnlen(void); extern void func_wcstombs(void); +extern void func_wcstoul(void); extern void func_static_construct(void); extern void func_static_init(void); @@ -26,9 +34,13 @@ { "_vsnprintf", func__vsnprintf }, { "_vsnwprintf", func__vsnwprintf }, { "mbstowcs", func_mbstowcs }, + { "_snprintf", func__snprintf }, + { "_snwprintf", func__snwprintf }, { "sprintf", func_sprintf }, { "strcpy", func_strcpy }, { "strlen", func_strlen }, + { "strtoul", func_strtoul }, + { "wcstoul", func_wcstoul }, { "wcstombs", func_wcstombs }, #if defined(TEST_CRTDLL) || defined(TEST_MSVCRT) || defined(TEST_STATIC_CRT) // ... Added: trunk/rostests/apitests/crt/wcstoul.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/wcstoul.c?re… ============================================================================== --- trunk/rostests/apitests/crt/wcstoul.c (added) +++ trunk/rostests/apitests/crt/wcstoul.c [iso-8859-1] Mon Dec 28 15:24:47 2015 @@ -0,0 +1,3 @@ +#define _UNICODE +#define func_tcstoul func_wcstoul +#include "tcstoul.h" Propchange: trunk/rostests/apitests/crt/wcstoul.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 70454: [SPEC2DEF] Don't use DATA and PRIVATE together. DATA means no stub function is generated in the import lib, PRIVATE means nothing is generated in the export lib.
by tkreuzer＠svn.reactos.org 28 Dec '15

28 Dec '15

Author: tkreuzer Date: Mon Dec 28 14:42:41 2015 New Revision: 70454 URL: http://svn.reactos.org/svn/reactos?rev=70454&view=rev Log: [SPEC2DEF] Don't use DATA and PRIVATE together. DATA means no stub function is generated in the import lib, PRIVATE means nothing is generated in the export lib. Modified: trunk/reactos/tools/spec2def/spec2def.c Modified: trunk/reactos/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/spec2def/spec2def.c?… ============================================================================== --- trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] Mon Dec 28 14:42:41 2015 @@ -688,12 +688,12 @@ fprintf(fileDest, " NONAME"); } + /* Either PRIVATE or DATA */ if (pexp->uFlags & FL_PRIVATE) { fprintf(fileDest, " PRIVATE"); } - - if (pexp->nCallingConvention == CC_EXTERN) + else if (pexp->nCallingConvention == CC_EXTERN) { fprintf(fileDest, " DATA"); }

1 0

[tkreuzer] 70453: [CRT_APITEST] - Disable a check for crtdll - Fix an MSVC warning
by tkreuzer＠svn.reactos.org 28 Dec '15

28 Dec '15

Author: tkreuzer Date: Mon Dec 28 11:01:03 2015 New Revision: 70453 URL: http://svn.reactos.org/svn/reactos?rev=70453&view=rev Log: [CRT_APITEST] - Disable a check for crtdll - Fix an MSVC warning Modified: trunk/rostests/apitests/crt/sprintf.c trunk/rostests/apitests/crt/strlen.c Modified: trunk/rostests/apitests/crt/sprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/sprintf.c?re… ============================================================================== --- trunk/rostests/apitests/crt/sprintf.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/sprintf.c [iso-8859-1] Mon Dec 28 11:01:03 2015 @@ -14,7 +14,9 @@ #include <ndk/mmfuncs.h> #include <ndk/rtlfuncs.h> -#ifdef __GNUC__ +#ifdef _MSC_VER +#pragma warning(disable:4778) // unterminated format string '%' +#else #pragma GCC diagnostic ignored "-Wformat" #pragma GCC diagnostic ignored "-Wformat-zero-length" #pragma GCC diagnostic ignored "-Wnonnull" @@ -177,7 +179,7 @@ Length = sprintf(Buffer, "%.4s", "hello"); ok_str(Buffer, "hell"); ok_int(Length, 4); - + StartSeh() Length = sprintf(Buffer, "%.*s", -1, "hello"); #ifdef TEST_USER32 Modified: trunk/rostests/apitests/crt/strlen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/strlen.c?rev… ============================================================================== --- trunk/rostests/apitests/crt/strlen.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/strlen.c [iso-8859-1] Mon Dec 28 11:01:03 2015 @@ -52,11 +52,14 @@ ok((eflags & EFLAGS_DF) != 0, "Direction flag in ELFAGS was changed."); /* Only test this for the exported versions, intrinsics might do it - differently. It's up to us to not do fishy stuff! */ + differently. It's up to us to not do fishy stuff! Also crtdll does + not do it like this. */ +#ifndef TEST_CRTDLL if (pstrlen == strlen) { ok(len == 8, "Should not have gone backwards (got len %i)", (int)len); } +#endif // TEST_CRTDLL #endif }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs