commit c0523aaa570636a7b3e0ca81b2018bdf420c87e7
author Mike McCormack <mike@codeweavers.com> Sat Jun 26 00:18:36 2004 +0000
committer Alexandre Julliard <julliard@winehq.org> Sat Jun 26 00:18:36 2004 +0000
tree f1a50f3c48677e4bda139a312e133f37886c0c0a
parent fb3f40b96274b62c46e5db342696c4db20a34a86

Pull the codepage from the string table.

dlls/msi/string.c

diff --git a/dlls/msi/string.c b/dlls/msi/string.c
index 0e7cf77..e61d416 100644
--- a/dlls/msi/string.c
+++ b/dlls/msi/string.c
@@ -47,6 +47,7 @@
 {
     UINT count;         /* the number of strings */
     UINT freeslot;
+    UINT codepage;
     msistring *strings; /* an array of strings (in the tree) */
 };
 
@@ -63,7 +64,7 @@
     return hash;
 }
 
-string_table *msi_init_stringtable( int entries )
+string_table *msi_init_stringtable( int entries, UINT codepage )
 {
     string_table *st;
 
@@ -79,6 +80,7 @@
     }
     st->count = entries;
     st->freeslot = 1;
+    st->codepage = codepage;
 
     return st;
 }
@@ -192,11 +194,11 @@
     }
 
     /* allocate a new string */
-    sz = WideCharToMultiByte( CP_UTF8, 0, data, len, NULL, 0, NULL, NULL );
+    sz = WideCharToMultiByte( st->codepage, 0, data, len, NULL, 0, NULL, NULL );
     st->strings[n].str = HeapAlloc( GetProcessHeap(), 0, sz + 1 );
     if( !st->strings[n].str )
         return -1;
-    WideCharToMultiByte( CP_UTF8, 0, data, len, 
+    WideCharToMultiByte( st->codepage, 0, data, len, 
                          st->strings[n].str, sz, NULL, NULL );
     st->strings[n].str[sz] = 0;
     st->strings[n].refcount = 1;
@@ -245,7 +247,7 @@
     if( !str )
         return ERROR_FUNCTION_FAILED;
 
-    len = MultiByteToWideChar(CP_UTF8,0,str,-1,NULL,0); 
+    len = MultiByteToWideChar(st->codepage,0,str,-1,NULL,0); 
 
     if( !buffer )
     {
@@ -253,7 +255,7 @@
         return ERROR_SUCCESS;
     }
 
-    *sz = MultiByteToWideChar(CP_UTF8,0,str,-1,buffer,*sz); 
+    *sz = MultiByteToWideChar(st->codepage,0,str,-1,buffer,*sz); 
 
     return ERROR_SUCCESS;
 }
@@ -338,13 +340,13 @@
         return ERROR_SUCCESS;
     }
 
-    sz = WideCharToMultiByte( CP_UTF8, 0, buffer, -1, NULL, 0, NULL, NULL );
+    sz = WideCharToMultiByte( st->codepage, 0, buffer, -1, NULL, 0, NULL, NULL );
     if( sz <= 0 )
         return r;
     str = HeapAlloc( GetProcessHeap(), 0, sz );
     if( !str )
         return ERROR_NOT_ENOUGH_MEMORY;
-    WideCharToMultiByte( CP_UTF8, 0, buffer, -1, str, sz, NULL, NULL );
+    WideCharToMultiByte( st->codepage, 0, buffer, -1, str, sz, NULL, NULL );
 
     r = msi_string2idA( st, str, id );
     if( str )