February 2021 - Wine-Commits

Alexandre Julliard : ntdll: Remove no longer used inline function.
by Alexandre Julliard Feb. 16, 2021

Feb. 16, 2021

Module: wine Branch: master Commit: b772414328787bb3c78805cbcae5f278d1de0c8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b772414328787bb3c78805cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 16 22:35:36 2021 +0100 ntdll: Remove no longer used inline function. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 1e7f9a8b3ef..4931e407e57 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -933,15 +933,6 @@ void WINAPI RtlDestroyProcessParameters( RTL_USER_PROCESS_PARAMETERS *params ) } -static inline void get_unicode_string( UNICODE_STRING *str, WCHAR **src, UINT len ) -{ - str->Buffer = *src; - str->Length = len; - str->MaximumLength = len + sizeof(WCHAR); - *src += len / sizeof(WCHAR); -} - - /*********************************************************************** * run_wineboot */

1 0

Alistair Leslie-Hughes : msado15: _Recordset get_Fields support rowset.
by Alexandre Julliard Feb. 16, 2021

Feb. 16, 2021

Module: wine Branch: master Commit: c8e663d6b1ebba7b8e1aaca2951dbd5626ebd93e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8e663d6b1ebba7b8e1aaca2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 16 18:17:17 2021 +1100 msado15: _Recordset get_Fields support rowset. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/recordset.c | 43 +++++++++++++++++++++++++++++++++++++++++++ dlls/msado15/tests/msado15.c | 2 +- 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index e830f66e1ba..12bb9680258 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -721,6 +721,46 @@ static const ISupportErrorInfoVtbl fields_supporterrorinfo_vtbl = fields_supporterrorinfo_InterfaceSupportsErrorInfo }; +static void map_rowset_fields(struct recordset *recordset, struct fields *fields) +{ + HRESULT hr; + IColumnsInfo *columninfo; + DBORDINAL columns, i; + DBCOLUMNINFO *colinfo; + OLECHAR *stringsbuffer; + + /* Not Finding the interface or GetColumnInfo failing just causes 0 Fields to be returned */ + hr = IRowset_QueryInterface(recordset->row_set, &IID_IColumnsInfo, (void**)&columninfo); + if (FAILED(hr)) + return; + + hr = IColumnsInfo_GetColumnInfo(columninfo, &columns, &colinfo, &stringsbuffer); + if (SUCCEEDED(hr)) + { + for (i=0; i < columns; i++) + { + TRACE("Adding Column %lu, pwszName: %s, pTypeInfo %p, iOrdinal %lu, dwFlags 0x%08x, " + "ulColumnSize %lu, wType %d, bPrecision %d, bScale %d\n", + i, debugstr_w(colinfo[i].pwszName), colinfo[i].pTypeInfo, colinfo[i].iOrdinal, + colinfo[i].dwFlags, colinfo[i].ulColumnSize, colinfo[i].wType, + colinfo[i].bPrecision, colinfo[i].bScale); + + hr = append_field(fields, colinfo[i].pwszName, colinfo[i].wType, colinfo[i].ulColumnSize, + colinfo[i].dwFlags, NULL); + if (FAILED(hr)) + { + ERR("Failed to add Field name - 0x%08x\n", hr); + return; + } + } + + CoTaskMemFree(colinfo); + CoTaskMemFree(stringsbuffer); + } + + IColumnsInfo_Release(columninfo); +} + static HRESULT fields_create( struct recordset *recordset, struct fields **ret ) { struct fields *fields; @@ -732,6 +772,9 @@ static HRESULT fields_create( struct recordset *recordset, struct fields **ret ) fields->recordset = recordset; _Recordset_AddRef( &fields->recordset->Recordset_iface ); + if ( recordset->row_set ) + map_rowset_fields(recordset, fields); + *ret = fields; TRACE( "returning %p\n", *ret ); return S_OK; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 50418690613..bc9b4a24761 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -596,7 +596,7 @@ static void test_ADORecordsetConstruction(void) count = -1; hr = Fields_get_Count( fields, &count ); - todo_wine ok( count == 1, "got %d\n", count ); + ok( count == 1, "got %d\n", count ); if (count > 0) { VARIANT index;

1 0

Nikolay Sivov : dwrite: Pass features to stage functions.
by Alexandre Julliard Feb. 16, 2021

Feb. 16, 2021

Module: wine Branch: master Commit: d489f1ddff5f651a6b46f693526babc807e157f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d489f1ddff5f651a6b46f693… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 16 12:48:38 2021 +0300 dwrite: Pass features to stage functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 5 ++++- dlls/dwrite/opentype.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index fa82a8d4376..830c71f0abf 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -564,7 +564,10 @@ struct shaping_feature #define MAX_SHAPING_STAGE 16 -typedef void (*stage_func)(struct scriptshaping_context *context); +struct shaping_features; + +typedef void (*stage_func)(struct scriptshaping_context *context, + const struct shaping_features *features); struct shaping_stage { diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index afae1b69d07..125b7353031 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -6070,7 +6070,7 @@ void opentype_layout_apply_gsub_features(struct scriptshaping_context *context, } if (features->stages[j].func) - features->stages[j].func(context); + features->stages[j].func(context, features); } /* For every glyph range of [<last>.isClusterStart, <next>.isClusterStart) set corresponding

1 0

Nikolay Sivov : dwrite: Always initialize output glyph count in GetGlyphs().
by Alexandre Julliard Feb. 16, 2021

Feb. 16, 2021

Module: wine Branch: master Commit: 1b10b88d32c65716d071bdb46d4a46cf8460cecd URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b10b88d32c65716d071bdb4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 16 14:54:10 2021 +0300 dwrite: Always initialize output glyph count in GetGlyphs(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 53fb18df4c9..d0d769cb346 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1188,6 +1188,8 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, context.glyph_infos = heap_calloc(glyph_count, sizeof(*context.glyph_infos)); context.table = &context.cache->gsub; + *actual_glyph_count = 0; + scriptprops = &dwritescripts_properties[context.script]; hr = shape_get_glyphs(&context, scriptprops->scripttags); if (SUCCEEDED(hr))

1 0

Rémi Bernon : plugplay: Broadcast WM_DEVICECHANGE message asynchronously.
by Alexandre Julliard Feb. 16, 2021

Feb. 16, 2021

Module: wine Branch: master Commit: f5ca06016dbf41ea21752f34a16d9202bb7aaa02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5ca06016dbf41ea21752f34… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 15 20:42:00 2021 +0100 plugplay: Broadcast WM_DEVICECHANGE message asynchronously. It may otherwise trigger a nasty race condition, where: 1) For explorer.exe to register the CLSID_ShellWindows classes, it needs RpcSS service to be started, 2) services.exe may start WinePlugPlay service group first, waiting for its startup to complete, 3) during startup and early device enumeration, hidclass.sys may call IoSetDeviceInterfaceState, which calls plugplay_send_event [1], 4) plugplay_send_event tries to broadcast a WM_DEVICECHANGE message with BSF_QUERY, waiting for the individual threads to reply, 5) which times-out because window threads are waiting on explorer.exe to create its desktop window and reply to the WM_NULL SendMessage. This happens more likely as there is threads with message queues being started, each waiting on the desktop window to reply. Usually explorer.exe is able to reply to some messages with the implicit message processing while creating its window, but not all of them. [1] Not completely sure how, it looks like some RPC too, but before RpcSs is started? Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/plugplay/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/plugplay/main.c b/programs/plugplay/main.c index 19e02286312..1156cb9f036 100644 --- a/programs/plugplay/main.c +++ b/programs/plugplay/main.c @@ -142,8 +142,8 @@ void __cdecl plugplay_send_event( DWORD code, const BYTE *data, unsigned int siz struct listener *listener; struct event *event; - BroadcastSystemMessageW( BSF_FORCEIFHUNG | BSF_QUERY, NULL, WM_DEVICECHANGE, code, (LPARAM)data ); - BroadcastSystemMessageW( BSF_FORCEIFHUNG | BSF_QUERY, NULL, WM_DEVICECHANGE, DBT_DEVNODES_CHANGED, 0 ); + BroadcastSystemMessageW( 0, NULL, WM_DEVICECHANGE, code, (LPARAM)data ); + BroadcastSystemMessageW( 0, NULL, WM_DEVICECHANGE, DBT_DEVNODES_CHANGED, 0 ); EnterCriticalSection( &plugplay_cs );

1 0

Andrew Boyarshin : widl: Support midl_pragma default option.
by Alexandre Julliard Feb. 16, 2021

Feb. 16, 2021

Module: wine Branch: master Commit: a55a37d1dae2231d8dec9f3191449f89be0b10dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=a55a37d1dae2231d8dec9f31… Author: Andrew Boyarshin <andrew.boyarshin(a)gmail.com> Date: Tue Feb 16 20:53:52 2021 +0100 widl: Support midl_pragma default option. Signed-off-by: Andrew Boyarshin <andrew.boyarshin(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.h | 2 +- tools/widl/parser.l | 4 ++-- tools/widl/parser.y | 7 ++++++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/tools/widl/parser.h b/tools/widl/parser.h index a67b160d48a..bc0c50792e1 100644 --- a/tools/widl/parser.h +++ b/tools/widl/parser.h @@ -39,7 +39,7 @@ void pop_import(void); int is_type(const char *name); -int do_warning(char *toggle, warning_list_t *wnum); +int do_warning(const char *toggle, warning_list_t *wnum); int is_warning_enabled(int warning); extern char *temp_name; diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 946dba84cd6..3e34bc41173 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -645,7 +645,7 @@ static void warning_enable(int warning) } } -int do_warning(char *toggle, warning_list_t *wnum) +int do_warning(const char *toggle, warning_list_t *wnum) { warning_t *warning, *next; int ret = 1; @@ -658,7 +658,7 @@ int do_warning(char *toggle, warning_list_t *wnum) if(!strcmp(toggle, "disable")) LIST_FOR_EACH_ENTRY(warning, wnum, warning_t, entry) warning_disable(warning->num); - else if(!strcmp(toggle, "enable")) + else if(!strcmp(toggle, "enable") || !strcmp(toggle, "default")) LIST_FOR_EACH_ENTRY(warning, wnum, warning_t, entry) warning_enable(warning->num); else diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 6ab4f83a0ad..e9071f8290e 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -425,7 +425,12 @@ pragma_warning: tPRAGMA_WARNING '(' aIDENTIFIER ':' warnings ')' $$ = NULL; result = do_warning($3, $5); if(!result) - error_loc("expected \"disable\" or \"enable\"\n"); + error_loc("expected \"disable\", \"enable\" or \"default\"\n"); + } + | tPRAGMA_WARNING '(' tDEFAULT ':' warnings ')' + { + $$ = NULL; + do_warning("default", $5); } ;

