[ros-diffs] [greatlrd] 25007: fixing stub of drvsetcolorkey

Author: greatlrd
Date: Fri Dec  1 00:04:09 2006
New Revision: 25007

URL: http://svn.reactos.org/svn/reactos?rev=25007&view=rev
Log:
fixing stub of drvsetcolorkey

Modified:
    trunk/reactos/dll/directx/ddraw/callbacks_hel.c
    trunk/reactos/dll/directx/ddraw/rosdraw.h
    trunk/reactos/dll/directx/ddraw/startup.c

Modified: trunk/reactos/dll/directx/ddraw/callbacks_hel.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/callback…
==============================================================================
--- trunk/reactos/dll/directx/ddraw/callbacks_hel.c (original)
+++ trunk/reactos/dll/directx/ddraw/callbacks_hel.c Fri Dec  1 00:04:09 2006
@@ -29,7 +29,7 @@
 }
 
 
-DWORD CALLBACK  HelDdSetColorKey(LPDDHAL_SETCOLORKEYDATA lpSetColorKey)
+DWORD CALLBACK  HelDdSetColorKey(LPDDHAL_DRVSETCOLORKEYDATA lpDrvSetColorKey)
 {
    	DX_STUB;
 }

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 Fri Dec  1 00:04:09 2006
@@ -562,7 +562,7 @@
 /* HEL CALLBACK */
 DWORD CALLBACK  HelDdDestroyDriver(LPDDHAL_DESTROYDRIVERDATA lpDestroyDriver);
 DWORD CALLBACK  HelDdCreateSurface(LPDDHAL_CREATESURFACEDATA lpCreateSurface);
-DWORD CALLBACK  HelDdSetColorKey(LPDDHAL_SETCOLORKEYDATA lpSetColorKey);
+DWORD CALLBACK  HelDdSetColorKey(LPDDHAL_DRVSETCOLORKEYDATA lpSetColorKey);
 DWORD CALLBACK  HelDdSetMode(LPDDHAL_SETMODEDATA SetMode);
 DWORD CALLBACK  HelDdWaitForVerticalBlank(LPDDHAL_WAITFORVERTICALBLANKDATA
lpWaitForVerticalBlank);
 DWORD CALLBACK  HelDdCanCreateSurface(LPDDHAL_CANCREATESURFACEDATA lpCanCreateSurface);

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 Fri Dec  1 00:04:09 2006
@@ -798,10 +798,12 @@
 	This->lpLcl->lpDDCB->HELDD.DestroyDriver        = HelDdDestroyDriver;
 	This->lpLcl->lpDDCB->HELDD.FlipToGDISurface     = HelDdFlipToGDISurface;
 	This->lpLcl->lpDDCB->HELDD.GetScanLine          = HelDdGetScanLine;
-	//This->lpLcl->lpDDCB->HELDD.SetColorKey          = HelDdSetColorKey;
+	This->lpLcl->lpDDCB->HELDD.SetColorKey          = HelDdSetColorKey;
 	This->lpLcl->lpDDCB->HELDD.SetExclusiveMode     = HelDdSetExclusiveMode;
 	This->lpLcl->lpDDCB->HELDD.SetMode              = HelDdSetMode;
 	This->lpLcl->lpDDCB->HELDD.WaitForVerticalBlank = HelDdWaitForVerticalBlank;
+
+	
 
 	This->lpLcl->lpDDCB->HELDD.dwFlags =  DDHAL_CB32_CANCREATESURFACE     |
 		                                  DDHAL_CB32_CREATESURFACE        |
@@ -809,7 +811,7 @@
 		                                  DDHAL_CB32_DESTROYDRIVER        | 
 										  DDHAL_CB32_FLIPTOGDISURFACE     |
 										  DDHAL_CB32_GETSCANLINE          |
-										  //DDHAL_CB32_SETCOLORKEY          |
+										  DDHAL_CB32_SETCOLORKEY          |
 										  DDHAL_CB32_SETEXCLUSIVEMODE     | 
 										  DDHAL_CB32_SETMODE              |                                            
      
 										  DDHAL_CB32_WAITFORVERTICALBLANK ;