November 2013 - Wine-commits

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

29 Nov '13

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

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

29 Nov '13

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

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

29 Nov '13

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: Make the DDSURFACEDESC2 parameter to ddraw_surface_create_texture() const.
by Alexandre Julliard 29 Nov '13

29 Nov '13

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: Get rid of CreateSurface().
by Alexandre Julliard 29 Nov '13

29 Nov '13

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: Get rid of copy_to_surfacedesc2().
by Alexandre Julliard 29 Nov '13

29 Nov '13

Module: wine Branch: master Commit: 82d5f36c8bdb6eb07e87113630e9b2d077070c6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=82d5f36c8bdb6eb07e8711363… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 28 09:55:43 2013 +0100 ddraw: Get rid of copy_to_surfacedesc2(). --- dlls/ddraw/ddraw_private.h | 12 ------------ dlls/ddraw/surface.c | 2 +- 2 files changed, 1 insertions(+), 13 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index b6f5170..74e11db 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -608,18 +608,6 @@ struct member_info #define DD_STRUCT_COPY_BYSIZE(to,from) DD_STRUCT_COPY_BYSIZE_(to,from,(from)->dwSize) -#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, const DDSURFACEDESC2 *from) -{ - DWORD from_size = from->dwSize; - if (from_size == sizeof(DDSURFACEDESC)) - from_size -= SIZEOF_END_PADDING(DDSURFACEDESC, ddsCaps); - to->dwSize = sizeof(DDSURFACEDESC2); /* for struct copy */ - DD_STRUCT_COPY_BYSIZE_(to, from, from_size); -} - HRESULT hr_ddraw_from_wined3d(HRESULT hr) DECLSPEC_HIDDEN; #endif diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index d6a948d..e94876f 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5620,7 +5620,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ return E_OUTOFMEMORY; texture->version = version; - copy_to_surfacedesc2(&texture->surface_desc, surface_desc); + texture->surface_desc = *surface_desc; desc = &texture->surface_desc; /* Ensure DDSD_CAPS is always set. */

1 0

Frédéric Delanoy : winemac.drv: Use BOOL type where appropriate.
by Alexandre Julliard 29 Nov '13

29 Nov '13

Module: wine Branch: master Commit: 69d35a01cf4c1a17422fcafc33f7f5b6b8da6711 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69d35a01cf4c1a17422fcafc3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Nov 28 23:09:12 2013 +0100 winemac.drv: Use BOOL type where appropriate. --- dlls/winemac.drv/window.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index f8e30ca..6360c32 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -62,23 +62,23 @@ static void get_cocoa_window_features(struct macdrv_win_data *data, if ((style & WS_CAPTION) == WS_CAPTION && !(ex_style & WS_EX_LAYERED)) { - wf->shadow = 1; + wf->shadow = TRUE; if (!data->shaped) { - wf->title_bar = 1; - if (style & WS_SYSMENU) wf->close_button = 1; - if (style & WS_MINIMIZEBOX) wf->minimize_button = 1; - if (style & WS_MAXIMIZEBOX) wf->resizable = 1; - if (ex_style & WS_EX_TOOLWINDOW) wf->utility = 1; + wf->title_bar = TRUE; + if (style & WS_SYSMENU) wf->close_button = TRUE; + if (style & WS_MINIMIZEBOX) wf->minimize_button = TRUE; + if (style & WS_MAXIMIZEBOX) wf->resizable = TRUE; + if (ex_style & WS_EX_TOOLWINDOW) wf->utility = TRUE; } } - if (ex_style & WS_EX_DLGMODALFRAME) wf->shadow = 1; + if (ex_style & WS_EX_DLGMODALFRAME) wf->shadow = TRUE; else if (style & WS_THICKFRAME) { - wf->shadow = 1; - if (!data->shaped) wf->resizable = 1; + wf->shadow = TRUE; + if (!data->shaped) wf->resizable = TRUE; } - else if ((style & (WS_DLGFRAME|WS_BORDER)) == WS_DLGFRAME) wf->shadow = 1; + else if ((style & (WS_DLGFRAME|WS_BORDER)) == WS_DLGFRAME) wf->shadow = TRUE; }

1 0

Frédéric Delanoy : winex11.drv: Use BOOL type where appropriate.
by Alexandre Julliard 29 Nov '13

29 Nov '13

Module: wine Branch: master Commit: 323bec99b37ee5279956eac7dfb6c83fd3fcbd89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=323bec99b37ee5279956eac7d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Nov 29 12:33:09 2013 +0100 winex11.drv: Use BOOL type where appropriate. --- dlls/winex11.drv/desktop.c | 2 +- dlls/winex11.drv/event.c | 5 +++-- dlls/winex11.drv/mouse.c | 4 ++-- dlls/winex11.drv/window.c | 2 +- dlls/winex11.drv/x11drv.h | 34 +++++++++++++++++----------------- dlls/winex11.drv/x11drv_main.c | 40 ++++++++++++++++++++-------------------- dlls/winex11.drv/xvidmode.c | 6 +++--- 7 files changed, 47 insertions(+), 46 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 7a1bb92..603e19f 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -117,7 +117,7 @@ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) RECT primary_rect = get_primary_monitor_rect(); root_window = win; - managed_mode = 0; /* no managed windows in desktop mode */ + managed_mode = FALSE; /* no managed windows in desktop mode */ max_width = primary_rect.right - primary_rect.left; max_height = primary_rect.bottom - primary_rect.top; xinerama_init( width, height ); diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 767c003..f60e845 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -925,7 +925,7 @@ static void X11DRV_MapNotify( HWND hwnd, XEvent *event ) if (event->xany.window == x11drv_thread_data()->clip_window) { - clipping_cursor = 1; + clipping_cursor = TRUE; return; } if (!(data = get_win_data( hwnd ))) return; @@ -945,7 +945,8 @@ static void X11DRV_MapNotify( HWND hwnd, XEvent *event ) */ static void X11DRV_UnmapNotify( HWND hwnd, XEvent *event ) { - if (event->xany.window == x11drv_thread_data()->clip_window) clipping_cursor = 0; + if (event->xany.window == x11drv_thread_data()->clip_window) + clipping_cursor = FALSE; } diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 2300f30..f1e58fe 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -400,7 +400,7 @@ static BOOL grab_clipping_window( const RECT *clip ) if (!XGrabPointer( data->display, clip_window, False, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, clip_window, None, CurrentTime )) - clipping_cursor = 1; + clipping_cursor = TRUE; if (!clipping_cursor) { @@ -430,7 +430,7 @@ void ungrab_clipping_window(void) TRACE( "no longer clipping\n" ); XUnmapWindow( display, clip_window ); - clipping_cursor = 0; + clipping_cursor = FALSE; SendMessageW( GetDesktopWindow(), WM_X11DRV_CLIP_CURSOR, 0, 0 ); } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index e78f226..4da361a 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -68,7 +68,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); #define SWP_AGG_NOPOSCHANGE (SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | SWP_NOZORDER) /* is cursor clipping active? */ -int clipping_cursor = 0; +BOOL clipping_cursor = FALSE; /* X context to associate a hwnd to an X window */ XContext winContext = 0; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 98386ce..9008db6 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -216,9 +216,9 @@ extern INT X11DRV_YWStoDS( HDC hdc, INT height ) DECLSPEC_HIDDEN; extern const int X11DRV_XROPfunction[]; -extern int client_side_graphics DECLSPEC_HIDDEN; -extern int client_side_with_render DECLSPEC_HIDDEN; -extern int shape_layered_windows DECLSPEC_HIDDEN; +extern BOOL client_side_graphics DECLSPEC_HIDDEN; +extern BOOL client_side_with_render DECLSPEC_HIDDEN; +extern BOOL shape_layered_windows DECLSPEC_HIDDEN; extern const struct gdi_dc_funcs *X11DRV_XRender_Init(void) DECLSPEC_HIDDEN; extern struct opengl_funcs *get_glx_driver(UINT) DECLSPEC_HIDDEN; @@ -363,22 +363,22 @@ extern XVisualInfo argb_visual DECLSPEC_HIDDEN; extern Colormap default_colormap DECLSPEC_HIDDEN; extern XPixmapFormatValues **pixmap_formats DECLSPEC_HIDDEN; extern Window root_window DECLSPEC_HIDDEN; -extern int clipping_cursor DECLSPEC_HIDDEN; +extern BOOL clipping_cursor DECLSPEC_HIDDEN; extern unsigned int screen_bpp DECLSPEC_HIDDEN; -extern int use_xkb DECLSPEC_HIDDEN; -extern int usexrandr DECLSPEC_HIDDEN; -extern int usexvidmode DECLSPEC_HIDDEN; +extern BOOL use_xkb DECLSPEC_HIDDEN; +extern BOOL usexrandr DECLSPEC_HIDDEN; +extern BOOL usexvidmode DECLSPEC_HIDDEN; extern BOOL ximInComposeMode DECLSPEC_HIDDEN; -extern int use_take_focus DECLSPEC_HIDDEN; -extern int use_primary_selection DECLSPEC_HIDDEN; -extern int use_system_cursors DECLSPEC_HIDDEN; -extern int show_systray DECLSPEC_HIDDEN; -extern int grab_pointer DECLSPEC_HIDDEN; -extern int grab_fullscreen DECLSPEC_HIDDEN; -extern int usexcomposite DECLSPEC_HIDDEN; -extern int managed_mode DECLSPEC_HIDDEN; -extern int decorated_mode DECLSPEC_HIDDEN; -extern int private_color_map DECLSPEC_HIDDEN; +extern BOOL use_take_focus DECLSPEC_HIDDEN; +extern BOOL use_primary_selection DECLSPEC_HIDDEN; +extern BOOL use_system_cursors DECLSPEC_HIDDEN; +extern BOOL show_systray DECLSPEC_HIDDEN; +extern BOOL grab_pointer DECLSPEC_HIDDEN; +extern BOOL grab_fullscreen DECLSPEC_HIDDEN; +extern BOOL usexcomposite DECLSPEC_HIDDEN; +extern BOOL managed_mode DECLSPEC_HIDDEN; +extern BOOL decorated_mode DECLSPEC_HIDDEN; +extern BOOL private_color_map DECLSPEC_HIDDEN; extern int primary_monitor DECLSPEC_HIDDEN; extern int copy_default_colors DECLSPEC_HIDDEN; extern int alloc_system_colors DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index a6572ba..85c69bf 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -62,23 +62,23 @@ Colormap default_colormap = None; XPixmapFormatValues **pixmap_formats; unsigned int screen_bpp; Window root_window; -int usexvidmode = 1; -int usexrandr = 1; -int usexcomposite = 1; -int use_xkb = 1; -int use_take_focus = 1; -int use_primary_selection = 0; -int use_system_cursors = 1; -int show_systray = 1; -int grab_pointer = 1; -int grab_fullscreen = 0; -int managed_mode = 1; -int decorated_mode = 1; -int private_color_map = 0; +BOOL usexvidmode = TRUE; +BOOL usexrandr = TRUE; +BOOL usexcomposite = TRUE; +BOOL use_xkb = TRUE; +BOOL use_take_focus = TRUE; +BOOL use_primary_selection = FALSE; +BOOL use_system_cursors = TRUE; +BOOL show_systray = TRUE; +BOOL grab_pointer = TRUE; +BOOL grab_fullscreen = FALSE; +BOOL managed_mode = TRUE; +BOOL decorated_mode = TRUE; +BOOL private_color_map = FALSE; int primary_monitor = 0; -int client_side_graphics = 1; -int client_side_with_render = 1; -int shape_layered_windows = 1; +BOOL client_side_graphics = TRUE; +BOOL client_side_with_render = TRUE; +BOOL shape_layered_windows = TRUE; int copy_default_colors = 128; int alloc_system_colors = 256; DWORD thread_data_tls_index = TLS_OUT_OF_INDEXES; @@ -91,7 +91,7 @@ static void *err_callback_arg; /* error callback argument */ static int err_callback_result; /* error callback result */ static unsigned long err_serial; /* serial number of first request */ static int (*old_error_handler)( Display *, XErrorEvent * ); -static int use_xim = 1; +static BOOL use_xim = TRUE; static char input_style[20]; #define IS_OPTION_TRUE(ch) \ @@ -439,7 +439,7 @@ static void X11DRV_XComposite_Init(void) if (!xcomposite_handle) { TRACE("Unable to open %s, XComposite disabled\n", SONAME_LIBXCOMPOSITE); - usexcomposite = 0; + usexcomposite = FALSE; return; } @@ -462,7 +462,7 @@ static void X11DRV_XComposite_Init(void) TRACE("XComposite extension could not be queried; disabled\n"); wine_dlclose(xcomposite_handle, NULL, 0); xcomposite_handle = NULL; - usexcomposite = 0; + usexcomposite = FALSE; return; } TRACE("XComposite is up and running error_base = %d\n", xcomp_error_base); @@ -472,7 +472,7 @@ sym_not_found: TRACE("Unable to load function pointers from %s, XComposite disabled\n", SONAME_LIBXCOMPOSITE); wine_dlclose(xcomposite_handle, NULL, 0); xcomposite_handle = NULL; - usexcomposite = 0; + usexcomposite = FALSE; } #endif /* defined(SONAME_LIBXCOMPOSITE) */ diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index a4e20f3..0020b08 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -43,7 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(xvidmode); #ifdef SONAME_LIBXXF86VM -extern int usexvidmode; +extern BOOL usexvidmode; static int xf86vm_event, xf86vm_error, xf86vm_major, xf86vm_minor; @@ -163,7 +163,7 @@ void X11DRV_XF86VM_Init(void) if (!xvidmode_handle) { TRACE("Unable to open %s, XVidMode disabled\n", SONAME_LIBXXF86VM); - usexvidmode = 0; + usexvidmode = FALSE; return; } @@ -242,7 +242,7 @@ sym_not_found: TRACE("Unable to load function pointers from %s, XVidMode disabled\n", SONAME_LIBXXF86VM); wine_dlclose(xvidmode_handle, NULL, 0); xvidmode_handle = NULL; - usexvidmode = 0; + usexvidmode = FALSE; } /***** GAMMA CONTROL *****/

