October 2007 - Wine-Commits

Juan Lang : wininet: Implement DeleteUrlCacheEntryW.
by Alexandre Julliard Oct. 22, 2007

Oct. 22, 2007

Module: wine Branch: master Commit: c527c7611a169986d65d3f14c31009e6ce690c36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c527c7611a169986d65d3f14c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 19 10:22:43 2007 -0700 wininet: Implement DeleteUrlCacheEntryW. --- dlls/wininet/urlcache.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 49 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 4d0ceab..9887994 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2528,7 +2528,55 @@ BOOL WINAPI DeleteUrlCacheEntryA(LPCSTR lpszUrlName) */ BOOL WINAPI DeleteUrlCacheEntryW(LPCWSTR lpszUrlName) { - FIXME("(%s) stub\n", debugstr_w(lpszUrlName)); + URLCACHECONTAINER * pContainer; + LPURLCACHE_HEADER pHeader; + CACHEFILE_ENTRY * pEntry; + LPSTR urlA; + int url_len; + + TRACE("(%s)\n", debugstr_w(lpszUrlName)); + + url_len = WideCharToMultiByte(CP_ACP, 0, lpszUrlName, -1, NULL, 0, NULL, NULL); + urlA = HeapAlloc(GetProcessHeap(), 0, url_len * sizeof(CHAR)); + if (!urlA) + { + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + WideCharToMultiByte(CP_ACP, 0, lpszUrlName, -1, urlA, url_len, NULL, NULL); + + if (!URLCacheContainers_FindContainerW(lpszUrlName, &pContainer)) + { + HeapFree(GetProcessHeap(), 0, urlA); + return FALSE; + } + if (!URLCacheContainer_OpenIndex(pContainer)) + { + HeapFree(GetProcessHeap(), 0, urlA); + return FALSE; + } + if (!(pHeader = URLCacheContainer_LockIndex(pContainer))) + { + HeapFree(GetProcessHeap(), 0, urlA); + return FALSE; + } + + if (!URLCache_FindEntryInHash(pHeader, urlA, &pEntry)) + { + URLCacheContainer_UnlockIndex(pContainer, pHeader); + TRACE("entry %s not found!\n", debugstr_a(urlA)); + HeapFree(GetProcessHeap(), 0, urlA); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; + } + + URLCache_DeleteEntry(pHeader, pEntry); + + URLCache_DeleteEntryFromHash(pHeader, urlA); + + URLCacheContainer_UnlockIndex(pContainer, pHeader); + + HeapFree(GetProcessHeap(), 0, urlA); return TRUE; }

1 0

Juan Lang : wininet: Implement IsUrlCacheEntryExpiredW.
by Alexandre Julliard Oct. 22, 2007

Oct. 22, 2007

Module: wine Branch: master Commit: d1559158615aed8e4e6048023dce89d9fe1e28c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1559158615aed8e4e6048023… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 19 10:22:15 2007 -0700 wininet: Implement IsUrlCacheEntryExpiredW. --- dlls/wininet/urlcache.c | 41 +++++++++++++++++++++++++++++++++++++++-- 1 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index a3c23ef..4d0ceab 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2933,6 +2933,43 @@ BOOL WINAPI IsUrlCacheEntryExpiredA( LPCSTR url, DWORD dwFlags, FILETIME* pftLas */ BOOL WINAPI IsUrlCacheEntryExpiredW( LPCWSTR url, DWORD dwFlags, FILETIME* pftLastModified ) { - FIXME("(%s, %08x, %p) stub\n", debugstr_w(url), dwFlags, pftLastModified); - return FALSE; + LPURLCACHE_HEADER pHeader; + CACHEFILE_ENTRY * pEntry; + URL_CACHEFILE_ENTRY * pUrlEntry; + URLCACHECONTAINER * pContainer; + + TRACE("(%s, %08x, %p)\n", debugstr_w(url), dwFlags, pftLastModified); + + if (!URLCacheContainers_FindContainerW(url, &pContainer)) + return FALSE; + + if (!URLCacheContainer_OpenIndex(pContainer)) + return FALSE; + + if (!(pHeader = URLCacheContainer_LockIndex(pContainer))) + return FALSE; + + if (!URLCache_FindEntryInHashW(pHeader, url, &pEntry)) + { + URLCacheContainer_UnlockIndex(pContainer, pHeader); + TRACE("entry %s not found!\n", debugstr_w(url)); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; + } + + 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; + + DosDateTimeToFileTime(pUrlEntry->wExpiredDate, pUrlEntry->wExpiredTime, pftLastModified); + + URLCacheContainer_UnlockIndex(pContainer, pHeader); + + return TRUE; }

1 0

Juan Lang : wininet: Add a URLCache_FindEntryInHashW helper, and use it to simplify finding an entry in a hash with a wide-character URL string .
by Alexandre Julliard Oct. 22, 2007

Oct. 22, 2007

Module: wine Branch: master Commit: 6fdec3d501af6ae02be1f671d3d8b86d8d6aa914 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fdec3d501af6ae02be1f671d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 19 10:21:40 2007 -0700 wininet: Add a URLCache_FindEntryInHashW helper, and use it to simplify finding an entry in a hash with a wide-character URL string. --- dlls/wininet/urlcache.c | 84 ++++++++++++++++++++--------------------------- 1 files changed, 36 insertions(+), 48 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index a3bf05f..a3c23ef 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1186,6 +1186,38 @@ static BOOL URLCache_FindEntryInHash(LPCURLCACHE_HEADER pHeader, LPCSTR lpszUrl, } /*********************************************************************** + * URLCache_FindEntryInHashW (Internal) + * + * Searches all the hash tables in the index for the given URL and + * returns the entry, if it was found, in ppEntry + * + * RETURNS + * TRUE if the entry was found + * FALSE if the entry could not be found + * + */ +static BOOL URLCache_FindEntryInHashW(LPCURLCACHE_HEADER pHeader, LPCWSTR lpszUrl, CACHEFILE_ENTRY ** ppEntry) +{ + struct _HASH_ENTRY * pHashEntry; + LPSTR urlA; + int url_len; + BOOL ret; + + url_len = WideCharToMultiByte(CP_ACP, 0, lpszUrl, -1, NULL, 0, NULL, NULL); + urlA = HeapAlloc(GetProcessHeap(), 0, url_len * sizeof(CHAR)); + if (!urlA) + { + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + WideCharToMultiByte(CP_ACP, 0, lpszUrl, -1, urlA, url_len, NULL, NULL); + if ((ret = URLCache_FindHash(pHeader, urlA, &pHashEntry))) + *ppEntry = (CACHEFILE_ENTRY *)((LPBYTE)pHeader + pHashEntry->dwOffsetEntry); + HeapFree(GetProcessHeap(), 0, urlA); + return ret; +} + +/*********************************************************************** * URLCache_HashEntrySetUse (Internal) * * Searches all the hash tables in the index for the given URL and @@ -1432,47 +1464,25 @@ BOOL WINAPI GetUrlCacheEntryInfoW(LPCWSTR lpszUrl, CACHEFILE_ENTRY * pEntry; URL_CACHEFILE_ENTRY * pUrlEntry; URLCACHECONTAINER * pContainer; - LPSTR lpszUrlA; - int url_len; TRACE("(%s, %p, %p)\n", debugstr_w(lpszUrl), lpCacheEntryInfo, lpdwCacheEntryInfoBufferSize); - url_len = WideCharToMultiByte(CP_ACP, 0, lpszUrl, -1, NULL, 0, NULL, NULL); - lpszUrlA = HeapAlloc(GetProcessHeap(), 0, url_len * sizeof(CHAR)); - if (!lpszUrlA) - { - SetLastError(ERROR_OUTOFMEMORY); - return FALSE; - } - WideCharToMultiByte(CP_ACP, 0, lpszUrl, -1, lpszUrlA, url_len, NULL, NULL); - if (!URLCacheContainers_FindContainerW(lpszUrl, &pContainer)) - { - HeapFree(GetProcessHeap(), 0, lpszUrlA); return FALSE; - } if (!URLCacheContainer_OpenIndex(pContainer)) - { - HeapFree(GetProcessHeap(), 0, lpszUrlA); return FALSE; - } if (!(pHeader = URLCacheContainer_LockIndex(pContainer))) - { - HeapFree(GetProcessHeap(), 0, lpszUrlA); return FALSE; - } - if (!URLCache_FindEntryInHash(pHeader, lpszUrlA, &pEntry)) + if (!URLCache_FindEntryInHashW(pHeader, lpszUrl, &pEntry)) { URLCacheContainer_UnlockIndex(pContainer, pHeader); - WARN("entry %s not found!\n", debugstr_a(lpszUrlA)); - HeapFree(GetProcessHeap(), 0, lpszUrlA); + WARN("entry %s not found!\n", debugstr_w(lpszUrl)); SetLastError(ERROR_FILE_NOT_FOUND); return FALSE; } - HeapFree(GetProcessHeap(), 0, lpszUrlA); if (pEntry->dwSignature != URL_SIGNATURE) { @@ -1596,47 +1606,25 @@ BOOL WINAPI SetUrlCacheEntryInfoW(LPCWSTR lpszUrl, LPINTERNET_CACHE_ENTRY_INFOW LPURLCACHE_HEADER pHeader; CACHEFILE_ENTRY * pEntry; URLCACHECONTAINER * pContainer; - LPSTR lpszUrlA; - int url_len; TRACE("(%s, %p, 0x%08x)\n", debugstr_w(lpszUrl), lpCacheEntryInfo, dwFieldControl); - url_len = WideCharToMultiByte(CP_ACP, 0, lpszUrl, -1, NULL, 0, NULL, NULL); - lpszUrlA = HeapAlloc(GetProcessHeap(), 0, url_len * sizeof(CHAR)); - if (!lpszUrlA) - { - SetLastError(ERROR_OUTOFMEMORY); - return FALSE; - } - WideCharToMultiByte(CP_ACP, 0, lpszUrl, -1, lpszUrlA, url_len, NULL, NULL); - if (!URLCacheContainers_FindContainerW(lpszUrl, &pContainer)) - { - HeapFree(GetProcessHeap(), 0, lpszUrlA); return FALSE; - } if (!URLCacheContainer_OpenIndex(pContainer)) - { - HeapFree(GetProcessHeap(), 0, lpszUrlA); return FALSE; - } if (!(pHeader = URLCacheContainer_LockIndex(pContainer))) - { - HeapFree(GetProcessHeap(), 0, lpszUrlA); return FALSE; - } - if (!URLCache_FindEntryInHash(pHeader, lpszUrlA, &pEntry)) + if (!URLCache_FindEntryInHashW(pHeader, lpszUrl, &pEntry)) { URLCacheContainer_UnlockIndex(pContainer, pHeader); - HeapFree(GetProcessHeap(), 0, lpszUrlA); - WARN("entry %s not found!\n", debugstr_a(lpszUrlA)); + WARN("entry %s not found!\n", debugstr_w(lpszUrl)); SetLastError(ERROR_FILE_NOT_FOUND); return FALSE; } - HeapFree(GetProcessHeap(), 0, lpszUrlA); if (pEntry->dwSignature != URL_SIGNATURE) {

1 0

Juan Lang : wininet: Implement IsUrlCacheEntryExpiredA.
by Alexandre Julliard Oct. 22, 2007

Oct. 22, 2007

Module: wine Branch: master Commit: 1594b429f85e3682b402eab49ee7576e58da3dd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1594b429f85e3682b402eab49… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 19 10:20:25 2007 -0700 wininet: Implement IsUrlCacheEntryExpiredA. --- dlls/wininet/urlcache.c | 41 +++++++++++++++++++++++++++++++++++++++-- 1 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index b531c65..a3bf05f 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2894,8 +2894,45 @@ DWORD WINAPI DeleteIE3Cache(HWND hWnd, HINSTANCE hInst, LPSTR lpszCmdLine, int n */ BOOL WINAPI IsUrlCacheEntryExpiredA( LPCSTR url, DWORD dwFlags, FILETIME* pftLastModified ) { - FIXME("(%s, %08x, %p) stub\n", debugstr_a(url), dwFlags, pftLastModified); - return FALSE; + LPURLCACHE_HEADER pHeader; + CACHEFILE_ENTRY * pEntry; + URL_CACHEFILE_ENTRY * pUrlEntry; + URLCACHECONTAINER * pContainer; + + TRACE("(%s, %08x, %p)\n", debugstr_a(url), dwFlags, pftLastModified); + + if (!URLCacheContainers_FindContainerA(url, &pContainer)) + return FALSE; + + if (!URLCacheContainer_OpenIndex(pContainer)) + return FALSE; + + if (!(pHeader = URLCacheContainer_LockIndex(pContainer))) + return FALSE; + + if (!URLCache_FindEntryInHash(pHeader, url, &pEntry)) + { + URLCacheContainer_UnlockIndex(pContainer, pHeader); + TRACE("entry %s not found!\n", url); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; + } + + 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; + + DosDateTimeToFileTime(pUrlEntry->wExpiredDate, pUrlEntry->wExpiredTime, pftLastModified); + + URLCacheContainer_UnlockIndex(pContainer, pHeader); + + return TRUE; } /***********************************************************************

1 0

Rob Shearman : server: Fix file_set_sd to handle NULL DACLs.
by Alexandre Julliard Oct. 22, 2007

Oct. 22, 2007

Module: wine Branch: master Commit: 8d6093e6248baab1228e92272b3de15a8a6d29f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d6093e6248baab1228e92272… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Oct 20 16:21:05 2007 +0100 server: Fix file_set_sd to handle NULL DACLs. These mean that the file should have full permissions for everyone. --- server/file.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/server/file.c b/server/file.c index 7a62b64..b5f6a87 100644 --- a/server/file.c +++ b/server/file.c @@ -435,9 +435,10 @@ static int file_set_sd( struct object *obj, const struct security_descriptor *sd if (set_info & DACL_SECURITY_INFORMATION) { - if (sd->control & SE_DACL_PRESENT) + int present; + const ACL *dacl = sd_get_dacl( sd, &present ); + if (present && dacl) { - const ACL *dacl = (const ACL *)((char *)sd + sd->owner_len + sd->group_len + sd->sacl_len); const ACE_HEADER *ace = (const ACE_HEADER *)(dacl + 1); ULONG i; for (i = 0; i < dacl->AceCount; i++)

1 0

Juan Lang : wininet: Update comments to match function parameters.
by Alexandre Julliard Oct. 22, 2007

Oct. 22, 2007

Module: wine Branch: master Commit: a6c252c122e05f4dbf333dfa347f6c1978a66682 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6c252c122e05f4dbf333dfa3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 19 10:20:00 2007 -0700 wininet: Update comments to match function parameters. --- dlls/wininet/urlcache.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index d9db16f..b531c65 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2888,9 +2888,9 @@ DWORD WINAPI DeleteIE3Cache(HWND hWnd, HINSTANCE hInst, LPSTR lpszCmdLine, int n * IsUrlCacheEntryExpiredA (WININET.@) * * PARAMS - * url [I] Url - * dwFlags Unknown - * pftLastModified Unknown ptr + * url [I] Url + * dwFlags [I] Unknown + * pftLastModified [O] Last modified time */ BOOL WINAPI IsUrlCacheEntryExpiredA( LPCSTR url, DWORD dwFlags, FILETIME* pftLastModified ) { @@ -2902,9 +2902,9 @@ BOOL WINAPI IsUrlCacheEntryExpiredA( LPCSTR url, DWORD dwFlags, FILETIME* pftLas * IsUrlCacheEntryExpiredW (WININET.@) * * PARAMS - * url [I] Url - * dwFlags Unknown - * pftLastModified Unknown ptr + * url [I] Url + * dwFlags [I] Unknown + * pftLastModified [O] Last modified time */ BOOL WINAPI IsUrlCacheEntryExpiredW( LPCWSTR url, DWORD dwFlags, FILETIME* pftLastModified ) {

1 0

Louis Lenders : setupapi: Add stub for SetupInstallServicesFromInfSectionA.
by Alexandre Julliard Oct. 22, 2007

Oct. 22, 2007

Module: wine Branch: master Commit: 1c7891f86e419b64b8a55605d37e5f29d14bd078 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c7891f86e419b64b8a55605d… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sat Oct 20 15:23:01 2007 +0100 setupapi: Add stub for SetupInstallServicesFromInfSectionA. --- dlls/setupapi/install.c | 9 +++++++++ dlls/setupapi/setupapi.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index f11ace4..412b1fd 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -1065,3 +1065,12 @@ void WINAPI InstallHinfSectionA( HWND hwnd, HINSTANCE handle, LPCSTR cmdline, IN RtlFreeUnicodeString( &cmdlineW ); } } + +/*********************************************************************** + * SetupInstallServicesFromInfSectionA (SETUPAPI.@) + */ +BOOL WINAPI SetupInstallServicesFromInfSectionA( HINF Inf, PCSTR SectionName, DWORD Flags) +{ + FIXME("(%p, %s, %d) stub!\n", Inf, debugstr_a(SectionName), Flags); + return FALSE; +} diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 8f5d78c..7f64edf 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -442,7 +442,7 @@ @ stdcall SetupInstallFilesFromInfSectionW(long long long wstr wstr long) @ stdcall SetupInstallFromInfSectionA(long long str long long str long ptr ptr long ptr) @ stdcall SetupInstallFromInfSectionW(long long wstr long long wstr long ptr ptr long ptr) -@ stub SetupInstallServicesFromInfSectionA +@ stdcall SetupInstallServicesFromInfSectionA(long str long) @ stub SetupInstallServicesFromInfSectionExA @ stub SetupInstallServicesFromInfSectionExW @ stub SetupInstallServicesFromInfSectionW

1 0

Lionel Debroux : server: Remove redundant NULL checks before free ( found by Smatch).
by Alexandre Julliard Oct. 22, 2007

Oct. 22, 2007

Module: wine Branch: master Commit: 2f89fe7b37ebe63b285aa88f87f54b7995a9fa77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f89fe7b37ebe63b285aa88f8… Author: Lionel Debroux <lionel_debroux(a)yahoo.fr> Date: Sat Oct 20 09:35:13 2007 +0200 server: Remove redundant NULL checks before free (found by Smatch). --- server/console.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/console.c b/server/console.c index a94c881..61c4924 100644 --- a/server/console.c +++ b/server/console.c @@ -710,7 +710,7 @@ static int set_console_input_info( const struct set_console_input_info_request * console->history_index -= delta; for (i = 0; i < console->history_size; i++) - if (console->history[i]) free( console->history[i] ); + free( console->history[i] ); free( console->history ); console->history = mem; console->history_size = req->history_size; @@ -1033,7 +1033,7 @@ static void console_input_destroy( struct object *obj ) release_object( console_in->event ); for (i = 0; i < console_in->history_size; i++) - if (console_in->history[i]) free( console_in->history[i] ); + free( console_in->history[i] ); free( console_in->history ); }

1 0

Lionel Debroux : server: Remove redundant NULL checks before free ( found by Smatch).
by Alexandre Julliard Oct. 22, 2007

Oct. 22, 2007

Module: wine Branch: master Commit: e122f81337d6544fd512f5664b34fc6ad0ab94c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e122f81337d6544fd512f5664… Author: Lionel Debroux <lionel_debroux(a)yahoo.fr> Date: Sat Oct 20 09:37:43 2007 +0200 server: Remove redundant NULL checks before free (found by Smatch). --- server/registry.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/registry.c b/server/registry.c index ac740ef..03828e1 100644 --- a/server/registry.c +++ b/server/registry.c @@ -334,8 +334,8 @@ static void key_destroy( struct object *obj ) free( key->class ); for (i = 0; i <= key->last_value; i++) { - if (key->values[i].name) free( key->values[i].name ); - if (key->values[i].data) free( key->values[i].data ); + free( key->values[i].name ); + free( key->values[i].data ); } free( key->values ); for (i = 0; i <= key->last_subkey; i++)

1 0

Lionel Debroux : itss: Remove redundant NULL check before free ( found by Smatch).
by Alexandre Julliard Oct. 22, 2007

Oct. 22, 2007

Module: wine Branch: master Commit: 6bca5f6fa086a06ab2bd1846d21d4bcb2d55d491 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bca5f6fa086a06ab2bd1846d… Author: Lionel Debroux <lionel_debroux(a)yahoo.fr> Date: Sat Oct 20 09:32:38 2007 +0200 itss: Remove redundant NULL check before free (found by Smatch). --- dlls/itss/chm_lib.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/itss/chm_lib.c b/dlls/itss/chm_lib.c index 788ec54..67954ac 100644 --- a/dlls/itss/chm_lib.c +++ b/dlls/itss/chm_lib.c @@ -854,8 +854,7 @@ void chm_close(struct chmFile *h) int i; for (i=0; i<h->cache_num_blocks; i++) { - if (h->cache_blocks[i]) - HeapFree(GetProcessHeap(), 0, h->cache_blocks[i]); + HeapFree(GetProcessHeap(), 0, h->cache_blocks[i]); } HeapFree(GetProcessHeap(), 0, h->cache_blocks); h->cache_blocks = NULL;

1 0