From: Rémi Bernon rbernon@codeweavers.com
--- dlls/win32u/d3dkmt.c | 10 ++-- dlls/win32u/tests/d3dkmt.c | 10 ++-- server/d3dkmt.c | 97 ++++++++++++++++++++++++++++++++++++-- server/protocol.def | 2 + tools/make_requests | 1 + 5 files changed, 107 insertions(+), 13 deletions(-)
diff --git a/dlls/win32u/d3dkmt.c b/dlls/win32u/d3dkmt.c index e88bbae21b3..14b2b5ca4dd 100644 --- a/dlls/win32u/d3dkmt.c +++ b/dlls/win32u/d3dkmt.c @@ -37,6 +37,8 @@ struct d3dkmt_object { enum d3dkmt_type type; /* object type */ D3DKMT_HANDLE local; /* object local handle */ + D3DKMT_HANDLE global; /* object global handle */ + BOOL shared; /* object is shared using nt handles */ HANDLE handle; /* internal handle of the server object */ };
@@ -176,19 +178,21 @@ static NTSTATUS d3dkmt_object_create( struct d3dkmt_object *object, BOOL shared req->type = object->type; status = wine_server_call( req ); object->handle = wine_server_ptr_handle( reply->handle ); + object->global = reply->global; + object->shared = shared; } SERVER_END_REQ;
if (!status) status = alloc_object_handle( object );
if (status) WARN( "Failed to create global object for %p, status %#x\n", object, status ); - else TRACE( "Created global object for %p/%#x\n", object, object->local ); + else TRACE( "Created global object %#x for %p/%#x\n", object->global, object, object->local ); return status; }
static void d3dkmt_object_free( struct d3dkmt_object *object ) { - TRACE( "object %p/%#x\n", object, object->local ); + TRACE( "object %p/%#x, global %#x\n", object, object->local, object->global ); if (object->local) free_object_handle( object ); if (object->handle) NtClose( object->handle ); free( object ); @@ -867,7 +871,7 @@ NTSTATUS WINAPI NtGdiDdDDICreateKeyedMutex2( D3DKMT_CREATEKEYEDMUTEX2 *params ) if ((status = d3dkmt_object_alloc( sizeof(*mutex), D3DKMT_MUTEX, (void **)&mutex ))) return status; if ((status = d3dkmt_object_create( mutex, params->Flags.NtSecuritySharing ))) goto failed;
- params->hSharedHandle = 0; + params->hSharedHandle = mutex->shared ? 0 : mutex->global; params->hKeyedMutex = mutex->local; return STATUS_SUCCESS;
diff --git a/dlls/win32u/tests/d3dkmt.c b/dlls/win32u/tests/d3dkmt.c index b90045affe3..60168c3f316 100644 --- a/dlls/win32u/tests/d3dkmt.c +++ b/dlls/win32u/tests/d3dkmt.c @@ -1513,7 +1513,7 @@ static void test_D3DKMTCreateKeyedMutex( void ) status = D3DKMTCreateKeyedMutex( &create ); ok_nt( STATUS_SUCCESS, status ); check_d3dkmt_local( create.hKeyedMutex, &next_local ); - todo_wine check_d3dkmt_global( create.hSharedHandle ); + check_d3dkmt_global( create.hSharedHandle );
status = D3DKMTOpenKeyedMutex( &open ); todo_wine ok_nt( STATUS_INVALID_PARAMETER, status ); @@ -1560,14 +1560,14 @@ static void test_D3DKMTCreateKeyedMutex( void ) status = D3DKMTCreateKeyedMutex2( &create2 ); ok_nt( STATUS_SUCCESS, status ); check_d3dkmt_local( create2.hKeyedMutex, &next_local ); - todo_wine check_d3dkmt_global( create2.hSharedHandle ); + check_d3dkmt_global( create2.hSharedHandle ); destroy.hKeyedMutex = create2.hKeyedMutex;
create2.hKeyedMutex = create2.hSharedHandle = 0x1eadbeed; status = D3DKMTCreateKeyedMutex2( &create2 ); ok_nt( STATUS_SUCCESS, status ); check_d3dkmt_local( create2.hKeyedMutex, &next_local ); - todo_wine check_d3dkmt_global( create2.hSharedHandle ); + check_d3dkmt_global( create2.hSharedHandle );
status = D3DKMTOpenKeyedMutex2( &open2 ); todo_wine ok_nt( STATUS_INVALID_PARAMETER, status ); @@ -1596,7 +1596,7 @@ static void test_D3DKMTCreateKeyedMutex( void ) status = D3DKMTCreateKeyedMutex2( &create2 ); ok_nt( STATUS_SUCCESS, status ); check_d3dkmt_local( create2.hKeyedMutex, &next_local ); - todo_wine check_d3dkmt_global( create2.hSharedHandle ); + check_d3dkmt_global( create2.hSharedHandle );
open2.hKeyedMutex = 0x1eadbeed; open2.hSharedHandle = create2.hSharedHandle; @@ -1623,7 +1623,7 @@ static void test_D3DKMTCreateKeyedMutex( void ) status = D3DKMTCreateKeyedMutex2( &create2 ); ok_nt( STATUS_SUCCESS, status ); check_d3dkmt_local( create2.hKeyedMutex, &next_local ); - todo_wine check_d3dkmt_global( create2.hSharedHandle ); + check_d3dkmt_global( create2.hSharedHandle );
open2.hKeyedMutex = 0x1eadbeed; open2.hSharedHandle = create2.hSharedHandle; diff --git a/server/d3dkmt.c b/server/d3dkmt.c index 64301548784..b99fabd3292 100644 --- a/server/d3dkmt.c +++ b/server/d3dkmt.c @@ -21,11 +21,9 @@ #include "config.h"
#include <assert.h> -#include <stdarg.h> +#include <stdbool.h> #include <stdio.h>
-#include <unistd.h> - #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -41,6 +39,7 @@ struct d3dkmt_object { struct object obj; /* object header */ enum d3dkmt_type type; /* object type */ + d3dkmt_handle_t global; /* object global handle */ };
static void d3dkmt_object_dump( struct object *obj, int verbose ); @@ -71,17 +70,97 @@ static const struct object_ops d3dkmt_object_ops = d3dkmt_object_destroy, /* destroy */ };
+static struct d3dkmt_object **objects, **objects_end, **objects_next; + +#define D3DKMT_HANDLE_BIT 0x40000000 + +static d3dkmt_handle_t index_to_handle( int index ) +{ + return (index << 6) | D3DKMT_HANDLE_BIT | 2; +} + +static int handle_to_index( d3dkmt_handle_t handle ) +{ + return (handle & ~0xc000003f) >> 6; +} + +static bool init_handle_table(void) +{ + static const size_t initial_capacity = 1024; + + if (!(objects = mem_alloc( initial_capacity * sizeof(*objects) ))) return false; + memset( objects, 0, initial_capacity * sizeof(*objects) ); + objects_end = objects + initial_capacity; + objects_next = objects; + + return true; +} + +static struct d3dkmt_object **grow_handle_table(void) +{ + size_t old_capacity = objects_end - objects, max_capacity = handle_to_index( D3DKMT_HANDLE_BIT - 1 ); + unsigned int new_capacity = old_capacity * 3 / 2; + struct d3dkmt_object **tmp; + + if (new_capacity > max_capacity) new_capacity = max_capacity; + if (new_capacity <= old_capacity) return NULL; /* exhausted handle capacity */ + + if (!(tmp = realloc( objects, new_capacity * sizeof(*objects) ))) return NULL; + memset( tmp + old_capacity, 0, (new_capacity - old_capacity) * sizeof(*tmp) ); + + objects = tmp; + objects_end = tmp + new_capacity; + objects_next = tmp + old_capacity; + + return objects_next; +} + +/* allocate a d3dkmt object with a global handle */ +static d3dkmt_handle_t alloc_object_handle( struct d3dkmt_object *object ) +{ + struct d3dkmt_object **entry; + d3dkmt_handle_t handle = 0; + + if (!objects && !init_handle_table()) goto done; + + for (entry = objects_next; entry < objects_end; entry++) if (!*entry) break; + if (entry == objects_end) + { + for (entry = objects; entry < objects_next; entry++) if (!*entry) break; + if (entry == objects_next && !(entry = grow_handle_table())) goto done; + } + + handle = index_to_handle( entry - objects ); + objects_next = entry + 1; + *entry = object; + +done: + if (!handle) set_error( STATUS_NO_MEMORY ); + return handle; +} + +/* free a d3dkmt global object handle */ +static void free_object_handle( d3dkmt_handle_t global ) +{ + unsigned int index = handle_to_index( global ); + assert( objects + index < objects_end ); + objects[index] = NULL; +} + static void d3dkmt_object_dump( struct object *obj, int verbose ) { struct d3dkmt_object *object = (struct d3dkmt_object *)obj; assert( obj->ops == &d3dkmt_object_ops );
- fprintf( stderr, "type=%#x\n", object->type ); + fprintf( stderr, "type=%#x global=%#x\n", object->type, object->global ); }
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 ); }
static struct d3dkmt_object *d3dkmt_object_create( enum d3dkmt_type type ) @@ -89,7 +168,14 @@ static struct d3dkmt_object *d3dkmt_object_create( enum d3dkmt_type type ) struct d3dkmt_object *object;
if (!(object = alloc_object( &d3dkmt_object_ops ))) return NULL; - object->type = type; + object->type = type; + object->global = 0; + + if (!(object->global = alloc_object_handle( object ))) + { + release_object( object ); + return NULL; + }
return object; } @@ -101,5 +187,6 @@ DECL_HANDLER(d3dkmt_object_create)
if (!(object = d3dkmt_object_create( req->type ))) return; reply->handle = alloc_handle( current->process, object, STANDARD_RIGHTS_ALL, OBJ_INHERIT ); + reply->global = object->global; release_object( object ); } diff --git a/server/protocol.def b/server/protocol.def index 9fbd90a0877..a6e0590d4d6 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -34,6 +34,7 @@
typedef unsigned int obj_handle_t; typedef unsigned int user_handle_t; +typedef unsigned int d3dkmt_handle_t; typedef unsigned int atom_t; typedef unsigned int process_id_t; typedef unsigned int thread_id_t; @@ -4151,6 +4152,7 @@ enum inproc_sync_type @REQ(d3dkmt_object_create) unsigned int type; /* d3dkmt object type */ @REPLY + d3dkmt_handle_t global; /* global d3dkmt handle */ obj_handle_t handle; /* internal handle of the server object */ @END
diff --git a/tools/make_requests b/tools/make_requests index f87664c9690..17e425537b5 100755 --- a/tools/make_requests +++ b/tools/make_requests @@ -34,6 +34,7 @@ my %formats = "atom_t" => [ 4, 4, "%04x" ], "process_id_t" => [ 4, 4, "%04x" ], "thread_id_t" => [ 4, 4, "%04x" ], + "d3dkmt_handle_t"=>[ 4, 4, "%08x" ], "unsigned __int64" => [ 8, 8, "&uint64" ], "timeout_t" => [ 8, 8 ], "abstime_t" => [ 8, 8 ],