mirror of
https://github.com/ClassiCube/ClassiCube.git
synced 2025-01-22 09:01:57 -05:00
Dynamically load all imagehlp functions
This commit is contained in:
UnknownShadow200
parent
29f1a173bf
commit
3c65a4fc28
9 changed files with 76 additions and 55 deletions
2
Makefile
2
Makefile
|
|
@ -49,7 +49,7 @@ ifeq ($(PLAT),mingw)
|
|||
OEXT = .exe
|
||||
CFLAGS += -DUNICODE
|
||||
LDFLAGS = -g
|
||||
LIBS = -mwindows -lwinmm -limagehlp
|
||||
LIBS = -mwindows -lwinmm
|
||||
BUILD_DIR = build-win
|
||||
endif
|
||||
|
||||
|
|
|
|||
41
misc/windows/min-imagehlp.h
Normal file
41
misc/windows/min-imagehlp.h
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
static DWORD_PTR (WINAPI *_SymGetModuleBase)(HANDLE process, DWORD_PTR addr);
|
||||
static PVOID (WINAPI *_SymFunctionTableAccess)(HANDLE process, DWORD_PTR addr);
|
||||
static BOOL (WINAPI *_SymInitialize)(HANDLE process, PCSTR userSearchPath, BOOL fInvadeProcess);
|
||||
|
||||
static BOOL (WINAPI *_SymGetSymFromAddr)(HANDLE process, DWORD_PTR addr, DWORD_PTR* displacement, IMAGEHLP_SYMBOL* sym);
|
||||
static BOOL (WINAPI *_SymGetModuleInfo) (HANDLE process, DWORD_PTR addr, IMAGEHLP_MODULE* module);
|
||||
static BOOL (WINAPI *_SymGetLineFromAddr)(HANDLE hProcess, DWORD_PTR addr, DWORD* displacement, IMAGEHLP_LINE* line); /* displacement is intentionally DWORD */
|
||||
|
||||
static BOOL (WINAPI *_EnumerateLoadedModules)(HANDLE process, PENUMLOADED_MODULES_CALLBACK callback, PVOID userContext);
|
||||
|
||||
static BOOL (WINAPI *_StackWalk)(DWORD machineType, HANDLE process, HANDLE thread, STACKFRAME* stackFrame, PVOID contextRecord,
|
||||
PREAD_PROCESS_MEMORY_ROUTINE ReadMemoryRoutine, PFUNCTION_TABLE_ACCESS_ROUTINE FunctionTableAccessRoutine,
|
||||
PGET_MODULE_BASE_ROUTINE GetModuleBaseRoutine, PTRANSLATE_ADDRESS_ROUTINE TranslateAddress);
|
||||
|
||||
static void ImageHlp_LoadDynamicFuncs(void) {
|
||||
static const struct DynamicLibSym funcs[] = {
|
||||
#ifdef _IMAGEHLP64
|
||||
{ "EnumerateLoadedModules64", (void**)&_EnumerateLoadedModules},
|
||||
{ "SymFunctionTableAccess64", (void**)&_SymFunctionTableAccess},
|
||||
{ "SymInitialize", (void**)&_SymInitialize },
|
||||
{ "SymGetModuleBase64", (void**)&_SymGetModuleBase },
|
||||
{ "SymGetModuleInfo64", (void**)&_SymGetModuleInfo },
|
||||
{ "SymGetLineFromAddr64", (void**)&_SymGetLineFromAddr },
|
||||
{ "SymGetSymFromAddr64", (void**)&_SymGetSymFromAddr },
|
||||
{ "StackWalk64", (void**)&_StackWalk },
|
||||
#else
|
||||
{ "EnumerateLoadedModules", (void**)&_EnumerateLoadedModules },
|
||||
{ "SymFunctionTableAccess", (void**)&_SymFunctionTableAccess },
|
||||
{ "SymInitialize", (void**)&_SymInitialize },
|
||||
{ "SymGetModuleBase", (void**)&_SymGetModuleBase },
|
||||
{ "SymGetModuleInfo", (void**)&_SymGetModuleInfo },
|
||||
{ "SymGetLineFromAddr", (void**)&_SymGetLineFromAddr },
|
||||
{ "SymGetSymFromAddr", (void**)&_SymGetSymFromAddr },
|
||||
{ "StackWalk", (void**)&_StackWalk },
|
||||
#endif
|
||||
};
|
||||
|
||||
static const cc_string imagehlp = String_FromConst("IMAGEHLP.DLL");
|
||||
void* lib;
|
||||
DynamicLib_LoadAll(&imagehlp, funcs, Array_Elems(funcs), &lib);
|
||||
}
|
||||
10
readme.md
10
readme.md
|
|
@ -112,14 +112,14 @@ I am assuming you used the installer from https://sourceforge.net/projects/mingw
|
|||
1. Install MinGW-W64
|
||||
2. Use either *Run Terminal* from Start Menu or run *mingw-w64.bat* in the installation folder
|
||||
3. Navigate to the directory with ClassiCube's source code
|
||||
4. Enter `gcc -fno-math-errno *.c -o ClassiCube.exe -mwindows -lwinmm -limagehlp`
|
||||
4. Enter `gcc -fno-math-errno *.c -o ClassiCube.exe -mwindows -lwinmm`
|
||||
|
||||
##### Using MinGW
|
||||
I am assuming you used the installer from https://osdn.net/projects/mingw/
|
||||
1. Install MinGW. You need mingw32-base-bin and msys-base-bin packages.
|
||||
2. Run *msys.bat* in the *C:\MinGW\msys\1.0* folder.
|
||||
2. Navigate to the directory with ClassiCube's source code
|
||||
4. Enter `gcc -fno-math-errno *.c -o ClassiCube.exe -mwindows -lwinmm -limagehlp`
|
||||
4. Enter `gcc -fno-math-errno *.c -o ClassiCube.exe -mwindows -lwinmm`
|
||||
|
||||
##### Using TCC (Tiny C Compiler)
|
||||
Setting up TCC:
|
||||
|
|
@ -131,7 +131,7 @@ Setting up TCC:
|
|||
Compiling with TCC:
|
||||
1. Navigate to the directory with ClassiCube's source code
|
||||
2. In `ExtMath.c`, change `fabsf` to `fabs` and `sqrtf` to `sqrt`
|
||||
3. Enter `tcc.exe -o ClassiCube.exe *.c -lwinmm -limagehlp -lgdi32 -luser32 -lcomdlg32 -lshell32`<br>
|
||||
3. Enter `tcc.exe -o ClassiCube.exe *.c -lwinmm -lgdi32 -luser32 -lcomdlg32 -lshell32`<br>
|
||||
(Note: You may need to specify the full path to `tcc.exe` instead of just `tcc.exe`)
|
||||
|
||||
## Compiling - Linux
|
||||
|
|
@ -144,11 +144,11 @@ Install appropriate libs as required. For ubuntu these are: libx11-dev, libxi-de
|
|||
|
||||
##### Cross compiling for Windows (32 bit):
|
||||
|
||||
```i686-w64-mingw32-gcc -fno-math-errno src/*.c -o ClassiCube.exe -mwindows -lwinmm -limagehlp```
|
||||
```i686-w64-mingw32-gcc -fno-math-errno src/*.c -o ClassiCube.exe -mwindows -lwinmm```
|
||||
|
||||
##### Cross compiling for Windows (64 bit):
|
||||
|
||||
```x86_64-w64-mingw32-gcc -fno-math-errno src/*.c -o ClassiCube.exe -mwindows -lwinmm -limagehlp```
|
||||
```x86_64-w64-mingw32-gcc -fno-math-errno src/*.c -o ClassiCube.exe -mwindows -lwinmm```
|
||||
|
||||
##### Raspberry Pi
|
||||
Although the regular linux compiliation flags will work fine, to take full advantage of the hardware:
|
||||
|
|
|
|||
|
|
@ -188,7 +188,7 @@
|
|||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<MinimumRequiredVersion>5.02</MinimumRequiredVersion>
|
||||
<EntryPointSymbol>main</EntryPointSymbol>
|
||||
<AdditionalDependencies>opengl32.lib;ws2_32.lib;Wininet.lib;dbghelp.lib;Winmm.lib;crypt32.lib;ucrtd.lib;vcruntimed.lib;msvcrtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>opengl32.lib;Winmm.lib;crypt32.lib;ucrtd.lib;vcruntimed.lib;msvcrtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
|
|
@ -208,7 +208,7 @@
|
|||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<EntryPointSymbol>main</EntryPointSymbol>
|
||||
<AdditionalDependencies>opengl32.lib;ws2_32.lib;Wininet.lib;crypt32.lib;dbghelp.lib;Winmm.lib;ucrtd.lib;vcruntimed.lib;msvcrtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>opengl32.lib;Winmm.lib;ucrtd.lib;vcruntimed.lib;msvcrtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
|
||||
|
|
@ -230,7 +230,7 @@
|
|||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<MinimumRequiredVersion>5.02</MinimumRequiredVersion>
|
||||
<EntryPointSymbol>main</EntryPointSymbol>
|
||||
<AdditionalDependencies>opengl32.lib;ws2_32.lib;Wininet.lib;dbghelp.lib;Winmm.lib;crypt32.lib;ucrtd.lib;vcruntimed.lib;msvcrtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>opengl32.lib;Winmm.lib;ucrtd.lib;vcruntimed.lib;msvcrtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
|
||||
|
|
@ -252,7 +252,7 @@
|
|||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<MinimumRequiredVersion>5.02</MinimumRequiredVersion>
|
||||
<EntryPointSymbol>main</EntryPointSymbol>
|
||||
<AdditionalDependencies>opengl32.lib;ws2_32.lib;Wininet.lib;dbghelp.lib;Winmm.lib;crypt32.lib;ucrtd.lib;vcruntimed.lib;msvcrtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>opengl32.lib;Winmm.lib;ucrtd.lib;vcruntimed.lib;msvcrtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
|
|
@ -281,7 +281,7 @@
|
|||
<MinimumRequiredVersion>5.02</MinimumRequiredVersion>
|
||||
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
|
||||
<EntryPointSymbol>main</EntryPointSymbol>
|
||||
<AdditionalDependencies>opengl32.lib;ws2_32.lib;Wininet.lib;crypt32.lib;dbghelp.lib;Winmm.lib;libucrt.lib;libvcruntime.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>opengl32.lib;Winmm.lib;libucrt.lib;libvcruntime.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
|
|
@ -308,7 +308,7 @@
|
|||
<OptimizeReferences>true</OptimizeReferences>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<EntryPointSymbol>main</EntryPointSymbol>
|
||||
<AdditionalDependencies>opengl32.lib;ws2_32.lib;Wininet.lib;crypt32.lib;dbghelp.lib;Winmm.lib;libucrt.lib;libvcruntime.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>opengl32.lib;Winmm.lib;libucrt.lib;libvcruntime.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
|
||||
|
|
@ -338,7 +338,7 @@
|
|||
<MinimumRequiredVersion>5.02</MinimumRequiredVersion>
|
||||
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
|
||||
<EntryPointSymbol>main</EntryPointSymbol>
|
||||
<AdditionalDependencies>opengl32.lib;ws2_32.lib;Wininet.lib;crypt32.lib;dbghelp.lib;Winmm.lib;libucrt.lib;libvcruntime.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>opengl32.lib;Winmm.lib;libucrt.lib;libvcruntime.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
|
||||
|
|
@ -368,7 +368,7 @@
|
|||
<MinimumRequiredVersion>5.02</MinimumRequiredVersion>
|
||||
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
|
||||
<EntryPointSymbol>main</EntryPointSymbol>
|
||||
<AdditionalDependencies>opengl32.lib;ws2_32.lib;Wininet.lib;crypt32.lib;dbghelp.lib;Winmm.lib;libucrt.lib;libvcruntime.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>opengl32.lib;Winmm.lib;libucrt.lib;libvcruntime.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -309,9 +309,10 @@ static struct ChatCommand MotdCommand = {
|
|||
*########################################################################################################################*/
|
||||
|
||||
static void PlaceCommand_Execute(const cc_string* args, int argsCount) {
|
||||
cc_string name;
|
||||
cc_uint8 off;
|
||||
int block;
|
||||
IVec3 pos;
|
||||
cc_uint8 off;
|
||||
|
||||
if (argsCount == 2) {
|
||||
Chat_AddRaw("&eToo few arguments.");
|
||||
|
|
@ -335,8 +336,7 @@ static void PlaceCommand_Execute(const cc_string* args, int argsCount) {
|
|||
Chat_AddRaw("&eCould not parse coordinates.");
|
||||
return;
|
||||
}
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
IVec3_Floor(&pos, &Entities.CurPlayer->Base.Position);
|
||||
}
|
||||
|
||||
|
|
@ -346,7 +346,7 @@ static void PlaceCommand_Execute(const cc_string* args, int argsCount) {
|
|||
}
|
||||
|
||||
Game_ChangeBlock(pos.x, pos.y, pos.z, block);
|
||||
cc_string name = Block_UNSAFE_GetName(block);
|
||||
name = Block_UNSAFE_GetName(block);
|
||||
Chat_Add4("&eSuccessfully placed %s block at (%i, %i, %i).", &name, &pos.x, &pos.y, &pos.z);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -728,15 +728,16 @@ int Game_MapState(int deviceIndex) {
|
|||
|
||||
static CC_INLINE void Game_RenderFrame(void) {
|
||||
struct ScheduledTask entTask;
|
||||
float t;
|
||||
double deltaD;
|
||||
float t, delta;
|
||||
|
||||
cc_uint64 render = Stopwatch_Measure();
|
||||
cc_uint64 elapsed = Stopwatch_ElapsedMicroseconds(frameStart, render);
|
||||
/* avoid large delta with suspended process */
|
||||
if (elapsed > 5000000) elapsed = 5000000;
|
||||
|
||||
double deltaD = (int)elapsed / (1000.0 * 1000.0);
|
||||
float delta = (float)deltaD;
|
||||
deltaD = (int)elapsed / (1000.0 * 1000.0);
|
||||
delta = (float)deltaD;
|
||||
Window_ProcessEvents(delta);
|
||||
|
||||
if (delta <= 0.0f) return;
|
||||
|
|
|
|||
36
src/Logger.c
36
src/Logger.c
|
|
@ -18,6 +18,8 @@
|
|||
|
||||
#include <windows.h>
|
||||
#include <imagehlp.h>
|
||||
/* Compatibility version so compiling works on older Windows SDKs */
|
||||
#include "../misc/windows/min-imagehlp.h"
|
||||
static HANDLE curProcess = CUR_PROCESS_HANDLE;
|
||||
#elif defined CC_BUILD_OPENBSD || defined CC_BUILD_HAIKU || defined CC_BUILD_SERENITY
|
||||
#include <signal.h>
|
||||
|
|
@ -203,8 +205,6 @@ static void PrintFrame(cc_string* str, cc_uintptr addr, cc_uintptr symAddr, cons
|
|||
|
||||
#if defined CC_BUILD_WIN
|
||||
struct SymbolAndName { IMAGEHLP_SYMBOL symbol; char name[256]; };
|
||||
static BOOL (WINAPI *_SymGetSymFromAddr)(HANDLE process, DWORD_PTR addr, DWORD_PTR* displacement, IMAGEHLP_SYMBOL* sym);
|
||||
static BOOL (WINAPI *_SymGetModuleInfo) (HANDLE process, DWORD_PTR addr, IMAGEHLP_MODULE* module);
|
||||
|
||||
static void DumpFrame(HANDLE process, cc_string* trace, cc_uintptr addr) {
|
||||
char strBuffer[512]; cc_string str;
|
||||
|
|
@ -232,7 +232,7 @@ static void DumpFrame(HANDLE process, cc_string* trace, cc_uintptr addr) {
|
|||
{
|
||||
IMAGEHLP_LINE line = { 0 }; DWORD lineOffset;
|
||||
line.SizeOfStruct = sizeof(IMAGEHLP_LINE);
|
||||
if (SymGetLineFromAddr(process, addr, &lineOffset, &line)) {
|
||||
if (_SymGetLineFromAddr(process, addr, &lineOffset, &line)) {
|
||||
String_Format2(&str, " line %i in %c\r\n", &line.LineNumber, line.FileName);
|
||||
}
|
||||
}
|
||||
|
|
@ -286,9 +286,6 @@ static void DumpFrame(cc_string* trace, void* addr) {
|
|||
*-------------------------------------------------------Backtracing-------------------------------------------------------*
|
||||
*#########################################################################################################################*/
|
||||
#if defined CC_BUILD_WIN
|
||||
static DWORD_PTR (WINAPI *_SymGetModuleBase)(HANDLE process, DWORD_PTR addr);
|
||||
static PVOID (WINAPI *_SymFunctionTableAccess)(HANDLE process, DWORD_PTR addr);
|
||||
static BOOL (WINAPI *_SymInitialize)(HANDLE process, PCSTR userSearchPath, BOOL fInvadeProcess);
|
||||
|
||||
static PVOID WINAPI FunctionTableAccessCallback(HANDLE process, DWORD_PTR addr) {
|
||||
if (!_SymFunctionTableAccess) return NULL;
|
||||
|
|
@ -341,10 +338,11 @@ static int GetFrames(CONTEXT* ctx, cc_uintptr* addrs, int max) {
|
|||
return RtlCaptureStackBackTrace(0, max, (void**)addrs, NULL);
|
||||
#endif
|
||||
thread = GetCurrentThread();
|
||||
if (!_StackWalk) return 0;
|
||||
|
||||
for (count = 0; count < max; count++)
|
||||
{
|
||||
if (!StackWalk(type, curProcess, thread, &frame, ctx, ReadMemCallback,
|
||||
if (!_StackWalk(type, curProcess, thread, &frame, ctx, ReadMemCallback,
|
||||
FunctionTableAccessCallback, GetModuleBaseCallback, NULL)) break;
|
||||
if (!frame.AddrFrame.Offset) break;
|
||||
addrs[count] = frame.AddrPC.Offset;
|
||||
|
|
@ -960,7 +958,7 @@ static BOOL CALLBACK DumpModule(const char* name, ULONG_PTR base, ULONG size, vo
|
|||
Logger_Log(&str);
|
||||
return true;
|
||||
}
|
||||
static BOOL (WINAPI *_EnumerateLoadedModules)(HANDLE process, PENUMLOADED_MODULES_CALLBACK callback, PVOID userContext);
|
||||
|
||||
static void DumpMisc(void) {
|
||||
static const cc_string modules = String_FromConst("-- modules --\r\n");
|
||||
if (spRegister >= 0xFFFF) DumpStack();
|
||||
|
|
@ -1115,29 +1113,9 @@ static LONG WINAPI UnhandledFilter(struct _EXCEPTION_POINTERS* info) {
|
|||
}
|
||||
|
||||
void Logger_Hook(void) {
|
||||
static const struct DynamicLibSym funcs[] = {
|
||||
#ifdef _IMAGEHLP64
|
||||
{ "EnumerateLoadedModules64", (void**)&_EnumerateLoadedModules},
|
||||
{ "SymFunctionTableAccess64", (void**)&_SymFunctionTableAccess},
|
||||
{ "SymGetModuleBase64", (void**)&_SymGetModuleBase },
|
||||
{ "SymGetModuleInfo64", (void**)&_SymGetModuleInfo },
|
||||
{ "SymGetSymFromAddr64", (void**)&_SymGetSymFromAddr },
|
||||
{ "SymInitialize", (void**)&_SymInitialize },
|
||||
#else
|
||||
{ "EnumerateLoadedModules", (void**)&_EnumerateLoadedModules },
|
||||
{ "SymFunctionTableAccess", (void**)&_SymFunctionTableAccess },
|
||||
{ "SymGetModuleBase", (void**)&_SymGetModuleBase },
|
||||
{ "SymGetModuleInfo", (void**)&_SymGetModuleInfo },
|
||||
{ "SymGetSymFromAddr", (void**)&_SymGetSymFromAddr },
|
||||
{ "SymInitialize", (void**)&_SymInitialize },
|
||||
#endif
|
||||
};
|
||||
static const cc_string imagehlp = String_FromConst("IMAGEHLP.DLL");
|
||||
OSVERSIONINFOA osInfo;
|
||||
void* lib;
|
||||
|
||||
SetUnhandledExceptionFilter(UnhandledFilter);
|
||||
DynamicLib_LoadAll(&imagehlp, funcs, Array_Elems(funcs), &lib);
|
||||
ImageHlp_LoadDynamicFuncs();
|
||||
|
||||
/* Windows 9x requires process IDs instead - see old DBGHELP docs */
|
||||
/* https://documentation.help/DbgHelp/documentation.pdf */
|
||||
|
|
|
|||
|
|
@ -131,9 +131,9 @@ void Platform_Log(const char* msg, int len) {
|
|||
OutputDebugStringA("\n");
|
||||
}
|
||||
|
||||
static VOID (WINAPI *_GetSystemTimeAsFileTime)(LPFILETIME sysTime);
|
||||
static void (WINAPI *_GetSystemTimeAsFileTime)(LPFILETIME sysTime);
|
||||
/* Fallback support for NT 3.5 */
|
||||
static VOID WINAPI Fallback_GetSystemTimeAsFileTime(LPFILETIME sysTime) {
|
||||
static void WINAPI Fallback_GetSystemTimeAsFileTime(LPFILETIME sysTime) {
|
||||
SYSTEMTIME curTime;
|
||||
GetSystemTime(&curTime);
|
||||
SystemTimeToFileTime(&curTime, sysTime);
|
||||
|
|
@ -143,6 +143,7 @@ static VOID WINAPI Fallback_GetSystemTimeAsFileTime(LPFILETIME sysTime) {
|
|||
#define FILETIME_UNIX_EPOCH 11644473600ULL
|
||||
#define FileTime_TotalSecs(time) ((time / 10000000) + FILETIME_EPOCH)
|
||||
#define FileTime_UnixTime(time) ((time / 10000000) - FILETIME_UNIX_EPOCH)
|
||||
|
||||
TimeMS DateTime_CurrentUTC(void) {
|
||||
FILETIME ft;
|
||||
cc_uint64 raw;
|
||||
|
|
|
|||
|
|
@ -445,8 +445,8 @@ void Clipboard_GetText(cc_string* value) {
|
|||
HWND hwnd = Window_Main.Handle.ptr;
|
||||
cc_bool unicode;
|
||||
HANDLE hGlobal;
|
||||
LPVOID src;
|
||||
SIZE_T size;
|
||||
void* src;
|
||||
int i;
|
||||
|
||||
/* retry up to 50 times */
|
||||
|
|
@ -857,11 +857,11 @@ static void GLContext_SelectGraphicsMode(struct GraphicsMode* mode) {
|
|||
}
|
||||
|
||||
void GLContext_Create(void) {
|
||||
static const cc_string glPath = String_FromConst("OPENGL32.dll");
|
||||
struct GraphicsMode mode;
|
||||
|
||||
InitGraphicsMode(&mode);
|
||||
GLContext_SelectGraphicsMode(&mode);
|
||||
|
||||
static const cc_string glPath = String_FromConst("OPENGL32.dll");
|
||||
gl_lib = DynamicLib_Load2(&glPath);
|
||||
|
||||
ctx_handle = wglCreateContext(win_DC);
|
||||
|
|
|
|||
Loading…
Reference in a new issue