Skip to content

W
wine-cw
Commit 7fd3fe59 authored by Juan Lang's avatar Juan Lang Committed by Alexandre Julliard
Browse files
Options

wsock32: Don't use HEAP_ZERO_MEMORY for memory that's fully initialized anyway.

parent 44c64aef
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
dlls/wsock32/socket.c
View file @ 7fd3fe59
...@@ -170,7 +170,7 @@ DWORD WINAPI WsControl(DWORD protocol, ...@@ -170,7 +170,7 @@ DWORD WINAPI WsControl(DWORD protocol,
ifTable = 0; ifTable = 0;
GetIfTable(NULL, &ifTable, FALSE); GetIfTable(NULL, &ifTable, FALSE);
table = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, ifTable ); table = HeapAlloc( GetProcessHeap(), 0, ifTable );
if (!table) if (!table)
return ERROR_NOT_ENOUGH_MEMORY; return ERROR_NOT_ENOUGH_MEMORY;
GetIfTable(table, &ifTable, FALSE); GetIfTable(table, &ifTable, FALSE);
...@@ -287,7 +287,7 @@ DWORD WINAPI WsControl(DWORD protocol, ...@@ -287,7 +287,7 @@ DWORD WINAPI WsControl(DWORD protocol,
if (*pcbResponseInfoLen < sizeof(ULONG) * 2) if (*pcbResponseInfoLen < sizeof(ULONG) * 2)
return (ERROR_LOCK_VIOLATION); return (ERROR_LOCK_VIOLATION);
GetIpNetTable(NULL, &size, FALSE); GetIpNetTable(NULL, &size, FALSE);
table = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size ); table = HeapAlloc( GetProcessHeap(), 0, size );
if (!table) if (!table)
return ERROR_NOT_ENOUGH_MEMORY; return ERROR_NOT_ENOUGH_MEMORY;
GetIpNetTable(table, &size, FALSE); GetIpNetTable(table, &size, FALSE);
...@@ -399,7 +399,7 @@ DWORD WINAPI WsControl(DWORD protocol, ...@@ -399,7 +399,7 @@ DWORD WINAPI WsControl(DWORD protocol,
gets just one entry. */ gets just one entry. */
tableSize = 0; tableSize = 0;
GetIpAddrTable(NULL, &tableSize, FALSE); GetIpAddrTable(NULL, &tableSize, FALSE);
table = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, tableSize ); table = HeapAlloc( GetProcessHeap(), 0, tableSize );
if (!table) if (!table)
return ERROR_NOT_ENOUGH_MEMORY; return ERROR_NOT_ENOUGH_MEMORY;
GetIpAddrTable(table, &tableSize, FALSE); GetIpAddrTable(table, &tableSize, FALSE);
...@@ -450,7 +450,7 @@ DWORD WINAPI WsControl(DWORD protocol, ...@@ -450,7 +450,7 @@ DWORD WINAPI WsControl(DWORD protocol,
/ sizeof(MIB_IPFORWARDROW) + 1; / sizeof(MIB_IPFORWARDROW) + 1;
if (*pcbResponseInfoLen < sizeof(IPRouteEntry) * numRoutes) if (*pcbResponseInfoLen < sizeof(IPRouteEntry) * numRoutes)
return (ERROR_LOCK_VIOLATION); return (ERROR_LOCK_VIOLATION);
table = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, routeTableSize ); table = HeapAlloc( GetProcessHeap(), 0, routeTableSize );
if (!table) if (!table)
return ERROR_NOT_ENOUGH_MEMORY; return ERROR_NOT_ENOUGH_MEMORY;
ret = GetIpForwardTable(table, &routeTableSize, FALSE); ret = GetIpForwardTable(table, &routeTableSize, FALSE);
...@@ -503,7 +503,7 @@ DWORD WINAPI WsControl(DWORD protocol, ...@@ -503,7 +503,7 @@ DWORD WINAPI WsControl(DWORD protocol,
/ sizeof(MIB_IPNETROW) + 1; / sizeof(MIB_IPNETROW) + 1;
if (*pcbResponseInfoLen < sizeof(MIB_IPNETROW) * numEntries) if (*pcbResponseInfoLen < sizeof(MIB_IPNETROW) * numEntries)
return (ERROR_LOCK_VIOLATION); return (ERROR_LOCK_VIOLATION);
table = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, arpTableSize ); table = HeapAlloc( GetProcessHeap(), 0, arpTableSize );
if (!table) if (!table)
return ERROR_NOT_ENOUGH_MEMORY; return ERROR_NOT_ENOUGH_MEMORY;
ret = GetIpNetTable(table, &arpTableSize, FALSE); ret = GetIpNetTable(table, &arpTableSize, FALSE);
...@@ -545,7 +545,7 @@ DWORD WINAPI WsControl(DWORD protocol, ...@@ -545,7 +545,7 @@ DWORD WINAPI WsControl(DWORD protocol,
/ sizeof(MIB_TCPROW) + 1; / sizeof(MIB_TCPROW) + 1;
if (*pcbResponseInfoLen < sizeof(MIB_TCPROW) * numEntries) if (*pcbResponseInfoLen < sizeof(MIB_TCPROW) * numEntries)
return (ERROR_LOCK_VIOLATION); return (ERROR_LOCK_VIOLATION);
table = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, tcpTableSize ); table = HeapAlloc( GetProcessHeap(), 0, tcpTableSize );
if (!table) if (!table)
return ERROR_NOT_ENOUGH_MEMORY; return ERROR_NOT_ENOUGH_MEMORY;
ret = GetTcpTable(table, &tcpTableSize, FALSE); ret = GetTcpTable(table, &tcpTableSize, FALSE);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment