Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 25248: Comment out a call to GdiReleaseDC() since it spams debug log with unimplemented messages. I put up a FIXME so it gets uncommented once GdiReleaseDC() is implemented.
by fireball＠svn.reactos.org 30 Dec '06

30 Dec '06

Author: fireball Date: Sat Dec 30 14:04:20 2006 New Revision: 25248 URL: http://svn.reactos.org/svn/reactos?rev=25248&view=rev Log: Comment out a call to GdiReleaseDC() since it spams debug log with unimplemented messages. I put up a FIXME so it gets uncommented once GdiReleaseDC() is implemented. Modified: trunk/reactos/dll/win32/user32/windows/dc.c Modified: trunk/reactos/dll/win32/user32/windows/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/dc.c (original) +++ trunk/reactos/dll/win32/user32/windows/dc.c Sat Dec 30 14:04:20 2006 @@ -87,8 +87,9 @@ // if the DC was released return one. if (!hDC) return FALSE; // Null hDC return zero. - - GdiReleaseDC ( hDC ); // Release locals. + + // FIXME: Uncomment once GdiReleaseDC() is implemented + //GdiReleaseDC ( hDC ); // Release locals. // Win 3.1 throw back, hWnd should be ignored and not used. // Replace with NtUserCallOneParam ((DWORD) hDC, ONEPARAM_ROUTINE_RELEASEDC); return NtUserReleaseDC(hWnd, hDC);

1 0

[mbosma] 25247: Different folders for translations and other resources.
by mbosma＠svn.reactos.org 30 Dec '06

30 Dec '06

Author: mbosma Date: Sat Dec 30 13:11:58 2006 New Revision: 25247 URL: http://svn.reactos.org/svn/reactos?rev=25247&view=rev Log: Different folders for translations and other resources. Added: trunk/reactos/base/applications/downloader/translations/ trunk/reactos/base/applications/downloader/translations/de.rc - copied unchanged from r25233, trunk/reactos/base/applications/downloader/resources/de.rc trunk/reactos/base/applications/downloader/translations/en.rc - copied unchanged from r25233, trunk/reactos/base/applications/downloader/resources/en.rc Removed: trunk/reactos/base/applications/downloader/resources/de.rc trunk/reactos/base/applications/downloader/resources/en.rc Modified: trunk/reactos/base/applications/downloader/downloader.rc Modified: trunk/reactos/base/applications/downloader/downloader.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/downloader.rc (original) +++ trunk/reactos/base/applications/downloader/downloader.rc Sat Dec 30 13:11:58 2006 @@ -8,9 +8,5 @@ #include <reactos/version.rc> #include "resources/generic.rc" -#include "resources/en.rc" -#include "resources/de.rc" - - - - +#include "translations/en.rc" +#include "translations/de.rc" Removed: trunk/reactos/base/applications/downloader/resources/de.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/resources/de.rc (original) +++ trunk/reactos/base/applications/downloader/resources/de.rc (removed) @@ -1,32 +1,0 @@ -LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT - -IDD_DOWNLOAD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 -STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Download..." -FONT 8, "MS Shell Dlg" -{ - CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 - LTEXT "", IDC_STATUS, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Cancel", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP -} - -STRINGTABLE DISCARDABLE -BEGIN - IDS_WINDOW_TITLE "Download ! - ReactOS Downloader" - IDS_WELCOME_TITLE "Willkommen im ReactOS Downloader" - IDS_WELCOME "Bitte wählen Sie rechts eine Kategorie. Dies ist Version 1.0." - IDS_NO_APP_TITLE "Keine Anwendung ausgewählt" - IDS_NO_APP "Bitte wählen Sie eine Anwendung, bevor Sie die Download-Schaltfläche betätigen. Wenn Sie Hilfe benötigen, drücken Sie die Hilfe-Schaltfläche in der oberen rechten Ecke." - IDS_UPDATE_TITLE "Update" - IDS_UPDATE "Diese Funktion wurde noch nicht implementiert." - IDS_HELP_TITLE "Hilfe" - IDS_HELP "Wählen Sie rechts eine Kategorie, wählen Sie eine Anwendung und drücken Sie die Download-Schaltfläche. Um die Anwendungsinformationen zu aktualisieren, drücken Sie die Schaltfläche neben der Hilfe-Schaltfläche." - IDS_NO_APPS "In dieser Kategorie sind bisher noch keine Anwendungen. Sie können helfen, indem Sie Anwendungen hinzufügen." - IDS_CHOOSE_APP "Bitte wählen Sie eine Anwendung." - IDS_CHOOSE_SUB "Bitte wählen Sie eine Unterkategorie." - IDS_CHOOSE_CATEGORY "Bitte wählen Sie eine Kategorie." - IDS_CHOOSE_BOTH "Bitte wählen Sie eine Unterkategorie oder eine Anwendung." - IDS_XMLERROR_1 "XML Datei nicht gefunden!" - IDS_XMLERROR_2 "XML Datei kann nicht verarbeitet werden!" - IDS_DOWNLOAD_ERROR "Die Datei konnte nicht runtergeladen werden.\nBitte prüfen sie, ob eine Verbindung zum Internet besteht." -END Removed: trunk/reactos/base/applications/downloader/resources/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/resources/en.rc (original) +++ trunk/reactos/base/applications/downloader/resources/en.rc (removed) @@ -1,32 +1,0 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT - -IDD_DOWNLOAD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 -STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Download..." -FONT 8, "MS Shell Dlg" -{ - CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 - LTEXT "", IDC_STATUS, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Cancel", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP -} - -STRINGTABLE DISCARDABLE -BEGIN - IDS_WINDOW_TITLE "Download ! - ReactOS Downloader" - IDS_WELCOME_TITLE "Welcome to the ReactOS Downloader" - IDS_WELCOME "Please choose a category on the right. This is version 1.0." - IDS_NO_APP_TITLE "No application selected" - IDS_NO_APP "Please select a Application before you click the download button, if you need assistance please click on the question mark button on the top right corner." - IDS_UPDATE_TITLE "Update" - IDS_UPDATE "Sorry this feature is not implemented yet." - IDS_HELP_TITLE "Help" - IDS_HELP "Choose a category on the right, then choose a application and click the download button. To update the application information click the button next to the help button." - IDS_NO_APPS "Sorry, there no applications in this category yet. You can help and add more applications." - IDS_CHOOSE_APP "Please choose an application." - IDS_CHOOSE_SUB "Please choose a subcategory." - IDS_CHOOSE_CATEGORY "Please choose a category." - IDS_CHOOSE_BOTH "Please choose a subcategory or an application." - IDS_XMLERROR_1 "Could not find the xml file !" - IDS_XMLERROR_2 "Could not parse the xml file !" - IDS_DOWNLOAD_ERROR "Unable to download the file.\nPlease check you internet connection." -END

1 0

[greatlrd] 25246: do not use hacked vfat drv revers the 25243 the hacked do not delete pendling or incomplte data and so on,
by greatlrd＠svn.reactos.org 30 Dec '06

30 Dec '06

Author: greatlrd Date: Sat Dec 30 04:11:14 2006 New Revision: 25246 URL: http://svn.reactos.org/svn/reactos?rev=25246&view=rev Log: do not use hacked vfat drv revers the 25243 the hacked do not delete pendling or incomplte data and so on, Modified: trunk/reactos/drivers/filesystems/vfat/cleanup.c trunk/reactos/drivers/filesystems/vfat/close.c trunk/reactos/drivers/filesystems/vfat/create.c Modified: trunk/reactos/drivers/filesystems/vfat/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/vfat/c… ============================================================================== --- trunk/reactos/drivers/filesystems/vfat/cleanup.c (original) +++ trunk/reactos/drivers/filesystems/vfat/cleanup.c Sat Dec 30 04:11:14 2006 @@ -29,50 +29,24 @@ pFcb = (PVFATFCB) FileObject->FsContext; if (pFcb) { - if (pFcb->Flags & FCB_IS_VOLUME) - { - pFcb->OpenHandleCount--; + if (!(*pFcb->Attributes & FILE_ATTRIBUTE_DIRECTORY) && + FsRtlAreThereCurrentFileLocks(&pFcb->FileLock)) + { + /* remove all locks this process have on this file */ + FsRtlFastUnlockAll(&pFcb->FileLock, + FileObject, + IoGetRequestorProcess(IrpContext->Irp), + NULL); + } - if (pFcb->OpenHandleCount != 0) - { - IoRemoveShareAccess(FileObject, &pFcb->FCBShareAccess); - } - } - else - { - if(!ExAcquireResourceExclusiveLite (&pFcb->MainResource, - (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT))) - { - return STATUS_PENDING; - } - if(!ExAcquireResourceExclusiveLite (&pFcb->PagingIoResource, - (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT))) - { - ExReleaseResourceLite (&pFcb->MainResource); - return STATUS_PENDING; - } - - pFcb->OpenHandleCount--; + if (pFcb->Flags & FCB_IS_DIRTY) + { + VfatUpdateEntry (pFcb); + } - if (!(*pFcb->Attributes & FILE_ATTRIBUTE_DIRECTORY) && - FsRtlAreThereCurrentFileLocks(&pFcb->FileLock)) - { - /* remove all locks this process have on this file */ - FsRtlFastUnlockAll(&pFcb->FileLock, - FileObject, - IoGetRequestorProcess(IrpContext->Irp), - NULL); - } - - if (pFcb->Flags & FCB_IS_DIRTY) - { - VfatUpdateEntry (pFcb); - } - - if (pFcb->Flags & FCB_DELETE_PENDING && - pFcb->OpenHandleCount == 0) - { - DPRINT("'%wZ'\n", &pFcb->PathNameU); + if (pFcb->Flags & FCB_DELETE_PENDING && + pFcb->OpenHandleCount == 1) + { PFILE_OBJECT tmpFileObject; tmpFileObject = pFcb->FileObject; if (tmpFileObject != NULL) @@ -97,21 +71,10 @@ #ifdef USE_ROS_CC_AND_FS CcRosReleaseFileCache (FileObject); #else - if (FileObject->SectionObjectPointer->SharedCacheMap) - { - CcUninitializeCacheMap (FileObject, &pFcb->RFCB.FileSize, NULL); - } + CcUninitializeCacheMap (FileObject, NULL, NULL); #endif - if (pFcb->OpenHandleCount != 0) - { - IoRemoveShareAccess(FileObject, &pFcb->FCBShareAccess); - } - - FileObject->Flags |= FO_CLEANUP_COMPLETE; - - ExReleaseResourceLite (&pFcb->PagingIoResource); - ExReleaseResourceLite (&pFcb->MainResource); - } + pFcb->OpenHandleCount--; + IoRemoveShareAccess(FileObject, &pFcb->FCBShareAccess); } return STATUS_SUCCESS; } @@ -141,11 +104,6 @@ ExReleaseResourceLite (&IrpContext->DeviceExt->DirResource); - if (Status == STATUS_PENDING) - { - return VfatQueueRequest(IrpContext); - } - ByeBye: IrpContext->Irp->IoStatus.Status = Status; IrpContext->Irp->IoStatus.Information = 0; Modified: trunk/reactos/drivers/filesystems/vfat/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/vfat/c… ============================================================================== --- trunk/reactos/drivers/filesystems/vfat/close.c (original) +++ trunk/reactos/drivers/filesystems/vfat/close.c Sat Dec 30 04:11:14 2006 @@ -30,8 +30,6 @@ pCcb = (PVFATCCB) (FileObject->FsContext2); pFcb = (PVFATFCB) (FileObject->FsContext); - FileObject->FsContext2 = NULL; - if (pFcb == NULL) { return STATUS_SUCCESS; @@ -45,7 +43,7 @@ } else { -// if (FileObject->DeletePending) + if (FileObject->DeletePending) { if (pFcb->Flags & FCB_DELETE_PENDING) { @@ -59,6 +57,7 @@ vfatReleaseFCB (DeviceExt, pFcb); } + FileObject->FsContext2 = NULL; FileObject->FsContext = NULL; FileObject->SectionObjectPointer = NULL; Modified: trunk/reactos/drivers/filesystems/vfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/vfat/c… ============================================================================== --- trunk/reactos/drivers/filesystems/vfat/create.c (original) +++ trunk/reactos/drivers/filesystems/vfat/create.c Sat Dec 30 04:11:14 2006 @@ -656,24 +656,7 @@ VfatCloseFile (DeviceExt, FileObject); return(STATUS_NOT_A_DIRECTORY); } -#ifndef USE_ROS_CC_AND_FS - if (!(*pFcb->Attributes & FILE_ATTRIBUTE_DIRECTORY)) - { - if (Stack->Parameters.Create.SecurityContext->DesiredAccess & FILE_WRITE_DATA || - RequestedDisposition == FILE_OVERWRITE || - RequestedDisposition == FILE_OVERWRITE_IF) - { - if (!MmFlushImageSection(&pFcb->SectionObjectPointers, MmFlushForWrite)) - { - DPRINT1("%wZ\n", &pFcb->PathNameU); - DPRINT1("%d %d %d\n", Stack->Parameters.Create.SecurityContext->DesiredAccess & FILE_WRITE_DATA, - RequestedDisposition == FILE_OVERWRITE, RequestedDisposition == FILE_OVERWRITE_IF); - VfatCloseFile (DeviceExt, FileObject); - return STATUS_SHARING_VIOLATION; - } - } - } -#endif + if (PagingFileCreate) { /* FIXME:

1 0

[mbosma] 25245: spelling
by mbosma＠svn.reactos.org 30 Dec '06

30 Dec '06

Author: mbosma Date: Sat Dec 30 03:47:03 2006 New Revision: 25245 URL: http://svn.reactos.org/svn/reactos?rev=25245&view=rev Log: spelling Modified: branches/cache_manager_rewrite/Instructions.txt Modified: branches/cache_manager_rewrite/Instructions.txt URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/Instructi… ============================================================================== --- branches/cache_manager_rewrite/Instructions.txt (original) +++ branches/cache_manager_rewrite/Instructions.txt Sat Dec 30 03:47:03 2006 @@ -1,1 +1,2 @@ -To build this branch apply the patch to trunk. And replace ntoskrnl/mm, ntoskrnl/cc with the folders from here. Please note that the chances are very likly to be outdated. +To build this branch apply the patch to trunk. And replace ntoskrnl/mm, ntoskrnl/cc with the folders from here. +Please note that the version are very likely to be outdated you might want to use svn merge to keep them up to date.

1 0

[mbosma] 25244: remove vfat, changes are in trunk now.
by mbosma＠svn.reactos.org 30 Dec '06

30 Dec '06

Author: mbosma Date: Sat Dec 30 03:43:33 2006 New Revision: 25244 URL: http://svn.reactos.org/svn/reactos?rev=25244&view=rev Log: remove vfat, changes are in trunk now. Removed: branches/cache_manager_rewrite/vfat/ Modified: branches/cache_manager_rewrite/Instructions.txt branches/cache_manager_rewrite/headers.patch Modified: branches/cache_manager_rewrite/Instructions.txt URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/Instructi… ============================================================================== --- branches/cache_manager_rewrite/Instructions.txt (original) +++ branches/cache_manager_rewrite/Instructions.txt Sat Dec 30 03:43:33 2006 @@ -1,1 +1,1 @@ -To build this branch apply the patch to trunk. And replace ntoskrnl/mm, ntoskrnl/cc and drivers/filesystems/vfat with the folders from here. +To build this branch apply the patch to trunk. And replace ntoskrnl/mm, ntoskrnl/cc with the folders from here. Please note that the chances are very likly to be outdated. Modified: branches/cache_manager_rewrite/headers.patch URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/headers.p… ============================================================================== --- branches/cache_manager_rewrite/headers.patch (original) +++ branches/cache_manager_rewrite/headers.patch Sat Dec 30 03:43:33 2006 @@ -23,7 +23,20 @@ +//#define USE_ROS_CC_AND_FS - #define CACHEPAGESIZE(pDeviceExt) \ + #define CACHEPAGESIZE(pDeviceExt) \ +Index: drivers/filesystems/vfat/vfat.h +=================================================================== +--- drivers/filesystems/vfat/vfat.h (revision 25241) ++++ drivers/filesystems/vfat/vfat.h (working copy) +@@ -6,7 +6,7 @@ + #ifdef __GNUC__ + #include <ccros.h> + +-#define USE_ROS_CC_AND_FS ++//#define USE_ROS_CC_AND_FS + #else + #define KEBUGCHECK KeBugCheck + #define KEBUGCHECKEX KeBugCheckEx Index: include/reactos/exeformat.h =================================================================== --- include/reactos/exeformat.h (revision 22988)

1 0

[mbosma] 25243: Add changes from cc rewrite brunch. The driver still works under the old cc because it makes use of the USE_ROS_CC_AND_FS define.
by mbosma＠svn.reactos.org 30 Dec '06

30 Dec '06

Author: mbosma Date: Sat Dec 30 03:37:52 2006 New Revision: 25243 URL: http://svn.reactos.org/svn/reactos?rev=25243&view=rev Log: Add changes from cc rewrite brunch. The driver still works under the old cc because it makes use of the USE_ROS_CC_AND_FS define. Modified: trunk/reactos/drivers/filesystems/vfat/cleanup.c trunk/reactos/drivers/filesystems/vfat/close.c trunk/reactos/drivers/filesystems/vfat/create.c Modified: trunk/reactos/drivers/filesystems/vfat/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/vfat/c… ============================================================================== --- trunk/reactos/drivers/filesystems/vfat/cleanup.c (original) +++ trunk/reactos/drivers/filesystems/vfat/cleanup.c Sat Dec 30 03:37:52 2006 @@ -29,24 +29,50 @@ pFcb = (PVFATFCB) FileObject->FsContext; if (pFcb) { - if (!(*pFcb->Attributes & FILE_ATTRIBUTE_DIRECTORY) && - FsRtlAreThereCurrentFileLocks(&pFcb->FileLock)) - { - /* remove all locks this process have on this file */ - FsRtlFastUnlockAll(&pFcb->FileLock, - FileObject, - IoGetRequestorProcess(IrpContext->Irp), - NULL); - } + if (pFcb->Flags & FCB_IS_VOLUME) + { + pFcb->OpenHandleCount--; - if (pFcb->Flags & FCB_IS_DIRTY) - { - VfatUpdateEntry (pFcb); - } + if (pFcb->OpenHandleCount != 0) + { + IoRemoveShareAccess(FileObject, &pFcb->FCBShareAccess); + } + } + else + { + if(!ExAcquireResourceExclusiveLite (&pFcb->MainResource, + (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT))) + { + return STATUS_PENDING; + } + if(!ExAcquireResourceExclusiveLite (&pFcb->PagingIoResource, + (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT))) + { + ExReleaseResourceLite (&pFcb->MainResource); + return STATUS_PENDING; + } + + pFcb->OpenHandleCount--; - if (pFcb->Flags & FCB_DELETE_PENDING && - pFcb->OpenHandleCount == 1) - { + if (!(*pFcb->Attributes & FILE_ATTRIBUTE_DIRECTORY) && + FsRtlAreThereCurrentFileLocks(&pFcb->FileLock)) + { + /* remove all locks this process have on this file */ + FsRtlFastUnlockAll(&pFcb->FileLock, + FileObject, + IoGetRequestorProcess(IrpContext->Irp), + NULL); + } + + if (pFcb->Flags & FCB_IS_DIRTY) + { + VfatUpdateEntry (pFcb); + } + + if (pFcb->Flags & FCB_DELETE_PENDING && + pFcb->OpenHandleCount == 0) + { + DPRINT("'%wZ'\n", &pFcb->PathNameU); PFILE_OBJECT tmpFileObject; tmpFileObject = pFcb->FileObject; if (tmpFileObject != NULL) @@ -71,10 +97,21 @@ #ifdef USE_ROS_CC_AND_FS CcRosReleaseFileCache (FileObject); #else - CcUninitializeCacheMap (FileObject, NULL, NULL); + if (FileObject->SectionObjectPointer->SharedCacheMap) + { + CcUninitializeCacheMap (FileObject, &pFcb->RFCB.FileSize, NULL); + } #endif - pFcb->OpenHandleCount--; - IoRemoveShareAccess(FileObject, &pFcb->FCBShareAccess); + if (pFcb->OpenHandleCount != 0) + { + IoRemoveShareAccess(FileObject, &pFcb->FCBShareAccess); + } + + FileObject->Flags |= FO_CLEANUP_COMPLETE; + + ExReleaseResourceLite (&pFcb->PagingIoResource); + ExReleaseResourceLite (&pFcb->MainResource); + } } return STATUS_SUCCESS; } @@ -104,6 +141,11 @@ ExReleaseResourceLite (&IrpContext->DeviceExt->DirResource); + if (Status == STATUS_PENDING) + { + return VfatQueueRequest(IrpContext); + } + ByeBye: IrpContext->Irp->IoStatus.Status = Status; IrpContext->Irp->IoStatus.Information = 0; Modified: trunk/reactos/drivers/filesystems/vfat/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/vfat/c… ============================================================================== --- trunk/reactos/drivers/filesystems/vfat/close.c (original) +++ trunk/reactos/drivers/filesystems/vfat/close.c Sat Dec 30 03:37:52 2006 @@ -30,6 +30,8 @@ pCcb = (PVFATCCB) (FileObject->FsContext2); pFcb = (PVFATFCB) (FileObject->FsContext); + FileObject->FsContext2 = NULL; + if (pFcb == NULL) { return STATUS_SUCCESS; @@ -43,7 +45,7 @@ } else { - if (FileObject->DeletePending) +// if (FileObject->DeletePending) { if (pFcb->Flags & FCB_DELETE_PENDING) { @@ -57,7 +59,6 @@ vfatReleaseFCB (DeviceExt, pFcb); } - FileObject->FsContext2 = NULL; FileObject->FsContext = NULL; FileObject->SectionObjectPointer = NULL; Modified: trunk/reactos/drivers/filesystems/vfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/vfat/c… ============================================================================== --- trunk/reactos/drivers/filesystems/vfat/create.c (original) +++ trunk/reactos/drivers/filesystems/vfat/create.c Sat Dec 30 03:37:52 2006 @@ -656,7 +656,24 @@ VfatCloseFile (DeviceExt, FileObject); return(STATUS_NOT_A_DIRECTORY); } - +#ifndef USE_ROS_CC_AND_FS + if (!(*pFcb->Attributes & FILE_ATTRIBUTE_DIRECTORY)) + { + if (Stack->Parameters.Create.SecurityContext->DesiredAccess & FILE_WRITE_DATA || + RequestedDisposition == FILE_OVERWRITE || + RequestedDisposition == FILE_OVERWRITE_IF) + { + if (!MmFlushImageSection(&pFcb->SectionObjectPointers, MmFlushForWrite)) + { + DPRINT1("%wZ\n", &pFcb->PathNameU); + DPRINT1("%d %d %d\n", Stack->Parameters.Create.SecurityContext->DesiredAccess & FILE_WRITE_DATA, + RequestedDisposition == FILE_OVERWRITE, RequestedDisposition == FILE_OVERWRITE_IF); + VfatCloseFile (DeviceExt, FileObject); + return STATUS_SHARING_VIOLATION; + } + } + } +#endif if (PagingFileCreate) { /* FIXME:

