[Wine-patches] [23/23] Re-generate some files.
Alexander Morozov
=?iso-8859-1?q?amorozov_=CE=C1_etersoft=2Eru?=
Пн Янв 19 18:26:11 MSK 2009
For eterhack branch
----------- следующая часть -----------
From f85ff2cc7297988c8886ed6c16628b23ebf4506f Mon Sep 17 00:00:00 2001
From: Alexander Morozov <amorozov на etersoft.ru>
Date: Mon, 19 Jan 2009 18:03:31 +0300
Subject: [PATCH] Re-generate some files.
---
.gitignore | 1 -
configure | 28 +++++++--------------
configure.ac | 3 +-
dlls/Makefile.in | 10 ++++----
include/wine/server_protocol.h | 53 +++++++++++++---------------------------
server/request.h | 6 +---
server/trace.c | 43 ++++++++++----------------------
7 files changed, 48 insertions(+), 96 deletions(-)
diff --git a/.gitignore b/.gitignore
index fcfbafb..c86b5a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -282,7 +282,6 @@ programs/winepath/winepath
programs/winetest/*_test.exe
programs/winetest/tests.rc
programs/winetest/winetest
-programs/wineusb/wineusb
programs/winevdm/winevdm
programs/winhlp32/macro.lex.yy.c
programs/winhlp32/winhlp32
diff --git a/configure b/configure
index 823348b..8773834 100755
--- a/configure
+++ b/configure
@@ -27546,6 +27546,14 @@ dlls/usbd.sys/Makefile: dlls/usbd.sys/Makefile.in dlls/Makedll.rules"
ac_config_files="$ac_config_files dlls/usbd.sys/Makefile"
ALL_MAKEFILES="$ALL_MAKEFILES \\
+ dlls/usbhub.sys/Makefile"
+test "x$enable_usbhub_sys" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+ usbhub.sys"
+ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
+dlls/usbhub.sys/Makefile: dlls/usbhub.sys/Makefile.in dlls/Makedll.rules"
+ac_config_files="$ac_config_files dlls/usbhub.sys/Makefile"
+
+ALL_MAKEFILES="$ALL_MAKEFILES \\
dlls/user32/Makefile"
test "x$enable_user32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
user32"
@@ -27818,14 +27826,6 @@ dlls/winequartz.drv/Makefile: dlls/winequartz.drv/Makefile.in dlls/Makedll.rules
ac_config_files="$ac_config_files dlls/winequartz.drv/Makefile"
ALL_MAKEFILES="$ALL_MAKEFILES \\
- dlls/wineusbhub/Makefile"
-test "x$enable_wineusbhub" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
- wineusbhub"
-ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
-dlls/wineusbhub/Makefile: dlls/wineusbhub/Makefile.in dlls/Makedll.rules"
-ac_config_files="$ac_config_files dlls/wineusbhub/Makefile"
-
-ALL_MAKEFILES="$ALL_MAKEFILES \\
dlls/winex11.drv/Makefile"
test "x$enable_winex11_drv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
winex11.drv"
@@ -28538,15 +28538,6 @@ programs/winetest/Makefile: programs/winetest/Makefile.in programs/Makeprog.rule
ac_config_files="$ac_config_files programs/winetest/Makefile"
ALL_MAKEFILES="$ALL_MAKEFILES \\
- programs/wineusb/Makefile"
-test "x$enable_wineusb" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
- wineusb" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\
- wineusb"
-ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
-programs/wineusb/Makefile: programs/wineusb/Makefile.in programs/Makeprog.rules"
-ac_config_files="$ac_config_files programs/wineusb/Makefile"
-
-ALL_MAKEFILES="$ALL_MAKEFILES \\
programs/winevdm/Makefile"
test "x$enable_winevdm" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
winevdm" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\
@@ -29604,6 +29595,7 @@ do
"dlls/urlmon/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/urlmon/Makefile" ;;
"dlls/urlmon/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/urlmon/tests/Makefile" ;;
"dlls/usbd.sys/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/usbd.sys/Makefile" ;;
+ "dlls/usbhub.sys/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/usbhub.sys/Makefile" ;;
"dlls/user32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/user32/Makefile" ;;
"dlls/user32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/user32/tests/Makefile" ;;
"dlls/userenv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/userenv/Makefile" ;;
@@ -29638,7 +29630,6 @@ do
"dlls/wineoss.drv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wineoss.drv/Makefile" ;;
"dlls/wineps.drv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wineps.drv/Makefile" ;;
"dlls/winequartz.drv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winequartz.drv/Makefile" ;;
- "dlls/wineusbhub/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wineusbhub/Makefile" ;;
"dlls/winex11.drv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winex11.drv/Makefile" ;;
"dlls/wing32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wing32/Makefile" ;;
"dlls/winhttp/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winhttp/Makefile" ;;
@@ -29722,7 +29713,6 @@ do
"programs/winemine/Makefile") CONFIG_FILES="$CONFIG_FILES programs/winemine/Makefile" ;;
"programs/winepath/Makefile") CONFIG_FILES="$CONFIG_FILES programs/winepath/Makefile" ;;
"programs/winetest/Makefile") CONFIG_FILES="$CONFIG_FILES programs/winetest/Makefile" ;;
- "programs/wineusb/Makefile") CONFIG_FILES="$CONFIG_FILES programs/wineusb/Makefile" ;;
"programs/winevdm/Makefile") CONFIG_FILES="$CONFIG_FILES programs/winevdm/Makefile" ;;
"programs/winhlp32/Makefile") CONFIG_FILES="$CONFIG_FILES programs/winhlp32/Makefile" ;;
"programs/winver/Makefile") CONFIG_FILES="$CONFIG_FILES programs/winver/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index b127be8..46aa2b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2120,6 +2120,7 @@ WINE_CONFIG_MAKEFILE([dlls/url/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DI
WINE_CONFIG_MAKEFILE([dlls/urlmon/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/urlmon/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
WINE_CONFIG_MAKEFILE([dlls/usbd.sys/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/usbhub.sys/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/user32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/user32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
WINE_CONFIG_MAKEFILE([dlls/userenv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
@@ -2154,7 +2155,6 @@ WINE_CONFIG_MAKEFILE([dlls/winenas.drv/Makefile],[dlls/Makedll.rules],[dlls],[AL
WINE_CONFIG_MAKEFILE([dlls/wineoss.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/wineps.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/winequartz.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
-WINE_CONFIG_MAKEFILE([dlls/wineusbhub/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/winex11.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/wing32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/winhttp/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
@@ -2238,7 +2238,6 @@ WINE_CONFIG_MAKEFILE([programs/winemenubuilder/Makefile],[programs/Makeprog.rule
WINE_CONFIG_MAKEFILE([programs/winemine/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS])
WINE_CONFIG_MAKEFILE([programs/winepath/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS])
WINE_CONFIG_MAKEFILE([programs/winetest/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS])
-WINE_CONFIG_MAKEFILE([programs/wineusb/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS])
WINE_CONFIG_MAKEFILE([programs/winevdm/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS])
WINE_CONFIG_MAKEFILE([programs/winhlp32/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS])
WINE_CONFIG_MAKEFILE([programs/winver/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS])
diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index 8bc9b60..fd8c8d7 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -293,6 +293,7 @@ IMPORT_LIBS = \
url/liburl.$(IMPLIBEXT) \
urlmon/liburlmon.$(IMPLIBEXT) \
usbd.sys/libusbd.sys.$(IMPLIBEXT) \
+ usbhub.sys/libusbhub.sys.$(IMPLIBEXT) \
user32/libuser32.$(IMPLIBEXT) \
userenv/libuserenv.$(IMPLIBEXT) \
usp10/libusp10.$(IMPLIBEXT) \
@@ -302,7 +303,6 @@ IMPORT_LIBS = \
wbemprox/libwbemprox.$(IMPLIBEXT) \
wined3d/libwined3d.$(IMPLIBEXT) \
winedos/libwinedos.$(IMPLIBEXT) \
- wineusbhub/libwineusbhub.$(IMPLIBEXT) \
winhttp/libwinhttp.$(IMPLIBEXT) \
wininet/libwininet.$(IMPLIBEXT) \
winmm/libwinmm.$(IMPLIBEXT) \
@@ -438,6 +438,7 @@ CROSS_IMPLIBS = \
url/liburl.a \
urlmon/liburlmon.a \
usbd.sys/libusbd.sys.a \
+ usbhub.sys/libusbhub.sys.a \
user32/libuser32.a \
userenv/libuserenv.a \
usp10/libusp10.a \
@@ -447,7 +448,6 @@ CROSS_IMPLIBS = \
wbemprox/libwbemprox.a \
wined3d/libwined3d.a \
winedos/libwinedos.a \
- wineusbhub/libwineusbhub.a \
winhttp/libwinhttp.a \
wininet/libwininet.a \
winmm/libwinmm.a \
@@ -821,6 +821,9 @@ urlmon/liburlmon.def urlmon/liburlmon.a: urlmon/urlmon.spec $(WINEBUILD)
usbd.sys/libusbd.sys.def usbd.sys/libusbd.sys.a: usbd.sys/usbd.sys.spec $(WINEBUILD)
@cd usbd.sys && $(MAKE) `basename $@`
+usbhub.sys/libusbhub.sys.def usbhub.sys/libusbhub.sys.a: usbhub.sys/usbhub.sys.spec $(WINEBUILD)
+ @cd usbhub.sys && $(MAKE) `basename $@`
+
user32/libuser32.def user32/libuser32.a: user32/user32.spec $(WINEBUILD)
@cd user32 && $(MAKE) `basename $@`
@@ -848,9 +851,6 @@ wined3d/libwined3d.def wined3d/libwined3d.a: wined3d/wined3d.spec $(WINEBUILD)
winedos/libwinedos.def winedos/libwinedos.a: winedos/winedos.spec $(WINEBUILD)
@cd winedos && $(MAKE) `basename $@`
-wineusbhub/libwineusbhub.def wineusbhub/libwineusbhub.a: wineusbhub/wineusbhub.spec $(WINEBUILD)
- @cd wineusbhub && $(MAKE) `basename $@`
-
winhttp/libwinhttp.def winhttp/libwinhttp.a: winhttp/winhttp.spec $(WINEBUILD)
@cd winhttp && $(MAKE) `basename $@`
diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h
index df21351..605c8b8 100644
--- a/include/wine/server_protocol.h
+++ b/include/wine/server_protocol.h
@@ -4319,35 +4319,6 @@ struct add_fd_completion_reply
-struct call_add_device_request
-{
- struct request_header __header;
- data_size_t drvname_len;
- /* VARARG(drvname,unicode_str); */
- /* VARARG(data,bytes); */
-};
-struct call_add_device_reply
-{
- struct reply_header __header;
-};
-
-
-
-struct get_add_device_request_request
-{
- struct request_header __header;
- obj_handle_t event;
- /* VARARG(drvname,unicode_str); */
-};
-struct get_add_device_request_reply
-{
- struct reply_header __header;
- obj_handle_t event;
- /* VARARG(data,bytes); */
-};
-
-
-
struct get_window_layered_info_request
{
struct request_header __header;
@@ -4377,6 +4348,19 @@ struct set_window_layered_info_reply
};
+
+struct get_device_name_request
+{
+ struct request_header __header;
+ obj_handle_t handle;
+};
+struct get_device_name_reply
+{
+ struct reply_header __header;
+ /* VARARG(name,unicode_str); */
+};
+
+
enum request
{
REQ_new_process,
@@ -4613,10 +4597,9 @@ enum request
REQ_query_completion,
REQ_set_completion_info,
REQ_add_fd_completion,
- REQ_call_add_device,
- REQ_get_add_device_request,
REQ_get_window_layered_info,
REQ_set_window_layered_info,
+ REQ_get_device_name,
REQ_NB_REQUESTS
};
@@ -4858,10 +4841,9 @@ union generic_request
struct query_completion_request query_completion_request;
struct set_completion_info_request set_completion_info_request;
struct add_fd_completion_request add_fd_completion_request;
- struct call_add_device_request call_add_device_request;
- struct get_add_device_request_request get_add_device_request_request;
struct get_window_layered_info_request get_window_layered_info_request;
struct set_window_layered_info_request set_window_layered_info_request;
+ struct get_device_name_request get_device_name_request;
};
union generic_reply
{
@@ -5101,12 +5083,11 @@ union generic_reply
struct query_completion_reply query_completion_reply;
struct set_completion_info_reply set_completion_info_reply;
struct add_fd_completion_reply add_fd_completion_reply;
- struct call_add_device_reply call_add_device_reply;
- struct get_add_device_request_reply get_add_device_request_reply;
struct get_window_layered_info_reply get_window_layered_info_reply;
struct set_window_layered_info_reply set_window_layered_info_reply;
+ struct get_device_name_reply get_device_name_reply;
};
-#define SERVER_PROTOCOL_VERSION 10380
+#define SERVER_PROTOCOL_VERSION 10381
#endif /* __WINE_WINE_SERVER_PROTOCOL_H */
diff --git a/server/request.h b/server/request.h
index c7256c6..1f8b943 100644
--- a/server/request.h
+++ b/server/request.h
@@ -345,10 +345,9 @@ DECL_HANDLER(remove_completion);
DECL_HANDLER(query_completion);
DECL_HANDLER(set_completion_info);
DECL_HANDLER(add_fd_completion);
-DECL_HANDLER(call_add_device);
-DECL_HANDLER(get_add_device_request);
DECL_HANDLER(get_window_layered_info);
DECL_HANDLER(set_window_layered_info);
+DECL_HANDLER(get_device_name);
#ifdef WANT_REQUEST_HANDLERS
@@ -589,10 +588,9 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] =
(req_handler)req_query_completion,
(req_handler)req_set_completion_info,
(req_handler)req_add_fd_completion,
- (req_handler)req_call_add_device,
- (req_handler)req_get_add_device_request,
(req_handler)req_get_window_layered_info,
(req_handler)req_set_window_layered_info,
+ (req_handler)req_get_device_name,
};
#endif /* WANT_REQUEST_HANDLERS */
diff --git a/server/trace.c b/server/trace.c
index 1b39e77..c0915a0 100644
--- a/server/trace.c
+++ b/server/trace.c
@@ -3987,30 +3987,6 @@ static void dump_add_fd_completion_request( const struct add_fd_completion_reque
fprintf( stderr, " information=%08x", req->information );
}
-static void dump_call_add_device_request( const struct call_add_device_request *req )
-{
- fprintf( stderr, " drvname_len=%u,", req->drvname_len );
- fprintf( stderr, " drvname=" );
- dump_varargs_unicode_str( cur_size );
- fputc( ',', stderr );
- fprintf( stderr, " data=" );
- dump_varargs_bytes( cur_size );
-}
-
-static void dump_get_add_device_request_request( const struct get_add_device_request_request *req )
-{
- fprintf( stderr, " event=%p,", req->event );
- fprintf( stderr, " drvname=" );
- dump_varargs_unicode_str( cur_size );
-}
-
-static void dump_get_add_device_request_reply( const struct get_add_device_request_reply *req )
-{
- fprintf( stderr, " event=%p,", req->event );
- fprintf( stderr, " data=" );
- dump_varargs_bytes( cur_size );
-}
-
static void dump_get_window_layered_info_request( const struct get_window_layered_info_request *req )
{
fprintf( stderr, " handle=%08x", req->handle );
@@ -4031,6 +4007,17 @@ static void dump_set_window_layered_info_request( const struct set_window_layere
fprintf( stderr, " flags=%08x", req->flags );
}
+static void dump_get_device_name_request( const struct get_device_name_request *req )
+{
+ fprintf( stderr, " handle=%04x", req->handle );
+}
+
+static void dump_get_device_name_reply( const struct get_device_name_reply *req )
+{
+ fprintf( stderr, " name=" );
+ dump_varargs_unicode_str( cur_size );
+}
+
static const dump_func req_dumpers[REQ_NB_REQUESTS] = {
(dump_func)dump_new_process_request,
(dump_func)dump_get_new_process_info_request,
@@ -4266,10 +4253,9 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = {
(dump_func)dump_query_completion_request,
(dump_func)dump_set_completion_info_request,
(dump_func)dump_add_fd_completion_request,
- (dump_func)dump_call_add_device_request,
- (dump_func)dump_get_add_device_request_request,
(dump_func)dump_get_window_layered_info_request,
(dump_func)dump_set_window_layered_info_request,
+ (dump_func)dump_get_device_name_request,
};
static const dump_func reply_dumpers[REQ_NB_REQUESTS] = {
@@ -4507,9 +4493,9 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = {
(dump_func)dump_query_completion_reply,
NULL,
NULL,
- (dump_func)dump_get_add_device_request_reply,
(dump_func)dump_get_window_layered_info_reply,
NULL,
+ (dump_func)dump_get_device_name_reply,
};
static const char * const req_names[REQ_NB_REQUESTS] = {
@@ -4747,10 +4733,9 @@ static const char * const req_names[REQ_NB_REQUESTS] = {
"query_completion",
"set_completion_info",
"add_fd_completion",
- "call_add_device",
- "get_add_device_request",
"get_window_layered_info",
"set_window_layered_info",
+ "get_device_name",
};
static const struct
--
1.6.0.2.GIT
Подробная информация о списке рассылки Wine-patches