Clean up a couple of DirectInput8 things

Author: elishacloud

Dllmain/BuildNo.rc

@@ -1 +1 @@
-#define BUILD_NUMBER 8073 
+#define BUILD_NUMBER 8074 

dinput8/IDirectInput8.cpp

@@ -91,12 +91,7 @@ HRESULT m_IDirectInput8::EnumDevicesT(DWORD dwDevType, V lpCallback, LPVOID pvRe
 {
 	Logging::LogDebug() << __FUNCTION__ << " (" << this << ")";
 
-	if (!lpCallback)
-	{
-		return DIERR_INVALIDPARAM;
-	}
-
-	if (Config.DeviceLookupCacheTime)
+	if (Config.DeviceLookupCacheTime && lpCallback)
 	{
 		auto now = std::chrono::steady_clock::now();
 		auto& cachedData = GetEnumCache(GetProxyInterface<T>());
@@ -203,34 +198,34 @@ HRESULT m_IDirectInput8::EnumDevicesBySemanticsT(V ptszUserName, W lpdiActionFor
 {
 	Logging::LogDebug() << __FUNCTION__ << " (" << this << ")";
 
-	if (!lpCallback)
+	if (lpCallback)
 	{
-		return DIERR_INVALIDPARAM;
-	}
-
-	struct EnumDevice
-	{
-		LPVOID pvRef = nullptr;
-		X lpCallback = nullptr;
-		GUID WrapperDeviceID = {};
-
-		static BOOL CALLBACK EnumDeviceCallback(C lpddi, D lpdid, DWORD dwFlags, DWORD dwRemaining, LPVOID pvRef)
+		struct EnumDevice
 		{
-			EnumDevice *self = (EnumDevice*)pvRef;
+			LPVOID pvRef = nullptr;
+			X lpCallback = nullptr;
+			GUID WrapperDeviceID = {};
 
-			if (lpdid)
+			static BOOL CALLBACK EnumDeviceCallback(C lpddi, D lpdid, DWORD dwFlags, DWORD dwRemaining, LPVOID pvRef)
 			{
-				lpdid = ProxyAddressLookupTableDinput8.FindAddress<m_IDirectInputDevice8>(lpdid, self->WrapperDeviceID);
+				EnumDevice* self = (EnumDevice*)pvRef;
+
+				if (lpdid)
+				{
+					lpdid = ProxyAddressLookupTableDinput8.FindAddress<m_IDirectInputDevice8>(lpdid, self->WrapperDeviceID);
+				}
+
+				return self->lpCallback(lpddi, lpdid, dwFlags, dwRemaining, self->pvRef);
 			}
+		} CallbackContext;
+		CallbackContext.pvRef = pvRef;
+		CallbackContext.lpCallback = lpCallback;
+		CallbackContext.WrapperDeviceID = WrapperDeviceID;
 
-			return self->lpCallback(lpddi, lpdid, dwFlags, dwRemaining, self->pvRef);
-		}
-	} CallbackContext;
-	CallbackContext.pvRef = pvRef;
-	CallbackContext.lpCallback = lpCallback;
-	CallbackContext.WrapperDeviceID = WrapperDeviceID;
+		return GetProxyInterface<T>()->EnumDevicesBySemantics(ptszUserName, lpdiActionFormat, EnumDevice::EnumDeviceCallback, &CallbackContext, dwFlags);
+	}
 
-	return GetProxyInterface<T>()->EnumDevicesBySemantics(ptszUserName, lpdiActionFormat, EnumDevice::EnumDeviceCallback, &CallbackContext, dwFlags);
+	return GetProxyInterface<T>()->EnumDevicesBySemantics(ptszUserName, lpdiActionFormat, lpCallback, pvRef, dwFlags);
 }
 
 template HRESULT m_IDirectInput8::ConfigureDevicesT<IDirectInput8A, LPDICONFIGUREDEVICESPARAMSA>(LPDICONFIGUREDEVICESCALLBACK, LPDICONFIGUREDEVICESPARAMSA, DWORD, LPVOID);

dinput8/IDirectInput8.h

@@ -16,7 +16,8 @@ class m_IDirectInput8 : public IDirectInput8A, public IDirectInput8W, public Add
 	template <class T, class V>
 	struct CachedDeviceDataT
 	{
-		std::chrono::steady_clock::time_point lastUpdate = std::chrono::steady_clock::now();
+		std::chrono::steady_clock::time_point lastUpdate = std::chrono::steady_clock::now() -
+			std::chrono::seconds(Config.DeviceLookupCacheTime ? Config.DeviceLookupCacheTime - 1 : 0);
 		DWORD dwDevType = (DWORD)-1;
 		DWORD dwFlags = (DWORD)-1;
 		std::vector<T> devices;

dinput8/IDirectInputDevice8.cpp

@@ -141,12 +141,13 @@ HRESULT m_IDirectInputDevice8::GetDeviceState(DWORD cbData, LPVOID lpvData)
 HRESULT m_IDirectInputDevice8::GetMouseDeviceData(DWORD cbObjectData, LPDIDEVICEOBJECTDATA rgdod, LPDWORD pdwInOut, DWORD dwFlags)
 {
 	// Check arguments
-	if (!pdwInOut || (rgdod && cbObjectData != sizeof(DIDEVICEOBJECTDATA) && cbObjectData != sizeof(DIDEVICEOBJECTDATA_DX3)))
+	if (!pdwInOut)
 	{
-		if (pdwInOut)
-		{
-			*pdwInOut = 0;
-		}
+		return DIERR_INVALIDPARAM;
+	}
+	if (rgdod && cbObjectData != sizeof(DIDEVICEOBJECTDATA) && cbObjectData != sizeof(DIDEVICEOBJECTDATA_DX3))
+	{
+		*pdwInOut = 0;
 		return DIERR_INVALIDPARAM;
 	}
 	bool isPeek = (dwFlags == DIGDD_PEEK);
@@ -349,7 +350,7 @@ HRESULT m_IDirectInputDevice8::GetDeviceData(DWORD cbObjectData, LPDIDEVICEOBJEC
 		}
 	}
 
-	if (IsMouse && Config.FixHighFrequencyMouse)
+	if (Config.FixHighFrequencyMouse && IsMouse && pdwInOut)
 	{
 		return GetMouseDeviceData(cbObjectData, rgdod, pdwInOut, dwFlags);
 	}