- Wine-Commits - list.winehq.org

Alex Henrie : include: Add RTL_CONSTANT_STRING.
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: wine Branch: master Commit: 7ada8b96fb1dc305028a29fd3f4d1b0f019da75c URL: https://gitlab.winehq.org/wine/wine/-/commit/7ada8b96fb1dc305028a29fd3f4d1b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 12 22:49:24 2022 -0700 include: Add RTL_CONSTANT_STRING. --- include/ntdef.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/ntdef.h b/include/ntdef.h index 92366c3f3bb..8d04f83da5d 100644 --- a/include/ntdef.h +++ b/include/ntdef.h @@ -84,4 +84,6 @@ typedef struct _RTL_BALANCED_NODE #define RTL_BALANCED_NODE_RESERVED_PARENT_MASK 3 +#define RTL_CONSTANT_STRING(s) { sizeof(s) - sizeof(s[0]), sizeof(s), (void*)s } + #endif /* _NTDEF_ */

1 0

Alex Henrie : dwrite: Handle memory allocation failure in bidi_compute_bracket_pairs (cppcheck).
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: wine Branch: master Commit: 08643dc4d5b43e206059bcd0b4c2ae058355c642 URL: https://gitlab.winehq.org/wine/wine/-/commit/08643dc4d5b43e206059bcd0b4c2ae… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Dec 16 22:21:29 2022 -0700 dwrite: Handle memory allocation failure in bidi_compute_bracket_pairs (cppcheck). --- dlls/dwrite/bidi.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/bidi.c b/dlls/dwrite/bidi.c index 142c82f19d0..796f276e2e9 100644 --- a/dlls/dwrite/bidi.c +++ b/dlls/dwrite/bidi.c @@ -632,23 +632,27 @@ static BracketPair *bidi_compute_bracket_pairs(IsolatedRun *iso_run) WCHAR *open_stack; int *stack_index; int stack_top = iso_run->length; - BracketPair *out = NULL; + BracketPair *out; int pair_count = 0; int i; open_stack = malloc(sizeof(WCHAR) * iso_run->length); stack_index = malloc(sizeof(int) * iso_run->length); + out = malloc(sizeof(BracketPair) * iso_run->length); + + if (!open_stack || !stack_index || !out) { + free(open_stack); + free(stack_index); + free(out); + return NULL; + } + + out[0].start = -1; for (i = 0; i < iso_run->length; i++) { unsigned short ubv = get_table_entry_16(bidi_bracket_table, iso_run->item[i].ch); if (ubv) { - if (!out) - { - out = malloc(sizeof(BracketPair)); - out[0].start = -1; - } - if ((ubv >> 8) == 0) { stack_top--; open_stack[stack_top] = iso_run->item[i].ch + (signed char)(ubv & 0xff); @@ -668,7 +672,6 @@ static BracketPair *bidi_compute_bracket_pairs(IsolatedRun *iso_run) out[pair_count].start = stack_index[j]; out[pair_count].end = i; pair_count++; - out = realloc(out, sizeof(BracketPair) * (pair_count+1)); out[pair_count].start = -1; stack_top = j+1; break;

1 0

Zebediah Figura : rpcrt4: Use CONTAINING_RECORD in release_delegating_vtbl().
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: wine Branch: master Commit: fe8f63ce729db45f5dd05699540b0e3778a8e17d URL: https://gitlab.winehq.org/wine/wine/-/commit/fe8f63ce729db45f5dd05699540b0e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 12 14:06:31 2022 -0600 rpcrt4: Use CONTAINING_RECORD in release_delegating_vtbl(). --- dlls/rpcrt4/cstub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c index c9dbbb18b60..0f5bd0eda9f 100644 --- a/dlls/rpcrt4/cstub.c +++ b/dlls/rpcrt4/cstub.c @@ -334,7 +334,7 @@ IUnknownVtbl *get_delegating_vtbl(DWORD num_methods) void release_delegating_vtbl(IUnknownVtbl *vtbl) { - struct delegating_vtbl *table = (struct delegating_vtbl *)((DWORD *)vtbl - 1); + struct delegating_vtbl *table = CONTAINING_RECORD(vtbl, struct delegating_vtbl, vtbl); EnterCriticalSection(&delegating_vtbl_section); table->ref--;

1 0

Eric Pouech : dbghelp: Don't search path when we have a file handle to loaded image.
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: wine Branch: master Commit: 168c7a475d43cb7688636f0eb13b3892322333c0 URL: https://gitlab.winehq.org/wine/wine/-/commit/168c7a475d43cb7688636f0eb13b38… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Jan 5 12:58:20 2023 +0100 dbghelp: Don't search path when we have a file handle to loaded image. When the handle to the loaded module is passed in SymLoadModule*(), don't try to search for the module's image path and use only the file handle. Co-authored-by: Ake Rehnman <ake.rehnman(a)gmail.com> Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/pe_module.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 4a7e68d5483..91a018c526b 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -784,6 +784,7 @@ struct module* pe_load_native_module(struct process* pcs, const WCHAR* name, BOOL opened = FALSE; struct module_format* modfmt; WCHAR loaded_name[MAX_PATH]; + WCHAR* real_path = NULL; loaded_name[0] = '\0'; if (!hFile) @@ -802,11 +803,12 @@ struct module* pe_load_native_module(struct process* pcs, const WCHAR* name, if (pe_map_file(hFile, &modfmt->u.pe_info->fmap, DMT_PE)) { struct builtin_search builtin = { NULL }; - if (modfmt->u.pe_info->fmap.u.pe.builtin && search_dll_path(pcs, loaded_name, search_builtin_pe, &builtin)) + if (opened && modfmt->u.pe_info->fmap.u.pe.builtin && search_dll_path(pcs, loaded_name, search_builtin_pe, &builtin)) { TRACE("reloaded %s from %s\n", debugstr_w(loaded_name), debugstr_w(builtin.path)); image_unmap_file(&modfmt->u.pe_info->fmap); modfmt->u.pe_info->fmap = builtin.fmap; + real_path = builtin.path; } if (!base) base = PE_FROM_OPTHDR(&modfmt->u.pe_info->fmap, ImageBase); if (!size) size = PE_FROM_OPTHDR(&modfmt->u.pe_info->fmap, SizeOfImage); @@ -817,7 +819,7 @@ struct module* pe_load_native_module(struct process* pcs, const WCHAR* name, modfmt->u.pe_info->fmap.u.pe.file_header.Machine); if (module) { - module->real_path = builtin.path; + module->real_path = real_path; modfmt->module = module; modfmt->remove = pe_module_remove; modfmt->loc_compute = NULL; @@ -827,7 +829,7 @@ struct module* pe_load_native_module(struct process* pcs, const WCHAR* name, else { ERR("could not load the module '%s'\n", debugstr_w(loaded_name)); - heap_free(builtin.path); + heap_free(real_path); image_unmap_file(&modfmt->u.pe_info->fmap); } }

1 0

Eric Pouech : winedbg: Pass loaded image's file handle to dbghelp.
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: wine Branch: master Commit: 3055653c1e79d59a2b5231d9c9b89bd995324061 URL: https://gitlab.winehq.org/wine/wine/-/commit/3055653c1e79d59a2b5231d9c9b89b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Jan 5 12:58:21 2023 +0100 winedbg: Pass loaded image's file handle to dbghelp. In some cases (running from build tree, overriding load order...), the path to the module from the load DLL debug event isn't the real path to the loaded module. So pass the handle to loaded module's image from winedbg to dbghelp (to avoid image lookup). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54250 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/winedbg/winedbg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 84ec7802396..aa94f2f18ab 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -377,7 +377,7 @@ BOOL dbg_init(HANDLE hProc, const WCHAR* in, BOOL invade) BOOL dbg_load_module(HANDLE hProc, HANDLE hFile, const WCHAR* name, DWORD_PTR base, DWORD size) { - BOOL ret = SymLoadModuleExW(hProc, NULL, name, NULL, base, size, NULL, 0); + BOOL ret = SymLoadModuleExW(hProc, hFile, name, NULL, base, size, NULL, 0); if (ret) { IMAGEHLP_MODULEW64 ihm;

1 0

Ake Rehnman : dbghelp: Store path to module image when passed through file handle.
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: wine Branch: master Commit: 70b8461bef2b12c5ddf868c14a56963c792b71d2 URL: https://gitlab.winehq.org/wine/wine/-/commit/70b8461bef2b12c5ddf868c14a5696… Author: Ake Rehnman <ake.rehnman(a)gmail.com> Date: Thu Jan 5 12:58:23 2023 +0100 dbghelp: Store path to module image when passed through file handle. Co-authored-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/pe_module.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 91a018c526b..80c2f1a1f45 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -26,6 +26,8 @@ #include <string.h> #include <assert.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "dbghelp_private.h" #include "image_private.h" #include "winternl.h" @@ -796,7 +798,31 @@ struct module* pe_load_native_module(struct process* pcs, const WCHAR* name, return NULL; opened = TRUE; } - else if (name) lstrcpyW(loaded_name, name); + else + { + ULONG sz = sizeof(OBJECT_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR), needed; + OBJECT_NAME_INFORMATION *obj_name; + NTSTATUS nts; + + obj_name = RtlAllocateHeap(GetProcessHeap(), 0, sz); + if (obj_name) + { + nts = NtQueryObject(hFile, ObjectNameInformation, obj_name, sz, &needed); + if (nts == STATUS_BUFFER_OVERFLOW) + { + sz = needed; + obj_name = RtlReAllocateHeap(GetProcessHeap(), 0, obj_name, sz); + nts = NtQueryObject(hFile, ObjectNameInformation, obj_name, sz, &needed); + } + if (!nts) + { + obj_name->Name.Buffer[obj_name->Name.Length / sizeof(WCHAR)] = L'\0'; + real_path = wcsdup(obj_name->Name.Buffer); + } + RtlFreeHeap(GetProcessHeap(), 0, obj_name); + } + if (name) lstrcpyW(loaded_name, name); + } if (!(modfmt = HeapAlloc(GetProcessHeap(), 0, sizeof(struct module_format) + sizeof(struct pe_module_info)))) return NULL; modfmt->u.pe_info = (struct pe_module_info*)(modfmt + 1);

1 0

Eric Pouech : dbghelp: Expose the real path to the module in SymGetModuleInfo*().
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: wine Branch: master Commit: a89975f731b5cfe822bd7f8d33da0a9481b1c151 URL: https://gitlab.winehq.org/wine/wine/-/commit/a89975f731b5cfe822bd7f8d33da0a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Jan 5 12:58:24 2023 +0100 dbghelp: Expose the real path to the module in SymGetModuleInfo*(). Expose the real path of a loaded module (potentially read from WINEDLLDIR or WINEBUILDDIR or overriden load order or ...). This improves gdb integration by passing the real path to the loaded modules (instead of the paths in c:\windows\ system subdirectories). Introduce new Wine only dbghelp's extended option to enable the feature. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54250 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/dbghelp.c | 7 +++++++ dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/module.c | 3 +++ include/dbghelp.h | 1 + programs/winedbg/gdbproxy.c | 9 ++++++--- 5 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index 2facc58585e..432e9c6b248 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -67,6 +67,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); unsigned dbghelp_options = SYMOPT_UNDNAME; BOOL dbghelp_opt_native = FALSE; +BOOL dbghelp_opt_real_path = FALSE; SYSTEM_INFO sysinfo; static struct process* process_first /* = NULL */; @@ -602,6 +603,10 @@ BOOL WINAPI SymSetExtendedOption(IMAGEHLP_EXTENDED_OPTIONS option, BOOL value) old = dbghelp_opt_native; dbghelp_opt_native = value; break; + case SYMOPT_EX_WINE_MODULE_REAL_PATH: + old = dbghelp_opt_real_path; + dbghelp_opt_real_path = value; + break; default: FIXME("Unsupported option %d with value %d\n", option, value); } @@ -619,6 +624,8 @@ BOOL WINAPI SymGetExtendedOption(IMAGEHLP_EXTENDED_OPTIONS option) { case SYMOPT_EX_WINE_NATIVE_MODULES: return dbghelp_opt_native; + case SYMOPT_EX_WINE_MODULE_REAL_PATH: + return dbghelp_opt_real_path; default: FIXME("Unsupported option %d\n", option); } diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 319a3b81047..a8ef5bfff84 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -111,6 +111,7 @@ void* hash_table_iter_up(struct hash_table_iter* hti) DECLSPEC_HIDDEN; extern unsigned dbghelp_options DECLSPEC_HIDDEN; extern BOOL dbghelp_opt_native DECLSPEC_HIDDEN; +extern BOOL dbghelp_opt_real_path DECLSPEC_HIDDEN; extern SYSTEM_INFO sysinfo DECLSPEC_HIDDEN; /* FIXME: this could be optimized later on by using relative offsets and smaller integral sizes */ diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index d590877497d..51ade962937 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -1439,6 +1439,9 @@ BOOL WINAPI SymGetModuleInfoW64(HANDLE hProcess, DWORD64 dwAddr, miw64 = module->module; + if (dbghelp_opt_real_path && module->real_path) + lstrcpynW(miw64.LoadedImageName, module->real_path, ARRAY_SIZE(miw64.LoadedImageName)); + /* update debug information from container if any */ if (module->module.SymType == SymNone) { diff --git a/include/dbghelp.h b/include/dbghelp.h index e56d8de0d5d..31600d99429 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -1098,6 +1098,7 @@ typedef enum #ifdef __WINESRC__ SYMOPT_EX_WINE_NATIVE_MODULES = 1000, + SYMOPT_EX_WINE_MODULE_REAL_PATH, #endif } IMAGEHLP_EXTENDED_OPTIONS; diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 6b523b30337..68875a6d0fa 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1765,7 +1765,7 @@ static BOOL CALLBACK packet_query_libraries_cb(PCSTR mod_name, DWORD64 base, PVO static enum packet_return packet_query_libraries(struct gdb_context* gdbctx) { struct reply_buffer* reply = &gdbctx->qxfer_buffer; - BOOL opt; + BOOL opt_native, opt_real_path; if (!gdbctx->process) return packet_error; @@ -1776,9 +1776,12 @@ static enum packet_return packet_query_libraries(struct gdb_context* gdbctx) SymLoadModule(gdbctx->process->handle, 0, 0, 0, 0, 0); reply_buffer_append_str(reply, "<library-list>"); - opt = SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, TRUE); + /* request also ELF modules, and also real path to loaded modules */ + opt_native = SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, TRUE); + opt_real_path = SymSetExtendedOption(SYMOPT_EX_WINE_MODULE_REAL_PATH, TRUE); SymEnumerateModules64(gdbctx->process->handle, packet_query_libraries_cb, gdbctx); - SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, opt); + SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, opt_native); + SymSetExtendedOption(SYMOPT_EX_WINE_MODULE_REAL_PATH, opt_real_path); reply_buffer_append_str(reply, "</library-list>"); return packet_send_buffer;

1 0

