Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-14 21:25:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename IsDeviceEnabled to IsDeviceStarted

Browse source 
svn path=/trunk/; revision=20233
This commit is contained in:
Thomas Bluemel 2005-12-17 21:41:15 +00:00
parent 6246647626
commit f52fb8c68c
3 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
reactos/lib/devmgr/advprop.c
View file

@ -56,7 +56,7 @@ typedef struct _DEVADVPROP_INFO
BOOL FreeDevPropSheets : 1; BOOL FreeDevPropSheets : 1;
BOOL CanDisable : 1; BOOL CanDisable : 1;
BOOL DeviceEnabled : 1; BOOL DeviceStarted : 1;
BOOL DeviceUsageChanged : 1; BOOL DeviceUsageChanged : 1;
BOOL CloseDevInst : 1; BOOL CloseDevInst : 1;
BOOL IsAdmin : 1; BOOL IsAdmin : 1;
@ -106,7 +106,7 @@ InitDevUsageActions(IN HWND hwndDlg,
switch (Actions[i]) switch (Actions[i])
{ {
case IDS_ENABLEDEVICE: case IDS_ENABLEDEVICE:
if (dap->DeviceEnabled) if (dap->DeviceStarted)
{ {
SendMessage(hComboBox, SendMessage(hComboBox,
CB_SETCURSEL, CB_SETCURSEL,
@ -116,7 +116,7 @@ InitDevUsageActions(IN HWND hwndDlg,
break; break;
case IDS_DISABLEDEVICE: case IDS_DISABLEDEVICE:
if (!dap->DeviceEnabled) if (!dap->DeviceStarted)
{ {
SendMessage(hComboBox, SendMessage(hComboBox,
CB_SETCURSEL, CB_SETCURSEL,
@ -176,7 +176,7 @@ ApplyGeneralSettings(IN HWND hwndDlg,
switch (SelectedUsageAction) switch (SelectedUsageAction)
{ {
case IDS_ENABLEDEVICE: case IDS_ENABLEDEVICE:
if (!dap->DeviceEnabled) if (!dap->DeviceStarted)
{ {
Ret = EnableDevice(dap->DeviceInfoSet, Ret = EnableDevice(dap->DeviceInfoSet,
&dap->DeviceInfoData, &dap->DeviceInfoData,
@ -187,7 +187,7 @@ ApplyGeneralSettings(IN HWND hwndDlg,
break; break;
case IDS_DISABLEDEVICE: case IDS_DISABLEDEVICE:
if (dap->DeviceEnabled) if (dap->DeviceStarted)
{ {
Ret = EnableDevice(dap->DeviceInfoSet, Ret = EnableDevice(dap->DeviceInfoSet,
&dap->DeviceInfoData, &dap->DeviceInfoData,
@ -606,7 +606,7 @@ GetParentNode:
IDC_DEVUSAGE); IDC_DEVUSAGE);
dap->CanDisable = FALSE; dap->CanDisable = FALSE;
dap->DeviceEnabled = FALSE; dap->DeviceStarted = FALSE;
if (CanDisableDevice(DeviceInfoData->DevInst, if (CanDisableDevice(DeviceInfoData->DevInst,
dap->hMachine, dap->hMachine,
@ -615,11 +615,11 @@ GetParentNode:
dap->CanDisable = bFlag; dap->CanDisable = bFlag;
} }
if (IsDeviceEnabled(DeviceInfoData->DevInst, if (IsDeviceStarted(DeviceInfoData->DevInst,
dap->hMachine, dap->hMachine,
&bFlag)) &bFlag))
{ {
dap->DeviceEnabled = bFlag; dap->DeviceStarted = bFlag;
} }
/* enable/disable the device usage controls */ /* enable/disable the device usage controls */

6
reactos/lib/devmgr/misc.c
View file

@ -508,9 +508,9 @@ CanDisableDevice(IN DEVINST DevInst,
BOOL BOOL
IsDeviceEnabled(IN DEVINST DevInst, IsDeviceStarted(IN DEVINST DevInst,
IN HMACHINE hMachine, IN HMACHINE hMachine,
OUT BOOL *IsEnabled) OUT BOOL *IsStarted)
{ {
CONFIGRET cr; CONFIGRET cr;
ULONG Status, ProblemNumber; ULONG Status, ProblemNumber;
@ -523,7 +523,7 @@ IsDeviceEnabled(IN DEVINST DevInst,
hMachine); hMachine);
if (cr == CR_SUCCESS) if (cr == CR_SUCCESS)
{ {
*IsEnabled = ((Status & DN_STARTED) != 0); *IsStarted = ((Status & DN_STARTED) != 0);
Ret = TRUE; Ret = TRUE;
} }

4
reactos/lib/devmgr/precomp.h
View file

@ -267,9 +267,9 @@ CanDisableDevice(IN DEVINST DevInst,
OUT BOOL *CanDisable); OUT BOOL *CanDisable);
BOOL BOOL
IsDeviceEnabled(IN DEVINST DevInst, IsDeviceStarted(IN DEVINST DevInst,
IN HMACHINE hMachine, IN HMACHINE hMachine,
OUT BOOL *IsEnabled); OUT BOOL *IsStarted);
BOOL BOOL
EnableDevice(IN HDEVINFO DeviceInfoSet, EnableDevice(IN HDEVINFO DeviceInfoSet,