1 0

Alexandre Julliard : kernel32: Don't use wine/server.h.
by Alexandre Julliard Feb. 16, 2021

Feb. 16, 2021

Module: wine Branch: master Commit: e11f6e0eb3d30d1c20a735bd4629341f2f8c90a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e11f6e0eb3d30d1c20a735bd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 16 11:43:40 2021 +0100 kernel32: Don't use wine/server.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/comm.c | 3 +-- dlls/kernel32/console.c | 4 ++-- dlls/kernel32/process.c | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/comm.c b/dlls/kernel32/comm.c index 209a490b623..e9dd0feac58 100644 --- a/dlls/kernel32/comm.c +++ b/dlls/kernel32/comm.c @@ -24,13 +24,12 @@ #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "winnls.h" #include "winerror.h" #include "winioctl.h" #include "ddk/ntddser.h" -#include "wine/server.h" - #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(comm); diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 7b3a07f0de5..8c61d28e8c6 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -33,11 +33,11 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "winnls.h" #include "winerror.h" #include "wincon.h" #include "wine/condrv.h" -#include "wine/server.h" #include "wine/exception.h" #include "wine/debug.h" #include "excpt.h" @@ -59,7 +59,7 @@ HWND WINAPI GetConsoleWindow(void) ret = DeviceIoControl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle, IOCTL_CONDRV_GET_INPUT_INFO, NULL, 0, &info, sizeof(info), NULL, NULL ); - return ret ? wine_server_ptr_handle(info.win) : NULL; + return ret ? LongToHandle( info.win ) : NULL; } diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 756d1ef3f87..41a5b34af19 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -36,7 +36,6 @@ #include "psapi.h" #include "ddk/wdm.h" #include "wine/exception.h" -#include "wine/server.h" #include "wine/asm.h" #include "wine/debug.h"

