winapi_test: Updated so the generated tests work.

diff --git a/dlls/gdi32/tests/generated.c b/dlls/gdi32/tests/generated.c
index 9a35f24070bb69d7eaed7a3d235468a009cdbb9e..632d6420b06215b09ac4de9b6bb572564ba4cd10 100644 (file)
--- a/dlls/gdi32/tests/generated.c
+++ b/dlls/gdi32/tests/generated.c
@@ -1,4 +1,4 @@
-/* File generated automatically from tools/winapi/test.dat; do not edit! */
+/* File generated automatically from tools/winapi/tests.dat; do not edit! */
 /* This file can be copied, modified and distributed without restriction. */
 
 /*

diff --git a/dlls/kernel32/tests/generated.c b/dlls/kernel32/tests/generated.c
index 846d7268a494b4bbcf9bd362d54d2f9cd777a47f..fe1c6c8a6d0935dcafd490b0ce3f6ff4f19c19dd 100644 (file)
--- a/dlls/kernel32/tests/generated.c
+++ b/dlls/kernel32/tests/generated.c
@@ -1,4 +1,4 @@
-/* File generated automatically from tools/winapi/test.dat; do not edit! */
+/* File generated automatically from tools/winapi/tests.dat; do not edit! */
 /* This file can be copied, modified and distributed without restriction. */
 
 /*

diff --git a/dlls/ntdll/tests/generated.c b/dlls/ntdll/tests/generated.c
index 4818c9e50ebca6edf54929ae1c04a76975538d31..c854d5b4daf0a4387fb331cbaa8b8bdeae0cd2c6 100644 (file)
--- a/dlls/ntdll/tests/generated.c
+++ b/dlls/ntdll/tests/generated.c
@@ -1,4 +1,4 @@
-/* File generated automatically from tools/winapi/test.dat; do not edit! */
+/* File generated automatically from tools/winapi/tests.dat; do not edit! */
 /* This file can be copied, modified and distributed without restriction. */
 
 /*

diff --git a/dlls/rpcrt4/tests/generated.c b/dlls/rpcrt4/tests/generated.c
index 609e49cbf25ae475bfb9986dfc0aea222242879b..c5b69a86f0da8da633be66142c3b6d9e2cdeb248 100644 (file)
--- a/dlls/rpcrt4/tests/generated.c
+++ b/dlls/rpcrt4/tests/generated.c
@@ -1,4 +1,4 @@
-/* File generated automatically from tools/winapi/test.dat; do not edit! */
+/* File generated automatically from tools/winapi/tests.dat; do not edit! */
 /* This file can be copied, modified and distributed without restriction. */
 
 /*
@@ -128,7 +128,6 @@ static void test_pack_RPC_STATUS(void)
 {
     /* RPC_STATUS */
     TEST_TYPE(RPC_STATUS, 4, 4);
-    TEST_TYPE_SIGNED(RPC_STATUS);
 }
 
 static void test_pack_PRPC_POLICY(void)
@@ -165,7 +164,7 @@ static void test_pack_RPC_BINDING_VECTOR(void)
 {
     /* RPC_BINDING_VECTOR (pack 4) */
     TEST_TYPE(RPC_BINDING_VECTOR, 8, 4);
-    TEST_FIELD(RPC_BINDING_VECTOR, unsigned long, Count, 0, 4, 4);
+    TEST_FIELD(RPC_BINDING_VECTOR, ULONG, Count, 0, 4, 4);
     TEST_FIELD(RPC_BINDING_VECTOR, RPC_BINDING_HANDLE[1], BindingH, 4, 4, 4);
 }
 
@@ -178,6 +177,10 @@ static void test_pack_RPC_IF_HANDLE(void)
 static void test_pack_RPC_IF_ID(void)
 {
     /* RPC_IF_ID (pack 4) */
+    TEST_TYPE(RPC_IF_ID, 20, 4);
+    TEST_FIELD(RPC_IF_ID, UUID, Uuid, 0, 16, 4);
+    TEST_FIELD(RPC_IF_ID, unsigned short, VersMajor, 16, 2, 2);
+    TEST_FIELD(RPC_IF_ID, unsigned short, VersMinor, 18, 2, 2);
 }
 
 static void test_pack_RPC_POLICY(void)
@@ -185,15 +188,15 @@ static void test_pack_RPC_POLICY(void)
     /* RPC_POLICY (pack 4) */
     TEST_TYPE(RPC_POLICY, 12, 4);
     TEST_FIELD(RPC_POLICY, unsigned int, Length, 0, 4, 4);
-    TEST_FIELD(RPC_POLICY, unsigned long, EndpointFlags, 4, 4, 4);
-    TEST_FIELD(RPC_POLICY, unsigned long, NICFlags, 8, 4, 4);
+    TEST_FIELD(RPC_POLICY, ULONG, EndpointFlags, 4, 4, 4);
+    TEST_FIELD(RPC_POLICY, ULONG, NICFlags, 8, 4, 4);
 }
 
 static void test_pack_UUID_VECTOR(void)
 {
     /* UUID_VECTOR (pack 4) */
     TEST_TYPE(UUID_VECTOR, 8, 4);
-    TEST_FIELD(UUID_VECTOR, unsigned long, Count, 0, 4, 4);
+    TEST_FIELD(UUID_VECTOR, ULONG, Count, 0, 4, 4);
     TEST_FIELD(UUID_VECTOR, UUID *[1], Uuid, 4, 4, 4);
 }
 
@@ -201,6 +204,7 @@ static void test_pack_PRPC_CLIENT_INTERFACE(void)
 {
     /* PRPC_CLIENT_INTERFACE */
     TEST_TYPE(PRPC_CLIENT_INTERFACE, 4, 4);
+    TEST_TYPE_POINTER(PRPC_CLIENT_INTERFACE, 68, 4);
 }
 
 static void test_pack_PRPC_DISPATCH_TABLE(void)
@@ -228,6 +232,7 @@ static void test_pack_PRPC_SERVER_INTERFACE(void)
 {
     /* PRPC_SERVER_INTERFACE */
     TEST_TYPE(PRPC_SERVER_INTERFACE, 4, 4);
+    TEST_TYPE_POINTER(PRPC_SERVER_INTERFACE, 68, 4);
 }
 
 static void test_pack_PRPC_SYNTAX_IDENTIFIER(void)
@@ -240,7 +245,16 @@ static void test_pack_PRPC_SYNTAX_IDENTIFIER(void)
 static void test_pack_RPC_CLIENT_INTERFACE(void)
 {
     /* RPC_CLIENT_INTERFACE (pack 4) */
+    TEST_TYPE(RPC_CLIENT_INTERFACE, 68, 4);
     TEST_FIELD(RPC_CLIENT_INTERFACE, unsigned int, Length, 0, 4, 4);
+    TEST_FIELD(RPC_CLIENT_INTERFACE, RPC_SYNTAX_IDENTIFIER, InterfaceId, 4, 20, 4);
+    TEST_FIELD(RPC_CLIENT_INTERFACE, RPC_SYNTAX_IDENTIFIER, TransferSyntax, 24, 20, 4);
+    TEST_FIELD(RPC_CLIENT_INTERFACE, PRPC_DISPATCH_TABLE, DispatchTable, 44, 4, 4);
+    TEST_FIELD(RPC_CLIENT_INTERFACE, unsigned int, RpcProtseqEndpointCount, 48, 4, 4);
+    TEST_FIELD(RPC_CLIENT_INTERFACE, PRPC_PROTSEQ_ENDPOINT, RpcProtseqEndpoint, 52, 4, 4);
+    TEST_FIELD(RPC_CLIENT_INTERFACE, ULONG_PTR, Reserved, 56, 4, 4);
+    TEST_FIELD(RPC_CLIENT_INTERFACE, void const*, InterpreterInfo, 60, 4, 4);
+    TEST_FIELD(RPC_CLIENT_INTERFACE, unsigned int, Flags, 64, 4, 4);
 }
 
 static void test_pack_RPC_DISPATCH_FUNCTION(void)
@@ -285,7 +299,16 @@ static void test_pack_RPC_PROTSEQ_ENDPOINT(void)
 static void test_pack_RPC_SERVER_INTERFACE(void)
 {
     /* RPC_SERVER_INTERFACE (pack 4) */
+    TEST_TYPE(RPC_SERVER_INTERFACE, 68, 4);
     TEST_FIELD(RPC_SERVER_INTERFACE, unsigned int, Length, 0, 4, 4);
+    TEST_FIELD(RPC_SERVER_INTERFACE, RPC_SYNTAX_IDENTIFIER, InterfaceId, 4, 20, 4);
+    TEST_FIELD(RPC_SERVER_INTERFACE, RPC_SYNTAX_IDENTIFIER, TransferSyntax, 24, 20, 4);
+    TEST_FIELD(RPC_SERVER_INTERFACE, PRPC_DISPATCH_TABLE, DispatchTable, 44, 4, 4);
+    TEST_FIELD(RPC_SERVER_INTERFACE, unsigned int, RpcProtseqEndpointCount, 48, 4, 4);
+    TEST_FIELD(RPC_SERVER_INTERFACE, PRPC_PROTSEQ_ENDPOINT, RpcProtseqEndpoint, 52, 4, 4);
+    TEST_FIELD(RPC_SERVER_INTERFACE, RPC_MGR_EPV*, DefaultManagerEpv, 56, 4, 4);
+    TEST_FIELD(RPC_SERVER_INTERFACE, void const*, InterpreterInfo, 60, 4, 4);
+    TEST_FIELD(RPC_SERVER_INTERFACE, unsigned int, Flags, 64, 4, 4);
 }
 
 static void test_pack_RPC_SYNTAX_IDENTIFIER(void)
