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

Henri Verbeet : wined3d: Use wined3d_texture_load_location() in surface_load_drawable().
by Alexandre Julliard 03 Aug '16

03 Aug '16

Module: wine Branch: master Commit: 1091de5c6162f9b5129a3613059d497cdc6552e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1091de5c6162f9b5129a36130… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 3 15:25:30 2016 +0200 wined3d: Use wined3d_texture_load_location() in surface_load_drawable(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index fdc7a51..c3a491f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2819,6 +2819,7 @@ static void surface_load_sysmem(struct wined3d_surface *surface, static HRESULT surface_load_drawable(struct wined3d_surface *surface, struct wined3d_context *context) { + unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface); struct wined3d_texture *texture = surface->container; RECT r; @@ -2830,7 +2831,7 @@ static HRESULT surface_load_drawable(struct wined3d_surface *surface, } surface_get_rect(surface, NULL, &r); - surface_load_location(surface, context, WINED3D_LOCATION_TEXTURE_RGB); + wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); surface_blt_to_drawable(texture->resource.device, context, WINED3D_TEXF_POINT, FALSE, surface, &r, surface, &r);

1 0

Henri Verbeet : wined3d: Use wined3d_texture_load_location() in surface_load_texture().
by Alexandre Julliard 03 Aug '16

03 Aug '16

Module: wine Branch: master Commit: bdfee1574e1d6134ef5a2ba40345d482ae7329d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdfee1574e1d6134ef5a2ba40… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 3 15:25:31 2016 +0200 wined3d: Use wined3d_texture_load_location() in surface_load_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c3a491f..8ba63fd 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2908,7 +2908,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, == WINED3D_LOCATION_TEXTURE_RGB) { FIXME_(d3d_perf)("Downloading RGB surface %p to reload it as sRGB.\n", surface); - surface_load_location(surface, context, texture->resource.map_binding); + wined3d_texture_load_location(texture, sub_resource_idx, context, texture->resource.map_binding); } } else @@ -2917,7 +2917,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, == WINED3D_LOCATION_TEXTURE_SRGB) { FIXME_(d3d_perf)("Downloading sRGB surface %p to reload it as RGB.\n", surface); - surface_load_location(surface, context, texture->resource.map_binding); + wined3d_texture_load_location(texture, sub_resource_idx, context, texture->resource.map_binding); } } @@ -2925,7 +2925,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, { WARN("Trying to load a texture from sysmem, but no simple location is valid.\n"); /* Lets hope we get it from somewhere... */ - surface_load_location(surface, context, WINED3D_LOCATION_SYSMEM); + wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_SYSMEM); } wined3d_texture_prepare_texture(texture, context, srgb); @@ -2943,7 +2943,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, { TRACE("Removing the pbo attached to surface %p.\n", surface); - surface_load_location(surface, context, WINED3D_LOCATION_SYSMEM); + wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_SYSMEM); wined3d_texture_set_map_binding(texture, WINED3D_LOCATION_SYSMEM); }

1 0

Anton Baskanov : amstream: Implement AMAudioData::SetBuffer.
by Alexandre Julliard 02 Aug '16

02 Aug '16

