wine-devel April 2018

wine-devel@winehq.org

75 participants
538 discussions

[PATCH 1/6] wined3d: Select the correct texture level in draw_textured_quad().
by Henri Verbeet 12 Apr '18

12 Apr '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c01bd32e1af..6c7d6df00d6 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -173,12 +173,14 @@ void draw_textured_quad(struct wined3d_texture *texture, unsigned int sub_resour { const struct wined3d_gl_info *gl_info = context->gl_info; struct blt_info info; + unsigned int level; texture2d_get_blt_info(texture, sub_resource_idx, src_rect, &info); gl_info->gl_ops.gl.p_glEnable(info.bind_target); checkGLcall("glEnable(bind_target)"); + level = sub_resource_idx % texture->level_count; context_bind_texture(context, info.bind_target, texture->texture_rgb.name); /* Filtering for StretchRect */ @@ -191,6 +193,8 @@ void draw_textured_quad(struct wined3d_texture *texture, unsigned int sub_resour gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); if (context->gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_SRGB_DECODE_EXT, GL_SKIP_DECODE_EXT); + gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_BASE_LEVEL, level); + gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_MAX_LEVEL, level); gl_info->gl_ops.gl.p_glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); checkGLcall("glTexEnvi"); @@ -209,6 +213,8 @@ void draw_textured_quad(struct wined3d_texture *texture, unsigned int sub_resour gl_info->gl_ops.gl.p_glVertex2i(dst_rect->right, dst_rect->bottom); gl_info->gl_ops.gl.p_glEnd(); + gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_MAX_LEVEL, texture->level_count - 1); + /* Unbind the texture */ context_bind_texture(context, info.bind_target, 0); @@ -218,6 +224,7 @@ void draw_textured_quad(struct wined3d_texture *texture, unsigned int sub_resour texture->texture_rgb.sampler_desc.min_filter = WINED3D_TEXF_POINT; texture->texture_rgb.sampler_desc.mip_filter = WINED3D_TEXF_NONE; texture->texture_rgb.sampler_desc.srgb_decode = FALSE; + texture->texture_rgb.base_level = level; } /* Works correctly only for <= 4 bpp formats. */ -- 2.11.0

1 0

[PATCH 1/4] widl: Generate correct alignment for encapsulated union tags.
by Zebediah Figura 12 Apr '18

12 Apr '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- tools/widl/typegen.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index e63600c..27855cc 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3276,6 +3276,7 @@ static unsigned int write_union_tfs(FILE *file, const attr_list_t *attrs, { const var_t *sv = type_union_get_switch_value(type); const type_t *st = sv->type; + unsigned int align = 0; unsigned char fc; if (type_get_type(st) == TYPE_BASIC) @@ -3303,9 +3304,16 @@ static unsigned int write_union_tfs(FILE *file, const attr_list_t *attrs, else error("union switch type must be an integer, char, or enum\n"); + type_memsize_and_alignment(st, &align); + if (fields) LIST_FOR_EACH_ENTRY(f, fields, var_t, entry) + { + if (f->type) + type_memsize_and_alignment(f->type, &align); + } + print_file(file, 2, "0x%x,\t/* FC_ENCAPSULATED_UNION */\n", RPC_FC_ENCAPSULATED_UNION); print_file(file, 2, "0x%x,\t/* Switch type= %s */\n", - 0x40 | fc, string_of_type(fc)); + (align << 4) | fc, string_of_type(fc)); *tfsoff += 2; } else if (is_attr(type->attrs, ATTR_SWITCHTYPE)) -- 2.7.4

3 9

[PATCH] comctrl32: Use clrTextBk color for icon backgrounds when TVS_FULLROWSELECT is used.
by Alistair Leslie-Hughes 12 Apr '18

