mountmgr.sys: Always set the return size from dhcp_request implementations.

Also return STATUS_SUCCESS rather than 0 in early-out cases. Signed-off-by: Tim Clem <tclem@codeweavers.com>

mountmgr.sys: Always set the return size from dhcp_request implementations.
6c465ae8 · Tim Clem · Alexandre Julliard · 3f36d7e2 · 6c465ae8 · 6c465ae8
Commit 6c465ae8 authored Jul 05, 2022 by Tim Clem Committed by Alexandre Julliard Jul 05, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

dbus.c dlls/mountmgr.sys/dbus.c +2 -1

diskarb.c dlls/mountmgr.sys/diskarb.c +3 -2

No files found.
--- a/dlls/mountmgr.sys/dbus.c
+++ b/dlls/mountmgr.sys/dbus.c
@@ -777,8 +777,9 @@ NTSTATUS dhcp_request( void *args )
    ULONG ret = 0;

    params->req->offset = params->req->size = 0;
+    *params->ret_size = 0;

-    if (!(reply = dhcp4_config_option_request( params->unix_name, map_option(params->req->id), &value ))) return 0;
+    if (!(reply = dhcp4_config_option_request( params->unix_name, map_option(params->req->id), &value ))) return STATUS_SUCCESS;

    switch (params->req->id)
    {

--- a/dlls/mountmgr.sys/diskarb.c
+++ b/dlls/mountmgr.sys/diskarb.c
@@ -293,18 +293,19 @@ NTSTATUS dhcp_request( void *args )

    params->req->offset = 0;
    params->req->size   = 0;
+    *params->ret_size = 0;

    if (!service_id) return 0;
    if (!(dict = SCDynamicStoreCopyDHCPInfo( NULL, service_id )))
    {
        CFRelease( service_id );
-        return 0;
+        return STATUS_SUCCESS;
    }
    CFRelease( service_id );
    if (!(value = DHCPInfoGetOptionData( dict, map_option(params->req->id) )))
    {
        CFRelease( dict );
-        return 0;
+        return STATUS_SUCCESS;
    }
    len = CFDataGetLength( value );