November 2017 - Wine-Commits

Fabian Maurer : gdiplus: In GdipPrivateAddMemoryFont allow loading fonts with long names.
by Alexandre Julliard Nov. 30, 2017

Nov. 30, 2017

Module: wine Branch: master Commit: 89366f740f1e3629a58711057afba39681a07ad6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89366f740f1e3629a58711057… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Nov 26 14:33:18 2017 +0100 gdiplus: In GdipPrivateAddMemoryFont allow loading fonts with long names. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/font.c | 38 ++++++++++-------- dlls/gdiplus/tests/Makefile.in | 5 +++ dlls/gdiplus/tests/font.c | 73 +++++++++++++++++++++++++++++++++++ dlls/gdiplus/tests/resource.rc | 22 +++++++++++ dlls/gdiplus/tests/wine_longname.sfd | 66 +++++++++++++++++++++++++++++++ dlls/gdiplus/tests/wine_longname.ttf | Bin 0 -> 2216 bytes 6 files changed, 188 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=89366f740f1e3629a5871…

1 0

Zebediah Figura : configure: Remove l_intl.nls before removing created directories.
by Alexandre Julliard Nov. 30, 2017

Nov. 30, 2017

Module: wine Branch: master Commit: ff18f812781df53942ede77ace1bc021ea6d8687 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff18f812781df53942ede77ac… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 30 00:09:33 2017 -0600 configure: Remove l_intl.nls before removing created directories. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 6 ++++-- configure.ac | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 4217def..28c456d 100755 --- a/configure +++ b/configure @@ -19274,8 +19274,10 @@ else wine_fn_append_rule "install install-lib:: \$(INSTALL_DATA) $srcdir/loader/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls -uninstall:: - \$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls" +.PHONY: l_intl.nls/uninstall +l_intl.nls/uninstall:: + \$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls +__uninstall__: l_intl.nls/uninstall" case $host_os in cygwin*|mingw32*|darwin*|macosx*|linux-android*) ;; *) wine_fn_append_rule "install install-lib:: diff --git a/configure.ac b/configure.ac index 22620ec..e9a7b2b 100644 --- a/configure.ac +++ b/configure.ac @@ -3905,8 +3905,10 @@ else WINE_APPEND_RULE( [install install-lib:: \$(INSTALL_DATA) $srcdir/loader/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls -uninstall:: - \$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls]) +.PHONY: l_intl.nls/uninstall +l_intl.nls/uninstall:: + \$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls +__uninstall__: l_intl.nls/uninstall]) case $host_os in cygwin*|mingw32*|darwin*|macosx*|linux-android*) ;; *) WINE_APPEND_RULE(

1 0

Zebediah Figura : hlink/tests: Add tests for navigating from a string reference.
by Alexandre Julliard Nov. 30, 2017

Nov. 30, 2017

Module: wine Branch: master Commit: 46aba9564282789a43e2e49b9f839297b4920cfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=46aba9564282789a43e2e49b9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Nov 30 10:21:01 2017 -0600 hlink/tests: Add tests for navigating from a string reference. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hlink/tests/hlink.c | 79 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 67 insertions(+), 12 deletions(-) diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index 50f61d5..c19de13 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -67,6 +67,9 @@ DEFINE_EXPECT(GetClassID); DEFINE_EXPECT(Save); DEFINE_EXPECT(HBC_QueryInterface_IHlinkHistory); +DEFINE_EXPECT(HBC_QueryInterface_IMarshal); +DEFINE_EXPECT(HBC_QueryInterface_IdentityUnmarshal); +DEFINE_EXPECT(HBC_QueryInterface_IUnknown); DEFINE_EXPECT(HBC_GetObject); DEFINE_EXPECT(HBC_UpdateHlink); @@ -77,8 +80,16 @@ DEFINE_EXPECT(HT_GetFriendlyName); DEFINE_EXPECT(HLF_UpdateHlink); +DEFINE_GUID(CLSID_IdentityUnmarshal,0x0000001b,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(IID_IHlinkHistory,0x79eac9c8,0xbaf9,0x11ce,0x8c,0x82,0x00,0xaa,0x00,0x4b,0xa9,0x0b); +static const WCHAR winehq_urlW[] = + {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g', + '/','t','e','s','t','s','/','h','e','l','l','o','.','h','t','m','l',0}; +static const WCHAR winehq_404W[] = + {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g', + '/','t','e','s','t','s','/','f','a','k','e','u','r','l',0}; + static void test_HlinkIsShortcut(void) { UINT i; @@ -627,9 +638,6 @@ static void test_HlinkParseDisplayName(void) IBindCtx *bctx; HRESULT hres; - static const WCHAR winehq_urlW[] = - {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g', - '/','s','i','t','e','/','a','b','o','u','t',0}; static const WCHAR invalid_urlW[] = {'t','e','s','t',':','1','2','3','a','b','c',0}; static const WCHAR clsid_nameW[] = {'c','l','s','i','d',':', '2','0','D','0','4','F','E','0','-','3','A','E','A','-','1','0','6','9','-','A','2','D','8', @@ -829,12 +837,17 @@ static HRESULT WINAPI HlinkBrowseContext_QueryInterface( { *ppv = NULL; - if(IsEqualGUID(&IID_IHlinkHistory, riid)) { + if (IsEqualGUID(&IID_IHlinkHistory, riid)) CHECK_EXPECT(HBC_QueryInterface_IHlinkHistory); - return E_NOINTERFACE; - } + else if (IsEqualGUID(&IID_IMarshal, riid)) + CHECK_EXPECT2(HBC_QueryInterface_IMarshal); + else if (IsEqualGUID(&CLSID_IdentityUnmarshal, riid)) + CHECK_EXPECT(HBC_QueryInterface_IdentityUnmarshal); + else if (IsEqualGUID(&IID_IUnknown, riid)) + CHECK_EXPECT(HBC_QueryInterface_IUnknown); + else + ok(0, "unexpected interface: %s\n", wine_dbgstr_guid(riid)); - ok(0, "unexpected interface: %s\n", wine_dbgstr_guid(riid)); return E_NOINTERFACE; } @@ -859,9 +872,17 @@ static IMoniker Moniker; static HRESULT WINAPI HlinkBrowseContext_GetObject(IHlinkBrowseContext *iface, IMoniker *pimk, BOOL fBindIfRootRegistered, IUnknown **ppiunk) { + IBindCtx *bctx; + WCHAR *name; + CHECK_EXPECT(HBC_GetObject); - ok(pimk == &Moniker, "pimk != &Moniker\n"); + CreateBindCtx(0, &bctx); + IMoniker_GetDisplayName(pimk, bctx, NULL, &name); + ok(!lstrcmpW(winehq_urlW, name) || !lstrcmpW(winehq_404W, name), "got unexpected url\n"); + CoTaskMemFree(name); + IBindCtx_Release(bctx); + ok(fBindIfRootRegistered == 1, "fBindIfRootRegistered = %x\n", fBindIfRootRegistered); *ppiunk = NULL; return S_FALSE; @@ -1205,10 +1226,6 @@ static HRESULT WINAPI Moniker_RelativePathTo(IMoniker *iface, IMoniker *pmkOther static HRESULT WINAPI Moniker_GetDisplayName(IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, LPOLESTR *ppszDisplayName) { - static const WCHAR winehq_urlW[] = - {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g', - '/','s','i','t','e','/','a','b','o','u','t',0}; - CHECK_EXPECT2(GetDisplayName); ok(pbc != NULL, "pbc == NULL\n"); @@ -2206,6 +2223,44 @@ static void test_Hlink_Navigate(void) CHECK_CALLED(HT_Navigate); todo_wine CHECK_CALLED(HT_GetFriendlyName); +if (0) { /* these currently open a browser window on wine */ + /* Test from string */ + SET_EXPECT(HBC_GetObject); + hres = HlinkNavigateToStringReference(winehq_404W, NULL, NULL, 0, NULL, 0, pbc, NULL, &HlinkBrowseContext); + todo_wine ok(hres == INET_E_OBJECT_NOT_FOUND, "Expected INET_E_OBJECT_NOT_FOUND, got %08x\n", hres); + todo_wine CHECK_CALLED(HBC_GetObject); + + /* MSDN claims browse context and bind context can't be null, but they can */ + SET_EXPECT(HBC_GetObject); + hres = HlinkNavigateToStringReference(winehq_404W, NULL, NULL, 0, NULL, 0, NULL, NULL, &HlinkBrowseContext); + todo_wine ok(hres == INET_E_OBJECT_NOT_FOUND, "Expected INET_E_OBJECT_NOT_FOUND, got %08x\n", hres); + todo_wine CHECK_CALLED(HBC_GetObject); +} + + /* these open a browser window, so mark them interactive only */ + if (winetest_interactive) + { + /* both parameters null */ + hres = HlinkNavigateToStringReference(winehq_404W, NULL, NULL, 0, NULL, 0, NULL, NULL, NULL); + todo_wine ok(hres == DRAGDROP_S_DROP, "Expected DRAGDROP_S_DROP, got %08x\n", hres); + + /* try basic test with valid URL */ + SET_EXPECT(HBC_GetObject); + SET_EXPECT(HBC_QueryInterface_IHlinkHistory); + SET_EXPECT(HBC_QueryInterface_IMarshal); + SET_EXPECT(HBC_QueryInterface_IdentityUnmarshal); + SET_EXPECT(HBC_QueryInterface_IUnknown); + hres = HlinkNavigateToStringReference(winehq_urlW, NULL, NULL, 0, NULL, 0, pbc, NULL, &HlinkBrowseContext); + ok(hres == S_OK, "Expected S_OK, got %08x\n", hres); + todo_wine CHECK_CALLED(HBC_GetObject); + todo_wine CHECK_CALLED(HBC_QueryInterface_IHlinkHistory); + todo_wine CHECK_CALLED(HBC_QueryInterface_IMarshal); + todo_wine CHECK_CALLED(HBC_QueryInterface_IdentityUnmarshal); + todo_wine CHECK_CALLED(HBC_QueryInterface_IUnknown); + } + else + skip("interactive IHlink_Navigate tests\n"); + IHlink_Release(hlink); IBindCtx_Release(pbc); _bctx = NULL;

1 0

Jacek Caban : mshtml: Silence some noisy FIXMEs.
by Alexandre Julliard Nov. 30, 2017

Nov. 30, 2017

Module: wine Branch: master Commit: f39c6c3cbd7d22fdab821e1ff51abd80b88a0611 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f39c6c3cbd7d22fdab821e1ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 30 16:11:16 2017 +0100 mshtml: Silence some noisy FIXMEs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsio.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index bc1dae9..7333334 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1193,7 +1193,7 @@ static nsresult NSAPI nsChannel_AsyncOpen2(nsIHttpChannel *iface, nsIStreamListe static nsresult NSAPI nsChannel_GetContentDisposition(nsIHttpChannel *iface, UINT32 *aContentDisposition) { nsChannel *This = impl_from_nsIHttpChannel(iface); - FIXME("(%p)->(%p)\n", This, aContentDisposition); + TRACE("(%p)->(%p) unimplemented\n", This, aContentDisposition); return NS_ERROR_NOT_IMPLEMENTED; } @@ -1221,7 +1221,7 @@ static nsresult NSAPI nsChannel_SetContentDispositionFilename(nsIHttpChannel *if static nsresult NSAPI nsChannel_GetContentDispositionHeader(nsIHttpChannel *iface, nsACString *aContentDispositionHeader) { nsChannel *This = impl_from_nsIHttpChannel(iface); - FIXME("(%p)->(%p)\n", This, aContentDispositionHeader); + TRACE("(%p)->(%p) unimplemented\n", This, aContentDispositionHeader); return NS_ERROR_NOT_IMPLEMENTED; } @@ -1306,7 +1306,7 @@ static nsresult NSAPI nsChannel_SetReferrer(nsIHttpChannel *iface, nsIURI *aRefe static nsresult NSAPI nsChannel_GetReferrerPolicy(nsIHttpChannel *iface, UINT32 *aReferrerPolicy) { nsChannel *This = impl_from_nsIHttpChannel(iface); - FIXME("(%p)->(%p)\n", This, aReferrerPolicy); + TRACE("(%p)->(%p) unimplemented\n", This, aReferrerPolicy); return NS_ERROR_NOT_IMPLEMENTED; } @@ -1835,7 +1835,7 @@ static nsresult NSAPI nsHttpChannelInternal_SetDocumentURI(nsIHttpChannelInterna { nsChannel *This = impl_from_nsIHttpChannelInternal(iface); - FIXME("(%p)->()\n", This); + TRACE("(%p)->() unimplemented\n", This); return NS_ERROR_NOT_IMPLEMENTED; } @@ -1862,7 +1862,7 @@ static nsresult NSAPI nsHttpChannelInternal_TakeAllSecurityMessages(nsIHttpChann { nsChannel *This = impl_from_nsIHttpChannelInternal(iface); - FIXME("(%p)->()\n", This); + TRACE("(%p)->(%p) unimplemented\n", This, aMessages); return NS_ERROR_NOT_IMPLEMENTED; } @@ -2125,7 +2125,7 @@ static nsresult NSAPI nsHttpChannelInternal_GetRedirectMode(nsIHttpChannelIntern static nsresult NSAPI nsHttpChannelInternal_SetRedirectMode(nsIHttpChannelInternal *iface, UINT32 aRedirectMode) { nsChannel *This = impl_from_nsIHttpChannelInternal(iface); - FIXME("(%p)->(%d)\n", This, aRedirectMode); + TRACE("(%p)->(%d) unimplemented\n", This, aRedirectMode); return NS_ERROR_NOT_IMPLEMENTED; }

1 0

Jacek Caban : mshtml: Store listener container type as a string.
by Alexandre Julliard Nov. 30, 2017

Nov. 30, 2017

Module: wine Branch: master Commit: 26f731f4a03519456ddc157fe6200be4c0ee323a URL: http://source.winehq.org/git/wine.git/?a=commit;h=26f731f4a03519456ddc157fe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 30 16:10:50 2017 +0100 mshtml: Store listener container type as a string. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 3b8820e..860c361 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -50,8 +50,8 @@ typedef struct { typedef struct { struct wine_rb_entry entry; - eventid_t event_id; struct list listeners; + WCHAR type[1]; } listener_container_t; static const WCHAR abortW[] = {'a','b','o','r','t',0}; @@ -242,8 +242,9 @@ static listener_container_t *get_listener_container(EventTarget *event_target, e const event_target_vtbl_t *vtbl; listener_container_t *container; struct wine_rb_entry *entry; + size_t type_len; - entry = wine_rb_get(&event_target->handler_map, (const void*)eid); + entry = wine_rb_get(&event_target->handler_map, event_info[eid].name); if(entry) return WINE_RB_ENTRY_VALUE(entry, listener_container_t, entry); if(!alloc) @@ -252,11 +253,11 @@ static listener_container_t *get_listener_container(EventTarget *event_target, e if(event_info[eid].flags & EVENT_FIXME) FIXME("unimplemented event %s\n", debugstr_w(event_info[eid].name)); - container = heap_alloc(sizeof(*container)); + type_len = strlenW(event_info[eid].name); + container = heap_alloc(FIELD_OFFSET(listener_container_t, type[type_len+1])); if(!container) return NULL; - - container->event_id = eid; + memcpy(container->type, event_info[eid].name, (type_len + 1) * sizeof(WCHAR)); list_init(&container->listeners); vtbl = dispex_get_vtbl(&event_target->dispex); if(vtbl->bind_event) @@ -264,7 +265,7 @@ static listener_container_t *get_listener_container(EventTarget *event_target, e else FIXME("Unsupported event binding on target %p\n", event_target); - wine_rb_put(&event_target->handler_map, (const void*)eid, &container->entry); + wine_rb_put(&event_target->handler_map, container->type, &container->entry); return container; } @@ -2264,7 +2265,7 @@ void EventTarget_init_dispex_info(dispex_data_t *dispex_info, compat_mode_t comp static int event_id_cmp(const void *key, const struct wine_rb_entry *entry) { - return (INT_PTR)key - WINE_RB_ENTRY_VALUE(entry, listener_container_t, entry)->event_id; + return strcmpW(key, WINE_RB_ENTRY_VALUE(entry, listener_container_t, entry)->type); } void EventTarget_Init(EventTarget *event_target, IUnknown *outer, dispex_static_data_t *dispex_data,

1 0

Alexandre Julliard : ntdll: Don't return from attach_dlls on failure.
by Alexandre Julliard Nov. 30, 2017

Nov. 30, 2017

Module: wine Branch: master Commit: 70b69f3e5fb964e08a77de936dbf5bb49f4afabf URL: http://source.winehq.org/git/wine.git/?a=commit;h=70b69f3e5fb964e08a77de936… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 30 16:00:14 2017 +0100 ntdll: Don't return from attach_dlls on failure. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 39 +++++++++++++++++++++++++-------------- dlls/ntdll/ntdll_misc.h | 6 +++--- dlls/ntdll/server.c | 6 +++--- dlls/ntdll/signal_arm.c | 20 +++++++------------- dlls/ntdll/signal_arm64.c | 20 +++++++------------- dlls/ntdll/signal_i386.c | 25 ++++++++----------------- dlls/ntdll/signal_powerpc.c | 20 +++++++------------- dlls/ntdll/signal_x86_64.c | 25 ++++++++----------------- dlls/ntdll/thread.c | 4 +--- 9 files changed, 69 insertions(+), 96 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=70b69f3e5fb964e08a77d…

1 0

Hans Leidekker : taskschd: Implement IExecAction_put_Path.
by Alexandre Julliard Nov. 30, 2017

Nov. 30, 2017

Module: wine Branch: master Commit: e0fbe82e66834afb2a57f6bdeec955616fd84aac URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0fbe82e66834afb2a57f6bde… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 30 09:37:10 2017 +0100 taskschd: Implement IExecAction_put_Path. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index f32d3d2..01e7c2d 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1638,6 +1638,7 @@ typedef struct { IExecAction IExecAction_iface; LONG ref; + WCHAR *path; } ExecAction; static inline ExecAction *impl_from_IExecAction(IExecAction *iface) @@ -1659,6 +1660,7 @@ static ULONG WINAPI ExecAction_Release(IExecAction *iface) if (!ref) { TRACE("destroying %p\n", iface); + heap_free(action->path); heap_free(action); } @@ -1744,7 +1746,15 @@ static HRESULT WINAPI ExecAction_get_Path(IExecAction *iface, BSTR *path) static HRESULT WINAPI ExecAction_put_Path(IExecAction *iface, BSTR path) { - FIXME("%p,%s: stub\n", iface, debugstr_w(path)); + ExecAction *action = impl_from_IExecAction(iface); + WCHAR *str = NULL; + + TRACE("%p,%s\n", iface, debugstr_w(path)); + + if (path && !(str = heap_strdupW((path)))) return E_OUTOFMEMORY; + heap_free(action->path); + action->path = str; + return S_OK; } @@ -1801,6 +1811,7 @@ static HRESULT ExecAction_create(IExecAction **obj) action->IExecAction_iface.lpVtbl = &Action_vtbl; action->ref = 1; + action->path = NULL; *obj = &action->IExecAction_iface;

1 0

Piotr Caban : msvcrt: Change how fread splits reading into chunks.
by Alexandre Julliard Nov. 30, 2017

Nov. 30, 2017

Module: wine Branch: master Commit: 1899eadf3eb4caaab26d5ff09e191d6da597224e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1899eadf3eb4caaab26d5ff09… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 30 19:55:16 2017 +0100 msvcrt: Change how fread splits reading into chunks. It affects fd stream position and buffer content on unsuccessul reads. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 6 +++--- dlls/msvcrt/tests/file.c | 28 ++++++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 1e662e9..116a9bd 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -4300,7 +4300,7 @@ MSVCRT_size_t CDECL MSVCRT__fread_nolock(void *ptr, MSVCRT_size_t size, MSVCRT_s while(rcnt>0) { int i; - if (!file->_cnt && rcnt<MSVCRT_BUFSIZ && (file->_flag & (MSVCRT__IOMYBUF | MSVCRT__USERBUF))) { + if (!file->_cnt && rcnt<file->_bufsiz && (file->_flag & (MSVCRT__IOMYBUF | MSVCRT__USERBUF))) { i = MSVCRT__read(file->_file, file->_base, file->_bufsiz); file->_ptr = file->_base; if (i != -1) { @@ -4319,10 +4319,10 @@ MSVCRT_size_t CDECL MSVCRT__fread_nolock(void *ptr, MSVCRT_size_t size, MSVCRT_s } } else if (rcnt > INT_MAX) { i = MSVCRT__read(file->_file, ptr, INT_MAX); - } else if (rcnt < MSVCRT_BUFSIZ) { + } else if (rcnt < (file->_bufsiz ? file->_bufsiz : MSVCRT_INTERNAL_BUFSIZ)) { i = MSVCRT__read(file->_file, ptr, rcnt); } else { - i = MSVCRT__read(file->_file, ptr, rcnt - MSVCRT_BUFSIZ/2); + i = MSVCRT__read(file->_file, ptr, rcnt - rcnt % (file->_bufsiz ? file->_bufsiz : MSVCRT_INTERNAL_BUFSIZ)); } pread += i; rcnt -= i; diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 00f5e7e..d4d63f2 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -222,7 +222,7 @@ static void test_readmode( BOOL ascii_mode ) static const char outbuffer[] = "0,1,2,3,4,5,6,7,8,9\r\n\r\nA,B,C,D,E\r\nX,Y,Z"; static const char padbuffer[] = "ghjghjghjghj"; static const char nlbuffer[] = "\r\n"; - char buffer[2*BUFSIZ+256]; + static char buffer[8192]; const char *optr; int fd; FILE *file; @@ -327,7 +327,7 @@ static void test_readmode( BOOL ascii_mode ) ok(feof(file)==0,"feof failure in %s\n", IOMODE); ok(fread(buffer,2,1,file)==0,"fread failure in %s\n",IOMODE); ok(feof(file)!=0,"feof failure in %s\n", IOMODE); - + /* test some additional functions */ rewind(file); ok(ftell(file) == 0,"Did not start at beginning of file in %s\n", IOMODE); @@ -350,6 +350,30 @@ static void test_readmode( BOOL ascii_mode ) fclose (file); unlink ("fdopen.tst"); + + /* test INTERNAL_BUFSIZ read containing 0x1a character (^Z) */ + fd = open("fdopen.tst", O_WRONLY | O_CREAT | O_BINARY, _S_IREAD |_S_IWRITE); + ok(fd != -1, "open failed\n"); + memset(buffer, 'a', sizeof(buffer)); + buffer[1] = 0x1a; + ok(write(fd, buffer, sizeof(buffer)) == sizeof(buffer), "write failed\n"); + ok(close(fd) != -1, "close failed\n"); + + fd = open("fdopen.tst", O_RDONLY); + ok(fd != -1, "open failed\n"); + file = fdopen(fd, ascii_mode ? "r" : "rb"); + ok(file != NULL, "fdopen failed\n"); + + memset(buffer, 0, sizeof(buffer)); + i = fread(buffer, 4096, 1, file); + ok(!i, "fread succeeded\n"); + ok(file->_bufsiz == 4096, "file->_bufsiz = %d\n", file->_bufsiz); + for(i=0; i<4096; i++) + if(buffer[i] != (i==1 ? 0x1a : 'a')) break; + ok(i==4096, "buffer[%d] = %d\n", i, buffer[i]); + + fclose(file); + unlink("fdopen.tst"); } static void test_asciimode(void)

1 0

Nikolay Sivov : gdiplus/tests: Check more return values (Coverity).
by Alexandre Julliard Nov. 30, 2017

Nov. 30, 2017

Module: wine Branch: master Commit: b1ccf61f22fd17fe6c15cc4304de090442978ddd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1ccf61f22fd17fe6c15cc430… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 28 12:05:20 2017 +0300 gdiplus/tests: Check more return values (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/font.c | 6 ++++-- dlls/gdiplus/tests/graphics.c | 12 ++++++++---- dlls/gdiplus/tests/image.c | 5 +++-- dlls/gdiplus/tests/pathiterator.c | 15 ++++++++++----- 4 files changed, 25 insertions(+), 13 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 410a538..961d845 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -155,7 +155,8 @@ static void test_createfont(void) for (i = UnitWorld; i <=UnitMillimeter; i++) { if (i == UnitDisplay) continue; /* Crashes WindowsXP, wtf? */ - GdipCreateFont(fontfamily, 24, FontStyleRegular, i, &font); + stat = GdipCreateFont(fontfamily, 24, FontStyleRegular, i, &font); + expect(Ok, stat); GdipGetFontSize (font, &size); ok (size == 24, "Expected 24, got %f (with unit: %d)\n", size, i); GdipGetFontUnit (font, &unit); @@ -179,7 +180,8 @@ static void test_logfont(void) UINT16 em_height, line_spacing; Unit unit; - GdipCreateFromHDC(hdc, &graphics); + stat = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, stat); memset(&lfa, 0, sizeof(LOGFONTA)); memset(&lfa2, 0xff, sizeof(LOGFONTA)); diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index a96050b..96df1a2 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -365,7 +365,8 @@ static void test_save_restore(void) log_state(state_a, &state_log); /* BeginContainer and SaveGraphics use the same stack. */ - GdipCreateFromHDC(hdc, &graphics1); + stat = GdipCreateFromHDC(hdc, &graphics1); + expect(Ok, stat); GdipSetInterpolationMode(graphics1, InterpolationModeBilinear); stat = GdipBeginContainer2(graphics1, &state_a); expect(Ok, stat); @@ -731,7 +732,8 @@ static void test_BeginContainer2(void) status = GdipCreateMatrix(&transform); expect(Ok, status); GdipGetWorldTransform(graphics, transform); - GdipGetMatrixElements(transform, elems); + status = GdipGetMatrixElements(transform, elems); + expect(Ok, status); ok(fabs(defTrans[0] - elems[0]) < 0.0001 && fabs(defTrans[1] - elems[1]) < 0.0001 && fabs(defTrans[2] - elems[2]) < 0.0001 && @@ -1600,10 +1602,12 @@ static void test_Get_Release_DC(void) status = GdipCreateMatrix(&m); expect(Ok, status); - GdipCreateRegion(&region); + status = GdipCreateRegion(&region); + expect(Ok, status); GdipCreateSolidFill((ARGB)0xdeadbeef, &brush); GdipCreatePath(FillModeAlternate, &path); - GdipCreateRegion(&clip); + status = GdipCreateRegion(&clip); + expect(Ok, status); status = GdipCreateFromHDC(hdc, &graphics); expect(Ok, status); diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 0b444ef..28f0fce 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -367,7 +367,8 @@ static void test_GdipImageGetFrameDimensionsCount(void) /* SelectActiveFrame has no effect on image data of memory bitmaps */ color = 0xdeadbeef; - GdipBitmapGetPixel(bm, 0, 0, &color); + stat = GdipBitmapGetPixel(bm, 0, 0, &color); + expect(Ok, stat); expect(0xffffffff, color); GdipDisposeImage((GpImage*)bm); @@ -2724,7 +2725,7 @@ static void test_multiframegif(void) expect(Ok, stat); color = 0xdeadbeef; - GdipBitmapGetPixel(bmp, 0, 0, &color); + stat = GdipBitmapGetPixel(bmp, 0, 0, &color); expect(Ok, stat); expect(0xffffffff, color); diff --git a/dlls/gdiplus/tests/pathiterator.c b/dlls/gdiplus/tests/pathiterator.c index 3f6292c..9bd3ac5 100644 --- a/dlls/gdiplus/tests/pathiterator.c +++ b/dlls/gdiplus/tests/pathiterator.c @@ -80,7 +80,8 @@ static void test_hascurve(void) GdipDeletePathIter(iter); - GdipAddPathEllipse(path, 0.0, 0.0, 35.0, 70.0); + stat = GdipAddPathEllipse(path, 0.0, 0.0, 35.0, 70.0); + expect(Ok, stat); stat = GdipCreatePathIter(&iter, path); expect(Ok, stat); @@ -330,9 +331,12 @@ static void test_isvalid(void) GdipDeletePathIter(iter); /* no markers */ - GdipAddPathLine(path, 50.0, 50.0, 110.0, 40.0); - GdipCreatePathIter(&iter, path); - GdipPathIterNextMarker(iter, &result, &start, &end); + stat = GdipAddPathLine(path, 50.0, 50.0, 110.0, 40.0); + expect(Ok, stat); + stat = GdipCreatePathIter(&iter, path); + expect(Ok, stat); + stat = GdipPathIterNextMarker(iter, &result, &start, &end); + expect(Ok, stat); isvalid = FALSE; stat = GdipPathIterIsValid(iter, &isvalid); expect(Ok, stat); @@ -527,7 +531,8 @@ static void test_nextpathtype(void) todo_wine expect(0, result); GdipDeletePathIter(iter); - GdipAddPathEllipse(path, 0.0, 0.0, 35.0, 70.0); + stat = GdipAddPathEllipse(path, 0.0, 0.0, 35.0, 70.0); + expect(Ok, stat); GdipCreatePathIter(&iter, path); start = end = result = (INT)0xdeadbeef; type = 255; /* out of range */

1 0

Zebediah Figura : hlink: Better handle the IBrowseContext parameter in IHlink::Navigate().
by Alexandre Julliard Nov. 30, 2017

Nov. 30, 2017

Module: wine Branch: master Commit: 00aca1476efd573cbf9d31a45c3d484f6fa6055b URL: http://source.winehq.org/git/wine.git/?a=commit;h=00aca1476efd573cbf9d31a45… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Nov 30 10:21:02 2017 -0600 hlink: Better handle the IBrowseContext parameter in IHlink::Navigate(). Query it for an IHlinkTarget object. Also, use ShellExecute() only if the parameter is NULL. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hlink/link.c | 43 ++++++++++++++++++++++----------------- dlls/hlink/tests/hlink.c | 53 ++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 69 insertions(+), 27 deletions(-) diff --git a/dlls/hlink/link.c b/dlls/hlink/link.c index f5da0b4..983765c 100644 --- a/dlls/hlink/link.c +++ b/dlls/hlink/link.c @@ -486,25 +486,33 @@ static HRESULT WINAPI IHlink_fnNavigate(IHlink* iface, DWORD grfHLNF, LPBC pbc, if (SUCCEEDED(r)) { - IBindCtx *bcxt; + IBindCtx *bcxt = NULL; IUnknown *unk = NULL; IHlinkTarget *target; - CreateBindCtx(0, &bcxt); - - RegisterBindStatusCallback(bcxt, pbsc, NULL, 0); - - r = IMoniker_BindToObject(mon, bcxt, NULL, &IID_IUnknown, (void**)&unk); - if (r == S_OK) - { - r = IUnknown_QueryInterface(unk, &IID_IHlinkTarget, (void**)&target); - IUnknown_Release(unk); - } - if (r == S_OK) + if (phbc) { - IHlinkTarget_SetBrowseContext(target, phbc); - r = IHlinkTarget_Navigate(target, grfHLNF, This->Location); - IHlinkTarget_Release(target); + r = IHlinkBrowseContext_GetObject(phbc, mon, TRUE, &unk); + if (r == S_FALSE) + { + CreateBindCtx(0, &bcxt); + RegisterBindStatusCallback(bcxt, pbsc, NULL, 0); + r = IMoniker_BindToObject(mon, bcxt, NULL, &IID_IUnknown, (void**)&unk); + } + if (r == S_OK) + { + r = IUnknown_QueryInterface(unk, &IID_IHlinkTarget, (void **)&target); + IUnknown_Release(unk); + } + if (r == S_OK) + { + if (bcxt) IHlinkTarget_SetBrowseContext(target, phbc); + r = IHlinkTarget_Navigate(target, grfHLNF, This->Location); + IHlinkTarget_Release(target); + } + + RevokeBindStatusCallback(bcxt, pbsc); + if (bcxt) IBindCtx_Release(bcxt); } else { @@ -516,12 +524,9 @@ static HRESULT WINAPI IHlink_fnNavigate(IHlink* iface, DWORD grfHLNF, LPBC pbc, { ShellExecuteW(NULL, szOpen, target, NULL, NULL, SW_SHOW); CoTaskMemFree(target); + r = DRAGDROP_S_DROP; } } - - RevokeBindStatusCallback(bcxt, pbsc); - - IBindCtx_Release(bcxt); IMoniker_Release(mon); } diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index c19de13..8350624 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -73,6 +73,7 @@ DEFINE_EXPECT(HBC_QueryInterface_IUnknown); DEFINE_EXPECT(HBC_GetObject); DEFINE_EXPECT(HBC_UpdateHlink); +DEFINE_EXPECT(HT_QueryInterface_IHlinkTarget); DEFINE_EXPECT(HT_SetBrowseContext); DEFINE_EXPECT(HT_GetBrowseContext); DEFINE_EXPECT(HT_Navigate); @@ -868,6 +869,8 @@ static HRESULT WINAPI HlinkBrowseContext_Register(IHlinkBrowseContext *iface, return E_NOTIMPL; } +static IUnknown *HBC_object; + static IMoniker Moniker; static HRESULT WINAPI HlinkBrowseContext_GetObject(IHlinkBrowseContext *iface, IMoniker *pimk, BOOL fBindIfRootRegistered, IUnknown **ppiunk) @@ -884,8 +887,9 @@ static HRESULT WINAPI HlinkBrowseContext_GetObject(IHlinkBrowseContext *iface, IBindCtx_Release(bctx); ok(fBindIfRootRegistered == 1, "fBindIfRootRegistered = %x\n", fBindIfRootRegistered); - *ppiunk = NULL; - return S_FALSE; + + *ppiunk = HBC_object; + return HBC_object ? S_OK : S_FALSE; } static HRESULT WINAPI HlinkBrowseContext_Revoke(IHlinkBrowseContext *iface, DWORD dwRegister) @@ -995,6 +999,7 @@ static IHlinkBrowseContext HlinkBrowseContext = { &HlinkBrowseContextVtbl }; static HRESULT WINAPI HlinkTarget_QueryInterface(IHlinkTarget *iface, REFIID riid, void **ppv) { if(IsEqualGUID(&IID_IHlinkTarget, riid)) { + CHECK_EXPECT(HT_QueryInterface_IHlinkTarget); *ppv = iface; return S_OK; } @@ -2188,6 +2193,8 @@ static void test_Hlink_Navigate(void) ok(hres == S_OK, "CreateBindCtx failed: %08x\n", hres); _bctx = pbc; + HBC_object = NULL; + SET_EXPECT(Reduce); SET_EXPECT(Enum); SET_EXPECT(IsSystemMoniker); @@ -2205,6 +2212,7 @@ static void test_Hlink_Navigate(void) SET_EXPECT(HBC_GetObject); SET_EXPECT(Reduce); SET_EXPECT(BindToObject); + SET_EXPECT(HT_QueryInterface_IHlinkTarget); SET_EXPECT(HT_GetBrowseContext); SET_EXPECT(HT_SetBrowseContext); SET_EXPECT(HBC_QueryInterface_IHlinkHistory); @@ -2213,36 +2221,65 @@ static void test_Hlink_Navigate(void) hres = IHlink_Navigate(hlink, 0, pbc, NULL, &HlinkBrowseContext); ok(hres == S_OK, "Navigate failed: %08x\n", hres); CHECK_CALLED(IsSystemMoniker); - todo_wine CHECK_CALLED(GetDisplayName); - todo_wine CHECK_CALLED(HBC_GetObject); + CHECK_CALLED(GetDisplayName); + CHECK_CALLED(HBC_GetObject); todo_wine CHECK_CALLED(Reduce); CHECK_CALLED(BindToObject); + CHECK_CALLED(HT_QueryInterface_IHlinkTarget); todo_wine CHECK_CALLED(HT_GetBrowseContext); CHECK_CALLED(HT_SetBrowseContext); todo_wine CHECK_CALLED(HBC_QueryInterface_IHlinkHistory); CHECK_CALLED(HT_Navigate); todo_wine CHECK_CALLED(HT_GetFriendlyName); + /* Test with valid return from HlinkBrowseContext::GetObject */ + HBC_object = (IUnknown *)&HlinkTarget; + + SET_EXPECT(IsSystemMoniker); + SET_EXPECT(GetDisplayName); + SET_EXPECT(HBC_GetObject); + SET_EXPECT(HT_QueryInterface_IHlinkTarget); + SET_EXPECT(HT_Navigate); + SET_EXPECT(HT_GetFriendlyName); + hres = IHlink_Navigate(hlink, 0, pbc, NULL, &HlinkBrowseContext); + ok(hres == S_OK, "Navigate failed: %08x\n", hres); + CHECK_CALLED(IsSystemMoniker); + CHECK_CALLED(GetDisplayName); + CHECK_CALLED(HBC_GetObject); + CHECK_CALLED(HT_QueryInterface_IHlinkTarget); + CHECK_CALLED(HT_Navigate); + todo_wine CHECK_CALLED(HT_GetFriendlyName); + + HBC_object = NULL; + if (0) { /* these currently open a browser window on wine */ /* Test from string */ SET_EXPECT(HBC_GetObject); hres = HlinkNavigateToStringReference(winehq_404W, NULL, NULL, 0, NULL, 0, pbc, NULL, &HlinkBrowseContext); todo_wine ok(hres == INET_E_OBJECT_NOT_FOUND, "Expected INET_E_OBJECT_NOT_FOUND, got %08x\n", hres); - todo_wine CHECK_CALLED(HBC_GetObject); + CHECK_CALLED(HBC_GetObject); /* MSDN claims browse context and bind context can't be null, but they can */ SET_EXPECT(HBC_GetObject); hres = HlinkNavigateToStringReference(winehq_404W, NULL, NULL, 0, NULL, 0, NULL, NULL, &HlinkBrowseContext); todo_wine ok(hres == INET_E_OBJECT_NOT_FOUND, "Expected INET_E_OBJECT_NOT_FOUND, got %08x\n", hres); - todo_wine CHECK_CALLED(HBC_GetObject); + CHECK_CALLED(HBC_GetObject); } /* these open a browser window, so mark them interactive only */ if (winetest_interactive) { /* both parameters null */ + SET_EXPECT(IsSystemMoniker); + SET_EXPECT(GetDisplayName); + hres = IHlink_Navigate(hlink, 0, NULL, NULL, NULL); + ok(hres == DRAGDROP_S_DROP, "Expected DRAGDROP_S_DROP, got %08x\n", hres); + CHECK_CALLED(IsSystemMoniker); + CHECK_CALLED(GetDisplayName); + + /* same, from string */ hres = HlinkNavigateToStringReference(winehq_404W, NULL, NULL, 0, NULL, 0, NULL, NULL, NULL); - todo_wine ok(hres == DRAGDROP_S_DROP, "Expected DRAGDROP_S_DROP, got %08x\n", hres); + ok(hres == DRAGDROP_S_DROP, "Expected DRAGDROP_S_DROP, got %08x\n", hres); /* try basic test with valid URL */ SET_EXPECT(HBC_GetObject); @@ -2252,7 +2289,7 @@ if (0) { /* these currently open a browser window on wine */ SET_EXPECT(HBC_QueryInterface_IUnknown); hres = HlinkNavigateToStringReference(winehq_urlW, NULL, NULL, 0, NULL, 0, pbc, NULL, &HlinkBrowseContext); ok(hres == S_OK, "Expected S_OK, got %08x\n", hres); - todo_wine CHECK_CALLED(HBC_GetObject); + CHECK_CALLED(HBC_GetObject); todo_wine CHECK_CALLED(HBC_QueryInterface_IHlinkHistory); todo_wine CHECK_CALLED(HBC_QueryInterface_IMarshal); todo_wine CHECK_CALLED(HBC_QueryInterface_IdentityUnmarshal);

1 0