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: Add explicit DUMMYUNIONNAME and DUMMYSTRUCTNAME names to anonymous unions in IDL files.
d9b84d2c · Rob Shearman · Alexandre Julliard · 2f8f3fac · d9b84d2c · d9b84d2c
Commit d9b84d2c authored Sep 18, 2008 by Rob Shearman Committed by Alexandre Julliard Sep 18, 2008
Showing with 9 additions and 9 deletions

amvideo.idl include/amvideo.idl +1 -1

d3d10.idl include/d3d10.idl +3 -3

imnxport.idl include/imnxport.idl +2 -2

objidl.idl include/objidl.idl +1 -1

propidl.idl include/propidl.idl +2 -2

No files found.
--- 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

--- 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 {

--- 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(

--- 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;


--- 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 {