Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Zsolt Vadász
wine
Commits
f560e983
Commit
f560e983
authored
13 years ago
by
Jacek Caban
Committed by
Alexandre Julliard
13 years ago
Browse files
Options
Downloads
Patches
Plain Diff
jscript: Removed no longer needed disp_propget caller argument.
parent
e0ae1826
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
dlls/jscript/dispex.c
+2
-2
2 additions, 2 deletions
dlls/jscript/dispex.c
dlls/jscript/engine.c
+7
-7
7 additions, 7 deletions
dlls/jscript/engine.c
dlls/jscript/jscript.h
+1
-1
1 addition, 1 deletion
dlls/jscript/jscript.h
dlls/jscript/jsutils.c
+1
-1
1 addition, 1 deletion
dlls/jscript/jsutils.c
with
11 additions
and
11 deletions
dlls/jscript/dispex.c
+
2
−
2
View file @
f560e983
...
...
@@ -1184,7 +1184,7 @@ HRESULT jsdisp_propget(jsdisp_t *jsdisp, DISPID id, VARIANT *val, jsexcept_t *ei
return
prop_get
(
jsdisp
,
prop
,
&
dp
,
val
,
ei
,
caller
);
}
HRESULT
disp_propget
(
script_ctx_t
*
ctx
,
IDispatch
*
disp
,
DISPID
id
,
VARIANT
*
val
,
jsexcept_t
*
ei
,
IServiceProvider
*
caller
)
HRESULT
disp_propget
(
script_ctx_t
*
ctx
,
IDispatch
*
disp
,
DISPID
id
,
VARIANT
*
val
,
jsexcept_t
*
ei
)
{
DISPPARAMS
dp
=
{
NULL
,
NULL
,
0
,
0
};
IDispatchEx
*
dispex
;
...
...
@@ -1193,7 +1193,7 @@ HRESULT disp_propget(script_ctx_t *ctx, IDispatch *disp, DISPID id, VARIANT *val
jsdisp
=
iface_to_jsdisp
((
IUnknown
*
)
disp
);
if
(
jsdisp
)
{
hres
=
jsdisp_propget
(
jsdisp
,
id
,
val
,
ei
,
caller
);
hres
=
jsdisp_propget
(
jsdisp
,
id
,
val
,
ei
,
NULL
);
jsdisp_release
(
jsdisp
);
return
hres
;
}
...
...
This diff is collapsed.
Click to expand it.
dlls/jscript/engine.c
+
7
−
7
View file @
f560e983
...
...
@@ -230,7 +230,7 @@ static HRESULT exprval_value(script_ctx_t *ctx, exprval_t *val, jsexcept_t *ei,
return
E_FAIL
;
}
return
disp_propget
(
ctx
,
val
->
u
.
idref
.
disp
,
val
->
u
.
idref
.
id
,
ret
,
ei
,
NULL
/*FIXME*/
);
return
disp_propget
(
ctx
,
val
->
u
.
idref
.
disp
,
val
->
u
.
idref
.
id
,
ret
,
ei
);
case
EXPRVAL_INVALID
:
assert
(
0
);
}
...
...
@@ -843,7 +843,7 @@ static HRESULT interp_array(exec_ctx_t *ctx)
hres
=
disp_get_id
(
ctx
->
parser
->
script
,
obj
,
name
,
0
,
&
id
);
SysFreeString
(
name
);
if
(
SUCCEEDED
(
hres
))
{
hres
=
disp_propget
(
ctx
->
parser
->
script
,
obj
,
id
,
&
v
,
ctx
->
ei
,
NULL
/*FIXME*/
);
hres
=
disp_propget
(
ctx
->
parser
->
script
,
obj
,
id
,
&
v
,
ctx
->
ei
);
}
else
if
(
hres
==
DISP_E_UNKNOWNNAME
)
{
V_VT
(
&
v
)
=
VT_EMPTY
;
hres
=
S_OK
;
...
...
@@ -873,7 +873,7 @@ static HRESULT interp_member(exec_ctx_t *ctx)
hres
=
disp_get_id
(
ctx
->
parser
->
script
,
obj
,
arg
,
0
,
&
id
);
if
(
SUCCEEDED
(
hres
))
{
V_VT
(
&
v
)
=
VT_EMPTY
;
hres
=
disp_propget
(
ctx
->
parser
->
script
,
obj
,
id
,
&
v
,
ctx
->
ei
,
NULL
/*FIXME*/
);
hres
=
disp_propget
(
ctx
->
parser
->
script
,
obj
,
id
,
&
v
,
ctx
->
ei
);
}
else
if
(
hres
==
DISP_E_UNKNOWNNAME
)
{
V_VT
(
&
v
)
=
VT_EMPTY
;
hres
=
S_OK
;
...
...
@@ -940,7 +940,7 @@ static HRESULT interp_refval(exec_ctx_t *ctx)
if
(
!
disp
)
return
throw_reference_error
(
ctx
->
parser
->
script
,
ctx
->
ei
,
JS_E_ILLEGAL_ASSIGN
,
NULL
);
hres
=
disp_propget
(
ctx
->
parser
->
script
,
disp
,
id
,
&
v
,
ctx
->
ei
,
NULL
/*FIXME*/
);
hres
=
disp_propget
(
ctx
->
parser
->
script
,
disp
,
id
,
&
v
,
ctx
->
ei
);
if
(
FAILED
(
hres
))
return
hres
;
...
...
@@ -1784,7 +1784,7 @@ static HRESULT interp_typeofid(exec_ctx_t *ctx)
return
stack_push_string
(
ctx
,
undefinedW
);
V_VT
(
&
v
)
=
VT_EMPTY
;
hres
=
disp_propget
(
ctx
->
parser
->
script
,
obj
,
id
,
&
v
,
ctx
->
ei
,
NULL
/*FIXME*/
);
hres
=
disp_propget
(
ctx
->
parser
->
script
,
obj
,
id
,
&
v
,
ctx
->
ei
);
IDispatch_Release
(
obj
);
if
(
FAILED
(
hres
))
return
stack_push_string
(
ctx
,
unknownW
);
...
...
@@ -1896,7 +1896,7 @@ static HRESULT interp_postinc(exec_ctx_t *ctx)
if
(
!
obj
)
return
throw_type_error
(
ctx
->
parser
->
script
,
ctx
->
ei
,
JS_E_OBJECT_EXPECTED
,
NULL
);
hres
=
disp_propget
(
ctx
->
parser
->
script
,
obj
,
id
,
&
v
,
ctx
->
ei
,
NULL
/*FIXME*/
);
hres
=
disp_propget
(
ctx
->
parser
->
script
,
obj
,
id
,
&
v
,
ctx
->
ei
);
if
(
SUCCEEDED
(
hres
))
{
VARIANT
n
,
inc
;
...
...
@@ -1930,7 +1930,7 @@ static HRESULT interp_preinc(exec_ctx_t *ctx)
if
(
!
obj
)
return
throw_type_error
(
ctx
->
parser
->
script
,
ctx
->
ei
,
JS_E_OBJECT_EXPECTED
,
NULL
);
hres
=
disp_propget
(
ctx
->
parser
->
script
,
obj
,
id
,
&
v
,
ctx
->
ei
,
NULL
/*FIXME*/
);
hres
=
disp_propget
(
ctx
->
parser
->
script
,
obj
,
id
,
&
v
,
ctx
->
ei
);
if
(
SUCCEEDED
(
hres
))
{
VARIANT
n
;
...
...
This diff is collapsed.
Click to expand it.
dlls/jscript/jscript.h
+
1
−
1
View file @
f560e983
...
...
@@ -210,7 +210,7 @@ HRESULT disp_call(script_ctx_t*,IDispatch*,DISPID,WORD,DISPPARAMS*,VARIANT*,jsex
HRESULT
jsdisp_call_value
(
jsdisp_t
*
,
WORD
,
DISPPARAMS
*
,
VARIANT
*
,
jsexcept_t
*
,
IServiceProvider
*
)
DECLSPEC_HIDDEN
;
HRESULT
jsdisp_call
(
jsdisp_t
*
,
DISPID
,
WORD
,
DISPPARAMS
*
,
VARIANT
*
,
jsexcept_t
*
)
DECLSPEC_HIDDEN
;
HRESULT
jsdisp_call_name
(
jsdisp_t
*
,
const
WCHAR
*
,
WORD
,
DISPPARAMS
*
,
VARIANT
*
,
jsexcept_t
*
,
IServiceProvider
*
)
DECLSPEC_HIDDEN
;
HRESULT
disp_propget
(
script_ctx_t
*
,
IDispatch
*
,
DISPID
,
VARIANT
*
,
jsexcept_t
*
,
IServiceProvider
*
)
DECLSPEC_HIDDEN
;
HRESULT
disp_propget
(
script_ctx_t
*
,
IDispatch
*
,
DISPID
,
VARIANT
*
,
jsexcept_t
*
)
DECLSPEC_HIDDEN
;
HRESULT
disp_propput
(
script_ctx_t
*
,
IDispatch
*
,
DISPID
,
VARIANT
*
,
jsexcept_t
*
,
IServiceProvider
*
)
DECLSPEC_HIDDEN
;
HRESULT
jsdisp_propget
(
jsdisp_t
*
,
DISPID
,
VARIANT
*
,
jsexcept_t
*
,
IServiceProvider
*
)
DECLSPEC_HIDDEN
;
HRESULT
jsdisp_propput_name
(
jsdisp_t
*
,
const
WCHAR
*
,
VARIANT
*
,
jsexcept_t
*
,
IServiceProvider
*
)
DECLSPEC_HIDDEN
;
...
...
This diff is collapsed.
Click to expand it.
dlls/jscript/jsutils.c
+
1
−
1
View file @
f560e983
...
...
@@ -211,7 +211,7 @@ HRESULT to_primitive(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, VARIANT *ret
jsdisp
=
iface_to_jsdisp
((
IUnknown
*
)
V_DISPATCH
(
v
));
if
(
!
jsdisp
)
{
V_VT
(
ret
)
=
VT_EMPTY
;
return
disp_propget
(
ctx
,
V_DISPATCH
(
v
),
DISPID_VALUE
,
ret
,
ei
,
NULL
/*FIXME*/
);
return
disp_propget
(
ctx
,
V_DISPATCH
(
v
),
DISPID_VALUE
,
ret
,
ei
);
}
if
(
hint
==
NO_HINT
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment