---
mingw-w64-headers/include/dxvahd.h | 41 +++++++++++----------------
mingw-w64-headers/include/dxvahd.idl | 42 +++++++++++-----------------
2 files changed, 34 insertions(+), 49 deletions(-)
diff --git a/mingw-w64-headers/include/dxvahd.h
b/mingw-w64-headers/include/dxvahd.h
index 39bab3f6..67f31ae7 100644
--- a/mingw-w64-headers/include/dxvahd.h
+++ b/mingw-w64-headers/include/dxvahd.h
@@ -70,13 +70,6 @@ typedef struct __WIDL_dxvahd_generated_name_0000000C {
char dummy;
} D3DCOLOR;
#endif
-#ifndef CALLBACK
-#if defined(_ARM_)
-#define CALLBACK
-#else
-#define CALLBACK __stdcall
-#endif
-#endif
#ifndef __IDXVAHD_Device_FWD_DEFINED__
#define __IDXVAHD_Device_FWD_DEFINED__
typedef interface IDXVAHD_Device IDXVAHD_Device;
@@ -366,23 +359,23 @@ typedef struct _DXVAHD_STREAM_STATE_PALETTE_DATA {
UINT Count;
D3DCOLOR *pEntries;
} DXVAHD_STREAM_STATE_PALETTE_DATA;
-typedef HRESULT ( CALLBACK *PDXVAHDSW_CreateDevice )(IDirect3DDevice9Ex
*pD3DDevice,HANDLE *phDevice);
-typedef HRESULT ( CALLBACK *PDXVAHDSW_ProposeVideoPrivateFormat )(HANDLE
hDevice,D3DFORMAT *pFormat);
-typedef HRESULT ( CALLBACK *PDXVAHDSW_GetVideoProcessorDeviceCaps )(HANDLE
hDevice,const DXVAHD_CONTENT_DESC *pContentDesc,DXVAHD_DEVICE_USAGE
Usage,DXVAHD_VPDEVCAPS *pCaps);
-typedef HRESULT ( CALLBACK *PDXVAHDSW_GetVideoProcessorOutputFormats )(HANDLE
hDevice,const DXVAHD_CONTENT_DESC *pContentDesc,DXVAHD_DEVICE_USAGE Usage,UINT
Count,D3DFORMAT *pFormats);
-typedef HRESULT ( CALLBACK *PDXVAHDSW_GetVideoProcessorInputFormats )(HANDLE
hDevice,const DXVAHD_CONTENT_DESC *pContentDesc,DXVAHD_DEVICE_USAGE Usage,UINT
Count,D3DFORMAT *pFormats);
-typedef HRESULT ( CALLBACK *PDXVAHDSW_GetVideoProcessorCaps )(HANDLE
hDevice,const DXVAHD_CONTENT_DESC *pContentDesc,DXVAHD_DEVICE_USAGE Usage,UINT
Count,DXVAHD_VPCAPS *pCaps);
-typedef HRESULT ( CALLBACK *PDXVAHDSW_GetVideoProcessorCustomRates )(HANDLE
hDevice,const GUID *pVPGuid,UINT Count,DXVAHD_CUSTOM_RATE_DATA *pRates);
-typedef HRESULT ( CALLBACK *PDXVAHDSW_SetVideoProcessBltState )(HANDLE
hVideoProcessor,DXVAHD_BLT_STATE State,UINT DataSize,const void *pData);
-typedef HRESULT ( CALLBACK *PDXVAHDSW_CreateVideoProcessor )(HANDLE
hDevice,const GUID *pVPGuid,HANDLE *phVideoProcessor);
-typedef HRESULT ( CALLBACK *PDXVAHDSW_DestroyDevice )(HANDLE hDevice);
-typedef HRESULT ( CALLBACK *PDXVAHDSW_GetVideoProcessorFilterRange )(HANDLE
hDevice,DXVAHD_FILTER Filter,DXVAHD_FILTER_RANGE_DATA *pRange);
-typedef HRESULT ( CALLBACK *PDXVAHDSW_DestroyVideoProcessor )(HANDLE
hVideoProcessor);
-typedef HRESULT ( CALLBACK *PDXVAHDSW_VideoProcessBltHD )(HANDLE
hVideoProcessor,IDirect3DSurface9 *pOutputSurface,UINT OutputFrame,UINT
StreamCount,const DXVAHD_STREAM_DATA *pStreams);
-typedef HRESULT ( CALLBACK *PDXVAHDSW_GetVideoProcessStreamStatePrivate
)(HANDLE hVideoProcessor,UINT StreamNumber,DXVAHD_STREAM_STATE_PRIVATE_DATA
*pData);
-typedef HRESULT ( CALLBACK *PDXVAHDSW_SetVideoProcessStreamState )(HANDLE
hVideoProcessor,UINT StreamNumber,DXVAHD_STREAM_STATE State,UINT DataSize,const
void *pData);
-typedef HRESULT ( CALLBACK *PDXVAHDSW_GetVideoProcessBltStatePrivate )(HANDLE
hVideoProcessor,DXVAHD_BLT_STATE_PRIVATE_DATA *pData);
-typedef HRESULT ( CALLBACK *PDXVAHDSW_Plugin )(UINT Size,void *pCallbacks);
+typedef HRESULT ( STDMETHODCALLTYPE *PDXVAHDSW_CreateDevice
)(IDirect3DDevice9Ex *pD3DDevice,HANDLE *phDevice);
+typedef HRESULT ( STDMETHODCALLTYPE *PDXVAHDSW_ProposeVideoPrivateFormat
)(HANDLE hDevice,D3DFORMAT *pFormat);
+typedef HRESULT ( STDMETHODCALLTYPE *PDXVAHDSW_GetVideoProcessorDeviceCaps
)(HANDLE hDevice,const DXVAHD_CONTENT_DESC *pContentDesc,DXVAHD_DEVICE_USAGE
Usage,DXVAHD_VPDEVCAPS *pCaps);
+typedef HRESULT ( STDMETHODCALLTYPE *PDXVAHDSW_GetVideoProcessorOutputFormats
)(HANDLE hDevice,const DXVAHD_CONTENT_DESC *pContentDesc,DXVAHD_DEVICE_USAGE
Usage,UINT Count,D3DFORMAT *pFormats);
+typedef HRESULT ( STDMETHODCALLTYPE *PDXVAHDSW_GetVideoProcessorInputFormats
)(HANDLE hDevice,const DXVAHD_CONTENT_DESC *pContentDesc,DXVAHD_DEVICE_USAGE
Usage,UINT Count,D3DFORMAT *pFormats);
+typedef HRESULT ( STDMETHODCALLTYPE *PDXVAHDSW_GetVideoProcessorCaps )(HANDLE
hDevice,const DXVAHD_CONTENT_DESC *pContentDesc,DXVAHD_DEVICE_USAGE Usage,UINT
Count,DXVAHD_VPCAPS *pCaps);
+typedef HRESULT ( STDMETHODCALLTYPE *PDXVAHDSW_GetVideoProcessorCustomRates
)(HANDLE hDevice,const GUID *pVPGuid,UINT Count,DXVAHD_CUSTOM_RATE_DATA
*pRates);
+typedef HRESULT ( STDMETHODCALLTYPE *PDXVAHDSW_SetVideoProcessBltState
)(HANDLE hVideoProcessor,DXVAHD_BLT_STATE State,UINT DataSize,const void
*pData);
+typedef HRESULT ( STDMETHODCALLTYPE *PDXVAHDSW_CreateVideoProcessor )(HANDLE
hDevice,const GUID *pVPGuid,HANDLE *phVideoProcessor);
+typedef HRESULT ( STDMETHODCALLTYPE *PDXVAHDSW_DestroyDevice )(HANDLE hDevice);
+typedef HRESULT ( STDMETHODCALLTYPE *PDXVAHDSW_GetVideoProcessorFilterRange
)(HANDLE hDevice,DXVAHD_FILTER Filter,DXVAHD_FILTER_RANGE_DATA *pRange);
+typedef HRESULT ( STDMETHODCALLTYPE *PDXVAHDSW_DestroyVideoProcessor )(HANDLE
hVideoProcessor);
+typedef HRESULT ( STDMETHODCALLTYPE *PDXVAHDSW_VideoProcessBltHD )(HANDLE
hVideoProcessor,IDirect3DSurface9 *pOutputSurface,UINT OutputFrame,UINT
StreamCount,const DXVAHD_STREAM_DATA *pStreams);
+typedef HRESULT ( STDMETHODCALLTYPE
*PDXVAHDSW_GetVideoProcessStreamStatePrivate )(HANDLE hVideoProcessor,UINT
StreamNumber,DXVAHD_STREAM_STATE_PRIVATE_DATA *pData);
+typedef HRESULT ( STDMETHODCALLTYPE *PDXVAHDSW_SetVideoProcessStreamState
)(HANDLE hVideoProcessor,UINT StreamNumber,DXVAHD_STREAM_STATE State,UINT
DataSize,const void *pData);
+typedef HRESULT ( STDMETHODCALLTYPE *PDXVAHDSW_GetVideoProcessBltStatePrivate
)(HANDLE hVideoProcessor,DXVAHD_BLT_STATE_PRIVATE_DATA *pData);
+typedef HRESULT ( STDMETHODCALLTYPE *PDXVAHDSW_Plugin )(UINT Size,void
*pCallbacks);
typedef struct _DXVAHDSW_CALLBACKS {
PDXVAHDSW_CreateDevice CreateDevice;
diff --git a/mingw-w64-headers/include/dxvahd.idl
b/mingw-w64-headers/include/dxvahd.idl
index c69057d8..465f16ca 100644
--- a/mingw-w64-headers/include/dxvahd.idl
+++ b/mingw-w64-headers/include/dxvahd.idl
@@ -20,14 +20,6 @@ typedef DWORD D3DPOOL;
typedef struct { char dummy; } D3DCOLOR;
cpp_quote("#endif")
-cpp_quote("#ifndef CALLBACK")
-cpp_quote("#if defined(_ARM_)")
-cpp_quote("#define CALLBACK")
-cpp_quote("#else")
-cpp_quote("#define CALLBACK __stdcall")
-cpp_quote("#endif")
-cpp_quote("#endif")
-
interface IDXVAHD_Device;
interface IDXVAHD_VideoProcessor;
@@ -349,23 +341,23 @@ typedef struct _DXVAHD_STREAM_STATE_PALETTE_DATA {
D3DCOLOR *pEntries;
} DXVAHD_STREAM_STATE_PALETTE_DATA;
-cpp_quote("typedef HRESULT ( CALLBACK *PDXVAHDSW_CreateDevice
)(IDirect3DDevice9Ex *pD3DDevice,HANDLE *phDevice);")
-cpp_quote("typedef HRESULT ( CALLBACK *PDXVAHDSW_ProposeVideoPrivateFormat
)(HANDLE hDevice,D3DFORMAT *pFormat);")
-cpp_quote("typedef HRESULT ( CALLBACK *PDXVAHDSW_GetVideoProcessorDeviceCaps
)(HANDLE hDevice,const DXVAHD_CONTENT_DESC *pContentDesc,DXVAHD_DEVICE_USAGE
Usage,DXVAHD_VPDEVCAPS *pCaps);")
-cpp_quote("typedef HRESULT ( CALLBACK
*PDXVAHDSW_GetVideoProcessorOutputFormats )(HANDLE hDevice,const
DXVAHD_CONTENT_DESC *pContentDesc,DXVAHD_DEVICE_USAGE Usage,UINT
Count,D3DFORMAT *pFormats);")
-cpp_quote("typedef HRESULT ( CALLBACK *PDXVAHDSW_GetVideoProcessorInputFormats
)(HANDLE hDevice,const DXVAHD_CONTENT_DESC *pContentDesc,DXVAHD_DEVICE_USAGE
Usage,UINT Count,D3DFORMAT *pFormats);")
-cpp_quote("typedef HRESULT ( CALLBACK *PDXVAHDSW_GetVideoProcessorCaps
)(HANDLE hDevice,const DXVAHD_CONTENT_DESC *pContentDesc,DXVAHD_DEVICE_USAGE
Usage,UINT Count,DXVAHD_VPCAPS *pCaps);")
-cpp_quote("typedef HRESULT ( CALLBACK *PDXVAHDSW_GetVideoProcessorCustomRates
)(HANDLE hDevice,const GUID *pVPGuid,UINT Count,DXVAHD_CUSTOM_RATE_DATA
*pRates);")
-cpp_quote("typedef HRESULT ( CALLBACK *PDXVAHDSW_SetVideoProcessBltState
)(HANDLE hVideoProcessor,DXVAHD_BLT_STATE State,UINT DataSize,const void
*pData);")
-cpp_quote("typedef HRESULT ( CALLBACK *PDXVAHDSW_CreateVideoProcessor )(HANDLE
hDevice,const GUID *pVPGuid,HANDLE *phVideoProcessor);")
-cpp_quote("typedef HRESULT ( CALLBACK *PDXVAHDSW_DestroyDevice )(HANDLE
hDevice);")
-cpp_quote("typedef HRESULT ( CALLBACK *PDXVAHDSW_GetVideoProcessorFilterRange
)(HANDLE hDevice,DXVAHD_FILTER Filter,DXVAHD_FILTER_RANGE_DATA *pRange);")
-cpp_quote("typedef HRESULT ( CALLBACK *PDXVAHDSW_DestroyVideoProcessor
)(HANDLE hVideoProcessor);")
-cpp_quote("typedef HRESULT ( CALLBACK *PDXVAHDSW_VideoProcessBltHD )(HANDLE
hVideoProcessor,IDirect3DSurface9 *pOutputSurface,UINT OutputFrame,UINT
StreamCount,const DXVAHD_STREAM_DATA *pStreams);")
-cpp_quote("typedef HRESULT ( CALLBACK
*PDXVAHDSW_GetVideoProcessStreamStatePrivate )(HANDLE hVideoProcessor,UINT
StreamNumber,DXVAHD_STREAM_STATE_PRIVATE_DATA *pData);")
-cpp_quote("typedef HRESULT ( CALLBACK *PDXVAHDSW_SetVideoProcessStreamState
)(HANDLE hVideoProcessor,UINT StreamNumber,DXVAHD_STREAM_STATE State,UINT
DataSize,const void *pData);")
-cpp_quote("typedef HRESULT ( CALLBACK
*PDXVAHDSW_GetVideoProcessBltStatePrivate )(HANDLE
hVideoProcessor,DXVAHD_BLT_STATE_PRIVATE_DATA *pData);")
-cpp_quote("typedef HRESULT ( CALLBACK *PDXVAHDSW_Plugin )(UINT Size,void
*pCallbacks);")
+cpp_quote("typedef HRESULT ( STDMETHODCALLTYPE *PDXVAHDSW_CreateDevice
)(IDirect3DDevice9Ex *pD3DDevice,HANDLE *phDevice);")
+cpp_quote("typedef HRESULT ( STDMETHODCALLTYPE
*PDXVAHDSW_ProposeVideoPrivateFormat )(HANDLE hDevice,D3DFORMAT *pFormat);")
+cpp_quote("typedef HRESULT ( STDMETHODCALLTYPE
*PDXVAHDSW_GetVideoProcessorDeviceCaps )(HANDLE hDevice,const
DXVAHD_CONTENT_DESC *pContentDesc,DXVAHD_DEVICE_USAGE Usage,DXVAHD_VPDEVCAPS
*pCaps);")
+cpp_quote("typedef HRESULT ( STDMETHODCALLTYPE
*PDXVAHDSW_GetVideoProcessorOutputFormats )(HANDLE hDevice,const
DXVAHD_CONTENT_DESC *pContentDesc,DXVAHD_DEVICE_USAGE Usage,UINT
Count,D3DFORMAT *pFormats);")
+cpp_quote("typedef HRESULT ( STDMETHODCALLTYPE
*PDXVAHDSW_GetVideoProcessorInputFormats )(HANDLE hDevice,const
DXVAHD_CONTENT_DESC *pContentDesc,DXVAHD_DEVICE_USAGE Usage,UINT
Count,D3DFORMAT *pFormats);")
+cpp_quote("typedef HRESULT ( STDMETHODCALLTYPE
*PDXVAHDSW_GetVideoProcessorCaps )(HANDLE hDevice,const DXVAHD_CONTENT_DESC
*pContentDesc,DXVAHD_DEVICE_USAGE Usage,UINT Count,DXVAHD_VPCAPS *pCaps);")
+cpp_quote("typedef HRESULT ( STDMETHODCALLTYPE
*PDXVAHDSW_GetVideoProcessorCustomRates )(HANDLE hDevice,const GUID
*pVPGuid,UINT Count,DXVAHD_CUSTOM_RATE_DATA *pRates);")
+cpp_quote("typedef HRESULT ( STDMETHODCALLTYPE
*PDXVAHDSW_SetVideoProcessBltState )(HANDLE hVideoProcessor,DXVAHD_BLT_STATE
State,UINT DataSize,const void *pData);")
+cpp_quote("typedef HRESULT ( STDMETHODCALLTYPE *PDXVAHDSW_CreateVideoProcessor
)(HANDLE hDevice,const GUID *pVPGuid,HANDLE *phVideoProcessor);")
+cpp_quote("typedef HRESULT ( STDMETHODCALLTYPE *PDXVAHDSW_DestroyDevice
)(HANDLE hDevice);")
+cpp_quote("typedef HRESULT ( STDMETHODCALLTYPE
*PDXVAHDSW_GetVideoProcessorFilterRange )(HANDLE hDevice,DXVAHD_FILTER
Filter,DXVAHD_FILTER_RANGE_DATA *pRange);")
+cpp_quote("typedef HRESULT ( STDMETHODCALLTYPE
*PDXVAHDSW_DestroyVideoProcessor )(HANDLE hVideoProcessor);")
+cpp_quote("typedef HRESULT ( STDMETHODCALLTYPE *PDXVAHDSW_VideoProcessBltHD
)(HANDLE hVideoProcessor,IDirect3DSurface9 *pOutputSurface,UINT
OutputFrame,UINT StreamCount,const DXVAHD_STREAM_DATA *pStreams);")
+cpp_quote("typedef HRESULT ( STDMETHODCALLTYPE
*PDXVAHDSW_GetVideoProcessStreamStatePrivate )(HANDLE hVideoProcessor,UINT
StreamNumber,DXVAHD_STREAM_STATE_PRIVATE_DATA *pData);")
+cpp_quote("typedef HRESULT ( STDMETHODCALLTYPE
*PDXVAHDSW_SetVideoProcessStreamState )(HANDLE hVideoProcessor,UINT
StreamNumber,DXVAHD_STREAM_STATE State,UINT DataSize,const void *pData);")
+cpp_quote("typedef HRESULT ( STDMETHODCALLTYPE
*PDXVAHDSW_GetVideoProcessBltStatePrivate )(HANDLE
hVideoProcessor,DXVAHD_BLT_STATE_PRIVATE_DATA *pData);")
+cpp_quote("typedef HRESULT ( STDMETHODCALLTYPE *PDXVAHDSW_Plugin )(UINT
Size,void *pCallbacks);")
cpp_quote("")
cpp_quote("typedef struct _DXVAHDSW_CALLBACKS {")
cpp_quote(" PDXVAHDSW_CreateDevice CreateDevice;")
--
2.17.1
_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
