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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: e1dd6a869dcacd13f502db8b418f168765b8249a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e1dd6a869dcacd13f502db8b41...

Author: Andrew Nguyen 
Date:   Tue Dec 22 04:15:15 2009 -0600

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

---

dlls/dxdiagn/provider.c       |    5 +----
 dlls/dxdiagn/tests/provider.c |    2 --
 2 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c
index 0795910..1100940 100644
--- a/dlls/dxdiagn/provider.c
+++ b/dlls/dxdiagn/provider.c
@@ -110,11 +110,8 @@ static HRESULT WINAPI IDxDiagProviderImpl_GetRootContainer(PDXDIAGPROVIDER iface
   IDxDiagProviderImpl *This = (IDxDiagProviderImpl *)iface;
   TRACE("(%p,%p)\n", iface, ppInstance);

-  if (NULL == ppInstance) {
-    return E_INVALIDARG;
-  }
   if (FALSE == This->init) {
-    return E_INVALIDARG; /* should be E_CO_UNINITIALIZED */
+    return CO_E_NOTINITIALIZED;
   }
   if (NULL == This->pRootContainer) {
     hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &This->pRootContainer);
diff --git a/dlls/dxdiagn/tests/provider.c b/dlls/dxdiagn/tests/provider.c
index a893842..52670c0 100644
--- a/dlls/dxdiagn/tests/provider.c
+++ b/dlls/dxdiagn/tests/provider.c
@@ -107,12 +107,10 @@ static void test_GetRootContainer(void)

/* Test calling IDxDiagProvider::GetRootContainer before initialization. */
     hr = IDxDiagProvider_GetRootContainer(pddp, NULL);
-    todo_wine
     ok(hr == CO_E_NOTINITIALIZED,
        "Expected IDxDiagProvider::GetRootContainer to return CO_E_NOTINITIALIZED, got %x\n", hr);

hr = IDxDiagProvider_GetRootContainer(pddp, &pddc);
-    todo_wine
     ok(hr == CO_E_NOTINITIALIZED,
        "Expected IDxDiagProvider::GetRootContainer to return CO_E_NOTINITIALIZED, got %x\n", hr);