From f72f2cf5ea826643d539179b0c595ec55e8cc3cc Mon Sep 17 00:00:00 2001
From: Maarten Bosma <maarten@bosma.de>
Date: Tue, 1 Nov 2005 12:17:25 +0000
Subject: [PATCH] Another few cosmetic changes and also except DDSURFACEDESC as
 parameter for CreateSurface.

svn path=/trunk/; revision=18928
---
 reactos/lib/ddraw/hal/ddraw_hal.c   |  3 +--
 reactos/lib/ddraw/main/ddraw_main.c | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/reactos/lib/ddraw/hal/ddraw_hal.c b/reactos/lib/ddraw/hal/ddraw_hal.c
index 6446e0a3fa9..9565a5b17e0 100644
--- a/reactos/lib/ddraw/hal/ddraw_hal.c
+++ b/reactos/lib/ddraw/hal/ddraw_hal.c
@@ -287,7 +287,7 @@ HRESULT Hal_DirectDraw_Initialize (LPDIRECTDRAW7 iface)
 
 HRESULT Hal_DirectDraw_SetCooperativeLevel (LPDIRECTDRAW7 iface)
 {
-       IDirectDrawImpl* This = (IDirectDrawImpl*)iface;
+    IDirectDrawImpl* This = (IDirectDrawImpl*)iface;
 
     DDHAL_SETEXCLUSIVEMODEDATA SetExclusiveMode;
 
@@ -379,7 +379,6 @@ HRESULT Hal_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscap
 
 HRESULT Hal_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7 iface, DWORD dwFlags,HANDLE h) 
 {
-
     IDirectDrawImpl* This = (IDirectDrawImpl*)iface;
 
     DDHAL_WAITFORVERTICALBLANKDATA WaitVectorData;
diff --git a/reactos/lib/ddraw/main/ddraw_main.c b/reactos/lib/ddraw/main/ddraw_main.c
index 99ccd497c22..ed7e9031f3c 100644
--- a/reactos/lib/ddraw/main/ddraw_main.c
+++ b/reactos/lib/ddraw/main/ddraw_main.c
@@ -161,7 +161,7 @@ HRESULT WINAPI Main_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDE
     if (pUnkOuter!=NULL) 
         return DDERR_INVALIDPARAMS; 
 
-    if(sizeof(DDSURFACEDESC2)!=pDDSD->dwSize)
+    if(sizeof(DDSURFACEDESC2)!=pDDSD->dwSize && sizeof(DDSURFACEDESC)!=pDDSD->dwSize)
         return DDERR_UNSUPPORTED;
 
     // the nasty com stuff
@@ -370,7 +370,7 @@ HRESULT WINAPI Main_DirectDraw_GetScanLine(LPDIRECTDRAW7 iface, LPDWORD lpdwScan
 
 HRESULT WINAPI Main_DirectDraw_Compact(LPDIRECTDRAW7 iface) 
 {
-       DX_STUB;
+    DX_STUB;
 }
 
 HRESULT WINAPI Main_DirectDraw_DuplicateSurface(LPDIRECTDRAW7 iface, LPDIRECTDRAWSURFACE7 src,
@@ -395,13 +395,13 @@ HRESULT WINAPI Main_DirectDraw_EnumSurfaces(LPDIRECTDRAW7 iface, DWORD dwFlags,
 
 HRESULT WINAPI Main_DirectDraw_GetFourCCCodes(LPDIRECTDRAW7 iface, LPDWORD pNumCodes, LPDWORD pCodes)
 {
-       DX_STUB;
+    DX_STUB;
 }
 
 HRESULT WINAPI Main_DirectDraw_GetGDISurface(LPDIRECTDRAW7 iface, 
                                              LPDIRECTDRAWSURFACE7 *lplpGDIDDSSurface)
 {
-       DX_STUB;
+    DX_STUB;
 }
 
 HRESULT WINAPI Main_DirectDraw_GetVerticalBlankStatus(LPDIRECTDRAW7 iface, LPBOOL status)
@@ -411,40 +411,40 @@ HRESULT WINAPI Main_DirectDraw_GetVerticalBlankStatus(LPDIRECTDRAW7 iface, LPBOO
 
 HRESULT WINAPI Main_DirectDraw_RestoreDisplayMode(LPDIRECTDRAW7 iface)
 {
-       DX_STUB;
+    DX_STUB;
 }
                                                    
 HRESULT WINAPI Main_DirectDraw_GetSurfaceFromDC(LPDIRECTDRAW7 iface, HDC hdc,
                                                 LPDIRECTDRAWSURFACE7 *lpDDS)
 {  
-       DX_STUB;
+    DX_STUB;
 }
 
 HRESULT WINAPI Main_DirectDraw_RestoreAllSurfaces(LPDIRECTDRAW7 iface)
 {
-       DX_STUB;
+    DX_STUB;
 }
 
 HRESULT WINAPI Main_DirectDraw_TestCooperativeLevel(LPDIRECTDRAW7 iface) 
 {
-       DX_STUB;
+    DX_STUB;
 }
 
 HRESULT WINAPI Main_DirectDraw_GetDeviceIdentifier(LPDIRECTDRAW7 iface,
                    LPDDDEVICEIDENTIFIER2 pDDDI, DWORD dwFlags)
 {    
-       DX_STUB;
+    DX_STUB;
 }
 
 HRESULT WINAPI Main_DirectDraw_StartModeTest(LPDIRECTDRAW7 iface, LPSIZE pModes,
                   DWORD dwNumModes, DWORD dwFlags)
 {    
-       DX_STUB;
+    DX_STUB;
 }
 
 HRESULT WINAPI Main_DirectDraw_EvaluateMode(LPDIRECTDRAW7 iface,DWORD a,DWORD* b)
 {    
-       DX_STUB;
+    DX_STUB;
 }
 
 IDirectDraw7Vtbl DirectDraw7_Vtable =