Markus Amsler : advpack: Make DoInfInstall return an HRESULT.

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: 30086feb441175fab81e323dab0c77e0443f1e9a
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=30086feb441175fab81e323d...

Author: Markus Amsler 
Date:   Tue Jan  3 17:33:02 2006 +0100

advpack: Make DoInfInstall return an HRESULT.

---

dlls/advpack/advpack.c |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c
index 6a6f591..31fa51c 100644
--- a/dlls/advpack/advpack.c
+++ b/dlls/advpack/advpack.c
@@ -190,8 +190,17 @@ typedef struct

/***********************************************************************
  *		DoInfInstall  (ADVPACK.@)
+ *
+ * Install an INF section.
+ *
+ * PARAMS
+ *  setup [I] Structure containing install information.
+ *
+ * RETURNS
+ *   S_OK                                Everything OK
+ *   HRESULT_FROM_WIN32(GetLastError())  Some other error
  */
-BOOL WINAPI DoInfInstall(const SETUPCOMMAND_PARAMS *setup)
+HRESULT WINAPI DoInfInstall(const SETUPCOMMAND_PARAMS *setup)
 {
     BOOL ret;
     HINF hinf;
@@ -202,7 +211,7 @@ BOOL WINAPI DoInfInstall(const SETUPCOMM
           debugstr_a(setup->section_name));

hinf = SetupOpenInfFileA(setup->inf_name, NULL, INF_STYLE_WIN4, NULL);
-    if (hinf == INVALID_HANDLE_VALUE) return FALSE;
+    if (hinf == INVALID_HANDLE_VALUE) return HRESULT_FROM_WIN32(GetLastError());

callback_context = SetupInitDefaultQueueCallback(setup->hwnd);

@@ -212,7 +221,7 @@ BOOL WINAPI DoInfInstall(const SETUPCOMM
     SetupTermDefaultQueueCallback(callback_context);
     SetupCloseInfFile(hinf);

-    return ret;
+    return ret ? S_OK : HRESULT_FROM_WIN32(GetLastError());
 }

/***********************************************************************