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
7f6630ee
Commit
7f6630ee
authored
Nov 12, 2009
by
Jacek Caban
Committed by
Alexandre Julliard
Nov 12, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Get rid of no longer needed bind_complete in set_moniker.
parent
aa714ca1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
10 deletions
+4
-10
persist.c
dlls/mshtml/persist.c
+4
-10
No files found.
dlls/mshtml/persist.c
View file @
7f6630ee
...
@@ -152,7 +152,7 @@ static void set_downloading_proc(task_t *_task)
...
@@ -152,7 +152,7 @@ static void set_downloading_proc(task_t *_task)
}
}
}
}
static
HRESULT
set_moniker
(
HTMLDocument
*
This
,
IMoniker
*
mon
,
IBindCtx
*
pibc
,
BOOL
*
bind_complete
)
static
HRESULT
set_moniker
(
HTMLDocument
*
This
,
IMoniker
*
mon
,
IBindCtx
*
pibc
)
{
{
nsChannelBSC
*
bscallback
;
nsChannelBSC
*
bscallback
;
LPOLESTR
url
=
NULL
;
LPOLESTR
url
=
NULL
;
...
@@ -268,8 +268,6 @@ static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BO
...
@@ -268,8 +268,6 @@ static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BO
IUnknown_Release
((
IUnknown
*
)
bscallback
);
IUnknown_Release
((
IUnknown
*
)
bscallback
);
CoTaskMemFree
(
url
);
CoTaskMemFree
(
url
);
if
(
bind_complete
)
*
bind_complete
=
FALSE
;
return
S_OK
;
return
S_OK
;
}
}
...
@@ -357,19 +355,15 @@ static HRESULT WINAPI PersistMoniker_Load(IPersistMoniker *iface, BOOL fFullyAva
...
@@ -357,19 +355,15 @@ static HRESULT WINAPI PersistMoniker_Load(IPersistMoniker *iface, BOOL fFullyAva
IMoniker
*
pimkName
,
LPBC
pibc
,
DWORD
grfMode
)
IMoniker
*
pimkName
,
LPBC
pibc
,
DWORD
grfMode
)
{
{
HTMLDocument
*
This
=
PERSISTMON_THIS
(
iface
);
HTMLDocument
*
This
=
PERSISTMON_THIS
(
iface
);
BOOL
bind_complete
=
FALSE
;
HRESULT
hres
;
HRESULT
hres
;
TRACE
(
"(%p)->(%x %p %p %08x)
\n
"
,
This
,
fFullyAvailable
,
pimkName
,
pibc
,
grfMode
);
TRACE
(
"(%p)->(%x %p %p %08x)
\n
"
,
This
,
fFullyAvailable
,
pimkName
,
pibc
,
grfMode
);
hres
=
set_moniker
(
This
,
pimkName
,
pibc
,
&
bind_complete
);
hres
=
set_moniker
(
This
,
pimkName
,
pibc
);
if
(
FAILED
(
hres
))
if
(
FAILED
(
hres
))
return
hres
;
return
hres
;
if
(
!
bind_complete
)
return
start_binding
(
This
->
window
,
NULL
,
(
BSCallback
*
)
This
->
window
->
bscallback
,
pibc
);
return
start_binding
(
This
->
window
,
NULL
,
(
BSCallback
*
)
This
->
window
->
bscallback
,
pibc
);
return
S_OK
;
}
}
static
HRESULT
WINAPI
PersistMoniker_Save
(
IPersistMoniker
*
iface
,
IMoniker
*
pimkName
,
static
HRESULT
WINAPI
PersistMoniker_Save
(
IPersistMoniker
*
iface
,
IMoniker
*
pimkName
,
...
@@ -626,7 +620,7 @@ static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, LPSTREAM
...
@@ -626,7 +620,7 @@ static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, LPSTREAM
return
hres
;
return
hres
;
}
}
hres
=
set_moniker
(
This
,
mon
,
NULL
,
NULL
);
hres
=
set_moniker
(
This
,
mon
,
NULL
);
IMoniker_Release
(
mon
);
IMoniker_Release
(
mon
);
if
(
FAILED
(
hres
))
if
(
FAILED
(
hres
))
return
hres
;
return
hres
;
...
...
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