Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 16766: update the english text for type
by greatlrd＠svn.reactos.com 27 Jul '05

27 Jul '05

update the english text for type Modified: trunk/reactos/subsys/system/cmd/En.rc _____ Modified: trunk/reactos/subsys/system/cmd/En.rc --- trunk/reactos/subsys/system/cmd/En.rc 2005-07-27 00:05:34 UTC (rev 16765) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-07-27 00:50:24 UTC (rev 16766) @@ -434,7 +434,8 @@ if none of ON, OFF or /S is specified the command\n\ will toggle stopwach state\n\n" -STRING_TYPE_HELP1, "Displays the contents of text files.\n\nTYPE [drive:][path]filename" +STRING_TYPE_HELP1, "Displays the contents of text files.\n\nTYPE [drive:][path]filename \n\ + /P Shows one screen of output at a time.\n" STRING_VERIFY_HELP1, "This command is just a dummy!!\n\ Sets whether to verify that your files are written correctly to a\n\

1 0

[greatlrd] 16765: add /P as param for Type, from PCDOS by Brandon Turner
by greatlrd＠svn.reactos.com 27 Jul '05

27 Jul '05

add /P as param for Type, from PCDOS by Brandon Turner Modified: trunk/reactos/subsys/system/cmd/type.c _____ Modified: trunk/reactos/subsys/system/cmd/type.c --- trunk/reactos/subsys/system/cmd/type.c 2005-07-26 22:51:03 UTC (rev 16764) +++ trunk/reactos/subsys/system/cmd/type.c 2005-07-27 00:05:34 UTC (rev 16765) @@ -38,11 +38,12 @@ TCHAR buff[256]; HANDLE hFile, hConsoleOut; DWORD dwRead; - DWORD dwWritten; BOOL bRet; INT argc,i; LPTSTR *argv; LPTSTR errmsg; + BOOL bPaging = FALSE; + BOOL bFirstTime = TRUE; hConsoleOut=GetStdHandle (STD_OUTPUT_HANDLE); @@ -60,9 +61,17 @@ argv = split (param, &argc, TRUE); + for(i = 0; i < argc; i++) + { + if(*argv[i] == _T('/') && _tcslen(argv[i]) >= 2 && _totupper(argv[i][1]) == _T('P')) + { + bPaging = TRUE; + } + } + for (i = 0; i < argc; i++) { - if (_T('/') == argv[i][0]) + if (_T('/') == argv[i][0] && _totupper(argv[i][1]) != _T('P')) { LoadString(CMD_ModuleHandle, STRING_TYPE_ERROR1, szMsg, RC_STRING_MAX_SIZE); ConErrPrintf(szMsg, argv[i] + 1); @@ -90,13 +99,22 @@ LocalFree (errmsg); continue; } - + do { bRet = ReadFile(hFile,buff,sizeof(buff),&dwRead,NULL); - if (dwRead>0 && bRet) - WriteFile(hConsoleOut,buff,dwRead,&dwWritten,NULL); + if(bPaging) + { + if(dwRead>0 && bRet) + ConOutPrintfPaging(bFirstTime, buff); + } + else + { + if(dwRead>0 && bRet) + ConOutPrintf(buff); + } + bFirstTime = FALSE; } while(dwRead>0 && bRet);

1 0

[navaraf] 16764: Do not dereference NULL pointers and this time for real.
by navaraf＠svn.reactos.com 26 Jul '05

26 Jul '05

Do not dereference NULL pointers and this time for real. Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c --- trunk/reactos/subsys/win32k/ntuser/winpos.c 2005-07-26 22:40:03 UTC (rev 16763) +++ trunk/reactos/subsys/win32k/ntuser/winpos.c 2005-07-26 22:51:03 UTC (rev 16764) @@ -164,7 +164,7 @@ done: Fg = NtUserGetForegroundWindow(); - if (!Fg || Window->Self == Fg) + if (Wnd && (!Fg || Window->Self == Fg)) { if (IntSetForegroundWindow(Wnd)) {

1 0

[navaraf] 16763: Do not dereference NULL pointers.
by navaraf＠svn.reactos.com 26 Jul '05

26 Jul '05

Do not dereference NULL pointers. Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c --- trunk/reactos/subsys/win32k/ntuser/winpos.c 2005-07-26 22:21:02 UTC (rev 16762) +++ trunk/reactos/subsys/win32k/ntuser/winpos.c 2005-07-26 22:40:03 UTC (rev 16763) @@ -145,6 +145,14 @@ { Old = Wnd; IntLockRelatives(Old); + if (Old->NextSibling == NULL) + { + Wnd = NULL; + IntUnLockRelatives(Old); + if (Old != Window) + IntReleaseWindowObject(Old); + break; + } Wnd = IntGetWindowObject(Old->NextSibling->Self); IntUnLockRelatives(Old); if (Old != Window)

1 0

[weiden] 16762: implemented GetNamedSecurityA/W and SetNamedSecurityInfoA/W and forward them to the MARTA provider
by weiden＠svn.reactos.com 26 Jul '05

26 Jul '05

implemented GetNamedSecurityA/W and SetNamedSecurityInfoA/W and forward them to the MARTA provider Modified: trunk/reactos/lib/advapi32/sec/misc.c Modified: trunk/reactos/lib/ntmarta/ntmarta.c Modified: trunk/reactos/lib/ntmarta/ntmarta.def _____ Modified: trunk/reactos/lib/advapi32/sec/misc.c --- trunk/reactos/lib/advapi32/sec/misc.c 2005-07-26 21:33:38 UTC (rev 16761) +++ trunk/reactos/lib/advapi32/sec/misc.c 2005-07-26 22:21:02 UTC (rev 16762) @@ -28,9 +28,21 @@ PVOID ConvertAclToAccess; PVOID GetAccessForTrustee; PVOID GetExplicitEntries; - PVOID RewriteGetNamedRights; - PVOID RewriteSetNamedRights; + DWORD (STDCALL *RewriteGetNamedRights)(LPWSTR pObjectName, + SE_OBJECT_TYPE ObjectType, + SECURITY_INFORMATION SecurityInfo, + PSID* ppsidOwner, + PSID* ppsidGroup, + PACL* ppDacl, + PACL* ppSacl, + PSECURITY_DESCRIPTOR* ppSecurityDescriptor); + + DWORD (STDCALL *RewriteSetNamedRights)(LPWSTR pObjectName, + SE_OBJECT_TYPE ObjectType, + SECURITY_INFORMATION SecurityInfo, + PSECURITY_DESCRIPTOR pSecurityDescriptor); + DWORD (STDCALL *RewriteGetHandleRights)(HANDLE handle, SE_OBJECT_TYPE ObjectType, SECURITY_INFORMATION SecurityInfo, @@ -109,9 +121,9 @@ FindNtMartaProc(ConvertAclToAccess); FindNtMartaProc(GetAccessForTrustee); FindNtMartaProc(GetExplicitEntries); +#endif FindNtMartaProc(RewriteGetNamedRights); FindNtMartaProc(RewriteSetNamedRights); -#endif FindNtMartaProc(RewriteGetHandleRights); FindNtMartaProc(RewriteSetHandleRights); #if 0 @@ -1234,10 +1246,186 @@ } +static DWORD +pGetSecurityInfoCheck(SECURITY_INFORMATION SecurityInfo, + PSID* ppsidOwner, + PSID* ppsidGroup, + PACL* ppDacl, + PACL* ppSacl, + PSECURITY_DESCRIPTOR* ppSecurityDescriptor) +{ + if ((SecurityInfo & (OWNER_SECURITY_INFORMATION | + GROUP_SECURITY_INFORMATION | + DACL_SECURITY_INFORMATION | + SACL_SECURITY_INFORMATION)) && + ppSecurityDescriptor == NULL) + { + /* if one of the SIDs or ACLs are present, the security descriptor + most not be NULL */ + return ERROR_INVALID_PARAMETER; + } + else + { + /* reset the pointers unless they're ignored */ + if ((SecurityInfo & OWNER_SECURITY_INFORMATION) && + ppsidOwner != NULL) + { + ppsidOwner = NULL; + } + if ((SecurityInfo & GROUP_SECURITY_INFORMATION) && + *ppsidGroup != NULL) + { + *ppsidGroup = NULL; + } + if ((SecurityInfo & DACL_SECURITY_INFORMATION) && + ppDacl != NULL) + { + *ppDacl = NULL; + } + if ((SecurityInfo & SACL_SECURITY_INFORMATION) && + ppSacl != NULL) + { + *ppSacl = NULL; + } + + if (SecurityInfo & (OWNER_SECURITY_INFORMATION | + GROUP_SECURITY_INFORMATION | + DACL_SECURITY_INFORMATION | + SACL_SECURITY_INFORMATION)) + { + *ppSecurityDescriptor = NULL; + } + + return ERROR_SUCCESS; + } +} + + +static DWORD +pSetSecurityInfoCheck(PSECURITY_DESCRIPTOR pSecurityDescriptor, + SECURITY_INFORMATION SecurityInfo, + PSID psidOwner, + PSID psidGroup, + PACL pDacl, + PACL pSacl) +{ + /* initialize a security descriptor on the stack */ + if (!InitializeSecurityDescriptor(pSecurityDescriptor, + SECURITY_DESCRIPTOR_REVISION)) + { + return GetLastError(); + } + + if (SecurityInfo & OWNER_SECURITY_INFORMATION) + { + if (RtlValidSid(psidOwner)) + { + if (!SetSecurityDescriptorOwner(pSecurityDescriptor, + psidOwner, + FALSE)) + { + return GetLastError(); + } + } + else + { + return ERROR_INVALID_PARAMETER; + } + } + + if (SecurityInfo & GROUP_SECURITY_INFORMATION) + { + if (RtlValidSid(psidGroup)) + { + if (!SetSecurityDescriptorGroup(pSecurityDescriptor, + psidGroup, + FALSE)) + { + return GetLastError(); + } + } + else + { + return ERROR_INVALID_PARAMETER; + } + } + + if (SecurityInfo & DACL_SECURITY_INFORMATION) + { + if (pDacl != NULL) + { + if (SetSecurityDescriptorDacl(pSecurityDescriptor, + TRUE, + pDacl, + FALSE)) + { + /* check if the DACL needs to be protected from being + modified by inheritable ACEs */ + if (SecurityInfo & PROTECTED_DACL_SECURITY_INFORMATION) + { + goto ProtectDacl; + } + } + else + { + return GetLastError(); + } + } + else + { +ProtectDacl: + /* protect the DACL from being modified by inheritable ACEs */ + if (!SetSecurityDescriptorControl(pSecurityDescriptor, + SE_DACL_PROTECTED, + SE_DACL_PROTECTED)) + { + return GetLastError(); + } + } + } + + if (SecurityInfo & SACL_SECURITY_INFORMATION) + { + if (pSacl != NULL) + { + if (SetSecurityDescriptorSacl(pSecurityDescriptor, + TRUE, + pSacl, + FALSE)) + { + /* check if the SACL needs to be protected from being + modified by inheritable ACEs */ + if (SecurityInfo & PROTECTED_SACL_SECURITY_INFORMATION) + { + goto ProtectSacl; + } + } + else + { + return GetLastError(); + } + } + else + { +ProtectSacl: + /* protect the SACL from being modified by inheritable ACEs */ + if (!SetSecurityDescriptorControl(pSecurityDescriptor, + SE_SACL_PROTECTED, + SE_SACL_PROTECTED)) + { + return GetLastError(); + } + } + } + + return ERROR_SUCCESS; +} + + /********************************************************************** * GetNamedSecurityInfoW EXPORTED * - * @unimplemented + * @implemented */ DWORD STDCALL GetNamedSecurityInfoW(LPWSTR pObjectName, @@ -1249,15 +1437,45 @@ PACL *ppSacl, PSECURITY_DESCRIPTOR *ppSecurityDescriptor) { - DPRINT1("GetNamedSecurityInfoW: stub\n"); - return ERROR_CALL_NOT_IMPLEMENTED; + DWORD ErrorCode; + + if (pObjectName != NULL) + { + ErrorCode = CheckNtMartaPresent(); + if (ErrorCode == ERROR_SUCCESS) + { + ErrorCode = pGetSecurityInfoCheck(SecurityInfo, + ppsidOwner, + ppsidGroup, + ppDacl, + ppSacl, + ppSecurityDescriptor); + + if (ErrorCode == ERROR_SUCCESS) + { + /* call the MARTA provider */ + ErrorCode = AccRewriteGetNamedRights(pObjectName, + ObjectType, + SecurityInfo, + ppsidOwner, + ppsidGroup, + ppDacl, + ppSacl, + ppSecurityDescriptor); + } + } + } + else + ErrorCode = ERROR_INVALID_PARAMETER; + + return ErrorCode; } /********************************************************************** * GetNamedSecurityInfoA EXPORTED * - * @unimplemented + * @implemented */ DWORD STDCALL GetNamedSecurityInfoA(LPSTR pObjectName, @@ -1269,15 +1487,36 @@ PACL *ppSacl, PSECURITY_DESCRIPTOR *ppSecurityDescriptor) { - DPRINT1("GetNamedSecurityInfoA: stub\n"); - return ERROR_CALL_NOT_IMPLEMENTED; + UNICODE_STRING ObjectName; + NTSTATUS Status; + DWORD Ret; + + Status = RtlCreateUnicodeStringFromAsciiz(&ObjectName, + pObjectName); + if (!NT_SUCCESS(Status)) + { + return RtlNtStatusToDosError(Status); + } + + Ret = GetNamedSecurityInfoW(ObjectName.Buffer, + ObjectType, + SecurityInfo, + ppsidOwner, + ppsidGroup, + ppDacl, + ppSacl, + ppSecurityDescriptor); + + RtlFreeUnicodeString(&ObjectName); + + return Ret; } /********************************************************************** * SetNamedSecurityInfoW EXPORTED * - * @unimplemented + * @implemented */ DWORD STDCALL SetNamedSecurityInfoW(LPWSTR pObjectName, @@ -1288,15 +1527,43 @@ PACL pDacl, PACL pSacl) { - DPRINT1("SetNamedSecurityInfoW: stub\n"); - return ERROR_CALL_NOT_IMPLEMENTED; + DWORD ErrorCode; + + if (pObjectName != NULL) + { + ErrorCode = CheckNtMartaPresent(); + if (ErrorCode == ERROR_SUCCESS) + { + SECURITY_DESCRIPTOR SecurityDescriptor; + + ErrorCode = pSetSecurityInfoCheck(&SecurityDescriptor, + SecurityInfo, + psidOwner, + psidGroup, + pDacl, + pSacl); + + if (ErrorCode == ERROR_SUCCESS) + { + /* call the MARTA provider */ + ErrorCode = AccRewriteSetNamedRights(pObjectName, + ObjectType, + SecurityInfo, + &SecurityDescriptor); + } + } + } + else + ErrorCode = ERROR_INVALID_PARAMETER; + + return ErrorCode; } /********************************************************************** * SetNamedSecurityInfoA EXPORTED * - * @unimplemented + * @implemented */ DWORD STDCALL SetNamedSecurityInfoA(LPSTR pObjectName, @@ -1307,15 +1574,35 @@ PACL pDacl, PACL pSacl) { - DPRINT1("SetNamedSecurityInfoA: stub\n"); - return ERROR_CALL_NOT_IMPLEMENTED; + UNICODE_STRING ObjectName; + NTSTATUS Status; + DWORD Ret; + + Status = RtlCreateUnicodeStringFromAsciiz(&ObjectName, + pObjectName); + if (!NT_SUCCESS(Status)) + { + return RtlNtStatusToDosError(Status); + } + + Ret = SetNamedSecurityInfoW(ObjectName.Buffer, + ObjectType, + SecurityInfo, + psidOwner, + psidGroup, + pDacl, + pSacl); + + RtlFreeUnicodeString(&ObjectName); + + return Ret; } /********************************************************************** * GetSecurityInfo EXPORTED * - * @unimplemented + * @implemented */ DWORD STDCALL GetSecurityInfo(HANDLE handle, @@ -1334,40 +1621,16 @@ ErrorCode = CheckNtMartaPresent(); if (ErrorCode == ERROR_SUCCESS) { - if ((SecurityInfo & (OWNER_SECURITY_INFORMATION | - GROUP_SECURITY_INFORMATION | - DACL_SECURITY_INFORMATION | - SACL_SECURITY_INFORMATION)) && - ppSecurityDescriptor == NULL) + ErrorCode = pGetSecurityInfoCheck(SecurityInfo, + ppsidOwner, + ppsidGroup, + ppDacl, + ppSacl, + ppSecurityDescriptor); + + if (ErrorCode == ERROR_SUCCESS) { - /* if one of the SIDs or ACLs are present, the security descriptor - most not be NULL */ - ErrorCode = ERROR_INVALID_PARAMETER; - } - else - { - /* reset the pointers unless they're ignored */ - if ((SecurityInfo & OWNER_SECURITY_INFORMATION) && - ppsidOwner != NULL) - { - ppsidOwner = NULL; - } - if ((SecurityInfo & GROUP_SECURITY_INFORMATION) && - *ppsidGroup != NULL) - { - *ppsidGroup = NULL; - } - if ((SecurityInfo & DACL_SECURITY_INFORMATION) && - ppDacl != NULL) - { - *ppDacl = NULL; - } - if ((SecurityInfo & SACL_SECURITY_INFORMATION) && - ppSacl != NULL) - { - *ppSacl = NULL; - } - + /* call the MARTA provider */ ErrorCode = AccRewriteGetHandleRights(handle, ObjectType, SecurityInfo, @@ -1389,7 +1652,7 @@ /********************************************************************** * SetSecurityInfo EXPORTED * - * @unimplemented + * @implemented */ DWORD WINAPI @@ -1410,116 +1673,21 @@ { SECURITY_DESCRIPTOR SecurityDescriptor; - /* initialize a security descriptor on the stack */ - InitializeSecurityDescriptor(&SecurityDescriptor, - SECURITY_DESCRIPTOR_REVISION); - - if (SecurityInfo & OWNER_SECURITY_INFORMATION) - { - if (RtlValidSid(psidOwner)) - { - if (!SetSecurityDescriptorOwner(&SecurityDescriptor, - psidOwner, - FALSE)) - { - return GetLastError(); - } - } - else - { - return ERROR_INVALID_PARAMETER; - } - } + ErrorCode = pSetSecurityInfoCheck(&SecurityDescriptor, + SecurityInfo, + psidOwner, + psidGroup, + pDacl, + pSacl); - if (SecurityInfo & GROUP_SECURITY_INFORMATION) + if (ErrorCode == ERROR_SUCCESS) { - if (RtlValidSid(psidGroup)) - { - if (!SetSecurityDescriptorGroup(&SecurityDescriptor, - psidGroup, - FALSE)) - { - return GetLastError(); - } - } - else - { - return ERROR_INVALID_PARAMETER; - } + /* call the MARTA provider */ + ErrorCode = AccRewriteSetHandleRights(handle, + ObjectType, + SecurityInfo, + &SecurityDescriptor); } - - if (SecurityInfo & DACL_SECURITY_INFORMATION) - { - if (pDacl != NULL) - { - if (SetSecurityDescriptorDacl(&SecurityDescriptor, - TRUE, - pDacl, - FALSE)) - { - /* check if the DACL needs to be protected from being - modified by inheritable ACEs */ - if (SecurityInfo & PROTECTED_DACL_SECURITY_INFORMATION) - { - goto ProtectDacl; - } - } - else - { - return GetLastError(); - } - } - else - { -ProtectDacl: - /* protect the DACL from being modified by inheritable ACEs */ - if (!SetSecurityDescriptorControl(&SecurityDescriptor, - SE_DACL_PROTECTED, - SE_DACL_PROTECTED)) - { - return GetLastError(); - } - } - } - - if (SecurityInfo & SACL_SECURITY_INFORMATION) - { - if (pSacl != NULL) - { - if (SetSecurityDescriptorSacl(&SecurityDescriptor, - TRUE, - pSacl, - FALSE)) - { - /* check if the SACL needs to be protected from being - modified by inheritable ACEs */ - if (SecurityInfo & PROTECTED_SACL_SECURITY_INFORMATION) - { - goto ProtectSacl; - } - } - else - { - return GetLastError(); - } - } - else - { -ProtectSacl: - /* protect the SACL from being modified by inheritable ACEs */ - if (!SetSecurityDescriptorControl(&SecurityDescriptor, - SE_SACL_PROTECTED, - SE_SACL_PROTECTED)) - { - return GetLastError(); - } - } - } - - ErrorCode = AccRewriteSetHandleRights(handle, - ObjectType, - SecurityInfo, - &SecurityDescriptor); } } else _____ Modified: trunk/reactos/lib/ntmarta/ntmarta.c --- trunk/reactos/lib/ntmarta/ntmarta.c 2005-07-26 21:33:38 UTC (rev 16761) +++ trunk/reactos/lib/ntmarta/ntmarta.c 2005-07-26 22:21:02 UTC (rev 16762) @@ -69,6 +69,42 @@ } +/********************************************************************** + * AccRewriteGetNamedRights EXPORTED + * + * @unimplemented + */ +DWORD STDCALL +AccRewriteGetNamedRights(LPWSTR pObjectName, + SE_OBJECT_TYPE ObjectType, + SECURITY_INFORMATION SecurityInfo, + PSID* ppsidOwner, + PSID* ppsidGroup, + PACL* ppDacl, + PACL* ppSacl, + PSECURITY_DESCRIPTOR* ppSecurityDescriptor) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/********************************************************************** + * AccRewriteSetNamedRights EXPORTED + * + * @unimplemented + */ +DWORD STDCALL +AccRewriteSetNamedRights(LPWSTR pObjectName, + SE_OBJECT_TYPE ObjectType, + SECURITY_INFORMATION SecurityInfo, + PSECURITY_DESCRIPTOR pSecurityDescriptor) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + + BOOL STDCALL DllMain(IN HINSTANCE hinstDLL, IN DWORD dwReason, _____ Modified: trunk/reactos/lib/ntmarta/ntmarta.def --- trunk/reactos/lib/ntmarta/ntmarta.def 2005-07-26 21:33:38 UTC (rev 16761) +++ trunk/reactos/lib/ntmarta/ntmarta.def 2005-07-26 22:21:02 UTC (rev 16762) @@ -6,10 +6,10 @@ ;AccProvHandleGrantAccessRights; ;AccRewriteGetExplicitEntriesFromAcl AccRewriteGetHandleRights@32 -;AccRewriteGetNamedRights +AccRewriteGetNamedRights@32 ;AccRewriteSetEntriesInAcl AccRewriteSetHandleRights@16 -;AccRewriteSetNamedRights +AccRewriteSetNamedRights@16 ;AccTreeResetNamedSecurityInfo ;AccConvertAccessMaskToActrlAccess ;AccConvertAccessToSD

1 0

[hbirr] 16761: reverted last change
by hbirr＠svn.reactos.com 26 Jul '05

26 Jul '05

reverted last change Modified: trunk/reactos/ntoskrnl/ex/handle.c _____ Modified: trunk/reactos/ntoskrnl/ex/handle.c --- trunk/reactos/ntoskrnl/ex/handle.c 2005-07-26 21:20:55 UTC (rev 16760) +++ trunk/reactos/ntoskrnl/ex/handle.c 2005-07-26 21:33:38 UTC (rev 16761) @@ -910,16 +910,14 @@ ASSERT(HandleTable); - ExAcquireHandleTableLockShared(HandleTable); HandleTableEntry = ExpLookupHandleTableEntry(HandleTable, Handle); if (HandleTableEntry != NULL && ExLockHandleTableEntry(HandleTable, HandleTableEntry)) { DPRINT("ExMapHandleToPointer HT:0x%p Entry:0x%p locked\n", HandleTable, HandleTableEntry); - ExReleaseHandleTableLock(HandleTable); return HandleTableEntry; } - ExReleaseHandleTableLock(HandleTable); + return NULL; } @@ -938,14 +936,12 @@ ASSERT(ChangeHandleCallback); KeEnterCriticalRegion(); - ExAcquireHandleTableLockShared(HandleTable); HandleTableEntry = ExpLookupHandleTableEntry(HandleTable, Handle); if(HandleTableEntry != NULL && ExLockHandleTableEntry(HandleTable, HandleTableEntry)) { - ExReleaseHandleTableLock(HandleTable); Ret = ChangeHandleCallback(HandleTable, HandleTableEntry, NULL); @@ -953,10 +949,7 @@ ExUnlockHandleTableEntry(HandleTable, HandleTableEntry); } - else - { - ExReleaseHandleTableLock(HandleTable); - } + KeLeaveCriticalRegion(); return Ret;

1 0

[weiden] 16760: - implemented GetSecurityInfo and SetSecurityInfo which just check and/or transform parameters and pass the call to the MARTA provider
by weiden＠svn.reactos.com 26 Jul '05

26 Jul '05

- implemented GetSecurityInfo and SetSecurityInfo which just check and/or transform parameters and pass the call to the MARTA provider - added missing definitions to w32api Modified: trunk/reactos/lib/advapi32/misc/dllmain.c Modified: trunk/reactos/lib/advapi32/sec/misc.c Modified: trunk/reactos/w32api/include/winnt.h _____ Modified: trunk/reactos/lib/advapi32/misc/dllmain.c --- trunk/reactos/lib/advapi32/misc/dllmain.c 2005-07-26 21:17:06 UTC (rev 16759) +++ trunk/reactos/lib/advapi32/misc/dllmain.c 2005-07-26 21:20:55 UTC (rev 16760) @@ -15,6 +15,7 @@ extern BOOL RegInitialize(VOID); extern BOOL RegCleanup(VOID); +extern VOID UnloadNtMarta(VOID); INT STDCALL DllMain(PVOID hinstDll, @@ -30,6 +31,7 @@ case DLL_PROCESS_DETACH: RegCleanup(); + UnloadNtMarta(); break; } _____ Modified: trunk/reactos/lib/advapi32/sec/misc.c --- trunk/reactos/lib/advapi32/sec/misc.c 2005-07-26 21:17:06 UTC (rev 16759) +++ trunk/reactos/lib/advapi32/sec/misc.c 2005-07-26 21:20:55 UTC (rev 16760) @@ -13,7 +13,168 @@ #define NDEBUG #include <debug.h> +/* Interface to ntmarta.dll ***************************************************/ +typedef struct _NTMARTA +{ + HINSTANCE hDllInstance; + + PVOID LookupAccountTrustee; + PVOID LookupAccountName; + PVOID LookupAccountSid; + PVOID SetEntriesInAList; + PVOID ConvertAccessToSecurityDescriptor; + PVOID ConvertSDToAccess; + PVOID ConvertAclToAccess; + PVOID GetAccessForTrustee; + PVOID GetExplicitEntries; + PVOID RewriteGetNamedRights; + PVOID RewriteSetNamedRights; + + DWORD (STDCALL *RewriteGetHandleRights)(HANDLE handle, + SE_OBJECT_TYPE ObjectType, + SECURITY_INFORMATION SecurityInfo, + PSID* ppsidOwner, + PSID* ppsidGroup, + PACL* ppDacl, + PACL* ppSacl, + PSECURITY_DESCRIPTOR* ppSecurityDescriptor); + + DWORD (STDCALL *RewriteSetHandleRights)(HANDLE handle, + SE_OBJECT_TYPE ObjectType, + SECURITY_INFORMATION SecurityInfo, + PSECURITY_DESCRIPTOR pSecurityDescriptor); + + PVOID RewriteSetEntriesInAcl; + PVOID RewriteGetExplicitEntriesFromAcl; + PVOID TreeResetNamedSecurityInfo; + PVOID GetInheritanceSource; + PVOID FreeIndexArray; +} NTMARTA, *PNTMARTA; + +static NTMARTA NtMartaStatic = { 0 }; +static PNTMARTA NtMarta = NULL; + +#define AccLookupAccountTrustee NtMartaStatic.LookupAccountTrustee +#define AccLookupAccountName NtMartaStatic.LookupAccountName +#define AccLookupAccountSid NtMartaStatic.LookupAccountSid +#define AccSetEntriesInAList NtMartaStatic.SetEntriesInAList +#define AccConvertAccessToSecurityDescriptor NtMartaStatic.ConvertAccessToSecurityDescriptor +#define AccConvertSDToAccess NtMartaStatic.ConvertSDToAccess +#define AccConvertAclToAccess NtMartaStatic.ConvertAclToAccess +#define AccGetAccessForTrustee NtMartaStatic.GetAccessForTrustee +#define AccGetExplicitEntries NtMartaStatic.GetExplicitEntries +#define AccRewriteGetNamedRights NtMartaStatic.RewriteGetNamedRights +#define AccRewriteSetNamedRights NtMartaStatic.RewriteSetNamedRights +#define AccRewriteGetHandleRights NtMartaStatic.RewriteGetHandleRights +#define AccRewriteSetHandleRights NtMartaStatic.RewriteSetHandleRights +#define AccRewriteSetEntriesInAcl NtMartaStatic.RewriteSetEntriesInAcl +#define AccRewriteGetExplicitEntriesFromAcl NtMartaStatic.RewriteGetExplicitEntriesFromAcl +#define AccTreeResetNamedSecurityInfo NtMartaStatic.TreeResetNamedSecurityInfo +#define AccGetInheritanceSource NtMartaStatic.GetInheritanceSource +#define AccFreeIndexArray NtMartaStatic.FreeIndexArray + +#define FindNtMartaProc(Name) \ + NtMartaStatic.Name = (PVOID)GetProcAddress(NtMartaStatic.hDllInstance, \ + "Acc" # Name ); \ + if (NtMartaStatic.Name == NULL) \ + { \ + return GetLastError(); \ + } + +static DWORD +LoadAndInitializeNtMarta(VOID) +{ + /* this code may be executed simultaneously by multiple threads in case they're + trying to initialize the interface at the same time, but that's no problem + because the pointers returned by GetProcAddress will be the same. However, + only one of the threads will change the NtMarta pointer to the NtMartaStatic + structure, the others threads will detect that there were other threads + initializing the structure faster and will release the reference to the + DLL */ + + NtMartaStatic.hDllInstance = LoadLibraryW(L"ntmarta.dll"); + if (NtMartaStatic.hDllInstance == NULL) + { + return GetLastError(); + } + +#if 0 + FindNtMartaProc(LookupAccountTrustee); + FindNtMartaProc(LookupAccountName); + FindNtMartaProc(LookupAccountSid); + FindNtMartaProc(SetEntriesInAList); + FindNtMartaProc(ConvertAccessToSecurityDescriptor); + FindNtMartaProc(ConvertSDToAccess); + FindNtMartaProc(ConvertAclToAccess); + FindNtMartaProc(GetAccessForTrustee); + FindNtMartaProc(GetExplicitEntries); + FindNtMartaProc(RewriteGetNamedRights); + FindNtMartaProc(RewriteSetNamedRights); +#endif + FindNtMartaProc(RewriteGetHandleRights); + FindNtMartaProc(RewriteSetHandleRights); +#if 0 + FindNtMartaProc(RewriteSetEntriesInAcl); + FindNtMartaProc(RewriteGetExplicitEntriesFromAcl); + FindNtMartaProc(TreeResetNamedSecurityInfo); + FindNtMartaProc(GetInheritanceSource); + FindNtMartaProc(FreeIndexArray); +#endif + + return ERROR_SUCCESS; +} + +static DWORD +CheckNtMartaPresent(VOID) +{ + DWORD ErrorCode; + + if (NtMarta == NULL) + { + /* we're the first one trying to use ntmarta, initialize it and change + the pointer after initialization */ + ErrorCode = LoadAndInitializeNtMarta(); + + if (ErrorCode == ERROR_SUCCESS) + { + /* try change the NtMarta pointer */ + if (InterlockedCompareExchangePointer(&NtMarta, + &NtMartaStatic, + NULL) != NULL) + { + /* another thread initialized ntmarta in the meanwhile, release + the reference of the dll loaded. */ + FreeLibrary(NtMartaStatic.hDllInstance); + } + } +#if DBG + else + { + DPRINT1("Failed to initialize ntmarta.dll! Error: 0x%x", ErrorCode); + } +#endif + } + else + { + /* ntmarta was already initialized */ + ErrorCode = ERROR_SUCCESS; + } + + return ErrorCode; +} + +VOID UnloadNtMarta(VOID) +{ + if (InterlockedExchangePointer(&NtMarta, + NULL) != NULL) + { + FreeLibrary(NtMartaStatic.hDllInstance); + } +} + +/********************************************************************** ********/ + /* * @implemented */ @@ -1166,8 +1327,62 @@ PACL* ppSacl, PSECURITY_DESCRIPTOR* ppSecurityDescriptor) { - DPRINT1("GetSecurityInfo: stub\n"); - return ERROR_CALL_NOT_IMPLEMENTED; + DWORD ErrorCode; + + if (handle != NULL) + { + ErrorCode = CheckNtMartaPresent(); + if (ErrorCode == ERROR_SUCCESS) + { + if ((SecurityInfo & (OWNER_SECURITY_INFORMATION | + GROUP_SECURITY_INFORMATION | + DACL_SECURITY_INFORMATION | + SACL_SECURITY_INFORMATION)) && + ppSecurityDescriptor == NULL) + { + /* if one of the SIDs or ACLs are present, the security descriptor + most not be NULL */ + ErrorCode = ERROR_INVALID_PARAMETER; + } + else + { + /* reset the pointers unless they're ignored */ + if ((SecurityInfo & OWNER_SECURITY_INFORMATION) && + ppsidOwner != NULL) + { + ppsidOwner = NULL; + } + if ((SecurityInfo & GROUP_SECURITY_INFORMATION) && + *ppsidGroup != NULL) + { + *ppsidGroup = NULL; + } + if ((SecurityInfo & DACL_SECURITY_INFORMATION) && + ppDacl != NULL) + { + *ppDacl = NULL; + } + if ((SecurityInfo & SACL_SECURITY_INFORMATION) && + ppSacl != NULL) + { + *ppSacl = NULL; + } + + ErrorCode = AccRewriteGetHandleRights(handle, + ObjectType, + SecurityInfo, + ppsidOwner, + ppsidGroup, + ppDacl, + ppSacl, + ppSecurityDescriptor); + } + } + } + else + ErrorCode = ERROR_INVALID_HANDLE; + + return ErrorCode; } @@ -1186,8 +1401,131 @@ PACL pDacl, PACL pSacl) { - DPRINT1("SetSecurityInfo: stub\n"); - return ERROR_CALL_NOT_IMPLEMENTED; + DWORD ErrorCode; + + if (handle != NULL) + { + ErrorCode = CheckNtMartaPresent(); + if (ErrorCode == ERROR_SUCCESS) + { + SECURITY_DESCRIPTOR SecurityDescriptor; + + /* initialize a security descriptor on the stack */ + InitializeSecurityDescriptor(&SecurityDescriptor, + SECURITY_DESCRIPTOR_REVISION); + + if (SecurityInfo & OWNER_SECURITY_INFORMATION) + { + if (RtlValidSid(psidOwner)) + { + if (!SetSecurityDescriptorOwner(&SecurityDescriptor, + psidOwner, + FALSE)) + { + return GetLastError(); + } + } + else + { + return ERROR_INVALID_PARAMETER; + } + } + + if (SecurityInfo & GROUP_SECURITY_INFORMATION) + { + if (RtlValidSid(psidGroup)) + { + if (!SetSecurityDescriptorGroup(&SecurityDescriptor, + psidGroup, + FALSE)) + { + return GetLastError(); + } + } + else + { + return ERROR_INVALID_PARAMETER; + } + } + + if (SecurityInfo & DACL_SECURITY_INFORMATION) + { + if (pDacl != NULL) + { + if (SetSecurityDescriptorDacl(&SecurityDescriptor, + TRUE, + pDacl, + FALSE)) + { + /* check if the DACL needs to be protected from being + modified by inheritable ACEs */ + if (SecurityInfo & PROTECTED_DACL_SECURITY_INFORMATION) + { + goto ProtectDacl; + } + } + else + { + return GetLastError(); + } + } + else + { +ProtectDacl: + /* protect the DACL from being modified by inheritable ACEs */ + if (!SetSecurityDescriptorControl(&SecurityDescriptor, + SE_DACL_PROTECTED, + SE_DACL_PROTECTED)) + { + return GetLastError(); + } + } + } + + if (SecurityInfo & SACL_SECURITY_INFORMATION) + { + if (pSacl != NULL) + { + if (SetSecurityDescriptorSacl(&SecurityDescriptor, + TRUE, + pSacl, + FALSE)) + { + /* check if the SACL needs to be protected from being + modified by inheritable ACEs */ + if (SecurityInfo & PROTECTED_SACL_SECURITY_INFORMATION) + { + goto ProtectSacl; + } + } + else + { + return GetLastError(); + } + } + else + { +ProtectSacl: + /* protect the SACL from being modified by inheritable ACEs */ + if (!SetSecurityDescriptorControl(&SecurityDescriptor, + SE_SACL_PROTECTED, + SE_SACL_PROTECTED)) + { + return GetLastError(); + } + } + } + + ErrorCode = AccRewriteSetHandleRights(handle, + ObjectType, + SecurityInfo, + &SecurityDescriptor); + } + } + else + ErrorCode = ERROR_INVALID_HANDLE; + + return ErrorCode; } _____ Modified: trunk/reactos/w32api/include/winnt.h --- trunk/reactos/w32api/include/winnt.h 2005-07-26 21:17:06 UTC (rev 16759) +++ trunk/reactos/w32api/include/winnt.h 2005-07-26 21:20:55 UTC (rev 16760) @@ -771,6 +771,10 @@ #define GROUP_SECURITY_INFORMATION 2 #define DACL_SECURITY_INFORMATION 4 #define SACL_SECURITY_INFORMATION 8 +#define PROTECTED_DACL_SECURITY_INFORMATION 0x80000000 +#define PROTECTED_SACL_SECURITY_INFORMATION 0x40000000 +#define UNPROTECTED_DACL_SECURITY_INFORMATION 0x20000000 +#define UNPROTECTED_SACL_SECURITY_INFORMATION 0x10000000 #define MAXIMUM_PROCESSORS 32 #define PAGE_NOACCESS 0x0001 #define PAGE_READONLY 0x0002

1 0

[weiden] 16759: added an initial MARTA provider (only two functions stubbed)
by weiden＠svn.reactos.com 26 Jul '05

26 Jul '05

added an initial MARTA provider (only two functions stubbed) Modified: trunk/reactos/baseaddress.xml Modified: trunk/reactos/bootdata/packages/reactos.dff Modified: trunk/reactos/lib/directory.xml Added: trunk/reactos/lib/ntmarta/ Added: trunk/reactos/lib/ntmarta/ntmarta.c Added: trunk/reactos/lib/ntmarta/ntmarta.def Added: trunk/reactos/lib/ntmarta/ntmarta.h Added: trunk/reactos/lib/ntmarta/ntmarta.rc Added: trunk/reactos/lib/ntmarta/ntmarta.xml _____ Modified: trunk/reactos/baseaddress.xml --- trunk/reactos/baseaddress.xml 2005-07-26 19:46:07 UTC (rev 16758) +++ trunk/reactos/baseaddress.xml 2005-07-26 21:17:06 UTC (rev 16759) @@ -56,6 +56,7 @@ <property name="BASEADDRESS_WAVEMAP" value="0x76610000" /> <property name="BASEADDRESS_MPR" value="0x76620000" /> <property name="BASEADDRESS_SETUPAPI" value="0x76660000" /> +<property name="BASEADDRESS_NTMARTA" value="0x768A0000" /> <property name="BASEADDRESS_GDIPLUS" value="0x76a00000" /> <property name="BASEADDRESS_IMAGEHLP" value="0x76c90000" /> <property name="BASEADDRESS_FMIFS" value="0x76df0000" /> _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-07-26 19:46:07 UTC (rev 16758) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-07-26 21:17:06 UTC (rev 16759) @@ -114,6 +114,7 @@ lib\mswsock\mswsock.dll 1 lib\netapi32\netapi32.dll 1 lib\ntdll\ntdll.dll 1 +lib\ntmarta\ntmarta.dll 1 lib\objsel\objsel.dll 1 lib\ole32\ole32.dll 1 lib\oleaut32\oleaut32.dll 1 _____ Modified: trunk/reactos/lib/directory.xml --- trunk/reactos/lib/directory.xml 2005-07-26 19:46:07 UTC (rev 16758) +++ trunk/reactos/lib/directory.xml 2005-07-26 21:17:06 UTC (rev 16759) @@ -190,6 +190,9 @@ <directory name="ntdll"> <xi:include href="ntdll/ntdll.xml" /> </directory> +<directory name="ntmarta"> + <xi:include href="ntmarta/ntmarta.xml" /> +</directory> <directory name="objsel"> <xi:include href="objsel/objsel.xml" /> </directory> Property changes on: trunk/reactos/lib/ntmarta ___________________________________________________________________ Name: svn:ignore + *.coff *.dll *.d *.a *.o *.sym *.map *.tmp *.gch makefile _____ Added: trunk/reactos/lib/ntmarta/ntmarta.c --- trunk/reactos/lib/ntmarta/ntmarta.c 2005-07-26 19:46:07 UTC (rev 16758) +++ trunk/reactos/lib/ntmarta/ntmarta.c 2005-07-26 21:17:06 UTC (rev 16759) @@ -0,0 +1,89 @@ +/* + * ReactOS MARTA provider + * Copyright (C) 2004 ReactOS Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * 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 + */ +/* $Id$ + * + * PROJECT: ReactOS MARTA provider + * FILE: lib/ntmarta/ntmarta.c + * PURPOSE: ReactOS MARTA provider + * PROGRAMMER: Thomas Weidenmueller <w3seek(a)reactos.com> + * + * UPDATE HISTORY: + * 07/26/2005 Created + */ +#include <ntmarta.h> + +#define NDEBUG +#include <debug.h> + +HINSTANCE hDllInstance; + +/********************************************************************** + * AccRewriteGetHandleRights EXPORTED + * + * @unimplemented + */ +DWORD STDCALL +AccRewriteGetHandleRights(HANDLE handle, + SE_OBJECT_TYPE ObjectType, + SECURITY_INFORMATION SecurityInfo, + PSID* ppsidOwner, + PSID* ppsidGroup, + PACL* ppDacl, + PACL* ppSacl, + PSECURITY_DESCRIPTOR* ppSecurityDescriptor) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/********************************************************************** + * AccRewriteSetHandleRights EXPORTED + * + * @unimplemented + */ +DWORD STDCALL +AccRewriteSetHandleRights(HANDLE handle, + SE_OBJECT_TYPE ObjectType, + SECURITY_INFORMATION SecurityInfo, + PSECURITY_DESCRIPTOR pSecurityDescriptor) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +BOOL STDCALL +DllMain(IN HINSTANCE hinstDLL, + IN DWORD dwReason, + IN LPVOID lpvReserved) +{ + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + hDllInstance = hinstDLL; + break; + case DLL_THREAD_ATTACH: + case DLL_THREAD_DETACH: + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} + Property changes on: trunk/reactos/lib/ntmarta/ntmarta.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/ntmarta/ntmarta.def --- trunk/reactos/lib/ntmarta/ntmarta.def 2005-07-26 19:46:07 UTC (rev 16758) +++ trunk/reactos/lib/ntmarta/ntmarta.def 2005-07-26 21:17:06 UTC (rev 16759) @@ -0,0 +1,47 @@ +LIBRARY ntmarta.dll + +EXPORTS +;AccFreeIndexArray +;AccGetInheritanceSource +;AccProvHandleGrantAccessRights; +;AccRewriteGetExplicitEntriesFromAcl +AccRewriteGetHandleRights@32 +;AccRewriteGetNamedRights +;AccRewriteSetEntriesInAcl +AccRewriteSetHandleRights@16 +;AccRewriteSetNamedRights +;AccTreeResetNamedSecurityInfo +;AccConvertAccessMaskToActrlAccess +;AccConvertAccessToSD +;AccConvertAccessToSecurityDescriptor +;AccConvertAclToAccess +;AccConvertSDToAccess +;AccGetAccessForTrustee +;AccGetExplicitEntries +;AccLookupAccountName +;AccLookupAccountSid; +;AccLookupAccountTrustee +;AccProvCancelOperation; +;AccProvGetAccessInfoPerObjectType +;AccProvGetAllRights +;AccProvGetCapabilities +;AccProvGetOperationResults +;AccProvGetTrusteesAccess +;AccProvGrantAccessRights +;AccProvHandleGetAccessInfoPerObjectType +;AccProvHandleGetAllRights +;AccProvHandleGetTrusteesAccess +;AccProvHandleIsAccessAudited +;AccProvHandleIsObjectAccessible +;AccProvHandleRevokeAccessRights +;AccProvHandleRevokeAuditRights +;AccProvHandleSetAccessRights +;AccProvIsAccessAudited +;AccProvIsObjectAccessible +;AccProvRevokeAccessRights +;AccProvSetAccessRights +;AccSetEntriesInAList +;EventGuidToName +;EventNameFree + +; EOF Property changes on: trunk/reactos/lib/ntmarta/ntmarta.def ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/lib/ntmarta/ntmarta.h --- trunk/reactos/lib/ntmarta/ntmarta.h 2005-07-26 19:46:07 UTC (rev 16758) +++ trunk/reactos/lib/ntmarta/ntmarta.h 2005-07-26 21:17:06 UTC (rev 16759) @@ -0,0 +1,8 @@ +#include <windows.h> +#include <accctrl.h> + +ULONG DbgPrint(PCH Format,...); + +extern HINSTANCE hDllInstance; + +/* EOF */ Property changes on: trunk/reactos/lib/ntmarta/ntmarta.h ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/ntmarta/ntmarta.rc --- trunk/reactos/lib/ntmarta/ntmarta.rc 2005-07-26 19:46:07 UTC (rev 16758) +++ trunk/reactos/lib/ntmarta/ntmarta.rc 2005-07-26 21:17:06 UTC (rev 16759) @@ -0,0 +1,9 @@ +#include <windows.h> +#include <reactos/resource.h> + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS MARTA Provider\0" +#define REACTOS_STR_INTERNAL_NAME "ntmarta\0" +#define REACTOS_STR_ORIGINAL_FILENAME "ntmarta.dll\0" +#include <reactos/version.rc> + Property changes on: trunk/reactos/lib/ntmarta/ntmarta.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/lib/ntmarta/ntmarta.xml --- trunk/reactos/lib/ntmarta/ntmarta.xml 2005-07-26 19:46:07 UTC (rev 16758) +++ trunk/reactos/lib/ntmarta/ntmarta.xml 2005-07-26 21:17:06 UTC (rev 16759) @@ -0,0 +1,16 @@ +<module name="ntmarta" type="win32dll" baseaddress="${BASEADDRESS_NTMARTA}" installbase="system32" installname="ntmarta.dll"> + <importlibrary definition="ntmarta.def" /> + <include base="ntmarta">.</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0500</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x0600</define> + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <file>ntmarta.c</file> + <file>ntmarta.rc</file> + <pch>ntmarta.h</pch> +</module> Property changes on: trunk/reactos/lib/ntmarta/ntmarta.xml ___________________________________________________________________ Name: svn:eol-style + native

1 0

[hbirr] 16758: Lock the handle table if we trying to get a pointer from a handle.
by hbirr＠svn.reactos.com 26 Jul '05

26 Jul '05

Lock the handle table if we trying to get a pointer from a handle. Modified: trunk/reactos/ntoskrnl/ex/handle.c _____ Modified: trunk/reactos/ntoskrnl/ex/handle.c --- trunk/reactos/ntoskrnl/ex/handle.c 2005-07-26 19:38:33 UTC (rev 16757) +++ trunk/reactos/ntoskrnl/ex/handle.c 2005-07-26 19:46:07 UTC (rev 16758) @@ -910,14 +910,16 @@ ASSERT(HandleTable); + ExAcquireHandleTableLockShared(HandleTable); HandleTableEntry = ExpLookupHandleTableEntry(HandleTable, Handle); if (HandleTableEntry != NULL && ExLockHandleTableEntry(HandleTable, HandleTableEntry)) { DPRINT("ExMapHandleToPointer HT:0x%p Entry:0x%p locked\n", HandleTable, HandleTableEntry); + ExReleaseHandleTableLock(HandleTable); return HandleTableEntry; } - + ExReleaseHandleTableLock(HandleTable); return NULL; } @@ -936,12 +938,14 @@ ASSERT(ChangeHandleCallback); KeEnterCriticalRegion(); + ExAcquireHandleTableLockShared(HandleTable); HandleTableEntry = ExpLookupHandleTableEntry(HandleTable, Handle); if(HandleTableEntry != NULL && ExLockHandleTableEntry(HandleTable, HandleTableEntry)) { + ExReleaseHandleTableLock(HandleTable); Ret = ChangeHandleCallback(HandleTable, HandleTableEntry, NULL); @@ -949,7 +953,10 @@ ExUnlockHandleTableEntry(HandleTable, HandleTableEntry); } - + else + { + ExReleaseHandleTableLock(HandleTable); + } KeLeaveCriticalRegion(); return Ret;

1 0

[hbirr] 16757: Used IoQueryFileInformation and IoSetInformation instead of ZwQueryInformationFile and ZwSetInformationFile to remove some overhead.
by hbirr＠svn.reactos.com 26 Jul '05

26 Jul '05

Used IoQueryFileInformation and IoSetInformation instead of ZwQueryInformationFile and ZwSetInformationFile to remove some overhead. Modified: trunk/reactos/ntoskrnl/mm/section.c _____ Modified: trunk/reactos/ntoskrnl/mm/section.c --- trunk/reactos/ntoskrnl/mm/section.c 2005-07-26 19:35:22 UTC (rev 16756) +++ trunk/reactos/ntoskrnl/mm/section.c 2005-07-26 19:38:33 UTC (rev 16757) @@ -2308,11 +2308,11 @@ * (as in case of the EXT2FS driver by Manoj Paul Joseph where the * standard file information is filled on first request). */ - Status = ZwQueryInformationFile(FileHandle, - &Iosb, - &FileInfo, + Status = IoQueryFileInformation(FileObject, + FileStandardInformation, sizeof(FILE_STANDARD_INFORMATION), - FileStandardInformation); + &FileInfo, + &Iosb.Information); if (!NT_SUCCESS(Status)) { ObDereferenceObject(Section); @@ -2342,11 +2342,10 @@ if (MaximumSize.QuadPart > FileInfo.EndOfFile.QuadPart) { - Status = ZwSetInformationFile(FileHandle, - &Iosb, - &MaximumSize, - sizeof(LARGE_INTEGER), - FileAllocationInformation); + Status = IoSetInformation(FileObject, + FileAllocationInformation, + sizeof(LARGE_INTEGER), + &MaximumSize); if (!NT_SUCCESS(Status)) { ObDereferenceObject(Section);

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