Added code to dynamically link with vJoy; DirectInput support. Static options are available with the preprocessor.

Author: Sonickidnextgen

IOSync/IOSync.vcxproj

@@ -32,6 +32,7 @@
     <ClCompile Include="src\devices\gamepad.cpp" />
     <ClCompile Include="src\devices\keyboard.cpp" />
     <ClCompile Include="src\devices\native\winnt\Real_XInput_Wrapper.cpp" />
+    <ClCompile Include="src\devices\native\winnt\vJoyDriver.cpp" />
     <ClCompile Include="src\exceptions.cpp" />
     <ClCompile Include="src\iosync.cpp" />
     <ClCompile Include="src\main.cpp" />

IOSync/IOSync.vcxproj.filters

@@ -96,6 +96,9 @@
     <ClCompile Include="src\devices\native\winnt\Real_XInput_Wrapper.cpp">
       <Filter>Source Files\devices\native\winnt</Filter>
     </ClCompile>
+    <ClCompile Include="src\devices\native\winnt\vJoyDriver.cpp">
+      <Filter>Source Files\devices\native\winnt</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\networking\address.h">

IOSync/Info.props

@@ -2,7 +2,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros">
-    <IOSync_Version>1.0.2</IOSync_Version>
+    <IOSync_Version>1.0.3</IOSync_Version>
   </PropertyGroup>
   <PropertyGroup />
   <ItemDefinitionGroup />

IOSync/src/devices/gamepad.cpp

@@ -180,42 +180,19 @@ namespace iosync
 			#ifdef GAMEPAD_VJOY_ENABLED
 				vJoy::vJoyDriver::vJoyDriverState gamepad::__winnt__vJoy__init()
 				{
-					// Namespace(s):
-					using namespace vJoy;
-
-					vJoyInfo.state = ((vJoyEnabled() == TRUE) ? vJoyDriver::VJOY_ENABLED : vJoyDriver::VJOY_DISABLED);
-
-					if (vJoyInfo.state == vJoyDriver::VJOY_ENABLED)
-					{
-						WORD DLLVer, driverVer;
-
-						if (!DriverMatch(&DLLVer, &driverVer))
-						{
-							vJoyInfo.state = vJoyDriver::VJOY_DISABLED;
-						}
-					}
-
-					return vJoyInfo.state;
+					// Call the main implementation. (Shared "driver" object)
+					return vJoyInfo.init();
 				}
 
 				vJoy::vJoyDriver::vJoyDriverState gamepad::__winnt__vJoy__deinit()
 				{
-					// Namespace(s):
-					using namespace vJoy;
-
-					if (vJoyInfo.state == vJoyDriver::VJOY_ENABLED)
-					{
-						// Nothing so far.
-
-						vJoyInfo.state = vJoyDriver::VJOY_DISABLED;
-					}
-
-					return vJoyInfo.state;
+					// Call the main implementation. (Shared "driver" object)
+					return vJoyInfo.deinit();
 				}
 
 				VjdStat gamepad::__winnt__vJoy__getStatus(const gamepadID internal_identifier)
 				{
-					return GetVJDStatus(__winnt__vJoy__vDevice(internal_identifier));
+					return vJoy::REAL_VJOY::GetVJDStatus(__winnt__vJoy__vDevice(internal_identifier));
 				}
 
 				LONG gamepad::__winnt__vJoy__capAxis(const UINT vJoyID, const LONG value, const UINT axis, const UINT maximum_value)
@@ -359,7 +336,7 @@ namespace iosync
 					//cout << "vState.lButtons: "  << vState.lButtons << endl;
 
 					// Update the vJoy-device.
-					UpdateVJD(vJoyID, &vState);
+					vJoy::REAL_VJOY::UpdateVJD(vJoyID, &vState);
 
 					return;
 				}

IOSync/src/devices/gamepad.h

@@ -14,24 +14,11 @@
 
 // Includes:
 #include "../platform.h"
-
-// The 'GAMEPAD_VJOY_ENABLED' preprocessor-variable should
-// only ever be defined when 'PLATFORM_WINDOWS' is defined.
-// Any other behavior should be considered non-standard.
-#ifdef PLATFORM_WINDOWS
-	// Disable this if needed; toggles optional vJoy support.
-	#define GAMEPAD_VJOY_ENABLED
-
-	#ifdef GAMEPAD_VJOY_ENABLED
-		#define GAMEPAD_VJOY_SAFE
-	#endif
-#endif
-
 #include "../names.h"
 
 #include "devices.h"
 
