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
176f5409
Commit
176f5409
authored
Nov 07, 2022
by
Gabriel Ivăncescu
Committed by
Alexandre Julliard
Nov 07, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Don't include fragment in storage event's url prop.
Signed-off-by:
Gabriel Ivăncescu
<
gabrielopcode@gmail.com
>
parent
c2d55cd2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
5 deletions
+11
-5
htmlstorage.c
dlls/mshtml/htmlstorage.c
+10
-4
documentmode.js
dlls/mshtml/tests/documentmode.js
+1
-1
No files found.
dlls/mshtml/htmlstorage.c
View file @
176f5409
...
@@ -235,7 +235,7 @@ struct send_storage_event_ctx {
...
@@ -235,7 +235,7 @@ struct send_storage_event_ctx {
BSTR
key
;
BSTR
key
;
BSTR
old_value
;
BSTR
old_value
;
BSTR
new_value
;
BSTR
new_value
;
const
WCHAR
*
url
;
BSTR
url
;
};
};
static
HRESULT
push_storage_event_task
(
struct
send_storage_event_ctx
*
ctx
,
HTMLInnerWindow
*
window
,
BOOL
commit
)
static
HRESULT
push_storage_event_task
(
struct
send_storage_event_ctx
*
ctx
,
HTMLInnerWindow
*
window
,
BOOL
commit
)
...
@@ -324,11 +324,16 @@ static HRESULT send_storage_event(HTMLStorage *storage, BSTR key, BSTR old_value
...
@@ -324,11 +324,16 @@ static HRESULT send_storage_event(HTMLStorage *storage, BSTR key, BSTR old_value
BSTR
hostname
=
NULL
;
BSTR
hostname
=
NULL
;
HRESULT
hres
=
S_OK
;
HRESULT
hres
=
S_OK
;
ctx
.
url
=
NULL
;
if
(
!
window
)
if
(
!
window
)
goto
done
;
goto
done
;
get_top_window
(
window
->
base
.
outer_window
,
&
top_window
);
if
(
window
->
base
.
outer_window
->
uri_nofrag
)
{
hres
=
IUri_GetDisplayUri
(
window
->
base
.
outer_window
->
uri_nofrag
,
&
ctx
.
url
);
if
(
hres
!=
S_OK
)
goto
done
;
}
ctx
.
url
=
window
->
base
.
outer_window
->
url
;
get_top_window
(
window
->
base
.
outer_window
,
&
top_window
)
;
ctx
.
key
=
key
;
ctx
.
key
=
key
;
ctx
.
old_value
=
old_value
;
ctx
.
old_value
=
old_value
;
ctx
.
new_value
=
new_value
;
ctx
.
new_value
=
new_value
;
...
@@ -351,9 +356,10 @@ static HRESULT send_storage_event(HTMLStorage *storage, BSTR key, BSTR old_value
...
@@ -351,9 +356,10 @@ static HRESULT send_storage_event(HTMLStorage *storage, BSTR key, BSTR old_value
hres
=
push_storage_event_task
(
&
ctx
,
window
,
TRUE
);
hres
=
push_storage_event_task
(
&
ctx
,
window
,
TRUE
);
done:
done:
SysFreeString
(
ctx
.
url
);
SysFreeString
(
hostname
);
SysFreeString
(
hostname
);
SysFreeString
(
old_value
);
SysFreeString
(
old_value
);
return
hres
;
return
FAILED
(
hres
)
?
hres
:
S_OK
;
}
}
static
HRESULT
WINAPI
HTMLStorage_QueryInterface
(
IHTMLStorage
*
iface
,
REFIID
riid
,
void
**
ppv
)
static
HRESULT
WINAPI
HTMLStorage_QueryInterface
(
IHTMLStorage
*
iface
,
REFIID
riid
,
void
**
ppv
)
...
...
dlls/mshtml/tests/documentmode.js
View file @
176f5409
...
@@ -1468,7 +1468,7 @@ async_test("storage events", function() {
...
@@ -1468,7 +1468,7 @@ async_test("storage events", function() {
ok
(
e
.
key
===
key
,
"key = "
+
e
.
key
+
", expected "
+
key
);
ok
(
e
.
key
===
key
,
"key = "
+
e
.
key
+
", expected "
+
key
);
ok
(
e
.
oldValue
===
oldValue
,
"oldValue = "
+
e
.
oldValue
+
", expected "
+
oldValue
);
ok
(
e
.
oldValue
===
oldValue
,
"oldValue = "
+
e
.
oldValue
+
", expected "
+
oldValue
);
ok
(
e
.
newValue
===
newValue
,
"newValue = "
+
e
.
newValue
+
", expected "
+
newValue
);
ok
(
e
.
newValue
===
newValue
,
"newValue = "
+
e
.
newValue
+
", expected "
+
newValue
);
s
=
(
idx
?
iframe
.
contentWindow
:
window
)[
"location"
][
"href"
];
s
=
(
idx
?
iframe
.
contentWindow
:
window
)[
"location"
][
"href"
]
.
split
(
'#'
,
1
)[
0
]
;
ok
(
e
.
url
===
s
,
"url = "
+
e
.
url
+
", expected "
+
s
);
ok
(
e
.
url
===
s
,
"url = "
+
e
.
url
+
", expected "
+
s
);
}
}
...
...
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