Ros-diffs February 2013

ros-diffs@reactos.org

11 participants
125 discussions

[akhaldi] 58372: [SAL] * Add _Field_size_opt_ annotation.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Feb 26 18:22:36 2013 New Revision: 58372 URL: http://svn.reactos.org/svn/reactos?rev=58372&view=rev Log: [SAL] * Add _Field_size_opt_ annotation. Modified: trunk/reactos/include/psdk/sal.h Modified: trunk/reactos/include/psdk/sal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sal.h?rev=583… ============================================================================== --- trunk/reactos/include/psdk/sal.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/sal.h [iso-8859-1] Tue Feb 26 18:22:36 2013 @@ -600,6 +600,7 @@ //#define _Deref2_pre_readonly_ #define _Field_range_(min,max) _SAL2_NAME(_Field_range_) _Group_(_SA_annotes2(SAL_range,min,max)) #define _Field_size_(size) _SAL2_NAME(_Field_size_) _Group_(_Notnull_ _Writable_elements_(size)) +#define _Field_size_opt_(size) _SAL2_NAME(_Field_size_opt_) _Group_(_Maybenull_ _Writable_elements_(size)) #define _Field_size_bytes_(size) _SAL2_NAME(_Field_size_bytes_) _Group_(_Notnull_ _Writable_bytes_(size)) //#define _Field_size_bytes_full_(size) //#define _Field_size_bytes_full_opt_(size) @@ -608,7 +609,6 @@ #define _Field_size_bytes_part_opt_(size, count) _SAL2_NAME(_Field_size_bytes_part_opt_) _Group_(_Maybenull_ _Writable_bytes_(size) _Readable_bytes_(count)) //#define _Field_size_full_(size) //#define _Field_size_full_opt_(size) -//#define _Field_size_opt_(size) //#define _Field_size_part_(size, count) //#define _Field_size_part_opt_(size, count) //#define _Field_z_

11 years, 7 months

[pschweitzer] 58371: [REGEDIT] Fix typo in French translation. Spotted on: http://reactos.org/forum/viewtopic.php?p=99232#p99232

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Feb 26 06:44:31 2013 New Revision: 58371 URL: http://svn.reactos.org/svn/reactos?rev=58371&view=rev Log: [REGEDIT] Fix typo in French translation. Spotted on: http://reactos.org/forum/viewtopic.php?p=99232#p99232 Modified: trunk/reactos/base/applications/regedit/lang/fr-FR.rc Modified: trunk/reactos/base/applications/regedit/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/fr-FR.rc [iso-8859-1] Tue Feb 26 06:44:31 2013 @@ -342,7 +342,7 @@ ID_EDIT_RENAME "Renomme la sÃ©lection" ID_EDIT_COPYKEYNAME "Copie le nom de la clÃ© sÃ©lectionnÃ©e vers le presse-papier" ID_EDIT_FIND "Recherche du texte dans une clÃ©, une valeur ou des donnÃ©es" - ID_EDIT_FINDNEXT "Recherche l'occurence suivante du texte de la derniÃ¨re recherche" + ID_EDIT_FINDNEXT "Recherche l'occurrence suivante du texte de la derniÃ¨re recherche" END STRINGTABLE DISCARDABLE

11 years, 7 months

[tkreuzer] 58370: [FREELDR] Fix a typo in arm code that I introduced, spotted by Thomas.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Feb 25 20:11:40 2013 New Revision: 58370 URL: http://svn.reactos.org/svn/reactos?rev=58370&view=rev Log: [FREELDR] Fix a typo in arm code that I introduced, spotted by Thomas. Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c [iso-8859-1] Mon Feb 25 20:11:40 2013 @@ -104,7 +104,7 @@ ArmInitializeBootDevices(VOID) { /* Emulate old behavior */ - return ArmHwDetect != NULL; + return (ArmHwDetect() != NULL); } PCONFIGURATION_COMPONENT_DATA

11 years, 7 months

