August 2008 - Wine-Commits - list.winehq.org

Stefan Leichter : rasapi32: Fix tests on platforms winme and some win98.
by Alexandre Julliard Aug. 28, 2008

Aug. 28, 2008

Module: wine Branch: master Commit: 66f010e123910707a5aee9e9138e0a430192272a URL: http://source.winehq.org/git/wine.git/?a=commit;h=66f010e123910707a5aee9e91… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Wed Aug 27 20:10:50 2008 +0200 rasapi32: Fix tests on platforms winme and some win98. --- dlls/rasapi32/tests/rasapi.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/rasapi32/tests/rasapi.c b/dlls/rasapi32/tests/rasapi.c index bcd4310..a997e02 100644 --- a/dlls/rasapi32/tests/rasapi.c +++ b/dlls/rasapi32/tests/rasapi.c @@ -59,6 +59,10 @@ static void test_rasenum(void) win_skip("RAS configuration problem\n"); return; } + if(ERROR_SUCCESS == result) { + win_skip("RasEnumDevicesA found nothing to enumerate\n"); + return; + } trace("RasEnumDevicesA: returned %d buffersize %d\n", result, cb); ok(result == ERROR_BUFFER_TOO_SMALL, "Expected ERROR_BUFFER_TOO_SMALL, got %08d\n", result);

1 0

Juan Lang : crypt32: Don't ignore errors when encoding items in an array.
by Alexandre Julliard Aug. 28, 2008

Aug. 28, 2008

Module: wine Branch: master Commit: 2d02ec7488bf1fb08e05a59afd369a39efbe2f2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d02ec7488bf1fb08e05a59af… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 27 11:02:13 2008 -0700 crypt32: Don't ignore errors when encoding items in an array. --- dlls/crypt32/encode.c | 118 ++++++++++++++++++++++++++---------------------- 1 files changed, 64 insertions(+), 54 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 0bcdad8..addd718 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -578,27 +578,31 @@ static BOOL WINAPI CRYPT_AsnEncodeCRLEntries(DWORD dwCertEncodingType, if (ret) dataLen += size; } - CRYPT_EncodeLen(dataLen, NULL, &lenBytes); - bytesNeeded = 1 + lenBytes + dataLen; - if (!pbEncoded) - *pcbEncoded = bytesNeeded; - else + if (ret) { - if ((ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara, pbEncoded, - pcbEncoded, bytesNeeded))) + CRYPT_EncodeLen(dataLen, NULL, &lenBytes); + bytesNeeded = 1 + lenBytes + dataLen; + if (!pbEncoded) + *pcbEncoded = bytesNeeded; + else { - if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) - pbEncoded = *(BYTE **)pbEncoded; - *pbEncoded++ = ASN_SEQUENCEOF; - CRYPT_EncodeLen(dataLen, pbEncoded, &lenBytes); - pbEncoded += lenBytes; - for (i = 0; i < cCRLEntry; i++) + if ((ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara, pbEncoded, + pcbEncoded, bytesNeeded))) { - DWORD size = dataLen; + if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) + pbEncoded = *(BYTE **)pbEncoded; + *pbEncoded++ = ASN_SEQUENCEOF; + CRYPT_EncodeLen(dataLen, pbEncoded, &lenBytes); + pbEncoded += lenBytes; + for (i = 0; i < cCRLEntry; i++) + { + DWORD size = dataLen; - ret = CRYPT_AsnEncodeCRLEntry(&rgCRLEntry[i], pbEncoded, &size); - pbEncoded += size; - dataLen -= size; + ret = CRYPT_AsnEncodeCRLEntry(&rgCRLEntry[i], pbEncoded, + &size); + pbEncoded += size; + dataLen -= size; + } } } } @@ -731,28 +735,31 @@ static BOOL WINAPI CRYPT_AsnEncodeExtensions(DWORD dwCertEncodingType, if (ret) dataLen += size; } - CRYPT_EncodeLen(dataLen, NULL, &lenBytes); - bytesNeeded = 1 + lenBytes + dataLen; - if (!pbEncoded) - *pcbEncoded = bytesNeeded; - else + if (ret) { - if ((ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara, pbEncoded, - pcbEncoded, bytesNeeded))) + CRYPT_EncodeLen(dataLen, NULL, &lenBytes); + bytesNeeded = 1 + lenBytes + dataLen; + if (!pbEncoded) + *pcbEncoded = bytesNeeded; + else { - if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) - pbEncoded = *(BYTE **)pbEncoded; - *pbEncoded++ = ASN_SEQUENCEOF; - CRYPT_EncodeLen(dataLen, pbEncoded, &lenBytes); - pbEncoded += lenBytes; - for (i = 0; i < exts->cExtension; i++) + if ((ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara, + pbEncoded, pcbEncoded, bytesNeeded))) { - DWORD size = dataLen; + if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) + pbEncoded = *(BYTE **)pbEncoded; + *pbEncoded++ = ASN_SEQUENCEOF; + CRYPT_EncodeLen(dataLen, pbEncoded, &lenBytes); + pbEncoded += lenBytes; + for (i = 0; i < exts->cExtension; i++) + { + DWORD size = dataLen; - ret = CRYPT_AsnEncodeExtension(&exts->rgExtension[i], - pbEncoded, &size); - pbEncoded += size; - dataLen -= size; + ret = CRYPT_AsnEncodeExtension(&exts->rgExtension[i], + pbEncoded, &size); + pbEncoded += size; + dataLen -= size; + } } } } @@ -1459,29 +1466,32 @@ static BOOL WINAPI CRYPT_AsnEncodeSMIMECapabilities(DWORD dwCertEncodingType, if (ret) dataLen += size; } - CRYPT_EncodeLen(dataLen, NULL, &lenBytes); - bytesNeeded = 1 + lenBytes + dataLen; - if (!pbEncoded) - *pcbEncoded = bytesNeeded; - else + if (ret) { - if ((ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara, pbEncoded, - pcbEncoded, bytesNeeded))) + CRYPT_EncodeLen(dataLen, NULL, &lenBytes); + bytesNeeded = 1 + lenBytes + dataLen; + if (!pbEncoded) + *pcbEncoded = bytesNeeded; + else { - if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) - pbEncoded = *(BYTE **)pbEncoded; - *pbEncoded++ = ASN_SEQUENCEOF; - CRYPT_EncodeLen(dataLen, pbEncoded, &lenBytes); - pbEncoded += lenBytes; - for (i = 0; i < capabilities->cCapability; i++) + if ((ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara, + pbEncoded, pcbEncoded, bytesNeeded))) { - DWORD size = dataLen; + if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) + pbEncoded = *(BYTE **)pbEncoded; + *pbEncoded++ = ASN_SEQUENCEOF; + CRYPT_EncodeLen(dataLen, pbEncoded, &lenBytes); + pbEncoded += lenBytes; + for (i = 0; i < capabilities->cCapability; i++) + { + DWORD size = dataLen; - ret = CRYPT_AsnEncodeSMIMECapability(dwCertEncodingType, - NULL, &capabilities->rgCapability[i], 0, NULL, pbEncoded, - &size); - pbEncoded += size; - dataLen -= size; + ret = CRYPT_AsnEncodeSMIMECapability(dwCertEncodingType, + NULL, &capabilities->rgCapability[i], 0, NULL, + pbEncoded, &size); + pbEncoded += size; + dataLen -= size; + } } } }

