Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 16:52:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

a better fix for bug 2519

Browse source 
svn path=/trunk/; revision=29496
This commit is contained in:
Ged Murphy 2007-10-11 10:29:02 +00:00
parent 8596afd334
commit f3d656d276
2 changed files with 58 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

10
reactos/base/applications/mscutils/servman/mainwnd.c
View file

@ -151,8 +151,8 @@ UpdateServiceCount(PMAIN_WND_INFO Info)
VOID SetMenuAndButtonStates(PMAIN_WND_INFO Info) VOID SetMenuAndButtonStates(PMAIN_WND_INFO Info)
{ {
LPQUERY_SERVICE_CONFIG lpServiceConfig;
HMENU hMainMenu; HMENU hMainMenu;
DWORD Flags, State;
UINT i; UINT i;
/* get handle to menu */ /* get handle to menu */
@ -178,6 +178,11 @@ VOID SetMenuAndButtonStates(PMAIN_WND_INFO Info)
EnableMenuItem(GetSubMenu(Info->hShortcutMenu, 0), ID_DELETE, MF_ENABLED); EnableMenuItem(GetSubMenu(Info->hShortcutMenu, 0), ID_DELETE, MF_ENABLED);
} }
lpServiceConfig = GetServiceConfig(Info->pCurrentService->lpServiceName);
if (lpServiceConfig && lpServiceConfig->dwStartType != SERVICE_DISABLED)
{
DWORD Flags, State;
Flags = Info->pCurrentService->ServiceStatusProcess.dwControlsAccepted; Flags = Info->pCurrentService->ServiceStatusProcess.dwControlsAccepted;
State = Info->pCurrentService->ServiceStatusProcess.dwCurrentState; State = Info->pCurrentService->ServiceStatusProcess.dwCurrentState;
@ -212,6 +217,9 @@ VOID SetMenuAndButtonStates(PMAIN_WND_INFO Info)
SendMessage(Info->hTool, TB_SETSTATE, ID_RESTART, SendMessage(Info->hTool, TB_SETSTATE, ID_RESTART,
(LPARAM)MAKELONG(TBSTATE_ENABLED, 0)); (LPARAM)MAKELONG(TBSTATE_ENABLED, 0));
} }
HeapFree(GetProcessHeap(), 0, lpServiceConfig);
}
} }
else else
{ {

15
reactos/base/applications/mscutils/servman/propsheet.c
View file

@ -21,13 +21,12 @@ SetButtonStates(PSERVICEPROPSHEET dlgInfo,
HWND hwndDlg) HWND hwndDlg)
{ {
HWND hButton; HWND hButton;
LPQUERY_SERVICE_CONFIG lpServiceConfig;
DWORD Flags, State; DWORD Flags, State;
UINT i; UINT i;
LPQUERY_SERVICE_CONFIG lpServiceConfig;
Flags = dlgInfo->pService->ServiceStatusProcess.dwControlsAccepted; Flags = dlgInfo->pService->ServiceStatusProcess.dwControlsAccepted;
State = dlgInfo->pService->ServiceStatusProcess.dwCurrentState; State = dlgInfo->pService->ServiceStatusProcess.dwCurrentState;
lpServiceConfig = GetServiceConfig(dlgInfo->pService->lpServiceName);
for (i = IDC_START; i <= IDC_RESUME; i++) for (i = IDC_START; i <= IDC_RESUME; i++)
{ {
@ -35,7 +34,10 @@ SetButtonStates(PSERVICEPROPSHEET dlgInfo,
EnableWindow (hButton, FALSE); EnableWindow (hButton, FALSE);
} }
if ( (State == SERVICE_STOPPED) && (lpServiceConfig->dwStartType != SERVICE_DISABLED) ) lpServiceConfig = GetServiceConfig(dlgInfo->pService->lpServiceName);
if (lpServiceConfig && lpServiceConfig->dwStartType != SERVICE_DISABLED)
{
if (State == SERVICE_STOPPED)
{ {
hButton = GetDlgItem(hwndDlg, IDC_START); hButton = GetDlgItem(hwndDlg, IDC_START);
EnableWindow (hButton, TRUE); EnableWindow (hButton, TRUE);
@ -51,10 +53,8 @@ SetButtonStates(PSERVICEPROPSHEET dlgInfo,
EnableWindow (hButton, TRUE); EnableWindow (hButton, TRUE);
} }
HeapFree(ProcessHeap, HeapFree(GetProcessHeap(), 0, lpServiceConfig);
0, }
lpServiceConfig);
} }
@ -492,4 +492,3 @@ OpenPropSheet(PMAIN_WND_INFO Info)
return Ret; return Ret;
} }