June 2022 - Wine-Commits - list.winehq.org

Jacek Caban : winemac: Use unixlib interface for macdrv_dnd_get_data.
by Alexandre Julliard June 3, 2022

June 3, 2022

Module: wine Branch: master Commit: 80e24bcc01c0863049ca3380356c9b53e4a86eb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80e24bcc01c0863049ca3380… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 1 20:28:56 2022 +0200 winemac: Use unixlib interface for macdrv_dnd_get_data. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/clipboard.c | 29 ++++++++++++++--------------- dlls/winemac.drv/dragdrop.c | 24 ++++++++++++++++++++++-- dlls/winemac.drv/macdrv.h | 2 +- dlls/winemac.drv/macdrv_main.c | 1 + dlls/winemac.drv/unixlib.h | 10 ++++++++++ 5 files changed, 48 insertions(+), 18 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index f46bb389cc9..8a795e61724 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -1128,24 +1128,26 @@ static CFDataRef export_unicodetext_to_utf16(void *data, size_t size) /************************************************************************** - * macdrv_get_pasteboard_data + * macdrv_dnd_get_data */ -HANDLE macdrv_get_pasteboard_data(CFTypeRef pasteboard, UINT desired_format) +NTSTATUS macdrv_dnd_get_data(void *arg) { + struct dnd_get_data_params *params = arg; + CFTypeRef pasteboard = pasteboard_from_handle(params->handle); CFArrayRef types; CFIndex count; CFIndex i; CFStringRef type, best_type; WINE_CLIPFORMAT* best_format = NULL; - HANDLE data = NULL; + NTSTATUS status = STATUS_SUCCESS; - TRACE("pasteboard %p, desired_format %s\n", pasteboard, debugstr_format(desired_format)); + TRACE("pasteboard %p, desired_format %s\n", pasteboard, debugstr_format(params->format)); types = macdrv_copy_pasteboard_types(pasteboard); if (!types) { WARN("Failed to copy pasteboard types\n"); - return NULL; + return STATUS_NO_MEMORY; } count = CFArrayGetCount(types); @@ -1161,7 +1163,7 @@ HANDLE macdrv_get_pasteboard_data(CFTypeRef pasteboard, UINT desired_format) { TRACE("for type %s got format %p/%s\n", debugstr_cf(type), format, debugstr_format(format->format_id)); - if (format->format_id == desired_format) + if (format->format_id == params->format) { /* The best format is the matching one which is not synthesized. Failing that, the best format is the first matching synthesized format. */ @@ -1183,15 +1185,12 @@ HANDLE macdrv_get_pasteboard_data(CFTypeRef pasteboard, UINT desired_format) if (pasteboard_data) { size_t size; - void *import = best_format->import_func(pasteboard_data, &size), *ptr; + void *import = best_format->import_func(pasteboard_data, &size); if (import) { - data = GlobalAlloc(GMEM_FIXED, size); - if (data && (ptr = GlobalLock(data))) - { - memcpy(ptr, import, size); - GlobalUnlock(data); - } + if (size > params->size) status = STATUS_BUFFER_OVERFLOW; + else memcpy(params->data, import, size); + params->size = size; free(import); } CFRelease(pasteboard_data); @@ -1199,8 +1198,8 @@ HANDLE macdrv_get_pasteboard_data(CFTypeRef pasteboard, UINT desired_format) } CFRelease(types); - TRACE(" -> %p\n", data); - return data; + TRACE(" -> %#x\n", status); + return status; } diff --git a/dlls/winemac.drv/dragdrop.c b/dlls/winemac.drv/dragdrop.c index 962a9d8c24b..aec8b1f4790 100644 --- a/dlls/winemac.drv/dragdrop.c +++ b/dlls/winemac.drv/dragdrop.c @@ -24,6 +24,8 @@ #define NONAMELESSUNION +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "macdrv.h" #define COBJMACROS @@ -92,6 +94,24 @@ static inline DragDropDataObject *impl_from_IDataObject(IDataObject *iface) } +static HANDLE get_pasteboard_data(UINT64 pasteboard, UINT desired_format) +{ + struct dnd_get_data_params params = { .handle = pasteboard, .format = desired_format, .size = 2048 }; + HANDLE handle; + NTSTATUS status; + + for (;;) + { + if (!(handle = GlobalAlloc(GMEM_FIXED, params.size))) return 0; + params.data = GlobalLock(handle); + status = MACDRV_CALL(dnd_get_data, &params); + GlobalUnlock(handle); + if (!status) return GlobalReAlloc(handle, params.size, 0); + GlobalFree(handle); + if (status != STATUS_BUFFER_OVERFLOW) return 0; + } +} + static HRESULT WINAPI dddo_QueryInterface(IDataObject* iface, REFIID riid, LPVOID *ppvObj) { DragDropDataObject *This = impl_from_IDataObject(iface); @@ -148,7 +168,7 @@ static HRESULT WINAPI dddo_GetData(IDataObject* iface, FORMATETC* formatEtc, STG if (SUCCEEDED(hr)) { medium->tymed = TYMED_HGLOBAL; - medium->u.hGlobal = macdrv_get_pasteboard_data((void *)(UINT_PTR)This->pasteboard, formatEtc->cfFormat); + medium->u.hGlobal = get_pasteboard_data(This->pasteboard, formatEtc->cfFormat); medium->pUnkForRelease = NULL; hr = medium->u.hGlobal ? S_OK : E_OUTOFMEMORY; } @@ -454,7 +474,7 @@ NTSTATUS WINAPI macdrv_dnd_query_drop(void *arg, ULONG size) hwnd = GetParent(hwnd); if (hwnd) { - HDROP hdrop = macdrv_get_pasteboard_data((void *)(UINT_PTR)params->handle, CF_HDROP); + HDROP hdrop = get_pasteboard_data(params->handle, CF_HDROP); DROPFILES *dropfiles = GlobalLock(hdrop); if (dropfiles) { diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 4c1a21a3fe8..a841465486e 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -255,7 +255,6 @@ extern void macdrv_displays_changed(const macdrv_event *event) DECLSPEC_HIDDEN; extern void macdrv_UpdateClipboard(void) DECLSPEC_HIDDEN; extern BOOL query_pasteboard_data(HWND hwnd, CFStringRef type) DECLSPEC_HIDDEN; extern void macdrv_lost_pasteboard_ownership(HWND hwnd) DECLSPEC_HIDDEN; -extern HANDLE macdrv_get_pasteboard_data(CFTypeRef pasteboard, UINT desired_format) DECLSPEC_HIDDEN; extern struct opengl_funcs *macdrv_wine_get_wgl_driver(UINT version) DECLSPEC_HIDDEN; extern const struct vulkan_funcs *macdrv_wine_get_vulkan_driver(UINT version) DECLSPEC_HIDDEN; @@ -285,6 +284,7 @@ extern NTSTATUS WINAPI macdrv_ime_query_char_rect(void *params, ULONG size) DECL /* unixlib interface */ +extern NTSTATUS macdrv_dnd_get_data(void *arg) DECLSPEC_HIDDEN; extern NTSTATUS macdrv_dnd_get_formats(void *arg) DECLSPEC_HIDDEN; extern NTSTATUS macdrv_dnd_have_format(void *arg) DECLSPEC_HIDDEN; extern NTSTATUS macdrv_dnd_release(void *arg) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index a0b29604e62..61195d408c8 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -630,6 +630,7 @@ static NTSTATUS macdrv_ime_using_input_method(void *arg) const unixlib_entry_t __wine_unix_call_funcs[] = { + macdrv_dnd_get_data, macdrv_dnd_get_formats, macdrv_dnd_have_format, macdrv_dnd_release, diff --git a/dlls/winemac.drv/unixlib.h b/dlls/winemac.drv/unixlib.h index b29bf99e7f4..0bfc61321d0 100644 --- a/dlls/winemac.drv/unixlib.h +++ b/dlls/winemac.drv/unixlib.h @@ -21,6 +21,7 @@ enum macdrv_funcs { + unix_dnd_get_data, unix_dnd_get_formats, unix_dnd_have_format, unix_dnd_release, @@ -37,6 +38,15 @@ enum macdrv_funcs extern NTSTATUS unix_call(enum macdrv_funcs code, void *params) DECLSPEC_HIDDEN; #define MACDRV_CALL(func, params) unix_call( unix_ ## func, params ) +/* macdrv_dnd_get_data params */ +struct dnd_get_data_params +{ + UINT64 handle; + UINT format; + size_t size; + void *data; +}; + /* macdrv_dnd_get_formats params */ struct dnd_get_formats_params {

1 0

Jacek Caban : winemac: Use unixlib interface for macdrv_app_quit_request.
by Alexandre Julliard June 3, 2022

June 3, 2022

Module: wine Branch: master Commit: c701734c364844ba4d081214802d46a27b81f9f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c701734c364844ba4d081214… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 2 00:00:31 2022 +0200 winemac: Use unixlib interface for macdrv_app_quit_request. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/dllmain.c | 174 +++++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/macdrv_main.c | 9 +++ dlls/winemac.drv/unixlib.h | 16 +++- dlls/winemac.drv/window.c | 168 +-------------------------------------- 4 files changed, 202 insertions(+), 165 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c701734c364844ba4d08…

1 0

Jacek Caban : winemac: Rename MOUSE_MOVE_RELATIVE to avoid collision with wincontypes.h.
by Alexandre Julliard June 3, 2022

June 3, 2022

Module: wine Branch: master Commit: 4998bbacef89875db65b80d96e1bd43c3033c2c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4998bbacef89875db65b80d9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 3 02:00:15 2022 +0200 winemac: Rename MOUSE_MOVE_RELATIVE to avoid collision with wincontypes.h. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/cocoa_app.m | 4 ++-- dlls/winemac.drv/cocoa_event.m | 6 +++--- dlls/winemac.drv/event.c | 6 +++--- dlls/winemac.drv/macdrv_cocoa.h | 2 +- dlls/winemac.drv/mouse.c | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index b5a3059382e..b13bc678c6d 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1188,7 +1188,7 @@ static NSString* WineLocalizedString(unsigned int stringID) [eventQueuesLock lock]; for (queue in eventQueues) { - [queue discardEventsMatchingMask:event_mask_for_type(MOUSE_MOVED) | + [queue discardEventsMatchingMask:event_mask_for_type(MOUSE_MOVED_RELATIVE) | event_mask_for_type(MOUSE_MOVED_ABSOLUTE) forWindow:nil]; [queue resetMouseEventPositions:pos]; @@ -1444,7 +1444,7 @@ static NSString* WineLocalizedString(unsigned int stringID) mouseMoveDeltaX += [anEvent deltaX]; mouseMoveDeltaY += [anEvent deltaY]; - event = macdrv_create_event(MOUSE_MOVED, targetWindow); + event = macdrv_create_event(MOUSE_MOVED_RELATIVE, targetWindow); event->mouse_moved.x = mouseMoveDeltaX * scale; event->mouse_moved.y = mouseMoveDeltaY * scale; diff --git a/dlls/winemac.drv/cocoa_event.m b/dlls/winemac.drv/cocoa_event.m index 868ce5a7813..24f69b17a0a 100644 --- a/dlls/winemac.drv/cocoa_event.m +++ b/dlls/winemac.drv/cocoa_event.m @@ -204,17 +204,17 @@ static const OSType WineHotKeySignature = 'Wine'; }]; [events removeObjectsAtIndexes:indexes]; - if ((event->event->type == MOUSE_MOVED || + if ((event->event->type == MOUSE_MOVED_RELATIVE || event->event->type == MOUSE_MOVED_ABSOLUTE) && event->event->deliver == INT_MAX && (lastEvent = [events lastObject]) && - (lastEvent->event->type == MOUSE_MOVED || + (lastEvent->event->type == MOUSE_MOVED_RELATIVE || lastEvent->event->type == MOUSE_MOVED_ABSOLUTE) && lastEvent->event->deliver == INT_MAX && lastEvent->event->window == event->event->window && lastEvent->event->mouse_moved.drag == event->event->mouse_moved.drag) { - if (event->event->type == MOUSE_MOVED) + if (event->event->type == MOUSE_MOVED_RELATIVE) { lastEvent->event->mouse_moved.x += event->event->mouse_moved.x; lastEvent->event->mouse_moved.y += event->event->mouse_moved.y; diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index 361709010c9..aed8f94076a 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -44,7 +44,7 @@ static const char *dbgstr_event(int type) "KEYBOARD_CHANGED", "LOST_PASTEBOARD_OWNERSHIP", "MOUSE_BUTTON", - "MOUSE_MOVED", + "MOUSE_MOVED_RELATIVE", "MOUSE_MOVED_ABSOLUTE", "MOUSE_SCROLL", "QUERY_EVENT", @@ -100,7 +100,7 @@ static macdrv_event_mask get_event_mask(DWORD mask) if (mask & QS_MOUSEMOVE) { - event_mask |= event_mask_for_type(MOUSE_MOVED); + event_mask |= event_mask_for_type(MOUSE_MOVED_RELATIVE); event_mask |= event_mask_for_type(MOUSE_MOVED_ABSOLUTE); } @@ -325,7 +325,7 @@ void macdrv_handle_event(const macdrv_event *event) case MOUSE_BUTTON: macdrv_mouse_button(hwnd, event); break; - case MOUSE_MOVED: + case MOUSE_MOVED_RELATIVE: case MOUSE_MOVED_ABSOLUTE: macdrv_mouse_moved(hwnd, event); break; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 94f9fbcfa17..27b130ca32e 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -328,7 +328,7 @@ enum { KEYBOARD_CHANGED, LOST_PASTEBOARD_OWNERSHIP, MOUSE_BUTTON, - MOUSE_MOVED, + MOUSE_MOVED_RELATIVE, MOUSE_MOVED_ABSOLUTE, MOUSE_SCROLL, QUERY_EVENT, diff --git a/dlls/winemac.drv/mouse.c b/dlls/winemac.drv/mouse.c index 078b674d7c0..00ec9a36c38 100644 --- a/dlls/winemac.drv/mouse.c +++ b/dlls/winemac.drv/mouse.c @@ -892,14 +892,14 @@ void macdrv_mouse_button(HWND hwnd, const macdrv_event *event) /*********************************************************************** * macdrv_mouse_moved * - * Handler for MOUSE_MOVED and MOUSE_MOVED_ABSOLUTE events. + * Handler for MOUSE_MOVED_RELATIVE and MOUSE_MOVED_ABSOLUTE events. */ void macdrv_mouse_moved(HWND hwnd, const macdrv_event *event) { UINT flags = MOUSEEVENTF_MOVE; TRACE("win %p/%p %s (%d,%d) drag %d time %lu (%lu ticks ago)\n", hwnd, event->window, - (event->type == MOUSE_MOVED) ? "relative" : "absolute", + (event->type == MOUSE_MOVED_RELATIVE) ? "relative" : "absolute", event->mouse_moved.x, event->mouse_moved.y, event->mouse_moved.drag, event->mouse_moved.time_ms, (NtGetTickCount() - event->mouse_moved.time_ms));

1 0

Nikolay Sivov : secur32: Store certificate credentials object pointer as 64-bit.
by Alexandre Julliard June 2, 2022

June 2, 2022

Module: wine Branch: master Commit: 39a01a9f5283d9def67c6763f7f02f240b7c516e URL: https://source.winehq.org/git/wine.git/?a=commit;h=39a01a9f5283d9def67c6763… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 31 12:10:22 2022 +0300 secur32: Store certificate credentials object pointer as 64-bit. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/secur32/schannel_gnutls.c | 14 +++++++++----- dlls/secur32/secur32_priv.h | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 4d7711f32a2..08801cef509 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -141,6 +141,11 @@ static inline gnutls_session_t session_from_handle(UINT64 handle) return (gnutls_session_t)(ULONG_PTR)handle; } +static inline gnutls_certificate_credentials_t certificate_creds_from_handle(UINT64 handle) +{ + return (gnutls_certificate_credentials_t)(ULONG_PTR)handle; +} + struct schan_buffers { SIZE_T offset; @@ -469,8 +474,7 @@ static NTSTATUS schan_create_session( void *args ) return STATUS_INTERNAL_ERROR; } - err = pgnutls_credentials_set(s, GNUTLS_CRD_CERTIFICATE, - (gnutls_certificate_credentials_t)cred->credentials); + err = pgnutls_credentials_set(s, GNUTLS_CRD_CERTIFICATE, certificate_creds_from_handle(cred->credentials)); if (err != GNUTLS_E_SUCCESS) { pgnutls_perror(err); @@ -1074,7 +1078,7 @@ static NTSTATUS schan_allocate_certificate_credentials( void *args ) if (!params->cert_blob) { - params->c->credentials = creds; + params->c->credentials = (ULONG_PTR)creds; return STATUS_SUCCESS; } @@ -1101,14 +1105,14 @@ static NTSTATUS schan_allocate_certificate_credentials( void *args ) return STATUS_INTERNAL_ERROR; } - params->c->credentials = creds; + params->c->credentials = (ULONG_PTR)creds; return STATUS_SUCCESS; } static NTSTATUS schan_free_certificate_credentials( void *args ) { const struct free_certificate_credentials_params *params = args; - pgnutls_certificate_free_credentials(params->c->credentials); + pgnutls_certificate_free_credentials(certificate_creds_from_handle(params->c->credentials)); return STATUS_SUCCESS; } diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index bbb2c527b18..5753ed47ffa 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -84,8 +84,8 @@ typedef UINT64 schan_session; typedef struct schan_credentials { ULONG credential_use; - void *credentials; DWORD enabled_protocols; + UINT64 credentials; } schan_credentials; struct session_params

1 0

Bernhard Kölbl : windows.media.speech: Make use of DEFINE_IINSPECTABLE for IInstalledVoicesStatic from SpeechSynthesizer statics.
by Alexandre Julliard June 2, 2022

June 2, 2022

Module: wine Branch: master Commit: f450d538b370974f5021f08b586d2a314d5537c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f450d538b370974f5021f08b… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Thu Jun 2 12:58:13 2022 +0200 windows.media.speech: Make use of DEFINE_IINSPECTABLE for IInstalledVoicesStatic from SpeechSynthesizer statics. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/synthesizer.c | 41 +-------------------------------- 1 file changed, 1 insertion(+), 40 deletions(-) diff --git a/dlls/windows.media.speech/synthesizer.c b/dlls/windows.media.speech/synthesizer.c index 4299750adf6..3b9e9377394 100644 --- a/dlls/windows.media.speech/synthesizer.c +++ b/dlls/windows.media.speech/synthesizer.c @@ -334,11 +334,6 @@ static inline struct synthesizer_statics *impl_from_IActivationFactory( IActivat return CONTAINING_RECORD(iface, struct synthesizer_statics, IActivationFactory_iface); } -static inline struct synthesizer_statics *impl_from_IInstalledVoicesStatic( IInstalledVoicesStatic *iface ) -{ - return CONTAINING_RECORD(iface, struct synthesizer_statics, IInstalledVoicesStatic_iface); -} - static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID iid, void **out ) { struct synthesizer_statics *impl = impl_from_IActivationFactory(iface); @@ -434,41 +429,7 @@ static const struct IActivationFactoryVtbl factory_vtbl = factory_ActivateInstance, }; -static HRESULT WINAPI installed_voices_static_QueryInterface( IInstalledVoicesStatic *iface, REFIID iid, void **out ) -{ - struct synthesizer_statics *impl = impl_from_IInstalledVoicesStatic(iface); - return IActivationFactory_QueryInterface(&impl->IActivationFactory_iface, iid, out); -} - -static ULONG WINAPI installed_voices_static_AddRef( IInstalledVoicesStatic *iface ) -{ - struct synthesizer_statics *impl = impl_from_IInstalledVoicesStatic(iface); - return IActivationFactory_AddRef(&impl->IActivationFactory_iface); -} - -static ULONG WINAPI installed_voices_static_Release( IInstalledVoicesStatic *iface ) -{ - struct synthesizer_statics *impl = impl_from_IInstalledVoicesStatic(iface); - return IActivationFactory_Release(&impl->IActivationFactory_iface); -} - -static HRESULT WINAPI installed_voices_static_GetIids( IInstalledVoicesStatic *iface, ULONG *iid_count, IID **iids ) -{ - FIXME("iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids); - return E_NOTIMPL; -} - -static HRESULT WINAPI installed_voices_static_GetRuntimeClassName( IInstalledVoicesStatic *iface, HSTRING *class_name ) -{ - FIXME("iface %p, class_name %p stub!\n", iface, class_name); - return E_NOTIMPL; -} - -static HRESULT WINAPI installed_voices_static_GetTrustLevel( IInstalledVoicesStatic *iface, TrustLevel *trust_level ) -{ - FIXME("iface %p, trust_level %p stub!\n", iface, trust_level); - return E_NOTIMPL; -} +DEFINE_IINSPECTABLE(installed_voices_static, IInstalledVoicesStatic, struct synthesizer_statics, IActivationFactory_iface) static HRESULT WINAPI installed_voices_static_get_AllVoices( IInstalledVoicesStatic *iface, IVectorView_VoiceInformation **value ) {

1 0

Rémi Bernon : winegstreamer: Reply with a video buffer pool to ALLOCATION queries.
by Alexandre Julliard June 2, 2022

June 2, 2022

Module: wine Branch: master Commit: f7ca5cfa27e433530f2725d44045ea5284fd332a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7ca5cfa27e433530f2725d4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 12 23:59:38 2022 +0200 winegstreamer: Reply with a video buffer pool to ALLOCATION queries. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winegstreamer/wg_transform.c | 62 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index 93fe0039a63..0c1654567e5 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -58,6 +58,17 @@ struct wg_transform GstCaps *output_caps; }; +static bool is_caps_video(GstCaps *caps) +{ + const gchar *media_type; + + if (!caps || !gst_caps_get_size(caps)) + return false; + + media_type = gst_structure_get_name(gst_caps_get_structure(caps, 0)); + return g_str_has_prefix(media_type, "video/"); +} + static GstFlowReturn transform_sink_chain_cb(GstPad *pad, GstObject *parent, GstBuffer *buffer) { struct wg_transform *transform = gst_pad_get_element_private(pad); @@ -81,6 +92,56 @@ static GstFlowReturn transform_sink_chain_cb(GstPad *pad, GstObject *parent, Gst return GST_FLOW_OK; } +static gboolean transform_sink_query_cb(GstPad *pad, GstObject *parent, GstQuery *query) +{ + struct wg_transform *transform = gst_pad_get_element_private(pad); + + GST_LOG("transform %p, type \"%s\".", transform, gst_query_type_get_name(query->type)); + + switch (query->type) + { + case GST_QUERY_ALLOCATION: + { + GstStructure *config; + gboolean needs_pool; + GstBufferPool *pool; + GstVideoInfo info; + GstCaps *caps; + + gst_query_parse_allocation(query, &caps, &needs_pool); + if (!is_caps_video(caps) || !needs_pool) + break; + + if (!gst_video_info_from_caps(&info, caps) + || !(pool = gst_video_buffer_pool_new())) + break; + + if (!(config = gst_buffer_pool_get_config(pool))) + GST_ERROR("Failed to get pool %p config.", pool); + else + { + gst_buffer_pool_config_set_params(config, caps, + info.size, 0, 0); + if (!gst_buffer_pool_set_config(pool, config)) + GST_ERROR("Failed to set pool %p config.", pool); + } + + gst_query_add_allocation_pool(query, pool, info.size, 0, 0); + + GST_INFO("Proposing pool %p, buffer size %#zx, for query %p.", + pool, info.size, query); + + g_object_unref(pool); + return true; + } + default: + GST_WARNING("Ignoring \"%s\" query.", gst_query_type_get_name(query->type)); + break; + } + + return gst_pad_query_default(pad, parent, query); +} + static gboolean transform_sink_event_cb(GstPad *pad, GstObject *parent, GstEvent *event) { struct wg_transform *transform = gst_pad_get_element_private(pad); @@ -252,6 +313,7 @@ NTSTATUS wg_transform_create(void *args) gst_pad_set_element_private(transform->my_sink, transform); gst_pad_set_event_function(transform->my_sink, transform_sink_event_cb); + gst_pad_set_query_function(transform->my_sink, transform_sink_query_cb); gst_pad_set_chain_function(transform->my_sink, transform_sink_chain_cb); /* Since we append conversion elements, we don't want to filter decoders

1 0

Nikolay Sivov : secur32: Get rid of buffer iteration callback in unixlib.
by Alexandre Julliard June 2, 2022

June 2, 2022

Module: wine Branch: master Commit: abf8ba51b6b8b5a83cfc0c490436c8bbff0a8ce3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=abf8ba51b6b8b5a83cfc0c49… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 31 09:41:21 2022 +0300 secur32: Get rid of buffer iteration callback in unixlib. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/secur32/schannel_gnutls.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 44ad7c2c1da..0657f9ab064 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -147,7 +147,6 @@ struct schan_buffers SIZE_T limit; const SecBufferDesc *desc; int current_buffer_idx; - int (*get_next_buffer)(struct schan_buffers *); }; struct schan_transport @@ -226,17 +225,15 @@ static void compat_gnutls_dtls_set_timeouts(gnutls_session_t session, unsigned i FIXME("\n"); } -static void init_schan_buffers(struct schan_buffers *s, const PSecBufferDesc desc, - int (*get_next_buffer)(struct schan_buffers *)) +static void init_schan_buffers(struct schan_buffers *s, const PSecBufferDesc desc) { s->offset = 0; s->limit = ~0UL; s->desc = desc; s->current_buffer_idx = -1; - s->get_next_buffer = get_next_buffer; } -static int common_get_next_buffer(struct schan_buffers *s) +static int get_next_buffer(struct schan_buffers *s) { if (s->current_buffer_idx == -1) return s->desc->cBuffers ? 0 : -1; @@ -259,7 +256,7 @@ static char *get_buffer(struct schan_buffers *s, SIZE_T *count) if (s->current_buffer_idx == -1) { /* Initial buffer */ - int buffer_idx = s->get_next_buffer(s); + int buffer_idx = get_next_buffer(s); if (buffer_idx == -1) { TRACE("No next buffer\n"); @@ -280,7 +277,7 @@ static char *get_buffer(struct schan_buffers *s, SIZE_T *count) { int buffer_idx; - buffer_idx = s->get_next_buffer(s); + buffer_idx = get_next_buffer(s); if (buffer_idx == -1) { TRACE("No next buffer\n"); @@ -518,9 +515,9 @@ static NTSTATUS schan_handshake( void *args ) NTSTATUS status; int err; - init_schan_buffers(&t->in, params->input, common_get_next_buffer); + init_schan_buffers(&t->in, params->input); t->in.limit = params->input_size; - init_schan_buffers(&t->out, params->output, common_get_next_buffer); + init_schan_buffers(&t->out, params->output); while (1) { @@ -785,7 +782,7 @@ static NTSTATUS schan_send( void *args ) struct schan_transport *t = (struct schan_transport *)pgnutls_transport_get_ptr(s); SSIZE_T ret, total = 0; - init_schan_buffers(&t->out, params->output, common_get_next_buffer); + init_schan_buffers(&t->out, params->output); for (;;) { @@ -825,7 +822,7 @@ static NTSTATUS schan_recv( void *args ) ssize_t ret; SECURITY_STATUS status = SEC_E_OK; - init_schan_buffers(&t->in, params->input, common_get_next_buffer); + init_schan_buffers(&t->in, params->input); t->in.limit = params->input_size; while (received < data_size)

1 0

Nikolay Sivov : secur32: Remove unused pointer parameter from send request.
by Alexandre Julliard June 2, 2022

June 2, 2022

Module: wine Branch: master Commit: 086e950a2b3738bda0ab1080977f1a2915f0e8e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=086e950a2b3738bda0ab1080… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 31 11:29:41 2022 +0300 secur32: Remove unused pointer parameter from send request. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/secur32/schannel.c | 9 +-------- dlls/secur32/schannel_gnutls.c | 6 +++--- dlls/secur32/secur32_priv.h | 2 +- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 050a0a6da4c..794ceff1ecf 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -1297,7 +1297,6 @@ static SECURITY_STATUS SEC_ENTRY schan_EncryptMessage(PCtxtHandle context_handle SECURITY_STATUS status; SecBuffer *buffer; SIZE_T data_size; - SIZE_T length; char *data; int output_buffer_idx = -1; ULONG output_offset = 0; @@ -1353,11 +1352,10 @@ static SECURITY_STATUS SEC_ENTRY schan_EncryptMessage(PCtxtHandle context_handle buffer_index[1] = data_idx; buffer_index[2] = trailer_idx; - length = data_size; params.session = ctx->session; params.output = &output_desc; params.buffer = data; - params.length = &length; + params.length = data_size; params.output_buffer_idx = &output_buffer_idx; params.output_offset = &output_offset; status = GNUTLS_CALL( send, &params ); @@ -1365,11 +1363,6 @@ static SECURITY_STATUS SEC_ENTRY schan_EncryptMessage(PCtxtHandle context_handle if (!status) message->pBuffers[buffer_index[output_buffer_idx]].cbBuffer = output_offset; - TRACE("Sent %Id bytes.\n", length); - - if (length != data_size) - status = SEC_E_INTERNAL_ERROR; - free(data); TRACE("Returning %#lx.\n", status); diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 0657f9ab064..4d7711f32a2 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -786,12 +786,12 @@ static NTSTATUS schan_send( void *args ) for (;;) { - ret = pgnutls_record_send(s, (const char *)params->buffer + total, *params->length - total); + ret = pgnutls_record_send(s, (const char *)params->buffer + total, params->length - total); if (ret >= 0) { total += ret; - TRACE( "sent %ld now %ld/%ld\n", ret, total, *params->length ); - if (total == *params->length) break; + TRACE( "sent %ld now %ld/%u\n", ret, total, (unsigned)params->length ); + if (total == params->length) break; } else if (ret == GNUTLS_E_AGAIN) { diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 8a494309710..edbe1ccc36e 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -166,7 +166,7 @@ struct send_params schan_session session; SecBufferDesc *output; const void *buffer; - SIZE_T *length; + ULONG length; int *output_buffer_idx; ULONG *output_offset; };

1 0

Rémi Bernon : winegstreamer: Support mapping of MF_MT_MINIMUM_DISPLAY_APERTURE.
by Alexandre Julliard June 2, 2022

June 2, 2022

Module: wine Branch: master Commit: 9c711ba7488d78a91e133083567e56feb446a7c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c711ba7488d78a91e133083… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 23 16:41:36 2022 +0200 winegstreamer: Support mapping of MF_MT_MINIMUM_DISPLAY_APERTURE. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mf/tests/mf.c | 40 +++++++++++++++++++-------------------- dlls/winegstreamer/h264_decoder.c | 16 ++++++++++++++++ dlls/winegstreamer/mfplat.c | 25 ++++++++++++++++++++++++ dlls/winegstreamer/unixlib.h | 1 + dlls/winegstreamer/wg_format.c | 3 ++- dlls/winegstreamer/wg_transform.c | 23 ++++++++++++++++++++++ 6 files changed, 87 insertions(+), 21 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9c711ba7488d78a91e13…

1 0

Bernhard Kölbl : windows.media.speech: Add some comments to describe the code regions in synthesizer.c.
by Alexandre Julliard June 2, 2022

June 2, 2022

Module: wine Branch: master Commit: 2cee81537f4cc0a8dc6b37e23a0f58faaa26b536 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cee81537f4cc0a8dc6b37e2… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Thu Jun 2 16:09:35 2022 +0200 windows.media.speech: Add some comments to describe the code regions in synthesizer.c. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/synthesizer.c | 48 +++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/windows.media.speech/synthesizer.c b/dlls/windows.media.speech/synthesizer.c index 3aa04ed9fbd..e8c9f0a280d 100644 --- a/dlls/windows.media.speech/synthesizer.c +++ b/dlls/windows.media.speech/synthesizer.c @@ -23,6 +23,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(speech); +/* + * + * IVectorView_VoiceInformation + * + */ + struct voice_information_vector { IVectorView_VoiceInformation IVectorView_VoiceInformation_iface; @@ -140,6 +146,12 @@ static struct voice_information_vector all_voices = 0 }; +/* + * + * SpeechSynthesizer runtimeclass + * + */ + struct synthesizer { ISpeechSynthesizer ISpeechSynthesizer_iface; @@ -148,6 +160,12 @@ struct synthesizer LONG ref; }; +/* + * + * ISpeechSynthesizer for SpeechSynthesizer runtimeclass + * + */ + static inline struct synthesizer *impl_from_ISpeechSynthesizer( ISpeechSynthesizer *iface ) { return CONTAINING_RECORD(iface, struct synthesizer, ISpeechSynthesizer_iface); @@ -266,6 +284,12 @@ static const struct ISpeechSynthesizerVtbl synthesizer_vtbl = synthesizer_get_Voice, }; +/* + * + * ISpeechSynthesizer2 for SpeechSynthesizer runtimeclass + * + */ + DEFINE_IINSPECTABLE(synthesizer2, ISpeechSynthesizer2, struct synthesizer, ISpeechSynthesizer_iface) static HRESULT WINAPI synthesizer2_get_Options( ISpeechSynthesizer2 *iface, ISpeechSynthesizerOptions **value ) @@ -288,6 +312,12 @@ static const struct ISpeechSynthesizer2Vtbl synthesizer2_vtbl = synthesizer2_get_Options, }; +/* + * + * IClosable for SpeechSynthesizer runtimeclass + * + */ + DEFINE_IINSPECTABLE(closable, IClosable, struct synthesizer, ISpeechSynthesizer_iface) static HRESULT WINAPI closable_Close( IClosable *iface ) @@ -310,6 +340,12 @@ static const struct IClosableVtbl closable_vtbl = closable_Close, }; +/* + * + * Static interfaces for SpeechSynthesizer runtimeclass + * + */ + struct synthesizer_statics { IActivationFactory IActivationFactory_iface; @@ -317,6 +353,12 @@ struct synthesizer_statics LONG ref; }; +/* + * + * IActivationFactory for SpeechSynthesizer runtimeclass + * + */ + static inline struct synthesizer_statics *impl_from_IActivationFactory( IActivationFactory *iface ) { return CONTAINING_RECORD(iface, struct synthesizer_statics, IActivationFactory_iface); @@ -416,6 +458,12 @@ static const struct IActivationFactoryVtbl factory_vtbl = factory_ActivateInstance, }; +/* + * + * IInstalledVoicesStatic for SpeechSynthesizer runtimeclass + * + */ + DEFINE_IINSPECTABLE(installed_voices_static, IInstalledVoicesStatic, struct synthesizer_statics, IActivationFactory_iface) static HRESULT WINAPI installed_voices_static_get_AllVoices( IInstalledVoicesStatic *iface, IVectorView_VoiceInformation **value )

1 0