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
99929c08
Commit
99929c08
authored
Mar 27, 2020
by
Jacek Caban
Committed by
Alexandre Julliard
Mar 27, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
jscript: Clear SCRIPTITEM_CODEONLY flag on script re-initialization.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
133918e6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
jscript.c
dlls/jscript/jscript.c
+3
-0
jscript.c
dlls/jscript/tests/jscript.c
+1
-4
No files found.
dlls/jscript/jscript.c
View file @
99929c08
...
...
@@ -757,6 +757,9 @@ static HRESULT WINAPI JScript_SetScriptSite(IActiveScript *iface,
hres
=
retrieve_named_item_disp
(
pass
,
item
);
if
(
FAILED
(
hres
))
return
hres
;
}
/* For some reason, CODEONLY flag is lost in re-initialized scripts */
item
->
flags
&=
~
SCRIPTITEM_CODEONLY
;
}
This
->
site
=
pass
;
...
...
dlls/jscript/tests/jscript.c
View file @
99929c08
...
...
@@ -1599,7 +1599,7 @@ static void test_named_items(void)
CHECK_CALLED
(
OnStateChange_CONNECTED
);
CHECK_CALLED_MULTI
(
OnEnterScript
,
5
);
CHECK_CALLED_MULTI
(
OnLeaveScript
,
5
);
todo_wine
CHECK_CALLED
(
GetIDsOfNames_persistent
);
CHECK_CALLED
(
GetIDsOfNames_persistent
);
test_state
(
script
,
SCRIPTSTATE_CONNECTED
);
dispex2
=
get_script_dispatch
(
script
,
L"persistent"
);
...
...
@@ -1619,7 +1619,6 @@ static void test_named_items(void)
SET_EXPECT
(
OnLeaveScript
);
hr
=
IActiveScriptParse_ParseScriptText
(
parse
,
L"this"
,
L"persistent"
,
NULL
,
NULL
,
0
,
0
,
SCRIPTTEXT_ISEXPRESSION
,
&
var
,
NULL
);
ok
(
hr
==
S_OK
,
"ParseScriptText failed: %08x
\n
"
,
hr
);
todo_wine
ok
(
V_VT
(
&
var
)
==
VT_DISPATCH
&&
V_DISPATCH
(
&
var
)
==
&
persistent_named_item
,
"Unexpected 'this': V_VT = %d, V_DISPATCH = %p
\n
"
,
V_VT
(
&
var
),
V_DISPATCH
(
&
var
));
VariantClear
(
&
var
);
...
...
@@ -1634,7 +1633,6 @@ static void test_named_items(void)
ok
(
hr
==
S_OK
,
"ParseScriptText failed: %08x
\n
"
,
hr
);
CHECK_CALLED
(
OnEnterScript
);
CHECK_CALLED
(
OnLeaveScript
);
todo_wine
CHECK_CALLED
(
GetIDsOfNames_persistent
);
SET_EXPECT
(
OnEnterScript
);
...
...
@@ -1645,7 +1643,6 @@ static void test_named_items(void)
ok
(
FAILED
(
hr
),
"ParseScriptText returned: %08x
\n
"
,
hr
);
CHECK_CALLED
(
OnEnterScript
);
CHECK_CALLED
(
OnLeaveScript
);
todo_wine
CHECK_CALLED
(
GetIDsOfNames_persistent
);
CHECK_CALLED
(
OnScriptError
);
...
...
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