wine-commits December 2009

wine-commits@winehq.org

3 participants
1233 discussions

Juan Lang : crypt32: The KeyId member of an authority key identifier is an octet string, not an integer.
by Alexandre Julliard 03 Dec '09

03 Dec '09

Module: wine Branch: master Commit: 91fbdb561a53d764a6a3e9e21470da091d045efc URL: http://source.winehq.org/git/wine.git/?a=commit;h=91fbdb561a53d764a6a3e9e21… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Dec 2 13:05:28 2009 -0800 crypt32: The KeyId member of an authority key identifier is an octet string, not an integer. --- dlls/crypt32/decode.c | 41 ++--------------------------------------- dlls/crypt32/encode.c | 43 ++----------------------------------------- 2 files changed, 4 insertions(+), 80 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index a16d89f..1fd2383 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -3106,43 +3106,6 @@ static BOOL CRYPT_AsnDecodeAltNameInternal(const BYTE *pbEncoded, return ret; } -/* Like CRYPT_AsnDecodeIntegerInternal, but swaps the bytes */ -static BOOL CRYPT_AsnDecodeIntegerSwapBytes(const BYTE *pbEncoded, - DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, - DWORD *pcbDecoded) -{ - BOOL ret; - - TRACE("(%p, %d, 0x%08x, %p, %d, %p)\n", pbEncoded, cbEncoded, dwFlags, - pvStructInfo, *pcbStructInfo, pcbDecoded); - - /* Can't use the CRYPT_DECODE_NOCOPY_FLAG, because we modify the bytes in- - * place. - */ - ret = CRYPT_AsnDecodeIntegerInternal(pbEncoded, cbEncoded, - dwFlags & ~CRYPT_DECODE_NOCOPY_FLAG, pvStructInfo, pcbStructInfo, - pcbDecoded); - if (ret && pvStructInfo) - { - CRYPT_DATA_BLOB *blob = pvStructInfo; - - if (blob->cbData) - { - DWORD i; - BYTE temp; - - for (i = 0; i < blob->cbData / 2; i++) - { - temp = blob->pbData[i]; - blob->pbData[i] = blob->pbData[blob->cbData - i - 1]; - blob->pbData[blob->cbData - i - 1] = temp; - } - } - } - TRACE("returning %d (%08x)\n", ret, GetLastError()); - return ret; -} - static BOOL WINAPI CRYPT_AsnDecodeAuthorityKeyId(DWORD dwCertEncodingType, LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) @@ -3153,7 +3116,7 @@ static BOOL WINAPI CRYPT_AsnDecodeAuthorityKeyId(DWORD dwCertEncodingType, { struct AsnDecodeSequenceItem items[] = { { ASN_CONTEXT | 0, offsetof(CERT_AUTHORITY_KEY_ID_INFO, KeyId), - CRYPT_AsnDecodeIntegerSwapBytes, sizeof(CRYPT_DATA_BLOB), + CRYPT_AsnDecodeOctetsInternal, sizeof(CRYPT_DATA_BLOB), TRUE, TRUE, offsetof(CERT_AUTHORITY_KEY_ID_INFO, KeyId.pbData), 0 }, { ASN_CONTEXT | ASN_CONSTRUCTOR| 1, offsetof(CERT_AUTHORITY_KEY_ID_INFO, CertIssuer), @@ -3188,7 +3151,7 @@ static BOOL WINAPI CRYPT_AsnDecodeAuthorityKeyId2(DWORD dwCertEncodingType, { struct AsnDecodeSequenceItem items[] = { { ASN_CONTEXT | 0, offsetof(CERT_AUTHORITY_KEY_ID2_INFO, KeyId), - CRYPT_AsnDecodeIntegerSwapBytes, sizeof(CRYPT_DATA_BLOB), + CRYPT_AsnDecodeOctetsInternal, sizeof(CRYPT_DATA_BLOB), TRUE, TRUE, offsetof(CERT_AUTHORITY_KEY_ID2_INFO, KeyId.pbData), 0 }, { ASN_CONTEXT | ASN_CONSTRUCTOR| 1, offsetof(CERT_AUTHORITY_KEY_ID2_INFO, AuthorityCertIssuer), diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 4d137ce..b7bbc83 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -2438,45 +2438,6 @@ static BOOL WINAPI CRYPT_AsnEncodeAltNameEntry(DWORD dwCertEncodingType, return ret; } -static BOOL WINAPI CRYPT_AsnEncodeIntegerSwapBytes(DWORD dwCertEncodingType, - LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, - PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) -{ - BOOL ret; - - __TRY - { - const CRYPT_DATA_BLOB *blob = pvStructInfo; - CRYPT_DATA_BLOB newBlob = { blob->cbData, NULL }; - - ret = TRUE; - if (newBlob.cbData) - { - newBlob.pbData = CryptMemAlloc(newBlob.cbData); - if (newBlob.pbData) - { - DWORD i; - - for (i = 0; i < newBlob.cbData; i++) - newBlob.pbData[newBlob.cbData - i - 1] = blob->pbData[i]; - } - else - ret = FALSE; - } - if (ret) - ret = CRYPT_AsnEncodeInteger(dwCertEncodingType, lpszStructType, - &newBlob, dwFlags, pEncodePara, pbEncoded, pcbEncoded); - CryptMemFree(newBlob.pbData); - } - __EXCEPT_PAGE_FAULT - { - SetLastError(STATUS_ACCESS_VIOLATION); - ret = FALSE; - } - __ENDTRY - return ret; -} - static BOOL WINAPI CRYPT_AsnEncodeAuthorityKeyId(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) @@ -2495,7 +2456,7 @@ static BOOL WINAPI CRYPT_AsnEncodeAuthorityKeyId(DWORD dwCertEncodingType, { swapped[cSwapped].tag = ASN_CONTEXT | 0; swapped[cSwapped].pvStructInfo = &info->KeyId; - swapped[cSwapped].encodeFunc = CRYPT_AsnEncodeIntegerSwapBytes; + swapped[cSwapped].encodeFunc = CRYPT_AsnEncodeOctets; items[cItem].pvStructInfo = &swapped[cSwapped]; items[cItem].encodeFunc = CRYPT_AsnEncodeSwapTag; cSwapped++; @@ -2626,7 +2587,7 @@ static BOOL WINAPI CRYPT_AsnEncodeAuthorityKeyId2(DWORD dwCertEncodingType, { swapped[cSwapped].tag = ASN_CONTEXT | 0; swapped[cSwapped].pvStructInfo = &info->KeyId; - swapped[cSwapped].encodeFunc = CRYPT_AsnEncodeIntegerSwapBytes; + swapped[cSwapped].encodeFunc = CRYPT_AsnEncodeOctets; items[cItem].pvStructInfo = &swapped[cSwapped]; items[cItem].encodeFunc = CRYPT_AsnEncodeSwapTag; cSwapped++;

