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
83ceee74
Commit
83ceee74
authored
Nov 11, 2014
by
Jacek Caban
Committed by
Alexandre Julliard
Nov 11, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Ignore query and hash parts in res protocol handler.
parent
b84bc52b
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
1 deletion
+14
-1
protocol.c
dlls/mshtml/protocol.c
+7
-1
protocol.c
dlls/mshtml/tests/protocol.c
+7
-0
No files found.
dlls/mshtml/protocol.c
View file @
83ceee74
...
...
@@ -594,9 +594,9 @@ static HRESULT WINAPI ResProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl,
DWORD
grfPI
,
HANDLE_PTR
dwReserved
)
{
ResProtocol
*
This
=
ResProtocol_from_IInternetProtocol
(
iface
);
WCHAR
*
url_dll
,
*
url_file
,
*
url
,
*
mime
,
*
res_type
=
(
LPWSTR
)
RT_HTML
,
*
ptr
;
DWORD
grfBINDF
=
0
,
len
;
BINDINFO
bindinfo
;
LPWSTR
url_dll
,
url_file
,
url
,
mime
,
res_type
=
(
LPWSTR
)
RT_HTML
;
HMODULE
hdll
;
HRSRC
src
;
HRESULT
hres
;
...
...
@@ -646,6 +646,12 @@ static HRESULT WINAPI ResProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl,
res_type
=
MAKEINTRESOURCEW
(
RT_HTML
);
}
/* Ignore query and hash parts. */
if
((
ptr
=
strchrW
(
url_file
,
'?'
)))
*
ptr
=
0
;
if
((
ptr
=
strchrW
(
url_file
,
'#'
)))
*
ptr
=
0
;
hdll
=
LoadLibraryExW
(
url_dll
,
NULL
,
LOAD_LIBRARY_AS_DATAFILE
);
if
(
!
hdll
)
{
WARN
(
"Could not open dll: %s
\n
"
,
debugstr_w
(
url_dll
));
...
...
dlls/mshtml/tests/protocol.c
View file @
83ceee74
...
...
@@ -601,6 +601,13 @@ static void test_res_protocol(void)
test_res_url
(
"/jstest.html"
);
test_res_url
(
"/Test/res.html"
);
test_res_url
(
"/test/dir/dir2/res.html"
);
if
(
GetProcAddress
(
LoadLibraryA
(
"urlmon.dll"
),
"CreateUri"
))
{
test_res_url
(
"/test/dir/dir2/res.html?query_part"
);
test_res_url
(
"/test/dir/dir2/res.html#hash_part"
);
}
else
{
win_skip
(
"IUri not supported
\n
"
);
}
}
static
void
do_test_about_protocol
(
IClassFactory
*
factory
,
DWORD
bf
)
...
...
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