October 2009 - Wine-commits

Juan Lang : crypt32: Add a helper function to encode a cert's public key.
by Alexandre Julliard 21 Oct '09

21 Oct '09

Module: wine Branch: master Commit: c97e442a28f1c5c56ff6c1041b925e93e110bff5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c97e442a28f1c5c56ff6c1041… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Oct 20 13:20:59 2009 -0700 crypt32: Add a helper function to encode a cert's public key. --- dlls/crypt32/encode.c | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 01f853c..627c354 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -464,6 +464,25 @@ static BOOL WINAPI CRYPT_AsnEncodeCert(DWORD dwCertEncodingType, return ret; } +static BOOL WINAPI CRYPT_AsnEncodePubKeyInfoNoNull(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, + PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) +{ + BOOL ret; + const CERT_PUBLIC_KEY_INFO *info = pvStructInfo; + struct AsnEncodeSequenceItem items[] = { + { &info->Algorithm, CRYPT_AsnEncodeAlgorithmId, 0 }, + { &info->PublicKey, CRYPT_AsnEncodeBits, 0 }, + }; + + TRACE("Encoding public key with OID %s\n", + debugstr_a(info->Algorithm.pszObjId)); + ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, + sizeof(items) / sizeof(items[0]), dwFlags, pEncodePara, pbEncoded, + pcbEncoded); + return ret; +} + /* Like in Windows, this blithely ignores the validity of the passed-in * CERT_INFO, and just encodes it as-is. The resulting encoded data may not * decode properly, see CRYPT_AsnDecodeCertInfo. @@ -484,7 +503,7 @@ static BOOL WINAPI CRYPT_AsnEncodeCertInfo(DWORD dwCertEncodingType, { &info->Issuer, CRYPT_CopyEncodedBlob, 0 }, { &info->NotBefore, CRYPT_AsnEncodeValidity, 0 }, { &info->Subject, CRYPT_CopyEncodedBlob, 0 }, - { &info->SubjectPublicKeyInfo, CRYPT_AsnEncodePubKeyInfo, 0 }, + { &info->SubjectPublicKeyInfo, CRYPT_AsnEncodePubKeyInfoNoNull, 0 }, { 0 } }; struct AsnConstructedItem constructed[3] = { { 0 } };

1 0

Juan Lang : crypt32: Use helper function to encode public keys for hashing.
by Alexandre Julliard 21 Oct '09

21 Oct '09

Module: wine Branch: master Commit: d8ca5bc348b3e033c04ca4ddf9f3786706f78f0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8ca5bc348b3e033c04ca4ddf… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Oct 20 13:29:03 2009 -0700 crypt32: Use helper function to encode public keys for hashing. This is necessary because the publicly callable form embeds the asn.1 NULL value when the parameters are empty, whereas the hash value expects that it's missing. --- dlls/crypt32/cert.c | 10 ++++++++-- dlls/crypt32/crypt32_private.h | 4 ++++ dlls/crypt32/encode.c | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 5b3b6e3..2115913 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1855,13 +1855,19 @@ BOOL WINAPI CryptHashPublicKeyInfo(HCRYPTPROV_LEGACY hCryptProv, ALG_ID Algid, hCryptProv = CRYPT_GetDefaultProvider(); if (!Algid) Algid = CALG_MD5; + if ((dwCertEncodingType & CERT_ENCODING_TYPE_MASK) != X509_ASN_ENCODING) + { + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; + } if (ret) { BYTE *buf; DWORD size = 0; - ret = CryptEncodeObjectEx(dwCertEncodingType, X509_PUBLIC_KEY_INFO, - pInfo, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + ret = CRYPT_AsnEncodePubKeyInfoNoNull(dwCertEncodingType, + X509_PUBLIC_KEY_INFO, pInfo, CRYPT_ENCODE_ALLOC_FLAG, NULL, + (LPBYTE)&buf, &size); if (ret) { ret = CryptCreateHash(hCryptProv, Algid, 0, 0, &hHash); diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 07c6382..a5759a2 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -113,6 +113,10 @@ BOOL CRYPT_AsnDecodePKCSDigestedData(const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, PCRYPT_DECODE_PARA pDecodePara, CRYPT_DIGESTED_DATA *digestedData, DWORD *pcbDigestedData); +BOOL WINAPI CRYPT_AsnEncodePubKeyInfoNoNull(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, + PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded); + /* The following aren't defined in wincrypt.h, as they're "reserved" */ #define CERT_CERT_PROP_ID 32 #define CERT_CRL_PROP_ID 33 diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 627c354..93c4a29 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -464,7 +464,7 @@ static BOOL WINAPI CRYPT_AsnEncodeCert(DWORD dwCertEncodingType, return ret; } -static BOOL WINAPI CRYPT_AsnEncodePubKeyInfoNoNull(DWORD dwCertEncodingType, +BOOL WINAPI CRYPT_AsnEncodePubKeyInfoNoNull(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) {

