Andrew Talbot : msi: Sign-compare warnings fix.
Alexandre Julliard
julliard at winehq.org
Tue Oct 21 07:07:00 CDT 2008
Module: wine
Branch: master
Commit: 40db5bdb16723cec7e607ca4d35d511ec745099c
URL: http://source.winehq.org/git/wine.git/?a=commit;h=40db5bdb16723cec7e607ca4d35d511ec745099c
Author: Andrew Talbot <andrew.talbot at talbotville.com>
Date: Mon Oct 20 22:06:16 2008 +0100
msi: Sign-compare warnings fix.
---
dlls/msi/appsearch.c | 4 ++--
dlls/msi/automation.c | 2 +-
dlls/msi/database.c | 2 +-
dlls/msi/dialog.c | 2 +-
dlls/msi/helpers.c | 4 ++--
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c
index 5f40ada..a9113c9 100644
--- a/dlls/msi/appsearch.c
+++ b/dlls/msi/appsearch.c
@@ -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;
diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c
index 60224b6..11f0a09 100644
--- a/dlls/msi/automation.c
+++ b/dlls/msi/automation.c
@@ -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)
diff --git a/dlls/msi/database.c b/dlls/msi/database.c
index 8aa2c5f..4667006 100644
--- a/dlls/msi/database.c
+++ b/dlls/msi/database.c
@@ -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;
diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c
index 2dcb868..8be1cc7 100644
--- a/dlls/msi/dialog.c
+++ b/dlls/msi/dialog.c
@@ -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;
diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c
index 9693719..d15d79a 100644
--- a/dlls/msi/helpers.c
+++ b/dlls/msi/helpers.c
@@ -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;
More information about the wine-cvs
mailing list