--- trunk/reactos/lib/devmgr/advprop.c 2005-12-17 21:13:36 UTC (rev 20232)
+++ trunk/reactos/lib/devmgr/advprop.c 2005-12-17 21:41:15 UTC (rev 20233)
@@ -56,7 +56,7 @@
BOOL FreeDevPropSheets : 1;
BOOL CanDisable : 1;
- BOOL DeviceEnabled : 1;
+ BOOL DeviceStarted : 1;
BOOL DeviceUsageChanged : 1;
BOOL CloseDevInst : 1;
BOOL IsAdmin : 1;
@@ -106,7 +106,7 @@
switch (Actions[i])
{
case IDS_ENABLEDEVICE:
- if (dap->DeviceEnabled)
+ if (dap->DeviceStarted)
{
SendMessage(hComboBox,
CB_SETCURSEL,
@@ -116,7 +116,7 @@
break;
case IDS_DISABLEDEVICE:
- if (!dap->DeviceEnabled)
+ if (!dap->DeviceStarted)
{
SendMessage(hComboBox,
CB_SETCURSEL,
@@ -176,7 +176,7 @@
switch (SelectedUsageAction)
{
case IDS_ENABLEDEVICE:
- if (!dap->DeviceEnabled)
+ if (!dap->DeviceStarted)
{
Ret = EnableDevice(dap->DeviceInfoSet,
&dap->DeviceInfoData,
@@ -187,7 +187,7 @@
break;
case IDS_DISABLEDEVICE:
- if (dap->DeviceEnabled)
+ if (dap->DeviceStarted)
{
Ret = EnableDevice(dap->DeviceInfoSet,
&dap->DeviceInfoData,
@@ -606,7 +606,7 @@
IDC_DEVUSAGE);
dap->CanDisable = FALSE;
- dap->DeviceEnabled = FALSE;
+ dap->DeviceStarted = FALSE;
if (CanDisableDevice(DeviceInfoData->DevInst,
dap->hMachine,
@@ -615,11 +615,11 @@
dap->CanDisable = bFlag;
}
- if (IsDeviceEnabled(DeviceInfoData->DevInst,
+ if (IsDeviceStarted(DeviceInfoData->DevInst,
dap->hMachine,
&bFlag))
{
- dap->DeviceEnabled = bFlag;
+ dap->DeviceStarted = bFlag;
}
/* enable/disable the device usage controls */
--- trunk/reactos/lib/devmgr/misc.c 2005-12-17 21:13:36 UTC (rev 20232)
+++ trunk/reactos/lib/devmgr/misc.c 2005-12-17 21:41:15 UTC (rev 20233)
@@ -508,9 +508,9 @@
BOOL
-IsDeviceEnabled(IN DEVINST DevInst,
+IsDeviceStarted(IN DEVINST DevInst,
IN HMACHINE hMachine,
- OUT BOOL *IsEnabled)
+ OUT BOOL *IsStarted)
{
CONFIGRET cr;
ULONG Status, ProblemNumber;
@@ -523,7 +523,7 @@
hMachine);
if (cr == CR_SUCCESS)
{
- *IsEnabled = ((Status & DN_STARTED) != 0);
+ *IsStarted = ((Status & DN_STARTED) != 0);
Ret = TRUE;
}
--- trunk/reactos/lib/devmgr/precomp.h 2005-12-17 21:13:36 UTC (rev 20232)
+++ trunk/reactos/lib/devmgr/precomp.h 2005-12-17 21:41:15 UTC (rev 20233)
@@ -267,9 +267,9 @@
OUT BOOL *CanDisable);
BOOL
-IsDeviceEnabled(IN DEVINST DevInst,
+IsDeviceStarted(IN DEVINST DevInst,
IN HMACHINE hMachine,
- OUT BOOL *IsEnabled);
+ OUT BOOL *IsStarted);
BOOL
EnableDevice(IN HDEVINFO DeviceInfoSet,