src/haptic/win32/SDL_syshaptic.c
branchgsoc2008_force_feedback
changeset 2623 6deba05725ac
parent 2621 83659de20bf2
child 2626 53dd30491c71
--- a/src/haptic/win32/SDL_syshaptic.c	Wed Aug 06 09:35:09 2008 +0000
+++ b/src/haptic/win32/SDL_syshaptic.c	Wed Aug 06 09:52:51 2008 +0000
@@ -91,7 +91,6 @@
 /*
  * External stuff.
  */
-extern HINSTANCE SDL_Instance;
 extern HWND SDL_HelperWindow;
 
 
@@ -146,6 +145,7 @@
 SDL_SYS_HapticInit(void)
 {
    HRESULT ret;
+   HINSTANCE instance;
 
    if (dinput != NULL) { /* Already open. */
       SDL_SetError("Haptic: SubSystem already open.");
@@ -171,7 +171,12 @@
    }
 
    /* Because we used CoCreateInstance, we need to Initialize it, first. */
-   ret = IDirectInput_Initialize(dinput, SDL_Instance, DIRECTINPUT_VERSION);
+   instance = GetModuleHandle(NULL);
+   if (instance == NULL) {
+      SDL_SetError("GetModuleHandle() failed with error code %d.", GetLastError());
+      return -1;
+   }
+   ret = IDirectInput_Initialize(dinput, instance, DIRECTINPUT_VERSION);
    if (FAILED(ret)) {
       DI_SetError("Initializing DirectInput device",ret);
       return -1;