Skip to content

Commit 706f288

Browse files
committed
fix compilation on win
1 parent b08b683 commit 706f288

File tree

2 files changed

+18
-16
lines changed

2 files changed

+18
-16
lines changed

src/app/Application.cpp

+11-10
Original file line numberDiff line numberDiff line change
@@ -62,19 +62,20 @@ static LONG WINAPI exceptionFilter(PEXCEPTION_POINTERS info) {
6262
SYSTEMTIME localTime;
6363
GetLocalTime(&localTime);
6464

65-
char temp[MAX_PATH];
65+
wchar_t temp[MAX_PATH];
6666
GetTempPath(MAX_PATH, temp);
6767

68-
char dir[MAX_PATH];
69-
StringCchPrintf(dir, MAX_PATH, "%sGittyup", temp);
68+
wchar_t dir[MAX_PATH];
69+
const wchar_t *gittyup_name = L"%sGittyup";
70+
StringCchPrintf(dir, MAX_PATH, gittyup_name, temp);
7071
CreateDirectory(dir, NULL);
7172

72-
char fileName[MAX_PATH];
73-
StringCchPrintf(
74-
fileName, MAX_PATH, "%s\\%s-%s-%04d%02d%02d-%02d%02d%02d-%ld-%ld.dmp",
75-
dir, GITTYUP_NAME, GITTYUP_VERSION, localTime.wYear, localTime.wMonth,
76-
localTime.wDay, localTime.wHour, localTime.wMinute, localTime.wSecond,
77-
GetCurrentProcessId(), GetCurrentThreadId());
73+
wchar_t fileName[MAX_PATH];
74+
const wchar_t *s = L"%s\\%s-%s-%04d%02d%02d-%02d%02d%02d-%ld-%ld.dmp";
75+
StringCchPrintf(fileName, MAX_PATH, s, dir, GITTYUP_NAME, GITTYUP_VERSION,
76+
localTime.wYear, localTime.wMonth, localTime.wDay,
77+
localTime.wHour, localTime.wMinute, localTime.wSecond,
78+
GetCurrentProcessId(), GetCurrentThreadId());
7879

7980
HANDLE dumpFile =
8081
CreateFile(fileName, GENERIC_READ | GENERIC_WRITE,
@@ -352,7 +353,7 @@ class CopyDataWindow : public QWindow {
352353

353354
protected:
354355
virtual bool nativeEvent(const QByteArray &eventType, void *message,
355-
long *result) Q_DECL_OVERRIDE {
356+
qintptr *result) Q_DECL_OVERRIDE {
356357
MSG *msg = (MSG *)message;
357358

358359
if (msg->message == WM_COPYDATA) {

src/index/indexer.cpp

+7-6
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,16 @@ static LONG WINAPI exceptionFilter(PEXCEPTION_POINTERS info) {
5757
GetTempPath(MAX_PATH, temp);
5858

5959
wchar_t dir[MAX_PATH];
60-
StringCchPrintf(dir, MAX_PATH, "%sGittyup", temp);
60+
const wchar_t *gittyup_name = L"%sGittyup";
61+
StringCchPrintf(dir, MAX_PATH, gittyup_name, temp);
6162
CreateDirectory(dir, NULL);
6263

6364
wchar_t fileName[MAX_PATH];
64-
StringCchPrintf(
65-
fileName, MAX_PATH, "%s\\%s-%s-%04d%02d%02d-%02d%02d%02d-%ld-%ld.dmp",
66-
dir, "indexer", GITTYUP_VERSION, localTime.wYear, localTime.wMonth,
67-
localTime.wDay, localTime.wHour, localTime.wMinute, localTime.wSecond,
68-
GetCurrentProcessId(), GetCurrentThreadId());
65+
const wchar_t *s = L"%s\\%s-%s-%04d%02d%02d-%02d%02d%02d-%ld-%ld.dmp";
66+
StringCchPrintf(fileName, MAX_PATH, s, dir, "indexer", GITTYUP_VERSION,
67+
localTime.wYear, localTime.wMonth, localTime.wDay,
68+
localTime.wHour, localTime.wMinute, localTime.wSecond,
69+
GetCurrentProcessId(), GetCurrentThreadId());
6970

7071
HANDLE dumpFile =
7172
CreateFile(fileName, GENERIC_READ | GENERIC_WRITE,

0 commit comments

Comments
 (0)