Rob Shearman : include: Add explicit DUMMYUNIONNAME and DUMMYSTRUCTNAME names to anonymous unions in IDL files .

[Alexandre Julliard]

Module: wine
Branch: master
Commit: d9b84d2c454eafee2b0ca7d80b1771edd5658c16
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d9b84d2c454eafee2b0ca7d80b...

Author: Rob Shearman 
Date:   Thu Sep 18 12:36:32 2008 +0100

include: Add explicit DUMMYUNIONNAME and DUMMYSTRUCTNAME names to anonymous unions in IDL files.

These aren't present in the PSDK versions of these files but are
necessary for us to be able to compile Wine with compilers that don't
support anonymous structs and unions.

---

include/amvideo.idl  |    2 +-
 include/d3d10.idl    |    6 +++---
 include/imnxport.idl |    4 ++--
 include/objidl.idl   |    2 +-
 include/propidl.idl  |    4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/include/amvideo.idl b/include/amvideo.idl
index 37d06ff..ea486d5 100644
--- a/include/amvideo.idl
+++ b/include/amvideo.idl
@@ -204,7 +204,7 @@ typedef struct tagVIDEOINFO
         RGBQUAD bmiColors[iPALETTE_COLORS];
         DWORD dwBitMasks[iMASK_COLORS];
         TRUECOLORINFO TrueColorInfo;
-    };
+    } DUMMYUNIONNAME;
 } VIDEOINFO;

typedef struct tagMPEG1VIDEOINFO
diff --git a/include/d3d10.idl b/include/d3d10.idl
index 120f884..032063f 100644
--- a/include/d3d10.idl
+++ b/include/d3d10.idl
@@ -560,7 +560,7 @@ typedef struct D3D10_DEPTH_STENCIL_VIEW_DESC {
         D3D10_TEX2D_ARRAY_DSV Texture2DArray;
         D3D10_TEX2DMS_DSV Texture2DMS;
         D3D10_TEX2DMS_ARRAY_DSV Texture2DMSArray;
-    };
+    } DUMMYUNIONNAME;
 } D3D10_DEPTH_STENCIL_VIEW_DESC;

typedef enum D3D10_RTV_DIMENSION {
@@ -627,7 +627,7 @@ typedef struct D3D10_RENDER_TARGET_VIEW_DESC {
         D3D10_TEX2DMS_RTV Texture2DMS;
         D3D10_TEX2DMS_ARRAY_RTV Texture2DMSArray;
         D3D10_TEX3D_RTV Texture3D;
-    };
+    } DUMMYUNIONNAME;
 } D3D10_RENDER_TARGET_VIEW_DESC;

typedef enum D3D10_SRV_DIMENSION {
@@ -704,7 +704,7 @@ typedef struct D3D10_SHADER_RESOURCE_VIEW_DESC {
         D3D10_TEX2DMS_ARRAY_SRV Texture2DMSArray;
         D3D10_TEX3D_SRV Texture3D;
         D3D10_TEXCUBE_SRV TextureCube;
-    };
+    } DUMMYUNIONNAME;
 } D3D10_SHADER_RESOURCE_VIEW_DESC;

typedef struct D3D10_BOX {
diff --git a/include/imnxport.idl b/include/imnxport.idl
index 50f3e4e..baf29d3 100644
--- a/include/imnxport.idl
+++ b/include/imnxport.idl
@@ -433,7 +433,7 @@ interface ISMTPCallback : ITransportCallback
         {
         [case(SMTP_SEND_STREAM)]    SMTPSTREAM rStreamInfo;
         [default];
-        };
+        } DUMMYUNIONNAME;
     } SMTPRESPONSE, *LPSMTPRESPONSE;

HRESULT OnResponse(
@@ -604,7 +604,7 @@ interface IPOP3Callback : ITransportCallback
         [case(POP3_RETR)] POP3RETR rRetrInfo;
         [case(POP3_TOP)]  POP3TOP rTopInfo;
         [default];
-        };
+        } DUMMYUNIONNAME;
     } POP3RESPONSE, *LPPOP3RESPONSE;

HRESULT OnResponse(
diff --git a/include/objidl.idl b/include/objidl.idl
index e0d83fa..b3dcf65 100644
--- a/include/objidl.idl
+++ b/include/objidl.idl
@@ -1424,7 +1424,7 @@ interface IAdviseSink : IUnknown
     case TYMED_FILE:     LPOLESTR lpszFileName;
     case TYMED_ISTREAM:  BYTE_BLOB *pstm;
     case TYMED_ISTORAGE: BYTE_BLOB *pstg;
-    };
+    } DUMMYUNIONNAME;
     IUnknown *pUnkForRelease;
   } userSTGMEDIUM;

diff --git a/include/propidl.idl b/include/propidl.idl
index 6720988..be67394 100644
--- a/include/propidl.idl
+++ b/include/propidl.idl
@@ -201,7 +201,7 @@ interface IPropertyStorage : IUnknown
     [case(VT_BYREF|VT_DISPATCH)]          IDispatch **ppdispVal;
     [case(VT_BYREF|VT_ARRAY)]             LPSAFEARRAY *pparray;
     [case(VT_BYREF|VT_VARIANT)]           PROPVARIANT *pvarVal;
-    };
+    } DUMMYUNIONNAME;
   };

typedef struct tagPROPVARIANT *LPPROPVARIANT;
@@ -255,7 +255,7 @@ interface IPropertyStorage : IUnknown
     [case(PRSPEC_PROPID)] PROPID propid;
     [case(PRSPEC_LPWSTR)] LPOLESTR lpwstr;
     [default]             ;
-    };
+    } DUMMYUNIONNAME;
   } PROPSPEC;

typedef struct tagSTATPROPSTG {