October 2009 - Wine-Commits

Eric Pouech : mciwave: Try to synchronize better async commands.
by Alexandre Julliard Oct. 19, 2009

Oct. 19, 2009

Module: wine Branch: master Commit: 3d8507bcb82e2c3be1baa2c40cee39c736c97223 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d8507bcb82e2c3be1baa2c40… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Oct 17 10:08:43 2009 +0200 mciwave: Try to synchronize better async commands. --- dlls/mciwave/mciwave.c | 34 ++++++++++++++++++++++++---------- 1 files changed, 24 insertions(+), 10 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index 5571b1f..8729bfb 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -62,10 +62,11 @@ typedef struct { * =================================================================== * =================================================================== */ -typedef DWORD (*async_cmd)(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt); +typedef DWORD (*async_cmd)(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt, HANDLE evt); struct SCA { async_cmd cmd; + HANDLE evt; UINT wDevID; DWORD_PTR dwParam1; DWORD_PTR dwParam2; @@ -81,7 +82,7 @@ static DWORD CALLBACK MCI_SCAStarter(LPVOID arg) TRACE("In thread before async command (%08x,%08lx,%08lx)\n", sca->wDevID, sca->dwParam1, sca->dwParam2); - ret = sca->cmd(sca->wDevID, sca->dwParam1 | MCI_WAIT, sca->dwParam2); + ret = sca->cmd(sca->wDevID, sca->dwParam1 | MCI_WAIT, sca->dwParam2, sca->evt); TRACE("In thread after async command (%08x,%08lx,%08lx)\n", sca->wDevID, sca->dwParam1, sca->dwParam2); HeapFree(GetProcessHeap(), 0, sca); @@ -97,7 +98,7 @@ static DWORD CALLBACK MCI_SCAStarter(LPVOID arg) static DWORD MCI_SendCommandAsync(UINT wDevID, async_cmd cmd, DWORD_PTR dwParam1, DWORD_PTR dwParam2, UINT size) { - HANDLE handle; + HANDLE handles[2]; struct SCA* sca = HeapAlloc(GetProcessHeap(), 0, sizeof(struct SCA) + size); if (sca == 0) @@ -117,12 +118,22 @@ static DWORD MCI_SendCommandAsync(UINT wDevID, async_cmd cmd, DWORD_PTR dwParam1 sca->dwParam2 = dwParam2; } - if ((handle = CreateThread(NULL, 0, MCI_SCAStarter, sca, 0, NULL)) == 0) { + if ((sca->evt = handles[1] = CreateEventW(NULL, FALSE, FALSE, NULL)) == NULL || + (handles[0] = CreateThread(NULL, 0, MCI_SCAStarter, sca, 0, NULL)) == 0) { WARN("Couldn't allocate thread for async command handling, sending synchronously\n"); + if (handles[1]) CloseHandle(handles[1]); + sca->evt = NULL; return MCI_SCAStarter(&sca); } - SetThreadPriority(handle, THREAD_PRIORITY_TIME_CRITICAL); - CloseHandle(handle); + + SetThreadPriority(handles[0], THREAD_PRIORITY_TIME_CRITICAL); + /* wait until either: + * - the thread has finished (handles[0], likely an error) + * - init phase of async command is done (handles[1]) + */ + WaitForMultipleObjects(2, handles, FALSE, INFINITE); + CloseHandle(handles[0]); + CloseHandle(handles[1]); return 0; } @@ -700,7 +711,7 @@ static void WAVE_mciPlayWaitDone(WINE_MCIWAVE* wmw) /************************************************************************** * WAVE_mciPlay [internal] */ -static DWORD WAVE_mciPlay(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt) +static DWORD WAVE_mciPlay(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt, HANDLE hEvent) { LPMCI_PLAY_PARMS lpParms = (void*)pmt; DWORD end; @@ -829,6 +840,7 @@ static DWORD WAVE_mciPlay(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt) wmw->dwEventCount = 1L; /* for first buffer */ TRACE("Playing (normalized) from byte=%u for %u bytes\n", wmw->dwPosition, left); + if (hEvent) SetEvent(hEvent); /* FIXME: this doesn't work if wmw->dwPosition != 0 */ while (left > 0 && wmw->dwStatus != MCI_MODE_STOP && wmw->dwStatus != MCI_MODE_NOT_READY) { @@ -946,7 +958,7 @@ static void WAVE_mciRecordWaitDone(WINE_MCIWAVE* wmw) /************************************************************************** * WAVE_mciRecord [internal] */ -static DWORD WAVE_mciRecord(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt) +static DWORD WAVE_mciRecord(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt, HANDLE hEvent) { LPMCI_RECORD_PARMS lpParms = (void*)pmt; DWORD end; @@ -1071,6 +1083,8 @@ static DWORD WAVE_mciRecord(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt dwRet = waveInStart(wmw->hWave); + if (hEvent) SetEvent(hEvent); + while (wmw->dwPosition < end && wmw->dwStatus != MCI_MODE_STOP && wmw->dwStatus != MCI_MODE_NOT_READY) { WAVE_mciRecordWaitDone(wmw); } @@ -1627,8 +1641,8 @@ LRESULT CALLBACK MCIWAVE_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case MCI_OPEN_DRIVER: return WAVE_mciOpen (dwDevID, dwParam1, (LPMCI_WAVE_OPEN_PARMSW) dwParam2); case MCI_CLOSE_DRIVER: return WAVE_mciClose (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS) dwParam2); case MCI_CUE: return WAVE_mciCue (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS) dwParam2); - case MCI_PLAY: return WAVE_mciPlay (dwDevID, dwParam1, dwParam2); - case MCI_RECORD: return WAVE_mciRecord (dwDevID, dwParam1, dwParam2); + case MCI_PLAY: return WAVE_mciPlay (dwDevID, dwParam1, dwParam2, NULL); + case MCI_RECORD: return WAVE_mciRecord (dwDevID, dwParam1, dwParam2, NULL); case MCI_STOP: return WAVE_mciStop (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS) dwParam2); case MCI_SET: return WAVE_mciSet (dwDevID, dwParam1, (LPMCI_SET_PARMS) dwParam2); case MCI_PAUSE: return WAVE_mciPause (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS) dwParam2);

1 0

Juan Lang : crypt32: Compare certificates in a consistent order.
by Alexandre Julliard Oct. 19, 2009

Oct. 19, 2009

Module: wine Branch: master Commit: 60140610e3405ca950a8b05b0fd8e888ba1a6bd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60140610e3405ca950a8b05b0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 15 11:52:25 2009 -0700 crypt32: Compare certificates in a consistent order. --- dlls/crypt32/cert.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 281f55f..b92aee9 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1196,7 +1196,7 @@ static BOOL compare_cert_by_subject_cert(PCCERT_CONTEXT pCertContext, /* Matching serial number and subject match.. */ ret = CertCompareCertificateName(pCertContext->dwCertEncodingType, - &pCertInfo->Issuer, &pCertContext->pCertInfo->Subject); + &pCertContext->pCertInfo->Subject, &pCertInfo->Issuer); if (ret) ret = CertCompareIntegerBlob(&pCertContext->pCertInfo->SerialNumber, &pCertInfo->SerialNumber); @@ -1207,7 +1207,7 @@ static BOOL compare_cert_by_subject_cert(PCCERT_CONTEXT pCertContext, &pCertInfo->SerialNumber); if (ret) ret = CertCompareCertificateName(pCertContext->dwCertEncodingType, - &pCertInfo->Issuer, &pCertContext->pCertInfo->Issuer); + &pCertContext->pCertInfo->Issuer, &pCertInfo->Issuer); } TRACE("returning %d\n", ret); return ret;

1 0

Juan Lang : crypt32: Introduce a helper function to search for certificates that doesn' t require recreating the search key for every certificate.
by Alexandre Julliard Oct. 19, 2009

Oct. 19, 2009

Module: wine Branch: master Commit: b2d27097b5b8f7f697880da5ce82f6dc95e1e59d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2d27097b5b8f7f697880da5c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 15 10:54:09 2009 -0700 crypt32: Introduce a helper function to search for certificates that doesn't require recreating the search key for every certificate. --- dlls/crypt32/cert.c | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index b640c30..618c578 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1120,12 +1120,6 @@ DWORD WINAPI CertGetPublicKeyLength(DWORD dwCertEncodingType, typedef BOOL (*CertCompareFunc)(PCCERT_CONTEXT pCertContext, DWORD dwType, DWORD dwFlags, const void *pvPara); -static BOOL compare_cert_any(PCCERT_CONTEXT pCertContext, DWORD dwType, - DWORD dwFlags, const void *pvPara) -{ - return TRUE; -} - static BOOL compare_cert_by_md5_hash(PCCERT_CONTEXT pCertContext, DWORD dwType, DWORD dwFlags, const void *pvPara) { @@ -1421,12 +1415,22 @@ static inline PCCERT_CONTEXT cert_compare_certs_in_store(HCERTSTORE store, return ret; } +typedef PCCERT_CONTEXT (*CertFindFunc)(HCERTSTORE store, DWORD dwType, + DWORD dwFlags, const void *pvPara, PCCERT_CONTEXT prev); + +static PCCERT_CONTEXT find_cert_any(HCERTSTORE store, DWORD dwType, + DWORD dwFlags, const void *pvPara, PCCERT_CONTEXT prev) +{ + return CertEnumCertificatesInStore(store, prev); +} + PCCERT_CONTEXT WINAPI CertFindCertificateInStore(HCERTSTORE hCertStore, DWORD dwCertEncodingType, DWORD dwFlags, DWORD dwType, const void *pvPara, PCCERT_CONTEXT pPrevCertContext) { PCCERT_CONTEXT ret; - CertCompareFunc compare; + CertFindFunc find = NULL; + CertCompareFunc compare = NULL; TRACE("(%p, %08x, %08x, %08x, %p, %p)\n", hCertStore, dwCertEncodingType, dwFlags, dwType, pvPara, pPrevCertContext); @@ -1434,7 +1438,7 @@ PCCERT_CONTEXT WINAPI CertFindCertificateInStore(HCERTSTORE hCertStore, switch (dwType >> CERT_COMPARE_SHIFT) { case CERT_COMPARE_ANY: - compare = compare_cert_any; + find = find_cert_any; break; case CERT_COMPARE_MD5_HASH: compare = compare_cert_by_md5_hash; @@ -1465,21 +1469,17 @@ PCCERT_CONTEXT WINAPI CertFindCertificateInStore(HCERTSTORE hCertStore, break; default: FIXME("find type %08x unimplemented\n", dwType); - compare = NULL; } - if (compare) - { + if (find) + ret = find(hCertStore, dwFlags, dwType, pvPara, pPrevCertContext); + else if (compare) ret = cert_compare_certs_in_store(hCertStore, pPrevCertContext, compare, dwType, dwFlags, pvPara); - if (!ret) - SetLastError(CRYPT_E_NOT_FOUND); - } else - { - SetLastError(CRYPT_E_NOT_FOUND); ret = NULL; - } + if (!ret) + SetLastError(CRYPT_E_NOT_FOUND); TRACE("returning %p\n", ret); return ret; }

1 0

Michael Stefaniuc : user32: Remove a duplicated return statement (Smatch).
by Alexandre Julliard Oct. 19, 2009

Oct. 19, 2009

Module: wine Branch: master Commit: 77f43eedf5eced6aef4eaf49833cdffbae929281 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77f43eedf5eced6aef4eaf498… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Oct 16 22:22:29 2009 +0200 user32: Remove a duplicated return statement (Smatch). --- dlls/user32/resource.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/user32/resource.c b/dlls/user32/resource.c index 82ec05b..e2695b6 100644 --- a/dlls/user32/resource.c +++ b/dlls/user32/resource.c @@ -70,7 +70,6 @@ HACCEL WINAPI LoadAcceleratorsW(HINSTANCE instance, LPCWSTR name) memcpy( accel->table, table, count * sizeof(*table) ); if (!(handle = alloc_user_handle( &accel->obj, USER_ACCEL ))) HeapFree( GetProcessHeap(), 0, accel ); - return handle; TRACE_(accel)("%p %s returning %p\n", instance, debugstr_w(name), handle ); return handle; }

