[PATCH 0/3] MR9377: wineandroid, winemac, winex11: Fix ProcessEvents drained return value.

[Rémi Bernon]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=58915

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/9377

[PATCH 1/3] wineandroid: Check if event list is empty before checking the pipe.

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=58915
---
 dlls/wineandroid.drv/window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c
index 81be65a065c..1444dc5ec56 100644
--- a/dlls/wineandroid.drv/window.c
+++ b/dlls/wineandroid.drv/window.c
@@ -515,7 +515,7 @@ static int process_events( DWORD mask )
         next = LIST_ENTRY( event_queue.next, struct java_event, entry );
     }
     current_event = previous;
-    return !check_fd_events( event_pipe[0], POLLIN );
+    return list_empty( &event_queue ) && !check_fd_events( event_pipe[0], POLLIN );
 }
 
 
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/9377

[PATCH 2/3] winemac: Only check if event pipe is drained with QS_ALLINPUT.

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=58915
---
 dlls/winemac.drv/event.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c
index 6841fd3603e..ace86f0c9d3 100644
--- a/dlls/winemac.drv/event.c
+++ b/dlls/winemac.drv/event.c
@@ -567,5 +567,5 @@ BOOL macdrv_ProcessEvents(DWORD mask)
     }
 
     if (count) TRACE("processed %d events\n", count);
-    return !check_fd_events(macdrv_get_event_queue_fd(data->queue), POLLIN);
+    return mask == QS_ALLINPUT && !check_fd_events(macdrv_get_event_queue_fd(data->queue), POLLIN);
 }
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/9377

[PATCH 3/3] winex11: Only check if event pipe is drained with QS_ALLINPUT.

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=58915
---
 dlls/winex11.drv/event.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c
index 9deccc2acfc..9475b0236fb 100644
--- a/dlls/winex11.drv/event.c
+++ b/dlls/winex11.drv/event.c
@@ -544,7 +544,7 @@ BOOL X11DRV_ProcessEvents( DWORD mask )
     XFlush( gdi_display );
     if (count) TRACE( "processed %d events\n", count );
 
-    if (check_fd_events( ConnectionNumber( data->display ), POLLIN )) return FALSE;
+    if (mask != QS_ALLINPUT || check_fd_events( ConnectionNumber( data->display ), POLLIN )) return FALSE;
     XFlush( data->display ); /* all events have been processed, flush any pending request */
     return TRUE;
 }
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/9377