Hib Eris : msi: Fix LONGCHAR column data type.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 0a81fbfa391c84c5ce22bbb11e96c972822b8812
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=0a81fbfa391c84c5ce22bbb11e...

Author: Hib Eris 
Date:   Sat Apr 25 21:38:06 2009 +0200

msi: Fix LONGCHAR column data type.

---

dlls/msi/sql.y      |    2 +-
 dlls/msi/tests/db.c |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/msi/sql.y b/dlls/msi/sql.y
index 7bf8ce6..8f241b1 100644
--- a/dlls/msi/sql.y
+++ b/dlls/msi/sql.y
@@ -359,7 +359,7 @@ data_type:
         }
   | TK_LONGCHAR
         {
-            $$ = 2;
+            $$ = MSITYPE_STRING | 0x400;
         }
   | TK_SHORT
         {
diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c
index 16a7ba6..41f65f1 100644
--- a/dlls/msi/tests/db.c
+++ b/dlls/msi/tests/db.c
@@ -1148,7 +1148,7 @@ static void test_viewgetcolumninfo(void)
     ok( check_record( rec, 4, "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");
-    todo_wine ok( check_record( rec, 7, "S0"), "wrong record type\n");
+    ok( check_record( rec, 7, "S0"), "wrong record type\n");

MsiCloseHandle( rec );

@@ -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", 5 ), "_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 */
     rec = get_column_info( hdb, "select * from `Properties`", MSICOLINFO_NAMES );