Ros-dev

ros-dev@reactos.org

5788 discussions

Re: [ros-dev] [ros-diffs] [tfaber] 57976: [EXPLORER_NEW] - Add a manifest file to support theming - Formatting fixes - Based on Andrew Green's GSoC branch

by Ged Murphy

Are you planning on resurrecting this branch Thomas? On 23/12/2012 10:25, "tfaber(a)svn.reactos.org" <tfaber(a)svn.reactos.org> wrote: >Author: tfaber >Date: Sun Dec 23 10:25:19 2012 >New Revision: 57976 > >URL: http://svn.reactos.org/svn/reactos?rev=57976&view=rev >Log: >[EXPLORER_NEW] >- Add a manifest file to support theming >- Formatting fixes >- Based on Andrew Green's GSoC branch > >Added: > trunk/reactos/base/shell/explorer-new/explorer.exe.manifest (with >props) >Modified: > trunk/reactos/base/shell/explorer-new/explorer.rc > trunk/reactos/base/shell/explorer-new/taskswnd.c > trunk/reactos/base/shell/explorer-new/trayntfy.c

11 years, 9 months

Re: [ros-dev] [ros-builds] Trunk_x86_GCCLin Release: build failed

by Pierre Schweitzer

Fixed as well. Forgot that one, sorry. Le samedi 15 décembre 2012 à 12:48 +0000, buildbot(a)reactos.org a écrit : > The Buildbot has detected a failed build on builder Trunk_x86_GCCLin Release while building ReactOS. > Full details are available at: > http://build.reactos.org/builders/Trunk_x86_GCCLin%20Release/builds/289 > > Buildbot URL: http://build.reactos.org/ > > Buildslave for this Build: Linux_AMD64_1B > > Build Reason: The Periodic scheduler named 'release' triggered this build > Build Source Stamp: HEAD > Blamelist: > > BUILD FAILED: failed compile_1 > > sincerely, > -The Buildbot > > -- Pierre Schweitzer <pierre(a)reactos.org> Systems Administrator ReactOS Foundation

11 years, 9 months

Re: [ros-dev] [ros-diffs] [jgardou] 57909: [INCLUDE/CRT] - _CRT_NON_CONFORMING_SWPRINTFS is not relevant for us.

by Timo Kreuzer

The reason for this define is to allow swprintf etc., wich is then an alias for _swprintf, which we do implement. I don't see why this should be disabled. Am 13.12.2012 20:21, schrieb jgardou(a)svn.reactos.org: > Author: jgardou > Date: Thu Dec 13 19:21:30 2012 > New Revision: 57909 > > URL: http://svn.reactos.org/svn/reactos?rev=57909&view=rev > Log: > [INCLUDE/CRT] > - _CRT_NON_CONFORMING_SWPRINTFS is not relevant for us. > > Modified: > trunk/reactos/include/crt/stdio.h > trunk/reactos/include/crt/wchar.h > > Modified: trunk/reactos/include/crt/stdio.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdio.h?rev=57… > ============================================================================== > --- trunk/reactos/include/crt/stdio.h [iso-8859-1] (original) > +++ trunk/reactos/include/crt/stdio.h [iso-8859-1] Thu Dec 13 19:21:30 2012 > @@ -322,12 +322,14 @@ > #include <vadefs.h> > #endif > > +#if 0 //this is for MSVCRT80 and higher, which we don't use nor implement > #ifdef _CRT_NON_CONFORMING_SWPRINTFS > #ifndef __cplusplus > #define swprintf _swprintf > #define vswprintf _vswprintf > #define _swprintf_l __swprintf_l > #define _vswprintf_l __vswprintf_l > +#endif > #endif > #endif > > > Modified: trunk/reactos/include/crt/wchar.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/wchar.h?rev=57… > ============================================================================== > --- trunk/reactos/include/crt/wchar.h [iso-8859-1] (original) > +++ trunk/reactos/include/crt/wchar.h [iso-8859-1] Thu Dec 13 19:21:30 2012 > @@ -561,12 +561,14 @@ > _CRTIMP int __cdecl __swprintf_l(wchar_t *_Dest,const wchar_t *_Format,_locale_t _Plocinfo,...); > _CRTIMP int __cdecl __vswprintf_l(wchar_t *_Dest,const wchar_t *_Format,_locale_t _Plocinfo,va_list _Args); > > +#if 0 //this is for MSVCRT80 and higher, which we don't use nor implement > #ifdef _CRT_NON_CONFORMING_SWPRINTFS > #ifndef __cplusplus > #define swprintf _swprintf > #define vswprintf _vswprintf > #define _swprintf_l __swprintf_l > #define _vswprintf_l __vswprintf_l > +#endif > #endif > #endif > > > >

11 years, 9 months

Re: [ros-dev] [ros-builds] Trunk_x86_GCCLin Debug: build failed

by Pierre Schweitzer

