October 2017 - Wine-Commits

Francois Gouget : testbot: Fix Tasks to not use WineTestBot::Log.
by Alexandre Julliard Oct. 12, 2017

Oct. 12, 2017

Module: tools Branch: master Commit: 1d497afe25f3f633134e2a491b65af62cc0aa83e URL: http://source.winehq.org/git/tools.git/?a=commit;h=1d497afe25f3f633134e2a49… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 11 16:15:30 2017 +0200 testbot: Fix Tasks to not use WineTestBot::Log. The perl modules should return error messages to the callers and let them deal with logging. So don't import WineTestBot::Log globally to ensure any logging really is deliberate. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Tasks.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 3dd5f13..401e275 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -40,7 +40,6 @@ use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::Steps; use WineTestBot::WineTestBotObjects; -use WineTestBot::Log; use vars qw(@ISA @EXPORT); @@ -109,6 +108,7 @@ sub Run($$) } elsif (!$Pid) { + require WineTestBot::Log; # Capture Perl errors in the task's generic error log my ($JobId, $StepNo, $TaskNo) = @{$self->GetMasterKey()}; my $TaskDir = "$DataDir/jobs/$JobId/$StepNo/$TaskNo"; @@ -124,12 +124,11 @@ sub Run($$) } else { - LogMsg "unable to redirect stderr to '$TaskDir/err': $!\n"; + WineTestBot::Log::LogMsg("unable to redirect stderr to '$TaskDir/err': $!\n"); } $ENV{PATH} = "/usr/bin:/bin"; delete $ENV{ENV}; exec("$BinDir/${ProjectName}$RunScript", "--log-only", $JobId, $StepNo, $TaskNo) or - require WineTestBot::Log; WineTestBot::Log::LogMsg("Unable to exec ${ProjectName}$RunScript: $!\n"); exit(1); } @@ -173,7 +172,8 @@ sub UpdateStatus($$) umask($OldUMask); # This probably indicates a bug in the task script. # Don't requeue the task to avoid an infinite loop. - LogMsg "Child process for task $JobId/$StepNo/$TaskNo died unexpectedly\n"; + require WineTestBot::Log; + WineTestBot::Log::LogMsg("Child process for task $JobId/$StepNo/$TaskNo died unexpectedly\n"); $self->Status("boterror"); $Status = "boterror";

1 0

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

Oct. 11, 2017

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

Andrey Gusev : kernel32/tests: Remove redundant comparison.
by Alexandre Julliard Oct. 11, 2017

Oct. 11, 2017

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

Alexandre Julliard : opengl32: Only output enums for supported extensions, including WGL ones.
by Alexandre Julliard Oct. 11, 2017

Oct. 11, 2017

Module: wine Branch: master Commit: 278c89a8468f7e0c7cc1dee037e1d3311122e56d URL: http://source.winehq.org/git/wine.git/?a=commit;h=278c89a8468f7e0c7cc1dee03… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 11 14:39:50 2017 +0200 opengl32: Only output enums for supported extensions, including WGL ones. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/make_opengl | 57 +- dlls/opengl32/tests/opengl.c | 22 - include/wine/wgl.h | 10804 +++++++++++++++++++---------------------- 3 files changed, 5072 insertions(+), 5811 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=278c89a8468f7e0c7cc1d…

1 0

Piotr Caban : vbscript: Reimplement array_access function.
by Alexandre Julliard Oct. 11, 2017

Oct. 11, 2017

