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
f3d80586
Commit
f3d80586
authored
Dec 06, 2009
by
Jacek Caban
Committed by
Alexandre Julliard
Dec 07, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Don't pass fdexNameEnsure flag to script engines in find_global_prop.
parent
9f9635d2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
1 deletion
+20
-1
script.c
dlls/mshtml/script.c
+1
-1
script.c
dlls/mshtml/tests/script.c
+19
-0
No files found.
dlls/mshtml/script.c
View file @
f3d80586
...
...
@@ -895,7 +895,7 @@ BOOL find_global_prop(HTMLWindow *window, BSTR name, DWORD flags, ScriptHost **r
hres
=
IDispatch_QueryInterface
(
disp
,
&
IID_IDispatchEx
,
(
void
**
)
&
dispex
);
if
(
SUCCEEDED
(
hres
))
{
hres
=
IDispatchEx_GetDispID
(
dispex
,
name
,
flags
,
ret_id
);
hres
=
IDispatchEx_GetDispID
(
dispex
,
name
,
flags
&
(
~
fdexNameEnsure
)
,
ret_id
);
IDispatchEx_Release
(
dispex
);
}
else
{
FIXME
(
"No IDispatchEx
\n
"
);
...
...
dlls/mshtml/tests/script.c
View file @
f3d80586
...
...
@@ -115,6 +115,7 @@ DEFINE_EXPECT(funcDisp);
DEFINE_EXPECT
(
script_divid_d
);
DEFINE_EXPECT
(
script_testprop_d
);
DEFINE_EXPECT
(
script_testprop_i
);
DEFINE_EXPECT
(
script_testprop2_d
);
DEFINE_EXPECT
(
AXQueryInterface_IActiveScript
);
DEFINE_EXPECT
(
AXQueryInterface_IObjectSafety
);
DEFINE_EXPECT
(
AXGetInterfaceSafetyOptions
);
...
...
@@ -124,6 +125,7 @@ DEFINE_EXPECT(AXSetInterfaceSafetyOptions);
#define TESTACTIVEX_CLSID "{178fc163-f585-4e24-9c13-4bb7faf80646}"
#define DISPID_SCRIPT_TESTPROP 0x100000
#define DISPID_SCRIPT_TESTPROP2 0x100001
static
const
GUID
CLSID_TestScript
=
{
0x178fc163
,
0xf585
,
0x4e24
,{
0x9c
,
0x13
,
0x4b
,
0xb7
,
0xfa
,
0xf8
,
0x07
,
0x46
}};
...
...
@@ -394,6 +396,13 @@ static HRESULT WINAPI scriptDisp_GetDispID(IDispatchEx *iface, BSTR bstrName, DW
return
S_OK
;
}
if
(
!
strcmp_wa
(
bstrName
,
"testProp2"
))
{
CHECK_EXPECT
(
script_testprop2_d
);
ok
(
grfdex
==
fdexNameCaseSensitive
,
"grfdex = %x
\n
"
,
grfdex
);
*
pid
=
DISPID_SCRIPT_TESTPROP2
;
return
S_OK
;
}
if
(
!
strcmp_wa
(
bstrName
,
"divid"
))
{
CHECK_EXPECT
(
script_divid_d
);
ok
(
grfdex
==
fdexNameCaseSensitive
,
"grfdex = %x
\n
"
,
grfdex
);
...
...
@@ -1212,6 +1221,16 @@ static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *ifac
CHECK_CALLED
(
GetScriptDispatch
);
CHECK_CALLED
(
script_testprop_i
);
SET_EXPECT
(
GetScriptDispatch
);
SET_EXPECT
(
script_testprop2_d
);
tmp
=
a2bstr
(
"testProp2"
);
hres
=
IDispatchEx_GetDispID
(
window_dispex
,
tmp
,
fdexNameCaseSensitive
|
fdexNameEnsure
,
&
id
);
ok
(
hres
==
S_OK
,
"GetDispID failed: %08x
\n
"
,
hres
);
ok
(
id
!=
DISPID_SCRIPT_TESTPROP2
,
"id == DISPID_SCRIPT_TESTPROP2
\n
"
);
CHECK_CALLED
(
GetScriptDispatch
);
CHECK_CALLED
(
script_testprop2_d
);
SysFreeString
(
tmp
);
test_global_id
();
test_security
();
...
...
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