Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Sebastian Mayr
wine
Commits
f427951d
Commit
f427951d
authored
17 years ago
by
Jacek Caban
Committed by
Alexandre Julliard
17 years ago
Browse files
Options
Downloads
Patches
Plain Diff
shdocvw: Call try_application_url after BindToObject failure.
parent
b5f38799
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dlls/shdocvw/navigate.c
+3
-11
3 additions, 11 deletions
dlls/shdocvw/navigate.c
with
3 additions
and
11 deletions
dlls/shdocvw/navigate.c
+
3
−
11
View file @
f427951d
...
...
@@ -461,6 +461,7 @@ static void on_before_navigate2(DocHost *This, LPCWSTR url, const BYTE *post_dat
SafeArrayDestroy
(
V_ARRAY
(
&
var_post_data
));
}
/* FIXME: urlmon should handle it */
static
BOOL
try_application_url
(
LPCWSTR
url
)
{
SHELLEXECUTEINFOW
exec_info
;
...
...
@@ -564,6 +565,8 @@ static HRESULT bind_to_object(DocHost *This, IMoniker *mon, LPCWSTR url, IBindCt
hres
=
S_OK
;
if
(
unk
)
IUnknown_Release
(
unk
);
}
else
if
(
try_application_url
(
This
->
url
))
{
hres
=
S_OK
;
}
else
{
FIXME
(
"BindToObject failed: %08x
\n
"
,
hres
);
}
...
...
@@ -666,7 +669,6 @@ static HRESULT navigate_hlink(DocHost *This, IMoniker *mon, IBindCtx *bindctx,
IBindStatusCallback
*
callback
)
{
IHttpNegotiate
*
http_negotiate
;
LPWSTR
url
=
NULL
;
PBYTE
post_data
=
NULL
;
ULONG
post_data_len
=
0
;
LPWSTR
headers
=
NULL
;
...
...
@@ -674,9 +676,6 @@ static HRESULT navigate_hlink(DocHost *This, IMoniker *mon, IBindCtx *bindctx,
DWORD
bindf
=
0
;
HRESULT
hres
;
IMoniker_GetDisplayName
(
mon
,
NULL
,
NULL
,
&
url
);
TRACE
(
"navigating to %s
\n
"
,
debugstr_w
(
url
));
hres
=
IBindStatusCallback_QueryInterface
(
callback
,
&
IID_IHttpNegotiate
,
(
void
**
)
&
http_negotiate
);
if
(
SUCCEEDED
(
hres
))
{
...
...
@@ -698,15 +697,8 @@ static HRESULT navigate_hlink(DocHost *This, IMoniker *mon, IBindCtx *bindctx,
post_data
=
bindinfo
.
stgmedData
.
u
.
hGlobal
;
}
/* FIXME: We should do it after BindToObject call */
if
(
try_application_url
(
url
))
{
CoTaskMemFree
(
url
);
return
S_OK
;
}
hres
=
navigate_mon
(
This
,
mon
,
post_data
,
post_data_len
,
headers
);
CoTaskMemFree
(
url
);
CoTaskMemFree
(
headers
);
ReleaseBindInfo
(
&
bindinfo
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment