Temporary workaround for developing NanaZip.Codecs.dll for solving is…

…sue mentioned in #379. (Thanks to dinhngtu.)
M2Team · Feb 9, 2024 · 62278f2 · 62278f2
1 parent 2db50de
commit 62278f2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/NanaZip.UI.Classic/SevenZip/CPP/7zip/UI/Common/LoadCodecs.cpp b/NanaZip.UI.Classic/SevenZip/CPP/7zip/UI/Common/LoadCodecs.cpp
@@ -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)

diff --git a/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/Common/LoadCodecs.cpp b/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/Common/LoadCodecs.cpp
@@ -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)