1 0

Juan Lang : crypt32: Implement authority info access decoding.
by Alexandre Julliard Aug. 28, 2008

Aug. 28, 2008

Module: wine Branch: master Commit: e594d24006906d33484de66216cadbad3d6de787 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e594d24006906d33484de6621… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 27 10:56:56 2008 -0700 crypt32: Implement authority info access decoding. --- dlls/crypt32/decode.c | 51 +++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/encode.c | 3 -- 2 files changed, 51 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index a624823..39a4684 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -2640,6 +2640,52 @@ static BOOL WINAPI CRYPT_AsnDecodeAuthorityKeyId2(DWORD dwCertEncodingType, return ret; } +static BOOL CRYPT_AsnDecodeAccessDescription(const BYTE *pbEncoded, + DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, + DWORD *pcbDecoded) +{ + struct AsnDecodeSequenceItem items[] = { + { 0, offsetof(CERT_ACCESS_DESCRIPTION, pszAccessMethod), + CRYPT_AsnDecodeOidInternal, sizeof(LPSTR), FALSE, TRUE, + offsetof(CERT_ACCESS_DESCRIPTION, pszAccessMethod), 0 }, + { 0, offsetof(CERT_ACCESS_DESCRIPTION, AccessLocation), + CRYPT_AsnDecodeAltNameEntry, sizeof(CERT_ALT_NAME_ENTRY), FALSE, + TRUE, offsetof(CERT_ACCESS_DESCRIPTION, AccessLocation.u.pwszURL), 0 }, + }; + CERT_ACCESS_DESCRIPTION *descr = (CERT_ACCESS_DESCRIPTION *)pvStructInfo; + + return CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + pbEncoded, cbEncoded, dwFlags, NULL, pvStructInfo, pcbStructInfo, + pcbDecoded, descr ? descr->pszAccessMethod : NULL); +} + +static BOOL WINAPI CRYPT_AsnDecodeAuthorityInfoAccess(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, + PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) +{ + BOOL ret; + + TRACE("%p, %d, %08x, %p, %p, %d\n", pbEncoded, cbEncoded, dwFlags, + pDecodePara, pvStructInfo, *pcbStructInfo); + + __TRY + { + struct AsnArrayDescriptor arrayDesc = { ASN_SEQUENCEOF, + CRYPT_AsnDecodeAccessDescription, sizeof(CERT_ACCESS_DESCRIPTION), + TRUE, offsetof(CERT_ACCESS_DESCRIPTION, pszAccessMethod) }; + + ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags, + pDecodePara, pvStructInfo, pcbStructInfo, NULL, NULL); + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + ret = FALSE; + } + __ENDTRY + return ret; +} + static BOOL CRYPT_AsnDecodePKCSContent(const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded) { @@ -4686,6 +4732,9 @@ static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, case LOWORD(X509_AUTHORITY_KEY_ID2): decodeFunc = CRYPT_AsnDecodeAuthorityKeyId2; break; + case LOWORD(X509_AUTHORITY_INFO_ACCESS): + decodeFunc = CRYPT_AsnDecodeAuthorityInfoAccess; + break; case LOWORD(PKCS_CONTENT_INFO): decodeFunc = CRYPT_AsnDecodePKCSContentInfo; break; @@ -4759,6 +4808,8 @@ static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, decodeFunc = CRYPT_AsnDecodeIssuingDistPoint; else if (!strcmp(lpszStructType, szOID_NAME_CONSTRAINTS)) decodeFunc = CRYPT_AsnDecodeNameConstraints; + else if (!strcmp(lpszStructType, szOID_AUTHORITY_INFO_ACCESS)) + decodeFunc = CRYPT_AsnDecodeAuthorityInfoAccess; return decodeFunc; } diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index d4d19aa..b0a4eea 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -4888,7 +4888,6 @@ static void test_decodeAuthorityInfoAccess(DWORD dwEncoding) ret = CryptDecodeObjectEx(dwEncoding, X509_AUTHORITY_INFO_ACCESS, emptySequence, sizeof(emptySequence), CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); - todo_wine ok(ret, "CryptDecodeObjectEx failed: %x\n", GetLastError()); if (buf) { @@ -4902,7 +4901,6 @@ static void test_decodeAuthorityInfoAccess(DWORD dwEncoding) ret = CryptDecodeObjectEx(dwEncoding, X509_AUTHORITY_INFO_ACCESS, authorityInfoAccessWithUrl, sizeof(authorityInfoAccessWithUrl), CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); - todo_wine ok(ret, "CryptDecodeObjectEx failed: %x\n", GetLastError()); if (buf) { @@ -4923,7 +4921,6 @@ static void test_decodeAuthorityInfoAccess(DWORD dwEncoding) authorityInfoAccessWithUrlAndIPAddr, sizeof(authorityInfoAccessWithUrlAndIPAddr), CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); - todo_wine ok(ret, "CryptDecodeObjectEx failed: %x\n", GetLastError()); if (buf) {

1 0

Juan Lang : crypt32: Test encoding/ decoding the authority info access extension.
by Alexandre Julliard Aug. 28, 2008

Aug. 28, 2008

Module: wine Branch: master Commit: 76f400b77137addbe805cdedc9c19819401613ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=76f400b77137addbe805cdedc… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 27 09:58:46 2008 -0700 crypt32: Test encoding/decoding the authority info access extension. --- dlls/crypt32/tests/encode.c | 181 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 181 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index d6bcf61..01d05c9 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -4775,6 +4775,185 @@ static void test_decodeAuthorityKeyId2(DWORD dwEncoding) } } +static const BYTE authorityInfoAccessWithUrl[] = { +0x30,0x19,0x30,0x17,0x06,0x02,0x2a,0x03,0x86,0x11,0x68,0x74,0x74,0x70,0x3a, +0x2f,0x2f,0x77,0x69,0x6e,0x65,0x68,0x71,0x2e,0x6f,0x72,0x67 }; +static const BYTE authorityInfoAccessWithUrlAndIPAddr[] = { +0x30,0x29,0x30,0x17,0x06,0x02,0x2a,0x03,0x86,0x11,0x68,0x74,0x74,0x70,0x3a, +0x2f,0x2f,0x77,0x69,0x6e,0x65,0x68,0x71,0x2e,0x6f,0x72,0x67,0x30,0x0e,0x06, +0x02,0x2d,0x06,0x87,0x08,0x30,0x06,0x87,0x04,0x7f,0x00,0x00,0x01 }; + +static void test_encodeAuthorityInfoAccess(DWORD dwEncoding) +{ + static char oid1[] = "1.2.3"; + static char oid2[] = "1.5.6"; + BOOL ret; + BYTE *buf = NULL; + DWORD size = 0; + CERT_ACCESS_DESCRIPTION accessDescription[2]; + CERT_AUTHORITY_INFO_ACCESS aia; + + memset(accessDescription, 0, sizeof(accessDescription)); + aia.cAccDescr = 0; + aia.rgAccDescr = NULL; + /* Having no access descriptions is allowed */ + ret = CryptEncodeObjectEx(dwEncoding, X509_AUTHORITY_INFO_ACCESS, &aia, + CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + todo_wine + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (buf) + { + ok(size == sizeof(emptySequence), "unexpected size %d\n", size); + ok(!memcmp(buf, emptySequence, size), "unexpected value\n"); + LocalFree(buf); + buf = NULL; + } + /* It can't have an empty access method */ + aia.cAccDescr = 1; + aia.rgAccDescr = accessDescription; + ret = CryptEncodeObjectEx(dwEncoding, X509_AUTHORITY_INFO_ACCESS, &aia, + CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + todo_wine + ok(!ret && GetLastError() == E_INVALIDARG, + "expected E_INVALIDARG, got %08x\n", GetLastError()); + /* It can't have an empty location */ + accessDescription[0].pszAccessMethod = oid1; + SetLastError(0xdeadbeef); + ret = CryptEncodeObjectEx(dwEncoding, X509_AUTHORITY_INFO_ACCESS, &aia, + CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + todo_wine + ok(!ret && GetLastError() == E_INVALIDARG, + "expected E_INVALIDARG, got %08x\n", GetLastError()); + accessDescription[0].AccessLocation.dwAltNameChoice = CERT_ALT_NAME_URL; + accessDescription[0].AccessLocation.pwszURL = (LPWSTR)url; + ret = CryptEncodeObjectEx(dwEncoding, X509_AUTHORITY_INFO_ACCESS, &aia, + CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + todo_wine + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (buf) + { + ok(size == sizeof(authorityInfoAccessWithUrl), "unexpected size %d\n", + size); + ok(!memcmp(buf, authorityInfoAccessWithUrl, size), + "unexpected value\n"); + LocalFree(buf); + buf = NULL; + } + accessDescription[1].pszAccessMethod = oid2; + accessDescription[1].AccessLocation.dwAltNameChoice = + CERT_ALT_NAME_IP_ADDRESS; + accessDescription[1].AccessLocation.IPAddress.cbData = + sizeof(encodedIPAddr); + accessDescription[1].AccessLocation.IPAddress.pbData = + (LPBYTE)encodedIPAddr; + aia.cAccDescr = 2; + ret = CryptEncodeObjectEx(dwEncoding, X509_AUTHORITY_INFO_ACCESS, &aia, + CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + todo_wine + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (buf) + { + ok(size == sizeof(authorityInfoAccessWithUrlAndIPAddr), + "unexpected size %d\n", size); + ok(!memcmp(buf, authorityInfoAccessWithUrlAndIPAddr, size), + "unexpected value\n"); + LocalFree(buf); + buf = NULL; + } +} + +static void compareAuthorityInfoAccess(LPCSTR header, + const CERT_AUTHORITY_INFO_ACCESS *expected, + const CERT_AUTHORITY_INFO_ACCESS *got) +{ + DWORD i; + + ok(expected->cAccDescr == got->cAccDescr, + "%s: expected %d access descriptions, got %d\n", header, + expected->cAccDescr, got->cAccDescr); + for (i = 0; i < expected->cAccDescr; i++) + { + ok(!strcmp(expected->rgAccDescr[i].pszAccessMethod, + got->rgAccDescr[i].pszAccessMethod), "%s[%d]: expected %s, got %s\n", + header, i, expected->rgAccDescr[i].pszAccessMethod, + got->rgAccDescr[i].pszAccessMethod); + compareAltNameEntry(&expected->rgAccDescr[i].AccessLocation, + &got->rgAccDescr[i].AccessLocation); + } +} + +static void test_decodeAuthorityInfoAccess(DWORD dwEncoding) +{ + static char oid1[] = "1.2.3"; + static char oid2[] = "1.5.6"; + BOOL ret; + LPBYTE buf = NULL; + DWORD size = 0; + + ret = CryptDecodeObjectEx(dwEncoding, X509_AUTHORITY_INFO_ACCESS, + emptySequence, sizeof(emptySequence), CRYPT_DECODE_ALLOC_FLAG, NULL, + (BYTE *)&buf, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %x\n", GetLastError()); + if (buf) + { + CERT_AUTHORITY_INFO_ACCESS aia = { 0, NULL }; + + compareAuthorityInfoAccess("empty AIA", &aia, + (CERT_AUTHORITY_INFO_ACCESS *)buf); + LocalFree(buf); + buf = NULL; + } + ret = CryptDecodeObjectEx(dwEncoding, X509_AUTHORITY_INFO_ACCESS, + authorityInfoAccessWithUrl, sizeof(authorityInfoAccessWithUrl), + CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %x\n", GetLastError()); + if (buf) + { + CERT_ACCESS_DESCRIPTION accessDescription; + CERT_AUTHORITY_INFO_ACCESS aia; + + accessDescription.pszAccessMethod = oid1; + accessDescription.AccessLocation.dwAltNameChoice = CERT_ALT_NAME_URL; + accessDescription.AccessLocation.pwszURL = (LPWSTR)url; + aia.cAccDescr = 1; + aia.rgAccDescr = &accessDescription; + compareAuthorityInfoAccess("AIA with URL", &aia, + (CERT_AUTHORITY_INFO_ACCESS *)buf); + LocalFree(buf); + buf = NULL; + } + ret = CryptDecodeObjectEx(dwEncoding, X509_AUTHORITY_INFO_ACCESS, + authorityInfoAccessWithUrlAndIPAddr, + sizeof(authorityInfoAccessWithUrlAndIPAddr), CRYPT_DECODE_ALLOC_FLAG, + NULL, (BYTE *)&buf, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %x\n", GetLastError()); + if (buf) + { + CERT_ACCESS_DESCRIPTION accessDescription[2]; + CERT_AUTHORITY_INFO_ACCESS aia; + + accessDescription[0].pszAccessMethod = oid1; + accessDescription[0].AccessLocation.dwAltNameChoice = CERT_ALT_NAME_URL; + accessDescription[0].AccessLocation.pwszURL = (LPWSTR)url; + accessDescription[1].pszAccessMethod = oid2; + accessDescription[1].AccessLocation.dwAltNameChoice = + CERT_ALT_NAME_IP_ADDRESS; + accessDescription[1].AccessLocation.IPAddress.cbData = + sizeof(encodedIPAddr); + accessDescription[1].AccessLocation.IPAddress.pbData = + (LPBYTE)encodedIPAddr; + aia.cAccDescr = 2; + aia.rgAccDescr = accessDescription; + compareAuthorityInfoAccess("AIA with URL and IP addr", &aia, + (CERT_AUTHORITY_INFO_ACCESS *)buf); + LocalFree(buf); + buf = NULL; + } +} + static const BYTE emptyPKCSContentInfo[] = { 0x30,0x04,0x06,0x02,0x2a,0x03 }; static const BYTE emptyPKCSContentInfoExtraBytes[] = { 0x30,0x04,0x06,0x02,0x2a, 0x03,0,0,0,0,0,0 }; @@ -6433,6 +6612,8 @@ START_TEST(encode) test_decodeAuthorityKeyId(encodings[i]); test_encodeAuthorityKeyId2(encodings[i]); test_decodeAuthorityKeyId2(encodings[i]); + test_encodeAuthorityInfoAccess(encodings[i]); + test_decodeAuthorityInfoAccess(encodings[i]); test_encodePKCSContentInfo(encodings[i]); test_decodePKCSContentInfo(encodings[i]); test_encodePKCSAttribute(encodings[i]);

1 0

Juan Lang : crypt32: Implement authority info access encoding.
by Alexandre Julliard Aug. 28, 2008

Aug. 28, 2008

Module: wine Branch: master Commit: 7e848b6cdc798f885d5a5642fe32d57483e601b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e848b6cdc798f885d5a5642f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 27 10:17:09 2008 -0700 crypt32: Implement authority info access encoding. --- dlls/crypt32/encode.c | 82 +++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/encode.c | 5 --- 2 files changed, 82 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index c935396..0bcdad8 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -2347,6 +2347,83 @@ static BOOL WINAPI CRYPT_AsnEncodeAuthorityKeyId2(DWORD dwCertEncodingType, return ret; } +static BOOL WINAPI CRYPT_AsnEncodeAccessDescription( + const CERT_ACCESS_DESCRIPTION *descr, BYTE *pbEncoded, DWORD *pcbEncoded) +{ + struct AsnEncodeSequenceItem items[] = { + { descr->pszAccessMethod, CRYPT_AsnEncodeOid, 0 }, + { &descr->AccessLocation, CRYPT_AsnEncodeAltNameEntry, 0 }, + }; + + if (!descr->pszAccessMethod) + { + SetLastError(E_INVALIDARG); + return FALSE; + } + return CRYPT_AsnEncodeSequence(X509_ASN_ENCODING, items, + sizeof(items) / sizeof(items[0]), 0, NULL, pbEncoded, pcbEncoded); +} + +static BOOL WINAPI CRYPT_AsnEncodeAuthorityInfoAccess(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, + PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) +{ + BOOL ret; + + __TRY + { + DWORD bytesNeeded, dataLen, lenBytes, i; + const CERT_AUTHORITY_INFO_ACCESS *info = + (const CERT_AUTHORITY_INFO_ACCESS *)pvStructInfo; + + ret = TRUE; + for (i = 0, dataLen = 0; ret && i < info->cAccDescr; i++) + { + DWORD size; + + ret = CRYPT_AsnEncodeAccessDescription(&info->rgAccDescr[i], NULL, + &size); + if (ret) + dataLen += size; + } + if (ret) + { + CRYPT_EncodeLen(dataLen, NULL, &lenBytes); + bytesNeeded = 1 + lenBytes + dataLen; + if (!pbEncoded) + *pcbEncoded = bytesNeeded; + else + { + if ((ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara, + pbEncoded, pcbEncoded, bytesNeeded))) + { + if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) + pbEncoded = *(BYTE **)pbEncoded; + *pbEncoded++ = ASN_SEQUENCEOF; + CRYPT_EncodeLen(dataLen, pbEncoded, &lenBytes); + pbEncoded += lenBytes; + for (i = 0; i < info->cAccDescr; i++) + { + DWORD size = dataLen; + + ret = CRYPT_AsnEncodeAccessDescription( + &info->rgAccDescr[i], pbEncoded, &size); + pbEncoded += size; + dataLen -= size; + } + } + } + } + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + ret = FALSE; + } + __ENDTRY + return ret; +} + static BOOL WINAPI CRYPT_AsnEncodeBasicConstraints(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) @@ -3762,6 +3839,9 @@ static CryptEncodeObjectExFunc CRYPT_GetBuiltinEncoder(DWORD dwCertEncodingType, case LOWORD(X509_AUTHORITY_KEY_ID2): encodeFunc = CRYPT_AsnEncodeAuthorityKeyId2; break; + case LOWORD(X509_AUTHORITY_INFO_ACCESS): + encodeFunc = CRYPT_AsnEncodeAuthorityInfoAccess; + break; case LOWORD(X509_SEQUENCE_OF_ANY): encodeFunc = CRYPT_AsnEncodeSequenceOfAny; break; @@ -3832,6 +3912,8 @@ static CryptEncodeObjectExFunc CRYPT_GetBuiltinEncoder(DWORD dwCertEncodingType, encodeFunc = CRYPT_AsnEncodeIssuingDistPoint; else if (!strcmp(lpszStructType, szOID_NAME_CONSTRAINTS)) encodeFunc = CRYPT_AsnEncodeNameConstraints; + else if (!strcmp(lpszStructType, szOID_AUTHORITY_INFO_ACCESS)) + encodeFunc = CRYPT_AsnEncodeAuthorityInfoAccess; return encodeFunc; } diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 01d05c9..d4d19aa 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -4799,7 +4799,6 @@ static void test_encodeAuthorityInfoAccess(DWORD dwEncoding) /* Having no access descriptions is allowed */ ret = CryptEncodeObjectEx(dwEncoding, X509_AUTHORITY_INFO_ACCESS, &aia, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); - todo_wine ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); if (buf) { @@ -4813,7 +4812,6 @@ static void test_encodeAuthorityInfoAccess(DWORD dwEncoding) aia.rgAccDescr = accessDescription; ret = CryptEncodeObjectEx(dwEncoding, X509_AUTHORITY_INFO_ACCESS, &aia, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError()); /* It can't have an empty location */ @@ -4821,14 +4819,12 @@ static void test_encodeAuthorityInfoAccess(DWORD dwEncoding) SetLastError(0xdeadbeef); ret = CryptEncodeObjectEx(dwEncoding, X509_AUTHORITY_INFO_ACCESS, &aia, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError()); accessDescription[0].AccessLocation.dwAltNameChoice = CERT_ALT_NAME_URL; accessDescription[0].AccessLocation.pwszURL = (LPWSTR)url; ret = CryptEncodeObjectEx(dwEncoding, X509_AUTHORITY_INFO_ACCESS, &aia, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); - todo_wine ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); if (buf) { @@ -4849,7 +4845,6 @@ static void test_encodeAuthorityInfoAccess(DWORD dwEncoding) aia.cAccDescr = 2; ret = CryptEncodeObjectEx(dwEncoding, X509_AUTHORITY_INFO_ACCESS, &aia, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); - todo_wine ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); if (buf) {

1 0

Paul Vriens : msi/tests: Remove service tests.
by Alexandre Julliard Aug. 28, 2008

Aug. 28, 2008

Module: wine Branch: master Commit: dd0ec9f811142e9f9b90365234f498ed5e40daef URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd0ec9f811142e9f9b9036523… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Aug 27 17:08:35 2008 +0200 msi/tests: Remove service tests. --- dlls/msi/tests/automation.c | 51 ++++-------------------------------------- 1 files changed, 5 insertions(+), 46 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 683de7a..8ea639a 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -63,8 +63,7 @@ static const CHAR component_dat[] = "Component\tComponentId\tDirectory_\tAttribu "Three\t{010B6ADD-B27D-4EDD-9B3D-34C4F7D61684}\tCHANGEDDIR\t2\t\tthree.txt\n" "Two\t{BF03D1A6-20DA-4A65-82F3-6CAC995915CE}\tFIRSTDIR\t2\t\ttwo.txt\n" "dangler\t{6091DF25-EF96-45F1-B8E9-A9B1420C7A3C}\tTARGETDIR\t4\t\tregdata\n" - "component\t\tMSITESTDIR\t0\t1\tfile\n" - "service_comp\t\tMSITESTDIR\t0\t1\tservice_file"; + "component\t\tMSITESTDIR\t0\t1\tfile\n"; static const CHAR directory_dat[] = "Directory\tDirectory_Parent\tDefaultDir\n" "s72\tS72\tl255\n" @@ -85,8 +84,7 @@ static const CHAR feature_dat[] = "Feature\tFeature_Parent\tTitle\tDescription\t "One\t\tOne\tThe One Feature\t1\t3\tMSITESTDIR\t0\n" "Three\tOne\tThree\tThe Three Feature\t3\t3\tCHANGEDDIR\t0\n" "Two\tOne\tTwo\tThe Two Feature\t2\t3\tFIRSTDIR\t0\n" - "feature\t\t\t\t2\t1\tTARGETDIR\t0\n" - "service_feature\t\t\t\t2\t1\tTARGETDIR\t0"; + "feature\t\t\t\t2\t1\tTARGETDIR\t0\n"; static const CHAR feature_comp_dat[] = "Feature_\tComponent_\n" "s38\ts72\n" @@ -96,8 +94,7 @@ static const CHAR feature_comp_dat[] = "Feature_\tComponent_\n" "One\tOne\n" "Three\tThree\n" "Two\tTwo\n" - "feature\tcomponent\n" - "service_feature\tservice_comp\n"; + "feature\tcomponent\n"; static const CHAR file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" @@ -107,8 +104,7 @@ static const CHAR file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tL "one.txt\tOne\tone.txt\t1000\t\t\t0\t1\n" "three.txt\tThree\tthree.txt\t1000\t\t\t0\t3\n" "two.txt\tTwo\ttwo.txt\t1000\t\t\t0\t2\n" - "file\tcomponent\tfilename\t100\t\t\t8192\t1\n" - "service_file\tservice_comp\tservice.exe\t100\t\t\t8192\t1"; + "file\tcomponent\tfilename\t100\t\t\t8192\t1\n"; static const CHAR install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "s72\tS255\tI2\n" @@ -118,7 +114,6 @@ static const CHAR install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "CostInitialize\t\t800\n" "FileCost\t\t900\n" "InstallFiles\t\t4000\n" - "InstallServices\t\t5000\n" "RegisterProduct\t\t6100\n" "PublishProduct\t\t6400\n" "InstallFinalize\t\t6600\n" @@ -158,17 +153,6 @@ static const CHAR registry_dat[] = "Registry\tRoot\tKey\tName\tValue\tComponent_ "regdata\t2\tSOFTWARE\\Wine\\msitest\tblah\tbad\tdangler\n" "OrderTest\t2\tSOFTWARE\\Wine\\msitest\tOrderTestName\tOrderTestValue\tcomponent"; -static const CHAR service_install_dat[] = "ServiceInstall\tName\tDisplayName\tServiceType\tStartType\tErrorControl\t" - "LoadOrderGroup\tDependencies\tStartName\tPassword\tArguments\tComponent_\tDescription\n" - "s72\ts255\tL255\ti4\ti4\ti4\tS255\tS255\tS255\tS255\tS255\ts72\tL255\n" - "ServiceInstall\tServiceInstall\n" - "TestService\tTestService\tTestService\t2\t3\t0\t\t\tTestService\t\t\tservice_comp\t\t"; - -static const CHAR service_control_dat[] = "ServiceControl\tName\tEvent\tArguments\tWait\tComponent_\n" - "s72\tl255\ti2\tL255\tI2\ts72\n" - "ServiceControl\tServiceControl\n" - "ServiceControl\tTestService\t8\t\t0\tservice_comp"; - typedef struct _msi_table { const CHAR *filename; @@ -188,9 +172,7 @@ static const msi_table tables[] = ADD_TABLE(install_exec_seq), ADD_TABLE(media), ADD_TABLE(property), - ADD_TABLE(registry), - ADD_TABLE(service_install), - ADD_TABLE(service_control) + ADD_TABLE(registry) }; typedef struct _msi_summary_info @@ -343,7 +325,6 @@ static void create_test_files(void) CreateDirectoryA("msitest\\cabout\\new",NULL); create_file("msitest\\cabout\\new\\five.txt", 100); create_file("msitest\\filename", 100); - create_file("msitest\\service.exe", 100); } static BOOL delete_pf(const CHAR *rel_path, BOOL is_file) @@ -368,7 +349,6 @@ static void delete_test_files(void) DeleteFileA("msitest\\second\\three.txt"); DeleteFileA("msitest\\first\\two.txt"); DeleteFileA("msitest\\one.txt"); - DeleteFileA("msitest\\service.exe"); DeleteFileA("msitest\\filename"); RemoveDirectoryA("msitest\\cabout\\new"); RemoveDirectoryA("msitest\\cabout"); @@ -377,24 +357,6 @@ static void delete_test_files(void) RemoveDirectoryA("msitest"); } -static void check_service_is_installed(void) -{ - SC_HANDLE scm, service; - BOOL res; - - scm = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); - ok(scm != NULL, "Failed to open the SC Manager\n"); - - service = OpenService(scm, "TestService", SC_MANAGER_ALL_ACCESS); - ok(service != NULL, "Failed to open TestService\n"); - - res = DeleteService(service); - ok(res, "Failed to delete TestService\n"); - - CloseServiceHandle(service); - CloseServiceHandle(scm); -} - /* * Automation helpers and tests */ @@ -2272,7 +2234,6 @@ static void test_Installer_InstallProduct(void) ok(delete_pf("msitest\\first", FALSE), "File not installed\n"); ok(delete_pf("msitest\\one.txt", TRUE), "File not installed\n"); ok(delete_pf("msitest\\filename", TRUE), "File not installed\n"); - ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n"); res = RegOpenKey(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest", &hkey); @@ -2306,8 +2267,6 @@ static void test_Installer_InstallProduct(void) res = RegDeleteKeyA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest"); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - check_service_is_installed(); - /* Remove registry keys written by RegisterProduct standard action */ res = RegDeleteKeyA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{F1C3AF50-8B56-4A69-A00C-00773FE42F30}"); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);

