Ros-diffs January 2010

ros-diffs@reactos.org

26 participants
522 discussions

[gedmurphy] 44955: Display all service dependants which need stopping
by gedmurphy＠svn.reactos.org 05 Jan '10

05 Jan '10

Author: gedmurphy Date: Tue Jan 5 20:19:06 2010 New Revision: 44955 URL: http://svn.reactos.org/svn/reactos?rev=44955&view=rev Log: Display all service dependants which need stopping Modified: trunk/reactos/base/applications/mscutils/servman/precomp.h trunk/reactos/base/applications/mscutils/servman/stop.c trunk/reactos/base/applications/mscutils/servman/stop_dependencies.c Modified: trunk/reactos/base/applications/mscutils/servman/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/precomp.h [iso-8859-1] Tue Jan 5 20:19:06 2010 @@ -43,6 +43,8 @@ BOOL bDlgOpen; BOOL bInMenuLoop; BOOL bIsUserAnAdmin; + + PVOID pTag; } MAIN_WND_INFO, *PMAIN_WND_INFO; Modified: trunk/reactos/base/applications/mscutils/servman/stop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/stop.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/stop.c [iso-8859-1] Tue Jan 5 20:19:06 2010 @@ -119,6 +119,7 @@ HWND hProgress; LPWSTR lpServiceList; BOOL bRet = FALSE; + BOOL bStop = TRUE; if (pInfo) { @@ -129,33 +130,44 @@ lpServiceList = GetListOfServicesToStop(pInfo->pCurrentService->lpServiceName); if (lpServiceList) { + /* Tag the service list to the main wnd info */ + pInfo->pTag = (PVOID)lpServiceList; + /* List them and ask the user if they want to stop them */ if (DialogBoxParamW(hInstance, - MAKEINTRESOURCEW(IDD_DLG_DEPEND_STOP), - pInfo->hMainWnd, - StopDependsDialogProc, - (LPARAM)lpServiceList) == IDOK) + MAKEINTRESOURCEW(IDD_DLG_DEPEND_STOP), + pInfo->hMainWnd, + StopDependsDialogProc, + (LPARAM)pInfo) == IDOK) { /* Stop all the dependant services */ StopDependantServices(pInfo, pInfo->pCurrentService->lpServiceName); } + else + { + /* Don't stop the main service if the user selected not to */ + bStop = FALSE; + } } } - /* Create a progress window to track the progress of the stopping service */ - hProgress = CreateProgressDialog(pInfo->hMainWnd, - pInfo->pCurrentService->lpServiceName, - IDS_PROGRESS_INFO_STOP); + if (bStop) + { + /* Create a progress window to track the progress of the stopping service */ + hProgress = CreateProgressDialog(pInfo->hMainWnd, + pInfo->pCurrentService->lpServiceName, + IDS_PROGRESS_INFO_STOP); - /* Stop the requested service */ - bRet = StopService(pInfo, - pInfo->pCurrentService->lpServiceName, - hProgress); + /* Stop the requested service */ + bRet = StopService(pInfo, + pInfo->pCurrentService->lpServiceName, + hProgress); - if (hProgress) - { - /* Complete and destroy the progress bar */ - DestroyProgressDialog(hProgress, TRUE); + if (hProgress) + { + /* Complete and destroy the progress bar */ + DestroyProgressDialog(hProgress, TRUE); + } } } Modified: trunk/reactos/base/applications/mscutils/servman/stop_dependencies.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/stop_dependencies.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/stop_dependencies.c [iso-8859-1] Tue Jan 5 20:19:06 2010 @@ -125,10 +125,49 @@ } +static VOID +AddServiceNamesToStop(HWND hServiceListBox, + LPWSTR lpServiceList) +{ + LPQUERY_SERVICE_CONFIG lpServiceConfig; + LPWSTR lpStr; + + lpStr = lpServiceList; + + /* Loop through all the services in the list */ + while (TRUE) + { + /* Break when we hit the double null */ + if (*lpStr == L'\0' && *(lpStr + 1) == L'\0') + break; + + /* If this isn't our first time in the loop we'll + have been left on a null char */ + if (*lpStr == L'\0') + lpStr++; + + /* Get the service's display name */ + lpServiceConfig = GetServiceConfig(lpStr); + if (lpServiceConfig) + { + /* Add the service to the listbox */ + SendMessageW(hServiceListBox, + LB_ADDSTRING, + 0, + (LPARAM)lpServiceConfig->lpDisplayName); + } + + /* Move onto the next string */ + while (*lpStr != L'\0') + lpStr++; + } +} + static BOOL DoInitDependsDialog(PMAIN_WND_INFO pInfo, HWND hDlg) { + HWND hServiceListBox; LPWSTR lpPartialStr, lpStr; DWORD fullLen; HICON hIcon = NULL; @@ -196,8 +235,14 @@ lpPartialStr); } - /* FIXME: Load the list of services which need stopping */ - + /* Display the list of services which need stopping */ + hServiceListBox = GetDlgItem(hDlg, + IDC_STOP_DEPENDS_LB); + if (hServiceListBox) + { + AddServiceNamesToStop(hServiceListBox, + (LPWSTR)pInfo->pTag); + } } return bRet;

1 0

[gedmurphy] 44954: Switch to crt string safe functions. Remove some commented code
by gedmurphy＠svn.reactos.org 05 Jan '10

05 Jan '10

Author: gedmurphy Date: Tue Jan 5 19:39:47 2010 New Revision: 44954 URL: http://svn.reactos.org/svn/reactos?rev=44954&view=rev Log: Switch to crt string safe functions. Remove some commented code Modified: trunk/reactos/base/applications/mscutils/servman/propsheet_depends.c trunk/reactos/base/applications/mscutils/servman/query.c trunk/reactos/base/applications/mscutils/servman/stop.c Modified: trunk/reactos/base/applications/mscutils/servman/propsheet_depends.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/propsheet_depends.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/propsheet_depends.c [iso-8859-1] Tue Jan 5 19:39:47 2010 @@ -20,6 +20,8 @@ { TV_ITEM tvi; TV_INSERTSTRUCT tvins; + LPTSTR lpName; + DWORD dwSize; ZeroMemory(&tvi, sizeof(tvi)); ZeroMemory(&tvins, sizeof(tvins)); @@ -52,13 +54,15 @@ if (lpServiceName) { + dwSize = _tcslen(lpServiceName) + 1; /* Attach the service name */ - tvi.lParam = (LPARAM)(LPTSTR)HeapAlloc(GetProcessHeap(), - 0, - (_tcslen(lpServiceName) + 1) * sizeof(TCHAR)); - if (tvi.lParam) - { - _tcscpy((LPTSTR)tvi.lParam, lpServiceName); + lpName = (LPTSTR)HeapAlloc(GetProcessHeap(), + 0, + dwSize * sizeof(TCHAR)); + if (lpName) + { + _tcscpy_s(lpName, dwSize, lpServiceName); + tvi.lParam = (LPARAM)lpName; } } Modified: trunk/reactos/base/applications/mscutils/servman/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/query.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/query.c [iso-8859-1] Tue Jan 5 19:39:47 2010 @@ -143,6 +143,7 @@ SERVICE_DESCRIPTION *pServiceDescription = NULL; LPTSTR lpDescription = NULL; DWORD BytesNeeded = 0; + DWORD dwSize; hSCManager = OpenSCManager(NULL, NULL, @@ -180,12 +181,16 @@ { if (pServiceDescription->lpDescription) { + dwSize = _tcslen(pServiceDescription->lpDescription) + 1; lpDescription = HeapAlloc(ProcessHeap, 0, - (_tcslen(pServiceDescription->lpDescription) + 1) * sizeof(TCHAR)); + dwSize * sizeof(TCHAR)); if (lpDescription) - _tcscpy(lpDescription, - pServiceDescription->lpDescription); + { + _tcscpy_s(lpDescription, + dwSize, + pServiceDescription->lpDescription); + } } } } Modified: trunk/reactos/base/applications/mscutils/servman/stop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/stop.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/stop.c [iso-8859-1] Tue Jan 5 19:39:47 2010 @@ -101,52 +101,13 @@ return bRet; } - - - static BOOL StopDependantServices(PMAIN_WND_INFO pInfo, LPWSTR lpServiceName) { - //LPENUM_SERVICE_STATUS lpDependencies; - //SC_HANDLE hDepService; - //DWORD dwCount; BOOL bRet = FALSE; MessageBox(NULL, L"Rewrite StopDependentServices", NULL, 0); - /* - - lpDependencies = GetServiceDependents(hService, &dwCount); - if (lpDependencies) - { - LPENUM_SERVICE_STATUS lpEnumServiceStatus; - DWORD i; - - for (i = 0; i < dwCount; i++) - { - lpEnumServiceStatus = &lpDependencies[i]; - - hDepService = OpenService(pStopInfo->hSCManager, - lpEnumServiceStatus->lpServiceName, - SERVICE_STOP | SERVICE_QUERY_STATUS); - if (hDepService) - { - bRet = StopService(pStopInfo, hDepService); - - CloseServiceHandle(hDepService); - - if (!bRet) - { - GetError(); - break; - } - } - } - - HeapFree(GetProcessHeap(), - 0, - lpDependencies); - }*/ return bRet; } @@ -186,13 +147,14 @@ pInfo->pCurrentService->lpServiceName, IDS_PROGRESS_INFO_STOP); - /* Finally, stop the requested service */ + /* Stop the requested service */ bRet = StopService(pInfo, pInfo->pCurrentService->lpServiceName, hProgress); if (hProgress) { + /* Complete and destroy the progress bar */ DestroyProgressDialog(hProgress, TRUE); } }

