wine-commits October 2017

wine-commits@winehq.org

2 participants
478 discussions

Francois Gouget : testbot: Queued Tasks are not supposed to have a child process.
by Alexandre Julliard 12 Oct '17

12 Oct '17

Module: tools Branch: master Commit: 97299c59adcb1dc5cdb7c0e666184a24d4c54841 URL: http://source.winehq.org/git/tools.git/?a=commit;h=97299c59adcb1dc5cdb7c0e6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 11 16:17:33 2017 +0200 testbot: Queued Tasks are not supposed to have a child process. So just silently unset ChildPid in Task::UpdateStatus() if needed, like we do for the tasks in other states that should not have a child process. Since they are queued they will get run later on anyway. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Tasks.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index b4298fb..3dd5f13 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -159,7 +159,7 @@ sub UpdateStatus($$) if (defined $self->ChildPid && !kill(0, $self->ChildPid) && $! == ESRCH) { $self->ChildPid(undef); - if ($Status eq "queued" || $Status eq "running") + if ($Status eq "running") { my ($JobId, $StepNo, $TaskNo) = @{$self->GetMasterKey()}; my $OldUMask = umask(002);

1 0

Nikolay Sivov : gdiplus/metafile: Support playback for EmfPlusRecordTypeSetAntiAliasMode.
by Alexandre Julliard 11 Oct '17

11 Oct '17

Module: wine Branch: master Commit: 4b028bb09cb9563e111fedab0f4c3663dc278d0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b028bb09cb9563e111fedab0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 10 21:24:41 2017 +0300 gdiplus/metafile: Support playback for EmfPlusRecordTypeSetAntiAliasMode. 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/metafile.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index e4e61ee..ecfbab2 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -1848,6 +1848,10 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, { return GdipSetTextRenderingHint(real_metafile->playback_graphics, flags & 0xff); } + case EmfPlusRecordTypeSetAntiAliasMode: + { + return GdipSetSmoothingMode(real_metafile->playback_graphics, (flags >> 1) & 0xff); + } default: FIXME("Not implemented for record type %x\n", recordType); return NotImplemented;

1 0

Nikolay Sivov : gdiplus/metafile: Support playback for EmfPlusRecordTypeSetTextRenderingHint.
by Alexandre Julliard 11 Oct '17

11 Oct '17

Module: wine Branch: master Commit: 6010b52a2e7c231665cda5f934ba31abea1aedfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6010b52a2e7c231665cda5f93… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 10 21:24:40 2017 +0300 gdiplus/metafile: Support playback for EmfPlusRecordTypeSetTextRenderingHint. 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/metafile.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 350925e..e4e61ee 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -1844,6 +1844,10 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, { return GdipSetInterpolationMode(real_metafile->playback_graphics, flags & 0xff); } + case EmfPlusRecordTypeSetTextRenderingHint: + { + return GdipSetTextRenderingHint(real_metafile->playback_graphics, flags & 0xff); + } default: FIXME("Not implemented for record type %x\n", recordType); return NotImplemented;

1 0

Nikolay Sivov : gdiplus/metafile: Fix flags handling for EMF+ property records.
by Alexandre Julliard 11 Oct '17

11 Oct '17

Module: wine Branch: master Commit: 30ba465786a92617f93cbd2237030b0a51ae0bc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30ba465786a92617f93cbd223… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 10 21:24:39 2017 +0300 gdiplus/metafile: Fix flags handling for EMF+ property records. 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/metafile.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index d135e36..350925e 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -1834,15 +1834,15 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, } case EmfPlusRecordTypeSetPixelOffsetMode: { - return GdipSetPixelOffsetMode(real_metafile->playback_graphics, (flags >> 8) & 0xf); + return GdipSetPixelOffsetMode(real_metafile->playback_graphics, flags & 0xff); } case EmfPlusRecordTypeSetCompositingQuality: { - return GdipSetCompositingQuality(real_metafile->playback_graphics, (flags >> 8) & 0xf); + return GdipSetCompositingQuality(real_metafile->playback_graphics, flags & 0xff); } case EmfPlusRecordTypeSetInterpolationMode: { - return GdipSetInterpolationMode(real_metafile->playback_graphics, (flags >> 8) & 0xf); + return GdipSetInterpolationMode(real_metafile->playback_graphics, flags & 0xff); } default: FIXME("Not implemented for record type %x\n", recordType);

1 0

Nikolay Sivov : gdiplus/tests: Test EMF+ records flags.
by Alexandre Julliard 11 Oct '17

11 Oct '17

Module: wine Branch: master Commit: 1df5f2fab7d5f61a6ce55393128ab3a2241edd09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1df5f2fab7d5f61a6ce553931… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 10 21:24:38 2017 +0300 gdiplus/tests: Test EMF+ records flags. 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/metafile.c | 422 ++++++++++++++++++++++-------------------- 1 file changed, 219 insertions(+), 203 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1df5f2fab7d5f61a6ce55…

