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
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
February 2009
----- 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
965 discussions
Start a n
N
ew thread
Francois Gouget : ntdll/tests: Remove WINAPI on static functions where not needed.
by Alexandre Julliard
12 Feb '09
12 Feb '09
Module: wine Branch: master Commit: ede61964672978a43050118ad9d5abb64c5f0b62 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ede61964672978a43050118ad…
Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 12 12:30:08 2009 +0100 ntdll/tests: Remove WINAPI on static functions where not needed. --- dlls/ntdll/tests/rtl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index bcf63b4..7beef6d 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -571,7 +571,7 @@ static void test_RtlUniform(void) } -static ULONG WINAPI my_RtlRandom(PULONG seed) +static ULONG my_RtlRandom(PULONG seed) { static ULONG saved_value[128] = { /* 0 */ 0x4c8bc0aa, 0x4c022957, 0x2232827a, 0x2f1e7626, 0x7f8bdafb, 0x5c37d02a, 0x0ab48f72, 0x2f0c4ffa,
1
0
0
0
Francois Gouget : mssign32: The mssign32 debug channel is unused so remove it.
by Alexandre Julliard
12 Feb '09
12 Feb '09
Module: wine Branch: master Commit: 16644b6929ab710cb5502ede3f42de3663507cfe URL:
http://source.winehq.org/git/wine.git/?a=commit;h=16644b6929ab710cb5502ede3…
Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 12 12:29:54 2009 +0100 mssign32: The mssign32 debug channel is unused so remove it. --- dlls/mssign32/mssign32_main.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/mssign32/mssign32_main.c b/dlls/mssign32/mssign32_main.c index e591917..6b403bd 100644 --- a/dlls/mssign32/mssign32_main.c +++ b/dlls/mssign32/mssign32_main.c @@ -24,9 +24,7 @@ #include "windef.h" #include "winbase.h" -#include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(mssign32); BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID lpv ) {
1
0
0
0
Francois Gouget : d3dx8: The d3dx debug channel is unused so remove it.
by Alexandre Julliard
12 Feb '09
12 Feb '09
Module: wine Branch: master Commit: 043cf21f236456d343015ff4a77f752589f6949d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=043cf21f236456d343015ff4a…
Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 12 12:29:47 2009 +0100 d3dx8: The d3dx debug channel is unused so remove it. --- dlls/d3dx8/mesh.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx8/mesh.c b/dlls/d3dx8/mesh.c index baa5f20..b0562c7 100644 --- a/dlls/d3dx8/mesh.c +++ b/dlls/d3dx8/mesh.c @@ -21,11 +21,9 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" -#include "wine/debug.h" #include "d3dx8_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(d3dx); BOOL WINAPI D3DXBoxBoundProbe(CONST D3DXVECTOR3 *pmin, CONST D3DXVECTOR3 *pmax, CONST D3DXVECTOR3 *prayposition, CONST D3DXVECTOR3 *praydirection)
1
0
0
0
Francois Gouget : shell32: Make SHILCreateFromPathA() static and remove WINAPI.
by Alexandre Julliard
12 Feb '09
12 Feb '09
Module: wine Branch: master Commit: 3eab2ee52fb776b213713078f6befb0f28c169bf URL:
http://source.winehq.org/git/wine.git/?a=commit;h=3eab2ee52fb776b213713078f…
Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 12 12:29:28 2009 +0100 shell32: Make SHILCreateFromPathA() static and remove WINAPI. --- dlls/shell32/pidl.c | 2 +- dlls/shell32/undocshell.h | 5 ----- 2 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index a7a0771..01479fb 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -381,7 +381,7 @@ HRESULT WINAPI ILSaveToStream (IStream * pStream, LPCITEMIDLIST pPidl) * NOTES * Wrapper for IShellFolder_ParseDisplayName(). */ -HRESULT WINAPI SHILCreateFromPathA(LPCSTR path, LPITEMIDLIST * ppidl, DWORD * attributes) +static HRESULT SHILCreateFromPathA(LPCSTR path, LPITEMIDLIST * ppidl, DWORD * attributes) { WCHAR lpszDisplayName[MAX_PATH]; diff --git a/dlls/shell32/undocshell.h b/dlls/shell32/undocshell.h index de7414e..f8a1b70 100644 --- a/dlls/shell32/undocshell.h +++ b/dlls/shell32/undocshell.h @@ -55,11 +55,6 @@ void WINAPI ILGlobalFree(LPITEMIDLIST pidl); LPITEMIDLIST WINAPI SHSimpleIDListFromPathA (LPCSTR lpszPath); LPITEMIDLIST WINAPI SHSimpleIDListFromPathW (LPCWSTR lpszPath); -HRESULT WINAPI SHILCreateFromPathA ( - LPCSTR path, - LPITEMIDLIST * ppidl, - DWORD *attributes); - HRESULT WINAPI SHILCreateFromPathW ( LPCWSTR path, LPITEMIDLIST * ppidl,
1
0
0
0
Huw Davies : gdi32/tests: Use the ANSI text metrics so the tests work on win9x.
by Alexandre Julliard
12 Feb '09
12 Feb '09
Module: wine Branch: master Commit: d9811e69277af7e932f5ad2e01e2967143ff9a24 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d9811e69277af7e932f5ad2e0…
Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 12 12:30:45 2009 +0000 gdi32/tests: Use the ANSI text metrics so the tests work on win9x. --- dlls/gdi32/tests/font.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index abb3a4d..ba117fc 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2019,10 +2019,10 @@ typedef struct ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24)) #define MS_OS2_TAG MS_MAKE_TAG('O','S','/','2') -static void expect_ff(const TEXTMETRICW *tmW, const TT_OS2_V2 *os2, WORD family, const char *name) +static void expect_ff(const TEXTMETRICA *tmA, const TT_OS2_V2 *os2, WORD family, const char *name) { - ok((tmW->tmPitchAndFamily & 0xf0) == family, "%s: expected family %02x got %02x. panose %d-%d-%d-%d-...\n", - name, family, tmW->tmPitchAndFamily, os2->panose.bFamilyType, os2->panose.bSerifStyle, + ok((tmA->tmPitchAndFamily & 0xf0) == family, "%s: expected family %02x got %02x. panose %d-%d-%d-%d-...\n", + name, family, tmA->tmPitchAndFamily, os2->panose.bFamilyType, os2->panose.bSerifStyle, os2->panose.bWeight, os2->panose.bProportion); } @@ -2146,9 +2146,9 @@ static void test_text_metrics(const LOGFONTA *lf) case PAN_FAMILY_TEXT_DISPLAY: case PAN_FAMILY_PICTORIAL: default: - if((tmW.tmPitchAndFamily & 1) == 0) /* fixed */ + if((tmA.tmPitchAndFamily & 1) == 0) /* fixed */ { - expect_ff(&tmW, &tt_os2, FF_MODERN, font_name); + expect_ff(&tmA, &tt_os2, FF_MODERN, font_name); break; } switch(tt_os2.panose.bSerifStyle) @@ -2156,7 +2156,7 @@ static void test_text_metrics(const LOGFONTA *lf) case PAN_ANY: case PAN_NO_FIT: default: - expect_ff(&tmW, &tt_os2, FF_DONTCARE, font_name); + expect_ff(&tmA, &tt_os2, FF_DONTCARE, font_name); break; case PAN_SERIF_COVE: @@ -2168,7 +2168,7 @@ static void test_text_metrics(const LOGFONTA *lf) case PAN_SERIF_BONE: case PAN_SERIF_EXAGGERATED: case PAN_SERIF_TRIANGLE: - expect_ff(&tmW, &tt_os2, FF_ROMAN, font_name); + expect_ff(&tmA, &tt_os2, FF_ROMAN, font_name); break; case PAN_SERIF_NORMAL_SANS: @@ -2176,17 +2176,17 @@ static void test_text_metrics(const LOGFONTA *lf) case PAN_SERIF_PERP_SANS: case PAN_SERIF_FLARED: case PAN_SERIF_ROUNDED: - expect_ff(&tmW, &tt_os2, FF_SWISS, font_name); + expect_ff(&tmA, &tt_os2, FF_SWISS, font_name); break; } break; case PAN_FAMILY_SCRIPT: - expect_ff(&tmW, &tt_os2, FF_SCRIPT, font_name); + expect_ff(&tmA, &tt_os2, FF_SCRIPT, font_name); break; case PAN_FAMILY_DECORATIVE: - expect_ff(&tmW, &tt_os2, FF_DECORATIVE, font_name); + expect_ff(&tmA, &tt_os2, FF_DECORATIVE, font_name); break; }
1
0
0
0
Huw Davies : gdi32: Add missing serif types.
by Alexandre Julliard
12 Feb '09
12 Feb '09
Module: wine Branch: master Commit: aaefb75f8d70d4b5e1a00f996746a1a653c84758 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=aaefb75f8d70d4b5e1a00f996…
Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 12 12:23:01 2009 +0000 gdi32: Add missing serif types. --- dlls/gdi32/freetype.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 97dd1a6..139c51e 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5463,6 +5463,8 @@ UINT WineEngGetOutlineTextMetrics(GdiFont *font, UINT cbSize, case PAN_SERIF_NORMAL_SANS: case PAN_SERIF_OBTUSE_SANS: case PAN_SERIF_PERP_SANS: + case PAN_SERIF_FLARED: + case PAN_SERIF_ROUNDED: TM.tmPitchAndFamily |= FF_SWISS; break; }
1
0
0
0
Michael Stefaniuc : atl: Remove superfluous pointer casts.
by Alexandre Julliard
12 Feb '09
12 Feb '09
Module: wine Branch: master Commit: 17ca7aa5a676b6fad9e60ff0c46469fb93e418e7 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=17ca7aa5a676b6fad9e60ff0c…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Feb 12 11:34:16 2009 +0100 atl: Remove superfluous pointer casts. --- dlls/atl/atl_ax.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index c98cba7..da595a4 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -126,11 +126,11 @@ static ULONG IOCS_AddRef(IOCS *This) return ref; } -#define THIS2IOLECLIENTSITE(This) ((IOleClientSite*)&This->lpOleClientSiteVtbl) -#define THIS2IOLECONTAINER(This) ((IOleContainer*)&This->lpOleContainerVtbl) -#define THIS2IOLEINPLACESITEWINDOWLESS(This) ((IOleInPlaceSiteWindowless*)&This->lpOleInPlaceSiteWindowlessVtbl) -#define THIS2IOLEINPLACEFRAME(This) ((IOleInPlaceFrame*)&This->lpOleInPlaceFrameVtbl) -#define THIS2IOLECONTROLSITE(This) ((IOleControlSite*)&This->lpOleControlSiteVtbl) +#define THIS2IOLECLIENTSITE(This) ((IOleClientSite*)&(This)->lpOleClientSiteVtbl) +#define THIS2IOLECONTAINER(This) (&(This)->lpOleContainerVtbl) +#define THIS2IOLEINPLACESITEWINDOWLESS(This) (&(This)->lpOleInPlaceSiteWindowlessVtbl) +#define THIS2IOLEINPLACEFRAME(This) (&(This)->lpOleInPlaceFrameVtbl) +#define THIS2IOLECONTROLSITE(This) (&(This)->lpOleControlSiteVtbl) static HRESULT IOCS_QueryInterface(IOCS *This, REFIID riid, void **ppv) {
1
0
0
0
Alistair Leslie-Hughes : mshtml: Implement IHTMLStyle_get_paddingLeft.
by Alexandre Julliard
12 Feb '09
12 Feb '09
Module: wine Branch: master Commit: cfcc38a4b97a3ceaa03cb4b15ce94659b5594a4e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=cfcc38a4b97a3ceaa03cb4b15…
Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Feb 8 20:20:38 2009 +1100 mshtml: Implement IHTMLStyle_get_paddingLeft. --- dlls/mshtml/htmlstyle.c | 14 ++++++++++++-- dlls/mshtml/tests/dom.c | 18 ++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 2e9be16..084dd35 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -1253,8 +1253,18 @@ static HRESULT WINAPI HTMLStyle_put_paddingLeft(IHTMLStyle *iface, VARIANT v) static HRESULT WINAPI HTMLStyle_get_paddingLeft(IHTMLStyle *iface, VARIANT *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + BSTR ret; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + + hres = get_style_attr(This, STYLEID_PADDING_LEFT, &ret); + if(FAILED(hres)) + return hres; + + V_VT(p) = VT_BSTR; + V_BSTR(p) = ret; + return S_OK; } static HRESULT WINAPI HTMLStyle_put_padding(IHTMLStyle *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index ae24bcf..a1d1e15 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2413,6 +2413,7 @@ static void test_default_style(IHTMLStyle *style) float f; BSTR sOverflowDefault; BSTR sDefault; + VARIANT vDefault; test_disp((IUnknown*)style, &DIID_DispHTMLStyle); test_ifaces((IUnknown*)style, style_iids); @@ -2988,6 +2989,23 @@ static void test_default_style(IHTMLStyle *style) ok(!V_BSTR(&v), "str=%s\n", dbgstr_w(V_BSTR(&v))); VariantClear(&v); + /* PaddingLeft */ + hres = IHTMLStyle_get_paddingLeft(style, &vDefault); + ok(hres == S_OK, "get_paddingLeft: %08x\n", hres); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("10"); + hres = IHTMLStyle_put_paddingLeft(style, v); + ok(hres == S_OK, "get_paddingLeft: %08x\n", hres); + VariantClear(&v); + + hres = IHTMLStyle_get_paddingLeft(style, &v); + ok(hres == S_OK, "get_paddingLeft: %08x\n", hres); + ok(!strcmp_wa(V_BSTR(&v), "10px"), "expecte 10 = %s\n", dbgstr_w(V_BSTR(&v))); + + hres = IHTMLStyle_put_paddingLeft(style, vDefault); + ok(hres == S_OK, "get_paddingLeft: %08x\n", hres); + hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, (void**)&style2); ok(hres == S_OK, "Could not get IHTMLStyle2 iface: %08x\n", hres); if(SUCCEEDED(hres)) {
1
0
0
0
Juan Lang : wintrust: Fix a couple tests on a variety of systems.
by Alexandre Julliard
12 Feb '09
12 Feb '09
Module: wine Branch: master Commit: 74ac0d30bdc17ce6bd2e87b1ed420d0acd734225 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=74ac0d30bdc17ce6bd2e87b1e…
Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Feb 11 18:03:40 2009 -0800 wintrust: Fix a couple tests on a variety of systems. --- dlls/wintrust/tests/register.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/wintrust/tests/register.c b/dlls/wintrust/tests/register.c index 9d1437f..ccceb6c 100644 --- a/dlls/wintrust/tests/register.c +++ b/dlls/wintrust/tests/register.c @@ -120,8 +120,10 @@ static void test_AddRem_ActionID(void) SetLastError(0xdeadbeef); ret = pWintrustAddActionID(&ActionID, 0, &ActionIDFunctions); ok (ret, "Expected WintrustAddActionID to succeed.\n"); - ok (GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %u.\n", GetLastError()); + ok (GetLastError() == ERROR_INVALID_PARAMETER || + GetLastError() == ERROR_ACCESS_DENIED, + "Expected ERROR_INVALID_PARAMETER or ERROR_ACCESS_DENIED, got %u.\n", + GetLastError()); /* All OK and all functions are correctly defined. The DLL and entrypoints * are not present. @@ -139,8 +141,9 @@ static void test_AddRem_ActionID(void) SetLastError(0xdeadbeef); ret = pWintrustAddActionID(&ActionID, 0, &ActionIDFunctions); ok (ret, "Expected WintrustAddActionID to succeed.\n"); - ok (GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got %u.\n", GetLastError()); + ok (GetLastError() == 0xdeadbeef || GetLastError() == ERROR_ACCESS_DENIED, + "Expected 0xdeadbeef or ERROR_ACCESS_DENIED, got %u.\n", + GetLastError()); SetLastError(0xdeadbeef); ret = pWintrustRemoveActionID(&ActionID);
1
0
0
0
Juan Lang : wintrust: Remove a couple tests that fail on a variety of systems.
by Alexandre Julliard
12 Feb '09
12 Feb '09
Module: wine Branch: master Commit: 22ea6bd61126ad72b20778bd456352b5503e4b2d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=22ea6bd61126ad72b20778bd4…
Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Feb 11 18:03:14 2009 -0800 wintrust: Remove a couple tests that fail on a variety of systems. --- dlls/wintrust/tests/register.c | 45 ---------------------------------------- 1 files changed, 0 insertions(+), 45 deletions(-) diff --git a/dlls/wintrust/tests/register.c b/dlls/wintrust/tests/register.c index 37801cc..9d1437f 100644 --- a/dlls/wintrust/tests/register.c +++ b/dlls/wintrust/tests/register.c @@ -165,12 +165,10 @@ static void test_AddRem_ActionID(void) static void test_AddDefaultForUsage(void) { BOOL ret; - LONG res; static GUID ActionID = { 0xdeadbeef, 0xdead, 0xbeef, { 0xde,0xad,0xbe,0xef,0xde,0xad,0xbe,0xef }}; static WCHAR DummyDllW[] = {'d','e','a','d','b','e','e','f','.','d','l','l',0 }; static CHAR DummyFunction[] = "dummyfunction"; static const CHAR oid[] = "1.2.3.4.5.6.7.8.9.10"; - static const CHAR Usages[] = "SOFTWARE\\Microsoft\\Cryptography\\Providers\\Trust\\Usages\\1.2.3.4.5.6.7.8.9.10"; static CRYPT_PROVIDER_REGDEFUSAGE DefUsage; if (!pWintrustAddDefaultForUsage) @@ -206,27 +204,6 @@ static void test_AddDefaultForUsage(void) ok (GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %u.\n", GetLastError()); - /* Just the ActionID */ - memset(&DefUsage, 0 , sizeof(CRYPT_PROVIDER_REGDEFUSAGE)); - DefUsage.cbStruct = sizeof(CRYPT_PROVIDER_REGDEFUSAGE); - DefUsage.pgActionID = &ActionID; - SetLastError(0xdeadbeef); - ret = pWintrustAddDefaultForUsage(oid, &DefUsage); - ok ( ret, "Expected WintrustAddDefaultForUsage to succeed\n"); - ok (GetLastError() == 0xdeadbeef, - "Last error should not have been changed: %u\n", GetLastError()); - - /* No ActionID */ - memset(&DefUsage, 0 , sizeof(CRYPT_PROVIDER_REGDEFUSAGE)); - DefUsage.cbStruct = sizeof(CRYPT_PROVIDER_REGDEFUSAGE); - DefUsage.pwszDllName = DummyDllW; - DefUsage.pwszLoadCallbackDataFunctionName = DummyFunction; - DefUsage.pwszFreeCallbackDataFunctionName = DummyFunction; - ret = pWintrustAddDefaultForUsage(oid, &DefUsage); - ok (!ret, "Expected WintrustAddDefaultForUsage to fail.\n"); - ok (GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %u.\n", GetLastError()); - /* cbStruct set to 0 */ memset(&DefUsage, 0 , sizeof(CRYPT_PROVIDER_REGDEFUSAGE)); DefUsage.cbStruct = 0; @@ -239,28 +216,6 @@ static void test_AddDefaultForUsage(void) ok (!ret, "Expected WintrustAddDefaultForUsage to fail.\n"); ok (GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %u.\n", GetLastError()); - - /* All OK */ - memset(&DefUsage, 0 , sizeof(CRYPT_PROVIDER_REGDEFUSAGE)); - DefUsage.cbStruct = sizeof(CRYPT_PROVIDER_REGDEFUSAGE); - DefUsage.pgActionID = &ActionID; - DefUsage.pwszDllName = DummyDllW; - DefUsage.pwszLoadCallbackDataFunctionName = DummyFunction; - DefUsage.pwszFreeCallbackDataFunctionName = DummyFunction; - SetLastError(0xdeadbeef); - ret = pWintrustAddDefaultForUsage(oid, &DefUsage); - ok ( ret, "Expected WintrustAddDefaultForUsage to succeed\n"); - ok (GetLastError() == 0xdeadbeef, - "Last error should not have been changed: %u\n", GetLastError()); - - /* There is no corresponding remove for WintrustAddDefaultForUsage - * so we delete the registry key manually. - */ - if (ret) - { - res = RegDeleteKeyA(HKEY_LOCAL_MACHINE, Usages); - ok (res == ERROR_SUCCESS, "Key delete failed : 0x%08x\n", res); - } } static void test_LoadFunctionPointers(void)
1
0
0
0
← Newer
1
...
51
52
53
54
55
56
57
...
97
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
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
Results per page:
10
25
50
100
200