wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

bug 516798: fix busted actor-as-return-value handling in IPDL

Browse Source
This commit is contained in:
Chris Jones 2009-09-16 21:49:41 -05:00
parent d50f580e04
commit 8ef0c1d0d8
2 changed files with 59 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ipc/glue/SyncChannel.cpp
View File

@ -94,7 +94,7 @@ SyncChannel::OnDispatchMessage(const Message& msg)
NS_ABORT_IF_FALSE(msg.is_sync(), "only sync messages here");
NS_ABORT_IF_FALSE(!msg.is_reply(), "wasn't awaiting reply");
Message* reply;
Message* reply = 0;
mProcessingSyncMessage = true;
Result rv =

76
ipc/ipdl/ipdl/lower.py
View File

@ -809,19 +809,20 @@ class GenerateProtocolHeader(Visitor):
name=md.decl.progname,
params=[ ],
ret=cxx.Type('nsresult'),
virtual=True)
virtual=1)
for param in md._cxx.params:
pcopy = deepcopy(param)
pcopy.type.const = True
pcopy.type.const = 1
if not param.type.actor:
pcopy.type.ref = True
pcopy.type.ref = 1
method.params.append(pcopy)
for ret in md._cxx.returns:
rcopy = deepcopy(ret)
if rcopy.type.actor:
rcopy.type.ptrptr = True
rcopy.type.ptr = 0
rcopy.type.ptrptr = 1
else:
rcopy.type.ptr = True
rcopy.type.ptr = 1
method.params.append(rcopy)
md._cxx.method = method
@ -1674,11 +1675,22 @@ class GenerateProtocolActorHeader(Visitor):
'__msg')))
msgvar = cxx.ExprVar('__msg')
impl.addstmt(cxx.Whitespace.NL)
# special case for explicit actor params: they need to be
# converted to Handle's before sending
for param in mdecl.params:
if not param.type.actor:
continue
# an actor outparam. check that it's non-null
if param.type.ptrptr:
checknull = cxx.StmtIf(
cxx.ExprPrefixUnop(cxx.ExprVar(param.name), '!'))
checknull.addifstmt(cxx.StmtReturn(valueerrcode))
impl.addstmt(checknull)
continue
pavar = cxx.ExprVar(param.name)
pahvar = cxx.ExprVar(param.name +'__ah')
impl.addstmt(cxx.StmtDecl(cxx.Decl(
@ -1855,22 +1867,16 @@ class GenerateProtocolActorHeader(Visitor):
impl.addstmt(failif2)
# if this message has explicit actor returns, we need
# to convert them from Handle before returning to C++
# to convert them from Handle before returning to C++.
# first declare the ActorHandle variables in which
# we store the deserialized, intermediate representation
for ret in md._cxx.returns:
if not ret.type.actor: continue
ravar = cxx.ExprVar(ret.name)
rahvar = cxx.ExprVar(ret.name +'__ah')
actortype = deepcopy(ret.type)
actortype.name = _actorName(actortype.name, self.myside)
actortype.ptrptr = 0; actortype.ptr = 1
impl.addstmt(cxx.StmtDecl(cxx.Decl(
cxx.Type('mozilla::ipc::ActorHandle'), rahvar.name)))
impl.addstmts(_actorHandleToActor(handle=rahvar,
actor=ravar,
actortype=actortype,
failcode=valueerrcode))
cxx.Type('mozilla::ipc::ActorHandle'),
ret.name +'__ah')))
impl.addstmt(cxx.Whitespace.NL)
unpackargs = [ cxx.ExprAddrOf(replyvar) ]
@ -1889,6 +1895,24 @@ class GenerateProtocolActorHeader(Visitor):
errhandle.ifb.addstmt(cxx.StmtReturn(valueerrcode))
impl.addstmt(errhandle)
impl.addstmt(cxx.Whitespace.NL)
# now look up the actor's ID
for ret in md._cxx.returns:
if not ret.type.actor: continue
ravar = cxx.ExprVar(ret.name)
rahvar = cxx.ExprVar(ret.name +'__ah')
actortype = deepcopy(ret.type)
actortype.name = _actorName(actortype.name, self.myside)
actortype.ptrptr = 0; actortype.ptr = 1
impl.addstmts(_actorHandleToActor(
handle=rahvar,
actor=cxx.ExprDeref(ravar),
actortype=actortype,
failcode=valueerrcode))
# see if we need to extract an actor out of a union
# and re-convert it into an actor pointer
for r in md._cxx.returns:
@ -2187,6 +2211,20 @@ class GenerateProtocolActorHeader(Visitor):
cxx.Decl(cxx.Type('Message', ptr=1), 'reply')))
replyvar = cxx.ExprVar('reply')
# pack actor returns into Handles to be shipped across
# the wire
for ret in md._cxx.returns:
if not ret.type.actor:
continue
retavar = cxx.ExprVar(ret.name)
retahvar = cxx.ExprVar(ret.name +'__ah')
block.addstmts(_actorToActorHandle(
actor=retavar, handle=retahvar,
failcode=cxx.ExprVar('MsgValueError')))
block.addstmt(cxx.Whitespace.NL)
# FIXME/cjones: yet more copy-n-paste
#
# special case for IPDL union types: if this union
@ -2249,6 +2287,8 @@ class GenerateProtocolActorHeader(Visitor):
ctorparams = [ ]
for i, r in enumerate(md._cxx.returns):
rvar = cxx.ExprVar(r.name)
if r.type.actor:
rvar.name += '__ah'
ctorparams.append(rvar)
replymsgctor = cxx.ExprNew(cxx.Type(md._cxx.nsreplyid),