wine-commits October 2008

wine-commits@winehq.org

3 participants
1216 discussions

Francois Gouget : secur32: Check that the GnuTLS header is recent enough for schannel.
by Alexandre Julliard 24 Oct '08

24 Oct '08

Module: wine Branch: master Commit: 3aae9546a4b004441a8c9ed31b837edcd9432d19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3aae9546a4b004441a8c9ed31… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Oct 24 11:24:58 2008 +0200 secur32: Check that the GnuTLS header is recent enough for schannel. --- configure | 40 ++++++++++++++++++++++++++++++++++++++++ configure.ac | 5 +++-- 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 18f36df..c7ad362 100755 --- a/configure +++ b/configure @@ -12881,6 +12881,38 @@ echo "${ECHO_T}$ac_cv_header_gnutls_gnutls_h" >&6; } fi if test $ac_cv_header_gnutls_gnutls_h = yes; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <gnutls/gnutls.h> +int +main () +{ +typeof(gnutls_transport_set_errno) *pfunc; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then { echo "$as_me:$LINENO: checking for -lgnutls" >&5 echo $ECHO_N "checking for -lgnutls... $ECHO_C" >&6; } if test "${ac_cv_lib_soname_gnutls+set}" = set; then @@ -12960,6 +12992,14 @@ _ACEOF fi +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi diff --git a/configure.ac b/configure.ac index 85f9f83..baeff8e 100644 --- a/configure.ac +++ b/configure.ac @@ -922,8 +922,9 @@ then ac_gnutls_cflags="`$PKG_CONFIG --cflags gnutls 2>/dev/null`" CPPFLAGS="$CPPFLAGS $ac_gnutls_cflags" AC_CHECK_HEADER(gnutls/gnutls.h, - [WINE_CHECK_SONAME(gnutls,gnutls_global_init, - [AC_SUBST(GNUTLSINCL,"$ac_gnutls_cflags")],,[$ac_gnutls_libs])]) + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gnutls/gnutls.h>]], [[typeof(gnutls_transport_set_errno) *pfunc;]])], + [WINE_CHECK_SONAME(gnutls,gnutls_global_init, + [AC_SUBST(GNUTLSINCL,"$ac_gnutls_cflags")],,[$ac_gnutls_libs])])]) CPPFLAGS="$ac_save_CPPFLAGS" fi WINE_NOTICE_WITH(gnutls,[test "x$ac_cv_lib_soname_gnutls" = "x"],

1 0

Francois Gouget : comdlg32/tests: Remove unneeded casts.
by Alexandre Julliard 24 Oct '08

24 Oct '08

Module: wine Branch: master Commit: fc967b45e8490c3c89b72a02c7385a61d0de39a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc967b45e8490c3c89b72a02c… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Oct 24 11:24:38 2008 +0200 comdlg32/tests: Remove unneeded casts. --- dlls/comdlg32/tests/filedlg.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index c3ca118..09a2428 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -212,9 +212,9 @@ static LONG_PTR WINAPI template_hook(HWND dlg, UINT msg, WPARAM wParam, LPARAM l HWND p,cb; INT sel; p = GetParent(dlg); - ok(p!=(HWND)NULL, "Failed to get parent of template\n"); + ok(p!=NULL, "Failed to get parent of template\n"); cb = GetDlgItem(p,0x470); - ok(cb!=(HWND)NULL, "Failed to get filter combobox\n"); + ok(cb!=NULL, "Failed to get filter combobox\n"); sel = SendMessage(cb, CB_GETCURSEL, 0, 0); ok (sel != -1, "Failed to get selection from filter listbox\n"); }

1 0

Paul Vriens : riched20/tests: Skip some tests on Win9x and WinMe.
by Alexandre Julliard 24 Oct '08

24 Oct '08

Module: wine Branch: master Commit: 5e05a7b9ebc040e71a42175e8ddd9393a21aa67b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e05a7b9ebc040e71a42175e8… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Oct 24 11:49:18 2008 +0200 riched20/tests: Skip some tests on Win9x and WinMe. --- dlls/riched20/tests/editor.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 8946ed3..2c803ae 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5658,9 +5658,15 @@ static void test_word_movement(void) /* Make sure the behaviour is the same with a unicode richedit window, * and using unicode functions. */ + SetLastError(0xdeadbeef); hwnd = CreateWindowW(RICHEDIT_CLASS20W, NULL, ES_MULTILINE|WS_POPUP|WS_HSCROLL|WS_VSCROLL|WS_VISIBLE, 0, 0, 200, 60, NULL, NULL, hmoduleRichEdit, NULL); + if (!hwnd && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("Needed unicode functions are not implemented\n"); + return; + } /* Test with a custom word break procedure that uses X as the delimiter. */ result = SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)textW);

1 0

Hans Leidekker : wininet: Add an exception handler in HttpOpenRequestA to protect against invalid accept type pointers .
by Alexandre Julliard 24 Oct '08

24 Oct '08

Module: wine Branch: master Commit: bd805297090da797cff0c6fac3098a00e2ce801e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd805297090da797cff0c6fac… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 24 11:08:12 2008 +0200 wininet: Add an exception handler in HttpOpenRequestA to protect against invalid accept type pointers. --- dlls/wininet/http.c | 37 ++++++++++++++++++++++++++----------- dlls/wininet/tests/http.c | 2 +- 2 files changed, 27 insertions(+), 12 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 8729df3..a3d04d9 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -59,6 +59,7 @@ #include "internet.h" #include "wine/debug.h" +#include "wine/exception.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(wininet); @@ -1020,12 +1021,20 @@ HINTERNET WINAPI HttpOpenRequestA(HINTERNET hHttpSession, types = lpszAcceptTypes; while (*types) { - /* find out how many there are */ - if (((ULONG_PTR)*types >> 16) && **types) + __TRY { - TRACE("accept type: %s\n", debugstr_a(*types)); - acceptTypesCount++; + /* find out how many there are */ + if (*types && **types) + { + TRACE("accept type: %s\n", debugstr_a(*types)); + acceptTypesCount++; + } + } + __EXCEPT_PAGE_FAULT + { + WARN("invalid accept type pointer\n"); } + __ENDTRY; types++; } szAcceptTypes = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR *) * (acceptTypesCount+1)); @@ -1035,20 +1044,26 @@ HINTERNET WINAPI HttpOpenRequestA(HINTERNET hHttpSession, types = lpszAcceptTypes; while (*types) { - if (((ULONG_PTR)*types >> 16) && **types) + __TRY { - len = MultiByteToWideChar(CP_ACP, 0, *types, -1, NULL, 0 ); - szAcceptTypes[acceptTypesCount] = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!szAcceptTypes[acceptTypesCount]) goto end; + if (*types && **types) + { + len = MultiByteToWideChar(CP_ACP, 0, *types, -1, NULL, 0 ); + szAcceptTypes[acceptTypesCount] = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, *types, -1, szAcceptTypes[acceptTypesCount], len); - acceptTypesCount++; + MultiByteToWideChar(CP_ACP, 0, *types, -1, szAcceptTypes[acceptTypesCount], len); + acceptTypesCount++; + } + } + __EXCEPT_PAGE_FAULT + { + /* ignore invalid pointer */ } + __ENDTRY; types++; } szAcceptTypes[acceptTypesCount] = NULL; } - else szAcceptTypes = 0; rc = HttpOpenRequestW(hHttpSession, szVerb, szObjectName, szVersion, szReferrer, diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index e01ef20..1c686c8 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1964,7 +1964,7 @@ static void test_user_agent_header(void) static void test_bogus_accept_types_array(void) { HINTERNET ses, con, req; - static const char *types[] = { (const char *)6240, "*/*", "%p", "", "*/*", NULL }; + static const char *types[] = { (const char *)6240, "*/*", "%p", "", (const char *)0xffffffff, "*/*", NULL }; DWORD size; char buffer[32]; BOOL ret;

1 0

Juan Lang : crypt32: Change expected behavior of a test to match Windows Vista/2008.
by Alexandre Julliard 24 Oct '08

24 Oct '08

Module: wine Branch: master Commit: cd434dd992c6d2989e7104fa92b14ff5ec9add9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd434dd992c6d2989e7104fa9… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 23 17:20:35 2008 -0700 crypt32: Change expected behavior of a test to match Windows Vista/2008. --- dlls/crypt32/tests/chain.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 8133c1c..cafe814 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1573,8 +1573,7 @@ static ChainCheck chainCheckNoStore[] = { 0 }, { { sizeof(chain8) / sizeof(chain8[0]), chain8 }, { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, - { CERT_TRUST_INVALID_BASIC_CONSTRAINTS | CERT_TRUST_IS_UNTRUSTED_ROOT | - CERT_TRUST_IS_NOT_TIME_VALID, 0 }, + { CERT_TRUST_IS_PARTIAL_CHAIN, 0 }, 1, simpleStatus8NoStore }, TODO_ERROR | TODO_INFO }, };

1 0

Juan Lang : wintrust: Partially implement SoftpubLoadMessage for catalog files.
by Alexandre Julliard 24 Oct '08

24 Oct '08

Module: wine Branch: master Commit: 12a848e54b6d0c3cb72ca1b179c30b2d99599bc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12a848e54b6d0c3cb72ca1b17… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 23 17:14:13 2008 -0700 wintrust: Partially implement SoftpubLoadMessage for catalog files. --- dlls/wintrust/softpub.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 40 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 57b581a..e0acf03 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -329,6 +329,43 @@ error: return ret; } +static BOOL SOFTPUB_LoadCatalogMessage(CRYPT_PROVIDER_DATA *data) +{ + BOOL ret; + HANDLE catalog = INVALID_HANDLE_VALUE; + + if (!data->pWintrustData->u.pCatalog) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + catalog = CreateFileW(data->pWintrustData->u.pCatalog->pcwszCatalogFilePath, + GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, + NULL); + if (catalog == INVALID_HANDLE_VALUE) + return FALSE; + ret = CryptSIPRetrieveSubjectGuid( + data->pWintrustData->u.pCatalog->pcwszCatalogFilePath, catalog, + &data->u.pPDSip->gSubject); + if (!ret) + goto error; + ret = SOFTPUB_GetSIP(data); + if (!ret) + goto error; + ret = SOFTPUB_GetMessageFromFile(data, catalog, + data->pWintrustData->u.pCatalog->pcwszCatalogFilePath); + if (!ret) + goto error; + ret = SOFTPUB_CreateStoreFromMessage(data); + if (!ret) + goto error; + ret = SOFTPUB_DecodeInnerContent(data); + /* FIXME: this loads the catalog file, but doesn't validate the member. */ +error: + CloseHandle(catalog); + return ret; +} + HRESULT WINAPI SoftpubLoadMessage(CRYPT_PROVIDER_DATA *data) { BOOL ret; @@ -346,6 +383,9 @@ HRESULT WINAPI SoftpubLoadMessage(CRYPT_PROVIDER_DATA *data) case WTD_CHOICE_FILE: ret = SOFTPUB_LoadFileMessage(data); break; + case WTD_CHOICE_CATALOG: + ret = SOFTPUB_LoadCatalogMessage(data); + break; default: FIXME("unimplemented for %d\n", data->pWintrustData->dwUnionChoice); SetLastError(ERROR_INVALID_PARAMETER);

1 0

Juan Lang : wintrust: Pass file handle and path to SOFTPUB_GetMessageFromFile.
by Alexandre Julliard 24 Oct '08

24 Oct '08

Module: wine Branch: master Commit: 153066c64ad72de2f274f04721cd791ca5c34735 URL: http://source.winehq.org/git/wine.git/?a=commit;h=153066c64ad72de2f274f0472… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 23 13:46:20 2008 -0700 wintrust: Pass file handle and path to SOFTPUB_GetMessageFromFile. --- dlls/wintrust/softpub.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index d110e2c..57b581a 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -128,7 +128,8 @@ static BOOL SOFTPUB_GetSIP(CRYPT_PROVIDER_DATA *data) /* Assumes data->u.pPDSip has been loaded, and data->u.pPDSip->pSip allocated. * Calls data->u.pPDSip->pSip->pfGet to construct data->hMsg. */ -static BOOL SOFTPUB_GetMessageFromFile(CRYPT_PROVIDER_DATA *data) +static BOOL SOFTPUB_GetMessageFromFile(CRYPT_PROVIDER_DATA *data, HANDLE file, + LPCWSTR filePath) { BOOL ret; LPBYTE buf = NULL; @@ -144,9 +145,8 @@ static BOOL SOFTPUB_GetMessageFromFile(CRYPT_PROVIDER_DATA *data) data->u.pPDSip->psSipSubjectInfo->cbSize = sizeof(SIP_SUBJECTINFO); data->u.pPDSip->psSipSubjectInfo->pgSubjectType = &data->u.pPDSip->gSubject; - data->u.pPDSip->psSipSubjectInfo->hFile = data->pWintrustData->u.pFile->hFile; - data->u.pPDSip->psSipSubjectInfo->pwsFileName = - data->pWintrustData->u.pFile->pcwszFilePath; + data->u.pPDSip->psSipSubjectInfo->hFile = file; + data->u.pPDSip->psSipSubjectInfo->pwsFileName = filePath; data->u.pPDSip->psSipSubjectInfo->hProv = data->hProv; ret = data->u.pPDSip->pSip->pfGet(data->u.pPDSip->psSipSubjectInfo, &data->dwEncoding, 0, &size, 0); @@ -317,7 +317,8 @@ static BOOL SOFTPUB_LoadFileMessage(CRYPT_PROVIDER_DATA *data) ret = SOFTPUB_GetSIP(data); if (!ret) goto error; - ret = SOFTPUB_GetMessageFromFile(data); + ret = SOFTPUB_GetMessageFromFile(data, data->pWintrustData->u.pFile->hFile, + data->pWintrustData->u.pFile->pcwszFilePath); if (!ret) goto error; ret = SOFTPUB_CreateStoreFromMessage(data);

1 0

Juan Lang : wintrust: Separate loading a message from a WINTRUST_FILE_INFO into a helper function .
by Alexandre Julliard 24 Oct '08

24 Oct '08

Module: wine Branch: master Commit: 1bfb60299399e22463be8c39216e5b7a7eb6e240 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bfb60299399e22463be8c392… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 23 13:42:08 2008 -0700 wintrust: Separate loading a message from a WINTRUST_FILE_INFO into a helper function. --- dlls/wintrust/softpub.c | 54 +++++++++++++++++++++++++++-------------------- 1 files changed, 31 insertions(+), 23 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 72d223c..d110e2c 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -298,6 +298,36 @@ static BOOL SOFTPUB_LoadCertMessage(CRYPT_PROVIDER_DATA *data) return ret; } +static BOOL SOFTPUB_LoadFileMessage(CRYPT_PROVIDER_DATA *data) +{ + BOOL ret; + + if (!data->pWintrustData->u.pFile) + { + SetLastError(ERROR_INVALID_PARAMETER); + ret = FALSE; + goto error; + } + ret = SOFTPUB_OpenFile(data); + if (!ret) + goto error; + ret = SOFTPUB_GetFileSubject(data); + if (!ret) + goto error; + ret = SOFTPUB_GetSIP(data); + if (!ret) + goto error; + ret = SOFTPUB_GetMessageFromFile(data); + if (!ret) + goto error; + ret = SOFTPUB_CreateStoreFromMessage(data); + if (!ret) + goto error; + ret = SOFTPUB_DecodeInnerContent(data); +error: + return ret; +} + HRESULT WINAPI SoftpubLoadMessage(CRYPT_PROVIDER_DATA *data) { BOOL ret; @@ -313,28 +343,7 @@ HRESULT WINAPI SoftpubLoadMessage(CRYPT_PROVIDER_DATA *data) ret = SOFTPUB_LoadCertMessage(data); break; case WTD_CHOICE_FILE: - if (!data->pWintrustData->u.pFile) - { - SetLastError(ERROR_INVALID_PARAMETER); - ret = FALSE; - goto error; - } - ret = SOFTPUB_OpenFile(data); - if (!ret) - goto error; - ret = SOFTPUB_GetFileSubject(data); - if (!ret) - goto error; - ret = SOFTPUB_GetSIP(data); - if (!ret) - goto error; - ret = SOFTPUB_GetMessageFromFile(data); - if (!ret) - goto error; - ret = SOFTPUB_CreateStoreFromMessage(data); - if (!ret) - goto error; - ret = SOFTPUB_DecodeInnerContent(data); + ret = SOFTPUB_LoadFileMessage(data); break; default: FIXME("unimplemented for %d\n", data->pWintrustData->dwUnionChoice); @@ -342,7 +351,6 @@ HRESULT WINAPI SoftpubLoadMessage(CRYPT_PROVIDER_DATA *data) ret = FALSE; } -error: if (!ret) data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] = GetLastError();

1 0

Juan Lang : wintrust: Separate loading a message from a WINTRUST_CERT_INFO into a helper function .
by Alexandre Julliard 24 Oct '08

24 Oct '08

Module: wine Branch: master Commit: 6455674c9792ee4a5ee45690189af99e6931c445 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6455674c9792ee4a5ee456901… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 23 13:40:34 2008 -0700 wintrust: Separate loading a message from a WINTRUST_CERT_INFO into a helper function. --- dlls/wintrust/softpub.c | 83 +++++++++++++++++++++++++--------------------- 1 files changed, 45 insertions(+), 38 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 6faaa1f..72d223c 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -249,61 +249,68 @@ error: return ret; } -HRESULT WINAPI SoftpubLoadMessage(CRYPT_PROVIDER_DATA *data) +static BOOL SOFTPUB_LoadCertMessage(CRYPT_PROVIDER_DATA *data) { BOOL ret; - TRACE("(%p)\n", data); - - if (!data->padwTrustStepErrors) - return S_FALSE; - - switch (data->pWintrustData->dwUnionChoice) + if (data->pWintrustData->u.pCert && + data->pWintrustData->u.pCert->cbStruct == sizeof(WINTRUST_CERT_INFO)) { - case WTD_CHOICE_CERT: - if (data->pWintrustData->u.pCert && - data->pWintrustData->u.pCert->cbStruct == sizeof(WINTRUST_CERT_INFO)) + if (data->psPfns) { - if (data->psPfns) + CRYPT_PROVIDER_SGNR signer = { sizeof(signer), { 0 } }; + DWORD i; + + /* Add a signer with nothing but the time to verify, so we can + * add a cert to it + */ + if (data->pWintrustData->u.pCert->psftVerifyAsOf) + data->sftSystemTime = signer.sftVerifyAsOf; + else { - CRYPT_PROVIDER_SGNR signer = { sizeof(signer), { 0 } }; - DWORD i; - - /* Add a signer with nothing but the time to verify, so we can - * add a cert to it - */ - if (data->pWintrustData->u.pCert->psftVerifyAsOf) - data->sftSystemTime = signer.sftVerifyAsOf; - else - { - SYSTEMTIME sysTime; + SYSTEMTIME sysTime; - GetSystemTime(&sysTime); - SystemTimeToFileTime(&sysTime, &signer.sftVerifyAsOf); - } - ret = data->psPfns->pfnAddSgnr2Chain(data, FALSE, 0, &signer); - if (!ret) - goto error; + GetSystemTime(&sysTime); + SystemTimeToFileTime(&sysTime, &signer.sftVerifyAsOf); + } + ret = data->psPfns->pfnAddSgnr2Chain(data, FALSE, 0, &signer); + if (ret) + { ret = data->psPfns->pfnAddCert2Chain(data, 0, FALSE, 0, data->pWintrustData->u.pCert->psCertContext); - if (!ret) - goto error; for (i = 0; ret && i < data->pWintrustData->u.pCert->chStores; i++) ret = data->psPfns->pfnAddStore2Chain(data, data->pWintrustData->u.pCert->pahStores[i]); } - else - { - /* Do nothing!? See the tests */ - ret = TRUE; - } } else { - SetLastError(ERROR_INVALID_PARAMETER); - ret = FALSE; + /* Do nothing!? See the tests */ + ret = TRUE; } + } + else + { + SetLastError(ERROR_INVALID_PARAMETER); + ret = FALSE; + } + return ret; +} + +HRESULT WINAPI SoftpubLoadMessage(CRYPT_PROVIDER_DATA *data) +{ + BOOL ret; + + TRACE("(%p)\n", data); + + if (!data->padwTrustStepErrors) + return S_FALSE; + + switch (data->pWintrustData->dwUnionChoice) + { + case WTD_CHOICE_CERT: + ret = SOFTPUB_LoadCertMessage(data); break; case WTD_CHOICE_FILE: if (!data->pWintrustData->u.pFile)

1 0

Juan Lang : crypt32: Fix a failing test on Windows, and remove TODO_ERROR since Wine's implemenation already matches.
by Alexandre Julliard 24 Oct '08

24 Oct '08

Module: wine Branch: master Commit: 92e88c3a9eeabf49c4a3b7f3147da4122bf87f19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92e88c3a9eeabf49c4a3b7f31… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 23 17:12:05 2008 -0700 crypt32: Fix a failing test on Windows, and remove TODO_ERROR since Wine's implemenation already matches. --- dlls/crypt32/tests/chain.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index fc9768b..8133c1c 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1539,7 +1539,8 @@ static ChainCheck chainCheck[] = { { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus10 }, 0 }, { { sizeof(chain12) / sizeof(chain12[0]), chain12 }, { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, - { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus12 }, TODO_ERROR }, + { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_NOT_SIGNATURE_VALID, 0 }, + 1, simpleStatus12 }, 0 }, { { sizeof(chain13) / sizeof(chain13[0]), chain13 }, { { CERT_TRUST_IS_NOT_TIME_NESTED, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus13 },

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 October 2008