June 2020 - Wine-commits - list.winehq.org

Francois Gouget : winex11.drv: Avoid using the mailing list address in error messages.
by Alexandre Julliard 01 Jun '20

01 Jun '20

Module: wine Branch: master Commit: f622224c58467ced47c5a1d621aeab887f8e8bc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f622224c58467ced47c5a1d6… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 31 18:05:35 2020 +0200 winex11.drv: Avoid using the mailing list address in error messages. Also let users decide whether to report bugs and let them figure out how. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/wintab.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 06a1427a19..92f957cf8d 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -619,7 +619,7 @@ BOOL CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) if (! is_tablet_cursor(target->name, device_type)) { - WARN("Skipping device %d [name %s|type %s]; not apparently a tablet cursor type device. If this is wrong, please report it to wine-devel(a)winehq.org\n", + WARN("Skipping device %d [name %s|type %s]; not apparently a tablet cursor type device\n", loop, devices[loop].name, debugstr_a(device_type)); break; }

1 0

Zhiyi Zhang : rpcrt4: Implement RpcIfInqId().
by Alexandre Julliard 01 Jun '20

01 Jun '20

Module: wine Branch: master Commit: d3a934be367e6b7bf7ba2ad127279fa8fc930fc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3a934be367e6b7bf7ba2ad1… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 1 10:59:34 2020 +0800 rpcrt4: Implement RpcIfInqId(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49257 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpcrt4.spec | 2 +- dlls/rpcrt4/rpcrt4_main.c | 25 ++++++++++++++++++++++++ dlls/rpcrt4/tests/rpc.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++ include/rpcdce.h | 3 +++ 4 files changed, 79 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 135beab0ff..5a294df65a 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -389,7 +389,7 @@ @ stub RpcFreeAuthorizationContext # wxp @ stdcall RpcGetAsyncCallStatus(ptr) RpcAsyncGetCallStatus @ stub RpcIfIdVectorFree -@ stub RpcIfInqId +@ stdcall RpcIfInqId(ptr ptr) @ stdcall RpcImpersonateClient(ptr) @ stdcall RpcInitializeAsyncHandle(ptr long) RpcAsyncInitializeHandle @ stdcall RpcMgmtEnableIdleCleanup() diff --git a/dlls/rpcrt4/rpcrt4_main.c b/dlls/rpcrt4/rpcrt4_main.c index e716f7cfff..57e33673c7 100644 --- a/dlls/rpcrt4/rpcrt4_main.c +++ b/dlls/rpcrt4/rpcrt4_main.c @@ -95,6 +95,12 @@ struct threaddata struct context_handle_list *context_handle_list; }; +struct interface_header +{ + unsigned int length; + RPC_SYNTAX_IDENTIFIER id; +}; + /*********************************************************************** * DllMain * @@ -178,6 +184,25 @@ RPC_STATUS WINAPI RpcStringFreeW(RPC_WSTR* String) return RPC_S_OK; } +/************************************************************************* + * RpcIfInqId [RPCRT4.@] + * + * Get interface UUID and version. + */ +RPC_STATUS WINAPI RpcIfInqId(RPC_IF_HANDLE if_handle, RPC_IF_ID *if_id) +{ + struct interface_header *header = (struct interface_header *)if_handle; + + TRACE("(%p,%p)\n", if_handle, if_id); + + if_id->Uuid = header->id.SyntaxGUID; + if_id->VersMajor = header->id.SyntaxVersion.MajorVersion; + if_id->VersMinor = header->id.SyntaxVersion.MinorVersion; + TRACE("UUID:%s VersMajor:%hu VersMinor:%hu.\n", debugstr_guid(&if_id->Uuid), if_id->VersMajor, + if_id->VersMinor); + return RPC_S_OK; +} + /************************************************************************* * RpcRaiseException [RPCRT4.@] * diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index d3a3aee6c8..ce16145119 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -854,6 +854,55 @@ static void test_RpcBindingFree(void) status); } +static void test_RpcIfInqId(void) +{ + static const GUID guid = {0x12345678, 0xdead, 0xbeef, {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08}}; + static RPC_STATUS (WINAPI *pRpcIfInqId)(RPC_IF_HANDLE, RPC_IF_ID *); + RPC_SERVER_INTERFACE server_interface; + RPC_CLIENT_INTERFACE client_interface; + RPC_IF_HANDLE test_handles[2]; + RPC_STATUS status; + RPC_IF_ID if_id; + UINT test_idx; + + pRpcIfInqId = (void *)GetProcAddress(GetModuleHandleA("rpcrt4.dll"), "RpcIfInqId"); + + memset(&server_interface, 0, sizeof(server_interface)); + memset(&client_interface, 0, sizeof(client_interface)); + server_interface.InterfaceId.SyntaxGUID = guid; + server_interface.InterfaceId.SyntaxVersion.MajorVersion = 1; + server_interface.InterfaceId.SyntaxVersion.MinorVersion = 2; + client_interface.InterfaceId.SyntaxGUID = guid; + client_interface.InterfaceId.SyntaxVersion.MajorVersion = 1; + client_interface.InterfaceId.SyntaxVersion.MinorVersion = 2; + + /* Crash on Windows */ + if (0) + { + status = pRpcIfInqId(NULL, &if_id); + ok(status == RPC_S_INVALID_ARG, "Expected %#x, got %#x.\n", RPC_S_INVALID_ARG, status); + + status = pRpcIfInqId((RPC_IF_HANDLE)&server_interface, NULL); + ok(status == RPC_S_INVALID_ARG, "Expected %#x, got %#x.\n", RPC_S_INVALID_ARG, status); + } + + test_handles[0] = (RPC_IF_HANDLE)&server_interface; + test_handles[1] = (RPC_IF_HANDLE)&client_interface; + + for (test_idx = 0; test_idx < ARRAY_SIZE(test_handles); ++test_idx) + { + memset(&if_id, 0, sizeof(if_id)); + status = pRpcIfInqId(test_handles[test_idx], &if_id); + ok(status == RPC_S_OK, "Test %u: Expected %#x, got %#x.\n", test_idx, RPC_S_OK, status); + ok(!memcmp(&if_id.Uuid, &guid, sizeof(guid)), "Test %u: Expected UUID %s, got %s.\n", test_idx, + wine_dbgstr_guid(&guid), wine_dbgstr_guid(&if_id.Uuid)); + ok(if_id.VersMajor == 1, "Test %u: Expected major version %hu, got %hu.\n", test_idx, 1, + if_id.VersMajor); + ok(if_id.VersMinor == 2, "Test %u: Expected minor version %hu, got %hu.\n", test_idx, 2, + if_id.VersMinor); + } +} + static void test_RpcServerInqDefaultPrincName(void) { RPC_STATUS ret; @@ -1204,6 +1253,7 @@ START_TEST( rpc ) test_UuidCreate(); test_UuidCreateSequential(); test_RpcBindingFree(); + test_RpcIfInqId(); test_RpcServerInqDefaultPrincName(); test_RpcServerRegisterAuthInfo(); diff --git a/include/rpcdce.h b/include/rpcdce.h index fc1fcea77b..2b289b2655 100644 --- a/include/rpcdce.h +++ b/include/rpcdce.h @@ -593,6 +593,9 @@ RPCRTAPI RPC_STATUS RPC_ENTRY RpcStringFreeW(RPC_WSTR* String); #define RpcStringFree WINELIB_NAME_AW(RpcStringFree) +RPCRTAPI RPC_STATUS RPC_ENTRY + RpcIfInqId( RPC_IF_HANDLE RpcIfHandle, RPC_IF_ID *RpcIfId ); + RPCRTAPI RPC_STATUS RPC_ENTRY UuidToStringA( UUID* Uuid, RPC_CSTR* StringUuid ); RPCRTAPI RPC_STATUS RPC_ENTRY

1 0

Alex Henrie : kernelbase: Add GetPackageFamilyName stub.
by Alexandre Julliard 01 Jun '20

01 Jun '20

Module: wine Branch: master Commit: 7af9488c103e42d4e1ef79bf760add414987c57c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7af9488c103e42d4e1ef79bf… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun May 31 22:15:05 2020 -0600 kernelbase: Add GetPackageFamilyName stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49299 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-appmodel-runtime-l1-1-1.spec | 2 +- .../ext-ms-win-kernel32-package-l1-1-1.spec | 2 +- dlls/kernel32/kernel32.spec | 1 + dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/version.c | 10 ++++++++++ 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec b/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec index 4d2edd60f5..4c00082a15 100644 --- a/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec +++ b/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec @@ -9,7 +9,7 @@ @ stub GetCurrentPackageInfo @ stub GetCurrentPackagePath @ stub GetPackageApplicationIds -@ stub GetPackageFamilyName +@ stdcall GetPackageFamilyName(long ptr ptr) kernel32.GetPackageFamilyName @ stdcall GetPackageFullName(long ptr ptr) kernel32.GetPackageFullName @ stub GetPackageId @ stub GetPackageInfo diff --git a/dlls/ext-ms-win-kernel32-package-l1-1-1/ext-ms-win-kernel32-package-l1-1-1.spec b/dlls/ext-ms-win-kernel32-package-l1-1-1/ext-ms-win-kernel32-package-l1-1-1.spec index ae239528b3..214cd34471 100644 --- a/dlls/ext-ms-win-kernel32-package-l1-1-1/ext-ms-win-kernel32-package-l1-1-1.spec +++ b/dlls/ext-ms-win-kernel32-package-l1-1-1/ext-ms-win-kernel32-package-l1-1-1.spec @@ -7,7 +7,7 @@ @ stub AppXLookupMoniker @ stub ClosePackageInfo @ stub FormatApplicationUserModelId -@ stub GetPackageFamilyName +@ stdcall GetPackageFamilyName(long ptr ptr) kernel32.GetPackageFamilyName @ stdcall GetPackageFullName(long ptr ptr) kernel32.GetPackageFullName @ stub GetPackageId @ stub GetPackageInfo diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 1a6fdbab01..8645d48d77 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -762,6 +762,7 @@ @ stdcall -import GetOverlappedResult(long ptr ptr long) @ stdcall -import GetOverlappedResultEx(long ptr ptr long long) @ stdcall -import GetUserPreferredUILanguages(long ptr ptr ptr) +@ stdcall GetPackageFamilyName(long ptr ptr) kernelbase.GetPackageFamilyName @ stdcall GetPackageFullName(long ptr ptr) kernelbase.GetPackageFullName @ stdcall -import GetPhysicallyInstalledSystemMemory(ptr) @ stdcall -import GetPriorityClass(long) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 986cd851ed..10de1821d1 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -591,7 +591,7 @@ # @ stub GetPackageApplicationPropertyString # @ stub GetPackageApplicationResourcesContext # @ stub GetPackageContext -# @ stub GetPackageFamilyName +@ stdcall GetPackageFamilyName(long ptr ptr) # @ stub GetPackageFamilyNameFromToken @ stdcall GetPackageFullName(long ptr ptr) # @ stub GetPackageFullNameFromToken diff --git a/dlls/kernelbase/version.c b/dlls/kernelbase/version.c index d6d3237270..58c49aa148 100644 --- a/dlls/kernelbase/version.c +++ b/dlls/kernelbase/version.c @@ -1544,3 +1544,13 @@ LONG WINAPI /* DECLSPEC_HOTPATCH */ GetPackageFullName( HANDLE process, UINT32 * FIXME( "(%p %p %p): stub\n", process, length, name ); return APPMODEL_ERROR_NO_PACKAGE; } + + +/*********************************************************************** + * GetPackageFamilyName (kernelbase.@) + */ +LONG WINAPI /* DECLSPEC_HOTPATCH */ GetPackageFamilyName( HANDLE process, UINT32 *length, WCHAR *name ) +{ + FIXME( "(%p %p %p): stub\n", process, length, name ); + return APPMODEL_ERROR_NO_PACKAGE; +}

1 0

Nikolay Sivov : dwrite: Fix lookup collection when no suitable script was found.
by Alexandre Julliard 01 Jun '20

01 Jun '20

Module: wine Branch: master Commit: d5cca527501f2d4460cfaa149d397cb3771f6f27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5cca527501f2d4460cfaa14… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 1 12:23:33 2020 +0300 dwrite: Fix lookup collection when no suitable script was found. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 46 +++++++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index f4e9d3305a..c724327c50 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4403,9 +4403,10 @@ static void opentype_layout_collect_lookups(struct scriptshaping_context *contex unsigned int language_index, const struct shaping_features *features, const struct ot_gsubgpos_table *table, struct lookups *lookups) { - UINT16 table_offset, langsys_offset, script_feature_count, total_feature_count, total_lookup_count; + unsigned int last_num_lookups = 0, stage, script_feature_count = 0; + UINT16 total_feature_count, total_lookup_count; const struct ot_feature_list *feature_list; - unsigned int last_num_lookups = 0, stage; + const struct ot_langsys *langsys = NULL; struct shaping_feature *feature; unsigned int i, j, next_bit; unsigned int global_bit_shift = 1; @@ -4415,23 +4416,31 @@ static void opentype_layout_collect_lookups(struct scriptshaping_context *contex if (!table->table.data) return; - /* ScriptTable offset. */ - table_offset = table_read_be_word(&table->table, table->script_list + FIELD_OFFSET(struct ot_script_list, scripts) + - script_index * sizeof(struct ot_script_record) + FIELD_OFFSET(struct ot_script_record, script)); - if (!table_offset) - return; + if (script_index != ~0u) + { + unsigned int table_offset, langsys_offset; - if (language_index == ~0u) - langsys_offset = table_read_be_word(&table->table, table->script_list + table_offset); - else - langsys_offset = table_read_be_word(&table->table, table->script_list + table_offset + - FIELD_OFFSET(struct ot_script, langsys) + language_index * sizeof(struct ot_langsys_record) + - FIELD_OFFSET(struct ot_langsys_record, langsys)); + /* ScriptTable offset. */ + table_offset = table_read_be_word(&table->table, table->script_list + FIELD_OFFSET(struct ot_script_list, scripts) + + script_index * sizeof(struct ot_script_record) + FIELD_OFFSET(struct ot_script_record, script)); + if (!table_offset) + return; - script_feature_count = table_read_be_word(&table->table, table->script_list + table_offset + langsys_offset + - FIELD_OFFSET(struct ot_langsys, feature_count)); - if (!script_feature_count) - return; + if (language_index == ~0u) + langsys_offset = table_read_be_word(&table->table, table->script_list + table_offset); + else + langsys_offset = table_read_be_word(&table->table, table->script_list + table_offset + + FIELD_OFFSET(struct ot_script, langsys) + language_index * sizeof(struct ot_langsys_record) + + FIELD_OFFSET(struct ot_langsys_record, langsys)); + langsys_offset += table->script_list + table_offset; + + script_feature_count = table_read_be_word(&table->table, langsys_offset + FIELD_OFFSET(struct ot_langsys, feature_count)); + if (script_feature_count) + langsys = table_read_ensure(&table->table, langsys_offset, + FIELD_OFFSET(struct ot_langsys, feature_index[script_feature_count])); + if (!langsys) + script_feature_count = 0; + } total_feature_count = table_read_be_word(&table->table, table->feature_list); if (!total_feature_count) @@ -4467,8 +4476,7 @@ static void opentype_layout_collect_lookups(struct scriptshaping_context *contex for (j = 0; j < script_feature_count; ++j) { - feature_index = table_read_be_word(&table->table, table->script_list + table_offset + - langsys_offset + FIELD_OFFSET(struct ot_langsys, feature_index[j])); + feature_index = GET_BE_WORD(langsys->feature_index[j]); if (feature_index >= total_feature_count) continue; if ((found = feature_list->features[feature_index].tag == feature->tag))

1 0

Nikolay Sivov : dwrite: Add properties for recently added scripts.
by Alexandre Julliard 01 Jun '20

01 Jun '20

Module: wine Branch: master Commit: 75a34d9408e2c94b229403836d8f970af958c514 URL: https://source.winehq.org/git/wine.git/?a=commit;h=75a34d9408e2c94b22940383… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 1 12:23:34 2020 +0300 dwrite: Add properties for recently added scripts. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 4 ++++ dlls/dwrite/scripts.h | 6 +++++- tools/make_unicode | 5 +++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 56950a5baa..cb58f36299 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -194,6 +194,10 @@ static const struct dwritescript_properties dwritescripts_properties[Script_Last { /* Medf */ { 0x6664654d, 265, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, { _OT('m','e','d','f') } }, { /* Sogo */ { 0x6f676f53, 142, 8, 0x0020, 1, 1, 1, 0, 0, 0, 0 }, { _OT('s','o','g','o') } }, { /* Sogd */ { 0x64676f53, 141, 8, 0x0020, 1, 1, 0, 0, 0, 1, 1 }, { _OT('s','o','g','d') } }, + { /* Elym */ { 0x6d796c45, 128, 1, 0x0020, 0, 0, 1, 0, 0, 0, 0 } }, + { /* Hmnp */ { 0x706e6d48, 451, 8, 0x0020, 1, 1, 0, 0, 0, 0, 0 } }, + { /* Nand */ { 0x646e614e, 311, 8, 0x0020, 1, 1, 0, 0, 0, 1, 0 } }, + { /* Wcho */ { 0x6f686357, 283, 8, 0x0020, 1, 1, 0, 0, 0, 0, 0 } }, }; #undef _OT diff --git a/dlls/dwrite/scripts.h b/dlls/dwrite/scripts.h index 19cb89bd8a..d1bdb49de4 100644 --- a/dlls/dwrite/scripts.h +++ b/dlls/dwrite/scripts.h @@ -152,5 +152,9 @@ enum unicode_script_id { Script_Medefaidrin = 146, Script_Old_Sogdian = 147, Script_Sogdian = 148, - Script_LastId = 148 + Script_Elymaic = 149, + Script_Nyiakeng_Puachue_Hmong = 150, + Script_Nandinagari = 151, + Script_Wancho = 152, + Script_LastId = 152 }; diff --git a/tools/make_unicode b/tools/make_unicode index ec5d8eafb4..e18ec0a206 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -1440,6 +1440,11 @@ my %scripts = "Medefaidrin" => 146, "Old_Sogdian" => 147, "Sogdian" => 148, + # Win10 2004 + "Elymaic" => 149, + "Nyiakeng_Puachue_Hmong" => 150, + "Nandinagari" => 151, + "Wancho" => 152, ); ################################################################

1 0

Nikolay Sivov : dwrite: Implement contextual subsitution (GSUB lookup 5).
by Alexandre Julliard 01 Jun '20

01 Jun '20

Module: wine Branch: master Commit: e7324209e05a95df8b3856ee4de3ff7d5d0d401d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7324209e05a95df8b3856ee… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 1 12:23:35 2020 +0300 dwrite: Implement contextual subsitution (GSUB lookup 5). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 165 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 158 insertions(+), 7 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index c724327c50..f1b9fb4e47 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -610,7 +610,7 @@ struct ot_gsub_lig UINT16 components[1]; }; -struct ot_gsub_chaincontext_subst_format1 +struct ot_gsub_context_subst_format1 { UINT16 format; UINT16 coverage; @@ -5205,6 +5205,157 @@ static BOOL opentype_layout_apply_chain_rule_set(const struct match_context *mc, return FALSE; } +static BOOL opentype_layout_apply_gsub_context_lookup(unsigned int input_count, const UINT16 *input, unsigned int lookup_count, + const UINT16 *lookup_records, const struct match_context *mc) +{ + unsigned int match_positions[GLYPH_CONTEXT_MAX_LENGTH]; + unsigned int match_length = 0; + + return opentype_layout_context_match_input(mc, input_count, input, &match_length, match_positions) && + opentype_layout_context_gsub_apply_lookup(mc->context, input_count, match_positions, lookup_count, + lookup_records, match_length); +} + +static BOOL opentype_layout_apply_rule_set(const struct match_context *mc, unsigned int offset) +{ + unsigned int input_count, lookup_count; + const struct dwrite_fonttable *table = &mc->context->table->table; + const UINT16 *input, *lookup_records; + const struct ot_gsub_ruleset *ruleset; + unsigned int i, count; + + count = table_read_be_word(table, offset); + ruleset = table_read_ensure(table, offset, count * sizeof(ruleset->offsets)); + + for (i = 0; i < count; ++i) + { + unsigned int rule_offset = offset + GET_BE_WORD(ruleset->offsets[i]); + + if (!(input_count = table_read_be_word(table, rule_offset))) + continue; + rule_offset += 2; + + if (!(lookup_count = table_read_be_word(table, rule_offset))) + continue; + rule_offset += 2; + + if (!(input = table_read_ensure(table, rule_offset, (input_count - 1) * sizeof(*input)))) + continue; + rule_offset += (input_count - 1) * sizeof(*input); + + if (!(lookup_records = table_read_ensure(table, rule_offset, lookup_count * 2 * sizeof(*lookup_records)))) + continue; + + /* First applicable rule is used. */ + if (opentype_layout_apply_gsub_context_lookup(input_count, input, lookup_count, lookup_records, mc)) + return TRUE; + } + + return FALSE; +} + +static BOOL opentype_layout_apply_gsub_context_substitution(struct scriptshaping_context *context, const struct lookup *lookup, + unsigned int subtable_offset) +{ + struct match_context mc = { .context = context, .mask = lookup->mask }; + const struct dwrite_fonttable *table = &context->table->table; + unsigned int coverage_index = GLYPH_NOT_COVERED, count, offset; + UINT16 glyph, format, coverage; + BOOL ret = FALSE; + + glyph = context->u.subst.glyphs[context->cur]; + + format = table_read_be_word(table, subtable_offset); + + if (format == 1) + { + coverage = table_read_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_context_subst_format1, coverage)); + + coverage_index = opentype_layout_is_glyph_covered(table, subtable_offset + coverage, glyph); + if (coverage_index == GLYPH_NOT_COVERED) + return FALSE; + + count = table_read_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_context_subst_format1, + ruleset_count)); + if (coverage_index >= count) + return FALSE; + + offset = table_read_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_context_subst_format1, + rulesets[coverage_index])); + offset += subtable_offset; + + mc.match_func = opentype_match_glyph_func; + + ret = opentype_layout_apply_rule_set(&mc, offset); + } + else if (format == 2) + { + unsigned int input_classdef, rule_set_idx; + + offset = subtable_offset + 2 /* format */; + + coverage = table_read_be_word(table, offset); + offset += 2; + + coverage_index = opentype_layout_is_glyph_covered(table, subtable_offset + coverage, glyph); + if (coverage_index == GLYPH_NOT_COVERED) + return FALSE; + + input_classdef = table_read_be_word(table, offset) + subtable_offset; + offset += 2; + + count = table_read_be_word(table, offset); + offset+= 2; + + rule_set_idx = opentype_layout_get_glyph_class(table, input_classdef, glyph); + if (rule_set_idx >= count) + return FALSE; + + offset = table_read_be_word(table, offset + rule_set_idx * 2); + offset += subtable_offset; + + mc.input_offset = input_classdef; + mc.match_func = opentype_match_class_func; + + ret = opentype_layout_apply_rule_set(&mc, offset); + } + else if (format == 3) + { + unsigned int input_count, lookup_count; + const UINT16 *input, *lookup_records; + + offset = subtable_offset + 2 /* format */; + + input_count = table_read_be_word(table, offset); + offset += 2; + + if (!input_count) + return FALSE; + + lookup_count = table_read_be_word(table, offset); + offset += 2; + + if (!(input = table_read_ensure(table, offset, sizeof(*input) * input_count))) + return FALSE; + offset += sizeof(*input) * input_count; + + coverage_index = opentype_layout_is_glyph_covered(table, subtable_offset + GET_BE_WORD(input[0]), glyph); + if (coverage_index == GLYPH_NOT_COVERED) + return FALSE; + + lookup_records = table_read_ensure(table, offset, lookup_count * 2 * sizeof(*lookup_records)); + + mc.input_offset = subtable_offset; + mc.match_func = opentype_match_coverage_func; + + ret = opentype_layout_apply_gsub_context_lookup(input_count, input + 1, lookup_count, lookup_records, &mc); + } + else + WARN("Unknown contextual substitution format %u.\n", format); + + return ret; +} + static BOOL opentype_layout_apply_gsub_chain_context_substitution(struct scriptshaping_context *context, const struct lookup *lookup, unsigned int subtable_offset) { @@ -5220,19 +5371,17 @@ static BOOL opentype_layout_apply_gsub_chain_context_substitution(struct scripts if (format == 1) { - coverage = table_read_be_word(table, subtable_offset + - FIELD_OFFSET(struct ot_gsub_chaincontext_subst_format1, coverage)); + coverage = table_read_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_context_subst_format1, coverage)); coverage_index = opentype_layout_is_glyph_covered(table, subtable_offset + coverage, glyph); if (coverage_index == GLYPH_NOT_COVERED) return FALSE; - count = table_read_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_chaincontext_subst_format1, - ruleset_count)); + count = table_read_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_context_subst_format1, ruleset_count)); if (coverage_index >= count) return FALSE; - offset = table_read_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_chaincontext_subst_format1, + offset = table_read_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_context_subst_format1, rulesets[coverage_index])); offset += subtable_offset; @@ -5357,10 +5506,12 @@ static BOOL opentype_layout_apply_gsub_lookup(struct scriptshaping_context *cont case GSUB_LOOKUP_LIGATURE_SUBST: ret = opentype_layout_apply_gsub_lig_substitution(context, lookup, subtable_offset); break; + case GSUB_LOOKUP_CONTEXTUAL_SUBST: + ret = opentype_layout_apply_gsub_context_substitution(context, lookup, subtable_offset); + break; case GSUB_LOOKUP_CHAINING_CONTEXTUAL_SUBST: ret = opentype_layout_apply_gsub_chain_context_substitution(context, lookup, subtable_offset); break; - case GSUB_LOOKUP_CONTEXTUAL_SUBST: case GSUB_LOOKUP_REVERSE_CHAINING_CONTEXTUAL_SUBST: WARN("Unimplemented lookup %d.\n", lookup->type); break;

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

Rémi Bernon : ntdll: Introduce free_ranges indexing sequence.
by Alexandre Julliard 01 Jun '20

01 Jun '20

Module: wine Branch: master Commit: eb716839e1533fdba3614ac57bbc9de8639650f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb716839e1533fdba3614ac5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 29 20:11:18 2020 +0200 ntdll: Introduce free_ranges indexing sequence. This is an ordered range sequence used to keep track of free address ranges. The sequence contains an entry for every free address range, with base pointing to the first free address and end pointing to the next first used address. It is initialized to [0, ~0] for convenience, so that there's always a range before or after a view. In the worst case scenario, where memory is entirely fragmented, there's going to be one more range than allocated views, but in general there's much less. In any case, because of cache locality, iterating in the contiguous sequence is much faster than traversing the view rbtree. In theory there can be a performance hit when allocating or deleting a view, as we may have to move the end of the sequence when a range is split or merged. But in practice and given the usually low number of ranges, this is not an issue. The default and maximum sequence size can hold up to 65536 ranges, which is much more than enough in general, and performance is probably going to be bad before reaching the limit anyway. The code currently asserts when reaching the limit, although we could possibly grow the sequence. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 186 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 183 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 0ba46c35ac..e4da11902a 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -195,6 +195,177 @@ static void *preload_reserve_end; static BOOL use_locks; static BOOL force_exec_prot; /* whether to force PROT_EXEC on all PROT_READ mmaps */ +struct range_entry +{ + void *base; + void *end; +}; + +static struct range_entry *free_ranges; +static struct range_entry *free_ranges_end; + + +/*********************************************************************** + * free_ranges_lower_bound + * + * Returns the first range whose end is not less than addr, or end if there's none. + */ +static struct range_entry *free_ranges_lower_bound( void *addr ) +{ + struct range_entry *begin = free_ranges; + struct range_entry *end = free_ranges_end; + struct range_entry *mid; + + while (begin < end) + { + mid = begin + (end - begin) / 2; + if (mid->end < addr) + begin = mid + 1; + else + end = mid; + } + + return begin; +} + + +/*********************************************************************** + * free_ranges_insert_view + * + * Updates the free_ranges after a new view has been created. + */ +static void free_ranges_insert_view( struct file_view *view ) +{ + void *view_base = ROUND_ADDR( view->base, granularity_mask ); + void *view_end = ROUND_ADDR( (char *)view->base + view->size + granularity_mask, granularity_mask ); + struct range_entry *range = free_ranges_lower_bound( view_base ); + struct range_entry *next = range + 1; + + /* free_ranges initial value is such that the view is either inside range or before another one. */ + assert( range != free_ranges_end ); + assert( range->end > view_base || next != free_ranges_end ); + + /* this happens because virtual_alloc_thread_stack shrinks a view, then creates another one on top, + * or because AT_ROUND_TO_PAGE was used with NtMapViewOfSection to force 4kB aligned mapping. */ + if ((range->end > view_base && range->base >= view_end) || + (range->end == view_base && next->base >= view_end)) + { + /* on Win64, assert that it's correctly aligned so we're not going to be in trouble later */ + assert( (!is_win64 && !is_wow64) || view->base == view_base ); + WARN( "range %p - %p is already mapped\n", view_base, view_end ); + return; + } + + /* this should never happen */ + if (range->base > view_base || range->end < view_end) + ERR( "range %p - %p is already partially mapped\n", view_base, view_end ); + assert( range->base <= view_base && range->end >= view_end ); + + /* need to split the range in two */ + if (range->base < view_base && range->end > view_end) + { + memmove( next + 1, next, (free_ranges_end - next) * sizeof(struct range_entry) ); + free_ranges_end += 1; + if ((char *)free_ranges_end - (char *)free_ranges > view_block_size) + MESSAGE( "Free range sequence is full, trouble ahead!\n" ); + assert( (char *)free_ranges_end - (char *)free_ranges <= view_block_size ); + + next->base = view_end; + next->end = range->end; + range->end = view_base; + } + else + { + /* otherwise we just have to shrink it */ + if (range->base < view_base) + range->end = view_base; + else + range->base = view_end; + + if (range->base < range->end) return; + + /* and possibly remove it if it's now empty */ + memmove( range, next, (free_ranges_end - next) * sizeof(struct range_entry) ); + free_ranges_end -= 1; + assert( free_ranges_end - free_ranges > 0 ); + } +} + + +/*********************************************************************** + * free_ranges_remove_view + * + * Updates the free_ranges after a view has been destroyed. + */ +static void free_ranges_remove_view( struct file_view *view ) +{ + void *view_base = ROUND_ADDR( view->base, granularity_mask ); + void *view_end = ROUND_ADDR( (char *)view->base + view->size + granularity_mask, granularity_mask ); + struct range_entry *range = free_ranges_lower_bound( view_base ); + struct range_entry *next = range + 1; + + /* It's possible to use AT_ROUND_TO_PAGE on 32bit with NtMapViewOfSection to force 4kB alignment, + * and this breaks our assumptions. Look at the views around to check if the range is still in use. */ +#ifndef _WIN64 + struct file_view *prev_view = WINE_RB_ENTRY_VALUE( wine_rb_prev( &view->entry ), struct file_view, entry ); + struct file_view *next_view = WINE_RB_ENTRY_VALUE( wine_rb_next( &view->entry ), struct file_view, entry ); + void *prev_view_base = prev_view ? ROUND_ADDR( prev_view->base, granularity_mask ) : NULL; + void *prev_view_end = prev_view ? ROUND_ADDR( (char *)prev_view->base + prev_view->size + granularity_mask, granularity_mask ) : NULL; + void *next_view_base = next_view ? ROUND_ADDR( next_view->base, granularity_mask ) : NULL; + void *next_view_end = next_view ? ROUND_ADDR( (char *)next_view->base + next_view->size + granularity_mask, granularity_mask ) : NULL; + + if ((prev_view_base < view_end && prev_view_end > view_base) || + (next_view_base < view_end && next_view_end > view_base)) + { + WARN( "range %p - %p is still mapped\n", view_base, view_end ); + return; + } +#endif + + /* free_ranges initial value is such that the view is either inside range or before another one. */ + assert( range != free_ranges_end ); + assert( range->end > view_base || next != free_ranges_end ); + + /* this should never happen, but we can safely ignore it */ + if (range->base <= view_base && range->end >= view_end) + { + WARN( "range %p - %p is already unmapped\n", view_base, view_end ); + return; + } + + /* this should never happen */ + if (range->base < view_end && range->end > view_base) + ERR( "range %p - %p is already partially unmapped\n", view_base, view_end ); + assert( range->end <= view_base || range->base >= view_end ); + + /* merge with next if possible */ + if (range->end == view_base && next->base == view_end) + { + range->end = next->end; + memmove( next, next + 1, (free_ranges_end - next - 1) * sizeof(struct range_entry) ); + free_ranges_end -= 1; + assert( free_ranges_end - free_ranges > 0 ); + } + /* or try growing the range */ + else if (range->end == view_base) + range->end = view_end; + else if (range->base == view_end) + range->base = view_base; + /* otherwise create a new one */ + else + { + memmove( range + 1, range, (free_ranges_end - range) * sizeof(struct range_entry) ); + free_ranges_end += 1; + if ((char *)free_ranges_end - (char *)free_ranges > view_block_size) + MESSAGE( "Free range sequence is full, trouble ahead!\n" ); + assert( (char *)free_ranges_end - (char *)free_ranges <= view_block_size ); + + range->base = view_base; + range->end = view_end; + } +} + + static inline int is_view_valloc( const struct file_view *view ) { return !(view->protect & (SEC_FILE | SEC_RESERVE | SEC_COMMIT)); @@ -833,6 +1004,8 @@ static void delete_view( struct file_view *view ) /* [in] View */ { if (!(view->protect & VPROT_SYSTEM)) unmap_area( view->base, view->size ); set_page_vprot( view->base, view->size, 0 ); + if (unix_funcs->mmap_is_in_reserved_area( view->base, view->size )) + free_ranges_remove_view( view ); wine_rb_remove( &views_tree, &view->entry ); *(struct file_view **)view = next_free_view; next_free_view = view; @@ -880,6 +1053,8 @@ static NTSTATUS create_view( struct file_view **view_ret, void *base, size_t siz set_page_vprot( base, size, vprot ); wine_rb_put( &views_tree, view->base, &view->entry ); + if (unix_funcs->mmap_is_in_reserved_area( view->base, view->size )) + free_ranges_insert_view( view ); *view_ret = view; @@ -1981,9 +2156,9 @@ void virtual_init(void) /* try to find space in a reserved area for the views and pages protection table */ #ifdef _WIN64 pages_vprot_size = ((size_t)address_space_limit >> page_shift >> pages_vprot_shift) + 1; - alloc_views.size = view_block_size + pages_vprot_size * sizeof(*pages_vprot); + alloc_views.size = 2 * view_block_size + pages_vprot_size * sizeof(*pages_vprot); #else - alloc_views.size = view_block_size + (1U << (32 - page_shift)); + alloc_views.size = 2 * view_block_size + (1U << (32 - page_shift)); #endif if (unix_funcs->mmap_enum_reserved_areas( alloc_virtual_heap, &alloc_views, 1 )) unix_funcs->mmap_remove_reserved_area( alloc_views.base, alloc_views.size ); @@ -1993,9 +2168,14 @@ void virtual_init(void) assert( alloc_views.base != (void *)-1 ); view_block_start = alloc_views.base; view_block_end = view_block_start + view_block_size / sizeof(*view_block_start); - pages_vprot = (void *)((char *)alloc_views.base + view_block_size); + free_ranges = (void *)((char *)alloc_views.base + view_block_size); + pages_vprot = (void *)((char *)alloc_views.base + 2 * view_block_size); wine_rb_init( &views_tree, compare_view ); + free_ranges[0].base = (void *)0; + free_ranges[0].end = (void *)~0; + free_ranges_end = free_ranges + 1; + /* make the DOS area accessible (except the low 64K) to hide bugs in broken apps like Excel 2003 */ size = (char *)address_space_start - (char *)0x10000; if (size && unix_funcs->mmap_is_in_reserved_area( (void*)0x10000, size ) == 1)

1 0

Rémi Bernon : ntdll: Use the free ranges in find_reserved_free_area.
by Alexandre Julliard 01 Jun '20

01 Jun '20

Module: wine Branch: master Commit: 1f25c6edf7ae9ef9fde21ee3407ee79c97b74fe0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f25c6edf7ae9ef9fde21ee3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 29 20:11:19 2020 +0200 ntdll: Use the free ranges in find_reserved_free_area. Instead of the view rbtree. Testing shows a 20% FPS increase in We Happy Few, from 80-100fps to 100-120fps right after starting a new game. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 45 ++++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index e4da11902a..abad3b8a7d 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -797,40 +797,43 @@ static void *map_free_area( void *base, void *end, size_t size, int top_down, in */ static void *find_reserved_free_area( void *base, void *end, size_t size, int top_down ) { - struct wine_rb_entry *first = find_view_inside_range( &base, &end, top_down ); + struct range_entry *range; void *start; + base = ROUND_ADDR( (char *)base + granularity_mask, granularity_mask ); + end = (char *)ROUND_ADDR( (char *)end - size, granularity_mask ) + size; + if (top_down) { - start = ROUND_ADDR( (char *)end - size, granularity_mask ); - if (start >= end || start < base) return NULL; + start = (char *)end - size; + range = free_ranges_lower_bound( start ); + assert(range != free_ranges_end && range->end >= start); - while (first) + if ((char *)range->end - (char *)start < size) start = ROUND_ADDR( (char *)range->end - size, granularity_mask ); + do { - struct file_view *view = WINE_RB_ENTRY_VALUE( first, struct file_view, entry ); - - if ((char *)view->base + view->size <= (char *)start) break; - start = ROUND_ADDR( (char *)view->base - size, granularity_mask ); - /* stop if remaining space is not large enough */ - if (!start || start >= end || start < base) return NULL; - first = wine_rb_prev( first ); + if (start >= end || start < base || (char *)end - (char *)start < size) return NULL; + if (start < range->end && start >= range->base && (char *)range->end - (char *)start >= size) break; + if (--range < free_ranges) return NULL; + start = ROUND_ADDR( (char *)range->end - size, granularity_mask ); } + while (1); } else { - start = ROUND_ADDR( (char *)base + granularity_mask, granularity_mask ); - if (!start || start >= end || (char *)end - (char *)start < size) return NULL; + start = base; + range = free_ranges_lower_bound( start ); + assert(range != free_ranges_end && range->end >= start); - while (first) + if (start < range->base) start = ROUND_ADDR( (char *)range->base + granularity_mask, granularity_mask ); + do { - struct file_view *view = WINE_RB_ENTRY_VALUE( first, struct file_view, entry ); - - if ((char *)view->base >= (char *)start + size) break; - start = ROUND_ADDR( (char *)view->base + view->size + granularity_mask, granularity_mask ); - /* stop if remaining space is not large enough */ - if (!start || start >= end || (char *)end - (char *)start < size) return NULL; - first = wine_rb_next( first ); + if (start >= end || start < base || (char *)end - (char *)start < size) return NULL; + if (start < range->end && start >= range->base && (char *)range->end - (char *)start >= size) break; + if (++range == free_ranges_end) return NULL; + start = ROUND_ADDR( (char *)range->base + granularity_mask, granularity_mask ); } + while (1); } return start; }

1 0

Zebediah Figura : d3dcompiler: Store derefs as an offset to a variable.
by Alexandre Julliard 01 Jun '20

01 Jun '20

Module: wine Branch: master Commit: 323be6c51556ab6cea405694cc09e44616618858 URL: https://source.winehq.org/git/wine.git/?a=commit;h=323be6c51556ab6cea405694… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 22 15:45:29 2020 -0500 d3dcompiler: Store derefs as an offset to a variable. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/d3dcompiler_private.h | 24 +----- dlls/d3dcompiler_43/hlsl.y | 131 ++++++++++++++++-------------- dlls/d3dcompiler_43/utils.c | 76 +++-------------- 3 files changed, 86 insertions(+), 145 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=323be6c51556ab6cea40…

1 0