February 2016 - Wine-Commits

Anton Baskanov : strmbase: Decommit allocator when streaming stops.
by Alexandre Julliard Feb. 1, 2016

Feb. 1, 2016

Module: wine Branch: master Commit: 3e02882508ae37532752820d1d9ef8965e5fe237 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e02882508ae37532752820d1… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Sat Jan 30 22:01:22 2016 +0600 strmbase: Decommit allocator when streaming stops. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/transform.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 59c89be..4ad9730 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -365,6 +365,8 @@ HRESULT WINAPI TransformFilterImpl_Stop(IBaseFilter * iface) This->filter.state = State_Stopped; if (This->pFuncsTable->pfnStopStreaming) hr = This->pFuncsTable->pfnStopStreaming(This); + if (SUCCEEDED(hr)) + hr = BaseOutputPinImpl_Inactive(impl_BaseOutputPin_from_IPin(This->ppPins[1])); } LeaveCriticalSection(&This->csReceive);

1 0

Jacek Caban : mshtml: Wine Gecko 2.44 release.
by Alexandre Julliard Feb. 1, 2016

Feb. 1, 2016

Module: wine Branch: master Commit: db105f08d247997f0d14b905f31b5b4fa2e083c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db105f08d247997f0d14b905f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jan 30 16:50:52 2016 +0100 mshtml: Wine Gecko 2.44 release. Includes fixes by Sebastian Lackner. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 6 +- dlls/mshtml/mshtml_private.h | 5 +- dlls/mshtml/mutation.c | 10 +- dlls/mshtml/nsembed.c | 16 +- dlls/mshtml/nsiface.idl | 245 +++++++++--------- dlls/mshtml/nsio.c | 604 +++++++++++++++---------------------------- 6 files changed, 350 insertions(+), 536 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=db105f08d247997f0d14b…

1 0

Henri Verbeet : ddraw: Print an ERR for non-zero sub-resource indices in ddraw_surface7_Flip().
by Alexandre Julliard Feb. 1, 2016

Feb. 1, 2016

Module: wine Branch: master Commit: 8ae4580137c2fbd4815e7e7eababf3bc7a0dba65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ae4580137c2fbd4815e7e7ea… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 29 18:48:56 2016 +0100 ddraw: Print an ERR for non-zero sub-resource indices in ddraw_surface7_Flip(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 3e57ad6..c9ac73c 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1239,6 +1239,8 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 tmp_rtv = ddraw_surface_get_rendertarget_view(dst_impl); tmp = dst_impl->wined3d_surface; + if (dst_impl->sub_resource_idx) + ERR("Invalid sub-resource index %u on surface %p.\n", dst_impl->sub_resource_idx, dst_impl); texture = dst_impl->wined3d_texture; rtv = wined3d_device_get_rendertarget_view(dst_impl->ddraw->wined3d_device, 0); ddraw_texture = wined3d_texture_get_parent(dst_impl->wined3d_texture); @@ -1271,6 +1273,8 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 dst_impl->wined3d_surface = src_impl->wined3d_surface; prev_ddraw_texture = wined3d_texture_get_parent(src_impl->wined3d_texture); wined3d_resource_set_parent(wined3d_texture_get_resource(src_impl->wined3d_texture), ddraw_texture); + if (src_impl->sub_resource_idx) + ERR("Invalid sub-resource index %u on surface %p.\n", src_impl->sub_resource_idx, src_impl); dst_impl->wined3d_texture = src_impl->wined3d_texture; ddraw_texture = prev_ddraw_texture; } @@ -1302,6 +1306,8 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 prev_ddraw_texture = wined3d_texture_get_parent(src_impl->wined3d_texture); wined3d_resource_set_parent(wined3d_texture_get_resource(src_impl->wined3d_texture), ddraw_texture); ddraw_texture = prev_ddraw_texture; + if (src_impl->sub_resource_idx) + ERR("Invalid sub-resource index %u on surface %p.\n", src_impl->sub_resource_idx, src_impl); dst_impl->wined3d_texture = src_impl->wined3d_texture; dst_impl = src_impl; }

1 0

Jacek Caban : jscript: Fixed tests on some old jscript versions.
by Alexandre Julliard Feb. 1, 2016

Feb. 1, 2016

Module: wine Branch: master Commit: 45b33347572aec824f1eff83edf6bf9ca53a10d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45b33347572aec824f1eff83e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 29 16:15:25 2016 +0100 jscript: Fixed tests on some old jscript versions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/tests/api.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index eb33675..dacacc4 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1780,7 +1780,6 @@ ok(isNaN(tmp), "Math.tan(-Infinity) is not NaN"); [[NaN], "null"], [[Infinity], "null"], [[-Infinity], "null"], - [[undefined], undefined], [[{prop1: true, prop2: "string"}], "{\"prop1\":true,\"prop2\":\"string\"}"], [[{prop1: true, prop2: testObj, prop3: undefined}], "{\"prop1\":true}"], [[{prop1: true, prop2: {prop: "string"}},undefined," "], @@ -1795,11 +1794,16 @@ ok(isNaN(tmp), "Math.tan(-Infinity) is not NaN"); for(i=0; i < stringify_tests.length; i++) { s = JSON.stringify.apply(null, stringify_tests[i][0]); ok(s === stringify_tests[i][1], - "stringify(" + stringify_tests[i][0] + ") returned " + s + " expected " + stringify_tests[i][1]); + "["+i+"] stringify(" + stringify_tests[i][0] + ") returned " + s + " expected " + stringify_tests[i][1]); } s = JSON.stringify(testObj); - ok(s === undefined, "stringify(testObj) returned " + s); + ok(s === undefined || s === "undefined" /* broken on some old versions */, + "stringify(testObj) returned " + s + " expected undfined"); + + s = JSON.stringify(undefined); + ok(s === undefined || s === "undefined" /* broken on some old versions */, + "stringify(undefined) returned " + s + " expected undfined"); var parse_tests = [ ["true", true],

1 0

Alexandre Julliard : server: Fix checks for a valid directory in object attributes.
by Alexandre Julliard Feb. 1, 2016

Feb. 1, 2016

Module: wine Branch: master Commit: 37503be65497b97fe5197c2c5c28486e3ff73e59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37503be65497b97fe5197c2c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 1 14:57:37 2016 +0900 server: Fix checks for a valid directory in object attributes. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 84 ++++----------------------------------------------- server/completion.c | 5 ++- server/directory.c | 5 ++- server/event.c | 13 +++----- server/file.c | 2 +- server/handle.c | 10 ++++-- server/mailslot.c | 15 +++++++-- server/mapping.c | 7 ++--- server/mutex.c | 7 ++--- server/named_pipe.c | 15 ++++++--- server/process.c | 6 ++-- server/registry.c | 4 +-- server/request.c | 9 +++++- server/request.h | 3 +- server/semaphore.c | 7 ++--- server/symlink.c | 6 ++-- server/timer.c | 5 ++- 17 files changed, 70 insertions(+), 133 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=37503be65497b97fe5197…

1 0