wine-commits July 2020

wine-commits@winehq.org

1 participants
826 discussions

Alexandre Julliard : ntdll: Use a pthread mutex for the CD-ROM cache section.
by Alexandre Julliard 13 Jul '20

13 Jul '20

Module: wine Branch: master Commit: 992bdd77a05755ccbde22bf244a41ab3c50086db URL: https://source.winehq.org/git/wine.git/?a=commit;h=992bdd77a05755ccbde22bf2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 13 18:43:56 2020 +0200 ntdll: Use a pthread mutex for the CD-ROM cache section. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/cdrom.c | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/unix/cdrom.c b/dlls/ntdll/unix/cdrom.c index b60a01df8f..0d8b624308 100644 --- a/dlls/ntdll/unix/cdrom.c +++ b/dlls/ntdll/unix/cdrom.c @@ -298,14 +298,7 @@ struct cdrom_cache { #define MAX_CACHE_ENTRIES 5 static struct cdrom_cache cdrom_cache[MAX_CACHE_ENTRIES]; -static RTL_CRITICAL_SECTION cache_section; -static RTL_CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &cache_section, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": cache_section") } -}; -static RTL_CRITICAL_SECTION cache_section = { &critsect_debug, -1, 0, 0, 0, 0 }; +static pthread_mutex_t cache_mutex = PTHREAD_MUTEX_INITIALIZER; /* Proposed media change function: not really needed at this time */ /* This is a 1 or 0 type of function */ @@ -566,9 +559,9 @@ static NTSTATUS CDROM_SyncCache(int dev, int fd) static void CDROM_ClearCacheEntry(int dev) { - RtlEnterCriticalSection( &cache_section ); + pthread_mutex_lock( &cache_mutex ); cdrom_cache[dev].toc_good = 0; - RtlLeaveCriticalSection( &cache_section ); + pthread_mutex_unlock( &cache_mutex ); } @@ -674,7 +667,7 @@ static NTSTATUS CDROM_Open(int fd, int* dev) if (fstat(fd, &st) == -1) return errno_to_status( errno ); - RtlEnterCriticalSection( &cache_section ); + pthread_mutex_lock( &cache_mutex ); for (*dev = 0; *dev < MAX_CACHE_ENTRIES; (*dev)++) { if (empty == -1 && @@ -695,7 +688,7 @@ static NTSTATUS CDROM_Open(int fd, int* dev) cdrom_cache[*dev].inode = st.st_ino; } } - RtlLeaveCriticalSection( &cache_section ); + pthread_mutex_unlock( &cache_mutex ); TRACE("%d, %d\n", *dev, fd); return ret; @@ -847,13 +840,13 @@ static NTSTATUS CDROM_ReadTOC(int dev, int fd, CDROM_TOC* toc) if (dev < 0 || dev >= MAX_CACHE_ENTRIES) return STATUS_INVALID_PARAMETER; - RtlEnterCriticalSection( &cache_section ); + pthread_mutex_lock( &cache_mutex ); if (cdrom_cache[dev].toc_good || !(ret = CDROM_SyncCache(dev, fd))) { *toc = cdrom_cache[dev].toc; ret = STATUS_SUCCESS; } - RtlLeaveCriticalSection( &cache_section ); + pthread_mutex_unlock( &cache_mutex ); return ret; } @@ -933,7 +926,7 @@ static NTSTATUS CDROM_ReadQChannel(int dev, int fd, const CDROM_SUB_Q_DATA_FORMA switch (fmt->Format) { case IOCTL_CDROM_CURRENT_POSITION: - RtlEnterCriticalSection( &cache_section ); + pthread_mutex_lock( &cache_mutex ); if (hdr->AudioStatus==AUDIO_STATUS_IN_PROGRESS) { data->CurrentPosition.FormatCode = IOCTL_CDROM_CURRENT_POSITION; data->CurrentPosition.Control = sc.cdsc_ctrl; @@ -958,7 +951,7 @@ static NTSTATUS CDROM_ReadQChannel(int dev, int fd, const CDROM_SUB_Q_DATA_FORMA cdrom_cache[dev].CurrentPosition.Header = *hdr; /* Preserve header info */ data->CurrentPosition = cdrom_cache[dev].CurrentPosition; } - RtlLeaveCriticalSection( &cache_section ); + pthread_mutex_unlock( &cache_mutex ); break; case IOCTL_CDROM_MEDIA_CATALOG: data->MediaCatalog.FormatCode = IOCTL_CDROM_MEDIA_CATALOG; @@ -1044,7 +1037,7 @@ static NTSTATUS CDROM_ReadQChannel(int dev, int fd, const CDROM_SUB_Q_DATA_FORMA switch (fmt->Format) { case IOCTL_CDROM_CURRENT_POSITION: - RtlEnterCriticalSection( &cache_section ); + pthread_mutex_lock( &cache_mutex ); if (hdr->AudioStatus==AUDIO_STATUS_IN_PROGRESS) { data->CurrentPosition.FormatCode = IOCTL_CDROM_CURRENT_POSITION; data->CurrentPosition.Control = sc.what.position.control; @@ -1066,7 +1059,7 @@ static NTSTATUS CDROM_ReadQChannel(int dev, int fd, const CDROM_SUB_Q_DATA_FORMA cdrom_cache[dev].CurrentPosition.Header = *hdr; /* Preserve header info */ data->CurrentPosition = cdrom_cache[dev].CurrentPosition; } - RtlLeaveCriticalSection( &cache_section ); + pthread_mutex_unlock( &cache_mutex ); break; case IOCTL_CDROM_MEDIA_CATALOG: data->MediaCatalog.FormatCode = IOCTL_CDROM_MEDIA_CATALOG; @@ -1255,7 +1248,7 @@ static NTSTATUS CDROM_SeekAudioMSF(int dev, int fd, const CDROM_SEEK_AUDIO_MSF* if (i <= toc.FirstTrack || i > toc.LastTrack+1) return STATUS_INVALID_PARAMETER; i--; - RtlEnterCriticalSection( &cache_section ); + pthread_mutex_lock( &cache_mutex ); cp = &cdrom_cache[dev].CurrentPosition; cp->FormatCode = IOCTL_CDROM_CURRENT_POSITION; cp->Control = toc.TrackData[i-toc.FirstTrack].Control; @@ -1269,7 +1262,7 @@ static NTSTATUS CDROM_SeekAudioMSF(int dev, int fd, const CDROM_SEEK_AUDIO_MSF* frame -= FRAME_OF_TOC(toc,i); cp->TrackRelativeAddress[0] = 0; MSF_OF_FRAME(cp->TrackRelativeAddress[1], frame); - RtlLeaveCriticalSection( &cache_section ); + pthread_mutex_unlock( &cache_mutex ); /* If playing, then issue a seek command, otherwise do nothing */ #ifdef linux

1 0

Alexandre Julliard : ntdll: Move the activation context initialization out of NtCreateThreadEx().
by Alexandre Julliard 13 Jul '20

13 Jul '20

Module: wine Branch: master Commit: fdb09f452376ead1fceeb04dc5407095467418c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fdb09f452376ead1fceeb04d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 13 18:38:10 2020 +0200 ntdll: Move the activation context initialization out of NtCreateThreadEx(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 31 +++++++++++++++++++++++++------ dlls/ntdll/unix/thread.c | 12 ------------ 2 files changed, 25 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 02dddfacb5..76e314841b 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -190,26 +190,45 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, SECURITY_DESCRIPTOR *descr, HANDLE *handle_ptr, CLIENT_ID *id ) { ULONG flags = suspended ? THREAD_CREATE_FLAGS_CREATE_SUSPENDED : 0; - HANDLE handle; + ULONG_PTR buffer[offsetof( PS_ATTRIBUTE_LIST, Attributes[2] ) / sizeof(ULONG_PTR)]; + PS_ATTRIBUTE_LIST *attr_list = (PS_ATTRIBUTE_LIST *)buffer; + HANDLE handle, actctx; + TEB *teb; + ULONG ret; NTSTATUS status; CLIENT_ID client_id; OBJECT_ATTRIBUTES attr; - PS_ATTRIBUTE_LIST attr_list = { sizeof(attr_list) }; - attr_list.Attributes[0].Attribute = PS_ATTRIBUTE_CLIENT_ID; - attr_list.Attributes[0].Size = sizeof(client_id); - attr_list.Attributes[0].ValuePtr = &client_id; + attr_list->TotalLength = sizeof(buffer); + attr_list->Attributes[0].Attribute = PS_ATTRIBUTE_CLIENT_ID; + attr_list->Attributes[0].Size = sizeof(client_id); + attr_list->Attributes[0].ValuePtr = &client_id; + attr_list->Attributes[0].ReturnLength = NULL; + attr_list->Attributes[1].Attribute = PS_ATTRIBUTE_TEB_ADDRESS; + attr_list->Attributes[1].Size = sizeof(teb); + attr_list->Attributes[1].ValuePtr = &teb; + attr_list->Attributes[1].ReturnLength = NULL; InitializeObjectAttributes( &attr, NULL, 0, NULL, descr ); + RtlGetActiveActivationContext( &actctx ); + if (actctx) flags |= THREAD_CREATE_FLAGS_CREATE_SUSPENDED; + status = NtCreateThreadEx( &handle, THREAD_ALL_ACCESS, &attr, process, start, param, - flags, 0, stack_commit, stack_reserve, &attr_list ); + flags, 0, stack_commit, stack_reserve, attr_list ); if (!status) { + if (actctx) + { + ULONG_PTR cookie; + RtlActivateActivationContextEx( 0, teb, actctx, &cookie ); + if (!suspended) NtResumeThread( handle, &ret ); + } if (id) *id = client_id; if (handle_ptr) *handle_ptr = handle; else NtClose( handle ); } + if (actctx) RtlReleaseActivationContext( actctx ); return status; } diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 6c64eecf1f..3b451a2257 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -88,7 +88,6 @@ struct startup_info { PRTL_THREAD_START_ROUTINE entry; void *arg; - HANDLE actctx; }; /*********************************************************************** @@ -102,18 +101,12 @@ static void start_thread( TEB *teb ) struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)&teb->GdiTebBatch; struct debug_info debug_info; BOOL suspend; - ULONG_PTR cookie; debug_info.str_pos = debug_info.out_pos = 0; thread_data->debug_info = &debug_info; thread_data->pthread_id = pthread_self(); signal_init_thread( teb ); server_init_thread( info->entry, &suspend ); - if (info->actctx) - { - RtlActivateActivationContext( 0, info->actctx, &cookie ); - RtlReleaseActivationContext( info->actctx ); - } signal_start_thread( info->entry, info->arg, suspend, pRtlUserThreadStart, teb ); } @@ -164,7 +157,6 @@ NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle, ACCESS_MASK access, OBJECT_ATT int request_pipe[2]; SIZE_T extra_stack = PTHREAD_STACK_MIN; CLIENT_ID client_id; - HANDLE actctx; TEB *teb; INITIAL_TEB stack; NTSTATUS status; @@ -230,8 +222,6 @@ NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle, ACCESS_MASK access, OBJECT_ATT return status; } - RtlGetActiveActivationContext( &actctx ); - pthread_sigmask( SIG_BLOCK, &server_block_set, &sigset ); if ((status = virtual_alloc_teb( &teb ))) goto done; @@ -249,7 +239,6 @@ NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle, ACCESS_MASK access, OBJECT_ATT info = (struct startup_info *)(teb + 1); info->entry = start; info->arg = param; - info->actctx = actctx; teb->Tib.StackBase = stack.StackBase; teb->Tib.StackLimit = stack.StackLimit; @@ -278,7 +267,6 @@ done: if (status) { NtClose( *handle ); - RtlReleaseActivationContext( actctx ); close( request_pipe[1] ); return status; }

1 0

Alexandre Julliard : ntdll: Implement RtlActivateActivationContextEx().
by Alexandre Julliard 13 Jul '20

13 Jul '20

Module: wine Branch: master Commit: c71da19d24a5d6f01e65b3b3691a9d7dd17a2278 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c71da19d24a5d6f01e65b3b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 13 18:37:29 2020 +0200 ntdll: Implement RtlActivateActivationContextEx(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 13 +++++++++++-- dlls/ntdll/ntdll.spec | 2 +- include/winternl.h | 1 + 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index f64cb31a1f..625cffcca8 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -5156,16 +5156,25 @@ NTSTATUS WINAPI RtlZombifyActivationContext( HANDLE handle ) * RtlActivateActivationContext (NTDLL.@) */ NTSTATUS WINAPI RtlActivateActivationContext( ULONG unknown, HANDLE handle, PULONG_PTR cookie ) +{ + return RtlActivateActivationContextEx( 0, NtCurrentTeb(), handle, cookie ); +} + + +/****************************************************************** + * RtlActivateActivationContextEx (NTDLL.@) + */ +NTSTATUS WINAPI RtlActivateActivationContextEx( ULONG flags, TEB *teb, HANDLE handle, ULONG_PTR *cookie ) { RTL_ACTIVATION_CONTEXT_STACK_FRAME *frame; if (!(frame = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*frame) ))) return STATUS_NO_MEMORY; - frame->Previous = NtCurrentTeb()->ActivationContextStack.ActiveFrame; + frame->Previous = teb->ActivationContextStack.ActiveFrame; frame->ActivationContext = handle; frame->Flags = 0; - NtCurrentTeb()->ActivationContextStack.ActiveFrame = frame; + teb->ActivationContextStack.ActiveFrame = frame; RtlAddRefActivationContext( handle ); *cookie = (ULONG_PTR)frame; diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index bd41da37af..7e2b6dd12f 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -446,7 +446,7 @@ @ stdcall RtlAcquireSRWLockExclusive(ptr) @ stdcall RtlAcquireSRWLockShared(ptr) @ stdcall RtlActivateActivationContext(long ptr ptr) -@ stub RtlActivateActivationContextEx +@ stdcall RtlActivateActivationContextEx(long ptr ptr ptr) @ stub RtlActivateActivationContextUnsafeFast @ stdcall RtlAddAccessAllowedAce(ptr long long ptr) @ stdcall RtlAddAccessAllowedAceEx(ptr long long long ptr) diff --git a/include/winternl.h b/include/winternl.h index 10d109fede..b3fbb90fef 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2944,6 +2944,7 @@ NTSYSAPI BYTE WINAPI RtlAcquireResourceShared(LPRTL_RWLOCK,BYTE); NTSYSAPI void WINAPI RtlAcquireSRWLockExclusive(RTL_SRWLOCK*); NTSYSAPI void WINAPI RtlAcquireSRWLockShared(RTL_SRWLOCK*); NTSYSAPI NTSTATUS WINAPI RtlActivateActivationContext(DWORD,HANDLE,ULONG_PTR*); +NTSYSAPI NTSTATUS WINAPI RtlActivateActivationContextEx(ULONG,TEB*,HANDLE,ULONG_PTR*); NTSYSAPI NTSTATUS WINAPI RtlAddAce(PACL,DWORD,DWORD,PACE_HEADER,DWORD); NTSYSAPI NTSTATUS WINAPI RtlAddAccessAllowedAce(PACL,DWORD,DWORD,PSID); NTSYSAPI NTSTATUS WINAPI RtlAddAccessAllowedAceEx(PACL,DWORD,DWORD,DWORD,PSID);

1 0

Alexandre Julliard : ntdll: Return the TEB pointer in NtCreateThreadEx().
by Alexandre Julliard 13 Jul '20

13 Jul '20

Module: wine Branch: master Commit: c6fea822a99ca4b5c82e5217a0a631434ad52c29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6fea822a99ca4b5c82e5217… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 13 18:36:56 2020 +0200 ntdll: Return the TEB pointer in NtCreateThreadEx(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 19 ++++++++++++++----- dlls/ntdll/unix/thread.c | 13 ++++++++++--- include/wine/server_protocol.h | 3 ++- server/protocol.def | 1 + 4 files changed, 27 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 4e65b0eab2..9a593f7725 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -533,9 +533,11 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result ) break; case APC_CREATE_THREAD: { - PS_ATTRIBUTE_LIST attr = { sizeof(attr) }; + ULONG_PTR buffer[offsetof( PS_ATTRIBUTE_LIST, Attributes[2] ) / sizeof(ULONG_PTR)]; + PS_ATTRIBUTE_LIST *attr = (PS_ATTRIBUTE_LIST *)buffer; CLIENT_ID id; HANDLE handle; + TEB *teb; SIZE_T reserve = call->create_thread.reserve; SIZE_T commit = call->create_thread.commit; void *func = wine_server_get_ptr( call->create_thread.func ); @@ -545,16 +547,23 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result ) if (reserve == call->create_thread.reserve && commit == call->create_thread.commit && (ULONG_PTR)func == call->create_thread.func && (ULONG_PTR)arg == call->create_thread.arg) { - attr.Attributes[0].Attribute = PS_ATTRIBUTE_CLIENT_ID; - attr.Attributes[0].Size = sizeof(id); - attr.Attributes[0].ValuePtr = &id; + attr->TotalLength = sizeof(buffer); + attr->Attributes[0].Attribute = PS_ATTRIBUTE_CLIENT_ID; + attr->Attributes[0].Size = sizeof(id); + attr->Attributes[0].ValuePtr = &id; + attr->Attributes[0].ReturnLength = NULL; + attr->Attributes[1].Attribute = PS_ATTRIBUTE_TEB_ADDRESS; + attr->Attributes[1].Size = sizeof(teb); + attr->Attributes[1].ValuePtr = &teb; + attr->Attributes[1].ReturnLength = NULL; result->create_thread.status = NtCreateThreadEx( &handle, THREAD_ALL_ACCESS, NULL, NtCurrentProcess(), func, arg, call->create_thread.flags, 0, - commit, reserve, &attr ); + commit, reserve, attr ); result->create_thread.handle = wine_server_obj_handle( handle ); result->create_thread.pid = HandleToULong(id.UniqueProcess); result->create_thread.tid = HandleToULong(id.UniqueThread); + result->create_thread.teb = wine_server_client_ptr( teb ); } else result->create_thread.status = STATUS_INVALID_PARAMETER; break; diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 78da6ae638..6c64eecf1f 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -123,7 +123,7 @@ static void start_thread( TEB *teb ) * * Update the output attributes. */ -static void update_attr_list( PS_ATTRIBUTE_LIST *attr, const CLIENT_ID *id ) +static void update_attr_list( PS_ATTRIBUTE_LIST *attr, const CLIENT_ID *id, TEB *teb ) { SIZE_T i, count = (attr->TotalLength - sizeof(attr->TotalLength)) / sizeof(PS_ATTRIBUTE); @@ -135,6 +135,12 @@ static void update_attr_list( PS_ATTRIBUTE_LIST *attr, const CLIENT_ID *id ) memcpy( attr->Attributes[i].ValuePtr, id, size ); if (attr->Attributes[i].ReturnLength) *attr->Attributes[i].ReturnLength = size; } + else if (attr->Attributes[i].Attribute == PS_ATTRIBUTE_TEB_ADDRESS) + { + SIZE_T size = min( attr->Attributes[i].Size, sizeof(teb) ); + memcpy( attr->Attributes[i].ValuePtr, &teb, size ); + if (attr->Attributes[i].ReturnLength) *attr->Attributes[i].ReturnLength = size; + } } } @@ -181,10 +187,11 @@ NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle, ACCESS_MASK access, OBJECT_ATT if (result.create_thread.status == STATUS_SUCCESS) { + TEB *teb = wine_server_get_ptr( result.create_thread.teb ); *handle = wine_server_ptr_handle( result.create_thread.handle ); client_id.UniqueProcess = ULongToHandle( result.create_thread.pid ); client_id.UniqueThread = ULongToHandle( result.create_thread.tid ); - if (attr_list) update_attr_list( attr_list, &client_id ); + if (attr_list) update_attr_list( attr_list, &client_id, teb ); } return result.create_thread.status; } @@ -275,7 +282,7 @@ done: close( request_pipe[1] ); return status; } - if (attr_list) update_attr_list( attr_list, &client_id ); + if (attr_list) update_attr_list( attr_list, &client_id, teb ); return STATUS_SUCCESS; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 8a282155eb..730e368f0c 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -647,6 +647,7 @@ typedef union unsigned int status; process_id_t pid; thread_id_t tid; + client_ptr_t teb; obj_handle_t handle; } create_thread; struct @@ -6481,7 +6482,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 624 +#define SERVER_PROTOCOL_VERSION 625 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 36e674f086..90c695ec0b 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -663,6 +663,7 @@ typedef union unsigned int status; /* status returned by call */ process_id_t pid; /* process id */ thread_id_t tid; /* thread id */ + client_ptr_t teb; /* thread teb (in process address space) */ obj_handle_t handle; /* handle to new thread */ } create_thread; struct