1 0

[gedmurphy] 44953: Forgot the comments in this file
by gedmurphy＠svn.reactos.org 05 Jan '10

05 Jan '10

Author: gedmurphy Date: Tue Jan 5 19:16:43 2010 New Revision: 44953 URL: http://svn.reactos.org/svn/reactos?rev=44953&view=rev Log: Forgot the comments in this file Modified: trunk/reactos/base/applications/mscutils/servman/progress.c Modified: trunk/reactos/base/applications/mscutils/servman/progress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/progress.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/progress.c [iso-8859-1] Tue Jan 5 19:16:43 2010 @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/mscutils/servman/progress.c * PURPOSE: Progress dialog box message handler - * COPYRIGHT: Copyright 2006-2007 Ged Murphy <gedmurphy(a)reactos.org> + * COPYRIGHT: Copyright 2006-2010 Ged Murphy <gedmurphy(a)reactos.org> * */ @@ -15,26 +15,31 @@ CompleteProgressBar(HWND hProgDlg) { HWND hProgBar; + UINT Pos = 0; + /* Get a handle to the progress bar */ hProgBar = GetDlgItem(hProgDlg, IDC_SERVCON_PROGRESS); if (hProgBar) { - INT pos = 0; - - pos = SendMessageW(hProgBar, + /* Get the current position */ + Pos = SendMessageW(hProgBar, PBM_GETPOS, 0, 0); - while (pos <= PROGRESSRANGE) + /* Loop until we hit the max */ + while (Pos <= PROGRESSRANGE) { + /* Increment the progress bar */ SendMessageW(hProgBar, PBM_DELTAPOS, - pos, + Pos, 0); + + /* Wait for 15ms, it gives it a smooth feel */ Sleep(15); - pos++; + Pos++; } } } @@ -45,12 +50,15 @@ { HWND hProgBar; + /* Get a handle to the progress bar */ hProgBar = GetDlgItem(hProgDlg, IDC_SERVCON_PROGRESS); if (hProgBar) { + /* Do we want to increment the default amount? */ if (NewPos == DEFAULT_STEP) { + /* Yes, use the step value we set on create */ SendMessageW(hProgBar, PBM_STEPIT, 0, @@ -58,6 +66,7 @@ } else { + /* No, use the value passed */ SendMessageW(hProgBar, PBM_SETPOS, NewPos, @@ -169,7 +178,7 @@ /* Complete the progress bar */ CompleteProgressBar(hwnd); - /* Wait for asthetics */ + /* Wait, for asthetics */ Sleep(500); }

1 0

[gedmurphy] 44951: - Reimplement service stop routines. - Stopping single services should now work again, full dependency trees won't yet.
by gedmurphy＠svn.reactos.org 05 Jan '10

05 Jan '10

