November 2013 - Wine-Commits

Henri Verbeet : ddraw: Get rid of CreateSurface().
by Alexandre Julliard Nov. 29, 2013

Nov. 29, 2013

Module: wine Branch: master Commit: 69ebf9de540a71acc8bb4c1e83ca7a5071d88371 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69ebf9de540a71acc8bb4c1e8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 28 09:55:42 2013 +0100 ddraw: Get rid of CreateSurface(). --- dlls/ddraw/ddraw.c | 120 ++------------------------------------------ dlls/ddraw/ddraw_private.h | 4 +- dlls/ddraw/surface.c | 15 +++++- 3 files changed, 19 insertions(+), 120 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 9645c2d..d2d762d 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2731,118 +2731,6 @@ static HRESULT WINAPI ddraw7_StartModeTest(IDirectDraw7 *iface, SIZE *Modes, DWO return DD_OK; } -/***************************************************************************** - * IDirectDraw7::CreateSurface - * - * Creates a new IDirectDrawSurface object and returns its interface. - * - * The surface connections with wined3d are a bit tricky. Basically it works - * like this: - * - * |------------------------| |-----------------| - * | DDraw surface | | WineD3DSurface | - * | | | | - * | WineD3DSurface |-------------->| | - * | Child |<------------->| Parent | - * |------------------------| |-----------------| - * - * The DDraw surface is the parent of the wined3d surface, and it releases - * the WineD3DSurface when the ddraw surface is destroyed. - * - * However, for all surfaces which can be in a container in WineD3D, - * we have to do this. These surfaces are usually complex surfaces, - * so this concerns primary surfaces with a front and a back buffer, - * and textures. - * - * |------------------------| |-----------------| - * | DDraw surface | | Container | - * | | | | - * | Child |<------------->| Parent | - * | Texture |<------------->| | - * | WineD3DSurface |<----| | Levels |<--| - * | Complex connection | | | | | - * |------------------------| | |-----------------| | - * ^ | | - * | | | - * | | | - * | |------------------| | |-----------------| | - * | | IParent | |-------->| WineD3DSurface | | - * | | | | | | - * | | Child |<------------->| Parent | | - * | | | | Container |<--| - * | |------------------| |-----------------| | - * | | - * | |----------------------| | - * | | DDraw surface 2 | | - * | | | | - * |<->| Complex root Child | | - * | | Texture | | - * | | WineD3DSurface |<----| | - * | |----------------------| | | - * | | | - * | |---------------------| | |-----------------| | - * | | IParent | |----->| WineD3DSurface | | - * | | | | | | - * | | Child |<---------->| Parent | | - * | |---------------------| | Container |<--| - * | |-----------------| | - * | | - * | ---More surfaces can follow--- | - * - * The reason is that the IWineD3DSwapchain(render target container) - * and the IWineD3DTexure(Texture container) release the parents - * of their surface's children, but by releasing the complex root - * the surfaces which are complexly attached to it are destroyed - * too. See IDirectDrawSurface::Release for a more detailed - * explanation. - * - * Params: - * DDSD: Description of the surface to create - * Surf: Address to store the interface pointer at - * UnkOuter: Basically for aggregation support, but ddraw doesn't support - * aggregation, so it has to be NULL - * - * Returns: - * DD_OK on success - * CLASS_E_NOAGGREGATION if UnkOuter != NULL - * DDERR_* if an error occurs - * - *****************************************************************************/ -static HRESULT CreateSurface(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_desc, - struct ddraw_surface **surface, IUnknown *UnkOuter, UINT version) -{ - struct ddraw_surface *object = NULL; - HRESULT hr; - - TRACE("ddraw %p, surface_desc %p, surface %p, outer_unknown %p.\n", ddraw, surface_desc, surface, UnkOuter); - - if (UnkOuter != NULL) - { - FIXME("(%p) : outer != NULL?\n", ddraw); - return CLASS_E_NOAGGREGATION; /* unchecked */ - } - - if (!surface) - { - FIXME("(%p) You want to get back a surface? Don't give NULL ptrs!\n", ddraw); - return E_POINTER; /* unchecked */ - } - - if (FAILED(hr = ddraw_surface_create_texture(ddraw, surface_desc, version, &object))) - { - WARN("Failed to create texture, hr %#x.\n", hr); - return hr; - } - object->is_complex_root = TRUE; - - *surface = object; - - if (surface_desc->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - ddraw->primary = object; - - return hr; -} - static HRESULT WINAPI ddraw7_CreateSurface(IDirectDraw7 *iface, DDSURFACEDESC2 *surface_desc, IDirectDrawSurface7 **surface, IUnknown *outer_unknown) { @@ -2882,7 +2770,7 @@ static HRESULT WINAPI ddraw7_CreateSurface(IDirectDraw7 *iface, DDSURFACEDESC2 * return DDERR_INVALIDCAPS; } - hr = CreateSurface(ddraw, surface_desc, &impl, outer_unknown, 7); + hr = ddraw_surface_create(ddraw, surface_desc, &impl, outer_unknown, 7); wined3d_mutex_unlock(); if (FAILED(hr)) { @@ -2936,7 +2824,7 @@ static HRESULT WINAPI ddraw4_CreateSurface(IDirectDraw4 *iface, return DDERR_INVALIDCAPS; } - hr = CreateSurface(ddraw, surface_desc, &impl, outer_unknown, 4); + hr = ddraw_surface_create(ddraw, surface_desc, &impl, outer_unknown, 4); wined3d_mutex_unlock(); if (FAILED(hr)) { @@ -2992,7 +2880,7 @@ static HRESULT WINAPI ddraw2_CreateSurface(IDirectDraw2 *iface, return DDERR_INVALIDCAPS; } - hr = CreateSurface(ddraw, &surface_desc2, &impl, outer_unknown, 2); + hr = ddraw_surface_create(ddraw, &surface_desc2, &impl, outer_unknown, 2); wined3d_mutex_unlock(); if (FAILED(hr)) { @@ -3037,7 +2925,7 @@ static HRESULT WINAPI ddraw1_CreateSurface(IDirectDraw *iface, * primaries anyway. */ surface_desc->ddsCaps.dwCaps &= ~DDSCAPS_FRONTBUFFER; DDSD_to_DDSD2(surface_desc, &surface_desc2); - hr = CreateSurface(ddraw, &surface_desc2, &impl, outer_unknown, 1); + hr = ddraw_surface_create(ddraw, &surface_desc2, &impl, outer_unknown, 1); wined3d_mutex_unlock(); if (FAILED(hr)) { diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 94f5453..b6f5170 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -193,8 +193,8 @@ struct ddraw_texture struct ddraw_surface *root; }; -HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, const DDSURFACEDESC2 *desc, - unsigned int version, struct ddraw_surface **surface) DECLSPEC_HIDDEN; +HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_desc, + struct ddraw_surface **surface, IUnknown *outer_unknown, unsigned int version) DECLSPEC_HIDDEN; HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, struct ddraw_texture *texture, struct wined3d_surface *wined3d_surface, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; ULONG ddraw_surface_release_iface(struct ddraw_surface *This) DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index ee5f2eb..d6a948d 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5589,8 +5589,8 @@ static HRESULT CDECL ddraw_reset_enum_callback(struct wined3d_resource *resource return DD_OK; } -HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_desc, - unsigned int version, struct ddraw_surface **surface) +HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_desc, + struct ddraw_surface **surface, IUnknown *outer_unknown, unsigned int version) { struct ddraw_surface *root, *mip, **attach; struct wined3d_resource_desc wined3d_desc; @@ -5602,12 +5602,20 @@ HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, const DDSURFACEDESC2 * UINT layers, levels, i, j; HRESULT hr; + TRACE("ddraw %p, surface_desc %p, surface %p, outer_unknown %p, version %u.\n", + ddraw, surface_desc, surface, outer_unknown, version); if (TRACE_ON(ddraw)) { TRACE("Requesting surface desc:\n"); DDRAW_dump_surface_desc(surface_desc); } + if (outer_unknown) + return CLASS_E_NOAGGREGATION; + + if (!surface) + return E_POINTER; + if (!(texture = HeapAlloc(GetProcessHeap(), 0, sizeof(*texture)))) return E_OUTOFMEMORY; @@ -5915,6 +5923,7 @@ HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, const DDSURFACEDESC2 * resource = wined3d_texture_get_sub_resource(wined3d_texture, 0); root = wined3d_resource_get_parent(resource); root->wined3d_texture = wined3d_texture; + root->is_complex_root = TRUE; texture->root = root; for (i = 0; i < layers; ++i) @@ -6010,6 +6019,8 @@ HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, const DDSURFACEDESC2 * } } + if (surface_desc->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) + ddraw->primary = root; *surface = root; return DD_OK;

1 0

Henri Verbeet : ddraw: Make the DDSURFACEDESC2 parameter to ddraw_surface_create_texture() const.
by Alexandre Julliard Nov. 29, 2013

Nov. 29, 2013

Module: wine Branch: master Commit: 028960d9d0d181c435feee64f1679559bf2cc825 URL: http://source.winehq.org/git/wine.git/?a=commit;h=028960d9d0d181c435feee64f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 28 09:55:41 2013 +0100 ddraw: Make the DDSURFACEDESC2 parameter to ddraw_surface_create_texture() const. --- dlls/ddraw/ddraw.c | 19 ++++--------------- dlls/ddraw/ddraw_private.h | 4 ++-- dlls/ddraw/surface.c | 36 +++++++++++++++++++++++++++--------- 3 files changed, 33 insertions(+), 26 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 389038c..9645c2d 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2808,21 +2808,13 @@ static HRESULT WINAPI ddraw7_StartModeTest(IDirectDraw7 *iface, SIZE *Modes, DWO * DDERR_* if an error occurs * *****************************************************************************/ -static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, +static HRESULT CreateSurface(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_desc, struct ddraw_surface **surface, IUnknown *UnkOuter, UINT version) { struct ddraw_surface *object = NULL; HRESULT hr; - DDSURFACEDESC2 desc2; - TRACE("ddraw %p, surface_desc %p, surface %p, outer_unknown %p.\n", ddraw, DDSD, surface, UnkOuter); - - /* Some checks before we start */ - if (TRACE_ON(ddraw)) - { - TRACE(" (%p) Requesting surface desc :\n", ddraw); - DDRAW_dump_surface_desc(DDSD); - } + TRACE("ddraw %p, surface_desc %p, surface %p, outer_unknown %p.\n", ddraw, surface_desc, surface, UnkOuter); if (UnkOuter != NULL) { @@ -2836,10 +2828,7 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, return E_POINTER; /* unchecked */ } - /* Modify some flags */ - copy_to_surfacedesc2(&desc2, DDSD); - - if (FAILED(hr = ddraw_surface_create_texture(ddraw, &desc2, version, &object))) + if (FAILED(hr = ddraw_surface_create_texture(ddraw, surface_desc, version, &object))) { WARN("Failed to create texture, hr %#x.\n", hr); return hr; @@ -2848,7 +2837,7 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, *surface = object; - if (desc2.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) + if (surface_desc->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) ddraw->primary = object; return hr; diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 782c136..94f5453 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -193,7 +193,7 @@ struct ddraw_texture struct ddraw_surface *root; }; -HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, DDSURFACEDESC2 *desc, +HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, const DDSURFACEDESC2 *desc, unsigned int version, struct ddraw_surface **surface) DECLSPEC_HIDDEN; HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, struct ddraw_texture *texture, struct wined3d_surface *wined3d_surface, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; @@ -611,7 +611,7 @@ struct member_info #define SIZEOF_END_PADDING(type, last_field) \ (sizeof(type) - offsetof(type, last_field) - sizeof(((type *)0)->last_field)) -static inline void copy_to_surfacedesc2(DDSURFACEDESC2 *to, DDSURFACEDESC2 *from) +static inline void copy_to_surfacedesc2(DDSURFACEDESC2 *to, const DDSURFACEDESC2 *from) { DWORD from_size = from->dwSize; if (from_size == sizeof(DDSURFACEDESC)) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index a13a5e4..ee5f2eb 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5589,7 +5589,7 @@ static HRESULT CDECL ddraw_reset_enum_callback(struct wined3d_resource *resource return DD_OK; } -HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, DDSURFACEDESC2 *desc, +HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_desc, unsigned int version, struct ddraw_surface **surface) { struct ddraw_surface *root, *mip, **attach; @@ -5597,17 +5597,24 @@ HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, DDSURFACEDESC2 *desc, struct wined3d_texture *wined3d_texture; struct wined3d_resource *resource; struct wined3d_display_mode mode; + DDSURFACEDESC2 *desc, *mip_desc; struct ddraw_texture *texture; UINT layers, levels, i, j; - DDSURFACEDESC2 *mip_desc; HRESULT hr; if (TRACE_ON(ddraw)) { TRACE("Requesting surface desc:\n"); - DDRAW_dump_surface_desc(desc); + DDRAW_dump_surface_desc(surface_desc); } + if (!(texture = HeapAlloc(GetProcessHeap(), 0, sizeof(*texture)))) + return E_OUTOFMEMORY; + + texture->version = version; + copy_to_surfacedesc2(&texture->surface_desc, surface_desc); + desc = &texture->surface_desc; + /* Ensure DDSD_CAPS is always set. */ desc->dwFlags |= DDSD_CAPS; @@ -5621,6 +5628,7 @@ HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, DDSURFACEDESC2 *desc, && !(ddraw->cooperative_level & DDSCL_EXCLUSIVE)) { WARN("Tried to create a flippable primary surface without DDSCL_EXCLUSIVE.\n"); + HeapFree(GetProcessHeap(), 0, texture); return DDERR_NOEXCLUSIVEMODE; } @@ -5628,6 +5636,7 @@ HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, DDSURFACEDESC2 *desc, == (DDSCAPS_BACKBUFFER | DDSCAPS_PRIMARYSURFACE)) { WARN("Tried to create a back buffer surface.\n"); + HeapFree(GetProcessHeap(), 0, texture); return DDERR_INVALIDCAPS; } @@ -5636,6 +5645,7 @@ HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, DDSURFACEDESC2 *desc, == (DDSCAPS_VIDEOMEMORY | DDSCAPS_SYSTEMMEMORY)) { WARN("Tried to create a surface in both system and video memory.\n"); + HeapFree(GetProcessHeap(), 0, texture); return DDERR_INVALIDCAPS; } @@ -5643,6 +5653,7 @@ HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, DDSURFACEDESC2 *desc, && !(desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP)) { WARN("Cube map faces requested without cube map flag.\n"); + HeapFree(GetProcessHeap(), 0, texture); return DDERR_INVALIDCAPS; } @@ -5650,6 +5661,7 @@ HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, DDSURFACEDESC2 *desc, && !(desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP_ALLFACES)) { WARN("Cube map without faces requested.\n"); + HeapFree(GetProcessHeap(), 0, texture); return DDERR_INVALIDPARAMS; } @@ -5662,12 +5674,14 @@ HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, DDSURFACEDESC2 *desc, if (!(desc->ddsCaps.dwCaps & DDSCAPS_TEXTURE)) { WARN("DDSCAPS2_TEXTUREMANAGE used without DDSCAPS_TEXTURE, returning DDERR_INVALIDCAPS.\n"); + HeapFree(GetProcessHeap(), 0, texture); return DDERR_INVALIDCAPS; } if (desc->ddsCaps.dwCaps & (DDSCAPS_VIDEOMEMORY | DDSCAPS_SYSTEMMEMORY)) { WARN("DDSCAPS2_TEXTUREMANAGE used width DDSCAPS_VIDEOMEMORY " "or DDSCAPS_SYSTEMMEMORY, returning DDERR_INVALIDCAPS.\n"); + HeapFree(GetProcessHeap(), 0, texture); return DDERR_INVALIDCAPS; } } @@ -5675,6 +5689,7 @@ HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, DDSURFACEDESC2 *desc, if (FAILED(hr = wined3d_get_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode, NULL))) { ERR("Failed to get display mode, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, texture); return hr; } @@ -5690,6 +5705,7 @@ HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, DDSURFACEDESC2 *desc, if (wined3d_desc.format == WINED3DFMT_UNKNOWN) { WARN("Unsupported / unknown pixelformat.\n"); + HeapFree(GetProcessHeap(), 0, texture); return DDERR_INVALIDPIXELFORMAT; } @@ -5699,6 +5715,7 @@ HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, DDSURFACEDESC2 *desc, if (!(desc->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)) { WARN("No width / height specified.\n"); + HeapFree(GetProcessHeap(), 0, texture); return DDERR_INVALIDPARAMS; } @@ -5708,7 +5725,10 @@ HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, DDSURFACEDESC2 *desc, } if (!desc->dwWidth || !desc->dwHeight) + { + HeapFree(GetProcessHeap(), 0, texture); return DDERR_INVALIDPARAMS; + } if (desc->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { @@ -5728,6 +5748,7 @@ HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, DDSURFACEDESC2 *desc, &swapchain_desc, NULL, ddraw_reset_enum_callback, TRUE))) { ERR("Failed to reset device.\n"); + HeapFree(GetProcessHeap(), 0, texture); return hr; } } @@ -5757,7 +5778,10 @@ HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, DDSURFACEDESC2 *desc, { /* Mipmap count is given, should not be 0. */ if (!desc->u2.dwMipMapCount) + { + HeapFree(GetProcessHeap(), 0, texture); return DDERR_INVALIDPARAMS; + } } else { @@ -5853,12 +5877,6 @@ HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, DDSURFACEDESC2 *desc, if (desc->ddsCaps.dwCaps & DDSCAPS_OWNDC) wined3d_desc.usage |= WINED3DUSAGE_OWNDC; - if (!(texture = HeapAlloc(GetProcessHeap(), 0, sizeof(*texture)))) - return E_OUTOFMEMORY; - - texture->version = version; - copy_to_surfacedesc2(&texture->surface_desc, desc); - if (desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP) { wined3d_desc.resource_type = WINED3D_RTYPE_CUBE_TEXTURE;

1 0

Henri Verbeet : ddraw: Move the DDSD_CAPS fixup from CreateSurface() to ddraw_surface_create_texture().
by Alexandre Julliard Nov. 29, 2013

Nov. 29, 2013

Module: wine Branch: master Commit: 2c109d2df19d148b1e2a69230a73aa01814689f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c109d2df19d148b1e2a69230… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 28 09:55:40 2013 +0100 ddraw: Move the DDSD_CAPS fixup from CreateSurface() to ddraw_surface_create_texture(). --- dlls/ddraw/ddraw.c | 6 ------ dlls/ddraw/surface.c | 3 +++ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index efdf28e..389038c 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2836,12 +2836,6 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, return E_POINTER; /* unchecked */ } - if (!(DDSD->dwFlags & DDSD_CAPS)) - { - /* DVIDEO.DLL does forget the DDSD_CAPS flag ... *sigh* */ - DDSD->dwFlags |= DDSD_CAPS; - } - /* Modify some flags */ copy_to_surfacedesc2(&desc2, DDSD); diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 18b23b2..a13a5e4 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5608,6 +5608,9 @@ HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, DDSURFACEDESC2 *desc, DDRAW_dump_surface_desc(desc); } + /* Ensure DDSD_CAPS is always set. */ + desc->dwFlags |= DDSD_CAPS; + /* If the surface is of the 'ALLOCONLOAD' type, ignore the LPSURFACE * field. Frank Herbert's Dune specifies a NULL pointer for lpSurface. */ if ((desc->ddsCaps.dwCaps & DDSCAPS_ALLOCONLOAD) || !desc->lpSurface)

1 0

Henri Verbeet : ddraw: Move the DDSD_LPSURFACE fixups from CreateSurface() to ddraw_surface_create_texture().
by Alexandre Julliard Nov. 29, 2013

Nov. 29, 2013

Module: wine Branch: master Commit: 06f393dc7d53397ba39a16c1f5d5a87430a86e85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06f393dc7d53397ba39a16c1f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 28 09:55:39 2013 +0100 ddraw: Move the DDSD_LPSURFACE fixups from CreateSurface() to ddraw_surface_create_texture(). --- dlls/ddraw/ddraw.c | 13 ------------- dlls/ddraw/surface.c | 5 +++++ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 415eda0..efdf28e 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2842,19 +2842,6 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, DDSD->dwFlags |= DDSD_CAPS; } - if (DDSD->ddsCaps.dwCaps & DDSCAPS_ALLOCONLOAD) - { - /* If the surface is of the 'alloconload' type, ignore the LPSURFACE field */ - DDSD->dwFlags &= ~DDSD_LPSURFACE; - } - - if ((DDSD->dwFlags & DDSD_LPSURFACE) && (DDSD->lpSurface == NULL)) - { - /* Frank Herbert's Dune specifies a null pointer for the surface, ignore the LPSURFACE field */ - WARN("(%p) Null surface pointer specified, ignore it!\n", ddraw); - DDSD->dwFlags &= ~DDSD_LPSURFACE; - } - /* Modify some flags */ copy_to_surfacedesc2(&desc2, DDSD); diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 4c5021d..18b23b2 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5608,6 +5608,11 @@ HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, DDSURFACEDESC2 *desc, DDRAW_dump_surface_desc(desc); } + /* If the surface is of the 'ALLOCONLOAD' type, ignore the LPSURFACE + * field. Frank Herbert's Dune specifies a NULL pointer for lpSurface. */ + if ((desc->ddsCaps.dwCaps & DDSCAPS_ALLOCONLOAD) || !desc->lpSurface) + desc->dwFlags &= ~DDSD_LPSURFACE; + if ((desc->ddsCaps.dwCaps & (DDSCAPS_FLIP | DDSCAPS_PRIMARYSURFACE)) == (DDSCAPS_FLIP | DDSCAPS_PRIMARYSURFACE) && !(ddraw->cooperative_level & DDSCL_EXCLUSIVE))

