wine-commits August 2016

wine-commits@winehq.org

2 participants
777 discussions

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::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::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::GetInfo.
by Alexandre Julliard 02 Aug '16

02 Aug '16

Module: wine Branch: master Commit: 6010ebb22f8f783e5802e691ed7b1b6f0eb88969 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6010ebb22f8f783e5802e691e… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Jul 28 21:59:52 2016 +0600 amstream: Implement AMAudioData::GetInfo. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiodata.c | 27 +++++++++++++++++++++++++-- dlls/amstream/tests/amstream.c | 25 +++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/audiodata.c b/dlls/amstream/audiodata.c index 7adb0c2..842fc95 100644 --- a/dlls/amstream/audiodata.c +++ b/dlls/amstream/audiodata.c @@ -30,6 +30,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(amstream); typedef struct { IAudioData IAudioData_iface; LONG ref; + DWORD size; + BYTE *data; + DWORD actual_data; } AMAudioDataImpl; static inline AMAudioDataImpl *impl_from_IAudioData(IAudioData *iface) @@ -87,9 +90,29 @@ static HRESULT WINAPI IAudioDataImpl_SetBuffer(IAudioData* iface, DWORD size, BY static HRESULT WINAPI IAudioDataImpl_GetInfo(IAudioData* iface, DWORD *length, BYTE **data, DWORD *actual_data) { - FIXME("(%p)->(%p,%p,%p): stub\n", iface, length, data, actual_data); + AMAudioDataImpl *This = impl_from_IAudioData(iface); - return E_NOTIMPL; + TRACE("(%p)->(%p,%p,%p)\n", iface, length, data, actual_data); + + if (!This->data) + { + return MS_E_NOTINIT; + } + + if (length) + { + *length = This->size; + } + if (data) + { + *data = This->data; + } + if (actual_data) + { + *actual_data = This->actual_data; + } + + return S_OK; } static HRESULT WINAPI IAudioDataImpl_SetActual(IAudioData* iface, DWORD data_valid) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index b4ead56..307868d 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -626,6 +626,30 @@ static void test_audiodata_query_interface(void) IUnknown_Release(unknown); } +static void test_audiodata_get_info(void) +{ + IUnknown *unknown = create_audio_data(); + IAudioData *audio_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_GetInfo(audio_data, NULL, NULL, NULL); + ok(MS_E_NOTINIT == result, "got 0x%08x\n", result); + + IAudioData_Release(audio_data); + +out_unknown: + IUnknown_Release(unknown); +} + START_TEST(amstream) { HANDLE file; @@ -645,6 +669,7 @@ START_TEST(amstream) } test_audiodata_query_interface(); + test_audiodata_get_info(); CoUninitialize(); }

1 0

Anton Baskanov : amstream: Fix AMAudioData::QueryInterface.
by Alexandre Julliard 02 Aug '16

02 Aug '16

Module: wine Branch: master Commit: 4a0db15622b6ea3ce5b0bd827363a83af504d7e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a0db15622b6ea3ce5b0bd827… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Jul 28 21:59:51 2016 +0600 amstream: Fix AMAudioData::QueryInterface. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiodata.c | 1 - dlls/amstream/tests/amstream.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/amstream/audiodata.c b/dlls/amstream/audiodata.c index c3bc1a6..7adb0c2 100644 --- a/dlls/amstream/audiodata.c +++ b/dlls/amstream/audiodata.c @@ -43,7 +43,6 @@ static HRESULT WINAPI IAudioDataImpl_QueryInterface(IAudioData *iface, REFIID ri TRACE("(%p)->(%s,%p)\n", iface, debugstr_guid(riid), ret_iface); if (IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_IMemoryData) || IsEqualGUID(riid, &IID_IAudioData)) { IAudioData_AddRef(iface); diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index c9e9392..b4ead56 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -593,6 +593,39 @@ error: IAMMultiMediaStream_Release(pams); } +static IUnknown *create_audio_data(void) +{ + IUnknown *audio_data = NULL; + HRESULT result = CoCreateInstance(&CLSID_AMAudioData, NULL, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void **)&audio_data); + ok(S_OK == result, "got 0x%08x\n", result); + return audio_data; +} + +static void test_audiodata_query_interface(void) +{ + IUnknown *unknown = create_audio_data(); + IMemoryData *memory_data = NULL; + IAudioData *audio_data = NULL; + + HRESULT result; + + result = IUnknown_QueryInterface(unknown, &IID_IMemoryData, (void **)&memory_data); + ok(E_NOINTERFACE == result, "got 0x%08x\n", result); + + result = IUnknown_QueryInterface(unknown, &IID_IAudioData, (void **)&audio_data); + ok(S_OK == result, "got 0x%08x\n", result); + if (S_OK == result) + { + result = IAudioData_QueryInterface(audio_data, &IID_IMemoryData, (void **)&memory_data); + ok(E_NOINTERFACE == result, "got 0x%08x\n", result); + + IAudioData_Release(audio_data); + } + + IUnknown_Release(unknown); +} + START_TEST(amstream) { HANDLE file; @@ -611,5 +644,7 @@ START_TEST(amstream) test_renderfile(); } + test_audiodata_query_interface(); + CoUninitialize(); }

