August 2012 - Wine-Commits - list.winehq.org

Detlef Riekenberg : mpr/tests: Handle result from the AppV virtual drive.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: fc4b2f6ceca61ca7738b81f6e843509d79977314 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc4b2f6ceca61ca7738b81f6e… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Aug 3 19:16:35 2012 +0200 mpr/tests: Handle result from the AppV virtual drive. --- dlls/mpr/tests/mpr.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/mpr/tests/mpr.c b/dlls/mpr/tests/mpr.c index d54d80d..8ccce78 100644 --- a/dlls/mpr/tests/mpr.c +++ b/dlls/mpr/tests/mpr.c @@ -42,7 +42,11 @@ static void test_WNetGetUniversalName(void) if(drive_type == DRIVE_REMOTE) ok(ret == WN_NO_ERROR, "WNetGetUniversalNameA failed: %08x\n", ret); else - ok(ret == ERROR_NOT_CONNECTED, "WNetGetUniversalNameA gave wrong error: %08x\n", ret); + /* WN_NO_NET_OR_BAD_PATH (DRIVE_FIXED) returned from the virtual drive (usual Q:) + created by the microsoft application virtualization client */ + ok((ret == WN_NOT_CONNECTED) || (ret == WN_NO_NET_OR_BAD_PATH), + "WNetGetUniversalNameA(%s, ...) returned %u (drive_type: %u)\n", + driveA, ret, drive_type); ok(info_size == sizeof(buffer), "Got wrong size: %u\n", info_size); @@ -53,7 +57,9 @@ static void test_WNetGetUniversalName(void) if(drive_type == DRIVE_REMOTE) ok(ret == WN_NO_ERROR, "WNetGetUniversalNameW failed: %08x\n", ret); else - ok(ret == ERROR_NOT_CONNECTED, "WNetGetUniversalNameW gave wrong error: %08x\n", ret); + ok((ret == WN_NOT_CONNECTED) || (ret == WN_NO_NET_OR_BAD_PATH), + "WNetGetUniversalNameW(%s, ...) returned %u (drive_type: %u)\n", + wine_dbgstr_w(driveW), ret, drive_type); ok(info_size == sizeof(buffer), "Got wrong size: %u\n", info_size); }

1 0

Michael Stefaniuc : krnl386.exe16: Avoid TRUE:FALSE conditional expressions .
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: dfa57c6e97f1cbbd8147ee7986dc39755ef51c0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfa57c6e97f1cbbd8147ee798… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Aug 6 11:26:07 2012 +0200 krnl386.exe16: Avoid TRUE:FALSE conditional expressions. --- dlls/krnl386.exe16/dosexe.c | 2 +- dlls/krnl386.exe16/int31.c | 2 +- dlls/krnl386.exe16/vga.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/krnl386.exe16/dosexe.c b/dlls/krnl386.exe16/dosexe.c index ff55326..9797c86 100644 --- a/dlls/krnl386.exe16/dosexe.c +++ b/dlls/krnl386.exe16/dosexe.c @@ -61,7 +61,7 @@ static BOOL DOSVM_isdosexe; */ BOOL DOSVM_IsWin16(void) { - return DOSVM_isdosexe ? FALSE : TRUE; + return !DOSVM_isdosexe; } /********************************************************************** diff --git a/dlls/krnl386.exe16/int31.c b/dlls/krnl386.exe16/int31.c index 9828876..ac9ae1f 100644 --- a/dlls/krnl386.exe16/int31.c +++ b/dlls/krnl386.exe16/int31.c @@ -93,7 +93,7 @@ typedef struct { */ BOOL DOSVM_IsDos32(void) { - return (dpmi_flag & 1) ? TRUE : FALSE; + return (dpmi_flag & 1) != 0; } diff --git a/dlls/krnl386.exe16/vga.c b/dlls/krnl386.exe16/vga.c index 70b3ef1..98edcef 100644 --- a/dlls/krnl386.exe16/vga.c +++ b/dlls/krnl386.exe16/vga.c @@ -716,7 +716,7 @@ static void VGA_InstallTimer(unsigned Rate) static BOOL VGA_IsTimerRunning(void) { - return VGA_timer_thread ? TRUE : FALSE; + return VGA_timer_thread != 0; } static HANDLE VGA_AlphaConsole(void)

