Skip to content

Commit 4266c50

Browse files
dmexdmex
committed
ExtendedServices: Remove duplicate macro
1 parent 7ad2799 commit 4266c50

File tree

1 file changed

+30
-42
lines changed
  • plugins/ExtendedServices

1 file changed

+30
-42
lines changed

‎plugins/ExtendedServices/main.c

Lines changed: 30 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -199,46 +199,40 @@ VOID NTAPI ProcessMenuInitializingCallback(
199199
// Massive copy and paste from mainwnd.c.
200200
// == START ==
201201

202-
#define SET_MENU_ITEM_ENABLED(MenuItem, Enabled) if (!(Enabled)) (MenuItem)->Flags |= PH_EMENU_DISABLED;
203-
204202
switch (serviceItem->State)
205203
{
206204
case SERVICE_RUNNING:
207205
{
208-
SET_MENU_ITEM_ENABLED(startMenuItem, FALSE);
209-
SET_MENU_ITEM_ENABLED(continueMenuItem, FALSE);
210-
SET_MENU_ITEM_ENABLED(pauseMenuItem,
211-
serviceItem->ControlsAccepted & SERVICE_ACCEPT_PAUSE_CONTINUE);
212-
SET_MENU_ITEM_ENABLED(stopMenuItem,
213-
serviceItem->ControlsAccepted & SERVICE_ACCEPT_STOP);
206+
PhSetEnabledEMenuItem(startMenuItem, FALSE);
207+
PhSetEnabledEMenuItem(continueMenuItem, FALSE);
208+
PhSetEnabledEMenuItem(pauseMenuItem, serviceItem->ControlsAccepted & SERVICE_ACCEPT_PAUSE_CONTINUE);
209+
PhSetEnabledEMenuItem(stopMenuItem, serviceItem->ControlsAccepted & SERVICE_ACCEPT_STOP);
214210
}
215211
break;
216212
case SERVICE_PAUSED:
217213
{
218-
SET_MENU_ITEM_ENABLED(startMenuItem, FALSE);
219-
SET_MENU_ITEM_ENABLED(continueMenuItem,
220-
serviceItem->ControlsAccepted & SERVICE_ACCEPT_PAUSE_CONTINUE);
221-
SET_MENU_ITEM_ENABLED(pauseMenuItem, FALSE);
222-
SET_MENU_ITEM_ENABLED(stopMenuItem,
223-
serviceItem->ControlsAccepted & SERVICE_ACCEPT_STOP);
214+
PhSetEnabledEMenuItem(startMenuItem, FALSE);
215+
PhSetEnabledEMenuItem(continueMenuItem, serviceItem->ControlsAccepted & SERVICE_ACCEPT_PAUSE_CONTINUE);
216+
PhSetEnabledEMenuItem(pauseMenuItem, FALSE);
217+
PhSetEnabledEMenuItem(stopMenuItem, serviceItem->ControlsAccepted & SERVICE_ACCEPT_STOP);
224218
}
225219
break;
226220
case SERVICE_STOPPED:
227221
{
228-
SET_MENU_ITEM_ENABLED(continueMenuItem, FALSE);
229-
SET_MENU_ITEM_ENABLED(pauseMenuItem, FALSE);
230-
SET_MENU_ITEM_ENABLED(stopMenuItem, FALSE);
222+
PhSetEnabledEMenuItem(continueMenuItem, FALSE);
223+
PhSetEnabledEMenuItem(pauseMenuItem, FALSE);
224+
PhSetEnabledEMenuItem(stopMenuItem, FALSE);
231225
}
232226
break;
233227
case SERVICE_START_PENDING:
234228
case SERVICE_CONTINUE_PENDING:
235229
case SERVICE_PAUSE_PENDING:
236230
case SERVICE_STOP_PENDING:
237231
{
238-
SET_MENU_ITEM_ENABLED(startMenuItem, FALSE);
239-
SET_MENU_ITEM_ENABLED(continueMenuItem, FALSE);
240-
SET_MENU_ITEM_ENABLED(pauseMenuItem, FALSE);
241-
SET_MENU_ITEM_ENABLED(stopMenuItem, FALSE);
232+
PhSetEnabledEMenuItem(startMenuItem, FALSE);
233+
PhSetEnabledEMenuItem(continueMenuItem, FALSE);
234+
PhSetEnabledEMenuItem(pauseMenuItem, FALSE);
235+
PhSetEnabledEMenuItem(stopMenuItem, FALSE);
242236
}
243237
break;
244238
}
@@ -496,46 +490,40 @@ VOID MiListSectionMenuInitializingCallback(
496490
// Massive copy and paste from mainwnd.c.
497491
// == START ==
498492

499-
#define SET_MENU_ITEM_ENABLED(MenuItem, Enabled) if (!(Enabled)) (MenuItem)->Flags |= PH_EMENU_DISABLED;
500-
501493
switch (serviceItem->State)
502494
{
503495
case SERVICE_RUNNING:
504496
{
505-
SET_MENU_ITEM_ENABLED(startMenuItem, FALSE);
506-
SET_MENU_ITEM_ENABLED(continueMenuItem, FALSE);
507-
SET_MENU_ITEM_ENABLED(pauseMenuItem,
508-
serviceItem->ControlsAccepted & SERVICE_ACCEPT_PAUSE_CONTINUE);
509-
SET_MENU_ITEM_ENABLED(stopMenuItem,
510-
serviceItem->ControlsAccepted & SERVICE_ACCEPT_STOP);
497+
PhSetEnabledEMenuItem(startMenuItem, FALSE);
498+
PhSetEnabledEMenuItem(continueMenuItem, FALSE);
499+
PhSetEnabledEMenuItem(pauseMenuItem, serviceItem->ControlsAccepted & SERVICE_ACCEPT_PAUSE_CONTINUE);
500+
PhSetEnabledEMenuItem(stopMenuItem, serviceItem->ControlsAccepted & SERVICE_ACCEPT_STOP);
511501
}
512502
break;
513503
case SERVICE_PAUSED:
514504
{
515-
SET_MENU_ITEM_ENABLED(startMenuItem, FALSE);
516-
SET_MENU_ITEM_ENABLED(continueMenuItem,
517-
serviceItem->ControlsAccepted & SERVICE_ACCEPT_PAUSE_CONTINUE);
518-
SET_MENU_ITEM_ENABLED(pauseMenuItem, FALSE);
519-
SET_MENU_ITEM_ENABLED(stopMenuItem,
520-
serviceItem->ControlsAccepted & SERVICE_ACCEPT_STOP);
505+
PhSetEnabledEMenuItem(startMenuItem, FALSE);
506+
PhSetEnabledEMenuItem(continueMenuItem, serviceItem->ControlsAccepted & SERVICE_ACCEPT_PAUSE_CONTINUE);
507+
PhSetEnabledEMenuItem(pauseMenuItem, FALSE);
508+
PhSetEnabledEMenuItem(stopMenuItem, serviceItem->ControlsAccepted & SERVICE_ACCEPT_STOP);
521509
}
522510
break;
523511
case SERVICE_STOPPED:
524512
{
525-
SET_MENU_ITEM_ENABLED(continueMenuItem, FALSE);
526-
SET_MENU_ITEM_ENABLED(pauseMenuItem, FALSE);
527-
SET_MENU_ITEM_ENABLED(stopMenuItem, FALSE);
513+
PhSetEnabledEMenuItem(continueMenuItem, FALSE);
514+
PhSetEnabledEMenuItem(pauseMenuItem, FALSE);
515+
PhSetEnabledEMenuItem(stopMenuItem, FALSE);
528516
}
529517
break;
530518
case SERVICE_START_PENDING:
531519
case SERVICE_CONTINUE_PENDING:
532520
case SERVICE_PAUSE_PENDING:
533521
case SERVICE_STOP_PENDING:
534522
{
535-
SET_MENU_ITEM_ENABLED(startMenuItem, FALSE);
536-
SET_MENU_ITEM_ENABLED(continueMenuItem, FALSE);
537-
SET_MENU_ITEM_ENABLED(pauseMenuItem, FALSE);
538-
SET_MENU_ITEM_ENABLED(stopMenuItem, FALSE);
523+
PhSetEnabledEMenuItem(startMenuItem, FALSE);
524+
PhSetEnabledEMenuItem(continueMenuItem, FALSE);
525+
PhSetEnabledEMenuItem(pauseMenuItem, FALSE);
526+
PhSetEnabledEMenuItem(stopMenuItem, FALSE);
539527
}
540528
break;
541529
}

0 commit comments

Comments
 (0)