1 0

Nikolay Sivov : include: Added IBackgroundCopyCallback2 definition.
by Alexandre Julliard Nov. 29, 2013

Nov. 29, 2013

Module: wine Branch: master Commit: fb3c58903d06f6370470b1a709a900c4f09f9c6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb3c58903d06f6370470b1a70… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 28 09:30:52 2013 +0400 include: Added IBackgroundCopyCallback2 definition. --- .gitignore | 1 + dlls/qmgrprxy/qmgrprxy.idl | 1 + include/Makefile.in | 1 + include/bits3_0.idl | 34 ++++++++++++++++++++++++++++++++++ 4 files changed, 37 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 8a093ad..7cd10bb 100644 --- a/.gitignore +++ b/.gitignore @@ -156,6 +156,7 @@ include/audiopolicy.h include/austream.h include/bits.h include/bits1_5.h +include/bits3_0.h include/comcat.h include/commoncontrols.h include/config.h diff --git a/dlls/qmgrprxy/qmgrprxy.idl b/dlls/qmgrprxy/qmgrprxy.idl index 828bcd8..97c1da3 100644 --- a/dlls/qmgrprxy/qmgrprxy.idl +++ b/dlls/qmgrprxy/qmgrprxy.idl @@ -24,6 +24,7 @@ #define DO_NO_IMPORTS #include "bits1_5.idl" +#include "bits3_0.idl" [ threading(both), diff --git a/include/Makefile.in b/include/Makefile.in index f4f1ce2..2d91150 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -14,6 +14,7 @@ PUBLIC_IDL_H_SRCS = \ austream.idl \ bits.idl \ bits1_5.idl \ + bits3_0.idl \ comcat.idl \ commoncontrols.idl \ control.idl \ diff --git a/include/bits3_0.idl b/include/bits3_0.idl new file mode 100644 index 0000000..6cf48b7 --- /dev/null +++ b/include/bits3_0.idl @@ -0,0 +1,34 @@ +/* + * Background Intelligent Transfer Service (BITS) 3.0 interface + * + * Copyright 2013 Nikolay Sivov for CodeWeavers + * + * 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 + * + */ + +#ifndef DO_NO_IMPORTS +import "bits.idl"; +#endif + +[ + uuid(659cdeac-489e-11d9-a9cd-000d56965251), + odl +] +interface IBackgroundCopyCallback2 : IBackgroundCopyCallback +{ + HRESULT FileTransferred([in] IBackgroundCopyJob *job, + [in] IBackgroundCopyFile *file); +}

