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

Re: [2/2] wined3d: Take abs() of vertex z coordinate as FFP fog coordinate (try 7)
by Stefan Dösinger 19 Nov '14

19 Nov '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-11-14 22:40, schrieb Joachim Priesner: > Take the absolute value of vertex.z as fog coordinate instead of > just the z coordinate. This fixes e.g. fog for applications that > use right-handed projection matrices. > > Also test the clamp behavior of the oFog vertex shader output. Fwiw, the start / end tests look good to me, and the results match what I expected. However I think Henri still disagrees with this patch. Henri, I'd appreciate if you would say what you want. Without that I can offer Joachim only guesswork. My guess is that the test is too complex. There are some parts that are technically not required to demonstrate the correctness of the abs(), but I see some value in the additional checks: *) The "interrupted" quad with extra vertices at z = 0. It shows that the fully fogged other quad is not a result of the interpolation failing entirely and producing INF or NaN. *) The foggy shader test: It shows how negative values coming from vertex shaders are treated. It's just logical to test this considering the behavior of the fixed function pipeline. *) The manual fog coord / unfogged shader tests: Those could be removed I guess, although at least the manual fog coord test shows that there isn't some unexpected interference with negative depth values. Joachim, I can offer you that I try to simplify those tests. If you're still motivated to work on this I'm happy to leave this up to you though. Some ideas for simplifying the test, but I don't know yet if they'll work: *) Split the shader and fixed function tests into separate tests. *) Remove the interpolation tests from the fixed function tests. fog_interpolation_test shows that the fog equation is evaluated in the vertex pipeline in the affected cases, and the fogstart = -1, fogend = 0 test shows that the abs() happens before the fog equation. So I think removing this part of the test for the fixed function part is safe. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUbK/nAAoJEN0/YqbEcdMworwP/2OytnoHiSrHWoFK9YPUvEGQ XIyIDZhe/PoMKaBGRdgqFWd4EjoVr9haUmCcPWb1BK/0R2MVSTIK0TS88RlotiMx ZIBcJJWCiiBvhNrydAW5Qqg/80h5UOgaumkWdi2qF4SfkvP/A3jLXvulXZaOU88k rmnlWXxiQun0EIMzShzms0OZmKxmyKkhm84CXAAr3hIh3k9anXVsr0Nsgi2UXTBl ey55rNaE/NBZdNMP/in/5kEq76f0WA7bx1CV2zfCds5p34thQPQLjuvYQ0mqz3Qg zo24W/J52m70W1GmqD/J2+4g5XPO2Gf3xIjV0NyJW988hsCoHIyQHFXZbRkZQpbQ ULdhBq6VgW6O9d1f9H1hy18HxVwlGPFjnu7gniMTWqtBLzyC3b6pppSqQfg1zRhj X/Njp/JBhSUWe8is4sP2R7sHl2fqMi5ROWQyXVpca/rUdoiu6dAH8zYo3IqepGDW P1RoSiwQXXDEh0tV/gzW7pVnk7nNRtcL6el0R5C7aqrytWi3xLXYfdsug6sluKK6 onN/Iz0PpBDsokaTFUMua1JgZ8fx7+Av/S/2xfPvMpSFyrp+q/Q4fw5HdQEKfCIb +JtA03sG0ZfKLjCWL3JRW2kt3G3TxQTOdaJ+Dic5S50xMjs04Ze2Ie3BzbY4FEn0 ZqXciJ+kIVCN4+LD5aJp =RHD+ -----END PGP SIGNATURE-----

1 0

Re: [PATCH 6/6] wined3d: Restore the display mode on focus change.
by Henri Verbeet 19 Nov '14

19 Nov '14

On 18 November 2014 21:26, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > + if(!EnumDisplaySettingsW(adapter->DeviceName, ENUM_REGISTRY_SETTINGS, &new_mode)) Formatting. > + else if (current_mode.dmPelsWidth == new_mode.dmPelsWidth > + && current_mode.dmPelsHeight == new_mode.dmPelsHeight > + && current_mode.dmBitsPerPel == new_mode.dmBitsPerPel > + && (current_mode.dmDisplayFrequency == new_mode.dmDisplayFrequency > + || !(new_mode.dmFields & DM_DISPLAYFREQUENCY)) > + && (current_mode.u2.dmDisplayFlags == new_mode.u2.dmDisplayFlags > + || new_mode.dmFields & DM_DISPLAYFLAGS)) Shouldn't that be "!(new_mode.dmFields & DM_DISPLAYFLAGS)"? > - struct wined3d_display_mode original_mode; > + struct wined3d_display_mode original_mode, d3d_mode; I might have just gone for "mode", but I don't care strongly.

1 0

Re: [PATCH 1/2] ole32/tests: Release() doesn't return HRESULT code
by Marvin 19 Nov '14