Fixed. The needed env variable is now exported. Le vendredi 14 décembre 2012 à 21:56 +0000, buildbot(a)reactos.org a écrit : > The Buildbot has detected a failed build on builder Trunk_x86_GCCLin Debug while building ReactOS. > Full details are available at: > http://build.reactos.org/builders/Trunk_x86_GCCLin%20Debug/builds/2066 > > Buildbot URL: http://build.reactos.org/ > > Buildslave for this Build: Linux_AMD64_1 > > Build Reason: scheduler > Build Source Stamp: 57913 > Blamelist: akhaldi > > BUILD FAILED: failed compile_1 > > sincerely, > -The Buildbot > > -- Pierre Schweitzer <pierre(a)reactos.org> Systems Administrator ReactOS Foundation

11 years, 9 months

Re: [ros-dev] [ros-diffs] [tfaber] 57815: [SPIDER] - Only dissolve a stack of cards if they're of the same color - Allow easier recognition of suit in concealed cards - Patch by Marcel Leyendeckers, m dot leyendeckers at gm...

by Timo Kreuzer

YAY! Finally this is fixed! Am 07.12.2012 19:00, schrieb tfaber(a)svn.reactos.org: > Author: tfaber > Date: Fri Dec 7 18:00:30 2012 > New Revision: 57815 > > URL: http://svn.reactos.org/svn/reactos?rev=57815&view=rev > Log: > [SPIDER] > - Only dissolve a stack of cards if they're of the same color > - Allow easier recognition of suit in concealed cards > - Patch by Marcel Leyendeckers, m dot leyendeckers at gmx dot de > CORE-6808 #resolve #comment Committed. Thanks! > > Modified: > trunk/reactos/base/applications/games/spider/spigame.cpp > > Modified: trunk/reactos/base/applications/games/spider/spigame.cpp > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… > ============================================================================== > --- trunk/reactos/base/applications/games/spider/spigame.cpp [iso-8859-1] (original) > +++ trunk/reactos/base/applications/games/spider/spigame.cpp [iso-8859-1] Fri Dec 7 18:00:30 2012 > @@ -249,7 +249,8 @@ > int i, max = NUM_ONECOLOR_CARDS - dragcards.NumCards() - 1; > > /* Dragged cards have been checked to be in order, check stack cards */ > - if (stackLookingGood(mystack, max)) > + if (mystack[0].Suit() == dragcard.Suit() && > + stackLookingGood(mystack, max)) > { > CardStack s = stackobj.GetCardStack(); > CardStack f; > @@ -279,8 +280,8 @@ > { > int i, pos; > > - /* Compute the value for yRowStackCardOffset based on the height of the card, so the card number isn't hidden on larger cards */ > - yRowStackCardOffset = (int)(__cardheight / 6.7); > + /* Compute the value for yRowStackCardOffset based on the height of the card, so the card number and suite isn't hidden on larger cards except Ace */ > + yRowStackCardOffset = (int)(__cardheight / 6.4); > > pDeck = SpiderWnd.CreateRegion(0, true, 0, 0, -15, 0); > pDeck->SetFaceDirection(CS_FACE_DOWN, 0); > > >

11 years, 9 months

Re: [ros-dev] [ros-diffs] [hbelusca] 57899: [FREELDR] - Use a list of possible operating system method loading to load ReactOS / ROS-Setup / Windows / Linux or booting from a disk / partition ..., instead of using a (huge) ...

by Aleksey Bragin

