Ros-diffs February 2007

ros-diffs@reactos.org

16 participants
265 discussions

[ion] 25752: - Fix build. - Initialize some SharedUserData settings in MmInitSystem.

by ion＠svn.reactos.org

Author: ion Date: Thu Feb 8 04:22:04 2007 New Revision: 25752 URL: http://svn.reactos.org/svn/reactos?rev=25752&view=rev Log: - Fix build. - Initialize some SharedUserData settings in MmInitSystem. Modified: trunk/reactos/ntoskrnl/include/internal/inbv.h trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/ntoskrnl/include/internal/inbv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/inbv.h (original) +++ trunk/reactos/ntoskrnl/include/internal/inbv.h Thu Feb 8 04:22:04 2007 @@ -45,6 +45,8 @@ VOID ); +extern BOOLEAN InbvBootDriverInstalled; + #endif /* NTOSKRNL_INBV_H */ Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c Thu Feb 8 04:22:04 2007 @@ -468,6 +468,14 @@ SectionsReady = TRUE; MmInitPagingFile(); PagingReady = TRUE; + + /* Setup shared user data settings that NT does as well */ + ASSERT(SharedUserData->NumberOfPhysicalPages == 0); + SharedUserData->NumberOfPhysicalPages = MmStats.NrTotalPages; + SharedUserData->LargePageMinimum = 0; + + /* For now, we assume that we're always Workstation */ + SharedUserData->NtProductType = NtProductWinNt; } else if (Phase == 2) {

17 years, 10 months

[ion] 25751: - Update boot graphics with new, RLE-compressed and palette-blacked versions from mf. - Re-enable FreeLDR's "prepare for ros video" routine, but change it to match the new BootVid, which uses Mode 0x12. This is roughly what HalDisplayReset does, which isn't yet implemented (except the latter needs to setup a BIOS call trampoline). - Fix up some bugs in bootvid and inbv. - Implement SOS case of DisplayBootBitmap, and implement FinalizeBootLogo. Now bootvid starts to show its colors,

by ion＠svn.reactos.org

Author: ion Date: Thu Feb 8 03:50:23 2007 New Revision: 25751 URL: http://svn.reactos.org/svn/reactos?rev=25751&view=rev Log: - Update boot graphics with new, RLE-compressed and palette-blacked versions from mf. - Re-enable FreeLDR's "prepare for ros video" routine, but change it to match the new BootVid, which uses Mode 0x12. This is roughly what HalDisplayReset does, which isn't yet implemented (except the latter needs to setup a BIOS call trampoline). - Fix up some bugs in bootvid and inbv. - Implement SOS case of DisplayBootBitmap, and implement FinalizeBootLogo. Now bootvid starts to show its colors, but one .bmp is still buggy. Modified: trunk/reactos/base/setup/usetup/bootsup.c trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c trunk/reactos/drivers/base/bootvid/vga.c trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/ex/power.c trunk/reactos/ntoskrnl/inbv/inbv.c trunk/reactos/ntoskrnl/inbv/logo/1.bmp trunk/reactos/ntoskrnl/inbv/logo/13.bmp trunk/reactos/ntoskrnl/inbv/logo/14.bmp trunk/reactos/ntoskrnl/inbv/logo/15.bmp trunk/reactos/ntoskrnl/inbv/logo/16.bmp trunk/reactos/ntoskrnl/inbv/logo/17.bmp trunk/reactos/ntoskrnl/inbv/logo/2.bmp trunk/reactos/ntoskrnl/inbv/logo/3.bmp trunk/reactos/ntoskrnl/inbv/logo/4.bmp trunk/reactos/ntoskrnl/inbv/logo/5.bmp trunk/reactos/ntoskrnl/inbv/logo/6.bmp trunk/reactos/ntoskrnl/inbv/logo/7.bmp trunk/reactos/ntoskrnl/inbv/logo/8.bmp trunk/reactos/ntoskrnl/include/internal/inbv.h Modified: trunk/reactos/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.… ============================================================================== --- trunk/reactos/base/setup/usetup/bootsup.c (original) +++ trunk/reactos/base/setup/usetup/bootsup.c Thu Feb 8 03:50:23 2007 @@ -310,7 +310,7 @@ NULL, INSERT_LAST, L"Options", - L"/DEBUGPORT=SCREEN /NOGUIBOOT /SOS"); + L"/DEBUGPORT=SCREEN /SOS"); /* Create "DOS" section */ IniSection = IniCacheAppendSection(IniCache, Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c Thu Feb 8 03:50:23 2007 @@ -596,7 +596,7 @@ { if (VIDEOCARD_VGA == PcVideoDetectVideoCard()) { - PcVideoSetBiosMode(0x03); + PcVideoSetBiosMode(0x12); PcVideoSetFont8x8(); PcVideoSelectAlternatePrintScreen(); PcVideoDisableCursorEmulation(); @@ -1108,8 +1108,8 @@ VOID PcVideoPrepareForReactOS(VOID) { - PcVideoSetMode80x50_80x43(); - PcVideoHideShowTextCursor(FALSE); + PcVideoSetBiosMode(0x12); + PcVideoHideShowTextCursor(FALSE); } /* EOF */ Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Thu Feb 8 03:50:23 2007 @@ -932,7 +932,7 @@ * Now boot the kernel */ DiskStopFloppyMotor(); - //MachVideoPrepareForReactOS(); + MachVideoPrepareForReactOS(); FrLdrStartup(0x2badb002); } Modified: trunk/reactos/drivers/base/bootvid/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/vga.c… ============================================================================== --- trunk/reactos/drivers/base/bootvid/vga.c (original) +++ trunk/reactos/drivers/base/bootvid/vga.c Thu Feb 8 03:50:23 2007 @@ -847,7 +847,7 @@ { /* Assert alignment */ ASSERT((x1 & 0x7) == 0); - ASSERT((x2 & 0x7) == 0); + ASSERT((x2 & 0x7) == 7); /* Set Scroll Region */ ScrollRegion[0] = x1; Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=257… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Thu Feb 8 03:50:23 2007 @@ -1028,7 +1028,7 @@ { /* It is, display the boot logo and enable printing strings */ InbvEnableDisplayString(SosEnabled); - //DisplayBootBitmap(SosEnabled); + DisplayBootBitmap(SosEnabled); } else { @@ -1204,7 +1204,7 @@ /* Wait 5 seconds for it to initialize */ Timeout.QuadPart = Int32x32To64(5, -10000000); Status = ZwWaitForSingleObject(ProcessInfo->ProcessHandle, FALSE, &Timeout); - //if (InbvBootDriverInstalled) FinalizeBootLogo(); + if (InbvBootDriverInstalled) FinalizeBootLogo(); if (Status == STATUS_SUCCESS) { Modified: trunk/reactos/ntoskrnl/ex/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/power.c?rev=25… ============================================================================== --- trunk/reactos/ntoskrnl/ex/power.c (original) +++ trunk/reactos/ntoskrnl/ex/power.c Thu Feb 8 03:50:23 2007 @@ -150,7 +150,7 @@ InbvSetTextColor(15); InbvInstallDisplayStringFilter(NULL); InbvEnableDisplayString(TRUE); - //InbvSetScrollRegion(0, 0, 639, 479); + InbvSetScrollRegion(0, 0, 639, 479); } if (Action == ShutdownNoReboot) Modified: trunk/reactos/ntoskrnl/inbv/inbv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/inbv.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/inbv/inbv.c (original) +++ trunk/reactos/ntoskrnl/inbv/inbv.c Thu Feb 8 03:50:23 2007 @@ -19,6 +19,9 @@ INBV_RESET_DISPLAY_PARAMETERS InbvResetDisplayParameters; ULONG ResourceCount; PUCHAR ResourceList[64]; +BOOLEAN SysThreadCreated; +ROT_BAR_TYPE RotBarSelection; +ULONG PltRotBarStatus; /* FUNCTIONS *****************************************************************/ @@ -528,3 +531,94 @@ /* Return success */ return STATUS_SUCCESS; } + +VOID +NTAPI +DisplayBootBitmap(IN BOOLEAN SosMode) +{ + PVOID Bitmap, Header; + ROT_BAR_TYPE TempRotBarSelection = RB_UNSPECIFIED; + + /* Check if the system thread has already been created */ + if (SysThreadCreated) + { + /* Reset the progress bar */ + InbvAcquireLock(); + RotBarSelection = 0; + InbvReleaseLock(); + } + + /* Check if this is SOS mode */ + ShowProgressBar = FALSE; + if (SosMode) + { + /* Check if this is a server OS */ + if (SharedUserData->NtProductType == NtProductWinNt) + { + /* It's not, set workstation settings */ + InbvSetTextColor(15); + InbvSolidColorFill(0, 0, 639, 479, 7); + InbvSolidColorFill(0, 421, 639, 479, 1); + + /* Get resources */ + Bitmap = InbvGetResourceAddress(6); + Header = InbvGetResourceAddress(7); + } + else + { + /* Set server settings */ + InbvSetTextColor(14); + InbvSolidColorFill(0, 0, 639, 479, 6); + InbvSolidColorFill(0, 421, 639, 479, 1); + + /* Get resources */ + Bitmap = InbvGetResourceAddress(14); + Header = InbvGetResourceAddress(15); + } + + /* Set the scrolling region */ + InbvSetScrollRegion(32, 80, 631, 400); + + /* Make sure we have resources */ + if ((Bitmap) && (Header)) + { + /* BitBlt them on the screen */ + InbvBitBlt(Header, 0, 419); + InbvBitBlt(Bitmap, 0, 0); + } + } + else + { + /* Is the boot driver installed? */ + if (!InbvBootDriverInstalled) return; + + /* FIXME: TODO, display full-screen bitmap */ + } + + /* Do we have a system thread? */ + if (SysThreadCreated) + { + /* We do, set the progress bar location */ + InbvAcquireLock(); + RotBarSelection = TempRotBarSelection; + //InbvRotBarInit(); + InbvReleaseLock(); + } +} + +VOID +NTAPI +FinalizeBootLogo(VOID) +{ + /* Acquire lock and check the display state */ + InbvAcquireLock(); + if (InbvGetDisplayState() == INBV_DISPLAY_STATE_OWNED) + { + /* Clear the screen */ + VidSolidColorFill(0, 0, 639, 479, 0); + } + + /* Reset progress bar and lock */ + PltRotBarStatus = 3; + InbvReleaseLock(); +} Modified: trunk/reactos/ntoskrnl/inbv/logo/1.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/1.bmp?r… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/ntoskrnl/inbv/logo/13.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/13.bmp?… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/ntoskrnl/inbv/logo/14.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/14.bmp?… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/ntoskrnl/inbv/logo/15.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/15.bmp?… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/ntoskrnl/inbv/logo/16.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/16.bmp?… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/ntoskrnl/inbv/logo/17.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/17.bmp?… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/ntoskrnl/inbv/logo/2.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/2.bmp?r… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/ntoskrnl/inbv/logo/3.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/3.bmp?r… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/ntoskrnl/inbv/logo/4.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/4.bmp?r… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/ntoskrnl/inbv/logo/5.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/5.bmp?r… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/ntoskrnl/inbv/logo/6.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/6.bmp?r… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/ntoskrnl/inbv/logo/7.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/7.bmp?r… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/ntoskrnl/inbv/logo/8.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/8.bmp?r… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/ntoskrnl/include/internal/inbv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/inbv.h (original) +++ trunk/reactos/ntoskrnl/include/internal/inbv.h Thu Feb 8 03:50:23 2007 @@ -7,6 +7,12 @@ ULONG Ceiling; ULONG Bias; } INBV_PROGRESS_STATE; + +typedef enum _ROT_BAR_TYPE +{ + RB_UNSPECIFIED, + RB_SQUARE_CELLS +} ROT_BAR_TYPE; VOID NTAPI @@ -27,6 +33,18 @@ IN BOOLEAN Enable ); +VOID +NTAPI +DisplayBootBitmap( + IN BOOLEAN SosMode +); + +VOID +NTAPI +FinalizeBootLogo( + VOID +); + #endif /* NTOSKRNL_INBV_H */

