[PATCH 1/7] ole32: ROTFLAGS_REGISTRATIONKEEPSALIVE and
ROTFLAGS_ALLOWANYCLIENT
are legal to be used together in RunningObjectTable_Register.
Robert Shearman
rob at codeweavers.com
Wed Dec 27 20:41:34 CST 2006
---
dlls/ole32/moniker.c | 10 ++--------
1 files changed, 2 insertions(+), 8 deletions(-)
-------------- next part --------------
diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c
index 080b936..6a26304 100644
--- a/dlls/ole32/moniker.c
+++ b/dlls/ole32/moniker.c
@@ -282,15 +282,9 @@ RunningObjectTableImpl_Register(IRunning
TRACE("(%p,%d,%p,%p,%p)\n",This,grfFlags,punkObject,pmkObjectName,pdwRegister);
- /*
- * there's only two types of register : strong and or weak registration
- * (only one must be passed on parameter)
- */
- if ( ( (grfFlags & ROTFLAGS_REGISTRATIONKEEPSALIVE) || !(grfFlags & ROTFLAGS_ALLOWANYCLIENT)) &&
- (!(grfFlags & ROTFLAGS_REGISTRATIONKEEPSALIVE) || (grfFlags & ROTFLAGS_ALLOWANYCLIENT)) &&
- (grfFlags) )
+ if (grfFlags & ~(ROTFLAGS_REGISTRATIONKEEPSALIVE|ROTFLAGS_ALLOWANYCLIENT))
{
- ERR("Invalid combination of ROTFLAGS: %x\n", grfFlags);
+ ERR("Invalid grfFlags: 0x%08x\n", grfFlags & ~(ROTFLAGS_REGISTRATIONKEEPSALIVE|ROTFLAGS_ALLOWANYCLIENT));
return E_INVALIDARG;
}
More information about the wine-patches
mailing list