1 0

Jacek Caban : mshtml: Strip hash part before combining URIs.
by Alexandre Julliard 29 Nov '13

29 Nov '13

Module: wine Branch: master Commit: 8c6d9482bcb298053ba70b18027976a6d71a11b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c6d9482bcb298053ba70b180… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 29 12:58:25 2013 +0100 mshtml: Strip hash part before combining URIs. --- dlls/mshtml/nsio.c | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index da7d930..d63e61e 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -141,6 +141,23 @@ static BOOL compare_ignoring_frag(IUri *uri1, IUri *uri2) return ret; } +static HRESULT combine_url(IUri *base_uri, const WCHAR *rel_url, IUri **ret) +{ + IUri *uri_nofrag; + HRESULT hres; + + uri_nofrag = get_uri_nofrag(base_uri); + if(!uri_nofrag) + return E_FAIL; + + hres = CoInternetCombineUrlEx(uri_nofrag, rel_url, URL_ESCAPE_SPACES_ONLY|URL_DONT_ESCAPE_EXTRA_INFO, + ret, 0); + IUri_Release(uri_nofrag); + if(FAILED(hres)) + WARN("CoInternetCombineUrlEx failed: %08x\n", hres); + return hres; +} + static nsresult create_nsuri(IUri*,HTMLOuterWindow*,NSContainer*,const char*,nsWineURI**); static const char *debugstr_nsacstr(const nsACString *nsstr) @@ -2407,12 +2424,10 @@ static nsresult NSAPI nsURI_Resolve(nsIFileURL *iface, const nsACString *aRelati if(!path) return NS_ERROR_OUT_OF_MEMORY; - hres = CoInternetCombineUrlEx(This->uri, path, URL_ESCAPE_SPACES_ONLY|URL_DONT_ESCAPE_EXTRA_INFO, &new_uri, 0); + hres = combine_url(This->uri, path, &new_uri); heap_free(path); - if(FAILED(hres)) { - ERR("CoIntenetCombineUrlEx failed: %08x\n", hres); + if(FAILED(hres)) return NS_ERROR_FAILURE; - } hres = IUri_GetDisplayUri(new_uri, &ret); IUri_Release(new_uri); @@ -3317,10 +3332,7 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString * MultiByteToWideChar(CP_ACP, 0, spec, -1, new_spec, sizeof(new_spec)/sizeof(WCHAR)); if(base_wine_uri) { - hres = CoInternetCombineUrlEx(base_wine_uri->uri, new_spec, URL_ESCAPE_SPACES_ONLY|URL_DONT_ESCAPE_EXTRA_INFO, - &urlmon_uri, 0); - if(FAILED(hres)) - WARN("CoInternetCombineUrlEx failed: %08x\n", hres); + hres = combine_url(base_wine_uri->uri, new_spec, &urlmon_uri); }else { hres = create_uri(new_spec, 0, &urlmon_uri); if(FAILED(hres))

1 0

Jacek Caban : mshtml: Use uri_nofrag instead of full URI in navigate_anchor .
by Alexandre Julliard 29 Nov '13

29 Nov '13

Module: wine Branch: master Commit: fc73f4726e49db16942c096a1a3fc8f28320f5c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc73f4726e49db16942c096a1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 29 12:58:41 2013 +0100 mshtml: Use uri_nofrag instead of full URI in navigate_anchor. --- dlls/mshtml/htmlanchor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 32b39cb..97ef900 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -121,7 +121,7 @@ static HRESULT navigate_anchor(HTMLAnchorElement *This) if(*href) { if(!window) window = This->element.node.doc->basedoc.window; - hres = navigate_url(window, href, window->uri, BINDING_NAVIGATED); + hres = navigate_url(window, href, window->uri_nofrag, BINDING_NAVIGATED); }else { TRACE("empty href\n"); hres = S_OK;

1 0