From 8f5cfcb9b5fd1aaffa2627845d88392f01d12ca8 Mon Sep 17 00:00:00 2001 From: owomomo Date: Sat, 6 Apr 2019 02:09:05 +0800 Subject: [PATCH 1/2] Update ram_search.cpp --- src/drivers/win/ram_search.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/drivers/win/ram_search.cpp b/src/drivers/win/ram_search.cpp index 387b67a7..b3896160 100644 --- a/src/drivers/win/ram_search.cpp +++ b/src/drivers/win/ram_search.cpp @@ -1534,7 +1534,7 @@ LRESULT CALLBACK RamSearchProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPara CompactAddrs(); } void init_list_box(HWND Box, const char* Strs[], int numColumns, int *columnWidths); - init_list_box(GetDlgItem(hDlg,IDC_RAMLIST),names,5,widths); + init_list_box(GetDlgItem(hDlg,IDC_RAMLIST),names,4,widths); //ListView_SetItemCount(GetDlgItem(hDlg,IDC_RAMLIST),ResultCount); if (!noMisalign) SendDlgItemMessage(hDlg, IDC_MISALIGN, BM_SETCHECK, BST_CHECKED, 0); //if (littleEndian) SendDlgItemMessage(hDlg, IDC_ENDIAN, BM_SETCHECK, BST_CHECKED, 0); @@ -2183,10 +2183,7 @@ void init_list_box(HWND Box, const char* Strs[], int numColumns, int *columnWidt Col.mask = LVCF_FMT | LVCF_ORDER | LVCF_SUBITEM | LVCF_TEXT | LVCF_WIDTH; for (int i = 0; i < numColumns; i++) { - if (i == 1) - Col.fmt = LVCFMT_RIGHT; - else - Col.fmt = LVCFMT_LEFT; + Col.fmt = !strcmp(Strs[i], "Value") || !strcmp(Strs[i], "Previous") || !strcmp(Strs[i], "Changes") ? LVCFMT_RIGHT : LVCFMT_LEFT; Col.iOrder = i; Col.iSubItem = i; Col.pszText = (LPSTR)(Strs[i]); @@ -2247,4 +2244,4 @@ void SetSearchType(int SearchType) { void DoRamSearchOperation() { RamSearchProc(RamSearchHWnd, WM_COMMAND, IDC_C_SEARCH, 0); return; -} \ No newline at end of file +} From 07e14fd26f916bd86c510c1569fab57cfea31f5f Mon Sep 17 00:00:00 2001 From: owomomo Date: Sat, 6 Apr 2019 02:14:52 +0800 Subject: [PATCH 2/2] Update res.rc --- src/drivers/win/res.rc | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/drivers/win/res.rc b/src/drivers/win/res.rc index cae2d8f4..e64930eb 100644 --- a/src/drivers/win/res.rc +++ b/src/drivers/win/res.rc @@ -7,16 +7,17 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "afxres.h" + ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// 非特定语言 resources +// #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU) LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -#pragma code_page(936) +#pragma code_page(1252) ///////////////////////////////////////////////////////////////////////////// // @@ -2146,7 +2147,7 @@ CAPTION " RAM Watch" MENU RAMWATCH_MENU FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CONTROL "",IDC_WATCHLIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_OWNERDATA | WS_BORDER | WS_TABSTOP,9,9,210,279,WS_EX_CLIENTEDGE + CONTROL "",IDC_WATCHLIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_OWNERDATA | WS_BORDER | WS_TABSTOP | LVS_NOSORTHEADER,9,9,210,279,WS_EX_CLIENTEDGE PUSHBUTTON "Edit",IDC_C_WATCH_EDIT,226,66,34,14 PUSHBUTTON "Remove",IDC_C_WATCH_REMOVE,226,83,34,14 PUSHBUTTON "New",IDC_C_WATCH,226,100,34,14 @@ -2661,12 +2662,12 @@ IDB_BITMAP_SELECTED17 BITMAP "res\\te_17_selected.bmp" IDB_BITMAP_SELECTED18 BITMAP "res\\te_18_selected.bmp" IDB_BITMAP_SELECTED19 BITMAP "res\\te_19_selected.bmp" IDB_BRANCH_SPRITESHEET BITMAP "res\\branch_spritesheet.bmp" -#endif // 非特定语言 resources +#endif ///////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////// -// 英语(美国) resources +// English(U.S.) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US @@ -2695,7 +2696,7 @@ END #endif // APSTUDIO_INVOKED -#endif // 英语(美国) resources +#endif // English(U.S.) resources ///////////////////////////////////////////////////////////////////////////// @@ -2705,7 +2706,8 @@ END // // Generated from the TEXTINCLUDE 3 resource. // - + + ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED