Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
219f477a
Commit
219f477a
authored
Jan 29, 2011
by
Nikolay Sivov
Committed by
Alexandre Julliard
Jan 31, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
shlwapi/tests: Reset cookie after service revoked (Valgrind).
parent
5f26248a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
0 deletions
+8
-0
ordinal.c
dlls/shlwapi/ordinal.c
+3
-0
ordinal.c
dlls/shlwapi/tests/ordinal.c
+5
-0
No files found.
dlls/shlwapi/ordinal.c
View file @
219f477a
...
...
@@ -1571,7 +1571,10 @@ HRESULT WINAPI IUnknown_ProfferService(IUnknown *lpUnknown, REFGUID service, ISe
if
(
pService
)
hr
=
IProfferService_ProfferService
(
proffer
,
service
,
pService
,
pCookie
);
else
{
hr
=
IProfferService_RevokeService
(
proffer
,
*
pCookie
);
*
pCookie
=
0
;
}
IProfferService_Release
(
proffer
);
}
...
...
dlls/shlwapi/tests/ordinal.c
View file @
219f477a
...
...
@@ -2362,6 +2362,7 @@ static ULONG WINAPI IProfferServiceImpl_Release(IProfferService *iface)
static
HRESULT
WINAPI
IProfferServiceImpl_ProfferService
(
IProfferService
*
iface
,
REFGUID
service
,
IServiceProvider
*
pService
,
DWORD
*
pCookie
)
{
*
pCookie
=
0xdeadbeef
;
add_call
(
&
trace_got
,
3
,
service
,
pService
,
pCookie
,
0
,
0
);
return
S_OK
;
}
...
...
@@ -2419,8 +2420,10 @@ static void test_IUnknown_ProfferService(void)
add_call
(
&
trace_expected
,
3
,
&
dummy_serviceid
,
provider
,
&
cookie
,
0
,
0
);
init_call_trace
(
&
trace_got
);
cookie
=
0
;
hr
=
pIUnknown_ProfferService
((
IUnknown
*
)
proff
,
&
dummy_serviceid
,
provider
,
&
cookie
);
ok
(
hr
==
S_OK
,
"got 0x%08x
\n
"
,
hr
);
ok
(
cookie
==
0xdeadbeef
,
"got %x
\n
"
,
cookie
);
ok_trace
(
&
trace_expected
,
&
trace_got
);
free_call_trace
(
&
trace_got
);
...
...
@@ -2434,8 +2437,10 @@ static void test_IUnknown_ProfferService(void)
add_call
(
&
trace_expected
,
4
,
(
void
*
)(
DWORD_PTR
)
cookie
,
0
,
0
,
0
,
0
);
init_call_trace
(
&
trace_got
);
ok
(
cookie
!=
0
,
"got %x
\n
"
,
cookie
);
hr
=
pIUnknown_ProfferService
((
IUnknown
*
)
proff
,
&
dummy_serviceid
,
0
,
&
cookie
);
ok
(
hr
==
S_OK
,
"got 0x%08x
\n
"
,
hr
);
ok
(
cookie
==
0
,
"got %x
\n
"
,
cookie
);
ok_trace
(
&
trace_expected
,
&
trace_got
);
free_call_trace
(
&
trace_got
);
free_call_trace
(
&
trace_expected
);
...
...
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