From e1b2e7a30f6a30f8df30fae944b260076b892936 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Fri, 28 Sep 2007 17:26:29 +0000 Subject: [PATCH] - header update - add a resource svn path=/trunk/; revision=29284 --- .../ntdd/NtGdiDdCreateDirectDrawObject.c | 1 - .../ntdd/NtGdiDdDeleteDirectDrawObject.c | 11 ------- .../ntdd/NtGdiDdQueryDirectDrawObject.c | 20 ------------ .../w32knapi/ntgdi/NtGdiEngCreatePalette.c | 13 -------- .../w32knapi/ntgdi/NtGdiEnumFontOpen.c | 6 +++- .../w32knapi/ntgdi/NtGdiSetBitmapBits.c | 2 -- .../ntuser/NtUserCountClipboardFormats.c | 2 -- .../ntuser/NtUserFindExistingCursorIcon.c | 7 ++++ .../w32knapi/ntuser/NtUserRedrawWindow.c | 30 ++++++++++++++++++ rostests/apitests/w32knapi/resource.h | 2 ++ .../apitests/w32knapi/resource/system.ico | Bin 0 -> 29926 bytes rostests/apitests/w32knapi/testlist.c | 6 +++- rostests/apitests/w32knapi/w32knapi.h | 17 ++++++---- rostests/apitests/w32knapi/w32knapi.rbuild | 2 ++ rostests/apitests/w32knapi/w32knapi.rc | 5 +++ 15 files changed, 66 insertions(+), 58 deletions(-) create mode 100644 rostests/apitests/w32knapi/ntuser/NtUserFindExistingCursorIcon.c create mode 100644 rostests/apitests/w32knapi/ntuser/NtUserRedrawWindow.c create mode 100644 rostests/apitests/w32knapi/resource.h create mode 100644 rostests/apitests/w32knapi/resource/system.ico create mode 100644 rostests/apitests/w32knapi/w32knapi.rc diff --git a/rostests/apitests/w32knapi/ntdd/NtGdiDdCreateDirectDrawObject.c b/rostests/apitests/w32knapi/ntdd/NtGdiDdCreateDirectDrawObject.c index 6a0be8f626c..928a6399121 100644 --- a/rostests/apitests/w32knapi/ntdd/NtGdiDdCreateDirectDrawObject.c +++ b/rostests/apitests/w32knapi/ntdd/NtGdiDdCreateDirectDrawObject.c @@ -1,4 +1,3 @@ -#include "../w32knapi.h" INT Test_NtGdiDdCreateDirectDrawObject(PTESTINFO pti) diff --git a/rostests/apitests/w32knapi/ntdd/NtGdiDdDeleteDirectDrawObject.c b/rostests/apitests/w32knapi/ntdd/NtGdiDdDeleteDirectDrawObject.c index f6dd63c492e..fb26f79ba8e 100644 --- a/rostests/apitests/w32knapi/ntdd/NtGdiDdDeleteDirectDrawObject.c +++ b/rostests/apitests/w32knapi/ntdd/NtGdiDdDeleteDirectDrawObject.c @@ -1,14 +1,3 @@ -#include "../w32knapi.h" - -W32KAPI -BOOL -APIENTRY -NtGdiDdDeleteDirectDrawObject( - HANDLE hDirectDrawLocal -) -{ - return (BOOL)Syscall(L"NtGdiDdDeleteDirectDrawObject", 1, &hDirectDrawLocal); -} INT Test_NtGdiDdDeleteDirectDrawObject(PTESTINFO pti) diff --git a/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c b/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c index 5c880472c1e..b7873108651 100644 --- a/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c +++ b/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c @@ -1,23 +1,3 @@ -#include "../w32knapi.h" - -W32KAPI -BOOL STDCALL -NtGdiDdQueryDirectDrawObject( - HANDLE hDirectDrawLocal, - DD_HALINFO *pHalInfo, - DWORD *pCallBackFlags, - LPD3DNTHAL_CALLBACKS puD3dCallbacks, - LPD3DNTHAL_GLOBALDRIVERDATA puD3dDriverData, - PDD_D3DBUFCALLBACKS puD3dBufferCallbacks, - LPDDSURFACEDESC puD3dTextureFormats, - DWORD *puNumHeaps, - VIDEOMEMORY *puvmList, - DWORD *puNumFourCC, - DWORD *puFourCC -) -{ - return (BOOL)Syscall(L"NtGdiDdQueryDirectDrawObject", 11, &hDirectDrawLocal); -} INT Test_NtGdiDdQueryDirectDrawObject(PTESTINFO pti) diff --git a/rostests/apitests/w32knapi/ntgdi/NtGdiEngCreatePalette.c b/rostests/apitests/w32knapi/ntgdi/NtGdiEngCreatePalette.c index 015367f8d80..52ebe973820 100644 --- a/rostests/apitests/w32knapi/ntgdi/NtGdiEngCreatePalette.c +++ b/rostests/apitests/w32knapi/ntgdi/NtGdiEngCreatePalette.c @@ -1,17 +1,4 @@ -HPALETTE -APIENTRY -NtGdiEngCreatePalette( - IN ULONG iMode, - IN ULONG cColors, - IN ULONG *pulColors, - IN FLONG flRed, - IN FLONG flGreen, - IN FLONG flBlue) -{ - return (HPALETTE)Syscall(L"NtGdiEngCreatePalette", 6, &iMode); -} - INT Test_NtGdiEngCreatePalette(PTESTINFO pti) { diff --git a/rostests/apitests/w32knapi/ntgdi/NtGdiEnumFontOpen.c b/rostests/apitests/w32knapi/ntgdi/NtGdiEnumFontOpen.c index 659d293a787..3ef0d01134e 100644 --- a/rostests/apitests/w32knapi/ntgdi/NtGdiEnumFontOpen.c +++ b/rostests/apitests/w32knapi/ntgdi/NtGdiEnumFontOpen.c @@ -25,7 +25,11 @@ Test_NtGdiEnumFontOpen(PTESTINFO pti) /* We should not be able to use DeleteObject() on the handle */ TEST(DeleteObject((HGDIOBJ)idEnum) == FALSE); - // FIXME: Close the enum handle + NtGdiEnumFontClose(idEnum); + + // Test no logfont (NULL): should word + // Test empty lfFaceName string: should not work + return APISTATUS_NORMAL; } diff --git a/rostests/apitests/w32knapi/ntgdi/NtGdiSetBitmapBits.c b/rostests/apitests/w32knapi/ntgdi/NtGdiSetBitmapBits.c index 1da1e2a8a85..153e21bc740 100644 --- a/rostests/apitests/w32knapi/ntgdi/NtGdiSetBitmapBits.c +++ b/rostests/apitests/w32knapi/ntgdi/NtGdiSetBitmapBits.c @@ -1,5 +1,3 @@ -#include "../w32knapi.h" - INT Test_NtGdiSetBitmapBits(PTESTINFO pti) { diff --git a/rostests/apitests/w32knapi/ntuser/NtUserCountClipboardFormats.c b/rostests/apitests/w32knapi/ntuser/NtUserCountClipboardFormats.c index 55375b2428f..10600a315c8 100644 --- a/rostests/apitests/w32knapi/ntuser/NtUserCountClipboardFormats.c +++ b/rostests/apitests/w32knapi/ntuser/NtUserCountClipboardFormats.c @@ -1,5 +1,3 @@ -#include "../w32knapi.h" - /* First the call stub */ DWORD STDCALL NtUserCountClipboardFormats(VOID) diff --git a/rostests/apitests/w32knapi/ntuser/NtUserFindExistingCursorIcon.c b/rostests/apitests/w32knapi/ntuser/NtUserFindExistingCursorIcon.c new file mode 100644 index 00000000000..aa0ac166f19 --- /dev/null +++ b/rostests/apitests/w32knapi/ntuser/NtUserFindExistingCursorIcon.c @@ -0,0 +1,7 @@ +INT +Test_NtUserFindExistingCursoricon(PTESTINFO pti) +{ + + return APISTATUS_NORMAL; +} + diff --git a/rostests/apitests/w32knapi/ntuser/NtUserRedrawWindow.c b/rostests/apitests/w32knapi/ntuser/NtUserRedrawWindow.c new file mode 100644 index 00000000000..6b288d277c3 --- /dev/null +++ b/rostests/apitests/w32knapi/ntuser/NtUserRedrawWindow.c @@ -0,0 +1,30 @@ +INT +Test_NtUserRedrawWindow(PTESTINFO pti) +{ + HWND hWnd; + RECT rect; + + hWnd = CreateWindowA("BUTTON", + "Test", + BS_PUSHBUTTON | WS_VISIBLE, + 0, + 0, + 50, + 30, + NULL, + NULL, + g_hInstance, + 0); + ASSERT(hWnd); + + rect.left = 0; + rect.top = 0; + rect.right = 10; + rect.bottom = 10; + + TEST(NtUserRedrawWindow(hWnd, &rect, NULL, RDW_VALIDATE) == TRUE); + + DestroyWindow(hWnd); + + return APISTATUS_NORMAL; +} diff --git a/rostests/apitests/w32knapi/resource.h b/rostests/apitests/w32knapi/resource.h new file mode 100644 index 00000000000..112444db17d --- /dev/null +++ b/rostests/apitests/w32knapi/resource.h @@ -0,0 +1,2 @@ + +#define IDI_ICON 1000 diff --git a/rostests/apitests/w32knapi/resource/system.ico b/rostests/apitests/w32knapi/resource/system.ico new file mode 100644 index 0000000000000000000000000000000000000000..2d8f32231876693215bd45c8337bda2995625556 GIT binary patch literal 29926 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 literal 0 HcmV?d00001 diff --git a/rostests/apitests/w32knapi/testlist.c b/rostests/apitests/w32knapi/testlist.c index b0ab9b7a81e..6df97ca8512 100644 --- a/rostests/apitests/w32knapi/testlist.c +++ b/rostests/apitests/w32knapi/testlist.c @@ -20,6 +20,8 @@ #include "ntgdi/NtGdiGetDIBits.c" #include "ntuser/NtUserCountClipboardFormats.c" +#include "ntuser/NtUserFindExistingCursorIcon.c" +#include "ntuser/NtUserRedrawWindow.c" /* The List of tests */ TESTENTRY TestList[] = @@ -44,7 +46,9 @@ TESTENTRY TestList[] = { L"NtGdiGetDIBitsInternal", Test_NtGdiGetDIBitsInternal }, /* ntuser */ - { L"NtUserCountClipboardFormats", Test_NtUserCountClipboardFormats } + { L"NtUserCountClipboardFormats", Test_NtUserCountClipboardFormats }, + { L"NtUserFindExistingCursorIcon", Test_NtUserFindExistingCursoricon }, + { L"NtUserRedrawWindow", Test_NtUserRedrawWindow } }; /* The function that gives us the number of tests */ diff --git a/rostests/apitests/w32knapi/w32knapi.h b/rostests/apitests/w32knapi/w32knapi.h index 2404b3d0312..cf29efc94a5 100644 --- a/rostests/apitests/w32knapi/w32knapi.h +++ b/rostests/apitests/w32knapi/w32knapi.h @@ -1,26 +1,29 @@ #ifndef _W32KNAPI_H #define _W32KNAPI_H -#define WIN32_NO_STATUS +/* SDK/NDK Headers */ #define NTOS_MODE_USER -#define WINVER 0x501 - +#define WIN32_NO_STATUS #include +#include +#include +#include +#include #include #include -#include #include #include /* Public Win32K Headers */ -#include #include +#include +#include #include +#include #include -#include - #include "../apitest.h" +#include "resource.h" typedef struct { diff --git a/rostests/apitests/w32knapi/w32knapi.rbuild b/rostests/apitests/w32knapi/w32knapi.rbuild index c6f2c34a126..de8058e0c3d 100644 --- a/rostests/apitests/w32knapi/w32knapi.rbuild +++ b/rostests/apitests/w32knapi/w32knapi.rbuild @@ -2,6 +2,7 @@ . 0x0501 + 0x501 apitest kernel32 user32 @@ -10,4 +11,5 @@ w32kdll w32knapi.c testlist.c + w32knapi.rc diff --git a/rostests/apitests/w32knapi/w32knapi.rc b/rostests/apitests/w32knapi/w32knapi.rc new file mode 100644 index 00000000000..d3cc13e3410 --- /dev/null +++ b/rostests/apitests/w32knapi/w32knapi.rc @@ -0,0 +1,5 @@ +#include +#include "resource.h" + +IDI_ICON ICON "resource/system.ico" +