September 2008 - Wine-Commits

Dylan Smith : richedit: Prevent integer overflow in wrapping code with no wrap.
by Alexandre Julliard Sept. 2, 2008

Sept. 2, 2008

Module: wine Branch: master Commit: b5e9aed2681d0a4944c1623a55964c9de22992a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5e9aed2681d0a4944c1623a5… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Aug 29 16:03:51 2008 -0400 richedit: Prevent integer overflow in wrapping code with no wrap. --- dlls/riched20/wrap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index a3c5d54..6f6e32c 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -377,7 +377,7 @@ static ME_DisplayItem *ME_WrapHandleRun(ME_WrapContext *wc, ME_DisplayItem *p) } /* will current run fit? */ - if (wc->pt.x + run->nWidth > wc->context->pt.x + wc->nAvailWidth) + if (wc->pt.x + run->nWidth - wc->context->pt.x > wc->nAvailWidth) { int loc = wc->context->pt.x + wc->nAvailWidth - wc->pt.x; /* total white run ? */

1 0

Eric Pouech : winedump, dbghelp: Correctly name the age field in PDB headers.
by Alexandre Julliard Sept. 2, 2008

Sept. 2, 2008

Module: wine Branch: master Commit: f3c071660d65a792742d0f45a2c98d6be2977491 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3c071660d65a792742d0f45a… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Aug 29 21:50:33 2008 +0200 winedump, dbghelp: Correctly name the age field in PDB headers. --- dlls/dbghelp/msc.c | 8 ++++---- include/wine/mscvpdb.h | 4 ++-- tools/winedump/debug.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index d04ebfb..022ad24 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2496,7 +2496,7 @@ static BOOL codeview_process_info(const struct process* pcs, pdb_lookup.kind = PDB_JG; pdb_lookup.u.jg.timestamp = pdb->timestamp; pdb_lookup.u.jg.toc = NULL; - pdb_lookup.age = pdb->unknown; + pdb_lookup.age = pdb->age; ret = pdb_process_file(pcs, msc_dbg, &pdb_lookup); break; } @@ -2504,13 +2504,13 @@ static BOOL codeview_process_info(const struct process* pcs, { const OMFSignatureRSDS* rsds = (const OMFSignatureRSDS*)msc_dbg->root; - TRACE("Got RSDS type of PDB file: guid=%s unk=%08x name=%s\n", - wine_dbgstr_guid(&rsds->guid), rsds->unknown, rsds->name); + TRACE("Got RSDS type of PDB file: guid=%s age=%08x name=%s\n", + wine_dbgstr_guid(&rsds->guid), rsds->age, rsds->name); pdb_lookup.filename = rsds->name; pdb_lookup.kind = PDB_DS; pdb_lookup.u.ds.guid = rsds->guid; pdb_lookup.u.ds.toc = NULL; - pdb_lookup.age = rsds->unknown; + pdb_lookup.age = rsds->age; ret = pdb_process_file(pcs, msc_dbg, &pdb_lookup); break; } diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 306d893..8cfd501 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -1879,7 +1879,7 @@ typedef struct OMFSignatureRSDS { char Signature[4]; GUID guid; - DWORD unknown; + DWORD age; CHAR name[1]; } OMFSignatureRSDS; @@ -1888,7 +1888,7 @@ typedef struct _CODEVIEW_PDB_DATA char Signature[4]; long filepos; DWORD timestamp; - DWORD unknown; + DWORD age; CHAR name[1]; } CODEVIEW_PDB_DATA, *PCODEVIEW_PDB_DATA; diff --git a/tools/winedump/debug.c b/tools/winedump/debug.c index b492be7..86ffd14 100644 --- a/tools/winedump/debug.c +++ b/tools/winedump/debug.c @@ -418,7 +418,7 @@ static void dump_codeview_headers(unsigned long base, unsigned long len) printf(" Filepos: 0x%08lX\n", pdb_data->filepos); printf(" TimeStamp: %08X (%s)\n", pdb_data->timestamp, get_time_str(pdb_data->timestamp)); - printf(" Dunno: %08X\n", pdb_data->unknown); + printf(" Age: %08X\n", pdb_data->age); printf(" Filename: %s\n", pdb_data->name); return; } @@ -428,7 +428,7 @@ static void dump_codeview_headers(unsigned long base, unsigned long len) rsds_data = (const void *)cv_base; printf(" Guid: %s\n", get_guid_str(&rsds_data->guid)); - printf(" Dunno: %08X\n", rsds_data->unknown); + printf(" Age: %08X\n", rsds_data->age); printf(" Filename: %s\n", rsds_data->name); return; }

1 0

Eric Pouech : dbghelp: Added the definitions for Dwarf3 specifications.
by Alexandre Julliard Sept. 2, 2008

Sept. 2, 2008

