From f2902217b38cf2e16e851ae84d61247f8e828180 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Mon, 25 Mar 2019 17:53:14 +0100 Subject: Update the 7z installer stub source to 18.05. Tag #1022 --- .../7zstub/src/7zip/UI/Explorer/MyMessages.cpp | 45 ---------------------- .../7zstub/src/7zip/UI/Explorer/MyMessages.h | 24 ------------ 2 files changed, 69 deletions(-) delete mode 100644 other-licenses/7zstub/src/7zip/UI/Explorer/MyMessages.cpp delete mode 100644 other-licenses/7zstub/src/7zip/UI/Explorer/MyMessages.h (limited to 'other-licenses/7zstub/src/7zip/UI/Explorer') diff --git a/other-licenses/7zstub/src/7zip/UI/Explorer/MyMessages.cpp b/other-licenses/7zstub/src/7zip/UI/Explorer/MyMessages.cpp deleted file mode 100644 index 92558930d..000000000 --- a/other-licenses/7zstub/src/7zip/UI/Explorer/MyMessages.cpp +++ /dev/null @@ -1,45 +0,0 @@ -// MyMessages.cpp - -#include "StdAfx.h" - -#include "MyMessages.h" -#include "Common/String.h" -#include "Common/StringConvert.h" - -#include "Windows/Error.h" -#include "Windows/ResourceString.h" - -#ifdef LANG -#include "../../FileManager/LangUtils.h" -#endif - -using namespace NWindows; - -void MyMessageBox(HWND window, LPCWSTR message) -{ - ::MessageBoxW(window, message, L"7-Zip", 0); -} - -void MyMessageBox(UINT32 id - #ifdef LANG - ,UINT32 langID - #endif - ) -{ - #ifdef LANG - MyMessageBox(LangString(id, langID)); - #else - MyMessageBox(MyLoadStringW(id)); - #endif -} - -void ShowErrorMessage(HWND window, DWORD message) -{ - MyMessageBox(window, NError::MyFormatMessageW(message)); -} - -void ShowLastErrorMessage(HWND window) -{ - ShowErrorMessage(window, ::GetLastError()); -} - diff --git a/other-licenses/7zstub/src/7zip/UI/Explorer/MyMessages.h b/other-licenses/7zstub/src/7zip/UI/Explorer/MyMessages.h deleted file mode 100644 index e3a755eef..000000000 --- a/other-licenses/7zstub/src/7zip/UI/Explorer/MyMessages.h +++ /dev/null @@ -1,24 +0,0 @@ -// MyMessages.h - -#ifndef __MYMESSAGES_H -#define __MYMESSAGES_H - -#include "Common/String.h" - -void MyMessageBox(HWND window, LPCWSTR message); - -inline void MyMessageBox(LPCWSTR message) - { MyMessageBox(0, message); } - -void MyMessageBox(UINT32 id - #ifdef LANG - ,UINT32 langID - #endif - ); - -void ShowErrorMessage(HWND window, DWORD errorMessage); -inline void ShowErrorMessage(DWORD errorMessage) - { ShowErrorMessage(0, errorMessage); } -void ShowLastErrorMessage(HWND window = 0); - -#endif -- cgit v1.2.3