winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
July
June
May
April
March
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
August 2012
----- 2025 -----
July 2025
June 2025
May 2025
April 2025
March 2025
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
541 discussions
Start a n
N
ew thread
Michael Stefaniuc : dsound: Avoid a TRUE:FALSE conditional expression.
by Alexandre Julliard
14 Aug '12
14 Aug '12
Module: wine Branch: master Commit: b18bc659d63e32c9d14fffe004416beab73293d5 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b18bc659d63e32c9d14fffe00…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Aug 13 11:43:59 2012 +0200 dsound: Avoid a TRUE:FALSE conditional expression. --- dlls/dsound/buffer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index caf1f86..cf4d2ec 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -141,7 +141,7 @@ static inline IDirectSoundBufferImpl *impl_from_IDirectSoundBuffer8(IDirectSound static inline BOOL is_primary_buffer(IDirectSoundBufferImpl *This) { - return This->dsbd.dwFlags & DSBCAPS_PRIMARYBUFFER ? TRUE : FALSE; + return (This->dsbd.dwFlags & DSBCAPS_PRIMARYBUFFER) != 0; } static HRESULT WINAPI IDirectSoundBufferImpl_SetFormat(IDirectSoundBuffer8 *iface,
1
0
0
0
Michael Stefaniuc : shell32: Avoid TRUE:FALSE conditional expressions.
by Alexandre Julliard
14 Aug '12
14 Aug '12
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
0
0
Michael Stefaniuc : setupapi: Avoid TRUE:FALSE conditional expressions.
by Alexandre Julliard
14 Aug '12
14 Aug '12
Module: wine Branch: master Commit: 4d28aedaf8180e9eddaf3cfb23c7eec333eb2fa5 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4d28aedaf8180e9eddaf3cfb2…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 9 09:34:54 2012 +0200 setupapi: Avoid TRUE:FALSE conditional expressions. --- dlls/setupapi/setupcab.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c index 156f20c..ea1bc99 100644 --- a/dlls/setupapi/setupcab.c +++ b/dlls/setupapi/setupcab.c @@ -194,7 +194,7 @@ static INT_PTR CDECL sc_cb_open(char *pszFile, int oflag, int pmode) sa.nLength = sizeof( SECURITY_ATTRIBUTES ); sa.lpSecurityDescriptor = NULL; - sa.bInheritHandle = (ioflag & _O_NOINHERIT) ? FALSE : TRUE; + sa.bInheritHandle = !(ioflag & _O_NOINHERIT); ret = (INT_PTR) CreateFileA(pszFile, ioflag, sharing, &sa, creation, FILE_ATTRIBUTE_NORMAL, NULL); @@ -604,8 +604,7 @@ BOOL WINAPI SetupIterateCabinetA(PCSTR CabinetFile, DWORD Reserved, if (!my_hsc.hfdi) return FALSE; - ret = ( sc_FDICopy(my_hsc.hfdi, pszCabinet, pszCabPath, - 0, sc_FNNOTIFY_A, NULL, &my_hsc) ) ? TRUE : FALSE; + ret = sc_FDICopy(my_hsc.hfdi, pszCabinet, pszCabPath, 0, sc_FNNOTIFY_A, NULL, &my_hsc); sc_FDIDestroy(my_hsc.hfdi); return ret; @@ -670,8 +669,7 @@ BOOL WINAPI SetupIterateCabinetW(PCWSTR CabinetFile, DWORD Reserved, if (!my_hsc.hfdi) return FALSE; - ret = ( sc_FDICopy(my_hsc.hfdi, pszCabinet, pszCabPath, - 0, sc_FNNOTIFY_W, NULL, &my_hsc) ) ? TRUE : FALSE; + ret = sc_FDICopy(my_hsc.hfdi, pszCabinet, pszCabPath, 0, sc_FNNOTIFY_W, NULL, &my_hsc); sc_FDIDestroy(my_hsc.hfdi); return ret;
1
0
0
0
Michael Stefaniuc : ntdll: Avoid TRUE:FALSE conditional expressions.
by Alexandre Julliard
14 Aug '12
14 Aug '12
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
0
0
Marek Chmiel : dssenh/tests: Hash tests for the DSSENH cryptographic service provider.
by Alexandre Julliard
14 Aug '12
14 Aug '12
Module: wine Branch: master Commit: 09737c7b8dc3bf02563895e7290729732c9fe1ea URL:
http://source.winehq.org/git/wine.git/?a=commit;h=09737c7b8dc3bf02563895e72…
Author: Marek Chmiel <kcmark(a)gmail.com> Date: Mon Aug 6 12:27:05 2012 -0500 dssenh/tests: Hash tests for the DSSENH cryptographic service provider. --- dlls/dssenh/tests/dssenh.c | 84 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 84 insertions(+), 0 deletions(-) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index 0c37c91..3a5bdef 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -396,8 +396,92 @@ static void test_keylength(void) ok(result, "Expected release of CSP provider.\n"); } +struct hash_test { + ALG_ID algid; + BYTE* input; + DWORD dataLen; + BYTE hash[20]; + DWORD hashLen; +}; + +static const char testHashVal1[] = "I love working with Wine"; +static const char testHashVal2[] = "Wine is not an emulater."; +static const char testHashVal3[] = ""; + +static const struct hash_test hash_data[] = { + {CALG_MD5, (BYTE *)testHashVal1, sizeof(testHashVal1), + {0x4f, 0xf4, 0xd0, 0xdf, 0xe8, 0xf6, 0x6b, 0x1b, + 0x87, 0xea, 0xca, 0x3d, 0xe8, 0x3c, 0xdd, 0xae}, 16}, + {CALG_MD5, (BYTE *)testHashVal2, sizeof(testHashVal2), + {0x80, 0x5c, 0x1c, 0x0e, 0x79, 0x70, 0xd9, 0x38, + 0x04, 0x46, 0x19, 0xbe, 0x38, 0x1f, 0xef, 0xe1}, 16}, + {CALG_MD5, (BYTE *)testHashVal3, sizeof(testHashVal3), + {0x93, 0xb8, 0x85, 0xad, 0xfe, 0x0d, 0xa0, 0x89, + 0xcd, 0xf6, 0x34, 0x90, 0x4f, 0xd5, 0x9f, 0x71}, 16}, + {CALG_SHA, (BYTE *)testHashVal1, sizeof(testHashVal1), + {0x2a, 0xd0, 0xc9, 0x42, 0xfb, 0x73, 0x02, 0x48, 0xbb, 0x5f, + 0xc2, 0xa4, 0x78, 0xdd, 0xe4, 0x3b, 0xfc, 0x76, 0xe9, 0xe2}, 20}, + {CALG_SHA, (BYTE *)testHashVal2, sizeof(testHashVal2), + {0xfd, 0xfc, 0xab, 0x3a, 0xde, 0x33, 0x01, 0x38, 0xfe, 0xbb, + 0xc3, 0x13, 0x84, 0x20, 0x9e, 0x55, 0x94, 0x8d, 0xc6, 0x05}, 20}, + {CALG_SHA, (BYTE *)testHashVal3, sizeof(testHashVal3), + {0x5b, 0xa9, 0x3c, 0x9d, 0xb0, 0xcf, 0xf9, 0x3f, 0x52, 0xb5, + 0x21, 0xd7, 0x42, 0x0e, 0x43, 0xf6, 0xed, 0xa2, 0x78, 0x4f}, 20} +}; + +static void test_hash(const struct hash_test *tests, int testLen) +{ + HCRYPTPROV hProv = 0; + HCRYPTHASH hHash; + BYTE hashValue[36]; + BOOL result; + int i; + + result = CryptAcquireContextA( + &hProv, NULL, MS_ENH_DSS_DH_PROV, PROV_DSS_DH, CRYPT_VERIFYCONTEXT); + if(!result) + { + skip("DSSENH is currently not available, skipping hashing tests.\n"); + return; + } + ok(result, "Expected no errors.\n"); + + for(i = 0; i < testLen; i++) + { + BYTE* data = tests[i].input; + DWORD dataLen = tests[i].dataLen; + DWORD hashLen; + + /* test algid hash */ + result = CryptCreateHash(hProv, tests[i].algid, 0, 0, &hHash); + ok(result, "Expected creation of a hash.\n"); + + result = CryptHashData(hHash, data, dataLen, 0); + ok(result, "Expected data to be added to hash.\n"); + + dataLen = sizeof(DWORD); + result = CryptGetHashParam(hHash, HP_HASHSIZE, (BYTE *)&hashLen, &dataLen, 0); + ok(result && (hashLen == tests[i].hashLen), "Expected %d hash len, got %d.Error: %x\n", + tests[i].hashLen, hashLen, GetLastError()); + + result = CryptGetHashParam(hHash, HP_HASHVAL, hashValue, &hashLen, 0); + ok(result, "Expected hash value return.\n"); + + ok(!memcmp(hashValue, tests[i].hash, tests[i].hashLen), "Incorrect hash output.\n"); + + result = CryptHashData(hHash, data, dataLen, 0); + ok(!result, "Should not be able to add to hash.\n"); + + result = CryptDestroyHash(hHash); + ok(result, "Expected destruction of hash.\n"); + } + result = CryptReleaseContext(hProv, 0); + ok(result, "Expected release of the DSS Enhanced provider.\n"); +} + START_TEST(dssenh) { test_acquire_context(); test_keylength(); + test_hash(hash_data, TESTLEN(hash_data)); }
1
0
0
0
Marek Chmiel : dssenh/tests: Key length tests for the DSSENH cryptographic service provider.
by Alexandre Julliard
14 Aug '12
14 Aug '12
Module: wine Branch: master Commit: 01e937d49a1d0d4aedfeb308951bfa48b29b0ff9 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=01e937d49a1d0d4aedfeb3089…
Author: Marek Chmiel <kcmark(a)gmail.com> Date: Thu Jun 28 21:31:37 2012 -0500 dssenh/tests: Key length tests for the DSSENH cryptographic service provider. --- dlls/dssenh/tests/dssenh.c | 218 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 218 insertions(+), 0 deletions(-) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index 332b865..0c37c91 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -179,7 +179,225 @@ static void test_acquire_context(void) "Expected NTE_EXISTS, got %08x\n", GetLastError()); } +struct keylength_test { + ALG_ID algid; + DWORD flags; + BOOL expectedResult; + DWORD expectedError; + BOOL brokenResult; + DWORD brokenError; +}; + +static const struct keylength_test baseDSS_keylength[] = { + /* AT_KEYEXCHANGE is not supported by the base DSS provider */ + {AT_KEYEXCHANGE, 448 << 16, FALSE, NTE_BAD_ALGID, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {AT_KEYEXCHANGE, 512 << 16, FALSE, NTE_BAD_ALGID, TRUE}, /* success on WinNT4 */ + {AT_KEYEXCHANGE, 1024 << 16, FALSE, NTE_BAD_ALGID, TRUE}, /* success on WinNT4 */ + {AT_KEYEXCHANGE, 1088 << 16, FALSE, NTE_BAD_ALGID, FALSE, NTE_BAD_FLAGS},/* WinNT4 and Win2k */ + /* min 512 max 1024 increment by 64 */ + {AT_SIGNATURE, 448 << 16, FALSE, NTE_BAD_FLAGS}, + {AT_SIGNATURE, 512 << 16, TRUE}, + {AT_SIGNATURE, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {AT_SIGNATURE, 768 << 16, TRUE}, + {AT_SIGNATURE, 1024 << 16, TRUE}, + {AT_SIGNATURE, 1088 << 16, FALSE, NTE_BAD_FLAGS}, + /* CALG_DH_EPHEM is not supported by the base DSS provider */ + {CALG_DH_EPHEM, 448 << 16, FALSE, NTE_BAD_ALGID, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {CALG_DH_EPHEM, 512 << 16, FALSE, NTE_BAD_ALGID, TRUE}, /* success on WinNT4 */ + {CALG_DH_EPHEM, 1024 << 16, FALSE, NTE_BAD_ALGID, TRUE}, /* success on WinNT4 */ + {CALG_DH_EPHEM, 1088 << 16, FALSE, NTE_BAD_ALGID, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + /* CALG_DH_SF is not supported by the base DSS provider */ + {CALG_DH_SF, 448 << 16, FALSE, NTE_BAD_ALGID, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {CALG_DH_SF, 512 << 16, FALSE, NTE_BAD_ALGID, TRUE}, /* success on WinNT4 */ + {CALG_DH_SF, 1024 << 16, FALSE, NTE_BAD_ALGID, TRUE}, /* success on WinNT4 */ + {CALG_DH_SF, 1088 << 16, FALSE, NTE_BAD_ALGID, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + /* min 512 max 1024, increment by 64 */ + {CALG_DSS_SIGN, 448 << 16, FALSE, NTE_BAD_FLAGS}, + {CALG_DSS_SIGN, 512 << 16, TRUE}, + {CALG_DSS_SIGN, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {CALG_DSS_SIGN, 768 << 16, TRUE}, + {CALG_DSS_SIGN, 1024 << 16, TRUE}, + {CALG_DSS_SIGN, 1088 << 16, FALSE, NTE_BAD_FLAGS} +}; + +static const struct keylength_test dssDH_keylength[] = { + /* min 512 max 1024, increment by 64 */ + {AT_KEYEXCHANGE, 448 << 16, FALSE, NTE_BAD_FLAGS}, + {AT_KEYEXCHANGE, 512 << 16, TRUE}, + {AT_KEYEXCHANGE, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {AT_KEYEXCHANGE, 768 << 16, TRUE}, + {AT_KEYEXCHANGE, 1024 << 16, TRUE}, + {AT_KEYEXCHANGE, 1088 << 16, FALSE, NTE_BAD_FLAGS}, + {AT_SIGNATURE, 448 << 16, FALSE, NTE_BAD_FLAGS}, + {AT_SIGNATURE, 512 << 16, TRUE}, + {AT_SIGNATURE, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {AT_SIGNATURE, 768 << 16, TRUE}, + {AT_SIGNATURE, 1024 << 16, TRUE}, + {AT_SIGNATURE, 1088 << 16, FALSE, NTE_BAD_FLAGS}, + {CALG_DH_EPHEM, 448 << 16, FALSE, NTE_BAD_FLAGS}, + {CALG_DH_EPHEM, 512 << 16, TRUE}, + {CALG_DH_EPHEM, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {CALG_DH_EPHEM, 768 << 16, TRUE}, + {CALG_DH_EPHEM, 1024 << 16, TRUE}, + {CALG_DH_EPHEM, 1088 << 16, FALSE, NTE_BAD_FLAGS}, + {CALG_DH_SF, 448 << 16, FALSE, NTE_BAD_FLAGS}, + {CALG_DH_SF, 512 << 16, TRUE}, + {CALG_DH_SF, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {CALG_DH_SF, 768 << 16, TRUE}, + {CALG_DH_SF, 1024 << 16, TRUE}, + {CALG_DH_SF, 1088 << 16, FALSE, NTE_BAD_FLAGS}, + {CALG_DSS_SIGN, 448 << 16, FALSE, NTE_BAD_FLAGS}, + {CALG_DSS_SIGN, 512 << 16, TRUE}, + {CALG_DSS_SIGN, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {CALG_DSS_SIGN, 768 << 16, TRUE}, + {CALG_DSS_SIGN, 1024 << 16, TRUE}, + {CALG_DSS_SIGN, 1088 << 16, FALSE, NTE_BAD_FLAGS} +}; + +static const struct keylength_test dssENH_keylength[] = { + /* min 512 max 1024 (AT_KEYEXCHANGE max 4096), increment by 64*/ + {AT_KEYEXCHANGE, 448 << 16, FALSE, NTE_BAD_FLAGS}, + {AT_KEYEXCHANGE, 512 << 16, TRUE}, + {AT_KEYEXCHANGE, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {AT_KEYEXCHANGE, 768 << 16, TRUE}, + {AT_KEYEXCHANGE, 1024 << 16, TRUE}, + {AT_KEYEXCHANGE, 1088 << 16, TRUE}, + {AT_KEYEXCHANGE, 2048 << 16, TRUE}, + /* Keylength too large - test bot timeout. + {AT_KEYEXCHANGE, 3072 << 16, TRUE}, + {AT_KEYEXCHANGE, 4096 << 16, TRUE}, */ + {AT_KEYEXCHANGE, 4160 << 16, FALSE, NTE_BAD_FLAGS}, + {AT_SIGNATURE, 448 << 16, FALSE, NTE_BAD_FLAGS}, + {AT_SIGNATURE, 512 << 16, TRUE}, + {AT_SIGNATURE, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {AT_SIGNATURE, 768 << 16, TRUE}, + {AT_SIGNATURE, 1024 << 16, TRUE}, + {AT_SIGNATURE, 1032 << 16, FALSE, NTE_BAD_FLAGS}, + {CALG_DH_EPHEM, 448 << 16, FALSE, NTE_BAD_FLAGS}, + {CALG_DH_EPHEM, 512 << 16, TRUE}, + {CALG_DH_EPHEM, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {CALG_DH_EPHEM, 768 << 16, TRUE}, + {CALG_DH_EPHEM, 1024 << 16, TRUE}, + {CALG_DH_EPHEM, 1040 << 16, FALSE, NTE_BAD_FLAGS}, + {CALG_DH_SF, 448 << 16, FALSE, NTE_BAD_FLAGS}, + {CALG_DH_SF, 512 << 16, TRUE}, + {CALG_DH_SF, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {CALG_DH_SF, 768 << 16, TRUE}, + {CALG_DH_SF, 1024 << 16, TRUE}, + {CALG_DH_SF, 1032 << 16, FALSE, NTE_BAD_FLAGS}, + {CALG_DSS_SIGN, 448 << 16, FALSE, NTE_BAD_FLAGS}, + {CALG_DSS_SIGN, 512 << 16, TRUE}, + {CALG_DSS_SIGN, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {CALG_DSS_SIGN, 768 << 16, TRUE}, + {CALG_DSS_SIGN, 1024 << 16, TRUE}, + {CALG_DSS_SIGN, 1088 << 16, FALSE, NTE_BAD_FLAGS} +}; + +static void test_keylength_array(HCRYPTPROV hProv,const struct keylength_test *tests, int testLen) +{ + HCRYPTKEY key; + BOOL result; + int i; + + for (i = 0; i < testLen; i++) + { + SetLastError(0xdeadbeef); + result = CryptGenKey(hProv, tests[i].algid, tests[i].flags, &key); + + /* success */ + if(tests[i].expectedResult) + { + ok(result, "Expected a key, got %08x\n", GetLastError()); + result = CryptDestroyKey(key); + ok(result, "Expected no errors.\n"); + } + else + { /* error but success on older system */ + if(tests[i].brokenResult) + ok((!result && GetLastError() == tests[i].expectedError) || + broken(result), "Expected a key, got %x.\n", GetLastError()); + else + { + /* error */ + if(!tests[i].brokenError) + ok(!result && GetLastError() == tests[i].expectedError, + "Expected a key, got %x.\n", GetLastError()); + + /* error but different error on older system */ + else + ok(!result && (GetLastError() == tests[i].expectedError || + broken(GetLastError() == tests[i].brokenError)), + "Expected a key, got %x.\n", GetLastError()); + } + } + } +} + +#define TESTLEN(x) (sizeof(x) / sizeof((x)[0])) + +static void test_keylength(void) +{ + HCRYPTPROV hProv = 0; + BOOL result; + + /* acquire base dss provider */ + result = CryptAcquireContextA( + &hProv, NULL, MS_DEF_DSS_PROV_A, PROV_DSS, CRYPT_VERIFYCONTEXT); + if(!result) + { + skip("DSSENH is currently not available, skipping key length tests.\n"); + return; + } + ok(result, "Expected no errors.\n"); + + /* perform keylength tests */ + test_keylength_array(hProv, baseDSS_keylength, TESTLEN(baseDSS_keylength)); + + result = CryptReleaseContext(hProv, 0); + ok(result, "Expected release of CSP provider.\n"); + + /* acquire diffie hellman dss provider */ + result = CryptAcquireContextA( + &hProv, NULL, MS_DEF_DSS_DH_PROV, PROV_DSS_DH, CRYPT_VERIFYCONTEXT); + ok(result, "Expected no errors.\n"); + + /* perform keylength tests */ + test_keylength_array(hProv, dssDH_keylength, TESTLEN(dssDH_keylength)); + + result = CryptReleaseContext(hProv, 0); + ok(result, "Expected release of CSP provider.\n"); + + /* acquire enhanced dss provider */ + SetLastError(0xdeadbeef); + result = CryptAcquireContextA( + &hProv, NULL, MS_ENH_DSS_DH_PROV, PROV_DSS_DH, CRYPT_VERIFYCONTEXT); + if(!result && GetLastError() == NTE_KEYSET_NOT_DEF) + { + win_skip("DSSENH and Schannel provider is broken on WinNT4\n"); + return; + } + ok(result, "Expected no errors.\n"); + + /* perform keylength tests */ + test_keylength_array(hProv, dssENH_keylength, TESTLEN(dssENH_keylength)); + + result = CryptReleaseContext(hProv, 0); + ok(result, "Expected release of CSP provider.\n"); + + /* acquire schannel dss provider */ + result = CryptAcquireContextA( + &hProv, NULL, MS_DEF_DH_SCHANNEL_PROV, PROV_DH_SCHANNEL, CRYPT_VERIFYCONTEXT); + ok(result, "Expected no errors.\n"); + + /* perform keylength tests */ + test_keylength_array(hProv, dssENH_keylength, TESTLEN(dssENH_keylength)); + + result = CryptReleaseContext(hProv, 0); + ok(result, "Expected release of CSP provider.\n"); +} + START_TEST(dssenh) { test_acquire_context(); + test_keylength(); }
1
0
0
0
Detlef Riekenberg : wintrust/tests: Handle ERROR_ACCESS_DENIED failures.
by Alexandre Julliard
14 Aug '12
14 Aug '12
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
0
0
Detlef Riekenberg : d3dx9_36/tests: Fix failures on vista x64.
by Alexandre Julliard
14 Aug '12
14 Aug '12
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
0
0
Detlef Riekenberg : mshtml/tests: Mark IE6 behavior as broken.
by Alexandre Julliard
14 Aug '12
14 Aug '12
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
0
0
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
0
0
← Newer
1
...
44
45
46
47
48
49
50
...
55
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
Results per page:
10
25
50
100
200