January 2017 - Wine-Commits

Alistair Leslie-Hughes : include: Correct misspelt GCPCLASS_PREBOUNDRTL define.
by Alexandre Julliard Jan. 4, 2017

Jan. 4, 2017

Module: wine Branch: master Commit: 3bf6923728fa4197dceeee317af1c4547034008c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bf6923728fa4197dceeee317… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jan 4 06:55:54 2017 +0000 include: Correct misspelt GCPCLASS_PREBOUNDRTL define. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wingdi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wingdi.h b/include/wingdi.h index 548269e..1851654 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -1415,7 +1415,7 @@ typedef struct #define GCPCLASS_LATINNUMERICSEPARATOR 8 #define GCPCLASS_NUMERICSEPARATOR 9 #define GCPCLASS_PREBOUNDLTR 0x80 -#define GCPCLASS_PREBOUNDRLT 0x40 +#define GCPCLASS_PREBOUNDRTL 0x40 #define GCPCLASS_POSTBOUNDLTR 0x20 #define GCPCLASS_POSTBOUNDRTL 0x10

1 0

Julian Rüger : German translation for release 2.0-rc3
by Jeremy Newman Jan. 4, 2017

Jan. 4, 2017

Module: website Branch: master Commit: 4719238109237fdef2089511b34ac29be6faa415 URL: http://source.winehq.org/git/website.git/?a=commit;h=4719238109237fdef20895… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Jan 4 09:18:31 2017 +0100 German translation for release 2.0-rc3 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2016122301.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/de/2016122301.xml b/news/de/2016122301.xml new file mode 100644 index 0000000..be64390 --- /dev/null +++ b/news/de/2016122301.xml @@ -0,0 +1,12 @@ +<news> +<date>23. Dezember 2016</date> +<title>Wine 2.0-rc3 freigegeben</title> +<body> + Die Entwicklungsversion 2.0-rc3 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/2.0-rc3">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Nur Fehlerkorrekturen, da wir uns im Code-freeze befinden.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/2.0/wine-2.0-rc3.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 1.8.6
by Jeremy Newman Jan. 4, 2017

Jan. 4, 2017

Module: website Branch: master Commit: 664afa3b686dc2751327bbc9ddcb23aaf473db9f URL: http://source.winehq.org/git/website.git/?a=commit;h=664afa3b686dc2751327bb… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Jan 4 09:17:40 2017 +0100 German translation for release 1.8.6 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2016121901.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/news/de/2016121901.xml b/news/de/2016121901.xml new file mode 100644 index 0000000..2a7b625 --- /dev/null +++ b/news/de/2016121901.xml @@ -0,0 +1,14 @@ +<news> +<date>19. Dezember 2016</date> +<title>Wine 1.8.6 freigegeben</title> +<body> + Die Wartungsversion 1.8.6 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.8.6">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Korrektur einer Regression, die versehentlich in 1.8.5 eingeführt wurde. (#41627)</li> + <li>Diverse Fehlerkorrekturen.</li> + <li>Eine kleine Anzahl neuer Grafikkarten in der GPU-Beschreibungstabelle.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/1.8/wine-1.8.6.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 2.0-rc2
by Jeremy Newman Jan. 4, 2017

Jan. 4, 2017

Module: website Branch: master Commit: b18cdde55c4956ea1cf7f2e475aad4a0b1228329 URL: http://source.winehq.org/git/website.git/?a=commit;h=b18cdde55c4956ea1cf7f2… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Jan 4 09:14:30 2017 +0100 German translation for release 2.0-rc2 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2016121601.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/de/2016121601.xml b/news/de/2016121601.xml new file mode 100644 index 0000000..4304b0a --- /dev/null +++ b/news/de/2016121601.xml @@ -0,0 +1,12 @@ +<news> +<date>16. Dezember 2016</date> +<title>Wine 2.0-rc2 freigegeben</title> +<body> + Die Entwicklungsversion 2.0-rc2 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/2.0-rc2">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Nur Fehlerkorrekturen, da wir uns im Code-freeze befinden.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/2.0/wine-2.0-rc2.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Józef Kucia : d3d8/tests: Add test for render target device mismatch.
by Alexandre Julliard Jan. 3, 2017

Jan. 3, 2017

Module: wine Branch: master Commit: f93fbcad414a7975ee8814a7c34f46dba6e05743 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f93fbcad414a7975ee8814a7c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 3 13:46:31 2017 +0100 d3d8/tests: Add test for render target device mismatch. 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> --- dlls/d3d8/tests/device.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 2b38f17..2dbf9d8 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -8083,6 +8083,64 @@ done: DestroyWindow(window); } +static void test_render_target_device_mismatch(void) +{ + IDirect3DDevice8 *device, *device2; + IDirect3DSurface8 *surface, *rt; + IDirect3D8 *d3d; + UINT refcount; + HWND window; + HRESULT hr; + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + 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_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + + device2 = create_device(d3d, window, NULL); + ok(!!device2, "Failed to create a D3D device.\n"); + + hr = IDirect3DDevice8_CreateRenderTarget(device2, 640, 480, + D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, FALSE, &surface); + ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderTarget(device, surface, NULL); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + IDirect3DSurface8_Release(surface); + + hr = IDirect3DDevice8_GetRenderTarget(device2, &surface); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderTarget(device, surface, NULL); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + IDirect3DSurface8_Release(surface); + + hr = IDirect3DDevice8_GetRenderTarget(device, &surface); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + todo_wine ok(surface == rt, "Got unexpected render target %p, expected %p.\n", surface, rt); + IDirect3DSurface8_Release(surface); + IDirect3DSurface8_Release(rt); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + refcount = IDirect3DDevice8_Release(device2); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -8187,6 +8245,7 @@ START_TEST(device) test_swapchain_parameters(); test_check_device_format(); test_miptree_layout(); + test_render_target_device_mismatch(); UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Józef Kucia : d3d11/tests: Add test for render target device mismatch.
by Alexandre Julliard Jan. 3, 2017

Jan. 3, 2017

Module: wine Branch: master Commit: 9047fdff8596ebfdc7350c9cdf20552aa6d48454 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9047fdff8596ebfdc7350c9cd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 3 13:46:28 2017 +0100 d3d11/tests: Add test for render target device mismatch. 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> --- dlls/d3d11/tests/d3d11.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 1957ad3..ac4393d 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -12664,6 +12664,40 @@ static void test_sm5_bufinfo_instruction(void) release_test_context(&test_context); } +static void test_render_target_device_mismatch(void) +{ + struct d3d11_test_context test_context; + struct device_desc device_desc = {0}; + ID3D11DeviceContext *context; + ID3D11RenderTargetView *rtv; + ID3D11Device *device; + ULONG refcount; + + if (!init_test_context(&test_context, NULL)) + return; + + device = create_device(&device_desc); + ok(!!device, "Failed to create device.\n"); + + ID3D11Device_GetImmediateContext(device, &context); + + rtv = (ID3D11RenderTargetView *)0xdeadbeef; + ID3D11DeviceContext_OMGetRenderTargets(context, 1, &rtv, NULL); + ok(!rtv, "Got unexpected render target view %p.\n", rtv); + ID3D11DeviceContext_OMSetRenderTargets(context, 1, &test_context.backbuffer_rtv, NULL); + ID3D11DeviceContext_OMGetRenderTargets(context, 1, &rtv, NULL); + ok(rtv == test_context.backbuffer_rtv, "Got unexpected render target view %p.\n", rtv); + ID3D11RenderTargetView_Release(rtv); + + rtv = NULL; + ID3D11DeviceContext_OMSetRenderTargets(context, 1, &rtv, NULL); + + ID3D11DeviceContext_Release(context); + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + release_test_context(&test_context); +} + START_TEST(d3d11) { test_create_device(); @@ -12732,4 +12766,5 @@ START_TEST(d3d11) test_sm4_ret_instruction(); test_primitive_restart(); test_sm5_bufinfo_instruction(); + test_render_target_device_mismatch(); }

1 0

Alex Henrie : gdiplus: Fix memory leak in format_string_callback error path.
by Alexandre Julliard Jan. 3, 2017

Jan. 3, 2017