19 Nov '14

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=10342 Your paranoid android. === wvistau64 (32 bit moniker) === moniker: unhandled exception c0000005 at 00425FC9 === w2008s64 (32 bit moniker) === moniker: unhandled exception c0000005 at 00425FC9 === w7u (32 bit moniker) === moniker: unhandled exception c0000005 at 00425FC9 === w8 (32 bit moniker) === moniker: unhandled exception c0000005 at 00425FC9 === wvistau64 (64 bit moniker) === moniker: unhandled exception c0000005 at 00000000004209EA === w2008s64 (64 bit moniker) === moniker: unhandled exception c0000005 at 00000000004209EA

2 1

Re: ole32: Simplify a function by removing no-op code (PVS-Studio).
by Sebastian Lackner 19 Nov '14

19 Nov '14

On 19.11.2014 09:26, Michael Stefaniuc wrote: > MSHLFLAGS_NORMAL is 0. > --- > dlls/ole32/stubmanager.c | 19 +------------------ > 1 file changed, 1 insertion(+), 18 deletions(-) > > diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c > index 96d710d..1aca924 100644 > --- a/dlls/ole32/stubmanager.c > +++ b/dlls/ole32/stubmanager.c > @@ -536,7 +536,6 @@ HRESULT ipid_get_dispatch_params(const IPID *ipid, APARTMENT **stub_apt, > /* returns TRUE if it is possible to unmarshal, FALSE otherwise. */ > BOOL stub_manager_notify_unmarshal(struct stub_manager *m, const IPID *ipid) > { > - BOOL ret = TRUE; > struct ifstub *ifstub; > > if (!(ifstub = stub_manager_ipid_to_ifstub(m, ipid))) > @@ -545,23 +544,7 @@ BOOL stub_manager_notify_unmarshal(struct stub_manager *m, const IPID *ipid) > return FALSE; > } > > - EnterCriticalSection(&m->lock); > - > - /* track normal marshals so we can enforce rules whilst in-process */ > - if (ifstub->flags & MSHLFLAGS_NORMAL) > - { > - if (m->norm_refs) > - m->norm_refs--; > - else > - { > - ERR("attempted invalid normal unmarshal, norm_refs is zero\n"); > - ret = FALSE; > - } > - } > - > - LeaveCriticalSection(&m->lock); > - > - return ret; > + return TRUE; > } > > /* handles refcounting for CoReleaseMarshalData */ > Although logically correct, I am not sure if this is what it should look like. In ole32/marshal for example there is also: --- snip --- if (flags & MSHLFLAGS_TABLEWEAK) TRACE(" MSHLFLAGS_TABLEWEAK"); if (!(flags & (MSHLFLAGS_TABLESTRONG|MSHLFLAGS_TABLEWEAK))) TRACE(" MSHLFLAGS_NORMAL"); if (flags & MSHLFLAGS_NOPING) TRACE(" MSHLFLAGS_NOPING"); --- snip --- This could probably mean that fixing the if condition is a more correct solution, but I don't know that part well enough.

2 1

Re: [PATCH 1/2] mmdevapi: allow GetPropValue function in audio drivers
by Nikolay Sivov 18 Nov '14

18 Nov '14

On 18.11.2014 20:59, Mark Harmstone wrote: > + if (SUCCEEDED(hr)) > + { > + MMDevice_SetPropValue(id, flow, prop, &pv); > + > + if (pv.vt == VT_LPWSTR) > + HeapFree(GetProcessHeap(), 0, pv.u.pwszVal); > + } > + out->vt = VT_LPWSTR; > + out->u.pwszVal = HeapAlloc(GetProcessHeap(), 0, 256 * sizeof(WCHAR)); This is a wrong way dealing with PROPVARIANT, you need to use PropVariantClear() and InitPropVariantFromString() - PROPVARIANT implies CoTaskMemAlloc/CoTaskMemFree memory management.

1 0

Re: [PATCH 6/6] wined3d: Restore the display mode on focus change.
by Marvin 18 Nov '14

18 Nov '14

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=10336 Your paranoid android. === w8 (32 bit device) === device.c:1181: Test failed: TestCooperativeLevel failed, hr 0x88760868. device.c:1226: Test failed: Reset failed, hr 0x88760868. device.c:1228: Test failed: TestCooperativeLevel failed, hr 0x88760869. device.c:1232: Test failed: Got unexpected value 0 for D3DRS_LIGHTING. device.c:1239: Test failed: D3DVIEWPORT->X = 10, expected 0. device.c:1240: Test failed: D3DVIEWPORT->Y = 20, expected 0. device.c:1241: Test failed: D3DVIEWPORT->Width = 400, expected 800. device.c:1242: Test failed: D3DVIEWPORT->Height = 300, expected 600. device.c:1243: Test failed: D3DVIEWPORT->MinZ = 2.00000003e-001, expected 0. device.c:1244: Test failed: D3DVIEWPORT->MaxZ = 3.00000012e-001, expected 1. device.c:1249: Test failed: Screen width is 640, expected 800. device.c:1250: Test failed: Screen height is 480, expected 600. device.c:1256: Test failed: Back buffer width is 640, expected 800. device.c:1258: Test failed: Back buffer height is 480, expected 600. device.c:1288: Test failed: Screen width is 640, expected 1024. device.c:1289: Test failed: Screen height is 480, expected 768. device.c:2446: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2451: Test failed: The focus window is active. device.c:2459: Test failed: Got unexpected hr 0x88760869. device.c:2465: Test failed: Got unexpect screen size 800x600. device.c:2485: Test failed: Got unexpect screen size 800x600. device.c:2621: Test failed: Expected foreground window 000B00CA, got 0002004C. device.c:2997: Test failed: Expected device window style 0x14cf0000, got 0x4cf0000. device.c:3001: Test failed: Expected device window extended style 0x108, got 0x100. device.c:3024: Test failed: Failed to reset device, hr 0x88760868. device.c:3028: Test failed: Expected device window style 0x14cf0000, got 0x4cf0000. device.c:3032: Test failed: Expected device window extended style 0x108, got 0x100. device.c:3046: Test failed: Failed to set foreground window. device.c:3050: Test failed: Expected device window style 0x34cf0000, got 0x4cf0000. device.c:3054: Test failed: Expected device window extended style 0x108, got 0x100.

