diff options
| -rw-r--r-- | winsup/w32api/ChangeLog | 22 | ||||
| -rw-r--r-- | winsup/w32api/include/nspapi.h | 103 | ||||
| -rw-r--r-- | winsup/w32api/include/svcguid.h | 33 | ||||
| -rw-r--r-- | winsup/w32api/include/winsock2.h | 26 | ||||
| -rw-r--r-- | winsup/w32api/include/wsipx.h | 28 | ||||
| -rw-r--r-- | winsup/w32api/lib/test.c | 2 |
6 files changed, 202 insertions, 12 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index b9b5f4f2d..4d15f94cb 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,25 @@ +2002-08-26 Bart Oldeman <bart.oldeman@btinternet.com> + + * include/winsock2.h (SOCKET_ADDRESS): Define if + __CSADDR_T_DEFINED is not defined (copied from nspapi.h) + (CSADDR_INFO): Ditto. + (nspapi.h) : Don't include. Removed FIXME comment. + * include/nspapi.h (SOCKET_ADDRESS) Only define if + __CSADDR_T_DEFINED is not defined. + (CSADDR_INFO): Ditto. + (BLOB): Add structure and typedef if not already defined. + (NS_*): Add defines. + (SERVICE_*): Ditto. + (SERVICE_ADDRESS): Add structure and typedefs. + (SERVICE_ADDRESSES): Ditto. + (SERVICE_INFO[AW]): Ditto, and add UNICODE mappings. + (LPSERVICE_ASYNC_INFO): Add typedef. + (SetService[AW], GetAddressByName[AW]): Add prototypes and UNICODE + mappings. + * include/wsipx.h: New file. + * include/svcguid.h: New file. + * lib/test.c: Include wspix.h and svcguid.h. + 2002-08-26 Casper S. Hornstrup <chorns@users.sourceforge.net> * include/wsahelp.h: New file. diff --git a/winsup/w32api/include/nspapi.h b/winsup/w32api/include/nspapi.h index 2a15c322e..54cb7cfaa 100644 --- a/winsup/w32api/include/nspapi.h +++ b/winsup/w32api/include/nspapi.h @@ -7,6 +7,41 @@ #ifdef __cplusplus extern "C" { #endif + +#define NS_ALL 0 + +#define NS_SAP 1 +#define NS_NDS 2 +#define NS_PEER_BROWSE 3 + +#define NS_TCPIP_LOCAL 10 +#define NS_TCPIP_HOSTS 11 +#define NS_DNS 12 +#define NS_NETBT 13 +#define NS_WINS 14 + +#define NS_NBP 20 + +#define NS_MS 30 +#define NS_STDA 31 +#define NS_NTDS 32 + +#define NS_X500 40 +#define NS_NIS 41 +#define NS_NISPLUS 42 + +#define NS_WRQ 50 + +#define SERVICE_REGISTER 1 +#define SERVICE_DEREGISTER 2 +#define SERVICE_FLUSH 3 +#define SERVICE_FLAG_HARD 0x00000002 + +#ifndef RC_INVOKED + +#if defined (_WINSOCK_H) || defined (_WINSOCK2_H) /* needed for LPSOCKADDR */ +#ifndef __CSADDR_T_DEFINED /* also in winsock2.h, but not in winsock.h */ +#define __CSADDR_T_DEFINED typedef struct _SOCKET_ADDRESS { LPSOCKADDR lpSockaddr; INT iSockaddrLength; @@ -17,6 +52,74 @@ typedef struct _CSADDR_INFO { INT iSocketType; INT iProtocol; } CSADDR_INFO,*PCSADDR_INFO,*LPCSADDR_INFO; +#endif +#endif + +#ifndef __BLOB_T_DEFINED /* also in wtypes.h and winsock2.h */ +#define __BLOB_T_DEFINED +typedef struct _BLOB { + ULONG cbSize; + BYTE *pBlobData; +} BLOB,*PBLOB,*LPBLOB; +#endif + +typedef struct _SERVICE_ADDRESS { + DWORD dwAddressType; + DWORD dwAddressFlags; + DWORD dwAddressLength; + DWORD dwPrincipalLength; + BYTE *lpAddress; + BYTE *lpPrincipal; +} SERVICE_ADDRESS; +typedef struct _SERVICE_ADDRESSES { + DWORD dwAddressCount; + SERVICE_ADDRESS Addresses[1]; +} SERVICE_ADDRESSES, *PSERVICE_ADDRESSES, *LPSERVICE_ADDRESSES; +typedef struct _SERVICE_INFOA { + LPGUID lpServiceType; + LPSTR lpServiceName; + LPSTR lpComment; + LPSTR lpLocale; + DWORD dwDisplayHint; + DWORD dwVersion; + DWORD dwTime; + LPSTR lpMachineName; + LPSERVICE_ADDRESSES lpServiceAddress; + BLOB ServiceSpecificInfo; +} SERVICE_INFOA, *LPSERVICE_INFOA; +typedef struct _SERVICE_INFOW { + LPGUID lpServiceType; + LPWSTR lpServiceName; + LPWSTR lpComment; + LPWSTR lpLocale; + DWORD dwDisplayHint; + DWORD dwVersion; + DWORD dwTime; + LPWSTR lpMachineName; + LPSERVICE_ADDRESSES lpServiceAddress; + BLOB ServiceSpecificInfo; +} SERVICE_INFOW, *LPSERVICE_INFOW; + +typedef void *LPSERVICE_ASYNC_INFO; +INT WINAPI SetServiceA(DWORD,DWORD,DWORD,LPSERVICE_INFOA,LPSERVICE_ASYNC_INFO,LPDWORD); +INT WINAPI SetServiceW(DWORD,DWORD,DWORD,LPSERVICE_INFOA,LPSERVICE_ASYNC_INFO,LPDWORD); +INT WINAPI GetAddressByNameA(DWORD,LPGUID,LPSTR,LPINT,DWORD,LPSERVICE_ASYNC_INFO,LPVOID,LPDWORD,LPTSTR,LPDWORD); +INT WINAPI GetAddressByNameW(DWORD,LPGUID,LPWSTR,LPINT,DWORD,LPSERVICE_ASYNC_INFO,LPVOID,LPDWORD,LPTSTR,LPDWORD); + +#ifdef UNICODE +typedef SERVICE_INFOW SERVICE_INFO, *LPSERVICE_INFO; +#define _SERVICE_INFO SERVICE_INFOW +#define SetService SetServiceW +#define GetAddressByName GetAddressByNameW +#else +typedef SERVICE_INFOA SERVICE_INFO, *LPSERVICE_INFO; +#define _SERVICE_INFO SERVICE_INFOA +#define SetService SetServiceA +#define GetAddressByName GetAddressByNameA +#endif + +#endif /* RC_INVOKED */ + #ifdef __cplusplus } #endif diff --git a/winsup/w32api/include/svcguid.h b/winsup/w32api/include/svcguid.h new file mode 100644 index 000000000..65072808c --- /dev/null +++ b/winsup/w32api/include/svcguid.h @@ -0,0 +1,33 @@ +#ifndef _SVCGUID_H +#define _SVCGUID_H +#if __GNUC__ >=3 +#pragma GCC system_header +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +#define SVCID_NETWARE(_SapId) \ + { (0x000B << 16) | (_SapId), 0, 0, { 0xC0,0,0,0,0,0,0,0x46 } } + +#define SAPID_FROM_SVCID_NETWARE(_g) \ + ((WORD)(_g->Data1 & 0xFFFF)) + +#define SET_NETWARE_SVCID(_g,_SapId) { \ + (_g)->Data1 = (0x000B << 16 ) | (_SapId); \ + (_g)->Data2 = 0; \ + (_g)->Data3 = 0; \ + (_g)->Data4[0] = 0xC0; \ + (_g)->Data4[1] = 0x0; \ + (_g)->Data4[2] = 0x0; \ + (_g)->Data4[3] = 0x0; \ + (_g)->Data4[4] = 0x0; \ + (_g)->Data4[5] = 0x0; \ + (_g)->Data4[6] = 0x0; \ + (_g)->Data4[7] = 0x46; } + +#ifdef __cplusplus +} +#endif +#endif diff --git a/winsup/w32api/include/winsock2.h b/winsup/w32api/include/winsock2.h index 5f7cf2c9a..dc01627cb 100644 --- a/winsup/w32api/include/winsock2.h +++ b/winsup/w32api/include/winsock2.h @@ -721,7 +721,6 @@ typedef struct _AFPROTOCOLS { INT iProtocol; } AFPROTOCOLS, *PAFPROTOCOLS, *LPAFPROTOCOLS; - typedef enum _WSAEcomparator { COMP_EQUAL = 0, @@ -734,23 +733,26 @@ typedef struct _WSAVersion WSAECOMPARATOR ecHow; } WSAVERSION, *PWSAVERSION, *LPWSAVERSION; -/* - * FIXME: nspapi.h has definition of SOCKET_ADDRESS needed by - * SOCKET_ADDRESS_LIST and LPCSADDR_INFO, needed in WSAQuery - * but itself needs LPSOCKADDR which is defined earlier in this file - * Incuding nspapi.h here works for now, but may need to change - * as nspapi.h actually starts to define the Name Space Provider API. - * MSDN docs say that SOCKET_ADDRESS is defined in winsock2.h. - */ - -#include <nspapi.h> +#ifndef __CSADDR_T_DEFINED /* also in nspapi.h */ +#define __CSADDR_T_DEFINED +typedef struct _SOCKET_ADDRESS { + LPSOCKADDR lpSockaddr; + INT iSockaddrLength; +} SOCKET_ADDRESS,*PSOCKET_ADDRESS,*LPSOCKET_ADDRESS; +typedef struct _CSADDR_INFO { + SOCKET_ADDRESS LocalAddr; + SOCKET_ADDRESS RemoteAddr; + INT iSocketType; + INT iProtocol; +} CSADDR_INFO,*PCSADDR_INFO,*LPCSADDR_INFO; +#endif typedef struct _SOCKET_ADDRESS_LIST { INT iAddressCount; SOCKET_ADDRESS Address[1]; } SOCKET_ADDRESS_LIST, * LPSOCKET_ADDRESS_LIST; -#ifndef __BLOB_T_DEFINED /* also in wtypes.h */ +#ifndef __BLOB_T_DEFINED /* also in wtypes.h and nspapi.h */ #define __BLOB_T_DEFINED typedef struct _BLOB { ULONG cbSize; diff --git a/winsup/w32api/include/wsipx.h b/winsup/w32api/include/wsipx.h new file mode 100644 index 000000000..4f24db43b --- /dev/null +++ b/winsup/w32api/include/wsipx.h @@ -0,0 +1,28 @@ +/* WSIPX.H - initially taken from the Wine project + */ + +#ifndef _WSIPX_H +#define _WSIPX_H +#if __GNUC__ >=3 +#pragma GCC system_header +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +#define NSPROTO_IPX 1000 +#define NSPROTO_SPX 1256 +#define NSPROTO_SPXII 1257 + +typedef struct sockaddr_ipx { + short sa_family; + char sa_netnum[4]; + char sa_nodenum[6]; + unsigned short sa_socket; +} SOCKADDR_IPX, *PSOCKADDR_IPX, *LPSOCKADDR_IPX; + +#ifdef __cplusplus +} +#endif +#endif diff --git a/winsup/w32api/lib/test.c b/winsup/w32api/lib/test.c index 7263d446f..a40a8cd7f 100644 --- a/winsup/w32api/lib/test.c +++ b/winsup/w32api/lib/test.c @@ -60,7 +60,9 @@ #include <ws2spi.h> #include <wsahelp.h> #endif +#include <wsipx.h> #include <wsnetbs.h> +#include <svcguid.h> #include <setupapi.h> #include <aclapi.h> #include <security.h> |