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

Rémi Bernon : windows.media.speech/tests: Add interface query tests.
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: wine Branch: master Commit: f333672a97b38666ebfd18b8ce339dd6e20f4bd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f333672a97b38666ebfd18b8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 12 12:31:09 2021 +0100 windows.media.speech/tests: Add interface query tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/windows.media.speech/tests/Makefile.in | 5 + dlls/windows.media.speech/tests/statics.c | 176 ++++++++++++++++++++++++++++ 4 files changed, 183 insertions(+) diff --git a/configure b/configure index 4d85a6e9523..15cac0ea020 100755 --- a/configure +++ b/configure @@ -21124,6 +21124,7 @@ wine_fn_config_makefile dlls/win87em.dll16 enable_win16 wine_fn_config_makefile dlls/winaspi.dll16 enable_win16 wine_fn_config_makefile dlls/windebug.dll16 enable_win16 wine_fn_config_makefile dlls/windows.media.speech enable_windows_media_speech +wine_fn_config_makefile dlls/windows.media.speech/tests enable_tests wine_fn_config_makefile dlls/windowscodecs enable_windowscodecs wine_fn_config_makefile dlls/windowscodecs/tests enable_tests wine_fn_config_makefile dlls/windowscodecsext enable_windowscodecsext diff --git a/configure.ac b/configure.ac index 9d8488113a4..8c092fb020c 100644 --- a/configure.ac +++ b/configure.ac @@ -3802,6 +3802,7 @@ WINE_CONFIG_MAKEFILE(dlls/win87em.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/winaspi.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/windebug.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/windows.media.speech) +WINE_CONFIG_MAKEFILE(dlls/windows.media.speech/tests) WINE_CONFIG_MAKEFILE(dlls/windowscodecs) WINE_CONFIG_MAKEFILE(dlls/windowscodecs/tests) WINE_CONFIG_MAKEFILE(dlls/windowscodecsext) diff --git a/dlls/windows.media.speech/tests/Makefile.in b/dlls/windows.media.speech/tests/Makefile.in new file mode 100644 index 00000000000..fad32174647 --- /dev/null +++ b/dlls/windows.media.speech/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = windows.media.speech.dll +IMPORTS = uuid + +C_SRCS = \ + statics.c diff --git a/dlls/windows.media.speech/tests/statics.c b/dlls/windows.media.speech/tests/statics.c new file mode 100644 index 00000000000..02bb267dc06 --- /dev/null +++ b/dlls/windows.media.speech/tests/statics.c @@ -0,0 +1,176 @@ +/* + * Copyright 2021 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#define COBJMACROS +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "winstring.h" + +#include "initguid.h" +#include "roapi.h" + +#define WIDL_using_Windows_Foundation +#define WIDL_using_Windows_Foundation_Collections +#include "windows.foundation.h" +#define WIDL_using_Windows_Media_SpeechSynthesis +#include "windows.media.speechsynthesis.h" + +#include "wine/test.h" + +static HRESULT (WINAPI *pRoActivateInstance)(HSTRING, IInspectable **); +static HRESULT (WINAPI *pRoGetActivationFactory)(HSTRING, REFIID, void **); +static HRESULT (WINAPI *pRoInitialize)(RO_INIT_TYPE); +static void (WINAPI *pRoUninitialize)(void); +static HRESULT (WINAPI *pWindowsCreateString)(LPCWSTR, UINT32, HSTRING *); +static HRESULT (WINAPI *pWindowsDeleteString)(HSTRING); + +static void test_SpeechSynthesizer(void) +{ + static const WCHAR *speech_synthesizer_name = L"Windows.Media.SpeechSynthesis.SpeechSynthesizer"; + + IVectorView_VoiceInformation *voices = NULL; + IInstalledVoicesStatic *voices_static = NULL; + IActivationFactory *factory = NULL; + IInspectable *inspectable = NULL, *tmp_inspectable = NULL; + IAgileObject *agile_object = NULL, *tmp_agile_object = NULL; + HSTRING str; + HRESULT hr; + ULONG rc, size; + + hr = pRoInitialize(RO_INIT_MULTITHREADED); + ok(SUCCEEDED(hr), "RoInitialize failed, hr %#x\n", hr); + + hr = pWindowsCreateString(speech_synthesizer_name, wcslen(speech_synthesizer_name), &str); + ok(SUCCEEDED(hr), "WindowsCreateString failed, hr %#x\n", hr); + + hr = pRoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); + ok(SUCCEEDED(hr), "RoGetActivationFactory failed, hr %#x\n", hr); + + rc = IActivationFactory_AddRef(factory); + ok(rc == 3, "IActivationFactory_AddRef returned %d\n", rc); + rc = IActivationFactory_Release(factory); + ok(rc == 2, "IActivationFactory_Release returned %d\n", rc); + + hr = IActivationFactory_QueryInterface(factory, &IID_IInspectable, (void **)&inspectable); + ok(SUCCEEDED(hr), "IActivationFactory_QueryInterface IID_IInspectable failed, hr %#x\n", hr); + + hr = IActivationFactory_QueryInterface(factory, &IID_IAgileObject, (void **)&agile_object); + ok(SUCCEEDED(hr), "IActivationFactory_QueryInterface IID_IAgileObject failed, hr %#x\n", hr); + + hr = IActivationFactory_QueryInterface(factory, &IID_IInstalledVoicesStatic, (void **)&voices_static); + todo_wine ok(SUCCEEDED(hr), "IActivationFactory_QueryInterface IID_IInstalledVoicesStatic failed, hr %#x\n", hr); + if (FAILED(hr)) goto done; + + hr = IInstalledVoicesStatic_QueryInterface(voices_static, &IID_IInspectable, (void **)&tmp_inspectable); + ok(SUCCEEDED(hr), "IInstalledVoicesStatic_QueryInterface IID_IInspectable failed, hr %#x\n", hr); + ok(tmp_inspectable == inspectable, "IInstalledVoicesStatic_QueryInterface IID_IInspectable returned %p, expected %p\n", tmp_inspectable, inspectable); + IInspectable_Release(tmp_inspectable); + + hr = IInstalledVoicesStatic_QueryInterface(voices_static, &IID_IAgileObject, (void **)&tmp_agile_object); + ok(SUCCEEDED(hr), "IInstalledVoicesStatic_QueryInterface IID_IAgileObject failed, hr %#x\n", hr); + ok(tmp_agile_object == agile_object, "IInstalledVoicesStatic_QueryInterface IID_IAgileObject returned %p, expected %p\n", tmp_agile_object, agile_object); + IAgileObject_Release(tmp_agile_object); + + hr = IInstalledVoicesStatic_get_AllVoices(voices_static, &voices); + ok(SUCCEEDED(hr), "IInstalledVoicesStatic_get_AllVoices failed, hr %#x\n", hr); + + hr = IVectorView_VoiceInformation_QueryInterface(voices, &IID_IInspectable, (void **)&tmp_inspectable); + ok(SUCCEEDED(hr), "IVectorView_VoiceInformation_QueryInterface voices failed, hr %#x\n", hr); + ok(tmp_inspectable != inspectable, "IVectorView_VoiceInformation_QueryInterface voices returned %p, expected %p\n", tmp_inspectable, inspectable); + IInspectable_Release(tmp_inspectable); + + hr = IVectorView_VoiceInformation_QueryInterface(voices, &IID_IAgileObject, (void **)&tmp_agile_object); + ok(FAILED(hr), "IVectorView_VoiceInformation_QueryInterface voices failed, hr %#x\n", hr); + + size = 0xdeadbeef; + hr = IVectorView_VoiceInformation_get_Size(voices, &size); + ok(SUCCEEDED(hr), "IVectorView_VoiceInformation_QueryInterface voices failed, hr %#x\n", hr); + ok(size != 0 && size != 0xdeadbeef, "IVectorView_VoiceInformation_get_Size returned %u\n", size); + + rc = IVectorView_VoiceInformation_Release(voices); + ok(rc == 0, "IVectorView_VoiceInformation_Release returned unexpected refcount %d\n", rc); + + rc = IInstalledVoicesStatic_Release(voices_static); + ok(rc == 4, "IInstalledVoicesStatic_Release returned unexpected refcount %d\n", rc); + +done: + rc = IAgileObject_Release(agile_object); + ok(rc == 3, "IAgileObject_Release returned unexpected refcount %d\n", rc); + rc = IInspectable_Release(inspectable); + ok(rc == 2, "IInspectable_Release returned unexpected refcount %d\n", rc); + rc = IActivationFactory_Release(factory); + ok(rc == 1, "IActivationFactory_Release returned unexpected refcount %d\n", rc); + + pWindowsDeleteString(str); + + pRoUninitialize(); +} + +static void test_VoiceInformation(void) +{ + static const WCHAR *voice_information_name = L"Windows.Media.SpeechSynthesis.VoiceInformation"; + + IActivationFactory *factory = NULL; + HSTRING str; + HRESULT hr; + + hr = pRoInitialize(RO_INIT_MULTITHREADED); + ok(SUCCEEDED(hr), "RoInitialize failed, hr %#x\n", hr); + + hr = pWindowsCreateString(voice_information_name, wcslen(voice_information_name), &str); + ok(SUCCEEDED(hr), "WindowsCreateString failed, hr %#x\n", hr); + + hr = pRoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); + todo_wine ok(hr == REGDB_E_CLASSNOTREG, "RoGetActivationFactory returned unexpected hr %#x\n", hr); + if (SUCCEEDED(hr)) IActivationFactory_Release(factory); + + pWindowsDeleteString(str); + + pRoUninitialize(); +} + +START_TEST(statics) +{ + HMODULE combase; + + if (!(combase = LoadLibraryW(L"combase.dll"))) + { + win_skip("Failed to load combase.dll, skipping tests\n"); + return; + } + +#define LOAD_FUNCPTR(x) \ + if (!(p##x = (void*)GetProcAddress(combase, #x))) \ + { \ + win_skip("Failed to find %s in combase.dll, skipping tests.\n", #x); \ + return; \ + } + + LOAD_FUNCPTR(RoActivateInstance); + LOAD_FUNCPTR(RoGetActivationFactory); + LOAD_FUNCPTR(RoInitialize); + LOAD_FUNCPTR(RoUninitialize); + LOAD_FUNCPTR(WindowsCreateString); + LOAD_FUNCPTR(WindowsDeleteString); +#undef LOAD_FUNCPTR + + test_SpeechSynthesizer(); + test_VoiceInformation(); +}

1 0

Jacek Caban : jscript: Add String.prototype.toLocaleUpperCase and toLocaleLowerCase implementation.
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: wine Branch: master Commit: 07cebfc9289d924bc3646d679b5d0628c7bf204e URL: https://source.winehq.org/git/wine.git/?a=commit;h=07cebfc9289d924bc3646d67… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 15 18:19:26 2021 +0100 jscript: Add String.prototype.toLocaleUpperCase and toLocaleLowerCase implementation. They are supposed to be locale-specific, but my testing shows that it's not the case in native. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/string.c | 36 +++++++++++++++++++++++------------- dlls/jscript/tests/api.js | 8 ++++++++ 2 files changed, 31 insertions(+), 13 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index a8bd77dc398..4f6d8cd194d 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1363,13 +1363,11 @@ static HRESULT String_sup(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsign return do_attributeless_tag_format(ctx, jsthis, r, L"SUP"); } -static HRESULT String_toLowerCase(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) +static HRESULT to_upper_case(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t *r) { jsstr_t *str; - HRESULT hres; + HRESULT hres; - TRACE("\n"); hres = get_string_val(ctx, jsthis, &str); if(FAILED(hres)) @@ -1387,7 +1385,7 @@ static HRESULT String_toLowerCase(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags } jsstr_flush(str, buf); - for (; len--; buf++) *buf = towlower(*buf); + for (; len--; buf++) *buf = towupper(*buf); *r = jsval_string(ret); } @@ -1395,13 +1393,11 @@ static HRESULT String_toLowerCase(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags return S_OK; } -static HRESULT String_toUpperCase(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) +static HRESULT to_lower_case(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t *r) { jsstr_t *str; HRESULT hres; - TRACE("\n"); hres = get_string_val(ctx, jsthis, &str); if(FAILED(hres)) @@ -1419,7 +1415,7 @@ static HRESULT String_toUpperCase(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags } jsstr_flush(str, buf); - for (; len--; buf++) *buf = towupper(*buf); + for (; len--; buf++) *buf = towlower(*buf); *r = jsval_string(ret); } @@ -1427,18 +1423,32 @@ static HRESULT String_toUpperCase(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags return S_OK; } +static HRESULT String_toLowerCase(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + TRACE("\n"); + return to_lower_case(ctx, jsthis, r); +} + +static HRESULT String_toUpperCase(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + TRACE("\n"); + return to_upper_case(ctx, jsthis, r); +} + static HRESULT String_toLocaleLowerCase(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return to_lower_case(ctx, jsthis, r); } static HRESULT String_toLocaleUpperCase(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return to_upper_case(ctx, jsthis, r); } static HRESULT String_trim(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index da0ad1e1ebc..564dfc16f30 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -753,10 +753,14 @@ tmp = "test".toLowerCase(3); ok(tmp === "test", "''.toLowerCase(3) = " + tmp); tmp = "tEsT".toLowerCase(); ok(tmp === "test", "''.toLowerCase() = " + tmp); +tmp = "tEsT".toLocaleLowerCase(); +ok(tmp === "test", "''.toLocaleLowerCase() = " + tmp); tmp = "tEsT".toLowerCase(3); ok(tmp === "test", "''.toLowerCase(3) = " + tmp); tmp = ("tE" + String.fromCharCode(0) + "sT").toLowerCase(); ok(tmp === "te" + String.fromCharCode(0) + "st", "''.toLowerCase() = " + tmp); +ok(String.prototype.toLocaleLowerCase != String.prototype.toLowerCase, + "String.prototype.toLocaleLowerCase == String.prototype.toLowerCase"); tmp = "".toUpperCase(); ok(tmp === "", "''.toUpperCase() = " + tmp); @@ -768,8 +772,12 @@ tmp = "tEsT".toUpperCase(); ok(tmp === "TEST", "''.toUpperCase() = " + tmp); tmp = "tEsT".toUpperCase(3); ok(tmp === "TEST", "''.toUpperCase(3) = " + tmp); +tmp = "tEsT".toLocaleUpperCase(3); +ok(tmp === "TEST", "''.toLocaleUpperCase(3) = " + tmp); tmp = ("tE" + String.fromCharCode(0) + "sT").toUpperCase(); ok(tmp === "TE" + String.fromCharCode(0) + "ST", "''.toUpperCase() = " + tmp); +ok(String.prototype.toLocaleUpperCase != String.prototype.toUpperCase, + "String.prototype.toLocaleUpperCase == String.prototype.toUpperCase"); tmp = "".anchor(); ok(tmp === "<A NAME=\"undefined\"></A>", "''.anchor() = " + tmp);

1 0

Nikolay Sivov : dwrite: Request one glyph outline at a time in GetGlyphRunOutline().
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: wine Branch: master Commit: 0ed0fd05c3364bb78a1ccb6ff0cb63c00283c697 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ed0fd05c3364bb78a1ccb6f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 15 10:36:51 2021 +0300 dwrite: Request one glyph outline at a time in GetGlyphRunOutline(). 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/font.c | 39 ++++++++++++++++++++-- dlls/dwrite/freetype.c | 79 +++++++++++--------------------------------- 3 files changed, 57 insertions(+), 66 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 8c09a315f54..fe1a16c8899 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -463,9 +463,8 @@ extern void release_freetype(void) DECLSPEC_HIDDEN; extern HRESULT freetype_get_design_glyph_metrics(struct dwrite_fontface *fontface, UINT16 glyph, DWRITE_GLYPH_METRICS *metrics) DECLSPEC_HIDDEN; extern void freetype_notify_cacheremove(IDWriteFontFace5 *fontface) DECLSPEC_HIDDEN; -extern HRESULT freetype_get_glyphrun_outline(IDWriteFontFace5 *fontface, float emsize, UINT16 const *glyphs, - float const *advances, DWRITE_GLYPH_OFFSET const *offsets, unsigned int count, BOOL is_rtl, - IDWriteGeometrySink *sink) DECLSPEC_HIDDEN; +extern HRESULT freetype_get_glyph_outline(IDWriteFontFace5 *fontface, float emSize, UINT16 glyph, + D2D1_POINT_2F origin, IDWriteGeometrySink *sink) DECLSPEC_HIDDEN; extern UINT16 freetype_get_glyphcount(IDWriteFontFace5 *fontface) DECLSPEC_HIDDEN; extern void freetype_get_glyph_bbox(struct dwrite_glyphbitmap *bitmap_desc) DECLSPEC_HIDDEN; extern BOOL freetype_get_glyph_bitmap(struct dwrite_glyphbitmap*) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index e5050476938..0167878e912 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -827,16 +827,49 @@ static HRESULT WINAPI dwritefontface_GetGlyphRunOutline(IDWriteFontFace5 *iface, UINT16 const *glyphs, FLOAT const* advances, DWRITE_GLYPH_OFFSET const *offsets, UINT32 count, BOOL is_sideways, BOOL is_rtl, IDWriteGeometrySink *sink) { + D2D1_POINT_2F *origins, baseline_origin = { 0 }; + DWRITE_GLYPH_RUN run; + unsigned int i; + HRESULT hr; + TRACE("%p, %.8e, %p, %p, %p, %u, %d, %d, %p.\n", iface, emSize, glyphs, advances, offsets, count, is_sideways, is_rtl, sink); if (!glyphs || !sink) return E_INVALIDARG; - if (is_sideways) - FIXME("sideways mode is not supported.\n"); + if (!count) + return S_OK; - return freetype_get_glyphrun_outline(iface, emSize, glyphs, advances, offsets, count, is_rtl, sink); + run.fontFace = (IDWriteFontFace *)iface; + run.fontEmSize = emSize; + run.glyphCount = count; + run.glyphIndices = glyphs; + run.glyphAdvances = advances; + run.glyphOffsets = offsets; + run.isSideways = is_sideways; + run.bidiLevel = is_rtl ? 1 : 0; + + if (!(origins = heap_alloc(sizeof(*origins) * count))) + return E_OUTOFMEMORY; + + if (FAILED(hr = compute_glyph_origins(&run, DWRITE_MEASURING_MODE_NATURAL, baseline_origin, NULL, origins))) + { + heap_free(origins); + return hr; + } + + ID2D1SimplifiedGeometrySink_SetFillMode(sink, D2D1_FILL_MODE_WINDING); + + for (i = 0; i < count; ++i) + { + if (FAILED(hr = freetype_get_glyph_outline(iface, emSize, glyphs[i], origins[i], sink))) + WARN("Failed to get glyph outline for glyph %u.\n", glyphs[i]); + } + + heap_free(origins); + + return S_OK; } static DWRITE_RENDERING_MODE fontface_renderingmode_from_measuringmode(DWRITE_MEASURING_MODE measuring, diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index b770caac479..83b2ae1bc88 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -464,20 +464,14 @@ static void embolden_glyph(FT_Glyph glyph, FLOAT emsize) embolden_glyph_outline(&outline_glyph->outline, emsize); } -HRESULT freetype_get_glyphrun_outline(IDWriteFontFace5 *fontface, float emSize, UINT16 const *glyphs, - float const *advances, DWRITE_GLYPH_OFFSET const *offsets, unsigned int count, BOOL is_rtl, - IDWriteGeometrySink *sink) +HRESULT freetype_get_glyph_outline(IDWriteFontFace5 *fontface, float emSize, UINT16 glyph, + D2D1_POINT_2F origin, IDWriteGeometrySink *sink) { FTC_ScalerRec scaler; USHORT simulations; HRESULT hr = S_OK; FT_Size size; - if (!count) - return S_OK; - - ID2D1SimplifiedGeometrySink_SetFillMode(sink, D2D1_FILL_MODE_WINDING); - simulations = IDWriteFontFace5_GetSimulations(fontface); scaler.face_id = fontface; @@ -490,56 +484,22 @@ HRESULT freetype_get_glyphrun_outline(IDWriteFontFace5 *fontface, float emSize, EnterCriticalSection(&freetype_cs); if (pFTC_Manager_LookupSize(cache_manager, &scaler, &size) == 0) { - D2D1_POINT_2F origin; - unsigned int i; - - origin.x = origin.y = 0.0f; - for (i = 0; i < count; ++i) + if (pFT_Load_Glyph(size->face, glyph, FT_LOAD_NO_BITMAP) == 0) { - if (pFT_Load_Glyph(size->face, glyphs[i], FT_LOAD_NO_BITMAP) == 0) - { - FLOAT ft_advance = size->face->glyph->metrics.horiAdvance >> 6; - FT_Outline *outline = &size->face->glyph->outline; - D2D1_POINT_2F glyph_origin; - FT_Matrix m; - - if (simulations & DWRITE_FONT_SIMULATIONS_BOLD) - embolden_glyph_outline(outline, emSize); - - m.xx = 1 << 16; - m.xy = simulations & DWRITE_FONT_SIMULATIONS_OBLIQUE ? (1 << 16) / 3 : 0; - m.yx = 0; - m.yy = -(1 << 16); /* flip Y axis */ - - pFT_Outline_Transform(outline, &m); - - glyph_origin = origin; - - if (is_rtl) - { - glyph_origin.x -= ft_advance; - - if (offsets) - { - glyph_origin.x -= offsets[i].advanceOffset; - glyph_origin.y -= offsets[i].ascenderOffset; - } - - origin.x -= advances ? advances[i] : ft_advance; - } - else - { - if (offsets) - { - glyph_origin.x += offsets[i].advanceOffset; - glyph_origin.y -= offsets[i].ascenderOffset; - } - - origin.x += advances ? advances[i] : ft_advance; - } - - decompose_outline(outline, glyph_origin, sink); - } + FT_Outline *outline = &size->face->glyph->outline; + FT_Matrix m; + + if (simulations & DWRITE_FONT_SIMULATIONS_BOLD) + embolden_glyph_outline(outline, emSize); + + m.xx = 1 << 16; + m.xy = simulations & DWRITE_FONT_SIMULATIONS_OBLIQUE ? (1 << 16) / 3 : 0; + m.yx = 0; + m.yy = -(1 << 16); /* flip Y axis */ + + pFT_Outline_Transform(outline, &m); + + decompose_outline(outline, origin, sink); } } else @@ -837,9 +797,8 @@ HRESULT freetype_get_design_glyph_metrics(struct dwrite_fontface *fontface, UINT return E_NOTIMPL; } -HRESULT freetype_get_glyphrun_outline(IDWriteFontFace5 *fontface, float emSize, UINT16 const *glyphs, - float const *advances, DWRITE_GLYPH_OFFSET const *offsets, unsigned int count, BOOL is_rtl, - IDWriteGeometrySink *sink) +HRESULT freetype_get_glyph_outline(IDWriteFontFace5 *fontface, float emSize, UINT16 glyph, + D2D1_POINT_2F origin, IDWriteGeometrySink *sink) { return E_NOTIMPL; }

