winhlp32: Simplify code that happened to work by chance (PVS-Studio)

Michael Stefaniuc mstefani at redhat.de
Fri Mar 6 03:17:21 CST 2015


Odd binary OR of 0 (MF_BYCOMMAND) with a BOOL driving the '?:' which has
the lower operator prority.
---
 programs/winhlp32/winhelp.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c
index ee5eecd..17fe90c 100644
--- a/programs/winhlp32/winhelp.c
+++ b/programs/winhlp32/winhelp.c
@@ -1519,11 +1519,11 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam,
     case WM_INITMENUPOPUP:
         win = (WINHELP_WINDOW*) GetWindowLongPtrW(hWnd, 0);
         CheckMenuItem((HMENU)wParam, MNID_OPTS_FONTS_SMALL,
-                      MF_BYCOMMAND | (win->font_scale == 0) ? MF_CHECKED : 0);
+                      (win->font_scale == 0) ? MF_CHECKED : MF_UNCHECKED);
         CheckMenuItem((HMENU)wParam, MNID_OPTS_FONTS_NORMAL,
-                      MF_BYCOMMAND | (win->font_scale == 1) ? MF_CHECKED : 0);
+                      (win->font_scale == 1) ? MF_CHECKED : MF_UNCHECKED);
         CheckMenuItem((HMENU)wParam, MNID_OPTS_FONTS_LARGE,
-                      MF_BYCOMMAND | (win->font_scale == 2) ? MF_CHECKED : 0);
+                      (win->font_scale == 2) ? MF_CHECKED : MF_UNCHECKED);
         break;
     case WM_DESTROY:
         win = (WINHELP_WINDOW*) GetWindowLongPtrW(hWnd, 0);
-- 
1.9.3



More information about the wine-patches mailing list