Add partial MipMap support

elishacloud · May 6, 2024 · 62b98cf · 62b98cf
1 parent c383c82
commit 62b98cf
Show file tree

Hide file tree

Showing 21 changed files with 410 additions and 143 deletions.
diff --git a/Dllmain/BuildNo.rc b/Dllmain/BuildNo.rc
@@ -1 +1 @@
-#define BUILD_NUMBER 7005 
+#define BUILD_NUMBER 7006 
diff --git a/Dllmain/Dllmain.cpp b/Dllmain/Dllmain.cpp
@@ -109,7 +109,7 @@ HMODULE LoadHookedDll(char *dllname, LoadProc Load, DWORD HookSystem32)
 HMODULE hModule_dll = nullptr;
 
 // Dll main function
-bool APIENTRY DllMain(HMODULE hModule, DWORD fdwReason, LPVOID lpReserved)
+BOOL APIENTRY DllMain(HMODULE hModule, DWORD fdwReason, LPVOID lpReserved)
 {
 	UNREFERENCED_PARAMETER(lpReserved);
 

diff --git a/IClassFactory/IClassFactory.h b/IClassFactory/IClassFactory.h
@@ -6,8 +6,8 @@
 #include "Settings\Settings.h"
 #include "Logging\Logging.h"
 
-DEFINE_GUID(IID_GetRealInterface, 0x254e1ffd, 0x10f9, 0x10c0, 0xc1, 0xb8, 0x21, 0x7d, 0x59, 0xd1, 0xe5, 0xb2);
-DEFINE_GUID(IID_GetInterfaceX, 0x254e1ffd, 0x10f9, 0x10c0, 0xc1, 0xb8, 0x21, 0x7d, 0x59, 0xd1, 0xe5, 0xb4);
+DEFINE_GUID(IID_GetRealInterface, 0x00000000, 0x1c77, 0x4d40, 0xb0, 0xcf, 0x98, 0xfe, 0xfd, 0xff, 0xff, 0xff);
+DEFINE_GUID(IID_GetInterfaceX, 0x11111111, 0x1c77, 0x4d40, 0xb0, 0xcf, 0x98, 0xfe, 0xfd, 0xff, 0xff, 0xff);
 
 typedef void(WINAPI *IQueryInterfaceProc)(REFIID, LPVOID *);
 typedef HRESULT(WINAPI *CoCreateInstanceHandleProc)(REFCLSID rclsid, LPUNKNOWN pUnkOuter, DWORD dwClsContext, REFIID riid, LPVOID *ppv);

diff --git a/ddraw/IDirect3DDeviceX.cpp b/ddraw/IDirect3DDeviceX.cpp
@@ -921,8 +921,6 @@ HRESULT m_IDirect3DDeviceX::SetTexture(DWORD dwStage, LPDIRECTDRAWSURFACE7 lpSur
 		}
 		else
 		{
-			lpDDSrcSurfaceX = nullptr;
-
 			if (!CheckSurfaceExists(lpSurface))
 			{
 				LOG_LIMIT(100, __FUNCTION__ << " Error: could not find source surface! " << lpSurface);

diff --git a/ddraw/IDirect3DTextureX.cpp b/ddraw/IDirect3DTextureX.cpp
@@ -279,13 +279,23 @@ HRESULT m_IDirect3DTextureX::Load(LPDIRECT3DTEXTURE2 lpD3DTexture2)
 			return DDERR_GENERIC;
 		}
 
+		if (pSrcTextureX == this)
+		{
+			return D3D_OK;
+		}
+
 		m_IDirectDrawSurfaceX* pSrcSurfaceX = pSrcTextureX->GetSurface();
 		if (!pSrcSurfaceX)
 		{
 			LOG_LIMIT(100, __FUNCTION__ << " Error: could not get surface!");
 			return DDERR_GENERIC;
 		}
 
+		if (pSrcSurfaceX == DDrawSurface)
+		{
+			return D3D_OK;
+		}
+
 		IDirectDrawSurface7* pSrcSurface7 = (IDirectDrawSurface7*)pSrcSurfaceX->GetWrapperInterfaceX(7);
 		IDirectDrawSurface7* pDestSurface7 = (IDirectDrawSurface7*)DDrawSurface->GetWrapperInterfaceX(7);