Author: gedmurphy Date: Tue Jan 5 19:08:41 2010 New Revision: 44951 URL: http://svn.reactos.org/svn/reactos?rev=44951&view=rev Log: - Reimplement service stop routines. - Stopping single services should now work again, full dependency trees won't yet. Modified: trunk/reactos/base/applications/mscutils/servman/control.c trunk/reactos/base/applications/mscutils/servman/precomp.h trunk/reactos/base/applications/mscutils/servman/progress.c trunk/reactos/base/applications/mscutils/servman/start.c trunk/reactos/base/applications/mscutils/servman/stop.c Modified: trunk/reactos/base/applications/mscutils/servman/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/control.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/control.c [iso-8859-1] Tue Jan 5 19:08:41 2010 @@ -48,7 +48,7 @@ DWORD dwOldCheckPoint = ServiceStatus.dwCheckPoint; DWORD dwMaxWait = 2000 * 60; // wait for 2 mins - IncrementProgressBar(hProgDlg); + IncrementProgressBar(hProgDlg, DEFAULT_STEP); while (ServiceStatus.dwCurrentState != Control) { @@ -66,7 +66,7 @@ if (ServiceStatus.dwCheckPoint > dwOldCheckPoint) { /* The service is making progress, increment the progress bar */ - IncrementProgressBar(hProgDlg); + IncrementProgressBar(hProgDlg, DEFAULT_STEP); dwStartTickCount = GetTickCount(); dwOldCheckPoint = ServiceStatus.dwCheckPoint; } Modified: trunk/reactos/base/applications/mscutils/servman/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/precomp.h [iso-8859-1] Tue Jan 5 19:08:41 2010 @@ -94,8 +94,10 @@ BOOL DoResume(PMAIN_WND_INFO Info); /* progress.c */ -HWND CreateProgressDialog(HWND hParent, LPTSTR lpServiceName, UINT Event); -VOID IncrementProgressBar(HWND hProgDlg); +#define DEFAULT_STEP 0 +HWND CreateProgressDialog(HWND hParent, LPTSTR lpServiceName, UINT LabelId); +BOOL DestroyProgressDialog(HWND hProgDlg, BOOL bComplete); +VOID IncrementProgressBar(HWND hProgDlg, UINT NewPos); VOID CompleteProgressBar(HWND hProgDlg); /* query.c */ Modified: trunk/reactos/base/applications/mscutils/servman/progress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/progress.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/progress.c [iso-8859-1] Tue Jan 5 19:08:41 2010 @@ -18,41 +18,51 @@ hProgBar = GetDlgItem(hProgDlg, IDC_SERVCON_PROGRESS); - if (hProgBar) { INT pos = 0; - pos = SendMessage(hProgBar, - PBM_GETPOS, - 0, - 0); + pos = SendMessageW(hProgBar, + PBM_GETPOS, + 0, + 0); - for (; pos <= PROGRESSRANGE; pos++) + while (pos <= PROGRESSRANGE) { - SendMessage(hProgBar, - PBM_DELTAPOS, - pos, - 0); + SendMessageW(hProgBar, + PBM_DELTAPOS, + pos, + 0); Sleep(15); + pos++; } } } VOID -IncrementProgressBar(HWND hProgDlg) +IncrementProgressBar(HWND hProgDlg, + UINT NewPos) { HWND hProgBar; hProgBar = GetDlgItem(hProgDlg, IDC_SERVCON_PROGRESS); - if (hProgBar) { - SendMessage(hProgBar, - PBM_STEPIT, - 0, - 0); + if (NewPos == DEFAULT_STEP) + { + SendMessageW(hProgBar, + PBM_STEPIT, + 0, + 0); + } + else + { + SendMessageW(hProgBar, + PBM_SETPOS, + NewPos, + 0); + } } } @@ -68,18 +78,21 @@ { HWND hProgBar; - /* set the progress bar range and step */ + /* Get a handle to the progress bar */ hProgBar = GetDlgItem(hDlg, IDC_SERVCON_PROGRESS); - SendMessage(hProgBar, - PBM_SETRANGE, - 0, - MAKELPARAM(0, PROGRESSRANGE)); - SendMessage(hProgBar, - PBM_SETSTEP, - (WPARAM)1, - 0); + /* Set the progress bar range */ + SendMessageW(hProgBar, + PBM_SETRANGE, + 0, + MAKELPARAM(0, PROGRESSRANGE)); + + /* Set the progress bar step */ + SendMessageW(hProgBar, + PBM_SETSTEP, + (WPARAM)1, + 0); } break; @@ -98,43 +111,70 @@ } return TRUE; - } HWND CreateProgressDialog(HWND hParent, LPTSTR lpServiceName, - UINT Event) + UINT LabelId) { HWND hProgDlg; - TCHAR ProgDlgBuf[100]; + LPWSTR lpProgStr; /* open the progress dialog */ - hProgDlg = CreateDialog(hInstance, - MAKEINTRESOURCE(IDD_DLG_PROGRESS), - hParent, - ProgressDialogProc); + hProgDlg = CreateDialogW(hInstance, + MAKEINTRESOURCEW(IDD_DLG_PROGRESS), + hParent, + ProgressDialogProc); if (hProgDlg != NULL) { - /* write the info to the progress dialog */ - LoadString(hInstance, - Event, - ProgDlgBuf, - sizeof(ProgDlgBuf) / sizeof(TCHAR)); + /* Load the label Id */ + if (AllocAndLoadString(&lpProgStr, + hInstance, + LabelId)) + { + /* Write it to the dialog */ + SendDlgItemMessageW(hProgDlg, + IDC_SERVCON_INFO, + WM_SETTEXT, + 0, + (LPARAM)lpProgStr); - SendDlgItemMessage(hProgDlg, - IDC_SERVCON_INFO, - WM_SETTEXT, - 0, - (LPARAM)ProgDlgBuf); + HeapFree(GetProcessHeap(), + 0, + lpProgStr); + } - /* write the service name to the progress dialog */ - SendDlgItemMessage(hProgDlg, - IDC_SERVCON_NAME, - WM_SETTEXT, - 0, - (LPARAM)lpServiceName); + /* Write the service name to the dialog */ + SendDlgItemMessageW(hProgDlg, + IDC_SERVCON_NAME, + WM_SETTEXT, + 0, + (LPARAM)lpServiceName); } return hProgDlg; } + +BOOL +DestroyProgressDialog(HWND hwnd, + BOOL bComplete) +{ + BOOL bRet = FALSE; + + if (hwnd) + { + if (bComplete) + { + /* Complete the progress bar */ + CompleteProgressBar(hwnd); + + /* Wait for asthetics */ + Sleep(500); + } + + bRet = DestroyWindow(hwnd); + } + + return bRet; +} Modified: trunk/reactos/base/applications/mscutils/servman/start.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/start.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/start.c [iso-8859-1] Tue Jan 5 19:08:41 2010 @@ -121,7 +121,7 @@ if (hProgDlg) { - IncrementProgressBar(hProgDlg); + IncrementProgressBar(hProgDlg, DEFAULT_STEP); bRet = DoStartService(Info, hProgDlg); Modified: trunk/reactos/base/applications/mscutils/servman/stop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/stop.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/stop.c [iso-8859-1] Tue Jan 5 19:08:41 2010 @@ -12,60 +12,97 @@ static BOOL StopService(PMAIN_WND_INFO pInfo, - LPWSTR lpServiceName) + LPWSTR lpServiceName, + HWND hProgress OPTIONAL) { - //SERVICE_STATUS_PROCESS ServiceStatus; - //DWORD dwBytesNeeded; - //DWORD dwStartTime; - // DWORD dwTimeout; - //HWND hProgDlg; + SC_HANDLE hSCManager; + SC_HANDLE hService; + SERVICE_STATUS_PROCESS ServiceStatus; + DWORD dwBytesNeeded; + DWORD dwStartTime; + DWORD dwTimeout; BOOL bRet = FALSE; -/* - dwStartTime = GetTickCount(); - dwTimeout = 30000; // 30 secs - - hProgDlg = CreateProgressDialog(pStopInfo->pInfo->hMainWnd, - pStopInfo->pInfo->pCurrentService->lpServiceName, - IDS_PROGRESS_INFO_STOP); - if (hProgDlg) - { - IncrementProgressBar(hProgDlg); - - if (ControlService(hService, - SERVICE_CONTROL_STOP, - (LPSERVICE_STATUS)&ServiceStatus)) - { - while (ServiceStatus.dwCurrentState != SERVICE_STOPPED) - { - Sleep(ServiceStatus.dwWaitHint); - - if (QueryServiceStatusEx(hService, - SC_STATUS_PROCESS_INFO, - (LPBYTE)&ServiceStatus, - sizeof(SERVICE_STATUS_PROCESS), - &dwBytesNeeded)) - { - if (GetTickCount() - dwStartTime > dwTimeout) + + if (hProgress) + { + /* Increment the progress bar */ + IncrementProgressBar(hProgress, DEFAULT_STEP); + } + + hSCManager = OpenSCManager(NULL, + NULL, + SC_MANAGER_CONNECT); + if (hSCManager) + { + hService = OpenService(hSCManager, + lpServiceName, + SERVICE_STOP | SERVICE_QUERY_STATUS); + if (hService) + { + if (hProgress) + { + /* Increment the progress bar */ + IncrementProgressBar(hProgress, DEFAULT_STEP); + } + + /* Set the wait time to 30 secs */ + dwStartTime = GetTickCount(); + dwTimeout = 30000; + + /* Send the service the stop code */ + if (ControlService(hService, + SERVICE_CONTROL_STOP, + (LPSERVICE_STATUS)&ServiceStatus)) + { + if (hProgress) + { + /* Increment the progress bar */ + IncrementProgressBar(hProgress, DEFAULT_STEP); + } + + while (ServiceStatus.dwCurrentState != SERVICE_STOPPED) + { + Sleep(ServiceStatus.dwWaitHint); + + if (hProgress) { - We exceeded our max wait time, give up - break; + /* Increment the progress bar */ + IncrementProgressBar(hProgress, DEFAULT_STEP); } - } - } - - if (ServiceStatus.dwCurrentState == SERVICE_STOPPED) - { - bRet = TRUE; - } - } - - CompleteProgressBar(hProgDlg); - Sleep(500); - DestroyWindow(hProgDlg); + + if (QueryServiceStatusEx(hService, + SC_STATUS_PROCESS_INFO, + (LPBYTE)&ServiceStatus, + sizeof(SERVICE_STATUS_PROCESS), + &dwBytesNeeded)) + { + /* Have we exceeded our wait time? */ + if (GetTickCount() - dwStartTime > dwTimeout) + { + /* Yep, give up */ + break; + } + } + } + + /* If the service is stopped, return TRUE */ + if (ServiceStatus.dwCurrentState == SERVICE_STOPPED) + { + bRet = TRUE; + } + } + + CloseServiceHandle(hService); + } + + CloseServiceHandle(hSCManager); } -*/ + return bRet; } + + + static BOOL StopDependantServices(PMAIN_WND_INFO pInfo, @@ -118,6 +155,7 @@ BOOL DoStop(PMAIN_WND_INFO pInfo) { + HWND hProgress; LPWSTR lpServiceList; BOOL bRet = FALSE; @@ -138,18 +176,24 @@ (LPARAM)lpServiceList) == IDOK) { /* Stop all the dependant services */ - if (StopDependantServices(pInfo, pInfo->pCurrentService->lpServiceName)) - { - /* Finally stop the requested service */ - bRet = StopService(pInfo, pInfo->pCurrentService->lpServiceName); - } - } - } - } - else - { - /* No dependants, just stop the service */ - bRet = StopService(pInfo, pInfo->pCurrentService->lpServiceName); + StopDependantServices(pInfo, pInfo->pCurrentService->lpServiceName); + } + } + } + + /* Create a progress window to track the progress of the stopping service */ + hProgress = CreateProgressDialog(pInfo->hMainWnd, + pInfo->pCurrentService->lpServiceName, + IDS_PROGRESS_INFO_STOP); + + /* Finally, stop the requested service */ + bRet = StopService(pInfo, + pInfo->pCurrentService->lpServiceName, + hProgress); + + if (hProgress) + { + DestroyProgressDialog(hProgress, TRUE); } }

