[1/5] winapi_test: Updated so the generated tests work.

[Francois Gouget]

---

I believe the patches in this series are essentially independent. But 
just in case I numbered them.

The GUID definition contains #ifdefs which throw winapi_test off. So 
Just ignore it.

 tools/winapi/tests.dat   |    4 ++--
 tools/winapi/winapi_test |    4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat
index 1214909..72a5f97 100644
--- 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 f4f00fb..f973928 100755
--- 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";
-- 
1.5.6.5