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

Michael Stefaniuc : Release 4.0.2.
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: acfa1c8c9f891a07491c9d85f06b085fa2ffa85d URL: https://source.winehq.org/git/wine.git/?a=commit;h=acfa1c8c9f891a07491c9d85… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Aug 15 20:44:31 2019 +0200 Release 4.0.2. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 406 +++++++++++++++++++++++++++++++++----------------------------- AUTHORS | 4 + VERSION | 2 +- configure | 18 +-- 4 files changed, 232 insertions(+), 198 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=acfa1c8c9f891a07491c…

1 0

Tag wine-4.0.2 : Alexandre Julliard : Release 4.0.2
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: refs/tags/wine-4.0.2 Tag: 6839b4f960f5b50ea96b10bc69fbeefe33ad51ee URL: https://source.winehq.org/git/wine.git/?a=tag;h=6839b4f960f5b50ea96b10bc69f… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 23 16:29:32 2019 +0200 Release 4.0.2

1 0

Gijs Vermeulen : riched20: Handle tomEnd in ITextRange::ScrollIntoView.
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: 0cfe81859cba69ca990298e1497a33b10f91dbb8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cfe81859cba69ca990298e1… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Apr 15 12:14:15 2019 +0200 riched20: Handle tomEnd in ITextRange::ScrollIntoView. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46899 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 840af642dbf8a222fdd9f40256db0a84c5279fc2) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/riched20/richole.c | 4 ++++ dlls/riched20/tests/richole.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 447e7d4..eca419a 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -2475,6 +2475,10 @@ static HRESULT WINAPI ITextRange_fnScrollIntoView(ITextRange *me, LONG value) ME_CursorFromCharOfs(editor, This->start, &cursor); ME_GetCursorCoordinates(editor, &cursor, &x, &y, &height); break; + case tomEnd: + ME_CursorFromCharOfs(editor, This->end, &cursor); + ME_GetCursorCoordinates(editor, &cursor, &x, &y, &height); + break; default: FIXME("bStart value %d not handled\n", value); return E_NOTIMPL; diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index d3ffdce..3360986 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -853,15 +853,19 @@ static void test_ITextRange_ScrollIntoView(void) /* Scroll to the top. */ check_range(w, txtDoc, 0, 1, tomStart, 0); + check_range(w, txtDoc, 0, 1, tomEnd, 0); /* Scroll to the bottom. */ check_range(w, txtDoc, 19, 20, tomStart, 1); + check_range(w, txtDoc, 19, 20, tomEnd, 1); /* Back up to the top. */ check_range(w, txtDoc, 0, 1, tomStart, 0); + check_range(w, txtDoc, 0, 1, tomEnd, 0); /* Large range */ check_range(w, txtDoc, 0, 20, tomStart, 0); + check_range(w, txtDoc, 0, 20, tomEnd, 1); hres = ITextDocument_Range(txtDoc, 0, 0, &txtRge); ok(hres == S_OK, "got 0x%08x\n", hres);

1 0

