mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-14 19:05:40 +00:00
dinput: Add more error checking to IDirectInput_GetDeviceStatus.
This commit is contained in:
parent
310859db67
commit
699da40d1b
|
@ -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;
|
||||||
|
|
||||||
|
|
|
@ -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)
|
||||||
}
|
}
|
||||||
|
|
||||||
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);
|
||||||
|
|
|
@ -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)
|
||||||
}
|
}
|
||||||
|
|
||||||
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);
|
||||||
|
|
Loading…
Reference in a new issue