Ros-diffs January 2007

ros-diffs@reactos.org

21 participants
401 discussions

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Jan 7 15:37:27 2007 New Revision: 25338 URL: http://svn.reactos.org/svn/reactos?rev=25338&view=rev Log: fix paths Modified: trunk/reactos/apistatus.lst Modified: trunk/reactos/apistatus.lst URL: http://svn.reactos.org/svn/reactos/trunk/reactos/apistatus.lst?rev=25338&r1… ============================================================================== --- trunk/reactos/apistatus.lst (original) +++ trunk/reactos/apistatus.lst Sun Jan 7 15:37:27 2007 @@ -3,27 +3,27 @@ ; COMPONENT_NAME - Name of the component. Eg. kernel32.dll. ; PATH_TO_COMPONENT_SOURCES - Relative path to sources (relative to ; where rgenstat is run from). -advapi32.dll reactos/lib/advapi32 -crtdll.dll reactos/lib/crtdll -gdi32.dll reactos/lib/gdi32 -gdiplus.dll reactos/lib/gdiplus -iphlpapi.dll reactos/lib/iphlpapi -kernel32.dll reactos/lib/kernel32 -lz32.dll reactos/lib/lzexpand -msvcrt.dll reactos/lib/msvcrt -rpcrt4.dll reactos/lib/rpcrt4 -secur32.dll reactos/lib/secur32 -snmpapi.dll reactos/lib/snmpapi -user32.dll reactos/lib/user32 -version.dll reactos/lib/version -winspool.dll reactos/lib/winspool -ws2_32.dll reactos/lib/ws2_32 -wsock32.dll reactos/lib/wsock32 +advapi32.dll reactos/dll/win32/advapi32 +crtdll.dll reactos/dll/win32/crtdll +gdi32.dll reactos/dll/win32/gdi32 +gdiplus.dll reactos/dll/win32/gdiplus +iphlpapi.dll reactos/dll/win32/iphlpapi +kernel32.dll reactos/dll/win32/kernel32 +lz32.dll reactos/dll/win32/lzexpand +msvcrt.dll reactos/dll/win32/msvcrt +rpcrt4.dll reactos/dll/win32/rpcrt4 +secur32.dll reactos/dll/win32/secur32 +snmpapi.dll reactos/dll/win32/snmpapi +user32.dll reactos/dll/win32/user32 +version.dll reactos/dll/win32/version +winspool.dll reactos/dll/win32/winspool +ws2_32.dll reactos/dll/win32/ws2_32 +wsock32.dll reactos/dll/win32/wsock32 videoprt.dll reactos/drivers/video/videoprt -ndis.sys reactos/drivers/net/ndis -tdi.sys reactos/drivers/net/tdi +ndis.sys reactos/drivers/network/ndis +tdi.sys reactos/drivers/network/tdi class2.sys reactos/drivers/storage/class2 scsiport.sys reactos/drivers/storage/scsiport ntoskrnl.exe reactos/ntoskrnl ntoskrnl.exe reactos/lib/rtl -win32k.sys reactos/subsys/win32k +win32k.sys reactos/subsystems/win32/win32k

17 years, 11 months

[ion] 25337: - Smallish changes to HalpReboot to make flags clearer and fixup one of them.

by ion＠svn.reactos.org

Author: ion Date: Sun Jan 7 09:49:00 2007 New Revision: 25337 URL: http://svn.reactos.org/svn/reactos?rev=25337&view=rev Log: - Smallish changes to HalpReboot to make flags clearer and fixup one of them. Modified: trunk/reactos/hal/halx86/generic/reboot.c Modified: trunk/reactos/hal/halx86/generic/reboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/reboot.… ============================================================================== --- trunk/reactos/hal/halx86/generic/reboot.c (original) +++ trunk/reactos/hal/halx86/generic/reboot.c Sun Jan 7 09:49:00 2007 @@ -46,7 +46,7 @@ /* Read periodic register and clear the interrupt enable */ Data = READ_PORT_UCHAR((PUCHAR)0x71); - WRITE_PORT_UCHAR((PUCHAR)0x71, Data & 0xBF); + WRITE_PORT_UCHAR((PUCHAR)0x71, Data & ~0x40); KeStallExecutionProcessor(1); /* Setup control register A */ @@ -55,7 +55,7 @@ /* Read divider rate and reset it */ Data = READ_PORT_UCHAR((PUCHAR)0x71); - WRITE_PORT_UCHAR((PUCHAR)0x71, (Data & 0xF0) | 0x06); + WRITE_PORT_UCHAR((PUCHAR)0x71, (Data & ~0x9) | 0x06); KeStallExecutionProcessor(1); /* Reset neutral CMOS address */

17 years, 11 months

[ion] 25336: - Fix multiple bugs in HalpCalculateChsValues. - Fix lots of typecast warnings. - Fix potentially uninitialized variables. - This should fix the partitioning problems/regression. Thanks to hto for finding out the source of the bug.

by ion＠svn.reactos.org

