/
staging-fix-24042019.mystagingrevert
1392 lines (1352 loc) · 63.2 KB
/
staging-fix-24042019.mystagingrevert
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff --git a/patches/server-Desktop_Refcount/0001-server-Introduce-a-new-alloc_handle-object-callback..patch b/patches/server-Desktop_Refcount/0001-server-Introduce-a-new-alloc_handle-object-callback..patch
index 7ce8205cf..4cc2c5abf 100644
--- a/patches/server-Desktop_Refcount/0001-server-Introduce-a-new-alloc_handle-object-callback..patch
+++ b/patches/server-Desktop_Refcount/0001-server-Introduce-a-new-alloc_handle-object-callback..patch
@@ -1,4 +1,4 @@
-From e5632cdae888ce1ed2274dc44d08eee6d2e9603e Mon Sep 17 00:00:00 2001
+From a0cf4045fe4ac3e3d561824da30fc7998097f97b Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Fri, 4 Dec 2015 10:36:47 +0100
Subject: [PATCH] server: Introduce a new alloc_handle object callback. (v2)
@@ -283,13 +283,13 @@ index 2a38780..e628cdb 100644
no_destroy /* destroy */
};
diff --git a/server/file.c b/server/file.c
-index 224ab7d..ca9a368 100644
+index 3ce7307..fa96ca7 100644
--- a/server/file.c
+++ b/server/file.c
-@@ -96,6 +96,7 @@ static const struct object_ops file_ops =
+@@ -98,6 +98,7 @@ static const struct object_ops file_ops =
NULL, /* unlink_name */
file_open_file, /* open_file */
- no_kernel_obj_list, /* get_kernel_obj_list */
+ file_get_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
fd_close_handle, /* close_handle */
file_destroy /* destroy */
@@ -625,7 +625,7 @@ index 7d0d742..2ad9d5d 100644
snapshot_destroy /* destroy */
};
diff --git a/server/sock.c b/server/sock.c
-index 4a10aac..f951f23 100644
+index ac83081..d373768 100644
--- a/server/sock.c
+++ b/server/sock.c
@@ -156,6 +156,7 @@ static const struct object_ops sock_ops =
From 4e7071e4f14f6ce85b0eb4b88accfb0267d6545b Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Tue, 23 Apr 2019 15:54:22 +1000
Subject: [PATCH] Updated server-Desktop_Refcount patchset
---
patches/patchinstall.sh | 39 ++
...-a-new-alloc_handle-object-callback..patch | 405 +++++++++---------
...-desktop-handle-count-more-correctly.patch | 40 +-
...ndom-name-when-no-name-was-passed-to.patch | 14 +-
patches/server-Desktop_Refcount/definition | 2 +-
...rt-for-TF_REUSE_SOCKET-to-TransmitFi.patch | 38 +-
patches/ws2_32-TransmitFile/definition | 2 +-
...ACleanup-implementation-using-winese.patch | 2 +-
8 files changed, 297 insertions(+), 245 deletions(-)
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index 314570436..660cdadc9 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -247,6 +247,7 @@ patch_enable_all ()
enable_quartz_Silence_FIXMEs="$1"
enable_riched20_Class_Tests="$1"
enable_riched20_IText_Interface="$1"
+ enable_server_Desktop_Refcount="$1"
enable_server_FileEndOfFileInformation="$1"
enable_server_File_Permissions="$1"
enable_server_Inherited_ACLs="$1"
@@ -878,6 +879,9 @@ patch_enable ()
riched20-IText_Interface)
enable_riched20_IText_Interface="$2"
;;
+ server-Desktop_Refcount)
+ enable_server_Desktop_Refcount="$2"
+ ;;
server-FileEndOfFileInformation)
enable_server_FileEndOfFileInformation="$2"
;;
@@ -1653,6 +1657,13 @@ if test "$enable_xaudio2_7_CreateFX_FXEcho" -eq 1; then
enable_xaudio2_revert=1
fi
+if test "$enable_ws2_32_TransmitFile" -eq 1; then
+ if test "$enable_server_Desktop_Refcount" -gt 1; then
+ abort "Patchset server-Desktop_Refcount disabled, but ws2_32-TransmitFile depends on that."
+ fi
+ enable_server_Desktop_Refcount=1
+fi
+
if test "$enable_winex11_WM_WINDOWPOSCHANGING" -eq 1; then
if test "$enable_winex11__NET_ACTIVE_WINDOW" -gt 1; then
abort "Patchset winex11-_NET_ACTIVE_WINDOW disabled, but winex11-WM_WINDOWPOSCHANGING depends on that."
@@ -5475,6 +5486,31 @@ if test "$enable_riched20_IText_Interface" -eq 1; then
) >> "$patchlist"
fi
+# Patchset server-Desktop_Refcount
+# |
+# | This patchset fixes the following Wine bugs:
+# | * [#46967] GOG Galaxy doesn't run in virtual desktop.
+# |
+# | Modified files:
+# | * dlls/user32/tests/winstation.c, include/wine/server_protocol.h, programs/explorer/desktop.c, server/async.c,
+# | server/atom.c, server/change.c, server/clipboard.c, server/completion.c, server/console.c, server/debugger.c,
+# | server/device.c, server/directory.c, server/event.c, server/fd.c, server/file.c, server/handle.c, server/handle.h,
+# | server/hook.c, server/mailslot.c, server/mapping.c, server/mutex.c, server/named_pipe.c, server/object.c,
+# | server/object.h, server/process.c, server/queue.c, server/registry.c, server/request.c, server/semaphore.c,
+# | server/serial.c, server/signal.c, server/snapshot.c, server/sock.c, server/symlink.c, server/thread.c, server/timer.c,
+# | server/token.c, server/winstation.c
+# |
+if test "$enable_server_Desktop_Refcount" -eq 1; then
+ patch_apply server-Desktop_Refcount/0001-server-Introduce-a-new-alloc_handle-object-callback..patch
+ patch_apply server-Desktop_Refcount/0002-server-Track-desktop-handle-count-more-correctly.patch
+ patch_apply server-Desktop_Refcount/0004-server-Assign-random-name-when-no-name-was-passed-to.patch
+ (
+ printf '%s\n' '+ { "Sebastian Lackner", "server: Introduce a new alloc_handle object callback.", 2 },';
+ printf '%s\n' '+ { "Sebastian Lackner", "server: Track desktop handle count more correctly.", 1 },';
+ printf '%s\n' '+ { "Sebastian Lackner", "server: Assign random name when no name was passed to create_winstation.", 1 },';
+ ) >> "$patchlist"
+fi
+
# Patchset server-FileEndOfFileInformation
# |
# | Modified files:
@@ -7396,6 +7432,9 @@ fi
# Patchset ws2_32-TransmitFile
# |
+# | This patchset has the following (direct or indirect) dependencies:
+# | * server-Desktop_Refcount
+# |
# | Modified files:
# | * dlls/ws2_32/socket.c, dlls/ws2_32/tests/sock.c, include/winsock.h, server/protocol.def, server/sock.c
# |
diff --git a/patches/server-Desktop_Refcount/0001-server-Introduce-a-new-alloc_handle-object-callback..patch b/patches/server-Desktop_Refcount/0001-server-Introduce-a-new-alloc_handle-object-callback..patch
index 845e02661..7ce8205cf 100644
--- a/patches/server-Desktop_Refcount/0001-server-Introduce-a-new-alloc_handle-object-callback..patch
+++ b/patches/server-Desktop_Refcount/0001-server-Introduce-a-new-alloc_handle-object-callback..patch
@@ -1,299 +1,312 @@
-From a38788ceb03df268149adad0c74b300220003eca Mon Sep 17 00:00:00 2001
+From e5632cdae888ce1ed2274dc44d08eee6d2e9603e Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Fri, 4 Dec 2015 10:36:47 +0100
Subject: [PATCH] server: Introduce a new alloc_handle object callback. (v2)
Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
---
- server/async.c | 2 ++
- server/atom.c | 1 +
- server/change.c | 1 +
- server/clipboard.c | 1 +
- server/completion.c | 1 +
- server/console.c | 3 +++
- server/debugger.c | 2 ++
- server/device.c | 4 ++++
- server/directory.c | 2 ++
- server/event.c | 2 ++
- server/fd.c | 4 ++++
- server/file.c | 1 +
- server/handle.c | 13 +++++++++++--
- server/hook.c | 1 +
- server/mailslot.c | 3 +++
- server/mapping.c | 3 +++
- server/mutex.c | 1 +
- server/named_pipe.c | 7 ++++++-
- server/object.c | 4 ++++
- server/object.h | 5 ++++-
- server/process.c | 3 +++
- server/queue.c | 2 ++
- server/registry.c | 1 +
- server/request.c | 1 +
- server/semaphore.c | 1 +
- server/serial.c | 1 +
- server/signal.c | 1 +
- server/snapshot.c | 1 +
- server/sock.c | 2 ++
- server/symlink.c | 1 +
- server/thread.c | 2 ++
- server/timer.c | 1 +
- server/token.c | 1 +
- server/winstation.c | 2 ++
- 34 files changed, 77 insertions(+), 4 deletions(-)
+ include/wine/server_protocol.h | 2 +-
+ server/async.c | 2 ++
+ server/atom.c | 1 +
+ server/change.c | 1 +
+ server/clipboard.c | 1 +
+ server/completion.c | 1 +
+ server/console.c | 3 +++
+ server/debugger.c | 2 ++
+ server/device.c | 4 ++++
+ server/directory.c | 2 ++
+ server/event.c | 2 ++
+ server/fd.c | 4 ++++
+ server/file.c | 1 +
+ server/handle.c | 13 +++++++++++--
+ server/hook.c | 1 +
+ server/mailslot.c | 3 +++
+ server/mapping.c | 3 +++
+ server/mutex.c | 1 +
+ server/named_pipe.c | 7 ++++++-
+ server/object.c | 4 ++++
+ server/object.h | 5 ++++-
+ server/process.c | 3 +++
+ server/queue.c | 2 ++
+ server/registry.c | 1 +
+ server/request.c | 1 +
+ server/semaphore.c | 1 +
+ server/serial.c | 1 +
+ server/signal.c | 1 +
+ server/snapshot.c | 1 +
+ server/sock.c | 2 ++
+ server/symlink.c | 1 +
+ server/thread.c | 2 ++
+ server/timer.c | 1 +
+ server/token.c | 1 +
+ server/winstation.c | 2 ++
+ 35 files changed, 78 insertions(+), 5 deletions(-)
+diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h
+index 9e26aa4..973f6df 100644
+--- a/include/wine/server_protocol.h
++++ b/include/wine/server_protocol.h
+@@ -6677,6 +6677,6 @@ union generic_reply
+ struct resume_process_reply resume_process_reply;
+ };
+
+-#define SERVER_PROTOCOL_VERSION 579
++#define SERVER_PROTOCOL_VERSION 580
+
+ #endif /* __WINE_WINE_SERVER_PROTOCOL_H */
diff --git a/server/async.c b/server/async.c
-index cadeda3..aab4085 100644
+index 75989e5..b5aff66 100644
--- a/server/async.c
+++ b/server/async.c
-@@ -79,6 +79,7 @@ static const struct object_ops async_ops =
- no_link_name, /* link_name */
+@@ -81,6 +81,7 @@ static const struct object_ops async_ops =
NULL, /* unlink_name */
no_open_file, /* open_file */
+ no_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
no_close_handle, /* close_handle */
async_destroy /* destroy */
};
-@@ -467,6 +468,7 @@ static const struct object_ops iosb_ops =
- no_link_name, /* link_name */
+@@ -471,6 +472,7 @@ static const struct object_ops iosb_ops =
NULL, /* unlink_name */
no_open_file, /* open_file */
+ no_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
no_close_handle, /* close_handle */
iosb_destroy /* destroy */
};
diff --git a/server/atom.c b/server/atom.c
-index 3ff7540..7bebf13 100644
+index 11b7ac5..e27b6f4 100644
--- a/server/atom.c
+++ b/server/atom.c
-@@ -90,6 +90,7 @@ static const struct object_ops atom_table_ops =
- no_link_name, /* link_name */
+@@ -92,6 +92,7 @@ static const struct object_ops atom_table_ops =
NULL, /* unlink_name */
no_open_file, /* open_file */
+ no_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
no_close_handle, /* close_handle */
atom_table_destroy /* destroy */
};
diff --git a/server/change.c b/server/change.c
-index d00a885..a4ed5df 100644
+index 2be6a83..dee48ce 100644
--- a/server/change.c
+++ b/server/change.c
-@@ -172,6 +172,7 @@ static const struct object_ops dir_ops =
- no_link_name, /* link_name */
+@@ -127,6 +127,7 @@ static const struct object_ops dir_ops =
NULL, /* unlink_name */
no_open_file, /* open_file */
+ no_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
dir_close_handle, /* close_handle */
dir_destroy /* destroy */
};
diff --git a/server/clipboard.c b/server/clipboard.c
-index 162725b..0898150 100644
+index 673aabb..5888754 100644
--- a/server/clipboard.c
+++ b/server/clipboard.c
-@@ -87,6 +87,7 @@ static const struct object_ops clipboard_ops =
- no_link_name, /* link_name */
+@@ -89,6 +89,7 @@ static const struct object_ops clipboard_ops =
NULL, /* unlink_name */
no_open_file, /* open_file */
+ no_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
no_close_handle, /* close_handle */
clipboard_destroy /* destroy */
};
diff --git a/server/completion.c b/server/completion.c
-index 8b8983a..72dbc5b 100644
+index 1a074c8..c0d2ccf 100644
--- a/server/completion.c
+++ b/server/completion.c
-@@ -75,6 +75,7 @@ static const struct object_ops completion_ops =
- directory_link_name, /* link_name */
+@@ -77,6 +77,7 @@ static const struct object_ops completion_ops =
default_unlink_name, /* unlink_name */
no_open_file, /* open_file */
+ no_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
no_close_handle, /* close_handle */
completion_destroy /* destroy */
};
diff --git a/server/console.c b/server/console.c
-index e1ae086..d9c60f9 100644
+index c322708..f437e74 100644
--- a/server/console.c
+++ b/server/console.c
-@@ -87,6 +87,7 @@ static const struct object_ops console_input_ops =
- no_link_name, /* link_name */
+@@ -90,6 +90,7 @@ static const struct object_ops console_input_ops =
NULL, /* unlink_name */
no_open_file, /* open_file */
+ no_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
no_close_handle, /* close_handle */
console_input_destroy /* destroy */
};
-@@ -121,6 +122,7 @@ static const struct object_ops console_input_events_ops =
- no_link_name, /* link_name */
+@@ -128,6 +129,7 @@ static const struct object_ops console_input_events_ops =
NULL, /* unlink_name */
no_open_file, /* open_file */
+ no_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
no_close_handle, /* close_handle */
console_input_events_destroy /* destroy */
};
-@@ -177,6 +179,7 @@ static const struct object_ops screen_buffer_ops =
- no_link_name, /* link_name */
+@@ -186,6 +188,7 @@ static const struct object_ops screen_buffer_ops =
NULL, /* unlink_name */
no_open_file, /* open_file */
+ no_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
no_close_handle, /* close_handle */
screen_buffer_destroy /* destroy */
};
diff --git a/server/debugger.c b/server/debugger.c
-index 79b7e52..d658fc0 100644
+index 9a29ef4..1c68ee0 100644
--- a/server/debugger.c
+++ b/server/debugger.c
-@@ -84,6 +84,7 @@ static const struct object_ops debug_event_ops =
- no_link_name, /* link_name */
+@@ -86,6 +86,7 @@ static const struct object_ops debug_event_ops =
NULL, /* unlink_name */
no_open_file, /* open_file */
+ no_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
no_close_handle, /* close_handle */
debug_event_destroy /* destroy */
};
-@@ -110,6 +111,7 @@ static const struct object_ops debug_ctx_ops =
- no_link_name, /* link_name */
+@@ -114,6 +115,7 @@ static const struct object_ops debug_ctx_ops =
NULL, /* unlink_name */
no_open_file, /* open_file */
+ no_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
no_close_handle, /* close_handle */
debug_ctx_destroy /* destroy */
};
diff --git a/server/device.c b/server/device.c
-index ac7d88f..55e6c7d 100644
+index 8340cb1..6573bd4 100644
--- a/server/device.c
+++ b/server/device.c
-@@ -75,6 +75,7 @@ static const struct object_ops irp_call_ops =
- no_link_name, /* link_name */
+@@ -79,6 +79,7 @@ static const struct object_ops irp_call_ops =
NULL, /* unlink_name */
no_open_file, /* open_file */
+ no_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
no_close_handle, /* close_handle */
irp_call_destroy /* destroy */
};
-@@ -111,6 +112,7 @@ static const struct object_ops device_manager_ops =
- no_link_name, /* link_name */
+@@ -120,6 +121,7 @@ static const struct object_ops device_manager_ops =
NULL, /* unlink_name */
no_open_file, /* open_file */
+ no_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
no_close_handle, /* close_handle */
device_manager_destroy /* destroy */
};
-@@ -152,6 +154,7 @@ static const struct object_ops device_ops =
- directory_link_name, /* link_name */
+@@ -164,6 +166,7 @@ static const struct object_ops device_ops =
default_unlink_name, /* unlink_name */
device_open_file, /* open_file */
+ device_get_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
no_close_handle, /* close_handle */
device_destroy /* destroy */
};
-@@ -197,6 +200,7 @@ static const struct object_ops device_file_ops =
- no_link_name, /* link_name */
+@@ -211,6 +214,7 @@ static const struct object_ops device_file_ops =
NULL, /* unlink_name */
no_open_file, /* open_file */
+ no_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
device_file_close_handle, /* close_handle */
device_file_destroy /* destroy */
};
diff --git a/server/directory.c b/server/directory.c
-index 6aa3a55..699eb70f 100644
+index 55cbad3..1ab0c73 100644
--- a/server/directory.c
+++ b/server/directory.c
-@@ -67,6 +67,7 @@ static const struct object_ops object_type_ops =
- directory_link_name, /* link_name */
+@@ -69,6 +69,7 @@ static const struct object_ops object_type_ops =
default_unlink_name, /* unlink_name */
no_open_file, /* open_file */
+ no_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
no_close_handle, /* close_handle */
no_destroy /* destroy */
};
-@@ -102,6 +103,7 @@ static const struct object_ops directory_ops =
- directory_link_name, /* link_name */
+@@ -106,6 +107,7 @@ static const struct object_ops directory_ops =
default_unlink_name, /* unlink_name */
no_open_file, /* open_file */
+ no_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
no_close_handle, /* close_handle */
directory_destroy /* destroy */
};
diff --git a/server/event.c b/server/event.c
-index cfc0f6a..608fafb 100644
+index 79287e7..ad8fddb 100644
--- a/server/event.c
+++ b/server/event.c
-@@ -68,6 +68,7 @@ static const struct object_ops event_ops =
- directory_link_name, /* link_name */
+@@ -76,6 +76,7 @@ static const struct object_ops event_ops =
default_unlink_name, /* unlink_name */
no_open_file, /* open_file */
+ event_get_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
no_close_handle, /* close_handle */
- no_destroy /* destroy */
+ event_destroy /* destroy */
};
-@@ -101,6 +102,7 @@ static const struct object_ops keyed_event_ops =
- directory_link_name, /* link_name */
+@@ -111,6 +112,7 @@ static const struct object_ops keyed_event_ops =
default_unlink_name, /* unlink_name */
no_open_file, /* open_file */
+ no_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
no_close_handle, /* close_handle */
no_destroy /* destroy */
};
diff --git a/server/fd.c b/server/fd.c
-index 119fae6..5dcd382 100644
+index 2a38780..e628cdb 100644
--- a/server/fd.c
+++ b/server/fd.c
-@@ -218,6 +218,7 @@ static const struct object_ops fd_ops =
- no_link_name, /* link_name */
+@@ -222,6 +222,7 @@ static const struct object_ops fd_ops =
NULL, /* unlink_name */
no_open_file, /* open_file */
+ no_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
no_close_handle, /* close_handle */
fd_destroy /* destroy */
};
-@@ -257,6 +258,7 @@ static const struct object_ops device_ops =
- no_link_name, /* link_name */
+@@ -263,6 +264,7 @@ static const struct object_ops device_ops =
NULL, /* unlink_name */
no_open_file, /* open_file */
+ no_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
no_close_handle, /* close_handle */
device_destroy /* destroy */
};
-@@ -295,6 +297,7 @@ static const struct object_ops inode_ops =
- no_link_name, /* link_name */
+@@ -303,6 +305,7 @@ static const struct object_ops inode_ops =
NULL, /* unlink_name */
no_open_file, /* open_file */
+ no_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
no_close_handle, /* close_handle */
inode_destroy /* destroy */
};
-@@ -335,6 +338,7 @@ static const struct object_ops file_lock_ops =
- no_link_name, /* link_name */
+@@ -345,6 +348,7 @@ static const struct object_ops file_lock_ops =
NULL, /* unlink_name */
no_open_file, /* open_file */
+ no_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
no_close_handle, /* close_handle */
no_destroy /* destroy */
};
diff --git a/server/file.c b/server/file.c
-index 8d39f30..2d9134c 100644
+index 224ab7d..ca9a368 100644
--- a/server/file.c
+++ b/server/file.c
-@@ -95,6 +95,7 @@ static const struct object_ops file_ops =
- no_link_name, /* link_name */
+@@ -96,6 +96,7 @@ static const struct object_ops file_ops =
NULL, /* unlink_name */
file_open_file, /* open_file */
+ no_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
fd_close_handle, /* close_handle */
file_destroy /* destroy */
};
diff --git a/server/handle.c b/server/handle.c
-index 35ab860..782baef 100644
+index 6ca4489..879098a 100644
--- a/server/handle.c
+++ b/server/handle.c
-@@ -133,6 +133,7 @@ static const struct object_ops handle_table_ops =
- no_link_name, /* link_name */
+@@ -135,6 +135,7 @@ static const struct object_ops handle_table_ops =
NULL, /* unlink_name */
no_open_file, /* open_file */
+ no_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
no_close_handle, /* close_handle */
handle_table_destroy /* destroy */
};
-@@ -232,7 +233,7 @@ static int grow_handle_table( struct handle_table *table )
+@@ -234,7 +235,7 @@ static int grow_handle_table( struct handle_table *table )
}
/* allocate the first free entry in the handle table */
@@ -302,7 +315,7 @@ index 35ab860..782baef 100644
{
struct handle_entry *entry = table->entries + table->free;
int i;
-@@ -248,6 +249,10 @@ static obj_handle_t alloc_entry( struct handle_table *table, void *obj, unsigned
+@@ -250,6 +251,10 @@ static obj_handle_t alloc_entry( struct handle_table *table, void *obj, unsigned
table->free = i + 1;
entry->ptr = grab_object_for_handle( obj );
entry->access = access;
@@ -313,7 +326,7 @@ index 35ab860..782baef 100644
return index_to_handle(i);
}
-@@ -373,7 +378,11 @@ struct handle_table *copy_handle_table( struct process *process, struct process
+@@ -375,7 +380,11 @@ struct handle_table *copy_handle_table( struct process *process, struct process
for (i = 0; i <= table->last; i++, ptr++)
{
if (!ptr->ptr) continue;
@@ -327,136 +340,136 @@ index 35ab860..782baef 100644
}
}
diff --git a/server/hook.c b/server/hook.c
-index 3a0e4b4..dc653b8 100644
+index f5d7639..22b1482 100644
--- a/server/hook.c
+++ b/server/hook.c
-@@ -91,6 +91,7 @@ static const struct object_ops hook_table_ops =
- no_link_name, /* link_name */
+@@ -93,6 +93,7 @@ static const struct object_ops hook_table_ops =
NULL, /* unlink_name */
no_open_file, /* open_file */
+ no_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
no_close_handle, /* close_handle */
hook_table_destroy /* destroy */
};
diff --git a/server/mailslot.c b/server/mailslot.c
-index 95308c4..bc9089b 100644
+index fc1caa9..57d0775 100644
--- a/server/mailslot.c
+++ b/server/mailslot.c
-@@ -89,6 +89,7 @@ static const struct object_ops mailslot_ops =
- mailslot_link_name, /* link_name */
+@@ -91,6 +91,7 @@ static const struct object_ops mailslot_ops =
default_unlink_name, /* unlink_name */
mailslot_open_file, /* open_file */
+ no_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
fd_close_handle, /* close_handle */
mailslot_destroy /* destroy */
};
-@@ -145,6 +146,7 @@ static const struct object_ops mail_writer_ops =
- no_link_name, /* link_name */
+@@ -149,6 +150,7 @@ static const struct object_ops mail_writer_ops =
NULL, /* unlink_name */
no_open_file, /* open_file */
+ no_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
fd_close_handle, /* close_handle */
mail_writer_destroy /* destroy */
};
-@@ -202,6 +204,7 @@ static const struct object_ops mailslot_device_ops =
- directory_link_name, /* link_name */
+@@ -208,6 +210,7 @@ static const struct object_ops mailslot_device_ops =
default_unlink_name, /* unlink_name */
mailslot_device_open_file, /* open_file */
+ no_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
fd_close_handle, /* close_handle */
mailslot_device_destroy /* destroy */
};
diff --git a/server/mapping.c b/server/mapping.c
-index bc59b21..ca803a4 100644
+index 1b3df08..819181a 100644
--- a/server/mapping.c
+++ b/server/mapping.c
-@@ -77,6 +77,7 @@ static const struct object_ops ranges_ops =
- no_link_name, /* link_name */
+@@ -103,6 +103,7 @@ static const struct object_ops ranges_ops =
NULL, /* unlink_name */
no_open_file, /* open_file */
+ no_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
no_close_handle, /* close_handle */
ranges_destroy /* destroy */
};
-@@ -111,6 +112,7 @@ static const struct object_ops shared_map_ops =
- no_link_name, /* link_name */
+@@ -139,6 +140,7 @@ static const struct object_ops shared_map_ops =
NULL, /* unlink_name */
no_open_file, /* open_file */
+ no_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
no_close_handle, /* close_handle */
shared_map_destroy /* destroy */
};
-@@ -166,6 +168,7 @@ static const struct object_ops mapping_ops =
- directory_link_name, /* link_name */
+@@ -196,6 +198,7 @@ static const struct object_ops mapping_ops =
default_unlink_name, /* unlink_name */
no_open_file, /* open_file */
+ no_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
fd_close_handle, /* close_handle */
mapping_destroy /* destroy */
};
diff --git a/server/mutex.c b/server/mutex.c
-index d1887e4..a2a0a24 100644
+index f5f969b..a4ab6bd 100644
--- a/server/mutex.c
+++ b/server/mutex.c
-@@ -71,6 +71,7 @@ static const struct object_ops mutex_ops =
- directory_link_name, /* link_name */
+@@ -73,6 +73,7 @@ static const struct object_ops mutex_ops =
default_unlink_name, /* unlink_name */
no_open_file, /* open_file */
+ no_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
no_close_handle, /* close_handle */
mutex_destroy /* destroy */
};
diff --git a/server/named_pipe.c b/server/named_pipe.c
-index 19a5426..8bb2283 100644
+index ceb9894..6892081 100644
--- a/server/named_pipe.c
+++ b/server/named_pipe.c
-@@ -134,6 +134,7 @@ static const struct object_ops named_pipe_ops =
- named_pipe_link_name, /* link_name */
+@@ -130,6 +130,7 @@ static const struct object_ops named_pipe_ops =
default_unlink_name, /* unlink_name */
named_pipe_open_file, /* open_file */
+ no_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
no_close_handle, /* close_handle */
named_pipe_destroy /* destroy */
};
-@@ -176,6 +177,7 @@ static const struct object_ops pipe_server_ops =
- no_link_name, /* link_name */
+@@ -173,6 +174,7 @@ static const struct object_ops pipe_server_ops =
NULL, /* unlink_name */
no_open_file, /* open_file */
+ no_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
fd_close_handle, /* close_handle */
pipe_server_destroy /* destroy */
};
-@@ -217,6 +219,7 @@ static const struct object_ops pipe_client_ops =
- no_link_name, /* link_name */
+@@ -216,6 +218,7 @@ static const struct object_ops pipe_client_ops =
NULL, /* unlink_name */
no_open_file, /* open_file */
+ no_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
fd_close_handle, /* close_handle */
pipe_end_destroy /* destroy */
};
-@@ -262,7 +265,8 @@ static const struct object_ops named_pipe_device_ops =
- directory_link_name, /* link_name */
+@@ -263,7 +266,8 @@ static const struct object_ops named_pipe_device_ops =
default_unlink_name, /* unlink_name */
named_pipe_device_open_file, /* open_file */
+ no_kernel_obj_list, /* get_kernel_obj_list */
- no_close_handle, /* close_handle */
+ no_alloc_handle, /* alloc_handle */
+ fd_close_handle, /* close_handle */
named_pipe_device_destroy /* destroy */
};
-@@ -290,6 +294,7 @@ static const struct object_ops named_pipe_device_file_ops =
- no_link_name, /* link_name */
+@@ -293,6 +297,7 @@ static const struct object_ops named_pipe_device_file_ops =
NULL, /* unlink_name */
no_open_file, /* open_file */
+ no_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
fd_close_handle, /* close_handle */
named_pipe_device_file_destroy /* destroy */
};
diff --git a/server/object.c b/server/object.c
-index 4455718..14cd38e 100644
+index 048da50..fbac8f7 100644
--- a/server/object.c
+++ b/server/object.c
-@@ -692,6 +692,10 @@ struct object *no_open_file( struct object *obj, unsigned int access, unsigned i
+@@ -693,6 +693,10 @@ struct object *no_open_file( struct object *obj, unsigned int access, unsigned i
return NULL;
}
@@ -468,13 +481,13 @@ index 4455718..14cd38e 100644
{
return 1; /* ok to close */
diff --git a/server/object.h b/server/object.h
-index b5c50e1..72ad852 100644
+index ca5a191..d913e65 100644
--- a/server/object.h
+++ b/server/object.h
-@@ -89,8 +89,10 @@ struct object_ops
- /* open a file object to access this object */
- struct object *(*open_file)(struct object *, unsigned int access, unsigned int sharing,
+@@ -93,8 +93,10 @@ struct object_ops
unsigned int options);
+ /* return list of kernel objects */
+ struct list *(*get_kernel_obj_list)(struct object *);
+ /* allocate a handle to this object */
+ void (*alloc_handle)(struct object *, struct process *, obj_handle_t);
/* close a handle to this object */
@@ -483,226 +496,226 @@ index b5c50e1..72ad852 100644
/* destroy on refcount == 0 */
void (*destroy)(struct object *);
};
-@@ -163,6 +165,7 @@ extern int no_link_name( struct object *obj, struct object_name *name, struct ob
- extern void default_unlink_name( struct object *obj, struct object_name *name );
+@@ -169,6 +171,7 @@ extern void default_unlink_name( struct object *obj, struct object_name *name );
extern struct object *no_open_file( struct object *obj, unsigned int access, unsigned int sharing,
unsigned int options );
+ extern struct list *no_kernel_obj_list( struct object *obj );
+extern void no_alloc_handle( struct object *obj, struct process *process, obj_handle_t handle );
extern int no_close_handle( struct object *obj, struct process *process, obj_handle_t handle );
extern void no_destroy( struct object *obj );
#ifdef DEBUG_OBJECTS
diff --git a/server/process.c b/server/process.c
-index 3bd545a..5274dc3 100644
+index f0b44a8..c059d19 100644
--- a/server/process.c
+++ b/server/process.c
-@@ -84,6 +84,7 @@ static const struct object_ops process_ops =
- no_link_name, /* link_name */
+@@ -91,6 +91,7 @@ static const struct object_ops process_ops =
NULL, /* unlink_name */
no_open_file, /* open_file */
+ process_get_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
no_close_handle, /* close_handle */
process_destroy /* destroy */
};
-@@ -133,6 +134,7 @@ static const struct object_ops startup_info_ops =
- no_link_name, /* link_name */
+@@ -142,6 +143,7 @@ static const struct object_ops startup_info_ops =
NULL, /* unlink_name */
no_open_file, /* open_file */
+ no_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
no_close_handle, /* close_handle */
startup_info_destroy /* destroy */
};
-@@ -176,6 +178,7 @@ static const struct object_ops job_ops =
- directory_link_name, /* link_name */
+@@ -187,6 +189,7 @@ static const struct object_ops job_ops =
default_unlink_name, /* unlink_name */
no_open_file, /* open_file */
+ no_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
job_close_handle, /* close_handle */
job_destroy /* destroy */
};
diff --git a/server/queue.c b/server/queue.c
-index f274dfb..ca9d677 100644
+index 56fa4d9..b5d0677 100644
--- a/server/queue.c
+++ b/server/queue.c
-@@ -181,6 +181,7 @@ static const struct object_ops msg_queue_ops =
- no_link_name, /* link_name */
+@@ -194,6 +194,7 @@ static const struct object_ops msg_queue_ops =
NULL, /* unlink_name */
no_open_file, /* open_file */
+ no_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
no_close_handle, /* close_handle */
msg_queue_destroy /* destroy */
};
-@@ -216,6 +217,7 @@ static const struct object_ops thread_input_ops =
- no_link_name, /* link_name */
+@@ -231,6 +232,7 @@ static const struct object_ops thread_input_ops =
NULL, /* unlink_name */
no_open_file, /* open_file */
+ no_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
no_close_handle, /* close_handle */
thread_input_destroy /* destroy */
};
diff --git a/server/registry.c b/server/registry.c
-index 9e6815d..21a6be5 100644
+index 1757fd3..e56134e 100644
--- a/server/registry.c
+++ b/server/registry.c
-@@ -170,6 +170,7 @@ static const struct object_ops key_ops =
- no_link_name, /* link_name */
+@@ -172,6 +172,7 @@ static const struct object_ops key_ops =
NULL, /* unlink_name */
no_open_file, /* open_file */
+ no_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
key_close_handle, /* close_handle */
key_destroy /* destroy */
};
diff --git a/server/request.c b/server/request.c
-index c10c4e6..4d0e673 100644
+index 73878cf..f089ccc 100644
--- a/server/request.c
+++ b/server/request.c
-@@ -107,6 +107,7 @@ static const struct object_ops master_socket_ops =
- no_link_name, /* link_name */
+@@ -109,6 +109,7 @@ static const struct object_ops master_socket_ops =
NULL, /* unlink_name */
no_open_file, /* open_file */
+ no_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
no_close_handle, /* close_handle */
master_socket_destroy /* destroy */
};
diff --git a/server/semaphore.c b/server/semaphore.c
-index 08ff153..15e7392 100644
+index 36e3e79..1913871 100644
--- a/server/semaphore.c
+++ b/server/semaphore.c
-@@ -68,6 +68,7 @@ static const struct object_ops semaphore_ops =
- directory_link_name, /* link_name */
+@@ -70,6 +70,7 @@ static const struct object_ops semaphore_ops =
default_unlink_name, /* unlink_name */
no_open_file, /* open_file */
+ no_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
no_close_handle, /* close_handle */
no_destroy /* destroy */
};
diff --git a/server/serial.c b/server/serial.c
-index f0adf92..1722149 100644
+index 2848e1d..966b8bc 100644
--- a/server/serial.c
+++ b/server/serial.c
-@@ -102,6 +102,7 @@ static const struct object_ops serial_ops =
- no_link_name, /* link_name */
+@@ -104,6 +104,7 @@ static const struct object_ops serial_ops =
NULL, /* unlink_name */
no_open_file, /* open_file */
+ no_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
fd_close_handle, /* close_handle */
serial_destroy /* destroy */
};
diff --git a/server/signal.c b/server/signal.c
-index 74416fa..4b2b8c4 100644
+index ca20039..a2e0efe 100644
--- a/server/signal.c
+++ b/server/signal.c
-@@ -77,6 +77,7 @@ static const struct object_ops handler_ops =
- no_link_name, /* link_name */
+@@ -79,6 +79,7 @@ static const struct object_ops handler_ops =
NULL, /* unlink_name */
no_open_file, /* open_file */
+ no_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
no_close_handle, /* close_handle */
handler_destroy /* destroy */
};
diff --git a/server/snapshot.c b/server/snapshot.c
-index e35588a..6e788ab 100644
+index 7d0d742..2ad9d5d 100644
--- a/server/snapshot.c
+++ b/server/snapshot.c
-@@ -71,6 +71,7 @@ static const struct object_ops snapshot_ops =
- no_link_name, /* link_name */
+@@ -73,6 +73,7 @@ static const struct object_ops snapshot_ops =
NULL, /* unlink_name */
no_open_file, /* open_file */
+ no_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
no_close_handle, /* close_handle */
snapshot_destroy /* destroy */
};
diff --git a/server/sock.c b/server/sock.c
-index a8e6e28..cd9a8fa 100644
+index 4a10aac..f951f23 100644
--- a/server/sock.c
+++ b/server/sock.c
-@@ -155,6 +155,7 @@ static const struct object_ops sock_ops =
- no_link_name, /* link_name */
+@@ -156,6 +156,7 @@ static const struct object_ops sock_ops =
NULL, /* unlink_name */
no_open_file, /* open_file */
+ no_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
fd_close_handle, /* close_handle */
sock_destroy /* destroy */
};
-@@ -980,6 +981,7 @@ static const struct object_ops ifchange_ops =
- no_link_name, /* link_name */
+@@ -972,6 +973,7 @@ static const struct object_ops ifchange_ops =
NULL, /* unlink_name */
no_open_file, /* open_file */
+ no_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
no_close_handle, /* close_handle */
ifchange_destroy /* destroy */
};
diff --git a/server/symlink.c b/server/symlink.c
-index 9199bc5..ecc0e43 100644
+index 6b66b23..52387be 100644
--- a/server/symlink.c
+++ b/server/symlink.c
-@@ -70,6 +70,7 @@ static const struct object_ops symlink_ops =
- directory_link_name, /* link_name */
+@@ -72,6 +72,7 @@ static const struct object_ops symlink_ops =
default_unlink_name, /* unlink_name */
no_open_file, /* open_file */
+ no_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
no_close_handle, /* close_handle */
symlink_destroy /* destroy */
};
diff --git a/server/thread.c b/server/thread.c
-index 7162fc3..7e9419b 100644
+index 8c45419..bcb8526 100644
--- a/server/thread.c
+++ b/server/thread.c
-@@ -120,6 +120,7 @@ static const struct object_ops thread_apc_ops =
- no_link_name, /* link_name */
+@@ -123,6 +123,7 @@ static const struct object_ops thread_apc_ops =
NULL, /* unlink_name */
no_open_file, /* open_file */
+ no_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
no_close_handle, /* close_handle */
thread_apc_destroy /* destroy */
};
-@@ -151,6 +152,7 @@ static const struct object_ops thread_ops =
- no_link_name, /* link_name */
+@@ -159,6 +160,7 @@ static const struct object_ops thread_ops =
NULL, /* unlink_name */
no_open_file, /* open_file */
+ thread_get_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
no_close_handle, /* close_handle */
destroy_thread /* destroy */
};
diff --git a/server/timer.c b/server/timer.c
-index 3a786fb..95df28f 100644
+index f2403fc..75d289c 100644
--- a/server/timer.c
+++ b/server/timer.c
-@@ -75,6 +75,7 @@ static const struct object_ops timer_ops =
- directory_link_name, /* link_name */
+@@ -80,6 +80,7 @@ static const struct object_ops timer_ops =
default_unlink_name, /* unlink_name */
no_open_file, /* open_file */
+ no_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
no_close_handle, /* close_handle */
timer_destroy /* destroy */
};
diff --git a/server/token.c b/server/token.c