generate automatically generated request code

Gbp-Pq: Topic generate
Gbp-Pq: Name request.patch

diff --git a/server/request.h b/server/request.h
index 3c455799d540d3cadd9b688c5cd2314484d753a8..9c76644c3fb4c8208fb7079ec1f11ae5087871e3 100644 (file)
--- a/server/request.h
+++ b/server/request.h
@@ -115,9 +115,9 @@ static inline void set_reply_data_ptr( void *data, data_size_t size )
     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(get_new_process_info);
@@ -2245,9 +2245,8 @@ C_ASSERT( sizeof(struct get_next_thread_request) == 32 );
 C_ASSERT( FIELD_OFFSET(struct get_next_thread_reply, handle) == 8 );
 C_ASSERT( sizeof(struct get_next_thread_reply) == 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 */

diff --git a/server/trace.c b/server/trace.c
index a48f00258fe66ee423385abac671470811ed2724..81bee76e37da0f9fb8b3697c829ce5f92cc80e38 100644 (file)
--- a/server/trace.c
+++ b/server/trace.c
@@ -1398,8 +1398,9 @@ static void dump_varargs_handle_infos( const char *prefix, data_size_t size )
 
 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 )
 {
@@ -5526,8 +5527,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 )
 {

diff --git a/tools/make_requests b/tools/make_requests
index 1c4e5977c8b2a88057cbc4a57a2c5b70fedc2c79..bbd366d29ad3b184ad5f7098219fd5af3d60eebb 100755 (executable)
--- 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 = 738;
     return $protocol;
 }
 
@@ -459,7 +454,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 );
@@ -486,7 +481,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 );