December 2014 - Wine-commits

André Hentschel : d3dx9_36/tests: Remove unused function (Clang).
by Alexandre Julliard 01 Dec '14

01 Dec '14

Module: wine Branch: master Commit: 09761309ad94f6126de6226fc7d1d147a6d7bb84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09761309ad94f6126de6226fc… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Nov 30 13:15:37 2014 +0100 d3dx9_36/tests: Remove unused function (Clang). --- dlls/d3dx9_36/tests/surface.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 5846281..7a4dff8 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -24,12 +24,6 @@ #include "d3dx9tex.h" #include "resources.h" -static inline int get_ref(IUnknown *obj) -{ - IUnknown_AddRef(obj); - return IUnknown_Release(obj); -} - #define check_release(obj, exp) _check_release(__LINE__, obj, exp) static inline void _check_release(unsigned int line, IUnknown *obj, int exp) {

1 0

Marcus Meissner : server: Initialize the _len parts to 0 (Coverity).
by Alexandre Julliard 01 Dec '14

01 Dec '14

Module: wine Branch: master Commit: ea5808dff5a36f5950ad9da4b177b8ba86d0506e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea5808dff5a36f5950ad9da4b… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Nov 30 13:50:04 2014 +0100 server: Initialize the _len parts to 0 (Coverity). --- server/object.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/server/object.c b/server/object.c index ec196c1..d4afefd 100644 --- a/server/object.c +++ b/server/object.c @@ -451,6 +451,7 @@ int set_sd_defaults_from_token( struct object *obj, const struct security_descri owner = token_get_user( token ); new_sd.owner_len = security_sid_len( owner ); } + else new_sd.owner_len = 0; if (set_info & GROUP_SECURITY_INFORMATION && sd->group_len) { @@ -467,6 +468,7 @@ int set_sd_defaults_from_token( struct object *obj, const struct security_descri group = token_get_primary_group( token ); new_sd.group_len = security_sid_len( group ); } + else new_sd.group_len = 0; new_sd.control |= SE_SACL_PRESENT; sacl = sd_get_sacl( sd, &present ); @@ -479,9 +481,7 @@ int set_sd_defaults_from_token( struct object *obj, const struct security_descri if (obj->sd && present) new_sd.sacl_len = obj->sd->sacl_len; else - { new_sd.sacl_len = 0; - } } new_sd.control |= SE_DACL_PRESENT; @@ -499,6 +499,7 @@ int set_sd_defaults_from_token( struct object *obj, const struct security_descri dacl = token_get_default_dacl( token ); new_sd.dacl_len = dacl->AclSize; } + else new_sd.dacl_len = 0; } ptr = mem_alloc( sizeof(new_sd) + new_sd.owner_len + new_sd.group_len +

1 0

Nikolay Sivov : comctl32/tests: Fix imagelist leak (Valgrind).
by Alexandre Julliard 01 Dec '14

01 Dec '14

Module: wine Branch: master Commit: 44dbf381a73b21ca34c3f9aa7f5af79203d7a935 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44dbf381a73b21ca34c3f9aa7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 1 08:16:39 2014 +0300 comctl32/tests: Fix imagelist leak (Valgrind). --- dlls/comctl32/tests/imagelist.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 921a16a..6f13846 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -295,6 +295,7 @@ static void test_begindrag(void) drag = ImageList_GetDragImage(NULL, NULL); ok(ret && drag, "ImageList drag was created\n"); ImageList_EndDrag(); + ImageList_Destroy(himl); } static void test_hotspot(void)

1 0

Henri Verbeet : wined3d: Assign the name to the correct signature in pixelshader_init().
by Alexandre Julliard 01 Dec '14

01 Dec '14

Module: wine Branch: master Commit: 55eb6c692264de661ace1d2ef66b8ba9a0990bab URL: http://source.winehq.org/git/wine.git/?a=commit;h=55eb6c692264de661ace1d2ef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 1 08:45:41 2014 +0100 wined3d: Assign the name to the correct signature in pixelshader_init(). --- dlls/wined3d/shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index f32d248..796a924 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2346,7 +2346,7 @@ static HRESULT pixelshader_init(struct wined3d_shader *shader, struct wined3d_de len = strlen(e->semantic_name); memcpy(ptr, e->semantic_name, len + 1); - shader->output_signature[e->register_idx].semantic_name = ptr; + shader->input_signature[e->register_idx].semantic_name = ptr; ptr += len + 1; } }

