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

Zhiyi Zhang : wined3d: Move device window to the correct output when changing swapchain state to full screen.
by Alexandre Julliard 08 May '20

08 May '20

Module: wine Branch: master Commit: e847b082296547376309f25d9947f2367f98a9ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=e847b082296547376309f25d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu May 7 15:52:12 2020 +0800 wined3d: Move device window to the correct output when changing swapchain state to full screen. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 20 +++++++++++++++----- dlls/wined3d/swapchain.c | 38 +++++++++++++++++++++++++++++++------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 47 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e16bd84164..1711014c8d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4954,6 +4954,12 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, || swapchain_desc->backbuffer_height != current_desc->backbuffer_height; windowed = current_desc->windowed; + if (!(output = wined3d_swapchain_get_output(swapchain))) + { + ERR("Failed to get output from swapchain %p.\n", swapchain); + return E_FAIL; + } + if (!swapchain_desc->windowed != !windowed || swapchain->reapply_mode || mode || (!swapchain_desc->windowed && backbuffer_resized)) { @@ -4971,11 +4977,6 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, } } - if (!(output = wined3d_swapchain_get_output(swapchain))) - { - ERR("Failed to get output from swapchain %p.\n", swapchain); - return E_FAIL; - } if (FAILED(hr = wined3d_swapchain_state_set_fullscreen(&swapchain->state, swapchain_desc, output, mode))) return hr; @@ -4988,13 +4989,22 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, { DWORD style = swapchain_state->style; DWORD exstyle = swapchain_state->exstyle; + struct wined3d_output_desc output_desc; + /* If we're in fullscreen, and the mode wasn't changed, we have to get * the window back into the right position. Some applications * (Battlefield 2, Guild Wars) move it and then call Reset() to clean * up their mess. Guild Wars also loses the device during that. */ + if (FAILED(hr = wined3d_output_get_desc(output, &output_desc))) + { + ERR("Failed to get output description, hr %#x.\n", hr); + return hr; + } + swapchain_state->style = 0; swapchain_state->exstyle = 0; wined3d_swapchain_state_setup_fullscreen(swapchain_state, swapchain_state->device_window, + output_desc.desktop_rect.left, output_desc.desktop_rect.top, swapchain_desc->backbuffer_width, swapchain_desc->backbuffer_height); swapchain_state->style = style; swapchain_state->exstyle = exstyle; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 3071afb8ae..466bcd95ca 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -872,13 +872,14 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc const struct wined3d_swapchain_ops *swapchain_ops) { struct wined3d_resource_desc texture_desc; + struct wined3d_output_desc output_desc; struct wined3d_output *output; BOOL displaymode_set = FALSE; DWORD texture_flags = 0; + HRESULT hr = E_FAIL; RECT client_rect; unsigned int i; HWND window; - HRESULT hr; wined3d_mutex_lock(); @@ -933,8 +934,21 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc } else { - wined3d_swapchain_state_setup_fullscreen(&swapchain->state, - window, desc->backbuffer_width, desc->backbuffer_height); + if (!(output = wined3d_swapchain_get_output(swapchain))) + { + ERR("Failed to get output from swapchain %p.\n", swapchain); + goto err; + } + + if (FAILED(hr = wined3d_output_get_desc(output, &output_desc))) + { + ERR("Failed to get output description, hr %#x.\n", hr); + goto err; + } + + wined3d_swapchain_state_setup_fullscreen(&swapchain->state, window, + output_desc.desktop_rect.left, output_desc.desktop_rect.top, desc->backbuffer_width, + desc->backbuffer_height); } swapchain->state.desc = *desc; wined3d_swapchain_apply_sample_count_override(swapchain, swapchain->state.desc.backbuffer_format, @@ -1551,7 +1565,7 @@ static LONG fullscreen_exstyle(LONG exstyle) } HRESULT wined3d_swapchain_state_setup_fullscreen(struct wined3d_swapchain_state *state, - HWND window, unsigned int w, unsigned int h) + HWND window, int x, int y, int width, int height) { LONG style, exstyle; BOOL filter; @@ -1583,7 +1597,8 @@ HRESULT wined3d_swapchain_state_setup_fullscreen(struct wined3d_swapchain_state SetWindowLongW(window, GWL_STYLE, style); SetWindowLongW(window, GWL_EXSTYLE, exstyle); - SetWindowPos(window, HWND_TOPMOST, 0, 0, w, h, SWP_FRAMECHANGED | SWP_SHOWWINDOW | SWP_NOACTIVATE); + SetWindowPos(window, HWND_TOPMOST, x, y, width, height, + SWP_FRAMECHANGED | SWP_SHOWWINDOW | SWP_NOACTIVATE); wined3d_filter_messages(window, filter); @@ -1647,6 +1662,7 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st const struct wined3d_display_mode *mode) { struct wined3d_display_mode actual_mode; + struct wined3d_output_desc output_desc; HRESULT hr; TRACE("state %p, swapchain_desc %p, output %p, mode %p.\n", @@ -1695,10 +1711,17 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st unsigned int width = actual_mode.width; unsigned int height = actual_mode.height; + if (FAILED(hr = wined3d_output_get_desc(output, &output_desc))) + { + ERR("Failed to get output description, hr %#x.\n", hr); + return hr; + } + if (state->desc.windowed) { /* Switch from windowed to fullscreen */ - if (FAILED(hr = wined3d_swapchain_state_setup_fullscreen(state, state->device_window, width, height))) + if (FAILED(hr = wined3d_swapchain_state_setup_fullscreen(state, state->device_window, + output_desc.desktop_rect.left, output_desc.desktop_rect.top, width, height))) return hr; } else @@ -1708,7 +1731,8 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st /* Fullscreen -> fullscreen mode change */ filter = wined3d_filter_messages(window, TRUE); - MoveWindow(window, 0, 0, width, height, TRUE); + MoveWindow(window, output_desc.desktop_rect.left, output_desc.desktop_rect.top, width, + height, TRUE); ShowWindow(window, SW_SHOW); wined3d_filter_messages(window, filter); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7a412d7a8e..0e20d1fc9b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4720,7 +4720,7 @@ struct wined3d_swapchain_state void wined3d_swapchain_state_restore_from_fullscreen(struct wined3d_swapchain_state *state, HWND window, const RECT *window_rect) DECLSPEC_HIDDEN; HRESULT wined3d_swapchain_state_setup_fullscreen(struct wined3d_swapchain_state *state, - HWND window, unsigned int w, unsigned int h) DECLSPEC_HIDDEN; + HWND window, int x, int y, int width, int height) DECLSPEC_HIDDEN; struct wined3d_swapchain_ops {

1 0

Zhiyi Zhang : dxgi/tests: Add more get swapchain containing output tests.
by Alexandre Julliard 08 May '20

08 May '20

Module: wine Branch: master Commit: c84c7a553d3ac6927565f4652f78edc8e8af093f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c84c7a553d3ac6927565f465… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu May 7 15:54:31 2020 +0800 dxgi/tests: Add more get swapchain containing output tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 251 +++++++++++++++++++++++++++++++------------------ 1 file changed, 161 insertions(+), 90 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c84c7a553d3ac6927565…

1 0

Alexandre Julliard : Release 5.8.
by Alexandre Julliard 08 May '20

08 May '20

Module: wine Branch: master Commit: bf1abbac0c93e46b6b037dbd7f975c8b2f951b2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf1abbac0c93e46b6b037dbd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 8 22:18:56 2020 +0200 Release 5.8. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 970 ++++++++++++++++++++++++++++---------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 448 insertions(+), 543 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bf1abbac0c93e46b6b03…

1 0

Tag wine-5.8 : Alexandre Julliard : Release 5.8
by Alexandre Julliard 08 May '20

08 May '20

Module: wine Branch: refs/tags/wine-5.8 Tag: 09ebdfe73ebf3eeeb414054a39de169add168523 URL: https://source.winehq.org/git/wine.git/?a=tag;h=09ebdfe73ebf3eeeb414054a39d… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 8 22:18:56 2020 +0200 Release 5.8

1 0

Zebediah Figura : http.sys: Use a separate file and preprocessor directives to avoid duplication.
by Alexandre Julliard 08 May '20

08 May '20

Module: wine Branch: master Commit: cab14ee04c185061f986907f583d54b31fd3d737 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cab14ee04c185061f986907f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 7 18:47:21 2020 -0500 http.sys: Use a separate file and preprocessor directives to avoid duplication. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/http.sys/http.c | 531 +++--------------------------------------------- dlls/http.sys/request.h | 310 ++++++++++++++++++++++++++++ 2 files changed, 336 insertions(+), 505 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cab14ee04c185061f986…

1 0

Zebediah Figura : quartz: Get rid of the SetDefault*Rect callbacks.
by Alexandre Julliard 08 May '20

08 May '20

Module: wine Branch: master Commit: 69011b371122722ce45fef117343e9c23d0e6747 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69011b371122722ce45fef11… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 7 20:50:21 2020 -0500 quartz: Get rid of the SetDefault*Rect callbacks. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/quartz_private.h | 2 -- dlls/quartz/videorenderer.c | 24 ------------------------ dlls/quartz/vmr9.c | 24 ------------------------ dlls/quartz/window.c | 7 +++++-- 4 files changed, 5 insertions(+), 52 deletions(-) diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index 7e49367a93..d3f3a8915a 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -112,8 +112,6 @@ struct video_window_ops BOOL (*resize)(struct video_window *window, LONG height, LONG width); HRESULT (*get_current_image)(struct video_window *window, LONG *size, LONG *image); - HRESULT (WINAPI *pfnSetDefaultSourceRect)(struct video_window *window); - HRESULT (WINAPI *pfnSetDefaultTargetRect)(struct video_window *window); }; void video_window_cleanup(struct video_window *window) DECLSPEC_HIDDEN; diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index ea5142e321..8504a51d74 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -314,35 +314,11 @@ static HRESULT video_renderer_get_current_image(struct video_window *iface, LONG return S_OK; } -static HRESULT WINAPI VideoRenderer_SetDefaultSourceRect(struct video_window *iface) -{ - struct video_renderer *This = impl_from_video_window(iface); - - SetRect(&This->window.src, 0, 0, This->VideoWidth, This->VideoHeight); - - return S_OK; -} - -static HRESULT WINAPI VideoRenderer_SetDefaultTargetRect(struct video_window *iface) -{ - struct video_renderer *This = impl_from_video_window(iface); - RECT rect; - - if (!GetClientRect(This->window.hwnd, &rect)) - return E_FAIL; - - SetRect(&This->window.dst, 0, 0, rect.right, rect.bottom); - - return S_OK; -} - static const struct video_window_ops window_ops = { .get_default_rect = video_renderer_get_default_rect, .resize = video_renderer_resize, .get_current_image = video_renderer_get_current_image, - .pfnSetDefaultSourceRect = VideoRenderer_SetDefaultSourceRect, - .pfnSetDefaultTargetRect = VideoRenderer_SetDefaultTargetRect, }; static HRESULT WINAPI VideoWindow_get_FullScreenMode(IVideoWindow *iface, diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 4fb8ddc32f..64ef4a53e3 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -734,35 +734,11 @@ out: return hr; } -static HRESULT WINAPI VMR9_SetDefaultSourceRect(struct video_window *iface) -{ - struct quartz_vmr *filter = impl_from_video_window(iface); - - SetRect(&filter->window.src, 0, 0, filter->VideoWidth, filter->VideoHeight); - - return S_OK; -} - -static HRESULT WINAPI VMR9_SetDefaultTargetRect(struct video_window *iface) -{ - RECT rect; - struct quartz_vmr *filter = impl_from_video_window(iface); - - if (!GetClientRect(filter->window.hwnd, &rect)) - return E_FAIL; - - SetRect(&filter->window.dst, 0, 0, rect.right, rect.bottom); - - return S_OK; -} - static const struct video_window_ops window_ops = { .get_default_rect = vmr_get_default_rect, .resize = vmr_resize, .get_current_image = vmr_get_current_image, - .pfnSetDefaultSourceRect = VMR9_SetDefaultSourceRect, - .pfnSetDefaultTargetRect = VMR9_SetDefaultTargetRect, }; static const IVideoWindowVtbl IVideoWindow_VTable = diff --git a/dlls/quartz/window.c b/dlls/quartz/window.c index ebd3ffe302..d383370e5d 100644 --- a/dlls/quartz/window.c +++ b/dlls/quartz/window.c @@ -1055,10 +1055,12 @@ static HRESULT WINAPI basic_video_GetSourcePosition(IBasicVideo *iface, static HRESULT WINAPI basic_video_SetDefaultSourcePosition(IBasicVideo *iface) { struct video_window *window = impl_from_IBasicVideo(iface); + const BITMAPINFOHEADER *bitmap_header = get_bitmap_header(window); TRACE("window %p.\n", window); - return window->ops->pfnSetDefaultSourceRect(window); + SetRect(&window->src, 0, 0, bitmap_header->biWidth, bitmap_header->biHeight); + return S_OK; } static HRESULT WINAPI basic_video_SetDestinationPosition(IBasicVideo *iface, @@ -1098,7 +1100,8 @@ static HRESULT WINAPI basic_video_SetDefaultDestinationPosition(IBasicVideo *ifa TRACE("window %p.\n", window); - return window->ops->pfnSetDefaultTargetRect(window); + GetClientRect(window->hwnd, &window->dst); + return S_OK; } static HRESULT WINAPI basic_video_GetVideoSize(IBasicVideo *iface, LONG *width, LONG *height)

1 0

Zebediah Figura : quartz: Get rid of the resize callback.
by Alexandre Julliard 08 May '20

08 May '20

Module: wine Branch: master Commit: 013c024b2b1247727e20c83a2e0f190728c80df5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=013c024b2b1247727e20c83a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 7 20:50:22 2020 -0500 quartz: Get rid of the resize callback. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/quartz_private.h | 4 ---- dlls/quartz/videorenderer.c | 11 ----------- dlls/quartz/vmr9.c | 11 ----------- dlls/quartz/window.c | 4 ++-- 4 files changed, 2 insertions(+), 28 deletions(-) diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index d3f3a8915a..33cfb5671f 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -106,11 +106,7 @@ struct video_window struct video_window_ops { - /* Required */ RECT (*get_default_rect)(struct video_window *window); - /* Optional, WinProc Related */ - BOOL (*resize)(struct video_window *window, LONG height, LONG width); - HRESULT (*get_current_image)(struct video_window *window, LONG *size, LONG *image); }; diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 8504a51d74..e004d0fc21 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -245,16 +245,6 @@ static RECT video_renderer_get_default_rect(struct video_window *iface) return defRect; } -static BOOL video_renderer_resize(struct video_window *iface, LONG Width, LONG Height) -{ - struct video_renderer *filter = impl_from_video_window(iface); - - TRACE("WM_SIZE %d %d\n", Width, Height); - GetClientRect(iface->hwnd, &filter->window.dst); - - return TRUE; -} - static const struct strmbase_renderer_ops renderer_ops = { .pfnCheckMediaType = VideoRenderer_CheckMediaType, @@ -317,7 +307,6 @@ static HRESULT video_renderer_get_current_image(struct video_window *iface, LONG static const struct video_window_ops window_ops = { .get_default_rect = video_renderer_get_default_rect, - .resize = video_renderer_resize, .get_current_image = video_renderer_get_current_image, }; diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 64ef4a53e3..758ede6155 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -663,16 +663,6 @@ static RECT vmr_get_default_rect(struct video_window *This) return defRect; } -static BOOL vmr_resize(struct video_window *This, LONG Width, LONG Height) -{ - struct quartz_vmr *pVMR9 = impl_from_video_window(This); - - TRACE("WM_SIZE %d %d\n", Width, Height); - GetClientRect(This->hwnd, &pVMR9->window.dst); - - return TRUE; -} - static HRESULT vmr_get_current_image(struct video_window *iface, LONG *size, LONG *image) { struct quartz_vmr *filter = impl_from_video_window(iface); @@ -737,7 +727,6 @@ out: static const struct video_window_ops window_ops = { .get_default_rect = vmr_get_default_rect, - .resize = vmr_resize, .get_current_image = vmr_get_current_image, }; diff --git a/dlls/quartz/window.c b/dlls/quartz/window.c index d383370e5d..ada6b99ddb 100644 --- a/dlls/quartz/window.c +++ b/dlls/quartz/window.c @@ -68,8 +68,8 @@ static LRESULT CALLBACK WndProcW(HWND hwnd, UINT message, WPARAM wparam, LPARAM } break; case WM_SIZE: - if (window->ops->resize) - return window->ops->resize(window, LOWORD(lparam), HIWORD(lparam)); + GetClientRect(window->hwnd, &window->dst); + break; } return DefWindowProcW(hwnd, message, wparam, lparam);

1 0

Zebediah Figura : quartz: Resize the destination rect only if we are using the default destination rect.
by Alexandre Julliard 08 May '20

08 May '20

Module: wine Branch: master Commit: 82420a8d3c8ea39193d1bcfc6f2ca68635a9e54d URL: https://source.winehq.org/git/wine.git/?a=commit;h=82420a8d3c8ea39193d1bcfc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 7 20:50:23 2020 -0500 quartz: Resize the destination rect only if we are using the default destination rect. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/quartz_private.h | 3 ++- dlls/quartz/window.c | 16 +++++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index 33cfb5671f..5c391481f2 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -94,9 +94,10 @@ struct video_window IBasicVideo IBasicVideo_iface; RECT src, dst; + BOOL default_dst; - HWND hwnd; BOOL AutoShow; + HWND hwnd; HWND hwndDrain; HWND hwndOwner; struct strmbase_filter *pFilter; diff --git a/dlls/quartz/window.c b/dlls/quartz/window.c index ada6b99ddb..efafb70daa 100644 --- a/dlls/quartz/window.c +++ b/dlls/quartz/window.c @@ -68,7 +68,8 @@ static LRESULT CALLBACK WndProcW(HWND hwnd, UINT message, WPARAM wparam, LPARAM } break; case WM_SIZE: - GetClientRect(window->hwnd, &window->dst); + if (window->default_dst) + GetClientRect(window->hwnd, &window->dst); break; } @@ -926,6 +927,7 @@ static HRESULT WINAPI basic_video_put_DestinationLeft(IBasicVideo *iface, LONG l TRACE("window %p, left %d.\n", window, left); + window->default_dst = FALSE; OffsetRect(&window->dst, left - window->dst.left, 0); return S_OK; } @@ -952,6 +954,7 @@ static HRESULT WINAPI basic_video_put_DestinationWidth(IBasicVideo *iface, LONG if (width <= 0) return E_INVALIDARG; + window->default_dst = FALSE; window->dst.right = window->dst.left + width; return S_OK; } @@ -975,6 +978,7 @@ static HRESULT WINAPI basic_video_put_DestinationTop(IBasicVideo *iface, LONG to TRACE("window %p, top %d.\n", window, top); + window->default_dst = FALSE; OffsetRect(&window->dst, 0, top - window->dst.top); return S_OK; } @@ -1001,6 +1005,7 @@ static HRESULT WINAPI basic_video_put_DestinationHeight(IBasicVideo *iface, LONG if (height <= 0) return E_INVALIDARG; + window->default_dst = FALSE; window->dst.bottom = window->dst.top + height; return S_OK; } @@ -1073,6 +1078,7 @@ static HRESULT WINAPI basic_video_SetDestinationPosition(IBasicVideo *iface, if (width <= 0 || height <= 0) return E_INVALIDARG; + window->default_dst = FALSE; SetRect(&window->dst, left, top, left + width, top + height); return S_OK; } @@ -1100,6 +1106,7 @@ static HRESULT WINAPI basic_video_SetDefaultDestinationPosition(IBasicVideo *ifa TRACE("window %p.\n", window); + window->default_dst = TRUE; GetClientRect(window->hwnd, &window->dst); return S_OK; } @@ -1155,9 +1162,11 @@ static HRESULT WINAPI basic_video_IsUsingDefaultSource(IBasicVideo *iface) static HRESULT WINAPI basic_video_IsUsingDefaultDestination(IBasicVideo *iface) { - FIXME("iface %p, stub!\n", iface); + struct video_window *window = impl_from_IBasicVideo(iface); - return S_OK; + TRACE("window %p.\n", window); + + return window->default_dst ? S_OK : S_FALSE; } static const IBasicVideoVtbl basic_video_vtbl = @@ -1216,6 +1225,7 @@ void video_window_init(struct video_window *window, const IVideoWindowVtbl *vtbl window->ops = ops; window->IVideoWindow_iface.lpVtbl = vtbl; window->IBasicVideo_iface.lpVtbl = &basic_video_vtbl; + window->default_dst = TRUE; window->AutoShow = OATRUE; window->pFilter = owner; window->pPin = pin;

1 0

Zebediah Figura : quartz: Implement IBasicVideo::IsUsingDefaultSource().
by Alexandre Julliard 08 May '20

08 May '20

Module: wine Branch: master Commit: 8f6d4b1c5fe2720473c2d3d4a250dfdbc833bee0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f6d4b1c5fe2720473c2d3d4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 7 20:50:24 2020 -0500 quartz: Implement IBasicVideo::IsUsingDefaultSource(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/window.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/window.c b/dlls/quartz/window.c index efafb70daa..a5ff4979ef 100644 --- a/dlls/quartz/window.c +++ b/dlls/quartz/window.c @@ -1155,9 +1155,16 @@ static HRESULT WINAPI basic_video_GetCurrentImage(IBasicVideo *iface, LONG *size static HRESULT WINAPI basic_video_IsUsingDefaultSource(IBasicVideo *iface) { - FIXME("iface %p, stub!\n", iface); + struct video_window *window = impl_from_IBasicVideo(iface); + const BITMAPINFOHEADER *bitmap_header = get_bitmap_header(window); - return S_OK; + TRACE("window %p.\n", window); + + if (!window->src.left && !window->src.top + && window->src.right == bitmap_header->biWidth + && window->src.bottom == bitmap_header->biHeight) + return S_OK; + return S_FALSE; } static HRESULT WINAPI basic_video_IsUsingDefaultDestination(IBasicVideo *iface)

1 0

Zebediah Figura : quartz/tests: Add tests for IBasicVideo.
by Alexandre Julliard 08 May '20

08 May '20

Module: wine Branch: master Commit: 79c78b79512bd6e3319aacc81591d275bf539f2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=79c78b79512bd6e3319aacc8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 7 20:50:25 2020 -0500 quartz/tests: Add tests for IBasicVideo. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 427 ++++++++++++++++++++++++++++++++++++ dlls/quartz/tests/vmr7.c | 450 ++++++++++++++++++++++++++++++++++++++ dlls/quartz/tests/vmr9.c | 450 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 1327 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=79c78b79512bd6e3319a…

1 0