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

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

Aug. 13, 2012

Module: wine Branch: master Commit: bf3e3d02d57c9661b4fea95a5c4144b7f841b17f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf3e3d02d57c9661b4fea95a5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 8 21:42:16 2012 +0200 wordpad: Avoid TRUE:FALSE conditional expressions. --- programs/wordpad/wordpad.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 24d956a..8a2afc4 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -583,10 +583,10 @@ static void dialog_choose_font(void) SendMessageW(hEditorWnd, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&fmt); lstrcpyW(cf.lpLogFont->lfFaceName, fmt.szFaceName); - cf.lpLogFont->lfItalic = (fmt.dwEffects & CFE_ITALIC) ? TRUE : FALSE; + cf.lpLogFont->lfItalic = (fmt.dwEffects & CFE_ITALIC) != 0; cf.lpLogFont->lfWeight = (fmt.dwEffects & CFE_BOLD) ? FW_BOLD : FW_NORMAL; - cf.lpLogFont->lfUnderline = (fmt.dwEffects & CFE_UNDERLINE) ? TRUE : FALSE; - cf.lpLogFont->lfStrikeOut = (fmt.dwEffects & CFE_STRIKEOUT) ? TRUE : FALSE; + cf.lpLogFont->lfUnderline = (fmt.dwEffects & CFE_UNDERLINE) != 0; + cf.lpLogFont->lfStrikeOut = (fmt.dwEffects & CFE_STRIKEOUT) != 0; cf.lpLogFont->lfHeight = -MulDiv(fmt.yHeight / 20, GetDeviceCaps(hDC, LOGPIXELSY), 72); cf.rgbColors = fmt.crTextColor;

1 0

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

Aug. 13, 2012

Module: wine Branch: master Commit: 915e12e59fc6d430cc94bd491fac456bf4096ebb URL: http://source.winehq.org/git/wine.git/?a=commit;h=915e12e59fc6d430cc94bd491… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 8 21:33:56 2012 +0200 winedbg: Avoid TRUE:FALSE conditional expressions. --- programs/winedbg/be_arm.c | 2 +- programs/winedbg/break.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 8e1b5b1..f375fe8 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -869,7 +869,7 @@ void be_arm_disasm_one_insn(ADDRESS64 *addr, int display) if (!memory_get_register(CV_ARM_CPSR, &pval, tmp, sizeof(tmp))) dbg_printf("\n\tmemory_get_register failed: %s", tmp); else - db_disasm_thumb=(*pval & 0x20)?TRUE:FALSE; + db_disasm_thumb = (*pval & 0x20) != 0; db_display = display; diff --git a/programs/winedbg/break.c b/programs/winedbg/break.c index e156a40..72979a1 100644 --- a/programs/winedbg/break.c +++ b/programs/winedbg/break.c @@ -549,7 +549,7 @@ void break_enable_xpoint(int num, BOOL enable) dbg_printf("Invalid breakpoint number %d\n", num); return; } - dbg_curr_process->bp[num].enabled = (enable) ? TRUE : FALSE; + dbg_curr_process->bp[num].enabled = enable != 0; dbg_curr_process->bp[num].skipcount = 0; }

1 0

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

Aug. 13, 2012

