commit 0cd3ff6cbe3979ce207527f79884c49ad53a2905
author Alexandre Julliard <julliard@winehq.org> Mon Dec 29 17:24:33 2008 +0100
committer Alexandre Julliard <julliard@winehq.org> Mon Dec 29 17:24:39 2008 +0100
tree e3e955f13da63d22179a64539d801bfb688f5d57
parent 45c991937ac0ba0a634df9db3ced2d811fd4ef24

server: Make the class opaque data a client_ptr_t instead of a void pointer.

server/class.c

diff --git a/server/class.c b/server/class.c
index 1833a28..0e402ba 100644
--- a/server/class.c
+++ b/server/class.c
@@ -49,7 +49,7 @@
     mod_handle_t    instance;        /* module instance */
     unsigned int    style;           /* class style */
     int             win_extra;       /* number of window extra bytes */
-    void           *client_ptr;      /* pointer to class in client address space */
+    client_ptr_t    client_ptr;      /* pointer to class in client address space */
     int             nb_extra_bytes;  /* number of extra bytes */
     char            extra_bytes[1];  /* extra bytes storage */
 };
@@ -141,7 +141,7 @@
     return class->atom;
 }
 
-void *get_class_client_ptr( struct window_class *class )
+client_ptr_t get_class_client_ptr( struct window_class *class )
 {
     return class->client_ptr;
 }

server/protocol.def

diff --git a/server/protocol.def b/server/protocol.def
index daa15b7..66c2e01 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -2059,7 +2059,7 @@
     user_handle_t  parent;      /* full handle of parent */
     user_handle_t  owner;       /* full handle of owner */
     int            extra;       /* number of extra bytes */
-    void*          class_ptr;   /* pointer to class in client address space */
+    client_ptr_t   class_ptr;   /* pointer to class in client address space */
 @END
 
 
@@ -2646,7 +2646,7 @@
     mod_handle_t   instance;       /* module instance */
     int            extra;          /* number of extra class bytes */
     int            win_extra;      /* number of window extra bytes */
-    void*          client_ptr;     /* pointer to class in client address space */
+    client_ptr_t   client_ptr;     /* pointer to class in client address space */
     VARARG(name,unicode_str);      /* class name */
 @REPLY
     atom_t         atom;           /* resulting class atom */
@@ -2659,7 +2659,7 @@
     mod_handle_t   instance;       /* module instance */
     VARARG(name,unicode_str);      /* class name */
 @REPLY
-    void*          client_ptr;     /* pointer to class in client address space */
+    client_ptr_t   client_ptr;     /* pointer to class in client address space */
 @END
 
 

server/trace.c

diff --git a/server/trace.c b/server/trace.c
index fb717d0..9530fde 100644
--- a/server/trace.c
+++ b/server/trace.c
@@ -2623,7 +2623,8 @@
     fprintf( stderr, " parent=%08x,", req->parent );
     fprintf( stderr, " owner=%08x,", req->owner );
     fprintf( stderr, " extra=%d,", req->extra );
-    fprintf( stderr, " class_ptr=%p", req->class_ptr );
+    fprintf( stderr, " class_ptr=" );
+    dump_uint64( &req->class_ptr );
 }
 
 static void dump_destroy_window_request( const struct destroy_window_request *req )
@@ -3327,7 +3328,9 @@
     fprintf( stderr, "," );
     fprintf( stderr, " extra=%d,", req->extra );
     fprintf( stderr, " win_extra=%d,", req->win_extra );
-    fprintf( stderr, " client_ptr=%p,", req->client_ptr );
+    fprintf( stderr, " client_ptr=" );
+    dump_uint64( &req->client_ptr );
+    fprintf( stderr, "," );
     fprintf( stderr, " name=" );
     dump_varargs_unicode_str( cur_size );
 }
@@ -3349,7 +3352,8 @@
 
 static void dump_destroy_class_reply( const struct destroy_class_reply *req )
 {
-    fprintf( stderr, " client_ptr=%p", req->client_ptr );
+    fprintf( stderr, " client_ptr=" );
+    dump_uint64( &req->client_ptr );
 }
 
 static void dump_set_class_info_request( const struct set_class_info_request *req )

server/user.h

diff --git a/server/user.h b/server/user.h
index d319410..b4f35a8 100644
--- a/server/user.h
+++ b/server/user.h
@@ -148,7 +148,7 @@
 extern int is_desktop_class( struct window_class *class );
 extern int is_hwnd_message_class( struct window_class *class );
 extern atom_t get_class_atom( struct window_class *class );
-extern void *get_class_client_ptr( struct window_class *class );
+extern client_ptr_t get_class_client_ptr( struct window_class *class );
 
 /* windows station functions */