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
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
Alexey Alyaev
wine
Commits
c221a36d
Commit
c221a36d
authored
17 years ago
by
Jacek Caban
Committed by
Alexandre Julliard
17 years ago
Browse files
Options
Downloads
Patches
Plain Diff
mshtml: Move createing URL moniker to separated function.
parent
5766b55e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dlls/mshtml/nsio.c
+35
-24
35 additions, 24 deletions
dlls/mshtml/nsio.c
with
35 additions
and
24 deletions
dlls/mshtml/nsio.c
+
35
−
24
View file @
c221a36d
...
...
@@ -605,15 +605,45 @@ static BOOL do_load_from_moniker_hack(nsChannel *This)
return
FALSE
;
}
static
HRESULT
create_mon_for_nschannel
(
nsChannel
*
channel
,
IMoniker
**
mon
)
{
nsIWineURI
*
wine_uri
;
LPCWSTR
wine_url
;
nsresult
nsres
;
HRESULT
hres
;
if
(
!
channel
->
original_uri
)
{
ERR
(
"original_uri == NULL
\n
"
);
return
E_FAIL
;
}
nsres
=
nsIURI_QueryInterface
(
channel
->
original_uri
,
&
IID_nsIWineURI
,
(
void
**
)
&
wine_uri
);
if
(
NS_FAILED
(
nsres
))
{
ERR
(
"Could not get nsIWineURI: %08x
\n
"
,
nsres
);
return
E_FAIL
;
}
nsIWineURI_GetWineURL
(
wine_uri
,
&
wine_url
);
nsIWineURI_Release
(
wine_uri
);
if
(
!
wine_url
)
{
TRACE
(
"wine_url == NULL
\n
"
);
return
E_FAIL
;
}
hres
=
CreateURLMoniker
(
NULL
,
wine_url
,
mon
);
if
(
FAILED
(
hres
))
WARN
(
"CreateURLMonikrer failed: %08x
\n
"
,
hres
);
return
hres
;
}
static
nsresult
NSAPI
nsChannel_AsyncOpen
(
nsIHttpChannel
*
iface
,
nsIStreamListener
*
aListener
,
nsISupports
*
aContext
)
{
nsChannel
*
This
=
NSCHANNEL_THIS
(
iface
);
BSCallback
*
bscallback
;
nsIWineURI
*
wine_uri
;
IMoniker
*
mon
;
IMoniker
*
mon
=
NULL
;
PRBool
is_doc_uri
;
LPCWSTR
wine_url
;
nsresult
nsres
;
task_t
*
task
;
HRESULT
hres
;
...
...
@@ -692,28 +722,9 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen
TRACE
(
"channel == NULL
\n
"
);
if
(
!
This
->
original_uri
)
{
ERR
(
"original_uri == NULL
\n
"
);
return
NS_ERROR_UNEXPECTED
;
}
nsres
=
nsIURI_QueryInterface
(
This
->
original_uri
,
&
IID_nsIWineURI
,
(
void
**
)
&
wine_uri
);
if
(
NS_FAILED
(
nsres
))
{
ERR
(
"Could not get nsIWineURI: %08x
\n
"
,
nsres
);
return
NS_ERROR_UNEXPECTED
;
}
nsIWineURI_GetWineURL
(
wine_uri
,
&
wine_url
);
if
(
!
wine_url
)
{
TRACE
(
"wine_url == NULL
\n
"
);
return
NS_ERROR_UNEXPECTED
;
}
hres
=
CreateURLMoniker
(
NULL
,
wine_url
,
&
mon
);
if
(
FAILED
(
hres
))
{
WARN
(
"CreateURLMonikrer failed: %08x
\n
"
,
hres
);
hres
=
create_mon_for_nschannel
(
This
,
&
mon
);
if
(
FAILED
(
hres
))
return
NS_ERROR_UNEXPECTED
;
}
bscallback
=
create_bscallback
(
mon
);
IMoniker_Release
(
mon
);
...
...
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