ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-02 19:26:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

[WS2_32]: Remove trailing whitespace.

Browse Source 
svn path=/trunk/; revision=74033
This commit is contained in:
Hermès Bélusca-Maïto
2017-03-03 00:13:40 +00:00
parent ad0bb95ddd
commit 948cba0848
25 changed files with 246 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/dll/win32/ws2_32/inc/ws2_32p.h
+1 -1
View File
@@ -537,7 +537,7 @@ WsNqProvLookupServiceBegin(
IN PNSQUERY_PROVIDER QueryProvider,
IN LPWSAQUERYSETW QuerySet,
IN LPWSASERVICECLASSINFOW ServiceClassInfo,
IN DWORD
IN DWORD
);
VOID
reactos/dll/win32/ws2_32/src/addrconv.c
+4 -4
View File
@@ -272,7 +272,7 @@ WSAHtonl(IN SOCKET s,
INT ErrorCode;
PWSSOCKET Socket;
DPRINT("WSAHtonl: %p, %lx, %p\n", s, hostlong, lpnetlong);
/* Check for WSAStartup */
if ((ErrorCode = WsQuickProlog()) == ERROR_SUCCESS)
{
@@ -330,7 +330,7 @@ WSAHtons(IN SOCKET s,
INT ErrorCode;
PWSSOCKET Socket;
DPRINT("WSAHtons: %p, %lx, %p\n", s, hostshort, lpnetshort);
/* Check for WSAStartup */
if ((ErrorCode = WsQuickProlog()) == ERROR_SUCCESS)
{
@@ -388,7 +388,7 @@ WSANtohl(IN SOCKET s,
INT ErrorCode;
PWSSOCKET Socket;
DPRINT("WSANtohl: %p, %lx, %p\n", s, netlong, lphostlong);
/* Check for WSAStartup */
if ((ErrorCode = WsQuickProlog()) == ERROR_SUCCESS)
{
@@ -446,7 +446,7 @@ WSANtohs(IN SOCKET s,
INT ErrorCode;
PWSSOCKET Socket;
DPRINT("WSANtohs: %p, %lx, %p\n", s, netshort, lphostshort);
/* Check for WSAStartup */
if ((ErrorCode = WsQuickProlog()) == ERROR_SUCCESS)
{
reactos/dll/win32/ws2_32/src/addrinfo.c
+36 -36
View File
@@ -58,7 +58,7 @@ ConvertAddrinfoFromUnicodeToAnsi(IN PADDRINFOW Addrinfo)
{
/* Get the name */
UnicodeName = &Addrinfo->ai_canonname;
/* Check if it exists */
if (*UnicodeName)
{
@@ -68,7 +68,7 @@ ConvertAddrinfoFromUnicodeToAnsi(IN PADDRINFOW Addrinfo)
{
/* Free the old one */
HeapFree(WsSockHeap, 0, *UnicodeName);
/* Set the new one */
*UnicodeName = (LPWSTR)AnsiName;
}
@@ -99,9 +99,9 @@ ParseV4Address(IN PCWSTR AddressString,
return FALSE;
WideCharToMultiByte(CP_ACP,
0,
AddressString,
-1,
AnsiAddressString,
AddressString,
-1,
AnsiAddressString,
sizeof(AnsiAddressString),
NULL,
0);
@@ -234,7 +234,7 @@ CloneAddrInfo(IN WORD Port,
/* Check if we ran out of memory */
if (Next) return EAI_MEMORY;
/* Return success */
return 0;
}
@@ -282,11 +282,11 @@ QueryDNS(IN LPCSTR NodeName,
/* Copy the canonical name */
strcpy(Alias, Hostent->h_name);
/* Return success */
return 0;
}
/* Find out what the error was */
switch (GetLastError())
{
@@ -345,7 +345,7 @@ LookupNodeByAddr(IN LPWSTR pNodeBuffer,
/* Get the reverse name */
Dns_Ip4AddressToReverseName_W(ReverseBuffer, *Ip4Addr);
}
/* FIXME: Not implemented for now
/* FIXME: Not implemented for now
else if ( */
/* By this point we have the Reverse Name, so prepare for lookup */
@@ -444,7 +444,7 @@ LookupAddressForName(IN LPCSTR NodeName,
/* Make a copy of the name */
strcpy(Name, NodeName);
/* Loop */
while (TRUE)
{
@@ -477,7 +477,7 @@ LookupAddressForName(IN LPCSTR NodeName,
{
/* Allocate memory for a copy */
(*pptResult)->ai_canonname = HeapAlloc(WsSockHeap, 0, 512);
/* Check if we had enough memory */
if (!(*pptResult)->ai_canonname)
{
@@ -487,11 +487,11 @@ LookupAddressForName(IN LPCSTR NodeName,
else
{
/* Convert the alias to UNICODE */
MultiByteToWideChar(CP_ACP,
0,
Alias,
-1,
(*pptResult)->ai_canonname,
MultiByteToWideChar(CP_ACP,
0,
Alias,
-1,
(*pptResult)->ai_canonname,
256);
}
}
@@ -551,7 +551,7 @@ GetAddrInfoW(IN PCWSTR pszNodeName,
SetLastError(EAI_FAIL);
return EAI_FAIL;
}
/* Save the flags and validate them */
iFlags = ptHints->ai_flags;
if ((iFlags & AI_CANONNAME) && !pszNodeName)
@@ -589,9 +589,9 @@ GetAddrInfoW(IN PCWSTR pszNodeName,
/* We need to convert it to ANSI */
WideCharToMultiByte(CP_ACP,
0,
pszServiceName,
-1,
AnsiServiceName,
pszServiceName,
-1,
AnsiServiceName,
sizeof(AnsiServiceName),
NULL,
0);
@@ -637,7 +637,7 @@ GetAddrInfoW(IN PCWSTR pszNodeName,
/* Return the port from the servent */
if (ptService) wPort = wTcpPort = ptService->s_port;
}
/* If we got 0, then fail */
if (wPort == 0)
{
@@ -653,7 +653,7 @@ GetAddrInfoW(IN PCWSTR pszNodeName,
iSocketType = SOCK_STREAM;
if (!wTcpPort && wUdpPort)
iSocketType = SOCK_DGRAM;
//bClone = (wTcpPort && wUdpPort);
//bClone = (wTcpPort && wUdpPort);
}
}
}
@@ -668,19 +668,19 @@ GetAddrInfoW(IN PCWSTR pszNodeName,
dwAddress = htonl((iFlags & AI_PASSIVE) ?
INADDR_ANY : INADDR_LOOPBACK);
}
/* Create the Addr Info */
*pptResult = NewAddrInfo(iSocketType, iProtocol, wPort, dwAddress);
/* If we didn't get one back, assume out of memory */
if (!(*pptResult)) iError = EAI_MEMORY;
/* Check if we have success and a nodename */
if (!iError && pszNodeName)
{
/* Set AI_NUMERICHOST since this is a numeric string */
(*pptResult)->ai_flags |= AI_NUMERICHOST;
/* Check if the canonical name was requested */
if (iFlags & AI_CANONNAME)
{
@@ -697,7 +697,7 @@ GetAddrInfoW(IN PCWSTR pszNodeName,
(*pptResult)->ai_canonname = HeapAlloc(WsSockHeap,
0,
wcslen(CanonicalName));
if (!(*pptResult)->ai_canonname)
{
/* No memory for the copy */
@@ -723,9 +723,9 @@ GetAddrInfoW(IN PCWSTR pszNodeName,
/* We need to convert it to ANSI */
WideCharToMultiByte(CP_ACP,
0,
pszNodeName,
-1,
AnsiNodeName,
pszNodeName,
-1,
AnsiNodeName,
sizeof(AnsiNodeName),
NULL,
0);
@@ -751,7 +751,7 @@ GetAddrInfoW(IN PCWSTR pszNodeName,
{
/* Free the address info and return nothing */
FreeAddrInfoW(*pptResult);
*pptResult = NULL;
*pptResult = NULL;
}
/* Return to caller */
@@ -778,7 +778,7 @@ freeaddrinfo(PADDRINFOA AddrInfo)
/* Free it */
HeapFree(WsSockHeap, 0, NextInfo->ai_canonname);
}
/* Check if there is an address */
if (NextInfo->ai_addr)
{
@@ -807,7 +807,7 @@ getaddrinfo(const char FAR *nodename,
{
INT ErrorCode;
LPWSTR UnicodeNodeName = NULL;
LPWSTR UnicodeServName = NULL;
LPWSTR UnicodeServName = NULL;
DPRINT("getaddrinfo: %s, %s, %p, %p\n", nodename, servname, hints, res);
/* Check for WSAStartup */
@@ -836,7 +836,7 @@ getaddrinfo(const char FAR *nodename,
goto Quickie;
}
}
/* Now call the unicode function */
ErrorCode = GetAddrInfoW(UnicodeNodeName,
UnicodeServName,
@@ -915,7 +915,7 @@ GetNameInfoW(IN CONST SOCKADDR *pSockaddr,
/* Unsupported family */
SetLastError(EAI_FAMILY);
return EAI_FAMILY;
}
}
/* Check for valid socket address length */
if ((DWORD)SockaddrLength < AddressLength)
@@ -923,7 +923,7 @@ GetNameInfoW(IN CONST SOCKADDR *pSockaddr,
/* Check if we have a node name */
if (pNodeBuffer)
{
{
/* Check if only the numeric host is wanted */
if (!(Flags & NI_NUMERICHOST))
{
@@ -1030,7 +1030,7 @@ getnameinfo(const struct sockaddr FAR *sa,
ServiceString = ServiceBuffer;
ServLength = sizeof(ServiceBuffer) / sizeof(WCHAR);
}
/* Now call the unicode function */
ErrorCode = GetNameInfoW(sa,
salen,
reactos/dll/win32/ws2_32/src/async.c
+1 -1
View File
@@ -954,7 +954,7 @@ WsAsyncCancelRequest(IN HANDLE TaskHandle)
WsAsyncFreeBlock(AsyncBlock);
return NO_ERROR;
}
/* Move to the next entry */
Entry = Entry->Flink;
}
reactos/dll/win32/ws2_32/src/dcatalog.c
+14 -14
View File
@@ -25,7 +25,7 @@ WSAAPI
WsTcAllocate(VOID)
{
PTCATALOG Catalog;
/* Allocate the object */
Catalog = HeapAlloc(WsSockHeap, HEAP_ZERO_MEMORY, sizeof(*Catalog));
@@ -283,7 +283,7 @@ WsTcRefreshFromRegistry(IN PTCATALOG Catalog,
ErrorCode = WSASYSCALLFAILURE;
break;
}
/* Get the next entry */
ErrorCode = RegQueryValueEx(Catalog->CatalogKey,
"Next_Catalog_Entry_ID",
@@ -313,7 +313,7 @@ WsTcRefreshFromRegistry(IN PTCATALOG Catalog,
}
/* Initialize them all */
for (i = 1; i <= CatalogEntries; i++)
for (i = 1; i <= CatalogEntries; i++)
{
/* Allocate a Catalog Entry Structure */
CatalogEntry = WsTcEntryAllocate();
@@ -517,13 +517,13 @@ WsTcGetEntryFromTriplet(IN PTCATALOG Catalog,
/* Check if Address Family Matches or if it's wildcard */
if ((Entry->ProtocolInfo.iAddressFamily == af) || (af == AF_UNSPEC))
{
{
/* Check if Socket Type Matches or if it's wildcard */
if ((Entry->ProtocolInfo.iSocketType == type) || (type == 0))
{
/* Check if Protocol is In Range or if it's wildcard */
if (((Entry->ProtocolInfo.iProtocol <= protocol) &&
((Entry->ProtocolInfo.iProtocol +
if (((Entry->ProtocolInfo.iProtocol <= protocol) &&
((Entry->ProtocolInfo.iProtocol +
Entry->ProtocolInfo.iProtocolMaxOffset) >= protocol)) ||
(protocol == 0))
{
@@ -542,18 +542,18 @@ WsTcGetEntryFromTriplet(IN PTCATALOG Catalog,
*CatalogEntry = Entry;
ErrorCode = ERROR_SUCCESS;
break;
}
else
}
else
{
ErrorCode = WSAEPROTONOSUPPORT;
}
}
else
}
else
{
ErrorCode = WSAESOCKTNOSUPPORT;
}
}
else
}
else
{
ErrorCode = WSAEAFNOSUPPORT;
}
@@ -790,7 +790,7 @@ CatalogChanged:
{
/* Load it */
ErrorCode = WsTcLoadProvider(Catalog, CatalogEntry);
/* Skip it if we failed to load it */
if (ErrorCode != ERROR_SUCCESS) continue;
@@ -830,7 +830,7 @@ CatalogChanged:
NewHandle = WPUModifyIFSHandle(ProtocolInfo.dwCatalogEntryId,
Handle,
&Error);
/* Check if the socket is invalid */
if (NewHandle == INVALID_SOCKET) return WSAENOTSOCK;
reactos/dll/win32/ws2_32/src/dcatitem.c
+5 -5
View File
@@ -81,18 +81,18 @@ WsTcEntryInitializeFromRegistry(IN PTCATALOG_ENTRY CatalogEntry,
&EntryKey);
/* Get Size of Catalog Entry Structure */
Return = RegQueryValueEx(EntryKey,
Return = RegQueryValueEx(EntryKey,
"PackedCatalogItem",
0,
NULL,
NULL,
&RegSize);
if(!(Buf = HeapAlloc(WsSockHeap, HEAP_ZERO_MEMORY, RegSize)))
if (!(Buf = HeapAlloc(WsSockHeap, HEAP_ZERO_MEMORY, RegSize)))
return ERROR_NOT_ENOUGH_MEMORY;
/* Read the Whole Catalog Entry Structure */
Return = RegQueryValueEx(EntryKey,
Return = RegQueryValueEx(EntryKey,
"PackedCatalogItem",
0,
&RegType,
@@ -102,7 +102,7 @@ WsTcEntryInitializeFromRegistry(IN PTCATALOG_ENTRY CatalogEntry,
memcpy(CatalogEntry->DllPath, Buf, sizeof(CatalogEntry->DllPath));
index = sizeof(CatalogEntry->DllPath);
if(index < RegSize)
if (index < RegSize)
{
memcpy(&CatalogEntry->ProtocolInfo, &Buf[index], sizeof(WSAPROTOCOL_INFOW));
index += sizeof(WSAPROTOCOL_INFOW);
reactos/dll/win32/ws2_32/src/dllmain.c
+1 -1
View File
@@ -33,7 +33,7 @@ DllMain(HANDLE hModule,
PWSPROCESS WsProcess;
/* Main Entrypoint */
switch (dwReason)
switch (dwReason)
{
case DLL_PROCESS_ATTACH:
/* Save DLL Handle */
reactos/dll/win32/ws2_32/src/dprovide.c
+7 -7
View File
@@ -20,14 +20,14 @@ WSAAPI
WsTpAllocate(VOID)
{
PTPROVIDER Provider;
DPRINT("WsTpAllocate: WsSockHeap %d\n", WsSockHeap);
/* Allocate the object */
Provider = HeapAlloc(WsSockHeap, HEAP_ZERO_MEMORY, sizeof(*Provider));
/* Setup non-zero data */
Provider->RefCount = 1;
/* Return it */
return Provider;
}
@@ -44,7 +44,7 @@ WsTpInitialize(IN PTPROVIDER Provider,
CHAR ExpandedDllPath[MAX_PATH];
DWORD ErrorCode;
DPRINT("WsTpInitialize: %p, %p, %p\n", Provider, DllName, ProtocolInfo);
/* Clear the tables */
RtlZeroMemory(&Provider->UpcallTable, sizeof(Provider->UpcallTable));
RtlZeroMemory(&Provider->Service, sizeof(Provider->Service));
@@ -72,14 +72,14 @@ WsTpInitialize(IN PTPROVIDER Provider,
/* Load the DLL */
Provider->DllHandle = LoadLibrary(ExpandedDllPath);
if(!Provider->DllHandle)
if (!Provider->DllHandle)
{
return SOCKET_ERROR;
}
/* Get the pointer to WSPStartup */
WSPStartupProc = (LPWSPSTARTUP)GetProcAddress(Provider->DllHandle, "WSPStartup");
if(!WSPStartupProc)
if (!WSPStartupProc)
{
return SOCKET_ERROR;
}
@@ -101,7 +101,7 @@ WsTpWSPCleanup(IN PTPROVIDER Provider,
{
LPWSPCLEANUP WSPCleanup = NULL;
INT ErrorCode = ERROR_SUCCESS;
/* Make sure we have a loaded handle */
if (Provider->DllHandle)
{
@@ -121,7 +121,7 @@ WSAAPI
WsTpDelete(IN PTPROVIDER Provider)
{
INT ErrorCode;
/* Make sure we have a loaded handle */
if (Provider->DllHandle)
{
reactos/dll/win32/ws2_32/src/dthread.c
+6 -6
View File
@@ -18,7 +18,7 @@ WsThreadDefaultBlockingHook(VOID)
{
MSG Message;
BOOL GotMessage = FALSE;
/* Get the message */
GotMessage = PeekMessage(&Message, NULL, 0, 0, PM_REMOVE);
@@ -46,7 +46,7 @@ WsThreadBlockingCallback(IN DWORD_PTR Context)
Thread->Cancelled = FALSE;
/* Call the blocking hook */
while(Thread->BlockingHook());
while (Thread->BlockingHook());
/* We're not blocking anymore */
Thread->Blocking = FALSE;
@@ -135,7 +135,7 @@ WSAAPI
WsThreadAllocate(VOID)
{
PWSTHREAD Thread;
/* Allocate the object */
Thread = HeapAlloc(WsSockHeap, HEAP_ZERO_MEMORY, sizeof(*Thread));
@@ -151,7 +151,7 @@ WSAAPI
WsThreadStartup(VOID)
{
INT ErrorCode = WSASYSCALLFAILURE;
/* Check if we have a valid TLS */
if (TlsIndex != TLS_OUT_OF_INDEXES)
{
@@ -175,7 +175,7 @@ WsThreadInitialize(IN PWSTHREAD Thread,
IN PWSPROCESS Process)
{
INT ErrorCode = WSASYSCALLFAILURE;
/* Set the process */
Thread->Process = Process;
@@ -244,7 +244,7 @@ WsThreadCreate(IN PWSPROCESS Process,
{
PWSTHREAD Thread = NULL;
INT ErrorCode = WSASYSCALLFAILURE;
/* Make sure we have TLS */
if (TlsIndex != TLS_OUT_OF_INDEXES)
{
reactos/dll/win32/ws2_32/src/dupsock.c
+4 -4
View File
@@ -27,16 +27,16 @@ WSADuplicateSocketA(IN SOCKET s,
WSAPROTOCOL_INFOW ProtocolInfoW;
INT ErrorCode;
DPRINT("WSADuplicateSocketA: %lx, %lx, %p\n", s, dwProcessId, lpProtocolInfo);
/* Call the Unicode Function */
ErrorCode = WSADuplicateSocketW(s, dwProcessId, &ProtocolInfoW);
/* Check for success */
if (ErrorCode == ERROR_SUCCESS)
{
{
/* Convert Protocol Info to Ansi */
if (lpProtocolInfo)
{
if (lpProtocolInfo)
{
/* Convert the information to ANSI */
ErrorCode = MapUnicodeProtocolInfoToAnsi(&ProtocolInfoW,
lpProtocolInfo);
reactos/dll/win32/ws2_32/src/event.c
+4 -4
View File
@@ -79,10 +79,10 @@ WSAWaitForMultipleEvents(IN DWORD cEvents,
IN BOOL fAlertable)
{
/* Call Win32 */
return WaitForMultipleObjectsEx(cEvents,
lphEvents,
fWaitAll,
dwTimeout,
return WaitForMultipleObjectsEx(cEvents,
lphEvents,
fWaitAll,
dwTimeout,
fAlertable);
}
reactos/dll/win32/ws2_32/src/getxbyxx.c
+56 -56
View File
@@ -16,16 +16,16 @@
/* DATA **********************************************************************/
AFPROTOCOLS afp[2] = {{AF_INET, IPPROTO_UDP}, {AF_INET, IPPROTO_TCP}};
/* FUNCTIONS *****************************************************************/
VOID
WSAAPI
FixList(PCHAR **List,
FixList(PCHAR **List,
ULONG_PTR Base)
{
/* Make sure it's valid */
if(*List)
if (*List)
{
PCHAR *Addr;
@@ -33,7 +33,7 @@ FixList(PCHAR **List,
Addr = *List = (PCHAR*)(((ULONG_PTR)*List + Base));
/* Loop the pointers */
while(*Addr)
while (*Addr)
{
/* Rebase them too */
*Addr = (PCHAR)(((ULONG_PTR)*Addr + Base));
@@ -63,7 +63,7 @@ UnpackHostEnt(PHOSTENT Hostent)
ULONG_PTR HostentPtr = (ULONG_PTR)Hostent;
/* Convert the Name Offset to a Pointer */
if(Hostent->h_name) Hostent->h_name = (PCHAR)(Hostent->h_name + HostentPtr);
if (Hostent->h_name) Hostent->h_name = (PCHAR)(Hostent->h_name + HostentPtr);
/* Convert all the List Offsets to Pointers */
FixList(&Hostent->h_aliases, HostentPtr);
@@ -126,7 +126,7 @@ getxyDataEnt(IN OUT PCHAR *Results,
WsaQuery->dwNumberOfProtocols = sizeof(afp)/sizeof(afp[0]);
WsaQuery->lpafpProtocols = afp;
if(!IsEqualGUID(Type, &HostnameGuid))
if (!IsEqualGUID(Type, &HostnameGuid))
dwControlFlags |= LUP_RETURN_BLOB;
/* Send the Query Request to find a Service */
@@ -134,7 +134,7 @@ getxyDataEnt(IN OUT PCHAR *Results,
dwControlFlags,
&RnRHandle);
if(ErrorCode == ERROR_SUCCESS)
if (ErrorCode == ERROR_SUCCESS)
{
while (TRUE)
{
@@ -145,22 +145,22 @@ getxyDataEnt(IN OUT PCHAR *Results,
WsaQuery);
/* Return the information requested */
if(ErrorCode == ERROR_SUCCESS)
if (ErrorCode == ERROR_SUCCESS)
{
/* Get the Blob and check if we have one */
Blob = WsaQuery->lpBlob;
if(Blob)
if (Blob)
{
/* Did they want the name back? */
if(NewName) *NewName = WsaQuery->lpszServiceInstanceName;
}
else
if (NewName) *NewName = WsaQuery->lpszServiceInstanceName;
}
else
{
/* Check if this was a Hostname lookup */
if (IsEqualGUID(Type, &HostnameGuid))
{
/* Return the name anyways */
if(NewName) *NewName = WsaQuery->lpszServiceInstanceName;
if (NewName) *NewName = WsaQuery->lpszServiceInstanceName;
}
else
{
@@ -168,8 +168,8 @@ getxyDataEnt(IN OUT PCHAR *Results,
ErrorCode = WSANO_DATA;
}
}
}
else
}
else
{
/* WSALookupServiceEnd will set its own error, so save ours */
ErrorCode = GetLastError();
@@ -197,12 +197,12 @@ getxyDataEnt(IN OUT PCHAR *Results,
}
}
}
/* Finish the Query Request */
WSALookupServiceEnd(RnRHandle);
/* Now set the Last Error */
if(ErrorCode != ERROR_SUCCESS) SetLastError(ErrorCode);
if (ErrorCode != ERROR_SUCCESS) SetLastError(ErrorCode);
/* Leave the loop */
break;
@@ -240,13 +240,13 @@ gethostbyname(IN const char FAR * name)
}
/* Check if no name was given */
if(!name || !*name)
if (!name || !*name)
{
/* This means we should do a local lookup first */
if(gethostname(szLocalName, MAX_HOSTNAME_LEN) != NO_ERROR) return(NULL);
if (gethostname(szLocalName, MAX_HOSTNAME_LEN) != NO_ERROR) return(NULL);
pszName = szLocalName;
}
else
}
else
{
/* Use the name tha twas given to us */
pszName = (PCHAR)name;
@@ -258,7 +258,7 @@ gethostbyname(IN const char FAR * name)
pszName,
&HostAddrByNameGuid,
0);
/* Check if we didn't get a blob, or if we got an empty name */
if (!(Blob) && (!(name) || !(*name)))
{
@@ -271,21 +271,21 @@ gethostbyname(IN const char FAR * name)
}
/* Check if we got a blob */
if(Blob)
if (Blob)
{
/* Copy the blob to our buffer and convert it */
Hostent = WsThreadBlobToHostent(Thread, Blob);
/* Unpack the hostent */
if(Hostent) UnpackHostEnt(Hostent);
}
else
if (Hostent) UnpackHostEnt(Hostent);
}
else
{
/* We failed, so zero it out */
Hostent = NULL;
/* Normalize the error message */
if(GetLastError() == WSASERVICE_NOT_FOUND)
if (GetLastError() == WSASERVICE_NOT_FOUND)
{
SetLastError(WSAHOST_NOT_FOUND);
}
@@ -360,23 +360,23 @@ gethostbyaddr(IN const char FAR * addr,
AddressBuffer,
&AddressGuid,
0);
/* Check if we got a blob */
if(Blob)
if (Blob)
{
/* Copy the blob to our buffer and convert it */
Hostent = WsThreadBlobToHostent(Thread, Blob);
/* Unpack the hostent */
if(Hostent) UnpackHostEnt(Hostent);
}
else
if (Hostent) UnpackHostEnt(Hostent);
}
else
{
/* We failed, so zero it out */
Hostent = NULL;
/* Normalize the error message */
if(GetLastError() == WSASERVICE_NOT_FOUND)
if (GetLastError() == WSASERVICE_NOT_FOUND)
{
SetLastError(WSAHOST_NOT_FOUND);
}
@@ -410,7 +410,7 @@ gethostname(OUT char FAR * name,
/* Get the Hostname in a String */
/* getxyDataEnt does not return blob for HostnameGuid */
getxyDataEnt(&Results, RNR_BUFFER_SIZE, NULL, &HostnameGuid, &Name);
if(Name)
if (Name)
{
/* Copy it */
strncpy(name, Name, namelen-1);
@@ -450,7 +450,7 @@ getservbyport(IN int port,
}
/* No protocol specified */
if(!proto) proto = "";
if (!proto) proto = "";
/* Allocate memory for the port name */
PortName = HeapAlloc(WsSockHeap, 0, strlen(proto) + 1 + 1 + 5);
@@ -471,15 +471,15 @@ getservbyport(IN int port,
HeapFree(WsSockHeap, 0, PortName);
/* Check if we got a blob */
if(Blob)
if (Blob)
{
/* Copy the blob to our buffer and convert it */
Servent = WsThreadBlobToServent(Thread, Blob);
/* Unpack the hostent */
if(Servent) UnpackServEnt(Servent);
}
else
if (Servent) UnpackServEnt(Servent);
}
else
{
/* We failed, so zero it out */
Servent = 0;
@@ -519,7 +519,7 @@ getservbyname(IN const char FAR * name,
}
/* No protocol specified */
if(!proto) proto = "";
if (!proto) proto = "";
/* Allocate buffer for it */
PortName = HeapAlloc(WsSockHeap, 0, strlen(proto) + 1 + strlen(name) + 1);
@@ -540,15 +540,15 @@ getservbyname(IN const char FAR * name,
HeapFree(WsSockHeap, 0, PortName);
/* Check if we got a blob */
if(Blob)
if (Blob)
{
/* Copy the blob to our buffer and convert it */
Servent = WsThreadBlobToServent(Thread, Blob);
/* Unpack the hostent */
if(Servent) UnpackServEnt(Servent);
}
else
if (Servent) UnpackServEnt(Servent);
}
else
{
/* We failed, so zero it out */
Servent = 0;
@@ -568,10 +568,10 @@ HANDLE
WSAAPI
WSAAsyncGetHostByAddr(IN HWND hWnd,
IN UINT wMsg,
IN CONST CHAR FAR *Address,
IN CONST CHAR FAR *Address,
IN INT Length,
IN INT Type,
OUT CHAR FAR *Buffer,
IN INT Type,
OUT CHAR FAR *Buffer,
IN INT BufferLength)
{
HANDLE TaskHandle;
@@ -633,10 +633,10 @@ WSAAsyncGetHostByAddr(IN HWND hWnd,
*/
HANDLE
WSAAPI
WSAAsyncGetHostByName(IN HWND hWnd,
IN UINT wMsg,
IN CONST CHAR FAR *Name,
OUT CHAR FAR *Buffer,
WSAAsyncGetHostByName(IN HWND hWnd,
IN UINT wMsg,
IN CONST CHAR FAR *Name,
OUT CHAR FAR *Buffer,
IN INT BufferLength)
{
HANDLE TaskHandle;
@@ -771,7 +771,7 @@ WSAAsyncGetProtoByNumber(IN HWND hWnd,
PWSASYNCBLOCK AsyncBlock;
INT ErrorCode;
DPRINT("WSAAsyncGetProtoByNumber: %lx, %lx, %lx\n", hWnd, wMsg, Number);
/* Enter prolog */
if ((ErrorCode = WsApiProlog(&Process, &Thread)) != ERROR_SUCCESS)
{
@@ -831,7 +831,7 @@ WSAAsyncGetServByName(IN HWND hWnd,
INT ErrorCode;
PVOID NameCopy;
DPRINT("WSAAsyncGetProtoByNumber: %lx, %lx, %s\n", hWnd, wMsg, Name);
/* Enter prolog */
if ((ErrorCode = WsApiProlog(&Process, &Thread)) != ERROR_SUCCESS)
{
@@ -895,7 +895,7 @@ WSAAsyncGetServByPort(IN HWND hWnd,
PWSASYNCBLOCK AsyncBlock;
INT ErrorCode;
DPRINT("WSAAsyncGetProtoByNumber: %lx, %lx, %lx\n", hWnd, wMsg, Port);
/* Enter prolog */
if ((ErrorCode = WsApiProlog(&Process, &Thread)) != ERROR_SUCCESS)
{
@@ -948,7 +948,7 @@ WSACancelAsyncRequest(IN HANDLE hAsyncTaskHandle)
PWSTHREAD Thread;
INT ErrorCode;
DPRINT("WSACancelAsyncRequest: %lx\n", hAsyncTaskHandle);
/* Enter prolog */
if ((ErrorCode = WsApiProlog(&Process, &Thread)) == ERROR_SUCCESS)
{
@@ -958,7 +958,7 @@ WSACancelAsyncRequest(IN HANDLE hAsyncTaskHandle)
/* Return */
if (ErrorCode == ERROR_SUCCESS) return ERROR_SUCCESS;
}
/* Fail */
SetLastError(ErrorCode);
return SOCKET_ERROR;
reactos/dll/win32/ws2_32/src/nscatalo.c
+7 -7
View File
@@ -282,7 +282,7 @@ WsNcRefreshFromRegistry(IN PNSCATALOG Catalog,
}
/* Initialize them all */
for (i = 1; i <= CatalogEntries; i++)
for (i = 1; i <= CatalogEntries; i++)
{
/* Allocate a Catalog Entry Structure */
CatalogEntry = WsNcEntryAllocate();
@@ -396,12 +396,12 @@ WsNcLoadProvider(IN PNSCATALOG Catalog,
CatalogEntry->DllPath,
&CatalogEntry->ProviderId);
/* Ensure success */
if (ErrorCode == ERROR_SUCCESS)
{
/* Set the provider */
WsNcEntrySetProvider(CatalogEntry, Provider);
}
/* Ensure success */
if (ErrorCode == ERROR_SUCCESS)
{
/* Set the provider */
WsNcEntrySetProvider(CatalogEntry, Provider);
}
/* Dereference it */
WsNpDereference(Provider);
reactos/dll/win32/ws2_32/src/nsprovid.c
+4 -4
View File
@@ -17,7 +17,7 @@ WSAAPI
WsNqProvAllocate(VOID)
{
PNSQUERY_PROVIDER Provider;
/* Allocate the object */
Provider = HeapAlloc(WsSockHeap, HEAP_ZERO_MEMORY, sizeof(*Provider));
@@ -63,7 +63,7 @@ WSAAPI
WsNpAllocate(VOID)
{
PNS_PROVIDER Provider;
/* Allocate the object */
Provider = HeapAlloc(WsSockHeap, HEAP_ZERO_MEMORY, sizeof(*Provider));
@@ -84,7 +84,7 @@ WsNpInitialize(IN PNS_PROVIDER Provider,
INT ErrorCode = ERROR_SUCCESS;
LPNSPSTARTUP NSPStartupProc;
CHAR AnsiPath[MAX_PATH], ExpandedDllPath[MAX_PATH];
/* Convert the path to ANSI */
WideCharToMultiByte(CP_ACP,
0,
@@ -138,7 +138,7 @@ WsNpNSPCleanup(IN PNS_PROVIDER Provider)
{
INT ErrorCode = ERROR_SUCCESS;
LPNSPCLEANUP lpNSPCleanup = NULL;
/* Make sure we have a loaded handle */
if (Provider->DllHandle)
{
reactos/dll/win32/ws2_32/src/nsquery.c
+13 -13
View File
@@ -22,7 +22,7 @@ WSAAPI
WsNqAllocate(VOID)
{
PNSQUERY NsQuery;
/* Allocate the object */
NsQuery = HeapAlloc(WsSockHeap, HEAP_ZERO_MEMORY, sizeof(*NsQuery));
@@ -30,7 +30,7 @@ WsNqAllocate(VOID)
NsQuery->Signature = ~0xBEADFACE;
InitializeListHead(&NsQuery->ProviderList);
NsQuery->TryAgain = TRUE;
/* Return it */
return NsQuery;
}
@@ -73,7 +73,7 @@ WsNqDelete(IN PNSQUERY NsQuery)
{
PNSQUERY_PROVIDER Provider;
PLIST_ENTRY Entry;
/* Make sure that we got initialized */
if (!NsQuery->ProviderList.Flink) return;
@@ -163,7 +163,7 @@ WsNqLookupServiceEnd(IN PNSQUERY NsQuery)
{
PNSQUERY_PROVIDER Provider;
PLIST_ENTRY Entry;
/* Protect us from closure */
WsNqLock();
NsQuery->ShuttingDown = TRUE;
@@ -266,7 +266,7 @@ WsNqLookupServiceNext(IN PNSQUERY NsQuery,
/* Save the current active provider */
Provider = NsQuery->ActiveProvider;
/* Check if one exists */
if (Provider)
{
@@ -313,7 +313,7 @@ WsNqLookupServiceNext(IN PNSQUERY NsQuery,
/* Reset it */
WsNqProvLookupServiceEnd(Provider);
WsNqProvDelete(Provider);
}
}
/* Start a new query */
if (!WsNqLookupServiceBegin(NsQuery,
@@ -322,7 +322,7 @@ WsNqLookupServiceNext(IN PNSQUERY NsQuery,
NsQuery->Catalog))
{
/* New query succeeded, set active provider now */
NsQuery->ActiveProvider =
NsQuery->ActiveProvider =
WsNqNextProvider(NsQuery,
NsQuery->ActiveProvider);
}
@@ -338,7 +338,7 @@ WsNqLookupServiceNext(IN PNSQUERY NsQuery,
WsNqUnlock();
/* Keep looping as long as there is a provider */
} while (NextProvider);
} while (NextProvider);
}
}
else
@@ -390,7 +390,7 @@ WsNqLookupServiceBegin(IN PNSQUERY NsQuery,
NsQuery->ControlFlags = ControlFlags;
NsQuery->Catalog = Catalog;
}
/* Check if we have a specific ID */
if (Restrictions->lpNSProviderId)
{
@@ -425,7 +425,7 @@ WsNqLookupServiceBegin(IN PNSQUERY NsQuery,
WsNqBeginEnumerationProc,
&EnumContext);
ErrorCode = EnumContext.ErrorCode;
/* Check for success */
if (ErrorCode != ERROR_SUCCESS)
{
@@ -521,7 +521,7 @@ WsNqNextProvider(IN PNSQUERY Query,
{
PNSQUERY_PROVIDER NextProvider = NULL;
PLIST_ENTRY Entry;
/* Get the first entry and get its provider */
Entry = Provider->QueryLink.Flink;
if (Entry != &Query->ProviderList)
@@ -541,7 +541,7 @@ WsNqPreviousProvider(IN PNSQUERY Query,
{
PNSQUERY_PROVIDER NextProvider = NULL;
PLIST_ENTRY Entry;
/* Get the first entry and get its provider */
Entry = Provider->QueryLink.Blink;
if (Entry != &Query->ProviderList)
@@ -561,7 +561,7 @@ WsNqAddProvider(IN PNSQUERY Query,
{
PNSQUERY_PROVIDER QueryProvider;
DWORD Return = TRUE;
/* Allocate a new Query Provider */
if ((QueryProvider = WsNqProvAllocate()))
{
reactos/dll/win32/ws2_32/src/qos.c
+2 -2
View File
@@ -20,8 +20,8 @@
*/
BOOL
WSAAPI
WSAGetQOSByName(IN SOCKET s,
IN OUT LPWSABUF lpQOSName,
WSAGetQOSByName(IN SOCKET s,
IN OUT LPWSABUF lpQOSName,
OUT LPQOS lpQOS)
{
PWSSOCKET Socket;
reactos/dll/win32/ws2_32/src/qshelpr.c
+6 -6
View File
@@ -204,14 +204,14 @@ ComputeQuerySetSize(IN LPWSAQUERYSETA AnsiSet,
if (AnsiSet->lpcsaBuffer[i].LocalAddr.lpSockaddr)
{
/* Align the current size and add the sockaddr's length */
Size = (Size + 3) & ~3;
Size = (Size + 3) & ~3;
Size += AnsiSet->lpcsaBuffer[i].LocalAddr.iSockaddrLength;
}
/* Check for remote sockaddr */
if (AnsiSet->lpcsaBuffer[i].RemoteAddr.lpSockaddr)
{
/* Align the current size and add the sockaddr's length */
Size = (Size + 3) & ~3;
Size = (Size + 3) & ~3;
Size += AnsiSet->lpcsaBuffer[i].RemoteAddr.iSockaddrLength;
}
@@ -825,11 +825,11 @@ MapAnsiQuerySetToUnicode(IN LPWSAQUERYSETA AnsiSet,
ErrorCode = WSA_NOT_ENOUGH_MEMORY;
goto error;
}
/* Build the relative buffer version */
ErrorCode = WSABuildQuerySetBufferA(AnsiSet, AnsiSize, AnsiCopy);
if (ErrorCode != ERROR_SUCCESS) goto error;
/* Re-use the ANSI version since the fields match */
UnicodeCopy = (LPWSAQUERYSETW)AnsiCopy;
@@ -946,11 +946,11 @@ MapUnicodeQuerySetToAnsi(OUT LPWSAQUERYSETW UnicodeSet,
ErrorCode = WSA_NOT_ENOUGH_MEMORY;
goto error;
}
/* Build the relative buffer version */
ErrorCode = WSABuildQuerySetBufferW(UnicodeSet, UnicodeSize, UnicodeCopy);
if (ErrorCode != ERROR_SUCCESS) goto error;
/* Re-use the Unicode version since the fields match */
AnsiCopy = (LPWSAQUERYSETA)UnicodeCopy;
reactos/dll/win32/ws2_32/src/rasdial.c
+3 -3
View File
@@ -110,13 +110,13 @@ WsRasLoadHelperDll(VOID)
if (WsRasDllHandle)
{
/* Get function pointers */
lpfnWSAttemptAutodialAddr =
lpfnWSAttemptAutodialAddr =
(PVOID)GetProcAddress(WsRasDllHandle,
"WSAttemptAutodialAddr");
lpfnWSAttemptAutodialName =
lpfnWSAttemptAutodialName =
(PVOID)GetProcAddress(WsRasDllHandle,
"WSAttemptAutodialName");
lpfnWSNoteSuccessfulHostentLookup =
lpfnWSNoteSuccessfulHostentLookup =
(PVOID)GetProcAddress(WsRasDllHandle,
"WSNoteSuccessfulHostentLookup");
}
reactos/dll/win32/ws2_32/src/recv.c
+18 -18
View File
@@ -45,13 +45,13 @@ recv(IN SOCKET s,
/* Make the call */
Status = Socket->Provider->Service.lpWSPRecv(s,
&Buffers,
&Buffers,
1,
&BytesReceived,
(LPDWORD)&flags,
&BytesReceived,
(LPDWORD)&flags,
NULL,
NULL,
ThreadId,
NULL,
ThreadId,
&ErrorCode);
/* Deference the Socket Context */
WsSockDereference(Socket);
@@ -111,15 +111,15 @@ recvfrom(IN SOCKET s,
/* Make the call */
Status = Socket->Provider->Service.lpWSPRecvFrom(s,
&Buffers,
&Buffers,
1,
&BytesReceived,
&BytesReceived,
(LPDWORD)&flags,
from,
fromlen,
NULL,
NULL,
ThreadId,
NULL,
ThreadId,
&ErrorCode);
/* Deference the Socket Context */
WsSockDereference(Socket);
@@ -174,13 +174,13 @@ WSARecv(IN SOCKET s,
{
/* Make the call */
Status = Socket->Provider->Service.lpWSPRecv(s,
lpBuffers,
lpBuffers,
dwBufferCount,
lpNumberOfBytesRecvd,
lpFlags,
lpNumberOfBytesRecvd,
lpFlags,
lpOverlapped,
lpCompletionRoutine,
ThreadId,
lpCompletionRoutine,
ThreadId,
&ErrorCode);
/* Deference the Socket Context */
WsSockDereference(Socket);
@@ -275,15 +275,15 @@ WSARecvFrom(IN SOCKET s,
{
/* Make the call */
Status = Socket->Provider->Service.lpWSPRecvFrom(s,
lpBuffers,
lpBuffers,
dwBufferCount,
lpNumberOfBytesRecvd,
lpFlags,
lpNumberOfBytesRecvd,
lpFlags,
lpFrom,
lpFromlen,
lpOverlapped,
lpCompletionRoutine,
ThreadId,
ThreadId,
&ErrorCode);
/* Deference the Socket Context */
WsSockDereference(Socket);
reactos/dll/win32/ws2_32/src/rnr.c
+7 -7
View File
@@ -74,7 +74,7 @@ WSAAddressToStringA(IN LPSOCKADDR lpsaAddress,
lpsaAddress->sa_family,
&CatalogEntry);
}
/* Check for success */
if (ErrorCode == ERROR_SUCCESS)
{
@@ -167,7 +167,7 @@ WSAAddressToStringW(IN LPSOCKADDR lpsaAddress,
lpsaAddress->sa_family,
&CatalogEntry);
}
/* Check for success */
if (ErrorCode == ERROR_SUCCESS)
{
@@ -249,7 +249,7 @@ WSALookupServiceBeginA(IN LPWSAQUERYSETA lpqsRestrictions,
DPRINT("WSALookupServiceBeginA: %p\n", lpqsRestrictions);
/* Verify pointer */
if (IsBadReadPtr(lpqsRestrictions, sizeof(*lpqsRestrictions)) ||
if (IsBadReadPtr(lpqsRestrictions, sizeof(*lpqsRestrictions)) ||
IsBadReadPtr(lpqsRestrictions->lpServiceClassId, sizeof(*lpqsRestrictions->lpServiceClassId)))
{
/* Invalid */
@@ -313,7 +313,7 @@ WSALookupServiceBeginA(IN LPWSAQUERYSETA lpqsRestrictions,
/*
* @implemented
*/
INT
INT
WINAPI
WSALookupServiceBeginW(IN LPWSAQUERYSETW lpqsRestrictions,
IN DWORD dwControlFlags,
@@ -374,7 +374,7 @@ WSALookupServiceBeginW(IN LPWSAQUERYSETW lpqsRestrictions,
ErrorCode = SOCKET_ERROR;
SetLastError(WSAENOBUFS);
}
/* Return */
return ErrorCode;
}
@@ -864,7 +864,7 @@ WSAStringToAddressA(IN LPSTR AddressString,
/* Get it from the address family */
ErrorCode = WsTcGetEntryFromAf(Catalog, AddressFamily, &CatalogEntry);
}
/* Check for success */
if (ErrorCode == ERROR_SUCCESS)
{
@@ -943,7 +943,7 @@ WSAStringToAddressW(IN LPWSTR AddressString,
/* Get it from the address family */
ErrorCode = WsTcGetEntryFromAf(Catalog, AddressFamily, &CatalogEntry);
}
/* Check for success */
if (ErrorCode == ERROR_SUCCESS)
{
reactos/dll/win32/ws2_32/src/select.c
+6 -6
View File
@@ -38,10 +38,10 @@ __WSAFDIsSet(SOCKET s,
*/
INT
WSAAPI
select(IN INT s,
IN OUT LPFD_SET readfds,
IN OUT LPFD_SET writefds,
IN OUT LPFD_SET exceptfds,
select(IN INT s,
IN OUT LPFD_SET readfds,
IN OUT LPFD_SET writefds,
IN OUT LPFD_SET exceptfds,
IN CONST struct timeval *timeout)
{
PWSSOCKET Socket;
@@ -149,9 +149,9 @@ WSAAsyncSelect(IN SOCKET s,
{
/* Make the call */
Status = Socket->Provider->Service.lpWSPAsyncSelect(s,
hWnd,
hWnd,
wMsg,
lEvent,
lEvent,
&ErrorCode);
/* Deference the Socket Context */
WsSockDereference(Socket);
reactos/dll/win32/ws2_32/src/send.c
+23 -23
View File
@@ -20,9 +20,9 @@
*/
INT
WSAAPI
send(IN SOCKET s,
IN CONST CHAR FAR* buf,
IN INT len,
send(IN SOCKET s,
IN CONST CHAR FAR* buf,
IN INT len,
IN INT flags)
{
PWSSOCKET Socket;
@@ -45,13 +45,13 @@ send(IN SOCKET s,
/* Make the call */
Status = Socket->Provider->Service.lpWSPSend(s,
&Buffers,
&Buffers,
1,
&BytesSent,
(DWORD)flags,
&BytesSent,
(DWORD)flags,
NULL,
NULL,
ThreadId,
NULL,
ThreadId,
&ErrorCode);
/* Deference the Socket Context */
WsSockDereference(Socket);
@@ -83,7 +83,7 @@ sendto(IN SOCKET s,
IN CONST CHAR FAR* buf,
IN INT len,
IN INT flags,
IN CONST struct sockaddr *to,
IN CONST struct sockaddr *to,
IN INT tolen)
{
PWSSOCKET Socket;
@@ -106,15 +106,15 @@ sendto(IN SOCKET s,
/* Make the call */
Status = Socket->Provider->Service.lpWSPSendTo(s,
&Buffers,
&Buffers,
1,
&BytesSent,
&BytesSent,
(DWORD)flags,
to,
tolen,
NULL,
NULL,
ThreadId,
NULL,
ThreadId,
&ErrorCode);
/* Deference the Socket Context */
WsSockDereference(Socket);
@@ -164,13 +164,13 @@ WSASend(IN SOCKET s,
{
/* Make the call */
Status = Socket->Provider->Service.lpWSPSend(s,
lpBuffers,
lpBuffers,
dwBufferCount,
lpNumberOfBytesSent,
dwFlags,
lpNumberOfBytesSent,
dwFlags,
lpOverlapped,
lpCompletionRoutine,
ThreadId,
lpCompletionRoutine,
ThreadId,
&ErrorCode);
/* Deference the Socket Context */
WsSockDereference(Socket);
@@ -268,15 +268,15 @@ WSASendTo(IN SOCKET s,
{
/* Make the call */
Status = Socket->Provider->Service.lpWSPSendTo(s,
lpBuffers,
lpBuffers,
dwBufferCount,
lpNumberOfBytesSent,
dwFlags,
lpNumberOfBytesSent,
dwFlags,
lpTo,
iToLen,
lpOverlapped,
lpCompletionRoutine,
ThreadId,
lpCompletionRoutine,
ThreadId,
&ErrorCode);
/* Deference the Socket Context */
WsSockDereference(Socket);
reactos/dll/win32/ws2_32/src/socklife.c
+12 -12
View File
@@ -50,7 +50,7 @@ bind(IN SOCKET s,
{
/* Make the call */
Status = Socket->Provider->Service.lpWSPBind(s,
name,
name,
namelen,
&ErrorCode);
/* Deference the Socket Context */
@@ -441,8 +441,8 @@ WSASocketA(IN INT af,
LPWSAPROTOCOL_INFOW p = &ProtocolInfoW;
/* Convert Protocol Info to Wide */
if (lpProtocolInfo)
{
if (lpProtocolInfo)
{
/* Copy the Data */
memcpy(&ProtocolInfoW,
lpProtocolInfo,
@@ -455,8 +455,8 @@ WSASocketA(IN INT af,
-1,
ProtocolInfoW.szProtocol,
sizeof(ProtocolInfoW.szProtocol) / sizeof(WCHAR));
}
else
}
else
{
/* No Protocol Info Specified */
p = NULL;
@@ -475,7 +475,7 @@ WSASocketA(IN INT af,
* @implemented
*/
SOCKET
WSAAPI
WSAAPI
WSASocketW(IN INT af,
IN INT type,
IN INT protocol,
@@ -506,8 +506,8 @@ WSASocketW(IN INT af,
Catalog = WsProcGetTCatalog(Process);
/* Find a Provider for the Catalog ID */
if (lpProtocolInfo)
{
if (lpProtocolInfo)
{
/* Get the catalog ID */
CatalogId = lpProtocolInfo->dwCatalogEntryId;
@@ -516,8 +516,8 @@ WSASocketW(IN INT af,
CatalogId,
&CatalogEntry);
}
else
{
else
{
/* No ID */
CatalogId = 0;
@@ -558,8 +558,8 @@ DoLookup:
WsTcEntryDereference(CatalogEntry);
/* Did we fail with WSAEINPROGRESS and had no specific provider? */
if ((Status == INVALID_SOCKET) &&
(ErrorCode == WSAEINPROGRESS) &&
if ((Status == INVALID_SOCKET) &&
(ErrorCode == WSAEINPROGRESS) &&
!(lpProtocolInfo))
{
/* In that case, restart the lookup from this ID */
reactos/dll/win32/ws2_32/src/startup.c
+5 -5
View File
@@ -42,8 +42,8 @@ WsDestroyStartupSynchronization(VOID)
/*
* @implemented
*/
BOOL
WSAAPI
BOOL
WSAAPI
WSApSetPostRoutine(PVOID Routine)
{
/* Set the post routine */
@@ -180,7 +180,7 @@ WSAStartup(IN WORD wVersionRequested,
lstrcpy(lpWSAData->szDescription, "WinSock 2.0");
lstrcpy(lpWSAData->szSystemStatus, "Running");
/*
/*
* On Winsock 1, the following values are returned.
* Taken straight from a Winsock Test app on Windows.
*/
@@ -188,13 +188,13 @@ WSAStartup(IN WORD wVersionRequested,
{
lpWSAData->iMaxSockets = 32767;
lpWSAData->iMaxUdpDg = 65467;
}
}
else
{
lpWSAData->iMaxSockets = 0;
lpWSAData->iMaxUdpDg = 0;
}
/* Requested invalid version (0) */
if (ErrorCode != ERROR_SUCCESS)
{
reactos/dll/win32/ws2_32/src/wsautil.c
+1 -1
View File
@@ -26,7 +26,7 @@ WsOpenRegistryRoot(VOID)
0,
MAXIMUM_ALLOWED,
&WinsockRootKey);
/* Check if it wasn't found */
if (ErrorCode == ERROR_FILE_NOT_FOUND)
{