Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
56e625b0
Commit
56e625b0
authored
Mar 22, 2010
by
Huw Davies
Committed by
Alexandre Julliard
Mar 23, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dispex: Call the deferred fill in function before returning from the server.
parent
ce31f2da
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
29 additions
and
0 deletions
+29
-0
marshal.c
dlls/dispex/tests/marshal.c
+20
-0
usrmarshal.c
dlls/dispex/usrmarshal.c
+9
-0
No files found.
dlls/dispex/tests/marshal.c
View file @
56e625b0
...
...
@@ -232,6 +232,12 @@ static HRESULT WINAPI dispex_GetDispID(IDispatchEx* iface,
return
E_NOTIMPL
;
}
static
HRESULT
WINAPI
defer_fn
(
EXCEPINFO
*
except
)
{
except
->
scode
=
E_OUTOFMEMORY
;
return
S_OK
;
}
static
HRESULT
WINAPI
dispex_InvokeEx
(
IDispatchEx
*
iface
,
DISPID
id
,
LCID
lcid
,
...
...
@@ -266,6 +272,11 @@ static HRESULT WINAPI dispex_InvokeEx(IDispatchEx* iface,
{
ok
(
wFlags
==
0xf
,
"got %04x
\n
"
,
wFlags
);
}
else
if
(
id
==
5
)
{
if
(
pei
)
pei
->
pfnDeferredFillIn
=
defer_fn
;
return
DISP_E_EXCEPTION
;
}
return
S_OK
;
}
...
...
@@ -354,6 +365,7 @@ static void test_dispex(void)
DISPPARAMS
params
;
VARIANTARG
args
[
10
];
INT
i
;
EXCEPINFO
excepinfo
;
hr
=
CreateStreamOnHGlobal
(
NULL
,
TRUE
,
&
stream
);
ok
(
hr
==
S_OK
,
"got %08x
\n
"
,
hr
);
...
...
@@ -399,6 +411,14 @@ todo_wine
hr
=
IDispatchEx_InvokeEx
(
dispex
,
4
,
LOCALE_SYSTEM_DEFAULT
,
0xffff
,
&
params
,
NULL
,
NULL
,
NULL
);
ok
(
hr
==
S_OK
,
"got %08x
\n
"
,
hr
);
params
.
cArgs
=
0
;
hr
=
IDispatchEx_InvokeEx
(
dispex
,
5
,
LOCALE_SYSTEM_DEFAULT
,
DISPATCH_METHOD
,
&
params
,
NULL
,
NULL
,
NULL
);
ok
(
hr
==
DISP_E_EXCEPTION
,
"got %08x
\n
"
,
hr
);
hr
=
IDispatchEx_InvokeEx
(
dispex
,
5
,
LOCALE_SYSTEM_DEFAULT
,
DISPATCH_METHOD
,
&
params
,
NULL
,
&
excepinfo
,
NULL
);
ok
(
hr
==
DISP_E_EXCEPTION
,
"got %08x
\n
"
,
hr
);
ok
(
excepinfo
.
scode
==
E_OUTOFMEMORY
,
"got scode %08x
\n
"
,
excepinfo
.
scode
);
ok
(
excepinfo
.
pfnDeferredFillIn
==
NULL
,
"got non-NULL pfnDeferredFillIn
\n
"
);
IDispatchEx_Release
(
dispex
);
end_host_object
(
tid
,
thread
);
}
...
...
dlls/dispex/usrmarshal.c
View file @
56e625b0
...
...
@@ -133,6 +133,15 @@ HRESULT __RPC_STUB IDispatchEx_InvokeEx_Stub(IDispatchEx* This, DISPID id, LCID
hr
=
IDispatchEx_InvokeEx
(
This
,
id
,
lcid
,
dwFlags
&
0xffff
,
pdp
,
result
,
pei
,
pspCaller
);
if
(
hr
==
DISP_E_EXCEPTION
)
{
if
(
pei
&&
pei
->
pfnDeferredFillIn
)
{
pei
->
pfnDeferredFillIn
(
pei
);
pei
->
pfnDeferredFillIn
=
NULL
;
}
}
for
(
arg
=
0
;
arg
<
byref_args
;
arg
++
)
VariantInit
(
pdp
->
rgvarg
+
ref_idx
[
arg
]);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment