Ros-diffs July 2006

ros-diffs@reactos.org

19 participants
662 discussions

[turner] 23220: Revert my backspace patch from before. I found a better way to handle backspaces which doesnt break backspacing in ftp.exe(and some of apps) while still fixing ncftp.exe.

by turner＠svn.reactos.org

Author: turner Date: Sat Jul 22 09:16:26 2006 New Revision: 23220 URL: http://svn.reactos.org/svn/reactos?rev=23220&view=rev Log: Revert my backspace patch from before. I found a better way to handle backspaces which doesnt break backspacing in ftp.exe(and some of apps) while still fixing ncftp.exe. Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conio.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.c Sat Jul 22 09:16:26 2006 @@ -607,8 +607,12 @@ && Input->InputEvent.Event.KeyEvent.bKeyDown && Input->InputEvent.Event.KeyEvent.uChar.AsciiChar != '\0') { - /* backspace handling */ - if ('\b' == Input->InputEvent.Event.KeyEvent.uChar.AsciiChar) + /* + * backspace handling - if we are in charge of echoing it then we handle it here + * otherwise we treat it like a normal char. + */ + if ('\b' == Input->InputEvent.Event.KeyEvent.uChar.AsciiChar && 0 + != (Console->Mode & ENABLE_ECHO_INPUT)) { /* echo if it has not already been done, and either we or the client has chars to be deleted */ if (! Input->Echoed @@ -622,14 +626,14 @@ i -= 2; /* if we already have something to return, just back it up by 2 */ } else - { - /* otherwise, we will treat the backspace just like any other char and let the client decide what to do */ + { /* otherwise, return STATUS_NOTIFY_CLEANUP to tell client to back up its buffer */ Console->WaitingChars--; ConioUnlockConsole(Console); HeapFree(Win32CsrApiHeap, 0, Input); - Request->Data.ReadConsoleRequest.NrCharactersRead++; - Buffer[i] = Input->InputEvent.Event.KeyEvent.uChar.AsciiChar; - return Request->Status; + Request->Data.ReadConsoleRequest.NrCharactersRead = 0; + Request->Status = STATUS_NOTIFY_CLEANUP; + return STATUS_NOTIFY_CLEANUP; + } Request->Data.ReadConsoleRequest.nCharsCanBeDeleted--; Input->Echoed = TRUE; /* mark as echoed so we don't echo it below */

18 years, 5 months

[hpoussin] 23219: Get rid of TCHAR variables. Use WCHAR instead.

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sat Jul 22 02:15:21 2006 New Revision: 23219 URL: http://svn.reactos.org/svn/reactos?rev=23219&view=rev Log: Get rid of TCHAR variables. Use WCHAR instead. Modified: trunk/reactos/dll/win32/newdev/newdev.c trunk/reactos/dll/win32/newdev/newdev.rbuild trunk/reactos/dll/win32/newdev/newdev_private.h trunk/reactos/dll/win32/newdev/wizard.c Modified: trunk/reactos/dll/win32/newdev/newdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/newdev.c?… ============================================================================== --- trunk/reactos/dll/win32/newdev/newdev.c (original) +++ trunk/reactos/dll/win32/newdev/newdev.c Sat Jul 22 02:15:21 2006 @@ -30,8 +30,8 @@ static BOOL SearchDriver( IN PDEVINSTDATA DevInstData, - IN LPCTSTR Directory OPTIONAL, - IN LPCTSTR InfFile OPTIONAL); + IN LPCWSTR Directory OPTIONAL, + IN LPCWSTR InfFile OPTIONAL); /* * @implemented @@ -250,14 +250,14 @@ static BOOL SearchDriver( IN PDEVINSTDATA DevInstData, - IN LPCTSTR Directory OPTIONAL, - IN LPCTSTR InfFile OPTIONAL) -{ - SP_DEVINSTALL_PARAMS DevInstallParams = {0,}; + IN LPCWSTR Directory OPTIONAL, + IN LPCWSTR InfFile OPTIONAL) +{ + SP_DEVINSTALL_PARAMS_W DevInstallParams = {0,}; BOOL ret; - DevInstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS); - if (!SetupDiGetDeviceInstallParams(DevInstData->hDevInfo, &DevInstData->devInfoData, &DevInstallParams)) + DevInstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS_W); + if (!SetupDiGetDeviceInstallParamsW(DevInstData->hDevInfo, &DevInstData->devInfoData, &DevInstallParams)) { TRACE("SetupDiGetDeviceInstallParams() failed with error 0x%lx\n", GetLastError()); return FALSE; @@ -267,20 +267,20 @@ if (InfFile) { DevInstallParams.Flags |= DI_ENUMSINGLEINF; - _tcsncpy(DevInstallParams.DriverPath, InfFile, MAX_PATH); + wcsncpy(DevInstallParams.DriverPath, InfFile, MAX_PATH); } else if (Directory) { DevInstallParams.Flags &= ~DI_ENUMSINGLEINF; - _tcsncpy(DevInstallParams.DriverPath, Directory, MAX_PATH); + wcsncpy(DevInstallParams.DriverPath, Directory, MAX_PATH); } else { DevInstallParams.Flags &= ~DI_ENUMSINGLEINF; - *DevInstallParams.DriverPath = _T('\0'); - } - - ret = SetupDiSetDeviceInstallParams( + *DevInstallParams.DriverPath = '\0'; + } + + ret = SetupDiSetDeviceInstallParamsW( DevInstData->hDevInfo, &DevInstData->devInfoData, &DevInstallParams); @@ -319,20 +319,20 @@ } static BOOL -IsDots(IN LPCTSTR str) -{ - if(_tcscmp(str, _T(".")) && _tcscmp(str, _T(".."))) return FALSE; +IsDots(IN LPCWSTR str) +{ + if(wcscmp(str, L".") && wcscmp(str, L"..")) return FALSE; return TRUE; } -static LPCTSTR -GetFileExt(IN LPTSTR FileName) -{ - LPCTSTR Dot; - - Dot = _tcsrchr(FileName, _T('.')); +static LPCWSTR +GetFileExt(IN LPWSTR FileName) +{ + LPCWSTR Dot; + + Dot = wcsrchr(FileName, '.'); if (!Dot) - return _T(""); + return L""; return Dot; } @@ -340,40 +340,40 @@ static BOOL SearchDriverRecursive( IN PDEVINSTDATA DevInstData, - IN LPCTSTR Path) -{ - WIN32_FIND_DATA wfd; - TCHAR DirPath[MAX_PATH]; - TCHAR FileName[MAX_PATH]; - TCHAR FullPath[MAX_PATH]; - TCHAR LastDirPath[MAX_PATH] = _T(""); - TCHAR PathWithPattern[MAX_PATH]; + IN LPCWSTR Path) +{ + WIN32_FIND_DATAW wfd; + WCHAR DirPath[MAX_PATH]; + WCHAR FileName[MAX_PATH]; + WCHAR FullPath[MAX_PATH]; + WCHAR LastDirPath[MAX_PATH] = L""; + WCHAR PathWithPattern[MAX_PATH]; BOOL ok = TRUE; BOOL retval = FALSE; HANDLE hFindFile = INVALID_HANDLE_VALUE; - _tcscpy(DirPath, Path); - - if (DirPath[_tcsclen(DirPath) - 1] != '\\') - _tcscat(DirPath, _T("\\")); - - _tcscpy(PathWithPattern, DirPath); - _tcscat(PathWithPattern, _T("\\*")); - - for (hFindFile = FindFirstFile(PathWithPattern, &wfd); + wcscpy(DirPath, Path); + + if (DirPath[wcslen(DirPath) - 1] != '\\') + wcscat(DirPath, L"\\"); + + wcscpy(PathWithPattern, DirPath); + wcscat(PathWithPattern, L"\\*"); + + for (hFindFile = FindFirstFileW(PathWithPattern, &wfd); ok && hFindFile != INVALID_HANDLE_VALUE; - ok = FindNextFile(hFindFile, &wfd)) - { - - _tcscpy(FileName, wfd.cFileName); + ok = FindNextFileW(hFindFile, &wfd)) + { + + wcscpy(FileName, wfd.cFileName); if (IsDots(FileName)) continue; if (wfd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { /* Recursive search */ - _tcscpy(FullPath, DirPath); - _tcscat(FullPath, FileName); + wcscpy(FullPath, DirPath); + wcscat(FullPath, FileName); if (SearchDriverRecursive(DevInstData, FullPath)) { retval = TRUE; @@ -382,13 +382,13 @@ } else { - LPCTSTR pszExtension = GetFileExt(FileName); - - if ((_tcsicmp(pszExtension, _T(".inf")) == 0) && (_tcscmp(LastDirPath, DirPath) != 0)) - { - _tcscpy(LastDirPath, DirPath); - - if (_tcsclen(DirPath) > MAX_PATH) + LPCWSTR pszExtension = GetFileExt(FileName); + + if ((wcsicmp(pszExtension, L".inf") == 0) && (wcscmp(LastDirPath, DirPath) != 0)) + { + wcscpy(LastDirPath, DirPath); + + if (wcslen(DirPath) > MAX_PATH) /* Path is too long to be searched */ continue; @@ -422,11 +422,11 @@ /* We need to check all specified directories to be * sure to find the best driver for the device. */ - LPCTSTR Path; - for (Path = DevInstData->CustomSearchPath; *Path != '\0'; Path += _tcslen(Path) + 1) + LPCWSTR Path; + for (Path = DevInstData->CustomSearchPath; *Path != '\0'; Path += wcslen(Path) + 1) { TRACE("Search driver in %S\n", Path); - if (_tcslen(Path) == 2 && Path[1] == ':') + if (wcslen(Path) == 2 && Path[1] == ':') { if (SearchDriverRecursive(DevInstData, Path)) result = TRUE; @@ -449,13 +449,13 @@ IN BOOL IncludeCustomPath, IN HWND hwndCombo OPTIONAL) { - TCHAR drive[] = {'?',':',0}; + WCHAR drive[] = {'?',':',0}; DWORD dwDrives = 0; DWORD i; UINT nType; DWORD CustomTextLength = 0; DWORD LengthNeeded = 0; - LPTSTR Buffer; + LPWSTR Buffer; /* Calculate length needed to store the search paths */ if (IncludeRemovableDevices) @@ -465,7 +465,7 @@ { if (dwDrives & i) { - nType = GetDriveType(drive); + nType = GetDriveTypeW(drive); if (nType == DRIVE_REMOVABLE || nType == DRIVE_CDROM) { LengthNeeded += 3; @@ -484,7 +484,7 @@ DevInstData->CustomSearchPath = Buffer = HeapAlloc( GetProcessHeap(), 0, - (LengthNeeded + 1) * sizeof(TCHAR)); + (LengthNeeded + 1) * sizeof(WCHAR)); if (!Buffer) { TRACE("HeapAlloc() failed\n"); @@ -499,19 +499,19 @@ { if (dwDrives & i) { - nType = GetDriveType(drive); + nType = GetDriveTypeW(drive); if (nType == DRIVE_REMOVABLE || nType == DRIVE_CDROM) { - Buffer += 1 + _stprintf(Buffer, drive); + Buffer += 1 + swprintf(Buffer, drive); } } } } if (IncludeCustomPath) { - Buffer += 1 + ComboBox_GetText(hwndCombo, Buffer, CustomTextLength); - } - *Buffer = _T('\0'); + Buffer += 1 + GetWindowTextW(hwndCombo, Buffer, CustomTextLength); + } + *Buffer = '\0'; return TRUE; } @@ -522,7 +522,7 @@ { BOOL ret; - TRACE("Installing driver %S: %S\n", DevInstData->drvInfoData.MfgName, DevInstData->drvInfoData.Description); + TRACE("Installing driver %s: %s\n", DevInstData->drvInfoData.MfgName, DevInstData->drvInfoData.Description); ret = SetupDiCallClassInstaller( DIF_SELECTBESTCOMPATDRV, @@ -733,7 +733,7 @@ } } - TRACE("Installing %S (%S)\n", DevInstData->buffer, InstanceId); + TRACE("Installing %s (%S)\n", DevInstData->buffer, InstanceId); /* Search driver in default location and removable devices */ if (!PrepareFoldersToScan(DevInstData, FALSE, FALSE, NULL)) Modified: trunk/reactos/dll/win32/newdev/newdev.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/newdev.rb… ============================================================================== --- trunk/reactos/dll/win32/newdev/newdev.rbuild (original) +++ trunk/reactos/dll/win32/newdev/newdev.rbuild Sat Jul 22 02:15:21 2006 @@ -1,7 +1,5 @@ <module name="newdev" type="win32dll" installbase="system32" installname="newdev.dll"> <include base="newdev">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <importlibrary definition="newdev.spec.def" /> <define name="_WIN32_IE">0x0600</define> <define name="_WIN32_WINNT">0x0501</define> Modified: trunk/reactos/dll/win32/newdev/newdev_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/newdev_pr… ============================================================================== --- trunk/reactos/dll/win32/newdev/newdev_private.h (original) +++ trunk/reactos/dll/win32/newdev/newdev_private.h Sat Jul 22 02:15:21 2006 @@ -1,6 +1,7 @@ #ifndef __NEWDEV_PRIVATE_H #define __NEWDEV_PRIVATE_H +#define COBJMACROS #include <windows.h> #include <windowsx.h> #include <commctrl.h> @@ -9,7 +10,6 @@ #include <setupapi.h> #include <cfgmgr32.h> #include <shlobj.h> -#include <tchar.h> #include <wine/debug.h> #include <stdio.h> @@ -29,7 +29,7 @@ SP_DEVINFO_DATA devInfoData; SP_DRVINFO_DATA drvInfoData; - LPTSTR CustomSearchPath; /* MULTI_SZ string */ + LPWSTR CustomSearchPath; /* MULTI_SZ string */ } DEVINSTDATA, *PDEVINSTDATA; #define WM_SEARCH_FINISHED (WM_USER + 10) Modified: trunk/reactos/dll/win32/newdev/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/wizard.c?… ============================================================================== --- trunk/reactos/dll/win32/newdev/wizard.c (original) +++ trunk/reactos/dll/win32/newdev/wizard.c Sat Jul 22 02:15:21 2006 @@ -237,8 +237,8 @@ HKEY hKey = NULL; DWORD dwRegType; DWORD dwPathLength; - LPTSTR Buffer = NULL; - LPCTSTR Path; + LPWSTR Buffer = NULL; + LPCWSTR Path; LONG rc; (void)ComboBox_ResetContent(hwndCombo); @@ -255,9 +255,9 @@ TRACE("RegOpenKeyEx() failed with error 0x%lx\n", rc); goto cleanup; } - rc = RegQueryValueEx( + rc = RegQueryValueExW( hKey, - _T("Installation Sources"), + L"Installation Sources", NULL, &dwRegType, NULL, @@ -269,15 +269,15 @@ } /* Allocate enough space to add 2 NULL chars at the end of the string */ - Buffer = HeapAlloc(GetProcessHeap(), 0, dwPathLength + 2 * sizeof(TCHAR)); + Buffer = HeapAlloc(GetProcessHeap(), 0, dwPathLength + 2 * sizeof(WCHAR)); if (!Buffer) { TRACE("HeapAlloc() failed\n"); goto cleanup; } - rc = RegQueryValueEx( + rc = RegQueryValueExW( hKey, - _T("Installation Sources"), + L"Installation Sources", NULL, NULL, (LPBYTE)Buffer, @@ -290,7 +290,7 @@ Buffer[dwPathLength] = Buffer[dwPathLength + 1] = '\0'; /* Populate combo box */ - for (Path = Buffer; *Path; Path += _tcslen(Path) + 1) + for (Path = Buffer; *Path; Path += wcslen(Path) + 1) { (void)ComboBox_AddString(hwndCombo, Path); if (Path == Buffer) @@ -307,10 +307,10 @@ SaveCustomPath( IN HWND hwndCombo) { - LPTSTR CustomPath = NULL; + LPWSTR CustomPath = NULL; DWORD CustomPathLength; - LPTSTR Buffer = NULL; - LPTSTR pBuffer; /* Pointer into Buffer */ + LPWSTR Buffer = NULL; + LPWSTR pBuffer; /* Pointer into Buffer */ int ItemsCount, Length; DWORD i; DWORD TotalLength = 0; @@ -320,13 +320,13 @@ /* Get custom path */ Length = ComboBox_GetTextLength(hwndCombo) + 1; - CustomPath = HeapAlloc(GetProcessHeap(), 0, Length * sizeof(TCHAR)); + CustomPath = HeapAlloc(GetProcessHeap(), 0, Length * sizeof(WCHAR)); if (!CustomPath) { TRACE("HeapAlloc() failed\n"); goto cleanup; } - CustomPathLength = ComboBox_GetText(hwndCombo, CustomPath, Length) + 1; + CustomPathLength = GetWindowTextW(hwndCombo, CustomPath, Length) + 1; /* Calculate length of the buffer */ ItemsCount = ComboBox_GetCount(hwndCombo); @@ -348,7 +348,7 @@ TotalLength++; /* Final NULL char */ /* Allocate buffer */ - Buffer = HeapAlloc(GetProcessHeap(), 0, (CustomPathLength + TotalLength + 1) * sizeof(TCHAR)); + Buffer = HeapAlloc(GetProcessHeap(), 0, (CustomPathLength + TotalLength + 1) * sizeof(WCHAR)); if (!Buffer) { TRACE("HeapAlloc() failed\n"); @@ -365,7 +365,7 @@ TRACE("ComboBox_GetLBText() failed\n"); goto cleanup; } - else if (UseCustomPath && _tcsicmp(CustomPath, pBuffer) == 0) + else if (UseCustomPath && wcsicmp(CustomPath, pBuffer) == 0) UseCustomPath = FALSE; pBuffer += 1 + Length; } @@ -378,7 +378,7 @@ } TotalLength += CustomPathLength; - _tcscpy(Buffer, CustomPath); + wcscpy(Buffer, CustomPath); /* Save the buffer */ /* RegSetKeyValue would have been better... */ @@ -393,13 +393,13 @@ TRACE("RegOpenKeyEx() failed with error 0x%lx\n", rc); goto cleanup; } - rc = RegSetValueEx( + rc = RegSetValueExW( hKey, - _T("Installation Sources"), + L"Installation Sources", 0, REG_MULTI_SZ, (const BYTE*)Buffer, - TotalLength * sizeof(TCHAR)); + TotalLength * sizeof(WCHAR)); if (rc != ERROR_SUCCESS) { TRACE("RegSetValueEx() failed with error 0x%lx\n", rc); @@ -595,21 +595,20 @@ pidl = SHBrowseForFolder(&bi); if (pidl) { - TCHAR Directory[MAX_PATH]; + WCHAR Directory[MAX_PATH]; IMalloc* malloc; - if (SHGetPathFromIDList(pidl, Directory)) + if (SHGetPathFromIDListW(pidl, Directory)) { /* Set the IDC_COMBO_PATH text */ - ComboBox_SetText(GetDlgItem(hwndDlg, IDC_COMBO_PATH), Directory); + SetWindowTextW(GetDlgItem(hwndDlg, IDC_COMBO_PATH), Directory); } /* Free memory, if possible */ if (SUCCEEDED(SHGetMalloc(&malloc))) { - FIXME("Memory leak!\n"); - //malloc->Free(pidl); - //malloc->Release(); + IMalloc_Free(malloc, pidl); + IMalloc_Release(malloc); } return TRUE; } @@ -1223,23 +1222,23 @@ static HFONT CreateTitleFont(VOID) { - NONCLIENTMETRICS ncm; - LOGFONT LogFont; + NONCLIENTMETRICSW ncm; + LOGFONTW LogFont; HDC hdc; INT FontSize; HFONT hFont; - ncm.cbSize = sizeof(NONCLIENTMETRICS); + ncm.cbSize = sizeof(NONCLIENTMETRICSW); SystemParametersInfo(SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); LogFont = ncm.lfMessageFont; LogFont.lfWeight = FW_BOLD; - _tcscpy(LogFont.lfFaceName, _T("MS Shell Dlg")); + wcscpy(LogFont.lfFaceName, L"MS Shell Dlg"); hdc = GetDC(NULL); FontSize = 12; LogFont.lfHeight = 0 - GetDeviceCaps (hdc, LOGPIXELSY) * FontSize / 72; - hFont = CreateFontIndirect(&LogFont); + hFont = CreateFontIndirectW(&LogFont); ReleaseDC(NULL, hdc); return hFont;

18 years, 5 months

[turner] 23218: Fix the horribly broken SetProgramWindow implementation

by turner＠svn.reactos.org

Author: turner Date: Sat Jul 22 01:11:46 2006 New Revision: 23218 URL: http://svn.reactos.org/svn/reactos?rev=23218&view=rev Log: Fix the horribly broken SetProgramWindow implementation Modified: trunk/reactos/dll/win32/user32/windows/window.c Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c (original) +++ trunk/reactos/dll/win32/user32/windows/window.c Sat Jul 22 01:11:46 2006 @@ -1582,7 +1582,7 @@ STDCALL SetProgmanWindow(HWND hWnd) { - return NtUserCallHwndOpt(hWnd, HWNDOPT_ROUTINE_SETTASKMANWINDOW); + return NtUserCallHwndOpt(hWnd, HWNDOPT_ROUTINE_SETPROGMANWINDOW); } /*

18 years, 5 months

[mbosma] 23217: remove locking in section.c

by mbosma＠svn.reactos.org

Author: mbosma Date: Sat Jul 22 00:32:51 2006 New Revision: 23217 URL: http://svn.reactos.org/svn/reactos?rev=23217&view=rev Log: remove locking in section.c Modified: branches/cache_manager_rewrite/mm/section.c Modified: branches/cache_manager_rewrite/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/sectio… ============================================================================== --- branches/cache_manager_rewrite/mm/section.c (original) +++ branches/cache_manager_rewrite/mm/section.c Sat Jul 22 00:32:51 2006 @@ -165,22 +165,6 @@ KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); MmReleasePageOp(PageOp); } - - -/* - * FUNCTION: Waits in kernel mode indefinitely for a file object lock. - * ARGUMENTS: PFILE_OBJECT to wait for. - * RETURNS: Status of the wait. - */ -static NTSTATUS -MmspWaitForFileLock(PFILE_OBJECT File) -{ - if(File->Flags & FO_SYNCHRONOUS_IO) - return KeWaitForSingleObject(&File->Lock, 0, KernelMode, FALSE, NULL); - else - return 0; -} - VOID MmFreePageTablesSectionSegment(PMM_SECTION_SEGMENT Segment) @@ -3556,18 +3540,6 @@ RtlZeroMemory(&Segment->PageDirectory, sizeof(SECTION_PAGE_DIRECTORY)); /* - * Lock the file - */ - Status = MmspWaitForFileLock(FileObject); - if (Status != STATUS_SUCCESS) - { - ExFreePool(Segment); - ObDereferenceObject(Section); - ObDereferenceObject(FileObject); - return(Status); - } - - /* * Set the lock before assigning the segment to the file object */ ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&DataSectionObjectLock); @@ -3601,20 +3573,6 @@ } else { - /* - * Lock the file - */ - Status = MmspWaitForFileLock(FileObject); - if (Status != STATUS_SUCCESS) - { - ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&DataSectionObjectLock); - Segment->ReferenceCount--; - ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&DataSectionObjectLock); - ObDereferenceObject(Section); - ObDereferenceObject(FileObject); - return(Status); - } - Section->Segment = Segment; ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&DataSectionObjectLock); MmLockSectionSegment(Segment); @@ -4418,19 +4376,6 @@ Section->ImageSection = ImageSectionObject; ASSERT(ImageSectionObject->Segments); - - /* - * Lock the file - */ - Status = MmspWaitForFileLock(FileObject); - if (!NT_SUCCESS(Status)) - { - ExFreePool(ImageSectionObject->Segments); - ExFreePool(ImageSectionObject); - ObDereferenceObject(Section); - ObDereferenceObject(FileObject); - return(Status); - } ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&ImageSectionObjectLock); tmpImageSectionObject = InterlockedCompareExchangePointer(&FileObject->SectionObjectPointer->ImageSectionObject, @@ -4472,20 +4417,6 @@ } else { - /* - * Lock the file - */ - Status = MmspWaitForFileLock(FileObject); - if (Status != STATUS_SUCCESS) - { - ObDereferenceObject(Section); - ObDereferenceObject(FileObject); - ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&ImageSectionObjectLock); - ImageSectionObject->RefCount--; - ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&ImageSectionObjectLock); - return(Status); - } - Section->ImageSection = ImageSectionObject; SectionSegments = ImageSectionObject->Segments;

18 years, 5 months

[ion] 23216: - Add bugcheck CRITICAL_OBJECT_TERMINATED - Implement PspCatchCriticalBreak and fix the 5 or so FIXMEs that depended on it.

by ion＠svn.reactos.org

Author: ion Date: Fri Jul 21 23:59:16 2006 New Revision: 23216 URL: http://svn.reactos.org/svn/reactos?rev=23216&view=rev Log: - Add bugcheck CRITICAL_OBJECT_TERMINATED - Implement PspCatchCriticalBreak and fix the 5 or so FIXMEs that depended on it. Modified: trunk/reactos/ntoskrnl/ntoskrnl.mc trunk/reactos/ntoskrnl/ps/kill.c Modified: trunk/reactos/ntoskrnl/ntoskrnl.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.mc?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.mc (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.mc Fri Jul 21 23:59:16 2006 @@ -1109,6 +1109,13 @@ CRITICAL_PROCESS_DIED . +MessageId=0xF4 +Severity=Success +Facility=System +SymbolicName=CRITICAL_OBJECT_TERMINATION +Language=English +CRITICAL_OBJECT_TERMINATION +. MessageId=0xFC Severity=Success Modified: trunk/reactos/ntoskrnl/ps/kill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/kill.c?rev=232… ============================================================================== --- trunk/reactos/ntoskrnl/ps/kill.c (original) +++ trunk/reactos/ntoskrnl/ps/kill.c Fri Jul 21 23:59:16 2006 @@ -21,6 +21,61 @@ /* PRIVATE FUNCTIONS *********************************************************/ +VOID +NTAPI +PspCatchCriticalBreak(IN PCHAR Message, + IN PVOID ProcessOrThread, + IN PCHAR ImageName) +{ + UCHAR Action[2]; + BOOLEAN Handled = FALSE; + PAGED_CODE(); + + /* Check if a debugger is enabled */ + if (KdDebuggerEnabled) + { + /* Print out the message */ + DbgPrint(Message, ProcessOrThread, ImageName); + do + { + /* If a debugger isn't present, don't prompt */ + if (KdDebuggerNotPresent) break; + + /* A debuger is active, prompt for action */ + DbgPrompt("Break, or Ignore (bi)?", Action, sizeof(Action)); + switch (Action[0]) + { + /* Break */ + case 'B': case 'b': + + /* Do a breakpoint */ + DbgBreakPoint(); + + /* Ignore */ + case 'I': case 'i': + + /* Handle it */ + Handled = TRUE; + + /* Unrecognized */ + default: + break; + } + } while (!Handled); + } + + /* Did we ultimately handle this? */ + if (!Handled) + { + /* We didn't, bugcheck */ + KeBugCheckEx(CRITICAL_OBJECT_TERMINATION, + ((PKPROCESS)ProcessOrThread)->Header.Type, + (ULONG_PTR)ProcessOrThread, + (ULONG_PTR)ImageName, + (ULONG_PTR)Message); + } +} + NTSTATUS NTAPI PspTerminateProcess(IN PEPROCESS Process, @@ -29,12 +84,13 @@ PAGED_CODE(); PETHREAD Thread = NULL; - /* Check if this is a Critical Process, and Bugcheck */ + /* Check if this is a Critical Process */ if (Process->BreakOnTermination) { - /* FIXME: Add critical Process support */ - DPRINT1("A critical Process is being terminated\n"); - KEBUGCHECK(0); + /* Break to debugger */ + PspCatchCriticalBreak("Terminating critical process 0x%p (%s)\n", + Process, + Process->ImageFileName); } /* Set the delete flag */ @@ -442,8 +498,10 @@ /* Check if this is a Critical Thread */ if ((KdDebuggerEnabled) && (Thread->BreakOnTermination)) { - /* FIXME: Add critical thread support */ - KEBUGCHECK(0); + /* Break to debugger */ + PspCatchCriticalBreak("Critical thread 0x%p (in %s) exited\n", + Thread, + CurrentProcess->ImageFileName); } /* Check if it's the last thread and this is a Critical Process */ @@ -452,8 +510,10 @@ /* Check if a debugger is here to handle this */ if (KdDebuggerEnabled) { - /* FIXME: Add critical process support */ - DbgBreakPoint(); + /* Break to debugger */ + PspCatchCriticalBreak("Critical process 0x%p (in %s) exited\n", + CurrentProcess, + CurrentProcess->ImageFileName); } else { @@ -805,9 +865,10 @@ /* Check if this is a Critical Thread, and Bugcheck */ if (Thread->BreakOnTermination) { - /* FIXME: Add critical thread support */ - DPRINT1("A critical thread is being terminated\n"); - KEBUGCHECK(0); + /* Break to debugger */ + PspCatchCriticalBreak("Terminating critical thread 0x%p (%s)\n", + Thread, + Thread->ThreadsProcess->ImageFileName); } /* Check if we are already inside the thread */ @@ -981,9 +1042,10 @@ /* Check if this is a Critical Process, and Bugcheck */ if (Process->BreakOnTermination) { - /* FIXME: Add critical Process support */ - DPRINT1("A critical Process is being terminated\n"); - KEBUGCHECK(0); + /* Break to debugger */ + PspCatchCriticalBreak("Terminating critical process 0x%p (%s)\n", + Process, + Process->ImageFileName); } /* Lock the Process */

18 years, 5 months

[hpoussin] 23215: Add a hack to be able to use serial mice again (IRP_MJ_CLOSE is not set after IoGetDeviceObjectPointer() + ObDereferenceObject())

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Fri Jul 21 23:49:32 2006 New Revision: 23215 URL: http://svn.reactos.org/svn/reactos?rev=23215&view=rev Log: Add a hack to be able to use serial mice again (IRP_MJ_CLOSE is not set after IoGetDeviceObjectPointer() + ObDereferenceObject()) Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/deviface… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/deviface.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/deviface.c Fri Jul 21 23:49:32 2006 @@ -1000,6 +1000,14 @@ ObDereferenceObject(FileObject); + /* hpoussin, July 2006. Dereferencing the FileObject once + * is not enough to trigger the sending of IRP_MJ_CLEANUP. + * So, do it once more... According to Alex, it's because + * FileObjects should start with a ref count of 1 instead + * of 2 at the moment... + */ + ObDereferenceObject(FileObject); + return STATUS_SUCCESS; }

18 years, 5 months

[ion] 23214: - Implement Kernel, Memory Manager and Process Manager APIs for the following concepts (not yet used): - Process Quantum. - Fixed and Variable Quantum Tables. - Long and Short Quantum Variability. - Priority Separation and Separation Masks. - Foreground Quantum Table. - Process Priority, Priority Modes and Priority Classes. - Virtual Memory Priority - Job Scheduling Classes - Implement PsSetProcessPriorityByClass.

by ion＠svn.reactos.org

Author: ion Date: Fri Jul 21 23:28:38 2006 New Revision: 23214 URL: http://svn.reactos.org/svn/reactos?rev=23214&view=rev Log: - Implement Kernel, Memory Manager and Process Manager APIs for the following concepts (not yet used): - Process Quantum. - Fixed and Variable Quantum Tables. - Long and Short Quantum Variability. - Priority Separation and Separation Masks. - Foreground Quantum Table. - Process Priority, Priority Modes and Priority Classes. - Virtual Memory Priority - Job Scheduling Classes - Implement PsSetProcessPriorityByClass. Modified: trunk/reactos/include/ndk/ketypes.h trunk/reactos/include/ndk/pstypes.h trunk/reactos/ntoskrnl/KrnlFun.c trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/include/internal/ps.h trunk/reactos/ntoskrnl/include/internal/ps_x.h trunk/reactos/ntoskrnl/ke/process.c trunk/reactos/ntoskrnl/mm/mminit.c trunk/reactos/ntoskrnl/mm/process.c trunk/reactos/ntoskrnl/ps/job.c trunk/reactos/ntoskrnl/ps/process.c Modified: trunk/reactos/include/ndk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ketypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/ketypes.h (original) +++ trunk/reactos/include/ndk/ketypes.h Fri Jul 21 23:28:38 2006 @@ -929,6 +929,9 @@ #endif } KPROCESS, *PKPROCESS; +#define ASSERT_PROCESS(object) \ + ASSERT((((object)->Header.Type & KOBJECT_TYPE_MASK) == ProcessObject)) + // // System Service Table Descriptor // Modified: trunk/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/pstypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/pstypes.h (original) +++ trunk/reactos/include/ndk/pstypes.h Fri Jul 21 23:28:38 2006 @@ -107,6 +107,12 @@ #define PROCESS_PRIORITY_IDLE 3 #define PROCESS_PRIORITY_NORMAL 8 #define PROCESS_PRIORITY_NORMAL_FOREGROUND 9 + +// +// Process Priority Separation Values (OR) +// +#define PSP_VARIABLE_QUANTUMS 4 +#define PSP_LONG_QUANTUMS 16 // // Number of TLS expansion slots @@ -303,6 +309,13 @@ } THREADINFOCLASS; #else + +typedef enum _PSPROCESSPRIORITYMODE +{ + PsProcessPriorityForeground, + PsProcessPriorityBackground, + PsProcessPrioritySpinning +} PSPROCESSPRIORITYMODE; typedef enum _JOBOBJECTINFOCLASS { Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=232… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (original) +++ trunk/reactos/ntoskrnl/KrnlFun.c Fri Jul 21 23:28:38 2006 @@ -48,4 +48,5 @@ // Ke: // - Add code for interval recalulation when wait interrupted by an APC // -/////////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////////////////////////////////////// + Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h Fri Jul 21 23:28:38 2006 @@ -397,6 +397,21 @@ LARGE_INTEGER DirectoryTableBase ); +VOID +NTAPI +KeSetQuantumProcess( + IN PKPROCESS Process, + IN UCHAR Quantum +); + +KPRIORITY +NTAPI +KeSetPriorityAndQuantumProcess( + IN PKPROCESS Process, + IN KPRIORITY Priority, + IN UCHAR Quantum OPTIONAL +); + ULONG STDCALL KeForceResumeThread(IN PKTHREAD Thread); Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h Fri Jul 21 23:28:38 2006 @@ -654,6 +654,13 @@ NTAPI MmGetSessionLocaleId(VOID); +NTSTATUS +NTAPI +MmSetMemoryPriorityProcess( + IN PEPROCESS Process, + IN UCHAR MemoryPriority +); + /* i386/pfault.c *************************************************************/ NTSTATUS Modified: trunk/reactos/ntoskrnl/include/internal/ps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ps.h Fri Jul 21 23:28:38 2006 @@ -18,6 +18,8 @@ #define PSP_MAX_CREATE_THREAD_NOTIFY 8 #define PSP_MAX_LOAD_IMAGE_NOTIFY 8 #define PSP_MAX_CREATE_PROCESS_NOTIFY 8 + +#define PSP_JOB_SCHEDULING_CLASSES 10 VOID NTAPI @@ -226,7 +228,8 @@ extern PKWIN32_THREAD_CALLOUT PspW32ThreadCallout; extern PVOID PspSystemDllEntryPoint; extern PVOID PspSystemDllBase; - +extern BOOLEAN PspUseJobSchedulingClasses; +extern CHAR PspJobSchedulingClasses[PSP_JOB_SCHEDULING_CLASSES]; #include "ps_x.h" #endif /* __INCLUDE_INTERNAL_PS_H */ Modified: trunk/reactos/ntoskrnl/include/internal/ps_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps_x.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ps_x.h Fri Jul 21 23:28:38 2006 @@ -6,6 +6,18 @@ * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) * Thomas Weidenmueller (w3seek(a)reactos.org) */ + +// +// Extract Quantum Settings from the Priority Separation Mask +// +#define PspPrioritySeparationFromMask(Mask) \ + ((Mask) & 3) + +#define PspQuantumTypeFromMask(Mask) \ + ((Mask) & 12) + +#define PspQuantumLengthFromMask(Mask) \ + ((Mask) & 48) VOID FORCEINLINE Modified: trunk/reactos/ntoskrnl/ke/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/process.c (original) +++ trunk/reactos/ntoskrnl/ke/process.c Fri Jul 21 23:28:38 2006 @@ -221,6 +221,204 @@ Ke386SetPageTableDirectory(NewProcess->DirectoryTableBase.u.LowPart); } +VOID +NTAPI +KeSetQuantumProcess(IN PKPROCESS Process, + IN UCHAR Quantum) +{ + KIRQL OldIrql; + PLIST_ENTRY NextEntry, ListHead; + PKTHREAD Thread; + ASSERT_PROCESS(Process); + ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); + + /* Lock Dispatcher */ + OldIrql = KeAcquireDispatcherDatabaseLock(); + + /* Set new quantum */ + Process->QuantumReset = Quantum; + + /* Loop all child threads */ + ListHead = &Process->ThreadListHead; + NextEntry = ListHead->Flink; + while (ListHead != NextEntry) + { + /* Get the thread */ + Thread = CONTAINING_RECORD(NextEntry, KTHREAD, ThreadListEntry); + + /* Set quantum */ + Thread->QuantumReset = Quantum; + + /* Go to the next one */ + NextEntry = NextEntry->Flink; + } + + /* Release Dispatcher Database */ + KeReleaseDispatcherDatabaseLock(OldIrql); +} + +KPRIORITY +NTAPI +KeSetPriorityAndQuantumProcess(IN PKPROCESS Process, + IN KPRIORITY Priority, + IN UCHAR Quantum OPTIONAL) +{ + KPRIORITY Delta; + PLIST_ENTRY NextEntry, ListHead; + KPRIORITY NewPriority, OldPriority; + KIRQL OldIrql; + PKTHREAD Thread; + BOOLEAN Released; + ASSERT_PROCESS(Process); + ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); + + /* Check if the process already has this priority */ + if (Process->BasePriority == Priority) + { + /* Don't change anything */ + return Process->BasePriority; + } + + /* If the caller gave priority 0, normalize to 1 */ + if (!Priority) Priority = 1; + + /* Lock Dispatcher */ + OldIrql = KeAcquireDispatcherDatabaseLock(); + + /* Check if we are modifying the quantum too */ + if (Quantum) Process->QuantumReset = Quantum; + + /* Save the current base priority and update it */ + OldPriority = Process->BasePriority; + Process->BasePriority = Priority; + + /* Calculate the priority delta */ + Delta = Priority - OldPriority; + + /* Set the list head and list entry */ + ListHead = &Process->ThreadListHead; + NextEntry = ListHead->Flink; + + /* Check if this is a real-time priority */ + if (Priority >= LOW_REALTIME_PRIORITY) + { + /* Loop the thread list */ + while (NextEntry != ListHead) + { + /* Get the thread */ + Thread = CONTAINING_RECORD(NextEntry, KTHREAD, ThreadListEntry); + + /* Update the quantum if we had one */ + if (Quantum) Thread->QuantumReset = Quantum; + + /* Calculate the new priority */ + NewPriority = Thread->BasePriority + Delta; + if (NewPriority < LOW_REALTIME_PRIORITY) + { + /* We're in real-time range, don't let it go below */ + NewPriority = LOW_REALTIME_PRIORITY; + } + else if (NewPriority > HIGH_PRIORITY) + { + /* We're going beyond the maximum priority, normalize */ + NewPriority = HIGH_PRIORITY; + } + + /* + * If priority saturation occured or the old priority was still in + * the real-time range, don't do anything. + */ + if (!(Thread->Saturation) || (OldPriority < LOW_REALTIME_PRIORITY)) + { + /* Check if we had priority saturation */ + if (Thread->Saturation > 0) + { + /* Boost priority to maximum */ + NewPriority = HIGH_PRIORITY; + } + else if (Thread->Saturation < 0) + { + /* If we had negative saturation, set minimum priority */ + NewPriority = LOW_REALTIME_PRIORITY; + } + + /* Update priority and quantum */ + Thread->BasePriority = NewPriority; + Thread->Quantum = Thread->QuantumReset; + + /* Disable decrements and update priority */ + Thread->PriorityDecrement = 0; + KiSetPriorityThread(Thread, NewPriority, &Released); + } + + /* Go to the next thread */ + NextEntry = NextEntry->Flink; + } + } + else + { + /* Loop the thread list */ + while (NextEntry != ListHead) + { + /* Get the thread */ + Thread = CONTAINING_RECORD(NextEntry, KTHREAD, ThreadListEntry); + + /* Update the quantum if we had one */ + if (Quantum) Thread->QuantumReset = Quantum; + + /* Calculate the new priority */ + NewPriority = Thread->BasePriority + Delta; + if (NewPriority >= LOW_REALTIME_PRIORITY) + { + /* We're not real-time range, don't let it enter RT range */ + NewPriority = LOW_REALTIME_PRIORITY - 1; + } + else if (NewPriority <= LOW_PRIORITY) + { + /* We're going below the minimum priority, normalize */ + NewPriority = 1; + } + + /* + * If priority saturation occured or the old priority was still in + * the real-time range, don't do anything. + */ + if (!(Thread->Saturation) || + (OldPriority >= LOW_REALTIME_PRIORITY)) + { + /* Check if we had priority saturation */ + if (Thread->Saturation > 0) + { + /* Boost priority to maximum */ + NewPriority = LOW_REALTIME_PRIORITY - 1; + } + else if (Thread->Saturation < 0) + { + /* If we had negative saturation, set minimum priority */ + NewPriority = 1; + } + + /* Update priority and quantum */ + Thread->BasePriority = NewPriority; + Thread->Quantum = Thread->QuantumReset; + + /* Disable decrements and update priority */ + Thread->PriorityDecrement = 0; + KiSetPriorityThread(Thread, NewPriority, &Released); + } + + /* Go to the next thread */ + NextEntry = NextEntry->Flink; + } + } + + /* Release Dispatcher Database */ + if (!Released) KeReleaseDispatcherDatabaseLock(OldIrql); + + /* Return previous priority */ + return OldPriority; +} + /* * @implemented */ Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c Fri Jul 21 23:28:38 2006 @@ -29,7 +29,7 @@ static BOOLEAN IsThisAnNtAsSystem = FALSE; -static MM_SYSTEM_SIZE MmSystemSize = MmSmallSystem; +MM_SYSTEM_SIZE MmSystemSize = MmSmallSystem; PHYSICAL_ADDRESS MmSharedDataPagePhysicalAddress; Modified: trunk/reactos/ntoskrnl/mm/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/process.c (original) +++ trunk/reactos/ntoskrnl/mm/process.c Fri Jul 21 23:28:38 2006 @@ -17,11 +17,35 @@ extern ULONG NtMinorVersion; extern ULONG NtOSCSDVersion; extern ULONG NtGlobalFlag; +extern MM_SYSTEM_SIZE MmSystemSize; #define MM_HIGHEST_VAD_ADDRESS \ (PVOID)((ULONG_PTR)MM_HIGHEST_USER_ADDRESS - (16 * PAGE_SIZE)) /* FUNCTIONS *****************************************************************/ + +NTSTATUS +NTAPI +MmSetMemoryPriorityProcess(IN PEPROCESS Process, + IN UCHAR MemoryPriority) +{ + UCHAR OldPriority; + + /* Check if we have less then 16MB of Physical Memory */ + if ((MmSystemSize == MmSmallSystem) && + (MmStats.NrTotalPages < ((15 * 1024 * 1024) / PAGE_SIZE))) + { + /* Always use background priority */ + MemoryPriority = 0; + } + + /* Save the old priority and update it */ + OldPriority = Process->Vm.Flags.MemoryPriority; + Process->Vm.Flags.MemoryPriority = MemoryPriority; + + /* Return the old priority */ + return OldPriority; +} LCID NTAPI Modified: trunk/reactos/ntoskrnl/ps/job.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/job.c?rev=2321… ============================================================================== --- trunk/reactos/ntoskrnl/ps/job.c (original) +++ trunk/reactos/ntoskrnl/ps/job.c Fri Jul 21 23:28:38 2006 @@ -18,14 +18,28 @@ #pragma alloc_text(INIT, PsInitJobManagment) #endif - - /* GLOBALS *******************************************************************/ POBJECT_TYPE PsJobType = NULL; LIST_ENTRY PsJobListHead; static FAST_MUTEX PsJobListLock; + +BOOLEAN PspUseJobSchedulingClasses; + +CHAR PspJobSchedulingClasses[PSP_JOB_SCHEDULING_CLASSES] = +{ + 1 * 6, + 2 * 6, + 3 * 6, + 4 * 6, + 5 * 6, + 6 * 6, + 7 * 6, + 8 * 6, + 9 * 6, + 10 * 6 +}; static GENERIC_MAPPING PiJobMapping = { Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c (original) +++ trunk/reactos/ntoskrnl/ps/process.c Fri Jul 21 23:28:38 2006 @@ -27,6 +27,49 @@ LARGE_INTEGER ShortPsLockDelay; +ULONG PsPrioritySeparation; +CHAR PspForegroundQuantum[3]; + +/* Fixed quantum table */ +CHAR PspFixedQuantums[6] = +{ + /* Short quantums */ + 3 * 6, /* Level 1 */ + 3 * 6, /* Level 2 */ + 3 * 6, /* Level 3 */ + + /* Long quantums */ + 6 * 6, /* Level 1 */ + 6 * 6, /* Level 2 */ + 6 * 6 /* Level 3 */ +}; + +/* Variable quantum table */ +CHAR PspVariableQuantums[6] = +{ + /* Short quantums */ + 1 * 6, /* Level 1 */ + 2 * 6, /* Level 2 */ + 3 * 6, /* Level 3 */ + + /* Long quantums */ + 2 * 6, /* Level 1 */ + 4 * 6, /* Level 2 */ + 6 * 6 /* Level 3 */ +}; + +/* Priority table */ +KPRIORITY PspPriorityTable[PROCESS_PRIORITY_CLASS_ABOVE_NORMAL + 1] = +{ + 8, + 4, + 8, + 13, + 24, + 6, + 10 +}; + /* PRIVATE FUNCTIONS *********************************************************/ NTSTATUS @@ -140,6 +183,164 @@ /* Reference the Process we had referenced earlier */ if (OldProcess) ObDereferenceObject(OldProcess); return FoundProcess; +} + +KPRIORITY +NTAPI +PspComputeQuantumAndPriority(IN PEPROCESS Process, + IN PSPROCESSPRIORITYMODE Mode, + OUT PCHAR Quantum) +{ + ULONG i; + UCHAR LocalQuantum, MemoryPriority; + PAGED_CODE(); + + /* Check if this is a foreground process */ + if (Mode == PsProcessPriorityForeground) + { + /* Set the memory priority and use priority separation */ + MemoryPriority = 2; + i = PsPrioritySeparation; + } + else + { + /* Set the background memory priority and no separation */ + MemoryPriority = 0; + i = 0; + } + + /* Make sure that the process mode isn't spinning */ + if (Mode != PsProcessPrioritySpinning) + { + /* Set the priority */ + MmSetMemoryPriorityProcess(Process, MemoryPriority); + } + + /* Make sure that the process isn't idle */ + if (Process->PriorityClass != PROCESS_PRIORITY_CLASS_IDLE) + { + /* Does the process have a job? */ + if ((Process->Job) && (PspUseJobSchedulingClasses)) + { + /* Use job quantum */ + LocalQuantum = PspJobSchedulingClasses[Process->Job-> + SchedulingClass]; + } + else + { + /* Use calculated quantum */ + LocalQuantum = PspForegroundQuantum[i]; + } + } + else + { + /* Process is idle, use default quantum */ + LocalQuantum = 6; + } + + /* Return quantum to caller */ + *Quantum = LocalQuantum; + + /* Return priority */ + return PspPriorityTable[Process->PriorityClass]; +} + +VOID +NTAPI +PsChangeQuantumTable(IN BOOLEAN Immediate, + IN ULONG PrioritySeparation) +{ + PEPROCESS Process = NULL; + ULONG i; + UCHAR Quantum; + PCHAR QuantumTable; + PAGED_CODE(); + + /* Write the current priority separation */ + PsPrioritySeparation = PspPrioritySeparationFromMask(PrioritySeparation); + + /* Normalize it if it was too high */ + if (PsPrioritySeparation == 3) PsPrioritySeparation = 2; + + /* Get the quantum table to use */ + if (PspQuantumTypeFromMask(PrioritySeparation) == PSP_VARIABLE_QUANTUMS) + { + /* Use a variable table */ + QuantumTable = PspVariableQuantums; + } + else + { + /* Use fixed table */ + QuantumTable = PspFixedQuantums; + } + + /* Now check if we should use long or short */ + if (PspQuantumLengthFromMask(PrioritySeparation) == PSP_LONG_QUANTUMS) + { + /* Use long quantums */ + QuantumTable += 3; + } + + /* Check if we're using long fixed quantums */ + if (QuantumTable == &PspFixedQuantums[3]) + { + /* Use Job scheduling classes */ + PspUseJobSchedulingClasses = TRUE; + } + else + { + /* Otherwise, we don't */ + PspUseJobSchedulingClasses = FALSE; + } + + /* Copy the selected table into the Foreground Quantum table */ + RtlCopyMemory(PspForegroundQuantum, + QuantumTable, + sizeof(PspForegroundQuantum)); + + /* Check if we should apply these changes real-time */ + if (Immediate) + { + /* We are...loop every process */ + Process == PsGetNextProcess(Process); + while (Process) + { + /* + * Use the priority separation, unless the process has + * low memory priority + */ + i = (Process->Vm.Flags.MemoryPriority == 1) ? + 0: PsPrioritySeparation; + + /* Make sure that the process isn't idle */ + if (Process->PriorityClass != PROCESS_PRIORITY_CLASS_IDLE) + { + /* Does the process have a job? */ + if ((Process->Job) && (PspUseJobSchedulingClasses)) + { + /* Use job quantum */ + Quantum = PspJobSchedulingClasses[Process->Job-> + SchedulingClass]; + } + else + { + /* Use calculated quantum */ + Quantum = PspForegroundQuantum[i]; + } + } + else + { + /* Process is idle, use default quantum */ + Quantum = 6; + } + + /* Now set the quantum */ + KeSetQuantumProcess(&Process->Pcb, Quantum); + + /* Get the next process */ + Process == PsGetNextProcess(Process); + } + } } NTSTATUS @@ -861,15 +1062,21 @@ } /* - * @unimplemented - */ -NTSTATUS + * @implemented + */ +VOID NTAPI PsSetProcessPriorityByClass(IN PEPROCESS Process, - IN ULONG Type) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + IN PSPROCESSPRIORITYMODE Type) +{ + UCHAR Quantum; + ULONG Priority; + + /* Compute quantum and priority */ + Priority = PspComputeQuantumAndPriority(Process, Type, &Quantum); + + /* Set them */ + KeSetPriorityAndQuantumProcess(&Process->Pcb, Priority, Quantum); } /*

