wine-commits October 2007

wine-commits@winehq.org

4 participants
996 discussions

Juan Lang : cryptnet: Don't prefer native version.
by Alexandre Julliard 24 Oct '07

24 Oct '07

Module: wine Branch: master Commit: 42d0d50561225c4c9dd47a7b8b6af4306ef3d07c URL: http://source.winehq.org/git/wine.git/?a=commit;h=42d0d50561225c4c9dd47a7b8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Oct 23 12:54:12 2007 -0700 cryptnet: Don't prefer native version. --- dlls/cryptnet/cryptnet_main.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index cb86278..d280ca4 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1,5 +1,6 @@ /* * Copyright (C) 2006 Maarten Lankhorst + * Copyright 2007 Juan Lang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -37,8 +38,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); switch (fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); break;

1 0

Juan Lang : cryptnet: Implement CertDllVerifyRevocation.
by Alexandre Julliard 24 Oct '07

24 Oct '07

Module: wine Branch: master Commit: 07794d58906b3af05d9b8b346c0a448895e71c60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07794d58906b3af05d9b8b346… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Oct 23 12:53:37 2007 -0700 cryptnet: Implement CertDllVerifyRevocation. --- dlls/cryptnet/cryptnet_main.c | 124 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 121 insertions(+), 3 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 5d1f6f7..cb86278 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1326,6 +1326,13 @@ BOOL WINAPI CryptRetrieveObjectByUrlW(LPCWSTR pszURL, LPCSTR pszObjectOid, return ret; } +typedef struct _OLD_CERT_REVOCATION_STATUS { + DWORD cbSize; + DWORD dwIndex; + DWORD dwError; + DWORD dwReason; +} OLD_CERT_REVOCATION_STATUS, *POLD_CERT_REVOCATION_STATUS; + /*********************************************************************** * CertDllVerifyRevocation (CRYPTNET.@) */ @@ -1333,7 +1340,118 @@ BOOL WINAPI CertDllVerifyRevocation(DWORD dwEncodingType, DWORD dwRevType, DWORD cContext, PVOID rgpvContext[], DWORD dwFlags, PCERT_REVOCATION_PARA pRevPara, PCERT_REVOCATION_STATUS pRevStatus) { - FIXME("(%08x, %d, %d, %p, %08x, %p, %p): stub\n", dwEncodingType, dwRevType, - cContext, rgpvContext, dwFlags, pRevPara, pRevStatus); - return FALSE; + DWORD error = 0, i; + BOOL ret; + + TRACE("(%08x, %d, %d, %p, %08x, %p, %p)\n", dwEncodingType, dwRevType, + cContext, rgpvContext, dwFlags, pRevPara, pRevStatus); + + if (pRevStatus->cbSize != sizeof(OLD_CERT_REVOCATION_STATUS) && + pRevStatus->cbSize != sizeof(CERT_REVOCATION_STATUS)) + { + SetLastError(E_INVALIDARG); + return FALSE; + } + memset(&pRevStatus->dwIndex, 0, pRevStatus->cbSize - sizeof(DWORD)); + if (dwRevType != CERT_CONTEXT_REVOCATION_TYPE) + { + error = CRYPT_E_NO_REVOCATION_CHECK; + ret = FALSE; + } + else + { + ret = TRUE; + for (i = 0; ret && i < cContext; i++) + { + DWORD cbUrlArray; + + ret = CryptGetObjectUrl(URL_OID_CERTIFICATE_CRL_DIST_POINT, + rgpvContext[i], 0, NULL, &cbUrlArray, NULL, NULL, NULL); + if (!ret && GetLastError() == CRYPT_E_NOT_FOUND) + { + error = CRYPT_E_NO_REVOCATION_CHECK; + pRevStatus->dwIndex = i; + } + else if (ret) + { + CRYPT_URL_ARRAY *urlArray = CryptMemAlloc(cbUrlArray); + + if (urlArray) + { + DWORD j, retrievalFlags = 0, startTime, endTime, timeout; + + ret = CryptGetObjectUrl(URL_OID_CERTIFICATE_CRL_DIST_POINT, + rgpvContext[i], 0, urlArray, &cbUrlArray, NULL, NULL, + NULL); + if (dwFlags & CERT_VERIFY_CACHE_ONLY_BASED_REVOCATION) + retrievalFlags |= CRYPT_CACHE_ONLY_RETRIEVAL; + if (dwFlags & CERT_VERIFY_REV_ACCUMULATIVE_TIMEOUT_FLAG && + pRevPara->cbSize >= offsetof(CERT_REVOCATION_PARA, + dwUrlRetrievalTimeout) + sizeof(DWORD)) + { + startTime = GetTickCount(); + endTime = startTime + pRevPara->dwUrlRetrievalTimeout; + timeout = pRevPara->dwUrlRetrievalTimeout; + } + else + endTime = timeout = 0; + for (j = 0; ret && j < urlArray->cUrl; j++) + { + PCCRL_CONTEXT crl; + + ret = CryptRetrieveObjectByUrlW(urlArray->rgwszUrl[j], + CONTEXT_OID_CRL, retrievalFlags, timeout, + (void **)&crl, NULL, NULL, NULL, NULL); + if (ret) + { + PCRL_ENTRY entry = NULL; + + CertFindCertificateInCRL( + (PCCERT_CONTEXT)rgpvContext[i], crl, 0, NULL, + &entry); + if (entry) + { + error = CRYPT_E_REVOKED; + pRevStatus->dwIndex = i; + ret = FALSE; + } + else if (timeout) + { + DWORD time = GetTickCount(); + + if ((int)(endTime - time) <= 0) + { + error = ERROR_TIMEOUT; + pRevStatus->dwIndex = i; + ret = FALSE; + } + else + timeout = endTime - time; + } + CertFreeCRLContext(crl); + } + else + error = CRYPT_E_REVOCATION_OFFLINE; + } + CryptMemFree(urlArray); + } + else + { + error = ERROR_OUTOFMEMORY; + pRevStatus->dwIndex = i; + ret = FALSE; + } + } + else + pRevStatus->dwIndex = i; + } + } + + if (!ret) + { + SetLastError(error); + pRevStatus->dwError = error; + } + TRACE("returning %d (%08x)\n", ret, error); + return ret; }

