August 2015 - Wine-Commits - list.winehq.org

Andrew Eikum : xaudio2/tests: Add callback tests.
by Alexandre Julliard Aug. 31, 2015

Aug. 31, 2015

Module: wine Branch: master Commit: 6abe9f0920b33e33eebc2c5c60aaf7307f4ed210 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6abe9f0920b33e33eebc2c5c6… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Aug 28 08:22:33 2015 -0500 xaudio2/tests: Add callback tests. --- dlls/xaudio2_7/tests/xaudio2.c | 307 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 305 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6abe9f0920b33e33eebc2…

1 0

Andrew Eikum : xaudio2: Add a simple audio streaming test.
by Alexandre Julliard Aug. 31, 2015

Aug. 31, 2015

Module: wine Branch: master Commit: 5423b2353bac65e25a02e78920bc775ec93f2e06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5423b2353bac65e25a02e7892… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Aug 28 08:22:29 2015 -0500 xaudio2: Add a simple audio streaming test. --- dlls/xaudio2_7/tests/xaudio2.c | 127 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 124 insertions(+), 3 deletions(-) diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index 669e5ed..01fabd6 100644 --- a/dlls/xaudio2_7/tests/xaudio2.c +++ b/dlls/xaudio2_7/tests/xaudio2.c @@ -17,17 +17,111 @@ */ #include <windows.h> +#include <math.h> #define COBJMACROS #include "wine/test.h" #include "initguid.h" #include "xaudio2.h" +#include "mmsystem.h" static BOOL xaudio27; static HRESULT (WINAPI *pXAudio2Create)(IXAudio2 **, UINT32, XAUDIO2_PROCESSOR) = NULL; -static void test_DeviceDetails(IXAudio27 *xa) +#define XA2CALL_0(method) if(xaudio27) hr = IXAudio27_##method((IXAudio27*)xa); else hr = IXAudio2_##method(xa); +#define XA2CALL_V(method, ...) if(xaudio27) IXAudio27_##method((IXAudio27*)xa, __VA_ARGS__); else IXAudio2_##method(xa, __VA_ARGS__); +#define XA2CALL(method, ...) if(xaudio27) hr = IXAudio27_##method((IXAudio27*)xa, __VA_ARGS__); else hr = IXAudio2_##method(xa, __VA_ARGS__); + +static void fill_buf(float *buf, WAVEFORMATEX *fmt, DWORD hz, DWORD len_frames) +{ + if(winetest_interactive){ + DWORD offs, c; + for(offs = 0; offs < len_frames; ++offs) + for(c = 0; c < fmt->nChannels; ++c) + buf[offs * fmt->nChannels + c] = sinf(offs * hz * 2 * M_PI / fmt->nSamplesPerSec); + }else + memset(buf, 0, sizeof(float) * len_frames * fmt->nChannels); +} + +static void test_simple_streaming(IXAudio2 *xa) +{ + HRESULT hr; + IXAudio2MasteringVoice *master; + IXAudio2SourceVoice *src, *src2; + WAVEFORMATEX fmt; + XAUDIO2_BUFFER buf, buf2; + XAUDIO2_VOICE_STATE state; + + if(xaudio27) + hr = IXAudio27_CreateMasteringVoice((IXAudio27*)xa, &master, 2, 44100, 0, 0, NULL); + else + hr = IXAudio2_CreateMasteringVoice(xa, &master, 2, 44100, 0, NULL, NULL, AudioCategory_GameEffects); + ok(hr == S_OK, "CreateMasteringVoice failed: %08x\n", hr); + + fmt.wFormatTag = WAVE_FORMAT_IEEE_FLOAT; + fmt.nChannels = 2; + fmt.nSamplesPerSec = 44100; + fmt.wBitsPerSample = 32; + fmt.nBlockAlign = fmt.nChannels * fmt.wBitsPerSample / 8; + fmt.nAvgBytesPerSec = fmt.nSamplesPerSec * fmt.nBlockAlign; + fmt.cbSize = 0; + + XA2CALL(CreateSourceVoice, &src, &fmt, 0, 1.f, NULL, NULL, NULL); + ok(hr == S_OK, "CreateSourceVoice failed: %08x\n", hr); + + memset(&buf, 0, sizeof(buf)); + buf.AudioBytes = 44100 * fmt.nBlockAlign; + buf.pAudioData = HeapAlloc(GetProcessHeap(), 0, buf.AudioBytes); + fill_buf((float*)buf.pAudioData, &fmt, 440, 44100); + + hr = IXAudio2SourceVoice_SubmitSourceBuffer(src, &buf, NULL); + ok(hr == S_OK, "SubmitSourceBuffer failed: %08x\n", hr); + + hr = IXAudio2SourceVoice_Start(src, 0, XAUDIO2_COMMIT_NOW); + ok(hr == S_OK, "Start failed: %08x\n", hr); + + + XA2CALL(CreateSourceVoice, &src2, &fmt, 0, 1.f, NULL, NULL, NULL); + ok(hr == S_OK, "CreateSourceVoice failed: %08x\n", hr); + + memset(&buf2, 0, sizeof(buf2)); + buf2.AudioBytes = 44100 * fmt.nBlockAlign; + buf2.pAudioData = HeapAlloc(GetProcessHeap(), 0, buf2.AudioBytes); + fill_buf((float*)buf2.pAudioData, &fmt, 220, 44100); + + hr = IXAudio2SourceVoice_SubmitSourceBuffer(src2, &buf2, NULL); + ok(hr == S_OK, "SubmitSourceBuffer failed: %08x\n", hr); + + hr = IXAudio2SourceVoice_Start(src2, 0, XAUDIO2_COMMIT_NOW); + ok(hr == S_OK, "Start failed: %08x\n", hr); + + while(1){ + if(xaudio27) + IXAudio27SourceVoice_GetState((IXAudio27SourceVoice*)src, &state); + else + IXAudio2SourceVoice_GetState(src, &state, 0); + if(state.SamplesPlayed >= 44100) + break; + Sleep(100); + } + + ok(state.SamplesPlayed == 44100, "Got wrong samples played\n"); + + HeapFree(GetProcessHeap(), 0, (void*)buf.pAudioData); + HeapFree(GetProcessHeap(), 0, (void*)buf2.pAudioData); + + if(xaudio27){ + IXAudio27SourceVoice_DestroyVoice((IXAudio27SourceVoice*)src); + IXAudio27SourceVoice_DestroyVoice((IXAudio27SourceVoice*)src2); + }else{ + IXAudio2SourceVoice_DestroyVoice(src); + IXAudio2SourceVoice_DestroyVoice(src2); + } + IXAudio2MasteringVoice_DestroyVoice(master); +} + +static UINT32 test_DeviceDetails(IXAudio27 *xa) { HRESULT hr; XAUDIO2_DEVICE_DETAILS dd; @@ -37,7 +131,7 @@ static void test_DeviceDetails(IXAudio27 *xa) ok(hr == S_OK, "GetDeviceCount failed: %08x\n", hr); if(count == 0) - return; + return 0; for(i = 0; i < count; ++i){ hr = IXAudio27_GetDeviceDetails(xa, i, &dd); @@ -48,6 +142,22 @@ static void test_DeviceDetails(IXAudio27 *xa) else ok(dd.Role == NotDefaultDevice, "Got wrong role for index %u: 0x%x\n", i, dd.Role); } + + return count; +} + +static UINT32 check_has_devices(IXAudio2 *xa) +{ + HRESULT hr; + IXAudio2MasteringVoice *master; + + hr = IXAudio2_CreateMasteringVoice(xa, &master, 2, 44100, 0, NULL, NULL, AudioCategory_GameEffects); + if(hr != S_OK) + return 0; + + IXAudio2MasteringVoice_DestroyVoice(master); + + return 1; } START_TEST(xaudio2) @@ -56,6 +166,7 @@ START_TEST(xaudio2) IXAudio27 *xa27 = NULL; IXAudio2 *xa = NULL; HANDLE xa28dll; + UINT32 has_devices; CoInitialize(NULL); @@ -72,7 +183,11 @@ START_TEST(xaudio2) hr = IXAudio27_Initialize(xa27, 0, XAUDIO2_ANY_PROCESSOR); ok(hr == S_OK, "Initialize failed: %08x\n", hr); - test_DeviceDetails(xa27); + has_devices = test_DeviceDetails(xa27); + if(has_devices){ + test_simple_streaming((IXAudio2*)xa27); + }else + skip("No audio devices available\n"); IXAudio27_Release(xa27); }else @@ -85,6 +200,12 @@ START_TEST(xaudio2) hr = pXAudio2Create(&xa, 0, XAUDIO2_DEFAULT_PROCESSOR); ok(hr == S_OK, "XAudio2Create failed: %08x\n", hr); + has_devices = check_has_devices(xa); + if(has_devices){ + test_simple_streaming(xa); + }else + skip("No audio devices available\n"); + IXAudio2_Release(xa); }else win_skip("XAudio 2.8 not available\n");

