oledlg: Avoid TRUE:FALSE conditional expressions.

Michael Stefaniuc mstefani at redhat.de
Wed Aug 8 14:29:34 CDT 2012


---
 dlls/oledlg/insobjdlg.c |    4 ++--
 dlls/oledlg/pastespl.c  |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/oledlg/insobjdlg.c b/dlls/oledlg/insobjdlg.c
index c801fba..75ca77b 100644
--- a/dlls/oledlg/insobjdlg.c
+++ b/dlls/oledlg/insobjdlg.c
@@ -233,8 +233,8 @@ static void UIINSERTOBJECTDLG_InitDialog(InsertObjectDlgInfo* pdlgInfo)
     IOF_SHOWINSERTCONTROL) ? SW_SHOW : SW_HIDE);
   ShowWindow(pdlgInfo->hwndDisplayIconCB, (pdlgInfo->lpOleUIInsertObject->dwFlags &
     IOF_CHECKDISPLAYASICON) ? SW_SHOW : SW_HIDE);
-  EnableWindow(pdlgInfo->hwndDisplayIconCB, (pdlgInfo->lpOleUIInsertObject->dwFlags &
-    IOF_DISABLEDISPLAYASICON) ? FALSE : TRUE);
+  EnableWindow(pdlgInfo->hwndDisplayIconCB, !(pdlgInfo->lpOleUIInsertObject->dwFlags &
+    IOF_DISABLEDISPLAYASICON));
 
   if (pdlgInfo->lpOleUIInsertObject->dwFlags & IOF_SELECTCREATECONTROL)
     UIINSERTOBJECTDLG_SelectCreateCtrl(pdlgInfo);
diff --git a/dlls/oledlg/pastespl.c b/dlls/oledlg/pastespl.c
index a487db7..1dba9583 100644
--- a/dlls/oledlg/pastespl.c
+++ b/dlls/oledlg/pastespl.c
@@ -252,7 +252,7 @@ static DWORD init_pastelist(HWND hdlg, OLEUIPASTESPECIALW *ps)
     }
 
     IEnumFORMATETC_Release(penum);
-    EnableWindow(GetDlgItem(hdlg, IDC_PS_PASTE), items_added ? TRUE : FALSE);
+    EnableWindow(GetDlgItem(hdlg, IDC_PS_PASTE), items_added != 0);
     return items_added;
 }
 
@@ -287,7 +287,7 @@ static DWORD init_linklist(HWND hdlg, OLEUIPASTESPECIALW *ps)
         }
     }
 
-    EnableWindow(GetDlgItem(hdlg, IDC_PS_PASTELINK), items_added ? TRUE : FALSE);
+    EnableWindow(GetDlgItem(hdlg, IDC_PS_PASTELINK), items_added != 0);
     return items_added;
 }
 
@@ -495,7 +495,7 @@ static void update_structure(HWND hdlg, ps_struct_t *ps_struct)
         ps_struct->ps->nSelectedIndex = pent->dwScratchSpace;
     }
     ps_struct->ps->dwFlags = ps_struct->flags;
-    ps_struct->ps->fLink = (ps_struct->flags & PSF_SELECTPASTELINK) ? TRUE : FALSE;
+    ps_struct->ps->fLink = (ps_struct->flags & PSF_SELECTPASTELINK) != 0;
 }
 
 static void free_structure(ps_struct_t *ps_struct)
-- 
1.7.7.6



More information about the wine-patches mailing list