July 2015 - Wine-Commits - list.winehq.org

Piotr Caban : msvcp90: Fix stringbuf and strstreambuf seekpos implementation.
by Alexandre Julliard July 31, 2015

July 31, 2015

Module: wine Branch: master Commit: b3fe96a0a9748c71a24fe0393fd964f0fb2f4ff4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3fe96a0a9748c71a24fe0393… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jul 31 18:36:05 2015 +0200 msvcp90: Fix stringbuf and strstreambuf seekpos implementation. --- dlls/msvcp60/ios.c | 6 +++--- dlls/msvcp90/ios.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index ff3ddd9..f5dabbf 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -4214,7 +4214,7 @@ fpos_int* __thiscall basic_stringbuf_char_seekpos(basic_stringbuf_char *this, return ret; } - return basic_stringbuf_char_seekoff(this, ret, pos.off, SEEKDIR_beg, mode); + return basic_stringbuf_char_seekoff(this, ret, pos.pos+pos.off, SEEKDIR_beg, mode); } /* ?str@?$basic_stringbuf(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2@@Z */ @@ -4635,7 +4635,7 @@ fpos_int* __thiscall basic_stringbuf_wchar_seekpos(basic_stringbuf_wchar *this, return ret; } - return basic_stringbuf_wchar_seekoff(this, ret, pos.off, SEEKDIR_beg, mode); + return basic_stringbuf_wchar_seekoff(this, ret, pos.pos+pos.off, SEEKDIR_beg, mode); } /* ?str@?$basic_stringbuf(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEXABV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2@@Z */ @@ -13382,7 +13382,7 @@ fpos_int* __thiscall strstreambuf_seekpos(strstreambuf *this, fpos_int *ret, fpo return ret; } - return strstreambuf_seekoff(this, ret, pos.off, SEEKDIR_beg, mode); + return strstreambuf_seekoff(this, ret, pos.pos+pos.off, SEEKDIR_beg, mode); } /* ?underflow(a)strstreambuf@std@@MAEHXZ */ diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 53c1089..c3477a4 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -4350,7 +4350,7 @@ fpos_int* __thiscall basic_stringbuf_char_seekpos(basic_stringbuf_char *this, return ret; } - return basic_stringbuf_char_seekoff(this, ret, pos.off, SEEKDIR_beg, mode); + return basic_stringbuf_char_seekoff(this, ret, pos.pos+pos.off, SEEKDIR_beg, mode); } /* ?str@?$basic_stringbuf(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2@@Z */ @@ -4771,7 +4771,7 @@ fpos_int* __thiscall basic_stringbuf_wchar_seekpos(basic_stringbuf_wchar *this, return ret; } - return basic_stringbuf_wchar_seekoff(this, ret, pos.off, SEEKDIR_beg, mode); + return basic_stringbuf_wchar_seekoff(this, ret, pos.pos+pos.off, SEEKDIR_beg, mode); } /* ?str@?$basic_stringbuf(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEXABV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2@@Z */ @@ -13954,7 +13954,7 @@ fpos_int* __thiscall strstreambuf_seekpos(strstreambuf *this, fpos_int *ret, fpo return ret; } - return strstreambuf_seekoff(this, ret, pos.off, SEEKDIR_beg, mode); + return strstreambuf_seekoff(this, ret, pos.pos+pos.off, SEEKDIR_beg, mode); } /* ?underflow(a)strstreambuf@std@@MAEHXZ */

1 0

Jacek Caban : widl: Declare C++ interfaces in namespaces if needed.
by Alexandre Julliard July 31, 2015

July 31, 2015