1 0

Vijay Kiran Kamuju : advapi32: Add stub for ConvertToAutoInheritPrivateObjectSecurity.
by Alexandre Julliard Aug. 28, 2008

Aug. 28, 2008

Module: wine Branch: master Commit: d2625be02fc0e153f5666028b0d558c5c715a880 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2625be02fc0e153f5666028b… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Aug 27 10:40:37 2008 -0400 advapi32: Add stub for ConvertToAutoInheritPrivateObjectSecurity. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/security.c | 13 +++++++++++++ include/winbase.h | 1 + 3 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 4189458..cb4dd4d 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -87,7 +87,7 @@ @ stdcall ConvertStringSecurityDescriptorToSecurityDescriptorW(wstr long ptr ptr) @ stdcall ConvertStringSidToSidA(ptr ptr) @ stdcall ConvertStringSidToSidW(ptr ptr) -# @ stub ConvertToAutoInheritPrivateObjectSecurity +@ stdcall ConvertToAutoInheritPrivateObjectSecurity(ptr ptr ptr ptr long ptr) @ stdcall CopySid(long ptr ptr) # @ stub CreateCodeAuthzLevel @ stdcall CreatePrivateObjectSecurity(ptr ptr ptr long long ptr) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 6a19ef0..ef9ce6e 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -4553,6 +4553,19 @@ BOOL WINAPI ConvertSidToStringSidA(PSID pSid, LPSTR *pstr) return TRUE; } +BOOL WINAPI ConvertToAutoInheritPrivateObjectSecurity( + PSECURITY_DESCRIPTOR pdesc, + PSECURITY_DESCRIPTOR cdesc, + PSECURITY_DESCRIPTOR* ndesc, + GUID* objtype, + BOOL isdir, + PGENERIC_MAPPING genmap ) +{ + FIXME("%p %p %p %p %d %p - stub\n", pdesc, cdesc, ndesc, objtype, isdir, genmap); + + return FALSE; +} + BOOL WINAPI CreatePrivateObjectSecurity( PSECURITY_DESCRIPTOR ParentDescriptor, PSECURITY_DESCRIPTOR CreatorDescriptor, diff --git a/include/winbase.h b/include/winbase.h index cf0345b..f7ccb8c 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1338,6 +1338,7 @@ WINBASEAPI INT WINAPI CompareFileTime(const FILETIME*,const FILETIME*); WINBASEAPI BOOL WINAPI ConvertFiberToThread(void); WINBASEAPI LPVOID WINAPI ConvertThreadToFiber(LPVOID); WINBASEAPI LPVOID WINAPI ConvertThreadToFiberEx(LPVOID,DWORD); +WINADVAPI BOOL WINAPI ConvertToAutoInheritPrivateObjectSecurity(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR*,GUID*,BOOL,PGENERIC_MAPPING); WINBASEAPI HANDLE WINAPI CreateActCtxA(PCACTCTXA); WINBASEAPI HANDLE WINAPI CreateActCtxW(PCACTCTXW); #define CreateActCtx WINELIB_NAME_AW(CreateActCtx)