1 0

Jacek Caban : wininet: Return data available in current chunk in chunked_get_avail_data.
by Alexandre Julliard 02 Aug '16

02 Aug '16

Module: wine Branch: master Commit: 16d300cacdeae49c73e334f5b519b112e019751f URL: http://source.winehq.org/git/wine.git/?a=commit;h=16d300cacdeae49c73e334f5b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 2 15:33:40 2016 +0200 wininet: Return data available in current chunk in chunked_get_avail_data. Based on a patch by Hans Leidekker. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 47700c9..ac79404 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2711,12 +2711,6 @@ static char next_chunked_data_char(chunked_stream_t *stream) return stream->buf[stream->buf_pos++]; } -static DWORD chunked_get_avail_data(data_stream_t *stream, http_request_t *req) -{ - /* Allow reading only from read buffer */ - return 0; -} - static BOOL chunked_end_of_data(data_stream_t *stream, http_request_t *req) { chunked_stream_t *chunked_stream = (chunked_stream_t*)stream; @@ -2858,6 +2852,26 @@ static DWORD chunked_read(data_stream_t *stream, http_request_t *req, BYTE *buf, return ERROR_SUCCESS; } +static DWORD chunked_get_avail_data(data_stream_t *stream, http_request_t *req) +{ + chunked_stream_t *chunked_stream = (chunked_stream_t*)stream; + DWORD avail = 0; + + if(chunked_stream->state != CHUNKED_STREAM_STATE_READING_CHUNK) { + DWORD res, read; + + /* try to process to the next chunk */ + res = chunked_read(stream, req, NULL, 0, &read, BLOCKING_DISALLOW); + if(res != ERROR_SUCCESS || chunked_stream->state != CHUNKED_STREAM_STATE_READING_CHUNK) + return 0; + } + + if(is_valid_netconn(req->netconn) && chunked_stream->buf_size < chunked_stream->chunk_size) + NETCON_query_data_available(req->netconn, &avail); + + return min(avail + chunked_stream->buf_size, chunked_stream->chunk_size); +} + static BOOL chunked_drain_content(data_stream_t *stream, http_request_t *req) { chunked_stream_t *chunked_stream = (chunked_stream_t*)stream;

1 0

Iván Matellanes : msvcirt: Implement istream:: operator>> for characters.
by Alexandre Julliard 02 Aug '16

02 Aug '16

