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
efc59d1b
Commit
efc59d1b
authored
Sep 15, 2011
by
Jacek Caban
Committed by
Alexandre Julliard
Sep 15, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vbscript: Store class_desc_t in vbdisp_t.
parent
fb57bc21
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
4 deletions
+9
-4
interp.c
dlls/vbscript/interp.c
+1
-1
vbdisp.c
dlls/vbscript/vbdisp.c
+4
-2
vbscript.h
dlls/vbscript/vbscript.h
+4
-1
No files found.
dlls/vbscript/interp.c
View file @
efc59d1b
...
...
@@ -463,7 +463,7 @@ static HRESULT interp_new(exec_ctx_t *ctx)
return
E_FAIL
;
}
hres
=
create_vbdisp
(
&
obj
);
hres
=
create_vbdisp
(
class_desc
,
&
obj
);
if
(
FAILED
(
hres
))
return
hres
;
...
...
dlls/vbscript/vbdisp.c
View file @
efc59d1b
...
...
@@ -184,7 +184,7 @@ static IDispatchExVtbl DispatchExVtbl = {
DispatchEx_GetNameSpaceParent
};
HRESULT
create_vbdisp
(
vbdisp_t
**
ret
)
HRESULT
create_vbdisp
(
const
class_desc_t
*
desc
,
vbdisp_t
**
ret
)
{
vbdisp_t
*
vbdisp
;
...
...
@@ -194,6 +194,7 @@ HRESULT create_vbdisp(vbdisp_t **ret)
vbdisp
->
IDispatchEx_iface
.
lpVtbl
=
&
DispatchExVtbl
;
vbdisp
->
ref
=
1
;
vbdisp
->
desc
=
desc
;
*
ret
=
vbdisp
;
return
S_OK
;
...
...
@@ -201,7 +202,8 @@ HRESULT create_vbdisp(vbdisp_t **ret)
HRESULT
init_global
(
script_ctx_t
*
ctx
)
{
return
create_vbdisp
(
&
ctx
->
script_obj
);
ctx
->
script_desc
.
ctx
=
ctx
;
return
create_vbdisp
(
&
ctx
->
script_desc
,
&
ctx
->
script_obj
);
}
HRESULT
disp_get_id
(
IDispatch
*
disp
,
BSTR
name
,
DISPID
*
id
)
...
...
dlls/vbscript/vbscript.h
View file @
efc59d1b
...
...
@@ -65,6 +65,8 @@ typedef struct {
IDispatchEx
IDispatchEx_iface
;
LONG
ref
;
const
class_desc_t
*
desc
;
}
vbdisp_t
;
typedef
enum
{
...
...
@@ -74,7 +76,7 @@ typedef enum {
VBDISP_ANY
}
vbdisp_invoke_type_t
;
HRESULT
create_vbdisp
(
vbdisp_t
**
);
HRESULT
create_vbdisp
(
const
class_desc_t
*
,
vbdisp_t
**
);
HRESULT
disp_get_id
(
IDispatch
*
,
BSTR
,
DISPID
*
);
HRESULT
disp_call
(
script_ctx_t
*
,
IDispatch
*
,
DISPID
,
DISPPARAMS
*
,
VARIANT
*
);
HRESULT
disp_propput
(
script_ctx_t
*
,
IDispatch
*
,
DISPID
,
VARIANT
*
);
...
...
@@ -101,6 +103,7 @@ struct _script_ctx_t {
IDispatch
*
host_global
;
class_desc_t
script_desc
;
vbdisp_t
*
script_obj
;
dynamic_var_t
*
global_vars
;
...
...
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