Hans Leidekker : msi: Return the right error from ITERATE_RegisterTypeLibraries.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 82d50fa675dc829b69f0a18e39a5b3486072edcb
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=82d50fa675dc829b69f0a18e39...

Author: Hans Leidekker <hans(a)codeweavers.com>
Date:   Fri Feb 12 10:33:00 2010 +0100

msi: Return the right error from ITERATE_RegisterTypeLibraries.

---

 dlls/msi/action.c        |    2 +-
 dlls/msi/tests/install.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index 0f1877e..69e2b03 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -2933,7 +2933,7 @@ static UINT ITERATE_RegisterTypeLibraries(MSIRECORD *row, LPVOID param)
         if (FAILED(hr))
         {
             ERR("Failed to load type library: %08x\n", hr);
-            return ERROR_FUNCTION_FAILED;
+            return ERROR_INSTALL_FAILURE;
         }
 
         ITypeLib_Release(tlib);
diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c
index 83e7220..de826c3 100644
--- a/dlls/msi/tests/install.c
+++ b/dlls/msi/tests/install.c
@@ -8090,7 +8090,7 @@ static void test_register_typelib(void)
     MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);
 
     r = MsiInstallProductA(msifile, "REGISTER_TYPELIB=1");
-    todo_wine ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r);
+    ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r);
 
     r = MsiInstallProductA(msifile, NULL);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);