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

Michael Stefaniuc : ntdll: Avoid TRUE:FALSE conditional expressions.
by Alexandre Julliard Aug. 14, 2012

Aug. 14, 2012

Module: wine Branch: master Commit: abef6ab366ad0fb45379322fc2a95cab3f065b62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abef6ab366ad0fb45379322fc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 9 09:32:54 2012 +0200 ntdll: Avoid TRUE:FALSE conditional expressions. --- dlls/ntdll/nt.c | 4 ++-- dlls/ntdll/printf.c | 6 +++--- dlls/ntdll/rtlbitmap.c | 2 +- dlls/ntdll/threadpool.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 775b6f1..7b161e5 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -610,7 +610,7 @@ NTSTATUS WINAPI NtPrivilegeCheck( SERVER_START_REQ( check_token_privileges ) { req->handle = wine_server_obj_handle( ClientToken ); - req->all_required = ((RequiredPrivileges->Control & PRIVILEGE_SET_ALL_NECESSARY) ? TRUE : FALSE); + req->all_required = (RequiredPrivileges->Control & PRIVILEGE_SET_ALL_NECESSARY) != 0; wine_server_add_data( req, RequiredPrivileges->Privilege, RequiredPrivileges->PrivilegeCount * sizeof(RequiredPrivileges->Privilege[0]) ); wine_server_set_reply( req, RequiredPrivileges->Privilege, @@ -619,7 +619,7 @@ NTSTATUS WINAPI NtPrivilegeCheck( status = wine_server_call( req ); if (status == STATUS_SUCCESS) - *Result = (reply->has_privileges ? TRUE : FALSE); + *Result = reply->has_privileges != 0; } SERVER_END_REQ; return status; diff --git a/dlls/ntdll/printf.c b/dlls/ntdll/printf.c index 1aca399..432920b 100644 --- a/dlls/ntdll/printf.c +++ b/dlls/ntdll/printf.c @@ -244,7 +244,7 @@ static inline BOOL pf_is_integer_format( char fmt ) static const char float_fmts[] = "diouxX"; if (!fmt) return FALSE; - return strchr( float_fmts, fmt ) ? TRUE : FALSE; + return strchr( float_fmts, fmt ) != 0; } static inline BOOL pf_is_double_format( char fmt ) @@ -252,7 +252,7 @@ static inline BOOL pf_is_double_format( char fmt ) static const char float_fmts[] = "aeEfgG"; if (!fmt) return FALSE; - return strchr( float_fmts, fmt ) ? TRUE : FALSE; + return strchr( float_fmts, fmt ) != 0; } static inline BOOL pf_is_valid_format( char fmt ) @@ -260,7 +260,7 @@ static inline BOOL pf_is_valid_format( char fmt ) static const char float_fmts[] = "acCdeEfgGinouxX"; if (!fmt) return FALSE; - return strchr( float_fmts, fmt ) ? TRUE : FALSE; + return strchr( float_fmts, fmt ) != 0; } static void pf_rebuild_format_string( char *p, pf_flags *flags ) diff --git a/dlls/ntdll/rtlbitmap.c b/dlls/ntdll/rtlbitmap.c index 806e0e8..20d6a02 100644 --- a/dlls/ntdll/rtlbitmap.c +++ b/dlls/ntdll/rtlbitmap.c @@ -956,7 +956,7 @@ static ULONG NTDLL_FindRuns(PCRTL_BITMAP lpBits, PRTL_BITMAP_RUN lpSeries, ULONG ulCount, BOOLEAN bLongest, ULONG (*fn)(PCRTL_BITMAP,ULONG,PULONG)) { - BOOL bNeedSort = ulCount > 1 ? TRUE : FALSE; + BOOL bNeedSort = ulCount > 1; ULONG ulPos = 0, ulRuns = 0; TRACE("(%p,%p,%d,%d)\n", lpBits, lpSeries, ulCount, bLongest); diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index ef61ad0..bd6e06b 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -344,7 +344,7 @@ static DWORD CALLBACK wait_thread_proc(LPVOID Arg) { struct wait_work_item *wait_work_item = Arg; NTSTATUS status; - BOOLEAN alertable = (wait_work_item->Flags & WT_EXECUTEINIOTHREAD) ? TRUE : FALSE; + BOOLEAN alertable = (wait_work_item->Flags & WT_EXECUTEINIOTHREAD) != 0; HANDLE handles[2] = { wait_work_item->Object, wait_work_item->CancelEvent }; LARGE_INTEGER timeout; HANDLE completion_event;

1 0

Lucas Zawacki : dinput: Semi-stub for IDirectInputJoyConfig8_GetConfig.
by Alexandre Julliard Aug. 14, 2012

Aug. 14, 2012

Module: wine Branch: master Commit: e8f808a6070d2ddbe030907cff684befdd40783e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8f808a6070d2ddbe030907cf… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Mon Aug 13 20:36:56 2012 -0300 dinput: Semi-stub for IDirectInputJoyConfig8_GetConfig. --- dlls/dinput/dinput_main.c | 40 ++++++++++++++++++++++++++++++++++++++-- dlls/dinput/tests/dinput.c | 4 ++-- 2 files changed, 40 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 46b7e08..63ff439 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1142,8 +1142,44 @@ static HRESULT WINAPI JoyConfig8Impl_DeleteType(IDirectInputJoyConfig8 *iface, L static HRESULT WINAPI JoyConfig8Impl_GetConfig(IDirectInputJoyConfig8 *iface, UINT id, LPDIJOYCONFIG info, DWORD flags) { - FIXME( "(%p)->(%d, %p, 0x%08x): stub!\n", iface, id, info, flags ); - return E_NOTIMPL; + IDirectInputImpl *di = impl_from_IDirectInputJoyConfig8(iface); + UINT found = 0; + int i, j, r; + + FIXME("(%p)->(%d, %p, 0x%08x): semi-stub!\n", iface, id, info, flags); + +#define X(x) if (flags & x) FIXME("\tflags |= "#x"\n"); + X(DIJC_GUIDINSTANCE) + X(DIJC_REGHWCONFIGTYPE) + X(DIJC_GAIN) + X(DIJC_CALLOUT) +#undef X + + /* Enumerate all joysticks in order */ + for (i = 0; i < NB_DINPUT_DEVICES; i++) + { + if (!dinput_devices[i]->enum_deviceA) continue; + + for (j = 0, r = -1; r != 0; j++) + { + DIDEVICEINSTANCEA dev; + dev.dwSize = sizeof(dev); + if ((r = dinput_devices[i]->enum_deviceA(DI8DEVCLASS_GAMECTRL, 0, &dev, di->dwVersion, j))) + { + /* Only take into account the chosen id */ + if (found == id) + { + if (flags & DIJC_GUIDINSTANCE) + info->guidInstance = dev.guidInstance; + + return DI_OK; + } + found += 1; + } + } + } + + return DIERR_NOMOREITEMS; } static HRESULT WINAPI JoyConfig8Impl_SetConfig(IDirectInputJoyConfig8 *iface, UINT id, LPCDIJOYCONFIG info, DWORD flags) diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c index c5386d6..cc28985 100644 --- a/dlls/dinput/tests/dinput.c +++ b/dlls/dinput/tests/dinput.c @@ -595,11 +595,11 @@ static void test_DirectInputJoyConfig8(void) { hr = IDirectInputJoyConfig8_GetConfig(pDIJC, i, &info, DIJC_GUIDINSTANCE); - todo_wine ok (hr == DI_OK || hr == DIERR_NOMOREITEMS, + ok (hr == DI_OK || hr == DIERR_NOMOREITEMS, "IDirectInputJoyConfig8_GetConfig returned 0x%08x\n", hr); if (SUCCEEDED(hr)) - todo_wine ok (SUCCEEDED(IDirectInput_CreateDevice(pDI, &info.guidInstance, &pDID, NULL)), + ok (SUCCEEDED(IDirectInput_CreateDevice(pDI, &info.guidInstance, &pDID, NULL)), "IDirectInput_CreateDevice failed with guid from GetConfig hr = 0x%08x\n", hr); }

1 0

Detlef Riekenberg : d3dx9_36/tests: Fix failures on vista x64.
by Alexandre Julliard Aug. 14, 2012

Aug. 14, 2012

Module: wine Branch: master Commit: feea4592388925bb80711fb5728035f76669179c URL: http://source.winehq.org/git/wine.git/?a=commit;h=feea4592388925bb80711fb57… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Aug 6 00:41:45 2012 +0200 d3dx9_36/tests: Fix failures on vista x64. --- dlls/d3dx9_36/tests/math.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index d1bcfcf..84eaae9 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2290,7 +2290,7 @@ static void test_D3DXFloat_Array(void) { FLOAT single_in; - /* half_ver2 occurs on WXPPROSP3 (32 bit math), WVISTAADM (32 bit math), W7PRO (32 bit math) */ + /* half_ver2 occurs on WXPPROSP3 (32 bit math), WVISTAADM (32/64 bit math), W7PRO (32 bit math) */ WORD half_ver1, half_ver2; /* single_out_ver2 confirms that half -> single conversion is consistent across platforms */ @@ -2314,15 +2314,15 @@ static void test_D3DXFloat_Array(void) { -65536.0f, 0xfc00, 0xfc00, -65536.0f, -65536.0f }, { 1.0f/z, 0x7c00, 0x7fff, 65536.0f, 131008.0f }, { -1.0f/z, 0xffff, 0xffff, -131008.0f, -131008.0f }, - { nan, 0x7fff, 0x7fff, 131008.0f, 131008.0f }, + { nan, 0x7fff, 0xffff, 131008.0f, -131008.0f }, { nnan, 0xffff, 0xffff, -131008.0f, -131008.0f }, { 0.0f, 0x0, 0x0, 0.0f, 0.0f }, { -0.0f, 0x8000, 0x8000, 0.0f, 0.0f }, { 2.9809595e-08f, 0x0, 0x0, 0.0f, 0.0f }, { -2.9809595e-08f, 0x8000, 0x8000, -0.0f, -0.0f }, - { 2.9809598e-08f, 0x1, 0x1, 5.96046e-08f, 5.96046e-08f }, - { -2.9809598e-08f, 0x8001, 0x8001, -5.96046e-08f, -5.96046e-08f }, - { 8.9406967e-08f, 0x2, 0x2, 1.19209e-07f, 1.19209e-07f } + { 2.9809598e-08f, 0x1, 0x0, 5.96046e-08f, 5.96046e-08f }, + { -2.9809598e-08f, 0x8001, 0x8000, -5.96046e-08f, -5.96046e-08f }, + { 8.9406967e-08f, 0x2, 0x1, 1.19209e-07f, 5.96046e-008 } }; /* exception on NULL out or in parameter */

1 0

Detlef Riekenberg : wintrust/tests: Handle ERROR_ACCESS_DENIED failures.
by Alexandre Julliard Aug. 14, 2012

Aug. 14, 2012

Module: wine Branch: master Commit: fbc735bef7af9b6db29b3e30459218cec3c17b99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbc735bef7af9b6db29b3e304… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Aug 7 00:12:16 2012 +0200 wintrust/tests: Handle ERROR_ACCESS_DENIED failures. --- dlls/wintrust/tests/crypt.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index d6672ea..ec12332 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -558,6 +558,11 @@ static void test_CryptCATAdminAddRemoveCatalog(void) /* Unique name will be created */ hcatinfo = pCryptCATAdminAddCatalog(hcatadmin, tmpfileW, NULL, 0); + if (!hcatinfo && (GetLastError() == ERROR_ACCESS_DENIED)) + { + win_skip("Not enough rights\n"); + goto cleanup; + } todo_wine ok(hcatinfo != NULL, "CryptCATAdminAddCatalog failed %u\n", GetLastError()); info.cbStruct = sizeof(info); @@ -620,6 +625,7 @@ static void test_CryptCATAdminAddRemoveCatalog(void) attrs = GetFileAttributes(catfilepath); ok(attrs == INVALID_FILE_ATTRIBUTES, "Expected %s to be removed\n", catfilepath); +cleanup: ret = pCryptCATAdminReleaseContext(hcatadmin, 0); ok(ret, "CryptCATAdminReleaseContext failed %u\n", GetLastError());

1 0

Piotr Caban : msvcp: Rename msvcp90 debug channel.
by Alexandre Julliard Aug. 14, 2012

Aug. 14, 2012

Module: wine Branch: master Commit: 7a0c6f44efd375ccd2cb2a6d817d46eb8c25c701 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a0c6f44efd375ccd2cb2a6d8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 14 10:51:34 2012 +0200 msvcp: Rename msvcp90 debug channel. --- dlls/msvcp60/exception.c | 2 +- dlls/msvcp60/main.c | 2 +- dlls/msvcp60/string.c | 2 +- dlls/msvcp90/exception.c | 2 +- dlls/msvcp90/ios.c | 2 +- dlls/msvcp90/locale.c | 2 +- dlls/msvcp90/misc.c | 2 +- dlls/msvcp90/msvcp90_main.c | 2 +- dlls/msvcp90/string.c | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/msvcp60/exception.c b/dlls/msvcp60/exception.c index 0b464f8..e85463d 100644 --- a/dlls/msvcp60/exception.c +++ b/dlls/msvcp60/exception.c @@ -25,7 +25,7 @@ #include "windef.h" #include "winbase.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msvcp90); +WINE_DEFAULT_DEBUG_CHANNEL(msvcp); /* dlls/msvcrt/cppexcept.h */ typedef void (*cxx_copy_ctor)(void); diff --git a/dlls/msvcp60/main.c b/dlls/msvcp60/main.c index f848a30..a979528 100644 --- a/dlls/msvcp60/main.c +++ b/dlls/msvcp60/main.c @@ -26,7 +26,7 @@ #include "winbase.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msvcp90); +WINE_DEFAULT_DEBUG_CHANNEL(msvcp); #ifdef __i386__ diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c index cac9596..2553e5b 100644 --- a/dlls/msvcp60/string.c +++ b/dlls/msvcp60/string.c @@ -27,7 +27,7 @@ #include "windef.h" #include "winbase.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msvcp90); +WINE_DEFAULT_DEBUG_CHANNEL(msvcp); #define FROZEN 255 diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 7f2dbe8..da952d4 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -25,7 +25,7 @@ #include "windef.h" #include "winbase.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msvcp90); +WINE_DEFAULT_DEBUG_CHANNEL(msvcp); /* dlls/msvcrt/cppexcept.h */ typedef void (*cxx_copy_ctor)(void); diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 8592f18..e99bba2 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -27,7 +27,7 @@ #include "windef.h" #include "winbase.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msvcp90); +WINE_DEFAULT_DEBUG_CHANNEL(msvcp); /* ?_Index(a)ios_base@std@@0HA */ int ios_base_Index = 0; diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 9cbf72c..935d381 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -34,7 +34,7 @@ #include "winnls.h" #include "wine/unicode.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msvcp90); +WINE_DEFAULT_DEBUG_CHANNEL(msvcp); char* __cdecl _Getdays(void); char* __cdecl _Getmonths(void); diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 122c7fa..c8c4122 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -26,7 +26,7 @@ #include "windef.h" #include "winbase.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msvcp90); +WINE_DEFAULT_DEBUG_CHANNEL(msvcp); /* ??0_Mutex(a)std@@QAE(a)XZ */ /* ??0_Mutex(a)std@@QEAA(a)XZ */ diff --git a/dlls/msvcp90/msvcp90_main.c b/dlls/msvcp90/msvcp90_main.c index a7dc864..18a2514 100644 --- a/dlls/msvcp90/msvcp90_main.c +++ b/dlls/msvcp90/msvcp90_main.c @@ -26,7 +26,7 @@ #include "winbase.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msvcp90); +WINE_DEFAULT_DEBUG_CHANNEL(msvcp); #ifdef __i386__ diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index d9afe3d..63ef466 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -27,7 +27,7 @@ #include "windef.h" #include "winbase.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msvcp90); +WINE_DEFAULT_DEBUG_CHANNEL(msvcp); /* _String_iterator<char> and _String_const_iterator<char> class */ typedef struct {

1 0

Detlef Riekenberg : mshtml/tests: Mark IE6 behavior as broken.
by Alexandre Julliard Aug. 14, 2012

Aug. 14, 2012

Module: wine Branch: master Commit: be1ca2839878f7d64b60e9fa4400ccd429da1506 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be1ca2839878f7d64b60e9fa4… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Aug 5 20:58:37 2012 +0200 mshtml/tests: Mark IE6 behavior as broken. --- dlls/mshtml/tests/htmldoc.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 1b6df58..4de1998 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -4985,7 +4985,7 @@ static void test_Load(IPersistMoniker *persist, IMoniker *mon) }else { todo_wine CHECK_CALLED(GetTravelLog); } - CHECK_CALLED(Exec_ShellDocView_84); + CHECK_CALLED_BROKEN(Exec_ShellDocView_84); todo_wine CHECK_CALLED(GetPendingUrl); set_clientsite = container_locked = TRUE; @@ -5117,7 +5117,7 @@ static void test_download(DWORD flags) CHECK_CALLED(OnViewChange); CLEAR_CALLED(GetDropTarget); if((flags & DWL_TRYCSS) && !(flags & DWL_EMPTY)) - todo_wine CHECK_CALLED(Exec_ShellDocView_84); + todo_wine CHECK_CALLED_BROKEN(Exec_ShellDocView_84); if(flags & DWL_CSS) { CHECK_CALLED(CreateInstance); CHECK_CALLED(Start); @@ -5296,7 +5296,7 @@ static void test_put_href(IHTMLDocument2 *doc, BOOL use_replace, const char *hre CHECK_CALLED(Invoke_AMBIENT_SILENT); CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); CHECK_CALLED(Exec_ShellDocView_63); - CHECK_CALLED(Exec_ShellDocView_84); + CHECK_CALLED_BROKEN(Exec_ShellDocView_84); }else { CHECK_CALLED(FireNavigateComplete2); CHECK_CALLED(FireDocumentComplete); @@ -5361,7 +5361,7 @@ static void test_put_href(IHTMLDocument2 *doc, BOOL use_replace, const char *hre CHECK_CALLED(Invoke_AMBIENT_SILENT); CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); CHECK_CALLED(Exec_ShellDocView_63); - CHECK_CALLED(Exec_ShellDocView_84); + CHECK_CALLED_BROKEN(Exec_ShellDocView_84); } if(doc_mon) { @@ -5732,7 +5732,7 @@ static void test_exec_editmode(IUnknown *unk, BOOL loaded) CHECK_CALLED(OnChanged_READYSTATE); CHECK_CALLED(Invoke_OnReadyStateChange_Loading); CLEAR_CALLED(IsSystemMoniker); /* IE7 */ - CHECK_CALLED(Exec_ShellDocView_84); + CHECK_CALLED_BROKEN(Exec_ShellDocView_84); if(loaded) CHECK_CALLED(BindToStorage); CHECK_CALLED(InPlaceUIWindow_SetActiveObject); @@ -5966,7 +5966,7 @@ static void test_ClientSite(IOleObject *oleobj, DWORD flags) CLEAR_CALLED(Invoke_AMBIENT_PALETTE); /* not called on IE9 */ CLEAR_CALLED(GetOverrideKeyPath); /* Called by IE9 */ todo_wine CHECK_CALLED(GetTravelLog); - CHECK_CALLED(Exec_ShellDocView_84); + CHECK_CALLED_BROKEN(Exec_ShellDocView_84); set_clientsite = TRUE; } @@ -7226,7 +7226,7 @@ static void test_UIActivate(BOOL do_load, BOOL use_ipsex, BOOL use_ipsw) CHECK_CALLED(Exec_SETPROGRESSMAX); CHECK_CALLED(Exec_SETPROGRESSPOS); todo_wine CHECK_CALLED(GetTravelLog); - CHECK_CALLED(Exec_ShellDocView_84); + CHECK_CALLED_BROKEN(Exec_ShellDocView_84); hres = IOleDocumentView_GetInPlaceSite(view, &inplacesite); ok(hres == S_OK, "GetInPlaceSite failed: %08x\n", hres);

1 0

Michael Stefaniuc : iexplore: Avoid a TRUE:FALSE conditional expression.
by Alexandre Julliard Aug. 14, 2012

Aug. 14, 2012

Module: wine Branch: master Commit: d45070d48faf4a0e1d88c46734b8f584156c6195 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d45070d48faf4a0e1d88c4673… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Aug 13 11:44:06 2012 +0200 iexplore: Avoid a TRUE:FALSE conditional expression. --- dlls/ieframe/iexplore.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index 00150a4..6c66aef 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -363,7 +363,7 @@ static INT_PTR CALLBACK ie_dialog_open_proc(HWND hwnd, UINT msg, WPARAM wparam, HWND hwndurl = GetDlgItem(hwnd, IDC_BROWSE_OPEN_URL); int len = GetWindowTextLengthW(hwndurl); - EnableWindow(GetDlgItem(hwnd, IDOK), len ? TRUE : FALSE); + EnableWindow(GetDlgItem(hwnd, IDOK), len != 0); break; } case IDOK:

1 0

Michael Stefaniuc : hlink: Avoid a TRUE:FALSE conditional expression.
by Alexandre Julliard Aug. 14, 2012

Aug. 14, 2012

Module: wine Branch: master Commit: 7c365e35abe511ece54a0963251afcb6648e8af1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c365e35abe511ece54a09632… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Aug 13 11:44:12 2012 +0200 hlink: Avoid a TRUE:FALSE conditional expression. --- dlls/hlink/link.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/hlink/link.c b/dlls/hlink/link.c index 72e792b..97164eb 100644 --- a/dlls/hlink/link.c +++ b/dlls/hlink/link.c @@ -797,7 +797,7 @@ static HRESULT WINAPI IPersistStream_fnLoad(IPersistStream* iface, r = OleLoadFromStream(pStm, &IID_IMoniker, (LPVOID*)&(This->Moniker)); if (FAILED(r)) goto end; - This->absolute = hdr[1] & HLINK_SAVE_MONIKER_IS_ABSOLUTE ? TRUE : FALSE; + This->absolute = (hdr[1] & HLINK_SAVE_MONIKER_IS_ABSOLUTE) != 0; } if (hdr[1] & HLINK_SAVE_LOCATION_PRESENT)

1 0

Michael Stefaniuc : shell32: Avoid TRUE:FALSE conditional expressions.
by Alexandre Julliard Aug. 14, 2012

Aug. 14, 2012

Module: wine Branch: master Commit: 563d229b5f5135ef9a200bbacceca4c342132c50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=563d229b5f5135ef9a200bbac… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Aug 13 11:42:29 2012 +0200 shell32: Avoid TRUE:FALSE conditional expressions. --- dlls/shell32/brsfolder.c | 2 +- dlls/shell32/pidl.c | 2 +- dlls/shell32/shellpath.c | 16 ++++------------ dlls/shell32/shfldr_fs.c | 5 +---- dlls/shell32/shlview.c | 6 +++--- 5 files changed, 10 insertions(+), 21 deletions(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index 589ba72..3200051 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -1024,7 +1024,7 @@ static INT_PTR CALLBACK BrsFolderDlgProc( HWND hWnd, UINT msg, WPARAM wParam, case BFFM_ENABLEOK: TRACE("Enable %ld\n", lParam); - EnableWindow(GetDlgItem(hWnd, 1), (lParam)?TRUE:FALSE); + EnableWindow(GetDlgItem(hWnd, 1), lParam != 0); break; case BFFM_SETOKTEXT: /* unicode only */ diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index 2130b49..58b8104 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1814,7 +1814,7 @@ BOOL _ILIsDesktop(LPCITEMIDLIST pidl) { TRACE("(%p)\n",pidl); - return pidl && pidl->mkid.cb ? FALSE : TRUE; + return !pidl || !pidl->mkid.cb; } BOOL _ILIsMyComputer(LPCITEMIDLIST pidl) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 800019f..41730ea 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -2855,12 +2855,8 @@ BOOL WINAPI SHGetSpecialFolderPathA ( int nFolder, BOOL bCreate) { - return (SHGetFolderPathA( - hwndOwner, - nFolder + (bCreate ? CSIDL_FLAG_CREATE : 0), - NULL, - 0, - szPath)) == S_OK ? TRUE : FALSE; + return SHGetFolderPathA(hwndOwner, nFolder + (bCreate ? CSIDL_FLAG_CREATE : 0), NULL, 0, + szPath) == S_OK; } /************************************************************************* @@ -2872,12 +2868,8 @@ BOOL WINAPI SHGetSpecialFolderPathW ( int nFolder, BOOL bCreate) { - return (SHGetFolderPathW( - hwndOwner, - nFolder + (bCreate ? CSIDL_FLAG_CREATE : 0), - NULL, - 0, - szPath)) == S_OK ? TRUE : FALSE; + return SHGetFolderPathW(hwndOwner, nFolder + (bCreate ? CSIDL_FLAG_CREATE : 0), NULL, 0, + szPath) == S_OK; } /************************************************************************* diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index e724b07..8439da1 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -1705,10 +1705,7 @@ ISFDropTarget_DragEnter (IDropTarget * iface, IDataObject * pDataObject, TRACE ("(%p)->(DataObject=%p)\n", This, pDataObject); InitFormatEtc (fmt, This->cfShellIDList, TYMED_HGLOBAL); - - This->fAcceptFmt = (S_OK == IDataObject_QueryGetData (pDataObject, &fmt)) ? - TRUE : FALSE; - + This->fAcceptFmt = IDataObject_QueryGetData (pDataObject, &fmt) == S_OK; ISFDropTarget_QueryDrop (iface, dwKeyState, pdwEffect); return S_OK; diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index efd6e0f..4f488ca 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -290,9 +290,9 @@ static void CheckToolbar(IShellViewImpl * This) if (IsInCommDlg(This)) { IShellBrowser_SendControlMsg(This->pShellBrowser, FCW_TOOLBAR, TB_CHECKBUTTON, - FCIDM_TB_SMALLICON, (This->FolderSettings.ViewMode==FVM_LIST)? TRUE : FALSE, &result); + FCIDM_TB_SMALLICON, This->FolderSettings.ViewMode == FVM_LIST, &result); IShellBrowser_SendControlMsg(This->pShellBrowser, FCW_TOOLBAR, TB_CHECKBUTTON, - FCIDM_TB_REPORTVIEW, (This->FolderSettings.ViewMode==FVM_DETAILS)? TRUE : FALSE, &result); + FCIDM_TB_REPORTVIEW, This->FolderSettings.ViewMode == FVM_DETAILS, &result); IShellBrowser_SendControlMsg(This->pShellBrowser, FCW_TOOLBAR, TB_ENABLEBUTTON, FCIDM_TB_SMALLICON, TRUE, &result); IShellBrowser_SendControlMsg(This->pShellBrowser, FCW_TOOLBAR, TB_ENABLEBUTTON, @@ -606,7 +606,7 @@ static BOOLEAN LV_AddItem(IShellViewImpl * This, LPCITEMIDLIST pidl) lvItem.lParam = (LPARAM) ILClone(ILFindLastID(pidl)); /*set the item's data*/ lvItem.pszText = LPSTR_TEXTCALLBACKW; /*get text on a callback basis*/ lvItem.iImage = I_IMAGECALLBACK; /*get the image on a callback basis*/ - return (-1==ListView_InsertItemW(This->hWndList, &lvItem))? FALSE: TRUE; + return ListView_InsertItemW(This->hWndList, &lvItem) != -1; } /**********************************************************

1 0

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

Aug. 13, 2012

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