Andrey Gusev : msi: Remove checks for negative value.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5bd1b6f41032d1e133a8d9a96fba711ee491d634
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=5bd1b6f41032d1e133a8d9a96...

Author: Andrey Gusev 
Date:   Tue Jun 26 09:06:48 2018 +0200

msi: Remove checks for negative value.

Signed-off-by: Andrey Gusev 
Signed-off-by: Hans Leidekker 
Signed-off-by: Alexandre Julliard

---

dlls/msi/format.c | 2 +-
 dlls/msi/string.c | 5 ++---
 dlls/msi/table.c  | 4 +---
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/dlls/msi/format.c b/dlls/msi/format.c
index 9356c9e..d32afb2 100644
--- a/dlls/msi/format.c
+++ b/dlls/msi/format.c
@@ -242,7 +242,7 @@ static WCHAR *deformat_file( FORMAT *format, FORMSTR *str, BOOL shortname, int *
         if ((ret = strdupW( file->TargetPath ))) len = strlenW( ret );
         goto done;
     }
-    if ((len = GetShortPathNameW(file->TargetPath, NULL, 0)) <= 0)
+    if (!(len = GetShortPathNameW(file->TargetPath, NULL, 0)))
     {
         if ((ret = strdupW( file->TargetPath ))) len = strlenW( ret );
         goto done;
diff --git a/dlls/msi/string.c b/dlls/msi/string.c
index f094a53..7383fdd 100644
--- a/dlls/msi/string.c
+++ b/dlls/msi/string.c
@@ -233,7 +233,7 @@ static void set_st_entry( string_table *st, UINT n, WCHAR *str, int len, USHORT

static UINT string2id( const string_table *st, const char *buffer, UINT *id )
 {
-    DWORD sz;
+    int sz;
     UINT r = ERROR_INVALID_PARAMETER;
     LPWSTR str;

@@ -245,8 +245,7 @@ static UINT string2id( const string_table *st, const char *buffer, UINT *id )
         return ERROR_SUCCESS;
     }

-    sz = MultiByteToWideChar( st->codepage, 0, buffer, -1, NULL, 0 );
-    if( sz <= 0 )
+    if (!(sz = MultiByteToWideChar( st->codepage, 0, buffer, -1, NULL, 0 )))
         return r;
     str = msi_alloc( sz*sizeof(WCHAR) );
     if( !str )
diff --git a/dlls/msi/table.c b/dlls/msi/table.c
index 45a1814..e046c5c 100644
--- a/dlls/msi/table.c
+++ b/dlls/msi/table.c
@@ -1279,9 +1279,7 @@ static UINT get_table_value_from_record( MSITABLEVIEW *tv, MSIRECORD *rec, UINT
     UINT r;
     int ival;

-    if ( (iField <= 0) ||
-         (iField > tv->num_cols) ||
-          MSI_RecordIsNull( rec, iField ) )
+    if (!iField || iField > tv->num_cols || MSI_RecordIsNull( rec, iField ))
         return ERROR_FUNCTION_FAILED;

columninfo = tv->columns[ iField - 1 ];