Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 58327: [POWRPROF_APITEST] Fix subscript out of array bounds
by tkreuzer＠svn.reactos.org 17 Feb '13

17 Feb '13

Author: tkreuzer Date: Sun Feb 17 10:31:50 2013 New Revision: 58327 URL: http://svn.reactos.org/svn/reactos?rev=58327&view=rev Log: [POWRPROF_APITEST] Fix subscript out of array bounds Modified: trunk/rostests/apitests/powrprof/power.c Modified: trunk/rostests/apitests/powrprof/power.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/powrprof/power.c… ============================================================================== --- trunk/rostests/apitests/powrprof/power.c [iso-8859-1] (original) +++ trunk/rostests/apitests/powrprof/power.c [iso-8859-1] Sun Feb 17 10:31:50 2013 @@ -997,11 +997,6 @@ if (pp.mach.pad1[1] != pp_compare.mach.pad1[1]) { printf("mach.pad1[1] failed %i != %i\n",pp.mach.pad1[1],pp_compare.mach.pad1[1]); - ret = FALSE; - } - if (pp.mach.pad1[2] != pp_compare.mach.pad1[2]) - { - printf("mach.pad1[2] failed %i != %i\n",pp.mach.pad1[2],pp_compare.mach.pad1[2]); ret = FALSE; } if (pp.mach.Revision != pp_compare.mach.Revision)

1 0

[ekohl] 58326: [MSGINA] - Fix a typo in the german lock dialog. - Store the user name and domain in the gina context and use them in the lock dialog. - Initialize the LOGONSERVER environment variable.
by ekohl＠svn.reactos.org 17 Feb '13

17 Feb '13

Author: ekohl Date: Sun Feb 17 01:06:24 2013 New Revision: 58326 URL: http://svn.reactos.org/svn/reactos?rev=58326&view=rev Log: [MSGINA] - Fix a typo in the german lock dialog. - Store the user name and domain in the gina context and use them in the lock dialog. - Initialize the LOGONSERVER environment variable. Modified: trunk/reactos/dll/win32/msgina/gui.c trunk/reactos/dll/win32/msgina/lang/de-DE.rc trunk/reactos/dll/win32/msgina/msgina.c trunk/reactos/dll/win32/msgina/msgina.h Modified: trunk/reactos/dll/win32/msgina/gui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/gui.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] Sun Feb 17 01:06:24 2013 @@ -414,6 +414,24 @@ } +static VOID +OnInitLockedDlg(HWND hwnd, + PGINA_CONTEXT pgContext, + UINT id) +{ + WCHAR Buffer1[256]; + WCHAR Buffer2[256]; + WCHAR Buffer3[512]; + + LoadStringW(pgContext->hDllInstance, IDS_LOCKMSG, Buffer1, 256); + + wsprintfW(Buffer2, L"%s\\%s", pgContext->Domain, pgContext->UserName); + wsprintfW(Buffer3, Buffer1, Buffer2); + + SetWindowTextW(GetDlgItem(hwnd, id), Buffer3); +} + + static INT_PTR CALLBACK LockedWindowProc( IN HWND hwndDlg, @@ -433,6 +451,7 @@ SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pgContext); pgContext->hBitmap = LoadImage(hDllInstance, MAKEINTRESOURCE(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); + OnInitLockedDlg(hwndDlg, pgContext, IDC_LOCKMSG); return TRUE; } case WM_PAINT: @@ -462,11 +481,9 @@ GUIDisplayLockedNotice( IN OUT PGINA_CONTEXT pgContext) { - int result; - TRACE("GUIdisplayLockedNotice()\n"); - result = pgContext->pWlxFuncs->WlxDialogBoxParam( + pgContext->pWlxFuncs->WlxDialogBoxParam( pgContext->hWlx, pgContext->hDllInstance, MAKEINTRESOURCEW(IDD_LOCKED_DLG), Modified: trunk/reactos/dll/win32/msgina/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/de-D… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/de-DE.rc [iso-8859-1] Sun Feb 17 01:06:24 2013 @@ -54,7 +54,7 @@ BEGIN CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 ICON IDI_LOCKICON,-1,7,59,20,20 - LTEXT "Dieser Computer wird verwndet und ist gesperrt.",IDC_STATIC,37,61,231,8 + LTEXT "Dieser Computer wird verwendet und ist gesperrt.",IDC_STATIC,37,61,231,8 LTEXT "Message",IDC_LOCKMSG,37,75,231,26 LTEXT "DrÃ¼cken Sie Strg+Alt+Entf um den Computer zu entsperren.",IDC_STATIC,37,106,231,8 END Modified: trunk/reactos/dll/win32/msgina/msgina.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.c?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] Sun Feb 17 01:06:24 2013 @@ -416,6 +416,7 @@ TOKEN_STATISTICS Stats; PWLX_PROFILE_V2_0 pProfile = NULL; DWORD cbStats, cbSize; + DWORD dwLength; BOOL bResult; if (!LogonUserW(UserName, Domain, Password, @@ -427,6 +428,18 @@ goto cleanup; } + /* Store user and domain in the context */ + wcscpy(pgContext->UserName, UserName); + if (Domain == NULL || wcslen(Domain) == 0) + { + dwLength = 256; + GetComputerNameW(pgContext->Domain, &dwLength); + } + else + { + wcscpy(pgContext->Domain, Domain); + } + /* Get profile path */ cbSize = 0; bResult = GetProfilesDirectoryW(NULL, &cbSize); @@ -456,13 +469,15 @@ pProfile->dwType = WLX_PROFILE_TYPE_V2_0; pProfile->pszProfile = ProfilePath; - lpEnvironment = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 32 * sizeof(WCHAR)); + lpEnvironment = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + (wcslen(pgContext->Domain)+ 14) * sizeof(WCHAR)); if (!lpEnvironment) { WARN("HeapAlloc() failed\n"); goto cleanup; } - wcscpy(lpEnvironment, L"LOGONSERVER=\\\\Test"); + + wsprintfW(lpEnvironment, L"LOGONSERVER=\\\\%s", pgContext->Domain); pProfile->pszEnvironment = lpEnvironment; Modified: trunk/reactos/dll/win32/msgina/msgina.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.h?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] Sun Feb 17 01:06:24 2013 @@ -29,6 +29,8 @@ DWORD AutoLogonState; /* Informations to be filled during logon */ + WCHAR UserName[256]; + WCHAR Domain[256]; HANDLE UserToken; PLUID pAuthenticationId; PDWORD pdwOptions;

1 0

[hbelusca] 58325: [CONSOLE.DLL] - Fix edit controls flag style - Remove that ugly WS_BORDER style to the spin controls.
by hbelusca＠svn.reactos.org 16 Feb '13

16 Feb '13

Author: hbelusca Date: Sat Feb 16 21:39:57 2013 New Revision: 58325 URL: http://svn.reactos.org/svn/reactos?rev=58325&view=rev Log: [CONSOLE.DLL] - Fix edit controls flag style - Remove that ugly WS_BORDER style to the spin controls. Modified: branches/ros-csrss/dll/cpl/console/lang/bg-BG.rc branches/ros-csrss/dll/cpl/console/lang/cs-CZ.rc branches/ros-csrss/dll/cpl/console/lang/de-DE.rc branches/ros-csrss/dll/cpl/console/lang/en-US.rc branches/ros-csrss/dll/cpl/console/lang/es-ES.rc branches/ros-csrss/dll/cpl/console/lang/fr-FR.rc branches/ros-csrss/dll/cpl/console/lang/he-IL.rc branches/ros-csrss/dll/cpl/console/lang/id-ID.rc branches/ros-csrss/dll/cpl/console/lang/it-IT.rc branches/ros-csrss/dll/cpl/console/lang/no-NO.rc branches/ros-csrss/dll/cpl/console/lang/pl-PL.rc branches/ros-csrss/dll/cpl/console/lang/ro-RO.rc branches/ros-csrss/dll/cpl/console/lang/ru-RU.rc branches/ros-csrss/dll/cpl/console/lang/sk-SK.rc branches/ros-csrss/dll/cpl/console/lang/uk-UA.rc branches/ros-csrss/dll/cpl/console/lang/zh-CN.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-csrss/dll/cpl/console/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… Modified: branches/ros-csrss/dll/cpl/console/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… Modified: branches/ros-csrss/dll/cpl/console/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… Modified: branches/ros-csrss/dll/cpl/console/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… Modified: branches/ros-csrss/dll/cpl/console/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… Modified: branches/ros-csrss/dll/cpl/console/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… Modified: branches/ros-csrss/dll/cpl/console/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… Modified: branches/ros-csrss/dll/cpl/console/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… Modified: branches/ros-csrss/dll/cpl/console/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… Modified: branches/ros-csrss/dll/cpl/console/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… Modified: branches/ros-csrss/dll/cpl/console/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… Modified: branches/ros-csrss/dll/cpl/console/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… Modified: branches/ros-csrss/dll/cpl/console/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… Modified: branches/ros-csrss/dll/cpl/console/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… Modified: branches/ros-csrss/dll/cpl/console/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… Modified: branches/ros-csrss/dll/cpl/console/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/…

1 0

[tkreuzer] 58324: [RTL] Fix RtlIsNameLegalDOS8Dot3 regression
by tkreuzer＠svn.reactos.org 16 Feb '13

16 Feb '13

Author: tkreuzer Date: Sat Feb 16 18:46:36 2013 New Revision: 58324 URL: http://svn.reactos.org/svn/reactos?rev=58324&view=rev Log: [RTL] Fix RtlIsNameLegalDOS8Dot3 regression Modified: trunk/reactos/lib/rtl/dos8dot3.c Modified: trunk/reactos/lib/rtl/dos8dot3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/dos8dot3.c?rev=583… ============================================================================== --- trunk/reactos/lib/rtl/dos8dot3.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/dos8dot3.c [iso-8859-1] Sat Feb 16 18:46:36 2013 @@ -225,12 +225,18 @@ /* * @implemented + * Note: the function does not conform to the annotations. + * SpacesFound is not always set! */ +_IRQL_requires_max_(PASSIVE_LEVEL) +_Must_inspect_result_ +NTSYSAPI BOOLEAN NTAPI -RtlIsNameLegalDOS8Dot3(IN PCUNICODE_STRING UnicodeName, - IN OUT POEM_STRING AnsiName OPTIONAL, - IN OUT PBOOLEAN SpacesFound OPTIONAL) +RtlIsNameLegalDOS8Dot3 ( + _In_ PCUNICODE_STRING Name, + _Inout_opt_ POEM_STRING OemName, + _Out_opt_ PBOOLEAN NameContainsSpaces) { static const char Illegal[] = "*?<>|\"+=,;[]:/\\\345"; int Dot = -1; @@ -240,36 +246,35 @@ BOOLEAN GotSpace = FALSE; NTSTATUS Status; - if (SpacesFound) *SpacesFound = FALSE; - - if (!AnsiName) + if (!OemName) { OemString.Length = sizeof(Buffer); OemString.MaximumLength = sizeof(Buffer); OemString.Buffer = Buffer; - AnsiName = &OemString; - } - - Status = RtlUpcaseUnicodeStringToCountedOemString(AnsiName, UnicodeName, FALSE); + OemName = &OemString; + } + + Status = RtlUpcaseUnicodeStringToCountedOemString(OemName, Name, FALSE); if (!NT_SUCCESS(Status)) return FALSE; - if ((AnsiName->Length > 12) || (AnsiName->Buffer == NULL)) return FALSE; + if ((OemName->Length > 12) || (OemName->Buffer == NULL)) return FALSE; /* a starting . is invalid, except for . and .. */ - if (AnsiName->Buffer[0] == '.') - { - if (AnsiName->Length != 1 && (AnsiName->Length != 2 || AnsiName->Buffer[1] != '.')) return FALSE; + if (OemName->Buffer[0] == '.') + { + if (OemName->Length != 1 && (OemName->Length != 2 || OemName->Buffer[1] != '.')) return FALSE; + if (NameContainsSpaces) *NameContainsSpaces = FALSE; return TRUE; } - for (i = 0; i < AnsiName->Length; i++) - { - switch (AnsiName->Buffer[i]) + for (i = 0; i < OemName->Length; i++) + { + switch (OemName->Buffer[i]) { case ' ': /* leading/trailing spaces not allowed */ - if (!i || i == AnsiName->Length-1 || AnsiName->Buffer[i+1] == '.') return FALSE; + if (!i || i == OemName->Length-1 || OemName->Buffer[i+1] == '.') return FALSE; GotSpace = TRUE; break; case '.': @@ -277,7 +282,7 @@ Dot = i; break; default: - if (strchr(Illegal, AnsiName->Buffer[i])) return FALSE; + if (strchr(Illegal, OemName->Buffer[i])) return FALSE; break; } } @@ -286,13 +291,13 @@ */ if (Dot == -1) { - if (AnsiName->Length > 8) return FALSE; + if (OemName->Length > 8) return FALSE; } else { - if (Dot > 8 || (AnsiName->Length - Dot > 4) || Dot == AnsiName->Length - 1) return FALSE; - } - if (SpacesFound) *SpacesFound = GotSpace; + if (Dot > 8 || (OemName->Length - Dot > 4) || Dot == OemName->Length - 1) return FALSE; + } + if (NameContainsSpaces) *NameContainsSpaces = GotSpace; return TRUE; }

1 0

[tkreuzer] 58323: [RTL] Fix some VS /analyze warnings, fix RtlGet/SetHeapInformation
by tkreuzer＠svn.reactos.org 16 Feb '13

16 Feb '13

Author: tkreuzer Date: Sat Feb 16 18:08:58 2013 New Revision: 58323 URL: http://svn.reactos.org/svn/reactos?rev=58323&view=rev Log: [RTL] Fix some VS /analyze warnings, fix RtlGet/SetHeapInformation Modified: trunk/reactos/lib/rtl/heap.c Modified: trunk/reactos/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.c?rev=58323&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap.c [iso-8859-1] Sat Feb 16 18:08:58 2013 @@ -541,7 +541,7 @@ PLIST_ENTRY Current; PHEAP_UCR_DESCRIPTOR UcrDescriptor; - DPRINT("RtlpInsertUnCommittedPages(%p %p %x)\n", Segment, Address, Size); + DPRINT("RtlpInsertUnCommittedPages(%p %08Ix %Ix)\n", Segment, Address, Size); /* Go through the list of UCR descriptors, they are sorted from lowest address to the highest */ @@ -596,7 +596,7 @@ /* "Current" is the descriptor before which our one should go */ InsertTailList(Current, &UcrDescriptor->SegmentEntry); - DPRINT("Added segment UCR with base %p, size 0x%x\n", Address, Size); + DPRINT("Added segment UCR with base %08Ix, size 0x%x\n", Address, Size); /* Increase counters */ Segment->NumberOfUnCommittedRanges++; @@ -614,7 +614,7 @@ PHEAP_ENTRY FirstEntry, LastEntry; NTSTATUS Status; - DPRINT("RtlpFindAndCommitPages(%p %p %x %p)\n", Heap, Segment, *Size, Address); + DPRINT("RtlpFindAndCommitPages(%p %p %Ix %08Ix)\n", Heap, Segment, *Size, Address); /* Go through UCRs in a segment */ Current = Segment->UCRSegmentList.Flink; @@ -644,7 +644,7 @@ PAGE_READWRITE); } - DPRINT("Committed %d bytes at base %p, UCR size is %d\n", *Size, Address, UcrDescriptor->Size); + DPRINT("Committed %Iu bytes at base %08Ix, UCR size is %lu\n", *Size, Address, UcrDescriptor->Size); /* Fail in unsuccessful case */ if (!NT_SUCCESS(Status)) @@ -679,7 +679,7 @@ UcrDescriptor->Address = (PVOID)((ULONG_PTR)UcrDescriptor->Address + *Size); UcrDescriptor->Size -= *Size; - DPRINT("Updating UcrDescriptor %p, new Address %p, size %d\n", + DPRINT("Updating UcrDescriptor %p, new Address %p, size %lu\n", UcrDescriptor, UcrDescriptor->Address, UcrDescriptor->Size); /* Set various first entry fields */ @@ -1080,7 +1080,7 @@ { Segment = Heap->Segments[Index]; - if (Segment) DPRINT("Segment[%d] %p with NOUCP %x\n", Index, Segment, Segment->NumberOfUnCommittedPages); + if (Segment) DPRINT("Segment[%u] %p with NOUCP %x\n", Index, Segment, Segment->NumberOfUnCommittedPages); /* Check if its size suits us */ if (Segment && @@ -1162,7 +1162,7 @@ MEM_COMMIT, PAGE_READWRITE); - DPRINT("Committed %d bytes at base %p\n", CommitSize, Segment); + DPRINT("Committed %lu bytes at base %p\n", CommitSize, Segment); /* Initialize heap segment if commit was successful */ if (NT_SUCCESS(Status)) @@ -1479,7 +1479,7 @@ MEM_COMMIT, PAGE_READWRITE); - DPRINT("Committed %d bytes at base %p\n", CommitSize, CommittedAddress); + DPRINT("Committed %Iu bytes at base %p\n", CommitSize, CommittedAddress); if (!NT_SUCCESS(Status)) { @@ -3303,7 +3303,8 @@ if (CurrentEntry->SegmentOffset != SegmentOffset) { - DPRINT1("HEAP: Heap entry %p SegmentOffset is incorrect %x (should be %x)\n", CurrentEntry, SegmentOffset, CurrentEntry->SegmentOffset); + DPRINT1("HEAP: Heap entry %p SegmentOffset is incorrect %x (should be %x)\n", + CurrentEntry, SegmentOffset, CurrentEntry->SegmentOffset); return FALSE; } @@ -3317,7 +3318,8 @@ /* Check if it's not really the last one */ if (CurrentEntry != Segment->LastValidEntry) { - DPRINT1("HEAP: Heap entry %p is not last block in segment (%x)\n", CurrentEntry, Segment->LastValidEntry); + DPRINT1("HEAP: Heap entry %p is not last block in segment (%p)\n", + CurrentEntry, Segment->LastValidEntry); return FALSE; } } @@ -3439,24 +3441,24 @@ /* If there is an in-use entry in a free list - that's quite a big problem */ if (FreeEntry->Flags & HEAP_ENTRY_BUSY) { - DPRINT1("HEAP: %x-dedicated list free element %x is marked in-use\n", Size, FreeEntry); + DPRINT1("HEAP: %Ix-dedicated list free element %p is marked in-use\n", Size, FreeEntry); return FALSE; } /* Check sizes according to that specific list's size */ if ((Size == 0) && (FreeEntry->Size < HEAP_FREELISTS)) { - DPRINT1("HEAP: Non dedicated list free element %x has size %x which would fit a dedicated list\n", FreeEntry, FreeEntry->Size); + DPRINT1("HEAP: Non dedicated list free element %p has size %x which would fit a dedicated list\n", FreeEntry, FreeEntry->Size); return FALSE; } else if (Size && (FreeEntry->Size != Size)) { - DPRINT1("HEAP: %x-dedicated list free element %x has incorrect size %x\n", Size, FreeEntry, FreeEntry->Size); + DPRINT1("HEAP: %Ix-dedicated list free element %p has incorrect size %x\n", Size, FreeEntry, FreeEntry->Size); return FALSE; } else if ((Size == 0) && (FreeEntry->Size < PreviousSize)) { - DPRINT1("HEAP: Non dedicated list free element %x is not put in order\n", FreeEntry); + DPRINT1("HEAP: Non dedicated list free element %p is not put in order\n", FreeEntry); return FALSE; } @@ -3514,13 +3516,13 @@ if (FreeListEntriesCount != FreeBlocksCount) { - DPRINT1("HEAP: Free blocks count in arena (%d) does not match free blocks number in the free lists (%d)\n", FreeBlocksCount, FreeListEntriesCount); + DPRINT1("HEAP: Free blocks count in arena (%lu) does not match free blocks number in the free lists (%lu)\n", FreeBlocksCount, FreeListEntriesCount); return FALSE; } if (Heap->TotalFreeSize != TotalFreeSize) { - DPRINT1("HEAP: Total size of free blocks in arena (%d) does not equal to the one in heap header (%d)\n", TotalFreeSize, Heap->TotalFreeSize); + DPRINT1("HEAP: Total size of free blocks in arena (%Iu) does not equal to the one in heap header (%Iu)\n", TotalFreeSize, Heap->TotalFreeSize); return FALSE; } @@ -3562,7 +3564,7 @@ /* Check signature */ if (Heap->Signature != HEAP_SIGNATURE) { - DPRINT1("HEAP: Signature %x is invalid for heap %p\n", Heap->Signature, Heap); + DPRINT1("HEAP: Signature %lx is invalid for heap %p\n", Heap->Signature, Heap); return FALSE; } @@ -3810,11 +3812,11 @@ /* Pass user value */ if (UserValue) *UserValue = (PVOID)Extra->Settable; - - /* Decode and return user flags */ - if (UserFlags) - *UserFlags = (HeapEntry->Flags & HEAP_ENTRY_SETTABLE_FLAGS) << 4; - } + } + + /* Decode and return user flags */ + if (UserFlags) + *UserFlags = (HeapEntry->Flags & HEAP_ENTRY_SETTABLE_FLAGS) << 4; /* Release the heap lock if it was acquired */ if (HeapLocked) @@ -3900,53 +3902,59 @@ IN SIZE_T HeapInformationLength) { /* Setting heap information is not really supported except for enabling LFH */ - if (HeapInformationClass == 0) return STATUS_SUCCESS; - - /* Check buffer length */ - if (HeapInformationLength < sizeof(ULONG)) - { - /* The provided buffer is too small */ - return STATUS_BUFFER_TOO_SMALL; - } - - /* Check for a special magic value for enabling LFH */ - if (*(PULONG)HeapInformation == 2) - { + if (HeapInformationClass == HeapCompatibilityInformation) + { + /* Check buffer length */ + if (HeapInformationLength < sizeof(ULONG)) + { + /* The provided buffer is too small */ + return STATUS_BUFFER_TOO_SMALL; + } + + /* Check for a special magic value for enabling LFH */ + if (*(PULONG)HeapInformation != 2) + { + return STATUS_UNSUCCESSFUL; + } + DPRINT1("RtlSetHeapInformation() needs to enable LFH\n"); return STATUS_SUCCESS; } - return STATUS_UNSUCCESSFUL; + return STATUS_SUCCESS; } NTSTATUS NTAPI RtlQueryHeapInformation(HANDLE HeapHandle, HEAP_INFORMATION_CLASS HeapInformationClass, - PVOID HeapInformation OPTIONAL, - SIZE_T HeapInformationLength OPTIONAL, + PVOID HeapInformation, + SIZE_T HeapInformationLength, PSIZE_T ReturnLength OPTIONAL) { PHEAP Heap = (PHEAP)HeapHandle; /* Only HeapCompatibilityInformation is supported */ - if (HeapInformationClass != HeapCompatibilityInformation) - return STATUS_UNSUCCESSFUL; - - /* Set result length */ - if (ReturnLength) *ReturnLength = sizeof(ULONG); - - /* Check buffer length */ - if (HeapInformationLength < sizeof(ULONG)) - { - /* It's too small, return needed length */ - return STATUS_BUFFER_TOO_SMALL; - } - - /* Return front end heap type */ - *(PULONG)HeapInformation = Heap->FrontEndHeapType; - - return STATUS_SUCCESS; + if (HeapInformationClass == HeapCompatibilityInformation) + { + /* Set result length */ + if (ReturnLength) + *ReturnLength = sizeof(ULONG); + + /* Check buffer length */ + if (HeapInformationLength < sizeof(ULONG)) + { + /* It's too small, return needed length */ + return STATUS_BUFFER_TOO_SMALL; + } + + /* Return front end heap type */ + *(PULONG)HeapInformation = Heap->FrontEndHeapType; + + return STATUS_SUCCESS; + } + + return STATUS_UNSUCCESSFUL; } NTSTATUS

1 0

[tkreuzer] 58322: [RTL] Fix warnings from VS /analyze
by tkreuzer＠svn.reactos.org 16 Feb '13

16 Feb '13

Author: tkreuzer Date: Sat Feb 16 17:58:16 2013 New Revision: 58322 URL: http://svn.reactos.org/svn/reactos?rev=58322&view=rev Log: [RTL] Fix warnings from VS /analyze Modified: trunk/reactos/lib/rtl/path.c Modified: trunk/reactos/lib/rtl/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/path.c?rev=58322&r… ============================================================================== --- trunk/reactos/lib/rtl/path.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/path.c [iso-8859-1] Sat Feb 16 17:58:16 2013 @@ -286,12 +286,13 @@ ULONG NTAPI -RtlGetFullPathName_Ustr(IN PUNICODE_STRING FileName, - IN ULONG Size, - IN PWSTR Buffer, - OUT PCWSTR *ShortName, - OUT PBOOLEAN InvalidName, - OUT RTL_PATH_TYPE *PathType) +RtlGetFullPathName_Ustr( + _In_ PUNICODE_STRING FileName, + _In_ ULONG Size, + _Out_z_bytecap_(Size) PWSTR Buffer, + _Out_opt_ PCWSTR *ShortName, + _Out_opt_ PBOOLEAN InvalidName, + _Out_ RTL_PATH_TYPE *PathType) { PWCHAR FileNameBuffer; ULONG FileNameLength, FileNameChars, DosLength, DosLengthOffset, FullLength; @@ -300,7 +301,7 @@ /* For now, assume the name is valid */ DPRINT("Filename: %wZ\n", FileName); - DPRINT("Size and buffer: %lx %S\n", Size, Buffer); + DPRINT("Size and buffer: %lx %p\n", Size, Buffer); if (InvalidName) *InvalidName = FALSE; /* Handle initial path type and failure case */ @@ -374,7 +375,7 @@ DPRINT("Path type: %lx\n", *PathType); /* This is disgusting... but avoids re-writing everything */ - DPRINT("Calling old API with %s and %lx and %S\n", FileNameBuffer, Size, Buffer); + DPRINT("Calling old API with '%S' and %lu and %S\n", FileNameBuffer, Size, Buffer); return RtlGetFullPathName_U(FileNameBuffer, Size, Buffer, (PWSTR*)ShortName); } @@ -911,8 +912,9 @@ */ ULONG NTAPI -RtlGetCurrentDirectory_U(IN ULONG MaximumLength, - IN PWSTR Buffer) +RtlGetCurrentDirectory_U( + _In_ ULONG MaximumLength, + _Out_bytecap_(MaximumLength) PWSTR Buffer) { ULONG Length, Bytes; PCURDIR CurDir; @@ -982,6 +984,8 @@ DPRINT("CurrentDirectory %S\n", Buffer); return Length * sizeof(WCHAR); } + + /* * @implemented @@ -1453,7 +1457,7 @@ if (reqsize) memcpy(buffer, ins_str, reqsize); reqsize += deplen; - if (ins_str != tmp && ins_str != cd->Buffer) + if (ins_str && ins_str != tmp && ins_str != cd->Buffer) RtlFreeHeap(RtlGetProcessHeap(), 0, ins_str); collapse_path( buffer, (ULONG)mark ); @@ -1824,7 +1828,7 @@ &ShortName, NameInvalid, PathType); - DPRINT("Length: %d StaticBuffer: %S\n", Length, StaticBuffer); + DPRINT("Length: %u StaticBuffer: %S\n", Length, StaticBuffer); if (!Length) { /* Fail if it failed */ @@ -2310,6 +2314,7 @@ "the search path, but RtlGetfullPathNameUStrEx() " "returned %08lx\n", __FUNCTION__, + &StaticCandidateString, Status); } DPRINT("STatus: %lx BUFFER: %S\n", Status, CallerBuffer->Buffer);

1 0

[tkreuzer] 58321: [RTL] Improve RtlCreateEnvironment, fixing some warnings from VS /analyze
by tkreuzer＠svn.reactos.org 16 Feb '13

16 Feb '13

Author: tkreuzer Date: Sat Feb 16 17:53:05 2013 New Revision: 58321 URL: http://svn.reactos.org/svn/reactos?rev=58321&view=rev Log: [RTL] Improve RtlCreateEnvironment, fixing some warnings from VS /analyze Modified: trunk/reactos/lib/rtl/env.c Modified: trunk/reactos/lib/rtl/env.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/env.c?rev=58321&r1… ============================================================================== --- trunk/reactos/lib/rtl/env.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/env.c [iso-8859-1] Sat Feb 16 17:53:05 2013 @@ -17,75 +17,85 @@ /* * @implemented */ -NTSTATUS NTAPI -RtlCreateEnvironment(BOOLEAN Inherit, - PWSTR *Environment) +NTSTATUS +NTAPI +RtlCreateEnvironment( + BOOLEAN Inherit, + PWSTR *OutEnvironment) { - MEMORY_BASIC_INFORMATION MemInfo; - PVOID EnvPtr = NULL; - NTSTATUS Status = STATUS_SUCCESS; - SIZE_T RegionSize = PAGE_SIZE; - - if (Inherit == TRUE) - { - RtlAcquirePebLock(); - - if (NtCurrentPeb()->ProcessParameters->Environment != NULL) - { - Status = NtQueryVirtualMemory(NtCurrentProcess(), - NtCurrentPeb()->ProcessParameters->Environment, - MemoryBasicInformation, - &MemInfo, - sizeof(MEMORY_BASIC_INFORMATION), - NULL); - if (!NT_SUCCESS(Status)) - { - RtlReleasePebLock(); - *Environment = NULL; - return(Status); - } - - RegionSize = MemInfo.RegionSize; - Status = NtAllocateVirtualMemory(NtCurrentProcess(), - &EnvPtr, - 0, - &RegionSize, - MEM_RESERVE | MEM_COMMIT, - PAGE_READWRITE); - if (!NT_SUCCESS(Status)) - { - RtlReleasePebLock(); - *Environment = NULL; - return(Status); - } - - memmove(EnvPtr, - NtCurrentPeb ()->ProcessParameters->Environment, - MemInfo.RegionSize); - - *Environment = EnvPtr; - } - - RtlReleasePebLock (); - } - else - { - Status = NtAllocateVirtualMemory(NtCurrentProcess(), - &EnvPtr, - 0, - &RegionSize, - MEM_RESERVE | MEM_COMMIT, - PAGE_READWRITE); - if (NT_SUCCESS(Status)) - { - memset(EnvPtr, - 0, - RegionSize); - *Environment = EnvPtr; - } - } - - return(Status); + MEMORY_BASIC_INFORMATION MemInfo; + PVOID CurrentEnvironment, NewEnvironment = NULL; + NTSTATUS Status = STATUS_SUCCESS; + SIZE_T RegionSize = PAGE_SIZE; + + /* Check if we should inherit the current environment */ + if (Inherit) + { + /* In this case we need to lock the PEB */ + RtlAcquirePebLock(); + + /* Get a pointer to the current Environment and check if it's not NULL */ + CurrentEnvironment = NtCurrentPeb()->ProcessParameters->Environment; + if (CurrentEnvironment != NULL) + { + /* Query the size of the current environment allocation */ + Status = NtQueryVirtualMemory(NtCurrentProcess(), + CurrentEnvironment, + MemoryBasicInformation, + &MemInfo, + sizeof(MEMORY_BASIC_INFORMATION), + NULL); + if (!NT_SUCCESS(Status)) + { + RtlReleasePebLock(); + *OutEnvironment = NULL; + return Status; + } + + /* Allocate a new region of the same size */ + RegionSize = MemInfo.RegionSize; + Status = NtAllocateVirtualMemory(NtCurrentProcess(), + &NewEnvironment, + 0, + &RegionSize, + MEM_RESERVE | MEM_COMMIT, + PAGE_READWRITE); + if (!NT_SUCCESS(Status)) + { + RtlReleasePebLock(); + *OutEnvironment = NULL; + return Status; + } + + /* Copy the current environment */ + RtlCopyMemory(NewEnvironment, + CurrentEnvironment, + MemInfo.RegionSize); + } + + /* We are done with the PEB, release the lock */ + RtlReleasePebLock (); + } + + /* Check if we still need an environment */ + if (NewEnvironment == NULL) + { + /* Allocate a new environment */ + Status = NtAllocateVirtualMemory(NtCurrentProcess(), + &NewEnvironment, + 0, + &RegionSize, + MEM_RESERVE | MEM_COMMIT, + PAGE_READWRITE); + if (NT_SUCCESS(Status)) + { + RtlZeroMemory(NewEnvironment, RegionSize); + } + } + + *OutEnvironment = NewEnvironment; + + return Status; } @@ -315,7 +325,7 @@ while (*env_end); env_end++; env_len = env_end - env; - DPRINT("environment length %ld characters\n", env_len); + DPRINT("environment length %lu characters\n", env_len); /* find where to insert */ while (*wcs)

1 0

[tkreuzer] 58320: [WIN32K] Improve code a bit
by tkreuzer＠svn.reactos.org 16 Feb '13

16 Feb '13

Author: tkreuzer Date: Sat Feb 16 17:44:38 2013 New Revision: 58320 URL: http://svn.reactos.org/svn/reactos?rev=58320&view=rev Log: [WIN32K] Improve code a bit Modified: trunk/reactos/win32ss/gdi/eng/surface.c Modified: trunk/reactos/win32ss/gdi/eng/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/surface.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/surface.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/surface.c [iso-8859-1] Sat Feb 16 17:44:38 2013 @@ -339,11 +339,11 @@ /* Set the device handle */ psurf->SurfObj.dhsurf = dhsurf; + /* Set public ownership */ + GDIOBJ_vSetObjectOwner(&psurf->BaseObject, GDI_OBJ_HMGR_PUBLIC); + /* Get the handle for the bitmap */ hbmp = (HBITMAP)psurf->SurfObj.hsurf; - - /* Set public ownership */ - GDIOBJ_vSetObjectOwner(&psurf->BaseObject, GDI_OBJ_HMGR_PUBLIC); /* Unlock the surface and return */ SURFACE_UnlockSurface(psurf); @@ -377,11 +377,11 @@ /* Set the device handle */ psurf->SurfObj.dhsurf = dhsurf; + /* Set public ownership */ + GDIOBJ_vSetObjectOwner(&psurf->BaseObject, GDI_OBJ_HMGR_PUBLIC); + /* Get the handle for the surface */ hsurf = psurf->SurfObj.hsurf; - - /* Set public ownership */ - GDIOBJ_vSetObjectOwner(&psurf->BaseObject, GDI_OBJ_HMGR_PUBLIC); /* Unlock the surface and return */ SURFACE_UnlockSurface(psurf);

1 0

[tkreuzer] 58319: [NTOSKRNL] Fix a number of warnings from VS /analyze
by tkreuzer＠svn.reactos.org 16 Feb '13

16 Feb '13

Author: tkreuzer Date: Sat Feb 16 17:37:17 2013 New Revision: 58319 URL: http://svn.reactos.org/svn/reactos?rev=58319&view=rev Log: [NTOSKRNL] Fix a number of warnings from VS /analyze Modified: trunk/reactos/ntoskrnl/cache/section/data.c trunk/reactos/ntoskrnl/cache/section/fault.c trunk/reactos/ntoskrnl/cache/section/io.c trunk/reactos/ntoskrnl/cache/section/newmm.h trunk/reactos/ntoskrnl/cache/section/reqtools.c trunk/reactos/ntoskrnl/cache/section/sptab.c trunk/reactos/ntoskrnl/cc/copy.c trunk/reactos/ntoskrnl/cc/fs.c trunk/reactos/ntoskrnl/cc/pin.c trunk/reactos/ntoskrnl/cc/view.c trunk/reactos/ntoskrnl/inbv/inbv.c Modified: trunk/reactos/ntoskrnl/cache/section/data.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/dat… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] Sat Feb 16 17:37:17 2013 @@ -131,9 +131,9 @@ LARGE_INTEGER FileOffset = *FileOffsetPtr, End, FirstMapped; KIRQL OldIrql; - DPRINT("MiZeroFillSection(Address %x,Offset %x,Length %x)\n", + DPRINT("MiZeroFillSection(Address %p, Offset 0x%I64x,Length 0x%lx)\n", Address, - FileOffset.LowPart, + FileOffset.QuadPart, Length); AddressSpace = MmGetKernelAddressSpace(); @@ -224,10 +224,10 @@ PPFN_NUMBER Pages; KIRQL OldIrql; - DPRINT("MiFlushMappedSection(%x,%08x,%x,%d,%s:%d)\n", + DPRINT("MiFlushMappedSection(%p,%I64x,%I64x,%u,%s:%d)\n", BaseAddress, - BaseOffset->LowPart, - FileSize, + BaseOffset->QuadPart, + FileSize ? FileSize->QuadPart : 0, WriteData, File, Line); @@ -508,7 +508,7 @@ return STATUS_NO_MEMORY; } - DPRINT("Zeroing %x\n", Segment); + DPRINT("Zeroing %p\n", Segment); RtlZeroMemory(Segment, sizeof(MM_SECTION_SEGMENT)); ExInitializeFastMutex(&Segment->Lock); @@ -555,7 +555,7 @@ else { KeReleaseSpinLock(&FileObject->IrpListLock, OldIrql); - DPRINTC("Free Segment %x\n", Segment); + DPRINTC("Free Segment %p\n", Segment); ExFreePoolWithTag(Segment, TAG_MM_SECTION_SEGMENT); DPRINT("Filling out Segment info (previous data section)\n"); @@ -583,16 +583,13 @@ Section->MaximumSize.QuadPart = MaximumSize.QuadPart; /* Extend file if section is longer */ - DPRINT("MaximumSize %08x%08x ValidDataLength %08x%08x\n", - MaximumSize.u.HighPart, - MaximumSize.u.LowPart, - FileSizes.ValidDataLength.u.HighPart, - FileSizes.ValidDataLength.u.LowPart); + DPRINT("MaximumSize %I64x ValidDataLength %I64x\n", + MaximumSize.QuadPart, + FileSizes.ValidDataLength.QuadPart); if (MaximumSize.QuadPart > FileSizes.ValidDataLength.QuadPart) { - DPRINT("Changing file size to %08x%08x, segment %x\n", - MaximumSize.u.HighPart, - MaximumSize.u.LowPart, + DPRINT("Changing file size to %I64x, segment %p\n", + MaximumSize.QuadPart, Segment); Status = IoSetInformation(FileObject, @@ -609,7 +606,7 @@ } } - DPRINTC("Segment %x created (%x)\n", Segment, Segment->Flags); + DPRINTC("Segment %p created (%x)\n", Segment, Segment->Flags); *SectionObject = Section; return STATUS_SUCCESS; @@ -645,7 +642,7 @@ if (!NT_SUCCESS(Status)) { - DPRINT("Mapping between 0x%.8X and 0x%.8X failed (%X).\n", + DPRINT("Mapping between 0x%p and 0x%p failed (%X).\n", (*BaseAddress), (char*)(*BaseAddress) + ViewSize, Status); @@ -653,11 +650,11 @@ return Status; } - DPRINTC("MiMapViewOfSegment %x %x %x %x %x %wZ %s:%d\n", + DPRINTC("MiMapViewOfSegment %p %p %p %I64x %Ix %wZ %s:%d\n", MmGetAddressSpaceOwner(AddressSpace), *BaseAddress, Segment, - ViewOffset ? ViewOffset->LowPart : 0, + ViewOffset ? ViewOffset->QuadPart : 0, ViewSize, Segment->FileObject ? &Segment->FileObject->FileName : NULL, file, @@ -680,7 +677,7 @@ 0, Protect); - DPRINTC("MiMapViewOfSegment(P %x, A %x, T %x)\n", + DPRINTC("MiMapViewOfSegment(P %p, A %p, T %x)\n", MmGetAddressSpaceOwner(AddressSpace), *BaseAddress, MArea->Type); @@ -704,10 +701,9 @@ PFILE_OBJECT FileObject = Segment->FileObject; Entry = MmGetPageEntrySectionSegment(Segment, FileOffset); - DPRINTC("MiFreeSegmentPage(%x:%08x%08x -> Entry %x\n", + DPRINTC("MiFreeSegmentPage(%p:%I64x -> Entry %Ix\n", Segment, - FileOffset->HighPart, - FileOffset->LowPart, + FileOffset->QuadPart, Entry); if (Entry && !IS_SWAP_FROM_SSE(Entry)) @@ -716,17 +712,16 @@ PFN_NUMBER OldPage = PFN_FROM_SSE(Entry); if (IS_DIRTY_SSE(Entry) && FileObject) { - DPRINT("MiWriteBackPage(%x,%wZ,%08x%08x)\n", + DPRINT("MiWriteBackPage(%p,%wZ,%I64x)\n", Segment, &FileObject->FileName, - FileOffset->u.HighPart, - FileOffset->u.LowPart); + FileOffset->QuadPart); MiWriteBackPage(FileObject, FileOffset, PAGE_SIZE, OldPage); } - DPRINTC("Free page %x (off %x from %x) (ref ct %d, ent %x, dirty? %s)\n", + DPRINTC("Free page %Ix (off %I64x from %p) (ref ct %lu, ent %Ix, dirty? %s)\n", OldPage, - FileOffset->LowPart, + FileOffset->QuadPart, Segment, MmGetReferenceCountPage(OldPage), Entry, @@ -759,7 +754,7 @@ PMM_SECTION_SEGMENT Segment; LARGE_INTEGER Offset; - DPRINT("MmFreeSectionPage(%x,%x,%x,%x,%d)\n", + DPRINT("MmFreeSectionPage(%p,%p,%Ix,%Ix,%u)\n", MmGetAddressSpaceOwner(ContextData[0]), Address, Page, @@ -777,12 +772,12 @@ if (Page != 0 && PFN_FROM_SSE(Entry) == Page && Dirty) { - DPRINT("Freeing section page %x:%x -> %x\n", Segment, Offset.LowPart, Entry); + DPRINT("Freeing section page %p:%I64x -> %Ix\n", Segment, Offset.QuadPart, Entry); MmSetPageEntrySectionSegment(Segment, &Offset, DIRTY_SSE(Entry)); } if (Page) { - DPRINT("Removing page %x:%x -> %x\n", Segment, Offset.LowPart, Entry); + DPRINT("Removing page %p:%I64x -> %x\n", Segment, Offset.QuadPart, Entry); MmSetSavedSwapEntryPage(Page, 0); MmDeleteRmap(Page, Process, Address); MmDeleteVirtualMapping(Process, Address, FALSE, NULL, NULL); @@ -819,7 +814,7 @@ Context[0] = AddressSpace; Context[1] = Segment; - DPRINT("MmFreeMemoryArea(%x,%x)\n", + DPRINT("MmFreeMemoryArea(%p,%p)\n", MmGetAddressSpaceOwner(AddressSpace), MemoryArea->StartingAddress); @@ -827,7 +822,7 @@ MmUnlockSectionSegment(Segment); - DPRINTC("MiUnmapViewOfSegment %x %x %x\n", + DPRINTC("MiUnmapViewOfSegment %p %p %p\n", MmGetAddressSpaceOwner(AddressSpace), BaseAddress, Segment); @@ -843,15 +838,15 @@ { LARGE_INTEGER OldSize; PMM_SECTION_SEGMENT Segment = Section->Segment; - DPRINT("Extend Segment %x\n", Segment); + DPRINT("Extend Segment %p\n", Segment); MmLockSectionSegment(Segment); OldSize.QuadPart = Segment->RawLength.QuadPart; MmUnlockSectionSegment(Segment); - DPRINT("OldSize %08x%08x NewSize %08x%08x\n", - OldSize.u.HighPart, OldSize.u.LowPart, - NewSize->u.HighPart, NewSize->u.LowPart); + DPRINT("OldSize 0x%I64x NewSize 0x%I64x\n", + OldSize.QuadPart, + NewSize->QuadPart); if (ExtendFile && OldSize.QuadPart < NewSize->QuadPart) { @@ -883,9 +878,8 @@ PMMSUPPORT AddressSpace; NTSTATUS Status; - DPRINT("MmMapViewInSystemSpaceAtOffset() called offset %08x%08x\n", - FileOffset->HighPart, - FileOffset->LowPart); + DPRINT("MmMapViewInSystemSpaceAtOffset() called offset 0x%I64x\n", + FileOffset->QuadPart); AddressSpace = MmGetKernelAddressSpace(); Modified: trunk/reactos/ntoskrnl/cache/section/fault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/fau… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/fault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/fault.c [iso-8859-1] Sat Feb 16 17:37:17 2013 @@ -189,7 +189,7 @@ } else { - DPRINT("Set %x in address space @ %x\n", Required->Page[0], Address); + DPRINT("Set %x in address space @ %p\n", Required->Page[0], Address); Status = MmCreateVirtualMapping(Process, Address, Attributes, @@ -332,7 +332,7 @@ LARGE_INTEGER Offset; PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); - DPRINT("MmAccessFaultSectionView(%x, %x, %x, %x)\n", + DPRINT("MmAccessFaultSectionView(%p, %p, %p, %u)\n", AddressSpace, MemoryArea, Address, @@ -358,11 +358,11 @@ #endif { ULONG_PTR Entry; - DPRINTC("setting non-cow page %x %x:%x offset %x (%x) to writable\n", + DPRINTC("setting non-cow page %p %p:%p offset %I64x (%Ix) to writable\n", Segment, Process, PAddress, - Offset.u.LowPart, + Offset.QuadPart, MmGetPfnForProcess(Process, Address)); if (Segment->FileObject) { @@ -450,7 +450,7 @@ MmReleasePageMemoryConsumer(MC_CACHE, OldPage); MmUnlockSectionSegment(Segment); - DPRINT("Address 0x%.8X\n", Address); + DPRINT("Address 0x%p\n", Address); return STATUS_SUCCESS; } @@ -539,11 +539,11 @@ RtlZeroMemory(&Context, sizeof(WORK_QUEUE_WITH_CONTEXT)); - DPRINT("MmAccessFault(Mode %d, Address %x)\n", Mode, Address); + DPRINT("MmAccessFault(Mode %d, Address %Ix)\n", Mode, Address); if (KeGetCurrentIrql() >= DISPATCH_LEVEL) { - DPRINT1("Page fault at high IRQL was %d\n", KeGetCurrentIrql()); + DPRINT1("Page fault at high IRQL was %u\n", KeGetCurrentIrql()); return STATUS_UNSUCCESSFUL; } @@ -553,7 +553,7 @@ /* Check permissions */ if (Mode != KernelMode) { - DPRINT("MmAccessFault(Mode %d, Address %x)\n", Mode, Address); + DPRINT("MmAccessFault(Mode %d, Address %Ix)\n", Mode, Address); return STATUS_ACCESS_VIOLATION; } AddressSpace = MmGetKernelAddressSpace(); @@ -578,11 +578,11 @@ { MmUnlockAddressSpace(AddressSpace); } - DPRINT("Address: %x\n", Address); + DPRINT("Address: %Ix\n", Address); return STATUS_ACCESS_VIOLATION; } - DPRINT("Type %x (%x -> %x)\n", + DPRINT("Type %x (%p -> %p)\n", MemoryArea->Type, MemoryArea->StartingAddress, MemoryArea->EndingAddress); @@ -605,9 +605,9 @@ if (Status == STATUS_SUCCESS + 1) { /* Wait page ... */ - DPRINT("Waiting for %x\n", Address); + DPRINT("Waiting for %Ix\n", Address); MiWaitForPageEvent(MmGetAddressSpaceOwner(AddressSpace), Address); - DPRINT("Restarting fault %x\n", Address); + DPRINT("Restarting fault %Ix\n", Address); Status = STATUS_MM_RESTART_OPERATION; } else if (Status == STATUS_MM_RESTART_OPERATION) @@ -619,7 +619,7 @@ { if (Thread->ActiveFaultCount > 0) { - DPRINT("Already fault handling ... going to work item (%x)\n", + DPRINT("Already fault handling ... going to work item (%Ix)\n", Address); Context.AddressSpace = AddressSpace; Context.MemoryArea = MemoryArea; @@ -657,8 +657,8 @@ if (!NT_SUCCESS(Status) && MemoryArea->Type == 1) { - DPRINT1("Completed page fault handling %x %x\n", Address, Status); - DPRINT1("Type %x (%x -> %x)\n", + DPRINT1("Completed page fault handling %Ix %x\n", Address, Status); + DPRINT1("Type %x (%p -> %p)\n", MemoryArea->Type, MemoryArea->StartingAddress, MemoryArea->EndingAddress); @@ -693,13 +693,13 @@ PMMSUPPORT AddressSpace; NTSTATUS Status; - DPRINT("MmpAccessFault(Mode %d, Address %x)\n", Mode, Address); + DPRINT("MmpAccessFault(Mode %d, Address %Ix)\n", Mode, Address); Thread = PsGetCurrentThread(); if (KeGetCurrentIrql() >= DISPATCH_LEVEL) { - DPRINT1("Page fault at high IRQL %d, address %x\n", + DPRINT1("Page fault at high IRQL %u, address %Ix\n", KeGetCurrentIrql(), Address); return STATUS_UNSUCCESSFUL; @@ -711,7 +711,7 @@ /* Check permissions */ if (Mode != KernelMode) { - DPRINT1("Address: %x:%x\n", PsGetCurrentProcess(), Address); + DPRINT1("Address: %p:%Ix\n", PsGetCurrentProcess(), Address); return STATUS_ACCESS_VIOLATION; } AddressSpace = MmGetKernelAddressSpace(); @@ -780,13 +780,13 @@ { DPRINT1("No memory area\n"); } - DPRINT1("Process %x, Address %x\n", + DPRINT1("Process %p, Address %Ix\n", MmGetAddressSpaceOwner(AddressSpace), Address); break; } - DPRINTC("Type %x (%x -> %x -> %x) in %x\n", + DPRINTC("Type %x (%p -> %08Ix -> %p) in %p\n", MemoryArea->Type, MemoryArea->StartingAddress, Address, @@ -816,9 +816,9 @@ else if (Status == STATUS_SUCCESS + 1) { /* Wait page ... */ - DPRINT("Waiting for %x\n", Address); + DPRINT("Waiting for %Ix\n", Address); MiWaitForPageEvent(MmGetAddressSpaceOwner(AddressSpace), Address); - DPRINT("Done waiting for %x\n", Address); + DPRINT("Done waiting for %Ix\n", Address); Status = STATUS_MM_RESTART_OPERATION; } else if (Status == STATUS_MM_RESTART_OPERATION) @@ -831,7 +831,7 @@ { if (Thread->ActiveFaultCount > 2) { - DPRINTC("Already fault handling ... going to work item (%x)\n", Address); + DPRINTC("Already fault handling ... going to work item (%Ix)\n", Address); Context.AddressSpace = AddressSpace; Context.MemoryArea = MemoryArea; Context.Required = &Resources; @@ -850,13 +850,13 @@ } else { - DPRINT("DoAcquisition %x\n", Resources.DoAcquisition); + DPRINT("DoAcquisition %p\n", Resources.DoAcquisition); Status = Resources.DoAcquisition(AddressSpace, MemoryArea, &Resources); - DPRINT("DoAcquisition %x -> %x\n", + DPRINT("DoAcquisition %p -> %x\n", Resources.DoAcquisition, Status); } @@ -878,7 +878,7 @@ } while (Status == STATUS_MM_RESTART_OPERATION); - DPRINTC("Completed page fault handling: %x:%x %x\n", + DPRINTC("Completed page fault handling: %p:%Ix %x\n", MmGetAddressSpaceOwner(AddressSpace), Address, Status); @@ -913,13 +913,13 @@ NTSTATUS Status; Address &= ~(PAGE_SIZE - 1); - DPRINT("MmNotPresentFault(Mode %d, Address %x)\n", Mode, Address); + DPRINT("MmNotPresentFault(Mode %d, Address %Ix)\n", Mode, Address); Thread = PsGetCurrentThread(); if (KeGetCurrentIrql() >= DISPATCH_LEVEL) { - DPRINT1("Page fault at high IRQL %d, address %x\n", + DPRINT1("Page fault at high IRQL %u, address %Ix\n", KeGetCurrentIrql(), Address); @@ -953,7 +953,7 @@ ASSERT(Status != STATUS_UNSUCCESSFUL); ASSERT(Status != STATUS_INVALID_PARAMETER); - DPRINT("MmAccessFault %x:%x -> %x\n", + DPRINT("MmAccessFault %p:%Ix -> %x\n", MmGetAddressSpaceOwner(AddressSpace), Address, Status); Modified: trunk/reactos/ntoskrnl/cache/section/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/io.… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/io.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/io.c [iso-8859-1] Sat Feb 16 17:37:17 2013 @@ -135,7 +135,7 @@ ASSERT(DeviceObject); - DPRINT("PAGING READ: FileObject %p <%wZ> Offset %08x%08x Length %d\n", + DPRINT("PAGING READ: FileObject %p <%wZ> Offset %08x%08x Length %ul\n", FileObject, &FileObject->FileName, FileOffset->HighPart, @@ -222,10 +222,10 @@ DeviceObject = MmGetDeviceObjectForFile(FileObject); ASSERT(DeviceObject); - DPRINT("PAGING WRITE: FileObject %x <%wZ> Offset %x Length %d (%s:%d)\n", + DPRINT("PAGING WRITE: FileObject %p <%wZ> Offset 0x%I64x Length %lu (%s:%d)\n", FileObject, &FileObject->FileName, - FileOffset->LowPart, + FileOffset->QuadPart, Length, File, Line); Modified: trunk/reactos/ntoskrnl/cache/section/newmm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/new… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/newmm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/newmm.h [iso-8859-1] Sat Feb 16 17:37:17 2013 @@ -36,12 +36,12 @@ #define SEC_CACHE (0x20000000) #define MiWaitForPageEvent(Process,Address) do { \ - DPRINT("MiWaitForPageEvent %x:%x #\n", Process, Address); \ + DPRINT("MiWaitForPageEvent %p:%Ix #\n", Process, Address); \ KeWaitForSingleObject(&MmWaitPageEvent, 0, KernelMode, FALSE, NULL); \ } while(0) #define MiSetPageEvent(Process,Address) do { \ - DPRINT("MiSetPageEvent %x:%x #\n",Process, Address); \ + DPRINT("MiSetPageEvent %p:%p #\n",Process, (PVOID)(Address)); \ KeSetEvent(&MmWaitPageEvent, IO_NO_INCREMENT, FALSE); \ } while(0) Modified: trunk/reactos/ntoskrnl/cache/section/reqtools.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/req… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/reqtools.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/reqtools.c [iso-8859-1] Sat Feb 16 17:37:17 2013 @@ -145,11 +145,10 @@ PMDL Mdl = (PMDL)MdlBase; KIRQL OldIrql; - DPRINTC("Pulling page %08x%08x from %wZ to %x\n", - FileOffset->u.HighPart, - FileOffset->u.LowPart, + DPRINTC("Pulling page %I64x from %wZ to %Ix\n", + FileOffset->QuadPart, &FileObject->FileName, - Page); + *Page); Status = MmRequestPageMemoryConsumer(RequiredResources->Consumer, TRUE, Modified: trunk/reactos/ntoskrnl/cache/section/sptab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/spt… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/sptab.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/sptab.c [iso-8859-1] Sat Feb 16 17:37:17 2013 @@ -123,10 +123,9 @@ ENTRIES_PER_ELEMENT * PAGE_SIZE); PageTable = RtlLookupElementGenericTable(Table, &SearchFileOffset); - DPRINT("MiSectionPageTableGet(%08x,%08x%08x)\n", + DPRINT("MiSectionPageTableGet(%p,%I64x)\n", Table, - FileOffset->HighPart, - FileOffset->LowPart); + FileOffset->QuadPart); return PageTable; } @@ -154,10 +153,9 @@ sizeof(SectionZeroPageTable), NULL); if (!PageTableSlice) return NULL; - DPRINT("Allocate page table %x (%08x%08x)\n", + DPRINT("Allocate page table %p (%I64x)\n", PageTableSlice, - PageTableSlice->FileOffset.u.HighPart, - PageTableSlice->FileOffset.u.LowPart); + PageTableSlice->FileOffset.QuadPart); } return PageTableSlice; } @@ -283,11 +281,10 @@ PCACHE_SECTION_PAGE_TABLE Element; DPRINT("MiFreePageTablesSectionSegment(%p)\n", &Segment->PageTable); while ((Element = RtlGetElementGenericTable(&Segment->PageTable, 0))) { - DPRINT("Delete table for <%wZ> %x -> %08x%08x\n", + DPRINT("Delete table for <%wZ> %p -> %I64x\n", Segment->FileObject ? &Segment->FileObject->FileName : NULL, Segment, - Element->FileOffset.u.HighPart, - Element->FileOffset.u.LowPart); + Element->FileOffset.QuadPart); if (FreePage) { ULONG i; @@ -299,10 +296,10 @@ Entry = Element->PageEntries[i]; if (Entry && !IS_SWAP_FROM_SSE(Entry)) { - DPRINT("Freeing page %x:%x @ %x\n", + DPRINT("Freeing page %p:%Ix @ %I64x\n", Segment, Entry, - Offset.LowPart); + Offset.QuadPart); FreePage(Segment, &Offset); } Modified: trunk/reactos/ntoskrnl/cc/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/copy.c?rev=583… ============================================================================== --- trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] Sat Feb 16 17:37:17 2013 @@ -337,16 +337,16 @@ PCACHE_SEGMENT current; DPRINT("CcCopyRead(FileObject 0x%p, FileOffset %I64x, " - "Length %d, Wait %d, Buffer 0x%p, IoStatus 0x%p)\n", + "Length %lu, Wait %u, Buffer 0x%p, IoStatus 0x%p)\n", FileObject, FileOffset->QuadPart, Length, Wait, Buffer, IoStatus); Bcb = FileObject->SectionObjectPointer->SharedCacheMap; ReadOffset = (ULONG)FileOffset->QuadPart; - DPRINT("AllocationSize %d, FileSize %d\n", - (ULONG)Bcb->AllocationSize.QuadPart, - (ULONG)Bcb->FileSize.QuadPart); + DPRINT("AllocationSize %I64d, FileSize %I64d\n", + Bcb->AllocationSize.QuadPart, + Bcb->FileSize.QuadPart); /* * Check for the nowait case that all the cache segments that would @@ -456,7 +456,7 @@ BOOLEAN Valid; DPRINT("CcCopyWrite(FileObject 0x%p, FileOffset %I64x, " - "Length %d, Wait %d, Buffer 0x%p)\n", + "Length %lu, Wait %u, Buffer 0x%p)\n", FileObject, FileOffset->QuadPart, Length, Wait, Buffer); Bcb = FileObject->SectionObjectPointer->SharedCacheMap; @@ -626,7 +626,7 @@ KEVENT Event; DPRINT("CcZeroData(FileObject 0x%p, StartOffset %I64x, EndOffset %I64x, " - "Wait %d)\n", FileObject, StartOffset->QuadPart, EndOffset->QuadPart, + "Wait %u)\n", FileObject, StartOffset->QuadPart, EndOffset->QuadPart, Wait); Length = EndOffset->u.LowPart - StartOffset->u.LowPart; Modified: trunk/reactos/ntoskrnl/cc/fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/fs.c?rev=58319… ============================================================================== --- trunk/reactos/ntoskrnl/cc/fs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/fs.c [iso-8859-1] Sat Feb 16 17:37:17 2013 @@ -136,10 +136,10 @@ DPRINT("CcSetFileSizes(FileObject 0x%p, FileSizes 0x%p)\n", FileObject, FileSizes); - DPRINT("AllocationSize %d, FileSize %d, ValidDataLength %d\n", - (ULONG)FileSizes->AllocationSize.QuadPart, - (ULONG)FileSizes->FileSize.QuadPart, - (ULONG)FileSizes->ValidDataLength.QuadPart); + DPRINT("AllocationSize %I64d, FileSize %I64d, ValidDataLength %I64d\n", + FileSizes->AllocationSize.QuadPart, + FileSizes->FileSize.QuadPart, + FileSizes->ValidDataLength.QuadPart); Bcb = FileObject->SectionObjectPointer->SharedCacheMap; Modified: trunk/reactos/ntoskrnl/cc/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/pin.c?rev=5831… ============================================================================== --- trunk/reactos/ntoskrnl/cc/pin.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/pin.c [iso-8859-1] Sat Feb 16 17:37:17 2013 @@ -40,7 +40,7 @@ PINTERNAL_BCB iBcb; ULONG ROffset; - DPRINT("CcMapData(FileObject 0x%p, FileOffset %I64x, Length %d, Flags %d," + DPRINT("CcMapData(FileObject 0x%p, FileOffset %I64x, Length %lu, Flags 0x%lx," " pBcb 0x%p, pBuffer 0x%p)\n", FileObject, FileOffset->QuadPart, Length, Flags, pBcb, pBuffer); Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=583… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Sat Feb 16 17:37:17 2013 @@ -76,7 +76,7 @@ ++cs->ReferenceCount; if ( cs->Bcb->Trace ) { - DbgPrint("(%s:%i) CacheSegment %p ++RefCount=%d, Dirty %d, PageOut %d\n", + DbgPrint("(%s:%i) CacheSegment %p ++RefCount=%lu, Dirty %u, PageOut %lu\n", file, line, cs, cs->ReferenceCount, cs->Dirty, cs->PageOut ); } } @@ -85,7 +85,7 @@ --cs->ReferenceCount; if ( cs->Bcb->Trace ) { - DbgPrint("(%s:%i) CacheSegment %p --RefCount=%d, Dirty %d, PageOut %d\n", + DbgPrint("(%s:%i) CacheSegment %p --RefCount=%lu, Dirty %u, PageOut %lu\n", file, line, cs, cs->ReferenceCount, cs->Dirty, cs->PageOut ); } } @@ -131,7 +131,7 @@ current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, BcbSegmentListEntry); current_entry = current_entry->Flink; - DPRINT1(" CacheSegment 0x%p enabled, RefCount %d, Dirty %d, PageOut %d\n", + DPRINT1(" CacheSegment 0x%p enabled, RefCount %lu, Dirty %u, PageOut %lu\n", current, current->ReferenceCount, current->Dirty, current->PageOut ); } KeReleaseSpinLock(&Bcb->BcbLock, oldirql); @@ -188,7 +188,7 @@ NTSTATUS Status; LARGE_INTEGER ZeroTimeout; - DPRINT("CcRosFlushDirtyPages(Target %d)\n", Target); + DPRINT("CcRosFlushDirtyPages(Target %lu)\n", Target); (*Count) = 0; ZeroTimeout.QuadPart = 0; @@ -300,7 +300,7 @@ ULONG i; BOOLEAN FlushedPages = FALSE; - DPRINT("CcRosTrimCache(Target %d)\n", Target); + DPRINT("CcRosTrimCache(Target %lu)\n", Target); InitializeListHead(&FreeList); @@ -381,7 +381,7 @@ if (PagesFreed != 0) { /* Try again after flushing dirty pages */ - DPRINT("Flushed %d dirty cache pages to disk\n", PagesFreed); + DPRINT("Flushed %lu dirty cache pages to disk\n", PagesFreed); goto retry; } } @@ -394,7 +394,7 @@ CcRosInternalFreeCacheSegment(current); } - DPRINT("Evicted %d cache pages\n", (*NrFreed)); + DPRINT("Evicted %lu cache pages\n", (*NrFreed)); return(STATUS_SUCCESS); } @@ -413,7 +413,7 @@ ASSERT(Bcb); - DPRINT("CcReleaseCacheSegment(Bcb 0x%p, CacheSeg 0x%p, Valid %d)\n", + DPRINT("CcReleaseCacheSegment(Bcb 0x%p, CacheSeg 0x%p, Valid %u)\n", Bcb, CacheSeg, Valid); KeAcquireGuardedMutex(&ViewLock); @@ -464,7 +464,7 @@ ASSERT(Bcb); - DPRINT("CcRosLookupCacheSegment(Bcb -x%p, FileOffset %d)\n", Bcb, FileOffset); + DPRINT("CcRosLookupCacheSegment(Bcb -x%p, FileOffset %lu)\n", Bcb, FileOffset); KeAcquireGuardedMutex(&ViewLock); KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); @@ -507,7 +507,7 @@ ASSERT(Bcb); - DPRINT("CcRosMarkDirtyCacheSegment(Bcb 0x%p, FileOffset %d)\n", Bcb, FileOffset); + DPRINT("CcRosMarkDirtyCacheSegment(Bcb 0x%p, FileOffset %lu)\n", Bcb, FileOffset); CacheSeg = CcRosLookupCacheSegment(Bcb, FileOffset); if (CacheSeg == NULL) @@ -554,7 +554,7 @@ ASSERT(Bcb); - DPRINT("CcRosUnmapCacheSegment(Bcb 0x%p, FileOffset %d, NowDirty %d)\n", + DPRINT("CcRosUnmapCacheSegment(Bcb 0x%p, FileOffset %lu, NowDirty %u)\n", Bcb, FileOffset, NowDirty); CacheSeg = CcRosLookupCacheSegment(Bcb, FileOffset); @@ -1045,7 +1045,7 @@ NTSTATUS Status; KIRQL oldIrql; - DPRINT("CcFlushCache(SectionObjectPointers 0x%p, FileOffset 0x%p, Length %d, IoStatus 0x%p)\n", + DPRINT("CcFlushCache(SectionObjectPointers 0x%p, FileOffset 0x%p, Length %lu, IoStatus 0x%p)\n", SectionObjectPointers, FileOffset, Length, IoStatus); if (SectionObjectPointers && SectionObjectPointers->SharedCacheMap) @@ -1333,7 +1333,7 @@ PBCB Bcb; Bcb = FileObject->SectionObjectPointer->SharedCacheMap; - DPRINT("CcRosInitializeFileCache(FileObject 0x%p, Bcb 0x%p, CacheSegmentSize %d)\n", + DPRINT("CcRosInitializeFileCache(FileObject 0x%p, Bcb 0x%p, CacheSegmentSize %lu)\n", FileObject, Bcb, CacheSegmentSize); KeAcquireGuardedMutex(&ViewLock); Modified: trunk/reactos/ntoskrnl/inbv/inbv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/inbv.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/inbv/inbv.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/inbv/inbv.c [iso-8859-1] Sat Feb 16 17:37:17 2013 @@ -94,7 +94,7 @@ ClrUsed = sizeof(_MainPalette) / sizeof(_MainPalette[0]); RtlZeroMemory(PaletteBitmap, sizeof(BITMAPINFOHEADER)); PaletteBitmap->biSize = sizeof(BITMAPINFOHEADER); - PaletteBitmap->biBitCount = 4; + PaletteBitmap->biBitCount = 4; PaletteBitmap->biClrUsed = ClrUsed; /* @@ -104,12 +104,12 @@ { for (Index = 0; Index < ClrUsed; Index++) { - Palette[Index].rgbRed = - _MainPalette[Index].rgbRed * Iteration / PALETTE_FADE_STEPS; - Palette[Index].rgbGreen = - _MainPalette[Index].rgbGreen * Iteration / PALETTE_FADE_STEPS; - Palette[Index].rgbBlue = - _MainPalette[Index].rgbBlue * Iteration / PALETTE_FADE_STEPS; + Palette[Index].rgbRed = (UCHAR) + (_MainPalette[Index].rgbRed * Iteration / PALETTE_FADE_STEPS); + Palette[Index].rgbGreen = (UCHAR) + (_MainPalette[Index].rgbGreen * Iteration / PALETTE_FADE_STEPS); + Palette[Index].rgbBlue = (UCHAR) + (_MainPalette[Index].rgbBlue * Iteration / PALETTE_FADE_STEPS); } VidBitBlt(PaletteBitmapBuffer, 0, 0); @@ -221,7 +221,7 @@ { /* Now reset the display, but only if there's a custom boot logo */ VidResetDisplay(CustomLogo); - + /* Find bitmap resources in the kernel */ ResourceCount = min(IDB_CLUSTER_SERVER, Count); for (i = 1; i <= Count; i++) @@ -709,7 +709,7 @@ InbvSetTextColor(15); InbvSolidColorFill(0, 0, 639, 479, 7); InbvSolidColorFill(0, 421, 639, 479, 1); - + /* Get resources */ Header = InbvGetResourceAddress(IDB_LOGO_HEADER); Band = InbvGetResourceAddress(IDB_LOGO_BAND); @@ -768,7 +768,7 @@ /* Normal edition */ Text = InbvGetResourceAddress(IDB_SERVER_LOGO); } - + /* Server product, display appropriate status bar color */ InbvGetResourceAddress(IDB_BAR_SERVER); } @@ -805,7 +805,7 @@ InbvScreenToBufferBlt(Buffer, 413, 237, 7, 7, 8); InbvSolidColorFill(418, 230, 454, 256, 0); InbvBufferToScreenBlt(Buffer, 413, 237, 7, 7, 8); - + /* In setup mode, you haven't selected a SKU yet */ if (ExpInTextModeSetup) Text = NULL; } @@ -851,7 +851,7 @@ { /* Remove the filter */ InbvInstallDisplayStringFilter(NULL); - + DotHack = FALSE; /* Draw text screen */

1 0

[tkreuzer] 58318: [RTL] Fix a number of warnings found with VS /analyze
by tkreuzer＠svn.reactos.org 16 Feb '13

16 Feb '13

Author: tkreuzer Date: Sat Feb 16 17:21:34 2013 New Revision: 58318 URL: http://svn.reactos.org/svn/reactos?rev=58318&view=rev Log: [RTL] Fix a number of warnings found with VS /analyze Modified: trunk/reactos/lib/rtl/actctx.c trunk/reactos/lib/rtl/assert.c trunk/reactos/lib/rtl/bootdata.c trunk/reactos/lib/rtl/crc32.c trunk/reactos/lib/rtl/dos8dot3.c trunk/reactos/lib/rtl/generictable.c trunk/reactos/lib/rtl/heappage.c trunk/reactos/lib/rtl/image.c trunk/reactos/lib/rtl/nls.c trunk/reactos/lib/rtl/registry.c trunk/reactos/lib/rtl/res.c trunk/reactos/lib/rtl/resource.c trunk/reactos/lib/rtl/security.c trunk/reactos/lib/rtl/unicode.c trunk/reactos/lib/rtl/unicodeprefix.c trunk/reactos/lib/rtl/workitem.c Modified: trunk/reactos/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/actctx.c?rev=58318… ============================================================================== --- trunk/reactos/lib/rtl/actctx.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/actctx.c [iso-8859-1] Sat Feb 16 17:21:34 2013 @@ -387,7 +387,7 @@ RtlFreeHeap(RtlGetProcessHeap(), 0, entity->u.clrsurrogate.clsid); break; default: - DPRINT1("Unknown entity kind %d\n", entity->kind); + DPRINT1("Unknown entity kind %u\n", entity->kind); } } RtlFreeHeap( RtlGetProcessHeap(), 0, array->base ); @@ -788,7 +788,7 @@ { attr_nameU = xmlstr2unicode(&attr_name); attr_valueU = xmlstr2unicode(&attr_name); - DPRINT1( "unexpected attr %S=%S\n", &attr_nameU, + DPRINT1( "unexpected attr %wZ=%wZ\n", &attr_nameU, &attr_valueU); } return !error; @@ -2275,7 +2275,8 @@ if (pActCtx->dwFlags & ACTCTX_FLAG_HMODULE_VALID) module = pActCtx->hModule; else module = NtCurrentTeb()->ProcessEnvironmentBlock->ImageBaseAddress; - if ((status = get_module_filename( module, &dir, 0 ))) goto error; + status = get_module_filename(module, &dir, 0); + if (!NT_SUCCESS(status)) goto error; if ((p = strrchrW( dir.Buffer, '\\' ))) p[1] = 0; actctx->appdir.info = dir.Buffer; } @@ -2289,7 +2290,7 @@ goto error; } status = open_nt_file( &file, &nameW ); - if (status) + if (!NT_SUCCESS(status)) { RtlFreeUnicodeString( &nameW ); goto error; @@ -2334,10 +2335,11 @@ if (file) NtClose( file ); RtlFreeUnicodeString( &nameW ); - if (status == STATUS_SUCCESS) status = parse_depend_manifests(&acl); + if (NT_SUCCESS(status)) status = parse_depend_manifests(&acl); free_depend_manifests( &acl ); - if (status == STATUS_SUCCESS) *handle = actctx; + if (NT_SUCCESS(status)) + *handle = actctx; else actctx_release( actctx ); return status; @@ -2498,7 +2500,7 @@ ACTIVATION_CONTEXT *actctx; NTSTATUS status; - DPRINT("%08x %p %p %u %p %ld %p\n", flags, handle, + DPRINT("%08x %p %p %u %p %Iu %p\n", flags, handle, subinst, class, buffer, bufsize, retlen); if (retlen) *retlen = 0; Modified: trunk/reactos/lib/rtl/assert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/assert.c?rev=58318… ============================================================================== --- trunk/reactos/lib/rtl/assert.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/assert.c [iso-8859-1] Sat Feb 16 17:21:34 2013 @@ -100,7 +100,7 @@ #else if (NULL != Message) { - DbgPrint("Assertion \'%s\' failed at %s line %d: %s\n", + DbgPrint("Assertion \'%s\' failed at %s line %u: %s\n", (PCHAR)FailedAssertion, (PCHAR)FileName, LineNumber, @@ -108,7 +108,7 @@ } else { - DbgPrint("Assertion \'%s\' failed at %s line %d\n", + DbgPrint("Assertion \'%s\' failed at %s line %u\n", (PCHAR)FailedAssertion, (PCHAR)FileName, LineNumber); Modified: trunk/reactos/lib/rtl/bootdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/bootdata.c?rev=583… ============================================================================== --- trunk/reactos/lib/rtl/bootdata.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/bootdata.c [iso-8859-1] Sat Feb 16 17:21:34 2013 @@ -433,6 +433,7 @@ HANDLE hToken = NULL; HANDLE hDirectory = NULL; NTSTATUS Status; + ULONG ReturnLength; Status = ZwOpenProcessToken(NtCurrentProcess(), TOKEN_QUERY | TOKEN_ADJUST_PRIVILEGES, @@ -452,7 +453,7 @@ &TokenPrivileges, sizeof(TokenPrivileges), &TokenPrivileges, - NULL); + &ReturnLength); if (!NT_SUCCESS(Status)) { goto Cleanup; @@ -757,7 +758,7 @@ LARGE_INTEGER ByteOffset; NTSTATUS Status; - DPRINT("RtlGetSetBootStatusData (%p %u %u %p %lu %p)\n", + DPRINT("RtlGetSetBootStatusData (%p %u %d %p %lu %p)\n", FileHandle, WriteMode, DataClass, Buffer, BufferSize, ReturnLength); if (DataClass >= RtlBsdItemMax) Modified: trunk/reactos/lib/rtl/crc32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/crc32.c?rev=58318&… ============================================================================== --- trunk/reactos/lib/rtl/crc32.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/crc32.c [iso-8859-1] Sat Feb 16 17:21:34 2013 @@ -91,7 +91,7 @@ { ULONG CrcValue = ~Initial; - DPRINT("(%d,%p,%d)\n", Initial, Data, Length); + DPRINT("(%u,%p,%u)\n", Initial, Data, Length); while (Length > 0) { Modified: trunk/reactos/lib/rtl/dos8dot3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/dos8dot3.c?rev=583… ============================================================================== --- trunk/reactos/lib/rtl/dos8dot3.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/dos8dot3.c [iso-8859-1] Sat Feb 16 17:21:34 2013 @@ -238,6 +238,9 @@ char Buffer[12]; OEM_STRING OemString; BOOLEAN GotSpace = FALSE; + NTSTATUS Status; + + if (SpacesFound) *SpacesFound = FALSE; if (!AnsiName) { @@ -246,7 +249,9 @@ OemString.Buffer = Buffer; AnsiName = &OemString; } - if (RtlUpcaseUnicodeStringToCountedOemString( AnsiName, UnicodeName, FALSE ) != STATUS_SUCCESS) + + Status = RtlUpcaseUnicodeStringToCountedOemString(AnsiName, UnicodeName, FALSE); + if (!NT_SUCCESS(Status)) return FALSE; if ((AnsiName->Length > 12) || (AnsiName->Buffer == NULL)) return FALSE; @@ -255,7 +260,6 @@ if (AnsiName->Buffer[0] == '.') { if (AnsiName->Length != 1 && (AnsiName->Length != 2 || AnsiName->Buffer[1] != '.')) return FALSE; - if (SpacesFound) *SpacesFound = FALSE; return TRUE; } Modified: trunk/reactos/lib/rtl/generictable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/generictable.c?rev… ============================================================================== --- trunk/reactos/lib/rtl/generictable.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/generictable.c [iso-8859-1] Sat Feb 16 17:21:34 2013 @@ -345,6 +345,7 @@ } while(RtlLeftChild(FoundNode)); /* Splay it */ + _Analysis_assume_(FoundNode != NULL); Table->TableRoot = RtlSplay(FoundNode); } else Modified: trunk/reactos/lib/rtl/heappage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heappage.c?rev=583… ============================================================================== --- trunk/reactos/lib/rtl/heappage.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heappage.c [iso-8859-1] Sat Feb 16 17:21:34 2013 @@ -321,7 +321,7 @@ &Size, Type, Protection); - DPRINT("Page heap: AllocVm (%p, %p, %x) status %x \n", Base, Size, Type, Status); + DPRINT("Page heap: AllocVm (%p, %Ix, %lx) status %lx \n", Base, Size, Type, Status); /* Check for failures */ if (!NT_SUCCESS(Status)) { @@ -330,7 +330,7 @@ _InterlockedIncrement(&RtlpDphCounter); if (RtlpDphBreakOptions & DPH_BREAK_ON_RESERVE_FAIL) { - DPRINT1("Page heap: AllocVm (%p, %p, %x) failed with %x \n", Base, Size, Type, Status); + DPRINT1("Page heap: AllocVm (%p, %Ix, %x) failed with %x \n", Base, Size, Type, Status); DbgBreakPoint(); return Status; } @@ -340,7 +340,7 @@ _InterlockedIncrement(&RtlpDphAllocFails); if (RtlpDphBreakOptions & DPH_BREAK_ON_COMMIT_FAIL) { - DPRINT1("Page heap: AllocVm (%p, %p, %x) failed with %x \n", Base, Size, Type, Status); + DPRINT1("Page heap: AllocVm (%p, %Ix, %x) failed with %x \n", Base, Size, Type, Status); DbgBreakPoint(); return Status; } @@ -357,7 +357,7 @@ /* Free the memory */ Status = RtlpSecMemFreeVirtualMemory(NtCurrentProcess(), &Base, &Size, Type); - DPRINT1("Page heap: FreeVm (%p, %p, %x) status %x \n", Base, Size, Type, Status); + DPRINT1("Page heap: FreeVm (%p, %Ix, %x) status %x \n", Base, Size, Type, Status); /* Log/report failures */ if (!NT_SUCCESS(Status)) { @@ -366,7 +366,7 @@ _InterlockedIncrement(&RtlpDphReleaseFails); if (RtlpDphBreakOptions & DPH_BREAK_ON_RELEASE_FAIL) { - DPRINT1("Page heap: FreeVm (%p, %p, %x) failed with %x \n", Base, Size, Type, Status); + DPRINT1("Page heap: FreeVm (%p, %Ix, %x) failed with %x \n", Base, Size, Type, Status); DbgBreakPoint(); return Status; } @@ -376,7 +376,7 @@ _InterlockedIncrement(&RtlpDphFreeFails); if (RtlpDphBreakOptions & DPH_BREAK_ON_FREE_FAIL) { - DPRINT1("Page heap: FreeVm (%p, %p, %x) failed with %x \n", Base, Size, Type, Status); + DPRINT1("Page heap: FreeVm (%p, %Ix, %x) failed with %x \n", Base, Size, Type, Status); DbgBreakPoint(); return Status; } @@ -401,7 +401,7 @@ _InterlockedIncrement(&RtlpDphProtectFails); if (RtlpDphBreakOptions & DPH_BREAK_ON_PROTECT_FAIL) { - DPRINT1("Page heap: ProtectVm (%p, %p, %x) failed with %x \n", Base, Size, Protection, Status); + DPRINT1("Page heap: ProtectVm (%p, %Ix, %x) failed with %x \n", Base, Size, Protection, Status); DbgBreakPoint(); return Status; } @@ -732,7 +732,7 @@ /* Make sure requested size is not too big */ ASSERT(FreeAllocations >= LeaveOnFreeList); - DPRINT("RtlpDphCoalesceFreeIntoAvailable(%p %d)\n", DphRoot, LeaveOnFreeList); + DPRINT("RtlpDphCoalesceFreeIntoAvailable(%p %lu)\n", DphRoot, LeaveOnFreeList); while (Node) { @@ -1411,7 +1411,8 @@ /* Per-process DPH init is done */ RtlpDphPageHeapListInitialized = TRUE; - DPRINT1("Page heap: pid 0x%X: page heap enabled with flags 0x%X.\n", Teb->ClientId.UniqueProcess, RtlpDphGlobalFlags); + DPRINT1("Page heap: pid 0x%p: page heap enabled with flags 0x%X.\n", + Teb->ClientId.UniqueProcess, RtlpDphGlobalFlags); return Status; } @@ -1554,8 +1555,9 @@ if (RtlpDphDebugOptions & DPH_DEBUG_VERBOSE) { - DPRINT1("Page heap: process 0x%X created heap @ %p (%p, flags 0x%X)\n", - NtCurrentTeb()->ClientId.UniqueProcess, (PUCHAR)DphRoot - PAGE_SIZE, DphRoot->NormalHeap, DphRoot->ExtraFlags); + DPRINT1("Page heap: process 0x%p created heap @ %p (%p, flags 0x%X)\n", + NtCurrentTeb()->ClientId.UniqueProcess, (PUCHAR)DphRoot - PAGE_SIZE, + DphRoot->NormalHeap, DphRoot->ExtraFlags); } /* Perform internal validation if required */ @@ -1641,7 +1643,8 @@ /* Report success */ if (RtlpDphDebugOptions & DPH_DEBUG_VERBOSE) - DPRINT1("Page heap: process 0x%X destroyed heap @ %p (%p)\n", NtCurrentTeb()->ClientId.UniqueProcess, HeapPtr, NormalHeap); + DPRINT1("Page heap: process 0x%p destroyed heap @ %p (%p)\n", + NtCurrentTeb()->ClientId.UniqueProcess, HeapPtr, NormalHeap); return NULL; } Modified: trunk/reactos/lib/rtl/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/image.c?rev=58318&… ============================================================================== --- trunk/reactos/lib/rtl/image.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/image.c [iso-8859-1] Sat Feb 16 17:21:34 2013 @@ -274,8 +274,7 @@ MappedAsImage = FALSE; } - - NtHeader = RtlImageNtHeader (BaseAddress); + NtHeader = RtlImageNtHeader(BaseAddress); if (NtHeader == NULL) return NULL; @@ -292,7 +291,7 @@ return (PVOID)((ULONG_PTR)BaseAddress + Va); /* image mapped as ordinary file, we must find raw pointer */ - return RtlImageRvaToVa (NtHeader, BaseAddress, Va, NULL); + return RtlImageRvaToVa(NtHeader, BaseAddress, Va, NULL); } @@ -341,13 +340,13 @@ if (SectionHeader) Section = *SectionHeader; - if (Section == NULL || - Rva < SWAPD(Section->VirtualAddress) || - Rva >= SWAPD(Section->VirtualAddress) + SWAPD(Section->Misc.VirtualSize)) + if ((Section == NULL) || + (Rva < SWAPD(Section->VirtualAddress)) || + (Rva >= SWAPD(Section->VirtualAddress) + SWAPD(Section->Misc.VirtualSize))) { Section = RtlImageRvaToSection (NtHeader, BaseAddress, Rva); if (Section == NULL) - return 0; + return NULL; if (SectionHeader) *SectionHeader = Section; @@ -418,7 +417,7 @@ case IMAGE_REL_BASED_MIPS_JMPADDR: default: DPRINT1("Unknown/unsupported fixup type %hu.\n", Type); - DPRINT1("Address %x, Current %d, Count %d, *TypeOffset %x\n", Address, i, Count, SWAPW(*TypeOffset)); + DPRINT1("Address %x, Current %u, Count %u, *TypeOffset %x\n", Address, i, Count, SWAPW(*TypeOffset)); return (PIMAGE_BASE_RELOCATION)NULL; } Modified: trunk/reactos/lib/rtl/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/nls.c?rev=58318&r1… ============================================================================== --- trunk/reactos/lib/rtl/nls.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/nls.c [iso-8859-1] Sat Feb 16 17:21:34 2013 @@ -210,11 +210,9 @@ CaseTableBase == NULL) return; - RtlInitCodePageTable (AnsiTableBase, - &NlsTable->AnsiTableInfo); - - RtlInitCodePageTable (OemTableBase, - &NlsTable->OemTableInfo); + RtlInitCodePageTable(AnsiTableBase, &NlsTable->AnsiTableInfo); + + RtlInitCodePageTable(OemTableBase, &NlsTable->OemTableInfo); NlsTable->UpperCaseTable = (PUSHORT)CaseTableBase + 2; NlsTable->LowerCaseTable = (PUSHORT)CaseTableBase + *((PUSHORT)CaseTableBase + 1) + 2; Modified: trunk/reactos/lib/rtl/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/registry.c?rev=583… ============================================================================== --- trunk/reactos/lib/rtl/registry.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/registry.c [iso-8859-1] Sat Feb 16 17:21:34 2013 @@ -409,12 +409,15 @@ return (Status == STATUS_BUFFER_TOO_SMALL) ? STATUS_SUCCESS : Status; } +_Success_(return!=NULL || BufferSize==0) +_When_(BufferSize!=NULL,__drv_allocatesMem(Mem)) PVOID NTAPI -RtlpAllocDeallocQueryBuffer(IN OUT PSIZE_T BufferSize, - IN PVOID OldBuffer, - IN SIZE_T OldBufferSize, - OUT PNTSTATUS Status) +RtlpAllocDeallocQueryBuffer( + _In_opt_ PSIZE_T BufferSize, + _In_opt_ __drv_freesMem(Mem) PVOID OldBuffer, + _In_ SIZE_T OldBufferSize, + _Out_opt_ _On_failure_(_Post_satisfies_(*Status < 0)) PNTSTATUS Status) { PVOID Buffer = NULL; Modified: trunk/reactos/lib/rtl/res.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/res.c?rev=58318&r1… ============================================================================== --- trunk/reactos/lib/rtl/res.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/res.c [iso-8859-1] Sat Feb 16 17:21:34 2013 @@ -216,16 +216,17 @@ _SEH2_TRY { - if (ResourceInfo) - { - DPRINT( "module %p type %ws name %ws lang %04lx level %ld\n", + if (ResourceInfo) + { + DPRINT( "module %p type %ws name %ws lang %04lx level %lu\n", BaseAddress, (LPCWSTR)ResourceInfo->Type, Level > 1 ? (LPCWSTR)ResourceInfo->Name : L"", Level > 2 ? ResourceInfo->Language : 0, Level ); } status = find_entry( BaseAddress, ResourceInfo, Level, &res, FALSE ); - if (status == STATUS_SUCCESS) *ResourceDataEntry = res; + if (NT_SUCCESS(status)) + *ResourceDataEntry = res; } _SEH2_EXCEPT(page_fault(_SEH2_GetExceptionCode())) { @@ -263,16 +264,17 @@ _SEH2_TRY { - if (info) - { - DPRINT( "module %p type %ws name %ws lang %04lx level %ld\n", + if (info) + { + DPRINT( "module %p type %ws name %ws lang %04lx level %lu\n", BaseAddress, (LPCWSTR)info->Type, level > 1 ? (LPCWSTR)info->Name : L"", level > 2 ? info->Language : 0, level ); } status = find_entry( BaseAddress, info, level, &res, TRUE ); - if (status == STATUS_SUCCESS) *addr = res; + if (NT_SUCCESS(status)) + *addr = res; } _SEH2_EXCEPT(page_fault(_SEH2_GetExceptionCode())) { @@ -346,7 +348,7 @@ _In_ PLDR_RESOURCE_INFO ResourceInfo, _In_ ULONG Level, _Inout_ ULONG *ResourceCount, - _Out_opt_ LDR_ENUM_RESOURCE_INFO *Resources) + _Out_writes_to_(*ResourceCount,*ResourceCount) LDR_ENUM_RESOURCE_INFO *Resources) { PUCHAR ResourceData; NTSTATUS Status; Modified: trunk/reactos/lib/rtl/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/resource.c?rev=583… ============================================================================== --- trunk/reactos/lib/rtl/resource.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/resource.c [iso-8859-1] Sat Feb 16 17:21:34 2013 @@ -310,7 +310,7 @@ NTAPI RtlDumpResource(PRTL_RESOURCE Resource) { - DbgPrint("RtlDumpResource(%p):\n\tactive count = %i\n\twaiting readers = %i\n\twaiting writers = %i\n", + DbgPrint("RtlDumpResource(%p):\n\tactive count = %d\n\twaiting readers = %u\n\twaiting writers = %u\n", Resource, Resource->NumberActive, Resource->SharedWaiters, @@ -318,7 +318,7 @@ if (Resource->NumberActive != 0) { - DbgPrint("\towner thread = %08x\n", + DbgPrint("\towner thread = %p\n", Resource->OwningThread); } } Modified: trunk/reactos/lib/rtl/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/security.c?rev=583… ============================================================================== --- trunk/reactos/lib/rtl/security.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/security.c [iso-8859-1] Sat Feb 16 17:21:34 2013 @@ -57,7 +57,7 @@ UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } - + /* PUBLIC FUNCTIONS ***********************************************************/ /* @@ -288,7 +288,7 @@ BOOLEAN Granted, CallerToken; TOKEN_STATISTICS TokenStats; ULONG Size; - DPRINT1("RtlNewSecurityGrantedAccess(%p)\n", DesiredAccess); + DPRINT1("RtlNewSecurityGrantedAccess(%lx)\n", DesiredAccess); /* Has the caller passed a token? */ if (!Token) Modified: trunk/reactos/lib/rtl/unicode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/unicode.c?rev=5831… ============================================================================== --- trunk/reactos/lib/rtl/unicode.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/unicode.c [iso-8859-1] Sat Feb 16 17:21:34 2013 @@ -584,14 +584,17 @@ IN PCWSTR SourceString) { SIZE_T Size; - CONST SIZE_T MaxSize = (MAXUSHORT & ~1) - sizeof(WCHAR); // an even number + CONST SIZE_T MaxSize = (MAXUSHORT & ~1) - sizeof(UNICODE_NULL); // an even number if (SourceString) { Size = wcslen(SourceString) * sizeof(WCHAR); - if (Size > MaxSize) Size = MaxSize; + __analysis_assume(Size <= MaxSize); + + if (Size > MaxSize) + Size = MaxSize; DestinationString->Length = (USHORT)Size; - DestinationString->MaximumLength = (USHORT)Size + sizeof(WCHAR); + DestinationString->MaximumLength = (USHORT)Size + sizeof(UNICODE_NULL); } else { Modified: trunk/reactos/lib/rtl/unicodeprefix.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/unicodeprefix.c?re… ============================================================================== --- trunk/reactos/lib/rtl/unicodeprefix.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/unicodeprefix.c [iso-8859-1] Sat Feb 16 17:21:34 2013 @@ -156,7 +156,7 @@ RTL_GENERIC_COMPARE_RESULTS Result; DPRINT("RtlFindUnicodePrefix(): Table %p, FullName %wZ, " - "CaseInsensitive %b\n", PrefixTable, FullName, CaseInsensitiveIndex); + "CaseInsensitive %lu\n", PrefixTable, FullName, CaseInsensitiveIndex); /* Find out how many names there are */ NameCount = ComputeUnicodeNameLength(FullName); @@ -467,7 +467,7 @@ PRTL_SPLAY_LINKS SplayLinks; PUNICODE_PREFIX_TABLE_ENTRY Entry, CaseMatchEntry = NULL; - DPRINT("RtlNextUnicodePrefix(): Table %p Restart %b\n", + DPRINT("RtlNextUnicodePrefix(): Table %p Restart %u\n", PrefixTable, Restart); /* We might need this entry 2/3rd of the time, so cache it now */ Modified: trunk/reactos/lib/rtl/workitem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/workitem.c?rev=583… ============================================================================== --- trunk/reactos/lib/rtl/workitem.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/workitem.c [iso-8859-1] Sat Feb 16 17:21:34 2013 @@ -456,7 +456,7 @@ /* Couldn't find an appropriate thread, see if we can use the persistent thread (if it exists) for now */ if (ThreadPoolIOWorkerThreads == 0) { - DPRINT1("Failed to find a worker thread for the work item 0x%p!\n"); + DPRINT1("Failed to find a worker thread for the work item 0x%p!\n", WorkItem); ASSERT(IsListEmpty(&ThreadPoolIOWorkerThreadsList)); return STATUS_NO_MEMORY; }

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