Module: wine Branch: master Commit: 080e4f56cf7d50d0683266e94d2cda2d367d2048 URL: http://source.winehq.org/git/wine.git/?a=commit;h=080e4f56cf7d50d0683266e94d...
Author: Stefan Dösinger stefandoesinger@gmx.at Date: Thu Oct 5 16:41:19 2006 +0200
wined3d: Add UpdatOverlayZOrder.
---
dlls/ddraw/surface.c | 7 +++++-- dlls/wined3d/surface.c | 10 ++++++++++ dlls/wined3d/surface_gdi.c | 1 + dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d_interface.h | 2 ++ 5 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 6e43976..459ce2c 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1607,8 +1607,11 @@ IDirectDrawSurfaceImpl_UpdateOverlayZOrd { ICOM_THIS_FROM(IDirectDrawSurfaceImpl, IDirectDrawSurface7, iface); IDirectDrawSurfaceImpl *Ref = ICOM_OBJECT(IDirectDrawSurfaceImpl, IDirectDrawSurface7, DDSRef); - FIXME("(%p)->(%lx,%p)\n", This, Flags, Ref); - return DDERR_NOTAOVERLAYSURFACE; + + TRACE("(%p)->(%lx,%p): Relay\n", This, Flags, Ref); + return IWineD3DSurface_UpdateOverlayZOrder(This->WineD3DSurface, + Flags, + Ref ? Ref->WineD3DSurface : NULL); }
/***************************************************************************** diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 36a525c..41059c5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3087,6 +3087,15 @@ HRESULT WINAPI IWineD3DSurfaceImpl_GetOv return WINED3D_OK; }
+HRESULT WINAPI IWineD3DSurfaceImpl_UpdateOverlayZOrder(IWineD3DSurface *iface, DWORD Flags, IWineD3DSurface *Ref) { + IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; + IWineD3DSurfaceImpl *RefImpl = (IWineD3DSurfaceImpl *) Ref; + + FIXME("(%p)->(%08x,%p) Stub!\n", This, Flags, RefImpl); + + return WINED3D_OK; +} + const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl = { /* IUnknown */ @@ -3126,6 +3135,7 @@ const IWineD3DSurfaceVtbl IWineD3DSurfac IWineD3DSurfaceImpl_SetMem, IWineD3DSurfaceImpl_SetOverlayPosition, IWineD3DSurfaceImpl_GetOverlayPosition, + IWineD3DSurfaceImpl_UpdateOverlayZOrder, /* Internal use: */ IWineD3DSurfaceImpl_CleanDirtyRect, IWineD3DSurfaceImpl_AddDirtyRect, diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index 22727c4..43acdf9 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -1585,6 +1585,7 @@ const IWineD3DSurfaceVtbl IWineGDISurfac IWineD3DSurfaceImpl_SetMem, IWineD3DSurfaceImpl_SetOverlayPosition, IWineD3DSurfaceImpl_GetOverlayPosition, + IWineD3DSurfaceImpl_UpdateOverlayZOrder, /* Internal use: */ IWineD3DSurfaceImpl_CleanDirtyRect, IWineD3DSurfaceImpl_AddDirtyRect, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1e7326a..190066b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -950,6 +950,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_Reali HRESULT WINAPI IWineD3DSurfaceImpl_SetMem(IWineD3DSurface *iface, void *Mem); HRESULT WINAPI IWineD3DSurfaceImpl_SetOverlayPosition(IWineD3DSurface *iface, LONG X, LONG Y); HRESULT WINAPI IWineD3DSurfaceImpl_GetOverlayPosition(IWineD3DSurface *iface, LONG *X, LONG *Y); +HRESULT WINAPI IWineD3DSurfaceImpl_UpdateOverlayZOrder(IWineD3DSurface *iface, DWORD Flags, IWineD3DSurface *Ref);
/* Surface flags: */ #define SFLAG_OVERSIZE 0x00000001 /* Surface is bigger than gl size, blts only */ diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index 4860c3b..3c65c98 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -1135,6 +1135,7 @@ DECLARE_INTERFACE_(IWineD3DSurface,IWine STDMETHOD(SetMem)(THIS_ void *mem) PURE; STDMETHOD(SetOverlayPosition)(THIS_ LONG X, LONG Y) PURE; STDMETHOD(GetOverlayPosition)(THIS_ LONG *X, LONG *Y) PURE; + STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD Flags, IWineD3DSurface *Ref) PURE; /* Internally used methods */ STDMETHOD(CleanDirtyRect)(THIS) PURE; STDMETHOD(AddDirtyRect)(THIS_ CONST RECT* pRect) PURE; @@ -1189,6 +1190,7 @@ #define IWineD3DSurface_GetPitch(p) #define IWineD3DSurface_SetMem(p, a) (p)->lpVtbl->SetMem(p, a) #define IWineD3DSurface_SetOverlayPosition(p, a, b) (p)->lpVtbl->SetOverlayPosition(p, a, b) #define IWineD3DSurface_GetOverlayPosition(p, a, b) (p)->lpVtbl->GetOverlayPosition(p, a, b) +#define IWineD3DSurface_UpdateOverlayZOrder(p, a, b) (p)->lpVtbl->UpdateOverlayZOrder(p, a, b) /*** IWineD3DSurface (Internal, no d3d mapping) methods ***/ #define IWineD3DSurface_CleanDirtyRect(p) (p)->lpVtbl->CleanDirtyRect(p) #define IWineD3DSurface_AddDirtyRect(p,a) (p)->lpVtbl->AddDirtyRect(p,a)