17 years, 10 months

[ion] 25750: - Add bootvid-compatible bitmaps for ReactOS, made by mf.

by ion＠svn.reactos.org

Author: ion Date: Thu Feb 8 01:08:13 2007 New Revision: 25750 URL: http://svn.reactos.org/svn/reactos?rev=25750&view=rev Log: - Add bootvid-compatible bitmaps for ReactOS, made by mf. Added: trunk/reactos/ntoskrnl/inbv/logo/ trunk/reactos/ntoskrnl/inbv/logo/1.bmp (with props) trunk/reactos/ntoskrnl/inbv/logo/13.bmp (with props) trunk/reactos/ntoskrnl/inbv/logo/14.bmp (with props) trunk/reactos/ntoskrnl/inbv/logo/15.bmp (with props) trunk/reactos/ntoskrnl/inbv/logo/16.bmp (with props) trunk/reactos/ntoskrnl/inbv/logo/17.bmp (with props) trunk/reactos/ntoskrnl/inbv/logo/2.bmp (with props) trunk/reactos/ntoskrnl/inbv/logo/3.bmp (with props) trunk/reactos/ntoskrnl/inbv/logo/4.bmp (with props) trunk/reactos/ntoskrnl/inbv/logo/5.bmp (with props) trunk/reactos/ntoskrnl/inbv/logo/6.bmp (with props) trunk/reactos/ntoskrnl/inbv/logo/7.bmp (with props) trunk/reactos/ntoskrnl/inbv/logo/8.bmp (with props) Modified: trunk/reactos/ntoskrnl/ntoskrnl.rc Added: trunk/reactos/ntoskrnl/inbv/logo/1.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/1.bmp?r… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/ntoskrnl/inbv/logo/1.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/ntoskrnl/inbv/logo/13.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/13.bmp?… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/ntoskrnl/inbv/logo/13.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/ntoskrnl/inbv/logo/14.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/14.bmp?… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/ntoskrnl/inbv/logo/14.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/ntoskrnl/inbv/logo/15.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/15.bmp?… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/ntoskrnl/inbv/logo/15.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/ntoskrnl/inbv/logo/16.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/16.bmp?… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/ntoskrnl/inbv/logo/16.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/ntoskrnl/inbv/logo/17.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/17.bmp?… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/ntoskrnl/inbv/logo/17.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/ntoskrnl/inbv/logo/2.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/2.bmp?r… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/ntoskrnl/inbv/logo/2.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/ntoskrnl/inbv/logo/3.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/3.bmp?r… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/ntoskrnl/inbv/logo/3.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/ntoskrnl/inbv/logo/4.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/4.bmp?r… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/ntoskrnl/inbv/logo/4.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/ntoskrnl/inbv/logo/5.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/5.bmp?r… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/ntoskrnl/inbv/logo/5.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/ntoskrnl/inbv/logo/6.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/6.bmp?r… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/ntoskrnl/inbv/logo/6.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/ntoskrnl/inbv/logo/7.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/7.bmp?r… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/ntoskrnl/inbv/logo/7.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/ntoskrnl/inbv/logo/8.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/8.bmp?r… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/ntoskrnl/inbv/logo/8.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/ntoskrnl/ntoskrnl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rc?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rc (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rc Thu Feb 8 01:08:13 2007 @@ -6,3 +6,17 @@ #include <reactos/version.rc> #include "bugcodes.rc" + +1 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/1.bmp" +2 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/2.bmp" +3 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/3.bmp" +4 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/4.bmp" +5 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/5.bmp" +6 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/6.bmp" +7 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/7.bmp" +8 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/8.bmp" +13 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/13.bmp" +14 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/14.bmp" +15 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/15.bmp" +16 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/16.bmp" +17 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/17.bmp"

17 years, 10 months

[hpoussin] 25749: Specify which winuser.h we want to include, instead of relying on some magic to find the right one

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Thu Feb 8 00:40:46 2007 New Revision: 25749 URL: http://svn.reactos.org/svn/reactos?rev=25749&view=rev Log: Specify which winuser.h we want to include, instead of relying on some magic to find the right one Modified: trunk/reactos/include/reactos/wine/winuser.h Modified: trunk/reactos/include/reactos/wine/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winus… ============================================================================== --- trunk/reactos/include/reactos/wine/winuser.h (original) +++ trunk/reactos/include/reactos/wine/winuser.h Thu Feb 8 00:40:46 2007 @@ -8,7 +8,7 @@ #include <wingdi.h> #if !defined(_MSC_VER) -#include_next <winuser.h> +#include "../../psdk/winuser.h" #endif #define WS_EX_TRAYWINDOW 0x80000000L

17 years, 10 months

[fireball] 25748: Merge fixes for LiveCD (25746, 25747 plus corresponding changes in ex/init.c). LiveCD now works.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Feb 7 23:56:12 2007 New Revision: 25748 URL: http://svn.reactos.org/svn/reactos?rev=25748&view=rev Log: Merge fixes for LiveCD (25746, 25747 plus corresponding changes in ex/init.c). LiveCD now works. Modified: branches/ros-branch-0_3_1/reactos/ntoskrnl/ex/init.c branches/ros-branch-0_3_1/reactos/ntoskrnl/ex/power.c branches/ros-branch-0_3_1/reactos/ntoskrnl/io/iomgr/arcname.c branches/ros-branch-0_3_1/reactos/ntoskrnl/mm/mminit.c Modified: branches/ros-branch-0_3_1/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/ntoskr… ============================================================================== --- branches/ros-branch-0_3_1/reactos/ntoskrnl/ex/init.c (original) +++ branches/ros-branch-0_3_1/reactos/ntoskrnl/ex/init.c Wed Feb 7 23:56:12 2007 @@ -33,6 +33,7 @@ BOOLEAN ExpInTextModeSetup; BOOLEAN IoRemoteBootClient; ULONG InitSafeBootMode; +BOOLEAN InitIsWinPEMode, InitWinPEModeType; BOOLEAN NoGuiBoot = FALSE; @@ -820,6 +821,7 @@ ExPhase2Init(PVOID Context) { LARGE_INTEGER Timeout; + PCHAR CommandLine; HANDLE ProcessHandle; HANDLE ThreadHandle; NTSTATUS Status; @@ -835,8 +837,11 @@ /* Do Phase 1 HAL Initialization */ HalInitSystem(1, KeLoaderBlock); + /* Get the command line and upcase it */ + CommandLine = _strupr(KeLoaderBlock->LoadOptions); + /* Check if GUI Boot is enabled */ - if (strstr(KeLoaderBlock->LoadOptions, "NOGUIBOOT")) NoGuiBoot = TRUE; + if (strstr(CommandLine, "NOGUIBOOT")) NoGuiBoot = TRUE; /* Display the boot screen image if not disabled */ if (!ExpInTextModeSetup) InbvDisplayInitialize2(NoGuiBoot); @@ -845,6 +850,14 @@ /* Clear the screen to blue and display the boot notice and debug status */ if (NoGuiBoot) ExpDisplayNotice(); KdInitSystem(2, KeLoaderBlock); + + /* Check if this is LiveCD (WinPE) mode */ + if (strstr(CommandLine, "MININT")) + { + /* Setup WinPE Settings */ + InitIsWinPEMode = TRUE; + InitWinPEModeType |= (strstr(CommandLine, "INRAM")) ? 0x80000000 : 1; + } /* Initialize Power Subsystem in Phase 0 */ PoInit(0, AcpiTableDetected); Modified: branches/ros-branch-0_3_1/reactos/ntoskrnl/ex/power.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/ntoskr… ============================================================================== --- branches/ros-branch-0_3_1/reactos/ntoskrnl/ex/power.c (original) +++ branches/ros-branch-0_3_1/reactos/ntoskrnl/ex/power.c Wed Feb 7 23:56:12 2007 @@ -150,7 +150,7 @@ InbvSetTextColor(15); InbvInstallDisplayStringFilter(NULL); InbvEnableDisplayString(TRUE); - InbvSetScrollRegion(0, 0, 639, 479); + //InbvSetScrollRegion(0, 0, 639, 479); } if (Action == ShutdownNoReboot) Modified: branches/ros-branch-0_3_1/reactos/ntoskrnl/io/iomgr/arcname.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/ntoskr… ============================================================================== --- branches/ros-branch-0_3_1/reactos/ntoskrnl/io/iomgr/arcname.c (original) +++ branches/ros-branch-0_3_1/reactos/ntoskrnl/io/iomgr/arcname.c Wed Feb 7 23:56:12 2007 @@ -33,6 +33,8 @@ FILE_BASIC_INFORMATION FileInfo; NTSTATUS Status; PCHAR p, q; + PCONFIGURATION_INFORMATION ConfigInfo = IoGetConfigurationInformation(); + extern BOOLEAN InitIsWinPEMode, ExpInTextModeSetup; /* Only ARC Name left - Build full ARC Name */ p = strstr(KeLoaderBlock->ArcBootDeviceName, "cdrom"); @@ -86,26 +88,32 @@ RtlFreeUnicodeString(&DeviceName); } - /* Build the name */ - sprintf(p, "cdrom(%lu)", DeviceNumber); - - /* Adjust original command line */ - q = strchr(p, ')'); - if (q) + if (!InitIsWinPEMode) { - q++; - strcpy(Buffer, q); + /* Build the name */ sprintf(p, "cdrom(%lu)", DeviceNumber); - strcat(p, Buffer); + + /* Adjust original command line */ + q = strchr(p, ')'); + if (q) + { + q++; + strcpy(Buffer, q); + sprintf(p, "cdrom(%lu)", DeviceNumber); + strcat(p, Buffer); + } } } + + /* OK, how many disks are there? */ + DeviceNumber += ConfigInfo->DiskCount; /* Return whether this is the CD or not */ - if (DeviceNumber != 1) + if ((InitIsWinPEMode) || (ExpInTextModeSetup)) { /* Hack until IoAssignDriveLetters is fixed */ - swprintf(SharedUserData->NtSystemRoot, L"D:\\reactos"); - return TRUE; + swprintf(SharedUserData->NtSystemRoot, L"%c:\\reactos", 'C' + DeviceNumber); + return TRUE; } /* Failed */ Modified: branches/ros-branch-0_3_1/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/ntoskr… ============================================================================== --- branches/ros-branch-0_3_1/reactos/ntoskrnl/mm/mminit.c (original) +++ branches/ros-branch-0_3_1/reactos/ntoskrnl/mm/mminit.c Wed Feb 7 23:56:12 2007 @@ -482,7 +482,7 @@ /* * Initialise the modified page writer. */ - MmInitMpwThread(); + if (!strstr(KeLoaderBlock->LoadOptions, "MININT")) MmInitMpwThread(); /* FIXME: Read parameters from memory */ }

