do not mix in wine header here the guids, CLSID is wrong for dx stuff in wine.

svn path=/trunk/; revision=32960

diff --git a/reactos/include/dxsdk/aviriff.h b/reactos/include/dxsdk/aviriff.h
index 665cb62..261ab09 100644 (file)
--- a/reactos/include/dxsdk/aviriff.h
+++ b/reactos/include/dxsdk/aviriff.h
@@ -141,9 +141,7 @@ typedef struct _avistreamheader
   } rcFrame;
 } AVISTREAMHEADER;
 
-#if defined(_MSC_VER)
 #pragma warning(disable:4200)
-#endif
 
 typedef struct _avioldindex
 {
@@ -306,4 +304,4 @@ typedef struct _avifieldindex_chunk
 
 #include <poppack.h>
 
-#endif
+#endif
\ No newline at end of file

diff --git a/reactos/include/dxsdk/dxsdk.rbuild b/reactos/include/dxsdk/dxsdk.rbuild
index 8caad47..fb78b96 100644 (file)
--- a/reactos/include/dxsdk/dxsdk.rbuild
+++ b/reactos/include/dxsdk/dxsdk.rbuild
@@ -10,7 +10,6 @@
        <file>mediaobj.idl</file>
        <file>medparam.idl</file>
        <file>mmstream.idl</file>
-       <file>qedit.idl</file>
        <file>regbag.idl</file>
        <file>tvratings.idl</file>
        <file>vidcap.idl</file>

diff --git a/reactos/include/dxsdk/ksuuids.h b/reactos/include/dxsdk/ksuuids.h
index 5fe247b..6a9431e 100644 (file)
--- a/reactos/include/dxsdk/ksuuids.h
+++ b/reactos/include/dxsdk/ksuuids.h
@@ -1,50 +1,50 @@
 #ifndef __KSUUIDS__
 #define __KSUUIDS__
 
-OUR_GUID_ENTRY(MEDIASUBTYPE_DVD_NAVIGATION_PROVIDER, 0xE06D8031,  0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA)
-OUR_GUID_ENTRY(FORMAT_MPEG2Video,                    0xE06D80e3,  0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA)
-OUR_GUID_ENTRY(FORMAT_DolbyAC3,                      0xE06D80e4,  0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA)
-OUR_GUID_ENTRY(AM_KSPROPSETID_DVD_RateChange,        0x3577EB09,  0x9582, 0x477F, 0xB2, 0x9C, 0xB0, 0xC4, 0x52,  0xA4, 0xFF, 0x9A)
-OUR_GUID_ENTRY(AM_KSPROPSETID_DvdKaraoke,            0xAE4720AE,  0xAA71, 0x42D8, 0xB8, 0x2A, 0xFF, 0xFD, 0xF5,  0x8B, 0x76, 0xFD)
-OUR_GUID_ENTRY(AM_KSPROPSETID_FrameStep,             0xC830ACBD,  0xAB07, 0x492F, 0x88, 0x52, 0x45, 0xB6, 0x98,  0x7C, 0x29, 0x79)
-OUR_GUID_ENTRY(AM_KSCATEGORY_CAPTURE,                0x65E8773DL, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9,  0x22, 0x31, 0x96)
-OUR_GUID_ENTRY(AM_KSCATEGORY_VIDEO,                  0x6994AD05L, 0x93EF, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9,  0x22, 0x31, 0x96)
-OUR_GUID_ENTRY(AM_KSCATEGORY_TVTUNER,                0xa799a800L, 0xA46D, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0x24,  0x01, 0xdc, 0xD4)
-OUR_GUID_ENTRY(MEDIASUBTYPE_DVD_LPCM_AUDIO,          0xE06D8032,  0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA)
-OUR_GUID_ENTRY(MEDIASUBTYPE_DVD_NAVIGATION_DSI,      0xE06D8030,  0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA)
-OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2_PROGRAM,           0xE06D8022,  0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA)
-OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2_TRANSPORT,         0xE06D8023,  0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA)
-OUR_GUID_ENTRY(MEDIASUBTYPE_DTS,                     0xE06D8033,  0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA)
-OUR_GUID_ENTRY(MEDIASUBTYPE_SDDS,                    0xE06D8034,  0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA)
-OUR_GUID_ENTRY(MEDIATYPE_DVD_ENCRYPTED_PACK,         0xED0B916A,  0x044D, 0x11D1, 0xAA, 0x78, 0x00, 0xC0, 0x04F, 0xC3, 0x1D, 0x60)
-OUR_GUID_ENTRY(MEDIATYPE_DVD_NAVIGATION,             0xE06D802E,  0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA)
-OUR_GUID_ENTRY(MEDIASUBTYPE_DVD_NAVIGATION_PCI,      0xE06D802F,  0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA)
-OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2_AUDIO,             0xE06D802B,  0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA)
-OUR_GUID_ENTRY(MEDIASUBTYPE_DOLBY_AC3,               0xE06D802C,  0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA)
-OUR_GUID_ENTRY(IID_IKsPin,                           0xb61178D1L, 0xA2D9, 0x11CF, 0x9E, 0x53, 0x00, 0xAA, 0x00,  0xA2, 0x16, 0xA1)
-OUR_GUID_ENTRY(IID_IKsInterfaceHandler,              0xD3ABC7E0L, 0x9A61, 0x11D0, 0xA4, 0x0D, 0x00, 0xA0, 0xC9,  0x22, 0x31, 0x96)
-OUR_GUID_ENTRY(IID_IKsDataTypeHandler,               0x5FFBAA02L, 0x49A3, 0x11D0, 0x9F, 0x36, 0x00, 0xAA, 0x00,  0xA2, 0x16, 0xA1)
-OUR_GUID_ENTRY(AM_KSCATEGORY_RENDER,                 0x65E8773EL, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9,  0x22, 0x31, 0x96)
-OUR_GUID_ENTRY(AM_KSCATEGORY_DATACOMPRESSOR,         0x1E84C900L, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04,  0xC1, 0x00, 0x00)
-OUR_GUID_ENTRY(AM_KSCATEGORY_AUDIO,                  0x6994AD04L, 0x93EF, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9,  0x22, 0x31, 0x96)
-OUR_GUID_ENTRY(FORMAT_MPEG2Audio,                    0xE06D80e5,  0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA)
-OUR_GUID_ENTRY(FORMAT_DVD_LPCMAudio,                 0xE06D80E6,  0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA)
-OUR_GUID_ENTRY(AM_KSPROPSETID_AC3,                   0xBFABE720,  0x6E1F, 0x11D0, 0xBC, 0xF2, 0x44, 0x45, 0x53,  0x54, 0x00, 0x00)
-OUR_GUID_ENTRY(AM_KSPROPSETID_DvdSubPic,             0xAC390460,  0x43AF, 0x11D0, 0xbd, 0x6A, 0x00, 0x35, 0x05,  0xc1, 0x03, 0xA9)
-OUR_GUID_ENTRY(AM_KSPROPSETID_CopyProt,              0x0E8A0A40,  0x6AEF, 0x11D0, 0x9E, 0xD0, 0x00, 0xA0, 0x24,  0xCA, 0x19, 0xB3)
-OUR_GUID_ENTRY(AM_KSPROPSETID_TSRateChange,          0xA503C5C0,  0x1D1D, 0x11D1, 0xAD, 0x80, 0x44, 0x45, 0x53,  0x54, 0x0,  0x0 )
-OUR_GUID_ENTRY(IID_IKsPinFactory,                    0xCD5EBE6BL, 0x8B6E, 0x11D1, 0x8A, 0xE0, 0x00, 0xA0, 0xC9,  0x22, 0x31, 0x96)
-OUR_GUID_ENTRY(MEDIATYPE_MPEG2_PACK,                 0x36523B13,  0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0,  0x57, 0x66, 0x4A)
-OUR_GUID_ENTRY(MEDIATYPE_MPEG2_PES,                  0xE06D8020,  0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F,  0x6C, 0xBB, 0xEA)
-OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2_VIDEO,             0xE06D8026,  0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F,  0x6C, 0xBB, 0xEA)
-OUR_GUID_ENTRY(FORMAT_MPEG2_VIDEO,                   0xE06D80e3,  0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F,  0x6C, 0xBB, 0xEA)
-OUR_GUID_ENTRY(FORMAT_VIDEOINFO2,                    0xF72A76A0L, 0xEB0A, 0x11D0, 0xAC, 0xE4, 0x0,  0x0,  0xC0,  0xCC, 0x16, 0xBA)
-OUR_GUID_ENTRY(MEDIASUBTYPE_DVD_SUBPICTURE,          0xE06D802d,  0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA)
-OUR_GUID_ENTRY(AM_INTERFACESETID_Standard,           0x1A8766A0L, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04,  0xC1, 0x00, 0x00)
-OUR_GUID_ENTRY(IID_IKsControl,                       0x28F54685L, 0x06FD, 0x11D2, 0xB2, 0x7A, 0x00, 0xA0, 0xC9,  0x22, 0x31, 0x96)
-OUR_GUID_ENTRY(AM_KSCATEGORY_CROSSBAR,               0xa799a801L, 0xA46D, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0x24,  0x01, 0xdc, 0xD4)
-OUR_GUID_ENTRY(AM_KSCATEGORY_TVAUDIO,                0xa799a802L, 0xA46D, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0x24,  0x01, 0xdc, 0xD4)
-OUR_GUID_ENTRY(AM_KSCATEGORY_VBICODEC,               0x07dAD660L, 0x22F1, 0x11D1, 0xa9, 0xF4, 0x00, 0xc0, 0x4F,  0xBB, 0xDE, 0x8F)
-OUR_GUID_ENTRY(AM_KSCATEGORY_SPLITTER,               0x0A4252A0L, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04,  0xC1, 0x00, 0x00)
+OUR_GUID_ENTRY(MEDIASUBTYPE_DVD_NAVIGATION_PROVIDER,0xE06D8031, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA)
+OUR_GUID_ENTRY(FORMAT_MPEG2Video,0xE06D80e3, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA)
+OUR_GUID_ENTRY(FORMAT_DolbyAC3,0xE06D80e4, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA)
+OUR_GUID_ENTRY(AM_KSPROPSETID_DVD_RateChange,0x3577EB09, 0x9582, 0x477F, 0xB2, 0x9C, 0xB0, 0xC4, 0x52, 0xA4, 0xFF, 0x9A)
+OUR_GUID_ENTRY(AM_KSPROPSETID_DvdKaraoke,0xAE4720AE, 0xAA71, 0x42D8, 0xB8, 0x2A, 0xFF, 0xFD, 0xF5, 0x8B, 0x76, 0xFD)
+OUR_GUID_ENTRY(AM_KSPROPSETID_FrameStep,0xC830ACBD, 0xAB07, 0x492F, 0x88, 0x52, 0x45, 0xB6, 0x98, 0x7C, 0x29, 0x79)
+OUR_GUID_ENTRY(AM_KSCATEGORY_CAPTURE,0x65E8773DL, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96)
+OUR_GUID_ENTRY(AM_KSCATEGORY_VIDEO,0x6994AD05L, 0x93EF, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96)
+OUR_GUID_ENTRY(AM_KSCATEGORY_TVTUNER,0xa799a800L, 0xA46D, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0x24, 0x01, 0xdc, 0xD4)
+OUR_GUID_ENTRY(MEDIASUBTYPE_DVD_LPCM_AUDIO,0xE06D8032, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA)
+OUR_GUID_ENTRY(MEDIASUBTYPE_DVD_NAVIGATION_DSI,0xE06D8030, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA)
+OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2_PROGRAM,0xE06D8022, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA)
+OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2_TRANSPORT,0xE06D8023, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA)
+OUR_GUID_ENTRY(MEDIASUBTYPE_DTS,0xE06D8033, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA)
+OUR_GUID_ENTRY(MEDIASUBTYPE_SDDS,0xE06D8034, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA)
+OUR_GUID_ENTRY(MEDIATYPE_DVD_ENCRYPTED_PACK,0xED0B916A, 0x044D, 0x11D1, 0xAA, 0x78, 0x00, 0xC0, 0x04F, 0xC3, 0x1D, 0x60)
+OUR_GUID_ENTRY(MEDIATYPE_DVD_NAVIGATION,0xE06D802E, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA)
+OUR_GUID_ENTRY(MEDIASUBTYPE_DVD_NAVIGATION_PCI,0xE06D802F, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA)
+OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2_AUDIO,0xE06D802B, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA)
+OUR_GUID_ENTRY(MEDIASUBTYPE_DOLBY_AC3,0xE06D802C, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA)
+OUR_GUID_ENTRY(IID_IKsPin,0xb61178D1L, 0xA2D9, 0x11CF, 0x9E, 0x53, 0x00, 0xAA, 0x00, 0xA2, 0x16, 0xA1)
+OUR_GUID_ENTRY(IID_IKsInterfaceHandler,0xD3ABC7E0L, 0x9A61, 0x11D0, 0xA4, 0x0D, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96)
+OUR_GUID_ENTRY(IID_IKsDataTypeHandler,0x5FFBAA02L, 0x49A3, 0x11D0, 0x9F, 0x36, 0x00, 0xAA, 0x00, 0xA2, 0x16, 0xA1)
+OUR_GUID_ENTRY(AM_KSCATEGORY_RENDER,0x65E8773EL, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96)
+OUR_GUID_ENTRY(AM_KSCATEGORY_DATACOMPRESSOR,0x1E84C900L, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00)
+OUR_GUID_ENTRY(AM_KSCATEGORY_AUDIO,0x6994AD04L, 0x93EF, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96)
+OUR_GUID_ENTRY(FORMAT_MPEG2Audio,0xE06D80e5, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA)
+OUR_GUID_ENTRY(FORMAT_DVD_LPCMAudio,0xE06D80E6, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA)
+OUR_GUID_ENTRY(AM_KSPROPSETID_AC3,0xBFABE720, 0x6E1F, 0x11D0, 0xBC, 0xF2, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00)
+OUR_GUID_ENTRY(AM_KSPROPSETID_DvdSubPic,0xAC390460, 0x43AF, 0x11D0, 0xbd, 0x6A, 0x00, 0x35, 0x05, 0xc1, 0x03, 0xA9)
+OUR_GUID_ENTRY(AM_KSPROPSETID_CopyProt,0x0E8A0A40, 0x6AEF, 0x11D0, 0x9E, 0xD0, 0x00, 0xA0, 0x24, 0xCA, 0x19, 0xB3)
+OUR_GUID_ENTRY(AM_KSPROPSETID_TSRateChange,0xA503C5C0, 0x1D1D, 0x11D1, 0xAD, 0x80, 0x44, 0x45, 0x53, 0x54, 0x0, 0x0)
+OUR_GUID_ENTRY(IID_IKsPinFactory, 0xCD5EBE6BL, 0x8B6E, 0x11D1, 0x8A, 0xE0, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96)
+OUR_GUID_ENTRY(MEDIATYPE_MPEG2_PACK,0x36523B13, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A)
+OUR_GUID_ENTRY(MEDIATYPE_MPEG2_PES,0xE06D8020, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA)
+OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2_VIDEO,0xE06D8026, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA)
+OUR_GUID_ENTRY(FORMAT_MPEG2_VIDEO,0xE06D80e3, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA)
+OUR_GUID_ENTRY(FORMAT_VIDEOINFO2,0xF72A76A0L, 0xEB0A, 0x11D0, 0xAC, 0xE4, 0x0, 0x0, 0xC0, 0xCC, 0x16, 0xBA)
+OUR_GUID_ENTRY(MEDIASUBTYPE_DVD_SUBPICTURE,0xE06D802d, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA)
+OUR_GUID_ENTRY(AM_INTERFACESETID_Standard, 0x1A8766A0L, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00)
+OUR_GUID_ENTRY(IID_IKsControl,0x28F54685L, 0x06FD, 0x11D2, 0xB2, 0x7A, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96)
+OUR_GUID_ENTRY(AM_KSCATEGORY_CROSSBAR,0xa799a801L, 0xA46D, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0x24, 0x01, 0xdc, 0xD4)
+OUR_GUID_ENTRY(AM_KSCATEGORY_TVAUDIO,0xa799a802L, 0xA46D, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0x24, 0x01, 0xdc, 0xD4)
+OUR_GUID_ENTRY(AM_KSCATEGORY_VBICODEC,0x07dAD660L, 0x22F1, 0x11D1, 0xa9, 0xF4, 0x00, 0xc0, 0x4F, 0xBB, 0xDE, 0x8F)
+OUR_GUID_ENTRY(AM_KSCATEGORY_SPLITTER,0x0A4252A0L, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00)
 
 #endif

