Hib Eris : msi: Fix SHORT column data type.

[Alexandre Julliard]

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

Author: Hib Eris <Hib at hiberis.nl>
Date:   Sat Apr 25 21:36:27 2009 +0200

msi: Fix SHORT column data type.

---

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

diff --git a/dlls/msi/sql.y b/dlls/msi/sql.y
index f22234e..7bf8ce6 100644
--- a/dlls/msi/sql.y
+++ b/dlls/msi/sql.y
@@ -363,7 +363,7 @@ data_type:
         }
   | TK_SHORT
         {
-            $$ = 2;
+            $$ = 2 | 0x400;
         }
   | TK_INT
         {
diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c
index 2d38274..0d9e3e3 100644
--- a/dlls/msi/tests/db.c
+++ b/dlls/msi/tests/db.c
@@ -1155,7 +1155,7 @@ static void test_viewgetcolumninfo(void)
     ok( 0x1d01 == get_columns_table_type(hdb, "Properties", 2 ), "_columns table wrong\n");
     ok( 0x1502 == get_columns_table_type(hdb, "Properties", 3 ), "_columns table wrong\n");
     ok( 0x1502 == get_columns_table_type(hdb, "Properties", 4 ), "_columns table wrong\n");
-    todo_wine 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");
 
     /* now try the names */