March 2014 - Wine-commits - list.winehq.org

Tag wine-1.7.15 : Alexandre Julliard : Release 1.7.15
by Alexandre Julliard 21 Mar '14

21 Mar '14

Module: wine Branch: refs/tags/wine-1.7.15 Tag: 9ffd1b90937901e563c9097286ff09df1b3e2e55 URL: http://source.winehq.org/git/wine.git/?a=tag;h=9ffd1b90937901e563c9097286ff… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 21 22:37:09 2014 +0100 Release 1.7.15

1 0

Stefan Dösinger : d3d8: Introduce a resource structure.
by Alexandre Julliard 21 Mar '14

21 Mar '14

Module: wine Branch: master Commit: 97b552588886f89bc594af85f8d92430159ab1aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=97b552588886f89bc594af85f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 21 11:46:19 2014 +0100 d3d8: Introduce a resource structure. --- dlls/d3d8/buffer.c | 20 ++++++++++++-------- dlls/d3d8/d3d8_main.c | 9 +++++++++ dlls/d3d8/d3d8_private.h | 18 +++++++++++++----- dlls/d3d8/device.c | 2 +- dlls/d3d8/surface.c | 10 ++++++---- dlls/d3d8/texture.c | 22 ++++++++++++---------- dlls/d3d8/volume.c | 10 ++++++---- 7 files changed, 59 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=97b552588886f89bc594a…

1 0

Stefan Dösinger : d3d8: Use the private store api for buffers.
by Alexandre Julliard 21 Mar '14

21 Mar '14

