July 2024 - Wine-Commits - list.winehq.org

Rémi Bernon : win32u: Pass whether window is shaped to drivers WindowPosChanging.
by Alexandre Julliard July 5, 2024

July 5, 2024

Module: wine Branch: master Commit: 81282091241e157a5b41951838a1f5c797400abd URL: https://gitlab.winehq.org/wine/wine/-/commit/81282091241e157a5b41951838a1f5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 28 11:24:39 2024 +0200 win32u: Pass whether window is shaped to drivers WindowPosChanging. --- dlls/win32u/driver.c | 2 +- dlls/win32u/window.c | 9 +++++++-- dlls/wineandroid.drv/android.h | 3 ++- dlls/wineandroid.drv/window.c | 9 +++++---- dlls/winemac.drv/macdrv.h | 3 ++- dlls/winemac.drv/window.c | 8 +++++--- dlls/winewayland.drv/waylanddrv.h | 3 ++- dlls/winewayland.drv/window.c | 9 +++++---- dlls/winex11.drv/window.c | 8 +++++++- dlls/winex11.drv/x11drv.h | 3 ++- include/wine/gdi_driver.h | 4 ++-- 11 files changed, 40 insertions(+), 21 deletions(-)

1 0

Rémi Bernon : win32u: Pass the window surface rect for CreateLayeredWindow.
by Alexandre Julliard July 5, 2024

July 5, 2024