[tkreuzer] 58369: [FREELDR] Get rid of reactos_arc_hardware_data, which wasn't used anyway. This frees up 16KB of memory. Don't reallocate the PARTIAL_RESOURE_LISTs in FldrCreateComponentKey, inste...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Feb 25 20:07:17 2013 New Revision: 58369 URL: http://svn.reactos.org/svn/reactos?rev=58369&view=rev Log: [FREELDR] Get rid of reactos_arc_hardware_data, which wasn't used anyway. This frees up 16KB of memory. Don't reallocate the PARTIAL_RESOURE_LISTs in FldrCreateComponentKey, instead take over the ones passed by the caller. Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c trunk/reactos/boot/freeldr/freeldr/bootmgr.c trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h trunk/reactos/boot/freeldr/freeldr/include/arch/pc/hardware.h trunk/reactos/boot/freeldr/freeldr/include/arch/powerpc/hardware.h trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c trunk/reactos/boot/freeldr/freeldr/windows/winldr.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c [iso-8859-1] Mon Feb 25 20:07:17 2013 @@ -31,7 +31,6 @@ ARC_DISK_SIGNATURE reactos_arc_disk_info; ULONG reactos_disk_count; -CHAR reactos_arc_hardware_data[256]; ULONG SizeBits[] = { Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] Mon Feb 25 20:07:17 2013 @@ -355,8 +355,6 @@ &BusKey); (*BusNumber)++; - - MmHeapFree(PartialResourceList); } @@ -545,8 +543,6 @@ PartialResourceList, Size, &PeripheralKey); - - MmHeapFree(PartialResourceList); } } @@ -619,8 +615,6 @@ &ControllerKey); TRACE("Created key: DiskController\\0\n"); - MmHeapFree(PartialResourceList); - if (FloppyCount) DetectBiosFloppyPeripheral(ControllerKey); } @@ -690,8 +684,6 @@ PartialResourceList, Size, &SystemKey); - - MmHeapFree(PartialResourceList); return SystemKey; } @@ -739,7 +731,6 @@ Size, &DiskKey); } - } static @@ -917,12 +908,12 @@ DetectSerialPointerPeripheral(PCONFIGURATION_COMPONENT_DATA ControllerKey, PUCHAR Base) { - CM_PARTIAL_RESOURCE_LIST PartialResourceList; + PCM_PARTIAL_RESOURCE_LIST PartialResourceList; char Buffer[256]; CHAR Identifier[256]; PCONFIGURATION_COMPONENT_DATA PeripheralKey; ULONG MouseType; - ULONG Length; + ULONG Size, Length; ULONG i; ULONG j; ULONG k; @@ -1043,10 +1034,13 @@ } /* Set 'Configuration Data' value */ - memset(&PartialResourceList, 0, sizeof(CM_PARTIAL_RESOURCE_LIST)); - PartialResourceList.Version = 1; - PartialResourceList.Revision = 1; - PartialResourceList.Count = 0; + Size = sizeof(CM_PARTIAL_RESOURCE_LIST) - + sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); + PartialResourceList = MmHeapAlloc(Size); + memset(PartialResourceList, 0, Size); + PartialResourceList->Version = 1; + PartialResourceList->Revision = 1; + PartialResourceList->Count = 0; /* Create 'PointerPeripheral' key */ FldrCreateComponentKey(ControllerKey, @@ -1056,9 +1050,8 @@ 0x0, 0xFFFFFFFF, Identifier, - &PartialResourceList, - sizeof(CM_PARTIAL_RESOURCE_LIST) - - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR), + PartialResourceList, + Size, &PeripheralKey); TRACE("Created key: PointerPeripheral\\0\n"); @@ -1160,8 +1153,6 @@ Size, &ControllerKey); - MmHeapFree(PartialResourceList); - if (!Rs232PortInUse(UlongToPtr(Base))) { /* Detect serial mouse */ @@ -1257,8 +1248,6 @@ PartialResourceList, Size, &ControllerKey); - - MmHeapFree(PartialResourceList); ControllerNumber++; } @@ -1390,8 +1379,6 @@ Size, &PeripheralKey); TRACE("Created key: KeyboardPeripheral\\0\n"); - - MmHeapFree(PartialResourceList); } } @@ -1461,8 +1448,6 @@ &ControllerKey); TRACE("Created key: KeyboardController\\0\n"); - MmHeapFree(PartialResourceList); - DetectKeyboardPeripheral(ControllerKey); } @@ -1582,28 +1567,30 @@ VOID DetectPS2Mouse(PCONFIGURATION_COMPONENT_DATA BusKey) { - CM_PARTIAL_RESOURCE_LIST PartialResourceList; + PCM_PARTIAL_RESOURCE_LIST PartialResourceList; PCONFIGURATION_COMPONENT_DATA ControllerKey; PCONFIGURATION_COMPONENT_DATA PeripheralKey; + ULONG Size; if (DetectPS2AuxPort()) { TRACE("Detected PS2 port\n"); - memset(&PartialResourceList, 0, sizeof(CM_PARTIAL_RESOURCE_LIST)); + PartialResourceList = MmHeapAlloc(sizeof(CM_PARTIAL_RESOURCE_LIST)); + memset(PartialResourceList, 0, sizeof(CM_PARTIAL_RESOURCE_LIST)); /* Initialize resource descriptor */ - PartialResourceList.Version = 1; - PartialResourceList.Revision = 1; - PartialResourceList.Count = 1; + PartialResourceList->Version = 1; + PartialResourceList->Revision = 1; + PartialResourceList->Count = 1; /* Set Interrupt */ - PartialResourceList.PartialDescriptors[0].Type = CmResourceTypeInterrupt; - PartialResourceList.PartialDescriptors[0].ShareDisposition = CmResourceShareUndetermined; - PartialResourceList.PartialDescriptors[0].Flags = CM_RESOURCE_INTERRUPT_LATCHED; - PartialResourceList.PartialDescriptors[0].u.Interrupt.Level = 12; - PartialResourceList.PartialDescriptors[0].u.Interrupt.Vector = 12; - PartialResourceList.PartialDescriptors[0].u.Interrupt.Affinity = 0xFFFFFFFF; + PartialResourceList->PartialDescriptors[0].Type = CmResourceTypeInterrupt; + PartialResourceList->PartialDescriptors[0].ShareDisposition = CmResourceShareUndetermined; + PartialResourceList->PartialDescriptors[0].Flags = CM_RESOURCE_INTERRUPT_LATCHED; + PartialResourceList->PartialDescriptors[0].u.Interrupt.Level = 12; + PartialResourceList->PartialDescriptors[0].u.Interrupt.Vector = 12; + PartialResourceList->PartialDescriptors[0].u.Interrupt.Affinity = 0xFFFFFFFF; /* Create controller key */ FldrCreateComponentKey(BusKey, @@ -1613,7 +1600,7 @@ 0x0, 0xFFFFFFFF, NULL, - &PartialResourceList, + PartialResourceList, sizeof(CM_PARTIAL_RESOURCE_LIST), &ControllerKey); TRACE("Created key: PointerController\\0\n"); @@ -1623,10 +1610,13 @@ TRACE("Detected PS2 mouse\n"); /* Initialize resource descriptor */ - memset(&PartialResourceList, 0, sizeof(CM_PARTIAL_RESOURCE_LIST)); - PartialResourceList.Version = 1; - PartialResourceList.Revision = 1; - PartialResourceList.Count = 0; + Size = sizeof(CM_PARTIAL_RESOURCE_LIST) - + sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); + PartialResourceList = MmHeapAlloc(Size); + memset(PartialResourceList, 0, Size); + PartialResourceList->Version = 1; + PartialResourceList->Revision = 1; + PartialResourceList->Count = 0; /* Create peripheral key */ FldrCreateComponentKey(ControllerKey, @@ -1636,9 +1626,8 @@ 0x0, 0xFFFFFFFF, "MICROSOFT PS2 MOUSE", - &PartialResourceList, - sizeof(CM_PARTIAL_RESOURCE_LIST) - - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR), + PartialResourceList, + Size, &PeripheralKey); TRACE("Created key: PointerPeripheral\\0\n"); } @@ -1731,8 +1720,6 @@ Size, &BusKey); - MmHeapFree(PartialResourceList); - /* Detect ISA/BIOS devices */ DetectBiosDisks(BusKey); Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c [iso-8859-1] Mon Feb 25 20:07:17 2013 @@ -115,8 +115,6 @@ /* Increment bus number */ (*BusNumber)++; - - MmHeapFree(PartialResourceList); } } Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c [iso-8859-1] Mon Feb 25 20:07:17 2013 @@ -59,15 +59,20 @@ DetectApmBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) { PCONFIGURATION_COMPONENT_DATA BiosKey; - CM_PARTIAL_RESOURCE_LIST PartialResourceList; + PCM_PARTIAL_RESOURCE_LIST PartialResourceList; + ULONG Size; + + Size = sizeof(CM_PARTIAL_RESOURCE_LIST) - + sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); if (FindApmBios()) { /* Create 'Configuration Data' value */ - memset(&PartialResourceList, 0, sizeof(CM_PARTIAL_RESOURCE_LIST)); - PartialResourceList.Version = 0; - PartialResourceList.Revision = 0; - PartialResourceList.Count = 0; + PartialResourceList = MmHeapAlloc(Size); + memset(&PartialResourceList, 0, Size); + PartialResourceList->Version = 0; + PartialResourceList->Revision = 0; + PartialResourceList->Count = 0; /* Create new bus key */ FldrCreateComponentKey(SystemKey, @@ -77,9 +82,8 @@ 0x0, 0xFFFFFFFF, "APM", - &PartialResourceList, - sizeof(CM_PARTIAL_RESOURCE_LIST) - - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR), + PartialResourceList, + Size, &BiosKey); /* Increment bus number */ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c [iso-8859-1] Mon Feb 25 20:07:17 2013 @@ -158,8 +158,6 @@ PartialResourceList, Size, &TableKey); - - MmHeapFree(PartialResourceList); } } @@ -204,8 +202,6 @@ /* Increment bus number */ (*BusNumber)++; - - MmHeapFree(PartialResourceList); DetectPciIrqRoutingTable(BiosKey); @@ -268,8 +264,6 @@ Size, &BusKey); - MmHeapFree(PartialResourceList); - /* Increment bus number */ (*BusNumber)++; } Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c [iso-8859-1] Mon Feb 25 20:07:17 2013 @@ -429,8 +429,6 @@ &ControllerKey); TRACE("Created key: DiskController\\0\n"); - MmHeapFree(PartialResourceList); - /* Create and fill subkey for each harddisk */ for (i = 0; i < DiskCount; i++) { @@ -451,9 +449,6 @@ PartialResourceList, Size, &DiskKey); - - if (PartialResourceList) - MmHeapFree(PartialResourceList); } } @@ -497,8 +492,6 @@ /* Increment bus number */ (*BusNumber)++; - MmHeapFree(PartialResourceList); - /* Detect ISA/BIOS devices */ DetectBiosDisks(SystemKey, BusKey); Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/bootm… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] Mon Feb 25 20:07:17 2013 @@ -21,7 +21,6 @@ ARC_DISK_SIGNATURE reactos_arc_disk_info[32]; // ARC Disk Information ULONG reactos_disk_count = 0; -CHAR reactos_arc_hardware_data[HW_MAX_ARC_HEAP_SIZE] = {0}; CHAR reactos_arc_strings[32][256]; typedef Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h [iso-8859-1] Mon Feb 25 20:07:17 2013 @@ -24,8 +24,6 @@ OUT PCONFIGURATION_COMPONENT_DATA *SystemKey ); -#define HW_MAX_ARC_HEAP_SIZE 256 - extern PARM_BOARD_CONFIGURATION_BLOCK ArmBoardBlock; extern ULONG FirstLevelDcacheSize; extern ULONG FirstLevelDcacheFillSize; Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/pc/hardware.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/pc/hardware.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/pc/hardware.h [iso-8859-1] Mon Feb 25 20:07:17 2013 @@ -23,12 +23,6 @@ #define CONFIG_CMD(bus, dev_fn, where) \ (0x80000000 | (((ULONG)(bus)) << 16) | (((dev_fn) & 0x1F) << 11) | (((dev_fn) & 0xE0) << 3) | ((where) & ~3)) - -// -// Static heap for ARC Hardware Component Tree -// 16KB oughta be enough for anyone. -// -#define HW_MAX_ARC_HEAP_SIZE 16 * 1024 // // ARC Component Configuration Routines Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/powerpc/hardware.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/powerpc/hardware.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/powerpc/hardware.h [iso-8859-1] Mon Feb 25 20:07:17 2013 @@ -26,12 +26,6 @@ #define CONFIG_CMD(bus, dev_fn, where) \ (0x80000000 | (((ULONG)(bus)) << 16) | (((dev_fn) & 0x1F) << 11) | (((dev_fn) & 0xE0) << 3) | ((where) & ~3)) - -// -// Static heap for ARC Hardware Component Tree -// 16KB oughta be enough for anyone. -// -#define HW_MAX_ARC_HEAP_SIZE 16 * 1024 // // ARC Component Configuration Routines Modified: trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c [iso-8859-1] Mon Feb 25 20:07:17 2013 @@ -14,17 +14,7 @@ /* GLOBALS ********************************************************************/ -extern CHAR reactos_arc_hardware_data[]; -SIZE_T FldrpHwHeapLocation; PCONFIGURATION_COMPONENT_DATA FldrArcHwTreeRoot; - -BOOLEAN UseRealHeap = FALSE; - -VOID -NTAPI -FldrSetConfigurationData(IN PCONFIGURATION_COMPONENT_DATA ComponentData, - IN PCM_PARTIAL_RESOURCE_LIST ResourceList, - IN ULONG Size); /* FUNCTIONS ******************************************************************/ @@ -34,26 +24,8 @@ { PVOID Buffer; - if (UseRealHeap) - { - /* Allocate memory from generic bootloader heap */ - Buffer = MmHeapAlloc(Size); - } - else - { - /* Return a block of memory from the ARC Hardware Heap */ - Buffer = &reactos_arc_hardware_data[FldrpHwHeapLocation]; - - /* Increment the heap location */ - FldrpHwHeapLocation += Size; - if (FldrpHwHeapLocation > HW_MAX_ARC_HEAP_SIZE) Buffer = NULL; - } - - /* Clear it */ - if (Buffer) - RtlZeroMemory(Buffer, Size); - - /* Return the buffer */ + /* Allocate memory from generic bootloader heap */ + Buffer = MmHeapAlloc(Size); return Buffer; } @@ -65,10 +37,10 @@ SIZE_T IdentifierLength; PCONFIGURATION_COMPONENT Component = &ComponentData->ComponentEntry; PCHAR Identifier; - + /* Allocate memory for the identifier */ IdentifierLength = strlen(IdentifierString) + 1; - Identifier = FldrpHwHeapAlloc(IdentifierLength); + Identifier = MmHeapAlloc(IdentifierLength); if (!Identifier) return; /* Copy the identifier */ @@ -84,11 +56,11 @@ FldrCreateSystemKey(OUT PCONFIGURATION_COMPONENT_DATA *SystemNode) { PCONFIGURATION_COMPONENT Component; - + /* Allocate the root */ - FldrArcHwTreeRoot = FldrpHwHeapAlloc(sizeof(CONFIGURATION_COMPONENT_DATA)); + FldrArcHwTreeRoot = MmHeapAlloc(sizeof(CONFIGURATION_COMPONENT_DATA)); if (!FldrArcHwTreeRoot) return; - + /* Set it up */ Component = &FldrArcHwTreeRoot->ComponentEntry; Component->Class = SystemClass; @@ -101,7 +73,7 @@ Component->Revision = 0; Component->Key = 0; Component->AffinityMask = 0xFFFFFFFF; - + /* Return the node */ *SystemNode = FldrArcHwTreeRoot; } @@ -130,7 +102,7 @@ /* This is now the parent */ Parent = Sibling; } while ((Sibling = Sibling->Sibling)); - + /* Found the lowest sibling; mark us as its sibling too */ Parent->Sibling = Child; } @@ -153,16 +125,16 @@ PCONFIGURATION_COMPONENT Component; /* Allocate the node for this component */ - ComponentData = FldrpHwHeapAlloc(sizeof(CONFIGURATION_COMPONENT_DATA)); + ComponentData = MmHeapAlloc(sizeof(CONFIGURATION_COMPONENT_DATA)); if (!ComponentData) return; - + /* Now save our parent */ ComponentData->Parent = SystemNode; - + /* Link us to the parent */ if (SystemNode) FldrLinkToParent(SystemNode, ComponentData); - + /* Set us up */ Component = &ComponentData->ComponentEntry; Component->Class = Class; @@ -170,36 +142,19 @@ Component->Flags = Flags; Component->Key = Key; Component->AffinityMask = Affinity; - + /* Set identifier */ if (IdentifierString) FldrSetIdentifier(ComponentData, IdentifierString); - + /* Set configuration data */ if (ResourceList) - FldrSetConfigurationData(ComponentData, ResourceList, Size); - + { + ComponentData->ConfigurationData = ResourceList; + ComponentData->ComponentEntry.ConfigurationDataLength = Size; + } + /* Return the child */ - *ComponentKey = ComponentData; + *ComponentKey = ComponentData; } -VOID -NTAPI -FldrSetConfigurationData(IN PCONFIGURATION_COMPONENT_DATA ComponentData, - IN PCM_PARTIAL_RESOURCE_LIST ResourceList, - IN ULONG Size) -{ - PCONFIGURATION_COMPONENT Component = &ComponentData->ComponentEntry; - PVOID ConfigurationData; - - /* Allocate a buffer from the hardware heap */ - ConfigurationData = FldrpHwHeapAlloc(Size); - if (!ConfigurationData) return; - - /* Copy component information */ - RtlCopyMemory(ConfigurationData, ResourceList, Size); - - /* Set component information */ - ComponentData->ConfigurationData = ConfigurationData; - Component->ConfigurationDataLength = Size; -} Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Mon Feb 25 20:07:17 2013 @@ -30,7 +30,6 @@ extern ULONG reactos_disk_count; extern ARC_DISK_SIGNATURE reactos_arc_disk_info[]; -extern BOOLEAN UseRealHeap; extern ULONG LoaderPagesSpanned; extern BOOLEAN AcpiPresent; @@ -582,7 +581,6 @@ SystemRoot = strstr(BootPath, "\\"); /* Detect hardware */ - UseRealHeap = TRUE; LoaderBlock->ConfigurationRoot = MachHwDetect(); if (OperatingSystemVersion == 0)

