August 2009 - Wine-Commits - list.winehq.org

Alexandre Julliard : configure: Add a --with-wine64 option to build a 32-bit Wow64 tree.
by Alexandre Julliard Aug. 14, 2009

Aug. 14, 2009

Module: wine Branch: master Commit: 39a75d374d5236075d71f05b2b17969fcdf5ef6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=39a75d374d5236075d71f05b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 13 19:45:31 2009 +0200 configure: Add a --with-wine64 option to build a 32-bit Wow64 tree. --- configure | 46 +++++++++++++++++++++++++++++++++++++--------- configure.ac | 40 +++++++++++++++++++++++++++++++--------- 2 files changed, 68 insertions(+), 18 deletions(-) diff --git a/configure b/configure index 3c3ddf2..8d9f023 100755 --- a/configure +++ b/configure @@ -805,6 +805,7 @@ with_xshm with_xslt with_xxf86vm with_wine_tools +with_wine64 with_x ' ac_precious_vars='build_alias @@ -1485,6 +1486,7 @@ Optional Packages: --without-xslt do not use XSLT --without-xxf86vm do not use XFree video mode extension --with-wine-tools=DIR use Wine tools from directory DIR + --with-wine64=DIR use the 64-bit Wine in DIR for a Wow64 build --with-x use the X Window System Some influential environment variables: @@ -2710,6 +2712,12 @@ if test "${with_wine_tools+set}" = set; then : fi +# Check whether --with-wine64 was given. +if test "${with_wine64+set}" = set; then : + withval=$with_wine64; +fi + + # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 @@ -3941,7 +3949,7 @@ fi case $host in *-darwin*) - if test "x$enable_win64" == "xyes" + if test "x$enable_win64" = "xyes" then CC="$CC -m64" CXX="$CXX -m64" @@ -4052,24 +4060,44 @@ then enable_winevdm=${enable_winevdm:-no} fi +if test -n "$with_wine64" +then + if test "x$enable_win64" = "xyes" + then + as_fn_error "--enable-win64 and --with-wine64 are mutually exclusive. +--enable-win64 should be used in the 64-bit build tree, --with-wine64 in the 32-bit Wow64 build tree." "$LINENO" 5 + fi + enable_fonts=${enable_fonts:-no} + enable_include=${enable_include:-no} + enable_server=${enable_server:-no} + enable_tools=${enable_tools:-no} + enable_wineboot=${enable_wineboot:-no} + enable_winedbg=${enable_winedbg:-no} + test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib32" +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the directory containing the Wine tools" >&5 $as_echo_n "checking for the directory containing the Wine tools... " >&6; } if test "${wine_cv_toolsdir+set}" = set; then : $as_echo_n "(cached) " >&6 else - if test -z "$with_wine_tools"; then + wine_cv_toolsdir="$with_wine_tools" + if test -z "$with_wine_tools"; then if test "$cross_compiling" = "yes"; then as_fn_error "you must use the --with-wine-tools option when cross-compiling." "$LINENO" 5 - else - wine_cv_toolsdir="\$(TOPOBJDIR)" + elif test -n "$with_wine64"; then + wine_cv_toolsdir="$with_wine64" fi - elif test -d "$with_wine_tools/tools/winebuild"; then - case $with_wine_tools in - /*) wine_cv_toolsdir="$with_wine_tools" ;; - *) wine_cv_toolsdir="\$(TOPOBJDIR)/$with_wine_tools" ;; + fi + if test -z "$wine_cv_toolsdir"; then + wine_cv_toolsdir="\$(TOPOBJDIR)" + elif test -d "$wine_cv_toolsdir/tools/winebuild"; then + case "$wine_cv_toolsdir" in + /*) ;; + *) wine_cv_toolsdir="\$(TOPOBJDIR)/$wine_cv_toolsdir" ;; esac else - as_fn_error "could not find Wine tools in $with_wine_tools." "$LINENO" 5 + as_fn_error "could not find Wine tools in $wine_cv_toolsdir" "$LINENO" 5 fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $wine_cv_toolsdir" >&5 diff --git a/configure.ac b/configure.ac index ef808d8..fb83660 100644 --- a/configure.ac +++ b/configure.ac @@ -83,6 +83,7 @@ AC_ARG_WITH(xxf86vm, AS_HELP_STRING([--without-xxf86vm],[do not use XFree vide [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_xf86vmode_h=no; fi]) AC_ARG_WITH(wine-tools,AS_HELP_STRING([--with-wine-tools=DIR],[use Wine tools from directory DIR])) +AC_ARG_WITH(wine64, AS_HELP_STRING([--with-wine64=DIR],[use the 64-bit Wine in DIR for a Wow64 build])) AC_CANONICAL_HOST @@ -105,7 +106,7 @@ AC_CHECK_TOOL(CPPBIN,cpp,cpp) case $host in *-darwin*) - if test "x$enable_win64" == "xyes" + if test "x$enable_win64" = "xyes" then CC="$CC -m64" CXX="$CXX -m64" @@ -174,20 +175,41 @@ then enable_winevdm=${enable_winevdm:-no} fi +dnl Some special cases for the wow64 build +if test -n "$with_wine64" +then + if test "x$enable_win64" = "xyes" + then + AC_MSG_ERROR([--enable-win64 and --with-wine64 are mutually exclusive. +--enable-win64 should be used in the 64-bit build tree, --with-wine64 in the 32-bit Wow64 build tree.]) + fi + enable_fonts=${enable_fonts:-no} + enable_include=${enable_include:-no} + enable_server=${enable_server:-no} + enable_tools=${enable_tools:-no} + enable_wineboot=${enable_wineboot:-no} + enable_winedbg=${enable_winedbg:-no} + test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib32" +fi + AC_CACHE_CHECK([for the directory containing the Wine tools], wine_cv_toolsdir, - [if test -z "$with_wine_tools"; then + [wine_cv_toolsdir="$with_wine_tools" + if test -z "$with_wine_tools"; then if test "$cross_compiling" = "yes"; then AC_MSG_ERROR([you must use the --with-wine-tools option when cross-compiling.]) - else - wine_cv_toolsdir="\$(TOPOBJDIR)" + elif test -n "$with_wine64"; then + wine_cv_toolsdir="$with_wine64" fi - elif test -d "$with_wine_tools/tools/winebuild"; then - case $with_wine_tools in - /*) wine_cv_toolsdir="$with_wine_tools" ;; - *) wine_cv_toolsdir="\$(TOPOBJDIR)/$with_wine_tools" ;; + fi + if test -z "$wine_cv_toolsdir"; then + wine_cv_toolsdir="\$(TOPOBJDIR)" + elif test -d "$wine_cv_toolsdir/tools/winebuild"; then + case "$wine_cv_toolsdir" in + /*) ;; + *) wine_cv_toolsdir="\$(TOPOBJDIR)/$wine_cv_toolsdir" ;; esac else - AC_MSG_ERROR([could not find Wine tools in $with_wine_tools.]) + AC_MSG_ERROR([could not find Wine tools in $wine_cv_toolsdir]) fi]) AC_SUBST(TOOLSDIR,$wine_cv_toolsdir) if test -n "$host_alias" -a "$host_alias" != "$build_alias"

1 0

Alexandre Julliard : winex11: Use the Globally Active focus model with take focus.
by Alexandre Julliard Aug. 14, 2009

Aug. 14, 2009

Module: wine Branch: master Commit: e3720c2810dda3895d6734c55117b0a355223b1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3720c2810dda3895d6734c55… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 13 18:18:22 2009 +0200 winex11: Use the Globally Active focus model with take focus. --- dlls/winex11.drv/window.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 9970348..19551fa 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1038,7 +1038,7 @@ static void set_wm_hints( Display *display, struct x11drv_win_data *data ) if (data->wm_hints) { data->wm_hints->flags |= InputHint | StateHint | WindowGroupHint; - data->wm_hints->input = !(style & WS_DISABLED); + data->wm_hints->input = !use_take_focus && !(style & WS_DISABLED); data->wm_hints->initial_state = (style & WS_MINIMIZE) ? IconicState : NormalState; data->wm_hints->window_group = group_leader; XSetWMHints( display, data->whole_window, data->wm_hints );

1 0

Juan Lang : ws2_32: Implement getsockopt(SOL_IRLMP, IRLMP_ENUMDEVICES).
by Alexandre Julliard Aug. 13, 2009

Aug. 13, 2009

Module: wine Branch: master Commit: cdffa876663bf8d4efe657cf3ae0b5a9af832912 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdffa876663bf8d4efe657cf3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 12 09:15:33 2009 -0700 ws2_32: Implement getsockopt(SOL_IRLMP, IRLMP_ENUMDEVICES). --- dlls/ws2_32/socket.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 67 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index afa8d9b..273f84a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2007,6 +2007,73 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, }/* end switch(optname) */ } /* end case NSPROTO_IPX */ #endif + +#ifdef HAVE_IRDA + case WS_SOL_IRLMP: + switch(optname) + { + case WS_IRLMP_ENUMDEVICES: + { + static const int MAX_IRDA_DEVICES = 10; + char buf[sizeof(struct irda_device_list) + + (MAX_IRDA_DEVICES - 1) * sizeof(struct irda_device_info)]; + int fd, res; + socklen_t len = sizeof(buf); + + if ( (fd = get_sock_fd( s, 0, NULL )) == -1) + return SOCKET_ERROR; + res = getsockopt( fd, SOL_IRLMP, IRLMP_ENUMDEVICES, buf, &len ); + if (res < 0) + { + SetLastError(wsaErrno()); + return SOCKET_ERROR; + } + else + { + struct irda_device_list *src = (struct irda_device_list *)buf; + DEVICELIST *dst = (DEVICELIST *)optval; + INT needed = sizeof(DEVICELIST), i; + + if (src->len > 0) + needed += (src->len - 1) * sizeof(IRDA_DEVICE_INFO); + if (*optlen < needed) + { + SetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + *optlen = needed; + TRACE("IRLMP_ENUMDEVICES: %d devices found:\n", src->len); + dst->numDevice = src->len; + for (i = 0; i < src->len; i++) + { + TRACE("saddr = %08x, daddr = %08x, info = %s, hints = %02x%02x\n", + src->dev[i].saddr, src->dev[i].daddr, + src->dev[i].info, src->dev[i].hints[0], + src->dev[i].hints[1]); + memcpy( dst->Device[i].irdaDeviceID, + &src->dev[i].daddr, + sizeof(dst->Device[i].irdaDeviceID) ) ; + memcpy( dst->Device[i].irdaDeviceName, + &src->dev[i].info, + sizeof(dst->Device[i].irdaDeviceName) ) ; + memcpy( &dst->Device[i].irdaDeviceHints1, + &src->dev[i].hints[0], + sizeof(dst->Device[i].irdaDeviceHints1) ) ; + memcpy( &dst->Device[i].irdaDeviceHints2, + &src->dev[i].hints[1], + sizeof(dst->Device[i].irdaDeviceHints2) ) ; + dst->Device[i].irdaCharSet = src->dev[i].charset; + } + return 0; + } + } + default: + FIXME("IrDA optname:0x%x\n", optname); + return SOCKET_ERROR; + } + break; /* case WS_SOL_IRLMP */ +#endif + /* Levels WS_IPPROTO_TCP and WS_IPPROTO_IP convert directly */ case WS_IPPROTO_TCP: switch(optname)

