November 2015 - Wine-commits

Stefan Dösinger : dxgi/tests: Windows 10 properly makes buffers read only.
by Alexandre Julliard 25 Nov '15

25 Nov '15

Module: wine Branch: master Commit: 8492b1939501093af78bf22d0c486f2ca8a3a9f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8492b1939501093af78bf22d0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 24 22:18:46 2015 +0100 dxgi/tests: Windows 10 properly makes buffers read only. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/device.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 522d5de..4e54f4f 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -1051,7 +1051,7 @@ static void test_swapchain_parameters(void) HRESULT hr; unsigned int i, j; ULONG refcount; - DXGI_USAGE usage, expected_usage; + DXGI_USAGE usage, expected_usage, broken_usage; HWND window; static const struct { @@ -1191,13 +1191,14 @@ static void test_swapchain_parameters(void) hr = IDXGISwapChain_GetBuffer(swapchain, j, &IID_IDXGIResource, (void **)&resource); ok(SUCCEEDED(hr), "GetBuffer(%u) failed, hr %#x, test %u.\n", hr, i, j); - expected_usage = DXGI_USAGE_RENDER_TARGET_OUTPUT | DXGI_USAGE_BACK_BUFFER; - /* Buffers > 0 are supposed to be read only. This is the case except that in - * fullscreen mode the last backbuffer (BufferCount - 1) is writeable. This - * is not the case if an unsupported refresh rate is passed for some reason, - * probably because the invalid refresh rate triggers a kinda-sorta windowed - * mode. + * fullscreen mode on Windows <= 8 the last backbuffer (BufferCount - 1) is + * writeable. This is not the case if an unsupported refresh rate is passed + * for some reason, probably because the invalid refresh rate triggers a + * kinda-sorta windowed mode. + * + * On Windows 10 all buffers > 0 are read-only. Mark the earlier behavior + * broken. * * This last buffer acts as a shadow frontbuffer. Writing to it doesn't show * the draw on the screen right away (Aero on or off doesn't matter), but @@ -1206,12 +1207,15 @@ static void test_swapchain_parameters(void) * Note that if the application doesn't have focused creating a fullscreen * swapchain returns DXGI_STATUS_OCCLUDED and we get a windowed swapchain, * so use the Windowed property of the swapchain that was actually created. */ + expected_usage = DXGI_USAGE_RENDER_TARGET_OUTPUT | DXGI_USAGE_BACK_BUFFER | DXGI_USAGE_READ_ONLY; + broken_usage = DXGI_USAGE_RENDER_TARGET_OUTPUT | DXGI_USAGE_BACK_BUFFER; + if (desc.Windowed || j < tests[i].highest_accessible_buffer) - expected_usage |= DXGI_USAGE_READ_ONLY; + broken_usage |= DXGI_USAGE_READ_ONLY; hr = IDXGIResource_GetUsage(resource, &usage); ok(SUCCEEDED(hr), "Failed to get resource usage, hr %#x, test %u, buffer %u.\n", hr, i, j); - ok(usage == expected_usage, "Got usage %x, expected %x, test %u, buffer %u.\n", + ok(usage == expected_usage || broken(usage == broken_usage), "Got usage %x, expected %x, test %u, buffer %u.\n", usage, expected_usage, i, j); IDXGIResource_Release(resource);

1 0

Andrew Eikum : Revert "explorerframe: Allow treeview expandos to open with a single click.".
by Alexandre Julliard 25 Nov '15

25 Nov '15

Module: wine Branch: master Commit: 585009124aafc1fa6aaa536573a59fad7834f930 URL: http://source.winehq.org/git/wine.git/?a=commit;h=585009124aafc1fa6aaa53657… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Nov 25 07:07:10 2015 -0600 Revert "explorerframe: Allow treeview expandos to open with a single click.". This reverts commit 5bbdcaaa16018c9e15cbaadb3a6e5954d0089cf1. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/explorerframe/nstc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index e8a2c54..87a7200 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -686,9 +686,9 @@ static LRESULT on_nm_click(NSTC2Impl *This, NMHDR *nmhdr) psi = shellitem_from_treeitem(This, tvhit.hItem); hr = events_OnItemClick(This, psi, tvhit.flags, NSTCECT_LBUTTON); - /* The label should not be expanded unless + /* The expando should not be expanded unless * double-clicked. */ - if(tvhit.flags == TVHT_ONITEMLABEL) + if(tvhit.flags == TVHT_ONITEMBUTTON) return TRUE; if(SUCCEEDED(hr))

1 0

Alistair Leslie-Hughes : d3d11: Make blend_factor optional in d3d11_immediate_context_OMSetBlendState().
by Alexandre Julliard 25 Nov '15

25 Nov '15

Module: wine Branch: master Commit: e7de17fce8e55a72d6e2e0dbc30e2b0916f3897a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7de17fce8e55a72d6e2e0dbc… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 25 14:44:32 2015 +0100 d3d11: Make blend_factor optional in d3d11_immediate_context_OMSetBlendState(). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index f9d7c9e..b1f56c3 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -606,10 +606,14 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11Devi ID3D11BlendState *blend_state, const FLOAT blend_factor[4], UINT sample_mask) { struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + static const float default_blend_factor[] = {1.0f, 1.0f, 1.0f, 1.0f}; const D3D11_BLEND_DESC *desc; - TRACE("iface %p, blend_state %p, blend_factor {%.8e %.8e %.8e %.8e}, sample_mask 0x%08x.\n", - iface, blend_state, blend_factor[0], blend_factor[1], blend_factor[2], blend_factor[3], sample_mask); + TRACE("iface %p, blend_state %p, blend_factor %p, sample_mask 0x%08x.\n", + iface, blend_state, blend_factor, sample_mask); + + if (!blend_factor) + blend_factor = default_blend_factor; if (blend_factor[0] != 1.0f || blend_factor[1] != 1.0f || blend_factor[2] != 1.0f || blend_factor[3] != 1.0f) FIXME("Ignoring blend factor {%.8e %.8e %.8e %.8e}.\n", @@ -3063,8 +3067,8 @@ static void STDMETHODCALLTYPE d3d10_device_OMSetBlendState(ID3D10Device1 *iface, struct d3d_device *device = impl_from_ID3D10Device(iface); struct d3d_blend_state *blend_state_object; - TRACE("iface %p, blend_state %p, blend_factor {%.8e %.8e %.8e %.8e}, sample_mask 0x%08x.\n", - iface, blend_state, blend_factor[0], blend_factor[1], blend_factor[2], blend_factor[3], sample_mask); + TRACE("iface %p, blend_state %p, blend_factor %p, sample_mask 0x%08x.\n", + iface, blend_state, blend_factor, sample_mask); blend_state_object = unsafe_impl_from_ID3D10BlendState(blend_state); d3d11_immediate_context_OMSetBlendState(&device->immediate_context.ID3D11DeviceContext_iface,

1 0

Alistair Leslie-Hughes : d3d10core/tests: Add test for NULL blend factor in OMSetBlendState().
by Alexandre Julliard 25 Nov '15

25 Nov '15

Module: wine Branch: master Commit: 5269fdce2c6174dc93a86b14a3ec5a837a68e800 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5269fdce2c6174dc93a86b14a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 25 13:39:56 2015 +1100 d3d10core/tests: Add test for NULL blend factor in OMSetBlendState(). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index bec3763..d25600e 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -2223,6 +2223,7 @@ float4 main(float4 color : COLOR) : SV_TARGET D3D10_BUFFER_DESC buffer_desc; D3D10_BLEND_DESC blend_desc; ID3D10Texture2D *ds_texture; + float tmp_blend_factor[4]; float blend_factor[4]; ID3D10Device *device; BOOL predicate_value; @@ -2559,7 +2560,30 @@ float4 main(float4 color : COLOR) : SV_TARGET hr = ID3D10Device_CreatePredicate(device, &predicate_desc, &predicate); ok(SUCCEEDED(hr), "Failed to create predicate, hr %#x.\n", hr); + /* Verify the behavior of set state methods. */ + + blend_factor[0] = 0.1f; + blend_factor[1] = 0.2f; + blend_factor[2] = 0.3f; + blend_factor[3] = 0.4f; + ID3D10Device_OMSetBlendState(device, blend_state, blend_factor, D3D10_DEFAULT_SAMPLE_MASK); + ID3D10Device_OMGetBlendState(device, &tmp_blend_state, tmp_blend_factor, &sample_mask); + ok(tmp_blend_factor[0] == 0.1f && tmp_blend_factor[1] == 0.2f + && tmp_blend_factor[2] == 0.3f && tmp_blend_factor[3] == 0.4f, + "Got unexpected blend factor {%.8e, %.8e, %.8e, %.8e}.\n", + tmp_blend_factor[0], tmp_blend_factor[1], tmp_blend_factor[2], tmp_blend_factor[3]); + ID3D10BlendState_Release(tmp_blend_state); + + ID3D10Device_OMSetBlendState(device, blend_state, NULL, D3D10_DEFAULT_SAMPLE_MASK); + ID3D10Device_OMGetBlendState(device, &tmp_blend_state, tmp_blend_factor, &sample_mask); + ok(tmp_blend_factor[0] == 1.0f && tmp_blend_factor[1] == 1.0f + && tmp_blend_factor[2] == 1.0f && tmp_blend_factor[3] == 1.0f, + "Got unexpected blend factor {%.8e, %.8e, %.8e, %.8e}.\n", + tmp_blend_factor[0], tmp_blend_factor[1], tmp_blend_factor[2], tmp_blend_factor[3]); + ID3D10BlendState_Release(tmp_blend_state); + /* Setup state. */ + ID3D10Device_VSSetConstantBuffers(device, 0, D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, cb); ID3D10Device_VSSetShaderResources(device, 0, D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT, srv); ID3D10Device_VSSetSamplers(device, 0, D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT, sampler);

1 0

Jacek Caban : wininet: Improved debug traces.
by Alexandre Julliard 25 Nov '15

25 Nov '15

Module: wine Branch: master Commit: 6790d825d1b2c41de73ffe5cb5df28c1d1cc8878 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6790d825d1b2c41de73ffe5cb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 25 15:11:48 2015 +0100 wininet: Improved debug traces. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/ftp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 8944c5c..96cbb5b 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2309,7 +2309,7 @@ BOOL WINAPI FtpCommandW( HINTERNET hConnect, BOOL fExpectResponse, DWORD dwFlags strcat(cmd, szCRLF); len--; - TRACE("Sending (%s) len(%d)\n", cmd, len); + TRACE("Sending (%s) len(%d)\n", debugstr_a(cmd), len); while ((nBytesSent < len) && (nRC != -1)) { nRC = sock_send(lpwfs->sndSocket, cmd + nBytesSent, len - nBytesSent, 0); @@ -2728,7 +2728,7 @@ static BOOL FTP_SendCommandA(INT nSocket, FTP_COMMAND ftpCmd, LPCSTR lpszParam, sprintf(buf, "%s%s%s%s", szFtpCommands[ftpCmd], dwParamLen ? " " : "", dwParamLen ? lpszParam : "", szCRLF); - TRACE("Sending (%s) len(%d)\n", buf, len); + TRACE("Sending (%s) len(%d)\n", debugstr_a(buf), len); while((nBytesSent < len) && (nRC != -1)) { nRC = sock_send(nSocket, buf+nBytesSent, len - nBytesSent, 0);

1 0

Alistair Leslie-Hughes : include: Add d3dx10async.h.
by Alexandre Julliard 25 Nov '15

25 Nov '15

Module: wine Branch: master Commit: 66f4015781f9b36036ca232167affef04ea15e2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=66f4015781f9b36036ca23216… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Nov 19 17:48:00 2015 +1100 include: Add d3dx10async.h. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/d3dx10.h | 1 + include/d3dx10async.h | 43 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 27f0ef6..ea0e3fd 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -246,6 +246,7 @@ HEADER_SRCS = \ d3dtypes.h \ d3dvec.inl \ d3dx10.h \ + d3dx10async.h \ d3dx9.h \ d3dx9anim.h \ d3dx9core.h \ diff --git a/include/d3dx10.h b/include/d3dx10.h index 6333349..df7cdb1 100644 --- a/include/d3dx10.h +++ b/include/d3dx10.h @@ -28,5 +28,6 @@ #include "d3d10.h" #include "d3dx10core.h" +#include "d3dx10async.h" #endif diff --git a/include/d3dx10async.h b/include/d3dx10async.h new file mode 100644 index 0000000..85219d2 --- /dev/null +++ b/include/d3dx10async.h @@ -0,0 +1,43 @@ +/* + * Copyright 2015 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __D3DX10ASYNC_H__ +#define __D3DX10ASYNC_H__ + + +HRESULT WINAPI D3DX10CreateEffectFromFileA(const char *filename, const D3D10_SHADER_MACRO *defines, + ID3D10Include *include, const char *profile, UINT hlslflags, UINT fxflags, ID3D10Device *device, + ID3D10EffectPool *effectpool, ID3DX10ThreadPump *pump, ID3D10Effect **effect, ID3D10Blob **errors, + HRESULT *hresult); + +HRESULT WINAPI D3DX10CreateEffectFromFileW(const WCHAR *filename, const D3D10_SHADER_MACRO *defines, + ID3D10Include *include, const char *profile, UINT hlslflags, UINT fxflags, ID3D10Device *device, + ID3D10EffectPool *effectpool, ID3DX10ThreadPump *pump, ID3D10Effect **effect, ID3D10Blob **errors, + HRESULT *hresult); + +HRESULT WINAPI D3DX10CreateEffectFromMemory(const void *data, SIZE_T datasize, const char *filename, + const D3D10_SHADER_MACRO *defines, ID3D10Include *include, const char *profile, UINT hlslflags, + UINT fxflags, ID3D10Device *device, ID3D10EffectPool *effectpool, ID3DX10ThreadPump *pump, + ID3D10Effect **effect, ID3D10Blob **errors, HRESULT *hresult); + +HRESULT WINAPI D3DX10CreateEffectPoolFromMemory(const void *data, SIZE_T datasize, const char *filename, + const D3D10_SHADER_MACRO *defines, ID3D10Include *include, const char *profile, UINT hlslflags, + UINT fxflags, ID3D10Device *device, ID3DX10ThreadPump *pump, ID3D10EffectPool **effectpool, + ID3D10Blob **errors, HRESULT *hresult); + +#endif

1 0

Stefan Dösinger : d3dx9_36: Replace powf(2, unsigned int) with (1u << unsigned int).
by Alexandre Julliard 25 Nov '15

25 Nov '15

Module: wine Branch: master Commit: 1e7825710964d3c654815c780cd09e21e114a580 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e7825710964d3c654815c780… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Nov 22 01:00:57 2015 +0100 d3dx9_36: Replace powf(2, unsigned int) with (1u << unsigned int). Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/math.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 09c055e..5e8d51a 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -2138,21 +2138,21 @@ unsigned short float_32_to_16(const float in) if (isnan(in)) return (sign ? 0xffff : 0x7fff); if (in == 0.0f) return (sign ? 0x8000 : 0x0000); - if (tmp < powf(2, 10)) + if (tmp < (float)(1u << 10)) { do { tmp *= 2.0f; exp--; - } while (tmp < powf(2, 10)); + } while (tmp < (float)(1u << 10)); } - else if (tmp >= powf(2, 11)) + else if (tmp >= (float)(1u << 11)) { do { tmp /= 2.0f; exp++; - } while (tmp >= powf(2, 11)); + } while (tmp >= (float)(1u << 11)); } exp += 10; /* Normalize the mantissa */ @@ -2190,7 +2190,7 @@ unsigned short float_32_to_16(const float in) exp = origexp; /* the 13 extra bits from single precision are used for rounding */ - mantissa = (unsigned int)(tmp * powf(2, 13)); + mantissa = (unsigned int)(tmp * (1u << 13)); mantissa >>= 1 - exp; /* denormalize */ mantissa -= ~(mantissa >> 13) & 1; /* round half to even */

1 0

Francois Gouget : xaudio2_7: Make some functions static.
by Alexandre Julliard 25 Nov '15

25 Nov '15

Module: wine Branch: master Commit: c9a040b5106c5b3ac21eaadb39186d69b5608401 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9a040b5106c5b3ac21eaadb3… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Nov 18 14:59:01 2015 +0100 xaudio2_7: Make some functions static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/compat.c | 14 +++++++------- dlls/xaudio2_7/xapofx.c | 2 +- dlls/xaudio2_7/xaudio_dll.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/xaudio2_7/compat.c b/dlls/xaudio2_7/compat.c index 8eb0efc..ffe6531 100644 --- a/dlls/xaudio2_7/compat.c +++ b/dlls/xaudio2_7/compat.c @@ -94,7 +94,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(xaudio2); -XA2SourceImpl *impl_from_IXAudio27SourceVoice(IXAudio27SourceVoice *iface) +static XA2SourceImpl *impl_from_IXAudio27SourceVoice(IXAudio27SourceVoice *iface) { return CONTAINING_RECORD(iface, XA2SourceImpl, IXAudio27SourceVoice_iface); } @@ -581,7 +581,7 @@ const IXAudio27Vtbl XAudio27_Vtbl = { XA27_SetDebugConfiguration }; -XA2SourceImpl *impl_from_IXAudio23SourceVoice(IXAudio23SourceVoice *iface) +static XA2SourceImpl *impl_from_IXAudio23SourceVoice(IXAudio23SourceVoice *iface) { return CONTAINING_RECORD(iface, XA2SourceImpl, IXAudio23SourceVoice_iface); } @@ -830,7 +830,7 @@ const IXAudio23SourceVoiceVtbl XAudio23SourceVoice_Vtbl = { XA23SRC_GetFrequencyRatio, }; -XA2SubmixImpl *impl_from_IXAudio23SubmixVoice(IXAudio23SubmixVoice *iface) +static XA2SubmixImpl *impl_from_IXAudio23SubmixVoice(IXAudio23SubmixVoice *iface) { return CONTAINING_RECORD(iface, XA2SubmixImpl, IXAudio23SubmixVoice_iface); } @@ -1007,7 +1007,7 @@ const IXAudio23SubmixVoiceVtbl XAudio23SubmixVoice_Vtbl = { XA23SUB_DestroyVoice }; -IXAudio2Impl *impl_from_IXAudio23MasteringVoice(IXAudio23MasteringVoice *iface) +static IXAudio2Impl *impl_from_IXAudio23MasteringVoice(IXAudio23MasteringVoice *iface) { return CONTAINING_RECORD(iface, IXAudio2Impl, IXAudio23MasteringVoice_iface); } @@ -1436,7 +1436,7 @@ const IXAudio22Vtbl XAudio22_Vtbl = { XA22_SetDebugConfiguration }; -XA2SourceImpl *impl_from_IXAudio20SourceVoice(IXAudio20SourceVoice *iface) +static XA2SourceImpl *impl_from_IXAudio20SourceVoice(IXAudio20SourceVoice *iface) { return CONTAINING_RECORD(iface, XA2SourceImpl, IXAudio20SourceVoice_iface); } @@ -1686,7 +1686,7 @@ const IXAudio20SourceVoiceVtbl XAudio20SourceVoice_Vtbl = { XA20SRC_GetFrequencyRatio, }; -XA2SubmixImpl *impl_from_IXAudio20SubmixVoice(IXAudio20SubmixVoice *iface) +static XA2SubmixImpl *impl_from_IXAudio20SubmixVoice(IXAudio20SubmixVoice *iface) { return CONTAINING_RECORD(iface, XA2SubmixImpl, IXAudio20SubmixVoice_iface); } @@ -1864,7 +1864,7 @@ const IXAudio20SubmixVoiceVtbl XAudio20SubmixVoice_Vtbl = { XA20SUB_DestroyVoice }; -IXAudio2Impl *impl_from_IXAudio20MasteringVoice(IXAudio20MasteringVoice *iface) +static IXAudio2Impl *impl_from_IXAudio20MasteringVoice(IXAudio20MasteringVoice *iface) { return CONTAINING_RECORD(iface, IXAudio2Impl, IXAudio20MasteringVoice_iface); } diff --git a/dlls/xaudio2_7/xapofx.c b/dlls/xaudio2_7/xapofx.c index 0fd008a..e4e4bf8 100644 --- a/dlls/xaudio2_7/xapofx.c +++ b/dlls/xaudio2_7/xapofx.c @@ -648,7 +648,7 @@ struct xapo_cf { const CLSID *class; }; -struct xapo_cf *xapo_impl_from_IClassFactory(IClassFactory *iface) +static struct xapo_cf *xapo_impl_from_IClassFactory(IClassFactory *iface) { return CONTAINING_RECORD(iface, struct xapo_cf, IClassFactory_iface); } diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 15b3ab9..73cf63d 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1801,7 +1801,7 @@ struct xaudio2_cf { DWORD version; }; -struct xaudio2_cf *impl_from_IClassFactory(IClassFactory *iface) +static struct xaudio2_cf *impl_from_IClassFactory(IClassFactory *iface) { return CONTAINING_RECORD(iface, struct xaudio2_cf, IClassFactory_iface); }

1 0

Bruno Jesus : msacm32/tests: Add some acmStreamPrepareHeader and acmStreamConvert tests.
by Alexandre Julliard 25 Nov '15

25 Nov '15

Module: wine Branch: master Commit: cb5ba51f94eb6e61e50763d149154d210df8bf65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb5ba51f94eb6e61e50763d14… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Nov 24 17:08:00 2015 +0800 msacm32/tests: Add some acmStreamPrepareHeader and acmStreamConvert tests. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/tests/msacm.c | 92 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 91 insertions(+), 1 deletion(-) diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index 4c9dca0..bb4ccc5 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -527,7 +527,7 @@ static void test_prepareheader(void) WAVEFORMATEX dst; MMRESULT mr; ACMSTREAMHEADER hdr; - BYTE buf[sizeof(WAVEFORMATEX) + 32], pcm[512], input[512]; + BYTE buf[sizeof(WAVEFORMATEX) + 32], pcm[2048], input[512]; ADPCMCOEFSET *coef; src = (ADPCMWAVEFORMAT*)buf; @@ -567,6 +567,7 @@ static void test_prepareheader(void) mr = acmStreamOpen(&has, NULL, (WAVEFORMATEX*)src, &dst, NULL, 0, 0, 0); ok(mr == MMSYSERR_NOERROR, "open failed: 0x%x\n", mr); + memset(input, 0, sizeof(input)); memset(&hdr, 0, sizeof(hdr)); hdr.cbStruct = sizeof(hdr); hdr.pbSrc = input; @@ -594,6 +595,95 @@ static void test_prepareheader(void) ok(mr == MMSYSERR_NOERROR, "prepare failed: 0x%x\n", mr); ok(hdr.fdwStatus == (ACMSTREAMHEADER_STATUSF_PREPARED | ACMSTREAMHEADER_STATUSF_DONE), "header wasn't prepared: 0x%x\n", hdr.fdwStatus); + hdr.cbSrcLengthUsed = 12345; + hdr.cbDstLengthUsed = 12345; + hdr.fdwStatus &= ~ACMSTREAMHEADER_STATUSF_DONE; + mr = acmStreamConvert(has, &hdr, ACM_STREAMCONVERTF_BLOCKALIGN); + ok(mr == MMSYSERR_NOERROR, "convert failed: 0x%x\n", mr); + ok(hdr.fdwStatus & ACMSTREAMHEADER_STATUSF_DONE, "conversion was not done: 0x%x\n", hdr.fdwStatus); + ok(hdr.cbSrcLengthUsed == hdr.cbSrcLength, "expected %d, got %d\n", hdr.cbSrcLength, hdr.cbSrcLengthUsed); +todo_wine + ok(hdr.cbDstLengthUsed == 1010, "expected 1010, got %d\n", hdr.cbDstLengthUsed); + + mr = acmStreamUnprepareHeader(has, &hdr, 0); + ok(mr == MMSYSERR_NOERROR, "unprepare failed: 0x%x\n", mr); + ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_DONE, "header wasn't unprepared: 0x%x\n", hdr.fdwStatus); + + /* The 2 next tests are related to Lost Horizon (bug 24723) */ + memset(&hdr, 0, sizeof(hdr)); + hdr.cbStruct = sizeof(hdr); + hdr.pbSrc = input; + hdr.cbSrcLength = sizeof(input); + hdr.pbDst = pcm; + hdr.cbDstLength = -4; + + mr = acmStreamPrepareHeader(has, &hdr, 0); + if (sizeof(void *) == 4) /* 64 bit fails on this test */ + { + ok(mr == MMSYSERR_NOERROR, "prepare failed: 0x%x\n", mr); + ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_PREPARED, "header wasn't prepared: 0x%x\n", hdr.fdwStatus); + + hdr.cbSrcLengthUsed = 12345; + hdr.cbDstLengthUsed = 12345; + hdr.fdwStatus &= ~ACMSTREAMHEADER_STATUSF_DONE; + mr = acmStreamConvert(has, &hdr, ACM_STREAMCONVERTF_BLOCKALIGN); + ok(mr == MMSYSERR_NOERROR, "convert failed: 0x%x\n", mr); + ok(hdr.fdwStatus & ACMSTREAMHEADER_STATUSF_DONE, "conversion was not done: 0x%x\n", hdr.fdwStatus); + ok(hdr.cbSrcLengthUsed == hdr.cbSrcLength, "expected %d, got %d\n", hdr.cbSrcLength, hdr.cbSrcLengthUsed); +todo_wine + ok(hdr.cbDstLengthUsed == 1010, "expected 1010, got %d\n", hdr.cbDstLengthUsed); + + mr = acmStreamUnprepareHeader(has, &hdr, 0); + ok(mr == MMSYSERR_NOERROR, "unprepare failed: 0x%x\n", mr); + ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_DONE, "header wasn't unprepared: 0x%x\n", hdr.fdwStatus); + } + else + ok(mr == MMSYSERR_INVALPARAM, "expected 11, got %d\n", mr); + + memset(&hdr, 0, sizeof(hdr)); + hdr.cbStruct = sizeof(hdr); + hdr.pbSrc = input; + hdr.cbSrcLength = 24; + hdr.pbDst = pcm; + hdr.cbDstLength = -4; + mr = acmStreamPrepareHeader(has, &hdr, 0); +todo_wine { + ok(mr == ACMERR_NOTPOSSIBLE, "expected 0x200, got 0x%x\n", mr); + ok(hdr.fdwStatus == 0, "expected 0, got 0x%x\n", hdr.fdwStatus); + + hdr.cbSrcLengthUsed = 12345; + hdr.cbDstLengthUsed = 12345; + mr = acmStreamConvert(has, &hdr, ACM_STREAMCONVERTF_BLOCKALIGN); + ok(mr == ACMERR_UNPREPARED, "expected 0x202, got 0x%x\n", mr); + ok(hdr.cbSrcLengthUsed == 12345, "expected 12345, got %d\n", hdr.cbSrcLengthUsed); + ok(hdr.cbDstLengthUsed == 12345, "expected 12345, got %d\n", hdr.cbDstLengthUsed); + + mr = acmStreamUnprepareHeader(has, &hdr, 0); + ok(mr == ACMERR_UNPREPARED, "expected 0x202, got 0x%x\n", mr); +} + /* Less output space than required */ + memset(&hdr, 0, sizeof(hdr)); + hdr.cbStruct = sizeof(hdr); + hdr.pbSrc = input; + hdr.cbSrcLength = sizeof(input); + hdr.pbDst = pcm; + hdr.cbDstLength = 32; + + mr = acmStreamPrepareHeader(has, &hdr, 0); + ok(mr == MMSYSERR_NOERROR, "prepare failed: 0x%x\n", mr); + ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_PREPARED, "header wasn't prepared: 0x%x\n", hdr.fdwStatus); + + hdr.cbSrcLengthUsed = 12345; + hdr.cbDstLengthUsed = 12345; + hdr.fdwStatus &= ~ACMSTREAMHEADER_STATUSF_DONE; + mr = acmStreamConvert(has, &hdr, ACM_STREAMCONVERTF_BLOCKALIGN); + ok(mr == MMSYSERR_NOERROR, "convert failed: 0x%x\n", mr); + ok(hdr.fdwStatus & ACMSTREAMHEADER_STATUSF_DONE, "conversion was not done: 0x%x\n", hdr.fdwStatus); +todo_wine + ok(hdr.cbSrcLengthUsed == hdr.cbSrcLength, "expected %d, got %d\n", hdr.cbSrcLength, hdr.cbSrcLengthUsed); +todo_wine + ok(hdr.cbDstLengthUsed == hdr.cbDstLength, "expected %d, got %d\n", hdr.cbDstLength, hdr.cbDstLengthUsed); + mr = acmStreamUnprepareHeader(has, &hdr, 0); ok(mr == MMSYSERR_NOERROR, "unprepare failed: 0x%x\n", mr); ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_DONE, "header wasn't unprepared: 0x%x\n", hdr.fdwStatus);

1 0

Henri Verbeet : dxgi: Implement dxgi_output_GetDesc().
by Alexandre Julliard 25 Nov '15

25 Nov '15

Module: wine Branch: master Commit: af196e5f25daf99cc7bf6f2dc1fe5d48dc992e19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af196e5f25daf99cc7bf6f2dc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 24 18:06:17 2015 +0100 dxgi: Implement dxgi_output_GetDesc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/directx.c | 13 +++++++--- dlls/d3d9/directx.c | 13 +++++++--- dlls/ddraw/main.c | 6 +++-- dlls/dxgi/output.c | 28 +++++++++++++++++++-- dlls/dxgi/tests/device.c | 56 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/directx.c | 35 ++++++++++++++++++++------ dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.h | 12 ++++++++- 9 files changed, 146 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=af196e5f25daf99cc7bf6…

1 0