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

Piotr Caban : msvcp: Match parameters list and architecture with function we're forwarding to.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: 78ea6a75929970db9664fcd4416f8f46550d8762 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78ea6a75929970db9664fcd44… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 26 10:00:00 2013 +0100 msvcp: Match parameters list and architecture with function we're forwarding to. --- dlls/msvcp60/msvcp60.spec | 18 ++++---- dlls/msvcp70/msvcp70.spec | 90 ++++++++++++++++++++++---------------------- 2 files changed, 54 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=78ea6a75929970db9664f…

1 0

Piotr Caban : wininet: Rename URLCacheContainers_* functions to cache_containers_*.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: 21b84e7ac94fea09fc6c4e33ed0310d125445515 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21b84e7ac94fea09fc6c4e33e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 26 09:53:37 2013 +0100 wininet: Rename URLCacheContainers_* functions to cache_containers_*. --- dlls/wininet/urlcache.c | 50 +++++++++++++++++++++++----------------------- 1 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 117eb9c..3ae6a16 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -531,7 +531,7 @@ static void cache_container_close_index(cache_container *pContainer) pContainer->mapping = NULL; } -static BOOL URLCacheContainers_AddContainer(LPCWSTR cache_prefix, +static BOOL cache_containers_add(LPCWSTR cache_prefix, LPCWSTR path, DWORD default_entry_type, LPWSTR mutex_name) { cache_container *pContainer = heap_alloc(sizeof(cache_container)); @@ -590,7 +590,7 @@ static void cache_container_delete_container(cache_container *pContainer) heap_free(pContainer); } -static void URLCacheContainers_CreateDefaults(void) +static void cache_containers_init(void) { static const WCHAR UrlSuffix[] = {'C','o','n','t','e','n','t','.','I','E','5',0}; static const WCHAR UrlPrefix[] = {0}; @@ -644,12 +644,12 @@ static void URLCacheContainers_CreateDefaults(void) wszCachePath[path_len + suffix_len + 2] = '\0'; } - URLCacheContainers_AddContainer(DefaultContainerData[i].cache_prefix, wszCachePath, + cache_containers_add(DefaultContainerData[i].cache_prefix, wszCachePath, DefaultContainerData[i].default_entry_type, wszMutexName); } } -static void URLCacheContainers_DeleteAll(void) +static void cache_containers_free(void) { while(!list_empty(&UrlContainers)) cache_container_delete_container( @@ -657,7 +657,7 @@ static void URLCacheContainers_DeleteAll(void) ); } -static DWORD URLCacheContainers_FindContainerW(LPCWSTR lpwszUrl, cache_container **ppContainer) +static DWORD cache_containers_findW(LPCWSTR lpwszUrl, cache_container **ppContainer) { cache_container *pContainer; @@ -680,7 +680,7 @@ static DWORD URLCacheContainers_FindContainerW(LPCWSTR lpwszUrl, cache_container return ERROR_FILE_NOT_FOUND; } -static DWORD URLCacheContainers_FindContainerA(LPCSTR lpszUrl, cache_container **ppContainer) +static DWORD cache_containers_findA(LPCSTR lpszUrl, cache_container **ppContainer) { LPWSTR url = NULL; DWORD ret; @@ -688,12 +688,12 @@ static DWORD URLCacheContainers_FindContainerA(LPCSTR lpszUrl, cache_container * if (lpszUrl && !(url = heap_strdupAtoW(lpszUrl))) return ERROR_OUTOFMEMORY; - ret = URLCacheContainers_FindContainerW(url, ppContainer); + ret = cache_containers_findW(url, ppContainer); heap_free(url); return ret; } -static BOOL URLCacheContainers_Enum(LPCWSTR lpwszSearchPattern, DWORD dwIndex, cache_container **ppContainer) +static BOOL cache_containers_enum(LPCWSTR lpwszSearchPattern, DWORD dwIndex, cache_container **ppContainer) { DWORD i = 0; cache_container *pContainer; @@ -1768,7 +1768,7 @@ BOOL WINAPI GetUrlCacheEntryInfoExA( if (dwFlags & ~GET_INSTALLED_ENTRY) FIXME("ignoring unsupported flags: %x\n", dwFlags); - error = URLCacheContainers_FindContainerA(lpszUrl, &pContainer); + error = cache_containers_findA(lpszUrl, &pContainer); if (error != ERROR_SUCCESS) { SetLastError(error); @@ -1911,7 +1911,7 @@ BOOL WINAPI GetUrlCacheEntryInfoExW( if (dwFlags) FIXME("ignoring unsupported flags: %x\n", dwFlags); - error = URLCacheContainers_FindContainerW(lpszUrl, &pContainer); + error = cache_containers_findW(lpszUrl, &pContainer); if (error != ERROR_SUCCESS) { SetLastError(error); @@ -1994,7 +1994,7 @@ BOOL WINAPI SetUrlCacheEntryInfoA( TRACE("(%s, %p, 0x%08x)\n", debugstr_a(lpszUrlName), lpCacheEntryInfo, dwFieldControl); - error = URLCacheContainers_FindContainerA(lpszUrlName, &pContainer); + error = cache_containers_findA(lpszUrlName, &pContainer); if (error != ERROR_SUCCESS) { SetLastError(error); @@ -2051,7 +2051,7 @@ BOOL WINAPI SetUrlCacheEntryInfoW(LPCWSTR lpszUrl, LPINTERNET_CACHE_ENTRY_INFOW TRACE("(%s, %p, 0x%08x)\n", debugstr_w(lpszUrl), lpCacheEntryInfo, dwFieldControl); - error = URLCacheContainers_FindContainerW(lpszUrl, &pContainer); + error = cache_containers_findW(lpszUrl, &pContainer); if (error != ERROR_SUCCESS) { SetLastError(error); @@ -2126,7 +2126,7 @@ BOOL WINAPI RetrieveUrlCacheEntryFileA( return FALSE; } - error = URLCacheContainers_FindContainerA(lpszUrlName, &pContainer); + error = cache_containers_findA(lpszUrlName, &pContainer); if (error != ERROR_SUCCESS) { SetLastError(error); @@ -2224,7 +2224,7 @@ BOOL WINAPI RetrieveUrlCacheEntryFileW( return FALSE; } - error = URLCacheContainers_FindContainerW(lpszUrlName, &pContainer); + error = cache_containers_findW(lpszUrlName, &pContainer); if (error != ERROR_SUCCESS) { SetLastError(error); @@ -2660,7 +2660,7 @@ BOOL WINAPI UnlockUrlCacheEntryFileA( return FALSE; } - error = URLCacheContainers_FindContainerA(lpszUrlName, &pContainer); + error = cache_containers_findA(lpszUrlName, &pContainer); if (error != ERROR_SUCCESS) { SetLastError(error); @@ -2736,7 +2736,7 @@ BOOL WINAPI UnlockUrlCacheEntryFileW( LPCWSTR lpszUrlName, DWORD dwReserved ) return FALSE; } - error = URLCacheContainers_FindContainerW(lpszUrlName, &pContainer); + error = cache_containers_findW(lpszUrlName, &pContainer); if (error != ERROR_SUCCESS) { SetLastError(error); @@ -2929,7 +2929,7 @@ BOOL WINAPI CreateUrlCacheEntryW( szFile[0] = 0; } - error = URLCacheContainers_FindContainerW(lpszUrlName, &pContainer); + error = cache_containers_findW(lpszUrlName, &pContainer); if (error != ERROR_SUCCESS) { SetLastError(error); @@ -3117,7 +3117,7 @@ static BOOL urlcache_entry_commit( file_size.u.LowPart = file_attr.nFileSizeLow; file_size.u.HighPart = file_attr.nFileSizeHigh; - error = URLCacheContainers_FindContainerW(lpszUrlName, &pContainer); + error = cache_containers_findW(lpszUrlName, &pContainer); if (error != ERROR_SUCCESS) { SetLastError(error); @@ -3641,7 +3641,7 @@ BOOL WINAPI DeleteUrlCacheEntryA(LPCSTR lpszUrlName) TRACE("(%s)\n", debugstr_a(lpszUrlName)); - error = URLCacheContainers_FindContainerA(lpszUrlName, &pContainer); + error = cache_containers_findA(lpszUrlName, &pContainer); if (error != ERROR_SUCCESS) { SetLastError(error); @@ -3695,7 +3695,7 @@ BOOL WINAPI DeleteUrlCacheEntryW(LPCWSTR lpszUrlName) return FALSE; } - error = URLCacheContainers_FindContainerW(lpszUrlName, &pContainer); + error = cache_containers_findW(lpszUrlName, &pContainer); if (error != ERROR_SUCCESS) { heap_free(urlA); @@ -3934,7 +3934,7 @@ static BOOL urlcache_find_next_entry( return FALSE; } - for (; URLCacheContainers_Enum(pEntryHandle->url_search_pattern, pEntryHandle->container_idx, &pContainer); + for (; cache_containers_enum(pEntryHandle->url_search_pattern, pEntryHandle->container_idx, &pContainer); pEntryHandle->container_idx++, pEntryHandle->hash_table_idx = 0) { urlcache_header *pHeader; @@ -4284,7 +4284,7 @@ BOOL WINAPI IsUrlCacheEntryExpiredA( LPCSTR url, DWORD dwFlags, FILETIME* pftLas FIXME("unknown flags 0x%08x\n", dwFlags); /* Any error implies that the URL is expired, i.e. not in the cache */ - if (URLCacheContainers_FindContainerA(url, &pContainer)) + if (cache_containers_findA(url, &pContainer)) { memset(pftLastModified, 0, sizeof(*pftLastModified)); return TRUE; @@ -4352,7 +4352,7 @@ BOOL WINAPI IsUrlCacheEntryExpiredW( LPCWSTR url, DWORD dwFlags, FILETIME* pftLa FIXME("unknown flags 0x%08x\n", dwFlags); /* Any error implies that the URL is expired, i.e. not in the cache */ - if (URLCacheContainers_FindContainerW(url, &pContainer)) + if (cache_containers_findW(url, &pContainer)) { memset(pftLastModified, 0, sizeof(*pftLastModified)); return TRUE; @@ -4468,7 +4468,7 @@ BOOL init_urlcache(void) return FALSE; } - URLCacheContainers_CreateDefaults(); + cache_containers_init(); return TRUE; } @@ -4480,7 +4480,7 @@ void free_urlcache(void) CloseHandle(free_cache_running); CloseHandle(dll_unload_event); - URLCacheContainers_DeleteAll(); + cache_containers_free(); } /***********************************************************************

1 0

Piotr Caban : wininet: Rename URLCache_* functions to urlcache_*.
by Alexandre Julliard March 26, 2013

March 26, 2013

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

Piotr Caban : wininet: Rename URLCacheFindEntryHandle to find_handle.
by Alexandre Julliard March 26, 2013

March 26, 2013

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 HASH_CACHEFILE_ENTRY to entry_hash_table.
by Alexandre Julliard March 26, 2013

March 26, 2013

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

Andrew Eikum : winmm: Shutdown the devices thread when all devices are closed.
by Alexandre Julliard March 26, 2013

March 26, 2013

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

Nikolay Sivov : hlink: Implement IHlinkBrowseContext_GetHlink().
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: ba40bbfcbf41d1e7f96e96493334f7ba75a696c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba40bbfcbf41d1e7f96e96493… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 25 17:44:31 2013 +0400 hlink: Implement IHlinkBrowseContext_GetHlink(). --- dlls/hlink/browse_ctx.c | 41 ++++++++++++++++++++++++++++++++--------- dlls/hlink/tests/browse_ctx.c | 7 +++++++ 2 files changed, 39 insertions(+), 9 deletions(-) diff --git a/dlls/hlink/browse_ctx.c b/dlls/hlink/browse_ctx.c index 0bfc061..48a20cb 100644 --- a/dlls/hlink/browse_ctx.c +++ b/dlls/hlink/browse_ctx.c @@ -234,20 +234,43 @@ static HRESULT WINAPI IHlinkBC_QueryHlink( IHlinkBrowseContext* iface, return E_NOTIMPL; } -static HRESULT WINAPI IHlinkBC_GetHlink( IHlinkBrowseContext* iface, - ULONG uHLID, IHlink** ppihl) +static HRESULT WINAPI IHlinkBC_GetHlink(IHlinkBrowseContext* iface, ULONG hlid, IHlink **ret) { - HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); + HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); + struct link_entry *link; + struct list *entry; - TRACE("(%p)->(%x %p)\n", This, uHLID, ppihl); + TRACE("(%p)->(0x%x %p)\n", This, hlid, ret); - if(uHLID != HLID_CURRENT) { - FIXME("Only HLID_CURRENT implemented, given: %x\n", uHLID); - return E_NOTIMPL; + switch (hlid) + { + case HLID_PREVIOUS: + entry = list_prev(&This->links, &This->current->entry); + break; + case HLID_NEXT: + entry = list_next(&This->links, &This->current->entry); + break; + case HLID_CURRENT: + entry = &This->current->entry; + break; + case HLID_STACKBOTTOM: + entry = list_tail(&This->links); + break; + case HLID_STACKTOP: + entry = list_head(&This->links); + break; + default: + WARN("unknown id 0x%x\n", hlid); + entry = NULL; } - *ppihl = This->current->link; - IHlink_AddRef(*ppihl); + if (!entry) + return E_FAIL; + + link = LIST_ENTRY(entry, struct link_entry, entry); + + *ret = link->link; + IHlink_AddRef(*ret); return S_OK; } diff --git a/dlls/hlink/tests/browse_ctx.c b/dlls/hlink/tests/browse_ctx.c index df801ab..40d132b 100644 --- a/dlls/hlink/tests/browse_ctx.c +++ b/dlls/hlink/tests/browse_ctx.c @@ -56,6 +56,13 @@ static void test_SetInitialHlink(void) hres = IHlinkBrowseContext_SetInitialHlink(bc, dummy, five, NULL); ok(hres == CO_E_ALREADYINITIALIZED, "got 0x%08x\n", hres); + /* there's only one */ + hres = IHlinkBrowseContext_GetHlink(bc, HLID_PREVIOUS, &found_hlink); + ok(hres == E_FAIL, "got 0x%08x\n", hres); + + hres = IHlinkBrowseContext_GetHlink(bc, HLID_NEXT, &found_hlink); + ok(hres == E_FAIL, "got 0x%08x\n", hres); + hres = IHlinkBrowseContext_GetHlink(bc, HLID_CURRENT, &found_hlink); ok(hres == S_OK, "GetHlink failed: 0x%08x\n", hres);

1 0

Piotr Caban : wininet: Rename URLCACHE_HEADER to urlcache_header.
by Alexandre Julliard March 26, 2013

March 26, 2013

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 : msvcp80: Fixed typo in spec file.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: cd8571af529fad961e1cfd6a22d2884b9f8caa28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd8571af529fad961e1cfd6a2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 26 09:59:10 2013 +0100 msvcp80: Fixed typo in spec file. --- dlls/msvcp80/msvcp80.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index 9d34087..e9a5b6a 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -3739,7 +3739,7 @@ @ cdecl -arch=win32 ?eq_int_type@?$char_traits(a)_W@std@@SA_NABG0(a)Z(ptr ptr) msvcp90.?eq_int_type@?$char_traits(a)_W@std@@SA_NABG0(a)Z @ cdecl -arch=win64 ?eq_int_type@?$char_traits(a)_W@std@@SA_NAEBG0(a)Z(ptr ptr) msvcp90.?eq_int_type@?$char_traits(a)_W@std@@SA_NAEBG0(a)Z @ thiscall -arch=win32 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V32@0(a)Z(ptr ptr ptr ptr ptr ptr) msvcp90.?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)0@Z -@ cdecl -arch=win64 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V32@0(a)Z(ptr ptr ptr ptr) msvcp90.?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V32@0(a)Z +@ cdecl -arch=win64 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V32@0(a)Z(ptr ptr ptr ptr) msvcp90.?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)0@Z @ thiscall -arch=win32 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V32@@Z(ptr ptr ptr ptr) msvcp90.?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2@@Z @ cdecl -arch=win64 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V32@@Z(ptr ptr ptr) msvcp90.?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2@@Z @ thiscall -arch=win32 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)II@Z(ptr long long) msvcp90.?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)II@Z

1 0

Nikolay Sivov : hlink: Add link stack to browser context.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: a083415dbca079152013a4341e5e3c11417b4a3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a083415dbca079152013a4341… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 23 22:29:07 2013 +0400 hlink: Add link stack to browser context. --- dlls/hlink/browse_ctx.c | 59 ++++++++++++++++++++++++++++------------ dlls/hlink/tests/browse_ctx.c | 6 ++++ 2 files changed, 47 insertions(+), 18 deletions(-) diff --git a/dlls/hlink/browse_ctx.c b/dlls/hlink/browse_ctx.c index 0995493..0bfc061 100644 --- a/dlls/hlink/browse_ctx.c +++ b/dlls/hlink/browse_ctx.c @@ -21,15 +21,23 @@ #include "hlink_private.h" #include "wine/debug.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(hlink); +struct link_entry +{ + struct list entry; + IHlink *link; +}; + typedef struct { IHlinkBrowseContext IHlinkBrowseContext_iface; LONG ref; HLBWINFO* BrowseWindowInfo; - IHlink* CurrentPage; + struct link_entry *current; + struct list links; } HlinkBCImpl; static inline HlinkBCImpl *impl_from_IHlinkBrowseContext(IHlinkBrowseContext *iface) @@ -68,18 +76,26 @@ static ULONG WINAPI IHlinkBC_fnAddRef (IHlinkBrowseContext* iface) static ULONG WINAPI IHlinkBC_fnRelease (IHlinkBrowseContext* iface) { HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); - ULONG refCount = InterlockedDecrement(&This->ref); + ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(count=%u)\n", This, refCount + 1); - if (refCount) - return refCount; + TRACE("(%p)->(count=%u)\n", This, ref + 1); - TRACE("-- destroying IHlinkBrowseContext (%p)\n", This); - heap_free(This->BrowseWindowInfo); - if (This->CurrentPage) - IHlink_Release(This->CurrentPage); - heap_free(This); - return 0; + if (!ref) + { + struct link_entry *link, *link2; + + LIST_FOR_EACH_ENTRY_SAFE(link, link2, &This->links, struct link_entry, entry) + { + list_remove(&link->entry); + IHlink_Release(link->link); + heap_free(link); + } + + heap_free(This->BrowseWindowInfo); + heap_free(This); + } + + return ref; } static HRESULT WINAPI IHlinkBC_Register(IHlinkBrowseContext* iface, @@ -165,17 +181,22 @@ static HRESULT WINAPI IHlinkBC_GetBrowseWindowInfo(IHlinkBrowseContext* iface, static HRESULT WINAPI IHlinkBC_SetInitialHlink(IHlinkBrowseContext* iface, IMoniker *pimkTarget, LPCWSTR pwzLocation, LPCWSTR pwzFriendlyName) { - HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); + HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); + struct link_entry *link; + + TRACE("(%p)->(%p %s %s)\n", This, pimkTarget, debugstr_w(pwzLocation), debugstr_w(pwzFriendlyName)); - FIXME("(%p)->(%p %s %s)\n", This, pimkTarget, - debugstr_w(pwzLocation), debugstr_w(pwzFriendlyName)); + if (!list_empty(&This->links)) + return CO_E_ALREADYINITIALIZED; - if (This->CurrentPage) - IHlink_Release(This->CurrentPage); + link = heap_alloc(sizeof(struct link_entry)); + if (!link) return E_OUTOFMEMORY; HlinkCreateFromMoniker(pimkTarget, pwzLocation, pwzFriendlyName, NULL, - 0, NULL, &IID_IHlink, (LPVOID*) &This->CurrentPage); + 0, NULL, &IID_IHlink, (void**)&link->link); + list_add_head(&This->links, &link->entry); + This->current = LIST_ENTRY(list_head(&This->links), struct link_entry, entry); return S_OK; } @@ -225,7 +246,7 @@ static HRESULT WINAPI IHlinkBC_GetHlink( IHlinkBrowseContext* iface, return E_NOTIMPL; } - *ppihl = This->CurrentPage; + *ppihl = This->current->link; IHlink_AddRef(*ppihl); return S_OK; @@ -289,6 +310,8 @@ HRESULT HLinkBrowseContext_Constructor(IUnknown *pUnkOuter, REFIID riid, void ** hl->ref = 1; hl->IHlinkBrowseContext_iface.lpVtbl = &hlvt; + list_init(&hl->links); + hl->current = NULL; *ppv = hl; return S_OK; diff --git a/dlls/hlink/tests/browse_ctx.c b/dlls/hlink/tests/browse_ctx.c index e9293d1..df801ab 100644 --- a/dlls/hlink/tests/browse_ctx.c +++ b/dlls/hlink/tests/browse_ctx.c @@ -50,6 +50,12 @@ static void test_SetInitialHlink(void) hres = IHlinkBrowseContext_SetInitialHlink(bc, dummy, one, NULL); ok(hres == S_OK, "SetInitialHlink failed: 0x%08x\n", hres); + hres = IHlinkBrowseContext_SetInitialHlink(bc, dummy, one, NULL); + ok(hres == CO_E_ALREADYINITIALIZED, "got 0x%08x\n", hres); + + hres = IHlinkBrowseContext_SetInitialHlink(bc, dummy, five, NULL); + ok(hres == CO_E_ALREADYINITIALIZED, "got 0x%08x\n", hres); + hres = IHlinkBrowseContext_GetHlink(bc, HLID_CURRENT, &found_hlink); ok(hres == S_OK, "GetHlink failed: 0x%08x\n", hres);

1 0