17 years, 10 months

[ion] 25747: - Better fix for LiveCD issue; now it should work no matter what.

by ion＠svn.reactos.org

Author: ion Date: Wed Feb 7 19:31:24 2007 New Revision: 25747 URL: http://svn.reactos.org/svn/reactos?rev=25747&view=rev Log: - Better fix for LiveCD issue; now it should work no matter what. Modified: trunk/reactos/ntoskrnl/io/iomgr/arcname.c Modified: trunk/reactos/ntoskrnl/io/iomgr/arcname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/arcname.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/arcname.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/arcname.c Wed Feb 7 19:31:24 2007 @@ -33,6 +33,8 @@ FILE_BASIC_INFORMATION FileInfo; NTSTATUS Status; PCHAR p, q; + PCONFIGURATION_INFORMATION ConfigInfo = IoGetConfigurationInformation(); + extern BOOLEAN InitIsWinPEMode, ExpInTextModeSetup; /* Only ARC Name left - Build full ARC Name */ p = strstr(KeLoaderBlock->ArcBootDeviceName, "cdrom"); @@ -86,7 +88,7 @@ RtlFreeUnicodeString(&DeviceName); } - if (!(strstr(KeLoaderBlock->LoadOptions, "MININT"))) + if (!InitIsWinPEMode) { /* Build the name */ sprintf(p, "cdrom(%lu)", DeviceNumber); @@ -102,13 +104,16 @@ } } } + + /* OK, how many disks are there? */ + DeviceNumber += ConfigInfo->DiskCount; /* Return whether this is the CD or not */ - if (DeviceNumber != 1) + if ((InitIsWinPEMode) || (ExpInTextModeSetup)) { /* Hack until IoAssignDriveLetters is fixed */ - swprintf(SharedUserData->NtSystemRoot, L"D:\\reactos"); - return TRUE; + swprintf(SharedUserData->NtSystemRoot, L"%c:\\reactos", 'C' + DeviceNumber); + return TRUE; } /* Failed */

