Fix some variables

elishacloud · Apr 27, 2019 · 7fe84db · 7fe84db
1 parent 5e6daa9
commit 7fe84db
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 17 deletions.
diff --git a/BuildNo.rc b/BuildNo.rc
@@ -1 +1 @@
-#define BUILD_NUMBER 22 
+#define BUILD_NUMBER 23 
diff --git a/IDirectInputEnum.cpp b/IDirectInputEnum.cpp
@@ -16,36 +16,36 @@
 
 #include "dinputto8.h"
 
-BOOL CALLBACK m_IDirectInputEnumEffect::EnumEffectCallback(LPDIRECTINPUTEFFECT a, LPVOID pvRef)
+BOOL CALLBACK m_IDirectInputEnumEffect::EnumEffectCallback(LPDIRECTINPUTEFFECT pdeff, LPVOID pvRef)
 {
 	ENUMEFFECT *lpCallbackContext = (ENUMEFFECT*)pvRef;
 
-	if (a)
+	if (pdeff)
 	{
-		a = ProxyAddressLookupTable.FindAddress<m_IDirectInputEffect>(a);
+		pdeff = ProxyAddressLookupTable.FindAddress<m_IDirectInputEffect>(pdeff);
 	}
 
-	return lpCallbackContext->lpCallback(a, lpCallbackContext->pvRef);
+	return lpCallbackContext->lpCallback(pdeff, lpCallbackContext->pvRef);
 }
 
-BOOL CALLBACK m_IDirectInputEnumDevice::EnumDeviceCallbackA(LPCDIDEVICEINSTANCEA a, LPVOID pvRef)
+BOOL CALLBACK m_IDirectInputEnumDevice::EnumDeviceCallbackA(LPCDIDEVICEINSTANCEA lpddi, LPVOID pvRef)
 {
 	ENUMDEVICE *lpCallbackContext = (ENUMDEVICE*)pvRef;
 
 	DIDEVICEINSTANCEA DI;
-	CopyMemory(&DI, a, a->dwSize);
-	DI.dwDevType = ConvertDevTypeTo7(GET_DIDEVICE_TYPE(a->dwDevType));
+	CopyMemory(&DI, lpddi, lpddi->dwSize);
+	DI.dwDevType = ConvertDevTypeTo7(GET_DIDEVICE_TYPE(lpddi->dwDevType));
 
 	return ((LPDIENUMDEVICESCALLBACKA)lpCallbackContext->lpCallback)(&DI, lpCallbackContext->pvRef);
 }
 
-BOOL CALLBACK m_IDirectInputEnumDevice::EnumDeviceCallbackW(LPCDIDEVICEINSTANCEW a, LPVOID pvRef)
+BOOL CALLBACK m_IDirectInputEnumDevice::EnumDeviceCallbackW(LPCDIDEVICEINSTANCEW lpddi, LPVOID pvRef)
 {
 	ENUMDEVICE *lpCallbackContext = (ENUMDEVICE*)pvRef;
 
 	DIDEVICEINSTANCEW DI;
-	CopyMemory(&DI, a, a->dwSize);
-	DI.dwDevType = ConvertDevTypeTo7(GET_DIDEVICE_TYPE(a->dwDevType));
+	CopyMemory(&DI, lpddi, lpddi->dwSize);
+	DI.dwDevType = ConvertDevTypeTo7(GET_DIDEVICE_TYPE(lpddi->dwDevType));
 
 	return ((LPDIENUMDEVICESCALLBACKW)lpCallbackContext->lpCallback)(&DI, lpCallbackContext->pvRef);
 }
diff --git a/InterfaceQuery.cpp b/InterfaceQuery.cpp
@@ -62,12 +62,7 @@ REFIID dinputto8::ConvertREFIID(REFIID riid)
 
 HRESULT dinputto8::ProxyQueryInterface(LPVOID ProxyInterface, REFIID riid, LPVOID * ppvObj, REFIID WrapperID, LPVOID WrapperInterface)
 {
-	if (!ppvObj)
-	{
-		return DIERR_GENERIC;
-	}
-
-	if (riid == WrapperID || riid == IID_IUnknown)
+	if ((riid == WrapperID || riid == IID_IUnknown) && ppvObj)
 	{
 		((IUnknown*)ProxyInterface)->AddRef();