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

Andrew Eikum : mmdevapi: Don't free resources on PROCESS_DETACH.
by Alexandre Julliard 26 Mar '13

26 Mar '13

Module: wine Branch: master Commit: 1d3aac50a68469bc90cd4372ad0c279aaf5cb980 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d3aac50a68469bc90cd4372a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Mar 25 14:46:38 2013 -0500 mmdevapi: Don't free resources on PROCESS_DETACH. --- dlls/mmdevapi/main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index e19f27d..447813f 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -176,6 +176,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) DisableThreadLibraryCalls(hinstDLL); break; case DLL_PROCESS_DETACH: + if(lpvReserved) + break; MMDevEnum_Free(); break; }

1 0

Andrew Eikum : winmm: Shutdown the devices thread when all devices are closed.
by Alexandre Julliard 26 Mar '13

26 Mar '13

Module: wine Branch: master Commit: 2d76befbddc798f02812fe48a12ab2b80d25181b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d76befbddc798f02812fe48a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Mar 25 14:46:41 2013 -0500 winmm: Shutdown the devices thread when all devices are closed. --- dlls/winmm/waveform.c | 190 ++++++++++++++++++++++++++++-------------------- 1 files changed, 111 insertions(+), 79 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2d76befbddc798f02812f…

1 0

Ken Thomases : winemac: Specify import and export functions explicitly in builtin_format_names[].
by Alexandre Julliard 26 Mar '13

26 Mar '13

Module: wine Branch: master Commit: 36343f520bde568efff79b9f7ce2066f99874fa1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36343f520bde568efff79b9f7… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Mar 26 00:47:58 2013 -0500 winemac: Specify import and export functions explicitly in builtin_format_names[]. --- dlls/winemac.drv/clipboard.c | 30 +++++++++++++++++++----------- 1 files changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 21d332d..81b4c34 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -197,15 +197,17 @@ static const WCHAR wszPNG[] = {'P','N','G',0}; static const WCHAR wszHTMLFormat[] = {'H','T','M','L',' ','F','o','r','m','a','t',0}; static const struct { - LPCWSTR name; - CFStringRef type; + LPCWSTR name; + CFStringRef type; + DRVIMPORTFUNC import; + DRVEXPORTFUNC export; } builtin_format_names[] = { - { wszRichTextFormat, CFSTR("public.rtf") }, - { wszGIF, CFSTR("com.compuserve.gif") }, - { wszJFIF, CFSTR("public.jpeg") }, - { wszPNG, CFSTR("public.png") }, - { wszHTMLFormat, CFSTR("public.html") }, + { wszRichTextFormat, CFSTR("public.rtf"), import_clipboard_data, export_clipboard_data }, + { wszGIF, CFSTR("com.compuserve.gif"), import_clipboard_data, export_clipboard_data }, + { wszJFIF, CFSTR("public.jpeg"), import_clipboard_data, export_clipboard_data }, + { wszPNG, CFSTR("public.png"), import_clipboard_data, export_clipboard_data }, + { wszHTMLFormat, CFSTR("public.html"), import_clipboard_data, export_clipboard_data }, }; /* The prefix prepended to an external Mac pasteboard type to make a Win32 clipboard format name. org.winehq.mac-type. */ @@ -1755,12 +1757,11 @@ BOOL CDECL macdrv_SetClipboardData(UINT format_id, HANDLE data, BOOL owner) void macdrv_clipboard_process_attach(void) { UINT i; + WINE_CLIPFORMAT *format; /* Register built-in formats */ for (i = 0; i < sizeof(builtin_format_ids)/sizeof(builtin_format_ids[0]); i++) { - WINE_CLIPFORMAT *format; - if (!(format = HeapAlloc(GetProcessHeap(), 0, sizeof(*format)))) break; format->format_id = builtin_format_ids[i].id; format->type = CFRetain(builtin_format_ids[i].type); @@ -1772,8 +1773,15 @@ void macdrv_clipboard_process_attach(void) /* Register known mappings between Windows formats and Mac types */ for (i = 0; i < sizeof(builtin_format_names)/sizeof(builtin_format_names[0]); i++) - insert_clipboard_format(RegisterClipboardFormatW(builtin_format_names[i].name), - builtin_format_names[i].type); + { + if (!(format = HeapAlloc(GetProcessHeap(), 0, sizeof(*format)))) break; + format->format_id = RegisterClipboardFormatW(builtin_format_names[i].name); + format->type = CFRetain(builtin_format_names[i].type); + format->import_func = builtin_format_names[i].import; + format->export_func = builtin_format_names[i].export; + format->synthesized = FALSE; + list_add_tail(&format_list, &format->entry); + } }

1 0

Ken Thomases : winemac: Support CFSTR_SHELLURLW (UniformResourceLocator) clipboard format, mapped to public.url.
by Alexandre Julliard 26 Mar '13

26 Mar '13

Module: wine Branch: master Commit: 678f08690495fad734d4e43bed92e8ca35715fd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=678f08690495fad734d4e43be… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Mar 26 00:48:02 2013 -0500 winemac: Support CFSTR_SHELLURLW (UniformResourceLocator) clipboard format, mapped to public.url. --- dlls/winemac.drv/clipboard.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 81b4c34..6dfb2a2 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -208,6 +208,7 @@ static const struct { wszJFIF, CFSTR("public.jpeg"), import_clipboard_data, export_clipboard_data }, { wszPNG, CFSTR("public.png"), import_clipboard_data, export_clipboard_data }, { wszHTMLFormat, CFSTR("public.html"), import_clipboard_data, export_clipboard_data }, + { CFSTR_SHELLURLW, CFSTR("public.url"), import_utf8_to_text, export_text_to_utf8 }, }; /* The prefix prepended to an external Mac pasteboard type to make a Win32 clipboard format name. org.winehq.mac-type. */

