From ab1866be521f342b48a5ab83a7442d0f6e293365 Mon Sep 17 00:00:00 2001
From: Francois Gouget <fgouget@free.fr>
Date: Mon, 6 Sep 2004 21:26:57 +0000
Subject: [PATCH] Test some more ntdll types. tests.dat: Remove types that
 don't exist, whether in the Windows or Wine headers.

---
 dlls/ntdll/tests/generated.c | 31 +++++++++++++++++++++++++++++++
 tools/winapi/tests.dat       | 11 +++++------
 2 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/dlls/ntdll/tests/generated.c b/dlls/ntdll/tests/generated.c
index d5925eed87..7ca73796d5 100644
--- a/dlls/ntdll/tests/generated.c
+++ b/dlls/ntdll/tests/generated.c
@@ -1559,6 +1559,13 @@ static void test_pack_PSYSTEM_AUDIT_ACE(void)
     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 */
@@ -1566,6 +1573,13 @@ static void test_pack_PTOKEN_PRIVILEGES(void)
     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 */
@@ -2080,6 +2094,13 @@ static void test_pack_PPOINT(void)
     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 */
@@ -2114,6 +2135,12 @@ static void test_pack_PSIZE(void)
     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) */
@@ -2366,6 +2393,7 @@ static void test_pack(void)
     test_pack_POINTL();
     test_pack_POINTS();
     test_pack_PPOINT();
+    test_pack_PPOINTL();
     test_pack_PPOINTS();
     test_pack_PPRIVILEGE_SET();
     test_pack_PRECT();
@@ -2387,7 +2415,10 @@ static void test_pack(void)
     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();
diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat
index f314bb0a60..17b8f82c59 100644
--- a/tools/winapi/tests.dat
+++ b/tools/winapi/tests.dat
@@ -573,6 +573,7 @@ PCRITICAL_SECTION_DEBUG
 PFIBER_START_ROUTINE
 !PFILETIME              # FIXME: 20040821: Mishandled by winapi_test
 PHKEY
+!PLDT_ENTRY             # Architecture dependent
 POFSTRUCT
 POSVERSIONINFOA
 POSVERSIONINFOEXA
@@ -636,7 +637,6 @@ ATOM
 BOOL
 BOOLEAN
 BYTE
-CATCHBUF
 CCHAR
 CHAR
 COLORREF
@@ -718,20 +718,15 @@ LONG64
 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 +808,7 @@ POINT
 POINTL
 POINTS
 PPOINT
+PPOINTL
 PPOINTS
 PPRIVILEGE_SET
 PRECT
@@ -835,7 +831,10 @@ PSIZE
 PSTR
 PSYSTEM_ALARM_ACE
 PSYSTEM_AUDIT_ACE
+PSZ
+PTOKEN_GROUPS
 PTOKEN_PRIVILEGES
+PTOKEN_USER
 PTOP_LEVEL_EXCEPTION_FILTER
 PTSTR
 PULARGE_INTEGER
-- 
2.32.0.93.g670b81a890