wine-commits August 2020

wine-commits@winehq.org

2 participants
692 discussions

Gabriel Ivăncescu : msscript.ocx: Implement the ScriptProcedure enumerator.
by Alexandre Julliard 20 Aug '20

20 Aug '20

Module: wine Branch: master Commit: 3a9c50e3ff0d2db1db6eaec19856f3c0eab6fb51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a9c50e3ff0d2db1db6eaec1… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Aug 17 18:33:51 2020 +0300 msscript.ocx: Implement the ScriptProcedure enumerator. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 194 ++++++++++++++++++++++++++++++++++++- dlls/msscript.ocx/tests/msscript.c | 80 +++++++++++++++ 2 files changed, 272 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3a9c50e3ff0d2db1db6e…

1 0

Nikolay Sivov : combase: Move CoGetCurrentLogicalThreadId().
by Alexandre Julliard 20 Aug '20

20 Aug '20

Module: wine Branch: master Commit: 6e0e890fba94946bc0f8925be900338028bd9606 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e0e890fba94946bc0f8925b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 20 10:34:42 2020 +0300 combase: Move CoGetCurrentLogicalThreadId(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.c | 22 ++++++++++++++++++++++ dlls/combase/combase.spec | 2 +- dlls/ole32/compobj.c | 14 -------------- dlls/ole32/compobj_private.h | 10 ---------- dlls/ole32/ole32.spec | 2 +- dlls/ole32/rpc.c | 2 +- 6 files changed, 25 insertions(+), 27 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index a2e5ac93a5..8ad95329d0 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -2211,3 +2211,25 @@ HRESULT WINAPI CoGetContextToken(ULONG_PTR *token) return S_OK; } + +/*********************************************************************** + * CoGetCurrentLogicalThreadId (combase.@) + */ +HRESULT WINAPI CoGetCurrentLogicalThreadId(GUID *id) +{ + struct tlsdata *tlsdata; + HRESULT hr; + + if (!id) + return E_INVALIDARG; + + if (FAILED(hr = com_get_tlsdata(&tlsdata))) + return hr; + + if (IsEqualGUID(&tlsdata->causality_id, &GUID_NULL)) + CoCreateGuid(&tlsdata->causality_id); + + *id = tlsdata->causality_id; + + return S_OK; +} diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 806ee01537..af83e89d17 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -104,7 +104,7 @@ @ stdcall CoGetClassObject(ptr long ptr ptr ptr) ole32.CoGetClassObject @ stub CoGetClassVersion @ stdcall CoGetContextToken(ptr) -@ stdcall CoGetCurrentLogicalThreadId(ptr) ole32.CoGetCurrentLogicalThreadId +@ stdcall CoGetCurrentLogicalThreadId(ptr) @ stdcall CoGetCurrentProcess() ole32.CoGetCurrentProcess @ stdcall CoGetDefaultContext(long ptr ptr) @ stdcall CoGetErrorInfo(long ptr) GetErrorInfo diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 8364478258..671f60e231 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2914,20 +2914,6 @@ DWORD WINAPI CoGetCurrentProcess(void) return info->thread_seqid; } -/*********************************************************************** - * CoGetCurrentLogicalThreadId [OLE32.@] - */ -HRESULT WINAPI CoGetCurrentLogicalThreadId(GUID *id) -{ - TRACE("(%p)\n", id); - - if (!id) - return E_INVALIDARG; - - *id = COM_CurrentCausalityId(); - return S_OK; -} - /*********************************************************************** * CoIsOle1Class [OLE32.@] * diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 5d7bf50b73..8419fd04ff 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -287,16 +287,6 @@ static inline APARTMENT* COM_CurrentApt(void) return COM_CurrentInfo()->apt; } -static inline GUID COM_CurrentCausalityId(void) -{ - struct oletls *info = COM_CurrentInfo(); - if (!info) - return GUID_NULL; - if (IsEqualGUID(&info->causality_id, &GUID_NULL)) - CoCreateGuid(&info->causality_id); - return info->causality_id; -} - /* helpers for debugging */ # define DEBUG_SET_CRITSEC_NAME(cs, name) (cs)->DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": " name) # define DEBUG_CLEAR_CRITSEC_NAME(cs) (cs)->DebugInfo->Spare[0] = 0 diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 9c66369248..543126e02b 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -32,7 +32,7 @@ @ stdcall CoGetCallerTID(ptr) @ stdcall CoGetClassObject(ptr long ptr ptr ptr) @ stdcall CoGetContextToken(ptr) combase.CoGetContextToken -@ stdcall CoGetCurrentLogicalThreadId(ptr) +@ stdcall CoGetCurrentLogicalThreadId(ptr) combase.CoGetCurrentLogicalThreadId @ stdcall CoGetCurrentProcess() @ stdcall CoGetDefaultContext(long ptr ptr) combase.CoGetDefaultContext @ stdcall CoGetInstanceFromFile(ptr ptr ptr long long wstr long ptr) combase.CoGetInstanceFromFile diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 895aa4010c..bd825fd6c1 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -659,7 +659,7 @@ static HRESULT WINAPI ClientRpcChannelBuffer_GetBuffer(LPRPCCHANNELBUFFER iface, message_state->channel_hook_info.iid = *riid; message_state->channel_hook_info.cbSize = sizeof(message_state->channel_hook_info); - message_state->channel_hook_info.uCausality = COM_CurrentCausalityId(); + CoGetCurrentLogicalThreadId(&message_state->channel_hook_info.uCausality); message_state->channel_hook_info.dwServerPid = This->server_pid; message_state->channel_hook_info.iMethod = msg->ProcNum & ~RPC_FLAGS_VALID_BIT; message_state->channel_hook_info.pObject = NULL; /* only present on server-side */

