January 2010 - Wine-Commits

Juan Lang : wintrust: Return error directly from WINTRUST_CreateChainForSigner.
by Alexandre Julliard Jan. 29, 2010

Jan. 29, 2010

Module: wine Branch: master Commit: 428fc17934017dfda2ceff0c1143c8379c10be00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=428fc17934017dfda2ceff0c1… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 27 14:20:26 2010 -0800 wintrust: Return error directly from WINTRUST_CreateChainForSigner. --- dlls/wintrust/softpub.c | 49 ++++++++++++++++++++++------------------------ 1 files changed, 23 insertions(+), 26 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index a0a3455..3e79172 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -753,11 +753,11 @@ static void WINTRUST_CreateChainPolicyCreateInfo( info->pvReserved = NULL; } -static BOOL WINTRUST_CreateChainForSigner(CRYPT_PROVIDER_DATA *data, +static DWORD WINTRUST_CreateChainForSigner(CRYPT_PROVIDER_DATA *data, DWORD signer, PWTD_GENERIC_CHAIN_POLICY_CREATE_INFO createInfo, PCERT_CHAIN_PARA chainPara) { - BOOL ret = TRUE; + DWORD err = ERROR_SUCCESS; HCERTSTORE store = NULL; if (data->chStores) @@ -772,15 +772,17 @@ static BOOL WINTRUST_CreateChainForSigner(CRYPT_PROVIDER_DATA *data, CertAddStoreToCollection(store, data->pahStores[i], 0, 0); } else - ret = FALSE; + err = GetLastError(); } - if (ret) + if (!err) { /* Expect the end certificate for each signer to be the only cert in * the chain: */ if (data->pasSigners[signer].csCertChain) { + BOOL ret; + /* Create a certificate chain for each signer */ ret = CertGetCertificateChain(createInfo->hChainEngine, data->pasSigners[signer].pasCertChain[0].pCert, @@ -792,45 +794,41 @@ static BOOL WINTRUST_CreateChainForSigner(CRYPT_PROVIDER_DATA *data, if (data->pasSigners[signer].pChainContext->cChain != 1) { FIXME("unimplemented for more than 1 simple chain\n"); - ret = FALSE; + err = E_NOTIMPL; } else { - DWORD err; - if (!(err = WINTRUST_CopyChain(data, signer))) { if (data->psPfns->pfnCertCheckPolicy) + { ret = data->psPfns->pfnCertCheckPolicy(data, signer, FALSE, 0); + if (!ret) + err = GetLastError(); + } else TRACE( "no cert check policy, skipping policy check\n"); } - else - { - SetLastError(err); - ret = FALSE; - } } } + else + err = GetLastError(); } CertCloseStore(store, 0); } - return ret; + return err; } HRESULT WINAPI WintrustCertificateTrust(CRYPT_PROVIDER_DATA *data) { - BOOL ret; + DWORD err; TRACE("(%p)\n", data); if (!data->csSigners) - { - ret = FALSE; - SetLastError(TRUST_E_NOSIGNATURE); - } + err = TRUST_E_NOSIGNATURE; else { DWORD i; @@ -838,17 +836,16 @@ HRESULT WINAPI WintrustCertificateTrust(CRYPT_PROVIDER_DATA *data) CERT_CHAIN_PARA chainPara; WINTRUST_CreateChainPolicyCreateInfo(data, &createInfo, &chainPara); - ret = TRUE; - for (i = 0; i < data->csSigners; i++) - ret = WINTRUST_CreateChainForSigner(data, i, &createInfo, + err = ERROR_SUCCESS; + for (i = 0; !err && i < data->csSigners; i++) + err = WINTRUST_CreateChainForSigner(data, i, &createInfo, &chainPara); } - if (!ret) - data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_CERTPROV] = - GetLastError(); - TRACE("returning %d (%08x)\n", ret ? S_OK : S_FALSE, + if (err) + data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_CERTPROV] = err; + TRACE("returning %d (%08x)\n", !err ? S_OK : S_FALSE, data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_CERTPROV]); - return ret ? S_OK : S_FALSE; + return !err ? S_OK : S_FALSE; } HRESULT WINAPI GenericChainCertificateTrust(CRYPT_PROVIDER_DATA *data)

1 0

Juan Lang : wintrust: Fail creating a chain if a store couldn't be created.
by Alexandre Julliard Jan. 29, 2010

