diff --git a/reactos/dll/directx/ddraw/Clipper/iface_clipper.c b/reactos/dll/directx/ddraw/Clipper/clipper_stubs.c similarity index 100% rename from reactos/dll/directx/ddraw/Clipper/iface_clipper.c rename to reactos/dll/directx/ddraw/Clipper/clipper_stubs.c diff --git a/reactos/dll/directx/ddraw/Color/iface_color.c b/reactos/dll/directx/ddraw/Color/color_stubs.c similarity index 100% rename from reactos/dll/directx/ddraw/Color/iface_color.c rename to reactos/dll/directx/ddraw/Color/color_stubs.c diff --git a/reactos/dll/directx/ddraw/Ddraw/callbacks_hel.c b/reactos/dll/directx/ddraw/Ddraw/callbacks_dd_hel.c similarity index 100% rename from reactos/dll/directx/ddraw/Ddraw/callbacks_hel.c rename to reactos/dll/directx/ddraw/Ddraw/callbacks_dd_hel.c diff --git a/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c b/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c index b088f39fad2..463f5b05d39 100644 --- a/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c +++ b/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c @@ -116,206 +116,6 @@ Main_DirectDraw_Compact(LPDIRECTDRAW7 iface) return DD_OK; } -/* - * IMPLEMENT - * Status ok - */ -HRESULT -WINAPI -Main_DirectDraw_CreateClipper(LPDIRECTDRAW7 iface, - DWORD dwFlags, - LPDIRECTDRAWCLIPPER *ppClipper, - IUnknown *pUnkOuter) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI Main_DirectDraw_CreatePalette(LPDIRECTDRAW7 iface, DWORD dwFlags, - LPPALETTEENTRY palent, LPDIRECTDRAWPALETTE* ppPalette, LPUNKNOWN pUnkOuter) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - - -/* - * stub - * Status not done - */ -HRESULT WINAPI Main_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, - LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter) -{ - - DX_WINDBG_trace(); - - DX_STUB; - -} - - -/* - * stub - * Status not done - */ -HRESULT WINAPI Main_DirectDraw_DuplicateSurface(LPDIRECTDRAW7 iface, LPDIRECTDRAWSURFACE7 src, - LPDIRECTDRAWSURFACE7* dst) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -/* - * IMPLEMENT - * Status ok - */ -HRESULT WINAPI Main_DirectDraw_EnumDisplayModes(LPDIRECTDRAW7 iface, DWORD dwFlags, - LPDDSURFACEDESC2 pDDSD, LPVOID context, LPDDENUMMODESCALLBACK2 callback) -{ - - DX_WINDBG_trace(); - - DX_STUB; -} - -/* - * stub - * Status not done - */ -HRESULT WINAPI -Main_DirectDraw_EnumSurfaces(LPDIRECTDRAW7 iface, DWORD dwFlags, - LPDDSURFACEDESC2 lpDDSD2, LPVOID context, - LPDDENUMSURFACESCALLBACK7 callback) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -/* - * IMPLEMENT - * Status ok - */ -HRESULT WINAPI -Main_DirectDraw_FlipToGDISurface(LPDIRECTDRAW7 iface) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -/* - * IMPLEMENT - * Status ok - */ -HRESULT WINAPI -Main_DirectDraw_GetCaps(LPDIRECTDRAW7 iface, LPDDCAPS pDriverCaps, - LPDDCAPS pHELCaps) -{ - - DX_WINDBG_trace(); - - DX_STUB; -} - - -/* - * IMPLEMENT - * Status ok - */ -HRESULT WINAPI Main_DirectDraw_GetDisplayMode(LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD) -{ - //LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; - - DX_WINDBG_trace(); - - DX_STUB; -} - -/* - * Stub - * Status todo - */ -HRESULT WINAPI -Main_DirectDraw_GetFourCCCodes(LPDIRECTDRAW7 iface, LPDWORD pNumCodes, LPDWORD pCodes) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -/* - * Stub - * Status todo - */ -HRESULT WINAPI -Main_DirectDraw_GetGDISurface(LPDIRECTDRAW7 iface, - LPDIRECTDRAWSURFACE7 *lplpGDIDDSSurface) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -/* - * IMPLEMENT - * Status ok - */ -HRESULT WINAPI -Main_DirectDraw_GetMonitorFrequency(LPDIRECTDRAW7 iface,LPDWORD freq) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -/* - * IMPLEMENT - * Status ok - */ -HRESULT WINAPI -Main_DirectDraw_GetScanLine(LPDIRECTDRAW7 iface, LPDWORD lpdwScanLine) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -/* - * Stub - * Status todo - */ -HRESULT WINAPI -Main_DirectDraw_GetVerticalBlankStatus(LPDIRECTDRAW7 iface, LPBOOL lpbIsInVB) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -/* - * IMPLEMENT - * Status ok - */ -HRESULT -WINAPI -Main_DirectDraw_Initialize (LPDIRECTDRAW7 iface, LPGUID lpGUID) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -/* - * IMPLEMENT - * Status ok - */ -HRESULT WINAPI -Main_DirectDraw_RestoreDisplayMode(LPDIRECTDRAW7 iface) -{ - DX_WINDBG_trace(); - - DX_STUB; - return DD_OK; -} /* */ @@ -485,110 +285,6 @@ Main_DirectDraw_SetCooperativeLevel (LPDIRECTDRAW7 iface, HWND hwnd, DWORD coopl } -/* - * IMPLEMENT - * Status ok - */ -HRESULT WINAPI -Main_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeight, - DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -/* - * IMPLEMENT - * Status ok - */ -HRESULT WINAPI -Main_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7 iface, DWORD dwFlags, - HANDLE h) -{ - - DX_WINDBG_trace(); - - DX_STUB; -} - -/* - * IMPLEMENT - * Status ok - */ -HRESULT WINAPI -Main_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps, - LPDWORD total, LPDWORD free) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -/* - * Stub - * Status todo - */ -HRESULT WINAPI Main_DirectDraw_GetSurfaceFromDC(LPDIRECTDRAW7 iface, HDC hdc, - LPDIRECTDRAWSURFACE7 *lpDDS) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -/* - * Stub - * Status todo - */ -HRESULT WINAPI Main_DirectDraw_RestoreAllSurfaces(LPDIRECTDRAW7 iface) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -/* - * Stub - * Status todo - */ -HRESULT WINAPI Main_DirectDraw_TestCooperativeLevel(LPDIRECTDRAW7 iface) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -/* - * Stub - * Status todo - */ -HRESULT WINAPI Main_DirectDraw_GetDeviceIdentifier(LPDIRECTDRAW7 iface, - LPDDDEVICEIDENTIFIER2 pDDDI, DWORD dwFlags) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -/* - * Stub - * Status todo - */ -HRESULT WINAPI Main_DirectDraw_StartModeTest(LPDIRECTDRAW7 iface, LPSIZE pModes, - DWORD dwNumModes, DWORD dwFlags) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -/* - * Stub - * Status todo - */ -HRESULT WINAPI Main_DirectDraw_EvaluateMode(LPDIRECTDRAW7 iface,DWORD a,DWORD* b) -{ - DX_WINDBG_trace(); - DX_STUB; -} - - IDirectDraw7Vtbl DirectDraw7_Vtable = { Main_DirectDraw_QueryInterface, diff --git a/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c b/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c new file mode 100644 index 00000000000..dc925fbcad1 --- /dev/null +++ b/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c @@ -0,0 +1,316 @@ +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS + * FILE: + * PURPOSE: IDirectDraw7 Implementation + * PROGRAMMER: Magnus Olsen, Maarten Bosma + * + */ + +#include "../rosdraw.h" + +/* + * IMPLEMENT + * Status ok + */ +HRESULT +WINAPI +Main_DirectDraw_CreateClipper(LPDIRECTDRAW7 iface, + DWORD dwFlags, + LPDIRECTDRAWCLIPPER *ppClipper, + IUnknown *pUnkOuter) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +/* */ +HRESULT WINAPI Main_DirectDraw_CreatePalette(LPDIRECTDRAW7 iface, DWORD dwFlags, + LPPALETTEENTRY palent, LPDIRECTDRAWPALETTE* ppPalette, LPUNKNOWN pUnkOuter) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + + +/* + * stub + * Status not done + */ +HRESULT WINAPI Main_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, + LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter) +{ + + DX_WINDBG_trace(); + + DX_STUB; + +} + + +/* + * stub + * Status not done + */ +HRESULT WINAPI Main_DirectDraw_DuplicateSurface(LPDIRECTDRAW7 iface, LPDIRECTDRAWSURFACE7 src, + LPDIRECTDRAWSURFACE7* dst) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +/* + * IMPLEMENT + * Status ok + */ +HRESULT WINAPI Main_DirectDraw_EnumDisplayModes(LPDIRECTDRAW7 iface, DWORD dwFlags, + LPDDSURFACEDESC2 pDDSD, LPVOID context, LPDDENUMMODESCALLBACK2 callback) +{ + + DX_WINDBG_trace(); + + DX_STUB; +} + +/* + * stub + * Status not done + */ +HRESULT WINAPI +Main_DirectDraw_EnumSurfaces(LPDIRECTDRAW7 iface, DWORD dwFlags, + LPDDSURFACEDESC2 lpDDSD2, LPVOID context, + LPDDENUMSURFACESCALLBACK7 callback) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +/* + * IMPLEMENT + * Status ok + */ +HRESULT WINAPI +Main_DirectDraw_FlipToGDISurface(LPDIRECTDRAW7 iface) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +/* + * IMPLEMENT + * Status ok + */ +HRESULT WINAPI +Main_DirectDraw_GetCaps(LPDIRECTDRAW7 iface, LPDDCAPS pDriverCaps, + LPDDCAPS pHELCaps) +{ + + DX_WINDBG_trace(); + + DX_STUB; +} + + +/* + * IMPLEMENT + * Status ok + */ +HRESULT WINAPI Main_DirectDraw_GetDisplayMode(LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD) +{ + //LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; + + DX_WINDBG_trace(); + + DX_STUB; +} + +/* + * Stub + * Status todo + */ +HRESULT WINAPI +Main_DirectDraw_GetFourCCCodes(LPDIRECTDRAW7 iface, LPDWORD pNumCodes, LPDWORD pCodes) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +/* + * Stub + * Status todo + */ +HRESULT WINAPI +Main_DirectDraw_GetGDISurface(LPDIRECTDRAW7 iface, + LPDIRECTDRAWSURFACE7 *lplpGDIDDSSurface) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +/* + * IMPLEMENT + * Status ok + */ +HRESULT WINAPI +Main_DirectDraw_GetMonitorFrequency(LPDIRECTDRAW7 iface,LPDWORD freq) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +/* + * IMPLEMENT + * Status ok + */ +HRESULT WINAPI +Main_DirectDraw_GetScanLine(LPDIRECTDRAW7 iface, LPDWORD lpdwScanLine) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +/* + * Stub + * Status todo + */ +HRESULT WINAPI +Main_DirectDraw_GetVerticalBlankStatus(LPDIRECTDRAW7 iface, LPBOOL lpbIsInVB) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +/* + * IMPLEMENT + * Status ok + */ +HRESULT +WINAPI +Main_DirectDraw_Initialize (LPDIRECTDRAW7 iface, LPGUID lpGUID) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +/* + * IMPLEMENT + * Status ok + */ +HRESULT WINAPI +Main_DirectDraw_RestoreDisplayMode(LPDIRECTDRAW7 iface) +{ + DX_WINDBG_trace(); + + DX_STUB; + return DD_OK; +} + +/* + * IMPLEMENT + * Status ok + */ +HRESULT WINAPI +Main_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeight, + DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +/* + * IMPLEMENT + * Status ok + */ +HRESULT WINAPI +Main_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7 iface, DWORD dwFlags, + HANDLE h) +{ + + DX_WINDBG_trace(); + + DX_STUB; +} + +/* + * IMPLEMENT + * Status ok + */ +HRESULT WINAPI +Main_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps, + LPDWORD total, LPDWORD free) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +/* + * Stub + * Status todo + */ +HRESULT WINAPI Main_DirectDraw_GetSurfaceFromDC(LPDIRECTDRAW7 iface, HDC hdc, + LPDIRECTDRAWSURFACE7 *lpDDS) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +/* + * Stub + * Status todo + */ +HRESULT WINAPI Main_DirectDraw_RestoreAllSurfaces(LPDIRECTDRAW7 iface) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +/* + * Stub + * Status todo + */ +HRESULT WINAPI Main_DirectDraw_TestCooperativeLevel(LPDIRECTDRAW7 iface) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +/* + * Stub + * Status todo + */ +HRESULT WINAPI Main_DirectDraw_GetDeviceIdentifier(LPDIRECTDRAW7 iface, + LPDDDEVICEIDENTIFIER2 pDDDI, DWORD dwFlags) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +/* + * Stub + * Status todo + */ +HRESULT WINAPI Main_DirectDraw_StartModeTest(LPDIRECTDRAW7 iface, LPSIZE pModes, + DWORD dwNumModes, DWORD dwFlags) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +/* + * Stub + * Status todo + */ +HRESULT WINAPI Main_DirectDraw_EvaluateMode(LPDIRECTDRAW7 iface,DWORD a,DWORD* b) +{ + DX_WINDBG_trace(); + DX_STUB; +} diff --git a/reactos/dll/directx/ddraw/Gamma/iface_gamma.c b/reactos/dll/directx/ddraw/Gamma/gamma_stubs.c similarity index 100% rename from reactos/dll/directx/ddraw/Gamma/iface_gamma.c rename to reactos/dll/directx/ddraw/Gamma/gamma_stubs.c diff --git a/reactos/dll/directx/ddraw/Kernel/iface_kernel.c b/reactos/dll/directx/ddraw/Kernel/kernel_stubs.c similarity index 100% rename from reactos/dll/directx/ddraw/Kernel/iface_kernel.c rename to reactos/dll/directx/ddraw/Kernel/kernel_stubs.c diff --git a/reactos/dll/directx/ddraw/Palette/iface_palette.c b/reactos/dll/directx/ddraw/Palette/palette_stubs.c similarity index 100% rename from reactos/dll/directx/ddraw/Palette/iface_palette.c rename to reactos/dll/directx/ddraw/Palette/palette_stubs.c diff --git a/reactos/dll/directx/ddraw/Surface/createsurface.c b/reactos/dll/directx/ddraw/Surface/createsurface.c index c80a19e1867..a7b00967d4f 100644 --- a/reactos/dll/directx/ddraw/Surface/createsurface.c +++ b/reactos/dll/directx/ddraw/Surface/createsurface.c @@ -21,7 +21,7 @@ CreatePrimarySurface(LPDDRAWI_DIRECTDRAW_INT This, That[0]->lpLcl->lpSurfMore->slist = lpLcl; - That[0]->lpVtbl = &DirectDrawSurface7_Vtable; + //That[0]->lpVtbl = &DirectDrawSurface7_Vtable; // FixMe ! That[0]->lpLcl->lpSurfMore->dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); That[0]->lpLcl->lpSurfMore->lpDD_int = This; That[0]->lpLcl->lpSurfMore->lpDD_lcl = This->lpLcl; @@ -113,7 +113,7 @@ CreateBackBufferSurface(LPDDRAWI_DIRECTDRAW_INT This, That[t]->lpLcl->lpSurfMore->slist = lpLcl; - That[t]->lpVtbl = &DirectDrawSurface7_Vtable; + //That[t]->lpVtbl = &DirectDrawSurface7_Vtable; // FixMe ! That[t]->lpLcl->lpSurfMore->dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); That[t]->lpLcl->lpSurfMore->lpDD_int = This; That[t]->lpLcl->lpSurfMore->lpDD_lcl = This->lpLcl; diff --git a/reactos/dll/directx/ddraw/Surface/surface_main.c b/reactos/dll/directx/ddraw/Surface/surface_main.c index 700bbd02b85..e1260e9b475 100644 --- a/reactos/dll/directx/ddraw/Surface/surface_main.c +++ b/reactos/dll/directx/ddraw/Surface/surface_main.c @@ -2,7 +2,7 @@ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS - * FILE: lib/ddraw/main/surface.c + * FILE: lib/ddraw/ * PURPOSE: IDirectDrawSurface7 Implementation * PROGRAMMER: Magnus Olsen, Maarten Bosma * @@ -307,100 +307,6 @@ Main_DDrawSurface_AddAttachedSurface(LPDIRECTDRAWSURFACE7 iface, DX_STUB; } -/* MSDN: "not currently implemented." */ -HRESULT WINAPI -Main_DDrawSurface_AddOverlayDirtyRect(LPDIRECTDRAWSURFACE7 iface, - LPRECT pRect) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_BltFast(LPDIRECTDRAWSURFACE7 iface, DWORD dstx, - DWORD dsty, LPDIRECTDRAWSURFACE7 src, - LPRECT rsrc, DWORD trans) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_Restore(LPDIRECTDRAWSURFACE7 iface) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -/* MSDN: "not currently implemented." */ -HRESULT WINAPI -Main_DDrawSurface_BltBatch(LPDIRECTDRAWSURFACE7 iface, - LPDDBLTBATCH pBatch, DWORD dwCount, - DWORD dwFlags) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_ChangeUniquenessValue(LPDIRECTDRAWSURFACE7 iface) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_DeleteAttachedSurface(LPDIRECTDRAWSURFACE7 iface, - DWORD dwFlags, - LPDIRECTDRAWSURFACE7 pAttach) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_EnumAttachedSurfaces(LPDIRECTDRAWSURFACE7 iface, - LPVOID context, - LPDDENUMSURFACESCALLBACK7 cb) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_EnumOverlayZOrders(LPDIRECTDRAWSURFACE7 iface, - DWORD dwFlags, LPVOID context, - LPDDENUMSURFACESCALLBACK7 cb) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_Flip(LPDIRECTDRAWSURFACE7 iface, - LPDIRECTDRAWSURFACE7 lpDDSurfaceTargetOverride, DWORD dwFlags) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_FreePrivateData(LPDIRECTDRAWSURFACE7 iface, REFGUID tag) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - HRESULT WINAPI Main_DDrawSurface_GetAttachedSurface(LPDIRECTDRAWSURFACE7 iface, LPDDSCAPS2 pCaps, @@ -459,25 +365,6 @@ Main_DDrawSurface_GetCaps(LPDIRECTDRAWSURFACE7 iface, LPDDSCAPS2 pCaps) return DD_OK; } -HRESULT WINAPI -Main_DDrawSurface_GetClipper(LPDIRECTDRAWSURFACE7 iface, - LPDIRECTDRAWCLIPPER* ppClipper) -{ - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_GetColorKey(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags, - LPDDCOLORKEY pCKey) -{ - //LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface; - - DX_WINDBG_trace(); - - DX_STUB; -} - HRESULT WINAPI Main_DDrawSurface_GetDC(LPDIRECTDRAWSURFACE7 iface, HDC *phDC) { @@ -502,46 +389,6 @@ Main_DDrawSurface_GetDC(LPDIRECTDRAWSURFACE7 iface, HDC *phDC) return DD_OK; } -HRESULT WINAPI -Main_DDrawSurface_GetDDInterface(LPDIRECTDRAWSURFACE7 iface, LPVOID* pDD) -{ - DX_WINDBG_trace(); - - DX_STUB; -} -HRESULT WINAPI -Main_DDrawSurface_GetFlipStatus(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_GetLOD(LPDIRECTDRAWSURFACE7 iface, LPDWORD pdwMaxLOD) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_GetOverlayPosition(LPDIRECTDRAWSURFACE7 iface, - LPLONG pX, LPLONG pY) -{ - DX_WINDBG_trace(); - - DX_STUB; -} -HRESULT WINAPI -Main_DDrawSurface_GetPalette(LPDIRECTDRAWSURFACE7 iface, - LPDIRECTDRAWPALETTE* ppPalette) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - HRESULT WINAPI Main_DDrawSurface_GetPixelFormat(LPDIRECTDRAWSURFACE7 iface, LPDDPIXELFORMAT pDDPixelFormat) @@ -568,25 +415,6 @@ Main_DDrawSurface_GetPixelFormat(LPDIRECTDRAWSURFACE7 iface, return retVale; } -HRESULT WINAPI -Main_DDrawSurface_GetPriority(LPDIRECTDRAWSURFACE7 iface, - LPDWORD pdwPriority) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_GetPrivateData(LPDIRECTDRAWSURFACE7 iface, - REFGUID tag, LPVOID pBuffer, - LPDWORD pcbBufferSize) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - HRESULT WINAPI Main_DDrawSurface_GetSurfaceDesc(LPDIRECTDRAWSURFACE7 iface, LPDDSURFACEDESC2 pDDSD) @@ -689,41 +517,6 @@ Main_DDrawSurface_GetSurfaceDesc(LPDIRECTDRAWSURFACE7 iface, return DD_OK; } -HRESULT WINAPI -Main_DDrawSurface_GetUniquenessValue(LPDIRECTDRAWSURFACE7 iface, - LPDWORD pValue) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_IsLost(LPDIRECTDRAWSURFACE7 iface) -{ - DX_WINDBG_trace(); - - //DX_STUB; - DX_STUB_str("not implement return not lost\n"); - return DD_OK; -} - -HRESULT WINAPI -Main_DDrawSurface_PageLock(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_PageUnlock(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - HRESULT WINAPI Main_DDrawSurface_ReleaseDC(LPDIRECTDRAWSURFACE7 iface, HDC hDC) { @@ -753,15 +546,6 @@ Main_DDrawSurface_ReleaseDC(LPDIRECTDRAWSURFACE7 iface, HDC hDC) return DD_OK; } -HRESULT WINAPI -Main_DDrawSurface_SetClipper (LPDIRECTDRAWSURFACE7 iface, - LPDIRECTDRAWCLIPPER pDDClipper) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - HRESULT WINAPI Main_DDrawSurface_SetColorKey (LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags, LPDDCOLORKEY pCKey) @@ -834,87 +618,6 @@ Main_DDrawSurface_SetOverlayPosition (LPDIRECTDRAWSURFACE7 iface, LONG X, LONG Y return DDERR_GENERIC; } -HRESULT WINAPI -Main_DDrawSurface_SetPalette (LPDIRECTDRAWSURFACE7 iface, - LPDIRECTDRAWPALETTE pPalette) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_SetPriority (LPDIRECTDRAWSURFACE7 iface, - DWORD dwPriority) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_SetPrivateData (LPDIRECTDRAWSURFACE7 iface, - REFGUID tag, LPVOID pData, - DWORD cbSize, DWORD dwFlags) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_UpdateOverlay (LPDIRECTDRAWSURFACE7 iface, - LPRECT pSrcRect, - LPDIRECTDRAWSURFACE7 pDstSurface, - LPRECT pDstRect, DWORD dwFlags, - LPDDOVERLAYFX pFX) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -/* MSDN: "not currently implemented." */ -HRESULT WINAPI -Main_DDrawSurface_UpdateOverlayDisplay (LPDIRECTDRAWSURFACE7 iface, - DWORD dwFlags) -{ - LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface; - - DX_WINDBG_trace(); - - if (!This->lpLcl->lpGbl->lpDD->lpDDCBtmp->cbDDSurfaceCallbacks.dwFlags & DDHAL_SURFCB32_UPDATEOVERLAY) - { - return DDERR_GENERIC; - } - - DX_STUB; -} - -HRESULT WINAPI Main_DDrawSurface_UpdateOverlayZOrder (LPDIRECTDRAWSURFACE7 iface, - DWORD dwFlags, LPDIRECTDRAWSURFACE7 pDDSRef) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_SetSurfaceDesc(LPDIRECTDRAWSURFACE7 iface, DDSURFACEDESC2 *DDSD, DWORD Flags) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_SetLOD(LPDIRECTDRAWSURFACE7 iface, DWORD MaxLOD) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - IDirectDrawSurface7Vtbl DirectDrawSurface7_Vtable = { /*** IUnknown ***/ diff --git a/reactos/dll/directx/ddraw/Surface/surface_stubs.c b/reactos/dll/directx/ddraw/Surface/surface_stubs.c new file mode 100644 index 00000000000..31144f39a96 --- /dev/null +++ b/reactos/dll/directx/ddraw/Surface/surface_stubs.c @@ -0,0 +1,325 @@ +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS + * FILE: + * PURPOSE: IDirectDrawSurface7 Implementation + * PROGRAMMER: Magnus Olsen, Maarten Bosma + * + */ + +#include "../rosdraw.h" + +HRESULT WINAPI +Main_DDrawSurface_QueryInterface(LPDIRECTDRAWSURFACE7 iface, REFIID riid, + LPVOID* ppObj) +{ + DX_WINDBG_trace(); + + DX_STUB_str("Unimplement\n"); + + return E_NOINTERFACE; +} + + +/* MSDN: "not currently implemented." */ +HRESULT WINAPI +Main_DDrawSurface_AddOverlayDirtyRect(LPDIRECTDRAWSURFACE7 iface, + LPRECT pRect) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_BltFast(LPDIRECTDRAWSURFACE7 iface, DWORD dstx, + DWORD dsty, LPDIRECTDRAWSURFACE7 src, + LPRECT rsrc, DWORD trans) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_Restore(LPDIRECTDRAWSURFACE7 iface) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +/* MSDN: "not currently implemented." */ +HRESULT WINAPI +Main_DDrawSurface_BltBatch(LPDIRECTDRAWSURFACE7 iface, + LPDDBLTBATCH pBatch, DWORD dwCount, + DWORD dwFlags) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_ChangeUniquenessValue(LPDIRECTDRAWSURFACE7 iface) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_DeleteAttachedSurface(LPDIRECTDRAWSURFACE7 iface, + DWORD dwFlags, + LPDIRECTDRAWSURFACE7 pAttach) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_EnumAttachedSurfaces(LPDIRECTDRAWSURFACE7 iface, + LPVOID context, + LPDDENUMSURFACESCALLBACK7 cb) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_EnumOverlayZOrders(LPDIRECTDRAWSURFACE7 iface, + DWORD dwFlags, LPVOID context, + LPDDENUMSURFACESCALLBACK7 cb) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_Flip(LPDIRECTDRAWSURFACE7 iface, + LPDIRECTDRAWSURFACE7 lpDDSurfaceTargetOverride, DWORD dwFlags) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_FreePrivateData(LPDIRECTDRAWSURFACE7 iface, REFGUID tag) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_GetClipper(LPDIRECTDRAWSURFACE7 iface, + LPDIRECTDRAWCLIPPER* ppClipper) +{ + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_GetColorKey(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags, + LPDDCOLORKEY pCKey) +{ + //LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface; + + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_GetDDInterface(LPDIRECTDRAWSURFACE7 iface, LPVOID* pDD) +{ + DX_WINDBG_trace(); + + DX_STUB; +} +HRESULT WINAPI +Main_DDrawSurface_GetFlipStatus(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_GetLOD(LPDIRECTDRAWSURFACE7 iface, LPDWORD pdwMaxLOD) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_GetOverlayPosition(LPDIRECTDRAWSURFACE7 iface, + LPLONG pX, LPLONG pY) +{ + DX_WINDBG_trace(); + + DX_STUB; +} +HRESULT WINAPI +Main_DDrawSurface_GetPalette(LPDIRECTDRAWSURFACE7 iface, + LPDIRECTDRAWPALETTE* ppPalette) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_GetPriority(LPDIRECTDRAWSURFACE7 iface, + LPDWORD pdwPriority) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_GetPrivateData(LPDIRECTDRAWSURFACE7 iface, + REFGUID tag, LPVOID pBuffer, + LPDWORD pcbBufferSize) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_GetUniquenessValue(LPDIRECTDRAWSURFACE7 iface, + LPDWORD pValue) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_IsLost(LPDIRECTDRAWSURFACE7 iface) +{ + DX_WINDBG_trace(); + + //DX_STUB; + DX_STUB_str("not implement return not lost\n"); + return DD_OK; +} + +HRESULT WINAPI +Main_DDrawSurface_PageLock(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_PageUnlock(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + + +HRESULT WINAPI +Main_DDrawSurface_SetClipper (LPDIRECTDRAWSURFACE7 iface, + LPDIRECTDRAWCLIPPER pDDClipper) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + + +HRESULT WINAPI +Main_DDrawSurface_SetPalette (LPDIRECTDRAWSURFACE7 iface, + LPDIRECTDRAWPALETTE pPalette) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_SetPriority (LPDIRECTDRAWSURFACE7 iface, + DWORD dwPriority) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_SetPrivateData (LPDIRECTDRAWSURFACE7 iface, + REFGUID tag, LPVOID pData, + DWORD cbSize, DWORD dwFlags) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_UpdateOverlay (LPDIRECTDRAWSURFACE7 iface, + LPRECT pSrcRect, + LPDIRECTDRAWSURFACE7 pDstSurface, + LPRECT pDstRect, DWORD dwFlags, + LPDDOVERLAYFX pFX) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + + +/* MSDN: "not currently implemented." */ +HRESULT WINAPI +Main_DDrawSurface_UpdateOverlayDisplay (LPDIRECTDRAWSURFACE7 iface, + DWORD dwFlags) +{ + LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface; + + DX_WINDBG_trace(); + + if (!This->lpLcl->lpGbl->lpDD->lpDDCBtmp->cbDDSurfaceCallbacks.dwFlags & DDHAL_SURFCB32_UPDATEOVERLAY) + { + return DDERR_GENERIC; + } + + DX_STUB; +} + + +HRESULT WINAPI Main_DDrawSurface_UpdateOverlayZOrder (LPDIRECTDRAWSURFACE7 iface, + DWORD dwFlags, LPDIRECTDRAWSURFACE7 pDDSRef) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_SetSurfaceDesc(LPDIRECTDRAWSURFACE7 iface, DDSURFACEDESC2 *DDSD, DWORD Flags) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_SetLOD(LPDIRECTDRAWSURFACE7 iface, DWORD MaxLOD) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + diff --git a/reactos/dll/directx/ddraw/Videoport/iface_videoport.c b/reactos/dll/directx/ddraw/Videoport/videoport_stubs.c similarity index 100% rename from reactos/dll/directx/ddraw/Videoport/iface_videoport.c rename to reactos/dll/directx/ddraw/Videoport/videoport_stubs.c diff --git a/reactos/dll/directx/ddraw/ddraw.rbuild b/reactos/dll/directx/ddraw/ddraw.rbuild index 10f109d6ef0..4473c138bf6 100644 --- a/reactos/dll/directx/ddraw/ddraw.rbuild +++ b/reactos/dll/directx/ddraw/ddraw.rbuild @@ -1,6 +1,5 @@ - \ No newline at end of file + + surface_stubs.c + callbacks_surf_hel.c + createsurface.c + + + clipper_stubs.c + + + color_stubs.c + + + gamma_stubs.c + + + kernel_stubs.c + + + palette_stubs.c + + + videoport_stubs.c + + \ No newline at end of file diff --git a/reactos/dll/directx/ddraw/rosdraw.h b/reactos/dll/directx/ddraw/rosdraw.h index 44f7563e9af..cdabfee590d 100644 --- a/reactos/dll/directx/ddraw/rosdraw.h +++ b/reactos/dll/directx/ddraw/rosdraw.h @@ -73,7 +73,9 @@ HRESULT WINAPI Main_DirectDraw_SetCooperativeLevel (LPDIRECTDRAW7, HWND, DWORD); HRESULT WINAPI Main_DirectDraw_SetDisplayMode (LPDIRECTDRAW7, DWORD, DWORD, DWORD, DWORD, DWORD); HRESULT WINAPI Main_DirectDraw_RestoreAllSurfaces(LPDIRECTDRAW7 iface); HRESULT WINAPI Main_DirectDraw_TestCooperativeLevel(LPDIRECTDRAW7 iface); - +HRESULT WINAPI Main_DirectDraw_Initialize (LPDIRECTDRAW7 iface, LPGUID lpGUID); +HRESULT WINAPI Main_DirectDraw_StartModeTest(LPDIRECTDRAW7 iface, LPSIZE pModes, DWORD dwNumModes, DWORD dwFlags); +HRESULT WINAPI Main_DirectDraw_EvaluateMode(LPDIRECTDRAW7 iface,DWORD a,DWORD* b); ULONG WINAPI Main_DDrawSurface_AddRef(LPDIRECTDRAWSURFACE7); ULONG WINAPI Main_DDrawSurface_Release(LPDIRECTDRAWSURFACE7);