wine-commits June 2020

wine-commits@winehq.org

1 participants
947 discussions

Aaro Altonen : msado15: Implement IConnectionPointContainer_FindConnectionPoint.
by Alexandre Julliard 01 Jun '20

01 Jun '20

Module: wine Branch: master Commit: a1222a3595c8eafaef7df95b3804fa2205ac3c84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1222a3595c8eafaef7df95b… Author: Aaro Altonen <a.altonen(a)hotmail.com> Date: Mon Jun 1 14:42:18 2020 +0300 msado15: Implement IConnectionPointContainer_FindConnectionPoint. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49303 Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/connection.c | 17 +++++++++++++++-- dlls/msado15/tests/msado15.c | 27 +++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index be201cb90b..9e8c05522e 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -23,6 +23,7 @@ #include "initguid.h" #include "ocidl.h" #include "objbase.h" +#include "olectl.h" #include "msado15_backcompat.h" #include "wine/debug.h" @@ -455,8 +456,20 @@ static HRESULT WINAPI connpointcontainer_FindConnectionPoint( IConnectionPointCo REFIID riid, IConnectionPoint **point ) { struct connection *connection = impl_from_IConnectionPointContainer( iface ); - FIXME( "%p, %s, %p\n", connection, debugstr_guid( riid ), point ); - return E_NOTIMPL; + + TRACE( "%p, %s %p\n", connection, debugstr_guid( riid ), point ); + + if (!point) return E_POINTER; + + if (IsEqualIID( riid, connection->cp_connev.riid )) + { + *point = &connection->cp_connev.IConnectionPoint_iface; + IConnectionPoint_AddRef( *point ); + return S_OK; + } + + FIXME( "unsupported connection point %s\n", debugstr_guid( riid ) ); + return CONNECT_E_NOCONNECTION; } static const struct IConnectionPointContainerVtbl connpointcontainer_vtbl = diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 349363b7c5..a8d2afdd41 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -20,6 +20,7 @@ #define COBJMACROS #include <initguid.h> #include <oledb.h> +#include <olectl.h> #include <msado15_backcompat.h> #include "wine/test.h" @@ -805,10 +806,36 @@ static void test_Command(void) _Command_Release( command ); } +static void test_ConnectionPoint(void) +{ + HRESULT hr; + ULONG refs; + IConnectionPoint *point; + IConnectionPointContainer *pointcontainer; + + hr = CoCreateInstance( &CLSID_Connection, NULL, CLSCTX_INPROC_SERVER, + &IID_IConnectionPointContainer, (void**)&pointcontainer ); + + hr = IConnectionPointContainer_FindConnectionPoint( pointcontainer, &DIID_ConnectionEvents, NULL ); + ok( hr == E_POINTER, "got %08x\n", hr ); + + hr = IConnectionPointContainer_FindConnectionPoint( pointcontainer, &DIID_RecordsetEvents, &point ); + ok( hr == CONNECT_E_NOCONNECTION, "got %08x\n", hr ); + + hr = IConnectionPointContainer_FindConnectionPoint( pointcontainer, &DIID_ConnectionEvents, &point ); + ok( hr == S_OK, "got %08x\n", hr ); + + refs = IConnectionPoint_Release( point ); + ok( refs == 1, "got %u", refs ); + + IConnectionPointContainer_Release( pointcontainer ); +} + START_TEST(msado15) { CoInitialize( NULL ); test_Connection(); + test_ConnectionPoint(); test_Fields(); test_Recordset(); test_Stream();

1 0

Aaro Altonen : msado15: Add IConnectionPoint stub to _Connection.
by Alexandre Julliard 01 Jun '20

01 Jun '20

Module: wine Branch: master Commit: a8b647d8f89e6927bc1591d505eb63eb5ebfe860 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8b647d8f89e6927bc1591d5… Author: Aaro Altonen <a.altonen(a)hotmail.com> Date: Mon Jun 1 14:42:17 2020 +0300 msado15: Add IConnectionPoint stub to _Connection. Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/connection.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 8ed39a3a51..be201cb90b 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -32,6 +32,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(msado15); +struct connection; + +struct connection_point +{ + IConnectionPoint IConnectionPoint_iface; + struct connection *conn; + const IID *riid; +}; + struct connection { _Connection Connection_iface; @@ -41,6 +50,7 @@ struct connection ObjectStateEnum state; LONG timeout; WCHAR *datasource; + struct connection_point cp_connev; }; static inline struct connection *impl_from_Connection( _Connection *iface ) @@ -58,6 +68,11 @@ static inline struct connection *impl_from_IConnectionPointContainer( IConnectio return CONTAINING_RECORD( iface, struct connection, IConnectionPointContainer_iface ); } +static inline struct connection_point *impl_from_IConnectionPoint( IConnectionPoint *iface ) +{ + return CONTAINING_RECORD( iface, struct connection_point, IConnectionPoint_iface ); +} + static ULONG WINAPI connection_AddRef( _Connection *iface ) { struct connection *connection = impl_from_Connection( iface ); @@ -453,6 +468,86 @@ static const struct IConnectionPointContainerVtbl connpointcontainer_vtbl = connpointcontainer_FindConnectionPoint }; +static HRESULT WINAPI connpoint_QueryInterface( IConnectionPoint *iface, REFIID riid, void **obj ) +{ + struct connection_point *connpoint = impl_from_IConnectionPoint( iface ); + + if (IsEqualGUID( &IID_IUnknown, riid ) || IsEqualGUID( &IID_IConnectionPoint, riid )) + { + *obj = &connpoint->IConnectionPoint_iface; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid( riid ) ); + return E_NOINTERFACE; + } + + connection_AddRef( &connpoint->conn->Connection_iface ); + return S_OK; +} + +static ULONG WINAPI connpoint_AddRef( IConnectionPoint *iface ) +{ + struct connection_point *connpoint = impl_from_IConnectionPoint( iface ); + return IConnectionPointContainer_AddRef( &connpoint->conn->IConnectionPointContainer_iface ); +} + +static ULONG WINAPI connpoint_Release( IConnectionPoint *iface ) +{ + struct connection_point *connpoint = impl_from_IConnectionPoint( iface ); + return IConnectionPointContainer_Release( &connpoint->conn->IConnectionPointContainer_iface ); +} + +static HRESULT WINAPI connpoint_GetConnectionInterface( IConnectionPoint *iface, IID *iid ) +{ + struct connection_point *connpoint = impl_from_IConnectionPoint( iface ); + FIXME( "%p, %p\n", connpoint, iid ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connpoint_GetConnectionPointContainer( IConnectionPoint *iface, + IConnectionPointContainer **container ) +{ + struct connection_point *connpoint = impl_from_IConnectionPoint( iface ); + FIXME( "%p, %p\n", connpoint, container ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connpoint_Advise( IConnectionPoint *iface, IUnknown *unk_sink, + DWORD *cookie ) +{ + struct connection_point *connpoint = impl_from_IConnectionPoint( iface ); + FIXME( "%p, %p, %p\n", connpoint, unk_sink, cookie ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connpoint_Unadvise( IConnectionPoint *iface, DWORD cookie ) +{ + struct connection_point *connpoint = impl_from_IConnectionPoint( iface ); + FIXME( "%p, %d\n", connpoint, cookie ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connpoint_EnumConnections( IConnectionPoint *iface, + IEnumConnections **points ) +{ + struct connection_point *connpoint = impl_from_IConnectionPoint( iface ); + FIXME( "%p, %p\n", connpoint, points ); + return E_NOTIMPL; +} + +static const IConnectionPointVtbl connpoint_vtbl = +{ + connpoint_QueryInterface, + connpoint_AddRef, + connpoint_Release, + connpoint_GetConnectionInterface, + connpoint_GetConnectionPointContainer, + connpoint_Advise, + connpoint_Unadvise, + connpoint_EnumConnections +}; + HRESULT Connection_create( void **obj ) { struct connection *connection; @@ -466,6 +561,10 @@ HRESULT Connection_create( void **obj ) connection->timeout = 30; connection->datasource = NULL; + connection->cp_connev.conn = connection; + connection->cp_connev.riid = &DIID_ConnectionEvents; + connection->cp_connev.IConnectionPoint_iface.lpVtbl = &connpoint_vtbl; + *obj = &connection->Connection_iface; TRACE( "returning iface %p\n", *obj ); return S_OK;

1 0

Vijay Kiran Kamuju : include: Add missing enum, function and packing to msasn1.h.
by Alexandre Julliard 01 Jun '20

01 Jun '20

Module: wine Branch: master Commit: 1b249e9055172a7a6c208a0e95335a50ae1cc56a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b249e9055172a7a6c208a0e… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Mon Jun 1 11:10:43 2020 +0200 include: Add missing enum, function and packing to msasn1.h. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msasn1.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/msasn1.h b/include/msasn1.h index dd0bcb5b3d..244ed61487 100644 --- a/include/msasn1.h +++ b/include/msasn1.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2015 Austin English + * Copyright (C) 2020 Vijay Kiran Kamuju * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,6 +19,8 @@ #ifndef __MS_ASN1_H__ #define __MS_ASN1_H__ +#include <pshpack8.h> + #ifdef __cplusplus extern "C" { #endif @@ -157,6 +160,13 @@ typedef enum tagASN1error_e ASN1_WRN_NOEOD = 1002, } ASN1error_e; +enum +{ + ASN1_CHOICE_BASE = 1, + ASN1_CHOICE_INVALID = -1, + ASN1_CHOICE_EXTENSION = 0 +}; + #define ASN1_SUCCEEDED(ret) (((int)(ret)) >= 0) #define ASN1_FAILED(ret) (((int)(ret)) < 0) @@ -301,6 +311,7 @@ void WINAPI ASN1_CloseEncoder(ASN1encoding_t); void WINAPI ASN1_CloseEncoder2(ASN1encoding_t); void WINAPI ASN1_CloseModule(ASN1module_t); ASN1error_e WINAPI ASN1_CreateDecoder(ASN1module_t, ASN1decoding_t*,ASN1octet_t*, ASN1uint32_t, ASN1decoding_t); +ASN1error_e WINAPI ASN1_CreateDecoderEx(ASN1module_t, ASN1decoding_t*,ASN1octet_t*, ASN1uint32_t, ASN1decoding_t, ASN1uint32_t); ASN1error_e WINAPI ASN1_CreateEncoder(ASN1module_t, ASN1encoding_t*, ASN1octet_t*, ASN1uint32_t, ASN1encoding_t); ASN1module_t WINAPI ASN1_CreateModule(ASN1uint32_t,ASN1encodingrule_e,ASN1uint32_t,ASN1uint32_t,const ASN1GenericFun_t [],const ASN1GenericFun_t [],const ASN1FreeFun_t [],const ASN1uint32_t [],ASN1magic_t); ASN1error_e WINAPI ASN1_Decode(ASN1decoding_t, void** , ASN1uint32_t, ASN1uint32_t, ASN1octet_t*, ASN1uint32_t); @@ -352,4 +363,6 @@ void WINAPI ASN1ztcharstring_free(ASN1charstring_t*); } #endif +#include <poppack.h> + #endif /* __MS_ASN1_H__ */

1 0

Vijay Kiran Kamuju : msasn1: Add stub for ASN1_Decode function.
by Alexandre Julliard 01 Jun '20

01 Jun '20

Module: wine Branch: master Commit: d2f3f3aaa831fa9c5b14dac82427283365da8f8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2f3f3aaa831fa9c5b14dac8… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sun May 31 10:44:23 2020 +0200 msasn1: Add stub for ASN1_Decode function. ASN1decoding_t and ASN1encoding_t are implemented as linked lists. Current implementation does not properly emulate the linked list, as we need to identify where the next link pointers are stored. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38020 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msasn1/main.c | 18 ++++++++++++++++++ dlls/msasn1/msasn1.spec | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/msasn1/main.c b/dlls/msasn1/main.c index c96be7d07d..d151362905 100644 --- a/dlls/msasn1/main.c +++ b/dlls/msasn1/main.c @@ -190,3 +190,21 @@ void WINAPI ASN1_CloseDecoder(ASN1decoding_t decoder) { FIXME("(%p): Stub!\n", decoder); } + +ASN1error_e WINAPI ASN1_Decode(ASN1decoding_t decoder, void **outdata, ASN1uint32_t pdunum, + ASN1uint32_t flags, ASN1octet_t *buf, ASN1uint32_t bufsize) +{ + FIXME("(%p %p %u %08x %p %u): Stub!\n", decoder, outdata, pdunum, flags, buf, bufsize); + + if (!decoder) + return ASN1_ERR_BADARGS; + + if (!buf || !bufsize) + { + decoder->err = ASN1_ERR_BADARGS; + return ASN1_ERR_BADARGS; + } + + decoder->err = ASN1_ERR_BADPDU; + return ASN1_ERR_BADPDU; +} diff --git a/dlls/msasn1/msasn1.spec b/dlls/msasn1/msasn1.spec index f98a4a62d7..ab823b03c3 100644 --- a/dlls/msasn1/msasn1.spec +++ b/dlls/msasn1/msasn1.spec @@ -224,7 +224,7 @@ @ stub ASN1_CreateDecoderEx @ stdcall ASN1_CreateEncoder(ptr ptr ptr long ptr) @ stdcall ASN1_CreateModule(long long long long ptr ptr ptr ptr long) -@ stub ASN1_Decode +@ stdcall ASN1_Decode(ptr ptr long long ptr long) @ stub ASN1_Encode @ stub ASN1_FreeDecoded @ stub ASN1_FreeEncoded

1 0

Alexandre Julliard : ntdll: Properly reset the stack environment at thread exit on ARM64.
by Alexandre Julliard 01 Jun '20

01 Jun '20

Module: wine Branch: master Commit: 87fa906a84621295a76035d73dd6305c9cd2ea4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=87fa906a84621295a76035d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 1 17:50:02 2020 +0200 ntdll: Properly reset the stack environment at thread exit on ARM64. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49301 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm64.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 6a407c63d9..9cfb4eaa05 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -238,11 +238,13 @@ void signal_init_thread( TEB *teb ) extern void DECLSPEC_NORETURN call_thread_exit_func( int status, void (*func)(int), TEB *teb ); __ASM_GLOBAL_FUNC( call_thread_exit_func, + "stp x29, x30, [sp,#-16]!\n\t" "ldr x3, [x2, #0x300]\n\t" /* arm64_thread_data()->exit_frame */ "str xzr, [x2, #0x300]\n\t" "cbz x3, 1f\n\t" "mov sp, x3\n" - "1:\tblr x1" ) + "1:\tldp x29, x30, [sp], #16\n\t" + "br x1" ) /*********************************************************************** * signal_exit_thread

1 0

Alexandre Julliard : ntdll: Move server wait functions to the Unix library.
by Alexandre Julliard 01 Jun '20

01 Jun '20

Module: wine Branch: master Commit: c0319e0eabbad87a3e153c23f2461c881153b984 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0319e0eabbad87a3e153c23… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 1 13:40:25 2020 +0200 ntdll: Move server wait functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/critsection.c | 2 +- dlls/ntdll/exception.c | 4 +- dlls/ntdll/process.c | 2 +- dlls/ntdll/server.c | 449 --------------------------------------- dlls/ntdll/sync.c | 12 +- dlls/ntdll/thread.c | 2 +- dlls/ntdll/unix/loader.c | 3 + dlls/ntdll/unix/server.c | 424 ++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/signal_arm.c | 110 ++++++++++ dlls/ntdll/unix/signal_arm64.c | 98 +++++++++ dlls/ntdll/unix/signal_i386.c | 142 +++++++++++++ dlls/ntdll/unix/signal_powerpc.c | 202 ++++++++++++++++++ dlls/ntdll/unix/signal_x86_64.c | 134 ++++++++++++ dlls/ntdll/unix/unix_private.h | 9 + dlls/ntdll/unixlib.h | 8 +- dlls/ntdll/virtual.c | 18 +- 16 files changed, 1149 insertions(+), 470 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c0319e0eabbad87a3e15…

1 0

Alexandre Julliard : ntdll: Use the actual zero_bits parameter in the server requests.
by Alexandre Julliard 01 Jun '20

01 Jun '20

Module: wine Branch: master Commit: b925dd78b813decf386139a15aa7bc6863ee7ae5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b925dd78b813decf386139a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 1 13:27:40 2020 +0200 ntdll: Use the actual zero_bits parameter in the server requests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 2 -- dlls/ntdll/server.c | 27 ++++++++++++++------------- dlls/ntdll/virtual.c | 29 +++++++---------------------- include/wine/server_protocol.h | 10 +++++----- server/protocol.def | 6 +++--- server/request.h | 8 ++++---- server/trace.c | 9 ++++----- tools/make_requests | 2 +- 8 files changed, 38 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b925dd78b813decf3861…

1 0

Alexandre Julliard : ntdll: Move the threading initialization functions to the Unix library.
by Alexandre Julliard 01 Jun '20

01 Jun '20

Module: wine Branch: master Commit: 3e9f8c87e5a2acaa80f8bbb1d50fa82147942143 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e9f8c87e5a2acaa80f8bbb1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 1 12:52:05 2020 +0200 ntdll: Move the threading initialization functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/selector.c | 4 +- dlls/ntdll/Makefile.in | 6 + dlls/ntdll/ntdll_misc.h | 9 - dlls/ntdll/server.c | 10 +- dlls/ntdll/signal_arm.c | 90 +------ dlls/ntdll/signal_arm64.c | 93 +------ dlls/ntdll/signal_i386.c | 380 +---------------------------- dlls/ntdll/signal_powerpc.c | 75 +----- dlls/ntdll/signal_x86_64.c | 205 +--------------- dlls/ntdll/thread.c | 51 ++-- dlls/ntdll/unix/loader.c | 10 + dlls/ntdll/unix/server.c | 12 +- dlls/ntdll/unix/signal_arm.c | 157 ++++++++++++ dlls/ntdll/unix/signal_arm64.c | 166 +++++++++++++ dlls/ntdll/unix/signal_i386.c | 508 +++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/signal_powerpc.c | 140 +++++++++++ dlls/ntdll/unix/signal_x86_64.c | 278 +++++++++++++++++++++ dlls/ntdll/unix/thread.c | 150 ++++++++++++ dlls/ntdll/unix/unix_private.h | 19 ++ dlls/ntdll/unix/virtual.c | 22 +- dlls/ntdll/unixlib.h | 16 +- dlls/ntdll/virtual.c | 7 +- 22 files changed, 1521 insertions(+), 887 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3e9f8c87e5a2acaa80f8…

1 0

Nikolay Sivov : dwrite: Add main loop variant for reverse substitution.
by Alexandre Julliard 01 Jun '20

01 Jun '20

Module: wine Branch: master Commit: 3e59649c9edfd27df45fca9112ecde9cb33d1740 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e59649c9edfd27df45fca91… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 1 12:23:37 2020 +0300 dwrite: Add main loop variant for reverse substitution. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 50 +++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 41 insertions(+), 9 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 29f2a95a8c..58e1a3941c 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -5610,6 +5610,19 @@ static void opentype_get_nominal_glyphs(struct scriptshaping_context *context, c } } +static BOOL opentype_is_gsub_lookup_reversed(const struct scriptshaping_context *context, const struct lookup *lookup) +{ + unsigned int subtable_offset, lookup_type = lookup->type; + + if (lookup->type == GSUB_LOOKUP_EXTENSION_SUBST) + { + subtable_offset = opentype_layout_get_gsubgpos_subtable(context, lookup->offset, 0); + /* Assumes format 1. */ + lookup_type = table_read_be_word(&context->table->table, subtable_offset + 2); + } + return lookup_type == GSUB_LOOKUP_REVERSE_CHAINING_CONTEXTUAL_SUBST; +} + void opentype_layout_apply_gsub_features(struct scriptshaping_context *context, unsigned int script_index, unsigned int language_index, const struct shaping_features *features) { @@ -5626,19 +5639,38 @@ void opentype_layout_apply_gsub_features(struct scriptshaping_context *context, { const struct lookup *lookup = &lookups.lookups[i]; - context->cur = 0; - while (context->cur < context->glyph_count) + if (!opentype_is_gsub_lookup_reversed(context, lookup)) { - ret = FALSE; - - if ((context->glyph_infos[context->cur].mask & lookup->mask) && - lookup_is_glyph_match(context, context->cur, lookup->flags)) + context->cur = 0; + while (context->cur < context->glyph_count) { - ret = opentype_layout_apply_gsub_lookup(context, lookup); + ret = FALSE; + + if ((context->glyph_infos[context->cur].mask & lookup->mask) && + lookup_is_glyph_match(context, context->cur, lookup->flags)) + { + ret = opentype_layout_apply_gsub_lookup(context, lookup); + } + + if (!ret) + context->cur++; } + } + else + { + context->cur = context->glyph_count - 1; - if (!ret) - context->cur++; + for (;;) + { + if ((context->glyph_infos[context->cur].mask & lookup->mask) && + lookup_is_glyph_match(context, context->cur, lookup->flags)) + { + opentype_layout_apply_gsub_lookup(context, lookup); + } + + if (context->cur == 0) break; + --context->cur; + } } }

1 0

Nikolay Sivov : dwrite: Fix offsets when stepping through chain rule fields.
by Alexandre Julliard 01 Jun '20

01 Jun '20

Module: wine Branch: master Commit: db6c4156afed774585d36b68a513565c9c52952a URL: https://source.winehq.org/git/wine.git/?a=commit;h=db6c4156afed774585d36b68… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 1 12:23:36 2020 +0300 dwrite: Fix offsets when stepping through chain rule fields. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index f1b9fb4e47..29f2a95a8c 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -5180,10 +5180,12 @@ static BOOL opentype_layout_apply_chain_rule_set(const struct match_context *mc, backtrack = table_read_ensure(table, rule_offset, backtrack_count * sizeof(*backtrack)); rule_offset += backtrack_count * sizeof(*backtrack); - input_count = table_read_be_word(table, rule_offset); + if (!(input_count = table_read_be_word(table, rule_offset))) + continue; + rule_offset += 2; - input = table_read_ensure(table, rule_offset, input_count * sizeof(*input)); - rule_offset += input_count * sizeof(*input); + input = table_read_ensure(table, rule_offset, (input_count - 1) * sizeof(*input)); + rule_offset += (input_count - 1) * sizeof(*input); lookahead_count = table_read_be_word(table, rule_offset); rule_offset += 2;

1 0

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 June 2020