1. Implement Surface_GetCaps

2. Implement AddAttachedSurface not tested 

svn path=/trunk/; revision=21514
This commit is contained in:
Magnus Olsen 2006-04-07 22:18:17 +00:00
parent ece46b942f
commit 2e69e8f9d1

View file

@ -82,7 +82,18 @@ HRESULT WINAPI
Main_DDrawSurface_AddAttachedSurface(LPDIRECTDRAWSURFACE7 iface, Main_DDrawSurface_AddAttachedSurface(LPDIRECTDRAWSURFACE7 iface,
LPDIRECTDRAWSURFACE7 pAttach) LPDIRECTDRAWSURFACE7 pAttach)
{ {
DX_STUB; IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface;
IDirectDrawSurfaceImpl* That = NULL;
if (pAttach==NULL)
{
return DDERR_INVALIDOBJECT;
}
That = (IDirectDrawSurfaceImpl*)pAttach;
//FIXME Have I put This and That in right order ?? DdAttachSurface(from, to)
return DdAttachSurface( That->Surf->mpPrimaryLocals[0],This->Surf->mpPrimaryLocals[0]);
} }
/* MSDN: "not currently implemented." */ /* MSDN: "not currently implemented." */
@ -176,7 +187,24 @@ Main_DDrawSurface_GetBltStatus(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags)
HRESULT WINAPI HRESULT WINAPI
Main_DDrawSurface_GetCaps(LPDIRECTDRAWSURFACE7 iface, LPDDSCAPS2 pCaps) Main_DDrawSurface_GetCaps(LPDIRECTDRAWSURFACE7 iface, LPDDSCAPS2 pCaps)
{ {
DX_STUB; IDirectDrawSurfaceImpl* This;
if (iface == NULL)
{
return DDERR_INVALIDOBJECT;
}
if (pCaps == NULL)
{
return DDERR_INVALIDPARAMS;
}
This = (IDirectDrawSurfaceImpl*)iface;
RtlZeroMemory(pCaps,sizeof(DDSCAPS2));
pCaps->dwCaps = This->Surf->mddsdPrimary.ddsCaps.dwCaps;
return DD_OK;
} }
HRESULT WINAPI HRESULT WINAPI