Module: wine Branch: master Commit: d4db4bfd7262871f94b512706aa88ddcb5315587 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4db4bfd7262871f94b512706… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Jul 28 21:59:53 2016 +0600 amstream: Implement AMAudioData::SetBuffer. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiodata.c | 38 +++++++++++++++++++++++++++++++-- dlls/amstream/tests/amstream.c | 48 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/audiodata.c b/dlls/amstream/audiodata.c index 842fc95..6ffd1df 100644 --- a/dlls/amstream/audiodata.c +++ b/dlls/amstream/audiodata.c @@ -32,6 +32,7 @@ typedef struct { LONG ref; DWORD size; BYTE *data; + BOOL data_owned; DWORD actual_data; } AMAudioDataImpl; @@ -75,7 +76,14 @@ static ULONG WINAPI IAudioDataImpl_Release(IAudioData* iface) TRACE("(%p)->(): new ref = %u\n", iface, This->ref); if (!ref) + { + if (This->data_owned) + { + CoTaskMemFree(This->data); + } + HeapFree(GetProcessHeap(), 0, This); + } return ref; } @@ -83,9 +91,35 @@ static ULONG WINAPI IAudioDataImpl_Release(IAudioData* iface) /*** IMemoryData methods ***/ static HRESULT WINAPI IAudioDataImpl_SetBuffer(IAudioData* iface, DWORD size, BYTE *data, DWORD flags) { - FIXME("(%p)->(%u,%p,%x): stub\n", iface, size, data, flags); + AMAudioDataImpl *This = impl_from_IAudioData(iface); - return E_NOTIMPL; + TRACE("(%p)->(%u,%p,%x)\n", iface, size, data, flags); + + if (!size) + { + return E_INVALIDARG; + } + + if (This->data_owned) + { + CoTaskMemFree(This->data); + This->data_owned = FALSE; + } + + This->size = size; + This->data = data; + + if (!This->data) + { + This->data = CoTaskMemAlloc(This->size); + This->data_owned = TRUE; + if (!This->data) + { + return E_OUTOFMEMORY; + } + } + + return S_OK; } static HRESULT WINAPI IAudioDataImpl_GetInfo(IAudioData* iface, DWORD *length, BYTE **data, DWORD *actual_data) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 307868d..a38ae64 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -650,6 +650,53 @@ out_unknown: IUnknown_Release(unknown); } +static void test_audiodata_set_buffer(void) +{ + IUnknown *unknown = create_audio_data(); + IAudioData *audio_data = NULL; + BYTE buffer[100] = {0}; + DWORD length = 0; + BYTE *data = NULL; + + HRESULT result; + + result = IUnknown_QueryInterface(unknown, &IID_IAudioData, (void **)&audio_data); + if (FAILED(result)) + { + /* test_audiodata_query_interface handles this case */ + skip("No IAudioData\n"); + goto out_unknown; + } + + result = IAudioData_SetBuffer(audio_data, 100, NULL, 0); + ok(S_OK == result, "got 0x%08x\n", result); + + data = (BYTE *)0xdeadbeef; + length = 0xdeadbeef; + result = IAudioData_GetInfo(audio_data, &length, &data, NULL); + ok(S_OK == result, "got 0x%08x\n", result); + ok(100 == length, "got %u\n", length); + ok(NULL != data, "got %p\n", data); + + result = IAudioData_SetBuffer(audio_data, 0, buffer, 0); + ok(E_INVALIDARG == result, "got 0x%08x\n", result); + + result = IAudioData_SetBuffer(audio_data, sizeof(buffer), buffer, 0); + ok(S_OK == result, "got 0x%08x\n", result); + + data = (BYTE *)0xdeadbeef; + length = 0xdeadbeef; + result = IAudioData_GetInfo(audio_data, &length, &data, NULL); + ok(S_OK == result, "got 0x%08x\n", result); + ok(sizeof(buffer) == length, "got %u\n", length); + ok(buffer == data, "got %p\n", data); + + IAudioData_Release(audio_data); + +out_unknown: + IUnknown_Release(unknown); +} + START_TEST(amstream) { HANDLE file; @@ -670,6 +717,7 @@ START_TEST(amstream) test_audiodata_query_interface(); test_audiodata_get_info(); + test_audiodata_set_buffer(); CoUninitialize(); }

1 0

Anton Baskanov : amstream: Implement AMAudioData::SetActual.
by Alexandre Julliard 02 Aug '16

02 Aug '16