1 0

Juan Lang : ws2_32: Add debug support for IrDA addresses.
by Alexandre Julliard Aug. 13, 2009

Aug. 13, 2009

Module: wine Branch: master Commit: c3f2eceaf24d051c1f5a627e9798830e5cbb6cb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3f2eceaf24d051c1f5a627e9… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 12 09:15:17 2009 -0700 ws2_32: Add debug support for IrDA addresses. --- dlls/ws2_32/socket.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 7d408e0..afa8d9b 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -197,6 +197,16 @@ static inline const char *debugstr_sockaddr( const struct WS_sockaddr *a ) return wine_dbg_sprintf("{ family AF_INET6, address %s, port %d }", p, ntohs(sin->sin6_port)); } + case WS_AF_IRDA: + { + DWORD addr; + + memcpy( &addr, ((const SOCKADDR_IRDA *)a)->irdaDeviceID, sizeof(addr) ); + addr = ntohl( addr ); + return wine_dbg_sprintf("{ family AF_IRDA, addr %08x, name %s }", + addr, + ((const SOCKADDR_IRDA *)a)->irdaServiceName); + } default: return wine_dbg_sprintf("{ family %d }", a->sa_family); }

1 0

Juan Lang : ws2_32: Implement ws_sockaddr_u2ws for AF_IRDA.
by Alexandre Julliard Aug. 13, 2009

