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
67d86e63
Commit
67d86e63
authored
Mar 11, 2013
by
Jacek Caban
Committed by
Alexandre Julliard
Mar 11, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
jscript: Use BSTR also for pure IDispatch call in disp_get_id.
parent
587d007d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
12 deletions
+16
-12
engine.c
dlls/jscript/engine.c
+16
-12
No files found.
dlls/jscript/engine.c
View file @
67d86e63
...
@@ -350,6 +350,7 @@ static HRESULT disp_get_id(script_ctx_t *ctx, IDispatch *disp, WCHAR *name, BSTR
...
@@ -350,6 +350,7 @@ static HRESULT disp_get_id(script_ctx_t *ctx, IDispatch *disp, WCHAR *name, BSTR
{
{
IDispatchEx
*
dispex
;
IDispatchEx
*
dispex
;
jsdisp_t
*
jsdisp
;
jsdisp_t
*
jsdisp
;
BSTR
bstr
;
HRESULT
hres
;
HRESULT
hres
;
jsdisp
=
iface_to_jsdisp
((
IUnknown
*
)
disp
);
jsdisp
=
iface_to_jsdisp
((
IUnknown
*
)
disp
);
...
@@ -359,24 +360,27 @@ static HRESULT disp_get_id(script_ctx_t *ctx, IDispatch *disp, WCHAR *name, BSTR
...
@@ -359,24 +360,27 @@ static HRESULT disp_get_id(script_ctx_t *ctx, IDispatch *disp, WCHAR *name, BSTR
return
hres
;
return
hres
;
}
}
if
(
name_bstr
)
{
bstr
=
name_bstr
;
}
else
{
bstr
=
SysAllocString
(
name
);
if
(
!
bstr
)
return
E_OUTOFMEMORY
;
}
*
id
=
0
;
*
id
=
0
;
hres
=
IDispatch_QueryInterface
(
disp
,
&
IID_IDispatchEx
,
(
void
**
)
&
dispex
);
hres
=
IDispatch_QueryInterface
(
disp
,
&
IID_IDispatchEx
,
(
void
**
)
&
dispex
);
if
(
SUCCEEDED
(
hres
))
{
if
(
SUCCEEDED
(
hres
))
{
BSTR
str
=
name_bstr
;
hres
=
IDispatchEx_GetDispID
(
dispex
,
bstr
,
make_grfdex
(
ctx
,
flags
|
fdexNameCaseSensitive
),
id
);
if
(
!
str
)
str
=
SysAllocString
(
name
);
if
(
str
)
hres
=
IDispatchEx_GetDispID
(
dispex
,
str
,
make_grfdex
(
ctx
,
flags
|
fdexNameCaseSensitive
),
id
);
else
hres
=
E_OUTOFMEMORY
;
IDispatchEx_Release
(
dispex
);
IDispatchEx_Release
(
dispex
);
return
hres
;
}
else
{
TRACE
(
"using IDispatch
\n
"
);
hres
=
IDispatch_GetIDsOfNames
(
disp
,
&
IID_NULL
,
&
name
,
1
,
0
,
id
);
}
}
TRACE
(
"using IDispatch
\n
"
);
if
(
name_bstr
!=
bstr
)
SysFreeString
(
bstr
);
return
IDispatch_GetIDsOfNames
(
disp
,
&
IID_NULL
,
&
name
,
1
,
0
,
id
)
;
return
hres
;
}
}
static
inline
BOOL
var_is_null
(
const
VARIANT
*
v
)
static
inline
BOOL
var_is_null
(
const
VARIANT
*
v
)
...
...
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