17 years, 10 months

[ion] 25746: - Fix IopApplyReactOSCdRomHack to handle LiveCD case properly. LiveCD should now boot*. - Fix invalid inbv called during shutdown. - Don't call HalResetDisplay during VidReset since it's not yet implemented and this will crash the system. - Temporarily disable bootvid in LiveCD until it works, and enable debugging output so LiveCDs can output some debugging information in case of bugs. * LiveCD won't actually work because for some time now, ReactOS needs to be "installed" because of

by ion＠svn.reactos.org

Author: ion Date: Wed Feb 7 09:08:24 2007 New Revision: 25746 URL: http://svn.reactos.org/svn/reactos?rev=25746&view=rev Log: - Fix IopApplyReactOSCdRomHack to handle LiveCD case properly. LiveCD should now boot*. - Fix invalid inbv called during shutdown. - Don't call HalResetDisplay during VidReset since it's not yet implemented and this will crash the system. - Temporarily disable bootvid in LiveCD until it works, and enable debugging output so LiveCDs can output some debugging information in case of bugs. * LiveCD won't actually work because for some time now, ReactOS needs to be "installed" because of missing PnP entries. LiveCD Boot will cause a message box saying "EnableUserModePnPManager" failed. hpoussin? Modified: trunk/reactos/boot/bootdata/livecd.ini trunk/reactos/drivers/base/bootvid/bootvid.c trunk/reactos/ntoskrnl/KrnlFun.c trunk/reactos/ntoskrnl/ex/power.c trunk/reactos/ntoskrnl/io/iomgr/arcname.c trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/boot/bootdata/livecd.ini URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/livecd.ini?r… ============================================================================== --- trunk/reactos/boot/bootdata/livecd.ini (original) +++ trunk/reactos/boot/bootdata/livecd.ini Wed Feb 7 09:08:24 2007 @@ -25,4 +25,4 @@ [ReactOS] BootType=ReactOS SystemPath=LiveCD -Options= +Options=/DEBUGPORT=COM1 /NOGUIBOOT Modified: trunk/reactos/drivers/base/bootvid/bootvid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootv… ============================================================================== --- trunk/reactos/drivers/base/bootvid/bootvid.c (original) +++ trunk/reactos/drivers/base/bootvid/bootvid.c Wed Feb 7 09:08:24 2007 @@ -463,7 +463,7 @@ curr_y = 0; /* Clear the screen with HAL if we were asked to */ - if (HalReset) HalResetDisplay(); + //if (HalReset) HalResetDisplay(); /* Re-initialize the VGA Display */ VgaInterpretCmdStream(AT_Initialization); Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=257… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (original) +++ trunk/reactos/ntoskrnl/KrnlFun.c Wed Feb 7 09:08:24 2007 @@ -15,9 +15,7 @@ // Global: // - TODO: Complete the list of bufxies // - Fix DPCs interrupting code at DISPATCH_LEVEL -// - Fix process reference count leak. // - Fix atapi.sys or serial.sys loading one more time at each boot. -// - Fix LiveCD. // /////////////////////////////////////////////////////////////////////////////// Modified: trunk/reactos/ntoskrnl/ex/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/power.c?rev=25… ============================================================================== --- trunk/reactos/ntoskrnl/ex/power.c (original) +++ trunk/reactos/ntoskrnl/ex/power.c Wed Feb 7 09:08:24 2007 @@ -150,7 +150,7 @@ InbvSetTextColor(15); InbvInstallDisplayStringFilter(NULL); InbvEnableDisplayString(TRUE); - InbvSetScrollRegion(0, 0, 639, 479); + //InbvSetScrollRegion(0, 0, 639, 479); } if (Action == ShutdownNoReboot) Modified: trunk/reactos/ntoskrnl/io/iomgr/arcname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/arcname.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/arcname.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/arcname.c Wed Feb 7 09:08:24 2007 @@ -86,17 +86,20 @@ RtlFreeUnicodeString(&DeviceName); } - /* Build the name */ - sprintf(p, "cdrom(%lu)", DeviceNumber); - - /* Adjust original command line */ - q = strchr(p, ')'); - if (q) + if (!(strstr(KeLoaderBlock->LoadOptions, "MININT"))) { - q++; - strcpy(Buffer, q); + /* Build the name */ sprintf(p, "cdrom(%lu)", DeviceNumber); - strcat(p, Buffer); + + /* Adjust original command line */ + q = strchr(p, ')'); + if (q) + { + q++; + strcpy(Buffer, q); + sprintf(p, "cdrom(%lu)", DeviceNumber); + strcat(p, Buffer); + } } } Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c Wed Feb 7 09:08:24 2007 @@ -480,7 +480,7 @@ /* * Initialise the modified page writer. */ - MmInitMpwThread(); + if (!strstr(LoaderBlock->LoadOptions, "MININT")) MmInitMpwThread(); /* Initialize the balance set manager */ MmInitBsmThread();

