system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-06 00:11:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

ws2_32: Normalize IPX protocol names using the WS prefix.

Browse source
This commit is contained in:
Bruno Jesus 2013-12-27 13:48:40 -02:00 committed by Alexandre Julliard
parent d030a6c588
commit 658c2b5f28
2 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
dlls/ws2_32/socket.c
View file

@ -195,9 +195,9 @@ static const INT valid_protocols[] =
{ {
WS_IPPROTO_TCP, WS_IPPROTO_TCP,
WS_IPPROTO_UDP, WS_IPPROTO_UDP,
NSPROTO_IPX, WS_NSPROTO_IPX,
NSPROTO_SPX, WS_NSPROTO_SPX,
NSPROTO_SPXII, WS_NSPROTO_SPXII,
0 0
}; };
@ -1641,7 +1641,7 @@ static BOOL WS_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info )
strcpyW( info->szProtocol, NameUdpW ); strcpyW( info->szProtocol, NameUdpW );
break; break;
case NSPROTO_IPX: case WS_NSPROTO_IPX:
info->dwServiceFlags1 = XP1_PARTIAL_MESSAGE | XP1_SUPPORT_BROADCAST | info->dwServiceFlags1 = XP1_PARTIAL_MESSAGE | XP1_SUPPORT_BROADCAST |
XP1_SUPPORT_MULTIPOINT | XP1_MESSAGE_ORIENTED | XP1_SUPPORT_MULTIPOINT | XP1_MESSAGE_ORIENTED |
XP1_CONNECTIONLESS; XP1_CONNECTIONLESS;
@ -1659,7 +1659,7 @@ static BOOL WS_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info )
strcpyW( info->szProtocol, NameIpxW ); strcpyW( info->szProtocol, NameIpxW );
break; break;
case NSPROTO_SPX: case WS_NSPROTO_SPX:
info->dwServiceFlags1 = XP1_IFS_HANDLES | XP1_PSEUDO_STREAM | info->dwServiceFlags1 = XP1_IFS_HANDLES | XP1_PSEUDO_STREAM |
XP1_MESSAGE_ORIENTED | XP1_GUARANTEED_ORDER | XP1_MESSAGE_ORIENTED | XP1_GUARANTEED_ORDER |
XP1_GUARANTEED_DELIVERY; XP1_GUARANTEED_DELIVERY;
@ -1676,7 +1676,7 @@ static BOOL WS_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info )
strcpyW( info->szProtocol, NameSpxW ); strcpyW( info->szProtocol, NameSpxW );
break; break;
case NSPROTO_SPXII: case WS_NSPROTO_SPXII:
info->dwServiceFlags1 = XP1_IFS_HANDLES | XP1_GRACEFUL_CLOSE | info->dwServiceFlags1 = XP1_IFS_HANDLES | XP1_GRACEFUL_CLOSE |
XP1_PSEUDO_STREAM | XP1_MESSAGE_ORIENTED | XP1_PSEUDO_STREAM | XP1_MESSAGE_ORIENTED |
XP1_GUARANTEED_ORDER | XP1_GUARANTEED_DELIVERY; XP1_GUARANTEED_ORDER | XP1_GUARANTEED_DELIVERY;
@ -3207,7 +3207,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level,
} /* end switch(optname) */ } /* end switch(optname) */
}/* end case WS_SOL_SOCKET */ }/* end case WS_SOL_SOCKET */
#ifdef HAS_IPX #ifdef HAS_IPX
case NSPROTO_IPX: case WS_NSPROTO_IPX:
{ {
struct WS_sockaddr_ipx addr; struct WS_sockaddr_ipx addr;
IPX_ADDRESS_DATA *data; IPX_ADDRESS_DATA *data;
@ -3269,7 +3269,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level,
FIXME("IPX optname:%x\n", optname); FIXME("IPX optname:%x\n", optname);
return SOCKET_ERROR; return SOCKET_ERROR;
}/* end switch(optname) */ }/* end switch(optname) */
} /* end case NSPROTO_IPX */ } /* end case WS_NSPROTO_IPX */
#endif #endif
#ifdef HAS_IRDA #ifdef HAS_IRDA
@ -4752,7 +4752,7 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname,
break; /* case WS_SOL_SOCKET */ break; /* case WS_SOL_SOCKET */
#ifdef HAS_IPX #ifdef HAS_IPX
case NSPROTO_IPX: case WS_NSPROTO_IPX:
switch(optname) switch(optname)
{ {
case IPX_PTYPE: case IPX_PTYPE:
@ -4789,7 +4789,7 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname,
FIXME("opt_name:%x\n", optname); FIXME("opt_name:%x\n", optname);
return SOCKET_ERROR; return SOCKET_ERROR;
} }
break; /* case NSPROTO_IPX */ break; /* case WS_NSPROTO_IPX */
#endif #endif
/* Levels WS_IPPROTO_TCP and WS_IPPROTO_IP convert directly */ /* Levels WS_IPPROTO_TCP and WS_IPPROTO_IP convert directly */

6
include/wsipx.h
View file

@ -36,9 +36,15 @@ typedef struct WS_sockaddr_ipx
/* /*
* constants * constants
*/ */
#ifndef USE_WS_PREFIX
#define NSPROTO_IPX 1000 #define NSPROTO_IPX 1000
#define NSPROTO_SPX 1256 #define NSPROTO_SPX 1256
#define NSPROTO_SPXII 1257 #define NSPROTO_SPXII 1257
#else
#define WS_NSPROTO_IPX 1000
#define WS_NSPROTO_SPX 1256
#define WS_NSPROTO_SPXII 1257
#endif
#undef WS #undef WS
#endif /* _WINE_WSIPX_ */ #endif /* _WINE_WSIPX_ */