1 0

Juan Lang : crypt32: Encode public keys with NULL parameters if they' re empty (and make tests more restrictive).
by Alexandre Julliard 21 Oct '09

21 Oct '09

Module: wine Branch: master Commit: e1903dc6e06da3fd9faa92fc63e784510ed26626 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1903dc6e06da3fd9faa92fc6… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Oct 20 13:33:15 2009 -0700 crypt32: Encode public keys with NULL parameters if they're empty (and make tests more restrictive). --- dlls/crypt32/encode.c | 2 +- dlls/crypt32/tests/encode.c | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 93c4a29..3cd2b1e 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -415,7 +415,7 @@ static BOOL WINAPI CRYPT_AsnEncodePubKeyInfo(DWORD dwCertEncodingType, { const CERT_PUBLIC_KEY_INFO *info = pvStructInfo; struct AsnEncodeSequenceItem items[] = { - { &info->Algorithm, CRYPT_AsnEncodeAlgorithmId, 0 }, + { &info->Algorithm, CRYPT_AsnEncodeAlgorithmIdWithNullParams, 0 }, { &info->PublicKey, CRYPT_AsnEncodeBits, 0 }, }; diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 9babafd..1e93dfc 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -2613,8 +2613,8 @@ static void test_decodeExtensions(DWORD dwEncoding) /* MS encodes public key info with a NULL if the algorithm identifier's * parameters are empty. However, when encoding an algorithm in a CERT_INFO, - * it encodes them by omitting the algorithm parameters. This latter approach - * seems more correct, so accept either form. + * it encodes them by omitting the algorithm parameters. It accepts either + * form for decoding. */ struct encodedPublicKey { @@ -2692,16 +2692,11 @@ static void test_encodePublicKeyInfo(DWORD dwEncoding) "CryptEncodeObjectEx failed: %08x\n", GetLastError()); if (buf) { - ok(bufSize == pubKeys[i].encoded[1] + 2 || - bufSize == pubKeys[i].encodedNoNull[1] + 2, - "Expected %d or %d bytes, got %d\n", pubKeys[i].encoded[1] + 2, - pubKeys[i].encodedNoNull[1] + 2, bufSize); + ok(bufSize == pubKeys[i].encoded[1] + 2, + "Expected %d bytes, got %d\n", pubKeys[i].encoded[1] + 2, bufSize); if (bufSize == pubKeys[i].encoded[1] + 2) ok(!memcmp(buf, pubKeys[i].encoded, pubKeys[i].encoded[1] + 2), "Unexpected value\n"); - else if (bufSize == pubKeys[i].encodedNoNull[1] + 2) - ok(!memcmp(buf, pubKeys[i].encodedNoNull, - pubKeys[i].encodedNoNull[1] + 2), "Unexpected value\n"); LocalFree(buf); } }

1 0

Ričardas Barkauskas : dinput: Fix counting non mapped axis as pov.
by Alexandre Julliard 21 Oct '09

21 Oct '09