Author: ion Date: Sun Jan 7 03:50:41 2007 New Revision: 25336 URL: http://svn.reactos.org/svn/reactos?rev=25336&view=rev Log: - Fix multiple bugs in HalpCalculateChsValues. - Fix lots of typecast warnings. - Fix potentially uninitialized variables. - This should fix the partitioning problems/regression. Thanks to hto for finding out the source of the bug. Modified: trunk/reactos/ntoskrnl/fstub/disksup.c Modified: trunk/reactos/ntoskrnl/fstub/disksup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/disksup.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fstub/disksup.c (original) +++ trunk/reactos/ntoskrnl/fstub/disksup.c Sun Jan 7 03:50:41 2007 @@ -1009,24 +1009,23 @@ IN ULONGLONG MaxOffset, IN ULONGLONG MaxSector) { - ULONGLONG endingSector; + ULONGLONG EndingSector; PAGED_CODE(); /* Unused partitions are considered valid */ if (Entry->PartitionType == PARTITION_ENTRY_UNUSED) return TRUE; /* Get the last sector of the partition */ - endingSector = GET_STARTING_SECTOR(Entry) + - GET_PARTITION_LENGTH(Entry); + EndingSector = GET_STARTING_SECTOR(Entry) + GET_PARTITION_LENGTH(Entry); /* Check if it's more then the maximum sector */ - if (endingSector > MaxSector) + if (EndingSector > MaxSector) { /* Invalid partition */ DPRINT1("FSTUB: entry is invalid\n"); DPRINT1("FSTUB: offset %#08lx\n", GET_STARTING_SECTOR(Entry)); DPRINT1("FSTUB: length %#08lx\n", GET_PARTITION_LENGTH(Entry)); - DPRINT1("FSTUB: end %#I64x\n", endingSector); + DPRINT1("FSTUB: end %#I64x\n", EndingSector); DPRINT1("FSTUB: max %#I64x\n", MaxSector); return FALSE; } @@ -1036,7 +1035,7 @@ DPRINT1("FSTUB: entry is invalid\n"); DPRINT1("FSTUB: offset %#08lx\n", GET_STARTING_SECTOR(Entry)); DPRINT1("FSTUB: length %#08lx\n", GET_PARTITION_LENGTH(Entry)); - DPRINT1("FSTUB: end %#I64x\n", endingSector); + DPRINT1("FSTUB: end %#I64x\n", EndingSector); DPRINT1("FSTUB: maxOffset %#I64x\n", MaxOffset); return FALSE; } @@ -1055,59 +1054,69 @@ IN ULONG ConventionalCylinders, OUT PPARTITION_DESCRIPTOR PartitionDescriptor) { - LARGE_INTEGER FirstSector, SectorCount, LastSector; - ULONG SectorsPerCylinder, StartCluster, EndCluster; - ULONG StartHead, EndHead; - ULONG StartSector, EndSector; - ULONG Remainder; + LARGE_INTEGER FirstSector, SectorCount; + ULONG LastSector, Remainder, SectorsPerCylinder; + ULONG StartingCylinder, EndingCylinder; + ULONG StartingTrack, EndingTrack; + ULONG StartingSector, EndingSector; PAGED_CODE(); /* Calculate the number of sectors for each cylinder */ SectorsPerCylinder = SectorsPerTrack * NumberOfTracks; - /* Calculate the start and end sector, as well as the count */ + /* Calculate the first sector, and the sector count */ FirstSector.QuadPart = PartitionOffset->QuadPart >> ShiftCount; SectorCount.QuadPart = PartitionLength->QuadPart >> ShiftCount; - LastSector.QuadPart = FirstSector.QuadPart + SectorCount.QuadPart - 1; - - /* Calculate the start and end clusters */ - StartCluster = FirstSector.LowPart / SectorsPerCylinder; - EndCluster = LastSector.LowPart / SectorsPerCylinder; + + /* Now calculate the last sector */ + LastSector = FirstSector.LowPart + SectorCount.LowPart - 1; + + /* Calculate the first and last cylinders */ + StartingCylinder = FirstSector.LowPart / SectorsPerCylinder; + EndingCylinder = LastSector / SectorsPerCylinder; /* Set the default number of cylinders */ if (!ConventionalCylinders) ConventionalCylinders = 1024; /* Normalize the values */ - if (StartCluster >= ConventionalCylinders) + if (StartingCylinder >= ConventionalCylinders) { /* Set the maximum to 1023 */ - StartCluster = ConventionalCylinders - 1; - } - if (EndCluster >= ConventionalCylinders) + StartingCylinder = ConventionalCylinders - 1; + } + if (EndingCylinder >= ConventionalCylinders) { /* Set the maximum to 1023 */ - EndCluster = ConventionalCylinders - 1; + EndingCylinder = ConventionalCylinders - 1; } /* Calculate the starting head and sector that still remain */ - Remainder = StartCluster % SectorsPerCylinder; - StartHead = Remainder / SectorsPerTrack; - StartSector = Remainder % SectorsPerTrack; + Remainder = FirstSector.LowPart % SectorsPerCylinder; + StartingTrack = Remainder / SectorsPerTrack; + StartingSector = Remainder % SectorsPerTrack; /* Calculate the ending head and sector that still remain */ - Remainder = EndCluster % SectorsPerCylinder; - EndHead = Remainder / SectorsPerTrack; - EndSector = Remainder % SectorsPerTrack; - - /* Write the values in the descriptor */ - PartitionDescriptor->StartingCylinderMsb = StartCluster; - PartitionDescriptor->EndingCylinderMsb = EndCluster; - PartitionDescriptor->StartingTrack = StartHead; - PartitionDescriptor->EndingTrack = EndHead; - PartitionDescriptor->StartingCylinderLsb = ((StartSector + 1) & 0x3F) | - ((StartCluster >> 2) & 0xC0); - PartitionDescriptor->EndingCylinderLsb = ((EndSector + 1) & 0x3F) | - ((EndCluster >> 2) & 0xC0); + Remainder = LastSector % SectorsPerCylinder; + EndingTrack = Remainder / SectorsPerTrack; + EndingSector = Remainder % SectorsPerTrack; + + /* Set cylinder data for the MSB */ + PartitionDescriptor->StartingCylinderMsb = (UCHAR)StartingCylinder; + PartitionDescriptor->EndingCylinderMsb = (UCHAR)EndingCylinder; + + /* Set the track data */ + PartitionDescriptor->StartingTrack = (UCHAR)StartingTrack; + PartitionDescriptor->EndingTrack = (UCHAR)EndingTrack; + + /* Update cylinder data for the LSB */ + StartingCylinder = ((StartingSector + 1) & 0x3F) | + ((StartingCylinder >> 2) & 0xC0); + EndingCylinder = ((EndingSector + 1) & 0x3F) | + ((EndingCylinder >> 2) & 0xC0); + + /* Set the cylinder data for the LSB */ + PartitionDescriptor->StartingCylinderLsb = (UCHAR)StartingCylinder; + PartitionDescriptor->EndingCylinderLsb = (UCHAR)EndingCylinder; } VOID @@ -1338,6 +1347,7 @@ PIO_STACK_LOCATION IoStackLocation; PBOOT_SECTOR_INFO BootSectorInfo = (PBOOT_SECTOR_INFO)Buffer; UCHAR PartitionType; + LARGE_INTEGER HiddenSectors64; VolumeOffset.QuadPart = Offset.QuadPart = 0; PAGED_CODE(); @@ -1584,18 +1594,19 @@ PartitionInfo->StartingOffset.QuadPart = StartOffset + UInt32x32To64(GET_STARTING_SECTOR(PartitionDescriptor), - SectorSize); + SectorSize); /* Calculate the number of hidden sectors */ - PartitionInfo->HiddenSectors = (PartitionInfo-> - StartingOffset.QuadPart - - StartOffset) / - SectorSize; + HiddenSectors64.QuadPart = (PartitionInfo-> + StartingOffset.QuadPart - + StartOffset) / + SectorSize; + PartitionInfo->HiddenSectors = HiddenSectors64.LowPart; /* Get the partition length */ PartitionInfo->PartitionLength.QuadPart = UInt32x32To64(GET_PARTITION_LENGTH(PartitionDescriptor), - SectorSize); + SectorSize); /* FIXME: REACTOS HACK */ PartitionInfo->PartitionNumber = i + 1; @@ -1845,9 +1856,9 @@ if (++i == PartitionNumber) { /* We found a match, set the type */ - PartitionDescriptor->PartitionType = PartitionType; - - /* Reset the resusable event */ + PartitionDescriptor->PartitionType = (UCHAR)PartitionType; + + /* Reset the reusable event */ KeResetEvent(&Event); /* Build the write IRP */ @@ -1947,7 +1958,8 @@ PPARTITION_TABLE PartitionTable; LARGE_INTEGER Offset, NextOffset, ExtendedOffset, SectorOffset; LARGE_INTEGER StartOffset, PartitionLength; - ULONG i, j, k; + ULONG i, j; + CCHAR k; BOOLEAN IsEzDrive = FALSE, IsSuperFloppy = FALSE, DoRewrite = FALSE, IsMbr; ULONG ConventionalCylinders; LONGLONG DiskSize; @@ -1957,7 +1969,7 @@ PIO_STACK_LOCATION IoStackLocation; PPARTITION_INFORMATION PartitionInfo = PartitionBuffer->PartitionEntry; PPARTITION_INFORMATION TableEntry; - NextOffset.QuadPart = Offset.QuadPart = 0; + ExtendedOffset.QuadPart = NextOffset.QuadPart = Offset.QuadPart = 0; PAGED_CODE(); /* Normalize the buffer size */ @@ -2011,14 +2023,15 @@ Buffer = ExAllocatePoolWithTag(NonPagedPool, PAGE_SIZE, TAG_FILE_SYSTEM); if (!Buffer) return STATUS_INSUFFICIENT_RESOURCES; + /* Loop the entries */ Entry = (PPTE)&Buffer[PARTITION_TABLE_OFFSET]; for (i = 0; i < DiskLayout->TableCount; i++) { /* Set if this is the MBR partition */ - IsMbr= !i; + IsMbr= (BOOLEAN)!i; /* Initialize th event */ - KeInitializeEvent( &Event, NotificationEvent, FALSE ); + KeInitializeEvent(&Event, NotificationEvent, FALSE); /* Build the read IRP */ Irp = IoBuildSynchronousFsdRequest(IRP_MJ_READ,

