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

Andrew Eikum : mmdevapi: Don't free resources on PROCESS_DETACH.
by Alexandre Julliard March 26, 2013

March 26, 2013

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

Piotr Caban : wininet: Rename STREAM_HANDLE to stream_handle.
by Alexandre Julliard March 26, 2013

March 26, 2013

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

Ken Thomases : winemac: Specify import and export functions explicitly in builtin_format_names[].
by Alexandre Julliard March 26, 2013

March 26, 2013

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

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

March 26, 2013

Module: wine Branch: master Commit: 4521044758af1804e70430f96c88c90cbc5d1238 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4521044758af1804e70430f96… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 25 17:50:32 2013 +0400 hlink: Implement IHlinkBrowseContext_UpdateHlink(). --- dlls/hlink/browse_ctx.c | 80 +++++++++++++++++++++++++++++----------------- 1 files changed, 50 insertions(+), 30 deletions(-) diff --git a/dlls/hlink/browse_ctx.c b/dlls/hlink/browse_ctx.c index 48a20cb..d09d59d 100644 --- a/dlls/hlink/browse_ctx.c +++ b/dlls/hlink/browse_ctx.c @@ -212,12 +212,56 @@ static HRESULT WINAPI IHlinkBC_OnNavigateHlink(IHlinkBrowseContext *iface, return S_OK; } +static struct link_entry *context_get_entry(HlinkBCImpl *ctxt, ULONG hlid) +{ + struct list *entry; + + switch (hlid) + { + case HLID_PREVIOUS: + entry = list_prev(&ctxt->links, &ctxt->current->entry); + break; + case HLID_NEXT: + entry = list_next(&ctxt->links, &ctxt->current->entry); + break; + case HLID_CURRENT: + entry = &ctxt->current->entry; + break; + case HLID_STACKBOTTOM: + entry = list_tail(&ctxt->links); + break; + case HLID_STACKTOP: + entry = list_head(&ctxt->links); + break; + default: + WARN("unknown id 0x%x\n", hlid); + entry = NULL; + } + + return entry ? LIST_ENTRY(entry, struct link_entry, entry) : NULL; +} + static HRESULT WINAPI IHlinkBC_UpdateHlink(IHlinkBrowseContext* iface, - ULONG uHLID, IMoniker* pimkTarget, LPCWSTR pwzLocation, - LPCWSTR pwzFriendlyName) + ULONG hlid, IMoniker *target, LPCWSTR location, LPCWSTR friendly_name) { - FIXME("\n"); - return E_NOTIMPL; + HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); + struct link_entry *entry = context_get_entry(This, hlid); + IHlink *link; + HRESULT hr; + + TRACE("(%p)->(0x%x %p %s %s)\n", This, hlid, target, debugstr_w(location), debugstr_w(friendly_name)); + + if (!entry) + return E_INVALIDARG; + + hr = HlinkCreateFromMoniker(target, location, friendly_name, NULL, 0, NULL, &IID_IHlink, (void**)&link); + if (FAILED(hr)) + return hr; + + IHlink_Release(entry->link); + entry->link = link; + + return S_OK; } static HRESULT WINAPI IHlinkBC_EnumNavigationStack( IHlinkBrowseContext *iface, @@ -238,37 +282,13 @@ static HRESULT WINAPI IHlinkBC_GetHlink(IHlinkBrowseContext* iface, ULONG hlid, { HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); struct link_entry *link; - struct list *entry; TRACE("(%p)->(0x%x %p)\n", This, hlid, ret); - 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; - } - - if (!entry) + link = context_get_entry(This, hlid); + if (!link) return E_FAIL; - link = LIST_ENTRY(entry, struct link_entry, entry); - *ret = link->link; IHlink_AddRef(*ret);

1 0

Jacek Caban : jscript: Use jsstr_flatten to access string buffer in jsutils .c.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: 96ace8cbcbb2887eb8e4aa0e2a80bf7244d5918a URL: http://source.winehq.org/git/wine.git/?a=commit;h=96ace8cbcbb2887eb8e4aa0e2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 26 10:38:01 2013 +0100 jscript: Use jsstr_flatten to access string buffer in jsutils.c. --- dlls/jscript/jsutils.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 60260bb..d141378 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -502,16 +502,15 @@ static int hex_to_int(WCHAR c) /* ECMA-262 3rd Edition 9.3.1 */ static HRESULT str_to_number(jsstr_t *str, double *ret) { - const WCHAR *ptr = str->str; + const WCHAR *ptr; BOOL neg = FALSE; DOUBLE d = 0.0; static const WCHAR infinityW[] = {'I','n','f','i','n','i','t','y'}; - if(!ptr) { - *ret = 0; - return S_OK; - } + ptr = jsstr_flatten(str); + if(!ptr) + return E_OUTOFMEMORY; while(isspaceW(*ptr)) ptr++;

1 0

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

Nikolay Sivov : xmllite: Partially implement value normalization for CDATA sections.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: 2bdaffd879439a04827a8ffae6496d76fefcbfdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bdaffd879439a04827a8ffae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 24 00:04:12 2013 +0400 xmllite: Partially implement value normalization for CDATA sections. --- dlls/xmllite/reader.c | 6 ++++++ dlls/xmllite/tests/reader.c | 19 +++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index e8f97f0..3d0b4a8 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1835,6 +1835,12 @@ static HRESULT reader_parse_cdata(xmlreader *reader) } else { + /* Value normalization is not fully implemented, rules are: + + - single '\r' -> '\n'; + - sequence '\r\n' -> '\n', in this case value length changes; + */ + if (*ptr == '\r') *ptr = '\n'; reader_skipn(reader, 1); ptr++; } diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 520ce71..fad3d41 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -771,6 +771,7 @@ struct test_entry { const char *value; HRESULT hr; HRESULT hr_broken; /* this is set to older version results */ + int todo : 1; }; static struct test_entry comment_tests[] = { @@ -1317,6 +1318,9 @@ static void test_readvaluechunk(void) static struct test_entry cdata_tests[] = { { "<a><![CDATA[ ]]data ]]></a>", "", " ]]data ", S_OK }, { "<a><![CDATA[<![CDATA[ data ]]]]></a>", "", "<![CDATA[ data ]]", S_OK }, + { "<a><![CDATA[\n \r\n \n\n ]]></a>", "", "\n \n \n\n ", S_OK, S_OK, 1 }, + { "<a><![CDATA[\r \r\r\n \n\n ]]></a>", "", "\n \n\n \n\n ", S_OK, S_OK, 1 }, + { "<a><![CDATA[\r\r \n\r \r \n\n ]]></a>", "", "\n\n \n\n \n \n\n ", S_OK }, { NULL } }; @@ -1383,9 +1387,20 @@ static void test_read_cdata(void) str = NULL; hr = IXmlReader_GetValue(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(len == strlen(test->value), "got %u\n", len); + str_exp = a2w(test->value); - ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + if (test->todo) + { + todo_wine { + ok(len == strlen(test->value), "got %u\n", len); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + } + } + else + { + ok(len == strlen(test->value), "got %u\n", len); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + } free_str(str_exp); }

1 0

Daniel Jelinski : wined3d: Add NVidia GeForce 315M.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: d8a86da66eae4245b529ac042d76179fdf221b93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8a86da66eae4245b529ac042… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sun Mar 17 16:57:49 2013 +0100 wined3d: Add NVidia GeForce 315M. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4093f7a..60a4b2d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1097,6 +1097,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX260, "NVIDIA GeForce GTX 260", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX275, "NVIDIA GeForce GTX 275", DRIVER_NVIDIA_GEFORCE6, 896 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX280, "NVIDIA GeForce GTX 280", DRIVER_NVIDIA_GEFORCE6, 1024}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_315M, "NVIDIA GeForce 315M", DRIVER_NVIDIA_GEFORCE6, 512 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_320M, "NVIDIA GeForce 320M", DRIVER_NVIDIA_GEFORCE6, 256}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT320M, "NVIDIA GeForce GT 320M", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT325M, "NVIDIA GeForce GT 325M", DRIVER_NVIDIA_GEFORCE6, 1024}, @@ -1559,6 +1560,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl {"GT 325M", CARD_NVIDIA_GEFORCE_GT325M}, /* Geforce 300 - midend mobile */ {"GT 320M", CARD_NVIDIA_GEFORCE_GT320M}, /* Geforce 300 - midend mobile */ {"320M", CARD_NVIDIA_GEFORCE_320M}, /* Geforce 300 - midend mobile */ + {"315M", CARD_NVIDIA_GEFORCE_315M}, /* Geforce 300 - midend mobile */ {"GTX 295", CARD_NVIDIA_GEFORCE_GTX280}, /* Geforce 200 - highend */ {"GTX 285", CARD_NVIDIA_GEFORCE_GTX280}, /* Geforce 200 - highend */ {"GTX 280", CARD_NVIDIA_GEFORCE_GTX280}, /* Geforce 200 - highend */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b81e018..e9a593d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1392,6 +1392,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX260 = 0x05e2, CARD_NVIDIA_GEFORCE_GTX275 = 0x05e6, CARD_NVIDIA_GEFORCE_GTX280 = 0x05e1, + CARD_NVIDIA_GEFORCE_315M = 0x0a7a, CARD_NVIDIA_GEFORCE_320M = 0x08a3, CARD_NVIDIA_GEFORCE_GT320M = 0x0a2d, CARD_NVIDIA_GEFORCE_GT325M = 0x0a35,

