mirror of
git://source.winehq.org/git/wine.git
synced 2024-07-24 09:06:23 +00:00
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>
This commit is contained in:
parent
3f36d7e25b
commit
6c465ae8ef
|
@ -777,8 +777,9 @@ NTSTATUS dhcp_request( void *args )
|
||||||
ULONG ret = 0;
|
ULONG ret = 0;
|
||||||
|
|
||||||
params->req->offset = params->req->size = 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)
|
switch (params->req->id)
|
||||||
{
|
{
|
||||||
|
|
|
@ -293,18 +293,19 @@ NTSTATUS dhcp_request( void *args )
|
||||||
|
|
||||||
params->req->offset = 0;
|
params->req->offset = 0;
|
||||||
params->req->size = 0;
|
params->req->size = 0;
|
||||||
|
*params->ret_size = 0;
|
||||||
|
|
||||||
if (!service_id) return 0;
|
if (!service_id) return 0;
|
||||||
if (!(dict = SCDynamicStoreCopyDHCPInfo( NULL, service_id )))
|
if (!(dict = SCDynamicStoreCopyDHCPInfo( NULL, service_id )))
|
||||||
{
|
{
|
||||||
CFRelease( service_id );
|
CFRelease( service_id );
|
||||||
return 0;
|
return STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
CFRelease( service_id );
|
CFRelease( service_id );
|
||||||
if (!(value = DHCPInfoGetOptionData( dict, map_option(params->req->id) )))
|
if (!(value = DHCPInfoGetOptionData( dict, map_option(params->req->id) )))
|
||||||
{
|
{
|
||||||
CFRelease( dict );
|
CFRelease( dict );
|
||||||
return 0;
|
return STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
len = CFDataGetLength( value );
|
len = CFDataGetLength( value );
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue