[DShow] Include fixes...

[Lionel Ulmer]

When transitionning from 'old-style' ICOM stuff to 'new-style', I forgot to
change the #ifdefs around the C launcher macros.

Changelog:
 - make the header in-line with current ICOM naming conventions

-- 
		 Lionel Ulmer - http://www.bbrox.org/
-------------- next part --------------
Index: include/control.h
===================================================================
RCS file: /home/wine/wine/include/control.h,v
retrieving revision 1.7
diff -u -r1.7 control.h
--- include/control.h	13 Jun 2003 18:06:44 -0000	1.7
+++ include/control.h	14 Jun 2003 10:35:40 -0000
@@ -50,7 +50,7 @@
 ICOM_DEFINE(IMediaControl,IDispatch)
 #undef INTERFACE
 
-#ifdef ICOM_CINTERFACE
+#ifdef COBJMACROS
 /*** IUnknown methods ***/
 #define IMediaControl_QueryInterface(p,a,b)   (p)->lpVtbl->QueryInterface(p,a,b)
 #define IMediaControl_AddRef(p)   (p)->lpVtbl->AddRef(p)
@@ -82,7 +82,7 @@
 ICOM_DEFINE(IBasicAudio,IDispatch)
 #undef INTERFACE
 
-#ifdef ICOM_CINTERFACE
+#ifdef COBJMACROS
 /*** IUnknown methods ***/
 #define IBasicAudio_QueryInterface(p,a,b)   (p)->lpVtbl->QueryInterface(p,a,b)
 #define IBasicAudio_AddRef(p)   (p)->lpVtbl->AddRef(p)
@@ -137,7 +137,7 @@
 ICOM_DEFINE(IBasicVideo,IDispatch)
 #undef INTERFACE
 
-#ifdef ICOM_CINTERFACE
+#ifdef COBJMACROS
 /*** IUnknown methods ***/
 #define IBasicVideo_QueryInterface(p,a,b)   (p)->lpVtbl->QueryInterface(p,a,b)
 #define IBasicVideo_AddRef(p)   (p)->lpVtbl->AddRef(p)
@@ -227,7 +227,7 @@
 ICOM_DEFINE(IVideoWindow,IDispatch)
 #undef INTERFACE
 
-#ifdef ICOM_CINTERFACE
+#ifdef COBJMACROS
 /*** IUnknown methods ***/
 #define IVideoWindow_QueryInterface(p,a,b)   (p)->lpVtbl->QueryInterface(p,a,b)
 #define IVideoWindow_AddRef(p)   (p)->lpVtbl->AddRef(p)
@@ -291,7 +291,7 @@
 ICOM_DEFINE(IMediaEvent,IDispatch)
 #undef INTERFACE
      
-#ifdef ICOM_CINTERFACE
+#ifdef COBJMACROS
 /*** IUnknown methods ***/
 #define IMediaEvent_QueryInterface(p,a,b)   (p)->lpVtbl->QueryInterface(p,a,b)
 #define IMediaEvent_AddRef(p)   (p)->lpVtbl->AddRef(p)
@@ -319,7 +319,7 @@
 ICOM_DEFINE(IMediaEventEx,IMediaEvent)
 #undef INTERFACE
 
-#ifdef ICOM_CINTERFACE
+#ifdef COBJMACROS
 /*** IUnknown methods ***/
 #define IMediaEventEx_QueryInterface(p,a,b)   (p)->lpVtbl->QueryInterface(p,a,b)
 #define IMediaEventEx_AddRef(p)   (p)->lpVtbl->AddRef(p)
Index: include/strmif.h
===================================================================
RCS file: /home/wine/wine/include/strmif.h,v
retrieving revision 1.15
diff -u -r1.15 strmif.h
--- include/strmif.h	13 Jun 2003 18:06:44 -0000	1.15
+++ include/strmif.h	14 Jun 2003 10:35:40 -0000
@@ -98,7 +98,7 @@
 ICOM_DEFINE(IPin,IUnknown)
 #undef INTERFACE
 
-#ifdef ICOM_CINTERFACE
+#ifdef COBJMACROS
 /*** IUnknown methods ***/
 #define IPin_QueryInterface(p,a,b)   (p)->lpVtbl->QueryInterface(p,a,b)
 #define IPin_AddRef(p)   (p)->lpVtbl->AddRef(p)