Module: wine Branch: master Commit: 8d24dd49eee67251c46bb03b0c1de78d0b1d2074 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d24dd49eee67251c46bb03b0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 8 21:35:53 2012 +0200 shlwapi: Avoid FALSE:TRUE conditional expressions. --- dlls/shlwapi/path.c | 4 ++-- dlls/shlwapi/reg.c | 16 ++++------------ dlls/shlwapi/thread.c | 2 +- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index 6f09d22..bb2879e 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -1714,7 +1714,7 @@ BOOL WINAPI PathFileExistsA(LPCSTR lpszPath) iPrevErrMode = SetErrorMode(SEM_FAILCRITICALERRORS); dwAttr = GetFileAttributesA(lpszPath); SetErrorMode(iPrevErrMode); - return dwAttr == INVALID_FILE_ATTRIBUTES ? FALSE : TRUE; + return dwAttr != INVALID_FILE_ATTRIBUTES; } /************************************************************************* @@ -1735,7 +1735,7 @@ BOOL WINAPI PathFileExistsW(LPCWSTR lpszPath) iPrevErrMode = SetErrorMode(SEM_FAILCRITICALERRORS); dwAttr = GetFileAttributesW(lpszPath); SetErrorMode(iPrevErrMode); - return dwAttr == INVALID_FILE_ATTRIBUTES ? FALSE : TRUE; + return dwAttr != INVALID_FILE_ATTRIBUTES; } /************************************************************************* diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index 26f83bf..c58a8c7 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -1890,17 +1890,14 @@ DWORD WINAPI SHGetValueGoodBootW(HKEY hkey, LPCWSTR pSubKey, LPCWSTR pValue, */ BOOL WINAPI RegisterMIMETypeForExtensionA(LPCSTR lpszSubKey, LPCSTR lpszValue) { - DWORD dwRet; - if (!lpszValue) { WARN("Invalid lpszValue would crash under Win32!\n"); return FALSE; } - dwRet = SHSetValueA(HKEY_CLASSES_ROOT, lpszSubKey, lpszContentTypeA, + return !SHSetValueA(HKEY_CLASSES_ROOT, lpszSubKey, lpszContentTypeA, REG_SZ, lpszValue, strlen(lpszValue)); - return dwRet ? FALSE : TRUE; } /************************************************************************* @@ -1910,17 +1907,14 @@ BOOL WINAPI RegisterMIMETypeForExtensionA(LPCSTR lpszSubKey, LPCSTR lpszValue) */ BOOL WINAPI RegisterMIMETypeForExtensionW(LPCWSTR lpszSubKey, LPCWSTR lpszValue) { - DWORD dwRet; - if (!lpszValue) { WARN("Invalid lpszValue would crash under Win32!\n"); return FALSE; } - dwRet = SHSetValueW(HKEY_CLASSES_ROOT, lpszSubKey, lpszContentTypeW, + return !SHSetValueW(HKEY_CLASSES_ROOT, lpszSubKey, lpszContentTypeW, REG_SZ, lpszValue, strlenW(lpszValue)); - return dwRet ? FALSE : TRUE; } /************************************************************************* @@ -1937,8 +1931,7 @@ BOOL WINAPI RegisterMIMETypeForExtensionW(LPCWSTR lpszSubKey, LPCWSTR lpszValue) */ BOOL WINAPI UnregisterMIMETypeForExtensionA(LPCSTR lpszSubKey) { - HRESULT ret = SHDeleteValueA(HKEY_CLASSES_ROOT, lpszSubKey, lpszContentTypeA); - return ret ? FALSE : TRUE; + return !SHDeleteValueA(HKEY_CLASSES_ROOT, lpszSubKey, lpszContentTypeA); } /************************************************************************* @@ -1948,8 +1941,7 @@ BOOL WINAPI UnregisterMIMETypeForExtensionA(LPCSTR lpszSubKey) */ BOOL WINAPI UnregisterMIMETypeForExtensionW(LPCWSTR lpszSubKey) { - HRESULT ret = SHDeleteValueW(HKEY_CLASSES_ROOT, lpszSubKey, lpszContentTypeW); - return ret ? FALSE : TRUE; + return !SHDeleteValueW(HKEY_CLASSES_ROOT, lpszSubKey, lpszContentTypeW); } /************************************************************************* diff --git a/dlls/shlwapi/thread.c b/dlls/shlwapi/thread.c index c18d5a4..f8afc29 100644 --- a/dlls/shlwapi/thread.c +++ b/dlls/shlwapi/thread.c @@ -365,7 +365,7 @@ BOOL WINAPI SHCreateThread(LPTHREAD_START_ROUTINE pfnThreadProc, VOID *pData, ti.pfnThreadProc = pfnThreadProc; ti.pfnCallback = pfnCallback; ti.pData = pData; - ti.bInitCom = dwFlags & CTF_COINIT ? TRUE : FALSE; + ti.bInitCom = (dwFlags & CTF_COINIT) != 0; ti.hEvent = CreateEventW(NULL,FALSE,FALSE,NULL); /* Hold references to the current thread and IE process, if desired */

1 0

Józef Kucia : d3dx9/tests: Add cube texture tests for ID3DXRenderToEnvMap.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: dcc09efe80941f547b233455842217f4a4a7e7c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcc09efe80941f547b2334558… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue Jul 31 15:26:41 2012 +0200 d3dx9/tests: Add cube texture tests for ID3DXRenderToEnvMap. --- dlls/d3dx9_36/tests/core.c | 91 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 91 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index 92c114a..ba0f065 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -1084,10 +1084,73 @@ static void test_D3DXCreateRenderToEnvMap(IDirect3DDevice9 *device) if (SUCCEEDED(hr)) ID3DXRenderToEnvMap_Release(render); } +static void test_ID3DXRenderToEnvMap_cube_map(IDirect3DDevice9 *device) +{ + HRESULT hr; + IDirect3DCubeTexture9 *cube_texture = NULL; + ID3DXRenderToEnvMap *render = NULL; + struct device_state pre_state; + struct device_state current_state; + + hr = IDirect3DDevice9_CreateCubeTexture(device, 256, 0, D3DUSAGE_RENDERTARGET, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, + &cube_texture, NULL); + if (FAILED(hr)) + { + skip("Failed to create cube texture\n"); + return; + } + + hr = retrieve_device_state(device, &pre_state); + + hr = D3DXCreateRenderToEnvMap(device, 256, 0, D3DFMT_A8R8G8B8, TRUE, D3DFMT_D24X8, &render); + ok(hr == D3D_OK, "D3DCreateRenderToEnvMap returned %#x, expected %#x\n", hr, D3D_OK); + if (SUCCEEDED(hr)) + { + DWORD face; + + hr = ID3DXRenderToEnvMap_End(render, D3DX_FILTER_NONE); + ok(hr == D3DERR_INVALIDCALL, "ID3DXRenderToEnvMap::End returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + hr = ID3DXRenderToEnvMap_BeginCube(render, cube_texture); + ok(hr == D3D_OK, "ID3DXRenderToEnvMap::BeginCube returned %#x, expected %#x\n", hr, D3D_OK); + + hr = retrieve_device_state(device, &current_state); + ok(SUCCEEDED(hr), "Failed to retrieve device state\n"); + compare_device_state(&current_state, &pre_state, TRUE); + release_device_state(&current_state); + + for (face = D3DCUBEMAP_FACE_POSITIVE_X; face <= D3DCUBEMAP_FACE_NEGATIVE_Z; face++) + { + hr = ID3DXRenderToEnvMap_Face(render, face, D3DX_FILTER_POINT); + ok(hr == D3D_OK, "ID3DXRenderToEnvMap::Face returned %#x, expected %#x\n", hr, D3D_OK); + + hr = retrieve_device_state(device, &current_state); + ok(SUCCEEDED(hr), "Failed to retrieve device state\n"); + compare_device_state(&current_state, &pre_state, FALSE); + release_device_state(&current_state); + } + + hr = ID3DXRenderToEnvMap_End(render, D3DX_FILTER_POINT); + ok(hr == D3D_OK, "ID3DXRenderToEnvMap::End returned %#x, expected %#x\n", hr, D3D_OK); + + hr = retrieve_device_state(device, &current_state); + ok(SUCCEEDED(hr), "Failed to retrieve device state\n"); + compare_device_state(&current_state, &pre_state, TRUE); + release_device_state(&current_state); + + check_release((IUnknown *)render, 0); + } + + release_device_state(&pre_state); + + check_release((IUnknown *)cube_texture, 0); +} + static void test_ID3DXRenderToEnvMap(IDirect3DDevice9 *device) { HRESULT hr; ID3DXRenderToEnvMap *render; + IDirect3DSurface9 *depth_stencil_surface; hr = D3DXCreateRenderToEnvMap(device, 256, 0, D3DFMT_A8R8G8B8, FALSE, D3DFMT_UNKNOWN, &render); if (SUCCEEDED(hr)) @@ -1124,6 +1187,34 @@ static void test_ID3DXRenderToEnvMap(IDirect3DDevice9 *device) check_release((IUnknown *)render, 0); } else skip("Failed to create ID3DXRenderToEnvMap\n"); + + /* make sure there is a depth stencil surface present */ + hr = IDirect3DDevice9_GetDepthStencilSurface(device, &depth_stencil_surface); + if (SUCCEEDED(hr)) + { + IDirect3DSurface9_Release(depth_stencil_surface); + depth_stencil_surface = NULL; + } + else if (hr == D3DERR_NOTFOUND) + { + hr = IDirect3DDevice9_CreateDepthStencilSurface(device, 256, 256, D3DFMT_D24X8, + D3DMULTISAMPLE_NONE, 0, TRUE, &depth_stencil_surface, NULL); + if (SUCCEEDED(hr)) IDirect3DDevice9_SetDepthStencilSurface(device, depth_stencil_surface); + } + + if (FAILED(hr)) + { + skip("Failed to create depth stencil surface\n"); + return; + } + + test_ID3DXRenderToEnvMap_cube_map(device); + + if (depth_stencil_surface) + { + IDirect3DDevice9_SetDepthStencilSurface(device, NULL); + IDirect3DSurface9_Release(depth_stencil_surface); + } } START_TEST(core)

1 0

Alistair Leslie-Hughes : scrrun: Implement IFileSystem3 FolderExists.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: e6d9f824dcc9a46613b4439750b51838a74c47bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6d9f824dcc9a46613b443975… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jul 30 09:02:39 2012 +1000 scrrun: Implement IFileSystem3 FolderExists. --- dlls/scrrun/filesystem.c | 13 +++++++++---- dlls/scrrun/tests/filesystem.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 4 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 5c8fb7d..a4e6f26 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -223,12 +223,17 @@ static HRESULT WINAPI filesys_FileExists(IFileSystem3 *iface, BSTR path, VARIANT return S_OK; } -static HRESULT WINAPI filesys_FolderExists(IFileSystem3 *iface, BSTR FolderSpec, - VARIANT_BOOL *pfExists) +static HRESULT WINAPI filesys_FolderExists(IFileSystem3 *iface, BSTR path, VARIANT_BOOL *ret) { - FIXME("%p %s %p\n", iface, debugstr_w(FolderSpec), pfExists); + DWORD attrs; + TRACE("%p %s %p\n", iface, debugstr_w(path), ret); - return E_NOTIMPL; + if (!ret) return E_POINTER; + + attrs = GetFileAttributesW(path); + *ret = attrs != INVALID_FILE_ATTRIBUTES && (attrs & FILE_ATTRIBUTE_DIRECTORY) ? VARIANT_TRUE : VARIANT_FALSE; + + return S_OK; } static HRESULT WINAPI filesys_GetDrive(IFileSystem3 *iface, BSTR DriveSpec, diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index ff1856e..a19a835 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -33,6 +33,10 @@ static void test_interfaces(void) { static const WCHAR pathW[] = {'p','a','t','h',0}; + static const WCHAR nonexistent_dirW[] = { + 'c', ':', '\\', 'N', 'o', 'n', 'e', 'x', 'i', 's', 't', 'e', 'n', 't', 0}; + static const WCHAR file_kernel32W[] = { + '\\', 'k', 'e', 'r', 'n', 'e', 'l', '3', '2', '.', 'd', 'l', 'l', 0}; HRESULT hr; IDispatch *disp; IDispatchEx *dispex; @@ -40,6 +44,8 @@ static void test_interfaces(void) IObjectWithSite *site; VARIANT_BOOL b; BSTR path; + WCHAR windows_path[MAX_PATH]; + WCHAR file_path[MAX_PATH]; hr = CoCreateInstance(&CLSID_FileSystemObject, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IDispatch, (void**)&disp); @@ -48,6 +54,10 @@ static void test_interfaces(void) return; } + GetSystemDirectoryW(windows_path, MAX_PATH); + lstrcpyW(file_path, windows_path); + lstrcatW(file_path, file_kernel32W); + hr = IDispatch_QueryInterface(disp, &IID_IFileSystem3, (void**)&fs3); ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); @@ -72,6 +82,28 @@ static void test_interfaces(void) ok(b == VARIANT_FALSE, "got %x\n", b); SysFreeString(path); + /* Folder Exists */ + hr = IFileSystem3_FolderExists(fs3, NULL, NULL); + ok(hr == E_POINTER, "got 0x%08x, expected 0x%08x\n", hr, E_POINTER); + + path = SysAllocString(windows_path); + hr = IFileSystem3_FolderExists(fs3, path, &b); + ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); + ok(b == VARIANT_TRUE, "Folder doesn't exists\n"); + SysFreeString(path); + + path = SysAllocString(nonexistent_dirW); + hr = IFileSystem3_FolderExists(fs3, path, &b); + ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); + ok(b == VARIANT_FALSE, "Folder exists\n"); + SysFreeString(path); + + path = SysAllocString(file_path); + hr = IFileSystem3_FolderExists(fs3, path, &b); + ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); + ok(b == VARIANT_FALSE, "Folder exists\n"); + SysFreeString(path); + IFileSystem3_Release(fs3); IDispatch_Release(disp); }

1 0

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

Aug. 13, 2012

Module: wine Branch: master Commit: 175eaf10748f424374ca41fa1c4468100148148d URL: http://source.winehq.org/git/wine.git/?a=commit;h=175eaf10748f424374ca41fa1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 8 21:00:22 2012 +0200 comctl32: Avoid TRUE:FALSE conditional expressions. --- dlls/comctl32/comboex.c | 2 +- dlls/comctl32/datetime.c | 2 +- dlls/comctl32/monthcal.c | 4 ++-- dlls/comctl32/tests/imagelist.c | 2 +- dlls/comctl32/toolbar.c | 2 +- dlls/comctl32/treeview.c | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index 710ef79..a72f897 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -720,7 +720,7 @@ COMBOEX_SetExtendedStyle (COMBOEX_INFO *infoPtr, DWORD mask, DWORD style) /* see if we need to change the word break proc on the edit */ if ((infoPtr->dwExtStyle ^ dwTemp) & CBES_EX_PATHWORDBREAKPROC) SetPathWordBreakProc(infoPtr->hwndEdit, - (infoPtr->dwExtStyle & CBES_EX_PATHWORDBREAKPROC) ? TRUE : FALSE); + (infoPtr->dwExtStyle & CBES_EX_PATHWORDBREAKPROC) != 0); /* test if the control's appearance has changed */ mask = CBES_EX_NOEDITIMAGE | CBES_EX_NOEDITIMAGEINDENT; diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index bfd5d5e..d36032f 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -586,7 +586,7 @@ DATETIME_IncreaseField (DATETIME_INFO *infoPtr, int number, int delta) /* Ensure time is within bounds */ limits = SendMessageW (infoPtr->hMonthCal, MCM_GETRANGE, 0, (LPARAM) &range); - min = ((delta < 0) ? TRUE : FALSE); + min = delta < 0; if (limits & (min ? GDTR_MIN : GDTR_MAX)) { diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index a7722ee..c5b6d91 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -372,7 +372,7 @@ static BOOL MONTHCAL_IsDateInValidRange(const MONTHCAL_INFO *infoPtr, date->wMonth = fix_st->wMonth; } - return fix_st ? FALSE : TRUE; + return !fix_st; } /* Checks passed range width with configured maximum selection count @@ -1276,7 +1276,7 @@ MONTHCAL_SetColor(MONTHCAL_INFO *infoPtr, UINT index, COLORREF color) infoPtr->pens[PenText] = CreatePen(PS_SOLID, 1, infoPtr->colors[index]); } - InvalidateRect(infoPtr->hwndSelf, NULL, index == MCSC_BACKGROUND ? TRUE : FALSE); + InvalidateRect(infoPtr->hwndSelf, NULL, index == MCSC_BACKGROUND); return prev; } diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index b920b9a..2e316f7 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -619,7 +619,7 @@ static BOOL allocate_storage(struct my_IStream *my_is, ULONG add) else my_is->iml_data = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, my_is->iml_data, my_is->iml_data_size); - return my_is->iml_data ? TRUE : FALSE; + return my_is->iml_data != NULL; } static HRESULT STDMETHODCALLTYPE Test_Stream_Write(IStream *iface, const void *pv, ULONG cb, diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 382161c..c26d70e 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3140,7 +3140,7 @@ TOOLBAR_CheckButton (TOOLBAR_INFO *infoPtr, INT Id, LPARAM lParam) btnPtr = &infoPtr->buttons[nIndex]; - bChecked = (btnPtr->fsState & TBSTATE_CHECKED) ? TRUE : FALSE; + bChecked = (btnPtr->fsState & TBSTATE_CHECKED) != 0; if (LOWORD(lParam) == FALSE) btnPtr->fsState &= ~TBSTATE_CHECKED; diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 79de8aa..d8fe635 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -1612,7 +1612,7 @@ TREEVIEW_DeleteItem(TREEVIEW_INFO *infoPtr, HTREEITEM item) static LRESULT TREEVIEW_SetRedraw(TREEVIEW_INFO* infoPtr, WPARAM wParam) { - infoPtr->bRedraw = wParam ? TRUE : FALSE; + infoPtr->bRedraw = wParam != 0; if (infoPtr->bRedraw) {

