Ros-diffs February 2015

ros-diffs@reactos.org

16 participants
372 discussions

[hbelusca] 66377: Fix MessageBox parameter value (handles ~= pointers --> NULL)

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Feb 20 23:52:48 2015 New Revision: 66377 URL: http://svn.reactos.org/svn/reactos?rev=66377&view=rev Log: Fix MessageBox parameter value (handles ~= pointers --> NULL) Modified: trunk/reactos/win32ss/user/winsrv/usersrv/harderror.c Modified: trunk/reactos/win32ss/user/winsrv/usersrv/harderror.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/usersrv/harderror.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/usersrv/harderror.c [iso-8859-1] Fri Feb 20 23:52:48 2015 @@ -490,7 +490,7 @@ Text, Caption, Severity, Type); /* Display a message box */ - MessageBoxResponse = MessageBoxW(0, Text, Caption, Type); + MessageBoxResponse = MessageBoxW(NULL, Text, Caption, Type); /* Return response value */ switch (MessageBoxResponse)

9 years, 7 months

[hbelusca] 66376: [MC files] CORE-3655 #comment Hackfix the fact that when being compiled with GCC on Linux, compiled messages have their endlines encoded with LF instead of with CR-LF as required ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Feb 20 23:36:23 2015 New Revision: 66376 URL: http://svn.reactos.org/svn/reactos?rev=66376&view=rev Log: [MC files] CORE-3655 #comment Hackfix the fact that when being compiled with GCC on Linux, compiled messages have their endlines encoded with LF instead of with CR-LF as required by Windows compatibility. This should be normally fixed in windmc (the GCC/binutils message compiler); I've enough complained about that, but not directly to GCC/binutils team. Until they fix their tool, I ask SVN to always store the .mc files with CR-LF endlines. This should "fix" the problem. Suggestion by Thomas Faber. Modified: trunk/reactos/base/applications/rapps/rappsmsg.mc (contents, props changed) trunk/reactos/dll/win32/kernel32/winnls/lang/bg-BG.mc (contents, props changed) trunk/reactos/dll/win32/kernel32/winnls/lang/de-DE.mc (contents, props changed) trunk/reactos/dll/win32/kernel32/winnls/lang/pl-PL.mc (contents, props changed) trunk/reactos/dll/win32/kernel32/winnls/lang/ru-RU.mc (contents, props changed) trunk/reactos/include/reactos/mc/bugcodes.mc (contents, props changed) trunk/reactos/include/reactos/mc/errcodes.mc (contents, props changed) trunk/reactos/include/reactos/mc/neteventmsg.mc (contents, props changed) trunk/reactos/include/reactos/mc/ntiologc.mc (contents, props changed) trunk/reactos/include/reactos/mc/ntstatus.mc (contents, props changed) trunk/reactos/include/reactos/mc/pciclass.mc (contents, props changed) trunk/reactos/include/reactos/mc/sacmsg.mc (props changed) [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/rapps/rappsmsg.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/bg-BG.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/de-DE.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/pl-PL.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/ru-RU.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Modified: trunk/reactos/include/reactos/mc/bugcodes.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/bugcode… Modified: trunk/reactos/include/reactos/mc/errcodes.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/errcode… Modified: trunk/reactos/include/reactos/mc/neteventmsg.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/neteven… Modified: trunk/reactos/include/reactos/mc/ntiologc.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/ntiolog… Modified: trunk/reactos/include/reactos/mc/ntstatus.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/ntstatu… Modified: trunk/reactos/include/reactos/mc/pciclass.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/pciclas…

9 years, 7 months

