Module: wine Branch: master Commit: 43ae84636aa7084cf10fbab9957e0342bc17be03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43ae84636aa7084cf10fbab995...
Author: Michael Stefaniuc mstefani@redhat.de Date: Wed Aug 8 10:13:54 2012 +0200
ole32: Avoid TRUE:FALSE conditional expressions.
---
dlls/ole32/compobj.c | 5 ++--- dlls/ole32/defaulthandler.c | 2 +- dlls/ole32/ole2.c | 4 ++-- dlls/ole32/tests/clipboard.c | 2 +- dlls/ole32/tests/compobj.c | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index ff8f961..4f6229d 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3769,10 +3769,9 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout, { TRACE("waiting for rpc completion\n");
- res = WaitForMultipleObjectsEx(cHandles, pHandles, - (dwFlags & COWAIT_WAITALL) ? TRUE : FALSE, + res = WaitForMultipleObjectsEx(cHandles, pHandles, (dwFlags & COWAIT_WAITALL) != 0, (dwTimeout == INFINITE) ? INFINITE : start_time + dwTimeout - now, - (dwFlags & COWAIT_ALERTABLE) ? TRUE : FALSE); + (dwFlags & COWAIT_ALERTABLE) != 0); }
switch (res) diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index b43b962..a2a30de 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -1899,7 +1899,7 @@ static DefaultHandler* DefaultHandler_Construct( This->IAdviseSink_iface.lpVtbl = &DefaultHandler_IAdviseSink_VTable; This->IPersistStorage_iface.lpVtbl = &DefaultHandler_IPersistStorage_VTable;
- This->inproc_server = (flags & EMBDHLP_INPROC_SERVER) ? TRUE : FALSE; + This->inproc_server = (flags & EMBDHLP_INPROC_SERVER) != 0;
/* * Start with one reference count. The caller of this function diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 6d37aa6..74fb43e 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -290,7 +290,7 @@ static inline HANDLE get_droptarget_handle(HWND hwnd) */ static inline BOOL is_droptarget(HWND hwnd) { - return get_droptarget_handle(hwnd) ? TRUE : FALSE; + return get_droptarget_handle(hwnd) != 0; }
/************************************************************* @@ -1660,7 +1660,7 @@ static BOOL OLEMenu_SetIsServerMenu( HMENU hmenu, OleMenuDescriptor *pOleMenuDes if ( nPos < nWidth ) { /* Odd elements are server menu widths */ - pOleMenuDescriptor->bIsServerItem = (i%2) ? TRUE : FALSE; + pOleMenuDescriptor->bIsServerItem = i%2; break; } } diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index 1029a68..5a16032 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -740,7 +740,7 @@ static void test_cf_dataobject(IDataObject *data) break; } cfs_seen[count] = fmt.cfFormat; - ok(fmt_ptr->first_use_of_cf == seen_cf ? FALSE : TRUE, "got %08x expected %08x\n", + ok(fmt_ptr->first_use_of_cf != seen_cf, "got %08x expected %08x\n", fmt_ptr->first_use_of_cf, !seen_cf); ok(fmt_ptr->res[0] == 0, "got %08x\n", fmt_ptr->res[1]); ok(fmt_ptr->res[1] == 0, "got %08x\n", fmt_ptr->res[2]); diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index b76c9d2..9dfc271 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -1110,7 +1110,7 @@ static DWORD CALLBACK free_libraries_thread(LPVOID p)
static inline BOOL is_module_loaded(const char *module) { - return GetModuleHandle(module) ? TRUE : FALSE; + return GetModuleHandle(module) != 0; }
static void test_CoFreeUnusedLibraries(void)