11 years, 7 months

[gadamopoulos] 58368: Fix build for gcc

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sun Feb 24 21:38:48 2013 New Revision: 58368 URL: http://svn.reactos.org/svn/reactos?rev=58368&view=rev Log: Fix build for gcc Modified: trunk/reactos/dll/win32/msgina/gui.c Modified: trunk/reactos/dll/win32/msgina/gui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/gui.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] Sun Feb 24 21:38:48 2013 @@ -67,7 +67,7 @@ if (!DuplicateHandle ( GetCurrentProcess(), msg->hDesktop, GetCurrentProcess(), - &hDesk, + (HANDLE*)&hDesk, 0, FALSE, DUPLICATE_SAME_ACCESS))

11 years, 7 months

[gadamopoulos] 58367: [msgina] - Fix a bug in StartupWindowThread that had as a result to close the desktop handle we get from winlogon. The problem is the wrong usage of SetThreadDesktop as it clo...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sun Feb 24 21:30:30 2013 New Revision: 58367 URL: http://svn.reactos.org/svn/reactos?rev=58367&view=rev Log: [msgina] - Fix a bug in StartupWindowThread that had as a result to close the desktop handle we get from winlogon. The problem is the wrong usage of SetThreadDesktop as it closes the previous desktop, so keeping OldDesk is totally useless and when the thread exits it will close the handle to the current thread desktop which is Session->WinlogonDesktop from winlogon. To solve this issue we have to duplicate the handle we get from winlogon and let it get closed by win32k when the thread exits Modified: trunk/reactos/dll/win32/msgina/gui.c Modified: trunk/reactos/dll/win32/msgina/gui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/gui.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] Sun Feb 24 21:30:30 2013 @@ -59,23 +59,35 @@ static DWORD WINAPI StartupWindowThread(LPVOID lpParam) { - HDESK OldDesk; + HDESK hDesk; PDISPLAYSTATUSMSG msg = (PDISPLAYSTATUSMSG)lpParam; - OldDesk = GetThreadDesktop(GetCurrentThreadId()); - - if(!SetThreadDesktop(msg->hDesktop)) + /* When SetThreadDesktop is called the system closes the desktop handle when needed + so we have to create a new handle because this handle may still be in use by winlogon */ + if (!DuplicateHandle ( GetCurrentProcess(), + msg->hDesktop, + GetCurrentProcess(), + &hDesk, + 0, + FALSE, + DUPLICATE_SAME_ACCESS)) { HeapFree(GetProcessHeap(), 0, lpParam); return FALSE; } + + if(!SetThreadDesktop(hDesk)) + { + HeapFree(GetProcessHeap(), 0, lpParam); + return FALSE; + } + DialogBoxParam( hDllInstance, MAKEINTRESOURCE(IDD_STATUSWINDOW_DLG), GetDesktopWindow(), StatusMessageWindowProc, (LPARAM)lpParam); - SetThreadDesktop(OldDesk); HeapFree(GetProcessHeap(), 0, lpParam); return TRUE;

