eliott/NanaZip
1
0
Fork 0
mirror of https://github.com/emtee40/NanaZip synced 2026-04-25 16:24:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Temporary workaround for developing NanaZip.Codecs.dll for solving issue mentioned in https://github.com/M2Team/NanaZip/pull/379. (Thanks to dinhngtu.)

Browse Source
This commit is contained in:
MouriNaruto
2024-02-09 13:57:52 +08:00
parent 2db50ded11
commit 62278f2180
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
NanaZip.UI.Classic/SevenZip/CPP/7zip/UI/Common/LoadCodecs.cpp
View File

@@ -1,4 +1,4 @@
// LoadCodecs.cpp
// LoadCodecs.cpp
/*
EXTERNAL_CODECS
@@ -781,6 +781,11 @@ HRESULT CCodecs::Load()
#ifdef EXTERNAL_CODECS
const FString baseFolder = GetBaseFolderPrefixFromRegistry();
{
// ******** NanaZip.Codecs.dll development workaround start ********
// For workaround https://github.com/M2Team/NanaZip/pull/379
if (!::LoadLibraryW(baseFolder + L"NanaZip.Codecs.dll"))
MainDll_ErrorPath = L"NanaZip.Codecs.dll";
// ******** NanaZip.Codecs.dll development workaround end ********
bool loadedOK;
RINOK(LoadDll(baseFolder + kMainDll, false, &loadedOK));
if (!loadedOK)

7
NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/Common/LoadCodecs.cpp
View File

@@ -1,4 +1,4 @@
// LoadCodecs.cpp
// LoadCodecs.cpp
/*
EXTERNAL_CODECS
@@ -781,6 +781,11 @@ HRESULT CCodecs::Load()
#ifdef EXTERNAL_CODECS
const FString baseFolder = GetBaseFolderPrefixFromRegistry();
{
// ******** NanaZip.Codecs.dll development workaround start ********
// For workaround https://github.com/M2Team/NanaZip/pull/379
if (!::LoadLibraryW(baseFolder + L"NanaZip.Codecs.dll"))
MainDll_ErrorPath = L"NanaZip.Codecs.dll";
// ******** NanaZip.Codecs.dll development workaround end ********
bool loadedOK;
RINOK(LoadDll(baseFolder + kMainDll, false, &loadedOK));
if (!loadedOK)