September 2015 - Wine-Commits

Iván Matellanes : msvcirt: Implement strstreambuf:: underflow.
by Alexandre Julliard Sept. 18, 2015

Sept. 18, 2015

Module: wine Branch: master Commit: 2f70aba8d9dc729b6bfda7a9427bf896cc5894fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f70aba8d9dc729b6bfda7a94… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Thu Sep 17 11:06:53 2015 +0200 msvcirt: Implement strstreambuf::underflow. --- dlls/msvcirt/msvcirt.c | 9 +++++++-- dlls/msvcirt/tests/msvcirt.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index c6e67dc..a320879 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -1380,8 +1380,13 @@ int __thiscall strstreambuf_sync(strstreambuf *this) DEFINE_THISCALL_WRAPPER(strstreambuf_underflow, 4) int __thiscall strstreambuf_underflow(strstreambuf *this) { - FIXME("(%p) stub\n", this); - return EOF; + TRACE("(%p)\n", this); + if (this->base.gptr < this->base.egptr) + return *this->base.gptr; + /* extend the get area to include the characters written */ + if (this->base.egptr < this->base.pptr) + this->base.egptr = this->base.pptr; + return (this->base.gptr < this->base.egptr) ? *this->base.gptr : EOF; } /* ??0ios@@IAE(a)ABV0@@Z */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 978665f..5e29e9a 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -196,6 +196,7 @@ static void (*__thiscall p_strstreambuf_dtor)(strstreambuf*); static int (*__thiscall p_strstreambuf_doallocate)(strstreambuf*); static void (*__thiscall p_strstreambuf_freeze)(strstreambuf*, int); static streambuf* (*__thiscall p_strstreambuf_setbuf)(strstreambuf*, char*, int); +static int (*__thiscall p_strstreambuf_underflow)(strstreambuf*); /* ios */ static ios* (*__thiscall p_ios_copy_ctor)(ios*, const ios*); @@ -351,6 +352,7 @@ static BOOL init(void) SET(p_strstreambuf_doallocate, "?doallocate(a)strstreambuf@@MEAAHXZ"); SET(p_strstreambuf_freeze, "?freeze(a)strstreambuf@@QEAAXH(a)Z"); SET(p_strstreambuf_setbuf, "?setbuf(a)strstreambuf@@UEAAPEAVstreambuf@@PEADH(a)Z"); + SET(p_strstreambuf_underflow, "?underflow(a)strstreambuf@@UEAAHXZ"); SET(p_ios_copy_ctor, "??0ios@@IEAA(a)AEBV0@@Z"); SET(p_ios_ctor, "??0ios@@IEAA(a)XZ"); @@ -426,6 +428,7 @@ static BOOL init(void) SET(p_strstreambuf_doallocate, "?doallocate(a)strstreambuf@@MAEHXZ"); SET(p_strstreambuf_freeze, "?freeze(a)strstreambuf@@QAEXH(a)Z"); SET(p_strstreambuf_setbuf, "?setbuf(a)strstreambuf@@UAEPAVstreambuf@@PADH(a)Z"); + SET(p_strstreambuf_underflow, "?underflow(a)strstreambuf@@UAEHXZ"); SET(p_ios_copy_ctor, "??0ios@@IAE(a)ABV0@@Z"); SET(p_ios_ctor, "??0ios@@IAE(a)XZ"); @@ -1596,6 +1599,31 @@ static void test_strstreambuf(void) ok(pret == &ssb2.base, "expected %p got %p\n", &ssb2.base, pret); ok(ssb2.increase == -2, "expected -2, got %d\n", ssb2.increase); + /* underflow */ + ssb1.base.epptr = ssb1.base.ebuf = ssb1.base.base + 64; + ret = (int) call_func1(p_strstreambuf_underflow, &ssb1); + ok(ret == 'T', "expected 'T' got %d\n", ret); + ssb1.base.gptr = ssb1.base.egptr; + ret = (int) call_func1(p_strstreambuf_underflow, &ssb1); + ok(ret == EOF, "expected EOF got %d\n", ret); + ret = (int) call_func3(p_streambuf_xsputn, &ssb1.base, "Gotta make you understand", 5); + ok(ret == 5, "expected 5 got %d\n", ret); + ok(ssb1.base.pptr == buffer + 25, "wrong put pointer, expected %p got %p\n", buffer + 25, ssb1.base.pptr); + ret = (int) call_func1(p_strstreambuf_underflow, &ssb1); + ok(ret == 'G', "expected 'G' got %d\n", ret); + ok(ssb1.base.egptr == buffer + 25, "wrong get end, expected %p got %p\n", buffer + 25, ssb1.base.egptr); + ssb1.base.gptr = ssb1.base.egptr = ssb1.base.pptr = ssb1.base.epptr; + ret = (int) call_func1(p_strstreambuf_underflow, &ssb1); + ok(ret == EOF, "expected EOF got %d\n", ret); + ssb2.base.eback = ssb2.base.gptr = ssb2.base.egptr = NULL; + ssb2.base.pbase = ssb2.base.pptr = ssb2.base.epptr = NULL; + ret = (int) call_func1(p_strstreambuf_underflow, &ssb2); + ok(ret == EOF, "expected EOF got %d\n", ret); + ssb2.base.eback = ssb2.base.base; + ssb2.base.gptr = ssb2.base.egptr = ssb2.base.ebuf; + ret = (int) call_func1(p_strstreambuf_underflow, &ssb2); + ok(ret == EOF, "expected EOF got %d\n", ret); + call_func1(p_strstreambuf_dtor, &ssb1); call_func1(p_strstreambuf_dtor, &ssb2); }

