advpack+setupapi: [2/2] Remove unneeded checks before SetupCloseInfFile

Detlef Riekenberg wine.dev at web.de
Mon Jul 9 12:49:21 CDT 2007


NULL and INVALID_HANDLE_VALUE are valid for SetupCloseInfFile()


Changelog:
 advpack+setupapi: Remove unneeded checks before SetupCloseInfFile



-- 
 
By by ... Detlef

-------------- next part --------------
>From 20104917384210bb9a0628dde73285875b1f68c7 Mon Sep 17 00:00:00 2001
From: Detlef Riekenberg <wine.dev at web.de>
Date: Mon, 9 Jul 2007 19:38:59 +0200
Subject: [PATCH] advpack+setupapi: Remove unneeded checks before SetupCloseInfFile
---
 dlls/advpack/install.c       |    3 +--
 dlls/setupapi/tests/parser.c |    2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c
index b7e997c..c5a5df0 100644
--- a/dlls/advpack/install.c
+++ b/dlls/advpack/install.c
@@ -512,8 +512,7 @@ static HRESULT install_init(LPCWSTR inf_
 /* release the install instance information */
 static void install_release(const ADVInfo *info)
 {
-    if (info->hinf && info->hinf != INVALID_HANDLE_VALUE)
-        SetupCloseInfFile(info->hinf);
+    SetupCloseInfFile(info->hinf);
 
     HeapFree(GetProcessHeap(), 0, info->inf_path);
     HeapFree(GetProcessHeap(), 0, info->inf_filename);
diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c
index 2585f6d..2aaaa5e 100644
--- a/dlls/setupapi/tests/parser.c
+++ b/dlls/setupapi/tests/parser.c
@@ -167,7 +167,7 @@ static void test_invalid_files(void)
             ok( hinf != INVALID_HANDLE_VALUE, "file %u: Open failed\n", i );
             ok( err == 0, "file %u: Error code set to %u\n", i, err );
         }
-        if (hinf != INVALID_HANDLE_VALUE) SetupCloseInfFile( hinf );
+        SetupCloseInfFile( hinf );
     }
 }
 
-- 
1.4.1



More information about the wine-patches mailing list