May 2016 - Wine-commits - list.winehq.org

Józef Kucia : d3d9: Allow to pass NULL pointers to IDirect3DDevice9_GetRenderTargetData().
by Alexandre Julliard 19 May '16

19 May '16

Module: wine Branch: master Commit: d283c5b68e078233cd1e69c1b16d3577af2cc448 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d283c5b68e078233cd1e69c1b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 19 11:11:45 2016 +0200 d3d9: Allow to pass NULL pointers to IDirect3DDevice9_GetRenderTargetData(). 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/device.c | 3 +++ dlls/d3d9/tests/device.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index dd7f46a..4bbdd42 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1279,6 +1279,9 @@ static HRESULT WINAPI d3d9_device_GetRenderTargetData(IDirect3DDevice9Ex *iface, TRACE("iface %p, render_target %p, dst_surface %p.\n", iface, render_target, dst_surface); + if (!render_target || !dst_surface) + return D3DERR_INVALIDCALL; + wined3d_mutex_lock(); wined3d_texture_get_sub_resource_desc(dst_impl->wined3d_texture, dst_impl->sub_resource_idx, &wined3d_desc); dst_rect.left = 0; diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 8860bce..4302f76 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -11122,6 +11122,55 @@ done: DestroyWindow(window); } +static void test_get_render_target_data(void) +{ + IDirect3DSurface9 *offscreen_surface, *render_target; + IDirect3DDevice9 *device; + 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_CreateOffscreenPlainSurface(device, 32, 32, + D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &offscreen_surface, NULL); + ok(SUCCEEDED(hr), "Failed to create offscreen surface, hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateRenderTarget(device, 32, 32, + D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, 0, TRUE, &render_target, NULL); + ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + + hr = IDirect3DDevice9_GetRenderTargetData(device, NULL, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_GetRenderTargetData(device, render_target, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_GetRenderTargetData(device, NULL, offscreen_surface); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_GetRenderTargetData(device, render_target, offscreen_surface); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + + IDirect3DSurface9_Release(render_target); + IDirect3DSurface9_Release(offscreen_surface); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { WNDCLASSA wc = {0}; @@ -11237,6 +11286,7 @@ START_TEST(device) test_swapchain_parameters(); test_check_device_format(); test_miptree_layout(); + test_get_render_target_data(); UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); }

1 0

Henri Verbeet : usp10: Resolve BNs and explicit formatting characters to the preceding level in resolveResolved ().
by Alexandre Julliard 19 May '16

19 May '16

Module: wine Branch: master Commit: 71cabaa4b93f040e16519c6f8253673480995ac7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71cabaa4b93f040e16519c6f8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 18 18:43:18 2016 +0200 usp10: Resolve BNs and explicit formatting characters to the preceding level in resolveResolved(). As in section 5.2 of the Unicode Bidirectional Algorithm. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/bidi.c | 5 +++++ dlls/usp10/tests/usp10.c | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/dlls/usp10/bidi.c b/dlls/usp10/bidi.c index caa266b..5adce9d 100644 --- a/dlls/usp10/bidi.c +++ b/dlls/usp10/bidi.c @@ -969,6 +969,11 @@ static void resolveResolved(unsigned baselevel, const WORD * pcls, WORD *plevel, plevel[j--] = baselevel; plevel[i] = baselevel; } + else if (pcls[i] == LRE || pcls[i] == RLE || pcls[i] == LRO || pcls[i] == RLO || + pcls[i] == PDF || pcls[i] == BN) + { + plevel[i] = i ? plevel[i - 1] : baselevel; + } if (i == eos && (pcls[i] == WS || pcls[i] == FSI || pcls[i] == LRI || pcls[i] == RLI || pcls[i] == PDI || pcls[i] == LRE || pcls[i] == RLE || pcls[i] == LRO || diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 7881667..d0c698f 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -563,6 +563,11 @@ static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, {{0,0,0,0,0,0},2,0,1,0,1,0,FALSE}, {{0,0,0,0,0,0},8,0,0,0,0,-1,FALSE}}; + /* ZWNJ */ + static const WCHAR test56[] = {0x0645, 0x06cc, 0x200c, 0x06a9, 0x0646, 0x0645}; /* می‌کنم */ + static const itemTest t561[] = {{{0,0,0,0,0,0},0,1,1,1,0,arab_tag,FALSE},{{0,0,0,0,0,0},6,0,0,0,0,-1,FALSE}}; + static const itemTest t562[] = {{{0,0,0,0,0,0},0,0,0,0,1,arab_tag,FALSE},{{0,0,0,0,0,0},6,0,0,0,0,-1,FALSE}}; + SCRIPT_ITEM items[15]; SCRIPT_CONTROL Control; SCRIPT_STATE State; @@ -643,6 +648,7 @@ static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, test_items_ok(test45,24,NULL,NULL,1,t451,FALSE,0); test_items_ok(test46,16,NULL,NULL,1,t461,FALSE,0); test_items_ok(test47,26,NULL,NULL,1,t471,FALSE,0); + test_items_ok(test56,6,NULL,NULL,1,t561,FALSE,0); State.uBidiLevel = 0; test_items_ok(test1,4,&Control,&State,1,t11,FALSE,0); @@ -705,6 +711,7 @@ static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, test_items_ok(test53,8,&Control,&State,4,t531,FALSE,0); test_items_ok(test54,7,&Control,&State,2,t541,FALSE,0); test_items_ok(test55,8,&Control,&State,2,t551,FALSE,0); + test_items_ok(test56,6,&Control,&State,1,t561,FALSE,0); State.uBidiLevel = 1; test_items_ok(test1,4,&Control,&State,1,t12,FALSE,0); @@ -759,6 +766,7 @@ static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, test_items_ok(test45,24,&Control,&State,1,t452,FALSE,0); test_items_ok(test46,16,&Control,&State,1,t462,FALSE,0); test_items_ok(test47,26,&Control,&State,1,t472,FALSE,0); + test_items_ok(test56,6,&Control,&State,1,t561,FALSE,0); State.uBidiLevel = 1; Control.fMergeNeutralItems = TRUE; @@ -814,6 +822,7 @@ static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, test_items_ok(test45,24,&Control,&State,1,t452,FALSE,0); test_items_ok(test46,16,&Control,&State,1,t462,FALSE,0); test_items_ok(test47,26,&Control,&State,1,t472,FALSE,0); + test_items_ok(test56,6,&Control,&State,1,t561,FALSE,0); State.uBidiLevel = 0; Control.fMergeNeutralItems = FALSE; @@ -878,6 +887,7 @@ static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, test_items_ok(test53,8,&Control,&State,4,t532,FALSE,0); test_items_ok(test54,7,&Control,&State,2,t542,FALSE,0); test_items_ok(test55,8,&Control,&State,2,t552,FALSE,0); + test_items_ok(test56,6,&Control,&State,1,t562,FALSE,0); } static inline void _test_shape_ok(int valid, HDC hdc, LPCWSTR string,

1 0

Henri Verbeet : kernel32/nls: Persian uses a right-to-left writing system.
by Alexandre Julliard 19 May '16

19 May '16

Module: wine Branch: master Commit: f2af3b9b57e45ff121656a339759bdc1b4193b70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2af3b9b57e45ff121656a339… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 18 18:43:19 2016 +0200 kernel32/nls: Persian uses a right-to-left writing system. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/far.nls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/nls/far.nls b/dlls/kernel32/nls/far.nls index fa71dc0..859239b 100644 --- a/dlls/kernel32/nls/far.nls +++ b/dlls/kernel32/nls/far.nls @@ -58,7 +58,7 @@ STRINGTABLE LANGUAGE LANG_FARSI, SUBLANG_DEFAULT LOCALE_IPOSSEPBYSPACE "1" LOCALE_IPOSSIGNPOSN "2" LOCALE_IPOSSYMPRECEDES "1" - LOCALE_IREADINGLAYOUT "0" + LOCALE_IREADINGLAYOUT "1" LOCALE_ITIME "0" LOCALE_ITIMEMARKPOSN "0" LOCALE_ITLZERO "1"

1 0

Henri Verbeet : kernel32/nls: Use Persian characters to write Persian.
by Alexandre Julliard 19 May '16

19 May '16

Module: wine Branch: master Commit: e1552209310a20732e9e4561064f62af1ac2f9b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1552209310a20732e9e45610… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 18 18:43:20 2016 +0200 kernel32/nls: Use Persian characters to write Persian. For ي and ى there's the excuse that ی doesn't exist in CP1256. There's no such excuse for using ك instead of ک. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/far.nls | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/kernel32/nls/far.nls b/dlls/kernel32/nls/far.nls index 859239b..07e2a57 100644 --- a/dlls/kernel32/nls/far.nls +++ b/dlls/kernel32/nls/far.nls @@ -71,23 +71,23 @@ STRINGTABLE LANGUAGE LANG_FARSI, SUBLANG_DEFAULT LOCALE_SABBREVDAYNAME4 "پنجشنبه" LOCALE_SABBREVDAYNAME5 "جمعه" LOCALE_SABBREVDAYNAME6 "شنبه" - LOCALE_SABBREVDAYNAME7 "يكشنبه" + LOCALE_SABBREVDAYNAME7 "یکشنبه" LOCALE_SABBREVLANGNAME "FAR" - LOCALE_SABBREVMONTHNAME1 "ژانويه" - LOCALE_SABBREVMONTHNAME2 "فوريه" + LOCALE_SABBREVMONTHNAME1 "ژانویه" + LOCALE_SABBREVMONTHNAME2 "فوریه" LOCALE_SABBREVMONTHNAME3 "مارس" - LOCALE_SABBREVMONTHNAME4 "آوريل" - LOCALE_SABBREVMONTHNAME5 "مى" + LOCALE_SABBREVMONTHNAME4 "آوریل" + LOCALE_SABBREVMONTHNAME5 "می" LOCALE_SABBREVMONTHNAME6 "ژوئن" - LOCALE_SABBREVMONTHNAME7 "ژوئيه" + LOCALE_SABBREVMONTHNAME7 "ژوئیه" LOCALE_SABBREVMONTHNAME8 "اوت" LOCALE_SABBREVMONTHNAME9 "سپتامبر" - LOCALE_SABBREVMONTHNAME10 "اُكتبر" + LOCALE_SABBREVMONTHNAME10 "اکتبر" LOCALE_SABBREVMONTHNAME11 "نوامبر" LOCALE_SABBREVMONTHNAME12 "دسامبر" LOCALE_SABBREVMONTHNAME13 "" LOCALE_SCOUNTRY "Iran" - LOCALE_SCURRENCY "ريال" + LOCALE_SCURRENCY "ریال" LOCALE_SDATE "/" LOCALE_SDAYNAME1 "دوشنبه" LOCALE_SDAYNAME2 "سه شنبه" @@ -95,7 +95,7 @@ STRINGTABLE LANGUAGE LANG_FARSI, SUBLANG_DEFAULT LOCALE_SDAYNAME4 "پنجشنبه" LOCALE_SDAYNAME5 "جمعه" LOCALE_SDAYNAME6 "شنبه" - LOCALE_SDAYNAME7 "يكشنبه" + LOCALE_SDAYNAME7 "یکشنبه" LOCALE_SDECIMAL "." LOCALE_SENGCOUNTRY "Iran" LOCALE_SENGCURRNAME "Iranian Rial" @@ -109,26 +109,26 @@ STRINGTABLE LANGUAGE LANG_FARSI, SUBLANG_DEFAULT LOCALE_SLONGDATE "yyyy/MM/dd" LOCALE_SMONDECIMALSEP "/" LOCALE_SMONGROUPING "3;0" - LOCALE_SMONTHNAME1 "ژانويه" - LOCALE_SMONTHNAME2 "فوريه" + LOCALE_SMONTHNAME1 "ژانویه" + LOCALE_SMONTHNAME2 "فوریه" LOCALE_SMONTHNAME3 "مارس" - LOCALE_SMONTHNAME4 "آوريل" - LOCALE_SMONTHNAME5 "مى" + LOCALE_SMONTHNAME4 "آوریل" + LOCALE_SMONTHNAME5 "می" LOCALE_SMONTHNAME6 "ژوئن" - LOCALE_SMONTHNAME7 "ژوئيه" + LOCALE_SMONTHNAME7 "ژوئیه" LOCALE_SMONTHNAME8 "اوت" LOCALE_SMONTHNAME9 "سپتامبر" - LOCALE_SMONTHNAME10 "اُكتبر" + LOCALE_SMONTHNAME10 "اکتبر" LOCALE_SMONTHNAME11 "نوامبر" LOCALE_SMONTHNAME12 "دسامبر" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "," LOCALE_SNAME "fa-IR" - LOCALE_SNATIVECTRYNAME "ايران" - LOCALE_SNATIVECURRNAME "رىال" + LOCALE_SNATIVECTRYNAME "ایران" + LOCALE_SNATIVECURRNAME "ریال" LOCALE_SNATIVEDIGITS L"\x06f0\x06f1\x06f2\x06f3\x06f4\x06f5\x06f6\x06f7\x06f8\x06f9" - LOCALE_SNATIVEDISPLAYNAME "فارسى (ايران)" - LOCALE_SNATIVELANGNAME "فارسى" + LOCALE_SNATIVEDISPLAYNAME "فارسی (ایران)" + LOCALE_SNATIVELANGNAME "فارسی" LOCALE_SNEGATIVESIGN "-" LOCALE_SOPENTYPELANGUAGETAG "FAR " LOCALE_SPOSITIVESIGN ""

1 0

Henri Verbeet : kernel32/nls: Use ZWNJ where appropriate in far.nls.
by Alexandre Julliard 19 May '16

19 May '16

Module: wine Branch: master Commit: d5620dd54bdaa739f41ca6a7cb95da0ce7c1e88c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5620dd54bdaa739f41ca6a7c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 18 18:43:21 2016 +0200 kernel32/nls: Use ZWNJ where appropriate in far.nls. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/far.nls | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/nls/far.nls b/dlls/kernel32/nls/far.nls index 07e2a57..3fc430c 100644 --- a/dlls/kernel32/nls/far.nls +++ b/dlls/kernel32/nls/far.nls @@ -66,12 +66,12 @@ STRINGTABLE LANGUAGE LANG_FARSI, SUBLANG_DEFAULT LOCALE_S2359 "ب.ظ" LOCALE_SABBREVCTRYNAME "IRN" LOCALE_SABBREVDAYNAME1 "دوشنبه" - LOCALE_SABBREVDAYNAME2 "سه شنبه" + LOCALE_SABBREVDAYNAME2 "سه‌شنبه" LOCALE_SABBREVDAYNAME3 "چهارشنبه" - LOCALE_SABBREVDAYNAME4 "پنجشنبه" + LOCALE_SABBREVDAYNAME4 "پنج‌شنبه" LOCALE_SABBREVDAYNAME5 "جمعه" LOCALE_SABBREVDAYNAME6 "شنبه" - LOCALE_SABBREVDAYNAME7 "یکشنبه" + LOCALE_SABBREVDAYNAME7 "یک‌شنبه" LOCALE_SABBREVLANGNAME "FAR" LOCALE_SABBREVMONTHNAME1 "ژانویه" LOCALE_SABBREVMONTHNAME2 "فوریه" @@ -90,12 +90,12 @@ STRINGTABLE LANGUAGE LANG_FARSI, SUBLANG_DEFAULT LOCALE_SCURRENCY "ریال" LOCALE_SDATE "/" LOCALE_SDAYNAME1 "دوشنبه" - LOCALE_SDAYNAME2 "سه شنبه" + LOCALE_SDAYNAME2 "سه‌شنبه" LOCALE_SDAYNAME3 "چهارشنبه" - LOCALE_SDAYNAME4 "پنجشنبه" + LOCALE_SDAYNAME4 "پنج‌شنبه" LOCALE_SDAYNAME5 "جمعه" LOCALE_SDAYNAME6 "شنبه" - LOCALE_SDAYNAME7 "یکشنبه" + LOCALE_SDAYNAME7 "یک‌شنبه" LOCALE_SDECIMAL "." LOCALE_SENGCOUNTRY "Iran" LOCALE_SENGCURRNAME "Iranian Rial"

1 0

Henri Verbeet : kernel32/nls: Persian is called Persian in English.
by Alexandre Julliard 19 May '16

19 May '16

Module: wine Branch: master Commit: 49aacb478427e533f5cdc594d4e229326ced710a URL: http://source.winehq.org/git/wine.git/?a=commit;h=49aacb478427e533f5cdc594d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 18 18:43:22 2016 +0200 kernel32/nls: Persian is called Persian in English. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/far.nls | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/nls/far.nls b/dlls/kernel32/nls/far.nls index 3fc430c..652c78f 100644 --- a/dlls/kernel32/nls/far.nls +++ b/dlls/kernel32/nls/far.nls @@ -1,5 +1,5 @@ /* - * Locale definitions for Farsi + * Locale definitions for Persian * * Copyright 2002 Alexandre Julliard for CodeWeavers * @@ -20,7 +20,7 @@ #pragma code_page(65001) /* UTF-8 */ -STRINGTABLE LANGUAGE LANG_FARSI, SUBLANG_DEFAULT +STRINGTABLE LANGUAGE LANG_PERSIAN, SUBLANG_DEFAULT { LOCALE_FONTSIGNATURE L"\x60af\x8000\x3848\x1000\x0008\x0000\x0000\x0800\x0040\x0000\x0000\x2000\x0040\x0000\x0000\x2008" LOCALE_ICALENDARTYPE "2" @@ -99,12 +99,12 @@ STRINGTABLE LANGUAGE LANG_FARSI, SUBLANG_DEFAULT LOCALE_SDECIMAL "." LOCALE_SENGCOUNTRY "Iran" LOCALE_SENGCURRNAME "Iranian Rial" - LOCALE_SENGLANGUAGE "Farsi" + LOCALE_SENGLANGUAGE "Persian" LOCALE_SGROUPING "3;0" LOCALE_SINTLSYMBOL "IRR" LOCALE_SISO3166CTRYNAME "IR" LOCALE_SISO639LANGNAME "fa" - LOCALE_SLANGUAGE "Farsi" + LOCALE_SLANGUAGE "Persian (Iran)" LOCALE_SLIST ";" LOCALE_SLONGDATE "yyyy/MM/dd" LOCALE_SMONDECIMALSEP "/"

1 0

Andrew Eikum : dsound: Allow inactive devices to change the primary format.
by Alexandre Julliard 19 May '16

19 May '16

Module: wine Branch: master Commit: 4fbe6f3e7601f7b39f7f672ffe43553eee92ab1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fbe6f3e7601f7b39f7f672ff… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 19 09:11:08 2016 -0500 dsound: Allow inactive devices to change the primary format. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/primary.c | 45 ++++++++++++++++++++------------------------- 1 file changed, 20 insertions(+), 25 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 0dc16f0..b14bff7 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -479,35 +479,30 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe RtlAcquireResourceExclusive(&(device->buffer_list_lock), TRUE); EnterCriticalSection(&(device->mixlock)); - if (device->priolevel == DSSCL_WRITEPRIMARY) { - old_fmt = device->primary_pwfx; - device->primary_pwfx = DSOUND_CopyFormat(passed_fmt); - fmtex = (WAVEFORMATEXTENSIBLE *)device->primary_pwfx; - if (device->primary_pwfx == NULL) { - err = DSERR_OUTOFMEMORY; - goto out; - } + old_fmt = device->primary_pwfx; + device->primary_pwfx = DSOUND_CopyFormat(passed_fmt); + fmtex = (WAVEFORMATEXTENSIBLE *)device->primary_pwfx; + if (device->primary_pwfx == NULL) { + err = DSERR_OUTOFMEMORY; + goto out; + } - if (fmtex->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE && - fmtex->Samples.wValidBitsPerSample == 0) { - TRACE("Correcting 0 valid bits per sample\n"); - fmtex->Samples.wValidBitsPerSample = fmtex->Format.wBitsPerSample; - } + if (fmtex->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE && + fmtex->Samples.wValidBitsPerSample == 0) { + TRACE("Correcting 0 valid bits per sample\n"); + fmtex->Samples.wValidBitsPerSample = fmtex->Format.wBitsPerSample; + } + if(device->priolevel == DSSCL_WRITEPRIMARY || device->nrofbuffers == 0) err = DSOUND_ReopenDevice(device, TRUE); - if (FAILED(err)) { - ERR("No formats could be opened\n"); - HeapFree(GetProcessHeap(), 0, device->primary_pwfx); - device->primary_pwfx = old_fmt; - } else - HeapFree(GetProcessHeap(), 0, old_fmt); + if (FAILED(err) && device->priolevel == DSSCL_WRITEPRIMARY) { + ERR("No formats could be opened\n"); + HeapFree(GetProcessHeap(), 0, device->primary_pwfx); + device->primary_pwfx = old_fmt; } else { - WAVEFORMATEX *wfx = DSOUND_CopyFormat(passed_fmt); - if (wfx) { - HeapFree(GetProcessHeap(), 0, device->primary_pwfx); - device->primary_pwfx = wfx; - } else - err = DSERR_OUTOFMEMORY; + /* ignore failures */ + err = S_OK; + HeapFree(GetProcessHeap(), 0, old_fmt); } out:

1 0

Andrew Eikum : dsound: Support downmixing 5.1 to stereo.
by Alexandre Julliard 19 May '16

19 May '16

Module: wine Branch: master Commit: 88dd3b4f6e4ed10413b8d93055801a6e60fbc5e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88dd3b4f6e4ed10413b8d9305… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 19 09:11:13 2016 -0500 dsound: Support downmixing 5.1 to stereo. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound_convert.c | 46 ++++++++++++++++++++++++++++++++++++++++++++ dlls/dsound/dsound_private.h | 2 ++ dlls/dsound/mixer.c | 8 ++++++++ 3 files changed, 56 insertions(+) diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c index 4ae83ba..3b4d2e5 100644 --- a/dlls/dsound/dsound_convert.c +++ b/dlls/dsound/dsound_convert.c @@ -157,6 +157,13 @@ void putieee32(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, floa *fbuf = value; } +void putieee32_sum(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) +{ + BYTE *buf = (BYTE *)dsb->device->tmp_buffer; + float *fbuf = (float*)(buf + pos + sizeof(float) * channel); + *fbuf += value; +} + void put_mono2stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) { dsb->put_aux(dsb, pos, 0, value); @@ -206,6 +213,45 @@ 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 */ + switch(channel){ + + case 4: /* back left */ + value *= 0.056f; /* (1/9) / (sum of left volumes) */ + dsb->put_aux(dsb, pos, 0, value); + break; + + case 0: /* front left */ + value *= 0.503; /* 1 / (sum of left volumes) */ + dsb->put_aux(dsb, pos, 0, value); + break; + + case 5: /* back right */ + value *= 0.056f; /* (1/9) / (sum of right volumes) */ + dsb->put_aux(dsb, pos, 1, value); + break; + + case 1: /* front right */ + value *= 0.503f; /* 1 / (sum of right volumes) */ + dsb->put_aux(dsb, pos, 1, value); + break; + + case 2: /* front centre */ + value *= 0.252f; /* 0.5 / (sum of left/right volumes) */ + 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); + break; + } +} + void mixieee32(float *src, float *dst, unsigned samples) { TRACE("%p - %p %d\n", src, dst, samples); diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index d063046..49e98ba 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -47,6 +47,7 @@ typedef float (*bitsgetfunc)(const IDirectSoundBufferImpl *, DWORD, DWORD); typedef void (*bitsputfunc)(const IDirectSoundBufferImpl *, DWORD, DWORD, float); extern const bitsgetfunc getbpp[5] DECLSPEC_HIDDEN; void putieee32(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; +void putieee32_sum(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; void mixieee32(float *src, float *dst, unsigned samples) DECLSPEC_HIDDEN; typedef void (*normfunc)(const void *, void *, unsigned); extern const normfunc normfunctions[4] DECLSPEC_HIDDEN; @@ -177,6 +178,7 @@ void put_mono2quad(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, void put_stereo2quad(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; 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; HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *dsbd, IDirectSoundBuffer **buffer) DECLSPEC_HIDDEN; diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 217d4ce..4f05ee2 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -173,6 +173,12 @@ void DSOUND_RecalcFormat(IDirectSoundBufferImpl *dsb) dsb->mix_channels = 2; dsb->put = put_stereo2surround51; } + else if (ichannels == 6 && ochannels == 2) + { + dsb->mix_channels = 6; + dsb->put = put_surround512stereo; + dsb->put_aux = putieee32_sum; + } else { if (ichannels > 2) @@ -495,6 +501,8 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, float *mix_buffer, /* Resample buffer to temporary buffer specifically allocated for this purpose, if needed */ oldpos = dsb->sec_mixpos; + if(dsb->put_aux == putieee32_sum) + memset(dsb->device->tmp_buffer, 0, dsb->device->tmp_buffer_len); DSOUND_MixToTemporary(dsb, frames); ibuf = dsb->device->tmp_buffer;

1 0

Andrew Eikum : dsound: Support downmixing quadraphonic to stereo.
by Alexandre Julliard 19 May '16

19 May '16

Module: wine Branch: master Commit: 1def346bab59ac447c7f9c34528fb4490b8ed69c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1def346bab59ac447c7f9c345… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 19 09:11:16 2016 -0500 dsound: Support downmixing quadraphonic to stereo. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound_convert.c | 27 +++++++++++++++++++++++++++ dlls/dsound/dsound_private.h | 1 + dlls/dsound/mixer.c | 6 ++++++ 3 files changed, 34 insertions(+) diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c index 3b4d2e5..d9ed637 100644 --- a/dlls/dsound/dsound_convert.c +++ b/dlls/dsound/dsound_convert.c @@ -252,6 +252,33 @@ void put_surround512stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD c } } +void put_quad2stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) +{ + /* based on pulseaudio's downmix algorithm */ + switch(channel){ + + case 2: /* back left */ + value *= 0.1f; /* (1/9) / (sum of left volumes) */ + dsb->put_aux(dsb, pos, 0, value); + break; + + case 0: /* front left */ + value *= 0.9f; /* 1 / (sum of left volumes) */ + dsb->put_aux(dsb, pos, 0, value); + break; + + case 3: /* back right */ + value *= 0.1f; /* (1/9) / (sum of right volumes) */ + dsb->put_aux(dsb, pos, 1, value); + break; + + case 1: /* front right */ + value *= 0.9f; /* 1 / (sum of right volumes) */ + dsb->put_aux(dsb, pos, 1, value); + break; + } +} + void mixieee32(float *src, float *dst, unsigned samples) { TRACE("%p - %p %d\n", src, dst, samples); diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 49e98ba..63d1226 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_quad2stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *dsbd, IDirectSoundBuffer **buffer) DECLSPEC_HIDDEN; diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 4f05ee2..309c338 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 == 4 && ochannels == 2) + { + dsb->mix_channels = 4; + dsb->put = put_quad2stereo; + dsb->put_aux = putieee32_sum; + } else { if (ichannels > 2)

1 0

Jacek Caban : wininet: Use scheme id instead of string in HTTP_HandleRedirect.
by Alexandre Julliard 19 May '16

19 May '16

Module: wine Branch: master Commit: 7528f4d533c8e282279aba2f1fdc70fc868d1758 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7528f4d533c8e282279aba2f1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 18 18:02:02 2016 +0200 wininet: Use scheme id instead of string in HTTP_HandleRedirect. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 21f6ff2..f932a27 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4130,36 +4130,24 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) } else { - URL_COMPONENTSW urlComponents; - WCHAR protocol[INTERNET_MAX_SCHEME_LENGTH]; + URL_COMPONENTSW urlComponents = { sizeof(urlComponents) }; WCHAR hostName[INTERNET_MAX_HOST_NAME_LENGTH]; WCHAR userName[INTERNET_MAX_USER_NAME_LENGTH]; BOOL custom_port = FALSE; - static const WCHAR httpW[] = {'h','t','t','p',0}; - static const WCHAR httpsW[] = {'h','t','t','p','s',0}; - userName[0] = 0; hostName[0] = 0; - protocol[0] = 0; - urlComponents.dwStructSize = sizeof(URL_COMPONENTSW); - urlComponents.lpszScheme = protocol; - urlComponents.dwSchemeLength = INTERNET_MAX_SCHEME_LENGTH; urlComponents.lpszHostName = hostName; urlComponents.dwHostNameLength = INTERNET_MAX_HOST_NAME_LENGTH; urlComponents.lpszUserName = userName; urlComponents.dwUserNameLength = INTERNET_MAX_USER_NAME_LENGTH; - urlComponents.lpszPassword = NULL; - urlComponents.dwPasswordLength = 0; urlComponents.lpszUrlPath = path; urlComponents.dwUrlPathLength = INTERNET_MAX_PATH_LENGTH; - urlComponents.lpszExtraInfo = NULL; - urlComponents.dwExtraInfoLength = 0; if(!InternetCrackUrlW(lpszUrl, strlenW(lpszUrl), 0, &urlComponents)) return INTERNET_GetLastError(); - if(!strcmpiW(protocol, httpW)) { + if(urlComponents.nScheme == INTERNET_SCHEME_HTTP) { if(request->hdr.dwFlags & INTERNET_FLAG_SECURE) { TRACE("redirect from secure page to non-secure page\n"); /* FIXME: warn about from secure redirect to non-secure page */ @@ -4167,7 +4155,7 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) } custom_port = urlComponents.nPort != INTERNET_DEFAULT_HTTP_PORT; - }else if(!strcmpiW(protocol, httpsW)) { + }else if(urlComponents.nScheme == INTERNET_SCHEME_HTTPS) { if(!(request->hdr.dwFlags & INTERNET_FLAG_SECURE)) { TRACE("redirect from non-secure page to secure page\n"); /* FIXME: notify about redirect to secure page */

1 0