wine-commits August 2021

wine-commits@winehq.org

1 participants
1051 discussions

Piotr Caban : msvcrt: Move invalid_scheduler_policy_thread_specification to concurrency.c.
by Alexandre Julliard 20 Aug '21

20 Aug '21

Module: wine Branch: master Commit: c9189a411b7941377cb414eed15d1ce02d43959c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9189a411b7941377cb414ee… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Aug 20 18:44:56 2021 +0200 msvcrt: Move invalid_scheduler_policy_thread_specification to concurrency.c. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/concurrency.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- dlls/msvcrt/cpp.c | 43 ------------------------------------------- dlls/msvcrt/msvcrt.h | 1 - 3 files changed, 43 insertions(+), 46 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c9189a411b7941377cb4…

1 0

Piotr Caban : msvcrt: Move invalid_scheduler_policy_value to concurrency.c.
by Alexandre Julliard 20 Aug '21

20 Aug '21

Module: wine Branch: master Commit: a7bbdea08994625411c94da97ef6b5fbcfb5aaf6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7bbdea08994625411c94da9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Aug 20 18:44:53 2021 +0200 msvcrt: Move invalid_scheduler_policy_value to concurrency.c. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/concurrency.c | 76 +++++++++++++++++++++++++++++++++++++++-------- dlls/msvcrt/cpp.c | 43 --------------------------- dlls/msvcrt/msvcrt.h | 1 - 3 files changed, 64 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a7bbdea08994625411c9…

1 0

Piotr Caban : msvcrt: Move invalid_scheduler_policy_key to concurrency.c.
by Alexandre Julliard 20 Aug '21

20 Aug '21

Module: wine Branch: master Commit: 635f59f2765c03a91b589b810a898bb0b0e566e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=635f59f2765c03a91b589b81… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Aug 20 18:44:50 2021 +0200 msvcrt: Move invalid_scheduler_policy_key to concurrency.c. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/concurrency.c | 66 +++++++++++++++++++++++++++++++++++++++++------ dlls/msvcrt/cpp.c | 43 ------------------------------ dlls/msvcrt/msvcrt.h | 1 - 3 files changed, 58 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=635f59f2765c03a91b58…

1 0

Piotr Caban : msvcrt: Move scheduler_resource_allocation_error to concurrency.c.
by Alexandre Julliard 20 Aug '21

20 Aug '21

Module: wine Branch: master Commit: a8decf5c1511019e3cb22a0e4db06cb0e6b121b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8decf5c1511019e3cb22a0e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Aug 20 18:44:46 2021 +0200 msvcrt: Move scheduler_resource_allocation_error to concurrency.c. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/concurrency.c | 66 ++++++++++++++++++++++++++++++++++++++++++++--- dlls/msvcrt/cpp.c | 64 --------------------------------------------- dlls/msvcrt/msvcrt.h | 1 - 3 files changed, 63 insertions(+), 68 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a8decf5c1511019e3cb2…

1 0

Piotr Caban : msvcrt: Move improper_lock implementation to concurrency.c.
by Alexandre Julliard 20 Aug '21

20 Aug '21