1 0

Nikolay Sivov : combase: Move CoGetContextToken().
by Alexandre Julliard 20 Aug '20

20 Aug '20

Module: wine Branch: master Commit: 90c0e3a4dda1287c14bd5ad6e9c3296864b94368 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90c0e3a4dda1287c14bd5ad6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 20 10:34:41 2020 +0300 combase: Move CoGetContextToken(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.c | 313 ++++++++++++++++++++++++++++++++++++++++++ dlls/combase/combase.spec | 2 +- dlls/ole32/compobj.c | 336 ---------------------------------------------- dlls/ole32/ole32.spec | 2 +- 4 files changed, 315 insertions(+), 338 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=90c0e3a4dda1287c14bd…

1 0

Nikolay Sivov : combase: Move local proxy-stub registration functions.
by Alexandre Julliard 20 Aug '20

20 Aug '20

Module: wine Branch: master Commit: e00ea31d09e451b524c93950ee0e3f92d5b371d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e00ea31d09e451b524c93950… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 20 10:34:40 2020 +0300 combase: Move local proxy-stub registration functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.c | 177 ++++++++++++++++++++++++++++++++++ dlls/combase/combase.spec | 5 +- dlls/ole32/compobj.c | 235 +++------------------------------------------- dlls/ole32/ole32.spec | 5 +- 4 files changed, 197 insertions(+), 225 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e00ea31d09e451b524c9…

1 0

Gijs Vermeulen : quartz: Close hfile when GetFileSizeEx fails in IFileSourceFilter::Load() (Coverity).
by Alexandre Julliard 20 Aug '20

20 Aug '20

Module: wine Branch: master Commit: 5e1753f04dd2d67edba2b62f1644cb30528376c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e1753f04dd2d67edba2b62f… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Aug 20 15:08:20 2020 +0200 quartz: Close hfile when GetFileSizeEx fails in IFileSourceFilter::Load() (Coverity). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index a553b8517e..79df639ab4 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -478,6 +478,7 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi if (!GetFileSizeEx(hFile, &This->file_size)) { WARN("Could not get file size.\n"); + CloseHandle(hFile); return HRESULT_FROM_WIN32(GetLastError()); }

1 0

Gijs Vermeulen : qcap/tests: Remove unused enumMediaTypes in test_smart_tee_filter() (Coverity).
by Alexandre Julliard 20 Aug '20

20 Aug '20

Module: wine Branch: master Commit: e13f5a1b43e994d4f5457f763f422452e572d722 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e13f5a1b43e994d4f5457f76… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Aug 20 15:07:54 2020 +0200 qcap/tests: Remove unused enumMediaTypes in test_smart_tee_filter() (Coverity). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/smartteefilter.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index f3a44c67c1..1364beef16 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -2142,7 +2142,6 @@ static void test_smart_tee_filter(void) FILTER_INFO filterInfo; int pinNumber = 0; IMemInputPin *memInputPin = NULL; - IEnumMediaTypes *enumMediaTypes = NULL; hr = CoCreateInstance(&CLSID_SmartTee, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void**)&smartTeeFilter); @@ -2213,8 +2212,6 @@ end: IEnumPins_Release(enumPins); if (memInputPin) IMemInputPin_Release(memInputPin); - if (enumMediaTypes) - IEnumMediaTypes_Release(enumMediaTypes); } static void test_unconnected_filter_state(void)