Module: wine Branch: master Commit: 634deaf874ca2b7b279f748cc1677f6bfbb11e4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=634deaf874ca2b7b279f748cc… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Jul 28 21:59:54 2016 +0600 amstream: Implement AMAudioData::SetActual. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiodata.c | 13 +++++++++-- dlls/amstream/tests/amstream.c | 49 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/audiodata.c b/dlls/amstream/audiodata.c index 6ffd1df..78a4fc7 100644 --- a/dlls/amstream/audiodata.c +++ b/dlls/amstream/audiodata.c @@ -151,9 +151,18 @@ static HRESULT WINAPI IAudioDataImpl_GetInfo(IAudioData* iface, DWORD *length, B static HRESULT WINAPI IAudioDataImpl_SetActual(IAudioData* iface, DWORD data_valid) { - FIXME("(%p)->(%u): stub\n", iface, data_valid); + AMAudioDataImpl *This = impl_from_IAudioData(iface); - return E_NOTIMPL; + TRACE("(%p)->(%u)\n", iface, data_valid); + + if (data_valid > This->size) + { + return E_INVALIDARG; + } + + This->actual_data = data_valid; + + return S_OK; } /*** IAudioData methods ***/ diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index a38ae64..893894c 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -697,6 +697,54 @@ out_unknown: IUnknown_Release(unknown); } +static void test_audiodata_set_actual(void) +{ + IUnknown *unknown = create_audio_data(); + IAudioData *audio_data = NULL; + BYTE buffer[100] = {0}; + DWORD actual_data = 0; + + HRESULT result; + + result = IUnknown_QueryInterface(unknown, &IID_IAudioData, (void **)&audio_data); + if (FAILED(result)) + { + /* test_audiodata_query_interface handles this case */ + skip("No IAudioData\n"); + goto out_unknown; + } + + result = IAudioData_SetActual(audio_data, 0); + ok(S_OK == result, "got 0x%08x\n", result); + + result = IAudioData_SetBuffer(audio_data, sizeof(buffer), buffer, 0); + ok(S_OK == result, "got 0x%08x\n", result); + + result = IAudioData_SetActual(audio_data, sizeof(buffer) + 1); + ok(E_INVALIDARG == result, "got 0x%08x\n", result); + + result = IAudioData_SetActual(audio_data, sizeof(buffer)); + ok(S_OK == result, "got 0x%08x\n", result); + + actual_data = 0xdeadbeef; + result = IAudioData_GetInfo(audio_data, NULL, NULL, &actual_data); + ok(S_OK == result, "got 0x%08x\n", result); + ok(sizeof(buffer) == actual_data, "got %u\n", actual_data); + + result = IAudioData_SetActual(audio_data, 0); + ok(S_OK == result, "got 0x%08x\n", result); + + actual_data = 0xdeadbeef; + result = IAudioData_GetInfo(audio_data, NULL, NULL, &actual_data); + ok(S_OK == result, "got 0x%08x\n", result); + ok(0 == actual_data, "got %u\n", actual_data); + + IAudioData_Release(audio_data); + +out_unknown: + IUnknown_Release(unknown); +} + START_TEST(amstream) { HANDLE file; @@ -718,6 +766,7 @@ START_TEST(amstream) test_audiodata_query_interface(); test_audiodata_get_info(); test_audiodata_set_buffer(); + test_audiodata_set_actual(); CoUninitialize(); }

1 0

Anton Baskanov : amstream: Implement AMAudioData::GetFormat.
by Alexandre Julliard 02 Aug '16

02 Aug '16

