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

Re: [PATCH] wined3d: fix color in range comparison
by Stefan Dösinger 27 May '15

27 May '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2015-05-26 um 14:41 schrieb Sergey Isakov: > +#define RED_KEY(x) (x & 0xff0000) > +#define GREEN_KEY(x) (x & 0x00ff00) > +#define BLUE_KEY(x) (x & 0x0000ff) > + return ((RED_KEY(color) >= RED_KEY(color_key->color_space_low_value)) && > + (RED_KEY(color) <= RED_KEY(color_key->color_space_high_value)) && > + (GREEN_KEY(color) >= GREEN_KEY(color_key->color_space_low_value)) && > + (GREEN_KEY(color) <= GREEN_KEY(color_key->color_space_high_value)) && > + (BLUE_KEY(color) >= BLUE_KEY(color_key->color_space_low_value)) && > + (BLUE_KEY(color) <= BLUE_KEY(color_key->color_space_high_value))); > +#undef RED_KEY > +#undef GREEN_KEY > +#undef BLUE_KEY The basic idea is most likely right, but it needs tests. Do you have a game that needs this behavior? The way you're extracting individual colors from the key is wrong. The bitmasks depend on the texture format. The code you're modifying is unused on any modern GPU. On GPUs that support ARB_fragment_program or GLSL we do the color key comparison in the fragment shader nowadays. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVZXSWAAoJEN0/YqbEcdMwbEUP/RM4QUsbdSzhSLyIz5j00Epb AW1ZcNOg61yrfymjHdhJkqfdNmEiKQFsRshD+ZQAxVHqMsZLTxXtRFfBB14WtmNI Ng5jwwiAzDqlmpjftlZ4CmkR1w7DMxH6Nt4e9OQBlDKShSIoGngL6RremV+2Wq+f nNC6HfdmUiAIReVvI2aMm5B9C5L624SKLvoAZNI8QW+HJeZeESSGmT9bx4IRVQwl QX+aKojT43CJwq6UpZRu7ZkniotrmO9aDC+6S3S0od0ZJWSP5Q9upCNWNcN+iPG7 9kCPwZMsEAxNUjvh/wQx8xE1+wiR7Ugjl/X6yTN8HFesFHChrqC2UeHUAkUKU++L WC4kwijfbktKSZnIiSvrTAzWvLOeCZMifFQqm8aqmlOqyvbNwyOJjh6yM/nqZi+c 2aEdEIMY5aaoswDIlyGRRN57zeWtqjZVmg7UzVxmZqfiocmUVxgdmdRv8BvFi0RF R4A6YTDP5EYb33SvH3qQE5kIrtDdtL8qtanmBsuHnhhwd1rdgeeq/9N0tqSjH1GQ s8vsXVmd3qU+mQMzyaxN9Cc9RGxGNgd+g1LkkoPqe+aVUw/JDzvAdMDGpy63zjhM QUlfS771f+Zt43wku/20XP1engXXti4m+KfnSOS3nCdKO1xRKOGHAMlUZzd8+jhU 2rWKuh42D3mSMDk1OhLR =IdO/ -----END PGP SIGNATURE-----

1 0

Re: winedump: Add more image debug types
by Michael Stefaniuc 27 May '15

27 May '15

On 05/26/2015 10:59 PM, André Hentschel wrote: > My main goal is to destroy the ccache from Michael S. ;) Did you just ask for your patch to be Rejected? But I don't mind anymore since I got my new beefy box as compilation is fast enough with that ;-P bye michael > --- > include/winnt.h | 4 ++++ > tools/winedump/pe.c | 8 ++++++++ > 2 files changed, 12 insertions(+) > > diff --git a/include/winnt.h b/include/winnt.h > index b25c25b..4c89750 100644 > --- a/include/winnt.h > +++ b/include/winnt.h

1 0

Re: [PATCH] ntdll/tests: NtOpenFile a directory with NULL ObjectName.
by Marvin 27 May '15

27 May '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=13614 Your paranoid android. === w8 (32 bit file) === file.c:408: Test failed: mismatched file size for L"WindowsUpdate.log"

1 0

programs/regsvr32: Output strings as WCHAR to support non-ascii characters
by Hugh McMaster 27 May '15

27 May '15

On Mon, 25 May 2015 12:06:43 -0300, Bruno Jesus wrote: > Fixes https://bugs.winehq.org/show_bug.cgi?id=38638 Hi Bruno, Your patch had the unfortunate side-effect of breaking output for almost all resource strings used in regsvr32. The problem is that the names of DLLs and input commands are still in ASCII. Fixing the issue requires more work, as regsvr32 needs to be converted to Unicode first. I wrote patches to do that last year, but Alexandre felt they weren't needed. He said something like, "If it isn't broken, don't fix it". But now there is a problem, as translations are broken. I've rebased the patches against the latest commit base and uploaded them to my Dropbox account. [1] Feel free to use them. Or, if you like, I'll resend them to wine-patches. -- Hugh McMaster [1] https://www.dropbox.com/sh/7j8wh9n0n09znk5/AADz3Fa3oEmtRUhqVG-Kq0kIa?dl=0

2 2

Re: [PATCH 3/8] wined3d: Keep track of renderbuffer capabilities.
by Henri Verbeet 26 May '15

26 May '15

On 22 May 2015 at 10:11, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > @@ -1145,18 +1151,21 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 > /* WINED3DUSAGE_DEPTHSTENCIL needs WINED3DFMT_FLAG_DEPTH or WINED3DFMT_FLAG_STENCIL, not both. */ > > if ((format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & required_flags) == required_flags > - && (!(desc->usage & WINED3DUSAGE_DEPTHSTENCIL) || (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & ds_flags)) > + && check_ds_support(format, WINED3D_GL_RES_TYPE_TEX_2D, desc->usage) > && (gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT] > || (desc->width == pow2_width && desc->height == pow2_height))) > gl_type = WINED3D_GL_RES_TYPE_TEX_2D; > else if ((format->flags[WINED3D_GL_RES_TYPE_TEX_RECT] & required_flags) == required_flags > - && (!(desc->usage & WINED3DUSAGE_DEPTHSTENCIL) || (format->flags[WINED3D_GL_RES_TYPE_TEX_RECT] & ds_flags))) > + && check_ds_support(format, WINED3D_GL_RES_TYPE_TEX_RECT, desc->usage)) > gl_type = WINED3D_GL_RES_TYPE_TEX_RECT; > + else if ((format->flags[WINED3D_GL_RES_TYPE_RB] & required_flags) == required_flags > + && check_ds_support(format, WINED3D_GL_RES_TYPE_RB, desc->usage)) > + gl_type = WINED3D_GL_RES_TYPE_RB; > else > gl_type = WINED3D_GL_RES_TYPE_TEX_2D; /* No error, may be SCRATCH pool or emulated conditional np2. */ > This is kind of ok because the existing code is like this, but notice the similarity to some of the code in resource_init(). In fact, is there any reason the caller needs to pass "gl_type" to resource_init() instead of letting it figure it out on its own? > -static void delete_fbo_attachment(const struct wined3d_gl_info *gl_info) > +static void delete_fbo_attachment(const struct wined3d_gl_info *gl_info, > + enum wined3d_gl_resource_type d3d_type, GLuint *object) > { > - gl_info->fbo_ops.glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, > - GL_TEXTURE_2D, 0, 0); > + switch (d3d_type) > + { > + case WINED3D_GL_RES_TYPE_TEX_1D: > + case WINED3D_GL_RES_TYPE_TEX_2D: > + case WINED3D_GL_RES_TYPE_TEX_RECT: > + case WINED3D_GL_RES_TYPE_TEX_3D: > + case WINED3D_GL_RES_TYPE_TEX_CUBE: > + gl_info->gl_ops.gl.p_glDeleteTextures(1, object); > + break; > + > + case WINED3D_GL_RES_TYPE_RB: > + gl_info->fbo_ops.glDeleteRenderbuffers(1, object); > + break; > + > + case WINED3D_GL_RES_TYPE_BUFFER: > + case WINED3D_GL_RES_TYPE_COUNT: > + break; > + } > } Why is "object" a pointer?

3 7

GSoC 2015 projects
by Matteo Bruni 26 May '15

26 May '15

Hey all, tomorrow the coding period of the Summer of Code begins and I though it might be a nice idea to let the community know about the projects we've got this year. Actually, I though it would be even better if the student themselves wrote a short summary of their own project for the mailing list. So, with no authority backing me, I'm kindly asking that. No need to write anything too fancy, just a few lines explaining what are you going to work on over the summer and maybe what are the expected benefits for Wine. Thank you! Matteo.

