Re: [crypt32/tests 2/2] Vista uses a different error code (RESEND)

[Dmitry Timoshkov]

"Paul Vriens" <paul.vriens.wine(a)gmail.com> wrote:
> ret = CryptSIPRetrieveSubjectGuid(tempfileW, NULL, &subject);
>     ok ( !ret, "Expected CryptSIPRetrieveSubjectGuid to fail\n");
>     ok ( GetLastError() == ERROR_FILE_INVALID ||
> +         GetLastError() == ERROR_INVALID_PARAMETER /* Vista */ ||
>          GetLastError() == S_OK /* Win98 */,
> -        "Expected ERROR_FILE_INVALID or S_OK, got 0x%08x\n", GetLastError());
> +        "Expected ERROR_FILE_INVALID, ERROR_INVALID_PARAMETER or S_OK, got 0x%08x\n", GetLastError());

S_OK is an OLE error, ERROR_SUCCESS is correct name in this case.

It's not your fault at all, but since you are fixing this code it would be
nice to fix it as well.

-- 
Dmitry.

[crypt32/tests 2/2] Vista uses a different error code (RESEND)

[Paul Vriens]

Dmitry Timoshkov wrote:
> "Paul Vriens" <paul.vriens.wine(a)gmail.com> wrote:
> > ret = CryptSIPRetrieveSubjectGuid(tempfileW, NULL, &subject);
> >     ok ( !ret, "Expected CryptSIPRetrieveSubjectGuid to fail\n");
> >     ok ( GetLastError() == ERROR_FILE_INVALID ||
> > +         GetLastError() == ERROR_INVALID_PARAMETER /* Vista */ ||
> >          GetLastError() == S_OK /* Win98 */,
> > -        "Expected ERROR_FILE_INVALID or S_OK, got 0x%08x\n", 
> > GetLastError());
> > +        "Expected ERROR_FILE_INVALID, ERROR_INVALID_PARAMETER or 
> > S_OK, got 0x%08x\n", GetLastError());
>
> S_OK is an OLE error, ERROR_SUCCESS is correct name in this case.
>
> It's not your fault at all, but since you are fixing this code it would be
> nice to fix it as well.

Well.... actually I wrote the initial test as well :-)

I'll change that and resend.

Cheers,

Paul.