-
-
Notifications
You must be signed in to change notification settings - Fork 8
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.
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
Water Surface Rendering Fix #71
Merged
Merged
Changes from 3 commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,186 @@ | ||
/* | ||
* MinHook - The Minimalistic API Hooking Library for x64/x86 | ||
* Copyright (C) 2009-2017 Tsuda Kageyu. | ||
* All rights reserved. | ||
* | ||
* Redistribution and use in source and binary forms, with or without | ||
* modification, are permitted provided that the following conditions | ||
* are met: | ||
* | ||
* 1. Redistributions of source code must retain the above copyright | ||
* notice, this list of conditions and the following disclaimer. | ||
* 2. Redistributions in binary form must reproduce the above copyright | ||
* notice, this list of conditions and the following disclaimer in the | ||
* documentation and/or other materials provided with the distribution. | ||
* | ||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | ||
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A | ||
* PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER | ||
* OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | ||
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | ||
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | ||
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF | ||
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING | ||
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
*/ | ||
|
||
#pragma once | ||
|
||
#if !(defined _M_IX86) && !(defined _M_X64) && !(defined __i386__) && !(defined __x86_64__) | ||
#error MinHook supports only x86 and x64 systems. | ||
#endif | ||
|
||
#include <windows.h> | ||
|
||
// MinHook Error Codes. | ||
typedef enum MH_STATUS | ||
{ | ||
// Unknown error. Should not be returned. | ||
MH_UNKNOWN = -1, | ||
|
||
// Successful. | ||
MH_OK = 0, | ||
|
||
// MinHook is already initialized. | ||
MH_ERROR_ALREADY_INITIALIZED, | ||
|
||
// MinHook is not initialized yet, or already uninitialized. | ||
MH_ERROR_NOT_INITIALIZED, | ||
|
||
// The hook for the specified target function is already created. | ||
MH_ERROR_ALREADY_CREATED, | ||
|
||
// The hook for the specified target function is not created yet. | ||
MH_ERROR_NOT_CREATED, | ||
|
||
// The hook for the specified target function is already enabled. | ||
MH_ERROR_ENABLED, | ||
|
||
// The hook for the specified target function is not enabled yet, or already | ||
// disabled. | ||
MH_ERROR_DISABLED, | ||
|
||
// The specified pointer is invalid. It points the address of non-allocated | ||
// and/or non-executable region. | ||
MH_ERROR_NOT_EXECUTABLE, | ||
|
||
// The specified target function cannot be hooked. | ||
MH_ERROR_UNSUPPORTED_FUNCTION, | ||
|
||
// Failed to allocate memory. | ||
MH_ERROR_MEMORY_ALLOC, | ||
|
||
// Failed to change the memory protection. | ||
MH_ERROR_MEMORY_PROTECT, | ||
|
||
// The specified module is not loaded. | ||
MH_ERROR_MODULE_NOT_FOUND, | ||
|
||
// The specified function is not found. | ||
MH_ERROR_FUNCTION_NOT_FOUND | ||
} | ||
MH_STATUS; | ||
|
||
// Can be passed as a parameter to MH_EnableHook, MH_DisableHook, | ||
// MH_QueueEnableHook or MH_QueueDisableHook. | ||
#define MH_ALL_HOOKS NULL | ||
|
||
#ifdef __cplusplus | ||
extern "C" { | ||
#endif | ||
|
||
// Initialize the MinHook library. You must call this function EXACTLY ONCE | ||
// at the beginning of your program. | ||
MH_STATUS WINAPI MH_Initialize(VOID); | ||
|
||
// Uninitialize the MinHook library. You must call this function EXACTLY | ||
// ONCE at the end of your program. | ||
MH_STATUS WINAPI MH_Uninitialize(VOID); | ||
|
||
// Creates a Hook for the specified target function, in disabled state. | ||
// Parameters: | ||
// pTarget [in] A pointer to the target function, which will be | ||
// overridden by the detour function. | ||
// pDetour [in] A pointer to the detour function, which will override | ||
// the target function. | ||
// ppOriginal [out] A pointer to the trampoline function, which will be | ||
// used to call the original target function. | ||
// This parameter can be NULL. | ||
MH_STATUS WINAPI MH_CreateHook(LPVOID pTarget, LPVOID pDetour, LPVOID *ppOriginal); | ||
|
||
// Creates a Hook for the specified API function, in disabled state. | ||
// Parameters: | ||
// pszModule [in] A pointer to the loaded module name which contains the | ||
// target function. | ||
// pszTarget [in] A pointer to the target function name, which will be | ||
// overridden by the detour function. | ||
// pDetour [in] A pointer to the detour function, which will override | ||
// the target function. | ||
// ppOriginal [out] A pointer to the trampoline function, which will be | ||
// used to call the original target function. | ||
// This parameter can be NULL. | ||
MH_STATUS WINAPI MH_CreateHookApi( | ||
LPCWSTR pszModule, LPCSTR pszProcName, LPVOID pDetour, LPVOID *ppOriginal); | ||
|
||
// Creates a Hook for the specified API function, in disabled state. | ||
// Parameters: | ||
// pszModule [in] A pointer to the loaded module name which contains the | ||
// target function. | ||
// pszTarget [in] A pointer to the target function name, which will be | ||
// overridden by the detour function. | ||
// pDetour [in] A pointer to the detour function, which will override | ||
// the target function. | ||
// ppOriginal [out] A pointer to the trampoline function, which will be | ||
// used to call the original target function. | ||
// This parameter can be NULL. | ||
// ppTarget [out] A pointer to the target function, which will be used | ||
// with other functions. | ||
// This parameter can be NULL. | ||
MH_STATUS WINAPI MH_CreateHookApiEx( | ||
LPCWSTR pszModule, LPCSTR pszProcName, LPVOID pDetour, LPVOID *ppOriginal, LPVOID *ppTarget); | ||
|
||
// Removes an already created hook. | ||
// Parameters: | ||
// pTarget [in] A pointer to the target function. | ||
MH_STATUS WINAPI MH_RemoveHook(LPVOID pTarget); | ||
|
||
// Enables an already created hook. | ||
// Parameters: | ||
// pTarget [in] A pointer to the target function. | ||
// If this parameter is MH_ALL_HOOKS, all created hooks are | ||
// enabled in one go. | ||
MH_STATUS WINAPI MH_EnableHook(LPVOID pTarget); | ||
|
||
// Disables an already created hook. | ||
// Parameters: | ||
// pTarget [in] A pointer to the target function. | ||
// If this parameter is MH_ALL_HOOKS, all created hooks are | ||
// disabled in one go. | ||
MH_STATUS WINAPI MH_DisableHook(LPVOID pTarget); | ||
|
||
// Queues to enable an already created hook. | ||
// Parameters: | ||
// pTarget [in] A pointer to the target function. | ||
// If this parameter is MH_ALL_HOOKS, all created hooks are | ||
// queued to be enabled. | ||
MH_STATUS WINAPI MH_QueueEnableHook(LPVOID pTarget); | ||
|
||
// Queues to disable an already created hook. | ||
// Parameters: | ||
// pTarget [in] A pointer to the target function. | ||
// If this parameter is MH_ALL_HOOKS, all created hooks are | ||
// queued to be disabled. | ||
MH_STATUS WINAPI MH_QueueDisableHook(LPVOID pTarget); | ||
|
||
// Applies all queued changes in one go. | ||
MH_STATUS WINAPI MH_ApplyQueued(VOID); | ||
|
||
// Translates the MH_STATUS to its name as a string. | ||
const char * WINAPI MH_StatusToString(MH_STATUS status); | ||
|
||
#ifdef __cplusplus | ||
} | ||
#endif | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks good to me. My only suggestions would be to use less unique patterns so there's some resilience against game patches, also to add some logging upon successful hooking. Maybe something like this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wouldn't it be more useful to report the address relative to baseModule? At the very least the base module address should be logged, because currently logging the absolute addresses doesn't allow us to actually check what is being patched in a disassembler.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've updated with the requested changes as well as logging the module address.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's true, so should we add a log of the baseModule address during
DetectGame
? Then for the relative addresses on hooks have something like this?This would look like
MGS 3: Render Water Surface: Address is METAL GEAR SOLID3.exe+5ac7c0
in the log.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, that works. Although it may be worth doing a separate pass on all of the logs in another PR as to not muddy this one. For now, logging the base module address at least allows us to manually find the relative addresses.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sounds good to me. I'll merge this and put up a new release.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
FYI in case it helps at all, you can disable the relocating with an EXE flag, steamstub would need to be removed first though: nipkownix/re4_tweaks#201 (comment)
Of course that doesn't help with user logs though, but can make debugging stuff a bit easier.