Skip to content

Commit 79c590c

Browse files
dmexdmex
committed
peview: Fix window theme, Remove legacy timers
1 parent 3176b71 commit 79c590c

32 files changed

+404
-271
lines changed

‎tools/peview/attributes.c

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Process Hacker -
33
* PE viewer
44
*
5-
* Copyright (C) 2018-2021 dmex
5+
* Copyright (C) 2018-2022 dmex
66
*
77
* This file is part of Process Hacker.
88
*
@@ -26,7 +26,6 @@ typedef struct _PVP_PE_ATTRIBUTES_CONTEXT
2626
{
2727
HWND WindowHandle;
2828
HWND ListViewHandle;
29-
HIMAGELIST ListViewImageList;
3029
PH_LAYOUT_MANAGER LayoutManager;
3130
PPV_PROPPAGECONTEXT PropSheetContext;
3231
} PVP_PE_ATTRIBUTES_CONTEXT, *PPVP_PE_ATTRIBUTES_CONTEXT;
@@ -138,6 +137,8 @@ INT_PTR CALLBACK PvpPeExtendedAttributesDlgProc(
138137
{
139138
case WM_INITDIALOG:
140139
{
140+
HIMAGELIST listViewImageList;
141+
141142
context->WindowHandle = hwndDlg;
142143
context->ListViewHandle = GetDlgItem(hwndDlg, IDC_LIST);
143144

@@ -153,8 +154,8 @@ INT_PTR CALLBACK PvpPeExtendedAttributesDlgProc(
153154
PhInitializeLayoutManager(&context->LayoutManager, hwndDlg);
154155
PhAddLayoutItem(&context->LayoutManager, context->ListViewHandle, NULL, PH_ANCHOR_ALL);
155156

156-
if (context->ListViewImageList = PhImageListCreate(2, 20, ILC_MASK | ILC_COLOR, 1, 1))
157-
ListView_SetImageList(context->ListViewHandle, context->ListViewImageList, LVSIL_SMALL);
157+
if (listViewImageList = PhImageListCreate(2, 20, ILC_MASK | ILC_COLOR, 1, 1))
158+
ListView_SetImageList(context->ListViewHandle, listViewImageList, LVSIL_SMALL);
158159

159160
PvEnumerateFileExtendedAttributes(context->ListViewHandle);
160161

@@ -165,9 +166,6 @@ INT_PTR CALLBACK PvpPeExtendedAttributesDlgProc(
165166
{
166167
PhSaveListViewColumnsToSetting(L"ImageAttributesListViewColumns", context->ListViewHandle);
167168

168-
if (context->ListViewImageList)
169-
PhImageListDestroy(context->ListViewImageList);
170-
171169
PhDeleteLayoutManager(&context->LayoutManager);
172170

173171
PhFree(context);
@@ -291,6 +289,17 @@ INT_PTR CALLBACK PvpPeExtendedAttributesDlgProc(
291289
}
292290
}
293291
break;
292+
case WM_CTLCOLORBTN:
293+
case WM_CTLCOLORDLG:
294+
case WM_CTLCOLORSTATIC:
295+
case WM_CTLCOLORLISTBOX:
296+
{
297+
SetBkMode((HDC)wParam, TRANSPARENT);
298+
SetTextColor((HDC)wParam, RGB(0, 0, 0));
299+
SetDCBrushColor((HDC)wParam, RGB(255, 255, 255));
300+
return (INT_PTR)GetStockBrush(DC_BRUSH);
301+
}
302+
break;
294303
}
295304

296305
return FALSE;

‎tools/peview/cfgprp.c

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* PE viewer
44
*
55
* Copyright (C) 2010-2011 wj32
6-
* Copyright (C) 2017-2021 dmex
6+
* Copyright (C) 2017-2022 dmex
77
*
88
* This file is part of Process Hacker.
99
*
@@ -268,6 +268,17 @@ INT_PTR CALLBACK PvpPeCgfDlgProc(
268268
PvHandleListViewCommandCopy(hwndDlg, lParam, wParam, context->ListViewHandle);
269269
}
270270
break;
271+
case WM_CTLCOLORBTN:
272+
case WM_CTLCOLORDLG:
273+
case WM_CTLCOLORSTATIC:
274+
case WM_CTLCOLORLISTBOX:
275+
{
276+
SetBkMode((HDC)wParam, TRANSPARENT);
277+
SetTextColor((HDC)wParam, RGB(0, 0, 0));
278+
SetDCBrushColor((HDC)wParam, RGB(255, 255, 255));
279+
return (INT_PTR)GetStockBrush(DC_BRUSH);
280+
}
281+
break;
271282
}
272283

273284
return FALSE;

‎tools/peview/clrprp.c

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* PE viewer
44
*
55
* Copyright (C) 2010-2011 wj32
6-
* Copyright (C) 2017-2021 dmex
6+
* Copyright (C) 2017-2022 dmex
77
*
88
* This file is part of Process Hacker.
99
*
@@ -28,7 +28,6 @@ typedef struct _PVP_PE_CLR_CONTEXT
2828
{
2929
HWND WindowHandle;
3030
HWND ListViewHandle;
31-
HIMAGELIST ListViewImageList;
3231
PH_LAYOUT_MANAGER LayoutManager;
3332
PPV_PROPPAGECONTEXT PropSheetContext;
3433
PVOID PdbMetadataAddress;
@@ -449,6 +448,7 @@ INT_PTR CALLBACK PvpPeClrDlgProc(
449448
{
450449
case WM_INITDIALOG:
451450
{
451+
HIMAGELIST listViewImageList;
452452
PSTORAGESIGNATURE clrMetaData;
453453

454454
context->WindowHandle = hwndDlg;
@@ -472,8 +472,8 @@ INT_PTR CALLBACK PvpPeClrDlgProc(
472472
PhAddLayoutItem(&context->LayoutManager, GetDlgItem(hwndDlg, IDC_TOKENSTRING), NULL, PH_ANCHOR_LEFT | PH_ANCHOR_TOP | PH_ANCHOR_RIGHT);
473473
PhAddLayoutItem(&context->LayoutManager, context->ListViewHandle, NULL, PH_ANCHOR_ALL);
474474

475-
if (context->ListViewImageList = PhImageListCreate(2, 20, ILC_MASK | ILC_COLOR, 1, 1))
476-
ListView_SetImageList(context->ListViewHandle, context->ListViewImageList, LVSIL_SMALL);
475+
if (listViewImageList = PhImageListCreate(2, 20, ILC_MASK | ILC_COLOR, 1, 1))
476+
ListView_SetImageList(context->ListViewHandle, listViewImageList, LVSIL_SMALL);
477477

478478
if (!context->PdbMetadataAddress)
479479
{
@@ -506,12 +506,7 @@ INT_PTR CALLBACK PvpPeClrDlgProc(
506506
case WM_DESTROY:
507507
{
508508
PhSaveListViewColumnsToSetting(L"ImageClrListViewColumns", context->ListViewHandle);
509-
510-
if (context->ListViewImageList)
511-
PhImageListDestroy(context->ListViewImageList);
512-
513509
PhDeleteLayoutManager(&context->LayoutManager);
514-
515510
PhFree(context);
516511
}
517512
break;
@@ -550,6 +545,17 @@ INT_PTR CALLBACK PvpPeClrDlgProc(
550545
PvHandleListViewCommandCopy(hwndDlg, lParam, wParam, context->ListViewHandle);
551546
}
552547
break;
548+
case WM_CTLCOLORBTN:
549+
case WM_CTLCOLORDLG:
550+
case WM_CTLCOLORSTATIC:
551+
case WM_CTLCOLORLISTBOX:
552+
{
553+
SetBkMode((HDC)wParam, TRANSPARENT);
554+
SetTextColor((HDC)wParam, RGB(0, 0, 0));
555+
SetDCBrushColor((HDC)wParam, RGB(255, 255, 255));
556+
return (INT_PTR)GetStockBrush(DC_BRUSH);
557+
}
558+
break;
553559
}
554560

555561
return FALSE;

‎tools/peview/clrtableimportprp.c

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Process Hacker -
33
* PE viewer
44
*
5-
* Copyright (C) 2021 dmex
5+
* Copyright (C) 2021-2022 dmex
66
*
77
* This file is part of Process Hacker.
88
*
@@ -276,6 +276,17 @@ INT_PTR CALLBACK PvpPeClrImportsDlgProc(
276276
PvHandleListViewCommandCopy(hwndDlg, lParam, wParam, context->ListViewHandle);
277277
}
278278
break;
279+
case WM_CTLCOLORBTN:
280+
case WM_CTLCOLORDLG:
281+
case WM_CTLCOLORSTATIC:
282+
case WM_CTLCOLORLISTBOX:
283+
{
284+
SetBkMode((HDC)wParam, TRANSPARENT);
285+
SetTextColor((HDC)wParam, RGB(0, 0, 0));
286+
SetDCBrushColor((HDC)wParam, RGB(255, 255, 255));
287+
return (INT_PTR)GetStockBrush(DC_BRUSH);
288+
}
289+
break;
279290
}
280291

281292
return FALSE;

‎tools/peview/debugprp.c

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Process Hacker -
33
* PE viewer
44
*
5-
* Copyright (C) 2021 dmex
5+
* Copyright (C) 2021-2022 dmex
66
*
77
* This file is part of Process Hacker.
88
*
@@ -26,7 +26,6 @@ typedef struct _PVP_PE_DEBUG_CONTEXT
2626
{
2727
HWND WindowHandle;
2828
HWND ListViewHandle;
29-
HIMAGELIST ListViewImageList;
3029
PH_LAYOUT_MANAGER LayoutManager;
3130
PPV_PROPPAGECONTEXT PropSheetContext;
3231
} PVP_PE_DEBUG_CONTEXT, *PPVP_PE_DEBUG_CONTEXT;
@@ -115,6 +114,7 @@ INT_PTR CALLBACK PvpPeDebugDlgProc(
115114
{
116115
PH_MAPPED_IMAGE_DEBUG debug;
117116
PH_IMAGE_DEBUG_ENTRY entry;
117+
HIMAGELIST listViewImageList;
118118
ULONG count = 0;
119119
ULONG i;
120120
INT lvItemIndex;
@@ -137,8 +137,8 @@ INT_PTR CALLBACK PvpPeDebugDlgProc(
137137
PhInitializeLayoutManager(&context->LayoutManager, hwndDlg);
138138
PhAddLayoutItem(&context->LayoutManager, context->ListViewHandle, NULL, PH_ANCHOR_ALL);
139139

140-
if (context->ListViewImageList = PhImageListCreate(2, 20, ILC_MASK | ILC_COLOR, 1, 1))
141-
ListView_SetImageList(context->ListViewHandle, context->ListViewImageList, LVSIL_SMALL);
140+
if (listViewImageList = PhImageListCreate(2, 20, ILC_MASK | ILC_COLOR, 1, 1))
141+
ListView_SetImageList(context->ListViewHandle, listViewImageList, LVSIL_SMALL);
142142

143143
if (NT_SUCCESS(PhGetMappedImageDebug(&PvMappedImage, &debug)))
144144
{
@@ -200,12 +200,7 @@ INT_PTR CALLBACK PvpPeDebugDlgProc(
200200
case WM_DESTROY:
201201
{
202202
PhSaveListViewColumnsToSetting(L"ImageDebugListViewColumns", context->ListViewHandle);
203-
204-
if (context->ListViewImageList)
205-
PhImageListDestroy(context->ListViewImageList);
206-
207203
PhDeleteLayoutManager(&context->LayoutManager);
208-
209204
PhFree(context);
210205
}
211206
break;
@@ -235,6 +230,17 @@ INT_PTR CALLBACK PvpPeDebugDlgProc(
235230
PvHandleListViewCommandCopy(hwndDlg, lParam, wParam, context->ListViewHandle);
236231
}
237232
break;
233+
case WM_CTLCOLORBTN:
234+
case WM_CTLCOLORDLG:
235+
case WM_CTLCOLORSTATIC:
236+
case WM_CTLCOLORLISTBOX:
237+
{
238+
SetBkMode((HDC)wParam, TRANSPARENT);
239+
SetTextColor((HDC)wParam, RGB(0, 0, 0));
240+
SetDCBrushColor((HDC)wParam, RGB(255, 255, 255));
241+
return (INT_PTR)GetStockBrush(DC_BRUSH);
242+
}
243+
break;
238244
}
239245

240246
return FALSE;

‎tools/peview/ehcontprp.c

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* PE viewer -
33
* EH continuation support
44
*
5-
* Copyright (C) 2020-2021 dmex
5+
* Copyright (C) 2020-2022 dmex
66
*
77
* This file is part of Process Hacker.
88
*
@@ -216,6 +216,17 @@ INT_PTR CALLBACK PvpPeEhContDlgProc(
216216
PvHandleListViewCommandCopy(hwndDlg, lParam, wParam, context->ListViewHandle);
217217
}
218218
break;
219+
case WM_CTLCOLORBTN:
220+
case WM_CTLCOLORDLG:
221+
case WM_CTLCOLORSTATIC:
222+
case WM_CTLCOLORLISTBOX:
223+
{
224+
SetBkMode((HDC)wParam, TRANSPARENT);
225+
SetTextColor((HDC)wParam, RGB(0, 0, 0));
226+
SetDCBrushColor((HDC)wParam, RGB(255, 255, 255));
227+
return (INT_PTR)GetStockBrush(DC_BRUSH);
228+
}
229+
break;
219230
}
220231

221232
return FALSE;

‎tools/peview/exlfprp.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Process Hacker -
33
* PE viewer
44
*
5-
* Copyright (C) 2017-2021 dmex
5+
* Copyright (C) 2017-2022 dmex
66
*
77
* This file is part of Process Hacker.
88
*
@@ -139,15 +139,15 @@ VOID PvExlfProperties(
139139

140140
// Imports
141141
newPage = PvCreatePropPageContext(
142-
MAKEINTRESOURCE(IDD_PELOADCONFIG),
142+
MAKEINTRESOURCE(IDD_ELFIMPORTS),
143143
PvpExlfImportsDlgProc,
144144
NULL
145145
);
146146
PvAddPropPage(propContext, newPage);
147147

148148
// Exports
149149
newPage = PvCreatePropPageContext(
150-
MAKEINTRESOURCE(IDD_PELOADCONFIG),
150+
MAKEINTRESOURCE(IDD_ELFEXPORTS),
151151
PvpExlfExportsDlgProc,
152152
NULL
153153
);

0 commit comments

Comments
 (0)