@@ -434,6 +457,15 @@ static void test_pack_MIDL_STUBLESS_PROXY_INFO(void)
 static void test_pack_MIDL_SYNTAX_INFO(void)
 {
     /* MIDL_SYNTAX_INFO (pack 4) */
+    TEST_TYPE(MIDL_SYNTAX_INFO, 48, 4);
+    TEST_FIELD(MIDL_SYNTAX_INFO, RPC_SYNTAX_IDENTIFIER, TransferSyntax, 0, 20, 4);
+    TEST_FIELD(MIDL_SYNTAX_INFO, RPC_DISPATCH_TABLE*, DispatchTable, 20, 4, 4);
+    TEST_FIELD(MIDL_SYNTAX_INFO, PFORMAT_STRING, ProcString, 24, 4, 4);
+    TEST_FIELD(MIDL_SYNTAX_INFO, unsigned short*, FmtStringOffset, 28, 4, 4);
+    TEST_FIELD(MIDL_SYNTAX_INFO, PFORMAT_STRING, TypeString, 32, 4, 4);
+    TEST_FIELD(MIDL_SYNTAX_INFO, void*, aUserMarshalQuadruple, 36, 4, 4);
+    TEST_FIELD(MIDL_SYNTAX_INFO, ULONG_PTR, pReserved1, 40, 4, 4);
+    TEST_FIELD(MIDL_SYNTAX_INFO, ULONG_PTR, pReserved2, 44, 4, 4);
 }
 
 static void test_pack_NDR_CCONTEXT(void)
@@ -544,6 +576,7 @@ static void test_pack_PMIDL_SYNTAX_INFO(void)
 {
     /* PMIDL_SYNTAX_INFO */
     TEST_TYPE(PMIDL_SYNTAX_INFO, 4, 4);
+    TEST_TYPE_POINTER(PMIDL_SYNTAX_INFO, 48, 4);
 }
 
 static void test_pack_PNDR_ASYNC_MESSAGE(void)

diff --git a/dlls/shell32/tests/generated.c b/dlls/shell32/tests/generated.c
index 7e8d2811cd6a31db25fd4029c5126834b1564b0f..21520215471ee448ca349288e381ad6bed8e4dd7 100644 (file)
--- a/dlls/shell32/tests/generated.c
+++ b/dlls/shell32/tests/generated.c
@@ -1,4 +1,4 @@
-/* File generated automatically from tools/winapi/test.dat; do not edit! */
+/* File generated automatically from tools/winapi/tests.dat; do not edit! */
 /* This file can be copied, modified and distributed without restriction. */
 
 /*
@@ -530,29 +530,12 @@ static void test_pack_FMTID(void)
     TEST_TYPE(FMTID, 16, 4);
 }
 
-static void test_pack_GUID(void)
-{
-    /* GUID (pack 4) */
-    TEST_TYPE(GUID, 16, 4);
-    TEST_FIELD(GUID, unsigned long, Data1, 0, 4, 4);
-    TEST_FIELD(GUID, unsigned short, Data2, 4, 2, 2);
-    TEST_FIELD(GUID, unsigned short, Data3, 6, 2, 2);
-    TEST_FIELD(GUID, unsigned char[ 8 ], Data4, 8, 8, 1);
-}
-
 static void test_pack_IID(void)
 {
     /* IID */
     TEST_TYPE(IID, 16, 4);
 }
 
-static void test_pack_LPGUID(void)
-{
-    /* LPGUID */
-    TEST_TYPE(LPGUID, 4, 4);
-    TEST_TYPE_POINTER(LPGUID, 16, 4);
-}
-
 static void test_pack_APPBARDATA(void)
 {
     /* APPBARDATA (pack 1) */
@@ -1227,12 +1210,6 @@ static void test_pack_SHELLSTATE(void)
     TEST_FIELD(SHELLSTATE, UINT, uNotUsed, 24, 4, 1);
 }
 