Module: wine Branch: master Commit: 27f63ff1cd7daeb47b0c396b5c842e73a3a34584 URL: https://gitlab.winehq.org/wine/wine/-/commit/27f63ff1cd7daeb47b0c396b5c842e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 27 18:21:19 2024 +0200 win32u: Pass the window surface rect for CreateLayeredWindow. Cropping and rounding it similarly to non-layered window surfaces. --- dlls/win32u/driver.c | 6 +++--- dlls/win32u/window.c | 3 ++- dlls/wineandroid.drv/android.h | 2 +- dlls/wineandroid.drv/window.c | 10 +++------- dlls/winemac.drv/surface.c | 10 +++------- dlls/winex11.drv/bitblt.c | 10 +++------- dlls/winex11.drv/x11drv.h | 2 +- 7 files changed, 16 insertions(+), 27 deletions(-) diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 7918945b625..4bc49619970 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -867,7 +867,7 @@ static LRESULT nulldrv_SysCommand( HWND hwnd, WPARAM wparam, LPARAM lparam ) return -1; } -static BOOL nulldrv_CreateLayeredWindow( HWND hwnd, const RECT *window_rect, COLORREF color_key, +static BOOL nulldrv_CreateLayeredWindow( HWND hwnd, const RECT *surface_rect, COLORREF color_key, struct window_surface **surface ) { *surface = NULL; @@ -1217,10 +1217,10 @@ static void loaderdrv_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) load_driver()->pSetWindowRgn( hwnd, hrgn, redraw ); } -static BOOL loaderdrv_CreateLayeredWindow( HWND hwnd, const RECT *window_rect, COLORREF color_key, +static BOOL loaderdrv_CreateLayeredWindow( HWND hwnd, const RECT *surface_rect, COLORREF color_key, struct window_surface **surface ) { - return load_driver()->pCreateLayeredWindow( hwnd, window_rect, color_key, surface ); + return load_driver()->pCreateLayeredWindow( hwnd, surface_rect, color_key, surface ); } static void loaderdrv_UpdateLayeredWindow( HWND hwnd, const RECT *window_rect, COLORREF color_key, diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 2b65bb635c9..b63392b1f2d 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -2202,7 +2202,7 @@ BOOL WINAPI NtUserUpdateLayeredWindow( HWND hwnd, HDC hdc_dst, const POINT *pts_ if (surface) window_surface_release( surface ); if (!(flags & ULW_COLORKEY)) key = CLR_INVALID; - if (!(user_driver->pCreateLayeredWindow( hwnd, &window_rect, key, &surface )) || !surface) return FALSE; + if (!(user_driver->pCreateLayeredWindow( hwnd, &surface_rect, key, &surface )) || !surface) return FALSE; if (!hdc_src) ret = TRUE; else @@ -2213,6 +2213,7 @@ BOOL WINAPI NtUserUpdateLayeredWindow( HWND hwnd, HDC hdc_dst, const POINT *pts_ HDC hdc = NULL; OffsetRect( &rect, -rect.left, -rect.top ); + intersect_rect( &rect, &rect, &surface_rect ); if (!(hdc = NtGdiCreateCompatibleDC( 0 ))) goto done; window_surface_lock( surface ); diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h index c92240c40bc..3f0329bac10 100644 --- a/dlls/wineandroid.drv/android.h +++ b/dlls/wineandroid.drv/android.h @@ -98,7 +98,7 @@ extern void ANDROID_SetParent( HWND hwnd, HWND parent, HWND old_parent ); extern void ANDROID_SetCapture( HWND hwnd, UINT flags ); extern void ANDROID_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style ); extern UINT ANDROID_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ); -extern BOOL ANDROID_CreateLayeredWindow( HWND hwnd, const RECT *window_rect, COLORREF color_key, +extern BOOL ANDROID_CreateLayeredWindow( HWND hwnd, const RECT *surface_rect, COLORREF color_key, struct window_surface **surface ); extern LRESULT ANDROID_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ); extern BOOL ANDROID_WindowPosChanging( HWND hwnd, UINT swp_flags, const RECT *window_rect, const RECT *client_rect, RECT *visible_rect ); diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 1ee542455a3..73f2c0b9897 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -1305,18 +1305,14 @@ void ANDROID_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alpha, DW /***************************************************************************** * ANDROID_CreateLayeredWindow */ -BOOL ANDROID_CreateLayeredWindow( HWND hwnd, const RECT *window_rect, COLORREF color_key, +BOOL ANDROID_CreateLayeredWindow( HWND hwnd, const RECT *surface_rect, COLORREF color_key, struct window_surface **window_surface ) { struct window_surface *surface; struct android_win_data *data; - RECT rect; if (!(data = get_win_data( hwnd ))) return FALSE; - rect = *window_rect; - OffsetRect( &rect, -window_rect->left, -window_rect->top ); - surface = data->surface; if (!is_argb_surface( surface )) { @@ -1324,9 +1320,9 @@ BOOL ANDROID_CreateLayeredWindow( HWND hwnd, const RECT *window_rect, COLORREF c surface = NULL; } - if (!surface || !EqualRect( &surface->rect, &rect )) + if (!surface || !EqualRect( &surface->rect, surface_rect )) { - data->surface = create_surface( data->hwnd, &rect, 255, color_key, TRUE ); + data->surface = create_surface( data->hwnd, surface_rect, 255, color_key, TRUE ); if (surface) window_surface_release( surface ); surface = data->surface; } diff --git a/dlls/winemac.drv/surface.c b/dlls/winemac.drv/surface.c index e4f140a898e..d8a49674a5b 100644 --- a/dlls/winemac.drv/surface.c +++ b/dlls/winemac.drv/surface.c @@ -226,25 +226,21 @@ done: /*********************************************************************** * CreateLayeredWindow (MACDRV.@) */ -BOOL macdrv_CreateLayeredWindow(HWND hwnd, const RECT *window_rect, COLORREF color_key, +BOOL macdrv_CreateLayeredWindow(HWND hwnd, const RECT *surface_rect, COLORREF color_key, struct window_surface **window_surface) { struct window_surface *surface; struct macdrv_win_data *data; - RECT rect; if (!(data = get_win_data(hwnd))) return FALSE; data->layered = TRUE; data->ulw_layered = TRUE; - rect = *window_rect; - OffsetRect(&rect, -window_rect->left, -window_rect->top); - surface = data->surface; - if (!surface || !EqualRect(&surface->rect, &rect)) + if (!surface || !EqualRect(&surface->rect, surface_rect)) { - data->surface = create_surface(data->hwnd, data->cocoa_window, &rect, NULL, TRUE); + data->surface = create_surface(data->hwnd, data->cocoa_window, surface_rect, NULL, TRUE); if (surface) window_surface_release(surface); surface = data->surface; if (data->unminimized_surface) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index c28a4d2d9a3..28723425029 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -2172,25 +2172,21 @@ done: /***************************************************************************** * CreateLayeredWindow (X11DRV.@) */ -BOOL X11DRV_CreateLayeredWindow( HWND hwnd, const RECT *window_rect, COLORREF color_key, +BOOL X11DRV_CreateLayeredWindow( HWND hwnd, const RECT *surface_rect, COLORREF color_key, struct window_surface **window_surface ) { struct window_surface *surface; struct x11drv_win_data *data; - RECT rect; if (!(data = get_win_data( hwnd ))) return FALSE; data->layered = TRUE; if (!data->embedded && argb_visual.visualid) set_window_visual( data, &argb_visual, TRUE ); - rect = *window_rect; - OffsetRect( &rect, -window_rect->left, -window_rect->top ); - surface = data->surface; - if (!surface || !EqualRect( &surface->rect, &rect )) + if (!surface || !EqualRect( &surface->rect, surface_rect )) { - data->surface = create_surface( data->hwnd, data->whole_window, &data->vis, &rect, + data->surface = create_surface( data->hwnd, data->whole_window, &data->vis, surface_rect, color_key, data->use_alpha ); if (surface) window_surface_release( surface ); surface = data->surface; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 49e4f039b18..1078270eefe 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -240,7 +240,7 @@ extern UINT X11DRV_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ); extern LRESULT X11DRV_SysCommand( HWND hwnd, WPARAM wparam, LPARAM lparam ); extern LRESULT X11DRV_ClipboardWindowProc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ); extern void X11DRV_UpdateClipboard(void); -extern BOOL X11DRV_CreateLayeredWindow( HWND hwnd, const RECT *window_rect, COLORREF color_key, +extern BOOL X11DRV_CreateLayeredWindow( HWND hwnd, const RECT *surface_rect, COLORREF color_key, struct window_surface **surface ); extern void X11DRV_UpdateLayeredWindow( HWND hwnd, const RECT *window_rect, COLORREF color_key, BYTE alpha, UINT flags );