11 years, 7 months

[ekohl] 58366: [LOGON] Fix formatting. No code changes.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Feb 24 20:27:15 2013 New Revision: 58366 URL: http://svn.reactos.org/svn/reactos?rev=58366&view=rev Log: [LOGON] Fix formatting. No code changes. Modified: trunk/reactos/base/applications/screensavers/logon/logon.c Modified: trunk/reactos/base/applications/screensavers/logon/logon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/logon.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/screensavers/logon/logon.c [iso-8859-1] Sun Feb 24 20:27:15 2013 @@ -31,60 +31,59 @@ #define RANDOM( min, max ) ((rand() % (int)(((max)+1) - (min))) + (min)) -#define APPNAME _T("Logon") -#define APP_TIMER 1 -#define APP_TIMER_INTERVAL 2000 +#define APPNAME _T("Logon") +#define APP_TIMER 1 +#define APP_TIMER_INTERVAL 2000 -HBITMAP GetScreenSaverBitmap (void) +HBITMAP +GetScreenSaverBitmap(VOID) { - OSVERSIONINFOEX osvi; + OSVERSIONINFOEX osvi; - ZeroMemory(&osvi, sizeof(OSVERSIONINFOEX)); - osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); - GetVersionEx ((OSVERSIONINFO *) &osvi); + ZeroMemory(&osvi, sizeof(OSVERSIONINFOEX)); + osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); + GetVersionEx ((OSVERSIONINFO *) &osvi); - switch(osvi.wProductType) - { - case VER_NT_WORKSTATION: - return LoadImage(GetModuleHandle(NULL), MAKEINTRESOURCE(IDB_WORKSTATION), IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION); - break; - default: - return LoadImage(GetModuleHandle(NULL), MAKEINTRESOURCE(IDB_SERVER), IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION); - break; - } + switch(osvi.wProductType) + { + case VER_NT_WORKSTATION: + return LoadImage(GetModuleHandle(NULL), MAKEINTRESOURCE(IDB_WORKSTATION), IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION); + break; + default: + return LoadImage(GetModuleHandle(NULL), MAKEINTRESOURCE(IDB_SERVER), IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION); + break; + } } -LRESULT CALLBACK +LRESULT +CALLBACK ScreenSaverProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { - static RECT rect; - static HBITMAP bitmap; + static RECT rect; + static HBITMAP bitmap; - switch (message) - { - case WM_CREATE: - { - bitmap = GetScreenSaverBitmap (); + switch (message) + { + case WM_CREATE: + { + bitmap = GetScreenSaverBitmap (); + if (bitmap == NULL) + { + MessageBox(hWnd, + _T("Fatal Error: Could not load bitmap"), + _T("Error"), + MB_OK | MB_ICONEXCLAMATION); + } - if(bitmap == NULL) - { - MessageBox( - hWnd, - _T("Fatal Error: Could not load bitmap"), - _T("Error"), - MB_OK | MB_ICONEXCLAMATION); - } + SetTimer(hWnd, + APP_TIMER, + APP_TIMER_INTERVAL, + NULL); - SetTimer ( - hWnd, - APP_TIMER, - APP_TIMER_INTERVAL, - NULL); - - break; - } - case WM_PAINT: - { + break; + } + case WM_PAINT: + { BITMAP bm; /* Bitmap structure as seen in bmWidth & bmHeight */ PAINTSTRUCT ps; HDC hdc; @@ -135,36 +134,40 @@ EndPaint(hWnd, &ps); break; - } + } case WM_TIMER: { InvalidateRect(hWnd, NULL, 1); break; } - case WM_DESTROY: - { - KillTimer (hWnd, APP_TIMER); - DeleteObject(bitmap); - PostQuitMessage(0); - break; - } + case WM_DESTROY: + { + KillTimer(hWnd, APP_TIMER); + DeleteObject(bitmap); + PostQuitMessage(0); + break; + } default: // Pass Windows Messages to the default screensaver window procedure return DefScreenSaverProc(hWnd, message, wParam, lParam); } - return 0; + return 0; } -BOOL WINAPI ScreenSaverConfigureDialog(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +BOOL +WINAPI +ScreenSaverConfigureDialog(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { return FALSE; } // This function is only called one time before opening the configuration dialog. // Use it to show a message that no configuration is necesssary and return FALSE to indicate that no configuration dialog shall be opened. -BOOL WINAPI RegisterDialogClasses(HANDLE hInst) +BOOL +WINAPI +RegisterDialogClasses(HANDLE hInst) { TCHAR szMessage[256]; TCHAR szTitle[25];

