Zebediah Figura : nsiproxy: Return STATUS_BUFFER_OVERFLOW to signal short buffers.
Alexandre Julliard
julliard at winehq.org
Tue Aug 31 15:40:22 CDT 2021
Module: wine
Branch: master
Commit: bd1aed5319601da9fe2157ffc40c52ae23f7b940
URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd1aed5319601da9fe2157ffc40c52ae23f7b940
Author: Zebediah Figura <zfigura at codeweavers.com>
Date: Mon Aug 30 22:26:01 2021 -0500
nsiproxy: Return STATUS_BUFFER_OVERFLOW to signal short buffers.
STATUS_MORE_ENTRIES is used for directory enumeration APIs, and signals that a
continuation will be returned on the next call.
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/nsiproxy.sys/device.c | 2 +-
dlls/nsiproxy.sys/ip.c | 6 +++---
dlls/nsiproxy.sys/ndis.c | 2 +-
dlls/nsiproxy.sys/tcp.c | 2 +-
dlls/nsiproxy.sys/udp.c | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c
index aa1d7a08bf7..c4db45dfad2 100644
--- a/dlls/nsiproxy.sys/device.c
+++ b/dlls/nsiproxy.sys/device.c
@@ -74,7 +74,7 @@ static void nsiproxy_enumerate_all( IRP *irp )
enum_all.count = in->count;
irp->IoStatus.u.Status = nsi_enumerate_all_ex( &enum_all );
- if (irp->IoStatus.u.Status == STATUS_SUCCESS || irp->IoStatus.u.Status == STATUS_MORE_ENTRIES)
+ if (irp->IoStatus.u.Status == STATUS_SUCCESS || irp->IoStatus.u.Status == STATUS_BUFFER_OVERFLOW)
{
irp->IoStatus.Information = out_len;
*(DWORD *)out = enum_all.count;
diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c
index e2e292f4b59..12fae3f2f12 100644
--- a/dlls/nsiproxy.sys/ip.c
+++ b/dlls/nsiproxy.sys/ip.c
@@ -754,7 +754,7 @@ static NTSTATUS ip_unicast_enumerate_all( int family, void *key_data, DWORD key_
freeifaddrs( addrs );
if (!want_data || num <= *count) *count = num;
- else status = STATUS_MORE_ENTRIES;
+ else status = STATUS_BUFFER_OVERFLOW;
return status;
}
@@ -990,7 +990,7 @@ static NTSTATUS ipv4_neighbour_enumerate_all( void *key_data, DWORD key_size, vo
#endif
if (!want_data || num <= *count) *count = num;
- else status = STATUS_MORE_ENTRIES;
+ else status = STATUS_BUFFER_OVERFLOW;
return status;
}
@@ -1233,7 +1233,7 @@ static NTSTATUS ipv4_forward_enumerate_all( void *key_data, DWORD key_size, void
#endif
if (!want_data || num <= *count) *count = num;
- else status = STATUS_MORE_ENTRIES;
+ else status = STATUS_BUFFER_OVERFLOW;
return status;
}
diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c
index 40a60e45c46..bf237ea16db 100644
--- a/dlls/nsiproxy.sys/ndis.c
+++ b/dlls/nsiproxy.sys/ndis.c
@@ -488,7 +488,7 @@ static NTSTATUS ifinfo_enumerate_all( void *key_data, DWORD key_size, void *rw_d
LeaveCriticalSection( &if_list_cs );
if (!want_data || num <= *count) *count = num;
- else status = STATUS_MORE_ENTRIES;
+ else status = STATUS_BUFFER_OVERFLOW;
return status;
}
diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c
index 603aefadfe9..f9ddf1a2b23 100644
--- a/dlls/nsiproxy.sys/tcp.c
+++ b/dlls/nsiproxy.sys/tcp.c
@@ -736,7 +736,7 @@ static NTSTATUS tcp_conns_enumerate_all( DWORD filter, struct nsi_tcp_conn_key *
#endif
if (!want_data || num <= *count) *count = num;
- else status = STATUS_MORE_ENTRIES;
+ else status = STATUS_BUFFER_OVERFLOW;
heap_free( pid_map );
heap_free( addr_scopes );
diff --git a/dlls/nsiproxy.sys/udp.c b/dlls/nsiproxy.sys/udp.c
index 190eb7f21f5..112170782f7 100644
--- a/dlls/nsiproxy.sys/udp.c
+++ b/dlls/nsiproxy.sys/udp.c
@@ -390,7 +390,7 @@ static NTSTATUS udp_endpoint_enumerate_all( void *key_data, DWORD key_size, void
#endif
if (!want_data || num <= *count) *count = num;
- else status = STATUS_MORE_ENTRIES;
+ else status = STATUS_BUFFER_OVERFLOW;
heap_free( pid_map );
heap_free( addr_scopes );
More information about the wine-cvs
mailing list