@@ -131,7 +131,7 @@
 ICOM_DEFINE(IEnumPins,IUnknown)
 #undef INTERFACE
 
-#ifdef ICOM_CINTERFACE
+#ifdef COBJMACROS
 /*** IUnknown methods ***/
 #define IEnumPins_QueryInterface(p,a,b)   (p)->lpVtbl->QueryInterface(p,a,b)
 #define IEnumPins_AddRef(p)   (p)->lpVtbl->AddRef(p)
@@ -155,7 +155,7 @@
 ICOM_DEFINE(IMediaFilter,IPersist)
 #undef INTERFACE
 
-#ifdef ICOM_CINTERFACE
+#ifdef COBJMACROS
 /*** IUnknown methods ***/
 #define IMediaFilter_QueryInterface(p,a,b)   (p)->lpVtbl->QueryInterface(p,a,b)
 #define IMediaFilter_AddRef(p)   (p)->lpVtbl->AddRef(p)
@@ -182,7 +182,7 @@
 ICOM_DEFINE(IBaseFilter,IMediaFilter)
 #undef INTERFACE
      
-#ifdef ICOM_CINTERFACE
+#ifdef COBJMACROS
 /*** IUnknown methods ***/
 #define IBaseFilter_QueryInterface(p,a,b)   (p)->lpVtbl->QueryInterface(p,a,b)
 #define IBaseFilter_AddRef(p)   (p)->lpVtbl->AddRef(p)
@@ -218,7 +218,7 @@
 ICOM_DEFINE(IFilterGraph,IUnknown)
 #undef INTERFACE
 
-#ifdef ICOM_CINTERFACE
+#ifdef COBJMACROS
 /*** IUnknown methods ***/
 #define IFilterGraph_QueryInterface(p,a,b)   (p)->lpVtbl->QueryInterface(p,a,b)
 #define IFilterGraph_AddRef(p)   (p)->lpVtbl->AddRef(p)
@@ -244,7 +244,7 @@
 ICOM_DEFINE(IEnumFilters,IUnknown)
 #undef INTERFACE
 
-#ifdef ICOM_CINTERFACE
+#ifdef COBJMACROS
 /*** IUnknown methods ***/
 #define IEnumFilters_QueryInterface(p,a,b)   (p)->lpVtbl->QueryInterface(p,a,b)
 #define IEnumFilters_AddRef(p)   (p)->lpVtbl->AddRef(p)
@@ -266,7 +266,7 @@
 ICOM_DEFINE(IEnumMediaTypes,IUnknown)
 #undef INTERFACE
 
-#ifdef ICOM_CINTERFACE
+#ifdef COBJMACROS
 /*** IUnknown methods ***/
 #define IEnumMediaTypes_QueryInterface(p,a,b)   (p)->lpVtbl->QueryInterface(p,a,b)
 #define IEnumMediaTypes_AddRef(p)   (p)->lpVtbl->AddRef(p)
@@ -288,7 +288,7 @@
 ICOM_DEFINE(IReferenceClock,IUnknown)
 #undef INTERFACE
 
-#ifdef ICOM_CINTERFACE
+#ifdef COBJMACROS
 /*** IUnknown methods ***/
 #define IReferenceClock_QueryInterface(p,a,b)   (p)->lpVtbl->QueryInterface(p,a,b)
 #define IReferenceClock_AddRef(p)   (p)->lpVtbl->AddRef(p)
@@ -313,7 +313,7 @@
 ICOM_DEFINE(IGraphBuilder,IFilterGraph)
 #undef INTERFACE
 
-#ifdef ICOM_CINTERFACE
+#ifdef COBJMACROS
 /*** IUnknown methods ***/
 #define IGraphBuilder_QueryInterface(p,a,b)   (p)->lpVtbl->QueryInterface(p,a,b)
 #define IGraphBuilder_AddRef(p)   (p)->lpVtbl->AddRef(p)
@@ -360,7 +360,7 @@
 ICOM_DEFINE(IMediaSeeking,IUnknown)
 #undef INTERFACE
 
-#ifdef ICOM_CINTERFACE
+#ifdef COBJMACROS
 /*** IUnknown methods ***/
 #define IMediaSeeking_QueryInterface(p,a,b)   (p)->lpVtbl->QueryInterface(p,a,b)
 #define IMediaSeeking_AddRef(p)   (p)->lpVtbl->AddRef(p)