April 2016 - Wine-Devel - list.winehq.org

Re: [PATCH 2/5] qedit: Stub out AMTimelineObj.

by Alex Henrie

2016-04-25 22:17 GMT-06:00 Nikolay Sivov <bunglehead(a)gmail.com>: > On 26.04.2016 6:09, Alex Henrie wrote: >> Cc: Andrew Eikum <aeikum(a)codeweavers.com> >> >> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> >> --- >> dlls/qedit/Makefile.in | 3 +- >> dlls/qedit/qedit_private.h | 2 + >> dlls/qedit/tests/timeline.c | 3 - >> dlls/qedit/timeline.c | 10 +- >> dlls/qedit/timelineobj.c | 470 ++++++++++++++++++++++++++++++++++++++++++++ >> 5 files changed, 482 insertions(+), 6 deletions(-) >> create mode 100644 dlls/qedit/timelineobj.c > > I think it's better to add this to timeline.c. I'm not sure it's a good idea to shove everything into one file. Andrew, what do you think? >> + >> + TRACE("(%d,%p)\n", type, ppv); >> + >> + switch (type) >> + { >> + case TIMELINE_MAJOR_TYPE_COMPOSITE: >> + case TIMELINE_MAJOR_TYPE_TRACK: >> + case TIMELINE_MAJOR_TYPE_SOURCE: >> + case TIMELINE_MAJOR_TYPE_TRANSITION: >> + case TIMELINE_MAJOR_TYPE_EFFECT: >> + case TIMELINE_MAJOR_TYPE_GROUP: >> + break; >> + default: >> + return E_INVALIDARG; >> + } > > What happens to returned pointer on type error? Nothing, but I'll add a test for this and resubmit. I will also make the rest of the changes to this patch that you suggested. -Alex

April 25, 2016

Re: [PATCH] shell32: Add SHLimitInputEdit stub.

by Alex Henrie

2016-04-25 22:25 GMT-06:00 Nikolay Sivov <bunglehead(a)gmail.com>: > On 26.04.2016 6:13, Alex Henrie wrote: >> Needed for Windows Movie Maker 2.6. >> >> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> >> --- >> dlls/shell32/shell32.spec | 1 + >> dlls/shell32/shlfolder.c | 9 +++++++++ >> 2 files changed, 10 insertions(+) >> >> diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec >> index 93fd449..7ebd032 100644 >> --- a/dlls/shell32/shell32.spec >> +++ b/dlls/shell32/shell32.spec >> @@ -264,6 +264,7 @@ >> 727 stdcall SHGetImageList(long ptr ptr) >> 730 stdcall -noname RestartDialogEx(long wstr long long) >> 743 stdcall SHCreateFileExtractIconW(wstr long ptr ptr) >> + 747 stdcall SHLimitInputEdit(ptr ptr) >> > > Does it actually need explicit ordinal? Yes. I tried it without the ordinal and the program still crashed. The exact error message is "Unhandled exception: unimplemented function SHELL32.dll.747 called in 32-bit code (0x7bc53e71)." -Alex

April 25, 2016

Re: [PATCH] shell32: Add SHLimitInputEdit stub.

by Nikolay Sivov

On 26.04.2016 6:13, Alex Henrie wrote: > Needed for Windows Movie Maker 2.6. > > Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> > --- > dlls/shell32/shell32.spec | 1 + > dlls/shell32/shlfolder.c | 9 +++++++++ > 2 files changed, 10 insertions(+) > > diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec > index 93fd449..7ebd032 100644 > --- a/dlls/shell32/shell32.spec > +++ b/dlls/shell32/shell32.spec > @@ -264,6 +264,7 @@ > 727 stdcall SHGetImageList(long ptr ptr) > 730 stdcall -noname RestartDialogEx(long wstr long long) > 743 stdcall SHCreateFileExtractIconW(wstr long ptr ptr) > + 747 stdcall SHLimitInputEdit(ptr ptr) > Does it actually need explicit ordinal?

April 25, 2016

Re: [PATCH 5/5] qedit: Implement IAMTimelineObj_GetTimelineNoRef and add tests.

by Nikolay Sivov

On 26.04.2016 6:10, Alex Henrie wrote: > static HRESULT WINAPI TimelineObj_GetTimelineNoRef(IAMTimelineObj *iface, IAMTimeline **timeline) > { > + /* MSDN says that this function is "not supported" */ > TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); > - FIXME("(%p)->(%p): not implemented!\n", This, timeline); > - return E_NOTIMPL; > + TRACE("(%p)->(%p)\n", This, timeline); > + if (!timeline) return E_POINTER; > + return E_NOINTERFACE; > } This looks like a call to QI, according to your tests.

April 25, 2016

Re: [PATCH 3/5] qedit: Implement IAMTimelineObj_GetTimelineType and add tests.

by Nikolay Sivov