Module: wine Branch: master Commit: 0aefe854d1a95e91a228e72543da790507fae064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aefe854d1a95e91a228e7254… Author: Iván Matellanes <matellanes.ivan(a)gmail.com> Date: Tue Aug 2 12:37:47 2016 +0100 msvcirt: Implement istream::operator>> for characters. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 13 +++++++- dlls/msvcirt/tests/msvcirt.c | 73 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 1 deletion(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 5d55b58..361285a 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -3490,7 +3490,18 @@ int __thiscall istream_getdouble(istream *this, char *str, int count) DEFINE_THISCALL_WRAPPER(istream_read_char, 8) istream* __thiscall istream_read_char(istream *this, char *ch) { - FIXME("(%p %p) stub\n", this, ch); + ios *base = istream_get_ios(this); + int ret; + + TRACE("(%p %p)\n", this, ch); + + if (istream_ipfx(this, 0)) { + if ((ret = streambuf_sbumpc(base->sb)) == EOF) + base->state |= IOSTATE_eofbit | IOSTATE_failbit; + else + *ch = ret; + istream_isfx(this); + } return this; } diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index a921b27..a706703 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -327,6 +327,7 @@ static int (*__thiscall p_istream_sync)(istream*); static streampos (*__thiscall p_istream_tellg)(istream*); static int (*__thiscall p_istream_getint)(istream*, char*); static int (*__thiscall p_istream_getdouble)(istream*, char*, int); +static istream* (*__thiscall p_istream_read_char)(istream*, char*); /* Emulate a __thiscall */ #ifdef __i386__ @@ -542,6 +543,7 @@ static BOOL init(void) SET(p_istream_tellg, "?tellg@istream@@QEAAJXZ"); SET(p_istream_getint, "?getint@istream@@AEAAHPEAD@Z"); SET(p_istream_getdouble, "?getdouble@istream@@AEAAHPEADH@Z"); + SET(p_istream_read_char, "??5istream@@QEAAAEAV0@AEAD@Z"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2@YAPAXI@Z"); p_operator_delete = (void*)GetProcAddress(msvcrt, "??3@YAXPAX@Z"); @@ -679,6 +681,7 @@ static BOOL init(void) SET(p_istream_tellg, "?tellg@istream@@QAEJXZ"); SET(p_istream_getint, "?getint@istream@@AAEHPAD@Z"); SET(p_istream_getdouble, "?getdouble@istream@@AAEHPADH@Z"); + SET(p_istream_read_char, "??5istream@@QAEAAV0@AAD@Z"); } SET(p_ios_static_lock, "?x_lockc@ios@@0U_CRT_CRITICAL_SECTION@@A"); SET(p_ios_lockc, "?lockc@ios@@KAXXZ"); @@ -4851,6 +4854,75 @@ static void test_istream_getdouble(void) call_func1(p_strstreambuf_dtor, &ssb); } +static void test_istream_read(void) +{ + istream is, *pis; + strstreambuf ssb, *pssb; + int len, ret, i; + + /* makes tables narrower */ + const ios_io_state IOSTATE_faileof = IOSTATE_failbit|IOSTATE_eofbit; + + char c, char_out[] = {-85, ' ', 'a', -50}; + struct istream_read_test { + enum { type_chr } type; + const char *stream_content; + ios_flags flags; + int width; + int expected_val; + ios_io_state expected_state; + int expected_width; + int expected_offset; + BOOL broken; + } tests[] = { + /* char */ + {type_chr, "", FLAGS_skipws, 6, /* -85 */ 0, IOSTATE_faileof, 6, 0, FALSE}, + {type_chr, " ", FLAGS_skipws, 6, /* -85 */ 0, IOSTATE_faileof, 6, 2, FALSE}, + {type_chr, " abc ", 0, 6, /* ' ' */ 1, IOSTATE_goodbit, 6, 1, FALSE}, + {type_chr, " abc ", FLAGS_skipws, 6, /* 'a' */ 2, IOSTATE_goodbit, 6, 2, FALSE}, + {type_chr, " a", FLAGS_skipws, 0, /* 'a' */ 2, IOSTATE_goodbit, 0, 2, FALSE}, + {type_chr, "\xce", 0, 6, /* -50 */ 3, IOSTATE_goodbit, 6, 1, FALSE}, + }; + + pssb = call_func2(p_strstreambuf_dynamic_ctor, &ssb, 64); + ok(pssb == &ssb, "wrong return, expected %p got %p\n", &ssb, pssb); + ret = (int) call_func1(p_streambuf_allocate, &ssb.base); + ok(ret == 1, "expected 1 got %d\n", ret); + pis = call_func3(p_istream_sb_ctor, &is, &ssb.base, TRUE); + ok(pis == &is, "wrong return, expected %p got %p\n", &is, pis); + + for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) { + len = strlen(tests[i].stream_content); + is.base_ios.state = IOSTATE_goodbit; + is.base_ios.flags = tests[i].flags; + is.base_ios.width = tests[i].width; + ssb.base.eback = ssb.base.gptr = ssb.base.base; + ssb.base.egptr = ssb.base.base + len; + memcpy(ssb.base.base, tests[i].stream_content, len); + + switch (tests[i].type) { + case type_chr: + c = -85; + pis = call_func2(p_istream_read_char, &is, &c); + ok(c == char_out[tests[i].expected_val], "Test %d: expected %d got %d\n", i, + char_out[tests[i].expected_val], c); + break; + } + + ok(pis == &is, "Test %d: wrong return, expected %p got %p\n", i, &is, pis); + ok(is.base_ios.state == tests[i].expected_state || /* xp, 2k3 */ broken(tests[i].broken), + "Test %d: expected %d got %d\n", i, tests[i].expected_state, is.base_ios.state); + ok(is.base_ios.width == tests[i].expected_width, "Test %d: expected %d got %d\n", i, + tests[i].expected_width, is.base_ios.width); + ok(ssb.base.gptr == ssb.base.base + tests[i].expected_offset || + /* xp, 2k3 */ broken(tests[i].broken), "Test %d: expected %p got %p\n", i, + ssb.base.base + tests[i].expected_offset, ssb.base.gptr); + } + + call_func1(p_istream_vbase_dtor, &is); + call_func1(p_strstreambuf_dtor, &ssb); +} + START_TEST(msvcirt) { if(!init()) @@ -4866,6 +4938,7 @@ START_TEST(msvcirt) test_istream(); test_istream_getint(); test_istream_getdouble(); + test_istream_read(); FreeLibrary(msvcrt); FreeLibrary(msvcirt);

1 0

Iván Matellanes : msvcirt: Add stubs for istream:: operator>>.
by Alexandre Julliard 02 Aug '16

02 Aug '16

Module: wine Branch: master Commit: 59f232e1c129f324cf50a25b81493f086ecedad1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59f232e1c129f324cf50a25b8… Author: Iván Matellanes <matellanes.ivan(a)gmail.com> Date: Tue Aug 2 12:37:46 2016 +0100 msvcirt: Add stubs for istream::operator>>. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 135 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcirt/msvcirt.spec | 72 +++++++++++------------ dlls/msvcrt20/msvcrt20.spec | 72 +++++++++++------------ dlls/msvcrt40/msvcrt40.spec | 72 +++++++++++------------ 4 files changed, 243 insertions(+), 108 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=59f232e1c129f324cf50a…

1 0

Nikolay Sivov : ucrtbase: Fix some spec file entries.
by Alexandre Julliard 02 Aug '16

02 Aug '16

Module: wine Branch: master Commit: 0ca1093335dbe072e4ad52e3e39129b1213e0ff8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ca1093335dbe072e4ad52e3e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 2 14:18:04 2016 +0300 ucrtbase: Fix some spec file entries. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-stdio-l1-1-0.spec | 16 ++++++++-------- dlls/ucrtbase/ucrtbase.spec | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec index 5acd7aa..10a2ab7 100644 --- a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec +++ b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec @@ -1,21 +1,21 @@ @ cdecl __acrt_iob_func(long) ucrtbase.__acrt_iob_func @ cdecl __p__commode() ucrtbase.__p__commode @ cdecl __p__fmode() ucrtbase.__p__fmode -@ cdecl __stdio_common_vfprintf(int64 ptr ptr ptr ptr) ucrtbase.__stdio_common_vfprintf +@ cdecl __stdio_common_vfprintf(int64 ptr str ptr ptr) ucrtbase.__stdio_common_vfprintf @ stub __stdio_common_vfprintf_p @ stub __stdio_common_vfprintf_s @ stub __stdio_common_vfscanf -@ cdecl __stdio_common_vfwprintf(int64 ptr ptr ptr ptr) ucrtbase.__stdio_common_vfwprintf +@ cdecl __stdio_common_vfwprintf(int64 ptr wstr ptr ptr) ucrtbase.__stdio_common_vfwprintf @ stub __stdio_common_vfwprintf_p @ stub __stdio_common_vfwprintf_s @ stub __stdio_common_vfwscanf -@ cdecl __stdio_common_vsnprintf_s(int64 ptr long long ptr ptr ptr) ucrtbase.__stdio_common_vsnprintf_s -@ cdecl __stdio_common_vsnwprintf_s(int64 ptr long long ptr ptr ptr) ucrtbase.__stdio_common_vsnwprintf_s -@ cdecl __stdio_common_vsprintf(int64 ptr long ptr ptr ptr) ucrtbase.__stdio_common_vsprintf +@ cdecl __stdio_common_vsnprintf_s(int64 ptr long long str ptr ptr) ucrtbase.__stdio_common_vsnprintf_s +@ cdecl __stdio_common_vsnwprintf_s(int64 ptr long long wstr ptr ptr) ucrtbase.__stdio_common_vsnwprintf_s +@ cdecl __stdio_common_vsprintf(int64 ptr long str ptr ptr) ucrtbase.__stdio_common_vsprintf @ stub __stdio_common_vsprintf_p -@ cdecl __stdio_common_vsprintf_s(int64 ptr long ptr ptr ptr) ucrtbase.__stdio_common_vsprintf_s -@ cdecl __stdio_common_vsscanf(int64 ptr long ptr ptr ptr) ucrtbase.__stdio_common_vsscanf -@ cdecl __stdio_common_vswprintf(int64 ptr long ptr ptr ptr) ucrtbase.__stdio_common_vswprintf +@ cdecl __stdio_common_vsprintf_s(int64 ptr long str ptr ptr) ucrtbase.__stdio_common_vsprintf_s +@ cdecl __stdio_common_vsscanf(int64 ptr long str ptr ptr) ucrtbase.__stdio_common_vsscanf +@ cdecl __stdio_common_vswprintf(int64 ptr long wstr ptr ptr) ucrtbase.__stdio_common_vswprintf @ stub __stdio_common_vswprintf_p @ cdecl __stdio_common_vswprintf_s(int64 ptr long wstr ptr ptr) ucrtbase.__stdio_common_vswprintf_s @ stub __stdio_common_vswscanf diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 96c050a..f77cbe3 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -146,21 +146,21 @@ @ stub __std_type_info_destroy_list @ stub __std_type_info_hash @ stub __std_type_info_name -@ cdecl __stdio_common_vfprintf(int64 ptr ptr ptr ptr) MSVCRT__stdio_common_vfprintf +@ cdecl __stdio_common_vfprintf(int64 ptr str ptr ptr) MSVCRT__stdio_common_vfprintf @ stub __stdio_common_vfprintf_p @ stub __stdio_common_vfprintf_s @ stub __stdio_common_vfscanf -@ cdecl __stdio_common_vfwprintf(int64 ptr ptr ptr ptr) MSVCRT__stdio_common_vfwprintf +@ cdecl __stdio_common_vfwprintf(int64 ptr wstr ptr ptr) MSVCRT__stdio_common_vfwprintf @ stub __stdio_common_vfwprintf_p @ stub __stdio_common_vfwprintf_s @ stub __stdio_common_vfwscanf -@ cdecl __stdio_common_vsnprintf_s(int64 ptr long long ptr ptr ptr) MSVCRT__stdio_common_vsnprintf_s -@ cdecl __stdio_common_vsnwprintf_s(int64 ptr long long ptr ptr ptr) MSVCRT__stdio_common_vsnwprintf_s -@ cdecl __stdio_common_vsprintf(int64 ptr long ptr ptr ptr) MSVCRT__stdio_common_vsprintf +@ cdecl __stdio_common_vsnprintf_s(int64 ptr long long str ptr ptr) MSVCRT__stdio_common_vsnprintf_s +@ cdecl __stdio_common_vsnwprintf_s(int64 ptr long long wstr ptr ptr) MSVCRT__stdio_common_vsnwprintf_s +@ cdecl __stdio_common_vsprintf(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsprintf @ stub __stdio_common_vsprintf_p -@ cdecl __stdio_common_vsprintf_s(int64 ptr long ptr ptr ptr) MSVCRT__stdio_common_vsprintf_s -@ cdecl __stdio_common_vsscanf(int64 ptr long ptr ptr ptr) MSVCRT__stdio_common_vsscanf -@ cdecl __stdio_common_vswprintf(int64 ptr long ptr ptr ptr) MSVCRT__stdio_common_vswprintf +@ cdecl __stdio_common_vsprintf_s(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsprintf_s +@ cdecl __stdio_common_vsscanf(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsscanf +@ cdecl __stdio_common_vswprintf(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswprintf @ stub __stdio_common_vswprintf_p @ cdecl __stdio_common_vswprintf_s(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswprintf_s @ stub __stdio_common_vswscanf

1 0

Nikolay Sivov : ucrtbase: Added __stdio_common_vswprintf_s().
by Alexandre Julliard 02 Aug '16

02 Aug '16

Module: wine Branch: master Commit: b6fd195279d874fff9ba1f81658d0ea49b5d36e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6fd195279d874fff9ba1f816… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 2 14:18:03 2016 +0300 ucrtbase: Added __stdio_common_vswprintf_s(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-stdio-l1-1-0.spec | 2 +- dlls/msvcrt/wcs.c | 10 ++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec index 4dcc065..5acd7aa 100644 --- a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec +++ b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec @@ -17,7 +17,7 @@ @ cdecl __stdio_common_vsscanf(int64 ptr long ptr ptr ptr) ucrtbase.__stdio_common_vsscanf @ cdecl __stdio_common_vswprintf(int64 ptr long ptr ptr ptr) ucrtbase.__stdio_common_vswprintf @ stub __stdio_common_vswprintf_p -@ stub __stdio_common_vswprintf_s +@ cdecl __stdio_common_vswprintf_s(int64 ptr long wstr ptr ptr) ucrtbase.__stdio_common_vswprintf_s @ stub __stdio_common_vswscanf @ cdecl _chsize(long long) ucrtbase._chsize @ cdecl _chsize_s(long int64) ucrtbase._chsize_s diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 04a2f76..6fc642c 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -942,6 +942,16 @@ int CDECL MSVCRT__stdio_common_vsnwprintf_s( unsigned __int64 options, } /********************************************************************* + * __stdio_common_vswprintf_s (MSVCRT.@) + */ +int CDECL MSVCRT__stdio_common_vswprintf_s( unsigned __int64 options, + MSVCRT_wchar_t *str, MSVCRT_size_t count, const MSVCRT_wchar_t *format, + MSVCRT__locale_t locale, __ms_va_list valist ) +{ + return MSVCRT__stdio_common_vsnwprintf_s(options, str, INT_MAX, count, format, locale, valist); +} + +/********************************************************************* * __stdio_common_vsprintf_s (MSVCRT.@) */ int CDECL MSVCRT__stdio_common_vsprintf_s( unsigned __int64 options, diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 6d7e631..96c050a 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -162,7 +162,7 @@ @ cdecl __stdio_common_vsscanf(int64 ptr long ptr ptr ptr) MSVCRT__stdio_common_vsscanf @ cdecl __stdio_common_vswprintf(int64 ptr long ptr ptr ptr) MSVCRT__stdio_common_vswprintf @ stub __stdio_common_vswprintf_p -@ stub __stdio_common_vswprintf_s +@ cdecl __stdio_common_vswprintf_s(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswprintf_s @ stub __stdio_common_vswscanf @ stub __strncnt @ cdecl __sys_errlist()

1 0

← Newer
1
...
70
71
72
73
74
75
76
77
78
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2016