From 1c247edcf4682e7e869f09610933c2f7841cc91b Mon Sep 17 00:00:00 2001 From: Maarten Bosma Date: Mon, 21 May 2007 15:47:39 +0000 Subject: [PATCH] Implement IDirectDraw7::GetFourCCCodes svn path=/trunk/; revision=26852 --- reactos/dll/directx/ddraw/Ddraw/ddraw_main.c | 17 +++++++++++++++++ reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c | 7 ------- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c b/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c index 53f0128e3f8..8a708dc43cb 100644 --- a/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c +++ b/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c @@ -142,6 +142,23 @@ Main_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps, return memdata.ddRVal; } +HRESULT WINAPI +Main_DirectDraw_GetFourCCCodes(LPDIRECTDRAW7 iface, LPDWORD lpNumCodes, LPDWORD lpCodes) +{ + LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; + DX_WINDBG_trace(); + + if(!lpNumCodes) + return DDERR_INVALIDPARAMS; + + if(lpCodes) + memcpy(lpCodes, This->lpLcl->lpGbl->lpdwFourCC, sizeof(DWORD)*(*lpNumCodes)); + else + *lpNumCodes = This->lpLcl->lpGbl->dwNumFourCC; + + return DD_OK; +} + HRESULT WINAPI Main_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter) diff --git a/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c b/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c index add27201238..3d55779c985 100644 --- a/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c +++ b/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c @@ -68,13 +68,6 @@ Main_DirectDraw_GetCaps(LPDIRECTDRAW7 iface, LPDDCAPS pDriverCaps, DX_STUB; } -HRESULT WINAPI -Main_DirectDraw_GetFourCCCodes(LPDIRECTDRAW7 iface, LPDWORD pNumCodes, LPDWORD pCodes) -{ - DX_WINDBG_trace(); - DX_STUB; -} - HRESULT WINAPI Main_DirectDraw_GetGDISurface(LPDIRECTDRAW7 iface, LPDIRECTDRAWSURFACE7 *lplpGDIDDSSurface)