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

Re: [PATCH v2 2/6] wined3d: Implement copying of buffer resources.
by Henri Verbeet 20 Mar '16

20 Mar '16

On 20 March 2016 at 23:15, Józef Kucia <jkucia(a)codeweavers.com> wrote: > + buffer_get_memory(dst_buffer, context, &dst_bo_address); > + buffer_get_memory(src_buffer, context, &src_bo_address); > + > + dst_buffer_mem = dst_buffer->resource.heap_memory; > + src_buffer_mem = src_buffer->resource.heap_memory; > + > + if (!dst_buffer_mem && !src_buffer_mem) > + { The way struct wined3d_bo_address works is that if the "buffer_object" field is non-zero, the "addr" field is relative to the start of the corresponding buffer object, and otherwise it's relative to the start of system memory. I.e., the correct check here should be for src_bo_address.buffer_object and dst_bo_address.buffer_object being non-zero, and you should be able to use src_bo_address.addr and dst_bo_address.addr instead of src_buffer_mem and dst_buffer_mem in most other places. > + if (gl_info->supported[ARB_COPY_BUFFER]) > + { > + GL_EXTCALL(glBindBuffer(GL_COPY_READ_BUFFER, src_bo_address.buffer_object)); > + GL_EXTCALL(glBindBuffer(GL_COPY_WRITE_BUFFER, dst_bo_address.buffer_object)); > + GL_EXTCALL(glCopyBufferSubData(GL_COPY_READ_BUFFER, GL_COPY_WRITE_BUFFER, src_offset, dst_offset, size)); The "addr" field is always going to be NULL in practice for buffer resources, but strictly speaking you should use something like "(INT_PTR)src_bo_address.add + src_offset" instead of just "src_offset" here.

2 1

prelink
by version2013＠openmailbox.org 20 Mar '16

20 Mar '16

According to [1], prelink is no longer needed. When I configure wine-1.9.6, I get the warning message, "configure: WARNING: prelink not found and linker does not support relocation, base address of core dlls won't be set correctly." [1] http://oldwiki.winehq.org/Prelink

4 3

Re: [PATCH 1/2] d3drm: Move struct d3drm_texture to header for global access.
by Józef Kucia 20 Mar '16

20 Mar '16

On Sun, Mar 20, 2016 at 7:24 PM, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> wrote: > CloseHandle(file); > - > - hr = Direct3DRMTexture_create(&IID_IDirect3DRMTexture3, (IUnknown**)&This->materials[i].texture); > + struct d3drm_texture *texture_object; > + hr = d3drm_texture_create(&texture_object); > if (FAILED(hr)) Put the "texture_object" declaration at the beginning of the block or the function. Mixed declarations and code is C99 feature and is not allowed in Wine. Also, "if (FAILED(hr = d3drm_texture_create(&texture_object)))" would be preferred.

1 0

Re: [2/3] shell32/tests: Move a file URL test to test_fileurl().
by Marvin 20 Mar '16

20 Mar '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=21531 Your paranoid android. === wvistau64 (32 bit shlexec) === shlexec.c:1690: Test failed: ShellExecute(verb="", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\masked file.shlexec") WaitForSingleObject returned 258 shlexec.c:1698: Test failed: ShellExecute(verb="", file=""C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\masked file.shlexec"") ShlexecVar expected 'Present', but key not found or empty shlexec.c:1712: Test failed: ShellExecute(file=""C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\masked file.shlexec"") argvA3 expected 'Open', but key not found or empty shlexec.c:1714: Test failed: ShellExecute(file=""C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\masked file.shlexec"") argvA4 expected 'C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\masked file.shlexec', but key not found or empty shlexec.c:1723: Test failed: ShellExecute(verb="LowerL", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.shlexec") WaitForSingleObject returned 258 shlexec.c:1772: Test failed: ShellExecute(file=""C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.shlexec"") argcA expected 5, but got 6 shlexec.c:1773: Test failed: ShellExecute(file=""C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.shlexec"") argvA3 expected 'Open', got 'UpperL' shlexec.c:1775: Test failed: ShellExecute(file=""C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.shlexec"") argvA4 expected 'C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.shlexec', got 'C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test' shlexec.c:2466: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec", topic="dde" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2483: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec", topic="dde" failed: rc=2 err=2 shlexec.c:2466: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail=""%1"", ddeexec="[open("%1")]", app="shlexec", topic="dde" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2483: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail=""%1"", ddeexec="[open("%1")]", app="shlexec", topic="dde" failed: rc=2 err=2 shlexec.c:2466: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="%1", ddeexec="[open(%1)]", app="shlexec", topic="dde" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2483: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="%1", ddeexec="[open(%1)]", app="shlexec", topic="dde" failed: rc=2 err=2 shlexec.c:2466: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec", topic="dde", ifexec="[ifexec("%1")]" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2483: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec", topic="dde", ifexec="[ifexec("%1")]" failed: rc=2 err=2 shlexec.c:2466: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2483: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec" failed: rc=2 err=2 shlexec.c:2466: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", topic="dde" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2483: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", topic="dde" failed: rc=2 err=2 shlexec.c:2580: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="1", cmdtail="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.exe", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2580: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="1", cmdtail="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test2 file.exe", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2580: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="1", cmdtail="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.exe param", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2580: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="1", cmdtail=""C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.exe"", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2580: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="1", cmdtail=""C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.exe" param", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2580: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="1", cmdtail="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test2 file.exe param", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2580: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="1", cmdtail=""C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test2 file.exe"", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2580: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="1", cmdtail=""C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test2 file.exe" param", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2580: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="1", cmdtail="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test2", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2580: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="1", cmdtail="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test2 param", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2580: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="1", cmdtail="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\notexist.exe", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2580: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="1", cmdtail="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\notexist.exe param", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2580: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="1", cmdtail="cmd", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2580: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="1", cmdtail="cmd param", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2580: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="1", cmdtail="xyzwxyzwxyz", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2580: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="1", cmdtail="xyzwxyzwxyz param", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2855: Test failed: ShellExecuteEx(mask="0x808440", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\wtD671.tmp" Exec") ShlexecVar expected 'Present', but key not found or empty shlexec.c:2858: Test failed: ShellExecuteEx(mask="0x808440", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\wtD671.tmp" Exec") argvA3 expected 'Exec', but key not found or empty shlexec.c:2859: Test failed: ShellExecuteEx(mask="0x808440", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\wtD671.tmp" Exec") longPath expected 'C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test2.exe', but key not found or empty shlexec.c:2863: Test failed: ShellExecuteEx(mask="0x808440", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\wtD671.tmp" Exec") ShlexecVar expected 'Present', but key not found or empty shlexec.c:2868: Test failed: ShellExecuteEx(mask="0x808440", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\wtD671.tmp" Exec", dir="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp") WaitForSingleObject returned 258 shlexec.c:2868: Test failed: ShellExecuteEx(mask="0x808440", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\wtD671.tmp" Exec", dir="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp") ShlexecVar expected 'Present', but key not found or empty shlexec.c:2871: Test failed: ShellExecuteEx(mask="0x808440", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\wtD671.tmp" Exec", dir="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp") argvA3 expected 'Exec', but key not found or empty shlexec.c:2872: Test failed: ShellExecuteEx(mask="0x808440", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\wtD671.tmp" Exec", dir="C:\Users\winetest\AppData\Local\Temp\wtD670.tmp") longPath expected 'C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test2.exe', but key not found or empty shlexec.c:2876: Test failed: ShellExecuteEx(mask="0x808440", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\wtD671.tmp" Exec", dir="%TMPDIR%") ShlexecVar expected 'Present', but key not found or empty shlexec.c:2880: Test failed: ShellExecuteEx(mask="0x808640", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\wtD671.tmp" Exec", dir="%TMPDIR%") WaitForSingleObject returned 258 shlexec.c:2880: Test failed: ShellExecuteEx(mask="0x808640", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\wtD671.tmp" Exec", dir="%TMPDIR%") ShlexecVar expected 'Present', but key not found or empty shlexec.c:2883: Test failed: ShellExecuteEx(mask="0x808640", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\wtD671.tmp" Exec", dir="%TMPDIR%") argvA3 expected 'Exec', but key not found or empty shlexec.c:2884: Test failed: ShellExecuteEx(mask="0x808640", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\wtD671.tmp" Exec", dir="%TMPDIR%") longPath expected 'C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\test2.exe', but key not found or empty shlexec.c:2889: Test failed: ShellExecuteEx(mask="0x808440", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD670.tmp\wtD671.tmp" Exec", dir="C:\Users\Public\Documents:C:\Users\winetest\AppData\Local\Temp\wtD670.tmp") ShlexecVar expected 'Present', but key not found or empty

1 0

Re: [1/3] shell32/tests: Delete the shlproto test class when done.
by Marvin 20 Mar '16

20 Mar '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=21530 Your paranoid android. === wvistau64 (64 bit shlexec) === shlexec.c:1979: Test failed: ShellExecuteEx(mask="0x8640", file="shlproto://%TMPDIR%/bar") WaitForSingleObject returned 258 shlexec.c:1983: Test failed: ShellExecuteEx(mask="0x8640", file="shlproto://%TMPDIR%/bar") argvA3 expected 'URL', but key not found or empty shlexec.c:1984: Test failed: ShellExecuteEx(mask="0x8640", file="shlproto://%TMPDIR%/bar") argvA4 expected 'shlproto://C:\Users\winetest\AppData\Local\Temp\wtCE84.tmp/bar', but key not found or empty shlexec.c:1988: Test failed: ShellExecute(verb="", file="%urlprefix%foo") ShlexecVar expected 'Present', but key not found or empty

1 0

Re: [v4 1/6] d3dx9: add test for preshader in effect.
by Matteo Bruni 19 Mar '16

19 Mar '16

2016-03-17 12:59 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: Nice job. I have a few nitpicks still... > +static const D3DXVECTOR4 test_effect_preshader_fconstsv[] = > +{ > + {11.0f, 12.0f, 13.0f, 0.0f}, > + {21.0f, 22.0f, 23.0f, 0.0f}, > + {31.0f, 32.0f, 33.0f, 0.0f}, > + {41.0f, 42.0f, 43.0f, 0.0f}, > + {11.0f, 21.0f, 31.0f, 0.0f}, > + {12.0f, 22.0f, 32.0f, 0.0f}, > + {13.0f, 23.0f, 33.0f, 0.0f}, > + {14.0f, 24.0f, 34.0f, 0.0f}, > + {11.0f, 12.0f, 13.0f, 14.0f}, > + {21.0f, 22.0f, 23.0f, 24.0f}, > + {31.0f, 32.0f, 33.0f, 34.0f}, > + {11.0f, 21.0f, 31.0f, 41.0f}, > + {12.0f, 22.0f, 32.0f, 42.0f}, > + {13.0f, 23.0f, 33.0f, 43.0f}, > + {4.0f, 5.0f, 6.0f, 7.0f} > +}; > + > +static const D3DXVECTOR4 test_effect_preshader_fconstsp[] = > +{ > + {11.0f, 21.0f, 0.0f, 0.0f}, > + {12.0f, 22.0f, 0.0f, 0.0f}, > + {13.0f, 23.0f, 0.0f, 0.0f}, > + {11.0f, 12.0f, 0.0f, 0.0f}, > + {21.0f, 22.0f, 0.0f, 0.0f}, > + {31.0f, 32.0f, 0.0f, 0.0f}, > + {11.0f, 12.0f, 0.0f, 0.0f}, > + {21.0f, 22.0f, 0.0f, 0.0f}, > + {11.0f, 21.0f, 0.0f, 0.0f}, > + {12.0f, 22.0f, 0.0f, 0.0f}, > + {11.0f, 12.0f, 13.0f, 0.0f}, > + {21.0f, 22.0f, 23.0f, 0.0f}, > + {11.0f, 21.0f, 31.0f, 0.0f}, > + {12.0f, 22.0f, 32.0f, 0.0f} > +}; > + > +static const BOOL test_effect_preshader_bconsts[] = > +{ > + TRUE, FALSE, TRUE, FALSE, TRUE, FALSE > +}; > + > +static const struct > +{ > + const char *comment; > + unsigned int todo[4]; > + unsigned int result[4]; > +} > +test_effect_preshader_op_results[] = > +{ > + {"1 / op", {1, 1, 1, 1}, {0x7f800000, 0xff800000, 0xbee8ba2e, 0x00200000}}, > + {"rsq", {1, 1, 3, 3}, {0x7f800000, 0x7f800000, 0x3f2c985d, 0x1f800000}}, > + {"mul", {1, 1, 1, 1}, {0x00000000, 0x80000000, 0x40d33334, 0x7f800000}}, > + {"add", {0, 1, 1, 1}, {0x3f800000, 0x40000000, 0xc0a66666, 0x7f7fffff}}, > + {"lt", {0, 0, 1, 0}, {0x3f800000, 0x3f800000, 0x00000000, 0x00000000}}, > + {"ge", {1, 1, 0, 1}, {0x00000000, 0x00000000, 0x3f800000, 0x3f800000}}, > + {"neg", {1, 1, 1, 1}, {0x80000000, 0x00000000, 0x400ccccd, 0xff7fffff}}, > + {"rcp", {1, 1, 1, 1}, {0x7f800000, 0xff800000, 0xbee8ba2e, 0x00200000}}, > + {"frac", {0, 0, 1, 0}, {0x00000000, 0x00000000, 0x3f4ccccc, 0x00000000}}, > + {"min", {0, 1, 1, 1}, {0x00000000, 0x80000000, 0xc0400000, 0x40800000}}, > + {"max", {1, 1, 1, 1}, {0x3f800000, 0x40000000, 0xc00ccccd, 0x7f7fffff}}, > + {"sin", {0, 1, 1, 3}, {0x00000000, 0x80000000, 0xbf4ef99e, 0xbf0599b3}}, > + {"cos", {1, 1, 1, 3}, {0x3f800000, 0x3f800000, 0xbf16a803, 0x3f5a5f96}}, > + {"den mul",{1, 1, 1, 1}, {0x7f800000, 0xff800000, 0xbb94f209, 0x000051ec}}, > + {"dot", {0, 1, 1, 0}, {0x00000000, 0x7f800000, 0x41f00000, 0x00000000}}, > + {"prec", {1, 1, 2, 0}, {0x2b8cbccc, 0x2c0cbccc, 0x00000000, 0x00000000}} > +}; > + > +#define TEST_EFFECT_PRES_NFLOATV ARRAY_SIZE(test_effect_preshader_fconstsv) > +#define TEST_EFFECT_PRES_NFLOATP ARRAY_SIZE(test_effect_preshader_fconstsp) > +#define TEST_EFFECT_PRES_NFLOATMAX (TEST_EFFECT_PRES_NFLOATV > TEST_EFFECT_PRES_NFLOATP ? \ > + TEST_EFFECT_PRES_NFLOATV : TEST_EFFECT_PRES_NFLOATP) > +#define TEST_EFFECT_PRES_NBOOL ARRAY_SIZE(test_effect_preshader_bconsts) > +#define TEST_EFFECT_PRES_NOPTESTS ARRAY_SIZE(test_effect_preshader_op_results) Those arrays above should probably be inside test_effect_preshader(), unless you plan to add other functions needing them. > + for ( ; i < 16; ++i) Those spaces in place of the first "for" expression look weird. Just leave that empty i.e. for (; i < 16; ++i) > + for (i = 0; i < TEST_EFFECT_PRES_NOPTESTS; ++i) > + { > + unsigned int *v; > + > + hr = IDirect3DDevice9_GetLight(device, i % 8, &light); > + v = i < 8 ? (unsigned int *)&light.Diffuse : (unsigned int *)&light.Ambient; > + ok(hr == D3D_OK, "Got result %#x.\n", hr); > + for (j = 0; j < 4; ++j) > + todo_wine_if(test_effect_preshader_op_results[i].todo[j] & 1) > + ok(v[j] == test_effect_preshader_op_results[i].result[j] > + || ((test_effect_preshader_op_results[i].todo[j] & 2) > + && broken(v[j] != test_effect_preshader_op_results[i].result[j])), > + "Operation %s, component %u, expected %#x, got %#x (%g).\n", > + test_effect_preshader_op_results[i].comment, j, > + test_effect_preshader_op_results[i].result[j], v[j], ((float *)v)[j]); I don't like that broken(), it isn't checking much (i.e. the condition is true for almost any value) and overloading the "todo" field for that doesn't seem too clean. Maybe something like this for the test results table would help: static const struct { const char *name; unsigned int expected[4]; BOOL todo[4]; unsigned int expected_broken[4]; } I think all the broken results are != 0 so expected_broken also works as a flag. If that's not the case you can add explicit "BOOL broken[4]" flags. You can then leave out the todo and expected_broken fields for the table entries which don't require them, since they end up zero-initialized. Maybe also add a small comment for each broken value, if it makes sense? > + todo_wine ok(!memcmp(byte_code, > + &test_effect_preshader_effect_blob[TEST_EFFECT_PRESHADER_VSHADER_POS + > + 1 * TEST_EFFECT_PRESHADER_VSHADER_LEN], byte_code_size), You can leave out the "1 *", it's pretty clear either way.

2 2

Re: [PATCH 2/5] wined3d: Implement copying of buffer resources.
by Henri Verbeet 19 Mar '16

19 Mar '16

On 18 March 2016 at 12:30, Józef Kucia <jkucia(a)codeweavers.com> wrote: > +HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_offset, > + struct wined3d_buffer *src_buffer, unsigned int src_offset, unsigned int size) > +{ > + BYTE *dst_buffer_mem, *src_buffer_mem; > + const struct wined3d_gl_info *gl_info; > + struct wined3d_context *context; > + struct wined3d_device *device; > + > + device = dst_buffer->resource.device; > + > + context = context_acquire(device, NULL); > + gl_info = context->gl_info; > + > + buffer_internal_preload(dst_buffer, context, NULL); > + buffer_internal_preload(src_buffer, context, NULL); > + > + dst_buffer_mem = dst_buffer->resource.heap_memory; > + src_buffer_mem = src_buffer->resource.heap_memory; This is probably fine, but I wonder why you're not using buffer_get_memory()? Somewhat related, there may be something to be said for the function just taking wined3d_bo_address structures and a size, although I don't have an immediate use for that yet. > + > + if (!dst_buffer_mem && !src_buffer_mem) > + { > + if (!gl_info->supported[ARB_COPY_BUFFER]) > + { > + FIXME("Direct buffer copy not supported.\n"); > + return WINED3DERR_INVALIDCALL; > + } I think that's fine, but we could of course implement that case by mapping the buffers and using memcpy().

2 2

Re: [PATCH 3/5] wined3d: Add support for buffers in wined3d_device_copy_sub_resource().
by Henri Verbeet 19 Mar '16

19 Mar '16

On 18 March 2016 at 12:30, Józef Kucia <jkucia(a)codeweavers.com> wrote: > + if (src_offset > src_resource->size > + || src_offset + size > src_resource->size That's not a safe way to validate "size". For large enough values of "size", "src_offset + size" may wrap to something smaller than "src_resource->size". You'd typically do something like "size > src_resource->size - src_offset" instead.

1 0

Re: [PATCH] msvcr120/tests: Add critical section test.
by Marvin 18 Mar '16

18 Mar '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=21522 Your paranoid android. === w2008s64 (64 bit msvcr120) === msvcr120: unhandled exception c0000005 at 000007FEF6F8B045

1 0

GSoC Idea: Winetest Graphical User Interface
by Zhenbo Li 18 Mar '16

18 Mar '16

Hello, I'm Zhenbo Li. This year, I wish to work on a project related to wine test suite. Previously, I sent a mail for Winetest Scripting Interface. A better winetest.exe should have such functions: 1. Choose which dlls to be tested. Users could use GUI, CLI, or a config file. 2. Show the result in winetest, or render it to html 3. Allow to leave tag and email blank if the user doesn't want to submit the result to test.winehq.org, and they can fill them when submitting them. I'm wondering whether this job would be enough for a summer, and I'm glad to write a script for wine test suite as another part of my job. Really appreciate your comments. -- Have a nice day! Zhenbo Li

6 7