1 0

Rico Schüller : d3dx9/tests: Reduce effect parameter value test count.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: 3bd55d0b62905134f1e57136e4ecbc916d034f76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bd55d0b62905134f1e57136e… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Aug 8 17:01:57 2012 +0200 d3dx9/tests: Reduce effect parameter value test count. --- dlls/d3dx9_36/tests/effect.c | 304 ++++++++++++------------------------------ 1 files changed, 85 insertions(+), 219 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3bd55d0b62905134f1e57…

1 0

Nikolay Sivov : riched20: Use proper interface methods macros.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: e3f0d4084006be0473431f9bc498c6f526b4a555 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3f0d4084006be0473431f9bc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 1 14:56:19 2012 +0400 riched20: Use proper interface methods macros. --- dlls/riched20/editor.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 44c7ad2..6e0fb3c 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2793,8 +2793,8 @@ static void ME_DestroyEditor(ME_TextEditor *editor) if (editor->rgbBackColor != -1) DeleteObject(editor->hbrBackground); if(editor->lpOleCallback) - IUnknown_Release(editor->lpOleCallback); - IUnknown_Release(editor->texthost); + IRichEditOleCallback_Release(editor->lpOleCallback); + ITextHost_Release(editor->texthost); OleUninitialize(); FREE_OBJ(editor->pBuffer); @@ -4311,10 +4311,10 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } case EM_SETOLECALLBACK: if(editor->lpOleCallback) - IUnknown_Release(editor->lpOleCallback); - editor->lpOleCallback = (LPRICHEDITOLECALLBACK)lParam; + IRichEditOleCallback_Release(editor->lpOleCallback); + editor->lpOleCallback = (IRichEditOleCallback*)lParam; if(editor->lpOleCallback) - IUnknown_AddRef(editor->lpOleCallback); + IRichEditOleCallback_AddRef(editor->lpOleCallback); return TRUE; case EM_GETWORDBREAKPROC: return (LRESULT)editor->pfnWordBreak;

1 0

