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
39600d9d
Commit
39600d9d
authored
Mar 16, 2009
by
Aric Stewart
Committed by
Alexandre Julliard
Mar 23, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msi: Reorder the condition operators so that longer strings are matched first.
This allows ~<< to be properly matched.
parent
694219d4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
2 deletions
+11
-2
cond.y
dlls/msi/cond.y
+2
-2
package.c
dlls/msi/tests/package.c
+9
-0
No files found.
dlls/msi/cond.y
View file @
39600d9d
...
...
@@ -553,14 +553,14 @@ static int COND_GetOperator( COND_input *cond )
const
WCHAR
str
[
4
];
int
id
;
}
table
[]
=
{
{
{
'~'
,
'='
,
0
},
COND_IEQ
},
{
{
'~'
,
'<'
,
'='
,
0
},
COND_ILE
},
{
{
'~'
,
'>'
,
'<'
,
0
},
COND_ISS
},
{
{
'~'
,
'>'
,
'>'
,
0
},
COND_IRHS
},
{
{
'~'
,
'<'
,
'>'
,
0
},
COND_INE
},
{
{
'~'
,
'<'
,
0
},
COND_ILT
},
{
{
'~'
,
'>'
,
'='
,
0
},
COND_IGE
},
{
{
'~'
,
'<'
,
'<'
,
0
},
COND_ILHS
},
{
{
'~'
,
'='
,
0
},
COND_IEQ
},
{
{
'~'
,
'<'
,
0
},
COND_ILT
},
{
{
'~'
,
'>'
,
0
},
COND_IGT
},
{
{
'>'
,
'='
,
0
},
COND_GE
},
{
{
'>'
,
'<'
,
0
},
COND_SS
},
...
...
dlls/msi/tests/package.c
View file @
39600d9d
...
...
@@ -1072,6 +1072,15 @@ static void test_condition(void)
r
=
MsiEvaluateCondition
(
hpkg
,
"not LicView"
);
ok
(
r
==
MSICONDITION_TRUE
,
"wrong return val
\n
"
);
r
=
MsiEvaluateCondition
(
hpkg
,
"
\"
Testing
\"
~<<
\"
Testing
\"
"
);
ok
(
r
==
MSICONDITION_TRUE
,
"wrong return val
\n
"
);
r
=
MsiEvaluateCondition
(
hpkg
,
"LicView ~<<
\"
Testing
\"
"
);
ok
(
r
==
MSICONDITION_FALSE
,
"wrong return val
\n
"
);
r
=
MsiEvaluateCondition
(
hpkg
,
"Not LicView ~<<
\"
Testing
\"
"
);
ok
(
r
==
MSICONDITION_TRUE
,
"wrong return val
\n
"
);
r
=
MsiEvaluateCondition
(
hpkg
,
"not
\"
A
\"
"
);
ok
(
r
==
MSICONDITION_FALSE
,
"wrong return val
\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