Commit f6647486 authored by Stefan Dösinger's avatar Stefan Dösinger Committed by Alexandre Julliard

wined3d: Add IWineD3DSurface::GetOverlayPosition.

parent 0f3995d2
...@@ -1351,9 +1351,12 @@ static HRESULT WINAPI ...@@ -1351,9 +1351,12 @@ static HRESULT WINAPI
IDirectDrawSurfaceImpl_GetOverlayPosition(IDirectDrawSurface7 *iface, IDirectDrawSurfaceImpl_GetOverlayPosition(IDirectDrawSurface7 *iface,
LONG *X, LONG *X,
LONG *Y) { 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);
} }
/***************************************************************************** /*****************************************************************************
......
...@@ -3079,6 +3079,14 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SetOverlayPosition(IWineD3DSurface *iface, LO ...@@ -3079,6 +3079,14 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SetOverlayPosition(IWineD3DSurface *iface, LO
return WINED3D_OK; 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 = const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl =
{ {
/* IUnknown */ /* IUnknown */
...@@ -3117,6 +3125,7 @@ const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl = ...@@ -3117,6 +3125,7 @@ const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl =
IWineD3DSurfaceImpl_GetPitch, IWineD3DSurfaceImpl_GetPitch,
IWineD3DSurfaceImpl_SetMem, IWineD3DSurfaceImpl_SetMem,
IWineD3DSurfaceImpl_SetOverlayPosition, IWineD3DSurfaceImpl_SetOverlayPosition,
IWineD3DSurfaceImpl_GetOverlayPosition,
/* Internal use: */ /* Internal use: */
IWineD3DSurfaceImpl_CleanDirtyRect, IWineD3DSurfaceImpl_CleanDirtyRect,
IWineD3DSurfaceImpl_AddDirtyRect, IWineD3DSurfaceImpl_AddDirtyRect,
......
...@@ -1584,6 +1584,7 @@ const IWineD3DSurfaceVtbl IWineGDISurface_Vtbl = ...@@ -1584,6 +1584,7 @@ const IWineD3DSurfaceVtbl IWineGDISurface_Vtbl =
IWineD3DSurfaceImpl_GetPitch, IWineD3DSurfaceImpl_GetPitch,
IWineD3DSurfaceImpl_SetMem, IWineD3DSurfaceImpl_SetMem,
IWineD3DSurfaceImpl_SetOverlayPosition, IWineD3DSurfaceImpl_SetOverlayPosition,
IWineD3DSurfaceImpl_GetOverlayPosition,
/* Internal use: */ /* Internal use: */
IWineD3DSurfaceImpl_CleanDirtyRect, IWineD3DSurfaceImpl_CleanDirtyRect,
IWineD3DSurfaceImpl_AddDirtyRect, IWineD3DSurfaceImpl_AddDirtyRect,
......
...@@ -949,6 +949,7 @@ DWORD WINAPI IWineD3DSurfaceImpl_GetPitch(IWineD3DSurface *iface); ...@@ -949,6 +949,7 @@ DWORD WINAPI IWineD3DSurfaceImpl_GetPitch(IWineD3DSurface *iface);
HRESULT WINAPI IWineD3DSurfaceImpl_RealizePalette(IWineD3DSurface *iface); HRESULT WINAPI IWineD3DSurfaceImpl_RealizePalette(IWineD3DSurface *iface);
HRESULT WINAPI IWineD3DSurfaceImpl_SetMem(IWineD3DSurface *iface, void *Mem); HRESULT WINAPI IWineD3DSurfaceImpl_SetMem(IWineD3DSurface *iface, void *Mem);
HRESULT WINAPI IWineD3DSurfaceImpl_SetOverlayPosition(IWineD3DSurface *iface, LONG X, LONG Y); HRESULT WINAPI IWineD3DSurfaceImpl_SetOverlayPosition(IWineD3DSurface *iface, LONG X, LONG Y);
HRESULT WINAPI IWineD3DSurfaceImpl_GetOverlayPosition(IWineD3DSurface *iface, LONG *X, LONG *Y);
/* Surface flags: */ /* Surface flags: */
#define SFLAG_OVERSIZE 0x00000001 /* Surface is bigger than gl size, blts only */ #define SFLAG_OVERSIZE 0x00000001 /* Surface is bigger than gl size, blts only */
......
...@@ -1134,6 +1134,7 @@ DECLARE_INTERFACE_(IWineD3DSurface,IWineD3DResource) ...@@ -1134,6 +1134,7 @@ DECLARE_INTERFACE_(IWineD3DSurface,IWineD3DResource)
STDMETHOD_(DWORD,GetPitch)(THIS) PURE; STDMETHOD_(DWORD,GetPitch)(THIS) PURE;
STDMETHOD(SetMem)(THIS_ void *mem) PURE; STDMETHOD(SetMem)(THIS_ void *mem) PURE;
STDMETHOD(SetOverlayPosition)(THIS_ LONG X, LONG Y) PURE; STDMETHOD(SetOverlayPosition)(THIS_ LONG X, LONG Y) PURE;
STDMETHOD(GetOverlayPosition)(THIS_ LONG *X, LONG *Y) PURE;
/* Internally used methods */ /* Internally used methods */
STDMETHOD(CleanDirtyRect)(THIS) PURE; STDMETHOD(CleanDirtyRect)(THIS) PURE;
STDMETHOD(AddDirtyRect)(THIS_ CONST RECT* pRect) PURE; STDMETHOD(AddDirtyRect)(THIS_ CONST RECT* pRect) PURE;
...@@ -1187,6 +1188,7 @@ DECLARE_INTERFACE_(IWineD3DSurface,IWineD3DResource) ...@@ -1187,6 +1188,7 @@ DECLARE_INTERFACE_(IWineD3DSurface,IWineD3DResource)
#define IWineD3DSurface_GetPitch(p) (p)->lpVtbl->GetPitch(p) #define IWineD3DSurface_GetPitch(p) (p)->lpVtbl->GetPitch(p)
#define IWineD3DSurface_SetMem(p, a) (p)->lpVtbl->SetMem(p, a) #define IWineD3DSurface_SetMem(p, a) (p)->lpVtbl->SetMem(p, a)
#define IWineD3DSurface_SetOverlayPosition(p, a, b) (p)->lpVtbl->SetOverlayPosition(p, a, b) #define IWineD3DSurface_SetOverlayPosition(p, a, b) (p)->lpVtbl->SetOverlayPosition(p, a, b)
#define IWineD3DSurface_GetOverlayPosition(p, a, b) (p)->lpVtbl->GetOverlayPosition(p, a, b)
/*** IWineD3DSurface (Internal, no d3d mapping) methods ***/ /*** IWineD3DSurface (Internal, no d3d mapping) methods ***/
#define IWineD3DSurface_CleanDirtyRect(p) (p)->lpVtbl->CleanDirtyRect(p) #define IWineD3DSurface_CleanDirtyRect(p) (p)->lpVtbl->CleanDirtyRect(p)
#define IWineD3DSurface_AddDirtyRect(p,a) (p)->lpVtbl->AddDirtyRect(p,a) #define IWineD3DSurface_AddDirtyRect(p,a) (p)->lpVtbl->AddDirtyRect(p,a)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment