From c7b780def28ff4d43f2a1127619d8b4fe2106f57 Mon Sep 17 00:00:00 2001 From: zeromus Date: Mon, 29 Oct 2012 22:20:25 +0000 Subject: [PATCH] fix 7z code to survive relocated dll --- BizHawk.Util/7z/LibraryManager.cs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/BizHawk.Util/7z/LibraryManager.cs b/BizHawk.Util/7z/LibraryManager.cs index dbf1aece9b..86ad2f7c86 100644 --- a/BizHawk.Util/7z/LibraryManager.cs +++ b/BizHawk.Util/7z/LibraryManager.cs @@ -131,12 +131,16 @@ namespace SevenZip #if !WINCE && !MONO if (_modulePtr == IntPtr.Zero) { - if (!File.Exists(_libraryFileName)) - { - throw new SevenZipLibraryException("DLL file does not exist."); - } + //zero 29-oct-2012 - this check isnt useful since LoadLibrary can pretty much check for the same thing. and it wrecks our dll relocation scheme + //if (!File.Exists(_libraryFileName)) + //{ + // throw new SevenZipLibraryException("DLL file does not exist."); + //} if ((_modulePtr = NativeMethods.LoadLibrary(_libraryFileName)) == IntPtr.Zero) { + //try a different directory + string alternateFilename = Path.Combine(Path.Combine(Path.GetDirectoryName(_libraryFileName),"dll"),"7z.dll"); + if ((_modulePtr = NativeMethods.LoadLibrary(alternateFilename)) == IntPtr.Zero) throw new SevenZipLibraryException("failed to load library."); } if (NativeMethods.GetProcAddress(_modulePtr, "GetHandlerProperty") == IntPtr.Zero)