[greatlrd] 33680: implemeted test for GdiConvertBitmap, GdiConvertBrush, GdiConvertDC, GdiConvertFont, GdiConvertPalette, GdiConvertRegion, GdiGetLocalBrush, GdiGetLocalDC tested in xp/vista/reactos and works no fault report.
Author: greatlrd Date: Sat May 24 17:20:31 2008 New Revision: 33680
URL: http://svn.reactos.org/svn/reactos?rev=33680&view=rev Log: implemeted test for GdiConvertBitmap, GdiConvertBrush, GdiConvertDC, GdiConvertFont, GdiConvertPalette, GdiConvertRegion, GdiGetLocalBrush, GdiGetLocalDC tested in xp/vista/reactos and works no fault report.
Added: trunk/rostests/apitests/gdi32api/tests/GdiConvertBitmap.c (with props) trunk/rostests/apitests/gdi32api/tests/GdiConvertBrush.c (with props) trunk/rostests/apitests/gdi32api/tests/GdiConvertDC.c (with props) trunk/rostests/apitests/gdi32api/tests/GdiConvertFont.c (with props) trunk/rostests/apitests/gdi32api/tests/GdiConvertPalette.c (with props) trunk/rostests/apitests/gdi32api/tests/GdiConvertRegion.c (with props) trunk/rostests/apitests/gdi32api/tests/GdiGetLocalBrush.c (with props) trunk/rostests/apitests/gdi32api/tests/GdiGetLocalDC.c (with props) Modified: trunk/rostests/apitests/gdi32api/gdi.h trunk/rostests/apitests/gdi32api/testlist.c
Modified: trunk/rostests/apitests/gdi32api/gdi.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/gdi.h?re... ============================================================================== --- trunk/rostests/apitests/gdi32api/gdi.h [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32api/gdi.h [iso-8859-1] Sat May 24 17:20:31 2008 @@ -200,4 +200,14 @@ // RECT VisRectRegion; // 1b8 } DC_ATTR, *PDC_ATTR;
- +HDC WINAPI GdiConvertBitmap(HDC hdc); +HBRUSH WINAPI GdiConvertBrush(HBRUSH hbr); +HDC WINAPI GdiConvertDC(HDC hdc); +HFONT WINAPI GdiConvertFont(HFONT hfont); +HPALETTE WINAPI GdiConvertPalette(HPALETTE hpal); +HRGN WINAPI GdiConvertRegion(HRGN hregion); +HBRUSH WINAPI GdiGetLocalBrush(HBRUSH hbr); +HDC WINAPI GdiGetLocalDC(HDC hdc); + + +
Modified: trunk/rostests/apitests/gdi32api/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/testlist... ============================================================================== --- trunk/rostests/apitests/gdi32api/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32api/testlist.c [iso-8859-1] Sat May 24 17:20:31 2008 @@ -12,15 +12,29 @@ #include "tests/CreatePen.c" #include "tests/CreateRectRgn.c" #include "tests/ExtCreatePen.c" +#include "tests/GdiConvertBitmap.c" +#include "tests/GdiConvertBrush.c" +#include "tests/GdiConvertDC.c" +#include "tests/GdiConvertFont.c" +#include "tests/GdiConvertPalette.c" +#include "tests/GdiConvertRegion.c" +#include "tests/GdiGetLocalBrush.c" +#include "tests/GdiGetLocalDC.c" #include "tests/GetClipRgn.c" #include "tests/GetCurrentObject.c" +#include "tests/GetDIBits.c" #include "tests/GetObject.c" #include "tests/GetStockObject.c" -#include "tests/GetDIBits.c" #include "tests/SelectObject.c" #include "tests/SetDCPenColor.c" #include "tests/SetSysColors.c" #include "tests/SetWorldTransform.c" + + + + + +
@@ -29,20 +43,28 @@ { { L"AddFontResourceA", Test_AddFontResourceA }, { L"AddFontResourceEx", Test_AddFontResourceEx }, - { L"CreateBitmapIndirect", Test_CreateBitmapIndirect }, + { L"CreateBitmapIndirect", Test_CreateBitmapIndirect }, { L"CreateCompatibleDC", Test_CreateCompatibleDC }, { L"CreateFont", Test_CreateFont }, { L"CreatePen", Test_CreatePen }, { L"CreateRectRgn", Test_CreateRectRgn }, { L"ExtCreatePen", Test_ExtCreatePen }, + { L"GdiConvertBitmap", Test_GdiConvertBitmap }, + { L"GdiConvertBrush", Test_GdiConvertBrush }, + { L"GdiConvertBrush", Test_GdiConvertDC }, + { L"GdiConvertFont", Test_GdiConvertFont }, + { L"GdiConvertPalette", Test_GdiConvertPalette }, + { L"GdiConvertRegion", Test_GdiConvertRegion }, + { L"GdiGetLocalBrush", Test_GdiGetLocalBrush }, + { L"GdiGetLocalDC", Test_GdiGetLocalDC }, { L"GetClipRgn", Test_GetClipRgn }, { L"GetCurrentObject", Test_GetCurrentObject }, + { L"GetDIBits", Test_GetDIBits }, { L"GetObject", Test_GetObject }, { L"GetStockObject", Test_GetStockObject }, - { L"GetDIBits", Test_GetDIBits }, - { L"SetSysColors", Test_SetSysColors }, { L"SelectObject", Test_SelectObject }, { L"SetDCPenColor", Test_SetDCPenColor }, + { L"SetSysColors", Test_SetSysColors }, { L"SetWorldTransform", Test_SetWorldTransform }, };
Added: trunk/rostests/apitests/gdi32api/tests/GdiConvertBitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/Gd... ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GdiConvertBitmap.c (added) +++ trunk/rostests/apitests/gdi32api/tests/GdiConvertBitmap.c [iso-8859-1] Sat May 24 17:20:31 2008 @@ -1,0 +1,10 @@ +INT +Test_GdiConvertBitmap(PTESTINFO pti) +{ + RTEST(GdiConvertBitmap((HDC)-1) == (HDC)-1); + RTEST(GdiConvertBitmap((HDC)0) == (HDC)0); + RTEST(GdiConvertBitmap((HDC)1) == (HDC)1); + RTEST(GdiConvertBitmap((HDC)2) == (HDC)2); + return APISTATUS_NORMAL; +} +
Propchange: trunk/rostests/apitests/gdi32api/tests/GdiConvertBitmap.c ------------------------------------------------------------------------------ svn:eol-style = native
Added: trunk/rostests/apitests/gdi32api/tests/GdiConvertBrush.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/Gd... ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GdiConvertBrush.c (added) +++ trunk/rostests/apitests/gdi32api/tests/GdiConvertBrush.c [iso-8859-1] Sat May 24 17:20:31 2008 @@ -1,0 +1,9 @@ +INT +Test_GdiConvertBrush(PTESTINFO pti) +{ + RTEST(GdiConvertBrush((HBRUSH)-1) == (HBRUSH)-1); + RTEST(GdiConvertBrush((HBRUSH)0) == (HBRUSH)0); + RTEST(GdiConvertBrush((HBRUSH)1) == (HBRUSH)1); + RTEST(GdiConvertBrush((HBRUSH)2) == (HBRUSH)2); + return APISTATUS_NORMAL; +}
Propchange: trunk/rostests/apitests/gdi32api/tests/GdiConvertBrush.c ------------------------------------------------------------------------------ svn:eol-style = native
Added: trunk/rostests/apitests/gdi32api/tests/GdiConvertDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/Gd... ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GdiConvertDC.c (added) +++ trunk/rostests/apitests/gdi32api/tests/GdiConvertDC.c [iso-8859-1] Sat May 24 17:20:31 2008 @@ -1,0 +1,10 @@ +INT +Test_GdiConvertDC(PTESTINFO pti) +{ + RTEST(GdiConvertDC((HDC)-1) == (HDC)-1); + RTEST(GdiConvertDC((HDC)0) == (HDC)0); + RTEST(GdiConvertDC((HDC)1) == (HDC)1); + RTEST(GdiConvertDC((HDC)2) == (HDC)2); + return APISTATUS_NORMAL; +} +
Propchange: trunk/rostests/apitests/gdi32api/tests/GdiConvertDC.c ------------------------------------------------------------------------------ svn:eol-style = native
Added: trunk/rostests/apitests/gdi32api/tests/GdiConvertFont.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/Gd... ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GdiConvertFont.c (added) +++ trunk/rostests/apitests/gdi32api/tests/GdiConvertFont.c [iso-8859-1] Sat May 24 17:20:31 2008 @@ -1,0 +1,9 @@ +INT +Test_GdiConvertFont(PTESTINFO pti) +{ + RTEST(GdiConvertFont((HFONT)-1) == (HFONT)-1); + RTEST(GdiConvertFont((HFONT)0) == (HFONT)0); + RTEST(GdiConvertFont((HFONT)1) == (HFONT)1); + RTEST(GdiConvertFont((HFONT)2) == (HFONT)2); + return APISTATUS_NORMAL; +}
Propchange: trunk/rostests/apitests/gdi32api/tests/GdiConvertFont.c ------------------------------------------------------------------------------ svn:eol-style = native
Added: trunk/rostests/apitests/gdi32api/tests/GdiConvertPalette.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/Gd... ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GdiConvertPalette.c (added) +++ trunk/rostests/apitests/gdi32api/tests/GdiConvertPalette.c [iso-8859-1] Sat May 24 17:20:31 2008 @@ -1,0 +1,9 @@ +INT +Test_GdiConvertPalette(PTESTINFO pti) +{ + RTEST(GdiConvertPalette((HPALETTE)-1) == (HPALETTE)-1); + RTEST(GdiConvertPalette((HPALETTE)0) == (HPALETTE)0); + RTEST(GdiConvertPalette((HPALETTE)1) == (HPALETTE)1); + RTEST(GdiConvertPalette((HPALETTE)2) == (HPALETTE)2); + return APISTATUS_NORMAL; +}
Propchange: trunk/rostests/apitests/gdi32api/tests/GdiConvertPalette.c ------------------------------------------------------------------------------ svn:eol-style = native
Added: trunk/rostests/apitests/gdi32api/tests/GdiConvertRegion.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/Gd... ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GdiConvertRegion.c (added) +++ trunk/rostests/apitests/gdi32api/tests/GdiConvertRegion.c [iso-8859-1] Sat May 24 17:20:31 2008 @@ -1,0 +1,12 @@ +INT +Test_GdiConvertRegion(PTESTINFO pti) +{ + RTEST(GdiConvertRegion((HRGN)-1) == (HRGN)-1); + RTEST(GdiConvertRegion((HRGN)0) == (HRGN)0); + RTEST(GdiConvertRegion((HRGN)1) == (HRGN)1); + RTEST(GdiConvertRegion((HRGN)2) == (HRGN)2); + RTEST(GdiConvertRegion((HRGN)3) == (HRGN)3); + RTEST(GdiConvertRegion((HRGN)4) == (HRGN)4); + return APISTATUS_NORMAL; +} +
Propchange: trunk/rostests/apitests/gdi32api/tests/GdiConvertRegion.c ------------------------------------------------------------------------------ svn:eol-style = native
Added: trunk/rostests/apitests/gdi32api/tests/GdiGetLocalBrush.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/Gd... ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GdiGetLocalBrush.c (added) +++ trunk/rostests/apitests/gdi32api/tests/GdiGetLocalBrush.c [iso-8859-1] Sat May 24 17:20:31 2008 @@ -1,0 +1,11 @@ +INT +Test_GdiGetLocalBrush(PTESTINFO pti) +{ + RTEST(GdiGetLocalBrush((HBRUSH)-1) == (HBRUSH)-1); + RTEST(GdiGetLocalBrush((HBRUSH)0) == (HBRUSH)0); + RTEST(GdiGetLocalBrush((HBRUSH)1) == (HBRUSH)1); + RTEST(GdiGetLocalBrush((HBRUSH)2) == (HBRUSH)2); + RTEST(GdiGetLocalBrush((HBRUSH)3) == (HBRUSH)3); + RTEST(GdiGetLocalBrush((HBRUSH)4) == (HBRUSH)4); + return APISTATUS_NORMAL; +}
Propchange: trunk/rostests/apitests/gdi32api/tests/GdiGetLocalBrush.c ------------------------------------------------------------------------------ svn:eol-style = native
Added: trunk/rostests/apitests/gdi32api/tests/GdiGetLocalDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/Gd... ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GdiGetLocalDC.c (added) +++ trunk/rostests/apitests/gdi32api/tests/GdiGetLocalDC.c [iso-8859-1] Sat May 24 17:20:31 2008 @@ -1,0 +1,11 @@ +INT +Test_GdiGetLocalDC(PTESTINFO pti) +{ + RTEST(GdiGetLocalDC((HDC)-1) == (HDC)-1); + RTEST(GdiGetLocalDC((HDC)0) == (HDC)0); + RTEST(GdiGetLocalDC((HDC)1) == (HDC)1); + RTEST(GdiGetLocalDC((HDC)2) == (HDC)2); + RTEST(GdiGetLocalDC((HDC)3) == (HDC)3); + RTEST(GdiGetLocalDC((HDC)4) == (HDC)4); + return APISTATUS_NORMAL; +}
Propchange: trunk/rostests/apitests/gdi32api/tests/GdiGetLocalDC.c ------------------------------------------------------------------------------ svn:eol-style = native
-
greatlrd＠svn.reactos.org