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

Matteo Bruni : ddraw: Use a union in tss_lookup. (Coverity).
by Alexandre Julliard 20 Jul '16

20 Jul '16

Module: wine Branch: master Commit: 96eb4242cc98166afa58e012062f516ca6b51da8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96eb4242cc98166afa58e0120… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jul 20 00:33:28 2016 +0200 ddraw: Use a union in tss_lookup. (Coverity). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 64 ++++++++++++++++++++++++++++------------------------- 1 file changed, 34 insertions(+), 30 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index ec71a7c..2f79c4c 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4776,35 +4776,39 @@ static HRESULT WINAPI d3d_device3_SetTexture(IDirect3DDevice3 *iface, static const struct tss_lookup { BOOL sampler_state; - enum wined3d_texture_stage_state state; + union + { + enum wined3d_texture_stage_state texture_state; + enum wined3d_sampler_state sampler_state; + } u; } tss_lookup[] = { - {FALSE, WINED3D_TSS_INVALID}, /* 0, unused */ - {FALSE, WINED3D_TSS_COLOR_OP}, /* 1, D3DTSS_COLOROP */ - {FALSE, WINED3D_TSS_COLOR_ARG1}, /* 2, D3DTSS_COLORARG1 */ - {FALSE, WINED3D_TSS_COLOR_ARG2}, /* 3, D3DTSS_COLORARG2 */ - {FALSE, WINED3D_TSS_ALPHA_OP}, /* 4, D3DTSS_ALPHAOP */ - {FALSE, WINED3D_TSS_ALPHA_ARG1}, /* 5, D3DTSS_ALPHAARG1 */ - {FALSE, WINED3D_TSS_ALPHA_ARG2}, /* 6, D3DTSS_ALPHAARG2 */ - {FALSE, WINED3D_TSS_BUMPENV_MAT00}, /* 7, D3DTSS_BUMPENVMAT00 */ - {FALSE, WINED3D_TSS_BUMPENV_MAT01}, /* 8, D3DTSS_BUMPENVMAT01 */ - {FALSE, WINED3D_TSS_BUMPENV_MAT10}, /* 9, D3DTSS_BUMPENVMAT10 */ - {FALSE, WINED3D_TSS_BUMPENV_MAT11}, /* 10, D3DTSS_BUMPENVMAT11 */ - {FALSE, WINED3D_TSS_TEXCOORD_INDEX}, /* 11, D3DTSS_TEXCOORDINDEX */ - {TRUE, WINED3D_SAMP_ADDRESS_U}, /* 12, D3DTSS_ADDRESS */ - {TRUE, WINED3D_SAMP_ADDRESS_U}, /* 13, D3DTSS_ADDRESSU */ - {TRUE, WINED3D_SAMP_ADDRESS_V}, /* 14, D3DTSS_ADDRESSV */ - {TRUE, WINED3D_SAMP_BORDER_COLOR}, /* 15, D3DTSS_BORDERCOLOR */ - {TRUE, WINED3D_SAMP_MAG_FILTER}, /* 16, D3DTSS_MAGFILTER */ - {TRUE, WINED3D_SAMP_MIN_FILTER}, /* 17, D3DTSS_MINFILTER */ - {TRUE, WINED3D_SAMP_MIP_FILTER}, /* 18, D3DTSS_MIPFILTER */ - {TRUE, WINED3D_SAMP_MIPMAP_LOD_BIAS}, /* 19, D3DTSS_MIPMAPLODBIAS */ - {TRUE, WINED3D_SAMP_MAX_MIP_LEVEL}, /* 20, D3DTSS_MAXMIPLEVEL */ - {TRUE, WINED3D_SAMP_MAX_ANISOTROPY}, /* 21, D3DTSS_MAXANISOTROPY */ - {FALSE, WINED3D_TSS_BUMPENV_LSCALE}, /* 22, D3DTSS_BUMPENVLSCALE */ - {FALSE, WINED3D_TSS_BUMPENV_LOFFSET}, /* 23, D3DTSS_BUMPENVLOFFSET */ - {FALSE, WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS}, /* 24, D3DTSS_TEXTURETRANSFORMFLAGS */ + {FALSE, {WINED3D_TSS_INVALID}}, /* 0, unused */ + {FALSE, {WINED3D_TSS_COLOR_OP}}, /* 1, D3DTSS_COLOROP */ + {FALSE, {WINED3D_TSS_COLOR_ARG1}}, /* 2, D3DTSS_COLORARG1 */ + {FALSE, {WINED3D_TSS_COLOR_ARG2}}, /* 3, D3DTSS_COLORARG2 */ + {FALSE, {WINED3D_TSS_ALPHA_OP}}, /* 4, D3DTSS_ALPHAOP */ + {FALSE, {WINED3D_TSS_ALPHA_ARG1}}, /* 5, D3DTSS_ALPHAARG1 */ + {FALSE, {WINED3D_TSS_ALPHA_ARG2}}, /* 6, D3DTSS_ALPHAARG2 */ + {FALSE, {WINED3D_TSS_BUMPENV_MAT00}}, /* 7, D3DTSS_BUMPENVMAT00 */ + {FALSE, {WINED3D_TSS_BUMPENV_MAT01}}, /* 8, D3DTSS_BUMPENVMAT01 */ + {FALSE, {WINED3D_TSS_BUMPENV_MAT10}}, /* 9, D3DTSS_BUMPENVMAT10 */ + {FALSE, {WINED3D_TSS_BUMPENV_MAT11}}, /* 10, D3DTSS_BUMPENVMAT11 */ + {FALSE, {WINED3D_TSS_TEXCOORD_INDEX}}, /* 11, D3DTSS_TEXCOORDINDEX */ + {TRUE, {WINED3D_SAMP_ADDRESS_U}}, /* 12, D3DTSS_ADDRESS */ + {TRUE, {WINED3D_SAMP_ADDRESS_U}}, /* 13, D3DTSS_ADDRESSU */ + {TRUE, {WINED3D_SAMP_ADDRESS_V}}, /* 14, D3DTSS_ADDRESSV */ + {TRUE, {WINED3D_SAMP_BORDER_COLOR}}, /* 15, D3DTSS_BORDERCOLOR */ + {TRUE, {WINED3D_SAMP_MAG_FILTER}}, /* 16, D3DTSS_MAGFILTER */ + {TRUE, {WINED3D_SAMP_MIN_FILTER}}, /* 17, D3DTSS_MINFILTER */ + {TRUE, {WINED3D_SAMP_MIP_FILTER}}, /* 18, D3DTSS_MIPFILTER */ + {TRUE, {WINED3D_SAMP_MIPMAP_LOD_BIAS}}, /* 19, D3DTSS_MIPMAPLODBIAS */ + {TRUE, {WINED3D_SAMP_MAX_MIP_LEVEL}}, /* 20, D3DTSS_MAXMIPLEVEL */ + {TRUE, {WINED3D_SAMP_MAX_ANISOTROPY}}, /* 21, D3DTSS_MAXANISOTROPY */ + {FALSE, {WINED3D_TSS_BUMPENV_LSCALE}}, /* 22, D3DTSS_BUMPENVLSCALE */ + {FALSE, {WINED3D_TSS_BUMPENV_LOFFSET}}, /* 23, D3DTSS_BUMPENVLOFFSET */ + {FALSE, {WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS}}, /* 24, D3DTSS_TEXTURETRANSFORMFLAGS */ }; /***************************************************************************** @@ -4849,7 +4853,7 @@ static HRESULT d3d_device7_GetTextureStageState(IDirect3DDevice7 *iface, if (l->sampler_state) { - *value = wined3d_device_get_sampler_state(device->wined3d_device, stage, l->state); + *value = wined3d_device_get_sampler_state(device->wined3d_device, stage, l->u.sampler_state); switch (state) { @@ -4909,7 +4913,7 @@ static HRESULT d3d_device7_GetTextureStageState(IDirect3DDevice7 *iface, } else { - *value = wined3d_device_get_texture_stage_state(device->wined3d_device, stage, l->state); + *value = wined3d_device_get_texture_stage_state(device->wined3d_device, stage, l->u.texture_state); } wined3d_mutex_unlock(); @@ -5047,11 +5051,11 @@ static HRESULT d3d_device7_SetTextureStageState(IDirect3DDevice7 *iface, break; } - wined3d_device_set_sampler_state(device->wined3d_device, stage, l->state, value); + wined3d_device_set_sampler_state(device->wined3d_device, stage, l->u.sampler_state, value); } else { - wined3d_device_set_texture_stage_state(device->wined3d_device, stage, l->state, value); + wined3d_device_set_texture_stage_state(device->wined3d_device, stage, l->u.texture_state, value); } wined3d_mutex_unlock();

1 0

Jan Schmidt : d3d9: Adjust D3DCOLOR_ARGB to avoid shift overflow.
by Alexandre Julliard 20 Jul '16

20 Jul '16

Module: wine Branch: master Commit: a9de59c906e20f1b186cbe5d5a17d10556c89796 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9de59c906e20f1b186cbe5d5… Author: Jan Schmidt <jan(a)centricular.com> Date: Wed Jul 20 14:37:09 2016 +1000 d3d9: Adjust D3DCOLOR_ARGB to avoid shift overflow. Signed-off-by: Jan Schmidt <jan(a)centricular.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d9types.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/d3d9types.h b/include/d3d9types.h index 8ebedcc..82e5112 100644 --- a/include/d3d9types.h +++ b/include/d3d9types.h @@ -39,7 +39,7 @@ #define D3DCLIPPLANE4 (1 << 4) #define D3DCLIPPLANE5 (1 << 5) -#define D3DCOLOR_ARGB(a,r,g,b) ((D3DCOLOR)((((a)&0xff)<<24)|(((r)&0xff)<<16)|(((g)&0xff)<<8)|((b)&0xff))) +#define D3DCOLOR_ARGB(a,r,g,b) ((D3DCOLOR)((((a)&0xffu)<<24)|(((r)&0xffu)<<16)|(((g)&0xffu)<<8)|((b)&0xffu))) #define D3DCOLOR_COLORVALUE(r,g,b,a) D3DCOLOR_RGBA((DWORD)((r)*255.f),(DWORD)((g)*255.f),(DWORD)((b)*255.f),(DWORD)((a)*255.f)) #define D3DCOLOR_RGBA(r,g,b,a) D3DCOLOR_ARGB(a,r,g,b) #define D3DCOLOR_XRGB(r,g,b) D3DCOLOR_ARGB(0xff,r,g,b)

1 0

Iván Matellanes : msvcirt: Implement istream::seekg.
by Alexandre Julliard 20 Jul '16

20 Jul '16

Module: wine Branch: master Commit: 3c9fd38283bd1b1ca04bb309ced3e57debd10ab3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c9fd38283bd1b1ca04bb309c… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Jul 20 10:56:05 2016 +0100 msvcirt: Implement istream::seekg. 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 | 18 +++++++++++++-- dlls/msvcirt/tests/msvcirt.c | 54 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index f016328..1715f80 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -3346,7 +3346,14 @@ istream* __thiscall istream_read_unsigned(istream *this, unsigned char *str, int DEFINE_THISCALL_WRAPPER(istream_seekg, 8) istream* __thiscall istream_seekg(istream *this, streampos pos) { - FIXME("(%p %d) stub\n", this, pos); + ios *base = istream_get_ios(this); + + TRACE("(%p %d)\n", this, pos); + + ios_lockbuf(base); + if (streambuf_seekpos(base->sb, pos, OPENMODE_in) == EOF) + ios_clear(base, base->state | IOSTATE_failbit); + ios_unlockbuf(base); return this; } @@ -3355,7 +3362,14 @@ istream* __thiscall istream_seekg(istream *this, streampos pos) DEFINE_THISCALL_WRAPPER(istream_seekg_offset, 12) istream* __thiscall istream_seekg_offset(istream *this, streamoff off, ios_seek_dir dir) { - FIXME("(%p %d %d) stub\n", this, off, dir); + ios *base = istream_get_ios(this); + + TRACE("(%p %d %d)\n", this, off, dir); + + ios_lockbuf(base); + if (call_streambuf_seekoff(base->sb, off, dir, OPENMODE_in) == 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 28f5dbf..0bb3e98 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -321,6 +321,8 @@ 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); +static istream* (*__thiscall p_istream_seekg)(istream*, streampos); +static istream* (*__thiscall p_istream_seekg_offset)(istream*, streamoff, ios_seek_dir); /* Emulate a __thiscall */ #ifdef __i386__ @@ -530,6 +532,8 @@ static BOOL init(void) 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"); + SET(p_istream_seekg, "?seekg(a)istream@@QEAAAEAV1(a)J@Z"); + SET(p_istream_seekg_offset, "?seekg(a)istream@@QEAAAEAV1(a)JW4seek_dir@ios@@@Z"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2(a)YAPAXI@Z"); p_operator_delete = (void*)GetProcAddress(msvcrt, "??3(a)YAXPAX@Z"); @@ -661,6 +665,8 @@ static BOOL init(void) 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_istream_seekg, "?seekg(a)istream@@QAEAAV1(a)J@Z"); + SET(p_istream_seekg_offset, "?seekg(a)istream@@QAEAAV1(a)JW4seek_dir@ios@@@Z"); } SET(p_ios_static_lock, "?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A"); SET(p_ios_lockc, "?lockc(a)ios@@KAXXZ"); @@ -4495,6 +4501,54 @@ if (0) /* crashes on native */ ok(buffer[0] == 'A', "expected 'A' got %d\n", buffer[0]); fb1.base.gptr = fb1.base.egptr; + /* seekg */ + is1.extract_delim = is1.count = 0xabababab; + pis = call_func2(p_istream_seekg, &is1, 0); + ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); + ok(fb1.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, fb1.base.gptr); + ok(_tell(fb1.fd) == 0, "expected 0 got %d\n", _tell(fb1.fd)); +if (0) /* crashes on native */ + is1.base_ios.sb = NULL; + pis = call_func2(p_istream_seekg, &is1, -5); + 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 == NULL, "wrong get pointer, expected %p got %p\n", NULL, fb1.base.gptr); + ok(_tell(fb1.fd) == 0, "expected 0 got %d\n", _tell(fb1.fd)); + fb1.base.epptr = fb1.base.ebuf; + pis = call_func2(p_istream_seekg, &is1, 5); + 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 == NULL, "wrong get pointer, expected %p got %p\n", NULL, fb1.base.gptr); + ok(fb1.base.epptr == NULL, "wrong put end, expected %p got %p\n", NULL, fb1.base.epptr); + ok(_tell(fb1.fd) == 5, "expected 5 got %d\n", _tell(fb1.fd)); + is1.base_ios.state = IOSTATE_goodbit; + fd = fb1.fd; + fb1.fd = -1; + pis = call_func2(p_istream_seekg, &is1, 0); + 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 == 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; + pis = call_func3(p_istream_seekg_offset, &is1, 0, SEEKDIR_end); + 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, "wrong get pointer, expected %p got %p\n", fb1.base.base, fb1.base.gptr); + is1.base_ios.state = IOSTATE_goodbit; + fb1.fd = fd; + pis = call_func3(p_istream_seekg_offset, &is1, 0, SEEKDIR_end); + 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, "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.egptr; + pis = call_func3(p_istream_seekg_offset, &is1, 0, SEEKDIR_end); + 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 == NULL, "wrong get pointer, expected %p got %p\n", NULL, fb1.base.gptr); + ok(_tell(fb1.fd) == 24, "expected 24 got %d\n", _tell(fb1.fd)); + 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::sync.
by Alexandre Julliard 20 Jul '16

20 Jul '16

Module: wine Branch: master Commit: 1235aa5d1b29ddc367b8bae89455d528a8486b19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1235aa5d1b29ddc367b8bae89… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Jul 20 10:56:06 2016 +0100 msvcirt: Implement istream::sync. 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 1715f80..12a4809 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -3378,8 +3378,16 @@ istream* __thiscall istream_seekg_offset(istream *this, streamoff off, ios_seek_ DEFINE_THISCALL_WRAPPER(istream_sync, 4) int __thiscall istream_sync(istream *this) { - FIXME("(%p) stub\n", this); - return 0; + ios *base = istream_get_ios(this); + int ret; + + TRACE("(%p)\n", this); + + ios_lockbuf(base); + if ((ret = call_streambuf_sync(base->sb)) == EOF) + ios_clear(base, base->state | IOSTATE_badbit | IOSTATE_failbit); + ios_unlockbuf(base); + return ret; } /* ?tellg(a)istream@@QAEJXZ */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 0bb3e98..af8a235 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -323,6 +323,7 @@ static istream* (*__thiscall p_istream_putback)(istream*, char); static istream* (*__thiscall p_istream_read)(istream*, char*, int); static istream* (*__thiscall p_istream_seekg)(istream*, streampos); static istream* (*__thiscall p_istream_seekg_offset)(istream*, streamoff, ios_seek_dir); +static int (*__thiscall p_istream_sync)(istream*); /* Emulate a __thiscall */ #ifdef __i386__ @@ -534,6 +535,7 @@ static BOOL init(void) SET(p_istream_read, "?read(a)istream@@QEAAAEAV1(a)PEADH@Z"); SET(p_istream_seekg, "?seekg(a)istream@@QEAAAEAV1(a)J@Z"); SET(p_istream_seekg_offset, "?seekg(a)istream@@QEAAAEAV1(a)JW4seek_dir@ios@@@Z"); + SET(p_istream_sync, "?sync(a)istream@@QEAAHXZ"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2(a)YAPAXI@Z"); p_operator_delete = (void*)GetProcAddress(msvcrt, "??3(a)YAXPAX@Z"); @@ -667,6 +669,7 @@ static BOOL init(void) SET(p_istream_read, "?read(a)istream@@QAEAAV1(a)PADH@Z"); SET(p_istream_seekg, "?seekg(a)istream@@QAEAAV1(a)J@Z"); SET(p_istream_seekg_offset, "?seekg(a)istream@@QAEAAV1(a)JW4seek_dir@ios@@@Z"); + SET(p_istream_sync, "?sync(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"); @@ -4549,6 +4552,42 @@ if (0) /* crashes on native */ ok(fb1.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, fb1.base.gptr); ok(_tell(fb1.fd) == 24, "expected 24 got %d\n", _tell(fb1.fd)); + /* sync */ + ret = (int) call_func1(p_istream_sync, &is1); + ok(ret == 0, "expected 0 got %d\n", ret); + ok(is1.base_ios.state == IOSTATE_failbit, "expected %d got %d\n", IOSTATE_failbit, is1.base_ios.state); + is1.base_ios.state = IOSTATE_badbit; + ret = (int) call_func1(p_istream_sync, &is1); + ok(ret == 0, "expected 0 got %d\n", ret); + ok(is1.base_ios.state == IOSTATE_badbit, "expected %d got %d\n", IOSTATE_badbit, is1.base_ios.state); + is1.base_ios.state = IOSTATE_goodbit; + ret = (int) call_func1(p_istream_sync, &is1); + ok(ret == 0, "expected 0 got %d\n", ret); + ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state); +if (0) /* crashes on native */ + is1.base_ios.sb = NULL; + fb1.base.eback = fb1.base.gptr = fb1.base.base; + fb1.base.egptr = fb1.base.base + 30; + ret = (int) call_func1(p_istream_sync, &is1); + ok(ret == EOF, "expected -1 got %d\n", ret); + 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, "wrong get pointer, expected %p got %p\n", fb1.base.base, fb1.base.gptr); + fb1.base.gptr = fb1.base.egptr; + ret = (int) call_func1(p_istream_sync, &is1); + ok(ret == 0, "expected 0 got %d\n", ret); + 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 == NULL, "wrong get pointer, expected %p got %p\n", NULL, fb1.base.gptr); + is1.base_ios.state = IOSTATE_eofbit; + fd = fb1.fd; + fb1.fd = -1; + ret = (int) call_func1(p_istream_sync, &is1); + ok(ret == EOF, "expected -1 got %d\n", ret); + ok(is1.base_ios.state == (IOSTATE_badbit|IOSTATE_failbit|IOSTATE_eofbit), "expected %d got %d\n", + IOSTATE_badbit|IOSTATE_failbit|IOSTATE_eofbit, is1.base_ios.state); + fb1.fd = fd; + 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::tellg.
by Alexandre Julliard 20 Jul '16

20 Jul '16

Module: wine Branch: master Commit: c484ee409fb2c0f58ebfa64cfa520d8ef7639550 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c484ee409fb2c0f58ebfa64cf… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Jul 20 10:56:07 2016 +0100 msvcirt: Implement istream::tellg. 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 | 26 ++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 12a4809..617928a 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -3395,8 +3395,16 @@ int __thiscall istream_sync(istream *this) DEFINE_THISCALL_WRAPPER(istream_tellg, 4) streampos __thiscall istream_tellg(istream *this) { - FIXME("(%p) stub\n", this); - return 0; + ios *base = istream_get_ios(this); + streampos pos; + + TRACE("(%p)\n", this); + + ios_lockbuf(base); + if ((pos = call_streambuf_seekoff(base->sb, 0, SEEKDIR_cur, OPENMODE_in)) == EOF) + ios_clear(base, base->state | IOSTATE_failbit); + ios_unlockbuf(base); + return pos; } /* ?getint(a)istream@@AAEHPAD(a)Z */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index af8a235..fab46f5 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -324,6 +324,7 @@ static istream* (*__thiscall p_istream_read)(istream*, char*, int); static istream* (*__thiscall p_istream_seekg)(istream*, streampos); static istream* (*__thiscall p_istream_seekg_offset)(istream*, streamoff, ios_seek_dir); static int (*__thiscall p_istream_sync)(istream*); +static streampos (*__thiscall p_istream_tellg)(istream*); /* Emulate a __thiscall */ #ifdef __i386__ @@ -536,6 +537,7 @@ static BOOL init(void) SET(p_istream_seekg, "?seekg(a)istream@@QEAAAEAV1(a)J@Z"); SET(p_istream_seekg_offset, "?seekg(a)istream@@QEAAAEAV1(a)JW4seek_dir@ios@@@Z"); SET(p_istream_sync, "?sync(a)istream@@QEAAHXZ"); + SET(p_istream_tellg, "?tellg(a)istream@@QEAAJXZ"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2(a)YAPAXI@Z"); p_operator_delete = (void*)GetProcAddress(msvcrt, "??3(a)YAXPAX@Z"); @@ -670,6 +672,7 @@ static BOOL init(void) SET(p_istream_seekg, "?seekg(a)istream@@QAEAAV1(a)J@Z"); SET(p_istream_seekg_offset, "?seekg(a)istream@@QAEAAV1(a)JW4seek_dir@ios@@@Z"); SET(p_istream_sync, "?sync(a)istream@@QAEHXZ"); + SET(p_istream_tellg, "?tellg(a)istream@@QAEJXZ"); } SET(p_ios_static_lock, "?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A"); SET(p_ios_lockc, "?lockc(a)ios@@KAXXZ"); @@ -4588,6 +4591,29 @@ if (0) /* crashes on native */ IOSTATE_badbit|IOSTATE_failbit|IOSTATE_eofbit, is1.base_ios.state); fb1.fd = fd; + /* tellg */ + ret = (int) call_func1(p_istream_tellg, &is1); + ok(ret == 24, "expected 24 got %d\n", ret); + ok(is1.base_ios.state == (IOSTATE_badbit|IOSTATE_failbit|IOSTATE_eofbit), "expected %d got %d\n", + IOSTATE_badbit|IOSTATE_failbit|IOSTATE_eofbit, is1.base_ios.state); + is1.base_ios.state = IOSTATE_goodbit; + ret = (int) call_func1(p_istream_tellg, &is1); + ok(ret == 24, "expected 24 got %d\n", ret); + ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state); +if (0) /* crashes on native */ + is1.base_ios.sb = NULL; + fb1.base.eback = fb1.base.gptr = fb1.base.base; + fb1.base.egptr = fb1.base.base + 30; + ret = (int) call_func1(p_istream_tellg, &is1); + ok(ret == EOF, "expected -1 got %d\n", ret); + ok(is1.base_ios.state == IOSTATE_failbit, "expected %d got %d\n", IOSTATE_failbit, is1.base_ios.state); + is1.base_ios.state = IOSTATE_eofbit; + ret = (int) call_func1(p_istream_tellg, &is1); + ok(ret == EOF, "expected -1 got %d\n", ret); + ok(is1.base_ios.state == (IOSTATE_eofbit|IOSTATE_failbit), "expected %d got %d\n", + IOSTATE_eofbit|IOSTATE_failbit, is1.base_ios.state); + fb1.base.eback = fb1.base.gptr = fb1.base.egptr = NULL; + 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::getint.
by Alexandre Julliard 20 Jul '16

20 Jul '16

Module: wine Branch: master Commit: 21ea9f0efbf0a5dae4b63601dd400c1837a55d34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21ea9f0efbf0a5dae4b63601d… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Jul 20 10:56:08 2016 +0100 msvcirt: Implement istream::getint. 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 | 64 +++++++++++++++++++++++- dlls/msvcirt/tests/msvcirt.c | 113 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 175 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=21ea9f0efbf0a5dae4b63…

1 0

Nikolay Sivov : msscript: Implement SetAdvise/GetAdvise.
by Alexandre Julliard 20 Jul '16

20 Jul '16

Module: wine Branch: master Commit: f0b76aec0c3a1f46f0d69093ca45ecc7a2e46ecc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0b76aec0c3a1f46f0d69093c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 20 13:47:44 2016 +0300 msscript: Implement SetAdvise/GetAdvise. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 38 ++++++++++++++++++++++++++++++++------ dlls/msscript.ocx/tests/msscript.c | 30 +++++++++++++++++++++++++++++- 2 files changed, 61 insertions(+), 7 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 319f901..3b097af 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -83,6 +83,10 @@ struct ScriptControl { ConnectionPoint cp_scsource; ConnectionPoint cp_propnotif; + /* IViewObject sink */ + IAdviseSink *view_sink; + DWORD view_sink_flags; + ScriptHost *host; }; @@ -1327,22 +1331,42 @@ static HRESULT WINAPI ViewObject_Unfreeze(IViewObjectEx *iface, DWORD freeze) return E_NOTIMPL; } -static HRESULT WINAPI ViewObject_SetAdvise(IViewObjectEx *iface, DWORD aspects, DWORD advf, IAdviseSink *sink) +static HRESULT WINAPI ViewObject_SetAdvise(IViewObjectEx *iface, DWORD aspects, DWORD flags, IAdviseSink *sink) { ScriptControl *This = impl_from_IViewObjectEx(iface); - FIXME("(%p)->(%d %d %p)\n", This, aspects, advf, sink); + TRACE("(%p)->(%d %#x %p)\n", This, aspects, flags, sink); - return E_NOTIMPL; + if (aspects != DVASPECT_CONTENT) + return DV_E_DVASPECT; + + This->view_sink_flags = flags; + if (This->view_sink) + IAdviseSink_Release(This->view_sink); + This->view_sink = sink; + if (This->view_sink) + IAdviseSink_AddRef(This->view_sink); + + return S_OK; } -static HRESULT WINAPI ViewObject_GetAdvise(IViewObjectEx *iface, DWORD *aspects, DWORD *advf, IAdviseSink **sink) +static HRESULT WINAPI ViewObject_GetAdvise(IViewObjectEx *iface, DWORD *aspects, DWORD *flags, IAdviseSink **sink) { ScriptControl *This = impl_from_IViewObjectEx(iface); - FIXME("(%p)->(%p %p %p)\n", This, aspects, advf, sink); + TRACE("(%p)->(%p %p %p)\n", This, aspects, flags, sink); - return E_NOTIMPL; + if (aspects) + *aspects = DVASPECT_CONTENT; + if (flags) + *flags = This->view_sink_flags; + if (sink) { + *sink = This->view_sink; + if (*sink) + IAdviseSink_AddRef(*sink); + } + + return S_OK; } static HRESULT WINAPI ViewObject_GetExtent(IViewObjectEx *iface, DWORD draw_aspect, LONG index, @@ -1676,6 +1700,8 @@ static HRESULT WINAPI ScriptControl_CreateInstance(IClassFactory *iface, IUnknow script_control->cp_list = NULL; script_control->host = NULL; script_control->timeout = 10000; + script_control->view_sink_flags = 0; + script_control->view_sink = NULL; ConnectionPoint_Init(&script_control->cp_scsource, script_control, &DIID_DScriptControlSource); ConnectionPoint_Init(&script_control->cp_propnotif, script_control, &IID_IPropertyNotifySink); diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 427d0ca..a211fe3 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -860,10 +860,11 @@ static void test_quickactivate(void) static void test_viewobject(void) { + DWORD status, aspect, flags; IViewObjectEx *viewex; IScriptControl *sc; IViewObject *view; - DWORD status; + IAdviseSink *sink; HRESULT hr; hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, @@ -876,6 +877,33 @@ static void test_viewobject(void) hr = IScriptControl_QueryInterface(sc, &IID_IViewObject2, (void**)&view); ok(hr == S_OK, "got 0x%08x\n", hr); + + sink = (IAdviseSink*)0xdeadbeef; + hr = IViewObject_GetAdvise(view, &aspect, &flags, &sink); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(aspect == DVASPECT_CONTENT, "got %u\n", aspect); + ok(flags == 0, "got %#x\n", flags); + ok(sink == NULL, "got %p\n", sink); + + hr = IViewObject_SetAdvise(view, DVASPECT_CONTENT, 0, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IViewObject_SetAdvise(view, DVASPECT_THUMBNAIL, 0, NULL); + ok(hr == DV_E_DVASPECT, "got 0x%08x\n", hr); + + hr = IViewObject_SetAdvise(view, DVASPECT_ICON, 0, NULL); + ok(hr == DV_E_DVASPECT, "got 0x%08x\n", hr); + + hr = IViewObject_SetAdvise(view, DVASPECT_DOCPRINT, 0, NULL); + ok(hr == DV_E_DVASPECT, "got 0x%08x\n", hr); + + sink = (IAdviseSink*)0xdeadbeef; + hr = IViewObject_GetAdvise(view, &aspect, &flags, &sink); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(aspect == DVASPECT_CONTENT, "got %u\n", aspect); + ok(flags == 0, "got %#x\n", flags); + ok(sink == NULL, "got %p\n", sink); + IViewObject_Release(view); hr = IScriptControl_QueryInterface(sc, &IID_IViewObjectEx, (void**)&viewex);

1 0

Michael Stefaniuc : hlink/tests: Use wine_dbgstr_guid() to print a REFIID.
by Alexandre Julliard 20 Jul '16

20 Jul '16

Module: wine Branch: master Commit: fdb1f48a22ba94ff73b088918269164714cd37ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdb1f48a22ba94ff73b088918… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 20 10:30:06 2016 +0200 hlink/tests: Use wine_dbgstr_guid() to print a REFIID. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hlink/tests/hlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index a913fb1..8a01f19 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -1731,7 +1731,7 @@ static const WCHAR ref_monikerW[] = {'R','E','F','_','M','O','N','I','K','E','R' static HRESULT WINAPI hls_test_Moniker_BindToStorage(IMoniker *iface, IBindCtx *pbc, IMoniker *toLeft, REFIID riid, void **obj) { - ok(0, "BTS: %p %p %p %p %p\n", iface, pbc, toLeft, riid, obj); + ok(0, "BTS: %p %p %p %s %p\n", iface, pbc, toLeft, wine_dbgstr_guid(riid), obj); return E_NOTIMPL; }

1 0

Michael Stefaniuc : shlwapi/tests: Use wine_dbgstr_guid() to trace REFIIDs.
by Alexandre Julliard 20 Jul '16

20 Jul '16

Module: wine Branch: master Commit: b713c438c144accd0dcf9658e4a435fcfead9f69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b713c438c144accd0dcf9658e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 20 10:30:56 2016 +0200 shlwapi/tests: Use wine_dbgstr_guid() to trace REFIIDs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/ordinal.c | 3 ++- dlls/shlwapi/tests/thread.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 2a1eaed..74cad7d 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -1004,7 +1004,8 @@ static HRESULT WINAPI Disp_Invoke( EXCEPINFO *pExcepInfo, UINT *puArgErr) { - trace("%p %x %p %x %x %p %p %p %p\n",This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr); + trace("%p %x %s %x %x %p %p %p %p\n", This, dispIdMember, wine_dbgstr_guid(riid), lcid, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); ok(dispIdMember == 0xa0 || dispIdMember == 0xa1, "Unknown dispIdMember\n"); ok(pDispParams != NULL, "Invoked with NULL pDispParams\n"); diff --git a/dlls/shlwapi/tests/thread.c b/dlls/shlwapi/tests/thread.c index d4a1787..34eb98c 100644 --- a/dlls/shlwapi/tests/thread.c +++ b/dlls/shlwapi/tests/thread.c @@ -52,7 +52,7 @@ static HRESULT WINAPI threadref_QueryInterface(IUnknown *iface, REFIID riid, LPV { threadref * This = impl_from_IUnknown(iface); - trace("unexpected QueryInterface(%p, %p, %p) called\n", This, riid, ppvObj); + trace("unexpected QueryInterface(%p, %s, %p) called\n", This, wine_dbgstr_guid(riid), ppvObj); *ppvObj = NULL; return E_NOINTERFACE; }

1 0

Michael Stefaniuc : msctf: Don' t crash on NULL input in EnumLanguageProfiles().
by Alexandre Julliard 20 Jul '16

20 Jul '16

Module: wine Branch: master Commit: fd0101ab61e61c67bc91d35639bad125265da615 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd0101ab61e61c67bc91d3563… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 19 09:46:01 2016 +0200 msctf: Don't crash on NULL input in EnumLanguageProfiles(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/inputprocessor.c | 4 ++++ dlls/msctf/tests/inputprocessor.c | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/dlls/msctf/inputprocessor.c b/dlls/msctf/inputprocessor.c index 0e8ad22..fca78e4 100644 --- a/dlls/msctf/inputprocessor.c +++ b/dlls/msctf/inputprocessor.c @@ -617,6 +617,10 @@ static HRESULT WINAPI InputProcessorProfiles_EnumLanguageProfiles( { InputProcessorProfiles *This = impl_from_ITfInputProcessorProfiles(iface); TRACE("(%p) %x %p\n",This,langid,ppEnum); + + if (!ppEnum) + return E_INVALIDARG; + return EnumTfLanguageProfiles_Constructor(langid, ppEnum); } diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 831e37a..2096bff 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -973,6 +973,11 @@ static void test_EnumLanguageProfiles(void) { BOOL found = FALSE; IEnumTfLanguageProfiles *ppEnum; + HRESULT hr; + + hr = ITfInputProcessorProfiles_EnumLanguageProfiles(g_ipp, gLangid, NULL); + ok(hr == E_INVALIDARG, "EnumLanguageProfiles failed: %x\n", hr); + if (SUCCEEDED(ITfInputProcessorProfiles_EnumLanguageProfiles(g_ipp,gLangid,&ppEnum))) { TF_LANGUAGEPROFILE profile;

1 0