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
76b19800
Commit
76b19800
authored
Oct 05, 2023
by
Gabriel Ivăncescu
Committed by
Alexandre Julliard
Oct 06, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ieframe: Use the original URL for error pages' address bar.
Signed-off-by:
Gabriel Ivăncescu
<
gabrielopcode@gmail.com
>
parent
8a67308f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
0 deletions
+23
-0
ieframe.h
dlls/ieframe/ieframe.h
+1
-0
iexplore.c
dlls/ieframe/iexplore.c
+4
-0
shellbrowser.c
dlls/ieframe/shellbrowser.c
+18
-0
No files found.
dlls/ieframe/ieframe.h
View file @
76b19800
...
...
@@ -281,6 +281,7 @@ HRESULT get_window(DocHost*,IHTMLWindow2**);
HRESULT
get_location_url
(
DocHost
*
,
BSTR
*
);
HRESULT
set_dochost_url
(
DocHost
*
,
const
WCHAR
*
);
void
handle_navigation_error
(
DocHost
*
,
HRESULT
,
BSTR
,
IHTMLWindow2
*
);
const
WCHAR
*
error_url_frag
(
const
WCHAR
*
);
HRESULT
dochost_object_available
(
DocHost
*
,
IUnknown
*
);
void
set_doc_state
(
DocHost
*
,
READYSTATE
);
void
activate_document
(
DocHost
*
);
...
...
dlls/ieframe/iexplore.c
View file @
76b19800
...
...
@@ -783,6 +783,10 @@ static void DocHostContainer_on_command_state_change(DocHost *iface, LONG comman
static
void
DocHostContainer_set_url
(
DocHost
*
iface
,
const
WCHAR
*
url
)
{
InternetExplorer
*
This
=
impl_from_DocHost
(
iface
);
const
WCHAR
*
orig_url
=
error_url_frag
(
url
);
if
(
orig_url
)
url
=
orig_url
;
This
->
nohome
=
FALSE
;
SendMessageW
(
This
->
frame_hwnd
,
WM_UPDATEADDRBAR
,
0
,
(
LPARAM
)
url
);
...
...
dlls/ieframe/shellbrowser.c
View file @
76b19800
...
...
@@ -29,6 +29,24 @@
WINE_DEFAULT_DEBUG_CHANNEL
(
ieframe
);
const
WCHAR
*
error_url_frag
(
const
WCHAR
*
url
)
{
if
(
!
wcsncmp
(
url
,
L"res://"
,
ARRAY_SIZE
(
L"res://"
)
-
1
))
{
WCHAR
buf
[
MAX_PATH
];
UINT
len
=
GetSystemDirectoryW
(
buf
,
ARRAY_SIZE
(
buf
));
if
(
len
&&
!
wcsncmp
(
url
+
ARRAY_SIZE
(
L"res://"
)
-
1
,
buf
,
len
))
{
len
+=
ARRAY_SIZE
(
L"res://"
)
-
1
;
if
(
!
wcsncmp
(
url
+
len
,
L"
\\
shdoclc.dll/ERROR.HTM"
,
ARRAY_SIZE
(
L"
\\
shdoclc.dll/ERROR.HTM"
)
-
1
))
{
len
+=
ARRAY_SIZE
(
L"
\\
shdoclc.dll/ERROR.HTM"
)
-
1
;
url
=
wcschr
(
url
+
len
,
'#'
);
return
url
?
url
+
1
:
NULL
;
}
}
}
return
NULL
;
}
static
inline
ShellBrowser
*
impl_from_IShellBrowser
(
IShellBrowser
*
iface
)
{
return
CONTAINING_RECORD
(
iface
,
ShellBrowser
,
IShellBrowser_iface
);
...
...
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