1 0

Juan Lang : cryptnet: Get cache entry expire time from HTTP expires header.
by Alexandre Julliard 24 Oct '07

24 Oct '07

Module: wine Branch: master Commit: 45f260e3e2cd29b4ec603d0b36a566c470f14061 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45f260e3e2cd29b4ec603d0b3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Oct 23 12:51:21 2007 -0700 cryptnet: Get cache entry expire time from HTTP expires header. --- dlls/cryptnet/cryptnet_main.c | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 21489ff..5d1f6f7 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -396,7 +396,6 @@ static BOOL CRYPT_GetObjectFromFile(HANDLE hFile, PCRYPT_BLOB_ARRAY pObject) } /* FIXME: should make wininet cache all downloads instead */ -/* FIXME: how do I know the cached object is up to date? */ static BOOL CRYPT_GetObjectFromCache(LPCWSTR pszURL, PCRYPT_BLOB_ARRAY pObject, PCRYPT_RETRIEVE_AUX_INFO pAuxInfo) { @@ -610,7 +609,7 @@ static BOOL CRYPT_DownloadObject(DWORD dwRetrievalFlags, HINTERNET hHttp, } static void CRYPT_CacheURL(LPCWSTR pszURL, PCRYPT_BLOB_ARRAY pObject, - DWORD dwRetrievalFlags) + DWORD dwRetrievalFlags, FILETIME expires) { WCHAR cacheFileName[MAX_PATH]; @@ -633,7 +632,7 @@ static void CRYPT_CacheURL(LPCWSTR pszURL, PCRYPT_BLOB_ARRAY pObject, WriteFile(hCacheFile, pObject->rgBlob[0].pbData, pObject->rgBlob[0].cbData, &bytesWritten, NULL); CloseHandle(hCacheFile); - CommitUrlCacheEntryW(pszURL, cacheFileName, ft, ft, entryType, + CommitUrlCacheEntryW(pszURL, cacheFileName, expires, ft, entryType, NULL, 0, NULL, NULL); } } @@ -820,7 +819,21 @@ static BOOL WINAPI HTTP_RetrieveEncodedObjectW(LPCWSTR pszURL, ret = CRYPT_DownloadObject(dwRetrievalFlags, hHttp, context, pObject, pAuxInfo); if (ret && !(dwRetrievalFlags & CRYPT_DONT_CACHE_RESULT)) - CRYPT_CacheURL(pszURL, pObject, dwRetrievalFlags); + { + SYSTEMTIME st; + DWORD len = sizeof(st); + + if (HttpQueryInfoW(hHttp, + HTTP_QUERY_EXPIRES | HTTP_QUERY_FLAG_SYSTEMTIME, &st, + &len, NULL)) + { + FILETIME ft; + + SystemTimeToFileTime(&st, &ft); + CRYPT_CacheURL(pszURL, pObject, dwRetrievalFlags, + ft); + } + } InternetCloseHandle(hHttp); } InternetCloseHandle(hHost);

1 0

Juan Lang : cryptnet: Set timeout on http connections when a timeout is specified.
by Alexandre Julliard 24 Oct '07

24 Oct '07

Module: wine Branch: master Commit: 6c5f759d5ac3d66203844a22ad618443b3c3d6f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c5f759d5ac3d66203844a22a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Oct 23 12:50:29 2007 -0700 cryptnet: Set timeout on http connections when a timeout is specified. --- dlls/cryptnet/cryptnet_main.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 603185d..21489ff 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -785,6 +785,14 @@ static BOOL WINAPI HTTP_RetrieveEncodedObjectW(LPCWSTR pszURL, if (hHttp) { + if (dwTimeout) + { + InternetSetOptionW(hHttp, + INTERNET_OPTION_RECEIVE_TIMEOUT, &dwTimeout, + sizeof(dwTimeout)); + InternetSetOptionW(hHttp, INTERNET_OPTION_SEND_TIMEOUT, + &dwTimeout, sizeof(dwTimeout)); + } ret = HttpSendRequestExW(hHttp, NULL, NULL, 0, (DWORD_PTR)context); if (!ret && GetLastError() == ERROR_IO_PENDING) @@ -795,14 +803,18 @@ static BOOL WINAPI HTTP_RetrieveEncodedObjectW(LPCWSTR pszURL, else ret = TRUE; } - ret = HttpEndRequestW(hHttp, NULL, 0, (DWORD_PTR)context); - if (!ret && GetLastError() == ERROR_IO_PENDING) + /* We don't set ret to TRUE in this block to avoid masking + * an error from HttpSendRequestExW. + */ + if (!HttpEndRequestW(hHttp, NULL, 0, (DWORD_PTR)context) && + GetLastError() == ERROR_IO_PENDING) { if (WaitForSingleObject(context->event, context->timeout) == WAIT_TIMEOUT) + { SetLastError(ERROR_TIMEOUT); - else - ret = TRUE; + ret = FALSE; + } } if (ret) ret = CRYPT_DownloadObject(dwRetrievalFlags, hHttp,

1 0

Alexander Nicolaysen Sørnes : Prevent ids getting lost during editing
by Chris Morgan 23 Oct '07

23 Oct '07

Module: appdb Branch: master Commit: 16d212c552e6f74075d9401eeab8c53667c80be5 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=16d212c552e6f74075d9401e… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Oct 23 21:49:06 2007 +0200 Prevent ids getting lost during editing --- include/comment.php | 4 +++- include/distribution.php | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/comment.php b/include/comment.php index 8274ef1..ca29670 100644 --- a/include/comment.php +++ b/include/comment.php @@ -200,7 +200,9 @@ class Comment { $this->sSubject = $aClean['sSubject']; $this->sBody = $aClean['sBody']; $this->iParentId = $aClean['iThread']; - $this->iVersionId = $aClean['iVersionId']; + + if($aClean['iVersionId']) + $this->iVersionId = $aClean['iVersionId']; if(!$this->oOwner) $this->oOwner = $_SESSION['current']; diff --git a/include/distribution.php b/include/distribution.php index a51cdef..9dc45f6 100644 --- a/include/distribution.php +++ b/include/distribution.php @@ -443,7 +443,9 @@ class distribution { /* $aValues can be $_REQUEST or any array with the values from outputEditor() */ function GetOutputEditorValues($aValues) { - $this->iDistributionId = $aValues['iDistributionId']; + if($aClean['iDistributionId']) + $this->iDistributionId = $aValues['iDistributionId']; + $this->sName = $aValues['sDistribution']; $this->sUrl = $aValues['sUrl']; }

1 0

Alexander Nicolaysen Sørnes : comment: Don't allow anonymous submissions
by Chris Morgan 23 Oct '07

23 Oct '07

Module: appdb Branch: master Commit: 3a25c6433385f6035a69ad8537fc3f79e170f47e URL: http://source.winehq.org/git/appdb.git/?a=commit;h=3a25c6433385f6035a69ad85… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Oct 24 00:33:52 2007 +0200 comment: Don't allow anonymous submissions --- include/comment.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/comment.php b/include/comment.php index 8a5d1ba..8274ef1 100644 --- a/include/comment.php +++ b/include/comment.php @@ -556,7 +556,7 @@ class Comment { function allowAnonymousSubmissions() { - return TRUE; + return FALSE; } function objectGetCustomVars($sAction)

1 0

Alexander Nicolaysen Sørnes : Improve help text on the confirm deletion page
by Chris Morgan 23 Oct '07

23 Oct '07

Module: appdb Branch: master Commit: ad73b6445f9072893eb8387b019ac290699522c1 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=ad73b6445f9072893eb8387b… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Oct 23 16:21:17 2007 +0200 Improve help text on the confirm deletion page --- include/objectManager.php | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index 8c49d0c..b40a461 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -433,6 +433,22 @@ class ObjectManager return; } + /* Why the user should write an explanation for the deletion */ + if($oObject->objectGetSubmitterId() != $_SESSION['current']->iUserId) + { + $shWhyComment = "Please enter a reason why so that you don’t hurt the submitter’s". + " feelings."; + + $oUser = new user($oObject->objectGetSubmitterId()); + $sSubmitter = " (submitted by ".$oUser->objectMakeLink().")"; + } else + { + $shWhyComment = "Although you submitted it it might be useful for other users to know why ". + "you are deleting it."; + + $sSubmitter = ""; + } + $oTable = new Table(); $oTableRow = new TableRow(); $oTable->setAlign("center"); @@ -444,9 +460,8 @@ class ObjectManager "Confirm deletion". "</div>". '<div class="info_contents">'. - "Are you sure you wish to delete this entry?<br />". - "Please enter a reason why so that you don’t hurt the submitter’s". - " feelings.". + "Are you sure you wish to delete this entry".$sSubmitter."?<br />". + $shWhyComment. "</div>". "</div>".

1 0

Alexander Nicolaysen Sørnes : Support previewing applications
by Chris Morgan 23 Oct '07

23 Oct '07

Module: appdb Branch: master Commit: fb13cd7c13a9aaf2c3fef4ce468baabb73cad48b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=fb13cd7c13a9aaf2c3fef4ce… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Oct 23 14:16:00 2007 +0200 Support previewing applications --- include/application.php | 13 ++++++++++++- include/application_queue.php | 12 ++++++++++++ include/version.php | 7 +++---- 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/include/application.php b/include/application.php index 15bf660..386fd74 100644 --- a/include/application.php +++ b/include/application.php @@ -37,6 +37,7 @@ class Application { var $sSubmitTime; var $iSubmitterId; var $aVersionsIds; // an array that contains the versionId of every version linked to this app. + var $aVersions; // Array of version objects belonging to this app var $iMaintainerRequest; /* Temporary variable for tracking maintainer requests on app submission. Value denotes type of request */ @@ -45,6 +46,8 @@ class Application { */ public function Application($iAppId = null, $oRow = null) { + $this->aVersions = array(); // Should always be an array + // we are working on an existing application if(!$iAppId && !$oRow) return; @@ -500,6 +503,10 @@ class Application { mail_appdb($sEmail, $sSubject ,$sMsg); } + public function objectShowPreview() + { + return TRUE; + } /* output a html table and this applications values to the fields for editing */ public function outputEditor($sVendorName = "") @@ -801,7 +808,7 @@ class Application { echo html_frame_end("For more details and user comments, view the versions of this application."); // display versions - Version::displayList($this->aVersionsIds); + Version::displayList($this->getVersions()); // display bundle $this->displayBundle(); @@ -1070,6 +1077,10 @@ class Application { public function getVersions($bIncludeObsolete = TRUE) { + /* If no id is set we cannot query for the versions, but perhaps objects are already cached? */ + if(!$this->iAppId) + return $this->aVersions; + $aVersions = array(); $hResult = $this->_internal_retrieve_all_versions($bIncludeObsolete); diff --git a/include/application_queue.php b/include/application_queue.php index 3aa82cb..883e126 100644 --- a/include/application_queue.php +++ b/include/application_queue.php @@ -152,6 +152,14 @@ class application_queue return $this->oApp->objectGetMail($sAction, $bMailSubmitter, $bParentAction); } + public function objectShowPreview() + { + if($this->oApp->sName) + return TRUE; + + return FALSE; + } + function outputEditor() { /* We ask the user for the application name first so as to avoid duplicate @@ -291,6 +299,10 @@ class application_queue function display() { + /* Cache the version object if it is not in the database */ + if(!$this->oVersionQueue->objectGetId()) + $this->oApp->aVersions = array($this->oVersionQueue->oVersion); + $this->oApp->display(); } diff --git a/include/version.php b/include/version.php index 63a5e03..8d49bf3 100644 --- a/include/version.php +++ b/include/version.php @@ -1097,9 +1097,9 @@ class version { } // display the versions - public static function displayList($aVersionsIds) + public static function displayList($aVersions) { - if ($aVersionsIds) + if ($aVersions) { echo html_frame_start("","98%","",0); @@ -1137,9 +1137,8 @@ class version { $oTable->SetHeader($oTableRow); $c = 0; - foreach($aVersionsIds as $iVersionId) + foreach($aVersions as $oVersion) { - $oVersion = new Version($iVersionId); $oApp = new application($oVersion->iAppId); if ($oVersion->sQueued == $oApp->sQueued) {

1 0

Alexander Nicolaysen Sørnes : screenshot : Fix random screenshot function
by Chris Morgan 23 Oct '07

23 Oct '07

Module: appdb Branch: master Commit: 58ef8e62e55b740e8d97ca164289f2f6cd0096da URL: http://source.winehq.org/git/appdb.git/?a=commit;h=58ef8e62e55b740e8d97ca16… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Oct 23 13:55:18 2007 +0200 screenshot: Fix random screenshot function --- include/screenshot.php | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/include/screenshot.php b/include/screenshot.php index 611b83b..81eec26 100644 --- a/include/screenshot.php +++ b/include/screenshot.php @@ -464,6 +464,7 @@ class screenshot $bFormatting = true) { // initialize variables to avoid notices when appending to them + $hResult = null; $sImgFile = ''; $sImg = ''; // we want a random screenshots for this app @@ -508,7 +509,7 @@ class screenshot $sZoomIcon = Screenshot::get_zoomicon_overlay(); /* we have screenshots */ - if(query_num_rows($hResult)) + if($hResult && query_num_rows($hResult)) { if($iVersionId) $sImg .= "<a href='screenshots.php?iAppId=$iAppId&iVersionId=$iVersionId'>".$sImgFile.$sZoomIcon."<center>View/Submit Screenshot</center></a>";

1 0

Alexander Nicolaysen Sørnes : Allow users to view apps with no id
by Chris Morgan 23 Oct '07

23 Oct '07

Module: appdb Branch: master Commit: 0c47bd87a3ba556c794fb8e39926ae91f67b7aad URL: http://source.winehq.org/git/appdb.git/?a=commit;h=0c47bd87a3ba556c794fb8e3… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Oct 23 13:35:06 2007 +0200 Allow users to view apps with no id --- include/user.php | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/user.php b/include/user.php index b30dee3..b23f005 100644 --- a/include/user.php +++ b/include/user.php @@ -632,6 +632,10 @@ class User { /* application permissions */ function canViewApplication($oApp) { + /* If there is no id the app is not in the database, which means the current user must have created the object */ + if(!$oApp->iAppId) + return true; + /* if the application isn't queued */ if($oApp->sQueued == 'false') return true;

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 2007