Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 54671: [NTOSKRNL] - Fix bad indentation
by cgutman＠svn.reactos.org 17 Dec '11

17 Dec '11

Author: cgutman Date: Sat Dec 17 12:59:01 2011 New Revision: 54671 URL: http://svn.reactos.org/svn/reactos?rev=54671&view=rev Log: [NTOSKRNL] - Fix bad indentation Modified: trunk/reactos/ntoskrnl/cc/view.c Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=546… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Sat Dec 17 12:59:01 2011 @@ -993,76 +993,76 @@ */ VOID NTAPI CcFlushCache(IN PSECTION_OBJECT_POINTERS SectionObjectPointers, - IN PLARGE_INTEGER FileOffset OPTIONAL, - IN ULONG Length, - OUT PIO_STATUS_BLOCK IoStatus) -{ - PBCB Bcb; - LARGE_INTEGER Offset; - PCACHE_SEGMENT current; - NTSTATUS Status; - KIRQL oldIrql; - - DPRINT("CcFlushCache(SectionObjectPointers 0x%p, FileOffset 0x%p, Length %d, IoStatus 0x%p)\n", + IN PLARGE_INTEGER FileOffset OPTIONAL, + IN ULONG Length, + OUT PIO_STATUS_BLOCK IoStatus) +{ + PBCB Bcb; + LARGE_INTEGER Offset; + PCACHE_SEGMENT current; + NTSTATUS Status; + KIRQL oldIrql; + + DPRINT("CcFlushCache(SectionObjectPointers 0x%p, FileOffset 0x%p, Length %d, IoStatus 0x%p)\n", SectionObjectPointers, FileOffset, Length, IoStatus); - if (SectionObjectPointers && SectionObjectPointers->SharedCacheMap) - { - Bcb = (PBCB)SectionObjectPointers->SharedCacheMap; - ASSERT(Bcb); - if (FileOffset) - { - Offset = *FileOffset; - } - else - { - Offset.QuadPart = (LONGLONG)0; - Length = Bcb->FileSize.u.LowPart; - } - - if (IoStatus) - { - IoStatus->Status = STATUS_SUCCESS; - IoStatus->Information = 0; - } - - while (Length > 0) - { - current = CcRosLookupCacheSegment (Bcb, Offset.u.LowPart); - if (current != NULL) - { - if (current->Dirty) - { - Status = CcRosFlushCacheSegment(current); - if (!NT_SUCCESS(Status) && IoStatus != NULL) - { - IoStatus->Status = Status; - } - } - KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); - ExReleasePushLock(&current->Lock); - CcRosCacheSegmentDecRefCount(current); - KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); - } - - Offset.QuadPart += Bcb->CacheSegmentSize; - if (Length > Bcb->CacheSegmentSize) - { - Length -= Bcb->CacheSegmentSize; - } - else - { - Length = 0; - } - } - } - else - { - if (IoStatus) - { - IoStatus->Status = STATUS_INVALID_PARAMETER; - } - } + if (SectionObjectPointers && SectionObjectPointers->SharedCacheMap) + { + Bcb = (PBCB)SectionObjectPointers->SharedCacheMap; + ASSERT(Bcb); + if (FileOffset) + { + Offset = *FileOffset; + } + else + { + Offset.QuadPart = (LONGLONG)0; + Length = Bcb->FileSize.u.LowPart; + } + + if (IoStatus) + { + IoStatus->Status = STATUS_SUCCESS; + IoStatus->Information = 0; + } + + while (Length > 0) + { + current = CcRosLookupCacheSegment (Bcb, Offset.u.LowPart); + if (current != NULL) + { + if (current->Dirty) + { + Status = CcRosFlushCacheSegment(current); + if (!NT_SUCCESS(Status) && IoStatus != NULL) + { + IoStatus->Status = Status; + } + } + KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); + ExReleasePushLock(&current->Lock); + CcRosCacheSegmentDecRefCount(current); + KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); + } + + Offset.QuadPart += Bcb->CacheSegmentSize; + if (Length > Bcb->CacheSegmentSize) + { + Length -= Bcb->CacheSegmentSize; + } + else + { + Length = 0; + } + } + } + else + { + if (IoStatus) + { + IoStatus->Status = STATUS_INVALID_PARAMETER; + } + } } NTSTATUS @@ -1072,68 +1072,68 @@ * FUNCTION: Releases the BCB associated with a file object */ { - PLIST_ENTRY current_entry; - PCACHE_SEGMENT current; - LIST_ENTRY FreeList; - KIRQL oldIrql; - - ASSERT(Bcb); - - Bcb->RefCount++; - KeReleaseGuardedMutex(&ViewLock); - - CcFlushCache(FileObject->SectionObjectPointer, NULL, 0, NULL); - - KeAcquireGuardedMutex(&ViewLock); - Bcb->RefCount--; - if (Bcb->RefCount == 0) - { - if (Bcb->BcbRemoveListEntry.Flink != NULL) - { - RemoveEntryList(&Bcb->BcbRemoveListEntry); - Bcb->BcbRemoveListEntry.Flink = NULL; - } - - FileObject->SectionObjectPointer->SharedCacheMap = NULL; - - /* - * Release all cache segments. - */ - InitializeListHead(&FreeList); - KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); - current_entry = Bcb->BcbSegmentListHead.Flink; - while (!IsListEmpty(&Bcb->BcbSegmentListHead)) - { - current_entry = RemoveTailList(&Bcb->BcbSegmentListHead); - current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, BcbSegmentListEntry); - RemoveEntryList(&current->CacheSegmentListEntry); - RemoveEntryList(&current->CacheSegmentLRUListEntry); - if (current->Dirty) - { - RemoveEntryList(&current->DirtySegmentListEntry); - DirtyPageCount -= Bcb->CacheSegmentSize / PAGE_SIZE; - DPRINT1("Freeing dirty segment\n"); - } - InsertHeadList(&FreeList, &current->BcbSegmentListEntry); - } + PLIST_ENTRY current_entry; + PCACHE_SEGMENT current; + LIST_ENTRY FreeList; + KIRQL oldIrql; + + ASSERT(Bcb); + + Bcb->RefCount++; + KeReleaseGuardedMutex(&ViewLock); + + CcFlushCache(FileObject->SectionObjectPointer, NULL, 0, NULL); + + KeAcquireGuardedMutex(&ViewLock); + Bcb->RefCount--; + if (Bcb->RefCount == 0) + { + if (Bcb->BcbRemoveListEntry.Flink != NULL) + { + RemoveEntryList(&Bcb->BcbRemoveListEntry); + Bcb->BcbRemoveListEntry.Flink = NULL; + } + + FileObject->SectionObjectPointer->SharedCacheMap = NULL; + + /* + * Release all cache segments. + */ + InitializeListHead(&FreeList); + KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); + current_entry = Bcb->BcbSegmentListHead.Flink; + while (!IsListEmpty(&Bcb->BcbSegmentListHead)) + { + current_entry = RemoveTailList(&Bcb->BcbSegmentListHead); + current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, BcbSegmentListEntry); + RemoveEntryList(&current->CacheSegmentListEntry); + RemoveEntryList(&current->CacheSegmentLRUListEntry); + if (current->Dirty) + { + RemoveEntryList(&current->DirtySegmentListEntry); + DirtyPageCount -= Bcb->CacheSegmentSize / PAGE_SIZE; + DPRINT1("Freeing dirty segment\n"); + } + InsertHeadList(&FreeList, &current->BcbSegmentListEntry); + } #if DBG - Bcb->Trace = FALSE; -#endif - KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); - - KeReleaseGuardedMutex(&ViewLock); - ObDereferenceObject (Bcb->FileObject); - - while (!IsListEmpty(&FreeList)) - { - current_entry = RemoveTailList(&FreeList); - current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, BcbSegmentListEntry); - CcRosInternalFreeCacheSegment(current); - } - ExFreeToNPagedLookasideList(&BcbLookasideList, Bcb); - KeAcquireGuardedMutex(&ViewLock); - } - return(STATUS_SUCCESS); + Bcb->Trace = FALSE; +#endif + KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); + + KeReleaseGuardedMutex(&ViewLock); + ObDereferenceObject (Bcb->FileObject); + + while (!IsListEmpty(&FreeList)) + { + current_entry = RemoveTailList(&FreeList); + current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, BcbSegmentListEntry); + CcRosInternalFreeCacheSegment(current); + } + ExFreeToNPagedLookasideList(&BcbLookasideList, Bcb); + KeAcquireGuardedMutex(&ViewLock); + } + return(STATUS_SUCCESS); } VOID

1 0

[cgutman] 54670: [VIDEOPRT] - "RegionSize must be zero" doesn't mean literally pass 0 for the region size...
by cgutman＠svn.reactos.org 17 Dec '11

17 Dec '11

Author: cgutman Date: Sat Dec 17 09:18:24 2011 New Revision: 54670 URL: http://svn.reactos.org/svn/reactos?rev=54670&view=rev Log: [VIDEOPRT] - "RegionSize must be zero" doesn't mean literally pass 0 for the region size... Modified: trunk/reactos/drivers/video/videoprt/int10.c Modified: trunk/reactos/drivers/video/videoprt/int10.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/int… ============================================================================== --- trunk/reactos/drivers/video/videoprt/int10.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/int10.c [iso-8859-1] Sat Dec 17 09:18:24 2011 @@ -82,13 +82,14 @@ NTSTATUS Status; PKPROCESS CallingProcess = (PKPROCESS)PsGetCurrentProcess(); KAPC_STATE ApcState; + SIZE_T Size = 0; TRACE_(VIDEOPRT, "IntInt10FreeBuffer\n"); INFO_(VIDEOPRT, "- Segment: %x\n", Seg); INFO_(VIDEOPRT, "- Offset: %x\n", Off); IntAttachToCSRSS(&CallingProcess, &ApcState); - Status = ZwFreeVirtualMemory(NtCurrentProcess(), &MemoryAddress, 0, + Status = ZwFreeVirtualMemory(NtCurrentProcess(), &MemoryAddress, &Size, MEM_RELEASE); IntDetachFromCSRSS(&CallingProcess, &ApcState);

1 0

[cgutman] 54669: [WIN32K] EngAllocMem: - Respect the FL_NONPAGED_MEMORY flag (actually allocate the memory from non-paged pool) - Fix an improper flag comparison that caused memory allocated with b...
by cgutman＠svn.reactos.org 17 Dec '11

17 Dec '11

Author: cgutman Date: Sat Dec 17 08:35:31 2011 New Revision: 54669 URL: http://svn.reactos.org/svn/reactos?rev=54669&view=rev Log: [WIN32K] EngAllocMem: - Respect the FL_NONPAGED_MEMORY flag (actually allocate the memory from non-paged pool) - Fix an improper flag comparison that caused memory allocated with both FL_NONPAGED_MEMORY and FL_ZERO_MEMORY set to not be zeroed as requested Modified: trunk/reactos/subsystems/win32/win32k/eng/mem.c Modified: trunk/reactos/subsystems/win32/win32k/eng/mem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/mem.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/mem.c [iso-8859-1] Sat Dec 17 08:35:31 2011 @@ -19,16 +19,19 @@ ULONG MemSize, ULONG Tag) { - PVOID newMem; + PVOID newMem; - newMem = ExAllocatePoolWithTag(PagedPool, MemSize, Tag); + newMem = ExAllocatePoolWithTag((Flags & FL_NONPAGED_MEMORY) ? NonPagedPool : PagedPool, + MemSize, + Tag); - if (Flags == FL_ZERO_MEMORY && NULL != newMem) - { - RtlZeroMemory(newMem, MemSize); - } + if (newMem == NULL) + return NULL; - return newMem; + if (Flags & FL_ZERO_MEMORY) + RtlZeroMemory(newMem, MemSize); + + return newMem; } /*

1 0