-#ifdef GAMEPAD_VJOY_ENABLED
+#ifdef PLATFORM_WINDOWS
 	// vJoy functionality.
 	#include "native/winnt/vJoyDriver.h"
 #endif
@@ -60,10 +47,6 @@
 	//#pragma comment(lib, "Xinput.lib")
 #endif
 
-#ifdef GAMEPAD_VJOY_ENABLED
-	#pragma comment(lib, "VJOYINTERFACE")
-#endif
-
 // Namespace(s):
 namespace iosync
 {
@@ -157,7 +140,7 @@ namespace iosync
 		struct gamepadState
 		{
 			// Constant variable(s):
-			#ifdef PLATFORM_WINDOWS
+			#ifdef GAMEPAD_VJOY_ENABLED
 				static const DWORD padMask = (XINPUT_GAMEPAD_DPAD_UP|XINPUT_GAMEPAD_DPAD_DOWN|XINPUT_GAMEPAD_DPAD_LEFT|XINPUT_GAMEPAD_DPAD_RIGHT);
 				static const DWORD faceMask = (XINPUT_GAMEPAD_A|XINPUT_GAMEPAD_B|XINPUT_GAMEPAD_X|XINPUT_GAMEPAD_Y);
 			#endif

IOSync/src/devices/native/winnt/Real_XInput_Wrapper.cpp

@@ -29,14 +29,14 @@
 namespace REAL_XINPUT
 {
 	// Typedefs:
-	typedef decltype(&XInputEnable) _XInputEnable_t;
-	typedef decltype(&XInputSetState) _XInputSetState_t;
-	typedef decltype(&XInputGetState) _XInputGetState_t;
-	typedef decltype(&XInputGetCapabilities) _XInputGetCapabilities_t;
-	typedef decltype(&XInputGetBatteryInformation) _XInputGetBatteryInformation_t;
-	typedef decltype(&XInputGetKeystroke) _XInputGetKeystroke_t;
-	typedef decltype(&XInputGetAudioDeviceIds) _XInputGetAudioDeviceIds_t;
-	typedef decltype(&XInputGetState) _XInputGetStateEx_t; // XInputGetStateEx
+	typedef decltype(&::XInputEnable) _XInputEnable_t;
+	typedef decltype(&::XInputSetState) _XInputSetState_t;
+	typedef decltype(&::XInputGetState) _XInputGetState_t;
+	typedef decltype(&::XInputGetCapabilities) _XInputGetCapabilities_t;
+	typedef decltype(&::XInputGetBatteryInformation) _XInputGetBatteryInformation_t;
+	typedef decltype(&::XInputGetKeystroke) _XInputGetKeystroke_t;
+	typedef decltype(&::XInputGetAudioDeviceIds) _XInputGetAudioDeviceIds_t;
+	typedef decltype(&::XInputGetState) _XInputGetStateEx_t; // XInputGetStateEx
 
 	_XInputEnable_t _XInputEnable;
 	_XInputSetState_t _XInputSetState;
@@ -80,6 +80,22 @@ namespace REAL_XINPUT
 		return response;
 	}
 
+	BOOL restoreFunctions()
+	{
+		// Set every function-pointer back to 'nullptr':
+		_XInputEnable = nullptr;
+		_XInputSetState = nullptr;
+		_XInputGetState = nullptr;
+		_XInputGetCapabilities = nullptr;
+		_XInputGetBatteryInformation = nullptr;
+		_XInputGetKeystroke = nullptr;
+		_XInputGetAudioDeviceIds = nullptr;
+		_XInputGetStateEx = nullptr;
+
+		// Return the default response.
+		return TRUE;
+	}
+
 	VOID linkTo(HMODULE hDLL)
 	{
 		using namespace process;

IOSync/src/devices/native/winnt/Real_XInput_Wrapper.h

@@ -47,6 +47,9 @@ namespace REAL_XINPUT
 
 	process::jumpSegment mapRemoteFunction(LPCSTR name, LPCVOID function, HMODULE hDLL);
 
+	// This command restores the internal function-pointers to their original state.
+	BOOL restoreFunctions();
+
 	VOID linkTo(HMODULE hDLL);
 
 	// The 'resolveSystemPath' argument specifies if this routine