wine-commits January 2021

wine-commits@winehq.org

2 participants
472 discussions

Nikolay Sivov : gdi32/uniscribe: Merge Arabic joining types C and D.
by Alexandre Julliard 20 Jan '21

20 Jan '21

Module: wine Branch: master Commit: f734d98a98e5be5ae456b9a1516011ec57241632 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f734d98a98e5be5ae456b9a1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 20 15:35:14 2021 +0300 gdi32/uniscribe: Merge Arabic joining types C and D. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/uniscribe/shape.c | 21 +-- dlls/gdi32/uniscribe/shaping.c | 314 ++++++++++++++++++++--------------------- tools/make_unicode | 14 +- 3 files changed, 177 insertions(+), 172 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f734d98a98e5be5ae456…

1 0

Nikolay Sivov : dwrite: Zero-initialize run analysis object structure.
by Alexandre Julliard 20 Jan '21

20 Jan '21

Module: wine Branch: master Commit: 5197fd7c91eed7c1ff4309adf904c454f1b19336 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5197fd7c91eed7c1ff4309ad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 20 18:14:33 2021 +0300 dwrite: Zero-initialize run analysis object structure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index c10234e09fc..74e6b929ecd 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -5931,7 +5931,7 @@ HRESULT create_glyphrunanalysis(const struct glyphrunanalysis_desc *desc, IDWrit if ((UINT32)desc->measuring_mode > DWRITE_MEASURING_MODE_GDI_NATURAL) return E_INVALIDARG; - analysis = heap_alloc(sizeof(*analysis)); + analysis = heap_alloc_zero(sizeof(*analysis)); if (!analysis) return E_OUTOFMEMORY; @@ -5945,10 +5945,6 @@ HRESULT create_glyphrunanalysis(const struct glyphrunanalysis_desc *desc, IDWrit else analysis->texture_type = DWRITE_TEXTURE_CLEARTYPE_3x1; - analysis->flags = 0; - analysis->bitmap = NULL; - analysis->max_glyph_bitmap_size = 0; - SetRectEmpty(&analysis->bounds); analysis->run = *desc->run; IDWriteFontFace_AddRef(analysis->run.fontFace); analysis->glyphs = heap_calloc(desc->run->glyphCount, sizeof(*analysis->glyphs)); @@ -5970,12 +5966,8 @@ HRESULT create_glyphrunanalysis(const struct glyphrunanalysis_desc *desc, IDWrit analysis->m = *desc->transform; analysis->flags |= RUNANALYSIS_USE_TRANSFORM; } - else - memset(&analysis->m, 0, sizeof(analysis->m)); analysis->run.glyphIndices = analysis->glyphs; - analysis->run.glyphAdvances = NULL; - analysis->run.glyphOffsets = NULL; rtl_factor = desc->run->bidiLevel & 1 ? -1.0f : 1.0f;

1 0

Nikolay Sivov : dwrite: Fix feature mask for non-global features.
by Alexandre Julliard 20 Jan '21

20 Jan '21

Module: wine Branch: master Commit: 94b367e3e91212f5b68a13b897f878405580b404 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94b367e3e91212f5b68a13b8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 20 17:02:34 2021 +0300 dwrite: Fix feature mask for non-global features. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 7c30678234a..a025227dfda 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4518,7 +4518,10 @@ static void opentype_layout_collect_lookups(struct scriptshaping_context *contex if ((feature->flags & FEATURE_GLOBAL) && feature->max_value == 1) bits_needed = 0; else + { BitScanReverse(&bits_needed, min(feature->max_value, 256)); + bits_needed++; + } if (!feature->max_value || next_bit + bits_needed > 8 * sizeof (feature->mask)) continue;

1 0

Nikolay Sivov : ntdll/tests: Remove skips on missing ntdll.dll.
by Alexandre Julliard 20 Jan '21

20 Jan '21

Module: wine Branch: master Commit: b78285b9a3e272d2db1dfe7d399499314145efca URL: https://source.winehq.org/git/wine.git/?a=commit;h=b78285b9a3e272d2db1dfe7d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 20 15:37:45 2021 +0300 ntdll/tests: Remove skips on missing ntdll.dll. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/change.c | 5 ----- dlls/ntdll/tests/path.c | 5 ----- 2 files changed, 10 deletions(-) diff --git a/dlls/ntdll/tests/change.c b/dlls/ntdll/tests/change.c index 0e76fb5635a..1e643fc3eee 100644 --- a/dlls/ntdll/tests/change.c +++ b/dlls/ntdll/tests/change.c @@ -313,11 +313,6 @@ static void test_ntncdf_async(void) START_TEST(change) { HMODULE hntdll = GetModuleHandleA("ntdll"); - if (!hntdll) - { - win_skip("not running on NT, skipping test\n"); - return; - } pNtNotifyChangeDirectoryFile = (void *)GetProcAddress(hntdll, "NtNotifyChangeDirectoryFile"); pNtCancelIoFile = (void *)GetProcAddress(hntdll, "NtCancelIoFile"); diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index e4adc992a28..a91038bab7b 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -603,11 +603,6 @@ static void test_RtlDosPathNameToNtPathName_U(void) START_TEST(path) { HMODULE mod = GetModuleHandleA("ntdll.dll"); - if (!mod) - { - win_skip("Not running on NT, skipping tests\n"); - return; - } pRtlMultiByteToUnicodeN = (void *)GetProcAddress(mod,"RtlMultiByteToUnicodeN"); pRtlUnicodeToMultiByteN = (void *)GetProcAddress(mod,"RtlUnicodeToMultiByteN");

1 0

Dmitry Timoshkov : gdi32: Avoid best fit chars when mapping unicode character to a glyph index.
by Alexandre Julliard 20 Jan '21

20 Jan '21

Module: wine Branch: master Commit: f45606c5f8b95923d4f398034f86951a47a511a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f45606c5f8b95923d4f39803… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jan 20 10:54:48 2021 +0000 gdi32: Avoid best fit chars when mapping unicode character to a glyph index. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 6 +++--- dlls/gdi32/tests/font.c | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 6f50cc92a83..afd41aeec31 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2906,11 +2906,11 @@ static UINT get_glyph_index( struct gdi_font *font, UINT glyph ) glyph = get_glyph_index_symbol( font, wc ); if (!glyph) { - if (WideCharToMultiByte( CP_ACP, 0, &wc, 1, &ch, 1, NULL, NULL )) + if (WideCharToMultiByte( CP_ACP, WC_NO_BEST_FIT_CHARS, &wc, 1, &ch, 1, NULL, NULL )) glyph = get_glyph_index_symbol( font, (unsigned char)ch ); } } - else if (WideCharToMultiByte( font->codepage, 0, &wc, 1, &ch, 1, NULL, &used ) && !used) + else if (WideCharToMultiByte( font->codepage, WC_NO_BEST_FIT_CHARS, &wc, 1, &ch, 1, NULL, &used ) && !used) { glyph = (unsigned char)ch; font_funcs->get_glyph_index( font, &glyph, FALSE ); @@ -3219,7 +3219,7 @@ static DWORD CDECL font_GetGlyphIndices( PHYSDEV dev, const WCHAR *str, INT coun if (str[i] >= 0xf020 && str[i] <= 0xf100) glyph = str[i] - 0xf000; else if (str[i] < 0x100) glyph = str[i]; } - else if (WideCharToMultiByte( physdev->font->codepage, 0, &str[i], 1, + else if (WideCharToMultiByte( physdev->font->codepage, WC_NO_BEST_FIT_CHARS, &str[i], 1, &ch, 1, NULL, &used ) && !used) glyph = (unsigned char)ch; } diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index da5fdf2238e..461eecf8038 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1688,14 +1688,12 @@ static void test_GetGlyphIndices(void) charcount = GetGlyphIndicesW(hdc, c, ARRAY_SIZE(c), glyphs, GGI_MARK_NONEXISTING_GLYPHS); ok(charcount == ARRAY_SIZE(c), "got %u\n", charcount); ok(glyphs[0] == 0x001f || glyphs[0] == 0xffff /* Vista */, "got %#x\n", glyphs[0]); -todo_wine ok(glyphs[1] == 0x001f || glyphs[1] == 0xffff /* Vista */, "got %#x\n", glyphs[1]); glyphs[0] = glyphs[1] = 0; charcount = GetGlyphIndicesW(hdc, c, ARRAY_SIZE(c), glyphs, 0); ok(charcount == ARRAY_SIZE(c), "got %u\n", charcount); ok(glyphs[0] == textm.tmDefaultChar || glyphs[0] == 0x20 /* CJK Windows */, "got %#x\n", glyphs[0]); -todo_wine ok(glyphs[1] == textm.tmDefaultChar || glyphs[1] == 0x20 /* CJK Windows */, "got %#x\n", glyphs[1]); DeleteObject(SelectObject(hdc, hOldFont));

1 0

Dmitry Timoshkov : wbemprox: Flesh out a bit SystemRestore::Enable() implementation.
by Alexandre Julliard 20 Jan '21

20 Jan '21

Module: wine Branch: master Commit: d2baf148a14b41d0347dfdc2bc6cf9efc4f63242 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2baf148a14b41d0347dfdc2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jan 20 11:15:58 2021 +0100 wbemprox: Flesh out a bit SystemRestore::Enable() implementation. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/sysrestore.c | 48 +++++++++++++++++++++++++++++++++++++++++++-- dlls/wbemprox/tests/query.c | 2 +- 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/sysrestore.c b/dlls/wbemprox/sysrestore.c index b840d220b5c..d59077381fb 100644 --- a/dlls/wbemprox/sysrestore.c +++ b/dlls/wbemprox/sysrestore.c @@ -45,8 +45,52 @@ HRESULT disable_restore( IWbemClassObject *obj, IWbemClassObject *in, IWbemClass HRESULT enable_restore( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) { - FIXME("stub\n"); - return S_OK; + VARIANT drive, retval; + IWbemClassObject *sig, *out_params = NULL; + HRESULT hr; + + TRACE("%p, %p\n", in, out); + + hr = IWbemClassObject_Get( in, L"Drive", 0, &drive, NULL, NULL ); + if (hr != S_OK) return hr; + + hr = create_signature( L"SystemRestore", L"Enable", PARAM_OUT, &sig ); + if (hr != S_OK) + { + VariantClear( &drive ); + return hr; + } + + if (out) + { + hr = IWbemClassObject_SpawnInstance( sig, 0, &out_params ); + if (hr != S_OK) + { + VariantClear( &drive ); + IWbemClassObject_Release( sig ); + return hr; + } + } + + FIXME("%s: stub\n", wine_dbgstr_variant(&drive)); + + VariantClear( &drive ); + IWbemClassObject_Release( sig ); + + if (out_params) + { + set_variant( VT_UI4, ERROR_SUCCESS, NULL, &retval ); + hr = IWbemClassObject_Put( out_params, L"ReturnValue", 0, &retval, CIM_UINT32 ); + } + + if (hr == S_OK && out) + { + *out = out_params; + IWbemClassObject_AddRef( out_params ); + } + if (out_params) IWbemClassObject_Release( out_params ); + + return hr; } HRESULT get_last_restore_status( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 1c7a615dd4e..67c0b218ce1 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1805,7 +1805,7 @@ static void test_SystemRestore( IWbemServices *services ) out = NULL; hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, in, &out, NULL ); ok( hr == S_OK || hr == WBEM_E_ACCESS_DENIED, "failed to execute method %08x\n", hr ); - if (hr == S_OK && out) + if (hr == S_OK) { VariantInit( &var ); hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &var, NULL, NULL );

1 0

Dmitry Timoshkov : wbemprox: Add class SystemRestore stub implementation.
by Alexandre Julliard 20 Jan '21

20 Jan '21

Module: wine Branch: master Commit: e0cb4d509338f5d1d6db71584722731d38b0d837 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0cb4d509338f5d1d6db7158… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jan 20 11:15:57 2021 +0100 wbemprox: Add class SystemRestore stub implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50033 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/Makefile.in | 1 + dlls/wbemprox/builtin.c | 38 ++++++++++++++++++++++++ dlls/wbemprox/sysrestore.c | 62 ++++++++++++++++++++++++++++++++++++++++ dlls/wbemprox/tests/query.c | 7 +++-- dlls/wbemprox/wbemprox_private.h | 5 ++++ 5 files changed, 111 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/Makefile.in b/dlls/wbemprox/Makefile.in index a26c833878f..ed2710f8855 100644 --- a/dlls/wbemprox/Makefile.in +++ b/dlls/wbemprox/Makefile.in @@ -14,6 +14,7 @@ C_SRCS = \ security.c \ service.c \ services.c \ + sysrestore.c \ table.c \ wbemlocator.c diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 9bd58ca77e6..39166a21171 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -406,6 +406,20 @@ static const struct column col_systemsecurity[] = { L"GetSD", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, { L"SetSD", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, }; +static const struct column col_sysrestore[] = +{ + { L"CreationTime", CIM_STRING }, + { L"Description", CIM_STRING }, + { L"EventType", CIM_UINT32 }, + { L"RestorePointType", CIM_UINT32 }, + { L"SequenceNumber", CIM_UINT32 }, + /* methods */ + { L"CreateRestorePoint", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, + { L"Disable", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, + { L"Enable", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, + { L"GetLastRestoreStatus", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, + { L"Restore", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, +}; static const struct column col_videocontroller[] = { { L"AdapterCompatibility", CIM_STRING }, @@ -783,6 +797,19 @@ struct record_stdregprov class_method *enumvalues; class_method *getstringvalue; }; +struct record_sysrestore +{ + const WCHAR *creation_time; + const WCHAR *description; + UINT32 event_type; + UINT32 restore_point_type; + UINT32 sequence_number; + class_method *create_restore_point; + class_method *disable_restore; + class_method *enable_restore; + class_method *get_last_restore_status; + class_method *restore; +}; struct record_systemsecurity { class_method *getsd; @@ -865,6 +892,10 @@ static const struct record_param data_param[] = { L"StdRegProv", L"GetStringValue", 1, L"sValueName", CIM_STRING }, { L"StdRegProv", L"GetStringValue", -1, L"ReturnValue", CIM_UINT32 }, { L"StdRegProv", L"GetStringValue", -1, L"sValue", CIM_STRING }, + { L"SystemRestore", L"Disable", 1, L"Drive", CIM_STRING }, + { L"SystemRestore", L"Disable", -1, L"ReturnValue", CIM_UINT32 }, + { L"SystemRestore", L"Enable", 1, L"Drive", CIM_STRING }, + { L"SystemRestore", L"Enable", -1, L"ReturnValue", CIM_UINT32 }, { L"Win32_Process", L"GetOwner", -1, L"ReturnValue", CIM_UINT32 }, { L"Win32_Process", L"GetOwner", -1, L"User", CIM_STRING }, { L"Win32_Process", L"GetOwner", -1, L"Domain", CIM_STRING }, @@ -895,6 +926,12 @@ static const struct record_stdregprov data_stdregprov[] = { { reg_create_key, reg_enum_key, reg_enum_values, reg_get_stringvalue } }; + +static const struct record_sysrestore data_sysrestore[] = +{ + { NULL, NULL, 0, 0, 0, create_restore_point, disable_restore, enable_restore, get_last_restore_status, restore } +}; + static UINT16 systemenclosure_chassistypes[] = { 1, @@ -3981,6 +4018,7 @@ static struct table builtin_classes[] = { L"CIM_LogicalDisk", C(col_logicaldisk), 0, 0, NULL, fill_logicaldisk }, { L"CIM_Processor", C(col_processor), 0, 0, NULL, fill_processor }, { L"StdRegProv", C(col_stdregprov), D(data_stdregprov) }, + { L"SystemRestore", C(col_sysrestore), D(data_sysrestore) }, { L"Win32_BIOS", C(col_bios), 0, 0, NULL, fill_bios }, { L"Win32_BaseBoard", C(col_baseboard), 0, 0, NULL, fill_baseboard }, { L"Win32_CDROMDrive", C(col_cdromdrive), 0, 0, NULL, fill_cdromdrive }, diff --git a/dlls/wbemprox/sysrestore.c b/dlls/wbemprox/sysrestore.c new file mode 100644 index 00000000000..b840d220b5c --- /dev/null +++ b/dlls/wbemprox/sysrestore.c @@ -0,0 +1,62 @@ +/* + * SystemRestore implementation + * + * Copyright 2020 Dmitry Timoshkov + * + * 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 "wbemcli.h" + +#include "wine/debug.h" +#include "wbemprox_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); + +HRESULT create_restore_point( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) +{ + FIXME("stub\n"); + return S_OK; +} + +HRESULT disable_restore( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) +{ + FIXME("stub\n"); + return S_OK; +} + +HRESULT enable_restore( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) +{ + FIXME("stub\n"); + return S_OK; +} + +HRESULT get_last_restore_status( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +HRESULT restore( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) +{ + FIXME("stub\n"); + return S_OK; +} diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 37b6fb4e8dc..1c7a615dd4e 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1772,16 +1772,19 @@ static void test_SystemRestore( IWbemServices *services ) hr = IWbemServices_GetObject( services, class, 0, NULL, &service, NULL ); if (hr != S_OK) { - skip( "SystemRestore not available\n" ); + win_skip( "SystemRestore not available\n" ); SysFreeString( class ); return; } check_property( service, L"CreationTime", VT_NULL, CIM_STRING ); check_property( service, L"Description", VT_NULL, CIM_STRING ); + if (0) /* FIXME */ + { check_property( service, L"EventType", VT_NULL, CIM_UINT32 ); check_property( service, L"RestorePointType", VT_NULL, CIM_UINT32 ); check_property( service, L"SequenceNumber", VT_NULL, CIM_UINT32 ); + } method = SysAllocString( L"Enable" ); sig_in = NULL; @@ -1802,7 +1805,7 @@ static void test_SystemRestore( IWbemServices *services ) out = NULL; hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, in, &out, NULL ); ok( hr == S_OK || hr == WBEM_E_ACCESS_DENIED, "failed to execute method %08x\n", hr ); - if (hr == S_OK) + if (hr == S_OK && out) { VariantInit( &var ); hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &var, NULL, NULL ); diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 30649257641..ff9a7f6ff82 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -253,6 +253,11 @@ HRESULT service_start_service(IWbemClassObject *, IWbemClassObject *, IWbemClass HRESULT service_stop_service(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT security_get_sd(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT security_set_sd(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; +HRESULT create_restore_point(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; +HRESULT disable_restore(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; +HRESULT enable_restore(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; +HRESULT get_last_restore_status(IWbemClassObject *, IWbemClassObject *in, IWbemClassObject **) DECLSPEC_HIDDEN; +HRESULT restore(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; static inline WCHAR *heap_strdupW( const WCHAR *src ) {

1 0

Rémi Bernon : include: Add windows.media.speechsynthesis.idl stub.
by Alexandre Julliard 20 Jan '21

20 Jan '21

Module: wine Branch: master Commit: e17ae0dc0fa5535ed4646696c4d81d7f72ba3ce5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e17ae0dc0fa5535ed4646696… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 19 14:04:51 2021 +0100 include: Add windows.media.speechsynthesis.idl stub. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/windows.media.speechsynthesis.idl | 47 +++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 74a1d8e0c89..fc5ffbbc721 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -746,6 +746,7 @@ SOURCES = \ windns.h \ windows.foundation.idl \ windows.h \ + windows.media.speechsynthesis.idl \ windowscontracts.idl \ windowsx.h \ wine/debug.h \ diff --git a/include/windows.media.speechsynthesis.idl b/include/windows.media.speechsynthesis.idl new file mode 100644 index 00000000000..7a1de5fcba6 --- /dev/null +++ b/include/windows.media.speechsynthesis.idl @@ -0,0 +1,47 @@ +/* + * Copyright 2020 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 + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "windows.foundation.idl"; + +namespace Windows { + namespace Media { + namespace SpeechSynthesis { + typedef enum VoiceGender VoiceGender; + interface IInstalledVoicesStatic; + interface IVoiceInformation; + } + } +} + +namespace Windows { + namespace Media { + namespace SpeechSynthesis { + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + enum VoiceGender + { + Male = 0, + Female = 1 + }; + } + } +}

1 0

Nikolay Sivov : dwrite/layout: Fail to create layouts with negative size.
by Alexandre Julliard 20 Jan '21

20 Jan '21

Module: wine Branch: master Commit: 9ec274083f273a3a6d7415599d097c206204e1ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ec274083f273a3a6d741559… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 20 08:44:12 2021 +0300 dwrite/layout: Fail to create layouts with negative size. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 3 +++ dlls/dwrite/tests/layout.c | 37 +++++++++++++++++++++++++++++++++++-- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 58aa05abd44..0b5bad80339 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -5207,6 +5207,9 @@ HRESULT create_textlayout(const struct textlayout_desc *desc, IDWriteTextLayout *layout = NULL; + if (desc->max_width < 0.0f || desc->max_height < 0.0f) + return E_INVALIDARG; + if (!desc->format || !desc->string) return E_INVALIDARG; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 7d950a0626c..52f17820e5e 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -908,7 +908,7 @@ static void test_CreateTextLayout(void) factory = create_factory(); layout = (void*)0xdeadbeef; - hr = IDWriteFactory_CreateTextLayout(factory, NULL, 0, NULL, 0.0, 0.0, &layout); + hr = IDWriteFactory_CreateTextLayout(factory, NULL, 0, NULL, 0.0f, 0.0f, &layout); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); ok(layout == NULL, "got %p\n", layout); @@ -941,6 +941,21 @@ static void test_CreateTextLayout(void) ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); ok(layout == NULL, "got %p\n", layout); + layout = (void *)0xdeadbeef; + hr = IDWriteFactory_CreateTextLayout(factory, L"string", 6, format, -100.0f, 100.0f, &layout); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(layout == NULL, "Unexpected pointer %p.\n", layout); + + layout = (void *)0xdeadbeef; + hr = IDWriteFactory_CreateTextLayout(factory, L"string", 6, format, 100.0f, -100.0f, &layout); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(layout == NULL, "Unexpected pointer %p.\n", layout); + + layout = (void *)0xdeadbeef; + hr = IDWriteFactory_CreateTextLayout(factory, L"string", 6, format, -100.0f, -100.0f, &layout); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(layout == NULL, "Unexpected pointer %p.\n", layout); + hr = IDWriteFactory_CreateTextLayout(factory, L"string", 0, format, 0.0f, 0.0f, &layout); ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); IDWriteTextLayout_Release(layout); @@ -1031,7 +1046,7 @@ static void test_CreateGdiCompatibleTextLayout(void) factory = create_factory(); layout = (void*)0xdeadbeef; - hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, NULL, 0, NULL, 0.0, 0.0, 0.0, NULL, FALSE, &layout); + hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, NULL, 0, NULL, 0.0f, 0.0f, 0.0f, NULL, FALSE, &layout); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); ok(layout == NULL, "got %p\n", layout); @@ -1070,6 +1085,24 @@ static void test_CreateGdiCompatibleTextLayout(void) ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); ok(layout == NULL, "got %p\n", layout); + layout = (void *)0xdeadbeef; + hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, L"string", 6, format, -100.0f, 100.0f, 1.0f, + NULL, FALSE, &layout); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(layout == NULL, "Unexpected pointer %p.\n", layout); + + layout = (void *)0xdeadbeef; + hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, L"string", 6, format, 100.0f, -100.0f, 1.0f, + NULL, FALSE, &layout); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(layout == NULL, "Unexpected pointer %p.\n", layout); + + layout = (void *)0xdeadbeef; + hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, L"string", 6, format, -100.0f, -100.0f, 1.0f, + NULL, FALSE, &layout); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(layout == NULL, "Unexpected pointer %p.\n", layout); + hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, L"string", 6, format, 100.0f, 100.0f, 1.0f, NULL, FALSE, &layout); ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr);

1 0

Zebediah Figura : winegstreamer: Manage our own streaming thread.
by Alexandre Julliard 20 Jan '21

20 Jan '21

Module: wine Branch: master Commit: 9c138562fe4f6ceffb6cfe5cc7ecdf6a89e993cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c138562fe4f6ceffb6cfe5c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 19 21:35:38 2021 -0600 winegstreamer: Manage our own streaming thread. This is a rather large and complex change. It comprises several parts: (1) Instead of directly sending EOS, segment, and sample events to the downstream DirectShow sink, first queue them in a local buffer (i.e. "pin->event"). (2) Spawn a separate thread per source pin (i.e. "stream_thread") which consumes said events and sends them downstream. (3) When flushing or stopping, explicitly wait for this thread to pause or stop (respectively). There are a few reasons for this: (1) It reduces the number of Unix -> PE callbacks we need to make, easing PE conversion. This is not a great advantage *a priori*, and may not be worth a similar dedicated "handler" thread for most modules, but winegstreamer is different—we were already marshalling these calls onto another thread, and now that marshalling can go away (almost). (2) Because GStreamer can only do pad negotiation (and hence autoplugging) while running (in contrast to DirectShow, which can do it while stopped), we currently have to renegotiate every time the pipeline is started. Most applications don't start the graph more than once, but even that requires two negotiations, and startup time is demonstrably too high. It would be nice to keep the graph in PAUSED state all of the time, but this is difficult to do without more fine-grained control over the streaming thread. [In particular, we cannot reliably wait for all samples to be delivered except by stopping the GStreamer pipeline.] Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/gstdemux.c | 340 +++++++++++++++++++++++++++++++++------ 2 files changed, 289 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9c138562fe4f6ceffb6c…

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
48
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2021