Michael Stefaniuc : crypt32: Avoid TRUE:FALSE conditional expressions.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: 2793be9c6ddd2bf6331335a959fcda2408aa74d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2793be9c6ddd2bf6331335a95… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Aug 6 11:19:22 2012 +0200 crypt32: Avoid TRUE:FALSE conditional expressions. --- dlls/crypt32/base64.c | 4 ++-- dlls/crypt32/decode.c | 2 +- dlls/crypt32/message.c | 9 ++++----- dlls/crypt32/oid.c | 6 +++--- dlls/crypt32/store.c | 6 +++--- 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/crypt32/base64.c b/dlls/crypt32/base64.c index a01a7b6..9d6dcb4 100644 --- a/dlls/crypt32/base64.c +++ b/dlls/crypt32/base64.c @@ -827,7 +827,7 @@ BOOL WINAPI CryptStringToBinaryA(LPCSTR pszString, ret = decoder(pszString, cchString, pbBinary, pcbBinary, pdwSkip, pdwFlags); if (ret) SetLastError(ret); - return (ret == ERROR_SUCCESS) ? TRUE : FALSE; + return ret == ERROR_SUCCESS; } static LONG decodeBase64BlockW(const WCHAR *in_buf, int in_len, @@ -1159,5 +1159,5 @@ BOOL WINAPI CryptStringToBinaryW(LPCWSTR pszString, ret = decoder(pszString, cchString, pbBinary, pcbBinary, pdwSkip, pdwFlags); if (ret) SetLastError(ret); - return (ret == ERROR_SUCCESS) ? TRUE : FALSE; + return ret == ERROR_SUCCESS; } diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index bdcb744..bfd61d0 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -2977,7 +2977,7 @@ static BOOL CRYPT_AsnDecodeBool(const BYTE *pbEncoded, DWORD cbEncoded, else { *pcbStructInfo = sizeof(BOOL); - *(BOOL *)pvStructInfo = pbEncoded[2] ? TRUE : FALSE; + *(BOOL *)pvStructInfo = pbEncoded[2] != 0; ret = TRUE; } TRACE("returning %d (%08x)\n", ret, GetLastError()); diff --git a/dlls/crypt32/message.c b/dlls/crypt32/message.c index e5b6f2a..8668cb1 100644 --- a/dlls/crypt32/message.c +++ b/dlls/crypt32/message.c @@ -140,7 +140,7 @@ BOOL WINAPI CryptVerifyDetachedMessageSignature( for (i = 0; ret && i < cToBeSigned; i++) ret = CryptMsgUpdate(msg, rgpbToBeSigned[i], rgcbToBeSigned[i], - i == cToBeSigned - 1 ? TRUE : FALSE); + i == cToBeSigned - 1); } if (ret) { @@ -304,8 +304,7 @@ BOOL WINAPI CryptHashMessage(PCRYPT_HASH_MESSAGE_PARA pHashPara, if (msg) { for (i = 0, ret = TRUE; ret && i < cToBeHashed; i++) - ret = CryptMsgUpdate(msg, rgpbToBeHashed[i], rgcbToBeHashed[i], - i == cToBeHashed - 1 ? TRUE : FALSE); + ret = CryptMsgUpdate(msg, rgpbToBeHashed[i], rgcbToBeHashed[i], i == cToBeHashed - 1); if (ret) { ret = CryptMsgGetParam(msg, CMSG_CONTENT_PARAM, 0, pbHashedBlob, @@ -356,7 +355,7 @@ BOOL WINAPI CryptVerifyDetachedMessageHash(PCRYPT_HASH_MESSAGE_PARA pHashPara, for (i = 0; ret && i < cToBeHashed; i++) { ret = CryptMsgUpdate(msg, rgpbToBeHashed[i], - rgcbToBeHashed[i], i == cToBeHashed - 1 ? TRUE : FALSE); + rgcbToBeHashed[i], i == cToBeHashed - 1); } } else @@ -511,7 +510,7 @@ BOOL WINAPI CryptSignMessage(PCRYPT_SIGN_MESSAGE_PARA pSignPara, for (i = 0; ret && i < cToBeSigned; ++i) { ret = CryptMsgUpdate(msg, rgpbToBeSigned[i], rgcbToBeSigned[i], - i == cToBeSigned - 1 ? TRUE : FALSE); + i == cToBeSigned - 1); } } else diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index d56fe83..4f09e7b 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -684,7 +684,7 @@ BOOL WINAPI CryptUnregisterOIDFunction(DWORD dwEncodingType, LPCSTR pszFuncName, CryptMemFree(szKey); if (rc) SetLastError(rc); - return rc ? FALSE : TRUE; + return !rc; } BOOL WINAPI CryptGetOIDFunctionValue(DWORD dwEncodingType, LPCSTR pszFuncName, @@ -721,7 +721,7 @@ BOOL WINAPI CryptGetOIDFunctionValue(DWORD dwEncodingType, LPCSTR pszFuncName, SetLastError(rc); RegCloseKey(hKey); } - return rc ? FALSE : TRUE; + return !rc; } BOOL WINAPI CryptSetOIDFunctionValue(DWORD dwEncodingType, LPCSTR pszFuncName, @@ -758,7 +758,7 @@ BOOL WINAPI CryptSetOIDFunctionValue(DWORD dwEncodingType, LPCSTR pszFuncName, SetLastError(rc); RegCloseKey(hKey); } - return rc ? FALSE : TRUE; + return !rc; } static LPCWSTR CRYPT_FindStringInMultiString(LPCWSTR multi, LPCWSTR toFind) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index b540e61..6d27fc1 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -163,7 +163,7 @@ static BOOL CRYPT_MemAddCert(PWINECRYPT_CERTSTORE store, void *cert, if (ppStoreContext) *ppStoreContext = CertDuplicateCertificateContext(context); } - return context ? TRUE : FALSE; + return context != 0; } static void *CRYPT_MemEnumCert(PWINECRYPT_CERTSTORE store, void *pPrev) @@ -208,7 +208,7 @@ static BOOL CRYPT_MemAddCrl(PWINECRYPT_CERTSTORE store, void *crl, if (ppStoreContext) *ppStoreContext = CertDuplicateCRLContext(context); } - return context ? TRUE : FALSE; + return context != 0; } static void *CRYPT_MemEnumCrl(PWINECRYPT_CERTSTORE store, void *pPrev) @@ -253,7 +253,7 @@ static BOOL CRYPT_MemAddCtl(PWINECRYPT_CERTSTORE store, void *ctl, if (ppStoreContext) *ppStoreContext = CertDuplicateCTLContext(context); } - return context ? TRUE : FALSE; + return context != 0; } static void *CRYPT_MemEnumCtl(PWINECRYPT_CERTSTORE store, void *pPrev)

1 0

Michael Stefaniuc : user32: Avoid TRUE:FALSE conditional expressions.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: 4affaea0baabba5076f9e4ef7aa202709bf05698 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4affaea0baabba5076f9e4ef7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 8 10:15:09 2012 +0200 user32: Avoid TRUE:FALSE conditional expressions. --- dlls/user32/combo.c | 4 ++-- dlls/user32/dde_client.c | 6 +++--- dlls/user32/dde_misc.c | 2 +- dlls/user32/edit.c | 2 +- dlls/user32/listbox.c | 4 ++-- dlls/user32/menu.c | 2 +- dlls/user32/sysparams.c | 2 +- dlls/user32/tests/win.c | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 540c64b..d20005c 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -2111,7 +2111,7 @@ LRESULT ComboWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM lPar if( lParam ) CBGetDroppedControlRect(lphc, (LPRECT)lParam ); return CB_OKAY; case CB_GETDROPPEDSTATE: - return (lphc->wState & CBF_DROPPED) ? TRUE : FALSE; + return (lphc->wState & CBF_DROPPED) != 0; case CB_DIR: return unicode ? SendMessageW(lphc->hWndLBox, LB_DIR, wParam, lParam) : SendMessageA(lphc->hWndLBox, LB_DIR, wParam, lParam); @@ -2173,7 +2173,7 @@ LRESULT ComboWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM lPar else lphc->wState &= ~CBF_EUI; return CB_OKAY; case CB_GETEXTENDEDUI: - return (lphc->wState & CBF_EUI) ? TRUE : FALSE; + return (lphc->wState & CBF_EUI) != 0; case CB_GETCOMBOBOXINFO: return COMBO_GetComboBoxInfo(lphc, (COMBOBOXINFO *)lParam); case CB_LIMITTEXT: diff --git a/dlls/user32/dde_client.c b/dlls/user32/dde_client.c index b8b8451..ef3ee3f 100644 --- a/dlls/user32/dde_client.c +++ b/dlls/user32/dde_client.c @@ -321,8 +321,8 @@ static WDML_XACT* WDML_ClientQueueAdvise(WDML_CONV* pConv, UINT wType, UINT wFmt /* pack DdeAdvise */ pDdeAdvise = GlobalLock(pXAct->hMem); - pDdeAdvise->fAckReq = (wType & XTYPF_ACKREQ) ? TRUE : FALSE; - pDdeAdvise->fDeferUpd = (wType & XTYPF_NODATA) ? TRUE : FALSE; + pDdeAdvise->fAckReq = (wType & XTYPF_ACKREQ) != 0; + pDdeAdvise->fDeferUpd = (wType & XTYPF_NODATA) != 0; pDdeAdvise->cfFormat = wFmt; GlobalUnlock(pXAct->hMem); @@ -857,7 +857,7 @@ static WDML_QUEUE_STATE WDML_HandleIncomingData(WDML_CONV* pConv, MSG* msg, HDDE * XTYP_ADVDATA and callback should return the proper status. */ pLink = WDML_FindLink(pConv->instance, (HCONV)pConv, WDML_CLIENT_SIDE, hsz, - uiLo ? TRUE : FALSE, wdh.cfFormat); + uiLo != 0, wdh.cfFormat); if (!pLink) { WDML_DecHSZ(pConv->instance, hsz); diff --git a/dlls/user32/dde_misc.c b/dlls/user32/dde_misc.c index 35b9599..724c074 100644 --- a/dlls/user32/dde_misc.c +++ b/dlls/user32/dde_misc.c @@ -2147,7 +2147,7 @@ static BOOL WDML_EnableCallback(WDML_CONV *pConv, UINT wCmd) } if (wCmd == EC_QUERYWAITING) - return pConv->transactions ? TRUE : FALSE; + return pConv->transactions != NULL; if (wCmd != EC_ENABLEALL && wCmd != EC_ENABLEONE) { diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index ad71a2b..226d737 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -3387,7 +3387,7 @@ static BOOL EDIT_CheckCombo(EDITSTATE *es, UINT msg, INT key) case WM_SYSKEYDOWN: /* Handle Alt+up/down arrows */ if (nEUI) - SendMessageW(hCombo, CB_SHOWDROPDOWN, bDropped ? FALSE : TRUE, 0); + SendMessageW(hCombo, CB_SHOWDROPDOWN, !bDropped, 0); else SendMessageW(hLBox, WM_KEYDOWN, VK_F4, 0); break; diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 6bf24a7..5686e24 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -695,7 +695,7 @@ static void LISTBOX_DrawFocusRect( LB_DESCR *descr, BOOL on ) if (!IsWindowEnabled(descr->self)) SetTextColor( hdc, GetSysColor( COLOR_GRAYTEXT ) ); SetWindowOrgEx( hdc, descr->horz_pos, 0, NULL ); - LISTBOX_PaintItem( descr, hdc, &rect, descr->focus_item, ODA_FOCUS, on ? FALSE : TRUE ); + LISTBOX_PaintItem( descr, hdc, &rect, descr->focus_item, ODA_FOCUS, !on ); if (oldFont) SelectObject( hdc, oldFont ); ReleaseDC( descr->self, hdc ); } @@ -2493,7 +2493,7 @@ static BOOL LISTBOX_Create( HWND hwnd, LPHEADCOMBO lphc ) descr->horz_pos = 0; descr->nb_tabs = 0; descr->tabs = NULL; - descr->caret_on = lphc ? FALSE : TRUE; + descr->caret_on = !lphc; if (descr->style & LBS_NOSEL) descr->caret_on = FALSE; descr->in_focus = FALSE; descr->captured = FALSE; diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index b113143..f1beb94 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3125,7 +3125,7 @@ static BOOL MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y, /* if the function was called by TrackPopupMenu, continue with the menu tracking. If not, stop it */ else - fEndMenu = ((wFlags & TPM_POPUPMENU) ? FALSE : TRUE); + fEndMenu = !(wFlags & TPM_POPUPMENU); break; diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index fecaeda..4603cf4 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -2063,7 +2063,7 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, WINE_SPI_FIXME(SPI_SETICONS); /* 88 WINVER >= 0x400 */ case SPI_GETDEFAULTINPUTLANG: /* 89 WINVER >= 0x400 */ - ret = GetKeyboardLayout(0) ? TRUE : FALSE; + ret = GetKeyboardLayout(0) != 0; break; WINE_SPI_FIXME(SPI_SETDEFAULTINPUTLANG); /* 90 WINVER >= 0x400 */ diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 3b7f1a8..cdd0cbc 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -1172,7 +1172,7 @@ static void test_shell_window(void) ok(!ret, "third call to SetShellWindow(hwnd1)\n"); */ SetWindowLong(hwnd1, GWL_EXSTYLE, GetWindowLong(hwnd1,GWL_EXSTYLE)|WS_EX_TOPMOST); - ret = GetWindowLong(hwnd1,GWL_EXSTYLE)&WS_EX_TOPMOST? TRUE: FALSE; + ret = (GetWindowLong(hwnd1,GWL_EXSTYLE) & WS_EX_TOPMOST) != 0; ok(!ret, "SetWindowExStyle(hwnd1, WS_EX_TOPMOST)\n"); ret = DestroyWindow(hwnd1);

1 0

Michael Stefaniuc : ole32: Avoid TRUE:FALSE conditional expressions.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: 43ae84636aa7084cf10fbab9957e0342bc17be03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43ae84636aa7084cf10fbab99… Author: Michael Stefaniuc <mstefani(a)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)

1 0

Dmitry Timoshkov : windowscodecs: Handle short reads in the metadata handler.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: 5f4b8f5916a681c9a8206ba649557177c3e788ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f4b8f5916a681c9a8206ba64… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Aug 6 11:07:49 2012 +0900 windowscodecs: Handle short reads in the metadata handler. --- dlls/windowscodecs/metadatahandler.c | 63 ++++++++++++++++++++------------- 1 files changed, 38 insertions(+), 25 deletions(-) diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c index 042d6ae..084facf 100644 --- a/dlls/windowscodecs/metadatahandler.c +++ b/dlls/windowscodecs/metadatahandler.c @@ -681,7 +681,8 @@ static HRESULT LoadUnknownMetadata(IStream *input, const GUID *preferred_vendor, if (!data) return E_OUTOFMEMORY; hr = IStream_Read(input, data, stat.cbSize.QuadPart, &bytesread); - if (FAILED(hr)) + if (bytesread != stat.cbSize.QuadPart) hr = E_FAIL; + if (hr != S_OK) { HeapFree(GetProcessHeap(), 0, data); return hr; @@ -770,7 +771,7 @@ static int tag_to_vt(SHORT tag) static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry, MetadataItem *item, BOOL native_byte_order) { - ULONG count, value, i; + ULONG count, value, i, bytesread; SHORT type; LARGE_INTEGER pos; HRESULT hr; @@ -822,8 +823,9 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry, HeapFree(GetProcessHeap(), 0, item->value.u.caub.pElems); return hr; } - hr = IStream_Read(input, item->value.u.caub.pElems, count, NULL); - if (FAILED(hr)) + hr = IStream_Read(input, item->value.u.caub.pElems, count, &bytesread); + if (bytesread != count) hr = E_FAIL; + if (hr != S_OK) { HeapFree(GetProcessHeap(), 0, item->value.u.caub.pElems); return hr; @@ -866,8 +868,9 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry, HeapFree(GetProcessHeap(), 0, item->value.u.caui.pElems); return hr; } - hr = IStream_Read(input, item->value.u.caui.pElems, count * 2, NULL); - if (FAILED(hr)) + hr = IStream_Read(input, item->value.u.caui.pElems, count * 2, &bytesread); + if (bytesread != count * 2) hr = E_FAIL; + if (hr != S_OK) { HeapFree(GetProcessHeap(), 0, item->value.u.caui.pElems); return hr; @@ -898,8 +901,9 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry, HeapFree(GetProcessHeap(), 0, item->value.u.caul.pElems); return hr; } - hr = IStream_Read(input, item->value.u.caul.pElems, count * 4, NULL); - if (FAILED(hr)) + hr = IStream_Read(input, item->value.u.caul.pElems, count * 4, &bytesread); + if (bytesread != count * 4) hr = E_FAIL; + if (hr != S_OK) { HeapFree(GetProcessHeap(), 0, item->value.u.caul.pElems); return hr; @@ -925,8 +929,9 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry, hr = IStream_Seek(input, pos, SEEK_SET, NULL); if (FAILED(hr)) return hr; - hr = IStream_Read(input, &ull, sizeof(ull), NULL); - if (FAILED(hr)) return hr; + hr = IStream_Read(input, &ull, sizeof(ull), &bytesread); + if (bytesread != sizeof(ull)) hr = E_FAIL; + if (hr != S_OK) return hr; item->value.u.uhVal.QuadPart = ull; @@ -953,8 +958,9 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry, HeapFree(GetProcessHeap(), 0, item->value.u.cauh.pElems); return hr; } - hr = IStream_Read(input, item->value.u.cauh.pElems, count * 8, NULL); - if (FAILED(hr)) + hr = IStream_Read(input, item->value.u.cauh.pElems, count * 8, &bytesread); + if (bytesread != count * 8) hr = E_FAIL; + if (hr != S_OK) { HeapFree(GetProcessHeap(), 0, item->value.u.cauh.pElems); return hr; @@ -990,8 +996,9 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry, HeapFree(GetProcessHeap(), 0, item->value.u.pszVal); return hr; } - hr = IStream_Read(input, item->value.u.pszVal, count, NULL); - if (FAILED(hr)) + hr = IStream_Read(input, item->value.u.pszVal, count, &bytesread); + if (bytesread != count) hr = E_FAIL; + if (hr != S_OK) { HeapFree(GetProcessHeap(), 0, item->value.u.pszVal); return hr; @@ -1025,8 +1032,9 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry, HeapFree(GetProcessHeap(), 0, item->value.u.blob.pBlobData); return hr; } - hr = IStream_Read(input, item->value.u.blob.pBlobData, count, NULL); - if (FAILED(hr)) + hr = IStream_Read(input, item->value.u.blob.pBlobData, count, &bytesread); + if (bytesread != count) hr = E_FAIL; + if (hr != S_OK) { HeapFree(GetProcessHeap(), 0, item->value.u.blob.pBlobData); return hr; @@ -1047,6 +1055,7 @@ static HRESULT LoadIfdMetadata(IStream *input, const GUID *preferred_vendor, USHORT count, i; struct IFD_entry *entry; BOOL native_byte_order = TRUE; + ULONG bytesread; TRACE("\n"); @@ -1057,16 +1066,18 @@ static HRESULT LoadIfdMetadata(IStream *input, const GUID *preferred_vendor, #endif native_byte_order = FALSE; - hr = IStream_Read(input, &count, sizeof(count), NULL); - if (FAILED(hr)) return hr; + hr = IStream_Read(input, &count, sizeof(count), &bytesread); + if (bytesread != sizeof(count)) hr = E_FAIL; + if (hr != S_OK) return hr; SWAP_USHORT(count); entry = HeapAlloc(GetProcessHeap(), 0, count * sizeof(*entry)); if (!entry) return E_OUTOFMEMORY; - hr = IStream_Read(input, entry, count * sizeof(*entry), NULL); - if (FAILED(hr)) + hr = IStream_Read(input, entry, count * sizeof(*entry), &bytesread); + if (bytesread != count * sizeof(*entry)) hr = E_FAIL; + if (hr != S_OK) { HeapFree(GetProcessHeap(), 0, entry); return hr; @@ -1079,8 +1090,9 @@ static HRESULT LoadIfdMetadata(IStream *input, const GUID *preferred_vendor, LARGE_INTEGER pos; USHORT next_ifd_count; - hr = IStream_Read(input, &next_ifd_offset, sizeof(next_ifd_offset), NULL); - if (FAILED(hr)) break; + hr = IStream_Read(input, &next_ifd_offset, sizeof(next_ifd_offset), &bytesread); + if (bytesread != sizeof(next_ifd_offset)) hr = E_FAIL; + if (hr != S_OK) break; SWAP_ULONG(next_ifd_offset); if (!next_ifd_offset) break; @@ -1089,8 +1101,9 @@ static HRESULT LoadIfdMetadata(IStream *input, const GUID *preferred_vendor, hr = IStream_Seek(input, pos, SEEK_SET, NULL); if (FAILED(hr)) break; - hr = IStream_Read(input, &next_ifd_count, sizeof(next_ifd_count), NULL); - if (FAILED(hr)) break; + hr = IStream_Read(input, &next_ifd_count, sizeof(next_ifd_count), &bytesread); + if (bytesread != sizeof(next_ifd_count)) hr = E_FAIL; + if (hr != S_OK) break; SWAP_USHORT(next_ifd_count); @@ -1099,7 +1112,7 @@ static HRESULT LoadIfdMetadata(IStream *input, const GUID *preferred_vendor, if (FAILED(hr)) break; } - if (FAILED(hr) || i == 4096) + if (hr != S_OK || i == 4096) { HeapFree(GetProcessHeap(), 0, entry); return WINCODEC_ERR_BADMETADATAHEADER;

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: 8399033b390a9c65ac7fff246c1fc56ce8cb802e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8399033b390a9c65ac7fff246… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Sun Aug 5 20:16:35 2012 +0300 po: Update Finnish translation. --- po/fi.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/po/fi.po b/po/fi.po index d53d735..26d221f 100644 --- a/po/fi.po +++ b/po/fi.po @@ -3450,16 +3450,16 @@ msgid "Test Force Feedback" msgstr "Testaa voimapalautetta" #: joy.rc:63 -#, fuzzy -#| msgid "Available formats" msgid "Available Effects" -msgstr "Mahdolliset muodot" +msgstr "Mahdolliset efektit" #: joy.rc:65 msgid "" "Press any button in the controller to activate the chosen effect. The effect " "direction can be changed with the controller axis." msgstr "" +"Aktivoi valittu efekti painamalla mitä tahansa ohjaimen painiketta. Efektin " +"suuntaa voi muuttaa ohjaimen akselilla." #: joy.rc:28 msgid "Game Controllers"

1 0

Michael Stefaniuc : avifil32: Avoid TRUE:FALSE conditional expressions.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: fdfb86589e19e2c433522a20615a071efb72a048 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdfb86589e19e2c433522a206… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Aug 6 10:56:28 2012 +0200 avifil32: Avoid TRUE:FALSE conditional expressions. --- dlls/avifil32/api.c | 2 +- dlls/avifil32/getframe.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c index c53897a..6c07a2f 100644 --- a/dlls/avifil32/api.c +++ b/dlls/avifil32/api.c @@ -1244,7 +1244,7 @@ static BOOL AVISaveOptionsFmtChoose(HWND hWnd) pOptions->dwFlags |= AVICOMPRESSF_VALID; HeapFree(GetProcessHeap(), 0, afmtc.pwfxEnum); - return (ret == S_OK ? TRUE : FALSE); + return ret == S_OK; } else { ERR(": unknown streamtype 0x%08X\n", sInfo.fccType); return FALSE; diff --git a/dlls/avifil32/getframe.c b/dlls/avifil32/getframe.c index c5b2bd4..46b1683 100644 --- a/dlls/avifil32/getframe.c +++ b/dlls/avifil32/getframe.c @@ -307,8 +307,7 @@ static HRESULT WINAPI IGetFrame_fnSetFormat(IGetFrame *iface, if (sInfo.fccType != streamtypeVIDEO) return AVIERR_UNSUPPORTED; - This->bFormatChanges = - (sInfo.dwFlags & AVISTREAMINFO_FORMATCHANGES ? TRUE : FALSE ); + This->bFormatChanges = (sInfo.dwFlags & AVISTREAMINFO_FORMATCHANGES) != 0; This->dwFormatChangeCount = sInfo.dwFormatChangeCount; This->dwEditCount = sInfo.dwEditCount; This->lCurrentFrame = -1;

1 0