Module: wine Branch: master Commit: 99d296b6fe4df9e09c0db52fdbc40a0374059c05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99d296b6fe4df9e09c0db52fd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 31 13:38:06 2015 +0200 widl: Declare C++ interfaces in namespaces if needed. --- tools/widl/header.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 7ae0e68..ec32512 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -1279,34 +1279,40 @@ static void write_com_interface_end(FILE *header, type_t *iface) /* C++ interface */ fprintf(header, "#if defined(__cplusplus) && !defined(CINTERFACE)\n"); - if (uuid) - fprintf(header, "MIDL_INTERFACE(\"%s\")\n", uuid_string(uuid)); - else + if (!is_global_namespace(iface->namespace)) { + write_line(header, 0, "} /* extern \"C\" */"); + write_namespace_start(header, iface->namespace); + } + if (uuid) { + write_line(header, 0, "MIDL_INTERFACE(\"%s\")", uuid_string(uuid)); + indent(header, 0); + }else { + indent(header, 0); fprintf(header, "interface "); + } if (type_iface_get_inherit(iface)) { fprintf(header, "%s : public %s\n", iface->name, type_iface_get_inherit(iface)->name); - fprintf(header, "{\n"); + write_line(header, 1, "{"); } else { fprintf(header, "%s\n", iface->name); - fprintf(header, "{\n"); - fprintf(header, " BEGIN_INTERFACE\n"); - fprintf(header, "\n"); + write_line(header, 1, "{\n"); + write_line(header, 0, "BEGIN_INTERFACE\n"); } /* dispinterfaces don't have real functions, so don't write C++ functions for * them */ if (!dispinterface) - { - indentation++; write_cpp_method_def(header, iface); - indentation--; - } if (!type_iface_get_inherit(iface)) - fprintf(header, " END_INTERFACE\n"); - fprintf(header, "};\n"); + write_line(header, 0, "END_INTERFACE\n"); + write_line(header, -1, "};"); + if (!is_global_namespace(iface->namespace)) { + write_namespace_end(header, iface->namespace); + write_line(header, 0, "extern \"C\" {"); + } if (uuid) write_uuid_decl(header, iface->name, uuid); fprintf(header, "#else\n");

1 0

Jacek Caban : widl: Write proper C++ forward declarations for interfaces inside namespace.
by Alexandre Julliard July 31, 2015

July 31, 2015

