[ros-diffs] [greatlrd] 23273: 1. Cleanup some stuff 2. Fixing the build again 3. Fixing a memory leak.

Author: greatlrd
Date: Tue Jul 25 02:02:13 2006
New Revision: 23273

URL: http://svn.reactos.org/svn/reactos?rev=23273&view=rev
Log:
1. Cleanup some stuff
2. Fixing the build again
3. Fixing a memory leak.

Modified:
    trunk/reactos/dll/directx/ddraw/ddraw.rbuild
    trunk/reactos/dll/directx/ddraw/main.c
    trunk/reactos/dll/directx/ddraw/main/ddraw_main.c
    trunk/reactos/dll/directx/ddraw/startup.c

Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw.rb…
==============================================================================
--- trunk/reactos/dll/directx/ddraw/ddraw.rbuild (original)
+++ trunk/reactos/dll/directx/ddraw/ddraw.rbuild Tue Jul 25 02:02:13 2006
@@ -27,8 +27,7 @@
 	<file>videoport.c</file>
 	<file>kernel.c</file>
 
-	<directory name="hal">
-		<file>ddraw_hal.c</file>
+	<directory name="hal">		
 		<file>surface_hal.c</file>
 	</directory>
 
@@ -37,8 +36,7 @@
 		<file>surface_main.c</file>				
 	</directory>
 
-	<directory name="soft">
-		<file>ddraw_hel.c</file>
+	<directory name="soft">		
 		<file>surface_hel.c</file>
             <file>surface_callbacks_hel.c</file>
 	</directory>

Modified: trunk/reactos/dll/directx/ddraw/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main.c?r…
==============================================================================
--- trunk/reactos/dll/directx/ddraw/main.c (original)
+++ trunk/reactos/dll/directx/ddraw/main.c Tue Jul 25 02:02:13 2006
@@ -13,6 +13,15 @@
 #include "rosdraw.h"
 #include "d3dhal.h"
 
+
+// This function is exported by the dll
+HRESULT WINAPI DirectDrawCreateClipper (DWORD dwFlags, 
+                                        LPDIRECTDRAWCLIPPER* lplpDDClipper, LPUNKNOWN
pUnkOuter)
+{
+    DX_WINDBG_trace();
+
+    return Main_DirectDraw_CreateClipper(NULL, dwFlags, lplpDDClipper, pUnkOuter);
+}
 
 /*
  * IMPLEMENT

Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddr…
==============================================================================
--- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original)
+++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Tue Jul 25 02:02:13 2006
@@ -1108,8 +1108,12 @@
 	return This->mDdSetMode.ddRVal;
 }
 
-
-HRESULT WINAPI Main_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7 iface, DWORD dwFlags,
+/*
+ * IMPLEMENT
+ * Status ok
+ */
+HRESULT WINAPI 
+Main_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7 iface, DWORD dwFlags,
                                                    HANDLE h)
 {
     DX_WINDBG_trace();
@@ -1133,7 +1137,12 @@
 	return  DDERR_NODRIVERSUPPORT;	 
 }
 
-HRESULT WINAPI Main_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 iface, LPDDSCAPS2
ddscaps,
+/*
+ * IMPLEMENT
+ * Status ok
+ */
+HRESULT WINAPI 
+Main_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps,
                    LPDWORD total, LPDWORD free)                                          
    
 {    
     DX_WINDBG_trace();
@@ -1165,65 +1174,10 @@
 	return  DDERR_NODRIVERSUPPORT;	 
 }
 