Great, that if/elseif was really lame and I wanted to fix that since the moment I added Windows boot support. Regards, Aleksey Bragin On 13.12.2012 4:46, hbelusca(a)svn.reactos.org wrote: > Author: hbelusca > Date: Thu Dec 13 00:46:55 2012 > New Revision: 57899 > > URL: http://svn.reactos.org/svn/reactos?rev=57899&view=rev > Log: > [FREELDR] > - Use a list of possible operating system method loading to load ReactOS / ROS-Setup / Windows / Linux or booting from a disk / partition ..., instead of using a (huge) if () else if () ... instruction. > - Modify the corresponding functions to take into account for this new functionality. > - Allow having a live + boot cd if needed, in a elegant way. > > Modified: > trunk/reactos/boot/freeldr/freeldr/arch/i386/custom.c > trunk/reactos/boot/freeldr/freeldr/arch/i386/miscboot.c > trunk/reactos/boot/freeldr/freeldr/bootmgr.c > trunk/reactos/boot/freeldr/freeldr/include/arch/i386/miscboot.h > trunk/reactos/boot/freeldr/freeldr/include/linux.h > trunk/reactos/boot/freeldr/freeldr/include/winldr.h > trunk/reactos/boot/freeldr/freeldr/linuxboot.c > trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c > trunk/reactos/boot/freeldr/freeldr/windows/winldr.c > > Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/custom.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… > ============================================================================== > --- trunk/reactos/boot/freeldr/freeldr/arch/i386/custom.c [iso-8859-1] (original) > +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/custom.c [iso-8859-1] Thu Dec 13 00:46:55 2012 > @@ -40,8 +40,8 @@ > "ReactOS", > "Linux" > }; > - ULONG CustomBootMenuCount = sizeof(CustomBootMenuList) / sizeof(CustomBootMenuList[0]); > - ULONG SelectedMenuItem; > + ULONG CustomBootMenuCount = sizeof(CustomBootMenuList) / sizeof(CustomBootMenuList[0]); > + ULONG SelectedMenuItem; > > if (!UiDisplayMenu("Please choose a boot method:", > CustomBootMenuList, > @@ -74,10 +74,11 @@ > > VOID OptionMenuCustomBootDisk(VOID) > { > - CHAR SectionName[100]; > - CHAR BootDriveString[20]; > - ULONG SectionId; > + ULONG_PTR SectionId; > + CHAR SectionName[100]; > + CHAR BootDriveString[20]; > TIMEINFO* TimeInfo; > + OperatingSystemItem OperatingSystem; > > RtlZeroMemory(SectionName, sizeof(SectionName)); > RtlZeroMemory(BootDriveString, sizeof(BootDriveString)); > @@ -111,16 +112,21 @@ > > UiMessageBox(CustomBootPrompt); > > - LoadAndBootDrive(SectionName); > + OperatingSystem.SystemPartition = SectionName; > + OperatingSystem.LoadIdentifier = NULL; > + OperatingSystem.OsLoadOptions = NULL; > + > + LoadAndBootDrive(&OperatingSystem, 0); > } > > VOID OptionMenuCustomBootPartition(VOID) > { > - CHAR SectionName[100]; > - CHAR BootDriveString[20]; > - CHAR BootPartitionString[20]; > - ULONG SectionId; > + ULONG_PTR SectionId; > + CHAR SectionName[100]; > + CHAR BootDriveString[20]; > + CHAR BootPartitionString[20]; > TIMEINFO* TimeInfo; > + OperatingSystemItem OperatingSystem; > > RtlZeroMemory(SectionName, sizeof(SectionName)); > RtlZeroMemory(BootDriveString, sizeof(BootDriveString)); > @@ -166,17 +172,22 @@ > > UiMessageBox(CustomBootPrompt); > > - LoadAndBootPartition(SectionName); > + OperatingSystem.SystemPartition = SectionName; > + OperatingSystem.LoadIdentifier = NULL; > + OperatingSystem.OsLoadOptions = NULL; > + > + LoadAndBootPartition(&OperatingSystem, 0); > } > > VOID OptionMenuCustomBootBootSectorFile(VOID) > { > - CHAR SectionName[100]; > - CHAR BootDriveString[20]; > - CHAR BootPartitionString[20]; > - CHAR BootSectorFileString[200]; > - ULONG SectionId; > + ULONG_PTR SectionId; > + CHAR SectionName[100]; > + CHAR BootDriveString[20]; > + CHAR BootPartitionString[20]; > + CHAR BootSectorFileString[200]; > TIMEINFO* TimeInfo; > + OperatingSystemItem OperatingSystem; > > RtlZeroMemory(SectionName, sizeof(SectionName)); > RtlZeroMemory(BootDriveString, sizeof(BootDriveString)); > @@ -234,19 +245,24 @@ > > UiMessageBox(CustomBootPrompt); > > - LoadAndBootBootSector(SectionName); > + OperatingSystem.SystemPartition = SectionName; > + OperatingSystem.LoadIdentifier = NULL; > + OperatingSystem.OsLoadOptions = NULL; > + > + LoadAndBootBootSector(&OperatingSystem, 0); > } > > VOID OptionMenuCustomBootLinux(VOID) > { > - CHAR SectionName[100]; > - CHAR BootDriveString[20]; > - CHAR BootPartitionString[20]; > - CHAR LinuxKernelString[200]; > - CHAR LinuxInitrdString[200]; > - CHAR LinuxCommandLineString[200]; > - ULONG SectionId; > + ULONG_PTR SectionId; > + CHAR SectionName[100]; > + CHAR BootDriveString[20]; > + CHAR BootPartitionString[20]; > + CHAR LinuxKernelString[200]; > + CHAR LinuxInitrdString[200]; > + CHAR LinuxCommandLineString[200]; > TIMEINFO* TimeInfo; > + OperatingSystemItem OperatingSystem; > > RtlZeroMemory(SectionName, sizeof(SectionName)); > RtlZeroMemory(BootDriveString, sizeof(BootDriveString)); > @@ -331,7 +347,11 @@ > > UiMessageBox(CustomBootPrompt); > > - LoadAndBootLinux(SectionName, "Custom Linux Setup"); > + OperatingSystem.SystemPartition = SectionName; > + OperatingSystem.LoadIdentifier = "Custom Linux Setup"; > + OperatingSystem.OsLoadOptions = NULL; > + > + LoadAndBootLinux(&OperatingSystem, 0); > } > > VOID OptionMenuReboot(VOID) > > Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/miscboot.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… > ============================================================================== > --- trunk/reactos/boot/freeldr/freeldr/arch/i386/miscboot.c [iso-8859-1] (original) > +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/miscboot.c [iso-8859-1] Thu Dec 13 00:46:55 2012 > @@ -19,21 +19,24 @@ > > #include <freeldr.h> > > -VOID LoadAndBootBootSector(PCSTR OperatingSystemName) > +VOID > +LoadAndBootBootSector(IN OperatingSystemItem* OperatingSystem, > + IN USHORT OperatingSystemVersion) > { > + ULONG_PTR SectionId; > + PCSTR SectionName = OperatingSystem->SystemPartition; > + CHAR FileName[260]; > PFILE FilePointer; > + ULONG BytesRead; > CHAR SettingName[80]; > - ULONG SectionId; > - CHAR FileName[260]; > - ULONG BytesRead; > > // Find all the message box settings and run them > - UiShowMessageBoxesInSection(OperatingSystemName); > + UiShowMessageBoxesInSection(SectionName); > > // Try to open the operating system section in the .ini file > - if (!IniOpenSection(OperatingSystemName, &SectionId)) > - { > - sprintf(SettingName, "Section [%s] not found in freeldr.ini.\n", OperatingSystemName); > + if (!IniOpenSection(SectionName, &SectionId)) > + { > + sprintf(SettingName, "Section [%s] not found in freeldr.ini.\n", SectionName); > UiMessageBox(SettingName); > return; > } > @@ -79,22 +82,25 @@ > ChainLoadBiosBootSectorCode(); > } > > -VOID LoadAndBootPartition(PCSTR OperatingSystemName) > +VOID > +LoadAndBootPartition(IN OperatingSystemItem* OperatingSystem, > + IN USHORT OperatingSystemVersion) > { > + ULONG_PTR SectionId; > + PCSTR SectionName = OperatingSystem->SystemPartition; > CHAR SettingName[80]; > CHAR SettingValue[80]; > - ULONG SectionId; > PARTITION_TABLE_ENTRY PartitionTableEntry; > UCHAR DriveNumber; > ULONG PartitionNumber; > > // Find all the message box settings and run them > - UiShowMessageBoxesInSection(OperatingSystemName); > + UiShowMessageBoxesInSection(SectionName); > > // Try to open the operating system section in the .ini file > - if (!IniOpenSection(OperatingSystemName, &SectionId)) > - { > - sprintf(SettingName, "Section [%s] not found in freeldr.ini.\n", OperatingSystemName); > + if (!IniOpenSection(SectionName, &SectionId)) > + { > + sprintf(SettingName, "Section [%s] not found in freeldr.ini.\n", SectionName); > UiMessageBox(SettingName); > return; > } > @@ -151,20 +157,23 @@ > ChainLoadBiosBootSectorCode(); > } > > -VOID LoadAndBootDrive(PCSTR OperatingSystemName) > +VOID > +LoadAndBootDrive(IN OperatingSystemItem* OperatingSystem, > + IN USHORT OperatingSystemVersion) > { > + ULONG_PTR SectionId; > + PCSTR SectionName = OperatingSystem->SystemPartition; > CHAR SettingName[80]; > CHAR SettingValue[80]; > - ULONG SectionId; > UCHAR DriveNumber; > > // Find all the message box settings and run them > - UiShowMessageBoxesInSection(OperatingSystemName); > + UiShowMessageBoxesInSection(SectionName); > > // Try to open the operating system section in the .ini file > - if (!IniOpenSection(OperatingSystemName, &SectionId)) > - { > - sprintf(SettingName, "Section [%s] not found in freeldr.ini.\n", OperatingSystemName); > + if (!IniOpenSection(SectionName, &SectionId)) > + { > + sprintf(SettingName, "Section [%s] not found in freeldr.ini.\n", SectionName); > UiMessageBox(SettingName); > return; > } > > 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] Thu Dec 13 00:46:55 2012 > @@ -24,7 +24,90 @@ > CHAR reactos_arc_hardware_data[HW_MAX_ARC_HEAP_SIZE] = {0}; > CHAR reactos_arc_strings[32][256]; > > -ULONG GetDefaultOperatingSystem(OperatingSystemItem* OperatingSystemList, ULONG OperatingSystemCount) > +typedef > +VOID > +(*OS_LOADING_METHOD)(IN OperatingSystemItem* OperatingSystem, > + IN USHORT OperatingSystemVersion); > + > +struct > +{ > + CHAR BootType[80]; > + USHORT OperatingSystemVersion; > + OS_LOADING_METHOD Load; > +} OSLoadingMethods[] = > +{ > +#ifdef FREELDR_REACTOS_SETUP > + {"ReactOSSetup", 0 , LoadReactOSSetup }, > +#endif > + > +#ifdef _M_IX86 > + {"BootSector" , 0 , LoadAndBootBootSector}, > + {"Drive" , 0 , LoadAndBootDrive }, > + {"Partition" , 0 , LoadAndBootPartition }, > + > + {"Linux" , 0 , LoadAndBootLinux }, > + > + {"Windows" , 0 , LoadAndBootWindows }, > + {"WindowsNT40" , _WIN32_WINNT_NT4 , LoadAndBootWindows }, > +#endif > + {"Windows2003" , _WIN32_WINNT_WS03, LoadAndBootWindows }, > + > +// {"Not found" , 0 , NULL } > +}; > + > +VOID LoadOperatingSystem(IN OperatingSystemItem* OperatingSystem) > +{ > + ULONG_PTR SectionId; > + PCSTR SectionName = OperatingSystem->SystemPartition; > + CHAR BootType[80]; > + ULONG i; > + > + // Try to open the operating system section in the .ini file > + if (IniOpenSection(SectionName, &SectionId)) > + { > + // Try to read the boot type > + IniReadSettingByName(SectionId, "BootType", BootType, sizeof(BootType)); > + } > + else > + { > + BootType[0] = ANSI_NULL; > + } > + > + if (BootType[0] == ANSI_NULL && SectionName[0] != ANSI_NULL) > + { > + // Try to infere the boot type value > +#ifdef _M_IX86 > + ULONG FileId; > + if (ArcOpen((PSTR)SectionName, OpenReadOnly, &FileId) == ESUCCESS) > + { > + ArcClose(FileId); > + strcpy(BootType, "BootSector"); > + } > + else > +#endif > + { > + strcpy(BootType, "Windows"); > + } > + } > + > + // Install the drive mapper according to this section drive mappings > +#if defined(_M_IX86) && !defined(_MSC_VER) > + DriveMapMapDrivesInSection(SectionName); > +#endif > + > + // Loop through the OS loading method table and find a suitable OS to boot > + for (i = 0; i < sizeof(OSLoadingMethods) / sizeof(OSLoadingMethods[0]); ++i) > + { > + if (_stricmp(BootType, OSLoadingMethods[i].BootType) == 0) > + { > + OSLoadingMethods[i].Load(OperatingSystem, > + OSLoadingMethods[i].OperatingSystemVersion); > + return; > + } > + } > +} > + > +ULONG GetDefaultOperatingSystem(OperatingSystemItem* OperatingSystemList, ULONG OperatingSystemCount) > { > CHAR DefaultOSText[80]; > PCSTR DefaultOSName; > @@ -105,17 +188,14 @@ > > VOID RunLoader(VOID) > { > - CHAR SettingValue[80]; > - CHAR BootType[80]; > ULONG_PTR SectionId; > ULONG OperatingSystemCount; > OperatingSystemItem* OperatingSystemList; > - PCSTR *OperatingSystemDisplayNames; > - PCSTR SectionName; > - ULONG i; > + PCSTR* OperatingSystemDisplayNames; > ULONG DefaultOperatingSystem; > LONG TimeOut; > ULONG SelectedOperatingSystem; > + ULONG i; > > // FIXME: if possible, only detect and register ARC devices... > if (!MachHwDetect()) > @@ -206,78 +286,8 @@ > > TimeOut = -1; > > - // Try to open the operating system section in the .ini file > - SettingValue[0] = ANSI_NULL; > - SectionName = OperatingSystemList[SelectedOperatingSystem].SystemPartition; > - if (IniOpenSection(SectionName, &SectionId)) > - { > - // Try to read the boot type > - IniReadSettingByName(SectionId, "BootType", BootType, sizeof(BootType)); > - } > - else > - BootType[0] = ANSI_NULL; > - > - if (BootType[0] == ANSI_NULL && SectionName[0] != ANSI_NULL) > - { > - // Try to infere boot type value > -#ifdef _M_IX86 > - ULONG FileId; > - if (ArcOpen((CHAR*)SectionName, OpenReadOnly, &FileId) == ESUCCESS) > - { > - ArcClose(FileId); > - strcpy(BootType, "BootSector"); > - } > - else > -#endif > - { > - strcpy(BootType, "Windows"); > - } > - } > - > - // Get OS setting value > - IniOpenSection("Operating Systems", &SectionId); > - IniReadSettingByName(SectionId, SectionName, SettingValue, sizeof(SettingValue)); > - > - // Install the drive mapper according to this sections drive mappings > -#if defined(_M_IX86) && !defined(_MSC_VER) > - DriveMapMapDrivesInSection(SectionName); > -#endif > - > -#ifdef FREELDR_REACTOS_SETUP > - // WinLdr-style boot > - LoadReactOSSetup(); > -#elif defined(_M_IX86) > - if (_stricmp(BootType, "Windows") == 0) > - { > - LoadAndBootWindows(SectionName, SettingValue, 0); > - } > - else if (_stricmp(BootType, "WindowsNT40") == 0) > - { > - LoadAndBootWindows(SectionName, SettingValue, _WIN32_WINNT_NT4); > - } > - else if (_stricmp(BootType, "Windows2003") == 0) > - { > - LoadAndBootWindows(SectionName, SettingValue, _WIN32_WINNT_WS03); > - } > - else if (_stricmp(BootType, "Linux") == 0) > - { > - LoadAndBootLinux(SectionName, OperatingSystemDisplayNames[SelectedOperatingSystem]); > - } > - else if (_stricmp(BootType, "BootSector") == 0) > - { > - LoadAndBootBootSector(SectionName); > - } > - else if (_stricmp(BootType, "Partition") == 0) > - { > - LoadAndBootPartition(SectionName); > - } > - else if (_stricmp(BootType, "Drive") == 0) > - { > - LoadAndBootDrive(SectionName); > - } > -#else > - LoadAndBootWindows(SectionName, SettingValue, _WIN32_WINNT_WS03); > -#endif > + // Load the chosen operating system > + LoadOperatingSystem(&OperatingSystemList[SelectedOperatingSystem]); > } > > reboot: > > Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/miscboot.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… > ============================================================================== > --- trunk/reactos/boot/freeldr/freeldr/include/arch/i386/miscboot.h [iso-8859-1] (original) > +++ trunk/reactos/boot/freeldr/freeldr/include/arch/i386/miscboot.h [iso-8859-1] Thu Dec 13 00:46:55 2012 > @@ -19,6 +19,12 @@ > > #pragma once > > -VOID LoadAndBootBootSector(PCSTR OperatingSystemName); > -VOID LoadAndBootPartition(PCSTR OperatingSystemName); > -VOID LoadAndBootDrive(PCSTR OperatingSystemName); > +VOID > +LoadAndBootBootSector(IN OperatingSystemItem* OperatingSystem, > + IN USHORT OperatingSystemVersion); > +VOID > +LoadAndBootPartition(IN OperatingSystemItem* OperatingSystem, > + IN USHORT OperatingSystemVersion); > +VOID > +LoadAndBootDrive(IN OperatingSystemItem* OperatingSystem, > + IN USHORT OperatingSystemVersion); > > Modified: trunk/reactos/boot/freeldr/freeldr/include/linux.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… > ============================================================================== > --- trunk/reactos/boot/freeldr/freeldr/include/linux.h [iso-8859-1] (original) > +++ trunk/reactos/boot/freeldr/freeldr/include/linux.h [iso-8859-1] Thu Dec 13 00:46:55 2012 > @@ -18,6 +18,7 @@ > */ > > #include <fs.h> > +#include <oslist.h> > > #ifndef __LINUX_H > #define __LINUX_H > @@ -129,7 +130,9 @@ > VOID BootNewLinuxKernel(VOID); // Implemented in linux.S > VOID BootOldLinuxKernel(ULONG KernelSize); // Implemented in linux.S > > -VOID LoadAndBootLinux(PCSTR OperatingSystemName, PCSTR Description); > +VOID > +LoadAndBootLinux(IN OperatingSystemItem* OperatingSystem, > + IN USHORT OperatingSystemVersion); > > BOOLEAN LinuxParseIniSection(PCSTR OperatingSystemName); > BOOLEAN LinuxReadBootSector(PFILE LinuxKernelFile); > > Modified: trunk/reactos/boot/freeldr/freeldr/include/winldr.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… > ============================================================================== > --- trunk/reactos/boot/freeldr/freeldr/include/winldr.h [iso-8859-1] (original) > +++ trunk/reactos/boot/freeldr/freeldr/include/winldr.h [iso-8859-1] Thu Dec 13 00:46:55 2012 > @@ -80,9 +80,8 @@ > // ReactOS Loading Functions > // > /////////////////////////////////////////////////////////////////////////////////////// > -VOID LoadAndBootWindows(PCSTR OperatingSystemName, > - PSTR SettingsValue, > - USHORT OperatingSystemVersion); > +VOID LoadAndBootWindows(IN OperatingSystemItem* OperatingSystem, > + IN USHORT OperatingSystemVersion); > > // conversion.c > PVOID VaToPa(PVOID Va); > @@ -179,7 +178,9 @@ > LPCSTR BootPath, > BOOLEAN Setup); > > -VOID LoadReactOSSetup(VOID); > +VOID > +LoadReactOSSetup(IN OperatingSystemItem* OperatingSystem, > + IN USHORT OperatingSystemVersion); > > VOID > WinLdrSetupMachineDependent(PLOADER_PARAMETER_BLOCK LoaderBlock); > > Modified: trunk/reactos/boot/freeldr/freeldr/linuxboot.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/linux… > ============================================================================== > --- trunk/reactos/boot/freeldr/freeldr/linuxboot.c [iso-8859-1] (original) > +++ trunk/reactos/boot/freeldr/freeldr/linuxboot.c [iso-8859-1] Thu Dec 13 00:46:55 2012 > @@ -72,8 +72,12 @@ > return TRUE; > } > > -VOID LoadAndBootLinux(PCSTR OperatingSystemName, PCSTR Description) > -{ > +VOID > +LoadAndBootLinux(IN OperatingSystemItem* OperatingSystem, > + IN USHORT OperatingSystemVersion) > +{ > + PCSTR SectionName = OperatingSystem->SystemPartition; > + PCSTR Description = OperatingSystem->LoadIdentifier; > PFILE LinuxKernel = 0; > PFILE LinuxInitrdFile = 0; > CHAR TempString[260]; > @@ -93,7 +97,7 @@ > UiDrawProgressBarCenter(0, 100, LinuxBootDescription); > > // Parse the .ini file section > - if (!LinuxParseIniSection(OperatingSystemName)) > + if (!LinuxParseIniSection(SectionName)) > { > goto LinuxBootFailed; > } > @@ -235,18 +239,18 @@ > LinuxCommandLineSize = 0; > } > > -BOOLEAN LinuxParseIniSection(PCSTR OperatingSystemName) > -{ > - CHAR SettingName[260]; > - ULONG SectionId; > +BOOLEAN LinuxParseIniSection(PCSTR SectionName) > +{ > + ULONG_PTR SectionId; > + CHAR SettingName[260]; > > // Find all the message box settings and run them > - UiShowMessageBoxesInSection(OperatingSystemName); > + UiShowMessageBoxesInSection(SectionName); > > // Try to open the operating system section in the .ini file > - if (!IniOpenSection(OperatingSystemName, &SectionId)) > - { > - sprintf(SettingName, "Section [%s] not found in freeldr.ini.\n", OperatingSystemName); > + if (!IniOpenSection(SectionName, &SectionId)) > + { > + sprintf(SettingName, "Section [%s] not found in freeldr.ini.\n", SectionName); > UiMessageBox(SettingName); > return FALSE; > } > > Modified: trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… > ============================================================================== > --- trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c [iso-8859-1] (original) > +++ trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c [iso-8859-1] Thu Dec 13 00:46:55 2012 > @@ -133,7 +133,9 @@ > } while (InfFindNextLine(&InfContext, &InfContext)); > } > > -VOID LoadReactOSSetup(VOID) > +VOID > +LoadReactOSSetup(IN OperatingSystemItem* OperatingSystem, > + IN USHORT OperatingSystemVersion) > { > CHAR FileName[512]; > CHAR BootPath[512]; > > 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] Thu Dec 13 00:46:55 2012 > @@ -456,22 +456,28 @@ > } > > VOID > -LoadAndBootWindows(PCSTR OperatingSystemName, > - PSTR SettingsValue, > - USHORT OperatingSystemVersion) > -{ > +LoadAndBootWindows(IN OperatingSystemItem* OperatingSystem, > + IN USHORT OperatingSystemVersion) > +{ > + ULONG_PTR SectionId; > + PCSTR SectionName = OperatingSystem->SystemPartition; > + CHAR SettingsValue[80]; > BOOLEAN HasSection; > - char BootPath[MAX_PATH]; > + CHAR BootPath[MAX_PATH]; > CHAR FileName[MAX_PATH]; > CHAR BootOptions[256]; > PCHAR File; > BOOLEAN Status; > - ULONG_PTR SectionId; > PLOADER_PARAMETER_BLOCK LoaderBlock; > + > + // Get OS setting value > + SettingsValue[0] = ANSI_NULL; > + IniOpenSection("Operating Systems", &SectionId); > + IniReadSettingByName(SectionId, SectionName, SettingsValue, sizeof(SettingsValue)); > > // Open the operating system section > // specified in the .ini file > - HasSection = IniOpenSection(OperatingSystemName, &SectionId); > + HasSection = IniOpenSection(SectionName, &SectionId); > > UiDrawBackdrop(); > UiDrawProgressBarCenter(1, 100, "Loading NT..."); > @@ -480,7 +486,7 @@ > if (!HasSection || > !IniReadSettingByName(SectionId, "SystemPath", BootPath, sizeof(BootPath))) > { > - strcpy(BootPath, OperatingSystemName); > + strcpy(BootPath, SectionName); > } > > /* Special case for LiveCD */ > @@ -499,7 +505,7 @@ > if (!HasSection || !IniReadSettingByName(SectionId, "Options", BootOptions, sizeof(BootOptions))) > { > /* Get options after the title */ > - const CHAR*p = SettingsValue; > + PCSTR p = SettingsValue; > while (*p == ' ' || *p == '"') > p++; > while (*p != '\0' && *p != '"') > >

