Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-03 07:53:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

[WS2_32]

Browse source 
- Fix invalid AQ_WIN16 comparisons. Spotted by you-know-what. Fix taken from Wine.

svn path=/trunk/; revision=55162
This commit is contained in:
Thomas Faber 2012-01-25 00:12:18 +00:00
parent e724bc4582
commit bd7ee66285
1 changed files with 34 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
reactos/dll/win32/ws2_32/misc/async.c
View file

@ -200,31 +200,23 @@ static int WS_copy_he(char *p_to,char *p_base,int t_size,struct hostent* p_he, i
WS_hostent *p_to32 = (WS_hostent*)p_to;
int size = hostent_size(p_he) +
(
(flag & AQ_WIN16) ? sizeof(struct ws_hostent16) : sizeof(WS_hostent)
(flag & AQ_WIN32) ? sizeof(WS_hostent) : sizeof(struct ws_hostent16)
- sizeof(struct hostent)
);
if (t_size < size)
return -size;
p = p_to;
p += (flag & AQ_WIN16) ?
sizeof(struct ws_hostent16) : sizeof(WS_hostent);
p += (flag & AQ_WIN32) ?
sizeof(WS_hostent) : sizeof(struct ws_hostent16);
p_name = p;
strcpy(p, p_he->h_name); p += strlen(p) + 1;
p_aliases = p;
p += list_dup(p_he->h_aliases, p, p_base + (p - (char*)p_to), 0);
p += list_dup(p_he->h_aliases, p, p_base + (p - p_to), 0);
p_addr = p;
list_dup(p_he->h_addr_list, p, p_base + (p - (char*)p_to), p_he->h_length);
list_dup(p_he->h_addr_list, p, p_base + (p - p_to), p_he->h_length);
if (flag & AQ_WIN16)
{
p_to16->h_addrtype = (INT16)p_he->h_addrtype;
p_to16->h_length = (INT16)p_he->h_length;
p_to16->h_name = (SEGPTR)(p_base + (p_name - p_to));
p_to16->h_aliases = (SEGPTR)(p_base + (p_aliases - p_to));
p_to16->h_addr_list = (SEGPTR)(p_base + (p_addr - p_to));
}
else
if (flag & AQ_WIN32)
{
p_to32->h_addrtype = p_he->h_addrtype;
p_to32->h_length = p_he->h_length;
@ -232,6 +224,14 @@ static int WS_copy_he(char *p_to,char *p_base,int t_size,struct hostent* p_he, i
p_to32->h_aliases = (char **)(p_base + (p_aliases - p_to));
p_to32->h_addr_list = (char **)(p_base + (p_addr - p_to));
}
else
{
p_to16->h_addrtype = (INT16)p_he->h_addrtype;
p_to16->h_length = (INT16)p_he->h_length;
p_to16->h_name = (SEGPTR)(p_base + (p_name - p_to));
p_to16->h_aliases = (SEGPTR)(p_base + (p_aliases - p_to));
p_to16->h_addr_list = (SEGPTR)(p_base + (p_addr - p_to));
}
return size;
}
@ -258,32 +258,31 @@ static int WS_copy_pe(char *p_to,char *p_base,int t_size,struct protoent* p_pe,
WS_protoent *p_to32 = (WS_protoent*)p_to;
int size = protoent_size(p_pe) +
(
(flag & AQ_WIN16) ? sizeof(struct ws_protoent16) : sizeof(WS_protoent)
(flag & AQ_WIN32) ? sizeof(WS_protoent) : sizeof(struct ws_protoent16)
- sizeof(struct protoent)
);
if (t_size < size)
return -size;
p = p_to;
p += (flag & AQ_WIN16) ?
sizeof(struct ws_protoent16) : sizeof(WS_protoent);
p += (flag & AQ_WIN32) ? sizeof(WS_protoent) : sizeof(struct ws_protoent16);
p_name = p;
strcpy(p, p_pe->p_name); p += strlen(p) + 1;
p_aliases = p;
list_dup(p_pe->p_aliases, p, p_base + (p - (char*)p_to), 0);
list_dup(p_pe->p_aliases, p, p_base + (p - p_to), 0);
if (flag & AQ_WIN16)
{
p_to16->p_proto = (INT16)p_pe->p_proto;
p_to16->p_name = (SEGPTR)(p_base) + (p_name - p_to);
p_to16->p_aliases = (SEGPTR)((p_base) + (p_aliases - p_to));
}
else
if (flag & AQ_WIN32)
{
p_to32->p_proto = p_pe->p_proto;
p_to32->p_name = (p_base) + (p_name - p_to);
p_to32->p_aliases = (char **)((p_base) + (p_aliases - p_to));
}
else
{
p_to16->p_proto = (INT16)p_pe->p_proto;
p_to16->p_name = (SEGPTR)(p_base) + (p_name - p_to);
p_to16->p_aliases = (SEGPTR)((p_base) + (p_aliases - p_to));
}
return size;
}
@ -312,15 +311,14 @@ static int WS_copy_se(char *p_to,char *p_base,int t_size,struct servent* p_se, i
WS_servent *p_to32 = (WS_servent*)p_to;
int size = servent_size(p_se) +
(
(flag & AQ_WIN16) ? sizeof(struct ws_servent16) : sizeof(WS_servent)
(flag & AQ_WIN32) ? sizeof(WS_servent) : sizeof(struct ws_servent16)
- sizeof(struct servent)
);
if (t_size < size)
return -size;
p = p_to;
p += (flag & AQ_WIN16) ?
sizeof(struct ws_servent16) : sizeof(WS_servent);
p += (flag & AQ_WIN32) ? sizeof(WS_servent) : sizeof(struct ws_servent16);
p_name = p;
strcpy(p, p_se->s_name); p += strlen(p) + 1;
p_proto = p;
@ -328,20 +326,20 @@ static int WS_copy_se(char *p_to,char *p_base,int t_size,struct servent* p_se, i
p_aliases = p;
list_dup(p_se->s_aliases, p, p_base + (p - p_to), 0);
if (flag & AQ_WIN16)
{
p_to16->s_port = (INT16)p_se->s_port;
p_to16->s_name = (SEGPTR)(p_base + (p_name - p_to));
p_to16->s_proto = (SEGPTR)(p_base + (p_proto - p_to));
p_to16->s_aliases = (SEGPTR)(p_base + (p_aliases - p_to));
}
else
if (flag & AQ_WIN32)
{
p_to32->s_port = p_se->s_port;
p_to32->s_name = (p_base + (p_name - p_to));
p_to32->s_proto = (p_base + (p_proto - p_to));
p_to32->s_aliases = (char **)(p_base + (p_aliases - p_to));
}
else
{
p_to16->s_port = (INT16)p_se->s_port;
p_to16->s_name = (SEGPTR)(p_base + (p_name - p_to));
p_to16->s_proto = (SEGPTR)(p_base + (p_proto - p_to));
p_to16->s_aliases = (SEGPTR)(p_base + (p_aliases - p_to));
}
return size;
}