May 2022 - Wine-commits - list.winehq.org

Rémi Bernon : ntdll: Use block size helpers in heap_reallocate.
by Alexandre Julliard 19 May '22

19 May '22

Module: wine Branch: master Commit: 61bc8abd1fa26861c43ed59097bb014a6ffd383c URL: https://source.winehq.org/git/wine.git/?a=commit;h=61bc8abd1fa26861c43ed590… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 3 17:27:25 2022 +0200 ntdll: Use block size helpers in heap_reallocate. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index e3bfc3d37e7..6e64d0d7dfb 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1662,8 +1662,8 @@ static NTSTATUS heap_reallocate( HEAP *heap, ULONG flags, void *ptr, SIZE_T size /* Check if we need to grow the block */ - old_data_size = (block->size & ARENA_SIZE_MASK); - old_size = (block->size & ARENA_SIZE_MASK) - block->unused_bytes; + old_data_size = block_get_size( block ) - sizeof(*block); + old_size = block_get_size( block ) - block_get_overhead( block ); if (data_size > old_data_size) { if ((next = next_block( subheap, block )) && (block_get_flags( next ) & ARENA_FLAG_FREE) &&

1 0

Eric Pouech : include: Use Mingw64's __uuidof when present.
by Alexandre Julliard 19 May '22

19 May '22

Module: wine Branch: master Commit: 4a1f1082e47ac0fddd6d4925636a557a593f3801 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a1f1082e47ac0fddd6d4925… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon May 2 18:05:30 2022 +0200 include: Use Mingw64's __uuidof when present. otherwise Wine's and Mingw64's __uuidof() conflict (C++) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/guiddef.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/include/guiddef.h b/include/guiddef.h index 912fcea0cbe..6f7e26df0c6 100644 --- a/include/guiddef.h +++ b/include/guiddef.h @@ -44,7 +44,10 @@ typedef struct _GUID /* Macros for __uuidof emulation */ #ifdef __cplusplus # if defined(__MINGW32__) -# define __WINE_UUID_ATTR __attribute__((selectany)) +# if !defined(__uuidof) /* Mingw64 can provide support for __uuidof and __CRT_UUID_DECL */ +# define __WINE_UUID_ATTR __attribute__((selectany)) +# undef __CRT_UUID_DECL +# endif # elif defined(__GNUC__) # define __WINE_UUID_ATTR __attribute__((visibility("hidden"),weak)) # endif @@ -76,7 +79,7 @@ extern "C++" { #define __uuidof(type) __wine_uuidof_type<__typeof__(type)>::inst::uuid -#else /* __WINE_UUID_ATTR */ +#elif !defined(__CRT_UUID_DECL) #define __CRT_UUID_DECL(type,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8)

1 0

Nikolay Sivov : winedump: Add support for dumping UnloadedModuleListStream.
by Alexandre Julliard 19 May '22

19 May '22

Module: wine Branch: master Commit: f2ee6b7c315cc13f34482e98c02da838f11fe96f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2ee6b7c315cc13f34482e98… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 19 10:50:37 2022 +0300 winedump: Add support for dumping UnloadedModuleListStream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/minidumpapiset.h | 16 ++++++++++++++++ tools/winedump/minidump.c | 43 +++++++++++++++++++++++++++++++++++-------- 2 files changed, 51 insertions(+), 8 deletions(-) diff --git a/include/minidumpapiset.h b/include/minidumpapiset.h index b3a7737bd13..fed3e4cac03 100644 --- a/include/minidumpapiset.h +++ b/include/minidumpapiset.h @@ -426,6 +426,22 @@ typedef struct _MINIDUMP_THREAD_INFO_LIST ULONG NumberOfEntries; } MINIDUMP_THREAD_INFO_LIST, *PMINIDUMP_THREAD_INFO_LIST; +typedef struct _MINIDUMP_UNLOADED_MODULE +{ + ULONG64 BaseOfImage; + ULONG32 SizeOfImage; + ULONG32 CheckSum; + ULONG32 TimeDateStamp; + RVA ModuleNameRva; +} MINIDUMP_UNLOADED_MODULE, *PMINIDUMP_UNLOADED_MODULE; + +typedef struct _MINIDUMP_UNLOADED_MODULE_LIST +{ + ULONG32 SizeOfHeader; + ULONG32 SizeOfEntry; + ULONG32 NumberOfEntries; +} MINIDUMP_UNLOADED_MODULE_LIST, *PMINIDUMP_UNLOADED_MODULE_LIST; + typedef enum _MINIDUMP_STREAM_TYPE { UnusedStream = 0, diff --git a/tools/winedump/minidump.c b/tools/winedump/minidump.c index 734c754e6be..8190df937af 100644 --- a/tools/winedump/minidump.c +++ b/tools/winedump/minidump.c @@ -83,6 +83,7 @@ void mdmp_dump(void) const MINIDUMP_DIRECTORY* dir; const void* stream; unsigned int i, idx; + const BYTE *ptr; if (!hdr) { @@ -439,17 +440,16 @@ void mdmp_dump(void) case HandleDataStream: { const MINIDUMP_HANDLE_DATA_STREAM *mhd = stream; - const BYTE *desc; printf("Handle data:\n"); printf(" SizeOfHeader: %u\n", mhd->SizeOfHeader); printf(" SizeOfDescriptor: %u\n", mhd->SizeOfDescriptor); printf(" NumberOfDescriptors: %u\n", mhd->NumberOfDescriptors); - desc = (BYTE *)mhd + sizeof(*mhd); + ptr = (BYTE *)mhd + sizeof(*mhd); for (i = 0; i < mhd->NumberOfDescriptors; ++i) { - const MINIDUMP_HANDLE_DESCRIPTOR_2 *hd = (void *)desc; + const MINIDUMP_HANDLE_DESCRIPTOR_2 *hd = (void *)ptr; printf(" Handle [%u]:\n", i); print_longlong(" Handle", hd->Handle); @@ -472,24 +472,23 @@ void mdmp_dump(void) printf(" Reserved0: %#x\n", hd->Reserved0); } - desc += mhd->SizeOfDescriptor; + ptr += mhd->SizeOfDescriptor; } } break; case ThreadInfoListStream: { const MINIDUMP_THREAD_INFO_LIST *til = stream; - const BYTE *desc; printf("Thread Info List:\n"); printf(" SizeOfHeader: %u\n", (UINT)til->SizeOfHeader); printf(" SizeOfEntry: %u\n", (UINT)til->SizeOfEntry); printf(" NumberOfEntries: %u\n", (UINT)til->NumberOfEntries); - desc = (BYTE *)til + sizeof(*til); + ptr = (BYTE *)til + sizeof(*til); for (i = 0; i < til->NumberOfEntries; ++i) { - const MINIDUMP_THREAD_INFO *ti = (void *)desc; + const MINIDUMP_THREAD_INFO *ti = (void *)ptr; printf(" Thread [%u]:\n", i); printf(" ThreadId: %u\n", ti->ThreadId); @@ -503,7 +502,35 @@ void mdmp_dump(void) print_longlong(" StartAddress", ti->StartAddress); print_longlong(" Affinity", ti->Affinity); - desc += til->SizeOfEntry; + ptr += til->SizeOfEntry; + } + } + break; + + case UnloadedModuleListStream: + { + const MINIDUMP_UNLOADED_MODULE_LIST *uml = stream; + + printf("Unloaded module list:\n"); + printf(" SizeOfHeader: %u\n", uml->SizeOfHeader); + printf(" SizeOfEntry: %u\n", uml->SizeOfEntry); + printf(" NumberOfEntries: %u\n", uml->NumberOfEntries); + + ptr = (BYTE *)uml + sizeof(*uml); + for (i = 0; i < uml->NumberOfEntries; ++i) + { + const MINIDUMP_UNLOADED_MODULE *mod = (void *)ptr; + + printf(" Module [%u]:\n", i); + print_longlong(" BaseOfImage", mod->BaseOfImage); + printf(" SizeOfImage: %u\n", mod->SizeOfImage); + printf(" CheckSum: %#x\n", mod->CheckSum); + printf(" TimeDateStamp: %s\n", get_time_str(mod->TimeDateStamp)); + printf(" ModuleName: "); + dump_mdmp_string(mod->ModuleNameRva); + printf("\n"); + + ptr += uml->SizeOfEntry; } } break;

1 0

Piotr Caban : msvcr120: Add missing _StructuredTaskCollection destructor spec file entry.
by Alexandre Julliard 19 May '22

19 May '22

Module: wine Branch: master Commit: f3576a0590260162cf6a03745f48d69d05ef428c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3576a0590260162cf6a0374… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 19 16:54:46 2022 +0200 msvcr120: Add missing _StructuredTaskCollection destructor spec file entry. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr120/msvcr120.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 4cafd8ba247..aa00853d5cd 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -290,6 +290,7 @@ @ stub -arch=arm ??1_SpinLock(a)details@Concurrency@@QAA(a)XZ @ stub -arch=i386 ??1_SpinLock(a)details@Concurrency@@QAE(a)XZ @ stub -arch=win64 ??1_SpinLock(a)details@Concurrency@@QEAA(a)XZ +@ stub -arch=arm ??1_StructuredTaskCollection(a)details@Concurrency@@QAA(a)XZ @ stub -arch=i386 ??1_StructuredTaskCollection(a)details@Concurrency@@QAE(a)XZ @ stub -arch=win64 ??1_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)XZ @ stub -arch=arm ??1_TaskCollection(a)details@Concurrency@@QAA(a)XZ

