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
0d9cc454
Commit
0d9cc454
authored
Mar 12, 2012
by
Jacek Caban
Committed by
Alexandre Julliard
Mar 12, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
jscript: Removed no longer needed caller argument from jsdisp_propget_name.
parent
7d4ba8db
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
8 additions
and
8 deletions
+8
-8
array.c
dlls/jscript/array.c
+1
-1
dispex.c
dlls/jscript/dispex.c
+2
-2
engine.c
dlls/jscript/engine.c
+1
-1
error.c
dlls/jscript/error.c
+2
-2
function.c
dlls/jscript/function.c
+1
-1
jscript.h
dlls/jscript/jscript.h
+1
-1
No files found.
dlls/jscript/array.c
View file @
0d9cc454
...
...
@@ -72,7 +72,7 @@ static HRESULT get_length(script_ctx_t *ctx, vdisp_t *vdisp, jsexcept_t *ei, jsd
if
(
!
is_jsdisp
(
vdisp
))
return
throw_type_error
(
ctx
,
ei
,
JS_E_JSCRIPT_EXPECTED
,
NULL
);
hres
=
jsdisp_propget_name
(
vdisp
->
u
.
jsdisp
,
lengthW
,
&
var
,
ei
,
NULL
/*FIXME*/
);
hres
=
jsdisp_propget_name
(
vdisp
->
u
.
jsdisp
,
lengthW
,
&
var
,
ei
);
if
(
FAILED
(
hres
))
return
hres
;
...
...
dlls/jscript/dispex.c
View file @
0d9cc454
...
...
@@ -1131,7 +1131,7 @@ HRESULT disp_propput(script_ctx_t *ctx, IDispatch *disp, DISPID id, VARIANT *val
return
hres
;
}
HRESULT
jsdisp_propget_name
(
jsdisp_t
*
obj
,
const
WCHAR
*
name
,
VARIANT
*
var
,
jsexcept_t
*
ei
,
IServiceProvider
*
caller
)
HRESULT
jsdisp_propget_name
(
jsdisp_t
*
obj
,
const
WCHAR
*
name
,
VARIANT
*
var
,
jsexcept_t
*
ei
)
{
DISPPARAMS
dp
=
{
NULL
,
NULL
,
0
,
0
};
dispex_prop_t
*
prop
;
...
...
@@ -1145,7 +1145,7 @@ HRESULT jsdisp_propget_name(jsdisp_t *obj, const WCHAR *name, VARIANT *var, jsex
if
(
!
prop
||
prop
->
type
==
PROP_DELETED
)
return
S_OK
;
return
prop_get
(
obj
,
prop
,
&
dp
,
var
,
ei
,
caller
);
return
prop_get
(
obj
,
prop
,
&
dp
,
var
,
ei
,
NULL
);
}
HRESULT
jsdisp_get_idx
(
jsdisp_t
*
obj
,
DWORD
idx
,
VARIANT
*
var
,
jsexcept_t
*
ei
,
IServiceProvider
*
caller
)
...
...
dlls/jscript/engine.c
View file @
0d9cc454
...
...
@@ -1396,7 +1396,7 @@ static HRESULT interp_instanceof(exec_ctx_t *ctx)
}
if
(
is_class
(
obj
,
JSCLASS_FUNCTION
))
{
hres
=
jsdisp_propget_name
(
obj
,
prototypeW
,
&
prot
,
ctx
->
ei
,
NULL
/*FIXME*/
);
hres
=
jsdisp_propget_name
(
obj
,
prototypeW
,
&
prot
,
ctx
->
ei
);
}
else
{
hres
=
throw_type_error
(
ctx
->
parser
->
script
,
ctx
->
ei
,
JS_E_FUNCTION_EXPECTED
,
NULL
);
}
...
...
dlls/jscript/error.c
View file @
0d9cc454
...
...
@@ -56,7 +56,7 @@ static HRESULT Error_toString(script_ctx_t *ctx, vdisp_t *vthis, WORD flags,
return
S_OK
;
}
hres
=
jsdisp_propget_name
(
jsthis
,
nameW
,
&
v
,
ei
,
caller
);
hres
=
jsdisp_propget_name
(
jsthis
,
nameW
,
&
v
,
ei
);
if
(
FAILED
(
hres
))
return
hres
;
...
...
@@ -71,7 +71,7 @@ static HRESULT Error_toString(script_ctx_t *ctx, vdisp_t *vthis, WORD flags,
}
}
hres
=
jsdisp_propget_name
(
jsthis
,
messageW
,
&
v
,
ei
,
caller
);
hres
=
jsdisp_propget_name
(
jsthis
,
messageW
,
&
v
,
ei
);
if
(
SUCCEEDED
(
hres
))
{
if
(
V_VT
(
&
v
)
!=
VT_EMPTY
)
{
hres
=
to_string
(
ctx
,
&
v
,
ei
,
&
msg
);
...
...
dlls/jscript/function.c
View file @
0d9cc454
...
...
@@ -364,7 +364,7 @@ static HRESULT array_to_args(script_ctx_t *ctx, jsdisp_t *arg_array, jsexcept_t
DWORD
length
,
i
;
HRESULT
hres
;
hres
=
jsdisp_propget_name
(
arg_array
,
lengthW
,
&
var
,
ei
,
NULL
/*FIXME*/
);
hres
=
jsdisp_propget_name
(
arg_array
,
lengthW
,
&
var
,
ei
);
if
(
FAILED
(
hres
))
return
hres
;
...
...
dlls/jscript/jscript.h
View file @
0d9cc454
...
...
@@ -216,7 +216,7 @@ HRESULT jsdisp_propget(jsdisp_t*,DISPID,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN;
HRESULT
jsdisp_propput_name
(
jsdisp_t
*
,
const
WCHAR
*
,
VARIANT
*
,
jsexcept_t
*
)
DECLSPEC_HIDDEN
;
HRESULT
jsdisp_propput_const
(
jsdisp_t
*
,
const
WCHAR
*
,
VARIANT
*
)
DECLSPEC_HIDDEN
;
HRESULT
jsdisp_propput_idx
(
jsdisp_t
*
,
DWORD
,
VARIANT
*
,
jsexcept_t
*
)
DECLSPEC_HIDDEN
;
HRESULT
jsdisp_propget_name
(
jsdisp_t
*
,
LPCWSTR
,
VARIANT
*
,
jsexcept_t
*
,
IServiceProvider
*
)
DECLSPEC_HIDDEN
;
HRESULT
jsdisp_propget_name
(
jsdisp_t
*
,
LPCWSTR
,
VARIANT
*
,
jsexcept_t
*
)
DECLSPEC_HIDDEN
;
HRESULT
jsdisp_get_idx
(
jsdisp_t
*
,
DWORD
,
VARIANT
*
,
jsexcept_t
*
,
IServiceProvider
*
)
DECLSPEC_HIDDEN
;
HRESULT
jsdisp_get_id
(
jsdisp_t
*
,
const
WCHAR
*
,
DWORD
,
DISPID
*
)
DECLSPEC_HIDDEN
;
HRESULT
jsdisp_delete_idx
(
jsdisp_t
*
,
DWORD
)
DECLSPEC_HIDDEN
;
...
...
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