May 2021 - Wine-commits - list.winehq.org

Alexandre Julliard : taskmgr: Fetch the debug channels from the PEB memory block.
by Alexandre Julliard 24 May '21

24 May '21

Module: wine Branch: master Commit: 0913e43bf976b5607665c416e979193a6078bd89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0913e43bf976b5607665c416… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 24 21:32:11 2021 +0200 taskmgr: Fetch the debug channels from the PEB memory block. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/taskmgr/dbgchnl.c | 60 ++++++--------------------------------------- programs/taskmgr/procpage.c | 3 --- programs/taskmgr/taskmgr.h | 2 -- 3 files changed, 7 insertions(+), 58 deletions(-) diff --git a/programs/taskmgr/dbgchnl.c b/programs/taskmgr/dbgchnl.c index 7200eb476c7..2d160bf4b50 100644 --- a/programs/taskmgr/dbgchnl.c +++ b/programs/taskmgr/dbgchnl.c @@ -28,7 +28,6 @@ #include <windows.h> #include <commctrl.h> #include <winnt.h> -#include <dbghelp.h> #include "taskmgr.h" #include "perfdata.h" @@ -49,35 +48,6 @@ * setting for a fixme:s or err:s */ -static DWORD (WINAPI *pSymSetOptions)(DWORD); -static BOOL (WINAPI *pSymInitialize)(HANDLE, PSTR, BOOL); -static DWORD (WINAPI *pSymLoadModule)(HANDLE, HANDLE, PCSTR, PCSTR, DWORD, DWORD); -static BOOL (WINAPI *pSymCleanup)(HANDLE); -static BOOL (WINAPI *pSymFromName)(HANDLE, PCSTR, PSYMBOL_INFO); - -BOOL AreDebugChannelsSupported(void) -{ - static HANDLE hDbgHelp /* = NULL */; - - static const WCHAR wszDbgHelp[] = {'D','B','G','H','E','L','P','.','D','L','L',0}; - - if (hDbgHelp) return TRUE; - - if (!(hDbgHelp = LoadLibraryW(wszDbgHelp))) return FALSE; - pSymSetOptions = (void*)GetProcAddress(hDbgHelp, "SymSetOptions"); - pSymInitialize = (void*)GetProcAddress(hDbgHelp, "SymInitialize"); - pSymLoadModule = (void*)GetProcAddress(hDbgHelp, "SymLoadModule"); - pSymFromName = (void*)GetProcAddress(hDbgHelp, "SymFromName"); - pSymCleanup = (void*)GetProcAddress(hDbgHelp, "SymCleanup"); - if (!pSymSetOptions || !pSymInitialize || !pSymLoadModule || !pSymCleanup || !pSymFromName) - { - FreeLibrary(hDbgHelp); - hDbgHelp = NULL; - return FALSE; - } - return TRUE; -} - static DWORD get_selected_pid(void) { LVITEMW lvitem; @@ -160,27 +130,6 @@ static int change_channel_CB(HANDLE hProcess, void* addr, struct __wine_debug_ch return 1; } -static void* get_symbol(HANDLE hProcess, const char* name) -{ - char buffer[sizeof(IMAGEHLP_SYMBOL) + 256]; - SYMBOL_INFO* si = (SYMBOL_INFO*)buffer; - void* ret = NULL; - - /* also ask for wine extensions (loading symbols from ELF files) */ - pSymSetOptions(SYMOPT_DEFERRED_LOADS | SYMOPT_PUBLICS_ONLY | 0x40000000); - /* FIXME: the TRUE option is due to the fact that dbghelp requires it - * when loading an ELF module - */ - if (pSymInitialize(hProcess, NULL, TRUE)) - { - si->SizeOfStruct = sizeof(*si); - si->MaxNameLen = sizeof(buffer) - sizeof(IMAGEHLP_SYMBOL); - if (pSymFromName(hProcess, name, si)) - ret = (void*)(ULONG_PTR)si->Address; - pSymCleanup(hProcess); - } - return ret; -} typedef int (*EnumChannelCB)(HANDLE, void*, struct __wine_debug_channel*, void*); @@ -193,11 +142,16 @@ typedef int (*EnumChannelCB)(HANDLE, void*, struct __wine_debug_channel*, void*) static int enum_channel(HANDLE hProcess, EnumChannelCB ce, void* user) { struct __wine_debug_channel channel; + PROCESS_BASIC_INFORMATION info; int ret = 1; void* addr; - if (!(addr = get_symbol(hProcess, "libwine.so.1!debug_options"))) return -1; - + NtQueryInformationProcess( hProcess, ProcessBasicInformation, &info, sizeof(info), NULL ); +#ifdef _WIN64 + addr = (char *)info.PebBaseAddress + 0x2000; +#else + addr = (char *)info.PebBaseAddress + 0x1000; +#endif while (ret && addr && ReadProcessMemory(hProcess, addr, &channel, sizeof(channel), NULL)) { if (!channel.name[0]) break; diff --git a/programs/taskmgr/procpage.c b/programs/taskmgr/procpage.c index 5ea2e6b044f..baba6c6a06b 100644 --- a/programs/taskmgr/procpage.c +++ b/programs/taskmgr/procpage.c @@ -97,9 +97,6 @@ static void ProcessPageShowContextMenu(DWORD dwProcessId) if (si.dwNumberOfProcessors < 2) RemoveMenu(hSubMenu, ID_PROCESS_PAGE_SETAFFINITY, MF_BYCOMMAND); - - if (!AreDebugChannelsSupported()) - RemoveMenu(hSubMenu, ID_PROCESS_PAGE_DEBUGCHANNELS, MF_BYCOMMAND); switch (dwProcessPriorityClass) { case REALTIME_PRIORITY_CLASS: diff --git a/programs/taskmgr/taskmgr.h b/programs/taskmgr/taskmgr.h index ed220beebd2..b8c383d5f4d 100644 --- a/programs/taskmgr/taskmgr.h +++ b/programs/taskmgr/taskmgr.h @@ -157,8 +157,6 @@ LPWSTR GetLastErrorText( LPWSTR lpwszBuf, DWORD dwSize ); void OnAbout(void); -BOOL AreDebugChannelsSupported(void); - void ProcessPage_OnSetAffinity(void); void ProcessPage_OnDebug(void); void ProcessPage_OnEndProcess(void);

1 0

Zebediah Figura : server: Don't change the status of an already terminated async.
by Alexandre Julliard 24 May '21

24 May '21

Module: wine Branch: master Commit: a5b6e90d48eb2f1a82cbab4b2a7864a312b8c78a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5b6e90d48eb2f1a82cbab4b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 21 22:08:45 2021 -0500 server: Don't change the status of an already terminated async. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/server/async.c b/server/async.c index 1ac5117edb9..a5fa61dc6e5 100644 --- a/server/async.c +++ b/server/async.c @@ -154,12 +154,7 @@ void async_terminate( struct async *async, unsigned int status ) { assert( status != STATUS_PENDING ); - if (async->status != STATUS_PENDING) - { - /* already terminated, just update status */ - async->status = status; - return; - } + if (async->status != STATUS_PENDING) return; /* already terminated */ async->status = status; if (async->iosb && async->iosb->status == STATUS_PENDING) async->iosb->status = status; @@ -457,7 +452,7 @@ static int cancel_async( struct process *process, struct object *obj, struct thr restart: LIST_FOR_EACH_ENTRY( async, &process->asyncs, struct async, process_entry ) { - if (async->status == STATUS_CANCELLED) continue; + if (async->status != STATUS_PENDING) continue; if ((!obj || (async->fd && get_fd_user( async->fd ) == obj)) && (!thread || async->thread == thread) && (!iosb || async->data.iosb == iosb))

1 0

