commit 0f3995d21aa71da01d0fcefb37e8764a27222c90
author Stefan Dösinger <stefan@codeweavers.com> Thu Oct 05 16:37:42 2006 +0200
committer Alexandre Julliard <julliard@winehq.org> Fri Oct 06 12:53:24 2006 +0200
tree 846bec2570717ac12f7e797e08faa6da2fa8744b
parent e5f2f651b23257b15466328af053f147f80d7611

wined3d: Add IWineD3DSurface::SetOverlayPosition.

dlls/ddraw/surface.c

diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index 111fa9e..16af260 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -1528,8 +1528,11 @@
                                           LONG Y)
 {
     ICOM_THIS_FROM(IDirectDrawSurfaceImpl, IDirectDrawSurface7, iface);
-    FIXME("(%p)->(%ld,%ld): Stub!\n", This, X, Y);
-    return DDERR_NOTAOVERLAYSURFACE;
+    TRACE("(%p)->(%ld,%ld): Relay\n", This, X, Y);
+
+    return IWineD3DSurface_SetOverlayPosition(This->WineD3DSurface,
+                                              X,
+                                              Y);
 }
 
 /*****************************************************************************

dlls/wined3d/surface.c

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 19bbd98..3b8d323 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -3071,6 +3071,14 @@
     return ret;
 }
 
+HRESULT WINAPI IWineD3DSurfaceImpl_SetOverlayPosition(IWineD3DSurface *iface, LONG X, LONG Y) {
+    IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface;
+
+    FIXME("(%p)->(%d,%d) Stub!\n", This, X, Y);
+
+    return WINED3D_OK;
+}
+
 const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl =
 {
     /* IUnknown */
@@ -3108,6 +3116,7 @@
     IWineD3DSurfaceImpl_SetColorKey,
     IWineD3DSurfaceImpl_GetPitch,
     IWineD3DSurfaceImpl_SetMem,
+    IWineD3DSurfaceImpl_SetOverlayPosition,
     /* Internal use: */
     IWineD3DSurfaceImpl_CleanDirtyRect,
     IWineD3DSurfaceImpl_AddDirtyRect,

dlls/wined3d/surface_gdi.c

diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c
index 95fc785..6376f9b 100644
--- a/dlls/wined3d/surface_gdi.c
+++ b/dlls/wined3d/surface_gdi.c
@@ -1583,6 +1583,7 @@
     IWineD3DSurfaceImpl_SetColorKey,
     IWineD3DSurfaceImpl_GetPitch,
     IWineD3DSurfaceImpl_SetMem,
+    IWineD3DSurfaceImpl_SetOverlayPosition,
     /* Internal use: */
     IWineD3DSurfaceImpl_CleanDirtyRect,
     IWineD3DSurfaceImpl_AddDirtyRect,

dlls/wined3d/wined3d_private.h

diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index b859ade..0f98482 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -948,6 +948,7 @@
 DWORD WINAPI IWineD3DSurfaceImpl_GetPitch(IWineD3DSurface *iface);
 HRESULT WINAPI IWineD3DSurfaceImpl_RealizePalette(IWineD3DSurface *iface);
 HRESULT WINAPI IWineD3DSurfaceImpl_SetMem(IWineD3DSurface *iface, void *Mem);
+HRESULT WINAPI IWineD3DSurfaceImpl_SetOverlayPosition(IWineD3DSurface *iface, LONG X, LONG Y);
 
 /* Surface flags: */
 #define SFLAG_OVERSIZE    0x00000001 /* Surface is bigger than gl size, blts only */

include/wine/wined3d_interface.h

diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h
index e76bc55..48a0545 100644
--- a/include/wine/wined3d_interface.h
+++ b/include/wine/wined3d_interface.h
@@ -1133,6 +1133,7 @@
     STDMETHOD(SetColorKey)(THIS_ DWORD Flags, DDCOLORKEY *CKey) PURE;
     STDMETHOD_(DWORD,GetPitch)(THIS) PURE;
     STDMETHOD(SetMem)(THIS_ void *mem) PURE;
+    STDMETHOD(SetOverlayPosition)(THIS_ LONG X, LONG Y) PURE;
     /* Internally used methods */
     STDMETHOD(CleanDirtyRect)(THIS) PURE;
     STDMETHOD(AddDirtyRect)(THIS_ CONST RECT* pRect) PURE;
@@ -1185,6 +1186,7 @@
 #define IWineD3DSurface_SetColorKey(p, a, b)         (p)->lpVtbl->SetColorKey(p, a, b)
 #define IWineD3DSurface_GetPitch(p)                  (p)->lpVtbl->GetPitch(p)
 #define IWineD3DSurface_SetMem(p, a)                 (p)->lpVtbl->SetMem(p, a)
+#define IWineD3DSurface_SetOverlayPosition(p, a, b)  (p)->lpVtbl->SetOverlayPosition(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)