1 0

Nikolay Sivov : user32/edit: Check for edit window to be here in case of destruction during handler execution .
by Alexandre Julliard 03 Dec '09

03 Dec '09

Module: wine Branch: master Commit: aa737174f07153e56622c70d26532e7c27d817d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa737174f07153e56622c70d2… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Dec 2 23:22:12 2009 +0300 user32/edit: Check for edit window to be here in case of destruction during handler execution. --- dlls/user32/edit.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index f4143b1..b512aa4 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -5390,7 +5390,7 @@ static LRESULT EditWndProc_common( HWND hwnd, UINT msg, break; } - if (es) EDIT_UnlockBuffer(es, FALSE); + if (IsWindow(hwnd) && es) EDIT_UnlockBuffer(es, FALSE); TRACE("hwnd=%p msg=%x (%s) -- 0x%08lx\n", hwnd, msg, SPY_GetMsgName(msg, hwnd), result);

1 0

Nikolay Sivov : user32/tests: Free window after use.
by Alexandre Julliard 03 Dec '09

03 Dec '09

Module: wine Branch: master Commit: 0e16d4cd5b0d42dff9dd28fa0d8854cd9fe9df0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e16d4cd5b0d42dff9dd28fa0… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Dec 2 23:06:59 2009 +0300 user32/tests: Free window after use. --- dlls/user32/tests/class.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 940550e..b11b5d2 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -572,6 +572,7 @@ static void test_instances(void) SetClassLongPtrA( hwnd, GCLP_HMODULE, 0xdeadbeef ); check_instance( "EDIT", (HINSTANCE)0x12345678, (HINSTANCE)0x12345678, (HINSTANCE)0xdeadbeef ); check_thread_instance( "EDIT", (HINSTANCE)0x12345678, (HINSTANCE)0x12345678, (HINSTANCE)0xdeadbeef ); + DestroyWindow(hwnd); } static void test_builtinproc(void)

