Updated imported headers to current Wine version.

This commit is contained in:
Jacek Caban 2016-08-16 12:55:28 +02:00
parent 05de869f24
commit 990c9d8806
8 changed files with 370 additions and 27 deletions

View File

@ -67,6 +67,11 @@ typedef interface IEnumTfProperties IEnumTfProperties;
typedef interface ITfRangeBackup ITfRangeBackup;
#endif
#ifndef __ITextStoreACPServices_FWD_DEFINED__
#define __ITextStoreACPServices_FWD_DEFINED__
typedef interface ITextStoreACPServices ITextStoreACPServices;
#endif
#ifndef __ITfContext_FWD_DEFINED__
#define __ITfContext_FWD_DEFINED__
typedef interface ITfContext ITfContext;
@ -317,6 +322,11 @@ typedef interface ITfMouseTracker ITfMouseTracker;
typedef interface ITfMouseTrackerACP ITfMouseTrackerACP;
#endif
#ifndef __ITfTransitoryExtensionSink_FWD_DEFINED__
#define __ITfTransitoryExtensionSink_FWD_DEFINED__
typedef interface ITfTransitoryExtensionSink ITfTransitoryExtensionSink;
#endif
/* Headers for imported files */
#include <oaidl.h>
@ -438,6 +448,16 @@ typedef interface ITfCompositionView ITfCompositionView;
typedef interface ITfKeyEventSink ITfKeyEventSink;
#endif
#ifndef __ITfPersistentPropertyLoaderACP_FWD_DEFINED__
#define __ITfPersistentPropertyLoaderACP_FWD_DEFINED__
typedef interface ITfPersistentPropertyLoaderACP ITfPersistentPropertyLoaderACP;
#endif
#ifndef __ITfRangeACP_FWD_DEFINED__
#define __ITfRangeACP_FWD_DEFINED__
typedef interface ITfRangeACP ITfRangeACP;
#endif
#if 0
typedef UINT_PTR HKL;
#endif
@ -2049,6 +2069,171 @@ void __RPC_STUB ITfRangeBackup_Restore_Stub(
#endif /* __ITfRangeBackup_INTERFACE_DEFINED__ */
/*****************************************************************************
* ITextStoreACPServices interface
*/
#ifndef __ITextStoreACPServices_INTERFACE_DEFINED__
#define __ITextStoreACPServices_INTERFACE_DEFINED__
DEFINE_GUID(IID_ITextStoreACPServices, 0xaa80e901, 0x2021, 0x11d2, 0x93,0xe0, 0x00,0x60,0xb0,0x67,0xb8,0x6e);
#if defined(__cplusplus) && !defined(CINTERFACE)
MIDL_INTERFACE("aa80e901-2021-11d2-93e0-0060b067b86e")
ITextStoreACPServices : public IUnknown
{
virtual HRESULT STDMETHODCALLTYPE Serialize(
ITfProperty *prop,
ITfRange *range,
TF_PERSISTENT_PROPERTY_HEADER_ACP *header,
IStream *stream) = 0;
virtual HRESULT STDMETHODCALLTYPE Unserialize(
ITfProperty *prop,
const TF_PERSISTENT_PROPERTY_HEADER_ACP *header,
IStream *stream,
ITfPersistentPropertyLoaderACP *loader) = 0;
virtual HRESULT STDMETHODCALLTYPE ForceLoadProperty(
ITfProperty *prop) = 0;
virtual HRESULT STDMETHODCALLTYPE CreateRange(
LONG start,
LONG end,
ITfRangeACP **range) = 0;
};
#ifdef __CRT_UUID_DECL
__CRT_UUID_DECL(ITextStoreACPServices, 0xaa80e901, 0x2021, 0x11d2, 0x93,0xe0, 0x00,0x60,0xb0,0x67,0xb8,0x6e)
#endif
#else
typedef struct ITextStoreACPServicesVtbl {
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
ITextStoreACPServices* This,
REFIID riid,
void **ppvObject);
ULONG (STDMETHODCALLTYPE *AddRef)(
ITextStoreACPServices* This);
ULONG (STDMETHODCALLTYPE *Release)(
ITextStoreACPServices* This);
/*** ITextStoreACPServices methods ***/
HRESULT (STDMETHODCALLTYPE *Serialize)(
ITextStoreACPServices* This,
ITfProperty *prop,
ITfRange *range,
TF_PERSISTENT_PROPERTY_HEADER_ACP *header,
IStream *stream);
HRESULT (STDMETHODCALLTYPE *Unserialize)(
ITextStoreACPServices* This,
ITfProperty *prop,
const TF_PERSISTENT_PROPERTY_HEADER_ACP *header,
IStream *stream,
ITfPersistentPropertyLoaderACP *loader);
HRESULT (STDMETHODCALLTYPE *ForceLoadProperty)(
ITextStoreACPServices* This,
ITfProperty *prop);
HRESULT (STDMETHODCALLTYPE *CreateRange)(
ITextStoreACPServices* This,
LONG start,
LONG end,
ITfRangeACP **range);
END_INTERFACE
} ITextStoreACPServicesVtbl;
interface ITextStoreACPServices {
CONST_VTBL ITextStoreACPServicesVtbl* lpVtbl;
};
#ifdef COBJMACROS
#ifndef WIDL_C_INLINE_WRAPPERS
/*** IUnknown methods ***/
#define ITextStoreACPServices_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject)
#define ITextStoreACPServices_AddRef(This) (This)->lpVtbl->AddRef(This)
#define ITextStoreACPServices_Release(This) (This)->lpVtbl->Release(This)
/*** ITextStoreACPServices methods ***/
#define ITextStoreACPServices_Serialize(This,prop,range,header,stream) (This)->lpVtbl->Serialize(This,prop,range,header,stream)
#define ITextStoreACPServices_Unserialize(This,prop,header,stream,loader) (This)->lpVtbl->Unserialize(This,prop,header,stream,loader)
#define ITextStoreACPServices_ForceLoadProperty(This,prop) (This)->lpVtbl->ForceLoadProperty(This,prop)
#define ITextStoreACPServices_CreateRange(This,start,end,range) (This)->lpVtbl->CreateRange(This,start,end,range)
#else
/*** IUnknown methods ***/
static FORCEINLINE HRESULT ITextStoreACPServices_QueryInterface(ITextStoreACPServices* This,REFIID riid,void **ppvObject) {
return This->lpVtbl->QueryInterface(This,riid,ppvObject);
}
static FORCEINLINE ULONG ITextStoreACPServices_AddRef(ITextStoreACPServices* This) {
return This->lpVtbl->AddRef(This);
}
static FORCEINLINE ULONG ITextStoreACPServices_Release(ITextStoreACPServices* This) {
return This->lpVtbl->Release(This);
}
/*** ITextStoreACPServices methods ***/
static FORCEINLINE HRESULT ITextStoreACPServices_Serialize(ITextStoreACPServices* This,ITfProperty *prop,ITfRange *range,TF_PERSISTENT_PROPERTY_HEADER_ACP *header,IStream *stream) {
return This->lpVtbl->Serialize(This,prop,range,header,stream);
}
static FORCEINLINE HRESULT ITextStoreACPServices_Unserialize(ITextStoreACPServices* This,ITfProperty *prop,const TF_PERSISTENT_PROPERTY_HEADER_ACP *header,IStream *stream,ITfPersistentPropertyLoaderACP *loader) {
return This->lpVtbl->Unserialize(This,prop,header,stream,loader);
}
static FORCEINLINE HRESULT ITextStoreACPServices_ForceLoadProperty(ITextStoreACPServices* This,ITfProperty *prop) {
return This->lpVtbl->ForceLoadProperty(This,prop);
}
static FORCEINLINE HRESULT ITextStoreACPServices_CreateRange(ITextStoreACPServices* This,LONG start,LONG end,ITfRangeACP **range) {
return This->lpVtbl->CreateRange(This,start,end,range);
}
#endif
#endif
#endif
HRESULT STDMETHODCALLTYPE ITextStoreACPServices_Serialize_Proxy(
ITextStoreACPServices* This,
ITfProperty *prop,
ITfRange *range,
TF_PERSISTENT_PROPERTY_HEADER_ACP *header,
IStream *stream);
void __RPC_STUB ITextStoreACPServices_Serialize_Stub(
IRpcStubBuffer* This,
IRpcChannelBuffer* pRpcChannelBuffer,
PRPC_MESSAGE pRpcMessage,
DWORD* pdwStubPhase);
HRESULT STDMETHODCALLTYPE ITextStoreACPServices_Unserialize_Proxy(
ITextStoreACPServices* This,
ITfProperty *prop,
const TF_PERSISTENT_PROPERTY_HEADER_ACP *header,
IStream *stream,
ITfPersistentPropertyLoaderACP *loader);
void __RPC_STUB ITextStoreACPServices_Unserialize_Stub(
IRpcStubBuffer* This,
IRpcChannelBuffer* pRpcChannelBuffer,
PRPC_MESSAGE pRpcMessage,
DWORD* pdwStubPhase);
HRESULT STDMETHODCALLTYPE ITextStoreACPServices_ForceLoadProperty_Proxy(
ITextStoreACPServices* This,
ITfProperty *prop);
void __RPC_STUB ITextStoreACPServices_ForceLoadProperty_Stub(
IRpcStubBuffer* This,
IRpcChannelBuffer* pRpcChannelBuffer,
PRPC_MESSAGE pRpcMessage,
DWORD* pdwStubPhase);
HRESULT STDMETHODCALLTYPE ITextStoreACPServices_CreateRange_Proxy(
ITextStoreACPServices* This,
LONG start,
LONG end,
ITfRangeACP **range);
void __RPC_STUB ITextStoreACPServices_CreateRange_Stub(
IRpcStubBuffer* This,
IRpcChannelBuffer* pRpcChannelBuffer,
PRPC_MESSAGE pRpcMessage,
DWORD* pdwStubPhase);
#endif /* __ITextStoreACPServices_INTERFACE_DEFINED__ */
/*****************************************************************************
* ITfContext interface
*/
@ -10910,6 +11095,102 @@ void __RPC_STUB ITfMouseTrackerACP_UnadviseMouseSink_Stub(
#endif /* __ITfMouseTrackerACP_INTERFACE_DEFINED__ */
/*****************************************************************************
* ITfTransitoryExtensionSink interface
*/
#ifndef __ITfTransitoryExtensionSink_INTERFACE_DEFINED__
#define __ITfTransitoryExtensionSink_INTERFACE_DEFINED__
DEFINE_GUID(IID_ITfTransitoryExtensionSink, 0xa615096f, 0x1c57, 0x4813, 0x8a,0x15, 0x55,0xee,0x6e,0x5a,0x83,0x9c);
#if defined(__cplusplus) && !defined(CINTERFACE)
MIDL_INTERFACE("a615096f-1c57-4813-8a15-55ee6e5a839c")
ITfTransitoryExtensionSink : public IUnknown
{
virtual HRESULT STDMETHODCALLTYPE OnTransitoryExtensionUpdated(
ITfContext *pic,
TfEditCookie ecReadOnly,
ITfRange *pResultRange,
ITfRange *pCompositionRange,
WINBOOL *pfDeleteResultRange) = 0;
};
#ifdef __CRT_UUID_DECL
__CRT_UUID_DECL(ITfTransitoryExtensionSink, 0xa615096f, 0x1c57, 0x4813, 0x8a,0x15, 0x55,0xee,0x6e,0x5a,0x83,0x9c)
#endif
#else
typedef struct ITfTransitoryExtensionSinkVtbl {
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
ITfTransitoryExtensionSink* This,
REFIID riid,
void **ppvObject);
ULONG (STDMETHODCALLTYPE *AddRef)(
ITfTransitoryExtensionSink* This);
ULONG (STDMETHODCALLTYPE *Release)(
ITfTransitoryExtensionSink* This);
/*** ITfTransitoryExtensionSink methods ***/
HRESULT (STDMETHODCALLTYPE *OnTransitoryExtensionUpdated)(
ITfTransitoryExtensionSink* This,
ITfContext *pic,
TfEditCookie ecReadOnly,
ITfRange *pResultRange,
ITfRange *pCompositionRange,
WINBOOL *pfDeleteResultRange);
END_INTERFACE
} ITfTransitoryExtensionSinkVtbl;
interface ITfTransitoryExtensionSink {
CONST_VTBL ITfTransitoryExtensionSinkVtbl* lpVtbl;
};
#ifdef COBJMACROS
#ifndef WIDL_C_INLINE_WRAPPERS
/*** IUnknown methods ***/
#define ITfTransitoryExtensionSink_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject)
#define ITfTransitoryExtensionSink_AddRef(This) (This)->lpVtbl->AddRef(This)
#define ITfTransitoryExtensionSink_Release(This) (This)->lpVtbl->Release(This)
/*** ITfTransitoryExtensionSink methods ***/
#define ITfTransitoryExtensionSink_OnTransitoryExtensionUpdated(This,pic,ecReadOnly,pResultRange,pCompositionRange,pfDeleteResultRange) (This)->lpVtbl->OnTransitoryExtensionUpdated(This,pic,ecReadOnly,pResultRange,pCompositionRange,pfDeleteResultRange)
#else
/*** IUnknown methods ***/
static FORCEINLINE HRESULT ITfTransitoryExtensionSink_QueryInterface(ITfTransitoryExtensionSink* This,REFIID riid,void **ppvObject) {
return This->lpVtbl->QueryInterface(This,riid,ppvObject);
}
static FORCEINLINE ULONG ITfTransitoryExtensionSink_AddRef(ITfTransitoryExtensionSink* This) {
return This->lpVtbl->AddRef(This);
}
static FORCEINLINE ULONG ITfTransitoryExtensionSink_Release(ITfTransitoryExtensionSink* This) {
return This->lpVtbl->Release(This);
}
/*** ITfTransitoryExtensionSink methods ***/
static FORCEINLINE HRESULT ITfTransitoryExtensionSink_OnTransitoryExtensionUpdated(ITfTransitoryExtensionSink* This,ITfContext *pic,TfEditCookie ecReadOnly,ITfRange *pResultRange,ITfRange *pCompositionRange,WINBOOL *pfDeleteResultRange) {
return This->lpVtbl->OnTransitoryExtensionUpdated(This,pic,ecReadOnly,pResultRange,pCompositionRange,pfDeleteResultRange);
}
#endif
#endif
#endif
HRESULT STDMETHODCALLTYPE ITfTransitoryExtensionSink_OnTransitoryExtensionUpdated_Proxy(
ITfTransitoryExtensionSink* This,
ITfContext *pic,
TfEditCookie ecReadOnly,
ITfRange *pResultRange,
ITfRange *pCompositionRange,
WINBOOL *pfDeleteResultRange);
void __RPC_STUB ITfTransitoryExtensionSink_OnTransitoryExtensionUpdated_Stub(
IRpcStubBuffer* This,
IRpcChannelBuffer* pRpcChannelBuffer,
PRPC_MESSAGE pRpcMessage,
DWORD* pdwStubPhase);
#endif /* __ITfTransitoryExtensionSink_INTERFACE_DEFINED__ */
/* Begin additional prototypes for all interfaces */
ULONG __RPC_USER BSTR_UserSize (ULONG *, ULONG, BSTR *);

View File

@ -97,6 +97,8 @@ interface ITfReadOnlyProperty;
interface IEnumTfLanguageProfiles;
interface ITfCompositionView;
interface ITfKeyEventSink;
interface ITfPersistentPropertyLoaderACP;
interface ITfRangeACP;
cpp_quote("#if 0")
typedef [uuid(4f5d560f-5ab5-4dde-8c4d-404592857ab0)] UINT_PTR HKL;
@ -350,6 +352,34 @@ interface ITfRangeBackup : IUnknown
[in] ITfRange *range);
}
[
object,
uuid(aa80e901-2021-11d2-93e0-0060b067b86e),
pointer_default(unique)
]
interface ITextStoreACPServices : IUnknown
{
HRESULT Serialize(
[in] ITfProperty *prop,
[in] ITfRange *range,
[out] TF_PERSISTENT_PROPERTY_HEADER_ACP *header,
[in] IStream *stream);
HRESULT Unserialize(
[in] ITfProperty *prop,
[in] const TF_PERSISTENT_PROPERTY_HEADER_ACP *header,
[in] IStream *stream,
[in] ITfPersistentPropertyLoaderACP *loader);
HRESULT ForceLoadProperty(
[in] ITfProperty *prop);
HRESULT CreateRange(
[in] LONG start,
[in] LONG end,
[out] ITfRangeACP **range);
}
[
object,
uuid(aa80e7fd-2021-11d2-93e0-0060b067b86e),
@ -1815,3 +1845,19 @@ interface ITfMouseTrackerACP : IUnknown
HRESULT UnadviseMouseSink([in] DWORD dwCookie);
}
[
object,
local,
uuid(a615096f-1c57-4813-8a15-55ee6e5a839c),
pointer_default(unique)
]
interface ITfTransitoryExtensionSink : IUnknown
{
HRESULT OnTransitoryExtensionUpdated(
[in] ITfContext *pic,
[in] TfEditCookie ecReadOnly,
[in] ITfRange *pResultRange,
[in] ITfRange *pCompositionRange,
[out] BOOL *pfDeleteResultRange);
}