1 0

Rémi Bernon : win32u: Split a new create_window_surface helper from apply_window_pos.
by Alexandre Julliard July 5, 2024

July 5, 2024

Module: wine Branch: master Commit: a149011c2ef87bc587140b42ce30f22cad5edd2e URL: https://gitlab.winehq.org/wine/wine/-/commit/a149011c2ef87bc587140b42ce30f2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jul 1 08:08:27 2024 +0200 win32u: Split a new create_window_surface helper from apply_window_pos. --- dlls/win32u/window.c | 128 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 79 insertions(+), 49 deletions(-)

1 0

Rémi Bernon : win32u: Move offscreen window surface creation fallback.
by Alexandre Julliard July 5, 2024

July 5, 2024

Module: wine Branch: master Commit: 8dd4b62e4c711b15575fbd3f2d205e1646b2c85e URL: https://gitlab.winehq.org/wine/wine/-/commit/8dd4b62e4c711b15575fbd3f2d205e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 27 18:10:25 2024 +0200 win32u: Move offscreen window surface creation fallback. --- dlls/win32u/window.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 841ab220074..8f36f913415 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -1841,7 +1841,7 @@ static BOOL apply_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, { WND *win; HWND surface_win = 0; - BOOL ret, needs_surface, needs_update = FALSE; + BOOL ret, needs_surface, needs_update = FALSE, layered, ulw_layered = FALSE; RECT surface_rect, visible_rect = *window_rect, old_visible_rect, old_window_rect, old_client_rect, extra_rects[3]; struct window_surface *old_surface, *new_surface; @@ -1856,6 +1856,16 @@ static BOOL apply_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, if (!needs_surface || IsRectEmpty( &visible_rect )) needs_surface = FALSE; /* use default surface */ else needs_surface = !user_driver->pCreateWindowSurface( hwnd, &surface_rect, &new_surface ); + if ((layered = !!(get_window_long( hwnd, GWL_EXSTYLE ) & WS_EX_LAYERED))) + ulw_layered = !NtUserGetLayeredWindowAttributes( hwnd, NULL, NULL, NULL ); + + /* create or update window surface for top-level windows if the driver doesn't implement CreateWindowSurface */ + if (needs_surface && new_surface == &dummy_surface && (!layered || !ulw_layered)) + { + window_surface_release( new_surface ); + create_offscreen_window_surface( hwnd, &surface_rect, &new_surface ); + } + get_window_rects( hwnd, COORDS_SCREEN, &old_window_rect, NULL, get_thread_dpi() ); if (IsRectEmpty( &valid_rects[0] )) valid_rects = NULL; @@ -1865,15 +1875,6 @@ static BOOL apply_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, return FALSE; } - /* create or update window surface for top-level windows if the driver doesn't implement WindowPosChanging */ - if (needs_surface && new_surface && (!(get_window_long( hwnd, GWL_EXSTYLE ) & WS_EX_LAYERED) || - NtUserGetLayeredWindowAttributes( hwnd, NULL, NULL, NULL ))) - { - window_surface_release( new_surface ); - if ((new_surface = win->surface)) window_surface_add_ref( new_surface ); - create_offscreen_window_surface( hwnd, &surface_rect, &new_surface ); - } - old_visible_rect = win->visible_rect; old_client_rect = win->client_rect; old_surface = win->surface;

1 0

Ziqing Hui : winegstreamer/video_encoder: Implement ProcessMessage.
by Alexandre Julliard July 5, 2024

July 5, 2024

Module: wine Branch: master Commit: aaea7027c73582adc7d5cf7ff06e50bb191ed883 URL: https://gitlab.winehq.org/wine/wine/-/commit/aaea7027c73582adc7d5cf7ff06e50… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Jul 4 11:34:28 2024 +0800 winegstreamer/video_encoder: Implement ProcessMessage. --- dlls/winegstreamer/video_encoder.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/video_encoder.c b/dlls/winegstreamer/video_encoder.c index 874e89d4423..ee27175ee4f 100644 --- a/dlls/winegstreamer/video_encoder.c +++ b/dlls/winegstreamer/video_encoder.c @@ -475,8 +475,22 @@ static HRESULT WINAPI transform_ProcessEvent(IMFTransform *iface, DWORD id, IMFM static HRESULT WINAPI transform_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_TYPE message, ULONG_PTR param) { - FIXME("iface %p, message %#x, param %Ix.\n", iface, message, param); - return E_NOTIMPL; + struct video_encoder *encoder = impl_from_IMFTransform(iface); + + TRACE("iface %p, message %#x, param %Ix.\n", iface, message, param); + + switch (message) + { + case MFT_MESSAGE_COMMAND_DRAIN: + return wg_transform_drain(encoder->wg_transform); + + case MFT_MESSAGE_COMMAND_FLUSH: + return wg_transform_flush(encoder->wg_transform); + + default: + FIXME("Ignoring message %#x.\n", message); + return S_OK; + } } static HRESULT WINAPI transform_ProcessInput(IMFTransform *iface, DWORD id, IMFSample *sample, DWORD flags)

1 0

Ziqing Hui : winegstreamer/video_encoder: Implement ProcessInput.
by Alexandre Julliard July 5, 2024

July 5, 2024

