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

Alex Henrie : shell32: Return E_INVALIDARG from FolderItems functions on null output.
by Alexandre Julliard 19 Jul '16

19 Jul '16

Module: wine Branch: master Commit: 970de7df997e29e9aff855ff10772724f17b93b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=970de7df997e29e9aff855ff1… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jul 6 23:35:44 2016 -0600 shell32: Return E_INVALIDARG from FolderItems functions on null output. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelldispatch.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 93c851f..0c1662d 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -1060,6 +1060,9 @@ static HRESULT WINAPI FolderItemsImpl_get_Application(FolderItems3 *iface, IDisp { FIXME("(%p,%p)\n", iface, ppid); + if (!ppid) + return E_INVALIDARG; + return E_NOTIMPL; } @@ -1081,6 +1084,9 @@ static HRESULT WINAPI FolderItemsImpl__NewEnum(FolderItems3 *iface, IUnknown **p { FIXME("(%p,%p)\n", iface, ppunk); + if (!ppunk) + return E_INVALIDARG; + return E_NOTIMPL; } @@ -1102,6 +1108,9 @@ static HRESULT WINAPI FolderItemsImpl_get_Verbs(FolderItems3 *iface, FolderItemV { FIXME("(%p,%p)\n", iface, ppfic); + if (!ppfic) + return E_INVALIDARG; + return E_NOTIMPL; }

1 0

Alex Henrie : shell32: Set output interfaces to NULL in FolderItems functions.
by Alexandre Julliard 19 Jul '16

19 Jul '16

Module: wine Branch: master Commit: a71128513767d44a8f42e10895578b650061bdce URL: http://source.winehq.org/git/wine.git/?a=commit;h=a71128513767d44a8f42e1089… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jul 6 23:35:45 2016 -0600 shell32: Set output interfaces to NULL in FolderItems functions. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelldispatch.c | 9 ++++++++- dlls/shell32/tests/shelldispatch.c | 3 --- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 0c1662d..ac79302 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -1063,12 +1063,16 @@ static HRESULT WINAPI FolderItemsImpl_get_Application(FolderItems3 *iface, IDisp if (!ppid) return E_INVALIDARG; + *ppid = NULL; return E_NOTIMPL; } static HRESULT WINAPI FolderItemsImpl_get_Parent(FolderItems3 *iface, IDispatch **ppid) { - FIXME("(%p,%p)\n", iface, ppid); + TRACE("(%p,%p)\n", iface, ppid); + + if (ppid) + *ppid = NULL; return E_NOTIMPL; } @@ -1077,6 +1081,7 @@ static HRESULT WINAPI FolderItemsImpl_Item(FolderItems3 *iface, VARIANT index, F { FIXME("(%p,%s,%p)\n", iface, debugstr_variant(&index), ppid); + *ppid = NULL; return E_NOTIMPL; } @@ -1087,6 +1092,7 @@ static HRESULT WINAPI FolderItemsImpl__NewEnum(FolderItems3 *iface, IUnknown **p if (!ppunk) return E_INVALIDARG; + *ppunk = NULL; return E_NOTIMPL; } @@ -1111,6 +1117,7 @@ static HRESULT WINAPI FolderItemsImpl_get_Verbs(FolderItems3 *iface, FolderItemV if (!ppfic) return E_INVALIDARG; + *ppfic = NULL; return E_NOTIMPL; } diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index c199549..1f50277 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -370,7 +370,6 @@ todo_wine r = FolderItems_Item(items, var, &item); todo_wine ok(r == S_FALSE, "expected S_FALSE, got %08x\n", r); -todo_wine ok(!item, "item is not null\n"); if (0) /* crashes on xp */ @@ -395,7 +394,6 @@ todo_wine disp = (IDispatch*)0xdeadbeef; r = FolderItems_get_Parent(items, &disp); ok(r == E_NOTIMPL, "expected E_NOTIMPL, got %08x\n", r); -todo_wine ok(!disp, "disp is not null\n"); if (0) /* crashes on xp */ @@ -426,7 +424,6 @@ todo_wine r = FolderItems3_get_Verbs(items3, &verbs); todo_wine ok(r == S_FALSE, "expected S_FALSE, got %08x\n", r); -todo_wine ok(!verbs, "verbs is not null\n"); }

1 0

Iván Matellanes : msvcirt: Implement istream:: getline.
by Alexandre Julliard 19 Jul '16

19 Jul '16

Module: wine Branch: master Commit: a7db5514e57a263fcf7362134c061c0942a8ae88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7db5514e57a263fcf7362134… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Jul 18 16:00:16 2016 +0100 msvcirt: Implement istream::getline. Signed-off-by: Iván Matellanes <matellanes.ivan(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 | 12 +++++-- dlls/msvcirt/tests/msvcirt.c | 80 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 3 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 13b61b6..ae07cd3 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -3244,7 +3244,14 @@ istream* __thiscall istream_get_sb(istream *this, streambuf *sb, char delim) DEFINE_THISCALL_WRAPPER(istream_getline, 16) istream* __thiscall istream_getline(istream *this, char *str, int count, char delim) { - FIXME("(%p %p %d %c) stub\n", this, str, count, delim); + ios *base = istream_get_ios(this); + + TRACE("(%p %p %d %c)\n", this, str, count, delim); + + ios_lock(base); + this->extract_delim++; + istream_get_str_delim(this, str, count, (unsigned char) delim); + ios_unlock(base); return this; } @@ -3253,8 +3260,7 @@ istream* __thiscall istream_getline(istream *this, char *str, int count, char de DEFINE_THISCALL_WRAPPER(istream_getline_unsigned, 16) istream* __thiscall istream_getline_unsigned(istream *this, unsigned char *str, int count, char delim) { - FIXME("(%p %p %d %c) stub\n", this, str, count, delim); - return this; + return istream_getline(this, (char*) str, count, delim); } /* ?ignore(a)istream@@QAEAAV1(a)HH@Z */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 2c0e4d2..d194adc 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -316,6 +316,7 @@ static istream* (*__thiscall p_istream_get_str)(istream*, char*, int, char); static int (*__thiscall p_istream_get)(istream*); static istream* (*__thiscall p_istream_get_char)(istream*, char*); static istream* (*__thiscall p_istream_get_sb)(istream*, streambuf*, char); +static istream* (*__thiscall p_istream_getline)(istream*, char*, int, char); /* Emulate a __thiscall */ #ifdef __i386__ @@ -520,6 +521,7 @@ static BOOL init(void) SET(p_istream_get, "?get(a)istream@@QEAAHXZ"); SET(p_istream_get_char, "?get(a)istream@@QEAAAEAV1(a)AEAD@Z"); SET(p_istream_get_sb, "?get(a)istream@@QEAAAEAV1(a)AEAVstreambuf@@D(a)Z"); + SET(p_istream_getline, "?getline(a)istream@@QEAAAEAV1(a)PEADHD@Z"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2(a)YAPAXI@Z"); p_operator_delete = (void*)GetProcAddress(msvcrt, "??3(a)YAXPAX@Z"); @@ -646,6 +648,7 @@ static BOOL init(void) SET(p_istream_get, "?get(a)istream@@QAEHXZ"); SET(p_istream_get_char, "?get(a)istream@@QAEAAV1(a)AAD@Z"); SET(p_istream_get_sb, "?get(a)istream@@QAEAAV1(a)AAVstreambuf@@D(a)Z"); + SET(p_istream_getline, "?getline(a)istream@@QAEAAV1(a)PADHD@Z"); } SET(p_ios_static_lock, "?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A"); SET(p_ios_lockc, "?lockc(a)ios@@KAXXZ"); @@ -4194,6 +4197,83 @@ if (0) /* crashes on native */ ok(fb2.base.pptr == fb2.base.base + 46, "wrong put pointer, expected %p got %p\n", fb2.base.base + 46, fb2.base.pptr); ok(fb2.base.epptr == fb2.base.ebuf, "wrong put end, expected %p got %p\n", fb2.base.ebuf, fb2.base.epptr); + /* getline */ + is1.extract_delim = is1.count = 0xabababab; + memset(buffer, 'A', sizeof(buffer)); + pis = call_func4(p_istream_getline, &is1, buffer, 10, 0); + ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); + ok(is1.extract_delim == 0, "expected 0 got %d\n", is1.extract_delim); + ok(is1.count == 0, "expected 0 got %d\n", is1.count); + ok(is1.base_ios.state == (IOSTATE_eofbit|IOSTATE_failbit), "expected %d got %d\n", + IOSTATE_eofbit|IOSTATE_failbit, is1.base_ios.state); + ok(buffer[0] == 0, "expected 0 got %d\n", buffer[0]); + is1.extract_delim = is1.count = 0xabababab; + is1.base_ios.state = IOSTATE_goodbit; + memset(buffer, 'A', sizeof(buffer)); + pis = call_func4(p_istream_getline, &is1, buffer, 10, 0); + ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); + ok(is1.extract_delim == 0, "expected 0 got %d\n", is1.extract_delim); + ok(is1.count == 0, "expected 0 got %d\n", is1.count); + ok(is1.base_ios.state == (IOSTATE_eofbit|IOSTATE_failbit), "expected %d got %d\n", + IOSTATE_eofbit|IOSTATE_failbit, is1.base_ios.state); + ok(buffer[0] == 0, "expected 0 got %d\n", buffer[0]); + is1.base_ios.state = IOSTATE_goodbit; + fb1.base.eback = fb1.base.gptr = fb1.base.base; + fb1.base.egptr = fb1.base.base + 30; + memset(buffer, 'A', sizeof(buffer)); + pis = call_func4(p_istream_getline, &is1, buffer, 10, 'r'); + ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); + ok(is1.extract_delim == 0, "expected 0 got %d\n", is1.extract_delim); + ok(is1.count == 7, "expected 7 got %d\n", is1.count); + ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state); + ok(fb1.base.gptr == fb1.base.base + 7, "wrong get pointer, expected %p got %p\n", fb1.base.base + 7, fb1.base.gptr); + ok(!strncmp(buffer, fb1.base.base, 6), "unexpected buffer content, got '%s'\n", buffer); + ok(buffer[6] == 0, "expected 0 got %d\n", buffer[6]); + is1.extract_delim = -1; + memset(buffer, 'A', sizeof(buffer)); + pis = call_func4(p_istream_getline, &is1, buffer, 10, -50); + ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); + ok(is1.extract_delim == 0, "expected 0 got %d\n", is1.extract_delim); + ok(is1.count == 7, "expected 7 got %d\n", is1.count); + ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state); + ok(fb1.base.gptr == fb1.base.base + 14, "wrong get pointer, expected %p got %p\n", fb1.base.base + 14, fb1.base.gptr); + ok(!strncmp(buffer, fb1.base.base + 7, 7), "unexpected buffer content, got '%s'\n", buffer); + ok(buffer[7] == 0, "expected 0 got %d\n", buffer[7]); + is1.extract_delim = -1; + memset(buffer, 'A', sizeof(buffer)); + pis = call_func4(p_istream_getline, &is1, buffer, 10, 206); + ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); + ok(is1.extract_delim == 0, "expected 0 got %d\n", is1.extract_delim); + ok(is1.count == 0, "expected 0 got %d\n", is1.count); + ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state); + ok(fb1.base.gptr == fb1.base.base + 14, "wrong get pointer, expected %p got %p\n", fb1.base.base + 14, fb1.base.gptr); + ok(buffer[0] == 0, "expected 0 got %d\n", buffer[0]); + is1.extract_delim = -2; + memset(buffer, 'A', sizeof(buffer)); + pis = call_func4(p_istream_getline, &is1, buffer, 20, '\r'); + ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); + ok(is1.extract_delim == 0, "expected 0 got %d\n", is1.extract_delim); + ok(is1.count == 10, "expected 10 got %d\n", is1.count); + ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state); + ok(fb1.base.gptr == fb1.base.base + 24, "wrong get pointer, expected %p got %p\n", fb1.base.base + 24, fb1.base.gptr); + ok(!strncmp(buffer, fb1.base.base + 14, 9), "unexpected buffer content, got '%s'\n", buffer); + ok(buffer[9] == 0, "expected 0 got %d\n", buffer[9]); + memset(buffer, 'A', sizeof(buffer)); + pis = call_func4(p_istream_getline, &is1, NULL, 20, '?'); + ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); + ok(is1.extract_delim == 0, "expected 0 got %d\n", is1.extract_delim); + ok(is1.count == 6, "expected 6 got %d\n", is1.count); + ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state); + ok(fb1.base.gptr == fb1.base.base + 30, "wrong get pointer, expected %p got %p\n", fb1.base.base + 30, fb1.base.gptr); + memset(buffer, 'A', sizeof(buffer)); + pis = call_func4(p_istream_getline, &is1, buffer, 0, 0); + ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); + ok(is1.extract_delim == 0, "expected 0 got %d\n", is1.extract_delim); + ok(is1.count == 0, "expected 0 got %d\n", is1.count); + ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state); + ok(fb1.base.gptr == fb1.base.base + 30, "wrong get pointer, expected %p got %p\n", fb1.base.base + 30, fb1.base.gptr); + ok(buffer[0] == 'A', "expected 'A' got %d\n", buffer[0]); + call_func1(p_istream_vbase_dtor, &is1); call_func1(p_istream_vbase_dtor, &is2); call_func1(p_ostream_vbase_dtor, &os);

1 0

Iván Matellanes : msvcirt: Implement istream::ignore.
by Alexandre Julliard 19 Jul '16

19 Jul '16

Module: wine Branch: master Commit: 31e2d23b467371dd3de1158d4fd5b5121dedbde6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31e2d23b467371dd3de1158d4… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Jul 18 16:00:17 2016 +0100 msvcirt: Implement istream::ignore. Signed-off-by: Iván Matellanes <matellanes.ivan(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 | 9 +++++- dlls/msvcirt/tests/msvcirt.c | 72 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 1 deletion(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index ae07cd3..a025aab 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -3268,7 +3268,14 @@ istream* __thiscall istream_getline_unsigned(istream *this, unsigned char *str, DEFINE_THISCALL_WRAPPER(istream_ignore, 12) istream* __thiscall istream_ignore(istream *this, int count, int delim) { - FIXME("(%p %d %d) stub\n", this, count, delim); + ios *base = istream_get_ios(this); + + TRACE("(%p %d %d)\n", this, count, delim); + + ios_lock(base); + this->extract_delim++; + istream_get_str_delim(this, NULL, count + 1, delim); + ios_unlock(base); return this; } diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index d194adc..fdc1e36 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -317,6 +317,7 @@ static int (*__thiscall p_istream_get)(istream*); static istream* (*__thiscall p_istream_get_char)(istream*, char*); static istream* (*__thiscall p_istream_get_sb)(istream*, streambuf*, char); static istream* (*__thiscall p_istream_getline)(istream*, char*, int, char); +static istream* (*__thiscall p_istream_ignore)(istream*, int, int); /* Emulate a __thiscall */ #ifdef __i386__ @@ -522,6 +523,7 @@ static BOOL init(void) SET(p_istream_get_char, "?get(a)istream@@QEAAAEAV1(a)AEAD@Z"); SET(p_istream_get_sb, "?get(a)istream@@QEAAAEAV1(a)AEAVstreambuf@@D(a)Z"); SET(p_istream_getline, "?getline(a)istream@@QEAAAEAV1(a)PEADHD@Z"); + SET(p_istream_ignore, "?ignore(a)istream@@QEAAAEAV1(a)HH@Z"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2(a)YAPAXI@Z"); p_operator_delete = (void*)GetProcAddress(msvcrt, "??3(a)YAXPAX@Z"); @@ -649,6 +651,7 @@ static BOOL init(void) SET(p_istream_get_char, "?get(a)istream@@QAEAAV1(a)AAD@Z"); SET(p_istream_get_sb, "?get(a)istream@@QAEAAV1(a)AAVstreambuf@@D(a)Z"); SET(p_istream_getline, "?getline(a)istream@@QAEAAV1(a)PADHD@Z"); + SET(p_istream_ignore, "?ignore(a)istream@@QAEAAV1(a)HH@Z"); } SET(p_ios_static_lock, "?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A"); SET(p_ios_lockc, "?lockc(a)ios@@KAXXZ"); @@ -4274,6 +4277,75 @@ if (0) /* crashes on native */ ok(fb1.base.gptr == fb1.base.base + 30, "wrong get pointer, expected %p got %p\n", fb1.base.base + 30, fb1.base.gptr); ok(buffer[0] == 'A', "expected 'A' got %d\n", buffer[0]); + /* ignore */ + is1.count = is1.extract_delim = 0xabababab; + is1.base_ios.state = IOSTATE_badbit; + pis = call_func3(p_istream_ignore, &is1, 10, 0); + ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); + ok(is1.extract_delim == 0, "expected 0 got %d\n", is1.extract_delim); + ok(is1.count == 0, "expected 0 got %d\n", is1.count); + ok(is1.base_ios.state == (IOSTATE_badbit|IOSTATE_failbit), "expected %d got %d\n", + IOSTATE_badbit|IOSTATE_failbit, is1.base_ios.state); + ok(fb1.base.gptr == fb1.base.base + 30, "wrong get pointer, expected %p got %p\n", fb1.base.base + 30, fb1.base.gptr); + is1.count = is1.extract_delim = 0xabababab; + is1.base_ios.state = IOSTATE_goodbit; + pis = call_func3(p_istream_ignore, &is1, 0, 0); + ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); + ok(is1.extract_delim == 0, "expected 0 got %d\n", is1.extract_delim); + ok(is1.count == 0, "expected 0 got %d\n", is1.count); + ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state); + ok(fb1.base.gptr == fb1.base.base + 30, "wrong get pointer, expected %p got %p\n", fb1.base.base + 30, fb1.base.gptr); + pis = call_func3(p_istream_ignore, &is1, 1, 0); + ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); + ok(is1.extract_delim == 0, "expected 0 got %d\n", is1.extract_delim); + ok(is1.count == 0, "expected 0 got %d\n", is1.count); + ok(is1.base_ios.state == (IOSTATE_eofbit|IOSTATE_failbit), "expected %d got %d\n", + IOSTATE_eofbit|IOSTATE_failbit, is1.base_ios.state); + ok(fb1.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, fb1.base.gptr); + is1.base_ios.state = IOSTATE_goodbit; + fb1.base.eback = fb1.base.gptr = fb1.base.base; + fb1.base.egptr = fb1.base.base + 30; + pis = call_func3(p_istream_ignore, &is1, 5, -1); + ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); + ok(is1.extract_delim == 0, "expected 0 got %d\n", is1.extract_delim); + ok(is1.count == 5, "expected 5 got %d\n", is1.count); + ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state); + ok(fb1.base.gptr == fb1.base.base + 5, "wrong get pointer, expected %p got %p\n", fb1.base.base + 5, fb1.base.gptr); + is1.extract_delim = 0; + pis = call_func3(p_istream_ignore, &is1, 10, 'g'); + ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); + ok(is1.extract_delim == 0, "expected 0 got %d\n", is1.extract_delim); + ok(is1.count == 4, "expected 4 got %d\n", is1.count); + ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state); + ok(fb1.base.gptr == fb1.base.base + 9, "wrong get pointer, expected %p got %p\n", fb1.base.base + 9, fb1.base.gptr); + is1.extract_delim = -1; + pis = call_func3(p_istream_ignore, &is1, 10, 'a'); + ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); + ok(is1.extract_delim == 0, "expected 0 got %d\n", is1.extract_delim); + ok(is1.count == 3, "expected 3 got %d\n", is1.count); + ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state); + ok(fb1.base.gptr == fb1.base.base + 12, "wrong get pointer, expected %p got %p\n", fb1.base.base + 12, fb1.base.gptr); + is1.extract_delim = -1; + pis = call_func3(p_istream_ignore, &is1, 10, 206); + ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); + ok(is1.extract_delim == 0, "expected 0 got %d\n", is1.extract_delim); + ok(is1.count == 2, "expected 2 got %d\n", is1.count); + ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state); + ok(fb1.base.gptr == fb1.base.base + 14, "wrong get pointer, expected %p got %p\n", fb1.base.base + 14, fb1.base.gptr); + pis = call_func3(p_istream_ignore, &is1, 10, -50); + ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); + ok(is1.extract_delim == 0, "expected 0 got %d\n", is1.extract_delim); + ok(is1.count == 10, "expected 10 got %d\n", is1.count); + ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state); + ok(fb1.base.gptr == fb1.base.base + 24, "wrong get pointer, expected %p got %p\n", fb1.base.base + 24, fb1.base.gptr); + is1.extract_delim = -1; + pis = call_func3(p_istream_ignore, &is1, 10, -1); + ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); + ok(is1.extract_delim == 0, "expected 0 got %d\n", is1.extract_delim); + ok(is1.count == 6, "expected 6 got %d\n", is1.count); + ok(is1.base_ios.state == IOSTATE_eofbit, "expected %d got %d\n", IOSTATE_eofbit, is1.base_ios.state); + ok(fb1.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, fb1.base.gptr); + call_func1(p_istream_vbase_dtor, &is1); call_func1(p_istream_vbase_dtor, &is2); call_func1(p_ostream_vbase_dtor, &os);

1 0

Iván Matellanes : msvcirt: Implement istream::peek.
by Alexandre Julliard 19 Jul '16

19 Jul '16

Module: wine Branch: master Commit: 7fff7ec8bfb5c2f07642cd43fe0edbbbef388e00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fff7ec8bfb5c2f07642cd43f… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Jul 18 16:00:18 2016 +0100 msvcirt: Implement istream::peek. Signed-off-by: Iván Matellanes <matellanes.ivan(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 | 12 ++++++++++-- dlls/msvcirt/tests/msvcirt.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index a025aab..88b6a62 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -3284,8 +3284,16 @@ istream* __thiscall istream_ignore(istream *this, int count, int delim) DEFINE_THISCALL_WRAPPER(istream_peek, 4) int __thiscall istream_peek(istream *this) { - FIXME("(%p) stub\n", this); - return 0; + ios *base = istream_get_ios(this); + int ret = EOF; + + TRACE("(%p)\n", this); + + if (istream_ipfx(this, 1)) { + ret = streambuf_sgetc(base->sb); + istream_isfx(this); + } + return ret; } /* ?putback(a)istream@@QAEAAV1(a)D@Z */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index fdc1e36..f55ad86 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -318,6 +318,7 @@ static istream* (*__thiscall p_istream_get_char)(istream*, char*); static istream* (*__thiscall p_istream_get_sb)(istream*, streambuf*, char); static istream* (*__thiscall p_istream_getline)(istream*, char*, int, char); static istream* (*__thiscall p_istream_ignore)(istream*, int, int); +static int (*__thiscall p_istream_peek)(istream*); /* Emulate a __thiscall */ #ifdef __i386__ @@ -524,6 +525,7 @@ static BOOL init(void) SET(p_istream_get_sb, "?get(a)istream@@QEAAAEAV1(a)AEAVstreambuf@@D(a)Z"); SET(p_istream_getline, "?getline(a)istream@@QEAAAEAV1(a)PEADHD@Z"); SET(p_istream_ignore, "?ignore(a)istream@@QEAAAEAV1(a)HH@Z"); + SET(p_istream_peek, "?peek(a)istream@@QEAAHXZ"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2(a)YAPAXI@Z"); p_operator_delete = (void*)GetProcAddress(msvcrt, "??3(a)YAXPAX@Z"); @@ -652,6 +654,7 @@ static BOOL init(void) SET(p_istream_get_sb, "?get(a)istream@@QAEAAV1(a)AAVstreambuf@@D(a)Z"); SET(p_istream_getline, "?getline(a)istream@@QAEAAV1(a)PADHD@Z"); SET(p_istream_ignore, "?ignore(a)istream@@QAEAAV1(a)HH@Z"); + SET(p_istream_peek, "?peek(a)istream@@QAEHXZ"); } SET(p_ios_static_lock, "?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A"); SET(p_ios_lockc, "?lockc(a)ios@@KAXXZ"); @@ -4346,6 +4349,42 @@ if (0) /* crashes on native */ ok(is1.base_ios.state == IOSTATE_eofbit, "expected %d got %d\n", IOSTATE_eofbit, is1.base_ios.state); ok(fb1.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, fb1.base.gptr); + /* peek */ + is1.count = 0xabababab; + ret = (int) call_func1(p_istream_peek, &is1); + ok(ret == EOF, "expected -1 got %d\n", ret); + ok(is1.count == 0, "expected 0 got %d\n", is1.count); + ok(is1.base_ios.state == (IOSTATE_eofbit|IOSTATE_failbit), "expected %d got %d\n", + IOSTATE_eofbit|IOSTATE_failbit, is1.base_ios.state); + is1.count = 0xabababab; + is1.base_ios.state = IOSTATE_goodbit; + ret = (int) call_func1(p_istream_peek, &is1); + ok(ret == EOF, "expected -1 got %d\n", ret); + ok(is1.count == 0, "expected 0 got %d\n", is1.count); + ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state); + ok(fb1.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, fb1.base.gptr); + fb1.base.eback = fb1.base.gptr = fb1.base.base; + fb1.base.egptr = fb1.base.base + 30; + ret = (int) call_func1(p_istream_peek, &is1); + ok(ret == ' ', "expected ' ' got %d\n", ret); + ok(is1.count == 0, "expected 0 got %d\n", is1.count); + ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state); + ok(fb1.base.gptr == fb1.base.base, "wrong get pointer, expected %p got %p\n", fb1.base.base, fb1.base.gptr); +if (0) /* crashes on native */ + is1.base_ios.sb = NULL; + fb1.base.gptr = fb1.base.base + 14; + ret = (int) call_func1(p_istream_peek, &is1); + ok(ret == 206, "expected 206 got %d\n", ret); + ok(is1.count == 0, "expected 0 got %d\n", is1.count); + ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state); + ok(fb1.base.gptr == fb1.base.base + 14, "wrong get pointer, expected %p got %p\n", fb1.base.base + 14, fb1.base.gptr); + fb1.base.gptr = fb1.base.base + 30; + ret = (int) call_func1(p_istream_peek, &is1); + ok(ret == EOF, "expected -1 got %d\n", ret); + ok(is1.count == 0, "expected 0 got %d\n", is1.count); + ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state); + ok(fb1.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, fb1.base.gptr); + call_func1(p_istream_vbase_dtor, &is1); call_func1(p_istream_vbase_dtor, &is2); call_func1(p_ostream_vbase_dtor, &os);

1 0

Iván Matellanes : msvcirt: Implement istream:: putback.
by Alexandre Julliard 19 Jul '16

19 Jul '16

Module: wine Branch: master Commit: 25a02cc4a9c6e893a62a4855ea6eb4633f204804 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25a02cc4a9c6e893a62a4855e… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Jul 18 16:00:19 2016 +0100 msvcirt: Implement istream::putback. Signed-off-by: Iván Matellanes <matellanes.ivan(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 | 11 ++++++++++- dlls/msvcirt/tests/msvcirt.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 1 deletion(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 88b6a62..2e3a308 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -3301,7 +3301,16 @@ int __thiscall istream_peek(istream *this) DEFINE_THISCALL_WRAPPER(istream_putback, 8) istream* __thiscall istream_putback(istream *this, char ch) { - FIXME("(%p %c) stub\n", this, ch); + ios *base = istream_get_ios(this); + + TRACE("(%p %c)\n", this, ch); + + if (ios_good(base)) { + ios_lockbuf(base); + if (streambuf_sputbackc(base->sb, ch) == EOF) + ios_clear(base, base->state | IOSTATE_failbit); + ios_unlockbuf(base); + } return this; } diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index f55ad86..4c83297 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -319,6 +319,7 @@ static istream* (*__thiscall p_istream_get_sb)(istream*, streambuf*, char); static istream* (*__thiscall p_istream_getline)(istream*, char*, int, char); static istream* (*__thiscall p_istream_ignore)(istream*, int, int); static int (*__thiscall p_istream_peek)(istream*); +static istream* (*__thiscall p_istream_putback)(istream*, char); /* Emulate a __thiscall */ #ifdef __i386__ @@ -526,6 +527,7 @@ static BOOL init(void) SET(p_istream_getline, "?getline(a)istream@@QEAAAEAV1(a)PEADHD@Z"); SET(p_istream_ignore, "?ignore(a)istream@@QEAAAEAV1(a)HH@Z"); SET(p_istream_peek, "?peek(a)istream@@QEAAHXZ"); + SET(p_istream_putback, "?putback(a)istream@@QEAAAEAV1(a)D@Z"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2(a)YAPAXI@Z"); p_operator_delete = (void*)GetProcAddress(msvcrt, "??3(a)YAXPAX@Z"); @@ -655,6 +657,7 @@ static BOOL init(void) SET(p_istream_getline, "?getline(a)istream@@QAEAAV1(a)PADHD@Z"); SET(p_istream_ignore, "?ignore(a)istream@@QAEAAV1(a)HH@Z"); SET(p_istream_peek, "?peek(a)istream@@QAEHXZ"); + SET(p_istream_putback, "?putback(a)istream@@QAEAAV1(a)D@Z"); } SET(p_ios_static_lock, "?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A"); SET(p_ios_lockc, "?lockc(a)ios@@KAXXZ"); @@ -4385,6 +4388,44 @@ if (0) /* crashes on native */ ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state); ok(fb1.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, fb1.base.gptr); + /* putback */ + is1.base_ios.state = IOSTATE_goodbit; + pis = call_func2(p_istream_putback, &is1, 'a'); + ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); + ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state); + ok(fb1.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, fb1.base.gptr); + fd = fb1.fd; + fb1.fd = -1; + pis = call_func2(p_istream_putback, &is1, 'a'); + ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); + ok(is1.base_ios.state == IOSTATE_failbit, "expected %d got %d\n", IOSTATE_failbit, is1.base_ios.state); + fb1.fd = fd; + fb1.base.eback = fb1.base.base; + fb1.base.gptr = fb1.base.base + 15; + fb1.base.egptr = fb1.base.base + 30; + pis = call_func2(p_istream_putback, &is1, -40); + ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); + ok(is1.base_ios.state == IOSTATE_failbit, "expected %d got %d\n", IOSTATE_failbit, is1.base_ios.state); + ok(fb1.base.gptr == fb1.base.base + 15, "wrong get pointer, expected %p got %p\n", fb1.base.base + 15, fb1.base.gptr); + is1.base_ios.state = IOSTATE_badbit; + pis = call_func2(p_istream_putback, &is1, -40); + ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); + ok(is1.base_ios.state == IOSTATE_badbit, "expected %d got %d\n", IOSTATE_badbit, is1.base_ios.state); + ok(fb1.base.gptr == fb1.base.base + 15, "wrong get pointer, expected %p got %p\n", fb1.base.base + 15, fb1.base.gptr); + is1.base_ios.state = IOSTATE_eofbit; + pis = call_func2(p_istream_putback, &is1, -40); + ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); + ok(is1.base_ios.state == IOSTATE_eofbit, "expected %d got %d\n", IOSTATE_eofbit, is1.base_ios.state); + ok(fb1.base.gptr == fb1.base.base + 15, "wrong get pointer, expected %p got %p\n", fb1.base.base + 15, fb1.base.gptr); + is1.base_ios.state = IOSTATE_goodbit; +if (0) /* crashes on native */ + is1.base_ios.sb = NULL; + pis = call_func2(p_istream_putback, &is1, -40); + ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); + ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state); + ok(fb1.base.gptr == fb1.base.base + 14, "wrong get pointer, expected %p got %p\n", fb1.base.base + 14, fb1.base.gptr); + ok(*fb1.base.gptr == -40, "expected -40 got %d\n", *fb1.base.gptr); + call_func1(p_istream_vbase_dtor, &is1); call_func1(p_istream_vbase_dtor, &is2); call_func1(p_ostream_vbase_dtor, &os);

1 0

Iván Matellanes : msvcirt: Implement istream::read.
by Alexandre Julliard 19 Jul '16

19 Jul '16

Module: wine Branch: master Commit: e6be6283b6e5c7dda7447ea7fc01f958470be98f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6be6283b6e5c7dda7447ea7f… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Jul 18 16:00:20 2016 +0100 msvcirt: Implement istream::read. Signed-off-by: Iván Matellanes <matellanes.ivan(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 | 69 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 3 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 2e3a308..f016328 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -3321,7 +3321,15 @@ istream* __thiscall istream_putback(istream *this, char ch) DEFINE_THISCALL_WRAPPER(istream_read, 12) istream* __thiscall istream_read(istream *this, char *str, int count) { - FIXME("(%p %p %d) stub\n", this, str, count); + ios *base = istream_get_ios(this); + + TRACE("(%p %p %d)\n", this, str, count); + + if (istream_ipfx(this, 1)) { + if ((this->count = streambuf_sgetn(base->sb, str, count)) != count) + base->state = IOSTATE_eofbit | IOSTATE_failbit; + istream_isfx(this); + } return this; } @@ -3330,8 +3338,7 @@ istream* __thiscall istream_read(istream *this, char *str, int count) DEFINE_THISCALL_WRAPPER(istream_read_unsigned, 12) istream* __thiscall istream_read_unsigned(istream *this, unsigned char *str, int count) { - FIXME("(%p %p %d) stub\n", this, str, count); - return this; + return istream_read(this, (char*) str, count); } /* ?seekg(a)istream@@QAEAAV1(a)J@Z */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 4c83297..28f5dbf 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -320,6 +320,7 @@ static istream* (*__thiscall p_istream_getline)(istream*, char*, int, char); static istream* (*__thiscall p_istream_ignore)(istream*, int, int); static int (*__thiscall p_istream_peek)(istream*); static istream* (*__thiscall p_istream_putback)(istream*, char); +static istream* (*__thiscall p_istream_read)(istream*, char*, int); /* Emulate a __thiscall */ #ifdef __i386__ @@ -528,6 +529,7 @@ static BOOL init(void) SET(p_istream_ignore, "?ignore(a)istream@@QEAAAEAV1(a)HH@Z"); SET(p_istream_peek, "?peek(a)istream@@QEAAHXZ"); SET(p_istream_putback, "?putback(a)istream@@QEAAAEAV1(a)D@Z"); + SET(p_istream_read, "?read(a)istream@@QEAAAEAV1(a)PEADH@Z"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2(a)YAPAXI@Z"); p_operator_delete = (void*)GetProcAddress(msvcrt, "??3(a)YAXPAX@Z"); @@ -658,6 +660,7 @@ static BOOL init(void) SET(p_istream_ignore, "?ignore(a)istream@@QAEAAV1(a)HH@Z"); SET(p_istream_peek, "?peek(a)istream@@QAEHXZ"); SET(p_istream_putback, "?putback(a)istream@@QAEAAV1(a)D@Z"); + SET(p_istream_read, "?read(a)istream@@QAEAAV1(a)PADH@Z"); } SET(p_ios_static_lock, "?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A"); SET(p_ios_lockc, "?lockc(a)ios@@KAXXZ"); @@ -4426,6 +4429,72 @@ if (0) /* crashes on native */ ok(fb1.base.gptr == fb1.base.base + 14, "wrong get pointer, expected %p got %p\n", fb1.base.base + 14, fb1.base.gptr); ok(*fb1.base.gptr == -40, "expected -40 got %d\n", *fb1.base.gptr); + /* read */ + is1.extract_delim = is1.count = 0xabababab; + is1.base_ios.state = IOSTATE_badbit; + memset(buffer, 'A', sizeof(buffer)); + pis = call_func3(p_istream_read, &is1, buffer, 10); + ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); + ok(is1.count == 0, "expected 0 got %d\n", is1.count); + ok(is1.base_ios.state == (IOSTATE_badbit|IOSTATE_failbit), "expected %d got %d\n", + IOSTATE_badbit|IOSTATE_failbit, is1.base_ios.state); + ok(buffer[0] == 'A', "expected 'A' got %d\n", buffer[0]); + is1.base_ios.state = IOSTATE_goodbit; + fb1.base.gptr = fb1.base.base; + memset(buffer, 'A', sizeof(buffer)); + pis = call_func3(p_istream_read, &is1, buffer, 10); + ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); + ok(is1.count == 10, "expected 10 got %d\n", is1.count); + ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state); + ok(fb1.base.gptr == fb1.base.base + 10, "wrong get pointer, expected %p got %p\n", fb1.base.base + 10, fb1.base.gptr); + ok(!strncmp(buffer, fb1.base.base, 10), "unexpected buffer content, got '%s'\n", buffer); + ok(buffer[10] == 'A', "expected 'A' got %d\n", buffer[10]); + memset(buffer, 'A', sizeof(buffer)); + pis = call_func3(p_istream_read, &is1, buffer, 20); + ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); + ok(is1.count == 20, "expected 20 got %d\n", is1.count); + ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state); + ok(fb1.base.gptr == fb1.base.base + 30, "wrong get pointer, expected %p got %p\n", fb1.base.base + 30, fb1.base.gptr); + ok(!strncmp(buffer, fb1.base.base + 10, 20), "unexpected buffer content, got '%s'\n", buffer); + ok(buffer[4] == -40, "expected -40 got %d\n", buffer[4]); + ok(buffer[20] == 'A', "expected 'A' got %d\n", buffer[20]); + memset(buffer, 'A', sizeof(buffer)); + pis = call_func3(p_istream_read, &is1, buffer, 5); + ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); + ok(is1.count == 1, "expected 1 got %d\n", is1.count); + ok(is1.base_ios.state == (IOSTATE_eofbit|IOSTATE_failbit), "expected %d got %d\n", + IOSTATE_eofbit|IOSTATE_failbit, is1.base_ios.state); + ok(fb1.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, fb1.base.gptr); + ok(buffer[0] == 'e', "expected 'e' got %d\n", buffer[0]); + ok(buffer[1] == 'A', "expected 'A' got %d\n", buffer[1]); + is1.base_ios.state = IOSTATE_goodbit; + fb1.base.eback = fb1.base.gptr = fb1.base.base; + fb1.base.egptr = fb1.base.base + 30; + memset(buffer, 'A', sizeof(buffer)); + pis = call_func3(p_istream_read, &is1, buffer, 35); + ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); + ok(is1.count == 30, "expected 30 got %d\n", is1.count); + ok(is1.base_ios.state == (IOSTATE_eofbit|IOSTATE_failbit), "expected %d got %d\n", + IOSTATE_eofbit|IOSTATE_failbit, is1.base_ios.state); + ok(fb1.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, fb1.base.gptr); + ok(!strncmp(buffer, fb1.base.base, 30), "unexpected buffer content, got '%s'\n", buffer); + ok(buffer[30] == 'A', "expected 'A' got %d\n", buffer[30]); +if (0) /* crashes on native */ + is1.base_ios.sb = NULL; + is1.base_ios.state = IOSTATE_goodbit; + fb1.base.eback = fb1.base.gptr = fb1.base.base; + fb1.base.egptr = fb1.base.base + 30; + memset(buffer, 'A', sizeof(buffer)); +if (0) /* crashes on native */ + pis = call_func3(p_istream_read, &is1, buffer, -1); + pis = call_func3(p_istream_read, &is1, buffer, 0); + ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); + ok(is1.count == 0, "expected 0 got %d\n", is1.count); + ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state); + ok(fb1.base.gptr == fb1.base.base, "wrong get pointer, expected %p got %p\n", fb1.base.base, fb1.base.gptr); + ok(buffer[0] == 'A', "expected 'A' got %d\n", buffer[0]); + fb1.base.gptr = fb1.base.egptr; + call_func1(p_istream_vbase_dtor, &is1); call_func1(p_istream_vbase_dtor, &is2); call_func1(p_ostream_vbase_dtor, &os);

1 0

Nikolay Sivov : dwrite: Implement SetTrimming() for layout.
by Alexandre Julliard 19 Jul '16

19 Jul '16

Module: wine Branch: master Commit: e5fb775142511c0035fd86d3ed4f612fa1e2ccf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5fb775142511c0035fd86d3e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 19 00:10:36 2016 +0300 dwrite: Implement SetTrimming() for layout. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 46 +++++++++++++++++++++++++++++++--------- dlls/dwrite/tests/layout.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+), 10 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index d292764..a9c0572 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -411,6 +411,30 @@ static inline HRESULT format_set_flowdirection(struct dwrite_textformat_data *fo return S_OK; } +static inline HRESULT format_set_trimming(struct dwrite_textformat_data *format, + DWRITE_TRIMMING const *trimming, IDWriteInlineObject *trimming_sign, BOOL *changed) +{ + if (changed) + *changed = FALSE; + + if ((UINT32)trimming->granularity > DWRITE_TRIMMING_GRANULARITY_WORD) + return E_INVALIDARG; + + if (changed) { + *changed = !!memcmp(&format->trimming, trimming, sizeof(*trimming)); + if (format->trimmingsign != trimming_sign) + *changed = TRUE; + } + + format->trimming = *trimming; + if (format->trimmingsign) + IDWriteInlineObject_Release(format->trimmingsign); + format->trimmingsign = trimming_sign; + if (format->trimmingsign) + IDWriteInlineObject_AddRef(format->trimmingsign); + return S_OK; +} + static inline HRESULT format_set_linespacing(struct dwrite_textformat_data *format, DWRITE_LINE_SPACING_METHOD method, FLOAT spacing, FLOAT baseline, BOOL *changed) { @@ -3855,8 +3879,17 @@ static HRESULT WINAPI dwritetextformat_layout_SetTrimming(IDWriteTextFormat1 *if IDWriteInlineObject *trimming_sign) { struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat1(iface); - FIXME("(%p)->(%p %p): stub\n", This, trimming, trimming_sign); - return E_NOTIMPL; + BOOL changed; + HRESULT hr; + + TRACE("(%p)->(%p %p)\n", This, trimming, trimming_sign); + + hr = format_set_trimming(&This->format, trimming, trimming_sign, &changed); + + if (changed) + This->recompute |= RECOMPUTE_LINES; + + return hr; } static HRESULT WINAPI dwritetextformat_layout_SetLineSpacing(IDWriteTextFormat1 *iface, DWRITE_LINE_SPACING_METHOD method, @@ -4839,14 +4872,7 @@ static HRESULT WINAPI dwritetextformat_SetTrimming(IDWriteTextFormat2 *iface, DW { struct dwrite_textformat *This = impl_from_IDWriteTextFormat2(iface); TRACE("(%p)->(%p %p)\n", This, trimming, trimming_sign); - - This->format.trimming = *trimming; - if (This->format.trimmingsign) - IDWriteInlineObject_Release(This->format.trimmingsign); - This->format.trimmingsign = trimming_sign; - if (This->format.trimmingsign) - IDWriteInlineObject_AddRef(This->format.trimmingsign); - return S_OK; + return format_set_trimming(&This->format, trimming, trimming_sign, NULL); } static HRESULT WINAPI dwritetextformat_SetLineSpacing(IDWriteTextFormat2 *iface, DWRITE_LINE_SPACING_METHOD method, diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 689b3b4..9f3b8c3 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1069,6 +1069,13 @@ if (0) /* crashes on native */ hr = IDWriteTextFormat_SetTrimming(format, &trimming, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); + /* invalid granularity */ + trimming.granularity = 10; + trimming.delimiter = 0; + trimming.delimiterCount = 0; + hr = IDWriteTextFormat_SetTrimming(format, &trimming, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + IDWriteTextFormat_Release(format); IDWriteFactory_Release(factory); } @@ -1771,13 +1778,17 @@ static void test_GetClusterMetrics(void) static const WCHAR str4W[] = {'a',' ',0}; DWRITE_INLINE_OBJECT_METRICS inline_metrics; DWRITE_CLUSTER_METRICS metrics[22]; + DWRITE_TEXT_METRICS text_metrics; + DWRITE_TRIMMING trimming_options; IDWriteTextLayout1 *layout1; IDWriteInlineObject *trimm; IDWriteTextFormat *format; IDWriteTextLayout *layout; + DWRITE_LINE_METRICS line; DWRITE_TEXT_RANGE range; IDWriteFactory *factory; UINT32 count, i; + FLOAT width; HRESULT hr; factory = create_factory(); @@ -2121,6 +2132,47 @@ todo_wine IDWriteTextLayout_Release(layout); + /* trigger line trimming */ + hr = IDWriteFactory_CreateTextLayout(factory, strW, lstrlenW(strW), format, 100.0f, 200.0f, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + count = 0; + memset(metrics, 0, sizeof(metrics)); + hr = IDWriteTextLayout_GetClusterMetrics(layout, metrics, 4, &count); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count == 4, "got %u\n", count); + + hr = IDWriteTextLayout_GetMetrics(layout, &text_metrics); + ok(hr == S_OK, "got 0x%08x\n", hr); + + width = metrics[0].width + inline_metrics.width; + ok(width < text_metrics.width, "unexpected trimming sign width\n"); + + /* enable trimming, reduce layout width so only first cluster and trimming sign fits */ + trimming_options.granularity = DWRITE_TRIMMING_GRANULARITY_CHARACTER; + trimming_options.delimiter = 0; + trimming_options.delimiterCount = 0; + hr = IDWriteTextLayout_SetTrimming(layout, &trimming_options, trimm); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteTextLayout_SetMaxWidth(layout, width); + ok(hr == S_OK, "got 0x%08x\n", hr); + + count = 0; + memset(metrics, 0, sizeof(metrics)); + hr = IDWriteTextLayout_GetClusterMetrics(layout, metrics, 4, &count); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count == 4, "got %u\n", count); + + hr = IDWriteTextLayout_GetLineMetrics(layout, &line, 1, &count); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count == 1, "got %u\n", count); +todo_wine + ok(line.length == 4, "got %u\n", line.length); + ok(line.isTrimmed, "got %d\n", line.isTrimmed); + + IDWriteTextLayout_Release(layout); + IDWriteInlineObject_Release(trimm); IDWriteTextFormat_Release(format); IDWriteFactory_Release(factory);

1 0

Sebastian Lackner : kernel32/tests: Use inline implementation of NtCurrentTeb for process tests.
by Alexandre Julliard 19 Jul '16

19 Jul '16

Module: wine Branch: master Commit: 225498662eb7146ecc170e6f5e33b9b92edefb28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=225498662eb7146ecc170e6f5… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jul 18 16:24:59 2016 +0200 kernel32/tests: Use inline implementation of NtCurrentTeb for process tests. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index ad7885c..8a135ef 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -70,7 +70,6 @@ static BOOL (WINAPI *pVirtualFreeEx)(HANDLE, LPVOID, SIZE_T, DWORD); static BOOL (WINAPI *pQueryFullProcessImageNameA)(HANDLE hProcess, DWORD dwFlags, LPSTR lpExeName, PDWORD lpdwSize); static BOOL (WINAPI *pQueryFullProcessImageNameW)(HANDLE hProcess, DWORD dwFlags, LPWSTR lpExeName, PDWORD lpdwSize); static DWORD (WINAPI *pK32GetProcessImageFileNameA)(HANDLE,LPSTR,DWORD); -static struct _TEB * (WINAPI *pNtCurrentTeb)(void); static HANDLE (WINAPI *pCreateJobObjectW)(LPSECURITY_ATTRIBUTES sa, LPCWSTR name); static BOOL (WINAPI *pAssignProcessToJobObject)(HANDLE job, HANDLE process); static BOOL (WINAPI *pIsProcessInJob)(HANDLE process, HANDLE job, PBOOL result); @@ -226,7 +225,6 @@ static BOOL init(void) hkernel32 = GetModuleHandleA("kernel32"); hntdll = GetModuleHandleA("ntdll.dll"); - pNtCurrentTeb = (void *)GetProcAddress(hntdll, "NtCurrentTeb"); pNtQueryInformationProcess = (void *)GetProcAddress(hntdll, "NtQueryInformationProcess"); pGetNativeSystemInfo = (void *) GetProcAddress(hkernel32, "GetNativeSystemInfo"); @@ -297,6 +295,7 @@ static void WINETEST_PRINTF_ATTR(2,3) childPrintf(HANDLE h, const char* fmt, ... */ static void doChild(const char* file, const char* option) { + RTL_USER_PROCESS_PARAMETERS *params = NtCurrentTeb()->Peb->ProcessParameters; STARTUPINFOA siA; STARTUPINFOW siW; int i; @@ -325,15 +324,10 @@ static void doChild(const char* file, const char* option) siA.dwFlags, siA.wShowWindow, (DWORD_PTR)siA.hStdInput, (DWORD_PTR)siA.hStdOutput, (DWORD_PTR)siA.hStdError); - if (pNtCurrentTeb) - { - RTL_USER_PROCESS_PARAMETERS *params = pNtCurrentTeb()->Peb->ProcessParameters; - - /* check the console handles in the TEB */ - childPrintf(hFile, "[TEB]\nhStdInput=%lu\nhStdOutput=%lu\nhStdError=%lu\n\n", - (DWORD_PTR)params->hStdInput, (DWORD_PTR)params->hStdOutput, - (DWORD_PTR)params->hStdError); - } + /* check the console handles in the TEB */ + childPrintf(hFile, "[TEB]\nhStdInput=%lu\nhStdOutput=%lu\nhStdError=%lu\n\n", + (DWORD_PTR)params->hStdInput, (DWORD_PTR)params->hStdOutput, + (DWORD_PTR)params->hStdError); /* since GetStartupInfoW is only implemented in win2k, * zero out before calling so we can notice the difference @@ -2874,12 +2868,6 @@ static void test_StartupNoConsole(void) STARTUPINFOA startup; PROCESS_INFORMATION info; - if (!pNtCurrentTeb) - { - win_skip( "NtCurrentTeb not supported\n" ); - return; - } - memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); startup.dwFlags = STARTF_USESHOWWINDOW;

1 0

Sebastian Lackner : vcomp: Implement 16-bit atomic instructions.
by Alexandre Julliard 19 Jul '16

19 Jul '16

Module: wine Branch: master Commit: 284058073d7856b778181eb37b06c7f7561d6ed1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=284058073d7856b778181eb37… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jul 18 16:05:41 2016 +0200 vcomp: Implement 16-bit atomic instructions. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/main.c | 115 ++++++++++++++++++++++++++++++++++++++++++++ dlls/vcomp/vcomp.spec | 22 ++++----- dlls/vcomp100/vcomp100.spec | 22 ++++----- dlls/vcomp110/vcomp110.spec | 22 ++++----- dlls/vcomp120/vcomp120.spec | 22 ++++----- dlls/vcomp90/vcomp90.spec | 22 ++++----- 6 files changed, 170 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=284058073d7856b778181…

1 0