diff options
Diffstat (limited to '3rdparty/lzma/CPP/7zip/UI/Explorer')
-rw-r--r-- | 3rdparty/lzma/CPP/7zip/UI/Explorer/MyMessages.cpp | 9 | ||||
-rw-r--r-- | 3rdparty/lzma/CPP/7zip/UI/Explorer/MyMessages.h | 8 |
2 files changed, 10 insertions, 7 deletions
diff --git a/3rdparty/lzma/CPP/7zip/UI/Explorer/MyMessages.cpp b/3rdparty/lzma/CPP/7zip/UI/Explorer/MyMessages.cpp index 70c2a4608d3..daff7dedbcf 100644 --- a/3rdparty/lzma/CPP/7zip/UI/Explorer/MyMessages.cpp +++ b/3rdparty/lzma/CPP/7zip/UI/Explorer/MyMessages.cpp @@ -18,15 +18,18 @@ void ShowErrorMessage(HWND window, LPCWSTR message) void ShowErrorMessageHwndRes(HWND window, UINT resID) { - ShowErrorMessage(window, LangString(resID)); + UString s = LangString(resID); + if (s.IsEmpty()) + s.Add_UInt32(resID); + ShowErrorMessage(window, s); } void ShowErrorMessageRes(UINT resID) { - ShowErrorMessageHwndRes(0, resID); + ShowErrorMessageHwndRes(NULL, resID); } -void ShowErrorMessageDWORD(HWND window, DWORD errorCode) +static void ShowErrorMessageDWORD(HWND window, DWORD errorCode) { ShowErrorMessage(window, NError::MyFormatMessage(errorCode)); } diff --git a/3rdparty/lzma/CPP/7zip/UI/Explorer/MyMessages.h b/3rdparty/lzma/CPP/7zip/UI/Explorer/MyMessages.h index d5822f45f1c..47d10db71c8 100644 --- a/3rdparty/lzma/CPP/7zip/UI/Explorer/MyMessages.h +++ b/3rdparty/lzma/CPP/7zip/UI/Explorer/MyMessages.h @@ -1,16 +1,16 @@ // MyMessages.h -#ifndef __MY_MESSAGES_H -#define __MY_MESSAGES_H +#ifndef ZIP7_INC_MY_MESSAGES_H +#define ZIP7_INC_MY_MESSAGES_H #include "../../../Common/MyString.h" void ShowErrorMessage(HWND window, LPCWSTR message); -inline void ShowErrorMessage(LPCWSTR message) { ShowErrorMessage(0, message); } +inline void ShowErrorMessage(LPCWSTR message) { ShowErrorMessage(NULL, message); } void ShowErrorMessageHwndRes(HWND window, UInt32 langID); void ShowErrorMessageRes(UInt32 langID); -void ShowLastErrorMessage(HWND window = 0); +void ShowLastErrorMessage(HWND window = NULL); #endif |