October 2007 - Wine-commits

Michael Stefaniuc : winealsa.drv: Leave the CriticalSection before destroying it. Found by Smatch.
by Alexandre Julliard 23 Oct '07

23 Oct '07

Module: wine Branch: master Commit: ca71287572bb358250186d6c5b3fd6a9cfd8c6a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca71287572bb358250186d6c5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 22 22:46:05 2007 +0200 winealsa.drv: Leave the CriticalSection before destroying it. Found by Smatch. --- dlls/winealsa.drv/mixer.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winealsa.drv/mixer.c b/dlls/winealsa.drv/mixer.c index f1b2e12..daa45a1 100644 --- a/dlls/winealsa.drv/mixer.c +++ b/dlls/winealsa.drv/mixer.c @@ -573,6 +573,7 @@ static void ALSA_MixerExit(void) EnterCriticalSection(&elem_crst); TerminateThread(thread, 1); refcnt = 0; + LeaveCriticalSection(&elem_crst); } TRACE("Cleaning up\n");

1 0

James Hawkins : msi: Release the record only after using the record's data.
by Alexandre Julliard 23 Oct '07

23 Oct '07

Module: wine Branch: master Commit: b6cfc405bda9729936d348427e8768bbddd4c54f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6cfc405bda9729936d348427… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Oct 23 03:06:59 2007 -0500 msi: Release the record only after using the record's data. --- dlls/msi/action.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 80caaac..cff5368 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4358,9 +4358,9 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) } key = MSI_RecordGetString(row, 6); - msiobj_release(&row->hdr); file = get_loaded_file(package, key); + msiobj_release(&row->hdr); if (!file) { ERR("Failed to load the service file\n");

1 0

Juan Lang : cryptnet: Return FALSE if the requested URL exists and the url array size is NULL.
by Alexandre Julliard 23 Oct '07

23 Oct '07

Module: wine Branch: master Commit: dcb8c874e875695208dd230e64f39120582921f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcb8c874e875695208dd230e6… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 22 10:22:50 2007 -0700 cryptnet: Return FALSE if the requested URL exists and the url array size is NULL. --- dlls/cryptnet/cryptnet_main.c | 3 +++ dlls/cryptnet/tests/cryptnet.c | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 049e52d..3a25fb5 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -174,7 +174,10 @@ static BOOL WINAPI CRYPT_GetUrlFromCertificateCRLDistPoint(LPCSTR pszUrlOid, } } if (!pcbUrlArray) + { SetLastError(E_INVALIDARG); + ret = FALSE; + } else if (!pUrlArray) *pcbUrlArray = bytesNeeded; else if (*pcbUrlArray < bytesNeeded) diff --git a/dlls/cryptnet/tests/cryptnet.c b/dlls/cryptnet/tests/cryptnet.c index 221a29d..25edaa6 100644 --- a/dlls/cryptnet/tests/cryptnet.c +++ b/dlls/cryptnet/tests/cryptnet.c @@ -175,13 +175,11 @@ static void test_getObjectUrl(void) SetLastError(0xdeadbeef); ret = CryptGetObjectUrl(URL_OID_CERTIFICATE_CRL_DIST_POINT, (void *)cert, 0, NULL, NULL, NULL, NULL, NULL); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); ret = CryptGetObjectUrl(URL_OID_CERTIFICATE_CRL_DIST_POINT, (void *)cert, 0, NULL, NULL, NULL, &infoSize, NULL); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", GetLastError()); /* Can get it without specifying the location: */

1 0

Juan Lang : cryptnet: Implement CryptRetrieveObjectByUrlW for the http protocol.
by Alexandre Julliard 23 Oct '07

23 Oct '07

Module: wine Branch: master Commit: d1d0c97c84f579ba293de9d62d0a1cafd4f9267e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1d0c97c84f579ba293de9d62… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 22 10:25:08 2007 -0700 cryptnet: Implement CryptRetrieveObjectByUrlW for the http protocol. --- dlls/cryptnet/cryptnet_main.c | 520 ++++++++++++++++++++++++++++++++++++----- 1 files changed, 465 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d1d0c97c84f579ba293de…

1 0

Detlef Riekenberg : comdlg32: Do not crash with PageSetupDlg(NULL).
by Alexandre Julliard 23 Oct '07

23 Oct '07

