Fixed crash in automatic TXD resizing #2

Author: ccw808

MTA10/core/CGraphics.cpp

@@ -2009,6 +2009,12 @@ bool CGraphics::CopyDataToSurface( IDirect3DSurface9* pSurface, const uchar* pDa
     D3DSURFACE_DESC SurfDesc;
     pSurface->GetDesc( &SurfDesc );
 
+    uint uiLineWidthBytes = SurfDesc.Width * CRenderItemManager::GetBitsPerPixel( SurfDesc.Format ) / 8;
+
+    // Check pitch is not too small (i.e from a mipmap level)
+    if ( uiDataPitch < uiLineWidthBytes )
+        return false;
+
     D3DLOCKED_RECT LockedRect;
     if ( FAILED( pSurface->LockRect( &LockedRect, NULL, D3DLOCK_NOSYSLOCK ) ) )
         return false;
@@ -2017,8 +2023,6 @@ bool CGraphics::CopyDataToSurface( IDirect3DSurface9* pSurface, const uchar* pDa
     uint uiSurfPitch = LockedRect.Pitch / CRenderItemManager::GetPitchDivisor( SurfDesc.Format );
     BYTE* pSurfBits = (BYTE*)LockedRect.pBits;
 
-    uint uiLineWidthBytes = SurfDesc.Width * CRenderItemManager::GetBitsPerPixel( SurfDesc.Format ) / 8;
-
     if ( uiLineWidthBytes == uiSurfPitch && uiLineWidthBytes == uiDataPitch )
     {
         // Pitches match byte width

MTA10/game_sa/CRenderWareSA.TxdRightSizing.cpp

@@ -119,7 +119,7 @@ RwTexture* CRenderWareSA::RightSizeTexture( RwTexture* pTexture, uint uiSizeLimi
     int iPitch = pD3DRaster->lockedRect.Pitch;
     bool bHasAlpha = pD3DRaster->alpha != 0;
     bool bIsCubeTexture = ( pD3DRaster->cubeTextureFlags & 0x01 ) != 0;
-    bool bHasMipMaps = ( pD3DRaster->textureFlags & 0x01 ) != 0;
+    bool bHasMipMaps = pRaster->depth != 1;
     bool bIsCompressed = ( pD3DRaster->textureFlags & 0x10 ) != 0;
 
     // Check we can do this
@@ -150,7 +150,7 @@ RwTexture* CRenderWareSA::RightSizeTexture( RwTexture* pTexture, uint uiSizeLimi
     header.TextureFormat.vAddressing = ( pTexture->flags & 0xf000 ) >> 12;
     memcpy( header.TextureFormat.name, pTexture->name, 32 );
     memcpy( header.TextureFormat.maskName, pTexture->mask, 32 );
-    header.RasterFormat.rasterFormat = pRaster->format << 8;    // dxt1 = 0x00000100 or 0x00000200 / dxt3 = 0x00000300
+    header.RasterFormat.rasterFormat = pRaster->format << 8;    // ( dxt1 = 0x00000100 or 0x00000200 / dxt3 = 0x00000300 ) | 0x00008000 mipmaps?
     header.RasterFormat.d3dFormat = pD3DRaster->format;
     header.RasterFormat.width = uiReqWidth;
     header.RasterFormat.height = uiReqHeight;