On 26.04.2016 6:09, Alex Henrie wrote: > static HRESULT WINAPI TimelineObj_GetTimelineType(IAMTimelineObj *iface, TIMELINE_MAJOR_TYPE *type) > { > TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); > - FIXME("(%p)->(%p): not implemented!\n", This, type); > - return E_NOTIMPL; > + TRACE("(%p)->(%p)\n", This, type); > + *type = This->timeline_type; > + return S_OK; > } Is it supposed to handle NULL input?

April 25, 2016

Re: [PATCH 2/5] qedit: Stub out AMTimelineObj.

by Nikolay Sivov

On 26.04.2016 6:09, Alex Henrie wrote: > Cc: Andrew Eikum <aeikum(a)codeweavers.com> > > Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> > --- > dlls/qedit/Makefile.in | 3 +- > dlls/qedit/qedit_private.h | 2 + > dlls/qedit/tests/timeline.c | 3 - > dlls/qedit/timeline.c | 10 +- > dlls/qedit/timelineobj.c | 470 ++++++++++++++++++++++++++++++++++++++++++++ > 5 files changed, 482 insertions(+), 6 deletions(-) > create mode 100644 dlls/qedit/timelineobj.c I think it's better to add this to timeline.c. > > diff --git a/dlls/qedit/timeline.c b/dlls/qedit/timeline.c > index 52123a7..0398f28 100644 > --- a/dlls/qedit/timeline.c > +++ b/dlls/qedit/timeline.c > @@ -129,8 +129,14 @@ static HRESULT WINAPI Timeline_IAMTimeline_CreateEmptyNode(IAMTimeline *iface, I > TIMELINE_MAJOR_TYPE type) > { > TimelineImpl *This = impl_from_IAMTimeline(iface); > - FIXME("(%p)->(%p,%04x): not implemented!\n", This, obj, type); > - return E_NOTIMPL; > + HRESULT hr; > + > + TRACE("(%p)->(%p,%04x)\n", This, obj, type); > + > + hr = AMTimelineObj_create(type, obj); > + if (FAILED(hr)) return hr; > + > + return S_OK; > } > You can simply 'return AMTimelineObj_create...;'. > + > +#include <assert.h> This one is not used. > +static ULONG WINAPI TimelineObj_inner_Release(IUnknown *iface) > +{ > + TimelineObjImpl *This = impl_from_IUnknown(iface); > + ULONG ref = InterlockedDecrement(&This->ref); > + > + TRACE("(%p) new ref = %u\n", This, ref); > + > + if (ref == 0) > + { > + CoTaskMemFree(This); > + return 0; > + } > + > + return ref; > +} Extra 'return 0;' does not add anything. > +HRESULT AMTimelineObj_create(TIMELINE_MAJOR_TYPE type, IAMTimelineObj **ppv) > +{ > + TimelineObjImpl* obj = NULL; No need to initialize it. > + > + TRACE("(%d,%p)\n", type, ppv); > + > + switch (type) > + { > + case TIMELINE_MAJOR_TYPE_COMPOSITE: > + case TIMELINE_MAJOR_TYPE_TRACK: > + case TIMELINE_MAJOR_TYPE_SOURCE: > + case TIMELINE_MAJOR_TYPE_TRANSITION: > + case TIMELINE_MAJOR_TYPE_EFFECT: > + case TIMELINE_MAJOR_TYPE_GROUP: > + break; > + default: > + return E_INVALIDARG; > + } What happens to returned pointer on type error? > + > + obj = CoTaskMemAlloc(sizeof(TimelineObjImpl)); > + if (NULL == obj) { > + *ppv = NULL; > + return E_OUTOFMEMORY; > + } > + ZeroMemory(obj, sizeof(TimelineObjImpl)); > + > + obj->ref = 1; > + obj->IUnknown_inner.lpVtbl = &timelineobj_vtbl; > + obj->IAMTimelineObj_iface.lpVtbl = &IAMTimelineObj_VTable; > + > + *ppv = &obj->IAMTimelineObj_iface; > + return S_OK; > +} > memset is not useful, you're setting all the fields anyway. Also, why do you need inner IUnknown for this object?

April 25, 2016

Re: [6/6] wininet: Handle INTERNET_INVALID_PORT_NUMBER in HttpOpenRequest.

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=22569 Your paranoid android. === w1064 (32 bit http) === http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:1762: Test failed: Expected 2, got 4 http.c:1763: Test failed: Expected CRLF, got ' http.c:2406: Test failed: count was wrong http.c:2407: Test failed: http data wrong, got: Garbage: Header http.c:3070: Test failed: HttpAddRequestHeaders succeeded http.c:3071: Test failed: Expected error ERROR_HTTP_HEADER_NOT_FOUND, got 0 http.c:3076: Test failed: code = 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 === w1064 (64 bit http) === http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:1762: Test failed: Expected 2, got 4 http.c:1763: Test failed: Expected CRLF, got ' http.c:2406: Test failed: count was wrong http.c:2407: Test failed: http data wrong, got: Garbage: Header http.c:3070: Test failed: HttpAddRequestHeaders succeeded http.c:3071: Test failed: Expected error ERROR_HTTP_HEADER_NOT_FOUND, got 0 http.c:3076: Test failed: code = 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1

