msi: merge cond.y fixes from codeweavers
Aric Stewart
aric at codeweavers.com
Wed May 18 11:32:04 CDT 2005
A few small cond.y fixes.
-------------- next part --------------
Index: dlls/msi/cond.y
===================================================================
RCS file: /home/wine/wine/dlls/msi/cond.y,v
retrieving revision 1.17
diff -u -r1.17 cond.y
--- dlls/msi/cond.y 18 Apr 2005 10:30:56 -0000 1.17
+++ dlls/msi/cond.y 18 May 2005 16:31:23 -0000
@@ -181,7 +181,7 @@
}
| value_s
{
- $$ = $1[0] ? MSICONDITION_TRUE : MSICONDITION_FALSE;
+ $$ = ($1 && $1[0]) ? MSICONDITION_TRUE : MSICONDITION_FALSE;
}
| value_i comp_op_i value_i
{
@@ -739,7 +739,9 @@
TRACE("Evaluating %s\n",debugstr_w(szCondition));
- if( szCondition && !COND_parse( &cond ) )
+ if ( szCondition == NULL || szCondition[0] == 0)
+ r = MSICONDITION_NONE;
+ else if ( !COND_parse( &cond ) )
r = cond.result;
else
r = MSICONDITION_ERROR;
More information about the wine-patches
mailing list