mirror of
git://source.winehq.org/git/wine.git
synced 2024-11-05 18:01:34 +00:00
msi: Sign-compare warnings fix.
This commit is contained in:
parent
860ba029c3
commit
40db5bdb16
5 changed files with 7 additions and 7 deletions
|
@ -594,7 +594,7 @@ static void ACTION_ExpandAnyPath(MSIPACKAGE *package, WCHAR *src, WCHAR *dst,
|
|||
ptr = src;
|
||||
|
||||
deformat_string(package, ptr, &deformatted);
|
||||
if (!deformatted || lstrlenW(deformatted) > len - 1)
|
||||
if (!deformatted || strlenW(deformatted) > len - 1)
|
||||
{
|
||||
msi_free(deformatted);
|
||||
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
|
||||
* 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)
|
||||
return ERROR_OUTOFMEMORY;
|
||||
|
||||
|
|
|
@ -336,7 +336,7 @@ static HRESULT WINAPI AutomationObject_GetIDsOfNames(
|
|||
hr = ITypeInfo_GetIDsOfNames(This->iTypeInfo, rgszNames, cNames, rgDispId);
|
||||
if (hr == DISP_E_UNKNOWNNAME)
|
||||
{
|
||||
int idx;
|
||||
UINT idx;
|
||||
for (idx=0; idx<cNames; idx++)
|
||||
{
|
||||
if (rgDispId[idx] == DISPID_UNKNOWN)
|
||||
|
|
|
@ -557,7 +557,7 @@ static UINT msi_add_records_to_table(MSIDATABASE *db, LPWSTR *columns, LPWSTR *t
|
|||
int num_columns, int num_records)
|
||||
{
|
||||
UINT r;
|
||||
DWORD i;
|
||||
int i;
|
||||
MSIQUERY *view;
|
||||
MSIRECORD *rec;
|
||||
|
||||
|
|
|
@ -1388,7 +1388,7 @@ msi_maskedit_set_text( struct msi_maskedit_info *info, LPCWSTR text )
|
|||
p = text;
|
||||
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 );
|
||||
chunk[ info->group[i].len ] = 0;
|
||||
|
|
|
@ -436,7 +436,7 @@ UINT schedule_action(MSIPACKAGE *package, UINT script, LPCWSTR action)
|
|||
|
||||
void msi_free_action_script(MSIPACKAGE *package, UINT script)
|
||||
{
|
||||
int i;
|
||||
UINT i;
|
||||
for (i = 0; i < package->script->ActionCount[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)
|
||||
{
|
||||
INT i;
|
||||
UINT i;
|
||||
|
||||
if (!package->script)
|
||||
return FALSE;
|
||||
|
|
Loading…
Reference in a new issue