Vitaliy Margolen : dinput: Add more error checking to IDirectInput_GetDeviceStatus.
Alexandre Julliard
julliard at winehq.org
Tue Nov 29 14:20:39 CST 2011
Module: wine
Branch: master
Commit: 699da40d1bb24220050271eea3ddc8cddbd8bcb8
URL: http://source.winehq.org/git/wine.git/?a=commit;h=699da40d1bb24220050271eea3ddc8cddbd8bcb8
Author: Vitaliy Margolen <wine-patches at kievinfo.com>
Date: Sat Nov 26 10:30:23 2011 -0700
dinput: Add more error checking to IDirectInput_GetDeviceStatus.
---
dlls/dinput/dinput_main.c | 1 +
dlls/dinput/tests/dinput.c | 2 --
dlls/dinput8/tests/dinput.c | 2 --
3 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c
index 55a04c5..e69bbf0 100644
--- a/dlls/dinput/dinput_main.c
+++ b/dlls/dinput/dinput_main.c
@@ -614,6 +614,7 @@ static HRESULT WINAPI IDirectInputAImpl_GetDeviceStatus(LPDIRECTINPUT7A iface, R
TRACE( "(%p)->(%s)\n", This, debugstr_guid(rguid) );
+ if (!rguid) return E_POINTER;
if (!This->initialized)
return DIERR_NOTINITIALIZED;
diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c
index 3302e7e..1cdc90b 100644
--- a/dlls/dinput/tests/dinput.c
+++ b/dlls/dinput/tests/dinput.c
@@ -132,7 +132,6 @@ static void test_preinitialization(void)
}
hr = IDirectInput_GetDeviceStatus(pDI, NULL);
- todo_wine
ok(hr == E_POINTER, "IDirectInput_GetDeviceStatus returned 0x%08x\n", hr);
hr = IDirectInput_GetDeviceStatus(pDI, &GUID_Unknown);
@@ -475,7 +474,6 @@ static void test_GetDeviceStatus(void)
}
hr = IDirectInput_GetDeviceStatus(pDI, NULL);
- todo_wine
ok(hr == E_POINTER, "IDirectInput_GetDeviceStatus returned 0x%08x\n", hr);
hr = IDirectInput_GetDeviceStatus(pDI, &GUID_Unknown);
diff --git a/dlls/dinput8/tests/dinput.c b/dlls/dinput8/tests/dinput.c
index 72cd498..2a23194 100644
--- a/dlls/dinput8/tests/dinput.c
+++ b/dlls/dinput8/tests/dinput.c
@@ -109,7 +109,6 @@ static void test_preinitialization(void)
}
hr = IDirectInput8_GetDeviceStatus(pDI, NULL);
- todo_wine
ok(hr == E_POINTER, "IDirectInput8_GetDeviceStatus returned 0x%08x\n", hr);
hr = IDirectInput8_GetDeviceStatus(pDI, &GUID_Unknown);
@@ -599,7 +598,6 @@ static void test_GetDeviceStatus(void)
}
hr = IDirectInput8_GetDeviceStatus(pDI, NULL);
- todo_wine
ok(hr == E_POINTER, "IDirectInput8_GetDeviceStatus returned 0x%08x\n", hr);
hr = IDirectInput8_GetDeviceStatus(pDI, &GUID_Unknown);
More information about the wine-cvs
mailing list