March 2011 - Wine-commits - list.winehq.org

Nikolay Sivov : msvcrt: Add _get_output_format() and return default value.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 0512829a27b6401610545ed15ab6cbc83097070c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0512829a27b6401610545ed15… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 8 22:41:07 2011 +0300 msvcrt: Add _get_output_format() and return default value. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/misc.c | 9 +++++++++ dlls/msvcrt/msvcrt.h | 3 +++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/headers.c | 1 + dlls/msvcrt/tests/printf.c | 17 +++++++++++++++++ include/msvcrt/stdio.h | 4 ++++ 9 files changed, 38 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index d732d69..1570fd4 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -684,7 +684,7 @@ @ cdecl _get_heap_handle() msvcrt._get_heap_handle @ cdecl _get_invalid_parameter_handler() msvcrt._get_invalid_parameter_handler @ cdecl _get_osfhandle(long) msvcrt._get_osfhandle -@ stub _get_output_format +@ cdecl _get_output_format() msvcrt._get_output_format @ stub _get_pgmptr @ stub _get_printf_count_output @ stub _get_purecall_handler diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 1631fdb..65f9510 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -528,7 +528,7 @@ @ cdecl _get_osfhandle(long) msvcrt._get_osfhandle @ cdecl _get_osplatform(ptr) msvcrt._get_osplatform @ stub _get_osver -@ stub _get_output_format +@ cdecl _get_output_format() msvcrt._get_output_format @ stub _get_pgmptr @ stub _get_printf_count_output @ stub _get_purecall_handler diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 8148caf..badfe65 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -518,7 +518,7 @@ @ cdecl _get_heap_handle() msvcrt._get_heap_handle @ cdecl _get_invalid_parameter_handler() msvcrt._get_invalid_parameter_handler @ cdecl _get_osfhandle(long) msvcrt._get_osfhandle -@ stub _get_output_format +@ cdecl _get_output_format() msvcrt._get_output_format @ stub _get_pgmptr @ stub _get_printf_count_output @ stub _get_purecall_handler diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index d37fc72..b32fdb9 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -253,3 +253,12 @@ void CDECL MSVCRT_qsort_s(void *base, MSVCRT_size_t nmemb, MSVCRT_size_t size, MSVCRT_mergesort(base, secondarr, size, compar, 0, nmemb-1, context); MSVCRT_free(secondarr); } + +/********************************************************************* + * _get_output_format (MSVCRT.@) + * + */ +unsigned int CDECL _get_output_format(void) +{ + return 0; +} diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 1c7120f..311437a 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -769,6 +769,9 @@ typedef void (__cdecl *MSVCRT___sighandler_t)(int); #define MSVCRT__WRITE_ABORT_MSG 1 #define MSVCRT__CALL_REPORTFAULT 2 +/* _get_output_format return code */ +#define MSVCRT__TWO_DIGIT_EXPONENT 0x1 + void __cdecl MSVCRT_free(void*); void* __cdecl MSVCRT_malloc(MSVCRT_size_t); void* __cdecl MSVCRT_calloc(MSVCRT_size_t,MSVCRT_size_t); diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index f75c0d9..5d07736 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -473,7 +473,7 @@ @ cdecl _get_osfhandle(long) @ cdecl _get_osplatform(ptr) MSVCRT__get_osplatform # stub _get_osver -# stub _get_output_format +@ cdecl _get_output_format() # stub _get_pgmptr @ cdecl _get_sbh_threshold() # stub _get_wenviron diff --git a/dlls/msvcrt/tests/headers.c b/dlls/msvcrt/tests/headers.c index 25e2277..7c102b4 100644 --- a/dlls/msvcrt/tests/headers.c +++ b/dlls/msvcrt/tests/headers.c @@ -457,6 +457,7 @@ static void test_defines(void) CHECK_DEF(_UNDERFLOW); CHECK_DEF(_WRITE_ABORT_MSG); CHECK_DEF(_CALL_REPORTFAULT); + CHECK_DEF(_TWO_DIGIT_EXPONENT); } #endif /* __WINE_USE_MSVCRT */ diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index ddf4801..22ad1f6 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -43,6 +43,7 @@ static int (__cdecl *p__ecvt_s)(char *buffer, size_t length, double number, int ndigits, int *decpt, int *sign); static int (__cdecl *p__fcvt_s)(char *buffer, size_t length, double number, int ndigits, int *decpt, int *sign); +static unsigned int (__cdecl *p__get_output_format)(void); static void init( void ) { @@ -53,6 +54,7 @@ static void init( void ) p__vsnwprintf_s = (void *)GetProcAddress(hmod, "_vsnwprintf_s"); p__ecvt_s = (void *)GetProcAddress(hmod, "_ecvt_s"); p__fcvt_s = (void *)GetProcAddress(hmod, "_fcvt_s"); + p__get_output_format = (void *)GetProcAddress(hmod, "_get_output_format"); } static void test_sprintf( void ) @@ -1013,6 +1015,20 @@ static void test_vsnwprintf_s(void) ok( !wcscmp(out1, buffer), "buffer wrong, got=%s\n", wine_dbgstr_w(buffer)); } +static void test__get_output_format(void) +{ + unsigned int ret; + + if (!p__get_output_format) + { + win_skip("_get_output_format not available\n"); + return; + } + + ret = p__get_output_format(); + ok(ret == 0, "got %d\n", ret); +} + START_TEST(printf) { init(); @@ -1026,4 +1042,5 @@ START_TEST(printf) test_vscprintf(); test_vscwprintf(); test_vsnwprintf_s(); + test__get_output_format(); } diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index fa5290f..c167110 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -94,6 +94,9 @@ FILE* __cdecl __iob_func(void); #define stdout (_iob+STDOUT_FILENO) #define stderr (_iob+STDERR_FILENO) +/* return value for _get_output_format */ +#define _TWO_DIGIT_EXPONENT 0x1 + #ifndef _STDIO_DEFINED #define _STDIO_DEFINED int __cdecl _fcloseall(void); @@ -173,6 +176,7 @@ int __cdecl vprintf(const char*,__ms_va_list); int __cdecl vprintf_s(const char*,__ms_va_list); int __cdecl vsprintf(char*,const char*,__ms_va_list); int __cdecl vsprintf_s(char*,size_t,const char*,__ms_va_list); +unsigned int __cdecl _get_output_format(void); #ifndef _WSTDIO_DEFINED #define _WSTDIO_DEFINED