17 years, 10 months

[dgorbachev] 25745: Fix "keyboard does not respond" bug. Thanks to Peter Krawies (breakoutbox /AT/ web /DOT/ de)

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Wed Feb 7 03:29:50 2007 New Revision: 25745 URL: http://svn.reactos.org/svn/reactos?rev=25745&view=rev Log: Fix "keyboard does not respond" bug. Thanks to Peter Krawies (breakoutbox /AT/ web /DOT/ de) Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c 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 (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c Wed Feb 7 03:29:50 2007 @@ -1925,6 +1925,8 @@ { UCHAR Scancode; UCHAR Status; + ULONG Loops; + BOOLEAN Result = TRUE; PS2ControllerWait(); WRITE_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_CONTROL, @@ -1935,31 +1937,43 @@ WRITE_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_DATA, 0xF2); - StallExecutionProcessor(10000); + /* Wait for reply */ + for (Loops = 0; Loops < 10; Loops++) + { + StallExecutionProcessor(10000); + Status = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_STATUS); + if ((Status & CONTROLLER_STATUS_OUTPUT_BUFFER_FULL) != 0) + break; + } Status = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_STATUS); if ((Status & CONTROLLER_STATUS_MOUSE_OUTPUT_BUFFER_FULL) == 0) - { - return FALSE; - } + Result = FALSE; Scancode = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_DATA); if (Scancode != 0xFA) - return FALSE; + Result = FALSE; StallExecutionProcessor(10000); Status = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_STATUS); if ((Status & CONTROLLER_STATUS_MOUSE_OUTPUT_BUFFER_FULL) == 0) - { - return FALSE; - } + Result = FALSE; Scancode = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_DATA); if (Scancode != 0x00) - return FALSE; - - return TRUE; + Result = FALSE; + + /* Flush output buffer */ + for (Loops = 0; Loops < 10; Loops++) + { + Status = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_STATUS); + if ((Status & CONTROLLER_STATUS_OUTPUT_BUFFER_FULL) == 0) + break; + StallExecutionProcessor(10000); + } + + return Result; }

17 years, 10 months

[dgorbachev] 25744: bootvid.sys -> bootvid.dll

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Tue Feb 6 20:48:21 2007 New Revision: 25744 URL: http://svn.reactos.org/svn/reactos?rev=25744&view=rev Log: bootvid.sys -> bootvid.dll Modified: trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/boot/bootdata/txtsetup.sif Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf (original) +++ trunk/reactos/boot/bootdata/hivesys.inf Tue Feb 6 20:48:21 2007 @@ -495,7 +495,7 @@ ; Boot Video Driver HKLM,"SYSTEM\CurrentControlSet\Services\BootVideo","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\BootVideo","Group",0x00000000,"Base" -HKLM,"SYSTEM\CurrentControlSet\Services\BootVideo","ImagePath",0x00020000,"system32\drivers\bootvid.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\BootVideo","ImagePath",0x00020000,"system32\drivers\bootvid.dll" HKLM,"SYSTEM\CurrentControlSet\Services\BootVideo","Start",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\BootVideo","Type",0x00010001,0x00000002 Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif Tue Feb 6 20:48:21 2007 @@ -16,7 +16,7 @@ atapi.sys = 3 buslogic.sys = 3 blue.sys = 3 -bootvid.sys = 3 +bootvid.dll = 3 c_437.nls = 2 c_1252.nls = 2 cdfs.sys = 3

17 years, 10 months

[greatlrd] 25743: update my private doc about mmx

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Tue Feb 6 19:46:33 2007 New Revision: 25743 URL: http://svn.reactos.org/svn/reactos?rev=25743&view=rev Log: update my private doc about mmx Modified: branches/ros-branch-0_3_1/reactos/regress_greatlord.rtf Modified: branches/ros-branch-0_3_1/reactos/regress_greatlord.rtf URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/regres… ============================================================================== --- branches/ros-branch-0_3_1/reactos/regress_greatlord.rtf (original) +++ branches/ros-branch-0_3_1/reactos/regress_greatlord.rtf Tue Feb 6 19:46:33 2007 @@ -25,21 +25,20 @@ correct behovir of some api.\par \par \b\par -Known fixed regress from 0.3.0 to 0.3.1 branch\line\b0 1. FPU \par -2. OpenGL works with disable mmx/3dnow/sse \par +Known fixed regress from 0.3.0 to 0.3.1 branch\line\b0 1. FPU/ MMX\par +2. OpenGL works with disable 3dnow/sse \par \b\par Known regress from 0.2.9 to 0.3.0\par \b0 1. ABI word does not work\par -\line 2. FPU does not work\par +\line 2. FPU/ MMX does not work\par why : rewriting/bugfix of ntoskrnl\line\par -3. MMX/3DNOW/SSE does not work. \par +3. 3DNOW/SSE does not work. \par why : rewriting/bugfix of ntoskrnl\line\par 4. Windows redrawing problem cpl \par \line 5. update backgound from some windows. \par \par 6. OpenGL\line\line\b Known regress from 0.3.0 to 0.3.1 branch\line\b0 1. LiveCD\par -2. cmd md\par -3. VBE driver \line\b\par +2. cmd md\b\par \par }

17 years, 10 months

← Newer
1
...
16
17
18
19
20
21
22
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2007