17 years, 11 months

[arty] 25335: Hal stubs. Build halppc.

by arty＠svn.reactos.org

Author: arty Date: Sun Jan 7 01:31:50 2007 New Revision: 25335 URL: http://svn.reactos.org/svn/reactos?rev=25335&view=rev Log: Hal stubs. Build halppc. Added: branches/powerpc/reactos/hal/halppc/ branches/powerpc/reactos/hal/halppc/directory.rbuild branches/powerpc/reactos/hal/halppc/generic/ branches/powerpc/reactos/hal/halppc/generic/beep.c branches/powerpc/reactos/hal/halppc/generic/bus.c branches/powerpc/reactos/hal/halppc/generic/display.c branches/powerpc/reactos/hal/halppc/generic/dma.c branches/powerpc/reactos/hal/halppc/generic/drive.c branches/powerpc/reactos/hal/halppc/generic/enum.c branches/powerpc/reactos/hal/halppc/generic/fmutex.c branches/powerpc/reactos/hal/halppc/generic/generic.rbuild branches/powerpc/reactos/hal/halppc/generic/halinit.c branches/powerpc/reactos/hal/halppc/generic/ipi.c branches/powerpc/reactos/hal/halppc/generic/irq.S branches/powerpc/reactos/hal/halppc/generic/irql.c branches/powerpc/reactos/hal/halppc/generic/isa.c branches/powerpc/reactos/hal/halppc/generic/kdbg.c branches/powerpc/reactos/hal/halppc/generic/mca.c branches/powerpc/reactos/hal/halppc/generic/misc.c branches/powerpc/reactos/hal/halppc/generic/pci.c branches/powerpc/reactos/hal/halppc/generic/portio.c branches/powerpc/reactos/hal/halppc/generic/processor.c branches/powerpc/reactos/hal/halppc/generic/pwroff.c branches/powerpc/reactos/hal/halppc/generic/reboot.c branches/powerpc/reactos/hal/halppc/generic/resource.c branches/powerpc/reactos/hal/halppc/generic/spinlock.c branches/powerpc/reactos/hal/halppc/generic/sysbus.c branches/powerpc/reactos/hal/halppc/generic/sysinfo.c branches/powerpc/reactos/hal/halppc/generic/systimer.S branches/powerpc/reactos/hal/halppc/generic/time.c branches/powerpc/reactos/hal/halppc/generic/timer.c branches/powerpc/reactos/hal/halppc/include/ branches/powerpc/reactos/hal/halppc/include/apic.h branches/powerpc/reactos/hal/halppc/include/bus.h branches/powerpc/reactos/hal/halppc/include/hal.h branches/powerpc/reactos/hal/halppc/include/haldma.h branches/powerpc/reactos/hal/halppc/include/halirq.h branches/powerpc/reactos/hal/halppc/include/halp.h branches/powerpc/reactos/hal/halppc/include/ioapic.h branches/powerpc/reactos/hal/halppc/include/mps.h branches/powerpc/reactos/hal/halppc/up/ branches/powerpc/reactos/hal/halppc/up/halinit_up.c branches/powerpc/reactos/hal/halppc/up/halup.rbuild branches/powerpc/reactos/hal/halppc/up/halup.rc [This mail would be too long, it was shortened to contain the URLs only.] Added: branches/powerpc/reactos/hal/halppc/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/dire… Added: branches/powerpc/reactos/hal/halppc/generic/beep.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/gene… Added: branches/powerpc/reactos/hal/halppc/generic/bus.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/gene… Added: branches/powerpc/reactos/hal/halppc/generic/display.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/gene… Added: branches/powerpc/reactos/hal/halppc/generic/dma.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/gene… Added: branches/powerpc/reactos/hal/halppc/generic/drive.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/gene… Added: branches/powerpc/reactos/hal/halppc/generic/enum.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/gene… Added: branches/powerpc/reactos/hal/halppc/generic/fmutex.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/gene… Added: branches/powerpc/reactos/hal/halppc/generic/generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/gene… Added: branches/powerpc/reactos/hal/halppc/generic/halinit.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/gene… Added: branches/powerpc/reactos/hal/halppc/generic/ipi.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/gene… Added: branches/powerpc/reactos/hal/halppc/generic/irq.S URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/gene… Added: branches/powerpc/reactos/hal/halppc/generic/irql.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/gene… Added: branches/powerpc/reactos/hal/halppc/generic/isa.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/gene… Added: branches/powerpc/reactos/hal/halppc/generic/kdbg.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/gene… Added: branches/powerpc/reactos/hal/halppc/generic/mca.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/gene… Added: branches/powerpc/reactos/hal/halppc/generic/misc.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/gene… Added: branches/powerpc/reactos/hal/halppc/generic/pci.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/gene… Added: branches/powerpc/reactos/hal/halppc/generic/portio.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/gene… Added: branches/powerpc/reactos/hal/halppc/generic/processor.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/gene… Added: branches/powerpc/reactos/hal/halppc/generic/pwroff.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/gene… Added: branches/powerpc/reactos/hal/halppc/generic/reboot.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/gene… Added: branches/powerpc/reactos/hal/halppc/generic/resource.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/gene… Added: branches/powerpc/reactos/hal/halppc/generic/spinlock.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/gene… Added: branches/powerpc/reactos/hal/halppc/generic/sysbus.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/gene… Added: branches/powerpc/reactos/hal/halppc/generic/sysinfo.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/gene… Added: branches/powerpc/reactos/hal/halppc/generic/systimer.S URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/gene… Added: branches/powerpc/reactos/hal/halppc/generic/time.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/gene… Added: branches/powerpc/reactos/hal/halppc/generic/timer.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/gene… Added: branches/powerpc/reactos/hal/halppc/include/apic.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/incl… Added: branches/powerpc/reactos/hal/halppc/include/bus.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/incl… Added: branches/powerpc/reactos/hal/halppc/include/hal.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/incl… Added: branches/powerpc/reactos/hal/halppc/include/haldma.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/incl… Added: branches/powerpc/reactos/hal/halppc/include/halirq.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/incl… Added: branches/powerpc/reactos/hal/halppc/include/halp.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/incl… Added: branches/powerpc/reactos/hal/halppc/include/ioapic.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/incl… Added: branches/powerpc/reactos/hal/halppc/include/mps.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/incl… Added: branches/powerpc/reactos/hal/halppc/up/halinit_up.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/up/h… Added: branches/powerpc/reactos/hal/halppc/up/halup.rbuild URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/up/h… Added: branches/powerpc/reactos/hal/halppc/up/halup.rc URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/up/h…

17 years, 11 months

