January 2019 - Wine-commits

Zebediah Figura : msi: Implement MSIMODIFY_REFRESH using msi_view_refresh_row().
by Alexandre Julliard 29 Jan '19

29 Jan '19

Module: wine Branch: master Commit: 05976464556385e7a7ef5d04b2a56c4830ff33cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=05976464556385e7a7ef5d04… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 28 22:11:11 2019 -0600 msi: Implement MSIMODIFY_REFRESH using msi_view_refresh_row(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/query.h | 2 ++ dlls/msi/select.c | 15 ++++++++++----- dlls/msi/tests/db.c | 4 +++- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/msi/query.h b/dlls/msi/query.h index d79c14f..c0144d3 100644 --- a/dlls/msi/query.h +++ b/dlls/msi/query.h @@ -153,4 +153,6 @@ UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, UINT msi_select_update( MSIVIEW *view, MSIRECORD *rec, UINT row ) DECLSPEC_HIDDEN; +UINT msi_view_refresh_row( MSIDATABASE *db, MSIVIEW *view, UINT row, MSIRECORD *rec ) DECLSPEC_HIDDEN; + #endif /* __WINE_MSI_QUERY_H */ diff --git a/dlls/msi/select.c b/dlls/msi/select.c index ef16e5d..b38f339 100644 --- a/dlls/msi/select.c +++ b/dlls/msi/select.c @@ -276,20 +276,25 @@ UINT msi_select_update(MSIVIEW *view, MSIRECORD *rec, UINT row) return ERROR_SUCCESS; } -static UINT SELECT_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode, +static UINT SELECT_modify( struct tagMSIVIEW *view, MSIMODIFY mode, MSIRECORD *rec, UINT row ) { MSISELECTVIEW *sv = (MSISELECTVIEW*)view; - TRACE("%p %d %p %d\n", sv, eModifyMode, rec, row ); + TRACE("view %p, mode %d, rec %p, row %u.\n", view, mode, rec, row); if( !sv->table ) return ERROR_FUNCTION_FAILED; - if (eModifyMode == MSIMODIFY_UPDATE) + switch (mode) + { + case MSIMODIFY_REFRESH: + return msi_view_refresh_row(sv->db, view, row, rec); + case MSIMODIFY_UPDATE: return msi_select_update(view, rec, row); - - return sv->table->ops->modify( sv->table, eModifyMode, rec, row ); + default: + return sv->table->ops->modify( sv->table, mode, rec, row ); + } } static UINT SELECT_delete( struct tagMSIVIEW *view ) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 09ba4b8..cbdfd3c 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -3618,6 +3618,7 @@ static void test_join(void) r = MsiViewFetch(hview, &hrec); ok( r == ERROR_SUCCESS, "failed to fetch view: %d\n", r ); + check_record(hrec, 2, "alveolar", "procerus"); r = MsiRecordSetStringA( hrec, 1, "epicranius" ); ok( r == ERROR_SUCCESS, "failed to set string: %d\n", r ); @@ -3627,7 +3628,8 @@ static void test_join(void) /* try another valid operation for joins */ r = MsiViewModify(hview, MSIMODIFY_REFRESH, hrec); - todo_wine ok( r == ERROR_SUCCESS, "failed to refresh row: %d\n", r ); + ok( r == ERROR_SUCCESS, "failed to refresh row: %d\n", r ); + check_record(hrec, 2, "epicranius", "procerus"); /* try an invalid operation for joins */ r = MsiViewModify(hview, MSIMODIFY_DELETE, hrec);

1 0

Zebediah Figura : msi: Don' t check the primary keys when handling MSIMODIFY_DELETE.
by Alexandre Julliard 29 Jan '19

29 Jan '19

Module: wine Branch: master Commit: 96b6d6b58725f17f3faabeeffe82d2b8bd5f0445 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96b6d6b58725f17f3faabeef… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 28 22:11:12 2019 -0600 msi: Don't check the primary keys when handling MSIMODIFY_DELETE. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/table.c | 14 +------------- dlls/msi/tests/db.c | 1 + 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index a2b83e2..57114ba 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1835,18 +1835,6 @@ static UINT msi_table_assign(struct tagMSIVIEW *view, MSIRECORD *rec) return TABLE_insert_row( view, rec, -1, FALSE ); } -static UINT modify_delete_row( struct tagMSIVIEW *view, MSIRECORD *rec ) -{ - MSITABLEVIEW *tv = (MSITABLEVIEW *)view; - UINT row, r; - - r = msi_table_find_row(tv, rec, &row, NULL); - if (r != ERROR_SUCCESS) - return r; - - return TABLE_delete_row(view, row); -} - static UINT msi_refresh_record( struct tagMSIVIEW *view, MSIRECORD *rec, UINT row ) { MSIRECORD *curr; @@ -1878,7 +1866,7 @@ static UINT TABLE_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode, switch (eModifyMode) { case MSIMODIFY_DELETE: - r = modify_delete_row( view, rec ); + r = TABLE_delete_row( view, row ); break; case MSIMODIFY_VALIDATE_NEW: r = table_validate_new( tv, rec, &column ); diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index cbdfd3c..e8ae8d2 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -5498,6 +5498,7 @@ static void test_viewmodify_delete(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); /* delete 2 */ + MsiRecordSetInteger(hrec, 1, 4); r = MsiViewModify(hview, MSIMODIFY_DELETE, hrec); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);

1 0

Orhan Kavrakoğlu : crypt32: Implement CryptHashCertificate2.
by Alexandre Julliard 29 Jan '19

29 Jan '19

Module: wine Branch: master Commit: d3c606954b8ee341f5984d15fc9f9cb637fb557b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3c606954b8ee341f5984d15… Author: Orhan Kavrakoğlu <aibok42(a)gmail.com> Date: Tue Jan 29 08:17:17 2019 +0300 crypt32: Implement CryptHashCertificate2. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46516 Signed-off-by: Orhan Kavrakoğlu <aibok42(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/cert.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/crypt32.spec | 1 + include/wincrypt.h | 4 ++++ 3 files changed, 58 insertions(+) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index eb646cd..f4cde69 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -2213,6 +2213,59 @@ BOOL WINAPI CryptHashCertificate(HCRYPTPROV_LEGACY hCryptProv, ALG_ID Algid, return ret; } +BOOL WINAPI CryptHashCertificate2(LPCWSTR pwszCNGHashAlgid, DWORD dwFlags, + void *pvReserved, const BYTE *pbEncoded, DWORD cbEncoded, BYTE *pbComputedHash, + DWORD *pcbComputedHash) +{ + BCRYPT_HASH_HANDLE hash = NULL; + BCRYPT_ALG_HANDLE alg = NULL; + NTSTATUS status; + DWORD hash_len; + DWORD hash_len_size; + + TRACE("(%s, %08x, %p, %p, %d, %p, %p)\n", debugstr_w(pwszCNGHashAlgid), + dwFlags, pvReserved, pbEncoded, cbEncoded, pbComputedHash, pcbComputedHash); + + if ((status = BCryptOpenAlgorithmProvider(&alg, pwszCNGHashAlgid, NULL, 0))) + { + if (status == STATUS_NOT_IMPLEMENTED) + status = STATUS_NOT_FOUND; + goto done; + } + + if ((status = BCryptCreateHash(alg, &hash, NULL, 0, NULL, 0, 0))) + goto done; + + if ((status = BCryptGetProperty(hash, BCRYPT_HASH_LENGTH, (BYTE *)&hash_len, sizeof(hash_len), &hash_len_size, 0))) + goto done; + + if (!pbComputedHash) + { + *pcbComputedHash = hash_len; + goto done; + } + + if (*pcbComputedHash < hash_len) + { + status = ERROR_MORE_DATA; + goto done; + } + + *pcbComputedHash = hash_len; + + if ((status = BCryptHashData(hash, (BYTE *)pbEncoded, cbEncoded, 0))) + goto done; + + if ((status = BCryptFinishHash(hash, pbComputedHash, hash_len, 0))) + goto done; + +done: + if (hash) BCryptDestroyHash(hash); + if (alg) BCryptCloseAlgorithmProvider(alg, 0); + if (status) SetLastError(status); + return !status; +} + BOOL WINAPI CryptHashPublicKeyInfo(HCRYPTPROV_LEGACY hCryptProv, ALG_ID Algid, DWORD dwFlags, DWORD dwCertEncodingType, PCERT_PUBLIC_KEY_INFO pInfo, BYTE *pbComputedHash, DWORD *pcbComputedHash) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 1815a1d..4399f7c 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -136,6 +136,7 @@ @ stdcall CryptGetOIDFunctionAddress(long long str long ptr ptr) @ stdcall CryptGetOIDFunctionValue(long str str wstr ptr ptr ptr) @ stdcall CryptHashCertificate(long long long ptr long ptr ptr) +@ stdcall CryptHashCertificate2(wstr long ptr ptr long ptr ptr) @ stdcall CryptHashMessage(ptr long long ptr ptr ptr ptr ptr ptr) @ stdcall CryptHashPublicKeyInfo(long long long long ptr ptr ptr) @ stdcall CryptHashToBeSigned(ptr long ptr long ptr ptr) diff --git a/include/wincrypt.h b/include/wincrypt.h index 5036ff5..8d9106e 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -4387,6 +4387,10 @@ BOOL WINAPI CryptHashCertificate(HCRYPTPROV_LEGACY hCryptProv, ALG_ID Algid, DWORD dwFlags, const BYTE *pbEncoded, DWORD cbEncoded, BYTE *pbComputedHash, DWORD *pcbComputedHash); +BOOL WINAPI CryptHashCertificate2(LPCWSTR pwszCNGHashAlgid, DWORD dwFlags, + void *pvReserved, const BYTE *pbEncoded, DWORD cbEncoded, BYTE *pbComputedHash, + DWORD *pcbComputedHash); + BOOL WINAPI CryptHashPublicKeyInfo(HCRYPTPROV_LEGACY hCryptProv, ALG_ID Algid, DWORD dwFlags, DWORD dwCertEncodingType, PCERT_PUBLIC_KEY_INFO pInfo, BYTE *pbComputedHash, DWORD *pcbComputedHash);

1 0

Orhan Kavrakoğlu : crypt32/tests: Add tests for CryptHashCertificate2.
by Alexandre Julliard 29 Jan '19

29 Jan '19

Module: wine Branch: master Commit: 558cdd7a2b2985a2ab4a3a5e3a28876012e06797 URL: https://source.winehq.org/git/wine.git/?a=commit;h=558cdd7a2b2985a2ab4a3a5e… Author: Orhan Kavrakoğlu <aibok42(a)gmail.com> Date: Tue Jan 29 08:17:19 2019 +0300 crypt32/tests: Add tests for CryptHashCertificate2. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46516 Signed-off-by: Orhan Kavrakoğlu <aibok42(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/cert.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index f653741..e4f4c59 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -21,6 +21,8 @@ #include <stdio.h> #include <stdarg.h> +#include <ntstatus.h> +#define WIN32_NO_STATUS #include <windef.h> #include <winbase.h> #include <winreg.h> @@ -33,6 +35,7 @@ static PCCERT_CONTEXT (WINAPI *pCertCreateSelfSignCertificate)(HCRYPTPROV_OR_NCR static BOOL (WINAPI *pCertGetValidUsages)(DWORD,PCCERT_CONTEXT*,int*,LPSTR*,DWORD*); static BOOL (WINAPI *pCryptAcquireCertificatePrivateKey)(PCCERT_CONTEXT,DWORD,void*,HCRYPTPROV_OR_NCRYPT_KEY_HANDLE*,DWORD*,BOOL*); static BOOL (WINAPI *pCryptEncodeObjectEx)(DWORD,LPCSTR,const void*,DWORD,PCRYPT_ENCODE_PARA,void*,DWORD*); +static BOOL (WINAPI *pCryptHashCertificate2)(LPCWSTR, DWORD, void*, const BYTE*, DWORD, BYTE*, DWORD*); static BOOL (WINAPI * pCryptVerifyCertificateSignatureEx) (HCRYPTPROV, DWORD, DWORD, void *, DWORD, void *, DWORD, void *); @@ -53,6 +56,7 @@ static void init_function_pointers(void) GET_PROC(hCrypt32, CertGetValidUsages) GET_PROC(hCrypt32, CryptAcquireCertificatePrivateKey) GET_PROC(hCrypt32, CryptEncodeObjectEx) + GET_PROC(hCrypt32, CryptHashCertificate2) GET_PROC(hCrypt32, CryptVerifyCertificateSignatureEx) GET_PROC(hAdvapi32, CryptAcquireContextA) @@ -1784,6 +1788,80 @@ static void testCryptHashCert(void) ok(!memcmp(hash, knownHash, sizeof(knownHash)), "Unexpected hash\n"); } +static void testCryptHashCert2(void) +{ + static const BYTE emptyHash[] = { 0xda, 0x39, 0xa3, 0xee, 0x5e, 0x6b, 0x4b, + 0x0d, 0x32, 0x55, 0xbf, 0xef, 0x95, 0x60, 0x18, 0x90, 0xaf, 0xd8, 0x07, + 0x09 }; + static const BYTE knownHash[] = { 0xae, 0x9d, 0xbf, 0x6d, 0xf5, 0x46, 0xee, + 0x8b, 0xc5, 0x7a, 0x13, 0xba, 0xc2, 0xb1, 0x04, 0xf2, 0xbf, 0x52, 0xa8, + 0xa2 }; + static const BYTE toHash[] = "abcdefghijklmnopqrstuvwxyz0123456789.,;!?:"; + BOOL ret; + BYTE hash[20]; + DWORD hashLen; + const WCHAR SHA1[] = { 'S', 'H', 'A', '1', '\0' }; + const WCHAR invalidAlgorithm[] = { '_', 'S', 'H', 'O', 'U', 'L', 'D', + 'N', 'O', 'T', + 'E', 'X', 'I', 'S', 'T', '_', '\0' }; + + if (!pCryptHashCertificate2) + { + win_skip("CryptHashCertificate2() is not available\n"); + return; + } + + /* Test empty hash */ + hashLen = sizeof(hash); + ret = pCryptHashCertificate2(SHA1, 0, NULL, NULL, 0, hash, &hashLen); + ok(ret, "CryptHashCertificate2 failed: %08x\n", GetLastError()); + ok(hashLen == sizeof(hash), "Got unexpected size of hash %d\n", hashLen); + ok(!memcmp(hash, emptyHash, sizeof(emptyHash)), "Unexpected hash of nothing\n"); + + /* Test known hash */ + hashLen = sizeof(hash); + ret = pCryptHashCertificate2(SHA1, 0, NULL, toHash, sizeof(toHash), hash, &hashLen); + ok(ret, "CryptHashCertificate2 failed: %08x\n", GetLastError()); + ok(hashLen == sizeof(hash), "Got unexpected size of hash %d\n", hashLen); + ok(!memcmp(hash, knownHash, sizeof(knownHash)), "Unexpected hash\n"); + + /* Test null hash size pointer just sets hash size */ + hashLen = 0; + ret = pCryptHashCertificate2(SHA1, 0, NULL, toHash, sizeof(toHash), NULL, &hashLen); + ok(ret, "CryptHashCertificate2 failed: %08x\n", GetLastError()); + ok(hashLen == sizeof(hash), "Hash size not set correctly (%d)\n", hashLen); + + /* Null algorithm ID crashes Windows implementations */ + if (0) { + /* Test null algorithm ID */ + hashLen = sizeof(hash); + ret = pCryptHashCertificate2(NULL, 0, NULL, toHash, sizeof(toHash), hash, &hashLen); + } + + /* Test invalid algorithm */ + hashLen = sizeof(hash); + SetLastError(0xdeadbeef); + ret = pCryptHashCertificate2(invalidAlgorithm, 0, NULL, toHash, sizeof(toHash), hash, &hashLen); + ok(!ret && GetLastError() == STATUS_NOT_FOUND, + "Expected STATUS_NOT_FOUND (0x%08x), got 0x%08x\n", STATUS_NOT_FOUND, GetLastError()); + + /* Test hash buffer too small */ + hashLen = sizeof(hash) / 2; + SetLastError(0xdeadbeef); + ret = pCryptHashCertificate2(SHA1, 0, NULL, toHash, sizeof(toHash), hash, &hashLen); + ok(!ret && GetLastError() == ERROR_MORE_DATA, + "Expected ERROR_MORE_DATA (%d), got %d\n", ERROR_MORE_DATA, GetLastError()); + + /* Null hash length crashes Windows implementations */ + if (0) { + /* Test hashLen null with hash */ + ret = pCryptHashCertificate2(SHA1, 0, NULL, toHash, sizeof(toHash), hash, NULL); + + /* Test hashLen null with no hash */ + ret = pCryptHashCertificate2(SHA1, 0, NULL, toHash, sizeof(toHash), NULL, NULL); + } +} + static void verifySig(HCRYPTPROV csp, const BYTE *toSign, size_t toSignLen, const BYTE *sig, unsigned int sigLen) { @@ -4074,6 +4152,7 @@ START_TEST(cert) testLinkCert(); testCryptHashCert(); + testCryptHashCert2(); testCertSigs(); testSignAndEncodeCert(); testCreateSelfSignCert();

1 0

Zebediah Figura : ntoskrnl.exe: Implement DPC-level queued spinlock functions.
by Alexandre Julliard 29 Jan '19

29 Jan '19

Module: wine Branch: master Commit: c3c2a4f697c2c249a6e3376f273bf3ee74223350 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3c2a4f697c2c249a6e3376f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 28 19:21:12 2019 -0600 ntoskrnl.exe: Implement DPC-level queued spinlock functions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 +-- dlls/ntoskrnl.exe/sync.c | 65 +++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 52ffc3d..7bda160 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -42,9 +42,9 @@ @ stdcall -norelay IofCallDriver(ptr ptr) @ stdcall -norelay IofCompleteRequest(ptr long) @ stdcall -norelay KeAcquireInStackQueuedSpinLock(ptr ptr) -@ stub KeAcquireInStackQueuedSpinLockAtDpcLevel +@ stdcall -norelay KeAcquireInStackQueuedSpinLockAtDpcLevel(ptr ptr) @ stdcall -norelay KeReleaseInStackQueuedSpinLock(ptr) -@ stub KeReleaseInStackQueuedSpinLockFromDpcLevel +@ stdcall -norelay KeReleaseInStackQueuedSpinLockFromDpcLevel(ptr) @ stub KeSetTimeUpdateNotifyRoutine @ stub KefAcquireSpinLockAtDpcLevel @ stub KefReleaseSpinLockFromDpcLevel diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 2a4685c..4dc1fc3 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -414,6 +414,71 @@ void WINAPI KeReleaseSpinLockFromDpcLevel( KSPIN_LOCK *lock ) InterlockedExchangePointer( (void **)lock, 0 ); } +#define QUEUED_SPINLOCK_OWNED 0x2 + +/*********************************************************************** + * KeAcquireInStackQueuedSpinLockAtDpcLevel (NTOSKRNL.EXE.@) + */ +#ifdef DEFINE_FASTCALL2_ENTRYPOINT +DEFINE_FASTCALL2_ENTRYPOINT( KeAcquireInStackQueuedSpinLockAtDpcLevel ) +void WINAPI DECLSPEC_HIDDEN __regs_KeAcquireInStackQueuedSpinLockAtDpcLevel( KSPIN_LOCK *lock, KLOCK_QUEUE_HANDLE *queue ) +#else +void WINAPI KeAcquireInStackQueuedSpinLockAtDpcLevel( KSPIN_LOCK *lock, KLOCK_QUEUE_HANDLE *queue ) +#endif +{ + KSPIN_LOCK_QUEUE *tail; + + TRACE("lock %p, queue %p.\n", lock, queue); + + queue->LockQueue.Next = NULL; + + if (!(tail = InterlockedExchangePointer( (void **)lock, &queue->LockQueue ))) + queue->LockQueue.Lock = (KSPIN_LOCK *)((ULONG_PTR)lock | QUEUED_SPINLOCK_OWNED); + else + { + queue->LockQueue.Lock = lock; + InterlockedExchangePointer( (void **)&tail->Next, &queue->LockQueue ); + + while (!((ULONG_PTR)InterlockedCompareExchangePointer( (void **)&queue->LockQueue.Lock, 0, 0 ) + & QUEUED_SPINLOCK_OWNED)) + { + small_pause(); + } + } +} + +/*********************************************************************** + * KeReleaseInStackQueuedSpinLockFromDpcLevel (NTOSKRNL.EXE.@) + */ +#ifdef DEFINE_FASTCALL1_ENTRYPOINT +DEFINE_FASTCALL1_ENTRYPOINT( KeReleaseInStackQueuedSpinLockFromDpcLevel ) +void WINAPI DECLSPEC_HIDDEN __regs_KeReleaseInStackQueuedSpinLockFromDpcLevel( KLOCK_QUEUE_HANDLE *queue ) +#else +void WINAPI KeReleaseInStackQueuedSpinLockFromDpcLevel( KLOCK_QUEUE_HANDLE *queue ) +#endif +{ + KSPIN_LOCK *lock = (KSPIN_LOCK *)((ULONG_PTR)queue->LockQueue.Lock & ~QUEUED_SPINLOCK_OWNED); + KSPIN_LOCK_QUEUE *next; + + TRACE("lock %p, queue %p.\n", lock, queue); + + queue->LockQueue.Lock = NULL; + + if (!(next = queue->LockQueue.Next)) + { + /* If we are truly the last in the queue, the lock will point to us. */ + if (InterlockedCompareExchangePointer( (void **)lock, NULL, &queue->LockQueue ) == queue) + return; + + /* Otherwise, someone just queued themselves, but hasn't yet set + * themselves as successor. Spin waiting for them to do so. */ + while (!(next = queue->LockQueue.Next)) + small_pause(); + } + + InterlockedExchangePointer( (void **)&next->Lock, (KSPIN_LOCK *)((ULONG_PTR)lock | QUEUED_SPINLOCK_OWNED) ); +} + #ifndef __i386__ /*********************************************************************** * KeReleaseSpinLock (NTOSKRNL.EXE.@)

1 0

Zebediah Figura : ntoskrnl.exe: Implement plain queued spinlock functions on top of DPC-level ones.
by Alexandre Julliard 29 Jan '19

29 Jan '19

Module: wine Branch: master Commit: 10dcc10a5527ec6f143ba9618c8712b09601f255 URL: https://source.winehq.org/git/wine.git/?a=commit;h=10dcc10a5527ec6f143ba961… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 28 19:21:13 2019 -0600 ntoskrnl.exe: Implement plain queued spinlock functions on top of DPC-level ones. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 27 --------------------------- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 ++-- dlls/ntoskrnl.exe/sync.c | 18 ++++++++++++++++++ 3 files changed, 20 insertions(+), 29 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index ec78f4b..9ee7543 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3765,33 +3765,6 @@ NTSTATUS WINAPI IoCreateFile(HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBUT } /*********************************************************************** - * KeAcquireInStackQueuedSpinLock (NTOSKRNL.EXE.@) - */ -#ifdef DEFINE_FASTCALL2_ENTRYPOINT -DEFINE_FASTCALL2_ENTRYPOINT( KeAcquireInStackQueuedSpinLock ) -void WINAPI DECLSPEC_HIDDEN __regs_KeAcquireInStackQueuedSpinLock( KSPIN_LOCK *spinlock, - KLOCK_QUEUE_HANDLE *handle ) -#else -void WINAPI KeAcquireInStackQueuedSpinLock( KSPIN_LOCK *spinlock, KLOCK_QUEUE_HANDLE *handle ) -#endif -{ - FIXME( "stub: %p %p\n", spinlock, handle ); -} - -/*********************************************************************** - * KeReleaseInStackQueuedSpinLock (NTOSKRNL.EXE.@) - */ -#ifdef DEFINE_FASTCALL1_ENTRYPOINT -DEFINE_FASTCALL1_ENTRYPOINT( KeReleaseInStackQueuedSpinLock ) -void WINAPI DECLSPEC_HIDDEN __regs_KeReleaseInStackQueuedSpinLock( KLOCK_QUEUE_HANDLE *handle ) -#else -void WINAPI KeReleaseInStackQueuedSpinLock( KLOCK_QUEUE_HANDLE *handle ) -#endif -{ - FIXME( "stub: %p\n", handle ); -} - -/*********************************************************************** * IoCreateNotificationEvent (NTOSKRNL.EXE.@) */ PKEVENT WINAPI IoCreateNotificationEvent(UNICODE_STRING *name, HANDLE *handle) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 7bda160..3f57f7d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -41,9 +41,9 @@ @ stub IoWritePartitionTable @ stdcall -norelay IofCallDriver(ptr ptr) @ stdcall -norelay IofCompleteRequest(ptr long) -@ stdcall -norelay KeAcquireInStackQueuedSpinLock(ptr ptr) +@ stdcall -arch=arm,arm64,x86_64 KeAcquireInStackQueuedSpinLock(ptr ptr) @ stdcall -norelay KeAcquireInStackQueuedSpinLockAtDpcLevel(ptr ptr) -@ stdcall -norelay KeReleaseInStackQueuedSpinLock(ptr) +@ stdcall -arch=arm,arm64,x86_64 KeReleaseInStackQueuedSpinLock(ptr) @ stdcall -norelay KeReleaseInStackQueuedSpinLockFromDpcLevel(ptr) @ stub KeSetTimeUpdateNotifyRoutine @ stub KefAcquireSpinLockAtDpcLevel diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 4dc1fc3..46ffc581 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -498,6 +498,24 @@ KIRQL WINAPI KeAcquireSpinLockRaiseToDpc( KSPIN_LOCK *lock ) KeAcquireSpinLockAtDpcLevel( lock ); return 0; } + +/*********************************************************************** + * KeAcquireInStackQueuedSpinLock (NTOSKRNL.EXE.@) + */ +void WINAPI KeAcquireInStackQueuedSpinLock( KSPIN_LOCK *lock, KLOCK_QUEUE_HANDLE *queue ) +{ + TRACE("lock %p, queue %p.\n", lock, queue); + KeAcquireInStackQueuedSpinLockAtDpcLevel( lock, queue ); +} + +/*********************************************************************** + * KeReleaseInStackQueuedSpinLock (NTOSKRNL.EXE.@) + */ +void WINAPI KeReleaseInStackQueuedSpinLock( KLOCK_QUEUE_HANDLE *queue ) +{ + TRACE("queue %p.\n", queue); + KeReleaseInStackQueuedSpinLockFromDpcLevel( queue ); +} #endif static KSPIN_LOCK cancel_lock;

1 0

Zebediah Figura : hal: Implement plain queued spinlock functions on top of DPC-level ones.
by Alexandre Julliard 29 Jan '19

29 Jan '19

Module: wine Branch: master Commit: 119b9c70392ab2f19ab805718bc99e9a61044f8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=119b9c70392ab2f19ab80571… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 28 19:21:14 2019 -0600 hal: Implement plain queued spinlock functions on top of DPC-level ones. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hal/hal.c | 31 +++++++++++++++++++++++++++++++ dlls/hal/hal.spec | 4 ++-- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/hal/hal.c b/dlls/hal/hal.c index 5b3ee44..8796272 100644 --- a/dlls/hal/hal.c +++ b/dlls/hal/hal.c @@ -49,6 +49,21 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntoskrnl); "pushl %eax\n\t" \ "jmp " __ASM_NAME("__regs_") #name __ASM_STDCALL(8)) +extern void * WINAPI call_fastcall_func1( void *func, const void *a ); +__ASM_STDCALL_FUNC( call_fastcall_func1, 8, + "popl %ecx\n\t" + "popl %eax\n\t" + "xchgl (%esp),%ecx\n\t" + "jmp *%eax" ); + +extern void * WINAPI call_fastcall_func2( void *func, const void *a, const void *b ); +__ASM_STDCALL_FUNC( call_fastcall_func2, 12, + "popl %edx\n\t" + "popl %eax\n\t" + "popl %ecx\n\t" + "xchgl (%esp),%edx\n\t" + "jmp *%eax" ); + DEFINE_FASTCALL1_ENTRYPOINT( ExAcquireFastMutex ) VOID WINAPI DECLSPEC_HIDDEN __regs_ExAcquireFastMutex(PFAST_MUTEX FastMutex) { @@ -94,6 +109,22 @@ void WINAPI KeReleaseSpinLock( KSPIN_LOCK *lock, KIRQL irql ) TRACE("lock %p, irql %u.\n", lock, irql); KeReleaseSpinLockFromDpcLevel( lock ); } + +extern void WINAPI KeAcquireInStackQueuedSpinLockAtDpcLevel( KSPIN_LOCK *, KLOCK_QUEUE_HANDLE * ); + +DEFINE_FASTCALL2_ENTRYPOINT( KeAcquireInStackQueuedSpinLock ) +void WINAPI DECLSPEC_HIDDEN __regs_KeAcquireInStackQueuedSpinLock( KSPIN_LOCK *lock, KLOCK_QUEUE_HANDLE *queue ) +{ + call_fastcall_func2( KeAcquireInStackQueuedSpinLockAtDpcLevel, lock, queue ); +} + +extern void WINAPI KeReleaseInStackQueuedSpinLockFromDpcLevel( KLOCK_QUEUE_HANDLE * ); + +DEFINE_FASTCALL1_ENTRYPOINT( KeReleaseInStackQueuedSpinLock ) +void WINAPI DECLSPEC_HIDDEN __regs_KeReleaseInStackQueuedSpinLock( KLOCK_QUEUE_HANDLE *queue ) +{ + call_fastcall_func1( KeReleaseInStackQueuedSpinLockFromDpcLevel, queue ); +} #endif /* __i386__ */ #if defined(__i386__) || defined(__arm__) || defined(__aarch64__) diff --git a/dlls/hal/hal.spec b/dlls/hal/hal.spec index b4ec512..16822fc 100644 --- a/dlls/hal/hal.spec +++ b/dlls/hal/hal.spec @@ -4,12 +4,12 @@ @ stub HalClearSoftwareInterrupt @ stub HalRequestSoftwareInterrupt @ stub HalSystemVectorDispatchEntry -@ stdcall -norelay KeAcquireInStackQueuedSpinLock(ptr ptr) ntoskrnl.exe.KeAcquireInStackQueuedSpinLock +@ stdcall -arch=i386 -norelay KeAcquireInStackQueuedSpinLock(ptr ptr) @ stub KeAcquireInStackQueuedSpinLockRaiseToSynch @ stub KeAcquireQueuedSpinLock @ stub KeAcquireQueuedSpinLockRaiseToSynch @ stub KeAcquireSpinLockRaiseToSynch -@ stdcall -norelay KeReleaseInStackQueuedSpinLock(ptr) ntoskrnl.exe.KeReleaseInStackQueuedSpinLock +@ stdcall -arch=i386 -norelay KeReleaseInStackQueuedSpinLock(ptr) @ stub KeReleaseQueuedSpinLock @ stub KeTryToAcquireQueuedSpinLock @ stub KeTryToAcquireQueuedSpinLockRaiseToSynch