1 0

Roberto Pungartnik : po: Update Spanish translation.
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: wine Branch: master Commit: aba849eb55453b439913334e394f69c681b01edd URL: https://source.winehq.org/git/wine.git/?a=commit;h=aba849eb55453b439913334e… Author: Roberto Pungartnik <rpungartnik(a)gmail.com> Date: Sat Mar 13 21:51:08 2021 -0300 po: Update Spanish translation. Signed-off-by: Roberto Pungartnik <rpungartnik(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/es.po | 728 ++++++++++++++++----------------------------------------------- 1 file changed, 182 insertions(+), 546 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aba849eb55453b439913…

1 0

Nikolay Sivov : d2d1: Implement d2d_geometry_group_GetBounds().
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: wine Branch: master Commit: 1cd678d6a0638698f27f9f3e4a1f42bb566e524f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cd678d6a0638698f27f9f3e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 15 10:38:15 2021 +0300 d2d1: Implement d2d_geometry_group_GetBounds(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50411 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 19 +++++++++++++++++-- dlls/d2d1/tests/d2d1.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index c32de310353..6da93de3eb4 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -4880,9 +4880,24 @@ static void STDMETHODCALLTYPE d2d_geometry_group_GetFactory(ID2D1GeometryGroup * static HRESULT STDMETHODCALLTYPE d2d_geometry_group_GetBounds(ID2D1GeometryGroup *iface, const D2D1_MATRIX_3X2_F *transform, D2D1_RECT_F *bounds) { - FIXME("iface %p, transform %p, bounds %p stub!.\n", iface, transform, bounds); + struct d2d_geometry *geometry = impl_from_ID2D1GeometryGroup(iface); + D2D1_RECT_F rect; + unsigned int i; - return E_NOTIMPL; + TRACE("iface %p, transform %p, bounds %p.\n", iface, transform, bounds); + + bounds->left = FLT_MAX; + bounds->top = FLT_MAX; + bounds->right = -FLT_MAX; + bounds->bottom = -FLT_MAX; + + for (i = 0; i < geometry->u.group.geometry_count; ++i) + { + if (SUCCEEDED(ID2D1Geometry_GetBounds(geometry->u.group.src_geometries[i], transform, &rect))) + d2d_rect_union(bounds, &rect); + } + + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_geometry_group_GetWidenedBounds(ID2D1GeometryGroup *iface, diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 1dc7a27ca5b..a046a21c7f6 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9566,6 +9566,54 @@ static void test_colour_space(BOOL d3d11) } } +static void test_geometry_group(BOOL d3d11) +{ + ID2D1Factory *factory; + ID2D1GeometryGroup *group; + ID2D1Geometry *geometries[2]; + D2D1_RECT_F rect; + HRESULT hr; + D2D1_MATRIX_3X2_F matrix; + BOOL match; + + hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); + ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr); + + set_rect(&rect, -1.0f, -1.0f, 1.0f, 1.0f); + hr = ID2D1Factory_CreateRectangleGeometry(factory, &rect, (ID2D1RectangleGeometry **)&geometries[0]); + ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr); + + set_rect(&rect, -2.0f, -2.0f, 0.0f, 2.0f); + hr = ID2D1Factory_CreateRectangleGeometry(factory, &rect, (ID2D1RectangleGeometry **)&geometries[1]); + ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr); + + hr = ID2D1Factory_CreateGeometryGroup(factory, D2D1_FILL_MODE_ALTERNATE, geometries, 2, &group); + ok(SUCCEEDED(hr), "Failed to create geometry group, hr %#x.\n", hr); + + set_rect(&rect, 0.0f, 0.0f, 0.0f, 0.0f); + hr = ID2D1GeometryGroup_GetBounds(group, NULL, &rect); + ok(SUCCEEDED(hr), "Failed to get geometry group bounds, hr %#x.\n", hr); + match = compare_rect(&rect, -2.0f, -2.0f, 1.0f, 2.0f, 0); + ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n", + rect.left, rect.top, rect.right, rect.bottom); + + set_matrix_identity(&matrix); + translate_matrix(&matrix, 80.0f, 640.0f); + scale_matrix(&matrix, 2.0f, 0.5f); + hr = ID2D1GeometryGroup_GetBounds(group, &matrix, &rect); + ok(SUCCEEDED(hr), "Failed to get geometry group bounds, hr %#x.\n", hr); + match = compare_rect(&rect, 76.0f, 639.0f, 82.0f, 641.0f, 0); + ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n", + rect.left, rect.top, rect.right, rect.bottom); + + ID2D1GeometryGroup_Release(group); + + ID2D1Geometry_Release(geometries[0]); + ID2D1Geometry_Release(geometries[1]); + + ID2D1Factory_Release(factory); +} + START_TEST(d2d1) { HMODULE d2d1_dll = GetModuleHandleA("d2d1.dll"); @@ -9625,6 +9673,7 @@ START_TEST(d2d1) queue_test(test_wic_bitmap_format); queue_d3d10_test(test_math); queue_d3d10_test(test_colour_space); + queue_test(test_geometry_group); run_queued_tests(); }

1 0

Huw Davies : riched20: Handle EM_GETLINE's unicode conversion in the host.
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: wine Branch: master Commit: e4c38944d83191dc0de525cd212a7972aca862c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4c38944d83191dc0de525cd… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 15 10:03:17 2021 +0000 riched20: Handle EM_GETLINE's unicode conversion in the host. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 24 +++++------------------- dlls/riched20/txthost.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 19 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index eb1ec78d962..c27a691de4f 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4030,11 +4030,9 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, const unsigned int nMaxChars = *(WORD *) lParam; unsigned int nCharsLeft = nMaxChars; char *dest = (char *) lParam; - BOOL wroteNull = FALSE; ME_Cursor start, end; - TRACE("EM_GETLINE: row=%d, nMaxChars=%d (%s)\n", (int) wParam, nMaxChars, - unicode ? "Unicode" : "Ansi"); + TRACE( "EM_GETLINE: row=%d, nMaxChars=%d\n", (int)wParam, nMaxChars ); row = row_from_row_number( editor, wParam ); if (row == NULL) return 0; @@ -4052,30 +4050,18 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, str = get_text( run, ofs ); nCopy = min( nCharsLeft, len ); - if (unicode) - memcpy(dest, str, nCopy * sizeof(WCHAR)); - else - nCopy = WideCharToMultiByte(CP_ACP, 0, str, nCopy, dest, - nCharsLeft, NULL, NULL); - dest += nCopy * (unicode ? sizeof(WCHAR) : 1); + memcpy(dest, str, nCopy * sizeof(WCHAR)); + dest += nCopy * sizeof(WCHAR); nCharsLeft -= nCopy; if (run == end.run) break; run = row_next_run( row, run ); } /* append line termination, space allowing */ - if (nCharsLeft > 0) - { - if (unicode) - *((WCHAR *)dest) = '\0'; - else - *dest = '\0'; - nCharsLeft--; - wroteNull = TRUE; - } + if (nCharsLeft > 0) *((WCHAR *)dest) = '\0'; TRACE("EM_GETLINE: got %u characters\n", nMaxChars - nCharsLeft); - return nMaxChars - nCharsLeft - (wroteNull ? 1 : 0); + return nMaxChars - nCharsLeft; } case EM_GETLINECOUNT: { diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index d249137d829..a10b77e8ebb 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -753,6 +753,32 @@ static BOOL create_windowed_editor( HWND hwnd, CREATESTRUCTW *create, BOOL emula return TRUE; } +static HRESULT get_lineA( ITextServices *text_srv, WPARAM wparam, LPARAM lparam, LRESULT *res ) +{ + LRESULT len = USHRT_MAX; + WORD sizeA; + HRESULT hr; + WCHAR *buf; + + *res = 0; + sizeA = *(WORD *)lparam; + *(WORD *)lparam = 0; + if (!sizeA) return S_OK; + buf = heap_alloc( len * sizeof(WCHAR) ); + if (!buf) return E_OUTOFMEMORY; + *(WORD *)buf = len; + hr = ITextServices_TxSendMessage( text_srv, EM_GETLINE, wparam, (LPARAM)buf, &len ); + if (hr == S_OK && len) + { + len = WideCharToMultiByte( CP_ACP, 0, buf, len, (char *)lparam, sizeA, NULL, NULL ); + if (!len && GetLastError() == ERROR_INSUFFICIENT_BUFFER) len = sizeA; + if (len < sizeA) ((char *)lparam)[len] = '\0'; + *res = len; + } + heap_free( buf ); + return hr; +} + static HRESULT get_text_rangeA( struct host *host, TEXTRANGEA *rangeA, LRESULT *res ) { TEXTRANGEW range; @@ -871,6 +897,11 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, } break; } + case EM_GETLINE: + if (unicode) hr = ITextServices_TxSendMessage( host->text_srv, msg, wparam, lparam, &res ); + else hr = get_lineA( host->text_srv, wparam, lparam, &res ); + break; + case WM_GETTEXT: { GETTEXTEX params;