1 0

Jacek Caban : server: Remove no longer needed get_console_mode and set_console_mode requests.
by Alexandre Julliard 13 Jul '20

13 Jul '20

Module: wine Branch: master Commit: 0e46dd09e5c71726f0c120362991cd3b2613295b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e46dd09e5c71726f0c12036… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 13 13:27:36 2020 +0200 server: Remove no longer needed get_console_mode and set_console_mode requests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 35 +------------------------ server/console.c | 58 ------------------------------------------ server/protocol.def | 14 ---------- server/request.h | 11 -------- server/trace.c | 22 ---------------- 5 files changed, 1 insertion(+), 139 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 28714f0014..8a282155eb 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1891,33 +1891,6 @@ struct get_console_wait_event_reply }; -struct get_console_mode_request -{ - struct request_header __header; - obj_handle_t handle; -}; -struct get_console_mode_reply -{ - struct reply_header __header; - int mode; - char __pad_12[4]; -}; - - - -struct set_console_mode_request -{ - struct request_header __header; - obj_handle_t handle; - int mode; - char __pad_20[4]; -}; -struct set_console_mode_reply -{ - struct reply_header __header; -}; - - struct set_console_input_info_request { @@ -5694,8 +5667,6 @@ enum request REQ_open_console, REQ_attach_console, REQ_get_console_wait_event, - REQ_get_console_mode, - REQ_set_console_mode, REQ_set_console_input_info, REQ_get_console_input_info, REQ_append_console_input_history, @@ -5991,8 +5962,6 @@ union generic_request struct open_console_request open_console_request; struct attach_console_request attach_console_request; struct get_console_wait_event_request get_console_wait_event_request; - struct get_console_mode_request get_console_mode_request; - struct set_console_mode_request set_console_mode_request; struct set_console_input_info_request set_console_input_info_request; struct get_console_input_info_request get_console_input_info_request; struct append_console_input_history_request append_console_input_history_request; @@ -6286,8 +6255,6 @@ union generic_reply struct open_console_reply open_console_reply; struct attach_console_reply attach_console_reply; struct get_console_wait_event_reply get_console_wait_event_reply; - struct get_console_mode_reply get_console_mode_reply; - struct set_console_mode_reply set_console_mode_reply; struct set_console_input_info_reply set_console_input_info_reply; struct get_console_input_info_reply get_console_input_info_reply; struct append_console_input_history_reply append_console_input_history_reply; @@ -6514,7 +6481,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 623 +#define SERVER_PROTOCOL_VERSION 624 /* ### protocol_version end ### */ diff --git a/server/console.c b/server/console.c index 577d39bdaa..72e98f14a9 100644 --- a/server/console.c +++ b/server/console.c @@ -715,52 +715,6 @@ static void propagate_console_signal( struct console_input *console, enum_processes(propagate_console_signal_cb, &csi); } -static int get_console_mode( obj_handle_t handle ) -{ - struct object *obj; - int ret = 0; - - if ((obj = get_handle_obj( current->process, handle, FILE_READ_PROPERTIES, NULL ))) - { - if (obj->ops == &console_input_ops) - { - ret = ((struct console_input *)obj)->mode; - } - else if (obj->ops == &screen_buffer_ops) - { - ret = ((struct screen_buffer *)obj)->mode; - } - else - set_error( STATUS_OBJECT_TYPE_MISMATCH ); - release_object( obj ); - } - return ret; -} - -/* changes the mode of either a console input or a screen buffer */ -static int set_console_mode( obj_handle_t handle, int mode ) -{ - struct object *obj; - int ret = 0; - - if (!(obj = get_handle_obj( current->process, handle, FILE_WRITE_PROPERTIES, NULL ))) - return 0; - if (obj->ops == &console_input_ops) - { - /* FIXME: if we remove the edit mode bits, we need (???) to clean up the history */ - ((struct console_input *)obj)->mode = mode; - ret = 1; - } - else if (obj->ops == &screen_buffer_ops) - { - ((struct screen_buffer *)obj)->mode = mode; - ret = 1; - } - else set_error( STATUS_OBJECT_TYPE_MISMATCH ); - release_object( obj ); - return ret; -} - /* retrieve a pointer to the console input records */ static int read_console_input( struct console_input *console, struct async *async, int flush ) { @@ -2003,18 +1957,6 @@ DECL_HANDLER(get_console_input_info) release_object( console ); } -/* get a console mode (input or output) */ -DECL_HANDLER(get_console_mode) -{ - reply->mode = get_console_mode( req->handle ); -} - -/* set a console mode (input or output) */ -DECL_HANDLER(set_console_mode) -{ - set_console_mode( req->handle, req->mode ); -} - /* appends a string to console's history */ DECL_HANDLER(append_console_input_history) { diff --git a/server/protocol.def b/server/protocol.def index 19dd9afb24..36e674f086 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1501,20 +1501,6 @@ enum server_fd_type obj_handle_t event; @END -/* Get a console mode (input or output) */ -@REQ(get_console_mode) - obj_handle_t handle; /* handle to the console */ -@REPLY - int mode; /* console mode */ -@END - - -/* Set a console mode (input or output) */ -@REQ(set_console_mode) - obj_handle_t handle; /* handle to the console */ - int mode; /* console mode */ -@END - /* Set info about a console (input only) */ @REQ(set_console_input_info) diff --git a/server/request.h b/server/request.h index 2609edc59a..deb547267a 100644 --- a/server/request.h +++ b/server/request.h @@ -185,8 +185,6 @@ DECL_HANDLER(free_console); DECL_HANDLER(open_console); DECL_HANDLER(attach_console); DECL_HANDLER(get_console_wait_event); -DECL_HANDLER(get_console_mode); -DECL_HANDLER(set_console_mode); DECL_HANDLER(set_console_input_info); DECL_HANDLER(get_console_input_info); DECL_HANDLER(append_console_input_history); @@ -481,8 +479,6 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_open_console, (req_handler)req_attach_console, (req_handler)req_get_console_wait_event, - (req_handler)req_get_console_mode, - (req_handler)req_set_console_mode, (req_handler)req_set_console_input_info, (req_handler)req_get_console_input_info, (req_handler)req_append_console_input_history, @@ -1141,13 +1137,6 @@ C_ASSERT( FIELD_OFFSET(struct get_console_wait_event_request, handle) == 12 ); C_ASSERT( sizeof(struct get_console_wait_event_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_console_wait_event_reply, event) == 8 ); C_ASSERT( sizeof(struct get_console_wait_event_reply) == 16 ); -C_ASSERT( FIELD_OFFSET(struct get_console_mode_request, handle) == 12 ); -C_ASSERT( sizeof(struct get_console_mode_request) == 16 ); -C_ASSERT( FIELD_OFFSET(struct get_console_mode_reply, mode) == 8 ); -C_ASSERT( sizeof(struct get_console_mode_reply) == 16 ); -C_ASSERT( FIELD_OFFSET(struct set_console_mode_request, handle) == 12 ); -C_ASSERT( FIELD_OFFSET(struct set_console_mode_request, mode) == 16 ); -C_ASSERT( sizeof(struct set_console_mode_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct set_console_input_info_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_console_input_info_request, mask) == 16 ); C_ASSERT( FIELD_OFFSET(struct set_console_input_info_request, active_sb) == 20 ); diff --git a/server/trace.c b/server/trace.c index 54fe84c417..d244589bae 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2063,22 +2063,6 @@ static void dump_get_console_wait_event_reply( const struct get_console_wait_eve fprintf( stderr, " event=%04x", req->event ); } -static void dump_get_console_mode_request( const struct get_console_mode_request *req ) -{ - fprintf( stderr, " handle=%04x", req->handle ); -} - -static void dump_get_console_mode_reply( const struct get_console_mode_reply *req ) -{ - fprintf( stderr, " mode=%d", req->mode ); -} - -static void dump_set_console_mode_request( const struct set_console_mode_request *req ) -{ - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", mode=%d", req->mode ); -} - static void dump_set_console_input_info_request( const struct set_console_input_info_request *req ) { fprintf( stderr, " handle=%04x", req->handle ); @@ -4590,8 +4574,6 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_open_console_request, (dump_func)dump_attach_console_request, (dump_func)dump_get_console_wait_event_request, - (dump_func)dump_get_console_mode_request, - (dump_func)dump_set_console_mode_request, (dump_func)dump_set_console_input_info_request, (dump_func)dump_get_console_input_info_request, (dump_func)dump_append_console_input_history_request, @@ -4883,8 +4865,6 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_open_console_reply, (dump_func)dump_attach_console_reply, (dump_func)dump_get_console_wait_event_reply, - (dump_func)dump_get_console_mode_reply, - NULL, NULL, (dump_func)dump_get_console_input_info_reply, NULL, @@ -5176,8 +5156,6 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "open_console", "attach_console", "get_console_wait_event", - "get_console_mode", - "set_console_mode", "set_console_input_info", "get_console_input_info", "append_console_input_history",

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_SET_MODE in SetConsoleMode.
by Alexandre Julliard 13 Jul '20

13 Jul '20

Module: wine Branch: master Commit: 7aadafbd505ab61c15bccb7d995cc9f4afc54e3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7aadafbd505ab61c15bccb7d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 13 13:27:24 2020 +0200 kernelbase: Use IOCTL_CONDRV_SET_MODE in SetConsoleMode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 52fd5bb39c..1df084fab9 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1267,18 +1267,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleInputExeNameW( LPCWSTR name ) */ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleMode( HANDLE handle, DWORD mode ) { - BOOL ret; - - SERVER_START_REQ(set_console_mode) - { - req->handle = console_handle_unmap( handle ); - req->mode = mode; - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; - - TRACE( "(%p,%x) retval == %d\n", handle, mode, ret ); - return ret; + TRACE( "(%p,%x)\n", handle, mode ); + return console_ioctl( handle, IOCTL_CONDRV_SET_MODE, &mode, sizeof(mode), NULL, 0, NULL ); }

1 0

Jacek Caban : server: Introduce IOCTL_CONDRV_SET_MODE ioctl.
by Alexandre Julliard 13 Jul '20

13 Jul '20

Module: wine Branch: master Commit: 22f53e6d9dd23a88d75ec8b6e4b3a73a186344d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22f53e6d9dd23a88d75ec8b6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 13 13:27:05 2020 +0200 server: Introduce IOCTL_CONDRV_SET_MODE ioctl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 1 + server/console.c | 20 +++++++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index c30802be66..25e5820046 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -25,6 +25,7 @@ /* common console input and output ioctls */ #define IOCTL_CONDRV_GET_MODE CTL_CODE(FILE_DEVICE_CONSOLE, 0, METHOD_BUFFERED, FILE_READ_PROPERTIES) +#define IOCTL_CONDRV_SET_MODE CTL_CODE(FILE_DEVICE_CONSOLE, 1, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) /* console input ioctls */ #define IOCTL_CONDRV_READ_INPUT CTL_CODE(FILE_DEVICE_CONSOLE, 10, METHOD_BUFFERED, FILE_READ_ACCESS) diff --git a/server/console.c b/server/console.c index 4c161fccb0..577d39bdaa 100644 --- a/server/console.c +++ b/server/console.c @@ -190,7 +190,7 @@ struct screen_buffer struct object obj; /* object header */ struct list entry; /* entry in list of all screen buffers */ struct console_input *input; /* associated console input */ - int mode; /* output mode */ + unsigned int mode; /* output mode */ int cursor_size; /* size of cursor (percentage filled) */ int cursor_visible;/* cursor visibility flag */ int cursor_x; /* position of cursor */ @@ -1584,6 +1584,15 @@ static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async * } return set_reply_data( &console->mode, sizeof(console->mode) ) != NULL; + case IOCTL_CONDRV_SET_MODE: + if (get_req_data_size() != sizeof(console->mode)) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + console->mode = *(unsigned int *)get_req_data(); + return 1; + case IOCTL_CONDRV_READ_INPUT: { int blocking = 0; @@ -1657,6 +1666,15 @@ static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async * } return set_reply_data( &screen_buffer->mode, sizeof(screen_buffer->mode) ) != NULL; + case IOCTL_CONDRV_SET_MODE: + if (get_req_data_size() != sizeof(screen_buffer->mode)) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + screen_buffer->mode = *(unsigned int *)get_req_data(); + return 1; + case IOCTL_CONDRV_GET_OUTPUT_INFO: { struct condrv_output_info *info;

1 0

Jacek Caban : kernel32: Use IOCTL_CONDRV_GET_MODE in VerifyConsoleIoHandle.
by Alexandre Julliard 13 Jul '20

13 Jul '20

Module: wine Branch: master Commit: f5badeac28dc245c4804d4d0a72ddfcea66846ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5badeac28dc245c4804d4d0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 13 13:26:53 2020 +0200 kernel32: Use IOCTL_CONDRV_GET_MODE in VerifyConsoleIoHandle. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index e21c8a890e..f294b15635 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -249,16 +249,10 @@ HANDLE WINAPI OpenConsoleW(LPCWSTR name, DWORD access, BOOL inherit, DWORD creat */ BOOL WINAPI VerifyConsoleIoHandle(HANDLE handle) { - BOOL ret; - - if (!is_console_handle(handle)) return FALSE; - SERVER_START_REQ(get_console_mode) - { - req->handle = console_handle_unmap(handle); - ret = !wine_server_call( req ); - } - SERVER_END_REQ; - return ret; + IO_STATUS_BLOCK io; + DWORD mode; + return !NtDeviceIoControlFile( handle, NULL, NULL, NULL, &io, IOCTL_CONDRV_GET_MODE, + NULL, 0, &mode, sizeof(mode) ); } /****************************************************************** @@ -1181,7 +1175,7 @@ BOOL CONSOLE_Init(RTL_USER_PROCESS_PARAMETERS *params) */ if (!params->hStdInput || params->hStdInput == INVALID_HANDLE_VALUE) params->hStdInput = 0; - else if (VerifyConsoleIoHandle(console_handle_map(params->hStdInput))) + else if (VerifyConsoleIoHandle(params->hStdInput)) { params->hStdInput = console_handle_map(params->hStdInput); save_console_mode(params->hStdInput); @@ -1189,12 +1183,12 @@ BOOL CONSOLE_Init(RTL_USER_PROCESS_PARAMETERS *params) if (!params->hStdOutput || params->hStdOutput == INVALID_HANDLE_VALUE) params->hStdOutput = 0; - else if (VerifyConsoleIoHandle(console_handle_map(params->hStdOutput))) + else if (VerifyConsoleIoHandle(params->hStdOutput)) params->hStdOutput = console_handle_map(params->hStdOutput); if (!params->hStdError || params->hStdError == INVALID_HANDLE_VALUE) params->hStdError = 0; - else if (VerifyConsoleIoHandle(console_handle_map(params->hStdError))) + else if (VerifyConsoleIoHandle(params->hStdError)) params->hStdError = console_handle_map(params->hStdError); return TRUE;

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_GET_MODE in GetConsoleMode.
by Alexandre Julliard 13 Jul '20

13 Jul '20

Module: wine Branch: master Commit: 48a23dbd432d8dbeaa884fe656105d902729f8de URL: https://source.winehq.org/git/wine.git/?a=commit;h=48a23dbd432d8dbeaa884fe6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 13 13:26:40 2020 +0200 kernelbase: Use IOCTL_CONDRV_GET_MODE in GetConsoleMode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 2 +- dlls/kernelbase/console.c | 13 +------------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index b923348015..49869948e9 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -822,7 +822,7 @@ static void testScreenBuffer(HANDLE hConOut) ret = WriteConsoleA(hFileOutWT, test_str1, lstrlenA(test_str1), &len, NULL); error = GetLastError(); ok(!ret, "Shouldn't succeed\n"); - todo_wine ok(error == ERROR_INVALID_HANDLE || error == ERROR_INVALID_FUNCTION, + ok(error == ERROR_INVALID_HANDLE || error == ERROR_INVALID_FUNCTION, "GetLastError: got %u\n", error); CloseHandle(hFileOutRW); diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index cc30a11d68..52fd5bb39c 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -610,18 +610,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetConsoleInputExeNameW( DWORD len, LPWSTR buffer */ BOOL WINAPI DECLSPEC_HOTPATCH GetConsoleMode( HANDLE handle, DWORD *mode ) { - BOOL ret; - - SERVER_START_REQ( get_console_mode ) - { - req->handle = console_handle_unmap( handle ); - if ((ret = !wine_server_call_err( req ))) - { - if (mode) *mode = reply->mode; - } - } - SERVER_END_REQ; - return ret; + return console_ioctl( handle, IOCTL_CONDRV_GET_MODE, NULL, 0, mode, sizeof(*mode), NULL ); }

1 0

Jacek Caban : server: Introduce IOCTL_CONDRV_GET_MODE ioctl.
by Alexandre Julliard 13 Jul '20

13 Jul '20

Module: wine Branch: master Commit: 409160bb596e44bcceee24d9ecd4d2629cbd6cb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=409160bb596e44bcceee24d9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 13 13:26:29 2020 +0200 server: Introduce IOCTL_CONDRV_GET_MODE ioctl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 3 +++ server/console.c | 16 ++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index 5992834069..c30802be66 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -23,6 +23,9 @@ #include "winioctl.h" +/* common console input and output ioctls */ +#define IOCTL_CONDRV_GET_MODE CTL_CODE(FILE_DEVICE_CONSOLE, 0, METHOD_BUFFERED, FILE_READ_PROPERTIES) + /* console input ioctls */ #define IOCTL_CONDRV_READ_INPUT CTL_CODE(FILE_DEVICE_CONSOLE, 10, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_CONDRV_WRITE_INPUT CTL_CODE(FILE_DEVICE_CONSOLE, 11, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) diff --git a/server/console.c b/server/console.c index a91d963a41..4c161fccb0 100644 --- a/server/console.c +++ b/server/console.c @@ -1576,6 +1576,14 @@ static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async * switch (code) { + case IOCTL_CONDRV_GET_MODE: + if (get_reply_max_size() != sizeof(console->mode)) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + return set_reply_data( &console->mode, sizeof(console->mode) ) != NULL; + case IOCTL_CONDRV_READ_INPUT: { int blocking = 0; @@ -1641,6 +1649,14 @@ static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async * switch (code) { + case IOCTL_CONDRV_GET_MODE: + if (get_reply_max_size() != sizeof(screen_buffer->mode)) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + return set_reply_data( &screen_buffer->mode, sizeof(screen_buffer->mode) ) != NULL; + case IOCTL_CONDRV_GET_OUTPUT_INFO: { struct condrv_output_info *info;

1 0

← Newer
1
...
53
54
55
56
57
58
59
...
83
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 July 2020