October 2014 - Wine-commits

Austin English : kernel32: Add a stub for SetSystemFileCacheSize.
by Alexandre Julliard 08 Oct '14

08 Oct '14

Module: wine Branch: master Commit: 96e920e01f90a2d9c343ad57986f8bf0ad1eb63f URL: http://source.winehq.org/git/wine.git/?a=commit;h=96e920e01f90a2d9c343ad579… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Oct 7 14:35:03 2014 -0500 kernel32: Add a stub for SetSystemFileCacheSize. --- .../api-ms-win-core-memory-l1-1-1.spec | 2 +- dlls/kernel32/heap.c | 7 +++++++ dlls/kernel32/kernel32.spec | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec b/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec index f0cd496..5d3eb13 100644 --- a/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec +++ b/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec @@ -16,7 +16,7 @@ @ stdcall ReadProcessMemory(long ptr ptr long ptr) kernel32.ReadProcessMemory @ stdcall ResetWriteWatch(ptr long) kernel32.ResetWriteWatch @ stub SetProcessWorkingSetSizeEx -@ stub SetSystemFileCacheSize +@ stdcall SetSystemFileCacheSize(long long long) kernel32.SetSystemFileCacheSize @ stdcall UnmapViewOfFile(ptr) kernel32.UnmapViewOfFile @ stub UnmapViewOfFileEx @ stdcall VirtualAlloc(ptr long long long) kernel32.VirtualAlloc diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 5a16a12..9037f8e 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1454,3 +1454,10 @@ BOOL WINAPI GetSystemFileCacheSize(PSIZE_T mincache, PSIZE_T maxcache, PDWORD fl SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +BOOL WINAPI SetSystemFileCacheSize(SIZE_T mincache, SIZE_T maxcache, DWORD flags) +{ + FIXME("stub: %ld %ld %d\n", mincache, maxcache, flags); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index e82a64d..d08f90c 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1167,6 +1167,7 @@ @ stdcall SetProcessShutdownParameters(long long) @ stdcall SetProcessWorkingSetSize(long long long) @ stdcall SetStdHandle(long long) +@ stdcall SetSystemFileCacheSize(long long long) @ stdcall SetSystemPowerState(long long) @ stdcall SetSystemTime(ptr) @ stdcall SetSystemTimeAdjustment(long long)

1 0

André Hentschel : winetest: Add Windows 8.1 to group Win8.
by Alexandre Julliard 08 Oct '14

08 Oct '14

Module: tools Branch: master Commit: 83d9d7a28fe40a2e148301217430dd13fbde1041 URL: http://source.winehq.org/git/tools.git/?a=commit;h=83d9d7a28fe40a2e14830121… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 7 21:41:36 2014 +0200 winetest: Add Windows 8.1 to group Win8. --- winetest/dissect | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winetest/dissect b/winetest/dissect index 676f089..61e85ca 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -203,7 +203,7 @@ if ($plid==1 && $major==4) { } elsif ($product==3) { $version = "2008"; } - } elsif ($minor == 2) { + } elsif ($minor == 2 || $minor == 3) { $version = "win8"; } }

1 0

Nikolay Sivov : dwrite: Introduce cache to be used by shaping engines.
by Alexandre Julliard 07 Oct '14

07 Oct '14