[hbelusca] 66375: [SMSS]: Improve some dprints (that prints strings; sometimes they happen to print empty strings for unknown reasons so I need to really check whether they are empty or not); remov...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Feb 20 22:03:23 2015 New Revision: 66375 URL: http://svn.reactos.org/svn/reactos?rev=66375&view=rev Log: [SMSS]: Improve some dprints (that prints strings; sometimes they happen to print empty strings for unknown reasons so I need to really check whether they are empty or not); remove extra whitespace at the end of dprints. Initialize a variable. Modified: trunk/reactos/base/system/smss/pagefile.c trunk/reactos/base/system/smss/sminit.c Modified: trunk/reactos/base/system/smss/pagefile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/pagefile.… ============================================================================== --- trunk/reactos/base/system/smss/pagefile.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/pagefile.c [iso-8859-1] Fri Feb 20 22:03:23 2015 @@ -101,7 +101,7 @@ } /* Parse the specified and get the name and arguments out of it */ - DPRINT("SMSS:PFILE: Paging file specifier `%wZ' \n", PageFileToken); + DPRINT("SMSS:PFILE: Paging file specifier `%wZ'\n", PageFileToken); Status = SmpParseCommandLine(PageFileToken, NULL, &PageFileName, @@ -216,7 +216,7 @@ /* This means no duplicates exist, so insert our descriptor! */ InsertTailList(&SmpPagingFileDescriptorList, &Descriptor->Entry); SmpNumberOfPagingFiles++; - DPRINT("SMSS:PFILE: Created descriptor for `%wZ' (`%wZ') \n", + DPRINT("SMSS:PFILE: Created descriptor for `%wZ' (`%wZ')\n", PageFileToken, &Descriptor->Name); return STATUS_SUCCESS; } @@ -228,7 +228,7 @@ !(Descriptor->Flags & SMP_PAGEFILE_ON_ANY_DRIVE)); /* We found a duplicate, so skip this descriptor/pagefile and fail */ - DPRINT1("SMSS:PFILE: Skipping duplicate specifier `%wZ' \n", PageFileToken); + DPRINT1("SMSS:PFILE: Skipping duplicate specifier `%wZ'\n", PageFileToken); RtlFreeUnicodeString(&PageFileName); RtlFreeHeap(RtlGetProcessHeap(), 0, Descriptor); return STATUS_INVALID_PARAMETER; @@ -268,7 +268,7 @@ FileStandardInformation); if (!NT_SUCCESS(Status)) { - DPRINT1("SMSS:PFILE: Failed query for size potential pagefile `%wZ' with status %X \n", + DPRINT1("SMSS:PFILE: Failed query for size potential pagefile `%wZ' with status %X\n", FileName, Status); NtClose(FileHandle); return Status; @@ -351,7 +351,7 @@ wcscpy(PathString, L"\\??\\A:\\"); RtlInitUnicodeString(&VolumeName, PathString); VolumeName.Buffer[STANDARD_DRIVE_LETTER_OFFSET] = Volume->DriveLetter; - DPRINT("SMSS:PFILE: Querying volume `%wZ' for free space \n", &VolumeName); + DPRINT("SMSS:PFILE: Querying volume `%wZ' for free space\n", &VolumeName); /* Open the volume */ InitializeObjectAttributes(&ObjectAttributes, @@ -367,7 +367,7 @@ FILE_SYNCHRONOUS_IO_NONALERT | FILE_DIRECTORY_FILE); if (!NT_SUCCESS(Status)) { - DPRINT1("SMSS:PFILE: Open volume `%wZ' failed with status %X \n", &VolumeName, Status); + DPRINT1("SMSS:PFILE: Open volume `%wZ' failed with status %X\n", &VolumeName, Status); return Status; } @@ -381,7 +381,7 @@ { /* We failed */ DPRINT1("SMSS:PFILE: Query volume `%wZ' (handle %p) for size failed" - " with status %X \n", + " with status %X\n", &VolumeName, VolumeHandle, Status); @@ -456,14 +456,14 @@ Status = NtCreatePagingFile(Name, MinSize, MaxSize, Priority); if (NT_SUCCESS(Status)) { - DPRINT("SMSS:PFILE: NtCreatePagingFile (%wZ, %I64X, %I64X) succeeded. \n", + DPRINT("SMSS:PFILE: NtCreatePagingFile (%wZ, %I64X, %I64X) succeeded.\n", Name, MinSize->QuadPart, MaxSize->QuadPart); } else { - DPRINT1("SMSS:PFILE: NtCreatePagingFile (%wZ, %I64X, %I64X) failed with %X \n", + DPRINT1("SMSS:PFILE: NtCreatePagingFile (%wZ, %I64X, %I64X) failed with %X\n", Name, MinSize->QuadPart, MaxSize->QuadPart, @@ -492,7 +492,7 @@ if (!Volume) { /* Couldn't find it, fail */ - DPRINT1("SMSS:PFILE: No volume descriptor for `%wZ' \n", + DPRINT1("SMSS:PFILE: No volume descriptor for `%wZ'\n", &Descriptor->Name); return STATUS_INVALID_PARAMETER; } @@ -504,7 +504,7 @@ if (!(Descriptor->Flags & SMP_PAGEFILE_DUMP_PROCESSED)) { /* Try to find a crash dump and extract it */ - DPRINT("SMSS:PFILE: Checking for crash dump in `%wZ' on boot volume \n", + DPRINT("SMSS:PFILE: Checking for crash dump in `%wZ' on boot volume\n", &Descriptor->Name); SmpCheckForCrashDump(&Descriptor->Name); @@ -529,7 +529,7 @@ { /* Crashdumps can only be on the boot volume */ DPRINT("SMSS:PFILE: Skipping crash dump checking for `%wZ' on non boot" - "volume `%wC' \n", + "volume `%wC'\n", &Descriptor->Name, Volume->DriveLetter); } @@ -544,7 +544,7 @@ DPRINT("SMSS:PFILE: Detected size %I64X for future paging file `%wZ'\n", PageFileSize, &Descriptor->Name); - DPRINT("SMSS:PFILE: Free space on volume `%wC' is %I64X \n", + DPRINT("SMSS:PFILE: Free space on volume `%wC' is %I64X\n", Volume->DriveLetter, Volume->FreeSpace.QuadPart); @@ -558,7 +558,7 @@ { Descriptor->ActualMaxSize = PageFileSize; } - DPRINT("SMSS:PFILE: min %I64X, max %I64X, real min %I64X \n", + DPRINT("SMSS:PFILE: min %I64X, max %I64X, real min %I64X\n", Descriptor->ActualMinSize.QuadPart, Descriptor->ActualMaxSize.QuadPart, MinimumSize->QuadPart); @@ -595,7 +595,7 @@ /* FIXFIX: Windows Vista does this, and it seems like we should too, so try to see if this fixes KVM */ Volume->FreeSpace.QuadPart = PageFileSize.QuadPart; } - DPRINT1("SMSS:PFILE: Failing for min %I64X, max %I64X, real min %I64X \n", + DPRINT1("SMSS:PFILE: Failing for min %I64X, max %I64X, real min %I64X\n", Descriptor->ActualMinSize.QuadPart, Descriptor->ActualMaxSize.QuadPart, MinimumSize->QuadPart); @@ -670,7 +670,7 @@ if (!NT_SUCCESS(Status)) { /* If we failed, use defaults since we have no idea otherwise */ - DPRINT1("SMSS:PFILE: NtQuerySystemInformation failed with %x \n", Status); + DPRINT1("SMSS:PFILE: NtQuerySystemInformation failed with %x\n", Status); SmpMakeDefaultPagingFileDescriptor(Descriptor); return; } @@ -734,7 +734,7 @@ if (WasTooBig) { /* Notify debugger output and write a flag in the descriptor */ - DPRINT("SMSS:PFILE: Trimmed size of `%wZ' to maximum allowed \n", + DPRINT("SMSS:PFILE: Trimmed size of `%wZ' to maximum allowed\n", &Descriptor->Name); Descriptor->Flags |= SMP_PAGEFILE_WAS_TOO_BIG; } @@ -842,7 +842,7 @@ NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("SMSS:PFILE: Query(ProcessDeviceMap) failed with status %X \n", + DPRINT1("SMSS:PFILE: Query(ProcessDeviceMap) failed with status %X\n", Status); return Status; } @@ -874,7 +874,7 @@ if (!NT_SUCCESS(Status)) { /* Skip the volume if we failed */ - DPRINT1("SMSS:PFILE: Open volume `%wZ' failed with status %X \n", + DPRINT1("SMSS:PFILE: Open volume `%wZ' failed with status %X\n", &VolumePath, Status); continue; } @@ -889,7 +889,7 @@ { /* Move to the next volume if we failed */ DPRINT1("SMSS:PFILE: Query volume `%wZ' (handle %p) for device info" - " failed with status %X \n", + " failed with status %X\n", &VolumePath, VolumeHandle, Status); @@ -904,7 +904,7 @@ FILE_REMOVABLE_MEDIA)) { /* It isn't, so skip it */ - DPRINT1("SMSS:PFILE: Volume `%wZ' (%X) cannot store a paging file \n", + DPRINT1("SMSS:PFILE: Volume `%wZ' (%X) cannot store a paging file\n", &VolumePath, DeviceInfo.Characteristics); NtClose(VolumeHandle); @@ -918,7 +918,7 @@ if (!Volume) { /* Failed to allocate memory, try the next disk */ - DPRINT1("SMSS:PFILE: Failed to allocate a volume descriptor (%u bytes) \n", + DPRINT1("SMSS:PFILE: Failed to allocate a volume descriptor (%u bytes)\n", sizeof(SMP_VOLUME_DESCRIPTOR)); NtClose(VolumeHandle); continue; @@ -948,7 +948,7 @@ { /* We failed -- keep going */ DPRINT1("SMSS:PFILE: Query volume `%wZ' (handle %p) for size failed" - " with status %X \n", + " with status %X\n", &VolumePath, VolumeHandle, Status); @@ -981,7 +981,7 @@ /* All done, add this volume to our descriptor list */ InsertTailList(&SmpVolumeDescriptorList, &Volume->Entry); Volume->Flags |= SMP_VOLUME_INSERTED; - DPRINT("SMSS:PFILE: Created volume descriptor for`%wZ' \n", &VolumePath); + DPRINT("SMSS:PFILE: Created volume descriptor for`%wZ'\n", &VolumePath); } /* We must've found at least the boot volume */ @@ -1006,9 +1006,9 @@ /* Check if no paging files were requested */ if (!(SmpNumberOfPagingFiles) && !(SmpRegistrySpecifierPresent)) { - /* The list should be empty -- nothign to do */ + /* The list should be empty -- nothing to do */ ASSERT(IsListEmpty(&SmpPagingFileDescriptorList)); - DPRINT1("SMSS:PFILE: No paging file was requested \n"); + DPRINT1("SMSS:PFILE: No paging file was requested\n"); return STATUS_SUCCESS; } @@ -1040,7 +1040,7 @@ if (!NT_SUCCESS(Status)) { /* We failed -- try again, with size minimization this time */ - DPRINT1("SMSS:PFILE: Trying lower sizes for (`%wZ') \n", + DPRINT1("SMSS:PFILE: Trying lower sizes for (`%wZ')\n", &Descriptor->Name); Status = SmpCreateSystemManagedPagingFile(Descriptor, TRUE); } @@ -1051,7 +1051,7 @@ SmpValidatePagingFileSizes(Descriptor); /* Check if this is an ANY pagefile or a FIXED pagefile */ - DPRINT("SMSS:PFILE: Creating a normal paging file (`%wZ') \n", + DPRINT("SMSS:PFILE: Creating a normal paging file (`%wZ')\n", &Descriptor->Name); if (Descriptor->Name.Buffer[STANDARD_DRIVE_LETTER_OFFSET] == L'?') { @@ -1063,7 +1063,7 @@ if (!NT_SUCCESS(Status)) { /* We failed to create it. Try again with a smaller size */ - DPRINT1("SMSS:PFILE: Trying lower sizes for (`%wZ') \n", + DPRINT1("SMSS:PFILE: Trying lower sizes for (`%wZ')\n", &Descriptor->Name); Size.QuadPart = 16 * MEGABYTE; Status = SmpCreatePagingFileOnAnyDrive(Descriptor, @@ -1090,7 +1090,7 @@ if (!Created) { /* Build an emergency pagefile ourselves */ - DPRINT1("SMSS:PFILE: Creating emergency paging file. \n"); + DPRINT1("SMSS:PFILE: Creating emergency paging file.\n"); Status = SmpCreateEmergencyPagingFile(); } Modified: trunk/reactos/base/system/smss/sminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/sminit.c?… ============================================================================== --- trunk/reactos/base/system/smss/sminit.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/sminit.c [iso-8859-1] Fri Feb 20 22:03:23 2015 @@ -104,8 +104,8 @@ /* A new entry -- allocate it */ RegEntry = RtlAllocateHeap(RtlGetProcessHeap(), SmBaseTag, - NameString.MaximumLength + - sizeof(SMP_REGISTRY_VALUE)); + sizeof(SMP_REGISTRY_VALUE) + + NameString.MaximumLength); if (!RegEntry) return STATUS_NO_MEMORY; /* Initialize the list and set all values to NULL */ @@ -355,15 +355,15 @@ IN PVOID EntryContext) { NTSTATUS Status; - static PWCHAR Canary; + static PWCHAR Canary = NULL; /* Check if this is the second call */ if (Canary) { /* Save the data into the list */ - DPRINT1("Renamed file: %S-%S\n", Canary, ValueData); + DPRINT1("Renamed file: '%S' - '%S'\n", Canary, ValueData); Status = SmpSaveRegistryValue(EntryContext, Canary, ValueData, FALSE); - Canary = 0; + Canary = NULL; } else { @@ -1994,7 +1994,7 @@ /* Get this entry */ NextEntry = RemoveHeadList(Head); RegEntry = CONTAINING_RECORD(NextEntry, SMP_REGISTRY_VALUE, Entry); - DPRINT1("Processing PFRO: %wZ/%wZ\n", &RegEntry->Value, &RegEntry->Name); + DPRINT1("Processing PFRO: '%wZ' / '%wZ'\n", &RegEntry->Value, &RegEntry->Name); /* Skip past the '@' marker */ if (!(RegEntry->Value.Length) && (*RegEntry->Name.Buffer == L'@')) @@ -2077,7 +2077,7 @@ (Buffer->ReplaceIfExists))) { /* Open the file for write attribute access this time... */ - DPRINT1("\nSMSS: %wZ => %wZ failed - Status == %x, Possible readonly target\n", + DPRINT1("\nSMSS: '%wZ' => '%wZ' failed - Status == %x, Possible readonly target\n", &RegEntry->Name, &RegEntry->Value, STATUS_OBJECT_NAME_COLLISION); @@ -2150,18 +2150,18 @@ if (!NT_SUCCESS(Status)) { /* We totally failed */ - DPRINT1("SMSS: %wZ => %wZ failed - Status == %x\n", + DPRINT1("SMSS: '%wZ' => '%wZ' failed - Status == %x\n", &RegEntry->Name, &RegEntry->Value, Status); } else if (RegEntry->Value.Length) { /* We succeed with a rename */ - DPRINT1("SMSS: %wZ (renamed to) %wZ\n", &RegEntry->Name, &RegEntry->Value); + DPRINT1("SMSS: '%wZ' (renamed to) '%wZ'\n", &RegEntry->Name, &RegEntry->Value); } else { /* We suceeded with a delete */ - DPRINT1("SMSS: %wZ (deleted)\n", &RegEntry->Name); + DPRINT1("SMSS: '%wZ' (deleted)\n", &RegEntry->Name); } /* Now free this entry and keep going */

9 years, 7 months

[tkreuzer] 66374: [WIN32K] Add back support for allocator stack backtraces for GDI objects and dump a list of BTs, when the GDI object table is exhausted. Disabled by default.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Feb 20 21:25:10 2015 New Revision: 66374 URL: http://svn.reactos.org/svn/reactos?rev=66374&view=rev Log: [WIN32K] Add back support for allocator stack backtraces for GDI objects and dump a list of BTs, when the GDI object table is exhausted. Disabled by default. Modified: trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c trunk/reactos/win32ss/gdi/ntgdi/gdidebug.h trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h trunk/reactos/win32ss/win32kp.h Modified: trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c [iso-8859-1] Fri Feb 20 21:25:10 2015 @@ -15,6 +15,7 @@ extern ULONG gulFirstFree; extern ULONG gulFirstUnused; +extern PENTRY gpentHmgr;; ULONG gulLogUnique = 0; @@ -94,21 +95,64 @@ {L"UserWnd", DbgChUserWnd} }; -#ifdef GDI_DEBUG -#if 0 +ULONG +NTAPI +DbgCaptureStackBackTace( + _Out_writes_(cFramesToCapture) PVOID* ppvFrames, + _In_ ULONG cFramesToSkip, + _In_ ULONG cFramesToCapture) +{ + ULONG cFrameCount; + PVOID apvTemp[30]; + NT_ASSERT(cFramesToCapture <= _countof(apvTemp)); + + /* Zero it out */ + RtlZeroMemory(ppvFrames, cFramesToCapture * sizeof(PVOID)); + + /* Capture kernel stack */ + cFrameCount = RtlWalkFrameChain(apvTemp, _countof(apvTemp), 0); + + /* If we should skip more than we have, we are done */ + if (cFramesToSkip > cFrameCount) + return 0; + + /* Copy, but skip frames */ + cFrameCount -= cFramesToSkip; + cFrameCount = min(cFrameCount, cFramesToCapture); + RtlCopyMemory(ppvFrames, &apvTemp[cFramesToSkip], cFrameCount * sizeof(PVOID)); + + /* Check if there is still space left */ + if (cFrameCount < cFramesToCapture) + { + /* Capture user stack */ + cFrameCount += RtlWalkFrameChain(&ppvFrames[cFrameCount], + cFramesToCapture - cFrameCount, + 1); + } + + return cFrameCount; +} + +#if DBG_ENABLE_GDIOBJ_BACKTRACES + static BOOL -CompareBacktraces(ULONG idx1, ULONG idx2) -{ +CompareBacktraces( + USHORT idx1, + USHORT idx2) +{ + POBJ pobj1, pobj2; ULONG iLevel; + /* Get the objects */ + pobj1 = gpentHmgr[idx1].einfo.pobj; + pobj2 = gpentHmgr[idx2].einfo.pobj; + /* Loop all stack levels */ - for (iLevel = 0; iLevel < GDI_STACK_LEVELS; iLevel++) - { - if (GDIHandleAllocator[idx1][iLevel] - != GDIHandleAllocator[idx2][iLevel]) -// if (GDIHandleShareLocker[idx1][iLevel] -// != GDIHandleShareLocker[idx2][iLevel]) + for (iLevel = 0; iLevel < GDI_OBJECT_STACK_LEVELS; iLevel++) + { + /* If one level doesn't match we are done */ + if (pobj1->apvBackTrace[iLevel] != pobj2->apvBackTrace[iLevel]) { return FALSE; } @@ -117,22 +161,37 @@ return TRUE; } +typedef struct +{ + USHORT idx; + USHORT iCount; +} GDI_DBG_HANDLE_BT; + VOID NTAPI DbgDumpGdiHandleTableWithBT(void) { - static int leak_reported = 0; - int i, j, idx, nTraces = 0; + static BOOL bLeakReported = FALSE; + ULONG idx, j; + BOOL bAlreadyPresent; + GDI_DBG_HANDLE_BT aBacktraceTable[GDI_DBG_MAX_BTS]; + USHORT iCount; KIRQL OldIrql; - - if (leak_reported) + POBJ pobj; + ULONG iLevel, ulObj; + + /* Only report once */ + if (bLeakReported) { DPRINT1("GDI handle abusers already reported!\n"); return; } - leak_reported = 1; + bLeakReported = TRUE; DPRINT1("Reporting GDI handle abusers:\n"); + + /* Zero out the table */ + RtlZeroMemory(aBacktraceTable, sizeof(aBacktraceTable)); /* We've got serious business to do */ KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); @@ -141,94 +200,84 @@ for (idx = RESERVE_ENTRIES_COUNT; idx < GDI_HANDLE_COUNT; idx++) { /* If the handle is free, continue */ - if (!IS_HANDLE_VALID(idx)) continue; - - /* Step through all previous backtraces */ - for (j = 0; j < nTraces; j++) - { - /* Check if the backtrace matches */ - if (CompareBacktraces(idx, AllocatorTable[j].idx)) + if (gpentHmgr[idx].einfo.pobj == 0) continue; + + /* Check if this backtrace is already covered */ + bAlreadyPresent = FALSE; + for (j = RESERVE_ENTRIES_COUNT; j < idx; j++) + { + if (CompareBacktraces(idx, j)) { - /* It matches, increment count and break out */ - AllocatorTable[j].count++; + bAlreadyPresent = TRUE; break; } } - /* Did we find a new backtrace? */ - if (j == nTraces) - { - /* Break out, if we reached the maximum */ - if (nTraces == MAX_BACKTRACES) break; - - /* Initialize this entry */ - AllocatorTable[j].idx = idx; - AllocatorTable[j].count = 1; - nTraces++; - } - } - - /* bubble sort time! weeeeee!! */ - for (i = 0; i < nTraces-1; i++) - { - if (AllocatorTable[i].count < AllocatorTable[i+1].count) - { - struct DbgOpenGDIHandle temp; - - temp = AllocatorTable[i+1]; - AllocatorTable[i+1] = AllocatorTable[i]; - j = i; - while (j > 0 && AllocatorTable[j-1].count < temp.count) - j--; - AllocatorTable[j] = temp; + if (bAlreadyPresent) continue; + + /* We don't have this BT yet, count how often it is present */ + iCount = 1; + for (j = idx + 1; j < GDI_HANDLE_COUNT; j++) + { + if (CompareBacktraces(idx, j)) + { + iCount++; + } + } + + /* Now add this backtrace */ + for (j = 0; j < GDI_DBG_MAX_BTS; j++) + { + /* Insert it below the next smaller count */ + if (aBacktraceTable[j].iCount < iCount) + { + /* Check if there are entries above */ + if (j < GDI_DBG_MAX_BTS - 1) + { + /* Move the following entries up by 1 */ + RtlMoveMemory(&aBacktraceTable[j], + &aBacktraceTable[j + 1], + GDI_DBG_MAX_BTS - j - 1); + } + + /* Set this entry */ + aBacktraceTable[j].idx = idx; + aBacktraceTable[j].iCount = iCount; + + /* We are done here */ + break; + } } } /* Print the worst offenders... */ - DbgPrint("Worst GDI Handle leak offenders (out of %i unique locations):\n", nTraces); - for (i = 0; i < nTraces && AllocatorTable[i].count > 1; i++) - { - /* Print out the allocation count */ - DbgPrint(" %i allocs, type = 0x%lx:\n", - AllocatorTable[i].count, - GdiHandleTable->Entries[AllocatorTable[i].idx].Type); - - /* Dump the frames */ - KeRosDumpStackFrames(GDIHandleAllocator[AllocatorTable[i].idx], GDI_STACK_LEVELS); - //KeRosDumpStackFrames(GDIHandleShareLocker[AllocatorTable[i].idx], GDI_STACK_LEVELS); - - /* Print new line for better readability */ + DbgPrint("Count Handle Backtrace\n"); + DbgPrint("------------------------------------------------\n"); + for (j = 0; j < GDI_DBG_MAX_BTS; j++) + { + idx = aBacktraceTable[j].idx; + if (idx == 0) + break; + + ulObj = ((ULONG)gpentHmgr[idx].FullUnique << 16) | idx; + pobj = gpentHmgr[idx].einfo.pobj; + + DbgPrint("%5d %08lx ", aBacktraceTable[j].iCount, ulObj); + for (iLevel = 0; iLevel < GDI_OBJECT_STACK_LEVELS; iLevel++) + { + DbgPrint("%p,", pobj->apvBackTrace[iLevel]); + } DbgPrint("\n"); } - if (i < nTraces) - DbgPrint("(List terminated - the remaining entries have 1 allocation only)\n"); + __debugbreak(); KeLowerIrql(OldIrql); - - ASSERT(FALSE); -} -#endif - -ULONG -NTAPI -DbgCaptureStackBackTace(PVOID* pFrames, ULONG nFramesToCapture) -{ - ULONG nFrameCount; - - memset(pFrames, 0x00, (nFramesToCapture + 1) * sizeof(PVOID)); - - nFrameCount = RtlWalkFrameChain(pFrames, nFramesToCapture, 0); - - if (nFrameCount < nFramesToCapture) - { - nFrameCount += RtlWalkFrameChain(pFrames + nFrameCount, - nFramesToCapture - nFrameCount, - 1); - } - - return nFrameCount; -} +} + +#endif /* DBG_ENABLE_GDIOBJ_BACKTRACES */ + +#if DBG BOOL NTAPI @@ -352,32 +401,10 @@ return r; } -#endif /* GDI_DEBUG */ - -VOID -NTAPI -DbgDumpLockedGdiHandles() -{ -#if 0 - ULONG i; - - for (i = RESERVE_ENTRIES_COUNT; i < GDI_HANDLE_COUNT; i++) - { - PENTRY pentry = &gpentHmgr[i]; - - if (pentry->Objt) - { - POBJ pobj = pentry->einfo.pobj; - if (pobj->cExclusiveLock > 0) - { - DPRINT1("Locked object: %lx, type = %lx. allocated from:\n", - i, pentry->Objt); - DBG_DUMP_EVENT_LIST(&pobj->slhLog); - } - } - } -#endif -} +#endif /* DBG */ + + +#if DBG_ENABLE_EVENT_LOGGING VOID NTAPI @@ -400,7 +427,7 @@ pLogEntry->lParam = lParam; /* Capture a backtrace */ - DbgCaptureStackBackTace(pLogEntry->apvBackTrace, 20); + DbgCaptureStackBackTace(pLogEntry->apvBackTrace, 1, 20); switch (nEventType) { @@ -483,6 +510,33 @@ } } +#endif /* DBG_ENABLE_EVENT_LOGGING */ + +#if 1 || DBG_ENABLE_SERVICE_HOOKS + +VOID +NTAPI +DbgDumpLockedGdiHandles() +{ + ULONG i; + + for (i = RESERVE_ENTRIES_COUNT; i < GDI_HANDLE_COUNT; i++) + { + PENTRY pentry = &gpentHmgr[i]; + + if (pentry->Objt) + { + POBJ pobj = pentry->einfo.pobj; + if (pobj->cExclusiveLock > 0) + { + DPRINT1("Locked object: %lx, type = %lx. allocated from:\n", + i, pentry->Objt); + DBG_DUMP_EVENT_LIST(&pobj->slhLog); + } + } + } +} + void NTAPI GdiDbgPreServiceHook(ULONG ulSyscallId, PULONG_PTR pulArguments) @@ -512,6 +566,9 @@ } return ulResult; } + +#endif /* DBG_ENABLE_SERVICE_HOOKS */ + NTSTATUS NTAPI QueryEnvironmentVariable(PUNICODE_STRING Name, Modified: trunk/reactos/win32ss/gdi/ntgdi/gdidebug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdidebug… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdidebug.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdidebug.h [iso-8859-1] Fri Feb 20 21:25:10 2015 @@ -1,4 +1,61 @@ #pragma once + +#define GDI_DBG_MAX_BTS 10 + +#if DBG +#define ASSERT_NOGDILOCKS() GdiDbgAssertNoLocks(__FILE__,__LINE__) +#define KeRosDumpStackFrames(Frames, Count) \ + KdSystemDebugControl('DsoR', (PVOID)Frames, Count, NULL, 0, NULL, KernelMode) +#else +#define ASSERT_NOGDILOCKS() +#define KeRosDumpStackFrames(Frames, Count) +#endif + +NTSYSAPI +ULONG +APIENTRY +RtlWalkFrameChain( + _Out_ PVOID *Callers, + _In_ ULONG Count, + _In_ ULONG Flags); + +ULONG +NTAPI +DbgCaptureStackBackTace( + _Out_writes_(cFramesToCapture) PVOID* ppvFrames, + _In_ ULONG cFramesToSkip, + _In_ ULONG cFramesToCapture); + +BOOL +NTAPI +DbgGdiHTIntegrityCheck( + VOID); + +VOID +NTAPI +DbgDumpLockedGdiHandles( + VOID); + +#if DBG_ENABLE_GDIOBJ_BACKTRACES + +VOID +NTAPI +DbgDumpGdiHandleTableWithBT(VOID); + +#endif + +#if KDBG + +BOOLEAN +NTAPI +DbgGdiKdbgCliCallback( + _In_ PCHAR Command, + _In_ ULONG Argc, + _In_ PCH Argv[]); + +#endif + +#if DBG_ENABLE_EVENT_LOGGING typedef enum _LOG_EVENT_TYPE { @@ -28,39 +85,41 @@ } data; } LOGENTRY, *PLOGENTRY; -#if KDBG -BOOLEAN +VOID NTAPI -DbgGdiKdbgCliCallback( - IN PCHAR Command, - IN ULONG Argc, - IN PCH Argv[]); -#endif +DbgDumpEventList( + _Inout_ PSLIST_HEADER pslh); -#if DBG_ENABLE_EVENT_LOGGING -VOID NTAPI DbgDumpEventList(PSLIST_HEADER pslh); -VOID NTAPI DbgLogEvent(PSLIST_HEADER pslh, LOG_EVENT_TYPE nEventType, LPARAM lParam); -VOID NTAPI DbgCleanupEventList(PSLIST_HEADER pslh); -VOID NTAPI DbgPrintEvent(PLOGENTRY pLogEntry); +VOID +NTAPI +DbgLogEvent( + _Inout_ PSLIST_HEADER pslh, + _In_ LOG_EVENT_TYPE nEventType, + _In_ LPARAM lParam); + +VOID +NTAPI +DbgCleanupEventList( + _Inout_ PSLIST_HEADER pslh); + +VOID +NTAPI +DbgPrintEvent( + _Inout_ PLOGENTRY pLogEntry); + #define DBG_LOGEVENT(pslh, type, val) DbgLogEvent(pslh, type, (ULONG_PTR)val) #define DBG_INITLOG(pslh) InitializeSListHead(pslh) #define DBG_DUMP_EVENT_LIST(pslh) DbgDumpEventList(pslh) #define DBG_CLEANUP_EVENT_LIST(pslh) DbgCleanupEventList(pslh) + #else + #define DBG_LOGEVENT(pslh, type, val) ((void)(val)) #define DBG_INITLOG(pslh) #define DBG_DUMP_EVENT_LIST(pslh) #define DBG_CLEANUP_EVENT_LIST(pslh) + #endif - - -VOID NTAPI DbgDumpGdiHandleTableWithBT(VOID); -ULONG NTAPI DbgCaptureStackBackTace(PVOID* pFrames, ULONG nFramesToCapture); -BOOL NTAPI DbgGdiHTIntegrityCheck(VOID); -VOID NTAPI DbgDumpLockedGdiHandles(VOID); - -#define KeRosDumpStackFrames(Frames, Count) KdSystemDebugControl('DsoR', (PVOID)Frames, Count, NULL, 0, NULL, KernelMode) -NTSYSAPI ULONG APIENTRY RtlWalkFrameChain(OUT PVOID *Callers, IN ULONG Count, IN ULONG Flags); #if DBG void @@ -88,9 +147,6 @@ ASSERT(FALSE); } } - -#define ASSERT_NOGDILOCKS() GdiDbgAssertNoLocks(__FILE__,__LINE__) -#else -#define ASSERT_NOGDILOCKS() #endif + Modified: trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] Fri Feb 20 21:25:10 2015 @@ -339,6 +339,10 @@ if (iFirst >= GDI_HANDLE_COUNT) { DPRINT1("No more GDI handles left!\n"); +#if DBG_ENABLE_GDIOBJ_BACKTRACES + DbgDumpGdiHandleTableWithBT(); +#endif + InterlockedDecrement((LONG*)&gulFirstUnused); return 0; } @@ -350,7 +354,7 @@ pentFree = &gpentHmgr[iFirst & GDI_HANDLE_INDEX_MASK]; /* Create a new value with an increased sequence number */ - iNext = (USHORT)(ULONG_PTR)pentFree->einfo.pobj; + iNext = GDI_HANDLE_GET_INDEX(pentFree->einfo.hFree); iNext |= (iFirst & ~GDI_HANDLE_INDEX_MASK) + 0x10000; /* Try to exchange the FirstFree value */ @@ -516,6 +520,9 @@ pobj->BaseFlags = fl & 0xffff; DBG_INITLOG(&pobj->slhLog); DBG_LOGEVENT(&pobj->slhLog, EVENT_ALLOCATE, 0); +#if DBG_ENABLE_GDIOBJ_BACKTRACES + DbgCaptureStackBackTace(pobj->apvBackTrace, 1, GDI_OBJECT_STACK_LEVELS); +#endif /* GDI_DEBUG */ return pobj; } @@ -1497,9 +1504,7 @@ } #if DBG -//#ifdef GDI_DEBUG - DbgGdiHTIntegrityCheck(); -//#endif + DbgGdiHTIntegrityCheck(); #endif ppi = PsGetCurrentProcessWin32Process(); Modified: trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h [iso-8859-1] Fri Feb 20 21:25:10 2015 @@ -4,6 +4,8 @@ */ #pragma once + +#define GDI_OBJECT_STACK_LEVELS 10 /* The first 10 entries are never used in windows, they are empty */ static const unsigned RESERVE_ENTRIES_COUNT = 10; @@ -42,6 +44,9 @@ USHORT cExclusiveLock; USHORT BaseFlags; EX_PUSH_LOCK pushlock; +#if DBG_ENABLE_GDIOBJ_BACKTRACES + PVOID apvBackTrace[GDI_OBJECT_STACK_LEVELS]; +#endif #if DBG_ENABLE_EVENT_LOGGING SLIST_HEADER slhLog; #endif Modified: trunk/reactos/win32ss/win32kp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/win32kp.h?rev=6637… ============================================================================== --- trunk/reactos/win32ss/win32kp.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/win32kp.h [iso-8859-1] Fri Feb 20 21:25:10 2015 @@ -23,6 +23,7 @@ /* Enable debugging features */ #define GDI_DEBUG 0 +#define DBG_ENABLE_GDIOBJ_BACKTRACES 0 #define DBG_ENABLE_EVENT_LOGGING 0 #define DBG_ENABLE_SERVICE_HOOKS 0

