Test some more ntdll types

Francois Gouget fgouget at free.fr
Mon Sep 6 07:46:45 CDT 2004


These tests compile and run successfully with the Windows headers.


Changelog:

 * dlls/ntdll/tests/generated.c
   tools/winapi/tests.dat

   Test some more ntdll types.
   tests.dat: Remove types that don't exist, whether in the Windows or
Wine headers.

-- 
Francois Gouget         fgouget at free.fr        http://fgouget.free.fr/
                     Linux: the choice of a GNU generation
-------------- next part --------------
Index: dlls/ntdll/tests/generated.c
===================================================================
RCS file: /var/cvs/wine/dlls/ntdll/tests/generated.c,v
retrieving revision 1.19
diff -u -r1.19 generated.c
--- dlls/ntdll/tests/generated.c	1 Sep 2004 04:53:36 -0000	1.19
+++ dlls/ntdll/tests/generated.c	6 Sep 2004 11:28:35 -0000
@@ -1555,6 +1559,13 @@
     TEST_TYPE_POINTER(PSYSTEM_AUDIT_ACE, 12, 4);
 }
 
+static void test_pack_PTOKEN_GROUPS(void)
+{
+    /* PTOKEN_GROUPS */
+    TEST_TYPE(PTOKEN_GROUPS, 4, 4);
+    TEST_TYPE_POINTER(PTOKEN_GROUPS, 12, 4);
+}
+
 static void test_pack_PTOKEN_PRIVILEGES(void)
 {
     /* PTOKEN_PRIVILEGES */
@@ -1562,6 +1573,13 @@
     TEST_TYPE_POINTER(PTOKEN_PRIVILEGES, 16, 4);
 }
 
+static void test_pack_PTOKEN_USER(void)
+{
+    /* PTOKEN_USER */
+    TEST_TYPE(PTOKEN_USER, 4, 4);
+    TEST_TYPE_POINTER(PTOKEN_USER, 8, 4);
+}
+
 static void test_pack_PTOP_LEVEL_EXCEPTION_FILTER(void)
 {
     /* PTOP_LEVEL_EXCEPTION_FILTER */
@@ -2076,6 +2094,13 @@
     TEST_TYPE_POINTER(PPOINT, 8, 4);
 }
 
+static void test_pack_PPOINTL(void)
+{
+    /* PPOINTL */
+    TEST_TYPE(PPOINTL, 4, 4);
+    TEST_TYPE_POINTER(PPOINTL, 8, 4);
+}
+
 static void test_pack_PPOINTS(void)
 {
     /* PPOINTS */
@@ -2110,6 +2135,12 @@
     TEST_TYPE_POINTER(PSIZE, 8, 4);
 }
 
+static void test_pack_PSZ(void)
+{
+    /* PSZ */
+    TEST_TYPE(PSZ, 4, 4);
+}
+
 static void test_pack_RECT(void)
 {
     /* RECT (pack 4) */
@@ -2362,6 +2393,7 @@
     test_pack_POINTL();
     test_pack_POINTS();
     test_pack_PPOINT();
+    test_pack_PPOINTL();
     test_pack_PPOINTS();
     test_pack_PPRIVILEGE_SET();
     test_pack_PRECT();
@@ -2383,7 +2415,10 @@
     test_pack_PSTR();
     test_pack_PSYSTEM_ALARM_ACE();
     test_pack_PSYSTEM_AUDIT_ACE();
+    test_pack_PSZ();
+    test_pack_PTOKEN_GROUPS();
     test_pack_PTOKEN_PRIVILEGES();
+    test_pack_PTOKEN_USER();
     test_pack_PTOP_LEVEL_EXCEPTION_FILTER();
     test_pack_PTSTR();
     test_pack_PULARGE_INTEGER();
Index: tools/winapi/tests.dat
===================================================================
RCS file: /var/cvs/wine/tools/winapi/tests.dat,v
retrieving revision 1.22
diff -u -r1.22 tests.dat
--- tools/winapi/tests.dat	25 Aug 2004 00:42:50 -0000	1.22
+++ tools/winapi/tests.dat	6 Sep 2004 11:03:48 -0000
@@ -573,6 +581,7 @@
 PFIBER_START_ROUTINE
 !PFILETIME              # FIXME: 20040821: Mishandled by winapi_test
 PHKEY
+!PLDT_ENTRY             # Architecture dependent
 POFSTRUCT
 POSVERSIONINFOA
 POSVERSIONINFOEXA
@@ -636,7 +645,6 @@
 BOOL
 BOOLEAN
 BYTE
-CATCHBUF
 CCHAR
 CHAR
 COLORREF
@@ -718,20 +726,15 @@
 LONGLONG
 LONG_PTR
 LPARAM
-LPCATCHBUF
 LPCRECT
 LPCRECTL
 LPCVOID
-LPLARGE_INTEGER
-LPMEMORY_BASIC_INFORMATION
 LPPOINT
 LPPOINTS
 LPRECT
 LPRECTL
-LPSID_IDENTIFIER_AUTHORITY
 LPSIZE
 LPTOP_LEVEL_EXCEPTION_FILTER
-LPULARGE_INTEGER
 LRESULT
 LUID
 LUID_AND_ATTRIBUTES
@@ -813,6 +816,7 @@
 POINTL
 POINTS
 PPOINT
+PPOINTL
 PPOINTS
 PPRIVILEGE_SET
 PRECT
@@ -835,7 +839,10 @@
 PSTR
 PSYSTEM_ALARM_ACE
 PSYSTEM_AUDIT_ACE
+PSZ
+PTOKEN_GROUPS
 PTOKEN_PRIVILEGES
+PTOKEN_USER
 PTOP_LEVEL_EXCEPTION_FILTER
 PTSTR
 PULARGE_INTEGER


More information about the wine-patches mailing list