November 2014 - Wine-Devel - list.winehq.org

Re: [PATCH 6/6] d3d8/tests: Add an ATI1N entry to the test_volume_blocks test.

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=9983 Your paranoid android. === w8 (32 bit device) === device.c:1174: Test failed: TestCooperativeLevel failed, hr 0x88760868. device.c:1219: Test failed: Reset failed, hr 0x88760868. device.c:1221: Test failed: TestCooperativeLevel failed, hr 0x88760869. device.c:1225: Test failed: Got unexpected value 0 for D3DRS_LIGHTING. device.c:1232: Test failed: D3DVIEWPORT->X = 10, expected 0. device.c:1233: Test failed: D3DVIEWPORT->Y = 20, expected 0. device.c:1234: Test failed: D3DVIEWPORT->Width = 400, expected 800. device.c:1235: Test failed: D3DVIEWPORT->Height = 300, expected 600. device.c:1236: Test failed: D3DVIEWPORT->MinZ = 2.00000003e-001, expected 0. device.c:1237: Test failed: D3DVIEWPORT->MaxZ = 3.00000012e-001, expected 1. device.c:1242: Test failed: Screen width is 640, expected 800. device.c:1243: Test failed: Screen height is 480, expected 600. device.c:1249: Test failed: Back buffer width is 640, expected 800. device.c:1251: Test failed: Back buffer height is 480, expected 600. device.c:1281: Test failed: Screen width is 640, expected 1024. device.c:1282: Test failed: Screen height is 480, expected 768. device.c:2437: Test failed: Expected foreground window 000500F6, got 0002004C. device.c:2808: Test failed: Expected device window style 0x14cf0000, got 0x4cf0000. device.c:2812: Test failed: Expected device window extended style 0x108, got 0x100. device.c:2834: Test failed: Failed to reset device, hr 0x88760868. device.c:2838: Test failed: Expected device window style 0x14cf0000, got 0x4cf0000. device.c:2842: Test failed: Expected device window extended style 0x108, got 0x100. device.c:3051: Test failed: Got unexpect width 640. device.c:3052: Test failed: Got unexpect height 480. device.c:3063: Test failed: Got unexpect width 640. device.c:3064: Test failed: Got unexpect height 480. device.c:3126: Test failed: Failed to reset device. device.c:3133: Test failed: Expected {0, 0, 1024, 768}, got {0, 0, 512, 384}. device.c:3141: Test failed: Expected wndproc 0x412ba0, got 0x412ba0.

Nov. 4, 2014

Re: [PATCH 4/6] d3d8/tests: Add a test for ATI1N and ATI2N texture formats.

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=9981 Your paranoid android. === w8 (32 bit device) === device.c:1174: Test failed: TestCooperativeLevel failed, hr 0x88760868. device.c:1219: Test failed: Reset failed, hr 0x88760868. device.c:1221: Test failed: TestCooperativeLevel failed, hr 0x88760869. device.c:1225: Test failed: Got unexpected value 0 for D3DRS_LIGHTING. device.c:1232: Test failed: D3DVIEWPORT->X = 10, expected 0. device.c:1233: Test failed: D3DVIEWPORT->Y = 20, expected 0. device.c:1234: Test failed: D3DVIEWPORT->Width = 400, expected 800. device.c:1235: Test failed: D3DVIEWPORT->Height = 300, expected 600. device.c:1236: Test failed: D3DVIEWPORT->MinZ = 2.00000003e-001, expected 0. device.c:1237: Test failed: D3DVIEWPORT->MaxZ = 3.00000012e-001, expected 1. device.c:1242: Test failed: Screen width is 640, expected 800. device.c:1243: Test failed: Screen height is 480, expected 600. device.c:1249: Test failed: Back buffer width is 640, expected 800. device.c:1251: Test failed: Back buffer height is 480, expected 600. device.c:1281: Test failed: Screen width is 640, expected 1024. device.c:1282: Test failed: Screen height is 480, expected 768. device.c:2437: Test failed: Expected foreground window 000301E2, got 0002004C. device.c:2808: Test failed: Expected device window style 0x14cf0000, got 0x4cf0000. device.c:2812: Test failed: Expected device window extended style 0x108, got 0x100. device.c:2834: Test failed: Failed to reset device, hr 0x88760868. device.c:2838: Test failed: Expected device window style 0x14cf0000, got 0x4cf0000. device.c:2842: Test failed: Expected device window extended style 0x108, got 0x100. device.c:3051: Test failed: Got unexpect width 640. device.c:3052: Test failed: Got unexpect height 480. device.c:3063: Test failed: Got unexpect width 640. device.c:3064: Test failed: Got unexpect height 480. device.c:3126: Test failed: Failed to reset device. device.c:3133: Test failed: Expected {0, 0, 1024, 768}, got {0, 0, 512, 384}. device.c:3141: Test failed: Expected wndproc 0x412ba0, got 0x412ba0.

