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

Re: [PATCH v2 2/6] wined3d: Implement copying of buffer resources.
by Henri Verbeet March 20, 2016

March 20, 2016

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 March 20, 2016

March 20, 2016

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 March 20, 2016

March 20, 2016

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 March 20, 2016

March 20, 2016

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 March 20, 2016

March 20, 2016

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 March 19, 2016

March 19, 2016

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 March 19, 2016

March 19, 2016

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 March 19, 2016

March 19, 2016

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 March 18, 2016

March 18, 2016

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 March 18, 2016

March 18, 2016

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

Re: [v3 resend 2/6] d3dx9: add preshaders to effect.
by Matteo Bruni March 17, 2016

March 17, 2016

2016-03-10 19:50 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Looks pretty good to me in general. I also like d3dx_param_eval and related names. > + for (i = 0; i < param->element_count; i++) > + { > + if (param->members[i].type != param->type) > + { > + FIXME("Unexpected member parameter type %u (need %u).\n", param->members[i].type, param->type); I would use "expected" or something similar instead of "need" in this message. > diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c > new file mode 100644 > index 0000000..409c00f > --- /dev/null > +++ b/dlls/d3dx9_36/preshader.c > @@ -0,0 +1,688 @@ > +/* > + * FX preshader parsing & execution, setting shader constants > + * from effect parameters. > + * > + * Copyright 2016 Paul Gofman > + * > + * 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 > + */ > + > +#include "config.h" > +#include "wine/port.h" > + > +#include "windef.h" > +#include "wingdi.h" Not your fault but those shouldn't be there. wingdi.h is already included by d3dx9_36_private.h, while windef.h is not but still it's necessary to avoid errors when including d3dx9_36_private.h. I'm sending a patch cleaning up the includes in d3dx9 (and renaming d3dx9_36_private.h to d3dx9_private.h while at it), please update this patch accordingly. > +static const struct > +{ > + unsigned int value_size; > + unsigned int reg_value_cnt; Just my preference, I would go with component_size and component_count (or maybe reg_component_count). > + {sizeof(float), 4, PRES_VT_FLOAT } /* PRES_REGTAB_REG */ I think I had tested this in the past and it turned out temporaries are stored as doubles. I'll see if I can find something. > +static const char *table_symbol[] = > +{ > + "(null)", "imm", "c", "v", "oc", "ob", "oi", "r" > +}; > + > +static const char *xyzw_str = "xyzw"; I haven't checked but maybe you can put those directly in the function using them. > + > +#define OFFSET2REG(table, offset) ((offset) / table_info[table].reg_value_cnt) > + > +static const enum PRES_REG_TABLES pres_regset2table[] = > +{ > + PRES_REGTAB_OBCONST, /* D3DXRS_BOOL */ > + PRES_REGTAB_OICONST, /* D3DXRS_INT4 */ > + PRES_REGTAB_CONST, /* D3DXRS_FLOAT4 */ > + PRES_REGTAB_NONE, /* D3DXRS_SAMPLER */ > +}; > + > +static const enum PRES_REG_TABLES shad_regset2table[] = > +{ > + PRES_REGTAB_OBCONST, /* D3DXRS_BOOL */ > + PRES_REGTAB_OICONST, /* D3DXRS_INT4 */ > + PRES_REGTAB_OCONST, /* D3DXRS_FLOAT4 */ > + PRES_REGTAB_NONE, /* D3DXRS_SAMPLER */ > +}; > + > +struct d3dx_pres_operand > +{ > + enum PRES_REG_TABLES table; > + /* offset is value index, not register index, e. g. > + offset for value c3.y is 17 (3 * 4 + 1) */ As I mentioned already, I would refer to "components" instead of "values". > + unsigned int offset; > +}; > + > +struct d3dx_pres_ins > +{ > + enum PRES_OPS op; > + /* first input argument is scalar, > + scalar component is propagated */ > + BOOL scalar_op; > + unsigned int ncomps; > + unsigned int ninp_args; Something like "component_count" and "operands_count" (or "input_count", or whatever) seems nicer. Similarly for the other counts. > + > +struct d3dx_param_eval > +{ > + enum param_eval_type peval_type; I feel like I might have already asked this, sorry if that's the case: do you really need this field? At least for what I can see at the moment you can do without since it's used only in d3dx_create_param_eval(), which is where you set the field, and in d3dx_param_eval_set_shader_constants(), where you don't really need it. > + D3DXPARAMETER_TYPE param_type; This one can also probably be avoided (e.g. by passing it down the call chain from the d3dx_parameter struct) although it's probably a bit more useful so I don't mind. > + > + struct d3dx_preshader pres; > + struct d3dx_const_tab shader_inputs; > +}; > + > +static HRESULT regstore_alloc_table(struct d3dx_regstore *rs, unsigned int table) > +{ > + unsigned int sz; > + > + sz = rs->table_sizes[table] * table_info[table].reg_value_cnt * table_info[table].value_size; > + if (sz) > + { > + rs->tables[table] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sz); > + rs->table_value_set[table] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, > + sizeof(*rs->table_value_set[table]) * > + ((rs->table_sizes[table] + PRES_VS_BITS_PER_WORD - 1) / PRES_VS_BITS_PER_WORD)); > + if (!rs->tables[table] || !rs->table_value_set[table]) > + return E_OUTOFMEMORY; > + } > + return D3D_OK; > +} > + > +static void regstore_free_tables(struct d3dx_regstore *rs) > +{ > + unsigned int i; > + > + for (i = PRES_REGTAB_IMMED; i < PRES_REGTAB_MAX; i++) Maybe add a couple of enum PRES_REGTAB_FIRST and PRES_REGTAB_LAST and use them here? > + for (j = 0; j < n; j++) > + TRACE("0x%08X,", words[i + j]); Please use lowercase hexadecimals. > + if (ninp_args != pres_op_info[i].ninp_args) > + { > + FIXME("Actual input args %u, expected %u, instruction %s.\n", ninp_args, > + pres_op_info[i].ninp_args, pres_op_info[i].mnem); > + return NULL; > + } > + ins->ninp_args = ninp_args; It shouldn't be necessary to store the number of arguments in the instruction structure at the moment, although maybe there is some variable-arguments opcode? > + hr = E_FAIL; This seems unnecessary. > + > -- git am complains about that empty line at the end of the file.

2 2

Re: TestBot job 21484 results: winhttp/tests: Fix test failures.
by Hans Leidekker March 17, 2016

March 17, 2016

On Thu, 2016-03-17 at 04:21 -0500, Marvin wrote: > === w864 (32 bit winhttp) === > > winhttp: > winhttp.c:1030: Test failed: failed to send request 2148074273 > winhttp.c:1034: Test failed: failed to retrieve certificate context 12019 > winhttp.c:1039: Test failed: failed to retrieve key bitness 4317 > winhttp.c:1043: Test failed: failed to retrieve certificate info 12019 > winhttp.c:1056: Test failed: failed to receive response 12019 > winhttp.c:1060: Test failed: failed to query available data 12019 > winhttp.c:1061: Test failed: available_size = 0 > winhttp.c:1066: Test failed: failed unexpectedly 12019 > winhttp.c:1067: Test failed: request failed unexpectedly 3735928559 > winhttp.c:1078: Test failed: WinHttpReadData failed: 12019. Here's a clean run: https://testbot.winehq.org/JobDetails.pl?Key=21483 In this test run without my patch the same error occurs only on that VM, but in a different test: https://testbot.winehq.org/JobDetails.pl?Key=21482 I don't remember seeing this failure before, so it looks like an unrelated issue that was also introduced with the upgrade.

1 0

Re: winhttp/tests: Fix test failures.
by Marvin March 17, 2016

March 17, 2016

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=21484 Your paranoid android. === w864 (32 bit winhttp) === winhttp.c:1030: Test failed: failed to send request 2148074273 winhttp.c:1034: Test failed: failed to retrieve certificate context 12019 winhttp.c:1039: Test failed: failed to retrieve key bitness 4317 winhttp.c:1043: Test failed: failed to retrieve certificate info 12019 winhttp.c:1056: Test failed: failed to receive response 12019 winhttp.c:1060: Test failed: failed to query available data 12019 winhttp.c:1061: Test failed: available_size = 0 winhttp.c:1066: Test failed: failed unexpectedly 12019 winhttp.c:1067: Test failed: request failed unexpectedly 3735928559 winhttp.c:1078: Test failed: WinHttpReadData failed: 12019.

1 0

Home Stretch for the New Wiki
by Kyle Auble March 17, 2016

March 17, 2016

Hi everybody, I just wanted to update you all on the state of the wiki. This email may seem long but it isn't too dense; feel free to skip the numbers, but for anyone that might appreciate some figures, the old wiki had... Total pages: 841 (Less) system pages: ~150 Actual pages by us: ~690 These consisted of... Redirects ~45 Homepages ~150 Categories ~25 Content pages: ~470 Of the content pages, we had... English pages: 384 Translations: ~86 Of the translations, between 20-26 were immediately disqualified (either as less than 50% actually translated or a translation of an English page we rejected). Alex H mentioned that most of the translations probably weren't worth migrating, but we thought we should leave that up to potential translators. For those remaining English pages... Already ported in some way: 153 Rejected as not worth porting: 169 Still unfinished: 62 Of these last 62, we actually have relatively clear plans for how to port ~25 of them, leaving just 35 or so as truly up for grabs. Furthermore, we've tried to leave a quick note on http://oldwiki.winehq.org/PageMigration for every page that still needs a decision. And of course, people are free to override our rejections if they really want to keep a page (we left an explanation for every rejection at the top of the relevant page) While some of those last 35 pages are really just a matter of policy (e.g. do we want a page for every command, even if it's a stub?), many of them have at least one or two technical notes that seem to supplement the API documentation. These are the ones where we would really appreciate input or decisions from developers, particularly whether anything is worth moving to the Developers' docs. Finally, as Rosanne and I made alternating edits, we discussed a few points that we think are worth keeping in mind for the future: 1. If a page is experimental / dev-oriented, try to make that clear from the name, text, and possibly a bold note (for example, a lot of users were apparently misinterpreting "WineOnWindows" as a stable feature they could use) 2. If you're using a distro/OS with its own wiki page, keeping an eye on its page for incorrect or outdated info would be great, even if only every few months. I updated several of them last year, testing what I could and researching docs on and outside WineHQ for changes, but it's no substitute for someone that knows first-hand what each one requires. 3. If you don't agree with a change, don't be afraid to revert it and start a discussion for the page, especially now that we have the talk pages. 4. The wiki is a natural place for things like to-do lists and transient notes, but if the same information can be easily written so that it's just as useful 5 years from now, aim for timelessness. If more of the wiki ages well, it should be easier to keep track of the things that may bit-rot. 5. Finally, if you want to start a new page, check to see if you could somehow add your info to existing pages first. Obviously we don't want the pages to get too long and it's totally subjective in the end, but it seems the more the pages spread out wildly, the more likely they are to wind up orphaned and abandoned. Have a good start to your spring everybody, Kyle

1 0

Re: [PATCH 1/2] d3drm: Change signature of d3drm_texture_create.
by Henri Verbeet March 16, 2016

March 16, 2016

The subject line is pretty vague. On 15 March 2016 at 22:19, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> wrote: > @@ -193,8 +194,16 @@ static HRESULT WINAPI d3drm1_CreateTexture(IDirect3DRM *iface, > D3DRMIMAGE *image, IDirect3DRMTexture **texture) > { > FIXME("iface %p, image %p, texture %p partial stub.\n", iface, image, texture); > + struct d3drm_texture *object; > + HRESULT hr; You mix declarations and code here. The compiler should have warned about that. > + hr = d3drm_texture_create(&object); > + if (FAILED(hr)) > + return hr; We would generally write that as if (FAILED(hr = d3drm_texture_create(&object))) return hr; not a big deal though. > +IDirect3DRMTexture *IDirect3DRMTexture_from_impl(struct d3drm_texture *texture) > +{ > + return &texture->IDirect3DRMTexture_iface; > +} > + > +IDirect3DRMTexture2 *IDirect3DRMTexture2_from_impl(struct d3drm_texture *texture) > +{ > + return &texture->IDirect3DRMTexture2_iface; > +} > + > +IDirect3DRMTexture3 *IDirect3DRMTexture3_from_impl(struct d3drm_texture *texture) > +{ > + return &texture->IDirect3DRMTexture3_iface; > +} I don't think these are an improvement, I'd prefer them just written out. > -HRESULT Direct3DRMTexture_create(REFIID riid, IUnknown **out) > +HRESULT d3drm_texture_create(struct d3drm_texture **out) I think "texture" would be a more appropriate name than "out" here.

2 2

Re: dsound: Avoid implicit cast of interface pointer. [RFC]
by Henri Verbeet March 16, 2016

March 16, 2016

On 16 March 2016 at 05:46, Sebastian Lackner <sebastian(a)fds-team.de> wrote: > To catch errors like http://source.winehq.org/patches/data/120308 easier in the future, > I would like to propose, that we replace CONTAINING_RECORD and similar macros with a > typesafe definition (on compilers where this is possible). The linux kernel source > contains an example how to do that, but there are multiple solutions available: > > #define container_of(ptr, type, member) ({ \ > const typeof( ((type *)0)->member ) *__mptr = (ptr); \ > (type *)( (char *)__mptr - offsetof(type,member) );}) > > One disadvantage is that we'll have to add explicit casts to a couple of places, like below. > Other dlls which would require explicit casts at a couple of places: > > amstream, d2d1, d3d11, d3d8, d3d9, ddraw, dwrite, msxml3, oleaut32, quartz, rpcrt4, vbscript > That implies you've tried the change. Did you find any issues other than the one in 120308? If not, I think this is rarely an issue in practice and not worth making legitimate cases uglier for.

2 1

Re: ddraw/tests: Fix function name in multiple ok() messages. (resend)
by Henri Verbeet March 16, 2016

March 16, 2016

On 7 March 2016 at 08:40, Sebastian Lackner <sebastian(a)fds-team.de> wrote: > I assume this patch was missed somehow, resending. > No, the patch is just not very useful.

3 3

Re: [PATCH 2/2] d3drm: Partially Implement IDirect3DRM*::LoadTexture.
by Henri Verbeet March 16, 2016

March 16, 2016

On 15 March 2016 at 22:19, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> wrote: > dlls/d3drm/Makefile.in | 2 +- > dlls/d3drm/d3drm.c | 35 +++++-- > dlls/d3drm/d3drm_private.h | 6 ++ > dlls/d3drm/tests/d3drm.c | 22 ++++- > dlls/d3drm/texture.c | 224 ++++++++++++++++++++++++++++++++++++++++++++- > 5 files changed, 273 insertions(+), 16 deletions(-) > I briefly looked at this, and it has some issues, some perhaps more obvious than others. But let's work on the first patch in the series first.

1 0

Re: [PATCH] shell32: Implement NIM_SETVERSION in Shell_NotifyIcon()
by Roman Pišl March 16, 2016

March 16, 2016

Hello, thank you for paying attention to this patch. Please, give me a hint how should I split the patch. Should I create three separate patches - shell32, explorer and winex11? I'm ready to do what is necessary. Best regards Roman Pišl On Tuesday 15 of March 2016 10:12:31 you wrote: > Thank you for your contribution to Wine! > > This is an automated notification to let you know that your patch has > been reviewed and its status set to "Needs splitting". > > This means that the patch needs to be split, either because it > contains unrelated changes that should be their own separate patch, or > because it's too large for review. You need to find a way to resend > the changes in smaller chunks. > > If you do not understand the reason for this status, disagree with our > assessment, or are simply not sure how to proceed next, please ask for > clarification by replying to this email.

2 1

[RFC] winex11: Don't put a default icon on modal dialogs.
by Alex Henrie March 16, 2016

March 16, 2016

Fixes https://bugs.winehq.org/show_bug.cgi?id=29336 when using the xfwm4 window manager. Could some other developers take a look at this patch? It passes the test program attached to the bug report, but I am not sure that it is the right way. --- dlls/winex11.drv/window.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 4789f98..63d256a 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -274,7 +274,7 @@ static unsigned long get_mwm_decorations( struct x11drv_win_data *data, if ((style & WS_CAPTION) == WS_CAPTION) { ret |= MWM_DECOR_TITLE | MWM_DECOR_BORDER; - if (style & WS_SYSMENU) ret |= MWM_DECOR_MENU; + if ((style & WS_SYSMENU) && data->icon_pixmap) ret |= MWM_DECOR_MENU; if (style & WS_MINIMIZEBOX) ret |= MWM_DECOR_MINIMIZE; if (style & WS_MAXIMIZEBOX) ret |= MWM_DECOR_MAXIMIZE; } @@ -603,7 +603,8 @@ static void fetch_icon_data( HWND hwnd, HICON icon_big, HICON icon_small ) { icon_big = (HICON)SendMessageW( hwnd, WM_GETICON, ICON_BIG, 0 ); if (!icon_big) icon_big = (HICON)GetClassLongPtrW( hwnd, GCLP_HICON ); - if (!icon_big) icon_big = LoadIconW( 0, (LPWSTR)IDI_WINLOGO ); + if (!icon_big && !(GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_DLGMODALFRAME)) + icon_big = LoadIconW( 0, (LPWSTR)IDI_WINLOGO ); } if (!icon_small) { @@ -611,7 +612,7 @@ static void fetch_icon_data( HWND hwnd, HICON icon_big, HICON icon_small ) if (!icon_small) icon_small = (HICON)GetClassLongPtrW( hwnd, GCLP_HICONSM ); } - if (!GetIconInfo(icon_big, &ii)) return; + if (!GetIconInfo(icon_small, &ii) && !GetIconInfo(icon_big, &ii)) return; hDC = CreateCompatibleDC(0); bits = get_bitmap_argb( hDC, ii.hbmColor, ii.hbmMask, &size ); -- 2.7.3

1 0

Re: [v6] shell32: fix two bugs in IQueryAssocations
by Theodore Dubois March 16, 2016

March 16, 2016

OK. I'll resend with the changes suggested. ~Theodore On Mar 15, 2016, at 07:03 PM, Alexandre Julliard <julliard(a)winehq.org> wrote: Theodore Dubois <tblodt(a)icloud.com> writes: The reason I need the macro is: If I wrote ok(getstring_test(whatever)), first the ok macro would call winetest_set_location with the current line number, and then it would call getstring_test. The ok macros in getstring_test would call winetest_set_location and overwrite the location of the actual test. Then if getstring_test returns with a failure, the error message has the wrong line number. The only way to fix this is to call getstring_test on one line and call ok on the next line. There's no reason to call ok on the getstring_test result, since getstring_test would have already reported the error. If you want to know which caller triggered it, you can pass a line number or some string description to getstring_test. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [v6] shell32: fix two bugs in IQueryAssocations
by Alexandre Julliard March 16, 2016

March 16, 2016

Theodore Dubois <tblodt(a)icloud.com> writes: > + > + /* This macro is necessary because of what the ok macro expands to. Failures would report the wrong line number. */ > +#define TEST_GET_STRING(a,p,s,es) \ > + getstring_test_result = getstring_test(a,p,s,es);\ > + ok(getstring_test_result, "\n"); It would be better to avoid the macro and write the tests explicitly, with meaningful error messages. Also, any chance to split the patch? -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [PATCH 2/2] d3drm: Partially Implement IDirect3DRM*::LoadTexture.
by Aaryaman Vasishta March 15, 2016

March 15, 2016

I forgot to remove some trailing whitespaces - sorry about that! I will send another patch without them if needed.

1 1

Re: [PATCH 2/2] d3drm: Partially Implement IDirect3DRM*::LoadTexture.
by Marvin March 15, 2016

March 15, 2016

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=21458 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [v3 resend 3/6] d3dx9: implement fxlc constants (expressions) in effect.
by Matteo Bruni March 15, 2016

March 15, 2016

2016-03-10 19:50 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > +static float regstore_get_float(struct d3dx_regstore *rs, unsigned int table, unsigned int offset) > +{ > + BYTE *p; > + > + p = (BYTE *)rs->tables[table] + table_info[table].value_size * offset; > + switch (table_info[table].type) > + { > + case PRES_VT_FLOAT : return *(float *)p; > + case PRES_VT_DOUBLE: return *(double *)p; > + case PRES_VT_INT : return *(int *)p; > + case PRES_VT_BOOL : return *(BOOL *)p ? 1.0f : -0.0f; I guess that -0.0f comes from some test? > + /* no EOL in WARN to dump arg in the same line */ > + WARN("Using uninitialized input "); > + dump_arg(rs, opr, comp); > + TRACE(".\n"); > + dump_ins(rs, ins); You can probably do without the comment, it's pretty clear anyway. > +#define ARGS_ARRAY_SIZE 8 > +static HRESULT execute_preshader(struct d3dx_preshader *pres) > +{ > + unsigned int i, j, k; > + float args[ARGS_ARRAY_SIZE]; > + float res; > + > + for (i = 0; i < pres->nins; i++) > + { > + struct d3dx_pres_ins *ins; > + struct op_info *oi; > + > + ins = &pres->ins[i]; > + oi = &pres_op_info[ins->op]; > + if (oi->func_all_comps) > + { > + if (ins->ninp_args * ins->ncomps > ARGS_ARRAY_SIZE) > + { > + FIXME("Too much arguments (%u) for one instruction.\n", ins->ninp_args * ins->ncomps); That should be "Too many". > +HRESULT d3dx_param_eval_set_shader_constants(struct IDirect3DDevice9 *device, struct d3dx_param_eval *peval) This function is unused in this patch. Please move it to the first patch requiring it (I think that's patch 6/6). BTW, splitting patch 6/6 would be nice although I don't have any suggestions on how to do that in a sensible manner... > +HRESULT d3dx_param_eval_get_shader_parameters(struct d3dx_param_eval *peval, struct d3dx_parameter ***param, > + unsigned int *nparam, D3DXCONSTANT_DESC **cdesc) > +{ > + *nparam = peval->shader_inputs.ninputs; > + *param = peval->shader_inputs.inputs_param; > + *cdesc = peval->shader_inputs.inputs; > + return D3D_OK; > +} You don't use this function in this patch either. Also it doesn't seem useful, it isn't an improvement to just assigning those three pointers directly in the caller IMO.

2 2

Re: [v3 1/6] d3dx9: add test for preshader in effect.
by Matteo Bruni March 15, 2016

March 15, 2016

2016-03-10 15:23 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- Looks much better, thanks. I still have a few comments though. > + for (i = 0; i < 256; i++) > + { > + hr = IDirect3DDevice9_SetVertexShaderConstantF(device, i, > + (const float *)&fvect_empty, 1); > + ok(hr == D3D_OK, "Got result %#x.\n", hr); > + } > + for (i = 0; i < TEST_EFFECT_PRES_NFLOATP; i++) > + { > + hr = IDirect3DDevice9_SetPixelShaderConstantF(device, i, > + (const float *)&fvect_empty, 1); > + ok(hr == D3D_OK, "Got result %#x.\n", hr); > + } I know it was me who suggested to clear all the 256 float shader constants but it looks a bit weird if the same doesn't happen for the other constant types. It's also not very useful if those additional constants aren't checked later on. I would change the initialization of the other constant types in the same way (maybe with a define or something instead of the plain number?) and then check that those are not modified by BeginPass(). > + bval = FALSE; > + for (i = 0; i < TEST_EFFECT_PRES_NBOOL; i++) > + { > + hr = IDirect3DDevice9_SetPixelShaderConstantB(device, i, &bval, 1); > + ok(hr == D3D_OK, "Got result %#x.\n", hr); > + } > + > + hr = effect->lpVtbl->Begin(effect, &npasses, 0); > + ok(hr == D3D_OK, "Got result %#x.\n", hr); > + > + par = effect->lpVtbl->GetParameterByName(effect, NULL, "g_Pos2"); > + ok(par != NULL, "GetParameterByName failed.\n"); > + > + hr = effect->lpVtbl->SetVector(effect, par, &fvect1); > + ok(hr == D3D_OK, "SetFloatArray failed, hr %#x.\n", hr); This message is still wrong. > + > + hr = effect->lpVtbl->BeginPass(effect, 0); > + todo_wine ok(hr == D3D_OK, "Got result %#x.\n", hr); > + > + hr = IDirect3DDevice9_GetVertexShaderConstantF(device, 0, (float *)fdata, TEST_EFFECT_PRES_NFLOATV); We usually avoid the cast in these cases with something like "&fdata->x". > + ok(hr == D3D_OK, "Got result %#x.\n", hr); > + todo_wine ok(!memcmp(fdata, test_effect_preshader_fconstsv, sizeof(test_effect_preshader_fconstsv)), > + "Vertex shader float constants do not match.\n"); > + hr = IDirect3DDevice9_GetPixelShaderConstantF(device, 0, (float *)fdata, TEST_EFFECT_PRES_NFLOATP); > + ok(hr == D3D_OK, "Got result %#x.\n", hr); > + todo_wine ok(!memcmp(fdata, test_effect_preshader_fconstsp, sizeof(test_effect_preshader_fconstsp)), > + "Pixel shader float constants do not match.\n"); > + > + hr = IDirect3DDevice9_GetPixelShaderConstantB(device, 0, bdata, TEST_EFFECT_PRES_NBOOL); > + ok(hr == D3D_OK, "Got result %#x.\n", hr); > + for (i = 0; i < TEST_EFFECT_PRES_NBOOL; i++) > + todo_wine_if(!bdata[i] != !test_effect_preshader_bconsts[i]) > + ok(!bdata[i] == !test_effect_preshader_bconsts[i], > + "Pixel shader boolean constants do not match.\n"); > + > + 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.\n", > + test_effect_preshader_op_results[i].comment, j, > + test_effect_preshader_op_results[i].result[j], v[j]); The indentation is pretty weird here. Even if you keep the ok on the same column of the todo_wine_if (to make its removal a few patches later nicer) the continuations of the ok condition should be indented, matching the other continuation lines. FWIW in newer d3d code we usually put the operators at the start of the next line (instead of at the end of the previous line) in line continuations. Also we prefer preincrement to postincrement of typical 'for' induction variables. > + ok(!!vshader, "Got NULL vshader.\n"); This double negation is unnecessary. > + > + hr = IDirect3DVertexShader9_GetFunction(vshader, NULL, &byte_code_size); > + ok(hr == D3D_OK, "Got result %#x.\n", hr); > + byte_code = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, byte_code_size); > + hr = IDirect3DVertexShader9_GetFunction(vshader, byte_code, &byte_code_size); > + ok(hr == D3D_OK, "Got result %#x.\n", hr); > + ok(byte_code_size > 1, "Got unexpected byte code size %u.\n", byte_code_size); > + 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), > + "Incorrect shader selected.\n"); > + HeapFree(GetProcessHeap(), 0, byte_code); > + IDirect3DVertexShader9_Release(vshader); > + > + hr = IDirect3DDevice9_SetVertexShader(device, NULL); > + ok(hr == D3D_OK, "Got result %#x.\n", hr); > + > + hr = effect->lpVtbl->SetVector(effect, par, &fvect1); > + ok(hr == D3D_OK, "SetFloatArray failed, hr %#x.\n", hr); > + hr = effect->lpVtbl->CommitChanges(effect); > + todo_wine ok(hr == D3D_OK, "Got result %#x.\n", hr); > + hr = IDirect3DDevice9_GetVertexShader(device, &vshader); > + ok(hr == D3D_OK, "Got result %#x.\n", hr); > + ok(!vshader, "Incorrect shader selected.\n"); > + if (vshader) > + IDirect3DVertexShader9_Release(vshader); I think you can remove this release too.

2 2

Re: [PATCH v2 08/12] wined3d: Implement stencil clear in wined3d_device_clear_rendertarget_view().
by Henri Verbeet March 15, 2016

March 15, 2016

On 15 March 2016 at 10:52, Józef Kucia <jkucia(a)codeweavers.com> wrote: > static HRESULT cpu_blit_depth_fill(struct wined3d_device *device, > - struct wined3d_rendertarget_view *view, const RECT *rect, float depth) > + struct wined3d_rendertarget_view *view, const RECT *rect, DWORD clear_flags, Minor typo.

1 0

Re: [PATCH 2/3] winex11.drv: Fix handling of CF_DIBV5 clipboard data.
by Alexandre Julliard March 15, 2016

March 15, 2016

Charles Davis <cdavis5x(a)gmail.com> writes: > @@ -1149,9 +1154,7 @@ static BOOL X11DRV_CLIPBOARD_RenderSynthesizedBitmap(Display *display) > lpbmih = GlobalLock(lpSource->hData); > if (lpbmih) > { > - offset = sizeof(BITMAPINFOHEADER) > - + ((lpbmih->biBitCount <= 8) ? (sizeof(RGBQUAD) * > - (1 << lpbmih->biBitCount)) : 0); > + offset = lpbmih->biSize - lpbmih->biSizeImage; This doesn't look right. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: dinput: Support IUnknown in the IDirectInputEffect COM object. (2nd try)
by Huw Davies March 15, 2016

March 15, 2016

On Tue, Mar 15, 2016 at 11:43:58AM +0100, Michael Stefaniuc wrote: > Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> > --- > v2: Use IsEqualIID consistently. Thanks Huw! > > And of course again not even compile tested as I don't have a Mac. Yes, > I need to set me up with a cross compile for that. > gcc -m32 -c -o joystick_osx.o joystick_osx.c -I. -I../../include -D__WINESRC__ -D_REENTRANT -fPIC -Wall -pipe \ -fno-strict-aliasing -Wdeclaration-after-statement -Wempty-body -Wstrict-prototypes \ -Wwrite-strings -Wpointer-arith -gdwarf-2 -fno-omit-frame-pointer -g -O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 joystick_osx.c: In function ‘effect_QueryInterface’: joystick_osx.c:1477: error: ‘riid’ undeclared (first use in this function) joystick_osx.c:1477: error: (Each undeclared identifier is reported only once joystick_osx.c:1477: error: for each function it appears in.) make: *** [joystick_osx.o] Error 1 > > dlls/dinput/joystick_osx.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c > index 6a8926d..19ca070 100644 > --- a/dlls/dinput/joystick_osx.c > +++ b/dlls/dinput/joystick_osx.c > @@ -1474,7 +1474,7 @@ static HRESULT WINAPI effect_QueryInterface(IDirectInputEffect *iface, > > TRACE("%p %s %p\n", This, debugstr_guid(guid), out); > > - if(IsEqualIID(guid, &IID_IDirectInputEffect)){ > + if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(guid, &IID_IDirectInputEffect)){ > *out = iface; > IDirectInputEffect_AddRef(iface); > return S_OK; > -- > 2.4.3 > >

1 0

Re: dinput: Support IUnknown in the IDirectInputEffect COM object.
by Huw Davies March 15, 2016

March 15, 2016

On Tue, Mar 15, 2016 at 10:37:16AM +0100, Michael Stefaniuc wrote: > Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> > --- > dlls/dinput/joystick_osx.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c > index 6a8926d..19ca070 100644 > --- a/dlls/dinput/joystick_osx.c > +++ b/dlls/dinput/joystick_osx.c > @@ -1474,7 +1474,7 @@ static HRESULT WINAPI effect_QueryInterface(IDirectInputEffect *iface, > > TRACE("%p %s %p\n", This, debugstr_guid(guid), out); > > - if(IsEqualIID(guid, &IID_IDirectInputEffect)){ > + if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualIID(guid, &IID_IDirectInputEffect)){ It looks a bit strange to mix IsEqualGUID and IsEqualIID. Huw.

2 3

GSoC Idea: Tools - Winetest Scripting Interface
by Zhenbo Li March 15, 2016

March 15, 2016

Hello, I'm Zhenbo Li. I participated in GSoC twice. This year, I want to work on "Tools - Winetest Scripting Interface". After "make test", checking the output in stdout manually is horrible. As ok() macro is used quite widely, my patches should cause no surprise. That is to say, other developers need to read neither my patches nor the changelog to continue their jobs, although ok() macro and other tools for test have been changed. I think there will be two steps for the goal: 1. ok() macro ===================== int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { tls_data* data=get_tls_data(); if (data->todo_level){...} else { if (!condition) { printf( "%s:%d: Test failed: ", data->current_file, data->current_line ); vprintf(msg, args); InterlockedIncrement(&failures); return 0; } else{.....} } } Instead of printing all the data to stderr, I think we can write a wrapper static void test_print(const char *s) { if(want_print_to_file) fprintf(file_handle, s); printf(s); } It needs some work to make sure that the file_handle is opened/closed successfully. With that, we can record the failed tests to a file, and developers don't need to find them in stdout anymore. 2. compare the results ======================= On the idea page, it says that any scripting language is acceptable. I prefer Python3. To make the code simple, I think editing runtest script is the best solution. Currently, our logic in Makefile is htmllocation.ok: ../../../tools/runtest $(RUNTESTFLAGS) -T ../../.. -M mshtml.dll -p mshtml_test.exe.so htmllocation && touch $@ And in runtest, we have exec $WINETEST_WRAPPER "$topobjdir/wine" "$program" "$@" I don't want to touch Makefile. Instead, I'm going to add some options for runtest. For example, one can use ../../../tools/runtest $(RUNTESTFLAGS) -new_option expected_errors_generated before -T ../../.. -M mshtml.dll -p mshtml_test.exe.so htmllocation And in runtest script, we can expected_errors_generated and new_errors_got, then tell that whether the test result has been changed. It should be easy for developers to write a script for git bisect or other circumstance. Problems ========= This approach seems to be quite simple, and there are some conditions can't be handled. For example void test_foo(sturct Data *d){ ret = foo(d); ok(ret, "foo(%s) is %d\n", data_to_str(d), ret); } struct Data list[]={a,b,c,d,e}; void test(){ for(i in list) test_foo(i); } I think we should not do too much "smart deduce" here, and don't hide what's happening to other developers. Maybe we can add another option for runtest script: --scrict=false This is my humble idea for Wine's GSoC 2016. If this project goes well, working on wine test suit will be much more satisfying(although still boring). I appreciate for your comment. With you a happy weekend. -- Have a nice day! Zhenbo Li

6 15

Re: winemac: Call the EnumDisplayMonitors callback using a wrapper.
by Henri Verbeet March 15, 2016

March 15, 2016

On 15 March 2016 at 05:50, Ken Thomases <ken(a)codeweavers.com> wrote: > Signed-off-by: Ken Thomases <ken(a)codeweavers.com> > --- > For <https://bugs.winehq.org/show_bug.cgi?id=40297>. > > dlls/winemac.drv/display.c | 31 +++++++++++++++++++++++++++++-- > 1 file changed, 29 insertions(+), 2 deletions(-) > Is this really specific to winemac, or would it be more appropriate to add the wrapper in user32?

1 0

Re: winemac: Call the EnumDisplayMonitors callback using a wrapper.
by Ken Thomases March 15, 2016

March 15, 2016

On Mar 14, 2016, at 11:50 PM, Ken Thomases <ken(a)codeweavers.com> wrote: > > Signed-off-by: Ken Thomases <ken(a)codeweavers.com> > --- > For <https://bugs.winehq.org/show_bug.cgi?id=40297>. > > dlls/winemac.drv/display.c | 31 +++++++++++++++++++++++++++++-- > 1 file changed, 29 insertions(+), 2 deletions(-) Dmitry pointed out that this version misaligns the stack, so ignore it. I'll submit another try tomorrow. -Ken

1 0

Re: [PATCH] crypt32/tests: Accept Windows 10 results.
by Alexandre Julliard March 15, 2016

March 15, 2016

Detlef Riekenberg <wine.dev(a)web.de> writes: > @@ -336,11 +336,13 @@ static void testStringToBinaryA(void) > /* Bad strings */ > for (i = 0; i < sizeof(badStrings) / sizeof(badStrings[0]); i++) > { > - bufLen = 0; > + bufLen = 0xdeadbeef; > + SetLastError(0xdeadbeef); > + /* This succeeds on Windows 10 with our CRYPT_STRING_BASE64 test data */ > ret = pCryptStringToBinaryA(badStrings[i].str, 0, badStrings[i].format, > NULL, &bufLen, NULL, NULL); > - ok(!ret && GetLastError() == ERROR_INVALID_DATA, > - "Expected ERROR_INVALID_DATA, got ret=%d le=%u\n", ret, GetLastError()); > + ok((!ret && GetLastError() == ERROR_INVALID_DATA) || broken(ret), > + "%d: Expected FALSE with ERROR_INVALID_DATA, got ret=%d le=%u len=%d\n", i, ret, GetLastError(), bufLen); I'm not convinced this should be considered broken. It would be worth testing some other truly bad strings, and the CRYPT_STRING_STRICT flag also. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: msrle32: Use the correct number of colors when biClrUsed = 0 (try 2)
by Alexandre Julliard March 15, 2016

March 15, 2016

Bruno Jesus <00cpxxx(a)gmail.com> writes: > @@ -1647,27 +1655,33 @@ static LRESULT DecompressBegin(CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, > > if (lpbiIn->biCompression != BI_RGB) > { > + int colors; > + > + if (lpbiIn->biClrUsed == 0) > + colors = 1 << lpbiIn->biBitCount; > + else > + colors = lpbiIn->biClrUsed; I don't think you want to do that for biBitCount > 8. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH] winex11: Don't create a temporary context each time X11DRV_wglBindTexImageARB is called.
by Matteo Bruni March 15, 2016

March 15, 2016

2016-03-12 14:57 GMT+01:00 Miklós Máté <mtmkls(a)gmail.com>: > Theoretically wglBindTexImageARB is supposed to be a fast > render-to-texture method, and creating a new context is anything but fast. > > This fixes horrible performance in Star Wars > Knights of the Old Republic when post-process effects are enabled. > > v2: fix context caching, fix destructor, fix comments > v3: better handling of context delete > > Signed-off-by: Miklós Máté <mtmkls(a)gmail.com> Thank you for following up after the review comments. Unfortunately I think there is one more (and hopefully last) bit which still needs addressing: > @@ -2301,6 +2314,7 @@ static struct wgl_pbuffer *X11DRV_wglCreatePbufferARB( HDC hdc, int iPixelFormat > SetLastError(ERROR_NO_SYSTEM_RESOURCES); > goto create_failed; /* unexpected error */ > } > + list_add_head( &pbuffer_list, &object->entry ); > TRACE("->(%p)\n", object); > return object; This needs to be done inside the critical section, so please put EnterCriticalSection() + LeaveCriticalSection() around it. FTR the wglCreateContext and wglCreateContextAttribsARB implementation functions indirectly acquire and release the critical section via get_gl_drawable() / release_gl_drawable(). It looks good to me otherwise.

1 0

Re: [v2 6/6] d3dx9: imlement setting named shader constants in effect.
by Matteo Bruni March 15, 2016

March 15, 2016

2016-03-10 14:51 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > + unsigned i, j; We usually avoid the bare "unsigned". > + for (i = 0; i < parameters_count; i++) > + if (params[i] && params[i]->class == D3DXPC_OBJECT && params[i]->type == D3DXPT_SAMPLER) > + { > + struct d3dx_sampler *sampler; > + > + sampler = (struct d3dx_sampler *)params[i]->data; > + TRACE("sampler %s, register index %u, state count %u.\n", params[i]->name, > + cdesc[i].RegisterIndex, sampler->state_count); > + for (j = 0; j < sampler->state_count; j++) > + { > + hr = d3dx9_apply_state(effect, pass, &sampler->states[j], > + cdesc[i].RegisterIndex + (vs ? D3DVERTEXTEXTURESAMPLER0 : 0)); > + if (FAILED(hr)) > + ret = hr; > + } > + } It's better to add brackets to the for, for greater clarity.

1 0

Re: [2/2] user32: Skip menu loop for empty popup menus.
by Marvin March 14, 2016

March 14, 2016

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=21431 Your paranoid android. === w864 (32 bit msg) === msg.c:6417: Test failed: Update region shouldn't be empty msg.c:6651: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6653: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different === w1064 (32 bit msg) === msg.c:6417: Test failed: Update region shouldn't be empty msg.c:6651: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6653: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different === w1064 (64 bit msg) === msg.c:6417: Test failed: Update region shouldn't be empty msg.c:6651: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6653: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different

1 0

Re: [PATCH 2/2] d3d11/tests: Port swapchain_flip to d3d11.
by Henri Verbeet March 14, 2016

March 14, 2016

On 13 March 2016 at 19:08, Stefan Dösinger <stefandoesinger(a)gmx.at> wrote: > --- > > I am not using create_test_context in this test because it would introduce > asymetry in how back buffer 0 is created that would make the test more > difficult to read in my opinion. It would probably be worth it, mostly because you also get to use draw_quad() that way. We could also consider making the "backbuffer" and "backbuffer_rtv" members arrays. For the moment it's probably more important that it matches the d3d10core test though. > > Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> If you put the Signed-off-by here, it won't be put in the commit message.

2 2

Re: [PATCH 1/2] windowscodecs: Stub IWICMetadataQueryReader
by Vincent Povirk March 14, 2016

March 14, 2016

You're referencing the block reader in MetadataQueryReader_CreateInstance but not releasing it in mqr_Release.

1 0

Re: [PATCH 1/8] wined3d: Introduce wined3d_rendertarget_view_clear().
by Henri Verbeet March 14, 2016

March 14, 2016

On 14 March 2016 at 00:03, Józef Kucia <jkucia(a)codeweavers.com> wrote: > Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> > --- > dlls/wined3d/device.c | 18 +----------------- > dlls/wined3d/surface.c | 22 ++-------------------- > dlls/wined3d/view.c | 40 ++++++++++++++++++++++++++++++++++++++++ > dlls/wined3d/wined3d_private.h | 3 +++ > 4 files changed, 46 insertions(+), 37 deletions(-) > I'm not sure how I feel about this change. There doesn't seem to be a particularly compelling reason to change this, although I suppose there's no strong reason not to either. I guess it depends on where you're going with this.

2 2

Re: [PATCH 2/2] ole32: Fix refcounting of IObjContext per-thread instance
by Huw Davies March 14, 2016

March 14, 2016

On Mon, Mar 14, 2016 at 08:10:00AM +0300, Nikolay Sivov wrote: > Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> > --- > dlls/ole32/compobj.c | 57 +++++++++++++++++++--------------------------- > dlls/ole32/tests/compobj.c | 46 ++++++++++++++++++++++--------------- > 2 files changed, 51 insertions(+), 52 deletions(-) > > diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c > index b095aeb..1081f98 100644 > --- a/dlls/ole32/compobj.c > +++ b/dlls/ole32/compobj.c > @@ -4683,10 +4683,13 @@ static ULONG Context_AddRef(Context *This) > > static ULONG Context_Release(Context *This) > { > - ULONG refs = InterlockedDecrement(&This->refs); > - if (!refs) > + if (!This->refs) > + { Since this is non-standard it needs a comment. Probably just referring to the constructor below. > HeapFree(GetProcessHeap(), 0, This); > - return refs; > + return 0; > + } > + > + return InterlockedDecrement(&This->refs); > } > > static HRESULT WINAPI Context_CTI_QueryInterface(IComThreadingInfo *iface, REFIID riid, LPVOID *ppv) > @@ -4924,39 +4927,19 @@ static const IObjContextVtbl Context_Object_Vtbl = > */ > HRESULT WINAPI CoGetObjectContext(REFIID riid, void **ppv) > { > - APARTMENT *apt = COM_CurrentApt(); > - Context *context; > + IObjContext *context; > HRESULT hr; > > TRACE("(%s, %p)\n", debugstr_guid(riid), ppv); > > *ppv = NULL; > - if (!apt) > - { > - if (!(apt = apartment_find_multi_threaded())) > - { > - ERR("apartment not initialised\n"); > - return CO_E_NOTINITIALIZED; > - } > - apartment_release(apt); > - } > - > - context = HeapAlloc(GetProcessHeap(), 0, sizeof(*context)); > - if (!context) > - return E_OUTOFMEMORY; > - > - context->IComThreadingInfo_iface.lpVtbl = &Context_Threading_Vtbl; > - context->IContextCallback_iface.lpVtbl = &Context_Callback_Vtbl; > - context->IObjContext_iface.lpVtbl = &Context_Object_Vtbl; > - context->refs = 1; > - > - hr = IComThreadingInfo_QueryInterface(&context->IComThreadingInfo_iface, riid, ppv); > - IComThreadingInfo_Release(&context->IComThreadingInfo_iface); > + hr = CoGetContextToken((ULONG_PTR*)&context); > + if (FAILED(hr)) > + return hr; > > - return hr; > + return IObjContext_QueryInterface(context, riid, ppv); > } > > - > /*********************************************************************** > * CoGetContextToken [OLE32.@] > */ > @@ -4985,16 +4968,22 @@ HRESULT WINAPI CoGetContextToken( ULONG_PTR *token ) > > if (!info->context_token) > { > - HRESULT hr; > - IObjContext *ctx; > + Context *context; > + > + context = HeapAlloc(GetProcessHeap(), 0, sizeof(*context)); > + if (!context) > + return E_OUTOFMEMORY; > + > + context->IComThreadingInfo_iface.lpVtbl = &Context_Threading_Vtbl; > + context->IContextCallback_iface.lpVtbl = &Context_Callback_Vtbl; > + context->IObjContext_iface.lpVtbl = &Context_Object_Vtbl; Add a comment here stating that context_token does not take a ref. > + context->refs = 0; > > - hr = CoGetObjectContext(&IID_IObjContext, (void **)&ctx); > - if (FAILED(hr)) return hr; > - info->context_token = ctx; > + info->context_token = &context->IObjContext_iface; > } > > *token = (ULONG_PTR)info->context_token; > - TRACE("apt->context_token=%p\n", info->context_token); > + TRACE("context_token=%p\n", info->context_token); > > return S_OK; > } I'm wondering whether this patch could be split since it's doing rather more than fixing a ref counting issue. Could you move the constructor to CoGetContextToken first and then fix the refs, or would that mess up the tests? Huw.

2 2

Re: [PATCH 6/8] d3d10core/tests: Add test for ClearDepthStencilView().
by Henri Verbeet March 14, 2016

March 14, 2016

On 14 March 2016 at 00:03, Józef Kucia <jkucia(a)codeweavers.com> wrote: > +static float get_readback_float(struct texture_readback *rb, unsigned int x, unsigned int y) > +{ > + return rb->texture > + ? ((float *)rb->mapped_texture.pData)[rb->mapped_texture.RowPitch * y / sizeof(float) + x] : NAN; > +} Can the texture ever legitimately be NULL?

2 1

Re: [PATCH 2/8] wined3d: Implement depth clear in wined3d_device_clear_rendertarget_view().
by Henri Verbeet March 14, 2016

March 14, 2016

On 14 March 2016 at 00:03, Józef Kucia <jkucia(a)codeweavers.com> wrote: > @@ -4100,7 +4110,13 @@ HRESULT CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *devi > rect = &r; > } > > - return wined3d_rendertarget_view_clear(view, rect, WINED3DCLEAR_TARGET, color, 0.0f, 0); > + if (!(flags & WINED3DCLEAR_TARGET) == !(flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL))) > + { > + ERR("Color and depth/stencil clears are mutually exclusive.\n"); > + return WINED3DERR_INVALIDCALL; > + } You may not need this. The documentation suggests depth/stencil views can only be created on depth formats, and I'd be inclined to believe it. IIRC it doesn't say much about creating rendertarget views on depth/stencil formats, but I wouldn't be all that surprised if that's not allowed either. In that case you'd just need to check the flags against the format capabilities. > +const char *debug_color(const struct wined3d_color *color) > +{ > + if (!color) > + return "(null)"; > + return wine_dbg_sprintf("{%.8e, %.8e, %.8e, %.8e}", > + color->r, color->g, color->b, color->a); > +} This is fine, but might as well be a separate change. There are a couple of other places where we trace wined3d_color values as well, the easiest way to find them is probably to look for the format string.

2 1

Re: d3drm: Use debugstr_a to print a string that can be NULL.
by Henri Verbeet March 14, 2016

March 14, 2016

On 14 March 2016 at 10:36, Michael Stefaniuc <mstefani(a)redhat.de> wrote: > - TRACE("Mesh name is '%s'\n", This->name ? This->name : ""); > + TRACE("Mesh name is '%s'\n", debugstr_a(This->name)); You should remove the quotes, since debugstr_a() also adds quotes. Note that just being external data is enough reason to use debugstr_a(), it doesn't matter much if it can be NULL or not in that regard.

2 1

Re: [PATCH] Read operation's type explicitly as QStringList
by Nikolay Sivov March 14, 2016

March 14, 2016

On 13.03.2016 19:12, Łukasz Wojniłowicz wrote: > Fixes bug #360129 > --- > kmymoney/plugins/csvimport/investprocessing.cpp | 22 ++++++++-------------- > 1 file changed, 8 insertions(+), 14 deletions(-) > Hi, Łukasz. Just pointing out so this patch is not lost by accident - wrong mailing list. You aimed for https://mail.kde.org/pipermail/kmymoney-devel/ probably or some list next to it.

1 0

Re: [PATCH] kernel32/tests: Skip ResolveDelayLoadedAPI tests on Win10+
by Nikolay Sivov March 13, 2016

March 13, 2016

On 13.03.2016 19:42, André Hentschel wrote: > Signed-off-by: André Hentschel <nerv(a)dawncrow.de> > --- > dlls/kernel32/tests/loader.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c > index c35cf25..30cc2e4 100644 > --- a/dlls/kernel32/tests/loader.c > +++ b/dlls/kernel32/tests/loader.c > @@ -2728,6 +2728,11 @@ static void test_ResolveDelayLoadedAPI(void) > > cb_count = 0; > ret = pResolveDelayLoadedAPI(hlib, delaydir, failuredllhook, NULL, &itda[i], 0); > + if (!ret && td[i].succeeds) > + { > + win_skip("Skipping broken ResolveDelayLoadedAPI implementation\n"); > + goto cleanup; > + } > if (td[i].succeeds) > { > ok(ret != NULL, "Test %u: ResolveDelayLoadedAPI failed\n", i); > @@ -2745,6 +2750,7 @@ static void test_ResolveDelayLoadedAPI(void) > delaydir++; > } > > +cleanup: > FreeLibrary(hlib); > trace("deleting %s\n", dll_name); > DeleteFileA(dll_name); > So what's exactly wrong with it on Win10? Silencing failures does not seem useful if actual issue was not investigated.

1 0

Re: [PATCH] d3d9/tests Accept Windows 10 result
by Stefan Dösinger March 13, 2016

March 13, 2016

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 2016-03-13 um 17:04 schrieb Detlef Riekenberg: > Windows 10 is returning D3D_OK, so the recent behavior seems to be > better as before. That's why I used D3D_OK as expected result, > marked the old S_PRESENT_MODE_CHANGED as broken and removed the > wine_todo I think the new behavior is more broken than the old one. "It needs a present call to pick up a mode change" - If my memory serves me right the issue was that CheckDeviceState would incorrectly return D3D_OK instead of S_PRESENT_MODE_CHANGED when the mode was changed. Now it's always wrong, even with a preceding Present call. Of course in light of the Windows 10 results we may have to redefine "wrong". -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJW5aMEAAoJEN0/YqbEcdMweH8P/2OQymbb9EhNw4YqaXw0lcVN ozmH/7MYrxM4V1zzk+1+7XBR7nlIwDFRBGYw6LaZCiCmJYDfb1CTpYbSoVokHzQo UW2aCJCVRNWnZ5L72aZ12AoFq5sIuUX0FCAWhnpT4rNU7/bv35T/Zz0h439vn4RN +USZIHayRpmsJbhSbSn9VejSyin7GhBZ3VD7Qcd+7MqBxqOATX5p62cgFg+KUPkN Wi1HelDEHNsybHE4U60zYcZ2uxZxh7alfP6FjOtffOOxYilmG5eGEpGQX/dRIIv7 wxAfkjy/lgZqV9T4kEVyVO4tiwf9Vj1ccijkBNOttP7cFNGA4IM5W/urSWxL0uPd QEzP3QUv03NPN9Mtgq7K+DOyZmMUeedU+dHcCTwPJj/GTuXGxs2KHpLURXiAWXjD they7Iog2TEBFWuDskx58RHJyevbzKfWqfeM6/nJew5ter19W62Y1Sn01hfI0Ym0 aaTdzj+/tnf5pdc5Mgu6AtSRbApziwtYdfn4xGyEImw7J4pu7BnSmzHk8FMowtHm Dy2+GKE0FlmpAExwo0FAY2z6fCvMtIQMYzinU95LYaWvIggjsUo3wII3PxLtjKY0 8gXqBk+6WUUeDrAKqRqdkMCdzLBsVrlmxlj37KhfmPNCvG9gAlnMRegNW9eZkE2F aqvHGFSUrJzmk9CPtwtt =+25F -----END PGP SIGNATURE-----

1 0

Re: [PATCH] kernel32/tests: Skip ResolveDelayLoadedAPI tests on Win10+
by Marvin March 13, 2016

March 13, 2016

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=21399 Your paranoid android. === w864 (32 bit loader) === loader.c:1820: Test failed: expected STILL_ACTIVE, got 195 loader.c:1855: Test failed: expected STILL_ACTIVE, got 195 === w1064 (32 bit loader) === loader.c:1820: Test failed: expected STILL_ACTIVE, got 195 loader.c:1855: Test failed: expected STILL_ACTIVE, got 195 === w864 (64 bit loader) === loader.c:1820: Test failed: expected STILL_ACTIVE, got 195 loader.c:1855: Test failed: expected STILL_ACTIVE, got 195 === w1064 (64 bit loader) === loader.c:1820: Test failed: expected STILL_ACTIVE, got 195 loader.c:1855: Test failed: expected STILL_ACTIVE, got 195

1 0

Builtin DLL View
by Keno Fischer March 12, 2016

March 12, 2016

Hello everyone, out of curiosity, I was tracking down why a piece of code in julia [1] threw an assertion when running under wine, but not on windows proper. The problem in this piece of code turned out to be that VirtualQuery is claiming a region of memory is free, when it is actually occupied by part of one of the builtin dlls. If I understand correctly what's happening here is that builtin dlls are regular shared objects on the host system, and get loaded as such, but contain the respective windows dll inside of them (modulo header, which gets created in `map_dll` by mapping over a couple of pages in the middle). Later, after going through the load callback, `virtual_create_builtin_view` records the appropriate information in the view map. However, it only records what it knows about the inner dll, not the shared object wrapper around it. I was thinking of preparing a patch, but I am not sure how to go about it. Options I could see: - Expand the mapping in `virtual_create_builtin_view`. This seems most straightforward, but I don't quite know what the proper way to pass this information through to here is. Or maybe we can parse the wrapper's header right in the function, if we assume that it's base will always be 64K before the PE header base? - Unmap the parts of the shared library that do not constitute the inner dll. I would imagine that at some point wine stops relying on the native dynamic linker, at which point it would probably be safe to just unmap the extra pages such that view agrees with what is actually mapped. I'd be happy to put together a patch, but I'll need some guidance on how best to do this, since I haven't looked at the Wine codebase before today. [1] https://github.com/JuliaLang/julia/blob/01dd5ec0b25fc5fa8cf1fbae6bb00ef5874…

1 0