Skip to content

Commit d6b17c9

Browse files
dmexdmex
committed
update macro
1 parent 93a9595 commit d6b17c9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+96
-118
lines changed

‎ProcessHacker/about.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
#include <phapp.h>
2525

26+
#include <windowsx.h>
2627
#include <symprv.h>
2728

2829
#include <hndlprv.h>
@@ -87,7 +88,7 @@ static INT_PTR CALLBACK PhpAboutDlgProc(
8788
break;
8889
case WM_COMMAND:
8990
{
90-
switch (LOWORD(wParam))
91+
switch (GET_WM_COMMAND_ID(wParam, lParam))
9192
{
9293
case IDCANCEL:
9394
case IDOK:

‎ProcessHacker/affinity.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ static INT_PTR CALLBACK PhpProcessAffinityDlgProc(
232232
break;
233233
case WM_COMMAND:
234234
{
235-
switch (LOWORD(wParam))
235+
switch (GET_WM_COMMAND_ID(wParam, lParam))
236236
{
237237
case IDCANCEL:
238238
EndDialog(hwndDlg, IDCANCEL);
@@ -304,7 +304,7 @@ static INT_PTR CALLBACK PhpProcessAffinityDlgProc(
304304
HWND checkBox = GetDlgItem(hwndDlg, IDC_CPU0 + i);
305305

306306
if (IsWindowEnabled(checkBox))
307-
Button_SetCheck(checkBox, LOWORD(wParam) == IDC_SELECTALL ? BST_CHECKED : BST_UNCHECKED);
307+
Button_SetCheck(checkBox, GET_WM_COMMAND_ID(wParam, lParam) == IDC_SELECTALL ? BST_CHECKED : BST_UNCHECKED);
308308
}
309309
}
310310
break;

‎ProcessHacker/chcol.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ INT_PTR CALLBACK PhpColumnsDlgProc(
207207
break;
208208
case WM_COMMAND:
209209
{
210-
switch (LOWORD(wParam))
210+
switch (GET_WM_COMMAND_ID(wParam, lParam))
211211
{
212212
case IDCANCEL:
213213
EndDialog(hwndDlg, IDCANCEL);

‎ProcessHacker/chdlg.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ INT_PTR CALLBACK PhpChoiceDlgProc(
272272
break;
273273
case WM_COMMAND:
274274
{
275-
switch (LOWORD(wParam))
275+
switch (GET_WM_COMMAND_ID(wParam, lParam))
276276
{
277277
case IDCANCEL:
278278
EndDialog(hwndDlg, IDCANCEL);

‎ProcessHacker/chproc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
*/
2222

2323
#include <phapp.h>
24-
2524
#include <lsasup.h>
25+
#include <windowsx.h>
2626

2727
typedef struct _CHOOSE_PROCESS_DIALOG_CONTEXT
2828
{
@@ -257,7 +257,7 @@ INT_PTR CALLBACK PhpChooseProcessDlgProc(
257257
break;
258258
case WM_COMMAND:
259259
{
260-
switch (LOWORD(wParam))
260+
switch (GET_WM_COMMAND_ID(wParam, lParam))
261261
{
262262
case IDCANCEL:
263263
{

‎ProcessHacker/findobj.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ static INT_PTR CALLBACK PhpFindObjectsDlgProc(
293293
break;
294294
case WM_COMMAND:
295295
{
296-
switch (LOWORD(wParam))
296+
switch (GET_WM_COMMAND_ID(wParam, lParam))
297297
{
298298
case IDOK:
299299
{
@@ -477,7 +477,7 @@ static INT_PTR CALLBACK PhpFindObjectsDlgProc(
477477
info.TypeName = result->TypeName;
478478
info.BestObjectName = result->Name;
479479

480-
if (LOWORD(wParam) == ID_HANDLE_OBJECTPROPERTIES1)
480+
if (GET_WM_COMMAND_ID(wParam, lParam) == ID_HANDLE_OBJECTPROPERTIES1)
481481
PhShowHandleObjectProperties1(hwndDlg, &info);
482482
else
483483
PhShowHandleObjectProperties2(hwndDlg, &info);

‎ProcessHacker/gdihndl.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,9 @@
2121
*/
2222

2323
#include <phapp.h>
24-
2524
#include <ntgdi.h>
26-
2725
#include <procprv.h>
26+
#include <windowsx.h>
2827

2928
typedef struct _GDI_HANDLES_CONTEXT
3029
{
@@ -357,7 +356,7 @@ INT_PTR CALLBACK PhpGdiHandlesDlgProc(
357356
break;
358357
case WM_COMMAND:
359358
{
360-
switch (LOWORD(wParam))
359+
switch (GET_WM_COMMAND_ID(wParam, lParam))
361360
{
362361
case IDCANCEL:
363362
case IDOK:

‎ProcessHacker/hidnproc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ static INT_PTR CALLBACK PhpHiddenProcessesDlgProc(
189189
return TRUE;
190190
case WM_COMMAND:
191191
{
192-
switch (LOWORD(wParam))
192+
switch (GET_WM_COMMAND_ID(wParam, lParam))
193193
{
194194
case IDCANCEL:
195195
case IDOK:

‎ProcessHacker/hndlstat.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,9 @@
2121
*/
2222

2323
#include <phapp.h>
24-
2524
#include <hndlinfo.h>
26-
2725
#include <hndlprv.h>
26+
#include <windowsx.h>
2827

2928
typedef struct _HANDLE_STATISTICS_ENTRY
3029
{
@@ -220,7 +219,7 @@ INT_PTR CALLBACK PhpHandleStatisticsDlgProc(
220219
break;
221220
case WM_COMMAND:
222221
{
223-
switch (LOWORD(wParam))
222+
switch (GET_WM_COMMAND_ID(wParam, lParam))
224223
{
225224
case IDCANCEL:
226225
case IDOK:

‎ProcessHacker/infodlg.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ static INT_PTR CALLBACK PhpInformationDlgProc(
9696
break;
9797
case WM_COMMAND:
9898
{
99-
switch (LOWORD(wParam))
99+
switch (GET_WM_COMMAND_ID(wParam, lParam))
100100
{
101101
case IDCANCEL:
102102
case IDOK:

‎ProcessHacker/jobprp.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,11 @@
2121
*/
2222

2323
#include <phapp.h>
24-
2524
#include <hndlinfo.h>
2625
#include <secedit.h>
27-
2826
#include <procprv.h>
2927
#include <settings.h>
28+
#include <windowsx.h>
3029

3130
typedef struct _JOB_PAGE_CONTEXT
3231
{
@@ -390,7 +389,7 @@ INT_PTR CALLBACK PhpJobPageProc(
390389
break;
391390
case WM_COMMAND:
392391
{
393-
switch (LOWORD(wParam))
392+
switch (GET_WM_COMMAND_ID(wParam, lParam))
394393
{
395394
case IDC_TERMINATE:
396395
{

‎ProcessHacker/logwnd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ INT_PTR CALLBACK PhpLogDlgProc(
209209
break;
210210
case WM_COMMAND:
211211
{
212-
switch (LOWORD(wParam))
212+
switch (GET_WM_COMMAND_ID(wParam, lParam))
213213
{
214214
case IDCANCEL:
215215
case IDOK:

‎ProcessHacker/mainwnd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ LRESULT CALLBACK PhMwpWndProc(
262262
break;
263263
case WM_COMMAND:
264264
{
265-
PhMwpOnCommand(LOWORD(wParam));
265+
PhMwpOnCommand(GET_WM_COMMAND_ID(wParam, lParam));
266266
}
267267
break;
268268
case WM_SHOWWINDOW:

‎ProcessHacker/mdump.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222

2323
#include <phapp.h>
2424

25+
#include <windowsx.h>
2526
#include <dbghelp.h>
26-
2727
#include <symprv.h>
2828

2929
#include <actions.h>
@@ -401,7 +401,7 @@ INT_PTR CALLBACK PhpProcessMiniDumpDlgProc(
401401
break;
402402
case WM_COMMAND:
403403
{
404-
switch (LOWORD(wParam))
404+
switch (GET_WM_COMMAND_ID(wParam, lParam))
405405
{
406406
case IDCANCEL:
407407
{

‎ProcessHacker/memedit.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ INT_PTR CALLBACK PhpMemoryEditorDlgProc(
349349
break;
350350
case WM_COMMAND:
351351
{
352-
switch (LOWORD(wParam))
352+
switch (GET_WM_COMMAND_ID(wParam, lParam))
353353
{
354354
case IDCANCEL:
355355
case IDOK:

‎ProcessHacker/memlists.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,12 @@
2121
*/
2222

2323
#include <phapp.h>
24-
2524
#include <emenu.h>
2625
#include <settings.h>
27-
2826
#include <actions.h>
2927
#include <phsvccl.h>
3028
#include <procprv.h>
29+
#include <windowsx.h>
3130

3231
#define MSG_UPDATE (WM_APP + 1)
3332

@@ -191,7 +190,7 @@ INT_PTR CALLBACK PhpMemoryListsDlgProc(
191190
break;
192191
case WM_COMMAND:
193192
{
194-
switch (LOWORD(wParam))
193+
switch (GET_WM_COMMAND_ID(wParam, lParam))
195194
{
196195
case IDCANCEL:
197196
case IDOK:

‎ProcessHacker/memprot.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ static INT_PTR CALLBACK PhpMemoryProtectDlgProc(
102102
break;
103103
case WM_COMMAND:
104104
{
105-
switch (LOWORD(wParam))
105+
switch (GET_WM_COMMAND_ID(wParam, lParam))
106106
{
107107
case IDCANCEL:
108108
EndDialog(hwndDlg, IDCANCEL);

‎ProcessHacker/memrslt.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ INT_PTR CALLBACK PhpMemoryResultsDlgProc(
369369
break;
370370
case WM_COMMAND:
371371
{
372-
switch (LOWORD(wParam))
372+
switch (GET_WM_COMMAND_ID(wParam, lParam))
373373
{
374374
case IDCANCEL:
375375
case IDOK:

‎ProcessHacker/memsrch.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,7 @@ INT_PTR CALLBACK PhpMemoryStringDlgProc(
554554
break;
555555
case WM_COMMAND:
556556
{
557-
switch (LOWORD(wParam))
557+
switch (GET_WM_COMMAND_ID(wParam, lParam))
558558
{
559559
case IDCANCEL:
560560
EndDialog(hwndDlg, IDCANCEL);
@@ -679,7 +679,7 @@ INT_PTR CALLBACK PhpMemoryStringProgressDlgProc(
679679
break;
680680
case WM_COMMAND:
681681
{
682-
switch (LOWORD(wParam))
682+
switch (GET_WM_COMMAND_ID(wParam, lParam))
683683
{
684684
case IDCANCEL:
685685
{

‎ProcessHacker/miniinfo.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ LRESULT CALLBACK PhMipContainerWndProc(
219219
break;
220220
case WM_ACTIVATE:
221221
{
222-
PhMipContainerOnActivate(LOWORD(wParam), !!HIWORD(wParam));
222+
PhMipContainerOnActivate(GET_WM_COMMAND_ID(wParam, lParam), !!HIWORD(wParam));
223223
}
224224
break;
225225
case WM_SIZE:
@@ -282,7 +282,7 @@ INT_PTR CALLBACK PhMipMiniInfoDialogProc(
282282
break;
283283
case WM_COMMAND:
284284
{
285-
PhMipOnCommand(LOWORD(wParam), HIWORD(wParam));
285+
PhMipOnCommand(GET_WM_COMMAND_ID(wParam, lParam), HIWORD(wParam));
286286
}
287287
break;
288288
case WM_NOTIFY:

‎ProcessHacker/mtgndlg.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
*/
2222

2323
#include <phapp.h>
24-
2524
#include <procmtgn.h>
25+
#include <windowsx.h>
2626

2727
typedef struct _MITIGATION_POLICY_ENTRY
2828
{
@@ -127,7 +127,7 @@ INT_PTR CALLBACK PhpProcessMitigationPolicyDlgProc(
127127
break;
128128
case WM_COMMAND:
129129
{
130-
switch (LOWORD(wParam))
130+
switch (GET_WM_COMMAND_ID(wParam, lParam))
131131
{
132132
case IDCANCEL:
133133
case IDOK:

‎ProcessHacker/netstk.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,9 @@
2121
*/
2222

2323
#include <phapp.h>
24-
2524
#include <symprv.h>
26-
2725
#include <netprv.h>
26+
#include <windowsx.h>
2827

2928
typedef struct NETWORK_STACK_CONTEXT
3029
{
@@ -210,9 +209,7 @@ static INT_PTR CALLBACK PhpNetworkStackDlgProc(
210209
break;
211210
case WM_COMMAND:
212211
{
213-
INT id = LOWORD(wParam);
214-
215-
switch (id)
212+
switch (GET_WM_COMMAND_ID(wParam, lParam))
216213
{
217214
case IDCANCEL: // Esc and X button to close
218215
case IDOK:

‎ProcessHacker/notifico.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ VOID PhNfForwardMessage(
208208
}
209209
}
210210

211-
switch (LOWORD(LParam))
211+
switch (GET_WM_COMMAND_ID(WParam, LParam))
212212
{
213213
case WM_LBUTTONDOWN:
214214
{

0 commit comments

Comments
 (0)