March 2019 - Wine-Commits - list.winehq.org

Michael Stefaniuc : d3dx9: Secure against unsafe iface to COM object transitions.
by Alexandre Julliard March 22, 2019

March 22, 2019

Module: wine Branch: master Commit: cd3e5020e4c87f49eb042fff9f607b6d745a5d55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd3e5020e4c87f49eb042fff… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 22 19:09:57 2019 +0100 d3dx9: Secure against unsafe iface to COM object transitions. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 433ec3b..269f75e 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1768,6 +1768,8 @@ static inline struct d3dx_effect_pool *impl_from_ID3DXEffectPool(ID3DXEffectPool return CONTAINING_RECORD(iface, struct d3dx_effect_pool, ID3DXEffectPool_iface); } +static inline struct d3dx_effect_pool *unsafe_impl_from_ID3DXEffectPool(ID3DXEffectPool *iface); + static inline struct d3dx_effect *impl_from_ID3DXEffect(ID3DXEffect *iface) { return CONTAINING_RECORD(iface, struct d3dx_effect, ID3DXEffect_iface); @@ -6164,8 +6166,8 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev if (pool) { + effect->pool = unsafe_impl_from_ID3DXEffectPool(pool); pool->lpVtbl->AddRef(pool); - effect->pool = impl_from_ID3DXEffectPool(pool); } IDirect3DDevice9_AddRef(device); @@ -6477,6 +6479,15 @@ static const struct ID3DXEffectPoolVtbl ID3DXEffectPool_Vtbl = d3dx_effect_pool_Release }; +static inline struct d3dx_effect_pool *unsafe_impl_from_ID3DXEffectPool(ID3DXEffectPool *iface) +{ + if (!iface) + return NULL; + + assert(iface->lpVtbl == &ID3DXEffectPool_Vtbl); + return impl_from_ID3DXEffectPool(iface); +} + HRESULT WINAPI D3DXCreateEffectPool(ID3DXEffectPool **pool) { struct d3dx_effect_pool *object;

1 0

Stefan Dösinger : ddraw: Don' t operate on stored invalid clippers.
by Alexandre Julliard March 22, 2019

March 22, 2019

Module: wine Branch: master Commit: 347efb985c7685ffd2e0a24090fc35be003dd84f URL: https://source.winehq.org/git/wine.git/?a=commit;h=347efb985c7685ffd2e0a240… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 22 12:50:04 2019 +0300 ddraw: Don't operate on stored invalid clippers. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/clipper.c | 2 +- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/surface.c | 13 ++++++++++--- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/clipper.c b/dlls/ddraw/clipper.c index e4b7ec2..68a0a7f 100644 --- a/dlls/ddraw/clipper.c +++ b/dlls/ddraw/clipper.c @@ -33,7 +33,7 @@ static inline struct ddraw_clipper *impl_from_IDirectDrawClipper(IDirectDrawClip return CONTAINING_RECORD(iface, struct ddraw_clipper, IDirectDrawClipper_iface); } -static BOOL ddraw_clipper_is_valid(const struct ddraw_clipper *clipper) +BOOL ddraw_clipper_is_valid(const struct ddraw_clipper *clipper) { /* Native is very lenient when you invoke the clipper methods with a clipper pointer that * points to something that is either not accessible or not a clipper, or if you break diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 77e2866..087c709 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -391,6 +391,7 @@ struct ddraw_clipper HRESULT ddraw_clipper_init(struct ddraw_clipper *clipper) DECLSPEC_HIDDEN; struct ddraw_clipper *unsafe_impl_from_IDirectDrawClipper(IDirectDrawClipper *iface) DECLSPEC_HIDDEN; +BOOL ddraw_clipper_is_valid(const struct ddraw_clipper *clipper) DECLSPEC_HIDDEN; /***************************************************************************** * IDirectDrawPalette implementation structure diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index b8cc2d2..4e2faef 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1549,6 +1549,12 @@ static HRESULT ddraw_surface_blt_clipped(struct ddraw_surface *dst_surface, cons return hr; } + if (!ddraw_clipper_is_valid(dst_surface->clipper)) + { + FIXME("Attempting to blit with an invalid clipper.\n"); + return DDERR_INVALIDPARAMS; + } + scale_x = (float)(src_rect.right - src_rect.left) / (float)(dst_rect.right - dst_rect.left); scale_y = (float)(src_rect.bottom - src_rect.top) / (float)(dst_rect.bottom - dst_rect.top); @@ -4426,7 +4432,8 @@ static HRESULT WINAPI ddraw_surface7_GetClipper(IDirectDrawSurface7 *iface, IDir } *clipper = &surface->clipper->IDirectDrawClipper_iface; - IDirectDrawClipper_AddRef(*clipper); + if (ddraw_clipper_is_valid(surface->clipper)) + IDirectDrawClipper_AddRef(*clipper); wined3d_mutex_unlock(); return DD_OK; @@ -4501,7 +4508,7 @@ static HRESULT WINAPI ddraw_surface7_SetClipper(IDirectDrawSurface7 *iface, if (clipper != NULL) IDirectDrawClipper_AddRef(iclipper); - if (old_clipper) + if (old_clipper && ddraw_clipper_is_valid(old_clipper)) IDirectDrawClipper_Release(&old_clipper->IDirectDrawClipper_iface); if ((This->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) && This->ddraw->wined3d_swapchain) @@ -5782,7 +5789,7 @@ static void STDMETHODCALLTYPE ddraw_surface_wined3d_object_destroyed(void *paren /* Reduce the ddraw surface count. */ list_remove(&surface->surface_list_entry); - if (surface->clipper) + if (surface->clipper && ddraw_clipper_is_valid(surface->clipper)) IDirectDrawClipper_Release(&surface->clipper->IDirectDrawClipper_iface); if (surface == surface->ddraw->primary)

1 0

Józef Kucia : d3d12: Call vkd3d_serialize_root_signature() directly.
by Alexandre Julliard March 22, 2019

March 22, 2019

Module: wine Branch: master Commit: 2f1007490e9e2bdc49f2562e4339474387ba1602 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f1007490e9e2bdc49f2562e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 22 09:42:03 2019 +0100 d3d12: Call vkd3d_serialize_root_signature() directly. 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/d3d12/d3d12_main.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c index fff3acb..bd680d8 100644 --- a/dlls/d3d12/d3d12_main.c +++ b/dlls/d3d12/d3d12_main.c @@ -418,11 +418,10 @@ HRESULT WINAPI D3D12SerializeRootSignature(const D3D12_ROOT_SIGNATURE_DESC *root HRESULT WINAPI D3D12SerializeVersionedRootSignature(const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, ID3DBlob **blob, ID3DBlob **error_blob) { - FIXME("desc %p, blob %p, error_blob %p partial-stub!\n", - desc, blob, error_blob); + TRACE("desc %p, blob %p, error_blob %p.\n", desc, blob, error_blob); if (desc->Version == D3D_ROOT_SIGNATURE_VERSION_1_0) - return D3D12SerializeRootSignature(&desc->Desc_1_0, desc->Version, blob, error_blob); + return vkd3d_serialize_root_signature(&desc->Desc_1_0, desc->Version, blob, error_blob); FIXME("Unsupported version %#x.\n", desc->Version); return E_NOTIMPL;

1 0

Michael Stefaniuc : d3d9/tests: Remove redundant not-NULL checks ( coccinellery).
by Alexandre Julliard March 22, 2019

March 22, 2019

Module: wine Branch: master Commit: f6be725389f1a6d2addbdecbb84232e00a0e9dd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6be725389f1a6d2addbdecb… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 22 08:47:36 2019 +0100 d3d9/tests: Remove redundant not-NULL checks (coccinellery). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 705deab..ffeb6b4 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2731,7 +2731,7 @@ static void test_depthstenciltest(void) ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with %08x\n", hr); if(pDepthStencil) IDirect3DSurface9_Release(pDepthStencil); - if(pDevice) IDirect3D9_Release(pDevice); + IDirect3D9_Release(pDevice); /* Now see if autodepthstencil disable is honored. First, without a format set */ ZeroMemory( &d3dpp, sizeof(d3dpp) ); @@ -2765,7 +2765,7 @@ static void test_depthstenciltest(void) ok(hr == D3D_OK, "IDirect3DDevice9_GetRenderState failed with %08x\n", hr); ok(state == D3DZB_FALSE, "D3DRS_ZENABLE is %s\n", state == D3DZB_FALSE ? "D3DZB_FALSE" : (state == D3DZB_TRUE ? "D3DZB_TRUE" : "D3DZB_USEW")); - if(pDevice) IDirect3D9_Release(pDevice); + IDirect3D9_Release(pDevice); /* Next, try EnableAutoDepthStencil FALSE with a depth stencil format set */ ZeroMemory( &d3dpp, sizeof(d3dpp) );

1 0

Jacek Caban : mshtml: Add IHTMLWindow6::get_localStorage implementation.
by Alexandre Julliard March 22, 2019

March 22, 2019

Module: wine Branch: master Commit: 64b5d6b3e5944b6f4b4d6bcd0df2f8b6bb32b584 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64b5d6b3e5944b6f4b4d6bcd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 22 15:16:28 2019 +0100 mshtml: Add IHTMLWindow6::get_localStorage implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 20 +++++++++++++++++--- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/elements.js | 11 ++++++++++- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 92b0537..926ebb9 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -295,6 +295,8 @@ static void release_inner_window(HTMLInnerWindow *This) if(This->session_storage) IHTMLStorage_Release(This->session_storage); + if(This->local_storage) + IHTMLStorage_Release(This->local_storage); if(This->mon) IMoniker_Release(This->mon); @@ -2123,7 +2125,7 @@ static HRESULT WINAPI HTMLWindow6_get_sessionStorage(IHTMLWindow6 *iface, IHTMLS { HTMLWindow *This = impl_from_IHTMLWindow6(iface); - FIXME("(%p)->(%p)\n", This, p); + TRACE("(%p)->(%p)\n", This, p); if(!This->inner_window->session_storage) { HRESULT hres; @@ -2141,8 +2143,20 @@ static HRESULT WINAPI HTMLWindow6_get_sessionStorage(IHTMLWindow6 *iface, IHTMLS static HRESULT WINAPI HTMLWindow6_get_localStorage(IHTMLWindow6 *iface, IHTMLStorage **p) { HTMLWindow *This = impl_from_IHTMLWindow6(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->inner_window->local_storage) { + HRESULT hres; + + hres = create_storage(&This->inner_window->local_storage); + if(FAILED(hres)) + return hres; + } + + IHTMLStorage_AddRef(This->inner_window->local_storage); + *p = This->inner_window->local_storage; + return S_OK; } static HRESULT WINAPI HTMLWindow6_put_onhashchange(IHTMLWindow6 *iface, VARIANT v) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index f2939da..14cc561 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -515,6 +515,7 @@ struct HTMLInnerWindow { IHTMLScreen *screen; OmHistory *history; IHTMLStorage *session_storage; + IHTMLStorage *local_storage; BOOL performance_initialized; VARIANT performance; diff --git a/dlls/mshtml/tests/elements.js b/dlls/mshtml/tests/elements.js index 7213388..b23f5c1 100644 --- a/dlls/mshtml/tests/elements.js +++ b/dlls/mshtml/tests/elements.js @@ -290,6 +290,14 @@ function test_style_properties() { next_test(); } +function test_storage() { + ok(typeof(window.sessionStorage) === "object", + "typeof(window.sessionStorage) = " + typeof(window.sessionStorage)); + ok(typeof(window.localStorage) === "object", + "typeof(window.localStorage) = " + typeof(window.localStorage)); + next_test(); +} + var tests = [ test_input_selection, test_textContent, @@ -301,5 +309,6 @@ var tests = [ test_query_selector, test_compare_position, test_document_owner, - test_style_properties + test_style_properties, + test_storage ];

1 0

Michael Stefaniuc : propsys: Remove useless cast to self.
by Alexandre Julliard March 22, 2019

March 22, 2019

Module: wine Branch: master Commit: 44d4fb5f1ecafb3e2744933ab19c8ca100dc6219 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44d4fb5f1ecafb3e2744933a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 22 08:47:32 2019 +0100 propsys: Remove useless cast to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propvar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 5d6eeca..98fb129 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -206,7 +206,7 @@ HRESULT WINAPI PropVariantToInt64(REFPROPVARIANT propvarIn, LONGLONG *ret) TRACE("%p,%p\n", propvarIn, ret); hr = PROPVAR_ConvertNumber(propvarIn, 64, TRUE, &res); - if (SUCCEEDED(hr)) *ret = (LONGLONG)res; + if (SUCCEEDED(hr)) *ret = res; return hr; }

1 0

Derek Lesho : ntoskrnl.exe: Add IoWMIOpenBlock stub.
by Alexandre Julliard March 22, 2019

March 22, 2019

Module: wine Branch: master Commit: 468c546f90676e8a5fd1d8d379e757fe39ca9c15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=468c546f90676e8a5fd1d8d3… Author: Derek Lesho <dereklesho52(a)gmail.com> Date: Thu Mar 21 11:54:00 2019 -0400 ntoskrnl.exe: Add IoWMIOpenBlock stub. Signed-off-by: Derek Lesho <dereklesho52(a)Gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 27c7d00..dc10f03 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3072,6 +3072,15 @@ NTSTATUS WINAPI IoWMIRegistrationControl(PDEVICE_OBJECT DeviceObject, ULONG Acti } /***************************************************** + * IoWMIOpenBlock (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoWMIOpenBlock(LPCGUID guid, ULONG desired_access, PVOID *data_block_obj) +{ + FIXME("(%p %u %p) stub\n", guid, desired_access, data_block_obj); + return STATUS_NOT_IMPLEMENTED; +} + +/***************************************************** * PsSetLoadImageNotifyRoutine (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE routine) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index da16bc2..43f4747 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -490,7 +490,7 @@ @ stub IoWMIDeviceObjectToInstanceName @ stub IoWMIExecuteMethod @ stub IoWMIHandleToInstanceName -@ stub IoWMIOpenBlock +@ stdcall IoWMIOpenBlock(ptr long ptr) @ stub IoWMIQueryAllData @ stub IoWMIQueryAllDataMultiple @ stub IoWMIQuerySingleInstance

1 0

Michael Stefaniuc : iphlpapi: Drop unneeded continue statements ( coccinellery).
by Alexandre Julliard March 22, 2019

March 22, 2019

Module: wine Branch: master Commit: 8c79999122e3ca6b7d4239ed6848f7cabd053a48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c79999122e3ca6b7d4239ed… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 22 08:47:35 2019 +0100 iphlpapi: Drop unneeded continue statements (coccinellery). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/ipstats.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index c36f42a..be1cc52 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -823,11 +823,8 @@ DWORD WINAPI GetIpStatisticsEx(PMIB_IPSTATS stats, DWORD family) *ptr='\0'; for (i = 0; i < ARRAY_SIZE(ipstatlist); i++) - if (!strcasecmp(buf, ipstatlist[i].name)) - { - if (sscanf(value, "%d", &res)) *ipstatlist[i].elem = res; - continue; - } + if (!strcasecmp(buf, ipstatlist[i].name) && sscanf(value, "%d", &res)) + *ipstatlist[i].elem = res; } fclose(fp); ret = NO_ERROR; @@ -1213,11 +1210,8 @@ DWORD WINAPI GetUdpStatisticsEx(PMIB_UDPSTATS stats, DWORD family) *ptr='\0'; for (i = 0; i < ARRAY_SIZE(udpstatlist); i++) - if (!strcasecmp(buf, udpstatlist[i].name)) - { - if (sscanf(value, "%d", &res)) *udpstatlist[i].elem = res; - continue; - } + if (!strcasecmp(buf, udpstatlist[i].name) && sscanf(value, "%d", &res)) + *udpstatlist[i].elem = res; } fclose(fp); ret = NO_ERROR;

1 0

Alexandre Julliard : ntdll: Default to 7-bit ASCII before codepages are initialized.
by Alexandre Julliard March 22, 2019

March 22, 2019

Module: wine Branch: master Commit: 25ff59d7a93d431d3e60ec2116b1ef2f139d424b URL: https://source.winehq.org/git/wine.git/?a=commit;h=25ff59d7a93d431d3e60ec21… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 22 13:05:48 2019 +0100 ntdll: Default to 7-bit ASCII before codepages are initialized. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/rtlstr.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c index 190bc01..e834ad2 100644 --- a/dlls/ntdll/rtlstr.c +++ b/dlls/ntdll/rtlstr.c @@ -44,8 +44,10 @@ UINT NlsAnsiCodePage = 0; BYTE NlsMbCodePageTag = 0; BYTE NlsMbOemCodePageTag = 0; -static const union cptable *ansi_table; -static const union cptable *oem_table; +extern const union cptable cptable_20127; /* 7-bit ASCII */ + +static const union cptable *ansi_table = &cptable_20127; +static const union cptable *oem_table = &cptable_20127; static const union cptable* unix_table; /* NULL if UTF8 */

1 0

Francois Gouget : dwrite: Remove freetype_get_design_glyph_bbox(). It' s not used anymore.
by Alexandre Julliard March 22, 2019

March 22, 2019

Module: wine Branch: master Commit: 1e819f00a5fda6c06f507c4f5006a8d3bd2b9cd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e819f00a5fda6c06f507c4f… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 16 23:49:52 2019 +0100 dwrite: Remove freetype_get_design_glyph_bbox(). It's not used anymore. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/freetype.c | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index 58cad41..fd94829 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -716,32 +716,6 @@ void freetype_get_glyph_bbox(struct dwrite_glyphbitmap *bitmap) SetRect(&bitmap->bbox, bbox.xMin, -bbox.yMax, bbox.xMax, -bbox.yMin); } -void freetype_get_design_glyph_bbox(IDWriteFontFace4 *fontface, UINT16 unitsperEm, UINT16 glyph, RECT *bbox) -{ - FTC_ScalerRec scaler; - FT_Size size; - - scaler.face_id = fontface; - scaler.width = unitsperEm; - scaler.height = unitsperEm; - scaler.pixel = 1; - scaler.x_res = 0; - scaler.y_res = 0; - - EnterCriticalSection(&freetype_cs); - if (pFTC_Manager_LookupSize(cache_manager, &scaler, &size) == 0) { - if (pFT_Load_Glyph(size->face, glyph, FT_LOAD_NO_SCALE) == 0) { - FT_Glyph_Metrics *metrics = &size->face->glyph->metrics; - - bbox->left = metrics->horiBearingX; - bbox->right = bbox->left + metrics->horiAdvance; - bbox->top = -metrics->horiBearingY; - bbox->bottom = bbox->top + metrics->height; - } - } - LeaveCriticalSection(&freetype_cs); -} - static BOOL freetype_get_aliased_glyph_bitmap(struct dwrite_glyphbitmap *bitmap, FT_Glyph glyph) { const RECT *bbox = &bitmap->bbox; @@ -998,11 +972,6 @@ void freetype_get_glyph_bbox(struct dwrite_glyphbitmap *bitmap) SetRectEmpty(&bitmap->bbox); } -void freetype_get_design_glyph_bbox(IDWriteFontFace4 *fontface, UINT16 unitsperEm, UINT16 glyph, RECT *bbox) -{ - SetRectEmpty(bbox); -} - BOOL freetype_get_glyph_bitmap(struct dwrite_glyphbitmap *bitmap) { return FALSE;

1 0