Fix how DirectInput interfaces are created

#537

Author: elishacloud

Dllmain/BuildNo.rc

@@ -1 +1 @@
-#define BUILD_NUMBER 8317 
+#define BUILD_NUMBER 8318 

External/dinputto8

@@ -68,19 +68,20 @@ template HRESULT m_IDirectInput8::CreateDeviceT<IDirectInput8W, LPDIRECTINPUTDEV
 template <class T, class V>
 HRESULT m_IDirectInput8::CreateDeviceT(T* ProxyInterfaceT, REFGUID rguid, V lplpDirectInputDevice, LPUNKNOWN pUnkOuter)
 {
+	UNREFERENCED_PARAMETER(ProxyInterfaceT);
+
 	Logging::LogDebug() << __FUNCTION__ << " (" << this << ")";
 
-	HRESULT hr = ProxyInterfaceT->CreateDevice(rguid, lplpDirectInputDevice, pUnkOuter);
+	IDirectInputDevice8W* ProxyDevice;
+	HRESULT hr = ProxyInterface->CreateDevice(rguid, &ProxyDevice, pUnkOuter);
 
-	if (SUCCEEDED(hr) && lplpDirectInputDevice)
+	if (SUCCEEDED(hr))
 	{
-		m_IDirectInputDevice8* pAddressX = new m_IDirectInputDevice8((IDirectInputDevice8W*)*lplpDirectInputDevice);
-
-		*lplpDirectInputDevice = pAddressX;
+		m_IDirectInputDevice8* DIDevice = new m_IDirectInputDevice8(ProxyDevice);
 
 		bool isMouse = false;
 
-		if (IsEqualGUID(GUID_SysMouse, rguid) || IsEqualIID(GUID_SysMouseEm, rguid) || IsEqualIID(GUID_SysMouseEm2, rguid))
+		if (IsEqualGUID(GUID_SysMouse, rguid) || IsEqualGUID(GUID_SysMouseEm, rguid) || IsEqualGUID(GUID_SysMouseEm2, rguid))
 		{
 			isMouse = true;
 		}
@@ -89,7 +90,7 @@ HRESULT m_IDirectInput8::CreateDeviceT(T* ProxyInterfaceT, REFGUID rguid, V lplp
 			DIDEVCAPS caps = {};
 			caps.dwSize = sizeof(DIDEVCAPS);
 
-			if (SUCCEEDED(pAddressX->GetCapabilities(&caps)))
+			if (SUCCEEDED(DIDevice->GetCapabilities(&caps)))
 			{
 				if (GET_DIDEVICE_TYPE(caps.dwDevType) == DI8DEVTYPE_MOUSE)
 				{
@@ -100,8 +101,13 @@ HRESULT m_IDirectInput8::CreateDeviceT(T* ProxyInterfaceT, REFGUID rguid, V lplp
 
 		if (isMouse)
 		{
-			pAddressX->SetAsMouse();
+			DIDevice->SetAsMouse();
 		}
+
+		REFGUID riid = std::is_same_v<T, IDirectInput8A> ? IID_IDirectInputDevice8A : IID_IDirectInputDevice8W;
+
+		hr = DIDevice->QueryInterface(riid, reinterpret_cast<LPVOID*>(lplpDirectInputDevice));
+		DIDevice->Release();
 	}
 
 	return hr;
@@ -234,12 +240,35 @@ HRESULT m_IDirectInput8::EnumDevicesBySemanticsT(T* ProxyInterfaceT, V ptszUserN
 
 				if (lpdid)
 				{
-					m_IDirectInputDevice8* WrapperDevice = ProxyAddressLookupTableDinput8.FindAddress<m_IDirectInputDevice8>(lpdid);
-					if (WrapperDevice == nullptr)
+					m_IDirectInputDevice8* DIDevice = ProxyAddressLookupTableDinput8.FindAddress<m_IDirectInputDevice8>(lpdid);
+					if (DIDevice == nullptr)
+					{
+						m_IDirectInputDevice8::proxy_type* ProxyDevice;
+						HRESULT hr = lpdid->QueryInterface(m_IDirectInputDevice8::proxy_iid, reinterpret_cast<LPVOID*>(&ProxyDevice));
+						if (FAILED(hr))
+						{
+							LOG_LIMIT(100, __FUNCTION__ << " Error: could not query interface for: " << m_IDirectInputDevice8::proxy_iid);
+							return DIENUM_CONTINUE;
+						}
+
+						DIDevice = new m_IDirectInputDevice8(ProxyDevice);
+						lpdid->Release();
+
+						REFGUID riid = std::is_same_v<T, IDirectInput8A> ? IID_IDirectInputDevice8A : IID_IDirectInputDevice8W;
+
+						hr = DIDevice->QueryInterface(riid, reinterpret_cast<LPVOID*>(lpdid));
+						DIDevice->Release();
+
+						if (FAILED(hr))
+						{
+							LOG_LIMIT(100, __FUNCTION__ << " Error: failed to get interface for: " << riid);
+							return DIENUM_CONTINUE;
+						}
+					}
+					else
 					{
-						WrapperDevice = new m_IDirectInputDevice8(lpdid);
+						lpdid = DIDevice;
 					}
-					lpdid = WrapperDevice;
 				}
 
 				return self->lpCallback(lpddi, lpdid, dwFlags, dwRemaining, self->pvRef);

dinput8/IDirectInput8.cpp

@@ -55,20 +55,11 @@ class m_IDirectInput8 final : public IDirectInput8A, public IDirectInput8W, Addr
 	inline HRESULT ConfigureDevicesT(T* ProxyInterfaceT, LPDICONFIGUREDEVICESCALLBACK lpdiCallback, V lpdiCDParams, DWORD dwFlags, LPVOID pvRefData);
 
 public:
-	m_IDirectInput8(IUnknown* aOriginal) : AddressLookupTableDinput8Object(aOriginal)
+	m_IDirectInput8(proxy_type* aOriginal) : AddressLookupTableDinput8Object(aOriginal), ProxyInterface(aOriginal)
 	{
-		LOG_LIMIT(3, "Creating interface " << __FUNCTION__ << " (" << this << ")");
-
-		aOriginal->QueryInterface(IID_IDirectInput8A, reinterpret_cast<LPVOID*>(&ProxyInterfaceA));
-		aOriginal->QueryInterface(IID_IDirectInput8W, reinterpret_cast<LPVOID*>(&ProxyInterface));
-		if (aOriginal == ProxyInterface || aOriginal == ProxyInterfaceA)
-		{
-			aOriginal->Release();
-		}
-		else
-		{
-			LOG_LIMIT(3, __FUNCTION__ << " Warning: passed interface does not match either ProxyInterface values!");
-		}
+		LOG_LIMIT(3, "Creating interface " << __FUNCTION__ << "(" << this << ")");
+
+		ProxyInterface->QueryInterface(IID_IDirectInput8A, reinterpret_cast<LPVOID*>(&ProxyInterfaceA));
 	}
 	~m_IDirectInput8()
 	{

dinput8/IDirectInput8.h

@@ -82,20 +82,11 @@ class m_IDirectInputDevice8 final : public IDirectInputDevice8A, public IDirectI
 	inline HRESULT GetImageInfoT(T* ProxyInterfaceT, V lpdiDevImageInfoHeader);
 
 public:
-	m_IDirectInputDevice8(IUnknown* aOriginal) : AddressLookupTableDinput8Object(aOriginal)
+	m_IDirectInputDevice8(proxy_type* aOriginal) : AddressLookupTableDinput8Object(aOriginal), ProxyInterface(aOriginal)
 	{
 		LOG_LIMIT(3, "Creating interface " << __FUNCTION__ << " (" << this << ")");
 
-		aOriginal->QueryInterface(IID_IDirectInputDevice8A, reinterpret_cast<LPVOID*>(&ProxyInterfaceA));
-		aOriginal->QueryInterface(IID_IDirectInputDevice8W, reinterpret_cast<LPVOID*>(&ProxyInterface));
-		if (aOriginal == ProxyInterface || aOriginal == ProxyInterfaceA)
-		{
-			aOriginal->Release();
-		}
-		else
-		{
-			LOG_LIMIT(3, __FUNCTION__ << " Warning: passed interface does not match either ProxyInterface values!");
-		}
+		ProxyInterface->QueryInterface(IID_IDirectInputDevice8A, reinterpret_cast<LPVOID*>(&ProxyInterfaceA));
 
 		ProcessID = GetCurrentProcessId();
 

dinput8/IDirectInputDevice8.h

@@ -48,11 +48,15 @@ HRESULT WINAPI di8_DirectInput8Create(HINSTANCE hinst, DWORD dwVersion, REFIID r
 
 	LOG_LIMIT(3, "Redirecting 'DirectInput8Create' ...");
 
-	HRESULT hr = DirectInput8Create(hinst, dwVersion, m_IDirectInput8::proxy_iid, ppvOut, punkOuter);
+	typename m_IDirectInput8::proxy_type* Proxy;
+	HRESULT hr = DirectInput8Create(hinst, dwVersion, m_IDirectInput8::proxy_iid, reinterpret_cast<LPVOID*>(&Proxy), punkOuter);
 
-	if (SUCCEEDED(hr) && ppvOut)
+	if (SUCCEEDED(hr))
 	{
-		*ppvOut = new m_IDirectInput8((IDirectInput8W*)*ppvOut);
+		m_IDirectInput8* Interface = new m_IDirectInput8(Proxy);
+
+		hr = Interface->QueryInterface(riid, ppvOut);
+		Interface->Release();
 	}
 
 	return hr;