Hotpatch EZFRD64 to fix heap-related crashes, improve the UCRT patch #5582

shuffle2 · 2017-06-09T05:17:53Z

The PR should be complete. CMake didn't touch this before so meh.

Source/Core/Common/Common.vcxproj

@@ -175,6 +176,7 @@
    <ClCompile Include="Hash.cpp" />
    <ClCompile Include="IniFile.cpp" />
    <ClCompile Include="JitRegister.cpp" />
+    <ClCompile Include="LdrWatcher.cpp" />


Source/Core/Common/CompatPatches.cpp

+    auto parser = ModuleParser(event.base_address);
+    parser.PatchIAT("kernel32.dll", "HeapCreate", HeapCreateLow4GB);
+  } });
+}


Source/Core/Common/CompatPatches.cpp

@@ -0,0 +1,121 @@
+#include <functional>


Source/Core/Common/CompatPatches.h

@@ -0,0 +1,5 @@
+#pragma once


Source/Core/Common/LdrWatcher.cpp

@@ -0,0 +1,176 @@
+#include <Windows.h>


Source/Core/Common/LdrWatcher.h

@@ -0,0 +1,33 @@
+#pragma once


JosJuice

This is pretty much the same as the feedback I left before, but I suppose I'll leave it again since this PR has been created separately from the old one.

Source/Core/Common/CompatPatches.cpp

+                      auto msg = StringFromFormat(
+                          "You are running %S version %d.%d.%d.%d.\n"
+                          "An important fix affecting dolphin was introduced in build %d.\n"
+                          "You can use dolphin, but there will be known bugs.\n"


Source/Core/Common/CompatPatches.cpp

+                          event.name.c_str(), version.major, version.minor, version.build,
+                          version.qfe, fixed_build);
+                      // Use MessageBox for maximal user annoyance
+                      MessageBoxA(nullptr, msg.c_str(), "WARNING: BUGGY UCRT VERSION",


Source/Core/Common/CompatPatches.cpp

+                      }
+                      // If we reach here, the version is buggy (afaik) and patching failed
+                      auto msg = StringFromFormat(
+                          "You are running %S version %d.%d.%d.%d.\n"


Source/Core/Common/LdrWatcher.cpp

+
+void LdrWatcher::Install(const LdrObserver& observer)
+{
+  observers.emplace_back(std::move(observer));


…on drivers. Move ucrtFreadWorkaround to use the new LdrWatcher.

Orphis suggested changes Jun 10, 2017

View reviewed changes

sepalani suggested changes Jun 11, 2017

View reviewed changes

shuffle2 changed the title ~~throw big honkin' warnings at users who load crashy modules into dolphin~~ Hotpatch EZFRD64 to fix heap-related crashes, improve the UCRT patch Jun 12, 2017

JosJuice reviewed Jun 12, 2017

View reviewed changes

lioncash reviewed Jun 12, 2017

View reviewed changes

Source/Core/Common/LdrWatcher.cpp Outdated

void LdrWatcher::Install(const LdrObserver& observer)

{

observers.emplace_back(std::move(observer));

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

shuffle2 added 2 commits June 15, 2017 21:21

[windows]: Apply compatibility patches to problematic gamepad vibrati…

1210c74

…on drivers. Move ucrtFreadWorkaround to use the new LdrWatcher.

cmake/win32: add CompatPatches

f469d86

shuffle2 merged commit 9c8e26b into dolphin-emu:master Jun 16, 2017

shuffle2 deleted the bad-dll-warnings branch June 18, 2017 22:48

TrixPone mentioned this pull request May 25, 2018

[Suggestion] Twin USB Joystick alessandroasm/generic-usb-gamepad-vibration-driver#4

Open

Hotpatch EZFRD64 to fix heap-related crashes, improve the UCRT patch #5582

Hotpatch EZFRD64 to fix heap-related crashes, improve the UCRT patch #5582

shuffle2 commented Jun 9, 2017 •

edited

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

JosJuice left a comment

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

Hotpatch EZFRD64 to fix heap-related crashes, improve the UCRT patch #5582

Hotpatch EZFRD64 to fix heap-related crashes, improve the UCRT patch #5582

Conversation

shuffle2 commented Jun 9, 2017 • edited

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

JosJuice left a comment

Choose a reason for hiding this comment

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

shuffle2 commented Jun 9, 2017 •

edited