-static void test_pack_SHELLVIEWID(void)
-{
-    /* SHELLVIEWID */
-    TEST_TYPE(SHELLVIEWID, 16, 4);
-}
-
 static void test_pack_TBINFO(void)
 {
     /* TBINFO (pack 8) */
@@ -1275,7 +1252,6 @@ static void test_pack(void)
     test_pack_FLAGGED_BYTE_BLOB();
     test_pack_FLAGGED_WORD_BLOB();
     test_pack_FMTID();
-    test_pack_GUID();
     test_pack_HMETAFILEPICT();
     test_pack_HYPER_SIZEDARR();
     test_pack_IID();
@@ -1300,7 +1276,6 @@ static void test_pack(void)
     test_pack_LPFILEGROUPDESCRIPTORA();
     test_pack_LPFILEGROUPDESCRIPTORW();
     test_pack_LPFNVIEWCALLBACK();
-    test_pack_LPGUID();
     test_pack_LPIDA();
     test_pack_LPITEMIDLIST();
     test_pack_LPOLESTR();
@@ -1348,7 +1323,6 @@ static void test_pack(void)
     test_pack_SHELLEXECUTEINFOW();
     test_pack_SHELLFLAGSTATE();
     test_pack_SHELLSTATE();
-    test_pack_SHELLVIEWID();
     test_pack_SHFILEINFOA();
     test_pack_SHFILEINFOW();
     test_pack_SHFILEOPSTRUCTA();

diff --git a/dlls/shlwapi/tests/generated.c b/dlls/shlwapi/tests/generated.c
index 6d50fbcf32e4091478be08c0507889f716148736..1ac8811a889b996b2d214a2a2a85bf08ed769578 100644 (file)
--- a/dlls/shlwapi/tests/generated.c
+++ b/dlls/shlwapi/tests/generated.c
@@ -1,4 +1,4 @@
-/* File generated automatically from tools/winapi/test.dat; do not edit! */
+/* File generated automatically from tools/winapi/tests.dat; do not edit! */
 /* This file can be copied, modified and distributed without restriction. */
 
 /*

diff --git a/dlls/urlmon/tests/generated.c b/dlls/urlmon/tests/generated.c
index d29c226ca17f61a8701178d935d3ae140cf865d6..a02720508469f766c2a3fdeb904a54d1b7da3b64 100644 (file)
--- a/dlls/urlmon/tests/generated.c
+++ b/dlls/urlmon/tests/generated.c
@@ -1,4 +1,4 @@
-/* File generated automatically from tools/winapi/test.dat; do not edit! */
+/* File generated automatically from tools/winapi/tests.dat; do not edit! */
 /* This file can be copied, modified and distributed without restriction. */
 
 /*

diff --git a/dlls/user32/tests/generated.c b/dlls/user32/tests/generated.c
index c2d24f913ff609f1d9d504d374e77b19ddde82b5..423bc08cd665c42da57bfc61e97eef6538ee6003 100644 (file)
--- a/dlls/user32/tests/generated.c
+++ b/dlls/user32/tests/generated.c
@@ -1,4 +1,4 @@
-/* File generated automatically from tools/winapi/test.dat; do not edit! */
+/* File generated automatically from tools/winapi/tests.dat; do not edit! */
 /* This file can be copied, modified and distributed without restriction. */
 
 /*

diff --git a/dlls/wininet/tests/generated.c b/dlls/wininet/tests/generated.c
index 2d6cdd087136e3a9ac1bbff76d6b470baf66da69..dea2d05e9e2686b3111c172ae9f94fab95d8a14f 100644 (file)
--- a/dlls/wininet/tests/generated.c
+++ b/dlls/wininet/tests/generated.c
@@ -1,4 +1,4 @@
-/* File generated automatically from tools/winapi/test.dat; do not edit! */
+/* File generated automatically from tools/winapi/tests.dat; do not edit! */
 /* This file can be copied, modified and distributed without restriction. */
 
 /*

diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat
index 1214909bc4fb9a612f2c1237db6d9e3de6de8cce..72a5f97c678b9e0cc597e20d60c97f5f77ed7726 100644 (file)
--- a/tools/winapi/tests.dat
+++ b/tools/winapi/tests.dat
@@ -1089,7 +1089,7 @@ FILEOP_FLAGS
 FLAGGED_BYTE_BLOB
 FLAGGED_WORD_BLOB
 FMTID
-GUID
+!GUID                   # Definition contains preprocessor directives
 HMETAFILEPICT
 HYPER_SIZEDARR
 IFileSystemBindData
@@ -1118,7 +1118,7 @@ LPFILEDESCRIPTORW
 LPFILEGROUPDESCRIPTORA
 LPFILEGROUPDESCRIPTORW
 LPFNVIEWCALLBACK
-LPGUID
+!LPGUID                 # Definition contains preprocessor directives
 LPIDA
 LPITEMIDLIST
 LPOLESTR

diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test
index f4f00fb698a6d40329dc5816ec42d9e17888d448..f973928c5e522693e158c344f919053a22ef24cf 100755 (executable)
--- a/tools/winapi/winapi_test
+++ b/tools/winapi/winapi_test
@@ -234,6 +234,10 @@ sub _find_align_kind_size($) {
        $align = 4;
        $kind = "struct";
        $size = 8;
+    } elsif (/^GUID$/) {
+       $align = 4;
+       $kind = "struct";
+       $size = 16;
     } elsif (/^(?:VOID)$/) {
        $align = 4;
        $kind = "signed";