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

Michael Stefaniuc : include/wininet.h: Avoid TRUE: FALSE conditional expressions.
by Alexandre Julliard 13 Aug '12

13 Aug '12

Module: wine Branch: master Commit: 6bfc07e3e545d68443f1491ec98b7457c458f441 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bfc07e3e545d68443f1491ec… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 8 21:45:27 2012 +0200 include/wininet.h: Avoid TRUE:FALSE conditional expressions. --- include/wininet.h | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/wininet.h b/include/wininet.h index 4c47902..c7a428a 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -806,17 +806,17 @@ DECL_WINELIB_TYPE_AW(LPGOPHER_FIND_DATA) #define GOPHER_TYPE_ASK 0x40000000 #define GOPHER_TYPE_GOPHER_PLUS 0x80000000 -#define IS_GOPHER_FILE(type) (BOOL)(((type) & GOPHER_TYPE_FILE_MASK) ? TRUE : FALSE) -#define IS_GOPHER_DIRECTORY(type) (BOOL)(((type) & GOPHER_TYPE_DIRECTORY) ? TRUE : FALSE) -#define IS_GOPHER_PHONE_SERVER(type) (BOOL)(((type) & GOPHER_TYPE_CSO) ? TRUE : FALSE) -#define IS_GOPHER_ERROR(type) (BOOL)(((type) & GOPHER_TYPE_ERROR) ? TRUE : FALSE) -#define IS_GOPHER_INDEX_SERVER(type) (BOOL)(((type) & GOPHER_TYPE_INDEX_SERVER) ? TRUE : FALSE) -#define IS_GOPHER_TELNET_SESSION(type) (BOOL)(((type) & GOPHER_TYPE_TELNET) ? TRUE : FALSE) -#define IS_GOPHER_BACKUP_SERVER(type) (BOOL)(((type) & GOPHER_TYPE_REDUNDANT) ? TRUE : FALSE) -#define IS_GOPHER_TN3270_SESSION(type) (BOOL)(((type) & GOPHER_TYPE_TN3270) ? TRUE : FALSE) -#define IS_GOPHER_ASK(type) (BOOL)(((type) & GOPHER_TYPE_ASK) ? TRUE : FALSE) -#define IS_GOPHER_PLUS(type) (BOOL)(((type) & GOPHER_TYPE_GOPHER_PLUS) ? TRUE : FALSE) -#define IS_GOPHER_TYPE_KNOWN(type) (BOOL)(((type) & GOPHER_TYPE_UNKNOWN) ? FALSE : TRUE) +#define IS_GOPHER_FILE(type) (BOOL)(((type) & GOPHER_TYPE_FILE_MASK) != 0) +#define IS_GOPHER_DIRECTORY(type) (BOOL)(((type) & GOPHER_TYPE_DIRECTORY) != 0) +#define IS_GOPHER_PHONE_SERVER(type) (BOOL)(((type) & GOPHER_TYPE_CSO) != 0) +#define IS_GOPHER_ERROR(type) (BOOL)(((type) & GOPHER_TYPE_ERROR) != 0) +#define IS_GOPHER_INDEX_SERVER(type) (BOOL)(((type) & GOPHER_TYPE_INDEX_SERVER) != 0) +#define IS_GOPHER_TELNET_SESSION(type) (BOOL)(((type) & GOPHER_TYPE_TELNET) != 0) +#define IS_GOPHER_BACKUP_SERVER(type) (BOOL)(((type) & GOPHER_TYPE_REDUNDANT) != 0) +#define IS_GOPHER_TN3270_SESSION(type) (BOOL)(((type) & GOPHER_TYPE_TN3270) != 0) +#define IS_GOPHER_ASK(type) (BOOL)(((type) & GOPHER_TYPE_ASK) != 0) +#define IS_GOPHER_PLUS(type) (BOOL)(((type) & GOPHER_TYPE_GOPHER_PLUS) != 0) +#define IS_GOPHER_TYPE_KNOWN(type) (BOOL)(!((type) & GOPHER_TYPE_UNKNOWN)) #define GOPHER_TYPE_FILE_MASK (GOPHER_TYPE_TEXT_FILE \ | GOPHER_TYPE_MAC_BINHEX \ | GOPHER_TYPE_DOS_ARCHIVE \

1 0

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

13 Aug '12

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 13 Aug '12

13 Aug '12

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: Get rid of two macros.
by Alexandre Julliard 13 Aug '12

13 Aug '12

Module: wine Branch: master Commit: 11d35ef8e72ef5cfb676fb57d0c102f79bec7347 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11d35ef8e72ef5cfb676fb57d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 8 20:58:35 2012 +0200 comctl32: Get rid of two macros. --- dlls/comctl32/toolbar.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index cd19a58..382161c 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -217,9 +217,6 @@ typedef enum #define TOOLBAR_NOWHERE (-1) -#define TOOLBAR_HasText(x, y) (TOOLBAR_GetText(x, y) ? TRUE : FALSE) -#define TOOLBAR_HasDropDownArrows(exStyle) ((exStyle & TBSTYLE_EX_DRAWDDARROWS) ? TRUE : FALSE) - /* Used to find undocumented extended styles */ #define TBSTYLE_EX_ALL (TBSTYLE_EX_DRAWDDARROWS | \ TBSTYLE_EX_UNDOC1 | \ @@ -258,6 +255,11 @@ static inline int default_top_margin(const TOOLBAR_INFO *infoPtr) return (infoPtr->dwStyle & TBSTYLE_FLAT ? 0 : TOP_BORDER); } +static inline BOOL TOOLBAR_HasDropDownArrows(DWORD exStyle) +{ + return (exStyle & TBSTYLE_EX_DRAWDDARROWS) != 0; +} + static LPWSTR TOOLBAR_GetText(const TOOLBAR_INFO *infoPtr, const TBUTTON_INFO *btnPtr) { @@ -1247,7 +1249,7 @@ TOOLBAR_CalcStrings (const TOOLBAR_INFO *infoPtr, LPSIZE lpSize) btnPtr = infoPtr->buttons; for (i = 0; i < infoPtr->nNumButtons; i++, btnPtr++) { - if(TOOLBAR_HasText(infoPtr, btnPtr)) + if(TOOLBAR_GetText(infoPtr, btnPtr)) { TOOLBAR_MeasureString(infoPtr, btnPtr, hdc, &sz); if (sz.cx > lpSize->cx)

1 0

Michael Stefaniuc : comctl32: Avoid TRUE:FALSE conditional expressions.
by Alexandre Julliard 13 Aug '12

13 Aug '12

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 : comdlg32: Avoid TRUE:FALSE conditional expressions.
by Alexandre Julliard 13 Aug '12

13 Aug '12

Module: wine Branch: master Commit: df158e43791c935f09322ae8dc763e97a2dc59a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df158e43791c935f09322ae8d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 8 21:01:59 2012 +0200 comdlg32: Avoid TRUE:FALSE conditional expressions. --- dlls/comdlg32/filedlg31.c | 2 +- dlls/comdlg32/printdlg.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/filedlg31.c b/dlls/comdlg32/filedlg31.c index b3d1c51..3feb106 100644 --- a/dlls/comdlg32/filedlg31.c +++ b/dlls/comdlg32/filedlg31.c @@ -492,7 +492,7 @@ static LRESULT FD31_TestPath( const FD31_DATA *lfs, LPWSTR path ) TRACE("path=%s, tmpstr2=%s\n", debugstr_w(path), debugstr_w(tmpstr2)); SetDlgItemTextW( hWnd, edt1, tmpstr2 ); FD31_ScanDir(lfs->ofnW, hWnd, path); - return (lfs->ofnW->Flags & OFN_NOVALIDATE) ? TRUE : FALSE; + return (lfs->ofnW->Flags & OFN_NOVALIDATE) != 0; } /* no wildcards, we might have a directory or a filename */ diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 57b077b..2d80fd5 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2190,7 +2190,7 @@ static BOOL PRINTDLG_CreateDCA(LPPRINTDLGA lppd) } GlobalUnlock(lppd->hDevNames); GlobalUnlock(lppd->hDevMode); - return lppd->hDC ? TRUE : FALSE; + return lppd->hDC != NULL; } static BOOL PRINTDLG_CreateDCW(LPPRINTDLGW lppd) @@ -2211,7 +2211,7 @@ static BOOL PRINTDLG_CreateDCW(LPPRINTDLGW lppd) } GlobalUnlock(lppd->hDevNames); GlobalUnlock(lppd->hDevMode); - return lppd->hDC ? TRUE : FALSE; + return lppd->hDC != NULL; } /***********************************************************************

1 0

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

13 Aug '12

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 : gdi32: Avoid TRUE:FALSE conditional expressions.
by Alexandre Julliard 13 Aug '12

13 Aug '12

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

Michael Stefaniuc : jscript: Avoid FALSE:TRUE conditional expressions.
by Alexandre Julliard 13 Aug '12

13 Aug '12

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 : msvcp60: Avoid FALSE:TRUE conditional expressions.
by Alexandre Julliard 13 Aug '12

13 Aug '12

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