Skip to content

Commit ee2f79a

Browse files
dmexdmex
committed
peview: Add MUI page, Fix typos
1 parent 59326c1 commit ee2f79a

File tree

10 files changed

+462
-83
lines changed

10 files changed

+462
-83
lines changed

‎tools/peview/attributes.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#include <peview.h>
1313

14-
typedef struct _PVP_PE_ATTRIBUTES_CONTEXT
14+
typedef struct _PV_PE_ATTRIBUTES_CONTEXT
1515
{
1616
HWND WindowHandle;
1717
HWND ListViewHandle;
@@ -111,7 +111,7 @@ INT_PTR CALLBACK PvpPeExtendedAttributesDlgProc(
111111

112112
if (lParam)
113113
{
114-
LPPROPSHEETPAGE propSheetPage = (LPPROPSHEETPAGE)lParam;
114+
const LPPROPSHEETPAGE propSheetPage = (LPPROPSHEETPAGE)lParam;
115115
context->PropSheetContext = (PPV_PROPPAGECONTEXT)propSheetPage->lParam;
116116
}
117117
}

‎tools/peview/include/peview.h

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -560,8 +560,8 @@ INT_PTR CALLBACK PvpPeStreamsDlgProc(
560560
);
561561

562562
INT_PTR CALLBACK PvpMappingsDlgProc(
563-
_In_ HWND hwndDlg,
564-
_In_ UINT uMsg,
563+
_In_ HWND WindowHandle,
564+
_In_ UINT WindowMessage,
565565
_In_ WPARAM wParam,
566566
_In_ LPARAM lParam
567567
);
@@ -692,6 +692,13 @@ INT_PTR CALLBACK PvpPeCHPEDlgProc(
692692
_In_ LPARAM lParam
693693
);
694694

695+
INT_PTR CALLBACK PvpPeMuiResourceDlgProc(
696+
_In_ HWND hwndDlg,
697+
_In_ UINT uMsg,
698+
_In_ WPARAM wParam,
699+
_In_ LPARAM lParam
700+
);
701+
695702
// ELF
696703

697704
PWSTR PvpGetSymbolTypeName(

‎tools/peview/layout.c

Lines changed: 25 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
* Authors:
77
*
8-
* dmex 2020-2022
8+
* dmex 2020-2023
99
*
1010
*/
1111

@@ -65,7 +65,7 @@ VOID PvDestroyLayoutNode(
6565
_In_ PPV_LAYOUT_NODE CertificateNode
6666
);
6767
BOOLEAN NTAPI PvLayoutTreeNewCallback(
68-
_In_ HWND hwnd,
68+
_In_ HWND WindowHandle,
6969
_In_ PH_TREENEW_MESSAGE Message,
7070
_In_opt_ PVOID Parameter1,
7171
_In_opt_ PVOID Parameter2,
@@ -79,7 +79,7 @@ VOID PvInitializeLayoutTree(
7979
PPH_STRING settings;
8080

8181
Context->NodeHashtable = PhCreateHashtable(
82-
sizeof(PV_LAYOUT_NODE),
82+
sizeof(PPV_LAYOUT_NODE),
8383
PvLayoutNodeHashtableEqualFunction,
8484
PvLayoutNodeHashtableHashFunction,
8585
100
@@ -281,14 +281,14 @@ BEGIN_SORT_FUNCTION(Index)
281281
END_SORT_FUNCTION
282282

283283
BOOLEAN NTAPI PvLayoutTreeNewCallback(
284-
_In_ HWND hwnd,
284+
_In_ HWND WindowHandle,
285285
_In_ PH_TREENEW_MESSAGE Message,
286-
_In_opt_ PVOID Parameter1,
287-
_In_opt_ PVOID Parameter2,
288-
_In_opt_ PVOID Context
286+
_In_ PVOID Parameter1,
287+
_In_ PVOID Parameter2,
288+
_In_ PVOID Context
289289
)
290290
{
291-
PPV_PE_LAYOUT_CONTEXT context = Context;
291+
const PPV_PE_LAYOUT_CONTEXT context = Context;
292292
PPV_LAYOUT_NODE node;
293293

294294
if (!context)
@@ -298,11 +298,7 @@ BOOLEAN NTAPI PvLayoutTreeNewCallback(
298298
{
299299
case TreeNewGetChildren:
300300
{
301-
PPH_TREENEW_GET_CHILDREN getChildren = Parameter1;
302-
303-
if (!getChildren)
304-
break;
305-
301+
const PPH_TREENEW_GET_CHILDREN getChildren = Parameter1;
306302
node = (PPV_LAYOUT_NODE)getChildren->Node;
307303

308304
if (!node)
@@ -319,11 +315,7 @@ BOOLEAN NTAPI PvLayoutTreeNewCallback(
319315
return TRUE;
320316
case TreeNewIsLeaf:
321317
{
322-
PPH_TREENEW_IS_LEAF isLeaf = Parameter1;
323-
324-
if (!isLeaf)
325-
break;
326-
318+
const PPH_TREENEW_IS_LEAF isLeaf = Parameter1;
327319
node = (PPV_LAYOUT_NODE)isLeaf->Node;
328320

329321
if (context->TreeNewSortOrder == NoSortOrder)
@@ -334,11 +326,7 @@ BOOLEAN NTAPI PvLayoutTreeNewCallback(
334326
return TRUE;
335327
case TreeNewGetCellText:
336328
{
337-
PPH_TREENEW_GET_CELL_TEXT getCellText = Parameter1;
338-
339-
if (!getCellText)
340-
break;
341-
329+
const PPH_TREENEW_GET_CELL_TEXT getCellText = Parameter1;
342330
node = (PPV_LAYOUT_NODE)getCellText->Node;
343331

344332
switch (getCellText->Id)
@@ -362,29 +350,22 @@ BOOLEAN NTAPI PvLayoutTreeNewCallback(
362350
return TRUE;
363351
case TreeNewGetNodeColor:
364352
{
365-
PPH_TREENEW_GET_NODE_COLOR getNodeColor = Parameter1;
366-
367-
if (!getNodeColor)
368-
break;
369-
353+
const PPH_TREENEW_GET_NODE_COLOR getNodeColor = Parameter1;
370354
node = (PPV_LAYOUT_NODE)getNodeColor->Node;
371355

372356
getNodeColor->Flags = TN_AUTO_FORECOLOR | TN_CACHE;
373357
}
374358
return TRUE;
375359
case TreeNewSortChanged:
376360
{
377-
TreeNew_GetSort(hwnd, &context->TreeNewSortColumn, &context->TreeNewSortOrder);
361+
TreeNew_GetSort(WindowHandle, &context->TreeNewSortColumn, &context->TreeNewSortOrder);
378362
// Force a rebuild to sort the items.
379-
TreeNew_NodesStructured(hwnd);
363+
TreeNew_NodesStructured(WindowHandle);
380364
}
381365
return TRUE;
382366
case TreeNewKeyDown:
383367
{
384-
PPH_TREENEW_KEY_EVENT keyEvent = Parameter1;
385-
386-
if (!keyEvent)
387-
break;
368+
const PPH_TREENEW_KEY_EVENT keyEvent = Parameter1;
388369

389370
switch (keyEvent->VirtualKey)
390371
{
@@ -402,7 +383,7 @@ BOOLEAN NTAPI PvLayoutTreeNewCallback(
402383
return TRUE;
403384
case TreeNewContextMenu:
404385
{
405-
PPH_TREENEW_CONTEXT_MENU contextMenuEvent = Parameter1;
386+
const PPH_TREENEW_CONTEXT_MENU contextMenuEvent = Parameter1;
406387

407388
SendMessage(context->WindowHandle, WM_COMMAND, WM_PV_LAYOUT_CONTEXTMENU, (LPARAM)contextMenuEvent);
408389
}
@@ -411,13 +392,13 @@ BOOLEAN NTAPI PvLayoutTreeNewCallback(
411392
{
412393
//PH_TN_COLUMN_MENU_DATA data;
413394

414-
//data.TreeNewHandle = hwnd;
395+
//data.TreeNewHandle = WindowHandle;
415396
//data.MouseEvent = Parameter1;
416397
//data.DefaultSortColumn = 0;
417398
//data.DefaultSortOrder = AscendingSortOrder;
418399
//PhInitializeTreeNewColumnMenuEx(&data, PH_TN_COLUMN_MENU_SHOW_RESET_SORT);
419400

420-
//data.Selection = PhShowEMenu(data.Menu, hwnd, PH_EMENU_SHOW_LEFTRIGHT,
401+
//data.Selection = PhShowEMenu(data.Menu, WindowHandle, PH_EMENU_SHOW_LEFTRIGHT,
421402
// PH_ALIGN_LEFT | PH_ALIGN_TOP, data.MouseEvent->ScreenLocation.x, data.MouseEvent->ScreenLocation.y);
422403
//PhHandleTreeNewColumnMenu(&data);
423404
//PhDeleteTreeNewColumnMenu(&data);
@@ -446,7 +427,7 @@ PPV_LAYOUT_NODE PvGetSelectedLayoutNode(
446427
{
447428
for (ULONG i = 0; i < Context->NodeList->Count; i++)
448429
{
449-
PPV_LAYOUT_NODE layoutNode = Context->NodeList->Items[i];
430+
const PPV_LAYOUT_NODE layoutNode = Context->NodeList->Items[i];
450431

451432
if (layoutNode->Node.Selected)
452433
return layoutNode;
@@ -469,7 +450,7 @@ BOOLEAN PvGetSelectedLayoutNodes(
469450

470451
for (i = 0; i < Context->NodeList->Count; i++)
471452
{
472-
PPV_LAYOUT_NODE node = Context->NodeList->Items[i];
453+
const PPV_LAYOUT_NODE node = Context->NodeList->Items[i];
473454

474455
if (node->Node.Selected)
475456
{
@@ -500,7 +481,7 @@ VOID PvExpandAllLayoutNodes(
500481

501482
for (i = 0; i < Context->NodeList->Count; i++)
502483
{
503-
PPV_LAYOUT_NODE node = Context->NodeList->Items[i];
484+
const PPV_LAYOUT_NODE node = Context->NodeList->Items[i];
504485

505486
if (node->Children->Count != 0 && node->Node.Expanded != Expand)
506487
{
@@ -782,8 +763,8 @@ PPH_STRING PvLayoutFormatSize(
782763
#define FILE_LAYOUT_ENTRY_VERSION 0x1
783764
#define STREAM_LAYOUT_ENTRY_VERSION 0x1
784765
#define PH_FIRST_LAYOUT_ENTRY(LayoutEntry) \
785-
((PFILE_LAYOUT_ENTRY)(PTR_ADD_OFFSET(LayoutEntry, \
786-
((PQUERY_FILE_LAYOUT_OUTPUT)LayoutEntry)->FirstFileOffset)))
766+
((PFILE_LAYOUT_ENTRY)(PTR_ADD_OFFSET((LayoutEntry), \
767+
((PQUERY_FILE_LAYOUT_OUTPUT)(LayoutEntry))->FirstFileOffset)))
787768
#define PH_NEXT_LAYOUT_ENTRY(LayoutEntry) ( \
788769
((PFILE_LAYOUT_ENTRY)(LayoutEntry))->NextFileOffset ? \
789770
(PFILE_LAYOUT_ENTRY)(PTR_ADD_OFFSET((LayoutEntry), \
@@ -1149,8 +1130,8 @@ NTSTATUS PvLayoutEnumerateFileLayouts(
11491130
PvAddChildLayoutNode(Context, NULL, L"File attributes", PhFormatUInt64(fileLayoutEntry->FileAttributes, FALSE));
11501131
PvAddChildLayoutNode(Context, NULL, L"File entry flags", PhFormatUInt64(fileLayoutEntry->Flags, FALSE));
11511132
PvAddChildLayoutNode(Context, NULL, L"Creation time", PvLayoutGetRelativeTimeString(&fileLayoutInfoEntry->BasicInformation.CreationTime));
1152-
//PvAddChildLayoutNode(Context, NULL, L"Last access time", PvLayoutGetRelativeTimeString(&fileLayoutInfoEntry->BasicInformation.LastAccessTime));
1153-
PvAddChildLayoutNode(Context, NULL, L"Last write time", PvLayoutGetRelativeTimeString(&fileLayoutInfoEntry->BasicInformation.LastWriteTime));
1133+
//PvAddChildLayoutNode(Context, NULL, L"Access time", PvLayoutGetRelativeTimeString(&fileLayoutInfoEntry->BasicInformation.LastAccessTime));
1134+
PvAddChildLayoutNode(Context, NULL, L"Write time", PvLayoutGetRelativeTimeString(&fileLayoutInfoEntry->BasicInformation.LastWriteTime));
11541135
PvAddChildLayoutNode(Context, NULL, L"Change time", PvLayoutGetRelativeTimeString(&fileLayoutInfoEntry->BasicInformation.ChangeTime));
11551136
PvAddChildLayoutNode(Context, NULL, L"LastUsn", PhFormatUInt64(fileLayoutInfoEntry->Usn, FALSE));
11561137
PvAddChildLayoutNode(Context, NULL, L"OwnerId", PhFormatUInt64(fileLayoutInfoEntry->OwnerId, FALSE));

‎tools/peview/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Authors:
77
*
88
* wj32 2010
9-
* dmex 2017-2021
9+
* dmex 2017-2023
1010
*
1111
*/
1212

0 commit comments

Comments
 (0)