1 0

Bernhard Kölbl : windows.media.speech/tests: Remove a inconsistent ref check.
by Alexandre Julliard 19 May '22

19 May '22

Module: wine Branch: master Commit: 1805b2ff26c2a6b777eef7d7813d74807c716a12 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1805b2ff26c2a6b777eef7d7… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Thu May 19 12:04:31 2022 +0200 windows.media.speech/tests: Remove a inconsistent ref check. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/tests/speech.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index 33da6828dc2..e5dbc289840 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -1135,7 +1135,6 @@ static void test_SpeechRecognizer(void) ok(!WaitForSingleObject(compilation_handler.event_finished, 5000), "Wait for event_finished failed.\n"); todo_wine ok(compilation_handler.ref == 3, "Got unexpected ref %lu.\n", compilation_handler.ref); - todo_wine check_refcount(operation, 3); handler = (void*)0xdeadbeef; old_ref = compilation_handler.ref;

1 0

Bernhard Kölbl : windows.media.speech: Rename impl_from_IAsyncInfo to async_inspectable_impl_from_IAsyncInfo.
by Alexandre Julliard 19 May '22

19 May '22

Module: wine Branch: master Commit: c73f06a586ca1c0d52128f6839e38fa192211185 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c73f06a586ca1c0d52128f68… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Tue May 3 13:37:32 2022 +0200 windows.media.speech: Rename impl_from_IAsyncInfo to async_inspectable_impl_from_IAsyncInfo. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/async.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/windows.media.speech/async.c b/dlls/windows.media.speech/async.c index 79510d61dc7..eceda4338b3 100644 --- a/dlls/windows.media.speech/async.c +++ b/dlls/windows.media.speech/async.c @@ -231,11 +231,12 @@ static const struct IAsyncOperation_IInspectableVtbl async_inspectable_vtbl = /* * - * IAsyncInfo + * IAsyncInfo for IAsyncOperation<IInspectable*> * */ -DEFINE_IINSPECTABLE(async_inspectable_info, IAsyncInfo, struct async_inspectable, IAsyncOperation_IInspectable_iface) +DEFINE_IINSPECTABLE_(async_inspectable_info, IAsyncInfo, struct async_inspectable, + async_inspectable_impl_from_IAsyncInfo, IAsyncInfo_iface, &impl->IAsyncOperation_IInspectable_iface) static HRESULT WINAPI async_inspectable_info_get_Id( IAsyncInfo *iface, UINT32 *id ) { @@ -245,7 +246,7 @@ static HRESULT WINAPI async_inspectable_info_get_Id( IAsyncInfo *iface, UINT32 * static HRESULT WINAPI async_inspectable_info_get_Status( IAsyncInfo *iface, AsyncStatus *status ) { - struct async_inspectable *impl = impl_from_IAsyncInfo(iface); + struct async_inspectable *impl = async_inspectable_impl_from_IAsyncInfo(iface); HRESULT hr = S_OK; TRACE("iface %p, status %p.\n", iface, status); @@ -261,7 +262,7 @@ static HRESULT WINAPI async_inspectable_info_get_Status( IAsyncInfo *iface, Asyn static HRESULT WINAPI async_inspectable_info_get_ErrorCode( IAsyncInfo *iface, HRESULT *error_code ) { - struct async_inspectable *impl = impl_from_IAsyncInfo(iface); + struct async_inspectable *impl = async_inspectable_impl_from_IAsyncInfo(iface); HRESULT hr = S_OK; TRACE("iface %p, error_code %p.\n", iface, error_code); @@ -278,7 +279,7 @@ static HRESULT WINAPI async_inspectable_info_get_ErrorCode( IAsyncInfo *iface, H static HRESULT WINAPI async_inspectable_info_Cancel( IAsyncInfo *iface ) { - struct async_inspectable *impl = impl_from_IAsyncInfo(iface); + struct async_inspectable *impl = async_inspectable_impl_from_IAsyncInfo(iface); HRESULT hr = S_OK; TRACE("iface %p.\n", iface); @@ -295,7 +296,7 @@ static HRESULT WINAPI async_inspectable_info_Cancel( IAsyncInfo *iface ) static HRESULT WINAPI async_inspectable_info_Close( IAsyncInfo *iface ) { - struct async_inspectable *impl = impl_from_IAsyncInfo(iface); + struct async_inspectable *impl = async_inspectable_impl_from_IAsyncInfo(iface); HRESULT hr = S_OK; TRACE("iface %p.\n", iface);

1 0

Bernhard Kölbl : windows.media.speech/tests: Retype AsyncOperationCompletedHandler to IInspectable.
by Alexandre Julliard 19 May '22

19 May '22

Module: wine Branch: master Commit: 00e3dccb67600f07d592c548c36246ef4d059b40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00e3dccb67600f07d592c548… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Wed May 11 16:48:20 2022 +0200 windows.media.speech/tests: Retype AsyncOperationCompletedHandler to IInspectable. So it can be used more generic. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/tests/speech.c | 84 ++++++++++++++++---------------- 1 file changed, 42 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=00e3dccb67600f07d592…

1 0

Bernhard Kölbl : windows.media.speech/tests: Add await helper for IAsyncOperation.
by Alexandre Julliard 19 May '22

19 May '22

Module: wine Branch: master Commit: 1b1ed8f1e279754f5a676de33c645bd7348ad6fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b1ed8f1e279754f5a676de3… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Wed May 11 17:26:46 2022 +0200 windows.media.speech/tests: Add await helper for IAsyncOperation. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/tests/speech.c | 43 ++++++++++++++++---------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index 99304e57865..1d7d91b62bd 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -307,7 +307,6 @@ static const struct IAsyncOperationCompletedHandler_IInspectableVtbl asnyc_inspe async_inspectable_handler_Invoke }; - static HRESULT WINAPI async_inspectable_handler_create_static( struct async_inspectable_handler *impl, const GUID *iid ) { impl->IAsyncOperationCompletedHandler_IInspectable_iface.lpVtbl = &asnyc_inspectable_handler_vtbl; @@ -317,6 +316,22 @@ static HRESULT WINAPI async_inspectable_handler_create_static( struct async_insp return S_OK; } +#define await_async_inspectable(operation, handler, iid) await_async_inspectable_(__LINE__, operation, handler, iid) +static void await_async_inspectable_( unsigned int line, IAsyncOperation_IInspectable *operation, struct async_inspectable_handler *handler, const GUID *handler_iid ) +{ + HRESULT hr; + + async_inspectable_handler_create_static(handler, handler_iid); + handler->event_block = NULL; + handler->event_finished = CreateEventW(NULL, FALSE, FALSE, NULL); + ok_(__FILE__, line)(!!handler->event_finished, "event_finished wasn't created.\n"); + + hr = IAsyncOperation_IInspectable_put_Completed(operation, &handler->IAsyncHandler_IInspectable_iface); + ok_(__FILE__, line)(hr == S_OK, "IAsyncOperation_IInspectable_put_Completed failed, hr %#lx.\n", hr); + ok_(__FILE__, line)(!WaitForSingleObject(handler->event_finished , 5000), "Wait for event_finished failed.\n"); + CloseHandle(handler->event_finished); +} + struct iterator_hstring { IIterator_HSTRING IIterator_HSTRING_iface; @@ -972,10 +987,6 @@ static void test_SpeechRecognizer(void) ref = IVector_ISpeechRecognitionConstraint_Release(constraints); ok(ref == 1, "Got unexpected ref %lu.\n", ref); - async_inspectable_handler_create_static(&compilation_handler, &IID_IAsyncOperationCompletedHandler_SpeechRecognitionCompilationResult); - compilation_handler.event_finished = CreateEventW(NULL, FALSE, FALSE, NULL); - compilation_handler.thread_id = GetCurrentThreadId(); - hr = ISpeechRecognizer_CompileConstraintsAsync(recognizer, &operation); ok(hr == S_OK, "ISpeechRecognizer_CompileConstraintsAsync failed, hr %#lx.\n", hr); @@ -991,11 +1002,9 @@ static void test_SpeechRecognizer(void) ok(hr == E_ILLEGAL_METHOD_CALL, "Got unexpected hr %#lx.\n", hr); ok(compilation_result == (void*)0xdeadbeef, "Compilation result had value %p.\n", compilation_result); - hr = IAsyncOperation_IInspectable_put_Completed((IAsyncOperation_IInspectable *) operation, &compilation_handler.IAsyncHandler_IInspectable_iface); - ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - - ok(!WaitForSingleObject(compilation_handler.event_finished, 1000), "Wait for event_finished failed.\n"); - CloseHandle(compilation_handler.event_finished); + await_async_inspectable((IAsyncOperation_IInspectable *)operation, + &compilation_handler, + &IID_IAsyncOperationCompletedHandler_SpeechRecognitionCompilationResult); hr = IAsyncOperation_SpeechRecognitionCompilationResult_put_Completed(operation, NULL); ok(hr == E_ILLEGAL_DELEGATE_ASSIGNMENT, "Got unexpected hr %#lx.\n", hr); @@ -1072,12 +1081,6 @@ static void test_SpeechRecognizer(void) IAsyncOperation_SpeechRecognitionCompilationResult_Release(operation); /* Test if AsyncOperation is started immediately. */ - async_inspectable_handler_create_static(&compilation_handler, &IID_IAsyncOperationCompletedHandler_SpeechRecognitionCompilationResult); - compilation_handler.event_finished = CreateEventW(NULL, FALSE, FALSE, NULL); - compilation_handler.thread_id = GetCurrentThreadId(); - - ok(compilation_handler.event_finished != NULL, "Finished event wasn't created.\n"); - hr = ISpeechRecognizer_CompileConstraintsAsync(recognizer, &operation); ok(hr == S_OK, "ISpeechRecognizer_CompileConstraintsAsync failed, hr %#lx.\n", hr); check_interface(operation, &IID_IAgileObject, TRUE); @@ -1090,11 +1093,9 @@ static void test_SpeechRecognizer(void) ok(hr == S_OK, "IAsyncInfo_get_Status failed, hr %#lx.\n", hr); ok(async_status != AsyncStatus_Closed, "Status was %#x.\n", async_status); - hr = IAsyncOperation_IInspectable_put_Completed((IAsyncOperation_IInspectable *) operation, &compilation_handler.IAsyncHandler_IInspectable_iface); - ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - - ok(!WaitForSingleObject(compilation_handler.event_finished, 1000), "Wait for event_finished failed.\n"); - CloseHandle(compilation_handler.event_finished); + await_async_inspectable((IAsyncOperation_IInspectable *)operation, + &compilation_handler, + &IID_IAsyncOperationCompletedHandler_SpeechRecognitionCompilationResult); async_status = 0xdeadbeef; hr = IAsyncInfo_get_Status(info, &async_status);

1 0

Bernhard Kölbl : windows.media.speech/tests: Make use of a helper function for IAsyncInfo checking.
by Alexandre Julliard 19 May '22

19 May '22

Module: wine Branch: master Commit: 38902e6d6060a9b97be31a9b07e036de13fb58f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38902e6d6060a9b97be31a9b… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Wed May 11 18:57:00 2022 +0200 windows.media.speech/tests: Make use of a helper function for IAsyncInfo checking. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/tests/speech.c | 80 +++++++++++++++++--------------- 1 file changed, 42 insertions(+), 38 deletions(-) diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index 1d7d91b62bd..6f33e8d1983 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -332,6 +332,39 @@ static void await_async_inspectable_( unsigned int line, IAsyncOperation_IInspec CloseHandle(handler->event_finished); } +#define check_async_info(obj, exp_id, exp_status, exp_hr) check_asnyc_info_(__LINE__, obj, exp_id, exp_status, exp_hr) +static void check_asnyc_info_( unsigned int line, IInspectable *async_obj, UINT32 expect_id, AsyncStatus expect_status, HRESULT expect_hr) +{ + IAsyncInfo *async_info; + AsyncStatus async_status; + UINT32 async_id; + HRESULT hr, async_hr; + + hr = IInspectable_QueryInterface(async_obj, &IID_IAsyncInfo, (void **)&async_info); + ok_(__FILE__, line)(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + async_id = 0xdeadbeef; + hr = IAsyncInfo_get_Id(async_info, &async_id); + if (expect_status < 4) todo_wine ok_(__FILE__, line)(hr == S_OK, "IAsyncInfo_get_Id returned %#lx\n", hr); + else todo_wine ok_(__FILE__, line)(hr == E_ILLEGAL_METHOD_CALL, "IAsyncInfo_get_Id returned %#lx\n", hr); + todo_wine ok_(__FILE__, line)(async_id == expect_id, "got async_id %#x\n", async_id); + + async_status = 0xdeadbeef; + hr = IAsyncInfo_get_Status(async_info, &async_status); + if (expect_status < 4) ok_(__FILE__, line)(hr == S_OK, "IAsyncInfo_get_Status returned %#lx\n", hr); + else ok_(__FILE__, line)(hr == E_ILLEGAL_METHOD_CALL, "IAsyncInfo_get_Status returned %#lx\n", hr); + ok_(__FILE__, line)(async_status == expect_status, "got async_status %#x\n", async_status); + + async_hr = 0xdeadbeef; + hr = IAsyncInfo_get_ErrorCode(async_info, &async_hr); + if (expect_status < 4) ok_(__FILE__, line)(hr == S_OK, "IAsyncInfo_get_ErrorCode returned %#lx\n", hr); + else ok_(__FILE__, line)(hr == E_ILLEGAL_METHOD_CALL, "IAsyncInfo_get_ErrorCode returned %#lx\n", hr); + if (expect_status < 4) todo_wine_if(FAILED(expect_hr)) ok_(__FILE__, line)(async_hr == expect_hr, "got async_hr %#lx\n", async_hr); + else ok_(__FILE__, line)(async_hr == E_ILLEGAL_METHOD_CALL, "got async_hr %#lx\n", async_hr); + + IAsyncInfo_Release(async_info); +} + struct iterator_hstring { IIterator_HSTRING IIterator_HSTRING_iface; @@ -873,9 +906,8 @@ static void test_SpeechRecognizer(void) AsyncStatus async_status; HSTRING hstr, hstr_lang; HANDLE put_thread; - HRESULT hr, error_code; - UINT32 id; LONG ref, old_ref; + HRESULT hr; hr = RoInitialize(RO_INIT_MULTITHREADED); ok(hr == S_OK, "RoInitialize failed, hr %#lx.\n", hr); @@ -1005,6 +1037,7 @@ static void test_SpeechRecognizer(void) await_async_inspectable((IAsyncOperation_IInspectable *)operation, &compilation_handler, &IID_IAsyncOperationCompletedHandler_SpeechRecognitionCompilationResult); + check_async_info((IInspectable *)operation, 1, Completed, S_OK); hr = IAsyncOperation_SpeechRecognitionCompilationResult_put_Completed(operation, NULL); ok(hr == E_ILLEGAL_DELEGATE_ASSIGNMENT, "Got unexpected hr %#lx.\n", hr); @@ -1031,43 +1064,17 @@ static void test_SpeechRecognizer(void) hr = IAsyncOperation_SpeechRecognitionCompilationResult_QueryInterface(operation, &IID_IAsyncInfo, (void **)&info); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - id = 0xdeadbeef; - hr = IAsyncInfo_get_Id(info, &id); - todo_wine ok(hr == S_OK, "IAsyncInfo_get_Id failed, hr %#lx.\n", hr); - todo_wine ok(id != 0xdeadbeef, "Id was %#x.\n", id); - - async_status = 0xdeadbeef; - hr = IAsyncInfo_get_Status(info, &async_status); - ok(hr == S_OK, "IAsyncInfo_get_Status failed, hr %#lx.\n", hr); - ok(async_status == Completed, "Status was %#x.\n", async_status); - - error_code = 0xdeadbeef; - hr = IAsyncInfo_get_ErrorCode(info, &error_code); - ok(hr == S_OK, "IAsyncInfo_get_ErrorCode failed, hr %#lx.\n", hr); - ok(error_code == S_OK, "ErrorCode was %#lx.\n", error_code); - hr = IAsyncInfo_Cancel(info); ok(hr == S_OK, "IAsyncInfo_Cancel failed, hr %#lx.\n", hr); - - async_status = 0xdeadbeef; - hr = IAsyncInfo_get_Status(info, &async_status); - ok(hr == S_OK, "IAsyncInfo_get_Status failed, hr %#lx.\n", hr); - ok(async_status == Completed, "Status was %#x.\n", async_status); + check_async_info((IInspectable *)operation, 1, Completed, S_OK); hr = IAsyncInfo_Close(info); ok(hr == S_OK, "IAsyncInfo_Close failed, hr %#lx.\n", hr); + check_async_info((IInspectable *)operation, 1, AsyncStatus_Closed, S_OK); + hr = IAsyncInfo_Close(info); ok(hr == S_OK, "IAsyncInfo_Close failed, hr %#lx.\n", hr); - - async_status = 0xdeadbeef; - hr = IAsyncInfo_get_Status(info, &async_status); - ok(hr == E_ILLEGAL_METHOD_CALL, "IAsyncInfo_get_Status failed, hr %#lx.\n", hr); - ok(async_status == AsyncStatus_Closed, "Status was %#x.\n", async_status); - - error_code = 0xdeadbeef; - hr = IAsyncInfo_get_ErrorCode(info, &error_code); - ok(hr == E_ILLEGAL_METHOD_CALL, "IAsyncInfo_get_ErrorCode failed, hr %#lx.\n", hr); - ok(error_code == E_ILLEGAL_METHOD_CALL, "ErrorCode was %#lx.\n", error_code); + check_async_info((IInspectable *)operation, 1, AsyncStatus_Closed, S_OK); IAsyncInfo_Release(info); @@ -1092,17 +1099,13 @@ static void test_SpeechRecognizer(void) hr = IAsyncInfo_get_Status(info, &async_status); ok(hr == S_OK, "IAsyncInfo_get_Status failed, hr %#lx.\n", hr); ok(async_status != AsyncStatus_Closed, "Status was %#x.\n", async_status); + IAsyncInfo_Release(info); await_async_inspectable((IAsyncOperation_IInspectable *)operation, &compilation_handler, &IID_IAsyncOperationCompletedHandler_SpeechRecognitionCompilationResult); + check_async_info((IInspectable *)operation, 2, Completed, S_OK); - async_status = 0xdeadbeef; - hr = IAsyncInfo_get_Status(info, &async_status); - ok(hr == S_OK, "IAsyncInfo_get_Status failed, hr %#lx.\n", hr); - ok(async_status == Completed, "Status was %#x.\n", async_status); - - IAsyncInfo_Release(info); IAsyncOperation_SpeechRecognitionCompilationResult_Release(operation); ref = ISpeechRecognizer_Release(recognizer); @@ -1155,6 +1158,7 @@ static void test_SpeechRecognizer(void) SetEvent(compilation_handler.event_block); ok(!WaitForSingleObject(put_thread, 1000), "Wait for block_thread failed.\n"); + check_async_info((IInspectable *)operation, 1, AsyncStatus_Closed, S_OK); CloseHandle(put_thread); CloseHandle(compilation_handler.event_block);

1 0

Bernhard Kölbl : windows.media.speech/tests: Add some recognition tests.
by Alexandre Julliard 19 May '22

19 May '22

Module: wine Branch: master Commit: 0a4b2bbd55a015dc603d0e073f7d000a574ab1b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a4b2bbd55a015dc603d0e07… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Mon Apr 25 23:18:06 2022 +0200 windows.media.speech/tests: Add some recognition tests. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/tests/speech.c | 347 +++++++++++++++++++++++++++++++ 1 file changed, 347 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0a4b2bbd55a015dc603d…

1 0