March 2017 - Wine-Devel - list.winehq.org

APPDB Intro email

by Bijie Zhu

Hi,My name is Bijie Zhu and I am currently a computer science student studying at City University of New York - Queens College. This is my first time participate in an open source project, and I hope I can get some guidance and feedback for the outreach project application process. I want to apply for improving APPDB website project. And I want to improve the app voting system. I would like to design an evaluation metric system for the app voting. So when people votes, we know why they vote for the app. People now can not only search for the most voted app, but also search for the app with the most desired attributes. Thank you,Bijie Zhu

March 27, 2017

Re: [PATCH v4 6/7] user32/tests: Workaround an intermittent failure.

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=29730 Your paranoid android. === w7pro64 (64 bit msg) === msg.c:12609: Test failed: 54: ShowWindow(SW_MINIMIZE): 4: in msg 0x0047 expecting wParam 0x8170 got 0x1803 msg.c:12609: Test failed: 54: ShowWindow(SW_MINIMIZE): 5: the msg 0x0003 was expected, but got msg 0x0047 instead msg.c:12609: Test failed: 54: ShowWindow(SW_MINIMIZE): 6: the msg 0x0005 was expected, but got msg 0x0003 instead msg.c:12609: Test failed: 54: ShowWindow(SW_MINIMIZE): 7: the msg sequence is not complete: expected 0000 - actual 0005

March 27, 2017

[3/3] windowscodecs: Fixed loading png from streams

by Viktor Semykin

Png decoder was making one extra seek after it met IEND chunk. This led to crashes of some software. Signed-off-by: Viktor Semykin <thesame.ml(a)gmail.com> --- dlls/windowscodecs/pngformat.c | 7 +++---- dlls/windowscodecs/tests/pngformat.c | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 990dcf6..c98a6a7 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -774,11 +774,12 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p /* Find the metadata chunks in the file. */ seek.QuadPart = 8; - hr = IStream_Seek(pIStream, seek, STREAM_SEEK_SET, &chunk_start); - if (FAILED(hr)) goto end; do { + hr = IStream_Seek(pIStream, seek, STREAM_SEEK_SET, &chunk_start); + if (FAILED(hr)) goto end; + hr = read_png_chunk(pIStream, chunk_type, NULL, &chunk_size); if (FAILED(hr)) goto end; @@ -816,8 +817,6 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p } seek.QuadPart = chunk_start.QuadPart + chunk_size + 12; /* skip data and CRC */ - hr = IStream_Seek(pIStream, seek, STREAM_SEEK_SET, &chunk_start); - if (FAILED(hr)) goto end; } while (memcmp(chunk_type, "IEND", 4)); This->stream = pIStream; diff --git a/dlls/windowscodecs/tests/pngformat.c b/dlls/windowscodecs/tests/pngformat.c index 20b6e93..18304a5 100644 --- a/dlls/windowscodecs/tests/pngformat.c +++ b/dlls/windowscodecs/tests/pngformat.c @@ -300,7 +300,7 @@ static IWICBitmapDecoder *create_decoder(const void *image_data, UINT image_size zero.QuadPart = 0; IStream_Seek (stream, zero, STREAM_SEEK_CUR, &pos); - todo_wine ok(pos.QuadPart < image_size, "seek beyond the end of stream: %lu >= %u\n", + ok(pos.QuadPart < image_size, "seek beyond the end of stream: %lu >= %u\n", pos.QuadPart, image_size); refcount = IStream_Release(stream); -- 2.12.1

March 27, 2017

[2/3] windowscodecs: Test for png codec seeking too far

by Viktor Semykin

Signed-off-by: Viktor Semykin <thesame.ml(a)gmail.com> --- dlls/windowscodecs/tests/Makefile.in | 2 +- dlls/windowscodecs/tests/pngformat.c | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/windowscodecs/tests/Makefile.in b/dlls/windowscodecs/tests/Makefile.in index e11d184..e006e3d 100644 --- a/dlls/windowscodecs/tests/Makefile.in +++ b/dlls/windowscodecs/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = windowscodecs.dll -IMPORTS = windowscodecs oleaut32 ole32 user32 gdi32 +IMPORTS = windowscodecs oleaut32 ole32 user32 gdi32 shlwapi C_SRCS = \ bitmap.c \ diff --git a/dlls/windowscodecs/tests/pngformat.c b/dlls/windowscodecs/tests/pngformat.c index 34cb533..20b6e93 100644 --- a/dlls/windowscodecs/tests/pngformat.c +++ b/dlls/windowscodecs/tests/pngformat.c @@ -25,6 +25,7 @@ #include "windef.h" #include "wincodec.h" #include "wine/test.h" +#include "shlwapi.h" /* 1x1 pixel PNG image */ static const char png_no_color_profile[] = { @@ -277,21 +278,16 @@ static IWICImagingFactory *factory; static IWICBitmapDecoder *create_decoder(const void *image_data, UINT image_size) { - HGLOBAL hmem; - BYTE *data; HRESULT hr; IWICBitmapDecoder *decoder = NULL; IStream *stream; GUID format; LONG refcount; + ULARGE_INTEGER pos; + LARGE_INTEGER zero; - hmem = GlobalAlloc(0, image_size); - data = GlobalLock(hmem); - memcpy(data, image_data, image_size); - GlobalUnlock(hmem); - - hr = CreateStreamOnHGlobal(hmem, TRUE, &stream); - ok(hr == S_OK, "CreateStreamOnHGlobal error %#x\n", hr); + stream = SHCreateMemStream (image_data, image_size); + ok(stream != NULL, "SHCreateMemStream error\n"); hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, &decoder); ok(hr == S_OK, "CreateDecoderFromStream error %#x\n", hr); @@ -302,6 +298,11 @@ static IWICBitmapDecoder *create_decoder(const void *image_data, UINT image_size ok(IsEqualGUID(&format, &GUID_ContainerFormatPng), "wrong container format %s\n", wine_dbgstr_guid(&format)); + zero.QuadPart = 0; + IStream_Seek (stream, zero, STREAM_SEEK_CUR, &pos); + todo_wine ok(pos.QuadPart < image_size, "seek beyond the end of stream: %lu >= %u\n", + pos.QuadPart, image_size); + refcount = IStream_Release(stream); ok(refcount > 0, "expected stream refcount > 0\n"); -- 2.12.1

March 27, 2017

[1/3] shlwapi: SHCreateMemStream added to shlwapi.h

by Viktor Semykin

Where it belongs according to its documentation. Signed-off-by: Viktor Semykin <thesame.ml(a)gmail.com> --- include/shlwapi.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/shlwapi.h b/include/shlwapi.h index 2c68b7f..c19ca31 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -978,6 +978,7 @@ HRESULT WINAPI SHCreateStreamOnFileA(LPCSTR,DWORD,struct IStream**); HRESULT WINAPI SHCreateStreamOnFileW(LPCWSTR,DWORD,struct IStream**); #define SHCreateStreamOnFile WINELIB_NAME_AW(SHCreateStreamOnFile) +struct IStream * WINAPI SHCreateMemStream(const BYTE *lpbData, UINT dwDataLen); HRESULT WINAPI SHCreateStreamOnFileEx(LPCWSTR,DWORD,DWORD,BOOL,struct IStream*,struct IStream**); HRESULT WINAPI SHCreateStreamWrapper(LPBYTE,DWORD,DWORD,struct IStream**); -- 2.12.1

March 27, 2017

Re: [PATCH v4 4/7] user32: Always send WM_CANCELMODE when disabling a window.

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=29728 Your paranoid android. === w7u (32 bit msg) === msg.c:5084: Test failed: ShowWindow(SW_RESTORE):overlapped: 18: the msg sequence is not complete: expected 0000 - actual 0088

March 27, 2017

Re: [2/3] windowscodecs: Test for png codec seeking too far

by Viktor Semykin

Yes it does. I will resubmit the patches with todo_wine. On 27/03/17 13:35, Vincent Povirk wrote: > Does this test fail on Wine without patch 3? If it fails, you should > add a todo_wine to the failing test, and remove it when the test is > fixed. -- best, Viktor.

March 27, 2017

Re: [2/3] windowscodecs: Test for png codec seeking too far

by Vincent Povirk

Does this test fail on Wine without patch 3? If it fails, you should add a todo_wine to the failing test, and remove it when the test is fixed.

March 27, 2017

Re: [PATCH 2/2 v2] devenum: Implement IMoniker::IsEqual().

by Jactry Zeng

Thanks again! 2017-03-27 23:08 GMT+08:00 Andrew Eikum <aeikum(a)codeweavers.com>: > Thanks, just a couple more tweaks. > > On Mon, Mar 27, 2017 at 10:57:36PM +0800, Jactry Zeng wrote: > > diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c > > index e3c0f47256..b6275be8d2 100644 > > --- a/dlls/devenum/tests/devenum.c > > +++ b/dlls/devenum/tests/devenum.c > > @@ -135,6 +135,94 @@ static void test_devenum(IBindCtx *bind_ctx) > > if(sizeof(void*) == 4) > > ok(have_mrle, "mrle codec not found\n"); > > } > > +static void test_moniker_isequal(void) > > +{ > > + HRESULT res; > > + ICreateDevEnum *create_devenum = NULL; > > + IEnumMoniker *enum_moniker0 = NULL, *enum_moniker1 = NULL; > > + IMoniker *moniker0 = NULL, *moniker1 = NULL; > > + > > + res = CoCreateInstance(&CLSID_SystemDeviceEnum, NULL, > CLSCTX_INPROC, > > + &IID_ICreateDevEnum, > (LPVOID*)&create_devenum); > > + if (res) > > Please use FAILED() here. > > > + if (SUCCEEDED(IEnumMoniker_Next(enum_moniker0, 1, &moniker0, > NULL)) && > > + SUCCEEDED(IEnumMoniker_Next(enum_moniker1, 1, &moniker1, > NULL))) > > + { > > + res = IMoniker_IsEqual(moniker0, moniker1); > > + ok(SUCCEEDED(res), "IMoniker_IsEqual failed (res = %x)\n", > res); > > + > > + res = IMoniker_IsEqual(moniker1, moniker0); > > + ok(SUCCEEDED(res), "IMoniker_IsEqual failed (res = %x)\n", > res); > > These should be compared against S_OK, otherwise S_FALSE will also > pass the test. > > Andrew > > > -- Regards, Jactry Zeng

March 27, 2017

Re: [PATCH 2/2 v2] devenum: Implement IMoniker::IsEqual().

by Andrew Eikum

Thanks, just a couple more tweaks. On Mon, Mar 27, 2017 at 10:57:36PM +0800, Jactry Zeng wrote: > diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c > index e3c0f47256..b6275be8d2 100644 > --- a/dlls/devenum/tests/devenum.c > +++ b/dlls/devenum/tests/devenum.c > @@ -135,6 +135,94 @@ static void test_devenum(IBindCtx *bind_ctx) > if(sizeof(void*) == 4) > ok(have_mrle, "mrle codec not found\n"); > } > +static void test_moniker_isequal(void) > +{ > + HRESULT res; > + ICreateDevEnum *create_devenum = NULL; > + IEnumMoniker *enum_moniker0 = NULL, *enum_moniker1 = NULL; > + IMoniker *moniker0 = NULL, *moniker1 = NULL; > + > + res = CoCreateInstance(&CLSID_SystemDeviceEnum, NULL, CLSCTX_INPROC, > + &IID_ICreateDevEnum, (LPVOID*)&create_devenum); > + if (res) Please use FAILED() here. > + if (SUCCEEDED(IEnumMoniker_Next(enum_moniker0, 1, &moniker0, NULL)) && > + SUCCEEDED(IEnumMoniker_Next(enum_moniker1, 1, &moniker1, NULL))) > + { > + res = IMoniker_IsEqual(moniker0, moniker1); > + ok(SUCCEEDED(res), "IMoniker_IsEqual failed (res = %x)\n", res); > + > + res = IMoniker_IsEqual(moniker1, moniker0); > + ok(SUCCEEDED(res), "IMoniker_IsEqual failed (res = %x)\n", res); These should be compared against S_OK, otherwise S_FALSE will also pass the test. Andrew

March 27, 2017