1 0

Nikolay Sivov : user32/tests: Restore original procedure to let control clean up.
by Alexandre Julliard 03 Dec '09

03 Dec '09

Module: wine Branch: master Commit: 48cb3a30b55f9a320e4a27a6c1feb8d7e36938fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=48cb3a30b55f9a320e4a27a6c… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Dec 2 23:03:21 2009 +0300 user32/tests: Restore original procedure to let control clean up. --- dlls/user32/tests/class.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 7b42ce3..940550e 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -707,6 +707,7 @@ static void test_builtinproc(void) oldproc = (WNDPROC)SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (LONG_PTR)ClassTest_WndProc); ok(IS_WNDPROC_HANDLE(oldproc) == FALSE, "Class %s shouldn't return a handle\n", NORMAL_CLASSES[i]); + SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (LONG_PTR)oldproc); DestroyWindow(hwnd); } @@ -747,6 +748,8 @@ static void test_builtinproc(void) CallWindowProcW((WNDPROC)GetWindowLongPtrW(hwnd, GWLP_WNDPROC), hwnd, WM_GETTEXT, 120, (LPARAM)buf); ok(memcmp(buf, classW, sizeof(classW)) == 0, "WM_GETTEXT invalid return\n"); + SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)oldproc); + DestroyWindow(hwnd); hwnd = CreateWindowA(WC_EDITA, classA, WS_OVERLAPPEDWINDOW, @@ -768,7 +771,7 @@ static void test_builtinproc(void) CallWindowProcW((WNDPROC)GetWindowLongPtrW(hwnd, GWLP_WNDPROC), hwnd, WM_GETTEXT, 120, (LPARAM)buf); ok(memcmp(buf, classW, sizeof(classW)) == 0, "WM_GETTEXT invalid return\n"); - SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (LONG_PTR)ClassTest_WndProc); + oldproc = (WNDPROC)SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (LONG_PTR)ClassTest_WndProc); SetWindowTextW(hwnd, unistring); CallWindowProcW((WNDPROC)GetWindowLongPtrW(hwnd, GWLP_WNDPROC), hwnd, WM_GETTEXT, 120, (LPARAM)buf); ok(memcmp(buf, unistring, sizeof(unistring)) == 0, "WM_GETTEXT invalid return\n"); @@ -781,6 +784,8 @@ static void test_builtinproc(void) CallWindowProcA((WNDPROC)GetWindowLongPtrA(hwnd, GWLP_WNDPROC), hwnd, WM_GETTEXT, 120, (LPARAM)buf); ok(memcmp(buf, classA, sizeof(classA)) == 0, "WM_GETTEXT invalid return\n"); + SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (LONG_PTR)oldproc); + DestroyWindow(hwnd); }

1 0

Stefan Leichter : setupapi/tests: Use separate directory for SetupGetInfFileListW.
by Alexandre Julliard 03 Dec '09

03 Dec '09

