wine-commits April 2017

wine-commits@winehq.org

2 participants
757 discussions

Józef Kucia : d3d11: Delay destroying depth stencil view until it is no longer referenced.
by Alexandre Julliard 27 Apr '17

27 Apr '17

Module: wine Branch: master Commit: 02a767cde201a437c9edec20054f46eada05624b URL: http://source.winehq.org/git/wine.git/?a=commit;h=02a767cde201a437c9edec200… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 27 12:02:47 2017 +0200 d3d11: Delay destroying depth stencil view until it is no longer referenced. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/view.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index ac5395d..85c16d8 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -999,6 +999,14 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_view_AddRef(ID3D11DepthStencil TRACE("%p increasing refcount to %u.\n", view, refcount); + if (refcount == 1) + { + ID3D11Device_AddRef(view->device); + wined3d_mutex_lock(); + wined3d_rendertarget_view_incref(view->wined3d_view); + wined3d_mutex_unlock(); + } + return refcount; } @@ -1011,12 +1019,13 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_view_Release(ID3D11DepthStenci if (!refcount) { + ID3D11Device *device = view->device; + wined3d_mutex_lock(); wined3d_rendertarget_view_decref(view->wined3d_view); - ID3D11Device_Release(view->device); - wined3d_private_store_cleanup(&view->private_store); wined3d_mutex_unlock(); - HeapFree(GetProcessHeap(), 0, view); + + ID3D11Device_Release(device); } return refcount; @@ -1225,6 +1234,19 @@ static const struct ID3D10DepthStencilViewVtbl d3d10_depthstencil_view_vtbl = d3d10_depthstencil_view_GetDesc, }; +static void STDMETHODCALLTYPE d3d_depth_stencil_view_wined3d_object_destroyed(void *parent) +{ + struct d3d_depthstencil_view *view = parent; + + wined3d_private_store_cleanup(&view->private_store); + HeapFree(GetProcessHeap(), 0, parent); +} + +static const struct wined3d_parent_ops d3d_depth_stencil_view_wined3d_parent_ops = +{ + d3d_depth_stencil_view_wined3d_object_destroyed, +}; + static void wined3d_depth_stencil_view_desc_from_d3d11(struct wined3d_view_desc *wined3d_desc, const D3D11_DEPTH_STENCIL_VIEW_DESC *desc) { @@ -1318,7 +1340,7 @@ static HRESULT d3d_depthstencil_view_init(struct d3d_depthstencil_view *view, st wined3d_depth_stencil_view_desc_from_d3d11(&wined3d_desc, &view->desc); if (FAILED(hr = wined3d_rendertarget_view_create(&wined3d_desc, wined3d_resource, - view, &d3d_null_wined3d_parent_ops, &view->wined3d_view))) + view, &d3d_depth_stencil_view_wined3d_parent_ops, &view->wined3d_view))) { wined3d_mutex_unlock(); WARN("Failed to create a wined3d rendertarget view, hr %#x.\n", hr);

1 0

Józef Kucia : d3d11: Get rid of "rasterizer_state" from struct d3d_device.
by Alexandre Julliard 27 Apr '17

27 Apr '17