11 years, 9 months

Re: [ros-dev] [ros-diffs] [pschweitzer] 57792: [NTOSKRNL] ExFreePool -> ExFreePoolWithTag

by Aleksey Bragin

On 04.12.2012 2:15, pschweitzer(a)svn.reactos.org wrote: > - ExFreePool(SharedRange); > + ExFreePoolWithTag(SharedRange, 'FSRA'); > /* We need to rebuild the list of shared ranges. */ > DPRINT("Removing the lock entry %wZ (%08x%08x:%08x%08x)\n", > &FileObject->FileName, > @@ -1287,7 +1287,7 @@ > SharedRange = CONTAINING_RECORD(SharedEntry, LOCK_SHARED_RANGE, Entry); > SharedEntry = SharedEntry->Flink; > RemoveEntryList(SharedEntry); > - ExFreePool(SharedRange); > + ExFreePoolWithTag(SharedRange, 'FSRA'); > } > while ((Entry = RtlGetElementGenericTable(&InternalInfo->RangeTable, 0)) != NULL) > { > > It would be a good idea to add this to TAG_ list of defines.

11 years, 9 months

24pullrequests.com

by Александр

11 years, 9 months

Re: [ros-dev] [ros-diffs] [hbelusca] 57780: [CPORTLIB/FREELDR] GetByte --> Wait for data (with timeout) and get it if available. PollByte --> Check for data, get it if available, and return immediately.

by Timo Kreuzer

You are aware that this changes the behavior? Polling previously only checked, if data is available, but didn't read it from the port. But afaics it's only relvenat for WinLdrPortPollOnly, which seems to be unused anyway. Am 29.11.2012 00:16, schrieb hbelusca(a)svn.reactos.org: > Author: hbelusca > Date: Wed Nov 28 23:16:01 2012 > New Revision: 57780 > > URL: http://svn.reactos.org/svn/reactos?rev=57780&view=rev > Log: > [CPORTLIB/FREELDR] > GetByte --> Wait for data (with timeout) and get it if available. > PollByte --> Check for data, get it if available, and return immediately. > > Modified: > trunk/reactos/boot/freeldr/freeldr/comm/rs232.c > trunk/reactos/boot/freeldr/freeldr/windows/headless.c > trunk/reactos/include/reactos/libs/cportlib/cportlib.h > trunk/reactos/lib/cportlib/cport.c > > Modified: trunk/reactos/boot/freeldr/freeldr/comm/rs232.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/comm/… > ============================================================================== > --- trunk/reactos/boot/freeldr/freeldr/comm/rs232.c [iso-8859-1] (original) > +++ trunk/reactos/boot/freeldr/freeldr/comm/rs232.c [iso-8859-1] Wed Nov 28 23:16:01 2012 > @@ -100,7 +100,7 @@ > if (PortInitialized == FALSE) > return FALSE; > > - return (CpGetByte(&Rs232ComPort, ByteReceived, FALSE, FALSE) == CP_GET_SUCCESS); > + return (CpGetByte(&Rs232ComPort, ByteReceived, TRUE) == CP_GET_SUCCESS); > } > > /* > @@ -109,12 +109,7 @@ > if (PortInitialized == FALSE) > return FALSE; > > - while ((READ_PORT_UCHAR (SER_LSR(Rs232PortBase)) & SR_LSR_DR) == 0) > - ; > - > - *ByteReceived = READ_PORT_UCHAR (SER_RBR(Rs232PortBase)); > - > - return TRUE; > + return (CpGetByte(&Rs232ComPort, ByteReceived, FALSE) == CP_GET_SUCCESS); > } > */ > > > Modified: trunk/reactos/boot/freeldr/freeldr/windows/headless.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… > ============================================================================== > --- trunk/reactos/boot/freeldr/freeldr/windows/headless.c [iso-8859-1] (original) > +++ trunk/reactos/boot/freeldr/freeldr/windows/headless.c [iso-8859-1] Wed Nov 28 23:16:01 2012 > @@ -143,7 +143,7 @@ > WinLdrPortGetByte(IN ULONG PortId, > OUT PUCHAR Data) > { > - return CpGetByte(&Port[PortId], Data, TRUE, FALSE) == CP_GET_SUCCESS; > + return CpGetByte(&Port[PortId], Data, TRUE) == CP_GET_SUCCESS; > } > > BOOLEAN > @@ -151,7 +151,7 @@ > { > UCHAR Dummy; > > - return CpGetByte(&Port[PortId], &Dummy, FALSE, TRUE) == CP_GET_SUCCESS; > + return CpGetByte(&Port[PortId], &Dummy, FALSE) == CP_GET_SUCCESS; > } > > VOID > > Modified: trunk/reactos/include/reactos/libs/cportlib/cportlib.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/cport… > ============================================================================== > --- trunk/reactos/include/reactos/libs/cportlib/cportlib.h [iso-8859-1] (original) > +++ trunk/reactos/include/reactos/libs/cportlib/cportlib.h [iso-8859-1] Wed Nov 28 23:16:01 2012 > @@ -69,8 +69,7 @@ > CpGetByte( > IN PCPPORT Port, > OUT PUCHAR Byte, > - IN BOOLEAN Wait, > - IN BOOLEAN Poll > + IN BOOLEAN Wait > ); > > VOID > > Modified: trunk/reactos/lib/cportlib/cport.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cportlib/cport.c?rev=5… > ============================================================================== > --- trunk/reactos/lib/cportlib/cport.c [iso-8859-1] (original) > +++ trunk/reactos/lib/cportlib/cport.c [iso-8859-1] Wed Nov 28 23:16:01 2012 > @@ -255,8 +255,7 @@ > NTAPI > CpGetByte(IN PCPPORT Port, > OUT PUCHAR Byte, > - IN BOOLEAN Wait, > - IN BOOLEAN Poll) > + IN BOOLEAN Wait) > { > UCHAR Lsr; > ULONG LimitCount = Wait ? TIMEOUT_COUNT : 1; > @@ -278,9 +277,6 @@ > return CP_GET_ERROR; > } > > - /* If only polling was requested by caller, return now */ > - if (Poll) return CP_GET_SUCCESS; > - > /* Otherwise read the byte and return it */ > *Byte = READ_PORT_UCHAR(Port->Address + RECEIVE_BUFFER_REGISTER); > > > >

11 years, 9 months

November Status Meeting Tomorrow

by Aleksey Bragin

Hello, Let me invite you to the monthly status meeting taking place last Thursday of this month, 29th of November, 19:00 UTC. The meeting will be at irc://dev.reactos.org (Port 6667, no SSL) in the channel #meeting, or as Pierre/Colin say. Note that the IRC service will only be started shortly before the meeting. Your participation passwords will be emailed to you shortly before the meeting starts, and they are going to be different once again as they are not stored in any database. Hopefully it's not much of inconvenience. If someone still is not getting passwords sent before a meeting - please email Colin or Pierre before the meeting started to get one. The agenda will be posted shortly before the meeting, suggestions are welcome (send them to my email as usual). Hot topics would include progress made during this month, contracts updates, release plans (if any), web site progress (if any). With the best regards, Aleksey Bragin

11 years, 9 months

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-dev