mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-15 12:54:01 +02:00
Code Issues Projects Releases Wiki Activity

- windows x64 updates to get things compiling on vc2012 x64

Browse Source
This commit is contained in:
Mark Vejvoda
2013-11-02 11:04:52 +00:00
parent a061289c1c
commit 1d3859ff32
53 changed files with 162 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/shared_lib/sources/platform/win32/platform_util.cpp
View File

@@ -199,9 +199,13 @@ string PlatformExceptionHandler::getStackTrace() {
HANDLE hThread = GetCurrentThread();
if (GetThreadContext(hThread, &context)) {
STACKFRAME stackframe = { 0 };
#if !defined(_WIN64)
stackframe.AddrPC.Offset = context.Eip;
#endif
stackframe.AddrPC.Mode = AddrModeFlat;
#if !defined(_WIN64)
stackframe.AddrFrame.Offset = context.Ebp;
#endif
stackframe.AddrFrame.Mode = AddrModeFlat;
SymInitialize(hProcess, NULL, TRUE);
@@ -218,10 +222,14 @@ string PlatformExceptionHandler::getStackTrace() {
NULL,
NULL,
NULL);
#if !defined(_WIN64)
DWORD dwDisplacement = 0;
#else
DWORD64 dwDisplacement = 0;
#endif
DWORD dwDisplacement2 = 0;
SymGetSymFromAddr(hProcess, stackframe.AddrPC.Offset, &dwDisplacement, pSym);
SymGetLineFromAddr(hProcess, stackframe.AddrPC.Offset, &dwDisplacement, &line);
SymGetLineFromAddr(hProcess, stackframe.AddrPC.Offset, &dwDisplacement2, &line);
SymGetModuleInfo(hProcess, stackframe.AddrPC.Offset, &module);
// RetAddr Arg1 Arg2 Arg3 module!funtion FileName(line)+offset
@@ -385,7 +393,9 @@ void init_win32() {
#ifndef __MINGW32__
LONG iconPtr = (LONG)icon;
#if !defined(_WIN64)
::SetClassLong(hwnd, GCL_HICON, iconPtr);
#endif
#endif
ontop_win32(0, 0);