[cgutman] 54668: [RTL] - Pass size 0 when calling NtFreeVirtualMemory for MEM_RELEASE
by cgutman＠svn.reactos.org 17 Dec '11

17 Dec '11

Author: cgutman Date: Sat Dec 17 08:30:48 2011 New Revision: 54668 URL: http://svn.reactos.org/svn/reactos?rev=54668&view=rev Log: [RTL] - Pass size 0 when calling NtFreeVirtualMemory for MEM_RELEASE Modified: trunk/reactos/lib/rtl/handle.c Modified: trunk/reactos/lib/rtl/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/handle.c?rev=54668… ============================================================================== --- trunk/reactos/lib/rtl/handle.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/handle.c [iso-8859-1] Sat Dec 17 08:30:48 2011 @@ -35,13 +35,12 @@ RtlDestroyHandleTable(PRTL_HANDLE_TABLE HandleTable) { PVOID ArrayPointer; - SIZE_T ArraySize; + SIZE_T ArraySize = 0; /* free handle array */ if (HandleTable->CommittedHandles) { ArrayPointer = (PVOID)HandleTable->CommittedHandles; - ArraySize = HandleTable->SizeOfHandleTableEntry * HandleTable->MaximumNumberOfHandles; NtFreeVirtualMemory(NtCurrentProcess(), &ArrayPointer, &ArraySize,

1 0

[cgutman] 54667: [RTL] - Don't pass stack garbage to ZwFreeVirtualMemory
by cgutman＠svn.reactos.org 17 Dec '11

17 Dec '11

Author: cgutman Date: Sat Dec 17 08:22:04 2011 New Revision: 54667 URL: http://svn.reactos.org/svn/reactos?rev=54667&view=rev Log: [RTL] - Don't pass stack garbage to ZwFreeVirtualMemory Modified: trunk/reactos/lib/rtl/heapdbg.c Modified: trunk/reactos/lib/rtl/heapdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heapdbg.c?rev=5466… ============================================================================== --- trunk/reactos/lib/rtl/heapdbg.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heapdbg.c [iso-8859-1] Sat Dec 17 08:22:04 2011 @@ -94,7 +94,7 @@ BOOLEAN NTAPI RtlDebugDestroyHeap(HANDLE HeapPtr) { - SIZE_T Size; + SIZE_T Size = 0; PHEAP Heap = (PHEAP)HeapPtr; if (Heap == RtlGetCurrentPeb()->ProcessHeap)

1 0

[cgutman] 54666: [RTL] - Revert r54660 and properly fix NtAllocateVirtualMemory/NtFreeVirtualMemory usage
by cgutman＠svn.reactos.org 16 Dec '11

16 Dec '11

Author: cgutman Date: Fri Dec 16 20:12:28 2011 New Revision: 54666 URL: http://svn.reactos.org/svn/reactos?rev=54666&view=rev Log: [RTL] - Revert r54660 and properly fix NtAllocateVirtualMemory/NtFreeVirtualMemory usage Modified: trunk/reactos/lib/rtl/dbgbuffer.c Modified: trunk/reactos/lib/rtl/dbgbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/dbgbuffer.c?rev=54… ============================================================================== --- trunk/reactos/lib/rtl/dbgbuffer.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/dbgbuffer.c [iso-8859-1] Fri Dec 16 20:12:28 2011 @@ -29,7 +29,7 @@ (PVOID*)&Buf, 0, &ViewSize, - MEM_COMMIT, + MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE); if (!NT_SUCCESS(Status)) return NULL; @@ -49,12 +49,13 @@ RtlDestroyQueryDebugBuffer(IN PRTL_DEBUG_INFORMATION Buf) { NTSTATUS Status = STATUS_SUCCESS; + SIZE_T ViewSize = 0; if (NULL != Buf) { Status = NtFreeVirtualMemory(NtCurrentProcess(), - (PVOID)Buf, - (PSIZE_T)&Buf->ViewSize, /* FIXME: not portable! */ + (PVOID*)&Buf, + &ViewSize, MEM_RELEASE); } if (!NT_SUCCESS(Status))

1 0

[rharabien] 54665: [POWRPROF] - Fix few resource leaks, possible buffer overflows and simplify code
by rharabien＠svn.reactos.org 16 Dec '11

16 Dec '11

