September 2015 - Wine-devel

Re: [PATCH 2/2] winex11.drv: Implement FlashWindow with UrgencyHint flag.
by Dmitry Timoshkov 16 Sep '15

16 Sep '15

Jactry Zeng <jzeng(a)codeweavers.com> wrote: > This patch only set UrgencyHint flag when the window is minimized. > Because X11 only define UrgencyHint, the specific UI effect is > implemented by WM/DE. Different WM/DE may have different UI effect > which is quite different from Windows. Probably FlashWindow should be implemented with _NET_WM_STATE_DEMANDS_ATTENTION instead. -- Dmitry.

2 1

disabling wow64, testing 64-bit wine-mono P/invoke
by Hin-Tak Leung 16 Sep '15

16 Sep '15

Hi, I am not having any luck trying to disable wow64 temporarily to test 64-bit wine-mono P/invoke . I tried moving syswow64, removing 32-bit wine, moving wow32.dll, etc. It either insists on p/invoking 32-bit dlls, or not recognizing the .net assembly at all. What I like to do is to test a pure 64-bit code-path - starting with neutral .net assembly, p/invoke to 64-bit dll's. This is possible on windows - in fact cmd.exe on win 8 64-bit will refuse to p/invoke to 32-bit dll's. Is there any way of doing this with 64-bit wine and 64-bit wine-mono? Hin-Tak

2 1

Re: [PATCH 3/4] xaudio2: Call OnStreamEnd callback
by Marvin 16 Sep '15

16 Sep '15

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=16733 Your paranoid android. === w864 (64 bit xaudio2) === xaudio2: unhandled exception c0000005 at 00007FFB6EDD4B7D === w1064 (64 bit xaudio2) === xaudio2: unhandled exception c0000005 at 00007FFC549A4B7D

1 0

Re: [PATCH] mshtml: Fixed tests on some Windows versions.
by Marvin 16 Sep '15

16 Sep '15

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=16726 Your paranoid android. === w1064 (32 bit htmldoc) === htmldoc.c:3003: Test failed: unexpected command 183 htmldoc.c:3555: Test failed: unexpected call IsErrorUrl htmldoc.c:3003: Test failed: unexpected command 101 htmldoc.c:3003: Test failed: unexpected command 101 htmldoc.c:3003: Test failed: unexpected command 101 htmldoc.c:3003: Test failed: unexpected command 101 htmldoc.c:3003: Test failed: unexpected command 101 htmldoc.c:3003: Test failed: unexpected command 101 htmldoc.c:3003: Test failed: unexpected command 101 htmldoc.c:3003: Test failed: unexpected command 101 htmldoc.c:3003: Test failed: unexpected command 101 htmldoc.c:3003: Test failed: unexpected command 101 htmldoc.c:3003: Test failed: unexpected command 101 htmldoc.c:3003: Test failed: unexpected command 101 htmldoc.c:3003: Test failed: unexpected command 101 htmldoc.c:875: Test failed: unexpected call htmldoc.c:875: Test failed: unexpected call htmldoc.c:3003: Test failed: unexpected command 101 htmldoc.c:2876: Test failed: unexpected state L"uninitialized", expected 4 htmldoc.c:2876: Test failed: VT_I4(out)=0, expected 4 htmldoc.c:3003: Test failed: unexpected command 101 htmldoc.c:3003: Test failed: unexpected command 101 htmldoc.c:3003: Test failed: unexpected command 101 htmldoc.c:3003: Test failed: unexpected command 132 htmldoc.c:3003: Test failed: unexpected command 101 htmldoc.c:3003: Test failed: unexpected command 101 htmldoc.c:875: Test failed: unexpected call htmldoc.c:3003: Test failed: unexpected command 101 htmldoc.c:3003: Test failed: unexpected command 101 htmldoc.c:3003: Test failed: unexpected command 132 === w1064 (64 bit htmldoc) === htmldoc.c:3003: Test failed: unexpected command 183 htmldoc.c:3555: Test failed: unexpected call IsErrorUrl htmldoc.c:3003: Test failed: unexpected command 101 htmldoc.c:3003: Test failed: unexpected command 101 htmldoc.c:3003: Test failed: unexpected command 101 htmldoc.c:3003: Test failed: unexpected command 101 htmldoc.c:3003: Test failed: unexpected command 101 htmldoc.c:3003: Test failed: unexpected command 101 htmldoc.c:3003: Test failed: unexpected command 101 htmldoc.c:3003: Test failed: unexpected command 101 htmldoc.c:3003: Test failed: unexpected command 101 htmldoc.c:3003: Test failed: unexpected command 101 htmldoc.c:3003: Test failed: unexpected command 101 htmldoc.c:3003: Test failed: unexpected command 101 htmldoc.c:3003: Test failed: unexpected command 101 htmldoc.c:875: Test failed: unexpected call htmldoc.c:875: Test failed: unexpected call htmldoc.c:3003: Test failed: unexpected command 101 htmldoc.c:2876: Test failed: unexpected state L"uninitialized", expected 4 htmldoc.c:2876: Test failed: VT_I4(out)=0, expected 4 htmldoc.c:3003: Test failed: unexpected command 101 htmldoc.c:3003: Test failed: unexpected command 101 htmldoc.c:3003: Test failed: unexpected command 101 htmldoc.c:3003: Test failed: unexpected command 132 htmldoc.c:3003: Test failed: unexpected command 101 htmldoc.c:3003: Test failed: unexpected command 101 htmldoc.c:875: Test failed: unexpected call htmldoc.c:3003: Test failed: unexpected command 101 htmldoc.c:3003: Test failed: unexpected command 101 htmldoc.c:3003: Test failed: unexpected command 132

1 0

Re: ieframe: Fixed tests on some VMs.
by Marvin 16 Sep '15

16 Sep '15

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=16725 Your paranoid android. === w2000pro (32 bit webbrowser) === webbrowser.c:2975: Test failed: expected Invoke_COMMANDSTATECHANGE_NAVIGATEBACK_FALSE webbrowser.c:2980: Test failed: expected Invoke_COMMANDSTATECHANGE_NAVIGATEFORWARD_FALSE webbrowser.c:2975: Test failed: expected Invoke_COMMANDSTATECHANGE_NAVIGATEBACK_FALSE webbrowser.c:2980: Test failed: expected Invoke_COMMANDSTATECHANGE_NAVIGATEFORWARD_FALSE webbrowser.c:2975: Test failed: expected Invoke_COMMANDSTATECHANGE_NAVIGATEBACK_FALSE webbrowser.c:2980: Test failed: expected Invoke_COMMANDSTATECHANGE_NAVIGATEFORWARD_FALSE === w1064 (32 bit webbrowser) === webbrowser.c:469: Test failed: unexpected nCmdID 182 webbrowser.c:469: Test failed: unexpected nCmdID 63 webbrowser.c:469: Test failed: unexpected nCmdID 182 webbrowser.c:469: Test failed: unexpected nCmdID 63 webbrowser.c:469: Test failed: unexpected nCmdID 182 webbrowser.c:469: Test failed: unexpected nCmdID 63 webbrowser.c:469: Test failed: unexpected nCmdID 182 webbrowser.c:469: Test failed: unexpected nCmdID 137 webbrowser.c:469: Test failed: unexpected nCmdID 182 webbrowser.c:469: Test failed: unexpected nCmdID 137 webbrowser.c:469: Test failed: unexpected nCmdID 182 webbrowser.c:469: Test failed: unexpected nCmdID 63 webbrowser.c:469: Test failed: unexpected nCmdID 182 webbrowser.c:469: Test failed: unexpected nCmdID 132 webbrowser.c:469: Test failed: unexpected nCmdID 182 webbrowser.c:469: Test failed: unexpected nCmdID 132 webbrowser.c:469: Test failed: unexpected nCmdID 182 webbrowser.c:469: Test failed: unexpected nCmdID 132 webbrowser.c:469: Test failed: unexpected nCmdID 182 webbrowser.c:469: Test failed: unexpected nCmdID 132 webbrowser.c:469: Test failed: unexpected nCmdID 182 webbrowser.c:469: Test failed: unexpected nCmdID 182 webbrowser.c:469: Test failed: unexpected nCmdID 63 webbrowser.c:469: Test failed: unexpected nCmdID 182 webbrowser.c:469: Test failed: unexpected nCmdID 63 webbrowser.c:469: Test failed: unexpected nCmdID 182 webbrowser.c:469: Test failed: unexpected nCmdID 63 webbrowser.c:469: Test failed: unexpected nCmdID 182 === w1064 (64 bit webbrowser) === webbrowser.c:469: Test failed: unexpected nCmdID 182 webbrowser.c:469: Test failed: unexpected nCmdID 63 webbrowser.c:469: Test failed: unexpected nCmdID 182 webbrowser.c:469: Test failed: unexpected nCmdID 63 webbrowser.c:469: Test failed: unexpected nCmdID 182 webbrowser.c:469: Test failed: unexpected nCmdID 63 webbrowser.c:469: Test failed: unexpected nCmdID 182 webbrowser.c:469: Test failed: unexpected nCmdID 137 webbrowser.c:469: Test failed: unexpected nCmdID 182 webbrowser.c:469: Test failed: unexpected nCmdID 137 webbrowser.c:469: Test failed: unexpected nCmdID 182 webbrowser.c:469: Test failed: unexpected nCmdID 63 webbrowser.c:469: Test failed: unexpected nCmdID 182 webbrowser.c:469: Test failed: unexpected nCmdID 132 webbrowser.c:469: Test failed: unexpected nCmdID 182 webbrowser.c:469: Test failed: unexpected nCmdID 132 webbrowser.c:469: Test failed: unexpected nCmdID 182 webbrowser.c:469: Test failed: unexpected nCmdID 132 webbrowser.c:469: Test failed: unexpected nCmdID 182 webbrowser.c:469: Test failed: unexpected nCmdID 132 webbrowser.c:469: Test failed: unexpected nCmdID 182 webbrowser.c:469: Test failed: unexpected nCmdID 182 webbrowser.c:469: Test failed: unexpected nCmdID 63 webbrowser.c:469: Test failed: unexpected nCmdID 182 webbrowser.c:469: Test failed: unexpected nCmdID 63 webbrowser.c:469: Test failed: unexpected nCmdID 182 webbrowser.c:469: Test failed: unexpected nCmdID 63 webbrowser.c:469: Test failed: unexpected nCmdID 182

