From 62278f2180d26f1efb79f76d5e1cd49acaac59c4 Mon Sep 17 00:00:00 2001
From: MouriNaruto <Kenji.Mouri@outlook.com>
Date: Fri, 9 Feb 2024 13:57:52 +0800
Subject: [PATCH] Temporary workaround for developing NanaZip.Codecs.dll for
 solving issue mentioned in https://github.com/M2Team/NanaZip/pull/379.
 (Thanks to dinhngtu.)

---
 .../SevenZip/CPP/7zip/UI/Common/LoadCodecs.cpp             | 7 ++++++-
 .../SevenZip/CPP/7zip/UI/Common/LoadCodecs.cpp             | 7 ++++++-
 2 files changed, 12 insertions(+), 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
index 951f5d0b..05eb1692 100644
--- 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
index 951f5d0b..05eb1692 100644
--- 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)