1 0

Paul Vriens : netapi32/tests: Fix the error text.
by Alexandre Julliard Aug. 27, 2008

Aug. 27, 2008

Module: wine Branch: master Commit: d8339f2eed8ca5b5d49f18abe69a243d7237555f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8339f2eed8ca5b5d49f18abe… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Aug 27 13:19:01 2008 +0200 netapi32/tests: Fix the error text. --- dlls/netapi32/tests/access.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/tests/access.c b/dlls/netapi32/tests/access.c index f46cb7f..f8536a7 100644 --- a/dlls/netapi32/tests/access.c +++ b/dlls/netapi32/tests/access.c @@ -217,7 +217,7 @@ static void run_querydisplayinformation1_tests(void) pNetApiBufferFree(Buffer); } while (Result == ERROR_MORE_DATA); - ok(hasAdmin, "Has Administrator account\n"); + ok(hasAdmin, "Doesn't have 'Administrator' account\n"); } static void run_usermodalsget_tests(void)

1 0

Alexandre Julliard : ntdll/tests: Fix a few more failures in the info test.
by Alexandre Julliard Aug. 27, 2008

Aug. 27, 2008

Module: wine Branch: master Commit: 45a0f45cddca47d2e304fa650da2204a2baf34da URL: http://source.winehq.org/git/wine.git/?a=commit;h=45a0f45cddca47d2e304fa650… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 27 14:19:23 2008 +0200 ntdll/tests: Fix a few more failures in the info test. --- dlls/ntdll/tests/info.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 4a0b017..74f180e 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -358,7 +358,8 @@ static void test_query_procperf(void) /* A too large given buffer size */ sppi = HeapReAlloc(GetProcessHeap(), 0, sppi , NeededLength + 2); status = pNtQuerySystemInformation(SystemProcessorPerformanceInformation, sppi, NeededLength + 2, &ReturnLength); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( status == STATUS_SUCCESS || status == STATUS_INFO_LENGTH_MISMATCH /* vista */, + "Expected STATUS_SUCCESS or STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); ok( NeededLength == ReturnLength, "Inconsistent length (%d) <-> (%d)\n", NeededLength, ReturnLength); HeapFree( GetProcessHeap(), 0, sppi); @@ -407,12 +408,10 @@ static void test_query_handle(void) SYSTEM_HANDLE_INFORMATION* shi = HeapAlloc(GetProcessHeap(), 0, SystemInformationLength); /* Request the needed length : a SystemInformationLength greater than one struct sets ReturnLength */ - status = pNtQuerySystemInformation(SystemHandleInformation, shi, 0, &ReturnLength); - - ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); - ok( ReturnLength > 0, "Expected ReturnLength to be > 0, it was %d\n", ReturnLength); + status = pNtQuerySystemInformation(SystemHandleInformation, shi, SystemInformationLength, &ReturnLength); + todo_wine ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); - SystemInformationLength = ReturnLength + sizeof(HANDLE); + SystemInformationLength = ReturnLength; shi = HeapReAlloc(GetProcessHeap(), 0, shi , SystemInformationLength); status = pNtQuerySystemInformation(SystemHandleInformation, shi, SystemInformationLength, &ReturnLength); if (status != STATUS_INFO_LENGTH_MISMATCH) /* vista */ @@ -822,7 +821,7 @@ static void test_readvirtualmemory(void) /* illegal remote address */ todo_wine{ status = pNtReadVirtualMemory(process, (void *) 0x1234, buffer, 12, &readcount); - ok( status == STATUS_PARTIAL_COPY, "Expected STATUS_PARTIAL_COPY, got %08x\n", status); + ok( status == STATUS_PARTIAL_COPY || broken(status == STATUS_ACCESS_VIOLATION), "Expected STATUS_PARTIAL_COPY, got %08x\n", status); if (status == STATUS_PARTIAL_COPY) ok( readcount == 0, "Expected to read 0 bytes, got %ld\n",readcount); }

