From 2545e830845a92035d3f4050a960f118f1d0251e Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Sat, 8 May 2010 16:38:05 +0000 Subject: [PATCH] [w32knapi} Patch by Jerome Gardou: add some more tests for NtGdiDeleteObjectApp svn path=/trunk/; revision=47130 --- .../w32knapi/ntgdi/NtGdiCreateCompatibleDC.c | 2 ++ .../w32knapi/ntgdi/NtGdiDeleteObjectApp.c | 22 ++++++++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/rostests/apitests/w32knapi/ntgdi/NtGdiCreateCompatibleDC.c b/rostests/apitests/w32knapi/ntgdi/NtGdiCreateCompatibleDC.c index 3597eb67dca..130e1005bd1 100644 --- a/rostests/apitests/w32knapi/ntgdi/NtGdiCreateCompatibleDC.c +++ b/rostests/apitests/w32knapi/ntgdi/NtGdiCreateCompatibleDC.c @@ -21,6 +21,8 @@ Test_NtGdiCreateCompatibleDC(PTESTINFO pti) /* The default pen should be GetStockObject(BLACK_PEN) */ hObj = SelectObject(hDC, GetStockObject(WHITE_PEN)); TEST(hObj == GetStockObject(BLACK_PEN)); + + TEST(NtGdiDeleteObjectApp(hDC) != 0); TEST(NtGdiDeleteObjectApp(hDC) != 0); diff --git a/rostests/apitests/w32knapi/ntgdi/NtGdiDeleteObjectApp.c b/rostests/apitests/w32knapi/ntgdi/NtGdiDeleteObjectApp.c index 0084b109a9a..53d8d251b1a 100644 --- a/rostests/apitests/w32knapi/ntgdi/NtGdiDeleteObjectApp.c +++ b/rostests/apitests/w32knapi/ntgdi/NtGdiDeleteObjectApp.c @@ -23,7 +23,27 @@ Test_NtGdiDeleteObjectApp(PTESTINFO pti) TEST(NtGdiDeleteObjectApp(hdc) == 1); TEST(GetLastError() == 0); TEST(IsHandleValid(hdc) == 0); - + + /* Delete a display DC */ + SetLastError(0); + hdc = CreateDC("DISPLAY", NULL, NULL, NULL); + ASSERT(IsHandleValid(hdc) == 1); + TEST(NtGdiDeleteObjectApp(hdc) != 0); + TEST(GetLastError() == 0); + TEST(IsHandleValid(hdc) == 1); + TEST(SelectObject(hdc, GetStockObject(WHITE_PEN)) == NULL); + TESTX(GetLastError() == ERROR_INVALID_PARAMETER, "GetLasterror returned 0x%08x\n", (unsigned int)GetLastError()); + + /* Once more */ + SetLastError(0); + hdc = GetDC(0); + ASSERT(IsHandleValid(hdc) == 1); + TEST(NtGdiDeleteObjectApp(hdc) != 0); + TEST(GetLastError() == 0); + TEST(IsHandleValid(hdc) == 1); + TEST(SelectObject(hdc, GetStockObject(WHITE_PEN)) == NULL); + TESTX(GetLastError() == ERROR_INVALID_PARAMETER, "GetLasterror returned 0x%08x\n", (unsigned int)GetLastError()); + /* Delete a display DC */ SetLastError(0); hdc = CreateDC("DISPLAY", NULL, NULL, NULL); -- 2.17.1