February 2017 - Wine-devel - list.winehq.org

Re: mscms: Fix some spec file entries
by Hans Leidekker 23 Feb '17

23 Feb '17

On Wed, 2017-02-22 at 23:23 +0100, André Hentschel wrote: > -@ stdcall SetStandardColorSpaceProfileA(ptr long ptr) > -@ stdcall SetStandardColorSpaceProfileW(ptr long ptr) > +@ stdcall SetStandardColorSpaceProfileA(str long ptr) > +@ stdcall SetStandardColorSpaceProfileW(wstr long ptr) The last parameter should also be w/str.

1 0

Re: widl: Initialize variables that are not necessarily filled in encode_type
by Huw Davies 23 Feb '17

23 Feb '17

On Mon, Feb 20, 2017 at 10:06:46PM +0100, André Hentschel wrote: > Signed-off-by: André Hentschel <nerv(a)dawncrow.de> > --- > > This helps with reproducable builds > > tools/widl/write_msft.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c > index 137bb2d..39be30b 100644 > --- a/tools/widl/write_msft.c > +++ b/tools/widl/write_msft.c > @@ -2195,7 +2195,7 @@ static void add_union_typeinfo(msft_typelib_t *typelib, type_t *tunion) > static void add_typedef_typeinfo(msft_typelib_t *typelib, type_t *tdef) > { > msft_typeinfo_t *msft_typeinfo = NULL; > - int alignment, datatype1, datatype2, size, duplicate = 0; > + int alignment = 0, datatype1 = 0, datatype2 = 0, size = 0, duplicate = 0; encode_type() initializes alignment, datatype1 and size in all cases, so these are unnecessary. The question then becomes where is the best place to initialize datatype2 (a.k.a. decoded_size). Since no caller to encode_type() relies on the existing value being preserved, it makes sense to initialize it in encode_type(). So just send the patch you originally sent to wine-devel. Huw.

2 2

Re: [PATCH] oledb32: Correct length calculation in DataConvert for DBTYPE_STR
by Huw Davies 23 Feb '17

23 Feb '17

On Thu, Feb 23, 2017 at 06:49:58AM +0000, Alistair Leslie-Hughes wrote: > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/oledb32/convert.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c > index ac462f2..7030eb5 100644 > --- a/dlls/oledb32/convert.c > +++ b/dlls/oledb32/convert.c > @@ -816,23 +816,23 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, > case DBTYPE_STR: > { > BSTR b; > - DBLENGTH bstr_len; > + DBLENGTH length; > INT bytes_to_copy; > - hr = IDataConvert_DataConvert(iface, src_type, DBTYPE_BSTR, src_len, &bstr_len, > + hr = IDataConvert_DataConvert(iface, src_type, DBTYPE_BSTR, src_len, &length, > src, &b, sizeof(BSTR), src_status, dst_status, > precision, scale, flags); > if(hr != S_OK) return hr; > - bstr_len = SysStringLen(b); > - *dst_len = bstr_len * sizeof(char); /* Doesn't include size for '\0' */ > + length = WideCharToMultiByte(CP_ACP, 0, b, -1, NULL, 0, NULL, NULL); > + *dst_len = length - 1; /* Doesn't include size for '\0' */ > *dst_status = DBSTATUS_S_OK; > - bytes_to_copy = min(*dst_len + sizeof(char), dst_max_len); > + bytes_to_copy = min(length, dst_max_len); > if(dst) > { > if(bytes_to_copy >= sizeof(char)) > { > - WideCharToMultiByte(CP_ACP, 0, b, bytes_to_copy - sizeof(char), dst, dst_max_len, NULL, NULL); > + WideCharToMultiByte(CP_ACP, 0, b, -1, dst, dst_max_len, NULL, NULL); > *((char *)dst + bytes_to_copy / sizeof(char) - 1) = 0; > - if(bytes_to_copy < *dst_len + sizeof(char)) > + if(bytes_to_copy < length) > *dst_status = DBSTATUS_S_TRUNCATED; > } > else This fails the tests: convert.c:1926: Test failed: got 2 I suspect you want to use SysStringLen(b) as the wstr len in the calls to WideCharToMultiByte. It would also be worth adding a test for DBTYPE_STR | DBTYPE_BYREF in this case too. Huw.

1 0

Re: user32: Fix some spec file entries
by Alexandre Julliard 23 Feb '17

23 Feb '17

André Hentschel <nerv(a)dawncrow.de> writes: > Signed-off-by: André Hentschel <nerv(a)dawncrow.de> > --- > dlls/user32/user32.spec | 34 +++++++++++++++++----------------- > 1 file changed, 17 insertions(+), 17 deletions(-) > > diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec > index c2d43e7..b64a630 100644 > --- a/dlls/user32/user32.spec > +++ b/dlls/user32/user32.spec > @@ -7,8 +7,8 @@ > @ stdcall AllowSetForegroundWindow (long) > @ stdcall AnimateWindow(long long long) > @ stdcall AnyPopup() > -@ stdcall AppendMenuA(long long long ptr) > -@ stdcall AppendMenuW(long long long ptr) > +@ stdcall AppendMenuA(long long long str) > +@ stdcall AppendMenuW(long long long wstr) Strings in menu calls are not always strings, you don't want to print them. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] user32: Translate WM_(NC)XBUTTONUP to WM_APPCOMMAND in DefWindowProc.
by Marvin 23 Feb '17

23 Feb '17

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=28823 Your paranoid android. === w7u (32 bit msg) === msg.c:7920: Test failed: destroy child on thread exit: 1: the msg sequence is not complete: expected 000f - actual 0000

1 0

Re: d3dx9_36: Fix some spec file entries
by Matteo Bruni 22 Feb '17

22 Feb '17

2017-02-22 21:28 GMT+01:00 André Hentschel <nerv(a)dawncrow.de>: > Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> BTW, the other d3dx9_xx.spec files seem to need the same fix.

1 0

Re: [PATCH] d3d9/tests: AMD r500 needs dummy texture output from vertex shaders for point sprites to work (v2).
by Marvin 22 Feb '17

22 Feb '17

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=28812 Your paranoid android. === w8 (32 bit visual) === visual.c:7989: Test failed: Got unexpected color 0x00007580 for quad 2 (different colors). === w864 (64 bit visual) === visual.c:8093: Test failed: Got unexpected color 0x00ff00ff for no color attribute test. === w1064 (64 bit visual) === visual.c:7941: Test failed: Input test: Quad 3(2crd-wrongidx) returned color 0x00ff00ff, expected 0x00ff0080 visual.c:7989: Test failed: Got unexpected color 0x00007580 for quad 2 (different colors). visual.c:8093: Test failed: Got unexpected color 0x00ff0000 for no color attribute test.

1 0

Outreachy project
by Ekta Parmar 22 Feb '17

22 Feb '17

Hey! Ekta Parmar here, I am currently pursuing B.Tech degree in Information and Communication Technology and I am in second year.I am quite new to open source contribution.I am interested in Winetest Graphical User Interface project.Please guide me further.

2 1

iphlpapi test failure
by André Hentschel 22 Feb '17

22 Feb '17

Hi François, It seems I introduced some test failures in iphlpapi and your machines seem to produce them reliable (testbot doesn't). Could you please run with the attached patch as soon as you have time for it, so I can shed some light on the problem? See https://test.winehq.org/data/tests/iphlpapi:iphlpapi.html

2 2

Re: [PATCH 7/7] server: Pass existing async object to fd_queue_async.
by Alexandre Julliard 22 Feb '17

22 Feb '17

Jacek Caban <jacek(a)codeweavers.com> writes: > @@ -2030,23 +2030,22 @@ void default_poll_event( struct fd *fd, int event ) > else if (!fd->inode) set_fd_events( fd, fd->fd_ops->get_poll_events( fd ) ); > } > > -struct async *fd_queue_async( struct fd *fd, const async_data_t *data, struct iosb *iosb, int type ) > +void fd_queue_async( struct fd *fd, struct async *async, int type ) > { > struct async_queue *queue; > - struct async *async; > > switch (type) > { > case ASYNC_TYPE_READ: > - if (!fd->read_q && !(fd->read_q = create_async_queue( fd ))) return NULL; > + if (!fd->read_q && !(fd->read_q = create_async_queue( fd ))) return; > queue = fd->read_q; > break; > case ASYNC_TYPE_WRITE: > - if (!fd->write_q && !(fd->write_q = create_async_queue( fd ))) return NULL; > + if (!fd->write_q && !(fd->write_q = create_async_queue( fd ))) return; > queue = fd->write_q; > break; > case ASYNC_TYPE_WAIT: > - if (!fd->wait_q && !(fd->wait_q = create_async_queue( fd ))) return NULL; > + if (!fd->wait_q && !(fd->wait_q = create_async_queue( fd ))) return; > queue = fd->wait_q; > break; > default: > @@ -2054,18 +2053,15 @@ struct async *fd_queue_async( struct fd *fd, const async_data_t *data, struct io > assert(0); > } > > - if ((async = create_async( current, data, iosb ))) > + queue_async( queue, async ); > + > + if (type != ASYNC_TYPE_WAIT) > { > - queue_async( queue, async ); > - if (type != ASYNC_TYPE_WAIT) > - { > - if (!fd->inode) > - set_fd_events( fd, fd->fd_ops->get_poll_events( fd ) ); > - else /* regular files are always ready for read and write */ > - async_wake_up( queue, STATUS_ALERTED ); > - } > + if (!fd->inode) > + set_fd_events( fd, fd->fd_ops->get_poll_events( fd ) ); > + else /* regular files are always ready for read and write */ > + async_wake_up( queue, STATUS_ALERTED ); > } > - return async; > } > > void fd_async_wake_up( struct fd *fd, int type, unsigned int status ) > @@ -2098,11 +2094,8 @@ void no_fd_queue_async( struct fd *fd, struct async *async, int type, int count > > void default_fd_queue_async( struct fd *fd, struct async *async, int type, int count ) > { > - if ((async = fd_queue_async( fd, async_get_data( async ), NULL, type ))) > - { > - release_object( async ); > - set_error( STATUS_PENDING ); > - } > + fd_queue_async( fd, async, type ); > + if (!get_error()) set_error( STATUS_PENDING ); I think it would be better to still have fd_queue_async() return a success flag instead of relying on the error code. -- Alexandre Julliard julliard(a)winehq.org

2 1