Skip to content

W
wine-winehq
Commit 48c7a3f4 authored by Hugh McMaster's avatar Hugh McMaster Committed by Alexandre Julliard
Browse files
Options

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

parent 91bd7ffa
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 3 deletions
programs/regsvr32/regsvr32.c
View file @ 48c7a3f4
...@@ -289,6 +289,12 @@ int wmain(int argc, WCHAR* argv[]) ...@@ -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[]) ...@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment