[PATCH v13 06/12] wineandroid: switch dequeueBuffer to socket transport

[Twaik Yont]

From: Twaik Yont <[e-mail]>

Switch dequeueBuffer to the socket-based ioctl transport.

Replace the HANDLE duplication path using NtDuplicateObject and
wineserver with direct fd passing over a UNIX socket.

The ioctl is now handled entirely on the new dispatch thread and no
longer depends on Wine TEB-based handle conversion.

This completes the dequeueBuffer transition that was previously kept on
the old transport for bisect safety.

Signed-off-by: Twaik Yont <[e-mail]>
---
 dlls/wineandroid.drv/device.c | 58 +++++------------------------------
 1 file changed, 8 insertions(+), 50 deletions(-)

diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c
index 798b23ef790..378328311a4 100644
--- a/dlls/wineandroid.drv/device.c
+++ b/dlls/wineandroid.drv/device.c
@@ -178,8 +178,6 @@ struct ioctl_android_window_pos_changed
 struct ioctl_android_dequeueBuffer
 {
     struct ioctl_header hdr;
-    HANDLE handle;
-    DWORD pid;
     int buffer_id;
     int generation;
 };
@@ -653,14 +651,11 @@ static NTSTATUS dequeueBuffer_ioctl( JNIEnv* env, void *data, DWORD in_size, DWO
     if (!(win_data = get_ioctl_native_win_data( &res->hdr ))) return STATUS_INVALID_HANDLE;
     if (!(parent = win_data->parent)) return STATUS_DEVICE_NOT_READY;
 
-    res->handle = 0;
     res->buffer_id = -1;
     res->generation = 0;
     *ret_size = sizeof(*res);
 
-    wrap_java_call();
     ret = parent->dequeueBuffer( parent, &buffer, &fence );
-    unwrap_java_call();
     if (ret)
     {
         _ERR( "%08x failed %d\n", res->hdr.hwnd, ret );
@@ -678,15 +673,10 @@ static NTSTATUS dequeueBuffer_ioctl( JNIEnv* env, void *data, DWORD in_size, DWO
 
     res->buffer_id = register_buffer( win_data, ahb, &is_new );
     res->generation = win_data->generation;
-    res->handle = 0;
 
     if (is_new)
     {
         int sv[2] = { -1, -1 };
-        HANDLE local = 0;
-        OBJECT_ATTRIBUTES attr = { .Length = sizeof(attr) };
-        CLIENT_ID cid = { .UniqueProcess = UlongToHandle( res->pid ) };
-        HANDLE process;
 
         if (!ahb)
         {
@@ -700,37 +690,16 @@ static NTSTATUS dequeueBuffer_ioctl( JNIEnv* env, void *data, DWORD in_size, DWO
             return STATUS_UNSUCCESSFUL;
         }
 
-        if (NtOpenProcess( &process, PROCESS_DUP_HANDLE, &attr, &cid ))
-        {
-            close( sv[0] );
-            close( sv[1] );
-            wait_fence_and_close( fence );
-            return STATUS_UNSUCCESSFUL;
-        }
-
-        if (!wine_server_fd_to_handle( dup(sv[1]), GENERIC_READ | SYNCHRONIZE, 0, &local ))
-        {
-            NTSTATUS status = NtDuplicateObject( GetCurrentProcess(), local, process, &res->handle, 0, 0, DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE );
-            if (status && local) NtClose( local );
-        }
-
-        NtClose( process );
-        close( sv[1] );
-
-        if (!res->handle)
-        {
-            close( sv[0] );
-            wait_fence_and_close( fence );
-            return STATUS_UNSUCCESSFUL;
-        }
-
         ret = pAHardwareBuffer_sendHandleToUnixSocket( ahb, sv[0] );
         close( sv[0] );
         if (ret)
         {
+            close( sv[1] );
             wait_fence_and_close( fence );
             return android_error_to_status( ret );
         }
+
+        *reply_fd = sv[1];
     }
 
     wait_fence_and_close( fence );
@@ -1321,35 +1290,24 @@ static int dequeueBuffer( struct ANativeWindow *window, struct ANativeWindowBuff
     struct native_win_wrapper *win = (struct native_win_wrapper *)window;
     struct ioctl_android_dequeueBuffer res = {0};
     DWORD size = sizeof(res);
-    int ret;
+    int ret, buffer_fd = -1;
 
     res.hdr.hwnd = HandleToLong( win->hwnd );
     res.hdr.opengl = win->opengl;
-    res.pid = GetCurrentProcessId();
-    res.handle = 0;
     res.buffer_id = -1;
     res.generation = 0;
 
-    ret = android_ioctl_old( IOCTL_DEQUEUE_BUFFER, &res, size, &res, &size, NULL );
+    ret = android_ioctl( IOCTL_DEQUEUE_BUFFER, &res, size, &res, &size, &buffer_fd );
     if (ret) return ret;
     if (size < sizeof(res)) return -EINVAL;
 
     if (res.buffer_id < 0 || res.buffer_id >= NB_CACHED_BUFFERS) return -EINVAL;
 
-    if (res.handle)
+    if (buffer_fd != -1)
     {
         AHardwareBuffer *ahb = NULL;
-        int fd;
-
-        if (wine_server_handle_to_fd( res.handle, GENERIC_READ | SYNCHRONIZE, &fd, NULL ))
-        {
-            NtClose( res.handle );
-            return -EINVAL;
-        }
-        NtClose( res.handle );
-
-        ret = pAHardwareBuffer_recvHandleFromUnixSocket( fd, &ahb );
-        close( fd );
+        ret = pAHardwareBuffer_recvHandleFromUnixSocket( buffer_fd, &ahb );
+        close( buffer_fd );
         if (ret) return ret;
 
         if (win->buffers[res.buffer_id].self)
-- 
GitLab


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