ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

regsvr32: Return the most recent error code, even if later DLLs succeed.

This commit is contained in:
Hugh McMaster 2015-09-09 20:43:52 +10:00 committed by Alexandre Julliard
parent 5b4d759e55
commit e19a8fd706
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
programs/regsvr32/regsvr32.c
View File

@ -19,9 +19,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*
* This version deliberately differs in error handling compared to the
* Windows version.
*/
#define WIN32_LEAN_AND_MEAN
@ -221,7 +218,7 @@ static WCHAR *parse_command_line(WCHAR *command_line)
int wmain(int argc, WCHAR* argv[])
{
int i;
int i, res, ret = 0;
BOOL CallRegister = TRUE;
BOOL CallInstall = FALSE;
BOOL Unregister = FALSE;
@ -286,7 +283,7 @@ int wmain(int argc, WCHAR* argv[])
if (argv[i])
{
WCHAR *DllName = argv[i];
int res = 0;
res = 0;
DllFound = TRUE;
if (CallInstall && Unregister)
@ -294,7 +291,10 @@ int wmain(int argc, WCHAR* argv[])
/* The Windows version stops processing the current file on the first error. */
if (res)
{
ret = res;
continue;
}
if (!CallInstall || (CallInstall && CallRegister))
{
@ -305,13 +305,19 @@ int wmain(int argc, WCHAR* argv[])
}
if (res)
{
ret = res;
continue;
}
if (CallInstall && !Unregister)
res = InstallDll(!Unregister, DllName, wsCommandLine);
if (res)
{
ret = res;
continue;
}
}
}
@ -324,5 +330,6 @@ int wmain(int argc, WCHAR* argv[])
OleUninitialize();
return 0;
/* return the most recent error code, even if later DLLs succeed */
return ret;
}