ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Corrected error handling for ws_getprotobyname/number. 

Made the Async error returns the same as the normal functions.
This commit is contained in:
Rein Klazes 2000-04-06 19:31:38 +00:00 committed by Alexandre Julliard
parent 61f572a6ea
commit ce77ea90b5
2 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dlls/winsock/async.c
View File

@ -90,6 +90,11 @@
DEFAULT_DEBUG_CHANNEL(winsock) DEFAULT_DEBUG_CHANNEL(winsock)
/* protoptypes of some functions in socket.c
*/
UINT16 wsaErrno(void);
UINT16 wsaHerrno(void);
/* ----------------------------------- helper functions - */ /* ----------------------------------- helper functions - */
static int list_size(char** l, int item_size) static int list_size(char** l, int item_size)
@ -308,7 +313,7 @@ static DWORD WINAPI _async_queryfun(LPVOID arg) {
size = -size; size = -size;
} }
} else { } else {
fail = WSAENOBUFS; fail = ((h_errno < 0) ? wsaErrno() : wsaHerrno());
} }
} }
break; break;
@ -325,7 +330,13 @@ static DWORD WINAPI _async_queryfun(LPVOID arg) {
size = -size; size = -size;
} }
} else { } else {
fail = WSAENOBUFS; if (aq->flags & AQ_NAME)
MESSAGE("protocol %s not found; You might want to add "
"this to /etc/protocols\n", debugstr_a(aq->proto_name) );
else
MESSAGE("protocol number %d not found; You might want to add "
"this to /etc/protocols\n", aq->proto_number );
fail = WSANO_DATA;
} }
} }
break; break;
@ -342,7 +353,15 @@ static DWORD WINAPI _async_queryfun(LPVOID arg) {
size = -size; size = -size;
} }
} else { } else {
fail = WSAENOBUFS; if (aq->flags & AQ_NAME)
MESSAGE("service %s protocol %s not found; You might want to add "
"this to /etc/services\n", debugstr_a(aq->serv_name) ,
aq->serv_proto ? debugstr_a(aq->serv_proto ):"*");
else
MESSAGE("service on port %d protocol %s not found; You might want to add "
"this to /etc/services\n", aq->serv_port,
aq->serv_proto ? debugstr_a(aq->serv_proto ):"*");
fail = WSANO_DATA;
} }
} }
break; break;

23
dlls/winsock/socket.c
View File

@ -1964,8 +1964,12 @@ static struct WIN_protoent* __ws_getprotobyname(const char *name, int dup_flag)
if( WS_dup_pe(pwsi, proto, dup_flag) ) if( WS_dup_pe(pwsi, proto, dup_flag) )
return (struct WIN_protoent*)(pwsi->pe); return (struct WIN_protoent*)(pwsi->pe);
else SetLastError(WSAENOBUFS); else SetLastError(WSAENOBUFS);
else SetLastError((h_errno < 0) ? wsaErrno() : wsaHerrno()); else {
} MESSAGE("protocol %s not found; You might want to add "
"this to /etc/protocols\n", debugstr_a(name) );
SetLastError(WSANO_DATA);
}
} else SetLastError(WSANOTINITIALISED);
return NULL; return NULL;
} }
@ -1998,8 +2002,12 @@ static struct WIN_protoent* __ws_getprotobynumber(int number, int dup_flag)
if( WS_dup_pe(pwsi, proto, dup_flag) ) if( WS_dup_pe(pwsi, proto, dup_flag) )
return (struct WIN_protoent*)(pwsi->pe); return (struct WIN_protoent*)(pwsi->pe);
else SetLastError(WSAENOBUFS); else SetLastError(WSAENOBUFS);
else SetLastError(WSANO_DATA); else {
} MESSAGE("protocol number %d not found; You might want to add "
"this to /etc/protocols\n", number );
SetLastError(WSANO_DATA);
}
} else SetLastError(WSANOTINITIALISED);
return NULL; return NULL;
} }
@ -2038,7 +2046,7 @@ struct WIN_servent* __ws_getservbyname(const char *name, const char *proto, int
return (struct WIN_servent*)(pwsi->se); return (struct WIN_servent*)(pwsi->se);
else SetLastError(WSAENOBUFS); else SetLastError(WSAENOBUFS);
else { else {
MESSAGE("service %s protocol %s not found; maybe you have add " MESSAGE("service %s protocol %s not found; You might want to add "
"this to /etc/services\n", debugstr_a(pwsi->buffer), "this to /etc/services\n", debugstr_a(pwsi->buffer),
proto ? debugstr_a(pwsi->buffer+i):"*"); proto ? debugstr_a(pwsi->buffer+i):"*");
SetLastError(WSANO_DATA); SetLastError(WSANO_DATA);
@ -2083,7 +2091,7 @@ static struct WIN_servent* __ws_getservbyport(int port, const char* proto, int d
else SetLastError(WSAENOBUFS); else SetLastError(WSAENOBUFS);
} }
else { else {
MESSAGE("service on port %d protocol %s not found; maybe you have " MESSAGE("service on port %d protocol %s not found; You might want to add "
"add this to /etc/services\n", ntohl(port), "add this to /etc/services\n", ntohl(port),
proto ? debugstr_a(pwsi->buffer) : "*"); proto ? debugstr_a(pwsi->buffer) : "*");
SetLastError(WSANO_DATA); SetLastError(WSANO_DATA);
@ -2498,7 +2506,8 @@ DWORD WINAPI WsControl(DWORD protocoll,DWORD action,
} }
return FALSE; return FALSE;
} }
/*********************************************************
/***********************************************************************
* WS_s_perror WSOCK32.1108 * WS_s_perror WSOCK32.1108
*/ */
void WINAPI WS_s_perror(LPCSTR message) void WINAPI WS_s_perror(LPCSTR message)