1 0

Gijs Vermeulen : amstream: Return S_FALSE when IMediaSeeking::GetDuration() fails in IAMMultiMediaStream::GetDuration().
by Alexandre Julliard 20 Aug '20

20 Aug '20

Module: wine Branch: master Commit: 0a2bf907337bf787feac68b0da8345149a734c6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a2bf907337bf787feac68b0… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Aug 6 20:32:31 2020 +0200 amstream: Return S_FALSE when IMediaSeeking::GetDuration() fails in IAMMultiMediaStream::GetDuration(). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/multimedia.c | 6 +++++- dlls/amstream/tests/amstream.c | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c index 5425ef42a3..82ef482234 100644 --- a/dlls/amstream/multimedia.c +++ b/dlls/amstream/multimedia.c @@ -181,7 +181,11 @@ static HRESULT WINAPI multimedia_stream_GetDuration(IAMMultiMediaStream *iface, if (!mmstream->media_seeking) return E_NOINTERFACE; - return IMediaSeeking_GetDuration(mmstream->media_seeking, duration); + + if (IMediaSeeking_GetDuration(mmstream->media_seeking, duration) != S_OK) + return S_FALSE; + + return S_OK; } static HRESULT WINAPI multimedia_stream_Seek(IAMMultiMediaStream *iface, STREAM_TIME seek_time) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 6a72f3ed89..a25ae42a31 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -414,7 +414,7 @@ static void test_mmstream_get_duration(const WCHAR *test_avi_path) duration = 0xdeadbeefdeadbeefULL; hr = IAMMultiMediaStream_GetDuration(mmstream, &duration); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); ok(duration == 0, "Got duration %s.\n", wine_dbgstr_longlong(duration)); ref = IAMMultiMediaStream_Release(mmstream); @@ -427,7 +427,7 @@ static void test_mmstream_get_duration(const WCHAR *test_avi_path) duration = 0xdeadbeefdeadbeefULL; hr = IAMMultiMediaStream_GetDuration(mmstream, &duration); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); ok(duration == 0, "Got duration %s.\n", wine_dbgstr_longlong(duration)); ref = IAMMultiMediaStream_Release(mmstream); @@ -442,7 +442,7 @@ static void test_mmstream_get_duration(const WCHAR *test_avi_path) duration = 0xdeadbeefdeadbeefULL; hr = IAMMultiMediaStream_GetDuration(mmstream, &duration); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); ok(duration == 0, "Got duration %s.\n", wine_dbgstr_longlong(duration)); ref = IAMMultiMediaStream_Release(mmstream);

1 0

Gijs Vermeulen : amstream: Return VFW_E_CANNOT_CONNECT in IAMMultiMediaStream::OpenFile() when no renderers are present and AMMSF_NORENDER is not specified.
by Alexandre Julliard 20 Aug '20

20 Aug '20

Module: wine Branch: master Commit: bdf860033860973bf2b516a1083d5bea86ad8c14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdf860033860973bf2b516a1… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Aug 6 20:32:30 2020 +0200 amstream: Return VFW_E_CANNOT_CONNECT in IAMMultiMediaStream::OpenFile() when no renderers are present and AMMSF_NORENDER is not specified. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/multimedia.c | 17 ++++++++++++++++- dlls/amstream/tests/amstream.c | 38 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 52 insertions(+), 3 deletions(-) diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c index 414a903cf2..5425ef42a3 100644 --- a/dlls/amstream/multimedia.c +++ b/dlls/amstream/multimedia.c @@ -447,7 +447,22 @@ static HRESULT WINAPI multimedia_stream_OpenFile(IAMMultiMediaStream *iface, } if (SUCCEEDED(ret) && !(flags & AMMSF_NORENDER)) - ret = IGraphBuilder_Render(This->graph, This->ipin); + { + IFilterGraph2 *graph; + + if (SUCCEEDED(ret = IGraphBuilder_QueryInterface(This->graph, &IID_IFilterGraph2, (void **)&graph))) + { + ret = IFilterGraph2_RenderEx(graph, This->ipin, AM_RENDEREX_RENDERTOEXISTINGRENDERERS, NULL); + if (ret == VFW_E_CANNOT_RENDER) ret = VFW_E_CANNOT_CONNECT; + else if (ret == VFW_S_PARTIAL_RENDER) ret = S_OK; + IFilterGraph2_Release(graph); + } + else + { + FIXME("Failed to get IFilterGraph2 interface, hr %#x.\n", ret); + ret = IGraphBuilder_Render(This->graph, This->ipin); + } + } IMediaStreamFilter_SupportSeeking(This->filter, This->type == STREAMTYPE_READ); diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 910ab11f52..6a72f3ed89 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -283,13 +283,47 @@ static void test_openfile(const WCHAR *test_avi_path) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(!graph, "Expected NULL graph.\n"); + hr = IAMMultiMediaStream_GetFilter(mmstream, &filter); + ok(!!filter, "Expected non-NULL filter.\n"); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + check_interface(filter, &IID_IMediaSeeking, FALSE); + hr = IAMMultiMediaStream_OpenFile(mmstream, test_avi_path, AMMSF_NORENDER); ok(hr == S_OK, "Got hr %#x.\n", hr); + check_interface(filter, &IID_IMediaSeeking, FALSE); + + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!!graph, "Expected non-NULL graph.\n"); + IGraphBuilder_Release(graph); + IMediaStreamFilter_Release(filter); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + mmstream = create_ammultimediastream(); + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!graph, "Expected NULL graph.\n"); + + hr = IAMMultiMediaStream_GetFilter(mmstream, &filter); + ok(!!filter, "Expected non-NULL filter.\n"); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + check_interface(filter, &IID_IMediaSeeking, FALSE); + + hr = IAMMultiMediaStream_OpenFile(mmstream, test_avi_path, 0); + ok(hr == VFW_E_CANNOT_CONNECT, "Got hr %#x.\n", hr); + + check_interface(filter, &IID_IMediaSeeking, FALSE); + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(!!graph, "Expected non-NULL graph.\n"); IGraphBuilder_Release(graph); + IMediaStreamFilter_Release(filter); ref = IAMMultiMediaStream_Release(mmstream); ok(!ref, "Got outstanding refcount %d.\n", ref); @@ -389,12 +423,12 @@ static void test_mmstream_get_duration(const WCHAR *test_avi_path) mmstream = create_ammultimediastream(); hr = IAMMultiMediaStream_OpenFile(mmstream, test_avi_path, 0); - todo_wine ok(hr == VFW_E_CANNOT_CONNECT, "Got hr %#x.\n", hr); + ok(hr == VFW_E_CANNOT_CONNECT, "Got hr %#x.\n", hr); duration = 0xdeadbeefdeadbeefULL; hr = IAMMultiMediaStream_GetDuration(mmstream, &duration); todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); - todo_wine ok(duration == 0, "Got duration %s.\n", wine_dbgstr_longlong(duration)); + ok(duration == 0, "Got duration %s.\n", wine_dbgstr_longlong(duration)); ref = IAMMultiMediaStream_Release(mmstream); ok(!ref, "Got outstanding refcount %d.\n", ref);