1 0

Nikolay Sivov : hlink: Remove useless initializers.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: 3e3027761c3de5654ea015dbc9bbaf90ac3f6cc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e3027761c3de5654ea015dbc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 23 21:53:14 2013 +0400 hlink: Remove useless initializers. --- dlls/hlink/browse_ctx.c | 2 +- dlls/hlink/extserv.c | 2 +- dlls/hlink/hlink_main.c | 15 ++++----------- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/dlls/hlink/browse_ctx.c b/dlls/hlink/browse_ctx.c index 4e91398..0995493 100644 --- a/dlls/hlink/browse_ctx.c +++ b/dlls/hlink/browse_ctx.c @@ -116,7 +116,7 @@ static HRESULT WINAPI IHlinkBC_GetObject(IHlinkBrowseContext* face, static HRESULT WINAPI IHlinkBC_Revoke(IHlinkBrowseContext* iface, DWORD dwRegister) { - HRESULT r = S_OK; + HRESULT r; IRunningObjectTable *ROT; HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); diff --git a/dlls/hlink/extserv.c b/dlls/hlink/extserv.c index 670bac2..3a97fa9 100644 --- a/dlls/hlink/extserv.c +++ b/dlls/hlink/extserv.c @@ -235,7 +235,7 @@ static ULONG WINAPI ExtServ_Release(IExtensionServices *iface) static HRESULT ExtServ_ImplSetAdditionalHeaders(ExtensionService* This, LPCWSTR pwzAdditionalHeaders) { - int len = 0; + int len; heap_free(This->headers); This->headers = NULL; diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index 1890fd5..5adbe9d 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -75,7 +75,7 @@ HRESULT WINAPI HlinkCreateFromMoniker( IMoniker *pimkTrgt, LPCWSTR pwzLocation, IUnknown* piunkOuter, REFIID riid, void** ppvObj) { IHlink *hl = NULL; - HRESULT r = S_OK; + HRESULT r; TRACE("%p %s %s %p %i %p %s %p\n", pimkTrgt, debugstr_w(pwzLocation), debugstr_w(pwzFriendlyName), pihlsite, dwSiteData, piunkOuter, @@ -107,7 +107,7 @@ HRESULT WINAPI HlinkCreateFromString( LPCWSTR pwzTarget, LPCWSTR pwzLocation, IUnknown* piunkOuter, REFIID riid, void** ppvObj) { IHlink *hl = NULL; - HRESULT r = S_OK; + HRESULT r; WCHAR *hash, *tgt; const WCHAR *loc; @@ -176,15 +176,8 @@ HRESULT WINAPI HlinkCreateFromString( LPCWSTR pwzTarget, LPCWSTR pwzLocation, */ HRESULT WINAPI HlinkCreateBrowseContext( IUnknown* piunkOuter, REFIID riid, void** ppvObj) { - HRESULT r = S_OK; - TRACE("%p %s %p\n", piunkOuter, debugstr_guid(riid), ppvObj); - - r = CoCreateInstance(&CLSID_StdHlinkBrowseContext, piunkOuter, CLSCTX_INPROC_SERVER, riid, ppvObj); - - TRACE("returning %i\n",r); - - return r; + return CoCreateInstance(&CLSID_StdHlinkBrowseContext, piunkOuter, CLSCTX_INPROC_SERVER, riid, ppvObj); } /*********************************************************************** @@ -213,7 +206,7 @@ HRESULT WINAPI HlinkOnNavigate( IHlinkFrame *phlFrame, IHlinkBrowseContext* phlbc, DWORD grfHLNF, IMoniker *pmkTarget, LPCWSTR pwzLocation, LPCWSTR pwzFriendlyName, ULONG* puHLID) { - HRESULT r = S_OK; + HRESULT r; TRACE("%p %p %i %p %s %s %p\n",phlFrame, phlbc, grfHLNF, pmkTarget, debugstr_w(pwzLocation), debugstr_w(pwzFriendlyName), puHLID);

1 0

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

March 26, 2013

Module: wine Branch: master Commit: c5a73badaddd5a09acaf3b71e695221de8f38d69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5a73badaddd5a09acaf3b71e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 23 11:03:35 2013 +0400 hlink: Implement HlinkUpdateStackItem(). --- dlls/hlink/hlink_main.c | 19 +++++++-- dlls/hlink/tests/hlink.c | 96 ++++++++++++++++++++++++++++++++++++++++++++- include/hlink.idl | 1 + 3 files changed, 108 insertions(+), 8 deletions(-) diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index 3bf9d27..1890fd5 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -366,12 +366,21 @@ HRESULT WINAPI HlinkTranslateURL(LPCWSTR pwzURL, DWORD grfFlags, LPWSTR *ppwzTra /*********************************************************************** * HlinkUpdateStackItem (HLINK.@) */ -HRESULT WINAPI HlinkUpdateStackItem(IHlinkFrame *pihlframe, IHlinkBrowseContext *pihlbc, - ULONG uHLID, IMoniker *pimkTrgt, LPCWSTR pwzLocation, LPCWSTR pwzFriendlyName) +HRESULT WINAPI HlinkUpdateStackItem(IHlinkFrame *frame, IHlinkBrowseContext *bc, + ULONG hlid, IMoniker *target, LPCWSTR location, LPCWSTR friendly_name) { - FIXME("(%p %p %u %p %s %s)\n", pihlframe, pihlbc, uHLID, pimkTrgt, debugstr_w(pwzLocation), - debugstr_w(pwzFriendlyName)); - return E_NOTIMPL; + HRESULT hr; + + TRACE("(%p %p 0x%x %p %s %s)\n", frame, bc, hlid, target, debugstr_w(location), debugstr_w(friendly_name)); + + if (!frame && !bc) return E_INVALIDARG; + + if (frame) + hr = IHlinkFrame_UpdateHlink(frame, hlid, target, location, friendly_name); + else + hr = IHlinkBrowseContext_UpdateHlink(bc, hlid, target, location, friendly_name); + + return hr; } /*********************************************************************** diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index 544cc4a..91f7c4a 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -68,12 +68,15 @@ DEFINE_EXPECT(Save); DEFINE_EXPECT(HBC_QueryInterface_IHlinkHistory); DEFINE_EXPECT(HBC_GetObject); +DEFINE_EXPECT(HBC_UpdateHlink); DEFINE_EXPECT(HT_SetBrowseContext); DEFINE_EXPECT(HT_GetBrowseContext); DEFINE_EXPECT(HT_Navigate); DEFINE_EXPECT(HT_GetFriendlyName); +DEFINE_EXPECT(HLF_UpdateHlink); + DEFINE_GUID(IID_IHlinkHistory,0x79eac9c8,0xbaf9,0x11ce,0x8c,0x82,0x00,0xaa,0x00,0x4b,0xa9,0x0b); static const char *debugstr_guid(REFIID riid) @@ -885,10 +888,10 @@ static HRESULT WINAPI HlinkBrowseContext_OnNavigateHlink(IHlinkBrowseContext *if } static HRESULT WINAPI HlinkBrowseContext_UpdateHlink(IHlinkBrowseContext *iface, ULONG uHLID, - IMoniker *pimkTarget, LPCWSTR pwzLocation, LPCWSTR pwzFriendlyName) + IMoniker *pimkTarget, LPCWSTR location, LPCWSTR friendly_name) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + CHECK_EXPECT(HBC_UpdateHlink); + return S_OK; } static HRESULT WINAPI HlinkBrowseContext_EnumNavigationStack(IHlinkBrowseContext *iface, @@ -2194,6 +2197,92 @@ static void test_Hlink_Navigate(void) _bctx = NULL; } +static HRESULT WINAPI hlinkframe_QueryInterface(IHlinkFrame *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IHlinkFrame)) + { + *obj = iface; + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI hlinkframe_AddRef(IHlinkFrame *iface) +{ + return 2; +} + +static ULONG WINAPI hlinkframe_Release(IHlinkFrame *iface) +{ + return 1; +} + +static HRESULT WINAPI hlinkframe_SetBrowseContext(IHlinkFrame *iface, IHlinkBrowseContext *bc) +{ + ok(0, "unexpected %p\n", bc); + return E_NOTIMPL; +} + +static HRESULT WINAPI hlinkframe_GetBrowseContext(IHlinkFrame *iface, IHlinkBrowseContext **bc) +{ + *bc = NULL; + ok(0, "unexpected %p\n", bc); + return E_NOTIMPL; +} + +static HRESULT WINAPI hlinkframe_Navigate(IHlinkFrame *iface, DWORD grfHLNF, LPBC pbc, IBindStatusCallback *bsc, IHlink *navigate) +{ + ok(0, "unexpected\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI hlinkframe_OnNavigate(IHlinkFrame *iface, DWORD grfHLNF, IMoniker *target, LPCWSTR location, LPCWSTR friendly_name, + DWORD reserved) +{ + ok(0, "unexpected\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI hlinkframe_UpdateHlink(IHlinkFrame *iface, ULONG uHLID, IMoniker *target, LPCWSTR location, LPCWSTR friendly_name) +{ + CHECK_EXPECT(HLF_UpdateHlink); + return S_OK; +} + +static IHlinkFrameVtbl hlinkframevtbl = { + hlinkframe_QueryInterface, + hlinkframe_AddRef, + hlinkframe_Release, + hlinkframe_SetBrowseContext, + hlinkframe_GetBrowseContext, + hlinkframe_Navigate, + hlinkframe_OnNavigate, + hlinkframe_UpdateHlink +}; + +static IHlinkFrame testframe = { &hlinkframevtbl }; + +static void test_HlinkUpdateStackItem(void) +{ + static const WCHAR location[] = {'l','o','c','a','t','i','o','n',0}; + HRESULT hr; + + hr = HlinkUpdateStackItem(NULL, NULL, HLID_CURRENT, &Moniker, location, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + SET_EXPECT(HBC_UpdateHlink); + hr = HlinkUpdateStackItem(NULL, &HlinkBrowseContext, HLID_CURRENT, &Moniker, location, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_CALLED(HBC_UpdateHlink); + + SET_EXPECT(HLF_UpdateHlink); + hr = HlinkUpdateStackItem(&testframe, &HlinkBrowseContext, HLID_CURRENT, &Moniker, location, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_CALLED(HLF_UpdateHlink); +} + START_TEST(hlink) { CoInitialize(NULL); @@ -2213,6 +2302,7 @@ START_TEST(hlink) test_HlinkClone(); test_StdHlink(); test_Hlink_Navigate(); + test_HlinkUpdateStackItem(); CoUninitialize(); } diff --git a/include/hlink.idl b/include/hlink.idl index af3f8f5..e735987 100644 --- a/include/hlink.idl +++ b/include/hlink.idl @@ -37,6 +37,7 @@ cpp_quote("HRESULT WINAPI HlinkIsShortcut(LPCWSTR);") cpp_quote("HRESULT WINAPI HlinkTranslateURL(LPCWSTR,DWORD,LPWSTR*);") cpp_quote("HRESULT WINAPI HlinkParseDisplayName(LPBC,LPCWSTR,BOOL,ULONG*,IMoniker**);") cpp_quote("HRESULT WINAPI HlinkResolveMonikerForData(LPMONIKER,DWORD,LPBC,ULONG,FORMATETC*,IBindStatusCallback*,LPMONIKER);") +cpp_quote("HRESULT WINAPI HlinkUpdateStackItem(IHlinkFrame*, IHlinkBrowseContext*, ULONG, IMoniker*, LPCWSTR, LPCWSTR);") typedef enum _HLSR_NOREDEF10 { HLSR_HOME,

1 0

Ken Thomases : winemac: Implement GetDeviceGammaRamp() and SetDeviceGammaRamp().
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: e633f79f610516e78f7958b2946cb96bac327fe5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e633f79f610516e78f7958b29… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 17 22:41:07 2013 -0500 winemac: Implement GetDeviceGammaRamp() and SetDeviceGammaRamp(). --- dlls/winemac.drv/display.c | 131 ++++++++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/gdi.c | 4 +- dlls/winemac.drv/macdrv.h | 2 + 3 files changed, 135 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index f152cc8..85c903d 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -24,6 +24,7 @@ #include "macdrv.h" #include "winuser.h" #include "winreg.h" +#include "ddrawi.h" WINE_DEFAULT_DEBUG_CHANNEL(display); @@ -599,6 +600,91 @@ failed: /*********************************************************************** + * GetDeviceGammaRamp (MACDRV.@) + */ +BOOL macdrv_GetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp) +{ + BOOL ret = FALSE; + DDGAMMARAMP *r = ramp; + struct macdrv_display *displays; + int num_displays; + uint32_t mac_entries; + int win_entries = sizeof(r->red) / sizeof(r->red[0]); + CGGammaValue *red, *green, *blue; + CGError err; + int win_entry; + + TRACE("dev %p ramp %p\n", dev, ramp); + + if (macdrv_get_displays(&displays, &num_displays)) + { + WARN("failed to get Mac displays\n"); + return FALSE; + } + + mac_entries = CGDisplayGammaTableCapacity(displays[0].displayID); + red = HeapAlloc(GetProcessHeap(), 0, mac_entries * sizeof(red[0]) * 3); + if (!red) + goto done; + green = red + mac_entries; + blue = green + mac_entries; + + err = CGGetDisplayTransferByTable(displays[0].displayID, mac_entries, red, green, + blue, &mac_entries); + if (err != kCGErrorSuccess) + { + WARN("failed to get Mac gamma table: %d\n", err); + goto done; + } + + if (mac_entries == win_entries) + { + for (win_entry = 0; win_entry < win_entries; win_entry++) + { + r->red[win_entry] = red[win_entry] * 65535 + 0.5; + r->green[win_entry] = green[win_entry] * 65535 + 0.5; + r->blue[win_entry] = blue[win_entry] * 65535 + 0.5; + } + } + else + { + for (win_entry = 0; win_entry < win_entries; win_entry++) + { + double mac_pos = win_entry * (mac_entries - 1) / (double)(win_entries - 1); + int mac_entry = mac_pos; + double red_value, green_value, blue_value; + + if (mac_entry == mac_entries - 1) + { + red_value = red[mac_entry]; + green_value = green[mac_entry]; + blue_value = blue[mac_entry]; + } + else + { + double distance = mac_pos - mac_entry; + + red_value = red[mac_entry] * (1 - distance) + red[mac_entry + 1] * distance; + green_value = green[mac_entry] * (1 - distance) + green[mac_entry + 1] * distance; + blue_value = blue[mac_entry] * (1 - distance) + blue[mac_entry + 1] * distance; + } + + r->red[win_entry] = red_value * 65535 + 0.5; + r->green[win_entry] = green_value * 65535 + 0.5; + r->blue[win_entry] = blue_value * 65535 + 0.5; + } + } + + ret = TRUE; + +done: + HeapFree(GetProcessHeap(), 0, red); + macdrv_free_displays(displays); + return ret; +} + + +/*********************************************************************** * GetMonitorInfo (MACDRV.@) */ BOOL CDECL macdrv_GetMonitorInfo(HMONITOR monitor, LPMONITORINFO info) @@ -650,6 +736,51 @@ BOOL CDECL macdrv_GetMonitorInfo(HMONITOR monitor, LPMONITORINFO info) /*********************************************************************** + * SetDeviceGammaRamp (MACDRV.@) + */ +BOOL macdrv_SetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp) +{ + DDGAMMARAMP *r = ramp; + struct macdrv_display *displays; + int num_displays; + int win_entries = sizeof(r->red) / sizeof(r->red[0]); + CGGammaValue *red, *green, *blue; + int i; + CGError err = kCGErrorFailure; + + TRACE("dev %p ramp %p\n", dev, ramp); + + if (macdrv_get_displays(&displays, &num_displays)) + { + WARN("failed to get Mac displays\n"); + return FALSE; + } + + red = HeapAlloc(GetProcessHeap(), 0, win_entries * sizeof(red[0]) * 3); + if (!red) + goto done; + green = red + win_entries; + blue = green + win_entries; + + for (i = 0; i < win_entries; i++) + { + red[i] = r->red[i] / 65535.0; + green[i] = r->green[i] / 65535.0; + blue[i] = r->blue[i] / 65535.0; + } + + err = CGSetDisplayTransferByTable(displays[0].displayID, win_entries, red, green, blue); + if (err != kCGErrorSuccess) + WARN("failed to set display gamma table: %d\n", err); + +done: + HeapFree(GetProcessHeap(), 0, red); + macdrv_free_displays(displays); + return (err == kCGErrorSuccess); +} + + +/*********************************************************************** * macdrv_displays_changed * * Handler for DISPLAYS_CHANGED events. diff --git a/dlls/winemac.drv/gdi.c b/dlls/winemac.drv/gdi.c index 2a9a019..e05f9ab 100644 --- a/dlls/winemac.drv/gdi.c +++ b/dlls/winemac.drv/gdi.c @@ -461,7 +461,7 @@ static const struct gdi_dc_funcs macdrv_funcs = NULL, /* pGetCharABCWidthsI */ NULL, /* pGetCharWidth */ macdrv_GetDeviceCaps, /* pGetDeviceCaps */ - NULL, /* pGetDeviceGammaRamp */ + macdrv_GetDeviceGammaRamp, /* pGetDeviceGammaRamp */ NULL, /* pGetFontData */ NULL, /* pGetFontUnicodeRanges */ NULL, /* pGetGlyphIndices */ @@ -522,7 +522,7 @@ static const struct gdi_dc_funcs macdrv_funcs = NULL, /* pSetDCPenColor */ NULL, /* pSetDIBitsToDevice */ NULL, /* pSetDeviceClipping */ - NULL, /* pSetDeviceGammaRamp */ + macdrv_SetDeviceGammaRamp, /* pSetDeviceGammaRamp */ NULL, /* pSetLayout */ NULL, /* pSetMapMode */ NULL, /* pSetMapperFlags */ diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index d4cbe1d..aeeee2d 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -71,6 +71,8 @@ static inline const char *wine_dbgstr_cgrect(CGRect cgrect) extern CGRect macdrv_get_desktop_rect(void) DECLSPEC_HIDDEN; extern void macdrv_reset_device_metrics(void) DECLSPEC_HIDDEN; +extern BOOL macdrv_GetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp) DECLSPEC_HIDDEN; +extern BOOL macdrv_SetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp) DECLSPEC_HIDDEN; /**************************************************************************

1 0

Carlo Bramini : inetcpl.cpl: Minor fix, remove useless code.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: fd7f0517c79af5c60e52182cf12a6390264ad009 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd7f0517c79af5c60e52182cf… Author: Carlo Bramini <carlo.bramix(a)libero.it> Date: Sat Mar 16 19:53:40 2013 +0100 inetcpl.cpl: Minor fix, remove useless code. --- dlls/inetcpl.cpl/security.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/inetcpl.cpl/security.c b/dlls/inetcpl.cpl/security.c index 8f46b79..48c4876 100644 --- a/dlls/inetcpl.cpl/security.c +++ b/dlls/inetcpl.cpl/security.c @@ -134,8 +134,7 @@ static void update_zone_info(secdlg_data *sd, DWORD lv_index) SetWindowTextW(GetDlgItem(sd->hsec, IDC_SEC_ZONE_INFO), za->szDescription); - LoadStringW(hcpl, IDS_SEC_SETTINGS, name, sizeof(name)/sizeof(*name)); - len = lstrlenW(name); + len = LoadStringW(hcpl, IDS_SEC_SETTINGS, name, sizeof(name)/sizeof(*name)); lstrcpynW(&name[len], za->szDisplayName, sizeof(name)/sizeof(*name) - len - 1); TRACE("new title: %s\n", debugstr_w(name));

1 0

Nikolay Sivov : msxml3: Embed user/password in uri used to create a moniker .
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: 448e939ebe3faeec2f837b1c44a14c58e8ba93c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=448e939ebe3faeec2f837b1c4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 18 12:44:44 2013 +0400 msxml3: Embed user/password in uri used to create a moniker. --- dlls/msxml3/httprequest.c | 61 +++++++++++++++++++++++++++++++++++++++------ 1 files changed, 53 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index c67177b..681ccab 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -619,8 +619,27 @@ static HRESULT WINAPI Authenticate_Authenticate(IAuthenticate *iface, HWND *hwnd, LPWSTR *username, LPWSTR *password) { BindStatusCallback *This = impl_from_IAuthenticate(iface); - FIXME("(%p)->(%p %p %p)\n", This, hwnd, username, password); - return E_NOTIMPL; + httprequest *request = This->request; + + TRACE("(%p)->(%p %p %p)\n", This, hwnd, username, password); + + if (request->user && *request->user) + { + if (hwnd) *hwnd = NULL; + *username = CoTaskMemAlloc(SysStringByteLen(request->user)+sizeof(WCHAR)); + *password = CoTaskMemAlloc(SysStringByteLen(request->password)+sizeof(WCHAR)); + if (!*username || !*password) + { + CoTaskMemFree(*username); + CoTaskMemFree(*password); + return E_OUTOFMEMORY; + } + + memcpy(*username, request->user, SysStringByteLen(request->user)+sizeof(WCHAR)); + memcpy(*password, request->password, SysStringByteLen(request->password)+sizeof(WCHAR)); + } + + return S_OK; } static const IAuthenticateVtbl AuthenticateVtbl = { @@ -882,12 +901,6 @@ static HRESULT httprequest_open(httprequest *This, BSTR method, BSTR url, return hr; } - This->uri = uri; - - VariantInit(&is_async); - hr = VariantChangeType(&is_async, &async, 0, VT_BOOL); - This->async = hr == S_OK && V_BOOL(&is_async); - VariantInit(&str); hr = VariantChangeType(&str, &user, 0, VT_BSTR); if (hr == S_OK) @@ -898,6 +911,38 @@ static HRESULT httprequest_open(httprequest *This, BSTR method, BSTR url, if (hr == S_OK) This->password = V_BSTR(&str); + /* add authentication info */ + if (This->user && *This->user) + { + IUriBuilder *builder; + + hr = CreateIUriBuilder(uri, 0, 0, &builder); + if (hr == S_OK) + { + IUri *full_uri; + + IUriBuilder_SetUserName(builder, This->user); + IUriBuilder_SetPassword(builder, This->password); + hr = IUriBuilder_CreateUri(builder, -1, 0, 0, &full_uri); + if (hr == S_OK) + { + IUri_Release(uri); + uri = full_uri; + } + else + WARN("failed to create modified uri, 0x%08x\n", hr); + IUriBuilder_Release(builder); + } + else + WARN("IUriBuilder creation failed, 0x%08x\n", hr); + } + + This->uri = uri; + + VariantInit(&is_async); + hr = VariantChangeType(&is_async, &async, 0, VT_BOOL); + This->async = hr == S_OK && V_BOOL(&is_async); + httprequest_setreadystate(This, READYSTATE_LOADING); return S_OK;

1 0

Francois Gouget : testbot/scripts: Tweak 'initd status' to check if a server it did not start is running already.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: tools Branch: master Commit: b779cb2c5f1d15a485afbe8df970e84ed132f94e URL: http://source.winehq.org/git/tools.git/?a=commit;h=b779cb2c5f1d15a485afbe8d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 26 11:50:19 2013 +0100 testbot/scripts: Tweak 'initd status' to check if a server it did not start is running already. This avoids confusion in case a server was started manually for testing. --- testbot/scripts/initd | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/testbot/scripts/initd b/testbot/scripts/initd index fe670ed..7e25f7d 100755 --- a/testbot/scripts/initd +++ b/testbot/scripts/initd @@ -106,9 +106,14 @@ then fi log_failure_msg "The WineTestBot server is running but not responding" exit 1 - elif [ "$status" = 4 ]; then - log_failure_msg "could not access PID file for the WineTestBot server" + elif [ "$status" = 4 ] + then + log_failure_msg "Could not access PID file for the WineTestBot server" exit $status + elif $PING -q + then + log_success_msg "A WineTestBot server was started manually already" + exit 0 else log_failure_msg "The WineTestBot server is not running" exit $status

1 0

Francois Gouget : testbot: Keep track of the revert processes and handle server restarts more gracefully .
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: tools Branch: master Commit: 2ecbb72c59e04b0b079267db948b83581db2b1d0 URL: http://source.winehq.org/git/tools.git/?a=commit;h=2ecbb72c59e04b0b079267db… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 26 11:47:48 2013 +0100 testbot: Keep track of the revert processes and handle server restarts more gracefully. On startup the WineTestBot server now: * Detects tasks that are still running and lets them complete. * Cleans up and requeues the running tasks that died. * Lets VMs that are currently reverting complete their revert. * Leaves the idle powered on VMs and those used by running tasks as it. * Shuts down any other active VM and marks them as dirty. This makes it possible to kill and restart a WineTestBot server without impacting the running tasks. Also, should the server reboot unexpectedly, the tasks that were running will be restarted. --- testbot/bin/Engine.pl | 149 +++++++++++++++++++++++++++++++----- testbot/bin/RevertVM.pl | 2 + testbot/ddl/update21.sql | 5 + testbot/ddl/winetestbot.sql | 1 + testbot/doc/winetestbot-schema.dia | 20 +++++ testbot/lib/WineTestBot/Jobs.pm | 25 ++++-- testbot/lib/WineTestBot/Steps.pm | 23 ++++-- testbot/lib/WineTestBot/Tasks.pm | 2 + testbot/lib/WineTestBot/VMs.pm | 19 +++++ testbot/web/admin/VMDetails.pl | 9 ++ 10 files changed, 221 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=2ecbb72c59e04b0b0792…

1 0

Francois Gouget : testbot: Tweak ScheduleJobs() to filter out disabled VMs as we won't be running jobs on them.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: tools Branch: master Commit: 14e9dd49121ac3d6cba423c1b2bd8c41a4ce3668 URL: http://source.winehq.org/git/tools.git/?a=commit;h=14e9dd49121ac3d6cba423c1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 26 11:47:35 2013 +0100 testbot: Tweak ScheduleJobs() to filter out disabled VMs as we won't be running jobs on them. --- testbot/lib/WineTestBot/Jobs.pm | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index c73dea1..61ef113 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -531,7 +531,10 @@ sub ScheduleJobs() # we should check if there are VMs to revert my %Hosts; - foreach my $VM (@{CreateVMs()->GetItems()}) + my $VMs = CreateVMs(); + $VMs->FilterEnabledRole(); + $VMs->FilterEnabledStatus(); + foreach my $VM (@{$VMs->GetItems()}) { my $Host = $VM->GetHost(); $Hosts{$Host}->{$VM->VirtURI} = 1;

1 0