1 0

Huw Davies : riched20: Handle EM_GETSELTEXT's unicode conversion in the host.
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: wine Branch: master Commit: dc6434959ea05d5dc715e0de01c630dff509717d URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc6434959ea05d5dc715e0de… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 15 10:03:18 2021 +0000 riched20: Handle EM_GETSELTEXT's unicode conversion in the host. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 24 ++++++------------------ dlls/riched20/tests/editor.c | 4 ++-- dlls/riched20/txthost.c | 14 ++++++++++++++ dlls/riched32/tests/editor.c | 6 +++--- 4 files changed, 25 insertions(+), 23 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index c27a691de4f..994e91ce3d5 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2132,22 +2132,11 @@ static int ME_GetTextEx(ME_TextEditor *editor, GETTEXTEX *ex, LPARAM pText) } } -static int ME_GetTextRange(ME_TextEditor *editor, WCHAR *strText, - const ME_Cursor *start, int nLen, BOOL unicode) +static int get_text_range( ME_TextEditor *editor, WCHAR *buffer, + const ME_Cursor *start, int len ) { - if (!strText) return 0; - if (unicode) { - return ME_GetTextW(editor, strText, INT_MAX, start, nLen, FALSE, FALSE); - } else { - int nChars; - WCHAR *p = heap_alloc((nLen+1) * sizeof(*p)); - if (!p) return 0; - nChars = ME_GetTextW(editor, p, nLen, start, nLen, FALSE, FALSE); - WideCharToMultiByte(CP_ACP, 0, p, nChars+1, (char *)strText, - nLen+1, NULL, NULL); - heap_free(p); - return nChars; - } + if (!buffer) return 0; + return ME_GetTextW( editor, buffer, INT_MAX, start, len, FALSE, FALSE ); } int set_selection( ME_TextEditor *editor, int to, int from ) @@ -3991,8 +3980,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, { int nFrom, nTo, nStartCur = ME_GetSelectionOfs(editor, &nFrom, &nTo); ME_Cursor *from = &editor->pCursors[nStartCur]; - return ME_GetTextRange(editor, (WCHAR *)lParam, from, - nTo - nFrom, unicode); + return get_text_range( editor, (WCHAR *)lParam, from, nTo - nFrom ); } case EM_GETSCROLLPOS: { @@ -4021,7 +4009,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, if (nStart >= nEnd) return 0; cursor_from_char_ofs( editor, nStart, &start ); - return ME_GetTextRange( editor, rng->lpstrText, &start, nEnd - nStart, TRUE ); + return get_text_range( editor, rng->lpstrText, &start, nEnd - nStart ); } case EM_GETLINE: { diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 170c29f186e..1ce94f8ae64 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1828,8 +1828,8 @@ static void test_EM_GETSELTEXT(void) SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"abcdef\x8e\xf0ghijk"); SendMessageA(hwndRichEdit, EM_SETSEL, 4, 8); result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffer); - todo_wine ok(result == 5, "EM_GETSELTEXT returned %ld\n", result); - todo_wine ok(!strcmp("ef\x8e\xf0g", buffer), "EM_GETSELTEXT filled %s\n", buffer); + ok(result == 5, "EM_GETSELTEXT returned %ld\n", result); + ok(!strcmp("ef\x8e\xf0g", buffer), "EM_GETSELTEXT filled %s\n", buffer); } DestroyWindow(hwndRichEdit); diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index a10b77e8ebb..1acf1d1e207 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -902,6 +902,20 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, else hr = get_lineA( host->text_srv, wparam, lparam, &res ); break; + case EM_GETSELTEXT: + { + TEXTRANGEA range; + + if (unicode) hr = ITextServices_TxSendMessage( host->text_srv, msg, wparam, lparam, &res ); + else + { + ITextServices_TxSendMessage( host->text_srv, EM_EXGETSEL, 0, (LPARAM)&range.chrg, &res ); + range.lpstrText = (char *)lparam; + range.lpstrText[0] = '\0'; + hr = get_text_rangeA( host, &range, &res ); + } + break; + } case WM_GETTEXT: { GETTEXTEX params; diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 0f5ca9f738b..5e3a70c5c7d 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -623,7 +623,7 @@ static void test_EM_GETSELTEXT(void) SendMessageA(hwndRichEdit, EM_SETSEL, 4, 8); result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffer); ok(result == 4, "EM_GETSELTEXT returned %ld\n", result); - todo_wine ok(!strcmp("ef\x8e\xf0", buffer), "EM_GETSELTEXT filled %s\n", buffer); + ok(!strcmp("ef\x8e\xf0", buffer), "EM_GETSELTEXT filled %s\n", buffer); } DestroyWindow(hwndRichEdit); @@ -1362,7 +1362,7 @@ static void test_EM_EXSETSEL(void) result = SendMessageA(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM)&cr); todo_wine ok(result == 7, "EM_EXSETSEL return %ld expected 7\n", result); result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, sizeof(bufA), (LPARAM)bufA); - todo_wine ok(!strcmp(bufA, "ef\x8e\xf0"), "EM_GETSELTEXT return incorrect string\n"); + ok(!strcmp(bufA, "ef\x8e\xf0"), "EM_GETSELTEXT return incorrect string\n"); SendMessageA(hwndRichEdit, EM_EXGETSEL, 0, (LPARAM)&cr); ok(cr.cpMin == 4, "Selection start incorrectly: %d expected 4\n", cr.cpMin); ok(cr.cpMax == 8, "Selection end incorrectly: %d expected 8\n", cr.cpMax); @@ -1421,7 +1421,7 @@ static void test_EM_SETSEL(void) result = SendMessageA(hwndRichEdit, EM_SETSEL, 4, 8); todo_wine ok(result == 7, "EM_SETSEL return %ld expected 7\n", result); result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, sizeof(buffA), (LPARAM)buffA); - todo_wine ok(!strcmp(buffA, "ef\x8e\xf0"), "EM_GETSELTEXT return incorrect string\n"); + ok(!strcmp(buffA, "ef\x8e\xf0"), "EM_GETSELTEXT return incorrect string\n"); result = SendMessageA(hwndRichEdit, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); ok(sel_start == 4, "Selection start incorrectly: %d expected 4\n", sel_start); ok(sel_end == 8, "Selection end incorrectly: %d expected 8\n", sel_end);

