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

Vijay Kiran Kamuju : msasn1: Add partial implementation of ASN1_CreateDecoder.
by Alexandre Julliard May 8, 2020

May 8, 2020

Module: wine Branch: master Commit: fc2c1b5d6079960eb53009f57cffb9b6bbbcda80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc2c1b5d6079960eb53009f5… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri May 8 11:39:46 2020 +0200 msasn1: Add partial implementation of ASN1_CreateDecoder. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msasn1/main.c | 43 ++++++++++++++++ dlls/msasn1/msasn1.spec | 2 +- dlls/msasn1/tests/asn1.c | 129 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 173 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fc2c1b5d6079960eb530…

1 0

Andrew Eikum : winmm/tests: Test using a device handle in wave{In,Out}GetDevCaps and wave{In,Out}Open.
by Alexandre Julliard May 8, 2020

May 8, 2020

Module: wine Branch: master Commit: 0239026bf3da2bc5114ba60c7da8f7f54d30c0f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0239026bf3da2bc5114ba60c… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 8 09:25:16 2020 -0500 winmm/tests: Test using a device handle in wave{In,Out}GetDevCaps and wave{In,Out}Open. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/capture.c | 17 ++++++++++++++++- dlls/winmm/tests/wave.c | 17 ++++++++++++++++- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c index 4290c358a9..f60b44b096 100644 --- a/dlls/winmm/tests/capture.c +++ b/dlls/winmm/tests/capture.c @@ -130,7 +130,7 @@ static void check_position(int device, HWAVEIN win, DWORD bytes, static void wave_in_test_deviceIn(int device, WAVEFORMATEX *pwfx, DWORD format, DWORD flags, WAVEINCAPSA *pcaps) { - HWAVEIN win; + HWAVEIN win, win2; HANDLE hevent = CreateEventW(NULL, FALSE, FALSE, NULL); WAVEHDR frag; MMRESULT rc; @@ -139,6 +139,7 @@ static void wave_in_test_deviceIn(int device, WAVEFORMATEX *pwfx, DWORD format, WORD nChannels = pwfx->nChannels; WORD wBitsPerSample = pwfx->wBitsPerSample; DWORD nSamplesPerSec = pwfx->nSamplesPerSec; + WAVEINCAPSW capsW; win=NULL; flags |= CALLBACK_EVENT; @@ -181,6 +182,20 @@ static void wave_in_test_deviceIn(int device, WAVEFORMATEX *pwfx, DWORD format, pwfx->nSamplesPerSec, pwfx->wBitsPerSample, pwfx->nChannels, nSamplesPerSec, wBitsPerSample, nChannels); + /* waveInGetDevCaps allows an open handle instead of a device id */ + rc=waveInGetDevCapsW(HandleToUlong(win),&capsW,sizeof(capsW)); + ok(rc==MMSYSERR_NOERROR, + "waveInGetDevCapsW(%s): MMSYSERR_NOERROR " + "expected, got %s\n",dev_name(device),wave_in_error(rc)); + + /* waveInOpen does not allow an open handle instead of a device id */ + rc=waveInOpen(&win2,HandleToUlong(win),pwfx,0,0,CALLBACK_NULL); + ok(rc==MMSYSERR_BADDEVICEID, + "waveInOpen(%s): MMSYSERR_BADDEVICEID " + "expected, got %s\n",dev_name(device),wave_in_error(rc)); + if(rc==MMSYSERR_NOERROR) + waveInClose(win2); + /* Check that the position is 0 at start */ check_position(device, win, 0, pwfx); diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index f9fc5c5aad..eec1ba2a03 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -599,9 +599,10 @@ static void wave_out_test_deviceOut(int device, double duration, int headers, in WAVEFORMATEX *pwfx, DWORD format, DWORD flags, WAVEOUTCAPSA *pcaps, BOOL interactive, BOOL sine, BOOL pause) { - HWAVEOUT wout; + HWAVEOUT wout, wout2; HANDLE hevent = CreateEventW(NULL, FALSE, FALSE, NULL); WAVEHDR *frags = 0; + WAVEOUTCAPSW capsW; MMRESULT rc; DWORD volume; WORD nChannels = pwfx->nChannels; @@ -705,6 +706,20 @@ static void wave_out_test_deviceOut(int device, double duration, int headers, in ok(has_volume ? rc==MMSYSERR_NOERROR : rc==MMSYSERR_NOTSUPPORTED, "waveOutGetVolume(%s): rc=%s\n",dev_name(device),wave_out_error(rc)); + /* waveOutGetDevCaps allows an open handle instead of a device id */ + rc=waveOutGetDevCapsW(HandleToUlong(wout),&capsW,sizeof(capsW)); + ok(rc==MMSYSERR_NOERROR, + "waveOutGetDevCapsW(%s): MMSYSERR_NOERROR " + "expected, got %s\n",dev_name(device),wave_out_error(rc)); + + /* waveOutOpen does not allow an open handle instead of a device id */ + rc=waveOutOpen(&wout2,HandleToUlong(wout),pwfx,0,0,CALLBACK_NULL); + ok(rc==MMSYSERR_BADDEVICEID, + "waveOutOpen(%s): MMSYSERR_BADDEVICEID " + "expected, got %s\n",dev_name(device),wave_out_error(rc)); + if(rc==MMSYSERR_NOERROR) + waveOutClose(wout2); + /* make sure fragment length is a multiple of block size */ frag_length = ((length / headers) / pwfx->nBlockAlign) * pwfx->nBlockAlign;

1 0

Nikolay Sivov : qmgr: Make SetMaximumDownloadTime() succeed.
by Alexandre Julliard May 8, 2020

May 8, 2020

Module: wine Branch: master Commit: 2f454fa3750c7fcfa4a0898cfeeafe9a842e612b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f454fa3750c7fcfa4a0898c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 8 15:40:22 2020 +0300 qmgr: Make SetMaximumDownloadTime() succeed. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qmgr/job.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index 6f2c4d61ca..2ba65cbc29 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -902,7 +902,7 @@ static HRESULT WINAPI BackgroundCopyJob_GetOwnerElevationState(IBackgroundCopyJo static HRESULT WINAPI BackgroundCopyJob_SetMaximumDownloadTime(IBackgroundCopyJob4 *iface, ULONG timeout) { FIXME("%p, %u.\n", iface, timeout); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI BackgroundCopyJob_GetMaximumDownloadTime(IBackgroundCopyJob4 *iface, ULONG *timeout)

1 0

Andrew Eikum : winmm: Accept open handles in wave{In,Out}GetDevCaps.
by Alexandre Julliard May 8, 2020

May 8, 2020

Module: wine Branch: master Commit: ae13a279e1994268638caae7043e08076facc1a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae13a279e1994268638caae7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 8 08:45:57 2020 -0500 winmm: Accept open handles in wave{In,Out}GetDevCaps. Based on a patch by Changping Yu <dead.ash(a)hotmail.com>. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/waveform.c | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index b08768577b..39461743c4 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -2669,10 +2669,18 @@ UINT WINAPI waveOutGetDevCapsW(UINT_PTR uDeviceID, LPWAVEOUTCAPSW lpCaps, caps = &mapper_caps; }else{ - if(uDeviceID >= g_outmmdevices_count) - return MMSYSERR_BADDEVICEID; + if(uDeviceID >= g_outmmdevices_count){ + WINMM_Device *device = WINMM_GetDeviceFromHWAVE((HWAVE)uDeviceID); + + if(!WINMM_ValidateAndLock(device)) + return MMSYSERR_BADDEVICEID; + + caps = &device->parent->out_caps; - caps = &read_map(g_out_map, uDeviceID)->out_caps; + LeaveCriticalSection(&device->lock); + }else{ + caps = &read_map(g_out_map, uDeviceID)->out_caps; + } } memcpy(lpCaps, caps, min(uSize, sizeof(*lpCaps))); @@ -3336,10 +3344,18 @@ UINT WINAPI waveInGetDevCapsW(UINT_PTR uDeviceID, LPWAVEINCAPSW lpCaps, UINT uSi caps = &mapper_caps; }else{ - if(uDeviceID >= g_inmmdevices_count) - return MMSYSERR_BADDEVICEID; + if(uDeviceID >= g_inmmdevices_count){ + WINMM_Device *device = WINMM_GetDeviceFromHWAVE((HWAVE)uDeviceID); + + if(!WINMM_ValidateAndLock(device)) + return MMSYSERR_BADDEVICEID; + + caps = &device->parent->in_caps; - caps = &read_map(g_in_map, uDeviceID)->in_caps; + LeaveCriticalSection(&device->lock); + }else{ + caps = &read_map(g_in_map, uDeviceID)->in_caps; + } } memcpy(lpCaps, caps, min(uSize, sizeof(*lpCaps)));

1 0

Vijay Kiran Kamuju : msasn1: Add partial implementation of ASN1_CreateEncoder.
by Alexandre Julliard May 8, 2020

May 8, 2020

Module: wine Branch: master Commit: 8b0e26779558ee36ae0cfc1071c113995cf0a79d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b0e26779558ee36ae0cfc10… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Thu May 7 15:59:30 2020 +0200 msasn1: Add partial implementation of ASN1_CreateEncoder. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msasn1/main.c | 46 ++++++++++++++ dlls/msasn1/msasn1.spec | 2 +- dlls/msasn1/tests/asn1.c | 161 +++++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 195 insertions(+), 14 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8b0e26779558ee36ae0c…

1 0

Zebediah Figura : http.sys: Use a separate file and preprocessor directives to avoid duplication.
by Alexandre Julliard May 8, 2020

May 8, 2020

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 resize callback.
by Alexandre Julliard May 8, 2020

May 8, 2020

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 May 8, 2020

May 8, 2020

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 May 8, 2020

May 8, 2020

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: Get rid of the SetDefault*Rect callbacks.
by Alexandre Julliard May 8, 2020

May 8, 2020

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