Author: rharabien Date: Fri Dec 16 19:22:07 2011 New Revision: 54665 URL: http://svn.reactos.org/svn/reactos?rev=54665&view=rev Log: [POWRPROF] - Fix few resource leaks, possible buffer overflows and simplify code Modified: trunk/reactos/dll/win32/powrprof/powrprof.c Modified: trunk/reactos/dll/win32/powrprof/powrprof.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/powrprof/powrpro… ============================================================================== --- trunk/reactos/dll/win32/powrprof/powrprof.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/powrprof/powrprof.c [iso-8859-1] Fri Dec 16 19:22:07 2011 @@ -50,7 +50,7 @@ static const WCHAR szDiskMin[] = L"DiskSpindownMin"; static const WCHAR szLastID[] = L"LastID"; -UINT g_LastID = -1; +UINT g_LastID = (UINT)-1; BOOLEAN WINAPI WritePwrPolicy(PUINT puiID, PPOWER_POLICY pPowerPolicy); @@ -76,29 +76,25 @@ nOutputBufferSize); } - BOOLEAN WINAPI CanUserWritePwrScheme(VOID) { HKEY hKey = NULL; LONG Ret; - BOOLEAN bSuccess = TRUE; TRACE("()\n"); Ret = RegOpenKeyExW(HKEY_LOCAL_MACHINE, szPowerCfgSubKey, 0, KEY_READ | KEY_WRITE, &hKey); - if (Ret != ERROR_SUCCESS) { TRACE("RegOpenKeyEx failed: %d\n", Ret); - bSuccess = FALSE; - } - - SetLastError(Ret); - RegCloseKey(hKey); - return bSuccess; -} - + SetLastError(Ret); + return FALSE; + } + + RegCloseKey(hKey); + return TRUE; +} BOOLEAN WINAPI DeletePwrScheme(UINT uiIndex) @@ -109,71 +105,64 @@ swprintf(Buf, L"Control Panel\\PowerCfg\\PowerPolicies\\%d", uiIndex); - if (GetActivePwrScheme(&Current)) - { - if (Current == uiIndex) - { - SetLastError(ERROR_ACCESS_DENIED); - return FALSE; - } - else - { - Err = RegDeleteKey(HKEY_CURRENT_USER, (LPCTSTR) Buf); - if (Err != ERROR_SUCCESS) - { - TRACE("RegDeleteKey failed: %d\n", Err); - SetLastError(Err); - return FALSE; - } - else - { - SetLastError(ERROR_SUCCESS); - return TRUE; - } - } - } - - return FALSE; -} - + if (!GetActivePwrScheme(&Current)) + return FALSE; + + if (Current == uiIndex) + { + SetLastError(ERROR_ACCESS_DENIED); + return FALSE; + } + + Err = RegDeleteKey(HKEY_CURRENT_USER, (LPCTSTR)Buf); + if (Err != ERROR_SUCCESS) + { + TRACE("RegDeleteKey failed: %d\n", Err); + SetLastError(Err); + return FALSE; + } + + return TRUE; +} static BOOLEAN POWRPROF_GetUserPowerPolicy(LPWSTR szNum, PUSER_POWER_POLICY puserPwrPolicy, - DWORD dwName, LPWSTR szName, - DWORD dwDesc, LPWSTR szDesc) -{ - HKEY hSubKey; + DWORD cchName, LPWSTR szName, + DWORD cchDesc, LPWSTR szDesc) +{ + HKEY hSubKey = NULL; DWORD dwSize; LONG Err; WCHAR szPath[MAX_PATH]; + BOOL bRet = FALSE; swprintf(szPath, L"Control Panel\\PowerCfg\\PowerPolicies\\%s", szNum); - Err = RegOpenKeyW(HKEY_CURRENT_USER, szPath, &hSubKey); - if (Err != ERROR_SUCCESS) - { - ERR("RegOpenKeyW failed: %d\n", Err); - SetLastError(Err); - return FALSE; - } - - dwName = MAX_PATH * sizeof(WCHAR); - Err = RegQueryValueExW(hSubKey, L"Name", NULL, NULL, (LPBYTE)szName, &dwName); + Err = RegOpenKeyExW(HKEY_CURRENT_USER, szPath, 0, KEY_READ, &hSubKey); + if (Err != ERROR_SUCCESS) + { + ERR("RegOpenKeyExW failed: %d\n", Err); + SetLastError(Err); + return FALSE; + } + + dwSize = cchName * sizeof(WCHAR); + Err = RegQueryValueExW(hSubKey, L"Name", NULL, NULL, (LPBYTE)szName, &dwSize); if (Err != ERROR_SUCCESS) { ERR("RegQueryValueExW failed: %d\n", Err); SetLastError(Err); - return FALSE; - } - - dwDesc = MAX_PATH * sizeof(WCHAR); - Err = RegQueryValueExW(hSubKey, L"Description", NULL, NULL, (LPBYTE)szDesc, &dwDesc); + goto cleanup; + } + + dwSize = cchDesc * sizeof(WCHAR); + Err = RegQueryValueExW(hSubKey, L"Description", NULL, NULL, (LPBYTE)szDesc, &dwSize); if (Err != ERROR_SUCCESS) { ERR("RegQueryValueExW failed: %d\n", Err); SetLastError(Err); - return FALSE; + goto cleanup; } dwSize = sizeof(USER_POWER_POLICY); @@ -182,10 +171,15 @@ { ERR("RegQueryValueExW failed: %d\n", Err); SetLastError(Err); - return FALSE; - } - - return TRUE; + goto cleanup; + } + + bRet = TRUE; + +cleanup: + RegCloseKey(hSubKey); + + return bRet; } static BOOLEAN @@ -198,22 +192,26 @@ swprintf(szPath, L"Software\\Microsoft\\Windows\\CurrentVersion\\Controls Folder\\PowerCfg\\PowerPolicies\\%s", szNum); - Err = RegOpenKeyW(HKEY_LOCAL_MACHINE, szPath, &hKey); - if (Err != ERROR_SUCCESS) - { - ERR("RegOpenKeyW failed: %d\n", Err); + Err = RegOpenKeyExW(HKEY_LOCAL_MACHINE, szPath, 0, KEY_READ, &hKey); + if (Err != ERROR_SUCCESS) + { + ERR("RegOpenKeyExW failed: %d\n", Err); SetLastError(Err); return FALSE; } dwSize = sizeof(MACHINE_POWER_POLICY); Err = RegQueryValueExW(hKey, L"Policies", NULL, NULL, (LPBYTE)pmachinePwrPolicy, &dwSize); + if (Err != ERROR_SUCCESS) { ERR("RegQueryValueExW failed: %d\n", Err); SetLastError(Err); - return FALSE; - } + RegCloseKey(hKey); + return FALSE; + } + + RegCloseKey(hKey); return TRUE; } @@ -229,7 +227,7 @@ POWER_POLICY PwrPolicy; USER_POWER_POLICY userPwrPolicy; MACHINE_POWER_POLICY machinePwrPolicy; - BOOLEAN ret = FALSE; + BOOLEAN bRet = FALSE; if (!lpfnPwrSchemesEnumProc) { @@ -237,7 +235,7 @@ return FALSE; } - Err = RegOpenKeyW(HKEY_CURRENT_USER, L"Control Panel\\PowerCfg\\PowerPolicies", &hKey); + Err = RegOpenKeyExW(HKEY_CURRENT_USER, L"Control Panel\\PowerCfg\\PowerPolicies", 0, KEY_READ, &hKey); if (Err != ERROR_SUCCESS) { ERR("RegOpenKeyW failed: %d\n", Err); @@ -255,43 +253,34 @@ dwNameSize, szName, dwDescSize, szDesc)) { - RegCloseKey(hKey); - ReleaseSemaphore(PPRegSemaphore, 1, NULL); - return FALSE; + WARN("POWRPROF_GetUserPowerPolicy failed\n"); + goto cleanup; } if (!POWRPROF_GetMachinePowerPolicy(szNum, &machinePwrPolicy)) { - RegCloseKey(hKey); - ReleaseSemaphore(PPRegSemaphore, 1, NULL); - return FALSE; + WARN("POWRPROF_GetMachinePowerPolicy failed\n"); + goto cleanup; } memcpy(&PwrPolicy.user, &userPwrPolicy, sizeof(USER_POWER_POLICY)); memcpy(&PwrPolicy.mach, &machinePwrPolicy, sizeof(MACHINE_POWER_POLICY)); if (!lpfnPwrSchemesEnumProc(_wtoi(szNum), dwNameSize, szName, dwDescSize, szDesc, &PwrPolicy, lParam)) - { - RegCloseKey(hKey); - ReleaseSemaphore(PPRegSemaphore, 1, NULL); - return ret; - } + goto cleanup; else - { - ret=TRUE; - } + bRet = TRUE; dwSize = sizeof(szNum) / sizeof(WCHAR); dwIndex++; } +cleanup: RegCloseKey(hKey); ReleaseSemaphore(PPRegSemaphore, 1, NULL); - SetLastError(ERROR_SUCCESS); - - return TRUE; -} - + + return bRet; +} BOOLEAN WINAPI GetActivePwrScheme(PUINT puiID) @@ -303,7 +292,7 @@ TRACE("GetActivePwrScheme(%u)", puiID); - Err = RegOpenKeyW(HKEY_CURRENT_USER, L"Control Panel\\PowerCfg", &hKey); + Err = RegOpenKeyExW(HKEY_CURRENT_USER, L"Control Panel\\PowerCfg", 0, KEY_READ, &hKey); if (Err != ERROR_SUCCESS) { ERR("RegOpenKey failed: %d\n", Err); @@ -323,13 +312,11 @@ return FALSE; } + RegCloseKey(hKey); *puiID = _wtoi(szBuf); - RegCloseKey(hKey); - SetLastError(ERROR_SUCCESS); - return TRUE; -} - + return TRUE; +} BOOLEAN WINAPI GetCurrentPowerPolicies(PGLOBAL_POWER_POLICY pGlobalPowerPolicy, @@ -349,38 +336,29 @@ Lohnegrim: I dont know why this Function shoud call NtPowerInformation, becouse as far as i know, it simply returns the GlobalPowerPolicy and the AktivPowerScheme! */ - BOOLEAN ret; UINT uiID; if (pGlobalPowerPolicy != NULL) { - ret = ReadGlobalPwrPolicy(pGlobalPowerPolicy); - if (!ret) - { - return FALSE; - } + if (!ReadGlobalPwrPolicy(pGlobalPowerPolicy)) + return FALSE; } if (pPowerPolicy != NULL) { - ret = GetActivePwrScheme(&uiID); - if (!ret) - { - return FALSE; - } - ret = ReadPwrScheme(uiID,pPowerPolicy); - if (!ret) - { - return FALSE; - } - } - return TRUE; -} - + if (!GetActivePwrScheme(&uiID)) + return FALSE; + + if (!ReadPwrScheme(uiID, pPowerPolicy)) + return FALSE; + } + + return TRUE; +} BOOLEAN WINAPI GetPwrCapabilities(PSYSTEM_POWER_CAPABILITIES lpSystemPowerCapabilities) { - NTSTATUS Ret; + NTSTATUS Status; TRACE("(%p)\n", lpSystemPowerCapabilities); @@ -390,16 +368,15 @@ return FALSE; } - Ret = NtPowerInformation(SystemPowerCapabilities, 0, 0, lpSystemPowerCapabilities, sizeof(SYSTEM_POWER_CAPABILITIES)); - - SetLastError(RtlNtStatusToDosError(Ret)); - - if (Ret == STATUS_SUCCESS) - return TRUE; - else - return FALSE; -} - + Status = NtPowerInformation(SystemPowerCapabilities, 0, 0, lpSystemPowerCapabilities, sizeof(SYSTEM_POWER_CAPABILITIES)); + if(!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + return TRUE; +} BOOLEAN WINAPI GetPwrDiskSpindownRange(PUINT RangeMax, PUINT RangeMin) @@ -416,8 +393,6 @@ SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - - SetLastError(ERROR_SUCCESS); WaitForSingleObject(PPRegSemaphore, INFINITE); @@ -461,11 +436,9 @@ RegCloseKey(hKey); ReleaseSemaphore(PPRegSemaphore, 1, NULL); - SetLastError(ERROR_SUCCESS); - - return TRUE; -} - + + return TRUE; +} BOOLEAN WINAPI IsAdminOverrideActive(PADMINISTRATOR_POWER_POLICY p) @@ -478,71 +451,68 @@ IsPwrHibernateAllowed(VOID) { SYSTEM_POWER_CAPABILITIES PowerCaps; - NTSTATUS ret; + NTSTATUS Status; BOOLEAN old; RtlAdjustPrivilege(SE_SHUTDOWN_PRIVILEGE, TRUE, FALSE, &old); - ret = NtPowerInformation(SystemPowerCapabilities, NULL, 0, &PowerCaps, sizeof(PowerCaps)); - if (ret == STATUS_SUCCESS) - { - return PowerCaps.SystemS4 && PowerCaps.HiberFilePresent; // IsHiberfilPresent(); - } - else - { - SetLastError(RtlNtStatusToDosError(ret)); - return FALSE; - } -} - + + Status = NtPowerInformation(SystemPowerCapabilities, NULL, 0, &PowerCaps, sizeof(PowerCaps)); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + return PowerCaps.SystemS4 && PowerCaps.HiberFilePresent; // IsHiberfilPresent(); +} BOOLEAN WINAPI IsPwrShutdownAllowed(VOID) { SYSTEM_POWER_CAPABILITIES PowerCaps; - NTSTATUS ret; + NTSTATUS Status; BOOLEAN old; RtlAdjustPrivilege(SE_SHUTDOWN_PRIVILEGE, TRUE, FALSE, &old); - ret = NtPowerInformation(SystemPowerCapabilities, NULL, 0, &PowerCaps, sizeof(PowerCaps)); - if (ret == STATUS_SUCCESS) - { - return PowerCaps.SystemS5; - } - else - { - SetLastError(RtlNtStatusToDosError(ret)); - return FALSE; - } -} - + + Status = NtPowerInformation(SystemPowerCapabilities, NULL, 0, &PowerCaps, sizeof(PowerCaps)); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + return PowerCaps.SystemS5; +} BOOLEAN WINAPI IsPwrSuspendAllowed(VOID) { SYSTEM_POWER_CAPABILITIES PowerCaps; - NTSTATUS ret; + NTSTATUS Status; BOOLEAN old; RtlAdjustPrivilege(SE_SHUTDOWN_PRIVILEGE, TRUE, FALSE, &old); - ret = NtPowerInformation(SystemPowerCapabilities, NULL, 0, &PowerCaps, sizeof(PowerCaps)); - if (ret == STATUS_SUCCESS) - { - return PowerCaps.SystemS1 || PowerCaps.SystemS2 || PowerCaps.SystemS3; - } - else - { - SetLastError(RtlNtStatusToDosError(ret)); - return FALSE; - } -} - -DWORD WINAPI PowerGetActiveScheme(HKEY UserRootPowerKey, GUID **polguid) + + Status = NtPowerInformation(SystemPowerCapabilities, NULL, 0, &PowerCaps, sizeof(PowerCaps)); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + return PowerCaps.SystemS1 || PowerCaps.SystemS2 || PowerCaps.SystemS3; +} + +DWORD WINAPI +PowerGetActiveScheme(HKEY UserRootPowerKey, GUID **polguid) { FIXME("(%p,%p) stub!\n", UserRootPowerKey, polguid); return ERROR_CALL_NOT_IMPLEMENTED; } -DWORD WINAPI PowerReadDCValue(HKEY RootPowerKey, const GUID *Scheme, const GUID *SubGroup, const GUID *PowerSettings, PULONG Type, PUCHAR Buffer, DWORD *BufferSize) +DWORD WINAPI +PowerReadDCValue(HKEY RootPowerKey, const GUID *Scheme, const GUID *SubGroup, const GUID *PowerSettings, PULONG Type, PUCHAR Buffer, DWORD *BufferSize) { FIXME("(%p,%s,%s,%s,%p,%p,%p) stub!\n", RootPowerKey, debugstr_guid(Scheme), debugstr_guid(SubGroup), debugstr_guid(PowerSettings), Type, Buffer, BufferSize); return ERROR_CALL_NOT_IMPLEMENTED; @@ -553,20 +523,20 @@ { GLOBAL_MACHINE_POWER_POLICY glMachPwrPolicy; GLOBAL_USER_POWER_POLICY glUserPwrPolicy; - HKEY hKey; + HKEY hKey = NULL; DWORD dwSize; LONG Err; + BOOL bRet = FALSE; ReleaseSemaphore(PPRegSemaphore, 1, NULL); // Getting user global power policy - Err = RegOpenKeyW(HKEY_CURRENT_USER, L"Control Panel\\PowerCfg\\GlobalPowerPolicy", &hKey); + Err = RegOpenKeyExW(HKEY_CURRENT_USER, L"Control Panel\\PowerCfg\\GlobalPowerPolicy", 0, KEY_READ, &hKey); if (Err != ERROR_SUCCESS) { ERR("RegOpenKeyW failed: %d\n", Err); - ReleaseSemaphore(PPRegSemaphore, 1, NULL); - SetLastError(Err); - return FALSE; + SetLastError(Err); + goto cleanup; } dwSize = sizeof(glUserPwrPolicy); @@ -574,21 +544,19 @@ if (Err != ERROR_SUCCESS) { ERR("RegQueryValueExW failed: %d\n", Err); - ReleaseSemaphore(PPRegSemaphore, 1, NULL); - SetLastError(Err); - return FALSE; + SetLastError(Err); + goto cleanup; } RegCloseKey(hKey); // Getting machine global power policy - Err = RegOpenKeyW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Controls Folder\\PowerCfg\\GlobalPowerPolicy", &hKey); + Err = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Controls Folder\\PowerCfg\\GlobalPowerPolicy", 0, KEY_READ, &hKey); if (Err != ERROR_SUCCESS) { ERR("RegOpenKeyW failed: %d\n", Err); - ReleaseSemaphore(PPRegSemaphore, 1, NULL); - SetLastError(Err); - return FALSE; + SetLastError(Err); + goto cleanup; } dwSize = sizeof(glMachPwrPolicy); @@ -596,20 +564,20 @@ if (Err != ERROR_SUCCESS) { ERR("RegQueryValueExW failed: %d\n", Err); - ReleaseSemaphore(PPRegSemaphore, 1, NULL); - SetLastError(Err); - return FALSE; - } - - RegCloseKey(hKey); + SetLastError(Err); + goto cleanup; + } memcpy(&pGlobalPowerPolicy->user, &glUserPwrPolicy, sizeof(GLOBAL_USER_POWER_POLICY)); memcpy(&pGlobalPowerPolicy->mach, &glMachPwrPolicy, sizeof(GLOBAL_MACHINE_POWER_POLICY)); - + bRet = TRUE; + +cleanup: + if(hKey) + RegCloseKey(hKey); ReleaseSemaphore(PPRegSemaphore, 1, NULL); - SetLastError(ERROR_SUCCESS); - - return TRUE; + + return bRet; } @@ -619,38 +587,22 @@ { HKEY hKey; WCHAR szPath[MAX_PATH]; - DWORD len=sizeof(MACHINE_PROCESSOR_POWER_POLICY); + DWORD dwSize = sizeof(MACHINE_PROCESSOR_POWER_POLICY); swprintf(szPath, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Controls Folder\\PowerCfg\\ProcessorPolicies\\%i", uiID); - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, - szPath, - 0, - KEY_ALL_ACCESS, - &hKey) == ERROR_SUCCESS) - { - if (RegQueryValueExW(hKey,szPolicies,NULL,0,(LPBYTE)pMachineProcessorPowerPolicy,&len) == ERROR_SUCCESS) - { - RegCloseKey(hKey); - return TRUE; - } - else - { - RegCloseKey(hKey); - if (uiID != 0) - { - return ReadProcessorPwrScheme(0,pMachineProcessorPowerPolicy); - } - else - { - return FALSE; - } - } - } - else + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, szPath, 0, KEY_READ, &hKey) != ERROR_SUCCESS) + return FALSE; + + if (RegQueryValueExW(hKey, szPolicies, NULL, 0, (LPBYTE)pMachineProcessorPowerPolicy, &dwSize) == ERROR_SUCCESS) { RegCloseKey(hKey); - return FALSE; - } + return TRUE; + } + + RegCloseKey(hKey); + if (uiID != 0) + return ReadProcessorPwrScheme(0, pMachineProcessorPowerPolicy); + return FALSE; } @@ -661,7 +613,7 @@ { USER_POWER_POLICY userPwrPolicy; MACHINE_POWER_POLICY machinePwrPolicy; - WCHAR szNum[3 + 1]; // max number - 999 + WCHAR szNum[16]; // max number - 999 ReleaseSemaphore(PPRegSemaphore, 1, NULL); @@ -679,15 +631,13 @@ return FALSE; } - memcpy(&pPowerPolicy->user, &userPwrPolicy, sizeof(USER_POWER_POLICY)); - memcpy(&pPowerPolicy->mach, &machinePwrPolicy, sizeof(MACHINE_POWER_POLICY)); + memcpy(&pPowerPolicy->user, &userPwrPolicy, sizeof(userPwrPolicy)); + memcpy(&pPowerPolicy->mach, &machinePwrPolicy, sizeof(machinePwrPolicy)); ReleaseSemaphore(PPRegSemaphore, 1, NULL); - SetLastError(ERROR_SUCCESS); - - return TRUE; -} - + + return TRUE; +} BOOLEAN WINAPI SetActivePwrScheme(UINT uiID, @@ -696,54 +646,37 @@ { POWER_POLICY tmp; HKEY hKey; - WCHAR Buf[MAX_PATH]; - BOOLEAN ret; - - if (ReadPwrScheme(uiID,&tmp)) - { - if (RegOpenKeyEx(HKEY_CURRENT_USER,szUserPowerConfigSubKey,0,KEY_ALL_ACCESS,&hKey) != ERROR_SUCCESS) - { - return FALSE; - } - swprintf(Buf,L"%i",uiID); - - if (RegSetValueExW(hKey,szCurrentPowerPolicies,0,REG_SZ,(CONST BYTE *)Buf,strlenW(Buf)*sizeof(WCHAR)) == ERROR_SUCCESS) - { - RegCloseKey(hKey); - if ((lpGlobalPowerPolicy != NULL) || (lpPowerPolicy != NULL)) - { - ret = ValidatePowerPolicies(lpGlobalPowerPolicy,lpPowerPolicy); - if (ret) - { - ret = TRUE; - if (lpGlobalPowerPolicy != NULL) - { - ret = WriteGlobalPwrPolicy(lpGlobalPowerPolicy); - } - if (ret && lpPowerPolicy != NULL) - { - ret = WritePwrPolicy(&uiID,lpPowerPolicy); - } - } - return ret; - } - else - { - return TRUE; - } - } - else - { - RegCloseKey(hKey); - return FALSE; - } - } - else - { - return FALSE; - } -} - + WCHAR Buf[16]; + + if (!ReadPwrScheme(uiID, &tmp)) + return FALSE; + + if (RegOpenKeyEx(HKEY_CURRENT_USER, szUserPowerConfigSubKey, 0, KEY_WRITE, &hKey) != ERROR_SUCCESS) + return FALSE; + + swprintf(Buf, L"%i", uiID); + + if (RegSetValueExW(hKey, szCurrentPowerPolicies, 0, REG_SZ, (PBYTE)Buf, strlenW(Buf)*sizeof(WCHAR)) != ERROR_SUCCESS) + { + RegCloseKey(hKey); + return FALSE; + } + RegCloseKey(hKey); + + if (lpGlobalPowerPolicy != NULL || lpPowerPolicy != NULL) + { + if (!ValidatePowerPolicies(lpGlobalPowerPolicy, lpPowerPolicy)) + return FALSE; + + if (lpGlobalPowerPolicy != NULL && !WriteGlobalPwrPolicy(lpGlobalPowerPolicy)) + return FALSE; + + if (lpPowerPolicy != NULL && !WritePwrPolicy(&uiID,lpPowerPolicy)) + return FALSE; + } + + return TRUE; +} BOOLEAN WINAPI SetSuspendState(BOOLEAN Hibernate, @@ -754,7 +687,6 @@ return TRUE; } - BOOLEAN WINAPI WriteGlobalPwrPolicy(PGLOBAL_POWER_POLICY pGlobalPowerPolicy) { @@ -768,38 +700,34 @@ if (RegOpenKeyEx(HKEY_CURRENT_USER, L"Control Panel\\PowerCfg\\GlobalPowerPolicy", 0, - KEY_ALL_ACCESS, - &hKey)) - return FALSE; - - if (RegSetValueExW(hKey,szPolicies,0,REG_BINARY,(const unsigned char *)&gupp,sizeof(GLOBAL_USER_POWER_POLICY)) == ERROR_SUCCESS) + KEY_WRITE, + &hKey) != ERROR_SUCCESS) + return FALSE; + + if (RegSetValueExW(hKey, szPolicies, 0, REG_BINARY, (PBYTE)&gupp, sizeof(gupp)) != ERROR_SUCCESS) { RegCloseKey(hKey); - - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, - L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Controls Folder\\PowerCfg\\GlobalPowerPolicy", - 0, - KEY_ALL_ACCESS, - &hKey)) - return FALSE; - - if (RegSetValueExW(hKey,szPolicies,0,REG_BINARY,(const unsigned char *)&gmpp,sizeof(GLOBAL_MACHINE_POWER_POLICY)) == ERROR_SUCCESS) - { - RegCloseKey(hKey); - return TRUE; - } - else - { - return FALSE; - } - } - else + return FALSE; + } + + RegCloseKey(hKey); + + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Controls Folder\\PowerCfg\\GlobalPowerPolicy", + 0, + KEY_ALL_ACCESS, + &hKey)) + return FALSE; + + if (RegSetValueExW(hKey,szPolicies, 0, REG_BINARY, (PBYTE)&gmpp, sizeof(gmpp)) != ERROR_SUCCESS) { RegCloseKey(hKey); return FALSE; } -} - + + RegCloseKey(hKey); + return TRUE; +} BOOLEAN WINAPI WriteProcessorPwrScheme(UINT ID, @@ -808,23 +736,20 @@ WCHAR Buf[MAX_PATH]; HKEY hKey; - swprintf(Buf,L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Controls Folder\\PowerCfg\\ProcessorPolicies\\%i",ID); - - if (RegCreateKey(HKEY_LOCAL_MACHINE,Buf, &hKey) == ERROR_SUCCESS) - { - RegSetValueExW(hKey,szPolicies,0,REG_BINARY,(const unsigned char *)pMachineProcessorPowerPolicy,sizeof(MACHINE_PROCESSOR_POWER_POLICY)); - RegCloseKey(hKey); - return TRUE; - } - else - { - return FALSE; - } -} - -void SetLastID() -{ - WCHAR Buf[MAX_PATH]; + swprintf(Buf, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Controls Folder\\PowerCfg\\ProcessorPolicies\\%i", ID); + + if (RegCreateKey(HKEY_LOCAL_MACHINE, Buf, &hKey) != ERROR_SUCCESS) + return FALSE; + + RegSetValueExW(hKey, szPolicies, 0, REG_BINARY, (PBYTE)pMachineProcessorPowerPolicy, sizeof(MACHINE_PROCESSOR_POWER_POLICY)); + RegCloseKey(hKey); + return TRUE; +} + +static VOID +SetLastID(VOID) +{ + WCHAR Buf[16]; HKEY hKey; if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, @@ -833,8 +758,8 @@ KEY_WRITE, &hKey) != ERROR_SUCCESS) return; - swprintf(Buf,L"%i",g_LastID); - RegSetValueExW(hKey,szLastID,0,REG_SZ,(CONST BYTE *)Buf,strlenW(Buf)*sizeof(WCHAR)); + swprintf(Buf, L"%i", g_LastID); + RegSetValueExW(hKey, szLastID, 0, REG_SZ, (PBYTE)Buf, strlenW(Buf)*sizeof(WCHAR)); RegCloseKey(hKey); } @@ -854,23 +779,19 @@ SetLastID(); } - swprintf(Buf,L"Control Panel\\PowerCfg\\PowerPolicies\\%i",*puiID); - - if (RegCreateKey(HKEY_CURRENT_USER,Buf,&hKey) == ERROR_SUCCESS) - { - RegSetValueExW(hKey,szName,0,REG_SZ,(const unsigned char *)lpszName,strlenW((const char *)lpszName)*sizeof(WCHAR)); - RegSetValueExW(hKey,szDescription,0,REG_SZ,(const unsigned char *)lpszDescription,strlenW((const char *)lpszDescription)*sizeof(WCHAR)); - RegCloseKey(hKey); - return WritePwrPolicy(puiID,pPowerPolicy); - } - else - { - return FALSE; - } - return FALSE; -} - -BOOLEAN CheckPowerActionPolicy(PPOWER_ACTION_POLICY pPAP, SYSTEM_POWER_CAPABILITIES PowerCaps) + swprintf(Buf, L"Control Panel\\PowerCfg\\PowerPolicies\\%i", *puiID); + + if (RegCreateKey(HKEY_CURRENT_USER, Buf, &hKey) != ERROR_SUCCESS) + return FALSE; + + RegSetValueExW(hKey, szName, 0, REG_SZ, (PBYTE)lpszName, strlenW(lpszName)*sizeof(WCHAR)); + RegSetValueExW(hKey, szDescription, 0, REG_SZ, (PBYTE)lpszDescription, strlenW(lpszDescription)*sizeof(WCHAR)); + RegCloseKey(hKey); + return WritePwrPolicy(puiID, pPowerPolicy); +} + +static BOOLEAN +CheckPowerActionPolicy(PPOWER_ACTION_POLICY pPAP, SYSTEM_POWER_CAPABILITIES PowerCaps) { /* Lohnegrim: this is an Helperfunction, it checks if the POWERACTIONPOLICY is valid @@ -906,9 +827,9 @@ }; } -VOID FixSystemPowerState(PSYSTEM_POWER_STATE Psps, SYSTEM_POWER_CAPABILITIES PowerCaps) -{ - +static VOID +FixSystemPowerState(PSYSTEM_POWER_STATE Psps, SYSTEM_POWER_CAPABILITIES PowerCaps) +{ //Lohnegrim: If the System dosn't support the Powerstates, then we have to change them if (!PowerCaps.SystemS1 && *Psps == PowerSystemSleeping1) *Psps = PowerSystemSleeping2; @@ -927,7 +848,6 @@ } - BOOLEAN WINAPI ValidatePowerPolicies(PGLOBAL_POWER_POLICY pGPP, PPOWER_POLICY pPP) { @@ -1148,52 +1068,43 @@ BOOLEAN WINAPI WritePwrPolicy(PUINT puiID, PPOWER_POLICY pPowerPolicy) { - WCHAR Buf[MAX_PATH]; HKEY hKey; - swprintf(Buf,L"Control Panel\\PowerCfg\\PowerPolicies\\%i",*puiID); - - if (RegCreateKey(HKEY_CURRENT_USER,Buf,&hKey) == ERROR_SUCCESS) - { - RegSetValueExW(hKey,szPolicies,0,REG_BINARY,(const unsigned char *)&pPowerPolicy->user,sizeof(USER_POWER_POLICY)); - RegCloseKey(hKey); - swprintf(Buf,L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Controls Folder\\PowerCfg\\PowerPolicies\\%i",*puiID); - - if (RegCreateKey(HKEY_LOCAL_MACHINE,Buf,&hKey) == ERROR_SUCCESS) - { - RegSetValueExW(hKey,szPolicies,0,REG_BINARY,(const unsigned char *)&pPowerPolicy->mach,sizeof(MACHINE_POWER_POLICY)); - RegCloseKey(hKey); - return TRUE; - } - else - { - return FALSE; - } - } - else - { - return FALSE; - } -} + swprintf(Buf, L"Control Panel\\PowerCfg\\PowerPolicies\\%i", *puiID); + + if (RegCreateKey(HKEY_CURRENT_USER, Buf, &hKey) != ERROR_SUCCESS) + return FALSE; + + RegSetValueExW(hKey, szPolicies, 0, REG_BINARY, (const unsigned char *)&pPowerPolicy->user, sizeof(USER_POWER_POLICY)); + RegCloseKey(hKey); + + swprintf(Buf, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Controls Folder\\PowerCfg\\PowerPolicies\\%i", *puiID); + + if (RegCreateKey(HKEY_LOCAL_MACHINE, Buf, &hKey) != ERROR_SUCCESS) + return FALSE; + + RegSetValueExW(hKey, szPolicies, 0, REG_BINARY, (const unsigned char *)&pPowerPolicy->mach, sizeof(MACHINE_POWER_POLICY)); + RegCloseKey(hKey); + + return TRUE; +} + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - FIXME("(%p, %d, %p) not fully implemented\n", hinstDLL, fdwReason, lpvReserved); - switch(fdwReason) { case DLL_PROCESS_ATTACH: { - HKEY hKey; - LONG r; + LONG Err; DisableThreadLibraryCalls(hinstDLL); - r = RegOpenKeyExW(HKEY_LOCAL_MACHINE, szPowerCfgSubKey, 0, KEY_READ | KEY_WRITE, &hKey); - - if (r != ERROR_SUCCESS) + Err = RegOpenKeyExW(HKEY_LOCAL_MACHINE, szPowerCfgSubKey, 0, KEY_READ, &hKey); + + if (Err != ERROR_SUCCESS) { TRACE("Couldn't open registry key HKLM\\%s, using some sane(?) defaults\n", debugstr_w(szPowerCfgSubKey)); } @@ -1201,8 +1112,9 @@ { WCHAR lpValue[MAX_PATH]; DWORD cbValue = sizeof(lpValue); - r = RegQueryValueExW(hKey, szLastID, 0, 0, (BYTE*)lpValue, &cbValue); - if (r == ERROR_SUCCESS) + + Err = RegQueryValueExW(hKey, szLastID, 0, 0, (BYTE*)lpValue, &cbValue); + if (Err == ERROR_SUCCESS) { g_LastID = _wtoi(lpValue); }