1 0

[tkreuzer] 44950: [ATL] Merged from amd64 branch: - add amd64 specific thunkCode - get rid of a cast
by tkreuzer＠svn.reactos.org 05 Jan '10

05 Jan '10

Author: tkreuzer Date: Tue Jan 5 18:38:03 2010 New Revision: 44950 URL: http://svn.reactos.org/svn/reactos?rev=44950&view=rev Log: [ATL] Merged from amd64 branch: - add amd64 specific thunkCode - get rid of a cast Modified: trunk/reactos/lib/atl/atlcom.h trunk/reactos/lib/atl/atlwin.h Modified: trunk/reactos/lib/atl/atlcom.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/atlcom.h?rev=44950… ============================================================================== --- trunk/reactos/lib/atl/atlcom.h [iso-8859-1] (original) +++ trunk/reactos/lib/atl/atlcom.h [iso-8859-1] Tue Jan 5 18:38:03 2010 @@ -33,7 +33,7 @@ class CComObjectRootBase { public: - long m_dwRef; + LONG m_dwRef; public: CComObjectRootBase() { @@ -99,13 +99,13 @@ ULONG InternalAddRef() { ATLASSERT(m_dwRef >= 0); - return ThreadModel::Increment(reinterpret_cast<int *>(&m_dwRef)); + return ThreadModel::Increment(&m_dwRef); } ULONG InternalRelease() { ATLASSERT(m_dwRef > 0); - return ThreadModel::Decrement(reinterpret_cast<int *>(&m_dwRef)); + return ThreadModel::Decrement(&m_dwRef); } void Lock() Modified: trunk/reactos/lib/atl/atlwin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/atlwin.h?rev=44950… ============================================================================== --- trunk/reactos/lib/atl/atlwin.h [iso-8859-1] (original) +++ trunk/reactos/lib/atl/atlwin.h [iso-8859-1] Tue Jan 5 18:38:03 2010 @@ -172,8 +172,39 @@ } }; +#elif _AMD64_ //WARNING: NOT VERIFIED +#pragma pack(push,1) +struct thunkCode +{ + DWORD_PTR m_mov; + DWORD_PTR m_this; + BYTE m_jmp; + DWORD_PTR m_relproc; +}; +#pragma pack(pop) + +class CWndProcThunk +{ +public: + thunkCode m_thunk; + _AtlCreateWndData cd; +public: + BOOL Init(WNDPROC proc, void *pThis) + { + m_thunk.m_mov = 0xffff8000042444C7LL; + m_thunk.m_this = (DWORD_PTR)pThis; + m_thunk.m_jmp = 0xe9; + m_thunk.m_relproc = DWORD_PTR(reinterpret_cast<char *>(proc) - (reinterpret_cast<char *>(this) + sizeof(thunkCode))); + return TRUE; + } + + WNDPROC GetWNDPROC() + { + return reinterpret_cast<WNDPROC>(&m_thunk); + } +}; #else -#error Only X86 supported +#error ARCH not supported #endif class CMessageMap

1 0

[gedmurphy] 44949: More code towards getting servman to stop services again, etc... (clearly not a message for the changelog)
by gedmurphy＠svn.reactos.org 05 Jan '10

05 Jan '10