Józef Kucia : dxgi: Do not forward d3d11_swapchain_Present() to d3d11_swapchain_Present1().
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: f8795125cdc3f4f49f0452f91c842d4d530e48a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8795125cdc3f4f49f0452f9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 13 14:48:18 2019 +0100 dxgi: Do not forward d3d11_swapchain_Present() to d3d11_swapchain_Present1(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e88084f65097b77bf80a47e75ea62065c300186d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dxgi/swapchain.c | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 07438f3..509e075 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -244,13 +244,33 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetDevice(IDXGISwapChain1 *ifac /* IDXGISwapChain1 methods */ +static HRESULT d3d11_swapchain_present(struct d3d11_swapchain *swapchain, + unsigned int sync_interval, unsigned int flags) +{ + if (sync_interval > 4) + { + WARN("Invalid sync interval %u.\n", sync_interval); + return DXGI_ERROR_INVALID_CALL; + } + + if (flags & ~DXGI_PRESENT_TEST) + FIXME("Unimplemented flags %#x.\n", flags); + if (flags & DXGI_PRESENT_TEST) + { + WARN("Returning S_OK for DXGI_PRESENT_TEST.\n"); + return S_OK; + } + + return wined3d_swapchain_present(swapchain->wined3d_swapchain, NULL, NULL, NULL, sync_interval, 0); +} + static HRESULT STDMETHODCALLTYPE d3d11_swapchain_Present(IDXGISwapChain1 *iface, UINT sync_interval, UINT flags) { struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); TRACE("iface %p, sync_interval %u, flags %#x.\n", iface, sync_interval, flags); - return IDXGISwapChain1_Present1(&swapchain->IDXGISwapChain1_iface, sync_interval, flags, NULL); + return d3d11_swapchain_present(swapchain, sync_interval, flags); } static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetBuffer(IDXGISwapChain1 *iface, @@ -606,24 +626,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_Present1(IDXGISwapChain1 *iface TRACE("iface %p, sync_interval %u, flags %#x, present_parameters %p.\n", iface, sync_interval, flags, present_parameters); - if (sync_interval > 4) - { - WARN("Invalid sync interval %u.\n", sync_interval); - return DXGI_ERROR_INVALID_CALL; - } - - if (flags & ~DXGI_PRESENT_TEST) - FIXME("Unimplemented flags %#x.\n", flags); - if (flags & DXGI_PRESENT_TEST) - { - WARN("Returning S_OK for DXGI_PRESENT_TEST.\n"); - return S_OK; - } - if (present_parameters) FIXME("Ignored present parameters %p.\n", present_parameters); - return wined3d_swapchain_present(swapchain->wined3d_swapchain, NULL, NULL, NULL, sync_interval, 0); + return d3d11_swapchain_present(swapchain, sync_interval, flags); } static BOOL STDMETHODCALLTYPE d3d11_swapchain_IsTemporaryMonoSupported(IDXGISwapChain1 *iface)

1 0

Andrey Gusev : dxgi: Add DECLSPEC_HOTPATCH to d3d11_swapchain_Present().
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: e3539df7a9709de3767b1e479d6a7bdf92ea4513 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3539df7a9709de3767b1e47… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Apr 23 14:28:27 2019 +0300 dxgi: Add DECLSPEC_HOTPATCH to d3d11_swapchain_Present(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46953 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46971 Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 29cd7dd0725e9f66bb080f4f5b76fd2e4328ba69) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dxgi/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 509e075..412dcad 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -264,7 +264,7 @@ static HRESULT d3d11_swapchain_present(struct d3d11_swapchain *swapchain, return wined3d_swapchain_present(swapchain->wined3d_swapchain, NULL, NULL, NULL, sync_interval, 0); } -static HRESULT STDMETHODCALLTYPE d3d11_swapchain_Present(IDXGISwapChain1 *iface, UINT sync_interval, UINT flags) +static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d11_swapchain_Present(IDXGISwapChain1 *iface, UINT sync_interval, UINT flags) { struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface);

1 0

Andrey Gusev : setupapi: Add DECLSPEC_HOTPATCH to SetupDiEnumDeviceInfo().
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: 8e62ef4ca0cff2e7c541760c65d14d6bd2e3a68c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e62ef4ca0cff2e7c541760c… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Apr 23 14:28:49 2019 +0300 setupapi: Add DECLSPEC_HOTPATCH to SetupDiEnumDeviceInfo(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46971 Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5466df6957606718aaaee61debd85ab22fb85800) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/setupapi/devinst.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index be57d1a..4ebce8f 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1607,7 +1607,7 @@ BOOL WINAPI SetupDiDeleteDeviceInterfaceData(HDEVINFO devinfo, SP_DEVICE_INTERFA /*********************************************************************** * SetupDiEnumDeviceInfo (SETUPAPI.@) */ -BOOL WINAPI SetupDiEnumDeviceInfo(HDEVINFO devinfo, DWORD index, SP_DEVINFO_DATA *device_data) +BOOL WINAPI DECLSPEC_HOTPATCH SetupDiEnumDeviceInfo(HDEVINFO devinfo, DWORD index, SP_DEVINFO_DATA *device_data) { struct DeviceInfoSet *set; struct device *device;

1 0

Nikola Pavlica : dsound: Revised 5.1 to stereo downmix.
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: 6c105094e42f16d65f31efabcfc3939f92a81854 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c105094e42f16d65f31efab… Author: Nikola Pavlica <pavlica.nikola(a)gmail.com> Date: Tue Apr 23 20:04:22 2019 +0200 dsound: Revised 5.1 to stereo downmix. Signed-off-by: Nikola Pavlica <pavlica.nikola(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 87eaa2f593d3a6b2e1440de3bf4c6b37ef089fcf) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dsound/dsound_convert.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c index 26dbb32..6171b16 100644 --- a/dlls/dsound/dsound_convert.c +++ b/dlls/dsound/dsound_convert.c @@ -216,39 +216,37 @@ void put_stereo2surround51(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD c void put_surround512stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) { - /* based on pulseaudio's downmix algorithm */ + /* based on analyzing a recording of a dsound downmix */ switch(channel){ - case 4: /* back left */ - value *= 0.056f; /* (1/9) / (sum of left volumes) */ + case 4: /* surround left */ + value *= 0.24f; dsb->put_aux(dsb, pos, 0, value); break; case 0: /* front left */ - value *= 0.503f; /* 1 / (sum of left volumes) */ + value *= 1.0f; dsb->put_aux(dsb, pos, 0, value); break; - case 5: /* back right */ - value *= 0.056f; /* (1/9) / (sum of right volumes) */ + case 5: /* surround right */ + value *= 0.24f; dsb->put_aux(dsb, pos, 1, value); break; case 1: /* front right */ - value *= 0.503f; /* 1 / (sum of right volumes) */ + value *= 1.0f; dsb->put_aux(dsb, pos, 1, value); break; - case 2: /* front centre */ - value *= 0.252f; /* 0.5 / (sum of left/right volumes) */ + case 2: /* centre */ + value *= 0.7; dsb->put_aux(dsb, pos, 0, value); dsb->put_aux(dsb, pos, 1, value); break; - case 3: /* LFE */ - value *= 0.189f; /* 0.375 / (sum of left/right volumes) */ - dsb->put_aux(dsb, pos, 0, value); - dsb->put_aux(dsb, pos, 1, value); + case 3: + /* LFE is totally ignored in dsound when downmixing to 2 channels */ break; } }

1 0

Nikola Pavlica : dsound: Added 7.1 to stereo downmix.
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: 43f2cc6372e5248078b777c4f5b10a0aa2377e97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43f2cc6372e5248078b777c4… Author: Nikola Pavlica <pavlica.nikola(a)gmail.com> Date: Tue Apr 23 20:04:23 2019 +0200 dsound: Added 7.1 to stereo downmix. Signed-off-by: Nikola Pavlica <pavlica.nikola(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit fc84b8675a848683988d1793ea4bc9f95b7ea395) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dsound/dsound_convert.c | 47 ++++++++++++++++++++++++++++++++++++++++++++ dlls/dsound/dsound_private.h | 1 + dlls/dsound/mixer.c | 6 ++++++ 3 files changed, 54 insertions(+) diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c index 6171b16..3519337 100644 --- a/dlls/dsound/dsound_convert.c +++ b/dlls/dsound/dsound_convert.c @@ -251,6 +251,53 @@ void put_surround512stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD c } } +void put_surround712stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) +{ + /* based on analyzing a recording of a dsound downmix */ + switch(channel){ + + case 6: /* back left */ + value *= 0.24f; + dsb->put_aux(dsb, pos, 0, value); + break; + + case 4: /* surround left */ + value *= 0.24f; + dsb->put_aux(dsb, pos, 0, value); + break; + + case 0: /* front left */ + value *= 1.0f; + dsb->put_aux(dsb, pos, 0, value); + break; + + case 7: /* back right */ + value *= 0.24f; + dsb->put_aux(dsb, pos, 1, value); + break; + + case 5: /* surround right */ + value *= 0.24f; + dsb->put_aux(dsb, pos, 1, value); + break; + + case 1: /* front right */ + value *= 1.0f; + dsb->put_aux(dsb, pos, 1, value); + break; + + case 2: /* centre */ + value *= 0.7; + dsb->put_aux(dsb, pos, 0, value); + dsb->put_aux(dsb, pos, 1, value); + break; + + case 3: + /* LFE is totally ignored in dsound when downmixing to 2 channels */ + break; + } +} + void put_quad2stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) { /* based on pulseaudio's downmix algorithm */ diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 45a100e..b04ce06 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -179,6 +179,7 @@ void put_stereo2quad(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel void put_mono2surround51(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; void put_stereo2surround51(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; void put_surround512stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; +void put_surround712stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; void put_quad2stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *dsbd, diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 32bde38..05ca99b 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -179,6 +179,12 @@ void DSOUND_RecalcFormat(IDirectSoundBufferImpl *dsb) dsb->put = put_surround512stereo; dsb->put_aux = putieee32_sum; } + else if (ichannels == 8 && ochannels == 2) + { + dsb->mix_channels = 8; + dsb->put = put_surround712stereo; + dsb->put_aux = putieee32_sum; + } else if (ichannels == 4 && ochannels == 2) { dsb->mix_channels = 4;

1 0

Zebediah Figura : d3d8/tests: Port test_draw_primitive() from d3d9.
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: 0f4e5ca849aa13bb444fca2bfe236a5c6ce451a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f4e5ca849aa13bb444fca2b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 24 23:06:11 2019 -0600 d3d8/tests: Port test_draw_primitive() from d3d9. 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> (cherry picked from commit 38fb14a688641a3a93c135c6bc6e4721e0529df8) Conflicts: dlls/d3d8/tests/device.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d8/tests/device.c | 181 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 181 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index adfeca8..0f8f15d 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -9208,6 +9208,186 @@ static void test_resource_access(void) DestroyWindow(window); } +static void test_draw_primitive(void) +{ + static const struct + { + float position[3]; + DWORD color; + } + quad[] = + { + {{-1.0f, -1.0f, 0.0f}, 0xffff0000}, + {{-1.0f, 1.0f, 0.0f}, 0xffff0000}, + {{ 1.0f, 1.0f, 0.0f}, 0xffff0000}, + {{ 1.0f, -1.0f, 0.0f}, 0xffff0000}, + {{-1.0f, -1.0f, 0.0f}, 0xffff0000}, + }; + static const WORD indices[] = {0, 1, 2, 3, 0, 2}; + + IDirect3DVertexBuffer8 *vertex_buffer, *current_vb; + IDirect3DIndexBuffer8 *index_buffer, *current_ib; + UINT stride, base_vertex_index; + IDirect3DDevice8 *device; + DWORD stateblock; + IDirect3D8 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + BYTE *ptr; + + window = create_window(); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, NULL))) + { + skip("Failed to create a D3D device.\n"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_CreateVertexBuffer(device, sizeof(quad), 0, 0, + D3DPOOL_DEFAULT, &vertex_buffer); + ok(SUCCEEDED(hr), "CreateVertexBuffer failed, hr %#x.\n", hr); + hr = IDirect3DVertexBuffer8_Lock(vertex_buffer, 0, 0, &ptr, D3DLOCK_DISCARD); + ok(SUCCEEDED(hr), "Lock failed, hr %#x.\n", hr); + memcpy(ptr, quad, sizeof(quad)); + hr = IDirect3DVertexBuffer8_Unlock(vertex_buffer); + ok(SUCCEEDED(hr), "Unlock failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetStreamSource(device, 0, vertex_buffer, sizeof(*quad)); + ok(SUCCEEDED(hr), "SetStreamSource failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_CreateIndexBuffer(device, sizeof(indices), 0, D3DFMT_INDEX16, + D3DPOOL_DEFAULT, &index_buffer); + ok(SUCCEEDED(hr), "CreateIndexBuffer failed, hr %#x.\n", hr); + hr = IDirect3DIndexBuffer8_Lock(index_buffer, 0, 0, &ptr, D3DLOCK_DISCARD); + ok(SUCCEEDED(hr), "Lock failed, hr %#x.\n", hr); + memcpy(ptr, indices, sizeof(indices)); + hr = IDirect3DIndexBuffer8_Unlock(index_buffer); + ok(SUCCEEDED(hr), "Unlock failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "SetRenderState D3DRS_LIGHTING failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_DrawPrimitive(device, D3DPT_TRIANGLELIST, 0, 2); + ok(SUCCEEDED(hr), "DrawPrimitive failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_GetStreamSource(device, 0, &current_vb, &stride); + ok(SUCCEEDED(hr), "GetStreamSource failed, hr %#x.\n", hr); + ok(current_vb == vertex_buffer, "Unexpected vb %p.\n", current_vb); + ok(stride == sizeof(*quad), "Unexpected stride %u.\n", stride); + IDirect3DVertexBuffer8_Release(current_vb); + + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLELIST, 2, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_GetStreamSource(device, 0, &current_vb, &stride); + ok(SUCCEEDED(hr), "GetStreamSource failed, hr %#x.\n", hr); + ok(!current_vb, "Unexpected vb %p.\n", current_vb); + ok(!stride, "Unexpected stride %u.\n", stride); + + /* NULL index buffer, NULL stream source. */ + hr = IDirect3DDevice8_SetIndices(device, NULL, 0); + ok(SUCCEEDED(hr), "SetIndices failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, 0, 4, 0, 2); + todo_wine ok(SUCCEEDED(hr), "DrawIndexedPrimitive failed, hr %#x.\n", hr); + + /* Valid index buffer, NULL stream source. */ + hr = IDirect3DDevice8_SetIndices(device, index_buffer, 1); + ok(SUCCEEDED(hr), "SetIndices failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, 0, 4, 0, 2); + ok(SUCCEEDED(hr), "DrawIndexedPrimitive failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_GetIndices(device, &current_ib, &base_vertex_index); + ok(SUCCEEDED(hr), "GetIndices failed, hr %#x.\n", hr); + ok(current_ib == index_buffer, "Unexpected index buffer %p.\n", current_ib); + ok(base_vertex_index == 1, "Unexpected base vertex index %u.\n", base_vertex_index); + IDirect3DIndexBuffer8_Release(current_ib); + + hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, 2, + indices, D3DFMT_INDEX16, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "DrawIndexedPrimitiveUP failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_GetIndices(device, &current_ib, &base_vertex_index); + ok(SUCCEEDED(hr), "GetIndices failed, hr %#x.\n", hr); + ok(!current_ib, "Unexpected index buffer %p.\n", current_ib); + ok(!base_vertex_index, "Unexpected base vertex index %u.\n", base_vertex_index); + + /* Resetting of stream source and index buffer is not recorded in stateblocks. */ + + hr = IDirect3DDevice8_SetStreamSource(device, 0, vertex_buffer, sizeof(*quad)); + ok(SUCCEEDED(hr), "SetStreamSource failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetIndices(device, index_buffer, 1); + ok(SUCCEEDED(hr), "SetIndices failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_BeginStateBlock(device); + ok(SUCCEEDED(hr), "BeginStateBlock failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, 2, + indices, D3DFMT_INDEX16, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "DrawIndexedPrimitiveUP failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_EndStateBlock(device, &stateblock); + ok(SUCCEEDED(hr), "BeginStateBlock failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_GetStreamSource(device, 0, &current_vb, &stride); + ok(SUCCEEDED(hr), "GetStreamSource failed, hr %#x.\n", hr); +todo_wine { + ok(!current_vb, "Unexpected vb %p.\n", current_vb); + ok(!stride, "Unexpected stride %u.\n", stride); +} + if (current_vb) + IDirect3DVertexBuffer8_Release(current_vb); + hr = IDirect3DDevice8_GetIndices(device, &current_ib, &base_vertex_index); + ok(SUCCEEDED(hr), "GetIndices failed, hr %#x.\n", hr); +todo_wine { + ok(!current_ib, "Unexpected index buffer %p.\n", current_ib); + ok(!base_vertex_index, "Unexpected base vertex index %u.\n", base_vertex_index); +} + if (current_ib) + IDirect3DIndexBuffer8_Release(current_ib); + + hr = IDirect3DDevice8_CaptureStateBlock(device, stateblock); + ok(SUCCEEDED(hr), "Capture failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetStreamSource(device, 0, vertex_buffer, sizeof(*quad)); + ok(SUCCEEDED(hr), "SetStreamSource failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetIndices(device, index_buffer, 1); + ok(SUCCEEDED(hr), "SetIndices failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_ApplyStateBlock(device, stateblock); + ok(SUCCEEDED(hr), "Apply failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_GetStreamSource(device, 0, &current_vb, &stride); + ok(SUCCEEDED(hr), "GetStreamSource failed, hr %#x.\n", hr); + ok(current_vb == vertex_buffer, "Unexpected vb %p.\n", current_vb); + ok(stride == sizeof(*quad), "Unexpected stride %u.\n", stride); + IDirect3DVertexBuffer8_Release(current_vb); + hr = IDirect3DDevice8_GetIndices(device, &current_ib, &base_vertex_index); + ok(SUCCEEDED(hr), "GetIndices failed, hr %#x.\n", hr); + ok(current_ib == index_buffer, "Unexpected index buffer %p.\n", current_ib); + ok(base_vertex_index == 1, "Unexpected base vertex index %u.\n", base_vertex_index); + IDirect3DIndexBuffer8_Release(current_ib); + + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Present failed, hr %#x.\n", hr); + + IDirect3DDevice8_DeleteStateBlock(device, stateblock); + IDirect3DVertexBuffer8_Release(vertex_buffer); + IDirect3DIndexBuffer8_Release(index_buffer); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d8_handle = GetModuleHandleA("d3d8.dll"); @@ -9321,6 +9501,7 @@ START_TEST(device) test_device_caps(); test_get_info(); test_resource_access(); + test_draw_primitive(); UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Matteo Bruni : d3d8: Validate vertex stride in Draw[Indexed]PrimitiveUP().
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: 2305f7966f9cd8578350a905f75d9b15dfaf6f4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2305f7966f9cd8578350a905… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 12 21:25:10 2019 +0100 d3d8: Validate vertex stride in Draw[Indexed]PrimitiveUP(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 59e32ecbbe7c9a7ba2dd036d242861b33c88e684) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d8/device.c | 8 ++++---- dlls/d3d8/tests/device.c | 12 ++++++++++++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 1d892ec..5c1be80 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2423,9 +2423,9 @@ static HRESULT WINAPI d3d8_device_DrawPrimitiveUP(IDirect3DDevice8 *iface, TRACE("iface %p, primitive_type %#x, primitive_count %u, data %p, stride %u.\n", iface, primitive_type, primitive_count, data, stride); - if (!primitive_count) + if (!primitive_count || !stride) { - WARN("primitive_count is 0, returning D3D_OK\n"); + WARN("primitive_count or stride is 0, returning D3D_OK.\n"); return D3D_OK; } @@ -2523,9 +2523,9 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitiveUP(IDirect3DDevice8 *iface iface, primitive_type, min_vertex_idx, vertex_count, primitive_count, index_data, index_format, vertex_data, vertex_stride); - if (!primitive_count) + if (!primitive_count || !vertex_stride) { - WARN("primitive_count is 0, returning D3D_OK\n"); + WARN("primitive_count or vertex_stride is 0, returning D3D_OK.\n"); return D3D_OK; } diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 0f8f15d..d0e840a 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -9282,6 +9282,11 @@ static void test_draw_primitive(void) ok(stride == sizeof(*quad), "Unexpected stride %u.\n", stride); IDirect3DVertexBuffer8_Release(current_vb); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, quad, 0); + ok(hr == D3D_OK, "DrawPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, quad, sizeof(*quad)); + ok(hr == D3D_OK, "DrawPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLELIST, 2, quad, sizeof(*quad)); ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); @@ -9308,6 +9313,13 @@ static void test_draw_primitive(void) ok(base_vertex_index == 1, "Unexpected base vertex index %u.\n", base_vertex_index); IDirect3DIndexBuffer8_Release(current_ib); + hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, 0, + indices, D3DFMT_INDEX16, quad, 0); + ok(SUCCEEDED(hr), "DrawIndexedPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, 2, + indices, D3DFMT_INDEX16, quad, 0); + ok(SUCCEEDED(hr), "DrawIndexedPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, 2, indices, D3DFMT_INDEX16, quad, sizeof(*quad)); ok(SUCCEEDED(hr), "DrawIndexedPrimitiveUP failed, hr %#x.\n", hr);

1 0