Module: wine Branch: master Commit: 2bb40c7625411ea10eadc43ef3f4bf86426750f4 URL: https://gitlab.winehq.org/wine/wine/-/commit/2bb40c7625411ea10eadc43ef3f4bf… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Jul 4 11:29:18 2024 +0800 winegstreamer/video_encoder: Implement ProcessInput. --- dlls/winegstreamer/video_encoder.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/video_encoder.c b/dlls/winegstreamer/video_encoder.c index 984be4dcd3a..874e89d4423 100644 --- a/dlls/winegstreamer/video_encoder.c +++ b/dlls/winegstreamer/video_encoder.c @@ -481,8 +481,14 @@ static HRESULT WINAPI transform_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_ static HRESULT WINAPI transform_ProcessInput(IMFTransform *iface, DWORD id, IMFSample *sample, DWORD flags) { - FIXME("iface %p, id %#lx, sample %p, flags %#lx.\n", iface, id, sample, flags); - return E_NOTIMPL; + struct video_encoder *encoder = impl_from_IMFTransform(iface); + + TRACE("iface %p, id %#lx, sample %p, flags %#lx.\n", iface, id, sample, flags); + + if (!encoder->wg_transform) + return MF_E_TRANSFORM_TYPE_NOT_SET; + + return wg_transform_push_mf(encoder->wg_transform, sample, encoder->wg_sample_queue); } static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags, DWORD count,

1 0

Ziqing Hui : winegstreamer/video_encoder: Create wg_transform.
by Alexandre Julliard July 5, 2024

July 5, 2024

Module: wine Branch: master Commit: 7cd172a6fb20a1e34e7e73c2c5f828b0db19d455 URL: https://gitlab.winehq.org/wine/wine/-/commit/7cd172a6fb20a1e34e7e73c2c5f828… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Jul 4 11:27:48 2024 +0800 winegstreamer/video_encoder: Create wg_transform. --- dlls/winegstreamer/video_encoder.c | 49 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/video_encoder.c b/dlls/winegstreamer/video_encoder.c index ce9a82dff2f..984be4dcd3a 100644 --- a/dlls/winegstreamer/video_encoder.c +++ b/dlls/winegstreamer/video_encoder.c @@ -49,6 +49,10 @@ struct video_encoder MFT_OUTPUT_STREAM_INFO output_info; IMFAttributes *attributes; + + wg_transform_t wg_transform; + struct wg_transform_attrs wg_transform_attrs; + struct wg_sample_queue *wg_sample_queue; }; static inline struct video_encoder *impl_from_IMFTransform(IMFTransform *iface) @@ -96,6 +100,18 @@ done: return hr; } +static HRESULT video_encoder_try_create_wg_transform(struct video_encoder *encoder) +{ + if (encoder->wg_transform) + { + wg_transform_destroy(encoder->wg_transform); + encoder->wg_transform = 0; + } + + return wg_transform_create_mf(encoder->input_type, encoder->output_type, + &encoder->wg_transform_attrs, &encoder->wg_transform); +} + static HRESULT WINAPI transform_QueryInterface(IMFTransform *iface, REFIID iid, void **out) { struct video_encoder *encoder = impl_from_IMFTransform(iface); @@ -139,6 +155,9 @@ static ULONG WINAPI transform_Release(IMFTransform *iface) if (encoder->output_type) IMFMediaType_Release(encoder->output_type); IMFAttributes_Release(encoder->attributes); + if (encoder->wg_transform) + wg_transform_destroy(encoder->wg_transform); + wg_sample_queue_destroy(encoder->wg_sample_queue); free(encoder); } @@ -274,7 +293,11 @@ static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFM IMFMediaType_Release(encoder->input_type); encoder->input_type = NULL; } - + if (encoder->wg_transform) + { + wg_transform_destroy(encoder->wg_transform); + encoder->wg_transform = 0; + } return S_OK; } @@ -309,7 +332,13 @@ static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFM IMFMediaType_Release(encoder->input_type); IMFMediaType_AddRef((encoder->input_type = type)); - return S_OK; + if (FAILED(hr = video_encoder_try_create_wg_transform(encoder))) + { + IMFMediaType_Release(encoder->input_type); + encoder->input_type = NULL; + } + + return hr; } static HRESULT WINAPI transform_SetOutputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) @@ -334,6 +363,11 @@ static HRESULT WINAPI transform_SetOutputType(IMFTransform *iface, DWORD id, IMF IMFMediaType_Release(encoder->output_type); encoder->output_type = NULL; } + if (encoder->wg_transform) + { + wg_transform_destroy(encoder->wg_transform); + encoder->wg_transform = 0; + } return S_OK; } @@ -373,6 +407,12 @@ static HRESULT WINAPI transform_SetOutputType(IMFTransform *iface, DWORD id, IMF /* FIXME: Add MF_MT_MPEG_SEQUENCE_HEADER attribute. */ + if (encoder->wg_transform) + { + wg_transform_destroy(encoder->wg_transform); + encoder->wg_transform = 0; + } + return S_OK; } @@ -499,11 +539,16 @@ static HRESULT video_encoder_create(const GUID *const *input_types, UINT input_t encoder->output_types = output_types; encoder->output_type_count = output_type_count; + encoder->wg_transform_attrs.input_queue_length = 15; + if (FAILED(hr = MFCreateAttributes(&encoder->attributes, 16))) goto failed; if (FAILED(hr = IMFAttributes_SetUINT32(encoder->attributes, &MFT_ENCODER_SUPPORTS_CONFIG_EVENT, TRUE))) goto failed; + if (FAILED(hr = wg_sample_queue_create(&encoder->wg_sample_queue))) + goto failed; + *out = encoder; TRACE("Created video encoder %p\n", encoder); return S_OK;

1 0

Ziqing Hui : winegstreamer/video_encoder: Rename create_input_type to video_encoder_create_input_type.
by Alexandre Julliard July 5, 2024

July 5, 2024

Module: wine Branch: master Commit: edebd07338b285c94830401251cb288fdc771b13 URL: https://gitlab.winehq.org/wine/wine/-/commit/edebd07338b285c94830401251cb28… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Jul 4 10:44:45 2024 +0800 winegstreamer/video_encoder: Rename create_input_type to video_encoder_create_input_type. --- dlls/winegstreamer/video_encoder.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/video_encoder.c b/dlls/winegstreamer/video_encoder.c index 2cb73ca89db..1e70a38c7a4 100644 --- a/dlls/winegstreamer/video_encoder.c +++ b/dlls/winegstreamer/video_encoder.c @@ -56,7 +56,8 @@ static inline struct video_encoder *impl_from_IMFTransform(IMFTransform *iface) return CONTAINING_RECORD(iface, struct video_encoder, IMFTransform_iface); } -static HRESULT create_input_type(struct video_encoder *encoder, const GUID *subtype, IMFMediaType **out) +static HRESULT video_encoder_create_input_type(struct video_encoder *encoder, + const GUID *subtype, IMFMediaType **out) { IMFVideoMediaType *input_type; UINT64 ratio; @@ -239,7 +240,7 @@ static HRESULT WINAPI transform_GetInputAvailableType(IMFTransform *iface, DWORD if (index >= encoder->input_type_count) return MF_E_NO_MORE_TYPES; - return create_input_type(encoder, encoder->input_types[index], type); + return video_encoder_create_input_type(encoder, encoder->input_types[index], type); } static HRESULT WINAPI transform_GetOutputAvailableType(IMFTransform *iface, DWORD id, @@ -293,7 +294,7 @@ static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFM if (i == encoder->input_type_count) return MF_E_INVALIDMEDIATYPE; - if (FAILED(hr = create_input_type(encoder, &subtype, &good_input_type))) + if (FAILED(hr = video_encoder_create_input_type(encoder, &subtype, &good_input_type))) return hr; hr = IMFMediaType_Compare(good_input_type, (IMFAttributes *)type, MF_ATTRIBUTES_MATCH_OUR_ITEMS, &result);

1 0

Ziqing Hui : winegstreamer/video_encoder: Clear input type when setting output type.
by Alexandre Julliard July 5, 2024

July 5, 2024

Module: wine Branch: master Commit: 8b7674a551f923d14259eb29d28150905d66fb8c URL: https://gitlab.winehq.org/wine/wine/-/commit/8b7674a551f923d14259eb29d28150… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Jul 5 10:06:32 2024 +0800 winegstreamer/video_encoder: Clear input type when setting output type. --- dlls/winegstreamer/video_encoder.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/winegstreamer/video_encoder.c b/dlls/winegstreamer/video_encoder.c index 1e70a38c7a4..ce9a82dff2f 100644 --- a/dlls/winegstreamer/video_encoder.c +++ b/dlls/winegstreamer/video_encoder.c @@ -361,6 +361,12 @@ static HRESULT WINAPI transform_SetOutputType(IMFTransform *iface, DWORD id, IMF || FAILED(IMFMediaType_GetUINT32(type, &MF_MT_INTERLACE_MODE, &uint32_value))) return MF_E_INVALIDMEDIATYPE; + if (encoder->input_type) + { + IMFMediaType_Release(encoder->input_type); + encoder->input_type = NULL; + } + if (encoder->output_type) IMFMediaType_Release(encoder->output_type); IMFMediaType_AddRef((encoder->output_type = type));

1 0

Mohamad Al-Jaf : windows.web: Implement IJsonValueStatics::CreateStringValue().
by Alexandre Julliard July 5, 2024

July 5, 2024

Module: wine Branch: master Commit: a584b81436381e627e83dcd793d8d602cf568701 URL: https://gitlab.winehq.org/wine/wine/-/commit/a584b81436381e627e83dcd793d8d6… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Wed Jul 3 02:13:11 2024 -0400 windows.web: Implement IJsonValueStatics::CreateStringValue(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56914 --- dlls/windows.web/json_value.c | 157 +++++++++++++++++++++++++++++++++++++++++- dlls/windows.web/tests/web.c | 6 +- 2 files changed, 157 insertions(+), 6 deletions(-) diff --git a/dlls/windows.web/json_value.c b/dlls/windows.web/json_value.c index 98d41d2c7cf..87b3365f199 100644 --- a/dlls/windows.web/json_value.c +++ b/dlls/windows.web/json_value.c @@ -115,6 +115,142 @@ static const struct IActivationFactoryVtbl factory_vtbl = factory_ActivateInstance, }; +struct json_value +{ + IJsonValue IJsonValue_iface; + LONG ref; + + HSTRING string_value; +}; + +static inline struct json_value *impl_from_IJsonValue( IJsonValue *iface ) +{ + return CONTAINING_RECORD( iface, struct json_value, IJsonValue_iface ); +} + +static HRESULT WINAPI json_value_QueryInterface( IJsonValue *iface, REFIID iid, void **out ) +{ + struct json_value *impl = impl_from_IJsonValue( iface ); + + TRACE( "iface %p, iid %s, out %p.\n", iface, debugstr_guid( iid ), out ); + + if (IsEqualGUID( iid, &IID_IUnknown ) || + IsEqualGUID( iid, &IID_IInspectable ) || + IsEqualGUID( iid, &IID_IAgileObject ) || + IsEqualGUID( iid, &IID_IJsonValue )) + { + *out = &impl->IJsonValue_iface; + IInspectable_AddRef( *out ); + return S_OK; + } + + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI json_value_AddRef( IJsonValue *iface ) +{ + struct json_value *impl = impl_from_IJsonValue( iface ); + ULONG ref = InterlockedIncrement( &impl->ref ); + TRACE( "iface %p increasing refcount to %lu.\n", iface, ref ); + return ref; +} + +static ULONG WINAPI json_value_Release( IJsonValue *iface ) +{ + struct json_value *impl = impl_from_IJsonValue( iface ); + ULONG ref = InterlockedDecrement( &impl->ref ); + + TRACE( "iface %p decreasing refcount to %lu.\n", iface, ref ); + + if (!ref) + { + WindowsDeleteString( impl->string_value ); + free( impl ); + } + return ref; +} + +static HRESULT WINAPI json_value_GetIids( IJsonValue *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 json_value_GetRuntimeClassName( IJsonValue *iface, HSTRING *class_name ) +{ + FIXME( "iface %p, class_name %p stub!\n", iface, class_name ); + return E_NOTIMPL; +} + +static HRESULT WINAPI json_value_GetTrustLevel( IJsonValue *iface, TrustLevel *trust_level ) +{ + FIXME( "iface %p, trust_level %p stub!\n", iface, trust_level ); + return E_NOTIMPL; +} + +static HRESULT WINAPI json_value_get_ValueType( IJsonValue *iface, JsonValueType *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI json_value_Stringify( IJsonValue *iface, HSTRING *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI json_value_GetString( IJsonValue *iface, HSTRING *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI json_value_GetNumber( IJsonValue *iface, DOUBLE *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI json_value_GetBoolean( IJsonValue *iface, boolean *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI json_value_GetArray( IJsonValue *iface, IJsonArray **value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI json_value_GetObject( IJsonValue *iface, IJsonObject **value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static const struct IJsonValueVtbl json_value_vtbl = +{ + json_value_QueryInterface, + json_value_AddRef, + json_value_Release, + /* IInspectable methods */ + json_value_GetIids, + json_value_GetRuntimeClassName, + json_value_GetTrustLevel, + /* IJsonValue methods */ + json_value_get_ValueType, + json_value_Stringify, + json_value_GetString, + json_value_GetNumber, + json_value_GetBoolean, + json_value_GetArray, + json_value_GetObject, +}; + DEFINE_IINSPECTABLE( json_value_statics, IJsonValueStatics, struct json_value_statics, IActivationFactory_iface ) static HRESULT WINAPI json_value_statics_Parse( IJsonValueStatics *iface, HSTRING input, IJsonValue **value ) @@ -143,8 +279,25 @@ static HRESULT WINAPI json_value_statics_CreateNumberValue( IJsonValueStatics *i static HRESULT WINAPI json_value_statics_CreateStringValue( IJsonValueStatics *iface, HSTRING input, IJsonValue **value ) { - FIXME( "iface %p, input %s, value %p stub!\n", iface, debugstr_hstring( input ), value ); - return E_NOTIMPL; + struct json_value *impl; + HRESULT hr; + + TRACE( "iface %p, input %s, value %p\n", iface, debugstr_hstring( input ), value ); + + if (!value) return E_POINTER; + if (!(impl = calloc( 1, sizeof(*impl) ))) return E_OUTOFMEMORY; + + impl->IJsonValue_iface.lpVtbl = &json_value_vtbl; + impl->ref = 1; + if (FAILED(hr = WindowsDuplicateString( input, &impl->string_value ))) + { + free( impl ); + return hr; + } + + *value = &impl->IJsonValue_iface; + TRACE( "created IJsonValue %p.\n", *value ); + return S_OK; } static const struct IJsonValueStaticsVtbl json_value_statics_vtbl = diff --git a/dlls/windows.web/tests/web.c b/dlls/windows.web/tests/web.c index 5bb81d44d13..649a1b066ed 100644 --- a/dlls/windows.web/tests/web.c +++ b/dlls/windows.web/tests/web.c @@ -120,20 +120,18 @@ static void test_JsonValueStatics(void) ok( hr == S_OK, "got hr %#lx.\n", hr ); hr = IJsonValueStatics_CreateStringValue( json_value_statics, NULL, (IJsonValue **)&json_value ); - todo_wine ok( hr == S_OK, "got hr %#lx.\n", hr ); if (hr == S_OK) IJsonValue_Release( json_value ); hr = WindowsCreateString( L"Wine", wcslen( L"Wine" ), &str ); ok( hr == S_OK, "got hr %#lx.\n", hr ); hr = IJsonValueStatics_CreateStringValue( json_value_statics, str, NULL ); - todo_wine ok( hr == E_POINTER, "got hr %#lx.\n", hr ); hr = IJsonValueStatics_CreateStringValue( json_value_statics, str, (IJsonValue **)&json_value ); - todo_wine ok( hr == S_OK, "got hr %#lx.\n", hr ); - if (hr == S_OK) IJsonValue_Release( json_value ); WindowsDeleteString( str ); + ref = IJsonValue_Release( json_value ); + ok( ref == 0, "got ref %ld.\n", ref ); ref = IJsonValueStatics_Release( json_value_statics ); ok( ref == 2, "got ref %ld.\n", ref ); ref = IActivationFactory_Release( factory );

1 0