1 0

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

Aug. 13, 2012

Module: wine Branch: master Commit: 47e472af10092fab903ab487e21ca7f063a0c6fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=47e472af10092fab903ab487e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 8 21:18:33 2012 +0200 msvcp60: Avoid FALSE:TRUE conditional expressions. --- dlls/msvcp60/string.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c index a935de1..cac9596 100644 --- a/dlls/msvcp60/string.c +++ b/dlls/msvcp60/string.c @@ -115,7 +115,7 @@ static const char* char_traits_char_find(const char *str, static MSVCP_bool basic_string_char_inside( basic_string_char *this, const char *ptr) { - return (ptr<this->ptr || ptr>=this->ptr+this->size) ? FALSE : TRUE; + return ptr>=this->ptr && ptr<this->ptr+this->size; } /* ?npos@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@2IB */ @@ -1811,7 +1811,7 @@ static const wchar_t* char_traits_wchar_find(const wchar_t *str, static MSVCP_bool basic_string_wchar_inside( basic_string_wchar *this, const wchar_t *ptr) { - return (ptr<this->ptr || ptr>=this->ptr+this->size) ? FALSE : TRUE; + return ptr>=this->ptr && ptr<this->ptr+this->size; } /* ?npos@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@2IB */

1 0

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

Aug. 13, 2012

Module: wine Branch: master Commit: 69d44b54f927d9800758d6179cb250387fc7a375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69d44b54f927d9800758d6179… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 8 21:06:42 2012 +0200 credui: Avoid TRUE:FALSE conditional expressions,. --- dlls/credui/credui_main.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index 1409c20..5a8c05c 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -337,7 +337,7 @@ static void CredDialogHideBalloonTip(HWND hwndDlg, struct cred_dialog_params *pa static inline BOOL CredDialogCapsLockOn(void) { - return GetKeyState(VK_CAPITAL) & 0x1 ? TRUE : FALSE; + return (GetKeyState(VK_CAPITAL) & 0x1) != 0; } static LRESULT CALLBACK CredDialogPasswordSubclassProc(HWND hwnd, UINT uMsg, @@ -649,13 +649,13 @@ DWORD WINAPI CredUIPromptForCredentialsW(PCREDUI_INFOW pUIInfo, len = strlenW(params.pszPassword); entry->pszPassword = HeapAlloc(GetProcessHeap(), 0, (len + 1)*sizeof(WCHAR)); memcpy(entry->pszPassword, params.pszPassword, (len + 1)*sizeof(WCHAR)); - entry->generic = dwFlags & CREDUI_FLAGS_GENERIC_CREDENTIALS ? TRUE : FALSE; + entry->generic = (dwFlags & CREDUI_FLAGS_GENERIC_CREDENTIALS) != 0; LeaveCriticalSection(&csPendingCredentials); } else result = save_credentials(pszTargetName, pszUsername, pszPassword, - dwFlags & CREDUI_FLAGS_GENERIC_CREDENTIALS ? TRUE : FALSE); + (dwFlags & CREDUI_FLAGS_GENERIC_CREDENTIALS) != 0); } return result;

1 0

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

Aug. 13, 2012

Module: wine Branch: master Commit: 37a9183d68ac338778e932db025bd80474fce75a URL: http://source.winehq.org/git/wine.git/?a=commit;h=37a9183d68ac338778e932db0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 8 21:13:43 2012 +0200 jscript: Avoid FALSE:TRUE conditional expressions. --- dlls/jscript/engine.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index e6c2646..eb2adca 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -461,9 +461,9 @@ static HRESULT equal2_values(VARIANT *lval, VARIANT *rval, BOOL *ret) break; case VT_BSTR: if(!V_BSTR(lval)) - *ret = SysStringLen(V_BSTR(rval))?FALSE:TRUE; + *ret = !SysStringLen(V_BSTR(rval)); else if(!V_BSTR(rval)) - *ret = SysStringLen(V_BSTR(lval))?FALSE:TRUE; + *ret = !SysStringLen(V_BSTR(lval)); else *ret = !strcmpW(V_BSTR(lval), V_BSTR(rval)); break;

1 0

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

Aug. 13, 2012

Module: wine Branch: master Commit: 4d3a7aa26870f2a1bac49e5591da90f4d3080d9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d3a7aa26870f2a1bac49e559… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 8 21:10:10 2012 +0200 gdi32: Avoid TRUE:FALSE conditional expressions. --- dlls/gdi32/dib.c | 2 +- dlls/gdi32/freetype.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index c35de33..78f0b93 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1390,7 +1390,7 @@ INT WINAPI GetDIBits( ret = lines; } else - ret = empty_rect ? FALSE : TRUE; + ret = !empty_rect; if (coloruse == DIB_PAL_COLORS) { diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 494ea7d..8222a18 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1754,7 +1754,7 @@ static Face *create_face( FT_Face ft_face, FT_Long face_index, const char *file, } face->vertical = vertical; - face->external = (flags & ADDFONT_EXTERNAL_FONT) ? TRUE : FALSE; + face->external = (flags & ADDFONT_EXTERNAL_FONT) != 0; face->family = NULL; face->cached_enum_data = NULL;

1 0