1 0

Piotr Caban : wininet: Rename HASH_CACHEFILE_ENTRY to entry_hash_table.
by Alexandre Julliard 26 Mar '13

26 Mar '13

Module: wine Branch: master Commit: d7ab4d74fecfc10b7a07b20ebb43d1a4418e3ce6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7ab4d74fecfc10b7a07b20eb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 26 09:52:29 2013 +0100 wininet: Rename HASH_CACHEFILE_ENTRY to entry_hash_table. --- dlls/wininet/urlcache.c | 208 +++++++++++++++++++++++----------------------- 1 files changed, 104 insertions(+), 104 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d7ab4d74fecfc10b7a07b…

1 0

Piotr Caban : wininet: Rename URLCACHE_HEADER to urlcache_header.
by Alexandre Julliard 26 Mar '13

26 Mar '13

Module: wine Branch: master Commit: 39daf43ce388393f02fda2fb732a99b9de4e4dec URL: http://source.winehq.org/git/wine.git/?a=commit;h=39daf43ce388393f02fda2fb7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 26 09:52:40 2013 +0100 wininet: Rename URLCACHE_HEADER to urlcache_header. --- dlls/wininet/urlcache.c | 259 +++++++++++++++++++++++------------------------ 1 files changed, 128 insertions(+), 131 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=39daf43ce388393f02fda…

1 0

Piotr Caban : wininet: Rename STREAM_HANDLE to stream_handle.
by Alexandre Julliard 26 Mar '13

26 Mar '13

