Remove dsound.dll for ME1 as it is becoming problematic

ME3Tweaks · Nov 22, 2018 · 5e3eaf1 · 5e3eaf1
1 parent e6228cd
commit 5e3eaf1
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 30 deletions.
diff --git a/AlotAddOnGUI/AlotAddOnGUI.csproj b/AlotAddOnGUI/AlotAddOnGUI.csproj
@@ -331,7 +331,6 @@
     <Resource Include="images\greencheckmark.png" />
     <Resource Include="images\orangedownload.png" />
     <Resource Include="ALOTInstallerIcon.ico" />
-    <Content Include="binkw32\me1\dsound.dll" />
     <Content Include="binkw32\me2\binkw23.dll" />
     <Content Include="binkw32\me2\binkw32.dll" />
     <Content Include="binkw32\me3\binkw23.dll" />
@@ -373,7 +372,9 @@
   <ItemGroup>
     <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Folder Include="binkw32\me1\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/AlotAddOnGUI/Utilites.cs b/AlotAddOnGUI/Utilites.cs
@@ -606,26 +606,7 @@ public static bool DeleteFilesAndFoldersRecursively(string target_dir)
             }
             return result;
         }
-
-        public static bool InstallIndirectSoundFixForME1()
-        {
-            Log.Information("Installing indirect sound fix  for Mass Effect");
-            string gamePath = GetGamePath(1);
-            gamePath += "\\Binaries\\";
-            try
-            {
-                File.WriteAllBytes(gamePath + "dsound.dll", AlotAddOnGUI.Properties.Resources.dsound);
-                Log.Information("Installed indrectsound for Mass Effect");
-                return true;
-            }
-            catch (Exception e)
-            {
-                Log.Error("Unable to install indirectsound:");
-                Log.Error(App.FlattenException(e));
-            }
-            return false;
-        }
-
+
         public static string CalculateMD5(string filename)
         {
             try

diff --git a/AlotAddOnGUI/binkw32/me1/dsound.dll b/AlotAddOnGUI/binkw32/me1/dsound.dll
diff --git a/AlotAddOnGUI/ui/ALOT_InstallMode_ThreadedTasks.cs b/AlotAddOnGUI/ui/ALOT_InstallMode_ThreadedTasks.cs
@@ -706,13 +706,6 @@ private void InstallALOTContextBased(object sender, DoWorkEventArgs e)
                     return;
                 }
                 Utilities.RemoveRunAsAdminXPSP3FromME1();
-                Utilities.InstallIndirectSoundFixForME1();
-                string iniPath = IniSettingsHandler.GetConfigIniPath(1);
-                if (File.Exists(iniPath))
-                {
-                    IniFile engineConf = new IniFile(iniPath);
-                    engineConf.Write("DeviceName", "Generic Hardware", "ISACTAudio.ISACTAudioDevice");
-                }
             }
             Utilities.TurnOffOriginAutoUpdate();
 

diff --git a/AlotAddOnGUI/ui/DiagnosticsWindow.xaml.cs b/AlotAddOnGUI/ui/DiagnosticsWindow.xaml.cs
@@ -1036,7 +1036,7 @@ private void PerformDiagnostics(object sender, DoWorkEventArgs e)
                                 if (line.Contains("Uninitialized: Log file closed"))
                                 {
                                     crashIndex = index;
-                                    reason = "Log file indicates uninitialized device caused application to abort";
+                                    reason = "Log file indicates device never fully initalized - may be due to dsound.dll in binaries folder.\nRemoving this file may fix the issue";
                                     Log.Information("Found crash in ME1 log " + file.Name + " on line " + index);
                                     break;
                                 }