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

Henri Verbeet : wined3d: Validate "data" in buffer_init().
by Alexandre Julliard 31 Jul '15

31 Jul '15

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 : d2d1: Implement d2d_state_block_GetFactory().
by Alexandre Julliard 31 Jul '15

31 Jul '15

Module: wine Branch: master Commit: c1fc008493b8eb85eb921b3dbd154b1753acdc47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1fc008493b8eb85eb921b3db… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 31 09:46:30 2015 +0200 d2d1: Implement d2d_state_block_GetFactory(). --- dlls/d2d1/d2d1_private.h | 5 +++-- dlls/d2d1/factory.c | 2 +- dlls/d2d1/state_block.c | 12 ++++++++---- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index cf98ff8..3c49c7b 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -200,12 +200,13 @@ struct d2d_state_block ID2D1DrawingStateBlock ID2D1DrawingStateBlock_iface; LONG refcount; + ID2D1Factory *factory; D2D1_DRAWING_STATE_DESCRIPTION drawing_state; IDWriteRenderingParams *text_rendering_params; }; -void d2d_state_block_init(struct d2d_state_block *state_block, const D2D1_DRAWING_STATE_DESCRIPTION *desc, - IDWriteRenderingParams *text_rendering_params) DECLSPEC_HIDDEN; +void d2d_state_block_init(struct d2d_state_block *state_block, ID2D1Factory *factory, + const D2D1_DRAWING_STATE_DESCRIPTION *desc, IDWriteRenderingParams *text_rendering_params) DECLSPEC_HIDDEN; struct d2d_state_block *unsafe_impl_from_ID2D1DrawingStateBlock(ID2D1DrawingStateBlock *iface) DECLSPEC_HIDDEN; enum d2d_geometry_state diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index b2d5dd0..ae40b1f 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -199,7 +199,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDrawingStateBlock(ID2D1Factor if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - d2d_state_block_init(object, desc, text_rendering_params); + d2d_state_block_init(object, iface, desc, text_rendering_params); TRACE("Created state block %p.\n", object); *state_block = &object->ID2D1DrawingStateBlock_iface; diff --git a/dlls/d2d1/state_block.c b/dlls/d2d1/state_block.c index 83fd162..90195fe 100644 --- a/dlls/d2d1/state_block.c +++ b/dlls/d2d1/state_block.c @@ -68,6 +68,7 @@ static ULONG STDMETHODCALLTYPE d2d_state_block_Release(ID2D1DrawingStateBlock *i { if (state_block->text_rendering_params) IDWriteRenderingParams_Release(state_block->text_rendering_params); + ID2D1Factory_Release(state_block->factory); HeapFree(GetProcessHeap(), 0, state_block); } @@ -76,9 +77,11 @@ static ULONG STDMETHODCALLTYPE d2d_state_block_Release(ID2D1DrawingStateBlock *i static void STDMETHODCALLTYPE d2d_state_block_GetFactory(ID2D1DrawingStateBlock *iface, ID2D1Factory **factory) { - FIXME("iface %p, factory %p stub!\n", iface, factory); + struct d2d_state_block *state_block = impl_from_ID2D1DrawingStateBlock(iface); + + TRACE("iface %p, factory %p.\n", iface, factory); - *factory = NULL; + ID2D1Factory_AddRef(*factory = state_block->factory); } static void STDMETHODCALLTYPE d2d_state_block_GetDescription(ID2D1DrawingStateBlock *iface, @@ -138,8 +141,8 @@ static const struct ID2D1DrawingStateBlockVtbl d2d_state_block_vtbl = 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) +void d2d_state_block_init(struct d2d_state_block *state_block, ID2D1Factory *factory, + const D2D1_DRAWING_STATE_DESCRIPTION *desc, IDWriteRenderingParams *text_rendering_params) { static const D2D1_MATRIX_3X2_F identity = { @@ -150,6 +153,7 @@ void d2d_state_block_init(struct d2d_state_block *state_block, const D2D1_DRAWIN state_block->ID2D1DrawingStateBlock_iface.lpVtbl = &d2d_state_block_vtbl; state_block->refcount = 1; + ID2D1Factory_AddRef(state_block->factory = factory); if (desc) state_block->drawing_state = *desc; else

1 0

Henri Verbeet : d2d1: Implement d2d_mesh_GetFactory().
by Alexandre Julliard 31 Jul '15

31 Jul '15

Module: wine Branch: master Commit: 9745efaf6ddefe821d63563998375c0fd990ab23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9745efaf6ddefe821d6356399… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 31 09:46:31 2015 +0200 d2d1: Implement d2d_mesh_GetFactory(). --- dlls/d2d1/d2d1_private.h | 4 +++- dlls/d2d1/mesh.c | 12 +++++++++--- dlls/d2d1/render_target.c | 3 ++- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 3c49c7b..47ba63c 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -175,9 +175,11 @@ struct d2d_mesh { ID2D1Mesh ID2D1Mesh_iface; LONG refcount; + + ID2D1Factory *factory; }; -void d2d_mesh_init(struct d2d_mesh *mesh) DECLSPEC_HIDDEN; +void d2d_mesh_init(struct d2d_mesh *mesh, ID2D1Factory *factory) DECLSPEC_HIDDEN; struct d2d_bitmap { diff --git a/dlls/d2d1/mesh.c b/dlls/d2d1/mesh.c index b566382..28d34da 100644 --- a/dlls/d2d1/mesh.c +++ b/dlls/d2d1/mesh.c @@ -65,16 +65,21 @@ static ULONG STDMETHODCALLTYPE d2d_mesh_Release(ID2D1Mesh *iface) TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) + { + ID2D1Factory_Release(mesh->factory); HeapFree(GetProcessHeap(), 0, mesh); + } return refcount; } static void STDMETHODCALLTYPE d2d_mesh_GetFactory(ID2D1Mesh *iface, ID2D1Factory **factory) { - FIXME("iface %p, factory %p stub!\n", iface, factory); + struct d2d_mesh *mesh = impl_from_ID2D1Mesh(iface); + + TRACE("iface %p, factory %p.\n", iface, factory); - *factory = NULL; + ID2D1Factory_AddRef(*factory = mesh->factory); } static HRESULT STDMETHODCALLTYPE d2d_mesh_Open(ID2D1Mesh *iface, ID2D1TessellationSink **sink) @@ -93,8 +98,9 @@ static const struct ID2D1MeshVtbl d2d_mesh_vtbl = d2d_mesh_Open, }; -void d2d_mesh_init(struct d2d_mesh *mesh) +void d2d_mesh_init(struct d2d_mesh *mesh, ID2D1Factory *factory) { mesh->ID2D1Mesh_iface.lpVtbl = &d2d_mesh_vtbl; mesh->refcount = 1; + ID2D1Factory_AddRef(mesh->factory = factory); } diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index a25b8ea..438fced 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -533,6 +533,7 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateLayer(ID2D1RenderTa static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateMesh(ID2D1RenderTarget *iface, ID2D1Mesh **mesh) { + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); struct d2d_mesh *object; TRACE("iface %p, mesh %p.\n", iface, mesh); @@ -540,7 +541,7 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateMesh(ID2D1RenderTar if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - d2d_mesh_init(object); + d2d_mesh_init(object, render_target->factory); TRACE("Created mesh %p.\n", object); *mesh = &object->ID2D1Mesh_iface;

1 0

Henri Verbeet : d2d1: Implement d2d_path_geometry_GetFactory().
by Alexandre Julliard 31 Jul '15

31 Jul '15

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

Jacek Caban : widl: Keep track of namespace in parser and beginning namespace lookup implementation.
by Alexandre Julliard 31 Jul '15

31 Jul '15

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

Jacek Caban : widl: Use proper macro name for forward declarations of interfaces inside a namespace.
by Alexandre Julliard 31 Jul '15

31 Jul '15

Module: wine Branch: master Commit: 867b0f8278dc01a0b9036578855645c539c5c430 URL: http://source.winehq.org/git/wine.git/?a=commit;h=867b0f8278dc01a0b90365788… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 31 13:37:50 2015 +0200 widl: Use proper macro name for forward declarations of interfaces inside a namespace. --- tools/widl/header.c | 4 ++-- tools/widl/parser.y | 7 +++++++ tools/widl/typetree.c | 31 +++++++++++++++++++++++++++++++ tools/widl/widltypes.h | 9 +++++++++ 4 files changed, 49 insertions(+), 2 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index bf824d8..a71ad1a 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -1219,8 +1219,8 @@ static void write_function_proto(FILE *header, const type_t *iface, const var_t static void write_forward(FILE *header, type_t *iface) { - fprintf(header, "#ifndef __%s_FWD_DEFINED__\n", iface->name); - fprintf(header, "#define __%s_FWD_DEFINED__\n", iface->name); + 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, "#endif\n\n" ); } diff --git a/tools/widl/parser.y b/tools/widl/parser.y index f3c250a..b9234a4 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1971,6 +1971,8 @@ int is_type(const char *name) type_t *get_type(enum type_type type, char *name, struct namespace *namespace, int t) { type_t *tp; + if (!namespace) + namespace = &global_namespace; if (name) { tp = find_type(name, namespace, t); if (tp) { @@ -1980,6 +1982,11 @@ type_t *get_type(enum type_type type, char *name, struct namespace *namespace, i } tp = make_type(type); tp->name = name; + tp->namespace = namespace; + if (is_global_namespace(namespace)) + tp->c_name = name; + else + tp->c_name = format_namespace(namespace, "__x_", "_C", name); if (!name) return tp; return reg_type(tp, name, namespace, t); } diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 6c09806..d27a92a 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -45,8 +45,10 @@ type_t *make_type(enum type_type type) { type_t *t = alloc_type(); t->name = NULL; + t->namespace = NULL; t->type_type = type; t->attrs = NULL; + t->c_name = NULL; t->orig = NULL; memset(&t->details, 0, sizeof(t->details)); t->typestring_offset = 0; @@ -76,6 +78,35 @@ static const var_t *find_arg(const var_list_t *args, const char *name) return NULL; } +static char *append_namespace(char *ptr, struct namespace *namespace, const char *separator) +{ + if(is_global_namespace(namespace)) + return ptr; + + ptr = append_namespace(ptr, namespace->parent, separator); + strcpy(ptr, namespace->name); + strcat(ptr, separator); + return ptr + strlen(ptr); +} + +char *format_namespace(struct namespace *namespace, const char *prefix, const char *separator, const char *suffix) +{ + unsigned len = strlen(prefix) + strlen(suffix); + unsigned sep_len = strlen(separator); + struct namespace *iter; + char *ret, *ptr; + + for(iter = namespace; !is_global_namespace(iter); iter = iter->parent) + len += strlen(iter->name) + sep_len; + + ret = xmalloc(len+1); + strcpy(ret, prefix); + ptr = append_namespace(ret + strlen(ret), namespace, separator); + strcpy(ptr, suffix); + + return ret; +} + type_t *type_new_function(var_list_t *args) { var_t *arg; diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 2e89ddb..4d51312 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -412,6 +412,7 @@ enum type_type struct _type_t { const char *name; + struct namespace *namespace; enum type_type type_type; attr_list_t *attrs; union @@ -427,6 +428,7 @@ struct _type_t { struct pointer_details pointer; struct bitfield_details bitfield; } details; + const char *c_name; type_t *orig; /* dup'd types */ unsigned int typestring_offset; unsigned int ptrdesc; /* used for complex structs */ @@ -570,6 +572,8 @@ var_list_t *append_var(var_list_t *list, var_t *var); void init_loc_info(loc_info_t *); +char *format_namespace(struct namespace *namespace, const char *prefix, const char *separator, const char *suffix); + static inline var_list_t *type_get_function_args(const type_t *func_type) { return func_type->details.function->args; @@ -599,4 +603,9 @@ static inline int statements_has_func(const statement_list_t *stmts) return has_func; } +static inline int is_global_namespace(const struct namespace *namespace) +{ + return !namespace->name; +} + #endif

1 0

Jacek Caban : widl: Write proper C++ forward declarations for interfaces inside namespace.
by Alexandre Julliard 31 Jul '15

31 Jul '15

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

Jacek Caban : widl: Declare C++ interfaces in namespaces if needed.
by Alexandre Julliard 31 Jul '15

31 Jul '15

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: Use proper names for namespaced interfaces in C declaration.
by Alexandre Julliard 31 Jul '15

31 Jul '15

Module: wine Branch: master Commit: 83e197df0f079e3419e38eca1b1c801203be8b60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83e197df0f079e3419e38eca1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 31 13:38:18 2015 +0200 widl: Use proper names for namespaced interfaces in C declaration. --- tools/widl/header.c | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index ec32512..d44f98d 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -1106,12 +1106,12 @@ static void do_write_c_method_def(FILE *header, const type_t *iface, const char static void write_c_method_def(FILE *header, const type_t *iface) { - do_write_c_method_def(header, iface, iface->name); + do_write_c_method_def(header, iface, iface->c_name); } static void write_c_disp_method_def(FILE *header, const type_t *iface) { - do_write_c_method_def(header, type_iface_get_inherit(iface), iface->name); + do_write_c_method_def(header, type_iface_get_inherit(iface), iface->c_name); } static void write_method_proto(FILE *header, const type_t *iface) @@ -1264,8 +1264,8 @@ static void write_com_interface_start(FILE *header, const type_t *iface) fprintf(header, "/*****************************************************************************\n"); fprintf(header, " * %s %sinterface\n", iface->name, dispinterface ? "disp" : ""); fprintf(header, " */\n"); - fprintf(header,"#ifndef __%s_%sINTERFACE_DEFINED__\n", iface->name, dispinterface ? "DISP" : ""); - fprintf(header,"#define __%s_%sINTERFACE_DEFINED__\n\n", iface->name, dispinterface ? "DISP" : ""); + fprintf(header,"#ifndef __%s_%sINTERFACE_DEFINED__\n", iface->c_name, dispinterface ? "DISP" : ""); + fprintf(header,"#define __%s_%sINTERFACE_DEFINED__\n\n", iface->c_name, dispinterface ? "DISP" : ""); } static void write_com_interface_end(FILE *header, type_t *iface) @@ -1275,7 +1275,7 @@ static void write_com_interface_end(FILE *header, type_t *iface) type_t *type; if (uuid) - write_guid(header, dispinterface ? "DIID" : "IID", iface->name, uuid); + write_guid(header, dispinterface ? "DIID" : "IID", iface->c_name, uuid); /* C++ interface */ fprintf(header, "#if defined(__cplusplus) && !defined(CINTERFACE)\n"); @@ -1317,29 +1317,25 @@ static void write_com_interface_end(FILE *header, type_t *iface) write_uuid_decl(header, iface->name, uuid); fprintf(header, "#else\n"); /* C interface */ - fprintf(header, "typedef struct %sVtbl {\n", iface->name); - indentation++; - fprintf(header, " BEGIN_INTERFACE\n"); - fprintf(header, "\n"); + write_line(header, 1, "typedef struct %sVtbl {", iface->c_name); + write_line(header, 0, "BEGIN_INTERFACE\n"); if (dispinterface) write_c_disp_method_def(header, iface); else write_c_method_def(header, iface); - indentation--; - fprintf(header, " END_INTERFACE\n"); - fprintf(header, "} %sVtbl;\n", iface->name); - fprintf(header, "interface %s {\n", iface->name); - fprintf(header, " CONST_VTBL %sVtbl* lpVtbl;\n", iface->name); - fprintf(header, "};\n"); - fprintf(header, "\n"); + write_line(header, 0, "END_INTERFACE"); + write_line(header, -1, "} %sVtbl;\n", iface->c_name); + fprintf(header, "interface %s {\n", iface->c_name); + fprintf(header, " CONST_VTBL %sVtbl* lpVtbl;\n", iface->c_name); + fprintf(header, "};\n\n"); fprintf(header, "#ifdef COBJMACROS\n"); /* dispinterfaces don't have real functions, so don't write macros for them, * only for the interface this interface inherits from, i.e. IDispatch */ fprintf(header, "#ifndef WIDL_C_INLINE_WRAPPERS\n"); type = dispinterface ? type_iface_get_inherit(iface) : iface; - write_method_macro(header, type, type, iface->name); + write_method_macro(header, type, type, iface->c_name); fprintf(header, "#else\n"); - write_inline_wrappers(header, type, type, iface->name); + write_inline_wrappers(header, type, type, iface->c_name); fprintf(header, "#endif\n"); fprintf(header, "#endif\n"); fprintf(header, "\n"); @@ -1347,13 +1343,13 @@ static void write_com_interface_end(FILE *header, type_t *iface) fprintf(header, "\n"); /* dispinterfaces don't have real functions, so don't write prototypes for * them */ - if (!dispinterface) + if (!dispinterface && !winrt_mode) { write_method_proto(header, iface); write_locals(header, iface, FALSE); fprintf(header, "\n"); } - fprintf(header,"#endif /* __%s_%sINTERFACE_DEFINED__ */\n\n", iface->name, dispinterface ? "DISP" : ""); + fprintf(header,"#endif /* __%s_%sINTERFACE_DEFINED__ */\n\n", iface->c_name, dispinterface ? "DISP" : ""); } static void write_rpc_interface_start(FILE *header, const type_t *iface)

1 0

Jacek Caban : widl: Properly handle namespaces in write_uuid_decl.
by Alexandre Julliard 31 Jul '15

31 Jul '15

Module: wine Branch: master Commit: cccbb4ebe892be266bc428dc203522f4cee2bd50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cccbb4ebe892be266bc428dc2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 31 13:38:32 2015 +0200 widl: Properly handle namespaces in write_uuid_decl. --- tools/widl/header.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index d44f98d..76f7ed0 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -129,8 +129,9 @@ static void write_guid(FILE *f, const char *guid_prefix, const char *name, const uuid->Data4[6], uuid->Data4[7]); } -static void write_uuid_decl(FILE *f, const char *name, const UUID *uuid) +static void write_uuid_decl(FILE *f, type_t *type, const UUID *uuid) { + char *name = format_namespace(type->namespace, "", "::", type->name); fprintf(f, "#ifdef __CRT_UUID_DECL\n"); fprintf(f, "__CRT_UUID_DECL(%s, 0x%08x, 0x%04x, 0x%04x, 0x%02x,0x%02x, 0x%02x," "0x%02x,0x%02x,0x%02x,0x%02x,0x%02x)\n", @@ -138,6 +139,7 @@ static void write_uuid_decl(FILE *f, const char *name, const UUID *uuid) uuid->Data4[2], uuid->Data4[3], uuid->Data4[4], uuid->Data4[5], uuid->Data4[6], uuid->Data4[7]); fprintf(f, "#endif\n"); + free(name); } static const char *uuid_string(const UUID *uuid) @@ -1314,7 +1316,7 @@ static void write_com_interface_end(FILE *header, type_t *iface) write_line(header, 0, "extern \"C\" {"); } if (uuid) - write_uuid_decl(header, iface->name, uuid); + write_uuid_decl(header, iface, uuid); fprintf(header, "#else\n"); /* C interface */ write_line(header, 1, "typedef struct %sVtbl {", iface->c_name); @@ -1400,7 +1402,7 @@ static void write_coclass(FILE *header, type_t *cocl) if (uuid) { fprintf(header, "class DECLSPEC_UUID(\"%s\") %s;\n", uuid_string(uuid), cocl->name); - write_uuid_decl(header, cocl->name, uuid); + write_uuid_decl(header, cocl, uuid); } else {

1 0