1 0

Alistair Leslie-Hughes : mfreadwrite: Add initial tests.
by Alexandre Julliard 29 Jan '19

29 Jan '19

Module: wine Branch: master Commit: 2e4afec590a9375f55090dfc71bfb8a98a29e16e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e4afec590a9375f55090dfc… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jan 29 02:31:00 2019 +0000 mfreadwrite: Add initial tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/mfreadwrite/Makefile.in | 1 + dlls/mfreadwrite/tests/Makefile.in | 5 ++ dlls/mfreadwrite/tests/mfplat.c | 109 +++++++++++++++++++++++++++++++++++++ 5 files changed, 117 insertions(+) diff --git a/configure b/configure index b3a360e..663b6dc 100755 --- a/configure +++ b/configure @@ -19692,6 +19692,7 @@ wine_fn_config_makefile dlls/mf3216 enable_mf3216 wine_fn_config_makefile dlls/mfplat enable_mfplat wine_fn_config_makefile dlls/mfplat/tests enable_tests wine_fn_config_makefile dlls/mfreadwrite enable_mfreadwrite +wine_fn_config_makefile dlls/mfreadwrite/tests enable_tests wine_fn_config_makefile dlls/mfuuid enable_mfuuid wine_fn_config_makefile dlls/mgmtapi enable_mgmtapi wine_fn_config_makefile dlls/midimap enable_midimap diff --git a/configure.ac b/configure.ac index 119c4ce..1b425d2 100644 --- a/configure.ac +++ b/configure.ac @@ -3431,6 +3431,7 @@ WINE_CONFIG_MAKEFILE(dlls/mf3216) WINE_CONFIG_MAKEFILE(dlls/mfplat) WINE_CONFIG_MAKEFILE(dlls/mfplat/tests) WINE_CONFIG_MAKEFILE(dlls/mfreadwrite) +WINE_CONFIG_MAKEFILE(dlls/mfreadwrite/tests) WINE_CONFIG_MAKEFILE(dlls/mfuuid) WINE_CONFIG_MAKEFILE(dlls/mgmtapi) WINE_CONFIG_MAKEFILE(dlls/midimap) diff --git a/dlls/mfreadwrite/Makefile.in b/dlls/mfreadwrite/Makefile.in index 7cf3a59..4b8ee82 100644 --- a/dlls/mfreadwrite/Makefile.in +++ b/dlls/mfreadwrite/Makefile.in @@ -1,4 +1,5 @@ MODULE = mfreadwrite.dll +IMPORTLIB = mfreadwrite C_SRCS = \ main.c diff --git a/dlls/mfreadwrite/tests/Makefile.in b/dlls/mfreadwrite/tests/Makefile.in new file mode 100644 index 0000000..5c906a1 --- /dev/null +++ b/dlls/mfreadwrite/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = mfreadwrite.dll +IMPORTS = ole32 mfplat mfreadwrite mfuuid + +C_SRCS = \ + mfplat.c diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c new file mode 100644 index 0000000..9f5cad6 --- /dev/null +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -0,0 +1,109 @@ +/* + * Copyright 2018 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <string.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winreg.h" + +#include "mfapi.h" +#include "mfidl.h" +#include "mferror.h" +#include "mfreadwrite.h" + +#include "wine/test.h" + +#include "initguid.h" +DEFINE_GUID(MF_READWRITE_MMCSS_PRIORITY_AUDIO,0x273db885, 0x2de2, 0x4db2, 0xa6, 0xa7, 0xfd, 0xb6, 0x6f, 0xb4, 0x0b, 0x61); +DEFINE_GUID(MF_READWRITE_MMCSS_CLASS_AUDIO, 0x430847da, 0x0890, 0x4b0e, 0x93, 0x8c, 0x05, 0x43, 0x32, 0xc5, 0x47, 0xe1); + +static HRESULT (WINAPI *pMFCreateMFByteStreamOnStream)(IStream *stream, IMFByteStream **bytestream); + +static void init_functions(void) +{ + HMODULE mod = GetModuleHandleA("mfplat.dll"); + +#define X(f) if (!(p##f = (void*)GetProcAddress(mod, #f))) return; + X(MFCreateMFByteStreamOnStream); +#undef X +} + +static void test_MFCreateSourceReaderFromByteStream(void) +{ + static const WCHAR audio[] = {'A','u','d','i','o',0}; + IMFSourceReader *source; + IMFAttributes *attributes; + IMFByteStream *bytestream = NULL; + IStream *stream = NULL; + HRESULT hr; + + if(!pMFCreateMFByteStreamOnStream) + { + win_skip("MFCreateMFByteStreamOnStream() not found\n"); + return; + } + + hr = MFCreateAttributes( &attributes, 3 ); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IMFAttributes_SetString(attributes, &MF_READWRITE_MMCSS_CLASS_AUDIO, audio); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IMFAttributes_SetUINT32(attributes, &MF_READWRITE_MMCSS_PRIORITY_AUDIO, 0); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = pMFCreateMFByteStreamOnStream(stream, &bytestream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = MFCreateSourceReaderFromByteStream(bytestream, attributes, &source); + ok(hr == S_OK || hr == MF_E_UNSUPPORTED_BYTESTREAM_TYPE, "got 0x%08x\n", hr); + + if(stream) + IStream_Release(stream); + if(bytestream) + IMFByteStream_Release(bytestream); + IMFAttributes_Release(attributes); + if(source) + IMFSourceReader_Release(source); +} + +START_TEST(mfplat) +{ + HRESULT hr; + + CoInitialize(NULL); + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + init_functions(); + + test_MFCreateSourceReaderFromByteStream(); + + MFShutdown(); + + CoUninitialize(); +}

1 0

Alistair Leslie-Hughes : include: Add MFSetAttributeSize/ MFSetAttributeRatio inline functions.
by Alexandre Julliard 29 Jan '19

29 Jan '19

Module: wine Branch: master Commit: cffb77e95f472c7613e69716570ff981d81397f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cffb77e95f472c7613e69716… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jan 29 02:31:03 2019 +0000 include: Add MFSetAttributeSize/MFSetAttributeRatio inline functions. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfidl.idl | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/mfidl.idl b/include/mfidl.idl index 2373e41..124ae3c 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -349,3 +349,14 @@ cpp_quote("#define MF_RESOLUTION_KEEP_BYTE_STREAM_ALIVE_ON_FAIL cpp_quote("#define MF_RESOLUTION_READ 0x00010000") cpp_quote("#define MF_RESOLUTION_WRITE 0x00020000") cpp_quote("#define MF_RESOLUTION_DISABLE_LOCAL_PLUGINS 0x00000040") + +cpp_quote("#ifdef __cplusplus") +cpp_quote("static inline HRESULT MFSetAttributeSize(IMFAttributes *attributes, REFGUID key, UINT32 width, UINT32 height)") +cpp_quote("{") +cpp_quote(" return attributes->SetUINT64(key, ((UINT64)width << 32) | height);") +cpp_quote("}") +cpp_quote("static inline HRESULT MFSetAttributeRatio(IMFAttributes *attributes, REFGUID key, UINT32 numerator, UINT32 denominator)") +cpp_quote("{") +cpp_quote(" return attributes->SetUINT64(key, ((UINT64)numerator << 32) | denominator);") +cpp_quote("}") +cpp_quote("#endif")

1 0

Hans Leidekker : winhttp: Implement WINHTTP_OPTION_CLIENT_CERT_CONTEXT.
by Alexandre Julliard 29 Jan '19

29 Jan '19

Module: wine Branch: master Commit: c68b5eb8500055c623486ad0b626a5f7691bfa89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c68b5eb8500055c623486ad0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 29 11:40:53 2019 +0100 winhttp: Implement WINHTTP_OPTION_CLIENT_CERT_CONTEXT. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 23 +++++++++++++---------- dlls/winhttp/session.c | 32 +++++++++++++++++++++++++++++--- dlls/winhttp/winhttp_private.h | 5 +++-- 3 files changed, 45 insertions(+), 15 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 5525c1c..af484cc 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1527,25 +1527,28 @@ static DWORD map_secure_protocols( DWORD mask ) return ret; } -static BOOL ensure_cred_handle( struct session *session ) +static BOOL ensure_cred_handle( struct request *request ) { SECURITY_STATUS status = SEC_E_OK; - if (session->cred_handle_initialized) return TRUE; + if (request->cred_handle_initialized) return TRUE; - EnterCriticalSection( &session->cs ); - if (!session->cred_handle_initialized) + if (!request->cred_handle_initialized) { SCHANNEL_CRED cred; memset( &cred, 0, sizeof(cred) ); cred.dwVersion = SCHANNEL_CRED_VERSION; - cred.grbitEnabledProtocols = map_secure_protocols( session->secure_protocols ); + cred.grbitEnabledProtocols = map_secure_protocols( request->connect->session->secure_protocols ); + if (request->client_cert) + { + cred.paCred = &request->client_cert; + cred.cCreds = 1; + } status = AcquireCredentialsHandleW( NULL, (WCHAR *)UNISP_NAME_W, SECPKG_CRED_OUTBOUND, NULL, - &cred, NULL, NULL, &session->cred_handle, NULL ); + &cred, NULL, NULL, &request->cred_handle, NULL ); if (status == SEC_E_OK) - session->cred_handle_initialized = TRUE; + request->cred_handle_initialized = TRUE; } - LeaveCriticalSection( &session->cs ); if (status != SEC_E_OK) { @@ -1686,9 +1689,9 @@ static BOOL open_connection( struct request *request ) CertFreeCertificateContext( request->server_cert ); request->server_cert = NULL; - if (!ensure_cred_handle( connect->session ) || + if (!ensure_cred_handle( request ) || !netconn_secure_connect( netconn, connect->hostname, request->security_flags, - &connect->session->cred_handle, request->check_revocation )) + &request->cred_handle, request->check_revocation )) { heap_free( addressW ); netconn_close( netconn ); diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 82615ad..64fa8bb 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -81,7 +81,6 @@ static void session_destroy( struct object_header *hdr ) TRACE("%p\n", session); if (session->unload_event) SetEvent( session->unload_event ); - if (session->cred_handle_initialized) FreeCredentialsHandle( &session->cred_handle ); destroy_cookies( session ); session->cs.DebugInfo->Spare[0] = 0; @@ -610,7 +609,9 @@ static void request_destroy( struct object_header *hdr ) } release_object( &request->connect->hdr ); + if (request->cred_handle_initialized) FreeCredentialsHandle( &request->cred_handle ); CertFreeCertificateContext( request->server_cert ); + CertFreeCertificateContext( request->client_cert ); destroy_authinfo( request->authinfo ); destroy_authinfo( request->proxy_authinfo ); @@ -1000,14 +1001,39 @@ static BOOL request_set_option( struct object_header *hdr, DWORD option, void *b return TRUE; } case WINHTTP_OPTION_CLIENT_CERT_CONTEXT: + { + const CERT_CONTEXT *cert; + if (!(hdr->flags & WINHTTP_FLAG_SECURE)) { SetLastError( ERROR_WINHTTP_INCORRECT_HANDLE_STATE ); return FALSE; } - FIXME("WINHTTP_OPTION_CLIENT_CERT_CONTEXT\n"); - return TRUE; + if (!buffer) + { + CertFreeCertificateContext( request->client_cert ); + request->client_cert = NULL; + } + else if (buflen >= sizeof(cert)) + { + if (!(cert = CertDuplicateCertificateContext( buffer ))) return FALSE; + CertFreeCertificateContext( request->client_cert ); + request->client_cert = cert; + } + else + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + if (request->cred_handle_initialized) + { + FreeCredentialsHandle( &request->cred_handle ); + request->cred_handle_initialized = FALSE; + } + + return TRUE; + } case WINHTTP_OPTION_ENABLE_FEATURE: if(buflen == sizeof( DWORD ) && *(DWORD *)buffer == WINHTTP_ENABLE_SSL_REVOCATION) { diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index b46f708..38e39cb 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -92,8 +92,6 @@ struct session WCHAR *proxy_password; struct list cookie_cache; HANDLE unload_event; - CredHandle cred_handle; - BOOL cred_handle_initialized; DWORD secure_protocols; }; @@ -182,6 +180,9 @@ struct request DWORD security_flags; BOOL check_revocation; const CERT_CONTEXT *server_cert; + const CERT_CONTEXT *client_cert; + CredHandle cred_handle; + BOOL cred_handle_initialized; int resolve_timeout; int connect_timeout; int send_timeout;

1 0