Robert Shearman : Return the correct error code from IConnectionPointContainer:: FindConnectionPoint.

Alexandre Julliard julliard at wine.codeweavers.com
Fri Feb 10 08:54:56 CST 2006


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

Author: Robert Shearman <rob at codeweavers.com>
Date:   Fri Feb 10 14:51:30 2006 +0100

Return the correct error code from IConnectionPointContainer::FindConnectionPoint.

---

 dlls/oleaut32/olefont.c    |    4 ++--
 dlls/oleaut32/olepicture.c |    4 ++--
 dlls/shdocvw/events.c      |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c
index dfb0d3c..2a121cc 100644
--- a/dlls/oleaut32/olefont.c
+++ b/dlls/oleaut32/olefont.c
@@ -1901,8 +1901,8 @@ static HRESULT WINAPI OLEFontImpl_FindCo
                                            &IID_IConnectionPoint,
                                            (LPVOID)ppCp);
   } else {
-    FIXME("Tried to find connection point on %s\n", debugstr_guid(riid));
-    return E_NOINTERFACE;
+    FIXME("no connection point for %s\n", debugstr_guid(riid));
+    return CONNECT_E_NOCONNECTION;
   }
 }
 
diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c
index 03de88c..e24fc2a 100644
--- a/dlls/oleaut32/olepicture.c
+++ b/dlls/oleaut32/olepicture.c
@@ -869,8 +869,8 @@ static HRESULT WINAPI OLEPictureImpl_Fin
   *ppCP = NULL;
   if (IsEqualGUID(riid,&IID_IPropertyNotifySink))
       return IConnectionPoint_QueryInterface(This->pCP,&IID_IConnectionPoint,(LPVOID)ppCP);
-  FIXME("tried to find connection point on %s?\n",debugstr_guid(riid));
-  return 0x80040200;
+  FIXME("no connection point for %s\n",debugstr_guid(riid));
+  return CONNECT_E_NOCONNECTION;
 }
 /************************************************************************
  *    IPersistStream
diff --git a/dlls/shdocvw/events.c b/dlls/shdocvw/events.c
index b7f93b7..f48f066 100644
--- a/dlls/shdocvw/events.c
+++ b/dlls/shdocvw/events.c
@@ -102,7 +102,7 @@ static HRESULT WINAPI ConnectionPointCon
     }
 
     WARN("Unsupported IID %s\n", debugstr_guid(riid));
-    return E_NOINTERFACE;
+    return CONNECT_E_NOCONNECTION;
 }
 
 #undef CONPTCONT_THIS




More information about the wine-cvs mailing list