September 2015 - Wine-commits

Ken Thomases : dbghelp: Fix a comment to reflect what the code' s actually doing.
by Alexandre Julliard 18 Sep '15

18 Sep '15

Module: wine Branch: master Commit: 8d6b34940933aa6551f50e7e218b400e86a27aea URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d6b34940933aa6551f50e7e2… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Sep 17 21:26:37 2015 -0500 dbghelp: Fix a comment to reflect what the code's actually doing. --- dlls/dbghelp/macho_module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 205c0c0..1352870 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -1551,7 +1551,7 @@ static BOOL macho_search_and_load_file(struct process* pcs, const WCHAR* filenam if (strstrW(filename, S_libstdcPPW)) return FALSE; /* We know we can't do it */ - /* If has no directories, try LD_LIBRARY_PATH first. */ + /* If has no directories, try PATH first. */ if (!strchrW(filename, '/')) { ret = macho_load_file_from_path(pcs, filename, load_addr,

1 0

Ken Thomases : dbghelp: Provide a default value for DYLD_FALLBACK_LIBRARY_PATH, which is closer to how dyld behaves.
by Alexandre Julliard 18 Sep '15

18 Sep '15

Module: wine Branch: master Commit: d5739561d8b45fa5cc72e05b7786e581b80be668 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5739561d8b45fa5cc72e05b7… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Sep 17 21:26:38 2015 -0500 dbghelp: Provide a default value for DYLD_FALLBACK_LIBRARY_PATH, which is closer to how dyld behaves. --- dlls/dbghelp/macho_module.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 1352870..1f5d446 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -1571,8 +1571,10 @@ static BOOL macho_search_and_load_file(struct process* pcs, const WCHAR* filenam /* Try DYLD_FALLBACK_LIBRARY_PATH, with just the filename (no directories). */ if (!ret) { - ret = macho_load_file_from_path(pcs, p, load_addr, - getenv("DYLD_FALLBACK_LIBRARY_PATH"), macho_info); + const char* fallback = getenv("DYLD_FALLBACK_LIBRARY_PATH"); + if (!fallback) + fallback = "/usr/local/lib:/lib:/usr/lib"; + ret = macho_load_file_from_path(pcs, p, load_addr, fallback, macho_info); } if (!ret && !strchrW(filename, '/')) ret = macho_load_file_from_dll_path(pcs, filename, load_addr, macho_info);

1 0

Iván Matellanes : msvcirt: Add stub of class strstreambuf.
by Alexandre Julliard 18 Sep '15

18 Sep '15

Module: wine Branch: master Commit: 37de5343526320e04dba9117547ed254986b1922 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37de5343526320e04dba91175… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Thu Sep 17 11:06:46 2015 +0200 msvcirt: Add stub of class strstreambuf. --- dlls/msvcirt/msvcirt.c | 214 ++++++++++++++++++++++++++++++++++++++++---- dlls/msvcirt/msvcirt.h | 2 + dlls/msvcirt/msvcirt.spec | 70 +++++++-------- dlls/msvcrt20/msvcrt20.spec | 62 ++++++------- dlls/msvcrt40/msvcrt40.spec | 62 ++++++------- 5 files changed, 298 insertions(+), 112 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=37de5343526320e04dba9…

1 0

Iván Matellanes : msvcirt: Implement strstreambuf constructors and destructor.
by Alexandre Julliard 18 Sep '15

18 Sep '15

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

Iván Matellanes : msvcirt: Implement strstreambuf:: freeze.
by Alexandre Julliard 18 Sep '15

18 Sep '15

Module: wine Branch: master Commit: a8b26a96b4d6d57052515d149f9ea35952af1737 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8b26a96b4d6d57052515d149… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Thu Sep 17 11:06:48 2015 +0200 msvcirt: Implement strstreambuf::freeze. --- dlls/msvcirt/msvcirt.c | 4 +++- dlls/msvcirt/tests/msvcirt.c | 20 +++++++++++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index b50745c..4d0f4f6 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -1289,7 +1289,9 @@ int __thiscall strstreambuf_doallocate(strstreambuf *this) DEFINE_THISCALL_WRAPPER(strstreambuf_freeze, 8) void __thiscall strstreambuf_freeze(strstreambuf *this, int frozen) { - FIXME("(%p %d) stub\n", this, frozen); + TRACE("(%p %d)\n", this, frozen); + if (!this->constant) + this->dynamic = !frozen; } /* ?overflow(a)strstreambuf@@UAEHH(a)Z */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 932e6fb..aaa9f1c 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 void (*__thiscall p_strstreambuf_freeze)(strstreambuf*, int); /* ios */ static ios* (*__thiscall p_ios_copy_ctor)(ios*, const ios*); @@ -345,6 +346,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_freeze, "?freeze(a)strstreambuf@@QEAAXH(a)Z"); SET(p_ios_copy_ctor, "??0ios@@IEAA(a)AEBV0@@Z"); SET(p_ios_ctor, "??0ios@@IEAA(a)XZ"); @@ -417,6 +419,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_freeze, "?freeze(a)strstreambuf@@QAEXH(a)Z"); SET(p_ios_copy_ctor, "??0ios@@IAE(a)ABV0@@Z"); SET(p_ios_ctor, "??0ios@@IAE(a)XZ"); @@ -1518,7 +1521,6 @@ static void test_strstreambuf(void) "wrong put end, expected %p + 0x7fffffff or -1, got %p\n", buffer, ssb1.base.epptr); ok(ssb1.dynamic == 0, "expected 0, got %d\n", ssb1.dynamic); ok(ssb1.constant == 1, "expected 1, got %d\n", ssb1.constant); - call_func1(p_strstreambuf_dtor, &ssb1); call_func1(p_strstreambuf_ctor, &ssb2); ok(ssb2.base.allocated == 0, "wrong allocate value, expected 0 got %d\n", ssb2.base.allocated); ok(ssb2.base.unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", ssb2.base.unbuffered); @@ -1527,6 +1529,22 @@ static void test_strstreambuf(void) ok(ssb2.constant == 0, "expected 0, got %d\n", ssb2.constant); ok(ssb2.f_alloc == NULL, "expected %p, got %p\n", NULL, ssb2.f_alloc); ok(ssb2.f_free == NULL, "expected %p, got %p\n", NULL, ssb2.f_free); + + /* freeze */ + call_func2(p_strstreambuf_freeze, &ssb1, 0); + ok(ssb1.dynamic == 0, "expected 0, got %d\n", ssb1.dynamic); + ssb1.constant = 0; + call_func2(p_strstreambuf_freeze, &ssb1, 0); + ok(ssb1.dynamic == 1, "expected 1, got %d\n", ssb1.dynamic); + call_func2(p_strstreambuf_freeze, &ssb1, 3); + ok(ssb1.dynamic == 0, "expected 0, got %d\n", ssb1.dynamic); + ssb1.constant = 1; + call_func2(p_strstreambuf_freeze, &ssb2, 5); + ok(ssb2.dynamic == 0, "expected 0, got %d\n", ssb2.dynamic); + call_func2(p_strstreambuf_freeze, &ssb2, 0); + ok(ssb2.dynamic == 1, "expected 1, got %d\n", ssb2.dynamic); + + call_func1(p_strstreambuf_dtor, &ssb1); call_func1(p_strstreambuf_dtor, &ssb2); }

1 0

Iván Matellanes : msvcirt: Implement strstreambuf:: str.
by Alexandre Julliard 18 Sep '15

18 Sep '15

Module: wine Branch: master Commit: 222cd629a384c84bbf7824f3ee828bb3523d5198 URL: http://source.winehq.org/git/wine.git/?a=commit;h=222cd629a384c84bbf7824f3e… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Thu Sep 17 11:06:49 2015 +0200 msvcirt: Implement strstreambuf::str. --- dlls/msvcirt/msvcirt.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 4d0f4f6..4b826db 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -1326,8 +1326,9 @@ streambuf* __thiscall strstreambuf_setbuf(strstreambuf *this, char *buffer, int DEFINE_THISCALL_WRAPPER(strstreambuf_str, 4) char* __thiscall strstreambuf_str(strstreambuf *this) { - FIXME("(%p) stub\n", this); - return NULL; + TRACE("(%p)\n", this); + strstreambuf_freeze(this, 1); + return this->base.base; } /* ?sync(a)strstreambuf@@UAEHXZ */

1 0

Iván Matellanes : msvcirt: Implement strstreambuf:: doallocate.
by Alexandre Julliard 18 Sep '15

18 Sep '15

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:: setbuf.
by Alexandre Julliard 18 Sep '15

18 Sep '15

Module: wine Branch: master Commit: 675ad97a69bac725fb92b362a6d79c4fb1ae7679 URL: http://source.winehq.org/git/wine.git/?a=commit;h=675ad97a69bac725fb92b362a… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Thu Sep 17 11:06:51 2015 +0200 msvcirt: Implement strstreambuf::setbuf. --- dlls/msvcirt/msvcirt.c | 6 ++++-- dlls/msvcirt/tests/msvcirt.c | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index d2c39eb..0ea4030 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -1350,8 +1350,10 @@ streampos __thiscall strstreambuf_seekoff(strstreambuf *this, streamoff offset, DEFINE_THISCALL_WRAPPER(strstreambuf_setbuf, 12) streambuf* __thiscall strstreambuf_setbuf(strstreambuf *this, char *buffer, int length) { - FIXME("(%p %p %d) stub\n", this, buffer, length); - return NULL; + TRACE("(%p %p %d)\n", this, buffer, length); + if (length) + this->increase = length; + return &this->base; } /* ?str(a)strstreambuf@@QAEPADXZ */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index c7398d6..978665f 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -195,6 +195,7 @@ 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); +static streambuf* (*__thiscall p_strstreambuf_setbuf)(strstreambuf*, char*, int); /* ios */ static ios* (*__thiscall p_ios_copy_ctor)(ios*, const ios*); @@ -349,6 +350,7 @@ static BOOL init(void) 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_strstreambuf_setbuf, "?setbuf(a)strstreambuf@@UEAAPEAVstreambuf@@PEADH(a)Z"); SET(p_ios_copy_ctor, "??0ios@@IEAA(a)AEBV0@@Z"); SET(p_ios_ctor, "??0ios@@IEAA(a)XZ"); @@ -423,6 +425,7 @@ static BOOL init(void) 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_strstreambuf_setbuf, "?setbuf(a)strstreambuf@@UAEPAVstreambuf@@PADH(a)Z"); SET(p_ios_copy_ctor, "??0ios@@IAE(a)ABV0@@Z"); SET(p_ios_ctor, "??0ios@@IAE(a)XZ"); @@ -1422,6 +1425,7 @@ static void test_filebuf(void) static void test_strstreambuf(void) { strstreambuf ssb1, ssb2; + streambuf *pret; char buffer[64]; int ret; @@ -1577,6 +1581,21 @@ static void test_strstreambuf(void) ok(!strncmp(ssb2.base.base, "Check", 5), "strings are not equal\n"); ssb2.dynamic = 1; + /* setbuf */ + pret = (streambuf*) call_func3(p_strstreambuf_setbuf, &ssb1, buffer + 16, 16); + ok(pret == &ssb1.base, "expected %p got %p\n", &ssb1.base, pret); + ok(ssb1.base.base == buffer, "wrong buffer, expected %p got %p\n", buffer, ssb1.base.base); + ok(ssb1.increase == 16, "expected 16, got %d\n", ssb1.increase); + pret = (streambuf*) call_func3(p_strstreambuf_setbuf, &ssb2, NULL, 2); + ok(pret == &ssb2.base, "expected %p got %p\n", &ssb2.base, pret); + ok(ssb2.increase == 2, "expected 2, got %d\n", ssb2.increase); + pret = (streambuf*) call_func3(p_strstreambuf_setbuf, &ssb2, buffer, 0); + ok(pret == &ssb2.base, "expected %p got %p\n", &ssb2.base, pret); + ok(ssb2.increase == 2, "expected 2, got %d\n", ssb2.increase); + pret = (streambuf*) call_func3(p_strstreambuf_setbuf, &ssb2, NULL, -2); + ok(pret == &ssb2.base, "expected %p got %p\n", &ssb2.base, pret); + ok(ssb2.increase == -2, "expected -2, got %d\n", ssb2.increase); + call_func1(p_strstreambuf_dtor, &ssb1); call_func1(p_strstreambuf_dtor, &ssb2); }

1 0

Iván Matellanes : msvcirt: Implement strstreambuf:: sync.
by Alexandre Julliard 18 Sep '15

18 Sep '15

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

Hans Leidekker : webservices/tests: Add tests.
by Alexandre Julliard 16 Sep '15

16 Sep '15

Module: wine Branch: master Commit: 11d0886f04c973ccc6e69b611497083a82d7dfe3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11d0886f04c973ccc6e69b611… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 16 11:19:27 2015 +0200 webservices/tests: Add tests. --- dlls/webservices/tests/reader.c | 121 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 121 insertions(+) diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 7f43a07..e2ab39a 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -331,9 +331,130 @@ static void test_WsCreateReader(void) ok( hr == E_INVALIDARG, "got %08x\n", hr ); } +static void test_WsSetInput(void) +{ + HRESULT hr; + WS_XML_READER *reader; + WS_XML_READER_PROPERTY prop; + WS_XML_READER_TEXT_ENCODING enc; + WS_XML_READER_BUFFER_INPUT input; + WS_CHARSET charset; + const WS_XML_NODE *node; + ULONG size, max_depth; + + hr = WsCreateReader( NULL, 0, &reader, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsSetInput( NULL, NULL, NULL, NULL, 0, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + node = NULL; + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node != NULL, "node not set\n" ); + if (node) ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); + + enc.encoding.encodingType = WS_XML_READER_ENCODING_TYPE_TEXT; + enc.charSet = WS_CHARSET_UTF8; + + input.input.inputType = WS_XML_READER_INPUT_TYPE_BUFFER; + input.encodedData = (void *)data1; + input.encodedDataSize = sizeof(data1) - 1; + + hr = WsSetInput( reader, (WS_XML_READER_ENCODING *)&enc, (WS_XML_READER_INPUT *)&input, NULL, 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + node = NULL; + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node != NULL, "node not set\n" ); + if (node) ok( node->nodeType == WS_XML_NODE_TYPE_BOF, "got %u\n", node->nodeType ); + + /* multiple calls are allowed */ + hr = WsSetInput( reader, (WS_XML_READER_ENCODING *)&enc, (WS_XML_READER_INPUT *)&input, NULL, 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* charset is detected by WsSetInput */ + enc.encoding.encodingType = WS_XML_READER_ENCODING_TYPE_TEXT; + enc.charSet = WS_CHARSET_AUTO; + hr = WsSetInput( reader, (WS_XML_READER_ENCODING *)&enc, (WS_XML_READER_INPUT *)&input, NULL, 0, NULL ); + todo_wine ok( hr == S_OK, "got %08x\n", hr ); + + charset = 0xdeadbeef; + size = sizeof(charset); + hr = WsGetReaderProperty( reader, WS_XML_READER_PROPERTY_CHARSET, &charset, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( charset == WS_CHARSET_UTF8, "got %u\n", charset ); + + enc.encoding.encodingType = WS_XML_READER_ENCODING_TYPE_TEXT; + enc.charSet = WS_CHARSET_UTF8; + + /* reader properties can be set with WsSetInput */ + max_depth = 16; + prop.id = WS_XML_READER_PROPERTY_MAX_DEPTH; + prop.value = &max_depth; + prop.valueSize = sizeof(max_depth); + hr = WsSetInput( reader, (WS_XML_READER_ENCODING *)&enc, (WS_XML_READER_INPUT *)&input, &prop, 1, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + max_depth = 0xdeadbeef; + size = sizeof(max_depth); + hr = WsGetReaderProperty( reader, WS_XML_READER_PROPERTY_MAX_DEPTH, &max_depth, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( max_depth == 16, "got %u\n", max_depth ); + WsFreeReader( reader ); +} + +static void test_WsFillReader(void) +{ + HRESULT hr; + WS_XML_READER *reader; + const WS_XML_NODE *node; + + hr = WsCreateReader( NULL, 0, &reader, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + hr = set_input( reader, data1, sizeof(data1) - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsFillReader( reader, sizeof(data1) - 1, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = set_input( reader, data1, sizeof(data1) - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + node = NULL; + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node != NULL, "node not set\n" ); + if (node) ok( node->nodeType == WS_XML_NODE_TYPE_BOF, "got %u\n", node->nodeType ); + + hr = WsFillReader( NULL, sizeof(data1) - 1, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsFillReader( reader, sizeof(data1) - 1, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + node = NULL; + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node != NULL, "node not set\n" ); + if (node) ok( node->nodeType == WS_XML_NODE_TYPE_BOF, "got %u\n", node->nodeType ); + + hr = WsFillReader( reader, sizeof(data1) - 1, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* min_size larger than input size */ + hr = WsFillReader( reader, sizeof(data1), NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + WsFreeReader( reader ); +} + START_TEST(reader) { test_WsCreateError(); test_WsCreateHeap(); test_WsCreateReader(); + test_WsSetInput(); + test_WsFillReader(); }

1 0