Mercurial > sdl-ios-xcode

diff src/joystick/win32/SDL_dxjoystick.c @ 2623:6deba05725ac gsoc2008_force_feedback
This should hopefully allow initailizing the joystick/haptic subsystems without calling SetVideoMode first.
author: Edgar Simo <bobbens@gmail.com>
date: Wed, 06 Aug 2008 09:52:51 +0000
parents: acd5da848404
children: 9bad8efcb75e
--- a/src/joystick/win32/SDL_dxjoystick.c	Wed Aug 06 09:35:09 2008 +0000
+++ b/src/joystick/win32/SDL_dxjoystick.c	Wed Aug 06 09:52:51 2008 +0000
@@ -52,7 +52,6 @@
 #define JOY_AXIS_THRESHOLD	(((AXIS_MAX)-(AXIS_MIN))/100)   /* 1% motion */
 
 /* external variables referenced. */
-extern HINSTANCE SDL_Instance;
 extern HWND SDL_HelperWindow;
 
 
@@ -117,8 +116,13 @@
     }
 
     /* Because we used CoCreateInstance, we need to Initialize it, first. */
+    instance = GetModuleHandle(NULL);
+    if (instance == NULL) {
+        SDL_SetError("GetModuleHandle() failed with error code %d.", GetLastError());
+        return (-1);
+    }
     result =
-        IDirectInput_Initialize(dinput, SDL_Instance, DIRECTINPUT_VERSION);
+        IDirectInput_Initialize(dinput, instance, DIRECTINPUT_VERSION);
 
     if (FAILED(result)) {
         SetDIerror("IDirectInput::Initialize", result);