msi: Fix column width calculation.

The iTunes 8 installer database has an integer column of size 1 which takes up two bytes at storage level, so adjust the column size calculation to account for this difference.

msi: Fix column width calculation.
eb101df6 · Hans Leidekker · Alexandre Julliard · 0b60ed8f · eb101df6
Commit eb101df6 authored Aug 04, 2009 by Hans Leidekker Committed by Alexandre Julliard Aug 04, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

table.c dlls/msi/table.c +8 -2

No files found.
--- a/dlls/msi/table.c
+++ b/dlls/msi/table.c
@@ -127,11 +127,17 @@ static inline UINT bytes_per_column( MSIDATABASE *db, const MSICOLUMNINFO *col )
 {
    if( MSITYPE_IS_BINARY(col->type) )
        return 2;
+
    if( col->type & MSITYPE_STRING )
        return db->bytes_per_strref;
-    if( (col->type & 0xff) > 4 )
+
+    if( (col->type & 0xff) <= 2)
+        return 2;
+
+    if( (col->type & 0xff) != 4 )
        ERR("Invalid column size!\n");
-    return col->type & 0xff;
+
+    return 4;
 }

 static int utf2mime(int x)