Hugh McMaster : regsvr32: Process the next file in the array if an error occurs.

Alexandre Julliard julliard at wine.codeweavers.com
Mon Sep 7 09:20:14 CDT 2015


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

Author: Hugh McMaster <hugh.mcmaster at outlook.com>
Date:   Mon Sep  7 20:38:04 2015 +1000

regsvr32: Process the next file in the array if an error occurs.

The Windows version stops processing the current file and moves to the
next file on the first error.

---

 programs/regsvr32/regsvr32.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c
index ff6a3ae..a1b55a3 100644
--- a/programs/regsvr32/regsvr32.c
+++ b/programs/regsvr32/regsvr32.c
@@ -292,8 +292,9 @@ int wmain(int argc, WCHAR* argv[])
             if (CallInstall && Unregister)
                 res = InstallDll(!Unregister, DllName, wsCommandLine);
 
+            /* The Windows version stops processing the current file on the first error. */
             if (res)
-                return res;
+                continue;
 
             if (!CallInstall || (CallInstall && CallRegister))
             {
@@ -304,14 +305,13 @@ int wmain(int argc, WCHAR* argv[])
             }
 
             if (res)
-                return res;
-            /* Confirmed. The Windows version stops on the first error. */
+                continue;
 
             if (CallInstall && !Unregister)
                 res = InstallDll(!Unregister, DllName, wsCommandLine);
 
             if (res)
-		return res;
+		continue;
         }
     }
 




More information about the wine-cvs mailing list