[akhaldi] 59041: [DXSDK] * We no longer need amvideo.h. * Update amvideo.idl.

Author: akhaldi
Date: Sun May 19 13:52:15 2013
New Revision: 59041

URL: http://svn.reactos.org/svn/reactos?rev=59041&view=rev
Log:
[DXSDK]
* We no longer need amvideo.h.
* Update amvideo.idl.

Removed:
    trunk/reactos/include/dxsdk/amvideo.h
Modified:
    trunk/reactos/include/dxsdk/amvideo.idl

Removed: trunk/reactos/include/dxsdk/amvideo.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/amvideo.h?re…
==============================================================================
--- trunk/reactos/include/dxsdk/amvideo.h	[iso-8859-1] (original)
+++ trunk/reactos/include/dxsdk/amvideo.h	(removed)
@@ -1,260 +0,0 @@
-/*
- * amvideo.h
- *
- * DirectX header
- *
- * Copyright Magnus Olsen (magnus(a)greatlord.com)
- */
-
-#ifndef __AMVIDEO__
-#define __AMVIDEO__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <ddraw.h>
-
-#define  AMDDS_NONE        0x00
-#define  AMDDS_DCIPS       0x01
-#define  AMDDS_PS          0x02
-#define  AMDDS_RGBOVR      0x04
-#define  AMDDS_YUVOVR      0x08
-#define  AMDDS_RGBOFF      0x10
-#define  AMDDS_YUVOFF      0x20
-#define  AMDDS_RGBFLP      0x40
-#define  AMDDS_YUVFLP      0x80
-#define  AMDDS_            ALL 0xFF
-#define  AMDDS_DEFAULT     AMDDS_ALL
-#define  AMDDS_YUV         (AMDDS_YUVOFF | AMDDS_YUVOVR | AMDDS_YUVFLP)
-#define  AMDDS_RGB         (AMDDS_RGBOFF | AMDDS_RGBOVR | AMDDS_RGBFLP)
-#define  AMDDS_PRIMARY     (AMDDS_DCIPS | AMDDS_PS)
-#define  iPALETTE_COLORS   256
-#define  iEGA_COLORS       16
-#define  iMASK_COLORS      3
-#define  iTRUECOLOR        16
-#define  iRED              0
-#define  iGREEN            1
-#define  iBLUE             2
-#define  iPALETTE          8
-#define  iMAXBITS          8
-
-typedef struct tag_TRUECOLORINFO
-{
-         DWORD             dwBitMasks[iMASK_COLORS];
-         RGBQUAD           bmiColors[iPALETTE_COLORS];
-} TRUECOLORINFO;
-
-
-typedef struct tagVIDEOINFOHEADER
-{
-         RECT              rcSource;
-         RECT              rcTarget;
-         DWORD             dwBitRate;
-         DWORD             dwBitErrorRate;
-         REFERENCE_TIME    AvgTimePerFrame;
-         BITMAPINFOHEADER  bmiHeader;
-} VIDEOINFOHEADER;
-
-
-typedef struct tagVIDEOINFO
-{
-         RECT               rcSource;
-         RECT               rcTarget;
-         DWORD              dwBitRate;
-         DWORD              dwBitErrorRate;
-         REFERENCE_TIME     AvgTimePerFrame;
-         BITMAPINFOHEADER   bmiHeader;
-         union
-         {
-               RGBQUAD       bmiColors[iPALETTE_COLORS];
-               DWORD         dwBitMasks[iMASK_COLORS];
-               TRUECOLORINFO TrueColorInfo;
-         };
-} VIDEOINFO;
-
-typedef struct tagMPEG1VIDEOINFO
-{
-        VIDEOINFOHEADER      hdr;
-        DWORD                dwStartTimeCode;
-        DWORD                cbSequenceHeader;
-        BYTE                 bSequenceHeader[1];
-} MPEG1VIDEOINFO;
-
-typedef struct tagAnalogVideoInfo
-{
-        RECT                 rcSource;
-        RECT                 rcTarget;
-        DWORD                dwActiveWidth;
-        DWORD                dwActiveHeight;
-        REFERENCE_TIME       AvgTimePerFrame;
-} ANALOGVIDEOINFO;
-
-#define TRUECOLOR(PBMIH)  ((TRUECOLORINFO *)(((LPBYTE)&((PBMIH)->bmiHeader)) +
(PBMIH)->bmiHeader.biSize))
-#define COLORS(PBMIH)	  ((RGBQUAD *)(((LPBYTE)&((PBMIH)->bmiHeader)) +
(PBMIH)->bmiHeader.biSize))
-#define BITMASKS(PBMIH)	  ((DWORD *)(((LPBYTE)&((PBMIH)->bmiHeader)) +
(PBMIH)->bmiHeader.biSize))
-
-#define SIZE_EGA_PALETTE  (iEGA_COLORS * sizeof(RGBQUAD))
-#define SIZE_PALETTE      (iPALETTE_COLORS * sizeof(RGBQUAD))
-#define SIZE_MASKS        (iMASK_COLORS * sizeof(DWORD))
-#define SIZE_PREHEADER    (FIELD_OFFSET(VIDEOINFOHEADER,bmiHeader))
-#define SIZE_VIDEOHEADER  (sizeof(BITMAPINFOHEADER) + SIZE_PREHEADER)
-
-#define WIDTHBYTES(BTIS)  ((DWORD)(((BTIS)+31) & (~31)) / 8)
-#define DIBWIDTHBYTES(BI) (DWORD)(BI).biBitCount) *
(DWORD)WIDTHBYTES((DWORD)(BI).biWidth
-#define _DIBSIZE(BI)      (DIBWIDTHBYTES(BI) * (DWORD)(BI).biHeight)
-#define DIBSIZE(BI)       ((BI).biHeight < 0 ? (-1)*(_DIBSIZE(BI)) : _DIBSIZE(BI))
-
-#define BIT_MASKS_MATCH(PBMIH1,PBMIH2)                                \
-        ((PBMIH2)->dwBitMasks[iGREEN] == (PBMIH1)->dwBitMasks[iGREEN]) &&
\
-        (((PBMIH2)->dwBitMasks[iRED] == (PBMIH1)->dwBitMasks[iRED]) &&     
  \
-        ((PBMIH2)->dwBitMasks[iBLUE] == (PBMIH1)->dwBitMasks[iBLUE]))
-
-#define    RESET_MASKS(PBMIH)           
(ZeroMemory((PVOID)(PBMIH)->dwBitFields,SIZE_MASKS))
-#define    RESET_HEADER(PBMIH)           (ZeroMemory((PVOID)(PBMIH),SIZE_VIDEOHEADER))
-#define    RESET_PALETTE(PBMIH)         
(ZeroMemory((PVOID)(PBMIH)->bmiColors,SIZE_PALETTE));
-#define    PALETTISED(PBMIH)             ((PBMIH)->bmiHeader.biBitCount <=
iPALETTE)
-#define    PALETTE_ENTRIES(PBMIH)        ((DWORD) 1 <<
(PBMIH)->bmiHeader.biBitCount)
-#define    HEADER(pVideoInfo)            (&(((VIDEOINFOHEADER *)
(pVideoInfo))->bmiHeader))
-#define    MAX_SIZE_MPEG1_SEQUENCE_INFO  140
-#define    MPEG1_SEQUENCE_INFO(pv)       ((const BYTE *)(pv)->bSequenceHeader)
-#define    SIZE_MPEG1VIDEOINFO(pv)       (FIELD_OFFSET(MPEG1VIDEOINFO,
bSequenceHeader[0]) + \
-                                         (pv)->cbSequenceHeader)
-
-#undef INTERFACE
-#define INTERFACE IDirectDrawVideo
-
-DECLARE_INTERFACE_(IDirectDrawVideo, IUnknown)
-{
-  STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID *ppvObj) PURE;
-  STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-  STDMETHOD_(ULONG,Release)(THIS) PURE;
-  STDMETHOD(GetSwitches)(THIS_ DWORD *pSwitches) PURE;
-  STDMETHOD(SetSwitches)(THIS_ DWORD Switches) PURE;
-  STDMETHOD(GetCaps)(THIS_ DDCAPS *pCaps) PURE;
-  STDMETHOD(GetEmulatedCaps)(THIS_ DDCAPS *pCaps) PURE;
-  STDMETHOD(GetSurfaceDesc)(THIS_ DDSURFACEDESC *pSurfaceDesc) PURE;
-  STDMETHOD(GetFourCCCodes)(THIS_ DWORD *pCount,DWORD *pCodes) PURE;
-  STDMETHOD(SetDirectDraw)(THIS_ LPDIRECTDRAW pDirectDraw) PURE;
-  STDMETHOD(GetDirectDraw)(THIS_ LPDIRECTDRAW *ppDirectDraw) PURE;
-  STDMETHOD(GetSurfaceType)(THIS_ DWORD *pSurfaceType) PURE;
-  STDMETHOD(SetDefault)(THIS) PURE;
-  STDMETHOD(UseScanLine)(THIS_ long UseScanLine) PURE;
-  STDMETHOD(CanUseScanLine)(THIS_ long *UseScanLine) PURE;
-  STDMETHOD(UseOverlayStretch)(THIS_ long UseOverlayStretch) PURE;
-  STDMETHOD(CanUseOverlayStretch)(THIS_ long *UseOverlayStretch) PURE;
-  STDMETHOD(UseWhenFullScreen)(THIS_ long UseWhenFullScreen) PURE;
-  STDMETHOD(WillUseFullScreen)(THIS_ long *UseWhenFullScreen) PURE;
-};
-
-
-#undef INTERFACE
-#define INTERFACE IFullScreenVideo
-
-DECLARE_INTERFACE_(IFullScreenVideo, IUnknown)
-{
-  STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID *ppvObj) PURE;
-  STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-  STDMETHOD_(ULONG,Release)(THIS) PURE;
-  STDMETHOD(CountModes)(THIS_ long *pModes) PURE;
-  STDMETHOD(GetModeInfo)(THIS_ long Mode,long *pWidth,long *pHeight,long *pDepth) PURE;
-  STDMETHOD(GetCurrentMode)(THIS_ long *pMode) PURE;
-  STDMETHOD(IsModeAvailable)(THIS_ long Mode) PURE;
-  STDMETHOD(IsModeEnabled)(THIS_ long Mode) PURE;
-  STDMETHOD(SetEnabled)(THIS_ long Mode,long bEnabled) PURE;
-  STDMETHOD(GetClipFactor)(THIS_ long *pClipFactor) PURE;
-  STDMETHOD(SetClipFactor)(THIS_ long ClipFactor) PURE;
-  STDMETHOD(SetMessageDrain)(THIS_ HWND hwnd) PURE;
-  STDMETHOD(GetMessageDrain)(THIS_ HWND *hwnd) PURE;
-  STDMETHOD(SetMonitor)(THIS_ long Monitor) PURE;
-  STDMETHOD(GetMonitor)(THIS_ long *Monitor) PURE;
-  STDMETHOD(HideOnDeactivate)(THIS_ long Hide) PURE;
-  STDMETHOD(IsHideOnDeactivate)(THIS) PURE;
-  STDMETHOD(SetCaption)(THIS_ BSTR strCaption) PURE;
-  STDMETHOD(GetCaption)(THIS_ BSTR *pstrCaption) PURE;
-  STDMETHOD(SetDefault)(THIS) PURE;
-};
-
-#undef INTERFACE
-#define INTERFACE IQualProp
-
-DECLARE_INTERFACE_(IQualProp, IUnknown)
-{
-  STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID *ppvObj) PURE;
-  STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-  STDMETHOD_(ULONG,Release)(THIS) PURE;
-  STDMETHOD(get_FramesDroppedInRenderer)(THIS_ int *pcFrames) PURE;
-  STDMETHOD(get_FramesDrawn)(THIS_ int *pcFramesDrawn) PURE;
-  STDMETHOD(get_AvgFrameRate)(THIS_ int *piAvgFrameRate) PURE;
-  STDMETHOD(get_Jitter)(THIS_ int *iJitter) PURE;
-  STDMETHOD(get_AvgSyncOffset)(THIS_ int *piAvg) PURE;
-  STDMETHOD(get_DevSyncOffset)(THIS_ int *piDev) PURE;
-};
-
-
-#undef INTERFACE
-#define INTERFACE IBaseVideoMixer
-
-DECLARE_INTERFACE_(IBaseVideoMixer, IUnknown)
-{
-  STDMETHOD(SetLeadPin)(THIS_ int iPin) PURE;
-  STDMETHOD(GetLeadPin)(THIS_ int *piPin) PURE;
-  STDMETHOD(GetInputPinCount)(THIS_ int *piPinCount) PURE;
-  STDMETHOD(IsUsingClock)(THIS_ int *pbValue) PURE;
-  STDMETHOD(SetUsingClock)(THIS_ int bValue) PURE;
-  STDMETHOD(GetClockPeriod)(THIS_ int *pbValue) PURE;
-  STDMETHOD(SetClockPeriod)(THIS_ int bValue) PURE;
-};
-
-#undef INTERFACE
-#define INTERFACE IFullScreenVideoEx
-
-DECLARE_INTERFACE_(IFullScreenVideoEx, IFullScreenVideo)
-{
-  STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID *ppvObj) PURE;
-  STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-  STDMETHOD_(ULONG,Release)(THIS) PURE;
-  STDMETHOD(CountModes)(THIS_ long *pModes) PURE;
-  STDMETHOD(GetModeInfo)(THIS_ long Mode,long *pWidth,long *pHeight,long *pDepth) PURE;
-  STDMETHOD(GetCurrentMode)(THIS_ long *pMode) PURE;
-  STDMETHOD(IsModeAvailable)(THIS_ long Mode) PURE;
-  STDMETHOD(IsModeEnabled)(THIS_ long Mode) PURE;
-  STDMETHOD(SetEnabled)(THIS_ long Mode,long bEnabled) PURE;
-  STDMETHOD(GetClipFactor)(THIS_ long *pClipFactor) PURE;
-  STDMETHOD(SetClipFactor)(THIS_ long ClipFactor) PURE;
-  STDMETHOD(SetMessageDrain)(THIS_ HWND hwnd) PURE;
-  STDMETHOD(GetMessageDrain)(THIS_ HWND *hwnd) PURE;
-  STDMETHOD(SetMonitor)(THIS_ long Monitor) PURE;
-  STDMETHOD(GetMonitor)(THIS_ long *Monitor) PURE;
-  STDMETHOD(HideOnDeactivate)(THIS_ long Hide) PURE;
-  STDMETHOD(IsHideOnDeactivate)(THIS) PURE;
-  STDMETHOD(SetCaption)(THIS_ BSTR strCaption) PURE;
-  STDMETHOD(GetCaption)(THIS_ BSTR *pstrCaption) PURE;
-  STDMETHOD(SetDefault)(THIS) PURE;
-  STDMETHOD(SetAcceleratorTable)(THIS_ HWND hwnd,HACCEL hAccel) PURE;
-  STDMETHOD(GetAcceleratorTable)(THIS_ HWND *phwnd,HACCEL *phAccel) PURE;
-  STDMETHOD(KeepPixelAspectRatio)(THIS_ long KeepAspect) PURE;
-  STDMETHOD(IsKeepPixelAspectRatio)(THIS_ long *pKeepAspect) PURE;
-};
-
-
-
-
-typedef enum
-{
-  AM_PROPERTY_FRAMESTEP_STEP            = 0x01,
-  AM_PROPERTY_FRAMESTEP_CANCEL          = 0x02,
-  AM_PROPERTY_FRAMESTEP_CANSTEP         = 0x03,
-  AM_PROPERTY_FRAMESTEP_CANSTEPMULTIPLE = 0x04
-} AM_PROPERTY_FRAMESTEP;
-
-typedef struct _AM_FRAMESTEP_STEP
-{
-    DWORD dwFramesToStep;
-} AM_FRAMESTEP_STEP;
-
-#ifdef __cplusplus
-}
-#endif
-#endif
-

