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/UI/GUI | |
| parent | 35596517f203f1c4970413b3b5b2e216b849e462 (diff) | |
9.229.22
Diffstat (limited to 'CPP/7zip/UI/GUI')
| -rwxr-xr-x | CPP/7zip/UI/GUI/7zG.exe.manifest | 14 | ||||
| -rwxr-xr-x | CPP/7zip/UI/GUI/GUI.cpp | 6 | ||||
| -rwxr-xr-x | CPP/7zip/UI/GUI/UpdateGUI.cpp | 3 |
3 files changed, 20 insertions, 3 deletions
diff --git a/CPP/7zip/UI/GUI/7zG.exe.manifest b/CPP/7zip/UI/GUI/7zG.exe.manifest index c6ef90e8..68c6047e 100755 --- a/CPP/7zip/UI/GUI/7zG.exe.manifest +++ b/CPP/7zip/UI/GUI/7zG.exe.manifest @@ -1 +1,13 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?><assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"><assemblyIdentity version="1.0.0.0" processorArchitecture="*" name="7-Zip.7-Zip.7zG" type="win32"/><description>7-Zip GUI.</description><dependency> <dependentAssembly><assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"/></dependentAssembly></dependency></assembly> +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3"> + <assemblyIdentity version="1.0.0.0" processorArchitecture="*" name="7-Zip.7-Zip.7zG" type="win32"/> + <description>7-Zip GUI.</description> + <dependency> + <dependentAssembly><assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"/></dependentAssembly> + </dependency> + <asmv3:application> + <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings"> + <dpiAware>true</dpiAware> + </asmv3:windowsSettings> + </asmv3:application> +</assembly> diff --git a/CPP/7zip/UI/GUI/GUI.cpp b/CPP/7zip/UI/GUI/GUI.cpp index 0a40b58e..5b809a63 100755 --- a/CPP/7zip/UI/GUI/GUI.cpp +++ b/CPP/7zip/UI/GUI/GUI.cpp @@ -20,6 +20,7 @@ #include "../Common/ExitCode.h" #include "../FileManager/StringUtils.h" +#include "../FileManager/MyWindowsNew.h" #include "BenchmarkDialog.h" #include "ExtractGUI.h" @@ -232,6 +233,11 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE /* hPrevInstance */, InitCommonControls(); + // OleInitialize is required for ProgressBar in TaskBar. + #ifndef UNDER_CE + OleInitialize(NULL); + #endif + ReloadLang(); // setlocale(LC_COLLATE, ".ACP"); diff --git a/CPP/7zip/UI/GUI/UpdateGUI.cpp b/CPP/7zip/UI/GUI/UpdateGUI.cpp index ec56492f..406d5bf1 100755 --- a/CPP/7zip/UI/GUI/UpdateGUI.cpp +++ b/CPP/7zip/UI/GUI/UpdateGUI.cpp @@ -392,7 +392,6 @@ HRESULT UpdateGUI( RINOK(tu.Create(title, hwndParent)); - messageWasDisplayed = tu.ThreadFinishedOK & - tu.ProgressDialog.MessagesDisplayed; + messageWasDisplayed = tu.ThreadFinishedOK && tu.ProgressDialog.MessagesDisplayed; return tu.Result; } |