Skip to content

Commit 86d6a3b

Browse files
committed
Merge remote-tracking branch 'refs/remotes/origin/master' into tracert
2 parents a7dd55c + 4897e08 commit 86d6a3b

File tree

14 files changed

+650
-166
lines changed

14 files changed

+650
-166
lines changed

ProcessHacker/chproc.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,6 @@ static VOID PhpRefreshProcessList(
8383

8484
lvHandle = Context->ListViewHandle;
8585

86-
ListView_DeleteAllItems(lvHandle);
87-
ImageList_RemoveAll(Context->ImageList);
88-
8986
if (!NT_SUCCESS(status = PhEnumProcesses(&processes)))
9087
{
9188
PhShowStatus(hwndDlg, L"Unable to enumerate processes", status, 0);
@@ -94,6 +91,9 @@ static VOID PhpRefreshProcessList(
9491

9592
ExtendedListView_SetRedraw(lvHandle, FALSE);
9693

94+
ListView_DeleteAllItems(lvHandle);
95+
ImageList_RemoveAll(Context->ImageList);
96+
9797
process = PH_FIRST_PROCESS(processes);
9898

9999
do

ProcessHacker/gdihndl.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,8 +236,8 @@ VOID PhpRefreshGdiHandles(
236236

237237
lvHandle = GetDlgItem(hwndDlg, IDC_LIST);
238238

239-
ListView_DeleteAllItems(lvHandle);
240239
ExtendedListView_SetRedraw(lvHandle, FALSE);
240+
ListView_DeleteAllItems(lvHandle);
241241

242242
for (i = 0; i < Context->List->Count; i++)
243243
{
@@ -328,6 +328,8 @@ INT_PTR CALLBACK PhpGdiHandlesDlgProc(
328328
PGDI_HANDLES_CONTEXT context = (PGDI_HANDLES_CONTEXT)lParam;
329329
HWND lvHandle;
330330

331+
PhCenterWindow(hwndDlg, GetParent(hwndDlg));
332+
331333
SetProp(hwndDlg, PhMakeContextAtom(), (HANDLE)context);
332334

333335
lvHandle = GetDlgItem(hwndDlg, IDC_LIST);
@@ -336,7 +338,7 @@ INT_PTR CALLBACK PhpGdiHandlesDlgProc(
336338
PhSetControlTheme(lvHandle, L"explorer");
337339
PhAddListViewColumn(lvHandle, 0, 0, 0, LVCFMT_LEFT, 100, L"Type");
338340
PhAddListViewColumn(lvHandle, 1, 1, 1, LVCFMT_LEFT, 80, L"Handle");
339-
PhAddListViewColumn(lvHandle, 2, 2, 2, LVCFMT_LEFT, 80, L"Object");
341+
PhAddListViewColumn(lvHandle, 2, 2, 2, LVCFMT_LEFT, 102, L"Object");
340342
PhAddListViewColumn(lvHandle, 3, 3, 3, LVCFMT_LEFT, 200, L"Information");
341343

342344
PhSetExtendedListView(lvHandle);

ProcessHacker/hidnproc.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,8 +221,6 @@ static INT_PTR CALLBACK PhpHiddenProcessesDlgProc(
221221
PhDereferenceObject(ProcessesList);
222222
}
223223

224-
ListView_DeleteAllItems(PhHiddenProcessesListViewHandle);
225-
226224
ProcessesList = PhCreateList(40);
227225

228226
ProcessesMethod =
@@ -233,6 +231,7 @@ static INT_PTR CALLBACK PhpHiddenProcessesDlgProc(
233231
NumberOfTerminatedProcesses = 0;
234232

235233
ExtendedListView_SetRedraw(PhHiddenProcessesListViewHandle, FALSE);
234+
ListView_DeleteAllItems(PhHiddenProcessesListViewHandle);
236235
status = PhEnumHiddenProcesses(
237236
ProcessesMethod,
238237
PhpHiddenProcessesCallback,

ProcessHacker/thrdstk.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,8 +450,8 @@ static NTSTATUS PhpRefreshThreadStack(
450450
ThreadStackContext->List = ThreadStackContext->NewList;
451451
ThreadStackContext->NewList = PhCreateList(10);
452452

453-
ListView_DeleteAllItems(ThreadStackContext->ListViewHandle);
454453
SendMessage(ThreadStackContext->ListViewHandle, WM_SETREDRAW, FALSE, 0);
454+
ListView_DeleteAllItems(ThreadStackContext->ListViewHandle);
455455

456456
for (i = 0; i < ThreadStackContext->List->Count; i++)
457457
{

build/sdk/makesdk.ps1

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ function BuildSolution([string] $FileName)
8080
# Debug builds
8181
& $msBuild "/m",
8282
"/nologo",
83-
"/nodemode:1",
8483
"/nodeReuse:true",
8584
"/verbosity:quiet",
8685
"/p:Configuration=Debug",
@@ -90,7 +89,6 @@ function BuildSolution([string] $FileName)
9089

9190
& $msBuild "/m",
9291
"/nologo",
93-
"/nodemode:1",
9492
"/nodeReuse:true",
9593
"/verbosity:quiet",
9694
"/p:Configuration=Debug",
@@ -101,7 +99,6 @@ function BuildSolution([string] $FileName)
10199
# Release builds
102100
& $msBuild "/m",
103101
"/nologo",
104-
"/nodemode:1",
105102
"/nodeReuse:true",
106103
"/verbosity:quiet",
107104
"/p:Configuration=Release",
@@ -111,7 +108,6 @@ function BuildSolution([string] $FileName)
111108

112109
& $msBuild "/m",
113110
"/nologo",
114-
"/nodemode:1",
115111
"/nodeReuse:true",
116112
"/verbosity:quiet",
117113
"/p:Configuration=Release",

0 commit comments

Comments
 (0)