Module: wine Branch: master Commit: db9d650342a42d69a26f7ae91e7033d81657d044 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db9d650342a42d69a26f7ae91… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 26 09:52:52 2013 +0100 wininet: Rename STREAM_HANDLE to stream_handle. --- dlls/wininet/urlcache.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index d8da402..a6197db 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -178,11 +178,11 @@ typedef struct BYTE allocation_table[ALLOCATION_TABLE_SIZE]; } urlcache_header; -typedef struct _STREAM_HANDLE +typedef struct { - HANDLE hFile; - CHAR lpszUrl[1]; -} STREAM_HANDLE; + HANDLE file; + CHAR url[1]; +} stream_handle; typedef struct _URLCACHECONTAINER { @@ -3455,7 +3455,7 @@ BOOL WINAPI ReadUrlCacheEntryStream( ) { /* Get handle to file from 'stream' */ - STREAM_HANDLE * pStream = (STREAM_HANDLE *)hUrlCacheStream; + stream_handle *pStream = (stream_handle*)hUrlCacheStream; if (dwReserved != 0) { @@ -3464,15 +3464,15 @@ BOOL WINAPI ReadUrlCacheEntryStream( return FALSE; } - if (IsBadReadPtr(pStream, sizeof(*pStream)) || IsBadStringPtrA(pStream->lpszUrl, INTERNET_MAX_URL_LENGTH)) + if (IsBadReadPtr(pStream, sizeof(*pStream)) || IsBadStringPtrA(pStream->url, INTERNET_MAX_URL_LENGTH)) { SetLastError(ERROR_INVALID_HANDLE); return FALSE; } - if (SetFilePointer(pStream->hFile, dwLocation, NULL, FILE_CURRENT) == INVALID_SET_FILE_POINTER) + if (SetFilePointer(pStream->file, dwLocation, NULL, FILE_CURRENT) == INVALID_SET_FILE_POINTER) return FALSE; - return ReadFile(pStream->hFile, lpBuffer, *lpdwLen, lpdwLen, NULL); + return ReadFile(pStream->file, lpBuffer, *lpdwLen, lpdwLen, NULL); } /*********************************************************************** @@ -3493,7 +3493,7 @@ HANDLE WINAPI RetrieveUrlCacheEntryStreamA( * on this behaviour. (Native version appears to allocate * indices into a table) */ - STREAM_HANDLE * pStream; + stream_handle *pStream; HANDLE hFile; TRACE( "(%s, %p, %p, %x, 0x%08x)\n", debugstr_a(lpszUrlName), lpCacheEntryInfo, @@ -3518,7 +3518,7 @@ HANDLE WINAPI RetrieveUrlCacheEntryStreamA( return FALSE; /* allocate handle storage space */ - pStream = heap_alloc(sizeof(STREAM_HANDLE) + strlen(lpszUrlName) * sizeof(CHAR)); + pStream = heap_alloc(sizeof(stream_handle) + strlen(lpszUrlName) * sizeof(CHAR)); if (!pStream) { CloseHandle(hFile); @@ -3526,8 +3526,8 @@ HANDLE WINAPI RetrieveUrlCacheEntryStreamA( return FALSE; } - pStream->hFile = hFile; - strcpy(pStream->lpszUrl, lpszUrlName); + pStream->file = hFile; + strcpy(pStream->url, lpszUrlName); return pStream; } @@ -3551,7 +3551,7 @@ HANDLE WINAPI RetrieveUrlCacheEntryStreamW( * on this behaviour. (Native version appears to allocate * indices into a table) */ - STREAM_HANDLE * pStream; + stream_handle *pStream; HANDLE hFile; TRACE( "(%s, %p, %p, %x, 0x%08x)\n", debugstr_w(lpszUrlName), lpCacheEntryInfo, @@ -3576,7 +3576,7 @@ HANDLE WINAPI RetrieveUrlCacheEntryStreamW( return FALSE; /* allocate handle storage space */ - size = sizeof(STREAM_HANDLE); + size = sizeof(stream_handle); url_len = WideCharToMultiByte(CP_ACP, 0, lpszUrlName, -1, NULL, 0, NULL, NULL); size += url_len; pStream = heap_alloc(size); @@ -3587,8 +3587,8 @@ HANDLE WINAPI RetrieveUrlCacheEntryStreamW( return FALSE; } - pStream->hFile = hFile; - WideCharToMultiByte(CP_ACP, 0, lpszUrlName, -1, pStream->lpszUrl, url_len, NULL, NULL); + pStream->file = hFile; + WideCharToMultiByte(CP_ACP, 0, lpszUrlName, -1, pStream->url, url_len, NULL, NULL); return pStream; } @@ -3601,7 +3601,7 @@ BOOL WINAPI UnlockUrlCacheEntryStream( IN DWORD dwReserved ) { - STREAM_HANDLE * pStream = (STREAM_HANDLE *)hUrlCacheStream; + stream_handle *pStream = (stream_handle*)hUrlCacheStream; if (dwReserved != 0) { @@ -3610,16 +3610,16 @@ BOOL WINAPI UnlockUrlCacheEntryStream( return FALSE; } - if (IsBadReadPtr(pStream, sizeof(*pStream)) || IsBadStringPtrA(pStream->lpszUrl, INTERNET_MAX_URL_LENGTH)) + if (IsBadReadPtr(pStream, sizeof(*pStream)) || IsBadStringPtrA(pStream->url, INTERNET_MAX_URL_LENGTH)) { SetLastError(ERROR_INVALID_HANDLE); return FALSE; } - if (!UnlockUrlCacheEntryFileA(pStream->lpszUrl, 0)) + if (!UnlockUrlCacheEntryFileA(pStream->url, 0)) return FALSE; - CloseHandle(pStream->hFile); + CloseHandle(pStream->file); heap_free(pStream); return TRUE; }

1 0

Piotr Caban : wininet: Rename URLCACHECONTAINER to cache_container.
by Alexandre Julliard 26 Mar '13

26 Mar '13

Module: wine Branch: master Commit: 299739d07f648088db8d52527e529b53a133d283 URL: http://source.winehq.org/git/wine.git/?a=commit;h=299739d07f648088db8d52527… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 26 09:53:03 2013 +0100 wininet: Rename URLCACHECONTAINER to cache_container. --- dlls/wininet/urlcache.c | 160 +++++++++++++++++++++++----------------------- 1 files changed, 80 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=299739d07f648088db8d5…

1 0

Piotr Caban : wininet: Rename URLCacheFindEntryHandle to find_handle.
by Alexandre Julliard 26 Mar '13

26 Mar '13

Module: wine Branch: master Commit: 33725537c1ce2cd34b253506eab972414573e9c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33725537c1ce2cd34b253506e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 26 09:53:13 2013 +0100 wininet: Rename URLCacheFindEntryHandle to find_handle. --- dlls/wininet/urlcache.c | 79 +++++++++++++++++++++++------------------------ 1 files changed, 39 insertions(+), 40 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 188d77c..1c54a7f 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -100,6 +100,8 @@ static const char urlcache_ver[] = "0.2012001"; #define DWORD_ALIGN(x) ( (DWORD)(((DWORD)(x)+sizeof(DWORD)-1)/sizeof(DWORD))*sizeof(DWORD) ) +#define URLCACHE_FIND_ENTRY_HANDLE_MAGIC 0xF389ABCD + typedef struct { DWORD signature; @@ -195,6 +197,14 @@ typedef struct DWORD default_entry_type; } cache_container; +typedef struct +{ + DWORD magic; + LPWSTR url_search_pattern; + DWORD container_idx; + DWORD hash_table_idx; + DWORD hash_entry_idx; +} find_handle; /* List of all containers available */ static struct list UrlContainers = LIST_INIT(UrlContainers); @@ -3839,17 +3849,6 @@ HANDLE WINAPI FindFirstUrlCacheEntryExW( return NULL; } -#define URLCACHE_FIND_ENTRY_HANDLE_MAGIC 0xF389ABCD - -typedef struct URLCacheFindEntryHandle -{ - DWORD dwMagic; - LPWSTR lpszUrlSearchPattern; - DWORD dwContainerIndex; - DWORD dwHashTableIndex; - DWORD dwHashEntryIndex; -} URLCacheFindEntryHandle; - /*********************************************************************** * FindFirstUrlCacheEntryA (WININET.@) * @@ -3857,7 +3856,7 @@ typedef struct URLCacheFindEntryHandle INTERNETAPI HANDLE WINAPI FindFirstUrlCacheEntryA(LPCSTR lpszUrlSearchPattern, LPINTERNET_CACHE_ENTRY_INFOA lpFirstCacheEntryInfo, LPDWORD lpdwFirstCacheEntryInfoBufferSize) { - URLCacheFindEntryHandle *pEntryHandle; + find_handle *pEntryHandle; TRACE("(%s, %p, %p)\n", debugstr_a(lpszUrlSearchPattern), lpFirstCacheEntryInfo, lpdwFirstCacheEntryInfoBufferSize); @@ -3865,21 +3864,21 @@ INTERNETAPI HANDLE WINAPI FindFirstUrlCacheEntryA(LPCSTR lpszUrlSearchPattern, if (!pEntryHandle) return NULL; - pEntryHandle->dwMagic = URLCACHE_FIND_ENTRY_HANDLE_MAGIC; + pEntryHandle->magic = URLCACHE_FIND_ENTRY_HANDLE_MAGIC; if (lpszUrlSearchPattern) { - pEntryHandle->lpszUrlSearchPattern = heap_strdupAtoW(lpszUrlSearchPattern); - if (!pEntryHandle->lpszUrlSearchPattern) + pEntryHandle->url_search_pattern = heap_strdupAtoW(lpszUrlSearchPattern); + if (!pEntryHandle->url_search_pattern) { heap_free(pEntryHandle); return NULL; } } else - pEntryHandle->lpszUrlSearchPattern = NULL; - pEntryHandle->dwContainerIndex = 0; - pEntryHandle->dwHashTableIndex = 0; - pEntryHandle->dwHashEntryIndex = 0; + pEntryHandle->url_search_pattern = NULL; + pEntryHandle->container_idx = 0; + pEntryHandle->hash_table_idx = 0; + pEntryHandle->hash_entry_idx = 0; if (!FindNextUrlCacheEntryA(pEntryHandle, lpFirstCacheEntryInfo, lpdwFirstCacheEntryInfoBufferSize)) { @@ -3896,7 +3895,7 @@ INTERNETAPI HANDLE WINAPI FindFirstUrlCacheEntryA(LPCSTR lpszUrlSearchPattern, INTERNETAPI HANDLE WINAPI FindFirstUrlCacheEntryW(LPCWSTR lpszUrlSearchPattern, LPINTERNET_CACHE_ENTRY_INFOW lpFirstCacheEntryInfo, LPDWORD lpdwFirstCacheEntryInfoBufferSize) { - URLCacheFindEntryHandle *pEntryHandle; + find_handle *pEntryHandle; TRACE("(%s, %p, %p)\n", debugstr_w(lpszUrlSearchPattern), lpFirstCacheEntryInfo, lpdwFirstCacheEntryInfoBufferSize); @@ -3904,21 +3903,21 @@ INTERNETAPI HANDLE WINAPI FindFirstUrlCacheEntryW(LPCWSTR lpszUrlSearchPattern, if (!pEntryHandle) return NULL; - pEntryHandle->dwMagic = URLCACHE_FIND_ENTRY_HANDLE_MAGIC; + pEntryHandle->magic = URLCACHE_FIND_ENTRY_HANDLE_MAGIC; if (lpszUrlSearchPattern) { - pEntryHandle->lpszUrlSearchPattern = heap_strdupW(lpszUrlSearchPattern); - if (!pEntryHandle->lpszUrlSearchPattern) + pEntryHandle->url_search_pattern = heap_strdupW(lpszUrlSearchPattern); + if (!pEntryHandle->url_search_pattern) { heap_free(pEntryHandle); return NULL; } } else - pEntryHandle->lpszUrlSearchPattern = NULL; - pEntryHandle->dwContainerIndex = 0; - pEntryHandle->dwHashTableIndex = 0; - pEntryHandle->dwHashEntryIndex = 0; + pEntryHandle->url_search_pattern = NULL; + pEntryHandle->container_idx = 0; + pEntryHandle->hash_table_idx = 0; + pEntryHandle->hash_entry_idx = 0; if (!FindNextUrlCacheEntryW(pEntryHandle, lpFirstCacheEntryInfo, lpdwFirstCacheEntryInfoBufferSize)) { @@ -3934,17 +3933,17 @@ static BOOL FindNextUrlCacheEntryInternal( LPDWORD lpdwNextCacheEntryInfoBufferSize, BOOL unicode) { - URLCacheFindEntryHandle *pEntryHandle = (URLCacheFindEntryHandle *)hEnumHandle; + find_handle *pEntryHandle = (find_handle*)hEnumHandle; cache_container *pContainer; - if (pEntryHandle->dwMagic != URLCACHE_FIND_ENTRY_HANDLE_MAGIC) + if (pEntryHandle->magic != URLCACHE_FIND_ENTRY_HANDLE_MAGIC) { SetLastError(ERROR_INVALID_HANDLE); return FALSE; } - for (; URLCacheContainers_Enum(pEntryHandle->lpszUrlSearchPattern, pEntryHandle->dwContainerIndex, &pContainer); - pEntryHandle->dwContainerIndex++, pEntryHandle->dwHashTableIndex = 0) + for (; URLCacheContainers_Enum(pEntryHandle->url_search_pattern, pEntryHandle->container_idx, &pContainer); + pEntryHandle->container_idx++, pEntryHandle->hash_table_idx = 0) { urlcache_header *pHeader; entry_hash_table *pHashTableEntry; @@ -3960,12 +3959,12 @@ static BOOL FindNextUrlCacheEntryInternal( if (!(pHeader = cache_container_lock_index(pContainer))) return FALSE; - for (; URLCache_EnumHashTables(pHeader, &pEntryHandle->dwHashTableIndex, &pHashTableEntry); - pEntryHandle->dwHashTableIndex++, pEntryHandle->dwHashEntryIndex = 0) + for (; URLCache_EnumHashTables(pHeader, &pEntryHandle->hash_table_idx, &pHashTableEntry); + pEntryHandle->hash_table_idx++, pEntryHandle->hash_entry_idx = 0) { const struct hash_entry *pHashEntry = NULL; - for (; URLCache_EnumHashTableEntries(pHeader, pHashTableEntry, &pEntryHandle->dwHashEntryIndex, &pHashEntry); - pEntryHandle->dwHashEntryIndex++) + for (; URLCache_EnumHashTableEntries(pHeader, pHashTableEntry, &pEntryHandle->hash_entry_idx, &pHashEntry); + pEntryHandle->hash_entry_idx++) { const entry_url *pUrlEntry; const entry_header *pEntry = (const entry_header*)((LPBYTE)pHeader + pHashEntry->offset); @@ -3998,7 +3997,7 @@ static BOOL FindNextUrlCacheEntryInternal( /* increment the current index so that next time the function * is called the next entry is returned */ - pEntryHandle->dwHashEntryIndex++; + pEntryHandle->hash_entry_idx++; cache_container_unlock_index(pContainer, pHeader); return TRUE; } @@ -4046,18 +4045,18 @@ BOOL WINAPI FindNextUrlCacheEntryW( */ BOOL WINAPI FindCloseUrlCache(HANDLE hEnumHandle) { - URLCacheFindEntryHandle *pEntryHandle = (URLCacheFindEntryHandle *)hEnumHandle; + find_handle *pEntryHandle = (find_handle*)hEnumHandle; TRACE("(%p)\n", hEnumHandle); - if (!pEntryHandle || pEntryHandle->dwMagic != URLCACHE_FIND_ENTRY_HANDLE_MAGIC) + if (!pEntryHandle || pEntryHandle->magic != URLCACHE_FIND_ENTRY_HANDLE_MAGIC) { SetLastError(ERROR_INVALID_HANDLE); return FALSE; } - pEntryHandle->dwMagic = 0; - heap_free(pEntryHandle->lpszUrlSearchPattern); + pEntryHandle->magic = 0; + heap_free(pEntryHandle->url_search_pattern); heap_free(pEntryHandle); return TRUE; }

1 0

Piotr Caban : wininet: Rename URLCache_* functions to urlcache_*.
by Alexandre Julliard 26 Mar '13

26 Mar '13

Module: wine Branch: master Commit: 4e624561ca809ca90b88cf29f203dcfe567a98cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e624561ca809ca90b88cf29f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 26 09:53:23 2013 +0100 wininet: Rename URLCache_* functions to urlcache_*. --- dlls/wininet/urlcache.c | 296 +++++++++++++++++++++++------------------------ 1 files changed, 144 insertions(+), 152 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4e624561ca809ca90b88c…

1 0