From 1ba74516f7a2a120ce381fd6ce3e9fb043b77b7b Mon Sep 17 00:00:00 2001 From: Alexander Morozov Date: Sat, 19 Mar 2011 17:26:15 +0300 Subject: [PATCH 2/2] Re-generate some files. --- configure | 249 +++++++++++++++++++++++++++++++--------- include/Makefile.in | 4 + include/config.h.in | 9 ++ include/wine/server_protocol.h | 20 +++- server/request.h | 14 ++- server/trace.c | 14 +++ 6 files changed, 251 insertions(+), 59 deletions(-) diff --git a/configure b/configure index ea86547..e790fe6 100755 --- a/configure +++ b/configure @@ -634,6 +634,8 @@ GPHOTO2INCL GPHOTO2LIBS gphoto2port_devel gphoto2_devel +USBINCL +USBLIBS SANEINCL sane_devel GNUTLSINCL @@ -801,6 +803,7 @@ with_png with_pthread with_sane with_tiff +with_usb with_v4l with_xcomposite with_xcursor @@ -1492,6 +1495,7 @@ Optional Packages: --without-pthread do not use the pthread library --without-sane do not use SANE (scanner support) --without-tiff do not use TIFF + --without-usb do not use USB --without-v4l do not use v4l1 (v4l support) --without-xcomposite do not use the Xcomposite extension --without-xcursor do not use the Xcursor extension @@ -2366,7 +2370,7 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;} || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi done @@ -2692,6 +2696,12 @@ if test "${with_tiff+set}" = set; then : fi +# Check whether --with-usb was given. +if test "${with_usb+set}" = set; then : + withval=$with_usb; +fi + + # Check whether --with-v4l was given. if test "${with_v4l+set}" = set; then : withval=$with_v4l; @@ -2805,7 +2815,7 @@ fi $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -2838,7 +2848,7 @@ fi $as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -3196,7 +3206,7 @@ fi test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -3311,7 +3321,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -3354,7 +3364,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3413,7 +3423,7 @@ $as_echo "$ac_try_echo"; } >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi fi fi @@ -3465,7 +3475,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -5143,8 +5153,8 @@ then MAINTAINER_MODE=\# else - if test "$FONTFORGE" = "false"; then as_fn_error $? "You need fontforge to rebuild fonts in maintainer mode." "$LINENO" 5 ; fi - if test "$RSVG" = "false"; then as_fn_error $? "You need rsvg to rebuild icons in maintainer mode." "$LINENO" 5 ; fi + if test "$FONTFORGE" = "false"; then as_fn_error $? "You need fontforge to rebuild fonts in maintainer mode." "$LINENO" 5; fi + if test "$RSVG" = "false"; then as_fn_error $? "You need rsvg to rebuild icons in maintainer mode." "$LINENO" 5; fi if test "$CONVERT" = false then @@ -5628,7 +5638,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=c @@ -7233,7 +7243,7 @@ if test "x$LIBPTHREAD" = "x"; then : xno) ;; *) as_fn_error $? "pthread ${notice_platform}development files not found. Wine cannot support threads without libpthread. -Use the --without-pthread option if you really want this." "$LINENO" 5 ;; +Use the --without-pthread option if you really want this." "$LINENO" 5 ;; esac fi @@ -7253,7 +7263,7 @@ if test "x$with_x" = xno; then have_x=disabled else case $x_includes,$x_libraries in #( - *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #( + *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #( *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then : $as_echo_n "(cached) " >&6 else @@ -8165,7 +8175,7 @@ fi x) as_fn_append wine_notices "|libxcursor ${notice_platform}development files not found, the Xcursor extension won't be supported." ;; xno) ;; *) as_fn_error $? "libxcursor ${notice_platform}development files not found, the Xcursor extension won't be supported. -This is an error since --with-xcursor was requested." "$LINENO" 5 ;; +This is an error since --with-xcursor was requested." "$LINENO" 5 ;; esac fi @@ -8227,7 +8237,7 @@ fi x) as_fn_append wine_notices "|libxi ${notice_platform}development files not found, the Xinput extension won't be supported." ;; xno) ;; *) as_fn_error $? "libxi ${notice_platform}development files not found, the Xinput extension won't be supported. -This is an error since --with-xinput was requested." "$LINENO" 5 ;; +This is an error since --with-xinput was requested." "$LINENO" 5 ;; esac fi @@ -8281,7 +8291,7 @@ fi x) as_fn_append wine_notices "|XShm ${notice_platform}development files not found, X Shared Memory won't be supported." ;; xno) ;; *) as_fn_error $? "XShm ${notice_platform}development files not found, X Shared Memory won't be supported. -This is an error since --with-xshm was requested." "$LINENO" 5 ;; +This is an error since --with-xshm was requested." "$LINENO" 5 ;; esac fi @@ -8335,7 +8345,7 @@ fi x) as_fn_append wine_notices "|XShape ${notice_platform}development files not found, XShape won't be supported." ;; xno) ;; *) as_fn_error $? "XShape ${notice_platform}development files not found, XShape won't be supported. -This is an error since --with-xshape was requested." "$LINENO" 5 ;; +This is an error since --with-xshape was requested." "$LINENO" 5 ;; esac fi @@ -8397,7 +8407,7 @@ fi x) as_fn_append wine_notices "|libXxf86vm ${notice_platform}development files not found, XFree86 Vidmode won't be supported." ;; xno) ;; *) as_fn_error $? "libXxf86vm ${notice_platform}development files not found, XFree86 Vidmode won't be supported. -This is an error since --with-xxf86vm was requested." "$LINENO" 5 ;; +This is an error since --with-xxf86vm was requested." "$LINENO" 5 ;; esac fi @@ -8501,7 +8511,7 @@ fi x) as_fn_append wine_warnings "|libxrender ${notice_platform}development files not found, XRender won't be supported." ;; xno) ;; *) as_fn_error $? "libxrender ${notice_platform}development files not found, XRender won't be supported. -This is an error since --with-xrender was requested." "$LINENO" 5 ;; +This is an error since --with-xrender was requested." "$LINENO" 5 ;; esac fi @@ -8578,7 +8588,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext x) as_fn_append wine_notices "|libxrandr ${notice_platform}development files not found, XRandr won't be supported." ;; xno) ;; *) as_fn_error $? "libxrandr ${notice_platform}development files not found, XRandr won't be supported. -This is an error since --with-xrandr was requested." "$LINENO" 5 ;; +This is an error since --with-xrandr was requested." "$LINENO" 5 ;; esac fi @@ -8655,7 +8665,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext x) as_fn_append wine_notices "|libxinerama ${notice_platform}development files not found, multi-monitor setups won't be supported." ;; xno) ;; *) as_fn_error $? "libxinerama ${notice_platform}development files not found, multi-monitor setups won't be supported. -This is an error since --with-xinerama was requested." "$LINENO" 5 ;; +This is an error since --with-xinerama was requested." "$LINENO" 5 ;; esac fi @@ -8717,7 +8727,7 @@ fi x) as_fn_append wine_notices "|libxcomposite ${notice_platform}development files not found, Xcomposite won't be supported." ;; xno) ;; *) as_fn_error $? "libxcomposite ${notice_platform}development files not found, Xcomposite won't be supported. -This is an error since --with-xcomposite was requested." "$LINENO" 5 ;; +This is an error since --with-xcomposite was requested." "$LINENO" 5 ;; esac fi @@ -8954,7 +8964,7 @@ fi x) as_fn_append wine_notices "|libGLU ${notice_platform}development files not found, GLU won't be supported." ;; xno) ;; *) as_fn_error $? "libGLU ${notice_platform}development files not found, GLU won't be supported. -This is an error since --with-glu was requested." "$LINENO" 5 ;; +This is an error since --with-glu was requested." "$LINENO" 5 ;; esac fi else @@ -8976,7 +8986,7 @@ OpenGL and Direct3D won't be supported." ;; xno) ;; *) as_fn_error $? "$opengl_msg OpenGL and Direct3D won't be supported. -This is an error since --with-opengl was requested." "$LINENO" 5 ;; +This is an error since --with-opengl was requested." "$LINENO" 5 ;; esac fi @@ -9107,7 +9117,7 @@ if test "x$XLIB" = "x"; then : *) as_fn_error $? "X ${notice_platform}development files not found. Wine will be built without X support, which probably isn't what you want. You will need to install ${notice_platform}development packages of Xlib/Xfree86 at the very least. -Use the --without-x option if you really want this." "$LINENO" 5 ;; +Use the --without-x option if you really want this." "$LINENO" 5 ;; esac fi @@ -9160,7 +9170,7 @@ if test "x$ac_cv_lib_OpenCL_clGetPlatformInfo" != xyes; then : x) as_fn_append wine_notices "|OpenCL ${notice_platform}development files not found, OpenCL won't be supported." ;; xno) ;; *) as_fn_error $? "OpenCL ${notice_platform}development files not found, OpenCL won't be supported. -This is an error since --with-opencl was requested." "$LINENO" 5 ;; +This is an error since --with-opencl was requested." "$LINENO" 5 ;; esac fi test "x$ac_cv_lib_OpenCL_clGetPlatformInfo" != xyes && enable_opencl=${enable_opencl:-no} @@ -9469,7 +9479,7 @@ if test "$ac_cv_lib_xml2_xmlParseMemory" != "yes"; then : x) as_fn_append wine_warnings "|libxml2 ${notice_platform}development files not found (or too old), XML won't be supported." ;; xno) ;; *) as_fn_error $? "libxml2 ${notice_platform}development files not found (or too old), XML won't be supported. -This is an error since --with-xml was requested." "$LINENO" 5 ;; +This is an error since --with-xml was requested." "$LINENO" 5 ;; esac fi @@ -9561,7 +9571,7 @@ if test "x$ac_cv_lib_soname_xslt" = "x"; then : x) as_fn_append wine_warnings "|libxslt ${notice_platform}development files not found, xslt won't be supported." ;; xno) ;; *) as_fn_error $? "libxslt ${notice_platform}development files not found, xslt won't be supported. -This is an error since --with-xslt was requested." "$LINENO" 5 ;; +This is an error since --with-xslt was requested." "$LINENO" 5 ;; esac fi @@ -9688,7 +9698,7 @@ if test "x$ac_cv_lib_soname_hal" = "x" -a "x$ac_cv_header_DiskArbitration_DiskAr x) as_fn_append wine_notices "|libhal/libdbus ${notice_platform}development files not found, no dynamic device support." ;; xno) ;; *) as_fn_error $? "libhal/libdbus ${notice_platform}development files not found, no dynamic device support. -This is an error since --with-hal was requested." "$LINENO" 5 ;; +This is an error since --with-hal was requested." "$LINENO" 5 ;; esac fi @@ -9778,7 +9788,7 @@ if test "x$ac_cv_lib_soname_gnutls" = "x"; then : x) as_fn_append wine_notices "|libgnutls ${notice_platform}development files not found, no schannel support." ;; xno) ;; *) as_fn_error $? "libgnutls ${notice_platform}development files not found, no schannel support. -This is an error since --with-gnutls was requested." "$LINENO" 5 ;; +This is an error since --with-gnutls was requested." "$LINENO" 5 ;; esac fi @@ -9907,7 +9917,7 @@ if test "x$ac_cv_lib_soname_curses$ac_cv_lib_soname_ncurses" = "x"; then : x) as_fn_append wine_notices "|lib(n)curses ${notice_platform}development files not found, curses won't be supported." ;; xno) ;; *) as_fn_error $? "lib(n)curses ${notice_platform}development files not found, curses won't be supported. -This is an error since --with-curses was requested." "$LINENO" 5 ;; +This is an error since --with-curses was requested." "$LINENO" 5 ;; esac fi @@ -10021,7 +10031,7 @@ if test "x$ac_cv_lib_soname_sane" = "x"; then : x) as_fn_append wine_notices "|libsane ${notice_platform}development files not found, scanners won't be supported." ;; xno) ;; *) as_fn_error $? "libsane ${notice_platform}development files not found, scanners won't be supported. -This is an error since --with-sane was requested." "$LINENO" 5 ;; +This is an error since --with-sane was requested." "$LINENO" 5 ;; esac fi @@ -10083,10 +10093,141 @@ if test "x$ac_cv_lib_soname_v4l1" = "x"; then : x) as_fn_append wine_notices "|libv4l ${notice_platform}development files not found." ;; xno) ;; *) as_fn_error $? "libv4l ${notice_platform}development files not found. -This is an error since --with-v4l was requested." "$LINENO" 5 ;; +This is an error since --with-v4l was requested." "$LINENO" 5 ;; esac fi +USBLIBS="" + +USBINCL="" + +if test "x$with_usb" != "xno" +then + for ac_header in usb.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "usb.h" "ac_cv_header_usb_h" "$ac_includes_default" +if test "x$ac_cv_header_usb_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_USB_H 1 +_ACEOF + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for usb_init in -lusb" >&5 +$as_echo_n "checking for usb_init in -lusb... " >&6; } +if test "${ac_cv_lib_usb_usb_init+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lusb $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char usb_init (); +int +main () +{ +return usb_init (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_usb_usb_init=yes +else + ac_cv_lib_usb_usb_init=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_usb_usb_init" >&5 +$as_echo "$ac_cv_lib_usb_usb_init" >&6; } +if test "x$ac_cv_lib_usb_usb_init" = x""yes; then : + +$as_echo "#define HAVE_LIBUSB 1" >>confdefs.h + + USBLIBS="-lusb" +fi + +fi + +done + + ac_usb_incl=`pkg-config --cflags libusb-1.0` + ac_save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$ac_usb_incl $CPPFLAGS" + for ac_header in libusb.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "libusb.h" "ac_cv_header_libusb_h" "$ac_includes_default" +if test "x$ac_cv_header_libusb_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBUSB_H 1 +_ACEOF + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libusb_init in -lusb-1.0" >&5 +$as_echo_n "checking for libusb_init in -lusb-1.0... " >&6; } +if test "${ac_cv_lib_usb_1_0_libusb_init+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lusb-1.0 $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char libusb_init (); +int +main () +{ +return libusb_init (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_usb_1_0_libusb_init=yes +else + ac_cv_lib_usb_1_0_libusb_init=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_usb_1_0_libusb_init" >&5 +$as_echo "$ac_cv_lib_usb_1_0_libusb_init" >&6; } +if test "x$ac_cv_lib_usb_1_0_libusb_init" = x""yes; then : + +$as_echo "#define HAVE_LIBUSB 1" >>confdefs.h + + USBLIBS="-lusb-1.0" + USBINCL="$ac_usb_incl" + +fi + +fi + +done + + CPPFLAGS="$ac_save_CPPFLAGS" +fi +if test "x$ac_cv_lib_usb_usb_init" != "xyes" -a "x$ac_cv_lib_usb_1_0_libusb_init" != "xyes"; then : + case "x$with_usb" in + x) as_fn_append wine_notices "|libusb ${notice_platform}development files not found, USB won't be supported." ;; + xno) ;; + *) as_fn_error $? "libusb ${notice_platform}development files not found, USB won't be supported. +This is an error since --with-usb was requested." "$LINENO" 5 ;; +esac +fi + + if test "x$with_gphoto" != "xno" then ac_save_CPPFLAGS="$CPPFLAGS" @@ -10238,7 +10379,7 @@ if test "$ac_cv_lib_gphoto2_gp_camera_new" != "yes"; then : x) as_fn_append wine_notices "|libgphoto2 ${notice_platform}development files not found, digital cameras won't be supported." ;; xno) ;; *) as_fn_error $? "libgphoto2 ${notice_platform}development files not found, digital cameras won't be supported. -This is an error since --with-gphoto was requested." "$LINENO" 5 ;; +This is an error since --with-gphoto was requested." "$LINENO" 5 ;; esac fi @@ -10332,7 +10473,7 @@ if test "$ac_cv_lib_lcms_cmsOpenProfileFromFile" != "yes"; then : x) as_fn_append wine_notices "|liblcms ${notice_platform}development files not found, Color Management won't be supported." ;; xno) ;; *) as_fn_error $? "liblcms ${notice_platform}development files not found, Color Management won't be supported. -This is an error since --with-cms was requested." "$LINENO" 5 ;; +This is an error since --with-cms was requested." "$LINENO" 5 ;; esac fi @@ -10524,7 +10665,7 @@ if test "x$FREETYPELIBS" = "x"; then : case "x$with_freetype" in xno) ;; *) as_fn_error $? "FreeType ${notice_platform}development files not found. Fonts will not be built. -Use the --without-freetype option if you really want this." "$LINENO" 5 ;; +Use the --without-freetype option if you really want this." "$LINENO" 5 ;; esac fi test "x$FREETYPELIBS" = "x" && enable_fonts=${enable_fonts:-no} @@ -10636,7 +10777,7 @@ if test "x$ZLIB" = "x"; then : x) as_fn_append wine_notices "|libz ${notice_platform}development files not found, data compression won't be supported." ;; xno) ;; *) as_fn_error $? "libz ${notice_platform}development files not found, data compression won't be supported. -This is an error since --with-zlib was requested." "$LINENO" 5 ;; +This is an error since --with-zlib was requested." "$LINENO" 5 ;; esac fi @@ -10694,7 +10835,7 @@ fi x) as_fn_append wine_warnings "|GetText ${notice_platform}development files not found (or too old). Internationalization won't be fully supported." ;; xno) ;; *) as_fn_error $? "GetText ${notice_platform}development files not found (or too old). Internationalization won't be fully supported. -This is an error since --with-gettextpo was requested." "$LINENO" 5 ;; +This is an error since --with-gettextpo was requested." "$LINENO" 5 ;; esac fi fi @@ -10923,7 +11064,7 @@ if test "x$ac_cv_lib_gstapp_0_10_gst_app_buffer_new" != xyes -a "x$ac_cv_header_ x) as_fn_append wine_notices "|gstreamer-0.10 base plugins ${notice_platform}development files not found, gstreamer support disabled" ;; xno) ;; *) as_fn_error $? "gstreamer-0.10 base plugins ${notice_platform}development files not found, gstreamer support disabled -This is an error since --with-gstreamer was requested." "$LINENO" 5 ;; +This is an error since --with-gstreamer was requested." "$LINENO" 5 ;; esac fi test "x$ac_cv_lib_gstapp_0_10_gst_app_buffer_new" = xyes || enable_winegstreamer=${enable_winegstreamer:-no} @@ -11054,7 +11195,7 @@ if test "x$ac_cv_lib_soname_capi20" = "x"; then : x) as_fn_append wine_notices "|libcapi20 ${notice_platform}development files not found, ISDN won't be supported." ;; xno) ;; *) as_fn_error $? "libcapi20 ${notice_platform}development files not found, ISDN won't be supported. -This is an error since --with-capi was requested." "$LINENO" 5 ;; +This is an error since --with-capi was requested." "$LINENO" 5 ;; esac fi @@ -11134,7 +11275,7 @@ if test "x$ac_cv_lib_soname_cups" = "x"; then : x) as_fn_append wine_notices "|libcups ${notice_platform}development files not found, CUPS won't be supported." ;; xno) ;; *) as_fn_error $? "libcups ${notice_platform}development files not found, CUPS won't be supported. -This is an error since --with-cups was requested." "$LINENO" 5 ;; +This is an error since --with-cups was requested." "$LINENO" 5 ;; esac fi @@ -11323,7 +11464,7 @@ if test "x$ac_cv_lib_soname_fontconfig" = "x"; then : x) as_fn_append wine_notices "|fontconfig ${notice_platform}development files not found, fontconfig won't be supported." ;; xno) ;; *) as_fn_error $? "fontconfig ${notice_platform}development files not found, fontconfig won't be supported. -This is an error since --with-fontconfig was requested." "$LINENO" 5 ;; +This is an error since --with-fontconfig was requested." "$LINENO" 5 ;; esac fi @@ -11435,7 +11576,7 @@ if test "x$ac_cv_lib_soname_ssl" = "x" -o "x$ac_cv_lib_soname_crypto" = "x"; the x) as_fn_append wine_warnings "|OpenSSL ${notice_platform}development files not found, SSL won't be supported." ;; xno) ;; *) as_fn_error $? "OpenSSL ${notice_platform}development files not found, SSL won't be supported. -This is an error since --with-openssl was requested." "$LINENO" 5 ;; +This is an error since --with-openssl was requested." "$LINENO" 5 ;; esac fi @@ -11497,7 +11638,7 @@ if test "x$ac_cv_lib_soname_gsm" = "x"; then : x) as_fn_append wine_notices "|libgsm ${notice_platform}development files not found, gsm 06.10 codec won't be supported." ;; xno) ;; *) as_fn_error $? "libgsm ${notice_platform}development files not found, gsm 06.10 codec won't be supported. -This is an error since --with-gsm was requested." "$LINENO" 5 ;; +This is an error since --with-gsm was requested." "$LINENO" 5 ;; esac fi @@ -11559,7 +11700,7 @@ if test "x$ac_cv_lib_soname_jpeg" = "x"; then : x) as_fn_append wine_warnings "|libjpeg ${notice_platform}development files not found, JPEG won't be supported." ;; xno) ;; *) as_fn_error $? "libjpeg ${notice_platform}development files not found, JPEG won't be supported. -This is an error since --with-jpeg was requested." "$LINENO" 5 ;; +This is an error since --with-jpeg was requested." "$LINENO" 5 ;; esac fi @@ -11778,7 +11919,7 @@ if test "x$ac_cv_lib_soname_png" = "x"; then : x) as_fn_append wine_warnings "|libpng ${notice_platform}development files not found, PNG won't be supported." ;; xno) ;; *) as_fn_error $? "libpng ${notice_platform}development files not found, PNG won't be supported. -This is an error since --with-png was requested." "$LINENO" 5 ;; +This is an error since --with-png was requested." "$LINENO" 5 ;; esac fi @@ -11840,7 +11981,7 @@ if test "x$ac_cv_lib_soname_tiff" = "x"; then : x) as_fn_append wine_notices "|libtiff ${notice_platform}development files not found, TIFF won't be supported." ;; xno) ;; *) as_fn_error $? "libtiff ${notice_platform}development files not found, TIFF won't be supported. -This is an error since --with-tiff was requested." "$LINENO" 5 ;; +This is an error since --with-tiff was requested." "$LINENO" 5 ;; esac fi @@ -11893,7 +12034,7 @@ if test "x$ac_cv_lib_mpg123_mpg123_feed" != xyes -a x"$ac_cv_header_CoreAudio_Co x) as_fn_append wine_notices "|libmpg123 ${notice_platform}development files not found (or too old), mp3 codec won't be supported." ;; xno) ;; *) as_fn_error $? "libmpg123 ${notice_platform}development files not found (or too old), mp3 codec won't be supported. -This is an error since --with-mpg123 was requested." "$LINENO" 5 ;; +This is an error since --with-mpg123 was requested." "$LINENO" 5 ;; esac fi test "x$ac_cv_lib_mpg123_mpg123_feed" = xyes -o "x$ac_cv_header_AudioToolbox_AudioConverter_h" = xyes || enable_winemp3_acm=${enable_winemp3_acm:-no} @@ -11963,7 +12104,7 @@ if test "x$ac_cv_lib_openal" != xyes; then : x) as_fn_append wine_notices "|libopenal ${notice_platform}development files not found (or too old), OpenAL won't be supported." ;; xno) ;; *) as_fn_error $? "libopenal ${notice_platform}development files not found (or too old), OpenAL won't be supported. -This is an error since --with-openal was requested." "$LINENO" 5 ;; +This is an error since --with-openal was requested." "$LINENO" 5 ;; esac fi test "x$ac_cv_lib_openal" = xyes || enable_openal32=${enable_openal32:-no} @@ -13295,7 +13436,7 @@ if test "x$LDAPLIBS" = "x"; then : x) as_fn_append wine_notices "|libldap (OpenLDAP) ${notice_platform}development files not found, LDAP won't be supported." ;; xno) ;; *) as_fn_error $? "libldap (OpenLDAP) ${notice_platform}development files not found, LDAP won't be supported. -This is an error since --with-ldap was requested." "$LINENO" 5 ;; +This is an error since --with-ldap was requested." "$LINENO" 5 ;; esac fi @@ -16342,7 +16483,7 @@ do "Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile" ;; "Make.tmp") CONFIG_FILES="$CONFIG_FILES Make.tmp:Make.vars.in:Makefile.in" ;; - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -16693,7 +16834,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -16721,7 +16862,7 @@ do [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -16748,7 +16889,7 @@ $as_echo "$as_me: creating $ac_file" >&6;} case $ac_tag in *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac diff --git a/include/Makefile.in b/include/Makefile.in index e677f38..a4989b2 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -205,7 +205,11 @@ SRCDIR_INCLUDES = \ ddk/usb100.h \ ddk/usb200.h \ ddk/usbdlib.h \ + ddk/usbdrivr.h \ + ddk/usbioctl.h \ + ddk/usbiodef.h \ ddk/wdm.h \ + ddk/wdmguid.h \ ddk/winddiui.h \ ddk/winsplp.h \ ddraw.h \ diff --git a/include/config.h.in b/include/config.h.in index 44b6bb6..7d96987 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -377,6 +377,12 @@ /* Define to 1 if you have the `ossaudio' library (-lossaudio). */ #undef HAVE_LIBOSSAUDIO +/* Define if you have the libusb library and header */ +#undef HAVE_LIBUSB + +/* Define to 1 if you have the header file. */ +#undef HAVE_LIBUSB_H + /* Define if you have the libxml2 library */ #undef HAVE_LIBXML2 @@ -1067,6 +1073,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* Define to 1 if you have the header file. */ +#undef HAVE_USB_H + /* Define to 1 if you have the `usleep' function. */ #undef HAVE_USLEEP diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 82e95be..76b7161 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4579,6 +4579,8 @@ struct get_next_device_request_reply struct reply_header __header; obj_handle_t next; ioctl_code_t code; + process_id_t pid; + char __pad_20[4]; client_ptr_t user_ptr; data_size_t in_size; data_size_t out_size; @@ -4814,6 +4816,19 @@ struct set_cursor_reply #define SET_CURSOR_CLIP 0x08 + +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, @@ -5059,6 +5074,7 @@ enum request REQ_alloc_user_handle, REQ_free_user_handle, REQ_set_cursor, + REQ_get_device_name, REQ_NB_REQUESTS }; @@ -5309,6 +5325,7 @@ union generic_request struct alloc_user_handle_request alloc_user_handle_request; struct free_user_handle_request free_user_handle_request; struct set_cursor_request set_cursor_request; + struct get_device_name_request get_device_name_request; }; union generic_reply { @@ -5557,8 +5574,9 @@ union generic_reply struct alloc_user_handle_reply alloc_user_handle_reply; struct free_user_handle_reply free_user_handle_reply; struct set_cursor_reply set_cursor_reply; + struct get_device_name_reply get_device_name_reply; }; -#define SERVER_PROTOCOL_VERSION 417 +#define SERVER_PROTOCOL_VERSION 418 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/request.h b/server/request.h index 47733a5..c2e4562 100644 --- a/server/request.h +++ b/server/request.h @@ -354,6 +354,7 @@ DECL_HANDLER(set_window_layered_info); DECL_HANDLER(alloc_user_handle); DECL_HANDLER(free_user_handle); DECL_HANDLER(set_cursor); +DECL_HANDLER(get_device_name); #ifdef WANT_REQUEST_HANDLERS @@ -603,6 +604,7 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_alloc_user_handle, (req_handler)req_free_user_handle, (req_handler)req_set_cursor, + (req_handler)req_get_device_name, }; C_ASSERT( sizeof(affinity_t) == 8 ); @@ -2020,10 +2022,11 @@ C_ASSERT( FIELD_OFFSET(struct get_next_device_request_request, status) == 20 ); C_ASSERT( sizeof(struct get_next_device_request_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, next) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, code) == 12 ); -C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, user_ptr) == 16 ); -C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, in_size) == 24 ); -C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, out_size) == 28 ); -C_ASSERT( sizeof(struct get_next_device_request_reply) == 32 ); +C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, pid) == 16 ); +C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, user_ptr) == 24 ); +C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, in_size) == 32 ); +C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, out_size) == 36 ); +C_ASSERT( sizeof(struct get_next_device_request_reply) == 40 ); C_ASSERT( sizeof(struct make_process_system_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct make_process_system_reply, event) == 8 ); C_ASSERT( sizeof(struct make_process_system_reply) == 16 ); @@ -2104,6 +2107,9 @@ C_ASSERT( FIELD_OFFSET(struct set_cursor_reply, new_x) == 16 ); C_ASSERT( FIELD_OFFSET(struct set_cursor_reply, new_y) == 20 ); C_ASSERT( FIELD_OFFSET(struct set_cursor_reply, new_clip) == 24 ); C_ASSERT( sizeof(struct set_cursor_reply) == 40 ); +C_ASSERT( FIELD_OFFSET(struct get_device_name_request, handle) == 12 ); +C_ASSERT( sizeof(struct get_device_name_request) == 16 ); +C_ASSERT( sizeof(struct get_device_name_reply) == 8 ); #endif /* WANT_REQUEST_HANDLERS */ diff --git a/server/trace.c b/server/trace.c index 0933cf1..4be3ebb 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3750,6 +3750,7 @@ static void dump_get_next_device_request_reply( const struct get_next_device_req { fprintf( stderr, " next=%04x", req->next ); dump_ioctl_code( ", code=", &req->code ); + fprintf( stderr, ", pid=%04x", req->pid ); dump_uint64( ", user_ptr=", &req->user_ptr ); fprintf( stderr, ", in_size=%u", req->in_size ); fprintf( stderr, ", out_size=%u", req->out_size ); @@ -3907,6 +3908,16 @@ static void dump_set_cursor_reply( const struct set_cursor_reply *req ) dump_rectangle( ", new_clip=", &req->new_clip ); } +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 ) +{ + dump_varargs_unicode_str( " name=", 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, @@ -4151,6 +4162,7 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_alloc_user_handle_request, (dump_func)dump_free_user_handle_request, (dump_func)dump_set_cursor_request, + (dump_func)dump_get_device_name_request, }; static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { @@ -4397,6 +4409,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_alloc_user_handle_reply, NULL, (dump_func)dump_set_cursor_reply, + (dump_func)dump_get_device_name_reply, }; static const char * const req_names[REQ_NB_REQUESTS] = { @@ -4643,6 +4656,7 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "alloc_user_handle", "free_user_handle", "set_cursor", + "get_device_name", }; static const struct -- 1.7.4.1