1 0

Henri Verbeet : wined3d: Unbind shader resource views in state_unbind_resources().
by Alexandre Julliard 01 Dec '14

01 Dec '14

Module: wine Branch: master Commit: 08b06b7d8f7396937c3d278219ce3b6cefa0476a URL: http://source.winehq.org/git/wine.git/?a=commit;h=08b06b7d8f7396937c3d27821… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 1 08:45:42 2014 +0100 wined3d: Unbind shader resource views in state_unbind_resources(). --- dlls/wined3d/stateblock.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 7e8c782..dc146fc 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -458,6 +458,7 @@ ULONG CDECL wined3d_stateblock_incref(struct wined3d_stateblock *stateblock) void state_unbind_resources(struct wined3d_state *state) { + struct wined3d_shader_resource_view *srv; struct wined3d_vertex_declaration *decl; struct wined3d_sampler *sampler; struct wined3d_texture *texture; @@ -529,6 +530,15 @@ void state_unbind_resources(struct wined3d_state *state) wined3d_sampler_decref(sampler); } } + + for (j = 0; j < MAX_SHADER_RESOURCE_VIEWS; ++j) + { + if ((srv = state->shader_resource_view[i][j])) + { + state->shader_resource_view[i][j] = NULL; + wined3d_shader_resource_view_decref(srv); + } + } } }

1 0

Henri Verbeet : wined3d: Keep a reference to the resource in shader resource views.
by Alexandre Julliard 01 Dec '14

01 Dec '14

