August 2015 - Wine-devel - list.winehq.org

Re: [include] - add new file tcpestats.h
by Sebastian Lackner 04 Aug '15

04 Aug '15

On 04.08.2015 01:19, Vijay Kiran Kamuju wrote: > Changelog > include - add new file tcpestats.h > Your patch contains the same whitespace errors as the mingw header files. As far as I know, copying header files is not allowed, you have to type them yourself (even when the mingw header files are under a public domain license). (If someone else knows better, please correct me.) Regards, Sebastian

1 0

Re: [PATCH 1/2] include: Add ntifs.h with Reparse point related definitions and typedefs.(try 2)
by Sebastian Lackner 04 Aug '15

04 Aug '15

On 04.08.2015 19:58, YongHao Hu wrote: > try 2: > Fix nameless union.(thanks Piotr) > --- > include/Makefile.in | 1 + > include/ntifs.h | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 84 insertions(+) > create mode 100644 include/ntifs.h > > > + ULONG ReparseTag; > + USHORT ReparseDataLength; > + USHORT Reserved; > + union foo > + { > + struct > + { Please use DUMMYUNIONNAME instead, like in the other include files. It should look like this: union { ... } DUMMYUNIONNAME; Regards, Sebastian

1 0

Re: [5/5] msvcirt: Implement filebuf::open/close
by Piotr Caban 04 Aug '15

04 Aug '15

On 08/03/15 16:49, Iván Matellanes wrote: > @@ -884,8 +893,16 @@ filebuf* __thiscall filebuf_attach(filebuf *this, filedesc fd) > DEFINE_THISCALL_WRAPPER(filebuf_close, 4) > filebuf* __thiscall filebuf_close(filebuf *this) > { > - FIXME("(%p) stub\n", this); > - return NULL; > + TRACE("(%p)\n", this); > + if (this->fd == -1) > + return NULL; > + > + streambuf_lock(&this->base); > + call_streambuf_sync(&this->base); Please handle call_streambuf_sync failure here. > /* ?fd(a)filebuf@@QBEHXZ */ > @@ -911,8 +928,46 @@ int __thiscall filebuf_is_open(const filebuf *this) > DEFINE_THISCALL_WRAPPER(filebuf_open, 16) > filebuf* __thiscall filebuf_open(filebuf *this, const char *name, ios_open_mode mode, int protection) > { > - FIXME("(%p %s %d %d) stub\n", this, name, mode, protection); > - return NULL; > + const int inout_mode[4] = {-1, _O_RDONLY, _O_WRONLY, _O_RDWR}; > + const int share_mode[4] = {_SH_DENYRW, _SH_DENYWR, _SH_DENYRD, _SH_DENYNO}; > + int op_flags, sh_flags, fd; > + > + TRACE("(%p %s %d %d)\n", this, name, mode, protection); It will be easier to read the logs if mode and protection is printed as hexadecimal value. The same way op_flags and sh_flags should be printed. > + if (this->fd != -1) > + return NULL; > + > + /* mode */ > + if (mode & (OPENMODE_app|OPENMODE_trunc)) > + mode |= OPENMODE_out; > + op_flags = inout_mode[mode & (OPENMODE_in|OPENMODE_out)]; > + if (op_flags < 0) > + return NULL; > + if (mode & OPENMODE_app) > + op_flags |= _O_APPEND; > + if ((mode & OPENMODE_trunc) || > + ((mode & OPENMODE_out) && !(mode & (OPENMODE_in|OPENMODE_app|OPENMODE_ate)))) > + op_flags |= _O_TRUNC; > + if (!(mode & OPENMODE_nocreate)) > + op_flags |= _O_CREAT; > + if (mode & OPENMODE_noreplace) > + op_flags |= _O_EXCL; > + op_flags |= (mode & OPENMODE_binary) ? _O_BINARY : _O_TEXT; > + > + /* share protection */ > + sh_flags = (protection & filebuf_sh_none) ? share_mode[(protection >> 9) & 3] : _SH_DENYNO; > + > + TRACE("op_flags %d, sh_flags %d\n", op_flags, sh_flags); > + fd = _sopen(name, op_flags, sh_flags, _S_IREAD|_S_IWRITE); > + if (fd < 0) > + return NULL; > + > + streambuf_lock(&this->base); > + this->fd = fd; > + this->close = 1; > + if (mode & OPENMODE_ate) > + call_streambuf_seekoff(&this->base, 0, SEEKDIR_end, OPENMODE_in|OPENMODE_out); Please handle seek failure here. Thanks, Piotr

1 0

Re: wine.inf: Add UTC Time Zone (try 4)
by Sebastian Lackner 04 Aug '15

04 Aug '15

On 04.08.2015 03:05, Philippe Groarke wrote: > Fixes 39008 > --- > loader/wine.inf.in | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/loader/wine.inf.in b/loader/wine.inf.in > index 315ef29..30cf5ab 100644 > --- a/loader/wine.inf.in > +++ b/loader/wine.inf.in > @@ -3070,6 +3070,10 @@ HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Display",,"America > HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Dlt",,"US Mountain Daylight Time" > HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Std",,"US Mountain Standard Time" > HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"TZI",1,a4,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"Display",,"Etc/UTC" > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"Dlt",,"Coordinated Universal Time" > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"Std",,"Coordinated Universal Time" > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"TZI",1,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 > HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Display",,"America/Caracas" > HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Dlt",,"Venezuela Daylight Time" > HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Std",,"Venezuela Standard Time" > Looks good, thanks! :)

1 0

Re: quartz: waveparser support wav file generated by ffmpeg
by Marvin 04 Aug '15

04 Aug '15

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=15747 Your paranoid android. === wvistau64 (32 bit filtergraph) === filtergraph.c:165: Test failed: RenderFile returned: 80040256 filtergraph.c:83: Test failed: Cannot run the graph returned: 0 === w2008s64 (32 bit filtergraph) === filtergraph.c:165: Test failed: RenderFile returned: 80040256 filtergraph.c:83: Test failed: Cannot run the graph returned: 0 === wvistau64 (64 bit filtergraph) === filtergraph.c:165: Test failed: RenderFile returned: 80040256 filtergraph.c:83: Test failed: Cannot run the graph returned: 0 === w2008s64 (64 bit filtergraph) === filtergraph.c:165: Test failed: RenderFile returned: 80040256 filtergraph.c:83: Test failed: Cannot run the graph returned: 0

1 0

Re: [PATCH 4/5] d3d9: Don't assert on invalid IDirect3DBaseTexture9 interfaces.
by Stefan Dösinger 04 Aug '15

04 Aug '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2015-08-04 um 08:53 schrieb Henri Verbeet: > + texture->lpVtbl = (IDirect3DBaseTexture9Vtbl *)0xdeadbeef; > + hr = IDirect3DDevice9_SetTexture(device, 0, texture); > + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); I guess you're not testing GetTexture because it crashes when trying to AddRef the texture? > + if (iface->lpVtbl != (const IDirect3DBaseTexture9Vtbl *)&d3d9_texture_2d_vtbl > + && iface->lpVtbl != (const IDirect3DBaseTexture9Vtbl *)&d3d9_texture_cube_vtbl > + && iface->lpVtbl != (const IDirect3DBaseTexture9Vtbl *)&d3d9_texture_3d_vtbl) > + { > + WARN("%p is not a valid IDirect3DBaseTexture8 interface.\n", iface); > + return NULL; > + } Minor copypaste bug ("IDirect3DBaseTexture8"). -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVwHkaAAoJEN0/YqbEcdMwAykP/3XM3HslUzcvJ+d5Jz59febN pBoVG5dJO0uboxYAjuv1Fj6Ft9+CWvcSOva6Oo1cnwV06ojY82oFC5XIQp+UB9xQ nU+T8In0b5IPX82uTSEM6k/uVE3Yycc41DmvD1/VxF29el64Oifn1afOcAg7TRAV f93+yR464vBzx7esXRpXkF5X1xvmsW1LtnJe3Z1uHqNMiZwixn9M33kuceMz0ZqD H9o8Hxn1sESurxR/2cEZFFzHne36l067NY2/HsJ9yeBk90zay+99iojMcWCLhhF2 CHj6xynbxWZCGFSRQM29HtCt/P5nl6lrg/jXeFY8AwmAf0n9NMBOyxqb8c7BVFx/ bSO75oPiyHS8xzBxdgqCuJka18QlTuy40UwNwQTU6TckcHl+MyezthLKAFSRV42i zGjcV0S725bQWy2/S4ep+fuxWaJNT5JKULvcqQxHDo3h/NBLyvHI+fNXMhZGJWdH Z1Xl2lGhoihIieu+2Xo5Jt+ghuecs8RQYIfamsYGQJDIuyovE8PAKGoPy/S+CzyN ypOPjXwhDTEIJpMm0/Gaxc49FkjbHiLjcevJS6wRP5JQJzIrKy94SwPCIhRiQoj7 dLgsiPAppEGLgkhFTQ1DcYvkS4UcPMlN8K0dmcXFiMWgzmfeKm2gnZ9+2p2WfhZf 5FGMz4ENg5TuWxay3YRj =4SY2 -----END PGP SIGNATURE-----

2 1

Re: loader: Add UTC Time Zone
by Sebastian Lackner 04 Aug '15

04 Aug '15

On 03.08.2015 16:32, Philippe Groarke wrote: > Fixes 39008 > --- > loader/wine.inf.in | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/loader/wine.inf.in b/loader/wine.inf.in > index 315ef29..1627ad6 100644 > --- a/loader/wine.inf.in > +++ b/loader/wine.inf.in > @@ -3070,6 +3070,10 @@ HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Display",,"America > HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Dlt",,"US Mountain Daylight Time" > HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Std",,"US Mountain Standard Time" > HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"TZI",1,a4,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"Display",,"Etc/GMT" I just saw that we have also a unix timezone Etc/UTC, this might be more appropriate (especially to avoid confusion with "GMT Standard Time", which is a separate entry in the file). > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"Dlt",,"Etc/GMT" > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"Std",,"Etc/GMT" For all other entries it contains a human readable name. Something like "Coordinated Universal Time" for both Dlt and Std might be a bit better. > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"TZI",1,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 > HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Display",,"America/Caracas" > HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Dlt",,"Venezuela Daylight Time" > HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Std",,"Venezuela Standard Time" > Two other remarks: * When you send an updated version, please append "(try N)" to your subject, to make clear which version is newer. * A subject starting with "wine.inf:" might be better, since your patch only touches this single file, not the loader itself. Sorry for not pointing out all those things earlier. Best regards, Sebastian

2 3

Re: [PATCH 1/2] include: Add ntifs.h with Reparse point related definitions and typedefs.
by Piotr Caban 03 Aug '15

03 Aug '15

On 07/29/15 20:01, YongHao Hu wrote: > + union > + { > + struct > + { > + USHORT SubstituteNameOffset; > + USHORT SubstituteNameLength; > + USHORT PrintNameOffset; > + USHORT PrintNameLength; > + ULONG Flags; > + WCHAR PathBuffer[1]; > + } SymbolicLinkReparseBuffer; > + struct > + { > + USHORT SubstituteNameOffset; > + USHORT SubstituteNameLength; > + USHORT PrintNameOffset; > + USHORT PrintNameLength; > + WCHAR PathBuffer[1]; > + } MountPointReparseBuffer; > + struct > + { > + UCHAR DataBuffer[1]; > + } GenericReparseBuffer; > + }; This will not work on some compilers (nameless unions). Thanks, Piotr

1 0

Re: winex11.drv: Unmaximize restored windows when necessary.
by Vincent Povirk 03 Aug '15

03 Aug '15

I don't think it's possible to sync the window modes correctly without maximizing first or messing with user32 internals. Is there something else I can follow up on?

1 0

Re: loader: Add UTC Time Zone
by Sebastian Lackner 03 Aug '15

03 Aug '15

On 03.08.2015 14:48, Philippe Groarke wrote: > Fixes 39008 > --- > loader/wine.inf.in | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/loader/wine.inf.in b/loader/wine.inf.in > index 315ef29..2ab6ff3 100644 > --- a/loader/wine.inf.in > +++ b/loader/wine.inf.in > @@ -3070,6 +3070,10 @@ HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Display",,"America > HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Dlt",,"US Mountain Daylight Time" > HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Std",,"US Mountain Standard Time" > HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"TZI",1,a4,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"Display",,"Etc/GMT" > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"Dlt",,"Etc/GMT" > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"Std",,"Etc/GMT" > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"TZI",,1,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 This is still wrong unfortunately, there should only be one "," before the 1, otherwise it is not interpreted correctly. > HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Display",,"America/Caracas" > HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Dlt",,"Venezuela Daylight Time" > HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Std",,"Venezuela Standard Time" >

1 0