Ros-diffs January 2006

ros-diffs@reactos.org

23 participants
586 discussions

[weiden] 20973: translate the \\?\ prefix to \??\ in RtlDosPathNameToNtPathName_U
by weiden＠svn.reactos.org 22 Jan '06

22 Jan '06

translate the \\?\ prefix to \??\ in RtlDosPathNameToNtPathName_U Modified: trunk/reactos/lib/rtl/path.c _____ Modified: trunk/reactos/lib/rtl/path.c --- trunk/reactos/lib/rtl/path.c 2006-01-22 11:08:35 UTC (rev 20972) +++ trunk/reactos/lib/rtl/path.c 2006-01-22 12:29:40 UTC (rev 20973) @@ -690,9 +690,6 @@ WCHAR fullname[MAX_PATH + 1]; PWSTR Buffer = NULL; - - RtlAcquirePebLock (); - RtlInitUnicodeString (&us, DosPathName); if (us.Length > 8) { @@ -700,15 +697,56 @@ /* check for "\\?\" - allows to use very long filenames ( up to 32k ) */ if (Buffer[0] == L'\\' && Buffer[1] == L'\\' && Buffer[2] == L'?' && Buffer[3] == L'\\') - { -// if( f_77F68606( &us, ntname, shortname, nah ) ) -// { -// RtlReleasePebLock (); -// return TRUE; -// } - Buffer = NULL; - RtlReleasePebLock (); - return FALSE; + { + /* allocate the new string and simply copy it */ + NtPathName->Length = us.Length; + NtPathName->MaximumLength = us.Length + sizeof(WCHAR); + NtPathName->Buffer = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + NtPathName->MaximumLength); + if (NtPathName->Buffer == NULL) + { + return FALSE; + } + + /* copy the string */ + RtlCopyMemory(NtPathName->Buffer, + us.Buffer, + NtPathName->Length); + NtPathName->Buffer[us.Length / sizeof(WCHAR)] = L'\0'; + + /* change the \\?\ prefix to \??\ */ + NtPathName->Buffer[1] = L'?'; + + if (NtFileNamePart != NULL) + { + PWSTR FilePart = NULL; + PWSTR s; + + /* try to find the last separator */ + s = NtPathName->Buffer + (NtPathName->Length / sizeof(WCHAR)); + while (s != NtPathName->Buffer) + { + if (*s == L'\\') + { + FilePart = s + 1; + break; + } + s--; + } + + *NtFileNamePart = FilePart; + } + + if (DirectoryInfo != NULL) + { + DirectoryInfo->DosPath.Length = 0; + DirectoryInfo->DosPath.MaximumLength = 0; + DirectoryInfo->DosPath.Buffer = NULL; + DirectoryInfo->Handle = NULL; + } + + return TRUE; } } @@ -717,10 +755,11 @@ sizeof( fullname ) + MAX_PFX_SIZE); if (Buffer == NULL) { - RtlReleasePebLock (); return FALSE; } + RtlAcquirePebLock (); + Size = RtlGetFullPathName_U (DosPathName, sizeof(fullname), fullname,

1 0

[weiden] 20972: fixed compiling
by weiden＠svn.reactos.org 22 Jan '06

22 Jan '06

fixed compiling Modified: trunk/reactos/lib/gdi32/objects/font.c _____ Modified: trunk/reactos/lib/gdi32/objects/font.c --- trunk/reactos/lib/gdi32/objects/font.c 2006-01-22 04:20:30 UTC (rev 20971) +++ trunk/reactos/lib/gdi32/objects/font.c 2006-01-22 11:08:35 UTC (rev 20972) @@ -15,73 +15,6 @@ #define INITIAL_FAMILY_COUNT 64 -/********************************************************************** * - * FONT_mbtowc - * - * Returns a Unicode translation of str using the charset of the - * currently selected font in hdc. If count is -1 then str is assumed - * to be '\0' terminated, otherwise it contains the number of bytes to - * convert. If plenW is non-NULL, on return it will point to the - * number of WCHARs that have been written. If pCP is non-NULL, on - * return it will point to the codepage used in the conversion. The - * caller should free the returned LPWSTR from the process heap - * itself. - */ -static LPWSTR FONT_mbtowc(HDC hdc, LPCSTR str, INT count, INT *plenW, UINT *pCP) -{ - UINT cp = CP_ACP; - INT lenW; - LPWSTR strW; - CHARSETINFO csi; - int charset = GetTextCharset(hdc); - - /* Hmm, nicely designed api this one! */ - if(NtGdiTranslateCharsetInfo((PDWORD)charset, &csi, TCI_SRCCHARSET)) - cp = csi.ciACP; - else { - switch(charset) { - case OEM_CHARSET: - cp = GetOEMCP(); - break; - case DEFAULT_CHARSET: - cp = GetACP(); - break; - -/* case VISCII_CHARSET: - case TCVN_CHARSET: - case KOI8_CHARSET: - case ISO3_CHARSET: - case ISO4_CHARSET: - case ISO10_CHARSET: - case CELTIC_CHARSET:*/ - /* FIXME: These have no place here, but because x11drv - enumerates fonts with these (made up) charsets some apps - might use them and then the FIXME below would become - annoying. Now we could pick the intended codepage for - each of these, but since it's broken anyway we'll just - use CP_ACP and hope it'll go away... - */ - /* cp = CP_ACP; - break;*/ - - default: - DPRINT1("Can't find codepage for charset %d\n", charset); - break; - } - } - - DPRINT("charset %d => cp %d\n", charset, cp); - - if(count == -1) count = strlen(str); - lenW = MultiByteToWideChar(cp, 0, str, count, NULL, 0); - strW = HeapAlloc(GetProcessHeap(), 0, lenW*sizeof(WCHAR)); - MultiByteToWideChar(cp, 0, str, count, strW, lenW); - if(plenW) *plenW = lenW; - if(pCP) *pCP = cp; - return strW; -} - - static BOOL FASTCALL MetricsCharConvert(WCHAR w, UCHAR *b) { @@ -415,7 +348,7 @@ ) { /* FIXME should be NtGdiGetCharWidthW */ - return NtGdiGetCharWidth32(hdc, iFirstChar, iLastChar, lpBuffer)) + return NtGdiGetCharWidth32(hdc, iFirstChar, iLastChar, lpBuffer); }

1 0

[weiden] 20971: try to get the user from the token and fall back to reading the owner from the process when needed
by weiden＠svn.reactos.org 22 Jan '06

22 Jan '06

try to get the user from the token and fall back to reading the owner from the process when needed Modified: trunk/reactos/subsys/system/taskmgr/perfdata.c _____ Modified: trunk/reactos/subsys/system/taskmgr/perfdata.c --- trunk/reactos/subsys/system/taskmgr/perfdata.c 2006-01-22 03:53:02 UTC (rev 20970) +++ trunk/reactos/subsys/system/taskmgr/perfdata.c 2006-01-22 04:20:30 UTC (rev 20971) @@ -92,14 +92,16 @@ PPERFDATA pPDOld; ULONG Idx, Idx2; HANDLE hProcess; + HANDLE hProcessToken; SYSTEM_PERFORMANCE_INFORMATION SysPerfInfo; SYSTEM_TIMEOFDAY_INFORMATION SysTimeInfo; SYSTEM_CACHE_INFORMATION SysCacheInfo; LPBYTE SysHandleInfoData; PSYSTEM_PROCESSOR_PERFORMANCE_INFORMATION SysProcessorTimeInfo; double CurrentKernelTime; - PSECURITY_DESCRIPTOR ProcessSD = NULL; + PSECURITY_DESCRIPTOR ProcessSD; PSID ProcessUser; + ULONG Buffer[64]; /* must be 4 bytes aligned! */ /* Get new system time */ status = NtQuerySystemInformation(SystemTimeOfDayInformation, &SysTimeInfo, sizeof(SysTimeInfo), 0); @@ -281,15 +283,41 @@ pPerfData[Idx].ThreadCount = pSPI->NumberOfThreads; pPerfData[Idx].SessionId = pSPI->SessionId; pPerfData[Idx].UserName[0] = _T('\0'); + pPerfData[Idx].USERObjectCount = 0; + pPerfData[Idx].GDIObjectCount = 0; ProcessUser = SystemUserSid; + ProcessSD = NULL; if (pSPI->UniqueProcessId != NULL) { hProcess = OpenProcess(PROCESS_QUERY_INFORMATION | READ_CONTROL, FALSE, PtrToUlong(pSPI->UniqueProcessId)); if (hProcess) { - GetSecurityInfo(hProcess, SE_KERNEL_OBJECT, OWNER_SECURITY_INFORMATION, &ProcessUser, NULL, NULL, NULL, &ProcessSD); + /* don't query the information of the system process. It's possible but + returns Administrators as the owner of the process instead of SYSTEM */ + if (pSPI->UniqueProcessId != (HANDLE)0x4) + { + if (OpenProcessToken(hProcess, TOKEN_QUERY, &hProcessToken)) + { + DWORD RetLen = 0; + BOOL Ret; - pPerfData[Idx].USERObjectCount = GetGuiResources(hProcess, GR_USEROBJECTS); - pPerfData[Idx].GDIObjectCount = GetGuiResources(hProcess, GR_GDIOBJECTS); + Ret = GetTokenInformation(hProcessToken, TokenUser, (LPVOID)Buffer, sizeof(Buffer), &RetLen); + CloseHandle(hProcessToken); + + if (Ret) + ProcessUser = ((PTOKEN_USER)Buffer)->User.Sid; + else + goto ReadProcOwner; + } + else + { +ReadProcOwner: + GetSecurityInfo(hProcess, SE_KERNEL_OBJECT, OWNER_SECURITY_INFORMATION, &ProcessUser, NULL, NULL, NULL, &ProcessSD); + } + + pPerfData[Idx].USERObjectCount = GetGuiResources(hProcess, GR_USEROBJECTS); + pPerfData[Idx].GDIObjectCount = GetGuiResources(hProcess, GR_GDIOBJECTS); + } + GetProcessIoCounters(hProcess, &pPerfData[Idx].IOCounters); CloseHandle(hProcess); } else { @@ -298,8 +326,6 @@ } else { ClearInfo: /* clear information we were unable to fetch */ - pPerfData[Idx].USERObjectCount = 0; - pPerfData[Idx].GDIObjectCount = 0; ZeroMemory(&pPerfData[Idx].IOCounters, sizeof(IO_COUNTERS)); }

1 0

[weiden] 20970: fixed allocating the memory for the security descriptor
by weiden＠svn.reactos.org 22 Jan '06

22 Jan '06

fixed allocating the memory for the security descriptor Modified: trunk/reactos/lib/ntmarta/ntmarta.c _____ Modified: trunk/reactos/lib/ntmarta/ntmarta.c --- trunk/reactos/lib/ntmarta/ntmarta.c 2006-01-22 03:50:36 UTC (rev 20969) +++ trunk/reactos/lib/ntmarta/ntmarta.c 2006-01-22 03:53:02 UTC (rev 20970) @@ -62,7 +62,7 @@ /* allocate a buffer large enough to hold the security descriptor we need to return */ SDSize += 0x100; - if (pSD != NULL) + if (pSD == NULL) { pSD = LocalAlloc(LMEM_FIXED, (SIZE_T)SDSize);

1 0

[ros-diffs] [weiden] 20969: return the pointers of the owner, group, dacl and sacl in the security descriptor returned by GetSecurityInfo()
by weiden＠svn.reactos.org 22 Jan '06

22 Jan '06

return the pointers of the owner, group, dacl and sacl in the security descriptor returned by GetSecurityInfo() Modified: trunk/reactos/lib/ntmarta/ntmarta.c _____ Modified: trunk/reactos/lib/ntmarta/ntmarta.c --- trunk/reactos/lib/ntmarta/ntmarta.c 2006-01-22 03:27:21 UTC (rev 20968) +++ trunk/reactos/lib/ntmarta/ntmarta.c 2006-01-22 03:50:36 UTC (rev 20969) @@ -1,6 +1,6 @@ /* * ReactOS MARTA provider - * Copyright (C) 2004 ReactOS Team + * Copyright (C) 2005 - 2006 ReactOS Team * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -69,9 +69,13 @@ } else { - pSD = LocalReAlloc((HLOCAL)pSD, - (SIZE_T)SDSize, - LMEM_MOVEABLE); + PSECURITY_DESCRIPTOR newSD; + + newSD = LocalReAlloc((HLOCAL)pSD, + (SIZE_T)SDSize, + LMEM_MOVEABLE); + if (newSD != NULL) + pSD = newSD; } if (pSD == NULL) @@ -136,11 +140,67 @@ if (Ret == ERROR_SUCCESS) { + BOOL Present, Defaulted; + + if (SecurityInfo & OWNER_SECURITY_INFORMATION && ppsidOwner != NULL) + { + *ppsidOwner = NULL; + if (!GetSecurityDescriptorOwner(pSD, + ppsidOwner, + &Defaulted)) + { + Ret = GetLastError(); + goto Cleanup; + } + } + + if (SecurityInfo & GROUP_SECURITY_INFORMATION && ppsidGroup != NULL) + { + *ppsidOwner = NULL; + if (!GetSecurityDescriptorGroup(pSD, + ppsidGroup, + &Defaulted)) + { + Ret = GetLastError(); + goto Cleanup; + } + } + + if (SecurityInfo & DACL_SECURITY_INFORMATION && ppDacl != NULL) + { + *ppDacl = NULL; + if (!GetSecurityDescriptorDacl(pSD, + &Present, + ppDacl, + &Defaulted)) + { + Ret = GetLastError(); + goto Cleanup; + } + } + + if (SecurityInfo & SACL_SECURITY_INFORMATION && ppSacl != NULL) + { + *ppSacl = NULL; + if (!GetSecurityDescriptorSacl(pSD, + &Present, + ppSacl, + &Defaulted)) + { + Ret = GetLastError(); + goto Cleanup; + } + } + *ppSecurityDescriptor = pSD; } - else if (pSD != NULL) + else { - LocalFree((HLOCAL)pSD); +Cleanup: + if (pSD != NULL) + { + LocalFree((HLOCAL)pSD); + } } /* restore the last error code */

1 0

[weiden] 20968: implement the object types SE_REGISTRY_KEY, SE_FILE_OBJECT, SE_SERVICE and SE_WINDOW_OBJECT for GetSecurityInfo()
by weiden＠svn.reactos.org 22 Jan '06

22 Jan '06

implement the object types SE_REGISTRY_KEY, SE_FILE_OBJECT, SE_SERVICE and SE_WINDOW_OBJECT for GetSecurityInfo() Modified: trunk/reactos/lib/ntmarta/ntmarta.c Modified: trunk/reactos/lib/ntmarta/ntmarta.h _____ Modified: trunk/reactos/lib/ntmarta/ntmarta.c --- trunk/reactos/lib/ntmarta/ntmarta.c 2006-01-22 03:07:21 UTC (rev 20967) +++ trunk/reactos/lib/ntmarta/ntmarta.c 2006-01-22 03:27:21 UTC (rev 20968) @@ -49,7 +49,7 @@ PSECURITY_DESCRIPTOR* ppSecurityDescriptor) { PSECURITY_DESCRIPTOR pSD = NULL; - ULONG RequiredSize, SDSize = 0; + ULONG SDSize = 0; NTSTATUS Status; DWORD LastErr; DWORD Ret = ERROR_SUCCESS; @@ -57,59 +57,83 @@ /* save the last error code */ LastErr = GetLastError(); -AllocBuffer: - /* allocate a buffer large enough to hold the - security descriptor we need to return */ - SDSize += 0x100; - if (pSD != NULL) + do { - pSD = LocalAlloc(LMEM_FIXED, - (SIZE_T)SDSize); - } - else - { - pSD = LocalReAlloc((HLOCAL)pSD, - (SIZE_T)SDSize, - LMEM_MOVEABLE); - } + /* allocate a buffer large enough to hold the + security descriptor we need to return */ + SDSize += 0x100; + if (pSD != NULL) + { + pSD = LocalAlloc(LMEM_FIXED, + (SIZE_T)SDSize); + } + else + { + pSD = LocalReAlloc((HLOCAL)pSD, + (SIZE_T)SDSize, + LMEM_MOVEABLE); + } - if (pSD == NULL) - { - Ret = GetLastError(); - goto Cleanup; - } + if (pSD == NULL) + { + Ret = GetLastError(); + break; + } - /* perform the actual query depending on the object type */ - switch (ObjectType) - { - case SE_KERNEL_OBJECT: + /* perform the actual query depending on the object type */ + switch (ObjectType) { - Status = NtQuerySecurityObject(handle, - SecurityInfo, - pSD, - SDSize, - &RequiredSize); - if (Status == STATUS_BUFFER_TOO_SMALL) + case SE_REGISTRY_KEY: { - /* not enough memory, increase the size of - the buffer and try again */ - ASSERT(RequiredSize > SDSize); - SDSize = RequiredSize; - goto AllocBuffer; + Ret = RegGetKeySecurity((HKEY)handle, + SecurityInfo, + pSD, + &SDSize); + break; } - Ret = RtlNtStatusToDosError(Status); - break; - } - default: - { - UNIMPLEMENTED; - Ret = ERROR_CALL_NOT_IMPLEMENTED; - break; + case SE_FILE_OBJECT: + case SE_KERNEL_OBJECT: + { + Status = NtQuerySecurityObject(handle, + SecurityInfo, + pSD, + SDSize, + &SDSize); + Ret = RtlNtStatusToDosError(Status); + break; + } + + case SE_SERVICE: + { + Ret = QueryServiceObjectSecurity((SC_HANDLE)handle, + SecurityInfo, + pSD, + SDSize, + &SDSize); + break; + } + + case SE_WINDOW_OBJECT: + { + Ret = GetUserObjectSecurity(handle, + &SecurityInfo, + pSD, + SDSize, + &SDSize); + break; + } + + default: + { + UNIMPLEMENTED; + Ret = ERROR_CALL_NOT_IMPLEMENTED; + break; + } } - } -Cleanup: + } while (Ret == ERROR_INSUFFICIENT_BUFFER); + if (Ret == ERROR_SUCCESS) { *ppSecurityDescriptor = pSD; _____ Modified: trunk/reactos/lib/ntmarta/ntmarta.h --- trunk/reactos/lib/ntmarta/ntmarta.h 2006-01-22 03:07:21 UTC (rev 20967) +++ trunk/reactos/lib/ntmarta/ntmarta.h 2006-01-22 03:27:21 UTC (rev 20968) @@ -3,6 +3,7 @@ #include <windows.h> #include <ndk/ntndk.h> #include <accctrl.h> +#include <winsvc.h> #ifndef HAS_FN_PROGRESSW #define FN_PROGRESSW FN_PROGRESS

1 0

[weiden] 20967: implement the object type SE_KERNEL_OBJECT for GetSecurityInfo()
by weiden＠svn.reactos.org 22 Jan '06

22 Jan '06

implement the object type SE_KERNEL_OBJECT for GetSecurityInfo() Modified: trunk/reactos/lib/ntmarta/ntmarta.c Modified: trunk/reactos/lib/ntmarta/ntmarta.h _____ Modified: trunk/reactos/lib/ntmarta/ntmarta.c --- trunk/reactos/lib/ntmarta/ntmarta.c 2006-01-22 02:43:36 UTC (rev 20966) +++ trunk/reactos/lib/ntmarta/ntmarta.c 2006-01-22 03:07:21 UTC (rev 20967) @@ -48,8 +48,81 @@ PACL* ppSacl, PSECURITY_DESCRIPTOR* ppSecurityDescriptor) { - UNIMPLEMENTED; - return ERROR_CALL_NOT_IMPLEMENTED; + PSECURITY_DESCRIPTOR pSD = NULL; + ULONG RequiredSize, SDSize = 0; + NTSTATUS Status; + DWORD LastErr; + DWORD Ret = ERROR_SUCCESS; + + /* save the last error code */ + LastErr = GetLastError(); + +AllocBuffer: + /* allocate a buffer large enough to hold the + security descriptor we need to return */ + SDSize += 0x100; + if (pSD != NULL) + { + pSD = LocalAlloc(LMEM_FIXED, + (SIZE_T)SDSize); + } + else + { + pSD = LocalReAlloc((HLOCAL)pSD, + (SIZE_T)SDSize, + LMEM_MOVEABLE); + } + + if (pSD == NULL) + { + Ret = GetLastError(); + goto Cleanup; + } + + /* perform the actual query depending on the object type */ + switch (ObjectType) + { + case SE_KERNEL_OBJECT: + { + Status = NtQuerySecurityObject(handle, + SecurityInfo, + pSD, + SDSize, + &RequiredSize); + if (Status == STATUS_BUFFER_TOO_SMALL) + { + /* not enough memory, increase the size of + the buffer and try again */ + ASSERT(RequiredSize > SDSize); + SDSize = RequiredSize; + goto AllocBuffer; + } + Ret = RtlNtStatusToDosError(Status); + break; + } + + default: + { + UNIMPLEMENTED; + Ret = ERROR_CALL_NOT_IMPLEMENTED; + break; + } + } + +Cleanup: + if (Ret == ERROR_SUCCESS) + { + *ppSecurityDescriptor = pSD; + } + else if (pSD != NULL) + { + LocalFree((HLOCAL)pSD); + } + + /* restore the last error code */ + SetLastError(LastErr); + + return Ret; } _____ Modified: trunk/reactos/lib/ntmarta/ntmarta.h --- trunk/reactos/lib/ntmarta/ntmarta.h 2006-01-22 02:43:36 UTC (rev 20966) +++ trunk/reactos/lib/ntmarta/ntmarta.h 2006-01-22 03:07:21 UTC (rev 20967) @@ -1,4 +1,7 @@ +#define WIN32_NO_STATUS +#define NTOS_MODE_USER #include <windows.h> +#include <ndk/ntndk.h> #include <accctrl.h> #ifndef HAS_FN_PROGRESSW

1 0

[weiden] 20966: - fixed getting the process owner
by weiden＠svn.reactos.org 22 Jan '06

22 Jan '06

- fixed getting the process owner - build as unicode by default Modified: trunk/reactos/subsys/system/taskmgr/perfdata.c Modified: trunk/reactos/subsys/system/taskmgr/precomp.h Modified: trunk/reactos/subsys/system/taskmgr/taskmgr.xml _____ Modified: trunk/reactos/subsys/system/taskmgr/perfdata.c --- trunk/reactos/subsys/system/taskmgr/perfdata.c 2006-01-21 23:00:16 UTC (rev 20965) +++ trunk/reactos/subsys/system/taskmgr/perfdata.c 2006-01-22 02:43:36 UTC (rev 20966) @@ -38,9 +38,11 @@ SYSTEM_CACHE_INFORMATION SystemCacheInfo; SYSTEM_HANDLE_INFORMATION SystemHandleInfo; PSYSTEM_PROCESSOR_PERFORMANCE_INFORMATION SystemProcessorTimeInfo = NULL; +PSID SystemUserSid = NULL; BOOL PerfDataInitialize(void) { + SID_IDENTIFIER_AUTHORITY NtSidAuthority = {SECURITY_NT_AUTHORITY}; NTSTATUS status; InitializeCriticalSection(&PerfDataCriticalSection); @@ -52,14 +54,34 @@ if (status != NO_ERROR) return FALSE; + /* + * Create the SYSTEM Sid + */ + AllocateAndInitializeSid(&NtSidAuthority, 1, SECURITY_LOCAL_SYSTEM_RID, 0, 0, 0, 0, 0, 0, 0, &SystemUserSid); return TRUE; } void PerfDataUninitialize(void) { DeleteCriticalSection(&PerfDataCriticalSection); + + if (SystemUserSid != NULL) + { + FreeSid(SystemUserSid); + SystemUserSid = NULL; + } } +static void SidToUserName(PSID Sid, LPTSTR szBuffer, DWORD BufferSize) +{ + static TCHAR szDomainNameUnused[255]; + DWORD DomainNameLen = sizeof(szDomainNameUnused) / sizeof(szDomainNameUnused[0]); + SID_NAME_USE Use; + + if (Sid != NULL) + LookupAccountSid(NULL, Sid, szBuffer, &BufferSize, szDomainNameUnused, &DomainNameLen, &Use); +} + void PerfDataRefresh(void) { ULONG ulSize; @@ -70,15 +92,14 @@ PPERFDATA pPDOld; ULONG Idx, Idx2; HANDLE hProcess; - HANDLE hProcessToken; - TCHAR szTemp[MAX_PATH]; - DWORD dwSize; SYSTEM_PERFORMANCE_INFORMATION SysPerfInfo; SYSTEM_TIMEOFDAY_INFORMATION SysTimeInfo; SYSTEM_CACHE_INFORMATION SysCacheInfo; LPBYTE SysHandleInfoData; PSYSTEM_PROCESSOR_PERFORMANCE_INFORMATION SysProcessorTimeInfo; double CurrentKernelTime; + PSECURITY_DESCRIPTOR ProcessSD = NULL; + PSID ProcessUser; /* Get new system time */ status = NtQuerySystemInformation(SystemTimeOfDayInformation, &SysTimeInfo, sizeof(SysTimeInfo), 0); @@ -259,33 +280,14 @@ pPerfData[Idx].HandleCount = pSPI->HandleCount; pPerfData[Idx].ThreadCount = pSPI->NumberOfThreads; pPerfData[Idx].SessionId = pSPI->SessionId; + pPerfData[Idx].UserName[0] = _T('\0'); + ProcessUser = SystemUserSid; if (pSPI->UniqueProcessId != NULL) { - hProcess = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, (DWORD)pSPI->UniqueProcessId); + hProcess = OpenProcess(PROCESS_QUERY_INFORMATION | READ_CONTROL, FALSE, PtrToUlong(pSPI->UniqueProcessId)); if (hProcess) { - if (OpenProcessToken(hProcess, TOKEN_QUERY|TOKEN_DUPLICATE|TOKEN_IMPERSONATE, &hProcessToken)) { - ImpersonateLoggedOnUser(hProcessToken); - memset(szTemp, 0, sizeof(TCHAR[MAX_PATH])); - dwSize = MAX_PATH; - GetUserName(szTemp, &dwSize); -#ifndef UNICODE - MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, szTemp, -1, pPerfData[Idx].UserName, MAX_PATH); -/* -int MultiByteToWideChar( - UINT CodePage, // code page - DWORD dwFlags, // character-type options - LPCSTR lpMultiByteStr, // string to map - int cbMultiByte, // number of bytes in string - LPWSTR lpWideCharStr, // wide-character buffer - int cchWideChar // size of buffer -); - */ -#endif - RevertToSelf(); - CloseHandle(hProcessToken); - } else { - pPerfData[Idx].UserName[0] = _T('\0'); - } + GetSecurityInfo(hProcess, SE_KERNEL_OBJECT, OWNER_SECURITY_INFORMATION, &ProcessUser, NULL, NULL, NULL, &ProcessSD); + pPerfData[Idx].USERObjectCount = GetGuiResources(hProcess, GR_USEROBJECTS); pPerfData[Idx].GDIObjectCount = GetGuiResources(hProcess, GR_GDIOBJECTS); GetProcessIoCounters(hProcess, &pPerfData[Idx].IOCounters); @@ -296,11 +298,18 @@ } else { ClearInfo: /* clear information we were unable to fetch */ - pPerfData[Idx].UserName[0] = _T('\0'); pPerfData[Idx].USERObjectCount = 0; pPerfData[Idx].GDIObjectCount = 0; ZeroMemory(&pPerfData[Idx].IOCounters, sizeof(IO_COUNTERS)); } + + SidToUserName(ProcessUser, pPerfData[Idx].UserName, sizeof(pPerfData[0].UserName) / sizeof(pPerfData[0].UserName[0])); + + if (ProcessSD != NULL) + { + LocalFree((HLOCAL)ProcessSD); + } + pPerfData[Idx].UserTime.QuadPart = pSPI->UserTime.QuadPart; pPerfData[Idx].KernelTime.QuadPart = pSPI->KernelTime.QuadPart; pSPI = (PSYSTEM_PROCESS_INFORMATION)((LPBYTE)pSPI + pSPI->NextEntryOffset); _____ Modified: trunk/reactos/subsys/system/taskmgr/precomp.h --- trunk/reactos/subsys/system/taskmgr/precomp.h 2006-01-21 23:00:16 UTC (rev 20965) +++ trunk/reactos/subsys/system/taskmgr/precomp.h 2006-01-22 02:43:36 UTC (rev 20966) @@ -7,6 +7,7 @@ #include <ndk/ntndk.h> #include <commctrl.h> #include <shellapi.h> +#include <aclapi.h> #include <stdlib.h> #include <math.h> #include <tchar.h> _____ Modified: trunk/reactos/subsys/system/taskmgr/taskmgr.xml --- trunk/reactos/subsys/system/taskmgr/taskmgr.xml 2006-01-21 23:00:16 UTC (rev 20965) +++ trunk/reactos/subsys/system/taskmgr/taskmgr.xml 2006-01-22 02:43:36 UTC (rev 20966) @@ -3,6 +3,8 @@ <define name="__USE_W32API" /> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> + <define name="UNICODE" /> + <define name="_UNICODE" /> <library>ntdll</library> <library>kernel32</library> <library>user32</library>

1 0

[jimtabor] 20965: Revert GetCharWidth32A change.
by jimtabor＠svn.reactos.org 21 Jan '06

21 Jan '06

Revert GetCharWidth32A change. Modified: trunk/reactos/lib/gdi32/objects/font.c _____ Modified: trunk/reactos/lib/gdi32/objects/font.c --- trunk/reactos/lib/gdi32/objects/font.c 2006-01-21 22:36:37 UTC (rev 20964) +++ trunk/reactos/lib/gdi32/objects/font.c 2006-01-21 23:00:16 UTC (rev 20965) @@ -414,34 +414,8 @@ LPINT lpBuffer ) { - INT i, wlen, count = (INT)(iLastChar - iFirstChar + 1); - LPSTR str; - LPWSTR wstr; - BOOL ret = TRUE; - - if(count <= 0) return FALSE; - - str = HeapAlloc(GetProcessHeap(), 0, count); - for(i = 0; i < count; i++) - str[i] = (BYTE)(iFirstChar + i); - - wstr = FONT_mbtowc(hdc, str, count, &wlen, NULL); - - for(i = 0; i < wlen; i++) - { - /* FIXME should be NtGdiGetCharWidthW */ - if(!NtGdiGetCharWidth32(hdc, wstr[i], wstr[i], lpBuffer)) - { - ret = FALSE; - break; - } - lpBuffer++; - } - - HeapFree(GetProcessHeap(), 0, str); - HeapFree(GetProcessHeap(), 0, wstr); - - return ret; + /* FIXME should be NtGdiGetCharWidthW */ + return NtGdiGetCharWidth32(hdc, iFirstChar, iLastChar, lpBuffer)) }

1 0

[weiden] 20964: rename a variable to avoid conflicts with an existing information class constant
by weiden＠svn.reactos.org 21 Jan '06

21 Jan '06

rename a variable to avoid conflicts with an existing information class constant Modified: trunk/reactos/lib/kernel32/file/file.c _____ Modified: trunk/reactos/lib/kernel32/file/file.c --- trunk/reactos/lib/kernel32/file/file.c 2006-01-21 17:37:04 UTC (rev 20963) +++ trunk/reactos/lib/kernel32/file/file.c 2006-01-21 22:36:37 UTC (rev 20964) @@ -1432,7 +1432,7 @@ ULONG NeededSize; UNICODE_STRING ShortName; IO_STATUS_BLOCK IoStatusBlock; - PFILE_NAME_INFORMATION FileNameInformation; + PFILE_NAME_INFORMATION FileNameInfo; if(IsConsoleHandle(hFile)) { @@ -1449,29 +1449,29 @@ RtlInitUnicodeString(&ShortName, lpShortName); NeededSize = sizeof(FILE_NAME_INFORMATION) + ShortName.Length + sizeof(WCHAR); - if(!(FileNameInformation = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, NeededSize))) + if(!(FileNameInfo = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, NeededSize))) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } - FileNameInformation->FileNameLength = ShortName.Length; - RtlCopyMemory(FileNameInformation->FileName, ShortName.Buffer, ShortName.Length); + FileNameInfo->FileNameLength = ShortName.Length; + RtlCopyMemory(FileNameInfo->FileName, ShortName.Buffer, ShortName.Length); Status = NtSetInformationFile(hFile, &IoStatusBlock, //out - FileNameInformation, + FileNameInfo, NeededSize, FileShortNameInformation); - RtlFreeHeap(RtlGetProcessHeap(), 0, FileNameInformation); + RtlFreeHeap(RtlGetProcessHeap(), 0, FileNameInfo); if(!NT_SUCCESS(Status)) { - SetLastErrorByStatus(Status); + return FALSE; } - return NT_SUCCESS(Status); + return TRUE; }

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
59
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2006