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
91b41eb4
Commit
91b41eb4
authored
Sep 18, 2012
by
Jacek Caban
Committed by
Alexandre Julliard
Sep 18, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vbscript: Added ScriptDisp_Invoke implementation.
parent
ba611c0d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
5 deletions
+21
-5
vbscript.c
dlls/vbscript/tests/vbscript.c
+14
-0
vbdisp.c
dlls/vbscript/vbdisp.c
+7
-5
No files found.
dlls/vbscript/tests/vbscript.c
View file @
91b41eb4
...
@@ -468,6 +468,20 @@ static void test_scriptdisp(void)
...
@@ -468,6 +468,20 @@ static void test_scriptdisp(void)
CHECK_CALLED
(
OnEnterScript
);
CHECK_CALLED
(
OnEnterScript
);
CHECK_CALLED
(
OnLeaveScript
);
CHECK_CALLED
(
OnLeaveScript
);
SET_EXPECT
(
OnEnterScript
);
SET_EXPECT
(
OnLeaveScript
);
memset
(
&
dp
,
0
,
sizeof
(
dp
));
memset
(
&
ei
,
0
,
sizeof
(
ei
));
V_VT
(
&
v
)
=
VT_EMPTY
;
hres
=
IDispatchEx_Invoke
(
script_disp
,
id
,
&
IID_NULL
,
0
,
DISPATCH_PROPERTYGET
|
DISPATCH_METHOD
,
&
dp
,
&
v
,
&
ei
,
NULL
);
ok
(
hres
==
S_OK
,
"InvokeEx failed: %08x
\n
"
,
hres
);
ok
(
V_VT
(
&
v
)
==
VT_I2
,
"V_VT(v) = %d
\n
"
,
V_VT
(
&
v
));
ok
(
V_I2
(
&
v
)
==
5
,
"V_I2(v) = %d
\n
"
,
V_I2
(
&
v
));
CHECK_CALLED
(
OnEnterScript
);
CHECK_CALLED
(
OnLeaveScript
);
get_disp_id
(
script_disp
,
"globalSub"
,
DISP_E_UNKNOWNNAME
,
&
id
);
get_disp_id
(
script_disp
,
"globalSub"
,
DISP_E_UNKNOWNNAME
,
&
id
);
parse_script
(
parser
,
"sub globalSub()
\n
end sub"
);
parse_script
(
parser
,
"sub globalSub()
\n
end sub"
);
get_disp_id
(
script_disp
,
"globalSub"
,
S_OK
,
&
id
);
get_disp_id
(
script_disp
,
"globalSub"
,
S_OK
,
&
id
);
...
...
dlls/vbscript/vbdisp.c
View file @
91b41eb4
...
@@ -700,14 +700,16 @@ static HRESULT WINAPI ScriptDisp_GetIDsOfNames(IDispatchEx *iface, REFIID riid,
...
@@ -700,14 +700,16 @@ static HRESULT WINAPI ScriptDisp_GetIDsOfNames(IDispatchEx *iface, REFIID riid,
return
S_OK
;
return
S_OK
;
}
}
static
HRESULT
WINAPI
ScriptDisp_Invoke
(
IDispatchEx
*
iface
,
DISPID
dispIdMember
,
static
HRESULT
WINAPI
ScriptDisp_Invoke
(
IDispatchEx
*
iface
,
DISPID
dispIdMember
,
REFIID
riid
,
LCID
lcid
,
REFIID
riid
,
LCID
lcid
,
WORD
wFlags
,
DISPPARAMS
*
pDispParams
,
WORD
wFlags
,
DISPPARAMS
*
pDispParams
,
VARIANT
*
pVarResult
,
EXCEPINFO
*
pExcepInfo
,
UINT
*
puArgErr
)
VARIANT
*
pVarResult
,
EXCEPINFO
*
pExcepInfo
,
UINT
*
puArgErr
)
{
{
ScriptDisp
*
This
=
ScriptDisp_from_IDispatchEx
(
iface
);
ScriptDisp
*
This
=
ScriptDisp_from_IDispatchEx
(
iface
);
FIXME
(
"(%p)->(%d %s %d %d %p %p %p %p)
\n
"
,
This
,
dispIdMember
,
debugstr_guid
(
riid
),
TRACE
(
"(%p)->(%d %s %d %d %p %p %p %p)
\n
"
,
This
,
dispIdMember
,
debugstr_guid
(
riid
),
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
return
E_NOTIMPL
;
return
IDispatchEx_InvokeEx
(
&
This
->
IDispatchEx_iface
,
dispIdMember
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
NULL
);
}
}
static
HRESULT
WINAPI
ScriptDisp_GetDispID
(
IDispatchEx
*
iface
,
BSTR
bstrName
,
DWORD
grfdex
,
DISPID
*
pid
)
static
HRESULT
WINAPI
ScriptDisp_GetDispID
(
IDispatchEx
*
iface
,
BSTR
bstrName
,
DWORD
grfdex
,
DISPID
*
pid
)
...
...
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