commited bugfix if we got if (my) dxallocfree and so on, also fixed the alloc macro...

svn path=/trunk/; revision=26968

diff --git a/reactos/dll/directx/ddraw/rosdraw.h b/reactos/dll/directx/ddraw/rosdraw.h
index da0964b..40742f6 100644 (file)
--- a/reactos/dll/directx/ddraw/rosdraw.h
+++ b/reactos/dll/directx/ddraw/rosdraw.h
@@ -41,9 +41,17 @@ VOID Cleanup(LPDIRECTDRAW7 iface);
 #define DxHeapMemFree(p)   HeapFree(GetProcessHeap(), 0, p); \
                            p = NULL;
 */
-#define DxHeapMemAlloc(p, m)  p = malloc(m)
-#define DxHeapMemFree(p)   free(p); \
-                           p = NULL;
+#define DxHeapMemAlloc(p, m)  { \
+                                p = malloc(m); \
+                                if (p != NULL) \
+                                { \
+                                    ZeroMemory(p,m); \
+                                } \
+                              }
+#define DxHeapMemFree(p)   { \
+                             free(p); \
+                             p = NULL; \
+                           }
 
 /******** Main Object ********/
 

diff --git a/reactos/dll/directx/ddraw/startup.c b/reactos/dll/directx/ddraw/startup.c
index 6ce852b..0306ffb 100644 (file)
--- a/reactos/dll/directx/ddraw/startup.c
+++ b/reactos/dll/directx/ddraw/startup.c
@@ -486,8 +486,8 @@ StartDirectDrawHal(LPDIRECTDRAW iface, BOOL reenable)
 
     /* Alloc mpFourCC */
     
-    //if (mHALInfo.ddCaps.dwNumFourCCCodes > 0 )
-    {
+    // if (mHALInfo.ddCaps.dwNumFourCCCodes > 0 )
+    // {
         //mpFourCC = (DWORD *) DxHeapMemAlloc( sizeof(DWORD) * 21);
         // DxHeapMemAlloc(mpFourCC, sizeof(DWORD) * 21);
 
@@ -500,7 +500,7 @@ StartDirectDrawHal(LPDIRECTDRAW iface, BOOL reenable)
             return DD_FALSE;
         }
         */
-    }
+    // }
 
     DX_STUB_str("Here\n");
 
@@ -553,7 +553,7 @@ StartDirectDrawHal(LPDIRECTDRAW iface, BOOL reenable)
 
     {
         char buffer[2048];
-        sprintf ( buffer, "test %d %d\n", mpFourCC, mHALInfo.ddCaps.dwNumFourCCCodes);
+        sprintf ( buffer, "3 test %d %d\n", mpFourCC, mHALInfo.ddCaps.dwNumFourCCCodes);
         OutputDebugStringA(buffer);
     }