wine-devel October 2015

wine-devel@winehq.org

67 participants
305 discussions

Re: [PATCH] d3d8, 9/tests: Use BOOL variable for ShowCursor return value (PVS-Studio)
by Marvin 14 Oct '15

14 Oct '15

1 0

Re: [PATCH] gdi32: Return default palette entries from GetSystemPaletteEntries for non-palette-based devices. (try 4, resend)
by Huw Davies 14 Oct '15

14 Oct '15

On 14 Oct 2015, at 07:13, Anton Baskanov wrote: > diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c > index d850d0f..70a75d8 100644 > --- a/dlls/gdi32/palette.c > +++ b/dlls/gdi32/palette.c > @@ -418,8 +418,39 @@ UINT WINAPI GetSystemPaletteEntries( > + { > + if (entries && start < 256) > + { > + UINT i; > + const RGBQUAD *default_entries; > + > + if (start + count > 256) count = 256 - start; > + > + default_entries = get_default_color_table( 8 ); > + for (i = 0; i < count; ++i) > + { > + if (start + i < 10 || start + i >= 246) > + { > + entries[i].peRed = default_entries[start + i].rgbRed; > + entries[i].peGreen = default_entries[start + i].rgbGreen; > + entries[i].peBlue = default_entries[start + i].rgbBlue; > + } > + else > + { > + entries[i].peRed = 0; > + entries[i].peGreen = 0; > + entries[i].peBlue = 0; > + } > + entries[i].peFlags = 0; > + } > + } > + } I think this should be moved to nulldrv_GetSystemPaletteEntries(). Then X11DRV_GetSystemPaletteEntries() should forward to this (using GET_NEXT_PHYSDEV) in the case that 'palette_size' is zero. This avoids the ugly GetDeviceCaps call at the beginning. Huw.

1 0

Re: [v2 1/6] d3d8: make use of wined3d_texture_map in d3d8_surface_LockRect
by Henri Verbeet 13 Oct '15

13 Oct '15

On 11 October 2015 at 13:29, Riccardo Bortolato <rikyz619(a)gmail.com> wrote: > diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c > index 20027a7..8f66112 100644 > --- a/dlls/d3d11/device.c > +++ b/dlls/d3d11/device.c > @@ -3007,11 +3007,11 @@ static void CDECL device_parent_activate(struct wined3d_device_parent *device_pa > } > > static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent *device_parent, > - void *container_parent, struct wined3d_surface *surface, void **parent, > + struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, struct wined3d_surface *surface, void **parent, > const struct wined3d_parent_ops **parent_ops) > { > - TRACE("device_parent %p, container_parent %p, surface %p, parent %p, parent_ops %p.\n", > - device_parent, container_parent, surface, parent, parent_ops); > + TRACE("device_parent %p, wined3d_texture %p, sub_resource_idx %u, surface %p, parent %p, parent_ops %p.\n", > + device_parent, wined3d_texture, sub_resource_idx, surface, parent, parent_ops); > > *parent = NULL; > *parent_ops = &d3d10_null_wined3d_parent_ops; This series looks fine, but there's a (trivial) merge conflict due to commit a865b14aedb01def345c09732717c3c5f2eb6dab.

3 2

ddraw cleanup
by Riccardo Bortolato 13 Oct '15

13 Oct '15

Hi, While sending the other cleanup patches I worked towards wined3d_surface freedom in ddraw and reached a critical point (aka it's the last thing I need to do and it's something that needs a strong decision): in order to get rid of wined3d_surface_get_resource() I need to accomodate the wined3d_resource_get_desc() call inside ddraw_surface_init() (ddraw/surface.c). Since the callback is executed when the wined3d_texture->sub_resources list isn't ready yet, I cannot use wined3d_texture_get_sub_resource(). So here are the ideas so far: - keep wined3d surface in the callback only (really ugly) - move the wined3d_resource_get_desc() calls in a loop after wined3d_texture_create() (kind of ugly) - do magic in wined3d (really unlikely?) Any ideas? Ciao, Riccardo

2 1

Re: [PATCH 4/7] wined3d: make wined3d_device_set_cursor_properties work with wined3d_texture and sub_resource_index
by Henri Verbeet 13 Oct '15

13 Oct '15

On 12 October 2015 at 17:23, Riccardo Bortolato <rikyz619(a)gmail.com> wrote: > HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device, > - UINT x_hotspot, UINT y_hotspot, struct wined3d_surface *cursor_image) > + UINT x_hotspot, UINT y_hotspot, struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx) "wined3d_texture" is redundant inside wined3d, just "texture" is fine. > { > + struct wined3d_resource *sub_resource = wined3d_texture_get_sub_resource(wined3d_texture, sub_resource_idx); > + struct wined3d_surface *cursor_image; > + > + if (!sub_resource) > + return WINED3DERR_INVALIDCALL; > + > + cursor_image = surface_from_resource(sub_resource); > + > TRACE("device %p, x_hotspot %u, y_hotspot %u, cursor_image %p.\n", > device, x_hotspot, y_hotspot, cursor_image); Like in 3/7, please move most of the new lines after the TRACE, and then update the trace to match the parameters.

1 0

Re: [PATCH 3/7] wined3d: make wined3d_device_get_front_buffer_data work with wined3d_texture and sub_resource_index
by Henri Verbeet 13 Oct '15

13 Oct '15

On 12 October 2015 at 17:23, Riccardo Bortolato <rikyz619(a)gmail.com> wrote: > HRESULT CDECL wined3d_device_get_front_buffer_data(const struct wined3d_device *device, > - UINT swapchain_idx, struct wined3d_surface *dst_surface) > + UINT swapchain_idx, struct wined3d_texture *texture, unsigned int sub_resource_idx) > { > + struct wined3d_resource *sub_resource = wined3d_texture_get_sub_resource(texture, sub_resource_idx); I'd rather have the wined3d_texture_get_sub_resource() call after the TRACE. It's not too much of an issue, but it does affect the order of the traces in the debug output. > - TRACE("device %p, swapchain_idx %u, dst_surface %p.\n", device, swapchain_idx, dst_surface); > + TRACE("device %p, swapchain_idx %u, texture %p, sub_index %u.\n", device, swapchain_idx, texture, sub_resource_idx); And please just match the parameter name here.

1 0

Re: [PATCH 1/7] d3d8: use wined3d_rendertarget_view_create instead of wined3d_rendertarget_view_create_from_surface in d3d8_surface_get_rendertarget_view
by Henri Verbeet 13 Oct '15

13 Oct '15

On 12 October 2015 at 17:23, Riccardo Bortolato <rikyz619(a)gmail.com> wrote: > + resource = wined3d_texture_get_resource(surface->wined3d_texture); > + if (!resource) > + { > + ERR("No resource found.\n"); > + return NULL; > + } wined3d_texture_get_resource() can't fail.

1 0

Re: [PATCH 1/4] ole32: Hold a reference to the stub manager throughout an incoming call.
by Jacek Caban 13 Oct '15

13 Oct '15

Hi Huw, On 10/13/15 15:49, Huw Davies wrote: > -HRESULT ipid_get_dispatch_params(const IPID *ipid, APARTMENT **stub_apt, IRpcStubBuffer **stub, IRpcChannelBuffer **chan, IID *iid, IUnknown **iface) DECLSPEC_HIDDEN; > +HRESULT ipid_get_dispatch_params(const IPID *ipid, APARTMENT **stub_apt, struct stub_manager **manager, IRpcStubBuffer **stub, > + IRpcChannelBuffer **chan, IID *iid, IUnknown **iface) DECLSPEC_HIDDEN; How about returning stub manager instead of APARTMENT? It already contains APARTMENT reference. Thanks, Jacek

2 1

Re: [PATCH 3/4] ole32/tests: Test calling CoDisconnectObject from within a COM call to the object.
by Marvin 13 Oct '15

13 Oct '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=17337 Your paranoid android. === w8 (32 bit marshal) === marshal.c:3473: Test failed: info->cbSize was -86228343 instead of 48 marshal.c:3474: Test failed: info->dwServerPid was 0x694 instead of 0xff0 marshal.c:3490: Test failed: info->cbSize was -86228343 instead of 48 marshal.c:3491: Test failed: info->dwServerPid was 0x694 instead of 0xff0 marshal.c:3528: Test failed: info->cbSize was -86228343 instead of 48 marshal.c:3529: Test failed: info->dwServerPid was 0x694 instead of 0xff0 marshal.c:3546: Test failed: info->cbSize was -86228343 instead of 48 marshal.c:3547: Test failed: info->dwServerPid was 0x694 instead of 0xff0 marshal.c:3510: Test failed: info->cbSize was -86228343 instead of 48 marshal.c:3511: Test failed: info->dwServerPid was 0x694 instead of 0xff0 marshal.c:3473: Test failed: info->cbSize was -86228343 instead of 48 marshal.c:3474: Test failed: info->dwServerPid was 0x694 instead of 0xff0 marshal.c:3490: Test failed: info->cbSize was -86228343 instead of 48 marshal.c:3491: Test failed: info->dwServerPid was 0x694 instead of 0xff0 marshal.c:3528: Test failed: info->cbSize was -86228343 instead of 48 marshal.c:3529: Test failed: info->dwServerPid was 0x694 instead of 0xff0 marshal.c:3546: Test failed: info->cbSize was -86228343 instead of 48 marshal.c:3547: Test failed: info->dwServerPid was 0x694 instead of 0xff0 marshal.c:3510: Test failed: info->cbSize was -86228343 instead of 48 marshal.c:3511: Test failed: info->dwServerPid was 0x694 instead of 0xff0 marshal.c:3473: Test failed: info->cbSize was -86228343 instead of 48 marshal.c:3474: Test failed: info->dwServerPid was 0x694 instead of 0xff0 marshal.c:3490: Test failed: info->cbSize was -86228343 instead of 48 marshal.c:3491: Test failed: info->dwServerPid was 0x694 instead of 0xff0 marshal.c:3528: Test failed: info->cbSize was -86228343 instead of 48 marshal.c:3529: Test failed: info->dwServerPid was 0x694 instead of 0xff0 marshal.c:3546: Test failed: info->cbSize was -86228343 instead of 48 marshal.c:3547: Test failed: info->dwServerPid was 0x694 instead of 0xff0 marshal.c:3510: Test failed: info->cbSize was -86228343 instead of 48 marshal.c:3511: Test failed: info->dwServerPid was 0x694 instead of 0xff0 === w864 (32 bit marshal) === marshal.c:3473: Test failed: info->cbSize was 48454452 instead of 48 marshal.c:3474: Test failed: info->dwServerPid was 0xcc instead of 0x7e8 marshal.c:3490: Test failed: info->cbSize was 48454452 instead of 48 marshal.c:3491: Test failed: info->dwServerPid was 0xcc instead of 0x7e8 marshal.c:3528: Test failed: info->cbSize was 48454452 instead of 48 marshal.c:3529: Test failed: info->dwServerPid was 0xcc instead of 0x7e8 marshal.c:3546: Test failed: info->cbSize was 48454452 instead of 48 marshal.c:3547: Test failed: info->dwServerPid was 0xcc instead of 0x7e8 marshal.c:3510: Test failed: info->cbSize was 48454452 instead of 48 marshal.c:3511: Test failed: info->dwServerPid was 0xcc instead of 0x7e8 marshal.c:3473: Test failed: info->cbSize was 48454452 instead of 48 marshal.c:3474: Test failed: info->dwServerPid was 0xcc instead of 0x7e8 marshal.c:3490: Test failed: info->cbSize was 48454452 instead of 48 marshal.c:3491: Test failed: info->dwServerPid was 0xcc instead of 0x7e8 marshal.c:3528: Test failed: info->cbSize was 48454452 instead of 48 marshal.c:3529: Test failed: info->dwServerPid was 0xcc instead of 0x7e8 marshal.c:3546: Test failed: info->cbSize was 48454452 instead of 48 marshal.c:3547: Test failed: info->dwServerPid was 0xcc instead of 0x7e8 marshal.c:3510: Test failed: info->cbSize was 48454452 instead of 48 marshal.c:3511: Test failed: info->dwServerPid was 0xcc instead of 0x7e8 marshal.c:3473: Test failed: info->cbSize was 48454452 instead of 48 marshal.c:3474: Test failed: info->dwServerPid was 0xcc instead of 0x7e8 marshal.c:3490: Test failed: info->cbSize was 48454452 instead of 48 marshal.c:3491: Test failed: info->dwServerPid was 0xcc instead of 0x7e8 marshal.c:3528: Test failed: info->cbSize was 48454452 instead of 48 marshal.c:3529: Test failed: info->dwServerPid was 0xcc instead of 0x7e8 marshal.c:3546: Test failed: info->cbSize was 48454452 instead of 48 marshal.c:3547: Test failed: info->dwServerPid was 0xcc instead of 0x7e8 marshal.c:3510: Test failed: info->cbSize was 48454452 instead of 48 marshal.c:3511: Test failed: info->dwServerPid was 0xcc instead of 0x7e8 === w1064 (32 bit marshal) === marshal.c:3473: Test failed: info->cbSize was -1482345884 instead of 48 marshal.c:3474: Test failed: info->dwServerPid was 0x139c instead of 0xc6c marshal.c:3490: Test failed: info->cbSize was -1482345884 instead of 48 marshal.c:3491: Test failed: info->dwServerPid was 0x139c instead of 0xc6c marshal.c:3528: Test failed: info->cbSize was -1482345884 instead of 48 marshal.c:3529: Test failed: info->dwServerPid was 0x139c instead of 0xc6c marshal.c:3530: Test failed: info->pObject shouldn't be NULL marshal.c:3546: Test failed: info->cbSize was -1482345884 instead of 48 marshal.c:3547: Test failed: info->dwServerPid was 0x139c instead of 0xc6c marshal.c:3548: Test failed: info->pObject shouldn't be NULL marshal.c:3510: Test failed: info->cbSize was -1482345884 instead of 48 marshal.c:3511: Test failed: info->dwServerPid was 0x139c instead of 0xc6c marshal.c:3513: Test failed: info->pObject shouldn't be NULL marshal.c:3473: Test failed: info->cbSize was -1482345884 instead of 48 marshal.c:3474: Test failed: info->dwServerPid was 0x139c instead of 0xc6c marshal.c:3490: Test failed: info->cbSize was -1482345884 instead of 48 marshal.c:3491: Test failed: info->dwServerPid was 0x139c instead of 0xc6c marshal.c:3528: Test failed: info->cbSize was -1482345884 instead of 48 marshal.c:3529: Test failed: info->dwServerPid was 0x139c instead of 0xc6c marshal.c:3530: Test failed: info->pObject shouldn't be NULL marshal.c:3546: Test failed: info->cbSize was -1482345884 instead of 48 marshal.c:3547: Test failed: info->dwServerPid was 0x139c instead of 0xc6c marshal.c:3548: Test failed: info->pObject shouldn't be NULL marshal.c:3510: Test failed: info->cbSize was -1482345884 instead of 48 marshal.c:3511: Test failed: info->dwServerPid was 0x139c instead of 0xc6c marshal.c:3513: Test failed: info->pObject shouldn't be NULL marshal.c:3473: Test failed: info->cbSize was -1482345884 instead of 48 marshal.c:3474: Test failed: info->dwServerPid was 0x139c instead of 0xc6c marshal.c:3490: Test failed: info->cbSize was -1482345884 instead of 48 marshal.c:3491: Test failed: info->dwServerPid was 0x139c instead of 0xc6c marshal.c:3528: Test failed: info->cbSize was -1482345884 instead of 48 marshal.c:3529: Test failed: info->dwServerPid was 0x139c instead of 0xc6c marshal.c:3530: Test failed: info->pObject shouldn't be NULL marshal.c:3546: Test failed: info->cbSize was -1482345884 instead of 48 marshal.c:3547: Test failed: info->dwServerPid was 0x139c instead of 0xc6c marshal.c:3548: Test failed: info->pObject shouldn't be NULL marshal.c:3510: Test failed: info->cbSize was -1482345884 instead of 48 marshal.c:3511: Test failed: info->dwServerPid was 0x139c instead of 0xc6c marshal.c:3513: Test failed: info->pObject shouldn't be NULL === w864 (64 bit marshal) === marshal.c:3473: Test failed: info->cbSize was -418054392 instead of 56 marshal.c:3474: Test failed: info->dwServerPid was 0x960 instead of 0xa14 marshal.c:3490: Test failed: info->cbSize was -418054392 instead of 56 marshal.c:3491: Test failed: info->dwServerPid was 0x960 instead of 0xa14 marshal.c:3528: Test failed: info->cbSize was -418054392 instead of 56 marshal.c:3529: Test failed: info->dwServerPid was 0x960 instead of 0xa14 marshal.c:3546: Test failed: info->cbSize was -418054392 instead of 56 marshal.c:3547: Test failed: info->dwServerPid was 0x960 instead of 0xa14 marshal.c:3510: Test failed: info->cbSize was -418054392 instead of 56 marshal.c:3511: Test failed: info->dwServerPid was 0x960 instead of 0xa14 marshal.c:3473: Test failed: info->cbSize was -418054392 instead of 56 marshal.c:3474: Test failed: info->dwServerPid was 0x960 instead of 0xa14 marshal.c:3490: Test failed: info->cbSize was -418054392 instead of 56 marshal.c:3491: Test failed: info->dwServerPid was 0x960 instead of 0xa14 marshal.c:3528: Test failed: info->cbSize was -418054392 instead of 56 marshal.c:3529: Test failed: info->dwServerPid was 0x960 instead of 0xa14 marshal.c:3546: Test failed: info->cbSize was -418054392 instead of 56 marshal.c:3547: Test failed: info->dwServerPid was 0x960 instead of 0xa14 marshal.c:3510: Test failed: info->cbSize was -418054392 instead of 56 marshal.c:3511: Test failed: info->dwServerPid was 0x960 instead of 0xa14 marshal.c:3473: Test failed: info->cbSize was -418054392 instead of 56 marshal.c:3474: Test failed: info->dwServerPid was 0x960 instead of 0xa14 marshal.c:3490: Test failed: info->cbSize was -418054392 instead of 56 marshal.c:3491: Test failed: info->dwServerPid was 0x960 instead of 0xa14 marshal.c:3528: Test failed: info->cbSize was -418054392 instead of 56 marshal.c:3529: Test failed: info->dwServerPid was 0x960 instead of 0xa14 marshal.c:3546: Test failed: info->cbSize was -418054392 instead of 56 marshal.c:3547: Test failed: info->dwServerPid was 0x960 instead of 0xa14 marshal.c:3510: Test failed: info->cbSize was -418054392 instead of 56 marshal.c:3511: Test failed: info->dwServerPid was 0x960 instead of 0xa14 === w1064 (64 bit marshal) === marshal.c:3473: Test failed: info->cbSize was -1670162658 instead of 56 marshal.c:3474: Test failed: info->dwServerPid was 0x370 instead of 0xafc marshal.c:3490: Test failed: info->cbSize was -1670162658 instead of 56 marshal.c:3491: Test failed: info->dwServerPid was 0x370 instead of 0xafc marshal.c:3528: Test failed: info->cbSize was -1670162658 instead of 56 marshal.c:3529: Test failed: info->dwServerPid was 0x370 instead of 0xafc marshal.c:3530: Test failed: info->pObject shouldn't be NULL marshal.c:3546: Test failed: info->cbSize was -1670162658 instead of 56 marshal.c:3547: Test failed: info->dwServerPid was 0x370 instead of 0xafc marshal.c:3548: Test failed: info->pObject shouldn't be NULL marshal.c:3510: Test failed: info->cbSize was -1670162658 instead of 56 marshal.c:3511: Test failed: info->dwServerPid was 0x370 instead of 0xafc marshal.c:3513: Test failed: info->pObject shouldn't be NULL marshal.c:3473: Test failed: info->cbSize was -1670162658 instead of 56 marshal.c:3474: Test failed: info->dwServerPid was 0x370 instead of 0xafc marshal.c:3490: Test failed: info->cbSize was -1670162658 instead of 56 marshal.c:3491: Test failed: info->dwServerPid was 0x370 instead of 0xafc marshal.c:3528: Test failed: info->cbSize was -1670162658 instead of 56 marshal.c:3529: Test failed: info->dwServerPid was 0x370 instead of 0xafc marshal.c:3530: Test failed: info->pObject shouldn't be NULL marshal.c:3546: Test failed: info->cbSize was -1670162658 instead of 56 marshal.c:3547: Test failed: info->dwServerPid was 0x370 instead of 0xafc marshal.c:3548: Test failed: info->pObject shouldn't be NULL marshal.c:3510: Test failed: info->cbSize was -1670162658 instead of 56 marshal.c:3511: Test failed: info->dwServerPid was 0x370 instead of 0xafc marshal.c:3513: Test failed: info->pObject shouldn't be NULL marshal.c:3473: Test failed: info->cbSize was -1670162658 instead of 56 marshal.c:3474: Test failed: info->dwServerPid was 0x370 instead of 0xafc marshal.c:3490: Test failed: info->cbSize was -1670162658 instead of 56 marshal.c:3491: Test failed: info->dwServerPid was 0x370 instead of 0xafc marshal.c:3528: Test failed: info->cbSize was -1670162658 instead of 56 marshal.c:3529: Test failed: info->dwServerPid was 0x370 instead of 0xafc marshal.c:3530: Test failed: info->pObject shouldn't be NULL marshal.c:3546: Test failed: info->cbSize was -1670162658 instead of 56 marshal.c:3547: Test failed: info->dwServerPid was 0x370 instead of 0xafc marshal.c:3548: Test failed: info->pObject shouldn't be NULL marshal.c:3510: Test failed: info->cbSize was -1670162658 instead of 56 marshal.c:3511: Test failed: info->dwServerPid was 0x370 instead of 0xafc marshal.c:3513: Test failed: info->pObject shouldn't be NULL

2 1

Re: [PATCH v3] d3d8/tests: Uninitialized varyings tests.
by Marvin 13 Oct '15

13 Oct '15

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
31
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel October 2015