Skip to content

Make safetyhook a shared library #2308

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Make safetyhook a shared library #2308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ccaf7f2
Preliminary changes for shared lib safetyhook
Kenzzer Apr 3, 2025
2a1bb88
Add safetyhook to load logic
Kenzzer Apr 3, 2025
6dd3591
temporary fix for windows
Kenzzer Apr 3, 2025
e9f83a8
Bump python from 3.8 to 3.9
Kenzzer Apr 3, 2025
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ jobs:

# Setup Python for AMBuild
- uses: actions/setup-python@v5
name: Setup Python 3.8
name: Setup Python 3.9
with:
python-version: 3.8
python-version: 3.9
- name: Install Python dependencies
run: |
python -m pip install --upgrade pip setuptools wheel
Expand Down
5 changes: 4 additions & 1 deletion AMBuildScript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,10 @@ class SMConfig(object):

for task in self.libsafetyhook:
if task.target.arch == binary.compiler.target.arch:
binary.compiler.linkflags += [task.binary]
if task.target.platform == 'windows':
binary.compiler.linkflags += [task.binary.path.removesuffix('.dll') + '.lib']
else:
binary.compiler.linkflags += [task.binary]
return
raise Exception('No suitable build of safetyhook was found.')

Expand Down
14 changes: 13 additions & 1 deletion core/logic_bridge.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,14 +676,26 @@ void CoreProviderImpl::InitializeBridge()
bool CoreProviderImpl::LoadBridge(char *error, size_t maxlength)
{
char file[PLATFORM_MAX_PATH];
char myerror[255];

/* Load safetyhook first. The core & extensions might depend on it */
g_SMAPI->PathFormat(file,
sizeof(file),
"%s/bin/" PLATFORM_ARCH_FOLDER "safetyhook." PLATFORM_LIB_EXT,
g_SourceMod.GetSourceModPath());

safetyhook_ = ke::SharedLib::Open(file, myerror, sizeof(myerror));
if (!safetyhook_) {
ke::SafeSprintf(error, maxlength, "failed to load %s: %s", file, myerror);
return false;
}

/* Now it's time to load the logic binary */
g_SMAPI->PathFormat(file,
sizeof(file),
"%s/bin/" PLATFORM_ARCH_FOLDER "sourcemod.logic." PLATFORM_LIB_EXT,
g_SourceMod.GetSourceModPath());

char myerror[255];
logic_ = ke::SharedLib::Open(file, myerror, sizeof(myerror));
if (!logic_) {
ke::SafeSprintf(error, maxlength, "failed to load %s: %s", file, myerror);
Expand Down
1 change: 1 addition & 0 deletions core/provider.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ class CoreProviderImpl : public CoreProvider
}

private:
ke::RefPtr<ke::SharedLib> safetyhook_;
ke::RefPtr<ke::SharedLib> logic_;
LogicInitFunction logic_init_;
GameHooks hooks_;
Expand Down
1 change: 0 additions & 1 deletion extensions/dhooks/DynamicHooks/hook.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
#else
#include <macro-assembler-x86.h>
#include <jit/jit_helpers.h>
#include <CDetour/detourhelpers.h>
using namespace sp;
#endif

Expand Down
147 changes: 0 additions & 147 deletions public/CDetour/detourhelpers.h
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions public/CDetour/detours.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
#ifndef _INCLUDE_SOURCEMOD_DETOURS_H_
#define _INCLUDE_SOURCEMOD_DETOURS_H_

#define SAFETYHOOK_SHARED_LIB true
#include "safetyhook.hpp"
#include <smsdk_ext.h>

Expand Down
2 changes: 1 addition & 1 deletion public/safetyhook
Open in desktop
Submodule safetyhook updated 18 files
+4 −3 AMBuilder
+68 −7 CMakeLists.txt
+1 −1 amalgamate.py
+61 −8 cmake.toml
+7 −0 cmake/safetyhook-config.cmake.in
+1 −0 include/safetyhook.hpp
+4 −2 include/safetyhook/allocator.hpp
+16 −0 include/safetyhook/common.hpp
+7 −4 include/safetyhook/easy.hpp
+29 −29 include/safetyhook/inline_hook.hpp
+10 −9 include/safetyhook/mid_hook.hpp
+14 −12 include/safetyhook/os.hpp
+6 −4 include/safetyhook/utility.hpp
+6 −6 include/safetyhook/vmt_hook.hpp
+4 −8 src/allocator.cpp
+2 −2 src/inline_hook.cpp
+3 −10 src/os.linux.cpp
+34 −18 src/os.windows.cpp
7 changes: 7 additions & 0 deletions tools/buildbot/PackageScript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,13 @@ helpers = SM.package_helpers
helpers.builder = builder
folder_map = helpers.CreateFolders(folder_list)

# Copy safetyhook
for cxx_task in SM.libsafetyhook:
if cxx_task.target.arch == 'x86_64' in cxx_task.binary.path:
builder.AddCopy(cxx_task.binary, folder_map['addons/sourcemod/bin/x64'])
else:
builder.AddCopy(cxx_task.binary, folder_map['addons/sourcemod/bin'])

# Copy binaries.
for cxx_task in SM.binaries:
# mms expects our loader (sourcemod_mm) to exist in /bin/
Expand Down
Loading