1 0

[ekohl] 54664: [EVENTLOG] Implement ElfrBackupELFA and ElfrReportEventA.
by ekohl＠svn.reactos.org 16 Dec '11

16 Dec '11

Author: ekohl Date: Fri Dec 16 18:18:20 2011 New Revision: 54664 URL: http://svn.reactos.org/svn/reactos?rev=54664&view=rev Log: [EVENTLOG] Implement ElfrBackupELFA and ElfrReportEventA. Modified: trunk/reactos/base/services/eventlog/rpc.c Modified: trunk/reactos/base/services/eventlog/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/rpc… ============================================================================== --- trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] Fri Dec 16 18:18:20 2011 @@ -540,8 +540,21 @@ IELF_HANDLE LogHandle, PRPC_STRING BackupFileName) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + UNICODE_STRING BackupFileNameW; + NTSTATUS Status; + + Status = RtlAnsiStringToUnicodeString(&BackupFileNameW, + (PANSI_STRING)BackupFileName, + TRUE); + if (!NT_SUCCESS(Status)) + return Status; + + Status = ElfrBackupELFW(LogHandle, + (PRPC_UNICODE_STRING)&BackupFileNameW); + + RtlFreeUnicodeString(&BackupFileNameW); + + return Status; } @@ -673,8 +686,104 @@ DWORD *RecordNumber, DWORD *TimeWritten) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + UNICODE_STRING ComputerNameW; + PUNICODE_STRING *StringsArrayW = NULL; + NTSTATUS Status = STATUS_SUCCESS; + USHORT i; + + DPRINT("ElfrReportEventA(%hu)\n", NumStrings); + +#if 0 + for (i = 0; i < NumStrings; i++) + { + if (Strings[i] == NULL) + { + DPRINT1("String %hu is null\n", i); + } + else + { + DPRINT1("String %hu: %Z\n", i, Strings[i]); + } + } +#endif + + Status = RtlAnsiStringToUnicodeString((PUNICODE_STRING)&ComputerNameW, + (PANSI_STRING)ComputerName, + TRUE); + if (!NT_SUCCESS(Status)) + return Status; + + if (NumStrings != 0) + { + StringsArrayW = HeapAlloc(MyHeap, + HEAP_ZERO_MEMORY, + NumStrings * sizeof (PUNICODE_STRING)); + if (StringsArrayW == NULL) + { + Status = STATUS_NO_MEMORY; + goto Done; + } + + for (i = 0; i < NumStrings; i++) + { + if (Strings[i] != NULL) + { + StringsArrayW[i] = HeapAlloc(MyHeap, + HEAP_ZERO_MEMORY, + sizeof(UNICODE_STRING)); + if (StringsArrayW[i] == NULL) + { + Status = STATUS_NO_MEMORY; + break; + } + + Status = RtlAnsiStringToUnicodeString(StringsArrayW[i], + (PANSI_STRING)Strings[i], + TRUE); + } + + if (!NT_SUCCESS(Status)) + break; + } + } + + if (NT_SUCCESS(Status)) + { + Status = ElfrReportEventW(LogHandle, + Time, + EventType, + EventCategory, + EventID, + NumStrings, + DataSize, + (PRPC_UNICODE_STRING)&ComputerNameW, + UserSID, + (PRPC_UNICODE_STRING*)StringsArrayW, + Data, + Flags, + RecordNumber, + TimeWritten); + } + +Done: + for (i = 0; i < NumStrings; i++) + { + if (StringsArrayW[i] != NULL) + { + if (StringsArrayW[i]->Buffer) + { + RtlFreeUnicodeString(StringsArrayW[i]); + HeapFree(MyHeap, 0, StringsArrayW[i]); + } + } + } + + if (StringsArrayW != NULL) + HeapFree(MyHeap, 0, StringsArrayW); + + RtlFreeUnicodeString(&ComputerNameW); + + return Status; }

