Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-23 00:45:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTOS:PNPMGR]

Browse source 
- Remove an unneeded ExFreePool(DeviceInstance.Buffer); call in IopGetInterfaceDeviceList because at this point DeviceInstance is not yet initialized. Fixes MSVC build.
- No need to check for DeviceInstance.Buffer being NULL or not (in IopDeviceStatus), because in case it was NULL the IopCaptureUnicodeString call already failed.
- Add some brackets to conform to code style.

svn path=/trunk/; revision=65337
This commit is contained in:
Hermès Bélusca-Maïto 2014-11-09 02:26:49 +00:00
parent a36ff01e00
commit 951a7e2106
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
reactos/ntoskrnl/io/pnpmgr/plugplay.c
View file

@ -199,8 +199,7 @@ IopCaptureUnicodeString(PUNICODE_STRING DstName, PUNICODE_STRING SrcName)
} }
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{ {
if (Name.Buffer) if (Name.Buffer) ExFreePool(Name.Buffer);
ExFreePool(Name.Buffer);
Status = _SEH2_GetExceptionCode(); Status = _SEH2_GetExceptionCode();
} }
_SEH2_END; _SEH2_END;
@ -232,7 +231,6 @@ IopGetInterfaceDeviceList(PPLUGPLAY_CONTROL_INTERFACE_DEVICE_LIST_DATA DeviceLis
} }
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{ {
ExFreePool(DeviceInstance.Buffer);
_SEH2_YIELD(return _SEH2_GetExceptionCode()); _SEH2_YIELD(return _SEH2_GetExceptionCode());
} }
_SEH2_END; _SEH2_END;
@ -533,7 +531,9 @@ IopDeviceStatus(PPLUGPLAY_CONTROL_STATUS_DATA StatusData)
Status = IopCaptureUnicodeString(&DeviceInstance, &StatusData->DeviceInstance); Status = IopCaptureUnicodeString(&DeviceInstance, &StatusData->DeviceInstance);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{
return Status; return Status;
}
DPRINT("Device name: '%wZ'\n", &DeviceInstance); DPRINT("Device name: '%wZ'\n", &DeviceInstance);
_SEH2_TRY _SEH2_TRY
@ -547,7 +547,7 @@ IopDeviceStatus(PPLUGPLAY_CONTROL_STATUS_DATA StatusData)
} }
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{ {
if (DeviceInstance.Buffer) ExFreePool(DeviceInstance.Buffer); ExFreePool(DeviceInstance.Buffer);
_SEH2_YIELD(return _SEH2_GetExceptionCode()); _SEH2_YIELD(return _SEH2_GetExceptionCode());
} }
_SEH2_END; _SEH2_END;
@ -556,7 +556,9 @@ IopDeviceStatus(PPLUGPLAY_CONTROL_STATUS_DATA StatusData)
DeviceObject = IopGetDeviceObjectFromDeviceInstance(&DeviceInstance); DeviceObject = IopGetDeviceObjectFromDeviceInstance(&DeviceInstance);
ExFreePool(DeviceInstance.Buffer); ExFreePool(DeviceInstance.Buffer);
if (DeviceObject == NULL) if (DeviceObject == NULL)
{
return STATUS_NO_SUCH_DEVICE; return STATUS_NO_SUCH_DEVICE;
}
DeviceNode = IopGetDeviceNode(DeviceObject); DeviceNode = IopGetDeviceNode(DeviceObject);
@ -618,7 +620,9 @@ IopGetDeviceDepth(PPLUGPLAY_CONTROL_DEPTH_DATA DepthData)
DeviceObject = IopGetDeviceObjectFromDeviceInstance(&DeviceInstance); DeviceObject = IopGetDeviceObjectFromDeviceInstance(&DeviceInstance);
ExFreePool(DeviceInstance.Buffer); ExFreePool(DeviceInstance.Buffer);
if (DeviceObject == NULL) if (DeviceObject == NULL)
{
return STATUS_NO_SUCH_DEVICE; return STATUS_NO_SUCH_DEVICE;
}
DeviceNode = IopGetDeviceNode(DeviceObject); DeviceNode = IopGetDeviceNode(DeviceObject);
@ -648,15 +652,18 @@ IopResetDevice(PPLUGPLAY_CONTROL_RESET_DEVICE_DATA ResetDeviceData)
Status = IopCaptureUnicodeString(&DeviceInstance, &ResetDeviceData->DeviceInstance); Status = IopCaptureUnicodeString(&DeviceInstance, &ResetDeviceData->DeviceInstance);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{
return Status; return Status;
}
DPRINT("IopResetDevice(%wZ)\n", &DeviceInstance); DPRINT("IopResetDevice(%wZ)\n", &DeviceInstance);
/* Get the device object */ /* Get the device object */
DeviceObject = IopGetDeviceObjectFromDeviceInstance(&DeviceInstance); DeviceObject = IopGetDeviceObjectFromDeviceInstance(&DeviceInstance);
ExFreePool(DeviceInstance.Buffer); ExFreePool(DeviceInstance.Buffer);
if (DeviceObject == NULL) if (DeviceObject == NULL)
{
return STATUS_NO_SUCH_DEVICE; return STATUS_NO_SUCH_DEVICE;
}
/* Get the device node */ /* Get the device node */
DeviceNode = IopGetDeviceNode(DeviceObject); DeviceNode = IopGetDeviceNode(DeviceObject);