March 2018 - Wine-devel - list.winehq.org

[PATCH] dmime: Make some 'stream chunk' functions static.
by Francois Gouget 15 Mar '18

15 Mar '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/dmime/dmobject.c | 6 +++--- dlls/dmime/dmobject.h | 6 ------ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/dmime/dmobject.c b/dlls/dmime/dmobject.c index 00e52f04b93..bd665d7aeb7 100644 --- a/dlls/dmime/dmobject.c +++ b/dlls/dmime/dmobject.c @@ -123,7 +123,7 @@ HRESULT stream_skip_chunk(IStream *stream, struct chunk_entry *chunk) return IStream_Seek(stream, end, STREAM_SEEK_SET, NULL); } -HRESULT stream_next_chunk(IStream *stream, struct chunk_entry *chunk) +static HRESULT stream_next_chunk(IStream *stream, struct chunk_entry *chunk) { HRESULT hr; @@ -136,7 +136,7 @@ HRESULT stream_next_chunk(IStream *stream, struct chunk_entry *chunk) return stream_get_chunk(stream, chunk); } -HRESULT stream_chunk_get_data(IStream *stream, const struct chunk_entry *chunk, void *data, +static HRESULT stream_chunk_get_data(IStream *stream, const struct chunk_entry *chunk, void *data, ULONG size) { if (chunk->size != size) { @@ -148,7 +148,7 @@ HRESULT stream_chunk_get_data(IStream *stream, const struct chunk_entry *chunk, return stream_read(stream, data, size); } -HRESULT stream_chunk_get_wstr(IStream *stream, const struct chunk_entry *chunk, WCHAR *str, +static HRESULT stream_chunk_get_wstr(IStream *stream, const struct chunk_entry *chunk, WCHAR *str, ULONG size) { ULONG len; diff --git a/dlls/dmime/dmobject.h b/dlls/dmime/dmobject.h index 2940225698e..aefa80a4122 100644 --- a/dlls/dmime/dmobject.h +++ b/dlls/dmime/dmobject.h @@ -32,14 +32,8 @@ struct chunk_entry { }; HRESULT stream_get_chunk(IStream *stream, struct chunk_entry *chunk) DECLSPEC_HIDDEN; -HRESULT stream_next_chunk(IStream *stream, struct chunk_entry *chunk) DECLSPEC_HIDDEN; HRESULT stream_skip_chunk(IStream *stream, struct chunk_entry *chunk) DECLSPEC_HIDDEN; -HRESULT stream_chunk_get_data(IStream *stream, const struct chunk_entry *chunk, void *data, - ULONG size) DECLSPEC_HIDDEN; -HRESULT stream_chunk_get_wstr(IStream *stream, const struct chunk_entry *chunk, WCHAR *str, - ULONG size) DECLSPEC_HIDDEN; - const char *debugstr_chunk(const struct chunk_entry *chunk) DECLSPEC_HIDDEN; -- 2.16.1

2 1

Move patches from wine-staging to mainline
by Kai Krakow 15 Mar '18

15 Mar '18

Hello! Since a similar discussion has come up, what would be the proposed way to suggest tested patches from staging to mainline? I'm currently carrying one or another selected (simple) patch from staging in my local patch-set that I apply to the latest wine version tag (so, I'm not running master). And these patches have proven quality for me since a view versions now. Should I just submit the patch to this list and remove Signed-off-by? Should I add Tested-by? Should I contact the original author first? Or should I add something to the subject like "PATCH suggest", and let "git send-mail" also ping the original author? Regards, Kai

4 4

[PATCH] dmime: Fix misplaced parenthesis.
by Andrey Gusev 15 Mar '18

15 Mar '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/dmime/dmobject.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmime/dmobject.c b/dlls/dmime/dmobject.c index 00e52f04b9..25f3198d2b 100644 --- a/dlls/dmime/dmobject.c +++ b/dlls/dmime/dmobject.c @@ -292,7 +292,7 @@ HRESULT dmobj_parsedescriptor(IStream *stream, const struct chunk_entry *riff, desc->dwValidData = 0; desc->dwSize = sizeof(*desc); - while ((hr = stream_next_chunk(stream, &chunk) == S_OK)) { + while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) { switch (chunk.id) { case DMUS_FOURCC_GUID_CHUNK: if ((supported & DMUS_OBJ_OBJECT) && stream_chunk_get_data(stream, &chunk, -- 2.13.6

2 1

[PATCH 5/5] usp10: Simplify GPOS_expand_script_cache().
by Henri Verbeet 15 Mar '18