Aug. 13, 2009

Module: wine Branch: master Commit: f166a9dfbd4fb9a4881444584f347c5a162480d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f166a9dfbd4fb9a4881444584… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 12 09:15:05 2009 -0700 ws2_32: Implement ws_sockaddr_u2ws for AF_IRDA. --- dlls/ws2_32/socket.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 39bc1c8..7d408e0 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1086,6 +1086,23 @@ static int ws_sockaddr_u2ws(const struct sockaddr* uaddr, struct WS_sockaddr* ws } break; #endif +#ifdef HAVE_IRDA + case AF_IRDA: { + const struct sockaddr_irda *uin = (const struct sockaddr_irda *)uaddr; + SOCKADDR_IRDA *win = (SOCKADDR_IRDA *)wsaddr; + + if (*wsaddrlen < sizeof(SOCKADDR_IRDA)) + return -1; + win->irdaAddressFamily = WS_AF_IRDA; + memcpy( win->irdaDeviceID, &uin->sir_addr, sizeof(win->irdaDeviceID) ); + if (uin->sir_lsap_sel != LSAP_ANY) + sprintf( win->irdaServiceName, "LSAP-SEL%u", uin->sir_lsap_sel ); + else + memcpy( win->irdaServiceName, uin->sir_name, + sizeof(win->irdaServiceName) ); + return 0; + } +#endif case AF_INET6: { const struct sockaddr_in6* uin6 = (const struct sockaddr_in6*)uaddr; struct WS_sockaddr_in6_old* win6old = (struct WS_sockaddr_in6_old*)wsaddr;

1 0

Juan Lang : ws2_32: Implement ws_sockaddr_ws2u for AF_IRDA.
by Alexandre Julliard Aug. 13, 2009

Aug. 13, 2009