Module: wine Branch: master Commit: 941d69e5443db1f21b9c8a38c7f6efd5d867c23b URL: http://source.winehq.org/git/wine.git/?a=commit;h=941d69e5443db1f21b9c8a38c… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Wed Dec 2 22:03:12 2009 +0100 setupapi/tests: Use separate directory for SetupGetInfFileListW. --- dlls/setupapi/tests/install.c | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 9aa5a91..4b718fc 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -478,6 +478,7 @@ static void test_inffilelist(void) "Signature=\"$Chicago$\""; WCHAR *p, *ptr; + char dirA[MAX_PATH]; WCHAR dir[MAX_PATH] = { 0 }; WCHAR buffer[MAX_PATH] = { 0 }; DWORD expected, outsize; @@ -510,9 +511,29 @@ static void test_inffilelist(void) todo_wine ok(!ret, "expected SetupGetInfFileListW to fail!\n"); + /* create a private directory, the temp directory may contain some + * inf files left over from old installations + */ + if (!GetTempFileNameA(CURR_DIR, "inftest", 1, dirA)) + { + win_skip("GetTempFileNameA failed with error %d\n", GetLastError()); + return; + } + if (!CreateDirectoryA(dirA, NULL )) + { + win_skip("CreateDirectoryA failed with error %d\n", GetLastError()); + return; + } + if (!SetCurrentDirectoryA(dirA)) + { + win_skip("SetCurrentDirectoryA failed with error %d\n", GetLastError()); + RemoveDirectoryA(dirA); + return; + } + + MultiByteToWideChar(CP_ACP, 0, dirA, -1, dir, MAX_PATH); /* check a not existing directory */ - MultiByteToWideChar(CP_ACP, 0, CURR_DIR, -1, dir, MAX_PATH); ptr = dir + lstrlenW(dir); MultiByteToWideChar(CP_ACP, 0, "\\not_existent", -1, ptr, MAX_PATH - lstrlenW(dir)); outsize = 0xffffffff; @@ -569,6 +590,8 @@ static void test_inffilelist(void) DeleteFile(inffile); DeleteFile(inffile2); DeleteFile(invalid_inf); + SetCurrentDirectoryA(CURR_DIR); + RemoveDirectoryA(dirA); } START_TEST(install)

1 0

Peter Rosin : msvcrt: Handle the SIGBREAK signal.
by Alexandre Julliard 03 Dec '09

03 Dec '09

Module: wine Branch: master Commit: f79cd33fc46a8c18b88a20040515a5e244a97901 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f79cd33fc46a8c18b88a20040… Author: Peter Rosin <peda(a)lysator.liu.se> Date: Wed Dec 2 20:21:21 2009 +0100 msvcrt: Handle the SIGBREAK signal. --- dlls/msvcrt/except.c | 2 ++ dlls/msvcrt/tests/signal.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 119469b..9f7c22d 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -556,6 +556,7 @@ MSVCRT___sighandler_t CDECL MSVCRT_signal(int sig, MSVCRT___sighandler_t func) case MSVCRT_SIGSEGV: case MSVCRT_SIGINT: case MSVCRT_SIGTERM: + case MSVCRT_SIGBREAK: ret = sighandlers[sig]; sighandlers[sig] = func; break; @@ -582,6 +583,7 @@ int CDECL MSVCRT_raise(int sig) case MSVCRT_SIGSEGV: case MSVCRT_SIGINT: case MSVCRT_SIGTERM: + case MSVCRT_SIGBREAK: handler = sighandlers[sig]; if (handler == MSVCRT_SIG_DFL) MSVCRT__exit(3); if (handler != MSVCRT_SIG_IGN) diff --git a/dlls/msvcrt/tests/signal.c b/dlls/msvcrt/tests/signal.c index b871a85..b2c16d5 100644 --- a/dlls/msvcrt/tests/signal.c +++ b/dlls/msvcrt/tests/signal.c @@ -37,11 +37,11 @@ static void test_signal(void) int res; old = signal(SIGBREAK, sighandler); - todo_wine ok(old != SIG_ERR, "Failed to install signal handler for SIGBREAK\n"); + ok(old != SIG_ERR, "Failed to install signal handler for SIGBREAK\n"); test_value = 0; res = raise(SIGBREAK); - todo_wine ok(res == 0, "Failed to raise SIGBREAK\n"); - todo_wine ok(test_value == 1, "SIGBREAK handler not invoked\n"); + ok(res == 0, "Failed to raise SIGBREAK\n"); + ok(test_value == 1, "SIGBREAK handler not invoked\n"); } START_TEST(signal)

