Peter Schellenbach : oleaut32: Corrected registration flag inversion in RegisterActiveObject.

Alexandre Julliard julliard at winehq.org
Mon Mar 7 12:22:48 CST 2011


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

Author: Peter Schellenbach <pjs at asent.com>
Date:   Thu Mar  3 17:03:40 2011 -0800

oleaut32: Corrected registration flag inversion in RegisterActiveObject.

---

 dlls/oleaut32/oleaut.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c
index ac2d666..f93339a 100644
--- a/dlls/oleaut32/oleaut.c
+++ b/dlls/oleaut32/oleaut.c
@@ -471,6 +471,7 @@ HRESULT WINAPI RegisterActiveObject(
 	HRESULT			ret;
 	LPRUNNINGOBJECTTABLE	runobtable;
 	LPMONIKER		moniker;
+        DWORD                   rot_flags = ROTFLAGS_REGISTRATIONKEEPSALIVE; /* default registration is strong */
 
 	StringFromGUID2(rcid,guidbuf,39);
 	ret = CreateItemMoniker(pdelimiter,guidbuf,&moniker);
@@ -481,7 +482,9 @@ HRESULT WINAPI RegisterActiveObject(
 		IMoniker_Release(moniker);
 		return ret;
 	}
-	ret = IRunningObjectTable_Register(runobtable,dwFlags,punk,moniker,pdwRegister);
+        if(dwFlags == ACTIVEOBJECT_WEAK)
+          rot_flags = 0;
+	ret = IRunningObjectTable_Register(runobtable,rot_flags,punk,moniker,pdwRegister);
 	IRunningObjectTable_Release(runobtable);
 	IMoniker_Release(moniker);
 	return ret;




More information about the wine-cvs mailing list