Implement the Load() function

Author: elishacloud

Dllmain/BuildNo.rc

@@ -1 +1 @@
-#define BUILD_NUMBER 6663 
+#define BUILD_NUMBER 6664 

ddraw/IDirect3DDeviceX.cpp

@@ -439,8 +439,68 @@ HRESULT m_IDirect3DDeviceX::Load(LPDIRECTDRAWSURFACE7 lpDestTex, LPPOINT lpDestP
 
 	if (Config.Dd7to9)
 	{
-		LOG_LIMIT(100, __FUNCTION__ << " Not Implemented");
-		return DDERR_UNSUPPORTED;
+		if (!lpDestTex || !lpSrcTex)
+		{
+			return  DDERR_INVALIDPARAMS;
+		}
+
+		// ToDo: support the following dwFlags: 
+		// DDSCAPS2_CUBEMAP_ALLFACES - All faces should be loaded with the image data within the source texture.
+		// DDSCAPS2_CUBEMAP_NEGATIVEX, DDSCAPS2_CUBEMAP_NEGATIVEY, or DDSCAPS2_CUBEMAP_NEGATIVEZ
+		//     The negative x, y, or z faces should receive the image data.
+		// DDSCAPS2_CUBEMAP_POSITIVEX, DDSCAPS2_CUBEMAP_POSITIVEY, or DDSCAPS2_CUBEMAP_POSITIVEZ
+		//     The positive x, y, or z faces should receive the image data.
+
+		if (dwFlags)
+		{
+			LOG_LIMIT(100, __FUNCTION__ << " Warning: flags not supported. dwFlags: " << Logging::hex(dwFlags));
+		}
+
+		// ToDo: check if source and destination surfaces are valid
+
+		if (!lprcSrcRect && (!lpDestPoint || (lpDestPoint && lpDestPoint->x == 0 && lpDestPoint->y == 0)))
+		{
+			return lpDestTex->Blt(nullptr, lpSrcTex, nullptr, 0, nullptr);
+		}
+		else
+		{
+			// Get source rect
+			RECT SrcRect = {};
+			if (lprcSrcRect)
+			{
+				SrcRect = *lprcSrcRect;
+			}
+			else
+			{
+				DDSURFACEDESC2 Desc2 = {};
+				Desc2.dwSize = sizeof(DDSURFACEDESC2);
+				lpSrcTex->GetSurfaceDesc(&Desc2);
+
+				if ((Desc2.dwFlags & (DDSD_WIDTH | DDSD_HEIGHT)) != (DDSD_WIDTH | DDSD_HEIGHT))
+				{
+					return DDERR_GENERIC;
+				}
+
+				SrcRect = { 0, 0, (LONG)Desc2.dwWidth, (LONG)Desc2.dwHeight };
+			}
+
+			// Get destination point
+			POINT DestPoint = {};
+			if (lpDestPoint)
+			{
+				DestPoint = *lpDestPoint;
+			}
+
+			// Get destination rect
+			RECT DestRect = {
+				DestPoint.x,									// left
+				DestPoint.y,									// top
+				DestPoint.x + (SrcRect.right - SrcRect.left),	// right
+				DestPoint.y + (SrcRect.bottom - SrcRect.top),	// bottom
+			};
+
+			return lpDestTex->Blt(&DestRect, lpSrcTex, &SrcRect, 0, nullptr);
+		}
 	}
 
 	if (lpDestTex)

ddraw/IDirect3DTextureX.cpp

@@ -208,8 +208,50 @@ HRESULT m_IDirect3DTextureX::Load(LPDIRECT3DTEXTURE2 lpD3DTexture2)
 
 	if (!ProxyInterface)
 	{
-		LOG_LIMIT(100, __FUNCTION__ << " Not Implemented");
-		return DDERR_UNSUPPORTED;
+		if (lpD3DTexture2)
+		{
+			return DDERR_INVALIDPARAMS;
+		}
+
+		if (!D3DDeviceInterface)
+		{
+			LOG_LIMIT(100, __FUNCTION__ << " Error: D3DDevice does not exist!");
+			return DDERR_GENERIC;
+		}
+
+		if (!DDrawSurface)
+		{
+			LOG_LIMIT(100, __FUNCTION__ << " Error: surface is not attached!");
+			return DDERR_GENERIC;
+		}
+
+		m_IDirect3DTextureX* pSrcTextureX = nullptr;
+		lpD3DTexture2->QueryInterface(IID_GetInterfaceX, (LPVOID*)&pSrcTextureX);
+
+		if (!pSrcTextureX)
+		{
+			LOG_LIMIT(100, __FUNCTION__ << " Error: could not get texture wrapper!");
+			return DDERR_GENERIC;
+		}
+
+		m_IDirectDrawSurfaceX* pSrcSurfaceX = pSrcTextureX->GetSurface();
+		if (!pSrcSurfaceX)
+		{
+			LOG_LIMIT(100, __FUNCTION__ << " Error: could not get surface!");
+			return DDERR_GENERIC;
+		}
+
+		IDirectDrawSurface7* pSrcSurface7 = (IDirectDrawSurface7*)pSrcSurfaceX->GetWrapperInterfaceX(7);
+		IDirectDrawSurface7* pDestSurface7 = (IDirectDrawSurface7*)DDrawSurface->GetWrapperInterfaceX(7);
+
+		if (!pDestSurface7 || !pSrcSurface7)
+		{
+			LOG_LIMIT(100, __FUNCTION__ << " Error: could not get v7 surface interface!");
+			return DDERR_GENERIC;
+		}
+
+		POINT Point = {};
+		return (*D3DDeviceInterface)->Load(pDestSurface7, &Point, pSrcSurface7, nullptr, 0);
 	}
 
 	if (lpD3DTexture2)