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

Alex Henrie : shell32/tests: Free winetest BSTR after use.
by Alexandre Julliard July 20, 2016

July 20, 2016

Module: wine Branch: master Commit: de37f020a2b193316d6252a5727eb81db434c9c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de37f020a2b193316d6252a57… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jul 19 22:43:06 2016 -0600 shell32/tests: Free winetest BSTR after use. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shelldispatch.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 1f50277..80ca8ad 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -338,6 +338,7 @@ static void test_items(void) r = IShellDispatch_NameSpace(sd, var, &folder); ok(r == S_OK, "IShellDispatch::NameSpace failed: %08x\n", r); ok(!!folder, "folder is null\n"); + SysFreeString(V_BSTR(&var)); IShellDispatch_Release(sd); SetCurrentDirectoryW(winetestW);

1 0

Jacek Caban : jscript: Optimize iface_to_jsdisp by using vtbl comparison.
by Alexandre Julliard July 20, 2016

July 20, 2016

Module: wine Branch: master Commit: 798ba715e398495fcd172d78196068e39f5b257b URL: http://source.winehq.org/git/wine.git/?a=commit;h=798ba715e398495fcd172d781… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 20 13:41:23 2016 +0200 jscript: Optimize iface_to_jsdisp by using vtbl comparison. This is 14% win on SunSpider 0.9 benchmark. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 93d74ba..538219e 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -25,13 +25,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); -/* - * This IID is used to get jsdisp_t objecto from interface. - * We might consider using private interface instead. - */ -static const IID IID_IDispatchJS = - {0x719c3050,0xf9d3,0x11cf,{0xa4,0x93,0x00,0x40,0x05,0x23,0xa8,0xa6}}; - #define FDEX_VERSION_MASK 0xf0000000 #define GOLDEN_RATIO 0x9E3779B9U @@ -565,11 +558,6 @@ static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, }else if(IsEqualGUID(&IID_IDispatchEx, riid)) { TRACE("(%p)->(IID_IDispatchEx %p)\n", This, ppv); *ppv = &This->IDispatchEx_iface; - }else if(IsEqualGUID(&IID_IDispatchJS, riid)) { - TRACE("(%p)->(IID_IDispatchJS %p)\n", This, ppv); - jsdisp_addref(This); - *ppv = This; - return S_OK; }else { WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); *ppv = NULL; @@ -1027,14 +1015,9 @@ HRESULT init_dispex_from_constr(jsdisp_t *dispex, script_ctx_t *ctx, const built jsdisp_t *iface_to_jsdisp(IDispatch *iface) { - jsdisp_t *ret; - HRESULT hres; - - hres = IDispatch_QueryInterface(iface, &IID_IDispatchJS, (void**)&ret); - if(FAILED(hres)) - return NULL; - - return ret; + return iface->lpVtbl == (const IDispatchVtbl*)&DispatchExVtbl + ? jsdisp_addref( impl_from_IDispatchEx((IDispatchEx*)iface)) + : NULL; } HRESULT jsdisp_get_id(jsdisp_t *jsdisp, const WCHAR *name, DWORD flags, DISPID *id)

1 0

Michael Stefaniuc : shlwapi/tests: Use wine_dbgstr_guid() to trace REFIIDs.
by Alexandre Julliard July 20, 2016

July 20, 2016

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

Matteo Bruni : wined3d: Check BLENDWEIGHT and BLENDINDICES FFP attributes for fixups.
by Alexandre Julliard July 20, 2016

July 20, 2016

