commit a05613a9f29914b0df425d2592f35efd8343b517
author James Hawkins <truiken@gmail.com> Thu Jun 07 16:41:51 2007 -0700
committer Alexandre Julliard <julliard@winehq.org> Fri Jun 08 11:59:28 2007 +0200
tree b46a9ebc05bfd13dd5aa09f0e8c63f455c4dadcb
parent 8568e0a4a8f9d6b7cc391fa0041b61389c2d1f45

msi: Add support for large string tables.

dlls/msi/string.c

diff --git a/dlls/msi/string.c b/dlls/msi/string.c
index b773a35..e816ffa 100644
--- a/dlls/msi/string.c
+++ b/dlls/msi/string.c
@@ -41,6 +41,7 @@
 WINE_DEFAULT_DEBUG_CHANNEL(msidb);
 
 #define HASH_SIZE 0x101
+#define LONG_STR_BYTES 3
 
 typedef struct _msistring
 {
@@ -507,7 +508,7 @@
     return S_OK;
 }
 
-string_table *msi_load_string_table( IStorage *stg )
+string_table *msi_load_string_table( IStorage *stg, UINT *bytes_per_strref )
 {
     string_table *st = NULL;
     CHAR *data = NULL;
@@ -515,6 +516,8 @@
     UINT r, datasize = 0, poolsize = 0, codepage;
     DWORD i, count, offset, len, n, refs;
 
+    static const USHORT large_str_sig[] = { 0x0000, 0x8000 };
+
     r = read_stream_data( stg, szStringPool, &pool, &poolsize );
     if( r != ERROR_SUCCESS)
         goto end;
@@ -522,8 +525,14 @@
     if( r != ERROR_SUCCESS)
         goto end;
 
+    if ( !memcmp(pool, large_str_sig, sizeof(large_str_sig)) )
+        *bytes_per_strref = LONG_STR_BYTES;
+    else
+        *bytes_per_strref = sizeof(USHORT);
+
+    /* FIXME: don't know where the codepage is in large str tables */
     count = poolsize/4;
-    if( poolsize > 4 )
+    if( poolsize > 4 && *bytes_per_strref != LONG_STR_BYTES )
         codepage = pool[0] | ( pool[1] << 16 );
     else
         codepage = CP_ACP;