1 0

Andrew Eikum : xaudio2: Implement IXAudio2SourceVoice::FlushSourceBuffers.
by Alexandre Julliard Aug. 31, 2015

Aug. 31, 2015

Module: wine Branch: master Commit: 66a58ad52a5e0dd9b444dc6b844e939367d2e047 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66a58ad52a5e0dd9b444dc6b8… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Aug 28 08:22:25 2015 -0500 xaudio2: Implement IXAudio2SourceVoice::FlushSourceBuffers. --- dlls/xaudio2_7/xaudio_dll.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index b8fbbc6..48ab3db 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -639,8 +639,45 @@ static HRESULT WINAPI XA2SRC_SubmitSourceBuffer(IXAudio2SourceVoice *iface, static HRESULT WINAPI XA2SRC_FlushSourceBuffers(IXAudio2SourceVoice *iface) { + UINT i, first, last, to_flush; XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + TRACE("%p\n", This); + + EnterCriticalSection(&This->lock); + + if(This->running && This->nbufs > 0){ + /* when running, flush only completely unused buffers; the rest remain + * in queue */ + last = (This->first_buf + This->nbufs) % XAUDIO2_MAX_QUEUED_BUFFERS; + first = (This->cur_buf + 1) % XAUDIO2_MAX_QUEUED_BUFFERS; + if(This->cur_buf == last) + /* nothing to do */ + to_flush = 0; + else if(last >= first) + to_flush = last - first; + else + to_flush = last + XAUDIO2_MAX_QUEUED_BUFFERS - first; + }else{ + /* when stopped, flush all buffers */ + first = This->first_buf; + last = (This->first_buf + This->nbufs) % XAUDIO2_MAX_QUEUED_BUFFERS; + to_flush = This->nbufs; + } + + + for(i = first; + i < (first + to_flush) % XAUDIO2_MAX_QUEUED_BUFFERS; + i = (i + 1) % XAUDIO2_MAX_QUEUED_BUFFERS){ + if(This->cb) + IXAudio2VoiceCallback_OnBufferEnd(This->cb, + This->buffers[i].xa2buffer.pContext); + } + + This->nbufs -= to_flush; + + LeaveCriticalSection(&This->lock); + return S_OK; }

1 0

Andrew Eikum : xaudio2: Implement IXAudio2SourceVoice::SetVolume.
by Alexandre Julliard Aug. 31, 2015

Aug. 31, 2015

Module: wine Branch: master Commit: cb38242821bfb24792b3d15c866a6d3284fea653 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb38242821bfb24792b3d15c8… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Aug 28 08:22:22 2015 -0500 xaudio2: Implement IXAudio2SourceVoice::SetVolume. --- dlls/xaudio2_7/xaudio_dll.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 530318c..b8fbbc6 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -402,7 +402,14 @@ static HRESULT WINAPI XA2SRC_SetVolume(IXAudio2SourceVoice *iface, float Volume, UINT32 OperationSet) { XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + ALfloat al_gain; + TRACE("%p, %f, 0x%x\n", This, Volume, OperationSet); + + al_gain = Volume; + + alSourcef(This->al_src, AL_GAIN, al_gain); + return S_OK; }

1 0

Józef Kucia : d3d11/tests: Port test_create_texture2d () from d3d10core.
by Alexandre Julliard Aug. 31, 2015

Aug. 31, 2015

Module: wine Branch: master Commit: 44d493aac3c9613ebcc852297bd13e1c391e6c17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44d493aac3c9613ebcc852297… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Aug 30 22:44:43 2015 +0200 d3d11/tests: Port test_create_texture2d() from d3d10core. --- dlls/d3d11/tests/d3d11.c | 112 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 104 insertions(+), 8 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index f313806..5bec3d6 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1,4 +1,5 @@ /* + * Copyright 2008 Henri Verbeet for CodeWeavers * Copyright 2015 Józef Kucia for CodeWeavers * * This library is free software; you can redistribute it and/or @@ -27,18 +28,19 @@ static ULONG get_refcount(IUnknown *iface) return IUnknown_Release(iface); } -static ID3D11Device *create_device(D3D_FEATURE_LEVEL feature_level) +static ID3D11Device *create_device(const D3D_FEATURE_LEVEL *feature_level) { ID3D11Device *device; + UINT feature_level_count = feature_level ? 1 : 0; - if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, &feature_level, 1, D3D11_SDK_VERSION, - &device, NULL, NULL))) + if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, feature_level, feature_level_count, + D3D11_SDK_VERSION, &device, NULL, NULL))) return device; - if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_WARP, NULL, 0, &feature_level, 1, D3D11_SDK_VERSION, - &device, NULL, NULL))) + if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_WARP, NULL, 0, feature_level, feature_level_count, + D3D11_SDK_VERSION, &device, NULL, NULL))) return device; - if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_REFERENCE, NULL, 0, &feature_level, 1, D3D11_SDK_VERSION, - &device, NULL, NULL))) + if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_REFERENCE, NULL, 0, feature_level, feature_level_count, + D3D11_SDK_VERSION, &device, NULL, NULL))) return device; return NULL; @@ -110,7 +112,7 @@ static void test_device_interfaces(void) for (i = 0; i < sizeof(feature_levels) / sizeof(*feature_levels); i++) { - if (!(device = create_device(feature_levels[i]))) + if (!(device = create_device(&feature_levels[i]))) { skip("Failed to create device for feature level %#x, skipping tests.\n", feature_levels[i]); continue; @@ -146,8 +148,102 @@ static void test_device_interfaces(void) } } +static void test_create_texture2d(void) +{ + ULONG refcount, expected_refcount; + D3D11_SUBRESOURCE_DATA data = {0}; + ID3D11Device *device, *tmp; + D3D11_TEXTURE2D_DESC desc; + ID3D11Texture2D *texture; + IDXGISurface *surface; + HRESULT hr; + + if (!(device = create_device(NULL))) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + desc.Width = 512; + desc.Height = 512; + desc.MipLevels = 1; + desc.ArraySize = 1; + desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + desc.SampleDesc.Count = 1; + desc.SampleDesc.Quality = 0; + desc.Usage = D3D11_USAGE_DEFAULT; + desc.BindFlags = D3D11_BIND_RENDER_TARGET; + desc.CPUAccessFlags = 0; + desc.MiscFlags = 0; + + hr = ID3D11Device_CreateTexture2D(device, &desc, &data, &texture); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + expected_refcount = get_refcount((IUnknown *)device) + 1; + hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x.\n", hr); + refcount = get_refcount((IUnknown *)device); + ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount); + tmp = NULL; + expected_refcount = refcount + 1; + ID3D11Texture2D_GetDevice(texture, &tmp); + ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); + refcount = get_refcount((IUnknown *)device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ID3D11Device_Release(tmp); + + hr = ID3D11Texture2D_QueryInterface(texture, &IID_IDXGISurface, (void **)&surface); + ok(SUCCEEDED(hr), "Texture should implement IDXGISurface.\n"); + IDXGISurface_Release(surface); + ID3D11Texture2D_Release(texture); + + desc.MipLevels = 0; + expected_refcount = get_refcount((IUnknown *)device) + 1; + hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x.\n", hr); + refcount = get_refcount((IUnknown *)device); + ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount); + tmp = NULL; + expected_refcount = refcount + 1; + ID3D11Texture2D_GetDevice(texture, &tmp); + ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); + refcount = get_refcount((IUnknown *)device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ID3D11Device_Release(tmp); + + ID3D11Texture2D_GetDesc(texture, &desc); + ok(desc.Width == 512, "Got unexpected Width %u.\n", desc.Width); + ok(desc.Height == 512, "Got unexpected Height %u.\n", desc.Height); + ok(desc.MipLevels == 10, "Got unexpected MipLevels %u.\n", desc.MipLevels); + ok(desc.ArraySize == 1, "Got unexpected ArraySize %u.\n", desc.ArraySize); + ok(desc.Format == DXGI_FORMAT_R8G8B8A8_UNORM, "Got unexpected Format %#x.\n", desc.Format); + ok(desc.SampleDesc.Count == 1, "Got unexpected SampleDesc.Count %u.\n", desc.SampleDesc.Count); + ok(desc.SampleDesc.Quality == 0, "Got unexpected SampleDesc.Quality %u.\n", desc.SampleDesc.Quality); + ok(desc.Usage == D3D11_USAGE_DEFAULT, "Got unexpected Usage %u.\n", desc.Usage); + ok(desc.BindFlags == D3D11_BIND_RENDER_TARGET, "Got unexpected BindFlags %#x.\n", desc.BindFlags); + ok(desc.CPUAccessFlags == 0, "Got unexpected CPUAccessFlags %#x.\n", desc.CPUAccessFlags); + ok(desc.MiscFlags == 0, "Got unexpected MiscFlags %#x.\n", desc.MiscFlags); + + hr = ID3D11Texture2D_QueryInterface(texture, &IID_IDXGISurface, (void **)&surface); + ok(FAILED(hr), "Texture should not implement IDXGISurface.\n"); + ID3D11Texture2D_Release(texture); + + desc.MipLevels = 1; + desc.ArraySize = 2; + hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x.\n", hr); + + hr = ID3D11Texture2D_QueryInterface(texture, &IID_IDXGISurface, (void **)&surface); + ok(FAILED(hr), "Texture should not implement IDXGISurface.\n"); + ID3D11Texture2D_Release(texture); + + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(d3d11) { test_create_device(); test_device_interfaces(); + test_create_texture2d(); }

1 0

Józef Kucia : d3d11: Implement d3d11_device_CreateTexture2D().
by Alexandre Julliard Aug. 31, 2015

Aug. 31, 2015

Module: wine Branch: master Commit: e0e72d284a374e78c5d80436f8e72fcac46d4e44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0e72d284a374e78c5d80436f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Aug 30 22:44:42 2015 +0200 d3d11: Implement d3d11_device_CreateTexture2D(). --- dlls/d3d11/d3d11_private.h | 4 ++-- dlls/d3d11/device.c | 25 ++++++++++++------------- dlls/d3d11/texture.c | 26 ++++++++++++++++++++++++-- 3 files changed, 38 insertions(+), 17 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index baff284..9eb145c 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -112,8 +112,8 @@ static inline struct d3d10_texture2d *impl_from_ID3D10Texture2D(ID3D10Texture2D return CONTAINING_RECORD(iface, struct d3d10_texture2d, ID3D10Texture2D_iface); } -HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d_device *device, - const D3D11_TEXTURE2D_DESC *desc, const D3D10_SUBRESOURCE_DATA *initial_data) DECLSPEC_HIDDEN; +HRESULT d3d_texture2d_create(struct d3d_device *device, const D3D11_TEXTURE2D_DESC *desc, + const D3D11_SUBRESOURCE_DATA *data, struct d3d10_texture2d **texture) DECLSPEC_HIDDEN; struct d3d10_texture2d *unsafe_impl_from_ID3D10Texture2D(ID3D10Texture2D *iface) DECLSPEC_HIDDEN; /* ID3D10Texture3D */ diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 9067de9..3fe8dac 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -75,9 +75,18 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateTexture1D(ID3D11Device *ifac static HRESULT STDMETHODCALLTYPE d3d11_device_CreateTexture2D(ID3D11Device *iface, const D3D11_TEXTURE2D_DESC *desc, const D3D11_SUBRESOURCE_DATA *data, ID3D11Texture2D **texture) { - FIXME("iface %p, desc %p, data %p, texture %p stub!\n", iface, desc, data, texture); + struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d10_texture2d *object; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, desc %p, data %p, texture %p.\n", iface, desc, data, texture); + + if (FAILED(hr = d3d_texture2d_create(device, desc, data, &object))) + return hr; + + *texture = &object->ID3D11Texture2D_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d11_device_CreateTexture3D(ID3D11Device *iface, @@ -2011,10 +2020,6 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture2D(ID3D10Device1 *ifa TRACE("iface %p, desc %p, data %p, texture %p.\n", iface, desc, data, texture); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) - return E_OUTOFMEMORY; - d3d11_desc.Width = desc->Width; d3d11_desc.Height = desc->Height; d3d11_desc.MipLevels = desc->MipLevels; @@ -2026,17 +2031,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture2D(ID3D10Device1 *ifa d3d11_desc.CPUAccessFlags = d3d11_cpu_access_flags_from_d3d10_cpu_access_flags(desc->CPUAccessFlags); d3d11_desc.MiscFlags = d3d11_resource_misc_flags_from_d3d10_resource_misc_flags(desc->MiscFlags); - if (FAILED(hr = d3d10_texture2d_init(object, device, &d3d11_desc, data))) - { - WARN("Failed to initialize texture, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + if (FAILED(hr = d3d_texture2d_create(device, &d3d11_desc, (const D3D11_SUBRESOURCE_DATA *)data, &object))) return hr; - } *texture = &object->ID3D10Texture2D_iface; - TRACE("Created ID3D10Texture2D %p\n", object); - return S_OK; } diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index eac1569..d3e14f8 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -444,8 +444,8 @@ static const struct wined3d_parent_ops d3d10_texture2d_wined3d_parent_ops = d3d10_texture2d_wined3d_object_released, }; -HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d_device *device, - const D3D11_TEXTURE2D_DESC *desc, const D3D10_SUBRESOURCE_DATA *data) +static HRESULT d3d_texture2d_init(struct d3d10_texture2d *texture, struct d3d_device *device, + const D3D11_TEXTURE2D_DESC *desc, const D3D11_SUBRESOURCE_DATA *data) { struct wined3d_resource_desc wined3d_desc; unsigned int levels; @@ -520,6 +520,28 @@ HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d_device return S_OK; } +HRESULT d3d_texture2d_create(struct d3d_device *device, const D3D11_TEXTURE2D_DESC *desc, + const D3D11_SUBRESOURCE_DATA *data, struct d3d10_texture2d **texture) +{ + struct d3d10_texture2d *object; + HRESULT hr; + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = d3d_texture2d_init(object, device, desc, data))) + { + WARN("Failed to initialize texture, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created texture %p.\n", object); + *texture = object; + + return S_OK; +} + static inline struct d3d10_texture3d *impl_from_ID3D10Texture3D(ID3D10Texture3D *iface) { return CONTAINING_RECORD(iface, struct d3d10_texture3d, ID3D10Texture3D_iface);

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard Aug. 31, 2015

Aug. 31, 2015

Module: wine Branch: master Commit: 2d2e9e5528dbed0ed4d87ddf3832f39ffe076b74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d2e9e5528dbed0ed4d87ddf3… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Aug 28 14:35:10 2015 +0200 po: Update German translation. --- po/de.po | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/po/de.po b/po/de.po index fe8b42e..806eff2 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-07-19 02:02+0200\n" +"PO-Revision-Date: 2015-08-28 14:35+0200\n" "Last-Translator: Julian Rüger\n" "Language-Team: German\n" "Language: de\n" @@ -12938,18 +12938,17 @@ msgstr "" #: uninstaller.rc:31 msgid "uninstaller: The application with GUID '%1' was not found\n" -msgstr "" +msgstr "Uninstaller: Die Anwendung mit der GUID '%1' wurde nicht gefunden\n" #: uninstaller.rc:32 msgid "" "uninstaller: The option '--remove' must be followed by an application GUID\n" msgstr "" +"Uninstaller: Auf die Option '--remove' muss eine Anwendungs-GUID folgen\n" #: uninstaller.rc:33 -#, fuzzy -#| msgid "Error: Invalid option '%c'.\n" msgid "uninstaller: Invalid option [%1]\n" -msgstr "Fehler: Ungültige Option '%c'.\n" +msgstr "Uninstaller: Ungültige Option [%1]\n" #: uninstaller.rc:35 msgid "" @@ -12958,6 +12957,10 @@ msgid "" "Uninstall applications from the current Wine prefix.\n" "\n" msgstr "" +"Wine Anwendungsentferner\n" +"\n" +"Deinstalliert Anwendungen aus dem aktuellen Wineprefix.\n" +"\n" #: uninstaller.rc:43 msgid "" @@ -12972,6 +12975,17 @@ msgid "" " [no option] Launch the graphical version of this program.\n" "\n" msgstr "" +"Aufruf:\n" +" uninstaller [Optionen]\n" +"\n" +"Optionen:\n" +" --help\t Zeigt diese Hilfe an.\n" +" --list\t Zeigt alle im aktuellen Wineprefix installierten Anwendungen " +"an.\n" +" --remove {GUID} Deinstalliert die angegebene Anwendung.\n" +"\t\t Benutzen Sie '--list', um die Anwendungs-GUID zu bestimmen.\n" +" [keine Option] Startet die grafische Version dieses Programms.\n" +"\n" #: view.rc:36 msgid "&Pan"

1 0

Francois Gouget : xaudio2_7: Remove an unused NONAMELESSSTRUCT directive.
by Alexandre Julliard Aug. 31, 2015

Aug. 31, 2015

Module: wine Branch: master Commit: 257795a757121ef2f9c152fa9a08a55664d3b468 URL: http://source.winehq.org/git/wine.git/?a=commit;h=257795a757121ef2f9c152fa9… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 28 14:34:01 2015 +0200 xaudio2_7: Remove an unused NONAMELESSSTRUCT directive. --- dlls/xaudio2_7/xaudio_dll.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 1e8dc19..453645b 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -20,7 +20,6 @@ #include <stdarg.h> #define NONAMELESSUNION -#define NONAMELESSSTRUCT #define COBJMACROS #include "windef.h"

1 0

Francois Gouget : xaudio2_7: Make some functions static.
by Alexandre Julliard Aug. 31, 2015

Aug. 31, 2015

Module: wine Branch: master Commit: aa6e0ebde535c3a18fd1f7303e56f1c66116d2da URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa6e0ebde535c3a18fd1f7303… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 28 14:33:57 2015 +0200 xaudio2_7: Make some functions static. --- dlls/xaudio2_7/xaudio_dll.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 48ab3db..1e8dc19 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -166,12 +166,12 @@ typedef struct _XA2SourceImpl { struct list entry; } XA2SourceImpl; -XA2SourceImpl *impl_from_IXAudio2SourceVoice(IXAudio2SourceVoice *iface) +static XA2SourceImpl *impl_from_IXAudio2SourceVoice(IXAudio2SourceVoice *iface) { return CONTAINING_RECORD(iface, XA2SourceImpl, IXAudio2SourceVoice_iface); } -XA2SourceImpl *impl_from_IXAudio27SourceVoice(IXAudio27SourceVoice *iface) +static XA2SourceImpl *impl_from_IXAudio27SourceVoice(IXAudio27SourceVoice *iface) { return CONTAINING_RECORD(iface, XA2SourceImpl, IXAudio27SourceVoice_iface); } @@ -186,7 +186,7 @@ typedef struct _XA2SubmixImpl { struct list entry; } XA2SubmixImpl; -XA2SubmixImpl *impl_from_IXAudio2SubmixVoice(IXAudio2SubmixVoice *iface) +static XA2SubmixImpl *impl_from_IXAudio2SubmixVoice(IXAudio2SubmixVoice *iface) { return CONTAINING_RECORD(iface, XA2SubmixImpl, IXAudio2SubmixVoice_iface); } @@ -239,7 +239,7 @@ static inline IXAudio2Impl *impl_from_IXAudio27(IXAudio27 *iface) return CONTAINING_RECORD(iface, IXAudio2Impl, IXAudio27_iface); } -IXAudio2Impl *impl_from_IXAudio2MasteringVoice(IXAudio2MasteringVoice *iface) +static IXAudio2Impl *impl_from_IXAudio2MasteringVoice(IXAudio2MasteringVoice *iface) { return CONTAINING_RECORD(iface, IXAudio2Impl, IXAudio2MasteringVoice_iface); }