Module: wine Branch: master Commit: 8b9c05a9cab29034fb4042fb67e50e6867d46a89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b9c05a9cab29034fb4042fb6… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Aug 29 21:49:00 2008 +0200 dbghelp: Added the definitions for Dwarf3 specifications. --- dlls/dbghelp/dwarf.h | 39 ++++++++++++++++++++++++++++++++++++--- 1 files changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/dwarf.h b/dlls/dbghelp/dwarf.h index 6a34bb5..e7a0a7e 100644 --- a/dlls/dbghelp/dwarf.h +++ b/dlls/dbghelp/dwarf.h @@ -68,6 +68,16 @@ typedef enum dwarf_tag_e DW_TAG_variant_part = 0x33, DW_TAG_variable = 0x34, DW_TAG_volatile_type = 0x35, + /** Dwarf3 new values */ + DW_TAG_dwarf_procedure = 0x36, + DW_TAG_restrict_type = 0x37, + DW_TAG_interface_type = 0x38, + DW_TAG_namespace = 0x39, + DW_TAG_imported_module = 0x3a, + DW_TAG_unspecified_type = 0x3b, + DW_TAG_partial_unit = 0x3c, + DW_TAG_imported_unit = 0x3d, + DW_TAG_mutable_type = 0x3e, /** extensions */ DW_TAG_MIPS_loop = 0x4081, DW_TAG_format_label = 0x4101, @@ -139,8 +149,20 @@ typedef enum dwarf_attribute_e DW_AT_variable_parameter = 0x4b, DW_AT_virtuality = 0x4c, DW_AT_vtable_elem_location = 0x4d, - + /** Dwarf3 new values */ + DW_AT_allocated = 0x4e, + DW_AT_associated = 0x4f, + DW_AT_data_location = 0x50, + DW_AT_stride = 0x51, + DW_AT_entry_pc = 0x52, + DW_AT_use_UTF8 = 0x53, + DW_AT_extension = 0x54, DW_AT_ranges = 0x55, + DW_AT_trampoline = 0x56, + DW_AT_call_column = 0x57, + DW_AT_call_file = 0x58, + DW_AT_call_line = 0x59, + DW_AT_description = 0x5a, /* extensions */ DW_AT_MIPS_fde = 0x2001, DW_AT_MIPS_loop_begin = 0x2002, @@ -197,7 +219,9 @@ typedef enum dwarf_type_e DW_ATE_signed = 0x5, DW_ATE_signed_char = 0x6, DW_ATE_unsigned = 0x7, - DW_ATE_unsigned_char = 0x8 + DW_ATE_unsigned_char = 0x8, + /* Dwarf3 new values */ + DW_ATE_imaginary_float = 0x9 } dwarf_type_t; typedef enum dwarf_operation_e @@ -346,7 +370,12 @@ typedef enum dwarf_operation_e DW_OP_piece = 0x93, DW_OP_deref_size = 0x94, DW_OP_xderef_size = 0x95, - DW_OP_nop = 0x96 + DW_OP_nop = 0x96, + /** Dwarf3 new values */ + DW_OP_push_object_address = 0x97, + DW_OP_call2 = 0x98, + DW_OP_call4 = 0x99, + DW_OP_call_ref = 0x9a, } dwarf_operation_t; enum dwarf_calling_convention @@ -369,6 +398,10 @@ enum dwarf_calling_convention #define DW_LNS_set_basic_block 0x07 #define DW_LNS_const_add_pc 0x08 #define DW_LNS_fixed_advance_pc 0x09 +/* Dwarf3 new values */ +#define DW_LNS_set_prologue_end 0x0a +#define DW_LNS_set_epilogue_begin 0x0b +#define DW_LNS_set_isa 0x0c #define DW_LNE_end_sequence 0x01 #define DW_LNE_set_address 0x02

1 0

Andrew Talbot : msvfw32: Sign-compare warning fix.
by Alexandre Julliard Sept. 2, 2008

Sept. 2, 2008

