February 2015 - Wine-Commits

Stefan Dösinger : wined3d: Read WINED3D_TEXTURE_COLOR_KEY and gl_color_key to find format conversions.
by Alexandre Julliard Feb. 18, 2015

Feb. 18, 2015

Module: wine Branch: master Commit: 52ab9e382e7ac7a538a2688aee9cc2fb8367cc40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52ab9e382e7ac7a538a2688ae… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Feb 17 23:09:37 2015 +0100 wined3d: Read WINED3D_TEXTURE_COLOR_KEY and gl_color_key to find format conversions. The idea is to make it clear that wined3d_texture_load is responsible for checking the color key for changes. Once we can do color keying in the shader we also have one place where we can disable the surface conversion. --- dlls/wined3d/surface.c | 2 +- dlls/wined3d/utils.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 06d8433..096579f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4217,7 +4217,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, if (texture->swapchain && texture->swapchain->palette) palette = texture->swapchain->palette; conversion->convert(data.addr, src_pitch, mem, dst_pitch, - width, height, palette, &texture->src_blt_color_key); + width, height, palette, &texture->gl_color_key); src_pitch = dst_pitch; data.addr = mem; } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 9e9fc49..1ce23ac 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -795,7 +795,7 @@ const struct wined3d_color_key_conversion * wined3d_format_get_color_key_convers WINED3DFMT_B8G8R8A8_UNORM, convert_p8_uint_b8g8r8a8_unorm }; - if (need_alpha_ck && (texture->color_key_flags & WINED3D_CKEY_SRC_BLT)) + if (need_alpha_ck && (texture->flags & WINED3D_TEXTURE_COLOR_KEY)) { for (i = 0; i < sizeof(color_key_info) / sizeof(*color_key_info); ++i) {

1 0

Henri Verbeet : d3d10core: Get rid of the "partial stub" FIXME in d3d10_device_CreateTexture2D().
by Alexandre Julliard Feb. 18, 2015

Feb. 18, 2015

Module: wine Branch: master Commit: e46bdc28f68a8d8d585376027e8072bb449c74bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e46bdc28f68a8d8d585376027… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 18 10:39:31 2015 +0100 d3d10core: Get rid of the "partial stub" FIXME in d3d10_device_CreateTexture2D(). --- dlls/d3d10core/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 7b811a6..7f41360 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1418,7 +1418,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture2D(ID3D10Device1 *ifa struct d3d10_texture2d *object; HRESULT hr; - FIXME("iface %p, desc %p, data %p, texture %p partial stub!\n", iface, desc, data, texture); + TRACE("iface %p, desc %p, data %p, texture %p.\n", iface, desc, data, texture); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object)

1 0

Henri Verbeet : d3d10core: Get rid of the "partial stub" FIXME in d3d10_device_CreateBuffer().
by Alexandre Julliard Feb. 18, 2015

Feb. 18, 2015

Module: wine Branch: master Commit: 58896c610f083997ab2cb1378fd7ed6dc1057d0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=58896c610f083997ab2cb1378… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 18 10:39:30 2015 +0100 d3d10core: Get rid of the "partial stub" FIXME in d3d10_device_CreateBuffer(). At this point it doesn't really add anything anymore. --- dlls/d3d10core/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index ccac3f2..7b811a6 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1381,7 +1381,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBuffer(ID3D10Device1 *iface, struct d3d10_buffer *object; HRESULT hr; - FIXME("iface %p, desc %p, data %p, buffer %p partial stub!\n", iface, desc, data, buffer); + TRACE("iface %p, desc %p, data %p, buffer %p.\n", iface, desc, data, buffer); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object)

1 0

Bruno Jesus : rsaenh/tests: Fix a copy & paste issue.
by Alexandre Julliard Feb. 18, 2015

Feb. 18, 2015

Module: wine Branch: master Commit: 4d43d364e80326fa0bb571b6f0bb7ccb7e1a1a0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d43d364e80326fa0bb571b6f… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Feb 18 12:25:21 2015 -0200 rsaenh/tests: Fix a copy & paste issue. --- dlls/rsaenh/tests/rsaenh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 072f08a..da74ffb 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1728,7 +1728,7 @@ static void test_rc4(void) dwLen = 0; result = CryptGetKeyParam(hKey, KP_SALT, NULL, &dwLen, 0); ok(result, "%08x\n", GetLastError()); - if (BASE_PROV || STRONG_PROV || nt4) + if (BASE_PROV || STRONG_PROV) ok(dwLen == 11, "expected salt length 11, got %d\n", dwLen); else ok(dwLen == 0 || broken(nt4 && dwLen == 11), "expected salt length 0, got %d\n", dwLen);

1 0

Stefan Dösinger : wined3d: Manage color key changes in the texture.
by Alexandre Julliard Feb. 18, 2015

Feb. 18, 2015

Module: wine Branch: master Commit: e53d22b0c002bbea2dfa3fc40d9587ee8b905018 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e53d22b0c002bbea2dfa3fc40… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Feb 17 23:09:36 2015 +0100 wined3d: Manage color key changes in the texture. This fixes a regression with color keyed mipmaps that was introduced by ee8a5b7dd1e554ef32229c766715f23ba17c9f6c. surface_load for level n+1 would call texture_force_reload, thus removing level n from the GL texture. --- dlls/wined3d/surface.c | 36 ++---------------------------------- dlls/wined3d/texture.c | 25 ++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 9 ++++----- 3 files changed, 30 insertions(+), 40 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8f60769..06d8433 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1814,43 +1814,18 @@ GLenum surface_get_gl_buffer(const struct wined3d_surface *surface) void surface_load(struct wined3d_surface *surface, BOOL srgb) { DWORD location = srgb ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB; - BOOL ck_changed; TRACE("surface %p, srgb %#x.\n", surface, srgb); if (surface->resource.pool == WINED3D_POOL_SCRATCH) ERR("Not supported on scratch surfaces.\n"); - ck_changed = !(surface->flags & SFLAG_GLCKEY) != !(surface->container->color_key_flags & WINED3D_CKEY_SRC_BLT); - - /* Reload if either the texture and sysmem have different ideas about the - * color key, or the actual key values changed. */ - if (ck_changed || ((surface->container->color_key_flags & WINED3D_CKEY_SRC_BLT) - && (surface->gl_color_key.color_space_low_value - != surface->container->src_blt_color_key.color_space_low_value - || surface->gl_color_key.color_space_high_value - != surface->container->src_blt_color_key.color_space_high_value))) - { - TRACE("Reloading because of color keying\n"); - /* To perform the color key conversion we need a sysmem copy of - * the surface. Make sure we have it. */ - - surface_prepare_map_memory(surface); - surface_load_location(surface, surface->resource.map_binding); - surface_invalidate_location(surface, ~surface->resource.map_binding); - /* Switching color keying on / off may change the internal format. */ - if (ck_changed) - wined3d_texture_force_reload(surface->container); - } - else if (!(surface->locations & location)) - { - TRACE("Reloading because surface is dirty.\n"); - } - else + if (surface->locations & location) { TRACE("surface is already in texture\n"); return; } + TRACE("Reloading because surface is dirty.\n"); surface_load_location(surface, location); surface_evict_sysmem(surface); @@ -4179,13 +4154,6 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, wined3d_texture_prepare_texture(texture, context, srgb); wined3d_texture_bind_and_dirtify(texture, context, srgb); - if (texture->color_key_flags & WINED3D_CKEY_SRC_BLT) - { - surface->flags |= SFLAG_GLCKEY; - surface->gl_color_key = texture->src_blt_color_key; - } - else surface->flags &= ~SFLAG_GLCKEY; - width = surface->resource.width; src_pitch = wined3d_surface_get_pitch(surface); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 57c8ef7..675ca9e 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -456,6 +456,22 @@ void wined3d_texture_load(struct wined3d_texture *texture, else flag = WINED3D_TEXTURE_RGB_VALID; + if (!(texture->flags & WINED3D_TEXTURE_COLOR_KEY) != !(texture->color_key_flags & WINED3D_CKEY_SRC_BLT) + || (texture->flags & WINED3D_TEXTURE_COLOR_KEY + && (texture->gl_color_key.color_space_low_value != texture->src_blt_color_key.color_space_low_value + || texture->gl_color_key.color_space_high_value != texture->src_blt_color_key.color_space_high_value))) + { + unsigned int sub_count = texture->level_count * texture->layer_count; + unsigned int i; + + TRACE("Reloading because of color key value change.\n"); + for (i = 0; i < sub_count; i++) + texture->texture_ops->texture_sub_resource_add_dirty_region(texture->sub_resources[i], NULL); + wined3d_texture_set_dirty(texture); + + texture->gl_color_key = texture->src_blt_color_key; + } + if (texture->flags & flag) { TRACE("Texture %p not dirty, nothing to do.\n", texture); @@ -665,9 +681,15 @@ void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct win { DWORD alloc_flag = srgb ? WINED3D_TEXTURE_SRGB_ALLOCATED : WINED3D_TEXTURE_RGB_ALLOCATED; + if (!(texture->flags & WINED3D_TEXTURE_COLOR_KEY) != !(texture->color_key_flags & WINED3D_CKEY_SRC_BLT)) + wined3d_texture_force_reload(texture); + if (texture->flags & alloc_flag) return; + if (texture->color_key_flags & WINED3D_CKEY_SRC_BLT) + texture->flags |= WINED3D_TEXTURE_COLOR_KEY; + texture->texture_ops->texture_prepare_texture(texture, context, srgb); texture->flags |= alloc_flag; } @@ -677,7 +699,8 @@ void wined3d_texture_force_reload(struct wined3d_texture *texture) unsigned int sub_count = texture->level_count * texture->layer_count; unsigned int i; - texture->flags &= ~(WINED3D_TEXTURE_RGB_ALLOCATED | WINED3D_TEXTURE_SRGB_ALLOCATED | WINED3D_TEXTURE_CONVERTED); + texture->flags &= ~(WINED3D_TEXTURE_RGB_ALLOCATED | WINED3D_TEXTURE_SRGB_ALLOCATED + | WINED3D_TEXTURE_CONVERTED | WINED3D_TEXTURE_COLOR_KEY); for (i = 0; i < sub_count; ++i) { texture->texture_ops->texture_sub_resource_invalidate_location(texture->sub_resources[i], diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d924271..b0c7a53 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2181,6 +2181,7 @@ struct wined3d_texture_ops #define WINED3D_TEXTURE_PIN_SYSMEM 0x00000100 #define WINED3D_TEXTURE_DYNAMIC_MAP 0x00000200 #define WINED3D_TEXTURE_NORMALIZED_COORDS 0x00000400 +#define WINED3D_TEXTURE_COLOR_KEY 0x00000800 struct wined3d_texture { @@ -2203,6 +2204,7 @@ struct wined3d_texture struct wined3d_color_key src_blt_color_key; struct wined3d_color_key dst_overlay_color_key; struct wined3d_color_key src_overlay_color_key; + struct wined3d_color_key gl_color_key; DWORD color_key_flags; }; @@ -2336,8 +2338,6 @@ struct wined3d_surface struct wined3d_surface_dib dib; HDC hDC; - struct wined3d_color_key gl_color_key; - struct list renderbuffers; const struct wined3d_renderbuffer_entry *current_renderbuffer; SIZE ds_current_size; @@ -2404,9 +2404,8 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D #define SFLAG_DISCARD 0x00000002 /* ??? */ #define SFLAG_NONPOW2 0x00000004 /* Surface sizes are not a power of 2 */ #define SFLAG_LOST 0x00000008 /* Surface lost flag for ddraw. */ -#define SFLAG_GLCKEY 0x00000010 /* The GL texture was created with a color key. */ -#define SFLAG_CLIENT 0x00000020 /* GL_APPLE_client_storage is used with this surface. */ -#define SFLAG_DCINUSE 0x00000040 /* Set between GetDC and ReleaseDC calls. */ +#define SFLAG_CLIENT 0x00000010 /* GL_APPLE_client_storage is used with this surface. */ +#define SFLAG_DCINUSE 0x00000020 /* Set between GetDC and ReleaseDC calls. */ struct wined3d_sampler {

1 0

Henri Verbeet : d2d1: Implement d2d_factory_CreateDrawingStateBlock().
by Alexandre Julliard Feb. 18, 2015

Feb. 18, 2015

Module: wine Branch: master Commit: a6409ed027d31d7f2541b8515f4abb369a57ece0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6409ed027d31d7f2541b8515… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 18 10:39:29 2015 +0100 d2d1: Implement d2d_factory_CreateDrawingStateBlock(). --- dlls/d2d1/Makefile.in | 1 + dlls/d2d1/d2d1_private.h | 9 ++++ dlls/d2d1/factory.c | 14 +++++- dlls/d2d1/state_block.c | 123 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 145 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/Makefile.in b/dlls/d2d1/Makefile.in index 1e829da..2828bac 100644 --- a/dlls/d2d1/Makefile.in +++ b/dlls/d2d1/Makefile.in @@ -8,6 +8,7 @@ C_SRCS = \ factory.c \ mesh.c \ render_target.c \ + state_block.c \ stroke.c \ wic_render_target.c diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 72c1c57..42694d2 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -170,4 +170,13 @@ HRESULT d2d_bitmap_init(struct d2d_bitmap *bitmap, struct d2d_d3d_render_target D2D1_SIZE_U size, const void *src_data, UINT32 pitch, const D2D1_BITMAP_PROPERTIES *desc) DECLSPEC_HIDDEN; struct d2d_bitmap *unsafe_impl_from_ID2D1Bitmap(ID2D1Bitmap *iface) DECLSPEC_HIDDEN; +struct d2d_state_block +{ + ID2D1DrawingStateBlock ID2D1DrawingStateBlock_iface; + LONG refcount; +}; + +void d2d_state_block_init(struct d2d_state_block *state_block, const D2D1_DRAWING_STATE_DESCRIPTION *desc, + IDWriteRenderingParams *text_rendering_params) DECLSPEC_HIDDEN; + #endif /* __WINE_D2D1_PRIVATE_H */ diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 27370c1..918fa13 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -165,10 +165,20 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDrawingStateBlock(ID2D1Factor const D2D1_DRAWING_STATE_DESCRIPTION *desc, IDWriteRenderingParams *text_rendering_params, ID2D1DrawingStateBlock **state_block) { - FIXME("iface %p, desc %p, text_rendering_params %p, state_block %p stub!\n", + struct d2d_state_block *object; + + TRACE("iface %p, desc %p, text_rendering_params %p, state_block %p.\n", iface, desc, text_rendering_params, state_block); - return E_NOTIMPL; + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + d2d_state_block_init(object, desc, text_rendering_params); + + TRACE("Created state block %p.\n", object); + *state_block = &object->ID2D1DrawingStateBlock_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_factory_CreateWicBitmapRenderTarget(ID2D1Factory *iface, diff --git a/dlls/d2d1/state_block.c b/dlls/d2d1/state_block.c new file mode 100644 index 0000000..4aa8cd4 --- /dev/null +++ b/dlls/d2d1/state_block.c @@ -0,0 +1,123 @@ +/* + * Copyright 2015 Henri Verbeet 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 + */ + +#include "config.h" +#include "wine/port.h" + +#include "d2d1_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d2d); + +static inline struct d2d_state_block *impl_from_ID2D1DrawingStateBlock(ID2D1DrawingStateBlock *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_state_block, ID2D1DrawingStateBlock_iface); +} + +static HRESULT STDMETHODCALLTYPE d2d_state_block_QueryInterface(ID2D1DrawingStateBlock *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_ID2D1DrawingStateBlock) + || IsEqualGUID(iid, &IID_ID2D1Resource) + || IsEqualGUID(iid, &IID_IUnknown)) + { + ID2D1DrawingStateBlock_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d2d_state_block_AddRef(ID2D1DrawingStateBlock *iface) +{ + struct d2d_state_block *state_block = impl_from_ID2D1DrawingStateBlock(iface); + ULONG refcount = InterlockedIncrement(&state_block->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d2d_state_block_Release(ID2D1DrawingStateBlock *iface) +{ + struct d2d_state_block *state_block = impl_from_ID2D1DrawingStateBlock(iface); + ULONG refcount = InterlockedDecrement(&state_block->refcount); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); + + if (!refcount) + HeapFree(GetProcessHeap(), 0, state_block); + + return refcount; +} + +static void STDMETHODCALLTYPE d2d_state_block_GetFactory(ID2D1DrawingStateBlock *iface, ID2D1Factory **factory) +{ + FIXME("iface %p, factory %p stub!\n", iface, factory); + + *factory = NULL; +} + +static void STDMETHODCALLTYPE d2d_state_block_GetDescription(ID2D1DrawingStateBlock *iface, + D2D1_DRAWING_STATE_DESCRIPTION *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); +} + +static void STDMETHODCALLTYPE d2d_state_block_SetDescription(ID2D1DrawingStateBlock *iface, + const D2D1_DRAWING_STATE_DESCRIPTION *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); +} + +static void STDMETHODCALLTYPE d2d_state_block_SetTextRenderingParams(ID2D1DrawingStateBlock *iface, + IDWriteRenderingParams *text_rendering_params) +{ + FIXME("iface %p, text_rendering_params %p stub!\n", iface, text_rendering_params); +} + +static void STDMETHODCALLTYPE d2d_state_block_GetTextRenderingParams(ID2D1DrawingStateBlock *iface, + IDWriteRenderingParams **text_rendering_params) +{ + FIXME("iface %p, text_rendering_params %p stub!\n", iface, text_rendering_params); +} + +static const struct ID2D1DrawingStateBlockVtbl d2d_state_block_vtbl = +{ + d2d_state_block_QueryInterface, + d2d_state_block_AddRef, + d2d_state_block_Release, + d2d_state_block_GetFactory, + d2d_state_block_GetDescription, + d2d_state_block_SetDescription, + d2d_state_block_SetTextRenderingParams, + d2d_state_block_GetTextRenderingParams, +}; + +void d2d_state_block_init(struct d2d_state_block *state_block, const D2D1_DRAWING_STATE_DESCRIPTION *desc, + IDWriteRenderingParams *text_rendering_params) +{ + FIXME("Ignoring state block properties.\n"); + + state_block->ID2D1DrawingStateBlock_iface.lpVtbl = &d2d_state_block_vtbl; + state_block->refcount = 1; +}

1 0

Alistair Leslie-Hughes : shell32: Implement IApplicationAssociationRegistration QueryCurrentDefault.
by Alexandre Julliard Feb. 18, 2015

Feb. 18, 2015

Module: wine Branch: master Commit: 31219559568fbf88db8fd704792ba59cc28076cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=31219559568fbf88db8fd7047… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Mar 25 11:36:06 2014 +1100 shell32: Implement IApplicationAssociationRegistration QueryCurrentDefault. --- dlls/shell32/assoc.c | 90 ++++++++++++++++++++++++++++++++++++++++++++-- dlls/shell32/tests/assoc.c | 67 ++++++++++++++++++++++++++-------- 2 files changed, 140 insertions(+), 17 deletions(-) diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c index f3c8e65..528666e 100644 --- a/dlls/shell32/assoc.c +++ b/dlls/shell32/assoc.c @@ -873,11 +873,95 @@ static ULONG WINAPI ApplicationAssociationRegistration_Release(IApplicationAssoc return ref; } -static HRESULT WINAPI ApplicationAssociationRegistration_QueryCurrentDefault(IApplicationAssociationRegistration* This, LPCWSTR query, +static HRESULT WINAPI ApplicationAssociationRegistration_QueryCurrentDefault(IApplicationAssociationRegistration *iface, LPCWSTR query, ASSOCIATIONTYPE type, ASSOCIATIONLEVEL level, LPWSTR *association) { - FIXME("(%p)->(%s, %d, %d, %p)\n", This, debugstr_w(query), type, level, association); - return E_NOTIMPL; + IApplicationAssociationRegistrationImpl *This = impl_from_IApplicationAssociationRegistration(iface); + static WCHAR urlassoc[] = {'U','r','l','A','s','s','o','c','i','a','t','i','o','n','s',0}; + static WCHAR mimeassoc[] = {'M','I','M','E','A','s','s','o','c','i','a','t','i','o','n','s',0}; + static WCHAR assocations[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\','S','h','e','l','l','\\', + 'A','s','s','o','c','i','a','t','i','o','n','s',0}; + static WCHAR slash[] = {'\\',0}; + static WCHAR choice[] = {'U','s','e','r','C','h','o','i','c','e',0}; + static WCHAR propid[] = {'P','r','o','g','i','d',0}; + WCHAR path[MAX_PATH] = {0}; + DWORD ret, keytype, size; + HKEY hkey = NULL; + HRESULT hr = HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION); + + TRACE("(%p)->(%s, %d, %d, %p)\n", This, debugstr_w(query), type, level, association); + + if(!association) + return E_INVALIDARG; + + *association = NULL; + + if((type == AT_URLPROTOCOL || type == AT_FILEEXTENSION) && !lstrlenW(query)) + return E_INVALIDARG; + else if(type == AT_FILEEXTENSION && query[0] != '.') + return E_INVALIDARG; + + if(type == AT_FILEEXTENSION) + { + ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, query, 0, KEY_READ, &hkey); + if(ret == ERROR_SUCCESS) + { + ret = RegGetValueW(hkey, NULL, NULL, RRF_RT_REG_SZ, &keytype, NULL, &size); + if(ret == ERROR_SUCCESS) + { + *association = CoTaskMemAlloc(size); + if(*association) + { + ret = RegGetValueW(hkey, NULL, NULL, RRF_RT_REG_SZ, &keytype, *association, &size); + if(ret == ERROR_SUCCESS) + hr = S_OK; + } + else + hr = E_OUTOFMEMORY; + } + } + } + else + { + ret = RegOpenKeyExW(HKEY_CURRENT_USER, assocations, 0, KEY_READ, &hkey); + if(ret == ERROR_SUCCESS) + { + if(type == AT_URLPROTOCOL) + lstrcpyW(path, urlassoc); + else if(type == AT_MIMETYPE) + lstrcpyW(path, mimeassoc); + else + { + WARN("Unsupported type (%d).\n", type); + RegCloseKey(hkey); + return hr; + } + + lstrcatW(path, slash); + lstrcatW(path, query); + lstrcatW(path, slash); + lstrcatW(path, choice); + + ret = RegGetValueW(hkey, path, propid, RRF_RT_REG_SZ, &keytype, NULL, &size); + if(ret == ERROR_SUCCESS) + { + *association = CoTaskMemAlloc(size); + if(*association) + { + ret = RegGetValueW(hkey, path, propid, RRF_RT_REG_SZ, &keytype, *association, &size); + if(ret == ERROR_SUCCESS) + hr = S_OK; + } + else + hr = E_OUTOFMEMORY; + } + } + } + + RegCloseKey(hkey); + + return hr; } static HRESULT WINAPI ApplicationAssociationRegistration_QueryAppIsDefault(IApplicationAssociationRegistration* This, LPCWSTR query, diff --git a/dlls/shell32/tests/assoc.c b/dlls/shell32/tests/assoc.c index f35938b..8aa2535 100644 --- a/dlls/shell32/tests/assoc.c +++ b/dlls/shell32/tests/assoc.c @@ -57,22 +57,12 @@ static void test_IQueryAssociations_QueryInterface(void) } -static void test_IApplicationAssociationRegistration_QueryInterface(void) +static void test_IApplicationAssociationRegistration_QueryInterface(IApplicationAssociationRegistration *appreg) { - IApplicationAssociationRegistration *appreg; IApplicationAssociationRegistration *appreg2; IUnknown *unk; HRESULT hr; - /* this works since Vista */ - hr = CoCreateInstance(&CLSID_ApplicationAssociationRegistration, NULL, CLSCTX_INPROC_SERVER, - &IID_IApplicationAssociationRegistration, (LPVOID*)&appreg); - - if (FAILED(hr)) { - skip("IApplicationAssociationRegistration not created: 0x%x\n", hr); - return; - } - hr = IApplicationAssociationRegistration_QueryInterface(appreg, &IID_IApplicationAssociationRegistration, (void**)&appreg2); ok(hr == S_OK, "QueryInterface (IApplicationAssociationRegistration) returned 0x%x\n", hr); @@ -88,8 +78,6 @@ static void test_IApplicationAssociationRegistration_QueryInterface(void) hr = IApplicationAssociationRegistration_QueryInterface(appreg, &IID_IUnknown, NULL); ok(hr == E_POINTER, "got 0x%x (expected E_POINTER)\n", hr); - - IApplicationAssociationRegistration_Release(appreg); } struct assoc_getstring_test @@ -189,9 +177,49 @@ static void test_IQueryAssociations_Init(void) IQueryAssociations_Release(assoc); } +static void test_IApplicationAssociationRegistration_QueryCurrentDefault(IApplicationAssociationRegistration *appreg) +{ + static const WCHAR emptyW[] = {0}; + static const WCHAR txtW[] = {'.','t','x','t',0}; + static const WCHAR spacetxtW[] = {' ','.','t','x','t',0}; + HRESULT hr; + LPWSTR assocprog = NULL; + + hr = IApplicationAssociationRegistration_QueryCurrentDefault(appreg, emptyW, AT_URLPROTOCOL, AL_EFFECTIVE, &assocprog); + ok(hr == E_INVALIDARG, "got 0x%x\n", hr); + + hr = IApplicationAssociationRegistration_QueryCurrentDefault(appreg, emptyW, AT_FILEEXTENSION, AL_EFFECTIVE, &assocprog); + ok(hr == E_INVALIDARG, "got 0x%x\n", hr); + + hr = IApplicationAssociationRegistration_QueryCurrentDefault(appreg, spacetxtW, AT_FILEEXTENSION, AL_EFFECTIVE, &assocprog); + ok(hr == E_INVALIDARG || hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION) /*Win8*/, "got 0x%x\n", hr); + + hr = IApplicationAssociationRegistration_QueryCurrentDefault(appreg, httpW, AT_URLPROTOCOL, AL_EFFECTIVE, NULL); + ok(hr == E_INVALIDARG, "got 0x%x\n", hr); + + /* AT_FILEEXTENSION must start with a period */ + hr = IApplicationAssociationRegistration_QueryCurrentDefault(appreg, txtW, AT_FILEEXTENSION, AL_EFFECTIVE, &assocprog); + ok(hr == S_OK, "got 0x%x\n", hr); + trace("%s\n", wine_dbgstr_w(assocprog)); + CoTaskMemFree(assocprog); + + hr = IApplicationAssociationRegistration_QueryCurrentDefault(appreg, emptyW, AT_STARTMENUCLIENT, AL_EFFECTIVE, &assocprog); + ok(hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION), "got 0x%x\n", hr); + + hr = IApplicationAssociationRegistration_QueryCurrentDefault(appreg, emptyW, AT_MIMETYPE, AL_EFFECTIVE, &assocprog); + ok(hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION), "got 0x%x\n", hr); + + hr = IApplicationAssociationRegistration_QueryCurrentDefault(appreg, httpW, AT_URLPROTOCOL, AL_EFFECTIVE, &assocprog); + todo_wine ok(hr == S_OK, "got 0x%x\n", hr); + trace("%s\n", wine_dbgstr_w(assocprog)); + + CoTaskMemFree(assocprog); +} + START_TEST(assoc) { IQueryAssociations *qa; + IApplicationAssociationRegistration *appreg = NULL; HRESULT hr; CoInitialize(NULL); @@ -209,7 +237,18 @@ START_TEST(assoc) else win_skip("IQueryAssociations not supported, 0x%x\n", hr); - test_IApplicationAssociationRegistration_QueryInterface(); + /* this works since Vista */ + hr = CoCreateInstance(&CLSID_ApplicationAssociationRegistration, NULL, CLSCTX_INPROC_SERVER, + &IID_IApplicationAssociationRegistration, (LPVOID*)&appreg); + if (hr == S_OK) + { + test_IApplicationAssociationRegistration_QueryInterface(appreg); + test_IApplicationAssociationRegistration_QueryCurrentDefault(appreg); + + IApplicationAssociationRegistration_Release(appreg); + } + else + win_skip("IApplicationAssociationRegistration not supported: 0x%x\n", hr); CoUninitialize(); }

1 0

Michael Stefaniuc : quartz: Remove an always true conditional subexpression (PVS-Studio).
by Alexandre Julliard Feb. 18, 2015

Feb. 18, 2015

Module: wine Branch: master Commit: 2e54309f39821f88eca80ad79068cc3df135af60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e54309f39821f88eca80ad79… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 18 00:11:40 2015 +0100 quartz: Remove an always true conditional subexpression (PVS-Studio). --- dlls/quartz/pin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 78b6fa2..8377be5 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -268,7 +268,7 @@ HRESULT WINAPI PullPin_ReceiveConnection(IPin * iface, IPin * pReceivePin, const props.cbAlign = 1; props.cbPrefix = 0; - if (SUCCEEDED(hr) && (This->fnQueryAccept(This->pUserData, pmt) != S_OK)) + if (This->fnQueryAccept(This->pUserData, pmt) != S_OK) hr = VFW_E_TYPE_NOT_ACCEPTED; /* FIXME: shouldn't we just map common errors onto * VFW_E_TYPE_NOT_ACCEPTED and pass the value on otherwise? */

1 0

Michael Stefaniuc : riched20: IDC_IBEAM is already an int resource ( PVS-Studio).
by Alexandre Julliard Feb. 18, 2015

Feb. 18, 2015

Module: wine Branch: master Commit: 54d3816eb835d73c1c68f8201cc68883e96bcaa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54d3816eb835d73c1c68f8201… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 18 00:06:55 2015 +0100 riched20: IDC_IBEAM is already an int resource (PVS-Studio). --- dlls/riched20/editor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index ca316d2..7632d47 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4818,7 +4818,7 @@ static BOOL ME_RegisterEditorClass(HINSTANCE hInstance) wcW.cbWndExtra = sizeof(ME_TextEditor *); wcW.hInstance = NULL; /* hInstance would register DLL-local class */ wcW.hIcon = NULL; - wcW.hCursor = LoadCursorW(NULL, MAKEINTRESOURCEW(IDC_IBEAM)); + wcW.hCursor = LoadCursorW(NULL, (LPWSTR)IDC_IBEAM); wcW.hbrBackground = GetStockObject(NULL_BRUSH); wcW.lpszMenuName = NULL; @@ -4844,7 +4844,7 @@ static BOOL ME_RegisterEditorClass(HINSTANCE hInstance) wcA.cbWndExtra = sizeof(ME_TextEditor *); wcA.hInstance = NULL; /* hInstance would register DLL-local class */ wcA.hIcon = NULL; - wcA.hCursor = LoadCursorW(NULL, MAKEINTRESOURCEW(IDC_IBEAM)); + wcA.hCursor = LoadCursorW(NULL, (LPWSTR)IDC_IBEAM); wcA.hbrBackground = GetStockObject(NULL_BRUSH); wcA.lpszMenuName = NULL; wcA.lpszClassName = RICHEDIT_CLASS20A;

1 0

Nikolay Sivov : wshom.ocx: Implement RegWrite().
by Alexandre Julliard Feb. 18, 2015

Feb. 18, 2015

Module: wine Branch: master Commit: 4588bb117094f71de5ac9601fbc758ad6a8c9b30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4588bb117094f71de5ac9601f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 18 08:39:25 2015 +0300 wshom.ocx: Implement RegWrite(). --- dlls/wshom.ocx/Makefile.in | 2 +- dlls/wshom.ocx/shell.c | 156 +++++++++++++++++++++++++++++++++++-------- dlls/wshom.ocx/tests/wshom.c | 81 +++++++++++++++++++++- 3 files changed, 210 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4588bb117094f71de5ac9…

1 0