Robert Shearman : ole: Fallthrough from local activation in CoGetClassObject.

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: f4a8ba9548499ca8118ad6eb936a01ce4f11cda1
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=f4a8ba9548499ca8118ad6eb936a01ce4f11cda1

Author: Robert Shearman <rob at codeweavers.com>
Date:   Thu Feb 23 19:02:00 2006 +0000

ole: Fallthrough from local activation in CoGetClassObject.
If local-server or local-service activation doesn't work in
CoGetClassObject then fallthrough instead of returning from the
function.

---

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

diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c
index 67c8655..7057450 100644
--- a/dlls/ole32/compobj.c
+++ b/dlls/ole32/compobj.c
@@ -1695,7 +1695,9 @@ HRESULT WINAPI CoGetClassObject(
     /* Next try out of process */
     if (CLSCTX_LOCAL_SERVER & dwClsContext)
     {
-        return RPC_GetLocalClassObject(rclsid,iid,ppv);
+        hres = RPC_GetLocalClassObject(rclsid,iid,ppv);
+        if (SUCCEEDED(hres))
+            return hres;
     }
 
     /* Finally try remote: this requires networked DCOM (a lot of work) */