Module: wine Branch: master Commit: f5c87f8ec5b5eee1b6e6fe9a2b1761ca7f056072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5c87f8ec5b5eee1b6e6fe9a2… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Aug 29 16:31:55 2008 +0100 msvfw32: Sign-compare warning fix. --- dlls/msvfw32/msvideo_main.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index baea47b..a135db2 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -102,7 +102,7 @@ static int compare_fourcc(DWORD fcc1, DWORD fcc2) return strncasecmp(fcc_str1, fcc_str2, 4); } -typedef BOOL (*enum_handler_t)(const char*, int, void*); +typedef BOOL (*enum_handler_t)(const char*, unsigned int, void*); static BOOL enum_drivers(DWORD fccType, enum_handler_t handler, void* param) { @@ -173,7 +173,7 @@ DWORD WINAPI VideoForWindowsVersion(void) return 0x040003B6; /* 4.950 */ } -static BOOL ICInfo_enum_handler(const char *drv, int nr, void *param) +static BOOL ICInfo_enum_handler(const char *drv, unsigned int nr, void *param) { ICINFO *lpicinfo = (ICINFO *)param; DWORD fccHandler = mmioStringToFOURCCA(drv + 5, 0); @@ -519,7 +519,7 @@ static HIC try_driver(driver_info_t *info) return 0; } -static BOOL ICLocate_enum_handler(const char *drv, int nr, void *param) +static BOOL ICLocate_enum_handler(const char *drv, unsigned int nr, void *param) { driver_info_t *info = (driver_info_t *)param; info->fccHandler = mmioStringToFOURCCA(drv + 5, 0);

1 0

Andrew Talbot : mstask: Sign-compare warnings fix.
by Alexandre Julliard Sept. 2, 2008

Sept. 2, 2008

Module: wine Branch: master Commit: 52c6c3fca8fe997f447b6e14e5677249878834fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=52c6c3fca8fe997f447b6e14e… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Aug 29 16:31:50 2008 +0100 mstask: Sign-compare warnings fix. --- dlls/mstask/mstask_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mstask/mstask_main.c b/dlls/mstask/mstask_main.c index c7b3dea..df1f1d8 100644 --- a/dlls/mstask/mstask_main.c +++ b/dlls/mstask/mstask_main.c @@ -88,7 +88,7 @@ static HRESULT init_register_strtable(STRTABLEA *strtable) }; #undef CLSID_EXPANSION_ENTRY static STRENTRYA pse[sizeof expns / sizeof expns[0]]; - int i; + unsigned int i; strtable->cEntries = sizeof pse / sizeof pse[0]; strtable->pse = pse; @@ -114,7 +114,7 @@ static HRESULT init_register_strtable(STRTABLEA *strtable) static void cleanup_register_strtable(STRTABLEA *strtable) { - int i; + unsigned int i; for (i = 0; i < strtable->cEntries; i++) { HeapFree(GetProcessHeap(), 0, strtable->pse[i].pszName);

1 0

Juan Lang : crypt32: Implement CertFindCTLInStore.
by Alexandre Julliard Sept. 2, 2008

Sept. 2, 2008

