August 2019 - Wine-commits - list.winehq.org

Alexandre Julliard : Wine release 4.15
by Alexandre Julliard 30 Aug '19

30 Aug '19

Module: website Branch: master Commit: 134de9d83ff517fafd0ca79615a2d0667e48013d URL: https://source.winehq.org/git/website.git/?a=commit;h=134de9d83ff517fafd0ca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 30 22:13:52 2019 +0200 Wine release 4.15 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2019083001.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2019083001.xml b/news/en/2019083001.xml new file mode 100644 index 0000000..5489818 --- /dev/null +++ b/news/en/2019083001.xml @@ -0,0 +1,16 @@ +<news> +<date>August 30, 2019</date> +<title>Wine 4.15 Released</title> +<body> + The Wine development release 4.15 is now available. + <a href="{$root}/announce/4.15">What's new</a> in this release: +<ul> + <li>Initial implementation of the HTTP service.</li> + <li>Stack unwinding support on ARM64.</li> + <li>Better multi-monitor support on macOS.</li> + <li>RichEdit control optimizations.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/4.x/wine-4.15.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Zebediah Figura : amstream/tests: Link to strmiids and uuid.
by Alexandre Julliard 30 Aug '19

30 Aug '19

Module: wine Branch: master Commit: 0fe51e0fa6fd9bb343e19906d2cce3a72f0c29b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fe51e0fa6fd9bb343e19906… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Aug 29 22:49:26 2019 -0500 amstream/tests: Link to strmiids and uuid. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/Makefile.in | 2 +- dlls/amstream/tests/amstream.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/amstream/tests/Makefile.in b/dlls/amstream/tests/Makefile.in index 915ea0f..3a1a269 100644 --- a/dlls/amstream/tests/Makefile.in +++ b/dlls/amstream/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = amstream.dll -IMPORTS = quartz ddraw oleaut32 ole32 user32 +IMPORTS = strmiids uuid ddraw ole32 user32 C_SRCS = \ amstream.c diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 1bb5546..b83e7bc 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -21,12 +21,11 @@ #define COBJMACROS #include "wine/test.h" -#include "initguid.h" #include "dshow.h" #include "amstream.h" -#include "vfwmsgs.h" #include "mmreg.h" #include "ks.h" +#include "initguid.h" #include "ksmedia.h" static const WCHAR primary_video_sink_id[] = {'I','{','A','3','5','F','F','5','6','A',

1 0

Zebediah Figura : amstream: Rename amstream.c to multimedia.c.
by Alexandre Julliard 30 Aug '19

30 Aug '19