1 0

Peter Rosin : msvcrt: Add test to check if signal(SIGBREAK, ...) works ( todo_wine).
by Alexandre Julliard 03 Dec '09

03 Dec '09

Module: wine Branch: master Commit: 83ec2f4f049aa511c5f60dbc3abd6a4b81138f08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83ec2f4f049aa511c5f60dbc3… Author: Peter Rosin <peda(a)lysator.liu.se> Date: Wed Dec 2 20:21:14 2009 +0100 msvcrt: Add test to check if signal(SIGBREAK, ...) works (todo_wine). --- dlls/msvcrt/tests/Makefile.in | 1 + dlls/msvcrt/tests/signal.c | 50 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/Makefile.in b/dlls/msvcrt/tests/Makefile.in index 74199e1..d0486d1 100644 --- a/dlls/msvcrt/tests/Makefile.in +++ b/dlls/msvcrt/tests/Makefile.in @@ -18,6 +18,7 @@ CTESTS = \ heap.c \ printf.c \ scanf.c \ + signal.c \ string.c \ time.c diff --git a/dlls/msvcrt/tests/signal.c b/dlls/msvcrt/tests/signal.c new file mode 100644 index 0000000..b871a85 --- /dev/null +++ b/dlls/msvcrt/tests/signal.c @@ -0,0 +1,50 @@ +/* + * Unit test suite for signal function. + * + * Copyright 2009 Peter Rosin + * + * 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 "wine/test.h" +#include <winbase.h> +#include <signal.h> + +static int test_value = 0; + +typedef void (sighandler_type)(int); + +static void sighandler(int signum) +{ + ++test_value; +} + +static void test_signal(void) +{ + sighandler_type *old; + int res; + + old = signal(SIGBREAK, sighandler); + todo_wine ok(old != SIG_ERR, "Failed to install signal handler for SIGBREAK\n"); + test_value = 0; + res = raise(SIGBREAK); + todo_wine ok(res == 0, "Failed to raise SIGBREAK\n"); + todo_wine ok(test_value == 1, "SIGBREAK handler not invoked\n"); +} + +START_TEST(signal) +{ + test_signal(); +}

1 0

Dan Kegel : user32/tests: Allocate big enough buffer for UnpackDDElParam test.
by Alexandre Julliard 03 Dec '09

03 Dec '09

Module: wine Branch: master Commit: 3e28e4ab0f7bf17cb478236ddb2851426b5e37bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e28e4ab0f7bf17cb478236dd… Author: Dan Kegel <dank(a)kegel.com> Date: Wed Dec 2 11:02:09 2009 -0800 user32/tests: Allocate big enough buffer for UnpackDDElParam test. --- dlls/user32/tests/dde.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index afeef4d..3a0d656 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -2013,7 +2013,7 @@ static void test_UnpackDDElParam(void) broken(hi == 0xbeef), /* win2k */ "Expected 0, got %08lx\n", hi); - hglobal = GlobalAlloc(GMEM_DDESHARE, 2); + hglobal = GlobalAlloc(GMEM_DDESHARE, 2 * sizeof(*ptr)); ptr = GlobalLock(hglobal); ptr[0] = 0xcafebabe; ptr[1] = 0xdeadbeef;

1 0

Juan Lang : cryptnet: Check revocation at an appropriate time.
by Alexandre Julliard 03 Dec '09

03 Dec '09

