dinput: Remove unneeded casts

Andrew Talbot andrew.talbot at talbotville.com
Thu Dec 6 14:58:42 CST 2007


Changelog:
    dinput: Remove unneeded casts.

diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c
index 68f61ec..5127aa9 100644
--- a/dlls/dinput/device.c
+++ b/dlls/dinput/device.c
@@ -319,7 +319,7 @@ void fill_DataFormat(void *out, const void *in, const DataFormat *df) {
 		    case 4:
 			TRACE("Copying (i) to %d default value %d\n",
 			      df->dt[i].offset_out, df->dt[i].value);
-			*((int *) (out_c + df->dt[i].offset_out)) = (int) df->dt[i].value;
+			*((int *) (out_c + df->dt[i].offset_out)) = df->dt[i].value;
 			break;
 			
 		    default:
diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c
index 15f3cda..2e12bc1 100644
--- a/dlls/dinput/dinput_main.c
+++ b/dlls/dinput/dinput_main.c
@@ -55,17 +55,17 @@ static const IDirectInput8WVtbl ddi8wvt;
 
 static inline IDirectInputImpl *impl_from_IDirectInput7W( IDirectInput7W *iface )
 {
-    return (IDirectInputImpl *)CONTAINING_RECORD( iface, IDirectInputImpl, lpVtbl7w );
+    return CONTAINING_RECORD( iface, IDirectInputImpl, lpVtbl7w );
 }
 
 static inline IDirectInputImpl *impl_from_IDirectInput8A( IDirectInput8A *iface )
 {
-    return (IDirectInputImpl *)CONTAINING_RECORD( iface, IDirectInputImpl, lpVtbl8a );
+    return CONTAINING_RECORD( iface, IDirectInputImpl, lpVtbl8a );
 }
 
 static inline IDirectInputImpl *impl_from_IDirectInput8W( IDirectInput8W *iface )
 {
-    return (IDirectInputImpl *)CONTAINING_RECORD( iface, IDirectInputImpl, lpVtbl8w );
+    return CONTAINING_RECORD( iface, IDirectInputImpl, lpVtbl8w );
 }
 
 static inline IDirectInput7W *IDirectInput7W_from_impl( IDirectInputImpl *iface )
diff --git a/include/dinput.h b/include/dinput.h
index eee1fbd..7f0ac9c 100644
--- a/include/dinput.h
+++ b/include/dinput.h
@@ -694,8 +694,8 @@ typedef struct DIPROPRANGE {
 } DIPROPRANGE, *LPDIPROPRANGE;
 typedef const DIPROPRANGE *LPCDIPROPRANGE;
 
-#define DIPROPRANGE_NOMIN	((LONG)0x80000000)
-#define DIPROPRANGE_NOMAX	((LONG)0x7FFFFFFF)
+#define DIPROPRANGE_NOMIN	0x80000000L
+#define DIPROPRANGE_NOMAX	0x7FFFFFFFL
 
 typedef struct DIPROPCAL {
 	DIPROPHEADER diph;



More information about the wine-patches mailing list