[ros-diffs] [greatlrd] 23259: really small change using DDSURFACEDESC2 instead of DDSURFACEDESC, for these struct basic same but DDSURFACEDESC2 have few more member at end. and it is type casted around DDSURFACEDESC when it pass down. u can found that info in msdn, ddk, sdk

Author: greatlrd
Date: Mon Jul 24 00:54:53 2006
New Revision: 23259

URL: http://svn.reactos.org/svn/reactos?rev=23259&view=rev
Log:
really small change using DDSURFACEDESC2 instead of DDSURFACEDESC, for these struct basic
same but DDSURFACEDESC2 have few more member at end. and it is type casted around
DDSURFACEDESC when it pass down. u can found that info in msdn, ddk, sdk 

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

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 Mon Jul 24 00:54:53 2006
@@ -634,7 +634,7 @@
            memcpy(&That->Owner->mddsdPrimary,pDDSD,sizeof(DDSURFACEDESC));
            That->Owner->mddsdPrimary.dwSize      = sizeof(DDSURFACEDESC);         

            This->mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE; 
-           This->mDdCanCreateSurface.lpDDSurfaceDesc =
&That->Owner->mddsdPrimary; 
+           This->mDdCanCreateSurface.lpDDSurfaceDesc =
(DDSURFACEDESC*)&That->Owner->mddsdPrimary; 
 
            if
(This->mDdCanCreateSurface.CanCreateSurface(&This->mDdCanCreateSurface)==
DDHAL_DRIVER_NOTHANDLED) 
            {         
@@ -672,7 +672,7 @@
 
           
 
-           This->mDdCreateSurface.lpDDSurfaceDesc =
&That->Owner->mddsdPrimary;
+           This->mDdCreateSurface.lpDDSurfaceDesc =
(DDSURFACEDESC*)&That->Owner->mddsdPrimary;
            This->mDdCreateSurface.lplpSList = That->Owner->mpPrimaryLocals;
            This->mDdCreateSurface.dwSCnt =
This->mDDrawGlobal.dsList->dwIntRefCnt ; 
 

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 Mon Jul 24 00:54:53 2006
@@ -71,10 +71,7 @@
     DWORD *mpFourCC;
 
     UINT mcTextures;
-    DDSURFACEDESC *mpTextures;
-
-	
-
+    DDSURFACEDESC2 *mpTextures;
 
 	/* ExclusiveOwner */	
     
@@ -106,7 +103,7 @@
     DDRAWI_DDRAWCLIPPER_LCL mPrimaryClipperLocal;
     DDRAWI_DDRAWCLIPPER_GBL mPrimaryClipperGlobal;
 
-    DDSURFACEDESC mddsdPrimary;
+    DDSURFACEDESC2 mddsdPrimary;
 
 	/* adding a switch */
 	DWORD devicetype;

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 Mon Jul 24 00:54:53 2006
@@ -291,7 +291,7 @@
     }
 
     This->mcTextures = This->mD3dDriverData.dwNumTextureFormats;
-    This->mpTextures = (DDSURFACEDESC*) DxHeapMemAlloc(sizeof(DDSURFACEDESC) *
This->mcTextures);
+    This->mpTextures = (DDSURFACEDESC2*) DxHeapMemAlloc(sizeof(DDSURFACEDESC2) *
This->mcTextures);
     if (This->mpTextures == NULL)
     {      
       DxHeapMemFree( This->mpFourCC);
@@ -304,7 +304,7 @@
 
     This->mHALInfo.vmiData.pvmList = This->mpvmList;
     This->mHALInfo.lpdwFourCC = This->mpFourCC;
-    This->mD3dDriverData.lpTextureFormats = This->mpTextures;
+    This->mD3dDriverData.lpTextureFormats = (DDSURFACEDESC*) This->mpTextures;
 
     if (!DdQueryDirectDrawObject(
                                     &This->mDDrawGlobal,
@@ -315,7 +315,7 @@
                                     &This->mD3dCallbacks,
                                     &This->mD3dDriverData,
                                     &This->mCallbacks.HALDDExeBuf,
-                                    This->mpTextures,
+                                    (DDSURFACEDESC*)This->mpTextures,
                                     This->mpFourCC,
                                     This->mpvmList))