Zebediah Figura : ntdll: Avoid accessing the I/O status block in wait_async().
by Alexandre Julliard 24 May '21

24 May '21

Module: wine Branch: master Commit: 97afac469fbe012e22acc1f1045c88b1004a241f URL: https://source.winehq.org/git/wine.git/?a=commit;h=97afac469fbe012e22acc1f1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 21 22:08:46 2021 -0500 ntdll: Avoid accessing the I/O status block in wait_async(). Steam uses WSASend() with completion ports, reusing OVERLAPPED structures as soon as they are returned from GetQueuedCompletionStatus(). Since completion is queued during the select request in wait_async(), the I/O status block can be reused even before the call to NtDeviceIoControl exits. This works fine with current Wine, because WSASend() doesn't access the I/O status block after queuing completion. However, a patch that changes it to use wait_async() like other async requests causes NtDeviceIoControlFile to consistently return garbage status codes. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 15 +++++++-------- server/async.c | 4 ++-- server/thread.c | 8 ++++++++ server/thread.h | 1 + 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index c033bb06fa3..8313e3c3160 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4697,10 +4697,9 @@ static async_data_t server_async( HANDLE handle, struct async_fileio *user, HAND return async; } -static NTSTATUS wait_async( HANDLE handle, BOOL alertable, IO_STATUS_BLOCK *io ) +static NTSTATUS wait_async( HANDLE handle, BOOL alertable ) { - if (NtWaitForSingleObject( handle, alertable, NULL )) return STATUS_PENDING; - return io->u.Status; + return NtWaitForSingleObject( handle, alertable, NULL ); } /* callback for irp async I/O completion */ @@ -4861,7 +4860,7 @@ static NTSTATUS server_read_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE a if (status != STATUS_PENDING) free( async ); - if (wait_handle) status = wait_async( wait_handle, (options & FILE_SYNCHRONOUS_IO_ALERT), io ); + if (wait_handle) status = wait_async( wait_handle, (options & FILE_SYNCHRONOUS_IO_ALERT) ); return status; } @@ -4899,7 +4898,7 @@ static NTSTATUS server_write_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE if (status != STATUS_PENDING) free( async ); - if (wait_handle) status = wait_async( wait_handle, (options & FILE_SYNCHRONOUS_IO_ALERT), io ); + if (wait_handle) status = wait_async( wait_handle, (options & FILE_SYNCHRONOUS_IO_ALERT) ); return status; } @@ -4944,7 +4943,7 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, if (status != STATUS_PENDING) free( async ); - if (wait_handle) status = wait_async( wait_handle, (options & FILE_SYNCHRONOUS_IO_ALERT), io ); + if (wait_handle) status = wait_async( wait_handle, (options & FILE_SYNCHRONOUS_IO_ALERT) ); return status; } @@ -5937,7 +5936,7 @@ NTSTATUS WINAPI NtFlushBuffersFile( HANDLE handle, IO_STATUS_BLOCK *io ) if (ret != STATUS_PENDING) free( async ); - if (wait_handle) ret = wait_async( wait_handle, FALSE, io ); + if (wait_handle) ret = wait_async( wait_handle, FALSE ); } if (needs_close) close( fd ); @@ -6436,7 +6435,7 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, IO_STATUS_BLOCK *io } SERVER_END_REQ; if (status != STATUS_PENDING) free( async ); - if (wait_handle) status = wait_async( wait_handle, FALSE, io ); + if (wait_handle) status = wait_async( wait_handle, FALSE ); return status; } else if (io->u.Status) return io->u.Status; diff --git a/server/async.c b/server/async.c index a5fa61dc6e5..27af3be52ff 100644 --- a/server/async.c +++ b/server/async.c @@ -118,14 +118,14 @@ static void async_satisfied( struct object *obj, struct wait_queue_entry *entry async->direct_result = 0; } + set_wait_status( entry, async->status ); + /* close wait handle here to avoid extra server round trip */ if (async->wait_handle) { close_handle( async->thread->process, async->wait_handle ); async->wait_handle = 0; } - - if (async->status == STATUS_PENDING) make_wait_abandoned( entry ); } static void async_destroy( struct object *obj ) diff --git a/server/thread.c b/server/thread.c index eb8b0de84b1..4077a752e4a 100644 --- a/server/thread.c +++ b/server/thread.c @@ -67,6 +67,7 @@ struct thread_wait client_ptr_t cookie; /* magic cookie to return to client */ abstime_t when; struct timeout_user *user; + int status; /* status to return (unless STATUS_PENDING) */ struct wait_queue_entry queues[1]; }; @@ -727,6 +728,11 @@ void make_wait_abandoned( struct wait_queue_entry *entry ) entry->wait->abandoned = 1; } +void set_wait_status( struct wait_queue_entry *entry, int status ) +{ + entry->wait->status = status; +} + /* finish waiting */ static unsigned int end_wait( struct thread *thread, unsigned int status ) { @@ -739,6 +745,7 @@ static unsigned int end_wait( struct thread *thread, unsigned int status ) if (status < wait->count) /* wait satisfied, tell it to the objects */ { + wait->status = status; if (wait->select == SELECT_WAIT_ALL) { for (i = 0, entry = wait->queues; i < wait->count; i++, entry++) @@ -749,6 +756,7 @@ static unsigned int end_wait( struct thread *thread, unsigned int status ) entry = wait->queues + status; entry->obj->ops->satisfied( entry->obj, entry ); } + status = wait->status; if (wait->abandoned) status += STATUS_ABANDONED_WAIT_0; } for (i = 0, entry = wait->queues; i < wait->count; i++, entry++) diff --git a/server/thread.h b/server/thread.h index 74b828f768b..8dcf966a90a 100644 --- a/server/thread.h +++ b/server/thread.h @@ -106,6 +106,7 @@ extern struct thread *get_wait_queue_thread( struct wait_queue_entry *entry ); extern enum select_op get_wait_queue_select_op( struct wait_queue_entry *entry ); extern client_ptr_t get_wait_queue_key( struct wait_queue_entry *entry ); extern void make_wait_abandoned( struct wait_queue_entry *entry ); +extern void set_wait_status( struct wait_queue_entry *entry, int status ); extern void stop_thread( struct thread *thread ); extern int wake_thread( struct thread *thread ); extern int wake_thread_queue_entry( struct wait_queue_entry *entry );