Nov. 4, 2014

Re: [PATCH 4/4] d3d8/tests: The device restores the mode settings from the registry (v4).

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=9979 Your paranoid android. === w8 (32 bit device) === device.c:1173: Test failed: TestCooperativeLevel failed, hr 0x88760868. device.c:1218: Test failed: Reset failed, hr 0x88760868. device.c:1220: Test failed: TestCooperativeLevel failed, hr 0x88760869. device.c:1224: Test failed: Got unexpected value 0 for D3DRS_LIGHTING. device.c:1231: Test failed: D3DVIEWPORT->X = 10, expected 0. device.c:1232: Test failed: D3DVIEWPORT->Y = 20, expected 0. device.c:1233: Test failed: D3DVIEWPORT->Width = 400, expected 800. device.c:1234: Test failed: D3DVIEWPORT->Height = 300, expected 600. device.c:1235: Test failed: D3DVIEWPORT->MinZ = 2.00000003e-001, expected 0. device.c:1236: Test failed: D3DVIEWPORT->MaxZ = 3.00000012e-001, expected 1. device.c:1241: Test failed: Screen width is 640, expected 800. device.c:1242: Test failed: Screen height is 480, expected 600. device.c:1248: Test failed: Back buffer width is 640, expected 800. device.c:1250: Test failed: Back buffer height is 480, expected 600. device.c:1280: Test failed: Screen width is 640, expected 1024. device.c:1281: Test failed: Screen height is 480, expected 768. device.c:2441: Test failed: Expected foreground window 000701E6, got 0002004C. device.c:2813: Test failed: Expected device window style 0x14cf0000, got 0x4cf0000. device.c:2817: Test failed: Expected device window extended style 0x108, got 0x100. device.c:2839: Test failed: Failed to reset device, hr 0x88760868. device.c:2843: Test failed: Expected device window style 0x14cf0000, got 0x4cf0000. device.c:2847: Test failed: Expected device window extended style 0x108, got 0x100. device.c:3216: Test failed: Failed to reset device. device.c:3223: Test failed: Expected {0, 0, 1024, 768}, got {0, 0, 512, 384}. device.c:3231: Test failed: Expected wndproc 0x412ed0, got 0x412ed0.

Nov. 4, 2014

Re: [PATCH 3/4] d3d8/tests: Check if the current display settings match the registry settings.

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=9978 Your paranoid android. === w8 (32 bit device) === device.c:1173: Test failed: TestCooperativeLevel failed, hr 0x88760868. device.c:1218: Test failed: Reset failed, hr 0x88760868. device.c:1220: Test failed: TestCooperativeLevel failed, hr 0x88760869. device.c:1224: Test failed: Got unexpected value 0 for D3DRS_LIGHTING. device.c:1231: Test failed: D3DVIEWPORT->X = 10, expected 0. device.c:1232: Test failed: D3DVIEWPORT->Y = 20, expected 0. device.c:1233: Test failed: D3DVIEWPORT->Width = 400, expected 800. device.c:1234: Test failed: D3DVIEWPORT->Height = 300, expected 600. device.c:1235: Test failed: D3DVIEWPORT->MinZ = 2.00000003e-001, expected 0. device.c:1236: Test failed: D3DVIEWPORT->MaxZ = 3.00000012e-001, expected 1. device.c:1241: Test failed: Screen width is 640, expected 800. device.c:1242: Test failed: Screen height is 480, expected 600. device.c:1248: Test failed: Back buffer width is 640, expected 800. device.c:1250: Test failed: Back buffer height is 480, expected 600. device.c:1280: Test failed: Screen width is 640, expected 1024. device.c:1281: Test failed: Screen height is 480, expected 768. device.c:2441: Test failed: Expected foreground window 000B00CA, got 0002004C. device.c:2813: Test failed: Expected device window style 0x14cf0000, got 0x4cf0000. device.c:2817: Test failed: Expected device window extended style 0x108, got 0x100. device.c:2839: Test failed: Failed to reset device, hr 0x88760868. device.c:2843: Test failed: Expected device window style 0x14cf0000, got 0x4cf0000. device.c:2847: Test failed: Expected device window extended style 0x108, got 0x100. device.c:3056: Test failed: Got unexpect width 640. device.c:3057: Test failed: Got unexpect height 480. device.c:3068: Test failed: Got unexpect width 640. device.c:3069: Test failed: Got unexpect height 480. device.c:3131: Test failed: Failed to reset device. device.c:3138: Test failed: Expected {0, 0, 1024, 768}, got {0, 0, 512, 384}. device.c:3146: Test failed: Expected wndproc 0x412ed0, got 0x412ed0.

Nov. 4, 2014

Re: ws2_32: Add tests and implement inet_pton

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=9974 Your paranoid android. === wxppro (32 bit sock) === sock.c:610: Test failed: oob_server (184): unexpectedly at the OOB mark: 0

Nov. 3, 2014

Re: [2/2] d3dx9_36/tests: Add tests for D3DXCreatePolygon.

by Matteo Bruni

2014-11-03 19:18 GMT+01:00 Sebastian Lackner <sebastian(a)fds-team.de>: > Thanks for the feedback. > > I am fine with changing what you suggested, but please note that most of these "issues" are also present in existing code, which I used as a template for implementing the new function. Yes, the existing code in d3dx9 (especially in mesh.c - even worse in the tests) is hardly a good reference, unfortunately... The general idea is to have the new code more or less follow the "modern" wined3d style (cs.c should be a decent example of that). > To point out a few examples: > > + TRACE("(%p, %f, %u, %p, %p)\n", device, length, sides, mesh, adjacency); > > Thats also the way its implemented for D3DXCreateSphere, D3DXCreateCylinder, D3DXCreateTeapot, D3DXCreateTextW, ... > > + for (i = 0; i < sides; i++) > > "i++" has 95 matches in mesh.c, "++i" only 4 ... > > Setting *mesh = NULL on error is only used at one place in the whole file. If it is necessary to match native behaviour, it is basically missing for all functions. That might be the case. Thus the test I mentioned, either we need to fix them all (and we can start by implementing it right for D3DXCreatePolygon) or we don't and the implementation is fine as is. Either way it seems a useful test to me. > +static BOOL compute_polygon(struct mesh *mesh, float length, UINT sides) > > See compute_sphere, compute_cylinder, compute_torus, ... > > + IDirect3D9* d3d; > + IDirect3DDevice9* device; > + D3DPRESENT_PARAMETERS d3dpp; > + ID3DXMesh* polygon; > + ID3DXBuffer* ppBuffer; > > My fault, copy & paste from existing tests. > > Regards, > Sebastian > > On 03.11.2014 18:57, Matteo Bruni wrote: >> 2014-11-03 6:35 GMT+01:00 Sebastian Lackner <sebastian(a)fds-team.de>: >>> Based on a patch by David Adam. >>> >>> --- >>> dlls/d3dx9_36/tests/mesh.c | 154 +++++++++++++++++++++++++++++++++++++++++++++ >>> 1 file changed, 154 insertions(+) >> >> More nitpicks... >> >> +static BOOL compute_polygon(struct mesh *mesh, float length, UINT sides) >> >> I'd prefer a plain unsigned int there. >> >> The various comments I made for the implementation patch obviously >> apply to the body of compute_polygon() too. >> >> + IDirect3D9* d3d; >> + IDirect3DDevice9* device; >> + D3DPRESENT_PARAMETERS d3dpp; >> + ID3DXMesh* polygon; >> + ID3DXBuffer* ppBuffer; >> >> Watch out for the '*' placement. Also, no hungarian notation please. >> >> + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, >> D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, >> &device); >> >> Not sure we care but the other tests in mesh.c use >> D3DCREATE_SOFTWARE_VERTEXPROCESSING. >> >> + ok(buffer_size == 33 * sizeof(DWORD), "expected size %d, received %d\n", >> + 33 * sizeof(DWORD), buffer_size); >> >> I think it's usually better not to print sizeof() results. >> >> + ok(buffer[i][1] == -1, "wrong adjacency[%d][1] = %d\n", i, >> buffer[i][1]); >> >> I'd prefer ~0 here. Also, unsigned int should be printed with "%u". >> >> + if (ppBuffer) ID3DXBuffer_Release(ppBuffer); >> >> Please put the "if" body on a separate line. >> >> I'd like to see an additional test to check whether the ID3DXMesh >> pointer is set to NULL on D3DXCreatePolygon() failure. Probably you >> could simply modify (at least) one of the failure tests at the >> beginning for that. >> >

Nov. 3, 2014

Re: [2/2] d3dx9_36/tests: Add tests for D3DXCreatePolygon.

by Sebastian Lackner

Thanks for the feedback. I am fine with changing what you suggested, but please note that most of these "issues" are also present in existing code, which I used as a template for implementing the new function. To point out a few examples: + TRACE("(%p, %f, %u, %p, %p)\n", device, length, sides, mesh, adjacency); Thats also the way its implemented for D3DXCreateSphere, D3DXCreateCylinder, D3DXCreateTeapot, D3DXCreateTextW, ... + for (i = 0; i < sides; i++) "i++" has 95 matches in mesh.c, "++i" only 4 ... Setting *mesh = NULL on error is only used at one place in the whole file. If it is necessary to match native behaviour, it is basically missing for all functions. +static BOOL compute_polygon(struct mesh *mesh, float length, UINT sides) See compute_sphere, compute_cylinder, compute_torus, ... + IDirect3D9* d3d; + IDirect3DDevice9* device; + D3DPRESENT_PARAMETERS d3dpp; + ID3DXMesh* polygon; + ID3DXBuffer* ppBuffer; My fault, copy & paste from existing tests. Regards, Sebastian On 03.11.2014 18:57, Matteo Bruni wrote: > 2014-11-03 6:35 GMT+01:00 Sebastian Lackner <sebastian(a)fds-team.de>: >> Based on a patch by David Adam. >> >> --- >> dlls/d3dx9_36/tests/mesh.c | 154 +++++++++++++++++++++++++++++++++++++++++++++ >> 1 file changed, 154 insertions(+) > > More nitpicks... > > +static BOOL compute_polygon(struct mesh *mesh, float length, UINT sides) > > I'd prefer a plain unsigned int there. > > The various comments I made for the implementation patch obviously > apply to the body of compute_polygon() too. > > + IDirect3D9* d3d; > + IDirect3DDevice9* device; > + D3DPRESENT_PARAMETERS d3dpp; > + ID3DXMesh* polygon; > + ID3DXBuffer* ppBuffer; > > Watch out for the '*' placement. Also, no hungarian notation please. > > + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, > D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, > &device); > > Not sure we care but the other tests in mesh.c use > D3DCREATE_SOFTWARE_VERTEXPROCESSING. > > + ok(buffer_size == 33 * sizeof(DWORD), "expected size %d, received %d\n", > + 33 * sizeof(DWORD), buffer_size); > > I think it's usually better not to print sizeof() results. > > + ok(buffer[i][1] == -1, "wrong adjacency[%d][1] = %d\n", i, > buffer[i][1]); > > I'd prefer ~0 here. Also, unsigned int should be printed with "%u". > > + if (ppBuffer) ID3DXBuffer_Release(ppBuffer); > > Please put the "if" body on a separate line. > > I'd like to see an additional test to check whether the ID3DXMesh > pointer is set to NULL on D3DXCreatePolygon() failure. Probably you > could simply modify (at least) one of the failure tests at the > beginning for that. >

Nov. 3, 2014

Re: [2/2] d3dx9_36/tests: Add tests for D3DXCreatePolygon.

by Matteo Bruni

2014-11-03 6:35 GMT+01:00 Sebastian Lackner <sebastian(a)fds-team.de>: > Based on a patch by David Adam. > > --- > dlls/d3dx9_36/tests/mesh.c | 154 +++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 154 insertions(+) More nitpicks... +static BOOL compute_polygon(struct mesh *mesh, float length, UINT sides) I'd prefer a plain unsigned int there. The various comments I made for the implementation patch obviously apply to the body of compute_polygon() too. + IDirect3D9* d3d; + IDirect3DDevice9* device; + D3DPRESENT_PARAMETERS d3dpp; + ID3DXMesh* polygon; + ID3DXBuffer* ppBuffer; Watch out for the '*' placement. Also, no hungarian notation please. + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); Not sure we care but the other tests in mesh.c use D3DCREATE_SOFTWARE_VERTEXPROCESSING. + ok(buffer_size == 33 * sizeof(DWORD), "expected size %d, received %d\n", + 33 * sizeof(DWORD), buffer_size); I think it's usually better not to print sizeof() results. + ok(buffer[i][1] == -1, "wrong adjacency[%d][1] = %d\n", i, buffer[i][1]); I'd prefer ~0 here. Also, unsigned int should be printed with "%u". + if (ppBuffer) ID3DXBuffer_Release(ppBuffer); Please put the "if" body on a separate line. I'd like to see an additional test to check whether the ID3DXMesh pointer is set to NULL on D3DXCreatePolygon() failure. Probably you could simply modify (at least) one of the failure tests at the beginning for that.

Nov. 3, 2014

Re: [1/2] d3dx9_36: Implement D3DXCreatePolygon.

by Matteo Bruni

2014-11-03 6:35 GMT+01:00 Sebastian Lackner <sebastian(a)fds-team.de>: > Based on a patch by David Adam. > > For bug 13632. > > --- > dlls/d3dx9_36/d3dx9_36.spec | 2 +- > dlls/d3dx9_36/mesh.c | 89 +++++++++++++++++++++++++++++++++++++++++++++ > include/d3dx9shape.h | 2 + > 3 files changed, 92 insertions(+), 1 deletion(-) > Hi Sebastian, I have a few nitpicks: + TRACE("(%p, %f, %u, %p, %p)\n", device, length, sides, mesh, adjacency); Generally you want that to be something like: TRACE("device %p, length %f, sides %u, mesh %p, adjacency %p.\n", device, length, sides, mesh, adjacency); + if (!device || length < 0.0f || sides == 0 || !mesh) Probably "!sides" is more in the usual Wine d3d* style. Also, no need to use brackets for single-line branches. + if (FAILED(hr = D3DXCreateMeshFVF(sides, sides + 1, D3DXMESH_MANAGED, + D3DFVF_XYZ | D3DFVF_NORMAL,device, &polygon))) Line continuation should be indented by 8 blanks. Also, missing whitespace after a comma. + scale = 0.5f * length / sin(D3DX_PI / sides); You probably want to use sinf() here. Same below. + for (i = 0; i < sides; i++) Not important, but the current wined3d style wants "++i" here. + for (i = 0; i < sides; i++) + { + adjacency_buf[i][0] = i - 1; + adjacency_buf[i][1] = -1; + adjacency_buf[i][2] = i + 1; + } Really a detail, but adjacency_buf and i are both defined as unsigned int, so either defining them as plain, signed int or using ~0 instead of -1 would be nicer. I haven't seen the test yet but in some other D3DX9 functions the "out" pointers are set to NULL on error. If this function has the same behavior you should probably add a "*mesh = NULL;" in the first few lines of the function.

Nov. 3, 2014

Wine Gecko 2.34 released

by Jacek Caban

Hi all, Wine Gecko 2.34 is finally released and relevant commit is in Wine. There is one important note to distro packages and everyone willing to build it himself: it's important to use very recent mingw-w64 version. See [1] for details. Cheers, Jacek https://bugzilla.mozilla.org/show_bug.cgi?id=1088848

Nov. 3, 2014