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

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

March 26, 2013

Module: wine Branch: master Commit: 16668e82fe869c2fea9e2641f0f7ddaadfce0277 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16668e82fe869c2fea9e2641f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 26 10:02:45 2013 +0100 msvcrt20: Match parameters list with function we're forwarding to. --- dlls/msvcrt20/msvcrt20.spec | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index b2293ee..b166ada 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -1141,7 +1141,7 @@ @ cdecl _swab(str str long) msvcrt._swab @ extern _sys_errlist msvcrt._sys_errlist @ extern _sys_nerr msvcrt._sys_nerr -@ cdecl _tccpy(str str) msvcrt._mbccpy +@ cdecl _tccpy(ptr str) msvcrt._mbccpy @ cdecl _tclen(ptr) msvcrt._mbclen @ cdecl _tcschr(str long) msvcrt._mbschr @ cdecl _tcsclen(str) msvcrt._mbslen @@ -1156,19 +1156,19 @@ @ cdecl _tcsnccat(str str long) msvcrt._mbsncat @ cdecl _tcsnccmp(str str long) msvcrt._mbsncmp @ cdecl _tcsnccnt(str long) msvcrt._mbsnccnt -@ cdecl _tcsnccpy(str str long) msvcrt._mbsncpy +@ cdecl _tcsnccpy(ptr str long) msvcrt._mbsncpy @ cdecl _tcsncicmp(str str long) msvcrt._mbsnicmp @ cdecl _tcsncmp(str str long) msvcrt._mbsnbcmp @ cdecl _tcsncpy(ptr str long) msvcrt._mbsnbcpy -@ cdecl _tcsncset(str long long) msvcrt._mbsnset +@ cdecl _tcsncset(ptr long long) msvcrt._mbsnset @ cdecl _tcsnextc(str) msvcrt._mbsnextc @ cdecl _tcsnicmp(str str long) msvcrt._mbsnbicmp @ cdecl _tcsninc(str long) msvcrt._mbsninc -@ cdecl _tcsnset(str long long) msvcrt._mbsnbset +@ cdecl _tcsnset(ptr long long) msvcrt._mbsnbset @ cdecl _tcspbrk(str str) msvcrt._mbspbrk @ cdecl _tcsrchr(str long) msvcrt._mbsrchr @ cdecl _tcsrev(str) msvcrt._mbsrev -@ cdecl _tcsset(str long) msvcrt._mbsset +@ cdecl _tcsset(ptr long) msvcrt._mbsset @ cdecl _tcsspn(str str) msvcrt._mbsspn @ cdecl _tcsspnp(str str) msvcrt._mbsspnp @ cdecl _tcsstr(str str) msvcrt._mbsstr

1 0

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

March 26, 2013

Module: wine Branch: master Commit: 607316df5f3d2cc5a13b4c6d2216bc757e93b85e URL: http://source.winehq.org/git/wine.git/?a=commit;h=607316df5f3d2cc5a13b4c6d2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 26 10:01:59 2013 +0100 msvcrt: Match architecture with function we're forwarding to. --- dlls/msvcr100/msvcr100.spec | 48 +++++++++++++++++++++--------------------- dlls/msvcr110/msvcr110.spec | 48 +++++++++++++++++++++--------------------- dlls/msvcr80/msvcr80.spec | 44 +++++++++++++++++++------------------- dlls/msvcr90/msvcr90.spec | 44 +++++++++++++++++++------------------- 4 files changed, 92 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=607316df5f3d2cc5a13b4…

1 0

Piotr Caban : wininet: Reorder functions to avoid urlcache_create_hash_table forward declaration.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: 2bcd8a3fae434bc7435ef147e1f0a56dba6bcbb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bcd8a3fae434bc7435ef147e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 26 09:53:48 2013 +0100 wininet: Reorder functions to avoid urlcache_create_hash_table forward declaration. --- dlls/wininet/urlcache.c | 310 +++++++++++++++++++++++------------------------ 1 files changed, 154 insertions(+), 156 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2bcd8a3fae434bc7435ef…

1 0

Piotr Caban : wininet: Rename URLCACHECONTAINER to cache_container.
by Alexandre Julliard March 26, 2013

March 26, 2013

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

1 0

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

March 26, 2013

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

1 0

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