Module: wine Branch: master Commit: dcaf944e35cfb995b1262c325595c2dc35514da9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcaf944e35cfb995b1262c325… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jul 20 00:33:26 2016 +0200 wined3d: Check BLENDWEIGHT and BLENDINDICES FFP attributes for fixups. 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/wined3d/buffer.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 79d1246..039b3a1 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -381,6 +381,10 @@ static BOOL buffer_find_decl(struct wined3d_buffer *This, const struct wined3d_s fixup_flags, &stride_this_run) || ret; fixup_flags &= ~WINED3D_BUFFER_FIXUP_XYZRHW; + ret = buffer_check_attribute(This, si, state, WINED3D_FFP_BLENDWEIGHT, + fixup_flags, &stride_this_run) || ret; + ret = buffer_check_attribute(This, si, state, WINED3D_FFP_BLENDINDICES, + fixup_flags, &stride_this_run) || ret; ret = buffer_check_attribute(This, si, state, WINED3D_FFP_NORMAL, fixup_flags, &stride_this_run) || ret; ret = buffer_check_attribute(This, si, state, WINED3D_FFP_DIFFUSE,

1 0

Nikolay Sivov : dwrite: Filter invalid weight in SetFontWeight().
by Alexandre Julliard July 20, 2016

July 20, 2016

Module: wine Branch: master Commit: 4f01bee4c81f9cbee4b854f47dcccbcda6ca396d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f01bee4c81f9cbee4b854f47… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 19 23:03:01 2016 +0300 dwrite: Filter invalid weight in SetFontWeight(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 3 +++ dlls/dwrite/tests/layout.c | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 22c3f31..6f10ce4 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -2889,6 +2889,9 @@ static HRESULT WINAPI dwritetextlayout_SetFontWeight(IDWriteTextLayout3 *iface, TRACE("(%p)->(%d %s)\n", This, weight, debugstr_range(&range)); + if ((UINT32)weight > DWRITE_FONT_WEIGHT_ULTRA_BLACK) + return E_INVALIDARG; + value.range = range; value.u.weight = weight; return set_layout_range_attr(This, LAYOUT_RANGE_ATTR_WEIGHT, &value); diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 9f3b8c3..4134a97 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1249,6 +1249,11 @@ static void test_fontweight(void) ok(weight == DWRITE_FONT_WEIGHT_NORMAL, "got %d\n", weight); ok(range.length == 6, "got %d\n", range.length); + range.startPosition = 0; + range.length = 6; + hr = IDWriteTextLayout_SetFontWeight(layout, 1000, range); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + size = IDWriteTextLayout_GetMaxWidth(layout); ok(size == 100.0, "got %.2f\n", size);

1 0

Nikolay Sivov : dwrite/tests: A couple of tests for matching with invalid font properties.
by Alexandre Julliard July 20, 2016

July 20, 2016

Module: wine Branch: master Commit: 02773e1f15d34663bccb2a280f421753d19b12ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=02773e1f15d34663bccb2a280… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 19 23:03:00 2016 +0300 dwrite/tests: A couple of tests for matching with invalid font properties. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 0459285..3b402b8 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2970,6 +2970,20 @@ static void test_GetFirstMatchingFont(void) IDWriteFont_Release(font); IDWriteFont_Release(font2); + /* out-of-range font props are allowed */ + hr = IDWriteFontFamily_GetFirstMatchingFont(family, 1000, DWRITE_FONT_STRETCH_NORMAL, DWRITE_FONT_STYLE_NORMAL, &font); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFont_Release(font); + + hr = IDWriteFontFamily_GetFirstMatchingFont(family, DWRITE_FONT_WEIGHT_NORMAL, 10, DWRITE_FONT_STYLE_NORMAL, &font); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFont_Release(font); + + hr = IDWriteFontFamily_GetFirstMatchingFont(family, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STRETCH_NORMAL, + 10, &font); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFont_Release(font); + IDWriteFontFamily_Release(family); font = get_tahoma_instance(factory, DWRITE_FONT_STYLE_ITALIC); @@ -2998,6 +3012,22 @@ static void test_GetMatchingFonts(void) hr = IDWriteFontCollection_GetFontFamily(collection, 0, &family); ok(hr == S_OK, "got 0x%08x\n", hr); + /* out-of-range font props are allowed */ + hr = IDWriteFontFamily_GetMatchingFonts(family, 1000, DWRITE_FONT_STRETCH_NORMAL, + DWRITE_FONT_STYLE_NORMAL, &fontlist); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFontList_Release(fontlist); + + hr = IDWriteFontFamily_GetMatchingFonts(family, DWRITE_FONT_WEIGHT_NORMAL, 10, + DWRITE_FONT_STYLE_NORMAL, &fontlist); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFontList_Release(fontlist); + + hr = IDWriteFontFamily_GetMatchingFonts(family, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STRETCH_NORMAL, + 10, &fontlist); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFontList_Release(fontlist); + hr = IDWriteFontFamily_GetMatchingFonts(family, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STRETCH_NORMAL, DWRITE_FONT_STYLE_NORMAL, &fontlist); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Nikolay Sivov : msscript: Implement SetAdvise/GetAdvise.
by Alexandre Julliard July 20, 2016

July 20, 2016

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

Iván Matellanes : msvcirt: Implement istream::getint.
by Alexandre Julliard July 20, 2016

July 20, 2016

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

Iván Matellanes : msvcirt: Implement istream::tellg.
by Alexandre Julliard July 20, 2016

July 20, 2016

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::seekg.
by Alexandre Julliard July 20, 2016

July 20, 2016

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