15 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/usp10/opentype.c | 80 ++++++++++++++++++++++++--------------------------- 1 file changed, 37 insertions(+), 43 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 74620a38f13..521b816d07d 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -2565,6 +2565,23 @@ unsigned int OpenType_apply_GPOS_lookup(const ScriptCache *script_cache, const O lookup_index, glyphs, glyph_index, glyph_count, goffset); } +static LoadedScript *usp10_script_cache_add_script(ScriptCache *script_cache, OPENTYPE_TAG tag) +{ + LoadedScript *script; + + if (!usp10_array_reserve((void **)&script_cache->scripts, &script_cache->scripts_size, + script_cache->script_count + 1, sizeof(*script_cache->scripts))) + { + ERR("Failed to grow scripts array.\n"); + return NULL; + } + + script = &script_cache->scripts[script_cache->script_count++]; + script->tag = tag; + + return script; +} + static LoadedScript *usp10_script_cache_get_script(ScriptCache *script_cache, OPENTYPE_TAG tag) { size_t i; @@ -2610,57 +2627,34 @@ static void GSUB_initialize_script_cache(ScriptCache *psc) static void GPOS_expand_script_cache(ScriptCache *psc) { - int i, count; - const OT_ScriptList *script; - const GPOS_Header* header = (const GPOS_Header*)psc->GPOS_Table; - LoadedScript *loaded_script; + SIZE_T initial_count, count, i; + const OT_ScriptList *list; + const GPOS_Header *header; + LoadedScript *script; + OPENTYPE_TAG tag; - if (!header) + if (!(header = psc->GPOS_Table)) return; - script = (const OT_ScriptList*)((const BYTE*)header + GET_BE_WORD(header->ScriptList)); - count = GET_BE_WORD(script->ScriptCount); - - if (!count) + list = (const OT_ScriptList *)((const BYTE *)header + GET_BE_WORD(header->ScriptList)); + if (!(count = GET_BE_WORD(list->ScriptCount))) return; - if (!psc->script_count) - { - psc->script_count = count; - TRACE("initializing %li scripts in this font\n",psc->script_count); - if (psc->script_count) - { - psc->scripts = heap_alloc_zero(psc->script_count * sizeof(*psc->scripts)); - for (i = 0; i < psc->script_count; i++) - { - int offset = GET_BE_WORD(script->ScriptRecord[i].Script); - psc->scripts[i].tag = MS_MAKE_TAG(script->ScriptRecord[i].ScriptTag[0], script->ScriptRecord[i].ScriptTag[1], script->ScriptRecord[i].ScriptTag[2], script->ScriptRecord[i].ScriptTag[3]); - psc->scripts[i].gpos_table = ((const BYTE*)script + offset); - } - } - } - else + TRACE("Initialising %lu scripts in this font.\n", count); + + initial_count = psc->script_count; + for (i = 0; i < count; ++i) { - for (i = 0; i < count; i++) - { - int offset = GET_BE_WORD(script->ScriptRecord[i].Script); - OPENTYPE_TAG tag = MS_MAKE_TAG(script->ScriptRecord[i].ScriptTag[0], script->ScriptRecord[i].ScriptTag[1], script->ScriptRecord[i].ScriptTag[2], script->ScriptRecord[i].ScriptTag[3]); + tag = MS_MAKE_TAG(list->ScriptRecord[i].ScriptTag[0], + list->ScriptRecord[i].ScriptTag[1], + list->ScriptRecord[i].ScriptTag[2], + list->ScriptRecord[i].ScriptTag[3]); - if (!(loaded_script = usp10_script_cache_get_script(psc, tag))) - { - if (!usp10_array_reserve((void **)&psc->scripts, &psc->scripts_size, - psc->script_count + 1, sizeof(*psc->scripts))) - { - ERR("Failed grow scripts array.\n"); - return; - } + if (!(initial_count && (script = usp10_script_cache_get_script(psc, tag))) + && !(script = usp10_script_cache_add_script(psc, tag))) + return; - loaded_script = &psc->scripts[psc->script_count]; - ++psc->script_count; - loaded_script->tag = tag; - } - loaded_script->gpos_table = (const BYTE *)script + offset; - } + script->gpos_table = (const BYTE *)list + GET_BE_WORD(list->ScriptRecord[i].Script); } } -- 2.11.0

2 1

[PATCH 2/2] gdi32: List fonts copied to C:\Windows\Fonts in registry.
by Daniel Lehman 15 Mar '18

15 Mar '18

3 6

[PATCH] wininet: Fix https connections over proxy
by Piotr Caban 15 Mar '18

15 Mar '18

Successful CONNECT request switch to tunnel instead of having a message body. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/wininet/http.c | 2 ++ 1 file changed, 2 insertions(+)

2 1

[PATCH v2 1/7] wmp: Handle allocation failure in IWMPMedia_get_sourceURL
by Anton Romanov 15 Mar '18

15 Mar '18

Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> --- dlls/wmp/player.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index 6c68240fa8..4a0d0742fd 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -1577,9 +1577,14 @@ static HRESULT WINAPI WMPMedia_get_isIdentical(IWMPMedia *iface, IWMPMedia *othe static HRESULT WINAPI WMPMedia_get_sourceURL(IWMPMedia *iface, BSTR *pbstrSourceUrl) { WMPMedia *This = impl_from_IWMPMedia(iface); + BSTR url; TRACE("(%p)->(%p)\n", This, pbstrSourceUrl); - *pbstrSourceUrl = SysAllocString(This->url); - return S_OK; + url = SysAllocString(This->url); + if (url) { + *pbstrSourceUrl = url; + return S_OK; + } + return E_OUTOFMEMORY; } static HRESULT WINAPI WMPMedia_get_name(IWMPMedia *iface, BSTR *pbstrName) -- 2.16.2

2 7

[PATCH] ieframe: Clean up InternetExplorerManager server process.
by Zebediah Figura 15 Mar '18

15 Mar '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ieframe/iexplore.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index 23d61f9..aac1436 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -887,7 +887,10 @@ static ULONG WINAPI InternetExplorerManager_Release(IInternetExplorerManager *if TRACE("(%p) decreasing refcount to %u\n", iface, ref); if (ref == 0) + { HeapFree(GetProcessHeap(), 0, This); + released_obj(); + } return ref; } @@ -923,6 +926,7 @@ HRESULT WINAPI InternetExplorerManager_Create(IClassFactory *iface, IUnknown *pO hr = IInternetExplorerManager_QueryInterface(&ret->IInternetExplorerManager_iface, riid, ppv); IInternetExplorerManager_Release(&ret->IInternetExplorerManager_iface); + InterlockedIncrement(&obj_cnt); return hr; } -- 2.7.4

2 1

[PATCH] wmp/tests: Add a trailing '\n' to an ok() call.
by Francois Gouget 15 Mar '18

15 Mar '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/wmp/tests/oleobj.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index 937960cbafb..e4c22944363 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -956,7 +956,7 @@ static void test_wmp_ifaces(IOleObject *oleobj) SET_EXPECT(Invoke_USERMODE); hres = IWMPPlayer4_get_URL(player4, &url); ok(hres == S_OK, "IWMPPlayer4_get_URL failed: %08x\n", hres); - ok(0 == lstrcmpW(url, filename), "%s != %s", wine_dbgstr_w(url), wine_dbgstr_w(filename)); + ok(0 == lstrcmpW(url, filename), "%s != %s\n", wine_dbgstr_w(url), wine_dbgstr_w(filename)); todo_wine CHECK_CALLED(Invoke_USERMODE); SysFreeString(url); @@ -967,7 +967,7 @@ static void test_wmp_ifaces(IOleObject *oleobj) url = NULL; hres = IWMPMedia_get_sourceURL(media, &url); ok(hres == S_OK, "IWMPMedia_get_sourceURL failed: %08x\n", hres); - ok(0 == lstrcmpW(url, filename), "%s != %s", wine_dbgstr_w(url), wine_dbgstr_w(filename)); + ok(0 == lstrcmpW(url, filename), "%s != %s\n", wine_dbgstr_w(url), wine_dbgstr_w(filename)); SysFreeString(url); SET_EXPECT(GetContainer); -- 2.16.1

1 0

[PATCH] kernelbase/tests: Fix a couple of typos in skip messages.
by Francois Gouget 15 Mar '18

15 Mar '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/kernelbase/tests/path.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index 47c77b8c341..7c8851357f1 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -149,7 +149,7 @@ static void test_PathCchAddBackslash(void) if (!pPathCchAddBackslash) { - win_skip("PathCchAddBackslash() is not availale.\n"); + win_skip("PathCchAddBackslash() is not available.\n"); return; } @@ -192,7 +192,7 @@ static void test_PathCchAddBackslashEx(void) if (!pPathCchAddBackslashEx) { - win_skip("PathCchAddBackslashEx() is not availale.\n"); + win_skip("PathCchAddBackslashEx() is not available.\n"); return; } -- 2.16.1

1 0