Skip to content

fix: disable if incompatible dll detected #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
alandtse wants to merge 2 commits into from
Closed

fix: disable if incompatible dll detected #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
082dca9
fix: fix compilation due to empty ports directory
alandtse Mar 11, 2023
dfabcec
fix: disable if incompatible dll detected
alandtse Mar 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file added cmake/ports/.gitkeep
View file
Open in desktop
Empty file.
41 changes: 28 additions & 13 deletions src/XSEPlugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include "ShaderCache.h"
#include "State.h"
#include "Menu.h"
#include <fmt/xchar.h>

#include "ENB/ENBSeriesAPI.h"

Expand All @@ -28,25 +29,39 @@ void MessageHandler(SKSE::MessagingInterface::Message* message)
switch (message->type) {
case SKSE::MessagingInterface::kPostPostLoad:
{
Hooks::Install();
const std::array dlls = {
L"ShaderTools",
L"ENBHelperSE",
L"ENBHelperVR",
L"ENBHelperPlus"
};
auto incompatible = false;
for (const auto dll : dlls) {
if (GetModuleHandle(dll)) {
logger::info(fmt::runtime("Incompatible DLL {} detected, will disable all hooks and features"), stl::utf16_to_utf8(dll).value_or("<unicode conversion error>"s));
incompatible = true;
}
}
if (!incompatible) {
Hooks::Install();

//auto& shaderCache = SIE::ShaderCache::Instance();
//auto& shaderCache = SIE::ShaderCache::Instance();

//shaderCache.SetEnabled(true);
//shaderCache.SetAsync(true);
//shaderCache.SetDiskCache(true);
//shaderCache.SetEnabled(true);
//shaderCache.SetAsync(true);
//shaderCache.SetDiskCache(true);

//State::GetSingleton()->Load();
//State::GetSingleton()->Load();

//shaderCache.ValidateDiskCache();
//shaderCache.ValidateDiskCache();

if (reshade::register_addon(m_hModule)) {
logger::info("ReShade: Registered add-on");
// reshade::register_event<reshade::addon_event::reshade_overlay>(DrawOverlayCallback);
} else {
logger::info("ReShade: Could not register add-on");
if (reshade::register_addon(m_hModule)) {
logger::info("ReShade: Registered add-on");
// reshade::register_event<reshade::addon_event::reshade_overlay>(DrawOverlayCallback);
} else {
logger::info("ReShade: Could not register add-on");
}
}

break;
}
case SKSE::MessagingInterface::kDataLoaded:
Expand Down