February 2021 - Wine-commits

Rémi Bernon : d3d11: Create an initial device ID3DDeviceContextState.
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: 943d48896e97240499351b7f78480811d6abb320 URL: https://source.winehq.org/git/wine.git/?a=commit;h=943d48896e97240499351b7f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 16 13:56:01 2021 +0100 d3d11: Create an initial device ID3DDeviceContextState. And use its emulated_interface. This adds a private_refcount to track hidden references, and a reference to the wined3d_device, to keep the d3d_device alive while not publicly referencing it. This uses d3d_device_context_state_AddRef on init so that the initial references are also traced, making it easier to verify that nothing is leaked. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_main.c | 1 - dlls/d3d11/d3d11_private.h | 6 ++-- dlls/d3d11/device.c | 69 ++++++++++++++++++++++++++++++++++++++-------- 3 files changed, 61 insertions(+), 15 deletions(-) diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c index 6666876049d..dac59d09999 100644 --- a/dlls/d3d11/d3d11_main.c +++ b/dlls/d3d11/d3d11_main.c @@ -137,7 +137,6 @@ HRESULT WINAPI D3D11CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapte return E_FAIL; } d3d_device->d3d11_only = TRUE; - d3d_device->emulated_interface = IID_ID3D11Device2; return S_OK; } diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index cdae1104efa..650b5c35871 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -520,7 +520,7 @@ struct d3d_query *unsafe_impl_from_ID3D11Asynchronous(ID3D11Asynchronous *iface) struct d3d_device_context_state { ID3DDeviceContextState ID3DDeviceContextState_iface; - LONG refcount; + LONG refcount, private_refcount; struct wined3d_private_store private_store; struct @@ -546,6 +546,8 @@ struct d3d_device_context_state } ps; GUID emulated_interface; + + struct wined3d_device *wined3d_device; ID3D11Device2 *device; }; @@ -572,8 +574,8 @@ struct d3d_device D3D_FEATURE_LEVEL feature_level; BOOL d3d11_only; - GUID emulated_interface; + struct d3d_device_context_state *state; struct d3d11_immediate_context immediate_context; struct wined3d_device_parent device_parent; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 914b64d6019..87bdd594d81 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -31,8 +31,9 @@ static const struct wined3d_parent_ops d3d_null_wined3d_parent_ops = static inline BOOL d3d_device_is_d3d10_active(struct d3d_device *device) { - return IsEqualGUID(&device->emulated_interface, &IID_ID3D10Device) - || IsEqualGUID(&device->emulated_interface, &IID_ID3D10Device1); + return !device->state + || IsEqualGUID(&device->state->emulated_interface, &IID_ID3D10Device) + || IsEqualGUID(&device->state->emulated_interface, &IID_ID3D10Device1); } /* ID3DDeviceContextState methods */ @@ -62,6 +63,15 @@ static HRESULT STDMETHODCALLTYPE d3d_device_context_state_QueryInterface(ID3DDev return E_NOINTERFACE; } +static ULONG d3d_device_context_state_private_addref(struct d3d_device_context_state *state) +{ + ULONG refcount = InterlockedIncrement(&state->private_refcount); + + TRACE("%p increasing private refcount to %u.\n", state, refcount); + + return refcount; +} + static ULONG STDMETHODCALLTYPE d3d_device_context_state_AddRef(ID3DDeviceContextState *iface) { struct d3d_device_context_state *state = impl_from_ID3DDeviceContextState(iface); @@ -69,16 +79,21 @@ static ULONG STDMETHODCALLTYPE d3d_device_context_state_AddRef(ID3DDeviceContext TRACE("%p increasing refcount to %u.\n", state, refcount); + if (refcount == 1) + { + d3d_device_context_state_private_addref(state); + ID3D11Device2_AddRef(state->device); + } + return refcount; } -static ULONG STDMETHODCALLTYPE d3d_device_context_state_Release(ID3DDeviceContextState *iface) +static void d3d_device_context_state_private_release(struct d3d_device_context_state *state) { - struct d3d_device_context_state *state = impl_from_ID3DDeviceContextState(iface); - ULONG refcount = InterlockedDecrement(&state->refcount); + ULONG refcount = InterlockedDecrement(&state->private_refcount); unsigned int i; - TRACE("%p decreasing refcount to %u.\n", state, refcount); + TRACE("%p decreasing private refcount to %u.\n", state, refcount); if (!refcount) { @@ -104,9 +119,23 @@ static ULONG STDMETHODCALLTYPE d3d_device_context_state_Release(ID3DDeviceContex if (state->gs.cbs[i]) ID3D11Buffer_Release(state->gs.cbs[i]); if (state->ps.cbs[i]) ID3D11Buffer_Release(state->ps.cbs[i]); } - ID3D11Device2_Release(state->device); + wined3d_device_decref(state->wined3d_device); heap_free(state); } +} + +static ULONG STDMETHODCALLTYPE d3d_device_context_state_Release(ID3DDeviceContextState *iface) +{ + struct d3d_device_context_state *state = impl_from_ID3DDeviceContextState(iface); + ULONG refcount = InterlockedDecrement(&state->refcount); + + TRACE("%p decreasing refcount to %u.\n", state, refcount); + + if (!refcount) + { + ID3D11Device2_Release(state->device); + d3d_device_context_state_private_release(state); + } return refcount; } @@ -169,7 +198,7 @@ static void d3d_device_context_state_init(struct d3d_device_context_state *state REFIID emulated_interface) { state->ID3DDeviceContextState_iface.lpVtbl = &d3d_device_context_state_vtbl; - state->refcount = 1; + state->refcount = state->private_refcount = 0; wined3d_private_store_init(&state->private_store); memset(&state->vs, 0, sizeof(state->vs)); @@ -177,8 +206,10 @@ static void d3d_device_context_state_init(struct d3d_device_context_state *state memset(&state->ps, 0, sizeof(state->ps)); state->emulated_interface = *emulated_interface; + wined3d_device_incref(state->wined3d_device = device->wined3d_device); state->device = &device->ID3D11Device2_iface; - ID3D11Device2_AddRef(state->device); + + d3d_device_context_state_AddRef(&state->ID3DDeviceContextState_iface); } /* ID3D11DeviceContext - immediate context methods */ @@ -2770,7 +2801,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_SwapDeviceContextState(ID3 *prev_state = NULL; if ((state_impl = heap_alloc(sizeof(*state_impl)))) { - d3d_device_context_state_init(state_impl, device, &device->emulated_interface); + d3d_device_context_state_init(state_impl, device, &device->state->emulated_interface); d3d11_immediate_context_capture_state(iface, state_impl); *prev_state = &state_impl->ID3DDeviceContextState_iface; } @@ -2779,7 +2810,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_SwapDeviceContextState(ID3 if ((state_impl = impl_from_ID3DDeviceContextState(state))) { d3d11_immediate_context_restore_state(iface, state_impl); - device->emulated_interface = state_impl->emulated_interface; + device->state->emulated_interface = state_impl->emulated_interface; if (d3d_device_is_d3d10_active(device)) FIXME("D3D10 interface emulation not fully implemented yet!\n"); } @@ -4175,6 +4206,7 @@ static ULONG STDMETHODCALLTYPE d3d_device_inner_Release(IUnknown *iface) if (!refcount) { + if (device->state) d3d_device_context_state_private_release(device->state); d3d11_immediate_context_destroy(&device->immediate_context); if (device->wined3d_device) { @@ -6352,6 +6384,8 @@ static void CDECL device_parent_wined3d_device_created(struct wined3d_device_par struct wined3d_device *wined3d_device) { struct d3d_device *device = device_from_wined3d_device_parent(device_parent); + ID3DDeviceContextState *state; + HRESULT hr; TRACE("device_parent %p, wined3d_device %p.\n", device_parent, wined3d_device); @@ -6359,6 +6393,17 @@ static void CDECL device_parent_wined3d_device_created(struct wined3d_device_par device->wined3d_device = wined3d_device; device->feature_level = d3d_feature_level_from_wined3d(wined3d_device_get_feature_level(wined3d_device)); + + if (FAILED(hr = d3d11_device_CreateDeviceContextState(&device->ID3D11Device2_iface, 0, &device->feature_level, + 1, D3D11_SDK_VERSION, device->d3d11_only ? &IID_ID3D11Device2 : &IID_ID3D10Device1, NULL, + &state))) + ERR("Failed to create the initial device context state, hr %#x.\n", hr); + else + { + device->state = impl_from_ID3DDeviceContextState(state); + d3d_device_context_state_private_addref(device->state); + ID3DDeviceContextState_Release(state); + } } static void CDECL device_parent_mode_changed(struct wined3d_device_parent *device_parent) @@ -6488,7 +6533,7 @@ void d3d_device_init(struct d3d_device *device, void *outer_unknown) /* COM aggregation always takes place */ device->outer_unk = outer_unknown; device->d3d11_only = FALSE; - device->emulated_interface = GUID_NULL; + device->state = NULL; d3d11_immediate_context_init(&device->immediate_context, device); ID3D11DeviceContext1_Release(&device->immediate_context.ID3D11DeviceContext1_iface);