1 0

Zebediah Figura : ntdll: Move struct async_fileio to unix_private.h.
by Alexandre Julliard 24 May '21

24 May '21

Module: wine Branch: master Commit: 5d3fde087a0f670ec88de41c2f62b113eff64051 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d3fde087a0f670ec88de41c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 21 22:08:47 2021 -0500 ntdll: Move struct async_fileio to unix_private.h. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 9 --------- dlls/ntdll/unix/server.c | 4 ++-- dlls/ntdll/unix/unix_private.h | 9 +++++++++ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 8313e3c3160..0db2bd4ffce 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4610,15 +4610,6 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, * Asynchronous file I/O * */ -typedef NTSTATUS async_callback_t( void *user, IO_STATUS_BLOCK *io, NTSTATUS status ); - -struct async_fileio -{ - async_callback_t *callback; /* must be the first field */ - struct async_fileio *next; - HANDLE handle; -}; - struct async_fileio_read { struct async_fileio io; diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index d153fdce0be..10f53bea8ab 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -390,12 +390,12 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result, BOO case APC_ASYNC_IO: { IO_STATUS_BLOCK *iosb = wine_server_get_ptr( call->async_io.sb ); - NTSTATUS (**user)(void *, IO_STATUS_BLOCK *, NTSTATUS) = wine_server_get_ptr( call->async_io.user ); + struct async_fileio *user = wine_server_get_ptr( call->async_io.user ); void *saved_frame = get_syscall_frame(); void *frame; result->type = call->type; - result->async_io.status = (*user)( user, iosb, call->async_io.status ); + result->async_io.status = user->callback( user, iosb, call->async_io.status ); if ((frame = get_syscall_frame()) != saved_frame) { diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index bd00d4e9d42..3c23562b7a0 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -75,6 +75,15 @@ static inline struct ntdll_thread_data *ntdll_get_thread_data(void) return (struct ntdll_thread_data *)&NtCurrentTeb()->GdiTebBatch; } +typedef NTSTATUS async_callback_t( void *user, IO_STATUS_BLOCK *io, NTSTATUS status ); + +struct async_fileio +{ + async_callback_t *callback; + struct async_fileio *next; + HANDLE handle; +}; + static const SIZE_T page_size = 0x1000; static const SIZE_T teb_size = 0x3000; /* TEB64 + TEB32 */ static const SIZE_T signal_stack_mask = 0xffff;

1 0

Zebediah Figura : ntdll: Implement IOCTL_AFD_RECV.
by Alexandre Julliard 24 May '21

24 May '21

Module: wine Branch: master Commit: b8f4061df0f71de13abc9edbeb18063d8359678f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8f4061df0f71de13abc9edb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 21 22:08:48 2021 -0500 ntdll: Implement IOCTL_AFD_RECV. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50366 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/Makefile.in | 1 + dlls/ntdll/unix/file.c | 7 +- dlls/ntdll/unix/socket.c | 313 +++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/unix_private.h | 4 + include/wine/afd.h | 17 +++ include/wine/server_protocol.h | 22 ++- server/fd.c | 6 + server/file.h | 1 + server/protocol.def | 11 ++ server/request.h | 9 ++ server/sock.c | 83 ++++++++++- server/trace.c | 16 +++ 12 files changed, 481 insertions(+), 9 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b8f4061df0f71de13abc…

1 0

Zebediah Figura : ws2_32/tests: Add some tests for IOCTL_AFD_RECV.
by Alexandre Julliard 24 May '21

24 May '21

Module: wine Branch: master Commit: 1ed574a03eb2f619f804ee0a4773cfdfb207777a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ed574a03eb2f619f804ee0a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 21 22:08:49 2021 -0500 ws2_32/tests: Add some tests for IOCTL_AFD_RECV. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/Makefile.in | 1 + dlls/ws2_32/tests/afd.c | 403 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 404 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1ed574a03eb2f619f804…

1 0

Piotr Caban : msvcrt: Remove cos from unixlib.
by Alexandre Julliard 24 May '21

24 May '21

Module: wine Branch: master Commit: 88dc2d0e685a97816405651ba4a542d2951062cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=88dc2d0e685a97816405651b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun May 23 16:36:44 2021 +0200 msvcrt: Remove cos from unixlib. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/unixlib.c | 9 --------- dlls/msvcrt/unixlib.h | 1 - 2 files changed, 10 deletions(-) diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 70c59d281de..5e80f319255 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -121,14 +121,6 @@ static float CDECL unix_atanhf(float x) #endif } -/********************************************************************* - * cos - */ -static double CDECL unix_cos( double x ) -{ - return cos( x ); -} - /********************************************************************* * cosf */ @@ -493,7 +485,6 @@ static const struct unix_funcs funcs = unix_asinhf, unix_atanh, unix_atanhf, - unix_cos, unix_cosf, unix_cosh, unix_coshf, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index a55454d3f59..0f9121723f1 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -29,7 +29,6 @@ struct unix_funcs float (CDECL *asinhf)(float x); double (CDECL *atanh)(double x); float (CDECL *atanhf)(float x); - double (CDECL *cos)(double x); float (CDECL *cosf)(float x); double (CDECL *cosh)(double x); float (CDECL *coshf)(float x);

1 0

Alexandre Julliard : packaging: Remove Fedora 32.
by Alexandre Julliard 24 May '21

24 May '21

Module: tools Branch: master Commit: 4132dd29cc475bcbd565472bc75b10ee8e32e866 URL: https://source.winehq.org/git/tools.git/?a=commit;h=4132dd29cc475bcbd565472… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 21 22:40:14 2021 +0200 packaging: Remove Fedora 32. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- packaging/obs/obs-sync | 2 +- packaging/obs/rsync-filter | 1 - packaging/obs/yum.conf | 4 ---- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync index 3b8843d..ce24e4d 100755 --- a/packaging/obs/obs-sync +++ b/packaging/obs/obs-sync @@ -181,7 +181,7 @@ publish_files () cd $basedir -distros="32 33 34 buster bullseye bionic focal groovy hirsute" +distros="33 34 buster bullseye bionic focal groovy hirsute" dry_run= while [ $# -ge 1 ] diff --git a/packaging/obs/rsync-filter b/packaging/obs/rsync-filter index 2410ed1..f3ae9bc 100644 --- a/packaging/obs/rsync-filter +++ b/packaging/obs/rsync-filter @@ -1,5 +1,4 @@ + /fedora -+ /fedora/32 + /fedora/33 + /fedora/34 - /fedora/* diff --git a/packaging/obs/yum.conf b/packaging/obs/yum.conf index e199453..c3f2fcd 100644 --- a/packaging/obs/yum.conf +++ b/packaging/obs/yum.conf @@ -4,10 +4,6 @@ debuglevel=0 logfile=/var/log/yum.log gpgcheck=1 -[fedora-32] -name = Fedora 32 -baseurl=https://download.opensuse.org/repositories/Emulators:/Wine:/Fedora/Fedora_32 - [fedora-33] name = Fedora 33 baseurl=https://download.opensuse.org/repositories/Emulators:/Wine:/Fedora/…

1 0

Alexandre Julliard : Wine release 6.9
by Alexandre Julliard 21 May '21

21 May '21

Module: website Branch: master Commit: c2f91d030ad8353922c92e90f5300e2db7b2538a URL: https://source.winehq.org/git/website.git/?a=commit;h=c2f91d030ad8353922c92… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 21 21:20:00 2021 +0200 Wine release 6.9 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2021052101.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2021052101.xml b/news/en/2021052101.xml new file mode 100644 index 00000000..5414e848 --- /dev/null +++ b/news/en/2021052101.xml @@ -0,0 +1,16 @@ +<news> +<date>May 21, 2021</date> +<title>Wine 6.9 Released</title> +<body> + The Wine development release 6.9 is now available. + <a href="{$root}/announce/6.9">What's new</a> in this release: +<ul> + <li>WPCAP library converted to PE.</li> + <li>Support for paper forms in the print spooler.</li> + <li>More math functions from Musl in the C runtime.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/6.x/wine-6.9.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : kernelbase: Fix process access rights in DebugActiveProcess().
by Alexandre Julliard 21 May '21

21 May '21

Module: wine Branch: master Commit: 036f1f3b8313a9e3141fe7ee2d936ca93e534c2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=036f1f3b8313a9e3141fe7ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 21 18:10:13 2021 +0200 kernelbase: Fix process access rights in DebugActiveProcess(). PROCESS_QUERY_INFORMATION is needed to check the Wow64 status. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c index 207c04da50c..08af7fad5ba 100644 --- a/dlls/kernelbase/debug.c +++ b/dlls/kernelbase/debug.c @@ -91,7 +91,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH DebugActiveProcess( DWORD pid ) if (!set_ntstatus( DbgUiConnectToDbg() )) return FALSE; if (!(process = OpenProcess( PROCESS_VM_READ | PROCESS_VM_WRITE | PROCESS_SUSPEND_RESUME | - PROCESS_CREATE_THREAD, FALSE, pid ))) + PROCESS_QUERY_INFORMATION | PROCESS_CREATE_THREAD, FALSE, pid ))) return FALSE; status = DbgUiDebugActiveProcess( process ); NtClose( process );

1 0