commit b040e4bcd2c6df09873e2bc1bd4b5a0bf397cd00
author Mike McCormack <mike@codeweavers.com> Thu Mar 18 04:04:08 2004 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Mar 18 04:04:08 2004 +0000
tree 717fa0bf59788a6584a278e1ad91b3feb71e205c
parent 8d02010ff7208e24b1d7eaf71031e811ed5c9b6b

When loading table data, split it up into rows.

dlls/msi/string.c

diff --git a/dlls/msi/string.c b/dlls/msi/string.c
index cee657a..a1345f2 100644
--- a/dlls/msi/string.c
+++ b/dlls/msi/string.c
@@ -123,7 +123,7 @@
 {
     int n;
 
-    TRACE("[%2d] = %s\n", string_no, debugstr_an(data,len) );
+    /* TRACE("[%2d] = %s\n", string_no, debugstr_an(data,len) ); */
 
     n = st_find_free_entry( st );
     if( n < 0 )
@@ -145,7 +145,35 @@
     return n;
 }
 
-UINT msi_id2string( string_table *st, UINT string_no, LPWSTR buffer, UINT *sz )
+UINT msi_id2stringW( string_table *st, UINT string_no, LPWSTR buffer, UINT *sz )
+{
+    UINT len;
+    LPSTR str;
+
+    TRACE("Finding string %d of %d\n", string_no, st->count);
+    if( string_no >= st->count )
+        return ERROR_FUNCTION_FAILED;
+
+    if( !st->strings[string_no].refcount )
+        return ERROR_FUNCTION_FAILED;
+
+    str = st->strings[string_no].str;
+    len = strlen( str );
+
+    if( !buffer )
+    {
+        *sz = MultiByteToWideChar(CP_ACP,0,str,len,NULL,0);
+        return ERROR_SUCCESS;
+    }
+
+    len = MultiByteToWideChar(CP_ACP,0,str,len+1,buffer,*sz);
+    if (!len) buffer[*sz-1] = 0;
+    else *sz = len;
+
+    return ERROR_SUCCESS;
+}
+
+UINT msi_id2stringA( string_table *st, UINT string_no, LPSTR buffer, UINT *sz )
 {
     UINT len;
     LPSTR str;
@@ -166,7 +194,8 @@
         return ERROR_SUCCESS;
     }
 
-    len = MultiByteToWideChar(CP_ACP,0,str,len,buffer,*sz-1); 
+    if (len >= *sz) len = *sz - 1;
+    memcpy( buffer, str, len );
     buffer[len] = 0;
     *sz = len+1;
 
@@ -207,3 +236,27 @@
 
     return r;
 }
+
+UINT msi_string_count( string_table *st )
+{
+    return st->count;
+}
+
+UINT msi_id_refcount( string_table *st, UINT i )
+{
+    if( i >= st->count )
+        return 0;
+    return st->strings[i].refcount;
+}
+
+UINT msi_string_totalsize( string_table *st )
+{
+    UINT size = 0, i;
+
+    for( i=0; i<st->count; i++)
+    {
+        if( st->strings[i].str )
+            size += strlen( st->strings[i].str );
+    }
+    return size;
+}