From 4246ea0bd85aee3870af64b77d8f5544aacd28b5 Mon Sep 17 00:00:00 2001 From: Niels Martin Hansen Date: Thu, 1 Mar 2012 00:37:34 +0000 Subject: [PATCH] Fixed w32dumper GUI so the listbox shows things chronologically instead of lexically. Also be more correct in the DialogProc implementation. Originally committed to SVN as r6529. --- devel/w32dumper/w32dumper.aps | Bin 34380 -> 34652 bytes devel/w32dumper/w32dumper.cpp | 17 ++++++++--------- devel/w32dumper/w32dumper.rc | 4 +++- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/devel/w32dumper/w32dumper.aps b/devel/w32dumper/w32dumper.aps index 9c01377b527f57c5cbef8030dd3f846b3f6869ce..dc1d150921cb979580bd5b6f0cf5a0ca73452f04 100644 GIT binary patch delta 498 zcmZutJxeP=6uo!WB!1v`@kCAhtezNllP8Gyku@``!8P$^6@3uM>lDGiAVzmBM8)Mc zR@N3anm=G+A!6YV5U~;r?}3elHacTO5S?i*XU?2+?z!A%*Sl=TXBG@yHy~KXoIj48N>3RIj6sN2tyZk`Ps3Ua>ipYItS7{<7KaAv z!gg#dj-p6li9EBXc|iU#q%hCV$76hMdPZdZiA20rdD$69K;6!PceL{e5mwxv(OH>A7((&DdK#kK`bll4%ve4NJf^md3k15` zSf>5L8O^wp0o?>R@^?CdCB+)2Ei*#5ZUt*d(w*DQ{&A}IBEhi{fF(g`9tr3w)< rI@qvFb(`@y}z!Z6vcO^)%)CGXH2E8l`rthIoQoXT8#yi@ zZ?JI#)tqUZtk)_td0&eVn;4MG(*)-J19F*x+z1d?kJW&YfuUw{Vw*hEhvv!unvJ;y KI9Y(QU;qFnuVV86 diff --git a/devel/w32dumper/w32dumper.cpp b/devel/w32dumper/w32dumper.cpp index eb5f1abbd..9adc0bdf5 100644 --- a/devel/w32dumper/w32dumper.cpp +++ b/devel/w32dumper/w32dumper.cpp @@ -246,29 +246,27 @@ INT_PTR CALLBACK dialog_msghandler(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA AddStringToListbox(hwndDlg, std::wstring(L"Completed ") + IntToWstring(numdumps) + (numdumps>1?L" minidumps.":L" minidump.")); else AddStringToListbox(hwndDlg, L"Finished, found no processes to dump."); - break; + return TRUE; case DNM_ERROR: numerrors += 1; AddStringToListbox(hwndDlg, std::wstring(L"An error occurred: ") + (wchar_t const *)lParam); - break; + return TRUE; case DNM_DUMPSTARTED: numdumps += 1; AddStringToListbox(hwndDlg, std::wstring(L"Beginning dump of pid ") + IntToWstring(wParam) + L" (" + (wchar_t const *)lParam + L")"); - break; + return TRUE; case DNM_DUMPFINISHED: AddStringToListbox(hwndDlg, std::wstring(L" Finished dump: ") + (wchar_t const *)lParam); - break; + return TRUE; case WM_COMMAND: - switch (LOWORD(wParam)) + if (LOWORD(wParam) == IDCLOSE && HIWORD(wParam) == BN_CLICKED) { - case IDCLOSE: - if (HIWORD(wParam) == BN_CLICKED) - PostQuitMessage(0); - break; + PostQuitMessage(0); + return TRUE; } break; @@ -279,6 +277,7 @@ INT_PTR CALLBACK dialog_msghandler(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA { std::wstring dumpfile_folder = GetDumpfileFolder(); ShellExecuteW(hwndDlg, L"open", dumpfile_folder.c_str(), 0, 0, SW_SHOWNORMAL); + return TRUE; } } break; diff --git a/devel/w32dumper/w32dumper.rc b/devel/w32dumper/w32dumper.rc index ff1e67cbe..d22975b0f 100644 --- a/devel/w32dumper/w32dumper.rc +++ b/devel/w32dumper/w32dumper.rc @@ -17,6 +17,7 @@ #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) ///////////////////////////////////////////////////////////////////////////// // @@ -29,7 +30,7 @@ CAPTION "Aegisub crash logger" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Close",IDCLOSE,260,97,50,14,WS_DISABLED - LISTBOX IDC_LOGLIST,7,7,303,85,NOT LBS_NOTIFY | LBS_SORT | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + LISTBOX IDC_LOGLIST,7,7,303,85,NOT LBS_NOTIFY | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP CONTROL "Open folder containing dump files",IDC_DUMPFOLDERLINK, "SysLink",WS_TABSTOP,7,99,195,12 END @@ -62,6 +63,7 @@ END #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK +#pragma code_page(1252) #ifdef APSTUDIO_INVOKED /////////////////////////////////////////////////////////////////////////////