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
8646cd77
Commit
8646cd77
authored
Jun 23, 2011
by
Jacek Caban
Committed by
Alexandre Julliard
Jun 24, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
urlmon: Use proper IUri in BindToObject implementation.
parent
cca52128
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
8 deletions
+10
-8
url.c
dlls/urlmon/tests/url.c
+5
-0
umon.c
dlls/urlmon/umon.c
+5
-8
No files found.
dlls/urlmon/tests/url.c
View file @
8646cd77
...
...
@@ -3626,6 +3626,11 @@ static void test_StdURLMoniker(void)
ok
(
hres
==
MK_E_SYNTAX
,
"BindToStorage failed: %08x, expected MK_E_SYNTAX
\n
"
,
hres
);
ok
(
!
unk
,
"unk = %p
\n
"
,
unk
);
unk
=
(
void
*
)
0xdeadbeef
;
hres
=
IMoniker_BindToObject
(
mon
,
bctx
,
NULL
,
&
IID_IUnknown
,
(
void
**
)
&
unk
);
ok
(
hres
==
MK_E_SYNTAX
,
"BindToStorage failed: %08x, expected MK_E_SYNTAX
\n
"
,
hres
);
ok
(
!
unk
,
"unk = %p
\n
"
,
unk
);
IMoniker_Release
(
mon
);
}
...
...
dlls/urlmon/umon.c
View file @
8646cd77
...
...
@@ -227,7 +227,6 @@ static HRESULT WINAPI URLMoniker_BindToObject(IMoniker *iface, IBindCtx* pbc, IM
{
URLMoniker
*
This
=
impl_from_IMoniker
(
iface
);
IRunningObjectTable
*
obj_tbl
;
IUri
*
uri
;
HRESULT
hres
;
TRACE
(
"(%p)->(%p,%p,%s,%p): stub
\n
"
,
This
,
pbc
,
pmkToLeft
,
debugstr_guid
(
riid
),
ppv
);
...
...
@@ -238,14 +237,12 @@ static HRESULT WINAPI URLMoniker_BindToObject(IMoniker *iface, IBindCtx* pbc, IM
IRunningObjectTable_Release
(
obj_tbl
);
}
hres
=
CreateUri
(
This
->
URLName
,
Uri_CREATE_FILE_USE_DOS_PATH
,
0
,
&
uri
);
if
(
FAILED
(
hres
))
return
hres
;
hres
=
bind_to_object
(
iface
,
uri
,
pbc
,
riid
,
ppv
);
if
(
!
This
->
uri
)
{
*
ppv
=
NULL
;
return
MK_E_SYNTAX
;
}
IUri_Release
(
uri
);
return
hres
;
return
bind_to_object
(
&
This
->
IMoniker_iface
,
This
->
uri
,
pbc
,
riid
,
ppv
);
}
static
HRESULT
WINAPI
URLMoniker_BindToStorage
(
IMoniker
*
iface
,
IBindCtx
*
pbc
,
...
...
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