1 0

Vincent Povirk : gdiplus: Fix a handle leak in GdipDrawString.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: d0e6aa0204a5cd6c7d2f4696019f6f87897cf478 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0e6aa0204a5cd6c7d2f46960… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 8 16:59:19 2011 -0600 gdiplus: Fix a handle leak in GdipDrawString. --- dlls/gdiplus/graphics.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 43513c8..e9412c8 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4411,7 +4411,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string lfw.lfEscapement = lfw.lfOrientation = roundr((angle / M_PI) * 1800.0); gdifont = CreateFontIndirectW(&lfw); - DeleteObject(SelectObject(graphics->hdc, CreateFontIndirectW(&lfw))); + DeleteObject(SelectObject(graphics->hdc, gdifont)); if (!format || format->align == StringAlignmentNear) {

1 0

Thomas Mullaly : mshtml/tests: Fixed memory leak and made Vtbl's const.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: a33df48f36c0b34343d3c369de724dac0fceb943 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a33df48f36c0b34343d3c369d… Author: Thomas Mullaly <tmullaly(a)codeweavers.com> Date: Tue Mar 8 23:27:16 2011 -0500 mshtml/tests: Fixed memory leak and made Vtbl's const. --- dlls/mshtml/tests/events.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index bdb8460..a670532 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -1197,7 +1197,7 @@ static HRESULT WINAPI timeoutFunc_Invoke(IDispatchEx *iface, DISPID dispIdMember return S_OK; } -static IDispatchExVtbl timeoutFuncVtbl = { +static const IDispatchExVtbl timeoutFuncVtbl = { DispatchEx_QueryInterface, DispatchEx_AddRef, DispatchEx_Release, @@ -1231,7 +1231,7 @@ static HRESULT WINAPI div_onclick_disp_Invoke(IDispatchEx *iface, DISPID id, return S_OK; } -static IDispatchExVtbl div_onclick_dispVtbl = { +static const IDispatchExVtbl div_onclick_dispVtbl = { Dispatch_QueryInterface, DispatchEx_AddRef, DispatchEx_Release, @@ -2208,7 +2208,7 @@ static HRESULT WINAPI PropertyNotifySink_OnRequestEdit(IPropertyNotifySink *ifac return E_NOTIMPL; } -static IPropertyNotifySinkVtbl PropertyNotifySinkVtbl = { +static const IPropertyNotifySinkVtbl PropertyNotifySinkVtbl = { PropertyNotifySink_QueryInterface, PropertyNotifySink_AddRef, PropertyNotifySink_Release, @@ -2410,6 +2410,7 @@ static void test_empty_document(void) ok(hres == S_OK, "Unadvise failed: %08x\n", hres); IHTMLDocument2_Release(windows_doc); + IHTMLDocument2_Release(doc); } START_TEST(events)

1 0

Hans Leidekker : msi: Also register components without a key path.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: e292eb121ddc9da71e758bc41096fa497101e813 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e292eb121ddc9da71e758bc41… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 9 08:58:29 2011 +0100 msi: Also register components without a key path. --- dlls/msi/action.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index a003f5e..f58aaf2 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3266,15 +3266,10 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package) if (comp->ActionRequest == INSTALLSTATE_LOCAL || comp->ActionRequest == INSTALLSTATE_SOURCE) { - if (!comp->FullKeypath) - continue; - if (package->Context == MSIINSTALLCONTEXT_MACHINE) - rc = MSIREG_OpenUserDataComponentKey(comp->ComponentId, szLocalSid, - &hkey, TRUE); + rc = MSIREG_OpenUserDataComponentKey(comp->ComponentId, szLocalSid, &hkey, TRUE); else - rc = MSIREG_OpenUserDataComponentKey(comp->ComponentId, NULL, - &hkey, TRUE); + rc = MSIREG_OpenUserDataComponentKey(comp->ComponentId, NULL, &hkey, TRUE); if (rc != ERROR_SUCCESS) continue;

1 0

Hans Leidekker : msi: Build the key path from the display name if the component is an assembly.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 888a19c02c1c719faba704c00ab24ac11b0dd7d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=888a19c02c1c719faba704c00… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 9 08:58:46 2011 +0100 msi: Build the key path from the display name if the component is an assembly. --- dlls/msi/action.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index f58aaf2..7567f5d 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3252,7 +3252,19 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package) squash_guid(comp->ComponentId,squished_cc); msi_free(comp->FullKeypath); - comp->FullKeypath = resolve_keypath( package, comp ); + if (comp->assembly) + { + const WCHAR prefixW[] = {'<','\\',0}; + DWORD len = strlenW( prefixW ) + strlenW( comp->assembly->display_name ); + + comp->FullKeypath = msi_alloc( (len + 1) * sizeof(WCHAR) ); + if (comp->FullKeypath) + { + strcpyW( comp->FullKeypath, prefixW ); + strcatW( comp->FullKeypath, comp->assembly->display_name ); + } + } + else comp->FullKeypath = resolve_keypath( package, comp ); ACTION_RefCountComponent( package, comp );

1 0

Juan Lang : wininet: Account for disk space usage when deleting url cache entries.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: a0397541036f7cedd47cde5bb830e576c5c654b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0397541036f7cedd47cde5bb… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Mar 8 08:06:10 2011 -0800 wininet: Account for disk space usage when deleting url cache entries. --- dlls/wininet/urlcache.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index e888360..639e135 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2963,6 +2963,10 @@ BOOL WINAPI DeleteUrlCacheEntryA(LPCSTR lpszUrlName) if (pHeader->directory_data[pUrlEntry->CacheDir].dwNumFiles) pHeader->directory_data[pUrlEntry->CacheDir].dwNumFiles--; } + if (pUrlEntry->size.QuadPart < pHeader->CacheUsage.QuadPart) + pHeader->CacheUsage.QuadPart -= pUrlEntry->size.QuadPart; + else + pHeader->CacheUsage.QuadPart = 0; URLCache_DeleteEntry(pHeader, pEntry); @@ -3042,6 +3046,10 @@ BOOL WINAPI DeleteUrlCacheEntryW(LPCWSTR lpszUrlName) if (pHeader->directory_data[pUrlEntry->CacheDir].dwNumFiles) pHeader->directory_data[pUrlEntry->CacheDir].dwNumFiles--; } + if (pUrlEntry->size.QuadPart < pHeader->CacheUsage.QuadPart) + pHeader->CacheUsage.QuadPart -= pUrlEntry->size.QuadPart; + else + pHeader->CacheUsage.QuadPart = 0; URLCache_DeleteEntry(pHeader, pEntry);

1 0

Juan Lang : wininet: Set last access time when retrieving a URL cache entry .
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 47970d050464fc711e91a2ce8f46065a2099e836 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47970d050464fc711e91a2ce8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Mar 3 13:42:08 2011 -0800 wininet: Set last access time when retrieving a URL cache entry. --- dlls/wininet/urlcache.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 639e135..6ec08de 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1896,6 +1896,7 @@ BOOL WINAPI RetrieveUrlCacheEntryFileA( pUrlEntry->dwHitRate++; pUrlEntry->dwUseCount++; + GetSystemTimeAsFileTime(&pUrlEntry->LastAccessTime); URLCache_HashEntrySetUse(pHashEntry, pUrlEntry->dwUseCount); error = URLCache_CopyEntry(pContainer, pHeader, lpCacheEntryInfo, @@ -1992,6 +1993,7 @@ BOOL WINAPI RetrieveUrlCacheEntryFileW( pUrlEntry->dwHitRate++; pUrlEntry->dwUseCount++; + GetSystemTimeAsFileTime(&pUrlEntry->LastAccessTime); URLCache_HashEntrySetUse(pHashEntry, pUrlEntry->dwUseCount); error = URLCache_CopyEntry(

1 0

Juan Lang : wininet: Store headers in url cache entries.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 011b26b1c6c229ace4afb65d063563d7c13fa669 URL: http://source.winehq.org/git/wine.git/?a=commit;h=011b26b1c6c229ace4afb65d0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Mar 3 15:33:40 2011 -0800 wininet: Store headers in url cache entries. --- dlls/wininet/http.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 2fb2a2e..a0574bf 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1576,8 +1576,12 @@ static void HTTPREQ_Destroy(object_header_t *hdr) CloseHandle(request->hCacheFile); if(HTTP_GetRequestURL(request, url)) { + DWORD headersLen; + + headersLen = request->rawHeaders ? strlenW(request->rawHeaders) : 0; CommitUrlCacheEntryW(url, request->cacheFile, request->expires, - request->last_modified, NORMAL_CACHE_ENTRY, NULL, 0, NULL, 0); + request->last_modified, NORMAL_CACHE_ENTRY, + request->rawHeaders, headersLen, NULL, 0); } }

1 0

Juan Lang : wininet: Implement RetrieveUrlCacheEntryStreamW.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 9cd7545c00ecb46ebe0a0f9f5d2bc7829374a942 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cd7545c00ecb46ebe0a0f9f5… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Mar 4 12:08:38 2011 -0800 wininet: Implement RetrieveUrlCacheEntryStreamW. --- dlls/wininet/urlcache.c | 48 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 46 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 6ec08de..100a103 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2868,9 +2868,53 @@ HANDLE WINAPI RetrieveUrlCacheEntryStreamW( IN DWORD dwReserved ) { - FIXME( "(%s, %p, %p, %x, 0x%08x)\n", debugstr_w(lpszUrlName), lpCacheEntryInfo, + DWORD size; + int url_len; + /* NOTE: this is not the same as the way that the native + * version allocates 'stream' handles. I did it this way + * as it is much easier and no applications should depend + * on this behaviour. (Native version appears to allocate + * indices into a table) + */ + STREAM_HANDLE * pStream; + HANDLE hFile; + + TRACE( "(%s, %p, %p, %x, 0x%08x)\n", debugstr_w(lpszUrlName), lpCacheEntryInfo, lpdwCacheEntryInfoBufferSize, fRandomRead, dwReserved ); - return NULL; + + if (!RetrieveUrlCacheEntryFileW(lpszUrlName, + lpCacheEntryInfo, + lpdwCacheEntryInfoBufferSize, + dwReserved)) + { + return NULL; + } + + hFile = CreateFileW(lpCacheEntryInfo->lpszLocalFileName, + GENERIC_READ, + FILE_SHARE_READ, + NULL, + OPEN_EXISTING, + fRandomRead ? FILE_FLAG_RANDOM_ACCESS : 0, + NULL); + if (hFile == INVALID_HANDLE_VALUE) + return FALSE; + + /* allocate handle storage space */ + size = sizeof(STREAM_HANDLE); + url_len = WideCharToMultiByte(CP_ACP, 0, lpszUrlName, -1, NULL, 0, NULL, NULL); + size += url_len; + pStream = HeapAlloc(GetProcessHeap(), 0, size); + if (!pStream) + { + CloseHandle(hFile); + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + + pStream->hFile = hFile; + WideCharToMultiByte(CP_ACP, 0, lpszUrlName, -1, pStream->lpszUrl, url_len, NULL, NULL); + return pStream; } /***********************************************************************

1 0

Juan Lang : wininet: Implement FindNextUrlCacheEntryW.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: c4d628cb023b856629cda61f6bbb353bd6200ea8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4d628cb023b856629cda61f6… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Mar 7 11:22:43 2011 -0800 wininet: Implement FindNextUrlCacheEntryW. --- dlls/wininet/urlcache.c | 43 +++++++++++++++++++++++++++++-------------- 1 files changed, 29 insertions(+), 14 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 100a103..431288f 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -3304,19 +3304,15 @@ INTERNETAPI HANDLE WINAPI FindFirstUrlCacheEntryW(LPCWSTR lpszUrlSearchPattern, return pEntryHandle; } -/*********************************************************************** - * FindNextUrlCacheEntryA (WININET.@) - */ -BOOL WINAPI FindNextUrlCacheEntryA( +static BOOL FindNextUrlCacheEntryInternal( HANDLE hEnumHandle, LPINTERNET_CACHE_ENTRY_INFOA lpNextCacheEntryInfo, - LPDWORD lpdwNextCacheEntryInfoBufferSize) + LPDWORD lpdwNextCacheEntryInfoBufferSize, + BOOL unicode) { URLCacheFindEntryHandle *pEntryHandle = (URLCacheFindEntryHandle *)hEnumHandle; URLCACHECONTAINER * pContainer; - TRACE("(%p, %p, %p)\n", hEnumHandle, lpNextCacheEntryInfo, lpdwNextCacheEntryInfoBufferSize); - if (pEntryHandle->dwMagic != URLCACHE_FIND_ENTRY_HANDLE_MAGIC) { SetLastError(ERROR_INVALID_HANDLE); @@ -3354,8 +3350,10 @@ BOOL WINAPI FindNextUrlCacheEntryA( continue; pUrlEntry = (const URL_CACHEFILE_ENTRY *)pEntry; - TRACE("Found URL: %s\n", (LPCSTR)pUrlEntry + pUrlEntry->dwOffsetUrl); - TRACE("Header info: %s\n", (LPCSTR)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo); + TRACE("Found URL: %s\n", + debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetUrl)); + TRACE("Header info: %s\n", + debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo)); error = URLCache_CopyEntry( pContainer, @@ -3363,14 +3361,15 @@ BOOL WINAPI FindNextUrlCacheEntryA( lpNextCacheEntryInfo, lpdwNextCacheEntryInfoBufferSize, pUrlEntry, - FALSE /* not UNICODE */); + unicode); if (error != ERROR_SUCCESS) { URLCacheContainer_UnlockIndex(pContainer, pHeader); SetLastError(error); return FALSE; } - TRACE("Local File Name: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetLocalName)); + TRACE("Local File Name: %s\n", + debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetLocalName)); /* increment the current index so that next time the function * is called the next entry is returned */ @@ -3388,6 +3387,20 @@ BOOL WINAPI FindNextUrlCacheEntryA( } /*********************************************************************** + * FindNextUrlCacheEntryA (WININET.@) + */ +BOOL WINAPI FindNextUrlCacheEntryA( + HANDLE hEnumHandle, + LPINTERNET_CACHE_ENTRY_INFOA lpNextCacheEntryInfo, + LPDWORD lpdwNextCacheEntryInfoBufferSize) +{ + TRACE("(%p, %p, %p)\n", hEnumHandle, lpNextCacheEntryInfo, lpdwNextCacheEntryInfoBufferSize); + + return FindNextUrlCacheEntryInternal(hEnumHandle, lpNextCacheEntryInfo, + lpdwNextCacheEntryInfoBufferSize, FALSE /* not UNICODE */); +} + +/*********************************************************************** * FindNextUrlCacheEntryW (WININET.@) */ BOOL WINAPI FindNextUrlCacheEntryW( @@ -3396,9 +3409,11 @@ BOOL WINAPI FindNextUrlCacheEntryW( LPDWORD lpdwNextCacheEntryInfoBufferSize ) { - FIXME("(%p, %p, %p) stub\n", hEnumHandle, lpNextCacheEntryInfo, lpdwNextCacheEntryInfoBufferSize); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + TRACE("(%p, %p, %p)\n", hEnumHandle, lpNextCacheEntryInfo, lpdwNextCacheEntryInfoBufferSize); + + return FindNextUrlCacheEntryInternal(hEnumHandle, + (LPINTERNET_CACHE_ENTRY_INFOA)lpNextCacheEntryInfo, + lpdwNextCacheEntryInfoBufferSize, TRUE /* UNICODE */); } /***********************************************************************

1 0