[ros-diffs] [greatlrd] 23241: Now is the move of all startup code complete. Starting redesign it. and alot of files will be delete

Author: greatlrd
Date: Sun Jul 23 14:21:30 2006
New Revision: 23241

URL: http://svn.reactos.org/svn/reactos?rev=23241&view=rev
Log:
Now is the move of all startup code complete.
Starting redesign it. and alot of files will be delete

Removed:
    trunk/reactos/dll/directx/ddraw/helinterface.c
Modified:
    trunk/reactos/dll/directx/ddraw/ddraw.rbuild
    trunk/reactos/dll/directx/ddraw/rosdraw.h
    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 Sun Jul 23 14:21:30 2006
@@ -18,7 +18,6 @@
 	<file>main.c</file>
 	<file>regsvr.c</file>
 	<file>startup.c</file>
-      <file>helinterface.c</file>
 
       <file>clipper.c</file>
 	<file>color.c</file>

Removed: trunk/reactos/dll/directx/ddraw/helinterface.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/helinter…
==============================================================================
--- trunk/reactos/dll/directx/ddraw/helinterface.c (original)
+++ trunk/reactos/dll/directx/ddraw/helinterface.c (removed)
@@ -1,40 +1,0 @@
-#include "rosdraw.h"
-
-HRESULT Hel_DirectDraw_Initialize (LPDIRECTDRAW7 iface)
-{
-	IDirectDrawImpl* This = (IDirectDrawImpl*)iface;
-
-	This->HELMemoryAvilable = HEL_GRAPHIC_MEMORY_MAX;
-
-    This->mCallbacks.HELDD.dwFlags = DDHAL_CB32_DESTROYDRIVER;
-    This->mCallbacks.HELDD.DestroyDriver = HelDdDestroyDriver;
-    
-    This->mCallbacks.HELDD.dwFlags += DDHAL_CB32_CREATESURFACE; 
-    This->mCallbacks.HELDD.CreateSurface = HelDdCreateSurface;
-    
-    // DDHAL_CB32_
-    //This->mCallbacks.HELDD.SetColorKey = HelDdSetColorKey;
-   
-    This->mCallbacks.HELDD.dwFlags += DDHAL_CB32_SETMODE;
-    This->mCallbacks.HELDD.SetMode = HelDdSetMode;
-    
-    This->mCallbacks.HELDD.dwFlags += DDHAL_CB32_WAITFORVERTICALBLANK;     
-    This->mCallbacks.HELDD.WaitForVerticalBlank = HelDdWaitForVerticalBlank;
-        
-    This->mCallbacks.HELDD.dwFlags += DDHAL_CB32_CANCREATESURFACE;
-    This->mCallbacks.HELDD.CanCreateSurface = HelDdCanCreateSurface;
-    
-    This->mCallbacks.HELDD.dwFlags += DDHAL_CB32_CREATEPALETTE;
-    This->mCallbacks.HELDD.CreatePalette = HelDdCreatePalette;
-    
-    This->mCallbacks.HELDD.dwFlags += DDHAL_CB32_GETSCANLINE;
-    This->mCallbacks.HELDD.GetScanLine = HelDdGetScanLine;
-    
-    This->mCallbacks.HELDD.dwFlags += DDHAL_CB32_SETEXCLUSIVEMODE;
-    This->mCallbacks.HELDD.SetExclusiveMode = HelDdSetExclusiveMode;
-
-    This->mCallbacks.HELDD.dwFlags += DDHAL_CB32_FLIPTOGDISURFACE;
-    This->mCallbacks.HELDD.FlipToGDISurface = HelDdFlipToGDISurface;
-   
-	return DD_OK;
-}

Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.…
==============================================================================
--- trunk/reactos/dll/directx/ddraw/rosdraw.h (original)
+++ trunk/reactos/dll/directx/ddraw/rosdraw.h Sun Jul 23 14:21:30 2006
@@ -10,11 +10,11 @@
 #include <d3dhal.h>
 #include <ddrawgdi.h>
 
