ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dxdiagn: Fix a return value and avoid validating the input parameter for IDxDiagProviderImpl::GetContainer.

This commit is contained in:
Andrew Nguyen 2009-12-22 04:15:15 -06:00 committed by Alexandre Julliard
parent dddf714f02
commit e1dd6a869d
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/dxdiagn/provider.c
View File

@ -110,11 +110,8 @@ static HRESULT WINAPI IDxDiagProviderImpl_GetRootContainer(PDXDIAGPROVIDER iface
IDxDiagProviderImpl *This = (IDxDiagProviderImpl *)iface; IDxDiagProviderImpl *This = (IDxDiagProviderImpl *)iface;
TRACE("(%p,%p)\n", iface, ppInstance); TRACE("(%p,%p)\n", iface, ppInstance);
if (NULL == ppInstance) {
return E_INVALIDARG;
}
if (FALSE == This->init) { if (FALSE == This->init) {
return E_INVALIDARG; /* should be E_CO_UNINITIALIZED */ return CO_E_NOTINITIALIZED;
} }
if (NULL == This->pRootContainer) { if (NULL == This->pRootContainer) {
hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &This->pRootContainer); hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &This->pRootContainer);

2
dlls/dxdiagn/tests/provider.c
View File

@ -107,12 +107,10 @@ static void test_GetRootContainer(void)
/* Test calling IDxDiagProvider::GetRootContainer before initialization. */ /* Test calling IDxDiagProvider::GetRootContainer before initialization. */
hr = IDxDiagProvider_GetRootContainer(pddp, NULL); hr = IDxDiagProvider_GetRootContainer(pddp, NULL);
todo_wine
ok(hr == CO_E_NOTINITIALIZED, ok(hr == CO_E_NOTINITIALIZED,
"Expected IDxDiagProvider::GetRootContainer to return CO_E_NOTINITIALIZED, got %x\n", hr); "Expected IDxDiagProvider::GetRootContainer to return CO_E_NOTINITIALIZED, got %x\n", hr);
hr = IDxDiagProvider_GetRootContainer(pddp, &pddc); hr = IDxDiagProvider_GetRootContainer(pddp, &pddc);
todo_wine
ok(hr == CO_E_NOTINITIALIZED, ok(hr == CO_E_NOTINITIALIZED,
"Expected IDxDiagProvider::GetRootContainer to return CO_E_NOTINITIALIZED, got %x\n", hr); "Expected IDxDiagProvider::GetRootContainer to return CO_E_NOTINITIALIZED, got %x\n", hr);