Changeset 21552

Timestamp:

Jan 11, 2011, 12:12:11 AM (15 years ago)

Author:

abwillis

Message:

Ticket #25 WSALookupServiceBeginA and W stubs.

Location:

trunk

Files:

• include/win/winsock2.h (modified) (3 diffs)
• src/ws2_32/socket.cpp (modified) (1 diff)
• src/ws2_32/ws2_32.def (modified) (1 diff)

trunk/include/win/winsock2.h

@@ -306 +306 @@
        unsigned int      PeakBandwidth;
        unsigned int      Latency;
-        unsigned int      DelayVariation;
+       unsigned int      DelayVariation;
        SERVICETYPE       ServiceType;
        unsigned int      MaxSduSize;
@@ -338 +338 @@
 );
 
+#ifndef _tagBLOB_DEFINED
+#define _tagBLOB_DEFINED
+#define _BLOB_DEFINED
+#define _LPBLOB_DEFINED
+typedef struct _BLOB {
+        ULONG   cbSize;
+        BYTE   *pBlobData;
+} BLOB, *LPBLOB;
+#endif
+
+#ifndef __CSADDR_DEFINED__
+#define __CSADDR_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
+
+/*socket address list */
+typedef struct _SOCKET_ADDRESS_LIST {
+        INT             iAddressCount;
+        SOCKET_ADDRESS  Address[1];
+} SOCKET_ADDRESS_LIST, *LPSOCKET_ADDRESS_LIST;
+
+/*   addressfamily protocol pairs */
+typedef struct _AFPROTOCOLS {
+        INT     iAddressFamily;
+        INT     iProtocol;
+} AFPROTOCOLS, *PAFPROTOCOLS, *LPAFPROTOCOLS;
+
+/* client query definitions */
+typedef enum _WSAEcomparator {
+        COMP_EQUAL = 0,
+        COMP_NOTLESS
+} WSAECOMPARATOR, *PWSAECOMPARATOR, *LPWSAECOMPARATOR;
+
+typedef struct _WSAVersion {
+        DWORD           dwVersion;
+        WSAECOMPARATOR  ecHow;
+} WSAVERSION, *PWSAVERSION, *LPWSAVERSION;
+
+
+typedef struct _WSAQuerySetA {
+        DWORD           dwSize;
+        LPSTR           lpszServiceInstanceName;
+        LPGUID          lpServiceClassId;
+        LPWSAVERSION    lpVersion;
+        LPSTR           lpszComment;
+        DWORD           dwNameSpace;
+        LPGUID          lpNSProviderId;
+        LPSTR           lpszContext;
+        DWORD           dwNumberOfProtocols;
+        LPAFPROTOCOLS   lpafpProtocols;
+        LPSTR           lpszQueryString;
+        DWORD           dwNumberOfCsAddrs;
+        LPCSADDR_INFO   lpcsaBuffer;
+        DWORD           dwOutputFlags;
+        LPBLOB          lpBlob;
+} WSAQUERYSETA, *PWSAQUERYSETA, *LPWSAQUERYSETA;
+
+typedef struct _WSAQuerySetW {
+        DWORD           dwSize;
+        LPWSTR          lpszServiceInstanceName;
+        LPGUID          lpServiceClassId;
+        LPWSAVERSION    lpVersion;
+        LPWSTR          lpszComment;
+        DWORD           dwNameSpace;
+        LPGUID          lpNSProviderId;
+        LPWSTR          lpszContext;
+        DWORD           dwNumberOfProtocols;
+        LPAFPROTOCOLS   lpafpProtocols;
+        LPWSTR          lpszQueryString;
+        DWORD           dwNumberOfCsAddrs;
+        LPCSADDR_INFO   lpcsaBuffer;
+        DWORD           dwOutputFlags;
+        LPBLOB          lpBlob;
+} WSAQUERYSETW, *PWSAQUERYSETW, *LPWSAQUERYSETW;
+
+DECL_WINELIB_TYPE_AW(WSAQUERYSET)
+DECL_WINELIB_TYPE_AW(PWSAQUERYSET)
+DECL_WINELIB_TYPE_AW(LPWSAQUERYSET)
 
 /* Function declarations */
@@ -369 +458 @@
                        LPINT lpFromlen, LPWSAOVERLAPPED lpOverlapped,
                        LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine);
+INT WINAPI WSALookupServiceBeginA( LPWSAQUERYSETA, DWORD, LPHANDLE);
+INT WINAPI WSALookupServiceBeginW( LPWSAQUERYSETW, DWORD, LPHANDLE);
+#define    WSALookupServiceBegin WINELIB_NAME_AW(WSALookupServiceBegin)
 
 extern INT WINAPI ioctlsocket(SOCKET s, LONG cmd, ULONG *argp);

trunk/src/ws2_32/socket.cpp

@@ -325 +325 @@
     return 0;
 }
+
+/***********************************************************************
+ *              WSALookupServiceBeginA                       (WS2_32.59)
+ */
+INT WINAPI WSALookupServiceBeginA( LPWSAQUERYSETA lpqsRestrictions,
+                                   DWORD dwControlFlags,
+                                   LPHANDLE lphLookup)
+{
+    FIXME("(%p 0x%08lx %p) Stub!\n", lpqsRestrictions, dwControlFlags,
+            lphLookup);
+    WSASetLastError(WSA_NOT_ENOUGH_MEMORY);
+    return SOCKET_ERROR;
+}
+
+/***********************************************************************
+ *              WSALookupServiceBeginW                       (WS2_32.60)
+ */
+INT WINAPI WSALookupServiceBeginW( LPWSAQUERYSETW lpqsRestrictions,
+                                   DWORD dwControlFlags,
+                                   LPHANDLE lphLookup)
+{
+    FIXME("(%p 0x%08lx %p) Stub!\n", lpqsRestrictions, dwControlFlags,
+            lphLookup);
+    WSASetLastError(WSA_NOT_ENOUGH_MEMORY);
+    return SOCKET_ERROR;
+}

trunk/src/ws2_32/ws2_32.def

@@ -81 +81 @@
 
 ; WSAJoinLeaf                                      @58
-; WSALookupServiceBeginA                           @59
-; WSALookupServiceBeginW                           @60
+  WSALookupServiceBeginA      = _WSALookupServiceBeginA@12            @59
+  WSALookupServiceBeginW      = _WSALookupServiceBeginW@12             @60
 ; WSALookupServiceEnd                              @61
 ; WSALookupServiceNextA                            @62