Ros-diffs

ros-diffs@reactos.org

81390 discussions

[weiden] 16418: some %x -> %p fixes
by weiden＠svn.reactos.com 04 Jul '05

04 Jul '05

some %x -> %p fixes Modified: trunk/reactos/lib/rtl/env.c Modified: trunk/reactos/lib/rtl/heap.c Modified: trunk/reactos/lib/rtl/image.c Modified: trunk/reactos/lib/rtl/process.c Modified: trunk/reactos/lib/rtl/unicode.c _____ Modified: trunk/reactos/lib/rtl/env.c --- trunk/reactos/lib/rtl/env.c 2005-07-04 22:22:22 UTC (rev 16417) +++ trunk/reactos/lib/rtl/env.c 2005-07-04 22:25:46 UTC (rev 16418) @@ -251,7 +251,7 @@ { PVOID EnvPtr; - DPRINT("NewEnvironment %x OldEnvironment %x\n", + DPRINT("NewEnvironment 0x%p OldEnvironment 0x%p\n", NewEnvironment, OldEnvironment); RtlAcquirePebLock(); _____ Modified: trunk/reactos/lib/rtl/heap.c --- trunk/reactos/lib/rtl/heap.c 2005-07-04 22:22:22 UTC (rev 16417) +++ trunk/reactos/lib/rtl/heap.c 2005-07-04 22:25:46 UTC (rev 16418) @@ -937,7 +937,7 @@ } while ( Frame != 0 && (ULONG)Frame != 0xDEADBEEF && (ULONG)Frame != 0xcdcdcdcd && (ULONG)Frame != 0xcccccccc && i++ < FrameCount ) { - DbgPrint("<%X>", (PVOID)Frame[1]); + DbgPrint("<%p>", (PVOID)Frame[1]); if (Frame[1] == 0xdeadbeef) break; Frame = (PULONG)Frame[0]; _____ Modified: trunk/reactos/lib/rtl/image.c --- trunk/reactos/lib/rtl/image.c 2005-07-04 22:22:22 UTC (rev 16417) +++ trunk/reactos/lib/rtl/image.c 2005-07-04 22:25:46 UTC (rev 16418) @@ -28,12 +28,12 @@ if (DosHeader && DosHeader->e_magic != IMAGE_DOS_SIGNATURE) { DPRINT1("DosHeader->e_magic %x\n", DosHeader->e_magic); - DPRINT1("NtHeader %x\n", (BaseAddress + DosHeader->e_lfanew)); + DPRINT1("NtHeader 0x%p\n", ((ULONG_PTR)BaseAddress + DosHeader->e_lfanew)); } if (DosHeader && DosHeader->e_magic == IMAGE_DOS_SIGNATURE) { - NtHeader = (PIMAGE_NT_HEADERS)(BaseAddress + DosHeader->e_lfanew); + NtHeader = (PIMAGE_NT_HEADERS)((ULONG_PTR)BaseAddress + DosHeader->e_lfanew); if (NtHeader->Signature == IMAGE_NT_SIGNATURE) return NtHeader; } _____ Modified: trunk/reactos/lib/rtl/process.c --- trunk/reactos/lib/rtl/process.c 2005-07-04 22:22:22 UTC (rev 16417) +++ trunk/reactos/lib/rtl/process.c 2005-07-04 22:25:46 UTC (rev 16418) @@ -35,7 +35,7 @@ RtlDeNormalizeProcessParams (Ppb); -// DbgPrint("ImagePathName %x\n", Ppb->ImagePathName.Buffer); +/* DbgPrint("ImagePathName 0x%p\n", Ppb->ImagePathName.Buffer); */ InitializeObjectAttributes(&ObjectAttributes, ImageFileName, _____ Modified: trunk/reactos/lib/rtl/unicode.c --- trunk/reactos/lib/rtl/unicode.c 2005-07-04 22:22:22 UTC (rev 16417) +++ trunk/reactos/lib/rtl/unicode.c 2005-07-04 22:25:46 UTC (rev 16418) @@ -516,7 +516,7 @@ { ULONG DestSize; - DPRINT("RtlInitUnicodeString(DestinationString %x, SourceString %x)\n", + DPRINT("RtlInitUnicodeString(DestinationString 0x%p, SourceString 0x%p)\n", DestinationString, SourceString);

1 0

[gdalsnes] 16417: fix premature close og reg key
by gdalsnes＠svn.reactos.com 04 Jul '05

04 Jul '05

fix premature close og reg key Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-07-04 22:11:00 UTC (rev 16416) +++ trunk/reactos/lib/setupapi/devinst.c 2005-07-04 22:22:22 UTC (rev 16417) @@ -1391,9 +1391,9 @@ SetupCloseInfFile(hInf); return FALSE; } - RegCloseKey(hClassKey); + /* Try to append a layout file */ #if 0 SetupOpenAppendInfFileW(NULL, hInf, NULL); @@ -1414,6 +1414,7 @@ if (FileQueue == INVALID_HANDLE_VALUE) { SetupCloseInfFile(hInf); + RegCloseKey(hClassKey); return FALSE; } @@ -1441,6 +1442,7 @@ SetupCloseInfFile(hInf); + RegCloseKey(hClassKey); return TRUE; }

1 0

[weiden] 16416: some %x -> %p fixes
by weiden＠svn.reactos.com 04 Jul '05

04 Jul '05

some %x -> %p fixes Modified: trunk/reactos/ntoskrnl/cc/copy.c Modified: trunk/reactos/ntoskrnl/cc/fs.c Modified: trunk/reactos/ntoskrnl/cc/pin.c Modified: trunk/reactos/ntoskrnl/cc/view.c Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c Modified: trunk/reactos/ntoskrnl/cm/regfile.c Modified: trunk/reactos/ntoskrnl/cm/registry.c Modified: trunk/reactos/ntoskrnl/cm/regobj.c Modified: trunk/reactos/ntoskrnl/dbgk/debug.c Modified: trunk/reactos/ntoskrnl/ex/event.c Modified: trunk/reactos/ntoskrnl/ex/evtpair.c Modified: trunk/reactos/ntoskrnl/ex/handle.c Modified: trunk/reactos/ntoskrnl/ex/lookas.c Modified: trunk/reactos/ntoskrnl/ex/mutant.c Modified: trunk/reactos/ntoskrnl/ex/resource.c Modified: trunk/reactos/ntoskrnl/ex/timer.c Modified: trunk/reactos/ntoskrnl/fs/filelock.c Modified: trunk/reactos/ntoskrnl/io/device.c Modified: trunk/reactos/ntoskrnl/io/disk.c Modified: trunk/reactos/ntoskrnl/io/driver.c Modified: trunk/reactos/ntoskrnl/io/file.c Modified: trunk/reactos/ntoskrnl/io/fs.c Modified: trunk/reactos/ntoskrnl/io/irp.c Modified: trunk/reactos/ntoskrnl/io/mdl.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnproot.c Modified: trunk/reactos/ntoskrnl/io/rawfs.c Modified: trunk/reactos/ntoskrnl/io/share.c Modified: trunk/reactos/ntoskrnl/io/timer.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c Modified: trunk/reactos/ntoskrnl/ke/catch.c _____ Modified: trunk/reactos/ntoskrnl/cc/copy.c --- trunk/reactos/ntoskrnl/cc/copy.c 2005-07-04 21:54:36 UTC (rev 16415) +++ trunk/reactos/ntoskrnl/cc/copy.c 2005-07-04 22:11:00 UTC (rev 16416) @@ -315,9 +315,9 @@ PLIST_ENTRY current_entry; PCACHE_SEGMENT current; - DPRINT("CcCopyRead(FileObject %x, FileOffset %x, " - "Length %d, Wait %d, Buffer %x, IoStatus %x)\n", - FileObject, (ULONG)FileOffset->QuadPart, Length, Wait, + DPRINT("CcCopyRead(FileObject 0x%p, FileOffset %I64x, " + "Length %d, Wait %d, Buffer 0x%p, IoStatus 0x%p)\n", + FileObject, FileOffset->QuadPart, Length, Wait, Buffer, IoStatus); Bcb = FileObject->SectionObjectPointer->SharedCacheMap; @@ -429,9 +429,9 @@ PVOID BaseAddress; BOOLEAN Valid; - DPRINT("CcCopyWrite(FileObject %x, FileOffset %x, " - "Length %d, Wait %d, Buffer %x)\n", - FileObject, (ULONG)FileOffset->QuadPart, Length, Wait, Buffer); + DPRINT("CcCopyWrite(FileObject 0x%p, FileOffset %I64x, " + "Length %d, Wait %d, Buffer 0x%p)\n", + FileObject, FileOffset->QuadPart, Length, Wait, Buffer); Bcb = FileObject->SectionObjectPointer->SharedCacheMap; WriteOffset = (ULONG)FileOffset->QuadPart; @@ -611,7 +611,7 @@ IO_STATUS_BLOCK Iosb; KEVENT Event; - DPRINT("CcZeroData(FileObject %x, StartOffset %I64x, EndOffset %I64x, " + DPRINT("CcZeroData(FileObject 0x%p, StartOffset %I64x, EndOffset %I64x, " "Wait %d)\n", FileObject, StartOffset->QuadPart, EndOffset->QuadPart, Wait); _____ Modified: trunk/reactos/ntoskrnl/cc/fs.c --- trunk/reactos/ntoskrnl/cc/fs.c 2005-07-04 21:54:36 UTC (rev 16415) +++ trunk/reactos/ntoskrnl/cc/fs.c 2005-07-04 22:11:00 UTC (rev 16416) @@ -134,7 +134,7 @@ LIST_ENTRY FreeListHead; NTSTATUS Status; - DPRINT("CcSetFileSizes(FileObject %x, FileSizes %x)\n", + DPRINT("CcSetFileSizes(FileObject 0x%p, FileSizes 0x%p)\n", FileObject, FileSizes); DPRINT("AllocationSize %d, FileSize %d, ValidDataLength %d\n", (ULONG)FileSizes->AllocationSize.QuadPart, @@ -196,7 +196,7 @@ Status = CcRosInternalFreeCacheSegment(current); if (!NT_SUCCESS(Status)) { - DPRINT1("CcRosInternalFreeCacheSegment failed, status = %x\n"); + DPRINT1("CcRosInternalFreeCacheSegment failed, status = %x\n", Status); KEBUGCHECK(0); } } _____ Modified: trunk/reactos/ntoskrnl/cc/pin.c --- trunk/reactos/ntoskrnl/cc/pin.c 2005-07-04 21:54:36 UTC (rev 16415) +++ trunk/reactos/ntoskrnl/cc/pin.c 2005-07-04 22:11:00 UTC (rev 16416) @@ -39,17 +39,17 @@ PINTERNAL_BCB iBcb; ULONG ROffset; - DPRINT("CcMapData(FileObject %x, FileOffset %d, Length %d, Wait %d," - " pBcb %x, pBuffer %x)\n", FileObject, (ULONG)FileOffset->QuadPart, + DPRINT("CcMapData(FileObject 0x%p, FileOffset %I64x, Length %d, Wait %d," + " pBcb 0x%p, pBuffer 0x%p)\n", FileObject, FileOffset->QuadPart, Length, Wait, pBcb, pBuffer); ReadOffset = (ULONG)FileOffset->QuadPart; Bcb = FileObject->SectionObjectPointer->SharedCacheMap; ASSERT(Bcb); - DPRINT("AllocationSize %d, FileSize %d\n", - (ULONG)Bcb->AllocationSize.QuadPart, - (ULONG)Bcb->FileSize.QuadPart); + DPRINT("AllocationSize %I64x, FileSize %I64x\n", + Bcb->AllocationSize.QuadPart, + Bcb->FileSize.QuadPart); if (ReadOffset % Bcb->CacheSegmentSize + Length > Bcb->CacheSegmentSize) { _____ Modified: trunk/reactos/ntoskrnl/cc/view.c --- trunk/reactos/ntoskrnl/cc/view.c 2005-07-04 21:54:36 UTC (rev 16415) +++ trunk/reactos/ntoskrnl/cc/view.c 2005-07-04 22:11:00 UTC (rev 16416) @@ -295,7 +295,7 @@ ASSERT(Bcb); - DPRINT("CcReleaseCacheSegment(Bcb %x, CacheSeg %x, Valid %d)\n", + DPRINT("CcReleaseCacheSegment(Bcb 0x%p, CacheSeg 0x%p, Valid %d)\n", Bcb, CacheSeg, Valid); CacheSeg->Valid = Valid; @@ -340,7 +340,7 @@ ASSERT(Bcb); - DPRINT("CcRosLookupCacheSegment(Bcb %x, FileOffset %d)\n", Bcb, FileOffset); + DPRINT("CcRosLookupCacheSegment(Bcb -x%p, FileOffset %d)\n", Bcb, FileOffset); KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); current_entry = Bcb->BcbSegmentListHead.Flink; @@ -370,7 +370,7 @@ ASSERT(Bcb); - DPRINT("CcRosMarkDirtyCacheSegment(Bcb %x, FileOffset %d)\n", Bcb, FileOffset); + DPRINT("CcRosMarkDirtyCacheSegment(Bcb 0x%p, FileOffset %d)\n", Bcb, FileOffset); CacheSeg = CcRosLookupCacheSegment(Bcb, FileOffset); if (CacheSeg == NULL) @@ -407,7 +407,7 @@ ASSERT(Bcb); - DPRINT("CcRosUnmapCacheSegment(Bcb %x, FileOffset %d, NowDirty %d)\n", + DPRINT("CcRosUnmapCacheSegment(Bcb 0x%p, FileOffset %d, NowDirty %d)\n", Bcb, FileOffset, NowDirty); CacheSeg = CcRosLookupCacheSegment(Bcb, FileOffset); @@ -760,7 +760,7 @@ PFN_TYPE Page; KIRQL oldIrql; #endif - DPRINT("Freeing cache segment %x\n", CacheSeg); + DPRINT("Freeing cache segment 0x%p\n", CacheSeg); #ifdef CACHE_BITMAP RegionSize = CacheSeg->Bcb->CacheSegmentSize / PAGE_SIZE; @@ -804,7 +804,7 @@ ASSERT(Bcb); - DPRINT("CcRosFreeCacheSegment(Bcb %x, CacheSeg %x)\n", + DPRINT("CcRosFreeCacheSegment(Bcb 0x%p, CacheSeg 0x%p)\n", Bcb, CacheSeg); ExAcquireFastMutex(&ViewLock); @@ -840,7 +840,7 @@ NTSTATUS Status; KIRQL oldIrql; - DPRINT("CcFlushCache(SectionObjectPointers %x, FileOffset %x, Length %d, IoStatus %x)\n", + DPRINT("CcFlushCache(SectionObjectPointers 0x%p, FileOffset 0x%p, Length %d, IoStatus 0x%p)\n", SectionObjectPointers, FileOffset, Length, IoStatus); if (SectionObjectPointers && SectionObjectPointers->SharedCacheMap) @@ -1118,7 +1118,7 @@ PBCB Bcb; Bcb = FileObject->SectionObjectPointer->SharedCacheMap; - DPRINT("CcRosInitializeFileCache(FileObject %x, *Bcb %x, CacheSegmentSize %d)\n", + DPRINT("CcRosInitializeFileCache(FileObject 0x%p, Bcb 0x%p, CacheSegmentSize %d)\n", FileObject, Bcb, CacheSegmentSize); ExAcquireFastMutex(&ViewLock); _____ Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c --- trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-07-04 21:54:36 UTC (rev 16415) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-07-04 22:11:00 UTC (rev 16416) @@ -49,8 +49,8 @@ PAGED_CODE(); - DPRINT("CmpFindObject(ObjectAttributes %x, ReturnedObject %x, " - "RemainingPath %x)\n",ObjectAttributes,ReturnedObject,RemainingPath); + DPRINT("CmpFindObject(ObjectAttributes 0x%p, ReturnedObject 0x%p, " + "RemainingPath 0x%p)\n",ObjectAttributes,ReturnedObject,RemainingPath); DPRINT("ObjectAttributes->ObjectName %wZ\n", ObjectAttributes->ObjectName); @@ -326,7 +326,7 @@ PAGED_CODE(); - DPRINT("NtCreateKey (Name %wZ KeyHandle %x Root %x)\n", + DPRINT("NtCreateKey (Name %wZ KeyHandle 0x%p Root 0x%p)\n", ObjectAttributes->ObjectName, KeyHandle, ObjectAttributes->RootDirectory); @@ -386,7 +386,7 @@ } } - DPRINT("RemainingPath %S ParentObject %x\n", RemainingPath.Buffer, Object); + DPRINT("RemainingPath %S ParentObject 0x%p\n", RemainingPath.Buffer, Object); Status = ObCreateObject(ExGetPreviousMode(), CmiKeyType, @@ -511,7 +511,7 @@ PAGED_CODE(); - DPRINT("NtDeleteKey(KeyHandle %x) called\n", KeyHandle); + DPRINT("NtDeleteKey(KeyHandle 0x%p) called\n", KeyHandle); PreviousMode = ExGetPreviousMode(); @@ -599,7 +599,7 @@ PreviousMode = ExGetPreviousMode(); - DPRINT("KH %x I %d KIC %x KI %x L %d RL %x\n", + DPRINT("KH 0x%p I %d KIC %x KI 0x%p L %d RL 0x%p\n", KeyHandle, Index, KeyInformationClass, @@ -947,7 +947,7 @@ PAGED_CODE(); - DPRINT("KH %x I %d KVIC %x KVI %x L %d RL %x\n", + DPRINT("KH 0x%p I %d KVIC %x KVI 0x%p L %d RL 0x%p\n", KeyHandle, Index, KeyValueInformationClass, @@ -1241,7 +1241,7 @@ PAGED_CODE(); - DPRINT("NtOpenKey(KH %x DA %x OA %x OA->ON '%wZ'\n", + DPRINT("NtOpenKey(KH 0x%p DA %x OA 0x%p OA->ON '%wZ'\n", KeyHandle, DesiredAccess, ObjectAttributes, @@ -1358,7 +1358,7 @@ PAGED_CODE(); - DPRINT("NtQueryKey(KH %x KIC %x KI %x L %d RL %x)\n", + DPRINT("NtQueryKey(KH 0x%p KIC %x KI 0x%p L %d RL 0x%p)\n", KeyHandle, KeyInformationClass, KeyInformation, @@ -1568,7 +1568,7 @@ PAGED_CODE(); - DPRINT("NtQueryValueKey(KeyHandle %x ValueName %S Length %x)\n", + DPRINT("NtQueryValueKey(KeyHandle 0x%p ValueName %S Length %x)\n", KeyHandle, ValueName->Buffer, Length); /* Verify that the handle is valid and is a registry key */ @@ -1810,7 +1810,7 @@ PAGED_CODE(); - DPRINT("NtSetValueKey(KeyHandle %x ValueName '%wZ' Type %d)\n", + DPRINT("NtSetValueKey(KeyHandle 0x%p ValueName '%wZ' Type %d)\n", KeyHandle, ValueName, Type); DesiredAccess = KEY_SET_VALUE; _____ Modified: trunk/reactos/ntoskrnl/cm/regfile.c --- trunk/reactos/ntoskrnl/cm/regfile.c 2005-07-04 21:54:36 UTC (rev 16415) +++ trunk/reactos/ntoskrnl/cm/regfile.c 2005-07-04 22:11:00 UTC (rev 16416) @@ -1068,7 +1068,7 @@ RtlZeroMemory (Hive, sizeof(REGISTRY_HIVE)); - DPRINT("Hive %x\n", Hive); + DPRINT("Hive 0x%p\n", Hive); Hive->HiveHeader = (PHIVE_HEADER)ExAllocatePool (NonPagedPool, sizeof(HIVE_HEADER)); @@ -1138,7 +1138,7 @@ RtlZeroMemory (Hive, sizeof(REGISTRY_HIVE)); - DPRINT ("Hive %x\n", Hive); + DPRINT ("Hive 0x%p\n", Hive); Hive->HiveHeader = (PHIVE_HEADER)ExAllocatePool (NonPagedPool, REG_BLOCK_SIZE); @@ -1151,7 +1151,7 @@ RtlZeroMemory (Hive->HiveHeader, REG_BLOCK_SIZE); - DPRINT ("HiveHeader %x\n", Hive->HiveHeader); + DPRINT ("HiveHeader 0x%p\n", Hive->HiveHeader); Hive->Flags = HIVE_NO_FILE; @@ -1260,7 +1260,7 @@ RtlZeroMemory (Hive, sizeof(REGISTRY_HIVE)); - DPRINT ("Hive %x\n", Hive); + DPRINT ("Hive 0x%p\n", Hive); Hive->Flags = (Flags & REG_NO_LAZY_FLUSH) ? HIVE_NO_SYNCH : 0; Hive->HiveHeader = (PHIVE_HEADER)ExAllocatePool(NonPagedPool, _____ Modified: trunk/reactos/ntoskrnl/cm/registry.c --- trunk/reactos/ntoskrnl/cm/registry.c 2005-07-04 21:54:36 UTC (rev 16415) +++ trunk/reactos/ntoskrnl/cm/registry.c 2005-07-04 22:11:00 UTC (rev 16416) @@ -1270,7 +1270,7 @@ ExReleaseResourceLite(&CmiRegistryLock); KeLeaveCriticalRegion(); - DPRINT("DeferredContext %x\n", DeferredContext); + DPRINT("DeferredContext 0x%p\n", DeferredContext); ExFreePool(DeferredContext); DPRINT("CmiHiveSyncRoutine() done\n"); @@ -1297,7 +1297,7 @@ CmiHiveSyncRoutine, WorkQueueItem); - DPRINT("DeferredContext %x\n", WorkQueueItem); + DPRINT("DeferredContext 0x%p\n", WorkQueueItem); ExQueueWorkItem(WorkQueueItem, CriticalWorkQueue); } _____ Modified: trunk/reactos/ntoskrnl/cm/regobj.c --- trunk/reactos/ntoskrnl/cm/regobj.c 2005-07-04 21:54:36 UTC (rev 16415) +++ trunk/reactos/ntoskrnl/cm/regobj.c 2005-07-04 22:11:00 UTC (rev 16416) @@ -196,7 +196,7 @@ RtlpCreateUnicodeString(&FoundObject->Name, KeyName.Buffer, NonPagedPool); CmiAddKeyToList(ParsedKey, FoundObject); - DPRINT("Created object 0x%x\n", FoundObject); + DPRINT("Created object 0x%p\n", FoundObject); } else { @@ -578,7 +578,7 @@ /* to allow a dichotomic search */ ParentKey->SubKeys[ParentKey->NumberOfSubKeys++] = NewKey; - DPRINT("Reference parent key: 0x%x\n", ParentKey); + DPRINT("Reference parent key: 0x%p\n", ParentKey); ObReferenceObjectByPointer(ParentKey, STANDARD_RIGHTS_REQUIRED, _____ Modified: trunk/reactos/ntoskrnl/dbgk/debug.c --- trunk/reactos/ntoskrnl/dbgk/debug.c 2005-07-04 21:54:36 UTC (rev 16415) +++ trunk/reactos/ntoskrnl/dbgk/debug.c 2005-07-04 22:11:00 UTC (rev 16416) @@ -29,7 +29,7 @@ NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); - DPRINT("NtCreateDebugObject(0x%x, 0x%x, 0x%x)\n", DebugHandle, DesiredAccess, ObjectAttributes); + DPRINT("NtCreateDebugObject(0x%p, 0x%x, 0x%p)\n", DebugHandle, DesiredAccess, ObjectAttributes); /* Check Output Safety */ if(PreviousMode != KernelMode) { _____ Modified: trunk/reactos/ntoskrnl/ex/event.c --- trunk/reactos/ntoskrnl/ex/event.c 2005-07-04 21:54:36 UTC (rev 16415) +++ trunk/reactos/ntoskrnl/ex/event.c 2005-07-04 22:11:00 UTC (rev 16416) @@ -103,7 +103,7 @@ NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); - DPRINT("NtCreateEvent(0x%x, 0x%x, 0x%x)\n", EventHandle, DesiredAccess, ObjectAttributes); + DPRINT("NtCreateEvent(0x%p, 0x%x, 0x%p)\n", EventHandle, DesiredAccess, ObjectAttributes); /* Check Output Safety */ if(PreviousMode != KernelMode) { @@ -183,7 +183,7 @@ NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); - DPRINT("NtOpenEvent(0x%x, 0x%x, 0x%x)\n", EventHandle, DesiredAccess, ObjectAttributes); + DPRINT("NtOpenEvent(0x%p, 0x%x, 0x%p)\n", EventHandle, DesiredAccess, ObjectAttributes); /* Check Output Safety */ if(PreviousMode != KernelMode) { @@ -314,7 +314,7 @@ PEVENT_BASIC_INFORMATION BasicInfo = (PEVENT_BASIC_INFORMATION)EventInformation; PAGED_CODE(); - DPRINT("NtQueryEvent(0x%x, 0x%x, 0x%x)\n", EventHandle, EventInformationClass); + DPRINT("NtQueryEvent(0x%p, 0x%x)\n", EventHandle, EventInformationClass); /* Check buffers and class validity */ DefaultQueryInfoBufferCheck(EventInformationClass, _____ Modified: trunk/reactos/ntoskrnl/ex/evtpair.c --- trunk/reactos/ntoskrnl/ex/evtpair.c 2005-07-04 21:54:36 UTC (rev 16415) +++ trunk/reactos/ntoskrnl/ex/evtpair.c 2005-07-04 22:11:00 UTC (rev 16416) @@ -62,7 +62,7 @@ NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); - DPRINT("NtCreateEventPair: %x\n", EventPairHandle); + DPRINT("NtCreateEventPair: 0x%p\n", EventPairHandle); /* Check Output Safety */ if(PreviousMode == UserMode) { @@ -194,7 +194,7 @@ NTSTATUS Status; PAGED_CODE(); - DPRINT("NtSetHighEventPair(EventPairHandle %x)\n", EventPairHandle); + DPRINT("NtSetHighEventPair(EventPairHandle 0x%p)\n", EventPairHandle); /* Open the Object */ Status = ObReferenceObjectByHandle(EventPairHandle, @@ -227,7 +227,7 @@ NTSTATUS Status; PAGED_CODE(); - DPRINT("NtSetHighWaitLowEventPair(EventPairHandle %x)\n", EventPairHandle); + DPRINT("NtSetHighWaitLowEventPair(EventPairHandle 0x%p)\n", EventPairHandle); /* Open the Object */ Status = ObReferenceObjectByHandle(EventPairHandle, @@ -270,7 +270,7 @@ PreviousMode = ExGetPreviousMode(); - DPRINT1("NtSetHighEventPair(EventPairHandle %x)\n", EventPairHandle); + DPRINT1("NtSetHighEventPair(EventPairHandle 0x%p)\n", EventPairHandle); /* Open the Object */ Status = ObReferenceObjectByHandle(EventPairHandle, @@ -303,7 +303,7 @@ NTSTATUS Status; PAGED_CODE(); - DPRINT("NtSetHighWaitLowEventPair(EventPairHandle %x)\n", EventPairHandle); + DPRINT("NtSetHighWaitLowEventPair(EventPairHandle 0x%p)\n", EventPairHandle); /* Open the Object */ Status = ObReferenceObjectByHandle(EventPairHandle, @@ -344,7 +344,7 @@ NTSTATUS Status; PAGED_CODE(); - DPRINT("NtSetHighWaitLowEventPair(EventPairHandle %x)\n", EventPairHandle); + DPRINT("NtSetHighWaitLowEventPair(EventPairHandle 0x%p)\n", EventPairHandle); /* Open the Object */ Status = ObReferenceObjectByHandle(EventPairHandle, @@ -381,7 +381,7 @@ NTSTATUS Status; PAGED_CODE(); - DPRINT("NtSetHighWaitLowEventPair(EventPairHandle %x)\n", EventPairHandle); + DPRINT("NtSetHighWaitLowEventPair(EventPairHandle 0x%p)\n", EventPairHandle); /* Open the Object */ Status = ObReferenceObjectByHandle(EventPairHandle, _____ Modified: trunk/reactos/ntoskrnl/ex/handle.c --- trunk/reactos/ntoskrnl/ex/handle.c 2005-07-04 21:54:36 UTC (rev 16415) +++ trunk/reactos/ntoskrnl/ex/handle.c 2005-07-04 22:11:00 UTC (rev 16416) @@ -166,7 +166,7 @@ PAGED_CODE(); - DPRINT("Entering handle table entry 0x%x lock...\n", Entry); + DPRINT("Entering handle table entry 0x%p lock...\n", Entry); ASSERT(HandleTable); ASSERT(Entry); @@ -177,7 +177,7 @@ if(!Current) { - DPRINT("Attempted to lock empty handle table entry 0x%x or handle table shut down\n", Entry); + DPRINT("Attempted to lock empty handle table entry 0x%p or handle table shut down\n", Entry); break; } @@ -188,7 +188,7 @@ (PVOID)New, (PVOID)Current) == (PVOID)Current) { - DPRINT("SUCCESS handle table 0x%x entry 0x%x lock\n", HandleTable, Entry); + DPRINT("SUCCESS handle table 0x%p entry 0x%p lock\n", HandleTable, Entry); /* we acquired the lock */ return TRUE; } @@ -399,7 +399,7 @@ else { freehandletable: - DPRINT1("Failed to duplicate handle table 0x%x\n", SourceHandleTable); + DPRINT1("Failed to duplicate handle table 0x%p\n", SourceHandleTable); ExReleaseHandleTableLock(SourceHandleTable); @@ -501,7 +501,7 @@ ASSERT(Handle); ASSERT(KeGetCurrentThread() != NULL); - DPRINT("HT[0x%x]: HandleCount: %d\n", HandleTable, HandleTable->HandleCount); + DPRINT("HT[0x%p]: HandleCount: %d\n", HandleTable, HandleTable->HandleCount); if(HandleTable->HandleCount < EX_MAX_HANDLES) { @@ -549,7 +549,7 @@ ASSERT(ELI_FROM_HANDLE(HandleTable->NextIndexNeedingPool) == 0); - DPRINT("HandleTable->Table[%d] == 0x%x\n", tli, HandleTable->Table[tli]); + DPRINT("HandleTable->Table[%d] == 0x%p\n", tli, HandleTable->Table[tli]); /* allocate a middle level entry list if required */ nmtbl = HandleTable->Table[tli]; @@ -592,7 +592,7 @@ ASSERT(nmtbl[mli] == NULL); } - DPRINT("HandleTable->Table[%d][%d] == 0x%x\n", tli, mli, nmtbl[mli]); + DPRINT("HandleTable->Table[%d][%d] == 0x%p\n", tli, mli, nmtbl[mli]); if(HandleTable->QuotaProcess != NULL) { @@ -660,7 +660,7 @@ } else { - DPRINT1("Can't allocate any more handles in handle table 0x%x!\n", HandleTable); + DPRINT1("Can't allocate any more handles in handle table 0x%p!\n", HandleTable); } return Entry; @@ -677,7 +677,7 @@ ASSERT(Entry); ASSERT(IS_VALID_EX_HANDLE(Handle)); - DPRINT("ExpFreeHandleTableEntry HT:0x%x Entry:0x%x\n", HandleTable, Entry); + DPRINT("ExpFreeHandleTableEntry HT:0x%p Entry:0x%p\n", HandleTable, Entry); /* automatically unlock the entry if currently locked. We however don't notify anyone who waited on the handle because we're holding an exclusive lock after @@ -713,7 +713,7 @@ mlp != NULL && mlp[mli] != NULL && mlp[mli][eli].u1.Object != NULL) { Entry = &mlp[mli][eli]; - DPRINT("handle lookup 0x%x -> entry 0x%x [HT:0x%x] ptr: 0x%x\n", Handle, Entry, HandleTable, mlp[mli][eli].u1.Object); + DPRINT("handle lookup 0x%x -> entry 0x%p [HT:0x%p] ptr: 0x%p\n", Handle, Entry, HandleTable, mlp[mli][eli].u1.Object); } } else @@ -732,7 +732,7 @@ PAGED_CODE(); - DPRINT("Entering handle table entry 0x%x lock...\n", Entry); + DPRINT("Entering handle table entry 0x%p lock...\n", Entry); ASSERT(HandleTable); ASSERT(Entry); @@ -743,7 +743,7 @@ if(!Current || (HandleTable->Flags & EX_HANDLE_TABLE_CLOSING)) { - DPRINT("Attempted to lock empty handle table entry 0x%x or handle table shut down\n", Entry); + DPRINT("Attempted to lock empty handle table entry 0x%p or handle table shut down\n", Entry); break; } @@ -754,7 +754,7 @@ (PVOID)New, (PVOID)Current) == (PVOID)Current) { - DPRINT("SUCCESS handle table 0x%x entry 0x%x lock\n", HandleTable, Entry); + DPRINT("SUCCESS handle table 0x%p entry 0x%p lock\n", HandleTable, Entry); /* we acquired the lock */ return TRUE; } @@ -785,7 +785,7 @@ ASSERT(HandleTable); ASSERT(Entry); - DPRINT("ExUnlockHandleTableEntry HT:0x%x Entry:0x%x\n", HandleTable, Entry); + DPRINT("ExUnlockHandleTableEntry HT:0x%p Entry:0x%p\n", HandleTable, Entry); Current = (volatile ULONG_PTR)Entry->u1.Object; @@ -885,7 +885,7 @@ /* This routine requires the entry to be locked */ ASSERT((ULONG_PTR)Entry->u1.Object & EX_HANDLE_ENTRY_LOCKED); - DPRINT("DestroyHandleByEntry HT:0x%x Entry:0x%x\n", HandleTable, Entry); + DPRINT("DestroyHandleByEntry HT:0x%p Entry:0x%p\n", HandleTable, Entry); KeEnterCriticalRegion(); ExAcquireHandleTableLockExclusive(HandleTable); @@ -914,7 +914,7 @@ Handle); if (HandleTableEntry != NULL && ExLockHandleTableEntry(HandleTable, HandleTableEntry)) { - DPRINT("ExMapHandleToPointer HT:0x%x Entry:0x%x locked\n", HandleTable, HandleTableEntry); + DPRINT("ExMapHandleToPointer HT:0x%p Entry:0x%p locked\n", HandleTable, HandleTableEntry); return HandleTableEntry; } _____ Modified: trunk/reactos/ntoskrnl/ex/lookas.c --- trunk/reactos/ntoskrnl/ex/lookas.c 2005-07-04 21:54:36 UTC (rev 16415) +++ trunk/reactos/ntoskrnl/ex/lookas.c 2005-07-04 22:11:00 UTC (rev 16416) @@ -139,7 +139,7 @@ ULONG Tag, USHORT Depth) { - DPRINT("Initializing nonpaged lookaside list at 0x%X\n", Lookaside); + DPRINT("Initializing nonpaged lookaside list at 0x%p\n", Lookaside); /* Initialize the Header */ ExInitializeSListHead(&Lookaside->L.ListHead); @@ -194,7 +194,7 @@ ULONG Tag, USHORT Depth) { - DPRINT("Initializing paged lookaside list at 0x%X\n", Lookaside); + DPRINT("Initializing paged lookaside list at 0x%p\n", Lookaside); /* Initialize the Header */ ExInitializeSListHead(&Lookaside->L.ListHead); _____ Modified: trunk/reactos/ntoskrnl/ex/mutant.c --- trunk/reactos/ntoskrnl/ex/mutant.c 2005-07-04 21:54:36 UTC (rev 16415) +++ trunk/reactos/ntoskrnl/ex/mutant.c 2005-07-04 22:11:00 UTC (rev 16416) @@ -40,7 +40,7 @@ ExpDeleteMutant(PVOID ObjectBody) { - DPRINT("ExpDeleteMutant(ObjectBody %x)\n", ObjectBody); + DPRINT("ExpDeleteMutant(ObjectBody 0x%p)\n", ObjectBody); /* Make sure to release the Mutant */ KeReleaseMutant((PKMUTANT)ObjectBody, @@ -87,7 +87,7 @@ NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); - DPRINT("NtCreateMutant(0x%x, 0x%x, 0x%x)\n", MutantHandle, DesiredAccess, ObjectAttributes); + DPRINT("NtCreateMutant(0x%p, 0x%x, 0x%p)\n", MutantHandle, DesiredAccess, ObjectAttributes); /* Check Output Safety */ if(PreviousMode == UserMode) { @@ -166,7 +166,7 @@ NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); - DPRINT("NtOpenMutant(0x%x, 0x%x, 0x%x)\n", MutantHandle, DesiredAccess, ObjectAttributes); + DPRINT("NtOpenMutant(0x%p, 0x%x, 0x%p)\n", MutantHandle, DesiredAccess, ObjectAttributes); /* Check Output Safety */ if(PreviousMode == UserMode) { @@ -296,7 +296,7 @@ PreviousMode = ExGetPreviousMode(); - DPRINT("NtReleaseMutant(MutantHandle 0%x PreviousCount 0%x)\n", + DPRINT("NtReleaseMutant(MutantHandle 0x%p PreviousCount 0x%p)\n", MutantHandle, PreviousCount); _____ Modified: trunk/reactos/ntoskrnl/ex/resource.c --- trunk/reactos/ntoskrnl/ex/resource.c 2005-07-04 21:54:36 UTC (rev 16415) +++ trunk/reactos/ntoskrnl/ex/resource.c 2005-07-04 22:11:00 UTC (rev 16416) @@ -100,7 +100,7 @@ { KIRQL oldIrql; - DPRINT("ExAcquireResourceExclusiveLite(Resource %x, Wait %d)\n", + DPRINT("ExAcquireResourceExclusiveLite(Resource 0x%p, Wait %d)\n", Resource, Wait); ASSERT_IRQL_LESS(DISPATCH_LEVEL); @@ -222,7 +222,7 @@ POWNER_ENTRY freeEntry; ULONG i = 0; - DPRINT("EiAddSharedOwner(Resource %x)\n", Resource); + DPRINT("EiAddSharedOwner(Resource 0x%p)\n", Resource); if (Resource->ActiveCount == 0) { @@ -292,7 +292,7 @@ } } - DPRINT("Found free entry %x\n", freeEntry); + DPRINT("Found free entry 0x%p\n", freeEntry); if (!freeEntry) { @@ -346,7 +346,7 @@ { KIRQL oldIrql; - DPRINT("ExAcquireResourceSharedLite(Resource %x, Wait %d)\n", + DPRINT("ExAcquireResourceSharedLite(Resource 0x%p, Wait %d)\n", Resource, Wait); ASSERT_IRQL_LESS(DISPATCH_LEVEL); @@ -438,7 +438,7 @@ ULONG oldWaiters; KIRQL oldIrql; - DPRINT("ExConvertExclusiveToSharedLite(Resource %x)\n", Resource); + DPRINT("ExConvertExclusiveToSharedLite(Resource 0x%p)\n", Resource); KeAcquireSpinLock(&Resource->SpinLock, &oldIrql); @@ -519,7 +519,7 @@ { KIRQL oldIrql; - DPRINT("ExAcquireSharedStarveExclusive(Resource %x, Wait %d)\n", + DPRINT("ExAcquireSharedStarveExclusive(Resource 0x%p, Wait %d)\n", Resource, Wait); KeAcquireSpinLock(&Resource->SpinLock, &oldIrql); @@ -610,7 +610,7 @@ PERESOURCE Resource ) { - DPRINT("ExDeleteResourceLite(Resource %x)\n", Resource); + DPRINT("ExDeleteResourceLite(Resource 0x%p)\n", Resource); if (Resource->OwnerTable) ExFreePool(Resource->OwnerTable); if (Resource->SharedWaiters) ExFreePool(Resource->SharedWaiters); if (Resource->ExclusiveWaiters) ExFreePool(Resource->ExclusiveWaiters); @@ -652,7 +652,7 @@ NTSTATUS STDCALL ExInitializeResourceLite (PERESOURCE Resource) { - DPRINT("ExInitializeResourceLite(Resource %x)\n", Resource); + DPRINT("ExInitializeResourceLite(Resource 0x%p)\n", Resource); memset(Resource,0,sizeof(ERESOURCE)); Resource->NumberOfSharedWaiters = 0; Resource->NumberOfExclusiveWaiters = 0; @@ -822,7 +822,7 @@ { KIRQL oldIrql; - DPRINT("ExReleaseResourceForThreadLite(Resource %x, ResourceThreadId %x)\n", + DPRINT("ExReleaseResourceForThreadLite(Resource 0x%p, ResourceThreadId 0x%p)\n", Resource, ResourceThreadId); ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL); _____ Modified: trunk/reactos/ntoskrnl/ex/timer.c --- trunk/reactos/ntoskrnl/ex/timer.c 2005-07-04 21:54:36 UTC (rev 16415) +++ trunk/reactos/ntoskrnl/ex/timer.c 2005-07-04 22:11:00 UTC (rev 16416) @@ -78,7 +78,7 @@ ASSERT (Timer->ApcAssociated); Timer->ApcAssociated = FALSE; - DPRINT("Timer, ThreadList: %x, %x\n", Timer, Thread); + DPRINT("Timer, ThreadList: 0x%p, 0x%p\n", Timer, Thread); /* Unlock the list */ KeReleaseSpinLockFromDpcLevel(&Thread->ActiveTimerListLock); @@ -113,7 +113,7 @@ KIRQL OldIrql; PETIMER Timer = ObjectBody; - DPRINT("ExpDeleteTimer(Timer: %x)\n", Timer); + DPRINT("ExpDeleteTimer(Timer: 0x%p)\n", Timer); /* Lock the Wake List */ KeAcquireSpinLock(&ExpWakeListLock, &OldIrql); @@ -145,7 +145,7 @@ PETIMER Timer; KIRQL OldIrql; - DPRINT("ExpTimerDpcRoutine(Dpc: %x)\n", Dpc); + DPRINT("ExpTimerDpcRoutine(Dpc: 0x%p)\n", Dpc); /* Get the Timer Object */ Timer = (PETIMER)DeferredContext; @@ -182,7 +182,7 @@ /* We need to find out which Timer we are */ Timer = CONTAINING_RECORD(Apc, ETIMER, TimerApc); - DPRINT("ExpTimerApcKernelRoutine(Apc: %x. Timer: %x)\n", Apc, Timer); + DPRINT("ExpTimerApcKernelRoutine(Apc: 0x%p. Timer: 0x%p)\n", Apc, Timer); /* Lock the Timer */ KeAcquireSpinLock(&Timer->Lock, &OldIrql); @@ -259,7 +259,7 @@ NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); - DPRINT("NtCancelTimer(0x%x, 0x%x)\n", TimerHandle, CurrentState); + DPRINT("NtCancelTimer(0x%p, 0x%x)\n", TimerHandle, CurrentState); /* Check Parameter Validity */ if(CurrentState != NULL && PreviousMode != KernelMode) { @@ -287,7 +287,7 @@ /* Check for success */ if(NT_SUCCESS(Status)) { - DPRINT("Timer Referencced: %x\n", Timer); + DPRINT("Timer Referenced: 0x%p\n", Timer); /* Lock the Timer */ KeAcquireSpinLock(&Timer->Lock, &OldIrql); @@ -300,7 +300,7 @@ * Get the Thread. */ TimerThread = CONTAINING_RECORD(Timer->TimerApc.Thread, ETHREAD, Tcb); - DPRINT("Removing from Thread: %x\n", TimerThread); + DPRINT("Removing from Thread: 0x%p\n", TimerThread); /* Lock its active list */ KeAcquireSpinLockAtDpcLevel(&TimerThread->ActiveTimerListLock); @@ -371,7 +371,7 @@ NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); - DPRINT("NtCreateTimer(Handle: %x, Type: %d)\n", TimerHandle, TimerType); + DPRINT("NtCreateTimer(Handle: 0x%p, Type: %d)\n", TimerHandle, TimerType); /* Check Parameter Validity */ if (PreviousMode != KernelMode) { @@ -405,7 +405,7 @@ if(NT_SUCCESS(Status)) { /* Initialize the Kernel Timer */ - DPRINT("Initializing Timer: %x\n", Timer); + DPRINT("Initializing Timer: 0x%p\n", Timer); KeInitializeTimerEx(&Timer->KeTimer, TimerType); /* Initialize the Timer Lock */ @@ -456,7 +456,7 @@ NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); - DPRINT("NtOpenTimer(TimerHandle: %x)\n", TimerHandle); + DPRINT("NtOpenTimer(TimerHandle: 0x%p)\n", TimerHandle); /* Check Parameter Validity */ if (PreviousMode != KernelMode) { @@ -519,7 +519,7 @@ PTIMER_BASIC_INFORMATION BasicInfo = (PTIMER_BASIC_INFORMATION)TimerInformation; PAGED_CODE(); - DPRINT("NtQueryTimer(TimerHandle: %x, Class: %d)\n", TimerHandle, TimerInformationClass); + DPRINT("NtQueryTimer(TimerHandle: 0x%p, Class: %d)\n", TimerHandle, TimerInformationClass); /* Check Validity */ DefaultQueryInfoBufferCheck(TimerInformationClass, @@ -550,7 +550,7 @@ _SEH_TRY { /* FIXME: Interrupt correction based on Interrupt Time */ - DPRINT("Returning Information for Timer: %x. Time Remaining: %d\n", Timer, Timer->KeTimer.DueTime.QuadPart); + DPRINT("Returning Information for Timer: 0x%p. Time Remaining: %I64x\n", Timer, Timer->KeTimer.DueTime.QuadPart); BasicInfo->TimeRemaining.QuadPart = Timer->KeTimer.DueTime.QuadPart; BasicInfo->SignalState = KeReadStateTimer(&Timer->KeTimer); @@ -591,7 +591,7 @@ NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); - DPRINT("NtSetTimer(TimerHandle: %x, DueTime: %d, Apc: %x, Period: %d)\n", TimerHandle, DueTime->QuadPart, TimerApcRoutine, Period); + DPRINT("NtSetTimer(TimerHandle: 0x%p, DueTime: %I64x, Apc: 0x%p, Period: %d)\n", TimerHandle, DueTime->QuadPart, TimerApcRoutine, Period); /* Check Parameter Validity */ if (PreviousMode != KernelMode) { @@ -631,7 +631,7 @@ if (NT_SUCCESS(Status)) { /* Lock the Timer */ - DPRINT("Timer Referencced: %x\n", Timer); + DPRINT("Timer Referencced: 0x%p\n", Timer); KeAcquireSpinLock(&Timer->Lock, &OldIrql); /* Cancel Running Timer */ @@ -642,7 +642,7 @@ * Get the Thread. */ TimerThread = CONTAINING_RECORD(Timer->TimerApc.Thread, ETHREAD, Tcb); - DPRINT("Thread already running. Removing from Thread: %x\n", TimerThread); + DPRINT("Thread already running. Removing from Thread: 0x%p\n", TimerThread); /* Lock its active list */ KeAcquireSpinLockAtDpcLevel(&TimerThread->ActiveTimerListLock); @@ -690,7 +690,7 @@ if (TimerApcRoutine) { /* Initialize the APC */ - DPRINT("Initializing APC: %x\n", Timer->TimerApc); + DPRINT("Initializing APC: 0x%p\n", Timer->TimerApc); KeInitializeApc(&Timer->TimerApc, &CurrentThread->Tcb, CurrentApcEnvironment, _____ Modified: trunk/reactos/ntoskrnl/fs/filelock.c --- trunk/reactos/ntoskrnl/fs/filelock.c 2005-07-04 21:54:36 UTC (rev 16415) +++ trunk/reactos/ntoskrnl/fs/filelock.c 2005-07-04 22:11:00 UTC (rev 16416) @@ -798,7 +798,7 @@ { Granted = CONTAINING_RECORD(EnumEntry, FILE_LOCK_GRANTED , ListEntry); - DPRINT1("%s, start: %i, len: %i, end: %i, key: %i, proc: 0x%X, fob: 0x%X\n", + DPRINT1("%s, start: %I64x, len: %I64x, end: %I64x, key: %i, proc: 0x%p, fob: 0x%p\n", Granted->Lock.ExclusiveLock ? "EXCL" : "SHRD", Granted->Lock.StartingByte.QuadPart, Granted->Lock.Length.QuadPart, @@ -817,7 +817,7 @@ Irp = CONTAINING_RECORD(EnumEntry, IRP , Tail.Overlay.ListEntry); Stack = IoGetCurrentIrpStackLocation(Irp); - DPRINT1("%s, start: %i, len: %i, end: %i, key: %i, proc: 0x%X, fob: 0x%X\n", + DPRINT1("%s, start: %I64x, len: %I64x, end: %I64x, key: %i, proc: 0x%p, fob: 0x%p\n", (Stack->Flags & SL_EXCLUSIVE_LOCK) ? "EXCL" : "SHRD", Stack->Parameters.LockControl.ByteOffset.QuadPart, Stack->Parameters.LockControl.Length->QuadPart, _____ Modified: trunk/reactos/ntoskrnl/io/device.c --- trunk/reactos/ntoskrnl/io/device.c 2005-07-04 21:54:36 UTC (rev 16415) +++ trunk/reactos/ntoskrnl/io/device.c 2005-07-04 22:11:00 UTC (rev 16416) @@ -290,7 +290,7 @@ PDEVICE_OBJECT AttachedDevice; NTSTATUS Status = STATUS_SUCCESS; - DPRINT("IoAttachDeviceByPointer(SourceDevice %x, TargetDevice %x)\n", + DPRINT("IoAttachDeviceByPointer(SourceDevice 0x%p, TargetDevice 0x%p)\n", SourceDevice, TargetDevice); /* Do the Attach */ @@ -322,7 +322,7 @@ &LocalAttach); /* Return it */ - DPRINT("IoAttachDeviceToDeviceStack DONE: %x\n", LocalAttach); + DPRINT("IoAttachDeviceToDeviceStack DONE: 0x%p\n", LocalAttach); return LocalAttach; } @@ -338,7 +338,7 @@ PDEVICE_OBJECT AttachedDevice; PDEVOBJ_EXTENSION SourceDeviceExtension; - DPRINT("IoAttachDeviceToDeviceStack(SourceDevice %x, TargetDevice %x)\n", + DPRINT("IoAttachDeviceToDeviceStack(SourceDevice 0x%p, TargetDevice 0x%p)\n", SourceDevice, TargetDevice); /* Get the Attached Device and source extension */ @@ -425,7 +425,7 @@ HANDLE TempHandle; ASSERT_IRQL(PASSIVE_LEVEL); - DPRINT("IoCreateDevice(DriverObject %x)\n",DriverObject); + DPRINT("IoCreateDevice(DriverObject 0x%p)\n", DriverObject); /* Generate a name if we have to */ if (DeviceCharacteristics & FILE_AUTOGENERATED_DEVICE_NAME) @@ -477,7 +477,7 @@ /* Clear the whole Object and extension so we don't null stuff manually */ RtlZeroMemory(CreatedDeviceObject, TotalSize); - DPRINT("CreatedDeviceObject %x\n", CreatedDeviceObject); + DPRINT("CreatedDeviceObject 0x%p\n", CreatedDeviceObject); /* * Setup the Type and Size. Note that we don't use the aligned size, @@ -492,7 +492,7 @@ AlignedDeviceExtensionSize); /* Set the Type and Size. Question: why is Size 0 on Windows? */ - DPRINT("DeviceObjectExtension %x\n", DeviceObjectExtension); + DPRINT("DeviceObjectExtension 0x%p\n", DeviceObjectExtension); DeviceObjectExtension->Type = IO_TYPE_DEVICE_OBJECT_EXTENSION; DeviceObjectExtension->Size = 0; @@ -632,7 +632,7 @@ STDCALL IoDetachDevice(PDEVICE_OBJECT TargetDevice) { - DPRINT("IoDetachDevice(TargetDevice %x)\n", TargetDevice); + DPRINT("IoDetachDevice(TargetDevice 0x%p)\n", TargetDevice); /* Remove the attachment */ TargetDevice->AttachedDevice->DeviceObjectExtension->AttachedTo = NULL; @@ -942,7 +942,7 @@ IRP, Tail.Overlay.DeviceQueueEntry); DeviceObject->CurrentIrp = Irp; - DPRINT("Next irp is %x\n", Irp); + DPRINT("Next irp is 0x%p\n", Irp); DeviceObject->DriverObject->DriverStartIo(DeviceObject, Irp); } else @@ -969,8 +969,8 @@ PKDEVICE_QUEUE_ENTRY entry; PIRP Irp; [truncated at 1000 lines; 1060 more skipped]

1 0

[gdalsnes] 16415: hopefully fix something in CreateClassKey
by gdalsnes＠svn.reactos.com 04 Jul '05

04 Jul '05

hopefully fix something in CreateClassKey Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-07-04 21:46:20 UTC (rev 16414) +++ trunk/reactos/lib/setupapi/devinst.c 2005-07-04 21:54:36 UTC (rev 16415) @@ -20,7 +20,7 @@ #include "config.h" #include "wine/port.h" - + #include <stdarg.h> #include "windef.h" @@ -1302,30 +1302,26 @@ MAX_PATH - 1, &RequiredSize)) { - return INVALID_HANDLE_VALUE; + return INVALID_HANDLE_VALUE; } lstrcpyW(FullBuffer, ControlClass); lstrcatW(FullBuffer, Buffer); - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, - FullBuffer, - 0, - KEY_ALL_ACCESS, - &hClassKey)) - { - if (!SetupGetLineTextW(NULL, + + if (!SetupGetLineTextW(NULL, hInf, Version, Class, Buffer, MAX_PATH, &RequiredSize)) - { - return INVALID_HANDLE_VALUE; - } + { + RegDeleteKeyW(HKEY_LOCAL_MACHINE, FullBuffer); + return INVALID_HANDLE_VALUE; + } - if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, + if (ERROR_SUCCESS != RegCreateKeyExW(HKEY_LOCAL_MACHINE, FullBuffer, 0, NULL, @@ -1333,24 +1329,22 @@ KEY_ALL_ACCESS, NULL, &hClassKey, - NULL)) - { - return INVALID_HANDLE_VALUE; - } - + NULL)) + { + RegDeleteKeyW(HKEY_LOCAL_MACHINE, FullBuffer); + return INVALID_HANDLE_VALUE; } - if (RegSetValueExW(hClassKey, + if (ERROR_SUCCESS != RegSetValueExW(hClassKey, Class, 0, REG_SZ, (LPBYTE)Buffer, - RequiredSize * sizeof(WCHAR))) + RequiredSize * sizeof(WCHAR))) { - RegCloseKey(hClassKey); - RegDeleteKeyW(HKEY_LOCAL_MACHINE, - FullBuffer); - return INVALID_HANDLE_VALUE; + RegCloseKey(hClassKey); + RegDeleteKeyW(HKEY_LOCAL_MACHINE, FullBuffer); + return INVALID_HANDLE_VALUE; } return hClassKey; @@ -1397,6 +1391,7 @@ SetupCloseInfFile(hInf); return FALSE; } + RegCloseKey(hClassKey); /* Try to append a layout file */

1 0

[navaraf] 16414: Yet another DPRINT fix.
by navaraf＠svn.reactos.com 04 Jul '05

04 Jul '05

Yet another DPRINT fix. Modified: trunk/reactos/ntoskrnl/ke/i386/irq.c _____ Modified: trunk/reactos/ntoskrnl/ke/i386/irq.c --- trunk/reactos/ntoskrnl/ke/i386/irq.c 2005-07-04 21:12:35 UTC (rev 16413) +++ trunk/reactos/ntoskrnl/ke/i386/irq.c 2005-07-04 21:46:20 UTC (rev 16414) @@ -473,7 +473,7 @@ if (Result) { InsertTailList(&CurrentIsr->ListHead,&InterruptObject->InterruptListEntr y); - DPRINT("%x %x\n",InterruptObject->InterruptListEntry.Flink, InterruptObject->Entry.Blink); + DPRINT("%x %x\n",InterruptObject->InterruptListEntry.Flink, InterruptObject->InterruptListEntry.Blink); } InterruptObject->Connected = TRUE;

1 0

[navaraf] 16413: Fix more DPRINTs.
by navaraf＠svn.reactos.com 04 Jul '05

04 Jul '05

Fix more DPRINTs. Modified: trunk/reactos/ntoskrnl/ob/handle.c Modified: trunk/reactos/ntoskrnl/ob/object.c _____ Modified: trunk/reactos/ntoskrnl/ob/handle.c --- trunk/reactos/ntoskrnl/ob/handle.c 2005-07-04 21:08:00 UTC (rev 16412) +++ trunk/reactos/ntoskrnl/ob/handle.c 2005-07-04 21:12:35 UTC (rev 16413) @@ -833,7 +833,7 @@ if (ObjectType != NULL && ObjectType != ObjectHeader->Type) { - DPRINT("ObjectType mismatch: %wZ vs %wZ (handle 0x%x)\n", &ObjectType->TypeName, ObjectHeader->Type ? &ObjectHeader->Type->TypeName : NULL, Handle); + DPRINT("ObjectType mismatch: %wZ vs %wZ (handle 0x%x)\n", &ObjectType->Name, ObjectHeader->Type ? &ObjectHeader->Type->Name : NULL, Handle); ExUnlockHandleTableEntry(HandleTable, HandleEntry); @@ -1142,7 +1142,7 @@ ObjectCreateInfo->Attributes & OBJ_INHERIT, Handle); DPRINT("handle Created: %d. refcount. handlecount %d %d\n", - *Handle, Header->RefCount, Header->HandleCount); + *Handle, Header->PointerCount, Header->HandleCount); } /* We can delete the Create Info now */ _____ Modified: trunk/reactos/ntoskrnl/ob/object.c --- trunk/reactos/ntoskrnl/ob/object.c 2005-07-04 21:08:00 UTC (rev 16412) +++ trunk/reactos/ntoskrnl/ob/object.c 2005-07-04 21:12:35 UTC (rev 16413) @@ -863,9 +863,9 @@ DPRINT("Failed %p (type was %x %wZ) should be %x %wZ\n", Header, Header->Type, - &BODY_TO_HEADER(Header->Type)->NameInfo, + &HEADER_TO_OBJECT_NAME(BODY_TO_HEADER(Header->Type))->Name, ObjectType, - &BODY_TO_HEADER(ObjectType)->NameInfo); + &HEADER_TO_OBJECT_NAME(BODY_TO_HEADER(ObjectType))->Name); return(STATUS_UNSUCCESSFUL); } if (Header->Type == PsProcessType)

1 0

[hpoussin] 16412: Remove entries that are created by 2nd stage setup, using media/inf/NET_NIC.inf
by hpoussin＠svn.reactos.com 04 Jul '05

04 Jul '05

Remove entries that are created by 2nd stage setup, using media/inf/NET_NIC.inf Fix some obvious wrong copy/pastes Add correct registry entries for kbdclass and mouclass classes Fix hard-coded values for serial mice (Serenum doesn't report the exact hardwa Modified: trunk/reactos/bootdata/hivesys.inf _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-07-04 21:01:46 UTC (rev 16411) +++ trunk/reactos/bootdata/hivesys.inf 2005-07-04 21:08:00 UTC (rev 16412) @@ -11,16 +11,10 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E965-E325-11CE-BFC1-08 002BE10318}",,0x00000000,"DVD/CD-ROM drives" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E965-E325-11CE-BFC1-08 002BE10318}","Class",0x00000000,"CDROM" -HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-0 8002BE10318}","EnumPropPages32",0x00000000,"MmSys.Cpl,MediaPropPageProvi der" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E965-E325-11CE-BFC1-0 8002BE10318}","EnumPropPages32",0x00000000,"MmSys.Cpl,MediaPropPageProvi der" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E965-E325-11CE-BFC1-08 002BE10318}","Icon",0x00000000,"-20" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E965-E325-11CE-BFC1-08 002BE10318}","NoInstallClass",0x00000000,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-0 8002BE10318}",,0x00000000,"Network Adapters" -HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-0 8002BE10318}","Class",0x00000000,"Net" -HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-0 8002BE10318}","EnumPropPages32",0x00000000,"NetCfgx.dll,NetPropPageProvi der" -HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-0 8002BE10318}","Icon",0x00000000,"-5" -HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-0 8002BE10318}","Installer32",0x00000000,"NetCfgx.dll,NetClassInstaller" - HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E973-E325-11CE-BFC1-08 002BE10318}",,0x00000000,"Network Client" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E973-E325-11CE-BFC1-08 002BE10318}","Class",0x00000000,"NetClient" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E973-E325-11CE-BFC1-08 002BE10318}","Icon",0x00000000,"-7" @@ -80,7 +74,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E972-E325-11CE-BFC1- 08002BE10318}",,0x00000000,"Network Adapters" HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E972-E325-11CE-BFC1- 08002BE10318}","Class",0x00000000,"Net" HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E973-E325-11CE-BFC1- 08002BE10318}",,0x00000000,"Network Client" -HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E973-E325-11CE-BFC1 -08002BE10318}","Class",0x00000000,"Net" +HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E973-E325-11CE-BFC1 -08002BE10318}","Class",0x00000000,"NetClient" HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E974-E325-11CE-BFC1- 08002BE10318}",,0x00000000,"Network Service" HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E974-E325-11CE-BFC1- 08002BE10318}","Class",0x00000000,"NetService" HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1- 08002BE10318}",,0x00000000,"Network Protocol" @@ -594,6 +588,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","ImagePath",0x00020000 ,"system32\drivers\kbdclass.sys" HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","Start",0x00010001,0x0 0000001 HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","Type",0x00010001,0x00 000001 +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E96B-E325-11CE-BFC1-0 8002BE10318}","UpperFilters",0x00010000,"kbdclass" ; Serial port enumerator HKLM,"SYSTEM\CurrentControlSet\Services\serenum","ErrorControl",0x000100 01,0x00000001 @@ -651,12 +646,16 @@ HKLM,"SYSTEM\CurrentControlSet\Services\mpu401","ErrorControl",0x0001000 1,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\mpu401","ImagePath",0x00020000," system32\drivers\mpu401.sys" -; Mouse driver -HKLM,"SYSTEM\CurrentControlSet\Services\Mouse","ErrorControl",0x0001000 1,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Mouse","Group",0x00000000,"Poin ter Class" -HKLM,"SYSTEM\CurrentControlSet\Services\Mouse","ImagePath",0x00020000," system32\drivers\mouclass.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Mouse","Start",0x00010001,0x000 00001 -HKLM,"SYSTEM\CurrentControlSet\Services\Mouse","Type",0x00010001,0x0000 0001 +; Mouse class driver +HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","ErrorControl",0x0001 0001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","Group",0x00000000,"P ointer Class" +HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","ImagePath",0x0002000 0,"system32\drivers\mouclass.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","Start",0x00010001,0x 00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","Type",0x00010001,0x0 0000001 +HKLM,"SYSTEM\CurrentControlSet\Services\mouclass\Parameters","ConnectMu ltiplePorts",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\mouclass\Parameters","MouseData QueueSize",0x00010001,0x00000064 +HKLM,"SYSTEM\CurrentControlSet\Services\mouclass\Parameters","PointerDe viceBaseName",0x00000000,"PointerClass" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E96F-E325-11CE-BFC1-0 8002BE10318}","UpperFilters",0x00010000,"mouclass" ; Mailslot filesystem driver HKLM,"SYSTEM\CurrentControlSet\Services\Msfs","ErrorControl",0x00010001, 0x00000000 @@ -883,12 +882,8 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Sermouse","Start",0x00010001,0x0 0000003 HKLM,"SYSTEM\CurrentControlSet\Services\Sermouse","Type",0x00010001,0x00 000001 ;hard coded values for some serial mice -HKLM,"SYSTEM\CurrentControlSet\Enum\*PNP0F01","Service",0x0000000,"serm ouse" -HKLM,"SYSTEM\CurrentControlSet\Enum\*PNP0F01","ClassGUID",0x0000000,"{4 D36E96F-E325-11CE-BFC1-08002BE10318}" -HKLM,"SYSTEM\CurrentControlSet\Enum\*PNP0F08","Service",0x0000000,"serm ouse" -HKLM,"SYSTEM\CurrentControlSet\Enum\*PNP0F08","ClassGUID",0x0000000,"{4 D36E96F-E325-11CE-BFC1-08002BE10318}" -HKLM,"SYSTEM\CurrentControlSet\Enum\*PNP0F09","Service",0x0000000,"serm ouse" -HKLM,"SYSTEM\CurrentControlSet\Enum\*PNP0F09","ClassGUID",0x0000000,"{4 D36E96F-E325-11CE-BFC1-08002BE10318}" +HKLM,"SYSTEM\CurrentControlSet\Enum\Serenum\Mouse\0000","Service",0x000 0000,"sermouse" +HKLM,"SYSTEM\CurrentControlSet\Enum\Serenum\Mouse\0000","ClassGUID",0x0 000000,"{4D36E96F-E325-11CE-BFC1-08002BE10318}" ; TCP/IP driver HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip","ErrorControl",0x00010001 ,0x00000001

1 0

[ion] 16411: Dprint fixes by our lovely Filip
by ion＠svn.reactos.com 04 Jul '05

04 Jul '05

Dprint fixes by our lovely Filip Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c Modified: trunk/reactos/ntoskrnl/io/file.c Modified: trunk/reactos/ntoskrnl/mm/anonmem.c _____ Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c --- trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-07-04 17:22:18 UTC (rev 16410) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-07-04 21:01:46 UTC (rev 16411) @@ -122,7 +122,7 @@ CurrentHeader = BODY_TO_HEADER(CurrentObject); DPRINT("Current ObjectType %wZ\n", - &CurrentHeader->Type->TypeName); + &CurrentHeader->Type->Name); if (CurrentHeader->Type->TypeInfo.ParseProcedure == NULL) { _____ Modified: trunk/reactos/ntoskrnl/io/file.c --- trunk/reactos/ntoskrnl/io/file.c 2005-07-04 17:22:18 UTC (rev 16410) +++ trunk/reactos/ntoskrnl/io/file.c 2005-07-04 21:01:46 UTC (rev 16411) @@ -69,7 +69,7 @@ ParentObjectType != IoFileObjectType) { DPRINT("Parent [%wZ] is a %S which is neither a file type nor a device type ; remaining path = %S\n", - &BODY_TO_HEADER(Parent)->NameInfo->Name, + &HEADER_TO_OBJECT_NAME(BODY_TO_HEADER(Parent))->Name, BODY_TO_HEADER(Parent)->Type->Name.Buffer, RemainingPath); return(STATUS_UNSUCCESSFUL); @@ -399,7 +399,7 @@ ULONG Length, PULONG ReturnLength) { - PVOID LocalInfo; + POBJECT_NAME_INFORMATION LocalInfo; PFILE_OBJECT FileObject; ULONG LocalReturnLength; NTSTATUS Status; @@ -428,7 +428,7 @@ /* Write Device Path */ Status = RtlAppendUnicodeStringToString(&ObjectNameInfo->Name, - &((POBJECT_NAME_INFORMATION)LocalInfo)->Name); + &(LocalInfo)->Name); /* Query the File name */ Status = IoQueryFileInformation(FileObject, _____ Modified: trunk/reactos/ntoskrnl/mm/anonmem.c --- trunk/reactos/ntoskrnl/mm/anonmem.c 2005-07-04 17:22:18 UTC (rev 16410) +++ trunk/reactos/ntoskrnl/mm/anonmem.c 2005-07-04 21:01:46 UTC (rev 16411) @@ -140,7 +140,7 @@ NTSTATUS Status; DPRINT("MmPageOutVirtualMemory(Address 0x%.8X) PID %d\n", - Address, MemoryArea->Process->UniqueProcessId); + Address, AddressSpace->Process->UniqueProcessId); /* * Check for paging out from a deleted virtual memory area.

1 0

[weiden] 16410: add a quick search feature to the checklist control
by weiden＠svn.reactos.com 04 Jul '05

04 Jul '05

add a quick search feature to the checklist control Modified: trunk/reactos/lib/aclui/aclui.c Modified: trunk/reactos/lib/aclui/acluilib.h Modified: trunk/reactos/lib/aclui/checklist.c _____ Modified: trunk/reactos/lib/aclui/aclui.c --- trunk/reactos/lib/aclui/aclui.c 2005-07-04 13:37:02 UTC (rev 16409) +++ trunk/reactos/lib/aclui/aclui.c 2005-07-04 17:22:18 UTC (rev 16410) @@ -705,6 +705,12 @@ ShowWindow(GetDlgItem(hwndDlg, IDC_LABEL_ADVANCED), SW_HIDE); } + + /* enable quicksearch for the permissions checklist control */ + SendMessage(sp->hAceCheckList, + CLM_ENABLEQUICKSEARCH, + TRUE, + 0); } break; } _____ Modified: trunk/reactos/lib/aclui/acluilib.h --- trunk/reactos/lib/aclui/acluilib.h 2005-07-04 13:37:02 UTC (rev 16409) +++ trunk/reactos/lib/aclui/acluilib.h 2005-07-04 17:22:18 UTC (rev 16410) @@ -102,6 +102,9 @@ #define CLM_GETCHECKBOXCOLUMN (WM_USER + 6) #define CLM_CLEARCHECKBOXES (WM_USER + 7) #define CLM_SETITEMSTATE (WM_USER + 8) +#define CLM_ENABLEQUICKSEARCH (WM_USER + 9) +#define CLM_SETQUICKSEARCH_TIMEOUT_RESET (WM_USER + 10) +#define CLM_SETQUICKSEARCH_TIMEOUT_SETFOCUS (WM_USER + 11) BOOL RegisterCheckListControl(HINSTANCE hInstance); _____ Modified: trunk/reactos/lib/aclui/checklist.c --- trunk/reactos/lib/aclui/checklist.c 2005-07-04 13:37:02 UTC (rev 16409) +++ trunk/reactos/lib/aclui/checklist.c 2005-07-04 17:22:18 UTC (rev 16410) @@ -28,6 +28,16 @@ */ #include "acluilib.h" +#define CI_TEXT_MARGIN_WIDTH (8) +#define CI_TEXT_MARGIN_HEIGHT (3) +#define CI_TEXT_SELECTIONMARGIN (1) + +#define TIMER_ID_SETHITFOCUS (1) +#define TIMER_ID_RESETQUICKSEARCH (2) + +#define DEFAULT_QUICKSEARCH_SETFOCUS_DELAY (2000) +#define DEFAULT_QUICKSEARCH_RESET_DELAY (3000) + typedef struct _CHECKITEM { struct _CHECKITEM *Next; @@ -54,6 +64,15 @@ COLORREF TextColor[2]; UINT CheckBoxLeft[2]; + + BOOL QuickSearchEnabled; + PCHECKITEM QuickSearchHitItem; + WCHAR QuickSearchText[65]; + UINT QuickSearchSetFocusDelay; + UINT QuickSearchResetDelay; + + DWORD CaretWidth; + BOOL ShowingCaret; #if SUPPORT_UXTHEME PCHECKITEM HoveredCheckItem; @@ -64,9 +83,18 @@ #endif } CHECKLISTWND, *PCHECKLISTWND; -#define CI_TEXT_MARGIN_WIDTH (8) -#define CI_TEXT_MARGIN_HEIGHT (3) +static VOID EscapeQuickSearch(IN PCHECKLISTWND infoPtr); +#if SUPPORT_UXTHEME +static VOID ChangeCheckItemHotTrack(IN PCHECKLISTWND infoPtr, + IN PCHECKITEM NewHotTrack, + IN UINT NewHotTrackBox); +#endif +static VOID ChangeCheckItemFocus(IN PCHECKLISTWND infoPtr, + IN PCHECKITEM NewFocus, + IN UINT NewFocusBox); +/********************************************************************** ********/ + static PCHECKITEM FindCheckItemByIndex(IN PCHECKLISTWND infoPtr, IN UINT Index) @@ -113,6 +141,27 @@ } static PCHECKITEM +FindCheckItem(IN PCHECKLISTWND infoPtr, + IN LPWSTR SearchText) +{ + PCHECKITEM CurItem; + SIZE_T Count = wcslen(SearchText); + + for (CurItem = infoPtr->CheckItemListHead; + CurItem != NULL; + CurItem = CurItem->Next) + { + if ((CurItem->State & CIS_DISABLED) != CIS_DISABLED && + !wcsnicmp(CurItem->Name, SearchText, Count)) + { + break; + } + } + + return CurItem; +} + +static PCHECKITEM FindFirstEnabledCheckBox(IN PCHECKLISTWND infoPtr, OUT UINT *CheckBox) { @@ -366,6 +415,27 @@ { if (CurItem == Item) { + if (Item == infoPtr->QuickSearchHitItem && infoPtr->QuickSearchEnabled) + { + EscapeQuickSearch(infoPtr); + } + +#if SUPPORT_UXTHEME + if (Item == infoPtr->HoveredCheckItem) + { + ChangeCheckItemHotTrack(infoPtr, + NULL, + 0); + } +#endif + + if (Item == infoPtr->FocusedCheckItem) + { + ChangeCheckItemFocus(infoPtr, + NULL, + 0); + } + *PrevPtr = CurItem->Next; HeapFree(GetProcessHeap(), 0, @@ -608,7 +678,7 @@ NULL, NULL, NULL, - SW_INVALIDATE); + SW_INVALIDATE | SW_SCROLLCHILDREN); RedrawWindow(infoPtr->hSelf, NULL, @@ -664,7 +734,16 @@ { infoPtr->ItemHeight = (2 * CI_TEXT_MARGIN_HEIGHT) + GetIdealItemHeight(infoPtr); } - + + if (infoPtr->ShowingCaret) + { + DestroyCaret(); + CreateCaret(infoPtr->hSelf, + NULL, + 0, + infoPtr->ItemHeight - (2 * CI_TEXT_MARGIN_HEIGHT)); + } + UpdateControl(infoPtr, TRUE); @@ -788,14 +867,73 @@ #if SUPPORT_UXTHEME ItemHovered = (Enabled && infoPtr->HoveredCheckItem == Item); #endif + + if (infoPtr->QuickSearchHitItem == Item) + { + COLORREF OldBkColor, OldFgColor; + SIZE TextSize; + SIZE_T TextLen, HighlightLen = wcslen(infoPtr->QuickSearchText); + + /* highlight the quicksearch text */ + if (GetTextExtentPoint32(hDC, + Item->Name, + HighlightLen, + &TextSize)) + { + COLORREF HighlightTextColor, HighlightBackground; + RECT rcHighlight = TextRect; + + HighlightTextColor = GetSysColor(COLOR_HIGHLIGHTTEXT); + HighlightBackground = GetSysColor(COLOR_HIGHLIGHT); + + rcHighlight.right = rcHighlight.left + TextSize.cx; + + InflateRect(&rcHighlight, + 0, + CI_TEXT_SELECTIONMARGIN); + + OldBkColor = SetBkColor(hDC, + HighlightBackground); + OldFgColor = SetTextColor(hDC, + HighlightTextColor); + + /* draw the highlighted text */ + DrawText(hDC, + Item->Name, + HighlightLen, + &rcHighlight, + DT_LEFT | DT_NOPREFIX | DT_SINGLELINE | DT_VCENTER); + + SetBkColor(hDC, + OldBkColor); + SetTextColor(hDC, + OldFgColor); + + /* draw the remaining part of the text */ + TextLen = wcslen(Item->Name); + if (HighlightLen < TextLen) + { + rcHighlight.left = rcHighlight.right; + rcHighlight.right = TextRect.right; + + DrawText(hDC, + Item->Name + HighlightLen, + -1, + &rcHighlight, + DT_LEFT | DT_NOPREFIX | DT_SINGLELINE | DT_VCENTER); + } + } + } + else + { + /* draw the text */ + DrawText(hDC, + Item->Name, + -1, + &TextRect, + DT_LEFT | DT_NOPREFIX | DT_SINGLELINE | DT_VCENTER); + } - /* draw the text */ - DrawText(hDC, - Item->Name, - -1, - &TextRect, - DT_LEFT | DT_NOPREFIX | DT_SINGLELINE | DT_VCENTER); - CheckBox.top = TextRect.top; CheckBox.bottom = TextRect.bottom; @@ -1059,6 +1197,295 @@ CheckItem->State = NewState; } +static VOID +DisplayCaret(IN PCHECKLISTWND infoPtr) +{ + if (IsWindowEnabled(infoPtr->hSelf) && !infoPtr->ShowingCaret) + { + infoPtr->ShowingCaret = TRUE; + + CreateCaret(infoPtr->hSelf, + NULL, + infoPtr->CaretWidth, + infoPtr->ItemHeight - (2 * CI_TEXT_MARGIN_HEIGHT)); + + ShowCaret(infoPtr->hSelf); + } +} + +static VOID +RemoveCaret(IN PCHECKLISTWND infoPtr) +{ + if (IsWindowEnabled(infoPtr->hSelf) && infoPtr->ShowingCaret) + { + infoPtr->ShowingCaret = FALSE; + + HideCaret(infoPtr->hSelf); + DestroyCaret(); + } +} + +static VOID +KillQuickSearchTimers(IN PCHECKLISTWND infoPtr) +{ + KillTimer(infoPtr->hSelf, + TIMER_ID_SETHITFOCUS); + KillTimer(infoPtr->hSelf, + TIMER_ID_RESETQUICKSEARCH); +} + +static VOID +MapItemToRect(IN PCHECKLISTWND infoPtr, + IN PCHECKITEM CheckItem, + OUT RECT *prcItem) +{ + INT Index = CheckItemToIndex(infoPtr, + CheckItem); + if (Index != -1) + { + RECT rcClient; + LONG Style; + INT VisibleFirst; + + GetClientRect(infoPtr->hSelf, &rcClient); + + Style = GetWindowLong(infoPtr->hSelf, + GWL_STYLE); + + if (Style & WS_VSCROLL) + { + VisibleFirst = GetScrollPos(infoPtr->hSelf, + SB_VERT); + } + else + { + VisibleFirst = 0; + } + + prcItem->left = rcClient.left; + prcItem->right = rcClient.right; + prcItem->top = (Index - VisibleFirst) * infoPtr->ItemHeight; + prcItem->bottom = prcItem->top + infoPtr->ItemHeight; + } + else + { + prcItem->left = 0; + prcItem->top = 0; + prcItem->right = 0; + prcItem->bottom = 0; + } +} + +static VOID +UpdateCaretPos(IN PCHECKLISTWND infoPtr) +{ + if (infoPtr->ShowingCaret && infoPtr->QuickSearchHitItem != NULL) + { + HDC hDC = GetDC(infoPtr->hSelf); + if (hDC != NULL) + { + SIZE TextSize; + HGDIOBJ hOldFont = SelectObject(hDC, + infoPtr->hFont); + + TextSize.cx = 0; + TextSize.cy = 0; + + if (infoPtr->QuickSearchText[0] == L'\0' || + GetTextExtentPoint32(hDC, + infoPtr->QuickSearchHitItem->Name, + wcslen(infoPtr->QuickSearchText), + &TextSize)) + { + RECT rcItem; + + MapItemToRect(infoPtr, + infoPtr->QuickSearchHitItem, + &rcItem); + + /* actually change the caret position */ + SetCaretPos(rcItem.left + CI_TEXT_MARGIN_WIDTH + TextSize.cx, + rcItem.top + CI_TEXT_MARGIN_HEIGHT); + } + + SelectObject(hDC, + hOldFont); + + ReleaseDC(infoPtr->hSelf, + hDC); + } + } +} + +static VOID +EscapeQuickSearch(IN PCHECKLISTWND infoPtr) +{ + if (infoPtr->QuickSearchEnabled && infoPtr->QuickSearchHitItem != NULL) + { + PCHECKITEM OldHit = infoPtr->QuickSearchHitItem; + + infoPtr->QuickSearchHitItem = NULL; + infoPtr->QuickSearchText[0] = L'\0'; + + /* scroll back to the focused item */ + if (infoPtr->FocusedCheckItem != NULL) + { + MakeCheckItemVisible(infoPtr, + infoPtr->FocusedCheckItem); + } + + /* repaint the old search hit item if it's still visible */ + UpdateCheckItem(infoPtr, + OldHit); + + KillQuickSearchTimers(infoPtr); + + RemoveCaret(infoPtr); + } +} + +static VOID +ChangeSearchHit(IN PCHECKLISTWND infoPtr, + IN PCHECKITEM NewHit) +{ + PCHECKITEM OldHit = infoPtr->QuickSearchHitItem; + + infoPtr->QuickSearchHitItem = NewHit; + + if (OldHit != NewHit) + { + /* scroll to the new search hit */ + MakeCheckItemVisible(infoPtr, + NewHit); + + /* repaint the old hit if present and visible */ + if (OldHit != NULL) + { + UpdateCheckItem(infoPtr, + OldHit); + } + else + { + /* show the caret the first time we find an item */ + DisplayCaret(infoPtr); + } + } + + UpdateCaretPos(infoPtr); + + UpdateCheckItem(infoPtr, + NewHit); + + /* kill the reset timer and restart the set hit focus timer */ + KillTimer(infoPtr->hSelf, + TIMER_ID_RESETQUICKSEARCH); + if (infoPtr->QuickSearchSetFocusDelay != 0) + { + SetTimer(infoPtr->hSelf, + TIMER_ID_SETHITFOCUS, + infoPtr->QuickSearchSetFocusDelay, + NULL); + } +} + +static BOOL +QuickSearchFindHit(IN PCHECKLISTWND infoPtr, + IN WCHAR c) +{ + if (infoPtr->QuickSearchEnabled) + { + BOOL Ret = FALSE; + PCHECKITEM NewHit; + + switch (c) + { + case '\r': + case '\n': + { + Ret = infoPtr->QuickSearchHitItem != NULL; + if (Ret) + { + /* NOTE: QuickSearchHitItem definitely has at least one + enabled check box, the user can't search for disabled + check items */ + + ChangeCheckItemFocus(infoPtr, + infoPtr->QuickSearchHitItem, + ((!(infoPtr->QuickSearchHitItem->State & CIS_ALLOWDISABLED)) ? CLB_ALLOW : CLB_DENY)); + + EscapeQuickSearch(infoPtr); + } + break; + } + + case VK_BACK: + { + if (infoPtr->QuickSearchHitItem != NULL) + { + INT SearchLen = wcslen(infoPtr->QuickSearchText); + if (SearchLen > 0) + { + /* delete the last character */ + infoPtr->QuickSearchText[--SearchLen] = L'\0'; + + if (SearchLen > 0) + { + /* search again */ + NewHit = FindCheckItem(infoPtr, + infoPtr->QuickSearchText); + + if (NewHit != NULL) + { + /* change the search hit */ + ChangeSearchHit(infoPtr, + NewHit); + + Ret = TRUE; + } + } + } + + if (!Ret) + { + EscapeQuickSearch(infoPtr); + } + } + break; + } + + default: + { + INT SearchLen = wcslen(infoPtr->QuickSearchText); + if (SearchLen < (sizeof(infoPtr->QuickSearchText) / sizeof(infoPtr->QuickSearchText[0])) - 1) + { + infoPtr->QuickSearchText[SearchLen++] = c; + infoPtr->QuickSearchText[SearchLen] = L'\0'; + + NewHit = FindCheckItem(infoPtr, + infoPtr->QuickSearchText); + if (NewHit != NULL) + { + /* change the search hit */ + ChangeSearchHit(infoPtr, + NewHit); + + Ret = TRUE; + } + else + { + /* reset the input */ + infoPtr->QuickSearchText[--SearchLen] = L'\0'; + } + } + break; + } + } + return Ret; + } + + return FALSE; +} + static LRESULT CALLBACK CheckListWndProc(IN HWND hwnd, IN UINT uMsg, @@ -1292,7 +1719,7 @@ NULL, NULL, NULL, - SW_INVALIDATE); + SW_INVALIDATE | SW_SCROLLCHILDREN); RedrawWindow(hwnd, NULL, @@ -1427,6 +1854,28 @@ break; } + case CLM_ENABLEQUICKSEARCH: + { + if (wParam == 0) + { + EscapeQuickSearch(infoPtr); + } + infoPtr->QuickSearchEnabled = (wParam != 0); + break; + } + + case CLM_SETQUICKSEARCH_TIMEOUT_RESET: + { + infoPtr->QuickSearchResetDelay = (UINT)wParam; + break; + } + + case CLM_SETQUICKSEARCH_TIMEOUT_SETFOCUS: + { + infoPtr->QuickSearchSetFocusDelay = (UINT)wParam; + break; + } + case WM_SETFONT: { Ret = (LRESULT)RetChangeControlFont(infoPtr, @@ -1461,6 +1910,8 @@ case WM_ENABLE: { + EscapeQuickSearch(infoPtr); + UpdateControl(infoPtr, TRUE); break; @@ -1515,7 +1966,7 @@ NULL, NULL, NULL, - SW_INVALIDATE); + SW_INVALIDATE | SW_SCROLLCHILDREN); RedrawWindow(hwnd, NULL, @@ -1552,6 +2003,8 @@ case WM_KILLFOCUS: { + EscapeQuickSearch(infoPtr); + infoPtr->HasFocus = FALSE; if (infoPtr->FocusedCheckItem != NULL) { @@ -1617,6 +2070,12 @@ if (ChangeFocus) { + if (infoPtr->QuickSearchEnabled && infoPtr->QuickSearchHitItem != NULL && + infoPtr->QuickSearchHitItem != NewFocus) + { + EscapeQuickSearch(infoPtr); + } + ChangeCheckItemFocus(infoPtr, NewFocus, NewFocusBox); @@ -1680,19 +2139,26 @@ { case VK_SPACE: { - if (infoPtr->FocusedCheckItem != NULL && GetCapture() == NULL) + if (GetCapture() == NULL && + !QuickSearchFindHit(infoPtr, + L' ')) { - BOOL OldPushed = infoPtr->FocusedPushed; - infoPtr->FocusedPushed = TRUE; - - if (infoPtr->FocusedPushed != OldPushed) + if (infoPtr->FocusedCheckItem != NULL && + (infoPtr->QuickSearchHitItem == NULL || + infoPtr->QuickSearchHitItem == infoPtr->FocusedCheckItem)) { - MakeCheckItemVisible(infoPtr, - infoPtr->FocusedCheckItem); + BOOL OldPushed = infoPtr->FocusedPushed; + infoPtr->FocusedPushed = TRUE; - UpdateCheckItemBox(infoPtr, - infoPtr->FocusedCheckItem, - infoPtr->FocusedCheckItemBox); + if (infoPtr->FocusedPushed != OldPushed) + { + MakeCheckItemVisible(infoPtr, + infoPtr->FocusedCheckItem); + + UpdateCheckItemBox(infoPtr, + infoPtr->FocusedCheckItem, + infoPtr->FocusedCheckItemBox); + } } } break; @@ -1700,18 +2166,24 @@ case VK_RETURN: { - if (infoPtr->FocusedCheckItem != NULL && GetCapture() == NULL) + if (GetCapture() == NULL && + !QuickSearchFindHit(infoPtr, + L'\n')) { - MakeCheckItemVisible(infoPtr, - infoPtr->FocusedCheckItem); + if (infoPtr->FocusedCheckItem != NULL && + infoPtr->QuickSearchHitItem == NULL) + { + MakeCheckItemVisible(infoPtr, + infoPtr->FocusedCheckItem); - ChangeCheckBox(infoPtr, - infoPtr->FocusedCheckItem, - infoPtr->FocusedCheckItemBox); - - UpdateCheckItemBox(infoPtr, + ChangeCheckBox(infoPtr, infoPtr->FocusedCheckItem, infoPtr->FocusedCheckItemBox); + + UpdateCheckItemBox(infoPtr, + infoPtr->FocusedCheckItem, + infoPtr->FocusedCheckItemBox); + } } break; } @@ -1723,6 +2195,8 @@ PCHECKITEM NewFocus; UINT NewFocusBox = 0; BOOL Shift = GetKeyState(VK_SHIFT) & 0x8000; + + EscapeQuickSearch(infoPtr); NewFocus = FindEnabledCheckBox(infoPtr, Shift, @@ -1779,16 +2253,23 @@ { INT virtKey; - Ret = DLGC_HASSETSEL; + Ret = 0; virtKey = (lParam != 0 ? (INT)((LPMSG)lParam)->wParam : 0); switch (virtKey) { case VK_RETURN: { - Ret |= DLGC_WANTMESSAGE; + if (infoPtr->QuickSearchEnabled && infoPtr->QuickSearchHitItem != NULL) + { + Ret |= DLGC_WANTCHARS | DLGC_WANTMESSAGE; + } + else + { + Ret |= DLGC_WANTMESSAGE; + } break; } - + case VK_TAB: { INT CheckBox; @@ -1801,10 +2282,26 @@ Ret |= (EnabledBox ? DLGC_WANTTAB : DLGC_WANTCHARS); break; } + + default: + { + if (infoPtr->QuickSearchEnabled) + { + Ret |= DLGC_WANTCHARS; + } + break; + } } break; } + case WM_CHAR: + { + QuickSearchFindHit(infoPtr, + (WCHAR)wParam); + break; + } + case WM_SYSCOLORCHANGE: { infoPtr->TextColor[0] = GetSysColor(COLOR_GRAYTEXT); @@ -1843,6 +2340,8 @@ case WM_SETTINGCHANGE: { + DWORD OldCaretWidth = infoPtr->CaretWidth; + #if SUPPORT_UXTHEME /* update the hover time */ if (!SystemParametersInfo(SPI_GETMOUSEHOVERTIME, @@ -1853,6 +2352,23 @@ infoPtr->HoverTime = HOVER_DEFAULT; } #endif + + /* update the caret */ + if (!SystemParametersInfo(SPI_GETCARETWIDTH, + 0, + &infoPtr->CaretWidth, + 0)) + { + infoPtr->CaretWidth = 2; + } + if (OldCaretWidth != infoPtr->CaretWidth && infoPtr->ShowingCaret) + { + DestroyCaret(); + CreateCaret(hwnd, + NULL, + infoPtr->CaretWidth, + infoPtr->ItemHeight - (2 * CI_TEXT_MARGIN_HEIGHT)); + } break; } @@ -1881,7 +2397,50 @@ } break; } + + case WM_TIMER: + { + switch (wParam) + { + case TIMER_ID_SETHITFOCUS: + { + /* kill the timer */ + KillTimer(hwnd, + wParam); + if (infoPtr->QuickSearchEnabled && infoPtr->QuickSearchHitItem != NULL) + { + /* change the focus to the hit item, this item has to have + at least one enabled checkbox! */ + ChangeCheckItemFocus(infoPtr, + infoPtr->QuickSearchHitItem, + ((!(infoPtr->QuickSearchHitItem->State & CIS_ALLOWDISABLED)) ? CLB_ALLOW : CLB_DENY)); + + /* start the timer to reset quicksearch */ + if (infoPtr->QuickSearchResetDelay != 0) + { + SetTimer(hwnd, + TIMER_ID_RESETQUICKSEARCH, + infoPtr->QuickSearchResetDelay, + NULL); + } + } + break; + } + case TIMER_ID_RESETQUICKSEARCH: + { + /* kill the timer */ + KillTimer(hwnd, + wParam); + + /* escape quick search */ + EscapeQuickSearch(infoPtr); + break; + } + } + break; + } + case WM_CREATE: { infoPtr = HeapAlloc(GetProcessHeap(), @@ -1901,7 +2460,15 @@ infoPtr->CheckItemListHead = NULL; infoPtr->CheckItemCount = 0; + if (!SystemParametersInfo(SPI_GETCARETWIDTH, + 0, + &infoPtr->CaretWidth, + 0)) + { + infoPtr->CaretWidth = 2; + } infoPtr->ItemHeight = 10; + infoPtr->ShowingCaret = FALSE; infoPtr->HasFocus = FALSE; infoPtr->FocusedCheckItem = NULL; @@ -1915,7 +2482,13 @@ infoPtr->CheckBoxLeft[0] = rcClient.right - 30; infoPtr->CheckBoxLeft[1] = rcClient.right - 15; + + infoPtr->QuickSearchEnabled = FALSE; + infoPtr->QuickSearchText[0] = L'\0'; + infoPtr->QuickSearchSetFocusDelay = DEFAULT_QUICKSEARCH_SETFOCUS_DELAY; + infoPtr->QuickSearchResetDelay = DEFAULT_QUICKSEARCH_RESET_DELAY; + #if SUPPORT_UXTHEME infoPtr->HoveredCheckItem = NULL; infoPtr->HoveredCheckItemBox = 0; @@ -1952,6 +2525,11 @@ case WM_DESTROY: { + if (infoPtr->ShowingCaret) + { + DestroyCaret(); + } + ClearCheckItems(infoPtr); #if SUPPORT_UXTHEME

1 0

[weiden] 16409: properly handle WM_UPDATEUISTATE
by weiden＠svn.reactos.com 04 Jul '05

04 Jul '05

properly handle WM_UPDATEUISTATE Modified: trunk/reactos/lib/aclui/checklist.c _____ Modified: trunk/reactos/lib/aclui/checklist.c --- trunk/reactos/lib/aclui/checklist.c 2005-07-04 13:21:14 UTC (rev 16408) +++ trunk/reactos/lib/aclui/checklist.c 2005-07-04 13:37:02 UTC (rev 16409) @@ -1865,30 +1865,20 @@ case WM_UPDATEUISTATE: { - BOOL OldFocusVisible = infoPtr->FocusVisible; - - switch(LOWORD(wParam)) + if (HIWORD(wParam) & UISF_HIDEFOCUS) { - case UIS_CLEAR: + BOOL OldFocusVisible = infoPtr->FocusVisible; + + infoPtr->FocusVisible = (LOWORD(wParam) == UIS_CLEAR); + + if (infoPtr->FocusVisible != OldFocusVisible && + infoPtr->FocusedCheckItem != NULL) { - infoPtr->FocusVisible = (HIWORD(wParam) & UISF_HIDEFOCUS); - break; + UpdateCheckItemBox(infoPtr, + infoPtr->FocusedCheckItem, + infoPtr->FocusedCheckItemBox); } - case UIS_SET: - case UIS_INITIALIZE: - { - infoPtr->FocusVisible = !(HIWORD(wParam) & UISF_HIDEFOCUS); - break; - } } - - if (infoPtr->FocusVisible != OldFocusVisible && - infoPtr->FocusedCheckItem != NULL) - { - UpdateCheckItemBox(infoPtr, - infoPtr->FocusedCheckItem, - infoPtr->FocusedCheckItemBox); - } break; }

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