[ros-diffs] [tkreuzer] 28890: - use NtDd api directly instead of using old syscall function. - remove some old definitions - fix build to make Wax happy

Author: tkreuzer
Date: Thu Sep  6 04:42:51 2007
New Revision: 28890

URL: http://svn.reactos.org/svn/reactos?rev=28890&view=rev
Log:
- use NtDd api directly instead of using old syscall function.
- remove some old definitions
- fix build to make Wax happy

Modified:
    trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdCreateDirectDrawObject.c
    trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEngCreatePalette.c
    trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEnumFontOpen.c
    trunk/rostests/apitests/w32knapi/w32knapi.h

Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdCreateDirectDrawObject.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntdd/Nt…
==============================================================================
--- trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdCreateDirectDrawObject.c (original)
+++ trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdCreateDirectDrawObject.c Thu Sep  6
04:42:51 2007
@@ -13,7 +13,7 @@
 
 	/* Cleanup ReactX setup */
 	DeleteDC(hdc);
-	Syscall(L"NtGdiDdDeleteDirectDrawObject", 1, &hDirectDraw);
+	NtGdiDdDeleteDirectDrawObject(hDirectDraw);
 
 	return APISTATUS_NORMAL;
 }

Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEngCreatePalette.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N…
==============================================================================
--- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEngCreatePalette.c (original)
+++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEngCreatePalette.c Thu Sep  6 04:42:51
2007
@@ -25,7 +25,7 @@
 	TEST(GDI_HANDLE_GET_TYPE(hPal) == GDI_OBJECT_TYPE_PALETTE);
 	pEntry = &GdiHandleTable[GDI_HANDLE_GET_INDEX(hPal)];
 	TEST(pEntry->KernelData != NULL);
-	TEST(pEntry->ProcessId == (HANDLE)GetCurrentProcessId());
+	TEST(pEntry->ProcessId == GetCurrentProcessId());
 	TEST(pEntry->UserData == 0);
 	TEST(pEntry->Type == (((UINT)hPal >> 16) | GDI_OBJECT_TYPE_PALETTE));
 

Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEnumFontOpen.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N…
==============================================================================
--- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEnumFontOpen.c (original)
+++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEnumFontOpen.c Thu Sep  6 04:42:51 2007
@@ -1,3 +1,4 @@
+
 INT
 Test_NtGdiEnumFontOpen(PTESTINFO pti)
 {
@@ -17,7 +18,7 @@
 	TEST(GDI_HANDLE_GET_TYPE(idEnum) == GDI_OBJECT_TYPE_ENUMFONT);
 	pEntry = &GdiHandleTable[GDI_HANDLE_GET_INDEX(idEnum)];
 	TEST(pEntry->KernelData != NULL);
-	TEST(pEntry->ProcessId == (HANDLE)GetCurrentProcessId());
+	TEST(pEntry->ProcessId == GetCurrentProcessId());
 	TEST(pEntry->UserData == 0);
 	TEST(pEntry->Type == ((idEnum >> 16) | GDI_OBJECT_TYPE_ENUMFONT));
 

Modified: trunk/rostests/apitests/w32knapi/w32knapi.h
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/w32knap…
==============================================================================
--- trunk/rostests/apitests/w32knapi/w32knapi.h (original)
+++ trunk/rostests/apitests/w32knapi/w32knapi.h Thu Sep  6 04:42:51 2007
@@ -22,10 +22,6 @@
 
 #include "../apitest.h"
 
-#define OS_UNSUPPORTED 0
-#define OS_REACTOS	1
-#define OS_WINDOWS	2
-
 typedef struct
 {
 	LPWSTR lpszFunction;