commit f6647486cfb8bc0751cd2f588dc57b425b9c1e06
author Stefan Dösinger <stefan@codeweavers.com> Thu Oct 05 16:40:56 2006 +0200
committer Alexandre Julliard <julliard@winehq.org> Fri Oct 06 12:53:24 2006 +0200
tree 510f784fc8821c536c143249a64bf36f28922e24
parent 0f3995d21aa71da01d0fcefb37e8764a27222c90

wined3d: Add IWineD3DSurface::GetOverlayPosition.

dlls/ddraw/surface.c

diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index 16af260..6e43976 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -1351,9 +1351,12 @@
 IDirectDrawSurfaceImpl_GetOverlayPosition(IDirectDrawSurface7 *iface,
                                           LONG *X,
                                           LONG *Y) {
-    FIXME("(%p)->(%p,%p): Stub!\n", iface, X, Y);
+    ICOM_THIS_FROM(IDirectDrawSurfaceImpl, IDirectDrawSurface7, iface);
+    TRACE("(%p)->(%p,%p): Relay\n", This, X, Y);
 
-    return DDERR_NOTAOVERLAYSURFACE;
+    return IWineD3DSurface_GetOverlayPosition(This->WineD3DSurface,
+                                              X,
+                                              Y);
 }
 
 /*****************************************************************************

dlls/wined3d/surface.c

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 3b8d323..36a525c 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -3079,6 +3079,14 @@
     return WINED3D_OK;
 }
 
+HRESULT WINAPI IWineD3DSurfaceImpl_GetOverlayPosition(IWineD3DSurface *iface, LONG *X, LONG *Y) {
+    IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface;
+
+    FIXME("(%p)->(%p,%p) Stub!\n", This, X, Y);
+
+    return WINED3D_OK;
+}
+
 const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl =
 {
     /* IUnknown */
@@ -3117,6 +3125,7 @@
     IWineD3DSurfaceImpl_GetPitch,
     IWineD3DSurfaceImpl_SetMem,
     IWineD3DSurfaceImpl_SetOverlayPosition,
+    IWineD3DSurfaceImpl_GetOverlayPosition,
     /* 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 6376f9b..22727c4 100644
--- a/dlls/wined3d/surface_gdi.c
+++ b/dlls/wined3d/surface_gdi.c
@@ -1584,6 +1584,7 @@
     IWineD3DSurfaceImpl_GetPitch,
     IWineD3DSurfaceImpl_SetMem,
     IWineD3DSurfaceImpl_SetOverlayPosition,
+    IWineD3DSurfaceImpl_GetOverlayPosition,
     /* 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 0f98482..1e7326a 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -949,6 +949,7 @@
 HRESULT WINAPI IWineD3DSurfaceImpl_RealizePalette(IWineD3DSurface *iface);
 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);
 
 /* Surface flags: */
 #define SFLAG_OVERSIZE    0x00000001 /* Surface is bigger than gl size, blts only */