Dynamically load latest version of XInput instead of static linking

include/nil.h

@@ -78,6 +78,7 @@ namespace Nil {
  Logitech::GKeySDK* mLogitechGKeys; //!< External module for Logitech G-Keys
  Logitech::LedSDK* mLogitechLEDs; //!< External module for Logitech LEDs
  SystemListener* mListener; //!< Our single event listener
+ XInput* mXInput; //!< XInput module handler
  const Cooperation mCooperation; //!< Cooperation mode
  void initializeDevices();
  void refreshDevices();
@@ -138,6 +139,8 @@ namespace Nil {
  //! \return null if it fails, else the Logitech LED SDK object.
  Logitech::LedSDK* getLogitechLEDs();
 
+ XInput* getXInput();
+
  //! Query if this System is initializing.
  //! \return true if initializing, false if not.
  const bool isInitializing() const;

include/nilCommon.h

@@ -5,7 +5,6 @@
 #include "nilException.h"
 #include "nilPnP.h"
 #include "nilHID.h"
-#include "nilLogitech.h"
 
 namespace Nil {
 

include/nilLogitech.h

@@ -1,41 +1,8 @@
 #pragma once
-#include "nil.h"
+#include "nilWindows.h"
 
 namespace Nil {
 
- //! \addtogroup Nil
- //! @{
-
- //! \class ExternalModule
- //! Base class for an external, optional module supported by the system.
- class ExternalModule
- {
- protected:
- HMODULE mModule; //!< The module handle
- bool mInitialized; //!< Whether the module is initialized
- public:
- ExternalModule();
-
- //! Possible initialization call return values.
- enum InitReturn: unsigned int {
- Initialization_OK = 0, //!< Module initialized OK
- Initialization_ModuleNotFound, //!< Module was not found
- Initialization_MissingExports, //!< Module was missing expected exports
- Initialization_Unavailable //!< Module was unavailable for use
- };
-
- //! Initializes this ExternalModule.
- virtual InitReturn initialize() = 0;
-
- //! Shuts down this ExternalModule and frees any resources it is using.
- virtual void shutdown() = 0;
-
- //! Query whether the module is initialized or not.
- virtual bool isInitialized() const;
- };
-
- //! @}
-
  namespace Logitech {
 
  // Logitech G-Key SDK (1.02.004) implementation

include/nilWindows.h

@@ -5,7 +5,7 @@
 #include "nilException.h"
 #include "nilPnP.h"
 #include "nilHID.h"
-#include "nilLogitech.h"
+#include "nilCommon.h"
 
 namespace Nil {
 
@@ -19,6 +19,34 @@ namespace Nil {
  class Keyboard;
  class Controller;
 
+ //! \class ExternalModule
+ //! Base class for an external, optional module supported by the system.
+ class ExternalModule
+ {
+ protected:
+ HMODULE mModule; //!< The module handle
+ bool mInitialized; //!< Whether the module is initialized
+ public:
+ ExternalModule();
+
+ //! Possible initialization call return values.
+ enum InitReturn: unsigned int {
+ Initialization_OK = 0, //!< Module initialized OK
+ Initialization_ModuleNotFound, //!< Module was not found
+ Initialization_MissingExports, //!< Module was missing expected exports
+ Initialization_Unavailable //!< Module was unavailable for use
+ };
+
+ //! Initializes this ExternalModule.
+ virtual InitReturn initialize() = 0;
+
+ //! Shuts down this ExternalModule and frees any resources it is using.
+ virtual void shutdown() = 0;
+
+ //! Query whether the module is initialized or not.
+ virtual bool isInitialized() const;
+ };
+
  class RawInputDeviceInfo
  {
  protected:
@@ -79,6 +107,33 @@ namespace Nil {
  virtual const GUID getInstanceID() const;
  };
 
+ typedef DWORD( WINAPI *fnXInputGetState )( DWORD dwUserIndex, XINPUT_STATE* pState );
+ typedef DWORD( WINAPI *fnXInputSetState )( DWORD dwUserIndex, XINPUT_VIBRATION* pVibration );
+ typedef DWORD( WINAPI *fnXInputGetCapabilities )( DWORD dwUserIndex, DWORD dwFlags, XINPUT_CAPABILITIES* pCapabilities );
+
+ //! \class XInput
+ //! XInput dynamic module loader.
+ //! \sa ExternalModule
+ class XInput: public ExternalModule {
+ public:
+ enum Version {
+ Version_None = 0,
+ Version_910,
+ Version_13,
+ Version_14
+ } mVersion;
+ struct Functions {
+ fnXInputGetState pfnXInputGetState;
+ fnXInputSetState pfnXInputSetState;
+ fnXInputGetCapabilities pfnXInputGetCapabilities;
+ Functions();
+ } mFunctions;
+ XInput();
+ virtual InitReturn initialize();
+ virtual void shutdown();
+ ~XInput();
+ };
+
  //! \class XInputDevice
  //! Device abstraction base class for XInput devices.
  //! \sa Device

nil.vcxproj

@@ -187,6 +187,7 @@
  <ClCompile Include="src\System.cpp" />
  <ClCompile Include="src\Types.cpp" />
  <ClCompile Include="src\Utilities.cpp" />
+ <ClCompile Include="src\XInput.cpp" />
  <ClCompile Include="src\XInputController.cpp" />
  <ClCompile Include="src\XInputDevice.cpp" />
  </ItemGroup>

nil.vcxproj.filters

@@ -131,5 +131,8 @@
  <ClCompile Include="src\LogitechGkeySDK.cpp">
  <Filter>Source Files\Windows\Logitech</Filter>
  </ClCompile>
+ <ClCompile Include="src\XInput.cpp">
+ <Filter>Source Files\Windows</Filter>
+ </ClCompile>
  </ItemGroup>
 </Project>

src/ExternalModule.cpp

@@ -1,5 +1,5 @@
 #include "nil.h"
-#include "nilLogitech.h"
+#include "nilWindows.h"
 
 namespace Nil {
 

src/System.cpp

@@ -10,7 +10,7 @@ namespace Nil {
  mMonitor( nullptr ), mIDPool( 0 ), mInitializing( true ),
  mHIDManager( nullptr ), mLogitechGKeys( nullptr ), mLogitechLEDs( nullptr ),
  mListener( listener ), mMouseIndexPool( 0 ), mKeyboardIndexPool( 0 ),
- mControllerIndexPool( 0 )
+ mControllerIndexPool( 0 ), mXInput( nullptr )
  {
  assert( mListener );
 
@@ -21,6 +21,10 @@ namespace Nil {
  mLogitechGKeys = new Logitech::GKeySDK();
  mLogitechLEDs = new Logitech::LedSDK();
 
+ mXInput = new XInput();
+ if ( mXInput->initialize() != ExternalModule::Initialization_OK )
+ NIL_EXCEPT( "Loading XInput failed" );
+
  // Create DirectInput instance
  auto hr = DirectInput8Create( mInstance, DIRECTINPUT_VERSION,
  IID_IDirectInput8W, (LPVOID*)&mDirectInput, NULL );
@@ -203,7 +207,7 @@ namespace Nil {
  if ( device->getHandler() == Device::Handler_XInput )
  {
  auto xDevice = static_cast<XInputDevice*>( device );
- auto status = XInputGetState( xDevice->getXInputID(), &state );
+ auto status = mXInput->mFunctions.pfnXInputGetState( xDevice->getXInputID(), &state );
  if ( status == ERROR_DEVICE_NOT_CONNECTED )
  {
  if ( xDevice->getStatus() == Device::Status_Connected )
@@ -366,6 +370,11 @@ namespace Nil {
  return mLogitechLEDs;
  }
 
+ XInput* System::getXInput()
+ {
+ return mXInput;
+ }
+
  System::~System()
  {
  for ( Device* device : mDevices )

src/XInput.cpp

@@ -0,0 +1,67 @@
+#include "nil.h"
+#include "nilUtil.h"
+#include "nilWindows.h"
+
+# define NIL_LOAD_EXTERNAL_FUNC(x) mFunctions.pfn##x##=(fn##x##)GetProcAddress(mModule,#x)
+
+namespace Nil {
+
+ XInput::Functions::Functions(): pfnXInputGetState( nullptr ),
+ pfnXInputSetState( nullptr ), pfnXInputGetCapabilities( nullptr )
+ {
+ }
+
+ XInput::XInput(): mVersion( Version_None )
+ {
+ }
+
+ XInput::InitReturn XInput::initialize()
+ {
+ mModule = LoadLibraryW( L"xinput1_4.dll" );
+ if ( mModule )
+ mVersion = Version_14;
+ else
+ {
+ mModule = LoadLibraryW( L"xinput1_3.dll" );
+ if ( mModule )
+ mVersion = Version_13;
+ else
+ {
+ mModule = LoadLibraryW( L"xinput9_1_0.dll" );
+ if ( mModule )
+ mVersion = Version_910;
+ else
+ return Initialization_ModuleNotFound;
+ }
+ }
+
+ NIL_LOAD_EXTERNAL_FUNC( XInputGetState );
+ NIL_LOAD_EXTERNAL_FUNC( XInputSetState );
+ NIL_LOAD_EXTERNAL_FUNC( XInputGetCapabilities );
+
+ if ( !mFunctions.pfnXInputGetState
+ || !mFunctions.pfnXInputSetState
+ || !mFunctions.pfnXInputGetCapabilities )
+ return Initialization_MissingExports;
+
+ mInitialized = true;
+
+ return Initialization_OK;
+ }
+
+ void XInput::shutdown()
+ {
+ if ( mModule )
+ {
+ FreeLibrary( mModule );
+ mModule = NULL;
+ }
+ mInitialized = false;
+ }
+
+ XInput::~XInput()
+ {
+ shutdown();
+ }
+
+}

src/XInputController.cpp

@@ -95,7 +95,7 @@ namespace Nil {
  {
  XInputDevice* xDevice = dynamic_cast<XInputDevice*>( mDevice );
 
- DWORD ret = XInputGetState( xDevice->getXInputID(), &mXInputState );
+ DWORD ret = mSystem->getXInput()->mFunctions.pfnXInputGetState( xDevice->getXInputID(), &mXInputState );
  if ( ret == ERROR_DEVICE_NOT_CONNECTED )
  {
  xDevice->flagDisconnected();

src/XInputDevice.cpp

@@ -38,7 +38,7 @@ namespace Nil {
 
  void XInputDevice::identify()
  {
- if ( XInputGetCapabilities( mXInputID, 0, &mCapabilities ) != ERROR_SUCCESS )
+ if ( mSystem->getXInput()->mFunctions.pfnXInputGetCapabilities( mXInputID, 0, &mCapabilities ) != ERROR_SUCCESS )
  return;
 
  for ( int i = 0; i < cMaxXInputModels; i++ ) {