Author: gedmurphy Date: Tue Jan 5 18:14:08 2010 New Revision: 44949 URL: http://svn.reactos.org/svn/reactos?rev=44949&view=rev Log: More code towards getting servman to stop services again, etc... (clearly not a message for the changelog) Added: trunk/reactos/base/applications/mscutils/servman/stop_dependencies.c - copied, changed from r44882, trunk/reactos/base/applications/mscutils/servman/dependencies.c Removed: trunk/reactos/base/applications/mscutils/servman/dependencies.c Modified: trunk/reactos/base/applications/mscutils/servman/dependencies_tv2.c trunk/reactos/base/applications/mscutils/servman/precomp.h trunk/reactos/base/applications/mscutils/servman/servman.rbuild trunk/reactos/base/applications/mscutils/servman/stop.c Removed: trunk/reactos/base/applications/mscutils/servman/dependencies.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/dependencies.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/dependencies.c (removed) @@ -1,153 +1,0 @@ -/* - * PROJECT: ReactOS Services - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/mscutils/servman/dependencies.c - * PURPOSE: Helper functions for service dependents - * COPYRIGHT: Copyright 2006-2009 Ged Murphy <gedmurphy(a)reactos.org> - * - */ - -#include "precomp.h" - -//FIXME: reimplement this -static BOOL -DoInitDependsDialog(PSTOP_INFO pStopInfo, - HWND hDlg) -{ - //LPENUM_SERVICE_STATUS lpDependencies; - //DWORD dwCount; - LPTSTR lpPartialStr, lpStr; - DWORD fullLen; - HICON hIcon = NULL; - BOOL bRet = FALSE; - - if (pStopInfo) - { - SetWindowLongPtr(hDlg, - GWLP_USERDATA, - (LONG_PTR)pStopInfo); - - hIcon = (HICON)LoadImage(hInstance, - MAKEINTRESOURCE(IDI_SM_ICON), - IMAGE_ICON, - 16, - 16, - 0); - if (hIcon) - { - SendMessage(hDlg, - WM_SETICON, - ICON_SMALL, - (LPARAM)hIcon); - DestroyIcon(hIcon); - } - - /* Add the label */ - if (AllocAndLoadString(&lpPartialStr, - hInstance, - IDS_STOP_DEPENDS)) - { - fullLen = _tcslen(lpPartialStr) + _tcslen(pStopInfo->pInfo->pCurrentService->lpDisplayName) + 1; - - lpStr = HeapAlloc(ProcessHeap, - 0, - fullLen * sizeof(TCHAR)); - if (lpStr) - { - _sntprintf(lpStr, fullLen, lpPartialStr, pStopInfo->pInfo->pCurrentService->lpDisplayName); - - SendDlgItemMessage(hDlg, - IDC_STOP_DEPENDS, - WM_SETTEXT, - 0, - (LPARAM)lpStr); - - bRet = TRUE; - - HeapFree(ProcessHeap, - 0, - lpStr); - } - - HeapFree(ProcessHeap, - 0, - lpPartialStr); - } - - /* Get the list of dependencies - GetServiceDependents(pStopInfo->hMainService, &dwCount); - if (lpDependencies) - { - LPENUM_SERVICE_STATUS lpEnumServiceStatus; - DWORD i; - - for (i = 0; i < dwCount; i++) - { - lpEnumServiceStatus = &lpDependencies[i]; - - Add the service to the listbox - SendDlgItemMessage(hDlg, - IDC_STOP_DEPENDS_LB, - LB_ADDSTRING, - 0, - (LPARAM)lpEnumServiceStatus->lpDisplayName); - } - - HeapFree(ProcessHeap, - 0, - lpDependencies); - }*/ - } - - return bRet; -} - - -INT_PTR CALLBACK -StopDependsDialogProc(HWND hDlg, - UINT message, - WPARAM wParam, - LPARAM lParam) -{ - PSTOP_INFO pStopInfo = NULL; - - /* Get the window context */ - pStopInfo = (PSTOP_INFO)GetWindowLongPtr(hDlg, - GWLP_USERDATA); - if (pStopInfo == NULL && message != WM_INITDIALOG) - { - return FALSE; - } - - switch (message) - { - case WM_INITDIALOG: - { - BOOL bRet = FALSE; - - pStopInfo = (PSTOP_INFO)lParam; - if (pStopInfo != NULL) - { - bRet = DoInitDependsDialog(pStopInfo, hDlg); - } - - return bRet; - } - - case WM_COMMAND: - { - switch (LOWORD(wParam)) - { - case IDOK: - case IDCANCEL: - { - EndDialog(hDlg, - LOWORD(wParam)); - return TRUE; - } - } - } - } - - return FALSE; -} Modified: trunk/reactos/base/applications/mscutils/servman/dependencies_tv2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/dependencies_tv2.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/dependencies_tv2.c [iso-8859-1] Tue Jan 5 18:14:08 2010 @@ -51,55 +51,67 @@ } -static LPENUM_SERVICE_STATUS -TV2_GetDependants(SC_HANDLE hService, +LPENUM_SERVICE_STATUS +TV2_GetDependants(LPWSTR lpServiceName, LPDWORD lpdwCount) { - LPENUM_SERVICE_STATUS lpDependencies; + SC_HANDLE hSCManager; + SC_HANDLE hService; + LPENUM_SERVICE_STATUSW lpDependencies = NULL; DWORD dwBytesNeeded; DWORD dwCount; - /* Does this have any dependencies? */ - if (EnumDependentServices(hService, - SERVICE_STATE_ALL, - NULL, - 0, - &dwBytesNeeded, - &dwCount)) - { - /* There are no dependent services */ - return NULL; - } - else - { - if (GetLastError() != ERROR_MORE_DATA) - return NULL; /* Unexpected error */ - - lpDependencies = (LPENUM_SERVICE_STATUS)HeapAlloc(GetProcessHeap(), - 0, - dwBytesNeeded); - if (lpDependencies) - { - /* Get the list of dependents */ - if (EnumDependentServices(hService, - SERVICE_STATE_ALL, - lpDependencies, - dwBytesNeeded, - &dwBytesNeeded, - &dwCount)) + /* Set the first items in each tree view */ + hSCManager = OpenSCManagerW(NULL, + NULL, + SC_MANAGER_ALL_ACCESS); + if (hSCManager) + { + hService = OpenServiceW(hSCManager, + lpServiceName, + SERVICE_QUERY_STATUS | SERVICE_ENUMERATE_DEPENDENTS | SERVICE_QUERY_CONFIG); + if (hService) + { + /* Does this have any dependencies? */ + if (!EnumDependentServicesW(hService, + SERVICE_STATE_ALL, + NULL, + 0, + &dwBytesNeeded, + &dwCount) && + GetLastError() == ERROR_MORE_DATA) { - /* Set the count */ - *lpdwCount = dwCount; + lpDependencies = (LPENUM_SERVICE_STATUSW)HeapAlloc(GetProcessHeap(), + 0, + dwBytesNeeded); + if (lpDependencies) + { + /* Get the list of dependents */ + if (EnumDependentServicesW(hService, + SERVICE_STATE_ALL, + lpDependencies, + dwBytesNeeded, + &dwBytesNeeded, + &dwCount)) + { + /* Set the count */ + *lpdwCount = dwCount; + } + else + { + HeapFree(ProcessHeap, + 0, + lpDependencies); + + lpDependencies = NULL; + } + } } - else - { - HeapFree(ProcessHeap, - 0, - lpDependencies); - - lpDependencies = NULL; - } - } + + CloseServiceHandle(hService); + } + + CloseServiceHandle(hSCManager); } return lpDependencies; @@ -111,70 +123,56 @@ HTREEITEM hParent, LPTSTR lpServiceName) { - SC_HANDLE hSCManager; - SC_HANDLE hService; - LPENUM_SERVICE_STATUS lpServiceStatus; + + LPENUM_SERVICE_STATUSW lpServiceStatus; LPTSTR lpNoDepends; DWORD count, i; BOOL bHasChildren; - /* Set the first items in each tree view */ - hSCManager = OpenSCManager(NULL, - NULL, - SC_MANAGER_ALL_ACCESS); - if (hSCManager) - { - hService = OpenService(hSCManager, - lpServiceName, - SERVICE_QUERY_STATUS | SERVICE_ENUMERATE_DEPENDENTS | SERVICE_QUERY_CONFIG); - if (hService) - { - /* Get a list of service dependents */ - lpServiceStatus = TV2_GetDependants(hService, &count); - if (lpServiceStatus) - { - for (i = 0; i < count; i++) - { - /* Does this item need a +/- box? */ - bHasChildren = TV2_HasDependantServices(lpServiceStatus[i].lpServiceName); - - /* Add it */ - AddItemToTreeView(pDlgInfo->hDependsTreeView2, - hParent, - lpServiceStatus[i].lpDisplayName, - lpServiceStatus[i].lpServiceName, - lpServiceStatus[i].ServiceStatus.dwServiceType, - bHasChildren); - } - } - else - { - /* If there is no parent, set the tree to 'no dependencies' */ - if (!hParent) - { - /* Load the 'No dependencies' string */ - AllocAndLoadString(&lpNoDepends, hInstance, IDS_NO_DEPENDS); - - AddItemToTreeView(pDlgInfo->hDependsTreeView2, - NULL, - lpNoDepends, - NULL, - 0, - FALSE); - - HeapFree(ProcessHeap, - 0, - lpNoDepends); - - /* Disable the window */ - EnableWindow(pDlgInfo->hDependsTreeView2, FALSE); - } - } - - CloseServiceHandle(hService); - } - - CloseServiceHandle(hSCManager); + /* Get a list of service dependents */ + lpServiceStatus = TV2_GetDependants(lpServiceName, &count); + if (lpServiceStatus) + { + for (i = 0; i < count; i++) + { + /* Does this item need a +/- box? */ + bHasChildren = TV2_HasDependantServices(lpServiceStatus[i].lpServiceName); + + /* Add it */ + AddItemToTreeView(pDlgInfo->hDependsTreeView2, + hParent, + lpServiceStatus[i].lpDisplayName, + lpServiceStatus[i].lpServiceName, + lpServiceStatus[i].ServiceStatus.dwServiceType, + bHasChildren); + } + + HeapFree(GetProcessHeap(), + 0, + lpServiceStatus); + } + else + { + /* If there is no parent, set the tree to 'no dependencies' */ + if (!hParent) + { + /* Load the 'No dependencies' string */ + AllocAndLoadString(&lpNoDepends, hInstance, IDS_NO_DEPENDS); + + AddItemToTreeView(pDlgInfo->hDependsTreeView2, + NULL, + lpNoDepends, + NULL, + 0, + FALSE); + + HeapFree(ProcessHeap, + 0, + lpNoDepends); + + /* Disable the window */ + EnableWindow(pDlgInfo->hDependsTreeView2, FALSE); + } } } Modified: trunk/reactos/base/applications/mscutils/servman/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/precomp.h [iso-8859-1] Tue Jan 5 18:14:08 2010 @@ -124,8 +124,9 @@ HTREEITEM AddItemToTreeView(HWND hTreeView, HTREEITEM hRoot, LPTSTR lpDisplayName, LPTSTR lpServiceName, ULONG serviceType, BOOL bHasChildren); -/* dependencies */ +/* stop_dependencies */ INT_PTR CALLBACK StopDependsDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); +LPWSTR GetListOfServicesToStop(LPWSTR lpServiceName); /* tv1_dependencies */ BOOL TV1_Initialize(PSERVICEPROPSHEET pDlgInfo, LPTSTR lpServiceName); @@ -135,6 +136,7 @@ BOOL TV2_Initialize(PSERVICEPROPSHEET pDlgInfo, LPTSTR lpServiceName); VOID TV2_AddDependantsToTree(PSERVICEPROPSHEET pDlgInfo, HTREEITEM hParent, LPTSTR lpServiceName); BOOL TV2_HasDependantServices(LPWSTR lpServiceName); +LPENUM_SERVICE_STATUS TV2_GetDependants(LPWSTR lpServiceName, LPDWORD lpdwCount); LONG APIENTRY OpenPropSheet(PMAIN_WND_INFO Info); Modified: trunk/reactos/base/applications/mscutils/servman/servman.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/servman.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/servman.rbuild [iso-8859-1] Tue Jan 5 18:14:08 2010 @@ -14,7 +14,6 @@ <file>control.c</file> <file>create.c</file> <file>delete.c</file> - <file>dependencies.c</file> <file>dependencies_tv1.c</file> <file>dependencies_tv2.c</file> <file>export.c</file> @@ -29,6 +28,7 @@ <file>servman.c</file> <file>start.c</file> <file>stop.c</file> + <file>stop_dependencies.c</file> </compilationunit> <file>servman.rc</file> <pch>precomp.h</pch> Modified: trunk/reactos/base/applications/mscutils/servman/stop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/stop.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/stop.c [iso-8859-1] Tue Jan 5 18:14:08 2010 @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/mscutils/servman/stop.c * PURPOSE: Stops running a service - * COPYRIGHT: Copyright 2006-2009 Ged Murphy <gedmurphy(a)reactos.org> + * COPYRIGHT: Copyright 2006-2010 Ged Murphy <gedmurphy(a)reactos.org> * */ @@ -118,6 +118,7 @@ BOOL DoStop(PMAIN_WND_INFO pInfo) { + LPWSTR lpServiceList; BOOL bRet = FALSE; if (pInfo) @@ -125,18 +126,23 @@ /* Does this service have anything which depends on it? */ if (TV2_HasDependantServices(pInfo->pCurrentService->lpServiceName)) { - /* It does, list them and ask the user if they want to stop them as well */ - if (DialogBoxParam(hInstance, - MAKEINTRESOURCE(IDD_DLG_DEPEND_STOP), - pInfo->hMainWnd, - StopDependsDialogProc, - (LPARAM)&pInfo) == IDOK) + /* It does, get a list of all the services which need stopping */ + lpServiceList = GetListOfServicesToStop(pInfo->pCurrentService->lpServiceName); + if (lpServiceList) { - /* Stop all the dependany services */ - if (StopDependantServices(pInfo, pInfo->pCurrentService->lpServiceName)) + /* List them and ask the user if they want to stop them */ + if (DialogBoxParamW(hInstance, + MAKEINTRESOURCEW(IDD_DLG_DEPEND_STOP), + pInfo->hMainWnd, + StopDependsDialogProc, + (LPARAM)lpServiceList) == IDOK) { - /* Finally stop the requested service */ - bRet = StopService(pInfo, pInfo->pCurrentService->lpServiceName); + /* Stop all the dependant services */ + if (StopDependantServices(pInfo, pInfo->pCurrentService->lpServiceName)) + { + /* Finally stop the requested service */ + bRet = StopService(pInfo, pInfo->pCurrentService->lpServiceName); + } } } } Copied: trunk/reactos/base/applications/mscutils/servman/stop_dependencies.c (from r44882, trunk/reactos/base/applications/mscutils/servman/dependencies.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/dependencies.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/stop_dependencies.c [iso-8859-1] Tue Jan 5 18:14:08 2010 @@ -1,72 +1,194 @@ /* * PROJECT: ReactOS Services * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/mscutils/servman/dependencies.c - * PURPOSE: Helper functions for service dependents - * COPYRIGHT: Copyright 2006-2009 Ged Murphy <gedmurphy(a)reactos.org> + * FILE: base/applications/mscutils/servman/stop_dependencies.c + * PURPOSE: Routines related to stopping dependent services + * COPYRIGHT: Copyright 2006-2010 Ged Murphy <gedmurphy(a)reactos.org> * */ #include "precomp.h" -//FIXME: reimplement this + +static LPWSTR +AddServiceToList(LPWSTR *lpServiceList, + LPWSTR lpServiceToAdd) +{ + LPWSTR lpNewList = NULL; + LPWSTR ptr; + DWORD dwToAddSize; + DWORD dwCurSize; + + dwToAddSize = wcslen(lpServiceToAdd) + 1; + + /* Is this is the first in the list? */ + if (!*lpServiceList) + { + /* Add another char for double null */ + dwToAddSize++; + + lpNewList = HeapAlloc(GetProcessHeap(), + 0, + dwToAddSize * sizeof(WCHAR)); + if (lpNewList) + { + /* Copy the service name */ + wcscpy_s(lpNewList, + dwToAddSize, + lpServiceToAdd); + + /* Add the double null char */ + lpNewList[dwToAddSize - 1] = L'\0'; + } + } + else + { + ptr = *lpServiceList; + dwCurSize = 0; + + /* Get the list size */ + while (*ptr != L'\0' || *(ptr + 1) != L'\0') + { + ptr++; + dwCurSize++; + } + dwCurSize++; + + /* Add another char for double null */ + dwCurSize++; + + /* Extend the list size */ + lpNewList = HeapReAlloc(GetProcessHeap(), + 0, + *lpServiceList, + (dwCurSize + dwToAddSize) * sizeof(WCHAR)); + if (lpNewList) + { + /* Copy the service name */ + wcscpy_s(&lpNewList[dwCurSize - 1], + dwToAddSize, + lpServiceToAdd); + + /* Add the double null char */ + lpNewList[dwCurSize + dwToAddSize - 1] = L'\0'; + } + } + + return lpNewList; +} + static BOOL -DoInitDependsDialog(PSTOP_INFO pStopInfo, +BuildListOfServicesToStop(LPWSTR *lpServiceList, + LPWSTR lpServiceName) +{ + LPENUM_SERVICE_STATUS lpServiceStatus; + DWORD dwCount, i; + BOOL bRet = FALSE; + + /* Get a list of service dependents */ + lpServiceStatus = TV2_GetDependants(lpServiceName, &dwCount); + if (lpServiceStatus) + { + for (i = 0; i < dwCount; i++) + { + /* Does this service have any dependents? */ + if (TV2_HasDependantServices(lpServiceStatus[i].lpServiceName)) + { + /* recall this function with the dependent */ + BuildListOfServicesToStop(lpServiceList, lpServiceStatus[i].lpServiceName); + } + + /* Add the service to the list */ + *lpServiceList = AddServiceToList(lpServiceList, lpServiceStatus[i].lpServiceName); + } + + bRet = TRUE; + + HeapFree(GetProcessHeap(), + 0, + lpServiceStatus); + } + + return bRet; +} + +LPWSTR +GetListOfServicesToStop(LPWSTR lpServiceName) +{ + LPWSTR lpServiceList = NULL; + + /* Call recursive function to get our list */ + if (BuildListOfServicesToStop(&lpServiceList, lpServiceName)) + return lpServiceList; + else + return NULL; +} + + +static BOOL +DoInitDependsDialog(PMAIN_WND_INFO pInfo, HWND hDlg) { - //LPENUM_SERVICE_STATUS lpDependencies; - //DWORD dwCount; - LPTSTR lpPartialStr, lpStr; + LPWSTR lpPartialStr, lpStr; DWORD fullLen; HICON hIcon = NULL; BOOL bRet = FALSE; - if (pStopInfo) - { - SetWindowLongPtr(hDlg, - GWLP_USERDATA, - (LONG_PTR)pStopInfo); - - hIcon = (HICON)LoadImage(hInstance, - MAKEINTRESOURCE(IDI_SM_ICON), - IMAGE_ICON, - 16, - 16, - 0); + if (pInfo) + { + /* Tag the info to the window */ + SetWindowLongPtrW(hDlg, + GWLP_USERDATA, + (LONG_PTR)pInfo); + + /* Load the icon for the window */ + hIcon = (HICON)LoadImageW(hInstance, + MAKEINTRESOURCE(IDI_SM_ICON), + IMAGE_ICON, + GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CXSMICON), + 0); if (hIcon) { - SendMessage(hDlg, - WM_SETICON, - ICON_SMALL, - (LPARAM)hIcon); + /* Set it */ + SendMessageW(hDlg, + WM_SETICON, + ICON_SMALL, + (LPARAM)hIcon); DestroyIcon(hIcon); } - /* Add the label */ + /* Load the stop depends note */ if (AllocAndLoadString(&lpPartialStr, hInstance, IDS_STOP_DEPENDS)) { - fullLen = _tcslen(lpPartialStr) + _tcslen(pStopInfo->pInfo->pCurrentService->lpDisplayName) + 1; + /* Get the length required */ + fullLen = wcslen(lpPartialStr) + wcslen(pInfo->pCurrentService->lpDisplayName) + 1; lpStr = HeapAlloc(ProcessHeap, 0, - fullLen * sizeof(TCHAR)); + fullLen * sizeof(WCHAR)); if (lpStr) { - _sntprintf(lpStr, fullLen, lpPartialStr, pStopInfo->pInfo->pCurrentService->lpDisplayName); - - SendDlgItemMessage(hDlg, - IDC_STOP_DEPENDS, - WM_SETTEXT, - 0, - (LPARAM)lpStr); - - bRet = TRUE; + /* Add the service name to the depends note */ + _snwprintf(lpStr, + fullLen, + lpPartialStr, + pInfo->pCurrentService->lpDisplayName); + + /* Add the string to the dialog */ + SendDlgItemMessageW(hDlg, + IDC_STOP_DEPENDS, + WM_SETTEXT, + 0, + (LPARAM)lpStr); HeapFree(ProcessHeap, 0, lpStr); + + bRet = TRUE; } HeapFree(ProcessHeap, @@ -74,29 +196,8 @@ lpPartialStr); } - /* Get the list of dependencies - GetServiceDependents(pStopInfo->hMainService, &dwCount); - if (lpDependencies) - { - LPENUM_SERVICE_STATUS lpEnumServiceStatus; - DWORD i; - - for (i = 0; i < dwCount; i++) - { - lpEnumServiceStatus = &lpDependencies[i]; - - Add the service to the listbox - SendDlgItemMessage(hDlg, - IDC_STOP_DEPENDS_LB, - LB_ADDSTRING, - 0, - (LPARAM)lpEnumServiceStatus->lpDisplayName); - } - - HeapFree(ProcessHeap, - 0, - lpDependencies); - }*/ + /* FIXME: Load the list of services which need stopping */ + } return bRet; @@ -109,12 +210,12 @@ WPARAM wParam, LPARAM lParam) { - PSTOP_INFO pStopInfo = NULL; + PMAIN_WND_INFO pInfo = NULL; /* Get the window context */ - pStopInfo = (PSTOP_INFO)GetWindowLongPtr(hDlg, - GWLP_USERDATA); - if (pStopInfo == NULL && message != WM_INITDIALOG) + pInfo = (PMAIN_WND_INFO)GetWindowLongPtrW(hDlg, + GWLP_USERDATA); + if (pInfo == NULL && message != WM_INITDIALOG) { return FALSE; } @@ -125,10 +226,10 @@ { BOOL bRet = FALSE; - pStopInfo = (PSTOP_INFO)lParam; - if (pStopInfo != NULL) - { - bRet = DoInitDependsDialog(pStopInfo, hDlg); + pInfo = (PMAIN_WND_INFO)lParam; + if (pInfo != NULL) + { + bRet = DoInitDependsDialog(pInfo, hDlg); } return bRet;

