Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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

[arty] 44944: Fix failure case for pageout (including pulling a page that's being swapped out), Reorder operations on not present to handle wait entries properly. Fix some balancer issues and initialize rmap earlier, as there's no reason to wait.
by arty＠svn.reactos.org 05 Jan '10

05 Jan '10

Author: arty Date: Tue Jan 5 16:15:30 2010 New Revision: 44944 URL: http://svn.reactos.org/svn/reactos?rev=44944&view=rev Log: Fix failure case for pageout (including pulling a page that's being swapped out), Reorder operations on not present to handle wait entries properly. Fix some balancer issues and initialize rmap earlier, as there's no reason to wait. Removed: branches/arty-newcc/ntoskrnl/mm/pageop.c Modified: branches/arty-newcc/ntoskrnl/mm/anonmem.c branches/arty-newcc/ntoskrnl/mm/balance.c branches/arty-newcc/ntoskrnl/mm/elf.inc.h branches/arty-newcc/ntoskrnl/mm/elf32.c branches/arty-newcc/ntoskrnl/mm/mmfault.c branches/arty-newcc/ntoskrnl/mm/mminit.c branches/arty-newcc/ntoskrnl/mm/rmap.c branches/arty-newcc/ntoskrnl/mm/section/fault.c branches/arty-newcc/ntoskrnl/mm/section/pagefile.c Modified: branches/arty-newcc/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/anonmem.… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/anonmem.c [iso-8859-1] Tue Jan 5 16:15:30 2010 @@ -790,49 +790,12 @@ { PLIST_ENTRY current_entry; PMM_REGION current; - ULONG i; DPRINT("MmFreeVirtualMemory(Process %p MemoryArea %p)\n", Process, MemoryArea); /* Mark this memory area as about to be deleted. */ MemoryArea->DeleteInProgress = TRUE; - - /* - * Wait for any ongoing paging operations. Notice that since we have - * flagged this memory area as deleted no more page ops will be added. - */ - if (MemoryArea->PageOpCount > 0) - { - ULONG_PTR MemoryAreaLength = (ULONG_PTR)MemoryArea->EndingAddress - - (ULONG_PTR)MemoryArea->StartingAddress; - const ULONG nPages = PAGE_ROUND_UP(MemoryAreaLength) >> PAGE_SHIFT; - - for (i = 0; i < nPages && MemoryArea->PageOpCount != 0; ++i) - { - PMM_PAGEOP PageOp; - PageOp = MmCheckForPageOp(MemoryArea, Process->UniqueProcessId, - (PVOID)((ULONG_PTR)MemoryArea->StartingAddress + (i * PAGE_SIZE)), - NULL, 0); - if (PageOp != NULL) - { - NTSTATUS Status; - MmUnlockAddressSpace(&Process->Vm); - Status = KeWaitForSingleObject(&PageOp->CompletionEvent, - 0, - KernelMode, - FALSE, - NULL); - if (Status != STATUS_SUCCESS) - { - DPRINT1("Failed to wait for page op\n"); - KeBugCheck(MEMORY_MANAGEMENT); - } - MmLockAddressSpace(&Process->Vm); - MmReleasePageOp(PageOp); - } - } - } /* Free all the individual segments. */ current_entry = MemoryArea->Data.VirtualMemoryData.RegionListHead.Flink; Modified: branches/arty-newcc/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/balance.… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/balance.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/balance.c [iso-8859-1] Tue Jan 5 16:15:30 2010 @@ -31,6 +31,7 @@ /* GLOBALS ******************************************************************/ +BOOLEAN MiBalancerInitialized = FALSE; MM_MEMORY_CONSUMER MiMemoryConsumers[MC_MAXIMUM]; /*static*/ ULONG MiMinimumAvailablePages = 128; static ULONG MiNrTotalPages; @@ -170,8 +171,9 @@ MiIsBalancerThread(VOID) { return - PsGetCurrentThread()->Cid.UniqueThread == - MiBalancerThreadId.UniqueThread; + !MiBalancerInitialized || + (PsGetCurrentThread()->Cid.UniqueThread == + MiBalancerThreadId.UniqueThread); } /* @@ -284,6 +286,8 @@ WaitObjects[0] = &MiBalancerEvent; WaitObjects[1] = &MiBalancerTimer; + + MiBalancerInitialized = TRUE; while (1) { @@ -335,23 +339,14 @@ { KPRIORITY Priority; NTSTATUS Status; -#if !defined(__GNUC__) - - LARGE_INTEGER dummyJunkNeeded; - dummyJunkNeeded.QuadPart = -20000000; /* 2 sec */ - ; -#endif - + LARGE_INTEGER BalancerInterval; + BalancerInterval.QuadPart = -20000000; /* 2 sec */ KeInitializeEvent(&MiBalancerEvent, SynchronizationEvent, FALSE); KeInitializeEvent(&MiBalancerContinue, SynchronizationEvent, FALSE); KeInitializeTimerEx(&MiBalancerTimer, SynchronizationTimer); KeSetTimerEx(&MiBalancerTimer, -#if defined(__GNUC__) - (LARGE_INTEGER)(LONGLONG)-20000000LL, /* 2 sec */ -#else - dummyJunkNeeded, -#endif + BalancerInterval, 2000, /* 2 sec */ NULL); Modified: branches/arty-newcc/ntoskrnl/mm/elf.inc.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/elf.inc.… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/elf.inc.h [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/elf.inc.h [iso-8859-1] Tue Jan 5 16:15:30 2010 @@ -8,8 +8,6 @@ #endif #include <elf/elf.h> - -#define IMAGE_SUBSYSTEM_WINDOWS_CUI 3 /* TODO: Intsafe should be made into a library, as it's generally useful */ static __inline BOOLEAN Intsafe_CanAddULongPtr Modified: branches/arty-newcc/ntoskrnl/mm/elf32.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/elf32.c?… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/elf32.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/elf32.c [iso-8859-1] Tue Jan 5 16:15:30 2010 @@ -9,8 +9,6 @@ #include <ntoskrnl.h> #define __ELF_WORD_SIZE 32 #include "elf.inc.h" - -#define IMAGE_FILE_MACHINE_UNKNOWN 0 extern NTSTATUS NTAPI Elf64FmtCreateSection ( Modified: branches/arty-newcc/ntoskrnl/mm/mmfault.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/mmfault.… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/mmfault.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/mmfault.c [iso-8859-1] Tue Jan 5 16:15:30 2010 @@ -161,6 +161,7 @@ if (Status == STATUS_SUCCESS + 1) { // Wait page ... + DPRINT1("Waiting for %x\n", Address); if (!NT_SUCCESS (KeWaitForSingleObject (&MmWaitPageEvent, @@ -169,6 +170,7 @@ FALSE, NULL))) ASSERT(FALSE); + DPRINT1("Restarting fault %x\n", Address); Status = STATUS_MM_RESTART_OPERATION; } else if (Status == STATUS_MORE_PROCESSING_REQUIRED) @@ -341,6 +343,7 @@ if (Status == STATUS_SUCCESS + 1) { // Wait page ... + DPRINT1("Waiting for %x\n", Address); if (!NT_SUCCESS (KeWaitForSingleObject (&MmWaitPageEvent, @@ -349,6 +352,7 @@ FALSE, NULL))) ASSERT(FALSE); + DPRINT1("Done waiting for %x\n", Address); Status = STATUS_MM_RESTART_OPERATION; } else if (Status == STATUS_MORE_PROCESSING_REQUIRED) Modified: branches/arty-newcc/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/mminit.c… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/mminit.c [iso-8859-1] Tue Jan 5 16:15:30 2010 @@ -467,7 +467,10 @@ /* Dump the address space */ MiDbgDumpAddressSpace(); - + + /* Initialize rmap implementation */ + MmInitializeRmapList(); + /* Initialize paged pool */ MmInitializePagedPool(); @@ -496,8 +499,6 @@ } else if (Phase == 1) { - MmInitializeRmapList(); - MmInitializePageOp(); MmInitSectionImplementation(); MmInitPagingFile(); Removed: branches/arty-newcc/ntoskrnl/mm/pageop.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/pageop.c… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/pageop.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/pageop.c (removed) @@ -1,268 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/mm/pageop.c - * PURPOSE: No purpose listed. - * - * PROGRAMMERS: David Welch (welch(a)cwcom.net) - */ - -/* INCLUDES ****************************************************************/ - -#include <ntoskrnl.h> -#define NDEBUG -#include <debug.h> - -#if defined (ALLOC_PRAGMA) -#pragma alloc_text(INIT, MmInitializePageOp) -#endif - - -/* GLOBALS *******************************************************************/ - -#define PAGEOP_HASH_TABLE_SIZE (32) - -static KSPIN_LOCK MmPageOpHashTableLock; -static PMM_PAGEOP MmPageOpHashTable[PAGEOP_HASH_TABLE_SIZE]; -static NPAGED_LOOKASIDE_LIST MmPageOpLookasideList; - -/* FUNCTIONS *****************************************************************/ - -VOID -NTAPI -MmReleasePageOp(PMM_PAGEOP PageOp) -/* - * FUNCTION: Release a reference to a page operation descriptor - */ -{ - KIRQL oldIrql; - PMM_PAGEOP PrevPageOp; - - KeAcquireSpinLock(&MmPageOpHashTableLock, &oldIrql); - PageOp->ReferenceCount--; - if (PageOp->ReferenceCount > 0) - { - KeReleaseSpinLock(&MmPageOpHashTableLock, oldIrql); - return; - } - (void)InterlockedDecrementUL(&PageOp->MArea->PageOpCount); - PrevPageOp = MmPageOpHashTable[PageOp->Hash]; - if (PrevPageOp == PageOp) - { - MmPageOpHashTable[PageOp->Hash] = PageOp->Next; - KeReleaseSpinLock(&MmPageOpHashTableLock, oldIrql); - ExFreeToNPagedLookasideList(&MmPageOpLookasideList, PageOp); - return; - } - while (PrevPageOp->Next != NULL) - { - if (PrevPageOp->Next == PageOp) - { - PrevPageOp->Next = PageOp->Next; - KeReleaseSpinLock(&MmPageOpHashTableLock, oldIrql); - ExFreeToNPagedLookasideList(&MmPageOpLookasideList, PageOp); - return; - } - PrevPageOp = PrevPageOp->Next; - } - KeReleaseSpinLock(&MmPageOpHashTableLock, oldIrql); - KeBugCheck(MEMORY_MANAGEMENT); -} - -PMM_PAGEOP -NTAPI -MmCheckForPageOp(PMEMORY_AREA MArea, HANDLE Pid, PVOID Address, - PMM_SECTION_SEGMENT Segment, ULONG Offset) -{ - ULONG_PTR Hash; - KIRQL oldIrql; - PMM_PAGEOP PageOp; - - /* - * Calcuate the hash value for pageop structure - */ - if (MArea->Type == MEMORY_AREA_SECTION_VIEW) - { - Hash = (((ULONG_PTR)Segment) | (((ULONG_PTR)Offset) / PAGE_SIZE)); - } - else - { - Hash = (((ULONG_PTR)Pid) | (((ULONG_PTR)Address) / PAGE_SIZE)); - } - Hash = Hash % PAGEOP_HASH_TABLE_SIZE; - - KeAcquireSpinLock(&MmPageOpHashTableLock, &oldIrql); - - /* - * Check for an existing pageop structure - */ - PageOp = MmPageOpHashTable[Hash]; - while (PageOp != NULL) - { - if (MArea->Type == MEMORY_AREA_SECTION_VIEW) - { - if (PageOp->Segment == Segment && - PageOp->Offset == Offset) - { - break; - } - } - else - { - if (PageOp->Pid == Pid && - PageOp->Address == Address) - { - break; - } - } - PageOp = PageOp->Next; - } - - /* - * If we found an existing pageop then increment the reference count - * and return it. - */ - if (PageOp != NULL) - { - PageOp->ReferenceCount++; - KeReleaseSpinLock(&MmPageOpHashTableLock, oldIrql); - return(PageOp); - } - KeReleaseSpinLock(&MmPageOpHashTableLock, oldIrql); - return(NULL); -} - -PMM_PAGEOP -NTAPI -MmGetPageOp(PMEMORY_AREA MArea, HANDLE Pid, PVOID Address, - PMM_SECTION_SEGMENT Segment, ULONG Offset, ULONG OpType, BOOLEAN First) -/* - * FUNCTION: Get a page operation descriptor corresponding to - * the memory area and either the segment, offset pair or the - * pid, address pair. - */ -{ - ULONG_PTR Hash; - KIRQL oldIrql; - PMM_PAGEOP PageOp; - - /* - * Calcuate the hash value for pageop structure - */ - if (MArea->Type == MEMORY_AREA_SECTION_VIEW) - { - Hash = (((ULONG_PTR)Segment) | (((ULONG_PTR)Offset) / PAGE_SIZE)); - } - else - { - Hash = (((ULONG_PTR)Pid) | (((ULONG_PTR)Address) / PAGE_SIZE)); - } - Hash = Hash % PAGEOP_HASH_TABLE_SIZE; - - KeAcquireSpinLock(&MmPageOpHashTableLock, &oldIrql); - - /* - * Check for an existing pageop structure - */ - PageOp = MmPageOpHashTable[Hash]; - while (PageOp != NULL) - { - if (MArea->Type == MEMORY_AREA_SECTION_VIEW) - { - if (PageOp->Segment == Segment && - PageOp->Offset == Offset) - { - break; - } - } - else - { - if (PageOp->Pid == Pid && - PageOp->Address == Address) - { - break; - } - } - PageOp = PageOp->Next; - } - - /* - * If we found an existing pageop then increment the reference count - * and return it. - */ - if (PageOp != NULL) - { - if (First) - { - PageOp = NULL; - } - else - { - PageOp->ReferenceCount++; - } - KeReleaseSpinLock(&MmPageOpHashTableLock, oldIrql); - return(PageOp); - } - - /* - * Otherwise add a new pageop. - */ - PageOp = ExAllocateFromNPagedLookasideList(&MmPageOpLookasideList); - if (PageOp == NULL) - { - KeReleaseSpinLock(&MmPageOpHashTableLock, oldIrql); - KeBugCheck(MEMORY_MANAGEMENT); - return(NULL); - } - - if (MArea->Type != MEMORY_AREA_SECTION_VIEW) - { - PageOp->Pid = Pid; - PageOp->Address = Address; - } - else - { - PageOp->Segment = Segment; - PageOp->Offset = Offset; - } - PageOp->ReferenceCount = 1; - PageOp->Next = MmPageOpHashTable[Hash]; - PageOp->Hash = Hash; - PageOp->Thread = PsGetCurrentThread(); - PageOp->Abandoned = FALSE; - PageOp->Status = STATUS_PENDING; - PageOp->OpType = OpType; - PageOp->MArea = MArea; - KeInitializeEvent(&PageOp->CompletionEvent, NotificationEvent, FALSE); - MmPageOpHashTable[Hash] = PageOp; - (void)InterlockedIncrementUL(&MArea->PageOpCount); - - KeReleaseSpinLock(&MmPageOpHashTableLock, oldIrql); - return(PageOp); -} - -VOID -INIT_FUNCTION -NTAPI -MmInitializePageOp(VOID) -{ - memset(MmPageOpHashTable, 0, sizeof(MmPageOpHashTable)); - KeInitializeSpinLock(&MmPageOpHashTableLock); - - ExInitializeNPagedLookasideList (&MmPageOpLookasideList, - NULL, - NULL, - 0, - sizeof(MM_PAGEOP), - TAG_MM_PAGEOP, - 50); -} - - - - - - - - - Modified: branches/arty-newcc/ntoskrnl/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/rmap.c?r… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/rmap.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/rmap.c [iso-8859-1] Tue Jan 5 16:15:30 2010 @@ -342,19 +342,30 @@ { DPRINT("About to finalize section page %x %s\n", Page, Dirty ? "dirty" : "clean"); - Evicted = - NT_SUCCESS(Status) && - NT_SUCCESS(MmFinalizeSectionPageOut(Segment, &FileOffset, Page, Dirty)); - - if (!Evicted && SectionPage) - { - DPRINT - ("Failed to page out, replacing %x at %x in segment %x\n", - SectionPage, FileOffset.LowPart, Segment); + if (MmGetRmapListHeadPage(Page)) + { + DPRINT1("Page %x was re-acquired while we were evicting it\n", Page); MmLockSectionSegment(Segment); MiSetPageEntrySectionSegment(Segment, &FileOffset, Dirty ? DIRTY_SSE(MAKE_PFN_SSE(SectionPage)) : MAKE_PFN_SSE(SectionPage)); MmUnlockSectionSegment(Segment); KeSetEvent(&MmWaitPageEvent, IO_NO_INCREMENT, FALSE); + } + else + { + Evicted = + NT_SUCCESS(Status) && + NT_SUCCESS(MmFinalizeSectionPageOut(Segment, &FileOffset, Page, Dirty)); + + if (!Evicted && SectionPage) + { + DPRINT1 + ("Failed to page out, replacing %x at %x in segment %x\n", + SectionPage, FileOffset.LowPart, Segment); + MmLockSectionSegment(Segment); + MiSetPageEntrySectionSegment(Segment, &FileOffset, Dirty ? DIRTY_SSE(MAKE_PFN_SSE(SectionPage)) : MAKE_PFN_SSE(SectionPage)); + MmUnlockSectionSegment(Segment); + KeSetEvent(&MmWaitPageEvent, IO_NO_INCREMENT, FALSE); + } } } Modified: branches/arty-newcc/ntoskrnl/mm/section/fault.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section/… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section/fault.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section/fault.c [iso-8859-1] Tue Jan 5 16:15:30 2010 @@ -71,7 +71,7 @@ PMM_REGION Region; PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); - DPRINT1("Not Present: %p %p (%p-%p)\n", AddressSpace, Address, MemoryArea->StartingAddress, MemoryArea->EndingAddress); + DPRINT("Not Present: %p %p (%p-%p)\n", AddressSpace, Address, MemoryArea->StartingAddress, MemoryArea->EndingAddress); /* * There is a window between taking the page fault and locking the @@ -115,6 +115,7 @@ { DPRINT("FileName %wZ\n", &Segment->FileObject->FileName); } + DPRINT("Total Offset %08x%08x\n", TotalOffset.HighPart, TotalOffset.LowPart); /* @@ -151,8 +152,73 @@ DPRINT("Normal %x\n", Attributes); } -grab_page: - if (Entry && !IS_SWAP_FROM_SSE(Entry)) + if (Required->State && Required->Page[0]) + { + DPRINT("Have file and page, set page in section @ %x\n", TotalOffset.LowPart); + Status = MiSetPageEntrySectionSegment + (Segment, &TotalOffset, Entry = MAKE_PFN_SSE(Required->Page[0])); + if (NT_SUCCESS(Status)) + { + MmReferencePage(Required->Page[0]); + Status = MmCreateVirtualMapping(Process, Address, Attributes, Required->Page, 1); + if (NT_SUCCESS(Status)) + { + MmInsertRmap(Required->Page[0], Process, Address); + } + else + { + MmDereferencePage(Required->Page[0]); + } + } + MmUnlockSectionSegment(Segment); + DPRINT("XXX Set Event %x\n", Status); + KeSetEvent(&MmWaitPageEvent, IO_NO_INCREMENT, FALSE); + DPRINT1("Status %x\n", Status); + return Status; + } + else if (MmIsPageSwapEntry(Process, Address)) + { + SWAPENTRY SwapEntry; + MmGetPageFileMapping(Process, Address, &SwapEntry); + if (SwapEntry == MM_WAIT_ENTRY) + { + DPRINT1("Wait for page entry in section\n"); + return STATUS_SUCCESS + 1; + } + else + { + DPRINT("Swap in\n"); + MmCreatePageFileMapping(Process, Address, MM_WAIT_ENTRY); + Required->State = 7; + Required->Consumer = Consumer; + Required->SwapEntry = SwapEntry; + Required->DoAcquisition = MiSwapInPage; + MmUnlockSectionSegment(Segment); + return STATUS_MORE_PROCESSING_REQUIRED; + } + } + else if (IS_SWAP_FROM_SSE(Entry)) + { + SWAPENTRY SwapEntry = SWAPENTRY_FROM_SSE(Entry); + if (SwapEntry == MM_WAIT_ENTRY) + { + DPRINT1("Wait for page entry in section\n"); + return STATUS_SUCCESS + 1; + } + else + { + DPRINT("Swap in\n"); + MmCreatePageFileMapping(Process, Address, MM_WAIT_ENTRY); + MiSetPageEntrySectionSegment(Segment, &TotalOffset, MAKE_SWAP_SSE(MM_WAIT_ENTRY)); + Required->State = 7; + Required->Consumer = Consumer; + Required->SwapEntry = SwapEntry; + Required->DoAcquisition = MiSwapInPage; + MmUnlockSectionSegment(Segment); + return STATUS_MORE_PROCESSING_REQUIRED; + } + } + else if (Entry && !IS_SWAP_FROM_SSE(Entry)) { PFN_TYPE Page = PFN_FROM_SSE(Entry); DPRINT("Page %x\n", Page); @@ -166,23 +232,10 @@ DPRINT("XXX Set Event %x\n", Status); KeSetEvent(&MmWaitPageEvent, IO_NO_INCREMENT, FALSE); MmUnlockSectionSegment(Segment); + DPRINT1("Status %x\n", Status); return Status; } - - if (Required->State && Required->Page[0]) - { - DPRINT("Have file and page, set page in section @ %x\n", TotalOffset.LowPart); - Status = MiSetPageEntrySectionSegment - (Segment, &TotalOffset, Entry = MAKE_PFN_SSE(Required->Page[0])); - if (NT_SUCCESS(Status)) - { - goto grab_page; - } - MmUnlockSectionSegment(Segment); - return Status; - } - - if (Entry == 0) + else { DPRINT("Get page into section\n"); /* @@ -213,17 +266,6 @@ MmUnlockSectionSegment(Segment); return STATUS_MORE_PROCESSING_REQUIRED; } - } - else - { - DPRINT("Swap in\n"); - Required->State = 7; - Required->Consumer = Consumer; - Required->SwapEntry = SWAPENTRY_FROM_SSE(Entry); - MiSetPageEntrySectionSegment(Segment, &TotalOffset, MAKE_SWAP_SSE(MM_WAIT_ENTRY)); - Required->DoAcquisition = MiSwapInPage; - MmUnlockSectionSegment(Segment); - return STATUS_MORE_PROCESSING_REQUIRED; } } @@ -311,6 +353,7 @@ DPRINT("Set in section @ %x\n", Offset.LowPart); Status = MiSetPageEntrySectionSegment (Segment, &Offset, MAKE_PFN_SSE(Page)); + KeSetEvent(&MmWaitPageEvent, IO_NO_INCREMENT, FALSE); } if (Required->State & 2) @@ -330,6 +373,7 @@ if (Required->State & 4) { DPRINT("Take a reference\n"); + Status = STATUS_SUCCESS; MmReferencePage(Page); } @@ -349,8 +393,7 @@ MmUnlockSectionSegment(Segment); return STATUS_MORE_PROCESSING_REQUIRED; } - - if (HasSwapEntry) + else if (HasSwapEntry) { MmGetPageFileMapping(Process, (PVOID)PAddress, &Required->SwapEntry); if (Required->SwapEntry == MM_WAIT_ENTRY) @@ -363,28 +406,18 @@ * Must be private page we have swapped out. */ DPRINT("Private swapped out page\n"); + MmCreatePageFileMapping(Process, Address, MM_WAIT_ENTRY); Required->State = 2; Required->Consumer = MC_USER; - MmCreatePageFileMapping(Process, Address, MM_WAIT_ENTRY); Required->DoAcquisition = MiSwapInPage; MmUnlockSectionSegment(Segment); return STATUS_MORE_PROCESSING_REQUIRED; } - - /* - * Map anonymous memory for BSS sections - */ - if (Entry == 0 || - (Segment->Image.Characteristics & IMAGE_SCN_CNT_UNINITIALIZED_DATA) || - Offset.QuadPart >= PAGE_ROUND_UP(Segment->RawLength.QuadPart)) - { - DPRINT("BSS Page\n"); - Required->State = 2; - Required->Amount = 1; - Required->Consumer = MC_USER; - Required->DoAcquisition = MiGetOnePage; - MmUnlockSectionSegment(Segment); - return STATUS_MORE_PROCESSING_REQUIRED; + else if (IS_SWAP_FROM_SSE(Entry) && SWAPENTRY_FROM_SSE(Entry) == MM_WAIT_ENTRY) + { + DPRINT("Waiting\n"); + MmUnlockSectionSegment(Segment); + return STATUS_SUCCESS + 1; } else if (IS_SWAP_FROM_SSE(Entry)) { @@ -394,6 +427,21 @@ MmGetPageFileMapping(Process, (PVOID)PAddress, &Required->SwapEntry); MmCreatePageFileMapping(Process, Address, MM_WAIT_ENTRY); Required->DoAcquisition = MiSwapInPage; + MmUnlockSectionSegment(Segment); + return STATUS_MORE_PROCESSING_REQUIRED; + } + /* + * Map anonymous memory for BSS sections + */ + else if (Entry == 0 && + ((Segment->Image.Characteristics & IMAGE_SCN_CNT_UNINITIALIZED_DATA) || + Offset.QuadPart >= PAGE_ROUND_UP(Segment->RawLength.QuadPart))) + { + DPRINT("BSS Page\n"); + Required->State = 2; + Required->Amount = 1; + Required->Consumer = MC_USER; + Required->DoAcquisition = MiGetOnePage; MmUnlockSectionSegment(Segment); return STATUS_MORE_PROCESSING_REQUIRED; } @@ -690,6 +738,7 @@ /* * Write the page to the pagefile */ + DPRINT1("Writing swap entry: %x %x\n", SwapEntry, Page); Status = MmWriteToSwapPage(SwapEntry, Page); if (!NT_SUCCESS(Status)) { @@ -749,15 +798,22 @@ ASSERT(KeGetCurrentIrql() <= APC_LEVEL); if (SwapEntry == MM_WAIT_ENTRY) { + DPRINT1 + ("SwapEntry is a WAIT, our swap to is %x, State is %x for (%x:%x) on page %x\n", + Required->SwapEntry, + Required->State, + Process, + Address, + OurPage); if (Required->SwapEntry || (Required->State & 2)) { - MmDeleteRmap(OurPage, Process, Address); Status = MmCreatePageFileMapping(Process, Address, Required->SwapEntry); MmSetSavedSwapEntryPage(OurPage, 0); ASSERT(KeGetCurrentIrql() <= APC_LEVEL); + MmDeleteRmap(OurPage, Process, Address); MmDereferencePage(OurPage); + MmUnlockSectionSegment(Segment); KeSetEvent(&MmWaitPageEvent, IO_NO_INCREMENT, FALSE); - MmUnlockSectionSegment(Segment); ASSERT(KeGetCurrentIrql() <= APC_LEVEL); DPRINT("XXX Set Event %x\n", Status); return Status; @@ -780,37 +836,34 @@ { Required->State |= 2; Required->SwapEntry = MmAllocSwapPage(); - if (!Required->SwapEntry) return STATUS_PAGEFILE_QUOTA; + if (!Required->SwapEntry) + { + MmUnlockSectionSegment(Segment); + return STATUS_PAGEFILE_QUOTA; + } + DPRINT1("MiWriteSwapPage (%x -> %x)\n", OurPage, Required->SwapEntry); Required->DoAcquisition = MiWriteSwapPage; MmCreatePageFileMapping(Process, Address, MM_WAIT_ENTRY); MmUnlockSectionSegment(Segment); return STATUS_MORE_PROCESSING_REQUIRED; } - else if (!Required->SwapEntry) - { + else + { + DPRINT1("Out of swap space for page %x\n", OurPage); MmUnlockSectionSegment(Segment); return STATUS_PAGEFILE_QUOTA; } - MmDeleteRmap(OurPage, Process, Address); - MmCreatePageFileMapping(Process, Address, Required->SwapEntry); - MmDereferencePage(OurPage); - MmUnlockSectionSegment(Segment); - return STATUS_SUCCESS; } else { BOOLEAN Dirty = !!MmIsDirtyPageRmap(OurPage); Required->State |= Dirty; DPRINT("Public page evicting %x (dirty %d)\n", OurPage, Required->State & 1); - if (Dirty) - { - DPRINT("Setting segment page dirty\n"); - MiSetPageEntrySectionSegment(Segment, &TotalOffset, DIRTY_SSE(Entry)); - } + MmDeleteVirtualMapping(Process, Address, FALSE, NULL, NULL); MmDeleteRmap(OurPage, Process, Address); - MmDeleteVirtualMapping(Process, Address, FALSE, NULL, NULL); MmDereferencePage(OurPage); MmUnlockSectionSegment(Segment); + KeSetEvent(&MmWaitPageEvent, IO_NO_INCREMENT, FALSE); return STATUS_SUCCESS; } } Modified: branches/arty-newcc/ntoskrnl/mm/section/pagefile.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section/… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section/pagefile.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section/pagefile.c [iso-8859-1] Tue Jan 5 16:15:30 2010 @@ -153,24 +153,20 @@ BOOLEAN Dirty) { NTSTATUS Status = STATUS_SUCCESS; - SWAPENTRY Swap; - + BOOLEAN WriteZero = FALSE; + SWAPENTRY Swap = MmGetSavedSwapEntryPage(Page); + + MmLockSectionSegment(Segment); if (Dirty) { - DPRINT("Finalize (dirty) Segment %x\n", Segment); + DPRINT1("Finalize (dirty) Segment %x Page %x\n", Segment, Page); DPRINT("Segment->FileObject %x\n", Segment->FileObject); DPRINT("Segment->Flags %x\n", Segment->Flags); if (Segment->FileObject && !(Segment->Flags & MM_IMAGE_SEGMENT)) { - DPRINT("Segment %x FileObject %x\n", Segment, Segment->FileObject, &Segment); + DPRINT1("Segment %x FileObject %x Offset %x\n", Segment, Segment->FileObject, FileOffset->LowPart); Status = MiWriteBackPage(Segment->FileObject, FileOffset, PAGE_SIZE, Page); - if (NT_SUCCESS(Status)) - { - DPRINT("Write zero to %x:%x %x\n", Segment, FileOffset->LowPart, Page); - MmLockSectionSegment(Segment); - MiSetPageEntrySectionSegment(Segment, FileOffset, 0); - MmUnlockSectionSegment(Segment); - } + WriteZero = NT_SUCCESS(Status); } else { @@ -185,29 +181,36 @@ } DPRINT("Status %x\n", Status); - if (NT_SUCCESS(Status)) - { - DPRINT("Set Swap entry\n"); - MmLockSectionSegment(Segment); - MiSetPageEntrySectionSegment(Segment, FileOffset, MAKE_SWAP_SSE(Swap)); - MmUnlockSectionSegment(Segment); - } + WriteZero = NT_SUCCESS(Status); } } else { - DPRINT("Write zero to %x:%x (%x)\n", Segment, FileOffset->LowPart, Page); - MmLockSectionSegment(Segment); - MiSetPageEntrySectionSegment(Segment, FileOffset, 0); - MmUnlockSectionSegment(Segment); + WriteZero = TRUE; } DPRINT("Status %x\n", Status); + + if (WriteZero) + { + DPRINT1("Setting page entry in segment %x:%x to swap %x\n", Segment, FileOffset->LowPart, Swap); + MiSetPageEntrySectionSegment(Segment, FileOffset, Swap ? MAKE_SWAP_SSE(Swap) : 0); + } + else + { + DPRINT1("Setting page entry in segment %x:%x to page %x\n", Segment, FileOffset->LowPart, Page); + MiSetPageEntrySectionSegment + (Segment, FileOffset, Page ? (Dirty ? DIRTY_SSE(MAKE_PFN_SSE(Page)) : MAKE_PFN_SSE(Page)) : 0); + } + if (NT_SUCCESS(Status)) { + DPRINT1("Removing page %x for real\n", Page); MmSetSavedSwapEntryPage(Page, 0); MmDereferencePage(Page); } + + MmUnlockSectionSegment(Segment); KeSetEvent(&MmWaitPageEvent, IO_NO_INCREMENT, FALSE);

1 0

[jimtabor] 44943: [gdi32] - Run full Attribute and GdiBatch for Region support. Leaving Enh/Meta and mirroring support for regions.
by jimtabor＠svn.reactos.org 05 Jan '10

05 Jan '10

Author: jimtabor Date: Tue Jan 5 04:05:50 2010 New Revision: 44943 URL: http://svn.reactos.org/svn/reactos?rev=44943&view=rev Log: [gdi32] - Run full Attribute and GdiBatch for Region support. Leaving Enh/Meta and mirroring support for regions. Modified: trunk/reactos/dll/win32/gdi32/objects/region.c Modified: trunk/reactos/dll/win32/gdi32/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/re… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/region.c [iso-8859-1] Tue Jan 5 04:05:50 2010 @@ -104,7 +104,6 @@ FASTCALL DeleteRegion( HRGN hRgn ) { -#if 0 PRGN_ATTR Rgn_Attr; if ((GdiGetHandleUserData((HGDIOBJ) hRgn, GDI_OBJECT_TYPE_REGION, (PVOID) &Rgn_Attr)) && @@ -128,7 +127,6 @@ } } } -#endif return NtGdiDeleteObjectApp((HGDIOBJ) hRgn); } @@ -204,7 +202,6 @@ HRGN hSrc2, INT CombineMode) { -#if 0 PRGN_ATTR pRgn_Attr_Dest = NULL; PRGN_ATTR pRgn_Attr_Src1 = NULL; PRGN_ATTR pRgn_Attr_Src2 = NULL; @@ -218,9 +215,8 @@ !pRgn_Attr_Dest || !pRgn_Attr_Src1 || pRgn_Attr_Src1->Flags > SIMPLEREGION ) -#endif return NtGdiCombineRgn(hDest, hSrc1, hSrc2, CombineMode); -#if 0 + /* Handle COPY and use only src1. */ if ( CombineMode == RGN_COPY ) { @@ -274,19 +270,29 @@ DPRINT1("RGN_COPY was handled! CombineMode %d\n",CombineMode); return NtGdiCombineRgn(hDest, hSrc1, hSrc2, CombineMode); } - - if ( pRgn_Attr_Src1->Flags != NULLREGION && - pRgn_Attr_Src2->Flags != NULLREGION ) + /* Now handle DIFF. */ + if ( pRgn_Attr_Src1->Flags == NULLREGION ) + { + if (SetRectRgn( hDest, 0, 0, 0, 0)) + return NULLREGION; + goto ERROR_Exit; + } + + if ( pRgn_Attr_Src2->Flags != NULLREGION ) { Complexity = ComplexityFromRects( &pRgn_Attr_Src1->Rect, &pRgn_Attr_Src2->Rect); - /* If same or overlapping and norm just go K. */ - if (Complexity == SAME_RGN || Complexity == OVERLAPPING_RGN) - return NtGdiCombineRgn(hDest, hSrc1, hSrc2, CombineMode); + + if ( Complexity != DIFF_RGN ) + { + if ( Complexity != INVERTED_RGN) + /* If same or overlapping and norm just go K. */ + return NtGdiCombineRgn(hDest, hSrc1, hSrc2, CombineMode); + + if (SetRectRgn( hDest, 0, 0, 0, 0)) + return NULLREGION; + goto ERROR_Exit; + } } - /* Just NULL rgn. */ - if (SetRectRgn( hDest, 0, 0, 0, 0)) - return NULLREGION; - goto ERROR_Exit; } else /* Handle OR or XOR. */ { @@ -389,7 +395,6 @@ /* Even on error the flag is set dirty and force server side to redraw. */ pRgn_Attr_Dest->AttrFlags |= ATTR_RGN_DIRTY; return ERROR; -#endif } /* @@ -634,13 +639,11 @@ GetRgnBox(HRGN hrgn, LPRECT prcOut) { -#if 0 PRGN_ATTR Rgn_Attr; if (!GdiGetHandleUserData((HGDIOBJ) hrgn, GDI_OBJECT_TYPE_REGION, (PVOID) &Rgn_Attr)) -#endif return NtGdiGetRgnBox(hrgn, prcOut); -#if 0 + if (Rgn_Attr->Flags == NULLREGION) { prcOut->left = 0; @@ -656,7 +659,6 @@ RtlCopyMemory( prcOut, &Rgn_Attr->Rect, sizeof(RECT)); } return Rgn_Attr->Flags; -#endif } /* @@ -747,14 +749,12 @@ int nXOffset, int nYOffset) { -#if 0 PRGN_ATTR pRgn_Attr; int nLeftRect, nTopRect, nRightRect, nBottomRect; if (!GdiGetHandleUserData((HGDIOBJ) hrgn, GDI_OBJECT_TYPE_REGION, (PVOID) &pRgn_Attr)) -#endif return NtGdiOffsetRgn(hrgn,nXOffset,nYOffset); -#if 0 + if ( pRgn_Attr->Flags == NULLREGION) return pRgn_Attr->Flags; @@ -792,7 +792,6 @@ } } return pRgn_Attr->Flags; -#endif } /* @@ -804,13 +803,11 @@ int x, int y) { -#if 0 PRGN_ATTR pRgn_Attr; if (!GdiGetHandleUserData((HGDIOBJ) hrgn, GDI_OBJECT_TYPE_REGION, (PVOID) &pRgn_Attr)) -#endif return NtGdiPtInRegion(hrgn,x,y); -#if 0 + if ( pRgn_Attr->Flags == NULLREGION) return FALSE; @@ -818,7 +815,6 @@ return NtGdiPtInRegion(hrgn,x,y); return INRECT( pRgn_Attr->Rect, x, y); -#endif } /* @@ -829,14 +825,12 @@ RectInRegion(HRGN hrgn, LPCRECT prcl) { -#if 0 PRGN_ATTR pRgn_Attr; RECTL rc; if (!GdiGetHandleUserData((HGDIOBJ) hrgn, GDI_OBJECT_TYPE_REGION, (PVOID) &pRgn_Attr)) -#endif return NtGdiRectInRegion(hrgn, (LPRECT) prcl); -#if 0 + if ( pRgn_Attr->Flags == NULLREGION) return FALSE; @@ -870,7 +864,6 @@ return TRUE; return FALSE; -#endif } /* @@ -896,13 +889,11 @@ int nRightRect, int nBottomRect) { -#if 0 PRGN_ATTR Rgn_Attr; if (!GdiGetHandleUserData((HGDIOBJ) hrgn, GDI_OBJECT_TYPE_REGION, (PVOID) &Rgn_Attr)) -#endif return NtGdiSetRectRgn(hrgn, nLeftRect, nTopRect, nRightRect, nBottomRect); -#if 0 + if ((nLeftRect == nRightRect) || (nTopRect == nBottomRect)) { Rgn_Attr->AttrFlags |= ATTR_RGN_DIRTY; @@ -931,7 +922,6 @@ Rgn_Attr->AttrFlags |= ATTR_RGN_DIRTY ; Rgn_Attr->Flags = SIMPLEREGION; return TRUE; -#endif } /*

1 0

[tkreuzer] 44942: [HAL] Move x86bios.c into amd64 folder
by tkreuzer＠svn.reactos.org 05 Jan '10

05 Jan '10

Author: tkreuzer Date: Tue Jan 5 01:59:00 2010 New Revision: 44942 URL: http://svn.reactos.org/svn/reactos?rev=44942&view=rev Log: [HAL] Move x86bios.c into amd64 folder Added: branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/x86bios.c - copied unchanged from r44937, branches/ros-amd64-bringup/reactos/hal/halx86/generic/x86bios.c Removed: branches/ros-amd64-bringup/reactos/hal/halx86/generic/x86bios.c Modified: branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild Removed: branches/ros-amd64-bringup/reactos/hal/halx86/generic/x86bios.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/generic/x86bios.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/generic/x86bios.c (removed) @@ -1,317 +1,0 @@ -/* - * PROJECT: ReactOS HAL - * LICENSE: See COPYING in the top level directory - * FILE: hal/halamd64/generic/x86bios.c - * PURPOSE: - * PROGRAMMERS: Timo Kreuzer (timo.kreuzer(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#include <hal.h> -//#define NDEBUG -#include <debug.h> - -/* This page serves as fallback for pages used by Mm */ -#define DEFAULT_PAGE 0x21 - -/* GLOBALS *******************************************************************/ - -BOOLEAN x86BiosIsInitialized; -LONG x86BiosBufferIsAllocated = 0; -PUCHAR x86BiosMemoryMapping; - -VOID -NTAPI -HalInitializeBios(ULONG Unknown, PLOADER_PARAMETER_BLOCK LoaderBlock) -{ - PPFN_NUMBER PfnArray; - PFN_NUMBER Pfn, Last; - PMEMORY_ALLOCATION_DESCRIPTOR Descriptor; - PLIST_ENTRY ListEntry; - PMDL Mdl; - - /* Allocate an MDL for 1MB */ - Mdl = IoAllocateMdl(NULL, 0x100000, FALSE, FALSE, NULL); - if (!Mdl) - { - ASSERT(FALSE); - } - - /* Get pointer to the pfn array */ - PfnArray = MmGetMdlPfnArray(Mdl); - - /* Fill the array with low memory PFNs */ - for (Pfn = 0; Pfn < 0x100; Pfn++) - { - PfnArray[Pfn] = Pfn; - } - - /* Loop the memory descriptors */ - for (ListEntry = LoaderBlock->MemoryDescriptorListHead.Flink; - ListEntry != &LoaderBlock->MemoryDescriptorListHead; - ListEntry = ListEntry->Flink) - { - /* Get the memory descriptor */ - Descriptor = CONTAINING_RECORD(ListEntry, - MEMORY_ALLOCATION_DESCRIPTOR, - ListEntry); - - /* Check if the memory is in the low range */ - if (Descriptor->BasePage < 0x100) - { - /* Check if the memory type is firmware */ - if (Descriptor->MemoryType != LoaderFirmwarePermanent && - Descriptor->MemoryType != LoaderFirmwarePermanent) - { - /* It's something else, so don't use it! */ - Last = min(Descriptor->BasePage + Descriptor->PageCount, 0x100); - for (Pfn = Descriptor->BasePage; Pfn < Last; Pfn++) - { - /* Set each page to the default page */ - PfnArray[Pfn] = DEFAULT_PAGE; - } - } - } - } - - /* Map the MDL to system space */ - x86BiosMemoryMapping = MmGetSystemAddressForMdlSafe(Mdl, HighPagePriority); - ASSERT(x86BiosMemoryMapping); - - DPRINT1("memory: %p, %p\n", *(PVOID*)x86BiosMemoryMapping, *(PVOID*)(x86BiosMemoryMapping + 8)); - - x86BiosIsInitialized = TRUE; -} - -NTSTATUS -NTAPI -x86BiosAllocateBuffer ( - ULONG *Size, - USHORT *Segment, - USHORT *Offset) -{ - /* Check if the system is initialized and the buffer is large enough */ - if (!x86BiosIsInitialized || *Size > PAGE_SIZE) - { - /* Something was wrong, fail! */ - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* Check if the buffer is already allocated */ - if (InterlockedBitTestAndSet(&x86BiosBufferIsAllocated, 0)) - { - /* Buffer was already allocated, fail */ - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* The buffer is sufficient, return hardcoded address and size */ - *Size = PAGE_SIZE; - *Segment = 0x2000; - *Offset = 0; - - return STATUS_SUCCESS;; -} - -NTSTATUS -NTAPI -x86BiosFreeBuffer ( - USHORT Segment, - USHORT Offset) -{ - /* Check if the system is initialized and if the address matches */ - if (!x86BiosIsInitialized || Segment != 0x2000 || Offset != 0) - { - /* Something was wrong, fail */ - return STATUS_INVALID_PARAMETER; - } - - /* Check if the buffer was allocated */ - if (!InterlockedBitTestAndReset(&x86BiosBufferIsAllocated, 0)) - { - /* It was not, fail */ - return STATUS_INVALID_PARAMETER; - } - - /* Buffer is freed, nothing more to do */ - return STATUS_SUCCESS;; -} - -NTSTATUS -NTAPI -x86BiosReadMemory ( - USHORT Segment, - USHORT Offset, - PVOID Buffer, - ULONG Size) -{ - ULONG_PTR Address; - - /* Calculate the physical address */ - Address = (Segment << 4) + Offset; - - /* Check if it's valid */ - if (!x86BiosIsInitialized || Address + Size > 0x100000) - { - /* Invalid */ - return STATUS_INVALID_PARAMETER; - } - - /* Copy the memory to the buffer */ - RtlCopyMemory(Buffer, x86BiosMemoryMapping + Address, Size); - - /* Return success */ - return STATUS_SUCCESS; -} - -NTSTATUS -NTAPI -x86BiosWriteMemory ( - USHORT Segment, - USHORT Offset, - PVOID Buffer, - ULONG Size) -{ - ULONG_PTR Address; - - /* Calculate the physical address */ - Address = (Segment << 4) + Offset; - - /* Check if it's valid */ - if (!x86BiosIsInitialized || Address + Size > 0x100000) - { - /* Invalid */ - return STATUS_INVALID_PARAMETER; - } - - /* Copy the memory from the buffer */ - RtlCopyMemory(x86BiosMemoryMapping + Address, Buffer, Size); - - /* Return success */ - return STATUS_SUCCESS; -} - -typedef struct -{ - union - { - ULONG Eax; - USHORT Ax; - struct - { - UCHAR Al; - UCHAR Ah; - }; - }; - union - { - ULONG Ecx; - USHORT Cx; - struct - { - UCHAR Cl; - UCHAR Ch; - }; - }; - union - { - ULONG Edx; - USHORT Dx; - struct - { - UCHAR Dl; - UCHAR Dh; - }; - }; - union - { - ULONG Ebx; - USHORT Bx; - struct - { - UCHAR Bl; - UCHAR Bh; - }; - }; - ULONG Ebp; - ULONG Esi; - ULONG Edi; - USHORT SegDs; - USHORT SegEs; - - /* Extended */ - union - { - ULONG Eip; - USHORT Ip; - }; - - union - { - ULONG Esp; - USHORT Sp; - }; - -} X86_REGISTERS, *PX86_REGISTERS; - -enum -{ - X86_VMFLAGS_RETURN_ON_IRET = 1, -}; - -typedef struct -{ - union - { - X86_BIOS_REGISTERS BiosRegisters; - X86_REGISTERS Registers; - }; - - struct - { - ULONG ReturnOnIret:1; - } Flags; - - PVOID MemBuffer; -} X86_VM_STATE, *PX86_VM_STATE; - -BOOLEAN -NTAPI -x86BiosCall ( - ULONG InterruptNumber, - X86_BIOS_REGISTERS *Registers) -{ - X86_VM_STATE VmState; - - /* Zero the VmState */ - RtlZeroMemory(&VmState, sizeof(VmState)); - - /* Copy the registers */ - VmState.BiosRegisters = *Registers; - - /* Set the physical memory buffer */ - VmState.MemBuffer = x86BiosMemoryMapping; - - /* Initialize IP from the interrupt vector table */ - VmState.Registers.Ip = ((PUSHORT)x86BiosMemoryMapping)[InterruptNumber]; - - /* Make the function return on IRET */ - VmState.Flags.ReturnOnIret = 1; - - /* Call the x86 emulator */ -// x86Emulator(&VmState); - - /* Copy registers back to caller */ - *Registers = VmState.BiosRegisters; - - return TRUE; -} - -BOOLEAN -NTAPI -HalpBiosDisplayReset(VOID) -{ - UNIMPLEMENTED; - return TRUE; -} - Modified: branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] Tue Jan 5 01:59:00 2010 @@ -36,7 +36,6 @@ </directory> </if> <if property="ARCH" value="amd64"> - <file>x86bios.c</file> <directory name="amd64"> <file>halinit.c</file> <file>irq.s</file> @@ -44,6 +43,7 @@ <file>pic.c</file> <file>systimer.S</file> <file>usage.c</file> + <file>x86bios.c</file> </directory> </if> </directory>

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs