ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

strmbase: Fix copy-paste error where calculating video destination height. 

Spotted by Andrew Eikum.

Signed-off-by: Akihiro Sagawa <sagawa.aki@gmail.com>
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Akihiro Sagawa 2016-11-25 01:10:03 +09:00 committed by Alexandre Julliard
parent 97405fc805
commit 96d2593ead
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/quartz/tests/filtergraph.c
View File

@ -215,7 +215,7 @@ static void test_basic_video(void)
ok(width==video_width/3+1, "expected %d, got %d\n", video_width/3+1, width);
hr = IBasicVideo_get_DestinationHeight(pbv, &height);
ok(hr==S_OK, "Cannot get destination height returned: %x\n", hr);
todo_wine ok(height==video_height/3+1, "expected %d, got %d\n", video_height/3+1, height);
ok(height==video_height/3+1, "expected %d, got %d\n", video_height/3+1, height);
hr = IBasicVideo_put_DestinationLeft(pbv, video_width/3);
ok(hr==S_OK, "Cannot put destination left returned: %x\n", hr);
@ -243,7 +243,7 @@ static void test_basic_video(void)
hr = IBasicVideo_GetDestinationPosition(pbv, &left, &top, &width, &height);
ok(hr == S_OK, "Cannot get source position returned: %x\n", hr);
ok(top == video_height/3, "expected %d, got %d\n", video_height/3, top);
todo_wine ok(height == video_height/4+1, "expected %d, got %d\n", video_height/4+1, height);
ok(height == video_height/4+1, "expected %d, got %d\n", video_height/4+1, height);
/* reset source rectangle */
hr = IBasicVideo_SetDefaultSourcePosition(pbv);

4
dlls/strmbase/video.c
View File

@ -368,7 +368,7 @@ HRESULT WINAPI BaseControlVideoImpl_put_DestinationHeight(IBasicVideo *iface, LO
TRACE("(%p/%p)->(%d)\n", This, iface, DestinationHeight);
This->pFuncsTable->pfnGetTargetRect(This, &DestRect);
DestRect.right = DestRect.left + DestinationHeight;
DestRect.bottom = DestRect.top + DestinationHeight;
This->pFuncsTable->pfnSetTargetRect(This, &DestRect);
return S_OK;
@ -383,7 +383,7 @@ HRESULT WINAPI BaseControlVideoImpl_get_DestinationHeight(IBasicVideo *iface, LO
if (!pDestinationHeight)
return E_POINTER;
This->pFuncsTable->pfnGetTargetRect(This, &DestRect);
*pDestinationHeight = DestRect.right - DestRect.left;
*pDestinationHeight = DestRect.bottom - DestRect.top;
return S_OK;
}