9 years, 7 months

[hbelusca] 66373: [EXPLORER]: Activate Logoff command. Patch by Lee Schroeder plus extra modifs. CORE-9104 #resolve

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Feb 20 20:08:52 2015 New Revision: 66373 URL: http://svn.reactos.org/svn/reactos?rev=66373&view=rev Log: [EXPLORER]: Activate Logoff command. Patch by Lee Schroeder plus extra modifs. CORE-9104 #resolve Modified: trunk/reactos/base/shell/explorer/traywnd.cpp trunk/reactos/boot/bootdata/hivedef.inf trunk/reactos/boot/bootdata/hivesft.inf trunk/reactos/include/reactos/undocshell.h Modified: trunk/reactos/base/shell/explorer/traywnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traywn… ============================================================================== --- trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] Fri Feb 20 20:08:52 2015 @@ -2622,8 +2622,8 @@ LRESULT OnDoExitWindows(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { /* - * TWM_DOEXITWINDOWS is send by the CDesktopBrowserr to us to - * show the shutdown dialog + * TWM_DOEXITWINDOWS is send by the CDesktopBrowser to us + * to show the shutdown dialog. */ return DoExitWindows(); } @@ -2717,7 +2717,6 @@ { switch (LOWORD(wParam)) { - /* FIXME: Handle these commands as well */ case IDM_TASKBARANDSTARTMENU: DisplayProperties(); break; @@ -2734,11 +2733,14 @@ DisplayRunFileDlg(); break; - /* FIXME: Handle these commands as well */ + /* FIXME: Handle these commands as well */ case IDM_SYNCHRONIZE: - case IDM_LOGOFF: case IDM_DISCONNECT: case IDM_UNDOCKCOMPUTER: + break; + + case IDM_LOGOFF: + LogoffWindowsDialog(m_hWnd); // FIXME: Maybe handle it in a similar way as DoExitWindows? break; case IDM_SHUTDOWN: Modified: trunk/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivedef.inf [iso-8859-1] Fri Feb 20 20:08:52 2015 @@ -1841,6 +1841,7 @@ HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\CLSID\{20D04FE0-3AEA-1069-A2D8-08002B30309D}",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced","ListviewShadow",0x00010001,0x00000001 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced","HideFileExt",0x00010001,0x00000000 +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced","StartMenuLogoff",0x00010001,0x00000001 ; default shell HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon",,0x00000012 Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Fri Feb 20 20:08:52 2015 @@ -112,7 +112,7 @@ HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\ShellServiceObjectDelayLoad",,0x00000012 -; FIXME - usetup doesn't handle extra paths +; FIXME - Setup doesn't handle extra paths HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\RunOnce","",0x00000000,"cmd /c md ""%programfiles%\Internet Explorer\"" && move %windir%\iexplore.exe ""%programfiles%\Internet Explorer\"" && ""%programfiles%\Internet Explorer\iexplore.exe"" /RegServer" ; Create .NET Framework InstallRoot key, reg_sz & full path HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\RunOnce","InstallRoot.NET",0x00000000,"cmd /c reg add HKLM\SOFTWARE\Microsoft\.NETFramework /v InstallRoot /t REG_SZ /d %SystemRoot%\Microsoft.NET\Framework\" Modified: trunk/reactos/include/reactos/undocshell.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/undocshell… ============================================================================== --- trunk/reactos/include/reactos/undocshell.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/undocshell.h [iso-8859-1] Fri Feb 20 20:08:52 2015 @@ -123,6 +123,7 @@ LPCWSTR lpstrDescription, UINT uFlags); +int WINAPI LogoffWindowsDialog(HWND hwndOwner); void WINAPI ExitWindowsDialog(HWND hwndOwner); BOOL WINAPI SHFindComputer(