Module: wine Branch: master Commit: 046fc19cd1ce053ad3f1b08312aa97a447b158f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=046fc19cd1ce053ad3f1b0831… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Dec 23 01:18:42 2016 -0700 gdiplus: Fix memory leak in format_string_callback error path. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphicspath.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index b6ec88d..5a3356a 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -881,6 +881,7 @@ static GpStatus format_string_callback(HDC dc, start = (char *)ph; if (!ph || !lengthen_path(path, len / sizeof(POINTFX))) { + heap_free(ph); status = OutOfMemory; break; }

1 0

Józef Kucia : d3d9/tests: Add test for render target device mismatch.
by Alexandre Julliard Jan. 3, 2017

Jan. 3, 2017

Module: wine Branch: master Commit: 6e6b377c228e377f74fa4d0a57254ed0bb69b7e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e6b377c228e377f74fa4d0a5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 3 13:46:30 2017 +0100 d3d9/tests: Add test for render target device mismatch. 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> --- dlls/d3d9/tests/device.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 7513df6..fbae9d6 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -11343,6 +11343,64 @@ static void test_get_render_target_data(void) DestroyWindow(window); } +static void test_render_target_device_mismatch(void) +{ + IDirect3DDevice9 *device, *device2; + IDirect3DSurface9 *surface, *rt; + IDirect3D9 *d3d; + UINT refcount; + HWND window; + HRESULT hr; + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(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"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_GetRenderTarget(device, 0, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + + device2 = create_device(d3d, window, NULL); + ok(!!device2, "Failed to create a D3D device.\n"); + + hr = IDirect3DDevice9_CreateRenderTarget(device2, 640, 480, + D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, 0, FALSE, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, surface); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + IDirect3DSurface9_Release(surface); + + hr = IDirect3DDevice9_GetRenderTarget(device2, 0, &surface); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, surface); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + IDirect3DSurface9_Release(surface); + + hr = IDirect3DDevice9_GetRenderTarget(device, 0, &surface); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + todo_wine ok(surface == rt, "Got unexpected render target %p, expected %p.\n", surface, rt); + IDirect3DSurface9_Release(surface); + IDirect3DSurface9_Release(rt); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + refcount = IDirect3DDevice9_Release(device2); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { WNDCLASSA wc = {0}; @@ -11459,6 +11517,7 @@ START_TEST(device) test_check_device_format(); test_miptree_layout(); test_get_render_target_data(); + test_render_target_device_mismatch(); UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); }

1 0

Józef Kucia : d3d8: Reject render target surfaces created for other devices.
by Alexandre Julliard Jan. 3, 2017

Jan. 3, 2017

Module: wine Branch: master Commit: 176e60074b2b69d28d53adbe6606bf7c5eaf1fc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=176e60074b2b69d28d53adbe6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 3 13:46:33 2017 +0100 d3d8: Reject render target surfaces created for other devices. 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> --- dlls/d3d8/d3d8_private.h | 1 + dlls/d3d8/device.c | 7 ++++++- dlls/d3d8/surface.c | 7 +++++++ dlls/d3d8/tests/device.c | 6 +++--- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index f55d2c2..ffcd1cd 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -242,6 +242,7 @@ struct d3d8_surface struct d3d8_texture *texture; }; +struct d3d8_device *d3d8_surface_get_device(const struct d3d8_surface *surface) DECLSPEC_HIDDEN; struct wined3d_rendertarget_view *d3d8_surface_get_rendertarget_view(struct d3d8_surface *surface) DECLSPEC_HIDDEN; void surface_init(struct d3d8_surface *surface, struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index fae5610..5a5871f 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1161,6 +1161,12 @@ static HRESULT WINAPI d3d8_device_SetRenderTarget(IDirect3DDevice8 *iface, TRACE("iface %p, render_target %p, depth_stencil %p.\n", iface, render_target, depth_stencil); + if (rt_impl && d3d8_surface_get_device(rt_impl) != device) + { + WARN("Render target surface does not match device.\n"); + return D3DERR_INVALIDCALL; + } + wined3d_mutex_lock(); if (ds_impl) @@ -1200,7 +1206,6 @@ static HRESULT WINAPI d3d8_device_SetRenderTarget(IDirect3DDevice8 *iface, WARN("Multisample settings do not match, returning D3DERR_INVALIDCALL\n"); wined3d_mutex_unlock(); return D3DERR_INVALIDCALL; - } } diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 565f642..137033e 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -353,6 +353,13 @@ static const struct wined3d_parent_ops d3d8_view_wined3d_parent_ops = view_wined3d_object_destroyed, }; +struct d3d8_device *d3d8_surface_get_device(const struct d3d8_surface *surface) +{ + IDirect3DDevice8 *device; + device = surface->texture ? surface->texture->parent_device : surface->parent_device; + return impl_from_IDirect3DDevice8(device); +} + struct wined3d_rendertarget_view *d3d8_surface_get_rendertarget_view(struct d3d8_surface *surface) { HRESULT hr; diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 2dbf9d8..22667ec 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -8115,7 +8115,7 @@ static void test_render_target_device_mismatch(void) ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); hr = IDirect3DDevice8_SetRenderTarget(device, surface, NULL); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); IDirect3DSurface8_Release(surface); @@ -8123,13 +8123,13 @@ static void test_render_target_device_mismatch(void) ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); hr = IDirect3DDevice8_SetRenderTarget(device, surface, NULL); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); IDirect3DSurface8_Release(surface); hr = IDirect3DDevice8_GetRenderTarget(device, &surface); ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); - todo_wine ok(surface == rt, "Got unexpected render target %p, expected %p.\n", surface, rt); + ok(surface == rt, "Got unexpected render target %p, expected %p.\n", surface, rt); IDirect3DSurface8_Release(surface); IDirect3DSurface8_Release(rt);

1 0

Andrew Eikum : dsound: Don' t write more than three periods to IAudioClient.
by Alexandre Julliard Jan. 3, 2017

Jan. 3, 2017

Module: wine Branch: master Commit: 0190c50a8ca14e21355befc212b60f6409594aec URL: http://source.winehq.org/git/wine.git/?a=commit;h=0190c50a8ca14e21355befc21… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jan 3 11:08:10 2017 -0600 dsound: Don't write more than three periods to IAudioClient. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/primary.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index f9720f8..f5a1020 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -296,12 +296,12 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) { HRESULT hres; REFERENCE_TIME period; - UINT32 frames; + UINT32 acbuf_frames, aclen_frames; DWORD period_ms; IAudioClient *client = NULL; IAudioRenderClient *render = NULL; IAudioStreamVolume *volume = NULL; - DWORD fraglen; + DWORD frag_frames; WAVEFORMATEX *wfx = NULL; DWORD oldspeakerconfig = device->speaker_config; @@ -350,17 +350,20 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) WARN("GetStreamLatency failed with %08x\n", hres); goto err; } - hres = IAudioClient_GetBufferSize(client, &frames); + hres = IAudioClient_GetBufferSize(client, &acbuf_frames); if (FAILED(hres)) { WARN("GetBufferSize failed with %08x\n", hres); goto err; } period_ms = (period + 9999) / 10000; - fraglen = MulDiv(wfx->nSamplesPerSec, period, 10000000) * wfx->nBlockAlign; - TRACE("period %u ms fraglen %u buflen %u\n", period_ms, fraglen, frames * wfx->nBlockAlign); + frag_frames = MulDiv(wfx->nSamplesPerSec, period, 10000000); - hres = DSOUND_PrimaryOpen(device, wfx, frames, forcewave); + aclen_frames = min(acbuf_frames, 3 * frag_frames); + + TRACE("period %u ms fraglen %u buflen %u\n", period_ms, frag_frames * wfx->nBlockAlign, aclen_frames * wfx->nBlockAlign); + + hres = DSOUND_PrimaryOpen(device, wfx, aclen_frames, forcewave); if(FAILED(hres)) goto err; @@ -368,8 +371,8 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) device->client = client; device->render = render; device->volume = volume; - device->fraglen = fraglen; - device->aclen = frames * wfx->nBlockAlign; + device->fraglen = frag_frames * wfx->nBlockAlign; + device->aclen = aclen_frames * wfx->nBlockAlign; if (period_ms < 3) device->sleeptime = 5;

1 0