Declare GUID in the correct way

Fix ICC compilation error

include/SubRenderIntf.h

@@ -184,8 +184,7 @@ interface ISubRenderFrame;
 
 // Base interface for both ISubRenderConsumer and ISubRenderProvider.
 
-[uuid("7CFD3728-235E-4430-9A2D-9F25F426BD70")]
-interface ISubRenderOptions : public IUnknown
+interface __declspec(uuid("7CFD3728-235E-4430-9A2D-9F25F426BD70")) ISubRenderOptions : public IUnknown
 {
   // Allows one party to get information from the other party.
   // The memory for strings and binary data is allocated by the callee
@@ -252,8 +251,7 @@ interface ISubRenderOptions : public IUnknown
 
 // This interface is exposed by every subtitle consumer.
 
-[uuid("9DF90966-FE9F-4F0E-881E-DAF8A572D900")]
-interface ISubRenderConsumer : public ISubRenderOptions
+interface __declspec(uuid("9DF90966-FE9F-4F0E-881E-DAF8A572D900")) ISubRenderConsumer : public ISubRenderOptions
 {
   // Called by the subtitle renderer to ask the merit of the consumer.
   // Recommended merits:
@@ -295,8 +293,7 @@ interface ISubRenderConsumer : public ISubRenderOptions
   STDMETHOD(DeliverFrame)(REFERENCE_TIME start, REFERENCE_TIME stop, LPVOID context, ISubRenderFrame *subtitleFrame) = 0;
 };
 
-[uuid("1A1737C8-2BF8-4BEA-97EA-3AB4FA8F7AC9")]
-interface ISubRenderConsumer2 : public ISubRenderConsumer
+interface __declspec(uuid("1A1737C8-2BF8-4BEA-97EA-3AB4FA8F7AC9")) ISubRenderConsumer2 : public ISubRenderConsumer
 {
   // Called by the subtitle renderer e.g. when the user switches to a
   // different subtitle track. The consumer should immediately release
@@ -312,8 +309,7 @@ interface ISubRenderConsumer2 : public ISubRenderConsumer
 // The subtitle renderer provides the consumer with this interface, when
 // calling the "ISubRenderConsumer.Connect()" method.
 
-[uuid("20752113-C883-455A-BA7B-ABA4E9115CA8")]
-interface ISubRenderProvider : public ISubRenderOptions
+interface __declspec(uuid("20752113-C883-455A-BA7B-ABA4E9115CA8")) ISubRenderProvider : public ISubRenderOptions
 {
   // Called by the consumer to request a rendered subtitle frame.
   // The subtitle renderer will deliver the frame when it is completed, by
@@ -341,8 +337,7 @@ interface ISubRenderProvider : public ISubRenderOptions
 
 // This interface is the reply to a consumer's frame render request.
 
-[uuid("81746AB5-9407-4B43-A014-1FAAC340F973")]
-interface ISubRenderFrame : public IUnknown
+interface __declspec(uuid("81746AB5-9407-4B43-A014-1FAAC340F973")) ISubRenderFrame : public IUnknown
 {
   // "GetOutputRect()" specifies for which video rect the subtitles were
   // rendered. If the subtitle renderer doesn't scale the subtitles at all,

src/dsutil/DSMPropertyBag.h

@@ -4,8 +4,7 @@
 
 // IDSMPropertyBag
 
-[uuid("232FD5D2-4954-41E7-BF9B-09E1257B1A95")]
-interface IDSMPropertyBag : public IPropertyBag2
+interface __declspec(uuid("232FD5D2-4954-41E7-BF9B-09E1257B1A95")) IDSMPropertyBag : public IPropertyBag2
 {
 	STDMETHOD(SetProperty) (LPCWSTR key, LPCWSTR value) = 0;
 	STDMETHOD(SetProperty) (LPCWSTR key, VARIANT* var) = 0;
@@ -47,8 +46,7 @@ class IDSMPropertyBagImpl : public ATL::CSimpleMap<CStringW, CStringW>, public I
 
 // IDSMResourceBag
 
-[uuid("EBAFBCBE-BDE0-489A-9789-05D5692E3A93")]
-interface IDSMResourceBag : public IUnknown
+interface __declspec(uuid("EBAFBCBE-BDE0-489A-9789-05D5692E3A93")) IDSMResourceBag : public IUnknown
 {
 	STDMETHOD_(DWORD, ResGetCount) () = 0;
 	STDMETHOD(ResGet) (DWORD iIndex, BSTR* ppName, BSTR* ppDesc, BSTR* ppMime, BYTE** ppData, DWORD* pDataLen, DWORD_PTR* pTag) = 0;
@@ -97,8 +95,7 @@ class IDSMResourceBagImpl : public IDSMResourceBag
 
 // IDSMChapterBag
 
-[uuid("2D0EBE73-BA82-4E90-859B-C7C48ED3650F")]
-interface IDSMChapterBag : public IUnknown
+interface __declspec(uuid("2D0EBE73-BA82-4E90-859B-C7C48ED3650F")) IDSMChapterBag : public IUnknown
 {
 	STDMETHOD_(DWORD, ChapGetCount) () = 0;
 	STDMETHOD(ChapGet) (DWORD iIndex, REFERENCE_TIME* prt, BSTR* ppName) = 0;

src/dsutil/NullRenderers.h

@@ -32,8 +32,7 @@ class CNullRenderer : public CBaseRenderer
 	CNullRenderer(REFCLSID clsid, TCHAR* pName, LPUNKNOWN pUnk, HRESULT* phr);
 };
 
-[uuid("579883A0-4E2D-481F-9436-467AAFAB7DE8")]
-class CNullVideoRenderer : public CNullRenderer
+class __declspec(uuid("579883A0-4E2D-481F-9436-467AAFAB7DE8")) CNullVideoRenderer : public CNullRenderer
 {
 protected:
 	HRESULT CheckMediaType(const CMediaType* pmt);
@@ -42,8 +41,7 @@ class CNullVideoRenderer : public CNullRenderer
 	CNullVideoRenderer(LPUNKNOWN pUnk, HRESULT* phr);
 };
 
-[uuid("DD9ED57D-6ABF-42E8-89A2-11D04798DC58")]
-class CNullUVideoRenderer : public CNullRenderer
+class __declspec(uuid("DD9ED57D-6ABF-42E8-89A2-11D04798DC58")) CNullUVideoRenderer : public CNullRenderer
 {
 protected:
 	HRESULT CheckMediaType(const CMediaType* pmt);
@@ -52,8 +50,7 @@ class CNullUVideoRenderer : public CNullRenderer
 	CNullUVideoRenderer(LPUNKNOWN pUnk, HRESULT* phr);
 };
 
-[uuid("0C38BDFD-8C17-4E00-A344-F89397D3E22A")]
-class CNullAudioRenderer : public CNullRenderer
+class __declspec(uuid("0C38BDFD-8C17-4E00-A344-F89397D3E22A")) CNullAudioRenderer : public CNullRenderer
 {
 protected:
 	HRESULT CheckMediaType(const CMediaType* pmt);
@@ -62,8 +59,7 @@ class CNullAudioRenderer : public CNullRenderer
 	CNullAudioRenderer(LPUNKNOWN pUnk, HRESULT* phr);
 };
 
-[uuid("64A45125-7343-4772-9DA4-179FAC9D462C")]
-class CNullUAudioRenderer : public CNullRenderer
+class __declspec(uuid("64A45125-7343-4772-9DA4-179FAC9D462C")) CNullUAudioRenderer : public CNullRenderer
 {
 protected:
 	HRESULT CheckMediaType(const CMediaType* pmt);
@@ -72,8 +68,7 @@ class CNullUAudioRenderer : public CNullRenderer
 	CNullUAudioRenderer(LPUNKNOWN pUnk, HRESULT* phr);
 };
 
-[uuid("655D7613-C26C-4A25-BBBD-3C9C516122CC")]
-class CNullTextRenderer : public CBaseFilter, public CCritSec
+class __declspec(uuid("655D7613-C26C-4A25-BBBD-3C9C516122CC")) CNullTextRenderer : public CBaseFilter, public CCritSec
 {
 	class CTextInputPin : public CBaseInputPin
 	{

src/filters/transform/vsfilter/DirectVobSubFilter.h

@@ -32,8 +32,7 @@
 
 /* This is for graphedit */
 
-[uuid("93A22E7A-5091-45ef-BA61-6DA26156A5D0")]
-class CDirectVobSubFilter
+class __declspec(uuid("93A22E7A-5091-45ef-BA61-6DA26156A5D0")) CDirectVobSubFilter
 	: public CBaseVideoFilter
 	, public CDirectVobSub
 	, public ISpecifyPropertyPages
@@ -196,8 +195,7 @@ class CDirectVobSubFilter
 
 /* The "auto-loading" version */
 
-[uuid("9852A670-F845-491b-9BE6-EBD841B8A613")]
-class CDirectVobSubFilter2 : public CDirectVobSubFilter
+class __declspec(uuid("9852A670-F845-491b-9BE6-EBD841B8A613")) CDirectVobSubFilter2 : public CDirectVobSubFilter
 {
     bool IsAppBlackListed();
 	bool ShouldWeAutoload(IFilterGraph* pGraph);

src/filters/transform/vsfilter/DirectVobSubPropPage.h

@@ -61,8 +61,7 @@ class CDVSBasePPage : public CBasePropertyPage
 	void BindControl(UINT id, CWnd& control);
 };
 
-[uuid("60765CF5-01C2-4ee7-A44B-C791CF25FEA0")]
-class CDVSMainPPage : public CDVSBasePPage
+class __declspec(uuid("60765CF5-01C2-4ee7-A44B-C791CF25FEA0")) CDVSMainPPage : public CDVSBasePPage
 {
 	void FreeLangs(), AllocLangs(int nLangs);
 
@@ -94,8 +93,7 @@ class CDVSMainPPage : public CDVSBasePPage
 	virtual ~CDVSMainPPage();
 };
 
-[uuid("0180E49C-13BF-46db-9AFD-9F52292E1C22")]
-class CDVSGeneralPPage : public CDVSBasePPage
+class __declspec(uuid("0180E49C-13BF-46db-9AFD-9F52292E1C22")) CDVSGeneralPPage : public CDVSBasePPage
 {
 	int m_HorExt, m_VerExt, m_ResX2, m_ResX2minw, m_ResX2minh;
 	int m_LoadLevel;
@@ -117,8 +115,7 @@ class CDVSGeneralPPage : public CDVSBasePPage
     CDVSGeneralPPage(LPUNKNOWN lpunk, HRESULT* phr, TCHAR *pName = NAME("DirectVobSub Property Page (general settings)"));
 };
 
-[uuid("A8B25C0E-0894-4531-B668-AB1599FAF7F6")]
-class CDVSMiscPPage : public CDVSBasePPage
+class __declspec(uuid("A8B25C0E-0894-4531-B668-AB1599FAF7F6")) CDVSMiscPPage : public CDVSBasePPage
 {
 	bool m_fFlipPicture, m_fFlipSubtitles, m_fHideSubtitles, m_fOSD, m_fDoPreBuffering, m_fReloaderDisabled, m_fSaveFullPath;
 
@@ -136,8 +133,7 @@ class CDVSMiscPPage : public CDVSBasePPage
     CDVSMiscPPage(LPUNKNOWN lpunk, HRESULT* phr, TCHAR *pName = NAME("DirectVobSub Property Page (misc settings)"));
 };
 
-[uuid("ACE4747B-35BD-4e97-9DD7-1D4245B0695C")]
-class CDVSTimingPPage : public CDVSBasePPage
+class __declspec(uuid("ACE4747B-35BD-4e97-9DD7-1D4245B0695C")) CDVSTimingPPage : public CDVSBasePPage
 {
 	int m_SubtitleSpeedMul, m_SubtitleSpeedDiv, m_SubtitleDelay;
 	bool m_fMediaFPSEnabled;
@@ -153,8 +149,7 @@ class CDVSTimingPPage : public CDVSBasePPage
     CDVSTimingPPage(LPUNKNOWN lpunk, HRESULT* phr, TCHAR *pName = NAME("DirectVobSub Timing Property Page"));
 };
 
-[uuid("69CE757B-E8C0-4B0A-9EA0-CEA284096F98")]
-class CDVSMorePPage : public CDVSBasePPage
+class __declspec(uuid("69CE757B-E8C0-4B0A-9EA0-CEA284096F98")) CDVSMorePPage : public CDVSBasePPage
 {
     int m_overlay_cache_max_item_num, m_overlay_no_blur_cache_max_item_num, m_path_cache_max_item_num, 
         m_scan_line_data_cache_max_item_num, m_subpixel_pos_level;
@@ -174,17 +169,15 @@ class CDVSMorePPage : public CDVSBasePPage
     CDVSMorePPage(LPUNKNOWN lpunk, HRESULT* phr);
 };
 
-[uuid("F544E0F5-CA3C-47ea-A64D-35FCF1602396")]
-class CDVSAboutPPage : public CDVSBasePPage
+class __declspec(uuid("F544E0F5-CA3C-47ea-A64D-35FCF1602396")) CDVSAboutPPage : public CDVSBasePPage
 {
 public:
     CDVSAboutPPage(LPUNKNOWN lpunk, HRESULT* phr, TCHAR* pName=NAME("About Property Page"));
 
     bool OnMessage(UINT uMsg, WPARAM wParam, LPARAM lParam);
 };
 
-[uuid("525F116F-04AD-40a2-AE2F-A0C4E1AFEF98")]
-class CDVSZoomPPage : public CDVSBasePPage
+class __declspec(uuid("525F116F-04AD-40a2-AE2F-A0C4E1AFEF98")) CDVSZoomPPage : public CDVSBasePPage
 {
 	NORMALIZEDRECT m_rect;
 
@@ -199,8 +192,7 @@ class CDVSZoomPPage : public CDVSBasePPage
     CDVSZoomPPage(LPUNKNOWN lpunk, HRESULT* phr);
 };
 
-[uuid("C2D6D98F-09CA-4524-AF64-1049B5665C9C")]
-class CDVSColorPPage : public CDVSBasePPage
+class __declspec(uuid("C2D6D98F-09CA-4524-AF64-1049B5665C9C")) CDVSColorPPage : public CDVSBasePPage
 {
     CListCtrl m_outputFmtList, m_inputFmtList;
     CButton m_followUpstreamPreferredOrder, m_btnColorUp, m_btnColorDown;
@@ -225,8 +217,7 @@ class CDVSColorPPage : public CDVSBasePPage
     ~CDVSColorPPage();
 };
 
-[uuid("CE77C59C-CFD2-429f-868C-8B04D23F94CA")]
-class CDVSPathsPPage : public CDVSBasePPage
+class __declspec(uuid("CE77C59C-CFD2-429f-868C-8B04D23F94CA")) CDVSPathsPPage : public CDVSBasePPage
 {
 	CStringArray m_paths;
 
@@ -246,8 +237,7 @@ class CDVSPathsPPage : public CDVSBasePPage
 //
 // XySubFilter
 //
-[uuid("4514EFD4-E09B-4995-9668-143F12994FE7")]
-class CXySubFilterMainPPage : public CDVSBasePPage
+class __declspec(uuid("4514EFD4-E09B-4995-9668-143F12994FE7")) CXySubFilterMainPPage : public CDVSBasePPage
 {
     void FreeLangs(), AllocLangs(int nLangs);
 
@@ -282,8 +272,7 @@ class CXySubFilterMainPPage : public CDVSBasePPage
     virtual ~CXySubFilterMainPPage();
 };
 
-[uuid("E7946C91-1083-4F0E-AC45-5CF6BE7DB4C7")]
-class CXySubFilterMorePPage : public CDVSBasePPage
+class __declspec(uuid("E7946C91-1083-4F0E-AC45-5CF6BE7DB4C7")) CXySubFilterMorePPage : public CDVSBasePPage
 {
     int m_overlay_cache_max_item_num, m_overlay_no_blur_cache_max_item_num, m_path_cache_max_item_num, 
         m_scan_line_data_cache_max_item_num, m_subpixel_pos_level;
@@ -315,26 +304,23 @@ class CXySubFilterMorePPage : public CDVSBasePPage
     CXySubFilterMorePPage(LPUNKNOWN lpunk, HRESULT* phr);
 };
 
-[uuid("1438A8B4-E8AF-4A81-BCA8-970751A9EE82")]
-class CXySubFilterTimingPPage : public CDVSTimingPPage
+class __declspec(uuid("1438A8B4-E8AF-4A81-BCA8-970751A9EE82")) CXySubFilterTimingPPage : public CDVSTimingPPage
 {
 public:
     CXySubFilterTimingPPage(LPUNKNOWN lpunk, HRESULT* phr
         , TCHAR *pName = NAME("XySubFilter Property Page (timing)"))
         : CDVSTimingPPage(lpunk, phr, pName) {}
 };
 
-[uuid("26DD9A01-7F95-40DE-B53D-4B4CE4023280")]
-class CXySubFilterPathsPPage : public CDVSPathsPPage
+class __declspec(uuid("26DD9A01-7F95-40DE-B53D-4B4CE4023280")) CXySubFilterPathsPPage : public CDVSPathsPPage
 {
 public:
     CXySubFilterPathsPPage(LPUNKNOWN lpunk, HRESULT* phr
         , TCHAR* pName = NAME("XySubFilter Property Page (path)"))
         : CDVSPathsPPage(lpunk, phr, pName) {}
 };
 
-[uuid("D0DE7ADC-7DC6-43EC-912D-ABD44D7453FB")]
-class CXySubFilterAboutPPage : public CDVSAboutPPage
+class __declspec(uuid("D0DE7ADC-7DC6-43EC-912D-ABD44D7453FB")) CXySubFilterAboutPPage : public CDVSAboutPPage
 {
 public:
     CXySubFilterAboutPPage(LPUNKNOWN lpunk, HRESULT* phr, TCHAR* pName=NAME("XySubFilter Property Page (about)"))
@@ -344,34 +330,30 @@ class CXySubFilterAboutPPage : public CDVSAboutPPage
 //
 // XySubFilterConsumer
 //
-[uuid("b7f66b77-10b9-48e4-be40-2e6e4d00292e")]
-class CXySubFilterConsumerGeneralPPage : public CDVSGeneralPPage
+class __declspec(uuid("b7f66b77-10b9-48e4-be40-2e6e4d00292e")) CXySubFilterConsumerGeneralPPage : public CDVSGeneralPPage
 {
 public:
     CXySubFilterConsumerGeneralPPage(LPUNKNOWN lpunk, HRESULT* phr
         , TCHAR *pName = NAME("XySubFilterConsumer Property Page (General)"))
         : CDVSGeneralPPage(lpunk, phr, pName) {}
 };
 
-[uuid("f2609280-2d03-4251-a1e4-65b1aff9dafe")]
-class CXySubFilterConsumerMiscPPage : public CDVSMiscPPage
+class __declspec(uuid("f2609280-2d03-4251-a1e4-65b1aff9dafe")) CXySubFilterConsumerMiscPPage : public CDVSMiscPPage
 {
 public:
     CXySubFilterConsumerMiscPPage(LPUNKNOWN lpunk, HRESULT* phr
         , TCHAR *pName = NAME("XySubFilterConsumer Property Page (Misc)"))
         : CDVSMiscPPage(lpunk, phr, pName) {}
 };
 
-[uuid("2e714223-34bc-430d-b52a-5bd23ddbf049")]
-class CXySubFilterConsumerAboutPPage : public CDVSAboutPPage
+class __declspec(uuid("2e714223-34bc-430d-b52a-5bd23ddbf049")) CXySubFilterConsumerAboutPPage : public CDVSAboutPPage
 {
 public:
     CXySubFilterConsumerAboutPPage(LPUNKNOWN lpunk, HRESULT* phr, TCHAR* pName=NAME("XySubFilterConsumer Property Page (about)"))
         : CDVSAboutPPage(lpunk, phr, pName) {}
 };
 
-[uuid("c371c901-97eb-4bb4-b742-d53a0eaa7b3c")]
-class CXySubFilterConsumerColorPPage : public CDVSColorPPage
+class __declspec(uuid("c371c901-97eb-4bb4-b742-d53a0eaa7b3c")) CXySubFilterConsumerColorPPage : public CDVSColorPPage
 {
 public:
     CXySubFilterConsumerColorPPage(LPUNKNOWN lpunk, HRESULT* phr, TCHAR* pName=NAME("XySubFilterConsumer Property Page (color)"))

src/filters/transform/vsfilter/XyOptions.h

@@ -1,7 +1,6 @@
 #pragma once
 
-[uuid("85E5D6F9-BEFB-4E01-B047-758359CDF9AB")]
-interface IXyOptions : public IUnknown 
+interface __declspec(uuid("85E5D6F9-BEFB-4E01-B047-758359CDF9AB")) IXyOptions : public IUnknown
 {
     STDMETHOD(XyGetBool     )(unsigned field, bool      *value) = 0;
     STDMETHOD(XyGetInt      )(unsigned field, int       *value) = 0;

src/filters/transform/vsfilter/XySubRenderIntf.h

@@ -17,17 +17,15 @@ struct XyPlannerFormatExtra
     LPCVOID plans[4];
 };
 
-[uuid("4237bf3b-14fd-44a4-9704-86ec87f89897")]
-interface IXySubRenderFrame : public ISubRenderFrame
+interface __declspec(uuid("4237bf3b-14fd-44a4-9704-86ec87f89897")) IXySubRenderFrame : public ISubRenderFrame
 {
     STDMETHOD(GetXyColorSpace)(int *xyColorSpace) = 0;
 
     //if xyColorSpace == XY_AYUV_PLANAR, extra_info should point to a XyPlannerFormatExtra struct
     STDMETHOD(GetBitmapExtra)(int index, LPVOID extra_info) = 0;
 };
 
-[uuid("68f052bf-dcf2-476e-baab-494b6288c58e")]
-interface IXySubRenderProvider: public IUnknown
+interface __declspec(uuid("68f052bf-dcf2-476e-baab-494b6288c58e")) IXySubRenderProvider: public IUnknown
 {
     STDMETHOD(Connect)(IXyOptions *consumer) = 0;
     STDMETHOD(RequestFrame)(IXySubRenderFrame**subRenderFrame, REFERENCE_TIME now) = 0;

src/filters/transform/vsfilter/auto_load_helper.h

@@ -15,8 +15,7 @@ class XyAutoLoaderDummyInputPin: public CBaseInputPin
     XySubFilterAutoLoader *m_filter;
 };
 
-[uuid("6b237877-902b-4c6c-92f6-e63169a5166c")]
-class XySubFilterAutoLoader : public CBaseFilter
+class __declspec(uuid("6b237877-902b-4c6c-92f6-e63169a5166c")) XySubFilterAutoLoader : public CBaseFilter
 {
 public:
     XySubFilterAutoLoader(LPUNKNOWN punk, HRESULT* phr, const GUID& clsid = __uuidof(XySubFilterAutoLoader));

src/filters/transform/vsfilter/xy_sub_filter.h

@@ -8,14 +8,12 @@
 class CDirectVobSubFilter;
 
 // Expose this interface if you do NOT want to work with XySubFilter in a graph
-[uuid("8871ac83-89c8-44e9-913f-a9a2a322440a")]
-interface IXySubFilterGraphMutex : public IUnknown
+interface __declspec(uuid("8871ac83-89c8-44e9-913f-a9a2a322440a")) IXySubFilterGraphMutex : public IUnknown
 {
 
 };
 
-[uuid("2dfcb782-ec20-4a7c-b530-4577adb33f21")]
-class XySubFilter
+class __declspec(uuid("2dfcb782-ec20-4a7c-b530-4577adb33f21")) XySubFilter
     : public CBaseFilter
     , public CDVS4XySubFilter
     , public ISpecifyPropertyPages

src/filters/transform/vsfilter/xy_sub_filter_consumer.h

@@ -31,8 +31,7 @@
 #include "SubRenderIntf.h"
 
 
-[uuid("db6974b5-9bd1-45f5-8462-27a88019b352")]
-class XySubFilterConsumer
+class __declspec(uuid("db6974b5-9bd1-45f5-8462-27a88019b352")) XySubFilterConsumer
     : public CBaseVideoFilter
     , public CDirectVobSub
     , public ISpecifyPropertyPages