March 2017 - Wine-commits - list.winehq.org

Henri Verbeet : usp10: Introduce a helper function to lookup a language in a LoadedScript structure.
by Alexandre Julliard 28 Mar '17

28 Mar '17

Module: wine Branch: master Commit: 9a15753d40f7dbd90eadb270b03bb0ddb8411ad3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a15753d40f7dbd90eadb270b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 27 22:57:00 2017 +0200 usp10: Introduce a helper function to lookup a language in a LoadedScript structure. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index e5e7ece..b58731a 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -2610,6 +2610,19 @@ HRESULT OpenType_GetFontScriptTags(ScriptCache *psc, OPENTYPE_TAG searchingFor, return rc; } +static LoadedLanguage *usp10_script_get_language(LoadedScript *script, OPENTYPE_TAG tag) +{ + size_t i; + + for (i = 0; i < script->language_count; ++i) + { + if (script->languages[i].tag == tag) + return &script->languages[i]; + } + + return NULL; +} + static void GSUB_initialize_language_cache(LoadedScript *script) { int i; @@ -2646,6 +2659,7 @@ static void GPOS_expand_language_cache(LoadedScript *script) { int count; const OT_Script* table = script->gpos_table; + LoadedLanguage *language; DWORD offset; if (!table) @@ -2678,27 +2692,21 @@ static void GPOS_expand_language_cache(LoadedScript *script) } else if (count) { - int i,j; + int i; for (i = 0; i < count; i++) { int offset = GET_BE_WORD(table->LangSysRecord[i].LangSys); OPENTYPE_TAG tag = MS_MAKE_TAG(table->LangSysRecord[i].LangSysTag[0], table->LangSysRecord[i].LangSysTag[1], table->LangSysRecord[i].LangSysTag[2], table->LangSysRecord[i].LangSysTag[3]); - for (j = 0; j < script->language_count; j++) - { - if (script->languages[j].tag == tag) - { - script->languages[j].gpos_table = ((const BYTE*)table + offset); - break; - } - } - if (j == script->language_count) + if (!(language = usp10_script_get_language(script, tag))) { script->language_count++; - script->languages = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,script->languages, sizeof(LoadedLanguage) * script->language_count); - script->languages[j].tag = tag; - script->languages[j].gpos_table = ((const BYTE*)table + offset); + script->languages = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + script->languages, script->language_count * sizeof(*script->languages)); + language = &script->languages[script->language_count - 1]; + language->tag = tag; } + language->gpos_table = (const BYTE *)table + offset; } } } @@ -2919,16 +2927,7 @@ HRESULT OpenType_GetFontFeatureTags(ScriptCache *psc, OPENTYPE_TAG script_tag, O if ((script->default_language.gsub_table || script->default_language.gpos_table) && script->default_language.tag == language_tag) language = &script->default_language; else - { - for (i = 0; i < script->language_count; i++) - { - if (script->languages[i].tag == language_tag) - { - language = &script->languages[i]; - break; - } - } - } + language = usp10_script_get_language(script, language_tag); if (!language) {

1 0

Henri Verbeet : usp10: Double the scripts array size when growing it in GPOS_expand_script_cache ().
by Alexandre Julliard 28 Mar '17

28 Mar '17

Module: wine Branch: master Commit: 218be443b66518b265f266c02d2e89d6e2fad092 URL: http://source.winehq.org/git/wine.git/?a=commit;h=218be443b66518b265f266c02… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 27 22:57:01 2017 +0200 usp10: Double the scripts array size when growing it in GPOS_expand_script_cache(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 17 +++++++++++------ dlls/usp10/usp10.c | 30 ++++++++++++++++++++++++++++++ dlls/usp10/usp10_internal.h | 4 +++- 3 files changed, 44 insertions(+), 7 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index b58731a..3786473 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -2504,7 +2504,7 @@ static void GSUB_initialize_script_cache(ScriptCache *psc) const GSUB_Header* header = (const GSUB_Header*)psc->GSUB_Table; script = (const OT_ScriptList*)((const BYTE*)header + GET_BE_WORD(header->ScriptList)); psc->script_count = GET_BE_WORD(script->ScriptCount); - TRACE("initializing %i scripts in this font\n",psc->script_count); + TRACE("initializing %li scripts in this font\n",psc->script_count); if (psc->script_count) { psc->scripts = heap_alloc_zero(psc->script_count * sizeof(*psc->scripts)); @@ -2537,7 +2537,7 @@ static void GPOS_expand_script_cache(ScriptCache *psc) if (!psc->script_count) { psc->script_count = count; - TRACE("initializing %i scripts in this font\n",psc->script_count); + TRACE("initializing %li scripts in this font\n",psc->script_count); if (psc->script_count) { psc->scripts = heap_alloc_zero(psc->script_count * sizeof(*psc->scripts)); @@ -2558,10 +2558,15 @@ static void GPOS_expand_script_cache(ScriptCache *psc) if (!(loaded_script = usp10_script_cache_get_script(psc, tag))) { - psc->script_count++; - psc->scripts = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - psc->scripts, psc->script_count * sizeof(*psc->scripts)); - loaded_script = &psc->scripts[psc->script_count - 1]; + if (!usp10_array_reserve((void **)&psc->scripts, &psc->scripts_size, + psc->script_count + 1, sizeof(*psc->scripts))) + { + ERR("Failed grow scripts array.\n"); + return; + } + + loaded_script = &psc->scripts[psc->script_count]; + ++psc->script_count; loaded_script->tag = tag; } loaded_script->gpos_table = (const BYTE *)script + offset; diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index d7b7d9a..2df27be 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -708,6 +708,36 @@ typedef struct { WORD target; } FindGlyph_struct; +BOOL usp10_array_reserve(void **elements, SIZE_T *capacity, SIZE_T count, SIZE_T size) +{ + SIZE_T max_capacity, new_capacity; + void *new_elements; + + if (count <= *capacity) + return TRUE; + + max_capacity = ~(SIZE_T)0 / size; + if (count > max_capacity) + return FALSE; + + new_capacity = max(1, *capacity); + while (new_capacity < count && new_capacity <= max_capacity / 2) + new_capacity *= 2; + if (new_capacity < count) + new_capacity = count; + + if (!*elements) + new_elements = heap_alloc_zero(new_capacity * size); + else + new_elements = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, *elements, new_capacity * size); + if (!new_elements) + return FALSE; + + *elements = new_elements; + *capacity = new_capacity; + return TRUE; +} + /* TODO Fix font properties on Arabic locale */ static inline BOOL set_cache_font_properties(const HDC hdc, ScriptCache *sc) { diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index f906885..9a8b5131 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -186,8 +186,9 @@ typedef struct { void *CMAP_format12_Table; void *GPOS_Table; BOOL scripts_initialized; - INT script_count; LoadedScript *scripts; + SIZE_T scripts_size; + SIZE_T script_count; OPENTYPE_TAG userScript; OPENTYPE_TAG userLang; @@ -245,6 +246,7 @@ typedef void (*reorder_function)(WCHAR *chars, IndicSyllable *syllable, lexical_ #define BIDI_WEAK 2 #define BIDI_NEUTRAL 0 +BOOL usp10_array_reserve(void **elements, SIZE_T *capacity, SIZE_T count, SIZE_T size) DECLSPEC_HIDDEN; int USP10_FindGlyphInLogClust(const WORD* pwLogClust, int cChars, WORD target) DECLSPEC_HIDDEN; BOOL BIDI_DetermineLevels(const WCHAR *string, unsigned int count, const SCRIPT_STATE *s,

1 0

Henri Verbeet : usp10: Double the languages array size when growing it in GPOS_expand_language_cache ().
by Alexandre Julliard 28 Mar '17

28 Mar '17

Module: wine Branch: master Commit: 0ffd5b45ea610ffe9c0c4c7803cb3d98d64760ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ffd5b45ea610ffe9c0c4c780… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 27 22:57:02 2017 +0200 usp10: Double the languages array size when growing it in GPOS_expand_language_cache(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 15 ++++++++++----- dlls/usp10/usp10_internal.h | 3 ++- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 3786473..2731c44 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -2646,7 +2646,7 @@ static void GSUB_initialize_language_cache(LoadedScript *script) if (script->language_count) { - TRACE("Deflang %p, LangCount %i\n",script->default_language.gsub_table, script->language_count); + TRACE("Deflang %p, LangCount %li\n",script->default_language.gsub_table, script->language_count); script->languages = heap_alloc_zero(script->language_count * sizeof(*script->languages)); @@ -2705,10 +2705,15 @@ static void GPOS_expand_language_cache(LoadedScript *script) if (!(language = usp10_script_get_language(script, tag))) { - script->language_count++; - script->languages = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - script->languages, script->language_count * sizeof(*script->languages)); - language = &script->languages[script->language_count - 1]; + if (!usp10_array_reserve((void **)&script->languages, &script->languages_size, + script->language_count + 1, sizeof(*script->languages))) + { + ERR("Failed grow languages array.\n"); + return; + } + + language = &script->languages[script->language_count]; + ++script->language_count; language->tag = tag; } language->gpos_table = (const BYTE *)table + offset; diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 9a8b5131..2dfca86 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -164,8 +164,9 @@ typedef struct { const void *gpos_table; LoadedLanguage default_language; BOOL languages_initialized; - INT language_count; LoadedLanguage *languages; + SIZE_T languages_size; + SIZE_T language_count; } LoadedScript; typedef struct {

1 0

Henri Verbeet : usp10: Get rid of some code duplication in GPOS_expand_feature_cache().
by Alexandre Julliard 28 Mar '17

28 Mar '17

Module: wine Branch: master Commit: 9b0f3f1bacbe3d5ba57dbef803276e4c9597dae0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b0f3f1bacbe3d5ba57dbef80… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 27 22:57:03 2017 +0200 usp10: Get rid of some code duplication in GPOS_expand_feature_cache(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 78 +++++++++++++++------------------------------------ 1 file changed, 23 insertions(+), 55 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 2731c44..2b67706 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -2829,10 +2829,10 @@ static void GSUB_initialize_feature_cache(const void *table, LoadedLanguage *lan static void GPOS_expand_feature_cache(const void *table, LoadedLanguage *language) { - int i, count; const OT_LangSys *lang = language->gpos_table; const GPOS_Header *header = (const GPOS_Header *)table; const OT_FeatureList *feature_list; + unsigned int i, j, count; if (!lang) return; @@ -2846,63 +2846,31 @@ static void GPOS_expand_feature_cache(const void *table, LoadedLanguage *languag return; if (!language->feature_count) - { - language->feature_count = count; - - if (language->feature_count) - { - language->features = heap_alloc(language->feature_count * sizeof(*language->features)); - - for (i = 0; i < language->feature_count; i++) - { - LoadedFeature *loaded_feature = &language->features[i]; - const OT_Feature *feature; - int j; - int index = GET_BE_WORD(lang->FeatureIndex[i]); - - loaded_feature->tag = MS_MAKE_TAG(feature_list->FeatureRecord[index].FeatureTag[0], - feature_list->FeatureRecord[index].FeatureTag[1], - feature_list->FeatureRecord[index].FeatureTag[2], - feature_list->FeatureRecord[index].FeatureTag[3]); - loaded_feature->feature = ((const BYTE *)feature_list - + GET_BE_WORD(feature_list->FeatureRecord[index].Feature)); - feature = loaded_feature->feature; - loaded_feature->lookup_count = GET_BE_WORD(feature->LookupCount); - loaded_feature->lookups = heap_alloc(loaded_feature->lookup_count * sizeof(*loaded_feature->lookups)); - for (j = 0; j < loaded_feature->lookup_count; ++j) - loaded_feature->lookups[j] = GET_BE_WORD(feature->LookupListIndex[j]); - loaded_feature->tableType = FEATURE_GPOS_TABLE; - } - } - } + language->features = heap_alloc(count * sizeof(*language->features)); else - { - language->features = HeapReAlloc(GetProcessHeap(),0,language->features, sizeof(LoadedFeature)*(language->feature_count + count)); + language->features = HeapReAlloc(GetProcessHeap(), 0, language->features, + (language->feature_count + count) * sizeof(*language->features)); - for (i = 0; i < count; i++) - { - LoadedFeature *loaded_feature; - const OT_Feature *feature; - int j; - int index = GET_BE_WORD(lang->FeatureIndex[i]); - int idx = language->feature_count + i; - - loaded_feature = &language->features[idx]; - loaded_feature->tag = MS_MAKE_TAG(feature_list->FeatureRecord[index].FeatureTag[0], - feature_list->FeatureRecord[index].FeatureTag[1], - feature_list->FeatureRecord[index].FeatureTag[2], - feature_list->FeatureRecord[index].FeatureTag[3]); - loaded_feature->feature = ((const BYTE *)feature_list - + GET_BE_WORD(feature_list->FeatureRecord[index].Feature)); - feature = loaded_feature->feature; - loaded_feature->lookup_count = GET_BE_WORD(feature->LookupCount); - loaded_feature->lookups = heap_alloc(loaded_feature->lookup_count * sizeof(*loaded_feature->lookups)); - for (j = 0; j < loaded_feature->lookup_count; ++j) - loaded_feature->lookups[j] = GET_BE_WORD(feature->LookupListIndex[j]); - loaded_feature->tableType = FEATURE_GPOS_TABLE; - } - language->feature_count += count; + for (i = 0; i < count; ++i) + { + const OT_FeatureRecord *record; + LoadedFeature *loaded_feature; + const OT_Feature *feature; + + record = &feature_list->FeatureRecord[GET_BE_WORD(lang->FeatureIndex[i])]; + feature = (const OT_Feature *)((const BYTE *)feature_list + GET_BE_WORD(record->Feature)); + + loaded_feature = &language->features[language->feature_count + i]; + loaded_feature->tag = MS_MAKE_TAG(record->FeatureTag[0], record->FeatureTag[1], + record->FeatureTag[2], record->FeatureTag[3]); + loaded_feature->tableType = FEATURE_GPOS_TABLE; + loaded_feature->feature = feature; + loaded_feature->lookup_count = GET_BE_WORD(feature->LookupCount); + loaded_feature->lookups = heap_alloc(loaded_feature->lookup_count * sizeof(*loaded_feature->lookups)); + for (j = 0; j < loaded_feature->lookup_count; ++j) + loaded_feature->lookups[j] = GET_BE_WORD(feature->LookupListIndex[j]); } + language->feature_count += count; } static void _initialize_feature_cache(ScriptCache *psc, LoadedLanguage *language)

1 0

Henri Verbeet : usp10: Get rid of the code duplication between GSUB_initialize_feature_cache() and GPOS_expand_feature_cache().
by Alexandre Julliard 28 Mar '17

28 Mar '17

Module: wine Branch: master Commit: 63bcfa3354edd910ee52b8134af191f7a774b701 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63bcfa3354edd910ee52b8134… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 27 22:57:04 2017 +0200 usp10: Get rid of the code duplication between GSUB_initialize_feature_cache() and GPOS_expand_feature_cache(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 86 ++++++++++++++------------------------------------- 1 file changed, 23 insertions(+), 63 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 2b67706..a8b3975 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -2783,64 +2783,13 @@ HRESULT OpenType_GetFontLanguageTags(ScriptCache *psc, OPENTYPE_TAG script_tag, return rc; } - -static void GSUB_initialize_feature_cache(const void *table, LoadedLanguage *language) -{ - int i; - - if (language->gsub_table) - { - const OT_LangSys *lang = language->gsub_table; - const GSUB_Header *header = (const GSUB_Header *)table; - const OT_FeatureList *feature_list; - - language->feature_count = GET_BE_WORD(lang->FeatureCount); - TRACE("%i features\n",language->feature_count); - - if (language->feature_count) - { - language->features = heap_alloc(language->feature_count * sizeof(*language->features)); - - feature_list = (const OT_FeatureList*)((const BYTE*)header + GET_BE_WORD(header->FeatureList)); - - for (i = 0; i < language->feature_count; i++) - { - LoadedFeature *loaded_feature = &language->features[i]; - const OT_Feature *feature; - int j; - int index = GET_BE_WORD(lang->FeatureIndex[i]); - - loaded_feature->tag = MS_MAKE_TAG(feature_list->FeatureRecord[index].FeatureTag[0], - feature_list->FeatureRecord[index].FeatureTag[1], - feature_list->FeatureRecord[index].FeatureTag[2], - feature_list->FeatureRecord[index].FeatureTag[3]); - loaded_feature->feature = ((const BYTE *)feature_list - + GET_BE_WORD(feature_list->FeatureRecord[index].Feature)); - feature = loaded_feature->feature; - loaded_feature->lookup_count = GET_BE_WORD(feature->LookupCount); - loaded_feature->lookups = heap_alloc(loaded_feature->lookup_count * sizeof(*loaded_feature->lookups)); - for (j = 0; j < loaded_feature->lookup_count; ++j) - loaded_feature->lookups[j] = GET_BE_WORD(feature->LookupListIndex[j]); - loaded_feature->tableType = FEATURE_GSUB_TABLE; - } - } - } -} - -static void GPOS_expand_feature_cache(const void *table, LoadedLanguage *language) +static void usp10_language_add_feature_list(LoadedLanguage *language, char table_type, + const OT_LangSys *lang, const OT_FeatureList *feature_list) { - const OT_LangSys *lang = language->gpos_table; - const GPOS_Header *header = (const GPOS_Header *)table; - const OT_FeatureList *feature_list; - unsigned int i, j, count; + unsigned int count = GET_BE_WORD(lang->FeatureCount); + unsigned int i, j; - if (!lang) - return; - - count = GET_BE_WORD(lang->FeatureCount); - feature_list = (const OT_FeatureList*)((const BYTE*)header + GET_BE_WORD(header->FeatureList)); - - TRACE("%i features\n",count); + TRACE("table_type %#x, %u features.\n", table_type, count); if (!count) return; @@ -2863,7 +2812,7 @@ static void GPOS_expand_feature_cache(const void *table, LoadedLanguage *languag loaded_feature = &language->features[language->feature_count + i]; loaded_feature->tag = MS_MAKE_TAG(record->FeatureTag[0], record->FeatureTag[1], record->FeatureTag[2], record->FeatureTag[3]); - loaded_feature->tableType = FEATURE_GPOS_TABLE; + loaded_feature->tableType = table_type; loaded_feature->feature = feature; loaded_feature->lookup_count = GET_BE_WORD(feature->LookupCount); loaded_feature->lookups = heap_alloc(loaded_feature->lookup_count * sizeof(*loaded_feature->lookups)); @@ -2875,12 +2824,23 @@ static void GPOS_expand_feature_cache(const void *table, LoadedLanguage *languag static void _initialize_feature_cache(ScriptCache *psc, LoadedLanguage *language) { - if (!language->features_initialized) - { - GSUB_initialize_feature_cache(psc->GSUB_Table, language); - GPOS_expand_feature_cache(psc->GPOS_Table, language); - language->features_initialized = TRUE; - } + const GSUB_Header *gsub_header = psc->GSUB_Table; + const GPOS_Header *gpos_header = psc->GPOS_Table; + const OT_FeatureList *feature_list; + const OT_LangSys *lang; + + if (language->features_initialized) + return; + + feature_list = (const OT_FeatureList *)((const BYTE *)gsub_header + GET_BE_WORD(gsub_header->FeatureList)); + if ((lang = language->gsub_table)) + usp10_language_add_feature_list(language, FEATURE_GSUB_TABLE, lang, feature_list); + + feature_list = (const OT_FeatureList *)((const BYTE *)gpos_header + GET_BE_WORD(gpos_header->FeatureList)); + if ((lang = language->gpos_table)) + usp10_language_add_feature_list(language, FEATURE_GPOS_TABLE, lang, feature_list); + + language->features_initialized = TRUE; } HRESULT OpenType_GetFontFeatureTags(ScriptCache *psc, OPENTYPE_TAG script_tag, OPENTYPE_TAG language_tag, BOOL filtered, OPENTYPE_TAG searchingFor, char tableType, int cMaxTags, OPENTYPE_TAG *pFeatureTags, int *pcTags, LoadedFeature** feature)

1 0

Piotr Caban : msvcrt: Add Scheduler class stub.
by Alexandre Julliard 28 Mar '17

28 Mar '17

Module: wine Branch: master Commit: b816418471d2c229f54e84d75184d9bd61e5ff31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b816418471d2c229f54e84d75… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 28 10:50:17 2017 +0200 msvcrt: Add Scheduler class stub. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 10 +++++----- dlls/msvcr100/msvcr100.spec | 10 +++++----- dlls/msvcr110/msvcr110.spec | 10 +++++----- dlls/msvcr120/msvcr120.spec | 10 +++++----- dlls/msvcr120_app/msvcr120_app.spec | 10 +++++----- dlls/msvcrt/scheduler.c | 25 +++++++++++++++++++++++++ 6 files changed, 50 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b816418471d2c229f54e8…

1 0

Piotr Caban : msvcrt: Add Scheduler::Create implementation.
by Alexandre Julliard 28 Mar '17

28 Mar '17

Module: wine Branch: master Commit: bac1ca7033eb619968590bca0e11d08cbecff6f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bac1ca7033eb619968590bca0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 28 10:50:24 2017 +0200 msvcrt: Add Scheduler::Create implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/scheduler.c | 158 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 153 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index 96f8582..a1fd8ba 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -83,6 +83,15 @@ typedef struct { extern const vtable_ptr MSVCRT_ExternalContextBase_vtable; static void ExternalContextBase_ctor(ExternalContextBase*); +typedef struct { + const vtable_ptr *vtable; +} Scheduler; + +typedef struct { + Scheduler scheduler; +} ThreadScheduler; +extern const vtable_ptr MSVCRT_ThreadScheduler_vtable; + static int context_tls_index = TLS_OUT_OF_INDEXES; static Context* try_get_current_context(void) @@ -506,16 +515,134 @@ void __thiscall SchedulerPolicy_dtor(SchedulerPolicy *this) MSVCRT_operator_delete(this->policy_container); } -typedef struct { - const vtable_ptr *vtable; -} Scheduler; +DEFINE_THISCALL_WRAPPER(ThreadScheduler_Id, 4) +unsigned int __thiscall ThreadScheduler_Id(const ThreadScheduler *this) +{ + FIXME("(%p) stub\n", this); + return 0; +} + +DEFINE_THISCALL_WRAPPER(ThreadScheduler_GetNumberOfVirtualProcessors, 4) +unsigned int __thiscall ThreadScheduler_GetNumberOfVirtualProcessors(const ThreadScheduler *this) +{ + FIXME("(%p) stub\n", this); + return 0; +} + +DEFINE_THISCALL_WRAPPER(ThreadScheduler_GetPolicy, 8) +SchedulerPolicy* __thiscall ThreadScheduler_GetPolicy( + const ThreadScheduler *this, SchedulerPolicy *ret) +{ + FIXME("(%p %p) stub\n", this, ret); + return NULL; +} + +DEFINE_THISCALL_WRAPPER(ThreadScheduler_Reference, 4) +unsigned int __thiscall ThreadScheduler_Reference(ThreadScheduler *this) +{ + FIXME("(%p) stub\n", this); + return 0; +} + +DEFINE_THISCALL_WRAPPER(ThreadScheduler_Release, 4) +unsigned int __thiscall ThreadScheduler_Release(ThreadScheduler *this) +{ + FIXME("(%p) stub\n", this); + return 0; +} + +DEFINE_THISCALL_WRAPPER(ThreadScheduler_RegisterShutdownEvent, 8) +void __thiscall ThreadScheduler_RegisterShutdownEvent(ThreadScheduler *this, HANDLE event) +{ + FIXME("(%p %p) stub\n", this, event); +} + +DEFINE_THISCALL_WRAPPER(ThreadScheduler_Attach, 4) +void __thiscall ThreadScheduler_Attach(ThreadScheduler *this) +{ + FIXME("(%p) stub\n", this); +} + +DEFINE_THISCALL_WRAPPER(ThreadScheduler_CreateScheduleGroup_loc, 8) +/*ScheduleGroup*/void* __thiscall ThreadScheduler_CreateScheduleGroup_loc( + ThreadScheduler *this, /*location*/void *placement) +{ + FIXME("(%p %p) stub\n", this, placement); + return NULL; +} + +DEFINE_THISCALL_WRAPPER(ThreadScheduler_CreateScheduleGroup, 4) +/*ScheduleGroup*/void* __thiscall ThreadScheduler_CreateScheduleGroup(ThreadScheduler *this) +{ + FIXME("(%p) stub\n", this); + return NULL; +} + +DEFINE_THISCALL_WRAPPER(ThreadScheduler_ScheduleTask_loc, 16) +void __thiscall ThreadScheduler_ScheduleTask_loc(ThreadScheduler *this, + void (__cdecl *proc)(void*), void* data, /*location*/void *placement) +{ + FIXME("(%p %p %p %p) stub\n", this, proc, data, placement); +} + +DEFINE_THISCALL_WRAPPER(ThreadScheduler_ScheduleTask, 12) +void __thiscall ThreadScheduler_ScheduleTask(ThreadScheduler *this, + void (__cdecl *proc)(void*), void* data) +{ + FIXME("(%p %p %p) stub\n", this, proc, data); +} + +DEFINE_THISCALL_WRAPPER(ThreadScheduler_IsAvailableLocation, 8) +MSVCRT_bool __thiscall ThreadScheduler_IsAvailableLocation( + const ThreadScheduler *this, const /*location*/void *placement) +{ + FIXME("(%p %p) stub\n", this, placement); + return FALSE; +} + +static void ThreadScheduler_dtor(ThreadScheduler *this) +{ +} + +DEFINE_THISCALL_WRAPPER(ThreadScheduler_vector_dtor, 8) +Scheduler* __thiscall ThreadScheduler_vector_dtor(ThreadScheduler *this, unsigned int flags) +{ + TRACE("(%p %x)\n", this, flags); + if(flags & 2) { + /* we have an array, with the number of elements stored before the first object */ + INT_PTR i, *ptr = (INT_PTR *)this-1; + + for(i=*ptr-1; i>=0; i--) + ThreadScheduler_dtor(this+i); + MSVCRT_operator_delete(ptr); + } else { + ThreadScheduler_dtor(this); + if(flags & 1) + MSVCRT_operator_delete(this); + } + + return &this->scheduler; +} + +static ThreadScheduler* ThreadScheduler_ctor(ThreadScheduler *this, + const SchedulerPolicy *policy) +{ + TRACE("(%p)->()\n", this); + + this->scheduler.vtable = &MSVCRT_ThreadScheduler_vtable; + return this; +} /* ?Create(a)Scheduler@Concurrency@@SAPAV12(a)ABVSchedulerPolicy@2@@Z */ /* ?Create(a)Scheduler@Concurrency@@SAPEAV12(a)AEBVSchedulerPolicy@2@@Z */ Scheduler* __cdecl Scheduler_Create(const SchedulerPolicy *policy) { - FIXME("(%p) stub\n", policy); - return NULL; + ThreadScheduler *ret; + + TRACE("(%p)\n", policy); + + ret = MSVCRT_operator_new(sizeof(*ret)); + return &ThreadScheduler_ctor(ret, policy)->scheduler; } /* ?ResetDefaultSchedulerPolicy(a)Scheduler@Concurrency@@SAXXZ */ @@ -536,6 +663,10 @@ DEFINE_RTTI_DATA0(Context, 0, ".?AVContext(a)Concurrency@@") DEFINE_RTTI_DATA1(ContextBase, 0, &Context_rtti_base_descriptor, ".?AVContextBase(a)details@Concurrency@@") DEFINE_RTTI_DATA2(ExternalContextBase, 0, &ContextBase_rtti_base_descriptor, &Context_rtti_base_descriptor, ".?AVExternalContextBase(a)details@Concurrency@@") +DEFINE_RTTI_DATA0(Scheduler, 0, ".?AVScheduler(a)Concurrency@@") +DEFINE_RTTI_DATA1(SchedulerBase, 0, &Scheduler_rtti_base_descriptor, ".?AVSchedulerBase(a)details@Concurrency@@") +DEFINE_RTTI_DATA2(ThreadScheduler, 0, &SchedulerBase_rtti_base_descriptor, + &Scheduler_rtti_base_descriptor, ".?AVThreadScheduler(a)details@Concurrency@@") #ifndef __GNUC__ void __asm_dummy_vtables(void) { @@ -547,6 +678,20 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(ExternalContextBase_Unblock) VTABLE_ADD_FUNC(ExternalContextBase_IsSynchronouslyBlocked) VTABLE_ADD_FUNC(ExternalContextBase_vector_dtor)); + __ASM_VTABLE(ThreadScheduler, + VTABLE_ADD_FUNC(ThreadScheduler_vector_dtor) + VTABLE_ADD_FUNC(ThreadScheduler_Id) + VTABLE_ADD_FUNC(ThreadScheduler_GetNumberOfVirtualProcessors) + VTABLE_ADD_FUNC(ThreadScheduler_GetPolicy) + VTABLE_ADD_FUNC(ThreadScheduler_Reference) + VTABLE_ADD_FUNC(ThreadScheduler_Release) + VTABLE_ADD_FUNC(ThreadScheduler_RegisterShutdownEvent) + VTABLE_ADD_FUNC(ThreadScheduler_Attach) + VTABLE_ADD_FUNC(ThreadScheduler_CreateScheduleGroup_loc) + VTABLE_ADD_FUNC(ThreadScheduler_CreateScheduleGroup) + VTABLE_ADD_FUNC(ThreadScheduler_ScheduleTask_loc) + VTABLE_ADD_FUNC(ThreadScheduler_ScheduleTask) + VTABLE_ADD_FUNC(ThreadScheduler_IsAvailableLocation)); #ifndef __GNUC__ } #endif @@ -557,6 +702,9 @@ void msvcrt_init_scheduler(void *base) init_Context_rtti(base); init_ContextBase_rtti(base); init_ExternalContextBase_rtti(base); + init_Scheduler_rtti(base); + init_SchedulerBase_rtti(base); + init_ThreadScheduler_rtti(base); #endif }

1 0

Piotr Caban : msvcrt: Add ThreadScheduler::GetPolicy implementation.
by Alexandre Julliard 28 Mar '17

28 Mar '17

Module: wine Branch: master Commit: 5debf060b8cba0639694f4a8088b2b72b4561f60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5debf060b8cba0639694f4a80… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 28 10:50:32 2017 +0200 msvcrt: Add ThreadScheduler::GetPolicy implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/scheduler.c | 47 +++++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index a1fd8ba..1c9a770 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -52,6 +52,26 @@ DEFINE_VTBL_WRAPPER(20); #endif +typedef enum { + SchedulerKind, + MaxConcurrency, + MinConcurrency, + TargetOversubscriptionFactor, + LocalContextCacheSize, + ContextStackSize, + ContextPriority, + SchedulingProtocol, + DynamicProgressFeedback, + WinRTInitialization, + last_policy_id +} PolicyElementKey; + +typedef struct { + struct _policy_container { + unsigned int policies[last_policy_id]; + } *policy_container; +} SchedulerPolicy; + typedef struct { const vtable_ptr *vtable; } Context; @@ -89,6 +109,7 @@ typedef struct { typedef struct { Scheduler scheduler; + SchedulerPolicy policy; } ThreadScheduler; extern const vtable_ptr MSVCRT_ThreadScheduler_vtable; @@ -329,26 +350,6 @@ void CDECL Concurrency_Free(void* mem) } } -typedef enum { - SchedulerKind, - MaxConcurrency, - MinConcurrency, - TargetOversubscriptionFactor, - LocalContextCacheSize, - ContextStackSize, - ContextPriority, - SchedulingProtocol, - DynamicProgressFeedback, - WinRTInitialization, - last_policy_id -} PolicyElementKey; - -typedef struct { - struct _policy_container { - unsigned int policies[last_policy_id]; - } *policy_container; -} SchedulerPolicy; - /* ?SetPolicyValue(a)SchedulerPolicy@Concurrency@@QAEIW4PolicyElementKey(a)2@I(a)Z */ /* ?SetPolicyValue(a)SchedulerPolicy@Concurrency@@QEAAIW4PolicyElementKey(a)2@I(a)Z */ DEFINE_THISCALL_WRAPPER(SchedulerPolicy_SetPolicyValue, 12) @@ -533,8 +534,8 @@ DEFINE_THISCALL_WRAPPER(ThreadScheduler_GetPolicy, 8) SchedulerPolicy* __thiscall ThreadScheduler_GetPolicy( const ThreadScheduler *this, SchedulerPolicy *ret) { - FIXME("(%p %p) stub\n", this, ret); - return NULL; + TRACE("(%p %p)\n", this, ret); + return SchedulerPolicy_copy_ctor(ret, &this->policy); } DEFINE_THISCALL_WRAPPER(ThreadScheduler_Reference, 4) @@ -602,6 +603,7 @@ MSVCRT_bool __thiscall ThreadScheduler_IsAvailableLocation( static void ThreadScheduler_dtor(ThreadScheduler *this) { + SchedulerPolicy_dtor(&this->policy); } DEFINE_THISCALL_WRAPPER(ThreadScheduler_vector_dtor, 8) @@ -630,6 +632,7 @@ static ThreadScheduler* ThreadScheduler_ctor(ThreadScheduler *this, TRACE("(%p)->()\n", this); this->scheduler.vtable = &MSVCRT_ThreadScheduler_vtable; + SchedulerPolicy_copy_ctor(&this->policy, policy); return this; }

1 0

Piotr Caban : msvcrt: Add ThreadScheduler::Id implementation.
by Alexandre Julliard 28 Mar '17

28 Mar '17

Module: wine Branch: master Commit: 118271c5f20917f1943023eaf76801f72646de36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=118271c5f20917f1943023eaf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 28 10:50:38 2017 +0200 msvcrt: Add ThreadScheduler::Id implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/scheduler.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index 1c9a770..18e5636 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -34,6 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); static int context_id = -1; +static int scheduler_id = -1; #ifdef __i386__ @@ -109,6 +110,7 @@ typedef struct { typedef struct { Scheduler scheduler; + unsigned int id; SchedulerPolicy policy; } ThreadScheduler; extern const vtable_ptr MSVCRT_ThreadScheduler_vtable; @@ -519,8 +521,8 @@ void __thiscall SchedulerPolicy_dtor(SchedulerPolicy *this) DEFINE_THISCALL_WRAPPER(ThreadScheduler_Id, 4) unsigned int __thiscall ThreadScheduler_Id(const ThreadScheduler *this) { - FIXME("(%p) stub\n", this); - return 0; + TRACE("(%p)\n", this); + return this->id; } DEFINE_THISCALL_WRAPPER(ThreadScheduler_GetNumberOfVirtualProcessors, 4) @@ -632,6 +634,7 @@ static ThreadScheduler* ThreadScheduler_ctor(ThreadScheduler *this, TRACE("(%p)->()\n", this); this->scheduler.vtable = &MSVCRT_ThreadScheduler_vtable; + this->id = InterlockedIncrement(&scheduler_id); SchedulerPolicy_copy_ctor(&this->policy, policy); return this; }

1 0

Piotr Caban : msvcrt: Add ThreadScheduler:: GetNumberOfVirtualProcessors implementation.
by Alexandre Julliard 28 Mar '17

28 Mar '17

Module: wine Branch: master Commit: ac502ad05a17bed7488377601e102c087b90e13a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac502ad05a17bed7488377601… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 28 10:50:43 2017 +0200 msvcrt: Add ThreadScheduler::GetNumberOfVirtualProcessors implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/scheduler.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index 18e5636..f8afed0 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -111,6 +111,7 @@ typedef struct { typedef struct { Scheduler scheduler; unsigned int id; + unsigned int virt_proc_no; SchedulerPolicy policy; } ThreadScheduler; extern const vtable_ptr MSVCRT_ThreadScheduler_vtable; @@ -528,8 +529,8 @@ unsigned int __thiscall ThreadScheduler_Id(const ThreadScheduler *this) DEFINE_THISCALL_WRAPPER(ThreadScheduler_GetNumberOfVirtualProcessors, 4) unsigned int __thiscall ThreadScheduler_GetNumberOfVirtualProcessors(const ThreadScheduler *this) { - FIXME("(%p) stub\n", this); - return 0; + TRACE("(%p)\n", this); + return this->virt_proc_no; } DEFINE_THISCALL_WRAPPER(ThreadScheduler_GetPolicy, 8) @@ -631,11 +632,18 @@ Scheduler* __thiscall ThreadScheduler_vector_dtor(ThreadScheduler *this, unsigne static ThreadScheduler* ThreadScheduler_ctor(ThreadScheduler *this, const SchedulerPolicy *policy) { + SYSTEM_INFO si; + TRACE("(%p)->()\n", this); this->scheduler.vtable = &MSVCRT_ThreadScheduler_vtable; this->id = InterlockedIncrement(&scheduler_id); SchedulerPolicy_copy_ctor(&this->policy, policy); + + GetSystemInfo(&si); + this->virt_proc_no = SchedulerPolicy_GetPolicyValue(&this->policy, MaxConcurrency); + if(this->virt_proc_no > si.dwNumberOfProcessors) + this->virt_proc_no = si.dwNumberOfProcessors; return this; }

1 0