Commit 76162a4e authored by Hugh McMaster's avatar Hugh McMaster Committed by Alexandre Julliard

regsvr32: Use correct exit code when DllRegisterServer, DllUnregisterServer and DllInstall fail.

parent 4349b3c1
...@@ -133,7 +133,7 @@ static int RegisterDll(const WCHAR* strDll) ...@@ -133,7 +133,7 @@ static int RegisterDll(const WCHAR* strDll)
if(FAILED(hr)) if(FAILED(hr))
{ {
output_write(STRING_REGISTER_FAILED, strDll); output_write(STRING_REGISTER_FAILED, strDll);
return -1; return DLLSERVER_FAILED;
} }
output_write(STRING_REGISTER_SUCCESSFUL, strDll); output_write(STRING_REGISTER_SUCCESSFUL, strDll);
...@@ -156,7 +156,7 @@ static int UnregisterDll(const WCHAR* strDll) ...@@ -156,7 +156,7 @@ static int UnregisterDll(const WCHAR* strDll)
if(FAILED(hr)) if(FAILED(hr))
{ {
output_write(STRING_UNREGISTER_FAILED, strDll); output_write(STRING_UNREGISTER_FAILED, strDll);
return -1; return DLLSERVER_FAILED;
} }
output_write(STRING_UNREGISTER_SUCCESSFUL, strDll); output_write(STRING_UNREGISTER_SUCCESSFUL, strDll);
...@@ -182,7 +182,7 @@ static int InstallDll(BOOL install, const WCHAR *strDll, const WCHAR *command_li ...@@ -182,7 +182,7 @@ static int InstallDll(BOOL install, const WCHAR *strDll, const WCHAR *command_li
output_write(STRING_INSTALL_FAILED, strDll); output_write(STRING_INSTALL_FAILED, strDll);
else else
output_write(STRING_UNINSTALL_FAILED, strDll); output_write(STRING_UNINSTALL_FAILED, strDll);
return -1; return DLLSERVER_FAILED;
} }
if (install) if (install)
output_write(STRING_INSTALL_SUCCESSFUL, strDll); output_write(STRING_INSTALL_SUCCESSFUL, strDll);
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#define INVALID_ARG 1 #define INVALID_ARG 1
#define LOADLIBRARY_FAILED 3 #define LOADLIBRARY_FAILED 3
#define GETPROCADDRESS_FAILED 4 #define GETPROCADDRESS_FAILED 4
#define DLLSERVER_FAILED 5
/* Resource strings */ /* Resource strings */
#define STRING_HEADER 1000 #define STRING_HEADER 1000
......
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