Henri Verbeet : d3d9: Fix some IDirect3DDevice9Ex methods.
Alexandre Julliard
julliard at winehq.org
Mon Oct 19 09:56:10 CDT 2009
Module: wine
Branch: master
Commit: 44aead2e1c638a2a57fda43a763821a1b2e1247d
URL: http://source.winehq.org/git/wine.git/?a=commit;h=44aead2e1c638a2a57fda43a763821a1b2e1247d
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Mon Oct 19 10:12:16 2009 +0200
d3d9: Fix some IDirect3DDevice9Ex methods.
---
dlls/d3d9/device.c | 44 ++++++++++++++++++++++++++++++--------------
include/d3d9.h | 12 ++++++++----
2 files changed, 38 insertions(+), 18 deletions(-)
diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index 7dcff3d..79990bb 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -2039,9 +2039,15 @@ static HRESULT WINAPI IDirect3DDevice9ExImpl_SetConvolutionMonoKernel(LPDIRECT
return WINED3DERR_INVALIDCALL;
}
-static HRESULT WINAPI IDirect3DDevice9ExImpl_ComposeRects(LPDIRECT3DDEVICE9EX iface, IDirect3DSurface9 *pSrc, IDirect3DDevice9 *pDst, IDirect3DVertexBuffer9 *pSrcRectDescs, UINT NumRects, IDirect3DVertexBuffer9 *pDstRectDescs, D3DCOMPOSERECTSOP Operation, int Xoffset, int Yoffset) {
- IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *) iface;
- FIXME("(%p)->(%p, %p, %p, %d, %p, %d, %d, %d) Stub!\n", This, pSrc, pDst, pSrcRectDescs, NumRects, pDstRectDescs, Operation, Xoffset, Yoffset);
+static HRESULT WINAPI IDirect3DDevice9ExImpl_ComposeRects(IDirect3DDevice9Ex *iface,
+ IDirect3DSurface9 *src_surface, IDirect3DSurface9 *dst_surface, IDirect3DVertexBuffer9 *src_descs,
+ UINT rect_count, IDirect3DVertexBuffer9 *dst_descs, D3DCOMPOSERECTSOP operation, INT offset_x, INT offset_y)
+{
+ FIXME("iface %p, src_surface %p, dst_surface %p, src_descs %p, rect_count %u,\n"
+ "dst_descs %p, operation %#x, offset_x %u, offset_y %u stub!\n",
+ iface, src_surface, dst_surface, src_descs, rect_count,
+ dst_descs, operation, offset_x, offset_y);
+
return WINED3DERR_INVALIDCALL;
}
@@ -2069,9 +2075,12 @@ static HRESULT WINAPI IDirect3DDevice9ExImpl_WaitForVBlank(LPDIRECT3DDEVICE9EX
return WINED3DERR_INVALIDCALL;
}
-static HRESULT WINAPI IDirect3DDevice9ExImpl_CheckresourceResidency(LPDIRECT3DDEVICE9EX iface, IDirect3DResource9 ** pResourceArray, UINT32 Numresources) {
- IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *) iface;
- FIXME("(%p)->(%p, %d) Stub!\n", This, pResourceArray, Numresources);
+static HRESULT WINAPI IDirect3DDevice9ExImpl_CheckResourceResidency(IDirect3DDevice9Ex *iface,
+ IDirect3DResource9 **resources, UINT32 resource_count)
+{
+ FIXME("iface %p, resources %p, resource_count %u stub!\n",
+ iface, resources, resource_count);
+
return WINED3DERR_INVALIDCALL;
}
@@ -2088,9 +2097,10 @@ static HRESULT WINAPI IDirect3DDevice9ExImpl_GetMaximumFrameLatency(LPDIRECT3D
return WINED3DERR_INVALIDCALL;
}
-static HRESULT WINAPI IDirect3DDevice9ExImpl_CheckdeviceState(LPDIRECT3DDEVICE9EX iface, HWND hDestinationWindow) {
- IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *) iface;
- FIXME("(%p)->(%p) Stub!\n", This, hDestinationWindow);
+static HRESULT WINAPI IDirect3DDevice9ExImpl_CheckDeviceState(IDirect3DDevice9Ex *iface, HWND dst_window)
+{
+ FIXME("iface %p, dst_window %p stub!\n", iface, dst_window);
+
return WINED3DERR_INVALIDCALL;
}
@@ -2106,9 +2116,15 @@ static HRESULT WINAPI IDirect3DDevice9ExImpl_CreateOffscreenPlainSurfaceEx(LPD
return WINED3DERR_INVALIDCALL;
}
-static HRESULT WINAPI IDirect3DDevice9ExImpl_CreateDepthStencilSurfaceEx(LPDIRECT3DDEVICE9EX iface, UINT Width, UINT Height, D3DFORMAT Format, D3DMULTISAMPLE_TYPE MultiSample, DWORD MultiSampleQuality, BOOL Discard, IDirect3DSurface9 **ppSurface, HANDLE *pSharedHandle, DWORD Usage) {
- IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *) iface;
- FIXME("(%p)->(%d, %d, %d, %d, %d, %s, %p, %p, 0x%08x) Stub!\n", This, Width, Height, Format, MultiSample, MultiSampleQuality, Discard ? "true" : "false", ppSurface, pSharedHandle, Usage);
+static HRESULT WINAPI IDirect3DDevice9ExImpl_CreateDepthStencilSurfaceEx(IDirect3DDevice9Ex *iface,
+ UINT width, UINT height, D3DFORMAT format, D3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality,
+ BOOL discard, IDirect3DSurface9 **surface, HANDLE *shared_handle, DWORD usage)
+{
+ FIXME("iface %p, width %u, height %u, format %#x, multisample_type %#x, multisample_quality %u,\n"
+ "discard %#x, surface %p, shared_handle %p, usage %#x stub!\n",
+ iface, width, height, format, multisample_type, multisample_quality,
+ discard, surface, shared_handle, usage);
+
return WINED3DERR_INVALIDCALL;
}
@@ -2254,10 +2270,10 @@ const IDirect3DDevice9ExVtbl Direct3DDevice9_Vtbl =
IDirect3DDevice9ExImpl_GetGPUThreadPriority,
IDirect3DDevice9ExImpl_SetGPUThreadPriority,
IDirect3DDevice9ExImpl_WaitForVBlank,
- IDirect3DDevice9ExImpl_CheckresourceResidency,
+ IDirect3DDevice9ExImpl_CheckResourceResidency,
IDirect3DDevice9ExImpl_SetMaximumFrameLatency,
IDirect3DDevice9ExImpl_GetMaximumFrameLatency,
- IDirect3DDevice9ExImpl_CheckdeviceState,
+ IDirect3DDevice9ExImpl_CheckDeviceState,
IDirect3DDevice9ExImpl_CreateRenderTargetEx,
IDirect3DDevice9ExImpl_CreateOffscreenPlainSurfaceEx,
IDirect3DDevice9ExImpl_CreateDepthStencilSurfaceEx,
diff --git a/include/d3d9.h b/include/d3d9.h
index dfd2acc..09ce3d0 100644
--- a/include/d3d9.h
+++ b/include/d3d9.h
@@ -1708,18 +1708,22 @@ DECLARE_INTERFACE_(IDirect3DDevice9Ex,IDirect3DDevice9)
STDMETHOD(CreateQuery)(THIS_ D3DQUERYTYPE Type, IDirect3DQuery9** ppQuery) PURE;
/* IDirect3DDevice9Ex methods */
STDMETHOD(SetConvolutionMonoKernel)(THIS_ UINT width, UINT height, float *rows, float *columns) PURE;
- STDMETHOD(ComposeRects)(THIS_ IDirect3DSurface9 *pSrc, IDirect3DDevice9 *pDst, IDirect3DVertexBuffer9 *pSrcRectDescs, UINT NumRects, IDirect3DVertexBuffer9 *pDstRectDescs, D3DCOMPOSERECTSOP Operation, int Xoffset, int Yoffset) PURE;
+ STDMETHOD(ComposeRects)(THIS_ IDirect3DSurface9 *src_surface, IDirect3DSurface9 *dst_surface,
+ IDirect3DVertexBuffer9 *src_descs, UINT rect_count, IDirect3DVertexBuffer9 *dst_descs,
+ D3DCOMPOSERECTSOP operation, INT offset_x, INT offset_y) PURE;
STDMETHOD(PresentEx)(THIS_ CONST RECT *pSourceRect, CONST RECT *pDestRect, HWND hDestWindowOverride, CONST RGNDATA *pDirtyRegion, DWORD dwFlags) PURE;
STDMETHOD(GetGPUThreadPriority)(THIS_ INT *pPriority) PURE;
STDMETHOD(SetGPUThreadPriority)(THIS_ INT Priority) PURE;
STDMETHOD(WaitForVBlank)(THIS_ UINT iSwapChain) PURE;
- STDMETHOD(CheckresourceResidency)(THIS_ IDirect3DResource9 ** pResourceArray, UINT32 Numresources) PURE;
+ STDMETHOD(CheckResourceResidency)(THIS_ IDirect3DResource9 **resources, UINT32 resource_count) PURE;
STDMETHOD(SetMaximumFrameLatency)(THIS_ UINT MaxLatency) PURE;
STDMETHOD(GetMaximumFrameLatency)(THIS_ UINT *pMaxLatenxy) PURE;
- STDMETHOD(CheckdeviceState)(THIS_ HWND hDestinationWindow) PURE;
+ STDMETHOD(CheckDeviceState)(THIS_ HWND dst_window) PURE;
STDMETHOD(CreateRenderTargetEx)(THIS_ UINT Width, UINT Height, D3DFORMAT Format, D3DMULTISAMPLE_TYPE MultiSample, DWORD MultiSampleQuality, BOOL Lockable, IDirect3DSurface9 ** ppSurface, HANDLE *pSharedHandle, DWORD Usage) PURE;
STDMETHOD(CreateOffscreenPlainSurfaceEx)(THIS_ UINT Width, UINT Height, D3DFORMAT Format, D3DPOOL Pool, IDirect3DSurface9 **ppSurface, HANDLE *pSharedHandle, DWORD Usage) PURE;
- STDMETHOD(CreateDepthStencilSurfaceEx)(THIS_ UINT Width, UINT Height, D3DFORMAT Format, D3DMULTISAMPLE_TYPE MultiSample, DWORD MultiSampleQuality, BOOL Discard, IDirect3DSurface9 **ppSurfface, HANDLE *pSharedHandle, DWORD Usage) PURE;
+ STDMETHOD(CreateDepthStencilSurfaceEx)(THIS_ UINT width, UINT height, D3DFORMAT format,
+ D3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality, BOOL discard,
+ IDirect3DSurface9 **surface, HANDLE *shared_handle, DWORD usage) PURE;
STDMETHOD(ResetEx)(THIS_ D3DPRESENT_PARAMETERS *pPresentationParameters, D3DDISPLAYMODEEX *pFullscreenDisplayMode) PURE;
STDMETHOD(GetDisplayModeEx)(THIS_ UINT iSwapChain, D3DDISPLAYMODEEX *pMode, D3DDISPLAYROTATION *pRotation) PURE;
};
More information about the wine-cvs
mailing list