November 2009 - Wine-commits

Eric Pouech : dbghelp: Correctly compute offsets in line number information .
by Alexandre Julliard 23 Nov '09

23 Nov '09

Module: wine Branch: master Commit: ed786fbae495d59473508f41f0ef902968b0e598 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed786fbae495d59473508f41f… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Nov 21 16:35:01 2009 +0100 dbghelp: Correctly compute offsets in line number information. --- dlls/dbghelp/msc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 34de916..b314602 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1410,7 +1410,7 @@ static void codeview_snarf_linetab2(const struct msc_debug_info* msc_dbg, const { symt_add_func_line(msc_dbg->module, func, source, lines_blk->l[i].lineno ^ 0x80000000, - lines_blk->l[i].offset - lines_blk->start); + lines_blk->l[i].offset); } break; case LT2_FILES_BLOCK: /* skip */

1 0

André Hentschel : winemaker: Replace whitespaces in projectnames.
by Alexandre Julliard 23 Nov '09

23 Nov '09

Module: wine Branch: master Commit: 5f059edcdf96277ce0b17416d4020c052696c766 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f059edcdf96277ce0b17416d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Nov 21 18:13:44 2009 +0100 winemaker: Replace whitespaces in projectnames. --- tools/winemaker | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index e077db2..4cd46ff 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -582,6 +582,7 @@ sub source_scan_project_file($$$) if (/^\# Microsoft Developer Studio Project File - Name=\"([^\"]+)/) { $prj_name="$1"; + $prj_name=~s/\s+/_/g; #print $prj_name; next; } elsif (/^# TARGTYPE/) { @@ -852,6 +853,7 @@ sub source_scan_project_file($$$) foreach my $vc_project_attr ($vc_project->attributes) { if ($vc_project_attr->getName eq "Name") { $prj_name=$vc_project_attr->getValue; + $prj_name=~s/\s+/_/g; last; } }

1 0

Alexandre Julliard : include: Specify explicit alignment for __int64 types.
by Alexandre Julliard 23 Nov '09

23 Nov '09

Module: wine Branch: master Commit: 7f69436ea874ad7c0b39f0f60e07d26da3dcb353 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f69436ea874ad7c0b39f0f60… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 21 14:23:22 2009 +0100 include: Specify explicit alignment for __int64 types. --- dlls/msvcrt/msvcrt.h | 12 ++++++------ include/msvcrt/crtdefs.h | 12 +++++++++++- include/msvcrt/io.h | 4 ++-- include/msvcrt/stdio.h | 2 +- include/msvcrt/wchar.h | 2 +- include/ws2def.h | 2 +- 6 files changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 337a17c..1de0c7b 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -64,8 +64,8 @@ typedef unsigned int MSVCRT__dev_t; typedef int MSVCRT__off_t; typedef int MSVCRT_clock_t; typedef int MSVCRT___time32_t; -typedef __int64 MSVCRT___time64_t; -typedef __int64 MSVCRT_fpos_t; +typedef __int64 DECLSPEC_ALIGN(8) MSVCRT___time64_t; +typedef __int64 DECLSPEC_ALIGN(8) MSVCRT_fpos_t; typedef void (*__cdecl MSVCRT_terminate_handler)(void); typedef void (*__cdecl MSVCRT_terminate_function)(void); @@ -316,7 +316,7 @@ struct MSVCRT__finddata32i64_t { MSVCRT___time32_t time_create; MSVCRT___time32_t time_access; MSVCRT___time32_t time_write; - __int64 size; + __int64 DECLSPEC_ALIGN(8) size; char name[260]; }; @@ -334,7 +334,7 @@ struct MSVCRT__finddata64_t { MSVCRT___time64_t time_create; MSVCRT___time64_t time_access; MSVCRT___time64_t time_write; - __int64 size; + __int64 DECLSPEC_ALIGN(8) size; char name[260]; }; @@ -352,7 +352,7 @@ struct MSVCRT__wfinddata32i64_t { MSVCRT___time32_t time_create; MSVCRT___time32_t time_access; MSVCRT___time32_t time_write; - __int64 size; + __int64 DECLSPEC_ALIGN(8) size; MSVCRT_wchar_t name[260]; }; @@ -370,7 +370,7 @@ struct MSVCRT__wfinddata64_t { MSVCRT___time64_t time_create; MSVCRT___time64_t time_access; MSVCRT___time64_t time_write; - __int64 size; + __int64 DECLSPEC_ALIGN(8) size; MSVCRT_wchar_t name[260]; }; diff --git a/include/msvcrt/crtdefs.h b/include/msvcrt/crtdefs.h index 2a101a9..61116e9 100644 --- a/include/msvcrt/crtdefs.h +++ b/include/msvcrt/crtdefs.h @@ -80,6 +80,16 @@ # endif #endif +#ifndef DECLSPEC_ALIGN +# if defined(_MSC_VER) && (_MSC_VER >= 1300) && !defined(MIDL_PASS) +# define DECLSPEC_ALIGN(x) __declspec(align(x)) +# elif defined(__GNUC__) +# define DECLSPEC_ALIGN(x) __attribute__((aligned(x))) +# else +# define DECLSPEC_ALIGN(x) +# endif +#endif + #ifndef _MSVCRT_LONG_DEFINED #define _MSVCRT_LONG_DEFINED /* we need 32-bit longs even on 64-bit */ @@ -129,7 +139,7 @@ typedef __msvcrt_long __time32_t; #endif #ifndef _TIME64_T_DEFINED -typedef __int64 __time64_t; +typedef __int64 DECLSPEC_ALIGN(8) __time64_t; #define _TIME64_T_DEFINED #endif diff --git a/include/msvcrt/io.h b/include/msvcrt/io.h index e15dff1..c7ba9ab 100644 --- a/include/msvcrt/io.h +++ b/include/msvcrt/io.h @@ -44,7 +44,7 @@ struct _finddatai64_t time_t time_create; time_t time_access; time_t time_write; - __int64 size; + __int64 DECLSPEC_ALIGN(8) size; char name[260]; }; #endif /* _FINDDATA_T_DEFINED */ @@ -65,7 +65,7 @@ struct _wfinddatai64_t { time_t time_create; time_t time_access; time_t time_write; - __int64 size; + __int64 DECLSPEC_ALIGN(8) size; wchar_t name[260]; }; #endif /* _WFINDDATA_T_DEFINED */ diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 1b3872c..b309ebb 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -72,7 +72,7 @@ typedef struct _iobuf #endif /* _FILE_DEFINED */ #ifndef _FPOS_T_DEFINED -typedef __int64 fpos_t; +typedef __int64 DECLSPEC_ALIGN(8) fpos_t; #define _FPOS_T_DEFINED #endif diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index fe76166..66d3a81 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -111,7 +111,7 @@ struct _wfinddatai64_t { time_t time_create; time_t time_access; time_t time_write; - __int64 size; + __int64 DECLSPEC_ALIGN(8) size; wchar_t name[260]; }; diff --git a/include/ws2def.h b/include/ws2def.h index f2f7223..585647b 100644 --- a/include/ws2def.h +++ b/include/ws2def.h @@ -58,7 +58,7 @@ typedef struct _CSADDR_INFO { typedef struct WS(sockaddr_storage) { short ss_family; char __ss_pad1[WS(_SS_PAD1SIZE)]; - __int64 __ss_align; + __int64 DECLSPEC_ALIGN(8) __ss_align; char __ss_pad2[WS(_SS_PAD2SIZE)]; } SOCKADDR_STORAGE, *PSOCKADDR_STORAGE, *LPSOCKADDR_STORAGE;

1 0

Alexandre Julliard : include: Define hyper to INT64 instead of __int64 to get the correct alignment
by Alexandre Julliard 23 Nov '09

23 Nov '09

Module: wine Branch: master Commit: a717d2d2840123872c17e00900caad105d5bd0fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a717d2d2840123872c17e0090… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 21 14:23:47 2009 +0100 include: Define hyper to INT64 instead of __int64 to get the correct alignment --- include/rpcndr.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/rpcndr.h b/include/rpcndr.h index 81baa87..5ab0685 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -97,8 +97,8 @@ extern "C" { #define small char typedef unsigned char byte; -#define hyper __int64 -#define MIDL_uhyper unsigned __int64 +typedef INT64 hyper; +typedef UINT64 MIDL_uhyper; typedef unsigned char boolean; #define __RPC_CALLEE WINAPI

1 0

Alexandre Julliard : widl: Use INT64 instead of __int64 in generated headers.
by Alexandre Julliard 23 Nov '09

23 Nov '09

Module: wine Branch: master Commit: 98de3950b1c1bc65d45d18e437d4b43d4d6e1482 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98de3950b1c1bc65d45d18e43… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 21 14:24:02 2009 +0100 widl: Use INT64 instead of __int64 in generated headers. --- tools/widl/header.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index e87a44e..c8b9613 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -254,6 +254,7 @@ void write_type_left(FILE *h, type_t *t, int declonly) break; case TYPE_BASIC: if (type_basic_get_type(t) != TYPE_BASIC_INT32 && + type_basic_get_type(t) != TYPE_BASIC_INT64 && type_basic_get_type(t) != TYPE_BASIC_HYPER) { if (type_basic_get_sign(t) < 0) fprintf(h, "signed "); @@ -264,7 +265,6 @@ void write_type_left(FILE *h, type_t *t, int declonly) case TYPE_BASIC_INT8: fprintf(h, "small"); break; case TYPE_BASIC_INT16: fprintf(h, "short"); break; case TYPE_BASIC_INT: fprintf(h, "int"); break; - case TYPE_BASIC_INT64: fprintf(h, "__int64"); break; case TYPE_BASIC_INT3264: fprintf(h, "__int3264"); break; case TYPE_BASIC_BYTE: fprintf(h, "byte"); break; case TYPE_BASIC_CHAR: fprintf(h, "char"); break; @@ -279,6 +279,12 @@ void write_type_left(FILE *h, type_t *t, int declonly) else fprintf(h, "LONG"); break; + case TYPE_BASIC_INT64: + if (type_basic_get_sign(t) > 0) + fprintf(h, "UINT64"); + else + fprintf(h, "INT64"); + break; case TYPE_BASIC_HYPER: if (type_basic_get_sign(t) > 0) fprintf(h, "MIDL_uhyper");

1 0

Juan Lang : crypt32/tests: Fix a typo.
by Alexandre Julliard 23 Nov '09

23 Nov '09

Module: wine Branch: master Commit: 22206b909a836505eefda401b8687e550d364b53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22206b909a836505eefda401b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 20 14:30:29 2009 -0800 crypt32/tests: Fix a typo. --- dlls/crypt32/tests/crl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/crl.c b/dlls/crypt32/tests/crl.c index 4a96a46..5ae6bf6 100644 --- a/dlls/crypt32/tests/crl.c +++ b/dlls/crypt32/tests/crl.c @@ -1148,8 +1148,8 @@ static void testVerifyCRLRevocation(void) CertFreeCRLContext(crl); /* Check against CRL with different issuer and entry for the cert */ - crl = CertCreateCRLContext(X509_ASN_ENCODING, v1CRLWithIssuerAndEntry, - sizeof(v1CRLWithIssuerAndEntry)); + crl = CertCreateCRLContext(X509_ASN_ENCODING, crlWithDifferentIssuer, + sizeof(crlWithDifferentIssuer)); ok(crl != NULL, "CertCreateCRLContext failed: %08x\n", GetLastError()); ret = CertVerifyCRLRevocation(X509_ASN_ENCODING, cert->pCertInfo, 1, (PCRL_INFO *)&crl->pCrlInfo);

1 0

Juan Lang : crypt32/tests: Test one more certificate against the Verisign CRL.
by Alexandre Julliard 23 Nov '09

23 Nov '09

Module: wine Branch: master Commit: 6bc8237c633e1153ce2a69c5ee068fe48d74c59f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bc8237c633e1153ce2a69c5e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 20 14:31:28 2009 -0800 crypt32/tests: Test one more certificate against the Verisign CRL. --- dlls/crypt32/tests/crl.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/crl.c b/dlls/crypt32/tests/crl.c index 5ae6bf6..cdb327f 100644 --- a/dlls/crypt32/tests/crl.c +++ b/dlls/crypt32/tests/crl.c @@ -1019,7 +1019,7 @@ static void testIsValidCRLForCert(void) CertFreeCRLContext(crl); - /* And again, with a real CRL, the CRL is valid for both certs. */ + /* And again, with a real CRL, the CRL is valid for all three certs. */ crl = CertCreateCRLContext(X509_ASN_ENCODING, verisignCRL, sizeof(verisignCRL)); ok(crl != NULL, "CertCreateCRLContext failed: %08x\n", GetLastError()); @@ -1028,6 +1028,8 @@ static void testIsValidCRLForCert(void) ok(ret, "CertIsValidCRLForCertificate failed: %08x\n", GetLastError()); ret = pCertIsValidCRLForCertificate(cert2, crl, 0, NULL); ok(ret, "CertIsValidCRLForCertificate failed: %08x\n", GetLastError()); + ret = pCertIsValidCRLForCertificate(cert3, crl, 0, NULL); + ok(ret, "CertIsValidCRLForCertificate failed: %08x\n", GetLastError()); CertFreeCRLContext(crl); @@ -1046,6 +1048,8 @@ static void testIsValidCRLForCert(void) ok(ret, "CertIsValidCRLForCertificate failed: %08x\n", GetLastError()); ret = pCertIsValidCRLForCertificate(cert2, crl, 0, NULL); ok(ret, "CertIsValidCRLForCertificate failed: %08x\n", GetLastError()); + ret = pCertIsValidCRLForCertificate(cert3, crl, 0, NULL); + ok(ret, "CertIsValidCRLForCertificate failed: %08x\n", GetLastError()); CertFreeCRLContext(crl);

1 0

Juan Lang : crypt32: Finding a CRL issued by a cert should compare the cert 's subject, not its issuer.
by Alexandre Julliard 23 Nov '09

23 Nov '09

Module: wine Branch: master Commit: 8646c39bdbe8b2ca451059382c4ff2316a92ca74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8646c39bdbe8b2ca451059382… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 20 14:46:53 2009 -0800 crypt32: Finding a CRL issued by a cert should compare the cert's subject, not its issuer. --- dlls/crypt32/crl.c | 2 +- dlls/crypt32/tests/crl.c | 2 -- 2 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c index 9e7fe9d..b8e8182 100644 --- a/dlls/crypt32/crl.c +++ b/dlls/crypt32/crl.c @@ -115,7 +115,7 @@ static BOOL compare_crl_issued_by(PCCRL_CONTEXT pCrlContext, DWORD dwType, PCCERT_CONTEXT issuer = pvPara; ret = CertCompareCertificateName(issuer->dwCertEncodingType, - &issuer->pCertInfo->Issuer, &pCrlContext->pCrlInfo->Issuer); + &issuer->pCertInfo->Subject, &pCrlContext->pCrlInfo->Issuer); if (ret && (dwFlags & CRL_FIND_ISSUED_BY_SIGNATURE_FLAG)) ret = CryptVerifyCertificateSignatureEx(0, issuer->dwCertEncodingType, diff --git a/dlls/crypt32/tests/crl.c b/dlls/crypt32/tests/crl.c index cdb327f..abf2fd0 100644 --- a/dlls/crypt32/tests/crl.c +++ b/dlls/crypt32/tests/crl.c @@ -651,11 +651,9 @@ static void testFindCRL(void) revoked_count++; } } while (context); - todo_wine { ok(count == 0, "expected 0 matching CRLs, got %d\n", count); ok(revoked_count == 0, "expected 0 matching CRL entries, got %d\n", revoked_count); - } count = revoked_count = 0; do { context = pCertFindCRLInStore(store, 0, 0, CRL_FIND_ISSUED_BY,

1 0

Juan Lang : crypt32/tests: Fix a typo.
by Alexandre Julliard 23 Nov '09

23 Nov '09

Module: wine Branch: master Commit: 7dee971809ad5c80d6cbf314af971aaf9d0134dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dee971809ad5c80d6cbf314a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 20 14:47:53 2009 -0800 crypt32/tests: Fix a typo. --- dlls/crypt32/tests/crl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/crl.c b/dlls/crypt32/tests/crl.c index abf2fd0..26033c2 100644 --- a/dlls/crypt32/tests/crl.c +++ b/dlls/crypt32/tests/crl.c @@ -704,7 +704,7 @@ static void testFindCRL(void) } while (context); todo_wine ok(count == 0 || broken(count == 1 /* Win9x */), - "expected 1 matching CRLs, got %d\n", count); + "expected 0 matching CRLs, got %d\n", count); ok(revoked_count == 0, "expected 0 matching CRL entries, got %d\n", revoked_count); count = revoked_count = 0;

1 0

Juan Lang : crypt32: When searching for a CRL by the AKI extension, the extension has to be decoded to match.
by Alexandre Julliard 23 Nov '09

23 Nov '09

Module: wine Branch: master Commit: 8e51a866b72494b402c9df486c8843b7ed49754d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e51a866b72494b402c9df486… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 20 15:18:23 2009 -0800 crypt32: When searching for a CRL by the AKI extension, the extension has to be decoded to match. --- dlls/crypt32/crl.c | 67 ++++++++++++++++++++++++++++++++++++++------- dlls/crypt32/tests/crl.c | 1 - 2 files changed, 56 insertions(+), 12 deletions(-) diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c index b8e8182..a24e6ad 100644 --- a/dlls/crypt32/crl.c +++ b/dlls/crypt32/crl.c @@ -123,26 +123,71 @@ static BOOL compare_crl_issued_by(PCCRL_CONTEXT pCrlContext, DWORD dwType, CRYPT_VERIFY_CERT_SIGN_ISSUER_CERT, (void *)issuer, 0, NULL); if (ret && (dwFlags & CRL_FIND_ISSUED_BY_AKI_FLAG)) { - PCERT_EXTENSION aki = CertFindExtension( + PCERT_EXTENSION ext = CertFindExtension( szOID_AUTHORITY_KEY_IDENTIFIER2, pCrlContext->pCrlInfo->cExtension, pCrlContext->pCrlInfo->rgExtension); - if (aki) + if (ext) { - CERT_EXTENSION *ski; + CERT_AUTHORITY_KEY_ID2_INFO *info; + DWORD size; - if ((ski = CertFindExtension(szOID_SUBJECT_KEY_IDENTIFIER, - issuer->pCertInfo->cExtension, - issuer->pCertInfo->rgExtension))) + if ((ret = CryptDecodeObjectEx(X509_ASN_ENCODING, + X509_AUTHORITY_KEY_ID2, ext->Value.pbData, ext->Value.cbData, + CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size))) { - if (aki->Value.cbData == ski->Value.cbData) - ret = !memcmp(aki->Value.pbData, ski->Value.pbData, - aki->Value.cbData); + if (info->AuthorityCertIssuer.cAltEntry && + info->AuthorityCertSerialNumber.cbData) + { + PCERT_ALT_NAME_ENTRY directoryName = NULL; + DWORD i; + + for (i = 0; !directoryName && + i < info->AuthorityCertIssuer.cAltEntry; i++) + if (info->AuthorityCertIssuer.rgAltEntry[i]. + dwAltNameChoice == CERT_ALT_NAME_DIRECTORY_NAME) + directoryName = + &info->AuthorityCertIssuer.rgAltEntry[i]; + if (directoryName) + { + ret = CertCompareCertificateName( + issuer->dwCertEncodingType, + &issuer->pCertInfo->Subject, + &directoryName->u.DirectoryName); + if (ret) + ret = CertCompareIntegerBlob( + &issuer->pCertInfo->SerialNumber, + &info->AuthorityCertSerialNumber); + } + else + { + FIXME("no supported name type in authority key id2\n"); + ret = FALSE; + } + } + else if (info->KeyId.cbData) + { + if ((ext = CertFindExtension( + szOID_SUBJECT_KEY_IDENTIFIER, + issuer->pCertInfo->cExtension, + issuer->pCertInfo->rgExtension))) + { + if (info->KeyId.cbData == ext->Value.cbData) + ret = !memcmp(info->KeyId.pbData, + ext->Value.pbData, info->KeyId.cbData); + else + ret = FALSE; + } + else + ret = FALSE; + } else + { + FIXME("unsupported value for AKI extension\n"); ret = FALSE; + } + LocalFree(info); } - else - ret = FALSE; } /* else: a CRL without an AKI matches any cert */ } diff --git a/dlls/crypt32/tests/crl.c b/dlls/crypt32/tests/crl.c index 26033c2..bb62219 100644 --- a/dlls/crypt32/tests/crl.c +++ b/dlls/crypt32/tests/crl.c @@ -702,7 +702,6 @@ static void testFindCRL(void) revoked_count++; } } while (context); - todo_wine ok(count == 0 || broken(count == 1 /* Win9x */), "expected 0 matching CRLs, got %d\n", count); ok(revoked_count == 0, "expected 0 matching CRL entries, got %d\n",

1 0