5 4

Re: [PATCH] d3d11.idl: add the basic interfaces to enable video decoding
by Steve Lhomme 26 May '15

26 May '15

On Sun, May 24, 2015 at 8:03 AM, Steve Lhomme <robux4(a)videolabs.io> wrote: > Any update on this patch ? Should I submit again with the one space removed ? I'm sending the updated version. > Steve > > On Wed, May 13, 2015 at 11:06 AM, Steve Lhomme <robux4(a)videolabs.io> wrote: >> On Wed, May 13, 2015 at 1:02 PM, Stefan Dösinger >> <stefandoesinger(a)gmail.com> wrote: >>> -----BEGIN PGP SIGNED MESSAGE----- >>> Hash: SHA1 >>> >>> Hi, >>> >>> This patch looks better. Ultimately Henri and Alexandre have to decide >>> if they're happy with it. Henri is on vacation this week, so don't >>> expect much movement until Monday. >> >> No problem. >> >>> Am 2015-05-11 um 15:41 schrieb Steve Lhomme: >>>> +interface ID3D11VideoDecoderOutputView : ID3D11View >>>> +{ >>>> + void GetDesc( >>>> + [out] D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC *pDesc ); >>>> +} >>> There's a space that doesn't match the rest of the patch, but does match >>> what's in the MS headers. Since it is the only case I can spot I think >>> it's a typo in a self-typed header rather than a missed fixup in a >>> copypasted header. >> >> Should I resubmit without the extra space ? >> >>> You don't have to use the same parameter names in Methods or functions. >>> Instead of "pDesc" you can e.g. use "desc". The rest of the header >>> already uses pCrap though, so I'm ok with the current way. >> >> I checked the other d3d IDL files in the repo to match what's already >> in use and pDesc is very common, for example in d3d10.idl. >> >>> -----BEGIN PGP SIGNATURE----- >>> Version: GnuPG v2 >>> >>> iQIcBAEBAgAGBQJVUy8wAAoJEN0/YqbEcdMwXHwQAJd+LDxvH03XR5L/+bpxZB/o >>> U6g7cgMmtkklfSeCazZrUe0R5ZZExbmmIN+bBr6GJpbQezVQW3vng9EQj6ihfBjf >>> 6CEKr9BJF/xOhYdHPrhg3yxaD9MZrnsXa9llNFGds6SI0q1L8uCclyAuPxV+AoSO >>> fxgElN7/+LCRTwEM9shdwuxVELrikW52UmVTEajhNematVixplOh6pJMe+8XyPp/ >>> iSn+6p/jBeytKzjb83uUnyGqVaFLOIg9ywR2PPeA43RvNYVnfV9agxeOGJYvO7Zw >>> mKWmv+fG9sIXzvF/G9upnceE69YHf8WoIdEHW+kZsOl2ctRRB4ycBHp0rG4s2IeH >>> f1XpENP55lT+dYIc/Tef8IdpABzmGD7JwtnbLyxRbF4F9Qwfe6x7GP3VtEBp1M/+ >>> 5nePonYZ4N55sShelaU8X7/JxUuZb8onlz1UfEXJkIykopyQJJw49rXkQv7OFm2k >>> xyJAsXCQk5Z9sqXXBuFxUnKkip9P8UaLOwFJ8WFUVgHrkS9UAceiehUKgvpcwYfX >>> vxh48j6gAE4fBEUBVOlXiR4lMV7cDUWIoJdCopUkzxysPMp/hi3BcDk7EdrF9LX9 >>> c01jQc2N+JwzjIyNhSC01Jk23Qp2lOG+pUT1UrKcACesoB1H6Zm3QbNv5hVgUfkz >>> pFuJsryqPWxQFS02SvTu >>> =ToVh >>> -----END PGP SIGNATURE-----

1 0

Re: [PATCH 1/2] Add the GUID definition of DXGI_DEBUG_D3D11
by Steve Lhomme 26 May '15

26 May '15