-
-
-
-
-
-
-
-
-
-
-/*
- * IMPLEMENT
- * Status this api is finish and is 100% correct 
- */
-
-
-
-
-// This function is exported by the dll
-HRESULT WINAPI DirectDrawCreateClipper (DWORD dwFlags, 
-                                        LPDIRECTDRAWCLIPPER* lplpDDClipper, LPUNKNOWN
pUnkOuter)
-{
-    DX_WINDBG_trace();
-
-    return Main_DirectDraw_CreateClipper(NULL, dwFlags, lplpDDClipper, pUnkOuter);
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-/********************************** Stubs **********************************/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-                                                   
+/*
+ * Stub
+ * Status todo
+ */
 HRESULT WINAPI Main_DirectDraw_GetSurfaceFromDC(LPDIRECTDRAW7 iface, HDC hdc,
                                                 LPDIRECTDRAWSURFACE7 *lpDDS)
 {  
@@ -1231,18 +1185,30 @@
     DX_STUB;
 }
 
+/*
+ * Stub
+ * Status todo
+ */
 HRESULT WINAPI Main_DirectDraw_RestoreAllSurfaces(LPDIRECTDRAW7 iface)
 {
     DX_WINDBG_trace();
     DX_STUB;
 }
 
+/*
+ * Stub
+ * Status todo
+ */
 HRESULT WINAPI Main_DirectDraw_TestCooperativeLevel(LPDIRECTDRAW7 iface) 
 {
     DX_WINDBG_trace();
     DX_STUB;
 }
 
+/*
+ * Stub
+ * Status todo
+ */
 HRESULT WINAPI Main_DirectDraw_GetDeviceIdentifier(LPDIRECTDRAW7 iface,
                    LPDDDEVICEIDENTIFIER2 pDDDI, DWORD dwFlags)
 {    
@@ -1250,6 +1216,10 @@
     DX_STUB;
 }
 
+/*
+ * Stub
+ * Status todo
+ */
 HRESULT WINAPI Main_DirectDraw_StartModeTest(LPDIRECTDRAW7 iface, LPSIZE pModes,
                   DWORD dwNumModes, DWORD dwFlags)
 {
@@ -1257,11 +1227,16 @@
     DX_STUB;
 }
 
+/*
+ * Stub
+ * Status todo
+ */
 HRESULT WINAPI Main_DirectDraw_EvaluateMode(LPDIRECTDRAW7 iface,DWORD a,DWORD* b)
 {  
     DX_WINDBG_trace();
     DX_STUB;
 }
+
 
 IDirectDraw7Vtbl DirectDraw7_Vtable =
 {

Modified: trunk/reactos/dll/directx/ddraw/startup.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.…
==============================================================================
--- trunk/reactos/dll/directx/ddraw/startup.c (original)
+++ trunk/reactos/dll/directx/ddraw/startup.c Tue Jul 25 02:02:13 2006
@@ -364,11 +364,6 @@
   DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS);
   This->mHALInfo.GetDriverInfo(&DriverInfo);
 
-  if (This->mDDrawGlobal.lpDDCBtmp->HALDDMiscellaneous.dwFlags &
DDHAL_MISCCB32_GETAVAILDRIVERMEMORY)
-  {
-     This->mDdGetDriverMemory.GetAvailDriverMemory =
This->mDDrawGlobal.lpDDCBtmp->HALDDMiscellaneous.GetAvailDriverMemory;
-  }
-
   /* Setup global surface */   
   /*This->mPrimaryGlobal.dwGlobalFlags = DDRAWISURFGBL_ISGDISURFACE;
   This->mPrimaryGlobal.lpDD       = &This->mDDrawGlobal;
@@ -378,7 +373,7 @@
   This->mPrimaryGlobal.lPitch  = This->mpModeInfos[0].lPitch;*/
 
   /* FIXME free it in cleanup */
-  This->mDDrawGlobal.dsList =
(LPDDRAWI_DDRAWSURFACE_INT)DxHeapMemAlloc(sizeof(DDRAWI_DDRAWSURFACE_INT)); 
+  // This->mDDrawGlobal.dsList =
(LPDDRAWI_DDRAWSURFACE_INT)DxHeapMemAlloc(sizeof(DDRAWI_DDRAWSURFACE_INT)); 
   return DD_OK;
 }