Author: gbrunmar
Date: Sun Dec 21 01:11:30 2008
New Revision: 38224
URL:
http://svn.reactos.org/svn/reactos?rev=38224&view=rev
Log:
* Implemented IDirect3DDevice9::GetBackBuffer()
* Forgotten documentation for IDirect3DDevice9::GetRasterStatus()
Modified:
trunk/reactos/dll/directx/d3d9/d3d9_device.c
Modified: trunk/reactos/dll/directx/d3d9/d3d9_device.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_devi…
==============================================================================
--- trunk/reactos/dll/directx/d3d9/d3d9_device.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/d3d9/d3d9_device.c [iso-8859-1] Sun Dec 21 01:11:30 2008
@@ -479,19 +479,12 @@
return D3D_OK;
}
-HRESULT WINAPI IDirect3DDevice9Base_GetBackBuffer(LPDIRECT3DDEVICE9 iface, UINT
iSwapChain, UINT iBackBuffer, D3DBACKBUFFER_TYPE Type, IDirect3DSurface9** ppBackBuffer)
-{
- UNIMPLEMENTED
-
- return D3D_OK;
-}
-
-/*++
-* @name IDirect3DDevice9::GetRasterStatus
-* @implemented
-*
-* The function IDirect3DDevice9Base_GetRasterStatus retrieves raster information
-* of the monitor for the specified swap chain.
+/*++
+* @name IDirect3DDevice9::GetBackBuffer
+* @implemented
+*
+* The function IDirect3DDevice9Base_GetBackBuffer retrieves the back buffer
+* for the specified swap chain.
*
* @param LPDIRECT3D iface
* Pointer to the IDirect3DDevice9 object returned from IDirect3D9::CreateDevice().
@@ -500,11 +493,19 @@
* Swap chain index to get object for.
* The maximum value for this is the value returned by
IDirect3DDevice9::GetNumberOfSwapChains() - 1.
*
-* @param D3DRASTER_STATUS* pRasterStatus
-* Pointer to a D3DRASTER_STATUS to receive the raster information
-*
-*/
-HRESULT WINAPI IDirect3DDevice9Base_GetRasterStatus(LPDIRECT3DDEVICE9 iface, UINT
iSwapChain, D3DRASTER_STATUS* pRasterStatus)
+* @param UINT iBackBuffer
+* Back buffer index to get object for.
+* The maximum value for this is the the total number of back buffers - 1, as indexing
starts at 0.
+*
+* @param IDirect3DSurface9** ppBackBuffer
+* Pointer to a IDirect3DSurface9* to receive the back buffer object
+*
+* @return HRESULT
+* If the method successfully sets the ppBackBuffer pointer, the return value is D3D_OK.
+* If iSwapChain or iBackBuffer is out of range, Type is invalid or ppBackBuffer is a bad
pointer,
+* the return value will be D3DERR_INVALIDCALL.
+*/
+HRESULT WINAPI IDirect3DDevice9Base_GetBackBuffer(LPDIRECT3DDEVICE9 iface, UINT
iSwapChain, UINT iBackBuffer, D3DBACKBUFFER_TYPE Type, IDirect3DSurface9** ppBackBuffer)
{
HRESULT hResult;
IDirect3DSwapChain9* pSwapChain = NULL;
@@ -519,37 +520,25 @@
return D3DERR_INVALIDCALL;
}
- if (NULL == pRasterStatus)
- {
- DPRINT1("Invalid pRasterStatus parameter specified");
- UNLOCK_D3DDEVICE9();
- return D3DERR_INVALIDCALL;
- }
-
- hResult = IDirect3DSwapChain9_GetRasterStatus(pSwapChain, pRasterStatus);
+ if (NULL == ppBackBuffer)
+ {
+ DPRINT1("Invalid ppBackBuffer parameter specified");
+ UNLOCK_D3DDEVICE9();
+ return D3DERR_INVALIDCALL;
+ }
+
+ hResult = IDirect3DSwapChain9_GetBackBuffer(pSwapChain, iBackBuffer, Type,
ppBackBuffer);
UNLOCK_D3DDEVICE9();
return hResult;
}
-HRESULT WINAPI IDirect3DDevice9Base_SetDialogBoxMode(LPDIRECT3DDEVICE9 iface, BOOL
bEnableDialogs)
-{
- UNIMPLEMENTED
-
- return D3D_OK;
-}
-
-VOID WINAPI IDirect3DDevice9Base_SetGammaRamp(LPDIRECT3DDEVICE9 iface, UINT iSwapChain,
DWORD Flags, CONST D3DGAMMARAMP* pRamp)
-{
- UNIMPLEMENTED
-}
-
-/*++
-* @name IDirect3DDevice9::GetGammaRamp
-* @implemented
-*
-* The function IDirect3DDevice9Base_GetGammaRamp retrieves the gamma correction ramp
values
-* for the specified swap chain.
+/*++
+* @name IDirect3DDevice9::GetRasterStatus
+* @implemented
+*
+* The function IDirect3DDevice9Base_GetRasterStatus retrieves raster information
+* of the monitor for the specified swap chain.
*
* @param LPDIRECT3D iface
* Pointer to the IDirect3DDevice9 object returned from IDirect3D9::CreateDevice().
@@ -558,6 +547,68 @@
* Swap chain index to get object for.
* The maximum value for this is the value returned by
IDirect3DDevice9::GetNumberOfSwapChains() - 1.
*
+* @param D3DRASTER_STATUS* pRasterStatus
+* Pointer to a D3DRASTER_STATUS to receive the raster information
+*
+* @return HRESULT
+* If the method successfully fills the pRasterStatus structure, the return value is
D3D_OK.
+* If iSwapChain is out of range or pRasterStatus is a bad pointer, the return value
+* will be D3DERR_INVALIDCALL.
+*/
+HRESULT WINAPI IDirect3DDevice9Base_GetRasterStatus(LPDIRECT3DDEVICE9 iface, UINT
iSwapChain, D3DRASTER_STATUS* pRasterStatus)
+{
+ HRESULT hResult;
+ IDirect3DSwapChain9* pSwapChain = NULL;
+ LPDIRECT3DDEVICE9_INT This = IDirect3DDevice9ToImpl(iface);
+ LOCK_D3DDEVICE9();
+
+ IDirect3DDevice9Base_GetSwapChain(iface, iSwapChain, &pSwapChain);
+ if (NULL == pSwapChain)
+ {
+ DPRINT1("Invalid iSwapChain parameter specified");
+ UNLOCK_D3DDEVICE9();
+ return D3DERR_INVALIDCALL;
+ }
+
+ if (NULL == pRasterStatus)
+ {
+ DPRINT1("Invalid pRasterStatus parameter specified");
+ UNLOCK_D3DDEVICE9();
+ return D3DERR_INVALIDCALL;
+ }
+
+ hResult = IDirect3DSwapChain9_GetRasterStatus(pSwapChain, pRasterStatus);
+
+ UNLOCK_D3DDEVICE9();
+ return hResult;
+}
+
+HRESULT WINAPI IDirect3DDevice9Base_SetDialogBoxMode(LPDIRECT3DDEVICE9 iface, BOOL
bEnableDialogs)
+{
+ UNIMPLEMENTED
+
+ return D3D_OK;
+}
+
+VOID WINAPI IDirect3DDevice9Base_SetGammaRamp(LPDIRECT3DDEVICE9 iface, UINT iSwapChain,
DWORD Flags, CONST D3DGAMMARAMP* pRamp)
+{
+ UNIMPLEMENTED
+}
+
+/*++
+* @name IDirect3DDevice9::GetGammaRamp
+* @implemented
+*
+* The function IDirect3DDevice9Base_GetGammaRamp retrieves the gamma correction ramp
values
+* for the specified swap chain.
+*
+* @param LPDIRECT3D iface
+* Pointer to the IDirect3DDevice9 object returned from IDirect3D9::CreateDevice().
+*
+* @param UINT iSwapChain
+* Swap chain index to get object for.
+* The maximum value for this is the value returned by
IDirect3DDevice9::GetNumberOfSwapChains() - 1.
+*
* @param D3DGAMMARAMP* pRamp
* Pointer to a D3DGAMMARAMP to receive the gamma correction ramp values.
*