1 0

Martin Storsjo : msvcrt: Test that the normal strtod doesn't handle the " NAN" string.
by Alexandre Julliard Aug. 31, 2015

Aug. 31, 2015

Module: wine Branch: master Commit: 8edbd9b381a921df7d8d681cd4579a1c8de5fb13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8edbd9b381a921df7d8d681cd… Author: Martin Storsjo <martin(a)martin.st> Date: Sun Aug 30 23:47:15 2015 +0300 msvcrt: Test that the normal strtod doesn't handle the "NAN" string. --- dlls/msvcrt/tests/string.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 476f762..d247ba6 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1728,6 +1728,7 @@ static void test__strtod(void) const char double3[] = "INF"; const char double4[] = ".21e12"; const char double5[] = "214353e-3"; + const char double6[] = "NAN"; const char overflow[] = "1d9999999999999999999"; const char white_chars[] = " d10"; @@ -1754,6 +1755,10 @@ static void test__strtod(void) ok(almost_equal(d, 214.353), "d = %lf\n", d); ok(end == double5+9, "incorrect end (%d)\n", (int)(end-double5)); + d = strtod(double6, &end); + ok(almost_equal(d, 0), "d = %lf\n", d); + ok(end == double6, "incorrect end (%d)\n", (int)(end-double6)); + d = strtod("12.1d2", NULL); ok(almost_equal(d, 12.1e2), "d = %lf\n", d);

1 0