server: Add lookup_name to object_ops structure [dir_object #3]
Vitaliy Margolen
wine-patch at kievinfo.com
Wed Nov 2 12:36:22 CST 2005
By implementing this member object could have it's own name space behind it.
Vitaliy Margolen
changelog:
server:
- Add lookup_name to object_ops structure
-------------- next part --------------
Index: server/atom.c
===================================================================
RCS file: /home/wine/wine/server/atom.c,v
retrieving revision 1.25
diff -u -p -r1.25 atom.c
--- server/atom.c 11 Jul 2005 10:55:53 -0000 1.25
+++ server/atom.c 2 Nov 2005 18:20:31 -0000
@@ -78,6 +78,7 @@ static const struct object_ops atom_tabl
NULL, /* satisfied */
no_signal, /* signal */
no_get_fd, /* get_fd */
+ NULL, /* lookup_name */
no_close_handle, /* close_handle */
atom_table_destroy /* destroy */
};
Index: server/change.c
===================================================================
RCS file: /home/wine/wine/server/change.c,v
retrieving revision 1.26
diff -u -p -r1.26 change.c
--- server/change.c 26 Sep 2005 13:51:58 -0000 1.26
+++ server/change.c 2 Nov 2005 18:20:31 -0000
@@ -73,6 +73,7 @@ static const struct object_ops change_op
no_satisfied, /* satisfied */
no_signal, /* signal */
no_get_fd, /* get_fd */
+ NULL, /* lookup_name */
no_close_handle, /* close_handle */
change_destroy /* destroy */
};
Index: server/clipboard.c
===================================================================
RCS file: /home/wine/wine/server/clipboard.c,v
retrieving revision 1.7
diff -u -p -r1.7 clipboard.c
--- server/clipboard.c 11 Jul 2005 10:55:53 -0000 1.7
+++ server/clipboard.c 2 Nov 2005 18:20:31 -0000
@@ -55,6 +55,7 @@ static const struct object_ops clipboard
NULL, /* satisfied */
no_signal, /* signal */
no_get_fd, /* get_fd */
+ NULL, /* lookup_name */
no_close_handle, /* close_handle */
no_destroy /* destroy */
};
Index: server/console.c
===================================================================
RCS file: /home/wine/wine/server/console.c,v
retrieving revision 1.60
diff -u -p -r1.60 console.c
--- server/console.c 29 Oct 2005 12:38:23 -0000 1.60
+++ server/console.c 2 Nov 2005 18:20:31 -0000
@@ -48,6 +48,7 @@ static const struct object_ops console_i
no_satisfied, /* satisfied */
no_signal, /* signal */
no_get_fd, /* get_fd */
+ NULL, /* lookup_name */
no_close_handle, /* close_handle */
console_input_destroy /* destroy */
};
@@ -74,6 +75,7 @@ static const struct object_ops console_i
no_satisfied, /* satisfied */
no_signal, /* signal */
no_get_fd, /* get_fd */
+ NULL, /* lookup_name */
no_close_handle, /* close_handle */
console_input_events_destroy /* destroy */
};
@@ -111,6 +113,7 @@ static const struct object_ops screen_bu
NULL, /* satisfied */
no_signal, /* signal */
no_get_fd, /* get_fd */
+ NULL, /* lookup_name */
no_close_handle, /* close_handle */
screen_buffer_destroy /* destroy */
};
Index: server/debugger.c
===================================================================
RCS file: /home/wine/wine/server/debugger.c,v
retrieving revision 1.59
diff -u -p -r1.59 debugger.c
--- server/debugger.c 1 Nov 2005 21:47:07 -0000 1.59
+++ server/debugger.c 2 Nov 2005 18:20:31 -0000
@@ -73,6 +73,7 @@ static const struct object_ops debug_eve
no_satisfied, /* satisfied */
no_signal, /* signal */
no_get_fd, /* get_fd */
+ NULL, /* lookup_name */
no_close_handle, /* close_handle */
debug_event_destroy /* destroy */
};
@@ -91,6 +92,7 @@ static const struct object_ops debug_ctx
no_satisfied, /* satisfied */
no_signal, /* signal */
no_get_fd, /* get_fd */
+ NULL, /* lookup_name */
no_close_handle, /* close_handle */
debug_ctx_destroy /* destroy */
};
Index: server/event.c
===================================================================
RCS file: /home/wine/wine/server/event.c,v
retrieving revision 1.33
diff -u -p -r1.33 event.c
--- server/event.c 29 Oct 2005 12:38:23 -0000 1.33
+++ server/event.c 2 Nov 2005 18:20:31 -0000
@@ -54,6 +54,7 @@ static const struct object_ops event_ops
event_satisfied, /* satisfied */
event_signal, /* signal */
no_get_fd, /* get_fd */
+ NULL, /* lookup_name */
no_close_handle, /* close_handle */
no_destroy /* destroy */
};
Index: server/fd.c
===================================================================
RCS file: /home/wine/wine/server/fd.c,v
retrieving revision 1.50
diff -u -p -r1.50 fd.c
--- server/fd.c 27 Oct 2005 11:20:50 -0000 1.50
+++ server/fd.c 2 Nov 2005 18:20:32 -0000
@@ -162,6 +162,7 @@ static const struct object_ops fd_ops =
NULL, /* satisfied */
no_signal, /* signal */
no_get_fd, /* get_fd */
+ NULL, /* lookup_name */
no_close_handle, /* close_handle */
fd_destroy /* destroy */
};
@@ -193,6 +194,7 @@ static const struct object_ops device_op
NULL, /* satisfied */
no_signal, /* signal */
no_get_fd, /* get_fd */
+ NULL, /* lookup_name */
no_close_handle, /* close_handle */
device_destroy /* destroy */
};
@@ -223,6 +225,7 @@ static const struct object_ops inode_ops
NULL, /* satisfied */
no_signal, /* signal */
no_get_fd, /* get_fd */
+ NULL, /* lookup_name */
no_close_handle, /* close_handle */
inode_destroy /* destroy */
};
@@ -255,6 +258,7 @@ static const struct object_ops file_lock
no_satisfied, /* satisfied */
no_signal, /* signal */
no_get_fd, /* get_fd */
+ NULL, /* lookup_name */
no_close_handle, /* close_handle */
no_destroy /* destroy */
};
Index: server/file.c
===================================================================
RCS file: /home/wine/wine/server/file.c,v
retrieving revision 1.100
diff -u -p -r1.100 file.c
--- server/file.c 8 Aug 2005 15:11:03 -0000 1.100
+++ server/file.c 2 Nov 2005 18:20:32 -0000
@@ -77,6 +77,7 @@ static const struct object_ops file_ops
no_satisfied, /* satisfied */
no_signal, /* signal */
file_get_fd, /* get_fd */
+ NULL, /* lookup_name */
no_close_handle, /* close_handle */
file_destroy /* destroy */
};
Index: server/handle.c
===================================================================
RCS file: /home/wine/wine/server/handle.c,v
retrieving revision 1.41
diff -u -p -r1.41 handle.c
--- server/handle.c 29 Oct 2005 12:38:23 -0000 1.41
+++ server/handle.c 2 Nov 2005 18:20:32 -0000
@@ -108,6 +108,7 @@ static const struct object_ops handle_ta
NULL, /* satisfied */
no_signal, /* signal */
no_get_fd, /* get_fd */
+ NULL, /* lookup_name */
no_close_handle, /* close_handle */
handle_table_destroy /* destroy */
};
Index: server/hook.c
===================================================================
RCS file: /home/wine/wine/server/hook.c,v
retrieving revision 1.17
diff -u -p -r1.17 hook.c
--- server/hook.c 11 Jul 2005 18:05:50 -0000 1.17
+++ server/hook.c 2 Nov 2005 18:20:32 -0000
@@ -80,6 +80,7 @@ static const struct object_ops hook_tabl
NULL, /* satisfied */
no_signal, /* signal */
no_get_fd, /* get_fd */
+ NULL, /* lookup_name */
no_close_handle, /* close_handle */
hook_table_destroy /* destroy */
};
Index: server/mailslot.c
===================================================================
RCS file: /home/wine/wine/server/mailslot.c,v
retrieving revision 1.11
diff -u -p -r1.11 mailslot.c
--- server/mailslot.c 29 Oct 2005 12:38:23 -0000 1.11
+++ server/mailslot.c 2 Nov 2005 18:20:32 -0000
@@ -75,6 +75,7 @@ static const struct object_ops mailslot_
no_satisfied, /* satisfied */
no_signal, /* signal */
mailslot_get_fd, /* get_fd */
+ NULL, /* lookup_name */
no_close_handle, /* close_handle */
mailslot_destroy /* destroy */
};
@@ -115,6 +116,7 @@ static const struct object_ops mail_writ
NULL, /* satisfied */
no_signal, /* signal */
mail_writer_get_fd, /* get_fd */
+ NULL, /* lookup_name */
no_close_handle, /* close_handle */
mail_writer_destroy /* destroy */
};
Index: server/mapping.c
===================================================================
RCS file: /home/wine/wine/server/mapping.c,v
retrieving revision 1.59
diff -u -p -r1.59 mapping.c
--- server/mapping.c 31 Oct 2005 21:03:05 -0000 1.59
+++ server/mapping.c 2 Nov 2005 18:20:32 -0000
@@ -63,6 +63,7 @@ static const struct object_ops mapping_o
NULL, /* satisfied */
no_signal, /* signal */
mapping_get_fd, /* get_fd */
+ NULL, /* lookup_name */
no_close_handle, /* close_handle */
mapping_destroy /* destroy */
};
Index: server/mutex.c
===================================================================
RCS file: /home/wine/wine/server/mutex.c,v
retrieving revision 1.31
diff -u -p -r1.31 mutex.c
--- server/mutex.c 29 Oct 2005 12:38:23 -0000 1.31
+++ server/mutex.c 2 Nov 2005 18:20:32 -0000
@@ -57,6 +57,7 @@ static const struct object_ops mutex_ops
mutex_satisfied, /* satisfied */
mutex_signal, /* signal */
no_get_fd, /* get_fd */
+ NULL, /* lookup_name */
no_close_handle, /* close_handle */
mutex_destroy /* destroy */
};
Index: server/named_pipe.c
===================================================================
RCS file: /home/wine/wine/server/named_pipe.c,v
retrieving revision 1.52
diff -u -p -r1.52 named_pipe.c
--- server/named_pipe.c 2 Nov 2005 14:15:09 -0000 1.52
+++ server/named_pipe.c 2 Nov 2005 18:20:32 -0000
@@ -110,6 +110,7 @@ static const struct object_ops named_pip
NULL, /* satisfied */
no_signal, /* signal */
no_get_fd, /* get_fd */
+ NULL, /* lookup_name */
no_close_handle, /* close_handle */
named_pipe_destroy /* destroy */
};
@@ -131,6 +132,7 @@ static const struct object_ops pipe_serv
no_satisfied, /* satisfied */
no_signal, /* signal */
pipe_server_get_fd, /* get_fd */
+ NULL, /* lookup_name */
no_close_handle, /* close_handle */
pipe_server_destroy /* destroy */
};
@@ -162,6 +164,7 @@ static const struct object_ops pipe_clie
no_satisfied, /* satisfied */
no_signal, /* signal */
pipe_client_get_fd, /* get_fd */
+ NULL, /* lookup_name */
no_close_handle, /* close_handle */
pipe_client_destroy /* destroy */
};
Index: server/object.h
===================================================================
RCS file: /home/wine/wine/server/object.h,v
retrieving revision 1.68
diff -u -p -r1.68 object.h
--- server/object.h 1 Nov 2005 10:22:38 -0000 1.68
+++ server/object.h 2 Nov 2005 18:20:32 -0000
@@ -89,8 +89,10 @@ struct object_ops
int (*signal)(struct object *, unsigned int);
/* return an fd object that can be used to read/write from the object */
struct fd *(*get_fd)(struct object *);
+ /* lookup a name if an object has a namespace */
+ int (*lookup_name)(struct object *,WCHAR **,size_t *,unsigned int,struct object **);
/* close a handle to this object */
- int (*close_handle)(struct object *,struct process *,obj_handle_t);
+ int (*close_handle)(struct object *,struct process *,obj_handle_t);
/* destroy on refcount == 0 */
void (*destroy)(struct object *);
};
Index: server/process.c
===================================================================
RCS file: /home/wine/wine/server/process.c,v
retrieving revision 1.143
diff -u -p -r1.143 process.c
--- server/process.c 29 Oct 2005 12:38:23 -0000 1.143
+++ server/process.c 2 Nov 2005 18:20:32 -0000
@@ -70,6 +70,7 @@ static const struct object_ops process_o
no_satisfied, /* satisfied */
no_signal, /* signal */
no_get_fd, /* get_fd */
+ NULL, /* lookup_name */
no_close_handle, /* close_handle */
process_destroy /* destroy */
};
@@ -118,6 +119,7 @@ static const struct object_ops startup_i
no_satisfied, /* satisfied */
no_signal, /* signal */
no_get_fd, /* get_fd */
+ NULL, /* lookup_name */
no_close_handle, /* close_handle */
startup_info_destroy /* destroy */
};
Index: server/queue.c
===================================================================
RCS file: /home/wine/wine/server/queue.c,v
retrieving revision 1.70
diff -u -p -r1.70 queue.c
--- server/queue.c 13 Sep 2005 14:46:46 -0000 1.70
+++ server/queue.c 2 Nov 2005 18:20:32 -0000
@@ -150,6 +150,7 @@ static const struct object_ops msg_queue
msg_queue_satisfied, /* satisfied */
no_signal, /* signal */
no_get_fd, /* get_fd */
+ NULL, /* lookup_name */
no_close_handle, /* close_handle */
msg_queue_destroy /* destroy */
};
@@ -165,6 +166,7 @@ static const struct object_ops thread_in
NULL, /* satisfied */
no_signal, /* signal */
no_get_fd, /* get_fd */
+ NULL, /* lookup_name */
no_close_handle, /* close_handle */
thread_input_destroy /* destroy */
};
Index: server/registry.c
===================================================================
RCS file: /home/wine/wine/server/registry.c,v
retrieving revision 1.81
diff -u -p -r1.81 registry.c
--- server/registry.c 9 Aug 2005 10:37:50 -0000 1.81
+++ server/registry.c 2 Nov 2005 18:20:33 -0000
@@ -141,6 +141,7 @@ static const struct object_ops key_ops =
NULL, /* satisfied */
no_signal, /* signal */
no_get_fd, /* get_fd */
+ NULL, /* lookup_name */
key_close_handle, /* close_handle */
key_destroy /* destroy */
};
Index: server/request.c
===================================================================
RCS file: /home/wine/wine/server/request.c,v
retrieving revision 1.94
diff -u -p -r1.94 request.c
--- server/request.c 16 Sep 2005 18:52:47 -0000 1.94
+++ server/request.c 2 Nov 2005 18:20:33 -0000
@@ -95,6 +95,7 @@ static const struct object_ops master_so
NULL, /* satisfied */
no_signal, /* signal */
no_get_fd, /* get_fd */
+ NULL, /* lookup_name */
no_close_handle, /* close_handle */
master_socket_destroy /* destroy */
};
Index: server/semaphore.c
===================================================================
RCS file: /home/wine/wine/server/semaphore.c,v
retrieving revision 1.31
diff -u -p -r1.31 semaphore.c
--- server/semaphore.c 29 Oct 2005 12:38:23 -0000 1.31
+++ server/semaphore.c 2 Nov 2005 18:20:33 -0000
@@ -54,6 +54,7 @@ static const struct object_ops semaphore
semaphore_satisfied, /* satisfied */
semaphore_signal, /* signal */
no_get_fd, /* get_fd */
+ NULL, /* lookup_name */
no_close_handle, /* close_handle */
no_destroy /* destroy */
};
Index: server/serial.c
===================================================================
RCS file: /home/wine/wine/server/serial.c,v
retrieving revision 1.43
diff -u -p -r1.43 serial.c
--- server/serial.c 21 Jun 2005 09:46:15 -0000 1.43
+++ server/serial.c 2 Nov 2005 18:20:33 -0000
@@ -100,6 +100,7 @@ static const struct object_ops serial_op
no_satisfied, /* satisfied */
no_signal, /* signal */
serial_get_fd, /* get_fd */
+ NULL, /* lookup_name */
no_close_handle, /* close_handle */
serial_destroy /* destroy */
};
Index: server/signal.c
===================================================================
RCS file: /home/wine/wine/server/signal.c,v
retrieving revision 1.13
diff -u -p -r1.13 signal.c
--- server/signal.c 19 Aug 2005 14:01:43 -0000 1.13
+++ server/signal.c 2 Nov 2005 18:20:33 -0000
@@ -64,6 +64,7 @@ static const struct object_ops handler_o
NULL, /* satisfied */
no_signal, /* signal */
no_get_fd, /* get_fd */
+ NULL, /* lookup_name */
no_close_handle, /* close_handle */
handler_destroy /* destroy */
};
Index: server/snapshot.c
===================================================================
RCS file: /home/wine/wine/server/snapshot.c,v
retrieving revision 1.25
diff -u -p -r1.25 snapshot.c
--- server/snapshot.c 9 Jun 2005 15:39:52 -0000 1.25
+++ server/snapshot.c 2 Nov 2005 18:20:33 -0000
@@ -63,6 +63,7 @@ static const struct object_ops snapshot_
NULL, /* satisfied */
no_signal, /* signal */
no_get_fd, /* get_fd */
+ NULL, /* lookup_name */
no_close_handle, /* close_handle */
snapshot_destroy /* destroy */
};
Index: server/sock.c
===================================================================
RCS file: /home/wine/wine/server/sock.c,v
retrieving revision 1.58
diff -u -p -r1.58 sock.c
--- server/sock.c 9 Aug 2005 10:37:50 -0000 1.58
+++ server/sock.c 2 Nov 2005 18:20:33 -0000
@@ -108,6 +108,7 @@ static const struct object_ops sock_ops
no_satisfied, /* satisfied */
no_signal, /* signal */
sock_get_fd, /* get_fd */
+ NULL, /* lookup_name */
no_close_handle, /* close_handle */
sock_destroy /* destroy */
};
Index: server/thread.c
===================================================================
RCS file: /home/wine/wine/server/thread.c,v
retrieving revision 1.129
diff -u -p -r1.129 thread.c
--- server/thread.c 2 Nov 2005 14:12:13 -0000 1.129
+++ server/thread.c 2 Nov 2005 18:20:33 -0000
@@ -94,6 +94,7 @@ static const struct object_ops thread_op
no_satisfied, /* satisfied */
no_signal, /* signal */
no_get_fd, /* get_fd */
+ NULL, /* lookup_name */
no_close_handle, /* close_handle */
destroy_thread /* destroy */
};
Index: server/timer.c
===================================================================
RCS file: /home/wine/wine/server/timer.c,v
retrieving revision 1.30
diff -u -p -r1.30 timer.c
--- server/timer.c 29 Oct 2005 12:38:23 -0000 1.30
+++ server/timer.c 2 Nov 2005 18:20:33 -0000
@@ -62,6 +62,7 @@ static const struct object_ops timer_ops
timer_satisfied, /* satisfied */
no_signal, /* signal */
no_get_fd, /* get_fd */
+ NULL, /* lookup_name */
no_close_handle, /* close_handle */
timer_destroy /* destroy */
};
Index: server/token.c
===================================================================
RCS file: /home/wine/wine/server/token.c,v
retrieving revision 1.15
diff -u -p -r1.15 token.c
--- server/token.c 18 Jul 2005 13:22:55 -0000 1.15
+++ server/token.c 2 Nov 2005 18:20:33 -0000
@@ -114,6 +114,7 @@ static const struct object_ops token_ops
NULL, /* satisfied */
no_signal, /* signal */
no_get_fd, /* get_fd */
+ NULL, /* lookup_name */
no_close_handle, /* close_handle */
token_destroy /* destroy */
};
Index: server/winstation.c
===================================================================
RCS file: /home/wine/wine/server/winstation.c,v
retrieving revision 1.13
diff -u -p -r1.13 winstation.c
--- server/winstation.c 1 Nov 2005 10:22:38 -0000 1.13
+++ server/winstation.c 2 Nov 2005 18:20:33 -0000
@@ -58,6 +58,7 @@ static const struct object_ops winstatio
NULL, /* satisfied */
no_signal, /* signal */
no_get_fd, /* get_fd */
+ NULL, /* lookup_name */
winstation_close_handle, /* close_handle */
winstation_destroy /* destroy */
};
@@ -73,6 +74,7 @@ static const struct object_ops desktop_o
NULL, /* satisfied */
no_signal, /* signal */
no_get_fd, /* get_fd */
+ NULL, /* lookup_name */
desktop_close_handle, /* close_handle */
desktop_destroy /* destroy */
};
More information about the wine-patches
mailing list