[ros-diffs] [dchapyshev] 36560: - Sync ddstream.idl with wine head - Add qedit.idl from wine

Author: dchapyshev
Date: Sun Sep 28 01:04:47 2008
New Revision: 36560

URL: http://svn.reactos.org/svn/reactos?rev=36560&view=rev
Log:
- Sync ddstream.idl with wine head
- Add qedit.idl from wine

Added:
    trunk/reactos/include/dxsdk/qedit.idl   (with props)
Modified:
    trunk/reactos/include/dxsdk/ddstream.idl
    trunk/reactos/include/dxsdk/dxsdk.rbuild

Modified: trunk/reactos/include/dxsdk/ddstream.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/ddstream.idl…
==============================================================================
--- trunk/reactos/include/dxsdk/ddstream.idl [iso-8859-1] (original)
+++ trunk/reactos/include/dxsdk/ddstream.idl [iso-8859-1] Sun Sep 28 01:04:47 2008
@@ -44,14 +44,14 @@
 interface IDirectDrawMediaStream : IMediaStream
 {
 	HRESULT GetFormat(
-		[out, optional] DDSURFACEDESC *pDDSDCurrent,
-		[out, optional] IDirectDrawPalette **ppDirectDrawPalette,
-		[out, optional] DDSURFACEDESC *pDDSDDesired,
-		[out, optional] DWORD *pdwFlags);
+		[out] DDSURFACEDESC *pDDSDCurrent,
+		[out] IDirectDrawPalette **ppDirectDrawPalette,
+		[out] DDSURFACEDESC *pDDSDDesired,
+		[out] DWORD *pdwFlags);
 
 	HRESULT SetFormat(
 		[in] const DDSURFACEDESC *pDDSurfaceDesc,
-		[in, optional] IDirectDrawPalette *pDirectDrawPalette);
+		[in] IDirectDrawPalette *pDirectDrawPalette);
 
 	HRESULT GetDirectDraw(
 		[out] IDirectDraw **ppDirectDraw);
@@ -60,8 +60,8 @@
 		[in] IDirectDraw *pDirectDraw);
 
 	HRESULT CreateSample(
-		[in, optional] IDirectDrawSurface *pSurface,
-		[in, optional] const RECT *pRect,
+		[in] IDirectDrawSurface *pSurface,
+		[in] const RECT *pRect,
 		[in] DWORD dwFlags,
 		[out] IDirectDrawStreamSample **ppSample);
 
@@ -79,8 +79,8 @@
 interface IDirectDrawStreamSample : IStreamSample
 {
 	HRESULT GetSurface(
-		[out, optional] IDirectDrawSurface ** ppDirectDrawSurface,
-		[out, optional] RECT * pRect);
+		[out] IDirectDrawSurface ** ppDirectDrawSurface,
+		[out] RECT * pRect);
 
 	HRESULT SetRect(
 		[in] const RECT * pRect);

Modified: trunk/reactos/include/dxsdk/dxsdk.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dxsdk.rbuild…
==============================================================================
--- trunk/reactos/include/dxsdk/dxsdk.rbuild [iso-8859-1] (original)
+++ trunk/reactos/include/dxsdk/dxsdk.rbuild [iso-8859-1] Sun Sep 28 01:04:47 2008
@@ -9,6 +9,7 @@
 	<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>

Added: trunk/reactos/include/dxsdk/qedit.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/qedit.idl?re…
==============================================================================
--- trunk/reactos/include/dxsdk/qedit.idl (added)
+++ trunk/reactos/include/dxsdk/qedit.idl [iso-8859-1] Sun Sep 28 01:04:47 2008
@@ -1,0 +1,168 @@
+/*
+ * 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;
+};

Propchange: trunk/reactos/include/dxsdk/qedit.idl
------------------------------------------------------------------------------
    svn:eol-style = native