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

Re: [PATCH 2/2] ucrtbase: Implement _register_onexit_function()
by Sebastian Lackner 24 Apr '16

24 Apr '16

On 24.04.2016 20:05, Nikolay Sivov wrote: > + table->_first = MSVCRT_calloc(sizeof(void *), 32); Not really an issue, but shouldn't the first argument be the counter, and the second one the size?

2 1

Re: [PATCH 1/2] ucrtbase: Implement _initialize_onexit_table()
by Sebastian Lackner 24 Apr '16

24 Apr '16

On 24.04.2016 20:05, Nikolay Sivov wrote: > diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec > index a54a71a..96e0c3b 100644 > --- a/dlls/ucrtbase/ucrtbase.spec > +++ b/dlls/ucrtbase/ucrtbase.spec > @@ -419,7 +419,7 @@ > @ cdecl _i64tow(int64 ptr long) ntdll._i64tow > @ cdecl _i64tow_s(int64 ptr long long) MSVCRT__i64tow_s > @ cdecl _initialize_narrow_environment() > -@ stub _initialize_onexit_table > +@ cdecl _initialize_onexit_table() MSVCRT__initialize_onexit_table Shouldn't there be one "ptr" argument? Same for the other spec files. > @ cdecl _initialize_wide_environment() > @ cdecl _initterm(ptr ptr) > @ cdecl _initterm_e(ptr ptr) >

1 0

Re: [PATCH 1/4] d3drm: Use sizeof instead of strlen in d3drm_texture3_GetClassName.
by Nikolay Sivov 24 Apr '16

24 Apr '16

On 24.04.2016 18:50, Aaryaman Vasishta wrote: > This size of class name turns out to be equal to sizeof("Texture") which is strlen("Texture") + 1. This was recently discovered while testing the size returned by GetClassName. > > Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> > --- > dlls/d3drm/texture.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c > index f81fc03..60374d3 100644 > --- a/dlls/d3drm/texture.c > +++ b/dlls/d3drm/texture.c > @@ -796,7 +796,7 @@ static HRESULT WINAPI d3drm_texture3_GetClassName(IDirect3DRMTexture3 *iface, DW > { > TRACE("iface %p, size %p, name %p.\n", iface, size, name); > > - if (!size || *size < strlen("Texture") || !name) > + if (!size || *size < sizeof("Texture") || !name) > return E_INVALIDARG; > > strcpy(name, "Texture"); > GetClassName() is duplicated for every object, it makes sense to introduce a helper function eventually.

2 1

Re: [PATCH 2/3] d3drm/tests: Replace test_Texture.
by Stefan Dösinger 24 Apr '16

24 Apr '16

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 2016-04-24 um 06:40 schrieb Aaryaman Vasishta: > + size = 1; > + hr = IDirect3DRMTexture_GetClassName(texture1, &size, cname); > + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); > + size = sizeof(cname); > + hr = IDirect3DRMTexture_GetClassName(texture1, &size, cname); > + ok(SUCCEEDED(hr), "Cannot get classname (hr = %x)\n", hr); > + ok(size == sizeof("Texture"), "wrong size: %u\n", size); sizeof("Texture") is confusing IMHO. I had to look up the C rules on string literals to make sure it does what you want :-) . Though I'm not sure if its better than strlen("Texture") + 1, so it's your call. However, the current implementation in d3drm_texture3_GetClassName confuses the two. I recommend adding a test for sizeof("Texture") - 1 and an exactly matching size. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXHJxZAAoJEN0/YqbEcdMwMAkP/0JEXejefj/awhnJGh5zQlg9 07gvcDjH+KvsHYbJsWOA8GE3+JcUJrqpHA8nqO2Uxmy1mg26EECNtRFTjfWJ4oQM iHcVgVurTb6rx6UZpcLkoy/BQ4fvWQFtWxfL2J9ZDO2TVt+0oeGSurkv5ywylTmq 5RZa5lFhnaeMyWw6hbtXNwsPXMhi+tDdHZTYVakJGRa72deO23ZrWuzbHzMfnlDx /SnGnSnFF9JcWLkLQMqeiQ+Q2Ztn+PHo15EjAye3hk1gvVYKx5xx7+Hef9l4/1dG Cqc2I+4GwE86FmrBkqT1noF6HDo4+6evHi+JrW6d0WFH7I/k3D+5SUtaqtBRtraC AuS4Kwsqri4wpVeqz6zsX8BsneQHQzkB87EXEC81d7W6fTPAYT1YoQp2zDPxP32G lIwd3bxtdyYA91dNTCGx8arKEpBXhuKqh0ahI8FrRBiuZ20JVIvosiVBxpWHYsiV 9X3smnaiYrL6sZTPtbcHbcs5shbuycpzm05EB5noSbc+P6ur5/q4Q9nSH86OYAIr mJBZWg6pE9N1zcko6KTmB//z7NGYms8knxVQYGVgtRgZaNk8+mVaeedgdbnrIMFj xsdTX8UGtOAs7mJ6E496xq4P7bMxK5B0BSoChtaJV3ZeS9wLD/JId/1Z7l/DvVwn 0EDb2DPmwv7EbEWz7cAH =MI19 -----END PGP SIGNATURE-----

