diff options
| author | David Lönnhager <david.l@mullvad.net> | 2020-02-20 17:08:24 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2020-02-20 17:08:24 +0100 |
| commit | 59cc56cbc161bf21e1964ebadbcf73334a4bd71a (patch) | |
| tree | 40859806a482545070cc543bc6ddf74f7bbb6416 /windows/nsis-plugins/src/msiutil/msiutil.cpp | |
| parent | c0a47fa66622f5617ba49fb19c6c5e0d5d545443 (diff) | |
| parent | 0c232306300831d23cb8eba00717852739268aaf (diff) | |
| download | mullvadvpn-59cc56cbc161bf21e1964ebadbcf73334a4bd71a.tar.xz mullvadvpn-59cc56cbc161bf21e1964ebadbcf73334a4bd71a.zip | |
Merge branch 'improve-installer-messages'
Diffstat (limited to 'windows/nsis-plugins/src/msiutil/msiutil.cpp')
| -rw-r--r-- | windows/nsis-plugins/src/msiutil/msiutil.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/windows/nsis-plugins/src/msiutil/msiutil.cpp b/windows/nsis-plugins/src/msiutil/msiutil.cpp index cf6e467b41..131b52dbcd 100644 --- a/windows/nsis-plugins/src/msiutil/msiutil.cpp +++ b/windows/nsis-plugins/src/msiutil/msiutil.cpp @@ -121,9 +121,7 @@ void __declspec(dllexport) NSISCALL SilentInstall if (ERROR_SUCCESS != installResult) { - std::wstringstream ss; - ss << L"Install failed: " << installResult; - pushstring(ss.str().c_str()); + pushstring(common::string::ToWide(common::error::FormatWindowsError(installResult)).c_str()); pushint(NsisStatus::GENERAL_ERROR); return; } @@ -189,9 +187,7 @@ void __declspec(dllexport) NSISCALL SilentUninstall if (ERROR_SUCCESS != installResult) { - std::wstringstream ss; - ss << L"Uninstall failed: " << installResult; - pushstring(ss.str().c_str()); + pushstring(common::string::ToWide(common::error::FormatWindowsError(installResult)).c_str()); pushint(NsisStatus::GENERAL_ERROR); return; } |