Module: wine Branch: master Commit: 0e8f2786e9de5e3711184ec975daca8e6f66ba41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e8f2786e9de5e3711184ec97… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 1 08:45:43 2014 +0100 wined3d: Keep a reference to the resource in shader resource views. --- dlls/d3d10core/view.c | 10 +++++++++- dlls/wined3d/view.c | 9 +++++++-- dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.h | 4 ++-- 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c index 5c02131..fc2e8cd 100644 --- a/dlls/d3d10core/view.c +++ b/dlls/d3d10core/view.c @@ -987,6 +987,7 @@ static const struct ID3D10ShaderResourceViewVtbl d3d10_shader_resource_view_vtbl HRESULT d3d10_shader_resource_view_init(struct d3d10_shader_resource_view *view, struct d3d10_device *device, ID3D10Resource *resource, const D3D10_SHADER_RESOURCE_VIEW_DESC *desc) { + struct wined3d_resource *wined3d_resource; HRESULT hr; view->ID3D10ShaderResourceView_iface.lpVtbl = &d3d10_shader_resource_view_vtbl; @@ -1002,7 +1003,14 @@ HRESULT d3d10_shader_resource_view_init(struct d3d10_shader_resource_view *view, view->desc = *desc; } - if (FAILED(hr = wined3d_shader_resource_view_create(view, &d3d10_null_wined3d_parent_ops, &view->wined3d_view))) + if (!(wined3d_resource = wined3d_resource_from_resource(resource))) + { + ERR("Failed to get wined3d resource for d3d10 resource %p.\n", resource); + return E_FAIL; + } + + if (FAILED(hr = wined3d_shader_resource_view_create(wined3d_resource, + view, &d3d10_null_wined3d_parent_ops, &view->wined3d_view))) { WARN("Failed to create wined3d shader resource view, hr %#x.\n", hr); return hr; diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 1f8db54..9cda64d 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -176,7 +176,10 @@ ULONG CDECL wined3d_shader_resource_view_decref(struct wined3d_shader_resource_v if (!refcount) { + /* Call wined3d_object_destroyed() before releasing the resource, + * since releasing the resource may end up destroying the parent. */ view->parent_ops->wined3d_object_destroyed(view->parent); + wined3d_resource_decref(view->resource); HeapFree(GetProcessHeap(), 0, view); } @@ -190,8 +193,8 @@ void * CDECL wined3d_shader_resource_view_get_parent(const struct wined3d_shader return view->parent; } -HRESULT CDECL wined3d_shader_resource_view_create(void *parent, const struct wined3d_parent_ops *parent_ops, - struct wined3d_shader_resource_view **view) +HRESULT CDECL wined3d_shader_resource_view_create(struct wined3d_resource *resource, void *parent, + const struct wined3d_parent_ops *parent_ops, struct wined3d_shader_resource_view **view) { struct wined3d_shader_resource_view *object; @@ -201,6 +204,8 @@ HRESULT CDECL wined3d_shader_resource_view_create(void *parent, const struct win return E_OUTOFMEMORY; object->refcount = 1; + object->resource = resource; + wined3d_resource_incref(resource); object->parent = parent; object->parent_ops = parent_ops; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 740dabc..050383c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2663,6 +2663,7 @@ struct wined3d_shader_resource_view { LONG refcount; + struct wined3d_resource *resource; void *parent; const struct wined3d_parent_ops *parent_ops; }; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 44a2726..2362cbc 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2441,8 +2441,8 @@ ULONG __cdecl wined3d_shader_incref(struct wined3d_shader *shader); HRESULT __cdecl wined3d_shader_set_local_constants_float(struct wined3d_shader *shader, UINT start_idx, const float *src_data, UINT vector4f_count); -HRESULT __cdecl wined3d_shader_resource_view_create(void *parent, const struct wined3d_parent_ops *parent_ops, - struct wined3d_shader_resource_view **view); +HRESULT __cdecl wined3d_shader_resource_view_create(struct wined3d_resource *resource, void *parent, + const struct wined3d_parent_ops *parent_ops, struct wined3d_shader_resource_view **view); ULONG __cdecl wined3d_shader_resource_view_decref(struct wined3d_shader_resource_view *view); void * __cdecl wined3d_shader_resource_view_get_parent(const struct wined3d_shader_resource_view *view); ULONG __cdecl wined3d_shader_resource_view_incref(struct wined3d_shader_resource_view *view);

1 0

Henri Verbeet : d2d1: Make "transform" in d2d_d3d_render_target_Clear() const.
by Alexandre Julliard 01 Dec '14

01 Dec '14

Module: wine Branch: master Commit: ac4bd550a5e1bc00be25f167f1c521f71b915914 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac4bd550a5e1bc00be25f167f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 1 08:45:44 2014 +0100 d2d1: Make "transform" in d2d_d3d_render_target_Clear() const. --- dlls/d2d1/render_target.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 0f5907f..f7e07d2 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -826,7 +826,7 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_Clear(ID2D1RenderTarget *ifa ID3D10Buffer *vs_cb, *ps_cb; HRESULT hr; - static float transform[] = + static const float transform[] = { 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, -1.0f, 0.0f, 0.0f,

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_CreateBitmapBrush().
by Alexandre Julliard 01 Dec '14

01 Dec '14

Module: wine Branch: master Commit: 0cb8722837143203c44d568881642e7f375ef6be URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cb8722837143203c44d56888… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 1 08:45:45 2014 +0100 d2d1: Implement d2d_d3d_render_target_CreateBitmapBrush(). --- dlls/d2d1/brush.c | 175 +++++++++++++++++++++++++++++++++++++++++++++- dlls/d2d1/d2d1_private.h | 4 ++ dlls/d2d1/render_target.c | 14 +++- 3 files changed, 190 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 6366086..2986c27 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -448,11 +448,184 @@ void d2d_linear_gradient_brush_init(struct d2d_brush *brush, ID2D1RenderTarget * (ID2D1BrushVtbl *)&d2d_linear_gradient_brush_vtbl); } +static inline struct d2d_brush *impl_from_ID2D1BitmapBrush(ID2D1BitmapBrush *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_brush, ID2D1Brush_iface); +} + +static HRESULT STDMETHODCALLTYPE d2d_bitmap_brush_QueryInterface(ID2D1BitmapBrush *iface, + REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_ID2D1BitmapBrush) + || IsEqualGUID(iid, &IID_ID2D1Brush) + || IsEqualGUID(iid, &IID_ID2D1Resource) + || IsEqualGUID(iid, &IID_IUnknown)) + { + ID2D1BitmapBrush_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_bitmap_brush_AddRef(ID2D1BitmapBrush *iface) +{ + struct d2d_brush *brush = impl_from_ID2D1BitmapBrush(iface); + ULONG refcount = InterlockedIncrement(&brush->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d2d_bitmap_brush_Release(ID2D1BitmapBrush *iface) +{ + struct d2d_brush *brush = impl_from_ID2D1BitmapBrush(iface); + ULONG refcount = InterlockedDecrement(&brush->refcount); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); + + if (!refcount) + HeapFree(GetProcessHeap(), 0, brush); + + return refcount; +} + +static void STDMETHODCALLTYPE d2d_bitmap_brush_GetFactory(ID2D1BitmapBrush *iface, + ID2D1Factory **factory) +{ + FIXME("iface %p, factory %p stub!\n", iface, factory); + + *factory = NULL; +} + +static void STDMETHODCALLTYPE d2d_bitmap_brush_SetOpacity(ID2D1BitmapBrush *iface, float opacity) +{ + struct d2d_brush *brush = impl_from_ID2D1BitmapBrush(iface); + + TRACE("iface %p, opacity %.8e.\n", iface, opacity); + + brush->opacity = opacity; +} + +static void STDMETHODCALLTYPE d2d_bitmap_brush_SetTransform(ID2D1BitmapBrush *iface, + const D2D1_MATRIX_3X2_F *transform) +{ + FIXME("iface %p, transform %p stub!\n", iface, transform); +} + +static float STDMETHODCALLTYPE d2d_bitmap_brush_GetOpacity(ID2D1BitmapBrush *iface) +{ + struct d2d_brush *brush = impl_from_ID2D1BitmapBrush(iface); + + TRACE("iface %p.\n", iface); + + return brush->opacity; +} + +static void STDMETHODCALLTYPE d2d_bitmap_brush_GetTransform(ID2D1BitmapBrush *iface, + D2D1_MATRIX_3X2_F *transform) +{ + static const D2D1_MATRIX_3X2_F identity = + { + 1.0f, 0.0f, + 0.0f, 1.0f, + 0.0f, 0.0f, + }; + + FIXME("iface %p, transform %p stub!\n", iface, transform); + + *transform = identity; +} + +static void STDMETHODCALLTYPE d2d_bitmap_brush_SetExtendModeX(ID2D1BitmapBrush *iface, D2D1_EXTEND_MODE mode) +{ + FIXME("iface %p, mode %#x stub!\n", iface, mode); +} + +static void STDMETHODCALLTYPE d2d_bitmap_brush_SetExtendModeY(ID2D1BitmapBrush *iface, D2D1_EXTEND_MODE mode) +{ + FIXME("iface %p, mode %#x stub!\n", iface, mode); +} + +static void STDMETHODCALLTYPE d2d_bitmap_brush_SetInterpolationMode(ID2D1BitmapBrush *iface, + D2D1_BITMAP_INTERPOLATION_MODE mode) +{ + FIXME("iface %p, mode %#x stub!\n", iface, mode); +} + +static void STDMETHODCALLTYPE d2d_bitmap_brush_SetBitmap(ID2D1BitmapBrush *iface, ID2D1Bitmap *bitmap) +{ + FIXME("iface %p, bitmap %p stub!\n", iface, bitmap); +} + +static D2D1_EXTEND_MODE STDMETHODCALLTYPE d2d_bitmap_brush_GetExtendModeX(ID2D1BitmapBrush *iface) +{ + FIXME("iface %p stub!\n", iface); + + return D2D1_EXTEND_MODE_CLAMP; +} + +static D2D1_EXTEND_MODE STDMETHODCALLTYPE d2d_bitmap_brush_GetExtendModeY(ID2D1BitmapBrush *iface) +{ + FIXME("iface %p stub!\n", iface); + + return D2D1_EXTEND_MODE_CLAMP; +} + +static D2D1_BITMAP_INTERPOLATION_MODE STDMETHODCALLTYPE d2d_bitmap_brush_GetInterpolationMode(ID2D1BitmapBrush *iface) +{ + FIXME("iface %p stub!\n", iface); + + return D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR; +} + +static void STDMETHODCALLTYPE d2d_bitmap_brush_GetBitmap(ID2D1BitmapBrush *iface, ID2D1Bitmap **bitmap) +{ + FIXME("iface %p, bitmap %p stub!\n", iface, bitmap); +} + +static const struct ID2D1BitmapBrushVtbl d2d_bitmap_brush_vtbl = +{ + d2d_bitmap_brush_QueryInterface, + d2d_bitmap_brush_AddRef, + d2d_bitmap_brush_Release, + d2d_bitmap_brush_GetFactory, + d2d_bitmap_brush_SetOpacity, + d2d_bitmap_brush_SetTransform, + d2d_bitmap_brush_GetOpacity, + d2d_bitmap_brush_GetTransform, + d2d_bitmap_brush_SetExtendModeX, + d2d_bitmap_brush_SetExtendModeY, + d2d_bitmap_brush_SetInterpolationMode, + d2d_bitmap_brush_SetBitmap, + d2d_bitmap_brush_GetExtendModeX, + d2d_bitmap_brush_GetExtendModeY, + d2d_bitmap_brush_GetInterpolationMode, + d2d_bitmap_brush_GetBitmap, +}; + +void d2d_bitmap_brush_init(struct d2d_brush *brush, ID2D1RenderTarget *render_target, const ID2D1Bitmap *bitmap, + const D2D1_BITMAP_BRUSH_PROPERTIES *bitmap_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc) +{ + FIXME("Ignoring brush properties.\n"); + + d2d_brush_init(brush, render_target, D2D_BRUSH_TYPE_BITMAP, brush_desc, + (ID2D1BrushVtbl *)&d2d_bitmap_brush_vtbl); +} + struct d2d_brush *unsafe_impl_from_ID2D1Brush(ID2D1Brush *iface) { if (!iface) return NULL; assert(iface->lpVtbl == (const ID2D1BrushVtbl *)&d2d_solid_color_brush_vtbl - || iface->lpVtbl == (const ID2D1BrushVtbl *)&d2d_linear_gradient_brush_vtbl); + || iface->lpVtbl == (const ID2D1BrushVtbl *)&d2d_linear_gradient_brush_vtbl + || iface->lpVtbl == (const ID2D1BrushVtbl *)&d2d_bitmap_brush_vtbl); return CONTAINING_RECORD(iface, struct d2d_brush, ID2D1Brush_iface); } diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 8504e68..05e678c 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -34,6 +34,7 @@ enum d2d_brush_type { D2D_BRUSH_TYPE_SOLID, D2D_BRUSH_TYPE_LINEAR, + D2D_BRUSH_TYPE_BITMAP, }; struct d2d_clip_stack @@ -124,6 +125,9 @@ void d2d_solid_color_brush_init(struct d2d_brush *brush, ID2D1RenderTarget *rend void d2d_linear_gradient_brush_init(struct d2d_brush *brush, ID2D1RenderTarget *render_target, const D2D1_LINEAR_GRADIENT_BRUSH_PROPERTIES *gradient_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, ID2D1GradientStopCollection *gradient) DECLSPEC_HIDDEN; +void d2d_bitmap_brush_init(struct d2d_brush *brush, ID2D1RenderTarget *render_target, + const ID2D1Bitmap *bitmap, const D2D1_BITMAP_BRUSH_PROPERTIES *bitmap_brush_desc, + const D2D1_BRUSH_PROPERTIES *brush_desc) DECLSPEC_HIDDEN; struct d2d_brush *unsafe_impl_from_ID2D1Brush(ID2D1Brush *iface) DECLSPEC_HIDDEN; struct d2d_stroke_style diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index f7e07d2..bdefab8 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -364,10 +364,20 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateBitmapBrush(ID2D1Re ID2D1Bitmap *bitmap, const D2D1_BITMAP_BRUSH_PROPERTIES *bitmap_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, ID2D1BitmapBrush **brush) { - FIXME("iface %p, bitmap %p, bitmap_brush_desc %p, brush_desc %p, brush %p stub!\n", + struct d2d_brush *object; + + TRACE("iface %p, bitmap %p, bitmap_brush_desc %p, brush_desc %p, brush %p.\n", iface, bitmap, bitmap_brush_desc, brush_desc, brush); - return E_NOTIMPL; + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + d2d_bitmap_brush_init(object, iface, bitmap, bitmap_brush_desc, brush_desc); + + TRACE("Created brush %p.\n", object); + *brush = (ID2D1BitmapBrush *)&object->ID2D1Brush_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateSolidColorBrush(ID2D1RenderTarget *iface,

1 0

Austin English : ole2disp: Add a stub for VariantChangeTypeEx.
by Alexandre Julliard 01 Dec '14

01 Dec '14

Module: wine Branch: master Commit: 6fd25a458c919398ebc8ebddf716f5b848181475 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fd25a458c919398ebc8ebddf… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Nov 28 14:58:26 2014 -0600 ole2disp: Add a stub for VariantChangeTypeEx. --- dlls/ole2disp.dll16/ole2disp.c | 9 +++++++++ dlls/ole2disp.dll16/ole2disp.dll16.spec | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/ole2disp.dll16/ole2disp.c b/dlls/ole2disp.dll16/ole2disp.c index 61a4043..1850346 100644 --- a/dlls/ole2disp.dll16/ole2disp.c +++ b/dlls/ole2disp.dll16/ole2disp.c @@ -260,6 +260,15 @@ HRESULT WINAPI RegisterActiveObject16( } /****************************************************************************** + * VariantChangeTypeEx [OLE2DISP.108] + */ +HRESULT WINAPI VariantChangeTypeEx16(VARIANTARG *dest, const VARIANTARG *src, LCID lcid, USHORT flags, VARTYPE vt) +{ + FIXME("stub: %p %p %d %d %d\n", dest, src, lcid, flags, vt); + return E_INVALIDARG; +} + +/****************************************************************************** * SetErrorInfo [OLE2DISP.110] */ HRESULT WINAPI SetErrorInfo16(ULONG dwReserved, IErrorInfo *perrinfo) diff --git a/dlls/ole2disp.dll16/ole2disp.dll16.spec b/dlls/ole2disp.dll16/ole2disp.dll16.spec index c027d12..2cf6784 100644 --- a/dlls/ole2disp.dll16/ole2disp.dll16.spec +++ b/dlls/ole2disp.dll16/ole2disp.dll16.spec @@ -9,7 +9,7 @@ 9 stub VARIANTCLEAR 10 stub VARIANTCOPY 11 stub VARIANTCOPYIND -12 pascal VARIANTCHANGETYPE(ptr ptr long long) VariantChangeType16 +12 pascal VariantChangeType(ptr ptr word word) VariantChangeType16 13 stub VARIANTTIMETODOSDATETIME 14 stub DOSDATETIMETOVARIANTTIME 15 stub SAFEARRAYCREATE @@ -105,7 +105,7 @@ 105 stub VARBOOLFROMSTR 106 stub VARBOOLFROMDISP 107 stub DOINVOKEMETHOD -108 stub VARIANTCHANGETYPEEX +108 pascal VariantChangeTypeEx(ptr ptr long word word) VariantChangeTypeEx16 109 stub SAFEARRAYPTROFINDEX 110 pascal SetErrorInfo(long ptr) SetErrorInfo16 111 stub GETERRORINFO

1 0

Austin English : ole2: Add a stub for WriteClassStg.
by Alexandre Julliard 01 Dec '14

01 Dec '14

Module: wine Branch: master Commit: b017bdcab3aba20461fb870dec7fd8d672653c4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b017bdcab3aba20461fb870de… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Nov 28 15:03:40 2014 -0600 ole2: Add a stub for WriteClassStg. --- dlls/ole2.dll16/ole2.c | 9 +++++++++ dlls/ole2.dll16/ole2.dll16.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ole2.dll16/ole2.c b/dlls/ole2.dll16/ole2.c index 25fb141..3a27132 100644 --- a/dlls/ole2.dll16/ole2.c +++ b/dlls/ole2.dll16/ole2.c @@ -346,3 +346,12 @@ VOID WINAPI ReleaseStgMedium16(LPSTGMEDIUM medium) { FIXME("%p: unimplemented stub!\n", medium); } + +/*********************************************************************** + * WriteClassStg16 (OLE2.19) + */ +HRESULT WINAPI WriteClassStg16(IStorage *stg, REFCLSID clsid) +{ + FIXME("stub:%p %s\n", stg, debugstr_guid(clsid)); + return STG_E_MEDIUMFULL; +} diff --git a/dlls/ole2.dll16/ole2.dll16.spec b/dlls/ole2.dll16/ole2.dll16.spec index 5c6e9c0..cb6b1ec 100644 --- a/dlls/ole2.dll16/ole2.dll16.spec +++ b/dlls/ole2.dll16/ole2.dll16.spec @@ -16,7 +16,7 @@ 16 stub OLEISRUNNING 17 stub OLELOCKRUNNING 18 pascal ReadClassStg(segptr ptr) ReadClassStg16 -19 stub WRITECLASSSTG +19 pascal WriteClassStg(segptr ptr) WriteClassStg16 20 stub READCLASSSTM 21 stub WRITECLASSSTM 22 stub BINDMONIKER

1 0