diff options
| author | David Lönnhager <david.l@mullvad.net> | 2020-05-22 14:23:39 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2020-05-22 14:23:39 +0200 |
| commit | 8a06a0740699a5bb5cda971ab83489e00c8b0fa2 (patch) | |
| tree | bc110aebaecd0d2a3f4fd9c74ff01c938132e692 | |
| parent | 542ce7d87fbe41ec0d27040e3838105a93073b0b (diff) | |
| parent | 3ff9c345dd9ab29bbbd0522a9a912c8be69cdb05 (diff) | |
| download | mullvadvpn-8a06a0740699a5bb5cda971ab83489e00c8b0fa2.tar.xz mullvadvpn-8a06a0740699a5bb5cda971ab83489e00c8b0fa2.zip | |
Merge branch 'update-win-error'
| -rw-r--r-- | windows/driverlogic/src/error.cpp | 6 | ||||
| m--------- | windows/windows-libraries | 0 |
2 files changed, 4 insertions, 2 deletions
diff --git a/windows/driverlogic/src/error.cpp b/windows/driverlogic/src/error.cpp index 49909784ca..22f60b77f2 100644 --- a/windows/driverlogic/src/error.cpp +++ b/windows/driverlogic/src/error.cpp @@ -1,6 +1,7 @@ #include "stdafx.h" #include "error.h" #include <string> +#include <ios> #include <iomanip> #include <sstream> #include <map> @@ -153,8 +154,9 @@ void ThrowSetupApiError(const char *operation, uint32_t code, const char *file, if (nullptr != message) { std::stringstream ss; - ss << operation << ": " << message - << " (0x" << std::setw(8) << std::setfill('0') << std::hex << code << ")" + ss << operation << ": 0x" << std::setw(8) << std::setfill('0') << std::hex << code + << std::setw(1) << std::dec + << ": " << message << " (" << IsolateFilename(file) << ": " << line << ")"; throw common::error::WindowsException(ss.str().c_str(), code); diff --git a/windows/windows-libraries b/windows/windows-libraries -Subproject c5abcd87bc057f2f0319a56037d1a9a721d6468 +Subproject 405070bb080e9e35669b2e613a34470417aaf9e |