1 0

Rémi Bernon : widl: Rename ifref_t iface member to type.
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: db580fe9db159f9eef8c50fa6ee16d5b19f5918a URL: https://source.winehq.org/git/wine.git/?a=commit;h=db580fe9db159f9eef8c50fa… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Feb 17 19:33:30 2021 +0100 widl: Rename ifref_t iface member to type. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 4 ++-- tools/widl/typetree.c | 8 ++++---- tools/widl/typetree.h | 2 +- tools/widl/widltypes.h | 2 +- tools/widl/write_msft.c | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index e9071f8290e..05ca81737d5 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1826,10 +1826,10 @@ static ifref_list_t *append_ifref(ifref_list_t *list, ifref_t *iface) return list; } -static ifref_t *make_ifref(type_t *iface) +static ifref_t *make_ifref(type_t *type) { ifref_t *l = xmalloc(sizeof(ifref_t)); - l->iface = iface; + l->type = type; l->attrs = NULL; return l; } diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 203fffcdee6..2f49a92511a 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -565,19 +565,19 @@ type_t *type_runtimeclass_define(type_t *runtimeclass, attr_list_t *attrs, ifref /* FIXME: this should probably not be allowed, here or in coclass, */ /* but for now there's too many places in Wine IDL where it is to */ /* even print a warning. */ - if (!(ifref->iface->defined)) continue; - if (!(requires = type_iface_get_requires(ifref->iface))) continue; + if (!(ifref->type->defined)) continue; + if (!(requires = type_iface_get_requires(ifref->type))) continue; LIST_FOR_EACH_ENTRY(required, requires, ifref_t, entry) { int found = 0; LIST_FOR_EACH_ENTRY(tmp, ifaces, ifref_t, entry) - if ((found = type_is_equal(tmp->iface, required->iface))) break; + if ((found = type_is_equal(tmp->type, required->type))) break; if (!found) error_loc("interface '%s' also requires interface '%s', " "but runtimeclass '%s' does not implement it.\n", - ifref->iface->name, required->iface->name, runtimeclass->name); + ifref->type->name, required->type->name, runtimeclass->name); } } diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index 96b681e0379..186f42307f4 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -363,7 +363,7 @@ static inline type_t *type_runtimeclass_get_default_iface(const type_t *type) if (!ifaces) return NULL; LIST_FOR_EACH_ENTRY(entry, ifaces, ifref_t, entry) if (is_attr(entry->attrs, ATTR_DEFAULT)) - return entry->iface; + return entry->type; return NULL; } diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 7596577493d..f31d40cad91 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -538,7 +538,7 @@ struct _declarator_t { }; struct _ifref_t { - type_t *iface; + type_t *type; attr_list_t *attrs; /* parser-internal */ diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 5728f041f6f..63635cec011 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2352,10 +2352,10 @@ static void add_coclass_typeinfo(msft_typelib_t *typelib, type_t *cls) i = 0; if (ifaces) LIST_FOR_EACH_ENTRY( iref, ifaces, ifref_t, entry ) { - if(iref->iface->typelib_idx == -1) - add_interface_typeinfo(typelib, iref->iface); + if(iref->type->typelib_idx == -1) + add_interface_typeinfo(typelib, iref->type); ref = (MSFT_RefRecord*) (typelib->typelib_segment_data[MSFT_SEG_REFERENCES] + offset + i * sizeof(*ref)); - ref->reftype = typelib->typelib_typeinfo_offsets[iref->iface->typelib_idx]; + ref->reftype = typelib->typelib_typeinfo_offsets[iref->type->typelib_idx]; ref->flags = 0; ref->oCustData = -1; ref->onext = -1;

