diff --git a/reactos/dll/directx/ddraw/cleanup.c b/reactos/dll/directx/ddraw/cleanup.c
index 0b85cb6e9ec..bdf60c74c41 100644
--- a/reactos/dll/directx/ddraw/cleanup.c
+++ b/reactos/dll/directx/ddraw/cleanup.c
@@ -15,9 +15,41 @@
 VOID 
 Cleanup(LPDIRECTDRAW7 iface) 
 {
-   /* FIXME 
-      free all memory and delete all dx stuff
-   */
+    LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface;
+
+    if (ddgbl.lpDDCBtmp != NULL)
+    {
+        DxHeapMemFree(ddgbl.lpDDCBtmp);
+    }
+
+    if (ddgbl.lpModeInfo != NULL)
+    {
+        DxHeapMemFree(ddgbl.lpModeInfo);
+    }
+
+    /* FIXME 
+       delete the DC we create 
+       delete the dx handler we got from hal
+       any more I forget ?
+    */
+
+    /* release the linked interface */
+    while (This->lpVtbl != NULL)
+    {
+        LPDDRAWI_DIRECTDRAW_INT newThis = This->lpVtbl;
+        if (This->lpLcl != NULL)
+        {
+            DxHeapMemFree(This->lpLcl);
+        }
+
+        This = newThis;
+    }
+
+    /* release unlinked interface */
+    if (This->lpLcl != NULL)
+    {
+        DxHeapMemFree(This->lpLcl);
+    }
 
 }
 
diff --git a/reactos/dll/directx/ddraw/rosdraw.h b/reactos/dll/directx/ddraw/rosdraw.h
index a04db4ae979..3fb5e1f0e26 100644
--- a/reactos/dll/directx/ddraw/rosdraw.h
+++ b/reactos/dll/directx/ddraw/rosdraw.h
@@ -33,7 +33,9 @@ VOID Cleanup(LPDIRECTDRAW7 iface);
 
 /* own macro to alloc memmory */
 #define DxHeapMemAlloc(m)  HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, m) 
-#define DxHeapMemFree(p)   HeapFree(GetProcessHeap(), 0, p);
+#define DxHeapMemFree(p)   HeapFree(GetProcessHeap(), 0, p); \
+                           p = NULL;
+
 /******** Main Object ********/
 
 /* Public interface */