November 2019 - Wine-Commits

Paul Gofman : ddraw/tests: Backport viewport v1 / v2 conversion tests for ddraw1.
by Alexandre Julliard Nov. 27, 2019

Nov. 27, 2019

Module: wine Branch: master Commit: 4099f6e71b6b195e307366e8cfb8077e8388b42d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4099f6e71b6b195e307366e8… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Nov 26 21:19:50 2019 +0300 ddraw/tests: Backport viewport v1 / v2 conversion tests for ddraw1. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 151 +++++++++++++++++++++++++++++++++------------- 1 file changed, 110 insertions(+), 41 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index fa65d0e722..b513121fbb 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -1266,18 +1266,19 @@ static ULONG get_refcount(IUnknown *test_iface) static void test_viewport_object(void) { - IDirectDraw *ddraw; - IDirect3D *d3d; - HRESULT hr; - ULONG ref; - D3DVIEWPORT vp; IDirect3DViewport *viewport, *another_vp; + IDirectDrawGammaControl *gamma; IDirect3DViewport2 *viewport2; IDirect3DViewport3 *viewport3; - IDirectDrawGammaControl *gamma; - IUnknown *unknown; IDirect3DDevice *device; + IUnknown *unknown; + IDirectDraw *ddraw; + D3DVIEWPORT2 vp2; + D3DVIEWPORT vp; + IDirect3D *d3d; HWND window; + HRESULT hr; + ULONG ref; union { D3DVIEWPORT vp1; @@ -1296,12 +1297,12 @@ static void test_viewport_object(void) } hr = IDirectDraw_QueryInterface(ddraw, &IID_IDirect3D, (void **)&d3d); - ok(SUCCEEDED(hr), "Failed to get d3d interface, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ref = get_refcount((IUnknown *) d3d); ok(ref == 2, "Got unexpected refcount %u.\n", ref); hr = IDirect3D_CreateViewport(d3d, &viewport, NULL); - ok(SUCCEEDED(hr), "Failed to create viewport, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ref = get_refcount((IUnknown *)viewport); ok(ref == 1, "Got unexpected refcount %u.\n", ref); ref = get_refcount((IUnknown *)d3d); @@ -1328,55 +1329,45 @@ static void test_viewport_object(void) hr = IDirect3DViewport_QueryInterface(viewport, &IID_IDirectDrawGammaControl, (void **)&gamma); ok(hr == E_NOINTERFACE || broken(hr == E_FAIL), "Got unexpected hr %#x.\n", hr); ok(gamma == NULL, "Interface not set to NULL by failed QI call: %p\n", gamma); - if (SUCCEEDED(hr)) IDirectDrawGammaControl_Release(gamma); - /* NULL iid: Segfaults */ hr = IDirect3DViewport_QueryInterface(viewport, &IID_IDirect3DViewport2, (void **)&viewport2); - ok(SUCCEEDED(hr) || hr == E_NOINTERFACE || broken(hr == E_FAIL), - "Failed to QI IDirect3DViewport2, hr %#x.\n", hr); - if (viewport2) - { - ref = get_refcount((IUnknown *)viewport); - ok(ref == 2, "Got unexpected refcount %u.\n", ref); - ref = get_refcount((IUnknown *)viewport2); - ok(ref == 2, "Got unexpected refcount %u.\n", ref); - IDirect3DViewport2_Release(viewport2); - viewport2 = NULL; - } + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + ref = get_refcount((IUnknown *)viewport); + ok(ref == 2, "Got unexpected refcount %u.\n", ref); + ref = get_refcount((IUnknown *)viewport2); + ok(ref == 2, "Got unexpected refcount %u.\n", ref); hr = IDirect3DViewport_QueryInterface(viewport, &IID_IDirect3DViewport3, (void **)&viewport3); - ok(SUCCEEDED(hr) || hr == E_NOINTERFACE || broken(hr == E_FAIL), - "Failed to QI IDirect3DViewport3, hr %#x.\n", hr); - if (viewport3) - { - ref = get_refcount((IUnknown *)viewport); - ok(ref == 2, "Got unexpected refcount %u.\n", ref); - ref = get_refcount((IUnknown *)viewport3); - ok(ref == 2, "Got unexpected refcount %u.\n", ref); - IDirect3DViewport3_Release(viewport3); - } + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + ref = get_refcount((IUnknown *)viewport); + ok(ref == 3, "Got unexpected refcount %u.\n", ref); + ref = get_refcount((IUnknown *)viewport3); + ok(ref == 3, "Got unexpected refcount %u.\n", ref); + IDirect3DViewport3_Release(viewport3); hr = IDirect3DViewport_QueryInterface(viewport, &IID_IUnknown, (void **)&unknown); - ok(SUCCEEDED(hr), "Failed to QI IUnknown, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ref = get_refcount((IUnknown *)viewport); - ok(ref == 2, "Got unexpected refcount %u.\n", ref); + ok(ref == 3, "Got unexpected refcount %u.\n", ref); ref = get_refcount(unknown); - ok(ref == 2, "Got unexpected refcount %u.\n", ref); + ok(ref == 3, "Got unexpected refcount %u.\n", ref); IUnknown_Release(unknown); hr = IDirect3DDevice_DeleteViewport(device, NULL); ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); hr = IDirect3D_CreateViewport(d3d, &another_vp, NULL); - ok(SUCCEEDED(hr), "Failed to create viewport, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); /* AddViewport(NULL): Segfault */ hr = IDirect3DDevice_AddViewport(device, viewport); - ok(SUCCEEDED(hr), "Failed to add viewport to device, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ref = get_refcount((IUnknown *) viewport); - ok(ref == 2, "Got unexpected refcount %u.\n", ref); + ok(ref == 3, "Got unexpected refcount %u.\n", ref); hr = IDirect3DDevice_AddViewport(device, another_vp); - ok(SUCCEEDED(hr), "Failed to add viewport to device, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ref = get_refcount((IUnknown *) another_vp); ok(ref == 2, "Got unexpected refcount %u.\n", ref); @@ -1396,10 +1387,88 @@ static void test_viewport_object(void) vp.dwSize = sizeof(vp); hr = IDirect3DViewport_SetViewport(viewport, &vp); - ok(SUCCEEDED(hr), "Failed to set viewport data, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + vp2.dwSize = sizeof(vp2); + vp2.dwX = 160; + vp2.dwY = 120; + vp2.dwWidth = 640 - vp2.dwX; + vp2.dwHeight = 480 - vp2.dwY; + vp2.dvClipX = 2.0f; + vp2.dvClipY = -1.75f; + vp2.dvClipWidth = 2.5f; + vp2.dvClipHeight = -1.5f; + vp2.dvMinZ = 0.5f; + vp2.dvMaxZ = 2.0f; + hr = IDirect3DViewport2_SetViewport2(viewport2, &vp2); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + memset(&vp, 0xff, sizeof(vp)); + vp.dwSize = sizeof(vp); + hr = IDirect3DViewport2_GetViewport(viewport2, &vp); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(vp.dvMaxX == 4.5f && vp.dvMaxY == -1.75f && vp.dvScaleX == 192.0f + && vp.dvScaleY == -240.0f && vp.dvMinZ == 0.0f && vp.dvMaxZ == 1.0f, + "Got unexpected values %g, %g, %g, %g, %g, %g.\n", + vp.dvMaxX, vp.dvMaxY, vp.dvScaleX, vp.dvScaleY, vp.dvMinZ, vp.dvMaxZ); + + vp2.dvClipX = -1.5f; + vp2.dvClipY = 1.75f; + vp2.dvClipWidth = -1.5f; + vp2.dvClipHeight = 2.0f; + vp2.dvMinZ = 2.0f; + vp2.dvMaxZ = 0.5f; + + hr = IDirect3DViewport2_SetViewport2(viewport2, &vp2); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + memset(&vp, 0xff, sizeof(vp)); + vp.dwSize = sizeof(vp); + hr = IDirect3DViewport2_GetViewport(viewport2, &vp); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(vp.dvMaxX == -3.0f && vp.dvMaxY == 1.75f && vp.dvScaleX == -320.0f + && vp.dvScaleY == 180.0f && vp.dvMinZ == 0.0f && vp.dvMaxZ == 1.0f, + "Got unexpected values %g, %g, %g, %g, %g, %g.\n", + vp.dvMaxX, vp.dvMaxY, vp.dvScaleX, vp.dvScaleY, vp.dvMinZ, vp.dvMaxZ); + + vp.dwSize = sizeof(vp); + vp.dvMinZ = 0.5f; + vp.dvMaxZ = 2.0f; + hr = IDirect3DViewport2_SetViewport(viewport2, &vp); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + memset(&vp2, 0xff, sizeof(vp2)); + vp2.dwSize = sizeof(vp2); + hr = IDirect3DViewport2_GetViewport2(viewport2, &vp2); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(vp2.dvClipX == 0.75f && vp2.dvClipY == 1.0f && vp2.dvClipWidth == -1.5f + && vp2.dvClipHeight == 2.0f && vp2.dvMinZ == 0.0f && vp2.dvMaxZ == 1.0f, + "Got unexpected values %g, %g, %g, %g, %g, %g.\n", + vp2.dvClipX, vp2.dvClipY, vp2.dvClipWidth, vp2.dvClipHeight, vp2.dvMinZ, vp2.dvMaxZ); + + vp.dvMaxX = 4.5f; + vp.dvMaxY = -1.75f; + vp.dvScaleX = 192.0f; + vp.dvScaleY = -240.0f; + vp.dvMinZ = 2.0f; + vp.dvMaxZ = 0.5f; + + hr = IDirect3DViewport3_SetViewport(viewport3, &vp); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + memset(&vp2, 0xff, sizeof(vp2)); + vp2.dwSize = sizeof(vp2); + hr = IDirect3DViewport2_GetViewport2(viewport2, &vp2); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(vp2.dvClipX == -1.25f && vp2.dvClipY == -0.75f && vp2.dvClipWidth == 2.5f + && vp2.dvClipHeight == -1.5f && vp2.dvMinZ == 0.0f && vp2.dvMaxZ == 1.0f, + "Got unexpected values %g, %g, %g, %g, %g, %g.\n", + vp2.dvClipX, vp2.dvClipY, vp2.dvClipWidth, vp2.dvClipHeight, vp2.dvMinZ, vp2.dvMaxZ); + + IDirect3DViewport2_Release(viewport2); hr = IDirect3DDevice_DeleteViewport(device, another_vp); - ok(SUCCEEDED(hr), "Failed to delete viewport from device, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ref = get_refcount((IUnknown *) another_vp); ok(ref == 1, "Got unexpected refcount %u.\n", ref);

1 0

Paul Gofman : ddraw: Fix conversion of v2 viewport from v1 in d3d_viewport_GetViewport2().
by Alexandre Julliard Nov. 27, 2019

Nov. 27, 2019

Module: wine Branch: master Commit: 2334aa93a355afb7142e13743a2593d9882e15b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2334aa93a355afb7142e1374… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Nov 26 21:19:49 2019 +0300 ddraw: Fix conversion of v2 viewport from v1 in d3d_viewport_GetViewport2(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/d3d.c | 28 ++++++++++++++++------------ dlls/ddraw/tests/ddraw4.c | 43 +++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/viewport.c | 13 +++++++------ 3 files changed, 66 insertions(+), 18 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index e606010a9c..13c925e970 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -1050,25 +1050,29 @@ static void ViewportTest(void) ret_vp2_data.dwSize = sizeof(vp2_data); hr = IDirect3DViewport2_GetViewport2(Viewport2, &ret_vp2_data); - ok(hr == D3D_OK, "IDirect3DViewport2_GetViewport2 returned %08x\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - ok(ret_vp2_data.dwX == vp1_data.dwX, "dwX is %u, expected %u\n", ret_vp2_data.dwX, vp1_data.dwX); - ok(ret_vp2_data.dwY == vp1_data.dwY, "dwY is %u, expected %u\n", ret_vp2_data.dwY, vp1_data.dwY); - ok(ret_vp2_data.dwWidth == vp1_data.dwWidth, "dwWidth is %u, expected %u\n", ret_vp2_data.dwWidth, vp1_data.dwWidth); - ok(ret_vp2_data.dwHeight == vp1_data.dwHeight, "dwHeight is %u, expected %u\n", ret_vp2_data.dwHeight, vp1_data.dwHeight); - ok(ret_vp2_data.dvClipX == vp2_data.dvClipX, "dvClipX is %f, expected %f\n", ret_vp2_data.dvClipX, vp2_data.dvClipX); - ok(ret_vp2_data.dvClipY == vp2_data.dvClipY, "dvClipY is %f, expected %f\n", ret_vp2_data.dvClipY, vp2_data.dvClipY); - ok(ret_vp2_data.dvClipWidth == vp2_data.dvClipWidth, "dvClipWidth is %f, expected %f\n", + ok(ret_vp2_data.dwX == vp1_data.dwX, "dwX is %u, expected %u.\n", ret_vp2_data.dwX, vp1_data.dwX); + ok(ret_vp2_data.dwY == vp1_data.dwY, "dwY is %u, expected %u.\n", ret_vp2_data.dwY, vp1_data.dwY); + ok(ret_vp2_data.dwWidth == vp1_data.dwWidth, "dwWidth is %u, expected %u.\n", + ret_vp2_data.dwWidth, vp1_data.dwWidth); + ok(ret_vp2_data.dwHeight == vp1_data.dwHeight, "dwHeight is %u, expected %u.\n", + ret_vp2_data.dwHeight, vp1_data.dwHeight); + todo_wine ok(ret_vp2_data.dvClipX == vp2_data.dvClipX, "dvClipX is %f, expected %f.\n", + ret_vp2_data.dvClipX, vp2_data.dvClipX); + todo_wine ok(ret_vp2_data.dvClipY == vp2_data.dvClipY, "dvClipY is %f, expected %f.\n", + ret_vp2_data.dvClipY, vp2_data.dvClipY); + todo_wine ok(ret_vp2_data.dvClipWidth == vp2_data.dvClipWidth, "dvClipWidth is %f, expected %f.\n", ret_vp2_data.dvClipWidth, vp2_data.dvClipWidth); - ok(ret_vp2_data.dvClipHeight == vp2_data.dvClipHeight, "dvClipHeight is %f, expected %f\n", + todo_wine ok(ret_vp2_data.dvClipHeight == vp2_data.dvClipHeight, "dvClipHeight is %f, expected %f.\n", ret_vp2_data.dvClipHeight, vp2_data.dvClipHeight); - ok(ret_vp2_data.dvMinZ == 0.0, "dvMinZ is %f, expected 0.0\n", ret_vp2_data.dvMinZ); - ok(ret_vp2_data.dvMaxZ == 1.0, "dvMaxZ is %f, expected 1.0\n", ret_vp2_data.dvMaxZ); + ok(ret_vp2_data.dvMinZ == 0.0, "dvMinZ is %f, expected 0.0.\n", ret_vp2_data.dvMinZ); + ok(ret_vp2_data.dvMaxZ == 1.0, "dvMaxZ is %f, expected 1.0.\n", ret_vp2_data.dvMaxZ); IDirect3DViewport2_Release(Viewport2); hr = IDirect3DDevice_DeleteViewport(Direct3DDevice1, Viewport); - ok(hr == D3D_OK, "IDirect3DDevice_DeleteViewport returned %08x\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); } static void Direct3D1Test(void) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 114f4b5ed6..8cadfae52a 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -1837,11 +1837,54 @@ static void test_viewport_object(void) "Got unexpected values %g, %g, %g, %g, %g, %g.\n", vp.dvMaxX, vp.dvMaxY, vp.dvScaleX, vp.dvScaleY, vp.dvMinZ, vp.dvMaxZ); + vp.dwSize = sizeof(vp); + vp.dvMinZ = 0.5f; + vp.dvMaxZ = 2.0f; + hr = IDirect3DViewport3_SetViewport(viewport3, &vp); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + memset(&vp2, 0xff, sizeof(vp2)); + vp2.dwSize = sizeof(vp2); + hr = IDirect3DViewport3_GetViewport2(viewport3, &vp2); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(vp2.dvClipX == 0.75f && vp2.dvClipY == 1.0f && vp2.dvClipWidth == -1.5f + && vp2.dvClipHeight == 2.0f && vp2.dvMinZ == 0.0f && vp2.dvMaxZ == 1.0f, + "Got unexpected values %g, %g, %g, %g, %g, %g.\n", + vp2.dvClipX, vp2.dvClipY, vp2.dvClipWidth, vp2.dvClipHeight, vp2.dvMinZ, vp2.dvMaxZ); + + vp.dvMaxX = 4.5f; + vp.dvMaxY = -1.75f; + vp.dvScaleX = 192.0f; + vp.dvScaleY = -240.0f; + vp.dvMinZ = 2.0f; + vp.dvMaxZ = 0.5f; + + hr = IDirect3DViewport3_SetViewport(viewport3, &vp); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + memset(&vp2, 0xff, sizeof(vp2)); + vp2.dwSize = sizeof(vp2); + hr = IDirect3DViewport3_GetViewport2(viewport3, &vp2); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(vp2.dvClipX == -1.25f && vp2.dvClipY == -0.75f && vp2.dvClipWidth == 2.5f + && vp2.dvClipHeight == -1.5f && vp2.dvMinZ == 0.0f && vp2.dvMaxZ == 1.0f, + "Got unexpected values %g, %g, %g, %g, %g, %g.\n", + vp2.dvClipX, vp2.dvClipY, vp2.dvClipWidth, vp2.dvClipHeight, vp2.dvMinZ, vp2.dvMaxZ); + /* Destroying the device removes the viewport and releases the reference */ IDirect3DDevice3_Release(device); ref = get_refcount((IUnknown *) viewport3); ok(ref == 1, "Got unexpected refcount %u.\n", ref); + memset(&vp2, 0xff, sizeof(vp2)); + vp2.dwSize = sizeof(vp2); + hr = IDirect3DViewport3_GetViewport2(viewport3, &vp2); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(vp2.dvClipX == -1.25f && vp2.dvClipY == -0.75f && vp2.dvClipWidth == 2.5f + && vp2.dvClipHeight == -1.5f && vp2.dvMinZ == 0.0f && vp2.dvMaxZ == 1.0f, + "Got unexpected values %g, %g, %g, %g, %g, %g.\n", + vp2.dvClipX, vp2.dvClipY, vp2.dvClipWidth, vp2.dvClipHeight, vp2.dvMinZ, vp2.dvMaxZ); + vp.dwSize = sizeof(vp); hr = IDirect3DViewport3_SetViewport(viewport3, &vp); ok(hr == D3DERR_VIEWPORTHASNODEVICE, "Got unexpected hr %#x.\n", hr); diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index ceb5582524..0a06329a69 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -983,12 +983,13 @@ static HRESULT WINAPI d3d_viewport_GetViewport2(IDirect3DViewport3 *iface, D3DVI vp2.dwY = viewport->viewports.vp1.dwY; vp2.dwWidth = viewport->viewports.vp1.dwWidth; vp2.dwHeight = viewport->viewports.vp1.dwHeight; - vp2.dvClipX = 0.0f; - vp2.dvClipY = 0.0f; - vp2.dvClipWidth = 0.0f; - vp2.dvClipHeight = 0.0f; - vp2.dvMinZ = viewport->viewports.vp1.dvMinZ; - vp2.dvMaxZ = viewport->viewports.vp1.dvMaxZ; + + vp2.dvClipWidth = viewport->viewports.vp1.dwWidth / viewport->viewports.vp1.dvScaleX; + vp2.dvClipHeight = viewport->viewports.vp1.dwHeight / viewport->viewports.vp1.dvScaleY; + vp2.dvClipX = -vp2.dvClipWidth / 2.0f; + vp2.dvClipY = vp2.dvClipHeight / 2.0f; + vp2.dvMinZ = 0.0f; + vp2.dvMaxZ = 1.0f; memcpy(vp, &vp2, size); }

1 0

Zebediah Figura : qcap/avico: Call IMemInputPin::Receive() directly.
by Alexandre Julliard Nov. 27, 2019

Nov. 27, 2019

Module: wine Branch: master Commit: b31cca343835348e7a5b46646d2ab1322925938d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b31cca343835348e7a5b4664… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 26 17:39:16 2019 -0600 qcap/avico: Call IMemInputPin::Receive() directly. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avico.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index 2e81a6b0c4..f0f60ae439 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -415,6 +415,7 @@ static HRESULT sink_query_interface(struct strmbase_pin *iface, REFIID iid, void static HRESULT WINAPI AVICompressorIn_Receive(struct strmbase_sink *base, IMediaSample *pSample) { AVICompressor *This = impl_from_strmbase_pin(&base->pin); + IMemInputPin *meminput = This->source.pMemInputPin; VIDEOINFOHEADER *src_videoinfo; REFERENCE_TIME start, stop; IMediaSample *out_sample; @@ -429,6 +430,12 @@ static HRESULT WINAPI AVICompressorIn_Receive(struct strmbase_sink *base, IMedia TRACE("(%p)->(%p)\n", base, pSample); + if (!meminput) + { + WARN("Source is not connected, returning VFW_E_NOT_CONNECTED.\n"); + return VFW_E_NOT_CONNECTED; + } + if(!This->hic) { FIXME("Driver not loaded\n"); return E_UNEXPECTED; @@ -490,7 +497,7 @@ static HRESULT WINAPI AVICompressorIn_Receive(struct strmbase_sink *base, IMedia else IMediaSample_SetMediaTime(out_sample, NULL, NULL); - hres = BaseOutputPinImpl_Deliver(&This->source, out_sample); + hres = IMemInputPin_Receive(meminput, out_sample); if(FAILED(hres)) WARN("Deliver failed: %08x\n", hres);

1 0

Alexandre Julliard : kernel32: Move codepage functions to kernelbase.
by Alexandre Julliard Nov. 27, 2019

Nov. 27, 2019

Module: wine Branch: master Commit: 03deff4e0dedbfeb2965efaf3660a74283ec8d84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03deff4e0dedbfeb2965efaf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 27 17:04:32 2019 +0100 kernel32: Move codepage functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 10 +- dlls/kernel32/locale.c | 174 +------------------------- dlls/kernelbase/kernelbase.spec | 10 +- dlls/kernelbase/locale.c | 271 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 283 insertions(+), 182 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=03deff4e0dedbfeb2965…

1 0

Zebediah Figura : qcap/smartteefilter: Call IMemInputPin::Receive() directly.
by Alexandre Julliard Nov. 27, 2019

Nov. 27, 2019

Module: wine Branch: master Commit: 5aec70f6d0449e92d97b45eb5cd0c7271862665a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5aec70f6d0449e92d97b45eb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 26 17:39:17 2019 -0600 qcap/smartteefilter: Call IMemInputPin::Receive() directly. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/smartteefilter.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index fd0dd621e3..f63a43de50 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -261,8 +261,8 @@ static HRESULT WINAPI SmartTeeFilterInput_Receive(struct strmbase_sink *base, IM if (This->capture.pin.peer) hrCapture = copy_sample(inputSample, This->capture.pAllocator, &captureSample); LeaveCriticalSection(&This->filter.csFilter); - if (SUCCEEDED(hrCapture)) - hrCapture = BaseOutputPinImpl_Deliver(&This->capture, captureSample); + if (SUCCEEDED(hrCapture) && This->capture.pMemInputPin) + hrCapture = IMemInputPin_Receive(This->capture.pMemInputPin, captureSample); if (captureSample) IMediaSample_Release(captureSample); @@ -273,8 +273,8 @@ static HRESULT WINAPI SmartTeeFilterInput_Receive(struct strmbase_sink *base, IM /* No timestamps on preview stream: */ if (SUCCEEDED(hrPreview)) hrPreview = IMediaSample_SetTime(previewSample, NULL, NULL); - if (SUCCEEDED(hrPreview)) - hrPreview = BaseOutputPinImpl_Deliver(&This->preview, previewSample); + if (SUCCEEDED(hrPreview) && This->preview.pMemInputPin) + hrPreview = IMemInputPin_Receive(This->preview.pMemInputPin, previewSample); if (previewSample) IMediaSample_Release(previewSample);

1 0

Zebediah Figura : d3d9: Fix a copy-paste error.
by Alexandre Julliard Nov. 27, 2019

Nov. 27, 2019

Module: wine Branch: master Commit: 1367a2dc4ec49c5f545e3e61b823ca2587dbe43e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1367a2dc4ec49c5f545e3e61… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 26 22:58:23 2019 -0600 d3d9: Fix a copy-paste error. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 0657cc2f76..58bdd7458c 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2403,7 +2403,7 @@ static HRESULT WINAPI d3d9_device_BeginStateBlock(IDirect3DDevice9Ex *iface) if (device->recording) { wined3d_mutex_unlock(); - WARN("Trying to begin a stateblock while recording, returning D3DERR_INBEGINSTATEBLOCK.\n"); + WARN("Trying to begin a stateblock while recording, returning D3DERR_INVALIDCALL.\n"); return D3DERR_INVALIDCALL; }

1 0

Michael Stefaniuc : dmime: The group for a track in a segment cannot be zero.
by Alexandre Julliard Nov. 27, 2019

Nov. 27, 2019

Module: wine Branch: master Commit: f5ecdbc3527b52bd25093851de4b6c4d9697abbd URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5ecdbc3527b52bd25093851… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Nov 27 00:49:53 2019 +0100 dmime: The group for a track in a segment cannot be zero. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/segment.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 3c0d4ac567..e3acafe979 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -235,7 +235,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_GetTrackGroup(IDirectMusicSegment } static HRESULT WINAPI IDirectMusicSegment8Impl_InsertTrack(IDirectMusicSegment8 *iface, - IDirectMusicTrack *pTrack, DWORD dwGroupBits) + IDirectMusicTrack *pTrack, DWORD group) { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); DWORD i = 0; @@ -243,7 +243,10 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_InsertTrack(IDirectMusicSegment8 LPDMUS_PRIVATE_SEGMENT_TRACK pIt = NULL; LPDMUS_PRIVATE_SEGMENT_TRACK pNewSegTrack = NULL; - TRACE("(%p, %p, %#x)\n", This, pTrack, dwGroupBits); + TRACE("(%p, %p, %#x)\n", This, pTrack, group); + + if (!group) + return E_INVALIDARG; LIST_FOR_EACH (pEntry, &This->Tracks) { i++; @@ -259,7 +262,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_InsertTrack(IDirectMusicSegment8 if (NULL == pNewSegTrack) return E_OUTOFMEMORY; - pNewSegTrack->dwGroupBits = dwGroupBits; + pNewSegTrack->dwGroupBits = group; pNewSegTrack->pTrack = pTrack; IDirectMusicTrack_Init(pTrack, (IDirectMusicSegment *)iface); IDirectMusicTrack_AddRef(pTrack);

1 0

Sven Baars : d3dcompiler/tests: Fix a copy-paste error.
by Alexandre Julliard Nov. 27, 2019

Nov. 27, 2019

Module: wine Branch: master Commit: e0143194c282008e1455a1fb1031b5078951873a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0143194c282008e1455a1fb… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri Nov 22 17:49:17 2019 +0100 d3dcompiler/tests: Fix a copy-paste error. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/reflection.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index 810eac8936..f8c97230d6 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -434,7 +434,7 @@ static void test_reflection_desc_vs(void) ok(desc.ReadWriteMask == pdesc->ReadWriteMask, "GetInputParameterDesc(%u) ReadWriteMask failed, got %x, expected %x\n", i, desc.ReadWriteMask, pdesc->ReadWriteMask); ok(desc.Stream == pdesc->Stream, "GetInputParameterDesc(%u) Stream failed, got %u, expected %u\n", - i, desc.Stream, pdesc->ReadWriteMask); + i, desc.Stream, pdesc->Stream); } for (i = 0; i < ARRAY_SIZE(test_reflection_desc_vs_resultout); ++i) @@ -459,7 +459,7 @@ static void test_reflection_desc_vs(void) ok(desc.ReadWriteMask == pdesc->ReadWriteMask, "GetOutputParameterDesc(%u) ReadWriteMask failed, got %x, expected %x\n", i, desc.ReadWriteMask, pdesc->ReadWriteMask); ok(desc.Stream == pdesc->Stream, "GetOutputParameterDesc(%u) Stream failed, got %u, expected %u\n", - i, desc.Stream, pdesc->ReadWriteMask); + i, desc.Stream, pdesc->Stream); } count = ref11->lpVtbl->Release(ref11); @@ -741,7 +741,7 @@ static void test_reflection_desc_ps(void) ok(desc.ReadWriteMask == pdesc->ReadWriteMask, "GetInputParameterDesc(%u) ReadWriteMask failed, got %x, expected %x\n", i, desc.ReadWriteMask, pdesc->ReadWriteMask); ok(desc.Stream == pdesc->Stream, "GetInputParameterDesc(%u) Stream failed, got %u, expected %u\n", - i, desc.Stream, pdesc->ReadWriteMask); + i, desc.Stream, pdesc->Stream); } for (i = 0; i < ARRAY_SIZE(test_reflection_desc_ps_resultout); ++i) @@ -772,7 +772,7 @@ static void test_reflection_desc_ps(void) ok(desc.ReadWriteMask == pdesc->ReadWriteMask, "GetOutputParameterDesc(%u) ReadWriteMask failed, got %x, expected %x\n", i, desc.ReadWriteMask, pdesc->ReadWriteMask); ok(desc.Stream == pdesc->Stream, "GetOutputParameterDesc(%u) Stream failed, got %u, expected %u\n", - i, desc.Stream, pdesc->ReadWriteMask); + i, desc.Stream, pdesc->Stream); } count = ref11->lpVtbl->Release(ref11); @@ -1009,7 +1009,7 @@ static void test_reflection_desc_ps_output(void) ok(desc.ReadWriteMask == pdesc->ReadWriteMask, "(%u): GetOutputParameterDesc ReadWriteMask failed, got %x, expected %x\n", i, desc.ReadWriteMask, pdesc->ReadWriteMask); ok(desc.Stream == pdesc->Stream, "(%u): GetOutputParameterDesc Stream failed, got %u, expected %u\n", - i, desc.Stream, pdesc->ReadWriteMask); + i, desc.Stream, pdesc->Stream); count = ref11->lpVtbl->Release(ref11); ok(count == 0, "(%u): Release failed %u\n", i, count);

1 0

Michael Stefaniuc : dmime/tests: Add some IDirectMusicSegment_GetTrack() tests.
by Alexandre Julliard Nov. 27, 2019

Nov. 27, 2019

Module: wine Branch: master Commit: 88281f4b5f1c32c79237ddc7e0894710d186b7da URL: https://source.winehq.org/git/wine.git/?a=commit;h=88281f4b5f1c32c79237ddc7… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Nov 27 00:49:54 2019 +0100 dmime/tests: Add some IDirectMusicSegment_GetTrack() tests. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/tests/dmime.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 3fb0e8afd8..f561eb391e 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -524,6 +524,86 @@ static void test_segment(void) while (IDirectMusicSegment_Release(dms)); } +static void _add_track(IDirectMusicSegment8 *seg, REFCLSID class, const char *name, DWORD group) +{ + IDirectMusicTrack *track; + HRESULT hr; + + hr = CoCreateInstance(class, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack, + (void**)&track); + ok(hr == S_OK, "%s create failed: %08x, expected S_OK\n", name, hr); + hr = IDirectMusicSegment8_InsertTrack(seg, track, group); + if (group) + ok(hr == S_OK, "Inserting %s failed: %08x, expected S_OK\n", name, hr); + else + ok(hr == E_INVALIDARG, "Inserting %s failed: %08x, expected E_INVALIDARG\n", name, hr); + IDirectMusicTrack_Release(track); +} + +#define add_track(seg, class, group) _add_track(seg, &CLSID_DirectMusic ## class, #class, group) + +static void _expect_track(IDirectMusicSegment8 *seg, REFCLSID expect, const char *name, DWORD group, + DWORD index) +{ + IDirectMusicTrack *track; + IPersistStream *ps; + CLSID class; + HRESULT hr; + + hr = IDirectMusicSegment8_GetTrack(seg, &GUID_NULL, group, index, &track); + if (!expect) { + ok(hr == DMUS_E_NOT_FOUND, "GetTrack failed: %08x, expected DMUS_E_NOT_FOUND\n", hr); + return; + } + + ok(hr == S_OK, "GetTrack failed: %08x, expected S_OK\n", hr); + hr = IDirectMusicTrack_QueryInterface(track, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + hr = IPersistStream_GetClassID(ps, &class); + ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(IsEqualGUID(&class, expect), "For group %#x index %u: Expected class %s got %s\n", + group, index, name, wine_dbgstr_guid(&class)); + + IPersistStream_Release(ps); + IDirectMusicTrack_Release(track); +} + +#define expect_track(seg, class, group, index) _expect_track(seg, &CLSID_DirectMusic ## class, #class, group, index) + +static void test_track_identify(void) +{ + IDirectMusicSegment8 *seg; + IDirectMusicTrack *track; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicSegment, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicSegment8, (void**)&seg); + ok(hr == S_OK, "DirectMusicSegment create failed: %08x, expected S_OK\n", hr); + + add_track(seg, LyricsTrack, 0x0); /* failure */ + add_track(seg, LyricsTrack, 0x1); /* idx 0 group 1 */ + add_track(seg, ParamControlTrack, 0x3); /* idx 1 group 1, idx 0 group 2 */ + add_track(seg, SegmentTriggerTrack, 0x2); /* idx 1 group 2 */ + add_track(seg, SeqTrack, 0x1); /* idx 2 group 1 */ + add_track(seg, TempoTrack, 0x7); /* idx 3 group 1, idx 2 group 2, idx 0 group 3 */ + + hr = IDirectMusicSegment8_GetTrack(seg, &GUID_NULL, 0, 0, &track); + ok(hr == DMUS_E_NOT_FOUND, "GetTrack failed: %08x, expected DMUS_E_NOT_FOUND\n", hr); + + expect_track(seg, LyricsTrack, 0x1, 0); + expect_track(seg, ParamControlTrack, 0x1, 1); + expect_track(seg, SeqTrack, 0x1, 2); + expect_track(seg, TempoTrack, 0x1, 3); + _expect_track(seg, NULL, "", 0x1, 4); + expect_track(seg, ParamControlTrack, 0x2, 0); + expect_track(seg, SegmentTriggerTrack, 0x3, 2); /* groups 1+2 combined index */ + expect_track(seg, SeqTrack, 0x3, 3); /* groups 1+2 combined index */ + expect_track(seg, TempoTrack, 0x7, 4); /* groups 1+2+3 combined index */ + expect_track(seg, TempoTrack, 0xffffffff, 4); /* all groups combined index */ + + IDirectMusicSegment8_Release(seg); +} + static void test_track(void) { IDirectMusicTrack *dmt; @@ -956,6 +1036,7 @@ START_TEST(dmime) test_audiopathconfig(); test_graph(); test_segment(); + test_track_identify(); test_track(); test_parsedescriptor();

1 0

Conor McCarthy : vkd3d/tests: Add and modify tests for GetResourceAllocationInfo().
by Alexandre Julliard Nov. 27, 2019

Nov. 27, 2019

Module: vkd3d Branch: master Commit: a303482acce5a9252e749af30154a4f8040792a4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a303482acce5a9252e749af… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Nov 28 00:35:07 2019 +1000 vkd3d/tests: Add and modify tests for GetResourceAllocationInfo(). Test large DepthOrArraySize for small resources, and test compressed textures at the 64KB limit. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 47c1649..578ae56 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -29437,7 +29437,6 @@ static void test_resource_allocation_info(void) ID3D12Device *device; unsigned int i, j; ULONG refcount; - uint64_t size; static const unsigned int alignments[] = { @@ -29472,12 +29471,15 @@ static void test_resource_allocation_info(void) { 4, 4, 1, 1, DXGI_FORMAT_R8_UINT}, { 8, 8, 1, 1, DXGI_FORMAT_R8G8B8A8_UNORM}, {16, 16, 1, 1, DXGI_FORMAT_R8G8B8A8_UNORM}, - {16, 16, 6, 1, DXGI_FORMAT_R8G8B8A8_UNORM}, + {16, 16, 1024, 1, DXGI_FORMAT_R8G8B8A8_UNORM}, + {256, 512, 1, 10, DXGI_FORMAT_BC1_UNORM}, + {256, 512, 64, 1, DXGI_FORMAT_BC1_UNORM}, {1024, 1024, 1, 1, DXGI_FORMAT_R8G8B8A8_UNORM}, {1024, 1024, 1, 2, DXGI_FORMAT_R8G8B8A8_UNORM}, {1024, 1024, 1, 3, DXGI_FORMAT_R8G8B8A8_UNORM}, {1024, 1024, 1, 0, DXGI_FORMAT_R8G8B8A8_UNORM}, + {260, 512, 1, 1, DXGI_FORMAT_BC1_UNORM}, }; if (!(device = create_device())) @@ -29549,8 +29551,7 @@ static void test_resource_allocation_info(void) info = ID3D12Device_GetResourceAllocationInfo(device, 0, 1, &desc); ok(info.Alignment >= D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT, "Got unexpected alignment %"PRIu64".\n", info.Alignment); - size = desc.Width * desc.Height * desc.DepthOrArraySize * format_size(desc.Format); - if (size <= D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT) + if (i < 6) { check_alignment(info.SizeInBytes, info.Alignment); }

1 0