1 0

Rémi Bernon : widl: Rename ifref_t to typeref_t.
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: 7987c6f9ba920ac678f968a8b2a7023b07a982c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7987c6f9ba920ac678f968a8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Feb 17 19:33:31 2021 +0100 widl: Rename ifref_t to typeref_t. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 34 +++++++++++++++++----------------- tools/widl/typetree.c | 14 +++++++------- tools/widl/typetree.h | 8 ++++---- tools/widl/widltypes.h | 5 ++--- tools/widl/write_msft.c | 6 +++--- 5 files changed, 33 insertions(+), 34 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 05ca81737d5..7579e84d6f3 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -57,8 +57,8 @@ static attr_t *make_custom_attr(UUID *id, expr_t *pval); static expr_list_t *append_expr(expr_list_t *list, expr_t *expr); static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, declarator_t *decl, int top); static var_list_t *set_var_types(attr_list_t *attrs, decl_spec_t *decl_spec, declarator_list_t *decls); -static ifref_list_t *append_ifref(ifref_list_t *list, ifref_t *iface); -static ifref_t *make_ifref(type_t *iface); +static ifref_list_t *append_typeref(ifref_list_t *list, typeref_t *ref); +static typeref_t *make_typeref(type_t *type); static var_list_t *append_var_list(var_list_t *list, var_list_t *vars); static declarator_list_t *append_declarator(declarator_list_t *list, declarator_t *p); static declarator_t *make_declarator(var_t *var); @@ -137,7 +137,7 @@ static typelib_t *current_typelib; statement_list_t *stmt_list; warning_t *warning; warning_list_t *warning_list; - ifref_t *ifref; + typeref_t *typeref; ifref_list_t *ifref_list; char *str; UUID *uuid; @@ -293,7 +293,7 @@ static typelib_t *current_typelib; %type <type> type unqualified_type qualified_type %type <type> type_parameter %type <type_list> type_parameters -%type <ifref> class_interface +%type <typeref> class_interface %type <ifref_list> class_interfaces %type <ifref_list> requires required_types %type <var> arg ne_union_field union_field s_field case enum enum_member declaration @@ -939,12 +939,12 @@ namespacedef: tNAMESPACE aIDENTIFIER { $$ = $2; } ; class_interfaces: { $$ = NULL; } - | class_interfaces class_interface { $$ = append_ifref( $1, $2 ); } + | class_interfaces class_interface { $$ = append_typeref( $1, $2 ); } ; class_interface: - m_attributes interfaceref ';' { $$ = make_ifref($2); $$->attrs = $1; } - | m_attributes dispinterfaceref ';' { $$ = make_ifref($2); $$->attrs = $1; } + m_attributes interfaceref ';' { $$ = make_typeref($2); $$->attrs = $1; } + | m_attributes dispinterfaceref ';' { $$ = make_typeref($2); $$->attrs = $1; } ; dispinterface: tDISPINTERFACE typename { $$ = type_dispinterface_declare($2); } @@ -987,8 +987,8 @@ interface: ; required_types: - qualified_type { $$ = append_ifref(NULL, make_ifref($1)); } - | required_types ',' qualified_type { $$ = append_ifref($1, make_ifref($3)); } + qualified_type { $$ = append_typeref(NULL, make_typeref($1)); } + | required_types ',' qualified_type { $$ = append_typeref($1, make_typeref($3)); } requires: { $$ = NULL; } | tREQUIRES required_types { $$ = $2; } @@ -1814,24 +1814,24 @@ static var_list_t *set_var_types(attr_list_t *attrs, decl_spec_t *decl_spec, dec return var_list; } -static ifref_list_t *append_ifref(ifref_list_t *list, ifref_t *iface) +static ifref_list_t *append_typeref(ifref_list_t *list, typeref_t *ref) { - if (!iface) return list; + if (!ref) return list; if (!list) { list = xmalloc( sizeof(*list) ); list_init( list ); } - list_add_tail( list, &iface->entry ); + list_add_tail( list, &ref->entry ); return list; } -static ifref_t *make_ifref(type_t *type) +static typeref_t *make_typeref(type_t *type) { - ifref_t *l = xmalloc(sizeof(ifref_t)); - l->type = type; - l->attrs = NULL; - return l; + typeref_t *ref = xmalloc(sizeof(typeref_t)); + ref->type = type; + ref->attrs = NULL; + return ref; } static type_list_t *append_type(type_list_t *list, type_t *type) diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 2f49a92511a..d2a43a36c01 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -548,7 +548,7 @@ type_t *type_runtimeclass_declare(char *name, struct namespace *namespace) type_t *type_runtimeclass_define(type_t *runtimeclass, attr_list_t *attrs, ifref_list_t *ifaces) { - ifref_t *ifref, *required, *tmp; + typeref_t *ref, *required, *tmp; ifref_list_t *requires; if (runtimeclass->defined) @@ -560,24 +560,24 @@ type_t *type_runtimeclass_define(type_t *runtimeclass, attr_list_t *attrs, ifref if (!type_runtimeclass_get_default_iface(runtimeclass)) error_loc("missing default interface on runtimeclass %s\n", runtimeclass->name); - LIST_FOR_EACH_ENTRY(ifref, ifaces, ifref_t, entry) + LIST_FOR_EACH_ENTRY(ref, ifaces, typeref_t, entry) { /* FIXME: this should probably not be allowed, here or in coclass, */ /* but for now there's too many places in Wine IDL where it is to */ /* even print a warning. */ - if (!(ifref->type->defined)) continue; - if (!(requires = type_iface_get_requires(ifref->type))) continue; - LIST_FOR_EACH_ENTRY(required, requires, ifref_t, entry) + if (!(ref->type->defined)) continue; + if (!(requires = type_iface_get_requires(ref->type))) continue; + LIST_FOR_EACH_ENTRY(required, requires, typeref_t, entry) { int found = 0; - LIST_FOR_EACH_ENTRY(tmp, ifaces, ifref_t, entry) + LIST_FOR_EACH_ENTRY(tmp, ifaces, typeref_t, entry) if ((found = type_is_equal(tmp->type, required->type))) break; if (!found) error_loc("interface '%s' also requires interface '%s', " "but runtimeclass '%s' does not implement it.\n", - ifref->type->name, required->type->name, runtimeclass->name); + ref->type->name, required->type->name, runtimeclass->name); } } diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index 186f42307f4..7c2e9d40026 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -358,12 +358,12 @@ static inline ifref_list_t *type_runtimeclass_get_ifaces(const type_t *type) static inline type_t *type_runtimeclass_get_default_iface(const type_t *type) { ifref_list_t *ifaces = type_runtimeclass_get_ifaces(type); - ifref_t *entry; + typeref_t *ref; if (!ifaces) return NULL; - LIST_FOR_EACH_ENTRY(entry, ifaces, ifref_t, entry) - if (is_attr(entry->attrs, ATTR_DEFAULT)) - return entry->type; + LIST_FOR_EACH_ENTRY(ref, ifaces, typeref_t, entry) + if (is_attr(ref->attrs, ATTR_DEFAULT)) + return ref->type; return NULL; } diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index f31d40cad91..8e83fc059fb 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -43,7 +43,7 @@ typedef struct _type_t type_t; typedef struct _var_t var_t; typedef struct _decl_spec_t decl_spec_t; typedef struct _declarator_t declarator_t; -typedef struct _ifref_t ifref_t; +typedef struct _typeref_t typeref_t; typedef struct _typelib_entry_t typelib_entry_t; typedef struct _importlib_t importlib_t; typedef struct _importinfo_t importinfo_t; @@ -537,7 +537,7 @@ struct _declarator_t { struct list entry; }; -struct _ifref_t { +struct _typeref_t { type_t *type; attr_list_t *attrs; @@ -601,7 +601,6 @@ struct _statement_t { enum statement_type type; union { - ifref_t iface; type_t *type; const char *str; var_t *var; diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 63635cec011..fb532f7a227 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2331,7 +2331,7 @@ static void add_typedef_typeinfo(msft_typelib_t *typelib, type_t *tdef) static void add_coclass_typeinfo(msft_typelib_t *typelib, type_t *cls) { msft_typeinfo_t *msft_typeinfo; - ifref_t *iref; + typeref_t *iref; int num_ifaces = 0, offset, i; MSFT_RefRecord *ref, *first = NULL, *first_source = NULL; int have_default = 0, have_default_source = 0; @@ -2345,13 +2345,13 @@ static void add_coclass_typeinfo(msft_typelib_t *typelib, type_t *cls) msft_typeinfo = create_msft_typeinfo(typelib, TKIND_COCLASS, cls->name, cls->attrs); ifaces = type_coclass_get_ifaces(cls); - if (ifaces) LIST_FOR_EACH_ENTRY( iref, ifaces, ifref_t, entry ) num_ifaces++; + if (ifaces) LIST_FOR_EACH_ENTRY( iref, ifaces, typeref_t, entry ) num_ifaces++; offset = msft_typeinfo->typeinfo->datatype1 = ctl2_alloc_segment(typelib, MSFT_SEG_REFERENCES, num_ifaces * sizeof(*ref), 0); i = 0; - if (ifaces) LIST_FOR_EACH_ENTRY( iref, ifaces, ifref_t, entry ) { + if (ifaces) LIST_FOR_EACH_ENTRY( iref, ifaces, typeref_t, entry ) { if(iref->type->typelib_idx == -1) add_interface_typeinfo(typelib, iref->type); ref = (MSFT_RefRecord*) (typelib->typelib_segment_data[MSFT_SEG_REFERENCES] + offset + i * sizeof(*ref));

1 0

Jacek Caban : winegcc: Properly set debug info type on msvc targets.
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: d281c90c4b2f03b8b554da2bf9e3e25e77953baa URL: https://source.winehq.org/git/wine.git/?a=commit;h=d281c90c4b2f03b8b554da2b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 17 21:36:29 2021 +0100 winegcc: Properly set debug info type on msvc targets. Fixes a typo from 9faa5eeddd24a057d9ff522259c9dbdc6203c098. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index e72f234d94b..c812af48670 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -560,12 +560,12 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) strarray_add(link_args, "-Wl,-debug"); strarray_add(link_args, strmake("-Wl,-pdb:%s", opts->debug_file)); } + else if (!opts->strip) + strarray_add(link_args, "-Wl,-debug:dwarf"); if (opts->out_implib) strarray_add(link_args, strmake("-Wl,-implib:%s", opts->out_implib)); - else if (!opts->strip) - strarray_add(link_args, "-Wl,-debug:dwarf"); strarray_add( link_args, strmake( "-Wl,-filealign:%s", opts->file_align ? opts->file_align : "0x1000" )); strarray_addall( link_args, flags );

1 0

Jacek Caban : ntdll: Store eflags in x86_64 syscall frame.
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: 9bdd02de0c5cd370a48901ceede12ff946662295 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bdd02de0c5cd370a48901ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 15 21:58:02 2021 +0100 ntdll: Store eflags in x86_64 syscall frame. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 2 +- tools/winebuild/import.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 824cfb4febe..9366d8913c0 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1947,7 +1947,7 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) context->Rsp = (ULONG64)&frame->ret_addr; context->Rbp = frame->rbp; context->Rip = frame->thunk_addr; - context->EFlags = 0x202; + context->EFlags = frame->eflags; __asm__( "movw %%cs,%0" : "=g" (context->SegCs) ); __asm__( "movw %%ss,%0" : "=g" (context->SegSs) ); context->ContextFlags |= CONTEXT_CONTROL; diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index c70470251a4..8c949a383e3 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1508,7 +1508,9 @@ void output_syscalls( DLLSPEC *spec ) output_cfi( ".cfi_rel_offset %%rbp,0" ); output( "\tmovq %%rsp,%%rbp\n" ); output_cfi( ".cfi_def_cfa_register %%rbp" ); - output( "\tleaq -0x2a8(%%rbp),%%rsp\n" ); + output( "\tleaq -0x10(%%rbp),%%rsp\n" ); + output( "\tpushfq\n" ); + output( "\tsubq $0x280,%%rsp\n" ); output( "\tandq $~63,%%rsp\n" ); output( "\tmovq %%rbx,-0x90(%%rbp)\n" ); output_cfi( ".cfi_rel_offset %%rbx,-144" );

1 0

Jacek Caban : ntdll: Store instruction pointer register in x86_64 syscall frame.
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: accf7a09080eb38f75e5b730725ac987248d6e1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=accf7a09080eb38f75e5b730… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 15 21:58:09 2021 +0100 ntdll: Store instruction pointer register in x86_64 syscall frame. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 4 ++-- tools/winebuild/import.c | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 9366d8913c0..d5a34c700f8 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1946,7 +1946,7 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) { context->Rsp = (ULONG64)&frame->ret_addr; context->Rbp = frame->rbp; - context->Rip = frame->thunk_addr; + context->Rip = frame->rip; context->EFlags = frame->eflags; __asm__( "movw %%cs,%0" : "=g" (context->SegCs) ); __asm__( "movw %%ss,%0" : "=g" (context->SegSs) ); @@ -2410,7 +2410,7 @@ static BOOL handle_syscall_fault( ucontext_t *sigcontext, EXCEPTION_RECORD *rec, R14_sig(sigcontext) = frame->r14; R15_sig(sigcontext) = frame->r15; RSP_sig(sigcontext) = (ULONG_PTR)&frame->ret_addr; - RIP_sig(sigcontext) = frame->thunk_addr; + RIP_sig(sigcontext) = frame->rip; if (fpu) *fpu = get_syscall_xsave( frame )->xsave; amd64_thread_data()->syscall_frame = NULL; } diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 8c949a383e3..2db414b3b30 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1522,10 +1522,12 @@ void output_syscalls( DLLSPEC *spec ) output( "\tmovq %%r13,-0x40(%%rbp)\n" ); output( "\tmovq %%r14,-0x38(%%rbp)\n" ); output( "\tmovq %%r15,-0x30(%%rbp)\n" ); - output( "\tfxsave64 (%%rsp)\n" ); /* Legends of Runeterra hooks the first system call return instruction, and * depends on us returning to it. Adjust the return address accordingly. */ output( "\tsubq $0xb,0x8(%%rbp)\n" ); + output( "\tmovq 0x8(%%rbp),%%rbx\n" ); + output( "\tmovq %%rbx,-0x28(%%rbp)\n" ); + output( "\tfxsave64 (%%rsp)\n" ); output( "\tmovq %%gs:0x30,%%rcx\n" ); output( "\tleaq -0x98(%%rbp),%%rbx\n" ); output( "\tmovq %%rbx,0x328(%%rcx)\n" ); /* amd64_thread_data()->syscall_frame */

1 0

Jacek Caban : ntdll: Store stack pointer in x86_64 syscall frame.
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: 4e5b61bb068f90b84d2b0a168162ac3f8f0e9af0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e5b61bb068f90b84d2b0a16… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 15 21:58:27 2021 +0100 ntdll: Store stack pointer in x86_64 syscall frame. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 13 +++++-------- tools/winebuild/import.c | 2 ++ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index d5a34c700f8..6477bf8a953 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -300,12 +300,9 @@ struct syscall_frame WORD gs; /* 0092 */ WORD pad[2]; /* 0094 */ ULONG64 rbp; /* 0098 */ - ULONG64 thunk_addr; - ULONG64 ret_addr; }; -/* Should match the offset in call_user_apc_dispatcher(). */ -C_ASSERT( offsetof( struct syscall_frame, ret_addr ) == 0xa8); +C_ASSERT( sizeof( struct syscall_frame ) == 0xa0); struct amd64_thread_data { @@ -1944,7 +1941,7 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) } if (needed_flags & CONTEXT_CONTROL) { - context->Rsp = (ULONG64)&frame->ret_addr; + context->Rsp = frame->rsp; context->Rbp = frame->rbp; context->Rip = frame->rip; context->EFlags = frame->eflags; @@ -2104,7 +2101,7 @@ __ASM_GLOBAL_FUNC( call_user_apc_dispatcher, "movq 0x98(%rcx),%rdx\n\t" /* context->Rsp */ "jmp 2f\n\t" "1:\tmovq 0x328(%rbx),%rax\n\t" /* amd64_thread_data()->syscall_frame */ - "leaq 0xa8(%rax),%rdx\n\t" /* &amd64_thread_data()->syscall_frame->ret_addr */ + "movq 0x88(%rax),%rdx\n\t" /* frame->rsp */ "2:\tsubq $0x510,%rdx\n\t" /* sizeof(struct apc_stack_layout) */ "andq $~0xf,%rdx\n\t" "addq $8,%rsp\n\t" /* pop return address */ @@ -2399,7 +2396,7 @@ static BOOL handle_syscall_fault( ucontext_t *sigcontext, EXCEPTION_RECORD *rec, { XMM_SAVE_AREA32 *fpu = FPU_sig(sigcontext); - TRACE( "returning to user mode ip=%016lx ret=%08x\n", frame->ret_addr, rec->ExceptionCode ); + TRACE( "returning to user mode ip=%016lx ret=%08x\n", frame->rip, rec->ExceptionCode ); RAX_sig(sigcontext) = rec->ExceptionCode; RBX_sig(sigcontext) = frame->rbx; RSI_sig(sigcontext) = frame->rsi; @@ -2409,7 +2406,7 @@ static BOOL handle_syscall_fault( ucontext_t *sigcontext, EXCEPTION_RECORD *rec, R13_sig(sigcontext) = frame->r13; R14_sig(sigcontext) = frame->r14; R15_sig(sigcontext) = frame->r15; - RSP_sig(sigcontext) = (ULONG_PTR)&frame->ret_addr; + RSP_sig(sigcontext) = frame->rsp; RIP_sig(sigcontext) = frame->rip; if (fpu) *fpu = get_syscall_xsave( frame )->xsave; amd64_thread_data()->syscall_frame = NULL; diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 2db414b3b30..12ba189aa0a 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1527,6 +1527,8 @@ void output_syscalls( DLLSPEC *spec ) output( "\tsubq $0xb,0x8(%%rbp)\n" ); output( "\tmovq 0x8(%%rbp),%%rbx\n" ); output( "\tmovq %%rbx,-0x28(%%rbp)\n" ); + output( "\tleaq 0x10(%%rbp),%%rbx\n" ); + output( "\tmovq %%rbx,-0x10(%%rbp)\n" ); output( "\tfxsave64 (%%rsp)\n" ); output( "\tmovq %%gs:0x30,%%rcx\n" ); output( "\tleaq -0x98(%%rbp),%%rbx\n" );

1 0

Jacek Caban : ntdll: Store segment registers in x86_64 syscall frame.
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: f72940de8e5709605e517f7fe4ac1605ca519c5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f72940de8e5709605e517f7f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 15 21:58:37 2021 +0100 ntdll: Store segment registers in x86_64 syscall frame. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 12 ++++++------ tools/winebuild/import.c | 6 ++++++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 6477bf8a953..35395283619 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1945,16 +1945,16 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) context->Rbp = frame->rbp; context->Rip = frame->rip; context->EFlags = frame->eflags; - __asm__( "movw %%cs,%0" : "=g" (context->SegCs) ); - __asm__( "movw %%ss,%0" : "=g" (context->SegSs) ); + context->SegCs = frame->cs; + context->SegSs = frame->ss; context->ContextFlags |= CONTEXT_CONTROL; } if (needed_flags & CONTEXT_SEGMENTS) { - __asm__( "movw %%ds,%0" : "=g" (context->SegDs) ); - __asm__( "movw %%es,%0" : "=g" (context->SegEs) ); - __asm__( "movw %%fs,%0" : "=g" (context->SegFs) ); - __asm__( "movw %%gs,%0" : "=g" (context->SegGs) ); + context->SegDs = frame->ds; + context->SegEs = frame->es; + context->SegFs = frame->fs; + context->SegGs = frame->gs; context->ContextFlags |= CONTEXT_SEGMENTS; } if (needed_flags & CONTEXT_FLOATING_POINT) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 12ba189aa0a..863d17c2734 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1529,6 +1529,12 @@ void output_syscalls( DLLSPEC *spec ) output( "\tmovq %%rbx,-0x28(%%rbp)\n" ); output( "\tleaq 0x10(%%rbp),%%rbx\n" ); output( "\tmovq %%rbx,-0x10(%%rbp)\n" ); + output( "\tmovw %%cs,-0x20(%%rbp)\n" ); + output( "\tmovw %%ds,-0x1e(%%rbp)\n" ); + output( "\tmovw %%es,-0x1c(%%rbp)\n" ); + output( "\tmovw %%fs,-0x1a(%%rbp)\n" ); + output( "\tmovw %%ss,-0x8(%%rbp)\n" ); + output( "\tmovw %%gs,-0x6(%%rbp)\n" ); output( "\tfxsave64 (%%rsp)\n" ); output( "\tmovq %%gs:0x30,%%rcx\n" ); output( "\tleaq -0x98(%%rbp),%%rbx\n" );

1 0

Jacek Caban : ntdll: Use syscall frame for volatile registers in x64_64 NtGetContextThread.
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: b817eb3ec804d3e9fce698f8f4bbc6299deae6d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b817eb3ec804d3e9fce698f8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 15 21:58:49 2021 +0100 ntdll: Use syscall frame for volatile registers in x64_64 NtGetContextThread. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 35395283619..6e34e0d9979 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1923,16 +1923,16 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) { if (needed_flags & CONTEXT_INTEGER) { - context->Rax = 0; + context->Rax = frame->rax; context->Rbx = frame->rbx; - context->Rcx = 0; - context->Rdx = 0; + context->Rcx = frame->rcx; + context->Rdx = frame->rdx; context->Rsi = frame->rsi; context->Rdi = frame->rdi; - context->R8 = 0; - context->R9 = 0; - context->R10 = 0; - context->R11 = 0; + context->R8 = frame->r8; + context->R9 = frame->r9; + context->R10 = frame->r10; + context->R11 = frame->r11; context->R12 = frame->r12; context->R13 = frame->r13; context->R14 = frame->r14;

1 0

Jacek Caban : winebuild: Restore all x86_64 control registers in syscall dispatcher.
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: 9b6f715b28a5fad471a7c4800881f93ecf28787e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b6f715b28a5fad471a7c480… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 15 21:59:02 2021 +0100 winebuild: Restore all x86_64 control registers in syscall dispatcher. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 863d17c2734..6b5f704c8f1 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1564,11 +1564,12 @@ void output_syscalls( DLLSPEC *spec ) output_cfi( ".cfi_same_value %%rsi" ); output( "\tmovq -0x90(%%rbp),%%rbx\n" ); output_cfi( ".cfi_same_value %%rbx" ); + output( "\tleaq -0x28(%%rbp),%%rsp\n" ); output_cfi( ".cfi_def_cfa_register %%rsp" ); - output( "\tleave\n" ); - output_cfi( ".cfi_adjust_cfa_offset -8" ); + output_cfi( ".cfi_adjust_cfa_offset 40" ); + output( "\tmovq (%%rbp),%%rbp\n" ); output_cfi( ".cfi_same_value %%rbp" ); - output( "\tret\n" ); + output( "\tiretq\n" ); output( "3:\tmovl $0x%x,%%eax\n", invalid_param ); output( "\tjmp 2b\n" ); break;

1 0