[tretiakov] 25334: Add DisableVmwInst option to unattend setup to disable vmware driver setup wizard

by tretiakov＠svn.reactos.org

Author: tretiakov Date: Sun Jan 7 00:18:36 2007 New Revision: 25334 URL: http://svn.reactos.org/svn/reactos?rev=25334&view=rev Log: Add DisableVmwInst option to unattend setup to disable vmware driver setup wizard Modified: trunk/reactos/boot/bootdata/unattend.inf.sample trunk/reactos/dll/win32/syssetup/globals.h trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/boot/bootdata/unattend.inf.sample URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/unattend.inf… ============================================================================== --- trunk/reactos/boot/bootdata/unattend.inf.sample (original) +++ trunk/reactos/boot/bootdata/unattend.inf.sample Sun Jan 7 00:18:36 2007 @@ -31,6 +31,8 @@ ; DisableAutoDaylightTimeSet = 1 ; enable this setting to format the selected partition +; 1 - format enabled +; 0 - format disabled FormatPartition=1 ; enable this section to automatically launch programs @@ -38,3 +40,8 @@ ; ; [GuiRunOnce] ; %SystemRoot%\system32\cmd.exe + +; enable this setting to disable vmware driver install +; yes - disabled +; no - enabled +DisableVmwInst = yes Modified: trunk/reactos/dll/win32/syssetup/globals.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/globals… ============================================================================== --- trunk/reactos/dll/win32/syssetup/globals.h (original) +++ trunk/reactos/dll/win32/syssetup/globals.h Sun Jan 7 00:18:36 2007 @@ -46,6 +46,7 @@ TCHAR ComputerName[MAX_COMPUTERNAME_LENGTH + 1]; /* max. 63 characters */ TCHAR AdminPassword[15]; /* max. 14 characters */ BOOL UnattendSetup; + BOOL DisableVmwInst; SYSTEMTIME SystemTime; PTIMEZONE_ENTRY TimeZoneListHead; Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c Sun Jan 7 00:18:36 2007 @@ -1784,7 +1784,8 @@ if (wParam) { #ifdef VMWINST - RunVMWInstall(GetParent(hwndDlg)); + if(!SetupData->UnattendSetup && !SetupData->DisableVmwInst) + RunVMWInstall(GetParent(hwndDlg)); #endif /* Enable the Back and Next buttons */ @@ -2003,6 +2004,11 @@ { SetupData.DisableAutoDaylightTimeSet = _ttoi(szValue); } + else if (_tcscmp(szName, _T("DisableVmwInst"))) + { + if(_tcscmp(szValue, _T("yes"))) SetupData.DisableVmwInst = 1; + else SetupData.DisableVmwInst = 0; + } } while (SetupFindNextLine(&InfContext, &InfContext));

17 years, 11 months

[arty] 25333: Make this allow POWERPC as well.

by arty＠svn.reactos.org

Author: arty Date: Sat Jan 6 23:01:20 2007 New Revision: 25333 URL: http://svn.reactos.org/svn/reactos?rev=25333&view=rev Log: Make this allow POWERPC as well. Modified: branches/powerpc/reactos/ntoskrnl/ldr/loader.c Modified: branches/powerpc/reactos/ntoskrnl/ldr/loader.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/ldr/lo… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/ldr/loader.c (original) +++ branches/powerpc/reactos/ntoskrnl/ldr/loader.c Sat Jan 6 23:01:20 2007 @@ -952,7 +952,11 @@ { return NULL; } +#ifdef _M_IX86 if (PENtHeaders->FileHeader.Machine != IMAGE_FILE_MACHINE_I386) +#elif defined(_M_PPC) + if (PENtHeaders->FileHeader.Machine != IMAGE_FILE_MACHINE_POWERPC) +#endif { return NULL; }

17 years, 11 months

[fireball] 25332: Dmitry G. Gorbachev (hto at mail cnt dot ru): NtOpenKey() calls ObpCaptureObjectAttributes() which can return null ObjectName. Then null pointer used in if (ObjectName.Buffer[(ObjectName.Length / sizeof(WCHAR)) - 1] == '\\') which leads to a crash.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Jan 6 22:14:41 2007 New Revision: 25332 URL: http://svn.reactos.org/svn/reactos?rev=25332&view=rev Log: Dmitry G. Gorbachev (hto at mail cnt dot ru): NtOpenKey() calls ObpCaptureObjectAttributes() which can return null ObjectName. Then null pointer used in if (ObjectName.Buffer[(ObjectName.Length / sizeof(WCHAR)) - 1] == '\\') which leads to a crash. Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/ntfunc.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/ntfunc.c (original) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c Sat Jan 6 22:14:41 2007 @@ -1367,7 +1367,8 @@ return Status; } - if (ObjectName.Buffer[(ObjectName.Length / sizeof(WCHAR)) - 1] == '\\') + if (ObjectName.Buffer && + ObjectName.Buffer[(ObjectName.Length / sizeof(WCHAR)) - 1] == '\\') { ObjectName.Buffer[(ObjectName.Length / sizeof(WCHAR)) - 1] = UNICODE_NULL; ObjectName.Length -= sizeof(WCHAR);

17 years, 11 months