Module: wine Branch: master Commit: e50866ae1086918aa6c7c52318f790c6582397e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e50866ae1086918aa6c7c5231… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 31 13:37:57 2015 +0200 widl: Write proper C++ forward declarations for interfaces inside namespace. --- tools/widl/header.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index a71ad1a..7ae0e68 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -52,6 +52,16 @@ static void indent(FILE *h, int delta) if (delta > 0) indentation += delta; } +static void write_line(FILE *f, int delta, const char *fmt, ...) +{ + va_list ap; + indent(f, delta); + va_start(ap, fmt); + vfprintf(f, fmt, ap); + va_end(ap); + fprintf(f, "\n"); +} + int is_ptrchain_attr(const var_t *var, enum attr_type t) { if (is_attr(var->attrs, t)) @@ -141,6 +151,24 @@ static const char *uuid_string(const UUID *uuid) return buf; } +static void write_namespace_start(FILE *header, struct namespace *namespace) +{ + if(is_global_namespace(namespace)) + return; + + write_namespace_start(header, namespace->parent); + write_line(header, 1, "namespace %s {", namespace->name); +} + +static void write_namespace_end(FILE *header, struct namespace *namespace) +{ + if(is_global_namespace(namespace)) + return; + + write_line(header, -1, "}", namespace->name); + write_namespace_end(header, namespace->parent); +} + const char *get_name(const var_t *v) { static char buffer[256]; @@ -1221,7 +1249,12 @@ static void write_forward(FILE *header, type_t *iface) { fprintf(header, "#ifndef __%s_FWD_DEFINED__\n", iface->c_name); fprintf(header, "#define __%s_FWD_DEFINED__\n", iface->c_name); - fprintf(header, "typedef interface %s %s;\n", iface->name, iface->name); + fprintf(header, "typedef interface %s %s;\n", iface->c_name, iface->c_name); + fprintf(header, "#ifdef __cplusplus\n"); + write_namespace_start(header, iface->namespace); + write_line(header, 0, "interface %s;", iface->name); + write_namespace_end(header, iface->namespace); + fprintf(header, "#endif /* __cplusplus */\n"); fprintf(header, "#endif\n\n" ); }

1 0

Sebastian Lackner : opencl: Define CL_USE_DEPRECATED_OPENCL_2_0_APIS to avoid warnings.
by Alexandre Julliard July 31, 2015

July 31, 2015

Module: wine Branch: master Commit: f652283368b856972b5b9794d3f4a1d1da221f9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f652283368b856972b5b9794d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jul 31 07:56:31 2015 +0200 opencl: Define CL_USE_DEPRECATED_OPENCL_2_0_APIS to avoid warnings. --- dlls/opencl/opencl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/opencl/opencl.c b/dlls/opencl/opencl.c index c3d25b5..f690733 100644 --- a/dlls/opencl/opencl.c +++ b/dlls/opencl/opencl.c @@ -32,6 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(opencl); #if defined(HAVE_CL_CL_H) #define CL_USE_DEPRECATED_OPENCL_1_1_APIS +#define CL_USE_DEPRECATED_OPENCL_2_0_APIS #include <CL/cl.h> #elif defined(HAVE_OPENCL_OPENCL_H) #include <OpenCL/opencl.h>

1 0

Jacek Caban : widl: Keep track of namespace in parser and beginning namespace lookup implementation.
by Alexandre Julliard July 31, 2015

July 31, 2015

Module: wine Branch: master Commit: ddc493a8055048fdb3995530bc33e03800e0ed03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddc493a8055048fdb3995530b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 31 13:37:40 2015 +0200 widl: Keep track of namespace in parser and beginning namespace lookup implementation. --- tools/widl/parser.y | 123 ++++++++++++++++++++++++++++++++++--------------- tools/widl/typetree.c | 20 ++++---- tools/widl/widltypes.h | 16 +++++-- 3 files changed, 110 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ddc493a8055048fdb3995…

1 0

Henri Verbeet : d2d1: Implement d2d_path_geometry_GetFactory().
by Alexandre Julliard July 31, 2015

July 31, 2015

Module: wine Branch: master Commit: 14c0009add4b9f9c7f0827399e068e47c5d7d661 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14c0009add4b9f9c7f0827399… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 31 09:46:32 2015 +0200 d2d1: Implement d2d_path_geometry_GetFactory(). --- dlls/d2d1/d2d1_private.h | 7 +++++-- dlls/d2d1/factory.c | 4 ++-- dlls/d2d1/geometry.c | 19 ++++++++++++------- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 47ba63c..c7744a3 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -242,6 +242,8 @@ struct d2d_geometry ID2D1Geometry ID2D1Geometry_iface; LONG refcount; + ID2D1Factory *factory; + D2D1_POINT_2F *vertices; size_t vertex_count; @@ -273,8 +275,9 @@ struct d2d_geometry } u; }; -void d2d_path_geometry_init(struct d2d_geometry *geometry) DECLSPEC_HIDDEN; -HRESULT d2d_rectangle_geometry_init(struct d2d_geometry *geometry, const D2D1_RECT_F *rect) DECLSPEC_HIDDEN; +void d2d_path_geometry_init(struct d2d_geometry *geometry, ID2D1Factory *factory) DECLSPEC_HIDDEN; +HRESULT d2d_rectangle_geometry_init(struct d2d_geometry *geometry, + ID2D1Factory *factory, const D2D1_RECT_F *rect) DECLSPEC_HIDDEN; struct d2d_geometry *unsafe_impl_from_ID2D1Geometry(ID2D1Geometry *iface) DECLSPEC_HIDDEN; static inline void d2d_matrix_multiply(D2D_MATRIX_3X2_F *a, const D2D_MATRIX_3X2_F *b) diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index ae40b1f..91534ce 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -102,7 +102,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRectangleGeometry(ID2D1Factor if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d2d_rectangle_geometry_init(object, rect))) + if (FAILED(hr = d2d_rectangle_geometry_init(object, iface, rect))) { WARN("Failed to initialize rectangle geometry, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); @@ -159,7 +159,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreatePathGeometry(ID2D1Factory *if if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - d2d_path_geometry_init(object); + d2d_path_geometry_init(object, iface); TRACE("Created path geometry %p.\n", object); *geometry = (ID2D1PathGeometry *)&object->ID2D1Geometry_iface; diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index ff53bb8..777b7ec 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -982,13 +982,16 @@ static void d2d_geometry_destroy(struct d2d_geometry *geometry) HeapFree(GetProcessHeap(), 0, geometry->beziers); HeapFree(GetProcessHeap(), 0, geometry->faces); HeapFree(GetProcessHeap(), 0, geometry->vertices); + ID2D1Factory_Release(geometry->factory); HeapFree(GetProcessHeap(), 0, geometry); } -static void d2d_geometry_init(struct d2d_geometry *geometry, const struct ID2D1GeometryVtbl *vtbl) +static void d2d_geometry_init(struct d2d_geometry *geometry, ID2D1Factory *factory, + const struct ID2D1GeometryVtbl *vtbl) { geometry->ID2D1Geometry_iface.lpVtbl = vtbl; geometry->refcount = 1; + ID2D1Factory_AddRef(geometry->factory = factory); } static inline struct d2d_geometry *impl_from_ID2D1GeometrySink(ID2D1GeometrySink *iface) @@ -1368,9 +1371,11 @@ static ULONG STDMETHODCALLTYPE d2d_path_geometry_Release(ID2D1PathGeometry *ifac static void STDMETHODCALLTYPE d2d_path_geometry_GetFactory(ID2D1PathGeometry *iface, ID2D1Factory **factory) { - FIXME("iface %p, factory %p stub!\n", iface, factory); + struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry(iface); - *factory = NULL; + TRACE("iface %p, factory %p.\n", iface, factory); + + ID2D1Factory_AddRef(*factory = geometry->factory); } static HRESULT STDMETHODCALLTYPE d2d_path_geometry_GetBounds(ID2D1PathGeometry *iface, @@ -1567,9 +1572,9 @@ static const struct ID2D1PathGeometryVtbl d2d_path_geometry_vtbl = d2d_path_geometry_GetFigureCount, }; -void d2d_path_geometry_init(struct d2d_geometry *geometry) +void d2d_path_geometry_init(struct d2d_geometry *geometry, ID2D1Factory *factory) { - d2d_geometry_init(geometry, (ID2D1GeometryVtbl *)&d2d_path_geometry_vtbl); + d2d_geometry_init(geometry, factory, (ID2D1GeometryVtbl *)&d2d_path_geometry_vtbl); geometry->u.path.ID2D1GeometrySink_iface.lpVtbl = &d2d_geometry_sink_vtbl; } @@ -1779,9 +1784,9 @@ static const struct ID2D1RectangleGeometryVtbl d2d_rectangle_geometry_vtbl = d2d_rectangle_geometry_GetRect, }; -HRESULT d2d_rectangle_geometry_init(struct d2d_geometry *geometry, const D2D1_RECT_F *rect) +HRESULT d2d_rectangle_geometry_init(struct d2d_geometry *geometry, ID2D1Factory *factory, const D2D1_RECT_F *rect) { - d2d_geometry_init(geometry, (ID2D1GeometryVtbl *)&d2d_rectangle_geometry_vtbl); + d2d_geometry_init(geometry, factory, (ID2D1GeometryVtbl *)&d2d_rectangle_geometry_vtbl); geometry->u.rectangle.rect = *rect; if (!(geometry->vertices = HeapAlloc(GetProcessHeap(), 0, 4 * sizeof(*geometry->vertices))))

1 0

Henri Verbeet : wined3d: Validate "data" in buffer_init().
by Alexandre Julliard July 31, 2015

July 31, 2015

Module: wine Branch: master Commit: 7f416ff339b0ba95dfbf64d151b7ef094134c62b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f416ff339b0ba95dfbf64d15… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 31 09:46:29 2015 +0200 wined3d: Validate "data" in buffer_init(). --- dlls/d3d10core/buffer.c | 7 +++---- dlls/d3d10core/tests/device.c | 4 ++++ dlls/wined3d/buffer.c | 13 ++++++++++--- include/wine/wined3d.h | 3 ++- 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/d3d10core/buffer.c b/dlls/d3d10core/buffer.c index 84882a7..af0dd9c 100644 --- a/dlls/d3d10core/buffer.c +++ b/dlls/d3d10core/buffer.c @@ -239,10 +239,9 @@ HRESULT d3d10_buffer_init(struct d3d10_buffer *buffer, struct d3d10_device *devi wined3d_desc.cpu_access_flags = desc->CPUAccessFlags; wined3d_desc.misc_flags = desc->MiscFlags; - hr = wined3d_buffer_create(device->wined3d_device, &wined3d_desc, - data ? data->pSysMem : NULL, buffer, &d3d10_buffer_wined3d_parent_ops, - &buffer->wined3d_buffer); - if (FAILED(hr)) + if (FAILED(hr = wined3d_buffer_create(device->wined3d_device, &wined3d_desc, + (const struct wined3d_sub_resource_data *)data, buffer, + &d3d10_buffer_wined3d_parent_ops, &buffer->wined3d_buffer))) { WARN("Failed to create wined3d buffer, hr %#x.\n", hr); wined3d_private_store_cleanup(&buffer->private_store); diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index edfa33f..c75def4 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -397,6 +397,7 @@ static void test_create_depthstencil_view(void) static void test_create_rendertarget_view(void) { D3D10_RENDER_TARGET_VIEW_DESC rtv_desc; + D3D10_SUBRESOURCE_DATA data = {0}; D3D10_TEXTURE2D_DESC texture_desc; ULONG refcount, expected_refcount; D3D10_BUFFER_DESC buffer_desc; @@ -418,6 +419,9 @@ static void test_create_rendertarget_view(void) buffer_desc.CPUAccessFlags = 0; buffer_desc.MiscFlags = 0; + hr = ID3D10Device_CreateBuffer(device, &buffer_desc, &data, &buffer); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + expected_refcount = get_refcount((IUnknown *)device) + 1; hr = ID3D10Device_CreateBuffer(device, &buffer_desc, NULL, &buffer); ok(SUCCEEDED(hr), "Failed to create a buffer, hr %#x\n", hr); diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index ea584df..40a137e 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1132,7 +1132,7 @@ static const struct wined3d_resource_ops buffer_resource_ops = static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device *device, UINT size, DWORD usage, enum wined3d_format_id format_id, enum wined3d_pool pool, GLenum bind_hint, - const char *data, void *parent, const struct wined3d_parent_ops *parent_ops) + const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops) { const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; const struct wined3d_format *format = wined3d_get_format(gl_info, format_id); @@ -1145,6 +1145,12 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device return WINED3DERR_INVALIDCALL; } + if (data && !data->data) + { + WARN("Invalid sub-resource data specified.\n"); + return E_INVALIDARG; + } + hr = resource_init(&buffer->resource, device, WINED3D_RTYPE_BUFFER, format, WINED3D_MULTISAMPLE_NONE, 0, usage, pool, size, 1, 1, size, parent, parent_ops, &buffer_resource_ops); if (FAILED(hr)) @@ -1205,7 +1211,7 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device return hr; } - memcpy(ptr, data, size); + memcpy(ptr, data->data, size); wined3d_buffer_unmap(buffer); } @@ -1224,7 +1230,8 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device } HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct wined3d_buffer_desc *desc, - const void *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_buffer **buffer) + const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, + struct wined3d_buffer **buffer) { struct wined3d_buffer *object; HRESULT hr; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 6ff1a3e..9786c3c 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2113,7 +2113,8 @@ HRESULT __cdecl wined3d_set_adapter_display_mode(struct wined3d *wined3d, UINT adapter_idx, const struct wined3d_display_mode *mode); HRESULT __cdecl wined3d_buffer_create(struct wined3d_device *device, const struct wined3d_buffer_desc *desc, - const void *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_buffer **buffer); + const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, + struct wined3d_buffer **buffer); HRESULT __cdecl wined3d_buffer_create_ib(struct wined3d_device *device, UINT length, DWORD usage, enum wined3d_pool pool, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_buffer **buffer);