1 0

Bruno Jesus : mciavi32: Detect Indeo video frames as valid frames.
by Alexandre Julliard Sept. 18, 2015

Sept. 18, 2015

Module: wine Branch: master Commit: c5e281d0d26b6095968e6c17b20f7369e22df6b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5e281d0d26b6095968e6c17b… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Sep 17 15:59:49 2015 +0800 mciavi32: Detect Indeo video frames as valid frames. --- dlls/mciavi32/mmoutput.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mciavi32/mmoutput.c b/dlls/mciavi32/mmoutput.c index 3f3bc53..d3badb6 100644 --- a/dlls/mciavi32/mmoutput.c +++ b/dlls/mciavi32/mmoutput.c @@ -190,8 +190,11 @@ static BOOL MCIAVI_AddFrame(WINE_MCIAVI* wma, LPMMCKINFO mmck, */ twocc = TWOCCFromFOURCC(mmck->ckid); if (twocc == TWOCCFromFOURCC(wma->inbih->biCompression)) - twocc = cktypeDIBcompressed; - + twocc = cktypeDIBcompressed; + /* Also detect some chunks that seem to be used by Indeo videos where the chunk is named + * after the codec. */ + else if (twocc == LOWORD(wma->ash_video.fccHandler)) + twocc = cktypeDIBcompressed; switch (twocc) { case cktypeDIBbits: case cktypeDIBcompressed:

1 0

Bruno Jesus : mciavi32: Make a debug message more clear.
by Alexandre Julliard Sept. 18, 2015

Sept. 18, 2015

Module: wine Branch: master Commit: 1862c38f7d8699553470b37b3c4c7c8160626ea0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1862c38f7d8699553470b37b3… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Sep 17 15:58:23 2015 +0800 mciavi32: Make a debug message more clear. --- dlls/mciavi32/mmoutput.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mciavi32/mmoutput.c b/dlls/mciavi32/mmoutput.c index 5d4e092..3f3bc53 100644 --- a/dlls/mciavi32/mmoutput.c +++ b/dlls/mciavi32/mmoutput.c @@ -398,8 +398,8 @@ BOOL MCIAVI_GetInfo(WINE_MCIAVI* wma) mmioAscend(wma->hFile, &mmckInfo, 0); } if (alb.numVideoFrames != wma->dwPlayableVideoFrames) { - WARN("Found %d video frames (/%d), reducing playable frames\n", - alb.numVideoFrames, wma->dwPlayableVideoFrames); + WARN("AVI header says %d frames, we found %d video frames, reducing playable frames\n", + wma->dwPlayableVideoFrames, alb.numVideoFrames); wma->dwPlayableVideoFrames = alb.numVideoFrames; } wma->dwPlayableAudioBlocks = alb.numAudioBlocks;

1 0

Józef Kucia : dxgi: Replace dxgi_cs with wined3d_mutex.
by Alexandre Julliard Sept. 18, 2015

Sept. 18, 2015

Module: wine Branch: master Commit: 0eefb93535ae676953fdfb2b6a4034eec320b916 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eefb93535ae676953fdfb2b6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 17 01:10:13 2015 +0200 dxgi: Replace dxgi_cs with wined3d_mutex. --- dlls/dxgi/adapter.c | 4 ++-- dlls/dxgi/device.c | 12 ++++++------ dlls/dxgi/dxgi_main.c | 30 ++++++++++-------------------- dlls/dxgi/dxgi_private.h | 2 -- dlls/dxgi/factory.c | 20 ++++++++++---------- dlls/dxgi/output.c | 10 +++++----- dlls/dxgi/swapchain.c | 16 ++++++++-------- dlls/dxgi/utils.c | 18 +++++++++--------- 8 files changed, 50 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0eefb93535ae676953fdf…

1 0

Andrey Gusev : d3d8: TRACE fixes.
by Alexandre Julliard Sept. 18, 2015

Sept. 18, 2015

Module: wine Branch: master Commit: f0c52fe0f53fc661b40a874a9cdbe0278311cbd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0c52fe0f53fc661b40a874a9… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Sep 16 20:22:38 2015 +0300 d3d8: TRACE fixes. --- dlls/d3d8/surface.c | 2 +- dlls/d3d8/vertexdeclaration.c | 2 +- dlls/d3d8/volume.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 7779a56..a76d0ce 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -30,7 +30,7 @@ static inline struct d3d8_surface *impl_from_IDirect3DSurface8(IDirect3DSurface8 static HRESULT WINAPI d3d8_surface_QueryInterface(IDirect3DSurface8 *iface, REFIID riid, void **out) { - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), out); + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); if (IsEqualGUID(riid, &IID_IDirect3DSurface8) || IsEqualGUID(riid, &IID_IDirect3DResource8) diff --git a/dlls/d3d8/vertexdeclaration.c b/dlls/d3d8/vertexdeclaration.c index 968b76b..7900325 100644 --- a/dlls/d3d8/vertexdeclaration.c +++ b/dlls/d3d8/vertexdeclaration.c @@ -263,7 +263,7 @@ static UINT convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3 WORD stream = 0; int offset = 0; - TRACE("d3d8_elements %p, wined3d_elements %p\n", d3d8_elements, wined3d_elements); + TRACE("d3d8_elements %p, d3d8_elements_size %p, wined3d_elements %p\n", d3d8_elements, d3d8_elements_size, wined3d_elements); /* 128 should be enough for anyone... */ *wined3d_elements = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 128 * sizeof(**wined3d_elements)); diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index d116b16..077ec72 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -30,7 +30,7 @@ static inline struct d3d8_volume *impl_from_IDirect3DVolume8(IDirect3DVolume8 *i static HRESULT WINAPI d3d8_volume_QueryInterface(IDirect3DVolume8 *iface, REFIID riid, void **out) { - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), out); + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); if (IsEqualGUID(riid, &IID_IDirect3DVolume8) || IsEqualGUID(riid, &IID_IUnknown))

1 0

Austin English : dxgi: Upgrade Direct3D 10 WARN to a FIXME.
by Alexandre Julliard Sept. 18, 2015

Sept. 18, 2015

Module: wine Branch: master Commit: 4114e048150ce22349ccdda2e3787822f43496cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4114e048150ce22349ccdda2e… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Sep 16 21:25:59 2015 -0500 dxgi: Upgrade Direct3D 10 WARN to a FIXME. --- dlls/dxgi/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index ae07bac..ecb9d91 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -23,6 +23,7 @@ #include "dxgi_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dxgi); +WINE_DECLARE_DEBUG_CHANNEL(winediag); static inline struct dxgi_device *impl_from_IWineDXGIDevice(IWineDXGIDevice *iface) { @@ -398,7 +399,7 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l hr = wined3d_get_device_caps(dxgi_factory->wined3d, dxgi_adapter->ordinal, WINED3D_DEVICE_TYPE_HAL, &caps); if (FAILED(hr) || caps.VertexShaderVersion < 4 || caps.PixelShaderVersion < 4) { - WARN("Direct3D 10 is not supported on this GPU with the current shader backend.\n"); + FIXME_(winediag)("Direct3D 10 is not supported on this GPU with the current shader backend.\n"); if (SUCCEEDED(hr)) hr = E_FAIL; IUnknown_Release(device->child_layer);