18 years, 5 months

[mbosma] 23213: Temporarily comment out the call to ObDereferenceObject, because it triggers a bug, which causes the kernel to crash. (See krnlfun.c) Now the branch appears to work again.

by mbosma＠svn.reactos.org

Author: mbosma Date: Fri Jul 21 23:19:43 2006 New Revision: 23213 URL: http://svn.reactos.org/svn/reactos?rev=23213&view=rev Log: Temporarily comment out the call to ObDereferenceObject, because it triggers a bug, which causes the kernel to crash. (See krnlfun.c) Now the branch appears to work again. Modified: branches/cache_manager_rewrite/cc/view.c Modified: branches/cache_manager_rewrite/cc/view.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/cc/view.c… ============================================================================== --- branches/cache_manager_rewrite/cc/view.c (original) +++ branches/cache_manager_rewrite/cc/view.c Fri Jul 21 23:19:43 2006 @@ -273,7 +273,7 @@ } DPRINT ("%x\n", Bcb->Section); - ObDereferenceObject (Bcb->Section); + //ObDereferenceObject (Bcb->Section); FileObject->SectionObjectPointer->SharedCacheMap = NULL; ExFreeToNPagedLookasideList (&BcbLookasideList, Bcb); }

18 years, 5 months

[hpoussin] 23212: Fix regression introduced in r23174, which prevented autochk to work

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Fri Jul 21 23:00:28 2006 New Revision: 23212 URL: http://svn.reactos.org/svn/reactos?rev=23212&view=rev Log: Fix regression introduced in r23174, which prevented autochk to work Modified: trunk/reactos/ntoskrnl/include/internal/ps_i.h Modified: trunk/reactos/ntoskrnl/include/internal/ps_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps_i.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ps_i.h Fri Jul 21 23:00:28 2006 @@ -199,8 +199,8 @@ /* ProcessDeviceMap */ IQS ( - RTL_FIELD_SIZE(PROCESS_DEVICEMAP_INFORMATION, Query), - RTL_FIELD_SIZE(PROCESS_DEVICEMAP_INFORMATION, Set), + ((PROCESS_DEVICEMAP_INFORMATION*)0)->Query, + ((PROCESS_DEVICEMAP_INFORMATION*)0)->Set, ULONG, ULONG, ICIF_QUERY | ICIF_SET

