From 5b39dc76f1bc82f941d5c800ab9f34407a06b53a Mon Sep 17 00:00:00 2001
From: Igor Pavlov <87184205+ip7z@users.noreply.github.com>
Date: Wed, 21 Jun 2023 00:00:00 +0000
Subject: 23.01

---
 CPP/Windows/ErrorMsg.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'CPP/Windows/ErrorMsg.cpp')

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 {
 
 static bool MyFormatMessage(DWORD errorCode, UString &message)
 {
-  #ifndef _SFX
-  if ((HRESULT)errorCode == MY_HRES_ERROR__INTERNAL_ERROR)
+  #ifndef Z7_SFX
+  if ((HRESULT)errorCode == MY_HRES_ERROR_INTERNAL_ERROR)
   {
     message = "Internal Error: The failure in hardware (RAM or CPU), OS or program";
     return true;
@@ -72,7 +72,7 @@ static bool MyFormatMessage(DWORD errorCode, UString &message)
     case E_OUTOFMEMORY         : s = "E_OUTOFMEMORY : Can't allocate required memory"; break;
     case E_INVALIDARG          : s = "E_INVALIDARG : One or more arguments are invalid"; break;
     
-    // case MY__E_ERROR_NEGATIVE_SEEK : s = "MY__E_ERROR_NEGATIVE_SEEK"; break;
+    // case MY_E_ERROR_NEGATIVE_SEEK : s = "MY_E_ERROR_NEGATIVE_SEEK"; break;
     default:
       break;
   }
@@ -81,7 +81,7 @@ static bool MyFormatMessage(DWORD errorCode, UString &message)
      So we must transfer error codes before strerror() */
   if (!s)
   {
-    if ((errorCode & 0xFFFF0000) == (UInt32)((MY__FACILITY__WRes << 16) | 0x80000000))
+    if ((errorCode & 0xFFFF0000) == (UInt32)((MY_FACILITY_WRes << 16) | 0x80000000))
       errorCode &= 0xFFFF;
     else if ((errorCode & ((UInt32)1 << 31)))
       return false; // we will show hex error later for that case
-- 
cgit v1.2.3-55-g6feb