MSI: avoid some non-standard str functions

Mike McCormack mike at codeweavers.com
Wed May 11 07:13:03 CDT 2005


ChangeLog:
* avoid some non-standard str functions
-------------- next part --------------
Index: dlls/msi/msiquery.c
===================================================================
RCS file: /home/wine/wine/dlls/msi/msiquery.c,v
retrieving revision 1.26
diff -u -p -r1.26 msiquery.c
--- dlls/msi/msiquery.c	24 Mar 2005 19:04:06 -0000	1.26
+++ dlls/msi/msiquery.c	11 May 2005 12:13:20 -0000
@@ -141,7 +141,7 @@ UINT MSI_OpenQuery( MSIDATABASE *db, MSI
 
     /* figure out how much space we need to allocate */
     va_start(va, fmt);
-    sz = strlenW(fmt) + 1;
+    sz = lstrlenW(fmt) + 1;
     p = fmt;
     while (*p)
     {
@@ -152,7 +152,7 @@ UINT MSI_OpenQuery( MSIDATABASE *db, MSI
         switch (*p)
         {
         case 's':  /* a string */
-            sz += strlenW(va_arg(va,LPCWSTR));
+            sz += lstrlenW(va_arg(va,LPCWSTR));
             break;
         case 'd':
         case 'i':  /* an integer -2147483648 seems to be longest */
Index: dlls/msi/table.c
===================================================================
RCS file: /home/wine/wine/dlls/msi/table.c,v
retrieving revision 1.32
diff -u -p -r1.32 table.c
--- dlls/msi/table.c	16 Mar 2005 11:31:35 -0000	1.32
+++ dlls/msi/table.c	11 May 2005 12:13:20 -0000
@@ -35,8 +35,6 @@
 #include "msipriv.h"
 #include "winnls.h"
 
-#include "wine/unicode.h"
-
 #include "query.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
@@ -98,7 +96,7 @@ static LPWSTR encode_streamname(BOOL bTa
     LPWSTR out, p;
 
     if( !bTable )
-        count = strlenW( in )+2;
+        count = lstrlenW( in )+2;
     out = HeapAlloc( GetProcessHeap(), 0, count*sizeof(WCHAR) );
     p = out;
 
@@ -1117,11 +1115,11 @@ static UINT TABLE_fetch_stream( struct t
     if( !sval )
         return ERROR_INVALID_PARAMETER;
 
-    len = strlenW( tv->name ) + 2 + strlenW( sval );
+    len = lstrlenW( tv->name ) + 2 + lstrlenW( sval );
     full_name = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) );
-    strcpyW( full_name, tv->name );
-    strcatW( full_name, szDot );
-    strcatW( full_name, sval );
+    lstrcpyW( full_name, tv->name );
+    lstrcatW( full_name, szDot );
+    lstrcatW( full_name, sval );
 
     r = db_get_raw_stream( tv->db, full_name, stm );
     if( r )


More information about the wine-patches mailing list