August 2019 - Wine-commits - list.winehq.org

Richard Pospesel : widl: Pass a decl_spec_t to write_type_v().
by Alexandre Julliard 16 Aug '19

16 Aug '19

Module: wine Branch: master Commit: aa2bd521d93e3d55c2f99b3d05713573fe0c2883 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa2bd521d93e3d55c2f99b3d… Author: Richard Pospesel <richard(a)torproject.org> Date: Thu Aug 15 20:13:18 2019 -0500 widl: Pass a decl_spec_t to write_type_v(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/client.c | 4 ++-- tools/widl/expr.c | 4 ++-- tools/widl/header.c | 26 +++++++++++++------------- tools/widl/header.h | 2 +- tools/widl/proxy.c | 2 +- tools/widl/server.c | 2 +- tools/widl/typegen.c | 36 +++++++++++++++++++----------------- tools/widl/typetree.h | 11 +++++++++++ 8 files changed, 50 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aa2bd521d93e3d55c2f9…

1 0

Richard Pospesel : widl: Pass a decl_spec_t to write_type_left().
by Alexandre Julliard 16 Aug '19

16 Aug '19

Module: wine Branch: master Commit: e8b6c052426b7711decee3d52ac9e325f171e050 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8b6c052426b7711decee3d5… Author: Richard Pospesel <richard(a)torproject.org> Date: Thu Aug 15 20:13:19 2019 -0500 widl: Pass a decl_spec_t to write_type_left(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/client.c | 2 +- tools/widl/header.c | 52 +++++++++++++++++++++++++++++----------------------- tools/widl/header.h | 4 ++-- tools/widl/proxy.c | 4 ++-- tools/widl/server.c | 2 +- tools/widl/typegen.c | 13 +++++++------ 6 files changed, 42 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e8b6c052426b7711dece…

1 0

Richard Pospesel : widl: Pass a decl_spec_t to type_new_array().
by Alexandre Julliard 16 Aug '19

16 Aug '19

Module: wine Branch: master Commit: d4dfbb630f0a536a4054df6254615b9efc0bb946 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4dfbb630f0a536a4054df62… Author: Richard Pospesel <richard(a)torproject.org> Date: Thu Aug 15 20:13:20 2019 -0500 widl: Pass a decl_spec_t to type_new_array(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 10 +++++----- tools/widl/typetree.c | 5 +++-- tools/widl/typetree.h | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index df3d78f..f35d671 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1622,11 +1622,11 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl error_loc("%s: cannot specify size_is for an already sized array\n", v->name); else *ptype = type_new_array((*ptype)->name, - type_array_get_element_type(*ptype), FALSE, + type_array_get_element(*ptype), FALSE, 0, dim, NULL, FC_RP); } else if (is_ptr(*ptype)) - *ptype = type_new_array((*ptype)->name, type_pointer_get_ref_type(*ptype), TRUE, + *ptype = type_new_array((*ptype)->name, type_pointer_get_ref(*ptype), TRUE, 0, dim, NULL, pointer_default); else error_loc("%s: size_is attribute applied to illegal type\n", v->name); @@ -1648,7 +1648,7 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl if (is_array(*ptype)) { *ptype = type_new_array((*ptype)->name, - type_array_get_element_type(*ptype), + type_array_get_element(*ptype), type_array_is_decl_as_ptr(*ptype), type_array_get_dim(*ptype), type_array_get_conformance(*ptype), @@ -1802,8 +1802,8 @@ static declarator_t *make_declarator(var_t *var) static type_t *make_safearray(type_t *type) { - return type_new_array(NULL, type_new_alias(type, "SAFEARRAY"), TRUE, 0, - NULL, NULL, FC_RP); + const decl_spec_t ds = {.type = type_new_alias(type, "SAFEARRAY")}; + return type_new_array(NULL, &ds, TRUE, 0, NULL, NULL, FC_RP); } static typelib_t *make_library(const char *name, const attr_list_t *attrs) diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index ae3f375..3e9ac89 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -217,7 +217,7 @@ type_t *type_new_coclass(char *name) } -type_t *type_new_array(const char *name, type_t *element, int declptr, +type_t *type_new_array(const char *name, const decl_spec_t *element, int declptr, unsigned int dim, expr_t *size_is, expr_t *length_is, unsigned char ptr_default_fc) { @@ -229,7 +229,8 @@ type_t *type_new_array(const char *name, type_t *element, int declptr, t->details.array.size_is = size_is; else t->details.array.dim = dim; - t->details.array.elem.type = element; + if (element) + t->details.array.elem = *element; t->details.array.ptr_def_fc = ptr_default_fc; return t; } diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index d5f28fe..9453e9d 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -33,7 +33,7 @@ type_t *type_new_function(var_list_t *args); type_t *type_new_pointer(unsigned char pointer_default, type_t *ref, attr_list_t *attrs); type_t *type_new_alias(type_t *t, const char *name); type_t *type_new_module(char *name); -type_t *type_new_array(const char *name, type_t *element, int declptr, +type_t *type_new_array(const char *name, const decl_spec_t *element, int declptr, unsigned int dim, expr_t *size_is, expr_t *length_is, unsigned char ptr_default_fc); type_t *type_new_basic(enum type_basic_type basic_type);

1 0

Richard Pospesel : widl: Pass a decl_spec_t to type_new_alias().
by Alexandre Julliard 16 Aug '19

16 Aug '19

Module: wine Branch: master Commit: f131795b30476ed2483649c49501dd00a97a8119 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f131795b30476ed2483649c4… Author: Richard Pospesel <richard(a)torproject.org> Date: Thu Aug 15 20:13:21 2019 -0500 widl: Pass a decl_spec_t to type_new_alias(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 8 +++++--- tools/widl/typetree.c | 4 ++-- tools/widl/typetree.h | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index f35d671..038b407 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1188,7 +1188,8 @@ static void decl_builtin_basic(const char *name, enum type_basic_type type) static void decl_builtin_alias(const char *name, type_t *t) { - reg_type(type_new_alias(t, name), name, NULL, 0); + const decl_spec_t ds = {.type = t}; + reg_type(type_new_alias(&ds, name), name, NULL, 0); } void init_types(void) @@ -1802,7 +1803,8 @@ static declarator_t *make_declarator(var_t *var) static type_t *make_safearray(type_t *type) { - const decl_spec_t ds = {.type = type_new_alias(type, "SAFEARRAY")}; + decl_spec_t ds = {.type = type}; + ds.type = type_new_alias(&ds, "SAFEARRAY"); return type_new_array(NULL, &ds, TRUE, 0, NULL, NULL, FC_RP); } @@ -1975,7 +1977,7 @@ static type_t *reg_typedefs(decl_spec_t *decl_spec, declarator_list_t *decls, at cur->loc_info.line_number); name = declare_var(attrs, decl_spec, decl, 0); - cur = type_new_alias(name->declspec.type, name->name); + cur = type_new_alias(&name->declspec, name->name); cur->attrs = attrs; if (is_incomplete(cur)) diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 3e9ac89..ef9a669 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -184,13 +184,13 @@ type_t *type_new_pointer(unsigned char pointer_default, type_t *ref, attr_list_t return t; } -type_t *type_new_alias(type_t *t, const char *name) +type_t *type_new_alias(const decl_spec_t *t, const char *name) { type_t *a = make_type(TYPE_ALIAS); a->name = xstrdup(name); a->attrs = NULL; - a->details.alias.aliasee.type = t; + a->details.alias.aliasee = *t; init_loc_info(&a->loc_info); return a; diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index 9453e9d..6377614 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -31,7 +31,7 @@ enum name_type { type_t *type_new_function(var_list_t *args); type_t *type_new_pointer(unsigned char pointer_default, type_t *ref, attr_list_t *attrs); -type_t *type_new_alias(type_t *t, const char *name); +type_t *type_new_alias(const decl_spec_t *t, const char *name); type_t *type_new_module(char *name); type_t *type_new_array(const char *name, const decl_spec_t *element, int declptr, unsigned int dim, expr_t *size_is, expr_t *length_is,

1 0

Zhiyi Zhang : msctf: Add ITfContextOwnerCompositionServices stub.
by Alexandre Julliard 16 Aug '19

16 Aug '19

Module: wine Branch: master Commit: ef542fc7977240046cab18f0e7efd051e56f6661 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef542fc7977240046cab18f0… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Aug 14 16:36:48 2019 +0800 msctf: Add ITfContextOwnerCompositionServices stub. Fix crash at launch for games that use Unreal Engine 4. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/context.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 88 insertions(+), 4 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 85e3c5b..63f2bf5 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -41,7 +41,7 @@ typedef struct tagContext { ITfContext ITfContext_iface; ITfSource ITfSource_iface; /* const ITfContextCompositionVtbl *ContextCompositionVtbl; */ - /* const ITfContextOwnerCompositionServicesVtbl *ContextOwnerCompositionServicesVtbl; */ + ITfContextOwnerCompositionServices ITfContextOwnerCompositionServices_iface; /* const ITfContextOwnerServicesVtbl *ContextOwnerServicesVtbl; */ ITfInsertAtSelection ITfInsertAtSelection_iface; /* const ITfMouseTrackerVtbl *MouseTrackerVtbl; */ @@ -89,6 +89,11 @@ static inline Context *impl_from_ITfSource(ITfSource *iface) return CONTAINING_RECORD(iface, Context, ITfSource_iface); } +static inline Context *impl_from_ITfContextOwnerCompositionServices(ITfContextOwnerCompositionServices *iface) +{ + return CONTAINING_RECORD(iface, Context, ITfContextOwnerCompositionServices_iface); +} + static inline Context *impl_from_ITfInsertAtSelection(ITfInsertAtSelection *iface) { return CONTAINING_RECORD(iface, Context, ITfInsertAtSelection_iface); @@ -150,6 +155,10 @@ static HRESULT WINAPI Context_QueryInterface(ITfContext *iface, REFIID iid, LPVO { *ppvOut = &This->ITfSource_iface; } + else if (IsEqualIID(iid, &IID_ITfContextOwnerCompositionServices)) + { + *ppvOut = &This->ITfContextOwnerCompositionServices_iface; + } else if (IsEqualIID(iid, &IID_ITfInsertAtSelection)) { *ppvOut = &This->ITfInsertAtSelection_iface; @@ -526,6 +535,9 @@ static const ITfContextVtbl ContextVtbl = Context_CreateRangeBackup }; +/***************************************************** + * ITfSource functions + *****************************************************/ static HRESULT WINAPI ContextSource_QueryInterface(ITfSource *iface, REFIID iid, LPVOID *ppvOut) { Context *This = impl_from_ITfSource(iface); @@ -544,9 +556,6 @@ static ULONG WINAPI ContextSource_Release(ITfSource *iface) return ITfContext_Release(&This->ITfContext_iface); } -/***************************************************** - * ITfSource functions - *****************************************************/ static HRESULT WINAPI ContextSource_AdviseSink(ITfSource *iface, REFIID riid, IUnknown *punk, DWORD *pdwCookie) { @@ -586,6 +595,80 @@ static const ITfSourceVtbl ContextSourceVtbl = }; /***************************************************** + * ITfContextOwnerCompositionServices functions + *****************************************************/ +static HRESULT WINAPI ContextOwnerCompositionServices_QueryInterface(ITfContextOwnerCompositionServices *iface, + REFIID iid, LPVOID *ppvOut) +{ + Context *This = impl_from_ITfContextOwnerCompositionServices(iface); + return ITfContext_QueryInterface(&This->ITfContext_iface, iid, ppvOut); +} + +static ULONG WINAPI ContextOwnerCompositionServices_AddRef(ITfContextOwnerCompositionServices *iface) +{ + Context *This = impl_from_ITfContextOwnerCompositionServices(iface); + return ITfContext_AddRef(&This->ITfContext_iface); +} + +static ULONG WINAPI ContextOwnerCompositionServices_Release(ITfContextOwnerCompositionServices *iface) +{ + Context *This = impl_from_ITfContextOwnerCompositionServices(iface); + return ITfContext_Release(&This->ITfContext_iface); +} + +static HRESULT WINAPI ContextOwnerCompositionServices_StartComposition(ITfContextOwnerCompositionServices *iface, + TfEditCookie ecWrite, ITfRange *pCompositionRange, ITfCompositionSink *pSink, ITfComposition **ppComposition) +{ + Context *This = impl_from_ITfContextOwnerCompositionServices(iface); + FIXME("STUB:(%p) %#x %p %p %p\n", This, ecWrite, pCompositionRange, pSink, ppComposition); + return E_NOTIMPL; +} + +static HRESULT WINAPI ContextOwnerCompositionServices_EnumCompositions(ITfContextOwnerCompositionServices *iface, + IEnumITfCompositionView **ppEnum) +{ + Context *This = impl_from_ITfContextOwnerCompositionServices(iface); + FIXME("STUB:(%p) %p\n", This, ppEnum); + return E_NOTIMPL; +} + +static HRESULT WINAPI ContextOwnerCompositionServices_FindComposition(ITfContextOwnerCompositionServices *iface, + TfEditCookie ecRead, ITfRange *pTestRange, IEnumITfCompositionView **ppEnum) +{ + Context *This = impl_from_ITfContextOwnerCompositionServices(iface); + FIXME("STUB:(%p) %#x %p %p\n", This, ecRead, pTestRange, ppEnum); + return E_NOTIMPL; +} + +static HRESULT WINAPI ContextOwnerCompositionServices_TakeOwnership(ITfContextOwnerCompositionServices *iface, + TfEditCookie ecWrite, ITfCompositionView *pComposition, ITfCompositionSink *pSink, ITfComposition **ppComposition) +{ + Context *This = impl_from_ITfContextOwnerCompositionServices(iface); + FIXME("STUB:(%p) %#x %p %p %p\n", This, ecWrite, pComposition, pSink, ppComposition); + return E_NOTIMPL; +} + +static HRESULT WINAPI ContextOwnerCompositionServices_TerminateComposition(ITfContextOwnerCompositionServices *iface, + ITfCompositionView *pComposition) +{ + Context *This = impl_from_ITfContextOwnerCompositionServices(iface); + FIXME("STUB:(%p) %p\n", This, pComposition); + return E_NOTIMPL; +} + +static const ITfContextOwnerCompositionServicesVtbl ContextOwnerCompositionServicesVtbl = +{ + ContextOwnerCompositionServices_QueryInterface, + ContextOwnerCompositionServices_AddRef, + ContextOwnerCompositionServices_Release, + ContextOwnerCompositionServices_StartComposition, + ContextOwnerCompositionServices_EnumCompositions, + ContextOwnerCompositionServices_FindComposition, + ContextOwnerCompositionServices_TakeOwnership, + ContextOwnerCompositionServices_TerminateComposition +}; + +/***************************************************** * ITfInsertAtSelection functions *****************************************************/ static HRESULT WINAPI InsertAtSelection_QueryInterface(ITfInsertAtSelection *iface, REFIID iid, LPVOID *ppvOut) @@ -981,6 +1064,7 @@ HRESULT Context_Constructor(TfClientId tidOwner, IUnknown *punk, ITfDocumentMgr This->ITfContext_iface.lpVtbl= &ContextVtbl; This->ITfSource_iface.lpVtbl = &ContextSourceVtbl; + This->ITfContextOwnerCompositionServices_iface.lpVtbl = &ContextOwnerCompositionServicesVtbl; This->ITfInsertAtSelection_iface.lpVtbl = &InsertAtSelectionVtbl; This->ITfSourceSingle_iface.lpVtbl = &ContextSourceSingleVtbl; This->ITextStoreACPSink_iface.lpVtbl = &TextStoreACPSinkVtbl;

1 0

Alexandre Julliard : Release 4.14.
by Alexandre Julliard 16 Aug '19

16 Aug '19

Module: wine Branch: master Commit: c1e8334735f20770b6c3bf2f98112bb853f5b891 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1e8334735f20770b6c3bf2f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Aug 17 00:26:16 2019 +0200 Release 4.14. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 525 ++++++++++++++++++++++++++++++++++++++++---------------------- AUTHORS | 3 + VERSION | 2 +- configure | 18 +-- 4 files changed, 351 insertions(+), 197 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c1e8334735f20770b6c3…

1 0

Tag wine-4.14 : Alexandre Julliard : Release 4.14
by Alexandre Julliard 16 Aug '19

16 Aug '19

Module: wine Branch: refs/tags/wine-4.14 Tag: ffbaee31a5fef66131de886879787cbbb4dfbcf2 URL: https://source.winehq.org/git/wine.git/?a=tag;h=ffbaee31a5fef66131de8868797… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Aug 17 00:26:16 2019 +0200 Release 4.14

1 0

Zebediah Figura : widl: Introduce type_array_{get,set}_ptr_tfsoff().
by Alexandre Julliard 15 Aug '19

15 Aug '19

Module: wine Branch: master Commit: 07c131f0f4d227a9a6a2e703e9fb738853202694 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07c131f0f4d227a9a6a2e703… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Aug 14 21:45:48 2019 -0500 widl: Introduce type_array_{get,set}_ptr_tfsoff(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typegen.c | 17 +++++++++-------- tools/widl/typetree.h | 14 ++++++++++++++ 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 47d12f5..e21aa57 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1011,8 +1011,9 @@ static unsigned char get_parameter_fc( const var_t *var, int is_return, unsigned break; case TGT_ARRAY: *flags |= MustFree; - if (type_array_is_decl_as_ptr(var->declspec.type) && var->declspec.type->details.array.ptr_tfsoff && - get_pointer_fc( var->declspec.type, var->attrs, !is_return ) == FC_RP) + if (type_array_is_decl_as_ptr(var->declspec.type) + && type_array_get_ptr_tfsoff(var->declspec.type) + && get_pointer_fc(var->declspec.type, var->attrs, !is_return) == FC_RP) { *typestring_offset = var->declspec.type->typestring_offset; *flags |= IsSimpleRef; @@ -1228,9 +1229,9 @@ static unsigned int write_old_procformatstring_type(FILE *file, int indent, cons { unsigned short offset = var->typestring_offset; - if (!is_interpreted && is_array(var->declspec.type) && - type_array_is_decl_as_ptr(var->declspec.type) && - var->declspec.type->details.array.ptr_tfsoff) + if (!is_interpreted && is_array(var->declspec.type) + && type_array_is_decl_as_ptr(var->declspec.type) + && type_array_get_ptr_tfsoff(var->declspec.type)) offset = var->declspec.type->typestring_offset; if (is_return) @@ -3621,7 +3622,7 @@ static unsigned int write_type_tfs(FILE *file, const attr_list_t *attrs, if (ptr_type != FC_RP) update_tfsoff( type, off, file ); *typeformat_offset += 4; } - type->details.array.ptr_tfsoff = off; + type_array_set_ptr_tfsoff(type, off); } return off; } @@ -4350,10 +4351,10 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const ((tc == FC_SMVARRAY || tc == FC_LGVARRAY) && in_attr) || (tc == FC_CARRAY && !in_attr)) { - if (type_array_is_decl_as_ptr(type) && type->details.array.ptr_tfsoff) + if (type_array_is_decl_as_ptr(type) && type_array_get_ptr_tfsoff(type)) { print_phase_function(file, indent, "Pointer", local_var_prefix, phase, var, - type->details.array.ptr_tfsoff); + type_array_get_ptr_tfsoff(type)); break; } print_phase_function(file, indent, array_type, local_var_prefix, phase, var, start_offset); diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index 4eb0a0a..07179a0 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -257,6 +257,20 @@ static inline expr_t *type_array_get_variance(const type_t *type) return type->details.array.length_is; } +static inline unsigned short type_array_get_ptr_tfsoff(const type_t *type) +{ + type = type_get_real_type(type); + assert(type_get_type(type) == TYPE_ARRAY); + return type->details.array.ptr_tfsoff; +} + +static inline void type_array_set_ptr_tfsoff(type_t *type, unsigned short ptr_tfsoff) +{ + type = type_get_real_type(type); + assert(type_get_type(type) == TYPE_ARRAY); + type->details.array.ptr_tfsoff = ptr_tfsoff; +} + static inline const decl_spec_t *type_array_get_element(const type_t *type) { type = type_get_real_type(type);

1 0

Zebediah Figura : widl: Use the type_type field to track whether the type is an alias.
by Alexandre Julliard 15 Aug '19

15 Aug '19

Module: wine Branch: master Commit: 2babcd6c1cd62e6d055cea4b3026d8769fc24aca URL: https://source.winehq.org/git/wine.git/?a=commit;h=2babcd6c1cd62e6d055cea4b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Aug 14 21:45:49 2019 -0500 widl: Use the type_type field to track whether the type is an alias. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typetree.c | 4 +--- tools/widl/typetree.h | 4 ++-- tools/widl/widltypes.h | 3 --- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index e727d8c..d823a46 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -59,7 +59,6 @@ type_t *make_type(enum type_type type) t->user_types_registered = FALSE; t->tfswrite = FALSE; t->checked = FALSE; - t->is_alias = FALSE; t->typelib_idx = -1; init_loc_info(&t->loc_info); return t; @@ -188,12 +187,11 @@ type_t *type_new_pointer(unsigned char pointer_default, type_t *ref, attr_list_t type_t *type_new_alias(type_t *t, const char *name) { - type_t *a = duptype(t, 0); + type_t *a = make_type(TYPE_ALIAS); a->name = xstrdup(name); a->attrs = NULL; a->orig = t; - a->is_alias = TRUE; /* for pointer types */ a->details = t->details; init_loc_info(&a->loc_info); diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index 07179a0..db8c1fc 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -59,7 +59,7 @@ type_t *duptype(type_t *t, int dupname); /* un-alias the type until finding the non-alias type */ static inline type_t *type_get_real_type(const type_t *type) { - if (type->is_alias) + if (type->type_type == TYPE_ALIAS) return type_get_real_type(type->orig); else return (type_t *)type; @@ -299,7 +299,7 @@ static inline unsigned char type_array_get_ptr_default_fc(const type_t *type) static inline int type_is_alias(const type_t *type) { - return type->is_alias; + return type->type_type == TYPE_ALIAS; } static inline type_t *type_alias_get_aliasee(const type_t *type) diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 5e0f34d..29ff266 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -451,7 +451,6 @@ struct _type_t { unsigned int user_types_registered : 1; unsigned int tfswrite : 1; /* if the type needs to be written to the TFS */ unsigned int checked : 1; - unsigned int is_alias : 1; /* is the type an alias? */ }; struct _var_t { @@ -593,8 +592,6 @@ char *format_namespace(struct namespace *namespace, const char *prefix, const ch static inline enum type_type type_get_type_detect_alias(const type_t *type) { - if (type->is_alias) - return TYPE_ALIAS; return type->type_type; }

1 0

Richard Pospesel : widl: Store the aliasee as a decl_spec_t structure.
by Alexandre Julliard 15 Aug '19

15 Aug '19

Module: wine Branch: master Commit: e63df7f7bfee8a797c270e46f24c075615cdf6c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e63df7f7bfee8a797c270e46… Author: Richard Pospesel <richard(a)torproject.org> Date: Wed Aug 14 21:45:50 2019 -0500 widl: Store the aliasee as a decl_spec_t structure. Signed-off-by: Richard Pospesel <richard(a)torproject.org> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/header.c | 14 +++++++------- tools/widl/header.h | 2 +- tools/widl/parser.y | 2 +- tools/widl/typegen.c | 8 ++++---- tools/widl/typetree.c | 5 +---- tools/widl/typetree.h | 6 +++--- tools/widl/widltypes.h | 7 ++++++- tools/widl/write_msft.c | 12 ++++++------ 8 files changed, 29 insertions(+), 27 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e63df7f7bfee8a797c27…

1 0