1 0

[fireball] 44948: Daniel Zimmermann <netzimme@aim.com> - Implement RtlDnsHostNameToComputerName. See issue #5092 for more details.
by fireball＠svn.reactos.org 05 Jan '10

05 Jan '10

Author: fireball Date: Tue Jan 5 17:37:32 2010 New Revision: 44948 URL: http://svn.reactos.org/svn/reactos?rev=44948&view=rev Log: Daniel Zimmermann <netzimme(a)aim.com> - Implement RtlDnsHostNameToComputerName. See issue #5092 for more details. Modified: trunk/reactos/dll/ntdll/def/ntdll.pspec trunk/reactos/lib/rtl/unicode.c Modified: trunk/reactos/dll/ntdll/def/ntdll.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.pspec?… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.pspec [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll.pspec [iso-8859-1] Tue Jan 5 17:37:32 2010 @@ -562,7 +562,7 @@ @ stdcall RtlDestroyQueryDebugBuffer(ptr) @ stdcall RtlDetermineDosPathNameType_U(wstr) @ stdcall RtlDllShutdownInProgress() -//@ stdcall RtlDnsHostNameToComputerName +@ stdcall RtlDnsHostNameToComputerName(ptr ptr long) @ stdcall RtlDoesFileExists_U(wstr) //@ stdcall RtlDosApplyFileIsolationRedirection_Ustr @ stdcall RtlDosPathNameToNtPathName_U(wstr ptr ptr ptr) Modified: trunk/reactos/lib/rtl/unicode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/unicode.c?rev=4494… ============================================================================== --- trunk/reactos/lib/rtl/unicode.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/unicode.c [iso-8859-1] Tue Jan 5 17:37:32 2010 @@ -2436,3 +2436,74 @@ return STATUS_NOT_FOUND; } + +/* + * @implemented + * + * NOTES + * Get the maximum of MAX_COMPUTERNAME_LENGTH characters from the dns.host name until the dot is found. + * Convert is to an uppercase oem string and check for unmapped characters. + * Then convert the oem string back to an unicode string. + */ +NTSTATUS +NTAPI +RtlDnsHostNameToComputerName(PUNICODE_STRING ComputerName,PUNICODE_STRING DnsHostName,BOOLEAN AllocateComputerNameString) +{ + NTSTATUS Status; + ULONG Length; + ULONG ComputerNameLength; + ULONG ComputerNameOemNLength; + OEM_STRING ComputerNameOem; + CHAR ComputerNameOemN[MAX_COMPUTERNAME_LENGTH + 1]; + + Status = STATUS_INVALID_COMPUTER_NAME; + ComputerNameLength = DnsHostName->Length; + + /* find the first dot in the dns host name */ + for (Length = 0;Length < DnsHostName->Length/sizeof(WCHAR);Length++) + { + if (DnsHostName->Buffer[Length] == L'.') + { + /* dot found, so set the length for the oem translation */ + ComputerNameLength = Length*sizeof(WCHAR); + break; + } + } + + /* the computername must have one character */ + if (ComputerNameLength > 0) + { + ComputerNameOemNLength = 0; + /* convert to oem string and use uppercase letters */ + Status = RtlUpcaseUnicodeToOemN(ComputerNameOemN, + MAX_COMPUTERNAME_LENGTH, + &ComputerNameOemNLength, + DnsHostName->Buffer, + ComputerNameLength); + /* status STATUS_BUFFER_OVERFLOW is not a problem since the computername shoud only + have MAX_COMPUTERNAME_LENGTH characters */ + if ((Status == STATUS_SUCCESS) || + (Status == STATUS_BUFFER_OVERFLOW)) + { + /* set the termination for the oem string */ + ComputerNameOemN[MAX_COMPUTERNAME_LENGTH] = 0; + /* set status for the case the next function failed */ + Status = STATUS_INVALID_COMPUTER_NAME; + /* fillup the oem string structure with the converted computername + and check it for unmapped characters */ + ComputerNameOem.Buffer = ComputerNameOemN; + ComputerNameOem.Length = (USHORT)ComputerNameOemNLength; + ComputerNameOem.MaximumLength = (USHORT)(MAX_COMPUTERNAME_LENGTH + 1); + if (RtlpDidUnicodeToOemWork(DnsHostName, &ComputerNameOem) == TRUE) + { + /* no unmapped character so convert it back to an unicode string */ + Status = RtlOemStringToUnicodeString(ComputerName, + &ComputerNameOem, + AllocateComputerNameString); + } + } + } + + return Status; +} +