Module: wine Branch: master Commit: fa542355e97b943f6d58faf68e78c9b1c46df3aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa542355e97b943f6d58faf68… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Jul 28 21:59:55 2016 +0600 amstream: Implement AMAudioData::GetFormat. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiodata.c | 21 +++++++++++++++++++-- dlls/amstream/tests/amstream.c | 43 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/audiodata.c b/dlls/amstream/audiodata.c index 78a4fc7..1c729fc 100644 --- a/dlls/amstream/audiodata.c +++ b/dlls/amstream/audiodata.c @@ -34,6 +34,7 @@ typedef struct { BYTE *data; BOOL data_owned; DWORD actual_data; + WAVEFORMATEX wave_format; } AMAudioDataImpl; static inline AMAudioDataImpl *impl_from_IAudioData(IAudioData *iface) @@ -168,9 +169,18 @@ static HRESULT WINAPI IAudioDataImpl_SetActual(IAudioData* iface, DWORD data_val /*** IAudioData methods ***/ static HRESULT WINAPI IAudioDataImpl_GetFormat(IAudioData* iface, WAVEFORMATEX *wave_format_current) { - FIXME("(%p)->(%p): stub\n", iface, wave_format_current); + AMAudioDataImpl *This = impl_from_IAudioData(iface); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", iface, wave_format_current); + + if (!wave_format_current) + { + return E_POINTER; + } + + *wave_format_current = This->wave_format; + + return S_OK; } static HRESULT WINAPI IAudioDataImpl_SetFormat(IAudioData* iface, const WAVEFORMATEX *wave_format) @@ -211,6 +221,13 @@ HRESULT AMAudioData_create(IUnknown *pUnkOuter, LPVOID *ppObj) object->IAudioData_iface.lpVtbl = &AudioData_Vtbl; object->ref = 1; + object->wave_format.wFormatTag = WAVE_FORMAT_PCM; + object->wave_format.nChannels = 1; + object->wave_format.nSamplesPerSec = 11025; + object->wave_format.wBitsPerSample = 16; + object->wave_format.nBlockAlign = object->wave_format.wBitsPerSample * object->wave_format.nChannels / 8; + object->wave_format.nAvgBytesPerSec = object->wave_format.nBlockAlign * object->wave_format.nSamplesPerSec; + *ppObj = &object->IAudioData_iface; return S_OK; diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 893894c..513d98a 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -745,6 +745,48 @@ out_unknown: IUnknown_Release(unknown); } +static void test_audiodata_get_format(void) +{ + IUnknown *unknown = create_audio_data(); + IAudioData *audio_data = NULL; + WAVEFORMATEX wave_format = {0}; + + HRESULT result; + + result = IUnknown_QueryInterface(unknown, &IID_IAudioData, (void **)&audio_data); + if (FAILED(result)) + { + /* test_audiodata_query_interface handles this case */ + skip("No IAudioData\n"); + goto out_unknown; + } + + result = IAudioData_GetFormat(audio_data, NULL); + ok(E_POINTER == result, "got 0x%08x\n", result); + + wave_format.wFormatTag = 0xdead; + wave_format.nChannels = 0xdead; + wave_format.nSamplesPerSec = 0xdeadbeef; + wave_format.nAvgBytesPerSec = 0xdeadbeef; + wave_format.nBlockAlign = 0xdead; + wave_format.wBitsPerSample = 0xdead; + wave_format.cbSize = 0xdead; + result = IAudioData_GetFormat(audio_data, &wave_format); + ok(S_OK == result, "got 0x%08x\n", result); + ok(WAVE_FORMAT_PCM == wave_format.wFormatTag, "got %u\n", wave_format.wFormatTag); + ok(1 == wave_format.nChannels, "got %u\n", wave_format.nChannels); + ok(11025 == wave_format.nSamplesPerSec, "got %u\n", wave_format.nSamplesPerSec); + ok(22050 == wave_format.nAvgBytesPerSec, "got %u\n", wave_format.nAvgBytesPerSec); + ok(2 == wave_format.nBlockAlign, "got %u\n", wave_format.nBlockAlign); + ok(16 == wave_format.wBitsPerSample, "got %u\n", wave_format.wBitsPerSample); + ok(0 == wave_format.cbSize, "got %u\n", wave_format.cbSize); + + IAudioData_Release(audio_data); + +out_unknown: + IUnknown_Release(unknown); +} + START_TEST(amstream) { HANDLE file; @@ -767,6 +809,7 @@ START_TEST(amstream) test_audiodata_get_info(); test_audiodata_set_buffer(); test_audiodata_set_actual(); + test_audiodata_get_format(); CoUninitialize(); }

1 0

Anton Baskanov : amstream: Implement AMAudioData::SetFormat.
by Alexandre Julliard 02 Aug '16

02 Aug '16

Module: wine Branch: master Commit: d283051b6b9a30cee7f726780faa1b2cd8fec83a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d283051b6b9a30cee7f726780… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Jul 28 21:59:56 2016 +0600 amstream: Implement AMAudioData::SetFormat. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiodata.c | 18 +++++++++-- dlls/amstream/tests/amstream.c | 69 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/audiodata.c b/dlls/amstream/audiodata.c index 1c729fc..06ed932 100644 --- a/dlls/amstream/audiodata.c +++ b/dlls/amstream/audiodata.c @@ -185,9 +185,23 @@ static HRESULT WINAPI IAudioDataImpl_GetFormat(IAudioData* iface, WAVEFORMATEX * static HRESULT WINAPI IAudioDataImpl_SetFormat(IAudioData* iface, const WAVEFORMATEX *wave_format) { - FIXME("(%p)->(%p): stub\n", iface, wave_format); + AMAudioDataImpl *This = impl_from_IAudioData(iface); + + TRACE("(%p)->(%p)\n", iface, wave_format); + + if (!wave_format) + { + return E_POINTER; + } - return E_NOTIMPL; + if (WAVE_FORMAT_PCM != wave_format->wFormatTag) + { + return E_INVALIDARG; + } + + This->wave_format = *wave_format; + + return S_OK; } static const struct IAudioDataVtbl AudioData_Vtbl = diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 513d98a..a7999be 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -25,6 +25,9 @@ #include "uuids.h" #include "amstream.h" #include "vfwmsgs.h" +#include "mmreg.h" +#include "ks.h" +#include "ksmedia.h" #define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) static void _expect_ref(IUnknown* obj, ULONG ref, int line) @@ -787,6 +790,71 @@ out_unknown: IUnknown_Release(unknown); } +static void test_audiodata_set_format(void) +{ + IUnknown *unknown = create_audio_data(); + IAudioData *audio_data = NULL; + WAVEFORMATPCMEX wave_format = {{0}}; + + HRESULT result; + + result = IUnknown_QueryInterface(unknown, &IID_IAudioData, (void **)&audio_data); + if (FAILED(result)) + { + /* test_audiodata_query_interface handles this case */ + skip("No IAudioData\n"); + goto out_unknown; + } + + result = IAudioData_SetFormat(audio_data, NULL); + ok(E_POINTER == result, "got 0x%08x\n", result); + + wave_format.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; + wave_format.Format.nChannels = 2; + wave_format.Format.nSamplesPerSec = 44100; + wave_format.Format.nAvgBytesPerSec = 176400; + wave_format.Format.nBlockAlign = 4; + wave_format.Format.wBitsPerSample = 16; + wave_format.Format.cbSize = 22; + wave_format.Samples.wValidBitsPerSample = 16; + wave_format.dwChannelMask = KSAUDIO_SPEAKER_STEREO; + wave_format.SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + result = IAudioData_SetFormat(audio_data, &wave_format.Format); + ok(E_INVALIDARG == result, "got 0x%08x\n", result); + + wave_format.Format.wFormatTag = WAVE_FORMAT_PCM; + wave_format.Format.nChannels = 2; + wave_format.Format.nSamplesPerSec = 44100; + wave_format.Format.nAvgBytesPerSec = 176400; + wave_format.Format.nBlockAlign = 4; + wave_format.Format.wBitsPerSample = 16; + wave_format.Format.cbSize = 0; + result = IAudioData_SetFormat(audio_data, &wave_format.Format); + ok(S_OK == result, "got 0x%08x\n", result); + + wave_format.Format.wFormatTag = 0xdead; + wave_format.Format.nChannels = 0xdead; + wave_format.Format.nSamplesPerSec = 0xdeadbeef; + wave_format.Format.nAvgBytesPerSec = 0xdeadbeef; + wave_format.Format.nBlockAlign = 0xdead; + wave_format.Format.wBitsPerSample = 0xdead; + wave_format.Format.cbSize = 0xdead; + result = IAudioData_GetFormat(audio_data, &wave_format.Format); + ok(S_OK == result, "got 0x%08x\n", result); + ok(WAVE_FORMAT_PCM == wave_format.Format.wFormatTag, "got %u\n", wave_format.Format.wFormatTag); + ok(2 == wave_format.Format.nChannels, "got %u\n", wave_format.Format.nChannels); + ok(44100 == wave_format.Format.nSamplesPerSec, "got %u\n", wave_format.Format.nSamplesPerSec); + ok(176400 == wave_format.Format.nAvgBytesPerSec, "got %u\n", wave_format.Format.nAvgBytesPerSec); + ok(4 == wave_format.Format.nBlockAlign, "got %u\n", wave_format.Format.nBlockAlign); + ok(16 == wave_format.Format.wBitsPerSample, "got %u\n", wave_format.Format.wBitsPerSample); + ok(0 == wave_format.Format.cbSize, "got %u\n", wave_format.Format.cbSize); + + IAudioData_Release(audio_data); + +out_unknown: + IUnknown_Release(unknown); +} + START_TEST(amstream) { HANDLE file; @@ -810,6 +878,7 @@ START_TEST(amstream) test_audiodata_set_buffer(); test_audiodata_set_actual(); test_audiodata_get_format(); + test_audiodata_set_format(); CoUninitialize(); }

1 0

Nikolay Sivov : oleaut32: Fix return value when converting from NULL interface pointers.
by Alexandre Julliard 02 Aug '16

02 Aug '16

Module: wine Branch: master Commit: 806ea12766849660a4cfa20e189b6d96ba8f2891 URL: http://source.winehq.org/git/wine.git/?a=commit;h=806ea12766849660a4cfa20e1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 2 12:03:48 2016 +0300 oleaut32: Fix return value when converting from NULL interface pointers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartype.c | 20 ++++++++++++++++++++ dlls/oleaut32/variant.c | 6 ++++++ 2 files changed, 26 insertions(+) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 7d50545..ff495bd 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -5889,6 +5889,16 @@ static void test_IUnknownChangeTypeEx(void) lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); + /* NULL IUnknown -> IDispatch */ + V_VT(&vSrc) = VT_UNKNOWN; + V_UNKNOWN(&vSrc) = NULL; + VariantInit(&vDst); + V_DISPATCH(&vDst) = (void*)0xdeadbeef; + hres = VariantChangeTypeEx(&vDst, &vSrc, lcid, 0, VT_DISPATCH); + ok(hres == S_OK && V_VT(&vDst) == VT_DISPATCH && V_DISPATCH(&vDst) == NULL, + "change unk(src,dst): expected 0x%08x,%d,%p, got 0x%08x,%d,%p\n", + S_OK, VT_DISPATCH, NULL, hres, V_VT(&vDst), V_DISPATCH(&vDst)); + V_VT(&vSrc) = VT_UNKNOWN; V_UNKNOWN(&vSrc) = pu; @@ -6033,6 +6043,16 @@ static void test_IDispatchChangeTypeEx(void) lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); + /* NULL IDispatch -> IUnknown */ + V_VT(&vSrc) = VT_DISPATCH; + V_DISPATCH(&vSrc) = NULL; + VariantInit(&vDst); + V_UNKNOWN(&vDst) = (void*)0xdeadbeef; + hres = VariantChangeTypeEx(&vDst, &vSrc, lcid, 0, VT_UNKNOWN); + ok(hres == S_OK && V_VT(&vDst) == VT_UNKNOWN && V_UNKNOWN(&vDst) == NULL, + "change unk(src,dst): expected 0x%08x,%d,%p, got 0x%08x,%d,%p\n", + S_OK, VT_UNKNOWN, NULL, hres, V_VT(&vDst), V_UNKNOWN(&vDst)); + V_VT(&vSrc) = VT_DISPATCH; V_DISPATCH(&vSrc) = pd; diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 6fbb320..17f753a 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -469,7 +469,10 @@ static inline HRESULT VARIANT_Coerce(VARIANTARG* pd, LCID lcid, USHORT wFlags, { case VT_DISPATCH: if (V_DISPATCH(ps) == NULL) + { V_UNKNOWN(pd) = NULL; + res = S_OK; + } else res = IDispatch_QueryInterface(V_DISPATCH(ps), &IID_IUnknown, (LPVOID*)&V_UNKNOWN(pd)); break; @@ -481,7 +484,10 @@ static inline HRESULT VARIANT_Coerce(VARIANTARG* pd, LCID lcid, USHORT wFlags, { case VT_UNKNOWN: if (V_UNKNOWN(ps) == NULL) + { V_DISPATCH(pd) = NULL; + res = S_OK; + } else res = IUnknown_QueryInterface(V_UNKNOWN(ps), &IID_IDispatch, (LPVOID*)&V_DISPATCH(pd)); break;

1 0

Jacek Caban : jscript: Store exception code in exprval_t.
by Alexandre Julliard 02 Aug '16

02 Aug '16

Module: wine Branch: master Commit: 7af8330e932e9e04bad194b1af0f99cd8ef03046 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7af8330e932e9e04bad194b1a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 2 17:40:42 2016 +0200 jscript: Store exception code in exprval_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 2c44112..ba408b8 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -58,6 +58,7 @@ typedef struct { IDispatch *disp; DISPID id; } idref; + HRESULT hres; } u; } exprval_t; @@ -221,6 +222,12 @@ static void exprval_release(exprval_t *val) } } +static inline void exprval_set_exception(exprval_t *val, HRESULT hres) +{ + val->type = EXPRVAL_INVALID; + val->u.hres = hres; +} + /* ECMA-262 3rd Edition 8.7.1 */ static HRESULT exprval_to_value(script_ctx_t *ctx, exprval_t *val, jsval_t *ret) { @@ -537,7 +544,7 @@ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, exprval_t *re if(lookup_global_members(ctx, identifier, ret)) return S_OK; - ret->type = EXPRVAL_INVALID; + exprval_set_exception(ret, JS_E_UNDEFINED_VARIABLE); return S_OK; } @@ -1060,7 +1067,7 @@ static HRESULT interp_ident(script_ctx_t *ctx) return hres; if(exprval.type == EXPRVAL_INVALID) - return throw_type_error(ctx, JS_E_UNDEFINED_VARIABLE, arg); + return throw_type_error(ctx, exprval.u.hres, arg); hres = exprval_to_value(ctx, &exprval, &v); exprval_release(&exprval);

