June 2017 - Wine-commits - list.winehq.org

Alistair Leslie-Hughes : dplayx: Implement IDirectPlayLobby3 EnumAddressTypes.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: 6a6f3365febee1ae35a8cac5f098957a5658cb57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a6f3365febee1ae35a8cac5f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 8 05:55:26 2017 +0000 dplayx: Implement IDirectPlayLobby3 EnumAddressTypes. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dplayx/dplobby.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index 7f9c7a8..944fea9 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -832,8 +832,9 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_EnumAddressTypes( IDirectPlayLobby3 static HRESULT WINAPI IDirectPlayLobby3Impl_EnumAddressTypes( IDirectPlayLobby3 *iface, LPDPLENUMADDRESSTYPESCALLBACK enumaddrtypecb, REFGUID sp, void *context, DWORD flags ) { - FIXME(":stub\n"); - return DPERR_OUTOFMEMORY; + IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3( iface ); + return IDirectPlayLobby_EnumAddressTypes( &This->IDirectPlayLobby3A_iface, enumaddrtypecb, sp, + context, flags ); } /********************************************************************

1 0

Nikolay Sivov : d3drm: Make it possible to create faces with CreateObject( ).
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: 499736490500d19670d1212b04ecbdbfc2b362d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=499736490500d19670d1212b0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 9 02:36:48 2017 +0300 d3drm: Make it possible to create faces with CreateObject(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm.c | 40 +++++++++++++++++++++++++++++++++++++--- dlls/d3drm/d3drm_private.h | 10 +++++++++- dlls/d3drm/face.c | 46 +++++++++++++++++++++++----------------------- dlls/d3drm/meshbuilder.c | 20 ++++++++++++++++++-- dlls/d3drm/tests/d3drm.c | 18 ++++++++++++++++++ 5 files changed, 105 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=499736490500d19670d12…

1 0

Nikolay Sivov : d3drm: Make it possible to create mesh builder with CreateObject().
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: a22e4647462a7b4068f8eb180a44bcaccfbf0a7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a22e4647462a7b4068f8eb180… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 9 02:36:49 2017 +0300 d3drm: Make it possible to create mesh builder with CreateObject(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm.c | 40 ++++++++++++++++++++++++++--- dlls/d3drm/d3drm_private.h | 29 ++++++++++++++++++++- dlls/d3drm/meshbuilder.c | 63 +++++++++++++++++----------------------------- dlls/d3drm/tests/d3drm.c | 21 +++++++++++++--- 4 files changed, 106 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a22e4647462a7b4068f8e…

1 0

Józef Kucia : d3d11/tests: Fix ok() checks in test_timestamp_query().
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: e7cf04be520c76ef4ad10a516fe2ba6dd0d4a203 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7cf04be520c76ef4ad10a516… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 9 13:00:01 2017 +0200 d3d11/tests: Fix ok() checks in test_timestamp_query(). 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 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index a3f2c98..5565143 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -5021,7 +5021,7 @@ static void test_timestamp_query(void) ID3D11DeviceContext_End(context, timestamp_disjoint_query); get_query_data(context, timestamp_disjoint_query, &disjoint, sizeof(disjoint)); - ok(disjoint.Frequency != 0xffffffff, "Frequency data was not modified.\n"); + ok(disjoint.Frequency != ~(UINT64)0, "Frequency data was not modified.\n"); ok(disjoint.Disjoint == TRUE || disjoint.Disjoint == FALSE, "Got unexpected disjoint %#x.\n", disjoint.Disjoint); prev_disjoint = disjoint; @@ -5044,7 +5044,8 @@ static void test_timestamp_query(void) hr = ID3D11DeviceContext_GetData(context, timestamp_disjoint_query, &disjoint, sizeof(disjoint), D3D11_ASYNC_GETDATA_DONOTFLUSH); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - ok(!memcmp(&disjoint, &prev_disjoint, sizeof(disjoint)), "Disjoint data mismatch.\n"); + ok(disjoint.Frequency == prev_disjoint.Frequency, "Frequency data mismatch.\n"); + ok(disjoint.Disjoint == prev_disjoint.Disjoint, "Disjoint data mismatch.\n"); memset(&timestamp, 0xff, sizeof(timestamp)); hr = ID3D11DeviceContext_GetData(context, timestamp_query, NULL, 0, 0); @@ -5092,7 +5093,7 @@ static void test_timestamp_query(void) disjoint.Disjoint = 0xff; hr = ID3D11DeviceContext_GetData(context, timestamp_disjoint_query, &disjoint, sizeof(disjoint), 0); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - ok(disjoint.Frequency != 0xffffffff, "Frequency data was not modified.\n"); + ok(disjoint.Frequency != 0xdeadbeef, "Frequency data was not modified.\n"); ok(disjoint.Disjoint == TRUE || disjoint.Disjoint == FALSE, "Got unexpected disjoint %#x.\n", disjoint.Disjoint); /* It's not strictly necessary for the TIMESTAMP query to be inside a TIMESTAMP_DISJOINT query. */

1 0

Józef Kucia : d3d10core/tests: Introduce get_query_data() helper function.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: de7f712ba9a18f308d9d55f1621e1ee18b59e254 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de7f712ba9a18f308d9d55f16… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 9 13:00:02 2017 +0200 d3d10core/tests: Introduce get_query_data() helper function. 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 | 183 ++++++++++++++++-------------------------- 1 file changed, 68 insertions(+), 115 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=de7f712ba9a18f308d9d5…

1 0

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

09 Jun '17

Module: wine Branch: master Commit: 2fb2836b45977b7fcf14eddf820895f95b96da62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fb2836b45977b7fcf14eddf8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 9 13:00:03 2017 +0200 d3d11: Implement d3d11_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 | 9 ++++++++- dlls/d3d11/d3d11_private.h | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index baa0926..4b290ad 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -159,7 +159,11 @@ static UINT STDMETHODCALLTYPE d3d11_query_GetDataSize(ID3D11Query *iface) static void STDMETHODCALLTYPE d3d11_query_GetDesc(ID3D11Query *iface, D3D11_QUERY_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d3d_query *query = impl_from_ID3D11Query(iface); + + TRACE("iface %p, desc %p.\n", iface, desc); + + *desc = query->desc; } static const struct ID3D11QueryVtbl d3d11_query_vtbl = @@ -428,6 +432,9 @@ static HRESULT d3d_query_init(struct d3d_query *query, struct d3d_device *device query->ID3D11Query_iface.lpVtbl = &d3d11_query_vtbl; query->ID3D10Query_iface.lpVtbl = &d3d10_query_vtbl; query->refcount = 1; + + query->desc = *desc; + wined3d_mutex_lock(); wined3d_private_store_init(&query->private_store); diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 57f1e90..479c84f 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -480,6 +480,7 @@ struct d3d_query struct wined3d_private_store private_store; struct wined3d_query *wined3d_query; BOOL predicate; + D3D11_QUERY_DESC desc; ID3D11Device *device; };

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

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 : 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

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