1 0

[fireball] 44947: - Implement SystemException and SystemContextSwitch information cases in NtQuerySystemInformation by Samuel Serapion, modified by me (comments, coding style). See issue #5054 for more details.
by fireball＠svn.reactos.org 05 Jan '10

05 Jan '10

Author: fireball Date: Tue Jan 5 17:28:47 2010 New Revision: 44947 URL: http://svn.reactos.org/svn/reactos?rev=44947&view=rev Log: - Implement SystemException and SystemContextSwitch information cases in NtQuerySystemInformation by Samuel Serapion, modified by me (comments, coding style). See issue #5054 for more details. Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Tue Jan 5 17:28:47 2010 @@ -1467,9 +1467,35 @@ /* Class 33 - Exception Information */ QSI_DEF(SystemExceptionInformation) { - /* FIXME */ - DPRINT1("NtQuerySystemInformation - SystemExceptionInformation not implemented\n"); - return STATUS_NOT_IMPLEMENTED; + PSYSTEM_EXCEPTION_INFORMATION ExceptionInformation = + (PSYSTEM_EXCEPTION_INFORMATION)Buffer; + PKPRCB Prcb; + ULONG i, AlignmentFixupCount = 0, ExceptionDispatchCount = 0; + ULONG FloatingEmulationCount = 0, ByteWordEmulationCount = 0; + + /* Check size of a buffer, it must match our expectations */ + if (sizeof(SYSTEM_EXCEPTION_INFORMATION) != Size) + return STATUS_INFO_LENGTH_MISMATCH; + + /* Sum up exception count information from all processors */ + for (i = 0; i < KeNumberProcessors; i++) + { + Prcb = KiProcessorBlock[i]; + if (Prcb) + { + AlignmentFixupCount += Prcb->KeAlignmentFixupCount; + ExceptionDispatchCount += Prcb->KeExceptionDispatchCount; + FloatingEmulationCount += Prcb->KeFloatingEmulationCount; + } + } + + /* Save information in user's buffer */ + ExceptionInformation->AlignmentFixupCount = AlignmentFixupCount; + ExceptionInformation->ExceptionDispatchCount = ExceptionDispatchCount; + ExceptionInformation->FloatingEmulationCount = FloatingEmulationCount; + ExceptionInformation->ByteWordEmulationCount = ByteWordEmulationCount; + + return STATUS_SUCCESS; } /* Class 34 - Crash Dump State Information */ @@ -1500,9 +1526,42 @@ /* Class 36 - Context Switch Information */ QSI_DEF(SystemContextSwitchInformation) { - /* FIXME */ - DPRINT1("NtQuerySystemInformation - SystemContextSwitchInformation not implemented\n"); - return STATUS_NOT_IMPLEMENTED; + PSYSTEM_CONTEXT_SWITCH_INFORMATION ContextSwitchInformation = + (PSYSTEM_CONTEXT_SWITCH_INFORMATION)Buffer; + ULONG ContextSwitches, i; + PKPRCB Prcb; + + /* Check size of a buffer, it must match our expectations */ + if (sizeof(SYSTEM_CONTEXT_SWITCH_INFORMATION) != Size) + return STATUS_INFO_LENGTH_MISMATCH; + + /* Calculate total value of context switches across all processors */ + ContextSwitches = 0; + for (i = 0; i < KeNumberProcessors; i ++) + { + Prcb = KiProcessorBlock[i]; + if (Prcb) + { + ContextSwitches += KeGetContextSwitches(Prcb); + } + } + + ContextSwitchInformation->ContextSwitches = ContextSwitches; + + /* FIXME */ + ContextSwitchInformation->FindAny = 0; + ContextSwitchInformation->FindLast = 0; + ContextSwitchInformation->FindIdeal = 0; + ContextSwitchInformation->IdleAny = 0; + ContextSwitchInformation->IdleCurrent = 0; + ContextSwitchInformation->IdleLast = 0; + ContextSwitchInformation->IdleIdeal = 0; + ContextSwitchInformation->PreemptAny = 0; + ContextSwitchInformation->PreemptCurrent = 0; + ContextSwitchInformation->PreemptLast = 0; + ContextSwitchInformation->SwitchToIdle = 0; + + return STATUS_SUCCESS; } /* Class 37 - Registry Quota Information */

