mirror of
https://github.com/reactos/reactos.git
synced 2024-09-11 05:12:43 +00:00
- Merge aicom-network-fixes up to r35946
svn path=/trunk/; revision=35955
This commit is contained in:
parent
0542c270aa
commit
a78ab11616
|
@ -521,9 +521,11 @@ NdisReadConfiguration(
|
||||||
|
|
||||||
ExFreePool(KeyInformation);
|
ExFreePool(KeyInformation);
|
||||||
|
|
||||||
if(*Status != STATUS_SUCCESS)
|
if(*Status != STATUS_SUCCESS) {
|
||||||
|
ExFreePool(*ParameterValue);
|
||||||
|
*ParameterValue = NULL;
|
||||||
*Status = NDIS_STATUS_FAILURE;
|
*Status = NDIS_STATUS_FAILURE;
|
||||||
else
|
} else
|
||||||
*Status = NDIS_STATUS_SUCCESS;
|
*Status = NDIS_STATUS_SUCCESS;
|
||||||
|
|
||||||
return;
|
return;
|
||||||
|
@ -567,6 +569,7 @@ NdisReadConfiguration(
|
||||||
if(!MiniportResource)
|
if(!MiniportResource)
|
||||||
{
|
{
|
||||||
NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n"));
|
NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n"));
|
||||||
|
ExFreePool(RegData);
|
||||||
ExFreePool(KeyInformation);
|
ExFreePool(KeyInformation);
|
||||||
ExFreePool(*ParameterValue);
|
ExFreePool(*ParameterValue);
|
||||||
*ParameterValue = NULL;
|
*ParameterValue = NULL;
|
||||||
|
|
|
@ -1623,7 +1623,7 @@ NdisIAddDevice(
|
||||||
|
|
||||||
Status = IoGetDeviceProperty(PhysicalDeviceObject, DevicePropertyDriverKeyName,
|
Status = IoGetDeviceProperty(PhysicalDeviceObject, DevicePropertyDriverKeyName,
|
||||||
0, NULL, &DriverKeyLength);
|
0, NULL, &DriverKeyLength);
|
||||||
if (Status != STATUS_BUFFER_TOO_SMALL && Status != STATUS_BUFFER_OVERFLOW)
|
if (Status != STATUS_BUFFER_TOO_SMALL && Status != STATUS_BUFFER_OVERFLOW && Status != STATUS_SUCCESS)
|
||||||
{
|
{
|
||||||
NDIS_DbgPrint(DEBUG_MINIPORT, ("Can't get miniport driver key length.\n"));
|
NDIS_DbgPrint(DEBUG_MINIPORT, ("Can't get miniport driver key length.\n"));
|
||||||
return Status;
|
return Status;
|
||||||
|
|
|
@ -783,7 +783,7 @@ NdisRegisterProtocol(
|
||||||
RtlInitUnicodeString(&ValueName, L"Bind");
|
RtlInitUnicodeString(&ValueName, L"Bind");
|
||||||
|
|
||||||
NtStatus = ZwQueryValueKey(DriverKeyHandle, &ValueName, KeyValuePartialInformation, NULL, 0, &ResultLength);
|
NtStatus = ZwQueryValueKey(DriverKeyHandle, &ValueName, KeyValuePartialInformation, NULL, 0, &ResultLength);
|
||||||
if(NtStatus != STATUS_BUFFER_OVERFLOW && NtStatus != STATUS_BUFFER_TOO_SMALL)
|
if(NtStatus != STATUS_BUFFER_OVERFLOW && NtStatus != STATUS_BUFFER_TOO_SMALL && NtStatus != STATUS_SUCCESS)
|
||||||
{
|
{
|
||||||
NDIS_DbgPrint(MID_TRACE, ("Unable to query the Bind value for size\n"));
|
NDIS_DbgPrint(MID_TRACE, ("Unable to query the Bind value for size\n"));
|
||||||
ZwClose(DriverKeyHandle);
|
ZwClose(DriverKeyHandle);
|
||||||
|
|
|
@ -331,10 +331,12 @@ cleanup:
|
||||||
ExFreePool ( FullFileName.Buffer );
|
ExFreePool ( FullFileName.Buffer );
|
||||||
FullFileName.Buffer = NULL;
|
FullFileName.Buffer = NULL;
|
||||||
}
|
}
|
||||||
if ( !NT_SUCCESS(*Status) && FileHandleObject != NULL )
|
if ( !NT_SUCCESS(*Status) )
|
||||||
{
|
{
|
||||||
|
if( FileHandleObject ) {
|
||||||
ExFreePool ( FileHandleObject );
|
ExFreePool ( FileHandleObject );
|
||||||
FileHandleObject = NULL;
|
FileHandleObject = NULL;
|
||||||
|
}
|
||||||
*FileHandle = NULL;
|
*FileHandle = NULL;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in a new issue