Module: wine Branch: master Commit: cb8556c1716c27b2252d25651c55f8c1625a87bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb8556c1716c27b2252d25651… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 5 17:43:47 2014 +0400 dwrite: Introduce cache to be used by shaping engines. --- dlls/dwrite/analyzer.c | 12 +++++++++--- dlls/dwrite/dwrite_private.h | 8 ++++++-- dlls/dwrite/shape.c | 35 ++++++++++++++++++++++++++++++++--- dlls/dwrite/tests/analyzer.c | 6 ++++++ 4 files changed, 53 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 20a84c3..e2fac55 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -846,6 +846,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, DWRITE_SHAPING_GLYPH_PROPERTIES* glyph_props, UINT32* actual_glyph_count) { const struct dwritescript_properties *scriptprops; + struct scriptshaping_cache *cache; WCHAR *string; BOOL update_cluster; UINT32 i, g; @@ -925,9 +926,13 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, } *actual_glyph_count = g; + hr = create_scriptshaping_cache(fontface, &cache); + if (FAILED(hr)) + goto done; + scriptprops = &dwritescripts_properties[script]; if (scriptprops->ops && scriptprops->ops->contextual_shaping) { - hr = scriptprops->ops->contextual_shaping(fontface, is_rtl, string, length, max_glyph_count, clustermap, glyph_indices, actual_glyph_count); + hr = scriptprops->ops->contextual_shaping(cache, is_rtl, string, length, max_glyph_count, clustermap, glyph_indices, actual_glyph_count); if (FAILED(hr)) goto done; } @@ -935,11 +940,12 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, /* FIXME: apply default features */ if (scriptprops->ops && scriptprops->ops->set_text_glyphs_props) - hr = scriptprops->ops->set_text_glyphs_props(fontface, string, length, clustermap, glyph_indices, *actual_glyph_count, text_props, glyph_props); + hr = scriptprops->ops->set_text_glyphs_props(cache, string, length, clustermap, glyph_indices, *actual_glyph_count, text_props, glyph_props); else - hr = default_shaping_ops.set_text_glyphs_props(fontface, string, length, clustermap, glyph_indices, *actual_glyph_count, text_props, glyph_props); + hr = default_shaping_ops.set_text_glyphs_props(cache, string, length, clustermap, glyph_indices, *actual_glyph_count, text_props, glyph_props); done: + release_scriptshaping_cache(cache); heap_free(string); return hr; diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 1624c6b..3eb7957 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -135,11 +135,15 @@ enum SCRIPT_JUSTIFY SCRIPT_JUSTIFY_ARABIC_SEEN_M }; +struct scriptshaping_cache; +extern HRESULT create_scriptshaping_cache(IDWriteFontFace*,struct scriptshaping_cache**) DECLSPEC_HIDDEN; +extern void release_scriptshaping_cache(struct scriptshaping_cache*) DECLSPEC_HIDDEN; + struct scriptshaping_ops { - HRESULT (*contextual_shaping)(IDWriteFontFace *fontface, BOOL is_rtl, const WCHAR *text, UINT32 len, UINT32 max_glyph_count, + HRESULT (*contextual_shaping)(struct scriptshaping_cache *cache, BOOL is_rtl, const WCHAR *text, UINT32 len, UINT32 max_glyph_count, UINT16 *clustermap, UINT16 *glyph_indices, UINT32* actual_glyph_count); - HRESULT (*set_text_glyphs_props)(IDWriteFontFace *fontface, const WCHAR *text, UINT32 len, UINT16 *clustermap, UINT16 *glyph_indices, + HRESULT (*set_text_glyphs_props)(struct scriptshaping_cache *cache, const WCHAR *text, UINT32 len, UINT16 *clustermap, UINT16 *glyph_indices, UINT32 glyphcount, DWRITE_SHAPING_TEXT_PROPERTIES *text_props, DWRITE_SHAPING_GLYPH_PROPERTIES *glyph_props); }; diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index fdedb2b..bf09861 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -26,6 +26,35 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); +struct scriptshaping_cache +{ + IDWriteFontFace *fontface; +}; + +HRESULT create_scriptshaping_cache(IDWriteFontFace *fontface, struct scriptshaping_cache **cache) +{ + struct scriptshaping_cache *ret; + + ret = heap_alloc(sizeof(*ret)); + if (!ret) + return E_OUTOFMEMORY; + + ret->fontface = fontface; + IDWriteFontFace_AddRef(fontface); + + *cache = ret; + + return S_OK; +} + +void release_scriptshaping_cache(struct scriptshaping_cache *cache) +{ + if (!cache) + return; + IDWriteFontFace_Release(cache->fontface); + heap_free(cache); +} + static void shape_update_clusters_from_glyphprop(UINT32 glyphcount, UINT32 text_len, UINT16 *clustermap, DWRITE_SHAPING_GLYPH_PROPERTIES *glyph_props) { UINT32 i; @@ -86,7 +115,7 @@ static INT32 map_glyph_to_text_pos(const UINT16 *clustermap, UINT32 len, UINT16 return k; } -static HRESULT default_set_text_glyphs_props(IDWriteFontFace *fontface, const WCHAR *text, UINT32 len, UINT16 *clustermap, UINT16 *glyph_indices, +static HRESULT default_set_text_glyphs_props(struct scriptshaping_cache *cache, const WCHAR *text, UINT32 len, UINT16 *clustermap, UINT16 *glyph_indices, UINT32 glyphcount, DWRITE_SHAPING_TEXT_PROPERTIES *text_props, DWRITE_SHAPING_GLYPH_PROPERTIES *glyph_props) { UINT32 i; @@ -119,13 +148,13 @@ static HRESULT default_set_text_glyphs_props(IDWriteFontFace *fontface, const WC return S_OK; } -static HRESULT latn_set_text_glyphs_props(IDWriteFontFace *fontface, const WCHAR *text, UINT32 len, UINT16 *clustermap, UINT16 *glyph_indices, +static HRESULT latn_set_text_glyphs_props(struct scriptshaping_cache *cache, const WCHAR *text, UINT32 len, UINT16 *clustermap, UINT16 *glyph_indices, UINT32 glyphcount, DWRITE_SHAPING_TEXT_PROPERTIES *text_props, DWRITE_SHAPING_GLYPH_PROPERTIES *glyph_props) { HRESULT hr; UINT32 i; - hr = default_set_text_glyphs_props(fontface, text, len, clustermap, glyph_indices, glyphcount, text_props, glyph_props); + hr = default_set_text_glyphs_props(cache, text, len, clustermap, glyph_indices, glyphcount, text_props, glyph_props); for (i = 0; i < glyphcount; i++) if (glyph_props[i].isZeroWidthSpace) diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 15f5ab0..1add761 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -1123,6 +1123,12 @@ static void test_GetGlyphs(void) NULL, NULL, NULL, 0, maxglyphcount, clustermap, props, glyphs1, shapingprops, &actual_count); ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "got 0x%08x\n", hr); +if (0) { + /* NULL fontface - crashes on Windows */ + hr = IDWriteTextAnalyzer_GetGlyphs(analyzer, test1W, lstrlenW(test1W), NULL, FALSE, FALSE, &sa, NULL, + NULL, NULL, NULL, 0, maxglyphcount, clustermap, props, glyphs1, shapingprops, &actual_count); +} + /* invalid script id */ maxglyphcount = 10; actual_count = 0;

1 0

Nikolay Sivov : dwrite: Store OpenType language tag in shaping cache.
by Alexandre Julliard 07 Oct '14

07 Oct '14

Module: wine Branch: master Commit: c9bb307c358c0b9361d4168b9fcea60856cfc157 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9bb307c358c0b9361d4168b9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 6 05:01:22 2014 +0400 dwrite: Store OpenType language tag in shaping cache. --- dlls/dwrite/analyzer.c | 2 +- dlls/dwrite/dwrite_private.h | 6 +++++- dlls/dwrite/opentype.c | 4 ---- dlls/dwrite/shape.c | 10 +++++++++- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index e2fac55..5851e90 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -926,7 +926,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, } *actual_glyph_count = g; - hr = create_scriptshaping_cache(fontface, &cache); + hr = create_scriptshaping_cache(fontface, locale, &cache); if (FAILED(hr)) goto done; diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 3eb7957..5a2b5a3 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -19,6 +19,10 @@ #include "wine/debug.h" #include "wine/unicode.h" +#define DWRITE_MAKE_OPENTYPE_TAG(ch0, ch1, ch2, ch3) \ + ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \ + ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24)) + static inline void *heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); @@ -136,7 +140,7 @@ enum SCRIPT_JUSTIFY }; struct scriptshaping_cache; -extern HRESULT create_scriptshaping_cache(IDWriteFontFace*,struct scriptshaping_cache**) DECLSPEC_HIDDEN; +extern HRESULT create_scriptshaping_cache(IDWriteFontFace*,const WCHAR*,struct scriptshaping_cache**) DECLSPEC_HIDDEN; extern void release_scriptshaping_cache(struct scriptshaping_cache*) DECLSPEC_HIDDEN; struct scriptshaping_ops diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 532c126..318adcf 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -25,10 +25,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); -#define DWRITE_MAKE_OPENTYPE_TAG(ch0, ch1, ch2, ch3) \ - ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \ - ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24)) - #define MS_TTCF_TAG DWRITE_MAKE_OPENTYPE_TAG('t','t','c','f') #define MS_OTTO_TAG DWRITE_MAKE_OPENTYPE_TAG('O','T','T','O') diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index bf09861..dbf5c67 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -29,9 +29,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); struct scriptshaping_cache { IDWriteFontFace *fontface; + UINT32 language_tag; }; -HRESULT create_scriptshaping_cache(IDWriteFontFace *fontface, struct scriptshaping_cache **cache) +HRESULT create_scriptshaping_cache(IDWriteFontFace *fontface, const WCHAR *locale, struct scriptshaping_cache **cache) { struct scriptshaping_cache *ret; @@ -42,6 +43,13 @@ HRESULT create_scriptshaping_cache(IDWriteFontFace *fontface, struct scriptshapi ret->fontface = fontface; IDWriteFontFace_AddRef(fontface); + ret->language_tag = DWRITE_MAKE_OPENTYPE_TAG('d','f','l','t'); + if (locale) { + WCHAR tag[5]; + if (GetLocaleInfoEx(locale, LOCALE_SOPENTYPELANGUAGETAG, tag, sizeof(tag)/sizeof(WCHAR))) + ret->language_tag = DWRITE_MAKE_OPENTYPE_TAG(tag[0],tag[1],tag[2],tag[3]); + } + *cache = ret; return S_OK;

1 0

Nikolay Sivov : dwrite: Move font table related data to a separate structure.
by Alexandre Julliard 07 Oct '14

07 Oct '14

Module: wine Branch: master Commit: 07dc8b66e421392df0199bba1026113f838e5753 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07dc8b66e421392df0199bba1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 6 16:26:31 2014 +0400 dwrite: Move font table related data to a separate structure. Eventually we should get rid of separate allocations on every TryGetFontTable(), that's not how local loader works. Instead it maps font file and returns pointers to a mapping, context is always NULL in this case. --- dlls/dwrite/font.c | 63 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 33 insertions(+), 30 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 25b47ef..923996b 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -97,21 +97,24 @@ struct dwrite_font { #define DWRITE_FONTTABLE_MAGIC 0xededfafa -struct dwrite_fonttable { +struct dwrite_fonttablecontext { UINT32 magic; - LPVOID context; + void *context; UINT32 file_index; }; +struct dwrite_fonttable { + void *data; + void *context; + UINT32 size; +}; + struct dwrite_fontface { IDWriteFontFace IDWriteFontFace_iface; LONG ref; struct dwrite_fontface_data *data; - - LPVOID CMAP_table; - LPVOID CMAP_context; - DWORD CMAP_size; + struct dwrite_fonttable cmap; BOOL is_system; LOGFONTW logfont; @@ -236,8 +239,8 @@ static ULONG WINAPI dwritefontface_Release(IDWriteFontFace *iface) if (!ref) { - if (This->CMAP_context) - IDWriteFontFace_ReleaseFontTable(iface, This->CMAP_context); + if (This->cmap.context) + IDWriteFontFace_ReleaseFontTable(iface, This->cmap.context); _free_fontface_data(This->data); heap_free(This); } @@ -353,10 +356,10 @@ static HRESULT WINAPI dwritefontface_GetGlyphIndices(IDWriteFontFace *iface, UIN { HRESULT hr; TRACE("(%p)->(%p %u %p)\n", This, codepoints, count, glyph_indices); - if (!This->CMAP_table) + if (!This->cmap.data) { BOOL exists = FALSE; - hr = IDWriteFontFace_TryGetFontTable(iface, MS_CMAP_TAG, (const void**)&This->CMAP_table, &This->CMAP_size, &This->CMAP_context, &exists); + hr = IDWriteFontFace_TryGetFontTable(iface, MS_CMAP_TAG, (const void**)&This->cmap.data, &This->cmap.size, &This->cmap.context, &exists); if (FAILED(hr) || !exists) { ERR("Font does not have a CMAP table\n"); @@ -366,7 +369,7 @@ static HRESULT WINAPI dwritefontface_GetGlyphIndices(IDWriteFontFace *iface, UIN for (i = 0; i < count; i++) { - OpenType_CMAP_GetGlyphIndex(This->CMAP_table, codepoints[i], &glyph_indices[i], 0); + OpenType_CMAP_GetGlyphIndex(This->cmap.data, codepoints[i], &glyph_indices[i], 0); } return S_OK; } @@ -385,14 +388,14 @@ static HRESULT WINAPI dwritefontface_TryGetFontTable(IDWriteFontFace *iface, UIN { HRESULT hr = S_OK; int i; - struct dwrite_fonttable *table; + struct dwrite_fonttablecontext *tablecontext; TRACE("(%p)->(%u %p %p %p %p)\n", This, table_tag, table_data, table_size, context, exists); - table = heap_alloc(sizeof(struct dwrite_fonttable)); - if (!table) + tablecontext = heap_alloc(sizeof(struct dwrite_fonttablecontext)); + if (!tablecontext) return E_OUTOFMEMORY; - table->magic = DWRITE_FONTTABLE_MAGIC; + tablecontext->magic = DWRITE_FONTTABLE_MAGIC; *exists = FALSE; for (i = 0; i < This->data->file_count && !(*exists); i++) @@ -401,16 +404,16 @@ static HRESULT WINAPI dwritefontface_TryGetFontTable(IDWriteFontFace *iface, UIN hr = _dwritefontfile_GetFontFileStream(This->data->files[i], &stream); if (FAILED(hr)) continue; - table->file_index = i; + tablecontext->file_index = i; - hr = find_font_table(stream, This->data->index, table_tag, table_data, &table->context, table_size, exists); + hr = find_font_table(stream, This->data->index, table_tag, table_data, &tablecontext->context, table_size, exists); IDWriteFontFileStream_Release(stream); } if (FAILED(hr) && !*exists) - heap_free(table); + heap_free(tablecontext); else - *context = (LPVOID)table; + *context = (void*)tablecontext; return hr; } } @@ -418,23 +421,23 @@ static HRESULT WINAPI dwritefontface_TryGetFontTable(IDWriteFontFace *iface, UIN static void WINAPI dwritefontface_ReleaseFontTable(IDWriteFontFace *iface, void *table_context) { struct dwrite_fontface *This = impl_from_IDWriteFontFace(iface); - struct dwrite_fonttable *table = (struct dwrite_fonttable *)table_context; + struct dwrite_fonttablecontext *tablecontext = (struct dwrite_fonttablecontext*)table_context; IDWriteFontFileStream *stream; HRESULT hr; TRACE("(%p)->(%p)\n", This, table_context); - if (table->magic != DWRITE_FONTTABLE_MAGIC) + if (tablecontext->magic != DWRITE_FONTTABLE_MAGIC) { TRACE("Invalid table magic\n"); return; } - hr = _dwritefontfile_GetFontFileStream(This->data->files[table->file_index], &stream); + hr = _dwritefontfile_GetFontFileStream(This->data->files[tablecontext->file_index], &stream); if (FAILED(hr)) return; - IDWriteFontFileStream_ReleaseFileFragment(stream, table->context); + IDWriteFontFileStream_ReleaseFileFragment(stream, tablecontext->context); IDWriteFontFileStream_Release(stream); - heap_free(table); + heap_free(tablecontext); } static HRESULT WINAPI dwritefontface_GetGlyphRunOutline(IDWriteFontFace *iface, FLOAT emSize, @@ -516,9 +519,9 @@ static HRESULT create_system_fontface(struct dwrite_font *font, IDWriteFontFace This->data->files = NULL; This->data->index = 0; This->data->simulations = DWRITE_FONT_SIMULATIONS_NONE; - This->CMAP_table = NULL; - This->CMAP_context = NULL; - This->CMAP_size = 0; + This->cmap.data = NULL; + This->cmap.context = NULL; + This->cmap.size = 0; This->is_system = TRUE; memset(&This->logfont, 0, sizeof(This->logfont)); @@ -1358,9 +1361,9 @@ HRESULT font_create_fontface(IDWriteFactory *iface, DWRITE_FONT_FACE_TYPE facety This->data->type = facetype; This->data->file_count = files_number; This->data->files = heap_alloc(sizeof(*This->data->files) * files_number); - This->CMAP_table = NULL; - This->CMAP_context = NULL; - This->CMAP_size = 0; + This->cmap.data = NULL; + This->cmap.context = NULL; + This->cmap.size = 0; /* Verify font file streams */ for (i = 0; i < This->data->file_count && SUCCEEDED(hr); i++) {

1 0

Nikolay Sivov : dwrite: Use public macro to define OpenType tags.
by Alexandre Julliard 07 Oct '14

07 Oct '14

Module: wine Branch: master Commit: 3b1e8bf824b7506ad718271f2dbbac084b1e2c7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b1e8bf824b7506ad718271f2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 7 09:23:26 2014 +0400 dwrite: Use public macro to define OpenType tags. --- dlls/dwrite/dwrite_private.h | 4 ---- dlls/dwrite/font.c | 12 ++++-------- include/dwrite.idl | 6 ++++++ 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 5a2b5a3..736292e 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -19,10 +19,6 @@ #include "wine/debug.h" #include "wine/unicode.h" -#define DWRITE_MAKE_OPENTYPE_TAG(ch0, ch1, ch2, ch3) \ - ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \ - ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24)) - static inline void *heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 923996b..def64ce 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -25,14 +25,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); -#define MS_MAKE_TAG(ch0, ch1, ch2, ch3) \ - ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \ - ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24)) - -#define MS_HEAD_TAG MS_MAKE_TAG('h','e','a','d') -#define MS_OS2_TAG MS_MAKE_TAG('O','S','/','2') -#define MS_POST_TAG MS_MAKE_TAG('p','o','s','t') -#define MS_CMAP_TAG MS_MAKE_TAG('c','m','a','p') +#define MS_HEAD_TAG DWRITE_MAKE_OPENTYPE_TAG('h','e','a','d') +#define MS_OS2_TAG DWRITE_MAKE_OPENTYPE_TAG('O','S','/','2') +#define MS_POST_TAG DWRITE_MAKE_OPENTYPE_TAG('p','o','s','t') +#define MS_CMAP_TAG DWRITE_MAKE_OPENTYPE_TAG('c','m','a','p') struct dwrite_fontface_data { LONG ref; diff --git a/include/dwrite.idl b/include/dwrite.idl index bc530fc..1888215 100644 --- a/include/dwrite.idl +++ b/include/dwrite.idl @@ -222,6 +222,12 @@ typedef enum DWRITE_LINE_SPACING_METHOD DWRITE_LINE_SPACING_METHOD_UNIFORM } DWRITE_LINE_SPACING_METHOD; +cpp_quote("#define DWRITE_MAKE_OPENTYPE_TAG(a,b,c,d) ( \\") +cpp_quote(" ((UINT32)(UINT8)(d) << 24) | \\") +cpp_quote(" ((UINT32)(UINT8)(c) << 16) | \\") +cpp_quote(" ((UINT32)(UINT8)(b) << 8) | \\") +cpp_quote(" (UINT32)(UINT8)(a))") + typedef enum DWRITE_FONT_FEATURE_TAG { DWRITE_FONT_FEATURE_TAG_ALTERNATIVE_FRACTIONS = 0x63726661, /* 'afrc' */

1 0

Henri Verbeet : ws2_32: Return an error if "out_buff" is NULL for SIO_ADDRESS_LIST_QUERY.
by Alexandre Julliard 07 Oct '14

07 Oct '14

Module: wine Branch: master Commit: 32724def728e54b9023fbec9d43854e8afdbf43c URL: http://source.winehq.org/git/wine.git/?a=commit;h=32724def728e54b9023fbec9d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 7 08:41:12 2014 +0200 ws2_32: Return an error if "out_buff" is NULL for SIO_ADDRESS_LIST_QUERY. --- dlls/ws2_32/socket.c | 39 ++++++++++++++++++--------------------- dlls/ws2_32/tests/sock.c | 5 +++++ 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 98ed686..aba7d3f 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3947,6 +3947,10 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID if (GetAdaptersInfo(NULL, &size) == ERROR_BUFFER_OVERFLOW) { IP_ADAPTER_INFO *p, *table = HeapAlloc(GetProcessHeap(), 0, size); + SOCKET_ADDRESS_LIST *sa_list; + SOCKADDR_IN *sockaddr; + SOCKET_ADDRESS *sa; + unsigned int i; DWORD num; if (!table || GetAdaptersInfo(table, &size)) @@ -3962,7 +3966,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID total = sizeof(SOCKET_ADDRESS_LIST) + sizeof(SOCKET_ADDRESS) * (num - 1); total += sizeof(SOCKADDR) * num; - if (total > out_size) + if (total > out_size || !out_buff) { *ret_size = total; HeapFree(GetProcessHeap(), 0, table); @@ -3970,29 +3974,22 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID break; } - if (out_buff) - { - unsigned int i; - SOCKET_ADDRESS *sa; - SOCKET_ADDRESS_LIST *sa_list = out_buff; - SOCKADDR_IN *sockaddr; - - sa = sa_list->Address; - sockaddr = (SOCKADDR_IN *)((char *)sa + num * sizeof(SOCKET_ADDRESS)); - sa_list->iAddressCount = num; + sa_list = out_buff; + sa = sa_list->Address; + sockaddr = (SOCKADDR_IN *)((char *)sa + num * sizeof(SOCKET_ADDRESS)); + sa_list->iAddressCount = num; - for (p = table, i = 0; p; p = p->Next) - { - if (!p->IpAddressList.IpAddress.String[0]) continue; + for (p = table, i = 0; p; p = p->Next) + { + if (!p->IpAddressList.IpAddress.String[0]) continue; - sa[i].lpSockaddr = (SOCKADDR *)&sockaddr[i]; - sa[i].iSockaddrLength = sizeof(SOCKADDR); + sa[i].lpSockaddr = (SOCKADDR *)&sockaddr[i]; + sa[i].iSockaddrLength = sizeof(SOCKADDR); - sockaddr[i].sin_family = AF_INET; - sockaddr[i].sin_port = 0; - sockaddr[i].sin_addr.WS_s_addr = inet_addr(p->IpAddressList.IpAddress.String); - i++; - } + sockaddr[i].sin_family = AF_INET; + sockaddr[i].sin_port = 0; + sockaddr[i].sin_addr.WS_s_addr = inet_addr(p->IpAddressList.IpAddress.String); + i++; } HeapFree(GetProcessHeap(), 0, table); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 1d61f9a..0ad6e8a 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7499,6 +7499,11 @@ static void test_address_list_query(void) ok(WSAGetLastError() == WSAEFAULT, "Got unexpected error %d.\n", WSAGetLastError()); bytes_returned = 0xdeadbeef; + ret = WSAIoctl(s, SIO_ADDRESS_LIST_QUERY, NULL, 0, NULL, size, &bytes_returned, NULL, NULL); + ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + ok(WSAGetLastError() == WSAEFAULT, "Got unexpected error %d.\n", WSAGetLastError()); + ok(bytes_returned == size, "Got unexpected bytes_returned %u, expected %u.\n", bytes_returned, size); + ret = WSAIoctl(s, SIO_ADDRESS_LIST_QUERY, NULL, 0, address_list, 1, &bytes_returned, NULL, NULL); ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); ok(WSAGetLastError() == WSAEINVAL, "Got unexpected error %d.\n", WSAGetLastError());

1 0

Henri Verbeet : ws2_32: Simplify some address calculations for SIO_ADDRESS_LIST_QUERY.
by Alexandre Julliard 07 Oct '14

07 Oct '14

Module: wine Branch: master Commit: c0e49c5c40c064e4a7a4ddaeaf039ca0813b7d84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0e49c5c40c064e4a7a4ddaea… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 7 08:41:13 2014 +0200 ws2_32: Simplify some address calculations for SIO_ADDRESS_LIST_QUERY. --- dlls/ws2_32/socket.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index aba7d3f..8b60fb3 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3963,9 +3963,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID for (p = table, num = 0; p; p = p->Next) if (p->IpAddressList.IpAddress.String[0]) num++; - total = sizeof(SOCKET_ADDRESS_LIST) + sizeof(SOCKET_ADDRESS) * (num - 1); - total += sizeof(SOCKADDR) * num; - + total = FIELD_OFFSET(SOCKET_ADDRESS_LIST, Address[num]) + num * sizeof(*sockaddr); if (total > out_size || !out_buff) { *ret_size = total; @@ -3976,7 +3974,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID sa_list = out_buff; sa = sa_list->Address; - sockaddr = (SOCKADDR_IN *)((char *)sa + num * sizeof(SOCKET_ADDRESS)); + sockaddr = (SOCKADDR_IN *)&sa[num]; sa_list->iAddressCount = num; for (p = table, i = 0; p; p = p->Next)

1 0

Henri Verbeet : wined3d: Return the destination format from d3dfmt_get_conv().
by Alexandre Julliard 07 Oct '14

07 Oct '14

Module: wine Branch: master Commit: 71b59afe03dc7cf8ecf40b8c48892528574dcad3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71b59afe03dc7cf8ecf40b8c4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 7 08:41:14 2014 +0200 wined3d: Return the destination format from d3dfmt_get_conv(). --- dlls/wined3d/surface.c | 85 ++++++++++++++++++++++++++------------------------ 1 file changed, 45 insertions(+), 40 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ee51f6b..47d5b52 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1586,12 +1586,8 @@ static void surface_upload_data(struct wined3d_surface *surface, const struct wi } static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alpha_ck, - struct wined3d_format *format, enum wined3d_conversion_type *conversion_type) + enum wined3d_format_id *dst_format_id, enum wined3d_conversion_type *conversion_type) { - const struct wined3d_device *device = texture->resource.device; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - const struct wined3d_format *dst_format; - enum wined3d_format_id dst_format_id; unsigned int i; static const struct @@ -1609,9 +1605,8 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp {WINED3DFMT_B8G8R8A8_UNORM, WINED3D_CT_CK_B8G8R8A8, WINED3DFMT_B8G8R8A8_UNORM}, }; - *format = *texture->resource.format; *conversion_type = WINED3D_CT_NONE; - dst_format_id = format->id; + *dst_format_id = WINED3DFMT_UNKNOWN; if (need_alpha_ck && (texture->color_key_flags & WINEDDSD_CKSRCBLT)) { @@ -1621,7 +1616,7 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp continue; *conversion_type = color_key_info[i].conversion_type; - dst_format_id = color_key_info[i].dst_format; + *dst_format_id = color_key_info[i].dst_format; break; } @@ -1631,22 +1626,11 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp /* FIXME: This should check if the blitter backend can do P8 conversion, * instead of checking for ARB_fragment_program. */ if (texture->resource.format->id == WINED3DFMT_P8_UINT - && !(gl_info->supported[ARB_FRAGMENT_PROGRAM] && texture->swapchain - && texture == texture->swapchain->front_buffer)) + && !(texture->resource.device->adapter->gl_info.supported[ARB_FRAGMENT_PROGRAM] + && texture->swapchain && texture == texture->swapchain->front_buffer)) { *conversion_type = WINED3D_CT_P8; - dst_format_id = WINED3DFMT_B8G8R8A8_UNORM; - } - - if (*conversion_type != WINED3D_CT_NONE) - { - dst_format = wined3d_get_format(gl_info, dst_format_id); - format->glInternal = dst_format->glInternal; - format->glGammaInternal = dst_format->glGammaInternal; - format->rtInternal = dst_format->rtInternal; - format->glFormat = dst_format->glFormat; - format->glType = dst_format->glType; - format->byte_count = dst_format->byte_count; + *dst_format_id = WINED3DFMT_B8G8R8A8_UNORM; } } @@ -1678,9 +1662,9 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P const struct wined3d_format *dst_format; const struct wined3d_gl_info *gl_info; enum wined3d_conversion_type convert; + enum wined3d_format_id format_id; struct wined3d_context *context; struct wined3d_bo_address data; - struct wined3d_format format; UINT update_w, update_h; UINT dst_w, dst_h; RECT r, dst_rect; @@ -1754,8 +1738,8 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P } /* Use wined3d_surface_blt() instead of uploading directly if we need conversion. */ - d3dfmt_get_conv(dst_surface->container, FALSE, &format, &convert); - if (convert != WINED3D_CT_NONE || format.convert) + d3dfmt_get_conv(dst_surface->container, FALSE, &format_id, &convert); + if (dst_format->convert || convert != WINED3D_CT_NONE) return wined3d_surface_blt(dst_surface, &dst_rect, src_surface, src_rect, 0, NULL, WINED3D_TEXF_POINT); context = context_acquire(dst_surface->resource.device, NULL); @@ -3081,19 +3065,34 @@ void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb) static void surface_prepare_texture_internal(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) { + const struct wined3d_format *format = surface->container->resource.format; DWORD alloc_flag = srgb ? SFLAG_SRGBALLOCATED : SFLAG_ALLOCATED; - enum wined3d_conversion_type convert; - struct wined3d_format format; if (surface->flags & alloc_flag) return; - d3dfmt_get_conv(surface->container, TRUE, &format, &convert); - if (convert != WINED3D_CT_NONE || format.convert) + if (format->convert) + { surface->flags |= SFLAG_CONVERTED; - else surface->flags &= ~SFLAG_CONVERTED; + } + else + { + enum wined3d_conversion_type convert; + enum wined3d_format_id format_id; + + d3dfmt_get_conv(surface->container, TRUE, &format_id, &convert); + if (convert != WINED3D_CT_NONE) + { + surface->flags |= SFLAG_CONVERTED; + format = wined3d_get_format(context->gl_info, format_id); + } + else + { + surface->flags &= ~SFLAG_CONVERTED; + } + } wined3d_texture_bind_and_dirtify(surface->container, context, srgb); - surface_allocate_surface(surface, context->gl_info, &format, srgb); + surface_allocate_surface(surface, context->gl_info, format, srgb); surface->flags |= alloc_flag; } @@ -4480,7 +4479,9 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, { RECT src_rect = {0, 0, surface->resource.width, surface->resource.height}; struct wined3d_device *device = surface->resource.device; + struct wined3d_texture *texture = surface->container; enum wined3d_conversion_type convert; + enum wined3d_format_id format_id; struct wined3d_context *context; UINT width, src_pitch, dst_pitch; struct wined3d_bo_address data; @@ -4489,7 +4490,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, BYTE *mem = NULL; if (wined3d_settings.offscreen_rendering_mode != ORM_FBO - && wined3d_resource_is_offscreen(&surface->container->resource) + && wined3d_resource_is_offscreen(&texture->resource) && (surface->locations & WINED3D_LOCATION_DRAWABLE)) { surface_load_fb_texture(surface, srgb); @@ -4532,8 +4533,6 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, /* Upload from system memory */ - d3dfmt_get_conv(surface->container, TRUE /* We need color keying */, &format, &convert); - if (srgb) { if ((surface->locations & (WINED3D_LOCATION_TEXTURE_RGB | surface->resource.map_binding)) @@ -4569,18 +4568,23 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, context = context_acquire(device, NULL); surface_prepare_texture(surface, context, srgb); - wined3d_texture_bind_and_dirtify(surface->container, context, srgb); + wined3d_texture_bind_and_dirtify(texture, context, srgb); - if (surface->container->color_key_flags & WINEDDSD_CKSRCBLT) + if (texture->color_key_flags & WINEDDSD_CKSRCBLT) { surface->flags |= SFLAG_GLCKEY; - surface->gl_color_key = surface->container->src_blt_color_key; + surface->gl_color_key = texture->src_blt_color_key; } else surface->flags &= ~SFLAG_GLCKEY; width = surface->resource.width; src_pitch = wined3d_surface_get_pitch(surface); + format = *texture->resource.format; + d3dfmt_get_conv(texture, TRUE, &format_id, &convert); + if (convert != WINED3D_CT_NONE) + format = *wined3d_get_format(gl_info, format_id); + /* Don't use PBOs for converted surfaces. During PBO conversion we look at * SFLAG_CONVERTED but it isn't set (yet) in all cases it is getting * called. */ @@ -5562,7 +5566,7 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC RECT src_rect, dst_rect; BOOL scale, convert; enum wined3d_conversion_type dst_convert_type; - struct wined3d_format dst_conv_fmt; + enum wined3d_format_id dst_conv_fmt_id; static const DWORD simple_blit = WINEDDBLT_ASYNC | WINEDDBLT_COLORFILL @@ -5677,8 +5681,9 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC /* We want to avoid invalidating the sysmem location for converted * surfaces, since otherwise we'd have to convert the data back when * locking them. */ - d3dfmt_get_conv(dst_surface->container, TRUE, &dst_conv_fmt, &dst_convert_type); - if (dst_convert_type != WINED3D_CT_NONE || dst_conv_fmt.convert || dst_surface->flags & SFLAG_CONVERTED) + d3dfmt_get_conv(dst_surface->container, TRUE, &dst_conv_fmt_id, &dst_convert_type); + if (dst_surface->flags & SFLAG_CONVERTED || dst_surface->container->resource.format->convert + || dst_convert_type != WINED3D_CT_NONE) { WARN_(d3d_perf)("Converted surface, using CPU blit.\n"); goto cpu;

1 0

Henri Verbeet : wined3d: Get rid of d3dfmt_convert_surface().
by Alexandre Julliard 07 Oct '14

07 Oct '14

Module: wine Branch: master Commit: 6da1cff518e106fa9ec9763aa64da2d567c352d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6da1cff518e106fa9ec9763aa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 7 08:41:15 2014 +0200 wined3d: Get rid of d3dfmt_convert_surface(). --- dlls/wined3d/surface.c | 457 ++++++++++++++++++----------------------- dlls/wined3d/wined3d_private.h | 11 - 2 files changed, 199 insertions(+), 269 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6da1cff518e106fa9ec97…

1 0