1 0

[fireball] 44946: Marcus Boillat <ka6602-280@online.de> - ipconfig should also parse parameters starting with "-" (undocumented feature, tested on Windows XP, Vista and Windows 7). See issue #5067 for more details.
by fireball＠svn.reactos.org 05 Jan '10

05 Jan '10

Author: fireball Date: Tue Jan 5 17:18:35 2010 New Revision: 44946 URL: http://svn.reactos.org/svn/reactos?rev=44946&view=rev Log: Marcus Boillat <ka6602-280(a)online.de> - ipconfig should also parse parameters starting with "-" (undocumented feature, tested on Windows XP, Vista and Windows 7). See issue #5067 for more details. Modified: trunk/reactos/base/applications/network/ipconfig/ipconfig.c Modified: trunk/reactos/base/applications/network/ipconfig/ipconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ipconfig/ipconfig.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ipconfig/ipconfig.c [iso-8859-1] Tue Jan 5 17:18:35 2010 @@ -693,7 +693,7 @@ ProcessHeap = GetProcessHeap(); /* Parse command line for options we have been given. */ - if ( (argc > 1)&&(argv[1][0]=='/') ) + if ( (argc > 1)&&(argv[1][0]=='/' || argv[1][0]=='-') ) { if( !_tcsicmp( &argv[1][1], _T("?") )) {

1 0

[arty] 44945: Missing update.
by arty＠svn.reactos.org 05 Jan '10

05 Jan '10

Author: arty Date: Tue Jan 5 16:27:04 2010 New Revision: 44945 URL: http://svn.reactos.org/svn/reactos?rev=44945&view=rev Log: Missing update. Modified: branches/arty-newcc/ntoskrnl/ntoskrnl-generic.rbuild Modified: branches/arty-newcc/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/ntoskrnl-ge… ============================================================================== --- branches/arty-newcc/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Tue Jan 5 16:27:04 2010 @@ -433,7 +433,6 @@ <file>mminit.c</file> <file>mpw.c</file> <file>pagefile.c</file> - <file>pageop.c</file> <file>pool.c</file> <file>ppool.c</file> <file>procsup.c</file>

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
53
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2010