Module: wine Branch: master Commit: ef81cfb5fbc6d8f2b892c2782bdd469a5bb2f526 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef81cfb5fbc6d8f2b892c278… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Aug 20 18:44:41 2021 +0200 msvcrt: Move improper_lock implementation to concurrency.c. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/concurrency.c | 76 +++++++++++++++++++++++++++++++++++++++++------ dlls/msvcrt/cpp.c | 39 ------------------------ dlls/msvcrt/msvcrt.h | 1 - 3 files changed, 67 insertions(+), 49 deletions(-) diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index a4df63d19a8..194cc707497 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -31,6 +31,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); +typedef exception cexception; +CREATE_EXCEPTION_OBJECT(cexception) + static int context_id = -1; static int scheduler_id = -1; @@ -296,6 +299,9 @@ typedef struct { CRITICAL_SECTION cs; } _ReentrantBlockingLock; +typedef exception improper_lock; +extern const vtable_ptr improper_lock_vtable; + enum ConcRT_EventType { CONCRT_EVENT_GENERIC, @@ -325,6 +331,41 @@ static HANDLE keyed_event; static void create_default_scheduler(void); +/* ??0improper_lock@Concurrency@@QAE@PBD@Z */ +/* ??0improper_lock@Concurrency@@QEAA@PEBD@Z */ +DEFINE_THISCALL_WRAPPER(improper_lock_ctor_str, 8) +improper_lock* __thiscall improper_lock_ctor_str(improper_lock *this, const char *str) +{ + TRACE("(%p %p)\n", this, str); + return __exception_ctor(this, str, &improper_lock_vtable); +} + +/* ??0improper_lock@Concurrency@@QAE@XZ */ +/* ??0improper_lock@Concurrency@@QEAA@XZ */ +DEFINE_THISCALL_WRAPPER(improper_lock_ctor, 4) +improper_lock* __thiscall improper_lock_ctor(improper_lock *this) +{ + return improper_lock_ctor_str(this, NULL); +} + +DEFINE_THISCALL_WRAPPER(improper_lock_copy_ctor,8) +improper_lock * __thiscall improper_lock_copy_ctor(improper_lock *this, const improper_lock *rhs) +{ + TRACE("(%p %p)\n", this, rhs); + return __exception_copy_ctor(this, rhs, &improper_lock_vtable); +} + +DEFINE_RTTI_DATA1(improper_lock, 0, &cexception_rtti_base_descriptor, + ".?AVimproper_lock@Concurrency@@") + +DEFINE_CXX_DATA1(improper_lock, &cexception_cxx_type_info, cexception_dtor) + +__ASM_BLOCK_BEGIN(concurrency_exception_vtables) + __ASM_VTABLE(improper_lock, + VTABLE_ADD_FUNC(cexception_vector_dtor) + VTABLE_ADD_FUNC(cexception_what)); +__ASM_BLOCK_END + static Context* try_get_current_context(void) { if (context_tls_index == TLS_OUT_OF_INDEXES) @@ -1433,8 +1474,11 @@ static inline void cs_lock(critical_section *cs, cs_queue *q) { cs_queue *last; - if(cs->unk_thread_id == GetCurrentThreadId()) - throw_exception(EXCEPTION_IMPROPER_LOCK, 0, "Already locked"); + if(cs->unk_thread_id == GetCurrentThreadId()) { + improper_lock e; + improper_lock_ctor_str(&e, "Already locked"); + _CxxThrowException(&e, &improper_lock_exception_type); + } memset(q, 0, sizeof(*q)); last = InterlockedExchangePointer(&cs->tail, q); @@ -1540,8 +1584,11 @@ bool __thiscall critical_section_try_lock_for( TRACE("(%p %d)\n", this, timeout); - if(this->unk_thread_id == GetCurrentThreadId()) - throw_exception(EXCEPTION_IMPROPER_LOCK, 0, "Already locked"); + if(this->unk_thread_id == GetCurrentThreadId()) { + improper_lock e; + improper_lock_ctor_str(&e, "Already locked"); + _CxxThrowException(&e, &improper_lock_exception_type); + } if(!(q = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*q)))) return critical_section_try_lock(this); @@ -2131,8 +2178,11 @@ void __thiscall reader_writer_lock_lock(reader_writer_lock *this) TRACE("(%p)\n", this); - if (this->thread_id == GetCurrentThreadId()) - throw_exception(EXCEPTION_IMPROPER_LOCK, 0, "Already locked"); + if (this->thread_id == GetCurrentThreadId()) { + improper_lock e; + improper_lock_ctor_str(&e, "Already locked"); + _CxxThrowException(&e, &improper_lock_exception_type); + } last = InterlockedExchangePointer((void**)&this->writer_tail, &q); if (last) { @@ -2162,8 +2212,11 @@ void __thiscall reader_writer_lock_lock_read(reader_writer_lock *this) TRACE("(%p)\n", this); - if (this->thread_id == GetCurrentThreadId()) - throw_exception(EXCEPTION_IMPROPER_LOCK, 0, "Already locked as writer"); + if (this->thread_id == GetCurrentThreadId()) { + improper_lock e; + improper_lock_ctor_str(&e, "Already locked as writer"); + _CxxThrowException(&e, &improper_lock_exception_type); + } do { q.next = this->reader_head; @@ -2436,7 +2489,7 @@ DEFINE_RTTI_DATA1(SchedulerBase, 0, &Scheduler_rtti_base_descriptor, ".?AVSchedu DEFINE_RTTI_DATA2(ThreadScheduler, 0, &SchedulerBase_rtti_base_descriptor, &Scheduler_rtti_base_descriptor, ".?AVThreadScheduler@details@Concurrency@@") -__ASM_BLOCK_BEGIN(scheduler_vtables) +__ASM_BLOCK_BEGIN(concurrency_vtables) __ASM_VTABLE(ExternalContextBase, VTABLE_ADD_FUNC(ExternalContextBase_GetId) VTABLE_ADD_FUNC(ExternalContextBase_GetVirtualProcessorId) @@ -2470,12 +2523,17 @@ __ASM_BLOCK_END void msvcrt_init_concurrency(void *base) { #ifdef __x86_64__ + init_cexception_rtti(base); + init_improper_lock_rtti(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); + + init_cexception_cxx_type_info(base); + init_improper_lock_cxx(base); #endif } diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 980b580c71e..fcdefd5512f 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -602,33 +602,6 @@ HRESULT __thiscall scheduler_resource_allocation_error_get_error_code( return this->hr; } -typedef exception improper_lock; -extern const vtable_ptr improper_lock_vtable; - -/* ??0improper_lock@Concurrency@@QAE@PBD@Z */ -/* ??0improper_lock@Concurrency@@QEAA@PEBD@Z */ -DEFINE_THISCALL_WRAPPER(improper_lock_ctor_str, 8) -improper_lock* __thiscall improper_lock_ctor_str(improper_lock *this, const char *str) -{ - TRACE("(%p %p)\n", this, str); - return __exception_ctor(this, str, &improper_lock_vtable); -} - -/* ??0improper_lock@Concurrency@@QAE@XZ */ -/* ??0improper_lock@Concurrency@@QEAA@XZ */ -DEFINE_THISCALL_WRAPPER(improper_lock_ctor, 4) -improper_lock* __thiscall improper_lock_ctor(improper_lock *this) -{ - return improper_lock_ctor_str(this, NULL); -} - -DEFINE_THISCALL_WRAPPER(improper_lock_copy_ctor,8) -improper_lock * __thiscall improper_lock_copy_ctor(improper_lock * _this, const improper_lock * rhs) -{ - TRACE("(%p %p)\n", _this, rhs); - return __exception_copy_ctor(_this, rhs, &improper_lock_vtable); -} - typedef exception invalid_scheduler_policy_key; extern const vtable_ptr invalid_scheduler_policy_key_vtable; @@ -804,9 +777,6 @@ __ASM_VTABLE(__non_rtti_object, __ASM_VTABLE(scheduler_resource_allocation_error, VTABLE_ADD_FUNC(exception_vector_dtor) VTABLE_ADD_FUNC(exception_what)); -__ASM_VTABLE(improper_lock, - VTABLE_ADD_FUNC(exception_vector_dtor) - VTABLE_ADD_FUNC(exception_what)); __ASM_VTABLE(invalid_scheduler_policy_key, VTABLE_ADD_FUNC(exception_vector_dtor) VTABLE_ADD_FUNC(exception_what)); @@ -840,7 +810,6 @@ DEFINE_RTTI_DATA2( __non_rtti_object, 0, &bad_typeid_rtti_base_descriptor, &exce #if _MSVCR_VER >= 100 DEFINE_RTTI_DATA1(scheduler_resource_allocation_error, 0, &exception_rtti_base_descriptor, ".?AVscheduler_resource_allocation_error@Concurrency@@") -DEFINE_RTTI_DATA1(improper_lock, 0, &exception_rtti_base_descriptor, ".?AVimproper_lock@Concurrency@@" ) DEFINE_RTTI_DATA1(invalid_scheduler_policy_key, 0, &exception_rtti_base_descriptor, ".?AVinvalid_scheduler_policy_key@Concurrency@@" ) DEFINE_RTTI_DATA1(invalid_scheduler_policy_value, 0, &exception_rtti_base_descriptor, @@ -863,7 +832,6 @@ DEFINE_CXX_DATA1( bad_alloc, &exception_cxx_type_info, bad_alloc_dtor ) #endif #if _MSVCR_VER >= 100 DEFINE_CXX_DATA1(scheduler_resource_allocation_error, &exception_cxx_type_info, exception_dtor) -DEFINE_CXX_DATA1(improper_lock, &exception_cxx_type_info, exception_dtor) DEFINE_CXX_DATA1(invalid_scheduler_policy_key, &exception_cxx_type_info, exception_dtor) DEFINE_CXX_DATA1(invalid_scheduler_policy_value, &exception_cxx_type_info, exception_dtor) DEFINE_CXX_DATA1(invalid_scheduler_policy_thread_specification, &exception_cxx_type_info, exception_dtor) @@ -885,7 +853,6 @@ void msvcrt_init_exception(void *base) init___non_rtti_object_rtti(base); #if _MSVCR_VER >= 100 init_scheduler_resource_allocation_error_rtti(base); - init_improper_lock_rtti(base); init_invalid_scheduler_policy_key_rtti(base); init_invalid_scheduler_policy_value_rtti(base); init_invalid_scheduler_policy_thread_specification_rtti(base); @@ -902,7 +869,6 @@ void msvcrt_init_exception(void *base) #endif #if _MSVCR_VER >= 100 init_scheduler_resource_allocation_error_cxx(base); - init_improper_lock_cxx(base); init_invalid_scheduler_policy_key_cxx(base); init_invalid_scheduler_policy_value_cxx(base); init_invalid_scheduler_policy_thread_specification_cxx(base); @@ -927,11 +893,6 @@ void throw_exception(exception_type et, HRESULT hr, const char *str) scheduler_resource_allocation_error_ctor_name(&e, str, hr); _CxxThrowException(&e.e, &scheduler_resource_allocation_error_exception_type); } - case EXCEPTION_IMPROPER_LOCK: { - improper_lock e; - improper_lock_ctor_str(&e, str); - _CxxThrowException(&e, &improper_lock_exception_type); - } case EXCEPTION_INVALID_SCHEDULER_POLICY_KEY: { invalid_scheduler_policy_key e; invalid_scheduler_policy_key_ctor_str(&e, str); diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 51e9b9726db..2d779cc1f5c 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -191,7 +191,6 @@ typedef enum { EXCEPTION_BAD_ALLOC, #if _MSVCR_VER >= 100 EXCEPTION_SCHEDULER_RESOURCE_ALLOCATION_ERROR, - EXCEPTION_IMPROPER_LOCK, EXCEPTION_INVALID_SCHEDULER_POLICY_KEY, EXCEPTION_INVALID_SCHEDULER_POLICY_VALUE, EXCEPTION_INVALID_SCHEDULER_POLICY_THREAD_SPECIFICATION,

1 0

Piotr Caban : msvcrt: Introduce macro for creating exception class.
by Alexandre Julliard 20 Aug '21

20 Aug '21

Module: wine Branch: master Commit: f6f8b30c47bc28be5df692743fcf81c7952153ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6f8b30c47bc28be5df69274… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Aug 20 18:44:38 2021 +0200 msvcrt: Introduce macro for creating exception class. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/cpp.c | 192 +++++++----------------------------------------- dlls/msvcrt/cppexcept.h | 101 +++++++++++++++++++++++-- 2 files changed, 121 insertions(+), 172 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f6f8b30c47bc28be5df6…

1 0

Piotr Caban : msvcrt: Rename exception::what() implementation to exception_what.
by Alexandre Julliard 20 Aug '21

20 Aug '21

Module: wine Branch: master Commit: f1fa214b9f936bd91fecbfd6f05436d22311f4dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1fa214b9f936bd91fecbfd6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Aug 20 18:44:35 2021 +0200 msvcrt: Rename exception::what() implementation to exception_what. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 6 +++--- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr70/msvcr70.spec | 4 ++-- dlls/msvcr71/msvcr71.spec | 4 ++-- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/cpp.c | 30 +++++++++++++++--------------- dlls/msvcrt/msvcrt.spec | 6 +++--- dlls/msvcrtd/msvcrtd.spec | 4 ++-- 10 files changed, 36 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f1fa214b9f936bd91fec…

1 0

Nikolay Sivov : oleaut32/typelib: Remove explicit check already handled by the loop condition.
by Alexandre Julliard 20 Aug '21

20 Aug '21

Module: wine Branch: master Commit: 8ca5afa43046627bcc1acd0f465715397825ed1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ca5afa43046627bcc1acd0f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 20 13:57:56 2021 +0300 oleaut32/typelib: Remove explicit check already handled by the loop condition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 0526af0abdb..ac326afe1a1 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -7216,7 +7216,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( UINT *pArgErr) { ITypeInfoImpl *This = impl_from_ITypeInfo2(iface); - int i; + int i, j; unsigned int var_index; TYPEKIND type_kind; HRESULT hres; @@ -7323,15 +7323,13 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( src_arg = NULL; - if (cNamedArgs) + for (j = 0; j < cNamedArgs; j++) { - USHORT j; - for (j = 0; j < cNamedArgs; j++) - if (rgdispidNamedArgs[j] == i || (i == func_desc->cParams-1 && rgdispidNamedArgs[j] == DISPID_PROPERTYPUT)) - { - src_arg = &pDispParams->rgvarg[j]; - break; - } + if (rgdispidNamedArgs[j] == i || (i == func_desc->cParams-1 && rgdispidNamedArgs[j] == DISPID_PROPERTYPUT)) + { + src_arg = &pDispParams->rgvarg[j]; + break; + } } if (!src_arg && vargs_converted + cNamedArgs < pDispParams->cArgs) @@ -7400,7 +7398,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( { SAFEARRAYBOUND bound; VARIANT *v; - LONG j; + bound.lLbound = 0; bound.cElements = pDispParams->cArgs-i; if (!(a = SafeArrayCreate(VT_VARIANT, 1, &bound))) @@ -7585,7 +7583,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( i == func_desc->cParams-1) { SAFEARRAY *a = V_ARRAY(prgpvarg[i]); - LONG j, ubound; + LONG ubound; VARIANT *v; hres = SafeArrayGetUBound(a, 1, &ubound); if (hres != S_OK)

1 0

Nikolay Sivov : oleaut32/tests: Add interface checks for font object.
by Alexandre Julliard 20 Aug '21

20 Aug '21

Module: wine Branch: master Commit: f7d26b4244fc69e878a548790daa6a47086656a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7d26b4244fc69e878a54879… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 20 12:00:15 2021 +0300 oleaut32/tests: Add interface checks for font object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/olefont.c | 53 ++++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index 5137d807e78..c14d3d9435d 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -51,6 +51,21 @@ static HMODULE hOleaut32; static HRESULT (WINAPI *pOleCreateFontIndirect)(LPFONTDESC,REFIID,LPVOID*); +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); +} + #define EXPECT_HR(hr,hr_exp) \ ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp) @@ -183,41 +198,27 @@ static void test_ifont_sizes(void) test_ifont_size(300000, 2, 2, -1058, "2:2 ratio 3"); } -static void test_QueryInterface(void) +static void test_interfaces(void) { - LPVOID pvObj = NULL; HRESULT hr; - IFont* font = NULL; - IPersistStreamInit *persistStreamInit = NULL; - LONG ref; + IFont *font = NULL; hr = pOleCreateFontIndirect(NULL, &IID_IFont, NULL); EXPECT_HR(hr, E_POINTER); - hr = pOleCreateFontIndirect(NULL, &IID_IFont, &pvObj); - font = pvObj; - + hr = pOleCreateFontIndirect(NULL, &IID_IFont, (void **)&font); EXPECT_HR(hr, S_OK); ok(font != NULL,"OCFI (NULL,..) returns NULL, instead of !NULL\n"); - pvObj = NULL; - hr = IFont_QueryInterface( font, &IID_IFont, &pvObj); - EXPECT_HR(hr, S_OK); - - /* Test if QueryInterface increments ref counter for IFONTs */ - ref = IFont_AddRef(font); - ok(ref == 3 || - broken(ref == 1), /* win95 */ - "IFont_QI expected ref value 3 but instead got %d\n", ref); - IFont_Release(font); + check_interface(font, &IID_IFont, TRUE); + check_interface(font, &IID_IFontDisp, TRUE); + check_interface(font, &IID_IDispatch, TRUE); + check_interface(font, &IID_IPersist, TRUE); + check_interface(font, &IID_IPersistStream, TRUE); + check_interface(font, &IID_IConnectionPointContainer, TRUE); + check_interface(font, &IID_IPersistPropertyBag, TRUE); + check_interface(font, &IID_IPersistStreamInit, FALSE); - ok(pvObj != NULL,"IFont_QI does return NULL, instead of a ptr\n"); - - /* IFont never had IPersistStreamInit */ - hr = IFont_QueryInterface(font, &IID_IPersistStreamInit, (void**)&persistStreamInit); - EXPECT_HR(hr, E_NOINTERFACE); - - IFont_Release(font); IFont_Release(font); } @@ -1278,7 +1279,7 @@ START_TEST(olefont) return; } - test_QueryInterface(); + test_interfaces(); test_type_info(); test_ifont_sizes(); test_font_events_disp();

1 0

Jacek Caban : gdi32: Use NtGdiGetOutlineTextMetricsInternalW for GetOutlineTextMetrics.
by Alexandre Julliard 20 Aug '21

20 Aug '21

Module: wine Branch: master Commit: 0669b6cd4868e50dc7c0b41aff9dcb39e00f9d0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0669b6cd4868e50dc7c0b41a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 20 10:43:13 2021 +0200 gdi32: Use NtGdiGetOutlineTextMetricsInternalW for GetOutlineTextMetrics. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 188 ++---------------------------------------------------- dlls/gdi32/text.c | 182 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 187 insertions(+), 183 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0669b6cd4868e50dc7c0…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2021