Module: wine Branch: master Commit: 66bd68a809725020f1644684f5f0b86022390c0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=66bd68a809725020f1644684f5...
Author: Michael Stefaniuc mstefani@redhat.de Date: Mon Aug 27 13:23:37 2012 +0200
dplayx: Avoid TRUE:FALSE conditional expressions.
---
dlls/dplayx/dplay.c | 4 ++-- dlls/dplayx/dplobby.c | 4 ++-- dlls/dplayx/name_server.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 1bcb386..7636546 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -2853,11 +2853,11 @@ static HRESULT DP_SecureOpen
FIXME( "Not all data fields are correct. Need new parameter\n" );
- data.bCreate = (dwFlags & DPOPEN_CREATE ) ? TRUE : FALSE; + data.bCreate = (dwFlags & DPOPEN_CREATE ) != 0; data.lpSPMessageHeader = (dwFlags & DPOPEN_CREATE ) ? NULL : NS_GetNSAddr( This->dp2->lpNameServerData ); data.lpISP = This->dp2->spData.lpISP; - data.bReturnStatus = (dwFlags & DPOPEN_RETURNSTATUS) ? TRUE : FALSE; + data.bReturnStatus = (dwFlags & DPOPEN_RETURNSTATUS) != 0; data.dwOpenFlags = dwFlags; data.dwSessionFlags = This->dp2->lpSessionDesc->dwFlags;
diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index 3e7efc7..9adc67a 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -1704,7 +1704,7 @@ static HRESULT WINAPI IDirectPlayLobby3WImpl_WaitForConnectionSettings ( LPDIRECTPLAYLOBBY3 iface, DWORD dwFlags ) { HRESULT hr = DP_OK; - BOOL bStartWait = (dwFlags & DPLWAIT_CANCEL) ? FALSE : TRUE; + BOOL bStartWait = !(dwFlags & DPLWAIT_CANCEL);
TRACE( "(%p)->(0x%08x)\n", iface, dwFlags );
@@ -1721,7 +1721,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_WaitForConnectionSettings ( LPDIRECTPLAYLOBBY3A iface, DWORD dwFlags ) { HRESULT hr = DP_OK; - BOOL bStartWait = (dwFlags & DPLWAIT_CANCEL) ? FALSE : TRUE; + BOOL bStartWait = !(dwFlags & DPLWAIT_CANCEL);
TRACE( "(%p)->(0x%08x)\n", iface, dwFlags );
diff --git a/dlls/dplayx/name_server.c b/dlls/dplayx/name_server.c index 0acdc5f..258bdad 100644 --- a/dlls/dplayx/name_server.c +++ b/dlls/dplayx/name_server.c @@ -208,7 +208,7 @@ HRESULT NS_SendSessionRequestBroadcast( LPCGUID lpcGuid, data.lpMessage = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, data.dwMessageSize ); data.lpISP = lpSpData->lpISP; - data.bReturnStatus = (dwFlags & DPENUMSESSIONS_RETURNSTATUS) ? TRUE : FALSE; + data.bReturnStatus = (dwFlags & DPENUMSESSIONS_RETURNSTATUS) != 0;
lpMsg = (LPDPMSG_ENUMSESSIONSREQUEST)(((BYTE*)data.lpMessage)+lpSpData->dwSPHeaderSize);