From 6bfead8421efa68231dbe4a13de69f19673db124 Mon Sep 17 00:00:00 2001
From: Rob Shearman <robertshearman@gmail.com>
Date: Fri, 12 Sep 2008 13:00:55 +0100
Subject: [PATCH] advpack: Add explicit "!= S_OK" to expressions that use
 HRESULTs as booleans.

---
 dlls/advpack/files.c   | 2 +-
 dlls/advpack/install.c | 6 +++---
 dlls/advpack/reg.c     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/advpack/files.c b/dlls/advpack/files.c
index 3aabc082c16..63f4080b934 100644
--- a/dlls/advpack/files.c
+++ b/dlls/advpack/files.c
@@ -627,7 +627,7 @@ static DWORD fill_file_list(SESSION *session, LPCSTR szCabName, LPCSTR szFileLis
     struct FILELIST *pNode;
 
     session->Operation |= EXTRACT_FILLFILELIST;
-    if (pExtract(session, szCabName))
+    if (pExtract(session, szCabName) != S_OK)
     {
         session->Operation &= ~EXTRACT_FILLFILELIST;
         return -1;
diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c
index 0ec5ceb4add..129ea828146 100644
--- a/dlls/advpack/install.c
+++ b/dlls/advpack/install.c
@@ -91,7 +91,7 @@ static HRESULT del_dirs_callback(HINF hinf, PCWSTR field, const void *arg)
                                MAX_INF_STRING_LENGTH, &size))
             continue;
 
-        if (DelNodeW(directory, ADN_DEL_IF_EMPTY))
+        if (DelNodeW(directory, ADN_DEL_IF_EMPTY) != S_OK)
             hr = E_FAIL;
     }
 
@@ -161,7 +161,7 @@ static HRESULT register_ocxs_callback(HINF hinf, PCWSTR field, const void *arg)
         hm = LoadLibraryExW(buffer, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
         if (hm)
         {
-            if (do_ocx_reg(hm, TRUE))
+            if (do_ocx_reg(hm, TRUE) != S_OK)
                 hr = E_FAIL;
 
             FreeLibrary(hm);
@@ -196,7 +196,7 @@ static HRESULT run_setup_commands_callback(HINF hinf, PCWSTR field, const void *
                                MAX_INF_STRING_LENGTH, &size))
             continue;
 
-        if (launch_exe(buffer, info->working_dir, NULL))
+        if (launch_exe(buffer, info->working_dir, NULL) != S_OK)
             hr = E_FAIL;
     }
 
diff --git a/dlls/advpack/reg.c b/dlls/advpack/reg.c
index bcb6cb9d596..9a430159ecc 100644
--- a/dlls/advpack/reg.c
+++ b/dlls/advpack/reg.c
@@ -230,7 +230,7 @@ HRESULT WINAPI RegInstallW(HMODULE hm, LPCWSTR pszSection, const STRTABLEW* pstT
     if(!create_tmp_ini_file(hm, tmp_ini_path))
         return E_FAIL;
 
-    if (write_predefined_strings(hm, tmp_ini_path))
+    if (write_predefined_strings(hm, tmp_ini_path) != S_OK)
         goto done;
 
     /* Write the additional string table */