Rob Shearman : ole32: Fix error code returned by CoGetClassObject/ CoCreateInstance in CLSCTX_REMOTE_SERVER case.

[Alexandre Julliard]

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

Author: Rob Shearman 
Date:   Mon Nov 23 21:52:27 2009 +0000

ole32: Fix error code returned by CoGetClassObject/CoCreateInstance in CLSCTX_REMOTE_SERVER case.

---

dlls/ole32/compobj.c       |    2 +-
 dlls/ole32/tests/compobj.c |    1 -
 2 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c
index 7dc1568..321f2e9 100644
--- a/dlls/ole32/compobj.c
+++ b/dlls/ole32/compobj.c
@@ -2380,7 +2380,7 @@ HRESULT WINAPI CoGetClassObject(
     if (CLSCTX_REMOTE_SERVER & dwClsContext)
     {
         FIXME ("CLSCTX_REMOTE_SERVER not supported\n");
-        hres = E_NOINTERFACE;
+        hres = REGDB_E_CLASSNOTREG;
     }

if (FAILED(hres))
diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c
index 21293bc..9d469b4 100644
--- a/dlls/ole32/tests/compobj.c
+++ b/dlls/ole32/tests/compobj.c
@@ -270,7 +270,6 @@ static void test_CoCreateInstance(void)
     hr = CoCreateInstance(&CLSID_non_existent, NULL, CLSCTX_LOCAL_SERVER, &IID_IUnknown, (void **)&pUnk);
     ok(hr == REGDB_E_CLASSNOTREG, "CoCreateInstance for non-registered local server should have returned REGDB_E_CLASSNOTREG instead of 0x%08x\n", hr);
     hr = CoCreateInstance(&CLSID_non_existent, NULL, CLSCTX_REMOTE_SERVER, &IID_IUnknown, (void **)&pUnk);
-    todo_wine
     ok(hr == REGDB_E_CLASSNOTREG, "CoCreateInstance for non-registered remote server should have returned REGDB_E_CLASSNOTREG instead of 0x%08x\n", hr);

hr = CoCreateInstance(rclsid, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&pUnk);