1 0

Henri Verbeet : wined3d: Validate "data" in wined3d_texture_upload_data().
by Alexandre Julliard July 31, 2015

July 31, 2015

Module: wine Branch: master Commit: 62454ae71d81eea0bd61a19af9f7fe38ed739454 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62454ae71d81eea0bd61a19af… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 31 09:46:28 2015 +0200 wined3d: Validate "data" in wined3d_texture_upload_data(). --- dlls/d3d10core/tests/device.c | 8 ++++++++ dlls/wined3d/texture.c | 22 +++++++++++++++++++--- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 0b03285..edfa33f 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -164,6 +164,7 @@ static IDXGISwapChain *create_swapchain(ID3D10Device *device, HWND window, BOOL static void test_create_texture2d(void) { ULONG refcount, expected_refcount; + D3D10_SUBRESOURCE_DATA data = {0}; ID3D10Device *device, *tmp; D3D10_TEXTURE2D_DESC desc; ID3D10Texture2D *texture; @@ -188,6 +189,9 @@ static void test_create_texture2d(void) desc.CPUAccessFlags = 0; desc.MiscFlags = 0; + hr = ID3D10Device_CreateTexture2D(device, &desc, &data, &texture); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + expected_refcount = get_refcount((IUnknown *)device) + 1; hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &texture); ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x\n", hr); @@ -255,6 +259,7 @@ static void test_create_texture2d(void) static void test_create_texture3d(void) { ULONG refcount, expected_refcount; + D3D10_SUBRESOURCE_DATA data = {0}; ID3D10Device *device, *tmp; D3D10_TEXTURE3D_DESC desc; ID3D10Texture3D *texture; @@ -277,6 +282,9 @@ static void test_create_texture3d(void) desc.CPUAccessFlags = 0; desc.MiscFlags = 0; + hr = ID3D10Device_CreateTexture3D(device, &desc, &data, &texture); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + expected_refcount = get_refcount((IUnknown *)device) + 1; hr = ID3D10Device_CreateTexture3D(device, &desc, NULL, &texture); ok(SUCCEEDED(hr), "Failed to create a 3d texture, hr %#x.\n", hr); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 1e039e4..82694bb 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -727,12 +727,22 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, return WINED3D_OK; } -static void wined3d_texture_upload_data(struct wined3d_texture *texture, const struct wined3d_sub_resource_data *data) +static HRESULT wined3d_texture_upload_data(struct wined3d_texture *texture, + const struct wined3d_sub_resource_data *data) { unsigned int sub_count = texture->level_count * texture->layer_count; struct wined3d_context *context; unsigned int i; + for (i = 0; i < sub_count; ++i) + { + if (!data[i].data) + { + WARN("Invalid sub-resource data specified for sub-resource %u.\n", i); + return E_INVALIDARG; + } + } + context = context_acquire(texture->resource.device, NULL); wined3d_texture_prepare_texture(texture, context, FALSE); @@ -748,6 +758,8 @@ static void wined3d_texture_upload_data(struct wined3d_texture *texture, const s } context_release(context); + + return WINED3D_OK; } static void texture2d_sub_resource_load(struct wined3d_resource *sub_resource, @@ -1444,8 +1456,12 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct /* FIXME: We'd like to avoid ever allocating system memory for the texture * in this case. */ - if (data) - wined3d_texture_upload_data(object, data); + if (data && FAILED(hr = wined3d_texture_upload_data(object, data))) + { + wined3d_texture_cleanup(object); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } TRACE("Created texture %p.\n", object); *texture = object;

1 0

Sebastian Lackner : wintrust: Create a dummy context to force creation of MachineGuid registry key.
by Alexandre Julliard July 31, 2015

July 31, 2015

Module: wine Branch: master Commit: e5e05b971b64496d3967fc3f8b9cdf8d608d14a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5e05b971b64496d3967fc3f8… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jul 31 08:07:33 2015 +0200 wintrust: Create a dummy context to force creation of MachineGuid registry key. --- dlls/wintrust/register.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c index 9981fbc..303426c 100644 --- a/dlls/wintrust/register.c +++ b/dlls/wintrust/register.c @@ -960,6 +960,8 @@ HRESULT WINAPI DllRegisterServer(void) HRESULT CryptRegisterRes = S_OK; HRESULT TrustProviderRes = S_OK; HRESULT SIPAddProviderRes = S_OK; + HCRYPTPROV crypt_provider; + BOOL ret; TRACE("\n"); @@ -1077,6 +1079,11 @@ add_trust_providers: * a trust provider without a diagnostic policy). */ + /* Create a dummy context to force creation of the MachineGuid registry key. */ + ret = CryptAcquireContextW(&crypt_provider, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); + if (ret) CryptReleaseContext(crypt_provider, 0); + else ERR("Failed to acquire cryptographic context: %u\n", GetLastError()); + /* If CryptRegisterRes is not S_OK it will always overrule the return value. */ if (CryptRegisterRes != S_OK) return CryptRegisterRes;

