Skip to content

Commit 115cf65

Browse files
authored
[EVENTVWR] Reduce lines (reactos#7758)
JIRA issue: N/A - Reduce lines in InitInstance function.
1 parent 13894e2 commit 115cf65

File tree

1 file changed

+22
-62
lines changed

1 file changed

+22
-62
lines changed

base/applications/mscutils/eventvwr/eventvwr.c

Lines changed: 22 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -3037,6 +3037,22 @@ InitInstance(HINSTANCE hInstance)
30373037
HIMAGELIST hSmall;
30383038
LVCOLUMNW lvc = {0};
30393039
WCHAR szTemp[256];
3040+
INT iColumn;
3041+
static const struct
3042+
{
3043+
WORD width;
3044+
WORD uID;
3045+
} columnItems[] =
3046+
{
3047+
{ 90, IDS_COLUMNTYPE },
3048+
{ 70, IDS_COLUMNDATE },
3049+
{ 70, IDS_COLUMNTIME },
3050+
{ 150, IDS_COLUMNSOURCE },
3051+
{ 100, IDS_COLUMNCATEGORY },
3052+
{ 60, IDS_COLUMNEVENT },
3053+
{ 120, IDS_COLUMNUSER },
3054+
{ 100, IDS_COLUMNCOMPUTER },
3055+
};
30403056

30413057
/* Create the main window */
30423058
rs = Settings.wpPos.rcNormalPosition;
@@ -3180,69 +3196,13 @@ InitInstance(HINSTANCE hInstance)
31803196

31813197
/* Now set up the listview with its columns */
31823198
lvc.mask = LVCF_TEXT | LVCF_WIDTH;
3183-
lvc.cx = 90;
3184-
LoadStringW(hInstance,
3185-
IDS_COLUMNTYPE,
3186-
szTemp,
3187-
ARRAYSIZE(szTemp));
3188-
lvc.pszText = szTemp;
3189-
ListView_InsertColumn(hwndListView, 0, &lvc);
3190-
3191-
lvc.cx = 70;
3192-
LoadStringW(hInstance,
3193-
IDS_COLUMNDATE,
3194-
szTemp,
3195-
ARRAYSIZE(szTemp));
3196-
lvc.pszText = szTemp;
3197-
ListView_InsertColumn(hwndListView, 1, &lvc);
3198-
3199-
lvc.cx = 70;
3200-
LoadStringW(hInstance,
3201-
IDS_COLUMNTIME,
3202-
szTemp,
3203-
ARRAYSIZE(szTemp));
3204-
lvc.pszText = szTemp;
3205-
ListView_InsertColumn(hwndListView, 2, &lvc);
3206-
3207-
lvc.cx = 150;
3208-
LoadStringW(hInstance,
3209-
IDS_COLUMNSOURCE,
3210-
szTemp,
3211-
ARRAYSIZE(szTemp));
3212-
lvc.pszText = szTemp;
3213-
ListView_InsertColumn(hwndListView, 3, &lvc);
3214-
3215-
lvc.cx = 100;
3216-
LoadStringW(hInstance,
3217-
IDS_COLUMNCATEGORY,
3218-
szTemp,
3219-
ARRAYSIZE(szTemp));
3220-
lvc.pszText = szTemp;
3221-
ListView_InsertColumn(hwndListView, 4, &lvc);
3222-
3223-
lvc.cx = 60;
3224-
LoadStringW(hInstance,
3225-
IDS_COLUMNEVENT,
3226-
szTemp,
3227-
ARRAYSIZE(szTemp));
3228-
lvc.pszText = szTemp;
3229-
ListView_InsertColumn(hwndListView, 5, &lvc);
3230-
3231-
lvc.cx = 120;
3232-
LoadStringW(hInstance,
3233-
IDS_COLUMNUSER,
3234-
szTemp,
3235-
ARRAYSIZE(szTemp));
32363199
lvc.pszText = szTemp;
3237-
ListView_InsertColumn(hwndListView, 6, &lvc);
3238-
3239-
lvc.cx = 100;
3240-
LoadStringW(hInstance,
3241-
IDS_COLUMNCOMPUTER,
3242-
szTemp,
3243-
ARRAYSIZE(szTemp));
3244-
lvc.pszText = szTemp;
3245-
ListView_InsertColumn(hwndListView, 7, &lvc);
3200+
for (iColumn = 0; iColumn < ARRAYSIZE(columnItems); ++iColumn)
3201+
{
3202+
lvc.cx = columnItems[iColumn].width;
3203+
LoadStringW(hInstance, columnItems[iColumn].uID, szTemp, ARRAYSIZE(szTemp));
3204+
ListView_InsertColumn(hwndListView, iColumn, &lvc);
3205+
}
32463206

32473207
/* Initialize the save Dialog */
32483208
ZeroMemory(&sfn, sizeof(sfn));

0 commit comments

Comments
 (0)