[PATCH 0/6] MR9300: vccorlib140: Platform::Exceptions stubs and tests.
From: Vibhav Pant <vibhavp(a)gmail.com> --- dlls/vccorlib140/tests/vccorlib.c | 41 ++++++++++++++++++++++++++++++- dlls/vccorlib140/vccorlib.c | 11 +++++++++ dlls/vccorlib140/vccorlib140.spec | 8 +++--- 3 files changed, 55 insertions(+), 5 deletions(-) diff --git a/dlls/vccorlib140/tests/vccorlib.c b/dlls/vccorlib140/tests/vccorlib.c index 1b597a9325a..a88c6c228f0 100644 --- a/dlls/vccorlib140/tests/vccorlib.c +++ b/dlls/vccorlib140/tests/vccorlib.c @@ -130,6 +130,8 @@ static int (__cdecl *p_platform_type_GetTypeCode)(void *); static HSTRING (__cdecl *p_platform_type_ToString)(void *); static HSTRING (__cdecl *p_platform_type_get_FullName)(void *); static void *(WINAPI *pCreateValue)(int type, const void *); +static void *(__cdecl *pAllocateException)(size_t); +static void (__cdecl *pFreeException)(void *); static void *(__cdecl *p__RTtypeid)(const void *); static const char *(__thiscall *p_type_info_name)(void *); @@ -173,6 +175,8 @@ static BOOL init(void) p_platform_type_ToString = (void *)GetProcAddress(hmod, "?ToString(a)Type@Platform@@U$AAAP$AAVString(a)2@XZ"); p_platform_type_get_FullName = (void *)GetProcAddress(hmod, "?get(a)FullName@Type(a)Platform@@Q$AAAP$AAVString(a)3@XZ"); pCreateValue = (void *)GetProcAddress(hmod, "?CreateValue(a)Details@Platform@@YAP$AAVObject(a)2@W4TypeCode(a)2@PBX(a)Z"); + pAllocateException = (void *)GetProcAddress(hmod, "?AllocateException(a)Heap@Details(a)Platform@@SAPAXI(a)Z"); + pFreeException = (void *)GetProcAddress(hmod, "?FreeException(a)Heap@Details(a)Platform@@SAXPAX(a)Z"); p_type_info_name = (void *)GetProcAddress(msvcrt, "?name(a)type_info@@QBAPBDXZ"); p_type_info_raw_name = (void *)GetProcAddress(msvcrt, "?raw_name(a)type_info@@QBAPBDXZ"); p_type_info_opequals_equals = (void *)GetProcAddress(msvcrt, "??8type_info@@QBAHABV0@@Z"); @@ -198,6 +202,8 @@ static BOOL init(void) "?get(a)FullName@Type(a)Platform@@QE$AAAPE$AAVString(a)3@XZ"); pCreateValue = (void *)GetProcAddress(hmod, "?CreateValue(a)Details@Platform@@YAPE$AAVObject(a)2@W4TypeCode(a)2@PEBX(a)Z"); + pAllocateException = (void *)GetProcAddress(hmod, "?AllocateException(a)Heap@Details(a)Platform@@SAPEAX_K(a)Z"); + pFreeException = (void *)GetProcAddress(hmod, "?FreeException(a)Heap@Details(a)Platform@@SAXPEAX(a)Z"); p_type_info_name = (void *)GetProcAddress(msvcrt, "?name(a)type_info@@QEBAPEBDXZ"); p_type_info_raw_name = (void *)GetProcAddress(msvcrt, "?raw_name(a)type_info@@QEBAPEBDXZ"); p_type_info_opequals_equals = (void *)GetProcAddress(msvcrt, "??8type_info@@QEBAHAEBV0@@Z"); @@ -222,6 +228,8 @@ static BOOL init(void) "?get(a)FullName@Type(a)Platform@@Q$AAAP$AAVString(a)3@XZ"); pCreateValue = (void *)GetProcAddress(hmod, "?CreateValue(a)Details@Platform@@YGP$AAVObject(a)2@W4TypeCode(a)2@PBX(a)Z"); + pAllocateException = (void *)GetProcAddress(hmod, "?AllocateException(a)Heap@Details(a)Platform@@SAPAXI(a)Z"); + pFreeException = (void *)GetProcAddress(hmod, "?FreeException(a)Heap@Details(a)Platform@@SAXPAX(a)Z"); p_type_info_name = (void *)GetProcAddress(msvcrt, "?name(a)type_info@@QBEPBDXZ"); p_type_info_raw_name = (void *)GetProcAddress(msvcrt, "?raw_name(a)type_info@@QBEPBDXZ"); p_type_info_opequals_equals = (void *)GetProcAddress(msvcrt, "??8type_info@@QBEHABV0@@Z"); @@ -240,6 +248,8 @@ static BOOL init(void) ok(p_platform_type_ToString != NULL, "Platform::Type::ToString not available\n"); ok(p_platform_type_get_FullName != NULL, "Platform::Type::FullName not available\n"); ok(pCreateValue != NULL, "CreateValue not available\n"); + ok(pAllocateException != NULL, "AllocateException not available\n"); + ok(pFreeException != NULL, "FreeException not available\n"); ok(p_type_info_name != NULL, "type_info::name not available\n"); ok(p_type_info_raw_name != NULL, "type_info::raw_name not available\n"); @@ -444,7 +454,7 @@ static void test_GetIidsFn(void) static void test_Allocate(void) { - void *addr; + void *addr, **ptr, **base; addr = pAllocate(0); ok(!!addr, "got addr %p\n", addr); @@ -454,6 +464,35 @@ static void test_Allocate(void) ok(!!addr, "got addr %p\n", addr); pFree(addr); pFree(NULL); + + /* AllocateException allocates additional space for two pointer-width fields, with the second field used as the + * back-pointer to the exception data. */ + addr = pAllocateException(0); + todo_wine ok(!!addr, "got addr %p\n", addr); + if (!addr) return; + ptr = (void **)((ULONG_PTR)addr - sizeof(void *)); + *ptr = NULL; /* The write should succeed. */ + base = (void **)((ULONG_PTR)addr - 2 * sizeof(void *)); + *base = NULL; + /* Since base is the actual allocation base, Free(base) should succeed. */ + pFree(base); + + addr = pAllocateException(sizeof(void *)); + ok(!!addr, "got addr %p\n", addr); + ptr = (void **)((ULONG_PTR)addr - sizeof(void *)); + *ptr = NULL; + base = (void **)((ULONG_PTR)addr - 2 * sizeof(void *)); + *base = NULL; + /* FreeException will derive the allocation base itself. */ + pFreeException(addr); + + /* Do what AllocateException does, manually. */ + base = pAllocate(sizeof(void *) * 2 + sizeof(UINT32)); + ok(!!base, "got base %p\n", base); + /* addr is what AllocateException would return. */ + addr = (void *)((ULONG_PTR)base + sizeof(void *) * 2); + /* FreeException should succeed with addr. */ + pFreeException(addr); } #define test_refcount(a, b) test_refcount_(__LINE__, (a), (b)) diff --git a/dlls/vccorlib140/vccorlib.c b/dlls/vccorlib140/vccorlib.c index 3294aab6dd0..e642f7b8d27 100644 --- a/dlls/vccorlib140/vccorlib.c +++ b/dlls/vccorlib140/vccorlib.c @@ -101,6 +101,12 @@ void *__cdecl Allocate(size_t size) return addr; } +void *__cdecl AllocateException(size_t size) +{ + FIXME("(%Iu): stub!\n", size); + return NULL; +} + void __cdecl Free(void *addr) { TRACE("(%p)\n", addr); @@ -108,6 +114,11 @@ void __cdecl Free(void *addr) free(addr); } +void __cdecl FreeException(void *addr) +{ + FIXME("(%p): stub!\n", addr); +} + struct control_block { IWeakReference IWeakReference_iface; diff --git a/dlls/vccorlib140/vccorlib140.spec b/dlls/vccorlib140/vccorlib140.spec index d146b07d30e..36ed8606ad4 100644 --- a/dlls/vccorlib140/vccorlib140.spec +++ b/dlls/vccorlib140/vccorlib140.spec @@ -68,8 +68,8 @@ @ stub -arch=win64 ?FlushFactoryCache@@YAXXZ @ cdecl -arch=win32 ?Free(a)Heap@Details(a)Platform@@SAXPAX(a)Z(ptr) Free @ cdecl -arch=win64 ?Free(a)Heap@Details(a)Platform@@SAXPEAX(a)Z(ptr) Free -@ stub -arch=win32 ?FreeException(a)Heap@Details(a)Platform@@SAXPAX(a)Z -@ stub -arch=win64 ?FreeException(a)Heap@Details(a)Platform@@SAXPEAX(a)Z +@ cdecl -arch=win32 ?FreeException(a)Heap@Details(a)Platform@@SAXPAX(a)Z(ptr) FreeException +@ cdecl -arch=win64 ?FreeException(a)Heap@Details(a)Platform@@SAXPEAX(a)Z(ptr) FreeException @ stub -arch=i386 ?GetActivationFactory(a)Details@Platform@@YGJPAVModuleBase(a)1WRL@Microsoft@@PAUHSTRING__@@PAPAUIActivationFactory@@@Z @ stub -arch=arm ?GetActivationFactory(a)Details@Platform@@YAJPAVModuleBase(a)1WRL@Microsoft@@PAUHSTRING__@@PAPAUIActivationFactory@@@Z @ stub -arch=win64 ?GetActivationFactory(a)Details@Platform@@YAJPEAVModuleBase(a)1WRL@Microsoft@@PEAUHSTRING__@@PEAPEAUIActivationFactory@@@Z @@ -507,10 +507,10 @@ @ cdecl -arch=win64 ?Allocate(a)Heap@Details(a)Platform@@SAPEAX_K(a)Z(long) Allocate @ cdecl -arch=win32 ?Allocate(a)Heap@Details(a)Platform@@SAPAXII(a)Z(long long) AllocateWithWeakRef @ cdecl -arch=win64 ?Allocate(a)Heap@Details(a)Platform@@SAPEAX_K0(a)Z(long long) AllocateWithWeakRef -@ stub -arch=win32 ?AllocateException(a)Heap@Details(a)Platform@@SAPAXI(a)Z +@ cdecl -arch=win32 ?AllocateException(a)Heap@Details(a)Platform@@SAPAXI(a)Z(long) AllocateException @ stub -arch=win64 ?AllocateException(a)Heap@Details(a)Platform@@SAPEAX_K0(a)Z @ stub -arch=win32 ?AllocateException(a)Heap@Details(a)Platform@@SAPAXII(a)Z -@ stub -arch=win64 ?AllocateException(a)Heap@Details(a)Platform@@SAPEAX_K(a)Z +@ cdecl -arch=win64 ?AllocateException(a)Heap@Details(a)Platform@@SAPEAX_K(a)Z(long) AllocateException @ stub ?Compare(a)Duration@Xaml(a)UI@Windows@@SAHV1234(a)0@Z @ stub -arch=win32 ??0COMException(a)Platform@@Q$AAA(a)HP$AAVString(a)1@@Z @ stub -arch=win64 ??0COMException(a)Platform@@QE$AAA(a)HPE$AAVString(a)1@@Z -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9300
From: Vibhav Pant <vibhavp(a)gmail.com> --- dlls/vccorlib140/tests/vccorlib.c | 57 +++++++++++++++++++++++++++++-- dlls/vccorlib140/vccorlib.c | 12 +++++-- dlls/vccorlib140/vccorlib140.spec | 4 +-- 3 files changed, 67 insertions(+), 6 deletions(-) diff --git a/dlls/vccorlib140/tests/vccorlib.c b/dlls/vccorlib140/tests/vccorlib.c index a88c6c228f0..a9fb81a5f63 100644 --- a/dlls/vccorlib140/tests/vccorlib.c +++ b/dlls/vccorlib140/tests/vccorlib.c @@ -131,6 +131,7 @@ static HSTRING (__cdecl *p_platform_type_ToString)(void *); static HSTRING (__cdecl *p_platform_type_get_FullName)(void *); static void *(WINAPI *pCreateValue)(int type, const void *); static void *(__cdecl *pAllocateException)(size_t); +static void *(__cdecl *pAllocateExceptionWithWeakRef)(ptrdiff_t, size_t); static void (__cdecl *pFreeException)(void *); static void *(__cdecl *p__RTtypeid)(const void *); @@ -176,6 +177,8 @@ static BOOL init(void) p_platform_type_get_FullName = (void *)GetProcAddress(hmod, "?get(a)FullName@Type(a)Platform@@Q$AAAP$AAVString(a)3@XZ"); pCreateValue = (void *)GetProcAddress(hmod, "?CreateValue(a)Details@Platform@@YAP$AAVObject(a)2@W4TypeCode(a)2@PBX(a)Z"); pAllocateException = (void *)GetProcAddress(hmod, "?AllocateException(a)Heap@Details(a)Platform@@SAPAXI(a)Z"); + pAllocateExceptionWithWeakRef = (void *)GetProcAddress(hmod, + "?AllocateException(a)Heap@Details(a)Platform@@SAPAXII(a)Z"); pFreeException = (void *)GetProcAddress(hmod, "?FreeException(a)Heap@Details(a)Platform@@SAXPAX(a)Z"); p_type_info_name = (void *)GetProcAddress(msvcrt, "?name(a)type_info@@QBAPBDXZ"); p_type_info_raw_name = (void *)GetProcAddress(msvcrt, "?raw_name(a)type_info@@QBAPBDXZ"); @@ -203,6 +206,8 @@ static BOOL init(void) pCreateValue = (void *)GetProcAddress(hmod, "?CreateValue(a)Details@Platform@@YAPE$AAVObject(a)2@W4TypeCode(a)2@PEBX(a)Z"); pAllocateException = (void *)GetProcAddress(hmod, "?AllocateException(a)Heap@Details(a)Platform@@SAPEAX_K(a)Z"); + pAllocateExceptionWithWeakRef = (void *)GetProcAddress(hmod, + "?AllocateException(a)Heap@Details(a)Platform@@SAPEAX_K0(a)Z"); pFreeException = (void *)GetProcAddress(hmod, "?FreeException(a)Heap@Details(a)Platform@@SAXPEAX(a)Z"); p_type_info_name = (void *)GetProcAddress(msvcrt, "?name(a)type_info@@QEBAPEBDXZ"); p_type_info_raw_name = (void *)GetProcAddress(msvcrt, "?raw_name(a)type_info@@QEBAPEBDXZ"); @@ -229,6 +234,8 @@ static BOOL init(void) pCreateValue = (void *)GetProcAddress(hmod, "?CreateValue(a)Details@Platform@@YGP$AAVObject(a)2@W4TypeCode(a)2@PBX(a)Z"); pAllocateException = (void *)GetProcAddress(hmod, "?AllocateException(a)Heap@Details(a)Platform@@SAPAXI(a)Z"); + pAllocateExceptionWithWeakRef = (void *)GetProcAddress(hmod, + "?AllocateException(a)Heap@Details(a)Platform@@SAPAXII(a)Z"); pFreeException = (void *)GetProcAddress(hmod, "?FreeException(a)Heap@Details(a)Platform@@SAXPAX(a)Z"); p_type_info_name = (void *)GetProcAddress(msvcrt, "?name(a)type_info@@QBEPBDXZ"); p_type_info_raw_name = (void *)GetProcAddress(msvcrt, "?raw_name(a)type_info@@QBEPBDXZ"); @@ -249,6 +256,7 @@ static BOOL init(void) ok(p_platform_type_get_FullName != NULL, "Platform::Type::FullName not available\n"); ok(pCreateValue != NULL, "CreateValue not available\n"); ok(pAllocateException != NULL, "AllocateException not available\n"); + ok(pAllocateExceptionWithWeakRef != NULL, "AllocateExceptionWithWeakRef not available.\n"); ok(pFreeException != NULL, "FreeException not available\n"); ok(p_type_info_name != NULL, "type_info::name not available\n"); @@ -512,9 +520,10 @@ struct control_block LONG ref_strong; IUnknown *object; bool is_inline; - UINT16 unknown; + bool unknown; + bool is_exception; #ifdef _WIN32 - char _padding[4]; + char _padding[5]; #endif }; @@ -646,6 +655,7 @@ static void test_AllocateWithWeakRef_inline(void) ok(object->weakref->object == &object->IUnknown_iface, "got object %p != %p\n", object->weakref->object, &object->IUnknown_iface); ok(object->weakref->unknown == 0, "got unknown %d\n", object->weakref->unknown); + ok(!object->weakref->is_exception, "got is_exception %d\n", object->weakref->is_exception); /* The object is allocate within the weakref. */ ok((char *)object->weakref == ((char *)object - sizeof(struct control_block)), "got %p != %p\n", object->weakref, (char *)object - sizeof(struct control_block)); @@ -703,6 +713,49 @@ static void test_AllocateWithWeakRef(void) ok(object->weakref->object == &object->IUnknown_iface, "got object %p != %p\n", object->weakref->object, &object->IUnknown_iface); ok(object->weakref->unknown == 0, "got unknown %d\n", object->weakref->unknown); + ok(!object->weakref->is_exception, "got is_exception %d\n", object->weakref->is_exception); + + hr = IWeakReference_Resolve(weakref, &IID_IAgileObject, (IInspectable **)&out); + ok(hr == S_OK, "got hr %#lx\n", hr); + test_refcount(&object->IUnknown_iface, 2); + IUnknown_Release(out); + + call_func1(pReleaseTarget, object->weakref); + hr = IWeakReference_Resolve(weakref, &IID_IAgileObject, (IInspectable **)&out); + ok(hr == S_OK, "got hr %#lx\n", hr); + test_refcount(&object->IUnknown_iface, 2); + IUnknown_Release(out); + + count = IWeakReference_AddRef(weakref); + ok(count == 2, "got count %lu\n", count); + + count = IUnknown_Release(&object->IUnknown_iface); + ok(count == 0, "got count %lu\n", count); + test_refcount(weakref, 1); + out = (IUnknown *)0xdeadbeef; + hr = IWeakReference_Resolve(weakref, &IID_IAgileObject, (IInspectable **)&out); + ok(hr == S_OK, "got hr %#lx\n", hr); + ok(out == (IUnknown *)0xdeadbeef, "got out %p\n", out); + count = IWeakReference_Release(weakref); + ok(count == 0, "got count %lu\n", count); + + /* AllocateExceptionWithWeakRef will not store the control block inline, regardless of the size. */ + object = pAllocateExceptionWithWeakRef(offsetof(struct unknown_impl, weakref), sizeof(struct unknown_impl)); + todo_wine ok(object != NULL, "got object %p\n", object); + if (!object) return; + + object->strong_ref_free_val = -100; + ok(object->weakref != NULL, "got weakref %p\n", object->weakref); + object->IUnknown_iface.lpVtbl = &unknown_impl_vtbl; + weakref = &object->weakref->IWeakReference_iface; + + test_refcount(weakref, 1); + ok(!object->weakref->is_inline, "got is_inline %d\n", object->weakref->is_inline); + ok(object->weakref->ref_strong == 1, "got ref_strong %lu\n", object->weakref->ref_strong); + ok(object->weakref->object == &object->IUnknown_iface, "got object %p != %p\n", object->weakref->object, + &object->IUnknown_iface); + ok(object->weakref->unknown == 0, "got unknown %d\n", object->weakref->unknown); + ok(object->weakref->is_exception, "got is_exception %d\n", object->weakref->is_exception); hr = IWeakReference_Resolve(weakref, &IID_IAgileObject, (IInspectable **)&out); ok(hr == S_OK, "got hr %#lx\n", hr); diff --git a/dlls/vccorlib140/vccorlib.c b/dlls/vccorlib140/vccorlib.c index e642f7b8d27..22ac7e5c2d8 100644 --- a/dlls/vccorlib140/vccorlib.c +++ b/dlls/vccorlib140/vccorlib.c @@ -126,9 +126,10 @@ struct control_block LONG ref_strong; IUnknown *object; bool is_inline; - UINT16 unknown; + bool unknown; + bool is_exception; #ifdef _WIN32 - char _padding[4]; + char _padding[5]; #endif }; @@ -228,10 +229,17 @@ void *__cdecl AllocateWithWeakRef(ptrdiff_t offset, size_t size) weakref->object = object; weakref->ref_strong = weakref->ref_weak = 1; weakref->unknown = 0; + weakref->is_exception = FALSE; return weakref->object; } +void *__cdecl AllocateExceptionWithWeakRef(ptrdiff_t offset, size_t size) +{ + FIXME("(%Iu, %Iu): stub!\n", offset, size); + return NULL; +} + DEFINE_THISCALL_WRAPPER(control_block_ReleaseTarget, 4) void __thiscall control_block_ReleaseTarget(struct control_block *weakref) { diff --git a/dlls/vccorlib140/vccorlib140.spec b/dlls/vccorlib140/vccorlib140.spec index 36ed8606ad4..a77ac7d414e 100644 --- a/dlls/vccorlib140/vccorlib140.spec +++ b/dlls/vccorlib140/vccorlib140.spec @@ -508,8 +508,8 @@ @ cdecl -arch=win32 ?Allocate(a)Heap@Details(a)Platform@@SAPAXII(a)Z(long long) AllocateWithWeakRef @ cdecl -arch=win64 ?Allocate(a)Heap@Details(a)Platform@@SAPEAX_K0(a)Z(long long) AllocateWithWeakRef @ cdecl -arch=win32 ?AllocateException(a)Heap@Details(a)Platform@@SAPAXI(a)Z(long) AllocateException -@ stub -arch=win64 ?AllocateException(a)Heap@Details(a)Platform@@SAPEAX_K0(a)Z -@ stub -arch=win32 ?AllocateException(a)Heap@Details(a)Platform@@SAPAXII(a)Z +@ cdecl -arch=win64 ?AllocateException(a)Heap@Details(a)Platform@@SAPEAX_K0(a)Z(long long) AllocateExceptionWithWeakRef +@ cdecl -arch=win32 ?AllocateException(a)Heap@Details(a)Platform@@SAPAXII(a)Z(long long) AllocateExceptionWithWeakRef @ cdecl -arch=win64 ?AllocateException(a)Heap@Details(a)Platform@@SAPEAX_K(a)Z(long) AllocateException @ stub ?Compare(a)Duration@Xaml(a)UI@Windows@@SAHV1234(a)0@Z @ stub -arch=win32 ??0COMException(a)Platform@@Q$AAA(a)HP$AAVString(a)1@@Z -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9300
From: Vibhav Pant <vibhavp(a)gmail.com> --- dlls/vccorlib140/vccorlib.c | 49 +++++++++++++++++ dlls/vccorlib140/vccorlib140.spec | 87 +++++++++++++------------------ 2 files changed, 85 insertions(+), 51 deletions(-) diff --git a/dlls/vccorlib140/vccorlib.c b/dlls/vccorlib140/vccorlib.c index 22ac7e5c2d8..12ff8b6f8d6 100644 --- a/dlls/vccorlib140/vccorlib.c +++ b/dlls/vccorlib140/vccorlib.c @@ -576,6 +576,55 @@ void *WINAPI CreateValue(int typecode, const void *val) return obj; } +void *__cdecl CreateExceptionWithMessage(HRESULT hr, HSTRING msg) +{ + FIXME("(%#lx, %s): stub!\n", hr, debugstr_hstring(msg)); + return NULL; +} + +void *__cdecl CreateException(HRESULT hr) +{ + FIXME("(%#lx): stub!\n", hr); + return NULL; +} + +void WINAPI __abi_WinRTraiseCOMException(HRESULT hr) +{ + FIXME("(%#lx): stub!\n", hr); +} + +#define WINRT_EXCEPTIONS \ + WINRT_EXCEPTION(AccessDenied, E_ACCESSDENIED) \ + WINRT_EXCEPTION(ChangedState, E_CHANGED_STATE) \ + WINRT_EXCEPTION(ClassNotRegistered, REGDB_E_CLASSNOTREG) \ + WINRT_EXCEPTION(Disconnected, RPC_E_DISCONNECTED) \ + WINRT_EXCEPTION(Failure, E_FAIL) \ + WINRT_EXCEPTION(InvalidArgument, E_INVALIDARG) \ + WINRT_EXCEPTION(InvalidCast, E_NOINTERFACE) \ + WINRT_EXCEPTION(NotImplemented, E_NOTIMPL) \ + WINRT_EXCEPTION(NullReference, E_POINTER) \ + WINRT_EXCEPTION(ObjectDisposed, RO_E_CLOSED) \ + WINRT_EXCEPTION(OperationCanceled, E_ABORT) \ + WINRT_EXCEPTION(OutOfBounds, E_BOUNDS) \ + WINRT_EXCEPTION(OutOfMemory, E_OUTOFMEMORY) \ + WINRT_EXCEPTION(WrongThread, RPC_E_WRONG_THREAD) + +#define WINRT_EXCEPTION(name, hr) \ + void WINAPI __abi_WinRTraise##name##Exception(void) \ + { \ + FIXME("(): stub!\n"); \ + } + +WINRT_EXCEPTIONS + +#undef WINRT_EXCEPTION + +HSTRING __cdecl platform_exception_get_Message(void *excp) +{ + FIXME("(%p): stub!\n", excp); + return NULL; +} + BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) { if (reason == DLL_PROCESS_ATTACH) diff --git a/dlls/vccorlib140/vccorlib140.spec b/dlls/vccorlib140/vccorlib140.spec index a77ac7d414e..78f090754cc 100644 --- a/dlls/vccorlib140/vccorlib140.spec +++ b/dlls/vccorlib140/vccorlib140.spec @@ -295,53 +295,38 @@ @ stub -arch=win64 ?__abi_ObjectToString(a)__abi_details@@YAPE$AAVString(a)Platform@@PE$AAVObject(a)3@_N(a)Z @ stub -arch=win32 ?__abi_Resolve(a)ControlBlock@Details(a)Platform@@UAGJAAVGuid(a)3@PAPAU__abi_IInspectable@@@Z @ stub -arch=win64 ?__abi_Resolve(a)ControlBlock@Details(a)Platform@@UEAAJAEAVGuid(a)3@PEAPEAU__abi_IInspectable@@@Z -@ stub -arch=i386 ?__abi_WinRTraiseAccessDeniedException@@YGXXZ -@ stub -arch=arm ?__abi_WinRTraiseAccessDeniedException@@YAXXZ -@ stub -arch=win64 ?__abi_WinRTraiseAccessDeniedException@@YAXXZ -@ stub -arch=i386 ?__abi_WinRTraiseCOMException@@YGXJ(a)Z -@ stub -arch=arm ?__abi_WinRTraiseCOMException@@YAXJ(a)Z -@ stub -arch=win64 ?__abi_WinRTraiseCOMException@@YAXJ(a)Z -@ stub -arch=i386 ?__abi_WinRTraiseChangedStateException@@YGXXZ -@ stub -arch=arm ?__abi_WinRTraiseChangedStateException@@YAXXZ -@ stub -arch=win64 ?__abi_WinRTraiseChangedStateException@@YAXXZ -@ stub -arch=i386 ?__abi_WinRTraiseClassNotRegisteredException@@YGXXZ -@ stub -arch=arm ?__abi_WinRTraiseClassNotRegisteredException@@YAXXZ -@ stub -arch=win64 ?__abi_WinRTraiseClassNotRegisteredException@@YAXXZ -@ stub -arch=i386 ?__abi_WinRTraiseDisconnectedException@@YGXXZ -@ stub -arch=arm ?__abi_WinRTraiseDisconnectedException@@YAXXZ -@ stub -arch=win64 ?__abi_WinRTraiseDisconnectedException@@YAXXZ -@ stub -arch=i386 ?__abi_WinRTraiseFailureException@@YGXXZ -@ stub -arch=arm ?__abi_WinRTraiseFailureException@@YAXXZ -@ stub -arch=win64 ?__abi_WinRTraiseFailureException@@YAXXZ -@ stub -arch=i386 ?__abi_WinRTraiseInvalidArgumentException@@YGXXZ -@ stub -arch=arm ?__abi_WinRTraiseInvalidArgumentException@@YAXXZ -@ stub -arch=win64 ?__abi_WinRTraiseInvalidArgumentException@@YAXXZ -@ stub -arch=i386 ?__abi_WinRTraiseInvalidCastException@@YGXXZ -@ stub -arch=arm ?__abi_WinRTraiseInvalidCastException@@YAXXZ -@ stub -arch=win64 ?__abi_WinRTraiseInvalidCastException@@YAXXZ +@ stdcall -arch=i386 ?__abi_WinRTraiseAccessDeniedException@@YGXXZ() __abi_WinRTraiseAccessDeniedException +@ stdcall -arch=arm,win64 ?__abi_WinRTraiseAccessDeniedException@@YAXXZ() __abi_WinRTraiseAccessDeniedException +@ stdcall -arch=i386 ?__abi_WinRTraiseCOMException@@YGXJ(a)Z(long) __abi_WinRTraiseCOMException +@ stdcall -arch=arm,win64 ?__abi_WinRTraiseCOMException@@YAXJ(a)Z(long) __abi_WinRTraiseCOMException +@ stdcall -arch=i386 ?__abi_WinRTraiseChangedStateException@@YGXXZ() __abi_WinRTraiseChangedStateException +@ stdcall -arch=arm,win64 ?__abi_WinRTraiseChangedStateException@@YAXXZ() __abi_WinRTraiseChangedStateException +@ stdcall -arch=i386 ?__abi_WinRTraiseClassNotRegisteredException@@YGXXZ() __abi_WinRTraiseClassNotRegisteredException +@ stdcall -arch=arm,win64 ?__abi_WinRTraiseClassNotRegisteredException@@YAXXZ() __abi_WinRTraiseClassNotRegisteredException +@ stdcall -arch=i386 ?__abi_WinRTraiseDisconnectedException@@YGXXZ() __abi_WinRTraiseDisconnectedException +@ stdcall -arch=arm,win64 ?__abi_WinRTraiseDisconnectedException@@YAXXZ() __abi_WinRTraiseDisconnectedException +@ stdcall -arch=i386 ?__abi_WinRTraiseFailureException@@YGXXZ() __abi_WinRTraiseFailureException +@ stdcall -arch=arm,win64 ?__abi_WinRTraiseFailureException@@YAXXZ() __abi_WinRTraiseFailureException +@ stdcall -arch=i386 ?__abi_WinRTraiseInvalidArgumentException@@YGXXZ() __abi_WinRTraiseInvalidArgumentException +@ stdcall -arch=arm,win64 ?__abi_WinRTraiseInvalidArgumentException@@YAXXZ() __abi_WinRTraiseInvalidArgumentException +@ stdcall -arch=i386 ?__abi_WinRTraiseInvalidCastException@@YGXXZ() __abi_WinRTraiseInvalidCastException +@ stdcall -arch=arm,win64 ?__abi_WinRTraiseInvalidCastException@@YAXXZ() __abi_WinRTraiseInvalidCastException @ stub -arch=win32 ??0IntPtr(a)Platform@@QAA(a)H@Z @ stub -arch=win64 ??0IntPtr(a)Platform@@QEAA(a)H@Z -@ stub -arch=i386 ?__abi_WinRTraiseNotImplementedException@@YGXXZ -@ stub -arch=arm ?__abi_WinRTraiseNotImplementedException@@YAXXZ -@ stub -arch=win64 ?__abi_WinRTraiseNotImplementedException@@YAXXZ -@ stub -arch=i386 ?__abi_WinRTraiseNullReferenceException@@YGXXZ -@ stub -arch=arm ?__abi_WinRTraiseNullReferenceException@@YAXXZ -@ stub -arch=win64 ?__abi_WinRTraiseNullReferenceException@@YAXXZ -@ stub -arch=i386 ?__abi_WinRTraiseObjectDisposedException@@YGXXZ -@ stub -arch=arm ?__abi_WinRTraiseObjectDisposedException@@YAXXZ -@ stub -arch=win64 ?__abi_WinRTraiseObjectDisposedException@@YAXXZ -@ stub -arch=i386 ?__abi_WinRTraiseOperationCanceledException@@YGXXZ -@ stub -arch=arm ?__abi_WinRTraiseOperationCanceledException@@YAXXZ -@ stub -arch=win64 ?__abi_WinRTraiseOperationCanceledException@@YAXXZ -@ stub -arch=i386 ?__abi_WinRTraiseOutOfBoundsException@@YGXXZ -@ stub -arch=arm ?__abi_WinRTraiseOutOfBoundsException@@YAXXZ -@ stub -arch=win64 ?__abi_WinRTraiseOutOfBoundsException@@YAXXZ -@ stub -arch=i386 ?__abi_WinRTraiseOutOfMemoryException@@YGXXZ -@ stub -arch=arm ?__abi_WinRTraiseOutOfMemoryException@@YAXXZ -@ stub -arch=win64 ?__abi_WinRTraiseOutOfMemoryException@@YAXXZ -@ stub -arch=i386 ?__abi_WinRTraiseWrongThreadException@@YGXXZ -@ stub -arch=arm ?__abi_WinRTraiseWrongThreadException@@YAXXZ -@ stub -arch=win64 ?__abi_WinRTraiseWrongThreadException@@YAXXZ +@ stdcall -arch=i386 ?__abi_WinRTraiseNotImplementedException@@YGXXZ() __abi_WinRTraiseNotImplementedException +@ stdcall -arch=arm,win64 ?__abi_WinRTraiseNotImplementedException@@YAXXZ() __abi_WinRTraiseNotImplementedException +@ stdcall -arch=i386 ?__abi_WinRTraiseNullReferenceException@@YGXXZ() __abi_WinRTraiseNullReferenceException +@ stdcall -arch=arm,win64 ?__abi_WinRTraiseNullReferenceException@@YAXXZ() __abi_WinRTraiseNullReferenceException +@ stdcall -arch=i386 ?__abi_WinRTraiseObjectDisposedException@@YGXXZ() __abi_WinRTraiseObjectDisposedException +@ stdcall -arch=arm,win64 ?__abi_WinRTraiseObjectDisposedException@@YAXXZ() __abi_WinRTraiseObjectDisposedException +@ stdcall -arch=i386 ?__abi_WinRTraiseOperationCanceledException@@YGXXZ() __abi_WinRTraiseOperationCanceledException +@ stdcall -arch=arm,win64 ?__abi_WinRTraiseOperationCanceledException@@YAXXZ() __abi_WinRTraiseOperationCanceledException +@ stdcall -arch=i386 ?__abi_WinRTraiseOutOfBoundsException@@YGXXZ() __abi_WinRTraiseOutOfBoundsException +@ stdcall -arch=arm,win64 ?__abi_WinRTraiseOutOfBoundsException@@YAXXZ() __abi_WinRTraiseOutOfBoundsException +@ stdcall -arch=i386 ?__abi_WinRTraiseOutOfMemoryException@@YGXXZ() __abi_WinRTraiseOutOfMemoryException +@ stdcall -arch=arm,win64 ?__abi_WinRTraiseOutOfMemoryException@@YAXXZ() __abi_WinRTraiseOutOfMemoryException +@ stdcall -arch=i386 ?__abi_WinRTraiseWrongThreadException@@YGXXZ() __abi_WinRTraiseWrongThreadException +@ stdcall -arch=arm,win64 ?__abi_WinRTraiseWrongThreadException@@YAXXZ() __abi_WinRTraiseWrongThreadException @ stub -arch=i386 ?__abi_cast_Object_to_String(a)__abi_details@@YGP$AAVString(a)Platform@@_NP$AAVObject(a)3@@Z @ stub -arch=arm ?__abi_cast_Object_to_String(a)__abi_details@@YAP$AAVString(a)Platform@@_NP$AAVObject(a)3@@Z @ stub -arch=win64 ?__abi_cast_Object_to_String(a)__abi_details@@YAPE$AAVString(a)Platform@@_NPE$AAVObject(a)3@@Z @@ -372,8 +357,8 @@ @ stub -arch=win64 ?get(a)HasInverse@Matrix3D(a)Media3D@Media(a)Xaml@UI(a)Windows@@QEAA_NXZ @ stub -arch=win32 ??0InvalidArgumentException(a)Platform@@Q$AAA(a)P$AAVString(a)1@@Z @ stub -arch=win64 ??0InvalidArgumentException(a)Platform@@QE$AAA(a)PE$AAVString(a)1@@Z -@ stub -arch=win32 ?get(a)Message@Exception(a)Platform@@Q$AAAP$AAVString(a)3@XZ -@ stub -arch=win64 ?get(a)Message@Exception(a)Platform@@QE$AAAPE$AAVString(a)3@XZ +@ cdecl -arch=win32 ?get(a)Message@Exception(a)Platform@@Q$AAAP$AAVString(a)3@XZ(ptr) platform_exception_get_Message +@ cdecl -arch=win64 ?get(a)Message@Exception(a)Platform@@QE$AAAPE$AAVString(a)3@XZ(ptr) platform_exception_get_Message @ stub ?get(a)ObjectCount@Heap(a)Details@Platform@@SAHXZ @ stub -arch=win32 ?get(a)Right@Rect(a)Foundation@Windows@@QAAMXZ @ stub -arch=win64 ?get(a)Right@Rect(a)Foundation@Windows@@QEAAMXZ @@ -516,10 +501,10 @@ @ stub -arch=win64 ??0COMException(a)Platform@@QE$AAA(a)HPE$AAVString(a)1@@Z @ stub -arch=win32 ?Contains(a)Rect@Foundation(a)Windows@@QAA_NVPoint(a)23@@Z @ stub -arch=win64 ?Contains(a)Rect@Foundation(a)Windows@@QEAA_NVPoint(a)23@@Z -@ stub -arch=win32 ?CreateException(a)Exception@Platform@@SAP$AAV12(a)H@Z -@ stub -arch=win64 ?CreateException(a)Exception@Platform@@SAPE$AAV12(a)H@Z -@ stub -arch=win32 ?CreateException(a)Exception@Platform@@SAP$AAV12(a)HP$AAVString(a)2@@Z -@ stub -arch=win64 ?CreateException(a)Exception@Platform@@SAPE$AAV12(a)HPE$AAVString(a)2@@Z +@ cdecl -arch=win32 ?CreateException(a)Exception@Platform@@SAP$AAV12(a)H@Z(long) CreateException +@ cdecl -arch=win64 ?CreateException(a)Exception@Platform@@SAPE$AAV12(a)H@Z(long) CreateException +@ cdecl -arch=win32 ?CreateException(a)Exception@Platform@@SAP$AAV12(a)HP$AAVString(a)2@@Z(long ptr) CreateExceptionWithMessage +@ cdecl -arch=win64 ?CreateException(a)Exception@Platform@@SAPE$AAV12(a)HPE$AAVString(a)2@@Z(long ptr) CreateExceptionWithMessage @ stdcall -arch=i386 ?CreateValue(a)Details@Platform@@YGP$AAVObject(a)2@W4TypeCode(a)2@PBX(a)Z(long ptr) CreateValue @ stdcall -arch=arm ?CreateValue(a)Details@Platform@@YAP$AAVObject(a)2@W4TypeCode(a)2@PBX(a)Z(long ptr) CreateValue @ stdcall -arch=win64 ?CreateValue(a)Details@Platform@@YAPE$AAVObject(a)2@W4TypeCode(a)2@PEBX(a)Z(long ptr) CreateValue -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9300
From: Vibhav Pant <vibhavp(a)gmail.com> --- dlls/vccorlib140/tests/Makefile.in | 2 +- dlls/vccorlib140/tests/vccorlib.c | 353 ++++++++++++++++++++++++++++- 2 files changed, 353 insertions(+), 2 deletions(-) diff --git a/dlls/vccorlib140/tests/Makefile.in b/dlls/vccorlib140/tests/Makefile.in index 9d20ff64424..7d19fceb468 100644 --- a/dlls/vccorlib140/tests/Makefile.in +++ b/dlls/vccorlib140/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = vccorlib140.dll -IMPORTS = combase ole32 uuid +IMPORTS = combase ole32 oleaut32 uuid SOURCES = \ vccorlib.c diff --git a/dlls/vccorlib140/tests/vccorlib.c b/dlls/vccorlib140/tests/vccorlib.c index a9fb81a5f63..15d6e34ea09 100644 --- a/dlls/vccorlib140/tests/vccorlib.c +++ b/dlls/vccorlib140/tests/vccorlib.c @@ -22,11 +22,13 @@ #define COBJMACROS #include <stdbool.h> +#include <stdint.h> #include "initguid.h" #include "activation.h" #include "objbase.h" #include "weakreference.h" +#include "restrictederrorinfo.h" #define WIDL_using_Windows_Foundation #include "windows.foundation.h" #include "winstring.h" @@ -110,6 +112,22 @@ DEFINE_EXPECT(PostInitialize); DEFINE_EXPECT(PreUninitialize); DEFINE_EXPECT(PostUninitialize); +#define WINRT_EXCEPTIONS \ + WINRT_EXCEPTION(AccessDenied, E_ACCESSDENIED) \ + WINRT_EXCEPTION(ChangedState, E_CHANGED_STATE) \ + WINRT_EXCEPTION(ClassNotRegistered, REGDB_E_CLASSNOTREG) \ + WINRT_EXCEPTION(Disconnected, RPC_E_DISCONNECTED) \ + WINRT_EXCEPTION(Failure, E_FAIL) \ + WINRT_EXCEPTION(InvalidArgument, E_INVALIDARG) \ + WINRT_EXCEPTION(InvalidCast, E_NOINTERFACE) \ + WINRT_EXCEPTION(NotImplemented, E_NOTIMPL) \ + WINRT_EXCEPTION(NullReference, E_POINTER) \ + WINRT_EXCEPTION(ObjectDisposed, RO_E_CLOSED) \ + WINRT_EXCEPTION(OperationCanceled, E_ABORT) \ + WINRT_EXCEPTION(OutOfBounds, E_BOUNDS) \ + WINRT_EXCEPTION(OutOfMemory, E_OUTOFMEMORY) \ + WINRT_EXCEPTION(WrongThread, RPC_E_WRONG_THREAD) + struct __abi_type_descriptor { const WCHAR *name; @@ -130,6 +148,9 @@ static int (__cdecl *p_platform_type_GetTypeCode)(void *); static HSTRING (__cdecl *p_platform_type_ToString)(void *); static HSTRING (__cdecl *p_platform_type_get_FullName)(void *); static void *(WINAPI *pCreateValue)(int type, const void *); +static void *(__cdecl *pCreateException)(HRESULT); +static void *(__cdecl *pCreateExceptionWithMessage)(HRESULT, HSTRING); +static HSTRING (__cdecl *p_platform_exception_get_Message)(void *); static void *(__cdecl *pAllocateException)(size_t); static void *(__cdecl *pAllocateExceptionWithWeakRef)(ptrdiff_t, size_t); static void (__cdecl *pFreeException)(void *); @@ -140,11 +161,13 @@ static const char *(__thiscall *p_type_info_raw_name)(void *); static int (__thiscall *p_type_info_opequals_equals)(void *, void *); static int (__thiscall *p_type_info_opnot_equals)(void *, void *); +static HMODULE hmod; + static BOOL init(void) { - HMODULE hmod = LoadLibraryA("vccorlib140.dll"); HMODULE msvcrt = LoadLibraryA("msvcrt.dll"); + hmod = LoadLibraryA("vccorlib140.dll"); if (!hmod) { win_skip("vccorlib140.dll not available\n"); @@ -176,6 +199,11 @@ static BOOL init(void) p_platform_type_ToString = (void *)GetProcAddress(hmod, "?ToString(a)Type@Platform@@U$AAAP$AAVString(a)2@XZ"); p_platform_type_get_FullName = (void *)GetProcAddress(hmod, "?get(a)FullName@Type(a)Platform@@Q$AAAP$AAVString(a)3@XZ"); pCreateValue = (void *)GetProcAddress(hmod, "?CreateValue(a)Details@Platform@@YAP$AAVObject(a)2@W4TypeCode(a)2@PBX(a)Z"); + pCreateException = (void *)GetProcAddress(hmod, "?CreateException(a)Exception@Platform@@SAP$AAV12(a)H@Z"); + pCreateExceptionWithMessage = (void *)GetProcAddress(hmod, + "?CreateException(a)Exception@Platform@@SAP$AAV12(a)HP$AAVString(a)2@@Z"); + p_platform_exception_get_Message = (void *)GetProcAddress(hmod, + "?get(a)Message@Exception(a)Platform@@Q$AAAP$AAVString(a)3@XZ"); pAllocateException = (void *)GetProcAddress(hmod, "?AllocateException(a)Heap@Details(a)Platform@@SAPAXI(a)Z"); pAllocateExceptionWithWeakRef = (void *)GetProcAddress(hmod, "?AllocateException(a)Heap@Details(a)Platform@@SAPAXII(a)Z"); @@ -205,6 +233,12 @@ static BOOL init(void) "?get(a)FullName@Type(a)Platform@@QE$AAAPE$AAVString(a)3@XZ"); pCreateValue = (void *)GetProcAddress(hmod, "?CreateValue(a)Details@Platform@@YAPE$AAVObject(a)2@W4TypeCode(a)2@PEBX(a)Z"); + pCreateException = (void *)GetProcAddress(hmod, + "?CreateException(a)Exception@Platform@@SAPE$AAV12(a)H@Z"); + pCreateExceptionWithMessage = (void *)GetProcAddress(hmod, + "?CreateException(a)Exception@Platform@@SAPE$AAV12(a)HPE$AAVString(a)2@@Z"); + p_platform_exception_get_Message = (void *)GetProcAddress(hmod, + "?get(a)Message@Exception(a)Platform@@QE$AAAPE$AAVString(a)3@XZ"); pAllocateException = (void *)GetProcAddress(hmod, "?AllocateException(a)Heap@Details(a)Platform@@SAPEAX_K(a)Z"); pAllocateExceptionWithWeakRef = (void *)GetProcAddress(hmod, "?AllocateException(a)Heap@Details(a)Platform@@SAPEAX_K0(a)Z"); @@ -233,6 +267,12 @@ static BOOL init(void) "?get(a)FullName@Type(a)Platform@@Q$AAAP$AAVString(a)3@XZ"); pCreateValue = (void *)GetProcAddress(hmod, "?CreateValue(a)Details@Platform@@YGP$AAVObject(a)2@W4TypeCode(a)2@PBX(a)Z"); + pCreateException = (void *)GetProcAddress(hmod, + "?CreateException(a)Exception@Platform@@SAP$AAV12(a)H@Z"); + pCreateExceptionWithMessage = (void *)GetProcAddress(hmod, + "?CreateException(a)Exception@Platform@@SAP$AAV12(a)HP$AAVString(a)2@@Z"); + p_platform_exception_get_Message = (void *)GetProcAddress(hmod, + "?get(a)Message@Exception(a)Platform@@Q$AAAP$AAVString(a)3@XZ"); pAllocateException = (void *)GetProcAddress(hmod, "?AllocateException(a)Heap@Details(a)Platform@@SAPAXI(a)Z"); pAllocateExceptionWithWeakRef = (void *)GetProcAddress(hmod, "?AllocateException(a)Heap@Details(a)Platform@@SAPAXII(a)Z"); @@ -255,6 +295,9 @@ static BOOL init(void) ok(p_platform_type_ToString != NULL, "Platform::Type::ToString not available\n"); ok(p_platform_type_get_FullName != NULL, "Platform::Type::FullName not available\n"); ok(pCreateValue != NULL, "CreateValue not available\n"); + ok(pCreateException != NULL, "CreateException not available\n"); + ok(pCreateExceptionWithMessage != NULL, "CreateExceptionWithMessage not available\n"); + ok(p_platform_exception_get_Message != NULL, "Platform::Exception::Message::get not available\n"); ok(pAllocateException != NULL, "AllocateException not available\n"); ok(pAllocateExceptionWithWeakRef != NULL, "AllocateExceptionWithWeakRef not available.\n"); ok(pFreeException != NULL, "FreeException not available\n"); @@ -1112,6 +1155,313 @@ static void test_CreateValue(void) pUninitializeData(0); } +#define CLASS_IS_SIMPLE_TYPE 1 +#define CLASS_HAS_VIRTUAL_BASE_CLASS 4 +#define CLASS_IS_IUNKNOWN 8 + +#define TYPE_FLAG_CONST 1 +#define TYPE_FLAG_VOLATILE 2 +#define TYPE_FLAG_REFERENCE 8 +#define TYPE_FLAG_IUNKNOWN 16 + +typedef struct __type_info +{ + const void *vtable; + char *name; + char mangled[128]; +} rtti_type_info; + +typedef struct +{ + UINT flags; + unsigned int type_info; + DWORD offsets[3]; + unsigned int size; + unsigned int copy_ctor; +} cxx_type_info; + +typedef struct +{ + UINT count; + unsigned int info[1]; +} cxx_type_info_table; + +typedef struct +{ + UINT flags; + unsigned int destructor; + unsigned int custom_handler; + unsigned int type_info_table; +} cxx_exception_type; + +struct exception_inner +{ + /* This only gets set when the exception is thrown. */ + BSTR message1; + /* Likewise, but can also be set by CreateExceptionWithMessage. */ + BSTR message2; + void *unknown1; + void *unknown2; + HRESULT hr; + /* Only gets set when the exception is thrown. */ + IRestrictedErrorInfo *error_info; + const cxx_exception_type *exception_type; + UINT32 unknown3; + void *unknown4; +}; + +struct platform_exception +{ + IInspectable IInspectable_iface; + const void *IPrintable_iface; + const void *IEquatable_iface; + IClosable IClosable_iface; + struct exception_inner inner; + /* Exceptions use the weakref control block for reference counting, even though they don't implement + * IWeakReferenceSource. */ + struct control_block *control_block; + /* This is lazily initialized, i.e, only when QueryInterface(IID_IMarshal) gets called. + * The default value is UINTPTR_MAX/-1 */ + IUnknown *marshal; +}; + +static void test_interface_layout_(int line, IUnknown *iface, const GUID *iid, const void *exp_ptr) +{ + IUnknown *out = NULL; + HRESULT hr; + + hr = IUnknown_QueryInterface(iface, iid, (void **)&out); + ok_(__FILE__, line)(hr == S_OK, "got hr %#lx\n", hr); + if (SUCCEEDED(hr)) + { + ok_(__FILE__, line)((ULONG_PTR)out == (ULONG_PTR)exp_ptr, "got out %p != %p\n", out, exp_ptr); + IUnknown_Release(out); + } +} +#define test_interface_layout(iface, iid, exp_ptr) test_interface_layout_(__LINE__, (IUnknown *)(iface), iid, exp_ptr) + +static void test_exceptions(void) +{ +#define EXCEPTION_RTTI_NAME(name) (sizeof(void *) == 8) ? \ + ".PE$AAV" #name "Exception(a)Platform@@" : ".P$AAV" #name "Exception(a)Platform@@" +#define WINRT_EXCEPTION(name, hr) \ + {hr, L"Platform." #name "Exception", ".?AV" #name "Exception(a)Platform@@", \ + "class Platform::" #name "Exception", EXCEPTION_RTTI_NAME(name)}, + const struct exception_test_case + { + HRESULT hr; + const WCHAR *exp_winrt_name; + const char *exp_rtti_mangled_name; + const char *exp_rtti_name; + /* The mangled RTTI name of the cxx_exception_type received by the exception handler/filter. */ + const char *exp_exception_rtti_mangled_name; + } test_cases[] = { + WINRT_EXCEPTIONS + /* Generic exceptions */ + {E_HANDLE, L"Platform.COMException", ".?AVCOMException(a)Platform@@", + "class Platform::COMException", EXCEPTION_RTTI_NAME(COM)}, + {0xdeadbeef, L"Platform.COMException", ".?AVCOMException(a)Platform@@", + "class Platform::COMException", EXCEPTION_RTTI_NAME(COM)}, + }; +#undef EXCEPTION_RTTI_NAME +#undef WINRT_EXCEPTION + +#ifdef __i386__ + const ULONG_PTR base = 0; +#else + const ULONG_PTR base = (ULONG_PTR)hmod; +#endif + const struct exception_test_case *cur_test; + HSTRING_HEADER hdr; + HSTRING msg; + HRESULT hr; + ULONG i; + + hr = WindowsCreateStringReference(L"foo", 3, &hdr, &msg); + ok(hr == S_OK, "got hr %#lx\n", hr); + + for (i = 0; i < ARRAY_SIZE(test_cases); i++) + { + const cxx_type_info_table *type_info_table; + const char *rtti_name, *rtti_raw_name; + const struct exception_inner *inner; + const rtti_type_info *rtti_info; + const cxx_exception_type *type; + struct platform_exception *obj; + const cxx_type_info *cxx_info; + IInspectable *inspectable; + const WCHAR *bufW; + INT32 j, ret = 0; + void *type_info; + WCHAR buf[256]; + IUnknown *out; + HSTRING str; + ULONG count; + HRESULT hr; + GUID *iids; + + winetest_push_context("test_cases[%lu]", i); + + cur_test = &test_cases[i]; + obj = pCreateException(cur_test->hr); + todo_wine ok(obj != NULL, "got obj %p\n", obj); + if (!obj) + { + winetest_pop_context(); + continue; + } + + inspectable = (IInspectable *)obj; + /* Verify that the IMarshal field is lazily-initialized. */ + ok((ULONG_PTR)obj->marshal == UINTPTR_MAX, "got marshal %p\n", obj->marshal); + todo_wine check_interface(inspectable, &IID_IMarshal); + ok(obj->marshal != NULL && (ULONG_PTR)obj->marshal != UINTPTR_MAX, "got marshal %p\n", obj->marshal); + + test_interface_layout(obj, &IID_IUnknown, &obj->IInspectable_iface); + test_interface_layout(obj, &IID_IInspectable, &obj->IInspectable_iface); + test_interface_layout(obj, &IID_IAgileObject, &obj->IInspectable_iface); + todo_wine test_interface_layout(obj, &IID_IPrintable, &obj->IPrintable_iface); + todo_wine test_interface_layout(obj, &IID_IEquatable, &obj->IEquatable_iface); + test_interface_layout(obj, &IID_IClosable, &obj->IClosable_iface); + + hr = IInspectable_GetRuntimeClassName(inspectable, &str); + ok(hr == S_OK, "got hr %#lx\n", hr); + bufW = WindowsGetStringRawBuffer(str, NULL); + ok(!wcscmp(cur_test->exp_winrt_name, bufW), "got str %s != %s\n", debugstr_hstring(str), + debugstr_w(cur_test->exp_winrt_name)); + WindowsDeleteString(str); + + /* Verify control block fields. */ + ok(!obj->control_block->is_inline, "got is_inline %d\n", obj->control_block->is_inline); + ok(obj->control_block->ref_strong == 1, "got ref_strong %lu\n", obj->control_block->ref_strong); + ok(obj->control_block->object == (IUnknown *)&obj->IInspectable_iface, "got object %p != %p\n", + obj->control_block->object, &obj->IInspectable_iface); + ok(obj->control_block->unknown == 0, "got unknown %d\n", obj->control_block->unknown); + ok(obj->control_block->is_exception, "got is_exception %d\n", obj->control_block->is_exception); + test_refcount(obj->control_block, 1); + count = IInspectable_AddRef(inspectable); + ok(count == 2, "got count %lu\n", count); + ok(obj->control_block->ref_strong == 2, "got ref_strong %lu\n", obj->control_block->ref_strong); + count = IInspectable_Release(inspectable); + ok(count == 1, "got count %lu\n", count); + ok(obj->control_block->ref_strong == 1, "got ref_strong %lu\n", obj->control_block->ref_strong); + + /* While Exceptions do *not* implement IWeakReferenceSource, the control block vtable still implements + * IWeakReference. */ + hr = IInspectable_QueryInterface(inspectable, &IID_IWeakReferenceSource, (void **)&out); + ok(hr == E_NOINTERFACE, "got hr %#lx\n", hr); + + hr = IWeakReference_Resolve(&obj->control_block->IWeakReference_iface, + &IID_IAgileObject, (IInspectable **)&out); + ok(hr == S_OK, "got hr %#lx\n", hr); + test_refcount(inspectable, 2); + count = IUnknown_Release(out); + ok(count == 1, "got count %lu\n", count); + test_refcount(inspectable, 1); + ok(obj->control_block->ref_strong == 1, "got ref_strong %lu\n", obj->control_block->ref_strong); + + count = 1; + iids = (void*)0xdeadbeef; + /* GetIids does not return any IIDs for Platform::Exception objects. */ + hr = IInspectable_GetIids(inspectable, &count, &iids); + ok(hr == S_OK, "got hr %#lx\n", hr); + ok(count == 0, "got count %lu\n", count); + ok(!iids, "iids = %p\n", iids); + + type_info = p__RTtypeid(obj); + ok(type_info != NULL, "got type_info %p\n", type_info); + rtti_name = (char *)call_func1(p_type_info_name, type_info); + ok(rtti_name && !strcmp(rtti_name, cur_test->exp_rtti_name), "got rtti_name %s != %s\n", + debugstr_a(rtti_name), debugstr_a(cur_test->exp_rtti_name)); + rtti_raw_name = (char *)call_func1(p_type_info_raw_name, type_info); + ok(rtti_raw_name && !strcmp(rtti_raw_name, cur_test->exp_rtti_mangled_name), "got rtti_raw_name %s != %s\n", + debugstr_a(rtti_raw_name), debugstr_a(cur_test->exp_rtti_mangled_name)); + + /* By default, the message returned is from FormatMessageW. */ + str = p_platform_exception_get_Message(obj); + ret = FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM, NULL, cur_test->hr, 0, buf, ARRAY_SIZE(buf), NULL); + ok(!!str == !!ret, "got str %s\n", debugstr_hstring(str)); + if(ret) + { + bufW = WindowsGetStringRawBuffer(str, NULL); + ok(!wcscmp(bufW, buf), "got str %s != %s\n", debugstr_hstring(str), debugstr_w(buf)); + } + WindowsDeleteString(str); + + inner = *(const struct exception_inner **)((ULONG_PTR)obj - sizeof(ULONG_PTR)); + ok(inner == &obj->inner, "got inner %p != %p\n", inner, &obj->inner); + ok(inner->message1 == NULL, "got message1 %p\n", inner->message1); + ok(inner->message2 == NULL, "got message2 %p\n", inner->message2); + ok(inner->unknown1 == NULL, "got unknown1 %p\n", inner->unknown1); + ok(inner->unknown2 == NULL, "got unknown2 %p\n", inner->unknown2); + ok(inner->hr == cur_test->hr, "got hr %#lx != %#lx\n", inner->hr, cur_test->hr); + ok(inner->error_info == NULL, "got error_info %p\n", inner->error_info); + ok(inner->exception_type != NULL, "got exception_type %p\n", inner->exception_type); + if (sizeof(void *) == 8) + ok(inner->unknown3 == 64, "got unknown3 %u\n", inner->unknown3); + else + ok(inner->unknown3 == 32, "got unknown3 %u \n", inner->unknown3); + + type = inner->exception_type; + ok(type->flags == TYPE_FLAG_IUNKNOWN, "got flags %#x\n", type->flags); + /* There is no destructor, presumbly because COMException objects already have COM semantics? */ + ok(type->destructor == 0, "got destructor %#x\n", type->destructor); + ok(type->custom_handler == 0, "got custom_handler %#x\n", type->custom_handler); + ok(type->type_info_table != 0, "got type_info_table %#x\n", type->type_info_table); + + type_info_table = (cxx_type_info_table *)(base + type->type_info_table); + ok(type_info_table->count != 0, "got count %u\n", type_info_table->count); + + for (j = 0; j < type_info_table->count; j++) + { + winetest_push_context("j=%u", j); + + cxx_info = (cxx_type_info *)(base + type_info_table->info[j]); + if (j == type_info_table->count - 1) + ok(cxx_info->flags == CLASS_IS_SIMPLE_TYPE, "got flags %u\n", cxx_info->flags); + else + ok(cxx_info->flags == (CLASS_IS_SIMPLE_TYPE | CLASS_IS_IUNKNOWN), "got flags %u\n", cxx_info->flags); + ok(cxx_info->size == sizeof(void *), "got size %u\n", cxx_info->size); + ok(cxx_info->copy_ctor == 0, "got copy_ctor %#x\n", cxx_info->copy_ctor); + ok(cxx_info->type_info != 0, "got type_info"); + + winetest_pop_context(); + } + + cxx_info = (cxx_type_info *)(base + type_info_table->info[0]); + rtti_info = (rtti_type_info *)(base + cxx_info->type_info); + ok(!strcmp(rtti_info->mangled, cur_test->exp_exception_rtti_mangled_name), "got mangled %s != %s\n", + debugstr_a(rtti_info->mangled), debugstr_a(cur_test->exp_exception_rtti_mangled_name)); + + count = IInspectable_Release(inspectable); + ok(count == 0, "got count %lu\n", count); + + /* Create an Exception object with a custom message. */ + inspectable = pCreateExceptionWithMessage(cur_test->hr, msg); + ok(inspectable != NULL, "got excp %p\n", inspectable); + str = p_platform_exception_get_Message(inspectable); + hr = WindowsCompareStringOrdinal(str, msg, &ret); + ok(hr == S_OK, "got hr %#lx\n", hr); + ok(!ret, "got str %s != %s\n", debugstr_hstring(str), debugstr_hstring(msg)); + WindowsDeleteString(str); + + inner = (const struct exception_inner *)*(ULONG_PTR *)((ULONG_PTR)inspectable - sizeof(ULONG_PTR)); + ok(inner->message1 == NULL, "got message1 %p\n", inner->message1); + ok(inner->message2 != NULL, "got message2 %p\n", inner->message2); + ok(inner->unknown1 == NULL, "got unknown3 %p\n", inner->unknown1); + ok(inner->unknown2 == NULL, "got unknown4 %p\n", inner->unknown2); + bufW = WindowsGetStringRawBuffer(msg, NULL); + ok(!wcscmp(inner->message2, bufW), "got message2 %s != %s\n", debugstr_w(inner->message2), debugstr_w(bufW)); + ret = SysStringLen(inner->message2); /* Verify that message2 is a BSTR. */ + ok(ret == wcslen(inner->message2), "got ret %u != %Iu\n", ret, wcslen(inner->message2)); + + count = IInspectable_Release(inspectable); + ok(count == 0, "got count %lu\n", count); + + winetest_pop_context(); + } +} + START_TEST(vccorlib) { if(!init()) @@ -1125,4 +1475,5 @@ START_TEST(vccorlib) test_AllocateWithWeakRef(); test___abi_make_type_id(); test_CreateValue(); + test_exceptions(); } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9300
From: Vibhav Pant <vibhavp(a)gmail.com> --- dlls/vccorlib140/tests/vccorlib.c | 150 ++++++++++++++++++++++++++++-- dlls/vccorlib140/vccorlib.c | 43 ++++++++- dlls/vccorlib140/vccorlib140.spec | 128 ++++++++++++------------- 3 files changed, 245 insertions(+), 76 deletions(-) diff --git a/dlls/vccorlib140/tests/vccorlib.c b/dlls/vccorlib140/tests/vccorlib.c index 15d6e34ea09..c25ae865d70 100644 --- a/dlls/vccorlib140/tests/vccorlib.c +++ b/dlls/vccorlib140/tests/vccorlib.c @@ -154,6 +154,15 @@ static HSTRING (__cdecl *p_platform_exception_get_Message)(void *); static void *(__cdecl *pAllocateException)(size_t); static void *(__cdecl *pAllocateExceptionWithWeakRef)(ptrdiff_t, size_t); static void (__cdecl *pFreeException)(void *); +static void *(__cdecl *p_platform_Exception_ctor)(void *, HRESULT); +static void *(__cdecl *p_platform_Exception_hstring_ctor)(void *, HRESULT, HSTRING); +static void *(__cdecl *p_platform_COMException_ctor)(void *, HRESULT); +static void *(__cdecl *p_platform_COMException_hstring_ctor)(void *, HRESULT, HSTRING); +#define WINRT_EXCEPTION(name, ...) \ + static void *(__cdecl *p_platform_##name##Exception_ctor)(void *); \ + static void *(__cdecl *p_platform_##name##Exception_hstring_ctor)(void *, HSTRING); +WINRT_EXCEPTIONS +#undef WINRT_EXCEPTION static void *(__cdecl *p__RTtypeid)(const void *); static const char *(__thiscall *p_type_info_name)(void *); @@ -208,6 +217,19 @@ static BOOL init(void) pAllocateExceptionWithWeakRef = (void *)GetProcAddress(hmod, "?AllocateException(a)Heap@Details(a)Platform@@SAPAXII(a)Z"); pFreeException = (void *)GetProcAddress(hmod, "?FreeException(a)Heap@Details(a)Platform@@SAXPAX(a)Z"); + p_platform_Exception_ctor = (void *)GetProcAddress(hmod, "??0Exception(a)Platform@@Q$AAA(a)H@Z"); + p_platform_Exception_hstring_ctor = (void *)GetProcAddress(hmod, "??0Exception(a)Platform@@Q$AAA(a)HP$AAVString(a)1@@Z"); + p_platform_COMException_ctor = (void *)GetProcAddress(hmod, "??0COMException(a)Platform@@Q$AAA(a)H@Z"); + p_platform_COMException_hstring_ctor = (void *)GetProcAddress(hmod, + "??0COMException(a)Platform@@Q$AAA(a)HP$AAVString(a)1@@Z"); +#define WINRT_EXCEPTION(name, ...) do { \ + p_platform_##name##Exception_ctor = (void *)GetProcAddress(hmod, \ + "??0" #name "Exception(a)Platform@@Q$AAA(a)XZ"); \ + p_platform_##name##Exception_hstring_ctor = (void *)GetProcAddress(hmod, \ + "??0" #name "Exception(a)Platform@@Q$AAA(a)P$AAVString(a)1@@Z"); \ + } while(0); + WINRT_EXCEPTIONS +#undef WINRT_EXCEPTION p_type_info_name = (void *)GetProcAddress(msvcrt, "?name(a)type_info@@QBAPBDXZ"); p_type_info_raw_name = (void *)GetProcAddress(msvcrt, "?raw_name(a)type_info@@QBAPBDXZ"); p_type_info_opequals_equals = (void *)GetProcAddress(msvcrt, "??8type_info@@QBAHABV0@@Z"); @@ -243,6 +265,20 @@ static BOOL init(void) pAllocateExceptionWithWeakRef = (void *)GetProcAddress(hmod, "?AllocateException(a)Heap@Details(a)Platform@@SAPEAX_K0(a)Z"); pFreeException = (void *)GetProcAddress(hmod, "?FreeException(a)Heap@Details(a)Platform@@SAXPEAX(a)Z"); + p_platform_Exception_ctor = (void *)GetProcAddress(hmod, "??0Exception(a)Platform@@QE$AAA(a)H@Z"); + p_platform_Exception_hstring_ctor = (void *)GetProcAddress(hmod, + "??0Exception(a)Platform@@QE$AAA(a)HPE$AAVString(a)1@@Z"); + p_platform_COMException_ctor = (void *)GetProcAddress(hmod, "??0COMException(a)Platform@@QE$AAA(a)H@Z"); + p_platform_COMException_hstring_ctor = (void *)GetProcAddress(hmod, + "??0COMException(a)Platform@@QE$AAA(a)HPE$AAVString(a)1@@Z"); +#define WINRT_EXCEPTION(name, ...) do { \ + p_platform_##name##Exception_ctor = (void *)GetProcAddress(hmod, \ + "??0" #name "Exception(a)Platform@@QE$AAA(a)XZ"); \ + p_platform_##name##Exception_hstring_ctor = (void *)GetProcAddress(hmod, \ + "??0" #name "Exception(a)Platform@@QE$AAA(a)PE$AAVString(a)1@@Z"); \ + } while(0); + WINRT_EXCEPTIONS +#undef WINRT_EXCEPTION p_type_info_name = (void *)GetProcAddress(msvcrt, "?name(a)type_info@@QEBAPEBDXZ"); p_type_info_raw_name = (void *)GetProcAddress(msvcrt, "?raw_name(a)type_info@@QEBAPEBDXZ"); p_type_info_opequals_equals = (void *)GetProcAddress(msvcrt, "??8type_info@@QEBAHAEBV0@@Z"); @@ -277,6 +313,20 @@ static BOOL init(void) pAllocateExceptionWithWeakRef = (void *)GetProcAddress(hmod, "?AllocateException(a)Heap@Details(a)Platform@@SAPAXII(a)Z"); pFreeException = (void *)GetProcAddress(hmod, "?FreeException(a)Heap@Details(a)Platform@@SAXPAX(a)Z"); + p_platform_Exception_ctor = (void *)GetProcAddress(hmod, "??0Exception(a)Platform@@Q$AAA(a)H@Z"); + p_platform_Exception_hstring_ctor = (void *)GetProcAddress(hmod, + "??0Exception(a)Platform@@Q$AAA(a)HP$AAVString(a)1@@Z"); + p_platform_COMException_ctor = (void *)GetProcAddress(hmod, "??0COMException(a)Platform@@Q$AAA(a)H@Z"); + p_platform_COMException_hstring_ctor = (void *)GetProcAddress(hmod, + "??0COMException(a)Platform@@Q$AAA(a)HP$AAVString(a)1@@Z"); +#define WINRT_EXCEPTION(name, ...) do { \ + p_platform_##name##Exception_ctor = (void *)GetProcAddress(hmod, \ + "??0" #name "Exception(a)Platform@@Q$AAA(a)XZ"); \ + p_platform_##name##Exception_hstring_ctor = (void *)GetProcAddress(hmod, \ + "??0" #name "Exception(a)Platform@@Q$AAA(a)P$AAVString(a)1@@Z"); \ + } while(0); + WINRT_EXCEPTIONS +#undef WINRT_EXCEPTION p_type_info_name = (void *)GetProcAddress(msvcrt, "?name(a)type_info@@QBEPBDXZ"); p_type_info_raw_name = (void *)GetProcAddress(msvcrt, "?raw_name(a)type_info@@QBEPBDXZ"); p_type_info_opequals_equals = (void *)GetProcAddress(msvcrt, "??8type_info@@QBEHABV0@@Z"); @@ -301,6 +351,16 @@ static BOOL init(void) ok(pAllocateException != NULL, "AllocateException not available\n"); ok(pAllocateExceptionWithWeakRef != NULL, "AllocateExceptionWithWeakRef not available.\n"); ok(pFreeException != NULL, "FreeException not available\n"); + ok(p_platform_Exception_ctor != NULL, "Platform::Exception not available.\n"); + ok(p_platform_Exception_hstring_ctor != NULL, "Platform::Exception(HRESULT, HSTRING) not available.\n"); + ok(p_platform_COMException_ctor != NULL, "Platform::COMException not available.\n"); + ok(p_platform_COMException_hstring_ctor != NULL, "Platform::COMException(HRESULT, HSTRING) not available.\n"); +#define WINRT_EXCEPTION(name, ...) do { \ + ok(p_platform_##name##Exception_ctor != NULL, "Platform::" #name "Exception not available.\n"); \ + ok(p_platform_##name##Exception_hstring_ctor != NULL, "Platform::" #name "Exception(HSTRING) not available.\n"); \ + } while(0); + WINRT_EXCEPTIONS +#undef WINRT_EXCEPTION ok(p_type_info_name != NULL, "type_info::name not available\n"); ok(p_type_info_raw_name != NULL, "type_info::raw_name not available\n"); @@ -1244,9 +1304,14 @@ static void test_exceptions(void) { #define EXCEPTION_RTTI_NAME(name) (sizeof(void *) == 8) ? \ ".PE$AAV" #name "Exception(a)Platform@@" : ".P$AAV" #name "Exception(a)Platform@@" -#define WINRT_EXCEPTION(name, hr) \ - {hr, L"Platform." #name "Exception", ".?AV" #name "Exception(a)Platform@@", \ - "class Platform::" #name "Exception", EXCEPTION_RTTI_NAME(name)}, +#define WINRT_EXCEPTION(name, hr) \ + {hr, \ + L"Platform." #name "Exception", \ + ".?AV" #name "Exception(a)Platform@@", \ + "class Platform::" #name "Exception", \ + EXCEPTION_RTTI_NAME(name), \ + p_platform_##name##Exception_ctor, \ + p_platform_##name##Exception_hstring_ctor}, const struct exception_test_case { HRESULT hr; @@ -1255,6 +1320,8 @@ static void test_exceptions(void) const char *exp_rtti_name; /* The mangled RTTI name of the cxx_exception_type received by the exception handler/filter. */ const char *exp_exception_rtti_mangled_name; + void *(__cdecl *ctor)(void *); /* The default constructor for this exception class */ + void *(__cdecl *hstring_ctor)(void *, HSTRING); } test_cases[] = { WINRT_EXCEPTIONS /* Generic exceptions */ @@ -1272,12 +1339,13 @@ static void test_exceptions(void) const ULONG_PTR base = (ULONG_PTR)hmod; #endif const struct exception_test_case *cur_test; + static const WCHAR *msg_bufW = L"foo"; HSTRING_HEADER hdr; HSTRING msg; HRESULT hr; ULONG i; - hr = WindowsCreateStringReference(L"foo", 3, &hdr, &msg); + hr = WindowsCreateStringReference(msg_bufW, wcslen(msg_bufW), &hdr, &msg); ok(hr == S_OK, "got hr %#lx\n", hr); for (i = 0; i < ARRAY_SIZE(test_cases); i++) @@ -1450,14 +1518,82 @@ static void test_exceptions(void) ok(inner->message2 != NULL, "got message2 %p\n", inner->message2); ok(inner->unknown1 == NULL, "got unknown3 %p\n", inner->unknown1); ok(inner->unknown2 == NULL, "got unknown4 %p\n", inner->unknown2); - bufW = WindowsGetStringRawBuffer(msg, NULL); - ok(!wcscmp(inner->message2, bufW), "got message2 %s != %s\n", debugstr_w(inner->message2), debugstr_w(bufW)); + ok(!wcscmp(inner->message2, msg_bufW), "got message2 %s != %s\n", debugstr_w(inner->message2), + debugstr_w(msg_bufW)); ret = SysStringLen(inner->message2); /* Verify that message2 is a BSTR. */ - ok(ret == wcslen(inner->message2), "got ret %u != %Iu\n", ret, wcslen(inner->message2)); + ok(ret == wcslen(msg_bufW), "got ret %u != %Iu\n", ret, wcslen(msg_bufW)); count = IInspectable_Release(inspectable); ok(count == 0, "got count %lu\n", count); + /* Test the constructors for this class. */ + if (cur_test->ctor) + { + obj = pAllocateExceptionWithWeakRef(offsetof(struct platform_exception, control_block), sizeof(*obj)); + inspectable = (IInspectable *)obj; + ok(obj != NULL, "got obj %p\n", obj); + /* Zero out all the fields that the constructor will initialize, including the back-pointer. */ + memset((char *)obj - sizeof(void *), 0, sizeof(void *) + offsetof(struct platform_exception, control_block)); + obj->marshal = NULL; + + cur_test->ctor(obj); + test_interface_layout(obj, &IID_IUnknown, &obj->IInspectable_iface); + test_interface_layout(obj, &IID_IInspectable, &obj->IInspectable_iface); + test_interface_layout(obj, &IID_IAgileObject, &obj->IInspectable_iface); + todo_wine test_interface_layout(obj, &IID_IPrintable, &obj->IPrintable_iface); + todo_wine test_interface_layout(obj, &IID_IEquatable, &obj->IEquatable_iface); + test_interface_layout(obj, &IID_IClosable, &obj->IClosable_iface); + ok((ULONG_PTR)obj->marshal == UINTPTR_MAX, "got marshal %p\n", obj->marshal); + + inner = *(const struct exception_inner **)((ULONG_PTR)obj - sizeof(ULONG_PTR)); + ok(inner == &obj->inner, "got inner %p != %p\n", inner, &obj->inner); + ok(inner->message1 == NULL, "got message1 %p\n", inner->message1); + ok(inner->message2 == NULL, "got message2 %p\n", inner->message2); + ok(inner->unknown1 == NULL, "got unknown1 %p\n", inner->unknown1); + ok(inner->unknown2 == NULL, "got unknown2 %p\n", inner->unknown2); + ok(obj->inner.exception_type == type, "got inner.exception_type %p != %p\n", obj->inner.exception_type, + type); + ok(obj->inner.hr == cur_test->hr, "got inner.hr %#lx != %#lx", obj->inner.hr, cur_test->hr); + + count = IInspectable_Release(inspectable); + ok(count == 0, "got count %lu\n", count); + } + if (cur_test->hstring_ctor) + { + obj = pAllocateExceptionWithWeakRef(offsetof(struct platform_exception, control_block), sizeof(*obj)); + inspectable = (IInspectable *)obj; + ok(obj != NULL, "got obj %p\n", obj); + /* Zero out all the fields that the constructor will initialize, including the back-pointer. */ + memset((char *)obj - sizeof(void *), 0, sizeof(void *) + offsetof(struct platform_exception, control_block)); + obj->marshal = NULL; + + cur_test->hstring_ctor(obj, msg); + test_interface_layout(obj, &IID_IUnknown, &obj->IInspectable_iface); + test_interface_layout(obj, &IID_IInspectable, &obj->IInspectable_iface); + test_interface_layout(obj, &IID_IAgileObject, &obj->IInspectable_iface); + todo_wine test_interface_layout(obj, &IID_IPrintable, &obj->IPrintable_iface); + todo_wine test_interface_layout(obj, &IID_IEquatable, &obj->IEquatable_iface); + test_interface_layout(obj, &IID_IClosable, &obj->IClosable_iface); + ok((ULONG_PTR)obj->marshal == UINTPTR_MAX, "got marshal %p\n", obj->marshal); + + inner = *(const struct exception_inner **)((ULONG_PTR)obj - sizeof(ULONG_PTR)); + ok(inner == &obj->inner, "got inner %p != %p\n", inner, &obj->inner); + ok(inner->message1 == NULL, "got message1 %p\n", inner->message1); + ok(inner->message2 != NULL, "got message2 %p\n", inner->message2); + ok(!wcscmp(inner->message2, msg_bufW), "got message2 %s != %s\n", debugstr_w(inner->message2), + debugstr_w(msg_bufW)); + ret = SysStringLen(inner->message2); /* Verify that message2 is a BSTR. */ + ok(ret == wcslen(msg_bufW), "got ret %u != %Iu\n", ret, wcslen(msg_bufW)); + ok(inner->unknown1 == NULL, "got unknown1 %p\n", inner->unknown1); + ok(inner->unknown2 == NULL, "got unknown2 %p\n", inner->unknown2); + ok(obj->inner.exception_type == type, "got inner.exception_type %p != %p\n", obj->inner.exception_type, + type); + ok(obj->inner.hr == cur_test->hr, "got inner.hr %#lx != %#lx", obj->inner.hr, cur_test->hr); + + count = IInspectable_Release(inspectable); + ok(count == 0, "got count %lu\n", count); + } + winetest_pop_context(); } } diff --git a/dlls/vccorlib140/vccorlib.c b/dlls/vccorlib140/vccorlib.c index 12ff8b6f8d6..86c290f4e37 100644 --- a/dlls/vccorlib140/vccorlib.c +++ b/dlls/vccorlib140/vccorlib.c @@ -609,16 +609,49 @@ void WINAPI __abi_WinRTraiseCOMException(HRESULT hr) WINRT_EXCEPTION(OutOfMemory, E_OUTOFMEMORY) \ WINRT_EXCEPTION(WrongThread, RPC_E_WRONG_THREAD) -#define WINRT_EXCEPTION(name, hr) \ - void WINAPI __abi_WinRTraise##name##Exception(void) \ - { \ - FIXME("(): stub!\n"); \ +#define WINRT_EXCEPTION(name, hr) \ + void WINAPI __abi_WinRTraise##name##Exception(void) \ + { \ + FIXME("(): stub!\n"); \ + } \ + void *__cdecl platform_##name##Exception_ctor(void *this) \ + { \ + FIXME("(%p): stub!\n", this); \ + return this; \ + } \ + void *__cdecl platform_##name##Exception_hstring_ctor(void *this, HSTRING msg) \ + { \ + FIXME("(%p, %s): stub!\n", this, debugstr_hstring(msg)); \ + return this; \ } WINRT_EXCEPTIONS - #undef WINRT_EXCEPTION +void *__cdecl platform_Exception_ctor(void *this, HRESULT hr) +{ + FIXME("(%p, %#lx): stub!\n", this, hr); + return this; +} + +void *__cdecl platform_Exception_hstring_ctor(void *this, HRESULT hr, HSTRING msg) +{ + FIXME("(%p, %#lx, %s): stub!\n", this, hr, debugstr_hstring(msg)); + return this; +} + +void *__cdecl platform_COMException_ctor(void *this, HRESULT hr) +{ + FIXME("(%p, %#lx): stub!\n", this, hr); + return this; +} + +void *__cdecl platform_COMException_hstring_ctor(void *this, HRESULT hr, HSTRING msg) +{ + FIXME("(%p, %#lx, %s): stub!\n", this, hr, debugstr_hstring(msg)); + return this; +} + HSTRING __cdecl platform_exception_get_Message(void *excp) { FIXME("(%p): stub!\n", excp); diff --git a/dlls/vccorlib140/vccorlib140.spec b/dlls/vccorlib140/vccorlib140.spec index 78f090754cc..b6c1f985c0c 100644 --- a/dlls/vccorlib140/vccorlib140.spec +++ b/dlls/vccorlib140/vccorlib140.spec @@ -1,7 +1,7 @@ @ stub -arch=win32 ?<Dispose>@Exception(a)Platform@@U$AAAXXZ @ stub -arch=win64 ?<Dispose>@Exception(a)Platform@@UE$AAAXXZ -@ stub -arch=win32 ??0ChangedStateException(a)Platform@@Q$AAA(a)P$AAVString(a)1@@Z -@ stub -arch=win64 ??0ChangedStateException(a)Platform@@QE$AAA(a)PE$AAVString(a)1@@Z +@ cdecl -arch=win32 ??0ChangedStateException(a)Platform@@Q$AAA(a)P$AAVString(a)1@@Z(ptr ptr) platform_ChangedStateException_hstring_ctor +@ cdecl -arch=win64 ??0ChangedStateException(a)Platform@@QE$AAA(a)PE$AAVString(a)1@@Z(ptr ptr) platform_ChangedStateException_hstring_ctor @ stub -arch=win32 ?Equals(a)Exception@Platform@@U$AAA_NP$AAVObject(a)2@@Z @ stub -arch=win64 ?Equals(a)Exception@Platform@@UE$AAA_NPE$AAVObject(a)2@@Z @ stub -arch=win32 ?Equals(a)MTAThreadAttribute@Platform@@Q$AAA_NP$AAVObject(a)2@@Z @@ -22,8 +22,8 @@ @ stub -arch=win64 ?Equals(a)float32@default@@QEAA_NPE$AAVObject(a)Platform@@@Z @ stub -arch=win32 ?Equals(a)float64@default@@QAA_NP$AAVObject(a)Platform@@@Z @ stub -arch=win64 ?Equals(a)float64@default@@QEAA_NPE$AAVObject(a)Platform@@@Z -@ stub -arch=win32 ??0ChangedStateException(a)Platform@@Q$AAA(a)XZ -@ stub -arch=win64 ??0ChangedStateException(a)Platform@@QE$AAA(a)XZ +@ cdecl -arch=win32 ??0ChangedStateException(a)Platform@@Q$AAA(a)XZ(ptr) platform_ChangedStateException_ctor +@ cdecl -arch=win64 ??0ChangedStateException(a)Platform@@QE$AAA(a)XZ(ptr) platform_ChangedStateException_ctor @ stub -arch=win32 ?Equals(a)int16@default@@QAA_NP$AAVObject(a)Platform@@@Z @ stub -arch=win64 ?Equals(a)int16@default@@QEAA_NPE$AAVObject(a)Platform@@@Z @ stub -arch=win32 ?Equals(a)int32@default@@QAA_NP$AAVObject(a)Platform@@@Z @@ -46,8 +46,8 @@ @ stub -arch=i386 ?EventSourceGetTargetArray(a)Details@Platform@@YGPAXPAXPAUEventLock(a)12@@Z @ stub -arch=arm ?EventSourceGetTargetArray(a)Details@Platform@@YAPAXPAXPAUEventLock(a)12@@Z @ stub -arch=win64 ?EventSourceGetTargetArray(a)Details@Platform@@YAPEAXPEAXPEAUEventLock(a)12@@Z -@ stub -arch=win32 ??0ClassNotRegisteredException(a)Platform@@Q$AAA(a)P$AAVString(a)1@@Z -@ stub -arch=win64 ??0ClassNotRegisteredException(a)Platform@@QE$AAA(a)PE$AAVString(a)1@@Z +@ cdecl -arch=win32 ??0ClassNotRegisteredException(a)Platform@@Q$AAA(a)P$AAVString(a)1@@Z(ptr ptr) platform_ClassNotRegisteredException_hstring_ctor +@ cdecl -arch=win64 ??0ClassNotRegisteredException(a)Platform@@QE$AAA(a)PE$AAVString(a)1@@Z(ptr ptr) platform_ClassNotRegisteredException_hstring_ctor @ stub -arch=i386 ?EventSourceGetTargetArrayEvent(a)Details@Platform@@YGPAXPAXIPBXPA_J(a)Z @ stub -arch=arm ?EventSourceGetTargetArrayEvent(a)Details@Platform@@YAPAXPAXIPBXPA_J(a)Z @ stub -arch=win64 ?EventSourceGetTargetArrayEvent(a)Details@Platform@@YAPEAXPEAXIPEBXPEA_J(a)Z @@ -76,8 +76,8 @@ @ stdcall -arch=i386 ?GetActivationFactoryByPCWSTR@@YGJPAXAAVGuid(a)Platform@@PAPAX(a)Z(wstr ptr ptr) GetActivationFactoryByPCWSTR @ stdcall -arch=arm ?GetActivationFactoryByPCWSTR@@YAJPAXAAVGuid(a)Platform@@PAPAX(a)Z(wstr ptr ptr) GetActivationFactoryByPCWSTR @ stdcall -arch=win64 ?GetActivationFactoryByPCWSTR@@YAJPEAXAEAVGuid(a)Platform@@PEAPEAX(a)Z(wstr ptr ptr) GetActivationFactoryByPCWSTR -@ stub -arch=win32 ??0ClassNotRegisteredException(a)Platform@@Q$AAA(a)XZ -@ stub -arch=win64 ??0ClassNotRegisteredException(a)Platform@@QE$AAA(a)XZ +@ cdecl -arch=win32 ??0ClassNotRegisteredException(a)Platform@@Q$AAA(a)XZ(ptr) platform_ClassNotRegisteredException_ctor +@ cdecl -arch=win64 ??0ClassNotRegisteredException(a)Platform@@QE$AAA(a)XZ(ptr) platform_ClassNotRegisteredException_ctor @ stub -arch=win32 ?GetCmdArguments(a)Details@Platform@@YAPAPA_WPAH(a)Z @ stub -arch=win64 ?GetCmdArguments(a)Details@Platform@@YAPEAPEA_WPEAH(a)Z @ stub -arch=win32 ?GetHashCode(a)Attribute@Metadata(a)Platform@@Q$AAAHXZ @@ -120,8 +120,8 @@ @ stub -arch=win64 ?GetHashCode(a)int64@default@@QEAAHXZ @ stub -arch=win32 ?GetHashCode(a)int8@default@@QAAHXZ @ stub -arch=win64 ?GetHashCode(a)int8@default@@QEAAHXZ -@ stub -arch=win32 ??0DisconnectedException(a)Platform@@Q$AAA(a)P$AAVString(a)1@@Z -@ stub -arch=win64 ??0DisconnectedException(a)Platform@@QE$AAA(a)PE$AAVString(a)1@@Z +@ cdecl -arch=win32 ??0DisconnectedException(a)Platform@@Q$AAA(a)P$AAVString(a)1@@Z(ptr ptr) platform_DisconnectedException_hstring_ctor +@ cdecl -arch=win64 ??0DisconnectedException(a)Platform@@QE$AAA(a)PE$AAVString(a)1@@Z(ptr ptr) platform_DisconnectedException_hstring_ctor @ stub -arch=win32 ?GetHashCode(a)uint16@default@@QAAHXZ @ stub -arch=win64 ?GetHashCode(a)uint16@default@@QEAAHXZ @ stub -arch=win32 ?GetHashCode(a)uint32@default@@QAAHXZ @@ -147,8 +147,8 @@ @ stub -arch=win64 ?GetProxyImpl(a)Details@Platform@@YAJPEAUIUnknown@@AEBU_GUID@@0PEAPEAU3@@Z @ stub -arch=win32 ?GetType(a)Boolean@Platform@@QAAP$AAVType(a)2@XZ @ stub -arch=win64 ?GetType(a)Boolean@Platform@@QEAAPE$AAVType(a)2@XZ -@ stub -arch=win32 ??0DisconnectedException(a)Platform@@Q$AAA(a)XZ -@ stub -arch=win64 ??0DisconnectedException(a)Platform@@QE$AAA(a)XZ +@ cdecl -arch=win32 ??0DisconnectedException(a)Platform@@Q$AAA(a)XZ(ptr) platform_DisconnectedException_ctor +@ cdecl -arch=win64 ??0DisconnectedException(a)Platform@@QE$AAA(a)XZ(ptr) platform_DisconnectedException_ctor @ stub -arch=win32 ?GetType(a)Guid@Platform@@QAAP$AAVType(a)2@XZ @ stub -arch=win64 ?GetType(a)Guid@Platform@@QEAAPE$AAVType(a)2@XZ @ stub -arch=win32 ?GetType(a)Object@Platform@@Q$AAAP$AAVType(a)2@XZ @@ -192,8 +192,8 @@ @ stub -arch=win64 ?IntersectsWith(a)Rect@Foundation(a)Windows@@QEAA_NV123@@Z @ stub -arch=win32 ?Invert(a)Matrix3D@Media3D(a)Media@Xaml(a)UI@Windows@@QAAXXZ @ stub -arch=win64 ?Invert(a)Matrix3D@Media3D(a)Media@Xaml(a)UI@Windows@@QEAAXXZ -@ stub -arch=win32 ??0Exception(a)Platform@@Q$AAA(a)H@Z -@ stub -arch=win64 ??0Exception(a)Platform@@QE$AAA(a)H@Z +@ cdecl -arch=win32 ??0Exception(a)Platform@@Q$AAA(a)H@Z(ptr long) platform_Exception_ctor +@ cdecl -arch=win64 ??0Exception(a)Platform@@QE$AAA(a)H@Z(ptr long) platform_Exception_ctor @ stub -arch=win32 ?ReCreateException(a)Exception@Platform@@SAP$AAV12(a)H@Z @ stub -arch=win64 ?ReCreateException(a)Exception@Platform@@SAPE$AAV12(a)H@Z @ stub -arch=win32 ?ReferenceEquals(a)Object@Platform@@SA_NP$AAV12(a)0@Z @@ -221,8 +221,8 @@ @ stub -arch=i386 ?TerminateModule(a)Details@Platform@@YG_NPAVModuleBase(a)1WRL@Microsoft@@@Z @ stub -arch=arm ?TerminateModule(a)Details@Platform@@YA_NPAVModuleBase(a)1WRL@Microsoft@@@Z @ stub -arch=win64 ?TerminateModule(a)Details@Platform@@YA_NPEAVModuleBase(a)1WRL@Microsoft@@@Z -@ stub -arch=win32 ??0Exception(a)Platform@@Q$AAA(a)HP$AAVString(a)1@@Z -@ stub -arch=win64 ??0Exception(a)Platform@@QE$AAA(a)HPE$AAVString(a)1@@Z +@ cdecl -arch=win32 ??0Exception(a)Platform@@Q$AAA(a)HP$AAVString(a)1@@Z(ptr long ptr) platform_Exception_hstring_ctor +@ cdecl -arch=win64 ??0Exception(a)Platform@@QE$AAA(a)HPE$AAVString(a)1@@Z(ptr long ptr) platform_Exception_hstring_ctor @ stub -arch=win32 ?ToInt32(a)IntPtr@Platform@@QAAHXZ @ stub -arch=win64 ?ToInt32(a)IntPtr@Platform@@QEAAHXZ @ stub -arch=win32 ?ToString(a)Attribute@Metadata(a)Platform@@Q$AAAP$AAVString(a)3@XZ @@ -245,8 +245,8 @@ @ stub -arch=win64 ?ToString(a)STAThreadAttribute@Platform@@QE$AAAPE$AAVString(a)2@XZ @ stub -arch=win32 ?<Dispose>@String(a)Platform@@U$AAAXXZ @ stub -arch=win64 ?<Dispose>@String(a)Platform@@UE$AAAXXZ -@ stub -arch=win32 ??0FailureException(a)Platform@@Q$AAA(a)P$AAVString(a)1@@Z -@ stub -arch=win64 ??0FailureException(a)Platform@@QE$AAA(a)PE$AAVString(a)1@@Z +@ cdecl -arch=win32 ??0FailureException(a)Platform@@Q$AAA(a)P$AAVString(a)1@@Z(ptr ptr) platform_FailureException_hstring_ctor +@ cdecl -arch=win64 ??0FailureException(a)Platform@@QE$AAA(a)PE$AAVString(a)1@@Z(ptr ptr) platform_FailureException_hstring_ctor @ cdecl -arch=win32 ?ToString(a)Type@Platform@@U$AAAP$AAVString(a)2@XZ(ptr) platform_type_ToString @ cdecl -arch=win64 ?ToString(a)Type@Platform@@UE$AAAPE$AAVString(a)2@XZ(ptr) platform_type_ToString @ stub -arch=win32 ?ToString(a)ValueType@Platform@@Q$AAAP$AAVString(a)2@XZ @@ -267,8 +267,8 @@ @ stub -arch=win64 ?ToString(a)int8@default@@QEAAPE$AAVString(a)Platform@@XZ @ stub -arch=win32 ?ToString(a)uint16@default@@QAAP$AAVString(a)Platform@@XZ @ stub -arch=win64 ?ToString(a)uint16@default@@QEAAPE$AAVString(a)Platform@@XZ -@ stub -arch=win32 ??0FailureException(a)Platform@@Q$AAA(a)XZ -@ stub -arch=win64 ??0FailureException(a)Platform@@QE$AAA(a)XZ +@ cdecl -arch=win32 ??0FailureException(a)Platform@@Q$AAA(a)XZ(ptr) platform_FailureException_ctor +@ cdecl -arch=win64 ??0FailureException(a)Platform@@QE$AAA(a)XZ(ptr) platform_FailureException_ctor @ stub -arch=win32 ?ToString(a)uint32@default@@QAAP$AAVString(a)Platform@@XZ @ stub -arch=win64 ?ToString(a)uint32@default@@QEAAPE$AAVString(a)Platform@@XZ @ stub -arch=win32 ?ToString(a)uint64@default@@QAAP$AAVString(a)Platform@@XZ @@ -355,8 +355,8 @@ @ cdecl -arch=win64 ?get(a)FullName@Type(a)Platform@@QE$AAAPE$AAVString(a)3@XZ(ptr) platform_type_get_FullName @ stub -arch=win32 ?get(a)HasInverse@Matrix3D(a)Media3D@Media(a)Xaml@UI(a)Windows@@QAA_NXZ @ stub -arch=win64 ?get(a)HasInverse@Matrix3D(a)Media3D@Media(a)Xaml@UI(a)Windows@@QEAA_NXZ -@ stub -arch=win32 ??0InvalidArgumentException(a)Platform@@Q$AAA(a)P$AAVString(a)1@@Z -@ stub -arch=win64 ??0InvalidArgumentException(a)Platform@@QE$AAA(a)PE$AAVString(a)1@@Z +@ cdecl -arch=win32 ??0InvalidArgumentException(a)Platform@@Q$AAA(a)P$AAVString(a)1@@Z(ptr ptr) platform_InvalidArgumentException_hstring_ctor +@ cdecl -arch=win64 ??0InvalidArgumentException(a)Platform@@QE$AAA(a)PE$AAVString(a)1@@Z(ptr ptr) platform_InvalidArgumentException_hstring_ctor @ cdecl -arch=win32 ?get(a)Message@Exception(a)Platform@@Q$AAAP$AAVString(a)3@XZ(ptr) platform_exception_get_Message @ cdecl -arch=win64 ?get(a)Message@Exception(a)Platform@@QE$AAAPE$AAVString(a)3@XZ(ptr) platform_exception_get_Message @ stub ?get(a)ObjectCount@Heap(a)Details@Platform@@SAHXZ @@ -366,46 +366,46 @@ @ stub ?set(a)BreakOnAllocationId@Heap(a)Details@Platform@@SAXH(a)Z @ stub ?set(a)BreakOnFreeId@Heap(a)Details@Platform@@SAXH(a)Z @ stub ?set(a)TrackingLevel@Heap(a)Details@Platform@@SAXW4HeapAllocationTrackingLevel(a)34@@Z -@ stub -arch=win32 ??0InvalidArgumentException(a)Platform@@Q$AAA(a)XZ -@ stub -arch=win64 ??0InvalidArgumentException(a)Platform@@QE$AAA(a)XZ -@ stub -arch=win32 ??0InvalidCastException(a)Platform@@Q$AAA(a)P$AAVString(a)1@@Z -@ stub -arch=win64 ??0InvalidCastException(a)Platform@@QE$AAA(a)PE$AAVString(a)1@@Z -@ stub -arch=win32 ??0InvalidCastException(a)Platform@@Q$AAA(a)XZ -@ stub -arch=win64 ??0InvalidCastException(a)Platform@@QE$AAA(a)XZ +@ cdecl -arch=win32 ??0InvalidArgumentException(a)Platform@@Q$AAA(a)XZ(ptr) platform_InvalidArgumentException_ctor +@ cdecl -arch=win64 ??0InvalidArgumentException(a)Platform@@QE$AAA(a)XZ(ptr) platform_InvalidArgumentException_ctor +@ cdecl -arch=win32 ??0InvalidCastException(a)Platform@@Q$AAA(a)P$AAVString(a)1@@Z(ptr ptr) platform_InvalidCastException_hstring_ctor +@ cdecl -arch=win64 ??0InvalidCastException(a)Platform@@QE$AAA(a)PE$AAVString(a)1@@Z(ptr ptr) platform_InvalidCastException_hstring_ctor +@ cdecl -arch=win32 ??0InvalidCastException(a)Platform@@Q$AAA(a)XZ(ptr) platform_InvalidCastException_ctor +@ cdecl -arch=win64 ??0InvalidCastException(a)Platform@@QE$AAA(a)XZ(ptr) platform_InvalidCastException_ctor @ stub -arch=win32 ??0MTAThreadAttribute(a)Platform@@Q$AAA(a)XZ @ stub -arch=win64 ??0MTAThreadAttribute(a)Platform@@QE$AAA(a)XZ @ stub -arch=win32 ?<Dispose>@Type(a)Platform@@U$AAAXXZ @ stub -arch=win64 ?<Dispose>@Type(a)Platform@@UE$AAAXXZ -@ stub -arch=win32 ??0NotImplementedException(a)Platform@@Q$AAA(a)P$AAVString(a)1@@Z -@ stub -arch=win64 ??0NotImplementedException(a)Platform@@QE$AAA(a)PE$AAVString(a)1@@Z -@ stub -arch=win32 ??0NotImplementedException(a)Platform@@Q$AAA(a)XZ -@ stub -arch=win64 ??0NotImplementedException(a)Platform@@QE$AAA(a)XZ -@ stub -arch=win32 ??0NullReferenceException(a)Platform@@Q$AAA(a)P$AAVString(a)1@@Z -@ stub -arch=win64 ??0NullReferenceException(a)Platform@@QE$AAA(a)PE$AAVString(a)1@@Z -@ stub -arch=win32 ??0NullReferenceException(a)Platform@@Q$AAA(a)XZ -@ stub -arch=win64 ??0NullReferenceException(a)Platform@@QE$AAA(a)XZ +@ cdecl -arch=win32 ??0NotImplementedException(a)Platform@@Q$AAA(a)P$AAVString(a)1@@Z(ptr ptr) platform_NotImplementedException_hstring_ctor +@ cdecl -arch=win64 ??0NotImplementedException(a)Platform@@QE$AAA(a)PE$AAVString(a)1@@Z(ptr ptr) platform_NotImplementedException_hstring_ctor +@ cdecl -arch=win32 ??0NotImplementedException(a)Platform@@Q$AAA(a)XZ(ptr) platform_NotImplementedException_ctor +@ cdecl -arch=win64 ??0NotImplementedException(a)Platform@@QE$AAA(a)XZ(ptr) platform_NotImplementedException_ctor +@ cdecl -arch=win32 ??0NullReferenceException(a)Platform@@Q$AAA(a)P$AAVString(a)1@@Z(ptr ptr) platform_NullReferenceException_hstring_ctor +@ cdecl -arch=win64 ??0NullReferenceException(a)Platform@@QE$AAA(a)PE$AAVString(a)1@@Z(ptr ptr) platform_NullReferenceException_hstring_ctor +@ cdecl -arch=win32 ??0NullReferenceException(a)Platform@@Q$AAA(a)XZ(ptr) platform_NullReferenceException_ctor +@ cdecl -arch=win64 ??0NullReferenceException(a)Platform@@QE$AAA(a)XZ(ptr) platform_NullReferenceException_ctor @ stub -arch=win32 ??0Object(a)Platform@@Q$AAA(a)XZ @ stub -arch=win64 ??0Object(a)Platform@@QE$AAA(a)XZ -@ stub -arch=win32 ??0ObjectDisposedException(a)Platform@@Q$AAA(a)P$AAVString(a)1@@Z -@ stub -arch=win64 ??0ObjectDisposedException(a)Platform@@QE$AAA(a)PE$AAVString(a)1@@Z -@ stub -arch=win32 ??0ObjectDisposedException(a)Platform@@Q$AAA(a)XZ -@ stub -arch=win64 ??0ObjectDisposedException(a)Platform@@QE$AAA(a)XZ +@ cdecl -arch=win32 ??0ObjectDisposedException(a)Platform@@Q$AAA(a)P$AAVString(a)1@@Z(ptr ptr) platform_ObjectDisposedException_hstring_ctor +@ cdecl -arch=win64 ??0ObjectDisposedException(a)Platform@@QE$AAA(a)PE$AAVString(a)1@@Z(ptr ptr) platform_ObjectDisposedException_hstring_ctor +@ cdecl -arch=win32 ??0ObjectDisposedException(a)Platform@@Q$AAA(a)XZ(ptr) platform_ObjectDisposedException_ctor +@ cdecl -arch=win64 ??0ObjectDisposedException(a)Platform@@QE$AAA(a)XZ(ptr) platform_ObjectDisposedException_ctor @ stub -arch=win32 ??0OnePhaseConstructedAttribute(a)CompilerServices@Runtime(a)Platform@@Q$AAA(a)XZ @ stub -arch=win64 ??0OnePhaseConstructedAttribute(a)CompilerServices@Runtime(a)Platform@@QE$AAA(a)XZ -@ stub -arch=win32 ??0OperationCanceledException(a)Platform@@Q$AAA(a)P$AAVString(a)1@@Z -@ stub -arch=win64 ??0OperationCanceledException(a)Platform@@QE$AAA(a)PE$AAVString(a)1@@Z -@ stub -arch=win32 ??0OperationCanceledException(a)Platform@@Q$AAA(a)XZ -@ stub -arch=win64 ??0OperationCanceledException(a)Platform@@QE$AAA(a)XZ -@ stub -arch=win32 ??0AccessDeniedException(a)Platform@@Q$AAA(a)P$AAVString(a)1@@Z -@ stub -arch=win64 ??0AccessDeniedException(a)Platform@@QE$AAA(a)PE$AAVString(a)1@@Z -@ stub -arch=win32 ??0OutOfBoundsException(a)Platform@@Q$AAA(a)P$AAVString(a)1@@Z -@ stub -arch=win64 ??0OutOfBoundsException(a)Platform@@QE$AAA(a)PE$AAVString(a)1@@Z -@ stub -arch=win32 ??0OutOfBoundsException(a)Platform@@Q$AAA(a)XZ -@ stub -arch=win64 ??0OutOfBoundsException(a)Platform@@QE$AAA(a)XZ -@ stub -arch=win32 ??0OutOfMemoryException(a)Platform@@Q$AAA(a)P$AAVString(a)1@@Z -@ stub -arch=win64 ??0OutOfMemoryException(a)Platform@@QE$AAA(a)PE$AAVString(a)1@@Z -@ stub -arch=win32 ??0OutOfMemoryException(a)Platform@@Q$AAA(a)XZ -@ stub -arch=win64 ??0OutOfMemoryException(a)Platform@@QE$AAA(a)XZ +@ cdecl -arch=win32 ??0OperationCanceledException(a)Platform@@Q$AAA(a)P$AAVString(a)1@@Z(ptr ptr) platform_OperationCanceledException_hstring_ctor +@ cdecl -arch=win64 ??0OperationCanceledException(a)Platform@@QE$AAA(a)PE$AAVString(a)1@@Z(ptr ptr) platform_OperationCanceledException_hstring_ctor +@ cdecl -arch=win32 ??0OperationCanceledException(a)Platform@@Q$AAA(a)XZ(ptr) platform_OperationCanceledException_ctor +@ cdecl -arch=win64 ??0OperationCanceledException(a)Platform@@QE$AAA(a)XZ(ptr) platform_OperationCanceledException_ctor +@ cdecl -arch=win32 ??0AccessDeniedException(a)Platform@@Q$AAA(a)P$AAVString(a)1@@Z(ptr ptr) platform_AccessDeniedException_hstring_ctor +@ cdecl -arch=win64 ??0AccessDeniedException(a)Platform@@QE$AAA(a)PE$AAVString(a)1@@Z(ptr ptr) platform_AccessDeniedException_hstring_ctor +@ cdecl -arch=win32 ??0OutOfBoundsException(a)Platform@@Q$AAA(a)P$AAVString(a)1@@Z(ptr ptr) platform_OutOfBoundsException_hstring_ctor +@ cdecl -arch=win64 ??0OutOfBoundsException(a)Platform@@QE$AAA(a)PE$AAVString(a)1@@Z(ptr ptr) platform_OutOfBoundsException_hstring_ctor +@ cdecl -arch=win32 ??0OutOfBoundsException(a)Platform@@Q$AAA(a)XZ(ptr) platform_OutOfBoundsException_ctor +@ cdecl -arch=win64 ??0OutOfBoundsException(a)Platform@@QE$AAA(a)XZ(ptr) platform_OutOfBoundsException_ctor +@ cdecl -arch=win32 ??0OutOfMemoryException(a)Platform@@Q$AAA(a)P$AAVString(a)1@@Z(ptr ptr) platform_OutOfMemoryException_hstring_ctor +@ cdecl -arch=win64 ??0OutOfMemoryException(a)Platform@@QE$AAA(a)PE$AAVString(a)1@@Z(ptr ptr) platform_OutOfMemoryException_hstring_ctor +@ cdecl -arch=win32 ??0OutOfMemoryException(a)Platform@@Q$AAA(a)XZ(ptr) platform_OutOfMemoryException_ctor +@ cdecl -arch=win64 ??0OutOfMemoryException(a)Platform@@QE$AAA(a)XZ(ptr) platform_OutOfMemoryException_ctor @ stub -arch=win32 ??0Rect(a)Foundation@Windows@@QAA(a)VPoint@12(a)0@Z @ stub -arch=win64 ??0Rect(a)Foundation@Windows@@QEAA(a)VPoint@12(a)0@Z @ stub -arch=win32 ??0Rect(a)Foundation@Windows@@QAA(a)VPoint@12(a)VSize@12@@Z @@ -418,8 +418,8 @@ @ stub -arch=win64 ??0SizeT(a)Platform@@QEAA(a)H@Z @ stub -arch=win32 ??0SizeT(a)Platform@@QAA(a)PAX@Z @ stub -arch=win64 ??0SizeT(a)Platform@@QEAA(a)PEAX@Z -@ stub -arch=win32 ??0AccessDeniedException(a)Platform@@Q$AAA(a)XZ -@ stub -arch=win64 ??0AccessDeniedException(a)Platform@@QE$AAA(a)XZ +@ cdecl -arch=win32 ??0AccessDeniedException(a)Platform@@Q$AAA(a)XZ(ptr) platform_AccessDeniedException_ctor +@ cdecl -arch=win64 ??0AccessDeniedException(a)Platform@@QE$AAA(a)XZ(ptr) platform_AccessDeniedException_ctor @ stub -arch=win32 ??0Type(a)Platform@@Q$AAA(a)P$AAVObject(a)1@@Z @ stub -arch=win64 ??0Type(a)Platform@@QE$AAA(a)PE$AAVObject(a)1@@Z @ stub -arch=win32 ??0Type(a)Platform@@Q$AAA(a)VIntPtr@1@@Z @@ -428,10 +428,10 @@ @ stub -arch=win64 ??0Type(a)Platform@@QE$AAA(a)VTypeName@Interop(a)Xaml@UI(a)Windows@@@Z @ stub -arch=win32 ??0ValueType(a)Platform@@Q$AAA(a)XZ @ stub -arch=win64 ??0ValueType(a)Platform@@QE$AAA(a)XZ -@ stub -arch=win32 ??0WrongThreadException(a)Platform@@Q$AAA(a)P$AAVString(a)1@@Z -@ stub -arch=win64 ??0WrongThreadException(a)Platform@@QE$AAA(a)PE$AAVString(a)1@@Z -@ stub -arch=win32 ??0WrongThreadException(a)Platform@@Q$AAA(a)XZ -@ stub -arch=win64 ??0WrongThreadException(a)Platform@@QE$AAA(a)XZ +@ cdecl -arch=win32 ??0WrongThreadException(a)Platform@@Q$AAA(a)P$AAVString(a)1@@Z(ptr ptr) platform_WrongThreadException_hstring_ctor +@ cdecl -arch=win64 ??0WrongThreadException(a)Platform@@QE$AAA(a)PE$AAVString(a)1@@Z(ptr ptr) platform_WrongThreadException_hstring_ctor +@ cdecl -arch=win32 ??0WrongThreadException(a)Platform@@Q$AAA(a)XZ(ptr) platform_WrongThreadException_ctor +@ cdecl -arch=win64 ??0WrongThreadException(a)Platform@@QE$AAA(a)XZ(ptr) platform_WrongThreadException_ctor @ stub -arch=win32 ??0char16(a)default@@QAA(a)_W@Z @ stub -arch=win64 ??0char16(a)default@@QEAA(a)_W@Z @ stub -arch=win32 ??0float32(a)default@@QAA(a)M@Z @@ -476,8 +476,8 @@ @ stub ??PDuration(a)Xaml@UI(a)Windows@@SA_NV0123(a)0@Z @ stub -arch=win32 ?AlignedAllocate(a)Heap@Details(a)Platform@@SAPAXII(a)Z @ stub -arch=win64 ?AlignedAllocate(a)Heap@Details(a)Platform@@SAPEAX_K00(a)Z -@ stub -arch=win32 ??0COMException(a)Platform@@Q$AAA(a)H@Z -@ stub -arch=win64 ??0COMException(a)Platform@@QE$AAA(a)H@Z +@ cdecl -arch=win32 ??0COMException(a)Platform@@Q$AAA(a)H@Z(ptr long) platform_COMException_ctor +@ cdecl -arch=win64 ??0COMException(a)Platform@@QE$AAA(a)H@Z(ptr long) platform_COMException_ctor @ stub -arch=win32 ?AlignedAllocate(a)Heap@Details(a)Platform@@SAPAXIII(a)Z @ stub -arch=win64 ?AlignedAllocate(a)Heap@Details(a)Platform@@SAPEAX_K0(a)Z @ stub -arch=win32 ?AlignedAllocateException(a)Heap@Details(a)Platform@@SAPAXII(a)Z @@ -497,8 +497,8 @@ @ cdecl -arch=win32 ?AllocateException(a)Heap@Details(a)Platform@@SAPAXII(a)Z(long long) AllocateExceptionWithWeakRef @ cdecl -arch=win64 ?AllocateException(a)Heap@Details(a)Platform@@SAPEAX_K(a)Z(long) AllocateException @ stub ?Compare(a)Duration@Xaml(a)UI@Windows@@SAHV1234(a)0@Z -@ stub -arch=win32 ??0COMException(a)Platform@@Q$AAA(a)HP$AAVString(a)1@@Z -@ stub -arch=win64 ??0COMException(a)Platform@@QE$AAA(a)HPE$AAVString(a)1@@Z +@ cdecl -arch=win32 ??0COMException(a)Platform@@Q$AAA(a)HP$AAVString(a)1@@Z(ptr long ptr) platform_COMException_hstring_ctor +@ cdecl -arch=win64 ??0COMException(a)Platform@@QE$AAA(a)HPE$AAVString(a)1@@Z(ptr long ptr) platform_COMException_hstring_ctor @ stub -arch=win32 ?Contains(a)Rect@Foundation(a)Windows@@QAA_NVPoint(a)23@@Z @ stub -arch=win64 ?Contains(a)Rect@Foundation(a)Windows@@QEAA_NVPoint(a)23@@Z @ cdecl -arch=win32 ?CreateException(a)Exception@Platform@@SAP$AAV12(a)H@Z(long) CreateException -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9300
From: Vibhav Pant <vibhavp(a)gmail.com> --- dlls/vccorlib140/tests/vccorlib.c | 6 ++-- dlls/vccorlib140/vccorlib.c | 47 +++++++++++++++++++++++++++---- 2 files changed, 43 insertions(+), 10 deletions(-) diff --git a/dlls/vccorlib140/tests/vccorlib.c b/dlls/vccorlib140/tests/vccorlib.c index c25ae865d70..95ce908d49d 100644 --- a/dlls/vccorlib140/tests/vccorlib.c +++ b/dlls/vccorlib140/tests/vccorlib.c @@ -579,8 +579,7 @@ static void test_Allocate(void) /* AllocateException allocates additional space for two pointer-width fields, with the second field used as the * back-pointer to the exception data. */ addr = pAllocateException(0); - todo_wine ok(!!addr, "got addr %p\n", addr); - if (!addr) return; + ok(!!addr, "got addr %p\n", addr); ptr = (void **)((ULONG_PTR)addr - sizeof(void *)); *ptr = NULL; /* The write should succeed. */ base = (void **)((ULONG_PTR)addr - 2 * sizeof(void *)); @@ -844,8 +843,7 @@ static void test_AllocateWithWeakRef(void) /* AllocateExceptionWithWeakRef will not store the control block inline, regardless of the size. */ object = pAllocateExceptionWithWeakRef(offsetof(struct unknown_impl, weakref), sizeof(struct unknown_impl)); - todo_wine ok(object != NULL, "got object %p\n", object); - if (!object) return; + ok(object != NULL, "got object %p\n", object); object->strong_ref_free_val = -100; ok(object->weakref != NULL, "got weakref %p\n", object->weakref); diff --git a/dlls/vccorlib140/vccorlib.c b/dlls/vccorlib140/vccorlib.c index 86c290f4e37..b17f2aff493 100644 --- a/dlls/vccorlib140/vccorlib.c +++ b/dlls/vccorlib140/vccorlib.c @@ -101,10 +101,21 @@ void *__cdecl Allocate(size_t size) return addr; } +struct exception_alloc +{ + void *unknown; + void *exception_inner; + char data[0]; +}; + void *__cdecl AllocateException(size_t size) { - FIXME("(%Iu): stub!\n", size); - return NULL; + struct exception_alloc *base; + + TRACE("(%Iu)\n", size); + + base = Allocate(offsetof(struct exception_alloc, data[size])); + return &base->data; } void __cdecl Free(void *addr) @@ -116,7 +127,11 @@ void __cdecl Free(void *addr) void __cdecl FreeException(void *addr) { - FIXME("(%p): stub!\n", addr); + struct exception_alloc *base = CONTAINING_RECORD(addr, struct exception_alloc, data); + + TRACE("(%p)\n", addr); + + Free(base); } struct control_block @@ -236,8 +251,23 @@ void *__cdecl AllocateWithWeakRef(ptrdiff_t offset, size_t size) void *__cdecl AllocateExceptionWithWeakRef(ptrdiff_t offset, size_t size) { - FIXME("(%Iu, %Iu): stub!\n", offset, size); - return NULL; + struct control_block *weakref; + void *excp; + + TRACE("(%Iu, %Iu)\n", offset, size); + + /* AllocateExceptionWithWeakRef does not store the control block inline, regardless of size. */ + weakref = Allocate(sizeof(*weakref)); + excp = AllocateException(size); + *(struct control_block **)((char *)excp + offset) = weakref; + weakref->IWeakReference_iface.lpVtbl = &control_block_vtbl; + weakref->object = excp; + weakref->ref_strong = weakref->ref_weak = 1; + weakref->is_inline = FALSE; + weakref->unknown = 0; + weakref->is_exception = TRUE; + + return excp; } DEFINE_THISCALL_WRAPPER(control_block_ReleaseTarget, 4) @@ -249,7 +279,12 @@ void __thiscall control_block_ReleaseTarget(struct control_block *weakref) if (weakref->is_inline || ReadNoFence(&weakref->ref_strong) >= 0) return; if ((object = InterlockedCompareExchangePointer((void *)&weakref->object, NULL, weakref->object))) - Free(object); + { + if (weakref->is_exception) + FreeException(object); + else + Free(object); + } } struct __abi_type_descriptor -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9300
This MR contains first 3 patches from !9209 (with some style changes and test fixes). -- https://gitlab.winehq.org/wine/wine/-/merge_requests/9300#note_119902
This merge request was approved by Piotr Caban. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/9300
participants (2)
-
Piotr Caban (＠piotr) -
Vibhav Pant