12 Apr '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/comctl32/treeview.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 65eff8b..0980e34 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -2640,7 +2640,9 @@ TREEVIEW_DrawItem(const TREEVIEW_INFO *infoPtr, HDC hdc, TREEVIEW_ITEM *item) ImageList_DrawEx(infoPtr->himlNormal, imageIndex, hdc, item->imageOffset, centery - infoPtr->normalImageHeight / 2, - 0, 0, infoPtr->clrBk, item->state & TVIS_CUT ? GETBKCOLOR(infoPtr->clrBk) : CLR_DEFAULT, + 0, 0, + TREEVIEW_IsFullRowSelect(infoPtr) ? nmcdhdr.clrTextBk : infoPtr->clrBk, + item->state & TVIS_CUT ? GETBKCOLOR(infoPtr->clrBk) : CLR_DEFAULT, style); } } -- 1.9.1

2 3

[PATCH v6 1/5] ole32: Add support for loading enhmetafiles from presentation and contents streams to data cache.
by Sergio Gómez Del Real 12 Apr '18

12 Apr '18

Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> --- dlls/ole32/datacache.c | 106 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 82 insertions(+), 24 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 325a98b33b..ff42e4d34a 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -547,6 +547,30 @@ static HRESULT open_pres_stream( IStorage *stg, int stream_number, IStream **stm return IStorage_OpenStream( stg, name, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, stm ); } +static HRESULT synthesize_emf( HMETAFILEPICT data, STGMEDIUM *med ) +{ + METAFILEPICT *pict; + HRESULT hr = E_FAIL; + UINT size; + void *bits; + + if (!(pict = GlobalLock( data ))) return hr; + + size = GetMetaFileBitsEx( pict->hMF, 0, NULL ); + if ((bits = HeapAlloc( GetProcessHeap(), 0, size ))) + { + GetMetaFileBitsEx( pict->hMF, size, bits ); + med->u.hEnhMetaFile = SetWinMetaFileBits( size, bits, NULL, pict ); + HeapFree( GetProcessHeap(), 0, bits ); + med->tymed = TYMED_ENHMF; + med->pUnkForRelease = NULL; + hr = S_OK; + } + + GlobalUnlock( data ); + return hr; +} + static HRESULT load_mf_pict( DataCacheEntry *cache_entry, IStream *stm ) { HRESULT hr; @@ -704,6 +728,60 @@ fail: } +static HRESULT load_emf( DataCacheEntry *cache_entry, IStream *stm ) +{ + HRESULT hr; + + if (cache_entry->load_stream_num != STREAM_NUMBER_CONTENTS) + { + STGMEDIUM stgmed; + + hr = load_mf_pict( cache_entry, stm ); + if (SUCCEEDED( hr )) + { + hr = synthesize_emf( cache_entry->stgmedium.u.hMetaFilePict, &stgmed ); + ReleaseStgMedium( &cache_entry->stgmedium ); + } + if (SUCCEEDED( hr )) + cache_entry->stgmedium = stgmed; + } + else + { + STATSTG stat; + BYTE *data; + ULONG read, size_bits; + + hr = IStream_Stat( stm, &stat, STATFLAG_NONAME ); + + if (SUCCEEDED( hr )) + { + data = HeapAlloc( GetProcessHeap(), 0, stat.cbSize.u.LowPart ); + if (!data) return E_OUTOFMEMORY; + + hr = IStream_Read( stm, data, stat.cbSize.u.LowPart, &read ); + if (hr != S_OK) + { + HeapFree( GetProcessHeap(), 0, data ); + return hr; + } + + if (read <= sizeof(DWORD) + sizeof(ENHMETAHEADER)) + { + HeapFree( GetProcessHeap(), 0, data ); + return E_FAIL; + } + size_bits = read - sizeof(DWORD) - sizeof(ENHMETAHEADER); + cache_entry->stgmedium.u.hEnhMetaFile = SetEnhMetaFileBits( size_bits, data + (read - size_bits) ); + cache_entry->stgmedium.tymed = TYMED_ENHMF; + cache_entry->stgmedium.pUnkForRelease = NULL; + + HeapFree( GetProcessHeap(), 0, data ); + } + } + + return hr; +} + /************************************************************************ * DataCacheEntry_LoadData * @@ -736,6 +814,10 @@ static HRESULT DataCacheEntry_LoadData(DataCacheEntry *cache_entry, IStorage *st hr = load_dib( cache_entry, stm ); break; + case CF_ENHMETAFILE: + hr = load_emf( cache_entry, stm ); + break; + default: FIXME( "Unimplemented clip format %x\n", cache_entry->fmtetc.cfFormat ); hr = E_NOTIMPL; @@ -1118,30 +1200,6 @@ static HRESULT synthesize_bitmap( HGLOBAL dib, STGMEDIUM *med ) return hr; } -static HRESULT synthesize_emf( HMETAFILEPICT data, STGMEDIUM *med ) -{ - METAFILEPICT *pict; - HRESULT hr = E_FAIL; - UINT size; - void *bits; - - if (!(pict = GlobalLock( data ))) return hr; - - size = GetMetaFileBitsEx( pict->hMF, 0, NULL ); - if ((bits = HeapAlloc( GetProcessHeap(), 0, size ))) - { - GetMetaFileBitsEx( pict->hMF, size, bits ); - med->u.hEnhMetaFile = SetWinMetaFileBits( size, bits, NULL, pict ); - HeapFree( GetProcessHeap(), 0, bits ); - med->tymed = TYMED_ENHMF; - med->pUnkForRelease = NULL; - hr = S_OK; - } - - GlobalUnlock( data ); - return hr; -} - static HRESULT DataCacheEntry_SetData(DataCacheEntry *cache_entry, const FORMATETC *formatetc, STGMEDIUM *stgmedium, -- 2.14.1

2 9

[PATCH] dwrite: Fix features dumping in analyzer_dump_user_features
by Piotr Caban 12 Apr '18

12 Apr '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1

[PATCH 3/4] riched20: Implement IRichEditOle::GetObject.
by Jactry Zeng 12 Apr '18

12 Apr '18

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/riched20/caret.c | 2 +- dlls/riched20/editor.h | 2 +- dlls/riched20/richole.c | 57 +++++++++++++++++++++++++++++++++++++++++++------ 3 files changed, 53 insertions(+), 8 deletions(-)

2 1

[PATCH] shell32: Avoid some exception when property Set and Commit in shell32.dll
by Guillaume GILL 12 Apr '18

12 Apr '18

Fixeshttps://bugs.winehq.org/show_bug.cgi?id=44866 --- dlls/shell32/shelllink.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 6dca9ac..07c83d1 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -2664,14 +2664,14 @@ static HRESULT WINAPI propertystore_SetValue(IPropertyStore *iface, REFPROPERTYK { IShellLinkImpl *This = impl_from_IPropertyStore(iface); FIXME("(%p)->(%p %p): stub\n", This, key, value); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI propertystore_Commit(IPropertyStore *iface) { IShellLinkImpl *This = impl_from_IPropertyStore(iface); FIXME("(%p): stub\n", This); - return E_NOTIMPL; + return S_OK; } static const IPropertyStoreVtbl propertystorevtbl = { -- 2.7.4

1 0

[PATCH 4/4] riched20/tests: Add tests for IRichEditOle::{GetObject,GetObjectCount}.
by Jactry Zeng 12 Apr '18

12 Apr '18

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/riched20/tests/richole.c | 145 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 129 insertions(+), 16 deletions(-)

1 0

[PATCH 2/4] riched20: Implement IRichEditOle::GetObjectCount.
by Jactry Zeng 12 Apr '18

12 Apr '18

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/riched20/richole.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH] shell32: Avoid some exception when property Set and Commit in, shell32.dll
by Guillaume GILL 12 Apr '18

12 Apr '18

1 0

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

Jump to page:

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-devel April 2018