Jan. 29, 2010

Module: wine Branch: master Commit: 711ca0f4f3a3ec1fcaffac8c47dce0bf316cf1cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=711ca0f4f3a3ec1fcaffac8c4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 27 14:14:53 2010 -0800 wintrust: Fail creating a chain if a store couldn't be created. --- dlls/wintrust/softpub.c | 64 +++++++++++++++++++++++++--------------------- 1 files changed, 35 insertions(+), 29 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 29d8523..a0a3455 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -771,46 +771,52 @@ static BOOL WINTRUST_CreateChainForSigner(CRYPT_PROVIDER_DATA *data, for (i = 0; i < data->chStores; i++) CertAddStoreToCollection(store, data->pahStores[i], 0, 0); } + else + ret = FALSE; } - /* Expect the end certificate for each signer to be the only cert in the - * chain: - */ - if (data->pasSigners[signer].csCertChain) + if (ret) { - /* Create a certificate chain for each signer */ - ret = CertGetCertificateChain(createInfo->hChainEngine, - data->pasSigners[signer].pasCertChain[0].pCert, - &data->pasSigners[signer].sftVerifyAsOf, store, - chainPara, createInfo->dwFlags, createInfo->pvReserved, - &data->pasSigners[signer].pChainContext); - if (ret) + /* Expect the end certificate for each signer to be the only cert in + * the chain: + */ + if (data->pasSigners[signer].csCertChain) { - if (data->pasSigners[signer].pChainContext->cChain != 1) - { - FIXME("unimplemented for more than 1 simple chain\n"); - ret = FALSE; - } - else + /* Create a certificate chain for each signer */ + ret = CertGetCertificateChain(createInfo->hChainEngine, + data->pasSigners[signer].pasCertChain[0].pCert, + &data->pasSigners[signer].sftVerifyAsOf, store, + chainPara, createInfo->dwFlags, createInfo->pvReserved, + &data->pasSigners[signer].pChainContext); + if (ret) { - DWORD err; - - if (!(err = WINTRUST_CopyChain(data, signer))) + if (data->pasSigners[signer].pChainContext->cChain != 1) { - if (data->psPfns->pfnCertCheckPolicy) - ret = data->psPfns->pfnCertCheckPolicy(data, signer, - FALSE, 0); - else - TRACE("no cert check policy, skipping policy check\n"); + FIXME("unimplemented for more than 1 simple chain\n"); + ret = FALSE; } else { - SetLastError(err); - ret = FALSE; + DWORD err; + + if (!(err = WINTRUST_CopyChain(data, signer))) + { + if (data->psPfns->pfnCertCheckPolicy) + ret = data->psPfns->pfnCertCheckPolicy(data, signer, + FALSE, 0); + else + TRACE( + "no cert check policy, skipping policy check\n"); + } + else + { + SetLastError(err); + ret = FALSE; + } } } } + CertCloseStore(store, 0); } - CertCloseStore(store, 0); return ret; }

1 0

Alexandre Julliard : msacm32: Clear the type field when deleting a driver.
by Alexandre Julliard Jan. 29, 2010

Jan. 29, 2010

Module: wine Branch: master Commit: 6bc1a359f882e685b7632f036dddd32d99a8c4d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bc1a359f882e685b7632f036… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 28 19:47:44 2010 +0100 msacm32: Clear the type field when deleting a driver. --- dlls/msacm32/driver.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msacm32/driver.c b/dlls/msacm32/driver.c index 9ca16dc..c02d89f 100644 --- a/dlls/msacm32/driver.c +++ b/dlls/msacm32/driver.c @@ -214,6 +214,7 @@ MMRESULT WINAPI acmDriverClose(HACMDRIVER had, DWORD fdwClose) else if (pad->pLocalDrvrInst) MSACM_CloseLocalDriver(pad->pLocalDrvrInst); + pad->obj.dwType = 0; HeapFree(MSACM_hHeap, 0, pad); return MMSYSERR_NOERROR;

1 0

Alexandre Julliard : cabinet/tests: Fix accesses to an invalid pointer.
by Alexandre Julliard Jan. 29, 2010

Jan. 29, 2010

