diff options
| author | Igor Pavlov <ipavlov@users.sourceforge.net> | 2011-04-18 04:00:00 +0400 |
|---|---|---|
| committer | Kornel Lesiński <kornel@geekhood.net> | 2016-05-28 02:16:06 +0300 |
| commit | 83f8ddcc5b2161e1e3c49666265257fca8aeb12c (patch) | |
| tree | fa164096cf0b1cdc9707ae031efc6a5017dd6963 /CPP/7zip/Bundles | |
| parent | 35596517f203f1c4970413b3b5b2e216b849e462 (diff) | |
9.229.22
Diffstat (limited to 'CPP/7zip/Bundles')
| -rwxr-xr-x | CPP/7zip/Bundles/Alone7z/resource.rc | 4 | ||||
| -rwxr-xr-x | CPP/7zip/Bundles/Format7zExtractR/resource.rc | 4 | ||||
| -rwxr-xr-x | CPP/7zip/Bundles/Format7zR/resource.rc | 4 | ||||
| -rwxr-xr-x | CPP/7zip/Bundles/SFXWin/Main.cpp | 6 |
4 files changed, 12 insertions, 6 deletions
diff --git a/CPP/7zip/Bundles/Alone7z/resource.rc b/CPP/7zip/Bundles/Alone7z/resource.rc index f4ee3577..b3fb079a 100755 --- a/CPP/7zip/Bundles/Alone7z/resource.rc +++ b/CPP/7zip/Bundles/Alone7z/resource.rc @@ -1,3 +1,3 @@ -#include "../../MyVersionInfo.rc" +#include "../../../../C/7zVersion.rc" -MY_VERSION_INFO_APP("7-Zip Standalone Console", "7zr") +MY_VERSION_INFO_APP("7-Zip Reduced Standalone Console", "7zr") diff --git a/CPP/7zip/Bundles/Format7zExtractR/resource.rc b/CPP/7zip/Bundles/Format7zExtractR/resource.rc index eb636986..149f58c4 100755 --- a/CPP/7zip/Bundles/Format7zExtractR/resource.rc +++ b/CPP/7zip/Bundles/Format7zExtractR/resource.rc @@ -1,5 +1,5 @@ -#include "../../MyVersionInfo.rc" +#include "../../../../C/7zVersion.rc" -MY_VERSION_INFO_DLL("7z Standalone Extracting Plugin", "7zxr") +MY_VERSION_INFO_DLL("7z Extracting Reduced Standalone Plugin", "7zxr") 101 ICON "../../Archive/Icons/7z.ico" diff --git a/CPP/7zip/Bundles/Format7zR/resource.rc b/CPP/7zip/Bundles/Format7zR/resource.rc index f9c17683..a8baa596 100755 --- a/CPP/7zip/Bundles/Format7zR/resource.rc +++ b/CPP/7zip/Bundles/Format7zR/resource.rc @@ -1,5 +1,5 @@ -#include "../../MyVersionInfo.rc" +#include "../../../../C/7zVersion.rc" -MY_VERSION_INFO_DLL("7z Standalone Plugin", "7zr") +MY_VERSION_INFO_DLL("7z Reduced Standalone Plugin", "7zr") 101 ICON "../../Archive/Icons/7z.ico" diff --git a/CPP/7zip/Bundles/SFXWin/Main.cpp b/CPP/7zip/Bundles/SFXWin/Main.cpp index bb7318a1..bd72fc08 100755 --- a/CPP/7zip/Bundles/SFXWin/Main.cpp +++ b/CPP/7zip/Bundles/SFXWin/Main.cpp @@ -20,6 +20,7 @@ #include "../../UI/Common/Extract.h" #include "../../UI/Common/ExitCode.h" #include "../../UI/Explorer/MyMessages.h" +#include "../../UI/FileManager/MyWindowsNew.h" #include "../../UI/GUI/ExtractGUI.h" #include "../../UI/GUI/ExtractRes.h" @@ -38,6 +39,11 @@ void ErrorMessageForHRESULT(HRESULT res) int APIENTRY WinMain2() { + // OleInitialize is required for ProgressBar in TaskBar. + #ifndef UNDER_CE + OleInitialize(NULL); + #endif + UString password; bool assumeYes = false; bool outputFolderDefined = false; |