1 0

[mbosma] 25242: Add downloader to start menu.
by mbosma＠svn.reactos.org 30 Dec '06

30 Dec '06

Author: mbosma Date: Sat Dec 30 03:18:00 2006 New Revision: 25242 URL: http://svn.reactos.org/svn/reactos?rev=25242&view=rev Log: Add downloader to start menu. Modified: trunk/reactos/dll/win32/syssetup/install.c trunk/reactos/dll/win32/syssetup/resource.h trunk/reactos/dll/win32/syssetup/syssetup_En.rc Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c (original) +++ trunk/reactos/dll/win32/syssetup/install.c Sat Dec 30 03:18:00 2006 @@ -531,6 +531,7 @@ CreateShortcut(CSIDL_PROGRAMS, NULL, _T("winefile.lnk"), _T("winefile.exe"), IDS_CMT_WINEFILE); CreateShortcut(CSIDL_PROGRAMS, NULL, _T("ibrowser.lnk"), _T("ibrowser.exe"), IDS_CMT_IBROWSER); CreateShortcut(CSIDL_PROGRAMS, NULL, _T("Get Firefox.lnk"), _T("getfirefox.exe"), IDS_CMT_GETFIREFOX); + CreateShortcut(CSIDL_PROGRAMS, NULL, _T("Download !.lnk"), _T("downloader.exe"), IDS_CMT_DOWNLOADER); /* create administritive tools startmenu shortcuts */ CreateShortcut(CSIDL_ADMINTOOLS, NULL, _T("Services.lnk"), _T("servman.exe"), IDS_CMT_SERVMAN); Modified: trunk/reactos/dll/win32/syssetup/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/resourc… ============================================================================== --- trunk/reactos/dll/win32/syssetup/resource.h (original) +++ trunk/reactos/dll/win32/syssetup/resource.h Sat Dec 30 03:18:00 2006 @@ -100,6 +100,7 @@ #define IDS_CMT_SERVMAN 3220 #define IDS_CMT_WORDPAD 3221 #define IDS_CMT_SCREENSHOT 3222 +#define IDS_CMT_DOWNLOADER 3223 #define IDS_REACTOS_SETUP 3300 #define IDS_UNKNOWN_ERROR 3301 Modified: trunk/reactos/dll/win32/syssetup/syssetup_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/syssetup_En.rc (original) +++ trunk/reactos/dll/win32/syssetup/syssetup_En.rc Sat Dec 30 03:18:00 2006 @@ -185,6 +185,7 @@ IDS_CMT_WINEFILE "Launch Winefile" IDS_CMT_IBROWSER "Launch iBrowser" IDS_CMT_GETFIREFOX "Download/install Firefox" + IDS_CMT_DOWNLOADER "Download and install various applications" END STRINGTABLE

1 0

[fireball] 25241: - Comment out the performance counting ("hits: xxx misses: yyy") part for the freetype lib.
by fireball＠svn.reactos.org 29 Dec '06

29 Dec '06

Author: fireball Date: Sat Dec 30 01:24:43 2006 New Revision: 25241 URL: http://svn.reactos.org/svn/reactos?rev=25241&view=rev Log: - Comment out the performance counting ("hits: xxx misses: yyy") part for the freetype lib. Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c Sat Dec 30 01:24:43 2006 @@ -1478,11 +1478,13 @@ if (CurrentEntry == &FontCacheListHead) { // DbgPrint("Miss! %x\n", FontEntry->Glyph); +/* Misses++; if (Misses>100) { DbgPrint ("Hits: %d Misses: %d\n", Hits, Misses); Hits = Misses = 0; } +*/ return NULL; } @@ -1490,11 +1492,14 @@ InsertHeadList(&FontCacheListHead, CurrentEntry); // DbgPrint("Hit! %x\n", FontEntry->Glyph); +/* Hits++; + if (Hits>100) { DbgPrint ("Hits: %d Misses: %d\n", Hits, Misses); Hits = Misses = 0; } +*/ return FontEntry->Glyph; }

1 0

[ion] 25240: - Fix OB_SECURITY_METHOD prototype, callers, and implementors. - Add call to SeOpenObjectAuditAlarm in ObCheckObjectAccess. - Start adding Ob Callout validation on checked builds. For now only done around security functions. - Set *MemoryAllocated to FALSE in ObGetObjectSecurity early on to avoid inconcistent state if the callback failed. - Implement new XP function ObSetSecurityObjectByPointer and simplify NtSetSecurityObject by making it use it. - More Win 2003 SecurityDescriptor
by ion＠svn.reactos.org 29 Dec '06

29 Dec '06

