August 2009 - Wine-commits - list.winehq.org

Jacek Caban : jscript: Use proper VARIANT_BOOL values in bool literals.
by Alexandre Julliard 29 Aug '09

29 Aug '09

Module: wine Branch: master Commit: 73e192a6b3885b131f1284ebfea47a0b9a3b7ab5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73e192a6b3885b131f1284ebf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 28 23:53:05 2009 +0200 jscript: Use proper VARIANT_BOOL values in bool literals. --- dlls/jscript/parser.y | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 748a06a..57f0744 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -812,8 +812,8 @@ Literal /* ECMA-262 3rd Edition 7.8.2 */ BooleanLiteral - : kTRUE { $$ = new_boolean_literal(ctx, TRUE); } - | kFALSE { $$ = new_boolean_literal(ctx, FALSE); } + : kTRUE { $$ = new_boolean_literal(ctx, VARIANT_TRUE); } + | kFALSE { $$ = new_boolean_literal(ctx, VARIANT_FALSE); } semicolon_opt : ';'

1 0

Jacek Caban : jscript: Create Array objects from proper constructor.
by Alexandre Julliard 29 Aug '09

29 Aug '09

Module: wine Branch: master Commit: 90af81f40534cb05b6f9684acd0d4fab4d949d99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90af81f40534cb05b6f9684ac… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 28 23:53:45 2009 +0200 jscript: Create Array objects from proper constructor. --- dlls/jscript/array.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 704624e..2aea70b 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -872,7 +872,7 @@ static HRESULT alloc_array(script_ctx_t *ctx, DispatchEx *object_prototype, Arra if(object_prototype) hres = init_dispex(&array->dispex, ctx, &Array_info, object_prototype); else - hres = init_dispex_from_constr(&array->dispex, ctx, &Array_info, ctx->object_constr); + hres = init_dispex_from_constr(&array->dispex, ctx, &Array_info, ctx->array_constr); if(FAILED(hres)) { heap_free(array);

1 0

André Hentschel : wcmd: Ignore start and end quotes.
by Alexandre Julliard 29 Aug '09

29 Aug '09

Module: wine Branch: master Commit: 765d9a1411cd09a4dca3955c85eb01c2df4eee43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=765d9a1411cd09a4dca3955c8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Aug 28 18:34:32 2009 +0200 wcmd: Ignore start and end quotes. --- programs/cmd/builtins.c | 5 +++++ programs/cmd/wcmd.h | 1 + programs/cmd/wcmdmain.c | 2 +- 3 files changed, 7 insertions(+), 1 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index b544a37..612e5d9 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2072,6 +2072,8 @@ void WCMD_setshow_env (WCHAR *s) { s += 2; while (*s && *s==' ') s++; + if (*s=='\"') + WCMD_opt_s_strip_quotes(s); /* If no parameter, or no '=' sign, return an error */ if (!(*s) || ((p = strchrW (s, '=')) == NULL )) { @@ -2096,6 +2098,9 @@ void WCMD_setshow_env (WCHAR *s) { } else { DWORD gle; + + if (*s=='\"') + WCMD_opt_s_strip_quotes(s); p = strchrW (s, '='); if (p == NULL) { env = GetEnvironmentStrings (); diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 667b3b9..00bada2 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -100,6 +100,7 @@ WCHAR *WCMD_strtrim_leading_spaces (WCHAR *string); void WCMD_HandleTildaModifiers(WCHAR **start, WCHAR *forVariable, WCHAR *forValue, BOOL justFors); void WCMD_splitpath(const WCHAR* path, WCHAR* drv, WCHAR* dir, WCHAR* name, WCHAR* ext); +void WCMD_opt_s_strip_quotes(WCHAR *cmd); WCHAR *WCMD_LoadMessage(UINT id); WCHAR *WCMD_strdupW(WCHAR *input); void WCMD_strsubstW(WCHAR *start, WCHAR* next, WCHAR* insert, int len); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index d3aea6d..249526f 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -457,7 +457,7 @@ WCHAR *WCMD_strtrim_leading_spaces (WCHAR *string) { * * Remove first and last quote WCHARacters, preserving all other text */ -static void WCMD_opt_s_strip_quotes(WCHAR *cmd) { +void WCMD_opt_s_strip_quotes(WCHAR *cmd) { WCHAR *src = cmd + 1, *dest = cmd, *lastq = NULL; while((*dest=*src) != '\0') { if (*src=='\"')

1 0

Benjamin Kramer : ntdll: Fix build on MacOSX.
by Alexandre Julliard 29 Aug '09

29 Aug '09

Module: wine Branch: master Commit: 2f3ac0640b43639be64312ca6d4d3a7df955f668 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f3ac0640b43639be64312ca6… Author: Benjamin Kramer <benny.kra(a)googlemail.com> Date: Fri Aug 28 21:15:22 2009 +0200 ntdll: Fix build on MacOSX. --- dlls/ntdll/nt.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 279a525..c27ef00 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1009,9 +1009,9 @@ NTSTATUS WINAPI NtQuerySystemInformation( sppi = RtlAllocateHeap(GetProcessHeap(), 0,len); for (i = 0; i < cpus; i++) { - sppi[i].liIdleTime.QuadPart = pinfo[i].cpu_ticks[CPU_STATE_IDLE]; - sppi[i].liKernelTime.QuadPart = pinfo[i].cpu_ticks[CPU_STATE_SYSTEM]; - sppi[i].liUserTime.QuadPart = pinfo[i].cpu_ticks[CPU_STATE_USER]; + sppi[i].IdleTime.QuadPart = pinfo[i].cpu_ticks[CPU_STATE_IDLE]; + sppi[i].KernelTime.QuadPart = pinfo[i].cpu_ticks[CPU_STATE_SYSTEM]; + sppi[i].UserTime.QuadPart = pinfo[i].cpu_ticks[CPU_STATE_USER]; } vm_deallocate (mach_task_self (), (vm_address_t) pinfo, info_count * sizeof(natural_t)); }

1 0

Aric Stewart : msctf: Hook up ITfTextEditSink::OnEndEdit.
by Alexandre Julliard 29 Aug '09

29 Aug '09

Module: wine Branch: master Commit: 0294cbc04803d6eb65e6cb6d0ed9d1d51da4a238 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0294cbc04803d6eb65e6cb6d0… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Aug 28 15:08:14 2009 -0500 msctf: Hook up ITfTextEditSink::OnEndEdit. --- dlls/msctf/context.c | 26 +++++++++- dlls/msctf/tests/inputprocessor.c | 108 +++++++++++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+), 1 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 5335940..c13235c 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -989,8 +989,9 @@ static HRESULT WINAPI TextStoreACPSink_OnLockGranted(ITextStoreACPSink *iface, { TextStoreACPSink *This = (TextStoreACPSink *)iface; HRESULT hr; - EditCookie *cookie; + EditCookie *cookie,*sinkcookie; TfEditCookie ec; + struct list *cursor; TRACE("(%p) %x\n",This, dwLockFlags); @@ -1010,12 +1011,35 @@ static HRESULT WINAPI TextStoreACPSink_OnLockGranted(ITextStoreACPSink *iface, if (!cookie) return E_OUTOFMEMORY; + sinkcookie = HeapAlloc(GetProcessHeap(),0,sizeof(EditCookie)); + if (!sinkcookie) + return E_OUTOFMEMORY; + cookie->lockType = dwLockFlags; cookie->pOwningContext = This->pContext; ec = generate_Cookie(COOKIE_MAGIC_EDITCOOKIE, cookie); hr = ITfEditSession_DoEditSession(This->pContext->currentEditSession, ec); + if ((dwLockFlags&TS_LF_READWRITE) == TS_LF_READWRITE) + { + TfEditCookie sc; + + sinkcookie->lockType = TS_LF_READ; + sinkcookie->pOwningContext = This->pContext; + sc = generate_Cookie(COOKIE_MAGIC_EDITCOOKIE, sinkcookie); + + /*TODO: implement ITfEditRecord */ + LIST_FOR_EACH(cursor, &This->pContext->pTextEditSink) + { + ContextSink* sink = LIST_ENTRY(cursor,ContextSink,entry); + ITfTextEditSink_OnEndEdit(sink->interfaces.pITfTextEditSink, + (ITfContext*) &This->pContext, sc, NULL); + } + sinkcookie = remove_Cookie(sc); + } + HeapFree(GetProcessHeap(),0,sinkcookie); + ITfEditSession_Release(This->pContext->currentEditSession); This->pContext->currentEditSession = NULL; diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index d35d391..6e8bbdc 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -65,6 +65,7 @@ static INT test_ACP_GetSelection = SINK_UNEXPECTED; static INT test_DoEditSession = SINK_UNEXPECTED; static INT test_ACP_InsertTextAtSelection = SINK_UNEXPECTED; static INT test_ACP_SetSelection = SINK_UNEXPECTED; +static INT test_OnEndEdit = SINK_UNEXPECTED; /********************************************************************** @@ -1181,6 +1182,90 @@ static inline int check_context_refcount(ITfContext *iface) return IUnknown_Release(iface); } + +/********************************************************************** + * ITfTextEditSink + **********************************************************************/ +typedef struct tagTextEditSink +{ + const ITfTextEditSinkVtbl *TextEditSinkVtbl; + LONG refCount; +} TextEditSink; + +static void TextEditSink_Destructor(TextEditSink *This) +{ + HeapFree(GetProcessHeap(),0,This); +} + +static HRESULT WINAPI TextEditSink_QueryInterface(ITfTextEditSink *iface, REFIID iid, LPVOID *ppvOut) +{ + TextEditSink *This = (TextEditSink *)iface; + *ppvOut = NULL; + + if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_ITfTextEditSink)) + { + *ppvOut = This; + } + + if (*ppvOut) + { + IUnknown_AddRef(iface); + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI TextEditSink_AddRef(ITfTextEditSink *iface) +{ + TextEditSink *This = (TextEditSink *)iface; + return InterlockedIncrement(&This->refCount); +} + +static ULONG WINAPI TextEditSink_Release(ITfTextEditSink *iface) +{ + TextEditSink *This = (TextEditSink *)iface; + ULONG ret; + + ret = InterlockedDecrement(&This->refCount); + if (ret == 0) + TextEditSink_Destructor(This); + return ret; +} + +static HRESULT WINAPI TextEditSink_OnEndEdit(ITfTextEditSink *iface, + ITfContext *pic, TfEditCookie ecReadOnly, ITfEditRecord *pEditRecord) +{ + ok(test_OnEndEdit == SINK_EXPECTED, "Unexpected OnEndEdit\n"); + test_OnEndEdit = SINK_FIRED; + return S_OK; +} + +static const ITfTextEditSinkVtbl TextEditSink_TextEditSinkVtbl = +{ + TextEditSink_QueryInterface, + TextEditSink_AddRef, + TextEditSink_Release, + + TextEditSink_OnEndEdit +}; + +static HRESULT TextEditSink_Constructor(ITfTextEditSink **ppOut) +{ + TextEditSink *This; + + *ppOut = NULL; + This = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(TextEditSink)); + if (This == NULL) + return E_OUTOFMEMORY; + + This->TextEditSinkVtbl = &TextEditSink_TextEditSinkVtbl; + This->refCount = 1; + + *ppOut = (ITfTextEditSink*)This; + return S_OK; +} + static void test_startSession(void) { HRESULT hr; @@ -1626,11 +1711,24 @@ static void test_TStoApplicationText(void) ITfEditSession *es; ITfContext *cxt; ITfDocumentMgr *dm; + ITfTextEditSink *sink; + ITfSource *source = NULL; + DWORD editSinkCookie = -1; ITfThreadMgr_GetFocus(g_tm, &dm); EditSession_Constructor(&es); ITfDocumentMgr_GetTop(dm,&cxt); + TextEditSink_Constructor(&sink); + hr = ITfContext_QueryInterface(cxt,&IID_ITfSource,(LPVOID*)&source); + ok(SUCCEEDED(hr),"Failed to get IID_ITfSource for Context\n"); + if (source) + { + hr = ITfSource_AdviseSink(source, &IID_ITfTextEditSink, (LPVOID)sink, &editSinkCookie); + ok(SUCCEEDED(hr),"Failed to advise Sink\n"); + ok(editSinkCookie != -1,"Failed to get sink cookie\n"); + } + hrSession = 0xfeedface; /* Test no premissions flags */ hr = ITfContext_RequestEditSession(cxt, tid, es, TF_ES_SYNC, &hrSession); @@ -1655,13 +1753,23 @@ static void test_TStoApplicationText(void) test_ACP_RequestLock = SINK_EXPECTED; test_DoEditSession = SINK_EXPECTED; hrSession = 0xfeedface; + test_OnEndEdit = SINK_EXPECTED; hr = ITfContext_RequestEditSession(cxt, tid, es, TF_ES_SYNC|TF_ES_READWRITE, &hrSession); ok(SUCCEEDED(hr),"ITfContext_RequestEditSession failed\n"); + ok(test_OnEndEdit == SINK_FIRED, "OnEndEdit not fired as expected\n"); ok(test_ACP_RequestLock == SINK_FIRED," expected RequestLock not fired\n"); ok(test_DoEditSession == SINK_FIRED," expected DoEditSession not fired\n"); ok(test_ACP_GetStatus == SINK_FIRED," expected GetStatus not fired\n"); ok(hrSession == 0xdeadcafe,"Unexpected hrSession (%x)\n",hrSession); + if (source) + { + hr = ITfSource_UnadviseSink(source, editSinkCookie); + ok(SUCCEEDED(hr),"Failed to unadvise Sink\n"); + ITfTextEditSink_Release(sink); + ITfSource_Release(source); + } + ITfContext_Release(cxt); ITfDocumentMgr_Release(dm); ITfEditSession_Release(es);

1 0

Aric Stewart : msctf: Stub implementation of ITfSourceSingle for ITfContext .
by Alexandre Julliard 29 Aug '09

29 Aug '09

Module: wine Branch: master Commit: e00bc2d3068ef118bf9d61cbfa9eb1d5dac89b12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e00bc2d3068ef118bf9d61cbf… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Aug 28 14:08:20 2009 -0500 msctf: Stub implementation of ITfSourceSingle for ITfContext. --- dlls/msctf/context.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 58 insertions(+), 1 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 5be06d3..5335940 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -64,7 +64,7 @@ typedef struct tagContext { const ITfInsertAtSelectionVtbl *InsertAtSelectionVtbl; /* const ITfMouseTrackerVtbl *MouseTrackerVtbl; */ /* const ITfQueryEmbeddedVtbl *QueryEmbeddedVtbl; */ - /* const ITfSourceSingleVtbl *SourceSingleVtbl; */ + const ITfSourceSingleVtbl *SourceSingleVtbl; LONG refCount; BOOL connected; @@ -117,6 +117,11 @@ static inline Context *impl_from_ITfInsertAtSelectionVtbl(ITfInsertAtSelection*i return (Context *)((char *)iface - FIELD_OFFSET(Context,InsertAtSelectionVtbl)); } +static inline Context *impl_from_ITfSourceSingleVtbl(ITfSourceSingle* iface) +{ + return (Context *)((char *)iface - FIELD_OFFSET(Context,SourceSingleVtbl)); +} + static void free_sink(ContextSink *sink) { IUnknown_Release(sink->interfaces.pIUnknown); @@ -204,6 +209,10 @@ static HRESULT WINAPI Context_QueryInterface(ITfContext *iface, REFIID iid, LPVO { *ppvOut = This->CompartmentMgr; } + else if (IsEqualIID(iid, &IID_ITfSourceSingle)) + { + *ppvOut = &This->SourceSingleVtbl; + } if (*ppvOut) { @@ -729,6 +738,53 @@ static const ITfInsertAtSelectionVtbl Context_InsertAtSelectionVtbl = InsertAtSelection_InsertEmbeddedAtSelection, }; +/***************************************************** + * ITfSourceSingle functions + *****************************************************/ +static HRESULT WINAPI SourceSingle_QueryInterface(ITfSourceSingle *iface, REFIID iid, LPVOID *ppvOut) +{ + Context *This = impl_from_ITfSourceSingleVtbl(iface); + return Context_QueryInterface((ITfContext *)This, iid, *ppvOut); +} + +static ULONG WINAPI SourceSingle_AddRef(ITfSourceSingle *iface) +{ + Context *This = impl_from_ITfSourceSingleVtbl(iface); + return Context_AddRef((ITfContext *)This); +} + +static ULONG WINAPI SourceSingle_Release(ITfSourceSingle *iface) +{ + Context *This = impl_from_ITfSourceSingleVtbl(iface); + return Context_Release((ITfContext *)This); +} + +static WINAPI HRESULT SourceSingle_AdviseSingleSink( ITfSourceSingle *iface, + TfClientId tid, REFIID riid, IUnknown *punk) +{ + Context *This = impl_from_ITfSourceSingleVtbl(iface); + FIXME("STUB:(%p) %i %s %p\n",This, tid, debugstr_guid(riid),punk); + return E_NOTIMPL; +} + +static WINAPI HRESULT SourceSingle_UnadviseSingleSink( ITfSourceSingle *iface, + TfClientId tid, REFIID riid) +{ + Context *This = impl_from_ITfSourceSingleVtbl(iface); + FIXME("STUB:(%p) %i %s\n",This, tid, debugstr_guid(riid)); + return E_NOTIMPL; +} + +static const ITfSourceSingleVtbl Context_SourceSingleVtbl = +{ + SourceSingle_QueryInterface, + SourceSingle_AddRef, + SourceSingle_Release, + + SourceSingle_AdviseSingleSink, + SourceSingle_UnadviseSingleSink, +}; + HRESULT Context_Constructor(TfClientId tidOwner, IUnknown *punk, ITfDocumentMgr *mgr, ITfContext **ppOut, TfEditCookie *pecTextStore) { Context *This; @@ -750,6 +806,7 @@ HRESULT Context_Constructor(TfClientId tidOwner, IUnknown *punk, ITfDocumentMgr This->ContextVtbl= &Context_ContextVtbl; This->SourceVtbl = &Context_SourceVtbl; This->InsertAtSelectionVtbl = &Context_InsertAtSelectionVtbl; + This->SourceSingleVtbl = &Context_SourceSingleVtbl; This->refCount = 1; This->tidOwner = tidOwner; This->connected = FALSE;

1 0

Aric Stewart : msctf: Define ITfSourceSingle.
by Alexandre Julliard 29 Aug '09

29 Aug '09

Module: wine Branch: master Commit: 6e6dd21c8356bd46ed732f9f75d23266501e210d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e6dd21c8356bd46ed732f9f7… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Aug 28 14:07:54 2009 -0500 msctf: Define ITfSourceSingle. --- include/msctf.idl | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/include/msctf.idl b/include/msctf.idl index bcd2587..204262f 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -1327,3 +1327,20 @@ interface IEnumTfDocumentMgrs : IUnknown HRESULT Skip( [in] ULONG ulCount); }; + +[ + object, + uuid(73131f9c-56a9-49dd-b0ee-d046633f7528), + pointer_default(unique) +] +interface ITfSourceSingle : IUnknown +{ + HRESULT AdviseSingleSink( + [in] TfClientId tid, + [in] REFIID riid, + [in, iid_is(riid)] IUnknown *punk); + + HRESULT UnadviseSingleSink( + [in] TfClientId tid, + [in] REFIID riid); +};

1 0

Alexandre Julliard : ntdll: Use a more drastic (and simpler) method for unwinding the stack on thread exit.
by Alexandre Julliard 29 Aug '09

29 Aug '09

Module: wine Branch: master Commit: 690cf4a6c8cde2d693f4c47be46ac7b8e6091945 URL: http://source.winehq.org/git/wine.git/?a=commit;h=690cf4a6c8cde2d693f4c47be… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Aug 29 12:08:11 2009 +0200 ntdll: Use a more drastic (and simpler) method for unwinding the stack on thread exit. --- dlls/ntdll/ntdll_misc.h | 4 ++ dlls/ntdll/signal_x86_64.c | 119 ++++++++++---------------------------------- 2 files changed, 31 insertions(+), 92 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index faafd20..179aa20 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -201,7 +201,11 @@ struct ntdll_thread_data int reply_fd; /* 1e4/314 fd for receiving server replies */ int wait_fd[2]; /* 1e8/318 fd for sleeping server requests */ BOOL wow64_redir; /* 1f0/320 Wow64 filesystem redirection flag */ +#ifdef __i386__ void *vm86_ptr; /* 1f4/328 data for vm86 mode */ +#else + void *exit_frame; /* 1f4/328 exit frame pointer */ +#endif pthread_t pthread_id; /* 1f8/330 pthread thread id */ }; diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 50ecbe8..b5ff237 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2880,101 +2880,45 @@ void WINAPI __regs_RtlRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context ) DEFINE_REGS_ENTRYPOINT( RtlRaiseException, 1 ) -struct topmost_frame -{ - EXCEPTION_REGISTRATION_RECORD frame; - sigjmp_buf jmp; - int exit_code; -}; - -static void DECLSPEC_NORETURN topmost_exit_unwind_target(void) -{ - struct topmost_frame *topmost_frame = (struct topmost_frame *)__wine_get_frame(); - __wine_pop_frame( &topmost_frame->frame ); - siglongjmp( topmost_frame->jmp, 1 ); -} - -static void DECLSPEC_NORETURN topmost_abort_unwind_target(void) -{ - struct topmost_frame *topmost_frame = (struct topmost_frame *)__wine_get_frame(); - __wine_pop_frame( &topmost_frame->frame ); - siglongjmp( topmost_frame->jmp, 2 ); -} - -static DWORD topmost_handler( EXCEPTION_RECORD *record, - EXCEPTION_REGISTRATION_RECORD *frame, - CONTEXT *context, - EXCEPTION_REGISTRATION_RECORD **pdispatcher ) +/*********************************************************************** + * call_thread_func + */ +void call_thread_func( LPTHREAD_START_ROUTINE entry, void *arg, void *frame ) { - struct topmost_frame *topmost_frame = (struct topmost_frame *)frame; - EXCEPTION_POINTERS ptrs; - - if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND | EH_NESTED_CALL)) - return ExceptionContinueSearch; - - ptrs.ExceptionRecord = record; - ptrs.ContextRecord = context; - switch (unhandled_exception_filter( &ptrs )) + ntdll_get_thread_data()->exit_frame = frame; + __TRY { - case EXCEPTION_CONTINUE_SEARCH: - return ExceptionContinueSearch; - case EXCEPTION_CONTINUE_EXECUTION: - return ExceptionContinueExecution; - case EXCEPTION_EXECUTE_HANDLER: - break; + RtlExitUserThread( entry( arg )); } - /* send the exit code to the server */ - /* we can't simply call NtTerminateThread since it's a WINAPI function */ - /* and libgcc unwinding doesn't handle those correctly */ - SERVER_START_REQ( terminate_thread ) + __EXCEPT(unhandled_exception_filter) { - req->handle = wine_server_obj_handle( GetCurrentThread() ); - req->exit_code = record->ExceptionCode; - wine_server_call( req ); + NtTerminateThread( GetCurrentThread(), GetExceptionCode() ); } - SERVER_END_REQ; - topmost_frame->exit_code = record->ExceptionCode; - for (;;) RtlUnwind( frame, topmost_abort_unwind_target, record, 0 ); + __ENDTRY + abort(); /* should not be reached */ } -/*********************************************************************** - * call_thread_entry_point - */ -void call_thread_entry_point( LPTHREAD_START_ROUTINE entry, void *arg ) -{ - struct topmost_frame frame; +extern void DECLSPEC_NORETURN call_thread_entry_point( LPTHREAD_START_ROUTINE entry, void *arg ); +__ASM_GLOBAL_FUNC( call_thread_entry_point, + "subq $8,%rsp\n\t" + ".cfi_adjust_cfa_offset 8\n\t" + "movq %rsp,%rdx\n\t" + "call " __ASM_NAME("call_thread_func") ); - frame.frame.Handler = topmost_handler; - switch (sigsetjmp( frame.jmp, 0 )) - { - case 0: - __wine_push_frame( &frame.frame ); - frame.exit_code = entry( arg ); - __wine_pop_frame( &frame.frame ); - /* fall through */ - case 1: - exit_thread( frame.exit_code ); - default: - terminate_thread( frame.exit_code ); - } -} +extern void DECLSPEC_NORETURN call_thread_exit_func( int status, void (*func)(int), void *frame ); +__ASM_GLOBAL_FUNC( call_thread_exit_func, + "subq $8,%rsp\n\t" + ".cfi_adjust_cfa_offset 8\n\t" + "movq %rdx,%rsp\n\t" + "call *%rsi" ); /*********************************************************************** * RtlExitUserThread (NTDLL.@) */ void WINAPI RtlExitUserThread( ULONG status ) { - EXCEPTION_REGISTRATION_RECORD *teb_frame = NtCurrentTeb()->Tib.ExceptionList; - - /* hack: find the top TEB frame and use it as unwind target */ - if (teb_frame != (EXCEPTION_REGISTRATION_RECORD *)~0UL) - { - while (teb_frame->Prev != (EXCEPTION_REGISTRATION_RECORD *)~0UL) teb_frame = teb_frame->Prev; - TRACE( "unwinding to frame %p for thread exit\n", teb_frame ); - ((struct topmost_frame *)teb_frame)->exit_code = status; - RtlUnwind( teb_frame, topmost_exit_unwind_target, NULL, 0 ); - } - exit_thread( status ); + if (!ntdll_get_thread_data()->exit_frame) exit_thread( status ); + call_thread_exit_func( status, exit_thread, ntdll_get_thread_data()->exit_frame ); } /*********************************************************************** @@ -2982,17 +2926,8 @@ void WINAPI RtlExitUserThread( ULONG status ) */ void abort_thread( int status ) { - EXCEPTION_REGISTRATION_RECORD *teb_frame = NtCurrentTeb()->Tib.ExceptionList; - - /* hack: find the top TEB frame and use it as unwind target */ - if (teb_frame != (EXCEPTION_REGISTRATION_RECORD *)~0UL) - { - while (teb_frame->Prev != (EXCEPTION_REGISTRATION_RECORD *)~0UL) teb_frame = teb_frame->Prev; - TRACE( "unwinding to frame %p for thread exit\n", teb_frame ); - ((struct topmost_frame *)teb_frame)->exit_code = status; - RtlUnwind( teb_frame, topmost_abort_unwind_target, NULL, 0 ); - } - terminate_thread( status ); + if (!ntdll_get_thread_data()->exit_frame) terminate_thread( status ); + call_thread_exit_func( status, terminate_thread, ntdll_get_thread_data()->exit_frame ); } /**********************************************************************

1 0

Alexandre Julliard : ntdll: Route the process startup through the platform-specific thread startup code .
by Alexandre Julliard 29 Aug '09

29 Aug '09

Module: wine Branch: master Commit: c9d85dd5760fb082c19577338632a05837eccdce URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9d85dd5760fb082c19577338… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Aug 29 11:07:17 2009 +0200 ntdll: Route the process startup through the platform-specific thread startup code. --- dlls/kernel32/process.c | 50 +++++++++++++++++----------------------------- dlls/ntdll/loader.c | 13 ++++++++++- include/winternl.h | 2 +- 3 files changed, 31 insertions(+), 34 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index ddc93f2..bf9bab4 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -47,7 +47,6 @@ #include "wine/winuser16.h" #include "winternl.h" #include "kernel_private.h" -#include "wine/exception.h" #include "wine/server.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -930,38 +929,29 @@ static void start_wineboot( HANDLE handles[2] ) * * Startup routine of a new process. Runs on the new process stack. */ -static void start_process( void *arg ) +static DWORD WINAPI start_process( PEB *peb ) { - __TRY - { - PEB *peb = NtCurrentTeb()->Peb; - IMAGE_NT_HEADERS *nt; - LPTHREAD_START_ROUTINE entry; - - nt = RtlImageNtHeader( peb->ImageBaseAddress ); - entry = (LPTHREAD_START_ROUTINE)((char *)peb->ImageBaseAddress + - nt->OptionalHeader.AddressOfEntryPoint); - - if (!nt->OptionalHeader.AddressOfEntryPoint) - { - ERR( "%s doesn't have an entry point, it cannot be executed\n", - debugstr_w(peb->ProcessParameters->ImagePathName.Buffer) ); - ExitThread( 1 ); - } + IMAGE_NT_HEADERS *nt; + LPTHREAD_START_ROUTINE entry; - if (TRACE_ON(relay)) - DPRINTF( "%04x:Starting process %s (entryproc=%p)\n", GetCurrentThreadId(), - debugstr_w(peb->ProcessParameters->ImagePathName.Buffer), entry ); + nt = RtlImageNtHeader( peb->ImageBaseAddress ); + entry = (LPTHREAD_START_ROUTINE)((char *)peb->ImageBaseAddress + + nt->OptionalHeader.AddressOfEntryPoint); - SetLastError( 0 ); /* clear error code */ - if (peb->BeingDebugged) DbgBreakPoint(); - ExitThread( entry( peb ) ); - } - __EXCEPT(UnhandledExceptionFilter) + if (!nt->OptionalHeader.AddressOfEntryPoint) { - TerminateThread( GetCurrentThread(), GetExceptionCode() ); + ERR( "%s doesn't have an entry point, it cannot be executed\n", + debugstr_w(peb->ProcessParameters->ImagePathName.Buffer) ); + ExitThread( 1 ); } - __ENDTRY + + if (TRACE_ON(relay)) + DPRINTF( "%04x:Starting process %s (entryproc=%p)\n", GetCurrentThreadId(), + debugstr_w(peb->ProcessParameters->ImagePathName.Buffer), entry ); + + SetLastError( 0 ); /* clear error code */ + if (peb->BeingDebugged) DbgBreakPoint(); + return entry( peb ); } @@ -1125,9 +1115,7 @@ void CDECL __wine_kernel_init(void) ExitProcess( error ); } - LdrInitializeThunk( 0, 0, 0, 0 ); - /* switch to the new stack */ - wine_switch_to_stack( start_process, NULL, NtCurrentTeb()->Tib.StackBase ); + LdrInitializeThunk( start_process, 0, 0, 0 ); error: ExitProcess( GetLastError() ); diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index a3db3b2..df4bb01 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2444,11 +2444,20 @@ static NTSTATUS attach_process_dlls( void *wm ) } +/*********************************************************************** + * start_process + */ +static void start_process( void *kernel_start ) +{ + call_thread_entry_point( kernel_start, NtCurrentTeb()->Peb ); +} + /****************************************************************** * LdrInitializeThunk (NTDLL.@) * */ -void WINAPI LdrInitializeThunk( ULONG unknown1, ULONG unknown2, ULONG unknown3, ULONG unknown4 ) +void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2, + ULONG_PTR unknown3, ULONG_PTR unknown4 ) { NTSTATUS status; WINE_MODREF *wm; @@ -2489,7 +2498,7 @@ void WINAPI LdrInitializeThunk( ULONG unknown1, ULONG unknown2, ULONG unknown3, virtual_release_address_space( nt->FileHeader.Characteristics & IMAGE_FILE_LARGE_ADDRESS_AWARE ); virtual_clear_thread_stack(); - return; + wine_switch_to_stack( start_process, kernel_start, NtCurrentTeb()->Tib.StackBase ); error: ERR( "Main exe initialization for %s failed, status %x\n", diff --git a/include/winternl.h b/include/winternl.h index aca74e5..07c778c 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1980,7 +1980,7 @@ NTSYSAPI NTSTATUS WINAPI LdrDisableThreadCalloutsForDll(HMODULE); NTSYSAPI NTSTATUS WINAPI LdrFindEntryForAddress(const void*, PLDR_MODULE*); NTSYSAPI NTSTATUS WINAPI LdrGetDllHandle(LPCWSTR, ULONG, const UNICODE_STRING*, HMODULE*); NTSYSAPI NTSTATUS WINAPI LdrGetProcedureAddress(HMODULE, const ANSI_STRING*, ULONG, void**); -NTSYSAPI void WINAPI LdrInitializeThunk(ULONG,ULONG,ULONG,ULONG); +NTSYSAPI void WINAPI LdrInitializeThunk(void*,ULONG_PTR,ULONG_PTR,ULONG_PTR); NTSYSAPI NTSTATUS WINAPI LdrLoadDll(LPCWSTR, DWORD, const UNICODE_STRING*, HMODULE*); NTSYSAPI NTSTATUS WINAPI LdrLockLoaderLock(ULONG,ULONG*,ULONG*); IMAGE_BASE_RELOCATION * WINAPI LdrProcessRelocationBlock(void*,UINT,USHORT*,INT_PTR);

1 0

Alexandre Julliard : ntdll: Add support for unwinding the signal stack on x86_64.
by Alexandre Julliard 29 Aug '09

29 Aug '09

Module: wine Branch: master Commit: af22daf72ba5c25e1d9221a77004701a2d5c5893 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af22daf72ba5c25e1d9221a77… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 28 18:24:06 2009 +0200 ntdll: Add support for unwinding the signal stack on x86_64. --- dlls/ntdll/signal_x86_64.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 825fb47..eaa9970 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -976,6 +976,17 @@ static inline void *get_signal_stack(void) } /*********************************************************************** + * is_inside_signal_stack + * + * Check if pointer is inside the signal stack. + */ +static inline int is_inside_signal_stack( void *ptr ) +{ + return ((char *)ptr >= (char *)get_signal_stack() && + (char *)ptr < (char *)get_signal_stack() + signal_stack_size); +} + +/*********************************************************************** * save_context * * Set the register values from a sigcontext. @@ -1316,8 +1327,7 @@ static EXCEPTION_RECORD *setup_exception( ucontext_t *sigcontext, raise_func fun /* stack sanity checks */ - if ((char *)stack >= (char *)get_signal_stack() && - (char *)stack < (char *)get_signal_stack() + signal_stack_size) + if (is_inside_signal_stack( stack )) { ERR( "nested exception on signal stack in thread %04x eip %016lx esp %016lx stack %p-%p\n", GetCurrentThreadId(), RIP_sig(sigcontext), RSP_sig(sigcontext), @@ -2424,6 +2434,14 @@ void WINAPI RtlUnwindEx( ULONG64 end_frame, ULONG64 target_ip, EXCEPTION_RECORD if (!dispatch.EstablisherFrame) break; + if (is_inside_signal_stack( (void *)dispatch.EstablisherFrame )) + { + 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; + continue; + } + if ((dispatch.EstablisherFrame & 7) || dispatch.EstablisherFrame < (ULONG64)NtCurrentTeb()->Tib.StackLimit || dispatch.EstablisherFrame > (ULONG64)NtCurrentTeb()->Tib.StackBase)

1 0