Any update on this patch ? Thanks On Tue, May 12, 2015 at 4:24 PM, Steve Lhomme <robux4(a)videolabs.io> wrote: > --- > According to https://msdn.microsoft.com/en-us/library/windows/desktop/hh780344%28v=vs.85… > --- > include/d3d11sdklayers.idl | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/include/d3d11sdklayers.idl b/include/d3d11sdklayers.idl > index 638e53c..f21d11e 100644 > --- a/include/d3d11sdklayers.idl > +++ b/include/d3d11sdklayers.idl > @@ -20,6 +20,8 @@ import "oaidl.idl"; > import "ocidl.idl"; > import "d3d11.idl"; > > +cpp_quote("DEFINE_GUID(DXGI_DEBUG_D3D11, 0x4b99317b, 0xac39, 0x4aa6, 0xbb, 0x0b, 0xba, 0xa0, 0x47, 0x84, 0x79, 0x8f);") > + > typedef enum D3D11_MESSAGE_CATEGORY { > D3D11_MESSAGE_CATEGORY_APPLICATION_DEFINED, > D3D11_MESSAGE_CATEGORY_MISCELLANEOUS, > -- > 2.4.0 > > >

1 0

Re: [PATCH 2/2] Add dxgidebug.idl
by Steve Lhomme 26 May '15

26 May '15

Any update on this patch ? Thanks On Tue, May 12, 2015 at 4:24 PM, Steve Lhomme <robux4(a)videolabs.io> wrote: > --- > Useful to debug DXGI leaks > See https://msdn.microsoft.com/en-us/library/windows/desktop/hh780352%28v=vs.85… > --- > include/Makefile.in | 1 + > include/dxgidebug.idl | 44 ++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 45 insertions(+) > create mode 100644 include/dxgidebug.idl > > diff --git a/include/Makefile.in b/include/Makefile.in > index ad87f47..d496bd8 100644 > --- a/include/Makefile.in > +++ b/include/Makefile.in > @@ -42,6 +42,7 @@ PUBLIC_IDL_H_SRCS = \ > dwrite_2.idl \ > dxgi.idl \ > dxgi1_2.idl \ > + dxgidebug.idl \ > dxva2api.idl \ > endpointvolume.idl \ > exdisp.idl \ > diff --git a/include/dxgidebug.idl b/include/dxgidebug.idl > new file mode 100644 > index 0000000..94f57da > --- /dev/null > +++ b/include/dxgidebug.idl > @@ -0,0 +1,44 @@ > +/* > + * Copyright 2015 Steve Lhomme > + * > + * This library is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2.1 of the License, or (at your option) any later version. > + * > + * This library is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this library; if not, write to the Free Software > + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA > + */ > + > +import "oaidl.idl"; > + > +cpp_quote("DEFINE_GUID(DXGI_DEBUG_ALL, 0xe48ae283, 0xda80, 0x490b, 0x87, 0xe6, 0x43, 0xe9, 0xa9, 0xcf, 0xda, 0x08);") > +cpp_quote("DEFINE_GUID(DXGI_DEBUG_DX, 0x35cdd7fc, 0x13b2, 0x421d, 0xa5, 0xd7, 0x7e, 0x44, 0x51, 0x28, 0x7d, 0x64);") > +cpp_quote("DEFINE_GUID(DXGI_DEBUG_DXGI, 0x25cddaa4, 0xb1c6, 0x47e1, 0xac, 0x3e, 0x98, 0x87, 0x5b, 0x5a, 0x2e, 0x2a);") > +cpp_quote("DEFINE_GUID(DXGI_DEBUG_APP, 0x06cd6e01, 0x4219, 0x4ebd, 0x87, 0x90, 0x27, 0xed, 0x23, 0x36, 0x0c, 0x62);") > + > +typedef enum DXGI_DEBUG_RLO_FLAGS { > + DXGI_DEBUG_RLO_SUMMARY = 0x0001, > + DXGI_DEBUG_RLO_DETAIL = 0x0002, > + DXGI_DEBUG_RLO_IGNORE_INTERNAL = 0x0004, > + DXGI_DEBUG_RLO_ALL = 0x0007 > +} DXGI_DEBUG_RLO_FLAGS; > + > +[ > + object, > + local, > + uuid(119e7452-de9e-40fe-8806-88f90c12b441) > +] > +interface IDXGIDebug : IUnknown > +{ > + HRESULT ReportLiveObjects( > + [in] GUID apiid, > + [in] DXGI_DEBUG_RLO_FLAGS flags); > +} > + > -- > 2.4.0 > > >

1 0

Re: [PATCH 3/4] riched20: Initial support for changing font properties
by Marvin 26 May '15

