regsvr32: Call InstallDll before UnregisterDll when using /u /i.

48c7a3f4 · Hugh McMaster · Alexandre Julliard · 91bd7ffa · 48c7a3f4
Commit 48c7a3f4 authored Sep 07, 2015 by Hugh McMaster Committed by Alexandre Julliard Sep 07, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

regsvr32.c programs/regsvr32/regsvr32.c +7 -3

No files found.
--- a/programs/regsvr32/regsvr32.c
+++ b/programs/regsvr32/regsvr32.c
@@ -289,6 +289,12 @@ int wmain(int argc, WCHAR* argv[])
            int res = 0;

            DllFound = TRUE;
+            if (CallInstall && Unregister)
+                res = InstallDll(!Unregister, DllName, wsCommandLine);
+
+            if (res)
+                return res;
+
            if (!CallInstall || (CallInstall && CallRegister))
            {
                if(Unregister)
@@ -301,10 +307,8 @@ int wmain(int argc, WCHAR* argv[])
                return res;
            /* Confirmed. The Windows version stops on the first error. */

-            if (CallInstall)
-            {
+            if (CallInstall && !Unregister)
                res = InstallDll(!Unregister, DllName, wsCommandLine);
-            }

            if (res)
 		return res;