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

Thomas Faber : quartz: Destroy BaseFilter after child class.
by Alexandre Julliard July 22, 2014

July 22, 2014

Module: wine Branch: master Commit: 5ce8c7a5a794cc86297fda637596140e9bb10e52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ce8c7a5a794cc86297fda637… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Jul 19 10:29:54 2014 +0200 quartz: Destroy BaseFilter after child class. --- dlls/quartz/filesource.c | 3 ++- dlls/quartz/nullrenderer.c | 3 ++- dlls/quartz/parser.c | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index a0af3a4..96d83a1 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -480,7 +480,7 @@ static HRESULT WINAPI AsyncReader_QueryInterface(IBaseFilter * iface, REFIID rii static ULONG WINAPI AsyncReader_Release(IBaseFilter * iface) { AsyncReader *This = impl_from_IBaseFilter(iface); - ULONG refCount = BaseFilterImpl_Release(iface); + ULONG refCount = InterlockedDecrement(&This->filter.refCount); TRACE("(%p)->() Release from %d\n", This, refCount + 1); @@ -500,6 +500,7 @@ static ULONG WINAPI AsyncReader_Release(IBaseFilter * iface) CoTaskMemFree(This->pszFileName); if (This->pmt) FreeMediaType(This->pmt); + BaseFilter_Destroy(&This->filter); CoTaskMemFree(This); return 0; } diff --git a/dlls/quartz/nullrenderer.c b/dlls/quartz/nullrenderer.c index 16a24ac..7befc46 100644 --- a/dlls/quartz/nullrenderer.c +++ b/dlls/quartz/nullrenderer.c @@ -128,11 +128,12 @@ static ULONG WINAPI NullRendererInner_AddRef(IUnknown *iface) static ULONG WINAPI NullRendererInner_Release(IUnknown *iface) { NullRendererImpl *This = impl_from_IUnknown(iface); - ULONG refCount = BaseFilterImpl_Release(&This->renderer.filter.IBaseFilter_iface); + ULONG refCount = InterlockedDecrement(&This->renderer.filter.refCount); if (!refCount) { TRACE("Destroying Null Renderer\n"); + BaseFilter_Destroy(&This->renderer.filter); CoTaskMemFree(This); } diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index f702c62..b57bae4 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -194,6 +194,7 @@ void Parser_Destroy(ParserImpl *This) } CoTaskMemFree(This->ppPins); + BaseFilter_Destroy(&This->filter); TRACE("Destroying parser\n"); CoTaskMemFree(This); @@ -202,7 +203,7 @@ void Parser_Destroy(ParserImpl *This) ULONG WINAPI Parser_Release(IBaseFilter * iface) { ParserImpl *This = impl_from_IBaseFilter(iface); - ULONG refCount = BaseFilterImpl_Release(iface); + ULONG refCount = InterlockedDecrement(&This->filter.refCount); TRACE("(%p)->() Release from %d\n", This, refCount + 1);

1 0

Thomas Faber : wineqtdecoder: Destroy BaseFilter after QT child class.
by Alexandre Julliard July 22, 2014

July 22, 2014

Module: wine Branch: master Commit: c6dfc084a535349676941ed46ac06c2004c01202 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6dfc084a535349676941ed46… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Jul 19 10:41:54 2014 +0200 wineqtdecoder: Destroy BaseFilter after QT child class. --- dlls/wineqtdecoder/qtsplitter.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 35dc807..8bb51a4 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -343,6 +343,7 @@ static void QT_Destroy(QTSplitter *This) This->csReceive.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->csReceive); + BaseFilter_Destroy(&This->filter); CoTaskMemFree(This); } @@ -381,7 +382,7 @@ static HRESULT WINAPI QT_QueryInterface(IBaseFilter *iface, REFIID riid, LPVOID static ULONG WINAPI QT_Release(IBaseFilter *iface) { QTSplitter *This = impl_from_IBaseFilter(iface); - ULONG refCount = BaseFilterImpl_Release(iface); + ULONG refCount = InterlockedDecrement(&This->filter.refCount); TRACE("(%p)->() Release from %d\n", This, refCount + 1);

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_SetTransform().
by Alexandre Julliard July 22, 2014

July 22, 2014

Module: wine Branch: master Commit: 7976da345ade2bd76591ea0fb1232ce3bd70ab8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7976da345ade2bd76591ea0fb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 22 08:44:22 2014 +0200 d2d1: Implement d2d_d3d_render_target_SetTransform(). --- dlls/d2d1/render_target.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 0dc633b..a7a822d 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -316,7 +316,11 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawGlyphRun(ID2D1RenderTarg static void STDMETHODCALLTYPE d2d_d3d_render_target_SetTransform(ID2D1RenderTarget *iface, const D2D1_MATRIX_3X2_F *transform) { - FIXME("iface %p, transform %p stub!\n", iface, transform); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + + TRACE("iface %p, transform %p.\n", iface, transform); + + render_target->transform = *transform; } static void STDMETHODCALLTYPE d2d_d3d_render_target_GetTransform(ID2D1RenderTarget *iface,

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_GetTransform().
by Alexandre Julliard July 22, 2014

July 22, 2014

Module: wine Branch: master Commit: 952b2575fd5b3b2693a4956b769008eb737ad379 URL: http://source.winehq.org/git/wine.git/?a=commit;h=952b2575fd5b3b2693a4956b7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 22 08:44:21 2014 +0200 d2d1: Implement d2d_d3d_render_target_GetTransform(). --- dlls/d2d1/d2d1_private.h | 2 ++ dlls/d2d1/render_target.c | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 720a96d..001c986 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -28,6 +28,8 @@ struct d2d_d3d_render_target { ID2D1RenderTarget ID2D1RenderTarget_iface; LONG refcount; + + D2D1_MATRIX_3X2_F transform; }; void d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, ID2D1Factory *factory, diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 34ed063..0dc633b 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -322,7 +322,11 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_SetTransform(ID2D1RenderTarg static void STDMETHODCALLTYPE d2d_d3d_render_target_GetTransform(ID2D1RenderTarget *iface, D2D1_MATRIX_3X2_F *transform) { - FIXME("iface %p, transform %p stub!\n", iface, transform); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + + TRACE("iface %p, transform %p.\n", iface, transform); + + *transform = render_target->transform; } static void STDMETHODCALLTYPE d2d_d3d_render_target_SetAntialiasMode(ID2D1RenderTarget *iface, @@ -556,8 +560,17 @@ static const struct ID2D1RenderTargetVtbl d2d_d3d_render_target_vtbl = void d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, ID2D1Factory *factory, IDXGISurface *surface, const D2D1_RENDER_TARGET_PROPERTIES *desc) { + static const D2D1_MATRIX_3X2_F identity = + { + 1.0f, 0.0f, + 0.0f, 1.0f, + 0.0f, 0.0f, + }; + FIXME("Ignoring render target properties.\n"); render_target->ID2D1RenderTarget_iface.lpVtbl = &d2d_d3d_render_target_vtbl; render_target->refcount = 1; + + render_target->transform = identity; }

1 0

Thomas Faber : qcap: Destroy BaseFilter after VfwCapture child class.
by Alexandre Julliard July 22, 2014

July 22, 2014

Module: wine Branch: master Commit: 5cbc081a1fef1e89a755bc44dc509bed29feaf42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cbc081a1fef1e89a755bc44d… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Jul 19 10:38:26 2014 +0200 qcap: Destroy BaseFilter after VfwCapture child class. --- dlls/qcap/vfwcapture.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 41a05a5..6d416b7 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -203,7 +203,7 @@ static HRESULT WINAPI VfwCapture_QueryInterface(IBaseFilter * iface, REFIID riid static ULONG WINAPI VfwCapture_Release(IBaseFilter * iface) { VfwCapture *This = (VfwCapture *)iface; - ULONG refCount = BaseFilterImpl_Release(iface); + ULONG refCount = InterlockedDecrement(&This->filter.refCount); TRACE("%p->() New refcount: %d\n", This, refCount); @@ -225,6 +225,7 @@ static ULONG WINAPI VfwCapture_Release(IBaseFilter * iface) IPin_Disconnect(This->pOutputPin); } IPin_Release(This->pOutputPin); + BaseFilter_Destroy(&This->filter); CoTaskMemFree(This); ObjectRefCount(FALSE); }

1 0

Thomas Faber : winegstreamer: Destroy BaseFilter after GST child class.
by Alexandre Julliard July 22, 2014

July 22, 2014

Module: wine Branch: master Commit: 04240e6ae3b8bca126e11cb344d9155b521a9696 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04240e6ae3b8bca126e11cb34… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Jul 19 10:40:28 2014 +0200 winegstreamer: Destroy BaseFilter after GST child class. --- dlls/winegstreamer/gstdemux.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 3694b54..4e5f04d 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1099,6 +1099,7 @@ static void GST_Destroy(GSTImpl *This) { gst_bus_set_sync_handler(This->bus, NULL, NULL); gst_object_unref(This->bus); } + BaseFilter_Destroy(&This->filter); CoTaskMemFree(This); } @@ -1131,7 +1132,7 @@ static HRESULT WINAPI GST_QueryInterface(IBaseFilter *iface, REFIID riid, LPVOID static ULONG WINAPI GST_Release(IBaseFilter *iface) { GSTImpl *This = (GSTImpl *)iface; - ULONG refCount = BaseFilterImpl_Release(iface); + ULONG refCount = InterlockedDecrement(&This->filter.refCount); TRACE("(%p)->() Release from %d\n", This, refCount + 1);

1 0

Henri Verbeet : dxgi: Only use a single newline in the dxgi_factory_MakeWindowAssociation() FIXME.
by Alexandre Julliard July 22, 2014

July 22, 2014

Module: wine Branch: master Commit: d3c6d3425f60f1270661feb06f02f6d7587b778d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3c6d3425f60f1270661feb06… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 22 08:44:23 2014 +0200 dxgi: Only use a single newline in the dxgi_factory_MakeWindowAssociation() FIXME. --- dlls/dxgi/factory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 98d036e..b75802b 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -161,7 +161,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumAdapters(IWineDXGIFactory *ifa static HRESULT STDMETHODCALLTYPE dxgi_factory_MakeWindowAssociation(IWineDXGIFactory *iface, HWND window, UINT flags) { - FIXME("iface %p, window %p, flags %#x stub!\n\n", iface, window, flags); + FIXME("iface %p, window %p, flags %#x stub!\n", iface, window, flags); return E_NOTIMPL; }

1 0

Shuai Meng : vbscript: Implemented IsNumeric.
by Alexandre Julliard July 22, 2014

July 22, 2014

Module: wine Branch: master Commit: 13fe9147b340472b3af57344ea6098e456a6578a URL: http://source.winehq.org/git/wine.git/?a=commit;h=13fe9147b340472b3af57344e… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Mon Jul 21 23:41:22 2014 +0800 vbscript: Implemented IsNumeric. --- dlls/vbscript/global.c | 21 +++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 26 +++++++++++++++++++++++++- 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 610de43..68fa388 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -91,6 +91,15 @@ static HRESULT return_bstr(VARIANT *res, BSTR str) return S_OK; } +static HRESULT return_bool(VARIANT *res, BOOL val) +{ + if(res) { + V_VT(res) = VT_BOOL; + V_BOOL(res) = val ? VARIANT_TRUE : VARIANT_FALSE; + } + return S_OK; +} + static HRESULT return_short(VARIANT *res, short val) { if(res) { @@ -600,8 +609,16 @@ static HRESULT Global_IsNull(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VA static HRESULT Global_IsNumeric(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + HRESULT hres; + double d; + + TRACE("(%s)\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + hres = to_double(arg, &d); + + return return_bool(res, SUCCEEDED(hres)); } static HRESULT Global_IsArray(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 38e5e76..fbf252a 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1,4 +1,3 @@ -' ' Copyright 2011 Jacek Caban for CodeWeavers ' ' This library is free software; you can redistribute it and/or @@ -195,6 +194,31 @@ Call ok(not isNull(4), "isNull(4) is true?") Call ok(not isNull("x"), "isNull(""x"") is true?") Call ok(isNull(Null), "isNull(Null) is not true?") +Call ok(isNumeric(Empty), "isNumeric(empty) is not true?") +Call ok(not isNumeric(Null), "isNumeric(Null) is not true?") +Call ok(isNumeric(32767), "isNumeric(32767) is true?") +Call ok(isNumeric(32768), "isNumeric(32768) is true?") +Call ok(isNumeric(CSng(3242.4)), "isNumeric(CSng(3242.4)) is true?") +Call ok(isNumeric(32768.4), "isNumeric(32768.4) is true?") +Call ok(isNumeric(CCur(32768.4)), "isNumeric(CCur(32768.4)) is true?") +Call ok(isNumeric("44"), "isNumeric(""44"") is true?") +Call ok(not isNumeric("rwrf"), "isNumeric(""rwrf"") is not true?") +Call ok(not isNumeric(Nothing), "isNumeric(Nothing) is not true?") +Call ok(not isNumeric(New EmptyClass), "isNumeric(New EmptyClass) is not true?") +Call ok(isNumeric(true), "isNumeric(true) is true?") +Call ok(isNumeric(CByte(32)), "isNumeric(CByte(32)) is true?") +Dim arr(2) +arr(0) = 2 +arr(1) = 3 +Call ok(not isNumeric(arr), "isNumeric(arr) is not true?") + +Dim newObject +Set newObject = New ValClass +newObject.myval = 1 +Call ok(isNumeric(newObject), "isNumeric(newObject) is true?") +newObject.myval = "test" +Call ok(not isNumeric(newObject), "isNumeric(newObject) is not true?") + Call ok(getVT(err) = "VT_DISPATCH", "getVT(err) = " & getVT(err)) Sub TestHex(x, ex)

1 0

Zhenbo Li : mshtml: Added IHTMLFormElement:: target property implementation.
by Alexandre Julliard July 22, 2014

July 22, 2014

Module: wine Branch: master Commit: f8f8964afeb8058b4ccf52a243bddb625fa501af URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8f8964afeb8058b4ccf52a24… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Mon Jul 21 22:51:11 2014 +0800 mshtml: Added IHTMLFormElement::target property implementation. --- dlls/mshtml/htmlform.c | 29 +++++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 22 ++++++++++++++++++++++ 2 files changed, 47 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index 86af350..10b2df4 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -286,15 +286,36 @@ static HRESULT WINAPI HTMLFormElement_get_elements(IHTMLFormElement *iface, IDis static HRESULT WINAPI HTMLFormElement_put_target(IHTMLFormElement *iface, BSTR v) { HTMLFormElement *This = impl_from_IHTMLFormElement(iface); - FIXME("(%p)->(%s)\n", This, wine_dbgstr_w(v)); - return E_NOTIMPL; + nsAString str; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, wine_dbgstr_w(v)); + + nsAString_InitDepend(&str, v); + + nsres = nsIDOMHTMLFormElement_SetTarget(This->nsform, &str); + + nsAString_Finish(&str); + if (NS_FAILED(nsres)) { + ERR("Set Target(%s) failed: %08x\n", wine_dbgstr_w(v), nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLFormElement_get_target(IHTMLFormElement *iface, BSTR *p) { HTMLFormElement *This = impl_from_IHTMLFormElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&str, NULL); + nsres = nsIDOMHTMLFormElement_GetTarget(This->nsform, &str); + + return return_nsstr(nsres, &str, p); } static HRESULT WINAPI HTMLFormElement_put_name(IHTMLFormElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 487c25c..533d7b7 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3775,6 +3775,27 @@ static void _test_form_reset(unsigned line, IUnknown *unk) IHTMLFormElement_Release(form); } + +static void test_form_target(IUnknown *unk) +{ + IHTMLFormElement *form = get_form_iface(unk); + HRESULT hres; + BSTR str; + static const char target[] = "_blank"; + + str = a2bstr(target); + hres = IHTMLFormElement_put_target(form, str); + ok(hres == S_OK, "put_target(%s) failed: %08x\n", target, hres); + SysFreeString(str); + + hres = IHTMLFormElement_get_target(form, &str); + ok(hres == S_OK, "get_target failed: %08x\n", hres); + ok(!strcmp_wa(str, target), "Expected %s, got %s\n", target, wine_dbgstr_w(str)); + SysFreeString(str); + + IHTMLFormElement_Release(form); +} + #define test_meta_name(a,b) _test_meta_name(__LINE__,a,b) static void _test_meta_name(unsigned line, IUnknown *unk, const char *exname) { @@ -7342,6 +7363,7 @@ static void test_elems2(IHTMLDocument2 *doc) test_form_encoding((IUnknown*)elem, "multipart/form-data"); test_form_elements((IUnknown*)elem); test_form_reset((IUnknown*)elem); + test_form_target((IUnknown*)elem); IHTMLElement_Release(elem); }

1 0

Jacek Caban : vbscript: Use VariantChangeType in to_int.
by Alexandre Julliard July 21, 2014

July 21, 2014

Module: wine Branch: master Commit: 15dfae71a12f4937c363156849213881c879c684 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15dfae71a12f4937c36315684… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 21 16:05:14 2014 +0200 vbscript: Use VariantChangeType in to_int. --- dlls/vbscript/global.c | 54 +++++++++++---------------------------------- dlls/vbscript/tests/api.vbs | 3 +++ 2 files changed, 16 insertions(+), 41 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index af7a27d..610de43 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -142,41 +142,15 @@ static inline HRESULT return_date(VARIANT *res, double date) HRESULT to_int(VARIANT *v, int *ret) { - if(V_VT(v) == (VT_BYREF|VT_VARIANT)) - v = V_VARIANTREF(v); - - switch(V_VT(v)) { - case VT_I2: - *ret = V_I2(v); - break; - case VT_I4: - *ret = V_I4(v); - break; - case VT_R8: { - double n = floor(V_R8(v)+0.5); - INT32 i; - - if(!is_int32(n)) { - FIXME("%lf is out of int range\n", n); - return E_FAIL; - } - - /* Round half to even */ - i = n; - if(i%2 && n-V_R8(v) == 0.5) - i--; + VARIANT r; + HRESULT hres; - *ret = i; - break; - } - case VT_BOOL: - *ret = V_BOOL(v) ? -1 : 0; - break; - default: - FIXME("not supported %s\n", debugstr_variant(v)); - return E_NOTIMPL; - } + V_VT(&r) = VT_EMPTY; + hres = VariantChangeType(&r, v, 0, VT_I4); + if(FAILED(hres)) + return hres; + *ret = V_I4(&r); return S_OK; } @@ -400,24 +374,22 @@ static HRESULT Global_CInt(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI static HRESULT Global_CLng(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - VARIANT v; + int i; HRESULT hres; TRACE("%s\n", debugstr_variant(arg)); assert(args_cnt == 1); - V_VT(&v) = VT_EMPTY; - hres = VariantChangeType(&v, arg, 0, VT_I4); + hres = to_int(arg, &i); if(FAILED(hres)) return hres; - if(!res) return DISP_E_BADVARTYPE; - else { - *res = v; - return S_OK; - } + + V_VT(res) = VT_I4; + V_I4(res) = i; + return S_OK; } static HRESULT Global_CBool(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 813f5e8..38e5e76 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -136,6 +136,7 @@ Call ok(Chr(120) = "x", "Chr(120) = " & Chr(120)) Call ok(Chr(0) <> "", "Chr(0) = """"") Call ok(Chr(120.5) = "x", "Chr(120.5) = " & Chr(120.5)) Call ok(Chr(119.5) = "x", "Chr(119.5) = " & Chr(119.5)) +Call ok(Chr("120") = "x", "Chr(""120"") = " & Chr("120")) sub testChrError on error resume next @@ -321,6 +322,7 @@ Call ok(Space(5.5) = " ", "Space(5.5) = " & Space(5.5) & """") Call ok(Space(4.5) = " ", "Space(4.5) = " & Space(4.5) & """") Call ok(Space(0.5) = "", "Space(0.5) = " & Space(0.5) & """") Call ok(Space(1.5) = " ", "Space(1.5) = " & Space(1.5) & """") +Call ok(Space("1") = " ", "Space(""1"") = " & Space("1") & """") Sub TestStrReverse(str, ex) Call ok(StrReverse(str) = ex, "StrReverse(" & str & ") = " & StrReverse(str)) @@ -341,6 +343,7 @@ TestLeft "test", 0, "" TestLeft 123, 2, "12" TestLeft "123456", 1.5, "12" TestLeft "123456", 2.5, "12" +TestLeft "test", "2", "te" if isEnglishLang then TestLeft true, 2, "Tr" Sub TestRight(str, len, ex)

1 0

Akihiro Sagawa : msi/tests: Add non-existence value tests for mixed package.
by Alexandre Julliard July 21, 2014

July 21, 2014

Module: wine Branch: master Commit: 5b76cd199a2a617aa7bce9325b15d289f989d149 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b76cd199a2a617aa7bce9325… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Jul 21 21:48:15 2014 +0900 msi/tests: Add non-existence value tests for mixed package. --- dlls/msi/tests/install.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 2a9af85..bda3744 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -5701,15 +5701,19 @@ static void test_mixed_package(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", 0, KEY_ALL_ACCESS|KEY_WOW64_32KEY, &hkey); - ok(!res, "can't open 32-bit component key\n"); + ok(!res, "can't open 32-bit component key, got %d\n", res); res = RegQueryValueExA(hkey, "test1", NULL, NULL, NULL, NULL); - ok(!res, "value test1 not found\n"); + ok(!res, "expected RegQueryValueEx to succeed, got %d\n", res); + res = RegQueryValueExA(hkey, "test2", NULL, NULL, NULL, NULL); + ok(res, "expected RegQueryValueEx to fail, got %d\n", res); RegCloseKey(hkey); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", 0, KEY_ALL_ACCESS|KEY_WOW64_64KEY, &hkey); - ok(!res, "can't open 64-bit component key\n"); + ok(!res, "can't open 64-bit component key, got %d\n", res); + res = RegQueryValueExA(hkey, "test1", NULL, NULL, NULL, NULL); + ok(res, "expected RegQueryValueEx to fail, got %d\n", res); res = RegQueryValueExA(hkey, "test2", NULL, NULL, NULL, NULL); - ok(!res, "value test2 not found\n"); + ok(!res, "expected RegQueryValueEx to succeed, got %d\n", res); RegCloseKey(hkey); r = MsiInstallProductA(msifile, "REMOVE=ALL"); @@ -5728,15 +5732,19 @@ static void test_mixed_package(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", 0, KEY_ALL_ACCESS|KEY_WOW64_32KEY, &hkey); - ok(!res, "can't open 32-bit component key\n"); + ok(!res, "can't open 32-bit component key, got %d\n", res); res = RegQueryValueExA(hkey, "test1", NULL, NULL, NULL, NULL); - ok(!res, "value test1 not found\n"); + ok(!res, "expected RegQueryValueEx to succeed, got %d\n", res); + res = RegQueryValueExA(hkey, "test2", NULL, NULL, NULL, NULL); + ok(res, "expected RegQueryValueEx to fail, got %d\n", res); RegCloseKey(hkey); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", 0, KEY_ALL_ACCESS|KEY_WOW64_64KEY, &hkey); - ok(!res, "can't open 64-bit component key\n"); + ok(!res, "can't open 64-bit component key, got %d\n", res); + res = RegQueryValueExA(hkey, "test1", NULL, NULL, NULL, NULL); + ok(res, "expected RegQueryValueEx to fail, got %d\n", res); res = RegQueryValueExA(hkey, "test2", NULL, NULL, NULL, NULL); - ok(!res, "value test2 not found\n"); + ok(!res, "expected RegQueryValueEx to succeed, got %d\n", res); RegCloseKey(hkey); r = MsiInstallProductA(msifile, "REMOVE=ALL");

1 0

Andrei Slăvoiu : wined3d: Remove usage of gl_info parameter from select_card_amd_binary.
by Alexandre Julliard July 21, 2014

July 21, 2014

Module: wine Branch: master Commit: 22475ddd82b09bbd25a9eba046583e1febc5c630 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22475ddd82b09bbd25a9eba04… Author: Andrei Slăvoiu <andrei.slavoiu(a)gmail.com> Date: Sun Jul 20 19:41:13 2014 +0300 wined3d: Remove usage of gl_info parameter from select_card_amd_binary. --- dlls/wined3d/directx.c | 222 ++++++++++++++++++++++++------------------------- 1 file changed, 107 insertions(+), 115 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=22475ddd82b09bbd25a9e…

1 0

Jactry Zeng : riched20: Implement ITextSelection::GetText.
by Alexandre Julliard July 21, 2014

July 21, 2014

Module: wine Branch: master Commit: 1f6073c8614f7358b76551a9e35dccb1254d8a7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f6073c8614f7358b76551a9e… Author: Jactry Zeng <wine(a)jactry.com> Date: Tue Jul 22 00:41:29 2014 +0800 riched20: Implement ITextSelection::GetText. --- dlls/riched20/clipboard.c | 2 +- dlls/riched20/editor.c | 22 +++++++---- dlls/riched20/editor.h | 2 +- dlls/riched20/richole.c | 27 ++++++++++++- dlls/riched20/tests/richole.c | 90 +++++++++++++++++++++++++++++++++++++++++++ dlls/riched20/txtsrv.c | 2 +- 6 files changed, 132 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1f6073c8614f7358b7655…

1 0

Andrei Slăvoiu : wined3d: Remove the gl_info parameter from select_card callbacks.
by Alexandre Julliard July 21, 2014

July 21, 2014

Module: wine Branch: master Commit: 41962a5a072be0afdffa1606260c842578b2c020 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41962a5a072be0afdffa16062… Author: Andrei Slăvoiu <andrei.slavoiu(a)gmail.com> Date: Sun Jul 20 19:41:15 2014 +0300 wined3d: Remove the gl_info parameter from select_card callbacks. --- dlls/wined3d/directx.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ee610ec..6a84b85 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1674,8 +1674,7 @@ static UINT d3d_level_from_gl_info(const struct wined3d_gl_info *gl_info) return level; } -static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl_info *gl_info, - const char *gl_renderer) +static enum wined3d_pci_device select_card_nvidia_binary(const char *gl_renderer) { unsigned int i; @@ -1853,8 +1852,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl return PCI_DEVICE_NONE; } -static enum wined3d_pci_device select_card_amd_binary(const struct wined3d_gl_info *gl_info, - const char *gl_renderer) +static enum wined3d_pci_device select_card_amd_binary(const char *gl_renderer) { /* See http://developer.amd.com/drivers/pc_vendor_id/Pages/default.aspx * @@ -1978,8 +1976,7 @@ static enum wined3d_pci_device select_card_amd_binary(const struct wined3d_gl_in return PCI_DEVICE_NONE; } -static enum wined3d_pci_device select_card_intel(const struct wined3d_gl_info *gl_info, - const char *gl_renderer) +static enum wined3d_pci_device select_card_intel(const char *gl_renderer) { unsigned int i; @@ -2048,8 +2045,7 @@ static enum wined3d_pci_device select_card_intel(const struct wined3d_gl_info *g return PCI_DEVICE_NONE; } -static enum wined3d_pci_device select_card_amd_mesa(const struct wined3d_gl_info *gl_info, - const char *gl_renderer) +static enum wined3d_pci_device select_card_amd_mesa(const char *gl_renderer) { unsigned int i; @@ -2144,8 +2140,7 @@ static enum wined3d_pci_device select_card_amd_mesa(const struct wined3d_gl_info return PCI_DEVICE_NONE; } -static enum wined3d_pci_device select_card_nvidia_mesa(const struct wined3d_gl_info *gl_info, - const char *gl_renderer) +static enum wined3d_pci_device select_card_nvidia_mesa(const char *gl_renderer) { unsigned int i; @@ -2238,7 +2233,7 @@ static enum wined3d_pci_device select_card_nvidia_mesa(const struct wined3d_gl_i return PCI_DEVICE_NONE; } -static enum wined3d_pci_device select_card_vmware(const struct wined3d_gl_info *gl_info, const char *gl_renderer) +static enum wined3d_pci_device select_card_vmware(const char *gl_renderer) { if (strstr(gl_renderer, "SVGA3D")) return CARD_VMWARE_SVGA3D; @@ -2250,7 +2245,7 @@ static const struct gl_vendor_selection { enum wined3d_gl_vendor gl_vendor; const char *description; /* Description of the card selector i.e. Apple OS/X Intel */ - enum wined3d_pci_device (*select_card)(const struct wined3d_gl_info *gl_info, const char *gl_renderer); + enum wined3d_pci_device (*select_card)(const char *gl_renderer); } amd_gl_vendor_table[] = { @@ -2315,8 +2310,7 @@ static enum wined3d_pci_device select_card_fallback_intel(const struct wined3d_g } static enum wined3d_pci_device select_card_handler(const struct gl_vendor_selection *table, - unsigned int table_size, enum wined3d_gl_vendor gl_vendor, - const struct wined3d_gl_info *gl_info, const char *gl_renderer) + unsigned int table_size, enum wined3d_gl_vendor gl_vendor, const char *gl_renderer) { unsigned int i; @@ -2326,7 +2320,7 @@ static enum wined3d_pci_device select_card_handler(const struct gl_vendor_select continue; TRACE("Applying card selector \"%s\".\n", table[i].description); - return table[i].select_card(gl_info, gl_renderer); + return table[i].select_card(gl_renderer); } FIXME("Couldn't find a suitable card selector for GL vendor %04x (using GL_RENDERER %s)\n", gl_vendor, debugstr_a(gl_renderer)); @@ -2422,7 +2416,7 @@ static enum wined3d_pci_device wined3d_guess_card(const struct wined3d_gl_info * TRACE("Applying card selector \"%s\".\n", card_vendor_table[i].description); device = select_card_handler(card_vendor_table[i].gl_vendor_selection, - card_vendor_table[i].gl_vendor_count, *gl_vendor, gl_info, gl_renderer); + card_vendor_table[i].gl_vendor_count, *gl_vendor, gl_renderer); if (device != PCI_DEVICE_NONE) return device;

1 0

Jactry Zeng : riched20: Fix ME_SetSelection when cpMax > strlen().
by Alexandre Julliard July 21, 2014

July 21, 2014

Module: wine Branch: master Commit: 68b9018d50b7ef2d74c08a2562e8b670731f777f URL: http://source.winehq.org/git/wine.git/?a=commit;h=68b9018d50b7ef2d74c08a256… Author: Jactry Zeng <wine(a)jactry.com> Date: Tue Jul 22 00:40:48 2014 +0800 riched20: Fix ME_SetSelection when cpMax > strlen(). --- dlls/riched20/caret.c | 13 ++++++++++++- dlls/riched20/tests/editor.c | 14 ++++++++------ 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 90b30a2..043a32a 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -139,6 +139,7 @@ int ME_SetSelection(ME_TextEditor *editor, int from, int to) { ME_SetCursorToStart(editor, &editor->pCursors[1]); ME_SetCursorToEnd(editor, &editor->pCursors[0]); + editor->pCursors[0].nOffset = editor->pCursors[0].pRun->member.run.len; ME_InvalidateSelection(editor); return len + 1; } @@ -159,6 +160,11 @@ int ME_SetSelection(ME_TextEditor *editor, int from, int to) ME_GetSelectionOfs(editor, &start, &end); if (start != end) { + if (end > len) + { + editor->pCursors[0].nOffset = 0; + end --; + } editor->pCursors[1] = editor->pCursors[0]; ME_Repaint(editor); } @@ -200,7 +206,12 @@ int ME_SetSelection(ME_TextEditor *editor, int from, int to) if (editor->pCursors[1].pRun->member.run.nFlags & MERF_ENDPARA) editor->pCursors[1].nOffset = 0; if (editor->pCursors[0].pRun->member.run.nFlags & MERF_ENDPARA) - editor->pCursors[0].nOffset = 0; + { + if (to > len) + editor->pCursors[0].nOffset = editor->pCursors[0].pRun->member.run.len; + else + editor->pCursors[0].nOffset = 0; + } return to; } diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 3bd3ec0..5ad063e 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -4363,7 +4363,9 @@ const struct exsetsel_s exsetsel_tests[] = { {5, 10, 10, 5, 10, 0}, {15, 17, 17, 15, 17, 0}, /* test cpMax > strlen() */ - {0, 100, 18, 0, 18, 1}, + {0, 100, 18, 0, 18, 0}, + /* test cpMin < 0 && cpMax >= 0 after cpMax > strlen() */ + {-1, 1, 17, 17, 17, 0}, /* test cpMin == cpMax */ {5, 5, 5, 5, 5, 0}, /* test cpMin < 0 && cpMax >= 0 (bug 4462) */ @@ -4373,13 +4375,13 @@ const struct exsetsel_s exsetsel_tests[] = { /* test cpMin < 0 && cpMax < 0 */ {-1, -1, 17, 17, 17, 0}, {-4, -5, 17, 17, 17, 0}, - /* test cMin >=0 && cpMax < 0 (bug 6814) */ - {0, -1, 18, 0, 18, 1}, - {17, -5, 18, 17, 18, 1}, + /* test cpMin >=0 && cpMax < 0 (bug 6814) */ + {0, -1, 18, 0, 18, 0}, + {17, -5, 18, 17, 18, 0}, {18, -3, 17, 17, 17, 0}, /* test if cpMin > cpMax */ - {15, 19, 18, 15, 18, 1}, - {19, 15, 18, 15, 18, 1} + {15, 19, 18, 15, 18, 0}, + {19, 15, 18, 15, 18, 0}, }; static void check_EM_EXSETSEL(HWND hwnd, const struct exsetsel_s *setsel, int id) {

1 0

Akihiro Sagawa : msi/tests: Add CLSID registry tests for mixed package.
by Alexandre Julliard July 21, 2014

July 21, 2014

Module: wine Branch: master Commit: 0eed829f7f67364c694793a77a861dc5c9cce404 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eed829f7f67364c694793a77… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Jul 21 21:48:16 2014 +0900 msi/tests: Add CLSID registry tests for mixed package. --- dlls/msi/tests/install.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 71 insertions(+), 1 deletion(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index bda3744..a99a4c4 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1088,7 +1088,11 @@ static const char mixed_registry_dat[] = "s72\ti2\tl255\tL255\tL0\ts72\n" "Registry\tRegistry\n" "regdata1\t2\tSOFTWARE\\Wine\\msitest\ttest1\t\tcomp1\n" - "regdata2\t2\tSOFTWARE\\Wine\\msitest\ttest2\t\tcomp2\n"; + "regdata2\t2\tSOFTWARE\\Wine\\msitest\ttest2\t\tcomp2\n" + "regdata3\t0\tCLSID\\{8dfef911-6885-41eb-b280-8f0304728e8b}\t\tCLSID_Winetest32\tcomp1\n" + "regdata4\t0\tCLSID\\{8dfef911-6885-41eb-b280-8f0304728e8b}\\InProcServer32\t\twinetest32.dll\tcomp1\n" + "regdata5\t0\tCLSID\\{8dfef911-6885-41eb-b280-8f0304728e8b}\t\tCLSID_Winetest64\tcomp2\n" + "regdata6\t0\tCLSID\\{8dfef911-6885-41eb-b280-8f0304728e8b}\\InProcServer32\t\twinetest64.dll\tcomp2\n"; static const char mixed_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" @@ -5678,6 +5682,8 @@ static void test_mixed_package(void) UINT r; LONG res; HKEY hkey; + char value[MAX_PATH]; + DWORD size; if (is_process_limited()) { @@ -5716,6 +5722,28 @@ static void test_mixed_package(void) ok(!res, "expected RegQueryValueEx to succeed, got %d\n", res); RegCloseKey(hkey); + res = RegOpenKeyExA(HKEY_CLASSES_ROOT, + "CLSID\\{8dfef911-6885-41eb-b280-8f0304728e8b}\\InProcServer32", + 0, KEY_ALL_ACCESS|KEY_WOW64_32KEY, &hkey); + todo_wine ok(res == ERROR_SUCCESS, "can't open 32-bit CLSID key, got %d\n", res); + if (res == ERROR_SUCCESS) { + size = sizeof(value); + res = RegQueryValueExA(hkey, "", NULL, NULL, (LPBYTE)value, &size); + ok(!strcmp(value, "winetest32.dll"), "got %s\n", value); + RegCloseKey(hkey); + } + + res = RegOpenKeyExA(HKEY_CLASSES_ROOT, + "CLSID\\{8dfef911-6885-41eb-b280-8f0304728e8b}\\InProcServer32", + 0, KEY_ALL_ACCESS|KEY_WOW64_64KEY, &hkey); + ok(res == ERROR_SUCCESS, "can't open 64-bit CLSID key, got %d\n", res); + if (res == ERROR_SUCCESS) { + size = sizeof(value); + res = RegQueryValueExA(hkey, "", NULL, NULL, (LPBYTE)value, &size); + ok(!strcmp(value, "winetest64.dll"), "got %s\n", value); + RegCloseKey(hkey); + } + r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); @@ -5725,6 +5753,16 @@ static void test_mixed_package(void) res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", 0, KEY_ALL_ACCESS|KEY_WOW64_64KEY, &hkey); ok(res == ERROR_FILE_NOT_FOUND, "64-bit component key not removed\n"); + res = RegOpenKeyExA(HKEY_CLASSES_ROOT, + "CLSID\\{8dfef911-6885-41eb-b280-8f0304728e8b}", + 0, KEY_ALL_ACCESS|KEY_WOW64_32KEY, &hkey); + ok(res == ERROR_FILE_NOT_FOUND, "32-bit CLSID key not removed\n"); + + res = RegOpenKeyExA(HKEY_CLASSES_ROOT, + "CLSID\\{8dfef911-6885-41eb-b280-8f0304728e8b}", + 0, KEY_ALL_ACCESS|KEY_WOW64_64KEY, &hkey); + ok(res == ERROR_FILE_NOT_FOUND, "64-bit CLSID key not removed\n"); + DeleteFileA( msifile ); create_database_template(msifile, mixed_tables, sizeof(mixed_tables)/sizeof(msi_table), 200, "Intel;1033"); @@ -5747,6 +5785,28 @@ static void test_mixed_package(void) ok(!res, "expected RegQueryValueEx to succeed, got %d\n", res); RegCloseKey(hkey); + res = RegOpenKeyExA(HKEY_CLASSES_ROOT, + "CLSID\\{8dfef911-6885-41eb-b280-8f0304728e8b}\\InProcServer32", + 0, KEY_ALL_ACCESS|KEY_WOW64_32KEY, &hkey); + todo_wine ok(res == ERROR_SUCCESS, "can't open 32-bit CLSID key, got %d\n", res); + if (res == ERROR_SUCCESS) { + size = sizeof(value); + res = RegQueryValueExA(hkey, "", NULL, NULL, (LPBYTE)value, &size); + ok(!strcmp(value, "winetest32.dll"), "got %s\n", value); + RegCloseKey(hkey); + } + + res = RegOpenKeyExA(HKEY_CLASSES_ROOT, + "CLSID\\{8dfef911-6885-41eb-b280-8f0304728e8b}\\InProcServer32", + 0, KEY_ALL_ACCESS|KEY_WOW64_64KEY, &hkey); + ok(res == ERROR_SUCCESS, "can't open 64-bit CLSID key, got %d\n", res); + if (res == ERROR_SUCCESS) { + size = sizeof(value); + res = RegQueryValueExA(hkey, "", NULL, NULL, (LPBYTE)value, &size); + ok(!strcmp(value, "winetest64.dll"), "got %s\n", value); + RegCloseKey(hkey); + } + r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); @@ -5756,6 +5816,16 @@ static void test_mixed_package(void) res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", 0, KEY_ALL_ACCESS|KEY_WOW64_64KEY, &hkey); ok(res == ERROR_FILE_NOT_FOUND, "64-bit component key not removed\n"); + res = RegOpenKeyExA(HKEY_CLASSES_ROOT, + "CLSID\\{8dfef911-6885-41eb-b280-8f0304728e8b}", + 0, KEY_ALL_ACCESS|KEY_WOW64_32KEY, &hkey); + ok(res == ERROR_FILE_NOT_FOUND, "32-bit CLSID key not removed\n"); + + res = RegOpenKeyExA(HKEY_CLASSES_ROOT, + "CLSID\\{8dfef911-6885-41eb-b280-8f0304728e8b}", + 0, KEY_ALL_ACCESS|KEY_WOW64_64KEY, &hkey); + ok(res == ERROR_FILE_NOT_FOUND, "64-bit CLSID key not removed\n"); + error: DeleteFileA( msifile ); }

1 0

Akihiro Sagawa : msi: Move set_installed_prop() call because platform information is needed in it.
by Alexandre Julliard July 21, 2014

July 21, 2014

Module: wine Branch: master Commit: 6fc6d32da2eb523fa5567e890be661f5fbea88f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fc6d32da2eb523fa5567e890… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Jul 21 21:48:13 2014 +0900 msi: Move set_installed_prop() call because platform information is needed in it. --- dlls/msi/package.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 73f342c..96de82d 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1181,7 +1181,6 @@ MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db, LPCWSTR base_url ) package->ProductCode = msi_dup_property( package->db, szProductCode ); package->script = msi_alloc_zero( sizeof(MSISCRIPT) ); - set_installed_prop( package ); set_installer_properties( package ); package->ui_level = gUILevel; @@ -1656,6 +1655,7 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) return r; } msi_set_property( package->db, szDatabase, db->path, -1 ); + set_installed_prop( package ); msi_set_context( package ); while (1)

1 0

Jacek Caban : wscript: Added support for calling object by DISPID_VALUE in do_icall.
by Alexandre Julliard July 21, 2014

July 21, 2014

Module: wine Branch: master Commit: e73bd253ea4e72d0ceb5874105155fb99e6f3ea5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e73bd253ea4e72d0ceb587410… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 21 18:07:40 2014 +0200 wscript: Added support for calling object by DISPID_VALUE in do_icall. --- dlls/vbscript/interp.c | 11 ++++++++++- dlls/vbscript/tests/run.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 10641db..7c66096 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -561,7 +561,7 @@ static HRESULT do_icall(exec_ctx_t *ctx, VARIANT *res) v = V_VT(ref.u.v) == (VT_VARIANT|VT_BYREF) ? V_VARIANTREF(ref.u.v) : ref.u.v; if(arg_cnt) { - SAFEARRAY *array; + SAFEARRAY *array = NULL; switch(V_VT(v)) { case VT_ARRAY|VT_BYREF|VT_VARIANT: @@ -570,11 +570,20 @@ static HRESULT do_icall(exec_ctx_t *ctx, VARIANT *res) case VT_ARRAY|VT_VARIANT: array = V_ARRAY(ref.u.v); break; + case VT_DISPATCH: + vbstack_to_dp(ctx, arg_cnt, FALSE, &dp); + hres = disp_call(ctx->script, V_DISPATCH(v), DISPID_VALUE, &dp, res); + if(FAILED(hres)) + return hres; + break; default: FIXME("arguments not implemented\n"); return E_NOTIMPL; } + if(!array) + break; + vbstack_to_dp(ctx, arg_cnt, FALSE, &dp); hres = array_access(ctx, array, &dp, &v); if(FAILED(hres)) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 56361bf..33cf0cd 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -87,6 +87,7 @@ DEFINE_EXPECT(testobj_propget_d); DEFINE_EXPECT(testobj_propget_i); DEFINE_EXPECT(testobj_propput_d); DEFINE_EXPECT(testobj_propput_i); +DEFINE_EXPECT(testobj_value_i); DEFINE_EXPECT(global_propargput_d); DEFINE_EXPECT(global_propargput_i); DEFINE_EXPECT(global_propargput1_d); @@ -718,6 +719,29 @@ static HRESULT WINAPI testObj_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { switch(id) { + case DISPID_VALUE: { + VARIANT *arg; + int i; + + CHECK_EXPECT(testobj_value_i); + + ok(wFlags == (DISPATCH_PROPERTYGET|DISPATCH_METHOD), "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pvarRes != NULL, "pvarRes == NULL\n"); + ok(pei != NULL, "pei == NULL\n"); + + for(i=0; i<pdp->cArgs; i++) { + arg = pdp->rgvarg+pdp->cArgs-i-1; + ok(V_VT(arg) == VT_I2, "V_VT(arg) = %d\n", V_VT(arg)); + ok(V_I2(arg) == i+1, "V_I2(arg) = %d\n", V_I2(arg)); + } + + V_VT(pvarRes) = VT_I2; + V_I2(pvarRes) = pdp->cArgs; + return S_OK; + } case DISPID_TESTOBJ_PROPGET: CHECK_EXPECT(testobj_propget_i); @@ -2053,6 +2077,14 @@ static void run_tests(void) strict_dispid_check = FALSE; + SET_EXPECT(testobj_value_i); + parse_script_a("dim n,o\n set o = testObj\n n = o(1,2)\n call ok(n=2, \"n = \" & n)\n"); + CHECK_CALLED(testobj_value_i); + + SET_EXPECT(testobj_value_i); + parse_script_a("dim n,o\n set o = testObj\n n = o\n call ok(n=0, \"n = \" & n)\n"); + CHECK_CALLED(testobj_value_i); + parse_script_a("Sub testsub\n" "x = 1\n" "Call ok(x = 1, \"x = \" & x)\n"

1 0

Andrei Slăvoiu : wined3d: Remove usage of gl_info parameter from select_card_nvidia_binary.
by Alexandre Julliard July 21, 2014

July 21, 2014

Module: wine Branch: master Commit: 665c2e1e27ec2377fd0f633cecf232add21a3fc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=665c2e1e27ec2377fd0f633ce… Author: Andrei Slăvoiu <andrei.slavoiu(a)gmail.com> Date: Sun Jul 20 19:41:08 2014 +0300 wined3d: Remove usage of gl_info parameter from select_card_nvidia_binary. --- dlls/wined3d/directx.c | 320 +++++++++++++++++++++++-------------------------- 1 file changed, 147 insertions(+), 173 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=665c2e1e27ec2377fd0f6…

1 0

Thomas Faber : mpr: Do not omit mandatory argument to DeviceIoControl.
by Alexandre Julliard July 21, 2014

July 21, 2014

Module: wine Branch: master Commit: 21a7cc6fa77fffa558d56ffd330492de843c903e URL: http://source.winehq.org/git/wine.git/?a=commit;h=21a7cc6fa77fffa558d56ffd3… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Jul 19 20:52:37 2014 +0200 mpr: Do not omit mandatory argument to DeviceIoControl. --- dlls/mpr/wnet.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index bdc7ad0..dd34969 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -1763,6 +1763,7 @@ static DWORD get_drive_connection( WCHAR letter, LPWSTR remote, LPDWORD size ) struct mountmgr_unix_drive *data = (struct mountmgr_unix_drive *)buffer; HANDLE mgr; DWORD ret = WN_NOT_CONNECTED; + DWORD bytes_returned; if ((mgr = CreateFileW( MOUNTMGR_DOS_DEVICE_NAME, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, @@ -1774,7 +1775,7 @@ static DWORD get_drive_connection( WCHAR letter, LPWSTR remote, LPDWORD size ) memset( data, 0, sizeof(*data) ); data->letter = letter; if (DeviceIoControl( mgr, IOCTL_MOUNTMGR_QUERY_UNIX_DRIVE, data, sizeof(*data), - data, sizeof(buffer), NULL, NULL )) + data, sizeof(buffer), &bytes_returned, NULL )) { char *p, *mount_point = buffer + data->mount_point_offset; DWORD len;

1 0

Thomas Faber : wbemprox: Do not omit mandatory argument to DeviceIoControl.
by Alexandre Julliard July 21, 2014

July 21, 2014

Module: wine Branch: master Commit: b5bcc63f6411ced4fe756000d61c2229d4d5fe57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5bcc63f6411ced4fe756000d… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Jul 19 20:52:03 2014 +0200 wbemprox: Do not omit mandatory argument to DeviceIoControl. --- dlls/wbemprox/builtin.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index ea54213..169227e 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -1498,6 +1498,7 @@ static UINT64 get_freespace( const WCHAR *dir, UINT64 *disksize ) ULARGE_INTEGER free; DISK_GEOMETRY_EX info; HANDLE handle; + DWORD bytes_returned; free.QuadPart = 512 * 1024 * 1024; GetDiskFreeSpaceExW( dir, NULL, NULL, &free ); @@ -1506,7 +1507,7 @@ static UINT64 get_freespace( const WCHAR *dir, UINT64 *disksize ) handle = CreateFileW( root, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); if (handle != INVALID_HANDLE_VALUE) { - if (DeviceIoControl( handle, IOCTL_DISK_GET_DRIVE_GEOMETRY_EX, NULL, 0, &info, sizeof(info), NULL, NULL )) + if (DeviceIoControl( handle, IOCTL_DISK_GET_DRIVE_GEOMETRY_EX, NULL, 0, &info, sizeof(info), &bytes_returned, NULL )) *disksize = info.DiskSize.QuadPart; CloseHandle( handle ); }

1 0

Bruno Jesus : crypt32/tests: Add more tests related to certificates.
by Alexandre Julliard July 21, 2014

July 21, 2014

Module: wine Branch: master Commit: 70ff9620a84d40a3f2294d32a01c65a0ce824f80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70ff9620a84d40a3f2294d32a… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Jul 20 19:28:22 2014 -0300 crypt32/tests: Add more tests related to certificates. Thanks to Juan Lang for help. --- dlls/crypt32/tests/cert.c | 63 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 61 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 66f13db..e16ca5d 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -1564,8 +1564,12 @@ static const BYTE chain7_1[] = { static void testGetIssuerCert(void) { BOOL ret; - PCCERT_CONTEXT parent, child, cert1, cert2; - DWORD flags = 0xffffffff; + PCCERT_CONTEXT parent, child, cert1, cert2, cert3; + DWORD flags = 0xffffffff, size; + CERT_NAME_BLOB certsubject; + BYTE *certencoded; + WCHAR rootW[] = {'R', 'O', 'O', 'T', '\0'}, + certname[] = {'C', 'N', '=', 'd', 'u', 'm', 'm', 'y', ',', ' ', 'T', '=', 'T', 'e', 's', 't', '\0'}; HCERTSTORE store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); @@ -1640,6 +1644,7 @@ static void testGetIssuerCert(void) ok(ret, "CertAddEncodedCertificateToStore failed: %08x\n", GetLastError()); parent = CertGetIssuerCertificateFromStore(store, child, NULL, &flags); ok(parent == NULL, "Expected no issuer\n"); + ok(GetLastError() == CRYPT_E_NOT_FOUND, "Expected CRYPT_E_NOT_FOUND, got %08X\n", GetLastError()); /* Adding an issuer allows one (and only one) issuer to be found */ ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, chain10_1, sizeof(chain10_1), CERT_STORE_ADD_ALWAYS, &cert1); @@ -1648,6 +1653,7 @@ static void testGetIssuerCert(void) ok(parent == cert1, "Expected cert1 to be the issuer\n"); parent = CertGetIssuerCertificateFromStore(store, child, parent, &flags); ok(parent == NULL, "Expected only one issuer\n"); + ok(GetLastError() == CRYPT_E_NOT_FOUND, "Expected CRYPT_E_NOT_FOUND, got %08X\n", GetLastError()); /* Adding a second issuer allows two issuers to be found - and the second * issuer is found before the first, implying certs are added to the head * of a list. @@ -1661,6 +1667,7 @@ static void testGetIssuerCert(void) ok(parent == cert1, "Expected cert1 to be the second issuer\n"); parent = CertGetIssuerCertificateFromStore(store, child, parent, &flags); ok(parent == NULL, "Expected no more than two issuers\n"); + ok(GetLastError() == CRYPT_E_NOT_FOUND, "Expected CRYPT_E_NOT_FOUND, got %08X\n", GetLastError()); CertFreeCertificateContext(child); CertFreeCertificateContext(cert1); CertFreeCertificateContext(cert2); @@ -1677,6 +1684,7 @@ static void testGetIssuerCert(void) ok(ret, "CertAddEncodedCertificateToStore failed: %08x\n", GetLastError()); parent = CertGetIssuerCertificateFromStore(store, child, NULL, &flags); ok(parent == NULL, "Expected no issuer\n"); + ok(GetLastError() == CRYPT_E_NOT_FOUND, "Expected CRYPT_E_NOT_FOUND, got %08X\n", GetLastError()); /* Adding an issuer allows one (and only one) issuer to be found */ ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, chain10_0, sizeof(chain10_0), CERT_STORE_ADD_ALWAYS, &cert1); @@ -1685,6 +1693,7 @@ static void testGetIssuerCert(void) ok(parent == cert1, "Expected cert1 to be the issuer\n"); parent = CertGetIssuerCertificateFromStore(store, child, parent, &flags); ok(parent == NULL, "Expected only one issuer\n"); + ok(GetLastError() == CRYPT_E_NOT_FOUND, "Expected CRYPT_E_NOT_FOUND, got %08X\n", GetLastError()); /* Adding a second issuer allows two issuers to be found - and the second * issuer is found before the first, implying certs are added to the head * of a list. @@ -1698,10 +1707,60 @@ static void testGetIssuerCert(void) ok(parent == cert1, "Expected cert1 to be the second issuer\n"); parent = CertGetIssuerCertificateFromStore(store, child, parent, &flags); ok(parent == NULL, "Expected no more than two issuers\n"); + ok(GetLastError() == CRYPT_E_NOT_FOUND, "Expected CRYPT_E_NOT_FOUND, got %08X\n", GetLastError()); + + /* Self-sign a certificate, add to the store and test getting the issuer */ + size = 0; +todo_wine + ok(CertStrToNameW(X509_ASN_ENCODING, certname, CERT_X500_NAME_STR, NULL, NULL, &size, NULL), + "CertStrToName should have worked\n"); + certencoded = HeapAlloc(GetProcessHeap(), 0, size); +todo_wine + ok(CertStrToNameW(X509_ASN_ENCODING, certname, CERT_X500_NAME_STR, NULL, certencoded, &size, NULL), + "CertStrToName should have worked\n"); + certsubject.pbData = certencoded; + certsubject.cbData = size; + cert3 = CertCreateSelfSignCertificate(0, &certsubject, 0, NULL, NULL, NULL, NULL, NULL); + /* wine fails to create the certificate, this makes it crash later. + * Remove IF when wine is fixed, all windows versions must work */ + if(cert3 == NULL) + { + todo_wine ok(0, "Must work on windows\n"); + goto skiptest; + } + ok(cert3 != NULL, "CertCreateSelfSignCertificate should have worked\n"); + ret = CertAddCertificateContextToStore(store, cert3, CERT_STORE_ADD_REPLACE_EXISTING, 0); + ok(ret, "CertAddEncodedCertificateToStore failed: %08x\n", GetLastError()); + CertFreeCertificateContext(cert3); + cert3 = CertEnumCertificatesInStore(store, NULL); + ok(cert3 != NULL, "CertEnumCertificatesInStore should have worked\n"); + SetLastError(0xdeadbeef); + flags = 0; + parent = CertGetIssuerCertificateFromStore(store, cert3, NULL, &flags); + ok(!parent, "Expected NULL\n"); + ok(GetLastError() == CRYPT_E_SELF_SIGNED, + "Expected CRYPT_E_SELF_SIGNED, got %08X\n", GetLastError()); +skiptest: CertFreeCertificateContext(child); CertFreeCertificateContext(cert1); CertFreeCertificateContext(cert2); CertCloseStore(store, 0); + HeapFree(GetProcessHeap(), 0, certencoded); + + /* Test root storage self-signed certificate */ + store = CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, 0, CERT_SYSTEM_STORE_CURRENT_USER, rootW); + ok(store != NULL, "CertOpenStore failed: %08x\n", GetLastError()); + flags = 0; + cert1 = CertEnumCertificatesInStore(store, NULL); + ok(cert1 != NULL, "CertEnumCertificatesInStore should have worked\n"); + SetLastError(0xdeadbeef); + parent = CertGetIssuerCertificateFromStore(store, cert1, NULL, &flags); +todo_wine + ok(!parent, "Expected NULL\n"); +todo_wine + ok(GetLastError() == CRYPT_E_SELF_SIGNED, + "Expected CRYPT_E_SELF_SIGNED, got %08X\n", GetLastError()); + CertCloseStore(store, 0); } static void testCryptHashCert(void)

1 0

Bruno Jesus : rsaenh/tests: Simplify broken NT4 tests.
by Alexandre Julliard July 21, 2014

July 21, 2014

Module: wine Branch: master Commit: 3a7b89e4c0544db3d182d4a634748fe5f0652170 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a7b89e4c0544db3d182d4a63… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jul 19 15:10:27 2014 -0300 rsaenh/tests: Simplify broken NT4 tests. Based on Dmitry Timoshkov idea. --- dlls/rsaenh/tests/rsaenh.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 467551e..2abdc55 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -414,7 +414,7 @@ static void test_hashes(void) BYTE pbHashValue[36]; BYTE pbSigValue[128]; HCRYPTKEY hKeyExchangeKey; - DWORD hashlen, len, error; + DWORD hashlen, len, error, cryptflags; int i; for (i=0; i<2048; i++) pbData[i] = (unsigned char)i; @@ -449,9 +449,11 @@ static void test_hashes(void) result = CryptHashData(hHash, pbData, sizeof(pbData), ~0); ok(!result && GetLastError() == NTE_BAD_FLAGS, "%08x\n", GetLastError()); - result = CryptHashData(hHash, pbData, sizeof(pbData), CRYPT_USERDATA); + cryptflags = CRYPT_USERDATA; + result = CryptHashData(hHash, pbData, sizeof(pbData), cryptflags); if (!result && GetLastError() == NTE_BAD_FLAGS) /* <= NT4 */ { + cryptflags &= ~CRYPT_USERDATA; ok(broken(1), "Failed to support CRYPT_USERDATA flag\n"); result = CryptHashData(hHash, pbData, sizeof(pbData), 0); } @@ -481,12 +483,7 @@ static void test_hashes(void) result = CryptHashData(hHash, pbData, sizeof(pbData), ~0); ok(!result && GetLastError() == NTE_BAD_FLAGS, "%08x\n", GetLastError()); - result = CryptHashData(hHash, pbData, sizeof(pbData), CRYPT_USERDATA); - if (!result && GetLastError() == NTE_BAD_FLAGS) /* <= NT4 */ - { - ok(broken(1), "Failed to support CRYPT_USERDATA flag\n"); - result = CryptHashData(hHash, pbData, sizeof(pbData), 0); - } + result = CryptHashData(hHash, pbData, sizeof(pbData), cryptflags); ok(result, "%08x\n", GetLastError()); len = 16; @@ -535,12 +532,7 @@ static void test_hashes(void) result = CryptCreateHash(hProv, CALG_SHA, 0, 0, &hHash); ok(result, "%08x\n", GetLastError()); - result = CryptHashData(hHash, pbData, 5, CRYPT_USERDATA); - if (!result && GetLastError() == NTE_BAD_FLAGS) /* <= NT4 */ - { - ok(broken(1), "Failed to support CRYPT_USERDATA flag\n"); - result = CryptHashData(hHash, pbData, 5, 0); - } + result = CryptHashData(hHash, pbData, 5, cryptflags); ok(result, "%08x\n", GetLastError()); if(pCryptDuplicateHash) {

1 0

Thomas Faber : kernel32: Do not omit mandatory argument to DeviceIoControl.
by Alexandre Julliard July 21, 2014

July 21, 2014

Module: wine Branch: master Commit: 7865b1a2774e4add531e43bbc706e1c39f9eb86f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7865b1a2774e4add531e43bbc… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Jul 19 20:53:10 2014 +0200 kernel32: Do not omit mandatory argument to DeviceIoControl. --- dlls/kernel32/volume.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 1509d73..d396764 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -187,6 +187,7 @@ static DWORD get_mountmgr_drive_type( LPCWSTR root ) { HANDLE mgr; struct mountmgr_unix_drive data; + DWORD br; memset( &data, 0, sizeof(data) ); if (root) data.letter = root[0]; @@ -203,7 +204,7 @@ static DWORD get_mountmgr_drive_type( LPCWSTR root ) if (mgr == INVALID_HANDLE_VALUE) return DRIVE_UNKNOWN; if (!DeviceIoControl( mgr, IOCTL_MOUNTMGR_QUERY_UNIX_DRIVE, &data, sizeof(data), &data, - sizeof(data), NULL, NULL ) && GetLastError() != ERROR_MORE_DATA) + sizeof(data), &br, NULL ) && GetLastError() != ERROR_MORE_DATA) data.type = DRIVE_UNKNOWN; CloseHandle( mgr ); @@ -1044,6 +1045,7 @@ BOOL WINAPI GetVolumeNameForVolumeMountPointW( LPCWSTR path, LPWSTR volume, DWOR NTSTATUS status; HANDLE mgr = INVALID_HANDLE_VALUE; BOOL ret = FALSE; + DWORD br; TRACE("(%s, %p, %x)\n", debugstr_w(path), volume, size); if (path[lstrlenW(path)-1] != '\\') @@ -1110,7 +1112,7 @@ BOOL WINAPI GetVolumeNameForVolumeMountPointW( LPCWSTR path, LPWSTR volume, DWOR /* now get the true volume name from the mountmgr */ if (!DeviceIoControl( mgr, IOCTL_MOUNTMGR_QUERY_POINTS, input, i_size, - output, o_size, NULL, NULL )) + output, o_size, &br, NULL )) goto err_ret; /* Verify and return the data, note string is not null terminated */ @@ -1869,6 +1871,7 @@ static MOUNTMGR_MOUNT_POINTS *query_mount_points( HANDLE mgr, MOUNTMGR_MOUNT_POI { MOUNTMGR_MOUNT_POINTS *output; DWORD outsize = 1024; + DWORD br; for (;;) { @@ -1877,7 +1880,7 @@ static MOUNTMGR_MOUNT_POINTS *query_mount_points( HANDLE mgr, MOUNTMGR_MOUNT_POI SetLastError( ERROR_NOT_ENOUGH_MEMORY ); return NULL; } - if (DeviceIoControl( mgr, IOCTL_MOUNTMGR_QUERY_POINTS, input, insize, output, outsize, NULL, NULL )) break; + if (DeviceIoControl( mgr, IOCTL_MOUNTMGR_QUERY_POINTS, input, insize, output, outsize, &br, NULL )) break; outsize = output->Size; HeapFree( GetProcessHeap(), 0, output ); if (GetLastError() != ERROR_MORE_DATA) return NULL; @@ -2024,6 +2027,7 @@ HANDLE WINAPI FindFirstVolumeA(LPSTR volume, DWORD len) HANDLE WINAPI FindFirstVolumeW( LPWSTR volume, DWORD len ) { DWORD size = 1024; + DWORD br; HANDLE mgr = CreateFileW( MOUNTMGR_DOS_DEVICE_NAME, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); if (mgr == INVALID_HANDLE_VALUE) return INVALID_HANDLE_VALUE; @@ -2041,7 +2045,7 @@ HANDLE WINAPI FindFirstVolumeW( LPWSTR volume, DWORD len ) memset( &input, 0, sizeof(input) ); if (!DeviceIoControl( mgr, IOCTL_MOUNTMGR_QUERY_POINTS, &input, sizeof(input), - output, size, NULL, NULL )) + output, size, &br, NULL )) { if (GetLastError() != ERROR_MORE_DATA) break; size = output->Size;

1 0

Bruno Jesus : rsaenh/tests: Fix some Windows 8 tests.
by Alexandre Julliard July 21, 2014

July 21, 2014

Module: wine Branch: master Commit: 7e456b8f25cfe2096f96e146e700abaf565a897c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e456b8f25cfe2096f96e146e… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jul 19 15:10:30 2014 -0300 rsaenh/tests: Fix some Windows 8 tests. --- dlls/rsaenh/tests/rsaenh.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 2abdc55..755ca3e 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -656,7 +656,8 @@ static void test_hashes(void) ok(result, "CryptCreateHash failed 0x%08x\n", GetLastError()); /* Test that CryptHashData fails on this hash */ result = CryptHashData(hHash, pbData, sizeof(pbData), 0); - ok(!result && GetLastError() == NTE_BAD_ALGID, "%08x\n", GetLastError()); + ok(!result && (GetLastError() == NTE_BAD_ALGID || broken(GetLastError() == ERROR_INVALID_HANDLE)) /* Win 8 */, + "%08x\n", GetLastError()); result = CryptSetHashParam(hHash, HP_HASHVAL, pbHashValue, 0); ok(result, "%08x\n", GetLastError()); len = (DWORD)sizeof(abPlainPrivateKey); @@ -779,11 +780,18 @@ static void test_block_cipher_modes(void) dwMode = CRYPT_MODE_OFB; result = CryptSetKeyParam(hKey, KP_MODE, (BYTE*)&dwMode, 0); - ok(result, "%08x\n", GetLastError()); - - dwLen = 23; - result = CryptEncrypt(hKey, 0, TRUE, 0, abData, &dwLen, 24); - ok(!result && GetLastError() == NTE_BAD_ALGID, "%08x\n", GetLastError()); + if(!result && GetLastError() == ERROR_INTERNAL_ERROR) + { + ok(broken(1), "OFB mode not supported\n"); /* Windows 8 */ + } + else + { + ok(result, "%08x\n", GetLastError()); + + dwLen = 23; + result = CryptEncrypt(hKey, 0, TRUE, 0, abData, &dwLen, 24); + ok(!result && GetLastError() == NTE_BAD_ALGID, "%08x\n", GetLastError()); + } CryptDestroyKey(hKey); }

1 0