Module: wine Branch: master Commit: 2bcacf22d369cf0ff2f7f0497537f460cbe321da URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bcacf22d369cf0ff2f7f04975...
Author: Stefan Dösinger stefandoesinger@gmx.at Date: Thu Oct 5 16:43:26 2006 +0200
wined3d: Add IWineD3DSurface::UpdateOverlay.
---
dlls/ddraw/surface.c | 10 ++++++++-- dlls/wined3d/surface.c | 9 +++++++++ dlls/wined3d/surface_gdi.c | 1 + dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d_interface.h | 2 ++ 5 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 459ce2c..6c3050c 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1563,8 +1563,14 @@ IDirectDrawSurfaceImpl_UpdateOverlay(IDi { ICOM_THIS_FROM(IDirectDrawSurfaceImpl, IDirectDrawSurface7, iface); IDirectDrawSurfaceImpl *Dst = ICOM_OBJECT(IDirectDrawSurfaceImpl, IDirectDrawSurface7, DstSurface); - FIXME("(%p)->(%p,%p,%p,%lx,%p): Stub!\n", This, SrcRect, Dst, DstRect, Flags, FX); - return DDERR_UNSUPPORTED; + TRACE("(%p)->(%p,%p,%p,%lx,%p): Relay\n", This, SrcRect, Dst, DstRect, Flags, FX); + + return IWineD3DSurface_UpdateOverlay(This->WineD3DSurface, + SrcRect, + Dst ? Dst->WineD3DSurface : NULL, + DstRect, + Flags, + (WINEDDOVERLAYFX *) FX); }
/***************************************************************************** diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 41059c5..61bad8a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3096,6 +3096,14 @@ HRESULT WINAPI IWineD3DSurfaceImpl_Updat return WINED3D_OK; }
+HRESULT WINAPI IWineD3DSurfaceImpl_UpdateOverlay(IWineD3DSurface *iface, RECT *SrcRect, IWineD3DSurface *DstSurface, RECT *DstRect, DWORD Flags, WINEDDOVERLAYFX *FX) { + IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; + IWineD3DSurfaceImpl *Dst = (IWineD3DSurfaceImpl *) DstSurface; + FIXME("(%p)->(%p, %p, %p, %08x, %p)\n", This, SrcRect, Dst, DstRect, Flags, FX); + + return WINED3D_OK; +} + const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl = { /* IUnknown */ @@ -3136,6 +3144,7 @@ const IWineD3DSurfaceVtbl IWineD3DSurfac IWineD3DSurfaceImpl_SetOverlayPosition, IWineD3DSurfaceImpl_GetOverlayPosition, IWineD3DSurfaceImpl_UpdateOverlayZOrder, + IWineD3DSurfaceImpl_UpdateOverlay, /* Internal use: */ IWineD3DSurfaceImpl_CleanDirtyRect, IWineD3DSurfaceImpl_AddDirtyRect, diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index 43acdf9..0e605c8 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -1586,6 +1586,7 @@ const IWineD3DSurfaceVtbl IWineGDISurfac IWineD3DSurfaceImpl_SetOverlayPosition, IWineD3DSurfaceImpl_GetOverlayPosition, IWineD3DSurfaceImpl_UpdateOverlayZOrder, + IWineD3DSurfaceImpl_UpdateOverlay, /* Internal use: */ IWineD3DSurfaceImpl_CleanDirtyRect, IWineD3DSurfaceImpl_AddDirtyRect, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 190066b..c9fb365 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -951,6 +951,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SetMe 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); +HRESULT WINAPI IWineD3DSurfaceImpl_UpdateOverlay(IWineD3DSurface *iface, RECT *SrcRect, IWineD3DSurface *DstSurface, RECT *DstRect, DWORD Flags, WINEDDOVERLAYFX *FX);
/* 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 3c65c98..516e637 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -1136,6 +1136,7 @@ DECLARE_INTERFACE_(IWineD3DSurface,IWine STDMETHOD(SetOverlayPosition)(THIS_ LONG X, LONG Y) PURE; STDMETHOD(GetOverlayPosition)(THIS_ LONG *X, LONG *Y) PURE; STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD Flags, IWineD3DSurface *Ref) PURE; + STDMETHOD(UpdateOverlay)(THIS_ RECT *SrcRect, IWineD3DSurface *DstSurface, RECT *DstRect, DWORD Flags, WINEDDOVERLAYFX *FX); /* Internally used methods */ STDMETHOD(CleanDirtyRect)(THIS) PURE; STDMETHOD(AddDirtyRect)(THIS_ CONST RECT* pRect) PURE; @@ -1191,6 +1192,7 @@ #define IWineD3DSurface_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) +#define IWineD3DSurface_UpdateOverlay(p, a, b, c, d, e) (p)->lpVtbl->UpdateOverlay(p, a, b, c, d, e) /*** IWineD3DSurface (Internal, no d3d mapping) methods ***/ #define IWineD3DSurface_CleanDirtyRect(p) (p)->lpVtbl->CleanDirtyRect(p) #define IWineD3DSurface_AddDirtyRect(p,a) (p)->lpVtbl->AddDirtyRect(p,a)
-
Alexandre Julliard