26 May '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=13591 Your paranoid android. === w2000pro (32 bit richole) === richole.c:1838: Test failed: got -1 richole.c:1939: Test failed: got 700 richole.c:1838: Test failed: got -1 richole.c:1939: Test failed: got 700 richole.c:1838: Test failed: got -1 richole.c:1939: Test failed: got 700 richole.c:1838: Test failed: got -1 richole.c:1939: Test failed: got 700 richole.c:1838: Test failed: got -1 richole.c:1939: Test failed: got 700 richole.c:1838: Test failed: got -1 richole.c:1939: Test failed: got 700 === wxppro (32 bit richole) === richole.c:1838: Test failed: got -1 richole.c:1939: Test failed: got 700 richole.c:1838: Test failed: got -1 richole.c:1939: Test failed: got 700 richole.c:1838: Test failed: got -1 richole.c:1939: Test failed: got 700 richole.c:1838: Test failed: got -1 richole.c:1939: Test failed: got 700 richole.c:1838: Test failed: got -1 richole.c:1939: Test failed: got 700 richole.c:1838: Test failed: got -1 richole.c:1939: Test failed: got 700 === w2003std (32 bit richole) === richole.c:1838: Test failed: got -1 richole.c:1939: Test failed: got 700 richole.c:1838: Test failed: got -1 richole.c:1939: Test failed: got 700 richole.c:1838: Test failed: got -1 richole.c:1939: Test failed: got 700 richole.c:1838: Test failed: got -1 richole.c:1939: Test failed: got 700 richole.c:1838: Test failed: got -1 richole.c:1939: Test failed: got 700 richole.c:1838: Test failed: got -1 richole.c:1939: Test failed: got 700 === wvistau64 (32 bit richole) === richole.c:1838: Test failed: got -1 richole.c:1939: Test failed: got 700 richole.c:1838: Test failed: got -1 richole.c:1939: Test failed: got 700 richole.c:1838: Test failed: got -1 richole.c:1939: Test failed: got 700 richole.c:1838: Test failed: got -1 richole.c:1939: Test failed: got 700 richole.c:1838: Test failed: got -1 richole.c:1939: Test failed: got 700 richole.c:1838: Test failed: got -1 richole.c:1939: Test failed: got 700 === w2008s64 (32 bit richole) === richole.c:1838: Test failed: got -1 richole.c:1939: Test failed: got 700 richole.c:1838: Test failed: got -1 richole.c:1939: Test failed: got 700 richole.c:1838: Test failed: got -1 richole.c:1939: Test failed: got 700 richole.c:1838: Test failed: got -1 richole.c:1939: Test failed: got 700 richole.c:1838: Test failed: got -1 richole.c:1939: Test failed: got 700 richole.c:1838: Test failed: got -1 richole.c:1939: Test failed: got 700 === w8 (32 bit richole) === richole.c:1838: Test failed: got -1 richole.c:1939: Test failed: got 700 richole.c:1838: Test failed: got -1 richole.c:1939: Test failed: got 700 richole.c:1838: Test failed: got -1 richole.c:1939: Test failed: got 700 richole.c:1838: Test failed: got -1 richole.c:1939: Test failed: got 700 richole.c:1838: Test failed: got -1 richole.c:1939: Test failed: got 700 richole.c:1838: Test failed: got -1 richole.c:1939: Test failed: got 700 === wvistau64 (64 bit richole) === richole.c:1838: Test failed: got -1 richole.c:1939: Test failed: got 700 richole.c:1838: Test failed: got -1 richole.c:1939: Test failed: got 700 richole.c:1838: Test failed: got -1 richole.c:1939: Test failed: got 700 richole.c:1838: Test failed: got -1 richole.c:1939: Test failed: got 700 richole.c:1838: Test failed: got -1 richole.c:1939: Test failed: got 700 richole.c:1838: Test failed: got -1 richole.c:1939: Test failed: got 700 === w2008s64 (64 bit richole) === richole.c:1838: Test failed: got -1 richole.c:1939: Test failed: got 700 richole.c:1838: Test failed: got -1 richole.c:1939: Test failed: got 700 richole.c:1838: Test failed: got -1 richole.c:1939: Test failed: got 700 richole.c:1838: Test failed: got -1 richole.c:1939: Test failed: got 700 richole.c:1838: Test failed: got -1 richole.c:1939: Test failed: got 700 richole.c:1838: Test failed: got -1 richole.c:1939: Test failed: got 700

1 0