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

Piotr Caban : msvcrt: Add Scheduler::Create implementation.
by Alexandre Julliard March 28, 2017

March 28, 2017

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

Henri Verbeet : usp10: Get rid of the code duplication between GSUB_initialize_feature_cache() and GPOS_expand_feature_cache().
by Alexandre Julliard March 28, 2017

March 28, 2017

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 ThreadScheduler:: GetNumberOfVirtualProcessors implementation.
by Alexandre Julliard March 28, 2017

March 28, 2017

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

Henri Verbeet : usp10: Double the scripts array size when growing it in GPOS_expand_script_cache ().
by Alexandre Julliard March 28, 2017

March 28, 2017

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

Alex Henrie : kernel32: Check for invalid flags in codepage conversion functions.
by Alexandre Julliard March 28, 2017

March 28, 2017

Module: wine Branch: master Commit: 0b95ebd283986fa179c7ec6d2ea3f34c977c3aaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b95ebd283986fa179c7ec6d2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Mar 27 21:59:05 2017 -0600 kernel32: Check for invalid flags in codepage conversion functions. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 23 +++++++++++++++++++++++ dlls/kernel32/tests/codepage.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index ca59751..e14aedb 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -54,6 +54,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(nls); #define LOCALE_LOCALEINFOFLAGSMASK (LOCALE_NOUSEROVERRIDE|LOCALE_USE_CP_ACP|\ LOCALE_RETURN_NUMBER|LOCALE_RETURN_GENITIVE_NAMES) +#define MB_FLAGSMASK (MB_PRECOMPOSED|MB_COMPOSITE|MB_USEGLYPHCHARS|MB_ERR_INVALID_CHARS) +#define WC_FLAGSMASK (WC_DISCARDNS|WC_SEPCHARS|WC_DEFAULTCHAR|WC_ERR_INVALID_CHARS|\ + WC_COMPOSITECHECK|WC_NO_BEST_FIT_CHARS) /* current code pages */ static const union cptable *ansi_cptable; @@ -2422,6 +2425,11 @@ INT WINAPI MultiByteToWideChar( UINT page, DWORD flags, LPCSTR src, INT srclen, #endif /* fall through */ case CP_UTF8: + if (flags & ~MB_FLAGSMASK) + { + SetLastError( ERROR_INVALID_FLAGS ); + return 0; + } ret = wine_utf8_mbstowcs( flags, src, srclen, dst, dstlen ); break; default: @@ -2430,6 +2438,11 @@ INT WINAPI MultiByteToWideChar( UINT page, DWORD flags, LPCSTR src, INT srclen, SetLastError( ERROR_INVALID_PARAMETER ); return 0; } + if (flags & ~MB_FLAGSMASK) + { + SetLastError( ERROR_INVALID_FLAGS ); + return 0; + } ret = wine_cp_mbstowcs( table, flags, src, srclen, dst, dstlen ); break; } @@ -2653,6 +2666,11 @@ INT WINAPI WideCharToMultiByte( UINT page, DWORD flags, LPCWSTR src, INT srclen, SetLastError( ERROR_INVALID_PARAMETER ); return 0; } + if (flags & ~WC_FLAGSMASK) + { + SetLastError( ERROR_INVALID_FLAGS ); + return 0; + } ret = wine_utf8_wcstombs( flags, src, srclen, dst, dstlen ); break; default: @@ -2661,6 +2679,11 @@ INT WINAPI WideCharToMultiByte( UINT page, DWORD flags, LPCWSTR src, INT srclen, SetLastError( ERROR_INVALID_PARAMETER ); return 0; } + if (flags & ~WC_FLAGSMASK) + { + SetLastError( ERROR_INVALID_FLAGS ); + return 0; + } ret = wine_cp_wcstombs( table, flags, src, srclen, dst, dstlen, defchar, used ? &used_tmp : NULL ); if (used) *used = used_tmp; diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index 8eccf99..7389d93 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -209,6 +209,40 @@ static void test_other_invalid_parameters(void) BOOL used; INT len; + /* Unrecognized flag => ERROR_INVALID_FLAGS */ + SetLastError(0xdeadbeef); + len = WideCharToMultiByte(CP_ACP, 0x100, w_string, -1, c_string, c_string_len, NULL, NULL); + ok(len == 0 && GetLastError() == ERROR_INVALID_FLAGS, "len=%d error=%x\n", len, GetLastError()); + + SetLastError(0xdeadbeef); + len = WideCharToMultiByte(CP_ACP, 0x800, w_string, -1, c_string, c_string_len, NULL, NULL); + ok(len == 0 && GetLastError() == ERROR_INVALID_FLAGS, "len=%d error=%x\n", len, GetLastError()); + + SetLastError(0xdeadbeef); + len = MultiByteToWideChar(CP_ACP, 0x10, c_string, -1, w_string, w_string_len); + ok(len == 0 && GetLastError() == ERROR_INVALID_FLAGS, "len=%d error=%x\n", len, GetLastError()); + + + /* Unrecognized flag and invalid codepage => ERROR_INVALID_PARAMETER */ + SetLastError(0xdeadbeef); + len = WideCharToMultiByte(0xdeadbeef, 0x100, w_string, w_string_len, c_string, c_string_len, NULL, NULL); + ok(len == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "len=%d error=%x\n", len, GetLastError()); + + SetLastError(0xdeadbeef); + len = MultiByteToWideChar(0xdeadbeef, 0x10, c_string, c_string_len, w_string, w_string_len); + ok(len == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "len=%d error=%x\n", len, GetLastError()); + + + /* Unrecognized flag and src is NULL => ERROR_INVALID_PARAMETER */ + SetLastError(0xdeadbeef); + len = WideCharToMultiByte(CP_ACP, 0x100, NULL, -1, c_string, c_string_len, NULL, NULL); + ok(len == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "len=%d error=%x\n", len, GetLastError()); + + SetLastError(0xdeadbeef); + len = MultiByteToWideChar(CP_ACP, 0x10, NULL, -1, w_string, w_string_len); + ok(len == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "len=%d error=%x\n", len, GetLastError()); + + /* srclen=0 => ERROR_INVALID_PARAMETER */ SetLastError(0xdeadbeef); len = WideCharToMultiByte(CP_ACP, 0, w_string, 0, c_string, c_string_len, NULL, NULL); @@ -266,6 +300,11 @@ static void test_other_invalid_parameters(void) SetLastError(0xdeadbeef); len = WideCharToMultiByte(CP_UTF7, 1, w_string, w_string_len, c_string, c_string_len, NULL, &used); ok(len == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "len=%d error=%x\n", len, GetLastError()); + + /* CP_UTF8, unrecognized flag and used not NULL => ERROR_INVALID_PARAMETER */ + SetLastError(0xdeadbeef); + len = WideCharToMultiByte(CP_UTF8, 0x100, w_string, w_string_len, c_string, c_string_len, NULL, &used); + ok(len == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "len=%d error=%x\n", len, GetLastError()); } static void test_overlapped_buffers(void)

1 0

Austin English : advapi32: Sync spec file to Windows 10.
by Alexandre Julliard March 28, 2017

March 28, 2017

Module: wine Branch: master Commit: be6008d2eb8f5c50061eb44628cd4c65a1cc0e10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be6008d2eb8f5c50061eb4462… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Mar 27 16:27:35 2017 -0500 advapi32: Sync spec file to Windows 10. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 90 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 68 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=be6008d2eb8f5c50061eb…

1 0

Nikolay Sivov : msxml3: Added support for setting IResponse as xsl processor output.
by Alexandre Julliard March 28, 2017

March 28, 2017

Module: wine Branch: master Commit: cebed397c335490c57389245b6e365b651a2f796 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cebed397c335490c57389245b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 28 00:04:33 2017 +0300 msxml3: Added support for setting IResponse as xsl processor output. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/stylesheet.c | 72 ++++++++++++++++++++++++++++++++++++++++------ dlls/msxml3/tests/domdoc.c | 22 ++++++++++++-- 2 files changed, 84 insertions(+), 10 deletions(-) diff --git a/dlls/msxml3/stylesheet.c b/dlls/msxml3/stylesheet.c index 74a9180..4c4f60e 100644 --- a/dlls/msxml3/stylesheet.c +++ b/dlls/msxml3/stylesheet.c @@ -36,6 +36,9 @@ #include "msxml_private.h" +#include "initguid.h" +#include "asptlb.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msxml); @@ -54,6 +57,7 @@ enum output_type PROCESSOR_OUTPUT_NOT_SET, PROCESSOR_OUTPUT_STREAM, /* IStream or ISequentialStream */ PROCESSOR_OUTPUT_PERSISTSTREAM, /* IPersistStream or IPersistStreamInit */ + PROCESSOR_OUTPUT_RESPONSE, /* IResponse */ }; typedef struct @@ -70,6 +74,7 @@ typedef struct IUnknown *unk; ISequentialStream *stream; IPersistStream *persiststream; + IResponse *response; } output; enum output_type output_type; BSTR outstr; @@ -493,7 +498,11 @@ static HRESULT WINAPI xslprocessor_put_output( hr = IUnknown_QueryInterface(V_UNKNOWN(&var), &IID_IStream, (void **)&output); if (FAILED(hr)) hr = IUnknown_QueryInterface(V_UNKNOWN(&var), &IID_ISequentialStream, (void **)&output); - /* FIXME: try IResponse */ + if (FAILED(hr)) + { + output_type = PROCESSOR_OUTPUT_RESPONSE; + hr = IUnknown_QueryInterface(V_UNKNOWN(&var), &IID_IResponse, (void **)&output); + } if (FAILED(hr)) { output_type = PROCESSOR_OUTPUT_PERSISTSTREAM; @@ -570,20 +579,67 @@ static HRESULT WINAPI xslprocessor_transform( stream = This->output.stream; ISequentialStream_AddRef(stream); } - else if (This->output_type == PROCESSOR_OUTPUT_PERSISTSTREAM) + else if (This->output_type == PROCESSOR_OUTPUT_PERSISTSTREAM || + This->output_type == PROCESSOR_OUTPUT_RESPONSE) + { CreateStreamOnHGlobal(NULL, TRUE, (IStream **)&stream); + } hr = node_transform_node_params(get_node_obj(This->input), This->stylesheet->node, &This->outstr, stream, &This->params); - if (SUCCEEDED(hr) && This->output_type == PROCESSOR_OUTPUT_PERSISTSTREAM) + if (SUCCEEDED(hr)) { IStream *src = (IStream *)stream; - LARGE_INTEGER zero; - /* for IPersistStream* output seekable stream is used */ - zero.QuadPart = 0; - IStream_Seek(src, zero, STREAM_SEEK_SET, NULL); - hr = IPersistStream_Load(This->output.persiststream, src); + switch (This->output_type) + { + case PROCESSOR_OUTPUT_PERSISTSTREAM: + { + LARGE_INTEGER zero; + + /* for IPersistStream* output seekable stream is used */ + zero.QuadPart = 0; + IStream_Seek(src, zero, STREAM_SEEK_SET, NULL); + hr = IPersistStream_Load(This->output.persiststream, src); + break; + } + case PROCESSOR_OUTPUT_RESPONSE: + { + SAFEARRAYBOUND bound; + SAFEARRAY *array; + HGLOBAL hglobal; + VARIANT bin; + DWORD size; + void *dest; + + GetHGlobalFromStream(src, &hglobal); + size = GlobalSize(hglobal); + + bound.lLbound = 0; + bound.cElements = size; + if (!(array = SafeArrayCreate(VT_UI1, 1, &bound))) + break; + + V_VT(&bin) = VT_ARRAY | VT_UI1; + V_ARRAY(&bin) = array; + + hr = SafeArrayAccessData(array, &dest); + if (hr == S_OK) + { + void *data = GlobalLock(hglobal); + memcpy(dest, data, size); + GlobalUnlock(hglobal); + SafeArrayUnaccessData(array); + + IResponse_BinaryWrite(This->output.response, bin); + } + + VariantClear(&bin); + break; + } + default: + ; + } } if (stream) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 3713490..4bac5a1 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -361,7 +361,6 @@ static HRESULT WINAPI response_QI(IResponse *iface, REFIID riid, void **obj) } if (!IsEqualIID(&IID_IStream, riid) && !IsEqualIID(&IID_ISequentialStream, riid)) -todo_wine ok(0, "unexpected call\n"); return E_NOINTERFACE; } @@ -488,7 +487,25 @@ static HRESULT WINAPI response_AppendToLog(IResponse *iface, BSTR bstrLogEntry) static HRESULT WINAPI response_BinaryWrite(IResponse *iface, VARIANT input) { + HRESULT hr; + LONG bound; + UINT dim; + ok(V_VT(&input) == (VT_ARRAY | VT_UI1), "got wrong input type %x\n", V_VT(&input)); + + dim = SafeArrayGetDim(V_ARRAY(&input)); + ok(dim == 1, "got wrong array dimensions %u\n", dim); + + bound = 1; + hr = SafeArrayGetLBound(V_ARRAY(&input), 1, &bound); + ok(hr == S_OK, "got %#x\n", hr); + ok(bound == 0, "wrong array low bound %d\n", bound); + + bound = 0; + hr = SafeArrayGetUBound(V_ARRAY(&input), 1, &bound); + ok(hr == S_OK, "got %#x\n", hr); + ok(bound > 0, "wrong array high bound %d\n", bound); + return E_NOTIMPL; } @@ -8977,11 +8994,12 @@ todo_wine { V_VT(&v) = VT_UNKNOWN; V_UNKNOWN(&v) = (IUnknown *)&testresponse; hr = IXSLProcessor_put_output(processor, v); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + b = VARIANT_FALSE; hr = IXSLProcessor_transform(processor, &b); ok(hr == S_OK, "got 0x%08x\n", hr); + ok(b == VARIANT_TRUE, "got %x\n", b); IXSLProcessor_Release(processor); IXMLDOMDocument_Release(doc2);

1 0

Nikolay Sivov : msxml3/tests: Added a test for IResponse processor output.
by Alexandre Julliard March 28, 2017

March 28, 2017

Module: wine Branch: master Commit: d1f1731960cc754643c15a301bd816b95d139221 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1f1731960cc754643c15a301… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 28 00:04:32 2017 +0300 msxml3/tests: Added a test for IResponse processor output. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 297 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 297 insertions(+) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 4b2cc27..3713490 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -37,6 +37,7 @@ #include "dispex.h" #include "objsafe.h" #include "initguid.h" +#include "asptlb.h" #include "wine/test.h" @@ -349,6 +350,288 @@ static const IStreamVtbl StreamVtbl = { static IStream savestream = { &StreamVtbl }; +static HRESULT WINAPI response_QI(IResponse *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(&IID_IResponse, riid) || + IsEqualIID(&IID_IDispatch, riid) || + IsEqualIID(&IID_IUnknown, riid)) + { + *obj = iface; + return S_OK; + } + + if (!IsEqualIID(&IID_IStream, riid) && !IsEqualIID(&IID_ISequentialStream, riid)) +todo_wine + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI response_AddRef(IResponse *iface) +{ + return 2; +} + +static ULONG WINAPI response_Release(IResponse *iface) +{ + return 1; +} + +static HRESULT WINAPI response_GetTypeInfoCount(IResponse *iface, UINT *count) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_GetTypeInfo(IResponse *iface, UINT ti, LCID lcid, ITypeInfo **tinfo) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_GetIDsOfNames(IResponse *iface, REFIID riid, LPOLESTR *names, + UINT cnames, LCID lcid, DISPID *rgDispId) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_Invoke(IResponse *iface, DISPID dispid, REFIID riid, LCID lcid, + WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *ei, UINT *argerr) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_get_Buffer(IResponse *iface, VARIANT_BOOL *fIsBuffering) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_put_Buffer(IResponse *iface, VARIANT_BOOL fIsBuffering) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_get_ContentType(IResponse *iface, BSTR *pbstrContentTypeRet) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_put_ContentType(IResponse *iface, BSTR bstrContentType) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_get_Expires(IResponse *iface, VARIANT *pvarExpiresMinutesRet) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_put_Expires(IResponse *iface, LONG lExpiresMinutes) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_get_ExpiresAbsolute(IResponse *iface, VARIANT *pvarExpiresRet) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_put_ExpiresAbsolute(IResponse *iface, DATE dtExpires) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_get_Cookies(IResponse *iface, IRequestDictionary **ppCookies) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_get_Status(IResponse *iface, BSTR *pbstrStatusRet) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_put_Status(IResponse *iface, BSTR bstrStatus) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_Add(IResponse *iface, BSTR bstrHeaderValue, BSTR bstrHeaderName) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_AddHeader(IResponse *iface, BSTR bstrHeaderName, BSTR bstrHeaderValue) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_AppendToLog(IResponse *iface, BSTR bstrLogEntry) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_BinaryWrite(IResponse *iface, VARIANT input) +{ + ok(V_VT(&input) == (VT_ARRAY | VT_UI1), "got wrong input type %x\n", V_VT(&input)); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_Clear(IResponse *iface) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_End(IResponse *iface) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_Flush(IResponse *iface) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_Redirect(IResponse *iface, BSTR bstrURL) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_Write(IResponse *iface, VARIANT varText) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_WriteBlock(IResponse *iface, short iBlockNumber) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_IsClientConnected(IResponse *iface, VARIANT_BOOL *pfIsClientConnected) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_get_CharSet(IResponse *iface, BSTR *pbstrCharSetRet) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_put_CharSet(IResponse *iface, BSTR bstrCharSet) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_Pics(IResponse *iface, BSTR bstrHeaderValue) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_get_CacheControl(IResponse *iface, BSTR *pbstrCacheControl) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_put_CacheControl(IResponse *iface, BSTR bstrCacheControl) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_get_CodePage(IResponse *iface, LONG *plvar) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_put_CodePage(IResponse *iface, LONG codepage) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_get_LCID(IResponse *iface, LONG *lcid) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_put_LCID(IResponse *iface, LONG lcid) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const IResponseVtbl testresponsevtbl = +{ + response_QI, + response_AddRef, + response_Release, + response_GetTypeInfoCount, + response_GetTypeInfo, + response_GetIDsOfNames, + response_Invoke, + response_get_Buffer, + response_put_Buffer, + response_get_ContentType, + response_put_ContentType, + response_get_Expires, + response_put_Expires, + response_get_ExpiresAbsolute, + response_put_ExpiresAbsolute, + response_get_Cookies, + response_get_Status, + response_put_Status, + response_Add, + response_AddHeader, + response_AppendToLog, + response_BinaryWrite, + response_Clear, + response_End, + response_Flush, + response_Redirect, + response_Write, + response_WriteBlock, + response_IsClientConnected, + response_get_CharSet, + response_put_CharSet, + response_Pics, + response_get_CacheControl, + response_put_CacheControl, + response_get_CodePage, + response_put_CodePage, + response_get_LCID, + response_put_LCID, +}; + +static IResponse testresponse = { &testresponsevtbl }; + #define EXPECT_CHILDREN(node) _expect_children((IXMLDOMNode*)node, __LINE__) static void _expect_children(IXMLDOMNode *node, int line) { @@ -8686,6 +8969,20 @@ todo_wine { ok(!!*str, "Expected document\n"); SysFreeString(str); + /* transform to IResponse */ + V_VT(&v) = VT_EMPTY; + hr = IXSLProcessor_put_output(processor, v); + ok(hr == S_OK, "got 0x%08x\n", hr); + + V_VT(&v) = VT_UNKNOWN; + V_UNKNOWN(&v) = (IUnknown *)&testresponse; + hr = IXSLProcessor_put_output(processor, v); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXSLProcessor_transform(processor, &b); + ok(hr == S_OK, "got 0x%08x\n", hr); + IXSLProcessor_Release(processor); IXMLDOMDocument_Release(doc2); IXMLDOMDocument_Release(doc3);