2 2

Re: [PATCH 3/3] d3drm/tests: Add tests for IDirect3DRMTexture{2-3}_InitFromImage. (v2)
by Stefan Dösinger 24 Apr '16

24 Apr '16

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Hi, I think it'd be a good idea to add some lines testing InitFromImage on a texture that was created with CreateTexture and trying to call InitFromImage twice (with the first call succeeding). Am 2016-04-24 um 06:46 schrieb Aaryaman Vasishta: > + /* InitFromImage tests */ > + d3drm_img = NULL; > + hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture2, (void **)&texture2); > + ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface (hr = %x).\n", hr); > + ref2 = get_refcount((IUnknown *)texture2); Did you forget IDirect3DRM::CreateObject(Texture1), or is there a reason why it is omitted? > + hr = IDirect3DRMTexture2_InitFromImage(texture2, NULL); > + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %x.\n", hr); > + ref3 = get_refcount((IUnknown *)texture2); > + ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3); You're not testing the reference count of d3drm1/2/3. My guess is that you plan to add this later since the InitFrom() increments it, and not the create. Is my understanding of your plans correct? -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXHJtCAAoJEN0/YqbEcdMwAhgQAJXR10NMu88OEslWcX2iUSSg rUXk7WcCaQVHHlGFwQwddtFLrX245idLScYxm8N9CvG3kyHxx91tQ3UH6wT+QHAv No6IuMc0menrh1g2mP08/Ci44sd7Hy01HS7K8A9+/rdwUnIhb3pYiAxB8673/7he ruXnPpYY/Mhi+8I1BAQA17qy5rArUFQWHGoth+18PnPdI9VELKlkZg0Y8R/ITqdu jgLkw1zKsKZS17qvwTyz+lyxmhC2mAjIMQu/WD/lVZOwXPTFUmSqPfUke6nyTFfA ffJL16e9C5CpyD+dCT+Rc3AUoboBo+JrQz4Qif4xOW+LhNY7fZeqt4f1Pd7+Zxqe X3sr7jVDTJY3d//bWy7eW1Ow7zixawhsWXa0cj6Z6TuIV4ruMvOK6QpZ2qb1IvmS BCTGoRI6DYF6bRDZLCirbz4nOB8CNTtO+erLhh5uHCP8wtN1eYC3/5rSjGjJACrT IBQ7g/l45/oiCkmVLug5kxUqgXXX0GoVbrod0MiBd0snDMwmev1T+xNHFdsfR9La 8AKBVF6eH3FqRo0Co6PGIvgKkk0ItuAUBPFkrvaREnzTwQO5XrSbCA54FeM8YFn3 FZH9ePNGENyWJD98SI1Laluw/9GiAusQynkJALSen9Aqm1pfhfH2OSuxaFqg0IfW vl8vPREqFJGtCGx9fQU/ =FjQh -----END PGP SIGNATURE-----

2 1

Wine inside Xephyr on OSX
by Bruno Jesus 23 Apr '16

23 Apr '16

Hi, all. In Debian I have been using Xephyr to test some applications when virtual desktop is not enough, so far so good. Now I was trying to do the same in an OSX, so I have opened Xephyr and DISPLAY=:2 xeyes work but Wine windows are not created inside the Xephyr window as if the DISPLAY is completely ignored. Is there any way to make this work? Best wishes, Bruno

3 5

Re: [PATCH] d3dx10: Implement D3DX10UnsetAllDeviceObjects()
by Marvin 23 Apr '16

23 Apr '16

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=22481 Your paranoid android. === build (build) === Make failed

1 0

Re: [PATCH 6/8] ddraw: Return early in d3d_device7_DrawIndexedPrimitiveVB() with a 0 vertex or index count.
by Marvin 22 Apr '16

22 Apr '16

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=22465 Your paranoid android. === w1064 (32 bit ddraw4) === ddraw4.c:2545: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw4) === ddraw4.c:2545: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw7) === ddraw7.c:2275: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw7) === ddraw7.c:2275: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}.

1 0

Re: [PATCH 5/8] ddraw: Return early in d3d_device7_DrawPrimitive() with a 0 vertex count.
by Marvin 22 Apr '16

22 Apr '16

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=22464 Your paranoid android. === w1064 (32 bit ddraw7) === ddraw7.c:2275: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw7) === ddraw7.c:2275: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw2) === ddraw2.c:2360: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw2) === ddraw2.c:2360: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw4) === ddraw4.c:2545: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw4) === ddraw4.c:2545: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}.

1 0

Re: [PATCH 4/8] ddraw: Return early in d3d_device7_DrawPrimitiveStrided() with a 0 vertex count.
by Marvin 22 Apr '16

22 Apr '16

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=22463 Your paranoid android. === w1064 (32 bit ddraw7) === ddraw7.c:2275: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw7) === ddraw7.c:2275: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw4) === ddraw4.c:2545: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw4) === ddraw4.c:2545: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}.

1 0