View File

@ -77,6 +77,8 @@ HRESULT WINAPI PropVariantToUInt16(REFPROPVARIANT propvarIn, USHORT *ret);
HRESULT WINAPI PropVariantToUInt32(REFPROPVARIANT propvarIn, ULONG *ret);
HRESULT WINAPI PropVariantToUInt64(REFPROPVARIANT propvarIn, ULONGLONG *ret);
HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret);
#ifdef __cplusplus
HRESULT InitPropVariantFromBoolean(WINBOOL fVal, PROPVARIANT *ppropvar);

View File

@ -39,6 +39,14 @@ extern "C" {
/* Possible return values. */
#define E_NONE __MSABI_LONG(0x0000)
#define E_API_NOTIMPL __MSABI_LONG(0x0001)
#define E_HDCINVALID __MSABI_LONG(0x0006)
#define E_NOFREEMEMORY __MSABI_LONG(0x0007)
#define E_NOTATRUETYPEFONT __MSABI_LONG(0x000a)
#define E_ERRORACCESSINGFONTDATA __MSABI_LONG(0x000c)
#define E_ERRORACCESSINGFACENAME __MSABI_LONG(0x000d)
#define E_FACENAMEINVALID __MSABI_LONG(0x0113)
#define E_PERMISSIONSINVALID __MSABI_LONG(0x0117)
#define E_PBENABLEDINVALID __MSABI_LONG(0x0118)
typedef ULONG (WINAPIV * READEMBEDPROC)(void*,void*,ULONG);
typedef ULONG (WINAPIV * WRITEEMBEDPROC)(void*,void*,ULONG);
@ -68,6 +76,8 @@ LONG WINAPI TTDeleteEmbeddedFont(HANDLE,ULONG,ULONG*);
#define EMBED_NOEMBEDDING 4
LONG WINAPI TTGetEmbeddingType(HDC, ULONG*);
LONG WINAPI TTIsEmbeddingEnabledForFacename(LPCSTR facename, WINBOOL *enabled);
LONG WINAPI TTIsEmbeddingEnabled(HDC hdc, WINBOOL *enabled);
#ifdef __cplusplus
}

