Update to 7-Zip Version 22.00

See: https://sourceforge.net/p/sevenzip/discussion/45797/thread/9c2d9061ce/
This commit is contained in:
Tino Reichardt
2022-08-07 09:59:33 +02:00
parent 6a4fe97fc3
commit 57558682a8
211 changed files with 15251 additions and 2482 deletions
+42
View File
@@ -12,7 +12,20 @@ void ShowHelpWindow(LPCSTR)
#else
// #define USE_EXTERNAL_HELP
#if defined(_MSC_VER)
#endif
#ifdef USE_EXTERNAL_HELP
#include "../../../Windows/ProcessUtils.h"
#include "../../../Windows/FileDir.h"
#include "../../../Windows/FileName.h"
#else
#include <HtmlHelp.h>
#endif
#include "../../../Common/StringConvert.h"
@@ -25,8 +38,37 @@ void ShowHelpWindow(LPCSTR topicFile)
FString path = NWindows::NDLL::GetModuleDirPrefix();
path += kHelpFileName;
path += topicFile;
#ifdef USE_EXTERNAL_HELP
FString prog;
#ifdef UNDER_CE
prog = "\\Windows\\";
#else
if (!NWindows::NFile::NDir::GetWindowsDir(prog))
return;
NWindows::NFile::NName::NormalizeDirPathPrefix(prog);
#endif
prog += "hh.exe";
UString params;
params += '"';
params += fs2us(path);
params += '"';
NWindows::CProcess process;
const WRes wres = process.Create(fs2us(prog), params, NULL); // curDir);
if (wres != 0)
{
/*
HRESULT hres = HRESULT_FROM_WIN32(wres);
ErrorMessageHRESULT(hres, imageName);
return hres;
*/
}
#else
// HWND hwnd = NULL;
HtmlHelp(NULL, GetSystemString(fs2us(path)), HH_DISPLAY_TOPIC, 0);
#endif
}
#endif