Merge of force feedback branch r4039.

configure.in

@@ -2330,6 +2330,7 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
             if test x$have_dinput = xyes; then
                 AC_DEFINE(SDL_JOYSTICK_DINPUT)
                 SOURCES="$SOURCES $srcdir/src/joystick/win32/SDL_dxjoystick.c"
+                EXTRA_LDFLAGS="$EXTRA_LDFLAGS -ldinput8 -ldxguid -ldxerr8 -lole32"
             else
                 AC_DEFINE(SDL_JOYSTICK_WINMM)
                 SOURCES="$SOURCES $srcdir/src/joystick/win32/SDL_mmjoystick.c"

src/haptic/win32/SDL_syshaptic.c

@@ -34,11 +34,11 @@
 
 #define DIRECTINPUT_VERSION 0x0700      /* Need at least DirectX 7 for dwStartDelay */
 #include <dinput.h>
-#include <dxerr.h>
+#include <dxerr8.h>
 #ifdef _MSC_VER
 #  pragma comment (lib, "dinput8.lib")
 #  pragma comment (lib, "dxguid.lib")
-#  pragma comment (lib, "dxerr.lib")
+#  pragma comment (lib, "dxerr8.lib")
 #endif /* _MSC_VER */
 
     /* an ISO hack for VisualC++ */
@@ -123,7 +123,7 @@ static void
 DI_SetError(const char *str, HRESULT err)
 {
     SDL_SetError("Haptic: %s - %s: %s", str,
-                 DXGetErrorString(err), DXGetErrorDescription(err));
+                 DXGetErrorString8A(err), DXGetErrorDescription8A(err));
 }
 
 

src/joystick/win32/SDL_dxjoystick.c

@@ -85,7 +85,7 @@ static void
 SetDIerror(const char *function, HRESULT code)
 {
     SDL_SetError("%s() [%s]: %s", function,
-                 DXGetErrorString(code), DXGetErrorDescription(code));
+                 DXGetErrorString8A(code), DXGetErrorDescription8A(code));
 }
 
 

src/joystick/win32/SDL_dxjoystick_c.h

@@ -42,9 +42,9 @@
     /* Used for the c_dfDIJoystick2 symbol (no imports are used) */
 #   pragma comment (lib, "dinput.lib")
 #endif
-#include <dxerr.h>
+#include <dxerr8.h>
 #ifdef _MSC_VER
-#   pragma comment (lib, "dxerr.lib")
+#   pragma comment (lib, "dxerr8.lib")
 #endif