Skip to content

Commit

Permalink
vc_crt_fix improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
@alabuzhev
alabuzhev committed Jul 1, 2017
1 parent 25e3342 commit ced464c
Show file tree
Hide file tree
Showing 2 changed files with 213 additions and 71 deletions.
279 changes: 208 additions & 71 deletions plugins/common/vc_crt_fix_impl.cpp
View file
Expand Up @@ -31,6 +31,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

#include <windows.h>
#include <utility>

template<typename T>
T GetFunctionPointer(const wchar_t* ModuleName, const char* FunctionName, T Replacement)
Expand All @@ -44,12 +45,33 @@ static const auto Function = GetFunctionPointer(ModuleName, #FunctionName, &impl

static const wchar_t kernel32[] = L"kernel32";

static void* XorPointer(void* Ptr)
{
static const auto Cookie = []
{
static void* Ptr;
auto Result = reinterpret_cast<uintptr_t>(&Ptr);

FILETIME CreationTime, NotUsed;
if (GetThreadTimes(GetCurrentThread(), &CreationTime, &NotUsed, &NotUsed, &NotUsed))
{
Result ^= CreationTime.dwLowDateTime;
Result ^= CreationTime.dwHighDateTime;
}
return Result;
}();
return reinterpret_cast<void*>(reinterpret_cast<uintptr_t>(Ptr) ^ Cookie);
}

// EncodePointer (VC2010)
extern "C" PVOID WINAPI EncodePointerWrapper(PVOID Ptr)
{
struct implementation
{
static PVOID WINAPI EncodePointer(PVOID Ptr) { return Ptr; }
static PVOID WINAPI EncodePointer(PVOID Ptr)
{
return XorPointer(Ptr);
}
};

CREATE_FUNCTION_POINTER(kernel32, EncodePointer);
Expand All @@ -61,7 +83,10 @@ extern "C" PVOID WINAPI DecodePointerWrapper(PVOID Ptr)
{
struct implementation
{
static PVOID WINAPI DecodePointer(PVOID Ptr) { return Ptr; }
static PVOID WINAPI DecodePointer(PVOID Ptr)
{
return XorPointer(Ptr);
}
};

CREATE_FUNCTION_POINTER(kernel32, DecodePointer);
Expand All @@ -75,134 +100,246 @@ extern "C" BOOL WINAPI GetModuleHandleExWWrapper(DWORD Flags, LPCWSTR ModuleName
{
static BOOL WINAPI GetModuleHandleExW(DWORD Flags, LPCWSTR ModuleName, HMODULE *Module)
{
BOOL Result = FALSE;
if (Flags)
if (Flags & GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS)
{
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
}
else
{
*Module = GetModuleHandleW(ModuleName);
if (*Module)
MEMORY_BASIC_INFORMATION mbi;
if (!VirtualQuery(ModuleName, &mbi, sizeof(mbi)))
return FALSE;

const auto ModuleValue = static_cast<HMODULE>(mbi.AllocationBase);

if (!(Flags & GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT))
{
Result = TRUE;
wchar_t Buffer[MAX_PATH];
if (!GetModuleFileName(ModuleValue, Buffer, ARRAYSIZE(Buffer)))
return FALSE;
LoadLibrary(Buffer);
}

*Module = ModuleValue;
return TRUE;
}
return Result;

// GET_MODULE_HANDLE_EX_FLAG_PIN not implemented

if (const auto ModuleValue = (Flags & GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT? GetModuleHandle : LoadLibrary)(ModuleName))
{
*Module = ModuleValue;
return TRUE;
}
return FALSE;
}
};

CREATE_FUNCTION_POINTER(kernel32, GetModuleHandleExW);
return Function(Flags, ModuleName, Module);
}

// InitializeSListHead (VC2015)
extern "C" void WINAPI InitializeSListHeadWrapper(PSLIST_HEADER ListHead)
namespace slist
{
struct implementation
namespace implementation
{
#ifdef _WIN64
#error Not implemented
#else
class critical_section
{
public:
critical_section() { InitializeCriticalSection(&m_Lock); }
~critical_section() { DeleteCriticalSection(&m_Lock); }
void lock() { EnterCriticalSection(&m_Lock); }
void unlock() { LeaveCriticalSection(&m_Lock); }

private:
CRITICAL_SECTION m_Lock;
};

struct service_entry: SLIST_ENTRY, critical_section
{
// InitializeSListHead might be called during runtime initialisation
// when operator new might not be ready yet (especially in presence of leak detectors)

void* operator new(size_t Size)
{
return malloc(Size);
}

void operator delete(void* Ptr)
{
free(Ptr);
}

service_entry* ServiceNext;
};

class slist_lock
{
public:
explicit slist_lock(PSLIST_HEADER ListHead):
m_Entry(static_cast<service_entry&>(*ListHead->Next.Next))
{
m_Entry.lock();
}

~slist_lock()
{
m_Entry.unlock();
}

private:
service_entry& m_Entry;
};

class service_deleter
{
public:
~service_deleter()
{
while (m_Data.ServiceNext)
{
delete std::exchange(m_Data.ServiceNext, m_Data.ServiceNext->ServiceNext);
}
}

void add(service_entry* Entry)
{
m_Data.lock();
Entry->ServiceNext = m_Data.ServiceNext;
m_Data.ServiceNext = Entry;
m_Data.unlock();
}

private:
service_entry m_Data{};
};

static SLIST_ENTRY*& top(PSLIST_HEADER ListHead)
{
return ListHead->Next.Next->Next;
}

static void WINAPI InitializeSListHead(PSLIST_HEADER ListHead)
{
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
*ListHead = {};

const auto Entry = new service_entry();
ListHead->Next.Next = Entry;

static service_deleter Deleter;
Deleter.add(Entry);
}

static PSLIST_ENTRY WINAPI InterlockedFlushSList(PSLIST_HEADER ListHead)
{
slist_lock Lock(ListHead);

ListHead->Depth = 0;
return std::exchange(top(ListHead), nullptr);
}

static PSLIST_ENTRY WINAPI InterlockedPopEntrySList(PSLIST_HEADER ListHead)
{
slist_lock Lock(ListHead);

auto& Top = top(ListHead);
if (!Top)
return nullptr;

--ListHead->Depth;
return std::exchange(Top, Top->Next);
}

static PSLIST_ENTRY WINAPI InterlockedPushEntrySList(PSLIST_HEADER ListHead, PSLIST_ENTRY ListEntry)
{
slist_lock Lock(ListHead);

auto& Top = top(ListHead);

++ListHead->Depth;
ListEntry->Next = Top;
return std::exchange(Top, ListEntry);
}

static PSLIST_ENTRY WINAPI InterlockedPushListSListEx(PSLIST_HEADER ListHead, PSLIST_ENTRY List, PSLIST_ENTRY ListEnd, ULONG Count)
{
slist_lock Lock(ListHead);

auto& Top = top(ListHead);

ListHead->Depth += Count;
ListEnd->Next = Top;
return std::exchange(Top, List);
}

static PSLIST_ENTRY WINAPI RtlFirstEntrySList(PSLIST_HEADER ListHead)
{
slist_lock Lock(ListHead);

return top(ListHead);
}

static USHORT WINAPI QueryDepthSList(PSLIST_HEADER ListHead)
{
slist_lock Lock(ListHead);

return ListHead->Depth;
}
#endif
};
}

// InitializeSListHead (VC2015)
extern "C" void WINAPI InitializeSListHeadWrapper(PSLIST_HEADER ListHead)
{
using namespace slist;
CREATE_FUNCTION_POINTER(kernel32, InitializeSListHead);
return Function(ListHead);
}

// InterlockedFlushSList (VC2015)
extern "C" PSLIST_ENTRY WINAPI InterlockedFlushSListWrapper(PSLIST_HEADER ListHead)
{
struct implementation
{
static PSLIST_ENTRY WINAPI InterlockedFlushSList(PSLIST_HEADER ListHead)
{
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return nullptr;
}
};

using namespace slist;
CREATE_FUNCTION_POINTER(kernel32, InterlockedFlushSList);
return Function(ListHead);
}

// InterlockedPopEntrySList (VC2015)
extern "C" PSLIST_ENTRY WINAPI InterlockedPopEntrySListWrapper(PSLIST_HEADER ListHead)
{
struct implementation
{
static PSLIST_ENTRY WINAPI InterlockedPopEntrySList(PSLIST_HEADER ListHead)
{
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return nullptr;
}
};

using namespace slist;
CREATE_FUNCTION_POINTER(kernel32, InterlockedPopEntrySList);
return Function(ListHead);
}

// InterlockedPushEntrySList (VC2015)
extern "C" PSLIST_ENTRY WINAPI InterlockedPushEntrySListWrapper(PSLIST_HEADER ListHead, PSLIST_ENTRY ListEntry)
{
struct implementation
{
static PSLIST_ENTRY WINAPI InterlockedPushEntrySList(PSLIST_HEADER ListHead, PSLIST_ENTRY ListEntry)
{
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return nullptr;
}
};

using namespace slist;
CREATE_FUNCTION_POINTER(kernel32, InterlockedPushEntrySList);
return Function(ListHead, ListEntry);
}

// InterlockedPushListSList (VC2015)
// InterlockedPushListSListEx (VC2015)
extern "C" PSLIST_ENTRY WINAPI InterlockedPushListSListExWrapper(PSLIST_HEADER ListHead, PSLIST_ENTRY List, PSLIST_ENTRY ListEnd, ULONG Count)
{
struct implementation
{
static PSLIST_ENTRY WINAPI InterlockedPushListSListEx(PSLIST_HEADER ListHead, PSLIST_ENTRY List, PSLIST_ENTRY ListEnd, ULONG Count)
{
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return nullptr;
}
};

using namespace slist;
CREATE_FUNCTION_POINTER(kernel32, InterlockedPushListSListEx);
return Function(ListHead, List, ListEnd, Count);
}

// RtlFirstEntrySList (VC2015)
extern "C" PSLIST_ENTRY WINAPI RtlFirstEntrySListWrapper(PSLIST_HEADER ListHead)
{
struct implementation
{
static PSLIST_ENTRY WINAPI RtlFirstEntrySList(PSLIST_HEADER ListHead)
{
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return nullptr;
}
};

using namespace slist;
CREATE_FUNCTION_POINTER(kernel32, RtlFirstEntrySList);
return Function(ListHead);
}

// QueryDepthSList (VC2015)
extern "C" USHORT WINAPI QueryDepthSListWrapper(PSLIST_HEADER ListHead)
{
struct implementation
{
static USHORT WINAPI QueryDepthSList(PSLIST_HEADER ListHead)
{
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return 0;
}
};

using namespace slist;
CREATE_FUNCTION_POINTER(kernel32, QueryDepthSList);
return Function(ListHead);
}
Expand Down
5 changes: 5 additions & 0 deletions plugins/common/vc_crt_fix_ulink.cpp
View file
Expand Up @@ -30,7 +30,9 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

#include "disable_warnings_in_std_begin.hpp"
#include <windows.h>
#include "disable_warnings_in_std_end.hpp"
#include <delayimp.h>

//----------------------------------------------------------------------------
Expand All @@ -56,6 +58,9 @@ static FARPROC WINAPI delayFailureHook(/*dliNotification*/unsigned dliNotify,
}

//----------------------------------------------------------------------------
#if _MSC_FULL_VER >= 190024215 // VS2015sp3
const
#endif
PfnDliHook __pfnDliFailureHook2 = (PfnDliHook)delayFailureHook;

//----------------------------------------------------------------------------
Expand Down

0 comments on commit ced464c

Please sign in to comment.