From c02aee8b8f8982436047e08851ddae37d38b996c Mon Sep 17 00:00:00 2001
From: Daniel Remenak <dtremenak@gmail.com>
Date: Sat, 12 Nov 2005 19:10:38 +0000
Subject: [PATCH] Add additional sanity checks to the linux input system dinput
 joystick implementation.

---
 dlls/dinput/joystick_linuxinput.c | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c
index 07e06b1531e..750251355a0 100644
--- a/dlls/dinput/joystick_linuxinput.c
+++ b/dlls/dinput/joystick_linuxinput.c
@@ -419,8 +419,6 @@ static HRESULT WINAPI JoystickAImpl_SetDataFormat(
 
   TRACE("(this=%p,%p)\n",This,df);
 
-  _dump_DIDATAFORMAT(df);
-  
   if (df == NULL) {
     WARN("invalid pointer\n");
     return E_POINTER;
@@ -431,6 +429,8 @@ static HRESULT WINAPI JoystickAImpl_SetDataFormat(
     return DIERR_INVALIDPARAM;
   }
 
+  _dump_DIDATAFORMAT(df);
+
   if (This->joyfd!=-1) {
     WARN("acquired\n");
     return DIERR_ACQUIRED;
@@ -906,8 +906,13 @@ static HRESULT WINAPI JoystickAImpl_SetProperty(LPDIRECTINPUTDEVICE8A iface,
 {
   JoystickImpl *This = (JoystickImpl *)iface;
 
-  FIXME("(this=%p,%s,%p)\n",This,debugstr_guid(rguid),ph);
-  FIXME("ph.dwSize = %ld, ph.dwHeaderSize =%ld, ph.dwObj = %ld, ph.dwHow= %ld\n",ph->dwSize, ph->dwHeaderSize,ph->dwObj,ph->dwHow);
+  if (!ph) {
+    WARN("invalid argument\n");
+    return DIERR_INVALIDPARAM;
+  }
+
+  TRACE("(this=%p,%s,%p)\n",This,debugstr_guid(rguid),ph);
+  TRACE("ph.dwSize = %ld, ph.dwHeaderSize =%ld, ph.dwObj = %ld, ph.dwHow= %ld\n",ph->dwSize, ph->dwHeaderSize,ph->dwObj,ph->dwHow);
 
   if (!HIWORD(rguid)) {
     switch (LOWORD(rguid)) {
@@ -993,6 +998,17 @@ static HRESULT WINAPI JoystickAImpl_GetCapabilities(
     int		i,axes,buttons;
 
     TRACE("%p->(%p)\n",iface,lpDIDevCaps);
+
+    if (!lpDIDevCaps) {
+	WARN("invalid pointer\n");
+	return E_POINTER;
+    }
+
+    if (lpDIDevCaps->dwSize != sizeof(DIDEVCAPS)) {
+        WARN("invalid argument\n");
+        return DIERR_INVALIDPARAM;
+    }
+
     if (xfd==-1) {
 	/* yes, games assume we return something, even if unacquired */
 	JoystickAImpl_Acquire(iface);