wine-commits June 2017

wine-commits@winehq.org

2 participants
595 discussions

Alexandre Julliard : Wine release 2.10
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: website Branch: master Commit: f98e7a06ca1323a82d96b28433dca54926fea04b URL: http://source.winehq.org/git/website.git/?a=commit;h=f98e7a06ca1323a82d96b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 9 19:44:08 2017 +0200 Wine release 2.10 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2017060901.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2017060901.xml b/news/en/2017060901.xml new file mode 100644 index 0000000..43c515c --- /dev/null +++ b/news/en/2017060901.xml @@ -0,0 +1,17 @@ +<news> +<date>June 9, 2017</date> +<title>Wine 2.10 Released</title> +<body> + The Wine development release 2.10 is now available. + <a href="{$root}/announce/2.10">What's new</a> in this release: +<ul> + <li>Initial version of the Android graphics driver.</li> + <li>Dictionary support in WebServices.</li> + <li>A number of Direct2D fixes.</li> + <li>User interface improvements in RegEdit.</li> + <li>OLE clipboard cache fixes.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/2.x/wine-2.10.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

Tag wine-2.10 : Alexandre Julliard : Release 2.10
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: refs/tags/wine-2.10 Tag: 5c8ee03b9d8823fb03baa4016a52edb0ed55ece4 URL: http://source.winehq.org/git/wine.git/?a=tag;h=5c8ee03b9d8823fb03baa4016a52… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 9 19:41:15 2017 +0200 Release 2.10

1 0

Alexandre Julliard : Release 2.10.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: 74d93d9bc0acadacc97c3dc803ede6ed4b8becb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74d93d9bc0acadacc97c3dc80… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 9 19:41:15 2017 +0200 Release 2.10. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 749 ++++++++++++++++++++++++++++++++------------------------------ VERSION | 2 +- configure | 18 +- 3 files changed, 396 insertions(+), 373 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=74d93d9bc0acadacc97c3…

1 0

Andrey Gusev : uxtheme/tests: Fix a typo in ok() message.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: 1a761379f8742fe79f696ea7c7bbf4aa02e9f764 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a761379f8742fe79f696ea7c… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Jun 9 17:48:16 2017 +0300 uxtheme/tests: Fix a typo in ok() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/tests/system.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index beba353..6989f44 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -687,7 +687,7 @@ todo_wine hr = pGetBufferedPaintBits(NULL, &bits, &row); ok(hr == E_FAIL, "Unexpected return code %#x\n", hr); ok(row == 10, "Unexpected row count %d\n", row); - ok(bits == (void *)0xdeadbeef, "Unepexpected data pointer %p\n", bits); + ok(bits == (void *)0xdeadbeef, "Unexpected data pointer %p\n", bits); hr = pGetBufferedPaintBits(NULL, NULL, NULL); ok(hr == E_POINTER, "Unexpected return code %#x\n", hr);

1 0

Zebediah Figura : msacm32: Check correct variable.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: 7493364b4bffa3563b4f36124b12a29bc59f4e86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7493364b4bffa3563b4f36124… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 8 17:57:12 2017 -0500 msacm32: Check correct variable. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/format.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c index f3c5155..e7eab56 100644 --- a/dlls/msacm32/format.c +++ b/dlls/msacm32/format.c @@ -424,7 +424,7 @@ MMRESULT WINAPI acmFormatDetailsW(HACMDRIVER had, PACMFORMATDETAILSW pafd, DWORD if (pafd->fdwSupport) return MMSYSERR_INVALPARAM; - if (pafd->pwfx->wFormatTag == WAVE_FORMAT_UNKNOWN) + if (pafd->dwFormatTag == WAVE_FORMAT_UNKNOWN) return MMSYSERR_INVALPARAM; switch (fdwDetails) {

1 0

Zebediah Figura : imaadp32.acm: Fix nibble ordering.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: 0f0fb984985aa08146996e04baf2b3d6e58abf46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f0fb984985aa08146996e04b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 8 10:15:21 2017 -0500 imaadp32.acm: Fix nibble ordering. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imaadp32.acm/imaadp32.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/imaadp32.acm/imaadp32.c b/dlls/imaadp32.acm/imaadp32.c index 7f4c5ea..474f548 100644 --- a/dlls/imaadp32.acm/imaadp32.c +++ b/dlls/imaadp32.acm/imaadp32.c @@ -445,7 +445,7 @@ static void cvtSS16imaK(PACMDRVSTREAMINSTANCE adsi, &stepIndexL, &sampleL); code2 = generate_nibble(R16(src + (4 * i + 2) * 2), &stepIndexL, &sampleL); - *dst++ = (code1 << 4) | code2; + *dst++ = (code2 << 4) | code1; } for (i = 0; i < 4; i++) { @@ -453,7 +453,7 @@ static void cvtSS16imaK(PACMDRVSTREAMINSTANCE adsi, &stepIndexR, &sampleR); code2 = generate_nibble(R16(src + (4 * i + 3) * 2), &stepIndexR, &sampleR); - *dst++ = (code1 << 4) | code2; + *dst++ = (code2 << 4) | code1; } src += 32; } @@ -509,7 +509,7 @@ static void cvtMM16imaK(PACMDRVSTREAMINSTANCE adsi, src += 2; code2 = generate_nibble(R16(src), &stepIndex, &sample); src += 2; - *dst++ = (code1 << 4) | code2; + *dst++ = (code2 << 4) | code1; } dst = in_dst + adsi->pwfxDst->nBlockAlign; }

1 0

Zebediah Figura : imaadp32.acm: Fix block size calculations.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: 2a1c1a4bac6753b0aafc66bdcfa9821a8453c2e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a1c1a4bac6753b0aafc66bdc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 8 10:15:20 2017 -0500 imaadp32.acm: Fix block size calculations. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imaadp32.acm/imaadp32.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/imaadp32.acm/imaadp32.c b/dlls/imaadp32.acm/imaadp32.c index 78a0ac4..7f4c5ea 100644 --- a/dlls/imaadp32.acm/imaadp32.c +++ b/dlls/imaadp32.acm/imaadp32.c @@ -154,7 +154,7 @@ static void init_wfx_ima_adpcm(IMAADPCMWAVEFORMAT* awfx/*, DWORD nba*/) } pwfx->cbSize = sizeof(WORD); - awfx->wSamplesPerBlock = (pwfx->nBlockAlign - (4 * pwfx->nChannels) * 2) / pwfx->nChannels + 1; + awfx->wSamplesPerBlock = (pwfx->nBlockAlign - (4 * pwfx->nChannels)) * (2 / pwfx->nChannels) + 1; pwfx->nAvgBytesPerSec = (pwfx->nSamplesPerSec * pwfx->nBlockAlign) / awfx->wSamplesPerBlock; } @@ -631,14 +631,7 @@ static LRESULT ADPCM_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) afd->pwfx->nChannels = ADPCM_Formats[afd->dwFormatIndex].nChannels; afd->pwfx->nSamplesPerSec = ADPCM_Formats[afd->dwFormatIndex].rate; afd->pwfx->wBitsPerSample = ADPCM_Formats[afd->dwFormatIndex].nBits; - afd->pwfx->nBlockAlign = 1024; - /* we got 4 bits per sample */ - afd->pwfx->nAvgBytesPerSec = - (afd->pwfx->nSamplesPerSec * 4) / 8; - if (afd->cbwfx >= sizeof(WAVEFORMATEX)) - afd->pwfx->cbSize = sizeof(WORD); - if (afd->cbwfx >= sizeof(IMAADPCMWAVEFORMAT)) - ((IMAADPCMWAVEFORMAT*)afd->pwfx)->wSamplesPerBlock = (1024 - 4 * afd->pwfx->nChannels) * (2 / afd->pwfx->nChannels) + 1; + init_wfx_ima_adpcm((IMAADPCMWAVEFORMAT *)afd->pwfx); break; default: WARN("Unsupported tag %08x\n", afd->dwFormatTag);

1 0

