Update to make easier integration into dxwrapper

Author: elishacloud

BuildNo.rc

@@ -1 +1 @@
-#define BUILD_NUMBER 53 
+#define BUILD_NUMBER 54 

IDirectInputDeviceX.cpp

@@ -44,7 +44,7 @@ static auto FindByDITypeAndInstance(T& collection, DWORD dwType)
 
 void m_IDirectInputDeviceX::InitializeEnumObjectData()
 {
-	DIDEVICEINSTANCE didi { sizeof(didi) };
+	DIDEVICEINSTANCEW didi { sizeof(didi) };
 	if (SUCCEEDED(ProxyInterface->GetDeviceInfo(&didi)))
 	{
 		DevType7 = ConvertDevTypeTo7(GET_DIDEVICE_TYPE(didi.dwDevType));

InterfaceQuery.cpp

@@ -108,3 +108,40 @@ void WINAPI dinputto8::genericQueryInterface(REFIID riid, LPVOID * ppvObj)
 	QUERYINTERFACE(IDirectInputDevice7W);
 	QUERYINTERFACE(IDirectInputEffect);
 }
+
+HRESULT dinputto8::hresValidInstanceAndVersion(HINSTANCE& hinst, DWORD dwVersion)
+{
+	bool bValidInstance;
+	if (hinst != nullptr)
+	{
+		wchar_t path[4];
+		bValidInstance = GetModuleFileNameW(hinst, path, std::size(path) - 1) != 0;
+	}
+	else
+	{
+		// DInput version 0x300 permits no instance...
+		bValidInstance = dwVersion == 0x300;
+	}
+
+	if (!bValidInstance)
+	{
+		return DIERR_INVALIDPARAM;
+	}
+
+	// ...but DInput8 does not, so if the instance is empty, give it one or else it'll fail.
+	if (hinst == nullptr && dwVersion == 0x300)
+	{
+		hinst = ::GetModuleHandle(nullptr);
+	}
+
+	if (dwVersion == 0x300 || dwVersion == 0x500 || dwVersion == 0x50A || dwVersion == 0x5B2 || dwVersion == 0x602 || dwVersion == 0x61A || dwVersion == 0x700)
+	{
+		return DI_OK;
+	}
+
+	if (dwVersion == 0)
+	{
+		return DIERR_NOTINITIALIZED;
+	}
+	return dwVersion < 0x700 ? DIERR_BETADIRECTINPUTVERSION : DIERR_OLDDIRECTINPUTVERSION;
+}

dinputto8.cpp

@@ -173,40 +173,3 @@ HRESULT WINAPI DllUnregisterServer()
 
 	return m_pDllUnregisterServer();
 }
-
-HRESULT dinputto8::hresValidInstanceAndVersion(HINSTANCE& hinst, DWORD dwVersion)
-{
-	bool bValidInstance;
-	if (hinst != nullptr)
-	{
-		wchar_t path[4];
-		bValidInstance = GetModuleFileNameW(hinst, path, std::size(path) - 1) != 0;
-	}
-	else
-	{
-		// DInput version 0x300 permits no instance...
-		bValidInstance = dwVersion == 0x300;
-	}
-
-	if (!bValidInstance)
-	{
-		return DIERR_INVALIDPARAM;
-	}
-
-	// ...but DInput8 does not, so if the instance is empty, give it one or else it'll fail.
-	if (hinst == nullptr && dwVersion == 0x300)
-	{
-		hinst = ::GetModuleHandle(nullptr);
-	}
-
-	if (dwVersion == 0x300 || dwVersion == 0x500 || dwVersion == 0x50A || dwVersion == 0x5B2 || dwVersion == 0x602 || dwVersion == 0x61A || dwVersion == 0x700)
-	{
-		return DI_OK;
-	}
-
-	if (dwVersion == 0)
-	{
-		return DIERR_NOTINITIALIZED;
-	}
-	return dwVersion < 0x700 ? DIERR_BETADIRECTINPUTVERSION : DIERR_OLDDIRECTINPUTVERSION;
-}