April 25, 2016

Re: [5/6] wininet/tests: Add more tests for INTERNET_INVALID_PORT_NUMBER.

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=22568 Your paranoid android. === w1064 (32 bit http) === http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:1762: Test failed: Expected 2, got 4 http.c:1763: Test failed: Expected CRLF, got ' http.c:2406: Test failed: count was wrong http.c:2407: Test failed: http data wrong, got: Garbage: Header http.c:3070: Test failed: HttpAddRequestHeaders succeeded http.c:3071: Test failed: Expected error ERROR_HTTP_HEADER_NOT_FOUND, got 0 http.c:3076: Test failed: code = 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 === w1064 (64 bit http) === http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:1762: Test failed: Expected 2, got 4 http.c:1763: Test failed: Expected CRLF, got ' http.c:2406: Test failed: count was wrong http.c:2407: Test failed: http data wrong, got: Garbage: Header http.c:3070: Test failed: HttpAddRequestHeaders succeeded http.c:3071: Test failed: Expected error ERROR_HTTP_HEADER_NOT_FOUND, got 0 http.c:3076: Test failed: code = 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1

April 25, 2016

Re: [4/6] wininet/tests: Add tests for asynchronous InternetReadFile.

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=22567 Your paranoid android. === w1064 (32 bit http) === http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:1762: Test failed: Expected 2, got 4 http.c:1763: Test failed: Expected CRLF, got ' http.c:2406: Test failed: count was wrong http.c:2407: Test failed: http data wrong, got: Garbage: Header http.c:3070: Test failed: HttpAddRequestHeaders succeeded http.c:3071: Test failed: Expected error ERROR_HTTP_HEADER_NOT_FOUND, got 0 http.c:3076: Test failed: code = 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 === w1064 (64 bit http) === http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:1762: Test failed: Expected 2, got 4 http.c:1763: Test failed: Expected CRLF, got ' http.c:2406: Test failed: count was wrong http.c:2407: Test failed: http data wrong, got: Garbage: Header http.c:3070: Test failed: HttpAddRequestHeaders succeeded http.c:3071: Test failed: Expected error ERROR_HTTP_HEADER_NOT_FOUND, got 0 http.c:3076: Test failed: code = 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1

April 25, 2016

Re: [2/6] wininet/tests: Add tests for asynchronous InternetReadFileEx.

by Bruno Jesus

On Mon, Apr 25, 2016 at 10:00 PM, Sebastian Lackner <sebastian(a)fds-team.de> wrote: > On 25.04.2016 21:51, Marvin wrote: >> Hi, >> >> While running your changed tests on Windows, I think I found new failures. >> Being a bot and all I'm not very good at pattern recognition, so I might be >> wrong, but could you please double-check? >> Full results can be found at >> https://testbot.winehq.org/JobDetails.pl?Key=22566 >> >> Your paranoid android. >> >> >> === w1064 (32 bit http) === >> http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 >> http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 >> http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 >> http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 >> http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 >> http.c:1762: Test failed: Expected 2, got 4 >> http.c:1763: Test failed: Expected CRLF, got ' >> http.c:2406: Test failed: count was wrong >> http.c:2407: Test failed: http data wrong, got: Garbage: Header >> http.c:3070: Test failed: HttpAddRequestHeaders succeeded >> http.c:3071: Test failed: Expected error ERROR_HTTP_HEADER_NOT_FOUND, got 0 >> http.c:3076: Test failed: code = 200, expected 400 >> http.c:3076: Test failed: unexpected status code 200, expected 400 >> http.c:3076: Test failed: unexpected status code 200, expected 400 >> http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 >> >> === w1064 (64 bit http) === >> http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 >> http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 >> http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 >> http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 >> http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 >> http.c:1762: Test failed: Expected 2, got 4 >> http.c:1763: Test failed: Expected CRLF, got ' >> http.c:2406: Test failed: count was wrong >> http.c:2407: Test failed: http data wrong, got: Garbage: Header >> http.c:3070: Test failed: HttpAddRequestHeaders succeeded >> http.c:3071: Test failed: Expected error ERROR_HTTP_HEADER_NOT_FOUND, got 0 >> http.c:3076: Test failed: code = 200, expected 400 >> http.c:3076: Test failed: unexpected status code 200, expected 400 >> http.c:3076: Test failed: unexpected status code 200, expected 400 >> http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 >> > > Those are existing failures. > Microsoft should use Wine tests to fix all these bugs they introduced in Windows 10. It looks like our tests are better than theirs ;-)

April 25, 2016