March 2012 - Wine-commits - list.winehq.org

Jacek Caban : jscript: Removed no longer needed caller argument from jsdisp_get_idx.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: 29b9237c91fee59c004ba728cc8491df2cde69c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29b9237c91fee59c004ba728c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 12 12:14:51 2012 +0100 jscript: Removed no longer needed caller argument from jsdisp_get_idx. --- dlls/jscript/array.c | 35 +++++++++++++++++------------------ dlls/jscript/dispex.c | 4 ++-- dlls/jscript/function.c | 7 +++---- dlls/jscript/jscript.h | 2 +- 4 files changed, 23 insertions(+), 25 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 4cba634..8a75bbe 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -161,15 +161,14 @@ static HRESULT Array_length(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP return S_OK; } -static HRESULT concat_array(jsdisp_t *array, ArrayInstance *obj, DWORD *len, - jsexcept_t *ei, IServiceProvider *caller) +static HRESULT concat_array(jsdisp_t *array, ArrayInstance *obj, DWORD *len, jsexcept_t *ei) { VARIANT var; DWORD i; HRESULT hres; for(i=0; i < obj->length; i++) { - hres = jsdisp_get_idx(&obj->dispex, i, &var, ei, caller); + hres = jsdisp_get_idx(&obj->dispex, i, &var, ei); if(hres == DISP_E_UNKNOWNNAME) continue; if(FAILED(hres)) @@ -185,7 +184,7 @@ static HRESULT concat_array(jsdisp_t *array, ArrayInstance *obj, DWORD *len, return S_OK; } -static HRESULT concat_obj(jsdisp_t *array, IDispatch *obj, DWORD *len, jsexcept_t *ei, IServiceProvider *caller) +static HRESULT concat_obj(jsdisp_t *array, IDispatch *obj, DWORD *len, jsexcept_t *ei) { jsdisp_t *jsobj; VARIANT var; @@ -194,7 +193,7 @@ static HRESULT concat_obj(jsdisp_t *array, IDispatch *obj, DWORD *len, jsexcept_ jsobj = iface_to_jsdisp((IUnknown*)obj); if(jsobj) { if(is_class(jsobj, JSCLASS_ARRAY)) { - hres = concat_array(array, (ArrayInstance*)jsobj, len, ei, caller); + hres = concat_array(array, (ArrayInstance*)jsobj, len, ei); jsdisp_release(jsobj); return hres; } @@ -219,7 +218,7 @@ static HRESULT Array_concat(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP if(FAILED(hres)) return hres; - hres = concat_obj(ret, jsthis->u.disp, &len, ei, caller); + hres = concat_obj(ret, jsthis->u.disp, &len, ei); if(SUCCEEDED(hres)) { VARIANT *arg; DWORD i; @@ -227,7 +226,7 @@ static HRESULT Array_concat(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP for(i=0; i < arg_cnt(dp); i++) { arg = get_arg(dp, i); if(V_VT(arg) == VT_DISPATCH) - hres = concat_obj(ret, V_DISPATCH(arg), &len, ei, caller); + hres = concat_obj(ret, V_DISPATCH(arg), &len, ei); else hres = jsdisp_propput_idx(ret, len++, arg, ei); if(FAILED(hres)) @@ -268,7 +267,7 @@ static HRESULT array_join(script_ctx_t *ctx, jsdisp_t *array, DWORD length, cons return E_OUTOFMEMORY; for(i=0; i < length; i++) { - hres = jsdisp_get_idx(array, i, &var, ei, caller); + hres = jsdisp_get_idx(array, i, &var, ei); if(hres == DISP_E_UNKNOWNNAME) { hres = S_OK; continue; @@ -401,7 +400,7 @@ static HRESULT Array_pop(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPARA } length--; - hres = jsdisp_get_idx(jsthis, length, &val, ei, caller); + hres = jsdisp_get_idx(jsthis, length, &val, ei); if(SUCCEEDED(hres)) { hres = jsdisp_delete_idx(jsthis, length); } else if(hres == DISP_E_UNKNOWNNAME) { @@ -476,11 +475,11 @@ static HRESULT Array_reverse(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISP for(k=0; k<length/2; k++) { l = length-k-1; - hres1 = jsdisp_get_idx(jsthis, k, &v1, ei, sp); + hres1 = jsdisp_get_idx(jsthis, k, &v1, ei); if(FAILED(hres1) && hres1!=DISP_E_UNKNOWNNAME) return hres1; - hres2 = jsdisp_get_idx(jsthis, l, &v2, ei, sp); + hres2 = jsdisp_get_idx(jsthis, l, &v2, ei); if(FAILED(hres2) && hres2!=DISP_E_UNKNOWNNAME) { VariantClear(&v1); return hres2; @@ -543,14 +542,14 @@ static HRESULT Array_shift(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPA return S_OK; } - hres = jsdisp_get_idx(jsthis, 0, &ret, ei, caller); + hres = jsdisp_get_idx(jsthis, 0, &ret, ei); if(hres == DISP_E_UNKNOWNNAME) { V_VT(&ret) = VT_EMPTY; hres = S_OK; } for(i=1; SUCCEEDED(hres) && i<length; i++) { - hres = jsdisp_get_idx(jsthis, i, &v, ei, caller); + hres = jsdisp_get_idx(jsthis, i, &v, ei); if(hres == DISP_E_UNKNOWNNAME) hres = jsdisp_delete_idx(jsthis, i-1); else if(SUCCEEDED(hres)) @@ -625,7 +624,7 @@ static HRESULT Array_slice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPA return hres; for(idx=start; idx<end; idx++) { - hres = jsdisp_get_idx(jsthis, idx, &v, ei, sp); + hres = jsdisp_get_idx(jsthis, idx, &v, ei); if(hres == DISP_E_UNKNOWNNAME) continue; @@ -756,7 +755,7 @@ static HRESULT Array_sort(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPAR vtab = heap_alloc_zero(length * sizeof(VARIANT)); if(vtab) { for(i=0; i<length; i++) { - hres = jsdisp_get_idx(jsthis, i, vtab+i, ei, caller); + hres = jsdisp_get_idx(jsthis, i, vtab+i, ei); if(hres == DISP_E_UNKNOWNNAME) { V_VT(vtab+i) = VT_EMPTY; hres = S_OK; @@ -911,7 +910,7 @@ static HRESULT Array_splice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPP return hres; for(i=0; SUCCEEDED(hres) && i < delete_cnt; i++) { - hres = jsdisp_get_idx(jsthis, start+i, &v, ei, caller); + hres = jsdisp_get_idx(jsthis, start+i, &v, ei); if(hres == DISP_E_UNKNOWNNAME) hres = S_OK; else if(SUCCEEDED(hres)) @@ -928,7 +927,7 @@ static HRESULT Array_splice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPP if(add_args < delete_cnt) { for(i = start; SUCCEEDED(hres) && i < length-delete_cnt; i++) { - hres = jsdisp_get_idx(jsthis, i+delete_cnt, &v, ei, caller); + hres = jsdisp_get_idx(jsthis, i+delete_cnt, &v, ei); if(hres == DISP_E_UNKNOWNNAME) hres = jsdisp_delete_idx(jsthis, i+add_args); else if(SUCCEEDED(hres)) @@ -939,7 +938,7 @@ static HRESULT Array_splice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPP hres = jsdisp_delete_idx(jsthis, i-1); }else if(add_args > delete_cnt) { for(i=length-delete_cnt; SUCCEEDED(hres) && i != start; i--) { - hres = jsdisp_get_idx(jsthis, i+delete_cnt-1, &v, ei, caller); + hres = jsdisp_get_idx(jsthis, i+delete_cnt-1, &v, ei); if(hres == DISP_E_UNKNOWNNAME) hres = jsdisp_delete_idx(jsthis, i+add_args-1); else if(SUCCEEDED(hres)) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 1de1dd0..418296f 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1148,7 +1148,7 @@ HRESULT jsdisp_propget_name(jsdisp_t *obj, const WCHAR *name, VARIANT *var, jsex return prop_get(obj, prop, &dp, var, ei, NULL); } -HRESULT jsdisp_get_idx(jsdisp_t *obj, DWORD idx, VARIANT *var, jsexcept_t *ei, IServiceProvider *caller) +HRESULT jsdisp_get_idx(jsdisp_t *obj, DWORD idx, VARIANT *var, jsexcept_t *ei) { WCHAR name[12]; DISPPARAMS dp = {NULL, NULL, 0, 0}; @@ -1167,7 +1167,7 @@ HRESULT jsdisp_get_idx(jsdisp_t *obj, DWORD idx, VARIANT *var, jsexcept_t *ei, I if(!prop || prop->type==PROP_DELETED) return DISP_E_UNKNOWNNAME; - return prop_get(obj, prop, &dp, var, ei, caller); + return prop_get(obj, prop, &dp, var, ei, NULL); } HRESULT jsdisp_propget(jsdisp_t *jsdisp, DISPID id, VARIANT *val, jsexcept_t *ei) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 23e7033..8b57721 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -357,8 +357,7 @@ static HRESULT Function_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, return S_OK; } -static HRESULT array_to_args(script_ctx_t *ctx, jsdisp_t *arg_array, jsexcept_t *ei, IServiceProvider *caller, - DISPPARAMS *args) +static HRESULT array_to_args(script_ctx_t *ctx, jsdisp_t *arg_array, jsexcept_t *ei, DISPPARAMS *args) { VARIANT var, *argv; DWORD length, i; @@ -378,7 +377,7 @@ static HRESULT array_to_args(script_ctx_t *ctx, jsdisp_t *arg_array, jsexcept_t return E_OUTOFMEMORY; for(i=0; i<length; i++) { - hres = jsdisp_get_idx(arg_array, i, argv+i, ei, caller); + hres = jsdisp_get_idx(arg_array, i, argv+i, ei); if(hres == DISP_E_UNKNOWNNAME) V_VT(argv+i) = VT_EMPTY; else if(FAILED(hres)) { @@ -432,7 +431,7 @@ static HRESULT Function_apply(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DI } if(arg_array) { - hres = array_to_args(ctx, arg_array, ei, caller, &args); + hres = array_to_args(ctx, arg_array, ei, &args); jsdisp_release(arg_array); }else { FIXME("throw TypeError\n"); diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index a4b7e19..9362fb6 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -217,7 +217,7 @@ HRESULT jsdisp_propput_name(jsdisp_t*,const WCHAR*,VARIANT*,jsexcept_t*) DECLSPE HRESULT jsdisp_propput_const(jsdisp_t*,const WCHAR*,VARIANT*) DECLSPEC_HIDDEN; HRESULT jsdisp_propput_idx(jsdisp_t*,DWORD,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_propget_name(jsdisp_t*,LPCWSTR,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN; -HRESULT jsdisp_get_idx(jsdisp_t*,DWORD,VARIANT*,jsexcept_t*,IServiceProvider*) DECLSPEC_HIDDEN; +HRESULT jsdisp_get_idx(jsdisp_t*,DWORD,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_get_id(jsdisp_t*,const WCHAR*,DWORD,DISPID*) DECLSPEC_HIDDEN; HRESULT jsdisp_delete_idx(jsdisp_t*,DWORD) DECLSPEC_HIDDEN; VARIANT_BOOL jsdisp_is_own_prop(jsdisp_t *obj, BSTR name) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : winhttp: Fix up headers with wrong termination.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: 189c1ca5d99026963d1598270cee8c39e1f1123a URL: http://source.winehq.org/git/wine.git/?a=commit;h=189c1ca5d99026963d1598270… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 12 12:25:14 2012 +0100 winhttp: Fix up headers with wrong termination. --- dlls/winhttp/request.c | 5 ++++ dlls/winhttp/tests/winhttp.c | 43 +++++++++++++++++++++++++++++++++++++---- 2 files changed, 43 insertions(+), 5 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 040f79b..8870e50 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -425,6 +425,11 @@ BOOL add_request_headers( request_t *request, LPCWSTR headers, DWORD len, DWORD q = p; while (*q) { + if (q[0] == '\n' && q[1] == '\r') + { + q[0] = '\r'; + q[1] = '\n'; + } if (q[0] == '\r' && q[1] == '\n') break; q++; } diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index cf4ad92..9d75dbf 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1754,11 +1754,6 @@ static const char okmsg[] = "Server: winetest\r\n" "\r\n"; -static const char notokmsg[] = -"HTTP/1.1 400 Bad Request\r\n" -"Server: winetest\r\n" -"\r\n"; - static const char noauthmsg[] = "HTTP/1.1 401 Unauthorized\r\n" "Server: winetest\r\n" @@ -1984,6 +1979,43 @@ static void test_no_headers(int port) WinHttpCloseHandle(ses); } +static void test_bad_header( int port ) +{ + static const WCHAR bad_headerW[] = + {'C','o','n','t','e','n','t','-','T','y','p','e',':',' ', + 't','e','x','t','/','h','t','m','l','\n','\r',0}; + static const WCHAR text_htmlW[] = {'t','e','x','t','/','h','t','m','l',0}; + static const WCHAR content_typeW[] = {'C','o','n','t','e','n','t','-','T','y','p','e',0}; + WCHAR buffer[32]; + HINTERNET ses, con, req; + DWORD index, len; + BOOL ret; + + ses = WinHttpOpen( test_useragent, 0, NULL, NULL, 0 ); + ok( ses != NULL, "failed to open session %u\n", GetLastError() ); + + con = WinHttpConnect( ses, localhostW, port, 0 ); + ok( con != NULL, "failed to open a connection %u\n", GetLastError() ); + + req = WinHttpOpenRequest( con, NULL, NULL, NULL, NULL, NULL, 0 ); + ok( req != NULL, "failed to open a request %u\n", GetLastError() ); + + ret = WinHttpAddRequestHeaders( req, bad_headerW, ~0u, WINHTTP_ADDREQ_FLAG_ADD ); + ok( ret, "failed to add header %u\n", GetLastError() ); + + index = 0; + buffer[0] = 0; + len = sizeof(buffer); + ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_CUSTOM|WINHTTP_QUERY_FLAG_REQUEST_HEADERS, + content_typeW, buffer, &len, &index ); + ok( ret, "failed to query headers %u\n", GetLastError() ); + ok( !lstrcmpW( buffer, text_htmlW ), "got %s\n", wine_dbgstr_w(buffer) ); + + WinHttpCloseHandle( req ); + WinHttpCloseHandle( con ); + WinHttpCloseHandle( ses ); +} + static void test_credentials(void) { static WCHAR userW[] = {'u','s','e','r',0}; @@ -2713,6 +2745,7 @@ START_TEST (winhttp) test_basic_request(si.port, NULL, basicW); test_no_headers(si.port); test_basic_authentication(si.port); + test_bad_header(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, NULL, quitW);

1 0

Petr Kočandrle : po: Update Czech translation.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: bbb1bc3eeee7b6ddb7e7f3108d8d6c2c06604691 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbb1bc3eeee7b6ddb7e7f3108… Author: Petr Kočandrle <petr.kocandrle(a)gmail.com> Date: Tue Mar 6 23:13:25 2012 +0100 po: Update Czech translation. --- po/cs.po | 418 +++++++++++++++++++++++++------------------------------------- 1 files changed, 168 insertions(+), 250 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bbb1bc3eeee7b6ddb7e7f…

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

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: 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: 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: 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

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

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