Module: wine Branch: master Commit: 55fe39e07b6070df17311c65a192ad0fe321c907 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55fe39e07b6070df17311c65a… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Oct 22 18:18:41 2007 +0200 comdlg32: Do not crash with PageSetupDlg(NULL). --- dlls/comdlg32/printdlg.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 490a794..b995624 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -3383,6 +3383,11 @@ BOOL WINAPI PageSetupDlgA(LPPAGESETUPDLGA setupdlg) { PageSetupDataA *pda; PRINTDLGA pdlg; + if (setupdlg == NULL) { + COMDLG32_SetCommDlgExtendedError(CDERR_INITIALIZATION); + return FALSE; + } + /* TRACE */ if(TRACE_ON(commdlg)) { char flagstr[1000] = ""; @@ -3399,11 +3404,8 @@ BOOL WINAPI PageSetupDlgA(LPPAGESETUPDLGA setupdlg) { setupdlg->hDevNames, setupdlg->hInstance, setupdlg->Flags, flagstr); } + /* Checking setupdlg structure */ - if (setupdlg == NULL) { - COMDLG32_SetCommDlgExtendedError(CDERR_INITIALIZATION); - return FALSE; - } if(setupdlg->lStructSize != sizeof(PAGESETUPDLGA)) { COMDLG32_SetCommDlgExtendedError(CDERR_STRUCTSIZE); return FALSE; @@ -3488,6 +3490,12 @@ BOOL WINAPI PageSetupDlgW(LPPAGESETUPDLGW setupdlg) { PRINTDLGW pdlg; FIXME("Unicode implementation is not done yet\n"); + + if (setupdlg == NULL) { + COMDLG32_SetCommDlgExtendedError(CDERR_INITIALIZATION); + return FALSE; + } + if(TRACE_ON(commdlg)) { char flagstr[1000] = ""; const struct pd_flags *pflag = psd_flags;

1 0

Juan Lang : cryptnet: Add tests for CryptRetrieveObjectByUrl.
by Alexandre Julliard 23 Oct '07

23 Oct '07

Module: wine Branch: master Commit: a7cfe075c864966025deb39ca289ed39c3c444cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7cfe075c864966025deb39ca… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 22 10:19:36 2007 -0700 cryptnet: Add tests for CryptRetrieveObjectByUrl. --- dlls/cryptnet/tests/cryptnet.c | 137 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 137 insertions(+), 0 deletions(-) diff --git a/dlls/cryptnet/tests/cryptnet.c b/dlls/cryptnet/tests/cryptnet.c index 8862d16..a8f1db0 100644 --- a/dlls/cryptnet/tests/cryptnet.c +++ b/dlls/cryptnet/tests/cryptnet.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdarg.h> +#include <stdio.h> #define NONAMELESSUNION #include <windef.h> #include <winbase.h> @@ -234,7 +235,143 @@ static void test_getObjectUrl(void) } } +static void make_tmp_file(LPSTR path) +{ + static char curr[MAX_PATH] = { 0 }; + char temp[MAX_PATH]; + DWORD dwNumberOfBytesWritten; + HANDLE hf; + + if (!*curr) + GetCurrentDirectoryA(MAX_PATH, curr); + GetTempFileNameA(curr, "net", 0, temp); + lstrcpyA(path, temp); + hf = CreateFileA(path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + WriteFile(hf, certWithCRLDistPoint, sizeof(certWithCRLDistPoint), + &dwNumberOfBytesWritten, NULL); + CloseHandle(hf); +} + +static void test_retrieveObjectByUrl(void) +{ + BOOL ret; + char tmpfile[MAX_PATH * 2], *ptr, url[MAX_PATH + 8]; + CRYPT_BLOB_ARRAY *pBlobArray; + PCCERT_CONTEXT cert; + PCCRL_CONTEXT crl; + HCERTSTORE store; + CRYPT_RETRIEVE_AUX_INFO aux = { 0 }; + FILETIME ft = { 0 }; + + SetLastError(0xdeadbeef); + ret = CryptRetrieveObjectByUrlA(NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, + NULL); + todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError()); + + make_tmp_file(tmpfile); + ptr = strchr(tmpfile, ':'); + if (ptr) + ptr += 2; /* skip colon and first slash */ + else + ptr = tmpfile; + snprintf(url, sizeof(url), "file:///%s", ptr); + do { + ptr = strchr(url, '\\'); + if (ptr) + *ptr = '/'; + } while (ptr); + + pBlobArray = (CRYPT_BLOB_ARRAY *)0xdeadbeef; + ret = CryptRetrieveObjectByUrlA(url, NULL, 0, 0, (void **)&pBlobArray, + NULL, NULL, NULL, NULL); + todo_wine + ok(ret, "CryptRetrieveObjectByUrlA failed: %d\n", GetLastError()); + todo_wine + ok(pBlobArray && pBlobArray != (CRYPT_BLOB_ARRAY *)0xdeadbeef, + "Expected a valid pointer\n"); + if (pBlobArray && pBlobArray != (CRYPT_BLOB_ARRAY *)0xdeadbeef) + { + ok(pBlobArray->cBlob == 1, "Expected 1 blob, got %d\n", + pBlobArray->cBlob); + ok(pBlobArray->rgBlob[0].cbData == sizeof(certWithCRLDistPoint), + "Unexpected size %d\n", pBlobArray->rgBlob[0].cbData); + CryptMemFree(pBlobArray); + } + cert = (PCCERT_CONTEXT)0xdeadbeef; + ret = CryptRetrieveObjectByUrlA(url, CONTEXT_OID_CERTIFICATE, 0, 0, + (void **)&cert, NULL, NULL, NULL, NULL); + todo_wine + ok(cert && cert != (PCCERT_CONTEXT)0xdeadbeef, "Expected a cert\n"); + if (cert && cert != (PCCERT_CONTEXT)0xdeadbeef) + CertFreeCertificateContext(cert); + crl = (PCCRL_CONTEXT)0xdeadbeef; + SetLastError(0xdeadbeef); + ret = CryptRetrieveObjectByUrlA(url, CONTEXT_OID_CRL, 0, 0, (void **)&crl, + NULL, NULL, NULL, NULL); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_NO_MATCH, + "Expected CRYPT_E_NO_MATCH, got %08x\n", GetLastError()); + todo_wine + ok(crl == NULL, "Expected CRL to be NULL\n"); + if (crl && crl != (PCCRL_CONTEXT)0xdeadbeef) + CertFreeCRLContext(crl); + store = (HCERTSTORE)0xdeadbeef; + ret = CryptRetrieveObjectByUrlA(url, CONTEXT_OID_CAPI2_ANY, 0, 0, + (void **)&store, NULL, NULL, NULL, NULL); + todo_wine + ok(ret, "CryptRetrieveObjectByUrlA failed: %d\n", GetLastError()); + if (store && store != (HCERTSTORE)0xdeadbeef) + { + DWORD certs = 0; + + cert = NULL; + do { + cert = CertEnumCertificatesInStore(store, cert); + if (cert) + certs++; + } while (cert); + ok(certs == 1, "Expected 1 cert, got %d\n", certs); + CertCloseStore(store, 0); + } + /* Are file URLs cached? */ + ret = CryptRetrieveObjectByUrlA(url, CONTEXT_OID_CERTIFICATE, + CRYPT_CACHE_ONLY_RETRIEVAL, 0, (void **)&cert, NULL, NULL, NULL, NULL); + todo_wine + ok(ret, "CryptRetrieveObjectByUrlA failed: %08x\n", GetLastError()); + if (cert && cert != (PCCERT_CONTEXT)0xdeadbeef) + CertFreeCertificateContext(cert); + ret = CryptRetrieveObjectByUrlA(url, CONTEXT_OID_CERTIFICATE, 0, 0, + (void **)&cert, NULL, NULL, NULL, &aux); + todo_wine + ok(ret, "CryptRetrieveObjectByUrlA failed: %08x\n", GetLastError()); + if (cert && cert != (PCCERT_CONTEXT)0xdeadbeef) + CertFreeCertificateContext(cert); + aux.cbSize = sizeof(aux); + ret = CryptRetrieveObjectByUrlA(url, CONTEXT_OID_CERTIFICATE, 0, 0, + (void **)&cert, NULL, NULL, NULL, &aux); + todo_wine + ok(ret, "CryptRetrieveObjectByUrlA failed: %08x\n", GetLastError()); + aux.pLastSyncTime = &ft; + ret = CryptRetrieveObjectByUrlA(url, CONTEXT_OID_CERTIFICATE, 0, 0, + (void **)&cert, NULL, NULL, NULL, &aux); + todo_wine + ok(ft.dwLowDateTime || ft.dwHighDateTime, + "Expected last sync time to be set\n"); + DeleteFileA(tmpfile); + /* Okay, after being deleted, are file URLs still cached? */ + SetLastError(0xdeadbeef); + ret = CryptRetrieveObjectByUrlA(url, CONTEXT_OID_CERTIFICATE, + CRYPT_CACHE_ONLY_RETRIEVAL, 0, (void **)&cert, NULL, NULL, NULL, NULL); + todo_wine + ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, + "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); +} + START_TEST(cryptnet) { test_getObjectUrl(); + test_retrieveObjectByUrl(); }

1 0

Juan Lang : cryptnet: Implement CryptRetrieveObjectByUrlA on top of CryptRetrieveObjectByUrlW.
by Alexandre Julliard 23 Oct '07

23 Oct '07

Module: wine Branch: master Commit: 1fbb0f6a5ae82f74dc91d2fbb4c195bef2bcbec9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fbb0f6a5ae82f74dc91d2fbb… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 22 10:20:11 2007 -0700 cryptnet: Implement CryptRetrieveObjectByUrlA on top of CryptRetrieveObjectByUrlW. --- dlls/cryptnet/cryptnet_main.c | 30 ++++++++++++++++++++++++++++-- dlls/cryptnet/tests/cryptnet.c | 1 - 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 0c5843b..669b12e 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -24,6 +24,7 @@ #include "wine/debug.h" #include "winbase.h" #include "winnt.h" +#include "winnls.h" #define NONAMELESSUNION #include "wincrypt.h" @@ -298,10 +299,35 @@ BOOL WINAPI CryptRetrieveObjectByUrlA(LPCSTR pszURL, LPCSTR pszObjectOid, HCRYPTASYNC hAsyncRetrieve, PCRYPT_CREDENTIALS pCredentials, LPVOID pvVerify, PCRYPT_RETRIEVE_AUX_INFO pAuxInfo) { - FIXME("(%s, %s, %08x, %d, %p, %p, %p, %p, %p)\n", debugstr_a(pszURL), + BOOL ret = FALSE; + int len; + + TRACE("(%s, %s, %08x, %d, %p, %p, %p, %p, %p)\n", debugstr_a(pszURL), debugstr_a(pszObjectOid), dwRetrievalFlags, dwTimeout, ppvObject, hAsyncRetrieve, pCredentials, pvVerify, pAuxInfo); - return FALSE; + + if (!pszURL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + len = MultiByteToWideChar(CP_ACP, 0, pszURL, -1, NULL, 0); + if (len) + { + LPWSTR url = CryptMemAlloc(len * sizeof(WCHAR)); + + if (url) + { + MultiByteToWideChar(CP_ACP, 0, pszURL, -1, url, len); + ret = CryptRetrieveObjectByUrlW(url, pszObjectOid, + dwRetrievalFlags, dwTimeout, ppvObject, hAsyncRetrieve, + pCredentials, pvVerify, pAuxInfo); + CryptMemFree(url); + } + else + SetLastError(ERROR_OUTOFMEMORY); + } + return ret; } /*********************************************************************** diff --git a/dlls/cryptnet/tests/cryptnet.c b/dlls/cryptnet/tests/cryptnet.c index a8f1db0..d1c4787 100644 --- a/dlls/cryptnet/tests/cryptnet.c +++ b/dlls/cryptnet/tests/cryptnet.c @@ -267,7 +267,6 @@ static void test_retrieveObjectByUrl(void) SetLastError(0xdeadbeef); ret = CryptRetrieveObjectByUrlA(NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError());

1 0

Juan Lang : cryptnet: Implement CryptRetrieveObjectByUrlW for the file: protocol.
by Alexandre Julliard 23 Oct '07

23 Oct '07

Module: wine Branch: master Commit: 681a408aa641f71e70c6d498c4ca946709e21b16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=681a408aa641f71e70c6d498c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 22 10:22:16 2007 -0700 cryptnet: Implement CryptRetrieveObjectByUrlW for the file: protocol. --- dlls/cryptnet/Makefile.in | 1 + dlls/cryptnet/cryptnet_main.c | 548 +++++++++++++++++++++++++++++++++++++++- dlls/cryptnet/tests/cryptnet.c | 17 +- 3 files changed, 551 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=681a408aa641f71e70c6d…

1 0

Juan Lang : wininet: Implement RetrieveUrlCacheEntryFileW.
by Alexandre Julliard 23 Oct '07

23 Oct '07

Module: wine Branch: master Commit: d448a2ad9b0bc4180be9052ad84c24e46d59a5ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=d448a2ad9b0bc4180be9052ad… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 22 10:16:27 2007 -0700 wininet: Implement RetrieveUrlCacheEntryFileW. --- dlls/wininet/urlcache.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 56 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index e7131f3..e895cd7 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1692,13 +1692,68 @@ BOOL WINAPI RetrieveUrlCacheEntryFileW( IN DWORD dwReserved ) { + LPURLCACHE_HEADER pHeader; + struct _HASH_ENTRY * pHashEntry; + CACHEFILE_ENTRY * pEntry; + URL_CACHEFILE_ENTRY * pUrlEntry; + URLCACHECONTAINER * pContainer; + TRACE("(%s, %p, %p, 0x%08x)\n", debugstr_w(lpszUrlName), lpCacheEntryInfo, lpdwCacheEntryInfoBufferSize, dwReserved); - return FALSE; + if (!URLCacheContainers_FindContainerW(lpszUrlName, &pContainer)) + return FALSE; + + if (!URLCacheContainer_OpenIndex(pContainer)) + return FALSE; + + if (!(pHeader = URLCacheContainer_LockIndex(pContainer))) + return FALSE; + + if (!URLCache_FindHashW(pHeader, lpszUrlName, &pHashEntry)) + { + URLCacheContainer_UnlockIndex(pContainer, pHeader); + TRACE("entry %s not found!\n", debugstr_w(lpszUrlName)); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; + } + + pEntry = (CACHEFILE_ENTRY *)((LPBYTE)pHeader + pHashEntry->dwOffsetEntry); + if (pEntry->dwSignature != URL_SIGNATURE) + { + URLCacheContainer_UnlockIndex(pContainer, pHeader); + FIXME("Trying to retrieve entry of unknown format %s\n", debugstr_an((LPSTR)&pEntry->dwSignature, sizeof(DWORD))); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; + } + + pUrlEntry = (URL_CACHEFILE_ENTRY *)pEntry; + TRACE("Found URL: %s\n", (LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl); + TRACE("Header info: %s\n", (LPBYTE)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo); + + pUrlEntry->dwHitRate++; + pUrlEntry->dwUseCount++; + URLCache_HashEntrySetUse(pHashEntry, pUrlEntry->dwUseCount); + + if (!URLCache_CopyEntry( + pContainer, + pHeader, + (LPINTERNET_CACHE_ENTRY_INFOA)lpCacheEntryInfo, + lpdwCacheEntryInfoBufferSize, + pUrlEntry, + TRUE /* UNICODE */)) + { + URLCacheContainer_UnlockIndex(pContainer, pHeader); + return FALSE; + } + TRACE("Local File Name: %s\n", debugstr_w(lpCacheEntryInfo->lpszLocalFileName)); + + URLCacheContainer_UnlockIndex(pContainer, pHeader); + + return TRUE; } /***********************************************************************

1 0

Juan Lang : wininet: Pass hash entry directly to URLCache_DeleteEntryFromHash.
by Alexandre Julliard 23 Oct '07

23 Oct '07

Module: wine Branch: master Commit: 1b42c00789682b67e95a0b91643de0c45ac344ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b42c00789682b67e95a0b916… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 22 10:16:50 2007 -0700 wininet: Pass hash entry directly to URLCache_DeleteEntryFromHash. --- dlls/wininet/urlcache.c | 17 ++++++----------- 1 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index e895cd7..09369c0 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1210,16 +1210,11 @@ static BOOL URLCache_HashEntrySetUse(struct _HASH_ENTRY * pHashEntry, DWORD dwUs * FALSE if the entry could not be found * */ -static BOOL URLCache_DeleteEntryFromHash(LPCURLCACHE_HEADER pHeader, LPCSTR lpszUrl) +static BOOL URLCache_DeleteEntryFromHash(struct _HASH_ENTRY * pHashEntry) { - struct _HASH_ENTRY * pHashEntry; - if (URLCache_FindHash(pHeader, lpszUrl, &pHashEntry)) - { - pHashEntry->dwHashKey = HASHTABLE_FREE; - pHashEntry->dwOffsetEntry = HASHTABLE_FREE; - return TRUE; - } - return FALSE; + pHashEntry->dwHashKey = HASHTABLE_FREE; + pHashEntry->dwOffsetEntry = HASHTABLE_FREE; + return TRUE; } /*********************************************************************** @@ -2597,7 +2592,7 @@ BOOL WINAPI DeleteUrlCacheEntryA(LPCSTR lpszUrlName) pEntry = (CACHEFILE_ENTRY *)((LPBYTE)pHeader + pHashEntry->dwOffsetEntry); URLCache_DeleteEntry(pHeader, pEntry); - URLCache_DeleteEntryFromHash(pHeader, lpszUrlName); + URLCache_DeleteEntryFromHash(pHashEntry); URLCacheContainer_UnlockIndex(pContainer, pHeader); @@ -2656,7 +2651,7 @@ BOOL WINAPI DeleteUrlCacheEntryW(LPCWSTR lpszUrlName) pEntry = (CACHEFILE_ENTRY *)((LPBYTE)pHeader + pHashEntry->dwOffsetEntry); URLCache_DeleteEntry(pHeader, pEntry); - URLCache_DeleteEntryFromHash(pHeader, urlA); + URLCache_DeleteEntryFromHash(pHashEntry); URLCacheContainer_UnlockIndex(pContainer, pHeader);

1 0