1 0

Henri Verbeet : usp10: Get rid of some code duplication in GPOS_expand_feature_cache().
by Alexandre Julliard March 28, 2017

March 28, 2017

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

Alistair Leslie-Hughes : ole32: Add CoRegisterSurrogate/Ex stubs.
by Alexandre Julliard March 28, 2017

March 28, 2017

Module: wine Branch: master Commit: b399bafa121aa9358d03c55d6eed1e762b3c535d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b399bafa121aa9358d03c55d6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Mar 28 08:37:11 2017 +0100 ole32: Add CoRegisterSurrogate/Ex stubs. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-com-l1-1-0.spec | 2 +- .../api-ms-win-core-com-l1-1-1.spec | 2 +- .../api-ms-win-core-com-private-l1-1-0.spec | 2 +- dlls/combase/combase.spec | 4 ++-- dlls/ole32/compobj.c | 20 ++++++++++++++++++++ dlls/ole32/ole32.spec | 4 ++-- 6 files changed, 27 insertions(+), 7 deletions(-) diff --git a/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec b/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec index f645c9d..954d6da 100644 --- a/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec +++ b/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec @@ -49,7 +49,7 @@ @ stdcall CoQueryProxyBlanket(ptr ptr ptr ptr ptr ptr ptr ptr) ole32.CoQueryProxyBlanket @ stdcall CoRegisterClassObject(ptr ptr long long ptr) ole32.CoRegisterClassObject @ stdcall CoRegisterPSClsid(ptr ptr) ole32.CoRegisterPSClsid -@ stub CoRegisterSurrogate +@ stdcall CoRegisterSurrogate(ptr) ole32.CoRegisterSurrogate @ stdcall CoReleaseMarshalData(ptr) ole32.CoReleaseMarshalData @ stdcall CoReleaseServerProcess() ole32.CoReleaseServerProcess @ stdcall CoResumeClassObjects() ole32.CoResumeClassObjects diff --git a/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec b/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec index d2914f0..a124d34 100644 --- a/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec +++ b/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec @@ -50,7 +50,7 @@ @ stub CoRegisterActivationFilter @ stdcall CoRegisterClassObject(ptr ptr long long ptr) ole32.CoRegisterClassObject @ stdcall CoRegisterPSClsid(ptr ptr) ole32.CoRegisterPSClsid -@ stub CoRegisterSurrogate +@ stdcall CoRegisterSurrogate(ptr) ole32.CoRegisterSurrogate @ stdcall CoReleaseMarshalData(ptr) ole32.CoReleaseMarshalData @ stdcall CoReleaseServerProcess() ole32.CoReleaseServerProcess @ stdcall CoResumeClassObjects() ole32.CoResumeClassObjects diff --git a/dlls/api-ms-win-core-com-private-l1-1-0/api-ms-win-core-com-private-l1-1-0.spec b/dlls/api-ms-win-core-com-private-l1-1-0/api-ms-win-core-com-private-l1-1-0.spec index 14d3b27..13ee601 100644 --- a/dlls/api-ms-win-core-com-private-l1-1-0/api-ms-win-core-com-private-l1-1-0.spec +++ b/dlls/api-ms-win-core-com-private-l1-1-0/api-ms-win-core-com-private-l1-1-0.spec @@ -22,7 +22,7 @@ @ stdcall CoRegisterInitializeSpy(ptr ptr) ole32.CoRegisterInitializeSpy @ stdcall CoRegisterMallocSpy(ptr) ole32.CoRegisterMallocSpy @ stdcall CoRegisterMessageFilter(ptr ptr) ole32.CoRegisterMessageFilter -@ stub CoRegisterSurrogateEx +@ stdcall CoRegisterSurrogateEx(ptr ptr) ole32.CoRegisterSurrogateEx @ stub CoRetireServer @ stdcall CoRevokeInitializeSpy(int64) ole32.CoRevokeInitializeSpy @ stdcall CoRevokeMallocSpy() ole32.CoRevokeMallocSpy diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index b612bef..493e796 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -138,8 +138,8 @@ @ stdcall CoRegisterMallocSpy(ptr) ole32.CoRegisterMallocSpy @ stdcall CoRegisterMessageFilter(ptr ptr) ole32.CoRegisterMessageFilter @ stdcall CoRegisterPSClsid(ptr ptr) ole32.CoRegisterPSClsid -@ stub CoRegisterSurrogate -@ stub CoRegisterSurrogateEx +@ stdcall CoRegisterSurrogate(ptr) ole32.CoRegisterSurrogate +@ stdcall CoRegisterSurrogateEx(ptr ptr) ole32.CoRegisterSurrogateEx @ stdcall CoReleaseMarshalData(ptr) ole32.CoReleaseMarshalData @ stdcall CoReleaseServerProcess() ole32.CoReleaseServerProcess @ stdcall CoResumeClassObjects() ole32.CoResumeClassObjects diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 7dd10a7..1ce9cec 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -5074,6 +5074,26 @@ HRESULT WINAPI CoGetApartmentType(APTTYPE *type, APTTYPEQUALIFIER *qualifier) return info->apt ? S_OK : CO_E_NOTINITIALIZED; } +/*********************************************************************** + * CoRegisterSurrogate [OLE32.@] + */ +HRESULT WINAPI CoRegisterSurrogate(ISurrogate *surrogate) +{ + FIXME("(%p): stub\n", surrogate); + + return E_NOTIMPL; +} + +/*********************************************************************** + * CoRegisterSurrogateEx [OLE32.@] + */ +HRESULT WINAPI CoRegisterSurrogateEx(REFGUID guid, void *reserved) +{ + FIXME("(%s %p): stub\n", debugstr_guid(guid), reserved); + + return E_NOTIMPL; +} + typedef struct { IGlobalOptions IGlobalOptions_iface; LONG ref; diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index eab8664..58bdd22 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -66,8 +66,8 @@ @ stdcall CoRegisterMallocSpy (ptr) @ stdcall CoRegisterMessageFilter(ptr ptr) @ stdcall CoRegisterPSClsid(ptr ptr) -@ stub CoRegisterSurrogate -@ stub CoRegisterSurrogateEx +@ stdcall CoRegisterSurrogate(ptr) +@ stdcall CoRegisterSurrogateEx(ptr ptr) @ stdcall CoReleaseMarshalData(ptr) @ stdcall CoReleaseServerProcess() @ stdcall CoResumeClassObjects()

1 0