Module: wine Branch: master Commit: 258fd75b39fcbe8ea1782cbbbe3bed37a2c643b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=258fd75b39fcbe8ea1782cbbb… Author: Ričardas Barkauskas <miegalius(a)gmail.com> Date: Wed Oct 21 00:12:00 2009 +0300 dinput: Fix counting non mapped axis as pov. --- dlls/dinput/joystick.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 489342e..84e45c9 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -549,7 +549,9 @@ HRESULT setup_dinput_options(JoystickGenericImpl *This, const int *default_axis_ { This->axis_map[i] = default_axis_map[i]; tokens = default_axis_map[i]; - if (tokens >= 0 && tokens < 8) + if (tokens < 0) + continue; + if (tokens < 8) axis++; else if (tokens < 15) {

1 0

Andrew Eikum : hlink: Use HLINKSETF flags in Hlink::fnSetMonikerReference.
by Alexandre Julliard 21 Oct '09

21 Oct '09

Module: wine Branch: master Commit: a4b5ccfc29a12a6217645095c9c34231e983bb9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4b5ccfc29a12a6217645095c… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Oct 20 16:33:27 2009 -0500 hlink: Use HLINKSETF flags in Hlink::fnSetMonikerReference. --- dlls/hlink/hlink_main.c | 4 +- dlls/hlink/link.c | 37 +++++++++++------- dlls/hlink/tests/hlink.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/navigate.c | 2 +- 4 files changed, 124 insertions(+), 17 deletions(-) diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index 213506e..0e2ce90 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -84,7 +84,7 @@ HRESULT WINAPI HlinkCreateFromMoniker( IMoniker *pimkTrgt, LPCWSTR pwzLocation, if (pihlsite) IHlink_SetHlinkSite(hl, pihlsite, dwSiteData); if (pimkTrgt) - IHlink_SetMonikerReference(hl, 0, pimkTrgt, pwzLocation); + IHlink_SetMonikerReference(hl, HLINKSETF_LOCATION | HLINKSETF_TARGET, pimkTrgt, pwzLocation); *ppvObj = hl; @@ -140,7 +140,7 @@ HRESULT WINAPI HlinkCreateFromString( LPCWSTR pwzTarget, LPCWSTR pwzLocation, return r; } - IHlink_SetMonikerReference(hl, 0, pTgtMk, pwzLocation); + IHlink_SetMonikerReference(hl, HLINKSETF_TARGET | HLINKSETF_LOCATION, pTgtMk, pwzLocation); IMoniker_Release(pTgtMk); IHlink_SetStringReference(hl, HLINKSETF_TARGET, pwzTarget, NULL); diff --git a/dlls/hlink/link.c b/dlls/hlink/link.c index 689317d..30530ca 100644 --- a/dlls/hlink/link.c +++ b/dlls/hlink/link.c @@ -206,24 +206,33 @@ static HRESULT WINAPI IHlink_fnSetMonikerReference( IHlink* iface, { HlinkImpl *This = (HlinkImpl*)iface; - FIXME("(%p)->(%i %p %s)\n", This, rfHLSETF, pmkTarget, + TRACE("(%p)->(%i %p %s)\n", This, rfHLSETF, pmkTarget, debugstr_w(pwzLocation)); - if (This->Moniker) - IMoniker_Release(This->Moniker); + if(rfHLSETF == 0) + return E_INVALIDARG; + if(!(rfHLSETF & (HLINKSETF_TARGET | HLINKSETF_LOCATION))) + return rfHLSETF; - This->Moniker = pmkTarget; - if (This->Moniker) - { - LPOLESTR display_name; - IMoniker_AddRef(This->Moniker); - IMoniker_GetDisplayName(This->Moniker, NULL, NULL, &display_name); - This->absolute = display_name && strchrW(display_name, ':'); - CoTaskMemFree(display_name); + if(rfHLSETF & HLINKSETF_TARGET){ + if (This->Moniker) + IMoniker_Release(This->Moniker); + + This->Moniker = pmkTarget; + if (This->Moniker) + { + LPOLESTR display_name; + IMoniker_AddRef(This->Moniker); + IMoniker_GetDisplayName(This->Moniker, NULL, NULL, &display_name); + This->absolute = display_name && strchrW(display_name, ':'); + CoTaskMemFree(display_name); + } } - heap_free(This->Location); - This->Location = hlink_strdupW( pwzLocation ); + if(rfHLSETF & HLINKSETF_LOCATION){ + heap_free(This->Location); + This->Location = hlink_strdupW( pwzLocation ); + } return S_OK; } diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index 9e920d9..cea70b5 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -1016,6 +1016,103 @@ static void test_HlinkResolveMonikerForData(void) IBindCtx_Release(bctx); } +static void test_HlinkGetSetMonikerReference(void) +{ + IMoniker *found_trgt, *dummy, *dummy2; + IHlink *hlink; + HRESULT hres; + const WCHAR one[] = {'1',0}; + const WCHAR two[] = {'2',0}; + const WCHAR name[] = {'a',0}; + WCHAR *found_loc; + + /* create two dummy monikers to use as targets */ + hres = CreateItemMoniker(one, one, &dummy); + ok(hres == S_OK, "CreateItemMoniker failed: 0x%08x\n", hres); + + hres = CreateItemMoniker(two, two, &dummy2); + ok(hres == S_OK, "CreateItemMoniker failed: 0x%08x\n", hres); + + /* create a new hlink: target => dummy, location => one */ + hres = HlinkCreateFromMoniker(dummy, one, name, NULL, 0, NULL, &IID_IHlink, (void**)&hlink); + ok(hres == S_OK, "HlinkCreateFromMoniker failed: 0x%08x\n", hres); + + /* validate the target and location */ + hres = IHlink_GetMonikerReference(hlink, HLINKGETREF_DEFAULT, &found_trgt, &found_loc); + ok(hres == S_OK, "IHlink_GetMonikerReference failed: 0x%08x\n", hres); + ok(found_trgt == dummy, "Found target should've been %p, was: %p\n", dummy, found_trgt); + ok(lstrcmpW(found_loc, one) == 0, "Found location should've been %s, was: %s\n", wine_dbgstr_w(one), wine_dbgstr_w(found_loc)); + IMoniker_Release(found_trgt); + + /* set location => two */ + hres = IHlink_SetMonikerReference(hlink, HLINKSETF_LOCATION, dummy2, two); + ok(hres == S_OK, "IHlink_SetMonikerReference failed: 0x%08x\n", hres); + + hres = IHlink_GetMonikerReference(hlink, HLINKGETREF_DEFAULT, &found_trgt, &found_loc); + ok(found_trgt == dummy, "Found target should've been %p, was: %p\n", dummy, found_trgt); + ok(lstrcmpW(found_loc, two) == 0, "Found location should've been %s, was: %s\n", wine_dbgstr_w(two), wine_dbgstr_w(found_loc)); + IMoniker_Release(found_trgt); + + /* set target => dummy2 */ + hres = IHlink_SetMonikerReference(hlink, HLINKSETF_TARGET, dummy2, one); + ok(hres == S_OK, "IHlink_SetMonikerReference failed: 0x%08x\n", hres); + + hres = IHlink_GetMonikerReference(hlink, HLINKGETREF_DEFAULT, &found_trgt, &found_loc); + ok(found_trgt == dummy2, "Found target should've been %p, was: %p\n", dummy2, found_trgt); + ok(lstrcmpW(found_loc, two) == 0, "Found location should've been %s, was: %s\n", wine_dbgstr_w(two), wine_dbgstr_w(found_loc)); + IMoniker_Release(found_trgt); + + /* set target => dummy, location => one */ + hres = IHlink_SetMonikerReference(hlink, HLINKSETF_TARGET | HLINKSETF_LOCATION, dummy, one); + ok(hres == S_OK, "IHlink_SetMonikerReference failed: 0x%08x\n", hres); + + hres = IHlink_GetMonikerReference(hlink, HLINKGETREF_DEFAULT, &found_trgt, &found_loc); + ok(found_trgt == dummy, "Found target should've been %p, was: %p\n", dummy, found_trgt); + ok(lstrcmpW(found_loc, one) == 0, "Found location should've been %s, was: %s\n", wine_dbgstr_w(one), wine_dbgstr_w(found_loc)); + IMoniker_Release(found_trgt); + + /* no HLINKSETF flags */ + hres = IHlink_SetMonikerReference(hlink, 0, dummy2, two); + ok(hres == E_INVALIDARG, "IHlink_SetMonikerReference should've failed with E_INVALIDARG (0x%08x), failed with 0x%08x\n", E_INVALIDARG, hres); + + hres = IHlink_GetMonikerReference(hlink, HLINKGETREF_DEFAULT, &found_trgt, &found_loc); + ok(found_trgt == dummy, "Found target should've been %p, was: %p\n", dummy, found_trgt); + ok(lstrcmpW(found_loc, one) == 0, "Found location should've been %s, was: %s\n", wine_dbgstr_w(one), wine_dbgstr_w(found_loc)); + IMoniker_Release(found_trgt); + + /* invalid HLINKSETF flags */ + hres = IHlink_SetMonikerReference(hlink, 12, dummy2, two); + ok(hres == 12, "IHlink_SetMonikerReference should've failed with 0x%08x, failed with 0x%08x\n", 12, hres); + + hres = IHlink_GetMonikerReference(hlink, HLINKGETREF_DEFAULT, &found_trgt, &found_loc); + ok(found_trgt == dummy, "Found target should've been %p, was: %p\n", dummy, found_trgt); + ok(lstrcmpW(found_loc, one) == 0, "Found location should've been %s, was: %s\n", wine_dbgstr_w(one), wine_dbgstr_w(found_loc)); + IMoniker_Release(found_trgt); + + /* valid & invalid HLINKSETF flags */ + hres = IHlink_SetMonikerReference(hlink, 12 | HLINKSETF_TARGET, dummy2, two); + ok(hres == S_OK, "IHlink_SetMonikerReference failed: 0x%08x\n", hres); + + hres = IHlink_GetMonikerReference(hlink, HLINKGETREF_DEFAULT, &found_trgt, &found_loc); + ok(found_trgt == dummy2, "Found target should've been %p, was: %p\n", dummy2, found_trgt); + ok(lstrcmpW(found_loc, one) == 0, "Found location should've been %s, was: %s\n", wine_dbgstr_w(one), wine_dbgstr_w(found_loc)); + IMoniker_Release(found_trgt); + + /* NULL args */ + hres = IHlink_SetMonikerReference(hlink, HLINKSETF_TARGET | HLINKSETF_LOCATION, NULL, NULL); + ok(hres == S_OK, "IHlink_SetMonikerReference failed: 0x%08x\n", hres); + + hres = IHlink_GetMonikerReference(hlink, HLINKGETREF_DEFAULT, &found_trgt, &found_loc); + ok(found_trgt == NULL, "Found target should've been %p, was: %p\n", NULL, found_trgt); + ok(found_loc == NULL, "Found location should've been %s, was: %s\n", wine_dbgstr_w(NULL), wine_dbgstr_w(found_loc)); + if(found_trgt) + IMoniker_Release(found_trgt); + + IHlink_Release(hlink); + IMoniker_Release(dummy2); + IMoniker_Release(dummy); +} + START_TEST(hlink) { CoInitialize(NULL); @@ -1027,6 +1124,7 @@ START_TEST(hlink) test_HlinkCreateExtensionServices(); test_HlinkParseDisplayName(); test_HlinkResolveMonikerForData(); + test_HlinkGetSetMonikerReference(); CoUninitialize(); } diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 92d95fc..951b04d 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1202,7 +1202,7 @@ HRESULT hlink_frame_navigate(HTMLDocument *doc, LPCWSTR url, hres = CreateURLMoniker(NULL, url, &mon); if(SUCCEEDED(hres)) { - IHlink_SetMonikerReference(hlink, 0, mon, NULL); + IHlink_SetMonikerReference(hlink, HLINKSETF_TARGET, mon, NULL); if(hlnf & HLNF_OPENINNEWWINDOW) { static const WCHAR wszBlank[] = {'_','b','l','a','n','k',0};

1 0

Damjan Jovanovic : usb.h: Add USBD_STATUS codes and the USBD_VERSION_INFORMATION struct.
by Alexandre Julliard 21 Oct '09

21 Oct '09

Module: wine Branch: master Commit: 8a210f4e55cf29c7317cab43d5fcbbcb9fa3ad91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a210f4e55cf29c7317cab43d… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Oct 21 07:53:24 2009 +0200 usb.h: Add USBD_STATUS codes and the USBD_VERSION_INFORMATION struct. --- include/ddk/usb.h | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+), 0 deletions(-) diff --git a/include/ddk/usb.h b/include/ddk/usb.h index b8f5f3f..af1c10d 100644 --- a/include/ddk/usb.h +++ b/include/ddk/usb.h @@ -82,6 +82,64 @@ typedef PVOID USBD_PIPE_HANDLE; typedef PVOID USBD_CONFIGURATION_HANDLE; typedef PVOID USBD_INTERFACE_HANDLE; +#define USBD_STATUS_SUCCESS ((USBD_STATUS)0x00000000) +#define USBD_STATUS_PENDING ((USBD_STATUS)0x40000000) +#define USBD_STATUS_CRC ((USBD_STATUS)0xC0000001) +#define USBD_STATUS_BTSTUFF ((USBD_STATUS)0xC0000002) +#define USBD_STATUS_DATA_TOGGLE_MISMATCH ((USBD_STATUS)0xC0000003) +#define USBD_STATUS_STALL_PID ((USBD_STATUS)0xC0000004) +#define USBD_STATUS_DEV_NOT_RESPONDING ((USBD_STATUS)0xC0000005) +#define USBD_STATUS_PID_CHECK_FAILURE ((USBD_STATUS)0xC0000006) +#define USBD_STATUS_UNEXPECTED_PID ((USBD_STATUS)0xC0000007) +#define USBD_STATUS_DATA_OVERRUN ((USBD_STATUS)0xC0000008) +#define USBD_STATUS_DATA_UNDERRUN ((USBD_STATUS)0xC0000009) +#define USBD_STATUS_RESERVED1 ((USBD_STATUS)0xC000000A) +#define USBD_STATUS_RESERVED2 ((USBD_STATUS)0xC000000B) +#define USBD_STATUS_BUFFER_OVERRUN ((USBD_STATUS)0xC000000C) +#define USBD_STATUS_BUFFER_UNDERRUN ((USBD_STATUS)0xC000000D) +#define USBD_STATUS_NOT_ACCESSED ((USBD_STATUS)0xC000000F) +#define USBD_STATUS_FIFO ((USBD_STATUS)0xC0000010) +#define USBD_STATUS_XACT_ERROR ((USBD_STATUS)0xC0000011) +#define USBD_STATUS_BABBLE_DETECTED ((USBD_STATUS)0xC0000012) +#define USBD_STATUS_DATA_BUFFER_ERROR ((USBD_STATUS)0xC0000013) +#define USBD_STATUS_ENDPOINT_HALTED ((USBD_STATUS)0xC0000030) +#define USBD_STATUS_INVALID_URB_FUNCTION ((USBD_STATUS)0x80000200) +#define USBD_STATUS_INVALID_PARAMETER ((USBD_STATUS)0x80000300) +#define USBD_STATUS_ERROR_BUSY ((USBD_STATUS)0x80000400) +#define USBD_STATUS_INVALID_PIPE_HANDLE ((USBD_STATUS)0x80000600) +#define USBD_STATUS_NO_BANDWIDTH ((USBD_STATUS)0x80000700) +#define USBD_STATUS_INTERNAL_HC_ERROR ((USBD_STATUS)0x80000800) +#define USBD_STATUS_ERROR_SHORT_TRANSFER ((USBD_STATUS)0x80000900) +#define USBD_STATUS_BAD_START_FRAME ((USBD_STATUS)0xC0000A00) +#define USBD_STATUS_ISOCH_REQUEST_FAILED ((USBD_STATUS)0xC0000B00) +#define USBD_STATUS_FRAME_CONTROL_OWNED ((USBD_STATUS)0xC0000C00) +#define USBD_STATUS_FRAME_CONTROL_NOT_OWNED ((USBD_STATUS)0xC0000D00) +#define USBD_STATUS_NOT_SUPPORTED ((USBD_STATUS)0xC0000E00) +#define USBD_STATUS_INVALID_CONFIGURATION_DESCRIPTOR ((USBD_STATUS)0xC0000F00) +#define USBD_STATUS_INSUFFICIENT_RESOURCES ((USBD_STATUS)0xC0001000) +#define USBD_STATUS_SET_CONFIG_FAILED ((USBD_STATUS)0xC0002000) +#define USBD_STATUS_BUFFER_TOO_SMALL ((USBD_STATUS)0xC0003000) +#define USBD_STATUS_INTERFACE_NOT_FOUND ((USBD_STATUS)0xC0004000) +#define USBD_STATUS_INVALID_PIPE_FLAGS ((USBD_STATUS)0xC0005000) +#define USBD_STATUS_TIMEOUT ((USBD_STATUS)0xC0006000) +#define USBD_STATUS_DEVICE_GONE ((USBD_STATUS)0xC0007000) +#define USBD_STATUS_STATUS_NOT_MAPPED ((USBD_STATUS)0xC0008000) +#define USBD_STATUS_CANCELED ((USBD_STATUS)0xC0010000) +#define USBD_STATUS_ISO_NOT_ACCESSED_BY_HW ((USBD_STATUS)0xC0020000) +#define USBD_STATUS_ISO_TD_ERROR ((USBD_STATUS)0xC0030000) +#define USBD_STATUS_ISO_NA_LATE_USBPORT ((USBD_STATUS)0xC0040000) +#define USBD_STATUS_ISO_NOT_ACCESSED_LATE ((USBD_STATUS)0xC0050000) + +#define USBD_SUCCESS(Status) ((USBD_STATUS)(Status) >= 0) +#define USBD_PENDING(Status) ((ULONG)(Status) >> 30 == 1) +#define USBD_ERROR(Status) ((USBD_STATUS)(Status) < 0) + +typedef struct _USBD_VERSION_INFORMATION { + ULONG USBDI_Version; + ULONG Supported_USB_Version; +} USBD_VERSION_INFORMATION; +typedef struct _USBD_VERSION_INFORMATION *PUSBD_VERSION_INFORMATION; + typedef enum _USBD_PIPE_TYPE { UsbdPipeTypeControl, UsbdPipeTypeIsochronous,

1 0

Francois Gouget : hnetcfg: Make NetFwOpenPort_create() static.
by Alexandre Julliard 21 Oct '09

21 Oct '09

Module: wine Branch: master Commit: dc5bff6632df227cebcdbf997dd0877a49237074 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc5bff6632df227cebcdbf997… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Oct 21 09:34:28 2009 +0200 hnetcfg: Make NetFwOpenPort_create() static. --- dlls/hnetcfg/port.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/hnetcfg/port.c b/dlls/hnetcfg/port.c index 627ae39..c80b5f7 100644 --- a/dlls/hnetcfg/port.c +++ b/dlls/hnetcfg/port.c @@ -319,7 +319,7 @@ static const struct INetFwOpenPortVtbl fw_port_vtbl = fw_port_get_BuiltIn }; -HRESULT NetFwOpenPort_create( IUnknown *pUnkOuter, LPVOID *ppObj ) +static HRESULT NetFwOpenPort_create( IUnknown *pUnkOuter, LPVOID *ppObj ) { fw_port *fp;

1 0

Paul Vriens : winspool.drv/tests: Fix a test failure on Vista.
by Alexandre Julliard 21 Oct '09

21 Oct '09

Module: wine Branch: master Commit: ab9ee4a3fd85734d9dca1f2c90e9f03d860eacc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab9ee4a3fd85734d9dca1f2c9… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Oct 21 10:16:41 2009 +0200 winspool.drv/tests: Fix a test failure on Vista. --- dlls/winspool.drv/tests/info.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index b249a00..c6c0066 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -1712,11 +1712,11 @@ static void test_GetPrintProcessorDirectory(void) buffer[0] = '\0'; SetLastError(0xdeadbeef); res = GetPrintProcessorDirectoryA(server_does_not_exist, NULL, 1, buffer, cbBuf*2, &pcbNeeded); - /* NT: RPC_S_SERVER_UNAVAILABLE, 9x: ERROR_INVALID_PARAMETER */ - ok( !res && - (GetLastError() == RPC_S_SERVER_UNAVAILABLE || GetLastError() == ERROR_INVALID_PARAMETER), - "returned %d with %d (expected '0' with RPC_S_SERVER_UNAVAILABLE or " - "ERROR_INVALID_PARAMETER)\n", res, GetLastError()); + ok( !res, "expected failure\n"); + ok( GetLastError() == RPC_S_SERVER_UNAVAILABLE || /* NT */ + GetLastError() == ERROR_INVALID_PARAMETER || /* 9x */ + GetLastError() == RPC_S_INVALID_NET_ADDR, /* Some Vista */ + "unexpected last error %d\n", GetLastError()); HeapFree(GetProcessHeap(), 0, buffer); }

1 0

Juan Lang : crypt32: Fix duplicating a NULL CRL context.
by Alexandre Julliard 21 Oct '09

21 Oct '09

Module: wine Branch: master Commit: acc9d81f26213628545c546c758f9b9b23633a92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acc9d81f26213628545c546c7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Oct 20 09:52:36 2009 -0700 crypt32: Fix duplicating a NULL CRL context. --- dlls/crypt32/crl.c | 3 ++- dlls/crypt32/tests/crl.c | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c index 271e4e0..80fe86f 100644 --- a/dlls/crypt32/crl.c +++ b/dlls/crypt32/crl.c @@ -228,7 +228,8 @@ PCCRL_CONTEXT WINAPI CertGetCRLFromStore(HCERTSTORE hCertStore, PCCRL_CONTEXT WINAPI CertDuplicateCRLContext(PCCRL_CONTEXT pCrlContext) { TRACE("(%p)\n", pCrlContext); - Context_AddRef((void *)pCrlContext, sizeof(CRL_CONTEXT)); + if (pCrlContext) + Context_AddRef((void *)pCrlContext, sizeof(CRL_CONTEXT)); return pCrlContext; } diff --git a/dlls/crypt32/tests/crl.c b/dlls/crypt32/tests/crl.c index abd8491..1b8cb18 100644 --- a/dlls/crypt32/tests/crl.c +++ b/dlls/crypt32/tests/crl.c @@ -118,6 +118,21 @@ static void testCreateCRL(void) CertFreeCRLContext(context); } +static void testDupCRL(void) +{ + PCCRL_CONTEXT context, dupContext; + + context = CertDuplicateCRLContext(NULL); + ok(context == NULL, "expected NULL\n"); + context = CertCreateCRLContext(X509_ASN_ENCODING, signedCRL, + sizeof(signedCRL)); + dupContext = CertDuplicateCRLContext(context); + ok(dupContext != NULL, "expected a context\n"); + ok(dupContext == context, "expected identical context addresses\n"); + CertFreeCRLContext(dupContext); + CertFreeCRLContext(context); +} + static void testAddCRL(void) { HCERTSTORE store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, @@ -722,6 +737,7 @@ START_TEST(crl) init_function_pointers(); testCreateCRL(); + testDupCRL(); testAddCRL(); testFindCRL(); testGetCRLFromStore();

1 0

Juan Lang : crypt32: Fix duplicating a NULL CTL context.
by Alexandre Julliard 21 Oct '09

21 Oct '09

Module: wine Branch: master Commit: dd26bee14c92c60f92177867bf77138907d7fac1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd26bee14c92c60f92177867b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Oct 20 09:54:56 2009 -0700 crypt32: Fix duplicating a NULL CTL context. --- dlls/crypt32/ctl.c | 3 ++- dlls/crypt32/tests/ctl.c | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/ctl.c b/dlls/crypt32/ctl.c index 5a6d19b..1bd60e7 100644 --- a/dlls/crypt32/ctl.c +++ b/dlls/crypt32/ctl.c @@ -455,7 +455,8 @@ end: PCCTL_CONTEXT WINAPI CertDuplicateCTLContext(PCCTL_CONTEXT pCtlContext) { TRACE("(%p)\n", pCtlContext); - Context_AddRef((void *)pCtlContext, sizeof(CTL_CONTEXT)); + if (pCtlContext) + Context_AddRef((void *)pCtlContext, sizeof(CTL_CONTEXT)); return pCtlContext; } diff --git a/dlls/crypt32/tests/ctl.c b/dlls/crypt32/tests/ctl.c index f09420c..8ee2652 100644 --- a/dlls/crypt32/tests/ctl.c +++ b/dlls/crypt32/tests/ctl.c @@ -187,6 +187,21 @@ static void testCreateCTL(void) CertFreeCTLContext(ctl); } +static void testDupCTL(void) +{ + PCCTL_CONTEXT context, dupContext; + + context = CertDuplicateCTLContext(NULL); + ok(context == NULL, "expected NULL\n"); + context = CertCreateCTLContext(X509_ASN_ENCODING, + signedCTLWithCTLInnerContent, sizeof(signedCTLWithCTLInnerContent)); + dupContext = CertDuplicateCTLContext(context); + ok(dupContext != NULL, "expected a context\n"); + ok(dupContext == context, "expected identical context addresses\n"); + CertFreeCTLContext(dupContext); + CertFreeCTLContext(context); +} + static void checkHash(const BYTE *data, DWORD dataLen, ALG_ID algID, PCCTL_CONTEXT context, DWORD propID) { @@ -444,6 +459,7 @@ static void testAddCTLToStore(void) START_TEST(ctl) { testCreateCTL(); + testDupCTL(); testCTLProperties(); testAddCTLToStore(); }

1 0