Aric Stewart : shlwapi: Rename ConnectToConnectionPoint bAdviseOnly to fConnect as MSDN.
Alexandre Julliard
julliard at winehq.org
Fri Dec 11 11:04:44 CST 2009
Module: wine
Branch: master
Commit: 56d1a7c00357498b485dd79128ae38f906e56944
URL: http://source.winehq.org/git/wine.git/?a=commit;h=56d1a7c00357498b485dd79128ae38f906e56944
Author: Aric Stewart <aric at codeweavers.com>
Date: Thu Dec 10 13:15:58 2009 -0600
shlwapi: Rename ConnectToConnectionPoint bAdviseOnly to fConnect as MSDN.
---
dlls/shlwapi/ordinal.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c
index 0ecbab8..ba614d3 100644
--- a/dlls/shlwapi/ordinal.c
+++ b/dlls/shlwapi/ordinal.c
@@ -1128,7 +1128,7 @@ HWND WINAPI SHSetParentHwnd(HWND hWnd, HWND hWndParent)
* PARAMS
* lpUnkSink [I] Sink for the connection point advise call
* riid [I] REFIID of connection point to advise
- * bAdviseOnly [I] TRUE = Advise only, FALSE = Unadvise first
+ * fConnect [I] TRUE = Connection being establisted, FALSE = broken
* lpUnknown [I] Object supporting the IConnectionPointContainer interface
* lpCookie [O] Pointer to connection point cookie
* lppCP [O] Destination for the IConnectionPoint found
@@ -1140,7 +1140,7 @@ HWND WINAPI SHSetParentHwnd(HWND hWnd, HWND hWndParent)
* E_NOINTERFACE, if lpUnknown isn't an IConnectionPointContainer,
* Or an HRESULT error code if any call fails.
*/
-HRESULT WINAPI ConnectToConnectionPoint(IUnknown* lpUnkSink, REFIID riid, BOOL bAdviseOnly,
+HRESULT WINAPI ConnectToConnectionPoint(IUnknown* lpUnkSink, REFIID riid, BOOL fConnect,
IUnknown* lpUnknown, LPDWORD lpCookie,
IConnectionPoint **lppCP)
{
@@ -1148,7 +1148,7 @@ HRESULT WINAPI ConnectToConnectionPoint(IUnknown* lpUnkSink, REFIID riid, BOOL b
IConnectionPointContainer* lpContainer;
IConnectionPoint *lpCP;
- if(!lpUnknown || (bAdviseOnly && !lpUnkSink))
+ if(!lpUnknown || (fConnect && !lpUnkSink))
return E_FAIL;
if(lppCP)
@@ -1162,9 +1162,10 @@ HRESULT WINAPI ConnectToConnectionPoint(IUnknown* lpUnkSink, REFIID riid, BOOL b
if (SUCCEEDED(hRet))
{
- if(!bAdviseOnly)
+ if(!fConnect)
hRet = IConnectionPoint_Unadvise(lpCP, *lpCookie);
- hRet = IConnectionPoint_Advise(lpCP, lpUnkSink, lpCookie);
+ else
+ hRet = IConnectionPoint_Advise(lpCP, lpUnkSink, lpCookie);
if (FAILED(hRet))
*lpCookie = 0;
More information about the wine-cvs
mailing list