[ekohl] 25331: - Don't use hardcoded colors. - Calculate the menu bar rectangle. - Add preview menu and remove the menu item strings. - Draw the menu bar using DrawMenuBarTemp.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Jan 6 19:53:07 2007 New Revision: 25331 URL: http://svn.reactos.org/svn/reactos?rev=25331&view=rev Log: - Don't use hardcoded colors. - Calculate the menu bar rectangle. - Add preview menu and remove the menu item strings. - Draw the menu bar using DrawMenuBarTemp. Modified: trunk/reactos/dll/cpl/desk/Fr.rc trunk/reactos/dll/cpl/desk/It.rc trunk/reactos/dll/cpl/desk/Ja.rc trunk/reactos/dll/cpl/desk/Ru.rc trunk/reactos/dll/cpl/desk/Uk.rc trunk/reactos/dll/cpl/desk/cz.rc trunk/reactos/dll/cpl/desk/de.rc trunk/reactos/dll/cpl/desk/en.rc trunk/reactos/dll/cpl/desk/es.rc trunk/reactos/dll/cpl/desk/gr.rc trunk/reactos/dll/cpl/desk/hu.rc trunk/reactos/dll/cpl/desk/nl.rc trunk/reactos/dll/cpl/desk/pl.rc trunk/reactos/dll/cpl/desk/preview.c trunk/reactos/dll/cpl/desk/resource.h trunk/reactos/dll/cpl/desk/sv.rc Modified: trunk/reactos/dll/cpl/desk/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/Fr.rc?rev=253… ============================================================================== --- trunk/reactos/dll/cpl/desk/Fr.rc (original) +++ trunk/reactos/dll/cpl/desk/Fr.rc Sat Jan 6 19:53:07 2007 @@ -96,6 +96,13 @@ END END +IDR_PREVIEW_MENU MENU +BEGIN + MENUITEM "Normal", ID_MENU_NORMAL + MENUITEM "Disabled", ID_MENU_DISABLED + MENUITEM "Selected", ID_MENU_SELECTED +END + STRINGTABLE BEGIN IDS_CPLNAME "Affichage" @@ -131,7 +138,4 @@ IDS_MESSBOX "Message Box" IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" - IDS_NORMAL "Normal" - IDS_DISABLED "Disabled" - IDS_SELECTED "Selected" END Modified: trunk/reactos/dll/cpl/desk/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/It.rc?rev=253… ============================================================================== --- trunk/reactos/dll/cpl/desk/It.rc (original) +++ trunk/reactos/dll/cpl/desk/It.rc Sat Jan 6 19:53:07 2007 @@ -90,6 +90,13 @@ END END +IDR_PREVIEW_MENU MENU +BEGIN + MENUITEM "Normal", ID_MENU_NORMAL + MENUITEM "Disabled", ID_MENU_DISABLED + MENUITEM "Selected", ID_MENU_SELECTED +END + STRINGTABLE BEGIN IDS_CPLNAME "Visualizzazione" @@ -125,7 +132,4 @@ IDS_MESSBOX "Message Box" IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" - IDS_NORMAL "Normal" - IDS_DISABLED "Disabled" - IDS_SELECTED "Selected" END Modified: trunk/reactos/dll/cpl/desk/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/Ja.rc?rev=253… ============================================================================== --- trunk/reactos/dll/cpl/desk/Ja.rc (original) +++ trunk/reactos/dll/cpl/desk/Ja.rc Sat Jan 6 19:53:07 2007 @@ -94,6 +94,13 @@ END END +IDR_PREVIEW_MENU MENU +BEGIN + MENUITEM "Normal", ID_MENU_NORMAL + MENUITEM "Disabled", ID_MENU_DISABLED + MENUITEM "Selected", ID_MENU_SELECTED +END + STRINGTABLE BEGIN IDS_CPLNAME "æÊ" @@ -129,7 +136,4 @@ IDS_MESSBOX "Message Box" IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" - IDS_NORMAL "Normal" - IDS_DISABLED "Disabled" - IDS_SELECTED "Selected" END Modified: trunk/reactos/dll/cpl/desk/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/Ru.rc?rev=253… ============================================================================== --- trunk/reactos/dll/cpl/desk/Ru.rc (original) +++ trunk/reactos/dll/cpl/desk/Ru.rc Sat Jan 6 19:53:07 2007 @@ -81,12 +81,6 @@ PUSHBUTTON "Äî&ïîëíèòåëüíî...",IDC_SETTINGS_ADVANCED,306,165,56,14 END - -///////////////////////////////////////////////////////////////////////////// -// -// Menu -// - IDR_POPUP_MENU MENU BEGIN POPUP "" @@ -99,11 +93,12 @@ END END - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// +IDR_PREVIEW_MENU MENU +BEGIN + MENUITEM "Normal", ID_MENU_NORMAL + MENUITEM "Disabled", ID_MENU_DISABLED + MENUITEM "Selected", ID_MENU_SELECTED +END STRINGTABLE BEGIN @@ -151,7 +146,4 @@ IDS_MESSBOX "Message Box" IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" - IDS_NORMAL "Normal" - IDS_DISABLED "Disabled" - IDS_SELECTED "Selected" END Modified: trunk/reactos/dll/cpl/desk/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/Uk.rc?rev=253… ============================================================================== --- trunk/reactos/dll/cpl/desk/Uk.rc (original) +++ trunk/reactos/dll/cpl/desk/Uk.rc Sat Jan 6 19:53:07 2007 @@ -98,6 +98,13 @@ END END +IDR_PREVIEW_MENU MENU +BEGIN + MENUITEM "Normal", ID_MENU_NORMAL + MENUITEM "Disabled", ID_MENU_DISABLED + MENUITEM "Selected", ID_MENU_SELECTED +END + STRINGTABLE BEGIN IDS_CPLNAME "Äèñïëåé" @@ -133,7 +140,4 @@ IDS_MESSBOX "Message Box" IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" - IDS_NORMAL "Normal" - IDS_DISABLED "Disabled" - IDS_SELECTED "Selected" END Modified: trunk/reactos/dll/cpl/desk/cz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/cz.rc?rev=253… ============================================================================== --- trunk/reactos/dll/cpl/desk/cz.rc (original) +++ trunk/reactos/dll/cpl/desk/cz.rc Sat Jan 6 19:53:07 2007 @@ -94,7 +94,14 @@ END END -STRINGTABLE +IDR_PREVIEW_MENU MENU +BEGIN + MENUITEM "Normal", ID_MENU_NORMAL + MENUITEM "Disabled", ID_MENU_DISABLED + MENUITEM "Selected", ID_MENU_SELECTED +END + +STRINGTABLE BEGIN IDS_CPLNAME "Obrazovka" IDS_CPLDESCRIPTION "Nastavení obrazovky, spoøièe, vzhledu a rozliení." @@ -123,7 +130,4 @@ IDS_MESSBOX "Message Box" IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" - IDS_NORMAL "Normal" - IDS_DISABLED "Disabled" - IDS_SELECTED "Selected" END Modified: trunk/reactos/dll/cpl/desk/de.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/de.rc?rev=253… ============================================================================== --- trunk/reactos/dll/cpl/desk/de.rc (original) +++ trunk/reactos/dll/cpl/desk/de.rc Sat Jan 6 19:53:07 2007 @@ -83,14 +83,21 @@ IDR_POPUP_MENU MENU DISCARDABLE BEGIN - POPUP "" - BEGIN - MENUITEM "&Konfigurieren", ID_MENU_CONFIG - MENUITEM "&Vorschau", ID_MENU_PREVIEW - MENUITEM SEPARATOR - MENUITEM "&Hinzufügen", ID_MENU_ADD - MENUITEM "&Löschen\tDel", ID_MENU_DELETE - END + POPUP "" + BEGIN + MENUITEM "&Konfigurieren", ID_MENU_CONFIG + MENUITEM "&Vorschau", ID_MENU_PREVIEW + MENUITEM SEPARATOR + MENUITEM "&Hinzufügen", ID_MENU_ADD + MENUITEM "&Löschen\tDel", ID_MENU_DELETE + END +END + +IDR_PREVIEW_MENU MENU +BEGIN + MENUITEM "Normal", ID_MENU_NORMAL + MENUITEM "Disabled", ID_MENU_DISABLED + MENUITEM "Selected", ID_MENU_SELECTED END STRINGTABLE @@ -127,7 +134,4 @@ IDS_MESSBOX "Message Box" IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" - IDS_NORMAL "Normal" - IDS_DISABLED "Disabled" - IDS_SELECTED "Selected" END Modified: trunk/reactos/dll/cpl/desk/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/en.rc?rev=253… ============================================================================== --- trunk/reactos/dll/cpl/desk/en.rc (original) +++ trunk/reactos/dll/cpl/desk/en.rc Sat Jan 6 19:53:07 2007 @@ -90,6 +90,13 @@ END END +IDR_PREVIEW_MENU MENU +BEGIN + MENUITEM "Normal", ID_MENU_NORMAL + MENUITEM "Disabled", ID_MENU_DISABLED + MENUITEM "Selected", ID_MENU_SELECTED +END + STRINGTABLE BEGIN IDS_CPLNAME "Display" @@ -125,7 +132,4 @@ IDS_MESSBOX "Message Box" IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" - IDS_NORMAL "Normal" - IDS_DISABLED "Disabled" - IDS_SELECTED "Selected" END Modified: trunk/reactos/dll/cpl/desk/es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/es.rc?rev=253… ============================================================================== --- trunk/reactos/dll/cpl/desk/es.rc (original) +++ trunk/reactos/dll/cpl/desk/es.rc Sat Jan 6 19:53:07 2007 @@ -101,6 +101,13 @@ END END +IDR_PREVIEW_MENU MENU +BEGIN + MENUITEM "Normal", ID_MENU_NORMAL + MENUITEM "Disabled", ID_MENU_DISABLED + MENUITEM "Selected", ID_MENU_SELECTED +END + STRINGTABLE BEGIN IDS_CPLNAME "Pantalla" @@ -130,7 +137,4 @@ IDS_MESSBOX "Message Box" IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" - IDS_NORMAL "Normal" - IDS_DISABLED "Disabled" - IDS_SELECTED "Selected" END Modified: trunk/reactos/dll/cpl/desk/gr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/gr.rc?rev=253… ============================================================================== --- trunk/reactos/dll/cpl/desk/gr.rc (original) +++ trunk/reactos/dll/cpl/desk/gr.rc Sat Jan 6 19:53:07 2007 @@ -94,6 +94,13 @@ END END +IDR_PREVIEW_MENU MENU +BEGIN + MENUITEM "Normal", ID_MENU_NORMAL + MENUITEM "Disabled", ID_MENU_DISABLED + MENUITEM "Selected", ID_MENU_SELECTED +END + STRINGTABLE BEGIN IDS_CPLNAME "Display" @@ -129,7 +136,4 @@ IDS_MESSBOX "Message Box" IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" - IDS_NORMAL "Normal" - IDS_DISABLED "Disabled" - IDS_SELECTED "Selected" END Modified: trunk/reactos/dll/cpl/desk/hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/hu.rc?rev=253… ============================================================================== --- trunk/reactos/dll/cpl/desk/hu.rc (original) +++ trunk/reactos/dll/cpl/desk/hu.rc Sat Jan 6 19:53:07 2007 @@ -82,6 +82,13 @@ END END +IDR_PREVIEW_MENU MENU +BEGIN + MENUITEM "Normal", ID_MENU_NORMAL + MENUITEM "Disabled", ID_MENU_DISABLED + MENUITEM "Selected", ID_MENU_SELECTED +END + STRINGTABLE BEGIN IDS_CPLNAME "Képernyõ" @@ -117,7 +124,4 @@ IDS_MESSBOX "Message Box" IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" - IDS_NORMAL "Normal" - IDS_DISABLED "Disabled" - IDS_SELECTED "Selected" END Modified: trunk/reactos/dll/cpl/desk/nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/nl.rc?rev=253… ============================================================================== --- trunk/reactos/dll/cpl/desk/nl.rc (original) +++ trunk/reactos/dll/cpl/desk/nl.rc Sat Jan 6 19:53:07 2007 @@ -94,6 +94,13 @@ END END +IDR_PREVIEW_MENU MENU +BEGIN + MENUITEM "Normal", ID_MENU_NORMAL + MENUITEM "Disabled", ID_MENU_DISABLED + MENUITEM "Selected", ID_MENU_SELECTED +END + STRINGTABLE BEGIN IDS_CPLNAME "Display" @@ -123,7 +130,4 @@ IDS_MESSBOX "Message Box" IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" - IDS_NORMAL "Normal" - IDS_DISABLED "Disabled" - IDS_SELECTED "Selected" END Modified: trunk/reactos/dll/cpl/desk/pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/pl.rc?rev=253… ============================================================================== --- trunk/reactos/dll/cpl/desk/pl.rc (original) +++ trunk/reactos/dll/cpl/desk/pl.rc Sat Jan 6 19:53:07 2007 @@ -95,6 +95,13 @@ END END +IDR_PREVIEW_MENU MENU +BEGIN + MENUITEM "Normal", ID_MENU_NORMAL + MENUITEM "Disabled", ID_MENU_DISABLED + MENUITEM "Selected", ID_MENU_SELECTED +END + STRINGTABLE BEGIN IDS_CPLNAME "Ekran" @@ -124,7 +131,4 @@ IDS_MESSBOX "Message Box" IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" - IDS_NORMAL "Normal" - IDS_DISABLED "Disabled" - IDS_SELECTED "Selected" END Modified: trunk/reactos/dll/cpl/desk/preview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/preview.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/desk/preview.c (original) +++ trunk/reactos/dll/cpl/desk/preview.c Sat Jan 6 19:53:07 2007 @@ -22,6 +22,11 @@ DWORD clrScrollbar; HBRUSH hbrScrollbar; + DWORD clrActiveCaptionText; + DWORD clrInactiveCaptionText; + DWORD clrWindowText; + DWORD clrButtonText; + INT cxEdge; INT cyEdge; @@ -33,6 +38,7 @@ RECT rcActiveFrame; RECT rcActiveCaption; + RECT rcActiveMenuBar; RECT rcActiveClient; RECT rcActiveScroll; @@ -48,13 +54,16 @@ LPTSTR lpMessBox; LPTSTR lpMessText; LPTSTR lpButText; - LPTSTR lpMenNorm; - LPTSTR lpMenDis; - LPTSTR lpMenSel; - - LOGFONT CaptionFont; - LOGFONT DialogFont; - LOGFONT MenuFont; + + LOGFONT lfCaptionFont; + LOGFONT lfMenuFont; + LOGFONT lfMessageFont; + + HFONT hCaptionFont; + HFONT hMenuFont; + HFONT hMessageFont; + + HMENU hMenu; } PREVIEW_DATA, *PPREVIEW_DATA; @@ -125,7 +134,7 @@ static VOID -OnCreate(PPREVIEW_DATA pPreviewData) +OnCreate(HWND hwnd, PPREVIEW_DATA pPreviewData) { NONCLIENTMETRICS NonClientMetrics; @@ -137,6 +146,11 @@ pPreviewData->clrWindow = GetSysColor(COLOR_WINDOW); pPreviewData->hbrWindow = CreateSolidBrush(pPreviewData->clrWindow); + pPreviewData->clrActiveCaptionText = GetSysColor(COLOR_CAPTIONTEXT); + pPreviewData->clrInactiveCaptionText = GetSysColor(COLOR_INACTIVECAPTIONTEXT); + pPreviewData->clrWindowText = GetSysColor(COLOR_WINDOWTEXT); + pPreviewData->clrButtonText = GetSysColor(COLOR_BTNTEXT); + pPreviewData->cxEdge = GetSystemMetrics(SM_CXEDGE); pPreviewData->cyEdge = GetSystemMetrics(SM_CXEDGE); @@ -145,9 +159,23 @@ /* load font info */ NonClientMetrics.cbSize = sizeof(NONCLIENTMETRICS); SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &NonClientMetrics, 0); - pPreviewData->CaptionFont = NonClientMetrics.lfCaptionFont; - pPreviewData->MenuFont = NonClientMetrics.lfMenuFont; - pPreviewData->DialogFont = NonClientMetrics.lfMessageFont; + + pPreviewData->lfCaptionFont = NonClientMetrics.lfCaptionFont; + pPreviewData->hCaptionFont = CreateFontIndirect(&pPreviewData->lfCaptionFont); + + pPreviewData->lfMenuFont = NonClientMetrics.lfMenuFont; + pPreviewData->hMenuFont = CreateFontIndirect(&pPreviewData->lfMenuFont); + + pPreviewData->lfMessageFont = NonClientMetrics.lfMessageFont; + pPreviewData->hMessageFont = CreateFontIndirect(&pPreviewData->lfMessageFont); + + /* Load and modify the menu */ + pPreviewData->hMenu = LoadMenu(hApplet, MAKEINTRESOURCE(IDR_PREVIEW_MENU)); + EnableMenuItem(pPreviewData->hMenu, ID_MENU_DISABLED, + MF_BYCOMMAND | MF_DISABLED); + HiliteMenuItem(hwnd, pPreviewData->hMenu, + ID_MENU_SELECTED, MF_BYCOMMAND | MF_HILITE); + AllocAndLoadString(&pPreviewData->lpInAct, hApplet, IDS_INACTWIN); AllocAndLoadString(&pPreviewData->lpAct, hApplet, IDS_ACTWIN); @@ -155,10 +183,6 @@ AllocAndLoadString(&pPreviewData->lpMessBox, hApplet, IDS_MESSBOX); AllocAndLoadString(&pPreviewData->lpMessText, hApplet, IDS_MESSTEXT); AllocAndLoadString(&pPreviewData->lpButText, hApplet, IDS_BUTTEXT); - AllocAndLoadString(&pPreviewData->lpMenNorm, hApplet, IDS_NORMAL); - AllocAndLoadString(&pPreviewData->lpMenDis, hApplet, IDS_DISABLED); - AllocAndLoadString(&pPreviewData->lpMenSel, hApplet, IDS_SELECTED); - } @@ -187,7 +211,7 @@ /* Calculate the active window rectangle */ pPreviewData->rcActiveFrame.left = pPreviewData->rcInactiveFrame.left + 3 + 1; - pPreviewData->rcActiveFrame.top = pPreviewData->rcInactiveCaption.bottom + 2; + pPreviewData->rcActiveFrame.top = pPreviewData->rcInactiveCaption.bottom + 1; pPreviewData->rcActiveFrame.right = pPreviewData->rcDesktop.right - 10; pPreviewData->rcActiveFrame.bottom = pPreviewData->rcDesktop.bottom - 25; @@ -197,11 +221,15 @@ pPreviewData->rcActiveCaption.right = pPreviewData->rcActiveFrame.right - 3 - 1; pPreviewData->rcActiveCaption.bottom = pPreviewData->rcActiveFrame.top + pPreviewData->cyCaption/*20*/ + 2; - /* FIXME: Calculate the active menu bar rectangle */ + /* Calculate the active menu bar rectangle */ + pPreviewData->rcActiveMenuBar.left = pPreviewData->rcActiveFrame.left + 3 + 1; + pPreviewData->rcActiveMenuBar.top = pPreviewData->rcActiveCaption.bottom + 1; + pPreviewData->rcActiveMenuBar.right = pPreviewData->rcActiveFrame.right - 3 - 1; + pPreviewData->rcActiveMenuBar.bottom = pPreviewData->rcActiveMenuBar.top + 20; /* Calculate the active client rectangle */ pPreviewData->rcActiveClient.left = pPreviewData->rcActiveFrame.left + 3 + 1; - pPreviewData->rcActiveClient.top = pPreviewData->rcActiveCaption.bottom + 20 + 2; + pPreviewData->rcActiveClient.top = pPreviewData->rcActiveMenuBar.bottom; // + 1; pPreviewData->rcActiveClient.right = pPreviewData->rcActiveFrame.right - 3 - 1; pPreviewData->rcActiveClient.bottom = pPreviewData->rcActiveFrame.bottom - 3 - 1; @@ -246,8 +274,8 @@ OnPaint(HWND hwnd, PPREVIEW_DATA pPreviewData) { PAINTSTRUCT ps; + HFONT hOldFont; HDC hdc; - HFONT hFont; RECT rc; hdc = BeginPaint(hwnd, &ps); @@ -257,27 +285,22 @@ /* Inactive Window */ DrawEdge(hdc, &pPreviewData->rcInactiveFrame, EDGE_RAISED, BF_RECT | BF_MIDDLE); - SetTextColor(hdc, RGB(212,208,200)); - - hFont = CreateFontIndirect(&pPreviewData->CaptionFont); - DrawCaptionTemp(NULL, hdc, &pPreviewData->rcInactiveCaption, hFont, + SetTextColor(hdc, pPreviewData->clrInactiveCaptionText); + DrawCaptionTemp(NULL, hdc, &pPreviewData->rcInactiveCaption, pPreviewData->hCaptionFont, NULL, pPreviewData->lpInAct, DC_GRADIENT | DC_ICON | DC_TEXT); - DeleteObject(hFont); - DrawCaptionButtons(hdc, &pPreviewData->rcInactiveCaption, TRUE); /* Active Window */ DrawEdge(hdc, &pPreviewData->rcActiveFrame, EDGE_RAISED, BF_RECT | BF_MIDDLE); - SetTextColor(hdc, RGB(255,255,255)); // FIXME: don't hardcode colors - - hFont = CreateFontIndirect(&pPreviewData->CaptionFont); - DrawCaptionTemp(NULL, hdc, &pPreviewData->rcActiveCaption, hFont, + SetTextColor(hdc, pPreviewData->clrActiveCaptionText); + DrawCaptionTemp(NULL, hdc, &pPreviewData->rcActiveCaption, pPreviewData->hCaptionFont, NULL, pPreviewData->lpAct, DC_ACTIVE | DC_GRADIENT | DC_ICON | DC_TEXT); - DeleteObject(hFont); - DrawCaptionButtons(hdc, &pPreviewData->rcActiveCaption, TRUE); /* FIXME: Draw the menu bar */ + DrawMenuBarTemp(hwnd, hdc, &pPreviewData->rcActiveMenuBar, + pPreviewData->hMenu /*HMENU hMenu*/, + pPreviewData->hMessageFont /*HFONT hFont*/); /* Draw the client area */ CopyRect(&rc, &pPreviewData->rcActiveClient); @@ -288,23 +311,19 @@ CopyRect(&rc, &pPreviewData->rcActiveClient); rc.left += 4; rc.top += 2; - SetTextColor(hdc, RGB(0,0,0)); - SelectObject(hdc, CreateFontIndirect(&pPreviewData->DialogFont)); + SetTextColor(hdc, pPreviewData->clrWindowText); + hOldFont = SelectObject(hdc, pPreviewData->hMessageFont); DrawText(hdc, pPreviewData->lpWinTxt, lstrlen(pPreviewData->lpWinTxt), &rc, DT_LEFT); - DeleteObject(SelectObject(hdc, GetStockObject(SYSTEM_FONT))); + SelectObject(hdc, hOldFont); /* Draw the scroll bar */ DrawScrollbar(hdc, &pPreviewData->rcActiveScroll, pPreviewData->hbrScrollbar); /* Dialog Window */ DrawEdge(hdc, &pPreviewData->rcDialogFrame, EDGE_RAISED, BF_RECT | BF_MIDDLE); - SetTextColor(hdc, RGB(255,255,255)); - - hFont = CreateFontIndirect(&pPreviewData->CaptionFont); - DrawCaptionTemp(NULL, hdc, &pPreviewData->rcDialogCaption, hFont, + SetTextColor(hdc, pPreviewData->clrActiveCaptionText); + DrawCaptionTemp(NULL, hdc, &pPreviewData->rcDialogCaption, pPreviewData->hCaptionFont, NULL, pPreviewData->lpMessBox, DC_ACTIVE | DC_GRADIENT | DC_ICON | DC_TEXT); - DeleteObject(hFont); - DrawCaptionButtons(hdc, &pPreviewData->rcDialogCaption, FALSE); /* Draw the dialog text */ @@ -312,17 +331,17 @@ rc.left += 4; rc.top += 2; SetTextColor(hdc, RGB(0,0,0)); - SelectObject(hdc, CreateFontIndirect(&pPreviewData->DialogFont)); + hOldFont = SelectObject(hdc, pPreviewData->hMessageFont); DrawText(hdc, pPreviewData->lpMessText, lstrlen(pPreviewData->lpMessText), &rc, DT_LEFT); - DeleteObject(SelectObject(hdc, GetStockObject(SYSTEM_FONT))); + SelectObject(hdc, hOldFont); /* Draw Button */ DrawFrameControl(hdc, &pPreviewData->rcDialogButton, DFC_BUTTON, DFCS_BUTTONPUSH); CopyRect(&rc, &pPreviewData->rcDialogButton); - rc.top += 6; - SelectObject(hdc, CreateFontIndirect(&pPreviewData->DialogFont)); - DrawText(hdc, pPreviewData->lpButText, lstrlen(pPreviewData->lpButText), &rc, DT_CENTER); - DeleteObject(SelectObject(hdc, GetStockObject(SYSTEM_FONT))); + SetTextColor(hdc, pPreviewData->clrButtonText); + hOldFont = SelectObject(hdc, pPreviewData->hMessageFont); + DrawText(hdc, pPreviewData->lpButText, lstrlen(pPreviewData->lpButText), &rc, DT_VCENTER | DT_CENTER | DT_SINGLELINE); + SelectObject(hdc, hOldFont); EndPaint(hwnd, &ps); } @@ -334,6 +353,12 @@ DeleteObject(pPreviewData->hbrScrollbar); DeleteObject(pPreviewData->hbrDesktop); DeleteObject(pPreviewData->hbrWindow); + + DeleteObject(pPreviewData->hCaptionFont); + DeleteObject(pPreviewData->hMenuFont); + DeleteObject(pPreviewData->hMessageFont); + + DestroyMenu(pPreviewData->hMenu); LocalFree((HLOCAL)pPreviewData->lpInAct); LocalFree((HLOCAL)pPreviewData->lpAct); @@ -341,9 +366,6 @@ LocalFree((HLOCAL)pPreviewData->lpMessBox); LocalFree((HLOCAL)pPreviewData->lpMessText); LocalFree((HLOCAL)pPreviewData->lpButText); - LocalFree((HLOCAL)pPreviewData->lpMenNorm); - LocalFree((HLOCAL)pPreviewData->lpMenDis); - LocalFree((HLOCAL)pPreviewData->lpMenSel); } @@ -367,7 +389,7 @@ return -1; SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)pPreviewData); - OnCreate(pPreviewData); + OnCreate(hwnd, pPreviewData); break; case WM_SIZE: Modified: trunk/reactos/dll/cpl/desk/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/resource.h?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/resource.h (original) +++ trunk/reactos/dll/cpl/desk/resource.h Sat Jan 6 19:53:07 2007 @@ -67,6 +67,10 @@ #define ID_MENU_ADD 2013 #define ID_MENU_DELETE 2014 +#define IDR_PREVIEW_MENU 2100 +#define ID_MENU_NORMAL 2101 +#define ID_MENU_DISABLED 2102 +#define ID_MENU_SELECTED 2103 /* Settings Page */ @@ -88,9 +92,6 @@ #define IDS_MESSBOX 1513 #define IDS_MESSTEXT 1514 #define IDS_BUTTEXT 1515 -#define IDS_NORMAL 1516 -#define IDS_DISABLED 1517 -#define IDS_SELECTED 1518 #endif /* __CPL_DESK_RESOURCE_H__ */ Modified: trunk/reactos/dll/cpl/desk/sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/sv.rc?rev=253… ============================================================================== --- trunk/reactos/dll/cpl/desk/sv.rc (original) +++ trunk/reactos/dll/cpl/desk/sv.rc Sat Jan 6 19:53:07 2007 @@ -97,6 +97,13 @@ END END +IDR_PREVIEW_MENU MENU +BEGIN + MENUITEM "Normal", ID_MENU_NORMAL + MENUITEM "Disabled", ID_MENU_DISABLED + MENUITEM "Selected", ID_MENU_SELECTED +END + STRINGTABLE BEGIN IDS_CPLNAME "Bildskärm" @@ -126,7 +133,4 @@ IDS_MESSBOX "Message Box" IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" - IDS_NORMAL "Normal" - IDS_DISABLED "Disabled" - IDS_SELECTED "Selected" END

