February 2009 - Wine-commits

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

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

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

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

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

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

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

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

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

Juan Lang : crypt32: Support an alternate OID in order to fix a test on some Windows 98 systems .
by Alexandre Julliard 12 Feb '09

12 Feb '09

Module: wine Branch: master Commit: b972a5d355fe9f9098f4b12dbfa313266a65a9be URL: http://source.winehq.org/git/wine.git/?a=commit;h=b972a5d355fe9f9098f4b12db… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Feb 11 20:33:25 2009 -0800 crypt32: Support an alternate OID in order to fix a test on some Windows 98 systems. --- dlls/crypt32/tests/oid.c | 113 +++++++++++++++++++++++++++------------------- 1 files changed, 66 insertions(+), 47 deletions(-) diff --git a/dlls/crypt32/tests/oid.c b/dlls/crypt32/tests/oid.c index 1145131..fb4607d 100644 --- a/dlls/crypt32/tests/oid.c +++ b/dlls/crypt32/tests/oid.c @@ -34,58 +34,59 @@ static BOOL (WINAPI *pCryptEnumOIDInfo)(DWORD,DWORD,void*,PFN_CRYPT_ENUM_OID_INF struct OIDToAlgID { LPCSTR oid; + LPCSTR altOid; DWORD algID; }; static const struct OIDToAlgID oidToAlgID[] = { - { szOID_RSA_RSA, CALG_RSA_KEYX }, - { szOID_RSA_MD2RSA, CALG_MD2 }, - { szOID_RSA_MD4RSA, CALG_MD4 }, - { szOID_RSA_MD5RSA, CALG_MD5 }, - { szOID_RSA_SHA1RSA, CALG_SHA }, - { szOID_RSA_DH, CALG_DH_SF }, - { szOID_RSA_SMIMEalgESDH, CALG_DH_EPHEM }, - { szOID_RSA_SMIMEalgCMS3DESwrap, CALG_3DES }, - { szOID_RSA_SMIMEalgCMSRC2wrap, CALG_RC2 }, - { szOID_RSA_MD2, CALG_MD2 }, - { szOID_RSA_MD4, CALG_MD4 }, - { szOID_RSA_MD5, CALG_MD5 }, - { szOID_RSA_RC2CBC, CALG_RC2 }, - { szOID_RSA_RC4, CALG_RC4 }, - { szOID_RSA_DES_EDE3_CBC, CALG_3DES }, - { szOID_ANSI_X942_DH, CALG_DH_SF }, - { szOID_X957_DSA, CALG_DSS_SIGN }, - { szOID_X957_SHA1DSA, CALG_SHA }, - { szOID_OIWSEC_md4RSA, CALG_MD4 }, - { szOID_OIWSEC_md5RSA, CALG_MD5 }, - { szOID_OIWSEC_md4RSA2, CALG_MD4 }, - { szOID_OIWSEC_desCBC, CALG_DES }, - { szOID_OIWSEC_dsa, CALG_DSS_SIGN }, - { szOID_OIWSEC_shaDSA, CALG_SHA }, - { szOID_OIWSEC_shaRSA, CALG_SHA }, - { szOID_OIWSEC_sha, CALG_SHA }, - { szOID_OIWSEC_rsaXchg, CALG_RSA_KEYX }, - { szOID_OIWSEC_sha1, CALG_SHA }, - { szOID_OIWSEC_dsaSHA1, CALG_SHA }, - { szOID_OIWSEC_sha1RSASign, CALG_SHA }, - { szOID_OIWDIR_md2RSA, CALG_MD2 }, - { szOID_INFOSEC_mosaicUpdatedSig, CALG_SHA }, - { szOID_INFOSEC_mosaicKMandUpdSig, CALG_DSS_SIGN }, + { szOID_RSA_RSA, NULL, CALG_RSA_KEYX }, + { szOID_RSA_MD2RSA, NULL, CALG_MD2 }, + { szOID_RSA_MD4RSA, NULL, CALG_MD4 }, + { szOID_RSA_MD5RSA, NULL, CALG_MD5 }, + { szOID_RSA_SHA1RSA, NULL, CALG_SHA }, + { szOID_RSA_DH, NULL, CALG_DH_SF }, + { szOID_RSA_SMIMEalgESDH, NULL, CALG_DH_EPHEM }, + { szOID_RSA_SMIMEalgCMS3DESwrap, NULL, CALG_3DES }, + { szOID_RSA_SMIMEalgCMSRC2wrap, NULL, CALG_RC2 }, + { szOID_RSA_MD2, NULL, CALG_MD2 }, + { szOID_RSA_MD4, NULL, CALG_MD4 }, + { szOID_RSA_MD5, NULL, CALG_MD5 }, + { szOID_RSA_RC2CBC, NULL, CALG_RC2 }, + { szOID_RSA_RC4, NULL, CALG_RC4 }, + { szOID_RSA_DES_EDE3_CBC, NULL, CALG_3DES }, + { szOID_ANSI_X942_DH, NULL, CALG_DH_SF }, + { szOID_X957_DSA, NULL, CALG_DSS_SIGN }, + { szOID_X957_SHA1DSA, NULL, CALG_SHA }, + { szOID_OIWSEC_md4RSA, NULL, CALG_MD4 }, + { szOID_OIWSEC_md5RSA, NULL, CALG_MD5 }, + { szOID_OIWSEC_md4RSA2, NULL, CALG_MD4 }, + { szOID_OIWSEC_desCBC, NULL, CALG_DES }, + { szOID_OIWSEC_dsa, NULL, CALG_DSS_SIGN }, + { szOID_OIWSEC_shaDSA, NULL, CALG_SHA }, + { szOID_OIWSEC_shaRSA, NULL, CALG_SHA }, + { szOID_OIWSEC_sha, NULL, CALG_SHA }, + { szOID_OIWSEC_rsaXchg, NULL, CALG_RSA_KEYX }, + { szOID_OIWSEC_sha1, NULL, CALG_SHA }, + { szOID_OIWSEC_dsaSHA1, NULL, CALG_SHA }, + { szOID_OIWSEC_sha1RSASign, NULL, CALG_SHA }, + { szOID_OIWDIR_md2RSA, NULL, CALG_MD2 }, + { szOID_INFOSEC_mosaicUpdatedSig, NULL, CALG_SHA }, + { szOID_INFOSEC_mosaicKMandUpdSig, NULL, CALG_DSS_SIGN }, }; static const struct OIDToAlgID algIDToOID[] = { - { szOID_RSA_RSA, CALG_RSA_KEYX }, - { szOID_RSA_SMIMEalgESDH, CALG_DH_EPHEM }, - { szOID_RSA_MD2, CALG_MD2 }, - { szOID_RSA_MD4, CALG_MD4 }, - { szOID_RSA_MD5, CALG_MD5 }, - { szOID_RSA_RC2CBC, CALG_RC2 }, - { szOID_RSA_RC4, CALG_RC4 }, - { szOID_RSA_DES_EDE3_CBC, CALG_3DES }, - { szOID_ANSI_X942_DH, CALG_DH_SF }, - { szOID_X957_DSA, CALG_DSS_SIGN }, - { szOID_OIWSEC_desCBC, CALG_DES }, - { szOID_OIWSEC_sha1, CALG_SHA }, + { szOID_RSA_RSA, NULL, CALG_RSA_KEYX }, + { szOID_RSA_SMIMEalgESDH, NULL, CALG_DH_EPHEM }, + { szOID_RSA_MD2, NULL, CALG_MD2 }, + { szOID_RSA_MD4, NULL, CALG_MD4 }, + { szOID_RSA_MD5, NULL, CALG_MD5 }, + { szOID_RSA_RC2CBC, NULL, CALG_RC2 }, + { szOID_RSA_RC4, NULL, CALG_RC4 }, + { szOID_RSA_DES_EDE3_CBC, NULL, CALG_3DES }, + { szOID_ANSI_X942_DH, NULL, CALG_DH_SF }, + { szOID_X957_DSA, szOID_OIWSEC_dsa /* some Win98 */, CALG_DSS_SIGN }, + { szOID_OIWSEC_desCBC, NULL, CALG_DES }, + { szOID_OIWSEC_sha1, NULL, CALG_SHA }, }; static const WCHAR bogusDll[] = { 'b','o','g','u','s','.','d','l','l',0 }; @@ -134,8 +135,26 @@ static void testAlgIDToOID(void) oid = CertAlgIdToOID(algIDToOID[i].algID); /* Allow failure, not every version of Windows supports every algo */ if (oid) - ok(!strcmp(oid, algIDToOID[i].oid), - "Expected %s, got %s\n", algIDToOID[i].oid, oid); + { + if (strcmp(oid, algIDToOID[i].oid)) + { + if (algIDToOID[i].altOid) + ok(!strcmp(oid, algIDToOID[i].oid) || + !strcmp(oid, algIDToOID[i].altOid), + "Expected %s or %s, got %s\n", algIDToOID[i].oid, + algIDToOID[i].altOid, oid); + else + { + /* No need to rerun the test, we already know it failed. */ + ok(0, "Expected %s, got %s\n", algIDToOID[i].oid, oid); + } + } + else + { + /* No need to rerun the test, we already know it succeeded. */ + ok(1, "Expected %s, got %s\n", algIDToOID[i].oid, oid); + } + } } }

1 0