ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi: Sign-compare warnings fix.

This commit is contained in:
Andrew Talbot 2008-10-20 22:06:16 +01:00 committed by Alexandre Julliard
parent 860ba029c3
commit 40db5bdb16
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/msi/appsearch.c
View File

@ -594,7 +594,7 @@ static void ACTION_ExpandAnyPath(MSIPACKAGE *package, WCHAR *src, WCHAR *dst,
ptr = src; ptr = src;
deformat_string(package, ptr, &deformatted); deformat_string(package, ptr, &deformatted);
if (!deformatted || lstrlenW(deformatted) > len - 1) if (!deformatted || strlenW(deformatted) > len - 1)
{ {
msi_free(deformatted); msi_free(deformatted);
return; return;
@ -755,7 +755,7 @@ static UINT ACTION_RecurseSearchDirectory(MSIPACKAGE *package, LPWSTR *appValue,
* here. Add two because we might need to add a backslash if the dir name * here. Add two because we might need to add a backslash if the dir name
* isn't backslash-terminated. * isn't backslash-terminated.
*/ */
buf = msi_alloc( (dirLen + max(fileLen, lstrlenW(starDotStarW)) + 2) * sizeof(WCHAR)); buf = msi_alloc( (dirLen + max(fileLen, strlenW(starDotStarW)) + 2) * sizeof(WCHAR));
if (!buf) if (!buf)
return ERROR_OUTOFMEMORY; return ERROR_OUTOFMEMORY;

2
dlls/msi/automation.c
View File

@ -336,7 +336,7 @@ static HRESULT WINAPI AutomationObject_GetIDsOfNames(
hr = ITypeInfo_GetIDsOfNames(This->iTypeInfo, rgszNames, cNames, rgDispId); hr = ITypeInfo_GetIDsOfNames(This->iTypeInfo, rgszNames, cNames, rgDispId);
if (hr == DISP_E_UNKNOWNNAME) if (hr == DISP_E_UNKNOWNNAME)
{ {
int idx; UINT idx;
for (idx=0; idx<cNames; idx++) for (idx=0; idx<cNames; idx++)
{ {
if (rgDispId[idx] == DISPID_UNKNOWN) if (rgDispId[idx] == DISPID_UNKNOWN)

2
dlls/msi/database.c
View File

@ -557,7 +557,7 @@ static UINT msi_add_records_to_table(MSIDATABASE *db, LPWSTR *columns, LPWSTR *t
int num_columns, int num_records) int num_columns, int num_records)
{ {
UINT r; UINT r;
DWORD i; int i;
MSIQUERY *view; MSIQUERY *view;
MSIRECORD *rec; MSIRECORD *rec;

2
dlls/msi/dialog.c
View File

@ -1388,7 +1388,7 @@ msi_maskedit_set_text( struct msi_maskedit_info *info, LPCWSTR text )
p = text; p = text;
for( i = 0; i < info->num_groups; i++ ) for( i = 0; i < info->num_groups; i++ )
{ {
if( info->group[i].len < lstrlenW( p ) ) if( info->group[i].len < strlenW( p ) )
{ {
LPWSTR chunk = strdupW( p ); LPWSTR chunk = strdupW( p );
chunk[ info->group[i].len ] = 0; chunk[ info->group[i].len ] = 0;

4
dlls/msi/helpers.c
View File

@ -436,7 +436,7 @@ UINT schedule_action(MSIPACKAGE *package, UINT script, LPCWSTR action)
void msi_free_action_script(MSIPACKAGE *package, UINT script) void msi_free_action_script(MSIPACKAGE *package, UINT script)
{ {
int i; UINT i;
for (i = 0; i < package->script->ActionCount[script]; i++) for (i = 0; i < package->script->ActionCount[script]; i++)
msi_free(package->script->Actions[script][i]); msi_free(package->script->Actions[script][i]);
@ -1009,7 +1009,7 @@ UINT register_unique_action(MSIPACKAGE *package, LPCWSTR action)
BOOL check_unique_action(const MSIPACKAGE *package, LPCWSTR action) BOOL check_unique_action(const MSIPACKAGE *package, LPCWSTR action)
{ {
INT i; UINT i;
if (!package->script) if (!package->script)
return FALSE; return FALSE;