Add warnings to D3d9to9Ex

Author: elishacloud

Dllmain/BuildNo.rc

@@ -1 +1 @@
-#define BUILD_NUMBER 8155 
+#define BUILD_NUMBER 8156 

d3d9/IDirect3D9Ex.cpp

@@ -417,6 +417,11 @@ HRESULT m_IDirect3D9Ex::GetAdapterLUID(THIS_ UINT Adapter, LUID * pLUID)
 
 void m_IDirect3D9Ex::InitInterface()
 {
+	if (Config.D3d9to9Ex && !IsForcingD3d9to9Ex())
+	{
+		LOG_LIMIT(3, __FUNCTION__ << " Warning: Creating non-Ex interface when using D3d9to9Ex!");
+	}
+
 	ProxyAddressLookupTable9.SaveAddress(this, ProxyInterface);
 }
 

d3d9/IDirect3DDevice9Ex.cpp

@@ -232,17 +232,23 @@ HRESULT m_IDirect3DDevice9Ex::GetDisplayMode(THIS_ UINT iSwapChain, D3DDISPLAYMO
 {
 	Logging::LogDebug() << __FUNCTION__ << " (" << this << ")";
 
-	if (IsForcingD3d9to9Ex() && pMode)
+	if (IsForcingD3d9to9Ex())
 	{
 		D3DDISPLAYMODEEX ModeEx = {};
 		ModeEx.Size = sizeof(D3DDISPLAYMODEEX);
+		D3DDISPLAYMODEEX* pModeEx = pMode ? &ModeEx : nullptr;
+
 		D3DDISPLAYROTATION Rotation = D3DDISPLAYROTATION_IDENTITY;
+		D3DDISPLAYROTATION* pRotation = pMode ? &Rotation : nullptr;
 
-		HRESULT hr = GetDisplayModeEx(iSwapChain, &ModeEx, &Rotation);
+		HRESULT hr = GetDisplayModeEx(iSwapChain, pModeEx, pRotation);
 
 		if (SUCCEEDED(hr))
 		{
-			ModeExToMode(ModeEx, *pMode);
+			if (pMode)
+			{
+				ModeExToMode(ModeEx, *pMode);
+			}
 
 			return hr;
 		}
@@ -414,16 +420,20 @@ HRESULT m_IDirect3DDevice9Ex::Reset(D3DPRESENT_PARAMETERS* pPresentationParamete
 {
 	Logging::LogDebug() << __FUNCTION__ << " (" << this << ")";
 
-	if (IsForcingD3d9to9Ex() && pPresentationParameters)
+	if (IsForcingD3d9to9Ex())
 	{
 		D3DDISPLAYMODEEX FullscreenDisplayMode = {};
+		D3DDISPLAYMODEEX* pFullscreenDisplayMode = nullptr;
 
-		m_IDirect3D9Ex::GetFullscreenDisplayMode(*pPresentationParameters, FullscreenDisplayMode);
-
-		if (SUCCEEDED(ResetEx(pPresentationParameters, &FullscreenDisplayMode)))
+		if (pPresentationParameters)
 		{
-			return D3D_OK;
+			pFullscreenDisplayMode = &FullscreenDisplayMode;
+			m_IDirect3D9Ex::GetFullscreenDisplayMode(*pPresentationParameters, FullscreenDisplayMode);
 		}
+
+		LOG_LIMIT(3, __FUNCTION__ << " Warning: Calling Reset() when using D3d9to9Ex.  Managed interfaces converted to the default pool will be lost!");
+
+		return ResetEx(pPresentationParameters, pFullscreenDisplayMode);
 	}
 
 	return ResetT<fReset>(nullptr, pPresentationParameters, false, nullptr);
@@ -3420,6 +3430,11 @@ void m_IDirect3DDevice9Ex::SetEnvironmentCubeMapTexture()
 // Runs when device is created and on every successful Reset()
 void m_IDirect3DDevice9Ex::ReInitInterface()
 {
+	if (Config.D3d9to9Ex && !IsForcingD3d9to9Ex())
+	{
+		LOG_LIMIT(3, __FUNCTION__ << " Warning: Creating non-Ex interface when using D3d9to9Ex!");
+	}
+
 	Utils::GetScreenSize(SHARED.hMonitor, SHARED.screenWidth, SHARED.screenHeight);
 
 	IsGammaSet = false;

d3d9/IDirect3DSwapChain9Ex.cpp

@@ -130,17 +130,23 @@ HRESULT m_IDirect3DSwapChain9Ex::GetDisplayMode(THIS_ D3DDISPLAYMODE* pMode)
 {
 	Logging::LogDebug() << __FUNCTION__ << " (" << this << ")";
 
-	if (IsForcingD3d9to9Ex() && pMode)
+	if (IsForcingD3d9to9Ex())
 	{
 		D3DDISPLAYMODEEX ModeEx = {};
 		ModeEx.Size = sizeof(D3DDISPLAYMODEEX);
+		D3DDISPLAYMODEEX* pModeEx = pMode ? &ModeEx : nullptr;
+
 		D3DDISPLAYROTATION Rotation = D3DDISPLAYROTATION_IDENTITY;
+		D3DDISPLAYROTATION* pRotation = pMode ? &Rotation : nullptr;
 
-		HRESULT hr = GetDisplayModeEx(&ModeEx, &Rotation);
+		HRESULT hr = GetDisplayModeEx(pModeEx, pRotation);
 
 		if (SUCCEEDED(hr))
 		{
-			m_IDirect3DDevice9Ex::ModeExToMode(ModeEx, *pMode);
+			if (pMode)
+			{
+				m_IDirect3DDevice9Ex::ModeExToMode(ModeEx, *pMode);
+			}
 
 			return hr;
 		}

d3d9/IDirect3DSwapChain9Ex.h

@@ -57,5 +57,9 @@ class m_IDirect3DSwapChain9Ex : public IDirect3DSwapChain9Ex, public AddressLook
 		{
 			ProxyInterfaceEx = nullptr;
 		}
+		if (Config.D3d9to9Ex && !IsForcingD3d9to9Ex())
+		{
+			LOG_LIMIT(3, __FUNCTION__ << " Warning: Creating non-Ex interface when using D3d9to9Ex!");
+		}
 	}
 };