1 0

Nikolay Sivov : dwrite: Translate rendered bitmap bounds to given origin.
by Alexandre Julliard July 31, 2015

July 31, 2015

Module: wine Branch: master Commit: 6d1f47902b9c5cfd3398375de5322320c895a78f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d1f47902b9c5cfd3398375de… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 31 01:29:39 2015 +0300 dwrite: Translate rendered bitmap bounds to given origin. --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 10 +++++++++- dlls/dwrite/main.c | 8 ++++---- dlls/dwrite/tests/font.c | 23 ++++++++++++++++++++++- 4 files changed, 36 insertions(+), 7 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 0c25483..59bef03 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -124,7 +124,7 @@ extern HRESULT create_font_file(IDWriteFontFileLoader *loader, const void *refer extern HRESULT create_localfontfileloader(IDWriteLocalFontFileLoader** iface) DECLSPEC_HIDDEN; extern HRESULT create_fontface(DWRITE_FONT_FACE_TYPE,UINT32,IDWriteFontFile* const*,UINT32,DWRITE_FONT_SIMULATIONS,IDWriteFontFace2**) DECLSPEC_HIDDEN; extern HRESULT create_font_collection(IDWriteFactory2*,IDWriteFontFileEnumerator*,BOOL,IDWriteFontCollection**) DECLSPEC_HIDDEN; -extern HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE,DWRITE_GLYPH_RUN const*,FLOAT,IDWriteGlyphRunAnalysis**) DECLSPEC_HIDDEN; +extern HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE,DWRITE_GLYPH_RUN const*,FLOAT,FLOAT,FLOAT,IDWriteGlyphRunAnalysis**) DECLSPEC_HIDDEN; extern BOOL is_system_collection(IDWriteFontCollection*) DECLSPEC_HIDDEN; extern HRESULT get_local_refkey(const WCHAR*,const FILETIME*,void**,UINT32*) DECLSPEC_HIDDEN; extern HRESULT get_filestream_from_file(IDWriteFontFile*,IDWriteFontFileStream**) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index a3f58b9..5f32c31 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -117,6 +117,8 @@ struct dwrite_glyphrunanalysis { DWRITE_RENDERING_MODE rendering_mode; DWRITE_GLYPH_RUN run; FLOAT ppdip; + FLOAT originX; + FLOAT originY; UINT16 *glyphs; FLOAT *advances; DWRITE_GLYPH_OFFSET *offsets; @@ -2956,6 +2958,9 @@ static void glyphrunanalysis_get_texturebounds(struct dwrite_glyphrunanalysis *a IDWriteFontFace2_Release(fontface2); + /* translate to given run origin */ + OffsetRect(&analysis->bounds, analysis->originX, analysis->originY); + analysis->ready |= RUNANALYSIS_BOUNDS; *bounds = analysis->bounds; } @@ -3075,7 +3080,8 @@ static const struct IDWriteGlyphRunAnalysisVtbl glyphrunanalysisvtbl = { glyphrunanalysis_GetAlphaBlendParams }; -HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE rendering_mode, DWRITE_GLYPH_RUN const *run, FLOAT ppdip, IDWriteGlyphRunAnalysis **ret) +HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE rendering_mode, DWRITE_GLYPH_RUN const *run, FLOAT ppdip, + FLOAT originX, FLOAT originY, IDWriteGlyphRunAnalysis **ret) { struct dwrite_glyphrunanalysis *analysis; @@ -3094,6 +3100,8 @@ HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE rendering_mode, DWRITE_GLY analysis->rendering_mode = rendering_mode; analysis->ready = 0; analysis->ppdip = ppdip; + analysis->originX = originX; + analysis->originY = originY; SetRectEmpty(&analysis->bounds); analysis->run = *run; IDWriteFontFace_AddRef(analysis->run.fontFace); diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 9f8454f..5a8c026 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1072,14 +1072,14 @@ static HRESULT WINAPI dwritefactory_CreateNumberSubstitution(IDWriteFactory2 *if static HRESULT WINAPI dwritefactory_CreateGlyphRunAnalysis(IDWriteFactory2 *iface, DWRITE_GLYPH_RUN const *run, FLOAT ppdip, DWRITE_MATRIX const* transform, DWRITE_RENDERING_MODE rendering_mode, - DWRITE_MEASURING_MODE measuring_mode, FLOAT baseline_x, FLOAT baseline_y, IDWriteGlyphRunAnalysis **analysis) + DWRITE_MEASURING_MODE measuring_mode, FLOAT originX, FLOAT originY, IDWriteGlyphRunAnalysis **analysis) { struct dwritefactory *This = impl_from_IDWriteFactory2(iface); - TRACE("(%p)->(%p %.2f %p %d %d %f %f %p)\n", This, run, ppdip, transform, rendering_mode, - measuring_mode, baseline_x, baseline_y, analysis); + TRACE("(%p)->(%p %.2f %p %d %d %.2f %.2f %p)\n", This, run, ppdip, transform, rendering_mode, + measuring_mode, originX, originY, analysis); - return create_glyphrunanalysis(rendering_mode, run, ppdip, analysis); + return create_glyphrunanalysis(rendering_mode, run, ppdip, originX, originY, analysis); } static HRESULT WINAPI dwritefactory1_GetEudcFontCollection(IDWriteFactory2 *iface, IDWriteFontCollection **collection, diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index aeb84bb..c132159 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -3435,7 +3435,7 @@ static void test_CreateGlyphRunAnalysis(void) FLOAT advance; HRESULT hr; UINT32 ch; - RECT rect; + RECT rect, rect2; DWRITE_GLYPH_OFFSET offset; DWRITE_GLYPH_METRICS metrics; DWRITE_FONT_METRICS fm; @@ -3489,8 +3489,29 @@ static void test_CreateGlyphRunAnalysis(void) ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); ok(rect.left == 0 && rect.right == 0 && rect.top == 0 && rect.bottom == 0, "unexpected rect\n"); + + /* check how origin affects bounds */ + memset(&rect, 0, sizeof(rect)); + hr = IDWriteGlyphRunAnalysis_GetAlphaTextureBounds(analysis, DWRITE_TEXTURE_ALIASED_1x1, &rect); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!IsRectEmpty(&rect), "got empty rect\n"); + IDWriteGlyphRunAnalysis_Release(analysis); + + hr = IDWriteFactory_CreateGlyphRunAnalysis(factory, &run, 1.0, NULL, + DWRITE_RENDERING_MODE_ALIASED, DWRITE_MEASURING_MODE_NATURAL, + 10.0, -5.0, &analysis); + ok(hr == S_OK, "got 0x%08x\n", hr); + + memset(&rect2, 0, sizeof(rect2)); + hr = IDWriteGlyphRunAnalysis_GetAlphaTextureBounds(analysis, DWRITE_TEXTURE_ALIASED_1x1, &rect2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!IsRectEmpty(&rect2), "got empty rect\n"); IDWriteGlyphRunAnalysis_Release(analysis); + ok(!EqualRect(&rect, &rect2), "got equal bounds\n"); + OffsetRect(&rect, 10, -5); + ok(EqualRect(&rect, &rect2), "got different bounds\n"); + for (i = 0; i < sizeof(rendermodes)/sizeof(rendermodes[0]); i++) { hr = IDWriteFactory_CreateGlyphRunAnalysis(factory, &run, 1.0, NULL, rendermodes[i], DWRITE_MEASURING_MODE_NATURAL,

1 0