11 years, 7 months

[tkreuzer] 58365: [FREELDR] Fix formatting

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Feb 24 20:18:57 2013 New Revision: 58365 URL: http://svn.reactos.org/svn/reactos?rev=58365&view=rev Log: [FREELDR] Fix formatting Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c trunk/reactos/boot/freeldr/freeldr/windows/peloader.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Modified: trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inffi… Modified: trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… Modified: trunk/reactos/boot/freeldr/freeldr/windows/peloader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo…

11 years, 7 months

[gadamopoulos] 58364: [win32k] - Fix a nasty bug in IntTrackMouseMove that prevented us from stopping the ID_EVENT_SYSTIMER_MOUSEHOVER timer. - IntKillTimer requires a PWND as first argument but we...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sun Feb 24 20:03:48 2013 New Revision: 58364 URL: http://svn.reactos.org/svn/reactos?rev=58364&view=rev Log: [win32k] - Fix a nasty bug in IntTrackMouseMove that prevented us from stopping the ID_EVENT_SYSTIMER_MOUSEHOVER timer. - IntKillTimer requires a PWND as first argument but we were passing an HWND and as a result the timer was never stopped - Fixes the remaining failed tests for TrackMouseEvent (besides queue state tests) Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Sun Feb 24 20:03:48 2013 @@ -1352,7 +1352,7 @@ 0, 0); if ( pDesk->dwDTFlags & DF_TME_HOVER ) - IntKillTimer(UserHMGetHandle(pDesk->spwndTrack), ID_EVENT_SYSTIMER_MOUSEHOVER, TRUE); + IntKillTimer(pDesk->spwndTrack, ID_EVENT_SYSTIMER_MOUSEHOVER, TRUE); /* Clear the flags to sign a change. */ pDesk->dwDTFlags &= ~(DF_TME_LEAVE|DF_TME_HOVER);