Modified: trunk/reactos/include/dxsdk/amvideo.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/amvideo.idl?…
==============================================================================
--- trunk/reactos/include/dxsdk/amvideo.idl	[iso-8859-1] (original)
+++ trunk/reactos/include/dxsdk/amvideo.idl	[iso-8859-1] Sun May 19 13:52:15 2013
@@ -21,7 +21,7 @@
 /* trick widl into thinking that it knows the DirectDraw types 
  * as there is no IDL file for them (yet) */
 cpp_quote("#if 0")
-typedef void * LPDIRECTDRAW;
+interface IDirectDraw;
 typedef void DDSURFACEDESC,DDCAPS;
 typedef DWORD RGBQUAD;
 typedef LONGLONG REFERENCE_TIME;
@@ -61,7 +61,7 @@
 
 [
     object,
-    uuid(36d39eb0-dd75-11ce-bf0e-00aa0055595a),
+    /* uuid(36d39eb0-dd75-11ce-bf0e-00aa0055595a)  conflicts with uuids.h */
     pointer_default(unique),
     local
 ]
@@ -73,8 +73,8 @@
     HRESULT GetEmulatedCaps([out] DDCAPS *pCaps);
     HRESULT GetSurfaceDesc([out] DDSURFACEDESC * pSurfaceDesc);
     HRESULT GetFourCCCodes([out] DWORD * pCount, [out] DWORD * pCodes);