+/* DirectDraw startup code only internal use  */
 HRESULT WINAPI StartDirectDraw(LPDIRECTDRAW* iface);
 HRESULT WINAPI StartDirectDrawHal(LPDIRECTDRAW* iface);
+HRESULT WINAPI StartDirectDrawHel(LPDIRECTDRAW* iface);
 HRESULT WINAPI Create_DirectDraw (LPGUID pGUID, LPDIRECTDRAW* pIface, REFIID id, BOOL
ex);
-
-HRESULT Hel_DirectDraw_Initialize (LPDIRECTDRAW7 );
 
 /* own macro to alloc memmory */
 #define DxHeapMemAlloc(m)  HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, m) 

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 Sun Jul 23 14:21:30 2006
@@ -110,8 +110,8 @@
     This->mDDrawGlobal.lpDDCBtmp = &This->mCallbacks;
     This->mDDrawGlobal.lpExclusiveOwner = &This->mDDrawLocal;
 
-    hal_ret = StartDirectDrawHal(iface);    
-    hel_ret = Hel_DirectDraw_Initialize ((LPDIRECTDRAW7)iface); 
+    hal_ret = StartDirectDrawHal(iface);
+	hel_ret = StartDirectDrawHel(iface);    
     if ((hal_ret!=DD_OK) &&  (hel_ret!=DD_OK))
     {
 		DX_STUB_str("DDERR_NODIRECTDRAWSUPPORT");
@@ -301,6 +301,46 @@
   return DD_OK;
 }
 
+HRESULT WINAPI 
+StartDirectDrawHel(LPDIRECTDRAW* iface)
+{
+	IDirectDrawImpl* This = (IDirectDrawImpl*)iface;
+
+	This->HELMemoryAvilable = HEL_GRAPHIC_MEMORY_MAX;
+
+    This->mCallbacks.HELDD.dwFlags = DDHAL_CB32_DESTROYDRIVER;
+    This->mCallbacks.HELDD.DestroyDriver = HelDdDestroyDriver;
+    
+    This->mCallbacks.HELDD.dwFlags += DDHAL_CB32_CREATESURFACE; 
+    This->mCallbacks.HELDD.CreateSurface = HelDdCreateSurface;
+    
+    // DDHAL_CB32_
+    //This->mCallbacks.HELDD.SetColorKey = HelDdSetColorKey;
+   
+    This->mCallbacks.HELDD.dwFlags += DDHAL_CB32_SETMODE;
+    This->mCallbacks.HELDD.SetMode = HelDdSetMode;
+    
+    This->mCallbacks.HELDD.dwFlags += DDHAL_CB32_WAITFORVERTICALBLANK;     
+    This->mCallbacks.HELDD.WaitForVerticalBlank = HelDdWaitForVerticalBlank;
+        
+    This->mCallbacks.HELDD.dwFlags += DDHAL_CB32_CANCREATESURFACE;
+    This->mCallbacks.HELDD.CanCreateSurface = HelDdCanCreateSurface;
+    
+    This->mCallbacks.HELDD.dwFlags += DDHAL_CB32_CREATEPALETTE;
+    This->mCallbacks.HELDD.CreatePalette = HelDdCreatePalette;
+    
+    This->mCallbacks.HELDD.dwFlags += DDHAL_CB32_GETSCANLINE;
+    This->mCallbacks.HELDD.GetScanLine = HelDdGetScanLine;
+    
+    This->mCallbacks.HELDD.dwFlags += DDHAL_CB32_SETEXCLUSIVEMODE;
+    This->mCallbacks.HELDD.SetExclusiveMode = HelDdSetExclusiveMode;
+
+    This->mCallbacks.HELDD.dwFlags += DDHAL_CB32_FLIPTOGDISURFACE;
+    This->mCallbacks.HELDD.FlipToGDISurface = HelDdFlipToGDISurface;
+   
+	return DD_OK;
+}
+
 HRESULT 
 WINAPI 
 Create_DirectDraw (LPGUID pGUID,