[ros-diffs] [mbosma] 18914: Fix wrong DDESC2 to DDESC conversion. Spotted by GreatLord.

[mbosma at svn.reactos.com]

Fix wrong DDESC2 to DDESC conversion. Spotted by GreatLord.
Modified: trunk/reactos/lib/ddraw/main/surface_main.c
  _____  

Modified: trunk/reactos/lib/ddraw/main/surface_main.c
--- trunk/reactos/lib/ddraw/main/surface_main.c	2005-10-31 19:02:09 UTC
(rev 18913)
+++ trunk/reactos/lib/ddraw/main/surface_main.c	2005-10-31 19:12:07 UTC
(rev 18914)
@@ -11,25 +11,28 @@

 #include "rosdraw.h"
 
 
-HRESULT WINAPI Main_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE7
iface, LPDIRECTDRAW pDD, LPDDSURFACEDESC2 pDDSD)
+HRESULT WINAPI Main_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE7
iface, LPDIRECTDRAW pDD, LPDDSURFACEDESC2 pDDSD2)
 {
     IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface;
 	
-	if(sizeof(DDSURFACEDESC2) != pDDSD->dwSize)
+	if(sizeof(DDSURFACEDESC2) != pDDSD2->dwSize)
 		return DDERR_UNSUPPORTED;
 
-	if(!(pDDSD->dwFlags & DDSD_CAPS))
+	if(!(pDDSD2->dwFlags & DDSD_CAPS))
 		return DDERR_INVALIDPARAMS;
 
 	This->owner = (IDirectDrawImpl*)pDD;	
-   	
+
+	DDSURFACEDESC DDSD = *(LPDDSURFACEDESC)pDDSD2;
+	DDSD.dwSize = sizeof(pDDSD2);
+   
 	if (This->owner->DirectDrawGlobal.lpDDCBtmp->HALDD.dwFlags &
DDHAL_CB32_CANCREATESURFACE)
 	{
 		/* can the driver create the surface */
 		DDHAL_CANCREATESURFACEDATA CanCreateData;
 		memset(&CanCreateData, 0,
sizeof(DDHAL_CANCREATESURFACEDATA));
 		CanCreateData.lpDD = &This->owner->DirectDrawGlobal; 
-		CanCreateData.lpDDSurfaceDesc = (DDSURFACEDESC*)pDDSD;
+		CanCreateData.lpDDSurfaceDesc = &DDSD;
 			
 		if
(This->owner->DirectDrawGlobal.lpDDCBtmp->HALDD.CanCreateSurface(&CanCre
ateData) == DDHAL_DRIVER_NOTHANDLED)
 			return DDERR_INVALIDPARAMS;
@@ -45,9 +48,6 @@
 	This->Global.wWidth =
This->owner->DirectDrawGlobal.vmiData.dwDisplayWidth;
 	This->Global.dwLinearSize =
This->owner->DirectDrawGlobal.vmiData.lDisplayPitch;
 	
-
-
-	
 	/* surface more struct */
 	memset(&This->More, 0, sizeof(DDRAWI_DDRAWSURFACE_MORE));
 	This->More.dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE);
@@ -56,10 +56,10 @@
 	memset(&This->Local, 0, sizeof(DDRAWI_DDRAWSURFACE_LCL));
 	This->Local.lpGbl = &This->Global;
 	This->Local.lpSurfMore = &This->More;
-	This->Local.ddsCaps = *(DDSCAPS*)&pDDSD->ddsCaps;
+	This->Local.ddsCaps = DDSD.ddsCaps;
 
 	/* we need to set some flags if we create the primary surface */
-	if(pDDSD->ddsCaps.dwCaps == DDSCAPS_PRIMARYSURFACE)
+	if(pDDSD2->ddsCaps.dwCaps == DDSCAPS_PRIMARYSURFACE)
 	{
 		This->Local.dwFlags |= DDRAWISURF_FRONTBUFFER;
 		This->Global.dwGlobalFlags |=
DDRAWISURFGBL_ISGDISURFACE;
@@ -74,7 +74,7 @@
 	DDHAL_CREATESURFACEDATA CreateData;
 	memset(&CreateData, 0, sizeof(DDHAL_CREATESURFACEDATA));
 	CreateData.lpDD = &This->owner->DirectDrawGlobal; 
-	CreateData.lpDDSurfaceDesc = (DDSURFACEDESC*)pDDSD;
+	CreateData.lpDDSurfaceDesc = &DDSD;
 	CreateData.dwSCnt = 1;
 	CreateData.lplpSList = pLocal;	
 	
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://www.reactos.org/pipermail/ros-diffs/attachments/20051031/b479a6e8/attachment.html