Module: wine Branch: master Commit: 6a9e506fd55206a4b02ebb220e778ee31bc13b07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a9e506fd55206a4b02ebb220… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 27 12:02:46 2017 +0200 d3d11: Get rid of "rasterizer_state" from struct d3d_device. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 1 - dlls/d3d11/device.c | 37 ++++++++++++++++++++++++++++++------- 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 3a9729b..a8987cb 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -521,7 +521,6 @@ struct d3d_device float blend_factor[4]; struct d3d_depthstencil_state *depth_stencil_state; UINT stencil_ref; - struct d3d_rasterizer_state *rasterizer_state; }; static inline struct d3d_device *impl_from_ID3D11Device(ID3D11Device *iface) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 095908d..c5ead36 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -877,12 +877,13 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon ID3D11RasterizerState *rasterizer_state) { struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_rasterizer_state *rasterizer_state_impl; const D3D11_RASTERIZER_DESC *desc; TRACE("iface %p, rasterizer_state %p.\n", iface, rasterizer_state); wined3d_mutex_lock(); - if (!(device->rasterizer_state = unsafe_impl_from_ID3D11RasterizerState(rasterizer_state))) + if (!(rasterizer_state_impl = unsafe_impl_from_ID3D11RasterizerState(rasterizer_state))) { wined3d_device_set_rasterizer_state(device->wined3d_device, NULL); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_FILLMODE, WINED3D_FILL_SOLID); @@ -894,9 +895,9 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon return; } - wined3d_device_set_rasterizer_state(device->wined3d_device, device->rasterizer_state->wined3d_state); + wined3d_device_set_rasterizer_state(device->wined3d_device, rasterizer_state_impl->wined3d_state); - desc = &device->rasterizer_state->desc; + desc = &rasterizer_state_impl->desc; wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_FILLMODE, desc->FillMode); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_CULLMODE, desc->CullMode); /* OpenGL style depth bias. */ @@ -1949,11 +1950,22 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetState(ID3D11DeviceCon ID3D11RasterizerState **rasterizer_state) { struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_rasterizer_state *rasterizer_state_impl; + struct wined3d_rasterizer_state *wined3d_state; TRACE("iface %p, rasterizer_state %p.\n", iface, rasterizer_state); - if ((*rasterizer_state = device->rasterizer_state ? &device->rasterizer_state->ID3D11RasterizerState_iface : NULL)) - ID3D11RasterizerState_AddRef(*rasterizer_state); + wined3d_mutex_lock(); + if ((wined3d_state = wined3d_device_get_rasterizer_state(device->wined3d_device))) + { + rasterizer_state_impl = wined3d_rasterizer_state_get_parent(wined3d_state); + ID3D11RasterizerState_AddRef(*rasterizer_state = &rasterizer_state_impl->ID3D11RasterizerState_iface); + } + else + { + *rasterizer_state = NULL; + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetViewports(ID3D11DeviceContext *iface, @@ -4612,11 +4624,22 @@ static void STDMETHODCALLTYPE d3d10_device_SOGetTargets(ID3D10Device1 *iface, static void STDMETHODCALLTYPE d3d10_device_RSGetState(ID3D10Device1 *iface, ID3D10RasterizerState **rasterizer_state) { struct d3d_device *device = impl_from_ID3D10Device(iface); + struct d3d_rasterizer_state *rasterizer_state_impl; + struct wined3d_rasterizer_state *wined3d_state; TRACE("iface %p, rasterizer_state %p.\n", iface, rasterizer_state); - if ((*rasterizer_state = device->rasterizer_state ? &device->rasterizer_state->ID3D10RasterizerState_iface : NULL)) - ID3D10RasterizerState_AddRef(*rasterizer_state); + wined3d_mutex_lock(); + if ((wined3d_state = wined3d_device_get_rasterizer_state(device->wined3d_device))) + { + rasterizer_state_impl = wined3d_rasterizer_state_get_parent(wined3d_state); + ID3D10RasterizerState_AddRef(*rasterizer_state = &rasterizer_state_impl->ID3D10RasterizerState_iface); + } + else + { + *rasterizer_state = NULL; + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d10_device_RSGetViewports(ID3D10Device1 *iface,

1 0

Józef Kucia : d3d11: Delay destroying rasterizer state until it is no longer referenced.
by Alexandre Julliard 27 Apr '17

27 Apr '17

Module: wine Branch: master Commit: ed33c53a0cc102bbbee8501d8fcb4a315af9cd11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed33c53a0cc102bbbee8501d8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 27 12:02:45 2017 +0200 d3d11: Delay destroying rasterizer state until it is no longer referenced. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/state.c | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index fa2e668..f10e713 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -649,6 +649,14 @@ static ULONG STDMETHODCALLTYPE d3d11_rasterizer_state_AddRef(ID3D11RasterizerSta TRACE("%p increasing refcount to %u.\n", state, refcount); + if (refcount == 1) + { + ID3D11Device_AddRef(state->device); + wined3d_mutex_lock(); + wined3d_rasterizer_state_incref(state->wined3d_state); + wined3d_mutex_unlock(); + } + return refcount; } @@ -661,14 +669,13 @@ static ULONG STDMETHODCALLTYPE d3d11_rasterizer_state_Release(ID3D11RasterizerSt if (!refcount) { - struct d3d_device *device = impl_from_ID3D11Device(state->device); + ID3D11Device *device = state->device; + wined3d_mutex_lock(); - wine_rb_remove(&device->rasterizer_states, &state->entry); wined3d_rasterizer_state_decref(state->wined3d_state); - wined3d_private_store_cleanup(&state->private_store); wined3d_mutex_unlock(); - ID3D11Device_Release(state->device); - HeapFree(GetProcessHeap(), 0, state); + + ID3D11Device_Release(device); } return refcount; @@ -847,6 +854,21 @@ static const struct ID3D10RasterizerStateVtbl d3d10_rasterizer_state_vtbl = d3d10_rasterizer_state_GetDesc, }; +static void STDMETHODCALLTYPE d3d_rasterizer_state_wined3d_object_destroyed(void *parent) +{ + struct d3d_rasterizer_state *state = parent; + struct d3d_device *device = impl_from_ID3D11Device(state->device); + + wine_rb_remove(&device->rasterizer_states, &state->entry); + wined3d_private_store_cleanup(&state->private_store); + HeapFree(GetProcessHeap(), 0, parent); +} + +static const struct wined3d_parent_ops d3d_rasterizer_state_wined3d_parent_ops = +{ + d3d_rasterizer_state_wined3d_object_destroyed, +}; + HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, struct d3d_device *device, const D3D11_RASTERIZER_DESC *desc) { @@ -862,7 +884,7 @@ HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, struct d3d wined3d_desc.front_ccw = desc->FrontCounterClockwise; if (FAILED(hr = wined3d_rasterizer_state_create(device->wined3d_device, &wined3d_desc, - state, &d3d_null_wined3d_parent_ops, &state->wined3d_state))) + state, &d3d_rasterizer_state_wined3d_parent_ops, &state->wined3d_state))) { WARN("Failed to create wined3d rasterizer state, hr %#x.\n", hr); wined3d_private_store_cleanup(&state->private_store);

1 0

Józef Kucia : wined3d: Add parent for rasterizer state objects.
by Alexandre Julliard 27 Apr '17

27 Apr '17

Module: wine Branch: master Commit: 8afc0e631c4eb7029d55e99a4e0f42aeb4130f6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8afc0e631c4eb7029d55e99a4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 27 12:02:44 2017 +0200 wined3d: Add parent for rasterizer state objects. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/state.c | 4 ++-- dlls/wined3d/state.c | 15 ++++++++++++++- dlls/wined3d/wined3d.spec | 3 ++- dlls/wined3d/wined3d_private.h | 3 +++ include/wine/wined3d.h | 4 +++- 5 files changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index b85bd67..fa2e668 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -861,8 +861,8 @@ HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, struct d3d state->desc = *desc; wined3d_desc.front_ccw = desc->FrontCounterClockwise; - if (FAILED(hr = wined3d_rasterizer_state_create(device->wined3d_device, - &wined3d_desc, &state->wined3d_state))) + if (FAILED(hr = wined3d_rasterizer_state_create(device->wined3d_device, &wined3d_desc, + state, &d3d_null_wined3d_parent_ops, &state->wined3d_state))) { WARN("Failed to create wined3d rasterizer state, hr %#x.\n", hr); wined3d_private_store_cleanup(&state->private_store); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 12ef3bb..b36c0fd 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -60,13 +60,24 @@ ULONG CDECL wined3d_rasterizer_state_decref(struct wined3d_rasterizer_state *sta TRACE("%p decreasing refcount to %u.\n", state, refcount); if (!refcount) + { + state->parent_ops->wined3d_object_destroyed(state->parent); wined3d_cs_destroy_object(device->cs, wined3d_rasterizer_state_destroy_object, state); + } return refcount; } +void * CDECL wined3d_rasterizer_state_get_parent(const struct wined3d_rasterizer_state *state) +{ + TRACE("rasterizer_state %p.\n", state); + + return state->parent; +} + HRESULT CDECL wined3d_rasterizer_state_create(struct wined3d_device *device, - const struct wined3d_rasterizer_state_desc *desc, struct wined3d_rasterizer_state **state) + const struct wined3d_rasterizer_state_desc *desc, void *parent, + const struct wined3d_parent_ops *parent_ops, struct wined3d_rasterizer_state **state) { struct wined3d_rasterizer_state *object; @@ -77,6 +88,8 @@ HRESULT CDECL wined3d_rasterizer_state_create(struct wined3d_device *device, object->refcount = 1; object->desc = *desc; + object->parent = parent; + object->parent_ops = parent_ops; object->device = device; TRACE("Created rasterizer state %p.\n", object); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 0f27de3..e1fc2ac 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -201,8 +201,9 @@ @ cdecl wined3d_query_incref(ptr) @ cdecl wined3d_query_issue(ptr long) -@ cdecl wined3d_rasterizer_state_create(ptr ptr ptr) +@ cdecl wined3d_rasterizer_state_create(ptr ptr ptr ptr ptr) @ cdecl wined3d_rasterizer_state_decref(ptr) +@ cdecl wined3d_rasterizer_state_get_parent(ptr) @ cdecl wined3d_rasterizer_state_incref(ptr) @ cdecl wined3d_resource_get_desc(ptr ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 751f092..628ef9a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2572,6 +2572,9 @@ struct wined3d_rasterizer_state LONG refcount; struct wined3d_rasterizer_state_desc desc; + void *parent; + const struct wined3d_parent_ops *parent_ops; + struct wined3d_device *device; }; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 2d69e98..c8b790e 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2502,8 +2502,10 @@ static inline HRESULT wined3d_private_store_set_private_data(struct wined3d_priv } HRESULT __cdecl wined3d_rasterizer_state_create(struct wined3d_device *device, - const struct wined3d_rasterizer_state_desc *desc, struct wined3d_rasterizer_state **state); + const struct wined3d_rasterizer_state_desc *desc, void *parent, + const struct wined3d_parent_ops *parent_ops, struct wined3d_rasterizer_state **state); ULONG __cdecl wined3d_rasterizer_state_decref(struct wined3d_rasterizer_state *state); +void * __cdecl wined3d_rasterizer_state_get_parent(const struct wined3d_rasterizer_state *state); ULONG __cdecl wined3d_rasterizer_state_incref(struct wined3d_rasterizer_state *state); void __cdecl wined3d_resource_get_desc(const struct wined3d_resource *resource,

1 0

Piotr Caban : dwrite: Fix EUDC font collection use after free issue.
by Alexandre Julliard 27 Apr '17

27 Apr '17

Module: wine Branch: master Commit: 4d02f2fed6e5dde284ec7e1b170ff9704a0bf3d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d02f2fed6e5dde284ec7e1b1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 27 17:20:03 2017 +0200 dwrite: Fix EUDC font collection use after free issue. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 6 ++++-- dlls/dwrite/main.c | 15 ++++++++------- dlls/dwrite/tests/font.c | 3 +++ 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 7dca5fb..0676b95 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -168,7 +168,7 @@ extern HRESULT add_localizedstring(IDWriteLocalizedStrings*,const WCHAR*,const W extern HRESULT clone_localizedstring(IDWriteLocalizedStrings *iface, IDWriteLocalizedStrings **strings) DECLSPEC_HIDDEN; extern void set_en_localizedstring(IDWriteLocalizedStrings*,const WCHAR*) DECLSPEC_HIDDEN; extern HRESULT get_system_fontcollection(IDWriteFactory4*,IDWriteFontCollection1**) DECLSPEC_HIDDEN; -extern HRESULT get_eudc_fontcollection(IDWriteFactory4*,IDWriteFontCollection**) DECLSPEC_HIDDEN; +extern HRESULT get_eudc_fontcollection(IDWriteFactory4*,IDWriteFontCollection1**) DECLSPEC_HIDDEN; extern HRESULT get_textanalyzer(IDWriteTextAnalyzer**) DECLSPEC_HIDDEN; extern HRESULT create_font_file(IDWriteFontFileLoader *loader, const void *reference_key, UINT32 key_size, IDWriteFontFile **font_file) DECLSPEC_HIDDEN; extern HRESULT create_localfontfileloader(IDWriteLocalFontFileLoader** iface) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 328e5e4..d5bed85 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -4052,7 +4052,7 @@ static HRESULT eudc_collection_add_family(IDWriteFactory4 *factory, struct dwrit return hr; } -HRESULT get_eudc_fontcollection(IDWriteFactory4 *factory, IDWriteFontCollection **ret) +HRESULT get_eudc_fontcollection(IDWriteFactory4 *factory, IDWriteFontCollection1 **ret) { static const WCHAR eudckeyfmtW[] = {'E','U','D','C','\\','%','u',0}; struct dwrite_fontcollection *collection; @@ -4078,7 +4078,9 @@ HRESULT get_eudc_fontcollection(IDWriteFactory4 *factory, IDWriteFontCollection return hr; } - *ret = (IDWriteFontCollection*)&collection->IDWriteFontCollection1_iface; + *ret = &collection->IDWriteFontCollection1_iface; + collection->factory = factory; + IDWriteFactory4_AddRef(factory); /* return empty collection if EUDC fonts are not configured */ sprintfW(eudckeypathW, eudckeyfmtW, GetACP()); diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 73fcb51..a99bd95 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -537,7 +537,7 @@ struct dwritefactory { LONG ref; IDWriteFontCollection1 *system_collection; - IDWriteFontCollection *eudc_collection; + IDWriteFontCollection1 *eudc_collection; IDWriteGdiInterop1 *gdiinterop; IDWriteFontFallback *fallback; @@ -592,7 +592,7 @@ static void release_dwritefactory(struct dwritefactory *factory) if (factory->system_collection) IDWriteFontCollection1_Release(factory->system_collection); if (factory->eudc_collection) - IDWriteFontCollection_Release(factory->eudc_collection); + IDWriteFontCollection1_Release(factory->eudc_collection); if (factory->fallback) release_system_fontfallback(factory->fallback); heap_free(factory); @@ -1201,13 +1201,12 @@ static HRESULT WINAPI dwritefactory1_GetEudcFontCollection(IDWriteFactory4 *ifac if (check_for_updates) FIXME("checking for eudc updates not implemented\n"); - if (!This->eudc_collection) + if (This->eudc_collection) + IDWriteFontCollection1_AddRef(This->eudc_collection); + else hr = get_eudc_fontcollection(iface, &This->eudc_collection); - if (SUCCEEDED(hr)) - IDWriteFontCollection_AddRef(This->eudc_collection); - - *collection = This->eudc_collection; + *collection = (IDWriteFontCollection*)This->eudc_collection; return hr; } @@ -1665,6 +1664,8 @@ void factory_detach_fontcollection(IDWriteFactory4 *iface, IDWriteFontCollection struct dwritefactory *factory = impl_from_IDWriteFactory4(iface); if (factory->system_collection == collection) factory->system_collection = NULL; + if (factory->eudc_collection == collection) + factory->eudc_collection = NULL; IDWriteFactory4_Release(iface); } diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 980278e..2d1b550 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -4366,10 +4366,13 @@ static void test_GetEudcFontCollection(void) return; } + EXPECT_REF(factory1, 1); hr = IDWriteFactory1_GetEudcFontCollection(factory1, &coll, FALSE); ok(hr == S_OK, "got 0x%08x\n", hr); + EXPECT_REF(factory1, 2); hr = IDWriteFactory1_GetEudcFontCollection(factory1, &coll2, FALSE); ok(hr == S_OK, "got 0x%08x\n", hr); + EXPECT_REF(factory1, 2); ok(coll == coll2, "got %p, %p\n", coll, coll2); IDWriteFontCollection_Release(coll); IDWriteFontCollection_Release(coll2);

1 0

Piotr Caban : dwrite: Don' t fail in opentype_get_font_strings_from_id if any of font strings got decoded.
by Alexandre Julliard 27 Apr '17

27 Apr '17

Module: wine Branch: master Commit: 0925006822412ea8a9f235b76acfdc89b3c0de35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0925006822412ea8a9f235b76… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 27 17:19:49 2017 +0200 dwrite: Don't fail in opentype_get_font_strings_from_id if any of font strings got decoded. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 1651729..5f2de23 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1586,8 +1586,10 @@ static HRESULT opentype_get_font_strings_from_id(const void *table_data, enum OP continue; } - if (!(exists = opentype_decode_namerecord(header, storage_area, i, *strings))) + if (!opentype_decode_namerecord(header, storage_area, i, *strings)) continue; + + exists = TRUE; } if (!exists) {

1 0

Piotr Caban : dwrite: Don' t crash on uninitialized cached and factory fields in dwritefontface_Release.
by Alexandre Julliard 27 Apr '17

27 Apr '17

Module: wine Branch: master Commit: e98cdc3215ccc826242573675ff37486c6707660 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e98cdc3215ccc826242573675… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 27 16:27:33 2017 +0200 dwrite: Don't crash on uninitialized cached and factory fields in dwritefontface_Release. The function may be called with the fields uninitialized from create_fontface when init_font_data fails. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index ca2d69a..328e5e4 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -501,8 +501,10 @@ static ULONG WINAPI dwritefontface_Release(IDWriteFontFace4 *iface) heap_free(This->glyphs[i]); freetype_notify_cacheremove(iface); - factory_release_cached_fontface(This->cached); - IDWriteFactory4_Release(This->factory); + if (This->cached) + factory_release_cached_fontface(This->cached); + if (This->factory) + IDWriteFactory4_Release(This->factory); heap_free(This); } @@ -4283,7 +4285,7 @@ HRESULT create_fontface(const struct fontface_desc *desc, struct list *cached_li *ret = NULL; - fontface = heap_alloc(sizeof(struct dwrite_fontface)); + fontface = heap_alloc_zero(sizeof(struct dwrite_fontface)); if (!fontface) return E_OUTOFMEMORY; @@ -4301,11 +4303,6 @@ HRESULT create_fontface(const struct fontface_desc *desc, struct list *cached_li fontface->ref = 1; fontface->type = desc->face_type; fontface->file_count = desc->files_number; - memset(&fontface->cmap, 0, sizeof(fontface->cmap)); - memset(&fontface->vdmx, 0, sizeof(fontface->vdmx)); - memset(&fontface->gasp, 0, sizeof(fontface->gasp)); - memset(&fontface->cpal, 0, sizeof(fontface->cpal)); - memset(&fontface->colr, 0, sizeof(fontface->colr)); fontface->cmap.exists = TRUE; fontface->vdmx.exists = TRUE; fontface->gasp.exists = TRUE; @@ -4313,7 +4310,6 @@ HRESULT create_fontface(const struct fontface_desc *desc, struct list *cached_li fontface->colr.exists = TRUE; fontface->index = desc->index; fontface->simulations = desc->simulations; - memset(fontface->glyphs, 0, sizeof(fontface->glyphs)); for (i = 0; i < fontface->file_count; i++) { hr = get_stream_from_file(desc->files[i], &fontface->streams[i]); @@ -4338,7 +4334,6 @@ HRESULT create_fontface(const struct fontface_desc *desc, struct list *cached_li } } - fontface->flags = 0; fontface->charmap = freetype_get_charmap_index(&fontface->IDWriteFontFace4_iface, &is_symbol); if (is_symbol) fontface->flags |= FONTFACE_IS_SYMBOL;

1 0

Huw Davies : regedit: Use the system metrics to retrieve the treeview icon sizes.
by Alexandre Julliard 27 Apr '17

27 Apr '17

Module: wine Branch: master Commit: 6bc8ecafe87ad4117dc0aec295e881a5793f78ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bc8ecafe87ad4117dc0aec29… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 27 14:27:21 2017 +0100 regedit: Use the system metrics to retrieve the treeview icon sizes. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/treeview.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index 4b5e1ca..d11793c 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -43,8 +43,6 @@ int Image_Open; int Image_Closed; int Image_Root; -#define CX_ICON 16 -#define CY_ICON 16 #define NUM_ICONS 3 static BOOL UpdateExpandingTree(HWND hwndTV, HTREEITEM hItem, int state); @@ -599,10 +597,11 @@ static BOOL InitTreeViewImageLists(HWND hwndTV) { HIMAGELIST himl; /* handle to image list */ HICON hico; /* handle to icon */ + INT cx = GetSystemMetrics(SM_CXSMICON); + INT cy = GetSystemMetrics(SM_CYSMICON); /* Create the image list. */ - if ((himl = ImageList_Create(CX_ICON, CY_ICON, - ILC_MASK, 0, NUM_ICONS)) == NULL) + if ((himl = ImageList_Create(cx, cy, ILC_MASK, 0, NUM_ICONS)) == NULL) return FALSE; /* Add the open file, closed file, and document bitmaps. */

1 0

Andrey Gusev : po: Update Ukrainian translation.
by Alexandre Julliard 27 Apr '17

27 Apr '17

Module: wine Branch: master Commit: 8cb12084db9bd4d807162a950dc56380f03d823e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cb12084db9bd4d807162a950… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Apr 27 18:54:44 2017 +0300 po: Update Ukrainian translation. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/uk.po | 33 ++++++++++----------------------- 1 file changed, 10 insertions(+), 23 deletions(-) diff --git a/po/uk.po b/po/uk.po index 4c7b8a9..6b2076b 100644 --- a/po/uk.po +++ b/po/uk.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-02-02 16:04+0200\n" +"PO-Revision-Date: 2017-04-27 18:47+0200\n" "Last-Translator: Andrey Gusev <andrey.goosev(a)gmail.com>\n" "Language-Team: Ukrainian\n" "Language: uk\n" @@ -3711,7 +3711,7 @@ msgstr "Очікується об'єкт Array" #: ../../include/wine/wine_common_ver.rc:129 msgid "Wine kernel DLL" -msgstr "" +msgstr "Бібліотека ядра Wine" #: ../../include/wine/wine_common_ver.rc:134 winemac.rc:32 wineboot.rc:42 msgid "Wine" @@ -9436,10 +9436,8 @@ msgid "Confidentiality Required" msgstr "Потрібна конфіденційність" #: wldap32.rc:46 -#, fuzzy -#| msgid "Shutdown in progress.\n" msgid "SASL Bind in Progress" -msgstr "Проводиться вимкнення системи.\n" +msgstr "Проводиться прив'язка за допомогою SASL" #: wldap32.rc:48 msgid "No Such Attribute" @@ -9463,7 +9461,7 @@ msgstr "Властивість або значення існує" #: wldap32.rc:53 msgid "Invalid Syntax" -msgstr "Неправильний синтакс" +msgstr "Невірний синтаксис" #: wldap32.rc:64 msgid "No Such Object" @@ -12037,17 +12035,11 @@ msgstr "Неможливо перейменувати вибране значе #: regedit.rc:222 msgid "" "The keys and values contained in %1 were successfully added to the registry." -msgstr "" +msgstr "Ключі та значення з '%1' були успішно додані до реєстру." #: regedit.rc:223 -#, fuzzy -#| msgid "" -#| "Unable to rename the key '%1'.\n" -#| "The specified key name already exists." msgid "Unable to import %1. The specified file is not a valid registry file." -msgstr "" -"Неможливо перейменувати ключ '%1'.\n" -"Вказаний ключ вже існує." +msgstr "Неможливо імпортувати '%1'. Вказаний файл не є файлом реєстру." #: regedit.rc:375 msgid "" @@ -12198,10 +12190,8 @@ msgid "regedit: Unable to delete the registry class '%1'.\n" msgstr "regedit: Неможливо видалити клас реєстру '%1'.\n" #: regedit.rc:398 -#, fuzzy -#| msgid "regedit: The line '%1' was not recognized.\n" msgid "regedit: The line contains invalid syntax.\n" -msgstr "regedit: Рядок '%1' не був розпізнаний.\n" +msgstr "regedit: Рядок має невірний синтаксис.\n" #: regedit.rc:163 msgid "Quits the registry editor" @@ -12328,17 +12318,14 @@ msgid "Exports selected branch of the registry to a text file" msgstr "Експортує вибрану гілку реєстру до текстового файлу" #: regedit.rc:187 -#, fuzzy -#| msgid "Confirm Value Delete" msgid "Confirm Key Delete" -msgstr "Підтвердження видалення значення" +msgstr "Підтвердження видалення ключа" #: regedit.rc:188 -#, fuzzy -#| msgid "Are you sure you want to delete the registry key '%1'?" msgid "" "Are you sure you want to delete the registry key '%1' and all of its subkeys?" -msgstr "Ви впевнені, що хочете видалити ключ реєстру '%1'?" +msgstr "" +"Ви впевнені, що хочете видалити ключ реєстру '%1' та всі його підрозділи?" #: regsvr32.rc:32 msgid ""

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 27 Apr '17

27 Apr '17

Module: wine Branch: master Commit: 43c93b22ccee6492feec5f0349a5e572fbf3622d URL: http://source.winehq.org/git/wine.git/?a=commit;h=43c93b22ccee6492feec5f034… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Apr 27 17:04:39 2017 +0300 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/fi.po b/po/fi.po index fb7db81..dc00b52 100644 --- a/po/fi.po +++ b/po/fi.po @@ -3695,7 +3695,7 @@ msgstr "Odotettiin taulukkoa" #: ../../include/wine/wine_common_ver.rc:129 msgid "Wine kernel DLL" -msgstr "" +msgstr "Winen ydin-DLL" #: ../../include/wine/wine_common_ver.rc:134 winemac.rc:32 wineboot.rc:42 msgid "Wine" @@ -12078,10 +12078,8 @@ msgid "regedit: Unable to delete the registry class '%1'.\n" msgstr "regedit: Rekisteriluokkaa '%1' ei voida poistaa.\n" #: regedit.rc:398 -#, fuzzy -#| msgid "regedit: The line '%1' was not recognized.\n" msgid "regedit: The line contains invalid syntax.\n" -msgstr "regedit: Riviä '%1' ei tunnisteta.\n" +msgstr "regedit: Rivin syntaksi on virheellinen.\n" #: regedit.rc:163 msgid "Quits the registry editor"

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
76
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 April 2017