projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prevent ChatView from scrolling up 1px on buffer switch, fixes #544
[quassel.git]
/
src
/
common
/
logbacktrace_win.cpp
diff --git
a/src/common/logbacktrace_win.cpp
b/src/common/logbacktrace_win.cpp
index
779e5cb
..
31d1f95
100644
(file)
--- a/
src/common/logbacktrace_win.cpp
+++ b/
src/common/logbacktrace_win.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-0
8 by the Quassel IRC Team
*
+ * Copyright (C) 2005-0
9 by the Quassel Project
*
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-49,11
+49,7
@@
struct EnumModulesContext {
EnumModulesContext(HANDLE hProcess, QTextStream &stream) : hProcess(hProcess), stream(stream) {}
};
EnumModulesContext(HANDLE hProcess, QTextStream &stream) : hProcess(hProcess), stream(stream) {}
};
-#if _MSC_VER >= 1500
BOOL CALLBACK EnumModulesCB(PCTSTR ModuleName, DWORD64 BaseOfDll, PVOID UserContext) {
BOOL CALLBACK EnumModulesCB(PCTSTR ModuleName, DWORD64 BaseOfDll, PVOID UserContext) {
-#else
-BOOL CALLBACK EnumModulesCB(PSTR ModuleName, DWORD64 BaseOfDll, PVOID UserContext) {
-#endif
IMAGEHLP_MODULE64 mod;
EnumModulesContext *context = (EnumModulesContext *)UserContext;
mod.SizeOfStruct = sizeof(IMAGEHLP_MODULE64);
IMAGEHLP_MODULE64 mod;
EnumModulesContext *context = (EnumModulesContext *)UserContext;
mod.SizeOfStruct = sizeof(IMAGEHLP_MODULE64);
@@
-74,6
+70,11
@@
BOOL CALLBACK EnumModulesCB(PSTR ModuleName, DWORD64 BaseOfDll, PVOID UserContex
return TRUE;
}
return TRUE;
}
+// we don't use the ModuleName anyways so we can easily "convert" this
+inline BOOL CALLBACK EnumModulesCB(PSTR ModuleName, DWORD64 BaseOfDll, PVOID UserContext) {
+ return EnumModulesCB(PCTSTR(0), BaseOfDll, UserContext);
+}
+
#ifdef _M_IX86
// Disable global optimization and ignore /GS waning caused by
// inline assembly.
#ifdef _M_IX86
// Disable global optimization and ignore /GS waning caused by
// inline assembly.