17 years, 11 months

[cwittich] 25330: copyrights of all files are changed to 1998-2007 (patch by Colin Finck) See issue #1942 for more details.

by cwittich＠svn.reactos.org

Author: cwittich Date: Sat Jan 6 16:12:53 2007 New Revision: 25330 URL: http://svn.reactos.org/svn/reactos?rev=25330&view=rev Log: copyrights of all files are changed to 1998-2007 (patch by Colin Finck) See issue #1942 for more details. Modified: trunk/reactos/include/reactos/version.rc Modified: trunk/reactos/include/reactos/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/version.rc… ============================================================================== --- trunk/reactos/include/reactos/version.rc (original) +++ trunk/reactos/include/reactos/version.rc Sat Jan 6 16:12:53 2007 @@ -78,7 +78,7 @@ #endif /* REACTOS_STR_INTERNAL_NAME */ #ifndef REACTOS_STR_LEGAL_COPYRIGHT -#define REACTOS_STR_LEGAL_COPYRIGHT "Copyright 1998-2006 ReactOS Team\0" +#define REACTOS_STR_LEGAL_COPYRIGHT "Copyright 1998-2007 ReactOS Team\0" #endif /* REACTOS_STR_LEGAL_COPYRIGHT */ #ifndef REACTOS_STR_ORIGINAL_FILENAME