Józef Kucia : d3d10core/tests: Port test_pipeline_statistics_query() from d3d11.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: 0c456ac8666cad127d381d6fdcffaf3439b6dc66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c456ac8666cad127d381d6fd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 9 13:00:06 2017 +0200 d3d10core/tests: Port test_pipeline_statistics_query() from d3d11. 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/d3d10core/tests/device.c | 73 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index bd8cf57..5159bad 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -4048,6 +4048,78 @@ static void test_occlusion_query(void) release_test_context(&test_context); } +static void test_pipeline_statistics_query(void) +{ + static const struct vec4 red = {1.0f, 0.0f, 0.0f, 1.0f}; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + + struct d3d10core_test_context test_context; + D3D10_QUERY_DATA_PIPELINE_STATISTICS data; + D3D10_QUERY_DESC query_desc; + ID3D10Asynchronous *query; + unsigned int data_size; + ID3D10Device *device; + HRESULT hr; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, white); + + query_desc.Query = D3D10_QUERY_PIPELINE_STATISTICS; + query_desc.MiscFlags = 0; + hr = ID3D10Device_CreateQuery(device, &query_desc, (ID3D10Query **)&query); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + data_size = ID3D10Asynchronous_GetDataSize(query); + ok(data_size == sizeof(data), "Got unexpected data size %u.\n", data_size); + + hr = ID3D10Asynchronous_GetData(query, NULL, 0, 0); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Asynchronous_GetData(query, &data, sizeof(data), 0); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + ID3D10Asynchronous_End(query); + ID3D10Asynchronous_Begin(query); + ID3D10Asynchronous_Begin(query); + + hr = ID3D10Asynchronous_GetData(query, NULL, 0, 0); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Asynchronous_GetData(query, &data, sizeof(data), 0); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + draw_quad(&test_context); + + ID3D10Asynchronous_End(query); + get_query_data(query, &data, sizeof(data)); + ok(data.IAVertices == 4, "Got unexpected IAVertices count: %u.\n", (unsigned int)data.IAVertices); + ok(data.IAPrimitives == 2, "Got unexpected IAPrimitives count: %u.\n", (unsigned int)data.IAPrimitives); + ok(data.VSInvocations == 4, "Got unexpected VSInvocations count: %u.\n", (unsigned int)data.VSInvocations); + ok(!data.GSInvocations, "Got unexpected GSInvocations count: %u.\n", (unsigned int)data.GSInvocations); + ok(!data.GSPrimitives, "Got unexpected GSPrimitives count: %u.\n", (unsigned int)data.GSPrimitives); + ok(data.CInvocations == 2, "Got unexpected CInvocations count: %u.\n", (unsigned int)data.CInvocations); + ok(data.CPrimitives == 2, "Got unexpected CPrimitives count: %u.\n", (unsigned int)data.CPrimitives); + todo_wine + ok(!data.PSInvocations, "Got unexpected PSInvocations count: %u.\n", (unsigned int)data.PSInvocations); + + ID3D10Asynchronous_Begin(query); + draw_color_quad(&test_context, &red); + ID3D10Asynchronous_End(query); + get_query_data(query, &data, sizeof(data)); + ok(data.IAVertices == 4, "Got unexpected IAVertices count: %u.\n", (unsigned int)data.IAVertices); + ok(data.IAPrimitives == 2, "Got unexpected IAPrimitives count: %u.\n", (unsigned int)data.IAPrimitives); + ok(data.VSInvocations == 4, "Got unexpected VSInvocations count: %u.\n", (unsigned int)data.VSInvocations); + ok(!data.GSInvocations, "Got unexpected GSInvocations count: %u.\n", (unsigned int)data.GSInvocations); + ok(!data.GSPrimitives, "Got unexpected GSPrimitives count: %u.\n", (unsigned int)data.GSPrimitives); + ok(data.CInvocations == 2, "Got unexpected CInvocations count: %u.\n", (unsigned int)data.CInvocations); + ok(data.CPrimitives == 2, "Got unexpected CPrimitives count: %u.\n", (unsigned int)data.CPrimitives); + ok(data.PSInvocations >= 640 * 480, "Got unexpected PSInvocations count: %u.\n", (unsigned int)data.PSInvocations); + + ID3D10Asynchronous_Release(query); + release_test_context(&test_context); +} + static void test_timestamp_query(void) { static const struct vec4 red = {1.0f, 0.0f, 0.0f, 1.0f}; @@ -12525,6 +12597,7 @@ START_TEST(device) test_create_rasterizer_state(); test_create_query(); test_occlusion_query(); + test_pipeline_statistics_query(); test_timestamp_query(); test_device_removed_reason(); test_scissor();

1 0

Józef Kucia : d3d11: Fixup D3D10_QUERY_PIPELINE_STATISTICS data.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: ffb47ee5ec8cdd7826bb220d4c6ec179e820551c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffb47ee5ec8cdd7826bb220d4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 9 13:00:05 2017 +0200 d3d11: Fixup D3D10_QUERY_PIPELINE_STATISTICS data. 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/async.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index c92e45f..ef8e63c 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -320,6 +320,8 @@ static void STDMETHODCALLTYPE d3d10_query_End(ID3D10Query *iface) static HRESULT STDMETHODCALLTYPE d3d10_query_GetData(ID3D10Query *iface, void *data, UINT data_size, UINT flags) { struct d3d_query *query = impl_from_ID3D10Query(iface); + D3D11_QUERY_DATA_PIPELINE_STATISTICS d3d11_data; + void *d3d10_data_pointer = NULL; unsigned int wined3d_flags; HRESULT hr; @@ -328,6 +330,17 @@ static HRESULT STDMETHODCALLTYPE d3d10_query_GetData(ID3D10Query *iface, void *d if (!data && data_size) return E_INVALIDARG; + if (query->desc.Query == D3D11_QUERY_PIPELINE_STATISTICS + && data_size == sizeof(D3D10_QUERY_DATA_PIPELINE_STATISTICS)) + { + data_size = sizeof(D3D11_QUERY_DATA_PIPELINE_STATISTICS); + if (data) + { + d3d10_data_pointer = data; + data = &d3d11_data; + } + } + wined3d_flags = wined3d_getdata_flags_from_d3d11_async_getdata_flags(flags); wined3d_mutex_lock(); @@ -344,6 +357,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_query_GetData(ID3D10Query *iface, void *d } wined3d_mutex_unlock(); + if (d3d10_data_pointer && hr == S_OK) + memcpy(d3d10_data_pointer, data, sizeof(D3D10_QUERY_DATA_PIPELINE_STATISTICS)); + return hr; } @@ -358,6 +374,9 @@ static UINT STDMETHODCALLTYPE d3d10_query_GetDataSize(ID3D10Query *iface) data_size = wined3d_query_get_data_size(query->wined3d_query); wined3d_mutex_unlock(); + if (query->desc.Query == D3D11_QUERY_PIPELINE_STATISTICS) + data_size = sizeof(D3D10_QUERY_DATA_PIPELINE_STATISTICS); + return data_size; }

1 0

Józef Kucia : d3d11: Implement d3d10_query_GetDesc().
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: a695cc6caa4c9a2ce9c0da4757ced93ef79c4fae URL: http://source.winehq.org/git/wine.git/?a=commit;h=a695cc6caa4c9a2ce9c0da475… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 9 13:00:04 2017 +0200 d3d11: Implement d3d10_query_GetDesc(). 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/async.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index 4b290ad..c92e45f 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -1,5 +1,6 @@ /* * Copyright 2009 Henri Verbeet for CodeWeavers + * Copyright 2015-2017 Józef Kucia for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -364,7 +365,11 @@ static UINT STDMETHODCALLTYPE d3d10_query_GetDataSize(ID3D10Query *iface) static void STDMETHODCALLTYPE d3d10_query_GetDesc(ID3D10Query *iface, D3D10_QUERY_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d3d_query *query = impl_from_ID3D10Query(iface); + + TRACE("iface %p, desc %p.\n", iface, desc); + + memcpy(desc, &query->desc, sizeof(*desc)); } static const struct ID3D10QueryVtbl d3d10_query_vtbl =

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
60
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2017