9 years, 7 months

[hbelusca] 66372: Move explorer_old to the rosapps. CORE-9198 #resolve

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Feb 20 14:54:05 2015 New Revision: 66372 URL: http://svn.reactos.org/svn/reactos?rev=66372&view=rev Log: Move explorer_old to the rosapps. CORE-9198 #resolve Added: trunk/rosapps/applications/explorer-old/ - copied from r66369, trunk/reactos/base/shell/explorer-old/ Removed: trunk/reactos/base/shell/explorer-old/ Modified: trunk/reactos/base/shell/CMakeLists.txt trunk/rosapps/applications/CMakeLists.txt Modified: trunk/reactos/base/shell/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/CMakeLists.txt?… ============================================================================== --- trunk/reactos/base/shell/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/shell/CMakeLists.txt [iso-8859-1] Fri Feb 20 14:54:05 2015 @@ -1,6 +1,5 @@ add_subdirectory(cmd) add_subdirectory(explorer) -add_subdirectory(explorer-old) add_subdirectory(filebrowser) add_subdirectory(rshell) Modified: trunk/rosapps/applications/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/CMakeLists.tx… ============================================================================== --- trunk/rosapps/applications/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/CMakeLists.txt [iso-8859-1] Fri Feb 20 14:54:05 2015 @@ -1,5 +1,6 @@ add_subdirectory(cmdutils) add_subdirectory(devutils) +add_subdirectory(explorer-old) #add_subdirectory(fraginator) add_subdirectory(imagesoft) #add_subdirectory(net)

