Merge branch 'fixes' into 'master'

Tweaks and fixes

See merge request Mr_Goldberg/goldberg_emulator!43
This commit is contained in:
Soar Qin 2023-05-10 05:21:30 +00:00
commit faebaac1ad
15 changed files with 57 additions and 39 deletions

View file

@ -19,9 +19,15 @@
#ifdef __WINDOWS__
BOOLEAN (APIENTRY *RtlGenRandom)(void *, ULONG) = NULL;
static void
randombytes(char * const buf, const size_t size)
{
if (RtlGenRandom == NULL)
{
RtlGenRandom = (BOOLEAN (APIENTRY *)(void *, ULONG))GetProcAddress(LoadLibraryW(L"advapi32.dll"), "SystemFunction036");
}
while (!RtlGenRandom((PVOID) buf, (ULONG) size)) {
PRINT_DEBUG("RtlGenRandom ERROR\n");
Sleep(100);

View file

@ -60,11 +60,11 @@
#include <shlobj.h>
#define MSG_NOSIGNAL 0
/*
#define SystemFunction036 NTAPI SystemFunction036
#include <ntsecapi.h>
#undef SystemFunction036
*/
#ifndef EMU_RELEASE_BUILD
#define PRINT_DEBUG(a, ...) do {FILE *t = fopen("STEAM_LOG.txt", "a"); fprintf(t, "%u " a, GetCurrentThreadId(), __VA_ARGS__); fclose(t); WSASetLastError(0);} while (0)
#endif

View file

@ -1,4 +0,0 @@
#include <windows.h>
#define RtlGenRandom SystemFunction036
#define DLLEXPORT __declspec(dllexport)
DLLEXPORT BOOLEAN WINAPI RtlGenRandom(PVOID in, ULONG len) {}

View file

@ -1,3 +0,0 @@
LIBRARY advapi32.dll
EXPORTS
SystemFunction036