1 0

Frédéric Delanoy : winejoystick.drv: Use BOOL type where appropriate.
by Alexandre Julliard Nov. 29, 2013

Nov. 29, 2013

Module: wine Branch: master Commit: 39afda4f6c402ce2dc3454545057797f8cad3430 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39afda4f6c402ce2dc3454545… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Nov 27 23:19:05 2013 +0100 winejoystick.drv: Use BOOL type where appropriate. --- dlls/winejoystick.drv/joystick.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winejoystick.drv/joystick.c b/dlls/winejoystick.drv/joystick.c index 577e593..00ca4e2 100644 --- a/dlls/winejoystick.drv/joystick.c +++ b/dlls/winejoystick.drv/joystick.c @@ -78,7 +78,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(joystick); typedef struct tagWINE_JSTCK { int joyIntf; - int in_use; + BOOL in_use; /* Some extra info we need to make this actually work under the Linux 2.2 event api. First of all, we cannot keep closing and reopening the device file - @@ -129,7 +129,7 @@ static LRESULT JSTCK_drvOpen(LPSTR str, DWORD dwIntf) return 0; JSTCK_Data[dwIntf].joyIntf = dwIntf; - JSTCK_Data[dwIntf].in_use = 1; + JSTCK_Data[dwIntf].in_use = TRUE; return (LRESULT)&JSTCK_Data[dwIntf]; } @@ -142,7 +142,7 @@ static LRESULT JSTCK_drvClose(DWORD_PTR dwDevID) if (jstck == NULL) return 0; - jstck->in_use = 0; + jstck->in_use = FALSE; if (jstck->dev > 0) { close(jstck->dev);

1 0

André Hentschel : winefile: Use defines instead of numbers.
by Alexandre Julliard Nov. 29, 2013

Nov. 29, 2013

Module: wine Branch: master Commit: ca58cea0a5feb3852bcb7d596c97ae0ad85b9370 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca58cea0a5feb3852bcb7d596… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 27 23:06:34 2013 +0100 winefile: Use defines instead of numbers. --- programs/winefile/resource.h | 2 ++ programs/winefile/winefile.rc | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/winefile/resource.h b/programs/winefile/resource.h index 83a6368..99f94aa 100644 --- a/programs/winefile/resource.h +++ b/programs/winefile/resource.h @@ -47,6 +47,8 @@ #define ID_FILE_MOVE 106 #define ID_FILE_COPY 107 #define ID_FILE_DELETE 108 +#define ID_RENAME 109 +#define ID_MKDIR 111 #define ID_FILE_EXIT 115 #define ID_CONNECT_NETWORK_DRIVE 252 #define ID_DISCONNECT_NETWORK_DRIVE 253 diff --git a/programs/winefile/winefile.rc b/programs/winefile/winefile.rc index 21c1c98..758f740 100644 --- a/programs/winefile/winefile.rc +++ b/programs/winefile/winefile.rc @@ -29,12 +29,12 @@ IDM_WINEFILE MENU MENUITEM "&Move...\tF7", ID_FILE_MOVE MENUITEM "&Copy...\tF8", ID_FILE_COPY MENUITEM "&Delete\tDel", ID_FILE_DELETE - MENUITEM "Re&name...", 109 + MENUITEM "Re&name...", ID_RENAME MENUITEM "Propert&ies\tAlt+Enter", ID_EDIT_PROPERTIES MENUITEM SEPARATOR MENUITEM "&Run...", ID_RUN MENUITEM SEPARATOR - MENUITEM "Cr&eate Directory...", 111 + MENUITEM "Cr&eate Directory...", ID_MKDIR MENUITEM SEPARATOR MENUITEM "E&xit", ID_FILE_EXIT }

1 0

Ken Thomases : winemac: Clear OpenGL views to black the first time a context is attached.
by Alexandre Julliard Nov. 29, 2013

Nov. 29, 2013

Module: wine Branch: master Commit: 4124478b8526d04b0049aae980c0674230136cc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4124478b8526d04b0049aae98… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Nov 27 15:33:19 2013 -0600 winemac: Clear OpenGL views to black the first time a context is attached. This prevents VRAM garbage from being displayed before the program draws. --- dlls/winemac.drv/cocoa_opengl.h | 2 ++ dlls/winemac.drv/cocoa_opengl.m | 33 ++++++++++++++++++++++++++++++++- dlls/winemac.drv/cocoa_window.m | 13 +++++++++++++ 3 files changed, 47 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_opengl.h b/dlls/winemac.drv/cocoa_opengl.h index 60e8c16..2cdcdbd 100644 --- a/dlls/winemac.drv/cocoa_opengl.h +++ b/dlls/winemac.drv/cocoa_opengl.h @@ -25,8 +25,10 @@ { NSView* latentView; BOOL needsUpdate; + BOOL shouldClearToBlack; } @property BOOL needsUpdate; +(a)property BOOL shouldClearToBlack; @end diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index 85b3639..13b9ea3 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -30,7 +30,7 @@ @implementation WineOpenGLContext -(a)synthesize latentView, needsUpdate; +(a)synthesize latentView, needsUpdate, shouldClearToBlack; - (void) dealloc { @@ -63,6 +63,32 @@ [self clearDrawable]; } + - (void) clearToBlackIfNeeded + { + if (shouldClearToBlack) + { + NSOpenGLContext* origContext = [NSOpenGLContext currentContext]; + + [self makeCurrentContext]; + + glPushAttrib(GL_COLOR_BUFFER_BIT | GL_SCISSOR_BIT); + glDrawBuffer(GL_FRONT_AND_BACK); + glDisable(GL_SCISSOR_TEST); + glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); + glClearColor(0, 0, 0, 1); + glClear(GL_COLOR_BUFFER_BIT); + glPopAttrib(); + glFlush(); + + if (origContext) + [origContext makeCurrentContext]; + else + [NSOpenGLContext clearCurrentContext]; + + shouldClearToBlack = FALSE; + } + } + @end @@ -135,6 +161,9 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v) [context setLatentView:view]; [context makeCurrentContext]; + + if ([context view]) + [context clearToBlackIfNeeded]; } else { @@ -163,6 +192,8 @@ void macdrv_update_opengl_context(macdrv_opengl_context c) { [context setView:context.latentView]; context.latentView = nil; + + [context clearToBlackIfNeeded]; } else [context update]; diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 74fa191..6fa6ee8 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -154,6 +154,7 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif { NSMutableArray* glContexts; NSMutableArray* pendingGlContexts; + BOOL clearedGlSurface; NSMutableAttributedString* markedText; NSRange markedTextSelection; @@ -221,7 +222,14 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif WineWindow* window = (WineWindow*)[self window]; for (WineOpenGLContext* context in pendingGlContexts) + { + if (!clearedGlSurface) + { + context.shouldClearToBlack = TRUE; + clearedGlSurface = TRUE; + } context.needsUpdate = TRUE; + } [glContexts addObjectsFromArray:pendingGlContexts]; [pendingGlContexts removeAllObjects]; @@ -298,6 +306,11 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif if ([[self window] windowNumber] > 0 && !NSIsEmptyRect([self visibleRect])) { [glContexts addObject:context]; + if (!clearedGlSurface) + { + context.shouldClearToBlack = TRUE; + clearedGlSurface = TRUE; + } context.needsUpdate = TRUE; } else

1 0

Ken Thomases : winemac: Move test for valid GL drawable into -[ WineContentView addGLContext:].
by Alexandre Julliard Nov. 29, 2013

Nov. 29, 2013

Module: wine Branch: master Commit: fd04552fe3d2acfc487192f7c6696526bd8c9950 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd04552fe3d2acfc487192f7c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Nov 27 15:32:46 2013 -0600 winemac: Move test for valid GL drawable into -[WineContentView addGLContext:]. Improves encapsulation. Avoids a round trip to the main thread. --- dlls/winemac.drv/cocoa_opengl.m | 9 ++------- dlls/winemac.drv/cocoa_window.m | 16 +++++++++++++--- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index 45799db..85b3639 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -123,16 +123,11 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v) context.needsUpdate = FALSE; if (view) { - __block BOOL viewIsValidDrawable; - macdrv_add_view_opengl_context(v, c); - OnMainThread(^{ - viewIsValidDrawable = [[view window] windowNumber] > 0 && - !NSIsEmptyRect([view visibleRect]); - }); - if (viewIsValidDrawable) + if (context.needsUpdate) { + context.needsUpdate = FALSE; [context setView:view]; [context setLatentView:nil]; } diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index a29f20e..74fa191 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -294,8 +294,18 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif glContexts = [[NSMutableArray alloc] init]; if (!pendingGlContexts) pendingGlContexts = [[NSMutableArray alloc] init]; - [pendingGlContexts addObject:context]; - [self setNeedsDisplay:YES]; + + if ([[self window] windowNumber] > 0 && !NSIsEmptyRect([self visibleRect])) + { + [glContexts addObject:context]; + context.needsUpdate = TRUE; + } + else + { + [pendingGlContexts addObject:context]; + [self setNeedsDisplay:YES]; + } + [(WineWindow*)[self window] updateColorSpace]; } @@ -2407,7 +2417,7 @@ void macdrv_add_view_opengl_context(macdrv_view v, macdrv_opengl_context c) WineContentView* view = (WineContentView*)v; WineOpenGLContext *context = (WineOpenGLContext*)c; - OnMainThreadAsync(^{ + OnMainThread(^{ [view addGLContext:context]; });

1 0

Nikolay Sivov : qmgr: Implement Get/SetNotifyInterface().
by Alexandre Julliard Nov. 29, 2013

Nov. 29, 2013

Module: wine Branch: master Commit: f2e9854483eb98e7423c95815ad33f73d5999d8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2e9854483eb98e7423c95815… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 28 09:31:24 2013 +0400 qmgr: Implement Get/SetNotifyInterface(). --- dlls/qmgr/job.c | 42 ++++++++++++++++++++++++++++++++++++++---- dlls/qmgr/qmgr.h | 6 +++++- dlls/qmgr/qmgr_local.idl | 1 + dlls/qmgr/tests/job.c | 12 ++++++++++++ 4 files changed, 56 insertions(+), 5 deletions(-) diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index 52c7b7f..fdbf234 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -77,6 +77,8 @@ static ULONG WINAPI BackgroundCopyJob_Release(IBackgroundCopyJob2 *iface) { This->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->cs); + if (This->callback) + IBackgroundCopyCallback2_Release(This->callback); HeapFree(GetProcessHeap(), 0, This->displayName); HeapFree(GetProcessHeap(), 0, This->description); HeapFree(GetProcessHeap(), 0, This); @@ -418,6 +420,7 @@ static HRESULT WINAPI BackgroundCopyJob_SetNotifyFlags( TRACE("(%p)->(0x%x)\n", This, Val); + if (is_job_done(This)) return BG_E_INVALID_STATE; if (Val & ~valid_flags) return E_NOTIMPL; This->notify_flags = Val; return S_OK; @@ -443,8 +446,29 @@ static HRESULT WINAPI BackgroundCopyJob_SetNotifyInterface( IUnknown *Val) { BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob2(iface); - FIXME("(%p)->(%p): stub\n", This, Val); - return E_NOTIMPL; + HRESULT hr = S_OK; + + TRACE("(%p)->(%p)\n", This, Val); + + if (is_job_done(This)) return BG_E_INVALID_STATE; + + if (This->callback) + { + IBackgroundCopyCallback2_Release(This->callback); + This->callback = NULL; + This->callback2 = FALSE; + } + + if (Val) + { + hr = IUnknown_QueryInterface(Val, &IID_IBackgroundCopyCallback2, (void**)&This->callback); + if (FAILED(hr)) + hr = IUnknown_QueryInterface(Val, &IID_IBackgroundCopyCallback, (void**)&This->callback); + else + This->callback2 = TRUE; + } + + return hr; } static HRESULT WINAPI BackgroundCopyJob_GetNotifyInterface( @@ -452,8 +476,16 @@ static HRESULT WINAPI BackgroundCopyJob_GetNotifyInterface( IUnknown **pVal) { BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob2(iface); - FIXME("(%p)->(%p): stub\n", This, pVal); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pVal); + + if (!pVal) return E_INVALIDARG; + + *pVal = (IUnknown*)This->callback; + if (*pVal) + IUnknown_AddRef(*pVal); + + return S_OK; } static HRESULT WINAPI BackgroundCopyJob_SetMinimumRetryDelay( @@ -705,6 +737,8 @@ HRESULT BackgroundCopyJobConstructor(LPCWSTR displayName, BG_JOB_TYPE type, GUID This->state = BG_JOB_STATE_SUSPENDED; This->description = NULL; This->notify_flags = BG_NOTIFY_JOB_ERROR | BG_NOTIFY_JOB_TRANSFERRED; + This->callback = NULL; + This->callback2 = FALSE; *job = This; diff --git a/dlls/qmgr/qmgr.h b/dlls/qmgr/qmgr.h index eb982a0..4a9bb15 100644 --- a/dlls/qmgr/qmgr.h +++ b/dlls/qmgr/qmgr.h @@ -22,10 +22,12 @@ #define __QMGR_H__ #include "windef.h" -#include "objbase.h" #define COBJMACROS +#include "objbase.h" + #include "bits1_5.h" +#include "bits3_0.h" #include <string.h> #include "wine/list.h" @@ -44,6 +46,8 @@ typedef struct BG_JOB_PROGRESS jobProgress; BG_JOB_STATE state; ULONG notify_flags; + IBackgroundCopyCallback2 *callback; + BOOL callback2; /* IBackgroundCopyCallback2 is supported in addition to IBackgroundCopyCallback */ /* Protects file list, and progress */ CRITICAL_SECTION cs; struct list entryFromQmgr; diff --git a/dlls/qmgr/qmgr_local.idl b/dlls/qmgr/qmgr_local.idl index 4bbcf7b..edbe71e 100644 --- a/dlls/qmgr/qmgr_local.idl +++ b/dlls/qmgr/qmgr_local.idl @@ -22,3 +22,4 @@ #define DO_NO_IMPORTS #include "bits1_5.idl" +#include "bits3_0.idl" diff --git a/dlls/qmgr/tests/job.c b/dlls/qmgr/tests/job.c index 108bf6b..d42e3a5 100644 --- a/dlls/qmgr/tests/job.c +++ b/dlls/qmgr/tests/job.c @@ -446,6 +446,17 @@ static void test_NotifyFlags(void) ok(flags == (BG_NOTIFY_JOB_ERROR | BG_NOTIFY_JOB_TRANSFERRED), "flags 0x%08x\n", flags); } +static void test_NotifyInterface(void) +{ + HRESULT hr; + IUnknown *unk; + + unk = (IUnknown*)0xdeadbeef; + hr = IBackgroundCopyJob_GetNotifyInterface(test_job, &unk); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(unk == NULL, "got %p\n", unk); +} + typedef void (*test_t)(void); START_TEST(job) @@ -458,6 +469,7 @@ START_TEST(job) test_GetState, test_ResumeEmpty, test_NotifyFlags, + test_NotifyInterface, 0 }; static const test_t tests_bits20[] = {

1 0