9 years, 7 months

[gadamopoulos] 66371: [WIN32K][CONSRV] - Silence a few more debug prints

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Feb 20 14:19:30 2015 New Revision: 66371 URL: http://svn.reactos.org/svn/reactos?rev=66371&view=rev Log: [WIN32K][CONSRV] - Silence a few more debug prints Modified: trunk/reactos/win32ss/user/ntuser/winpos.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/terminal.c Modified: trunk/reactos/win32ss/user/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winpos… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] Fri Feb 20 14:19:30 2015 @@ -327,7 +327,7 @@ /* If this is popup window, try to activate the owner first. */ if ((Wnd->style & WS_POPUP) && (WndTo = Wnd->spwndOwner)) { - ERR("WPAOW Popup with Owner\n"); + TRACE("WPAOW Popup with Owner\n"); WndTo = UserGetAncestor( WndTo, GA_ROOT ); if (can_activate_window(WndTo)) goto done; } @@ -2088,10 +2088,10 @@ pti->MessageQueue != gpqForeground ) // This fixes the breakage at boot time caused by the above line! { // Inside SAW? Fixes Api AttachThreadInput tests. - ERR("SetWindowPos Set FG Window! hWnd %p\n",WinPos.hwnd); + TRACE("SetWindowPos Set FG Window! hWnd %p\n",WinPos.hwnd); if (!(Window->state & WNDS_BEINGACTIVATED)) { - ERR("SetWindowPos Set FG Window!\n"); + TRACE("SetWindowPos Set FG Window!\n"); // Fixes SW_HIDE issues. Wine win test_SetActiveWindow & test_SetForegroundWindow. co_IntSetForegroundWindow(Window); } Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] Fri Feb 20 14:19:30 2015 @@ -762,9 +762,9 @@ LeaveCriticalSection(&Console->Lock); if (SetFocus) - DPRINT1("TODO: Create console caret\n"); + DPRINT("TODO: Create console caret\n"); else - DPRINT1("TODO: Destroy console caret\n"); + DPRINT("TODO: Destroy console caret\n"); } static VOID Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/terminal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/terminal.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/terminal.c [iso-8859-1] Fri Feb 20 14:19:30 2015 @@ -277,7 +277,7 @@ DPRINT1("InitFrontEnd failed, Status = 0x%08lx\n", Status); /** HACK HACK!! Be sure FrontEndIFace is correctly updated in the console!! **/ - DPRINT1("Using FrontEndIFace HACK(2), should be removed after proper implementation!\n"); + DPRINT("Using FrontEndIFace HACK(2), should be removed after proper implementation!\n"); Console->FrontEndIFace = *FrontEnd; return Status;

