wine-commits March 2012

wine-commits@winehq.org

3 participants
710 discussions

Jacek Caban : jscript: Added QueryService(SID_VariantConversion) implementation.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: c6360c3e6e7fc3d82c436580320eaafc4af3bf3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6360c3e6e7fc3d82c4365803… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 12 12:12:40 2012 +0100 jscript: Added QueryService(SID_VariantConversion) implementation. --- dlls/jscript/jscript.c | 6 +++++- dlls/jscript/jscript.h | 1 + dlls/jscript/jsutils.c | 11 ++++++++++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 1ca5f9c..45edeb1 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -72,6 +72,7 @@ void script_release(script_ctx_t *ctx) jsheap_free(&ctx->tmp_heap); SysFreeString(ctx->last_match); + ctx->jscaller->ctx = NULL; IServiceProvider_Release(&ctx->jscaller->IServiceProvider_iface); heap_free(ctx); @@ -411,8 +412,10 @@ static ULONG WINAPI JScript_Release(IActiveScript *iface) if(!ref) { if(This->ctx && This->ctx->state != SCRIPTSTATE_CLOSED) IActiveScript_Close(&This->IActiveScript_iface); - if(This->ctx) + if(This->ctx) { + This->ctx->active_script = NULL; script_release(This->ctx); + } heap_free(This); unlock_module(); } @@ -709,6 +712,7 @@ static HRESULT WINAPI JScriptParse_InitNew(IActiveScriptParse *iface) ctx->ref = 1; ctx->state = SCRIPTSTATE_UNINITIALIZED; + ctx->active_script = &This->IActiveScript_iface; ctx->safeopt = This->safeopt; ctx->version = This->version; jsheap_init(&ctx->tmp_heap); diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 47df16d..cdb8eb6 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -293,6 +293,7 @@ struct _script_ctx_t { LONG ref; SCRIPTSTATE state; + IActiveScript *active_script; exec_ctx_t *exec_ctx; named_item_t *named_items; diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 6d77fe1..b9a35db 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -20,6 +20,7 @@ #include "wine/port.h" #include <math.h> +#include <assert.h> #include "jscript.h" #include "engine.h" @@ -769,8 +770,10 @@ static ULONG WINAPI JSCaller_Release(IServiceProvider *iface) TRACE("(%p) ref=%d\n", This, ref); - if(!ref) + if(!ref) { + assert(!This->ctx); heap_free(This); + } return ref; } @@ -780,6 +783,11 @@ static HRESULT WINAPI JSCaller_QueryService(IServiceProvider *iface, REFGUID gui { JSCaller *This = impl_from_IServiceProvider(iface); + if(IsEqualGUID(guidService, &SID_VariantConversion) && This->ctx && This->ctx->active_script) { + TRACE("(%p)->(SID_VariantConversion)\n", This); + return IActiveScript_QueryInterface(This->ctx->active_script, riid, ppv); + } + FIXME("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); *ppv = NULL; @@ -803,6 +811,7 @@ HRESULT create_jscaller(script_ctx_t *ctx) ret->IServiceProvider_iface.lpVtbl = &ServiceProviderVtbl; ret->ref = 1; + ret->ctx = ctx; ctx->jscaller = ret; return S_OK;

1 0

Jacek Caban : jscript: Added ChangeType implementation.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: bac7c1ef3650a6b48e97094bef87d87ad4bd7a4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bac7c1ef3650a6b48e97094be… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 12 12:12:26 2012 +0100 jscript: Added ChangeType implementation. --- dlls/jscript/jscript.c | 16 +++++++++- dlls/jscript/jscript.h | 2 + dlls/jscript/jsutils.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 86 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 4453bcc..1ca5f9c 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -1002,8 +1002,20 @@ static ULONG WINAPI VariantChangeType_Release(IVariantChangeType *iface) static HRESULT WINAPI VariantChangeType_ChangeType(IVariantChangeType *iface, VARIANT *dst, VARIANT *src, LCID lcid, VARTYPE vt) { JScript *This = impl_from_IVariantChangeType(iface); - FIXME("(%p)->(%p %s %x %d)\n", This, dst, debugstr_variant(src), lcid, vt); - return E_NOTIMPL; + HRESULT hres; + + TRACE("(%p)->(%p %s %x %d)\n", This, dst, debugstr_variant(src), lcid, vt); + + if(!This->ctx) { + FIXME("Object uninitialized\n"); + return E_UNEXPECTED; + } + + hres = VariantClear(dst); + if(FAILED(hres)) + return hres; + + return variant_change_type(This->ctx, dst, src, vt); } static const IVariantChangeTypeVtbl VariantChangeTypeVtbl = { diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 2e2d57b..47df16d 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -260,6 +260,8 @@ HRESULT to_uint32(script_ctx_t*,VARIANT*,jsexcept_t*,DWORD*) DECLSPEC_HIDDEN; HRESULT to_string(script_ctx_t*,VARIANT*,jsexcept_t*,BSTR*) DECLSPEC_HIDDEN; HRESULT to_object(script_ctx_t*,VARIANT*,IDispatch**) DECLSPEC_HIDDEN; +HRESULT variant_change_type(script_ctx_t*,VARIANT*,VARIANT*,VARTYPE); + BSTR int_to_bstr(int) DECLSPEC_HIDDEN; HRESULT double_to_bstr(double,BSTR*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 2e1030e..6d77fe1 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -657,6 +657,76 @@ HRESULT to_object(script_ctx_t *ctx, VARIANT *v, IDispatch **disp) return S_OK; } +HRESULT variant_change_type(script_ctx_t *ctx, VARIANT *dst, VARIANT *src, VARTYPE vt) +{ + jsexcept_t ei; + HRESULT hres; + + memset(&ei, 0, sizeof(ei)); + + switch(vt) { + case VT_I2: + case VT_I4: { + INT i; + + hres = to_int32(ctx, src, &ei, &i); + if(SUCCEEDED(hres)) { + if(vt == VT_I4) + V_I4(dst) = i; + else + V_I2(dst) = i; + } + break; + } + case VT_R8: + hres = to_number(ctx, src, &ei, dst); + if(SUCCEEDED(hres) && V_VT(dst) == VT_I4) + V_R8(dst) = V_I4(dst); + break; + case VT_R4: { + VARIANT n; + + hres = to_number(ctx, src, &ei, &n); + if(SUCCEEDED(hres)) + V_R4(dst) = num_val(&n); + break; + } + case VT_BOOL: { + VARIANT_BOOL b; + + hres = to_boolean(src, &b); + if(SUCCEEDED(hres)) + V_BOOL(dst) = b; + break; + } + case VT_BSTR: { + BSTR str; + + hres = to_string(ctx, src, &ei, &str); + if(SUCCEEDED(hres)) + V_BSTR(dst) = str; + break; + } + case VT_EMPTY: + hres = V_VT(src) == VT_EMPTY ? S_OK : E_NOTIMPL; + break; + case VT_NULL: + hres = V_VT(src) == VT_NULL ? S_OK : E_NOTIMPL; + break; + default: + FIXME("vt %d not implemented\n", vt); + hres = E_NOTIMPL; + } + + if(FAILED(hres)) { + VariantClear(&ei.var); + return hres; + } + + V_VT(dst) = vt; + return S_OK; +} + static inline JSCaller *impl_from_IServiceProvider(IServiceProvider *iface) { return CONTAINING_RECORD(iface, JSCaller, IServiceProvider_iface);

1 0

Piotr Caban : msxml3: Added internal function for loading xml from IMoniker .
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: 2cbd6a63dfb39052cd454ed3d67483885390ddaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cbd6a63dfb39052cd454ed3d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 12 10:56:59 2012 +0100 msxml3: Added internal function for loading xml from IMoniker. --- dlls/msxml3/bsc.c | 32 +++++++++++++++++--------------- dlls/msxml3/domdoc.c | 14 +++++++++++--- dlls/msxml3/msxml_private.h | 4 +++- dlls/msxml3/saxreader.c | 10 ++++++++-- 4 files changed, 39 insertions(+), 21 deletions(-) diff --git a/dlls/msxml3/bsc.c b/dlls/msxml3/bsc.c index a0b9022..580d509 100644 --- a/dlls/msxml3/bsc.c +++ b/dlls/msxml3/bsc.c @@ -242,12 +242,9 @@ static const struct IBindStatusCallbackVtbl bsc_vtbl = bsc_OnObjectAvailable }; -HRESULT bind_url(LPCWSTR url, HRESULT (*onDataAvailable)(void*,char*,DWORD), void *obj, bsc_t **ret) +HRESULT create_moniker_from_url(LPCWSTR url, IMoniker **mon) { WCHAR fileUrl[INTERNET_MAX_URL_LENGTH]; - bsc_t *bsc; - IBindCtx *pbc; - HRESULT hr; TRACE("%s\n", debugstr_w(url)); @@ -270,6 +267,18 @@ HRESULT bind_url(LPCWSTR url, HRESULT (*onDataAvailable)(void*,char*,DWORD), voi url = fileUrl; } + return CreateURLMonikerEx(NULL, url, mon, 0); +} + +HRESULT bind_url(IMoniker *mon, HRESULT (*onDataAvailable)(void*,char*,DWORD), + void *obj, bsc_t **ret) +{ + bsc_t *bsc; + IBindCtx *pbc; + HRESULT hr; + + TRACE("%p\n", mon); + hr = CreateBindCtx(0, &pbc); if(FAILED(hr)) return hr; @@ -287,17 +296,10 @@ HRESULT bind_url(LPCWSTR url, HRESULT (*onDataAvailable)(void*,char*,DWORD), voi hr = RegisterBindStatusCallback(pbc, &bsc->IBindStatusCallback_iface, NULL, 0); if(SUCCEEDED(hr)) { - IMoniker *moniker; - - hr = CreateURLMoniker(NULL, url, &moniker); - if(SUCCEEDED(hr)) - { - IStream *stream; - hr = IMoniker_BindToStorage(moniker, pbc, NULL, &IID_IStream, (LPVOID*)&stream); - IMoniker_Release(moniker); - if(stream) - IStream_Release(stream); - } + IStream *stream; + hr = IMoniker_BindToStorage(mon, pbc, NULL, &IID_IStream, (LPVOID*)&stream); + if(stream) + IStream_Release(stream); IBindCtx_Release(pbc); } diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 64122ce..22a4191 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1996,12 +1996,13 @@ static HRESULT domdoc_onDataAvailable(void *obj, char *ptr, DWORD len) return S_OK; } -static HRESULT doread( domdoc *This, LPWSTR filename ) +HRESULT domdoc_load_moniker(IXMLDOMDocument3 *iface, IMoniker *mon) { + domdoc *This = impl_from_IXMLDOMDocument3(iface); bsc_t *bsc; HRESULT hr; - hr = bind_url(filename, domdoc_onDataAvailable, This, &bsc); + hr = bind_url(mon, domdoc_onDataAvailable, This, &bsc); if(FAILED(hr)) return hr; @@ -2145,7 +2146,14 @@ static HRESULT WINAPI domdoc_load( if ( filename ) { - hr = doread( This, filename ); + IMoniker *mon; + + hr = create_moniker_from_url( filename, &mon); + if ( SUCCEEDED(hr) ) + { + hr = domdoc_load_moniker( iface, mon ); + IMoniker_Release(mon); + } if ( FAILED(hr) ) This->error = E_FAIL; diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 2e647d0..0bb243f 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -487,8 +487,10 @@ static inline const CLSID* SchemaCache_version(MSXML_VERSION v) typedef struct bsc_t bsc_t; -HRESULT bind_url(LPCWSTR, HRESULT (*onDataAvailable)(void*,char*,DWORD), void*, bsc_t**) DECLSPEC_HIDDEN; +HRESULT create_moniker_from_url(LPCWSTR, IMoniker**) DECLSPEC_HIDDEN; +HRESULT bind_url(IMoniker*, HRESULT (*onDataAvailable)(void*,char*,DWORD), void*, bsc_t**) DECLSPEC_HIDDEN; HRESULT detach_bsc(bsc_t*) DECLSPEC_HIDDEN; +HRESULT domdoc_load_moniker(IXMLDOMDocument3*, IMoniker*) DECLSPEC_HIDDEN; const char *debugstr_variant(const VARIANT*) DECLSPEC_HIDDEN; diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index b1508ca..0a2f346 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -2423,13 +2423,19 @@ static HRESULT internal_parseURL( const WCHAR *url, BOOL vbInterface) { + IMoniker *mon; bsc_t *bsc; HRESULT hr; TRACE("(%p)->(%s)\n", This, debugstr_w(url)); - if(vbInterface) hr = bind_url(url, internal_vbonDataAvailable, This, &bsc); - else hr = bind_url(url, internal_onDataAvailable, This, &bsc); + hr = create_moniker_from_url(url, &mon); + if(FAILED(hr)) + return hr; + + if(vbInterface) hr = bind_url(mon, internal_vbonDataAvailable, This, &bsc); + else hr = bind_url(mon, internal_onDataAvailable, This, &bsc); + IMoniker_Release(mon); if(FAILED(hr)) return hr;

1 0

Piotr Caban : msxml3/tests: Added XMLView QueryInterface tests.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: ecf31f2cc09398aa6ad7fadf8db6ff604baf4635 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecf31f2cc09398aa6ad7fadf8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 12 10:56:45 2012 +0100 msxml3/tests: Added XMLView QueryInterface tests. --- dlls/msxml3/tests/Makefile.in | 3 +- dlls/msxml3/tests/xmlview.c | 81 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/Makefile.in b/dlls/msxml3/tests/Makefile.in index 61a3dc0..22103cd 100644 --- a/dlls/msxml3/tests/Makefile.in +++ b/dlls/msxml3/tests/Makefile.in @@ -6,6 +6,7 @@ C_SRCS = \ saxreader.c \ schema.c \ xmldoc.c \ - xmlparser.c + xmlparser.c \ + xmlview.c @MAKE_TEST_RULES@ diff --git a/dlls/msxml3/tests/xmlview.c b/dlls/msxml3/tests/xmlview.c new file mode 100644 index 0000000..c1b221e --- /dev/null +++ b/dlls/msxml3/tests/xmlview.c @@ -0,0 +1,81 @@ +/* + * Copyright 2012 Piotr Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#define COBJMACROS +#define CONST_VTABLE + +#include <stdio.h> +#include <assert.h> + +#include "windows.h" +#include "ole2.h" +#include "mshtml.h" +#include "initguid.h" +#include "perhist.h" +#include "docobj.h" + +#include "wine/test.h" + +DEFINE_GUID(CLSID_XMLView, 0x48123bc4, 0x99d9, 0x11d1, 0xa6,0xb3, 0x00,0xc0,0x4f,0xd9,0x15,0x55); + +static void test_QueryInterface(void) +{ + IUnknown *xmlview, *unk; + IHTMLDocument *htmldoc; + HRESULT hres; + + hres = CoCreateInstance(&CLSID_XMLView, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IUnknown, (void**)&xmlview); + if(hres == REGDB_E_CLASSNOTREG) { + win_skip("XMLView class not registered\n"); + return; + } + ok(hres == S_OK, "CoCreateInstance returned %x, expected S_OK\n", hres); + + hres = IUnknown_QueryInterface(xmlview, &IID_IPersistMoniker, (void**)&unk); + ok(hres == S_OK, "QueryInterface(IID_IPersistMoniker) returned %x, expected S_OK\n", hres); + IUnknown_Release(unk); + + hres = IUnknown_QueryInterface(xmlview, &IID_IPersistHistory, (void**)&unk); + ok(hres == S_OK, "QueryInterface(IID_IPersistHistory) returned %x, expected S_OK\n", hres); + IUnknown_Release(unk); + + hres = IUnknown_QueryInterface(xmlview, &IID_IOleCommandTarget, (void**)&unk); + ok(hres == S_OK, "QueryInterface(IID_IOleCommandTarget) returned %x, expected S_OK\n", hres); + IUnknown_Release(unk); + + hres = IUnknown_QueryInterface(xmlview, &IID_IOleObject, (void**)&unk); + ok(hres == S_OK, "QueryInterface(IID_IOleObject) returned %x, expected S_OK\n", hres); + IUnknown_Release(unk); + + hres = IUnknown_QueryInterface(xmlview, &IID_IHTMLDocument, (void**)&htmldoc); + ok(hres == S_OK, "QueryInterface(IID_IHTMLDocument) returned %x, expected S_OK\n", hres); + hres = IHTMLDocument_QueryInterface(htmldoc, &IID_IUnknown, (void**)&unk); + ok(hres == S_OK, "QueryInterface(IID_IUnknown) returned %x, expected S_OK\n", hres); + todo_wine ok(unk == xmlview, "Aggregation is not working as expected\n"); + IUnknown_Release(unk); + IHTMLDocument_Release(htmldoc); + + IUnknown_Release(xmlview); +} + +START_TEST(xmlview) +{ + CoInitialize(NULL); + test_QueryInterface(); + CoUninitialize(); +}

1 0

Piotr Caban : msxml3: Added XMLView class stub.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: b80388fa9701ed9d5f232a9314104ffffa2f5cd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b80388fa9701ed9d5f232a931… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 12 10:56:29 2012 +0100 msxml3: Added XMLView class stub. --- dlls/msxml3/Makefile.in | 3 +- dlls/msxml3/factory.c | 9 +- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/xmlparser.idl | 15 ++ dlls/msxml3/xmlview.c | 535 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 561 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b80388fa9701ed9d5f232…

1 0

Alexandre Julliard : ntdll: Add support for the special STATUS_UNWIND_CONSOLIDATE exception code.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: e562623a15c6aca6b4e8f2e880c7b28682d768c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e562623a15c6aca6b4e8f2e88… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 12 11:27:19 2012 +0100 ntdll: Add support for the special STATUS_UNWIND_CONSOLIDATE exception code. --- dlls/ntdll/signal_x86_64.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index a0d02a3..12acf94 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -3062,6 +3062,12 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec context->u.s.Xmm14 = jmp->Xmm14; context->u.s.Xmm15 = jmp->Xmm15; } + else if (rec->ExceptionCode == STATUS_UNWIND_CONSOLIDATE && rec->NumberParameters >= 1) + { + PVOID (CALLBACK *consolidate)(EXCEPTION_RECORD *) = (void *)rec->ExceptionInformation[0]; + TRACE( "calling consolidate callback %p\n", consolidate ); + target_ip = consolidate( rec ); + } context->Rax = (ULONG64)retval; context->Rip = (ULONG64)target_ip; TRACE( "returning to %lx stack %lx\n", context->Rip, context->Rsp );

1 0

Alexandre Julliard : ntdll: Trace the exception extra information also in RtlUnwindEx.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: f996c89274471acaee2ca2d6435e6df8e79bbede URL: http://source.winehq.org/git/wine.git/?a=commit;h=f996c89274471acaee2ca2d64… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 12 11:27:00 2012 +0100 ntdll: Trace the exception extra information also in RtlUnwindEx. --- dlls/ntdll/signal_x86_64.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 8b3fca9..a0d02a3 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2118,7 +2118,7 @@ static NTSTATUS raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL f rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, context->Rip, GetCurrentThreadId() ); for (c = 0; c < min( EXCEPTION_MAXIMUM_PARAMETERS, rec->NumberParameters ); c++) - TRACE( " info[%d]=%08lx\n", c, rec->ExceptionInformation[c] ); + TRACE( " info[%d]=%016lx\n", c, rec->ExceptionInformation[c] ); if (rec->ExceptionCode == EXCEPTION_WINE_STUB) { if (rec->ExceptionInformation[1] >> 16) @@ -2893,7 +2893,7 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec CONTEXT new_context; LDR_MODULE *module; NTSTATUS status; - DWORD size; + DWORD i, size; RtlCaptureContext( context ); new_context = *context; @@ -2913,6 +2913,8 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec TRACE( "code=%x flags=%x end_frame=%p target_ip=%p rip=%016lx\n", rec->ExceptionCode, rec->ExceptionFlags, end_frame, target_ip, context->Rip ); + for (i = 0; i < min( EXCEPTION_MAXIMUM_PARAMETERS, rec->NumberParameters ); i++) + TRACE( " info[%d]=%016lx\n", i, rec->ExceptionInformation[i] ); TRACE(" rax=%016lx rbx=%016lx rcx=%016lx rdx=%016lx\n", context->Rax, context->Rbx, context->Rcx, context->Rdx ); TRACE(" rsi=%016lx rdi=%016lx rbp=%016lx rsp=%016lx\n",

1 0

Alexandre Julliard : ntdll: Set the TARGET_UNWIND flag when calling the unwind handler for the target frame .
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: 2bce0c698e2a2854fc8aa0e44838cc13cbdf772b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bce0c698e2a2854fc8aa0e44… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 12 11:20:29 2012 +0100 ntdll: Set the TARGET_UNWIND flag when calling the unwind handler for the target frame. --- dlls/ntdll/signal_x86_64.c | 1 + include/wine/exception.h | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index a9ff371..8b3fca9 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -3016,6 +3016,7 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec ERR( "invalid end frame %lx/%p\n", dispatch.EstablisherFrame, end_frame ); raise_status( STATUS_INVALID_UNWIND_TARGET, rec ); } + if (dispatch.EstablisherFrame == (ULONG64)end_frame) rec->ExceptionFlags |= EH_TARGET_UNWIND; call_unwind_handler( rec, &dispatch ); } else /* hack: call builtin handlers registered in the tib list */ diff --git a/include/wine/exception.h b/include/wine/exception.h index 9115fc9..8b807c1 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -252,6 +252,7 @@ static inline EXCEPTION_REGISTRATION_RECORD *__wine_get_frame(void) #define EH_EXIT_UNWIND 0x04 #define EH_STACK_INVALID 0x08 #define EH_NESTED_CALL 0x10 +#define EH_TARGET_UNWIND 0x20 /* Wine-specific exceptions codes */

1 0

Alexandre Julliard : ntdll: Restore the original context for the last frame instead of the result of the unwind handler .
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: 7c36b51aafce8b83dd4fb547723902b8b8976158 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c36b51aafce8b83dd4fb5477… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 12 11:11:36 2012 +0100 ntdll: Restore the original context for the last frame instead of the result of the unwind handler. --- dlls/ntdll/signal_x86_64.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 144dad1..a9ff371 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2927,7 +2927,7 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec dispatch.ContextRecord = context; dispatch.HistoryTable = table; - while (dispatch.EstablisherFrame != (ULONG64)end_frame) + for (;;) { /* FIXME: should use the history table to make things faster */ @@ -3031,6 +3031,7 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec dispatch.EstablisherFrame = new_context.Rsp; } + if (dispatch.EstablisherFrame == (ULONG64)end_frame) break; *context = new_context; }

1 0

Alexandre Julliard : ntdll: Use the context argument as working variable instead of making a copy in RtlUnwindEx .
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: de9330cbcba368c4779226a1d5f18153e42e0b01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de9330cbcba368c4779226a1d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 12 11:08:10 2012 +0100 ntdll: Use the context argument as working variable instead of making a copy in RtlUnwindEx. --- dlls/ntdll/signal_x86_64.c | 92 +++++++++++++++++++++---------------------- 1 files changed, 45 insertions(+), 47 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index baa22d3..144dad1 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2885,17 +2885,18 @@ static void call_teb_unwind_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT * * RtlUnwindEx (NTDLL.@) */ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec, - PVOID retval, CONTEXT *orig_context, UNWIND_HISTORY_TABLE *table ) + PVOID retval, CONTEXT *context, UNWIND_HISTORY_TABLE *table ) { EXCEPTION_REGISTRATION_RECORD *teb_frame = NtCurrentTeb()->Tib.ExceptionList; EXCEPTION_RECORD record; DISPATCHER_CONTEXT dispatch; - CONTEXT context, new_context; + CONTEXT new_context; LDR_MODULE *module; NTSTATUS status; DWORD size; - RtlCaptureContext( orig_context ); + RtlCaptureContext( context ); + new_context = *context; /* build an exception record, if we do not have one */ if (!rec) @@ -2903,7 +2904,7 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec record.ExceptionCode = STATUS_UNWIND; record.ExceptionFlags = 0; record.ExceptionRecord = NULL; - record.ExceptionAddress = (void *)orig_context->Rip; + record.ExceptionAddress = (void *)context->Rip; record.NumberParameters = 0; rec = &record; } @@ -2911,26 +2912,23 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec rec->ExceptionFlags |= EH_UNWINDING | (end_frame ? 0 : EH_EXIT_UNWIND); TRACE( "code=%x flags=%x end_frame=%p target_ip=%p rip=%016lx\n", - rec->ExceptionCode, rec->ExceptionFlags, end_frame, target_ip, orig_context->Rip ); + rec->ExceptionCode, rec->ExceptionFlags, end_frame, target_ip, context->Rip ); TRACE(" rax=%016lx rbx=%016lx rcx=%016lx rdx=%016lx\n", - orig_context->Rax, orig_context->Rbx, orig_context->Rcx, orig_context->Rdx ); + context->Rax, context->Rbx, context->Rcx, context->Rdx ); TRACE(" rsi=%016lx rdi=%016lx rbp=%016lx rsp=%016lx\n", - orig_context->Rsi, orig_context->Rdi, orig_context->Rbp, orig_context->Rsp ); + context->Rsi, context->Rdi, context->Rbp, context->Rsp ); TRACE(" r8=%016lx r9=%016lx r10=%016lx r11=%016lx\n", - orig_context->R8, orig_context->R9, orig_context->R10, orig_context->R11 ); + context->R8, context->R9, context->R10, context->R11 ); TRACE(" r12=%016lx r13=%016lx r14=%016lx r15=%016lx\n", - orig_context->R12, orig_context->R13, orig_context->R14, orig_context->R15 ); + context->R12, context->R13, context->R14, context->R15 ); - context = *orig_context; - dispatch.EstablisherFrame = context.Rsp; + dispatch.EstablisherFrame = context->Rsp; dispatch.TargetIp = (ULONG64)target_ip; - dispatch.ContextRecord = &context; + dispatch.ContextRecord = context; dispatch.HistoryTable = table; while (dispatch.EstablisherFrame != (ULONG64)end_frame) { - new_context = context; - /* FIXME: should use the history table to make things faster */ module = NULL; @@ -2939,7 +2937,7 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec /* first look for PE exception information */ - if (!LdrFindEntryForAddress( (void *)context.Rip, &module )) + if (!LdrFindEntryForAddress( (void *)context->Rip, &module )) { RUNTIME_FUNCTION *dir; @@ -2947,11 +2945,11 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec if ((dir = RtlImageDirectoryEntryToData( module->BaseAddress, TRUE, IMAGE_DIRECTORY_ENTRY_EXCEPTION, &size ))) { - if ((dispatch.FunctionEntry = find_function_info( context.Rip, module->BaseAddress, + if ((dispatch.FunctionEntry = find_function_info( context->Rip, module->BaseAddress, dir, size ))) { dispatch.LanguageHandler = RtlVirtualUnwind( UNW_FLAG_UHANDLER, dispatch.ImageBase, - context.Rip, dispatch.FunctionEntry, + context->Rip, dispatch.FunctionEntry, &new_context, &dispatch.HandlerData, &dispatch.EstablisherFrame, NULL ); goto unwind_done; @@ -2966,12 +2964,12 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec if (!module || (module->Flags & LDR_WINE_INTERNAL)) { struct dwarf_eh_bases bases; - const struct dwarf_fde *fde = _Unwind_Find_FDE( (void *)(context.Rip - 1), &bases ); + const struct dwarf_fde *fde = _Unwind_Find_FDE( (void *)(context->Rip - 1), &bases ); if (fde) { dispatch.FunctionEntry = NULL; - status = dwarf_virtual_unwind( context.Rip, &dispatch.EstablisherFrame, &new_context, fde, + status = dwarf_virtual_unwind( context->Rip, &dispatch.EstablisherFrame, &new_context, fde, &bases, &dispatch.LanguageHandler, &dispatch.HandlerData ); if (status != STATUS_SUCCESS) raise_status( status, rec ); if (dispatch.LanguageHandler && !module) @@ -2985,8 +2983,8 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec /* no exception information, treat as a leaf function */ - new_context.Rip = *(ULONG64 *)context.Rsp; - new_context.Rsp = context.Rsp + sizeof(ULONG64); + new_context.Rip = *(ULONG64 *)context->Rsp; + new_context.Rsp = context->Rsp + sizeof(ULONG64); dispatch.EstablisherFrame = new_context.Rsp; dispatch.LanguageHandler = NULL; @@ -2997,7 +2995,7 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec { TRACE( "frame %lx is inside signal stack (%p-%p)\n", dispatch.EstablisherFrame, get_signal_stack(), (char *)get_signal_stack() + signal_stack_size ); - context = new_context; + *context = new_context; continue; } @@ -3033,37 +3031,37 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec dispatch.EstablisherFrame = new_context.Rsp; } - context = new_context; + *context = new_context; } if (rec->ExceptionCode == STATUS_LONGJUMP && rec->NumberParameters >= 1) { struct MSVCRT_JUMP_BUFFER *jmp = (struct MSVCRT_JUMP_BUFFER *)rec->ExceptionInformation[0]; - context.Rbx = jmp->Rbx; - context.Rsp = jmp->Rsp; - context.Rbp = jmp->Rbp; - context.Rsi = jmp->Rsi; - context.Rdi = jmp->Rdi; - context.R12 = jmp->R12; - context.R13 = jmp->R13; - context.R14 = jmp->R14; - context.R15 = jmp->R15; - context.Rip = jmp->Rip; - context.u.s.Xmm6 = jmp->Xmm6; - context.u.s.Xmm7 = jmp->Xmm7; - context.u.s.Xmm8 = jmp->Xmm8; - context.u.s.Xmm9 = jmp->Xmm9; - context.u.s.Xmm10 = jmp->Xmm10; - context.u.s.Xmm11 = jmp->Xmm11; - context.u.s.Xmm12 = jmp->Xmm12; - context.u.s.Xmm13 = jmp->Xmm13; - context.u.s.Xmm14 = jmp->Xmm14; - context.u.s.Xmm15 = jmp->Xmm15; + context->Rbx = jmp->Rbx; + context->Rsp = jmp->Rsp; + context->Rbp = jmp->Rbp; + context->Rsi = jmp->Rsi; + context->Rdi = jmp->Rdi; + context->R12 = jmp->R12; + context->R13 = jmp->R13; + context->R14 = jmp->R14; + context->R15 = jmp->R15; + context->Rip = jmp->Rip; + context->u.s.Xmm6 = jmp->Xmm6; + context->u.s.Xmm7 = jmp->Xmm7; + context->u.s.Xmm8 = jmp->Xmm8; + context->u.s.Xmm9 = jmp->Xmm9; + context->u.s.Xmm10 = jmp->Xmm10; + context->u.s.Xmm11 = jmp->Xmm11; + context->u.s.Xmm12 = jmp->Xmm12; + context->u.s.Xmm13 = jmp->Xmm13; + context->u.s.Xmm14 = jmp->Xmm14; + context->u.s.Xmm15 = jmp->Xmm15; } - context.Rax = (ULONG64)retval; - context.Rip = (ULONG64)target_ip; - TRACE( "returning to %lx stack %lx\n", context.Rip, context.Rsp ); - set_cpu_context( &context ); + context->Rax = (ULONG64)retval; + context->Rip = (ULONG64)target_ip; + TRACE( "returning to %lx stack %lx\n", context->Rip, context->Rsp ); + set_cpu_context( context ); }

1 0

← Newer
1
...
48
49
50
51
52
53
54
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2012