1 0

Re: [PATCH 4/6] d3d8/tests: Test mode restoration on focus loss.
by Marvin 18 Nov '14

18 Nov '14

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=10334 Your paranoid android. === w8 (32 bit device) === device.c:1181: Test failed: TestCooperativeLevel failed, hr 0x88760868. device.c:1226: Test failed: Reset failed, hr 0x88760868. device.c:1228: Test failed: TestCooperativeLevel failed, hr 0x88760869. device.c:1232: Test failed: Got unexpected value 0 for D3DRS_LIGHTING. device.c:1239: Test failed: D3DVIEWPORT->X = 10, expected 0. device.c:1240: Test failed: D3DVIEWPORT->Y = 20, expected 0. device.c:1241: Test failed: D3DVIEWPORT->Width = 400, expected 800. device.c:1242: Test failed: D3DVIEWPORT->Height = 300, expected 600. device.c:1243: Test failed: D3DVIEWPORT->MinZ = 2.00000003e-001, expected 0. device.c:1244: Test failed: D3DVIEWPORT->MaxZ = 3.00000012e-001, expected 1. device.c:1249: Test failed: Screen width is 640, expected 800. device.c:1250: Test failed: Screen height is 480, expected 600. device.c:1256: Test failed: Back buffer width is 640, expected 800. device.c:1258: Test failed: Back buffer height is 480, expected 600. device.c:1288: Test failed: Screen width is 640, expected 1024. device.c:1289: Test failed: Screen height is 480, expected 768. device.c:2446: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2451: Test failed: The focus window is active. device.c:2459: Test failed: Got unexpected hr 0x88760869. device.c:2465: Test failed: Got unexpect screen size 800x600. device.c:2485: Test failed: Got unexpect screen size 800x600. device.c:2621: Test failed: Expected foreground window 000B00CA, got 0002004C. device.c:2997: Test failed: Expected device window style 0x14cf0000, got 0x4cf0000. device.c:3001: Test failed: Expected device window extended style 0x108, got 0x100. device.c:3024: Test failed: Failed to reset device, hr 0x88760868. device.c:3028: Test failed: Expected device window style 0x14cf0000, got 0x4cf0000. device.c:3032: Test failed: Expected device window extended style 0x108, got 0x100. device.c:3046: Test failed: Failed to set foreground window. device.c:3050: Test failed: Expected device window style 0x34cf0000, got 0x4cf0000. device.c:3054: Test failed: Expected device window extended style 0x108, got 0x100.

1 0

Re: [PATCH 2/2] winealsa: implement GetPropValue and return device path
by Nikolay Sivov 18 Nov '14

18 Nov '14

On 18.11.2014 20:59, Mark Harmstone wrote: > --- a/dlls/winealsa.drv/Makefile.in > +++ b/dlls/winealsa.drv/Makefile.in > @@ -1,5 +1,5 @@ > MODULE = winealsa.drv > -IMPORTS = uuid ole32 advapi32 > +IMPORTS = uuid ole32 advapi32 user32 > DELAYIMPORTS = winmm > EXTRALIBS = $(ALSA_LIBS) If you need this only for wsprintfW() you could try sprintfW() from include/wine/unicode.h.

1 0

Re: [PATCH 1/2] mshtml: Added support for IHTMLFrameBase::put_src call on detached element.
by Marvin 18 Nov '14

18 Nov '14

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=10324 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: [PATCH 5/6] ddraw/tests: Test messages on focus loss (v2).
by Henri Verbeet 18 Nov '14

18 Nov '14

On 17 November 2014 21:17, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > @@ -2291,6 +2320,18 @@ static void test_coop_level_mode_set(void) > user32_rect.left, user32_rect.top, user32_rect.right, user32_rect.bottom, > r.left, r.top, r.right, r.bottom); > > + expect_messages = exclusive_focus_loss_messages; > + SetForegroundWindow(GetDesktopWindow()); > + ok(!expect_messages->message, "Expected message %#x, but didn't receive it.\n", expect_messages->message); This fails for me on Windows: ddraw1.c:2295: Test failed: Expected message 0x46, but didn't receive it.

1 0