Module: wine Branch: master Commit: 1860d2a8d38e003366b4013d0711faa652a419ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=1860d2a8d38e003366b4013d0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Dec 2 10:26:48 2009 -0800 cryptnet: Check revocation at an appropriate time. --- dlls/cryptnet/tests/cryptnet.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/cryptnet/tests/cryptnet.c b/dlls/cryptnet/tests/cryptnet.c index a66e912..ee7e1fc 100644 --- a/dlls/cryptnet/tests/cryptnet.c +++ b/dlls/cryptnet/tests/cryptnet.c @@ -486,6 +486,9 @@ static const BYTE rootSignedCRL[] = { BOOL (WINAPI *pCertVerifyRevocation)(DWORD, DWORD, DWORD, void **, DWORD, PCERT_REVOCATION_PARA, PCERT_REVOCATION_STATUS); +/* Wednesday, Oct 1, 2007 */ +static SYSTEMTIME oct2007 = { 2007, 10, 1, 1, 0, 0, 0, 0 }; + static void test_verifyRevocation(void) { HMODULE hCryptNet = GetModuleHandleA("cryptnet.dll"); @@ -493,6 +496,7 @@ static void test_verifyRevocation(void) CERT_REVOCATION_STATUS status = { sizeof(status), 0 }; PCCERT_CONTEXT certs[2]; CERT_REVOCATION_PARA revPara = { sizeof(revPara), 0 }; + FILETIME time; pCertVerifyRevocation = (void *)GetProcAddress(hCryptNet, "CertDllVerifyRevocation"); @@ -599,6 +603,16 @@ static void test_verifyRevocation(void) broken(status.dwError == CRYPT_E_REVOKED /* Win2k */), "expected CRYPT_E_NO_REVOCATION_CHECK, got %08x\n", status.dwError); ok(status.dwIndex == 0, "expected index 0, got %d\n", status.dwIndex); + /* Specifying the time to check: still no change */ + SystemTimeToFileTime(&oct2007, &time); + revPara.pftTimeToUse = &time; + ret = pCertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, + 1, (void **)&certs[1], 0, &revPara, &status); + ok(!ret && GetLastError() == CRYPT_E_NO_REVOCATION_CHECK, + "expected CRYPT_E_NO_REVOCATION_CHECK, got %08x\n", GetLastError()); + ok(status.dwError == CRYPT_E_NO_REVOCATION_CHECK, + "expected CRYPT_E_NO_REVOCATION_CHECK, got %08x\n", status.dwError); + ok(status.dwIndex == 0, "expected index 0, got %d\n", status.dwIndex); CertCloseStore(revPara.hCrlStore, 0); CertFreeCertificateContext(certs[1]); CertFreeCertificateContext(certs[0]);

1 0

Juan Lang : crypt32: Fix test failures on Win2k.
by Alexandre Julliard 03 Dec '09

03 Dec '09

Module: wine Branch: master Commit: 865669eeb3da0dadbd4417c07cf89acaefa9afae URL: http://source.winehq.org/git/wine.git/?a=commit;h=865669eeb3da0dadbd4417c07… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Dec 2 10:06:00 2009 -0800 crypt32: Fix test failures on Win2k. --- dlls/crypt32/tests/cert.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 4a3b0ae..a107250 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -3256,9 +3256,14 @@ static void testVerifyRevocation(void) SetLastError(0xdeadbeef); ret = CertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, 1, (void **)&certs[1], 0, &revPara, &status); - ok(!ret && GetLastError() == CRYPT_E_NO_REVOCATION_CHECK, + /* Win2k thinks the cert is revoked, and it is, except the CRL is out of + * date, hence the revocation status should be unknown. + */ + ok(!ret && (GetLastError() == CRYPT_E_NO_REVOCATION_CHECK || + broken(GetLastError() == CRYPT_E_REVOKED /* Win2k */)), "expected CRYPT_E_NO_REVOCATION_CHECK, got %08x\n", GetLastError()); - ok(status.dwError == CRYPT_E_NO_REVOCATION_CHECK, + ok(status.dwError == CRYPT_E_NO_REVOCATION_CHECK || + broken(status.dwError == CRYPT_E_REVOKED /* Win2k */), "expected CRYPT_E_NO_REVOCATION_CHECK, got %08x\n", status.dwError); ok(status.dwIndex == 0, "expected index 0, got %d\n", status.dwIndex); CertCloseStore(revPara.hCrlStore, 0);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2009