Module: wine Branch: master Commit: 0a7933a4ebeb6f53f10c29f796a8e3ac1a26df5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a7933a4ebeb6f53f10c29f7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 29 22:49:27 2019 -0500 amstream: Rename amstream.c to multimedia.c. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/Makefile.in | 4 ++-- dlls/amstream/{amstream.c => multimedia.c} | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/amstream/Makefile.in b/dlls/amstream/Makefile.in index d2dfa68..0b278f4 100644 --- a/dlls/amstream/Makefile.in +++ b/dlls/amstream/Makefile.in @@ -4,11 +4,11 @@ IMPORTS = strmiids strmbase uuid ole32 advapi32 ddraw EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ - amstream.c \ audiodata.c \ filter.c \ main.c \ - mediastream.c + mediastream.c \ + multimedia.c IDL_SRCS = amstream_classes.idl diff --git a/dlls/amstream/amstream.c b/dlls/amstream/multimedia.c similarity index 99% rename from dlls/amstream/amstream.c rename to dlls/amstream/multimedia.c index 06fa564..003d2b4 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/multimedia.c @@ -1,5 +1,5 @@ /* - * Implementation of IAMMultiMediaStream Interface + * Multimedia stream object * * Copyright 2004, 2012 Christian Costa * Copyright 2006 Ivan Leo Puoti

1 0

Zebediah Figura : amstream: Get rid of the IAMMultiMediaStreamImpl typedef.
by Alexandre Julliard 30 Aug '19

30 Aug '19

Module: wine Branch: master Commit: 8af6ed6881416ee4cb13d57475988df3d25c92c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8af6ed6881416ee4cb13d574… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 29 22:49:28 2019 -0500 amstream: Get rid of the IAMMultiMediaStreamImpl typedef. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/multimedia.c | 52 +++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8af6ed6881416ee4cb13…

1 0

André Hentschel : ntdll: Add RtlUnwindEx spec entry for ARM64.
by Alexandre Julliard 30 Aug '19

30 Aug '19

Module: wine Branch: master Commit: 9220772d28c6c10051626dbf466faa713e3e9405 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9220772d28c6c10051626dbf… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Aug 30 20:21:54 2019 +0200 ntdll: Add RtlUnwindEx spec entry for ARM64. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-rtlsupport-l1-1-0.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/ntdll/ntdll.spec | 2 +- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-core-rtlsupport-l1-1-0/api-ms-win-core-rtlsupport-l1-1-0.spec b/dlls/api-ms-win-core-rtlsupport-l1-1-0/api-ms-win-core-rtlsupport-l1-1-0.spec index a1b81f5..0305068 100644 --- a/dlls/api-ms-win-core-rtlsupport-l1-1-0/api-ms-win-core-rtlsupport-l1-1-0.spec +++ b/dlls/api-ms-win-core-rtlsupport-l1-1-0/api-ms-win-core-rtlsupport-l1-1-0.spec @@ -11,5 +11,5 @@ @ stdcall -norelay RtlRaiseException(ptr) ntdll.RtlRaiseException @ stdcall -arch=x86_64 RtlRestoreContext(ptr ptr) ntdll.RtlRestoreContext @ stdcall -norelay RtlUnwind(ptr ptr ptr ptr) ntdll.RtlUnwind -@ stdcall -arch=x86_64 RtlUnwindEx(ptr ptr ptr ptr ptr ptr) ntdll.RtlUnwindEx +@ stdcall -arch=arm64,x86_64 RtlUnwindEx(ptr ptr ptr ptr ptr ptr) ntdll.RtlUnwindEx @ stdcall -arch=arm64,x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) ntdll.RtlVirtualUnwind diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 765173b..b562c74 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1299,7 +1299,7 @@ @ stdcall -arch=arm -norelay RtlRaiseException(ptr) ntdll.RtlRaiseException @ stdcall -arch=x86_64 RtlRestoreContext(ptr ptr) ntdll.RtlRestoreContext @ stdcall RtlUnwind(ptr ptr ptr long) ntdll.RtlUnwind -@ stdcall -arch=x86_64 RtlUnwindEx(long long ptr long ptr) ntdll.RtlUnwindEx +@ stdcall -arch=arm64,x86_64 RtlUnwindEx(long long ptr long ptr) ntdll.RtlUnwindEx @ stdcall -arch=arm64,x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) ntdll.RtlVirtualUnwind @ stdcall RtlZeroMemory(ptr long) ntdll.RtlZeroMemory @ stdcall -i386 -private -norelay SMapLS() krnl386.exe16.SMapLS diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 82c78f6..b8f5415 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -983,7 +983,7 @@ @ stdcall RtlUnlockHeap(long) # @ stub RtlUnlockMemoryStreamRegion @ stdcall -norelay RtlUnwind(ptr ptr ptr ptr) -@ stdcall -arch=x86_64 RtlUnwindEx(ptr ptr ptr ptr ptr ptr) +@ stdcall -arch=arm64,x86_64 RtlUnwindEx(ptr ptr ptr ptr ptr ptr) @ stdcall RtlUpcaseUnicodeChar(long) @ stdcall RtlUpcaseUnicodeString(ptr ptr long) @ stdcall RtlUpcaseUnicodeStringToAnsiString(ptr ptr long) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index ddc3f72..c46891d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1210,7 +1210,7 @@ @ stdcall RtlUnicodeToOemN(ptr long ptr ptr long) @ stub RtlUnlockBootStatusData @ stdcall -norelay RtlUnwind(ptr ptr ptr ptr) -@ stdcall -arch=x86_64 RtlUnwindEx(ptr ptr ptr ptr ptr ptr) +@ stdcall -arch=arm64,x86_64 RtlUnwindEx(ptr ptr ptr ptr ptr ptr) @ stdcall RtlUpcaseUnicodeChar(long) @ stdcall RtlUpcaseUnicodeString(ptr ptr long) @ stdcall RtlUpcaseUnicodeStringToAnsiString(ptr ptr long)

1 0

Jeff Smith : d3drm: Implement d3drm_viewport2_GetCamera().
by Alexandre Julliard 30 Aug '19

30 Aug '19

Module: wine Branch: master Commit: 99a2fec667b5048d62a607971bb14d1eb0dc9496 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99a2fec667b5048d62a60797… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Sat Aug 31 00:11:50 2019 +0430 d3drm: Implement d3drm_viewport2_GetCamera(). Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm_private.h | 2 ++ dlls/d3drm/frame.c | 4 +--- dlls/d3drm/tests/d3drm.c | 33 +++++++++++++++++++++++++++++++-- dlls/d3drm/viewport.c | 30 ++++++++++++++++++++++++++---- 4 files changed, 60 insertions(+), 9 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=99a2fec667b5048d62a6…

1 0

Jeff Smith : d3drm: Implement d3drm_viewport2_SetCamera().
by Alexandre Julliard 30 Aug '19

30 Aug '19

Module: wine Branch: master Commit: 70568cd1201fa3192e05050fd343ee5b07505a18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70568cd1201fa3192e05050f… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Sat Aug 31 00:11:51 2019 +0430 d3drm: Implement d3drm_viewport2_SetCamera(). Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 33 +++++++++++++++++++++++++++++++++ dlls/d3drm/viewport.c | 22 ++++++++++++++++++---- 2 files changed, 51 insertions(+), 4 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 403822c..76d2dbe 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1791,11 +1791,20 @@ static void test_Viewport(void) ok(device1 == d3drm_device1, "Expected device returned = %p, got %p.\n", device1, d3drm_device1); IDirect3DRMDevice_Release(d3drm_device1); + hr = IDirect3DRMViewport_SetCamera(viewport, NULL); + ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); hr = IDirect3DRMViewport_GetCamera(viewport, &d3drm_frame); ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); ok(frame == d3drm_frame, "Expected frame returned = %p, got %p.\n", frame, d3drm_frame); IDirect3DRMFrame_Release(d3drm_frame); + hr = IDirect3DRMViewport_SetCamera(viewport, tmp_frame1); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMViewport_GetCamera(viewport, &d3drm_frame); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + ok(d3drm_frame == tmp_frame1, "Got unexpected frame %p, expected %p.\n", d3drm_frame, tmp_frame1); + IDirect3DRMFrame_Release(d3drm_frame); + IDirect3DRMViewport_Release(viewport); ref4 = get_refcount((IUnknown *)d3drm1); ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4); @@ -1826,11 +1835,20 @@ static void test_Viewport(void) ok(device1 == d3drm_device1, "Expected device returned = %p, got %p.\n", device1, d3drm_device1); IDirect3DRMDevice_Release(d3drm_device1); + hr = IDirect3DRMViewport_SetCamera(viewport, NULL); + ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); hr = IDirect3DRMViewport_GetCamera(viewport, &d3drm_frame); ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); ok(frame == d3drm_frame, "Expected frame returned = %p, got %p.\n", frame, d3drm_frame); IDirect3DRMFrame_Release(d3drm_frame); + hr = IDirect3DRMViewport_SetCamera(viewport, tmp_frame1); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMViewport_GetCamera(viewport, &d3drm_frame); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + ok(d3drm_frame == tmp_frame1, "Got unexpected frame %p, expected %p.\n", d3drm_frame, tmp_frame1); + IDirect3DRMFrame_Release(d3drm_frame); + IDirect3DRMViewport_Release(viewport); ref4 = get_refcount((IUnknown *)d3drm1); ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4); @@ -1864,11 +1882,20 @@ static void test_Viewport(void) ok(device3 == d3drm_device3, "Expected device returned = %p, got %p.\n", device3, d3drm_device3); IDirect3DRMDevice3_Release(d3drm_device3); + hr = IDirect3DRMViewport2_SetCamera(viewport2, NULL); + ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); hr = IDirect3DRMViewport2_GetCamera(viewport2, &d3drm_frame3); ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); ok(frame3 == d3drm_frame3, "Expected frame returned = %p, got %p.\n", frame3, d3drm_frame3); IDirect3DRMFrame3_Release(d3drm_frame3); + hr = IDirect3DRMViewport2_SetCamera(viewport2, tmp_frame3); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMViewport2_GetCamera(viewport2, &d3drm_frame3); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + ok(d3drm_frame3 == tmp_frame3, "Got unexpected frame %p, expected %p.\n", d3drm_frame3, tmp_frame3); + IDirect3DRMFrame3_Release(d3drm_frame3); + IDirect3DRMViewport2_Release(viewport2); ref4 = get_refcount((IUnknown *)d3drm1); ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4); @@ -2110,6 +2137,9 @@ static void test_Viewport(void) hr = IDirect3DRMViewport_GetCamera(viewport, &d3drm_frame); ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMViewport_SetCamera(viewport, frame); + ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); + /* Test all failures together */ hr = IDirect3DRMViewport_Init(viewport, NULL, frame, rc.left, rc.top, rc.right, rc.bottom); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); @@ -2217,6 +2247,9 @@ static void test_Viewport(void) hr = IDirect3DRMViewport2_GetCamera(viewport2, &d3drm_frame3); ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMViewport2_SetCamera(viewport2, frame3); + ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMViewport2_Init(viewport2, NULL, frame3, rc.left, rc.top, rc.right, rc.bottom); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); hr = IDirect3DRMViewport2_Init(viewport2, device3, NULL, rc.left, rc.top, rc.right, rc.bottom); diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index 833afb9..6da7d7e 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -556,16 +556,30 @@ static HRESULT WINAPI d3drm_viewport1_SetUniformScaling(IDirect3DRMViewport *ifa static HRESULT WINAPI d3drm_viewport2_SetCamera(IDirect3DRMViewport2 *iface, IDirect3DRMFrame3 *camera) { - FIXME("iface %p, camera %p stub!\n", iface, camera); + struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport2(iface); + struct d3drm_frame *frame = unsafe_impl_from_IDirect3DRMFrame3(camera); - return E_NOTIMPL; + TRACE("iface %p, camera %p.\n", iface, camera); + + if (!camera || !viewport->camera) + return D3DRMERR_BADOBJECT; + + IDirect3DRMFrame_AddRef(&frame->IDirect3DRMFrame_iface); + IDirect3DRMFrame_Release(viewport->camera); + viewport->camera = &frame->IDirect3DRMFrame_iface; + + return D3DRM_OK; } static HRESULT WINAPI d3drm_viewport1_SetCamera(IDirect3DRMViewport *iface, IDirect3DRMFrame *camera) { - FIXME("iface %p, camera %p stub!\n", iface, camera); + struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport(iface); + struct d3drm_frame *frame = unsafe_impl_from_IDirect3DRMFrame(camera); - return E_NOTIMPL; + TRACE("iface %p, camera %p.\n", iface, camera); + + return d3drm_viewport2_SetCamera(&viewport->IDirect3DRMViewport2_iface, + frame ? &frame->IDirect3DRMFrame3_iface : NULL); } static HRESULT WINAPI d3drm_viewport2_SetProjection(IDirect3DRMViewport2 *iface, D3DRMPROJECTIONTYPE type)

1 0

Jeff Smith : d3drm: Implement d3drm_viewport2_GetPlane().
by Alexandre Julliard 30 Aug '19

30 Aug '19

Module: wine Branch: master Commit: f3adad102d0adc1340e697c652ba1c702b8f142b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3adad102d0adc1340e697c6… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Sat Aug 31 00:11:52 2019 +0430 d3drm: Implement d3drm_viewport2_GetPlane(). Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm_private.h | 14 ++++++++--- dlls/d3drm/tests/d3drm.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/d3drm/viewport.c | 47 ++++++++++++++++++++++++++-------- 3 files changed, 111 insertions(+), 13 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f3adad102d0adc1340e6…

1 0

Jeff Smith : d3drm: Implement d3drm_viewport2_SetPlane().
by Alexandre Julliard 30 Aug '19

30 Aug '19

Module: wine Branch: master Commit: fe03e3637ee8848647fce1a8d17492a38e3fbc57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe03e3637ee8848647fce1a8… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Sat Aug 31 00:11:53 2019 +0430 d3drm: Implement d3drm_viewport2_SetPlane(). Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 26 ++++++++++++++++++++++++++ dlls/d3drm/viewport.c | 20 ++++++++++++++++---- 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 3293887..bb58350 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -2151,6 +2151,8 @@ static void test_Viewport(void) ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); hr = IDirect3DRMViewport_SetField(viewport, 0.5f); ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMViewport_SetPlane(viewport, -0.5f, 0.5f, -0.5f, 0.5f); + ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); /* Test all failures together */ hr = IDirect3DRMViewport_Init(viewport, NULL, frame, rc.left, rc.top, rc.right, rc.bottom); @@ -2234,6 +2236,17 @@ static void test_Viewport(void) ok(bottom == -1.0f, "Got unexpected bottom %.8e.\n", bottom); ok(top == 1.0f, "Got unexpected top %.8e.\n", top); + hr = IDirect3DRMViewport_SetPlane(viewport, 5.0f, 3.0f, 2.0f, 0.0f); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + field = IDirect3DRMViewport_GetField(viewport); + ok(field == -1.0f, "Got unexpected field %.8e.\n", field); + hr = IDirect3DRMViewport_GetPlane(viewport, &left, &right, &bottom, &top); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + ok(left == 5.0f, "Got unexpected left %.8e.\n", left); + ok(right == 3.0f, "Got unexpected right %.8e.\n", right); + ok(bottom == 2.0f, "Got unexpected bottom %.8e.\n", bottom); + ok(top == 0.0f, "Got unexpected top %.8e.\n", top); + hr = IDirect3DRMViewport_Init(viewport, device1, frame, rc.left, rc.top, rc.right, rc.bottom); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); hr = IDirect3DRMViewport_GetDevice(viewport, NULL); @@ -2292,6 +2305,8 @@ static void test_Viewport(void) ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); hr = IDirect3DRMViewport2_SetField(viewport2, 0.5f); ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMViewport2_SetPlane(viewport2, -0.5f, 0.5f, -0.5f, 0.5f); + ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); hr = IDirect3DRMViewport2_Init(viewport2, NULL, frame3, rc.left, rc.top, rc.right, rc.bottom); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); @@ -2368,6 +2383,17 @@ static void test_Viewport(void) ok(bottom == -1.0f, "Got unexpected bottom %.8e.\n", bottom); ok(top == 1.0f, "Got unexpected top %.8e.\n", top); + hr = IDirect3DRMViewport2_SetPlane(viewport2, 5.0f, 3.0f, 2.0f, 0.0f); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + field = IDirect3DRMViewport2_GetField(viewport2); + ok(field == -1.0f, "Got unexpected field %.8e.\n", field); + hr = IDirect3DRMViewport2_GetPlane(viewport2, &left, &right, &bottom, &top); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + ok(left == 5.0f, "Got unexpected left %.8e.\n", left); + ok(right == 3.0f, "Got unexpected right %.8e.\n", right); + ok(bottom == 2.0f, "Got unexpected bottom %.8e.\n", bottom); + ok(top == 0.0f, "Got unexpected top %.8e.\n", top); + hr = IDirect3DRMViewport2_Init(viewport2, device3, frame3, rc.left, rc.top, rc.right, rc.bottom); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); hr = IDirect3DRMViewport2_GetDevice(viewport2, NULL); diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index 9710599..2c923b1 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -676,19 +676,31 @@ static HRESULT WINAPI d3drm_viewport1_ForceUpdate(IDirect3DRMViewport *iface, static HRESULT WINAPI d3drm_viewport2_SetPlane(IDirect3DRMViewport2 *iface, D3DVALUE left, D3DVALUE right, D3DVALUE bottom, D3DVALUE top) { - FIXME("iface %p, left %.8e, right %.8e, bottom %.8e, top %.8e stub!\n", + struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport2(iface); + + TRACE("iface %p, left %.8e, right %.8e, bottom %.8e, top %.8e.\n", iface, left, right, bottom, top); - return E_NOTIMPL; + if (!viewport->d3d_viewport) + return D3DRMERR_BADOBJECT; + + viewport->clip.left = left; + viewport->clip.right = right; + viewport->clip.bottom = bottom; + viewport->clip.top = top; + + return D3DRM_OK; } static HRESULT WINAPI d3drm_viewport1_SetPlane(IDirect3DRMViewport *iface, D3DVALUE left, D3DVALUE right, D3DVALUE bottom, D3DVALUE top) { - FIXME("iface %p, left %.8e, right %.8e, bottom %.8e, top %.8e stub!\n", + struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport(iface); + + TRACE("iface %p, left %.8e, right %.8e, bottom %.8e, top %.8e.\n", iface, left, right, bottom, top); - return E_NOTIMPL; + return d3drm_viewport2_SetPlane(&viewport->IDirect3DRMViewport2_iface, left, right, bottom, top); } static HRESULT WINAPI d3drm_viewport2_GetCamera(IDirect3DRMViewport2 *iface, IDirect3DRMFrame3 **camera)

1 0

Jeff Smith : d3drm: Initialise the front and back clip distances in d3drm_viewport2_Init().
by Alexandre Julliard 30 Aug '19

30 Aug '19

Module: wine Branch: master Commit: 54a1913dec79302c46b4f541e2b4cfc45c2d9dc7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54a1913dec79302c46b4f541… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Sat Aug 31 00:11:54 2019 +0430 d3drm: Initialise the front and back clip distances in d3drm_viewport2_Init(). Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/d3drm/viewport.c | 20 ++++++++++++++++ 2 files changed, 79 insertions(+), 1 deletion(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index bb58350..0f9f9cd 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1714,7 +1714,7 @@ static void test_Viewport(void) { IDirect3DRMFrame3 *frame3, *d3drm_frame3, *tmp_frame3; IDirect3DRMFrame *frame, *d3drm_frame, *tmp_frame1; - float field, left, top, right, bottom; + float field, left, top, right, bottom, front, back; IDirectDrawClipper *clipper; HRESULT hr; IDirect3DRM *d3drm1; @@ -2146,6 +2146,10 @@ static void test_Viewport(void) ok(right == 10.0f, "Got unexpected right %.8e.\n", right); ok(bottom == 10.0f, "Got unexpected bottom %.8e.\n", bottom); ok(top == 10.0f, "Got unexpected top %.8e.\n", top); + front = IDirect3DRMViewport_GetFront(viewport); + ok(front == -1.0f, "Got unexpected front %.8e\n", front); + back = IDirect3DRMViewport_GetBack(viewport); + ok(back == -1.0f, "Got unexpected back %.8e\n", back); hr = IDirect3DRMViewport_SetCamera(viewport, frame); ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); @@ -2153,6 +2157,10 @@ static void test_Viewport(void) ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); hr = IDirect3DRMViewport_SetPlane(viewport, -0.5f, 0.5f, -0.5f, 0.5f); ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMViewport_SetFront(viewport, 1.0f); + ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMViewport_SetBack(viewport, 100.0f); + ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); /* Test all failures together */ hr = IDirect3DRMViewport_Init(viewport, NULL, frame, rc.left, rc.top, rc.right, rc.bottom); @@ -2224,6 +2232,10 @@ static void test_Viewport(void) ok(right == 0.5f, "Got unexpected right %.8e.\n", right); ok(bottom == -0.5f, "Got unexpected bottom %.8e.\n", bottom); ok(top == 0.5f, "Got unexpected top %.8e.\n", top); + front = IDirect3DRMViewport_GetFront(viewport); + ok(front == 1.0f, "Got unexpected front %.8e.\n", front); + back = IDirect3DRMViewport_GetBack(viewport); + ok(back == 100.0f, "Got unexpected back %.8e.\n", back); hr = IDirect3DRMViewport_SetField(viewport, 1.0f); ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); @@ -2246,6 +2258,14 @@ static void test_Viewport(void) ok(right == 3.0f, "Got unexpected right %.8e.\n", right); ok(bottom == 2.0f, "Got unexpected bottom %.8e.\n", bottom); ok(top == 0.0f, "Got unexpected top %.8e.\n", top); + hr = IDirect3DRMViewport_SetFront(viewport, 2.0f); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + front = IDirect3DRMViewport_GetFront(viewport); + ok(front == 2.0f, "Got unexpected front %.8e.\n", front); + hr = IDirect3DRMViewport_SetBack(viewport, 200.0f); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + back = IDirect3DRMViewport_GetBack(viewport); + ok(back == 200.0f, "Got unexpected back %.8e.\n", back); hr = IDirect3DRMViewport_Init(viewport, device1, frame, rc.left, rc.top, rc.right, rc.bottom); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); @@ -2259,6 +2279,15 @@ static void test_Viewport(void) ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); hr = IDirect3DRMViewport_SetField(viewport, -1.0f); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + hr = IDirect3DRMViewport_SetFront(viewport, 0.0f); + ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMViewport_SetFront(viewport, -1.0f); + ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr); + front = IDirect3DRMViewport_GetFront(viewport); + hr = IDirect3DRMViewport_SetBack(viewport, front); + ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMViewport_SetBack(viewport, front / 2.0f); + ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr); IDirect3DRMViewport_Release(viewport); ref4 = get_refcount((IUnknown *)d3drm1); @@ -2300,6 +2329,10 @@ static void test_Viewport(void) ok(right == 10.0f, "Got unexpected right %.8e.\n", right); ok(bottom == 10.0f, "Got unexpected bottom %.8e.\n", bottom); ok(top == 10.0f, "Got unexpected top %.8e.\n", top); + front = IDirect3DRMViewport2_GetFront(viewport2); + ok(front == -1.0f, "Got unexpected front %.8e\n", front); + back = IDirect3DRMViewport2_GetBack(viewport2); + ok(back == -1.0f, "Got unexpected back %.8e\n", back); hr = IDirect3DRMViewport2_SetCamera(viewport2, frame3); ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); @@ -2307,6 +2340,10 @@ static void test_Viewport(void) ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); hr = IDirect3DRMViewport2_SetPlane(viewport2, -0.5f, 0.5f, -0.5f, 0.5f); ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMViewport2_SetFront(viewport2, 1.0f); + ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMViewport2_SetBack(viewport2, 100.0f); + ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); hr = IDirect3DRMViewport2_Init(viewport2, NULL, frame3, rc.left, rc.top, rc.right, rc.bottom); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); @@ -2371,6 +2408,10 @@ static void test_Viewport(void) ok(right == 0.5f, "Got unexpected right %.8e.\n", right); ok(bottom == -0.5f, "Got unexpected bottom %.8e.\n", bottom); ok(top == 0.5f, "Got unexpected top %.8e.\n", top); + front = IDirect3DRMViewport2_GetFront(viewport2); + ok(front == 1.0f, "Got unexpected front %.8e.\n", front); + back = IDirect3DRMViewport2_GetBack(viewport2); + ok(back == 100.0f, "Got unexpected back %.8e.\n", back); hr = IDirect3DRMViewport2_SetField(viewport2, 1.0f); ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); @@ -2393,6 +2434,14 @@ static void test_Viewport(void) ok(right == 3.0f, "Got unexpected right %.8e.\n", right); ok(bottom == 2.0f, "Got unexpected bottom %.8e.\n", bottom); ok(top == 0.0f, "Got unexpected top %.8e.\n", top); + hr = IDirect3DRMViewport2_SetFront(viewport2, 2.0f); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + front = IDirect3DRMViewport2_GetFront(viewport2); + ok(front == 2.0f, "Got unexpected front %.8e.\n", front); + hr = IDirect3DRMViewport2_SetBack(viewport2, 200.0f); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + back = IDirect3DRMViewport2_GetBack(viewport2); + ok(back == 200.0f, "Got unexpected back %.8e.\n", back); hr = IDirect3DRMViewport2_Init(viewport2, device3, frame3, rc.left, rc.top, rc.right, rc.bottom); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); @@ -2406,6 +2455,15 @@ static void test_Viewport(void) ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); hr = IDirect3DRMViewport2_SetField(viewport2, -1.0f); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + hr = IDirect3DRMViewport2_SetFront(viewport2, 0.0f); + ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMViewport2_SetFront(viewport2, -1.0f); + ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr); + front = IDirect3DRMViewport2_GetFront(viewport2); + hr = IDirect3DRMViewport2_SetBack(viewport2, front); + ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMViewport2_SetBack(viewport2, front / 2.0f); + ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr); IDirect3DRMViewport2_Release(viewport2); ref4 = get_refcount((IUnknown *)d3drm1); diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index 2c923b1..8e959d5 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -373,6 +373,8 @@ static HRESULT WINAPI d3drm_viewport2_Init(IDirect3DRMViewport2 *iface, IDirect3 viewport->clip.top = 0.5f; viewport->clip.right = 0.5f; viewport->clip.bottom = -0.5f; + viewport->clip.front = 1.0f; + viewport->clip.back = 100.0f; cleanup: @@ -488,6 +490,12 @@ static HRESULT WINAPI d3drm_viewport2_SetFront(IDirect3DRMViewport2 *iface, D3DV TRACE("iface %p, front %.8e.\n", iface, front); + if (!viewport->d3d_viewport) + return D3DRMERR_BADOBJECT; + + if (front <= 0.0f) + return D3DRMERR_BADVALUE; + viewport->clip.front = front; return D3DRM_OK; @@ -508,6 +516,12 @@ static HRESULT WINAPI d3drm_viewport2_SetBack(IDirect3DRMViewport2 *iface, D3DVA TRACE("iface %p, back %.8e.\n", iface, back); + if (!viewport->d3d_viewport) + return D3DRMERR_BADOBJECT; + + if (back <= viewport->clip.front) + return D3DRMERR_BADVALUE; + viewport->clip.back = back; return D3DRM_OK; @@ -919,6 +933,9 @@ static D3DVALUE WINAPI d3drm_viewport2_GetBack(IDirect3DRMViewport2 *iface) TRACE("iface %p.\n", iface); + if (!viewport->d3d_viewport) + return -1.0f; + return viewport->clip.back; } @@ -937,6 +954,9 @@ static D3DVALUE WINAPI d3drm_viewport2_GetFront(IDirect3DRMViewport2 *iface) TRACE("iface %p.\n", iface); + if (!viewport->d3d_viewport) + return -1.0f; + return viewport->clip.front; }

1 0