Module: wine Branch: master Commit: 4f62230ee255bec184a37250237cf986f76ed08c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f62230ee255bec184a372502… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 29 07:57:19 2008 -0700 crypt32: Implement CertFindCTLInStore. --- dlls/crypt32/crypt32.spec | 2 +- dlls/crypt32/ctl.c | 126 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 127 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index a5af07d..8476345 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -38,7 +38,7 @@ @ stdcall CertEnumSystemStore(long ptr ptr ptr) @ stdcall CertFindAttribute(str long ptr) @ stdcall CertFindCRLInStore(long long long long ptr ptr) -@ stub CertFindCTLInStore +@ stdcall CertFindCTLInStore(long long long long ptr ptr) @ stdcall CertFindCertificateInStore(long long long long ptr ptr) @ stdcall CertFindCertificateInCRL(ptr ptr long ptr ptr) @ stdcall CertFindExtension(str long ptr) diff --git a/dlls/crypt32/ctl.c b/dlls/crypt32/ctl.c index 864f56d..12ee19d 100644 --- a/dlls/crypt32/ctl.c +++ b/dlls/crypt32/ctl.c @@ -68,6 +68,132 @@ PCCTL_CONTEXT WINAPI CertEnumCTLsInStore(HCERTSTORE hCertStore, return ret; } +typedef BOOL (*CtlCompareFunc)(PCCTL_CONTEXT pCtlContext, DWORD dwType, + DWORD dwFlags, const void *pvPara); + +static BOOL compare_ctl_any(PCCTL_CONTEXT pCtlContext, DWORD dwType, + DWORD dwFlags, const void *pvPara) +{ + return TRUE; +} + +static BOOL compare_ctl_by_md5_hash(PCCTL_CONTEXT pCtlContext, DWORD dwType, + DWORD dwFlags, const void *pvPara) +{ + BOOL ret; + BYTE hash[16]; + DWORD size = sizeof(hash); + + ret = CertGetCTLContextProperty(pCtlContext, CERT_MD5_HASH_PROP_ID, hash, + &size); + if (ret) + { + const CRYPT_HASH_BLOB *pHash = (const CRYPT_HASH_BLOB *)pvPara; + + if (size == pHash->cbData) + ret = !memcmp(pHash->pbData, hash, size); + else + ret = FALSE; + } + return ret; +} + +static BOOL compare_ctl_by_sha1_hash(PCCTL_CONTEXT pCtlContext, DWORD dwType, + DWORD dwFlags, const void *pvPara) +{ + BOOL ret; + BYTE hash[20]; + DWORD size = sizeof(hash); + + ret = CertGetCTLContextProperty(pCtlContext, CERT_SHA1_HASH_PROP_ID, hash, + &size); + if (ret) + { + const CRYPT_HASH_BLOB *pHash = (const CRYPT_HASH_BLOB *)pvPara; + + if (size == pHash->cbData) + ret = !memcmp(pHash->pbData, hash, size); + else + ret = FALSE; + } + return ret; +} + +static BOOL compare_ctl_existing(PCCTL_CONTEXT pCtlContext, DWORD dwType, + DWORD dwFlags, const void *pvPara) +{ + BOOL ret; + + if (pvPara) + { + PCCTL_CONTEXT ctl = (PCCTL_CONTEXT)pvPara; + + if (pCtlContext->cbCtlContext == ctl->cbCtlContext) + { + if (ctl->cbCtlContext) + ret = !memcmp(pCtlContext->pbCtlContext, ctl->pbCtlContext, + ctl->cbCtlContext); + else + ret = TRUE; + } + else + ret = FALSE; + } + else + ret = FALSE; + return ret; +} + +PCCTL_CONTEXT WINAPI CertFindCTLInStore(HCERTSTORE hCertStore, + DWORD dwCertEncodingType, DWORD dwFindFlags, DWORD dwFindType, + const void *pvFindPara, PCCTL_CONTEXT pPrevCtlContext) +{ + PCCTL_CONTEXT ret; + CtlCompareFunc compare; + + TRACE("(%p, %d, %d, %d, %p, %p)\n", hCertStore, dwCertEncodingType, + dwFindFlags, dwFindType, pvFindPara, pPrevCtlContext); + + switch (dwFindType) + { + case CTL_FIND_ANY: + compare = compare_ctl_any; + break; + case CTL_FIND_SHA1_HASH: + compare = compare_ctl_by_sha1_hash; + break; + case CTL_FIND_MD5_HASH: + compare = compare_ctl_by_md5_hash; + break; + case CTL_FIND_EXISTING: + compare = compare_ctl_existing; + break; + default: + FIXME("find type %08x unimplemented\n", dwFindType); + compare = NULL; + } + + if (compare) + { + BOOL matches = FALSE; + + ret = pPrevCtlContext; + do { + ret = CertEnumCTLsInStore(hCertStore, ret); + if (ret) + matches = compare(ret, dwFindType, dwFindFlags, pvFindPara); + } while (ret != NULL && !matches); + if (!ret) + SetLastError(CRYPT_E_NOT_FOUND); + } + else + { + SetLastError(CRYPT_E_NOT_FOUND); + ret = NULL; + } + return ret; +} + BOOL WINAPI CertDeleteCTLFromStore(PCCTL_CONTEXT pCtlContext) { BOOL ret;

1 0

Juan Lang : crypt32: Implement CertAddCTLContextToStore.
by Alexandre Julliard Sept. 2, 2008

Sept. 2, 2008

Module: wine Branch: master Commit: 07de224b54133d8a6d36a66e138b0bcf9fdad40f URL: http://source.winehq.org/git/wine.git/?a=commit;h=07de224b54133d8a6d36a66e1… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 29 07:59:37 2008 -0700 crypt32: Implement CertAddCTLContextToStore. --- dlls/crypt32/ctl.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/store.c | 9 ----- dlls/crypt32/tests/ctl.c | 4 -- 3 files changed, 85 insertions(+), 13 deletions(-) diff --git a/dlls/crypt32/ctl.c b/dlls/crypt32/ctl.c index 12ee19d..9b6d2e0 100644 --- a/dlls/crypt32/ctl.c +++ b/dlls/crypt32/ctl.c @@ -29,6 +29,91 @@ WINE_DEFAULT_DEBUG_CHANNEL(crypt); +#define CtlContext_CopyProperties(to, from) \ + Context_CopyProperties((to), (from), sizeof(CTL_CONTEXT)) + +BOOL WINAPI CertAddCTLContextToStore(HCERTSTORE hCertStore, + PCCTL_CONTEXT pCtlContext, DWORD dwAddDisposition, + PCCTL_CONTEXT* ppStoreContext) +{ + PWINECRYPT_CERTSTORE store = (PWINECRYPT_CERTSTORE)hCertStore; + BOOL ret = TRUE; + PCCTL_CONTEXT toAdd = NULL, existing = NULL; + + TRACE("(%p, %p, %08x, %p)\n", hCertStore, pCtlContext, dwAddDisposition, + ppStoreContext); + + if (dwAddDisposition != CERT_STORE_ADD_ALWAYS) + { + existing = CertFindCTLInStore(hCertStore, 0, 0, CTL_FIND_EXISTING, + pCtlContext, NULL); + } + + switch (dwAddDisposition) + { + case CERT_STORE_ADD_ALWAYS: + toAdd = CertDuplicateCTLContext(pCtlContext); + break; + case CERT_STORE_ADD_NEW: + if (existing) + { + TRACE("found matching CTL, not adding\n"); + SetLastError(CRYPT_E_EXISTS); + ret = FALSE; + } + else + toAdd = CertDuplicateCTLContext(pCtlContext); + break; + case CERT_STORE_ADD_NEWER: + if (existing) + { + LONG newer = CompareFileTime(&existing->pCtlInfo->ThisUpdate, + &pCtlContext->pCtlInfo->ThisUpdate); + + if (newer < 0) + toAdd = CertDuplicateCTLContext(pCtlContext); + else + { + TRACE("existing CTL is newer, not adding\n"); + SetLastError(CRYPT_E_EXISTS); + ret = FALSE; + } + } + else + toAdd = CertDuplicateCTLContext(pCtlContext); + break; + case CERT_STORE_ADD_REPLACE_EXISTING: + toAdd = CertDuplicateCTLContext(pCtlContext); + break; + case CERT_STORE_ADD_REPLACE_EXISTING_INHERIT_PROPERTIES: + toAdd = CertDuplicateCTLContext(pCtlContext); + if (existing) + CtlContext_CopyProperties(toAdd, existing); + break; + case CERT_STORE_ADD_USE_EXISTING: + if (existing) + CtlContext_CopyProperties(existing, pCtlContext); + break; + default: + FIXME("Unimplemented add disposition %d\n", dwAddDisposition); + ret = FALSE; + } + + if (toAdd) + { + if (store) + ret = store->ctls.addContext(store, (void *)toAdd, + (void *)existing, (const void **)ppStoreContext); + else if (ppStoreContext) + *ppStoreContext = CertDuplicateCTLContext(toAdd); + CertFreeCTLContext(toAdd); + } + CertFreeCTLContext(existing); + + TRACE("returning %d\n", ret); + return ret; +} + BOOL WINAPI CertAddEncodedCTLToStore(HCERTSTORE hCertStore, DWORD dwMsgAndCertEncodingType, const BYTE *pbCtlEncoded, DWORD cbCtlEncoded, DWORD dwAddDisposition, PCCTL_CONTEXT *ppCtlContext) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 180740c..6d9177e 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -1091,15 +1091,6 @@ PCCRL_CONTEXT WINAPI CertEnumCRLsInStore(HCERTSTORE hCertStore, return ret; } -BOOL WINAPI CertAddCTLContextToStore(HCERTSTORE hCertStore, - PCCTL_CONTEXT pCtlContext, DWORD dwAddDisposition, - PCCTL_CONTEXT* ppStoreContext) -{ - FIXME("(%p, %p, %08x, %p): stub\n", hCertStore, pCtlContext, - dwAddDisposition, ppStoreContext); - return TRUE; -} - HCERTSTORE WINAPI CertDuplicateStore(HCERTSTORE hCertStore) { WINECRYPT_CERTSTORE *hcs = (WINECRYPT_CERTSTORE *)hCertStore; diff --git a/dlls/crypt32/tests/ctl.c b/dlls/crypt32/tests/ctl.c index b6cccb2..168b05d 100644 --- a/dlls/crypt32/tests/ctl.c +++ b/dlls/crypt32/tests/ctl.c @@ -333,7 +333,6 @@ static void testAddCTLToStore(void) if (ctl) numCTLs++; } while (ctl); - todo_wine ok(numCTLs == 2, "expected 2 CTLs, got %d\n", numCTLs); CertCloseStore(store, 0); @@ -350,7 +349,6 @@ static void testAddCTLToStore(void) signedCTLWithCTLInnerContentAndBadSig, sizeof(signedCTLWithCTLInnerContentAndBadSig), CERT_STORE_ADD_NEW, NULL); - todo_wine ok(!ret && GetLastError() == CRYPT_E_EXISTS, "expected CRYPT_E_EXISTS, got %08x\n", GetLastError()); CertCloseStore(store, 0); @@ -376,7 +374,6 @@ static void testAddCTLToStore(void) if (ctl) numCTLs++; } while (ctl); - todo_wine ok(numCTLs == 2, "expected 2 CTLs, got %d\n", numCTLs); CertCloseStore(store, 0); @@ -401,7 +398,6 @@ static void testAddCTLToStore(void) if (ctl) numCTLs++; } while (ctl); - todo_wine ok(numCTLs == 2, "expected 2 CTLs, got %d\n", numCTLs); CertCloseStore(store, 0); }

1 0

Juan Lang : crypt32: Add tests for CertAddEncodedCTLToStore.
by Alexandre Julliard Sept. 2, 2008

Sept. 2, 2008

Module: wine Branch: master Commit: 08f37c62be8f1940a0985451f9c575c937ef124c URL: http://source.winehq.org/git/wine.git/?a=commit;h=08f37c62be8f1940a0985451f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 29 07:58:43 2008 -0700 crypt32: Add tests for CertAddEncodedCTLToStore. --- dlls/crypt32/tests/ctl.c | 160 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 160 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/ctl.c b/dlls/crypt32/tests/ctl.c index cefca25..b6cccb2 100644 --- a/dlls/crypt32/tests/ctl.c +++ b/dlls/crypt32/tests/ctl.c @@ -247,8 +247,168 @@ static void testCTLProperties(void) CertFreeCTLContext(ctl); } +static const BYTE signedCTLWithUsage[] = { +0x30,0x82,0x01,0x0f,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x07,0x02, +0xa0,0x82,0x01,0x00,0x30,0x81,0xfd,0x02,0x01,0x01,0x31,0x0e,0x30,0x0c,0x06, +0x08,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x02,0x05,0x05,0x00,0x30,0x30,0x06,0x09, +0x2b,0x06,0x01,0x04,0x01,0x82,0x37,0x0a,0x01,0xa0,0x23,0x30,0x21,0x30,0x0a, +0x06,0x08,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x02,0x05,0x18,0x0f,0x31,0x36,0x30, +0x31,0x30,0x31,0x30,0x31,0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0x30,0x02,0x06, +0x00,0x31,0x81,0xb5,0x30,0x81,0xb2,0x02,0x01,0x01,0x30,0x1a,0x30,0x15,0x31, +0x13,0x30,0x11,0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20, +0x4c,0x61,0x6e,0x67,0x00,0x02,0x01,0x01,0x30,0x0c,0x06,0x08,0x2a,0x86,0x48, +0x86,0xf7,0x0d,0x02,0x05,0x05,0x00,0xa0,0x3b,0x30,0x18,0x06,0x09,0x2a,0x86, +0x48,0x86,0xf7,0x0d,0x01,0x09,0x03,0x31,0x0b,0x06,0x09,0x2b,0x06,0x01,0x04, +0x01,0x82,0x37,0x0a,0x01,0x30,0x1f,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d, +0x01,0x09,0x04,0x31,0x12,0x04,0x10,0xc4,0x3e,0x7e,0xc8,0xf9,0x85,0xf3,0x27, +0x7d,0xc0,0x38,0xb2,0x7f,0xc7,0x76,0x85,0x30,0x04,0x06,0x00,0x05,0x00,0x04, +0x40,0x90,0x33,0x1b,0xb4,0x88,0x35,0xe6,0xf7,0x7f,0x93,0x05,0xc9,0x1a,0x0e, +0x8f,0x21,0xc0,0xaa,0xb3,0xab,0x3e,0x4a,0xa6,0x63,0x74,0xfd,0xef,0x11,0xbd, +0x67,0x3a,0x1b,0x07,0x4b,0x88,0x59,0x31,0xd5,0x08,0xf9,0x09,0x2f,0x0b,0x85, +0x62,0x5a,0x67,0x3b,0x62,0x7e,0x81,0x31,0xea,0xa4,0x36,0x5f,0x9a,0x92,0xb6, +0x66,0xa5,0x00,0x60,0x96 }; +static const BYTE signedCTLWithListID1[] = { +0x30,0x82,0x01,0x07,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x07,0x02, +0xa0,0x81,0xf9,0x30,0x81,0xf6,0x02,0x01,0x01,0x31,0x0e,0x30,0x0c,0x06,0x08, +0x2a,0x86,0x48,0x86,0xf7,0x0d,0x02,0x05,0x05,0x00,0x30,0x29,0x06,0x09,0x2b, +0x06,0x01,0x04,0x01,0x82,0x37,0x0a,0x01,0xa0,0x1c,0x30,0x1a,0x30,0x00,0x04, +0x01,0x01,0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31,0x30,0x31,0x30,0x30,0x30, +0x30,0x30,0x30,0x5a,0x30,0x02,0x06,0x00,0x31,0x81,0xb5,0x30,0x81,0xb2,0x02, +0x01,0x01,0x30,0x1a,0x30,0x15,0x31,0x13,0x30,0x11,0x06,0x03,0x55,0x04,0x03, +0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67,0x00,0x02,0x01,0x01, +0x30,0x0c,0x06,0x08,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x02,0x05,0x05,0x00,0xa0, +0x3b,0x30,0x18,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x09,0x03,0x31, +0x0b,0x06,0x09,0x2b,0x06,0x01,0x04,0x01,0x82,0x37,0x0a,0x01,0x30,0x1f,0x06, +0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x09,0x04,0x31,0x12,0x04,0x10,0xbc, +0x13,0xde,0x17,0xc7,0x7c,0x67,0x5b,0xf9,0xa9,0x7c,0xb0,0xd9,0xf2,0x84,0xd5, +0x30,0x04,0x06,0x00,0x05,0x00,0x04,0x40,0xff,0xff,0xff,0xff,0xff,0xff,0xff, +0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, +0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, +0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, +0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff }; +static const BYTE signedCTLWithListID2[] = { +0x30,0x82,0x01,0x07,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x07,0x02, +0xa0,0x81,0xf9,0x30,0x81,0xf6,0x02,0x01,0x01,0x31,0x0e,0x30,0x0c,0x06,0x08, +0x2a,0x86,0x48,0x86,0xf7,0x0d,0x02,0x05,0x05,0x00,0x30,0x29,0x06,0x09,0x2b, +0x06,0x01,0x04,0x01,0x82,0x37,0x0a,0x01,0xa0,0x1c,0x30,0x1a,0x30,0x00,0x04, +0x01,0x02,0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31,0x30,0x31,0x30,0x30,0x30, +0x30,0x30,0x30,0x5a,0x30,0x02,0x06,0x00,0x31,0x81,0xb5,0x30,0x81,0xb2,0x02, +0x01,0x01,0x30,0x1a,0x30,0x15,0x31,0x13,0x30,0x11,0x06,0x03,0x55,0x04,0x03, +0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67,0x00,0x02,0x01,0x01, +0x30,0x0c,0x06,0x08,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x02,0x05,0x05,0x00,0xa0, +0x3b,0x30,0x18,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x09,0x03,0x31, +0x0b,0x06,0x09,0x2b,0x06,0x01,0x04,0x01,0x82,0x37,0x0a,0x01,0x30,0x1f,0x06, +0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x09,0x04,0x31,0x12,0x04,0x10,0x60, +0x6b,0x10,0xb6,0xb8,0x74,0xb8,0xf3,0x79,0xd5,0x42,0x15,0x4a,0x60,0x93,0x1f, +0x30,0x04,0x06,0x00,0x05,0x00,0x04,0x40,0xff,0xff,0xff,0xff,0xff,0xff,0xff, +0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, +0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, +0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, +0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff }; + +static void testAddCTLToStore(void) +{ + HCERTSTORE store; + BOOL ret; + DWORD numCTLs; + PCCTL_CONTEXT ctl; + + store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, + CERT_STORE_CREATE_NEW_FLAG, NULL); + /* Add two CTLs */ + ret = CertAddEncodedCTLToStore(store, X509_ASN_ENCODING, + signedCTLWithCTLInnerContent, sizeof(signedCTLWithCTLInnerContent), + CERT_STORE_ADD_ALWAYS, NULL); + ok(ret, "CertAddEncodedCTLToStore failed: %08x\n", GetLastError()); + ret = CertAddEncodedCTLToStore(store, X509_ASN_ENCODING, + signedCTLWithCTLInnerContentAndBadSig, + sizeof(signedCTLWithCTLInnerContentAndBadSig), CERT_STORE_ADD_ALWAYS, + NULL); + ok(ret, "CertAddEncodedCTLToStore failed: %08x\n", GetLastError()); + /* Check that two exist */ + numCTLs = 0; + ctl = NULL; + do { + ctl = CertEnumCTLsInStore(store, ctl); + if (ctl) + numCTLs++; + } while (ctl); + todo_wine + ok(numCTLs == 2, "expected 2 CTLs, got %d\n", numCTLs); + CertCloseStore(store, 0); + + store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, + CERT_STORE_CREATE_NEW_FLAG, NULL); + /* Add the two CTLs again. They're identical except for the signature.. */ + ret = CertAddEncodedCTLToStore(store, X509_ASN_ENCODING, + signedCTLWithCTLInnerContent, sizeof(signedCTLWithCTLInnerContent), + CERT_STORE_ADD_NEW, NULL); + ok(ret, "CertAddEncodedCTLToStore failed: %08x\n", GetLastError()); + /* so adding the second CTL fails. */ + SetLastError(0xdeadbeef); + ret = CertAddEncodedCTLToStore(store, X509_ASN_ENCODING, + signedCTLWithCTLInnerContentAndBadSig, + sizeof(signedCTLWithCTLInnerContentAndBadSig), CERT_STORE_ADD_NEW, + NULL); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_EXISTS, + "expected CRYPT_E_EXISTS, got %08x\n", GetLastError()); + CertCloseStore(store, 0); + + store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, + CERT_STORE_CREATE_NEW_FLAG, NULL); + /* Add two CTLs. These two have different usages, so they're considered + * different. + */ + ret = CertAddEncodedCTLToStore(store, X509_ASN_ENCODING, + signedCTLWithCTLInnerContent, sizeof(signedCTLWithCTLInnerContent), + CERT_STORE_ADD_NEW, NULL); + ok(ret, "CertAddEncodedCTLToStore failed: %08x\n", GetLastError()); + ret = CertAddEncodedCTLToStore(store, X509_ASN_ENCODING, + signedCTLWithUsage, sizeof(signedCTLWithUsage), CERT_STORE_ADD_NEW, + NULL); + ok(ret, "CertAddEncodedCTLToStore failed: %08x\n", GetLastError()); + /* Check that two exist */ + numCTLs = 0; + ctl = NULL; + do { + ctl = CertEnumCTLsInStore(store, ctl); + if (ctl) + numCTLs++; + } while (ctl); + todo_wine + ok(numCTLs == 2, "expected 2 CTLs, got %d\n", numCTLs); + CertCloseStore(store, 0); + + store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, + CERT_STORE_CREATE_NEW_FLAG, NULL); + /* Add two CTLs. Now they have the same (empty) usages and different list + * IDs, so they're different. + */ + ret = CertAddEncodedCTLToStore(store, X509_ASN_ENCODING, + signedCTLWithListID1, sizeof(signedCTLWithListID1), CERT_STORE_ADD_NEW, + NULL); + ok(ret, "CertAddEncodedCTLToStore failed: %08x\n", GetLastError()); + ret = CertAddEncodedCTLToStore(store, X509_ASN_ENCODING, + signedCTLWithListID2, sizeof(signedCTLWithListID2), CERT_STORE_ADD_NEW, + NULL); + ok(ret, "CertAddEncodedCTLToStore failed: %08x\n", GetLastError()); + /* Check that two exist */ + numCTLs = 0; + ctl = NULL; + do { + ctl = CertEnumCTLsInStore(store, ctl); + if (ctl) + numCTLs++; + } while (ctl); + todo_wine + ok(numCTLs == 2, "expected 2 CTLs, got %d\n", numCTLs); + CertCloseStore(store, 0); +} + START_TEST(ctl) { testCreateCTL(); testCTLProperties(); + testAddCTLToStore(); }

1 0

Andrew Talbot : msimtf: Sign-compare warning fix.
by Alexandre Julliard Sept. 2, 2008

Sept. 2, 2008

Module: wine Branch: master Commit: 380d3b249432108e2d4034e00530dc5173b39a2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=380d3b249432108e2d4034e00… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Aug 29 16:31:46 2008 +0100 msimtf: Sign-compare warning fix. --- dlls/msimtf/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msimtf/main.c b/dlls/msimtf/main.c index da675aa..45edf53 100644 --- a/dlls/msimtf/main.c +++ b/dlls/msimtf/main.c @@ -168,7 +168,7 @@ static HRESULT register_server(BOOL doregister) STRTABLEA strtable; STRENTRYA pse[1]; static CLSID const *clsids[34]; - int i = 0; + unsigned int i = 0; static const WCHAR wszAdvpack[] = {'a','d','v','p','a','c','k','.','d','l','l',0};

1 0

Juan Lang : crypt32: Add CTLs to the registry store.
by Alexandre Julliard Sept. 2, 2008

Sept. 2, 2008

Module: wine Branch: master Commit: dc7a4e1302b3c1cfad5d7dc7b71e5c2c93325eb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc7a4e1302b3c1cfad5d7dc7b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 29 07:33:24 2008 -0700 crypt32: Add CTLs to the registry store. --- dlls/crypt32/regstore.c | 29 ++++++++++++++++++++++++++--- 1 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/regstore.c b/dlls/crypt32/regstore.c index 35928b8..5574a5e 100644 --- a/dlls/crypt32/regstore.c +++ b/dlls/crypt32/regstore.c @@ -43,6 +43,7 @@ typedef struct _WINE_REGSTOREINFO CRITICAL_SECTION cs; struct list certsToDelete; struct list crlsToDelete; + struct list ctlsToDelete; } WINE_REGSTOREINFO, *PWINE_REGSTOREINFO; static void CRYPT_HashToStr(const BYTE *hash, LPWSTR asciiHash) @@ -251,7 +252,7 @@ static BOOL CRYPT_RegWriteToReg(PWINE_REGSTOREINFO store) const WINE_CONTEXT_INTERFACE * const interfaces[] = { pCertInterface, pCRLInterface, pCTLInterface }; struct list *listToDelete[] = { &store->certsToDelete, &store->crlsToDelete, - NULL }; + &store->ctlsToDelete }; BOOL ret = TRUE; DWORD i; @@ -430,6 +431,27 @@ static BOOL WINAPI CRYPT_RegDeleteCRL(HCERTSTORE hCertStore, pCRLInterface); } +static BOOL WINAPI CRYPT_RegWriteCTL(HCERTSTORE hCertStore, + PCCTL_CONTEXT ctl, DWORD dwFlags) +{ + PWINE_REGSTOREINFO store = (PWINE_REGSTOREINFO)hCertStore; + + TRACE("(%p, %p, %d)\n", hCertStore, ctl, dwFlags); + + return CRYPT_RegWriteContext(store, ctl, dwFlags); +} + +static BOOL WINAPI CRYPT_RegDeleteCTL(HCERTSTORE hCertStore, + PCCTL_CONTEXT pCtlContext, DWORD dwFlags) +{ + PWINE_REGSTOREINFO store = (PWINE_REGSTOREINFO)hCertStore; + + TRACE("(%p, %p, %08x)\n", store, pCtlContext, dwFlags); + + return CRYPT_RegDeleteContext(store, &store->ctlsToDelete, pCtlContext, + pCTLInterface); +} + static BOOL WINAPI CRYPT_RegControl(HCERTSTORE hCertStore, DWORD dwFlags, DWORD dwCtrlType, void const *pvCtrlPara) { @@ -475,8 +497,8 @@ static void *regProvFuncs[] = { CRYPT_RegDeleteCRL, NULL, /* CERT_STORE_PROV_SET_CRL_PROPERTY_FUNC */ NULL, /* CERT_STORE_PROV_READ_CTL_FUNC */ - NULL, /* CERT_STORE_PROV_WRITE_CTL_FUNC */ - NULL, /* CERT_STORE_PROV_DELETE_CTL_FUNC */ + CRYPT_RegWriteCTL, + CRYPT_RegDeleteCTL, NULL, /* CERT_STORE_PROV_SET_CTL_PROPERTY_FUNC */ CRYPT_RegControl, }; @@ -529,6 +551,7 @@ PWINECRYPT_CERTSTORE CRYPT_RegOpenStore(HCRYPTPROV hCryptProv, DWORD dwFlags, regInfo->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": PWINE_REGSTOREINFO->cs"); list_init(&regInfo->certsToDelete); list_init(&regInfo->crlsToDelete); + list_init(&regInfo->ctlsToDelete); CRYPT_RegReadFromReg(regInfo->key, regInfo->memStore); regInfo->dirty = FALSE; provInfo.cbSize = sizeof(provInfo);

1 0