Module: wine Branch: master Commit: 1db2bdcf8ab29de17fcd2c07a21ad1d852b33036 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1db2bdcf8ab29de17fcd2c07a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 21 11:46:20 2014 +0100 d3d8: Use the private store api for buffers. --- dlls/d3d8/buffer.c | 60 ++++------------------------------------ dlls/d3d8/d3d8_main.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/d3d8/d3d8_private.h | 6 ++++ 3 files changed, 81 insertions(+), 54 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 7a3ea8c..eac22fa 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -104,52 +104,28 @@ static HRESULT WINAPI d3d8_vertexbuffer_SetPrivateData(IDirect3DVertexBuffer8 *i REFGUID guid, const void *data, DWORD data_size, DWORD flags) { struct d3d8_vertexbuffer *buffer = impl_from_IDirect3DVertexBuffer8(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s, data %p, data_size %u, flags %#x.\n", iface, debugstr_guid(guid), data, data_size, flags); - wined3d_mutex_lock(); - resource = wined3d_buffer_get_resource(buffer->wined3d_buffer); - hr = wined3d_resource_set_private_data(resource, guid, data, data_size, flags); - wined3d_mutex_unlock(); - - return hr; + return d3d8_resource_set_private_data(&buffer->resource, guid, data, data_size, flags); } static HRESULT WINAPI d3d8_vertexbuffer_GetPrivateData(IDirect3DVertexBuffer8 *iface, REFGUID guid, void *data, DWORD *data_size) { struct d3d8_vertexbuffer *buffer = impl_from_IDirect3DVertexBuffer8(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s, data %p, data_size %p.\n", iface, debugstr_guid(guid), data, data_size); - wined3d_mutex_lock(); - resource = wined3d_buffer_get_resource(buffer->wined3d_buffer); - hr = wined3d_resource_get_private_data(resource, guid, data, data_size); - wined3d_mutex_unlock(); - - return hr; + return d3d8_resource_get_private_data(&buffer->resource, guid, data, data_size); } static HRESULT WINAPI d3d8_vertexbuffer_FreePrivateData(IDirect3DVertexBuffer8 *iface, REFGUID guid) { struct d3d8_vertexbuffer *buffer = impl_from_IDirect3DVertexBuffer8(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s.\n", iface, debugstr_guid(guid)); - wined3d_mutex_lock(); - resource = wined3d_buffer_get_resource(buffer->wined3d_buffer); - hr = wined3d_resource_free_private_data(resource, guid); - wined3d_mutex_unlock(); - - return hr; + return d3d8_resource_free_private_data(&buffer->resource, guid); } static DWORD WINAPI d3d8_vertexbuffer_SetPriority(IDirect3DVertexBuffer8 *iface, DWORD priority) @@ -401,52 +377,28 @@ static HRESULT WINAPI d3d8_indexbuffer_SetPrivateData(IDirect3DIndexBuffer8 *ifa REFGUID guid, const void *data, DWORD data_size, DWORD flags) { struct d3d8_indexbuffer *buffer = impl_from_IDirect3DIndexBuffer8(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s, data %p, data_size %u, flags %#x.\n", iface, debugstr_guid(guid), data, data_size, flags); - wined3d_mutex_lock(); - resource = wined3d_buffer_get_resource(buffer->wined3d_buffer); - hr = wined3d_resource_set_private_data(resource, guid, data, data_size, flags); - wined3d_mutex_unlock(); - - return hr; + return d3d8_resource_set_private_data(&buffer->resource, guid, data, data_size, flags); } static HRESULT WINAPI d3d8_indexbuffer_GetPrivateData(IDirect3DIndexBuffer8 *iface, REFGUID guid, void *data, DWORD *data_size) { struct d3d8_indexbuffer *buffer = impl_from_IDirect3DIndexBuffer8(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s, data %p, data_size %p.\n", iface, debugstr_guid(guid), data, data_size); - wined3d_mutex_lock(); - resource = wined3d_buffer_get_resource(buffer->wined3d_buffer); - hr = wined3d_resource_get_private_data(resource, guid, data, data_size); - wined3d_mutex_unlock(); - - return hr; + return d3d8_resource_get_private_data(&buffer->resource, guid, data, data_size); } static HRESULT WINAPI d3d8_indexbuffer_FreePrivateData(IDirect3DIndexBuffer8 *iface, REFGUID guid) { struct d3d8_indexbuffer *buffer = impl_from_IDirect3DIndexBuffer8(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s.\n", iface, debugstr_guid(guid)); - wined3d_mutex_lock(); - resource = wined3d_buffer_get_resource(buffer->wined3d_buffer); - hr = wined3d_resource_free_private_data(resource, guid); - wined3d_mutex_unlock(); - - return hr; + return d3d8_resource_free_private_data(&buffer->resource, guid); } static DWORD WINAPI d3d8_indexbuffer_SetPriority(IDirect3DIndexBuffer8 *iface, DWORD priority) diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index 2175a33..2b6ada4 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -140,9 +140,78 @@ HRESULT WINAPI ValidatePixelShader(DWORD* pixelshader, DWORD* reserved1, BOOL bo void d3d8_resource_cleanup(struct d3d8_resource *resource) { + wined3d_private_store_cleanup(&resource->private_store); +} + +HRESULT d3d8_resource_free_private_data(struct d3d8_resource *resource, const GUID *guid) +{ + struct wined3d_private_data *entry; + + wined3d_mutex_lock(); + entry = wined3d_private_store_get_private_data(&resource->private_store, guid); + if (!entry) + { + wined3d_mutex_unlock(); + return D3DERR_NOTFOUND; + } + + wined3d_private_store_free_private_data(&resource->private_store, entry); + wined3d_mutex_unlock(); + + return D3D_OK; +} + +HRESULT d3d8_resource_get_private_data(struct d3d8_resource *resource, const GUID *guid, + void *data, DWORD *data_size) +{ + const struct wined3d_private_data *stored_data; + DWORD size_in; + HRESULT hr; + + wined3d_mutex_lock(); + stored_data = wined3d_private_store_get_private_data(&resource->private_store, guid); + if (!stored_data) + { + hr = D3DERR_NOTFOUND; + goto done; + } + + size_in = *data_size; + *data_size = stored_data->size; + if (!data) + { + hr = D3D_OK; + goto done; + } + if (size_in < stored_data->size) + { + hr = D3DERR_MOREDATA; + goto done; + } + + if (stored_data->flags & WINED3DSPD_IUNKNOWN) + IUnknown_AddRef(stored_data->content.object); + memcpy(data, stored_data->content.data, stored_data->size); + hr = D3D_OK; + +done: + wined3d_mutex_unlock(); + return hr; } void d3d8_resource_init(struct d3d8_resource *resource) { resource->refcount = 1; + wined3d_private_store_init(&resource->private_store); +} + +HRESULT d3d8_resource_set_private_data(struct d3d8_resource *resource, const GUID *guid, + const void *data, DWORD data_size, DWORD flags) +{ + HRESULT hr; + + wined3d_mutex_lock(); + hr = wined3d_private_store_set_private_data(&resource->private_store, guid, data, data_size, flags); + wined3d_mutex_unlock(); + return hr; } diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 85cd8ef..54bbe1c 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -177,10 +177,16 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine struct d3d8_resource { LONG refcount; + struct wined3d_private_store private_store; }; void d3d8_resource_cleanup(struct d3d8_resource *resource) DECLSPEC_HIDDEN; +HRESULT d3d8_resource_free_private_data(struct d3d8_resource *resource, const GUID *guid) DECLSPEC_HIDDEN; +HRESULT d3d8_resource_get_private_data(struct d3d8_resource *resource, const GUID *guid, + void *data, DWORD *data_size) DECLSPEC_HIDDEN; void d3d8_resource_init(struct d3d8_resource *resource) DECLSPEC_HIDDEN; +HRESULT d3d8_resource_set_private_data(struct d3d8_resource *resource, const GUID *guid, + const void *data, DWORD data_size, DWORD flags) DECLSPEC_HIDDEN; struct d3d8_volume {

1 0

Stefan Dösinger : d3d8: Use the private store api for volumes.
by Alexandre Julliard 21 Mar '14

21 Mar '14

Module: wine Branch: master Commit: c9db3c6620092723afa31a8f03f021281ad2a7e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9db3c6620092723afa31a8f0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 21 11:46:21 2014 +0100 d3d8: Use the private store api for volumes. --- dlls/d3d8/volume.c | 32 ++++---------------------------- 1 file changed, 4 insertions(+), 28 deletions(-) diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index 1a4e80c..add35ad 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -130,52 +130,28 @@ static HRESULT WINAPI d3d8_volume_SetPrivateData(IDirect3DVolume8 *iface, REFGUI const void *data, DWORD data_size, DWORD flags) { struct d3d8_volume *volume = impl_from_IDirect3DVolume8(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s, data %p, data_size %u, flags %#x.\n", iface, debugstr_guid(guid), data, data_size, flags); - wined3d_mutex_lock(); - resource = wined3d_volume_get_resource(volume->wined3d_volume); - hr = wined3d_resource_set_private_data(resource, guid, data, data_size, flags); - wined3d_mutex_unlock(); - - return hr; + return d3d8_resource_set_private_data(&volume->resource, guid, data, data_size, flags); } -static HRESULT WINAPI d3d8_volume_GetPrivateData(IDirect3DVolume8 *iface, REFGUID guid, +static HRESULT WINAPI d3d8_volume_GetPrivateData(IDirect3DVolume8 *iface, REFGUID guid, void *data, DWORD *data_size) { struct d3d8_volume *volume = impl_from_IDirect3DVolume8(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s, data %p, data_size %p.\n", iface, debugstr_guid(guid), data, data_size); - wined3d_mutex_lock(); - resource = wined3d_volume_get_resource(volume->wined3d_volume); - hr = wined3d_resource_get_private_data(resource, guid, data, data_size); - wined3d_mutex_unlock(); - - return hr; + return d3d8_resource_get_private_data(&volume->resource, guid, data, data_size); } static HRESULT WINAPI d3d8_volume_FreePrivateData(IDirect3DVolume8 *iface, REFGUID guid) { struct d3d8_volume *volume = impl_from_IDirect3DVolume8(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s.\n", iface, debugstr_guid(guid)); - wined3d_mutex_lock(); - resource = wined3d_volume_get_resource(volume->wined3d_volume); - hr = wined3d_resource_free_private_data(resource, guid); - wined3d_mutex_unlock(); - - return hr; + return d3d8_resource_free_private_data(&volume->resource, guid); } static HRESULT WINAPI d3d8_volume_GetContainer(IDirect3DVolume8 *iface, REFIID riid, void **container)

1 0

Stefan Dösinger : d3d8: Use the private store api for textures.
by Alexandre Julliard 21 Mar '14

21 Mar '14

Module: wine Branch: master Commit: 9be18d5fdd2957d270d619e5703b4b448d9ac9eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9be18d5fdd2957d270d619e57… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 21 11:46:22 2014 +0100 d3d8: Use the private store api for textures. --- dlls/d3d8/texture.c | 90 ++++++--------------------------------------------- 1 file changed, 9 insertions(+), 81 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 9d96659..b6a032a 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -113,52 +113,28 @@ static HRESULT WINAPI d3d8_texture_2d_SetPrivateData(IDirect3DTexture8 *iface, REFGUID guid, const void *data, DWORD data_size, DWORD flags) { struct d3d8_texture *texture = impl_from_IDirect3DTexture8(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s, data %p, data_size %u, flags %#x.\n", iface, debugstr_guid(guid), data, data_size, flags); - wined3d_mutex_lock(); - resource = wined3d_texture_get_resource(texture->wined3d_texture); - hr = wined3d_resource_set_private_data(resource, guid, data, data_size, flags); - wined3d_mutex_unlock(); - - return hr; + return d3d8_resource_set_private_data(&texture->resource, guid, data, data_size, flags); } static HRESULT WINAPI d3d8_texture_2d_GetPrivateData(IDirect3DTexture8 *iface, REFGUID guid, void *data, DWORD *data_size) { struct d3d8_texture *texture = impl_from_IDirect3DTexture8(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s, data %p, data_size %p.\n", iface, debugstr_guid(guid), data, data_size); - wined3d_mutex_lock(); - resource = wined3d_texture_get_resource(texture->wined3d_texture); - hr = wined3d_resource_get_private_data(resource, guid, data, data_size); - wined3d_mutex_unlock(); - - return hr; + return d3d8_resource_get_private_data(&texture->resource, guid, data, data_size); } static HRESULT WINAPI d3d8_texture_2d_FreePrivateData(IDirect3DTexture8 *iface, REFGUID guid) { struct d3d8_texture *texture = impl_from_IDirect3DTexture8(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s.\n", iface, debugstr_guid(guid)); - wined3d_mutex_lock(); - resource = wined3d_texture_get_resource(texture->wined3d_texture); - hr = wined3d_resource_free_private_data(resource, guid); - wined3d_mutex_unlock(); - - return hr; + return d3d8_resource_free_private_data(&texture->resource, guid); } static DWORD WINAPI d3d8_texture_2d_SetPriority(IDirect3DTexture8 *iface, DWORD priority) @@ -483,52 +459,28 @@ static HRESULT WINAPI d3d8_texture_cube_SetPrivateData(IDirect3DCubeTexture8 *if REFGUID guid, const void *data, DWORD data_size, DWORD flags) { struct d3d8_texture *texture = impl_from_IDirect3DCubeTexture8(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s, data %p, data_size %u, flags %#x.\n", iface, debugstr_guid(guid), data, data_size, flags); - wined3d_mutex_lock(); - resource = wined3d_texture_get_resource(texture->wined3d_texture); - hr = wined3d_resource_set_private_data(resource, guid, data, data_size, flags); - wined3d_mutex_unlock(); - - return hr; + return d3d8_resource_set_private_data(&texture->resource, guid, data, data_size, flags); } static HRESULT WINAPI d3d8_texture_cube_GetPrivateData(IDirect3DCubeTexture8 *iface, REFGUID guid, void *data, DWORD *data_size) { struct d3d8_texture *texture = impl_from_IDirect3DCubeTexture8(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s, data %p, data_size %p.\n", iface, debugstr_guid(guid), data, data_size); - wined3d_mutex_lock(); - resource = wined3d_texture_get_resource(texture->wined3d_texture); - hr = wined3d_resource_get_private_data(resource, guid, data, data_size); - wined3d_mutex_unlock(); - - return hr; + return d3d8_resource_get_private_data(&texture->resource, guid, data, data_size); } static HRESULT WINAPI d3d8_texture_cube_FreePrivateData(IDirect3DCubeTexture8 *iface, REFGUID guid) { struct d3d8_texture *texture = impl_from_IDirect3DCubeTexture8(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s.\n", iface, debugstr_guid(guid)); - wined3d_mutex_lock(); - resource = wined3d_texture_get_resource(texture->wined3d_texture); - hr = wined3d_resource_free_private_data(resource, guid); - wined3d_mutex_unlock(); - - return hr; + return d3d8_resource_free_private_data(&texture->resource, guid); } static DWORD WINAPI d3d8_texture_cube_SetPriority(IDirect3DCubeTexture8 *iface, DWORD priority) @@ -874,52 +826,28 @@ static HRESULT WINAPI d3d8_texture_3d_SetPrivateData(IDirect3DVolumeTexture8 *if REFGUID guid, const void *data, DWORD data_size, DWORD flags) { struct d3d8_texture *texture = impl_from_IDirect3DVolumeTexture8(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s, data %p, data_size %u, flags %#x.\n", iface, debugstr_guid(guid), data, data_size, flags); - wined3d_mutex_lock(); - resource = wined3d_texture_get_resource(texture->wined3d_texture); - hr = wined3d_resource_set_private_data(resource, guid, data, data_size, flags); - wined3d_mutex_unlock(); - - return hr; + return d3d8_resource_set_private_data(&texture->resource, guid, data, data_size, flags); } static HRESULT WINAPI d3d8_texture_3d_GetPrivateData(IDirect3DVolumeTexture8 *iface, REFGUID guid, void *data, DWORD *data_size) { struct d3d8_texture *texture = impl_from_IDirect3DVolumeTexture8(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s, data %p, data_size %p.\n", iface, debugstr_guid(guid), data, data_size); - wined3d_mutex_lock(); - resource = wined3d_texture_get_resource(texture->wined3d_texture); - hr = wined3d_resource_get_private_data(resource, guid, data, data_size); - wined3d_mutex_unlock(); - - return hr; + return d3d8_resource_get_private_data(&texture->resource, guid, data, data_size); } static HRESULT WINAPI d3d8_texture_3d_FreePrivateData(IDirect3DVolumeTexture8 *iface, REFGUID guid) { struct d3d8_texture *texture = impl_from_IDirect3DVolumeTexture8(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s.\n", iface, debugstr_guid(guid)); - wined3d_mutex_lock(); - resource = wined3d_texture_get_resource(texture->wined3d_texture); - hr = wined3d_resource_free_private_data(resource, guid); - wined3d_mutex_unlock(); - - return hr; + return d3d8_resource_free_private_data(&texture->resource, guid); } static DWORD WINAPI d3d8_texture_3d_SetPriority(IDirect3DVolumeTexture8 *iface, DWORD priority)

1 0

Stefan Dösinger : d3d8: Use the private store api for surfaces.
by Alexandre Julliard 21 Mar '14

21 Mar '14

Module: wine Branch: master Commit: 9a795c528f08660bc244dacecf349afe66b14785 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a795c528f08660bc244dacec… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 21 11:46:23 2014 +0100 d3d8: Use the private store api for surfaces. --- dlls/d3d8/surface.c | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-) diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index c5e2fee..9768946 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -150,52 +150,28 @@ static HRESULT WINAPI d3d8_surface_SetPrivateData(IDirect3DSurface8 *iface, REFG const void *data, DWORD data_size, DWORD flags) { struct d3d8_surface *surface = impl_from_IDirect3DSurface8(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s, data %p, data_size %u, flags %#x.\n", iface, debugstr_guid(guid), data, data_size, flags); - wined3d_mutex_lock(); - resource = wined3d_surface_get_resource(surface->wined3d_surface); - hr = wined3d_resource_set_private_data(resource, guid, data, data_size, flags); - wined3d_mutex_unlock(); - - return hr; + return d3d8_resource_set_private_data(&surface->resource, guid, data, data_size, flags); } static HRESULT WINAPI d3d8_surface_GetPrivateData(IDirect3DSurface8 *iface, REFGUID guid, void *data, DWORD *data_size) { struct d3d8_surface *surface = impl_from_IDirect3DSurface8(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s, data %p, data_size %p.\n", iface, debugstr_guid(guid), data, data_size); - wined3d_mutex_lock(); - resource = wined3d_surface_get_resource(surface->wined3d_surface); - hr = wined3d_resource_get_private_data(resource, guid, data, data_size); - wined3d_mutex_unlock(); - - return hr; + return d3d8_resource_get_private_data(&surface->resource, guid, data, data_size); } static HRESULT WINAPI d3d8_surface_FreePrivateData(IDirect3DSurface8 *iface, REFGUID guid) { struct d3d8_surface *surface = impl_from_IDirect3DSurface8(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s.\n", iface, debugstr_guid(guid)); - wined3d_mutex_lock(); - resource = wined3d_surface_get_resource(surface->wined3d_surface); - hr = wined3d_resource_free_private_data(resource, guid); - wined3d_mutex_unlock(); - - return hr; + return d3d8_resource_free_private_data(&surface->resource, guid); } static HRESULT WINAPI d3d8_surface_GetContainer(IDirect3DSurface8 *iface, REFIID riid, void **container)

1 0

Hans Leidekker : mscms/tests: Fix test failures on Wine when color profiles are present.
by Alexandre Julliard 21 Mar '14

21 Mar '14

Module: wine Branch: master Commit: 5752d4835318e73b66e7e9ac3f622d35c7403080 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5752d4835318e73b66e7e9ac3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 21 19:00:19 2014 +0100 mscms/tests: Fix test failures on Wine when color profiles are present. --- dlls/mscms/tests/profile.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index cfaf2ba..fd35193 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -122,6 +122,8 @@ static const WCHAR profile2W[] = 'c','o','l','o','r','\\','s','r','g','b',' ','c','o','l','o','r',' ', 's','p','a','c','e',' ','p','r','o','f','i','l','e','.','i','c','m',0 }; +static BOOL have_color_profile; + static const unsigned char rgbheader[] = { 0x48, 0x0c, 0x00, 0x00, 0x6f, 0x6e, 0x69, 0x4c, 0x00, 0x00, 0x10, 0x02, 0x72, 0x74, 0x6e, 0x6d, 0x20, 0x42, 0x47, 0x52, 0x20, 0x5a, 0x59, 0x58, @@ -669,7 +671,7 @@ static void test_EnumColorProfilesA( char *standardprofile ) ok( !ret, "EnumColorProfilesA() succeeded (%d)\n", GetLastError() ); ret = pEnumColorProfilesA( NULL, &record, buffer, &size, &number ); - if (standardprofile) + if (have_color_profile) ok( ret, "EnumColorProfilesA() failed (%d)\n", GetLastError() ); else todo_wine ok( ret, "EnumColorProfilesA() failed (%d)\n", GetLastError() ); @@ -683,7 +685,7 @@ static void test_EnumColorProfilesA( char *standardprofile ) size = total; ret = pEnumColorProfilesA( NULL, &record, buffer, &size, &number ); - if (standardprofile) + if (have_color_profile) ok( ret, "EnumColorProfilesA() failed (%d)\n", GetLastError() ); else todo_wine ok( ret, "EnumColorProfilesA() failed (%d)\n", GetLastError() ); @@ -723,7 +725,7 @@ static void test_EnumColorProfilesW( WCHAR *standardprofileW ) ok( !ret, "EnumColorProfilesW() succeeded (%d)\n", GetLastError() ); ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number ); - if (standardprofileW) + if (have_color_profile) ok( ret, "EnumColorProfilesW() failed (%d)\n", GetLastError() ); else todo_wine ok( ret, "EnumColorProfilesW() failed (%d)\n", GetLastError() ); @@ -736,7 +738,7 @@ static void test_EnumColorProfilesW( WCHAR *standardprofileW ) size = total; ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number ); - if (standardprofileW) + if (have_color_profile) ok( ret, "EnumColorProfilesW() failed (%d)\n", GetLastError() ); else todo_wine ok( ret, "EnumColorProfilesW() failed (%d)\n", GetLastError() ); @@ -1317,6 +1319,21 @@ static void test_AssociateColorProfileWithDeviceA( char *testprofile ) } } +static BOOL have_profile(void) +{ + char glob[MAX_PATH + sizeof("\\*.icm")]; + DWORD size = MAX_PATH; + HANDLE handle; + WIN32_FIND_DATAA data; + + if (!pGetColorDirectoryA( NULL, glob, &size )) return FALSE; + lstrcatA( glob, "\\*.icm" ); + handle = FindFirstFileA( glob, &data ); + if (handle == INVALID_HANDLE_VALUE) return FALSE; + FindClose( handle ); + return TRUE; +} + START_TEST(profile) { UINT len; @@ -1392,6 +1409,8 @@ START_TEST(profile) } } + have_color_profile = have_profile(); + test_GetColorDirectoryA(); test_GetColorDirectoryW();

1 0

Hans Leidekker : wbemprox/tests: Don't use infinite timeouts.
by Alexandre Julliard 21 Mar '14

21 Mar '14

Module: wine Branch: master Commit: 6e7440e9b115f75afb54df601a89d5e51e35aac7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e7440e9b115f75afb54df601… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 21 19:01:09 2014 +0100 wbemprox/tests: Don't use infinite timeouts. --- dlls/wbemprox/tests/query.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 8134e3a..9b77b4c 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -46,7 +46,7 @@ static HRESULT exec_query( IWbemServices *services, const WCHAR *str, IEnumWbemC { VARIANT var; - IEnumWbemClassObject_Next( *result, WBEM_INFINITE, 1, &obj, &count ); + IEnumWbemClassObject_Next( *result, 10000, 1, &obj, &count ); if (!count) break; if (IWbemClassObject_Get( obj, captionW, 0, &var, NULL, NULL ) == WBEM_S_NO_ERROR)

1 0

Ken Thomases : winemac: Make the swap interval a property of the window, not the context.
by Alexandre Julliard 21 Mar '14

21 Mar '14

Module: wine Branch: master Commit: 15612dd762e1948d7bb0bd4b061ecd7d180553a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15612dd762e1948d7bb0bd4b0… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Mar 21 00:15:37 2014 -0500 winemac: Make the swap interval a property of the window, not the context. --- dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/opengl.c | 198 +++++++++++++++++++++++++++++++++++---------- dlls/winemac.drv/window.c | 1 + 3 files changed, 156 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=15612dd762e1948d7bb0b…

1 0

Ken Thomases : winex11: Don' t reset OpenGL swap interval of window on SetParent().
by Alexandre Julliard 21 Mar '14

21 Mar '14

Module: wine Branch: master Commit: 6696e7d9e1b59c22b8842803670ed917ebb2a3d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6696e7d9e1b59c22b88428036… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Mar 21 00:18:58 2014 -0500 winex11: Don't reset OpenGL swap interval of window on SetParent(). --- dlls/opengl32/tests/opengl.c | 16 +++++++++++++--- dlls/winex11.drv/opengl.c | 8 ++++---- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 4303d1c..7384cb4 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -1509,7 +1509,7 @@ static void test_swap_control(HDC oldhdc) 0, 0, 0 /* layer masks */ }; int pixel_format; - HWND window1, window2; + HWND window1, window2, old_parent; HGLRC ctx1, ctx2, oldctx; BOOL ret; HDC dc1, dc2; @@ -1550,7 +1550,7 @@ static void test_swap_control(HDC oldhdc) ok(ret, "Failed to set swap interval to 0, last error %#x.\n", GetLastError()); interval = pwglGetSwapIntervalEXT(); - ok(interval == 0, "Expected default swap interval 0, got %d\n", interval); + ok(interval == 0, "Expected swap interval 0, got %d\n", interval); /* Check what interval we get on a second context on the same drawable.*/ ctx2 = wglCreateContext(dc1); @@ -1582,7 +1582,17 @@ static void test_swap_control(HDC oldhdc) * is not global or shared among contexts. */ interval = pwglGetSwapIntervalEXT(); - ok(interval == 1, "Expected swap interval 1, got %d\n", interval); + ok(interval == 1, "Expected default swap interval 1, got %d\n", interval); + + /* Test if setting the parent of a window resets the swap interval. */ + ret = wglMakeCurrent(dc1, ctx1); + ok(ret, "Failed to make context current, last error %#x.\n", GetLastError()); + + old_parent = SetParent(window1, window2); + ok(!!old_parent, "Failed to make window1 a child of window2, last error %#x.\n", GetLastError()); + + interval = pwglGetSwapIntervalEXT(); + ok(interval == 0, "Expected swap interval 0, got %d\n", interval); ret = wglDeleteContext(ctx1); ok(ret, "Failed to delete GL context, last error %#x.\n", GetLastError()); diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index d06565a..759e51f 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1253,10 +1253,6 @@ static void free_gl_drawable( struct gl_drawable *gl ) static BOOL create_gl_drawable( HWND hwnd, HWND parent, struct gl_drawable *gl ) { gl->drawable = 0; - /* Default GLX and WGL swap interval is 1, but in case of glXSwapIntervalSGI - * there is no way to query it, so we have to store it here. - */ - gl->swap_interval = 1; if (GetAncestor( hwnd, GA_PARENT ) == GetDesktopWindow()) /* top-level window */ { @@ -1331,6 +1327,10 @@ static BOOL set_win_format( HWND hwnd, const struct wgl_pixel_format *format ) struct gl_drawable *gl, *prev; gl = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*gl) ); + /* Default GLX and WGL swap interval is 1, but in case of glXSwapIntervalSGI + * there is no way to query it, so we have to store it here. + */ + gl->swap_interval = 1; gl->format = format; gl->visual = pglXGetVisualFromFBConfig( gdi_display, format->fbconfig ); if (!gl->visual)

1 0