From b527796afade087de160261495c6ce8a03c79bad Mon Sep 17 00:00:00 2001
From: Magnus Olsen <magnus@greatlord.com>
Date: Wed, 16 May 2007 22:58:25 +0000
Subject: [PATCH] fixing some smaller bugs found by the regress test

svn path=/trunk/; revision=26816
---
 .../dll/directx/ddraw/Surface/createsurface.c |  2 ++
 reactos/dll/directx/ddraw/main.c              | 11 -------
 reactos/dll/directx/ddraw/startup.c           | 30 +++++++++++++------
 3 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/reactos/dll/directx/ddraw/Surface/createsurface.c b/reactos/dll/directx/ddraw/Surface/createsurface.c
index 6d913ab69b9..bb290682b15 100644
--- a/reactos/dll/directx/ddraw/Surface/createsurface.c
+++ b/reactos/dll/directx/ddraw/Surface/createsurface.c
@@ -82,6 +82,8 @@ Internal_CreateSurface( LPDDRAWI_DIRECTDRAW_INT pDDraw, LPDDSURFACEDESC2 pDDSD,
         desc.dwFlags = desc.dwFlags & DDSD_ALL;
     }
 
+     /* more code will follow */
+
 
 
     return DDERR_GENERIC;
diff --git a/reactos/dll/directx/ddraw/main.c b/reactos/dll/directx/ddraw/main.c
index b9e72b5104a..0cc54a93ab2 100644
--- a/reactos/dll/directx/ddraw/main.c
+++ b/reactos/dll/directx/ddraw/main.c
@@ -40,11 +40,6 @@ DirectDrawCreate (LPGUID lpGUID,
     */
     DX_WINDBG_trace();
 
-    /* check the pointer if it vaild to read from */
-    if (IsBadWritePtr( lplpDD, sizeof( LPVOID )) )
-    {
-        return DDERR_INVALIDPARAMS;
-    }
 
     /* check see if pUnkOuter is null or not */
     if (pUnkOuter)
@@ -75,12 +70,6 @@ DirectDrawCreateEx(LPGUID lpGUID,
     */
     DX_WINDBG_trace();
 
-    /* check the pointer if it vaild to read from */
-    if (IsBadWritePtr( lplpDD, sizeof( LPVOID )) )
-    {
-        return DDERR_INVALIDPARAMS;
-    }
-
     /* check see if pUnkOuter is null or not */
     if (pUnkOuter)
     {
diff --git a/reactos/dll/directx/ddraw/startup.c b/reactos/dll/directx/ddraw/startup.c
index d9762e5b4f2..fd47a46e142 100644
--- a/reactos/dll/directx/ddraw/startup.c
+++ b/reactos/dll/directx/ddraw/startup.c
@@ -25,12 +25,21 @@ HRESULT WINAPI
 Create_DirectDraw (LPGUID pGUID, LPDIRECTDRAW* pIface,
                    REFIID id, BOOL ex)
 {
-    LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)*pIface;
+    LPDDRAWI_DIRECTDRAW_INT This;
 
     DX_WINDBG_trace();
 
-    if (This == NULL)
+    if ((IsBadReadPtr(pIface,sizeof(LPDIRECTDRAW))) ||
+       (IsBadWritePtr(pIface,sizeof(LPDIRECTDRAW))))
     {
+        return DDERR_INVALIDPARAMS;
+    }
+
+    This = (LPDDRAWI_DIRECTDRAW_INT)*pIface;
+
+    if (IsBadReadPtr(This,sizeof(LPDIRECTDRAW)))
+    {
+        DX_STUB_str("1. no linking\n");
         /* We do not have a DirectDraw interface, we need alloc it*/
         LPDDRAWI_DIRECTDRAW_INT memThis;
 
@@ -47,6 +56,7 @@ Create_DirectDraw (LPGUID pGUID, LPDIRECTDRAW* pIface,
     }
     else
     {
+        DX_STUB_str("2.linking\n");
         /* We got the DirectDraw interface alloc and we need create the link */
         LPDDRAWI_DIRECTDRAW_INT  newThis;
         newThis = DxHeapMemAlloc(sizeof(DDRAWI_DIRECTDRAW_INT));
@@ -269,7 +279,7 @@ StartDirectDraw(LPDIRECTDRAW iface, LPGUID lpGuid, BOOL reenable)
     This->lpLcl->hDD = This->lpLcl->lpGbl->hDD;
     ddgbl.hDD = This->lpLcl->lpGbl->hDD;
 
-    DX_STUB_str("DD_OK");
+    DX_STUB_str("DD_OK\n");
     return DD_OK;
 }
 
@@ -374,10 +384,13 @@ StartDirectDrawHal(LPDIRECTDRAW iface, BOOL reenable)
 
     if (reenable == FALSE)
     {
-        ddgbl.lpDDCBtmp = DxHeapMemAlloc(sizeof(DDHAL_CALLBACKS));
-        if ( ddgbl.lpDDCBtmp == NULL)
+        if (ddgbl.lpDDCBtmp == NULL)
         {
-            return DD_FALSE;
+            ddgbl.lpDDCBtmp = DxHeapMemAlloc(sizeof(DDHAL_CALLBACKS));
+            if ( ddgbl.lpDDCBtmp == NULL)
+            {
+                return DD_FALSE;
+            }
         }
     }
     else
@@ -425,7 +438,7 @@ StartDirectDrawHal(LPDIRECTDRAW iface, BOOL reenable)
 
     /* Alloc mpFourCC */
     mpFourCC = NULL;
-    if (mHALInfo.ddCaps.dwNumFourCCCodes)
+    if (mHALInfo.ddCaps.dwNumFourCCCodes > 0 )
     {
         mpFourCC = (DWORD *) DxHeapMemAlloc(sizeof(DWORD) * mHALInfo.ddCaps.dwNumFourCCCodes);
         if (mpFourCC == NULL)
@@ -438,8 +451,7 @@ StartDirectDrawHal(LPDIRECTDRAW iface, BOOL reenable)
 
     /* Alloc mpTextures */
     mpTextures = NULL;
-
-    if (mD3dDriverData.dwNumTextureFormats)
+    if (mD3dDriverData.dwNumTextureFormats > 0)
     {
         mpTextures = (DDSURFACEDESC*) DxHeapMemAlloc(sizeof(DDSURFACEDESC) * mD3dDriverData.dwNumTextureFormats);
         if (mpTextures == NULL)