1 0

Alexandre Julliard : ntdll: Unwind the syscall frame in NtSetContextThread().
by Alexandre Julliard 20 Aug '20

20 Aug '20

Module: wine Branch: master Commit: 77fbf3a9fde517ecb4d23e0bc121668206fec2f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77fbf3a9fde517ecb4d23e0b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 20 18:23:24 2020 +0200 ntdll: Unwind the syscall frame in NtSetContextThread(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 7 ++++++- dlls/ntdll/unix/signal_arm64.c | 2 ++ dlls/ntdll/unix/signal_i386.c | 3 +++ dlls/ntdll/unix/signal_x86_64.c | 4 ++++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 270a23ad71..175e86168a 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -461,7 +461,12 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) context_to_server( &server_context, context ); ret = set_thread_context( handle, &server_context, &self ); - if (self && ret == STATUS_SUCCESS) set_cpu_context( context ); + if (self && ret == STATUS_SUCCESS) + { + struct syscall_frame *frame = arm_thread_data()->syscall_frame; + arm_thread_data()->syscall_frame = frame->prev_frame; + set_cpu_context( context ); + } return ret; } diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 8c03357b76..52f00323a0 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -520,6 +520,8 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) } if (self && ret == STATUS_SUCCESS) { + struct syscall_frame *frame = arm64_thread_data()->syscall_frame; + arm64_thread_data()->syscall_frame = frame->prev_frame; InterlockedExchangePointer( (void **)&arm64_thread_data()->context, (void *)context ); raise( SIGUSR2 ); } diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index c70b381547..b9cc3ee46e 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -870,6 +870,9 @@ static inline void restore_context( const CONTEXT *context, ucontext_t *sigconte */ extern void set_full_cpu_context( const CONTEXT *context ); __ASM_GLOBAL_FUNC( set_full_cpu_context, + "movl %fs:0x1f8,%eax\n\t" /* x86_thread_data()->syscall_frame */ + "movl (%eax),%eax\n\t" /* frame->prev_frame */ + "movl %eax,%fs:0x1f8\n\t" "movl 4(%esp),%ecx\n\t" "movw 0x8c(%ecx),%gs\n\t" /* SegGs */ "movw 0x90(%ecx),%fs\n\t" /* SegFs */ diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 734c6b92a5..79b69cccc5 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1708,7 +1708,11 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) if (!(flags & CONTEXT_CONTROL)) FIXME( "setting partial context (%x) not supported\n", flags ); else + { + struct syscall_frame *frame = amd64_thread_data()->syscall_frame; + amd64_thread_data()->syscall_frame = frame->prev_frame; set_full_cpu_context( context ); + } } return ret; }

1 0

Alexandre Julliard : ntdll: Unwind the syscall frame when calling KiUserApcDispatcher().
by Alexandre Julliard 20 Aug '20

20 Aug '20

Module: wine Branch: master Commit: a686759f1d7aee67b5786b72e81a4e4fcf3f3c02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a686759f1d7aee67b5786b72… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 20 08:24:00 2020 +0200 ntdll: Unwind the syscall frame when calling KiUserApcDispatcher(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 10 ++++---- dlls/ntdll/unix/signal_arm.c | 56 +++++++++++++++++++++++++++++------------ dlls/ntdll/unix/signal_arm64.c | 55 +++++++++++++++++++++++++++++----------- dlls/ntdll/unix/signal_i386.c | 53 +++++++++++++++++++++++++++----------- dlls/ntdll/unix/signal_x86_64.c | 50 ++++++++++++++++++++++++------------ dlls/ntdll/unix/unix_private.h | 6 +++-- 6 files changed, 161 insertions(+), 69 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a686759f1d7aee67b578…

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
70
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 August 2020