dinput: Add more error checking to IDirectInput_GetDeviceStatus.

This commit is contained in:
Vitaliy Margolen 2011-11-26 10:30:23 -07:00 committed by Alexandre Julliard
parent 310859db67
commit 699da40d1b
3 changed files with 1 additions and 4 deletions

View File

@ -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;

View File

@ -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);

View File

@ -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);