1 0

[dgorbachev] 54663: [TRANSLATIONS] - Sync translated resource files (DeskADP and most of CPL) with English files. - Small Czech update of DXDiag and TaskMgr translations by Radek Liska (bug #6774).
by dgorbachev＠svn.reactos.org 16 Dec '11

16 Dec '11

Author: dgorbachev Date: Fri Dec 16 17:18:05 2011 New Revision: 54663 URL: http://svn.reactos.org/svn/reactos?rev=54663&view=rev Log: [TRANSLATIONS] - Sync translated resource files (DeskADP and most of CPL) with English files. - Small Czech update of DXDiag and TaskMgr translations by Radek Liska (bug #6774). Modified: trunk/reactos/base/applications/dxdiag/lang/cs-CZ.rc trunk/reactos/base/applications/taskmgr/lang/cs-CZ.rc trunk/reactos/dll/cpl/access/lang/bg-BG.rc trunk/reactos/dll/cpl/access/lang/pl-PL.rc trunk/reactos/dll/cpl/desk/lang/ro-RO.rc trunk/reactos/dll/cpl/desk/lang/sv-SE.rc trunk/reactos/dll/cpl/desk/lang/uk-UA.rc trunk/reactos/dll/cpl/input/lang/bg-BG.rc trunk/reactos/dll/cpl/input/lang/de-DE.rc trunk/reactos/dll/cpl/input/lang/el-GR.rc trunk/reactos/dll/cpl/input/lang/es-ES.rc trunk/reactos/dll/cpl/input/lang/fr-FR.rc trunk/reactos/dll/cpl/input/lang/it-IT.rc trunk/reactos/dll/cpl/input/lang/no-NO.rc trunk/reactos/dll/cpl/input/lang/pl-PL.rc trunk/reactos/dll/cpl/input/lang/ru-RU.rc trunk/reactos/dll/cpl/input/lang/sk-SK.rc trunk/reactos/dll/cpl/input/lang/uk-UA.rc trunk/reactos/dll/cpl/input/lang/zh-CN.rc trunk/reactos/dll/cpl/intl/lang/bg-BG.rc trunk/reactos/dll/cpl/intl/lang/cs-CZ.rc trunk/reactos/dll/cpl/intl/lang/de-DE.rc trunk/reactos/dll/cpl/intl/lang/en-US.rc trunk/reactos/dll/cpl/intl/lang/es-ES.rc trunk/reactos/dll/cpl/intl/lang/fr-FR.rc trunk/reactos/dll/cpl/intl/lang/it-IT.rc trunk/reactos/dll/cpl/intl/lang/no-NO.rc trunk/reactos/dll/cpl/intl/lang/pl-PL.rc trunk/reactos/dll/cpl/intl/lang/ro-RO.rc trunk/reactos/dll/cpl/intl/lang/ru-RU.rc trunk/reactos/dll/cpl/intl/lang/sk-SK.rc trunk/reactos/dll/cpl/intl/lang/uk-UA.rc trunk/reactos/dll/cpl/intl/lang/zh-CN.rc trunk/reactos/dll/cpl/joy/lang/bg-BG.rc trunk/reactos/dll/cpl/joy/lang/fr-FR.rc trunk/reactos/dll/cpl/joy/lang/pl-PL.rc trunk/reactos/dll/cpl/joy/lang/ru-RU.rc trunk/reactos/dll/cpl/main/lang/cs-CZ.rc trunk/reactos/dll/cpl/main/lang/de-DE.rc trunk/reactos/dll/cpl/main/lang/el-GR.rc trunk/reactos/dll/cpl/main/lang/no-NO.rc trunk/reactos/dll/cpl/main/lang/zh-CN.rc trunk/reactos/dll/cpl/mmsys/lang/bg-BG.rc trunk/reactos/dll/cpl/mmsys/lang/cs-CZ.rc trunk/reactos/dll/cpl/mmsys/lang/pt-BR.rc trunk/reactos/dll/cpl/powercfg/lang/bg-BG.rc trunk/reactos/dll/cpl/powercfg/lang/cs-CZ.rc trunk/reactos/dll/cpl/powercfg/lang/de-DE.rc trunk/reactos/dll/cpl/powercfg/lang/el-GR.rc trunk/reactos/dll/cpl/powercfg/lang/en-US.rc trunk/reactos/dll/cpl/powercfg/lang/es-ES.rc trunk/reactos/dll/cpl/powercfg/lang/fr-FR.rc trunk/reactos/dll/cpl/powercfg/lang/id-ID.rc trunk/reactos/dll/cpl/powercfg/lang/it-IT.rc trunk/reactos/dll/cpl/powercfg/lang/ja-JP.rc trunk/reactos/dll/cpl/powercfg/lang/nl-NL.rc trunk/reactos/dll/cpl/powercfg/lang/no-NO.rc trunk/reactos/dll/cpl/powercfg/lang/pl-PL.rc trunk/reactos/dll/cpl/powercfg/lang/ro-RO.rc trunk/reactos/dll/cpl/powercfg/lang/ru-RU.rc trunk/reactos/dll/cpl/powercfg/lang/sk-SK.rc trunk/reactos/dll/cpl/powercfg/lang/th-TH.rc trunk/reactos/dll/cpl/powercfg/lang/uk-UA.rc trunk/reactos/dll/cpl/powercfg/lang/zh-CN.rc trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc trunk/reactos/dll/cpl/sysdm/lang/da-DK.rc trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc trunk/reactos/dll/cpl/sysdm/lang/en-US.rc trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc trunk/reactos/dll/cpl/sysdm/lang/hu-HU.rc trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc trunk/reactos/dll/cpl/sysdm/lang/nl-NL.rc trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc trunk/reactos/dll/cpl/sysdm/rsrc.rc trunk/reactos/dll/cpl/timedate/lang/bg-BG.rc trunk/reactos/dll/cpl/timedate/lang/cs-CZ.rc trunk/reactos/dll/cpl/timedate/lang/da-DK.rc trunk/reactos/dll/cpl/timedate/lang/de-DE.rc trunk/reactos/dll/cpl/timedate/lang/el-GR.rc trunk/reactos/dll/cpl/timedate/lang/en-US.rc trunk/reactos/dll/cpl/timedate/lang/es-ES.rc trunk/reactos/dll/cpl/timedate/lang/eu-ES.rc trunk/reactos/dll/cpl/timedate/lang/fr-FR.rc trunk/reactos/dll/cpl/timedate/lang/hu-HU.rc trunk/reactos/dll/cpl/timedate/lang/id-ID.rc trunk/reactos/dll/cpl/timedate/lang/it-IT.rc trunk/reactos/dll/cpl/timedate/lang/ja-JP.rc trunk/reactos/dll/cpl/timedate/lang/nl-NL.rc trunk/reactos/dll/cpl/timedate/lang/no-NO.rc trunk/reactos/dll/cpl/timedate/lang/pl-PL.rc trunk/reactos/dll/cpl/timedate/lang/ro-RO.rc trunk/reactos/dll/cpl/timedate/lang/ru-RU.rc trunk/reactos/dll/cpl/timedate/lang/sk-SK.rc trunk/reactos/dll/cpl/timedate/lang/sv-SE.rc trunk/reactos/dll/cpl/timedate/lang/th-TH.rc trunk/reactos/dll/cpl/timedate/lang/uk-UA.rc trunk/reactos/dll/cpl/usrmgr/lang/pl-PL.rc trunk/reactos/dll/cpl/usrmgr/lang/ru-RU.rc trunk/reactos/dll/shellext/deskadp/lang/de-DE.rc trunk/reactos/dll/shellext/deskadp/lang/es-ES.rc trunk/reactos/dll/shellext/deskadp/lang/eu-ES.rc trunk/reactos/dll/shellext/deskadp/lang/pl-PL.rc trunk/reactos/dll/shellext/deskadp/lang/ro-RO.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/dxdiag/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/taskmgr/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/dll/cpl/access/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/bg-BG.… Modified: trunk/reactos/dll/cpl/access/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/pl-PL.… Modified: trunk/reactos/dll/cpl/desk/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ro-RO.rc… Modified: trunk/reactos/dll/cpl/desk/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sv-SE.rc… Modified: trunk/reactos/dll/cpl/desk/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/uk-UA.rc… Modified: trunk/reactos/dll/cpl/input/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/bg-BG.r… Modified: trunk/reactos/dll/cpl/input/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/de-DE.r… Modified: trunk/reactos/dll/cpl/input/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/el-GR.r… Modified: trunk/reactos/dll/cpl/input/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/es-ES.r… Modified: trunk/reactos/dll/cpl/input/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/fr-FR.r… Modified: trunk/reactos/dll/cpl/input/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/it-IT.r… Modified: trunk/reactos/dll/cpl/input/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/no-NO.r… Modified: trunk/reactos/dll/cpl/input/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/pl-PL.r… Modified: trunk/reactos/dll/cpl/input/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/ru-RU.r… Modified: trunk/reactos/dll/cpl/input/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/sk-SK.r… Modified: trunk/reactos/dll/cpl/input/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/uk-UA.r… Modified: trunk/reactos/dll/cpl/input/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/zh-CN.r… Modified: trunk/reactos/dll/cpl/intl/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/bg-BG.rc… Modified: trunk/reactos/dll/cpl/intl/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/cs-CZ.rc… Modified: trunk/reactos/dll/cpl/intl/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/de-DE.rc… Modified: trunk/reactos/dll/cpl/intl/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/en-US.rc… Modified: trunk/reactos/dll/cpl/intl/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/es-ES.rc… Modified: trunk/reactos/dll/cpl/intl/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/fr-FR.rc… Modified: trunk/reactos/dll/cpl/intl/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/it-IT.rc… Modified: trunk/reactos/dll/cpl/intl/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/no-NO.rc… Modified: trunk/reactos/dll/cpl/intl/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/pl-PL.rc… Modified: trunk/reactos/dll/cpl/intl/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/ro-RO.rc… Modified: trunk/reactos/dll/cpl/intl/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/ru-RU.rc… Modified: trunk/reactos/dll/cpl/intl/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/sk-SK.rc… Modified: trunk/reactos/dll/cpl/intl/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/uk-UA.rc… Modified: trunk/reactos/dll/cpl/intl/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/zh-CN.rc… Modified: trunk/reactos/dll/cpl/joy/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/lang/bg-BG.rc?… Modified: trunk/reactos/dll/cpl/joy/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/lang/fr-FR.rc?… Modified: trunk/reactos/dll/cpl/joy/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/lang/pl-PL.rc?… Modified: trunk/reactos/dll/cpl/joy/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/lang/ru-RU.rc?… Modified: trunk/reactos/dll/cpl/main/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/cs-CZ.rc… Modified: trunk/reactos/dll/cpl/main/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/de-DE.rc… Modified: trunk/reactos/dll/cpl/main/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/el-GR.rc… Modified: trunk/reactos/dll/cpl/main/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/no-NO.rc… Modified: trunk/reactos/dll/cpl/main/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/zh-CN.rc… Modified: trunk/reactos/dll/cpl/mmsys/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/bg-BG.r… Modified: trunk/reactos/dll/cpl/mmsys/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/cs-CZ.r… Modified: trunk/reactos/dll/cpl/mmsys/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/pt-BR.r… Modified: trunk/reactos/dll/cpl/powercfg/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/bg-B… Modified: trunk/reactos/dll/cpl/powercfg/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/cs-C… Modified: trunk/reactos/dll/cpl/powercfg/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/de-D… Modified: trunk/reactos/dll/cpl/powercfg/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/el-G… Modified: trunk/reactos/dll/cpl/powercfg/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/en-U… Modified: trunk/reactos/dll/cpl/powercfg/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/es-E… Modified: trunk/reactos/dll/cpl/powercfg/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/fr-F… Modified: trunk/reactos/dll/cpl/powercfg/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/id-I… Modified: trunk/reactos/dll/cpl/powercfg/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/it-I… Modified: trunk/reactos/dll/cpl/powercfg/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/ja-J… Modified: trunk/reactos/dll/cpl/powercfg/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/nl-N… Modified: trunk/reactos/dll/cpl/powercfg/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/no-N… Modified: trunk/reactos/dll/cpl/powercfg/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/pl-P… Modified: trunk/reactos/dll/cpl/powercfg/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/ro-R… Modified: trunk/reactos/dll/cpl/powercfg/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/ru-R… Modified: trunk/reactos/dll/cpl/powercfg/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/sk-S… Modified: trunk/reactos/dll/cpl/powercfg/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/th-T… Modified: trunk/reactos/dll/cpl/powercfg/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/uk-U… Modified: trunk/reactos/dll/cpl/powercfg/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/zh-C… Modified: trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/bg-BG.r… Modified: trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.r… Modified: trunk/reactos/dll/cpl/sysdm/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/da-DK.r… Modified: trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/de-DE.r… Modified: trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/el-GR.r… Modified: trunk/reactos/dll/cpl/sysdm/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/en-US.r… Modified: trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/es-ES.r… Modified: trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/fr-FR.r… Modified: trunk/reactos/dll/cpl/sysdm/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/hu-HU.r… Modified: trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/id-ID.r… Modified: trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/it-IT.r… Modified: trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ja-JP.r… Modified: trunk/reactos/dll/cpl/sysdm/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/nl-NL.r… Modified: trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/no-NO.r… Modified: trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/pl-PL.r… Modified: trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ro-RO.r… Modified: trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ru-RU.r… Modified: trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/sk-SK.r… Modified: trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/sv-SE.r… Modified: trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/uk-UA.r… Modified: trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/zh-CN.r… Modified: trunk/reactos/dll/cpl/sysdm/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/rsrc.rc?rev=… Modified: trunk/reactos/dll/cpl/timedate/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/bg-B… Modified: trunk/reactos/dll/cpl/timedate/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/cs-C… Modified: trunk/reactos/dll/cpl/timedate/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/da-D… Modified: trunk/reactos/dll/cpl/timedate/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/de-D… Modified: trunk/reactos/dll/cpl/timedate/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/el-G… Modified: trunk/reactos/dll/cpl/timedate/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/en-U… Modified: trunk/reactos/dll/cpl/timedate/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/es-E… Modified: trunk/reactos/dll/cpl/timedate/lang/eu-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/eu-E… Modified: trunk/reactos/dll/cpl/timedate/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/fr-F… Modified: trunk/reactos/dll/cpl/timedate/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/hu-H… Modified: trunk/reactos/dll/cpl/timedate/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/id-I… Modified: trunk/reactos/dll/cpl/timedate/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/it-I… Modified: trunk/reactos/dll/cpl/timedate/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/ja-J… Modified: trunk/reactos/dll/cpl/timedate/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/nl-N… Modified: trunk/reactos/dll/cpl/timedate/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/no-N… Modified: trunk/reactos/dll/cpl/timedate/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/pl-P… Modified: trunk/reactos/dll/cpl/timedate/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/ro-R… Modified: trunk/reactos/dll/cpl/timedate/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/ru-R… Modified: trunk/reactos/dll/cpl/timedate/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/sk-S… Modified: trunk/reactos/dll/cpl/timedate/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/sv-S… Modified: trunk/reactos/dll/cpl/timedate/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/th-T… Modified: trunk/reactos/dll/cpl/timedate/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/uk-U… Modified: trunk/reactos/dll/cpl/usrmgr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/pl-PL.… Modified: trunk/reactos/dll/cpl/usrmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/ru-RU.… Modified: trunk/reactos/dll/shellext/deskadp/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/lang/… Modified: trunk/reactos/dll/shellext/deskadp/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/lang/… Modified: trunk/reactos/dll/shellext/deskadp/lang/eu-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/lang/… Modified: trunk/reactos/dll/shellext/deskadp/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/lang/… Modified: trunk/reactos/dll/shellext/deskadp/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/lang/…

1 0

[fireball] 54662: [REFORMATTING] - Reindent the dbgbuffer.c code to the ReactOS Standard Indentation.
by fireball＠svn.reactos.org 16 Dec '11

16 Dec '11

Author: fireball Date: Fri Dec 16 15:45:09 2011 New Revision: 54662 URL: http://svn.reactos.org/svn/reactos?rev=54662&view=rev Log: [REFORMATTING] - Reindent the dbgbuffer.c code to the ReactOS Standard Indentation. Modified: trunk/reactos/lib/rtl/dbgbuffer.c Modified: trunk/reactos/lib/rtl/dbgbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/dbgbuffer.c?rev=54… ============================================================================== --- trunk/reactos/lib/rtl/dbgbuffer.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/dbgbuffer.c [iso-8859-1] Fri Dec 16 15:45:09 2011 @@ -1,8 +1,8 @@ /* COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: lib/rtl/dbgbuffer.c - * PROGRAMER: James Tabor - */ +* PROJECT: ReactOS system libraries +* FILE: lib/rtl/dbgbuffer.c +* PROGRAMER: James Tabor +*/ /* INCLUDES *****************************************************************/ @@ -14,388 +14,392 @@ /* FUNCTIONS *****************************************************************/ /* - * @unimplemented - */ -PRTL_DEBUG_INFORMATION NTAPI +* @unimplemented +*/ +PRTL_DEBUG_INFORMATION +NTAPI RtlCreateQueryDebugBuffer(IN ULONG Size, IN BOOLEAN EventPair) { - NTSTATUS Status; - PRTL_DEBUG_INFORMATION Buf = NULL; - SIZE_T ViewSize = 100 * PAGE_SIZE; - - Status = NtAllocateVirtualMemory( NtCurrentProcess(), - (PVOID*)&Buf, + NTSTATUS Status; + PRTL_DEBUG_INFORMATION Buf = NULL; + SIZE_T ViewSize = 100 * PAGE_SIZE; + + Status = NtAllocateVirtualMemory(NtCurrentProcess(), + (PVOID*)&Buf, 0, &ViewSize, MEM_COMMIT, PAGE_READWRITE); - if (!NT_SUCCESS(Status)) - { - return NULL; - } - - Buf->ViewBaseClient = Buf; - Buf->ViewSize = (ULONG)ViewSize; - - DPRINT("RtlCQDB: BA: %p BS: 0x%lx\n", Buf->ViewBaseClient, Buf->ViewSize); - - return Buf; + if (!NT_SUCCESS(Status)) return NULL; + + Buf->ViewBaseClient = Buf; + Buf->ViewSize = (ULONG)ViewSize; + + DPRINT("RtlCQDB: BA: %p BS: 0x%lx\n", Buf->ViewBaseClient, Buf->ViewSize); + + return Buf; } /* - * @unimplemented - */ -NTSTATUS NTAPI +* @unimplemented +*/ +NTSTATUS +NTAPI RtlDestroyQueryDebugBuffer(IN PRTL_DEBUG_INFORMATION Buf) { - NTSTATUS Status = STATUS_SUCCESS; - - if (NULL != Buf) - { - Status = NtFreeVirtualMemory( NtCurrentProcess(), - (PVOID)Buf, - (PSIZE_T)&Buf->ViewSize, /* FIXME: not portable! */ - MEM_RELEASE); - } - if (!NT_SUCCESS(Status)) - { + NTSTATUS Status = STATUS_SUCCESS; + + if (NULL != Buf) + { + Status = NtFreeVirtualMemory(NtCurrentProcess(), + (PVOID)Buf, + (PSIZE_T)&Buf->ViewSize, /* FIXME: not portable! */ + MEM_RELEASE); + } + if (!NT_SUCCESS(Status)) + { DPRINT1("RtlDQDB: Failed to free VM!\n"); - } - return Status; + } + return Status; } /* - * Based on lib/epsapi/enum/modules.c by KJK::Hyperion. - * - */ -NTSTATUS NTAPI +* Based on lib/epsapi/enum/modules.c by KJK::Hyperion. +* +*/ +NTSTATUS +NTAPI RtlpQueryRemoteProcessModules(HANDLE ProcessHandle, IN PRTL_PROCESS_MODULES Modules OPTIONAL, IN ULONG Size OPTIONAL, OUT PULONG ReturnedSize) { - PROCESS_BASIC_INFORMATION pbiInfo; - PPEB_LDR_DATA ppldLdrData; - LDR_DATA_TABLE_ENTRY lmModule; - PLIST_ENTRY pleListHead; - PLIST_ENTRY pleCurEntry; - - PRTL_PROCESS_MODULE_INFORMATION ModulePtr = NULL; - NTSTATUS Status = STATUS_SUCCESS; - ULONG UsedSize = sizeof(ULONG); - ANSI_STRING AnsiString; - PCHAR p; - - DPRINT("RtlpQueryRemoteProcessModules Start\n"); - - /* query the process basic information (includes the PEB address) */ - Status = NtQueryInformationProcess ( ProcessHandle, + PROCESS_BASIC_INFORMATION pbiInfo; + PPEB_LDR_DATA ppldLdrData; + LDR_DATA_TABLE_ENTRY lmModule; + PLIST_ENTRY pleListHead; + PLIST_ENTRY pleCurEntry; + + PRTL_PROCESS_MODULE_INFORMATION ModulePtr = NULL; + NTSTATUS Status = STATUS_SUCCESS; + ULONG UsedSize = sizeof(ULONG); + ANSI_STRING AnsiString; + PCHAR p; + + DPRINT("RtlpQueryRemoteProcessModules Start\n"); + + /* query the process basic information (includes the PEB address) */ + Status = NtQueryInformationProcess(ProcessHandle, ProcessBasicInformation, &pbiInfo, sizeof(PROCESS_BASIC_INFORMATION), NULL); - if (!NT_SUCCESS(Status)) - { - /* failure */ - DPRINT("NtQueryInformationProcess 1 0x%lx \n", Status); - return Status; - } - - if (Modules == NULL || Size == 0) - { - Status = STATUS_INFO_LENGTH_MISMATCH; - } - else - { - Modules->NumberOfModules = 0; - ModulePtr = &Modules->Modules[0]; - Status = STATUS_SUCCESS; - } - - /* get the address of the PE Loader data */ - Status = NtReadVirtualMemory ( ProcessHandle, - &(pbiInfo.PebBaseAddress->Ldr), - &ppldLdrData, - sizeof(ppldLdrData), - NULL ); - - if (!NT_SUCCESS(Status)) - { - /* failure */ - DPRINT("NtReadVirtualMemory 1 0x%lx \n", Status); - return Status; - } - - - /* head of the module list: the last element in the list will point to this */ - pleListHead = &ppldLdrData->InLoadOrderModuleList; - - /* get the address of the first element in the list */ - Status = NtReadVirtualMemory ( ProcessHandle, - &(ppldLdrData->InLoadOrderModuleList.Flink), - &pleCurEntry, + if (!NT_SUCCESS(Status)) + { + /* failure */ + DPRINT("NtQueryInformationProcess 1 0x%lx \n", Status); + return Status; + } + + if (Modules == NULL || Size == 0) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + } + else + { + Modules->NumberOfModules = 0; + ModulePtr = &Modules->Modules[0]; + Status = STATUS_SUCCESS; + } + + /* get the address of the PE Loader data */ + Status = NtReadVirtualMemory(ProcessHandle, + &(pbiInfo.PebBaseAddress->Ldr), + &ppldLdrData, + sizeof(ppldLdrData), + NULL); + + if (!NT_SUCCESS(Status)) + { + /* failure */ + DPRINT("NtReadVirtualMemory 1 0x%lx \n", Status); + return Status; + } + + + /* head of the module list: the last element in the list will point to this */ + pleListHead = &ppldLdrData->InLoadOrderModuleList; + + /* get the address of the first element in the list */ + Status = NtReadVirtualMemory(ProcessHandle, + &(ppldLdrData->InLoadOrderModuleList.Flink), + &pleCurEntry, sizeof(pleCurEntry), - NULL ); - - if (!NT_SUCCESS(Status)) - { + NULL); + + if (!NT_SUCCESS(Status)) + { /* failure */ DPRINT("NtReadVirtualMemory 2 0x%lx \n", Status); return Status; - } - - while(pleCurEntry != pleListHead) - { - - UNICODE_STRING Unicode; - WCHAR Buffer[256 * sizeof(WCHAR)]; - - /* read the current module */ - Status = NtReadVirtualMemory ( ProcessHandle, - CONTAINING_RECORD(pleCurEntry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks), - &lmModule, - sizeof(LDR_DATA_TABLE_ENTRY), - NULL ); - - /* Import module name from remote Process user space. */ - Unicode.Length = lmModule.FullDllName.Length; - Unicode.MaximumLength = lmModule.FullDllName.MaximumLength; - Unicode.Buffer = Buffer; - - Status = NtReadVirtualMemory ( ProcessHandle, - lmModule.FullDllName.Buffer, - Unicode.Buffer, - Unicode.Length, - NULL ); - - if (!NT_SUCCESS(Status)) - { - /* failure */ - DPRINT( "NtReadVirtualMemory 3 0x%lx \n", Status); - return Status; - } - - DPRINT(" Module %wZ\n", &Unicode); - - if (UsedSize > Size) + } + + while(pleCurEntry != pleListHead) + { + UNICODE_STRING Unicode; + WCHAR Buffer[256 * sizeof(WCHAR)]; + + /* read the current module */ + Status = NtReadVirtualMemory(ProcessHandle, + CONTAINING_RECORD(pleCurEntry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks), + &lmModule, + sizeof(LDR_DATA_TABLE_ENTRY), + NULL); + + /* Import module name from remote Process user space. */ + Unicode.Length = lmModule.FullDllName.Length; + Unicode.MaximumLength = lmModule.FullDllName.MaximumLength; + Unicode.Buffer = Buffer; + + Status = NtReadVirtualMemory(ProcessHandle, + lmModule.FullDllName.Buffer, + Unicode.Buffer, + Unicode.Length, + NULL); + + if (!NT_SUCCESS(Status)) { - Status = STATUS_INFO_LENGTH_MISMATCH; + /* failure */ + DPRINT( "NtReadVirtualMemory 3 0x%lx \n", Status); + return Status; } - else if (Modules != NULL) + + DPRINT(" Module %wZ\n", &Unicode); + + if (UsedSize > Size) { - ModulePtr->Section = 0; - ModulePtr->MappedBase = NULL; // FIXME: ?? - ModulePtr->ImageBase = lmModule.DllBase; - ModulePtr->ImageSize = lmModule.SizeOfImage; - ModulePtr->Flags = lmModule.Flags; - ModulePtr->LoadOrderIndex = 0; // FIXME: ?? - ModulePtr->InitOrderIndex = 0; // FIXME: ?? - ModulePtr->LoadCount = lmModule.LoadCount; - - AnsiString.Length = 0; - AnsiString.MaximumLength = 256; - AnsiString.Buffer = ModulePtr->FullPathName; - RtlUnicodeStringToAnsiString(&AnsiString, - &Unicode, - FALSE); - - p = strrchr(ModulePtr->FullPathName, '\\'); - if (p != NULL) - ModulePtr->OffsetToFileName = (USHORT)(p - ModulePtr->FullPathName + 1); - else - ModulePtr->OffsetToFileName = 0; - - ModulePtr++; - Modules->NumberOfModules++; + Status = STATUS_INFO_LENGTH_MISMATCH; } - UsedSize += sizeof(RTL_PROCESS_MODULE_INFORMATION); - - /* address of the next module in the list */ - pleCurEntry = lmModule.InLoadOrderLinks.Flink; - } - - if (ReturnedSize != 0) - *ReturnedSize = UsedSize; - - DPRINT("RtlpQueryRemoteProcessModules End\n"); + else if (Modules != NULL) + { + ModulePtr->Section = 0; + ModulePtr->MappedBase = NULL; // FIXME: ?? + ModulePtr->ImageBase = lmModule.DllBase; + ModulePtr->ImageSize = lmModule.SizeOfImage; + ModulePtr->Flags = lmModule.Flags; + ModulePtr->LoadOrderIndex = 0; // FIXME: ?? + ModulePtr->InitOrderIndex = 0; // FIXME: ?? + ModulePtr->LoadCount = lmModule.LoadCount; + + AnsiString.Length = 0; + AnsiString.MaximumLength = 256; + AnsiString.Buffer = ModulePtr->FullPathName; + RtlUnicodeStringToAnsiString(&AnsiString, + &Unicode, + FALSE); + + p = strrchr(ModulePtr->FullPathName, '\\'); + if (p != NULL) + ModulePtr->OffsetToFileName = (USHORT)(p - ModulePtr->FullPathName + 1); + else + ModulePtr->OffsetToFileName = 0; + + ModulePtr++; + Modules->NumberOfModules++; + } + UsedSize += sizeof(RTL_PROCESS_MODULE_INFORMATION); + + /* address of the next module in the list */ + pleCurEntry = lmModule.InLoadOrderLinks.Flink; + } + + if (ReturnedSize != 0) + *ReturnedSize = UsedSize; + + DPRINT("RtlpQueryRemoteProcessModules End\n"); /* success */ - return (STATUS_SUCCESS); + return (STATUS_SUCCESS); } /* - * @unimplemented - */ -NTSTATUS NTAPI +* @unimplemented +*/ +NTSTATUS +NTAPI RtlQueryProcessDebugInformation(IN ULONG ProcessId, IN ULONG DebugInfoMask, IN OUT PRTL_DEBUG_INFORMATION Buf) { - NTSTATUS Status = STATUS_SUCCESS; - ULONG Pid = (ULONG)(ULONG_PTR) NtCurrentTeb()->ClientId.UniqueProcess; - - Buf->Flags = DebugInfoMask; - Buf->OffsetFree = sizeof(RTL_DEBUG_INFORMATION); - - DPRINT("QueryProcessDebugInformation Start\n"); - -/* - Currently ROS can not read-only from kenrel space, and doesn't - check for boundaries inside kernel space that are page protected - from every one but the kernel. aka page 0 - 2 - */ -if (ProcessId <= 1) - { - Status = STATUS_ACCESS_VIOLATION; - } -else -if (Pid == ProcessId) - { - if (DebugInfoMask & RTL_DEBUG_QUERY_MODULES) - { - PRTL_PROCESS_MODULES Mp; - ULONG ReturnSize = 0; - ULONG MSize; - - Mp = (PRTL_PROCESS_MODULES)(Buf + Buf->OffsetFree); - - /* I like this better than the do & while loop. */ - Status = LdrQueryProcessModuleInformation( NULL, - 0 , - &ReturnSize); - Status = LdrQueryProcessModuleInformation( Mp, - ReturnSize , - &ReturnSize); - if (!NT_SUCCESS(Status)) - { - return Status; - } - - MSize = Mp->NumberOfModules * (sizeof(RTL_PROCESS_MODULES) + 8); - Buf->Modules = Mp; - Buf->OffsetFree = Buf->OffsetFree + MSize; - } - - if (DebugInfoMask & RTL_DEBUG_QUERY_HEAPS) - { - PRTL_PROCESS_HEAPS Hp; - ULONG HSize; - - Hp = (PRTL_PROCESS_HEAPS)(Buf + Buf->OffsetFree); - HSize = sizeof(RTL_PROCESS_HEAPS); - if (DebugInfoMask & RTL_DEBUG_QUERY_HEAP_TAGS) - { - } - if (DebugInfoMask & RTL_DEBUG_QUERY_HEAP_BLOCKS) - { - } - Buf->Heaps = Hp; - Buf->OffsetFree = Buf->OffsetFree + HSize; - - } - - if (DebugInfoMask & RTL_DEBUG_QUERY_LOCKS) - { - PRTL_PROCESS_LOCKS Lp; - ULONG LSize; - - Lp = (PRTL_PROCESS_LOCKS)(Buf + Buf->OffsetFree); - LSize = sizeof(RTL_PROCESS_LOCKS); - Buf->Locks = Lp; - Buf->OffsetFree = Buf->OffsetFree + LSize; - } - - DPRINT("QueryProcessDebugInformation end \n"); - DPRINT("QueryDebugInfo : 0x%lx\n", Buf->OffsetFree); + NTSTATUS Status = STATUS_SUCCESS; + ULONG Pid = (ULONG)(ULONG_PTR) NtCurrentTeb()->ClientId.UniqueProcess; + + Buf->Flags = DebugInfoMask; + Buf->OffsetFree = sizeof(RTL_DEBUG_INFORMATION); + + DPRINT("QueryProcessDebugInformation Start\n"); + + /* + Currently ROS can not read-only from kenrel space, and doesn't + check for boundaries inside kernel space that are page protected + from every one but the kernel. aka page 0 - 2 + */ + if (ProcessId <= 1) + { + Status = STATUS_ACCESS_VIOLATION; + } + else + if (Pid == ProcessId) + { + if (DebugInfoMask & RTL_DEBUG_QUERY_MODULES) + { + PRTL_PROCESS_MODULES Mp; + ULONG ReturnSize = 0; + ULONG MSize; + + Mp = (PRTL_PROCESS_MODULES)(Buf + Buf->OffsetFree); + + /* I like this better than the do & while loop. */ + Status = LdrQueryProcessModuleInformation(NULL, + 0, + &ReturnSize); + Status = LdrQueryProcessModuleInformation(Mp, + ReturnSize , + &ReturnSize); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + MSize = Mp->NumberOfModules * (sizeof(RTL_PROCESS_MODULES) + 8); + Buf->Modules = Mp; + Buf->OffsetFree = Buf->OffsetFree + MSize; + } + + if (DebugInfoMask & RTL_DEBUG_QUERY_HEAPS) + { + PRTL_PROCESS_HEAPS Hp; + ULONG HSize; + + Hp = (PRTL_PROCESS_HEAPS)(Buf + Buf->OffsetFree); + HSize = sizeof(RTL_PROCESS_HEAPS); + if (DebugInfoMask & RTL_DEBUG_QUERY_HEAP_TAGS) + { + // TODO + } + if (DebugInfoMask & RTL_DEBUG_QUERY_HEAP_BLOCKS) + { + // TODO + } + Buf->Heaps = Hp; + Buf->OffsetFree = Buf->OffsetFree + HSize; + + } + + if (DebugInfoMask & RTL_DEBUG_QUERY_LOCKS) + { + PRTL_PROCESS_LOCKS Lp; + ULONG LSize; + + Lp = (PRTL_PROCESS_LOCKS)(Buf + Buf->OffsetFree); + LSize = sizeof(RTL_PROCESS_LOCKS); + Buf->Locks = Lp; + Buf->OffsetFree = Buf->OffsetFree + LSize; + } + + DPRINT("QueryProcessDebugInformation end \n"); + DPRINT("QueryDebugInfo : 0x%lx\n", Buf->OffsetFree); + } + else + { + HANDLE hProcess; + CLIENT_ID ClientId; + OBJECT_ATTRIBUTES ObjectAttributes; + + Buf->TargetProcessHandle = NtCurrentProcess(); + + ClientId.UniqueThread = 0; + ClientId.UniqueProcess = (HANDLE)(ULONG_PTR)ProcessId; + InitializeObjectAttributes(&ObjectAttributes, + NULL, + 0, + NULL, + NULL); + + Status = NtOpenProcess(&hProcess, + (PROCESS_ALL_ACCESS), + &ObjectAttributes, + &ClientId ); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + if (DebugInfoMask & RTL_DEBUG_QUERY_MODULES) + { + PRTL_PROCESS_MODULES Mp; + ULONG ReturnSize = 0; + ULONG MSize; + + Mp = (PRTL_PROCESS_MODULES)(Buf + Buf->OffsetFree); + + Status = RtlpQueryRemoteProcessModules(hProcess, + NULL, + 0, + &ReturnSize); + + Status = RtlpQueryRemoteProcessModules(hProcess, + Mp, + ReturnSize , + &ReturnSize); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + MSize = Mp->NumberOfModules * (sizeof(RTL_PROCESS_MODULES) + 8); + Buf->Modules = Mp; + Buf->OffsetFree = Buf->OffsetFree + MSize; + } + + if (DebugInfoMask & RTL_DEBUG_QUERY_HEAPS) + { + PRTL_PROCESS_HEAPS Hp; + ULONG HSize; + + Hp = (PRTL_PROCESS_HEAPS)(Buf + Buf->OffsetFree); + HSize = sizeof(RTL_PROCESS_HEAPS); + if (DebugInfoMask & RTL_DEBUG_QUERY_HEAP_TAGS) + { + // TODO + } + if (DebugInfoMask & RTL_DEBUG_QUERY_HEAP_BLOCKS) + { + // TODO + } + Buf->Heaps = Hp; + Buf->OffsetFree = Buf->OffsetFree + HSize; + + } + + if (DebugInfoMask & RTL_DEBUG_QUERY_LOCKS) + { + PRTL_PROCESS_LOCKS Lp; + ULONG LSize; + + Lp = (PRTL_PROCESS_LOCKS)(Buf + Buf->OffsetFree); + LSize = sizeof(RTL_PROCESS_LOCKS); + Buf->Locks = Lp; + Buf->OffsetFree = Buf->OffsetFree + LSize; + } + + DPRINT("QueryProcessDebugInformation end \n"); + DPRINT("QueryDebugInfo : 0x%lx\n", Buf->OffsetFree); + } + + return Status; } -else -{ - HANDLE hProcess; - CLIENT_ID ClientId; - OBJECT_ATTRIBUTES ObjectAttributes; - - Buf->TargetProcessHandle = NtCurrentProcess(); - - ClientId.UniqueThread = 0; - ClientId.UniqueProcess = (HANDLE)(ULONG_PTR)ProcessId; - InitializeObjectAttributes(&ObjectAttributes, - NULL, - 0, - NULL, - NULL); - - Status = NtOpenProcess( &hProcess, - (PROCESS_ALL_ACCESS), - &ObjectAttributes, - &ClientId ); - if (!NT_SUCCESS(Status)) - { - return Status; - } - - if (DebugInfoMask & RTL_DEBUG_QUERY_MODULES) - { - PRTL_PROCESS_MODULES Mp; - ULONG ReturnSize = 0; - ULONG MSize; - - Mp = (PRTL_PROCESS_MODULES)(Buf + Buf->OffsetFree); - - Status = RtlpQueryRemoteProcessModules( hProcess, - NULL, - 0, - &ReturnSize); - - Status = RtlpQueryRemoteProcessModules( hProcess, - Mp, - ReturnSize , - &ReturnSize); - if (!NT_SUCCESS(Status)) - { - return Status; - } - - MSize = Mp->NumberOfModules * (sizeof(RTL_PROCESS_MODULES) + 8); - Buf->Modules = Mp; - Buf->OffsetFree = Buf->OffsetFree + MSize; - } - - if (DebugInfoMask & RTL_DEBUG_QUERY_HEAPS) - { - PRTL_PROCESS_HEAPS Hp; - ULONG HSize; - - Hp = (PRTL_PROCESS_HEAPS)(Buf + Buf->OffsetFree); - HSize = sizeof(RTL_PROCESS_HEAPS); - if (DebugInfoMask & RTL_DEBUG_QUERY_HEAP_TAGS) - { - } - if (DebugInfoMask & RTL_DEBUG_QUERY_HEAP_BLOCKS) - { - } - Buf->Heaps = Hp; - Buf->OffsetFree = Buf->OffsetFree + HSize; - - } - - if (DebugInfoMask & RTL_DEBUG_QUERY_LOCKS) - { - PRTL_PROCESS_LOCKS Lp; - ULONG LSize; - - Lp = (PRTL_PROCESS_LOCKS)(Buf + Buf->OffsetFree); - LSize = sizeof(RTL_PROCESS_LOCKS); - Buf->Locks = Lp; - Buf->OffsetFree = Buf->OffsetFree + LSize; - } - - DPRINT("QueryProcessDebugInformation end \n"); - DPRINT("QueryDebugInfo : 0x%lx\n", Buf->OffsetFree); -} - return Status; - -} /* EOL */

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