1 0

Andrey Gusev : kernel32/tests: Remove redundant comparison.
by Alexandre Julliard 11 Oct '17

11 Oct '17

Module: wine Branch: master Commit: c9e37d8142ff47f7283d4570252f1cd22b719a9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9e37d8142ff47f7283d45702… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Oct 11 20:06:26 2017 +0300 kernel32/tests: Remove redundant comparison. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 07daea8..db7bf14 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -3619,7 +3619,7 @@ static void test_ProcThreadAttributeList(void) ok(GetLastError() == ERROR_OBJECT_NAME_EXISTS, "got %d\n", GetLastError()); ret = pUpdateProcThreadAttribute(&list, 0, PROC_THREAD_ATTRIBUTE_IDEAL_PROCESSOR, handles, sizeof(PROCESSOR_NUMBER), NULL, NULL); - ok(ret || (!ret && GetLastError() == ERROR_NOT_SUPPORTED), "got %d gle %d\n", ret, GetLastError()); + ok(ret || GetLastError() == ERROR_NOT_SUPPORTED, "got %d gle %d\n", ret, GetLastError()); if (ret) {

1 0

Jacek Caban : mshtml: Added IDocumentEvent stub implementation.
by Alexandre Julliard 11 Oct '17

11 Oct '17

Module: wine Branch: master Commit: 35ebf6756aa12501f4c268b480088763a6a53b52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35ebf6756aa12501f4c268b48… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 11 15:16:20 2017 +0200 mshtml: Added IDocumentEvent stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 73 ++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/events.c | 15 +++++++++ 3 files changed, 89 insertions(+) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index e32385e..16aedea 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4300,6 +4300,76 @@ static const IDocumentSelectorVtbl DocumentSelectorVtbl = { DocumentSelector_querySelectorAll }; +static inline HTMLDocument *impl_from_IDocumentEvent(IDocumentEvent *iface) +{ + return CONTAINING_RECORD(iface, HTMLDocument, IDocumentEvent_iface); +} + +static HRESULT WINAPI DocumentEvent_QueryInterface(IDocumentEvent *iface, REFIID riid, void **ppv) +{ + HTMLDocument *This = impl_from_IDocumentEvent(iface); + return htmldoc_query_interface(This, riid, ppv); +} + +static ULONG WINAPI DocumentEvent_AddRef(IDocumentEvent *iface) +{ + HTMLDocument *This = impl_from_IDocumentEvent(iface); + return htmldoc_addref(This); +} + +static ULONG WINAPI DocumentEvent_Release(IDocumentEvent *iface) +{ + HTMLDocument *This = impl_from_IDocumentEvent(iface); + return htmldoc_release(This); +} + +static HRESULT WINAPI DocumentEvent_GetTypeInfoCount(IDocumentEvent *iface, UINT *pctinfo) +{ + HTMLDocument *This = impl_from_IDocumentEvent(iface); + return IDispatchEx_GetTypeInfoCount(&This->IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI DocumentEvent_GetTypeInfo(IDocumentEvent *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLDocument *This = impl_from_IDocumentEvent(iface); + return IDispatchEx_GetTypeInfo(&This->IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI DocumentEvent_GetIDsOfNames(IDocumentEvent *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + HTMLDocument *This = impl_from_IDocumentEvent(iface); + return IDispatchEx_GetIDsOfNames(&This->IDispatchEx_iface, riid, rgszNames, cNames, lcid, + rgDispId); +} + +static HRESULT WINAPI DocumentEvent_Invoke(IDocumentEvent *iface, DISPID dispIdMember, REFIID riid, + LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLDocument *This = impl_from_IDocumentEvent(iface); + return IDispatchEx_Invoke(&This->IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI DocumentEvent_createEvent(IDocumentEvent *iface, BSTR eventType, IDOMEvent **p) +{ + HTMLDocument *This = impl_from_IDocumentEvent(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_w(eventType), p); + return E_NOTIMPL; +} + +static const IDocumentEventVtbl DocumentEventVtbl = { + DocumentEvent_QueryInterface, + DocumentEvent_AddRef, + DocumentEvent_Release, + DocumentEvent_GetTypeInfoCount, + DocumentEvent_GetTypeInfo, + DocumentEvent_GetIDsOfNames, + DocumentEvent_Invoke, + DocumentEvent_createEvent +}; + static void HTMLDocument_on_advise(IUnknown *iface, cp_static_data_t *cp) { HTMLDocument *This = impl_from_IHTMLDocument2((IHTMLDocument2*)iface); @@ -4652,6 +4722,8 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) *ppv = &This->IHTMLDocument7_iface; else if(IsEqualGUID(&IID_IDocumentSelector, riid)) *ppv = &This->IDocumentSelector_iface; + else if(IsEqualGUID(&IID_IDocumentEvent, riid)) + *ppv = &This->IDocumentEvent_iface; else if(IsEqualGUID(&IID_IPersist, riid)) *ppv = &This->IPersistFile_iface; else if(IsEqualGUID(&IID_IPersistMoniker, riid)) @@ -4754,6 +4826,7 @@ static void init_doc(HTMLDocument *doc, IUnknown *outer, IDispatchEx *dispex) doc->IHTMLDocument7_iface.lpVtbl = &HTMLDocument7Vtbl; doc->IDispatchEx_iface.lpVtbl = &DocDispatchExVtbl; doc->IDocumentSelector_iface.lpVtbl = &DocumentSelectorVtbl; + doc->IDocumentEvent_iface.lpVtbl = &DocumentEventVtbl; doc->ISupportErrorInfo_iface.lpVtbl = &SupportErrorInfoVtbl; doc->IProvideMultipleClassInfo_iface.lpVtbl = &ProvideMultipleClassInfoVtbl; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 1727f2c..c463849 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -572,6 +572,7 @@ struct HTMLDocument { IHTMLDocument6 IHTMLDocument6_iface; IHTMLDocument7 IHTMLDocument7_iface; IDocumentSelector IDocumentSelector_iface; + IDocumentEvent IDocumentEvent_iface; IPersistMoniker IPersistMoniker_iface; IPersistFile IPersistFile_iface; IPersistHistory IPersistHistory_iface; diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index ea2b6d0..f8a8d44 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -2530,6 +2530,19 @@ static void test_iframe_connections(IHTMLDocument2 *doc) IHTMLDocument2_Release(iframes_doc); } +static void test_create_event(IHTMLDocument2 *doc) +{ + IDocumentEvent *doc_event; + HRESULT hres; + + trace("createEvent tests...\n"); + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IDocumentEvent, (void**)&doc_event); + ok(hres == S_OK, "Could not get IDocumentEvent iface: %08x\n", hres); + + IDocumentEvent_Release(doc_event); +} + static HRESULT QueryInterface(REFIID,void**); static HRESULT WINAPI InPlaceFrame_QueryInterface(IOleInPlaceFrame *iface, REFIID riid, void **ppv) @@ -3201,6 +3214,8 @@ START_TEST(events) run_test(empty_doc_str, test_submit); run_test(empty_doc_ie9_str, test_submit); run_test(iframe_doc_str, test_iframe_connections); + if(is_ie9plus) + run_test(empty_doc_ie9_str, test_create_event); test_empty_document();

1 0

Andrey Gusev : webservices: Fix misplaced parenthesis.
by Alexandre Julliard 11 Oct '17

11 Oct '17

Module: wine Branch: master Commit: 131397e784975361dbdb9e3a1aad8029e8c7954a URL: http://source.winehq.org/git/wine.git/?a=commit;h=131397e784975361dbdb9e3a1… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Oct 11 16:40:11 2017 +0300 webservices: Fix misplaced parenthesis. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 0906cba..9d024a3 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -3061,7 +3061,7 @@ static HRESULT skip_node( struct reader *reader ) for (;;) { - if ((hr = read_node( reader ) != S_OK) || !parent) break; + if ((hr = read_node( reader )) != S_OK || !parent) break; if (node_type( reader->current ) != WS_XML_NODE_TYPE_END_ELEMENT) continue; if (reader->current->parent == parent) return read_node( reader ); }

1 0

Alexandre Julliard : include: Get rid of wglext.h.
by Alexandre Julliard 11 Oct '17

11 Oct '17

Module: wine Branch: master Commit: 5632c82c4246208f04f7e78af8c0598d55eede52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5632c82c4246208f04f7e78af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 11 17:48:57 2017 +0200 include: Get rid of wglext.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/opengl.c | 1 - dlls/wined3d/wined3d_gl.h | 1 - dlls/winemac.drv/opengl.c | 1 - dlls/winex11.drv/opengl.c | 1 - include/wine/wglext.h | 915 ------------------------------------------ 5 files changed, 919 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5632c82c4246208f04f7e…

1 0

Alexandre Julliard : opengl32: Generate thunks for WGL extensions when possible.
by Alexandre Julliard 11 Oct '17

11 Oct '17

Module: wine Branch: master Commit: c4e9e3fcb94191979e56c6aad480bc6b72d47124 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4e9e3fcb94191979e56c6aad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 11 16:12:17 2017 +0200 opengl32: Generate thunks for WGL extensions when possible. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/make_opengl | 134 ++++++++++++++++------------- dlls/opengl32/opengl_ext.c | 130 ++++++++++++++++++++++++++--- dlls/opengl32/opengl_ext.h | 17 ++-- dlls/opengl32/opengl_norm.c | 8 +- dlls/opengl32/wgl.c | 199 +------------------------------------------- 5 files changed, 212 insertions(+), 276 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c4e9e3fcb94191979e56c…

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
48
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2017