Bernhard Kölbl : windows.media.speech: Return IAsyncAction from session_StopAsync.
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: wine Branch: master Commit: d21b872a8063494404d4fd9fca6f31610d33c89c URL: https://gitlab.winehq.org/wine/wine/-/commit/d21b872a8063494404d4fd9fca6f31… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Tue May 3 17:04:08 2022 +0200 windows.media.speech: Return IAsyncAction from session_StopAsync. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/recognizer.c | 7 ++++++- dlls/windows.media.speech/tests/speech.c | 24 ++++++++++-------------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/windows.media.speech/recognizer.c b/dlls/windows.media.speech/recognizer.c index aaf9c5f8908..b4f68489bd0 100644 --- a/dlls/windows.media.speech/recognizer.c +++ b/dlls/windows.media.speech/recognizer.c @@ -266,10 +266,15 @@ static HRESULT WINAPI session_StartWithModeAsync( ISpeechContinuousRecognitionSe return E_NOTIMPL; } +static HRESULT session_stop_async( IInspectable *invoker ) +{ + return S_OK; +} + static HRESULT WINAPI session_StopAsync( ISpeechContinuousRecognitionSession *iface, IAsyncAction **action ) { FIXME("iface %p, action %p stub!\n", iface, action); - return E_NOTIMPL; + return async_action_create(NULL, session_stop_async, action); } static HRESULT WINAPI session_CancelAsync( ISpeechContinuousRecognitionSession *iface, IAsyncAction **action ) diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index 445d10923ae..b6355743a83 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -1762,9 +1762,7 @@ static void test_Recognition(void) */ hr = ISpeechContinuousRecognitionSession_StopAsync(session, &action2); - todo_wine ok(hr == S_OK, "ISpeechContinuousRecognitionSession_StopAsync failed, hr %#lx.\n", hr); - - if (FAILED(hr)) goto skip_action; + ok(hr == S_OK, "ISpeechContinuousRecognitionSession_StopAsync failed, hr %#lx.\n", hr); async_void_handler_create_static(&action_handler); action_handler.event_block = CreateEventW(NULL, FALSE, FALSE, NULL); @@ -1776,40 +1774,38 @@ static void test_Recognition(void) put_param.handler = &action_handler.IAsyncActionCompletedHandler_iface; put_param.action = action2; put_thread = CreateThread(NULL, 0, action_put_completed_thread, &put_param, 0, NULL); - todo_wine ok(!WaitForSingleObject(action_handler.event_finished , 5000), "Wait for event_finished failed.\n"); + ok(!WaitForSingleObject(action_handler.event_finished , 5000), "Wait for event_finished failed.\n"); handler = (void *)0xdeadbeef; old_ref = action_handler.ref; hr = IAsyncAction_get_Completed(action2, &handler); - todo_wine ok(hr == S_OK, "IAsyncAction_get_Completed failed, hr %#lx.\n", hr); + ok(hr == S_OK, "IAsyncAction_get_Completed failed, hr %#lx.\n", hr); - todo_wine ok(handler == &action_handler.IAsyncActionCompletedHandler_iface || /* Broken on 1507. */ - broken(handler != NULL && handler != (void *)0xdeadbeef), "Handler was %p.\n", handler); + todo_wine ok(handler == &action_handler.IAsyncActionCompletedHandler_iface, "Handler was %p.\n", handler); ref = action_handler.ref - old_ref; todo_wine ok(ref == 1, "The ref was increased by %lu.\n", ref); - IAsyncActionCompletedHandler_Release(handler); + if (handler) IAsyncActionCompletedHandler_Release(handler); hr = IAsyncAction_QueryInterface(action2, &IID_IAsyncInfo, (void **)&info); - todo_wine ok(hr == S_OK, "IAsyncAction_QueryInterface failed, hr %#lx.\n", hr); + ok(hr == S_OK, "IAsyncAction_QueryInterface failed, hr %#lx.\n", hr); hr = IAsyncInfo_Close(info); /* If IAsyncInfo_Close would wait for the handler to finish, the test would get stuck here. */ - todo_wine ok(hr == S_OK, "IAsyncInfo_Close failed, hr %#lx.\n", hr); + ok(hr == S_OK, "IAsyncInfo_Close failed, hr %#lx.\n", hr); check_async_info((IInspectable *)action2, 3, AsyncStatus_Closed, S_OK); set = SetEvent(action_handler.event_block); - todo_wine ok(set == TRUE, "Event 'event_block' wasn't set.\n"); - todo_wine ok(!WaitForSingleObject(put_thread , 1000), "Wait for put_thread failed.\n"); + ok(set == TRUE, "Event 'event_block' wasn't set.\n"); + ok(!WaitForSingleObject(put_thread , 1000), "Wait for put_thread failed.\n"); IAsyncInfo_Release(info); CloseHandle(action_handler.event_finished); CloseHandle(action_handler.event_block); CloseHandle(put_thread); - todo_wine ok(action != action2, "actions were the same!\n"); + ok(action != action2, "actions were the same!\n"); IAsyncAction_Release(action2); -skip_action: IAsyncAction_Release(action); hr = ISpeechContinuousRecognitionSession_remove_ResultGenerated(session, token);

1 0

Bernhard Kölbl : windows.media.speech: Do not force calling convention on internal callbacks.
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: wine Branch: master Commit: 754452dd9d840a03c3996a53fb27bfe30089ddf7 URL: https://gitlab.winehq.org/wine/wine/-/commit/754452dd9d840a03c3996a53fb27bf… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Tue Jan 3 15:08:28 2023 +0100 windows.media.speech: Do not force calling convention on internal callbacks. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/private.h | 4 ++-- dlls/windows.media.speech/recognizer.c | 8 ++++---- dlls/windows.media.speech/synthesizer.c | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/windows.media.speech/private.h b/dlls/windows.media.speech/private.h index 13964329697..41f7b02e3de 100644 --- a/dlls/windows.media.speech/private.h +++ b/dlls/windows.media.speech/private.h @@ -69,8 +69,8 @@ struct vector_iids const GUID *view; }; -typedef HRESULT (WINAPI *async_action_callback)( IInspectable *invoker ); -typedef HRESULT (WINAPI *async_operation_inspectable_callback)( IInspectable *invoker, IInspectable **result ); +typedef HRESULT (*async_action_callback)( IInspectable *invoker ); +typedef HRESULT (*async_operation_inspectable_callback)( IInspectable *invoker, IInspectable **result ); HRESULT async_action_create( IInspectable *invoker, async_action_callback callback, IAsyncAction **out ); HRESULT async_operation_inspectable_create( const GUID *iid, IInspectable *invoker, async_operation_inspectable_callback callback, diff --git a/dlls/windows.media.speech/recognizer.c b/dlls/windows.media.speech/recognizer.c index 105ed2b0b05..aaf9c5f8908 100644 --- a/dlls/windows.media.speech/recognizer.c +++ b/dlls/windows.media.speech/recognizer.c @@ -247,7 +247,7 @@ static HRESULT WINAPI session_set_AutoStopSilenceTimeout( ISpeechContinuousRecog return E_NOTIMPL; } -static HRESULT WINAPI start_callback( IInspectable *invoker ) +static HRESULT session_start_async( IInspectable *invoker ) { return S_OK; } @@ -255,7 +255,7 @@ static HRESULT WINAPI start_callback( IInspectable *invoker ) static HRESULT WINAPI session_StartAsync( ISpeechContinuousRecognitionSession *iface, IAsyncAction **action ) { FIXME("iface %p, action %p stub!\n", iface, action); - return async_action_create(NULL, start_callback, action); + return async_action_create(NULL, session_start_async, action); } static HRESULT WINAPI session_StartWithModeAsync( ISpeechContinuousRecognitionSession *iface, @@ -479,7 +479,7 @@ static HRESULT WINAPI recognizer_get_UIOptions( ISpeechRecognizer *iface, ISpeec return E_NOTIMPL; } -static HRESULT WINAPI compile_callback( IInspectable *invoker, IInspectable **result ) +static HRESULT recognizer_compile_constraints_async( IInspectable *invoker, IInspectable **result ) { return compilation_result_create(SpeechRecognitionResultStatus_Success, (ISpeechRecognitionCompilationResult **) result); } @@ -489,7 +489,7 @@ static HRESULT WINAPI recognizer_CompileConstraintsAsync( ISpeechRecognizer *ifa { IAsyncOperation_IInspectable **value = (IAsyncOperation_IInspectable **)operation; FIXME("iface %p, operation %p semi-stub!\n", iface, operation); - return async_operation_inspectable_create(&IID_IAsyncOperation_SpeechRecognitionCompilationResult, NULL, compile_callback, value); + return async_operation_inspectable_create(&IID_IAsyncOperation_SpeechRecognitionCompilationResult, NULL, recognizer_compile_constraints_async, value); } static HRESULT WINAPI recognizer_RecognizeAsync( ISpeechRecognizer *iface, diff --git a/dlls/windows.media.speech/synthesizer.c b/dlls/windows.media.speech/synthesizer.c index ce257c7c355..39d14b84ab7 100644 --- a/dlls/windows.media.speech/synthesizer.c +++ b/dlls/windows.media.speech/synthesizer.c @@ -375,7 +375,7 @@ static HRESULT WINAPI synthesizer_GetTrustLevel( ISpeechSynthesizer *iface, Trus return E_NOTIMPL; } -static HRESULT CALLBACK text_to_stream_operation( IInspectable *invoker, IInspectable **result ) +static HRESULT synthesizer_synthesize_text_to_stream_async( IInspectable *invoker, IInspectable **result ) { return synthesis_stream_create((ISpeechSynthesisStream **)result); } @@ -385,10 +385,10 @@ static HRESULT WINAPI synthesizer_SynthesizeTextToStreamAsync( ISpeechSynthesize { TRACE("iface %p, text %p, operation %p.\n", iface, text, operation); return async_operation_inspectable_create(&IID_IAsyncOperation_SpeechSynthesisStream, NULL, - text_to_stream_operation, (IAsyncOperation_IInspectable **)operation); + synthesizer_synthesize_text_to_stream_async, (IAsyncOperation_IInspectable **)operation); } -static HRESULT CALLBACK ssml_to_stream_operation( IInspectable *invoker, IInspectable **result ) +static HRESULT synthesizer_synthesize_ssml_to_stream_async( IInspectable *invoker, IInspectable **result ) { return synthesis_stream_create((ISpeechSynthesisStream **)result); } @@ -398,7 +398,7 @@ static HRESULT WINAPI synthesizer_SynthesizeSsmlToStreamAsync( ISpeechSynthesize { TRACE("iface %p, ssml %p, operation %p.\n", iface, ssml, operation); return async_operation_inspectable_create(&IID_IAsyncOperation_SpeechSynthesisStream, NULL, - ssml_to_stream_operation, (IAsyncOperation_IInspectable **)operation); + synthesizer_synthesize_ssml_to_stream_async, (IAsyncOperation_IInspectable **)operation); } static HRESULT WINAPI synthesizer_put_Voice( ISpeechSynthesizer *iface, IVoiceInformation *value )

1 0

Nikolay Sivov : include: Add recent DirectWrite API changes.
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: wine Branch: master Commit: cab673f8b32562656d8f5c45baf6624e8fd2bd99 URL: https://gitlab.winehq.org/wine/wine/-/commit/cab673f8b32562656d8f5c45baf662… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Dec 17 18:37:32 2022 +0300 include: Add recent DirectWrite API changes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/dwrite_3.idl | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl index 845754f6e3f..e67c8ab6364 100644 --- a/include/dwrite_3.idl +++ b/include/dwrite_3.idl @@ -473,6 +473,29 @@ interface IDWriteFontSet3 : IDWriteFontSet2 HRESULT GetFontSourceName(UINT32 index, WCHAR *buffer, UINT32 buffer_size); } +[ + local, + object, + uuid(eec175fc-bea9-4c86-8b53-ccbdd7df0c82) +] +interface IDWriteFontSet4 : IDWriteFontSet3 +{ + UINT32 ConvertWeightStretchStyleToFontAxisValues( + DWRITE_FONT_AXIS_VALUE const *input_axis_values, + UINT32 input_axis_count, + DWRITE_FONT_WEIGHT weight, + DWRITE_FONT_STRETCH stretch, + DWRITE_FONT_STYLE style, + float size, + DWRITE_FONT_AXIS_VALUE *output_axis_values); + HRESULT GetMatchingFonts( + WCHAR const *family_name, + DWRITE_FONT_AXIS_VALUE const *axis_values, + UINT32 axis_value_count, + DWRITE_FONT_SIMULATIONS allowed_simulations, + IDWriteFontSet4 **fonts); +} + [ local, object, @@ -795,6 +818,21 @@ interface IDWriteFontFace5 : IDWriteFontFace4 BOOL Equals(IDWriteFontFace *fontface); } +[ + local, + object, + uuid(c4b1fe1b-6e84-47d5-b54c-a597981b06ad) +] +interface IDWriteFontFace6 : IDWriteFontFace5 +{ + HRESULT GetFamilyNames( + DWRITE_FONT_FAMILY_MODEL font_family_model, + IDWriteLocalizedStrings **names); + HRESULT GetFaceNames( + DWRITE_FONT_FAMILY_MODEL font_family_model, + IDWriteLocalizedStrings **names); +} + typedef struct DWRITE_COLOR_GLYPH_RUN1 DWRITE_COLOR_GLYPH_RUN1; cpp_quote("struct DWRITE_COLOR_GLYPH_RUN1")

1 0