[ros-diffs] [greatlrd] 26214: more compatible fix betwin reactos ddk and ms DDK version 3790.1830

Author: greatlrd
Date: Sat Mar 31 00:49:26 2007
New Revision: 26214

URL: http://svn.reactos.org/svn/reactos?rev=26214&view=rev
Log:
more compatible fix betwin reactos ddk and ms DDK version 3790.1830

Added:
    trunk/reactos/include/ddk/ksuuids.h   (with props)
Modified:
    trunk/reactos/include/ddk/tvout.h

Added: trunk/reactos/include/ddk/ksuuids.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ksuuids.h?rev=…
==============================================================================
--- trunk/reactos/include/ddk/ksuuids.h (added)
+++ trunk/reactos/include/ddk/ksuuids.h Sat Mar 31 00:49:26 2007
@@ -1,0 +1,53 @@
+
+
+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( MEDIATYPE_MPEG2_SECTIONS,               0x455F176C, 0x4B06, 0x47CE, 0x9A,
0xEF, 0x8c, 0xAE, 0xF7, 0x3D, 0xF7, 0xB5)
+OUR_GUID_ENTRY(MEDIASUBTYPE_ATSC_SI,                    0xB3C7397C, 0xD303, 0x414D, 0xB3,
0x3C, 0x4E, 0xD2, 0xC9, 0xD2, 0x97, 0x33)
+OUR_GUID_ENTRY(MEDIASUBTYPE_DVB_SI,                     0xE9dD31A3, 0x221D, 0x4ADB, 0x85,
0x32, 0x9A, 0xF3, 0x9, 0xC1, 0xA4, 0x8)
+OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2DATA,                  0xC892E55B, 0x252D, 0x42B5, 0xA3,
0x16, 0xD9, 0x97, 0xE7, 0xA5, 0xD9, 0x95)
+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,                       0xF72A76A0, 0xEB0A, 0x11D0, 0xAC,
0xE4, 0x0, 0x0, 0xC0, 0xcc, 0x16, 0xBA)
+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_MPEG2_TRANSPORT_STRIDE,     0x138AA9A4, 0x1EE2, 0x4C5B, 0x98,
0x8E, 0x19, 0xAB, 0xFD, 0xBC, 0x8A, 0x11)
+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(MEDIASUBTYPE_DVD_SUBPICTURE,             0xE06D802D, 0xDB46, 0x11CF, 0xB4,
0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA)
+OUR_GUID_ENTRY(MEDIASUBTYPE_DVD_LPCM_AUDIO,             0xE06D8032, 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_DVD_NAVIGATION_DSI,         0xE06D8030, 0xDB46, 0x11CF, 0xB4,
0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA)
+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(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(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,                   0x65E8773D, 0x8F56, 0x11D0, 0xA3,
0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96)
+OUR_GUID_ENTRY(AM_KSCATEGORY_RENDER,                    0x65E8773E, 0x8F56, 0x11D0, 0xA3,
0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96)
+OUR_GUID_ENTRY(AM_KSCATEGORY_DATACOMPRESSOR,            0x1E84C900, 0x7E70, 0x11D0, 0xA5,
0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00)
+OUR_GUID_ENTRY(AM_KSCATEGORY_AUDIO,                     0x6994AD04, 0x93EF, 0x11D0, 0xA3,
0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96)
+OUR_GUID_ENTRY(AM_KSCATEGORY_VIDEO,                     0x6994AD05, 0x93EF, 0x11D0, 0xA3,
0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96)
+OUR_GUID_ENTRY(AM_KSCATEGORY_TVTUNER,                   0xA799A800, 0xA46D, 0x11D0, 0xA1,
0x8C, 0x00, 0xa0, 0x24, 0x01, 0xDC, 0xD4)
+OUR_GUID_ENTRY(AM_KSCATEGORY_CROSSBAR,                  0xA799A801, 0xA46D, 0x11D0, 0xA1,
0x8C, 0x00, 0xa0, 0x24, 0x01, 0xDC, 0xD4)
+OUR_GUID_ENTRY(AM_KSCATEGORY_TVAUDIO,                   0xA799A802, 0xA46D, 0x11D0, 0xA1,
0x8C, 0x00, 0xa0, 0x24, 0x01, 0xDC, 0xD4)
+OUR_GUID_ENTRY(AM_KSCATEGORY_VBICODEC,                  0x07DAD660, 0x22F1, 0x11D1, 0xa9,
0xF4, 0x00, 0xc0, 0x4F, 0xBB, 0xDE, 0x8F)
+OUR_GUID_ENTRY(AM_KSCATEGORY_SPLITTER,                  0x0A4252A0, 0x7E70, 0x11D0, 0xA5,
0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00)
+OUR_GUID_ENTRY(IID_IKsInterfACeHandler,                 0xD3ABC7E0, 0x9A61, 0x11D0, 0xA4,
0x0D, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96)
+OUR_GUID_ENTRY(IID_IKsDataTypeHandler,                  0x5FFBAA02, 0x49A3, 0x11D0, 0x9F,
0x36, 0x00, 0xAA, 0x00, 0xA2, 0x16, 0xA1)
+OUR_GUID_ENTRY(IID_IKsPin,                              0xB61178D1, 0xA2D9, 0x11CF, 0x9E,
0x53, 0x00, 0xAA, 0x00, 0xA2, 0x16, 0xa1)
+OUR_GUID_ENTRY(IID_IKsControl,                          0x28F54685, 0x06FD, 0x11D2, 0xB2,
0x7A, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96)
+OUR_GUID_ENTRY(IID_IKsPinFACtory,                       0xCD5EBE6B, 0x8B6E, 0x11D1, 0x8A,
0xE0, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96)
+OUR_GUID_ENTRY(AM_INTERFACESETID_Standard,              0x1A8766A0, 0x62CE, 0x11CF, 0xA5,
0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00)
+

Propchange: trunk/reactos/include/ddk/ksuuids.h
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/include/ddk/tvout.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/tvout.h?rev=26…
==============================================================================
--- trunk/reactos/include/ddk/tvout.h (original)
+++ trunk/reactos/include/ddk/tvout.h Sat Mar 31 00:49:26 2007
@@ -23,12 +23,18 @@
 #ifndef __TVOUT_H
 #define __TVOUT_H
 
+
 #if __GNUC__ >=3
 #pragma GCC system_header
 #endif
 
-#ifdef __cplusplus
-extern "C" {
+#if _MSC_VER > 1000
+#pragma once
+#endif
+
+
+#ifndef GUID_DEFINED
+#include <guiddef.h>
 #endif
 
 /* VIDEOPARAMETERS.dwCommand constants */
@@ -107,8 +113,5 @@
   BYTE  bOEMCopyProtection[256];
 } VIDEOPARAMETERS, *PVIDEOPARAMETERS, FAR *LPVIDEOPARAMETERS;
 
-#ifdef __cplusplus
-}
-#endif
 
 #endif /* __TVOUT_H */