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
|
description: generate automatically generated request code
author: Michael Gilbert <mgilbert@debian.org>
--- a/tools/make_requests
+++ b/tools/make_requests
@@ -272,16 +272,11 @@ sub PARSE_REQUESTS()
}
### Retrieve the server protocol version from the existing server_protocol.h file
+# Modified by -1, see debian/scripts/import
sub GET_PROTOCOL_VERSION()
{
- my $protocol = 0;
- open SERVER_PROT, "include/wine/server_protocol.h" or return 0;
- while (<SERVER_PROT>)
- {
- if (/^\#define SERVER_PROTOCOL_VERSION (\d+)/) { $protocol = $1; last; }
- }
- close SERVER_PROT;
+ my $protocol = 594;
return $protocol;
}
@@ -446,7 +441,7 @@ foreach my $err (sort keys %errors)
push @trace_lines, " { NULL, 0 }\n";
push @trace_lines, "};\n";
-replace_in_file( "server/trace.c",
+replace_in_file( "server/trace.generated",
"### make_requests begin ###",
"### make_requests end ###",
@trace_lines );
@@ -473,7 +468,7 @@ foreach my $type (sort keys %formats)
push @request_lines, @asserts;
push @request_lines, "\n#endif /* WANT_REQUEST_HANDLERS */\n";
-replace_in_file( "server/request.h",
+replace_in_file( "server/request.generated",
"### make_requests begin ###",
"### make_requests end ###",
@request_lines );
--- a/server/request.h
+++ b/server/request.h
@@ -109,9 +109,9 @@ static inline void set_reply_data_ptr( v
current->reply_data = data;
}
+#include "request.generated"
-/* Everything below this line is generated automatically by tools/make_requests */
-/* ### make_requests begin ### */
+/*
DECL_HANDLER(new_process);
DECL_HANDLER(exec_process);
@@ -2446,9 +2446,8 @@ C_ASSERT( sizeof(struct suspend_process_
C_ASSERT( FIELD_OFFSET(struct resume_process_request, handle) == 12 );
C_ASSERT( sizeof(struct resume_process_request) == 16 );
-#endif /* WANT_REQUEST_HANDLERS */
+#endif
-/* ### make_requests end ### */
-/* Everything above this line is generated automatically by tools/make_requests */
+*/
#endif /* __WINE_SERVER_REQUEST_H */
--- a/server/trace.c
+++ b/server/trace.c
@@ -1238,8 +1238,9 @@ static void dump_varargs_handle_infos( c
typedef void (*dump_func)( const void *req );
-/* Everything below this line is generated automatically by tools/make_requests */
-/* ### make_requests begin ### */
+#include "trace.generated"
+
+/*
static void dump_new_process_request( const struct new_process_request *req )
{
@@ -5681,8 +5682,7 @@ static const struct
{ NULL, 0 }
};
-/* ### make_requests end ### */
-/* Everything above this line is generated automatically by tools/make_requests */
+*/
static const char *get_status_name( unsigned int status )
{
|