1 0

Re: [PATCH 7/7] wined3d: remove wined3d_surface_preload
by Henri Verbeet 15 Sep '15

15 Sep '15

On 14 September 2015 at 13:14, Riccardo Bortolato <rikyz619(a)gmail.com> wrote: > + struct d3d9_texture *texture = surface->texture; > > TRACE("iface %p.\n", iface); > > + /* Standalone surfaces can't be in D3DPOOL_MANAGED */ > + if (!texture) > + return; You don't need this anymore.

1 0

Re: [PATCH 5/7] wined3d: remove wined3d_volume_from_resource from the public api
by Henri Verbeet 15 Sep '15

15 Sep '15

On 14 September 2015 at 13:14, Riccardo Bortolato <rikyz619(a)gmail.com> wrote: > diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h > index 7fb136d..49ed8db 100644 > --- a/dlls/wined3d/wined3d_private.h > +++ b/dlls/wined3d/wined3d_private.h > @@ -2332,6 +2332,7 @@ BOOL volume_prepare_system_memory(struct wined3d_volume *volume) DECLSPEC_HIDDEN > HRESULT wined3d_volume_create(struct wined3d_texture *container, const struct wined3d_resource_desc *desc, > unsigned int level, struct wined3d_volume **volume) DECLSPEC_HIDDEN; > void wined3d_volume_destroy(struct wined3d_volume *volume) DECLSPEC_HIDDEN; > +struct wined3d_volume *wined3d_volume_from_resource(struct wined3d_resource *resource) DECLSPEC_HIDDEN; You never want to use this from inside wined3d. If there are any callers they should use volume_from_resource() instead.

1 0

Re: [PATCH 3/7] wined3d: introduce new wined3d_texture_(un)map functions
by Henri Verbeet 15 Sep '15

15 Sep '15

On 14 September 2015 at 13:14, Riccardo Bortolato <rikyz619(a)gmail.com> wrote: > static const struct wined3d_texture_ops texture2d_ops = > { > texture2d_sub_resource_load, > @@ -924,6 +935,8 @@ static const struct wined3d_texture_ops texture2d_ops = > texture2d_sub_resource_validate_location, > texture2d_sub_resource_upload_data, > texture2d_prepare_texture, > + texture2d_sub_resource_map, > + texture2d_sub_resource_unmap, > }; > Please keep the various sub_resource operations together. (I.e., keep texture_prepare_texture last.) You're probably also missing some wined3d_private.h changes here that ended up in the next patch. It doesn't make sense to introduce these without users, so what you'd want to do is e.g. first make the change for d3d10_texture2d_Map(), then for d3d10_texture2d_Unmap(), etc.

1 0

Re: [PATCH 2/7] wined3d: pass a wined3d_box to wined3d_surface_map
by Stefan Dösinger 15 Sep '15

15 Sep '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 2015-09-14 um 13:13 schrieb Riccardo Bortolato: > + hr = wined3d_surface_map(surface->wined3d_surface, &map_desc, rect ? (const struct wined3d_box *)&box : NULL, flags); Why do you need the cast? -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJV9x41AAoJEN0/YqbEcdMw5H4P/i9IrXL1PHd3pzoSmu2ObeSg rYWjMykbp0rh39JwXioBnMqbOCfneEjCSESHGqChNYQ4ZUHyMa6v8M0SOelvxlsA s9sQDs1YBRreXHTMlJSze4/jkHuOSFPCCiVueYLXsyoPunjER+KielzvICZ7lFYQ MQtHi6VwvUDiZJb7UaU3EeiUz2Drxq/Tki5OOgl+NS0rVQXRrecaA3qimPKEpbpI SkXChNulMWHM5q1cboxfP585R7SX12RnirNH0Wwx5kgv21gnvJGVB4eLirPNeKvA FnYAeGqo0ct3ruY9O77UMQFZTbAfn20Jv1EP4ZD0dAhUaUeSzPKQ9I68f+LYC5tG jiwZ7+8E/ReGWXRWcmHF3gnp3SumFl4RtQl8oz4jcqwoH42+xaaSMn5NDam4Hx0s sImgiqEG1ga7sCTOFUIL3q+0XkCpmXMwsjuBxxdZO1qRzSw9MlSgf1BpGsl3rJUb gHI4E+CsgHgUtP8ANyAPJBEbX87JEZ4SDycPwvgNIPQL84hRi0j+FvTJuJe26SN3 47qorsnjy9i/HrtTZXu613qhB07oMedyowWFRqI4EhRv8aKBUB6efzo8/LVHNU2v Sdfy3iI6d6Z+01sZa7nkdbAxeeASfEJ0tSKYN8ikRe0ahPhbRSFU0aD3/4+smQT6 EHW5Os4oDmiycqCxwogK =PePB -----END PGP SIGNATURE-----

2 1

Re: [PATCH 1/7] wined3d: store wined3d_texture and sub_resource_idx in d3d8, d3d9 and ddraw surfaces and volumes
by Henri Verbeet 15 Sep '15

15 Sep '15

On 14 September 2015 at 13:13, Riccardo Bortolato <rikyz619(a)gmail.com> wrote: > diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h > index d12805f..d1eebbb 100644 > --- a/dlls/d3d9/d3d9_private.h > +++ b/dlls/d3d9/d3d9_private.h > @@ -193,10 +193,13 @@ struct d3d9_volume > struct d3d9_resource resource; > struct wined3d_volume *wined3d_volume; > struct d3d9_texture *texture; > + struct wined3d_texture *wined3d_texture; > + UINT sub_resource_idx; I'd prefer "unsigned int", but it's not that important. We'll probably want "wined3d_texture" and "sub_resource_idx" before "wined3d_volume". > -void volume_init(struct d3d9_volume *volume, struct d3d9_texture *texture, > - struct wined3d_volume *wined3d_volume, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; > +void volume_init(struct d3d9_volume *volume, struct wined3d_volume *wined3d_volume, > + const struct wined3d_parent_ops **parent_ops, > + struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx) DECLSPEC_HIDDEN; Please keep "parent_ops" the last parameter. You don't need the wined3d_volume parameter here. Affects the device_parent calls as well. > @@ -5395,6 +5395,7 @@ HRESULT wined3d_surface_create(struct wined3d_texture *container, const struct w > struct wined3d_surface *object; > void *parent; > HRESULT hr; > + UINT sub_resource_idx = layer * container->level_count + level; This probably doesn't need its own variable. I think it makes sense to split this patch in two, one making the change for volumes, and one making the change for surfaces.

1 0