wine-commits August 2015

wine-commits@winehq.org

2 participants
503 discussions

Nikolay Sivov : dwrite: Fix family name extraction order.
by Alexandre Julliard 13 Aug '15

13 Aug '15

Module: wine Branch: master Commit: fb013d7acdea4d68b5b1ba2051878b812ab33932 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb013d7acdea4d68b5b1ba205… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 12 21:09:58 2015 +0300 dwrite: Fix family name extraction order. --- dlls/dwrite/dwrite_private.h | 3 ++- dlls/dwrite/font.c | 22 ++------------------ dlls/dwrite/gdiinterop.c | 2 +- dlls/dwrite/opentype.c | 48 +++++++++++++++++++++++++++++++++++++++----- 4 files changed, 48 insertions(+), 27 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 1b7bd3a..0fbe44f 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -152,7 +152,8 @@ extern HRESULT opentype_get_font_table(IDWriteFontFileStream*,DWRITE_FONT_FACE_T extern HRESULT opentype_cmap_get_unicode_ranges(void*,UINT32,DWRITE_UNICODE_RANGE*,UINT32*) DECLSPEC_HIDDEN; extern void opentype_get_font_properties(IDWriteFontFileStream*,DWRITE_FONT_FACE_TYPE,UINT32,struct dwrite_font_props*) DECLSPEC_HIDDEN; extern void opentype_get_font_metrics(IDWriteFontFileStream*,DWRITE_FONT_FACE_TYPE,UINT32,DWRITE_FONT_METRICS1*,DWRITE_CARET_METRICS*) DECLSPEC_HIDDEN; -extern HRESULT opentype_get_font_strings_from_id(const void*,DWRITE_INFORMATIONAL_STRING_ID,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; +extern HRESULT opentype_get_font_info_strings(const void*,DWRITE_INFORMATIONAL_STRING_ID,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; +extern HRESULT opentype_get_font_familyname(IDWriteFontFileStream*,UINT32,DWRITE_FONT_FACE_TYPE,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; extern HRESULT opentype_get_typographic_features(IDWriteFontFace*,UINT32,UINT32,UINT32,UINT32*,DWRITE_FONT_FEATURE_TAG*) DECLSPEC_HIDDEN; extern BOOL opentype_get_vdmx_size(const void*,INT,UINT16*,UINT16*) DECLSPEC_HIDDEN; extern UINT32 opentype_get_cpal_palettecount(const void*) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index eda6378..c77c7c5 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1108,24 +1108,6 @@ static const IDWriteFontFace2Vtbl dwritefontfacevtbl = { dwritefontface2_GetRecommendedRenderingMode }; -HRESULT get_family_names_from_stream(IDWriteFontFileStream *stream, UINT32 index, DWRITE_FONT_FACE_TYPE facetype, - IDWriteLocalizedStrings **names) -{ - const void *name_table = NULL; - void *name_context; - HRESULT hr = E_FAIL; - - opentype_get_font_table(stream, facetype, index, MS_NAME_TAG, &name_table, &name_context, NULL, NULL); - if (name_table) { - hr = opentype_get_font_strings_from_id(name_table, DWRITE_INFORMATIONAL_STRING_WIN32_FAMILY_NAMES, names); - IDWriteFontFileStream_ReleaseFileFragment(stream, name_context); - } - else - *names = NULL; - - return hr; -} - static HRESULT get_fontface_from_font(struct dwrite_font *font, IDWriteFontFace2 **fontface) { struct dwrite_font_data *data = font->data; @@ -1318,7 +1300,7 @@ static HRESULT WINAPI dwritefont_GetInformationalStrings(IDWriteFont2 *iface, WARN("no NAME table found.\n"); if (table_exists) { - hr = opentype_get_font_strings_from_id(table_data, stringid, &data->info_strings[stringid]); + hr = opentype_get_font_info_strings(table_data, stringid, &data->info_strings[stringid]); if (FAILED(hr) || !data->info_strings[stringid]) return hr; IDWriteFontFace2_ReleaseFontTable(fontface, context); @@ -2091,7 +2073,7 @@ HRESULT create_font_collection(IDWriteFactory2* factory, IDWriteFontFileEnumerat break; /* get family name from font file */ - hr = get_family_names_from_stream(stream, i, face_type, &family_name); + hr = opentype_get_font_familyname(stream, i, face_type, &family_name); IDWriteFontFileStream_Release(stream); if (FAILED(hr)) { WARN("unable to get family name from font\n"); diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index 8248431..8c0aa43 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -575,7 +575,7 @@ static HRESULT WINAPI gdiinterop_ConvertFontFaceToLOGFONT(IDWriteGdiInterop *ifa index = IDWriteFontFace_GetIndex(fontface); face_type = IDWriteFontFace_GetType(fontface); opentype_get_font_properties(stream, face_type, index, &props); - hr = get_family_names_from_stream(stream, index, face_type, &familynames); + hr = opentype_get_font_familyname(stream, index, face_type, &familynames); IDWriteFontFile_Release(file); IDWriteFontFileStream_Release(stream); if (FAILED(hr)) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index c6d4ec3..76b5c68 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -33,6 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); #define MS_TTCF_TAG DWRITE_MAKE_OPENTYPE_TAG('t','t','c','f') #define MS_GPOS_TAG DWRITE_MAKE_OPENTYPE_TAG('G','P','O','S') #define MS_GSUB_TAG DWRITE_MAKE_OPENTYPE_TAG('G','S','U','B') +#define MS_NAME_TAG DWRITE_MAKE_OPENTYPE_TAG('n','a','m','e') #ifdef WORDS_BIGENDIAN #define GET_BE_WORD(x) (x) @@ -1194,12 +1195,11 @@ static void get_name_record_locale(enum OPENTYPE_PLATFORM_ID platform, USHORT la } } -HRESULT opentype_get_font_strings_from_id(const void *table_data, DWRITE_INFORMATIONAL_STRING_ID id, IDWriteLocalizedStrings **strings) +HRESULT opentype_get_font_strings_from_id(const void *table_data, enum OPENTYPE_STRING_ID id, IDWriteLocalizedStrings **strings) { const TT_NAME_V0 *header; BYTE *storage_area = 0; USHORT count = 0; - UINT16 name_id; BOOL exists; HRESULT hr; int i; @@ -1222,14 +1222,12 @@ HRESULT opentype_get_font_strings_from_id(const void *table_data, DWRITE_INFORMA storage_area = (LPBYTE)table_data + GET_BE_WORD(header->stringOffset); count = GET_BE_WORD(header->count); - name_id = dwriteid_to_opentypeid[id]; - exists = FALSE; for (i = 0; i < count; i++) { const TT_NameRecord *record = &header->nameRecord[i]; USHORT lang_id, length, offset, encoding, platform; - if (GET_BE_WORD(record->nameID) != name_id) + if (GET_BE_WORD(record->nameID) != id) continue; exists = TRUE; @@ -1293,6 +1291,46 @@ HRESULT opentype_get_font_strings_from_id(const void *table_data, DWRITE_INFORMA *strings = NULL; } + return exists ? S_OK : E_FAIL; +} + +/* Provides a conversion from DWRITE to OpenType name ids, input id be valid, it's not checked. */ +HRESULT opentype_get_font_info_strings(const void *table_data, DWRITE_INFORMATIONAL_STRING_ID id, IDWriteLocalizedStrings **strings) +{ + return opentype_get_font_strings_from_id(table_data, dwriteid_to_opentypeid[id], strings); +} + +/* Name locating order is WWS Family Name -> Preferred Name -> Family Name. If font claims to + have 'Preferred Name' in WWS format, then WWS name is not used. */ +HRESULT opentype_get_font_familyname(IDWriteFontFileStream *stream, UINT32 index, DWRITE_FONT_FACE_TYPE facetype, + IDWriteLocalizedStrings **names) +{ + const TT_OS2_V2 *tt_os2; + void *os2_context, *name_context; + const void *name_table; + HRESULT hr; + + opentype_get_font_table(stream, facetype, index, MS_OS2_TAG, (const void**)&tt_os2, &os2_context, NULL, NULL); + opentype_get_font_table(stream, facetype, index, MS_NAME_TAG, &name_table, &name_context, NULL, NULL); + + *names = NULL; + + /* if Preferred Family doesn't conform to WWS model try WWS name */ + if (tt_os2 && !(GET_BE_WORD(tt_os2->fsSelection) & OS2_FSSELECTION_WWS)) + hr = opentype_get_font_strings_from_id(name_table, OPENTYPE_STRING_WWS_FAMILY_NAME, names); + else + hr = E_FAIL; + + if (FAILED(hr)) + hr = opentype_get_font_strings_from_id(name_table, OPENTYPE_STRING_PREFERRED_FAMILY_NAME, names); + if (FAILED(hr)) + hr = opentype_get_font_strings_from_id(name_table, OPENTYPE_STRING_FAMILY_NAME, names); + + if (tt_os2) + IDWriteFontFileStream_ReleaseFileFragment(stream, os2_context); + if (name_context) + IDWriteFontFileStream_ReleaseFileFragment(stream, name_context); + return hr; }

1 0

Henri Verbeet : d2d1: Get rid of a FIXME in d2d_wic_render_target_init().
by Alexandre Julliard 13 Aug '15

13 Aug '15

Module: wine Branch: master Commit: d41f568226d84057743731ff345d49f93beacc55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d41f568226d84057743731ff3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 12 17:37:12 2015 +0200 d2d1: Get rid of a FIXME in d2d_wic_render_target_init(). --- dlls/d2d1/wic_render_target.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d2d1/wic_render_target.c b/dlls/d2d1/wic_render_target.c index 973303c..07a19ee 100644 --- a/dlls/d2d1/wic_render_target.c +++ b/dlls/d2d1/wic_render_target.c @@ -788,8 +788,6 @@ HRESULT d2d_wic_render_target_init(struct d2d_wic_render_target *render_target, ID3D10Texture2D *texture; HRESULT hr; - FIXME("Ignoring render target properties.\n"); - render_target->ID2D1RenderTarget_iface.lpVtbl = &d2d_wic_render_target_vtbl; render_target->refcount = 1;

1 0

Henri Verbeet : d2d1: d2d_bitmap_brush_init() can't fail.
by Alexandre Julliard 13 Aug '15

13 Aug '15

Module: wine Branch: master Commit: 64ccd138a2cf147070061ebf06753f12a9d452ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=64ccd138a2cf147070061ebf0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 12 17:37:11 2015 +0200 d2d1: d2d_bitmap_brush_init() can't fail. --- dlls/d2d1/brush.c | 4 +--- dlls/d2d1/d2d1_private.h | 2 +- dlls/d2d1/render_target.c | 8 +------- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 2535f85..f450f24 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -683,7 +683,7 @@ static const struct ID2D1BitmapBrushVtbl d2d_bitmap_brush_vtbl = d2d_bitmap_brush_GetBitmap, }; -HRESULT d2d_bitmap_brush_init(struct d2d_brush *brush, ID2D1Factory *factory, ID2D1Bitmap *bitmap, +void d2d_bitmap_brush_init(struct d2d_brush *brush, ID2D1Factory *factory, ID2D1Bitmap *bitmap, const D2D1_BITMAP_BRUSH_PROPERTIES *bitmap_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc) { d2d_brush_init(brush, factory, D2D_BRUSH_TYPE_BITMAP, @@ -702,8 +702,6 @@ HRESULT d2d_bitmap_brush_init(struct d2d_brush *brush, ID2D1Factory *factory, ID brush->u.bitmap.extend_mode_y = D2D1_EXTEND_MODE_CLAMP; brush->u.bitmap.interpolation_mode = D2D1_BITMAP_INTERPOLATION_MODE_LINEAR; } - - return S_OK; } struct d2d_brush *unsafe_impl_from_ID2D1Brush(ID2D1Brush *iface) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 6553eeb..4ba41e0 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -153,7 +153,7 @@ void d2d_solid_color_brush_init(struct d2d_brush *brush, ID2D1Factory *factory, void d2d_linear_gradient_brush_init(struct d2d_brush *brush, ID2D1Factory *factory, const D2D1_LINEAR_GRADIENT_BRUSH_PROPERTIES *gradient_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, ID2D1GradientStopCollection *gradient) DECLSPEC_HIDDEN; -HRESULT d2d_bitmap_brush_init(struct d2d_brush *brush, ID2D1Factory *factory, +void d2d_bitmap_brush_init(struct d2d_brush *brush, ID2D1Factory *factory, ID2D1Bitmap *bitmap, const D2D1_BITMAP_BRUSH_PROPERTIES *bitmap_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc) DECLSPEC_HIDDEN; void d2d_brush_bind_resources(struct d2d_brush *brush, struct d2d_d3d_render_target *render_target, diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index df9a898..263cb91 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -435,7 +435,6 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateBitmapBrush(ID2D1Re { struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); struct d2d_brush *object; - HRESULT hr; TRACE("iface %p, bitmap %p, bitmap_brush_desc %p, brush_desc %p, brush %p.\n", iface, bitmap, bitmap_brush_desc, brush_desc, brush); @@ -443,12 +442,7 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateBitmapBrush(ID2D1Re if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d2d_bitmap_brush_init(object, render_target->factory, bitmap, bitmap_brush_desc, brush_desc))) - { - WARN("Failed to initialize brush, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); - return hr; - } + d2d_bitmap_brush_init(object, render_target->factory, bitmap, bitmap_brush_desc, brush_desc); TRACE("Created brush %p.\n", object); *brush = (ID2D1BitmapBrush *)&object->ID2D1Brush_iface;

1 0

Henri Verbeet : d2d1: Get rid of a FIXME in d2d_bitmap_brush_init().
by Alexandre Julliard 13 Aug '15

13 Aug '15

Module: wine Branch: master Commit: 7bdc1ef899735663969c324fa423ed0ec494762f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bdc1ef899735663969c324fa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 12 17:37:10 2015 +0200 d2d1: Get rid of a FIXME in d2d_bitmap_brush_init(). --- dlls/d2d1/brush.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index f1bfbb0..2535f85 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -686,9 +686,6 @@ static const struct ID2D1BitmapBrushVtbl d2d_bitmap_brush_vtbl = HRESULT d2d_bitmap_brush_init(struct d2d_brush *brush, ID2D1Factory *factory, 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, factory, D2D_BRUSH_TYPE_BITMAP, brush_desc, (ID2D1BrushVtbl *)&d2d_bitmap_brush_vtbl); if ((brush->u.bitmap.bitmap = unsafe_impl_from_ID2D1Bitmap(bitmap)))

1 0

Henri Verbeet : d2d1: Get rid of a FIXME in d2d_solid_color_brush_init().
by Alexandre Julliard 13 Aug '15

13 Aug '15

Module: wine Branch: master Commit: 7d801d67ed577ee6d04c388bb9e96369e0764c4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d801d67ed577ee6d04c388bb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 12 17:37:09 2015 +0200 d2d1: Get rid of a FIXME in d2d_solid_color_brush_init(). All properties for solid color brushes are implemented. --- dlls/d2d1/brush.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 6f9200a..f1bfbb0 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -304,8 +304,6 @@ static const struct ID2D1SolidColorBrushVtbl d2d_solid_color_brush_vtbl = void d2d_solid_color_brush_init(struct d2d_brush *brush, ID2D1Factory *factory, const D2D1_COLOR_F *color, const D2D1_BRUSH_PROPERTIES *desc) { - FIXME("Ignoring brush properties.\n"); - d2d_brush_init(brush, factory, D2D_BRUSH_TYPE_SOLID, desc, (ID2D1BrushVtbl *)&d2d_solid_color_brush_vtbl); brush->u.solid.color = *color;

1 0

Henri Verbeet : d3d10core: Add locking around wined3d calls.
by Alexandre Julliard 13 Aug '15

13 Aug '15

Module: wine Branch: master Commit: 63d279430da44088b03fa304df6a850e94e5cfb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63d279430da44088b03fa304d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 12 17:37:08 2015 +0200 d3d10core: Add locking around wined3d calls. --- dlls/d3d10core/async.c | 5 ++ dlls/d3d10core/buffer.c | 16 +++++- dlls/d3d10core/device.c | 131 ++++++++++++++++++++++++++++++++++++++++++- dlls/d3d10core/inputlayout.c | 8 +++ dlls/d3d10core/shader.c | 24 ++++++++ dlls/d3d10core/state.c | 21 +++++++ dlls/d3d10core/texture.c | 30 ++++++++++ dlls/d3d10core/utils.c | 29 +++++++++- dlls/d3d10core/view.c | 19 ++++++- 9 files changed, 277 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=63d279430da44088b03fa…

1 0

Jacek Caban : windows.foundation.idl: Added struct declarations.
by Alexandre Julliard 13 Aug '15

13 Aug '15

Module: wine Branch: master Commit: a00d6ccb7b5c5c775f499dd87d5527baa7b8527c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a00d6ccb7b5c5c775f499dd87… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 10 13:20:07 2015 +0200 windows.foundation.idl: Added struct declarations. --- include/windows.foundation.idl | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/include/windows.foundation.idl b/include/windows.foundation.idl index 6e0062a..2c16fa2 100644 --- a/include/windows.foundation.idl +++ b/include/windows.foundation.idl @@ -72,6 +72,36 @@ namespace Windows { OtherTypeArray = 1044 }; + [version(0x06020000)] + struct Point { + FLOAT X; + FLOAT Y; + }; + + [version(0x06020000)] + struct Size { + FLOAT Width; + FLOAT Height; + }; + + [version(0x06020000)] + struct Rect { + FLOAT X; + FLOAT Y; + FLOAT Width; + FLOAT Height; + }; + + [version(0x06020000)] + struct DateTime { + INT64 UniversalTime; + }; + + [version(0x06020000)] + struct TimeSpan { + INT64 Duration; + }; + [ version(0x06030000), uuid(96369f54-8eb6-48f0-abce-c1b211e627c3)

1 0

Jacek Caban : widl: Added support for namespaced structs.
by Alexandre Julliard 13 Aug '15

13 Aug '15

Module: wine Branch: master Commit: 7c29a53208e0d2f382fbf6af02078ec172c72410 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c29a53208e0d2f382fbf6af0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 10 13:19:48 2015 +0200 widl: Added support for namespaced structs. --- tools/widl/header.c | 4 ++-- tools/widl/parser.y | 6 +++--- tools/widl/typetree.c | 8 +++++--- tools/widl/typetree.h | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 29b622e..cb4601e 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -314,7 +314,7 @@ void write_type_left(FILE *h, type_t *t, enum name_type name_type, int declonly) case TYPE_STRUCT: case TYPE_ENCAPSULATED_UNION: if (!declonly && t->defined && !t->written) { - if (t->name) fprintf(h, "struct %s {\n", t->name); + if (name) fprintf(h, "struct %s {\n", name); else fprintf(h, "struct {\n"); t->written = TRUE; indentation++; @@ -325,7 +325,7 @@ void write_type_left(FILE *h, type_t *t, enum name_type name_type, int declonly) indent(h, -1); fprintf(h, "}"); } - else fprintf(h, "struct %s", t->name ? t->name : ""); + else fprintf(h, "struct %s", name ? name : ""); break; case TYPE_UNION: if (!declonly && t->defined && !t->written) { diff --git a/tools/widl/parser.y b/tools/widl/parser.y index ba0be1c..b42b4a2 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -380,7 +380,7 @@ typedecl: enumdef | tENUM aIDENTIFIER { $$ = type_new_enum($2, current_namespace, FALSE, NULL); } | structdef - | tSTRUCT aIDENTIFIER { $$ = type_new_struct($2, FALSE, NULL); } + | tSTRUCT aIDENTIFIER { $$ = type_new_struct($2, current_namespace, FALSE, NULL); } | uniondef | tUNION aIDENTIFIER { $$ = type_new_nonencapsulated_union($2, FALSE, NULL); } | attributes enumdef { $$ = $2; $$->attrs = check_enum_attrs($1); } @@ -1091,7 +1091,7 @@ pointer_type: | tPTR { $$ = RPC_FC_FP; } ; -structdef: tSTRUCT t_ident '{' fields '}' { $$ = type_new_struct($2, TRUE, $4); } +structdef: tSTRUCT t_ident '{' fields '}' { $$ = type_new_struct($2, current_namespace, TRUE, $4); } ; type: tVOID { $$ = type_new_void(); } @@ -1100,7 +1100,7 @@ type: tVOID { $$ = type_new_void(); } | enumdef { $$ = $1; } | tENUM aIDENTIFIER { $$ = type_new_enum($2, current_namespace, FALSE, NULL); } | structdef { $$ = $1; } - | tSTRUCT aIDENTIFIER { $$ = type_new_struct($2, FALSE, NULL); } + | tSTRUCT aIDENTIFIER { $$ = type_new_struct($2, current_namespace, FALSE, NULL); } | uniondef { $$ = $1; } | tUNION aIDENTIFIER { $$ = type_new_nonencapsulated_union($2, FALSE, NULL); } | tSAFEARRAY '(' type ')' { $$ = make_safearray($3); } diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 3f8ced3..5925d40 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -297,11 +297,13 @@ type_t *type_new_enum(const char *name, struct namespace *namespace, int defined return t; } -type_t *type_new_struct(char *name, int defined, var_list_t *fields) +type_t *type_new_struct(char *name, struct namespace *namespace, int defined, var_list_t *fields) { - type_t *tag_type = name ? find_type(name, NULL, tsSTRUCT) : NULL; + type_t *tag_type = name ? find_type(name, namespace, tsSTRUCT) : NULL; type_t *t = make_type(TYPE_STRUCT); t->name = name; + t->namespace = namespace; + if (tag_type && tag_type->details.structure) t->details.structure = tag_type->details.structure; else if (defined) @@ -313,7 +315,7 @@ type_t *type_new_struct(char *name, int defined, var_list_t *fields) if (name) { if (defined) - reg_type(t, name, NULL, tsSTRUCT); + reg_type(t, name, namespace, tsSTRUCT); else add_incomplete(t); } diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index 873ba8a..bf05f25 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -41,7 +41,7 @@ type_t *type_new_int(enum type_basic_type basic_type, int sign); type_t *type_new_void(void); type_t *type_new_coclass(char *name); type_t *type_new_enum(const char *name, struct namespace *namespace, int defined, var_list_t *enums); -type_t *type_new_struct(char *name, int defined, var_list_t *fields); +type_t *type_new_struct(char *name, struct namespace *namespace, int defined, var_list_t *fields); type_t *type_new_nonencapsulated_union(const char *name, int defined, var_list_t *fields); type_t *type_new_encapsulated_union(char *name, var_t *switch_field, var_t *union_field, var_list_t *cases); type_t *type_new_bitfield(type_t *field_type, const expr_t *bits);

1 0

Jacek Caban : widl: Allow [version] attribute to be used on structs in winrt mode.
by Alexandre Julliard 13 Aug '15

13 Aug '15

Module: wine Branch: master Commit: 8d43c54ed2a877ce4dcdb867a26988c6e0c097bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d43c54ed2a877ce4dcdb867a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 10 13:19:29 2015 +0200 widl: Allow [version] attribute to be used on structs in winrt mode. --- tools/widl/parser.y | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 725cd3b..ba0be1c 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2064,7 +2064,7 @@ struct allowed_attr unsigned int on_arg : 1; unsigned int on_type : 1; unsigned int on_enum : 1; - unsigned int on_struct : 1; + unsigned int on_struct : 2; unsigned int on_union : 1; unsigned int on_field : 1; unsigned int on_library : 1; @@ -2175,7 +2175,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_UUID */ { 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, "uuid" }, /* ATTR_V1ENUM */ { 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, "v1_enum" }, /* ATTR_VARARG */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "vararg" }, - /* ATTR_VERSION */ { 1, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, "version" }, + /* ATTR_VERSION */ { 1, 0, 1, 0, 0, 1, 1, 2, 0, 0, 1, 0, 0, 1, "version" }, /* ATTR_VIPROGID */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "vi_progid" }, /* ATTR_WIREMARSHAL */ { 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "wire_marshal" }, }; @@ -2265,11 +2265,12 @@ static attr_list_t *check_enum_attrs(attr_list_t *attrs) static attr_list_t *check_struct_attrs(attr_list_t *attrs) { + int mask = winrt_mode ? 3 : 1; const attr_t *attr; if (!attrs) return attrs; LIST_FOR_EACH_ENTRY(attr, attrs, const attr_t, entry) { - if (!allowed_attr[attr->type].on_struct) + if (!(allowed_attr[attr->type].on_struct & mask)) error_loc("inapplicable attribute %s for struct\n", allowed_attr[attr->type].display_name); }

1 0

Józef Kucia : d3d10core/tests: Fix copy-paste mistake.
by Alexandre Julliard 13 Aug '15

13 Aug '15

Module: wine Branch: master Commit: 96322fbefcf10df40341afb007dc0d12e97417f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96322fbefcf10df40341afb00… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 10 01:11:19 2015 +0200 d3d10core/tests: Fix copy-paste mistake. --- dlls/d3d10core/tests/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index c75def4..55dce67 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -232,7 +232,7 @@ static void test_create_texture2d(void) ok(desc.Format == DXGI_FORMAT_R8G8B8A8_UNORM, "Got unexpected Format %#x.\n", desc.Format); ok(desc.SampleDesc.Count == 1, "Got unexpected SampleDesc.Count %u.\n", desc.SampleDesc.Count); ok(desc.SampleDesc.Quality == 0, "Got unexpected SampleDesc.Quality %u.\n", desc.SampleDesc.Quality); - ok(desc.Usage == D3D10_USAGE_DEFAULT, "Got unexpected MipLevels %u.\n", desc.Usage); + ok(desc.Usage == D3D10_USAGE_DEFAULT, "Got unexpected Usage %u.\n", desc.Usage); ok(desc.BindFlags == D3D10_BIND_RENDER_TARGET, "Got unexpected BindFlags %u.\n", desc.BindFlags); ok(desc.CPUAccessFlags == 0, "Got unexpected CPUAccessFlags %u.\n", desc.CPUAccessFlags); ok(desc.MiscFlags == 0, "Got unexpected MiscFlags %u.\n", desc.MiscFlags); @@ -323,7 +323,7 @@ static void test_create_texture3d(void) ok(desc.Depth == 64, "Got unexpected Depth %u.\n", desc.Depth); ok(desc.MipLevels == 7, "Got unexpected MipLevels %u.\n", desc.MipLevels); ok(desc.Format == DXGI_FORMAT_R8G8B8A8_UNORM, "Got unexpected Format %#x.\n", desc.Format); - ok(desc.Usage == D3D10_USAGE_DEFAULT, "Got unexpected MipLevels %u.\n", desc.Usage); + ok(desc.Usage == D3D10_USAGE_DEFAULT, "Got unexpected Usage %u.\n", desc.Usage); ok(desc.BindFlags == D3D10_BIND_RENDER_TARGET, "Got unexpected BindFlags %u.\n", desc.BindFlags); ok(desc.CPUAccessFlags == 0, "Got unexpected CPUAccessFlags %u.\n", desc.CPUAccessFlags); ok(desc.MiscFlags == 0, "Got unexpected MiscFlags %u.\n", desc.MiscFlags);

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
51
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2015