From b7d56ed0e3d82f85d434810960436da229a41ea5 Mon Sep 17 00:00:00 2001 From: Maarten Bosma Date: Tue, 1 Nov 2005 11:35:01 +0000 Subject: [PATCH] fix compiling again, sorry. svn path=/trunk/; revision=18926 --- reactos/lib/ddraw/main/ddraw_main.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/reactos/lib/ddraw/main/ddraw_main.c b/reactos/lib/ddraw/main/ddraw_main.c index ec166a9b4d6..dc984ea7c11 100644 --- a/reactos/lib/ddraw/main/ddraw_main.c +++ b/reactos/lib/ddraw/main/ddraw_main.c @@ -290,10 +290,11 @@ HRESULT WINAPI Main_DirectDraw_GetDisplayMode(LPDIRECTDRAW7 iface, LPDDSURFACEDE pDDSD->lPitch = This->DirectDrawGlobal.vmiData.lDisplayPitch; pDDSD->dwRefreshRate = This->DirectDrawGlobal.dwMonitorFrequency; - /* have not check where I should get hold of this info yet */ - DWORD dwBackBufferCount; + RtlCopyMemory(&pDDSD->ddpfPixelFormat,&This->DirectDrawGlobal.vmiData.ddpfDisplay,sizeof(DDPIXELFORMAT)); + RtlCopyMemory(&pDDSD->ddsCaps,&This->DirectDrawGlobal.ddCaps,sizeof(DDCORECAPS)); /* have not check where I should get hold of this info yet + DWORD dwBackBufferCount; DWORD dwAlphaBitDepth; DWORD dwReserved; LPVOID lpSurface; @@ -304,17 +305,11 @@ HRESULT WINAPI Main_DirectDraw_GetDisplayMode(LPDIRECTDRAW7 iface, LPDDSURFACEDE } DDCOLORKEY ddckCKDestBlt; DDCOLORKEY ddckCKSrcOverlay; - DDCOLORKEY ddckCKSrcBlt; - */ - - RtlCopyMemory(&pDDSD->ddpfPixelFormat,&This->DirectDrawGlobal.vmiData.ddpfDisplay,sizeof(DDPIXELFORMAT)); - RtlCopyMemory(&pDDSD->ddsCaps,&This->DirectDrawGlobal.ddCaps,sizeof(DDCORECAPS)); - - /* have not check where I should get hold of this info yet + DDCOLORKEY ddckCKSrcBlt; DWORD dwTextureStage; */ - return DD_OK; + return DD_OK; } HRESULT WINAPI Main_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7 iface, DWORD dwFlags,