From: Rémi Bernon rbernon@codeweavers.com
--- dlls/win32u/d3dkmt.c | 3 +++ server/d3dkmt.c | 57 ++++++++++++++++++++++++++++++++++++++++++-- server/protocol.def | 1 + 3 files changed, 59 insertions(+), 2 deletions(-)
diff --git a/dlls/win32u/d3dkmt.c b/dlls/win32u/d3dkmt.c index 5d6ada3e11d..fd9e49b77a0 100644 --- a/dlls/win32u/d3dkmt.c +++ b/dlls/win32u/d3dkmt.c @@ -184,9 +184,12 @@ static NTSTATUS d3dkmt_object_create( struct d3dkmt_object *object, int fd, BOOL { NTSTATUS status;
+ if (fd >= 0) wine_server_send_fd( fd ); + SERVER_START_REQ( d3dkmt_object_create ) { req->type = object->type; + req->fd = fd; if (runtime_size) wine_server_add_data( req, runtime, runtime_size ); status = wine_server_call( req ); object->handle = wine_server_ptr_handle( reply->handle ); diff --git a/server/d3dkmt.c b/server/d3dkmt.c index c253740a7bb..672ff2ce9c1 100644 --- a/server/d3dkmt.c +++ b/server/d3dkmt.c @@ -42,9 +42,11 @@ struct d3dkmt_object d3dkmt_handle_t global; /* object global handle */ void *runtime; /* client runtime data */ data_size_t runtime_size; /* size of client runtime data */ + struct fd *fd; /* fd object for unix fds */ };
static void d3dkmt_object_dump( struct object *obj, int verbose ); +static struct fd *d3dkmt_object_get_fd( struct object *obj ); static void d3dkmt_object_destroy( struct object *obj );
static const struct object_ops d3dkmt_object_ops = @@ -57,7 +59,7 @@ static const struct object_ops d3dkmt_object_ops = NULL, /* signaled */ NULL, /* satisfied */ no_signal, /* signal */ - no_get_fd, /* get_fd */ + d3dkmt_object_get_fd, /* get_fd */ default_get_sync, /* get_sync */ default_map_access, /* map_access */ default_get_sd, /* get_sd */ @@ -72,6 +74,27 @@ static const struct object_ops d3dkmt_object_ops = d3dkmt_object_destroy, /* destroy */ };
+static enum server_fd_type d3dkmt_get_fd_type( struct fd *fd ) +{ + return FD_TYPE_INVALID; +} + +static const struct fd_ops d3dkmt_fd_ops = +{ + default_fd_get_poll_events, /* get_poll_events */ + default_poll_event, /* poll_event */ + d3dkmt_get_fd_type, /* get_fd_type */ + no_fd_read, /* read */ + no_fd_write, /* write */ + no_fd_flush, /* flush */ + no_fd_get_file_info, /* get_file_info */ + no_fd_get_volume_info, /* get_volume_info */ + no_fd_ioctl, /* ioctl */ + default_fd_cancel_async, /* cancel_async */ + no_fd_queue_async, /* queue_async */ + default_fd_reselect_async /* reselect_async */ +}; + #define DXGK_SHARED_SYNC_QUERY_STATE 0x0001 #define DXGK_SHARED_SYNC_MODIFY_STATE 0x0002 #define DXGK_SHARED_SYNC_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x3) @@ -306,12 +329,24 @@ static void d3dkmt_object_dump( struct object *obj, int verbose ) fprintf( stderr, "type=%#x global=%#x\n", object->type, object->global ); }
+static struct fd *d3dkmt_object_get_fd( struct object *obj ) +{ + struct d3dkmt_object *object = (struct d3dkmt_object *)obj; + assert( obj->ops == &d3dkmt_object_ops ); + + if (object->fd) return (struct fd *)grab_object( object->fd ); + + set_error( STATUS_NO_SUCH_FILE ); + return NULL; +} + static void d3dkmt_object_destroy( struct object *obj ) { struct d3dkmt_object *object = (struct d3dkmt_object *)obj; assert( obj->ops == &d3dkmt_object_ops );
if (object->global) free_object_handle( object->global ); + if (object->fd) release_object( object->fd ); free( object->runtime ); }
@@ -323,6 +358,7 @@ static struct d3dkmt_object *d3dkmt_object_create( enum d3dkmt_type type, data_s object->type = type; object->global = 0; object->runtime_size = runtime_size; + object->fd = NULL;
if (!(object->runtime = memdup( runtime, runtime_size )) || !(object->global = alloc_object_handle( object ))) @@ -381,11 +417,28 @@ static struct d3dkmt_object *d3dkmt_object_open_shared( obj_handle_t handle, enu DECL_HANDLER(d3dkmt_object_create) { struct d3dkmt_object *object; + struct fd *fd = NULL; + + if (req->fd >= 0) + { + int unix_fd; + if ((unix_fd = thread_get_inflight_fd( current, req->fd )) < 0) return; + if (!(fd = create_anonymous_fd( NULL, unix_fd, NULL, 0 ))) return; + } + + if (!(object = d3dkmt_object_create( req->type, get_req_data_size(), get_req_data() ))) goto done; + if (fd) + { + set_fd_user( fd, &d3dkmt_fd_ops, &object->obj ); + object->fd = (struct fd *)grab_object( fd ); + }
- if (!(object = d3dkmt_object_create( req->type, get_req_data_size(), get_req_data() ))) return; reply->handle = alloc_handle( current->process, object, STANDARD_RIGHTS_ALL, OBJ_INHERIT ); reply->global = object->global; release_object( object ); + +done: + if (fd) release_object( fd ); }
/* update a global d3dkmt object */ diff --git a/server/protocol.def b/server/protocol.def index 87b8730f92a..45fa52858e7 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -4177,6 +4177,7 @@ enum inproc_sync_type /* Create a global d3dkmt object */ @REQ(d3dkmt_object_create) unsigned int type; /* d3dkmt object type */ + int fd; /* host specific fd */ VARARG(runtime,bytes); /* client runtime data */ @REPLY d3dkmt_handle_t global; /* global d3dkmt handle */