1 0

Andrey Gusev : d3d9: TRACE fixes.
by Alexandre Julliard Sept. 18, 2015

Sept. 18, 2015

Module: wine Branch: master Commit: 425160ce85ded396df218807b13c367801b4f395 URL: http://source.winehq.org/git/wine.git/?a=commit;h=425160ce85ded396df218807b… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Sep 16 20:23:29 2015 +0300 d3d9: TRACE fixes. --- dlls/d3d9/query.c | 2 +- dlls/d3d9/vertexdeclaration.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/query.c b/dlls/d3d9/query.c index 42b476c..6b55aec 100644 --- a/dlls/d3d9/query.c +++ b/dlls/d3d9/query.c @@ -32,7 +32,7 @@ static inline struct d3d9_query *impl_from_IDirect3DQuery9(IDirect3DQuery9 *ifac static HRESULT WINAPI d3d9_query_QueryInterface(IDirect3DQuery9 *iface, REFIID riid, void **out) { - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), out); + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); if (IsEqualGUID(riid, &IID_IDirect3DQuery9) || IsEqualGUID(riid, &IID_IUnknown)) diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index cc7998d..914de24 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -326,7 +326,7 @@ static HRESULT convert_to_wined3d_declaration(const D3DVERTEXELEMENT9 *d3d9_elem UINT count = 1; UINT i; - TRACE("d3d9_elements %p, wined3d_elements %p\n", d3d9_elements, wined3d_elements); + TRACE("d3d9_elements %p, wined3d_elements %p, element_count %p\n", d3d9_elements, wined3d_elements, element_count); element = d3d9_elements; while (element++->Stream != 0xff && count++ < 128);

1 0

Iván Matellanes : msvcirt: Implement strstreambuf:: sync.
by Alexandre Julliard Sept. 18, 2015

Sept. 18, 2015

Module: wine Branch: master Commit: ea953271deaeb558650ac349311cc13620f038a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea953271deaeb558650ac3493… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Thu Sep 17 11:06:52 2015 +0200 msvcirt: Implement strstreambuf::sync. --- dlls/msvcirt/msvcirt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 0ea4030..c6e67dc 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -1371,8 +1371,8 @@ char* __thiscall strstreambuf_str(strstreambuf *this) DEFINE_THISCALL_WRAPPER(strstreambuf_sync, 4) int __thiscall strstreambuf_sync(strstreambuf *this) { - FIXME("(%p) stub\n", this); - return EOF; + TRACE("(%p)\n", this); + return 0; } /* ?underflow(a)strstreambuf@@UAEHXZ */

1 0

Iván Matellanes : msvcirt: Implement strstreambuf:: doallocate.
by Alexandre Julliard Sept. 18, 2015

Sept. 18, 2015