Module: wine Branch: master Commit: 91502b0634078cf24dad25a22f8c69758f55525f URL: http://source.winehq.org/git/wine.git/?a=commit;h=91502b0634078cf24dad25a22… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 28 19:47:27 2010 +0100 cabinet/tests: Fix accesses to an invalid pointer. --- dlls/cabinet/tests/extract.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/cabinet/tests/extract.c b/dlls/cabinet/tests/extract.c index 76bd7b7..29fd1c7 100644 --- a/dlls/cabinet/tests/extract.c +++ b/dlls/cabinet/tests/extract.c @@ -670,6 +670,7 @@ static void test_Extract(void) lstrcpyA(session.Destination, "dest"); session.Operation = EXTRACT_FILLFILELIST | EXTRACT_EXTRACTFILES; res = pExtract(&session, "extract.cab"); + node = session.FileList; todo_wine { ok(res == HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED) || res == E_FAIL, @@ -694,8 +695,8 @@ static void test_Extract(void) todo_wine { ok(!DeleteFileA("dest\\testdir\\d.txt"), "Expected dest\\testdir\\d.txt to not exist\n"); + ok(!check_list(&node, "testdir\\d.txt", FALSE), "list entry should not exist\n"); } - ok(!check_list(&node, "testdir\\d.txt", FALSE), "list entry should not exist\n"); ok(!check_list(&node, "testdir\\c.txt", FALSE), "list entry wrong\n"); ok(!check_list(&node, "b.txt", FALSE), "list entry wrong\n"); ok(!check_list(&node, "a.txt", TRUE), "list entry wrong\n");

1 0

Alexandre Julliard : ntdll: Support delayed freeing of heap blocks to catch use-after-free bugs.
by Alexandre Julliard Jan. 29, 2010

Jan. 29, 2010

Module: wine Branch: master Commit: b7b8929f0b72dc63d61e96e3eaca177da79f5865 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7b8929f0b72dc63d61e96e3e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 28 19:43:38 2010 +0100 ntdll: Support delayed freeing of heap blocks to catch use-after-free bugs. --- dlls/ntdll/heap.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 73 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 07fec3f..622b174 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -82,6 +82,7 @@ typedef struct /* Value for arena 'magic' field */ #define ARENA_INUSE_MAGIC 0x455355 +#define ARENA_PENDING_MAGIC 0xbedead #define ARENA_FREE_MAGIC 0x45455246 #define ARENA_LARGE_MAGIC 0x6752614c @@ -151,6 +152,8 @@ typedef struct tagHEAP struct list large_list; /* Large blocks list */ SIZE_T grow_size; /* Size of next subheap for growing heap */ DWORD magic; /* Magic number */ + DWORD pending_pos; /* Position in pending free requests ring */ + ARENA_INUSE **pending_free; /* Ring buffer for pending free requests */ RTL_CRITICAL_SECTION critSection; /* Critical section for serialization */ FREE_LIST_ENTRY *freeList; /* Free lists */ } HEAP; @@ -159,6 +162,7 @@ typedef struct tagHEAP #define HEAP_DEF_SIZE 0x110000 /* Default heap size = 1Mb + 64Kb */ #define COMMIT_MASK 0xffff /* bitmask for commit/decommit granularity */ +#define MAX_FREE_PENDING 1024 /* max number of free requests to delay */ /* some undocumented flags (names are made up) */ #define HEAP_PAGE_ALLOCS 0x01000000 @@ -275,7 +279,8 @@ static void subheap_notify_free_all(SUBHEAP const *subheap) else { ARENA_INUSE const *pArena = (ARENA_INUSE const *)ptr; - if (pArena->magic!=ARENA_INUSE_MAGIC) ERR("bad inuse_magic @%p\n", pArena); + if (pArena->magic != ARENA_INUSE_MAGIC && pArena->magic != ARENA_PENDING_MAGIC) + ERR("bad inuse_magic @%p\n", pArena); notify_free(pArena + 1); ptr += sizeof(*pArena) + (pArena->size & ARENA_SIZE_MASK); } @@ -362,7 +367,9 @@ static void HEAP_Dump( HEAP *heap ) else { ARENA_INUSE *pArena = (ARENA_INUSE *)ptr; - DPRINTF( "%p %08x used %08x\n", pArena, pArena->magic, pArena->size & ARENA_SIZE_MASK ); + DPRINTF( "%p %08x %s %08x\n", + pArena, pArena->magic, pArena->magic == ARENA_INUSE_MAGIC ? "used" : "pend", + pArena->size & ARENA_SIZE_MASK ); ptr += sizeof(*pArena) + (pArena->size & ARENA_SIZE_MASK); arenaSize += sizeof(ARENA_INUSE); usedSize += pArena->size & ARENA_SIZE_MASK; @@ -607,11 +614,25 @@ static void HEAP_CreateFreeBlock( SUBHEAP *subheap, void *ptr, SIZE_T size ) */ static void HEAP_MakeInUseBlockFree( SUBHEAP *subheap, ARENA_INUSE *pArena ) { + HEAP *heap = subheap->heap; ARENA_FREE *pFree; - SIZE_T size = (pArena->size & ARENA_SIZE_MASK) + sizeof(*pArena); + SIZE_T size; + + if (heap->pending_free) + { + ARENA_INUSE *prev = heap->pending_free[heap->pending_pos]; + heap->pending_free[heap->pending_pos] = pArena; + heap->pending_pos = (heap->pending_pos + 1) % MAX_FREE_PENDING; + pArena->magic = ARENA_PENDING_MAGIC; + mark_block_free( pArena + 1, pArena->size & ARENA_SIZE_MASK, heap->flags ); + if (!prev) return; + pArena = prev; + subheap = HEAP_FindSubHeap( heap, pArena ); + } /* Check if we can merge with previous block */ + size = (pArena->size & ARENA_SIZE_MASK) + sizeof(*pArena); if (pArena->size & ARENA_FLAG_PREV_FREE) { pFree = *((ARENA_FREE **)pArena - 1); @@ -1168,7 +1189,7 @@ static BOOL HEAP_ValidateInUseArena( const SUBHEAP *subheap, const ARENA_INUSE * } /* Check magic number */ - if (pArena->magic != ARENA_INUSE_MAGIC) + if (pArena->magic != ARENA_INUSE_MAGIC && pArena->magic != ARENA_PENDING_MAGIC) { if (quiet == NOISY) { ERR("Heap %p: invalid in-use arena magic %08x for %p\n", subheap->heap, pArena->magic, pArena ); @@ -1238,7 +1259,24 @@ static BOOL HEAP_ValidateInUseArena( const SUBHEAP *subheap, const ARENA_INUSE * return FALSE; } /* Check unused bytes */ - if (flags & HEAP_TAIL_CHECKING_ENABLED) + if (pArena->magic == ARENA_PENDING_MAGIC) + { + DWORD *ptr = (DWORD *)(pArena + 1); + DWORD *end = (DWORD *)((char *)ptr + size); + + while (ptr < end) + { + if (*ptr != ARENA_FREE_FILLER) + { + ERR("Heap %p: free block %p overwritten at %p by %08x\n", + subheap->heap, (ARENA_INUSE *)pArena + 1, ptr, *ptr ); + if (!*ptr) { HEAP_Dump( subheap->heap ); DbgBreakPoint(); } + return FALSE; + } + ptr++; + } + } + else if (flags & HEAP_TAIL_CHECKING_ENABLED) { const unsigned char *data = (const unsigned char *)(pArena + 1) + size - pArena->unused_bytes; @@ -1366,6 +1404,8 @@ static BOOL validate_block_pointer( HEAP *heap, SUBHEAP **ret_subheap, const ARE ret = HEAP_ValidateInUseArena( subheap, arena, QUIET ); else if ((ULONG_PTR)arena % ALIGNMENT != ARENA_OFFSET) WARN( "Heap %p: unaligned arena pointer %p\n", subheap->heap, arena ); + else if (arena->magic == ARENA_PENDING_MAGIC) + WARN( "Heap %p: block %p used after free\n", subheap->heap, arena + 1 ); else if (arena->magic != ARENA_INUSE_MAGIC) WARN( "Heap %p: invalid in-use arena magic %08x for %p\n", subheap->heap, arena->magic, arena ); else if (arena->size & ARENA_FLAG_FREE) @@ -1435,8 +1475,11 @@ void heap_set_debug_flags( HANDLE handle ) } else { - mark_block_tail( (char *)(arena + 1) + size - arena->unused_bytes, - arena->unused_bytes, flags ); + if (arena->magic == ARENA_PENDING_MAGIC) + mark_block_free( arena + 1, size, flags ); + else + mark_block_tail( (char *)(arena + 1) + size - arena->unused_bytes, + arena->unused_bytes, flags ); ptr += sizeof(ARENA_INUSE) + size; } } @@ -1446,6 +1489,19 @@ void heap_set_debug_flags( HANDLE handle ) mark_block_tail( (char *)(large + 1) + large->data_size, large->block_size - sizeof(*large) - large->data_size, flags ); } + + if ((heap->flags & HEAP_GROWABLE) && !heap->pending_free && + ((flags & HEAP_FREE_CHECKING_ENABLED) || RUNNING_ON_VALGRIND)) + { + void *ptr = NULL; + SIZE_T size = MAX_FREE_PENDING * sizeof(*heap->pending_free); + + if (!NtAllocateVirtualMemory( NtCurrentProcess(), &ptr, 4, &size, MEM_COMMIT, PAGE_READWRITE )) + { + heap->pending_free = ptr; + heap->pending_pos = 0; + } + } } @@ -1550,6 +1606,12 @@ HANDLE WINAPI RtlDestroyHeap( HANDLE heap ) NtFreeVirtualMemory( NtCurrentProcess(), &addr, &size, MEM_RELEASE ); } subheap_notify_free_all(&heapPtr->subheap); + if (heapPtr->pending_free) + { + size = 0; + addr = heapPtr->pending_free; + NtFreeVirtualMemory( NtCurrentProcess(), &addr, &size, MEM_RELEASE ); + } size = 0; addr = heapPtr->subheap.base; NtFreeVirtualMemory( NtCurrentProcess(), &addr, &size, MEM_RELEASE ); @@ -2052,7 +2114,8 @@ NTSTATUS WINAPI RtlWalkHeap( HANDLE heap, PVOID entry_ptr ) goto HW_end; } - if (((ARENA_INUSE *)ptr - 1)->magic == ARENA_INUSE_MAGIC) + if (((ARENA_INUSE *)ptr - 1)->magic == ARENA_INUSE_MAGIC || + ((ARENA_INUSE *)ptr - 1)->magic == ARENA_PENDING_MAGIC) { ARENA_INUSE *pArena = (ARENA_INUSE *)ptr - 1; ptr += pArena->size & ARENA_SIZE_MASK; @@ -2100,7 +2163,8 @@ NTSTATUS WINAPI RtlWalkHeap( HANDLE heap, PVOID entry_ptr ) entry->lpData = pArena + 1; entry->cbData = pArena->size & ARENA_SIZE_MASK; entry->cbOverhead = sizeof(ARENA_INUSE); - entry->wFlags = PROCESS_HEAP_ENTRY_BUSY; + entry->wFlags = (pArena->magic == ARENA_PENDING_MAGIC) ? + PROCESS_HEAP_UNCOMMITTED_RANGE : PROCESS_HEAP_ENTRY_BUSY; /* FIXME: can't handle PROCESS_HEAP_ENTRY_MOVEABLE and PROCESS_HEAP_ENTRY_DDESHARE yet */ }

1 0

Juan Lang : wintrust: Return error directly from WINTRUST_VerifySigner.
by Alexandre Julliard Jan. 29, 2010

Jan. 29, 2010

Module: wine Branch: master Commit: 1781878b009c541ef6cd0e56d3b5945805283f44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1781878b009c541ef6cd0e56d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 27 14:03:13 2010 -0800 wintrust: Return error directly from WINTRUST_VerifySigner. --- dlls/wintrust/softpub.c | 34 +++++++++++++++++++++------------- 1 files changed, 21 insertions(+), 13 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 8d017d2..4a702c1 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -520,9 +520,9 @@ static CERT_INFO *WINTRUST_GetSignerCertInfo(CRYPT_PROVIDER_DATA *data, return certInfo; } -static BOOL WINTRUST_VerifySigner(CRYPT_PROVIDER_DATA *data, DWORD signerIdx) +static DWORD WINTRUST_VerifySigner(CRYPT_PROVIDER_DATA *data, DWORD signerIdx) { - BOOL ret; + DWORD err; CERT_INFO *certInfo = WINTRUST_GetSignerCertInfo(data, signerIdx); if (certInfo) @@ -535,25 +535,24 @@ static BOOL WINTRUST_VerifySigner(CRYPT_PROVIDER_DATA *data, DWORD signerIdx) CMSG_CTRL_VERIFY_SIGNATURE_EX_PARA para = { sizeof(para), 0, signerIdx, CMSG_VERIFY_SIGNER_CERT, (LPVOID)subject }; - ret = CryptMsgControl(data->hMsg, 0, CMSG_CTRL_VERIFY_SIGNATURE_EX, - &para); - if (!ret) - SetLastError(TRUST_E_CERT_SIGNATURE); + if (!CryptMsgControl(data->hMsg, 0, CMSG_CTRL_VERIFY_SIGNATURE_EX, + &para)) + err = TRUST_E_CERT_SIGNATURE; else + { data->psPfns->pfnAddCert2Chain(data, signerIdx, FALSE, 0, subject); + err = ERROR_SUCCESS; + } CertFreeCertificateContext(subject); } else - { - SetLastError(TRUST_E_NO_SIGNER_CERT); - ret = FALSE; - } + err = TRUST_E_NO_SIGNER_CERT; data->psPfns->pfnFree(certInfo); } else - ret = FALSE; - return ret; + err = GetLastError(); + return err; } HRESULT WINAPI SoftpubLoadSignature(CRYPT_PROVIDER_DATA *data) @@ -579,7 +578,16 @@ HRESULT WINAPI SoftpubLoadSignature(CRYPT_PROVIDER_DATA *data) for (i = 0; ret && i < signerCount; i++) { if ((ret = WINTRUST_SaveSigner(data, i))) - ret = WINTRUST_VerifySigner(data, i); + { + DWORD err; + + err = WINTRUST_VerifySigner(data, i); + if (err) + { + SetLastError(err); + ret = FALSE; + } + } } } else

1 0

Alexandre Julliard : ntdll: Fix the various heap debug checks for 64-bit.
by Alexandre Julliard Jan. 29, 2010

Jan. 29, 2010

Module: wine Branch: master Commit: 7ffb1c102ed38bff541c9ccc430727ded9b21a88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ffb1c102ed38bff541c9ccc4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 29 12:10:17 2010 +0100 ntdll: Fix the various heap debug checks for 64-bit. --- dlls/ntdll/heap.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 9a41d68..5e57fd0 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -110,7 +110,8 @@ C_ASSERT( sizeof(ARENA_LARGE) % LARGE_ALIGNMENT == 0 ); /* minimum size to start allocating large blocks */ #define HEAP_MIN_LARGE_BLOCK_SIZE 0x7f000 /* extra size to add at the end of block for tail checking */ -#define HEAP_TAIL_EXTRA_SIZE(flags) ((flags & HEAP_TAIL_CHECKING_ENABLED) || RUNNING_ON_VALGRIND ? 8 : 0) +#define HEAP_TAIL_EXTRA_SIZE(flags) \ + ((flags & HEAP_TAIL_CHECKING_ENABLED) || RUNNING_ON_VALGRIND ? ALIGNMENT : 0) /* Max size of the blocks on the free lists */ static const SIZE_T HEAP_freeListSizes[] = @@ -143,7 +144,8 @@ typedef struct tagSUBHEAP typedef struct tagHEAP { - DWORD unknown[3]; + DWORD_PTR unknown1[2]; + DWORD unknown2; DWORD flags; /* Heap flags */ DWORD force_flags; /* Forced heap flags for debugging */ SUBHEAP subheap; /* First sub-heap */ @@ -1143,7 +1145,8 @@ static BOOL HEAP_ValidateFreeArena( SUBHEAP *subheap, ARENA_FREE *pArena ) char *end = (char *)(pArena + 1) + size; if (end >= heapEnd) end = (char *)subheap->base + subheap->commitSize; - while (ptr < (DWORD *)end - 1) + else end -= sizeof(ARENA_FREE *); + while (ptr < (DWORD *)end) { if (*ptr != ARENA_FREE_FILLER) { @@ -1466,8 +1469,8 @@ void heap_set_debug_flags( HANDLE handle ) SIZE_T count = size; ptr += sizeof(ARENA_FREE) + size; - if (ptr > end) count = end - (char *)((ARENA_FREE *)arena + 1); - else count -= sizeof(DWORD); + if (ptr >= end) count = end - (char *)((ARENA_FREE *)arena + 1); + else count -= sizeof(ARENA_FREE *); mark_block_free( (ARENA_FREE *)arena + 1, count, flags ); } else