Module: wine Branch: master Commit: 0b5473c166d0fca9c71080e688c85a6580c4cb0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b5473c166d0fca9c71080e68… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 10 17:08:46 2017 +0200 vbscript: Reimplement array_access function. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/interp.c | 45 ++++++++++++++++++++++---------------------- dlls/vbscript/tests/lang.vbs | 2 ++ 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 02180d9..feb8119 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -481,10 +481,8 @@ static void vbstack_to_dp(exec_ctx_t *ctx, unsigned arg_cnt, BOOL is_propput, DI static HRESULT array_access(exec_ctx_t *ctx, SAFEARRAY *array, DISPPARAMS *dp, VARIANT **ret) { - unsigned cell_off = 0, dim_size = 1, i; - unsigned argc = arg_cnt(dp); - VARIANT *data; - LONG idx; + unsigned i, argc = arg_cnt(dp); + LONG *indices; HRESULT hres; if(!array) { @@ -492,34 +490,35 @@ static HRESULT array_access(exec_ctx_t *ctx, SAFEARRAY *array, DISPPARAMS *dp, V return E_FAIL; } + hres = SafeArrayLock(array); + if(FAILED(hres)) + return hres; + if(array->cDims != argc) { FIXME("argc %d does not match cDims %d\n", dp->cArgs, array->cDims); + SafeArrayUnlock(array); return E_FAIL; } - for(i=0; i < argc; i++) { - hres = to_int(get_arg(dp, i), &idx); - if(FAILED(hres)) - return hres; + indices = heap_alloc(sizeof(*indices) * argc); + if(!indices) { + SafeArrayUnlock(array); + return E_OUTOFMEMORY; + } - idx -= array->rgsabound[i].lLbound; - if(idx >= array->rgsabound[i].cElements) { - FIXME("out of bound element %d in dim %d of size %d\n", idx, i+1, array->rgsabound[i].cElements); - return E_FAIL; + for(i=0; i<argc; i++) { + hres = to_int(get_arg(dp, i), indices+i); + if(FAILED(hres)) { + heap_free(indices); + SafeArrayUnlock(array); + return hres; } - - cell_off += idx*dim_size; - dim_size *= array->rgsabound[i].cElements; } - hres = SafeArrayAccessData(array, (void**)&data); - if(FAILED(hres)) - return hres; - - *ret = data+cell_off; - - SafeArrayUnaccessData(array); - return S_OK; + hres = SafeArrayPtrOfIndex(array, indices, (void**)ret); + SafeArrayUnlock(array); + heap_free(indices); + return hres; } static HRESULT do_icall(exec_ctx_t *ctx, VARIANT *res) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index a90dfc8..7c83b74 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1157,6 +1157,8 @@ arr3(3,2,1) = 1 arr3(1,2,3) = 2 Call ok(arr3(3,2,1) = 1, "arr3(3,2,1) = " & arr3(3,2,1)) Call ok(arr3(1,2,3) = 2, "arr3(1,2,3) = " & arr3(1,2,3)) +arr2(4,3) = 1 +Call ok(arr2(4,3) = 1, "arr2(4,3) = " & arr2(4,3)) x = arr3 Call ok(x(3,2,1) = 1, "x(3,2,1) = " & x(3,2,1))

1 0

Nikolay Sivov : comctl32/tests: Remove some old workarounds for platforms we don't test on anymore.
by Alexandre Julliard Oct. 11, 2017

Oct. 11, 2017

Module: wine Branch: master Commit: 2c6c5e0d055007d8a766978f56e4458c3ffc0589 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c6c5e0d055007d8a766978f5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 11 12:54:58 2017 +0300 comctl32/tests: Remove some old workarounds for platforms we don't test on anymore. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listview.c | 47 ++++++------------------------------------ 1 file changed, 6 insertions(+), 41 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 0c1d878..dce253c 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1545,15 +1545,6 @@ static void test_create(void) hList = CreateWindowA("MyListView32", "Test", WS_VISIBLE, 0, 0, 100, 100, NULL, NULL, GetModuleHandleA(NULL), 0); ok((HIMAGELIST)SendMessageA(hList, LVM_GETIMAGELIST, 0, 0) == test_create_imagelist, "Image list not obtained\n"); hHeader = (HWND)SendMessageA(hList, LVM_GETHEADER, 0, 0); - - if (!IsWindow(hHeader)) - { - /* version 4.0 */ - win_skip("LVM_GETHEADER not implemented. Skipping.\n"); - DestroyWindow(hList); - return; - } - ok(IsWindow(hHeader) && IsWindowVisible(hHeader), "Listview not in report mode\n"); ok(hHeader == GetDlgItem(hList, 0), "Expected header as dialog item\n"); DestroyWindow(hList); @@ -1939,13 +1930,6 @@ static void test_icon_spacing(void) "Expected %d, got %d\n", MAKELONG(w, h), r); r = SendMessageA(hwnd, LVM_SETICONSPACING, 0, MAKELPARAM(25, 35)); - if (r == 0) - { - /* version 4.0 */ - win_skip("LVM_SETICONSPACING unimplemented. Skipping.\n"); - DestroyWindow(hwnd); - return; - } expect(MAKELONG(20,30), r); r = SendMessageA(hwnd, LVM_SETICONSPACING, 0, MAKELPARAM(-1,-1)); @@ -4394,19 +4378,11 @@ static void test_notifyformat(void) r = SendMessageA(hwnd, LVM_SETUNICODEFORMAT, 1, 0); expect(0, r); r = SendMessageA(hwnd, LVM_GETUNICODEFORMAT, 0, 0); - if (r == 1) - { - r = SendMessageA(hwnd, LVM_SETUNICODEFORMAT, 0, 0); - expect(1, r); - r = SendMessageA(hwnd, LVM_GETUNICODEFORMAT, 0, 0); - expect(0, r); - } - else - { - win_skip("LVM_GETUNICODEFORMAT is unsupported\n"); - DestroyWindow(hwnd); - return; - } + ok(r == 1, "Unexpected return value %d.\n", r); + r = SendMessageA(hwnd, LVM_SETUNICODEFORMAT, 0, 0); + expect(1, r); + r = SendMessageA(hwnd, LVM_GETUNICODEFORMAT, 0, 0); + expect(0, r); DestroyWindow(hwnd); @@ -5011,12 +4987,7 @@ static void test_approximate_viewrect(void) expect(0, ret); ret = SendMessageA(hwnd, LVM_SETICONSPACING, 0, MAKELPARAM(75, 75)); - if (ret == 0) - { - /* version 4.0 */ - win_skip("LVM_SETICONSPACING unimplemented. Skipping.\n"); - return; - } + ok(ret != 0, "Unexpected return value %#x.\n", ret); ret = SendMessageA(hwnd, LVM_APPROXIMATEVIEWRECT, 11, MAKELPARAM(100,100)); expect(MAKELONG(77,827), ret); @@ -5110,12 +5081,6 @@ static void test_finditem(void) fi.flags = LVFI_SUBSTRING; fi.psz = f; r = SendMessageA(hwnd, LVM_FINDITEMA, -1, (LPARAM)&fi); - if (r == -1) - { - win_skip("LVFI_SUBSTRING not supported\n"); - DestroyWindow(hwnd); - return; - } expect(0, r); strcpy(f, "f"); fi.flags = LVFI_SUBSTRING;

1 0

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

Oct. 11, 2017

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

Jacek Caban : mshtml: Added IDocumentEvent stub implementation.
by Alexandre Julliard Oct. 11, 2017

Oct. 11, 2017

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 Oct. 11, 2017

Oct. 11, 2017

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 Oct. 11, 2017

Oct. 11, 2017

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