Module: wine Branch: master Commit: 2856794e66d22f8bb168325b86c5df9e7ce0e87a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2856794e66d22f8bb168325b8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 12 09:14:41 2009 -0700 ws2_32: Implement ws_sockaddr_ws2u for AF_IRDA. --- dlls/ws2_32/socket.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 5400ea4..39bc1c8 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -144,6 +144,7 @@ #include "ws2spi.h" #include "wsipx.h" #include "mstcpip.h" +#include "af_irda.h" #include "winnt.h" #include "iphlpapi.h" #include "wine/server.h" @@ -951,6 +952,32 @@ static unsigned int ws_sockaddr_ws2u(const struct WS_sockaddr* wsaddr, int wsadd memcpy(&uin->sin_addr,&win->sin_addr,4); /* 4 bytes = 32 address bits */ break; } +#ifdef HAVE_IRDA + case WS_AF_IRDA: { + struct sockaddr_irda *uin = (struct sockaddr_irda *)uaddr; + const SOCKADDR_IRDA *win = (const SOCKADDR_IRDA *)wsaddr; + + if (wsaddrlen < sizeof(SOCKADDR_IRDA)) + return 0; + uaddrlen = sizeof(struct sockaddr_irda); + memset( uaddr, 0, uaddrlen ); + uin->sir_family = AF_IRDA; + if (!strncmp( win->irdaServiceName, "LSAP-SEL", strlen( "LSAP-SEL" ) )) + { + unsigned int lsap_sel; + + sscanf( win->irdaServiceName, "LSAP-SEL%u", &lsap_sel ); + uin->sir_lsap_sel = lsap_sel; + } + else + { + uin->sir_lsap_sel = LSAP_ANY; + memcpy( uin->sir_name, win->irdaServiceName, 25 ); + } + memcpy( &uin->sir_addr, win->irdaDeviceID, sizeof(uin->sir_addr) ); + break; + } +#endif case WS_AF_UNSPEC: { /* Try to determine the needed space by the passed windows sockaddr space */ switch (wsaddrlen) { @@ -963,6 +990,11 @@ static unsigned int ws_sockaddr_ws2u(const struct WS_sockaddr* wsaddr, int wsadd uaddrlen = sizeof(struct sockaddr_ipx); break; #endif +#ifdef HAVE_IRDA + case sizeof(SOCKADDR_IRDA): + uaddrlen = sizeof(struct sockaddr_irda); + break; +#endif case sizeof(struct WS_sockaddr_in6): case sizeof(struct WS_sockaddr_in6_old): uaddrlen = sizeof(struct sockaddr_in6);

1 0

Juan Lang : ws2_32: Allow binding to IrDA sockets if IrDA support is compiled in.
by Alexandre Julliard Aug. 13, 2009

Aug. 13, 2009

Module: wine Branch: master Commit: 643466208b34aca185b9b4c5b77ff1b067c020b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=643466208b34aca185b9b4c5b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 12 09:14:27 2009 -0700 ws2_32: Allow binding to IrDA sockets if IrDA support is compiled in. --- dlls/ws2_32/socket.c | 30 ++++++++++++++++++++++++++---- 1 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 2bbb49c..5400ea4 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -110,6 +110,14 @@ # define HAVE_IPX #endif +#ifdef HAVE_LINUX_IRDA_H +# ifdef HAVE_LINUX_TYPES_H +# include <linux/types.h> +# endif +# include <linux/irda.h> +# define HAVE_IRDA +#endif + #ifdef HAVE_POLL_H #include <poll.h> #endif @@ -852,11 +860,25 @@ static struct WS_protoent *check_buffer_pe(int size) /* ----------------------------------- i/o APIs */ +static inline BOOL supported_pf(int pf) +{ + switch (pf) + { + case WS_AF_INET: + case WS_AF_INET6: + return TRUE; #ifdef HAVE_IPX -#define SUPPORTED_PF(pf) ((pf)==WS_AF_INET || (pf)== WS_AF_IPX || (pf) == WS_AF_INET6) -#else -#define SUPPORTED_PF(pf) ((pf)==WS_AF_INET || (pf) == WS_AF_INET6) + case WS_AF_IPX: + return TRUE; +#endif +#ifdef HAVE_IRDA + case WS_AF_IRDA: + return TRUE; #endif + default: + return FALSE; + } +} /**********************************************************************/ @@ -1425,7 +1447,7 @@ int WINAPI WS_bind(SOCKET s, const struct WS_sockaddr* name, int namelen) if (fd != -1) { - if (!name || (name->sa_family && !SUPPORTED_PF(name->sa_family))) + if (!name || (name->sa_family && !supported_pf(name->sa_family))) { SetLastError(WSAEAFNOSUPPORT); }

1 0