1 0

Huw Davies : riched20: Initialize a copy of the properties in the host.
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: wine Branch: master Commit: 1507f2c8c39a46ce09eefd25fd7b3e50c115f603 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1507f2c8c39a46ce09eefd25… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 15 10:03:21 2021 +0000 riched20: Initialize a copy of the properties in the host. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/txthost.c | 69 +++++++++++++++++-------------------------------- 1 file changed, 23 insertions(+), 46 deletions(-) diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 5bd11c5aba2..c810589b4a6 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -41,6 +41,7 @@ struct host HWND window; BOOL emulate_10; PARAFORMAT2 para_fmt; + DWORD props; }; static const ITextHostVtbl textHostVtbl; @@ -48,6 +49,26 @@ static const ITextHostVtbl textHostVtbl; static BOOL listbox_registered; static BOOL combobox_registered; +static void host_init_props( struct host *host ) +{ + DWORD style, scrollbar; + + host->props = TXTBIT_RICHTEXT | TXTBIT_AUTOWORDSEL | TXTBIT_ALLOWBEEP; + + style = GetWindowLongW( host->window, GWL_STYLE ); + + if (style & ES_MULTILINE) host->props |= TXTBIT_MULTILINE; + if (style & ES_READONLY) host->props |= TXTBIT_READONLY; + if (style & ES_PASSWORD) host->props |= TXTBIT_USEPASSWORD; + if (!(style & ES_NOHIDESEL)) host->props |= TXTBIT_HIDESELECTION; + if (style & ES_SAVESEL) host->props |= TXTBIT_SAVESELECTION; + if (style & ES_VERTICAL) host->props |= TXTBIT_VERTICAL; + if (style & ES_NOOLEDRAGDROP) host->props |= TXTBIT_DISABLEDRAG; + + ITextHost_TxGetScrollBars( &host->ITextHost_iface, &scrollbar ); + if (!(scrollbar & ES_AUTOHSCROLL)) host->props |= TXTBIT_WORDWRAP; +} + struct host *host_create( HWND hwnd, CREATESTRUCTW *cs, BOOL emulate_10 ) { struct host *texthost; @@ -68,6 +89,7 @@ struct host *host_create( HWND hwnd, CREATESTRUCTW *cs, BOOL emulate_10 ) if (cs->style & ES_CENTER) texthost->para_fmt.wAlignment = PFA_CENTER; texthost->editor = NULL; + host_init_props( texthost ); return texthost; } @@ -373,53 +395,8 @@ DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetPropertyBits,12) DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetPropertyBits( ITextHost *iface, DWORD mask, DWORD *bits ) { struct host *host = impl_from_ITextHost( iface ); - DWORD style; - DWORD dwBits = 0; - DWORD dwScrollBar; - style = GetWindowLongW( host->window, GWL_STYLE ); - ITextHostImpl_TxGetScrollBars(iface, &dwScrollBar); - - dwBits |= TXTBIT_RICHTEXT|TXTBIT_AUTOWORDSEL; - if (!(dwScrollBar & ES_AUTOHSCROLL)) - dwBits |= TXTBIT_WORDWRAP; - - /* Bits that correspond to window styles. */ - if (style & ES_MULTILINE) - dwBits |= TXTBIT_MULTILINE; - if (style & ES_READONLY) - dwBits |= TXTBIT_READONLY; - if (style & ES_PASSWORD) - dwBits |= TXTBIT_USEPASSWORD; - if (!(style & ES_NOHIDESEL)) - dwBits |= TXTBIT_HIDESELECTION; - if (style & ES_SAVESEL) - dwBits |= TXTBIT_SAVESELECTION; - if (style & ES_VERTICAL) - dwBits |= TXTBIT_VERTICAL; - if (style & ES_NOOLEDRAGDROP) - dwBits |= TXTBIT_DISABLEDRAG; - - dwBits |= TXTBIT_ALLOWBEEP; - - /* The following bits are always FALSE because they are probably only - * needed for ITextServices_OnTxPropertyBitsChange: - * TXTBIT_VIEWINSETCHANGE - * TXTBIT_BACKSTYLECHANGE - * TXTBIT_MAXLENGTHCHANGE - * TXTBIT_CHARFORMATCHANGE - * TXTBIT_PARAFORMATCHANGE - * TXTBIT_SHOWACCELERATOR - * TXTBIT_EXTENTCHANGE - * TXTBIT_SELBARCHANGE - * TXTBIT_SCROLLBARCHANGE - * TXTBIT_CLIENTRECTCHANGE - * - * Documented by MSDN as not supported: - * TXTBIT_USECURRENTBKG - */ - - *bits = dwBits & mask; + *bits = host->props & mask; return S_OK; }

