From bf51ef9a820223ab5db8bf260bf64c71e736e12d Mon Sep 17 00:00:00 2001 From: Maarten Bosma Date: Sat, 12 May 2007 17:50:09 +0000 Subject: [PATCH] Create Internal_CreateSurface stub. svn path=/trunk/; revision=26736 --- reactos/dll/directx/ddraw/Ddraw/ddraw_main.c | 5 ++++- reactos/dll/directx/ddraw/Surface/createsurface.c | 7 +++++++ reactos/dll/directx/ddraw/Surface/surface.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c b/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c index ef2dfd667aa..7b5807851bb 100644 --- a/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c +++ b/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c @@ -130,6 +130,9 @@ HRESULT WINAPI Main_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDE DX_WINDBG_trace(); + if (pUnkOuter) + return DDERR_GENERIC; + /* FIXME vaildate input pointers or warp everthing with SEH */ EnterCriticalSection(&ddcs); @@ -162,7 +165,7 @@ HRESULT WINAPI Main_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDE } /* FIXME add one gbl check with one pDDSD check */ - // ret = internal_CreateSurface(iface,dd_desc_v2,ppSurf,pUnkOuter); + ret = Internal_CreateSurface(dd_int,ppSurf,&dd_desc_v2); LeaveCriticalSection(&ddcs); return ret; diff --git a/reactos/dll/directx/ddraw/Surface/createsurface.c b/reactos/dll/directx/ddraw/Surface/createsurface.c index f77811c6302..71f8a3a83d1 100644 --- a/reactos/dll/directx/ddraw/Surface/createsurface.c +++ b/reactos/dll/directx/ddraw/Surface/createsurface.c @@ -9,6 +9,13 @@ */ #include "rosdraw.h" +HRESULT +Internal_CreateSurface(LPDDRAWI_DIRECTDRAW_INT pDDraw, + LPDDRAWI_DDRAWSURFACE_LCL *lpLcl, + LPDDSURFACEDESC2 pDDSD) +{ + return DDERR_GENERIC; +} void CopyDDSurfDescToDDSurfDesc2(LPDDSURFACEDESC2 dst_pDesc, LPDDSURFACEDESC src_pDesc) { diff --git a/reactos/dll/directx/ddraw/Surface/surface.h b/reactos/dll/directx/ddraw/Surface/surface.h index 7aedc909489..80f97f486a0 100644 --- a/reactos/dll/directx/ddraw/Surface/surface.h +++ b/reactos/dll/directx/ddraw/Surface/surface.h @@ -71,3 +71,4 @@ DWORD CALLBACK HelDdFlipToGDISurface(LPDDHAL_FLIPTOGDISURFACEDATA lpFlipToGDISu HRESULT CreateOverlaySurface(LPDDRAWI_DIRECTDRAW_INT This, LPDDRAWI_DDRAWSURFACE_INT *That, LPDDSURFACEDESC2 pDDSD); HRESULT CreateBackBufferSurface(LPDDRAWI_DIRECTDRAW_INT This, LPDDRAWI_DDRAWSURFACE_INT *That, LPDDRAWI_DDRAWSURFACE_LCL *lpLcl, LPDDSURFACEDESC2 pDDSD); HRESULT CreatePrimarySurface(LPDDRAWI_DIRECTDRAW_INT This, LPDDRAWI_DDRAWSURFACE_INT *That,LPDDRAWI_DDRAWSURFACE_LCL *lpLcl, LPDDSURFACEDESC2 pDDSD); +HRESULT Internal_CreateSurface(LPDDRAWI_DIRECTDRAW_INT, LPDDRAWI_DDRAWSURFACE_LCL*, LPDDSURFACEDESC2);