1 0

Eric Pouech : mciwave: Simplify async command management by directly calling the right function instead of going through winmm again .
by Alexandre Julliard Oct. 19, 2009

Oct. 19, 2009

Module: wine Branch: master Commit: 49ff58e386e618717be0676650ff7b8d8882bc76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49ff58e386e618717be067665… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Oct 17 10:08:37 2009 +0200 mciwave: Simplify async command management by directly calling the right function instead of going through winmm again. --- dlls/mciwave/mciwave.c | 36 ++++++++++++++++++++---------------- 1 files changed, 20 insertions(+), 16 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index 66af58a..5571b1f 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -62,9 +62,11 @@ typedef struct { * =================================================================== * =================================================================== */ +typedef DWORD (*async_cmd)(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt); + struct SCA { + async_cmd cmd; UINT wDevID; - UINT wMsg; DWORD_PTR dwParam1; DWORD_PTR dwParam2; }; @@ -77,11 +79,11 @@ static DWORD CALLBACK MCI_SCAStarter(LPVOID arg) struct SCA* sca = (struct SCA*)arg; DWORD ret; - TRACE("In thread before async command (%08x,%u,%08lx,%08lx)\n", - sca->wDevID, sca->wMsg, sca->dwParam1, sca->dwParam2); - ret = mciSendCommandA(sca->wDevID, sca->wMsg, sca->dwParam1 | MCI_WAIT, sca->dwParam2); - TRACE("In thread after async command (%08x,%u,%08lx,%08lx)\n", - sca->wDevID, sca->wMsg, sca->dwParam1, sca->dwParam2); + TRACE("In thread before async command (%08x,%08lx,%08lx)\n", + sca->wDevID, sca->dwParam1, sca->dwParam2); + ret = sca->cmd(sca->wDevID, sca->dwParam1 | MCI_WAIT, sca->dwParam2); + TRACE("In thread after async command (%08x,%08lx,%08lx)\n", + sca->wDevID, sca->dwParam1, sca->dwParam2); HeapFree(GetProcessHeap(), 0, sca); ExitThread(ret); WARN("Should not happen ? what's wrong\n"); @@ -92,7 +94,7 @@ static DWORD CALLBACK MCI_SCAStarter(LPVOID arg) /************************************************************************** * MCI_SendCommandAsync [internal] */ -static DWORD MCI_SendCommandAsync(UINT wDevID, UINT wMsg, DWORD_PTR dwParam1, +static DWORD MCI_SendCommandAsync(UINT wDevID, async_cmd cmd, DWORD_PTR dwParam1, DWORD_PTR dwParam2, UINT size) { HANDLE handle; @@ -102,7 +104,7 @@ static DWORD MCI_SendCommandAsync(UINT wDevID, UINT wMsg, DWORD_PTR dwParam1, return MCIERR_OUT_OF_MEMORY; sca->wDevID = wDevID; - sca->wMsg = wMsg; + sca->cmd = cmd; sca->dwParam1 = dwParam1; if (size && dwParam2) { @@ -698,8 +700,9 @@ static void WAVE_mciPlayWaitDone(WINE_MCIWAVE* wmw) /************************************************************************** * WAVE_mciPlay [internal] */ -static DWORD WAVE_mciPlay(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms) +static DWORD WAVE_mciPlay(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt) { + LPMCI_PLAY_PARMS lpParms = (void*)pmt; DWORD end; LONG bufsize, count, left; DWORD dwRet = 0; @@ -707,7 +710,7 @@ static DWORD WAVE_mciPlay(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lp WINE_MCIWAVE* wmw = WAVE_mciGetOpenDev(wDevID); int whidx; - TRACE("(%u, %08X, %p);\n", wDevID, dwFlags, lpParms); + TRACE("(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms); if (wmw == NULL) return MCIERR_INVALID_DEVICE_ID; if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; @@ -735,7 +738,7 @@ static DWORD WAVE_mciPlay(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lp wmw->dwStatus = MCI_MODE_PLAY; if (!(dwFlags & MCI_WAIT)) { - return MCI_SendCommandAsync(wmw->openParms.wDeviceID, MCI_PLAY, dwFlags, + return MCI_SendCommandAsync(wmw->openParms.wDeviceID, WAVE_mciPlay, dwFlags, (DWORD_PTR)lpParms, sizeof(MCI_PLAY_PARMS)); } @@ -943,15 +946,16 @@ static void WAVE_mciRecordWaitDone(WINE_MCIWAVE* wmw) /************************************************************************** * WAVE_mciRecord [internal] */ -static DWORD WAVE_mciRecord(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_RECORD_PARMS lpParms) +static DWORD WAVE_mciRecord(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt) { + LPMCI_RECORD_PARMS lpParms = (void*)pmt; DWORD end; DWORD dwRet = MMSYSERR_NOERROR; LONG bufsize; LPWAVEHDR waveHdr = NULL; WINE_MCIWAVE* wmw = WAVE_mciGetOpenDev(wDevID); - TRACE("(%u, %08X, %p);\n", wDevID, dwFlags, lpParms); + TRACE("(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms); if (wmw == NULL) return MCIERR_INVALID_DEVICE_ID; if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; @@ -977,7 +981,7 @@ static DWORD WAVE_mciRecord(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_RECORD_PARM wmw->dwStatus = MCI_MODE_RECORD; if (!(dwFlags & MCI_WAIT)) { - return MCI_SendCommandAsync(wmw->openParms.wDeviceID, MCI_RECORD, dwFlags, + return MCI_SendCommandAsync(wmw->openParms.wDeviceID, WAVE_mciRecord, dwFlags, (DWORD_PTR)lpParms, sizeof(MCI_RECORD_PARMS)); } @@ -1623,8 +1627,8 @@ LRESULT CALLBACK MCIWAVE_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case MCI_OPEN_DRIVER: return WAVE_mciOpen (dwDevID, dwParam1, (LPMCI_WAVE_OPEN_PARMSW) dwParam2); case MCI_CLOSE_DRIVER: return WAVE_mciClose (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS) dwParam2); case MCI_CUE: return WAVE_mciCue (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS) dwParam2); - case MCI_PLAY: return WAVE_mciPlay (dwDevID, dwParam1, (LPMCI_PLAY_PARMS) dwParam2); - case MCI_RECORD: return WAVE_mciRecord (dwDevID, dwParam1, (LPMCI_RECORD_PARMS) dwParam2); + case MCI_PLAY: return WAVE_mciPlay (dwDevID, dwParam1, dwParam2); + case MCI_RECORD: return WAVE_mciRecord (dwDevID, dwParam1, dwParam2); case MCI_STOP: return WAVE_mciStop (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS) dwParam2); case MCI_SET: return WAVE_mciSet (dwDevID, dwParam1, (LPMCI_SET_PARMS) dwParam2); case MCI_PAUSE: return WAVE_mciPause (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS) dwParam2);

1 0

Juan Lang : crypt32: Avoid repeatedly decoding authority key id extensions when searching for a cert 's issuer.
by Alexandre Julliard Oct. 19, 2009

Oct. 19, 2009

Module: wine Branch: master Commit: 3740e4150ba3f9333ca701d346422bcce8106329 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3740e4150ba3f9333ca701d34… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 15 11:14:23 2009 -0700 crypt32: Avoid repeatedly decoding authority key id extensions when searching for a cert's issuer. --- dlls/crypt32/cert.c | 148 +++++++++++++++++++++++++-------------------------- 1 files changed, 73 insertions(+), 75 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 618c578..281f55f 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1261,11 +1261,70 @@ static BOOL compare_cert_by_cert_id(PCCERT_CONTEXT pCertContext, DWORD dwType, return ret; } -static BOOL compare_cert_by_issuer(PCCERT_CONTEXT pCertContext, DWORD dwType, +static BOOL compare_existing_cert(PCCERT_CONTEXT pCertContext, DWORD dwType, + DWORD dwFlags, const void *pvPara) +{ + PCCERT_CONTEXT toCompare = pvPara; + return CertCompareCertificate(pCertContext->dwCertEncodingType, + pCertContext->pCertInfo, toCompare->pCertInfo); +} + +static BOOL compare_cert_by_signature_hash(PCCERT_CONTEXT pCertContext, DWORD dwType, DWORD dwFlags, const void *pvPara) { - BOOL ret = FALSE; - PCCERT_CONTEXT subject = pvPara; + const CRYPT_HASH_BLOB *hash = pvPara; + DWORD size = 0; + BOOL ret; + + ret = CertGetCertificateContextProperty(pCertContext, + CERT_SIGNATURE_HASH_PROP_ID, NULL, &size); + if (ret && size == hash->cbData) + { + LPBYTE buf = CryptMemAlloc(size); + + if (buf) + { + CertGetCertificateContextProperty(pCertContext, + CERT_SIGNATURE_HASH_PROP_ID, buf, &size); + ret = !memcmp(buf, hash->pbData, size); + CryptMemFree(buf); + } + } + else + ret = FALSE; + return ret; +} + +static inline PCCERT_CONTEXT cert_compare_certs_in_store(HCERTSTORE store, + PCCERT_CONTEXT prev, CertCompareFunc compare, DWORD dwType, DWORD dwFlags, + const void *pvPara) +{ + BOOL matches = FALSE; + PCCERT_CONTEXT ret; + + ret = prev; + do { + ret = CertEnumCertificatesInStore(store, ret); + if (ret) + matches = compare(ret, dwType, dwFlags, pvPara); + } while (ret != NULL && !matches); + return ret; +} + +typedef PCCERT_CONTEXT (*CertFindFunc)(HCERTSTORE store, DWORD dwType, + DWORD dwFlags, const void *pvPara, PCCERT_CONTEXT prev); + +static PCCERT_CONTEXT find_cert_any(HCERTSTORE store, DWORD dwType, + DWORD dwFlags, const void *pvPara, PCCERT_CONTEXT prev) +{ + return CertEnumCertificatesInStore(store, prev); +} + +static PCCERT_CONTEXT find_cert_by_issuer(HCERTSTORE store, DWORD dwType, + DWORD dwFlags, const void *pvPara, PCCERT_CONTEXT prev) +{ + BOOL ret; + PCCERT_CONTEXT found = NULL, subject = pvPara; PCERT_EXTENSION ext; DWORD size; @@ -1289,18 +1348,17 @@ static BOOL compare_cert_by_issuer(PCCERT_CONTEXT pCertContext, DWORD dwType, sizeof(CERT_NAME_BLOB)); memcpy(&id.u.IssuerSerialNumber.SerialNumber, &info->CertSerialNumber, sizeof(CRYPT_INTEGER_BLOB)); - ret = compare_cert_by_cert_id(pCertContext, dwType, dwFlags, - &id); } else if (info->KeyId.cbData) { id.dwIdChoice = CERT_ID_KEY_IDENTIFIER; memcpy(&id.u.KeyId, &info->KeyId, sizeof(CRYPT_HASH_BLOB)); - ret = compare_cert_by_cert_id(pCertContext, dwType, dwFlags, - &id); } else ret = FALSE; + if (ret) + found = cert_compare_certs_in_store(store, prev, + compare_cert_by_cert_id, dwType, dwFlags, &id); LocalFree(info); } } @@ -1337,8 +1395,6 @@ static BOOL compare_cert_by_issuer(PCCERT_CONTEXT pCertContext, DWORD dwType, memcpy(&id.u.IssuerSerialNumber.SerialNumber, &info->AuthorityCertSerialNumber, sizeof(CRYPT_INTEGER_BLOB)); - ret = compare_cert_by_cert_id(pCertContext, dwType, dwFlags, - &id); } else { @@ -1350,78 +1406,20 @@ static BOOL compare_cert_by_issuer(PCCERT_CONTEXT pCertContext, DWORD dwType, { id.dwIdChoice = CERT_ID_KEY_IDENTIFIER; memcpy(&id.u.KeyId, &info->KeyId, sizeof(CRYPT_HASH_BLOB)); - ret = compare_cert_by_cert_id(pCertContext, dwType, dwFlags, - &id); } else ret = FALSE; + if (ret) + found = cert_compare_certs_in_store(store, prev, + compare_cert_by_cert_id, dwType, dwFlags, &id); LocalFree(info); } } else - ret = compare_cert_by_name(pCertContext, - CERT_COMPARE_NAME | CERT_COMPARE_SUBJECT_CERT, dwFlags, - &subject->pCertInfo->Issuer); - return ret; -} - -static BOOL compare_existing_cert(PCCERT_CONTEXT pCertContext, DWORD dwType, - DWORD dwFlags, const void *pvPara) -{ - PCCERT_CONTEXT toCompare = pvPara; - return CertCompareCertificate(pCertContext->dwCertEncodingType, - pCertContext->pCertInfo, toCompare->pCertInfo); -} - -static BOOL compare_cert_by_signature_hash(PCCERT_CONTEXT pCertContext, DWORD dwType, - DWORD dwFlags, const void *pvPara) -{ - const CRYPT_HASH_BLOB *hash = pvPara; - DWORD size = 0; - BOOL ret; - - ret = CertGetCertificateContextProperty(pCertContext, - CERT_SIGNATURE_HASH_PROP_ID, NULL, &size); - if (ret && size == hash->cbData) - { - LPBYTE buf = CryptMemAlloc(size); - - if (buf) - { - CertGetCertificateContextProperty(pCertContext, - CERT_SIGNATURE_HASH_PROP_ID, buf, &size); - ret = !memcmp(buf, hash->pbData, size); - CryptMemFree(buf); - } - } - else - ret = FALSE; - return ret; -} - -static inline PCCERT_CONTEXT cert_compare_certs_in_store(HCERTSTORE store, - PCCERT_CONTEXT prev, CertCompareFunc compare, DWORD dwType, DWORD dwFlags, - const void *pvPara) -{ - BOOL matches = FALSE; - PCCERT_CONTEXT ret; - - ret = prev; - do { - ret = CertEnumCertificatesInStore(store, ret); - if (ret) - matches = compare(ret, dwType, dwFlags, pvPara); - } while (ret != NULL && !matches); - return ret; -} - -typedef PCCERT_CONTEXT (*CertFindFunc)(HCERTSTORE store, DWORD dwType, - DWORD dwFlags, const void *pvPara, PCCERT_CONTEXT prev); - -static PCCERT_CONTEXT find_cert_any(HCERTSTORE store, DWORD dwType, - DWORD dwFlags, const void *pvPara, PCCERT_CONTEXT prev) -{ - return CertEnumCertificatesInStore(store, prev); + found = cert_compare_certs_in_store(store, prev, + compare_cert_by_name, CERT_COMPARE_NAME | CERT_COMPARE_SUBJECT_CERT, + dwFlags, &subject->pCertInfo->Issuer); + return found; } PCCERT_CONTEXT WINAPI CertFindCertificateInStore(HCERTSTORE hCertStore, @@ -1459,7 +1457,7 @@ PCCERT_CONTEXT WINAPI CertFindCertificateInStore(HCERTSTORE hCertStore, compare = compare_cert_by_cert_id; break; case CERT_COMPARE_ISSUER_OF: - compare = compare_cert_by_issuer; + find = find_cert_by_issuer; break; case CERT_COMPARE_EXISTING: compare = compare_existing_cert;

1 0

Juan Lang : crypt32: Use helper function to search for certs.
by Alexandre Julliard Oct. 19, 2009

Oct. 19, 2009

Module: wine Branch: master Commit: e0a440483128c7856a4e1172e33833e7a34ca6e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0a440483128c7856a4e1172e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 15 10:46:44 2009 -0700 crypt32: Use helper function to search for certs. --- dlls/crypt32/cert.c | 26 ++++++++++++++++++-------- 1 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 1c0c74e..b640c30 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1405,6 +1405,22 @@ static BOOL compare_cert_by_signature_hash(PCCERT_CONTEXT pCertContext, DWORD dw return ret; } +static inline PCCERT_CONTEXT cert_compare_certs_in_store(HCERTSTORE store, + PCCERT_CONTEXT prev, CertCompareFunc compare, DWORD dwType, DWORD dwFlags, + const void *pvPara) +{ + BOOL matches = FALSE; + PCCERT_CONTEXT ret; + + ret = prev; + do { + ret = CertEnumCertificatesInStore(store, ret); + if (ret) + matches = compare(ret, dwType, dwFlags, pvPara); + } while (ret != NULL && !matches); + return ret; +} + PCCERT_CONTEXT WINAPI CertFindCertificateInStore(HCERTSTORE hCertStore, DWORD dwCertEncodingType, DWORD dwFlags, DWORD dwType, const void *pvPara, PCCERT_CONTEXT pPrevCertContext) @@ -1454,14 +1470,8 @@ PCCERT_CONTEXT WINAPI CertFindCertificateInStore(HCERTSTORE hCertStore, if (compare) { - BOOL matches = FALSE; - - ret = pPrevCertContext; - do { - ret = CertEnumCertificatesInStore(hCertStore, ret); - if (ret) - matches = compare(ret, dwType, dwFlags, pvPara); - } while (ret != NULL && !matches); + ret = cert_compare_certs_in_store(hCertStore, pPrevCertContext, + compare, dwType, dwFlags, pvPara); if (!ret) SetLastError(CRYPT_E_NOT_FOUND); }

1 0

Juan Lang : wintrust: Simplify CRYPT_AsnDecodeInt.
by Alexandre Julliard Oct. 19, 2009

Oct. 19, 2009

Module: wine Branch: master Commit: af192c20f960609449ae11fa7a4bc5d148cc90b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af192c20f960609449ae11fa7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 16 11:52:01 2009 -0700 wintrust: Simplify CRYPT_AsnDecodeInt. --- dlls/wintrust/asn.c | 62 +++++++++----------------------------------------- 1 files changed, 11 insertions(+), 51 deletions(-) diff --git a/dlls/wintrust/asn.c b/dlls/wintrust/asn.c index 002eab5..472521f 100644 --- a/dlls/wintrust/asn.c +++ b/dlls/wintrust/asn.c @@ -2179,62 +2179,24 @@ BOOL WINAPI WVTAsn1SpcSpOpusInfoDecode(DWORD dwCertEncodingType, return ret; } -static BOOL CRYPT_AsnDecodeInteger(const BYTE *pbEncoded, - DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo) +/* Ignores tag. Only allows integers 4 bytes or smaller in size. */ +static BOOL WINAPI CRYPT_AsnDecodeInt(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, + void *pvStructInfo, DWORD *pcbStructInfo) { BOOL ret; - DWORD bytesNeeded, dataLen; + DWORD dataLen; if ((ret = CRYPT_GetLen(pbEncoded, cbEncoded, &dataLen))) { BYTE lenBytes = GET_LEN_BYTES(pbEncoded[1]); - bytesNeeded = dataLen + sizeof(CRYPT_INTEGER_BLOB); - if (!pvStructInfo) - *pcbStructInfo = bytesNeeded; - else if (*pcbStructInfo < bytesNeeded) + if (dataLen > sizeof(int)) { - *pcbStructInfo = bytesNeeded; - SetLastError(ERROR_MORE_DATA); + SetLastError(CRYPT_E_ASN1_LARGE); ret = FALSE; } - else - { - CRYPT_INTEGER_BLOB *blob = pvStructInfo; - - *pcbStructInfo = bytesNeeded; - blob->cbData = dataLen; - assert(blob->pbData); - if (blob->cbData) - { - DWORD i; - - for (i = 0; i < blob->cbData; i++) - { - blob->pbData[i] = *(pbEncoded + 1 + lenBytes + - dataLen - i - 1); - } - } - } - } - return ret; -} - -/* Ignores tag. Only allows integers 4 bytes or smaller in size. */ -static BOOL WINAPI CRYPT_AsnDecodeInt(DWORD dwCertEncodingType, - LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, - void *pvStructInfo, DWORD *pcbStructInfo) -{ - BOOL ret; - BYTE buf[sizeof(CRYPT_INTEGER_BLOB) + sizeof(int)]; - CRYPT_INTEGER_BLOB *blob = (CRYPT_INTEGER_BLOB *)buf; - DWORD size = sizeof(buf); - - blob->pbData = buf + sizeof(CRYPT_INTEGER_BLOB); - ret = CRYPT_AsnDecodeInteger(pbEncoded, cbEncoded, 0, buf, &size); - if (ret) - { - if (!pvStructInfo) + else if (!pvStructInfo) *pcbStructInfo = sizeof(int); else if (*pcbStructInfo < sizeof(int)) { @@ -2248,23 +2210,21 @@ static BOOL WINAPI CRYPT_AsnDecodeInt(DWORD dwCertEncodingType, DWORD i; *pcbStructInfo = sizeof(int); - if (blob->pbData[blob->cbData - 1] & 0x80) + if (dataLen && pbEncoded[1 + lenBytes] & 0x80) { /* initialize to a negative value to sign-extend */ val = -1; } else val = 0; - for (i = 0; i < blob->cbData; i++) + for (i = 0; i < dataLen; i++) { val <<= 8; - val |= blob->pbData[blob->cbData - i - 1]; + val |= pbEncoded[1 + lenBytes + i]; } memcpy(pvStructInfo, &val, sizeof(int)); } } - else if (GetLastError() == ERROR_MORE_DATA) - SetLastError(CRYPT_E_ASN1_LARGE); return ret; }

1 0

Juan Lang : crypt32: Explicitly pass pointers to blob arrays rather than relying on an invalid alignment assumption .
by Alexandre Julliard Oct. 19, 2009

Oct. 19, 2009

Module: wine Branch: master Commit: 3000bc200aeb1917a8e61b403d5ff2c0dfaacbb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3000bc200aeb1917a8e61b403… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 15 16:23:17 2009 -0700 crypt32: Explicitly pass pointers to blob arrays rather than relying on an invalid alignment assumption. --- dlls/crypt32/msg.c | 45 +++++++++++++++++++++++---------------------- 1 files changed, 23 insertions(+), 22 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 8a88b75..b91e185 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -719,27 +719,22 @@ static BOOL CRYPT_ConstructBlob(CRYPT_DATA_BLOB *out, const CRYPT_DATA_BLOB *in) return ret; } -typedef struct _BlobArray -{ - DWORD cBlobs; - PCRYPT_DATA_BLOB blobs; -} BlobArray; - -static BOOL CRYPT_ConstructBlobArray(BlobArray *out, const BlobArray *in) +static BOOL CRYPT_ConstructBlobArray(DWORD *outCBlobs, + PCRYPT_DATA_BLOB *outPBlobs, DWORD cBlobs, const PCRYPT_DATA_BLOB pBlobs) { BOOL ret = TRUE; - out->cBlobs = in->cBlobs; - if (out->cBlobs) + *outCBlobs = cBlobs; + if (cBlobs) { - out->blobs = CryptMemAlloc(out->cBlobs * sizeof(CRYPT_DATA_BLOB)); - if (out->blobs) + *outPBlobs = CryptMemAlloc(cBlobs * sizeof(CRYPT_DATA_BLOB)); + if (*outPBlobs) { DWORD i; - memset(out->blobs, 0, out->cBlobs * sizeof(CRYPT_DATA_BLOB)); - for (i = 0; ret && i < out->cBlobs; i++) - ret = CRYPT_ConstructBlob(&out->blobs[i], &in->blobs[i]); + memset(*outPBlobs, 0, cBlobs * sizeof(CRYPT_DATA_BLOB)); + for (i = 0; ret && i < cBlobs; i++) + ret = CRYPT_ConstructBlob(&(*outPBlobs)[i], &pBlobs[i]); } else ret = FALSE; @@ -747,6 +742,12 @@ static BOOL CRYPT_ConstructBlobArray(BlobArray *out, const BlobArray *in) return ret; } +typedef struct _BlobArray +{ + DWORD cBlobs; + PCRYPT_DATA_BLOB blobs; +} BlobArray; + static void CRYPT_FreeBlobArray(BlobArray *array) { DWORD i; @@ -765,8 +766,8 @@ static BOOL CRYPT_ConstructAttribute(CRYPT_ATTRIBUTE *out, if (out->pszObjId) { strcpy(out->pszObjId, in->pszObjId); - ret = CRYPT_ConstructBlobArray((BlobArray *)&out->cValue, - (const BlobArray *)&in->cValue); + ret = CRYPT_ConstructBlobArray(&out->cValue, &out->rgValue, + in->cValue, in->rgValue); } else ret = FALSE; @@ -1435,13 +1436,13 @@ static HCRYPTMSG CSignedEncodeMsg_Open(DWORD dwFlags, } } if (ret) - ret = CRYPT_ConstructBlobArray( - (BlobArray *)&msg->msg_data.info->cCertEncoded, - (const BlobArray *)&info->cCertEncoded); + ret = CRYPT_ConstructBlobArray(&msg->msg_data.info->cCertEncoded, + &msg->msg_data.info->rgCertEncoded, info->cCertEncoded, + info->rgCertEncoded); if (ret) - ret = CRYPT_ConstructBlobArray( - (BlobArray *)&msg->msg_data.info->cCrlEncoded, - (const BlobArray *)&info->cCrlEncoded); + ret = CRYPT_ConstructBlobArray(&msg->msg_data.info->cCrlEncoded, + &msg->msg_data.info->rgCrlEncoded, info->cCrlEncoded, + info->rgCrlEncoded); if (!ret) { CSignedEncodeMsg_Close(msg);

1 0

Juan Lang : crypt32: Simplify CRYPT_AsnDecodeIntInternal.
by Alexandre Julliard Oct. 19, 2009

Oct. 19, 2009

Module: wine Branch: master Commit: 4e300b6defe488feecb36a5cab223c6c78998c66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e300b6defe488feecb36a5ca… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 15 15:12:40 2009 -0700 crypt32: Simplify CRYPT_AsnDecodeIntInternal. --- dlls/crypt32/decode.c | 28 +++++++++++++++------------- 1 files changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 9da367b..ede5af2 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -3915,38 +3915,40 @@ static BOOL CRYPT_AsnDecodeIntInternal(const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded) { BOOL ret; - BYTE buf[sizeof(CRYPT_INTEGER_BLOB) + sizeof(int)]; - CRYPT_INTEGER_BLOB *blob = (CRYPT_INTEGER_BLOB *)buf; - DWORD size = sizeof(buf); + DWORD dataLen; - blob->pbData = buf + sizeof(CRYPT_INTEGER_BLOB); - ret = CRYPT_AsnDecodeIntegerInternal(pbEncoded, cbEncoded, 0, buf, - &size, pcbDecoded); - if (ret) + if ((ret = CRYPT_GetLen(pbEncoded, cbEncoded, &dataLen))) { - if (!pvStructInfo) + BYTE lenBytes = GET_LEN_BYTES(pbEncoded[1]); + + if (pcbDecoded) + *pcbDecoded = 1 + lenBytes + dataLen; + if (dataLen > sizeof(int)) + { + SetLastError(CRYPT_E_ASN1_LARGE); + ret = FALSE; + } + else if (!pvStructInfo) *pcbStructInfo = sizeof(int); else if ((ret = CRYPT_DecodeCheckSpace(pcbStructInfo, sizeof(int)))) { int val, i; - if (blob->pbData[blob->cbData - 1] & 0x80) + if (dataLen && pbEncoded[1 + lenBytes] & 0x80) { /* initialize to a negative value to sign-extend */ val = -1; } else val = 0; - for (i = 0; i < blob->cbData; i++) + for (i = 0; i < dataLen; i++) { val <<= 8; - val |= blob->pbData[blob->cbData - i - 1]; + val |= pbEncoded[1 + lenBytes + i]; } memcpy(pvStructInfo, &val, sizeof(int)); } } - else if (GetLastError() == ERROR_MORE_DATA) - SetLastError(CRYPT_E_ASN1_LARGE); return ret; }

1 0