Commit 0a81fbfa authored by Hib Eris's avatar Hib Eris Committed by Alexandre Julliard

msi: Fix LONGCHAR column data type.

parent 508028ae
...@@ -359,7 +359,7 @@ data_type: ...@@ -359,7 +359,7 @@ data_type:
} }
| TK_LONGCHAR | TK_LONGCHAR
{ {
$$ = 2; $$ = MSITYPE_STRING | 0x400;
} }
| TK_SHORT | TK_SHORT
{ {
......
...@@ -1148,7 +1148,7 @@ static void test_viewgetcolumninfo(void) ...@@ -1148,7 +1148,7 @@ static void test_viewgetcolumninfo(void)
ok( check_record( rec, 4, "I2"), "wrong record type\n"); ok( check_record( rec, 4, "I2"), "wrong record type\n");
ok( check_record( rec, 5, "I2"), "wrong record type\n"); ok( check_record( rec, 5, "I2"), "wrong record type\n");
ok( check_record( rec, 6, "I4"), "wrong record type\n"); ok( check_record( rec, 6, "I4"), "wrong record type\n");
todo_wine ok( check_record( rec, 7, "S0"), "wrong record type\n"); ok( check_record( rec, 7, "S0"), "wrong record type\n");
MsiCloseHandle( rec ); MsiCloseHandle( rec );
...@@ -1159,7 +1159,7 @@ static void test_viewgetcolumninfo(void) ...@@ -1159,7 +1159,7 @@ static void test_viewgetcolumninfo(void)
ok( 0x1502 == get_columns_table_type(hdb, "Properties", 4 ), "_columns table wrong\n"); ok( 0x1502 == get_columns_table_type(hdb, "Properties", 4 ), "_columns table wrong\n");
ok( 0x1502 == get_columns_table_type(hdb, "Properties", 5 ), "_columns table wrong\n"); ok( 0x1502 == get_columns_table_type(hdb, "Properties", 5 ), "_columns table wrong\n");
ok( 0x1104 == get_columns_table_type(hdb, "Properties", 6 ), "_columns table wrong\n"); ok( 0x1104 == get_columns_table_type(hdb, "Properties", 6 ), "_columns table wrong\n");
todo_wine ok( 0x1d00 == get_columns_table_type(hdb, "Properties", 7 ), "_columns table wrong\n"); ok( 0x1d00 == get_columns_table_type(hdb, "Properties", 7 ), "_columns table wrong\n");
/* now try the names */ /* now try the names */
rec = get_column_info( hdb, "select * from `Properties`", MSICOLINFO_NAMES ); rec = get_column_info( hdb, "select * from `Properties`", MSICOLINFO_NAMES );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment