Author: akhaldi
Date: Sun Sep 25 16:28:58 2011
New Revision: 53856
URL:
http://svn.reactos.org/svn/reactos?rev=53856&view=rev
Log:
[ACTPRXY]
* Enclose midl-incompatible declarations as widl-only. Fixes actxprxy MSVC build.
Modified:
trunk/reactos/dll/win32/actxprxy/actxprxy_activscp.idl
trunk/reactos/dll/win32/actxprxy/actxprxy_comcat.idl
trunk/reactos/dll/win32/actxprxy/actxprxy_docobj.idl
trunk/reactos/dll/win32/actxprxy/actxprxy_hlink.idl
trunk/reactos/dll/win32/actxprxy/actxprxy_htiframe.idl
trunk/reactos/dll/win32/actxprxy/actxprxy_objsafe.idl
trunk/reactos/dll/win32/actxprxy/actxprxy_ocmm.idl
trunk/reactos/dll/win32/actxprxy/actxprxy_servprov.idl
trunk/reactos/dll/win32/actxprxy/actxprxy_shldisp.idl
trunk/reactos/dll/win32/actxprxy/actxprxy_shobjidl.idl
trunk/reactos/dll/win32/actxprxy/actxprxy_urlhist.idl
Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_activscp.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx…
==============================================================================
--- trunk/reactos/dll/win32/actxprxy/actxprxy_activscp.idl [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/actxprxy/actxprxy_activscp.idl [iso-8859-1] Sun Sep 25
16:28:58 2011
@@ -20,8 +20,10 @@
#include "activscp.idl"
+#ifdef __WIDL__
[
threading(both),
uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */
]
coclass PSFactoryBuffer { interface IFactoryBuffer; }
+#endif
Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_comcat.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx…
==============================================================================
--- trunk/reactos/dll/win32/actxprxy/actxprxy_comcat.idl [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/actxprxy/actxprxy_comcat.idl [iso-8859-1] Sun Sep 25 16:28:58
2011
@@ -20,8 +20,10 @@
#include "comcat.idl"
+#ifdef __WIDL__
[
threading(both),
uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */
]
coclass PSFactoryBuffer { interface IFactoryBuffer; }
+#endif
Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_docobj.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx…
==============================================================================
--- trunk/reactos/dll/win32/actxprxy/actxprxy_docobj.idl [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/actxprxy/actxprxy_docobj.idl [iso-8859-1] Sun Sep 25 16:28:58
2011
@@ -20,8 +20,10 @@
#include "docobj.idl"
+#ifdef __WIDL__
[
threading(both),
uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */
]
coclass PSFactoryBuffer { interface IFactoryBuffer; }
+#endif
Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_hlink.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx…
==============================================================================
--- trunk/reactos/dll/win32/actxprxy/actxprxy_hlink.idl [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/actxprxy/actxprxy_hlink.idl [iso-8859-1] Sun Sep 25 16:28:58
2011
@@ -20,8 +20,10 @@
#include "hlink.idl"
+#ifdef __WIDL__
[
threading(both),
uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */
]
coclass PSFactoryBuffer { interface IFactoryBuffer; }
+#endif
Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_htiframe.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx…
==============================================================================
--- trunk/reactos/dll/win32/actxprxy/actxprxy_htiframe.idl [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/actxprxy/actxprxy_htiframe.idl [iso-8859-1] Sun Sep 25
16:28:58 2011
@@ -20,8 +20,10 @@
#include "htiframe.idl"
+#ifdef __WIDL__
[
threading(both),
uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */
]
coclass PSFactoryBuffer { interface IFactoryBuffer; }
+#endif
Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_objsafe.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx…
==============================================================================
--- trunk/reactos/dll/win32/actxprxy/actxprxy_objsafe.idl [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/actxprxy/actxprxy_objsafe.idl [iso-8859-1] Sun Sep 25 16:28:58
2011
@@ -20,8 +20,10 @@
#include "objsafe.idl"
+#ifdef __WIDL__
[
threading(both),
uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */
]
coclass PSFactoryBuffer { interface IFactoryBuffer; }
+#endif
Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_ocmm.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx…
==============================================================================
--- trunk/reactos/dll/win32/actxprxy/actxprxy_ocmm.idl [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/actxprxy/actxprxy_ocmm.idl [iso-8859-1] Sun Sep 25 16:28:58
2011
@@ -20,8 +20,10 @@
#include "ocmm.idl"
+#ifdef __WIDL__
[
threading(both),
uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */
]
coclass PSFactoryBuffer { interface IFactoryBuffer; }
+#endif
Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_servprov.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx…
==============================================================================
--- trunk/reactos/dll/win32/actxprxy/actxprxy_servprov.idl [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/actxprxy/actxprxy_servprov.idl [iso-8859-1] Sun Sep 25
16:28:58 2011
@@ -1,7 +1,9 @@
#include "servprov.idl"
+#ifdef __WIDL__
[
threading(both),
uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */
]
coclass PSFactoryBuffer { interface IFactoryBuffer; }
+#endif
Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_shldisp.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx…
==============================================================================
--- trunk/reactos/dll/win32/actxprxy/actxprxy_shldisp.idl [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/actxprxy/actxprxy_shldisp.idl [iso-8859-1] Sun Sep 25 16:28:58
2011
@@ -20,8 +20,10 @@
#include "shldisp.idl"
+#ifdef __WIDL__
[
threading(both),
uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */
]
coclass PSFactoryBuffer { interface IFactoryBuffer; }
+#endif
Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_shobjidl.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx…
==============================================================================
--- trunk/reactos/dll/win32/actxprxy/actxprxy_shobjidl.idl [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/actxprxy/actxprxy_shobjidl.idl [iso-8859-1] Sun Sep 25
16:28:58 2011
@@ -20,8 +20,10 @@
#include "shobjidl.idl"
+#ifdef __WIDL__
[
threading(both),
uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */
]
coclass PSFactoryBuffer { interface IFactoryBuffer; }
+#endif
Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_urlhist.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx…
==============================================================================
--- trunk/reactos/dll/win32/actxprxy/actxprxy_urlhist.idl [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/actxprxy/actxprxy_urlhist.idl [iso-8859-1] Sun Sep 25 16:28:58
2011
@@ -20,8 +20,10 @@
#include "urlhist.idl"
+#ifdef __WIDL__
[
threading(both),
uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */
]
coclass PSFactoryBuffer { interface IFactoryBuffer; }
+#endif