9 years, 7 months

[gadamopoulos] 66370: [WIN32K] - Silence several debug prints that spam the debug log for no reason

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Feb 20 13:42:22 2015 New Revision: 66370 URL: http://svn.reactos.org/svn/reactos?rev=66370&view=rev Log: [WIN32K] - Silence several debug prints that spam the debug log for no reason Modified: trunk/reactos/win32ss/gdi/eng/gradient.c trunk/reactos/win32ss/user/ntuser/focus.c trunk/reactos/win32ss/user/ntuser/menu.c trunk/reactos/win32ss/user/ntuser/window.c trunk/reactos/win32ss/user/ntuser/winsta.c Modified: trunk/reactos/win32ss/gdi/eng/gradient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/gradient.c… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/gradient.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/gradient.c [iso-8859-1] Fri Feb 20 13:42:22 2015 @@ -354,9 +354,9 @@ } } - DPRINT1("Triangle: (%i,%i) (%i,%i) (%i,%i)\n", v1->x, v1->y, v2->x, v2->y, v3->x, v3->y); + DPRINT("Triangle: (%i,%i) (%i,%i) (%i,%i)\n", v1->x, v1->y, v2->x, v2->y, v3->x, v3->y); /* FIXME: commented out because of an endless loop - fix triangles first */ - DPRINT1("FIXME: IntEngGradientFillTriangle is broken\n"); + DPRINT("FIXME: IntEngGradientFillTriangle is broken\n"); if (!IntEngEnter(&EnterLeave, psoDest, &FillRect, FALSE, &Translate, &psoOutput)) { Modified: trunk/reactos/win32ss/user/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/focus.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/focus.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/focus.c [iso-8859-1] Fri Feb 20 13:42:22 2015 @@ -337,7 +337,7 @@ Message->Msg.hwnd == UserHMGetHandle(Wnd) && Message->Msg.wParam == wParam) { - ERR("ASYNC SAW: Found one in the Sent Msg Queue! %p Activate/Deactivate %d\n", Message->Msg.hwnd, !!wParam); + WARN("ASYNC SAW: Found one in the Sent Msg Queue! %p Activate/Deactivate %d\n", Message->Msg.hwnd, !!wParam); RemoveEntryList(&Message->ListEntry); // Purge the entry. ClearMsgBitsMask(pti, Message->QS_Flags); ExFreePoolWithTag(Message, TAG_USRMSG); Modified: trunk/reactos/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] Fri Feb 20 13:42:22 2015 @@ -254,7 +254,7 @@ } if (UserObjectInDestroy(Menu->head.h)) { - ERR("Menu already dead!\n"); + WARN("Menu already dead!\n"); return FALSE; } ret = UserDeleteObject(Menu->head.h, TYPE_MENU); Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Fri Feb 20 13:42:22 2015 @@ -1411,7 +1411,7 @@ if (!(W32Thread = (PTHREADINFO)Thread->Tcb.Win32Thread)) { ObDereferenceObject(Thread); - ERR("Thread is not initialized!\n"); + TRACE("Tried to enumerate windows of a non gui thread\n"); return ERROR_INVALID_PARAMETER; } Modified: trunk/reactos/win32ss/user/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winsta… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] Fri Feb 20 13:42:22 2015 @@ -934,7 +934,7 @@ ppi->prpwinsta = NewWinSta; ppi->hwinsta = hWindowStation; ppi->amwinsta = hWindowStation != NULL ? ObjectHandleInfo.GrantedAccess : 0; - ERR("WS : Granted Access %p\n",ppi->amwinsta); + TRACE("WS : Granted Access %p\n",ppi->amwinsta); if (RtlAreAllAccessesGranted(ppi->amwinsta, WINSTA_READSCREEN)) {

9 years, 7 months

[tfaber] 66369: [NTOS:PS] - In PspExitThread, correctly set the ZeroInit field of the message before calling LpcRequestPort (which would otherwise complain with STATUS_INVALID_PARAMETER and fail to...

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Feb 20 12:04:57 2015 New Revision: 66369 URL: http://svn.reactos.org/svn/reactos?rev=66369&view=rev Log: [NTOS:PS] - In PspExitThread, correctly set the ZeroInit field of the message before calling LpcRequestPort (which would otherwise complain with STATUS_INVALID_PARAMETER and fail to send the message) - In NtRegisterThreadTerminatePort, dereference the port object in case of failure, not a null pointer CORE-9234 #resolve Modified: trunk/reactos/ntoskrnl/ps/kill.c Modified: trunk/reactos/ntoskrnl/ps/kill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/kill.c?rev=663… ============================================================================== --- trunk/reactos/ntoskrnl/ps/kill.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/kill.c [iso-8859-1] Fri Feb 20 12:04:57 2015 @@ -696,11 +696,11 @@ * port, which means that it died before being fully created. Since we * still have to notify an LPC Server, we'll use the exception port, * which we know exists. However, we need to know how far the thread - * actually got created. We have three possibilites: + * actually got created. We have three possibilities: * * - NtCreateThread returned an error really early: DeadThread is set. * - NtCreateThread managed to create the thread: DeadThread is off. - * - NtCreateThread was creating the thread (with Deadthread set, + * - NtCreateThread was creating the thread (with DeadThread set, * but the thread got killed prematurely: STATUS_THREAD_IS_TERMINATING * is our exit code.) * @@ -709,6 +709,7 @@ */ /* Setup the message header */ + TerminationMsg.h.u2.ZeroInit = 0; TerminationMsg.h.u2.s2.Type = LPC_CLIENT_DIED; TerminationMsg.h.u1.s1.TotalLength = sizeof(TerminationMsg); TerminationMsg.h.u1.s1.DataLength = sizeof(TerminationMsg) - @@ -1202,7 +1203,7 @@ if (!ExAcquireRundownProtection(&Process->RundownProtect)) { /* Failed to lock, fail */ - ObDereferenceObject (Process); + ObDereferenceObject(Process); return STATUS_PROCESS_IS_TERMINATING; } @@ -1372,6 +1373,6 @@ } /* Dereference and Fail */ - ObDereferenceObject(TerminationPort); + ObDereferenceObject(TerminationLpcPort); return STATUS_INSUFFICIENT_RESOURCES; }

9 years, 7 months

[tfaber] 66368: [KERNEL32_APITEST] - Use correct format specifier aka fix GCC build

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Feb 20 10:34:18 2015 New Revision: 66368 URL: http://svn.reactos.org/svn/reactos?rev=66368&view=rev Log: [KERNEL32_APITEST] - Use correct format specifier aka fix GCC build Modified: trunk/rostests/apitests/kernel32/TerminateProcess.c Modified: trunk/rostests/apitests/kernel32/TerminateProcess.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/Termina… ============================================================================== --- trunk/rostests/apitests/kernel32/TerminateProcess.c [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/TerminateProcess.c [iso-8859-1] Fri Feb 20 10:34:18 2015 @@ -136,7 +136,7 @@ Error = GetLastError(); ok_(File, Line)(hProcess == NULL, "OpenProcess succeeded unexpectedly for pid 0x%lx\n", ProcessId); ok_(File, Line)(Error == ERROR_INVALID_PARAMETER, "Error = %lu\n", Error); - ok_(File, Line)(ExitCode == ExpectedExitCode, "Exit code is %lu but expected %lu\n", ExitCode, ExpectedExitCode); + ok_(File, Line)(ExitCode == ExpectedExitCode, "Exit code is %lu but expected %u\n", ExitCode, ExpectedExitCode); } static

9 years, 7 months

← Newer
1
...
11
12
13
14
15
16
17
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2015