Author: ion Date: Sat Dec 30 01:17:29 2006 New Revision: 25240 URL: http://svn.reactos.org/svn/reactos?rev=25240&view=rev Log: - Fix OB_SECURITY_METHOD prototype, callers, and implementors. - Add call to SeOpenObjectAuditAlarm in ObCheckObjectAccess. - Start adding Ob Callout validation on checked builds. For now only done around security functions. - Set *MemoryAllocated to FALSE in ObGetObjectSecurity early on to avoid inconcistent state if the callback failed. - Implement new XP function ObSetSecurityObjectByPointer and simplify NtSetSecurityObject by making it use it. - More Win 2003 SecurityDescriptor Cache functions to sdcache instead of obsecure.c. Modified: trunk/reactos/include/ndk/obtypes.h trunk/reactos/ntoskrnl/cm/cm.h trunk/reactos/ntoskrnl/cm/regobj.c trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/include/internal/ob_x.h trunk/reactos/ntoskrnl/include/internal/se.h trunk/reactos/ntoskrnl/include/internal/tag.h trunk/reactos/ntoskrnl/io/iomgr/file.c trunk/reactos/ntoskrnl/ob/obsecure.c trunk/reactos/ntoskrnl/ob/sdcache.c trunk/reactos/ntoskrnl/se/audit.c trunk/reactos/ntoskrnl/se/semgr.c Modified: trunk/reactos/include/ndk/obtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/obtypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/obtypes.h (original) +++ trunk/reactos/include/ndk/obtypes.h Sat Dec 30 01:17:29 2006 @@ -215,7 +215,7 @@ (NTAPI *OB_SECURITY_METHOD)( IN PVOID Object, IN SECURITY_OPERATION_CODE OperationType, - IN SECURITY_INFORMATION SecurityInformation, // FIXME: <= should be a pointer + IN PSECURITY_INFORMATION SecurityInformation, IN PSECURITY_DESCRIPTOR SecurityDescriptor, IN OUT PULONG CapturedLength, IN OUT PSECURITY_DESCRIPTOR *ObjectSecurityDescriptor, Modified: trunk/reactos/ntoskrnl/cm/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/cm.h?rev=25240… ============================================================================== --- trunk/reactos/ntoskrnl/cm/cm.h (original) +++ trunk/reactos/ntoskrnl/cm/cm.h Sat Dec 30 01:17:29 2006 @@ -165,7 +165,7 @@ NTSTATUS STDCALL CmiObjectSecurity(PVOID ObjectBody, SECURITY_OPERATION_CODE OperationCode, - SECURITY_INFORMATION SecurityInformation, + PSECURITY_INFORMATION SecurityInformation, PSECURITY_DESCRIPTOR SecurityDescriptor, PULONG BufferLength, PSECURITY_DESCRIPTOR *OldSecurityDescriptor, Modified: trunk/reactos/ntoskrnl/cm/regobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regobj.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regobj.c (original) +++ trunk/reactos/ntoskrnl/cm/regobj.c Sat Dec 30 01:17:29 2006 @@ -669,7 +669,7 @@ NTSTATUS STDCALL CmiObjectSecurity(PVOID ObjectBody, SECURITY_OPERATION_CODE OperationCode, - SECURITY_INFORMATION SecurityInformation, + PSECURITY_INFORMATION SecurityInformation, PSECURITY_DESCRIPTOR SecurityDescriptor, PULONG BufferLength, PSECURITY_DESCRIPTOR *OldSecurityDescriptor, @@ -687,7 +687,7 @@ case QuerySecurityDescriptor: DPRINT("Query security descriptor\n"); return CmiQuerySecurityDescriptor((PKEY_OBJECT)ObjectBody, - SecurityInformation, + *SecurityInformation, SecurityDescriptor, BufferLength); Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h Sat Dec 30 01:17:29 2006 @@ -898,7 +898,7 @@ IopSecurityFile( IN PVOID ObjectBody, IN SECURITY_OPERATION_CODE OperationCode, - IN SECURITY_INFORMATION SecurityInformation, + IN PSECURITY_INFORMATION SecurityInformation, IN OUT PSECURITY_DESCRIPTOR SecurityDescriptor, IN OUT PULONG BufferLength, OUT PSECURITY_DESCRIPTOR *OldSecurityDescriptor, Modified: trunk/reactos/ntoskrnl/include/internal/ob_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob_x.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ob_x.h Sat Dec 30 01:17:29 2006 @@ -5,6 +5,53 @@ * PURPOSE: Intenral Inlined Functions for the Object Manager * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ + +#if DBG +VOID +FORCEINLINE +ObpCalloutStart(IN PKIRQL CalloutIrql) +{ + /* Save the callout IRQL */ + *CalloutIrql = KeGetCurrentIrql(); +} + +VOID +FORCEINLINE +ObpCalloutEnd(IN KIRQL CalloutIrql, + IN PCHAR Procedure, + IN POBJECT_TYPE ObjectType, + IN PVOID Object) +{ + /* Detect IRQL change */ + if (CalloutIrql != KeGetCurrentIrql()) + { + /* Print error */ + DbgPrint("OB: ObjectType: %wZ Procedure: %s Object: %08x\n", + &ObjectType->Name, Procedure, Object); + DbgPrint(" Returned at %x IRQL, but was called at %x IRQL\n", + KeGetCurrentIrql(), CalloutIrql); + DbgBreakPoint(); + } +} +#else +VOID +FORCEINLINE +ObpCalloutStart(IN PKIRQL CalloutIrql) +{ + /* No-op */ + UNREFERENCED_PARAMETER(CalloutIrql); +} + +VOID +FORCEINLINE +ObpCalloutEnd(IN KIRQL CalloutIrql, + IN PCHAR Procedure, + IN POBJECT_TYPE ObjectType, + IN PVOID Object) +{ + UNREFERENCED_PARAMETER(CalloutIrql); +} +#endif VOID FORCEINLINE Modified: trunk/reactos/ntoskrnl/include/internal/se.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/se.h (original) +++ trunk/reactos/ntoskrnl/include/internal/se.h Sat Dec 30 01:17:29 2006 @@ -299,7 +299,7 @@ SeDefaultObjectMethod( PVOID Object, SECURITY_OPERATION_CODE OperationType, - SECURITY_INFORMATION SecurityInformation, + PSECURITY_INFORMATION SecurityInformation, PSECURITY_DESCRIPTOR NewSecurityDescriptor, PULONG ReturnLength, PSECURITY_DESCRIPTOR *OldSecurityDescriptor, Modified: trunk/reactos/ntoskrnl/include/internal/tag.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/tag.h (original) +++ trunk/reactos/ntoskrnl/include/internal/tag.h Sat Dec 30 01:17:29 2006 @@ -162,5 +162,6 @@ #define TAG_SEPA TAG('S', 'e', 'P', 'a') #define TAG_WAIT TAG('W', 'a', 'i', 't') +#define TAG_SEC_QUERY TAG('O', 'b', 'S', 'q') #endif /* _NTOSKRNL_TAG_H */ Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Sat Dec 30 01:17:29 2006 @@ -1055,7 +1055,7 @@ NTAPI IopSecurityFile(IN PVOID ObjectBody, IN SECURITY_OPERATION_CODE OperationCode, - IN SECURITY_INFORMATION SecurityInformation, + IN PSECURITY_INFORMATION SecurityInformation, IN PSECURITY_DESCRIPTOR SecurityDescriptor, IN OUT PULONG BufferLength, IN OUT PSECURITY_DESCRIPTOR *OldSecurityDescriptor, @@ -1183,7 +1183,7 @@ /* Set the major function and parameters */ StackPtr->MajorFunction = IRP_MJ_QUERY_SECURITY; StackPtr->Parameters.QuerySecurity.SecurityInformation = - SecurityInformation; + *SecurityInformation; StackPtr->Parameters.QuerySecurity.Length = *BufferLength; Irp->UserBuffer = SecurityDescriptor; } @@ -1192,7 +1192,7 @@ /* Set the major function and parameters for a set */ StackPtr->MajorFunction = IRP_MJ_SET_SECURITY; StackPtr->Parameters.SetSecurity.SecurityInformation = - SecurityInformation; + *SecurityInformation; StackPtr->Parameters.SetSecurity.SecurityDescriptor = SecurityDescriptor; } @@ -1246,7 +1246,7 @@ if (OperationCode == QuerySecurityDescriptor) { /* Set a World Security Descriptor */ - Status = SeSetWorldSecurityDescriptor(SecurityInformation, + Status = SeSetWorldSecurityDescriptor(*SecurityInformation, SecurityDescriptor, BufferLength); } Modified: trunk/reactos/ntoskrnl/ob/obsecure.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obsecure.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obsecure.c (original) +++ trunk/reactos/ntoskrnl/ob/obsecure.c Sat Dec 30 01:17:29 2006 @@ -12,8 +12,6 @@ #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> - -#define TAG_SEC_QUERY TAG('O', 'b', 'S', 'q') /* PRIVATE FUNCTIONS *********************************************************/ @@ -109,6 +107,17 @@ AccessState->PreviouslyGrantedAccess |= GrantedAccess; } + /* Do audit alarm */ + SeOpenObjectAuditAlarm(&ObjectType->Name, + Object, + NULL, + SecurityDescriptor, + AccessState, + FALSE, + Result, + AccessMode, + &AccessState->GenerateOnClose); + /* We're done, unlock the context and release security */ SeUnlockSubjectContext(&AccessState->SubjectSecurityContext); ObReleaseObjectSecurity(SecurityDescriptor, SdAllocated); @@ -149,6 +158,7 @@ { PSECURITY_DESCRIPTOR NewDescriptor; NTSTATUS Status; + KIRQL CalloutIrql; PAGED_CODE(); /* Build the new security descriptor */ @@ -162,19 +172,19 @@ if (!NT_SUCCESS(Status)) return Status; /* Call the security method */ + ObpCalloutStart(&CalloutIrql); Status = Type->TypeInfo.SecurityProcedure(Object, AssignSecurityDescriptor, - 0, + NULL, NewDescriptor, NULL, NULL, PagedPool, &Type->TypeInfo.GenericMapping); - if (!NT_SUCCESS(Status)) - { - /* Release the new security descriptor */ - SeDeassignSecurity(&NewDescriptor); - } + ObpCalloutEnd(CalloutIrql, "Security", Type, Object); + + /* Check for failure and deassign security if so */ + if (!NT_SUCCESS(Status)) SeDeassignSecurity(&NewDescriptor); /* Return to caller */ return Status; @@ -208,39 +218,47 @@ { POBJECT_HEADER Header; POBJECT_TYPE Type; - ULONG Length; + ULONG Length = 0; NTSTATUS Status; + SECURITY_INFORMATION SecurityInformation; + KIRQL CalloutIrql; PAGED_CODE(); /* Get the object header and type */ Header = OBJECT_TO_OBJECT_HEADER(Object); Type = Header->Type; + /* Tell the caller that we didn't have to allocate anything yet */ + *MemoryAllocated = FALSE; + /* Check if the object uses default security */ if (Type->TypeInfo.SecurityProcedure == SeDefaultObjectMethod) { /* Reference the descriptor */ *SecurityDescriptor = ObpReferenceCachedSecurityDescriptor(Header->SecurityDescriptor); - - /* Tell the caller that we didn't have to allocate anything */ - *MemoryAllocated = FALSE; return STATUS_SUCCESS; } + /* Set mask to query */ + SecurityInformation = OWNER_SECURITY_INFORMATION | + GROUP_SECURITY_INFORMATION | + DACL_SECURITY_INFORMATION | + SACL_SECURITY_INFORMATION; + /* Get the security descriptor size */ - Length = 0; + ObpCalloutStart(&CalloutIrql); Status = Type->TypeInfo.SecurityProcedure(Object, QuerySecurityDescriptor, - OWNER_SECURITY_INFORMATION | - GROUP_SECURITY_INFORMATION | - DACL_SECURITY_INFORMATION | - SACL_SECURITY_INFORMATION, + &SecurityInformation, *SecurityDescriptor, &Length, &Header->SecurityDescriptor, Type->TypeInfo.PoolType, &Type->TypeInfo.GenericMapping); + ObpCalloutEnd(CalloutIrql, "Security", Type, Object); + + /* Check for failure */ if (Status != STATUS_BUFFER_TOO_SMALL) return Status; /* Allocate security descriptor */ @@ -248,20 +266,21 @@ Length, TAG_SEC_QUERY); if (!(*SecurityDescriptor)) return STATUS_INSUFFICIENT_RESOURCES; + *MemoryAllocated = TRUE; /* Query security descriptor */ - *MemoryAllocated = TRUE; + ObpCalloutStart(&CalloutIrql); Status = Type->TypeInfo.SecurityProcedure(Object, QuerySecurityDescriptor, - OWNER_SECURITY_INFORMATION | - GROUP_SECURITY_INFORMATION | - DACL_SECURITY_INFORMATION | - SACL_SECURITY_INFORMATION, + &SecurityInformation, *SecurityDescriptor, &Length, &Header->SecurityDescriptor, Type->TypeInfo.PoolType, &Type->TypeInfo.GenericMapping); + ObpCalloutEnd(CalloutIrql, "Security", Type, Object); + + /* Check for failure */ if (!NT_SUCCESS(Status)) { /* Free the descriptor and tell the caller we failed */ @@ -311,6 +330,51 @@ /* Otherwise this means we used an internal descriptor */ ObpDereferenceCachedSecurityDescriptor(SecurityDescriptor); } +} + +/*++ +* @name ObSetSecurityObjectByPointer +* @implemented NT5.1 +* +* The ObSetSecurityObjectByPointer routine <FILLMEIN> +* +* @param SecurityDescriptor +* <FILLMEIN> +* +* @param MemoryAllocated +* <FILLMEIN> +* +* @return STATUS_SUCCESS or appropriate error value. +* +* @remarks None. +* +*--*/ +NTSTATUS +NTAPI +ObSetSecurityObjectByPointer(IN PVOID Object, + IN SECURITY_INFORMATION SecurityInformation, + IN PSECURITY_DESCRIPTOR SecurityDescriptor) +{ + POBJECT_TYPE Type; + POBJECT_HEADER Header; + PAGED_CODE(); + + /* Get the header and type */ + Header = OBJECT_TO_OBJECT_HEADER(Object); + Type = Header->Type; + + /* Sanity check */ + ASSERT(SecurityDescriptor); + + /* Call the security procedure */ + return Type->TypeInfo.SecurityProcedure(Object, + SetSecurityDescriptor, + &SecurityInformation, + SecurityDescriptor, + NULL, + &Header->SecurityDescriptor, + Type->TypeInfo.PoolType, + &Type->TypeInfo.GenericMapping); } /*++ @@ -395,7 +459,7 @@ /* Call the security procedure's query function */ Status = Type->TypeInfo.SecurityProcedure(Object, QuerySecurityDescriptor, - SecurityInformation, + &SecurityInformation, SecurityDescriptor, &Length, &Header->SecurityDescriptor, @@ -450,8 +514,6 @@ { KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); PVOID Object; - POBJECT_HEADER Header; - POBJECT_TYPE Type; SECURITY_DESCRIPTOR_RELATIVE *CapturedDescriptor; ACCESS_MASK DesiredAccess; NTSTATUS Status; @@ -460,66 +522,63 @@ /* Make sure the caller doesn't pass a NULL security descriptor! */ if (!SecurityDescriptor) return STATUS_ACCESS_VIOLATION; - /* Capture and make a copy of the security descriptor */ - Status = SeCaptureSecurityDescriptor(SecurityDescriptor, - PreviousMode, - PagedPool, - TRUE, - (PSECURITY_DESCRIPTOR*) - &CapturedDescriptor); - if (!NT_SUCCESS(Status)) return Status; - - /* - * Make sure the security descriptor passed by the caller - * is valid for the operation we're about to perform - */ - if (((SecurityInformation & OWNER_SECURITY_INFORMATION) && - !(CapturedDescriptor->Owner)) || - ((SecurityInformation & GROUP_SECURITY_INFORMATION) && - !(CapturedDescriptor->Group))) - { - /* Set the failure status */ - Status = STATUS_INVALID_SECURITY_DESCR; - } - else - { - /* Set the required access rights for the operation */ - SeSetSecurityAccessMask(SecurityInformation, &DesiredAccess); - - /* Reference the object */ - Status = ObReferenceObjectByHandle(Handle, - DesiredAccess, - NULL, - PreviousMode, - &Object, - NULL); - if (NT_SUCCESS(Status)) + /* Set the required access rights for the operation */ + SeSetSecurityAccessMask(SecurityInformation, &DesiredAccess); + + /* Reference the object */ + Status = ObReferenceObjectByHandle(Handle, + DesiredAccess, + NULL, + PreviousMode, + &Object, + NULL); + if (NT_SUCCESS(Status)) + { + /* Capture and make a copy of the security descriptor */ + Status = SeCaptureSecurityDescriptor(SecurityDescriptor, + PreviousMode, + PagedPool, + TRUE, + (PSECURITY_DESCRIPTOR*) + &CapturedDescriptor); + if (!NT_SUCCESS(Status)) { - /* Get the Object Header and Type */ - Header = OBJECT_TO_OBJECT_HEADER(Object); - Type = Header->Type; - - /* Call the security procedure's set function */ - Status = Type->TypeInfo.SecurityProcedure(Object, - SetSecurityDescriptor, - SecurityInformation, - SecurityDescriptor, - NULL, - &Header-> - SecurityDescriptor, - Type->TypeInfo.PoolType, - &Type-> - TypeInfo.GenericMapping); - - /* Now we can dereference the object */ + /* Fail */ ObDereferenceObject(Object); + return Status; } - } - - /* Release the descriptor and return status */ - SeReleaseSecurityDescriptor((PSECURITY_DESCRIPTOR)CapturedDescriptor, - PreviousMode, - TRUE); + + /* Sanity check */ + ASSERT(CapturedDescriptor->Control & SE_SELF_RELATIVE); + + /* + * Make sure the security descriptor passed by the caller + * is valid for the operation we're about to perform + */ + if (((SecurityInformation & OWNER_SECURITY_INFORMATION) && + !(CapturedDescriptor->Owner)) || + ((SecurityInformation & GROUP_SECURITY_INFORMATION) && + !(CapturedDescriptor->Group))) + { + /* Set the failure status */ + Status = STATUS_INVALID_SECURITY_DESCR; + } + else + { + /* Set security */ + Status = ObSetSecurityObjectByPointer(Object, + SecurityInformation, + CapturedDescriptor); + } + + /* Release the descriptor and return status */ + SeReleaseSecurityDescriptor((PSECURITY_DESCRIPTOR)CapturedDescriptor, + PreviousMode, + TRUE); + } + + /* Now we can dereference the object */ + ObDereferenceObject(Object); return Status; } @@ -588,66 +647,4 @@ return Status; } -/*++ -* @name ObLogSecurityDescriptor -* @unimplemented NT5.2 -* -* The ObLogSecurityDescriptor routine <FILLMEIN> -* -* @param InputSecurityDescriptor -* <FILLMEIN> -* -* @param OutputSecurityDescriptor -* <FILLMEIN> -* -* @param RefBias -* <FILLMEIN> -* -* @return STATUS_SUCCESS or appropriate error value. -* -* @remarks None. -* -*--*/ -NTSTATUS -NTAPI -ObLogSecurityDescriptor(IN PSECURITY_DESCRIPTOR InputSecurityDescriptor, - OUT PSECURITY_DESCRIPTOR *OutputSecurityDescriptor, - IN ULONG RefBias) -{ - /* HACK: Return the same descriptor back */ - PISECURITY_DESCRIPTOR SdCopy; - DPRINT1("ObLogSecurityDescriptor is not implemented!\n", - InputSecurityDescriptor); - - SdCopy = ExAllocatePool(PagedPool, sizeof(*SdCopy)); - RtlCopyMemory(SdCopy, InputSecurityDescriptor, sizeof(*SdCopy)); - *OutputSecurityDescriptor = SdCopy; - return STATUS_SUCCESS; -} - -/*++ -* @name ObDereferenceSecurityDescriptor -* @unimplemented NT5.2 -* -* The ObDereferenceSecurityDescriptor routine <FILLMEIN> -* -* @param SecurityDescriptor -* <FILLMEIN> -* -* @param Count -* <FILLMEIN> -* -* @return STATUS_SUCCESS or appropriate error value. -* -* @remarks None. -* -*--*/ -VOID -NTAPI -ObDereferenceSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor, - IN ULONG Count) -{ - DPRINT1("ObDereferenceSecurityDescriptor is not implemented!\n"); -} - /* EOF */ Modified: trunk/reactos/ntoskrnl/ob/sdcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/sdcache.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ob/sdcache.c (original) +++ trunk/reactos/ntoskrnl/ob/sdcache.c Sat Dec 30 01:17:29 2006 @@ -343,4 +343,66 @@ DPRINT("ObpDereferenceCachedSecurityDescriptor() done\n"); } +/*++ +* @name ObLogSecurityDescriptor +* @unimplemented NT5.2 +* +* The ObLogSecurityDescriptor routine <FILLMEIN> +* +* @param InputSecurityDescriptor +* <FILLMEIN> +* +* @param OutputSecurityDescriptor +* <FILLMEIN> +* +* @param RefBias +* <FILLMEIN> +* +* @return STATUS_SUCCESS or appropriate error value. +* +* @remarks None. +* +*--*/ +NTSTATUS +NTAPI +ObLogSecurityDescriptor(IN PSECURITY_DESCRIPTOR InputSecurityDescriptor, + OUT PSECURITY_DESCRIPTOR *OutputSecurityDescriptor, + IN ULONG RefBias) +{ + /* HACK: Return the same descriptor back */ + PISECURITY_DESCRIPTOR SdCopy; + DPRINT1("ObLogSecurityDescriptor is not implemented!\n", + InputSecurityDescriptor); + + SdCopy = ExAllocatePool(PagedPool, sizeof(*SdCopy)); + RtlCopyMemory(SdCopy, InputSecurityDescriptor, sizeof(*SdCopy)); + *OutputSecurityDescriptor = SdCopy; + return STATUS_SUCCESS; +} + +/*++ +* @name ObDereferenceSecurityDescriptor +* @unimplemented NT5.2 +* +* The ObDereferenceSecurityDescriptor routine <FILLMEIN> +* +* @param SecurityDescriptor +* <FILLMEIN> +* +* @param Count +* <FILLMEIN> +* +* @return STATUS_SUCCESS or appropriate error value. +* +* @remarks None. +* +*--*/ +VOID +NTAPI +ObDereferenceSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor, + IN ULONG Count) +{ + DPRINT1("ObDereferenceSecurityDescriptor is not implemented!\n"); +} + /* EOF */ Modified: trunk/reactos/ntoskrnl/se/audit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/audit.c?rev=25… ============================================================================== --- trunk/reactos/ntoskrnl/se/audit.c (original) +++ trunk/reactos/ntoskrnl/se/audit.c Sat Dec 30 01:17:29 2006 @@ -376,24 +376,30 @@ UNIMPLEMENTED; } - -/* - * @unimplemented - */ -VOID STDCALL +/* + * @unimplemented + */ +VOID +NTAPI SeOpenObjectAuditAlarm(IN PUNICODE_STRING ObjectTypeName, - IN PVOID Object OPTIONAL, - IN PUNICODE_STRING AbsoluteObjectName OPTIONAL, - IN PSECURITY_DESCRIPTOR SecurityDescriptor, - IN PACCESS_STATE AccessState, - IN BOOLEAN ObjectCreated, - IN BOOLEAN AccessGranted, - IN KPROCESSOR_MODE AccessMode, - OUT PBOOLEAN GenerateOnClose) -{ - DPRINT1("SeOpenObjectAuditAlarm is UNIMPLEMENTED!\n"); -} - + IN PVOID Object OPTIONAL, + IN PUNICODE_STRING AbsoluteObjectName OPTIONAL, + IN PSECURITY_DESCRIPTOR SecurityDescriptor, + IN PACCESS_STATE AccessState, + IN BOOLEAN ObjectCreated, + IN BOOLEAN AccessGranted, + IN KPROCESSOR_MODE AccessMode, + OUT PBOOLEAN GenerateOnClose) +{ + PAGED_CODE(); + + /* Audits aren't done on kernel-mode access */ + if (AccessMode == KernelMode) return; + + /* Otherwise, unimplemented! */ + //UNIMPLEMENTED; + return; +} /* * @unimplemented Modified: trunk/reactos/ntoskrnl/se/semgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/semgr.c?rev=25… ============================================================================== --- trunk/reactos/ntoskrnl/se/semgr.c (original) +++ trunk/reactos/ntoskrnl/se/semgr.c Sat Dec 30 01:17:29 2006 @@ -203,7 +203,7 @@ STDCALL SeDefaultObjectMethod(PVOID Object, SECURITY_OPERATION_CODE OperationType, - SECURITY_INFORMATION SecurityInformation, + PSECURITY_INFORMATION _SecurityInformation, PSECURITY_DESCRIPTOR _SecurityDescriptor, PULONG ReturnLength, PSECURITY_DESCRIPTOR *OldSecurityDescriptor, @@ -225,10 +225,12 @@ ULONG Control = 0; ULONG_PTR Current; NTSTATUS Status; + SECURITY_INFORMATION SecurityInformation; if (OperationType == SetSecurityDescriptor) { ObjectSd = Header->SecurityDescriptor; + SecurityInformation = *_SecurityInformation; /* Get owner and owner size */ if (SecurityInformation & OWNER_SECURITY_INFORMATION) @@ -401,7 +403,7 @@ } else if (OperationType == QuerySecurityDescriptor) { - Status = SeQuerySecurityDescriptorInfo(&SecurityInformation, + Status = SeQuerySecurityDescriptorInfo(_SecurityInformation, SecurityDescriptor, ReturnLength, &Header->SecurityDescriptor);

1 0

[ion] 25239: - Fix some subtle bugs in NtWaitForMultipleObjects/NtWaitForSingleObject: - Fail if memory allocation failed. - Don't overwrite original captured handle value when decoding to kernel handle. - Use PAGED_CODE. - Check timeout validity first before probing the entire handle array. - Fix a critical bug in NtSignalAndWaitForObject which was using the wrong object type (waitable object instead of signalled objecT).
by ion＠svn.reactos.org 29 Dec '06

29 Dec '06

Author: ion Date: Fri Dec 29 23:52:33 2006 New Revision: 25239 URL: http://svn.reactos.org/svn/reactos?rev=25239&view=rev Log: - Fix some subtle bugs in NtWaitForMultipleObjects/NtWaitForSingleObject: - Fail if memory allocation failed. - Don't overwrite original captured handle value when decoding to kernel handle. - Use PAGED_CODE. - Check timeout validity first before probing the entire handle array. - Fix a critical bug in NtSignalAndWaitForObject which was using the wrong object type (waitable object instead of signalled objecT). Modified: trunk/reactos/ntoskrnl/include/internal/tag.h trunk/reactos/ntoskrnl/ob/obwait.c Modified: trunk/reactos/ntoskrnl/include/internal/tag.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/tag.h (original) +++ trunk/reactos/ntoskrnl/include/internal/tag.h Fri Dec 29 23:52:33 2006 @@ -161,4 +161,6 @@ /* Se Process Audit */ #define TAG_SEPA TAG('S', 'e', 'P', 'a') +#define TAG_WAIT TAG('W', 'a', 'i', 't') + #endif /* _NTOSKRNL_TAG_H */ Modified: trunk/reactos/ntoskrnl/ob/obwait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obwait.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obwait.c (original) +++ trunk/reactos/ntoskrnl/ob/obwait.c Fri Dec 29 23:52:33 2006 @@ -12,8 +12,6 @@ #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> - -#define TAG_WAIT TAG('W', 'a', 'i', 't') /* FUNCTIONS *****************************************************************/ @@ -52,7 +50,7 @@ IN PLARGE_INTEGER TimeOut OPTIONAL) { PKWAIT_BLOCK WaitBlockArray = NULL; - HANDLE Handles[MAXIMUM_WAIT_OBJECTS]; + HANDLE Handles[MAXIMUM_WAIT_OBJECTS], KernelHandle; PVOID Objects[MAXIMUM_WAIT_OBJECTS]; PVOID WaitObjects[MAXIMUM_WAIT_OBJECTS]; ULONG i = 0, ReferencedObjects = 0, j; @@ -65,17 +63,16 @@ ACCESS_MASK GrantedAccess; PVOID DefaultObject; NTSTATUS Status = STATUS_SUCCESS; - DPRINT("NtWaitForMultipleObjects(ObjectCount %lu HandleArray[] %x," - " Alertable %d, TimeOut %x)\n", - ObjectCount, HandleArray, Alertable, TimeOut); + PAGED_CODE(); /* Enter a critical region since we'll play with handles */ LockInUse = TRUE; KeEnterCriticalRegion(); /* Check for valid Object Count */ - if ((ObjectCount > MAXIMUM_WAIT_OBJECTS) || !ObjectCount) - { + if ((ObjectCount > MAXIMUM_WAIT_OBJECTS) || !(ObjectCount)) + { + /* Fail */ Status = STATUS_INVALID_PARAMETER_1; goto Quickie; } @@ -83,6 +80,7 @@ /* Check for valid Wait Type */ if ((WaitType != WaitAll) && (WaitType != WaitAny)) { + /* Fail */ Status = STATUS_INVALID_PARAMETER_3; goto Quickie; } @@ -93,16 +91,18 @@ /* Check if the call came from user mode */ if(PreviousMode != KernelMode) { - /* Probe all the handles */ - ProbeForRead(HandleArray, - ObjectCount * sizeof(HANDLE), - sizeof(HANDLE)); + /* Check if we have a timeout */ if (TimeOut) { /* Make a local copy of the timeout on the stack */ SafeTimeOut = ProbeForReadLargeInteger(TimeOut); TimeOut = &SafeTimeOut; } + + /* Probe all the handles */ + ProbeForRead(HandleArray, + ObjectCount * sizeof(HANDLE), + sizeof(HANDLE)); } /* @@ -132,6 +132,12 @@ ObjectCount * sizeof(KWAIT_BLOCK), TAG_WAIT); + if (!WaitBlockArray) + { + /* Fail */ + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Quickie; + } } /* Start the loop */ @@ -142,16 +148,21 @@ { /* Use the System Handle Table and decode */ HandleTable = ObpKernelHandleTable; - Handles[i] = ObKernelHandleToHandle(Handles[i]); + KernelHandle = ObKernelHandleToHandle(Handles[i]); + + /* Get a pointer to it */ + HandleEntry = ExMapHandleToPointer(HandleTable, KernelHandle); } else { /* Use the Process' Handle table and get the Ex Handle */ HandleTable = PsGetCurrentProcess()->ObjectTable; - } - - /* Get a pointer to it */ - HandleEntry = ExMapHandleToPointer(HandleTable, Handles[i]); + + /* Get a pointer to it */ + HandleEntry = ExMapHandleToPointer(HandleTable, Handles[i]); + } + + /* Check if we have an entry */ if (!HandleEntry) { /* Fail, handle is invalid */ @@ -349,12 +360,11 @@ KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); LARGE_INTEGER SafeTimeOut; NTSTATUS Status = STATUS_SUCCESS; - DPRINT("NtWaitForSingleObject(ObjectHandle %x, Alertable %d, TimeOut %x)\n", - ObjectHandle,Alertable,TimeOut); /* Check if we came with a timeout from user mode */ - if (TimeOut && PreviousMode != KernelMode) - { + if ((TimeOut) && (PreviousMode != KernelMode)) + { + /* Enter SEH for proving */ _SEH_TRY { /* Make a copy on the stack */ @@ -367,8 +377,6 @@ Status = _SEH_GetExceptionCode(); } _SEH_END; - - /* Fail if we got an access violation */ if (!NT_SUCCESS(Status)) return Status; } @@ -449,16 +457,15 @@ { KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); POBJECT_TYPE Type; - PVOID SignalObj; - PVOID WaitObj; - PVOID WaitableObject; + PVOID SignalObj, WaitObj, WaitableObject; LARGE_INTEGER SafeTimeOut; OBJECT_HANDLE_INFORMATION HandleInfo; NTSTATUS Status = STATUS_SUCCESS; /* Check if we came with a timeout from user mode */ - if (TimeOut && PreviousMode != KernelMode) - { + if ((TimeOut) && (PreviousMode != KernelMode)) + { + /* Enter SEH for probing */ _SEH_TRY { /* Make a copy on the stack */ @@ -471,8 +478,6 @@ Status = _SEH_GetExceptionCode(); } _SEH_END; - - /* Fail if we got an access violation */ if (!NT_SUCCESS(Status)) return Status; } @@ -511,7 +516,7 @@ } /* Check Signal Object Type */ - Type = OBJECT_TO_OBJECT_HEADER(WaitObj)->Type; + Type = OBJECT_TO_OBJECT_HEADER(SignalObj)->Type; if (Type == ExEventObjectType) { /* Check if we came from user-mode without the right access */

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