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

Nikolay Sivov : msscript: Added IActiveScriptSiteWindow stub.
by Alexandre Julliard July 21, 2016

July 21, 2016

Module: wine Branch: master Commit: 11275cc707a10811aecdf201896384d487b11909 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11275cc707a10811aecdf2018… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 20 22:31:18 2016 +0300 msscript: Added IActiveScriptSiteWindow stub. 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 | 55 ++++++++++++++++++++++++++++++++++++++ dlls/msscript.ocx/tests/msscript.c | 11 +++++--- 2 files changed, 63 insertions(+), 3 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 3fcbb42..752679a 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -57,6 +57,7 @@ struct ConnectionPoint { typedef struct ScriptHost { IActiveScriptSite IActiveScriptSite_iface; + IActiveScriptSiteWindow IActiveScriptSiteWindow_iface; IServiceProvider IServiceProvider_iface; LONG ref; @@ -222,6 +223,11 @@ static inline ScriptHost *impl_from_IActiveScriptSite(IActiveScriptSite *iface) return CONTAINING_RECORD(iface, ScriptHost, IActiveScriptSite_iface); } +static inline ScriptHost *impl_from_IActiveScriptSiteWindow(IActiveScriptSiteWindow *iface) +{ + return CONTAINING_RECORD(iface, ScriptHost, IActiveScriptSiteWindow_iface); +} + static inline ScriptHost *impl_from_IServiceProvider(IServiceProvider *iface) { return CONTAINING_RECORD(iface, ScriptHost, IServiceProvider_iface); @@ -238,6 +244,9 @@ static HRESULT WINAPI ActiveScriptSite_QueryInterface(IActiveScriptSite *iface, }else if(IsEqualGUID(&IID_IActiveScriptSite, riid)) { TRACE("(%p)->(IID_IActiveScriptSite %p)\n", This, ppv); *ppv = &This->IActiveScriptSite_iface; + }else if(IsEqualGUID(&IID_IActiveScriptSiteWindow, riid)) { + TRACE("(%p)->(IID_IActiveScriptSiteWindow %p)\n", This, ppv); + *ppv = &This->IActiveScriptSiteWindow_iface; }else if(IsEqualGUID(&IID_IServiceProvider, riid)) { TRACE("(%p)->(IID_IServiceProvider %p)\n", This, ppv); *ppv = &This->IServiceProvider_iface; @@ -379,6 +388,51 @@ static const IActiveScriptSiteVtbl ActiveScriptSiteVtbl = { ActiveScriptSite_OnLeaveScript }; +/* IActiveScriptSiteWindow */ +static HRESULT WINAPI ActiveScriptSiteWindow_QueryInterface(IActiveScriptSiteWindow *iface, REFIID riid, void **obj) +{ + ScriptHost *This = impl_from_IActiveScriptSiteWindow(iface); + return IActiveScriptSite_QueryInterface(&This->IActiveScriptSite_iface, riid, obj); +} + +static ULONG WINAPI ActiveScriptSiteWindow_AddRef(IActiveScriptSiteWindow *iface) +{ + ScriptHost *This = impl_from_IActiveScriptSiteWindow(iface); + return IActiveScriptSite_AddRef(&This->IActiveScriptSite_iface); +} + +static ULONG WINAPI ActiveScriptSiteWindow_Release(IActiveScriptSiteWindow *iface) +{ + ScriptHost *This = impl_from_IActiveScriptSiteWindow(iface); + return IActiveScriptSite_Release(&This->IActiveScriptSite_iface); +} + +static HRESULT WINAPI ActiveScriptSiteWindow_GetWindow(IActiveScriptSiteWindow *iface, HWND *hwnd) +{ + ScriptHost *This = impl_from_IActiveScriptSiteWindow(iface); + + FIXME("(%p, %p)\n", This, hwnd); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ActiveScriptSiteWindow_EnableModeless(IActiveScriptSiteWindow *iface, BOOL enable) +{ + ScriptHost *This = impl_from_IActiveScriptSiteWindow(iface); + + FIXME("(%p, %d)\n", This, enable); + + return E_NOTIMPL; +} + +static const IActiveScriptSiteWindowVtbl ActiveScriptSiteWindowVtbl = { + ActiveScriptSiteWindow_QueryInterface, + ActiveScriptSiteWindow_AddRef, + ActiveScriptSiteWindow_Release, + ActiveScriptSiteWindow_GetWindow, + ActiveScriptSiteWindow_EnableModeless +}; + /* IServiceProvider */ static HRESULT WINAPI ServiceProvider_QueryInterface(IServiceProvider *iface, REFIID riid, void **obj) { @@ -428,6 +482,7 @@ static HRESULT init_script_host(const CLSID *clsid, ScriptHost **ret) return E_OUTOFMEMORY; host->IActiveScriptSite_iface.lpVtbl = &ActiveScriptSiteVtbl; + host->IActiveScriptSiteWindow_iface.lpVtbl = &ActiveScriptSiteWindowVtbl; host->IServiceProvider_iface.lpVtbl = &ServiceProviderVtbl; host->ref = 1; host->script = NULL; diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 1ef7e9f..17b7fc1 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -247,6 +247,7 @@ static ULONG WINAPI ActiveScript_Release(IActiveScript *iface) static HRESULT WINAPI ActiveScript_SetScriptSite(IActiveScript *iface, IActiveScriptSite *pass) { IActiveScriptSiteInterruptPoll *poll; + IActiveScriptSiteWindow *window; IActiveScriptSiteDebug *debug; IServiceProvider *service; ICanHandleException *canexpection; @@ -258,7 +259,7 @@ static HRESULT WINAPI ActiveScript_SetScriptSite(IActiveScript *iface, IActiveSc ok(pass != NULL, "pass == NULL\n"); hres = IActiveScriptSite_QueryInterface(pass, &IID_IActiveScriptSiteInterruptPoll, (void**)&poll); - ok(hres == E_NOINTERFACE, "Could not get IActiveScriptSiteInterruptPoll interface: %08x\n", hres); + ok(hres == E_NOINTERFACE, "Got IActiveScriptSiteInterruptPoll interface: %08x\n", hres); hres = IActiveScriptSite_GetLCID(pass, &lcid); ok(hres == S_OK, "GetLCID failed: %08x\n", hres); @@ -267,15 +268,19 @@ static HRESULT WINAPI ActiveScript_SetScriptSite(IActiveScript *iface, IActiveSc ok(hres == E_NOTIMPL, "OnStateChange failed: %08x\n", hres); hres = IActiveScriptSite_QueryInterface(pass, &IID_IActiveScriptSiteDebug, (void**)&debug); - ok(hres == E_NOINTERFACE, "Could not get IActiveScriptSiteDebug interface: %08x\n", hres); + ok(hres == E_NOINTERFACE, "Got IActiveScriptSiteDebug interface: %08x\n", hres); hres = IActiveScriptSite_QueryInterface(pass, &IID_ICanHandleException, (void**)&canexpection); - ok(hres == E_NOINTERFACE, "Could not get IID_ICanHandleException interface: %08x\n", hres); + ok(hres == E_NOINTERFACE, "Got IID_ICanHandleException interface: %08x\n", hres); hres = IActiveScriptSite_QueryInterface(pass, &IID_IServiceProvider, (void**)&service); ok(hres == S_OK, "Could not get IServiceProvider interface: %08x\n", hres); IServiceProvider_Release(service); + hres = IActiveScriptSite_QueryInterface(pass, &IID_IActiveScriptSiteWindow, (void**)&window); + ok(hres == S_OK, "Could not get IActiveScriptSiteWindow interface: %08x\n", hres); + IActiveScriptSiteWindow_Release(window); + site = pass; IActiveScriptSite_AddRef(site); return S_OK;

1 0

Henri Verbeet : wined3d: Also try DRIVER_MODEL_NT6X in init_driver_info().
by Alexandre Julliard July 21, 2016

July 21, 2016

Module: wine Branch: master Commit: f03c25699723ed03aa0b05e5d432a52402608f94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f03c25699723ed03aa0b05e5d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 21 15:57:57 2016 +0200 wined3d: Also try DRIVER_MODEL_NT6X in init_driver_info(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index dc41c7e..a1af01c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1588,7 +1588,8 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, * This could be an indication that our database is not up to date, so this should be fixed. */ if ((version_info = get_driver_version_info(driver, driver_model)) - || (version_info = get_driver_version_info(driver, DRIVER_MODEL_NT5X))) + || (version_info = get_driver_version_info(driver, DRIVER_MODEL_NT5X)) + || (version_info = get_driver_version_info(driver, DRIVER_MODEL_NT6X))) { driver_info->name = version_info->driver_name; driver_info->version_high = MAKEDWORD_VERSION(driver_os_version, version_info->version);

1 0

Nikolay Sivov : msscript: Added IServiceProvider stub.
by Alexandre Julliard July 21, 2016

July 21, 2016

Module: wine Branch: master Commit: f2a8b5d2abc7c5020c72b08d3d469d88ec1ec32a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2a8b5d2abc7c5020c72b08d3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 20 22:31:17 2016 +0300 msscript: Added IServiceProvider stub. 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 | 46 ++++++++++++++++++++++++++++++++++++++ dlls/msscript.ocx/tests/msscript.c | 4 +--- 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 3b097af..3fcbb42 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -57,6 +57,7 @@ struct ConnectionPoint { typedef struct ScriptHost { IActiveScriptSite IActiveScriptSite_iface; + IServiceProvider IServiceProvider_iface; LONG ref; IActiveScript *script; @@ -221,6 +222,11 @@ static inline ScriptHost *impl_from_IActiveScriptSite(IActiveScriptSite *iface) return CONTAINING_RECORD(iface, ScriptHost, IActiveScriptSite_iface); } +static inline ScriptHost *impl_from_IServiceProvider(IServiceProvider *iface) +{ + return CONTAINING_RECORD(iface, ScriptHost, IServiceProvider_iface); +} + /* IActiveScriptSite */ static HRESULT WINAPI ActiveScriptSite_QueryInterface(IActiveScriptSite *iface, REFIID riid, void **ppv) { @@ -232,6 +238,9 @@ static HRESULT WINAPI ActiveScriptSite_QueryInterface(IActiveScriptSite *iface, }else if(IsEqualGUID(&IID_IActiveScriptSite, riid)) { TRACE("(%p)->(IID_IActiveScriptSite %p)\n", This, ppv); *ppv = &This->IActiveScriptSite_iface; + }else if(IsEqualGUID(&IID_IServiceProvider, riid)) { + TRACE("(%p)->(IID_IServiceProvider %p)\n", This, ppv); + *ppv = &This->IServiceProvider_iface; }else { FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); *ppv = NULL; @@ -370,6 +379,42 @@ static const IActiveScriptSiteVtbl ActiveScriptSiteVtbl = { ActiveScriptSite_OnLeaveScript }; +/* IServiceProvider */ +static HRESULT WINAPI ServiceProvider_QueryInterface(IServiceProvider *iface, REFIID riid, void **obj) +{ + ScriptHost *This = impl_from_IServiceProvider(iface); + return IActiveScriptSite_QueryInterface(&This->IActiveScriptSite_iface, riid, obj); +} + +static ULONG WINAPI ServiceProvider_AddRef(IServiceProvider *iface) +{ + ScriptHost *This = impl_from_IServiceProvider(iface); + return IActiveScriptSite_AddRef(&This->IActiveScriptSite_iface); +} + +static ULONG WINAPI ServiceProvider_Release(IServiceProvider *iface) +{ + ScriptHost *This = impl_from_IServiceProvider(iface); + return IActiveScriptSite_Release(&This->IActiveScriptSite_iface); +} + +static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, REFGUID service, + REFIID riid, void **obj) +{ + ScriptHost *This = impl_from_IServiceProvider(iface); + + FIXME("(%p)->(%s %s %p)\n", This, debugstr_guid(service), debugstr_guid(riid), obj); + + return E_NOTIMPL; +} + +static const IServiceProviderVtbl ServiceProviderVtbl = { + ServiceProvider_QueryInterface, + ServiceProvider_AddRef, + ServiceProvider_Release, + ServiceProvider_QueryService +}; + static HRESULT init_script_host(const CLSID *clsid, ScriptHost **ret) { IObjectSafety *objsafety; @@ -383,6 +428,7 @@ static HRESULT init_script_host(const CLSID *clsid, ScriptHost **ret) return E_OUTOFMEMORY; host->IActiveScriptSite_iface.lpVtbl = &ActiveScriptSiteVtbl; + host->IServiceProvider_iface.lpVtbl = &ServiceProviderVtbl; host->ref = 1; host->script = NULL; host->parse = NULL; diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index a211fe3..1ef7e9f 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -273,10 +273,8 @@ static HRESULT WINAPI ActiveScript_SetScriptSite(IActiveScript *iface, IActiveSc ok(hres == E_NOINTERFACE, "Could not get IID_ICanHandleException interface: %08x\n", hres); hres = IActiveScriptSite_QueryInterface(pass, &IID_IServiceProvider, (void**)&service); -todo_wine ok(hres == S_OK, "Could not get IServiceProvider interface: %08x\n", hres); - if(SUCCEEDED(hres)) - IServiceProvider_Release(service); + IServiceProvider_Release(service); site = pass; IActiveScriptSite_AddRef(site);

1 0

Nikolay Sivov : msscript: Implement Reset().
by Alexandre Julliard July 21, 2016

July 21, 2016

Module: wine Branch: master Commit: 20993a38f162bd5d75e3720d81307c8aa6df4a39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20993a38f162bd5d75e3720d8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 20 22:31:19 2016 +0300 msscript: Implement Reset(). 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 | 9 ++++- dlls/msscript.ocx/tests/msscript.c | 79 +++++++++++++++++++++++++++++++++++++- 2 files changed, 85 insertions(+), 3 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 752679a..79e53f1 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -847,8 +847,13 @@ static HRESULT WINAPI ScriptControl_AddObject(IScriptControl *iface, BSTR name, static HRESULT WINAPI ScriptControl_Reset(IScriptControl *iface) { ScriptControl *This = impl_from_IScriptControl(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + if (!This->host) + return E_FAIL; + + return IActiveScript_SetScriptState(This->host->script, SCRIPTSTATE_INITIALIZED); } static HRESULT WINAPI ScriptControl_AddCode(IScriptControl *iface, BSTR code) diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 17b7fc1..3f3ff00 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -94,6 +94,7 @@ DEFINE_EXPECT(InitNew); DEFINE_EXPECT(Close); DEFINE_EXPECT(SetScriptSite); DEFINE_EXPECT(QI_IActiveScriptParse); +DEFINE_EXPECT(SetScriptState_INITIALIZED); #define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) static void _expect_ref(IUnknown* obj, ULONG ref, int line) @@ -295,7 +296,13 @@ static HRESULT WINAPI ActiveScript_GetScriptSite(IActiveScript *iface, REFIID ri static HRESULT WINAPI ActiveScript_SetScriptState(IActiveScript *iface, SCRIPTSTATE ss) { - ok(0, "unexpected call\n"); + if (ss == SCRIPTSTATE_INITIALIZED) { + CHECK_EXPECT(SetScriptState_INITIALIZED); + return S_OK; + } + else + ok(0, "unexpected call, state %u\n", ss); + return E_NOTIMPL; } @@ -1010,6 +1017,75 @@ static void test_timeout(void) IScriptControl_Release(sc); } +static void test_Reset(void) +{ + IScriptControl *sc; + HRESULT hr; + BSTR str; + + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void**)&sc); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IScriptControl_Reset(sc); + ok(hr == E_FAIL, "got 0x%08x\n", hr); + + str = SysAllocString(vbW); + hr = IScriptControl_put_Language(sc, str); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(str); + + hr = IScriptControl_Reset(sc); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IScriptControl_get_Language(sc, &str); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(str, vbW), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + IScriptControl_Release(sc); + + /* custom script engine */ + if (register_script_engine()) { + static const WCHAR testscriptW[] = {'t','e','s','t','s','c','r','i','p','t',0}; + + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void**)&sc); + ok(hr == S_OK, "got 0x%08x\n", hr); + + SET_EXPECT(CreateInstance); + SET_EXPECT(SetInterfaceSafetyOptions); + SET_EXPECT(SetScriptSite); + SET_EXPECT(QI_IActiveScriptParse); + SET_EXPECT(InitNew); + + str = SysAllocString(testscriptW); + hr = IScriptControl_put_Language(sc, str); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(str); + + SET_EXPECT(SetScriptState_INITIALIZED); + hr = IScriptControl_Reset(sc); + ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_CALLED(SetScriptState_INITIALIZED); + + SET_EXPECT(SetScriptState_INITIALIZED); + hr = IScriptControl_Reset(sc); + ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_CALLED(SetScriptState_INITIALIZED); + + init_registry(FALSE); + + SET_EXPECT(Close); + + IScriptControl_Release(sc); + + CHECK_CALLED(Close); + } + else + skip("Could not register TestScript engine\n"); +} + START_TEST(msscript) { IUnknown *unk; @@ -1034,6 +1110,7 @@ START_TEST(msscript) test_viewobject(); test_pointerinactive(); test_timeout(); + test_Reset(); CoUninitialize(); }

1 0

Henri Verbeet : d3drm/tests: Fix some IDirect3D2 reference leaks.
by Alexandre Julliard July 21, 2016

July 21, 2016

Module: wine Branch: master Commit: fe3a78ba996280b8c43ac99230e5d599c470e243 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe3a78ba996280b8c43ac9923… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 21 15:57:56 2016 +0200 d3drm/tests: Fix some IDirect3D2 reference leaks. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 15e62b5..76e4fb4 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -4474,7 +4474,7 @@ static void test_create_device_from_d3d2(void) /* Release leaked references */ while (IDirect3DRM_Release(d3drm1) > ref4); while (IDirect3DDevice2_Release(temp_d3ddevice2) > 0); - while (IDirect3D2_Release(temp_d3d2) > ref5); + while (IDirect3D2_Release(temp_d3d2) >= ref5); IDirectDrawSurface_Release(surface); IDirectDraw2_Release(temp_ddraw2); IDirectDraw_Release(temp_ddraw1); @@ -4755,7 +4755,7 @@ static void test_create_device_from_d3d3(void) /* Release leaked references */ while (IDirect3DRM_Release(d3drm1) > ref4); while (IDirect3DDevice2_Release(temp_d3ddevice2) > 0); - while (IDirect3D2_Release(temp_d3d2) > ref5); + while (IDirect3D2_Release(temp_d3d2) >= ref5); IDirectDrawSurface_Release(surface); IDirectDraw2_Release(temp_ddraw2); IDirectDraw_Release(temp_ddraw1);

1 0

Iván Matellanes : msvcirt: Implement istream::ws.
by Alexandre Julliard July 21, 2016

July 21, 2016

Module: wine Branch: master Commit: 681e905b6e319baaa352f342a0ffa476b3242b58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=681e905b6e319baaa352f342a… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Thu Jul 21 10:56:51 2016 +0100 msvcirt: Implement istream::ws. 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 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 9361d6b..7ea6541 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -3546,8 +3546,9 @@ int __thiscall istream_getdouble(istream *this, char *str, int count) /* ?ws@@YAAEAVistream@@AEAV1@@Z */ istream* __cdecl istream_ws(istream *this) { - FIXME("(%p) stub\n", this); - return this; + TRACE("(%p)\n", this); + istream_eatwhite(this); + return this; } /******************************************************************

1 0

Hugh McMaster : regedit: Output the registry data type as a string when it is used in error messages.
by Alexandre Julliard July 21, 2016

July 21, 2016

1 0

Iván Matellanes : msvcirt: Implement istream:: getdouble.
by Alexandre Julliard July 21, 2016

July 21, 2016

Module: wine Branch: master Commit: ae5343bd97bb5a22857b1c72bccc7c68a8410337 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae5343bd97bb5a22857b1c72b… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Thu Jul 21 10:56:50 2016 +0100 msvcirt: Implement istream::getdouble. 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 | 63 +++++++++++++++++++++-- dlls/msvcirt/tests/msvcirt.c | 117 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 177 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ae5343bd97bb5a22857b1…

1 0

Hugh McMaster : reg: Handle a special case for Default values and ' reg query'.
by Alexandre Julliard July 21, 2016

July 21, 2016

1 0

Hugh McMaster : regedit: Use generic ARRAY_SIZE macro to allow for broader use.
by Alexandre Julliard July 21, 2016

July 21, 2016

Module: wine Branch: master Commit: bb2c799f3656c70155b04da8f4852de89fa1d50e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb2c799f3656c70155b04da8f… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 21 05:48:43 2016 +0000 regedit: Use generic ARRAY_SIZE macro to allow for broader use. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index be6f7a5..eefa35f 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -50,7 +50,7 @@ static HKEY reg_class_keys[] = { HKEY_CURRENT_CONFIG, HKEY_CURRENT_USER, HKEY_DYN_DATA }; -#define REG_CLASS_NUMBER (sizeof(reg_class_keys) / sizeof(reg_class_keys[0])) +#define ARRAY_SIZE(A) (sizeof(A)/sizeof(*A)) /* return values */ #define NOT_ENOUGH_MEMORY 1 @@ -317,7 +317,7 @@ static BOOL parseKeyName(LPWSTR lpKeyName, HKEY *hKey, LPWSTR *lpKeyPath) } *hKey = NULL; - for (i = 0; i < REG_CLASS_NUMBER; i++) { + for (i = 0; i < ARRAY_SIZE(reg_class_keys); i++) { if (CompareStringW(LOCALE_USER_DEFAULT, 0, lpKeyName, len, reg_class_namesW[i], -1) == CSTR_EQUAL && len == lstrlenW(reg_class_namesW[i])) { *hKey = reg_class_keys[i]; @@ -1309,7 +1309,7 @@ BOOL export_registry_key(WCHAR *file_name, WCHAR *reg_key_name, DWORD format) /* export all registry classes */ file = REGPROC_open_export_file(file_name, unicode); - for (i = 0; i < REG_CLASS_NUMBER; i++) { + for (i = 0; i < ARRAY_SIZE(reg_class_keys); i++) { /* do not export HKEY_CLASSES_ROOT */ if (reg_class_keys[i] != HKEY_CLASSES_ROOT && reg_class_keys[i] != HKEY_CURRENT_USER &&

1 0