Avoid some non-standard str functions.
This commit is contained in:
parent
8bcdf42710
commit
bd07966c8f
|
@ -141,7 +141,7 @@ UINT MSI_OpenQuery( MSIDATABASE *db, MSIQUERY **view, LPCWSTR fmt, ... )
|
|||
|
||||
/* 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, MSIQUERY **view, LPCWSTR fmt, ... )
|
|||
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 */
|
||||
|
|
|
@ -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 bTable, LPCWSTR in)
|
|||
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 tagMSIVIEW *view, UINT row, UINT col, ISt
|
|||
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 )
|
||||
|
|
Loading…
Reference in New Issue