Juan Lang : ws2_32: Test for linux/irda.h.
by Alexandre Julliard Aug. 13, 2009

Aug. 13, 2009

Module: wine Branch: master Commit: 0ce420de733bb86b7542993e9601bbefa07e8820 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ce420de733bb86b7542993e9… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 12 09:14:16 2009 -0700 ws2_32: Test for linux/irda.h. --- configure | 10 ++++++---- configure.ac | 2 +- include/config.h.in | 3 +++ 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/configure b/configure index bff209f..3c3ddf2 100755 --- a/configure +++ b/configure @@ -5708,9 +5708,10 @@ fi done -for ac_header in linux/ipx.h +for ac_header in linux/ipx.h linux/irda.h do : - ac_fn_c_check_header_compile "$LINENO" "linux/ipx.h" "ac_cv_header_linux_ipx_h" "#include <sys/types.h> + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#include <sys/types.h> #ifdef HAVE_ASM_TYPES_H # include <asm/types.h> #endif @@ -5721,9 +5722,10 @@ do : # include <linux/types.h> #endif " -if test "x$ac_cv_header_linux_ipx_h" = x""yes; then : +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define HAVE_LINUX_IPX_H 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF fi diff --git a/configure.ac b/configure.ac index e637722..ef808d8 100644 --- a/configure.ac +++ b/configure.ac @@ -479,7 +479,7 @@ AC_CHECK_HEADERS([netinet/tcp_timer.h netinet/udp_var.h netinet/icmp_var.h netin #include <netinet/tcp_timer.h> #endif]) -AC_CHECK_HEADERS([linux/ipx.h],,, +AC_CHECK_HEADERS([linux/ipx.h linux/irda.h],,, [#include <sys/types.h> #ifdef HAVE_ASM_TYPES_H # include <asm/types.h> diff --git a/include/config.h.in b/include/config.h.in index 56d6fd9..293c489 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -396,6 +396,9 @@ /* Define to 1 if you have the <linux/ipx.h> header file. */ #undef HAVE_LINUX_IPX_H +/* Define to 1 if you have the <linux/irda.h> header file. */ +#undef HAVE_LINUX_IRDA_H + /* Define to 1 if you have the <linux/joystick.h> header file. */ #undef HAVE_LINUX_JOYSTICK_H

1 0

Juan Lang : ws2_32: Add af_irda.h.
by Alexandre Julliard Aug. 13, 2009

Aug. 13, 2009

Module: wine Branch: master Commit: 97319aa981904ba09e0ec78faf08d3d54deb7d71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97319aa981904ba09e0ec78fa… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 12 09:14:00 2009 -0700 ws2_32: Add af_irda.h. --- include/Makefile.in | 1 + include/af_irda.h | 100 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index fafdf8e..247568c 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -99,6 +99,7 @@ SRCDIR_INCLUDES = \ aclui.h \ adshlp.h \ advpub.h \ + af_irda.h \ appmgmt.h \ audevcod.h \ aviriff.h \ diff --git a/include/af_irda.h b/include/af_irda.h new file mode 100644 index 0000000..3be5b39 --- /dev/null +++ b/include/af_irda.h @@ -0,0 +1,100 @@ +/* + * Copyright 2009 Juan Lang + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#ifndef AF_IRDA_H +#define AF_IRDA_H + +typedef struct _IRDA_DEVICE_INFO +{ + UCHAR irdaDeviceID[4]; + char irdaDeviceName[22]; + UCHAR irdaDeviceHints1; + UCHAR irdaDeviceHints2; + UCHAR irdaCharSet; +} IRDA_DEVICE_INFO, *PIRDA_DEVICE_INFO; + +typedef struct _DEVICELIST +{ + ULONG numDevice; + IRDA_DEVICE_INFO Device[1]; +} DEVICELIST, *PDEVICELIST; + +typedef struct _SOCKADDR_IRDA +{ + USHORT irdaAddressFamily; + UCHAR irdaDeviceID[4]; + char irdaServiceName[25]; +} SOCKADDR_IRDA, *PSOCKADDR_IRDA, *LPSOCKADDR_IRDA; + +#ifdef USE_WS_PREFIX + +/* Socket levels and options */ +#define WS_SOL_IRLMP 0xff + +#define WS_IRLMP_ENUMDEVICES ((ULONG)0x10) +#define WS_IRLMP_IAS_SET ((ULONG)0x11) +#define WS_IRLMP_IAS_QUERY ((ULONG)0x12) +#define WS_IRLMP_SEND_PDU_LEN ((ULONG)0x13) +#define WS_IRLMP_EXCLUSIVE_MODE ((ULONG)0x14) +#define WS_IRLMP_IRLPT_MODE ((ULONG)0x15) +#define WS_IRLMP_9WIRE_MODE ((ULONG)0x16) +#define WS_IRLMP_TINYTP_MODE ((ULONG)0x17) +#define WS_IRLMP_PARAMETERS ((ULONG)0x18) +#define WS_IRLMP_DISCOVER_MODE ((ULONG)0x19) +#define WS_IRLMP_SHARP_MODE ((ULONG)0x20) + +#define WS_IAS_MAX_CLASSNAME 64 +#define WS_IAS_MAX_ATTRIBNAME 256 + +#else + +/* Socket levels and options */ +#define SOL_IRLMP 0xff + +#define IRLMP_ENUMDEVICES ((ULONG)0x10) +#define IRLMP_IAS_SET ((ULONG)0x11) +#define IRLMP_IAS_QUERY ((ULONG)0x12) +#define IRLMP_SEND_PDU_LEN ((ULONG)0x13) +#define IRLMP_EXCLUSIVE_MODE ((ULONG)0x14) +#define IRLMP_IRLPT_MODE ((ULONG)0x15) +#define IRLMP_9WIRE_MODE ((ULONG)0x16) +#define IRLMP_TINYTP_MODE ((ULONG)0x17) +#define IRLMP_PARAMETERS ((ULONG)0x18) +#define IRLMP_DISCOVER_MODE ((ULONG)0x19) +#define IRLMP_SHARP_MODE ((ULONG)0x20) + +#define IAS_MAX_CLASSNAME 64 +#define IAS_MAX_ATTRIBNAME 256 + +#endif + +#define IAS_MAX_OCTET_STRING 1024 +#define IAS_MAX_USER_STRING 256 + +#define LmCharSetASCII 0x00 +#define LmCharSetISO_8859_1 0x01 +#define LmCharSetISO_8859_2 0x02 +#define LmCharSetISO_8859_3 0x03 +#define LmCharSetISO_8859_4 0x04 +#define LmCharSetISO_8859_5 0x05 +#define LmCharSetISO_8859_6 0x06 +#define LmCharSetISO_8859_7 0x07 +#define LmCharSetISO_8859_8 0x08 +#define LmCharSetISO_8859_9 0x09 +#define LmCharSetUNICODE 0xff + +#endif /* AF_IRDA_H */

1 0

Juan Lang : ws2_32: Add AF_IRDA to the address family map.
by Alexandre Julliard Aug. 13, 2009

Aug. 13, 2009

Module: wine Branch: master Commit: b1a80b88374f51889ff5a7f3290e2b894d0e5422 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1a80b88374f51889ff5a7f32… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 12 09:13:18 2009 -0700 ws2_32: Add AF_IRDA to the address family map. --- dlls/ws2_32/socket.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 9471a48..2bbb49c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -319,6 +319,9 @@ static const int ws_af_map[][2] = #ifdef HAVE_IPX MAP_OPTION( AF_IPX ), #endif +#ifdef AF_IRDA + MAP_OPTION( AF_IRDA ), +#endif {FROM_PROTOCOL_INFO, FROM_PROTOCOL_INFO}, };

1 0