Ros-diffs July 2005

ros-diffs@reactos.org

21 participants
563 discussions

by ion＠svn.reactos.com

- Fix warnings - Revert to wZ, gcc is being stupid. Modified: trunk/reactos/subsys/system/calc/winecalc.c Modified: trunk/reactos/subsys/system/usetup/partlist.c _____ Modified: trunk/reactos/subsys/system/calc/winecalc.c --- trunk/reactos/subsys/system/calc/winecalc.c 2005-07-27 00:55:36 UTC (rev 16768) +++ trunk/reactos/subsys/system/calc/winecalc.c 2005-07-27 01:02:51 UTC (rev 16769) @@ -2927,15 +2927,15 @@ switch (calc->numBase) { case NBASE_HEX: real = calc_atof(calc->buffer, calc->numBase); - sprintf(calc->display, "%x", (long)real); + sprintf(calc->display, "%lx", (long)real); break; case NBASE_OCTAL: - sprintf(calc->display, "%o", calc->buffer); + sprintf(calc->display, "%lo", (long)calc->buffer); break; case NBASE_BINARY: - sprintf(calc->display, "%x", calc->buffer); + sprintf(calc->display, "%lx", (long)calc->buffer); break; case NBASE_DECIMAL: @@ -3060,7 +3060,7 @@ // commify the integer part now - while (c = *(s + --n)) { + while ((c = *(s + --n))) { r[i++] = c; if (x++ % 3 == 0) r[i++] = ','; @@ -3258,7 +3258,7 @@ case 'F': { char s22[CALC_BUF_SIZE]; - char w = (char)LOWORD(wParam); + UCHAR w = (UCHAR)LOWORD(wParam); if (!keys[calc.numBase][w]) { MessageBeep(0); _____ Modified: trunk/reactos/subsys/system/usetup/partlist.c --- trunk/reactos/subsys/system/usetup/partlist.c 2005-07-27 00:55:36 UTC (rev 16768) +++ trunk/reactos/subsys/system/usetup/partlist.c 2005-07-27 01:02:51 UTC (rev 16769) @@ -918,14 +918,14 @@ if (DiskEntry->DriverName.Length > 0) { sprintf (LineBuffer, - "%6I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S", + "%6I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ", DiskSize, Unit, DiskEntry->DiskNumber, DiskEntry->Port, DiskEntry->Bus, DiskEntry->Id, - DiskEntry->DriverName.Buffer); + &DiskEntry->DriverName); } else {

19 years, 2 months

[ion] 16768: - Fix warnings

by ion＠svn.reactos.com

- Fix warnings Modified: trunk/reactos/subsys/system/winefile/winefile.c _____ Modified: trunk/reactos/subsys/system/winefile/winefile.c --- trunk/reactos/subsys/system/winefile/winefile.c 2005-07-27 00:54:07 UTC (rev 16767) +++ trunk/reactos/subsys/system/winefile/winefile.c 2005-07-27 00:55:36 UTC (rev 16768) @@ -1821,12 +1821,12 @@ static TCHAR sTranslation[] = {'\\','V','a','r','F','i','l','e','I','n','f','o','\\','T','r','a','n',' s','l','a','t','i','o','n','\0'}; static TCHAR sStringFileInfo[] = {'\\','S','t','r','i','n','g','F','i','l','e','I','n','f','o','\\', '%','0','4','x','%','0','4','x','\\','%','s','\0'}; - DWORD dwVersionDataLen = GetFileVersionInfoSize(strFilename, NULL); + DWORD dwVersionDataLen = GetFileVersionInfoSize((LPWSTR)strFilename, NULL); if (dwVersionDataLen) { dlg->pVersionData = malloc(dwVersionDataLen); - if (GetFileVersionInfo(strFilename, 0, dwVersionDataLen, dlg->pVersionData)) { + if (GetFileVersionInfo((LPWSTR)strFilename, 0, dwVersionDataLen, dlg->pVersionData)) { LPVOID pVal; UINT nValLen;

19 years, 2 months

[ion] 16767: - Fix warnings

by ion＠svn.reactos.com

- Fix warnings Modified: trunk/reactos/subsys/system/usetup/partlist.c Modified: trunk/reactos/subsys/system/usetup/usetup.h _____ Modified: trunk/reactos/subsys/system/usetup/partlist.c --- trunk/reactos/subsys/system/usetup/partlist.c 2005-07-27 00:50:24 UTC (rev 16766) +++ trunk/reactos/subsys/system/usetup/partlist.c 2005-07-27 00:54:07 UTC (rev 16767) @@ -918,14 +918,14 @@ if (DiskEntry->DriverName.Length > 0) { sprintf (LineBuffer, - "%6I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ", + "%6I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S", DiskSize, Unit, DiskEntry->DiskNumber, DiskEntry->Port, DiskEntry->Bus, DiskEntry->Id, - &DiskEntry->DriverName); + DiskEntry->DriverName.Buffer); } else { _____ Modified: trunk/reactos/subsys/system/usetup/usetup.h --- trunk/reactos/subsys/system/usetup/usetup.h 2005-07-27 00:50:24 UTC (rev 16766) +++ trunk/reactos/subsys/system/usetup/usetup.h 2005-07-27 00:54:07 UTC (rev 16767) @@ -27,6 +27,10 @@ #ifndef __USETUP_H__ #define __USETUP_H__ +/* C Headers */ +#include <ctype.h> +#include <stdio.h> + /* PSDK/NDK */ #include <windows.h> #include <fmifs/fmifs.h>

19 years, 2 months

[greatlrd] 16766: update the english text for type

by greatlrd＠svn.reactos.com

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\

19 years, 2 months

[greatlrd] 16765: add /P as param for Type, from PCDOS by Brandon Turner

by greatlrd＠svn.reactos.com

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);

19 years, 2 months

[navaraf] 16764: Do not dereference NULL pointers and this time for real.

by navaraf＠svn.reactos.com

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)) {

19 years, 2 months

[navaraf] 16763: Do not dereference NULL pointers.

by navaraf＠svn.reactos.com

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)

19 years, 2 months

[weiden] 16762: implemented GetNamedSecurityA/W and SetNamedSecurityInfoA/W and forward them to the MARTA provider

by weiden＠svn.reactos.com

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

19 years, 2 months

[hbirr] 16761: reverted last change

by hbirr＠svn.reactos.com

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;

19 years, 2 months

[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

- 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

19 years, 2 months

← Newer
1
...
14
15
16
17
18
19
20
...
57
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2005