mirror of
https://github.com/reactos/reactos.git
synced 2024-06-30 01:42:30 +00:00
[MSDMO]
sync msdmo with wine 1.1.38 svn path=/trunk/; revision=45583
This commit is contained in:
Christoph von Wittich
parent
dd15553124
commit
082d9c9fe7
|
|
@ -787,11 +787,11 @@ HRESULT read_types(HKEY root, LPCWSTR key, ULONG *supplied, ULONG requested, DMO
|
|||
* DMOGetTypes (MSDMO.@)
|
||||
*/
|
||||
HRESULT WINAPI DMOGetTypes(REFCLSID clsidDMO,
|
||||
unsigned long ulInputTypesRequested,
|
||||
unsigned long* pulInputTypesSupplied,
|
||||
ULONG ulInputTypesRequested,
|
||||
ULONG* pulInputTypesSupplied,
|
||||
DMO_PARTIAL_MEDIATYPE* pInputTypes,
|
||||
unsigned long ulOutputTypesRequested,
|
||||
unsigned long* pulOutputTypesSupplied,
|
||||
ULONG ulOutputTypesRequested,
|
||||
ULONG* pulOutputTypesSupplied,
|
||||
DMO_PARTIAL_MEDIATYPE* pOutputTypes)
|
||||
{
|
||||
HKEY root,hkey;
|
||||
|
|
@ -815,7 +815,7 @@ HRESULT WINAPI DMOGetTypes(REFCLSID clsidDMO,
|
|||
|
||||
if (ulInputTypesRequested > 0)
|
||||
{
|
||||
ret = read_types(hkey, szDMOInputType, (ULONG*)pulInputTypesSupplied, ulInputTypesRequested, pInputTypes );
|
||||
ret = read_types(hkey, szDMOInputType, pulInputTypesSupplied, ulInputTypesRequested, pInputTypes );
|
||||
}
|
||||
else
|
||||
*pulInputTypesSupplied = 0;
|
||||
|
|
@ -823,7 +823,7 @@ HRESULT WINAPI DMOGetTypes(REFCLSID clsidDMO,
|
|||
if (ulOutputTypesRequested > 0)
|
||||
{
|
||||
HRESULT ret2;
|
||||
ret2 = read_types(hkey, szDMOOutputType, (ULONG*)pulOutputTypesSupplied, ulOutputTypesRequested, pOutputTypes );
|
||||
ret2 = read_types(hkey, szDMOOutputType, pulOutputTypesSupplied, ulOutputTypesRequested, pOutputTypes );
|
||||
|
||||
if (ret == S_OK)
|
||||
ret = ret2;
|
||||
|
|
|
|||
|
|
@ -1,20 +1,34 @@
|
|||
/*
|
||||
* Copyright (C) 2002 Alexandre Julliard
|
||||
*
|
||||
* 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
|
||||
*/
|
||||
|
||||
#ifndef __DMO_H__
|
||||
#define __DMO_H__
|
||||
|
||||
#include "mediaerr.h"
|
||||
#include <mediaerr.h>
|
||||
|
||||
#ifdef FIX_LOCK_NAME
|
||||
#define Lock DMOLock
|
||||
#define Lock DMOLock
|
||||
#endif
|
||||
|
||||
#include "mediaobj.h"
|
||||
|
||||
#include <mediaobj.h>
|
||||
#ifdef FIX_LOCK_NAME
|
||||
#undef Lock
|
||||
#undef Lock
|
||||
#endif
|
||||
#include <dmoreg.h>
|
||||
#include <dmort.h>
|
||||
|
||||
#include "dmoreg.h"
|
||||
#include "dmort.h"
|
||||
|
||||
#endif /* __DMO_H__ */
|
||||
#endif /* __DMO_H__ */
|
||||
|
|
|
|||
|
|
@ -1,75 +1,70 @@
|
|||
/*
|
||||
* Copyright (C) 2002 Alexandre Julliard
|
||||
*
|
||||
* 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
|
||||
*/
|
||||
|
||||
#ifndef __DMOREG_H__
|
||||
#define __DMOREG_H__
|
||||
|
||||
#include "mediaobj.h"
|
||||
|
||||
DEFINE_GUID(DMOCATEGORY_ACOUSTIC_ECHO_CANCEL, 0xBF963D80, 0xC559, 0x11D0, 0x8A, 0x2B,0x00,0xA0,0xC9,0x25,0x5A,0xC1);
|
||||
DEFINE_GUID(DMOCATEGORY_AGC, 0xE88C9BA0, 0xC557, 0x11D0, 0x8A, 0x2B,0x00,0xA0,0xC9,0x25,0x5A,0xC1);
|
||||
DEFINE_GUID(DMOCATEGORY_AUDIO_CAPTURE_EFFECT, 0xF665AAba, 0x3E09, 0x4920, 0xAA, 0x5F,0x21,0x98,0x11,0x14,0x8F,0x09);
|
||||
DEFINE_GUID(DMOCATEGORY_AUDIO_DECODER, 0x57F2db8b, 0xE6BB, 0x4513, 0x9D, 0x43,0xDC,0xD2,0xA6,0x59,0x31,0x25);
|
||||
DEFINE_GUID(DMOCATEGORY_AUDIO_EFFECT, 0xF3602b3f, 0x0592, 0x48DF, 0xA4, 0xCD,0x67,0x47,0x21,0xE7,0xEB,0xEB);
|
||||
DEFINE_GUID(DMOCATEGORY_AUDIO_ENCODER, 0x33D9A761, 0x90C8, 0x11D0, 0xBD, 0x43,0x00,0xA0,0xC9,0x11,0xCE,0x86);
|
||||
DEFINE_GUID(DMOCATEGORY_AUDIO_NOISE_SUPPRESS, 0xE07f903f, 0x62FD, 0x4e60, 0x8C, 0xDD,0xDE,0xA7,0x23,0x66,0x65,0xB5);
|
||||
DEFINE_GUID(DMOCATEGORY_VIDEO_DECODER, 0x4A69b442, 0x28BE, 0x4991, 0x96, 0x9C,0xB5,0x00,0xAD,0xF5,0xd8,0xA8);
|
||||
DEFINE_GUID(DMOCATEGORY_VIDEO_EFFECT, 0xd990eE14, 0x776C, 0x4723, 0xBE, 0x46,0x3D,0xA2,0xF5,0x6F,0x10,0xB9);
|
||||
DEFINE_GUID(DMOCATEGORY_VIDEO_ENCODER, 0x33D9A760, 0x90C8, 0x11D0, 0xBD, 0x43,0x00,0xA0,0xC9,0x11,0xCE,0x86);
|
||||
|
||||
typedef struct _DMO_PARTIAL_MEDIATYPE
|
||||
{
|
||||
GUID type;
|
||||
GUID subtype;
|
||||
GUID type;
|
||||
GUID subtype;
|
||||
} DMO_PARTIAL_MEDIATYPE, *PDMO_PARTIAL_MEDIATYPE;
|
||||
|
||||
enum DMO_REGISTER_FLAGS
|
||||
{
|
||||
DMO_REGISTERF_IS_KEYED = 0x00000001
|
||||
DMO_REGISTERF_IS_KEYED = 1
|
||||
};
|
||||
|
||||
enum DMO_ENUM_FLAGS
|
||||
{
|
||||
DMO_ENUMF_INCLUDE_KEYED = 0x00000001
|
||||
DMO_ENUMF_INCLUDE_KEYED = 1
|
||||
};
|
||||
|
||||
STDAPI
|
||||
DMOEnum(
|
||||
REFGUID guidCategory,
|
||||
DWORD dwFlags,
|
||||
DWORD cInTypes,
|
||||
const DMO_PARTIAL_MEDIATYPE *pInTypes,
|
||||
DWORD cOutTypes,
|
||||
const DMO_PARTIAL_MEDIATYPE *pOutTypes,
|
||||
IEnumDMO **ppEnum);
|
||||
HRESULT WINAPI DMORegister(LPCWSTR,REFCLSID,REFGUID,DWORD,DWORD,const DMO_PARTIAL_MEDIATYPE*,
|
||||
DWORD,const DMO_PARTIAL_MEDIATYPE*);
|
||||
HRESULT WINAPI DMOUnregister(REFCLSID,REFGUID);
|
||||
HRESULT WINAPI DMOEnum(REFGUID,DWORD,DWORD,const DMO_PARTIAL_MEDIATYPE*,DWORD,
|
||||
const DMO_PARTIAL_MEDIATYPE*,IEnumDMO**);
|
||||
HRESULT WINAPI DMOGetTypes(REFCLSID,ULONG,ULONG*,DMO_PARTIAL_MEDIATYPE*,
|
||||
ULONG,ULONG*,DMO_PARTIAL_MEDIATYPE*);
|
||||
HRESULT WINAPI DMOGetName(REFCLSID,WCHAR[80]);
|
||||
|
||||
STDAPI
|
||||
DMOGetName(
|
||||
REFCLSID clsidDMO,
|
||||
WCHAR szName[80]);
|
||||
|
||||
STDAPI DMOGetTypes(
|
||||
REFCLSID clsidDMO,
|
||||
unsigned long ulInputTypesRequested,
|
||||
unsigned long *pulInputTypesSupplied,
|
||||
DMO_PARTIAL_MEDIATYPE *pInputTypes,
|
||||
unsigned long ulOutputTypesRequested,
|
||||
unsigned long *pulOutputTypesSupplied,
|
||||
DMO_PARTIAL_MEDIATYPE *pOutputTypes
|
||||
);
|
||||
|
||||
STDAPI
|
||||
DMORegister(
|
||||
LPCWSTR szName,
|
||||
REFCLSID clsidDMO,
|
||||
REFGUID guidCategory,
|
||||
DWORD dwFlags,
|
||||
DWORD cInTypes,
|
||||
const DMO_PARTIAL_MEDIATYPE *pInTypes,
|
||||
DWORD cOutTypes,
|
||||
const DMO_PARTIAL_MEDIATYPE *pOutTypes);
|
||||
|
||||
STDAPI
|
||||
DMOUnregister(
|
||||
REFCLSID clsidDMO,
|
||||
REFGUID guidCategory);
|
||||
|
||||
#endif
|
||||
DEFINE_GUID(DMOCATEGORY_AUDIO_DECODER,
|
||||
0x57f2db8b,0xe6bb,0x4513,0x9d,0x43,0xdc,0xd2,0xa6,0x59,0x31,0x25);
|
||||
DEFINE_GUID(DMOCATEGORY_AUDIO_ENCODER,
|
||||
0x33d9a761,0x90c8,0x11d0,0xbd,0x43,0x00,0xa0,0xc9,0x11,0xce,0x86);
|
||||
DEFINE_GUID(DMOCATEGORY_VIDEO_DECODER,
|
||||
0x4a69b442,0x28be,0x4991,0x96,0x9c,0xb5,0x00,0xad,0xf5,0xd8,0xa8);
|
||||
DEFINE_GUID(DMOCATEGORY_VIDEO_ENCODER,
|
||||
0x33d9a760,0x90c8,0x11d0,0xbd,0x43,0x00,0xa0,0xc9,0x11,0xce,0x86);
|
||||
DEFINE_GUID(DMOCATEGORY_AUDIO_EFFECT,
|
||||
0xf3602b3f,0x0592,0x48df,0xa4,0xcd,0x67,0x47,0x21,0xe7,0xeb,0xeb);
|
||||
DEFINE_GUID(DMOCATEGORY_VIDEO_EFFECT,
|
||||
0xd990ee14,0x776c,0x4723,0xbe,0x46,0x3d,0xa2,0xf5,0x6f,0x10,0xb9);
|
||||
DEFINE_GUID(DMOCATEGORY_AUDIO_CAPTURE_EFFECT,
|
||||
0xf665aaba,0x3e09,0x4920,0xaa,0x5f,0x21,0x98,0x11,0x14,0x8f,0x09);
|
||||
DEFINE_GUID(DMOCATEGORY_ACOUSTIC_ECHO_CANCEL,
|
||||
0xbf963d80,0xc559,0x11d0,0x8a,0x2b,0x00,0xa0,0xc9,0x25,0x5a,0xc1);
|
||||
DEFINE_GUID(DMOCATEGORY_AUDIO_NOISE_SUPPRESS,
|
||||
0xe07f903f,0x62fd,0x4e60,0x8c,0xdd,0xde,0xa7,0x23,0x66,0x65,0xb5);
|
||||
DEFINE_GUID(DMOCATEGORY_AGC,
|
||||
0xe88c9ba0,0xc557,0x11d0,0x8a,0x2b,0x00,0xa0,0xc9,0x25,0x5a,0xc1);
|
||||
|
||||
#endif /* __DMOREG_H__ */
|
||||
|
|
|
|||
|
|
@ -1,13 +1,29 @@
|
|||
/*
|
||||
* Copyright (C) 2002 Alexandre Julliard
|
||||
*
|
||||
* 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
|
||||
*/
|
||||
|
||||
#ifndef __DMORT_H__
|
||||
#define __DMORT_H__
|
||||
|
||||
STDAPI MoCopyMediaType(DMO_MEDIA_TYPE *pmtDest, const DMO_MEDIA_TYPE *pmtSrc);
|
||||
STDAPI MoCreateMediaType(DMO_MEDIA_TYPE **ppmt, DWORD cbFormat);
|
||||
STDAPI MoDeleteMediaType(DMO_MEDIA_TYPE *pmt);
|
||||
STDAPI MoDuplicateMediaType(DMO_MEDIA_TYPE **ppmtDest, const DMO_MEDIA_TYPE *pmtSrc);
|
||||
STDAPI MoFreeMediaType(DMO_MEDIA_TYPE *pmt);
|
||||
STDAPI MoInitMediaType(DMO_MEDIA_TYPE *pmt, DWORD cbFormat);
|
||||
|
||||
#endif
|
||||
HRESULT WINAPI MoCopyMediaType(DMO_MEDIA_TYPE*,const DMO_MEDIA_TYPE*);
|
||||
HRESULT WINAPI MoCreateMediaType(DMO_MEDIA_TYPE**,DWORD);
|
||||
HRESULT WINAPI MoDeleteMediaType(DMO_MEDIA_TYPE*);
|
||||
HRESULT WINAPI MoDuplicateMediaType(DMO_MEDIA_TYPE**,const DMO_MEDIA_TYPE*);
|
||||
HRESULT WINAPI MoFreeMediaType(DMO_MEDIA_TYPE*);
|
||||
HRESULT WINAPI MoInitMediaType(DMO_MEDIA_TYPE*,DWORD);
|
||||
|
||||
#endif /* __DMORT_H__ */
|
||||
|
|
|
|||
Loading…
Reference in a new issue