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

Jacek Caban : mshtml: Pass listener type as a string to remove_event_listener.
by Alexandre Julliard Nov. 30, 2017

Nov. 30, 2017

Module: wine Branch: master Commit: bb9bc082b71cdadf816b60aa8294bca0bc47b815 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb9bc082b71cdadf816b60aa8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 30 16:11:09 2017 +0100 mshtml: Pass listener type as a string to remove_event_listener. 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, 4 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index e0ee269..a046491 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -271,12 +271,12 @@ static listener_container_t *get_listener_container(EventTarget *event_target, c return container; } -static void remove_event_listener(EventTarget *event_target, eventid_t eid, listener_type_t type, IDispatch *function) +static void remove_event_listener(EventTarget *event_target, const WCHAR *type_name, listener_type_t type, IDispatch *function) { listener_container_t *container; event_listener_t *listener; - container = get_listener_container(event_target, event_info[eid].name, FALSE); + container = get_listener_container(event_target, type_name, FALSE); if(!container) return; @@ -1918,7 +1918,7 @@ HRESULT detach_event(EventTarget *event_target, BSTR name, IDispatch *disp) return S_OK; } - remove_event_listener(event_target, eid, LISTENER_TYPE_ATTACHED, disp); + remove_event_listener(event_target, event_info[eid].name, LISTENER_TYPE_ATTACHED, disp); return S_OK; } @@ -2136,17 +2136,10 @@ static HRESULT WINAPI EventTarget_removeEventListener(IEventTarget *iface, BSTR IDispatch *listener, VARIANT_BOOL capture) { EventTarget *This = impl_from_IEventTarget(iface); - eventid_t eid; TRACE("(%p)->(%s %p %x)\n", This, debugstr_w(type), listener, capture); - eid = str_to_eid(type); - if(eid == EVENTID_LAST) { - FIXME("Unsupported on event %s\n", debugstr_w(type)); - return E_NOTIMPL; - } - - remove_event_listener(This, eid, capture ? LISTENER_TYPE_CAPTURE : LISTENER_TYPE_BUBBLE, listener); + remove_event_listener(This, type, capture ? LISTENER_TYPE_CAPTURE : LISTENER_TYPE_BUBBLE, listener); return S_OK; }

1 0

Jacek Caban : mshtml: Pass listener type as a string to get_listener_container.
by Alexandre Julliard Nov. 30, 2017

Nov. 30, 2017