View File

@ -2481,7 +2481,7 @@ IWMReaderAdvanced : public IUnknown
WINBOOL fAllocate) = 0;
virtual HRESULT STDMETHODCALLTYPE GetAllocateForStream(
WORD dwSreamNum,
WORD dwStreamNum,
WINBOOL *pfAllocate) = 0;
virtual HRESULT STDMETHODCALLTYPE GetStatistics(
@ -2588,7 +2588,7 @@ typedef struct IWMReaderAdvancedVtbl {
HRESULT (STDMETHODCALLTYPE *GetAllocateForStream)(
IWMReaderAdvanced* This,
WORD dwSreamNum,
WORD dwStreamNum,
WINBOOL *pfAllocate);
HRESULT (STDMETHODCALLTYPE *GetStatistics)(
@ -2640,7 +2640,7 @@ interface IWMReaderAdvanced {
#define IWMReaderAdvanced_SetAllocateForOutput(This,dwOutputNum,fAllocate) (This)->lpVtbl->SetAllocateForOutput(This,dwOutputNum,fAllocate)
#define IWMReaderAdvanced_GetAllocateForOutput(This,dwOutputNum,pfAllocate) (This)->lpVtbl->GetAllocateForOutput(This,dwOutputNum,pfAllocate)
#define IWMReaderAdvanced_SetAllocateForStream(This,wStreamNum,fAllocate) (This)->lpVtbl->SetAllocateForStream(This,wStreamNum,fAllocate)
#define IWMReaderAdvanced_GetAllocateForStream(This,dwSreamNum,pfAllocate) (This)->lpVtbl->GetAllocateForStream(This,dwSreamNum,pfAllocate)
#define IWMReaderAdvanced_GetAllocateForStream(This,dwStreamNum,pfAllocate) (This)->lpVtbl->GetAllocateForStream(This,dwStreamNum,pfAllocate)
#define IWMReaderAdvanced_GetStatistics(This,pStatistics) (This)->lpVtbl->GetStatistics(This,pStatistics)
#define IWMReaderAdvanced_SetClientInfo(This,pClientInfo) (This)->lpVtbl->SetClientInfo(This,pClientInfo)
#define IWMReaderAdvanced_GetMaxOutputSampleSize(This,dwOutput,pcbMax) (This)->lpVtbl->GetMaxOutputSampleSize(This,dwOutput,pcbMax)
@ -2700,8 +2700,8 @@ static FORCEINLINE HRESULT IWMReaderAdvanced_GetAllocateForOutput(IWMReaderAdvan
static FORCEINLINE HRESULT IWMReaderAdvanced_SetAllocateForStream(IWMReaderAdvanced* This,WORD wStreamNum,WINBOOL fAllocate) {
return This->lpVtbl->SetAllocateForStream(This,wStreamNum,fAllocate);
}
static FORCEINLINE HRESULT IWMReaderAdvanced_GetAllocateForStream(IWMReaderAdvanced* This,WORD dwSreamNum,WINBOOL *pfAllocate) {
return This->lpVtbl->GetAllocateForStream(This,dwSreamNum,pfAllocate);
static FORCEINLINE HRESULT IWMReaderAdvanced_GetAllocateForStream(IWMReaderAdvanced* This,WORD dwStreamNum,WINBOOL *pfAllocate) {
return This->lpVtbl->GetAllocateForStream(This,dwStreamNum,pfAllocate);
}
static FORCEINLINE HRESULT IWMReaderAdvanced_GetStatistics(IWMReaderAdvanced* This,WM_READER_STATISTICS *pStatistics) {
return This->lpVtbl->GetStatistics(This,pStatistics);
@ -2845,7 +2845,7 @@ void __RPC_STUB IWMReaderAdvanced_SetAllocateForStream_Stub(
DWORD* pdwStubPhase);
HRESULT STDMETHODCALLTYPE IWMReaderAdvanced_GetAllocateForStream_Proxy(
IWMReaderAdvanced* This,
WORD dwSreamNum,
WORD dwStreamNum,
WINBOOL *pfAllocate);
void __RPC_STUB IWMReaderAdvanced_GetAllocateForStream_Stub(
IRpcStubBuffer* This,
@ -3059,7 +3059,7 @@ typedef struct IWMReaderAdvanced2Vtbl {
HRESULT (STDMETHODCALLTYPE *GetAllocateForStream)(
IWMReaderAdvanced2* This,
WORD dwSreamNum,
WORD dwStreamNum,
WINBOOL *pfAllocate);
HRESULT (STDMETHODCALLTYPE *GetStatistics)(
@ -3190,7 +3190,7 @@ interface IWMReaderAdvanced2 {
#define IWMReaderAdvanced2_SetAllocateForOutput(This,dwOutputNum,fAllocate) (This)->lpVtbl->SetAllocateForOutput(This,dwOutputNum,fAllocate)
#define IWMReaderAdvanced2_GetAllocateForOutput(This,dwOutputNum,pfAllocate) (This)->lpVtbl->GetAllocateForOutput(This,dwOutputNum,pfAllocate)
#define IWMReaderAdvanced2_SetAllocateForStream(This,wStreamNum,fAllocate) (This)->lpVtbl->SetAllocateForStream(This,wStreamNum,fAllocate)
#define IWMReaderAdvanced2_GetAllocateForStream(This,dwSreamNum,pfAllocate) (This)->lpVtbl->GetAllocateForStream(This,dwSreamNum,pfAllocate)
#define IWMReaderAdvanced2_GetAllocateForStream(This,dwStreamNum,pfAllocate) (This)->lpVtbl->GetAllocateForStream(This,dwStreamNum,pfAllocate)
#define IWMReaderAdvanced2_GetStatistics(This,pStatistics) (This)->lpVtbl->GetStatistics(This,pStatistics)
#define IWMReaderAdvanced2_SetClientInfo(This,pClientInfo) (This)->lpVtbl->SetClientInfo(This,pClientInfo)
#define IWMReaderAdvanced2_GetMaxOutputSampleSize(This,dwOutput,pcbMax) (This)->lpVtbl->GetMaxOutputSampleSize(This,dwOutput,pcbMax)
@ -3266,8 +3266,8 @@ static FORCEINLINE HRESULT IWMReaderAdvanced2_GetAllocateForOutput(IWMReaderAdva
static FORCEINLINE HRESULT IWMReaderAdvanced2_SetAllocateForStream(IWMReaderAdvanced2* This,WORD wStreamNum,WINBOOL fAllocate) {
return This->lpVtbl->SetAllocateForStream(This,wStreamNum,fAllocate);
}
static FORCEINLINE HRESULT IWMReaderAdvanced2_GetAllocateForStream(IWMReaderAdvanced2* This,WORD dwSreamNum,WINBOOL *pfAllocate) {
return This->lpVtbl->GetAllocateForStream(This,dwSreamNum,pfAllocate);
static FORCEINLINE HRESULT IWMReaderAdvanced2_GetAllocateForStream(IWMReaderAdvanced2* This,WORD dwStreamNum,WINBOOL *pfAllocate) {
return This->lpVtbl->GetAllocateForStream(This,dwStreamNum,pfAllocate);
}
static FORCEINLINE HRESULT IWMReaderAdvanced2_GetStatistics(IWMReaderAdvanced2* This,WM_READER_STATISTICS *pStatistics) {
return This->lpVtbl->GetStatistics(This,pStatistics);
@ -3585,7 +3585,7 @@ typedef struct IWMReaderAdvanced3Vtbl {
HRESULT (STDMETHODCALLTYPE *GetAllocateForStream)(
IWMReaderAdvanced3* This,
WORD dwSreamNum,
WORD dwStreamNum,
WINBOOL *pfAllocate);
HRESULT (STDMETHODCALLTYPE *GetStatistics)(
@ -3729,7 +3729,7 @@ interface IWMReaderAdvanced3 {
#define IWMReaderAdvanced3_SetAllocateForOutput(This,dwOutputNum,fAllocate) (This)->lpVtbl->SetAllocateForOutput(This,dwOutputNum,fAllocate)
#define IWMReaderAdvanced3_GetAllocateForOutput(This,dwOutputNum,pfAllocate) (This)->lpVtbl->GetAllocateForOutput(This,dwOutputNum,pfAllocate)
#define IWMReaderAdvanced3_SetAllocateForStream(This,wStreamNum,fAllocate) (This)->lpVtbl->SetAllocateForStream(This,wStreamNum,fAllocate)
#define IWMReaderAdvanced3_GetAllocateForStream(This,dwSreamNum,pfAllocate) (This)->lpVtbl->GetAllocateForStream(This,dwSreamNum,pfAllocate)
#define IWMReaderAdvanced3_GetAllocateForStream(This,dwStreamNum,pfAllocate) (This)->lpVtbl->GetAllocateForStream(This,dwStreamNum,pfAllocate)
#define IWMReaderAdvanced3_GetStatistics(This,pStatistics) (This)->lpVtbl->GetStatistics(This,pStatistics)
#define IWMReaderAdvanced3_SetClientInfo(This,pClientInfo) (This)->lpVtbl->SetClientInfo(This,pClientInfo)
#define IWMReaderAdvanced3_GetMaxOutputSampleSize(This,dwOutput,pcbMax) (This)->lpVtbl->GetMaxOutputSampleSize(This,dwOutput,pcbMax)
@ -3808,8 +3808,8 @@ static FORCEINLINE HRESULT IWMReaderAdvanced3_GetAllocateForOutput(IWMReaderAdva
static FORCEINLINE HRESULT IWMReaderAdvanced3_SetAllocateForStream(IWMReaderAdvanced3* This,WORD wStreamNum,WINBOOL fAllocate) {
return This->lpVtbl->SetAllocateForStream(This,wStreamNum,fAllocate);
}
static FORCEINLINE HRESULT IWMReaderAdvanced3_GetAllocateForStream(IWMReaderAdvanced3* This,WORD dwSreamNum,WINBOOL *pfAllocate) {
return This->lpVtbl->GetAllocateForStream(This,dwSreamNum,pfAllocate);
static FORCEINLINE HRESULT IWMReaderAdvanced3_GetAllocateForStream(IWMReaderAdvanced3* This,WORD dwStreamNum,WINBOOL *pfAllocate) {
return This->lpVtbl->GetAllocateForStream(This,dwStreamNum,pfAllocate);
}
static FORCEINLINE HRESULT IWMReaderAdvanced3_GetStatistics(IWMReaderAdvanced3* This,WM_READER_STATISTICS *pStatistics) {
return This->lpVtbl->GetStatistics(This,pStatistics);
@ -4039,7 +4039,7 @@ typedef struct IWMReaderAdvanced4Vtbl {
HRESULT (STDMETHODCALLTYPE *GetAllocateForStream)(
IWMReaderAdvanced4* This,
WORD dwSreamNum,
WORD dwStreamNum,
WINBOOL *pfAllocate);
HRESULT (STDMETHODCALLTYPE *GetStatistics)(
@ -4225,7 +4225,7 @@ interface IWMReaderAdvanced4 {
#define IWMReaderAdvanced4_SetAllocateForOutput(This,dwOutputNum,fAllocate) (This)->lpVtbl->SetAllocateForOutput(This,dwOutputNum,fAllocate)
#define IWMReaderAdvanced4_GetAllocateForOutput(This,dwOutputNum,pfAllocate) (This)->lpVtbl->GetAllocateForOutput(This,dwOutputNum,pfAllocate)
#define IWMReaderAdvanced4_SetAllocateForStream(This,wStreamNum,fAllocate) (This)->lpVtbl->SetAllocateForStream(This,wStreamNum,fAllocate)
#define IWMReaderAdvanced4_GetAllocateForStream(This,dwSreamNum,pfAllocate) (This)->lpVtbl->GetAllocateForStream(This,dwSreamNum,pfAllocate)
#define IWMReaderAdvanced4_GetAllocateForStream(This,dwStreamNum,pfAllocate) (This)->lpVtbl->GetAllocateForStream(This,dwStreamNum,pfAllocate)
#define IWMReaderAdvanced4_GetStatistics(This,pStatistics) (This)->lpVtbl->GetStatistics(This,pStatistics)
#define IWMReaderAdvanced4_SetClientInfo(This,pClientInfo) (This)->lpVtbl->SetClientInfo(This,pClientInfo)
#define IWMReaderAdvanced4_GetMaxOutputSampleSize(This,dwOutput,pcbMax) (This)->lpVtbl->GetMaxOutputSampleSize(This,dwOutput,pcbMax)
@ -4314,8 +4314,8 @@ static FORCEINLINE HRESULT IWMReaderAdvanced4_GetAllocateForOutput(IWMReaderAdva
static FORCEINLINE HRESULT IWMReaderAdvanced4_SetAllocateForStream(IWMReaderAdvanced4* This,WORD wStreamNum,WINBOOL fAllocate) {
return This->lpVtbl->SetAllocateForStream(This,wStreamNum,fAllocate);
}
static FORCEINLINE HRESULT IWMReaderAdvanced4_GetAllocateForStream(IWMReaderAdvanced4* This,WORD dwSreamNum,WINBOOL *pfAllocate) {
return This->lpVtbl->GetAllocateForStream(This,dwSreamNum,pfAllocate);
static FORCEINLINE HRESULT IWMReaderAdvanced4_GetAllocateForStream(IWMReaderAdvanced4* This,WORD dwStreamNum,WINBOOL *pfAllocate) {
return This->lpVtbl->GetAllocateForStream(This,dwStreamNum,pfAllocate);
}
static FORCEINLINE HRESULT IWMReaderAdvanced4_GetStatistics(IWMReaderAdvanced4* This,WM_READER_STATISTICS *pStatistics) {
return This->lpVtbl->GetStatistics(This,pStatistics);
@ -4600,7 +4600,7 @@ typedef struct IWMReaderAdvanced5Vtbl {
HRESULT (STDMETHODCALLTYPE *GetAllocateForStream)(
IWMReaderAdvanced5* This,
WORD dwSreamNum,
WORD dwStreamNum,
WINBOOL *pfAllocate);
HRESULT (STDMETHODCALLTYPE *GetStatistics)(
@ -4792,7 +4792,7 @@ interface IWMReaderAdvanced5 {
#define IWMReaderAdvanced5_SetAllocateForOutput(This,dwOutputNum,fAllocate) (This)->lpVtbl->SetAllocateForOutput(This,dwOutputNum,fAllocate)
#define IWMReaderAdvanced5_GetAllocateForOutput(This,dwOutputNum,pfAllocate) (This)->lpVtbl->GetAllocateForOutput(This,dwOutputNum,pfAllocate)
#define IWMReaderAdvanced5_SetAllocateForStream(This,wStreamNum,fAllocate) (This)->lpVtbl->SetAllocateForStream(This,wStreamNum,fAllocate)
#define IWMReaderAdvanced5_GetAllocateForStream(This,dwSreamNum,pfAllocate) (This)->lpVtbl->GetAllocateForStream(This,dwSreamNum,pfAllocate)
#define IWMReaderAdvanced5_GetAllocateForStream(This,dwStreamNum,pfAllocate) (This)->lpVtbl->GetAllocateForStream(This,dwStreamNum,pfAllocate)
#define IWMReaderAdvanced5_GetStatistics(This,pStatistics) (This)->lpVtbl->GetStatistics(This,pStatistics)
#define IWMReaderAdvanced5_SetClientInfo(This,pClientInfo) (This)->lpVtbl->SetClientInfo(This,pClientInfo)
#define IWMReaderAdvanced5_GetMaxOutputSampleSize(This,dwOutput,pcbMax) (This)->lpVtbl->GetMaxOutputSampleSize(This,dwOutput,pcbMax)
@ -4883,8 +4883,8 @@ static FORCEINLINE HRESULT IWMReaderAdvanced5_GetAllocateForOutput(IWMReaderAdva
static FORCEINLINE HRESULT IWMReaderAdvanced5_SetAllocateForStream(IWMReaderAdvanced5* This,WORD wStreamNum,WINBOOL fAllocate) {
return This->lpVtbl->SetAllocateForStream(This,wStreamNum,fAllocate);
}
static FORCEINLINE HRESULT IWMReaderAdvanced5_GetAllocateForStream(IWMReaderAdvanced5* This,WORD dwSreamNum,WINBOOL *pfAllocate) {
return This->lpVtbl->GetAllocateForStream(This,dwSreamNum,pfAllocate);
static FORCEINLINE HRESULT IWMReaderAdvanced5_GetAllocateForStream(IWMReaderAdvanced5* This,WORD dwStreamNum,WINBOOL *pfAllocate) {
return This->lpVtbl->GetAllocateForStream(This,dwStreamNum,pfAllocate);
}
static FORCEINLINE HRESULT IWMReaderAdvanced5_GetStatistics(IWMReaderAdvanced5* This,WM_READER_STATISTICS *pStatistics) {
return This->lpVtbl->GetStatistics(This,pStatistics);
@ -5109,7 +5109,7 @@ typedef struct IWMReaderAdvanced6Vtbl {
HRESULT (STDMETHODCALLTYPE *GetAllocateForStream)(
IWMReaderAdvanced6* This,
WORD dwSreamNum,
WORD dwStreamNum,
WINBOOL *pfAllocate);
HRESULT (STDMETHODCALLTYPE *GetStatistics)(
@ -5311,7 +5311,7 @@ interface IWMReaderAdvanced6 {
#define IWMReaderAdvanced6_SetAllocateForOutput(This,dwOutputNum,fAllocate) (This)->lpVtbl->SetAllocateForOutput(This,dwOutputNum,fAllocate)
#define IWMReaderAdvanced6_GetAllocateForOutput(This,dwOutputNum,pfAllocate) (This)->lpVtbl->GetAllocateForOutput(This,dwOutputNum,pfAllocate)
#define IWMReaderAdvanced6_SetAllocateForStream(This,wStreamNum,fAllocate) (This)->lpVtbl->SetAllocateForStream(This,wStreamNum,fAllocate)
#define IWMReaderAdvanced6_GetAllocateForStream(This,dwSreamNum,pfAllocate) (This)->lpVtbl->GetAllocateForStream(This,dwSreamNum,pfAllocate)
#define IWMReaderAdvanced6_GetAllocateForStream(This,dwStreamNum,pfAllocate) (This)->lpVtbl->GetAllocateForStream(This,dwStreamNum,pfAllocate)
#define IWMReaderAdvanced6_GetStatistics(This,pStatistics) (This)->lpVtbl->GetStatistics(This,pStatistics)
#define IWMReaderAdvanced6_SetClientInfo(This,pClientInfo) (This)->lpVtbl->SetClientInfo(This,pClientInfo)
#define IWMReaderAdvanced6_GetMaxOutputSampleSize(This,dwOutput,pcbMax) (This)->lpVtbl->GetMaxOutputSampleSize(This,dwOutput,pcbMax)
@ -5404,8 +5404,8 @@ static FORCEINLINE HRESULT IWMReaderAdvanced6_GetAllocateForOutput(IWMReaderAdva
static FORCEINLINE HRESULT IWMReaderAdvanced6_SetAllocateForStream(IWMReaderAdvanced6* This,WORD wStreamNum,WINBOOL fAllocate) {
return This->lpVtbl->SetAllocateForStream(This,wStreamNum,fAllocate);
}
static FORCEINLINE HRESULT IWMReaderAdvanced6_GetAllocateForStream(IWMReaderAdvanced6* This,WORD dwSreamNum,WINBOOL *pfAllocate) {
return This->lpVtbl->GetAllocateForStream(This,dwSreamNum,pfAllocate);
static FORCEINLINE HRESULT IWMReaderAdvanced6_GetAllocateForStream(IWMReaderAdvanced6* This,WORD dwStreamNum,WINBOOL *pfAllocate) {
return This->lpVtbl->GetAllocateForStream(This,dwStreamNum,pfAllocate);
}
static FORCEINLINE HRESULT IWMReaderAdvanced6_GetStatistics(IWMReaderAdvanced6* This,WM_READER_STATISTICS *pStatistics) {
return This->lpVtbl->GetStatistics(This,pStatistics);

View File

@ -549,7 +549,7 @@ interface IWMReaderAdvanced : IUnknown
[in] BOOL fAllocate);
HRESULT GetAllocateForStream(
[in] WORD dwSreamNum,
[in] WORD dwStreamNum,
[out] BOOL *pfAllocate);
HRESULT GetStatistics(

View File

@ -1482,6 +1482,8 @@ STDAPI CreateXmlWriter(REFIID riid, void **ppvObject, IMalloc *pMalloc);
typedef IUnknown IXmlWriterOutput;
STDAPI CreateXmlWriterOutputWithEncodingName(IUnknown *stream, IMalloc *pMalloc,
LPCWSTR encoding, IXmlWriterOutput **output);
STDAPI CreateXmlWriterOutputWithEncodingCodePage(IUnknown *stream, IMalloc *pMalloc,
UINT codepage, IXmlWriterOutput **output);
/* Begin additional prototypes for all interfaces */

View File

@ -300,3 +300,5 @@ cpp_quote("STDAPI CreateXmlWriter(REFIID riid, void **ppvObject, IMalloc *pMallo
cpp_quote("typedef IUnknown IXmlWriterOutput;")
cpp_quote("STDAPI CreateXmlWriterOutputWithEncodingName(IUnknown *stream, IMalloc *pMalloc,")
cpp_quote(" LPCWSTR encoding, IXmlWriterOutput **output);")
cpp_quote("STDAPI CreateXmlWriterOutputWithEncodingCodePage(IUnknown *stream, IMalloc *pMalloc,")
cpp_quote(" UINT codepage, IXmlWriterOutput **output);")