1 0

Nikolay Sivov : dwrite/layout: Split run shaping between two helpers.
by Alexandre Julliard Feb. 16, 2021

Feb. 16, 2021

Module: wine Branch: master Commit: 2655576be965c1c2fefcd4613c4e96c740973770 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2655576be965c1c2fefcd461… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 16 12:48:39 2021 +0300 dwrite/layout: Split run shaping between two helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 105 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 67 insertions(+), 38 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index a24752c9bff..73fe28e222a 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -934,47 +934,57 @@ fatal: return hr; } -static HRESULT layout_shape_run(struct dwrite_textlayout *layout, struct regular_layout_run *run) +struct shaping_context { + IDWriteTextAnalyzer *analyzer; + struct regular_layout_run *run; DWRITE_SHAPING_GLYPH_PROPERTIES *glyph_props; DWRITE_SHAPING_TEXT_PROPERTIES *text_props; - IDWriteTextAnalyzer *analyzer; - struct layout_range *range; - UINT32 max_count; +}; + +static void layout_shape_clear_context(struct shaping_context *context) +{ + heap_free(context->glyph_props); + heap_free(context->text_props); +} + +static HRESULT layout_shape_get_glyphs(struct dwrite_textlayout *layout, struct shaping_context *context) +{ + struct regular_layout_run *run = context->run; + unsigned int max_count; HRESULT hr; - range = get_layout_range_by_pos(layout, run->descr.textPosition); - run->descr.localeName = range->locale; + run->descr.localeName = get_layout_range_by_pos(layout, run->descr.textPosition)->locale; run->clustermap = heap_calloc(run->descr.stringLength, sizeof(*run->clustermap)); + if (!run->clustermap) + return E_OUTOFMEMORY; max_count = 3 * run->descr.stringLength / 2 + 16; run->glyphs = heap_calloc(max_count, sizeof(*run->glyphs)); - if (!run->clustermap || !run->glyphs) + if (!run->glyphs) return E_OUTOFMEMORY; - text_props = heap_calloc(run->descr.stringLength, sizeof(*text_props)); - glyph_props = heap_calloc(max_count, sizeof(*glyph_props)); - if (!text_props || !glyph_props) { - heap_free(text_props); - heap_free(glyph_props); + context->text_props = heap_calloc(run->descr.stringLength, sizeof(*context->text_props)); + context->glyph_props = heap_calloc(max_count, sizeof(*context->glyph_props)); + if (!context->text_props || !context->glyph_props) return E_OUTOFMEMORY; - } - - analyzer = get_text_analyzer(); - for (;;) { - hr = IDWriteTextAnalyzer_GetGlyphs(analyzer, run->descr.string, run->descr.stringLength, run->run.fontFace, + for (;;) + { + hr = IDWriteTextAnalyzer_GetGlyphs(context->analyzer, run->descr.string, run->descr.stringLength, run->run.fontFace, run->run.isSideways, run->run.bidiLevel & 1, &run->sa, run->descr.localeName, NULL /* FIXME */, NULL, - NULL, 0, max_count, run->clustermap, text_props, run->glyphs, glyph_props, &run->glyphcount); - if (hr == E_NOT_SUFFICIENT_BUFFER) { + NULL, 0, max_count, run->clustermap, context->text_props, run->glyphs, context->glyph_props, &run->glyphcount); + if (hr == E_NOT_SUFFICIENT_BUFFER) + { heap_free(run->glyphs); - heap_free(glyph_props); + heap_free(context->glyph_props); max_count = run->glyphcount; run->glyphs = heap_calloc(max_count, sizeof(*run->glyphs)); - glyph_props = heap_calloc(max_count, sizeof(*glyph_props)); - if (!run->glyphs || !glyph_props) { + context->glyph_props = heap_calloc(max_count, sizeof(*context->glyph_props)); + if (!run->glyphs || !context->glyph_props) + { hr = E_OUTOFMEMORY; break; } @@ -985,16 +995,20 @@ static HRESULT layout_shape_run(struct dwrite_textlayout *layout, struct regular break; } - if (FAILED(hr)) { - heap_free(text_props); - heap_free(glyph_props); + if (FAILED(hr)) WARN("%s: shaping failed, hr %#x.\n", debugstr_rundescr(&run->descr), hr); - return hr; - } run->run.glyphIndices = run->glyphs; run->descr.clusterMap = run->clustermap; + return hr; +} + +static HRESULT layout_shape_get_positions(struct dwrite_textlayout *layout, struct shaping_context *context) +{ + struct regular_layout_run *run = context->run; + HRESULT hr; + run->advances = heap_calloc(run->glyphcount, sizeof(*run->advances)); run->offsets = heap_calloc(run->glyphcount, sizeof(*run->offsets)); if (!run->advances || !run->offsets) @@ -1002,20 +1016,19 @@ static HRESULT layout_shape_run(struct dwrite_textlayout *layout, struct regular /* Get advances and offsets. */ if (is_layout_gdi_compatible(layout)) - hr = IDWriteTextAnalyzer_GetGdiCompatibleGlyphPlacements(analyzer, run->descr.string, run->descr.clusterMap, - text_props, run->descr.stringLength, run->run.glyphIndices, glyph_props, run->glyphcount, + hr = IDWriteTextAnalyzer_GetGdiCompatibleGlyphPlacements(context->analyzer, run->descr.string, run->descr.clusterMap, + context->text_props, run->descr.stringLength, run->run.glyphIndices, context->glyph_props, run->glyphcount, run->run.fontFace, run->run.fontEmSize, layout->ppdip, &layout->transform, layout->measuringmode == DWRITE_MEASURING_MODE_GDI_NATURAL, run->run.isSideways, run->run.bidiLevel & 1, &run->sa, run->descr.localeName, NULL, NULL, 0, run->advances, run->offsets); else - hr = IDWriteTextAnalyzer_GetGlyphPlacements(analyzer, run->descr.string, run->descr.clusterMap, text_props, - run->descr.stringLength, run->run.glyphIndices, glyph_props, run->glyphcount, run->run.fontFace, - run->run.fontEmSize, run->run.isSideways, run->run.bidiLevel & 1, &run->sa, run->descr.localeName, - NULL, NULL, 0, run->advances, run->offsets); - - heap_free(text_props); - heap_free(glyph_props); - if (FAILED(hr)) { + hr = IDWriteTextAnalyzer_GetGlyphPlacements(context->analyzer, run->descr.string, run->descr.clusterMap, + context->text_props, run->descr.stringLength, run->run.glyphIndices, context->glyph_props, run->glyphcount, + run->run.fontFace, run->run.fontEmSize, run->run.isSideways, run->run.bidiLevel & 1, &run->sa, + run->descr.localeName, NULL, NULL, 0, run->advances, run->offsets); + + if (FAILED(hr)) + { memset(run->advances, 0, run->glyphcount * sizeof(*run->advances)); memset(run->offsets, 0, run->glyphcount * sizeof(*run->offsets)); WARN("%s: failed to get glyph placement info, hr %#x.\n", debugstr_rundescr(&run->descr), hr); @@ -1024,6 +1037,22 @@ static HRESULT layout_shape_run(struct dwrite_textlayout *layout, struct regular run->run.glyphAdvances = run->advances; run->run.glyphOffsets = run->offsets; + return hr; +} + +static HRESULT layout_shape_run(struct dwrite_textlayout *layout, struct regular_layout_run *run) +{ + struct shaping_context context = { 0 }; + HRESULT hr; + + context.analyzer = get_text_analyzer(); + context.run = run; + + if (SUCCEEDED(hr = layout_shape_get_glyphs(layout, &context))) + hr = layout_shape_get_positions(layout, &context); + + layout_shape_clear_context(&context); + /* Special treatment for runs that don't produce visual output, shaping code adds normal glyphs for them, with valid cluster map and potentially with non-zero advances; layout code exposes those as zero width clusters. */ @@ -1032,7 +1061,7 @@ static HRESULT layout_shape_run(struct dwrite_textlayout *layout, struct regular else run->run.glyphCount = run->glyphcount; - return S_OK; + return hr; } static HRESULT layout_compute_runs(struct dwrite_textlayout *layout)

1 0

Jacek Caban : oleaut32: Use C locale in VARIANT_BstrFromReal.
by Alexandre Julliard Feb. 16, 2021

Feb. 16, 2021

Module: wine Branch: master Commit: 22a1485c08fb219444f7bb45b37c26af7c203d19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22a1485c08fb219444f7bb45… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 16 19:03:37 2021 +0100 oleaut32: Use C locale in VARIANT_BstrFromReal. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50672 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/vartype.c | 7 ++++++- include/msvcrt/corecrt_wstdio.h | 11 +++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 6793de317ac..90b3fcaa1a9 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -29,6 +29,8 @@ #include "variant.h" #include "resource.h" +#include "locale.h" + WINE_DEFAULT_DEBUG_CHANNEL(variant); extern HMODULE hProxyDll DECLSPEC_HIDDEN; @@ -6501,12 +6503,15 @@ static BSTR VARIANT_BstrReplaceDecimal(const WCHAR * buff, LCID lcid, ULONG dwFl static HRESULT VARIANT_BstrFromReal(DOUBLE dblIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut, LPCWSTR lpszFormat) { + _locale_t locale; WCHAR buff[256]; if (!pbstrOut) return E_INVALIDARG; - swprintf( buff, ARRAY_SIZE(buff), lpszFormat, dblIn ); + if (!(locale = _create_locale(LC_ALL, "C"))) return E_OUTOFMEMORY; + _swprintf_l(buff, ARRAY_SIZE(buff), lpszFormat, locale, dblIn); + _free_locale(locale); /* Negative zeroes are disallowed (some applications depend on this). If buff starts with a minus, and then nothing follows but zeroes diff --git a/include/msvcrt/corecrt_wstdio.h b/include/msvcrt/corecrt_wstdio.h index 63f411e02db..81238afafb8 100644 --- a/include/msvcrt/corecrt_wstdio.h +++ b/include/msvcrt/corecrt_wstdio.h @@ -181,6 +181,17 @@ static inline int WINAPIV swprintf_s(wchar_t *buffer, size_t size, const wchar_t return ret; } +static inline int WINAPIV _swprintf_l(wchar_t *buffer, size_t size, const wchar_t* format, _locale_t locale, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, locale); + ret = __stdio_common_vswprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, format, locale, args); + __ms_va_end(args); + return ret; +} + static inline int __cdecl _vscwprintf(const wchar_t *format, __ms_va_list args) { int ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR,

1 0

Nikolay Sivov : dwrite/layout: Grow output buffer on GetGlyphs() failure.
by Alexandre Julliard Feb. 16, 2021

Feb. 16, 2021

Module: wine Branch: master Commit: 2e0ce5b8e70bbfcf50cc415df2ed3f2ee6bac536 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e0ce5b8e70bbfcf50cc415d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 16 12:48:40 2021 +0300 dwrite/layout: Grow output buffer on GetGlyphs() failure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 73fe28e222a..12a2ce1726c 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -979,7 +979,7 @@ static HRESULT layout_shape_get_glyphs(struct dwrite_textlayout *layout, struct heap_free(run->glyphs); heap_free(context->glyph_props); - max_count = run->glyphcount; + max_count *= 2; run->glyphs = heap_calloc(max_count, sizeof(*run->glyphs)); context->glyph_props = heap_calloc(max_count, sizeof(*context->glyph_props));

1 0