Module: wine Branch: master Commit: 0257ebc838395dd9934e4ab682483eba72963c5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0257ebc838395dd9934e4ab68… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Thu Sep 17 11:06:50 2015 +0200 msvcirt: Implement strstreambuf::doallocate. --- dlls/msvcirt/msvcirt.c | 37 +++++++++++++++++++++++++++++++++++-- dlls/msvcirt/tests/msvcirt.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 4b826db..d2c39eb 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -1280,8 +1280,41 @@ strstreambuf* __thiscall strstreambuf_scalar_dtor(strstreambuf *this, unsigned i DEFINE_THISCALL_WRAPPER(strstreambuf_doallocate, 4) int __thiscall strstreambuf_doallocate(strstreambuf *this) { - FIXME("(%p) stub\n", this); - return EOF; + char *prev_buffer = this->base.base, *new_buffer; + LONG prev_size = this->base.ebuf - this->base.base, new_size; + + TRACE("(%p)\n", this); + + /* calculate the size of the new buffer */ + new_size = (prev_size > 0 ? prev_size : 0) + (this->increase > 0 ? this->increase : 1); + /* get a new buffer */ + if (this->f_alloc) + new_buffer = this->f_alloc(new_size); + else + new_buffer = MSVCRT_operator_new(new_size); + if (!new_buffer) + return EOF; + if (this->base.ebuf) { + /* copy the contents and adjust the pointers */ + memcpy(new_buffer, this->base.base, prev_size); + if (this->base.egptr) { + this->base.eback += new_buffer - prev_buffer; + this->base.gptr += new_buffer - prev_buffer; + this->base.egptr += new_buffer - prev_buffer; + } + if (this->base.epptr) { + this->base.pbase += new_buffer - prev_buffer; + this->base.pptr += new_buffer - prev_buffer; + this->base.epptr += new_buffer - prev_buffer; + } + /* free the old buffer */ + if (this->f_free) + this->f_free(this->base.base); + else + MSVCRT_operator_delete(this->base.base); + } + streambuf_setb(&this->base, new_buffer, new_buffer + new_size, 0); + return 1; } /* ?freeze(a)strstreambuf@@QAEXH(a)Z */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index aaa9f1c..c7398d6 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -193,6 +193,7 @@ static strstreambuf* (*__thiscall p_strstreambuf_buffer_ctor)(strstreambuf*, cha static strstreambuf* (*__thiscall p_strstreambuf_ubuffer_ctor)(strstreambuf*, unsigned char*, int, unsigned char*); static strstreambuf* (*__thiscall p_strstreambuf_ctor)(strstreambuf*); static void (*__thiscall p_strstreambuf_dtor)(strstreambuf*); +static int (*__thiscall p_strstreambuf_doallocate)(strstreambuf*); static void (*__thiscall p_strstreambuf_freeze)(strstreambuf*, int); /* ios */ @@ -346,6 +347,7 @@ static BOOL init(void) SET(p_strstreambuf_ubuffer_ctor, "??0strstreambuf@@QEAA(a)PEAEH0@Z"); SET(p_strstreambuf_ctor, "??0strstreambuf@@QEAA(a)XZ"); SET(p_strstreambuf_dtor, "??1strstreambuf@@UEAA(a)XZ"); + SET(p_strstreambuf_doallocate, "?doallocate(a)strstreambuf@@MEAAHXZ"); SET(p_strstreambuf_freeze, "?freeze(a)strstreambuf@@QEAAXH(a)Z"); SET(p_ios_copy_ctor, "??0ios@@IEAA(a)AEBV0@@Z"); @@ -419,6 +421,7 @@ static BOOL init(void) SET(p_strstreambuf_ubuffer_ctor, "??0strstreambuf@@QAE(a)PAEH0@Z"); SET(p_strstreambuf_ctor, "??0strstreambuf@@QAE(a)XZ"); SET(p_strstreambuf_dtor, "??1strstreambuf@@UAE(a)XZ"); + SET(p_strstreambuf_doallocate, "?doallocate(a)strstreambuf@@MAEHXZ"); SET(p_strstreambuf_freeze, "?freeze(a)strstreambuf@@QAEXH(a)Z"); SET(p_ios_copy_ctor, "??0ios@@IAE(a)ABV0@@Z"); @@ -1420,6 +1423,7 @@ static void test_strstreambuf(void) { strstreambuf ssb1, ssb2; char buffer[64]; + int ret; memset(&ssb1, 0xab, sizeof(strstreambuf)); memset(&ssb2, 0xab, sizeof(strstreambuf)); @@ -1544,6 +1548,35 @@ static void test_strstreambuf(void) call_func2(p_strstreambuf_freeze, &ssb2, 0); ok(ssb2.dynamic == 1, "expected 1, got %d\n", ssb2.dynamic); + /* doallocate */ + ssb2.dynamic = 0; + ssb2.increase = 5; + ret = (int) call_func1(p_strstreambuf_doallocate, &ssb2); + ok(ret == 1, "return value %d\n", ret); + ok(ssb2.base.ebuf == ssb2.base.base + 5, "expected %p, got %p\n", ssb2.base.base + 5, ssb2.base.ebuf); + ssb2.base.eback = ssb2.base.base; + ssb2.base.gptr = ssb2.base.base + 2; + ssb2.base.egptr = ssb2.base.base + 4; + strcpy(ssb2.base.base, "Check"); + ret = (int) call_func1(p_strstreambuf_doallocate, &ssb2); + ok(ret == 1, "return value %d\n", ret); + ok(ssb2.base.ebuf == ssb2.base.base + 10, "expected %p, got %p\n", ssb2.base.base + 10, ssb2.base.ebuf); + ok(ssb2.base.eback == ssb2.base.base, "wrong get base, expected %p got %p\n", ssb2.base.base, ssb2.base.eback); + ok(ssb2.base.gptr == ssb2.base.base + 2, "wrong get pointer, expected %p got %p\n", ssb2.base.base + 2, ssb2.base.gptr); + ok(ssb2.base.egptr == ssb2.base.base + 4, "wrong get end, expected %p got %p\n", ssb2.base.base + 4, ssb2.base.egptr); + ok(!strncmp(ssb2.base.base, "Check", 5), "strings are not equal\n"); + ssb2.base.pbase = ssb2.base.pptr = ssb2.base.base + 4; + ssb2.base.epptr = ssb2.base.ebuf; + ssb2.increase = -3; + ret = (int) call_func1(p_strstreambuf_doallocate, &ssb2); + ok(ret == 1, "return value %d\n", ret); + ok(ssb2.base.ebuf == ssb2.base.base + 11, "expected %p, got %p\n", ssb2.base.base + 11, ssb2.base.ebuf); + ok(ssb2.base.pbase == ssb2.base.base + 4, "wrong put base, expected %p got %p\n", ssb2.base.base + 4, ssb2.base.pbase); + ok(ssb2.base.pptr == ssb2.base.base + 4, "wrong put pointer, expected %p got %p\n", ssb2.base.base + 4, ssb2.base.pptr); + ok(ssb2.base.epptr == ssb2.base.base + 10, "wrong put end, expected %p got %p\n", ssb2.base.base + 10, ssb2.base.epptr); + ok(!strncmp(ssb2.base.base, "Check", 5), "strings are not equal\n"); + ssb2.dynamic = 1; + call_func1(p_strstreambuf_dtor, &ssb1); call_func1(p_strstreambuf_dtor, &ssb2); }

1 0

Iván Matellanes : msvcirt: Implement strstreambuf constructors and destructor.
by Alexandre Julliard Sept. 18, 2015

Sept. 18, 2015

Module: wine Branch: master Commit: aa4e2740b7c16b016b88fe477519cae8566b7f70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa4e2740b7c16b016b88fe477… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Thu Sep 17 11:06:47 2015 +0200 msvcirt: Implement strstreambuf constructors and destructor. --- dlls/msvcirt/msvcirt.c | 58 +++++++++++++--- dlls/msvcirt/tests/msvcirt.c | 156 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 205 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aa4e2740b7c16b016b88f…

1 0