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

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

This commit is contained in:
Hugh McMaster 2015-09-07 20:08:10 +10:00 committed by Alexandre Julliard
parent 91bd7ffaa8
commit 48c7a3f4d7
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
programs/regsvr32/regsvr32.c
View File

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