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