18 years, 5 months

[winesync] 23211: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

Author: winesync Date: Fri Jul 21 17:07:57 2006 New Revision: 23211 URL: http://svn.reactos.org/svn/reactos?rev=23211&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/uxtheme/draw.c trunk/reactos/dll/win32/uxtheme/main.c trunk/reactos/dll/win32/uxtheme/metric.c trunk/reactos/dll/win32/uxtheme/msstyles.c trunk/reactos/dll/win32/uxtheme/msstyles.h trunk/reactos/dll/win32/uxtheme/property.c trunk/reactos/dll/win32/uxtheme/stylemap.c trunk/reactos/dll/win32/uxtheme/system.c trunk/reactos/dll/win32/uxtheme/uxini.c trunk/reactos/dll/win32/uxtheme/uxthemedll.h trunk/reactos/dll/win32/uxtheme/version.rc Modified: trunk/reactos/dll/win32/uxtheme/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/draw.c?r… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/draw.c (original) +++ trunk/reactos/dll/win32/uxtheme/draw.c Fri Jul 21 17:07:57 2006 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include "config.h" Modified: trunk/reactos/dll/win32/uxtheme/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/main.c (original) +++ trunk/reactos/dll/win32/uxtheme/main.c Fri Jul 21 17:07:57 2006 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include "config.h" Modified: trunk/reactos/dll/win32/uxtheme/metric.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/metric.c… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/metric.c (original) +++ trunk/reactos/dll/win32/uxtheme/metric.c Fri Jul 21 17:07:57 2006 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include "config.h" @@ -151,8 +151,8 @@ TRACE("(%p, %d)\n", hTheme, iIntID); if(!hTheme) return E_HANDLE; - if(iIntID <= TMT_FIRSTINT || iIntID >= TMT_LASTINT) { - TRACE("Unknown IntID: %d\n", iIntID); + if(iIntID < TMT_FIRSTINT || iIntID > TMT_LASTINT) { + WARN("Unknown IntID: %d\n", iIntID); return STG_E_INVALIDPARAMETER; } if((tp = MSSTYLES_FindMetric(TMT_INT, iIntID))) @@ -215,8 +215,8 @@ TRACE("(%p, %d)\n", hTheme, iStringID); if(!hTheme) return E_HANDLE; - if(iStringID <= TMT_FIRSTSTRING || iStringID >= TMT_LASTSTRING) { - TRACE("Unknown StringID: %d\n", iStringID); + if(iStringID < TMT_FIRSTSTRING || iStringID > TMT_LASTSTRING) { + WARN("Unknown StringID: %d\n", iStringID); return STG_E_INVALIDPARAMETER; } if((tp = MSSTYLES_FindMetric(TMT_STRING, iStringID))) Modified: trunk/reactos/dll/win32/uxtheme/msstyles.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/msstyles… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/msstyles.c (original) +++ trunk/reactos/dll/win32/uxtheme/msstyles.c Fri Jul 21 17:07:57 2006 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include "config.h" Modified: trunk/reactos/dll/win32/uxtheme/msstyles.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/msstyles… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/msstyles.h (original) +++ trunk/reactos/dll/win32/uxtheme/msstyles.h Fri Jul 21 17:07:57 2006 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef __WINE_MSSTYLES_H Modified: trunk/reactos/dll/win32/uxtheme/property.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/property… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/property.c (original) +++ trunk/reactos/dll/win32/uxtheme/property.c Fri Jul 21 17:07:57 2006 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include "config.h" Modified: trunk/reactos/dll/win32/uxtheme/stylemap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/stylemap… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/stylemap.c (original) +++ trunk/reactos/dll/win32/uxtheme/stylemap.c Fri Jul 21 17:07:57 2006 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include "config.h" Modified: trunk/reactos/dll/win32/uxtheme/system.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/system.c… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/system.c (original) +++ trunk/reactos/dll/win32/uxtheme/system.c Fri Jul 21 17:07:57 2006 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include "config.h" Modified: trunk/reactos/dll/win32/uxtheme/uxini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/uxini.c?… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/uxini.c (original) +++ trunk/reactos/dll/win32/uxtheme/uxini.c Fri Jul 21 17:07:57 2006 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include "config.h" Modified: trunk/reactos/dll/win32/uxtheme/uxthemedll.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/uxthemed… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/uxthemedll.h (original) +++ trunk/reactos/dll/win32/uxtheme/uxthemedll.h Fri Jul 21 17:07:57 2006 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef __WINE_UXTHEMEDLL_H Modified: trunk/reactos/dll/win32/uxtheme/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/version.… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/version.rc (original) +++ trunk/reactos/dll/win32/uxtheme/version.rc Fri Jul 21 17:07:57 2006 @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #define WINE_FILENAME_STR "uxtheme.dll"

18 years, 5 months

← Newer
1
...
16
17
18
19
20
21
22
...
67
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2006