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
6920b289
Commit
6920b289
authored
Sep 17, 2012
by
Jacek Caban
Committed by
Alexandre Julliard
Sep 17, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
jscript: Use BOOL instead of VARIANT_BOOL in a few more places.
parent
29f4194d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
regexp.c
dlls/jscript/regexp.c
+5
-5
No files found.
dlls/jscript/regexp.c
View file @
6920b289
...
@@ -3633,7 +3633,7 @@ static HRESULT create_match_array(script_ctx_t *ctx, BSTR input, const match_res
...
@@ -3633,7 +3633,7 @@ static HRESULT create_match_array(script_ctx_t *ctx, BSTR input, const match_res
}
}
static
HRESULT
run_exec
(
script_ctx_t
*
ctx
,
vdisp_t
*
jsthis
,
jsval_t
arg
,
jsexcept_t
*
ei
,
BSTR
*
input
,
static
HRESULT
run_exec
(
script_ctx_t
*
ctx
,
vdisp_t
*
jsthis
,
jsval_t
arg
,
jsexcept_t
*
ei
,
BSTR
*
input
,
match_result_t
*
match
,
match_result_t
**
parens
,
DWORD
*
parens_cnt
,
VARIANT_
BOOL
*
ret
)
match_result_t
*
match
,
match_result_t
**
parens
,
DWORD
*
parens_cnt
,
BOOL
*
ret
)
{
{
RegExpInstance
*
regexp
;
RegExpInstance
*
regexp
;
DWORD
parens_size
=
0
,
last_index
=
0
,
length
;
DWORD
parens_size
=
0
,
last_index
=
0
,
length
;
...
@@ -3657,7 +3657,7 @@ static HRESULT run_exec(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t arg, jsexcep
...
@@ -3657,7 +3657,7 @@ static HRESULT run_exec(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t arg, jsexcep
if
(
regexp
->
last_index
<
0
)
{
if
(
regexp
->
last_index
<
0
)
{
SysFreeString
(
string
);
SysFreeString
(
string
);
set_last_index
(
regexp
,
0
);
set_last_index
(
regexp
,
0
);
*
ret
=
VARIANT_
FALSE
;
*
ret
=
FALSE
;
if
(
input
)
{
if
(
input
)
{
*
input
=
NULL
;
*
input
=
NULL
;
}
}
...
@@ -3675,7 +3675,7 @@ static HRESULT run_exec(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t arg, jsexcep
...
@@ -3675,7 +3675,7 @@ static HRESULT run_exec(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t arg, jsexcep
return
hres
;
return
hres
;
}
}
*
ret
=
hres
==
S_OK
?
VARIANT_TRUE
:
VARIANT_FALSE
;
*
ret
=
hres
==
S_OK
;
if
(
input
)
{
if
(
input
)
{
*
input
=
string
;
*
input
=
string
;
}
else
{
}
else
{
...
@@ -3689,7 +3689,7 @@ static HRESULT RegExp_exec(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsig
...
@@ -3689,7 +3689,7 @@ static HRESULT RegExp_exec(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsig
{
{
match_result_t
*
parens
=
NULL
,
match
;
match_result_t
*
parens
=
NULL
,
match
;
DWORD
parens_cnt
=
0
;
DWORD
parens_cnt
=
0
;
VARIANT_
BOOL
b
;
BOOL
b
;
BSTR
string
;
BSTR
string
;
HRESULT
hres
;
HRESULT
hres
;
...
@@ -3721,7 +3721,7 @@ static HRESULT RegExp_test(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsig
...
@@ -3721,7 +3721,7 @@ static HRESULT RegExp_test(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsig
{
{
match_result_t
match
;
match_result_t
match
;
BSTR
undef_str
;
BSTR
undef_str
;
VARIANT_
BOOL
b
;
BOOL
b
;
HRESULT
hres
;
HRESULT
hres
;
TRACE
(
"
\n
"
);
TRACE
(
"
\n
"
);
...
...
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