1 0

Jacek Caban : jscript: Use exprval_t to represent property references passed on JS stack.
by Alexandre Julliard 02 Aug '16

02 Aug '16

Module: wine Branch: master Commit: abba963006a7f6ac8f70887b2d97431eb128925c URL: http://source.winehq.org/git/wine.git/?a=commit;h=abba963006a7f6ac8f70887b2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 2 17:40:54 2016 +0200 jscript: Use exprval_t to represent property references passed on JS stack. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 1 + dlls/jscript/engine.c | 261 +++++++++++++++++++++++++++----------------------- 2 files changed, 144 insertions(+), 118 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=abba963006a7f6ac8f708…

1 0

Jacek Caban : jscript: Allow accessing arguments values directly from stack.
by Alexandre Julliard 02 Aug '16

02 Aug '16

Module: wine Branch: master Commit: da02140b43e8cf12246b5879bfbbf696fcccdb86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da02140b43e8cf12246b5879b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 2 17:41:40 2016 +0200 jscript: Allow accessing arguments values directly from stack. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 132 ++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 107 insertions(+), 25 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 99eacb1..11b5618 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -50,6 +50,7 @@ typedef struct { enum { EXPRVAL_JSVAL, EXPRVAL_IDREF, + EXPRVAL_STACK_REF, EXPRVAL_INVALID } type; union { @@ -58,6 +59,7 @@ typedef struct { IDispatch *disp; DISPID id; } idref; + unsigned off; HRESULT hres; } u; } exprval_t; @@ -103,10 +105,15 @@ static inline jsval_t stack_top(script_ctx_t *ctx) return ctx->stack[ctx->stack_top-1]; } -static inline jsval_t stack_topn(script_ctx_t *ctx, unsigned n) +static inline jsval_t *stack_top_ref(script_ctx_t *ctx, unsigned n) { assert(ctx->stack_top > ctx->call_ctx->stack_base+n); - return ctx->stack[ctx->stack_top-1-n]; + return ctx->stack+ctx->stack_top-1-n; +} + +static inline jsval_t stack_topn(script_ctx_t *ctx, unsigned n) +{ + return *stack_top_ref(ctx, n); } static inline jsval_t *stack_args(script_ctx_t *ctx, unsigned n) @@ -183,6 +190,11 @@ static HRESULT stack_push_exprval(script_ctx_t *ctx, exprval_t *val) else IDispatch_Release(val->u.idref.disp); return hres; + case EXPRVAL_STACK_REF: + hres = stack_push(ctx, jsval_number(val->u.off)); + if(SUCCEEDED(hres)) + hres = stack_push(ctx, jsval_undefined()); + return hres; case EXPRVAL_INVALID: hres = stack_push(ctx, jsval_undefined()); if(SUCCEEDED(hres)) @@ -194,19 +206,50 @@ static HRESULT stack_push_exprval(script_ctx_t *ctx, exprval_t *val) return E_FAIL; } -static BOOL exprval_from_stack(jsval_t v1, jsval_t v2, exprval_t *r) +static BOOL stack_topn_exprval(script_ctx_t *ctx, unsigned n, exprval_t *r) { - switch(jsval_type(v1)) { + jsval_t v = stack_topn(ctx, n+1); + + switch(jsval_type(v)) { + case JSV_NUMBER: { + call_frame_t *frame = ctx->call_ctx; + unsigned off = get_number(v); + + if(!frame->base_scope->frame && off >= frame->arguments_off) { + DISPID id; + HRESULT hres; + + /* Got stack reference in deoptimized code. Need to convert it back to variable object reference. */ + + hres = jsdisp_get_id(ctx->call_ctx->base_scope->jsobj, frame->function->params[off - frame->arguments_off], 0, &id); + if(FAILED(hres)) { + r->type = EXPRVAL_INVALID; + r->u.hres = hres; + return FALSE; + } + + *stack_top_ref(ctx, n+1) = jsval_obj(jsdisp_addref(frame->base_scope->jsobj)); + *stack_top_ref(ctx, n) = jsval_number(id); + r->type = EXPRVAL_IDREF; + r->u.idref.disp = frame->base_scope->obj; + r->u.idref.id = id; + return TRUE; + } + + r->type = EXPRVAL_STACK_REF; + r->u.off = off; + return TRUE; + } case JSV_OBJECT: r->type = EXPRVAL_IDREF; - r->u.idref.disp = get_object(v1); - assert(is_number(v2)); - r->u.idref.id = get_number(v2); + r->u.idref.disp = get_object(v); + assert(is_number(stack_topn(ctx, n))); + r->u.idref.id = get_number(stack_topn(ctx, n)); return TRUE; case JSV_UNDEFINED: r->type = EXPRVAL_INVALID; - assert(is_number(v2)); - r->u.hres = get_number(v2); + assert(is_number(stack_topn(ctx, n))); + r->u.hres = get_number(stack_topn(ctx, n)); return FALSE; default: assert(0); @@ -216,31 +259,59 @@ static BOOL exprval_from_stack(jsval_t v1, jsval_t v2, exprval_t *r) static inline BOOL stack_pop_exprval(script_ctx_t *ctx, exprval_t *r) { - jsval_t v = stack_pop(ctx); - return exprval_from_stack(stack_pop(ctx), v, r); -} - -static inline BOOL stack_topn_exprval(script_ctx_t *ctx, unsigned n, exprval_t *r) -{ - return exprval_from_stack(stack_topn(ctx, n+1), stack_topn(ctx, n), r); + BOOL ret = stack_topn_exprval(ctx, 0, r); + ctx->stack_top -= 2; + return ret; } static HRESULT exprval_propput(script_ctx_t *ctx, exprval_t *ref, jsval_t v) { - assert(ref->type == EXPRVAL_IDREF); - return disp_propput(ctx, ref->u.idref.disp, ref->u.idref.id, v); + switch(ref->type) { + case EXPRVAL_STACK_REF: { + jsval_t *r = ctx->stack + ref->u.off; + jsval_release(*r); + return jsval_copy(v, r); + } + case EXPRVAL_IDREF: + return disp_propput(ctx, ref->u.idref.disp, ref->u.idref.id, v); + default: + assert(0); + return E_FAIL; + } } static HRESULT exprval_propget(script_ctx_t *ctx, exprval_t *ref, jsval_t *r) { - assert(ref->type == EXPRVAL_IDREF); - return disp_propget(ctx, ref->u.idref.disp, ref->u.idref.id, r); + switch(ref->type) { + case EXPRVAL_STACK_REF: + return jsval_copy(ctx->stack[ref->u.off], r); + case EXPRVAL_IDREF: + return disp_propget(ctx, ref->u.idref.disp, ref->u.idref.id, r); + default: + assert(0); + return E_FAIL; + } } static HRESULT exprval_call(script_ctx_t *ctx, exprval_t *ref, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - assert(ref->type == EXPRVAL_IDREF); - return disp_call(ctx, ref->u.idref.disp, ref->u.idref.id, flags, argc, argv, r); + switch(ref->type) { + case EXPRVAL_STACK_REF: { + jsval_t v = ctx->stack[ref->u.off]; + + if(!is_object_instance(v)) { + FIXME("invoke %s\n", debugstr_jsval(v)); + return E_FAIL; + } + + return disp_call_value(ctx, get_object(v), NULL, flags, argc, argv, r); + } + case EXPRVAL_IDREF: + return disp_call(ctx, ref->u.idref.disp, ref->u.idref.id, flags, argc, argv, r); + default: + assert(0); + return E_FAIL; + } } /* ECMA-262 3rd Edition 8.7.1 */ @@ -271,6 +342,7 @@ static void exprval_release(exprval_t *val) if(val->u.idref.disp) IDispatch_Release(val->u.idref.disp); return; + case EXPRVAL_STACK_REF: case EXPRVAL_INVALID: return; } @@ -530,9 +602,16 @@ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, exprval_t *re if(ctx->call_ctx) { for(scope = ctx->call_ctx->scope; scope; scope = scope->next) { if(scope->frame) { - hres = detach_variable_object(ctx, scope->frame); - if(FAILED(hres)) - return hres; + function_code_t *func = scope->frame->function; + int i; + + for(i = 0; i < func->param_cnt; i++) { + if(!strcmpW(identifier, func->params[i])) { + ret->type = EXPRVAL_STACK_REF; + ret->u.off = scope->frame->arguments_off+i; + return S_OK; + } + } } if(scope->jsobj) hres = jsdisp_get_id(scope->jsobj, identifier, fdexNameImplicit, &id); @@ -1677,6 +1756,9 @@ static HRESULT interp_delete_ident(script_ctx_t *ctx) return hres; switch(exprval.type) { + case EXPRVAL_STACK_REF: + ret = FALSE; + break; case EXPRVAL_IDREF: hres = disp_delete(exprval.u.idref.disp, exprval.u.idref.id, &ret); IDispatch_Release(exprval.u.idref.disp);

1 0