11 years, 7 months

[ekohl] 58363: [MSGINA] - Implement WlxScreenSaverNotify. I decided to return a hardcoded FALSE because RegQueryValueExW always reads "1", although there is a "0" written in the registry. Will fix ...

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Feb 24 19:44:41 2013 New Revision: 58363 URL: http://svn.reactos.org/svn/reactos?rev=58363&view=rev Log: [MSGINA] - Implement WlxScreenSaverNotify. I decided to return a hardcoded FALSE because RegQueryValueExW always reads "1", although there is a "0" written in the registry. Will fix it later. Modified: trunk/reactos/dll/win32/msgina/msgina.c trunk/reactos/dll/win32/msgina/msgina.h trunk/reactos/dll/win32/msgina/stubs.c Modified: trunk/reactos/dll/win32/msgina/msgina.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.c?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] Sun Feb 24 19:44:41 2013 @@ -184,6 +184,67 @@ ChooseGinaUI(); return pGinaUI->Initialize(pgContext); +} + +/* + * @implemented + */ +BOOL +WINAPI +WlxScreenSaverNotify( + PVOID pWlxContext, + BOOL *pSecure) +{ +#if 0 + WCHAR szBuffer[2]; + HKEY hKey; + DWORD bufferSize = sizeof(szBuffer); + DWORD varType = REG_SZ; + LONG rc; + + TRACE("(%p %p)\n", pWlxContext, pSecure); + + *pSecure = TRUE; + + /* + * Policy setting: + * HKLM\Software\Policies\Microsoft\Windows\Control Panel\Desktop : ScreenSaverIsSecure + * User setting: + * HKCU\Control Panel\Desktop : ScreenSaverIsSecure + */ + + rc = RegOpenKeyExW(HKEY_CURRENT_USER, + L"Control Panel\\Desktop", + 0, + KEY_QUERY_VALUE, + &hKey); + TRACE("RegOpenKeyExW: %ld\n", rc); + if (rc == ERROR_SUCCESS) + { + rc = RegQueryValueExW(hKey, + L"ScreenSaverIsSecure", + NULL, + &varType, + (LPBYTE)szBuffer, + &bufferSize); + + TRACE("RegQueryValueExW: %ld\n", rc); + + if (rc == ERROR_SUCCESS) + { + TRACE("szBuffer: \"%S\"\n", szBuffer); + *pSecure = _wtoi(szBuffer); + } + + RegCloseKey(hKey); + } + + TRACE("*pSecure: %ld\n", *pSecure); +#endif + + *pSecure = FALSE; + + return TRUE; } /* Modified: trunk/reactos/dll/win32/msgina/msgina.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.h?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] Sun Feb 24 19:44:41 2013 @@ -1,6 +1,7 @@ #define WIN32_NO_STATUS #include <stdarg.h> +#include <stdlib.h> #include <windef.h> #include <winbase.h> #include <wincon.h> Modified: trunk/reactos/dll/win32/msgina/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/stubs.c?r… ============================================================================== --- trunk/reactos/dll/win32/msgina/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/stubs.c [iso-8859-1] Sun Feb 24 19:44:41 2013 @@ -86,23 +86,6 @@ * @unimplemented */ BOOL WINAPI -WlxScreenSaverNotify( - PVOID pWlxContext, - BOOL *pSecure) -{ - UNREFERENCED_PARAMETER(pWlxContext); - UNREFERENCED_PARAMETER(pSecure); - - //HKLM\Software\Policies\Microsoft\Windows\Control Panel\Desktop : ScreenSaverIsSecure - UNIMPLEMENTED; - return TRUE; -} - - -/* - * @unimplemented - */ -BOOL WINAPI WlxGetStatusMessage( PVOID pWlxContext, DWORD *pdwOptions,

11 years, 7 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2013