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
9c8162db
Commit
9c8162db
authored
Mar 08, 2019
by
Jacek Caban
Committed by
Alexandre Julliard
Mar 08, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Get rid of no longer needed is_doc_uri from nsWineURI.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
24603b01
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
37 deletions
+2
-37
binding.h
dlls/mshtml/binding.h
+0
-1
nsembed.c
dlls/mshtml/nsembed.c
+1
-6
nsio.c
dlls/mshtml/nsio.c
+1
-30
No files found.
dlls/mshtml/binding.h
View file @
9c8162db
...
...
@@ -136,7 +136,6 @@ typedef struct {
HRESULT
set_http_header
(
struct
list
*
,
const
WCHAR
*
,
int
,
const
WCHAR
*
,
int
)
DECLSPEC_HIDDEN
;
HRESULT
create_redirect_nschannel
(
const
WCHAR
*
,
nsChannel
*
,
nsChannel
**
)
DECLSPEC_HIDDEN
;
nsresult
on_start_uri_open
(
NSContainer
*
,
nsIURI
*
,
cpp_bool
*
)
DECLSPEC_HIDDEN
;
HRESULT
hlink_frame_navigate
(
HTMLDocument
*
,
LPCWSTR
,
nsChannel
*
,
DWORD
,
BOOL
*
)
DECLSPEC_HIDDEN
;
HRESULT
create_doc_uri
(
IUri
*
,
nsWineURI
**
)
DECLSPEC_HIDDEN
;
HRESULT
load_nsuri
(
HTMLOuterWindow
*
,
nsWineURI
*
,
nsIInputStream
*
,
nsChannelBSC
*
,
DWORD
)
DECLSPEC_HIDDEN
;
...
...
dlls/mshtml/nsembed.c
View file @
9c8162db
...
...
@@ -1612,7 +1612,6 @@ static nsresult NSAPI nsURIContentListener_OnStartURIOpen(nsIURIContentListener
NSContainer
*
This
=
impl_from_nsIURIContentListener
(
iface
);
nsACString
spec_str
;
const
char
*
spec
;
nsresult
nsres
;
nsACString_Init
(
&
spec_str
,
NULL
);
nsIURI_GetSpec
(
aURI
,
&
spec_str
);
...
...
@@ -1622,11 +1621,7 @@ static nsresult NSAPI nsURIContentListener_OnStartURIOpen(nsIURIContentListener
nsACString_Finish
(
&
spec_str
);
nsres
=
on_start_uri_open
(
This
,
aURI
,
_retval
);
if
(
NS_FAILED
(
nsres
))
return
nsres
;
return
!*
_retval
&&
This
->
content_listener
return
This
->
content_listener
?
nsIURIContentListener_OnStartURIOpen
(
This
->
content_listener
,
aURI
,
_retval
)
:
NS_OK
;
}
...
...
dlls/mshtml/nsio.c
View file @
9c8162db
...
...
@@ -61,7 +61,6 @@ struct nsWineURI {
IUri
*
uri
;
IUriBuilder
*
uri_builder
;
char
*
origin_charset
;
BOOL
is_doc_uri
;
BOOL
is_mutable
;
DWORD
scheme
;
};
...
...
@@ -3376,17 +3375,7 @@ static nsresult create_nsuri(IUri *iuri, const char *origin_charset, nsWineURI *
HRESULT
create_doc_uri
(
IUri
*
iuri
,
nsWineURI
**
ret
)
{
nsWineURI
*
uri
;
nsresult
nsres
;
nsres
=
create_nsuri
(
iuri
,
NULL
,
&
uri
);
if
(
NS_FAILED
(
nsres
))
return
E_FAIL
;
uri
->
is_doc_uri
=
TRUE
;
*
ret
=
uri
;
return
S_OK
;
return
create_nsuri
(
iuri
,
NULL
,
ret
);
}
static
nsresult
create_nschannel
(
nsWineURI
*
uri
,
nsChannel
**
ret
)
...
...
@@ -3873,24 +3862,6 @@ static const nsIIOServiceHookVtbl nsIOServiceHookVtbl = {
static
nsIIOServiceHook
nsIOServiceHook
=
{
&
nsIOServiceHookVtbl
};
nsresult
on_start_uri_open
(
NSContainer
*
nscontainer
,
nsIURI
*
uri
,
cpp_bool
*
_retval
)
{
nsWineURI
*
wine_uri
;
nsresult
nsres
;
*
_retval
=
FALSE
;
nsres
=
nsIURI_QueryInterface
(
uri
,
&
IID_nsWineURI
,
(
void
**
)
&
wine_uri
);
if
(
NS_FAILED
(
nsres
))
{
WARN
(
"Could not get nsWineURI: %08x
\n
"
,
nsres
);
return
NS_ERROR_NOT_IMPLEMENTED
;
}
wine_uri
->
is_doc_uri
=
TRUE
;
nsIFileURL_Release
(
&
wine_uri
->
nsIFileURL_iface
);
return
NS_OK
;
}
void
init_nsio
(
nsIComponentManager
*
component_manager
)
{
nsIFactory
*
old_factory
=
NULL
;
...
...
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