diff --git a/reactos/include/dxsdk/qedit.idl b/reactos/include/dxsdk/qedit.idl
deleted file mode 100644 (file)
index 48764c1..0000000
--- a/reactos/include/dxsdk/qedit.idl
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright (C) 2008 Google (Lei Zhang)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-import "oaidl.idl";
-import "ocidl.idl";
-/* import "dxtrans.idl"; */
-import "amstream.idl";
-import "msxml.idl";
-
-[
-    object,
-    uuid(0579154A-2B53-4994-B0D0-E773148EFF85),
-    local,
-    pointer_default(unique)
-]
-interface ISampleGrabberCB : IUnknown
-{
-    HRESULT SampleCB(
-        double SampleTime,
-        IMediaSample * pSample
-    );
-    HRESULT BufferCB(
-        double SampleTime,
-        BYTE * pBuffer,
-        long BufferLen
-    );
-}
-
-[
-    object,
-    uuid(6B652FFF-11FE-4fce-92AD-0266B5D7C78F),
-    local,
-    pointer_default(unique)
-]
-interface ISampleGrabber: IUnknown
-{
-    HRESULT SetOneShot(
-        BOOL OneShot
-    );
-
-    HRESULT SetMediaType(
-        const AM_MEDIA_TYPE * pType
-    );
-
-    HRESULT GetConnectedMediaType(
-        AM_MEDIA_TYPE * pType
-    );
-
-    HRESULT SetBufferSamples(
-        BOOL BufferThem
-    );
-
-    HRESULT GetCurrentBuffer(
-        [in,out] long * pBufferSize,
-        [out] long * pBuffer
-    );
-
-    HRESULT GetCurrentSample(
-        [out] IMediaSample ** ppSample
-    );
-
-    HRESULT SetCallback(
-        ISampleGrabberCB * pCallback,
-        long WhichMethodToCallback
-    );
-};
-
-[
-    object,
-    uuid(65bd0710-24d2-4FF7-9324-ed2e5d3abafa),
-    pointer_default(unique)
-]
-interface IMediaDet : IUnknown
-{
-    HRESULT get_Filter(
-        [out] IUnknown* *pVal
-    );
-
-    HRESULT put_Filter(
-        IUnknown* newVal
-    );
-
-    HRESULT get_OutputStreams(
-        [out] long *pVal
-    );
-
-    HRESULT get_CurrentStream(
-        [out] long *pVal
-    );
-
-    HRESULT put_CurrentStream(
-        long newVal
-    );
-
-    HRESULT get_StreamType(
-        [out] GUID *pVal
-    );
-
-    HRESULT get_StreamTypeB(
-        [out] BSTR *pVal
-    );
-
-    HRESULT get_StreamLength(
-        [out] double *pVal
-    );
-
-    HRESULT get_Filename(
-        [out] BSTR *pVal
-    );
-
-    HRESULT put_Filename(
-        BSTR newVal
-    );
-
-    HRESULT GetBitmapBits(
-        double StreamTime,
-        long * pBufferSize,
-        char * pBuffer,
-        long Width,
-        long Height
-    );
-
-    HRESULT WriteBitmapBits(
-        double StreamTime,
-        long Width,
-        long Height,
-        BSTR Filename
-    );
-
-    HRESULT get_StreamMediaType(
-        [out] AM_MEDIA_TYPE * pVal
-    );
-
-    HRESULT GetSampleGrabber(
-        [out] ISampleGrabber ** ppVal
-    );
-
-    HRESULT get_FrameRate(
-        [out] double *pVal
-    );
-
-    HRESULT EnterBitmapGrabMode(
-        double SeekTime
-    );
-};
-
-[
-    uuid(65BD0711-24D2-4ff7-9324-ED2E5D3ABAFA),
-]
-coclass MediaDet
-{
-    [default] interface IMediaDet;
-};

diff --git a/reactos/include/dxsdk/uuids.h b/reactos/include/dxsdk/uuids.h
index b10d1f3..66032c2 100644 (file)
--- a/reactos/include/dxsdk/uuids.h
+++ b/reactos/include/dxsdk/uuids.h
@@ -373,11 +373,8 @@ OUR_GUID_ENTRY(CLSID_TVEFilterTuneProperties,           0x05500281, 0xFAA5, 0x4D
 OUR_GUID_ENTRY(CLSID_TVEFilterCCProperties,             0x05500282, 0xFAA5, 0x4DF9, 0x82, 0x46, 0xBF, 0xC2, 0x3A, 0xC5, 0xCE, 0xA8)
 OUR_GUID_ENTRY(CLSID_TVEFilterStatsProperties,          0x05500283, 0xFAA5, 0x4DF9, 0x82, 0x46, 0xBF, 0xC2, 0x3A, 0xC5, 0xCE, 0xA8)
 OUR_GUID_ENTRY(CLSID_IVideoEncoderProxy,                0xB43c4eec, 0x8C32, 0x4791, 0x91, 0x02, 0x50, 0x8A, 0xda, 0x5E, 0xE8, 0xE7)
-OUR_GUID_ENTRY(CLSID_ICodecAPIProxy,                    0x7ff0997a, 0x1999, 0x4286, 0xA7, 0x3C, 0x62, 0x2B, 0x88, 0x14, 0xE7, 0xEB)
-OUR_GUID_ENTRY(CLSID_IVideoEncoderCodecAPIProxy,        0xB05dabd9, 0x56e5, 0x4Fdc, 0xAF, 0xA4, 0x8A, 0x47, 0xE9, 0x1F, 0x1C, 0x9C)
-OUR_GUID_ENTRY(CLSID_AVIDocWriter,                      0xd3588ab1, 0x0781, 0x11ce, 0xb0, 0x3a, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70)
-OUR_GUID_ENTRY(CLSID_NullRenderer,                      0xc1f400a4, 0x3f08, 0x11d3, 0x9f, 0x0b, 0x00, 0x60, 0x08, 0x03, 0x9e, 0x37)
-OUR_GUID_ENTRY(CLSID_WAVEParser,                        0xd51bd5a1, 0x7548, 0x11cf, 0xa5, 0x20, 0x00, 0x80, 0xc7, 0x7e, 0xf5, 0x8a)
+OUR_GUID_ENTRY(CLSID_ICodecAPIProxy,                    0x7ff0997a, 0x1999, 0x4286, 0xA7, 0x3C, 0x62, 0x2B, 0x88, 0x14, 0xE7, 0xEB )
+OUR_GUID_ENTRY(CLSID_IVideoEncoderCodecAPIProxy,        0xB05dabd9, 0x56e5, 0x4Fdc, 0xAF, 0xA4, 0x8A, 0x47, 0xE9, 0x1F, 0x1C, 0x9C )
 
 #ifndef __ENCODER_API_GUIDS__
 #define __ENCODER_API_GUIDS__