1 0

Alexandre Julliard : ntdll: Disable debug flags when running on Valgrind.
by Alexandre Julliard Jan. 29, 2010

Jan. 29, 2010

Module: wine Branch: master Commit: a75ae7936eb2581cdc6a7a5050ae79add0cb4ab1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a75ae7936eb2581cdc6a7a505… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 28 19:42:31 2010 +0100 ntdll: Disable debug flags when running on Valgrind. The extra debug checks cause more harm than good under Valgrind. --- dlls/ntdll/heap.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 1055ce0..07fec3f 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1406,6 +1406,8 @@ void heap_set_debug_flags( HANDLE handle ) flags |= HEAP_VALIDATE | HEAP_VALIDATE_ALL | HEAP_TAIL_CHECKING_ENABLED | HEAP_FREE_CHECKING_ENABLED; + if (RUNNING_ON_VALGRIND) flags = 0; /* no sense in validating since Valgrind catches accesses */ + heap->flags |= flags; heap->force_flags |= flags & ~(HEAP_VALIDATE | HEAP_DISABLE_COALESCE_ON_FREE);

1 0

Juan Lang : wintrust: Simplify error handling in SoftpubLoadSignature.
by Alexandre Julliard Jan. 29, 2010

Jan. 29, 2010

Module: wine Branch: master Commit: c9c23190f76a89cb12d8241dec5725b6ae3984d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9c23190f76a89cb12d8241de… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 27 14:09:37 2010 -0800 wintrust: Simplify error handling in SoftpubLoadSignature. --- dlls/wintrust/softpub.c | 22 +++++++++------------- 1 files changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 3fc14c2..c7d5f6a 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -560,7 +560,7 @@ static DWORD WINTRUST_VerifySigner(CRYPT_PROVIDER_DATA *data, DWORD signerIdx) HRESULT WINAPI SoftpubLoadSignature(CRYPT_PROVIDER_DATA *data) { - BOOL ret; + DWORD err; TRACE("(%p)\n", data); @@ -572,30 +572,26 @@ HRESULT WINAPI SoftpubLoadSignature(CRYPT_PROVIDER_DATA *data) DWORD signerCount, size; size = sizeof(signerCount); - ret = CryptMsgGetParam(data->hMsg, CMSG_SIGNER_COUNT_PARAM, 0, - &signerCount, &size); - if (ret) + if (CryptMsgGetParam(data->hMsg, CMSG_SIGNER_COUNT_PARAM, 0, + &signerCount, &size)) { DWORD i; - DWORD err = ERROR_SUCCESS; + err = ERROR_SUCCESS; for (i = 0; !err && i < signerCount; i++) { if (!(err = WINTRUST_SaveSigner(data, i))) err = WINTRUST_VerifySigner(data, i); } - if (err) - ret = FALSE; } else - SetLastError(TRUST_E_NOSIGNATURE); + err = TRUST_E_NOSIGNATURE; } else - ret = TRUE; - if (!ret) - data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_SIGPROV] = - GetLastError(); - return ret ? S_OK : S_FALSE; + err = ERROR_SUCCESS; + if (err) + data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_SIGPROV] = err; + return !err ? S_OK : S_FALSE; } static DWORD WINTRUST_TrustStatusToConfidence(DWORD errorStatus)

1 0

Alexandre Julliard : dbghelp: Fix the Mac OS build.
by Alexandre Julliard Jan. 28, 2010

Jan. 28, 2010

Module: wine Branch: master Commit: 2a071639010232e8a45ef4ea8231b90cc7c9b7c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a071639010232e8a45ef4ea8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 28 15:52:32 2010 +0100 dbghelp: Fix the Mac OS build. --- dlls/dbghelp/macho_module.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 4cc220e..379596b 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -826,8 +826,7 @@ static void macho_finish_stabs(struct module* module, struct hash_table* ht_symt if (ste->is_public && !(dbghelp_options & SYMOPT_NO_PUBLICS)) { - symt_new_public(module, ste->compiland, ste->ht_elt.name, - ste->addr, 0, ste->is_code, ste->is_code); + symt_new_public(module, ste->compiland, ste->ht_elt.name, ste->addr, 0); } } }

1 0