1 0

Michael Stefaniuc : devenum: Avoid the comma operator.
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: wine Branch: master Commit: c5c4e833920eacaf14ffb05410c2d51b9e2f1f80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5c4e833920eacaf14ffb054… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Mar 14 22:54:38 2021 +0100 devenum: Avoid the comma operator. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/mediacatenum.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index f097c580261..b24e24f7f31 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -186,7 +186,7 @@ static HRESULT WINAPI property_bag_Read(IPropertyBag *iface, reg_pins[1].nMediaTypes = output_count; reg_pins[1].lpMediaType = reg_types + count; reg_filter.dwVersion = 2; - reg_filter.dwMerit = MERIT_NORMAL + 0x800, + reg_filter.dwMerit = MERIT_NORMAL + 0x800; reg_filter.cPins2 = 2; reg_filter.rgPins2 = reg_pins;

1 0

Alexandre Julliard : server: Return the file name for image mappings in the get_mapping_info request.
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: wine Branch: master Commit: 6531f262e3488bbd917fcdb191f97efa820d0d54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6531f262e3488bbd917fcdb1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 11 14:56:57 2021 +0100 server: Return the file name for image mappings in the get_mapping_info request. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/virtual.c | 99 ++++++++++++++++++++++++++++++------------ include/wine/server_protocol.h | 5 ++- server/mapping.c | 16 ++++++- server/protocol.def | 2 + server/request.h | 3 +- server/trace.c | 2 + 6 files changed, 96 insertions(+), 31 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6531f262e3488bbd917f…

1 0