1 0

Aric Stewart : user32: Add test demonstrating the WM_PAINT loop.
by Alexandre Julliard Aug. 27, 2008

Aug. 27, 2008

Module: wine Branch: master Commit: 3f9aec17cd7ecb01ea72747d7f9e1f6572b1303b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f9aec17cd7ecb01ea72747d7… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Aug 26 09:55:05 2008 -0500 user32: Add test demonstrating the WM_PAINT loop. --- dlls/user32/tests/msg.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 7480e1b..62cc2dc 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -1584,6 +1584,7 @@ static int after_end_dialog, test_def_id; static int sequence_cnt, sequence_size; static struct message* sequence; static int log_all_parent_messages; +static int paint_loop_done; /* user32 functions */ static HWND (WINAPI *pGetAncestor)(HWND,UINT); @@ -7039,6 +7040,31 @@ static LRESULT WINAPI ShowWindowProcA(HWND hwnd, UINT message, WPARAM wParam, LP return ret; } +LRESULT WINAPI PaintLoopProcA(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch (msg) + { + case WM_CREATE: return 0; + case WM_PAINT: + { + MSG msg2; + static int i = 0; + + i++; + if (PeekMessageA(&msg2, 0, 0, 0, 1)) + { + TranslateMessage(&msg2); + DispatchMessage(&msg2); + } + i--; + if ( i == 0) + paint_loop_done = 1; + return DefWindowProcA(hWnd,msg,wParam,lParam); + } + } + return DefWindowProcA(hWnd,msg,wParam,lParam); +} + static BOOL RegisterWindowClasses(void) { WNDCLASSA cls; @@ -7072,6 +7098,10 @@ static BOOL RegisterWindowClasses(void) cls.lpszClassName = "SimpleWindowClass"; if(!RegisterClassA(&cls)) return FALSE; + cls.lpfnWndProc = PaintLoopProcA; + cls.lpszClassName = "PaintLoopWindowClass"; + if(!RegisterClassA(&cls)) return FALSE; + cls.style = CS_NOCLOSE; cls.lpszClassName = "NoCloseWindowClass"; if(!RegisterClassA(&cls)) return FALSE; @@ -11033,6 +11063,31 @@ static void test_menu_messages(void) DestroyMenu(hmenu); } + +static void test_paintingloop(void) +{ + HWND hwnd; + + paint_loop_done = 0; + hwnd = CreateWindowExA(0x0,"PaintLoopWindowClass", + "PaintLoopWindowClass",WS_OVERLAPPEDWINDOW, + 100, 100, 100, 100, 0, 0, 0, NULL ); + ok(hwnd != 0, "PaintLoop window error %u\n", GetLastError()); + ShowWindow(hwnd,SW_NORMAL); + SetFocus(hwnd); + + while (!paint_loop_done) + { + MSG msg; + if (PeekMessageA(&msg, 0, 0, 0, 1)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + } + DestroyWindow(hwnd); +} + START_TEST(msg) { BOOL ret; @@ -11116,6 +11171,7 @@ START_TEST(msg) test_nullCallback(); test_dbcs_wm_char(); test_menu_messages(); + test_paintingloop(); /* keep it the last test, under Windows it tends to break the tests * which rely on active/foreground windows being correct. */

1 0