-    HRESULT SetDirectDraw([in] LPDIRECTDRAW pDirectDraw);
-    HRESULT GetDirectDraw([out] LPDIRECTDRAW * ppDirectDraw);
+    HRESULT SetDirectDraw([in] IDirectDraw *ddraw);
+    HRESULT GetDirectDraw([out] IDirectDraw **ddraw);
     HRESULT GetSurfaceType([out] DWORD * pSurfaceType);
     HRESULT SetDefault();
     HRESULT UseScanLine([in] long UseScanLine);
@@ -87,7 +87,7 @@
 
 [
     object,
-    uuid(1bd0ecb0-f8e2-11ce-aac6-0020af0b99a3),
+    /* uuid(1bd0ecb0-f8e2-11ce-aac6-0020af0b99a3)  conflicts with uuids.h */
     pointer_default(unique),
     local
 ]
@@ -103,7 +103,7 @@
 
 [
     object,
-    uuid(dd1d7110-7836-11cf-bf47-00aa0055595a),
+    /* uuid(dd1d7110-7836-11cf-bf47-00aa0055595a)  conflicts with uuids.h */
     pointer_default(unique)
 ]
 interface IFullScreenVideo : IUnknown
@@ -129,7 +129,7 @@
 
 [
     object,
-    uuid(53479470-f1dd-11cf-bc42-00aa00ac74f6),
+    /* uuid(53479470-f1dd-11cf-bc42-00aa00ac74f6)  conflicts with uuids.h */
     pointer_default(unique),
     local
 ]
@@ -144,7 +144,7 @@
 
 [
     object,
-    uuid(61ded640-e912-11ce-a099-00aa00479a58),
+    /* uuid(61ded640-e912-11ce-a099-00aa00479a58)  conflicts with uuids.h */
     pointer_default(unique),
     local
 ]
@@ -204,7 +204,7 @@
         RGBQUAD bmiColors[iPALETTE_COLORS];
         DWORD dwBitMasks[iMASK_COLORS];
         TRUECOLORINFO TrueColorInfo;
-    } DUMMYUNIONNAME;
+    };
 } VIDEOINFO;
 
 typedef struct tagMPEG1VIDEOINFO