Module: wine Branch: master Commit: ebefab4b0383bacb6e5469439f73dae3dcd2ae64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebefab4b0383bacb6e5469439… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 30 16:11:01 2017 +0100 mshtml: Pass listener type as a string to get_listener_container. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 860c361..e0ee269 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -237,27 +237,29 @@ static eventid_t attr_to_eid(const WCHAR *str) return EVENTID_LAST; } -static listener_container_t *get_listener_container(EventTarget *event_target, eventid_t eid, BOOL alloc) +static listener_container_t *get_listener_container(EventTarget *event_target, const WCHAR *type, BOOL alloc) { const event_target_vtbl_t *vtbl; listener_container_t *container; struct wine_rb_entry *entry; size_t type_len; + eventid_t eid; - entry = wine_rb_get(&event_target->handler_map, event_info[eid].name); + entry = wine_rb_get(&event_target->handler_map, type); if(entry) return WINE_RB_ENTRY_VALUE(entry, listener_container_t, entry); if(!alloc) return NULL; - if(event_info[eid].flags & EVENT_FIXME) + eid = str_to_eid(type); + if(eid != EVENTID_LAST && (event_info[eid].flags & EVENT_FIXME)) FIXME("unimplemented event %s\n", debugstr_w(event_info[eid].name)); - type_len = strlenW(event_info[eid].name); + type_len = strlenW(type); container = heap_alloc(FIELD_OFFSET(listener_container_t, type[type_len+1])); if(!container) return NULL; - memcpy(container->type, event_info[eid].name, (type_len + 1) * sizeof(WCHAR)); + memcpy(container->type, type, (type_len + 1) * sizeof(WCHAR)); list_init(&container->listeners); vtbl = dispex_get_vtbl(&event_target->dispex); if(vtbl->bind_event) @@ -274,7 +276,7 @@ static void remove_event_listener(EventTarget *event_target, eventid_t eid, list listener_container_t *container; event_listener_t *listener; - container = get_listener_container(event_target, eid, FALSE); + container = get_listener_container(event_target, event_info[eid].name, FALSE); if(!container) return; @@ -1299,7 +1301,7 @@ static BOOL is_cp_event(cp_static_data_t *data, DISPID dispid) static void call_event_handlers(EventTarget *event_target, DOMEvent *event) { const eventid_t eid = event->event_id; - const listener_container_t *container = get_listener_container(event_target, eid, FALSE); + const listener_container_t *container = get_listener_container(event_target, event_info[eid].name, FALSE); const BOOL cancelable = event_info[eid].flags & EVENT_CANCELABLE; const BOOL use_quirks = use_event_quirks(event_target); event_listener_t *listener, listeners_buf[8], *listeners = listeners_buf; @@ -1739,7 +1741,7 @@ static event_listener_t *get_onevent_listener(EventTarget *event_target, eventid listener_container_t *container; event_listener_t *listener; - container = get_listener_container(event_target, eid, alloc); + container = get_listener_container(event_target, event_info[eid].name, alloc); if(!container) return NULL; @@ -1887,7 +1889,7 @@ HRESULT attach_event(EventTarget *event_target, BSTR name, IDispatch *disp, VARI return S_OK; } - container = get_listener_container(event_target, eid, TRUE); + container = get_listener_container(event_target, event_info[eid].name, TRUE); if(!container) return E_OUTOFMEMORY; @@ -2107,18 +2109,10 @@ static HRESULT WINAPI EventTarget_addEventListener(IEventTarget *iface, BSTR typ listener_type_t listener_type = capture ? LISTENER_TYPE_CAPTURE : LISTENER_TYPE_BUBBLE; listener_container_t *container; event_listener_t *listener; - eventid_t eid; TRACE("(%p)->(%s %p %x)\n", This, debugstr_w(type), function, capture); - eid = str_to_eid(type); - if(eid == EVENTID_LAST) { - FIXME("Unsupported on event %s\n", debugstr_w(type)); - return E_NOTIMPL; - } - - - container = get_listener_container(This, eid, TRUE); + container = get_listener_container(This, type, TRUE); if(!container) return E_OUTOFMEMORY;

1 0

Andrew Eikum : xaudio2: Ignore buffers returned from OpenAL after Stop.
by Alexandre Julliard Nov. 30, 2017

Nov. 30, 2017

Module: wine Branch: master Commit: e2c73fc394bace00c4463b6fcb6dfe9dc64084bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2c73fc394bace00c4463b6fc… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Nov 30 08:01:53 2017 -0600 xaudio2: Ignore buffers returned from OpenAL after Stop. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/tests/xaudio2.c | 78 ++++++++++++++++++++++++++++++++++++++++ dlls/xaudio2_7/xaudio_dll.c | 79 +++++++++++++++++++++++++---------------- dlls/xaudio2_7/xaudio_private.h | 2 +- 3 files changed, 128 insertions(+), 31 deletions(-) diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index 54176ea..ff402f8 100644 --- a/dlls/xaudio2_7/tests/xaudio2.c +++ b/dlls/xaudio2_7/tests/xaudio2.c @@ -841,6 +841,82 @@ static void test_submix(IXAudio2 *xa) IXAudio2MasteringVoice_DestroyVoice(master); } +static void test_flush(IXAudio2 *xa) +{ + HRESULT hr; + IXAudio2MasteringVoice *master; + IXAudio2SourceVoice *src; + WAVEFORMATEX fmt; + XAUDIO2_BUFFER buf; + XAUDIO2_VOICE_STATE state; + + XA2CALL_0V(StopEngine); + + if(xaudio27) + hr = IXAudio27_CreateMasteringVoice((IXAudio27*)xa, &master, 2, 44100, 0, 0, NULL); + else + hr = IXAudio2_CreateMasteringVoice(xa, &master, 2, 44100, 0, NULL, NULL, AudioCategory_GameEffects); + ok(hr == S_OK, "CreateMasteringVoice failed: %08x\n", hr); + + fmt.wFormatTag = WAVE_FORMAT_IEEE_FLOAT; + fmt.nChannels = 2; + fmt.nSamplesPerSec = 44100; + fmt.wBitsPerSample = 32; + fmt.nBlockAlign = fmt.nChannels * fmt.wBitsPerSample / 8; + fmt.nAvgBytesPerSec = fmt.nSamplesPerSec * fmt.nBlockAlign; + fmt.cbSize = 0; + + XA2CALL(CreateSourceVoice, &src, &fmt, 0, 1.f, NULL, NULL, NULL); + ok(hr == S_OK, "CreateSourceVoice failed: %08x\n", hr); + + memset(&buf, 0, sizeof(buf)); + buf.AudioBytes = 22050 * fmt.nBlockAlign; + buf.pAudioData = HeapAlloc(GetProcessHeap(), 0, buf.AudioBytes); + fill_buf((float*)buf.pAudioData, &fmt, 440, 22050); + + hr = IXAudio2SourceVoice_SubmitSourceBuffer(src, &buf, NULL); + ok(hr == S_OK, "SubmitSourceBuffer failed: %08x\n", hr); + + hr = IXAudio2SourceVoice_Start(src, 0, XAUDIO2_COMMIT_NOW); + ok(hr == S_OK, "Start failed: %08x\n", hr); + + XA2CALL_0(StartEngine); + ok(hr == S_OK, "StartEngine failed: %08x\n", hr); + + while(1){ + if(xaudio27) + IXAudio27SourceVoice_GetState((IXAudio27SourceVoice*)src, &state); + else + IXAudio2SourceVoice_GetState(src, &state, 0); + if(state.SamplesPlayed >= 2205) + break; + Sleep(10); + } + + hr = IXAudio2SourceVoice_Stop(src, 0, XAUDIO2_COMMIT_NOW); + ok(hr == S_OK, "Stop failed: %08x\n", hr); + + hr = IXAudio2SourceVoice_FlushSourceBuffers(src); + ok(hr == S_OK, "FlushSourceBuffers failed: %08x\n", hr); + + hr = IXAudio2SourceVoice_Start(src, 0, XAUDIO2_COMMIT_NOW); + ok(hr == S_OK, "Start failed: %08x\n", hr); + + Sleep(100); + + hr = IXAudio2SourceVoice_SubmitSourceBuffer(src, &buf, NULL); + ok(hr == S_OK, "SubmitSourceBuffer failed: %08x\n", hr); + + if(xaudio27){ + IXAudio27SourceVoice_DestroyVoice((IXAudio27SourceVoice*)src); + }else{ + IXAudio2SourceVoice_DestroyVoice(src); + } + IXAudio2MasteringVoice_DestroyVoice(master); + + HeapFree(GetProcessHeap(), 0, (void*)buf.pAudioData); +} + static UINT32 test_DeviceDetails(IXAudio27 *xa) { HRESULT hr; @@ -1136,6 +1212,7 @@ START_TEST(xaudio2) test_buffer_callbacks((IXAudio2*)xa27); test_looping((IXAudio2*)xa27); test_submix((IXAudio2*)xa27); + test_flush((IXAudio2*)xa27); }else skip("No audio devices available\n"); @@ -1159,6 +1236,7 @@ START_TEST(xaudio2) test_buffer_callbacks(xa); test_looping(xa); test_submix(xa); + test_flush(xa); }else skip("No audio devices available\n"); diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 13f5916..8f15ded 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -414,6 +414,7 @@ static void WINAPI XA2SRC_DestroyVoice(IXAudio2SourceVoice *iface) This->nbufs = 0; This->first_buf = 0; This->cur_buf = 0; + This->abandoned_albufs = 0; LeaveCriticalSection(&This->lock); } @@ -438,11 +439,18 @@ static HRESULT WINAPI XA2SRC_Stop(IXAudio2SourceVoice *iface, UINT32 Flags, UINT32 OperationSet) { XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + ALint bufs; TRACE("%p, 0x%x, 0x%x\n", This, Flags, OperationSet); + palcSetThreadContext(This->xa2->al_ctx); + EnterCriticalSection(&This->lock); + alGetSourcei(This->al_src, AL_BUFFERS_QUEUED, &bufs); + + This->abandoned_albufs = bufs; + This->running = FALSE; LeaveCriticalSection(&This->lock); @@ -2273,44 +2281,53 @@ static void update_source_state(XA2SourceImpl *src) ALuint al_buffers[XAUDIO2_MAX_QUEUED_BUFFERS]; alSourceUnqueueBuffers(src->al_src, processed, al_buffers); + src->first_al_buf += processed; src->first_al_buf %= XAUDIO2_MAX_QUEUED_BUFFERS; src->al_bufs_used -= processed; - for(i = 0; i < processed; ++i){ - ALint bufsize; - - alGetBufferi(al_buffers[i], AL_SIZE, &bufsize); + if(processed > src->abandoned_albufs){ + for(i = src->abandoned_albufs; i < processed; ++i){ + ALint bufsize; - src->in_al_bytes -= bufsize; - src->played_frames += bufsize / src->submit_blocksize; + alGetBufferi(al_buffers[i], AL_SIZE, &bufsize); - if(al_buffers[i] == src->buffers[src->first_buf].latest_al_buf){ - DWORD old_buf = src->first_buf; + src->in_al_bytes -= bufsize; + src->played_frames += bufsize / src->submit_blocksize; - src->first_buf++; - src->first_buf %= XAUDIO2_MAX_QUEUED_BUFFERS; - src->nbufs--; + if(al_buffers[i] == src->buffers[src->first_buf].latest_al_buf){ + DWORD old_buf = src->first_buf; - TRACE("%p: done with buffer %u\n", src, old_buf); + src->first_buf++; + src->first_buf %= XAUDIO2_MAX_QUEUED_BUFFERS; + src->nbufs--; - if(src->buffers[old_buf].xa2buffer.Flags & XAUDIO2_END_OF_STREAM) - src->played_frames = 0; + TRACE("%p: done with buffer %u\n", src, old_buf); - if(src->cb){ - IXAudio2VoiceCallback_OnBufferEnd(src->cb, - src->buffers[old_buf].xa2buffer.pContext); if(src->buffers[old_buf].xa2buffer.Flags & XAUDIO2_END_OF_STREAM) - IXAudio2VoiceCallback_OnStreamEnd(src->cb); - - if(src->nbufs > 0) - IXAudio2VoiceCallback_OnBufferStart(src->cb, - src->buffers[src->first_buf].xa2buffer.pContext); + src->played_frames = 0; + + if(src->cb){ + IXAudio2VoiceCallback_OnBufferEnd(src->cb, + src->buffers[old_buf].xa2buffer.pContext); + if(src->buffers[old_buf].xa2buffer.Flags & XAUDIO2_END_OF_STREAM) + IXAudio2VoiceCallback_OnStreamEnd(src->cb); + + if(src->nbufs > 0) + IXAudio2VoiceCallback_OnBufferStart(src->cb, + src->buffers[src->first_buf].xa2buffer.pContext); + } } } - } + + src->abandoned_albufs = 0; + }else + src->abandoned_albufs -= processed; } + if(!src->running) + return; + alGetSourcei(src->al_src, AL_BYTE_OFFSET, &bufpos); /* maintain IN_AL_PERIODS periods in AL */ @@ -2384,12 +2401,12 @@ static void do_engine_tick(IXAudio2Impl *This) EnterCriticalSection(&src->lock); - if(!src->in_use || !src->running){ + if(!src->in_use){ LeaveCriticalSection(&src->lock); continue; } - if(src->cb){ + if(src->cb && This->running){ #if XAUDIO2_VER == 0 IXAudio20VoiceCallback_OnVoiceProcessingPassStart((IXAudio20VoiceCallback*)src->cb); #else @@ -2403,12 +2420,14 @@ static void do_engine_tick(IXAudio2Impl *This) update_source_state(src); - alGetSourcei(src->al_src, AL_SOURCE_STATE, &st); - if(st != AL_PLAYING) - alSourcePlay(src->al_src); + if(This->running){ + alGetSourcei(src->al_src, AL_SOURCE_STATE, &st); + if(st != AL_PLAYING) + alSourcePlay(src->al_src); - if(src->cb) - IXAudio2VoiceCallback_OnVoiceProcessingPassEnd(src->cb); + if(src->cb) + IXAudio2VoiceCallback_OnVoiceProcessingPassEnd(src->cb); + } LeaveCriticalSection(&src->lock); } diff --git a/dlls/xaudio2_7/xaudio_private.h b/dlls/xaudio2_7/xaudio_private.h index f28a0ae..1a4aa08 100644 --- a/dlls/xaudio2_7/xaudio_private.h +++ b/dlls/xaudio2_7/xaudio_private.h @@ -81,7 +81,7 @@ typedef struct _XA2SourceImpl { /* most cases will only need about 4 AL buffers, but some corner cases * could require up to MAX_QUEUED_BUFFERS */ ALuint al_bufs[XAUDIO2_MAX_QUEUED_BUFFERS]; - DWORD first_al_buf, al_bufs_used; + DWORD first_al_buf, al_bufs_used, abandoned_albufs; struct list entry; } XA2SourceImpl;

1 0

Alexandre Julliard : kernel32/tests: Add a test for the thread initial context.
by Alexandre Julliard Nov. 30, 2017

Nov. 30, 2017

Module: wine Branch: master Commit: b802f88319969fc5c71807ec8b695b0256bdf35c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b802f88319969fc5c71807ec8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 30 12:25:58 2017 +0100 kernel32/tests: Add a test for the thread initial context. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 44 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 6790185..07067ab 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -3036,6 +3036,7 @@ static void test_SuspendProcessNewThread(void) IMAGE_NT_HEADERS nt_header; HANDLE thread_handle = NULL; DWORD exit_code = 0; + CONTEXT ctx; exit_thread_ptr = GetProcAddress(hkernel32, "ExitThread"); ok(exit_thread_ptr != NULL, "GetProcAddress ExitThread failed\n"); @@ -3052,9 +3053,50 @@ static void test_SuspendProcessNewThread(void) thread_handle = CreateRemoteThread(pi.hProcess, NULL, 0, (LPTHREAD_START_ROUTINE)exit_thread_ptr, - (PVOID)(ULONG_PTR)0x1234, 0, NULL); + (PVOID)(ULONG_PTR)0x1234, CREATE_SUSPENDED, NULL); ok(thread_handle != NULL, "Could not create remote thread (%d)\n", GetLastError()); + ret = are_imports_resolved(pi.hProcess, exe_base, &nt_header); + ok(!ret, "IAT entry resolved prematurely\n"); + + ctx.ContextFlags = CONTEXT_FULL; + ret = GetThreadContext( thread_handle, &ctx ); + ok( ret, "Failed retrieving remote thread context (%d)\n", GetLastError() ); +#ifdef __x86_64__ + ok( ctx.ContextFlags == CONTEXT_FULL, "wrong flags %x\n", ctx.ContextFlags ); + ok( !ctx.Rax, "rax is not zero %lx\n", ctx.Rax ); + ok( !ctx.Rbx, "rbx is not zero %lx\n", ctx.Rbx ); + ok( ctx.Rcx == (ULONG_PTR)exit_thread_ptr, "wrong rcx %lx/%p\n", ctx.Rcx, exit_thread_ptr ); + ok( ctx.Rdx == 0x1234, "wrong rdx %lx\n", ctx.Rdx ); + ok( !ctx.Rsi, "rsi is not zero %lx\n", ctx.Rsi ); + ok( !ctx.Rdi, "rdi is not zero %lx\n", ctx.Rdi ); + ok( !ctx.Rbp, "rbp is not zero %lx\n", ctx.Rbp ); + ok( !ctx.R8, "r8 is not zero %lx\n", ctx.R8 ); + ok( !ctx.R9, "r9 is not zero %lx\n", ctx.R9 ); + ok( !ctx.R10, "r10 is not zero %lx\n", ctx.R10 ); + ok( !ctx.R11, "r11 is not zero %lx\n", ctx.R11 ); + ok( !ctx.R12, "r12 is not zero %lx\n", ctx.R12 ); + ok( !ctx.R13, "r13 is not zero %lx\n", ctx.R13 ); + ok( !ctx.R14, "r14 is not zero %lx\n", ctx.R14 ); + ok( !ctx.R15, "r15 is not zero %lx\n", ctx.R15 ); + ok( !((ctx.Rsp + 0x28) & 0xfff), "rsp is not at top of stack page %lx\n", ctx.Rsp ); +#else + ok( ctx.ContextFlags == CONTEXT_FULL, "wrong flags %x\n", ctx.ContextFlags ); + ok( !ctx.Ebp || broken(ctx.Ebp), /* winxp */ "ebp is not zero %08x\n", ctx.Ebp ); + if (!ctx.Ebp) /* winxp is completely different */ + { + ok( !ctx.Ecx, "ecx is not zero %08x\n", ctx.Ecx ); + ok( !ctx.Edx, "edx is not zero %08x\n", ctx.Edx ); + ok( !ctx.Esi, "esi is not zero %08x\n", ctx.Esi ); + ok( !ctx.Edi, "edi is not zero %08x\n", ctx.Edi ); + } + ok( ctx.Eax == (ULONG_PTR)exit_thread_ptr, "wrong eax %08x/%p\n", ctx.Eax, exit_thread_ptr ); + ok( ctx.Ebx == 0x1234, "wrong ebx %08x\n", ctx.Ebx ); + ok( !((ctx.Esp + 0x10) & 0xfff) || broken( !((ctx.Esp + 4) & 0xfff) ), /* winxp, w2k3 */ + "esp is not at top of stack page or properly aligned: %08x\n", ctx.Esp ); +#endif + + ResumeThread( thread_handle ); ok(WaitForSingleObject(thread_handle, 60000) == WAIT_OBJECT_0, "Waiting for remote thread failed (%d)\n", GetLastError()); ok(GetExitCodeThread(thread_handle, &exit_code), "Failed to retrieve remote thread exit code (%d)\n", GetLastError()); ok(exit_code == 0x1234, "Invalid remote thread exit code\n");

1 0

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

Nov. 30, 2017

Module: wine Branch: master Commit: 0d3ebfc45981e7d61522c44ff91f9b8748ca5c60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d3ebfc45981e7d61522c44ff… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 30 09:37:11 2017 +0100 taskschd: Implement IExecAction_get_Path. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 16 ++++++++++++++-- dlls/taskschd/tests/scheduler.c | 13 +++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 01e7c2d..df75236 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1740,8 +1740,20 @@ static HRESULT WINAPI ExecAction_get_Type(IExecAction *iface, TASK_ACTION_TYPE * static HRESULT WINAPI ExecAction_get_Path(IExecAction *iface, BSTR *path) { - FIXME("%p,%p: stub\n", iface, path); - return E_NOTIMPL; + ExecAction *action = impl_from_IExecAction(iface); + + TRACE("%p,%p\n", iface, path); + + if (!path) return E_POINTER; + + if (!action->path) + { + *path = NULL; + return S_OK; + } + + if (!(*path = SysAllocString(action->path))) return E_OUTOFMEMORY; + return S_OK; } static HRESULT WINAPI ExecAction_put_Path(IExecAction *iface, BSTR path) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 22854d9..c7de7c7 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1236,6 +1236,7 @@ static void create_action(ITaskDefinition *taskdef) IAction *action; IExecAction *exec_action; TASK_ACTION_TYPE type; + BSTR path; hr = ITaskDefinition_get_Actions(taskdef, &actions); ok(hr == S_OK, "get_Actions error %#x\n", hr); @@ -1251,9 +1252,21 @@ static void create_action(ITaskDefinition *taskdef) ok(hr == S_OK, "get_Type error %#x\n", hr); ok(type == TASK_ACTION_EXEC, "got %u\n", type ); + path = (BSTR)0xdeadbeef; + hr = IExecAction_get_Path(exec_action, &path); + ok(hr == S_OK, "get_Path error %#x\n", hr); + ok(path == NULL, "path not set\n"); + hr = IExecAction_put_Path(exec_action, task1_exe); ok(hr == S_OK, "put_Path error %#x\n", hr); + path = NULL; + hr = IExecAction_get_Path(exec_action, &path); + ok(hr == S_OK, "get_Path error %#x\n", hr); + ok(path != NULL, "path not set\n"); + ok(!lstrcmpW(path, task1_exe), "wrong path\n" ); + SysFreeString(path); + IExecAction_Release(exec_action); IAction_Release(action); IActionCollection_Release(actions);

1 0

Piotr Caban : msvcrt: Don' t report error in fclose on already closed stream.
by Alexandre Julliard Nov. 30, 2017

Nov. 30, 2017

Module: wine Branch: master Commit: 96584d858a75ed0fc627ab9912bec815511596cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=96584d858a75ed0fc627ab991… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 30 20:28:30 2017 +0100 msvcrt: Don't report error in fclose on already closed stream. 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 | 3 +++ 2 files changed, 9 insertions(+) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 116a9bd..43c3fc4 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3627,6 +3627,12 @@ int CDECL MSVCRT__fclose_nolock(MSVCRT_FILE* file) { int r, flag; + if(!(file->_flag & (MSVCRT__IOREAD | MSVCRT__IOWRT | MSVCRT__IORW))) + { + file->_flag = 0; + return MSVCRT_EOF; + } + flag = file->_flag; MSVCRT_free(file->_tmpfname); file->_tmpfname = NULL; diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index d4d63f2..136ee15 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1742,10 +1742,13 @@ static void test_fopen_fclose_fcloseall( void ) ok(ret == 0, "The file '%s' was not closed\n", fname2); ret = fclose(stream3); ok(ret == 0, "The file '%s' was not closed\n", fname3); + errno = 0xdeadbeef; ret = fclose(stream2); ok(ret == EOF, "Closing file '%s' returned %d\n", fname2, ret); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); ret = fclose(stream3); ok(ret == EOF, "Closing file '%s' returned %d\n", fname3, ret); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); /* testing fcloseall() */ numclosed = _fcloseall();

1 0

Jacek Caban : mshtml: Removed unused impl_from_DispatchEx.
by Alexandre Julliard Nov. 30, 2017

Nov. 30, 2017

Module: wine Branch: master Commit: dda20ef4ec9d0db3354789b525a079db44cb17bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=dda20ef4ec9d0db3354789b52… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 30 16:09:37 2017 +0100 mshtml: Removed unused impl_from_DispatchEx. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 0b9a36b..3b8820e 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2051,11 +2051,6 @@ static inline EventTarget *impl_from_IEventTarget(IEventTarget *iface) return CONTAINING_RECORD(iface, EventTarget, IEventTarget_iface); } -static inline EventTarget *impl_from_DispatchEx(DispatchEx *iface) -{ - return CONTAINING_RECORD(iface, EventTarget, dispex); -} - static HRESULT WINAPI EventTarget_QueryInterface(IEventTarget *iface, REFIID riid, void **ppv) { EventTarget *This = impl_from_IEventTarget(iface);

1 0

Alexandre Julliard : ntdll: Suspend a thread with its start context explicitly before attaching dlls.
by Alexandre Julliard Nov. 30, 2017

Nov. 30, 2017

Module: wine Branch: master Commit: 6c61ea6a13eae35429f48b07d32fc5a67e3b5833 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c61ea6a13eae35429f48b07d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 30 11:01:47 2017 +0100 ntdll: Suspend a thread with its start context explicitly before attaching dlls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 4 ++-- dlls/ntdll/server.c | 3 ++- dlls/ntdll/signal_arm.c | 12 +++++++++++- dlls/ntdll/signal_arm64.c | 12 +++++++++++- dlls/ntdll/signal_i386.c | 20 +++++++++++++++++++- dlls/ntdll/signal_powerpc.c | 12 +++++++++++- dlls/ntdll/signal_x86_64.c | 15 ++++++++++++++- dlls/ntdll/thread.c | 8 +++++--- include/wine/server_protocol.h | 4 ++-- server/protocol.def | 1 + server/request.h | 1 + server/thread.c | 2 +- server/trace.c | 1 + 13 files changed, 81 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6c61ea6a13eae35429f48…

1 0

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

Nov. 30, 2017

Module: wine Branch: master Commit: 8d739937d336f78cd34e8aa8a873f89a43ca274c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d739937d336f78cd34e8aa8a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 30 09:37:09 2017 +0100 taskschd: Implement IActionCollection_Create. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 188 +++++++++++++++++++++++++++++++++++++++- dlls/taskschd/tests/scheduler.c | 13 ++- 2 files changed, 192 insertions(+), 9 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 1c20f83..f32d3d2 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1636,6 +1636,181 @@ static HRESULT Principal_create(IPrincipal **obj) typedef struct { + IExecAction IExecAction_iface; + LONG ref; +} ExecAction; + +static inline ExecAction *impl_from_IExecAction(IExecAction *iface) +{ + return CONTAINING_RECORD(iface, ExecAction, IExecAction_iface); +} + +static ULONG WINAPI ExecAction_AddRef(IExecAction *iface) +{ + ExecAction *action = impl_from_IExecAction(iface); + return InterlockedIncrement(&action->ref); +} + +static ULONG WINAPI ExecAction_Release(IExecAction *iface) +{ + ExecAction *action = impl_from_IExecAction(iface); + LONG ref = InterlockedDecrement(&action->ref); + + if (!ref) + { + TRACE("destroying %p\n", iface); + heap_free(action); + } + + return ref; +} + +static HRESULT WINAPI ExecAction_QueryInterface(IExecAction *iface, REFIID riid, void **obj) +{ + if (!riid || !obj) return E_INVALIDARG; + + TRACE("%p,%s,%p\n", iface, debugstr_guid(riid), obj); + + if (IsEqualGUID(riid, &IID_IExecAction) || + IsEqualGUID(riid, &IID_IAction) || + IsEqualGUID(riid, &IID_IDispatch) || + IsEqualGUID(riid, &IID_IUnknown)) + { + IExecAction_AddRef(iface); + *obj = iface; + return S_OK; + } + + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static HRESULT WINAPI ExecAction_GetTypeInfoCount(IExecAction *iface, UINT *count) +{ + FIXME("%p,%p: stub\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI ExecAction_GetTypeInfo(IExecAction *iface, UINT index, LCID lcid, ITypeInfo **info) +{ + FIXME("%p,%u,%u,%p: stub\n", iface, index, lcid, info); + return E_NOTIMPL; +} + +static HRESULT WINAPI ExecAction_GetIDsOfNames(IExecAction *iface, REFIID riid, LPOLESTR *names, + UINT count, LCID lcid, DISPID *dispid) +{ + FIXME("%p,%s,%p,%u,%u,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); + return E_NOTIMPL; +} + +static HRESULT WINAPI ExecAction_Invoke(IExecAction *iface, DISPID dispid, REFIID riid, LCID lcid, WORD flags, + DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *argerr) +{ + FIXME("%p,%d,%s,%04x,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, + params, result, excepinfo, argerr); + return E_NOTIMPL; +} + +static HRESULT WINAPI ExecAction_get_Id(IExecAction *iface, BSTR *id) +{ + FIXME("%p,%p: stub\n", iface, id); + return E_NOTIMPL; +} + +static HRESULT WINAPI ExecAction_put_Id(IExecAction *iface, BSTR id) +{ + FIXME("%p,%s: stub\n", iface, debugstr_w(id)); + return E_NOTIMPL; +} + +static HRESULT WINAPI ExecAction_get_Type(IExecAction *iface, TASK_ACTION_TYPE *type) +{ + TRACE("%p,%p\n", iface, type); + + if (!type) return E_POINTER; + + *type = TASK_ACTION_EXEC; + + return S_OK; +} + +static HRESULT WINAPI ExecAction_get_Path(IExecAction *iface, BSTR *path) +{ + FIXME("%p,%p: stub\n", iface, path); + return E_NOTIMPL; +} + +static HRESULT WINAPI ExecAction_put_Path(IExecAction *iface, BSTR path) +{ + FIXME("%p,%s: stub\n", iface, debugstr_w(path)); + return S_OK; +} + +static HRESULT WINAPI ExecAction_get_Arguments(IExecAction *iface, BSTR *arguments) +{ + FIXME("%p,%p: stub\n", iface, arguments); + return E_NOTIMPL; +} + +static HRESULT WINAPI ExecAction_put_Arguments(IExecAction *iface, BSTR arguments) +{ + FIXME("%p,%s: stub\n", iface, debugstr_w(arguments)); + return S_OK; +} + +static HRESULT WINAPI ExecAction_get_WorkingDirectory(IExecAction *iface, BSTR *directory) +{ + FIXME("%p,%p: stub\n", iface, directory); + return E_NOTIMPL; +} + +static HRESULT WINAPI ExecAction_put_WorkingDirectory(IExecAction *iface, BSTR directory) +{ + FIXME("%p,%s: stub\n", iface, debugstr_w(directory)); + return E_NOTIMPL; +} + +static const IExecActionVtbl Action_vtbl = +{ + ExecAction_QueryInterface, + ExecAction_AddRef, + ExecAction_Release, + ExecAction_GetTypeInfoCount, + ExecAction_GetTypeInfo, + ExecAction_GetIDsOfNames, + ExecAction_Invoke, + ExecAction_get_Id, + ExecAction_put_Id, + ExecAction_get_Type, + ExecAction_get_Path, + ExecAction_put_Path, + ExecAction_get_Arguments, + ExecAction_put_Arguments, + ExecAction_get_WorkingDirectory, + ExecAction_put_WorkingDirectory +}; + +static HRESULT ExecAction_create(IExecAction **obj) +{ + ExecAction *action; + + action = heap_alloc(sizeof(*action)); + if (!action) return E_OUTOFMEMORY; + + action->IExecAction_iface.lpVtbl = &Action_vtbl; + action->ref = 1; + + *obj = &action->IExecAction_iface; + + TRACE("created %p\n", *obj); + + return S_OK; +} + +typedef struct +{ IActionCollection IActionCollection_iface; LONG ref; } Actions; @@ -1744,8 +1919,17 @@ static HRESULT WINAPI Actions_put_XmlText(IActionCollection *iface, BSTR xml) static HRESULT WINAPI Actions_Create(IActionCollection *iface, TASK_ACTION_TYPE type, IAction **action) { - FIXME("%p,%u,%p: stub\n", iface, type, action); - return E_NOTIMPL; + TRACE("%p,%u,%p\n", iface, type, action); + + switch (type) + { + case TASK_ACTION_EXEC: + return ExecAction_create((IExecAction **)action); + + default: + FIXME("unimplemented type %u\n", type); + return E_NOTIMPL; + } } static HRESULT WINAPI Actions_Remove(IActionCollection *iface, VARIANT index) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 1df79d5..22854d9 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1235,23 +1235,22 @@ static void create_action(ITaskDefinition *taskdef) IActionCollection *actions; IAction *action; IExecAction *exec_action; + TASK_ACTION_TYPE type; hr = ITaskDefinition_get_Actions(taskdef, &actions); ok(hr == S_OK, "get_Actions error %#x\n", hr); hr = IActionCollection_Create(actions, TASK_ACTION_EXEC, &action); -todo_wine ok(hr == S_OK, "Create action error %#x\n", hr); - /* FIXME: Remove once implemented */ - if (hr != S_OK) - { - IActionCollection_Release(actions); - return; - } hr = IAction_QueryInterface(action, &IID_IExecAction, (void **)&exec_action); ok(hr == S_OK, "QueryInterface error %#x\n", hr); + type = 0xdeadbeef; + hr = IExecAction_get_Type(exec_action, &type); + ok(hr == S_OK, "get_Type error %#x\n", hr); + ok(type == TASK_ACTION_EXEC, "got %u\n", type ); + hr = IExecAction_put_Path(exec_action, task1_exe); ok(hr == S_OK, "put_Path error %#x\n", hr);

1 0

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

Nov. 30, 2017

Module: wine Branch: master Commit: 759ef6a4fa8be8b9696552d5b89cf46f0f3950ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=759ef6a4fa8be8b9696552d5b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 30 09:37:08 2017 +0100 taskschd: Implement ITaskDefinition_put_Actions. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 15 +++++++++++++-- dlls/taskschd/tests/scheduler.c | 10 ++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 166e587..1c20f83 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -2093,8 +2093,19 @@ static HRESULT WINAPI TaskDefinition_get_Actions(ITaskDefinition *iface, IAction static HRESULT WINAPI TaskDefinition_put_Actions(ITaskDefinition *iface, IActionCollection *actions) { - FIXME("%p,%p: stub\n", iface, actions); - return E_NOTIMPL; + TaskDefinition *taskdef = impl_from_ITaskDefinition(iface); + + TRACE("%p,%p\n", iface, actions); + + if (!actions) return E_POINTER; + + if (taskdef->actions) + IActionCollection_Release(taskdef->actions); + + IActionCollection_AddRef(actions); + taskdef->actions = actions; + + return S_OK; } static const WCHAR Task[] = {'T','a','s','k',0}; diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 3d1d18e..1df79d5 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1096,6 +1096,7 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ITaskSettings *set; ITriggerCollection *triggers; IPrincipal *principal; + IActionCollection *actions; hr = ITaskDefinition_get_Settings(taskdef, &set); ok(hr == S_OK, "get_Settings error %#x\n", hr); @@ -1178,6 +1179,15 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); if (principal) IPrincipal_Release(principal); + actions = NULL; + hr = ITaskDefinition_get_Actions(taskdef, &actions); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + ok(actions != NULL, "actions not set\n"); + + hr = ITaskDefinition_put_Actions(taskdef, actions); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + if (actions) IActionCollection_Release(actions); + /* FIXME: set IIdleSettings and INetworkSettings */ ITaskSettings_Release(set);

1 0

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

Nov. 30, 2017

Module: wine Branch: master Commit: 96cf60ecac7afc789e5e85b58655f79bf64cde6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=96cf60ecac7afc789e5e85b58… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 30 09:37:04 2017 +0100 taskschd: Implement ITaskDefinition_put_Triggers. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 15 +++++++++++++-- dlls/taskschd/tests/scheduler.c | 10 ++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 731c22d..d4e0d56 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1601,8 +1601,19 @@ static HRESULT WINAPI TaskDefinition_get_Triggers(ITaskDefinition *iface, ITrigg static HRESULT WINAPI TaskDefinition_put_Triggers(ITaskDefinition *iface, ITriggerCollection *triggers) { - FIXME("%p,%p: stub\n", iface, triggers); - return E_NOTIMPL; + TaskDefinition *taskdef = impl_from_ITaskDefinition(iface); + + TRACE("%p,%p\n", iface, triggers); + + if (!triggers) return E_POINTER; + + if (taskdef->triggers) + ITriggerCollection_Release(taskdef->triggers); + + ITriggerCollection_AddRef(triggers); + taskdef->triggers = triggers; + + return S_OK; } static HRESULT WINAPI TaskDefinition_get_Settings(ITaskDefinition *iface, ITaskSettings **settings) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 07083af..c58a507 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1094,6 +1094,7 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) { HRESULT hr; ITaskSettings *set; + ITriggerCollection *triggers; hr = ITaskDefinition_get_Settings(taskdef, &set); ok(hr == S_OK, "get_Settings error %#x\n", hr); @@ -1158,6 +1159,15 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) hr = ITaskSettings_put_AllowDemandStart(set, test->allow_on_demand_start); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + triggers = NULL; + hr = ITaskDefinition_get_Triggers(taskdef, &triggers); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + ok(triggers != NULL, "triggers not set\n"); + + hr = ITaskDefinition_put_Triggers(taskdef, triggers); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + if (triggers) ITriggerCollection_Release(triggers); + /* FIXME: set IIdleSettings and INetworkSettings */ ITaskSettings_Release(set);

1 0

Zebediah Figura : shell32: Implement the ShowGroup() command for Progman DDE.
by Alexandre Julliard Nov. 30, 2017

Nov. 30, 2017

Module: wine Branch: master Commit: fd851064d84f986f36ffe7f2f909d344a289dc67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd851064d84f986f36ffe7f2f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 29 17:00:48 2017 -0600 shell32: Implement the ShowGroup() command for Progman DDE. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/dde.c | 15 +++++++++++++++ dlls/shell32/tests/progman_dde.c | 10 ++-------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/dde.c b/dlls/shell32/dde.c index a1aac15..36b5dfa 100644 --- a/dlls/shell32/dde.c +++ b/dlls/shell32/dde.c @@ -121,6 +121,7 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) { static const WCHAR create_groupW[] = {'C','r','e','a','t','e','G','r','o','u','p',0}; static const WCHAR delete_groupW[] = {'D','e','l','e','t','e','G','r','o','u','p',0}; + static const WCHAR show_groupW[] = {'S','h','o','w','G','r','o','u','p',0}; if (!strcmpiW(command, create_groupW)) { @@ -160,6 +161,20 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) if (ret || shfos.fAnyOperationsAborted) return DDE_FNOTPROCESSED; } + else if (!strcmpiW(command, show_groupW)) + { + WCHAR *path; + + /* Win32 requires the second parameter to be present but seems to + * ignore its actual value. */ + if (argc < 2) return DDE_FNOTPROCESSED; + + path = get_programs_path(argv[0]); + + ShellExecuteW(NULL, NULL, path, NULL, NULL, SW_SHOWNORMAL); + + HeapFree(GetProcessHeap(), 0, path); + } else { FIXME("unhandled command %s\n", debugstr_w(command)); diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index c5fd262..b54a72a 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -332,18 +332,12 @@ static void test_progman_dde(DWORD instance, HCONV hConv) ok(!check_exists("Group1/f3g1Name.lnk"), "link should not exist\n"); error = dde_execute(instance, hConv, "[ShowGroup(Startup, 0)]"); - todo_wine { ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); - if (error == DMLERR_NO_ERROR) - ok(check_window_exists(StartupTitle), "window not created\n"); - } + ok(check_window_exists(StartupTitle), "window not created\n"); error = dde_execute(instance, hConv, "[ShowGroup(Group1, 0)]"); - todo_wine { ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); - if (error == DMLERR_NO_ERROR) - ok(check_window_exists(Group1Title), "window not created\n"); - } + ok(check_window_exists(Group1Title), "window not created\n"); /* DeleteGroup Test */ error = dde_execute(instance, hConv, "[DeleteGroup(Group1)]");

1 0

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

Nov. 30, 2017

Module: wine Branch: master Commit: c0858ec0cb004f0c9019bba6e50937dfe822d4b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0858ec0cb004f0c9019bba6e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 30 09:37:07 2017 +0100 taskschd: Implement ITaskDefinition_get_Actions. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 203 ++++++++++++++++++++++++++++++++++++++-- dlls/taskschd/tests/scheduler.c | 10 +- 2 files changed, 204 insertions(+), 9 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 6828c98..166e587 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1636,6 +1636,182 @@ static HRESULT Principal_create(IPrincipal **obj) typedef struct { + IActionCollection IActionCollection_iface; + LONG ref; +} Actions; + +static inline Actions *impl_from_IActionCollection(IActionCollection *iface) +{ + return CONTAINING_RECORD(iface, Actions, IActionCollection_iface); +} + +static ULONG WINAPI Actions_AddRef(IActionCollection *iface) +{ + Actions *actions = impl_from_IActionCollection(iface); + return InterlockedIncrement(&actions->ref); +} + +static ULONG WINAPI Actions_Release(IActionCollection *iface) +{ + Actions *actions = impl_from_IActionCollection(iface); + LONG ref = InterlockedDecrement(&actions->ref); + + if (!ref) + { + TRACE("destroying %p\n", iface); + heap_free(actions); + } + + return ref; +} + +static HRESULT WINAPI Actions_QueryInterface(IActionCollection *iface, REFIID riid, void **obj) +{ + if (!riid || !obj) return E_INVALIDARG; + + TRACE("%p,%s,%p\n", iface, debugstr_guid(riid), obj); + + if (IsEqualGUID(riid, &IID_IActionCollection) || + IsEqualGUID(riid, &IID_IDispatch) || + IsEqualGUID(riid, &IID_IUnknown)) + { + IActionCollection_AddRef(iface); + *obj = iface; + return S_OK; + } + + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static HRESULT WINAPI Actions_GetTypeInfoCount(IActionCollection *iface, UINT *count) +{ + FIXME("%p,%p: stub\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI Actions_GetTypeInfo(IActionCollection *iface, UINT index, LCID lcid, ITypeInfo **info) +{ + FIXME("%p,%u,%u,%p: stub\n", iface, index, lcid, info); + return E_NOTIMPL; +} + +static HRESULT WINAPI Actions_GetIDsOfNames(IActionCollection *iface, REFIID riid, LPOLESTR *names, + UINT count, LCID lcid, DISPID *dispid) +{ + FIXME("%p,%s,%p,%u,%u,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); + return E_NOTIMPL; +} + +static HRESULT WINAPI Actions_Invoke(IActionCollection *iface, DISPID dispid, REFIID riid, LCID lcid, WORD flags, + DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *argerr) +{ + FIXME("%p,%d,%s,%04x,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, + params, result, excepinfo, argerr); + return E_NOTIMPL; +} + +static HRESULT WINAPI Actions_get_Count(IActionCollection *iface, LONG *count) +{ + FIXME("%p,%p: stub\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI Actions_get_Item(IActionCollection *iface, LONG index, IAction **action) +{ + FIXME("%p,%d,%p: stub\n", iface, index, action); + return E_NOTIMPL; +} + +static HRESULT WINAPI Actions_get__NewEnum(IActionCollection *iface, IUnknown **penum) +{ + FIXME("%p,%p: stub\n", iface, penum); + return E_NOTIMPL; +} + +static HRESULT WINAPI Actions_get_XmlText(IActionCollection *iface, BSTR *xml) +{ + FIXME("%p,%p: stub\n", iface, xml); + return E_NOTIMPL; +} + +static HRESULT WINAPI Actions_put_XmlText(IActionCollection *iface, BSTR xml) +{ + FIXME("%p,%s: stub\n", iface, debugstr_w(xml)); + return E_NOTIMPL; +} + +static HRESULT WINAPI Actions_Create(IActionCollection *iface, TASK_ACTION_TYPE type, IAction **action) +{ + FIXME("%p,%u,%p: stub\n", iface, type, action); + return E_NOTIMPL; +} + +static HRESULT WINAPI Actions_Remove(IActionCollection *iface, VARIANT index) +{ + FIXME("%p,%s: stub\n", iface, debugstr_variant(&index)); + return E_NOTIMPL; +} + +static HRESULT WINAPI Actions_Clear(IActionCollection *iface) +{ + FIXME("%p: stub\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI Actions_get_Context(IActionCollection *iface, BSTR *ctx) +{ + FIXME("%p,%p: stub\n", iface, ctx); + return E_NOTIMPL; +} + +static HRESULT WINAPI Actions_put_Context(IActionCollection *iface, BSTR ctx) +{ + FIXME("%p,%s: stub\n", iface, debugstr_w(ctx)); + return S_OK; +} + +static const IActionCollectionVtbl Actions_vtbl = +{ + Actions_QueryInterface, + Actions_AddRef, + Actions_Release, + Actions_GetTypeInfoCount, + Actions_GetTypeInfo, + Actions_GetIDsOfNames, + Actions_Invoke, + Actions_get_Count, + Actions_get_Item, + Actions_get__NewEnum, + Actions_get_XmlText, + Actions_put_XmlText, + Actions_Create, + Actions_Remove, + Actions_Clear, + Actions_get_Context, + Actions_put_Context +}; + +static HRESULT Actions_create(IActionCollection **obj) +{ + Actions *actions; + + actions = heap_alloc(sizeof(*actions)); + if (!actions) return E_OUTOFMEMORY; + + actions->IActionCollection_iface.lpVtbl = &Actions_vtbl; + actions->ref = 1; + + *obj = &actions->IActionCollection_iface; + + TRACE("created %p\n", *obj); + + return S_OK; +} + +typedef struct +{ ITaskDefinition ITaskDefinition_iface; LONG ref; IRegistrationInfo *reginfo; @@ -1896,8 +2072,23 @@ static HRESULT WINAPI TaskDefinition_put_Principal(ITaskDefinition *iface, IPrin static HRESULT WINAPI TaskDefinition_get_Actions(ITaskDefinition *iface, IActionCollection **actions) { - FIXME("%p,%p: stub\n", iface, actions); - return E_NOTIMPL; + TaskDefinition *taskdef = impl_from_ITaskDefinition(iface); + HRESULT hr; + + TRACE("%p,%p\n", iface, actions); + + if (!actions) return E_POINTER; + + if (!taskdef->actions) + { + hr = Actions_create(&taskdef->actions); + if (hr != S_OK) return hr; + } + + IActionCollection_AddRef(taskdef->actions); + *actions = taskdef->actions; + + return S_OK; } static HRESULT WINAPI TaskDefinition_put_Actions(ITaskDefinition *iface, IActionCollection *actions) @@ -1938,7 +2129,7 @@ static const WCHAR S4U[] = {'S','4','U',0}; static const WCHAR InteractiveToken[] = {'I','n','t','e','r','a','c','t','i','v','e','T','o','k','e','n',0}; static const WCHAR RunLevel[] = {'R','u','n','L','e','v','e','l',0}; static const WCHAR LeastPrivilege[] = {'L','e','a','s','t','P','r','i','v','i','l','e','g','e',0}; -static const WCHAR Actions[] = {'A','c','t','i','o','n','s',0}; +static const WCHAR actionsW[] = {'A','c','t','i','o','n','s',0}; static const WCHAR Exec[] = {'E','x','e','c',0}; static const WCHAR MultipleInstancesPolicy[] = {'M','u','l','t','i','p','l','e','I','n','s','t','a','n','c','e','s','P','o','l','i','c','y',0}; static const WCHAR IgnoreNew[] = {'I','g','n','o','r','e','N','e','w',0}; @@ -2298,11 +2489,11 @@ static HRESULT write_actions(IStream *stream, IActionCollection *actions) { if (!actions) { - write_element(stream, Actions); + write_element(stream, actionsW); push_indent(); write_empty_element(stream, Exec); pop_indent(); - return write_element_end(stream, Actions); + return write_element_end(stream, actionsW); } FIXME("stub\n"); @@ -2958,7 +3149,7 @@ static HRESULT read_task(IXmlReader *reader, ITaskDefinition *taskdef) hr = read_triggers(reader, taskdef); else if (!lstrcmpW(name, Principals)) hr = read_principals(reader, taskdef); - else if (!lstrcmpW(name, Actions)) + else if (!lstrcmpW(name, actionsW)) hr = read_actions(reader, taskdef); else FIXME("unhandled Task element %s\n", debugstr_w(name)); diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 244c28d..3d1d18e 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1227,13 +1227,17 @@ static void create_action(ITaskDefinition *taskdef) IExecAction *exec_action; hr = ITaskDefinition_get_Actions(taskdef, &actions); -todo_wine ok(hr == S_OK, "get_Actions error %#x\n", hr); - /* FIXME: Remove once implemented */ - if (hr != S_OK) return; hr = IActionCollection_Create(actions, TASK_ACTION_EXEC, &action); +todo_wine ok(hr == S_OK, "Create action error %#x\n", hr); + /* FIXME: Remove once implemented */ + if (hr != S_OK) + { + IActionCollection_Release(actions); + return; + } hr = IAction_QueryInterface(action, &IID_IExecAction, (void **)&exec_action); ok(hr == S_OK, "QueryInterface error %#x\n", hr);

1 0

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

Nov. 30, 2017

Module: wine Branch: master Commit: 4a0fa13f28c06995cc7188e9b90f4d8dfcf1e107 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a0fa13f28c06995cc7188e9b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 30 09:37:05 2017 +0100 taskschd: Implement ITaskDefinition_get_Principal. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 221 ++++++++++++++++++++++++++++++++++++++-- dlls/taskschd/tests/scheduler.c | 7 ++ 2 files changed, 220 insertions(+), 8 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index d4e0d56..185f5c2 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1446,6 +1446,196 @@ static HRESULT TaskSettings_create(ITaskSettings **obj) typedef struct { + IPrincipal IPrincipal_iface; + LONG ref; +} Principal; + +static inline Principal *impl_from_IPrincipal(IPrincipal *iface) +{ + return CONTAINING_RECORD(iface, Principal, IPrincipal_iface); +} + +static ULONG WINAPI Principal_AddRef(IPrincipal *iface) +{ + Principal *principal = impl_from_IPrincipal(iface); + return InterlockedIncrement(&principal->ref); +} + +static ULONG WINAPI Principal_Release(IPrincipal *iface) +{ + Principal *principal = impl_from_IPrincipal(iface); + LONG ref = InterlockedDecrement(&principal->ref); + + if (!ref) + { + TRACE("destroying %p\n", iface); + heap_free(principal); + } + + return ref; +} + +static HRESULT WINAPI Principal_QueryInterface(IPrincipal *iface, REFIID riid, void **obj) +{ + if (!riid || !obj) return E_INVALIDARG; + + TRACE("%p,%s,%p\n", iface, debugstr_guid(riid), obj); + + if (IsEqualGUID(riid, &IID_IPrincipal) || + IsEqualGUID(riid, &IID_IDispatch) || + IsEqualGUID(riid, &IID_IUnknown)) + { + IPrincipal_AddRef(iface); + *obj = iface; + return S_OK; + } + + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static HRESULT WINAPI Principal_GetTypeInfoCount(IPrincipal *iface, UINT *count) +{ + FIXME("%p,%p: stub\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI Principal_GetTypeInfo(IPrincipal *iface, UINT index, LCID lcid, ITypeInfo **info) +{ + FIXME("%p,%u,%u,%p: stub\n", iface, index, lcid, info); + return E_NOTIMPL; +} + +static HRESULT WINAPI Principal_GetIDsOfNames(IPrincipal *iface, REFIID riid, LPOLESTR *names, + UINT count, LCID lcid, DISPID *dispid) +{ + FIXME("%p,%s,%p,%u,%u,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); + return E_NOTIMPL; +} + +static HRESULT WINAPI Principal_Invoke(IPrincipal *iface, DISPID dispid, REFIID riid, LCID lcid, WORD flags, + DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *argerr) +{ + FIXME("%p,%d,%s,%04x,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, + params, result, excepinfo, argerr); + return E_NOTIMPL; +} + +static HRESULT WINAPI Principal_get_Id(IPrincipal *iface, BSTR *id) +{ + FIXME("%p,%p: stub\n", iface, id); + return E_NOTIMPL; +} + +static HRESULT WINAPI Principal_put_Id(IPrincipal *iface, BSTR id) +{ + FIXME("%p,%s: stub\n", iface, debugstr_w(id)); + return S_OK; +} + +static HRESULT WINAPI Principal_get_DisplayName(IPrincipal *iface, BSTR *name) +{ + FIXME("%p,%p: stub\n", iface, name); + return E_NOTIMPL; +} + +static HRESULT WINAPI Principal_put_DisplayName(IPrincipal *iface, BSTR name) +{ + FIXME("%p,%s: stub\n", iface, debugstr_w(name)); + return E_NOTIMPL; +} + +static HRESULT WINAPI Principal_get_UserId(IPrincipal *iface, BSTR *user_id) +{ + FIXME("%p,%p: stub\n", iface, user_id); + return E_NOTIMPL; +} + +static HRESULT WINAPI Principal_put_UserId(IPrincipal *iface, BSTR user_id) +{ + FIXME("%p,%s: stub\n", iface, debugstr_w(user_id)); + return S_OK; +} + +static HRESULT WINAPI Principal_get_LogonType(IPrincipal *iface, TASK_LOGON_TYPE *logon_type) +{ + FIXME("%p,%p: stub\n", iface, logon_type); + return E_NOTIMPL; +} + +static HRESULT WINAPI Principal_put_LogonType(IPrincipal *iface, TASK_LOGON_TYPE logon_type) +{ + FIXME("%p,%u: stub\n", iface, logon_type); + return E_NOTIMPL; +} + +static HRESULT WINAPI Principal_get_GroupId(IPrincipal *iface, BSTR *group_id) +{ + FIXME("%p,%p: stub\n", iface, group_id); + return E_NOTIMPL; +} + +static HRESULT WINAPI Principal_put_GroupId(IPrincipal *iface, BSTR group_id) +{ + FIXME("%p,%s: stub\n", iface, debugstr_w(group_id)); + return E_NOTIMPL; +} + +static HRESULT WINAPI Principal_get_RunLevel(IPrincipal *iface, TASK_RUNLEVEL_TYPE *run_level) +{ + FIXME("%p,%p: stub\n", iface, run_level); + return E_NOTIMPL; +} + +static HRESULT WINAPI Principal_put_RunLevel(IPrincipal *iface, TASK_RUNLEVEL_TYPE run_level) +{ + FIXME("%p,%u: stub\n", iface, run_level); + return E_NOTIMPL; +} + +static const IPrincipalVtbl Principal_vtbl = +{ + Principal_QueryInterface, + Principal_AddRef, + Principal_Release, + Principal_GetTypeInfoCount, + Principal_GetTypeInfo, + Principal_GetIDsOfNames, + Principal_Invoke, + Principal_get_Id, + Principal_put_Id, + Principal_get_DisplayName, + Principal_put_DisplayName, + Principal_get_UserId, + Principal_put_UserId, + Principal_get_LogonType, + Principal_put_LogonType, + Principal_get_GroupId, + Principal_put_GroupId, + Principal_get_RunLevel, + Principal_put_RunLevel +}; + +static HRESULT Principal_create(IPrincipal **obj) +{ + Principal *principal; + + principal = heap_alloc(sizeof(*principal)); + if (!principal) return E_OUTOFMEMORY; + + principal->IPrincipal_iface.lpVtbl = &Principal_vtbl; + principal->ref = 1; + + *obj = &principal->IPrincipal_iface; + + TRACE("created %p\n", *obj); + + return S_OK; +} + +typedef struct +{ ITaskDefinition ITaskDefinition_iface; LONG ref; IRegistrationInfo *reginfo; @@ -1668,8 +1858,23 @@ static HRESULT WINAPI TaskDefinition_put_Data(ITaskDefinition *iface, BSTR data) static HRESULT WINAPI TaskDefinition_get_Principal(ITaskDefinition *iface, IPrincipal **principal) { - FIXME("%p,%p: stub\n", iface, principal); - return E_NOTIMPL; + TaskDefinition *taskdef = impl_from_ITaskDefinition(iface); + HRESULT hr; + + TRACE("%p,%p\n", iface, principal); + + if (!principal) return E_POINTER; + + if (!taskdef->principal) + { + hr = Principal_create(&taskdef->principal); + if (hr != S_OK) return hr; + } + + IPrincipal_AddRef(taskdef->principal); + *principal = taskdef->principal; + + return S_OK; } static HRESULT WINAPI TaskDefinition_put_Principal(ITaskDefinition *iface, IPrincipal *principal) @@ -1710,7 +1915,7 @@ static const WCHAR SecurityDescriptor[] = {'S','e','c','u','r','i','t','y','D',' static const WCHAR Settings[] = {'S','e','t','t','i','n','g','s',0}; static const WCHAR Triggers[] = {'T','r','i','g','g','e','r','s',0}; static const WCHAR Principals[] = {'P','r','i','n','c','i','p','a','l','s',0}; -static const WCHAR Principal[] = {'P','r','i','n','c','i','p','a','l',0}; +static const WCHAR principalW[] = {'P','r','i','n','c','i','p','a','l',0}; static const WCHAR id[] = {'i','d',0}; static const WCHAR UserId[] = {'U','s','e','r','I','d',0}; static const WCHAR LogonType[] = {'L','o','g','o','n','T','y','p','e',0}; @@ -1964,7 +2169,7 @@ static HRESULT write_principal(IStream *stream, IPrincipal *principal) { write_indent(stream); write_stringW(stream, start_element); - write_stringW(stream, Principal); + write_stringW(stream, principalW); write_stringW(stream, spaceW); write_stringW(stream, id); write_stringW(stream, equalW); @@ -1976,7 +2181,7 @@ static HRESULT write_principal(IStream *stream, IPrincipal *principal) SysFreeString(bstr); } else - write_element(stream, Principal); + write_element(stream, principalW); push_indent(); @@ -2054,7 +2259,7 @@ static HRESULT write_principal(IStream *stream, IPrincipal *principal) } pop_indent(); - write_element_end(stream, Principal); + write_element_end(stream, principalW); pop_indent(); return write_element_end(stream, Principals); @@ -2275,7 +2480,7 @@ static HRESULT read_principal(IXmlReader *reader, IPrincipal *principal) TRACE("/%s\n", debugstr_w(name)); - if (!lstrcmpW(name, Principal)) + if (!lstrcmpW(name, principalW)) return S_OK; break; @@ -2374,7 +2579,7 @@ static HRESULT read_principals(IXmlReader *reader, ITaskDefinition *taskdef) TRACE("Element: %s\n", debugstr_w(name)); - if (!lstrcmpW(name, Principal)) + if (!lstrcmpW(name, principalW)) { IPrincipal *principal; diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index c58a507..ad07556 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1095,6 +1095,7 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) HRESULT hr; ITaskSettings *set; ITriggerCollection *triggers; + IPrincipal *principal; hr = ITaskDefinition_get_Settings(taskdef, &set); ok(hr == S_OK, "get_Settings error %#x\n", hr); @@ -1168,6 +1169,12 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); if (triggers) ITriggerCollection_Release(triggers); + principal = NULL; + hr = ITaskDefinition_get_Principal(taskdef, &principal); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + ok(principal != NULL, "principal not set\n"); + if (principal) IPrincipal_Release(principal); + /* FIXME: set IIdleSettings and INetworkSettings */ ITaskSettings_Release(set);

1 0

Ziqing Hui : mlang: Fix font name of code page families.
by Alexandre Julliard Nov. 30, 2017

Nov. 30, 2017

Module: wine Branch: master Commit: 5083f2a589930b8a67a396cbf03a266cf39b08cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5083f2a589930b8a67a396cbf… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Nov 30 12:23:52 2017 +0800 mlang: Fix font name of code page families. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mlang/mlang.c | 24 ++++++++++++------------ dlls/mlang/tests/mlang.c | 18 ++++++------------ 2 files changed, 18 insertions(+), 24 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index aa644e2..bada104 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -495,35 +495,35 @@ static const struct mlang_data } mlang_data[] = { { "Arabic",1256,sizeof(arabic_cp)/sizeof(arabic_cp[0]),arabic_cp, - "Courier","Arial", sidArabic }, /* FIXME */ + "Simplified Arabic Fixed","Simplified Arabic", sidArabic }, { "Baltic",1257,sizeof(baltic_cp)/sizeof(baltic_cp[0]),baltic_cp, - "Courier","Arial", sidAsciiLatin }, /* FIXME */ + "Courier New","Arial", sidAsciiLatin }, { "Chinese Simplified",936,sizeof(chinese_simplified_cp)/sizeof(chinese_simplified_cp[0]),chinese_simplified_cp, "Simsun","Simsun", sidHan }, { "Chinese Traditional",950,sizeof(chinese_traditional_cp)/sizeof(chinese_traditional_cp[0]),chinese_traditional_cp, "MingLiu","New MingLiu", sidBopomofo }, { "Central European",1250,sizeof(central_european_cp)/sizeof(central_european_cp[0]),central_european_cp, - "Courier","Arial", sidAsciiLatin }, /* FIXME */ + "Courier New","Arial", sidAsciiLatin }, { "Cyrillic",1251,sizeof(cyrillic_cp)/sizeof(cyrillic_cp[0]),cyrillic_cp, - "Courier","Arial", sidCyrillic }, /* FIXME */ + "Courier New","Arial", sidCyrillic }, { "Greek",1253,sizeof(greek_cp)/sizeof(greek_cp[0]),greek_cp, - "Courier","Arial", sidGreek }, /* FIXME */ + "Courier New","Arial", sidGreek }, { "Hebrew",1255,sizeof(hebrew_cp)/sizeof(hebrew_cp[0]),hebrew_cp, - "Courier","Arial", sidHebrew }, /* FIXME */ + "Miriam Fixed","David", sidHebrew }, { "Japanese",932,sizeof(japanese_cp)/sizeof(japanese_cp[0]),japanese_cp, "MS Gothic","MS PGothic", sidKana }, { "Korean",949,sizeof(korean_cp)/sizeof(korean_cp[0]),korean_cp, - "Courier","Arial", sidHangul }, /* FIXME */ + "GulimChe","Gulim", sidHangul }, { "Thai",874,sizeof(thai_cp)/sizeof(thai_cp[0]),thai_cp, - "Courier","Arial", sidThai }, /* FIXME */ + "Tahoma","Tahoma", sidThai }, { "Turkish",1254,sizeof(turkish_cp)/sizeof(turkish_cp[0]),turkish_cp, - "Courier","Arial", sidAsciiLatin }, /* FIXME */ + "Courier New","Arial", sidAsciiLatin }, { "Vietnamese",1258,sizeof(vietnamese_cp)/sizeof(vietnamese_cp[0]),vietnamese_cp, - "Courier","Arial", sidAsciiLatin }, /* FIXME */ + "Courier New","Arial", sidAsciiLatin }, { "Western European",1252,sizeof(western_cp)/sizeof(western_cp[0]),western_cp, - "Courier","Arial", sidAsciiLatin }, /* FIXME */ + "Courier New","Arial", sidAsciiLatin }, { "Unicode",CP_UNICODE,sizeof(unicode_cp)/sizeof(unicode_cp[0]),unicode_cp, - "Courier","Arial" } /* FIXME */ + "Courier New","Arial" } }; struct font_list diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 5100870..2e3b36b 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -362,7 +362,6 @@ const static struct cpinfo_test_data iml2_cpinfo_data[] = {'S','i','m','p','l','i','f','i','e','d',' ','A','r','a','b','i','c',' ','F','i','x','e','d',0}, {'S','i','m','p','l','i','f','i','e','d',' ','A','r','a','b','i','c',0}, 178 }, - FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, TRUE }, /* 9. Baltic (Windows) */ { @@ -377,7 +376,6 @@ const static struct cpinfo_test_data iml2_cpinfo_data[] = {'C','o','u','r','i','e','r',' ','N','e','w',0}, {'A','r','i','a','l',0}, 186 }, - FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE }, /* 10. Central European (Windows) */ { @@ -392,7 +390,7 @@ const static struct cpinfo_test_data iml2_cpinfo_data[] = {'C','o','u','r','i','e','r',' ','N','e','w',0}, {'A','r','i','a','l',0}, 238 }, - FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, TRUE + FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE }, /* 11. Cyrillic (Windows) */ { @@ -407,7 +405,7 @@ const static struct cpinfo_test_data iml2_cpinfo_data[] = {'C','o','u','r','i','e','r',' ','N','e','w',0}, {'A','r','i','a','l',0}, 204 }, - FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, TRUE + FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE }, /* 12. Greek (Windows) */ { @@ -422,7 +420,7 @@ const static struct cpinfo_test_data iml2_cpinfo_data[] = {'C','o','u','r','i','e','r',' ','N','e','w',0}, {'A','r','i','a','l',0}, 161 }, - FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, TRUE + FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE }, /* 13. Hebrew (Windows) */ { @@ -437,7 +435,6 @@ const static struct cpinfo_test_data iml2_cpinfo_data[] = {'M','i','r','i','a','m',' ','F','i','x','e','d',0}, {'D','a','v','i','d',0}, 177 }, - FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, TRUE }, /* 14. Japanese (Shift-JIS) */ { @@ -466,7 +463,6 @@ const static struct cpinfo_test_data iml2_cpinfo_data[] = {'G','u','l','i','m','C','h','e',0}, {'G','u','l','i','m',0}, 129 }, - FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, TRUE }, /* 16. Thai (Windows) */ { @@ -481,7 +477,7 @@ const static struct cpinfo_test_data iml2_cpinfo_data[] = {'T','a','h','o','m','a',0}, {'T','a','h','o','m','a',0}, 222 }, - FALSE, TRUE, FALSE, FALSE, TRUE, TRUE, TRUE, TRUE, TRUE + FALSE, TRUE, FALSE, FALSE, TRUE, TRUE, TRUE }, /* 17. Turkish (Windows) */ { @@ -496,7 +492,7 @@ const static struct cpinfo_test_data iml2_cpinfo_data[] = {'C','o','u','r','i','e','r',' ','N','e','w',0}, {'A','r','i','a','l',0}, 162 }, - FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, TRUE + FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE }, /* 18. Vietnamese (Windows) */ { @@ -511,7 +507,6 @@ const static struct cpinfo_test_data iml2_cpinfo_data[] = {'C','o','u','r','i','e','r',' ','N','e','w',0}, {'A','r','i','a','l',0}, 163 }, - FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE }, /* 19. Western European (Windows) */ { @@ -526,7 +521,7 @@ const static struct cpinfo_test_data iml2_cpinfo_data[] = {'C','o','u','r','i','e','r',' ','N','e','w',0}, {'A','r','i','a','l',0}, 0 }, - FALSE, FALSE, FALSE, FALSE, TRUE, TRUE, FALSE, TRUE + FALSE, FALSE, FALSE, FALSE, TRUE, TRUE }, /* 20. Unicode */ { @@ -540,7 +535,6 @@ const static struct cpinfo_test_data iml2_cpinfo_data[] = {'C','o','u','r','i','e','r',' ','N','e','w',0}, {'A','r','i','a','l',0}, 1 }, - FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE } };

1 0