wine-commits January 2021

wine-commits@winehq.org

2 participants
472 discussions

Alexandre Julliard : ntdll: Support the NtCreateDebugObject() flags.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 964772bc8ea04fb445843b13f4d1f2e297002d4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=964772bc8ea04fb445843b13… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 29 12:26:17 2021 +0100 ntdll: Support the NtCreateDebugObject() flags. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 74 ++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/process.c | 2 +- dlls/ntdll/unix/sync.c | 3 ++ include/wine/server_protocol.h | 4 ++- include/winternl.h | 2 ++ server/debugger.c | 21 ++++++------ server/protocol.def | 1 + server/request.h | 3 +- server/trace.c | 1 + 9 files changed, 98 insertions(+), 13 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=964772bc8ea04fb44584…

1 0

Alexandre Julliard : ntdll: Implement DbgUiConnectToDbg().
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: a24e330b203a6b37987633ba03fc3b2e1c3a004f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a24e330b203a6b37987633ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 28 11:20:38 2021 +0100 ntdll: Implement DbgUiConnectToDbg(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/process.c | 16 ++++++++++++++++ include/winternl.h | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 285b719f2d5..740030f2066 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -34,7 +34,7 @@ @ stub DbgPrompt # @ stub DbgQueryDebugFilterState # @ stub DbgSetDebugFilterState -@ stub DbgUiConnectToDbg +@ stdcall DbgUiConnectToDbg() @ stub DbgUiContinue @ stub DbgUiConvertStateChangeStructure # @ stub DbgUiDebugActiveProcess diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index d8280277418..c52f00d123e 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -134,6 +134,22 @@ void WINAPI DbgUiSetThreadDebugObject( HANDLE handle ) NtCurrentTeb()->DbgSsReserved[1] = handle; } +/*********************************************************************** + * DbgUiConnectToDbg (NTDLL.@) + */ +NTSTATUS WINAPI DbgUiConnectToDbg(void) +{ + HANDLE handle; + NTSTATUS status; + OBJECT_ATTRIBUTES attr = { sizeof(attr) }; + + if (DbgUiGetThreadDebugObject()) return STATUS_SUCCESS; /* already connected */ + + status = NtCreateDebugObject( &handle, DEBUG_ALL_ACCESS, &attr, 0 ); + if (!status) DbgUiSetThreadDebugObject( handle ); + return status; +} + /*********************************************************************** * DbgUiRemoteBreakin (NTDLL.@) */ diff --git a/include/winternl.h b/include/winternl.h index ac63567dad3..fc4792a194a 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3020,6 +3020,7 @@ typedef struct _PS_CREATE_INFO NTSYSAPI void WINAPI DbgBreakPoint(void); NTSYSAPI NTSTATUS WINAPIV DbgPrint(LPCSTR fmt, ...); NTSYSAPI NTSTATUS WINAPIV DbgPrintEx(ULONG iComponentId, ULONG Level, LPCSTR fmt, ...); +NTSYSAPI NTSTATUS WINAPI DbgUiConnectToDbg(void); NTSYSAPI HANDLE WINAPI DbgUiGetThreadDebugObject(void); NTSYSAPI NTSTATUS WINAPI DbgUiIssueRemoteBreakin(HANDLE); NTSYSAPI void WINAPI DbgUiRemoteBreakin(void*);

1 0

Alexandre Julliard : ntdll: Implement DbgUiGet/SetThreadDebugObject().
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: f7c48da359a7b83e6a0ef35fdea89fcc613a48b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7c48da359a7b83e6a0ef35f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 28 11:17:45 2021 +0100 ntdll: Implement DbgUiGet/SetThreadDebugObject(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/process.c | 16 ++++++++++++++++ include/winternl.h | 2 ++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 2f1d4904111..285b719f2d5 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -38,10 +38,10 @@ @ stub DbgUiContinue @ stub DbgUiConvertStateChangeStructure # @ stub DbgUiDebugActiveProcess -# @ stub DbgUiGetThreadDebugObject +@ stdcall DbgUiGetThreadDebugObject() @ stdcall DbgUiIssueRemoteBreakin(long) @ stdcall DbgUiRemoteBreakin(ptr) -# @ stub DbgUiSetThreadDebugObject +@ stdcall DbgUiSetThreadDebugObject(long) # @ stub DbgUiStopDebugging @ stub DbgUiWaitStateChange @ stdcall DbgUserBreakPoint() diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 4cf83753a79..d8280277418 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -118,6 +118,22 @@ NTSTATUS WINAPI RtlCreateUserProcess( UNICODE_STRING *path, ULONG attributes, &create_info, attr ); } +/*********************************************************************** + * DbgUiGetThreadDebugObject (NTDLL.@) + */ +HANDLE WINAPI DbgUiGetThreadDebugObject(void) +{ + return NtCurrentTeb()->DbgSsReserved[1]; +} + +/*********************************************************************** + * DbgUiSetThreadDebugObject (NTDLL.@) + */ +void WINAPI DbgUiSetThreadDebugObject( HANDLE handle ) +{ + NtCurrentTeb()->DbgSsReserved[1] = handle; +} + /*********************************************************************** * DbgUiRemoteBreakin (NTDLL.@) */ diff --git a/include/winternl.h b/include/winternl.h index 6de71e0e206..ac63567dad3 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3020,8 +3020,10 @@ typedef struct _PS_CREATE_INFO NTSYSAPI void WINAPI DbgBreakPoint(void); NTSYSAPI NTSTATUS WINAPIV DbgPrint(LPCSTR fmt, ...); NTSYSAPI NTSTATUS WINAPIV DbgPrintEx(ULONG iComponentId, ULONG Level, LPCSTR fmt, ...); +NTSYSAPI HANDLE WINAPI DbgUiGetThreadDebugObject(void); NTSYSAPI NTSTATUS WINAPI DbgUiIssueRemoteBreakin(HANDLE); NTSYSAPI void WINAPI DbgUiRemoteBreakin(void*); +NTSYSAPI void WINAPI DbgUiSetThreadDebugObject(HANDLE); NTSYSAPI void WINAPI DbgUserBreakPoint(void); NTSYSAPI NTSTATUS WINAPI LdrAccessResource(HMODULE,const IMAGE_RESOURCE_DATA_ENTRY*,void**,PULONG); NTSYSAPI NTSTATUS WINAPI LdrAddDllDirectory(const UNICODE_STRING*,void**);

1 0

Zebediah Figura : kernel32: Implement SetProcessDEPPolicy().
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: b62921245238412709d4e9f8a3548d37864d0d5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b62921245238412709d4e9f8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 28 22:08:22 2021 -0600 kernel32: Implement SetProcessDEPPolicy(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 227d49ea37e..085fff1454e 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -562,11 +562,19 @@ DEP_SYSTEM_POLICY_TYPE WINAPI GetSystemDEPPolicy(void) /********************************************************************** * SetProcessDEPPolicy (KERNEL32.@) */ -BOOL WINAPI SetProcessDEPPolicy(DWORD newDEP) +BOOL WINAPI SetProcessDEPPolicy( DWORD flags ) { - FIXME("(%d): stub\n", newDEP); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + ULONG dep_flags = 0; + + TRACE("%#x\n", flags); + + if (flags & PROCESS_DEP_ENABLE) + dep_flags |= MEM_EXECUTE_OPTION_DISABLE | MEM_EXECUTE_OPTION_PERMANENT; + if (flags & PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION) + dep_flags |= MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION; + + return set_ntstatus( NtSetInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, + &dep_flags, sizeof(dep_flags) ) ); } /**********************************************************************

1 0

Zebediah Figura : kernel32: Implement GetSystemDEPPolicy().
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 246e2356e5a178ca7e56d350cbc5cdaecc8538ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=246e2356e5a178ca7e56d350… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 28 22:08:21 2021 -0600 kernel32: Implement GetSystemDEPPolicy(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 92582ae31de..227d49ea37e 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -34,6 +34,7 @@ #include "wincon.h" #include "kernel_private.h" #include "psapi.h" +#include "ddk/wdm.h" #include "wine/exception.h" #include "wine/server.h" #include "wine/asm.h" @@ -41,6 +42,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(process); +static const struct _KUSER_SHARED_DATA *user_shared_data = (struct _KUSER_SHARED_DATA *)0x7ffe0000; + typedef struct { LPSTR lpEnvAddress; @@ -553,8 +556,7 @@ DWORD WINAPI WTSGetActiveConsoleSessionId(void) */ DEP_SYSTEM_POLICY_TYPE WINAPI GetSystemDEPPolicy(void) { - FIXME("stub\n"); - return OptIn; + return user_shared_data->NXSupportPolicy; } /**********************************************************************

1 0

Zebediah Figura : wineboot: Set the NXSupportPolicy member of the user shared data to NX_SUPPORT_POLICY_OPTIN.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: b3d00c3340e5a0d19d0b708a1c434b1ccb1bc04d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3d00c3340e5a0d19d0b708a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 28 22:08:20 2021 -0600 wineboot: Set the NXSupportPolicy member of the user shared data to NX_SUPPORT_POLICY_OPTIN. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineboot/wineboot.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 05a5ee6aa62..9427448b612 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -291,6 +291,7 @@ static void create_user_shared_data(void) data->NtMinorVersion = version.dwMinorVersion; data->SuiteMask = version.wSuiteMask; data->NumberOfPhysicalPages = sbi.MmNumberOfPhysicalPages; + data->NXSupportPolicy = NX_SUPPORT_POLICY_OPTIN; wcscpy( data->NtSystemRoot, L"C:\\windows" ); features = data->ProcessorFeatures;

1 0

Zebediah Figura : winegstreamer: Don't force activate_mode() onto a Wine thread.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 8c13dde595b0841198a7d17bfc21c2997dde53b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c13dde595b0841198a7d17b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 28 18:40:16 2021 -0600 winegstreamer: Don't force activate_mode() onto a Wine thread. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_cbs.c | 14 -------------- dlls/winegstreamer/gst_cbs.h | 2 -- dlls/winegstreamer/gstdemux.c | 8 +------- 3 files changed, 1 insertion(+), 23 deletions(-) diff --git a/dlls/winegstreamer/gst_cbs.c b/dlls/winegstreamer/gst_cbs.c index 5267091c5e1..90c34b1cb39 100644 --- a/dlls/winegstreamer/gst_cbs.c +++ b/dlls/winegstreamer/gst_cbs.c @@ -147,20 +147,6 @@ void existing_new_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) call_cb(&cbdata); } -gboolean activate_mode_wrapper(GstPad *pad, GstObject *parent, GstPadMode mode, gboolean activate) -{ - struct cb_data cbdata = { ACTIVATE_MODE }; - - cbdata.u.activate_mode_data.pad = pad; - cbdata.u.activate_mode_data.parent = parent; - cbdata.u.activate_mode_data.mode = mode; - cbdata.u.activate_mode_data.activate = activate; - - call_cb(&cbdata); - - return cbdata.u.activate_mode_data.ret; -} - gboolean query_sink_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) { struct cb_data cbdata = { QUERY_SINK }; diff --git a/dlls/winegstreamer/gst_cbs.h b/dlls/winegstreamer/gst_cbs.h index 4afde78ba7d..cbd9a630885 100644 --- a/dlls/winegstreamer/gst_cbs.h +++ b/dlls/winegstreamer/gst_cbs.h @@ -31,7 +31,6 @@ typedef enum { enum CB_TYPE { EXISTING_NEW_PAD, - ACTIVATE_MODE, QUERY_SINK, GSTDEMUX_MAX, BYTESTREAM_WRAPPER_PULL, @@ -114,7 +113,6 @@ void perform_cb_gstdemux(struct cb_data *data) DECLSPEC_HIDDEN; void perform_cb_media_source(struct cb_data *data) DECLSPEC_HIDDEN; void existing_new_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; -gboolean activate_mode_wrapper(GstPad *pad, GstObject *parent, GstPadMode mode, gboolean activate) DECLSPEC_HIDDEN; GstFlowReturn got_data_wrapper(GstPad *pad, GstObject *parent, GstBuffer *buf) DECLSPEC_HIDDEN; void Gstreamer_transform_pad_added_wrapper(GstElement *filter, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; gboolean query_sink_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 5747cce1dd2..ea6808ec113 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1581,7 +1581,7 @@ static HRESULT GST_Connect(struct parser *This, IPin *pConnectPin) This->my_src = gst_pad_new_from_static_template(&src_template, "quartz-src"); gst_pad_set_getrange_function(This->my_src, request_buffer_src); gst_pad_set_query_function(This->my_src, query_function); - gst_pad_set_activatemode_function(This->my_src, activate_mode_wrapper); + gst_pad_set_activatemode_function(This->my_src, activate_mode); gst_pad_set_event_function(This->my_src, event_src); gst_pad_set_element_private (This->my_src, This); @@ -2511,12 +2511,6 @@ void perform_cb_gstdemux(struct cb_data *cbdata) existing_new_pad(data->element, data->pad, data->user); break; } - case ACTIVATE_MODE: - { - struct activate_mode_data *data = &cbdata->u.activate_mode_data; - cbdata->u.activate_mode_data.ret = activate_mode(data->pad, data->parent, data->mode, data->activate); - break; - } case QUERY_SINK: { struct query_sink_data *data = &cbdata->u.query_sink_data;

1 0

Zebediah Figura : winegstreamer: Avoid using Wine debug functions in activate_mode().
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 1dc7015cdbcc863a57c89cc81b94440c10686da5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1dc7015cdbcc863a57c89cc8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 28 18:40:15 2021 -0600 winegstreamer: Avoid using Wine debug functions in activate_mode(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index e7178bb4dfc..5747cce1dd2 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1422,7 +1422,6 @@ static gboolean activate_push(GstPad *pad, gboolean activate) struct parser *This = gst_pad_get_element_private(pad); if (!activate) { - TRACE("Deactivating\n"); if (This->push_thread) { pthread_join(This->push_thread, NULL); This->push_thread = 0; @@ -1432,7 +1431,6 @@ static gboolean activate_push(GstPad *pad, gboolean activate) } else if (!This->push_thread) { int ret; - TRACE("Activating\n"); if ((ret = pthread_create(&This->push_thread, NULL, push_data, This))) { GST_ERROR("Failed to create push thread: %s", strerror(errno)); @@ -1447,7 +1445,7 @@ static gboolean activate_mode(GstPad *pad, GstObject *parent, GstPadMode mode, g { struct parser *filter = gst_pad_get_element_private(pad); - TRACE("%s source pad for filter %p in %s mode.\n", + GST_DEBUG("%s source pad for filter %p in %s mode.", activate ? "Activating" : "Deactivating", filter, gst_pad_mode_get_name(mode)); switch (mode) {

1 0

Zebediah Figura : winegstreamer: Don't grab filter_cs in activate_push().
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 8e84f16066568e1a24f6eff1a8137acfe4f68ed2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e84f16066568e1a24f6eff1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 28 18:40:14 2021 -0600 winegstreamer: Don't grab filter_cs in activate_push(). There's no good reason to do this; we're not protecting anything that isn't already protected by GStreamer locks. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index b2a20934837..e7178bb4dfc 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1421,7 +1421,6 @@ static gboolean activate_push(GstPad *pad, gboolean activate) { struct parser *This = gst_pad_get_element_private(pad); - EnterCriticalSection(&This->filter.filter_cs); if (!activate) { TRACE("Deactivating\n"); if (This->push_thread) { @@ -1441,7 +1440,6 @@ static gboolean activate_push(GstPad *pad, gboolean activate) return FALSE; } } - LeaveCriticalSection(&This->filter.filter_cs); return TRUE; }

1 0

Zebediah Figura : winegstreamer: Do not flush the upstream source pin in activate_push().
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 5482400a4edb57985be313a68ea9b6406f26ae4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=5482400a4edb57985be313a6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 28 18:40:13 2021 -0600 winegstreamer: Do not flush the upstream source pin in activate_push(). We don't do this in pull mode (and in general never have; avidemux and wavparse are two examples of GStreamer elements that don't flush the upstream pad when deactivating). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index a4d49c75a1b..b2a20934837 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1424,12 +1424,10 @@ static gboolean activate_push(GstPad *pad, gboolean activate) EnterCriticalSection(&This->filter.filter_cs); if (!activate) { TRACE("Deactivating\n"); - IAsyncReader_BeginFlush(This->reader); if (This->push_thread) { pthread_join(This->push_thread, NULL); This->push_thread = 0; } - IAsyncReader_EndFlush(This->reader); if (This->filter.state == State_Stopped) This->nextofs = This->start; } else if (!This->push_thread) {

1 0

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 January 2021