MSI: STRING_Evaluate

[Johan Dahlin]

Simple bugfix, catch EXPR_COL_NUMBER expressions in STRING_Evaluate.
Also improve the debugging output for similar functions.

Makes the VC++ standalone installation proceed a big further.

Johan
-------------- next part --------------
Index: where.c
===================================================================
RCS file: /home/wine/wine/dlls/msi/where.c,v
retrieving revision 1.19
diff -u -B -p -r1.19 where.c
--- where.c	29 May 2005 20:08:12 -0000	1.19
+++ where.c	24 Aug 2005 23:28:18 -0000
@@ -136,6 +136,7 @@ static const WCHAR *STRING_evaluate( str
 
     switch( expr->type )
     {
+    case EXPR_COL_NUMBER:
     case EXPR_COL_NUMBER_STRING:
         r = table->ops->fetch_int( table, row, expr->u.col_number, &val );
         if( r != ERROR_SUCCESS )
@@ -149,7 +150,7 @@ static const WCHAR *STRING_evaluate( str
         return MSI_RecordGetString( record, 1 );
 
     default:
-        ERR("Invalid expression type\n");
+        ERR("Invalid expression type: %d\n", expr->type);
         break;
     }
     return NULL;
@@ -215,7 +216,7 @@ static UINT WHERE_evaluate( MSIDATABASE 
         return ERROR_SUCCESS;
 
     default:
-        ERR("Invalid expression type\n");
+        ERR("Invalid expression type: %d\n", cond->type);
         break;
     } 
 
@@ -430,7 +431,7 @@ static UINT WHERE_VerifyCondition( MSIDA
         *valid = 1;
         break;
     default:
-        ERR("Invalid expression type\n");
+        ERR("Invalid expression type: %d\n", cond->type);
         *valid = 0;
         break;
     } 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: jdahlin.vcf
Type: text/x-vcard
Size: 414 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20050824/c2c2929c/jdahlin.vcf