system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-05 23:50:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

msi: Treat an empty string and a NULL string as the same value.

Browse source
This commit is contained in:
James Hawkins 2007-07-29 21:23:19 -07:00 committed by Alexandre Julliard
parent d03e2696cf
commit 5e81dbebb0
2 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
dlls/msi/tests/db.c
View file

@ -1562,6 +1562,24 @@ static void test_where(void)
ok( r == ERROR_SUCCESS, "query failed: %d\n", r );
MsiCloseHandle( rec );
rec = MsiCreateRecord(1);
MsiRecordSetString(rec, 1, "");
query = "SELECT * FROM `Media` WHERE `DiskPrompt` = ?";
r = MsiDatabaseOpenView(hdb, query, &view);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
r = MsiViewExecute(view, rec);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
MsiCloseHandle(rec);
r = MsiViewFetch(view, &rec);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
MsiCloseHandle(rec);
MsiViewClose(view);
MsiCloseHandle(view);
MsiCloseHandle( hdb );
DeleteFile(msifile);
}

3
dlls/msi/where.c
View file

@ -192,7 +192,8 @@ static UINT STRCMP_Evaluate( MSIWHEREVIEW *wv, UINT row, const struct expr *cond
l_str = STRING_evaluate( wv, row, cond->u.expr.left, record );
r_str = STRING_evaluate( wv, row, cond->u.expr.right, record );
if( l_str == r_str )
if( l_str == r_str ||
((!l_str || !*l_str) && (!r_str || !*r_str)) )
sr = 0;
else if( l_str && ! r_str )
sr = 1;