17 years, 11 months

[ekohl] 25329: Add DrawMenuBarTemp prototype.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Jan 6 15:23:48 2007 New Revision: 25329 URL: http://svn.reactos.org/svn/reactos?rev=25329&view=rev Log: Add DrawMenuBarTemp prototype. Modified: trunk/reactos/include/psdk/winuser.h Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h (original) +++ trunk/reactos/include/psdk/winuser.h Sat Jan 6 15:23:48 2007 @@ -3508,6 +3508,7 @@ BOOL WINAPI DrawIcon(HDC,int,int,HICON); BOOL WINAPI DrawIconEx(HDC,int,int,HICON,int,int,UINT,HBRUSH,UINT); BOOL WINAPI DrawMenuBar(HWND); +DWORD WINAPI DrawMenuBarTemp(HWND,HDC,LPRECT,HMENU,HFONT); BOOL WINAPI DrawStateA(HDC,HBRUSH,DRAWSTATEPROC,LPARAM,WPARAM,int,int,int,int,UINT); BOOL WINAPI DrawStateW(HDC,HBRUSH,DRAWSTATEPROC,LPARAM,WPARAM,int,int,int,int,UINT); int WINAPI DrawTextA(HDC,LPCSTR,int,LPRECT,UINT);

17 years, 11 months

← Newer
1
...
30
31
32
33
34
35
36
...
41
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 January 2007