Skip to content

W
wine-winehq
Commit 699da40d authored by Vitaliy Margolen's avatar Vitaliy Margolen Committed by Alexandre Julliard
Browse files
Options

dinput: Add more error checking to IDirectInput_GetDeviceStatus.

parent 310859db
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 4 deletions
dlls/dinput/dinput_main.c
View file @ 699da40d
...@@ -614,6 +614,7 @@ static HRESULT WINAPI IDirectInputAImpl_GetDeviceStatus(LPDIRECTINPUT7A iface, R ...@@ -614,6 +614,7 @@ static HRESULT WINAPI IDirectInputAImpl_GetDeviceStatus(LPDIRECTINPUT7A iface, R
TRACE( "(%p)->(%s)\n", This, debugstr_guid(rguid) ); TRACE( "(%p)->(%s)\n", This, debugstr_guid(rguid) );
if (!rguid) return E_POINTER;
if (!This->initialized) if (!This->initialized)
return DIERR_NOTINITIALIZED; return DIERR_NOTINITIALIZED;
......
dlls/dinput/tests/dinput.c
View file @ 699da40d
...@@ -132,7 +132,6 @@ static void test_preinitialization(void) ...@@ -132,7 +132,6 @@ static void test_preinitialization(void)
} }
hr = IDirectInput_GetDeviceStatus(pDI, NULL); hr = IDirectInput_GetDeviceStatus(pDI, NULL);
todo_wine
ok(hr == E_POINTER, "IDirectInput_GetDeviceStatus returned 0x%08x\n", hr); ok(hr == E_POINTER, "IDirectInput_GetDeviceStatus returned 0x%08x\n", hr);
hr = IDirectInput_GetDeviceStatus(pDI, &GUID_Unknown); hr = IDirectInput_GetDeviceStatus(pDI, &GUID_Unknown);
...@@ -475,7 +474,6 @@ static void test_GetDeviceStatus(void) ...@@ -475,7 +474,6 @@ static void test_GetDeviceStatus(void)
} }
hr = IDirectInput_GetDeviceStatus(pDI, NULL); hr = IDirectInput_GetDeviceStatus(pDI, NULL);
todo_wine
ok(hr == E_POINTER, "IDirectInput_GetDeviceStatus returned 0x%08x\n", hr); ok(hr == E_POINTER, "IDirectInput_GetDeviceStatus returned 0x%08x\n", hr);
hr = IDirectInput_GetDeviceStatus(pDI, &GUID_Unknown); hr = IDirectInput_GetDeviceStatus(pDI, &GUID_Unknown);
......
dlls/dinput8/tests/dinput.c
View file @ 699da40d
...@@ -109,7 +109,6 @@ static void test_preinitialization(void) ...@@ -109,7 +109,6 @@ static void test_preinitialization(void)
} }
hr = IDirectInput8_GetDeviceStatus(pDI, NULL); hr = IDirectInput8_GetDeviceStatus(pDI, NULL);
todo_wine
ok(hr == E_POINTER, "IDirectInput8_GetDeviceStatus returned 0x%08x\n", hr); ok(hr == E_POINTER, "IDirectInput8_GetDeviceStatus returned 0x%08x\n", hr);
hr = IDirectInput8_GetDeviceStatus(pDI, &GUID_Unknown); hr = IDirectInput8_GetDeviceStatus(pDI, &GUID_Unknown);
...@@ -599,7 +598,6 @@ static void test_GetDeviceStatus(void) ...@@ -599,7 +598,6 @@ static void test_GetDeviceStatus(void)
} }
hr = IDirectInput8_GetDeviceStatus(pDI, NULL); hr = IDirectInput8_GetDeviceStatus(pDI, NULL);
todo_wine
ok(hr == E_POINTER, "IDirectInput8_GetDeviceStatus returned 0x%08x\n", hr); ok(hr == E_POINTER, "IDirectInput8_GetDeviceStatus returned 0x%08x\n", hr);
hr = IDirectInput8_GetDeviceStatus(pDI, &GUID_Unknown); hr = IDirectInput8_GetDeviceStatus(pDI, &GUID_Unknown);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment