diff options
| author | Igor Pavlov <87184205+ip7z@users.noreply.github.com> | 2023-06-21 00:00:00 +0000 |
|---|---|---|
| committer | Igor Pavlov <87184205+ip7z@users.noreply.github.com> | 2023-12-17 14:59:19 +0500 |
| commit | 5b39dc76f1bc82f941d5c800ab9f34407a06b53a (patch) | |
| tree | fe5e17420300b715021a76328444088d32047963 /CPP/Windows/ErrorMsg.cpp | |
| parent | 93be7d4abfd4233228f58ee1fbbcd76d91be66a4 (diff) | |
| download | 7zip-23.01.tar.gz 7zip-23.01.tar.bz2 7zip-23.01.zip | |
23.0123.01
Diffstat (limited to 'CPP/Windows/ErrorMsg.cpp')
| -rw-r--r-- | CPP/Windows/ErrorMsg.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/CPP/Windows/ErrorMsg.cpp b/CPP/Windows/ErrorMsg.cpp index f6343a5..5acf3ad 100644 --- a/CPP/Windows/ErrorMsg.cpp +++ b/CPP/Windows/ErrorMsg.cpp | |||
| @@ -19,8 +19,8 @@ namespace NError { | |||
| 19 | 19 | ||
| 20 | static bool MyFormatMessage(DWORD errorCode, UString &message) | 20 | static bool MyFormatMessage(DWORD errorCode, UString &message) |
| 21 | { | 21 | { |
| 22 | #ifndef _SFX | 22 | #ifndef Z7_SFX |
| 23 | if ((HRESULT)errorCode == MY_HRES_ERROR__INTERNAL_ERROR) | 23 | if ((HRESULT)errorCode == MY_HRES_ERROR_INTERNAL_ERROR) |
| 24 | { | 24 | { |
| 25 | message = "Internal Error: The failure in hardware (RAM or CPU), OS or program"; | 25 | message = "Internal Error: The failure in hardware (RAM or CPU), OS or program"; |
| 26 | return true; | 26 | return true; |
| @@ -72,7 +72,7 @@ static bool MyFormatMessage(DWORD errorCode, UString &message) | |||
| 72 | case E_OUTOFMEMORY : s = "E_OUTOFMEMORY : Can't allocate required memory"; break; | 72 | case E_OUTOFMEMORY : s = "E_OUTOFMEMORY : Can't allocate required memory"; break; |
| 73 | case E_INVALIDARG : s = "E_INVALIDARG : One or more arguments are invalid"; break; | 73 | case E_INVALIDARG : s = "E_INVALIDARG : One or more arguments are invalid"; break; |
| 74 | 74 | ||
| 75 | // case MY__E_ERROR_NEGATIVE_SEEK : s = "MY__E_ERROR_NEGATIVE_SEEK"; break; | 75 | // case MY_E_ERROR_NEGATIVE_SEEK : s = "MY_E_ERROR_NEGATIVE_SEEK"; break; |
| 76 | default: | 76 | default: |
| 77 | break; | 77 | break; |
| 78 | } | 78 | } |
| @@ -81,7 +81,7 @@ static bool MyFormatMessage(DWORD errorCode, UString &message) | |||
| 81 | So we must transfer error codes before strerror() */ | 81 | So we must transfer error codes before strerror() */ |
| 82 | if (!s) | 82 | if (!s) |
| 83 | { | 83 | { |
| 84 | if ((errorCode & 0xFFFF0000) == (UInt32)((MY__FACILITY__WRes << 16) | 0x80000000)) | 84 | if ((errorCode & 0xFFFF0000) == (UInt32)((MY_FACILITY_WRes << 16) | 0x80000000)) |
| 85 | errorCode &= 0xFFFF; | 85 | errorCode &= 0xFFFF; |
| 86 | else if ((errorCode & ((UInt32)1 << 31))) | 86 | else if ((errorCode & ((UInt32)1 << 31))) |
| 87 | return false; // we will show hex error later for that case | 87 | return false; // we will show hex error later for that case |