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
f73f8848
Commit
f73f8848
authored
Jul 19, 2016
by
Jacek Caban
Committed by
Alexandre Julliard
Jul 20, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Store external script text in HTMLScriptElement object.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
718a415a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
8 deletions
+14
-8
htmlscript.c
dlls/mshtml/htmlscript.c
+8
-1
htmlscript.h
dlls/mshtml/htmlscript.h
+1
-0
script.c
dlls/mshtml/script.c
+5
-7
No files found.
dlls/mshtml/htmlscript.c
View file @
f73f8848
...
@@ -391,6 +391,13 @@ static HRESULT HTMLScriptElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv)
...
@@ -391,6 +391,13 @@ static HRESULT HTMLScriptElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv)
return
HTMLElement_QI
(
&
This
->
element
.
node
,
riid
,
ppv
);
return
HTMLElement_QI
(
&
This
->
element
.
node
,
riid
,
ppv
);
}
}
static
void
HTMLScriptElement_destructor
(
HTMLDOMNode
*
iface
)
{
HTMLScriptElement
*
This
=
impl_from_HTMLDOMNode
(
iface
);
heap_free
(
This
->
src_text
);
HTMLElement_destructor
(
&
This
->
element
.
node
);
}
static
HRESULT
HTMLScriptElement_get_readystate
(
HTMLDOMNode
*
iface
,
BSTR
*
p
)
static
HRESULT
HTMLScriptElement_get_readystate
(
HTMLDOMNode
*
iface
,
BSTR
*
p
)
{
{
HTMLScriptElement
*
This
=
impl_from_HTMLDOMNode
(
iface
);
HTMLScriptElement
*
This
=
impl_from_HTMLDOMNode
(
iface
);
...
@@ -439,7 +446,7 @@ static void HTMLScriptElement_unlink(HTMLDOMNode *iface)
...
@@ -439,7 +446,7 @@ static void HTMLScriptElement_unlink(HTMLDOMNode *iface)
static
const
NodeImplVtbl
HTMLScriptElementImplVtbl
=
{
static
const
NodeImplVtbl
HTMLScriptElementImplVtbl
=
{
HTMLScriptElement_QI
,
HTMLScriptElement_QI
,
HTMLElement_destructor
,
HTML
Script
Element_destructor
,
HTMLElement_cpc
,
HTMLElement_cpc
,
HTMLElement_clone
,
HTMLElement_clone
,
HTMLElement_handle_event
,
HTMLElement_handle_event
,
...
...
dlls/mshtml/htmlscript.h
View file @
f73f8848
...
@@ -26,6 +26,7 @@ typedef struct {
...
@@ -26,6 +26,7 @@ typedef struct {
BOOL
parse_on_bind
;
BOOL
parse_on_bind
;
BOOL
pending_readystatechange_event
;
BOOL
pending_readystatechange_event
;
READYSTATE
readystate
;
READYSTATE
readystate
;
WCHAR
*
src_text
;
/* sctipt text downloaded from src */
}
HTMLScriptElement
;
}
HTMLScriptElement
;
typedef
struct
{
typedef
struct
{
...
...
dlls/mshtml/script.c
View file @
f73f8848
...
@@ -866,22 +866,20 @@ static void script_file_available(ScriptBSC *bsc)
...
@@ -866,22 +866,20 @@ static void script_file_available(ScriptBSC *bsc)
HTMLScriptElement
*
script_elem
=
bsc
->
script_elem
;
HTMLScriptElement
*
script_elem
=
bsc
->
script_elem
;
HTMLInnerWindow
*
window
=
bsc
->
bsc
.
window
;
HTMLInnerWindow
*
window
=
bsc
->
bsc
.
window
;
ScriptHost
*
script_host
;
ScriptHost
*
script_host
;
WCHAR
*
text
;
HRESULT
hres
;
HRESULT
hres
;
hres
=
get_binding_text
(
bsc
,
&
text
);
assert
(
window
!=
NULL
);
hres
=
get_binding_text
(
bsc
,
&
script_elem
->
src_text
);
if
(
FAILED
(
hres
))
if
(
FAILED
(
hres
))
return
;
return
;
script_host
=
get_elem_script_host
(
window
,
script_elem
);
script_host
=
get_elem_script_host
(
window
,
script_elem
);
if
(
!
script_host
)
{
if
(
!
script_host
)
heap_free
(
text
);
return
;
return
;
}
script_elem
->
parsed
=
TRUE
;
script_elem
->
parsed
=
TRUE
;
parse_elem_text
(
script_host
,
script_elem
,
text
);
parse_elem_text
(
script_host
,
script_elem
,
script_elem
->
src_text
);
heap_free
(
text
);
}
}
static
inline
ScriptBSC
*
impl_from_BSCallback
(
BSCallback
*
iface
)
static
inline
ScriptBSC
*
impl_from_BSCallback
(
BSCallback
*
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