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

bugfixes in win64 for exception handling

Browse Source
This commit is contained in:
Mark Vejvoda
2013-11-04 17:42:48 +00:00
parent 1134ad399d
commit c6b42e4bf6
2 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -201,10 +201,14 @@ string PlatformExceptionHandler::getStackTrace() {
STACKFRAME stackframe = { 0 };
#if !defined(_WIN64)
stackframe.AddrPC.Offset = context.Eip;
#else
stackframe.AddrPC.Offset = context.Rip;
#endif
stackframe.AddrPC.Mode = AddrModeFlat;
#if !defined(_WIN64)
stackframe.AddrFrame.Offset = context.Ebp;
#else
stackframe.AddrFrame.Offset = context.Rbp;
#endif
stackframe.AddrFrame.Mode = AddrModeFlat;
@@ -213,7 +217,11 @@ string PlatformExceptionHandler::getStackTrace() {
do
{
#if !defined(_WIN64)
fSuccess = StackWalk(IMAGE_FILE_MACHINE_I386,
#else
fSuccess = StackWalk(IMAGE_FILE_MACHINE_AMD64,
#endif
GetCurrentProcess(),
GetCurrentThread(),
&stackframe,
@@ -395,6 +403,8 @@ void init_win32() {
#if !defined(_WIN64)
::SetClassLong(hwnd, GCL_HICON, iconPtr);
#else
::SetClassLongPtr(hwnd, GCLP_HICON, (LONG_PTR)&iconPtr);
#endif
#endif