xevion/easy7zip
1
0
Fork 0
mirror of https://github.com/Xevion/easy7zip.git synced 2025-12-10 12:07:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

9.22

Browse Source
This commit is contained in:
Igor Pavlov
2011-04-18 00:00:00 +00:00
committed by Kornel Lesiński
parent 35596517f2
commit 83f8ddcc5b
31 changed files with 298 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
CPP/7zip/UI/GUI/7zG.exe.manifest
View File

@@ -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>

6
CPP/7zip/UI/GUI/GUI.cpp
View File

@@ -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");

3
CPP/7zip/UI/GUI/UpdateGUI.cpp
View File

@@ -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;
}