Ros-diffs August 2006

ros-diffs@reactos.org

19 participants
447 discussions

[hpoussin] 23840: Remove some code duplication when calling PopupError Add ConAttachConsole stub

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Thu Aug 31 16:35:39 2006 New Revision: 23840 URL: http://svn.reactos.org/svn/reactos?rev=23840&view=rev Log: Remove some code duplication when calling PopupError Add ConAttachConsole stub Modified: trunk/reactos/base/setup/usetup/console.c trunk/reactos/base/setup/usetup/console.h trunk/reactos/base/setup/usetup/usetup.c Modified: trunk/reactos/base/setup/usetup/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/console.… ============================================================================== --- trunk/reactos/base/setup/usetup/console.c (original) +++ trunk/reactos/base/setup/usetup/console.c Thu Aug 31 16:35:39 2006 @@ -36,21 +36,21 @@ HANDLE StdInput = INVALID_HANDLE_VALUE; HANDLE StdOutput = INVALID_HANDLE_VALUE; -static SHORT xScreen = 0; -static SHORT yScreen = 0; +SHORT xScreen = 0; +SHORT yScreen = 0; /* FUNCTIONS *****************************************************************/ -BOOL WINAPI -ConAllocConsole( - IN DWORD dwProcessId) +#ifndef WIN32_USETUP + +BOOL WINAPI +ConAllocConsole(VOID) { UNICODE_STRING ScreenName = RTL_CONSTANT_STRING(L"\\??\\BlueScreen"); UNICODE_STRING KeyboardName = RTL_CONSTANT_STRING(L"\\Device\\KeyboardClass0"); OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; NTSTATUS Status; - CONSOLE_SCREEN_BUFFER_INFO csbi; /* Open the screen */ InitializeObjectAttributes( @@ -86,13 +86,14 @@ if (!NT_SUCCESS(Status)) return FALSE; - if (!GetConsoleScreenBufferInfo(StdOutput, &csbi)) - return FALSE; - - xScreen = csbi.dwSize.X; - yScreen = csbi.dwSize.Y; - return TRUE; +} + +BOOL WINAPI +ConAttachConsole( + IN DWORD dwProcessId) +{ + return FALSE; } BOOL WINAPI @@ -136,6 +137,21 @@ *lpNumberOfCharsWritten = IoStatusBlock.Information; return TRUE; +} + +HANDLE WINAPI +ConGetStdHandle( + IN DWORD nStdHandle) +{ + switch (nStdHandle) + { + case STD_INPUT_HANDLE: + return StdInput; + case STD_OUTPUT_HANDLE: + return StdOutput; + default: + return INVALID_HANDLE_VALUE; + } } BOOL WINAPI @@ -435,6 +451,8 @@ 0); return NT_SUCCESS(Status); } + +#endif /* !WIN32_USETUP */ VOID CONSOLE_ConInKey( Modified: trunk/reactos/base/setup/usetup/console.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/console.… ============================================================================== --- trunk/reactos/base/setup/usetup/console.h (original) +++ trunk/reactos/base/setup/usetup/console.h Thu Aug 31 16:35:39 2006 @@ -27,15 +27,31 @@ #ifndef __CONSOLE_H__ #define __CONSOLE_H__ +#define FOREGROUND_WHITE (FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE) +#define FOREGROUND_YELLOW (FOREGROUND_INTENSITY | FOREGROUND_RED | FOREGROUND_GREEN) +#define BACKGROUND_WHITE (BACKGROUND_RED | BACKGROUND_GREEN | BACKGROUND_BLUE) + +extern HANDLE StdInput, StdOutput; +extern SHORT xScreen, yScreen; + +#ifdef WIN32_USETUP + +#define NtDisplayString(str) printf("%S", (str)->Buffer) +#define NtRaiseHardError(status, a, b, c, d, e) exit(1) + +#else /* WIN32_USETUP */ + #undef WriteConsole #undef ReadConsoleInput #undef FillConsoleOutputCharacter #define AllocConsole ConAllocConsole +#define AttachConsole ConAttachConsole #define FillConsoleOutputAttribute ConFillConsoleOutputAttribute #define FillConsoleOutputCharacterA ConFillConsoleOutputCharacterA #define FreeConsole ConFreeConsole #define GetConsoleScreenBufferInfo ConGetConsoleScreenBufferInfo +#define GetStdHandle ConGetStdHandle #define ReadConsoleInput ConReadConsoleInput #define SetConsoleCursorInfo ConSetConsoleCursorInfo #define SetConsoleCursorPosition ConSetConsoleCursorPosition @@ -44,15 +60,8 @@ #define WriteConsoleOutputCharacterA ConWriteConsoleOutputCharacterA #define WriteConsoleOutputCharacterW ConWriteConsoleOutputCharacterW -#define FOREGROUND_WHITE (FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE) -#define FOREGROUND_YELLOW (FOREGROUND_INTENSITY | FOREGROUND_RED | FOREGROUND_GREEN) -#define BACKGROUND_WHITE (BACKGROUND_RED | BACKGROUND_GREEN | BACKGROUND_BLUE) - -extern HANDLE StdInput, StdOutput; - -BOOL WINAPI -ConAllocConsole( - IN DWORD dwProcessId); +BOOL WINAPI +ConAllocConsole(VOID); BOOL WINAPI ConFillConsoleOutputAttribute( @@ -77,6 +86,10 @@ ConGetConsoleScreenBufferInfo( IN HANDLE hConsoleOutput, OUT PCONSOLE_SCREEN_BUFFER_INFO lpConsoleScreenBufferInfo); + +HANDLE WINAPI +ConGetStdHandle( + IN DWORD nStdHandle); BOOL WINAPI ConReadConsoleInput( @@ -124,6 +137,7 @@ IN COORD dwWriteCoord, OUT LPDWORD lpNumberOfCharsWritten); +#endif /* !WIN32_USETUP */ VOID CONSOLE_ClearScreen(VOID); Modified: trunk/reactos/base/setup/usetup/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.c… ============================================================================== --- trunk/reactos/base/setup/usetup/usetup.c (original) +++ trunk/reactos/base/setup/usetup/usetup.c Thu Aug 31 16:35:39 2006 @@ -141,9 +141,15 @@ } +#define POPUP_WAIT_NONE 0 +#define POPUP_WAIT_ANY_KEY 1 +#define POPUP_WAIT_ENTER 2 + static VOID PopupError(PCHAR Text, - PCHAR Status) + PCHAR Status, + PINPUT_RECORD Ir, + ULONG WaitEvent) { SHORT xScreen; SHORT yScreen; @@ -364,6 +370,20 @@ coPos, &Written); } + + if (WaitEvent == POPUP_WAIT_NONE) + return; + + while (TRUE) + { + CONSOLE_ConInKey(Ir); + + if (WaitEvent == POPUP_WAIT_ANY_KEY + || Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) + { + return; + } + } } @@ -384,7 +404,8 @@ "\n" " \x07 Press ENTER to continue Setup.\n" " \x07 Press F3 to quit Setup.", - "F3= Quit ENTER = Continue"); + "F3= Quit ENTER = Continue", + NULL, POPUP_WAIT_NONE); while(TRUE) { @@ -560,31 +581,17 @@ { CONSOLE_PrintTextXY(6, 15, "NtQuerySystemInformation() failed (Status 0x%08lx)", Status); PopupError("Setup could not retrieve system drive information.\n", - "ENTER = Reboot computer"); - while(TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return QUIT_PAGE; - } - } + "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; } if (Sdi.NumberOfDisks == 0) { PopupError("Setup could not find a harddisk.\n", - "ENTER = Reboot computer"); - while(TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return QUIT_PAGE; - } - } + "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; } /* Get the source path and source root path */ @@ -592,24 +599,17 @@ &SourceRootPath); if (!NT_SUCCESS(Status)) { - CONSOLE_PrintTextXY(6, 15, "GetSourcePath() failed (Status 0x%08lx)", Status); + CONSOLE_PrintTextXY(6, 15, "GetSourcePaths() failed (Status 0x%08lx)", Status); PopupError("Setup could not find its source drive.\n", - "ENTER = Reboot computer"); - while(TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return QUIT_PAGE; - } - } + "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; } #if 0 else { - PrintTextXY(6, 15, "SourcePath: '%wZ'", &SourcePath); - PrintTextXY(6, 16, "SourceRootPath: '%wZ'", &SourceRootPath); + CONSOLE_PrintTextXY(6, 15, "SourcePath: '%wZ'", &SourcePath); + CONSOLE_PrintTextXY(6, 16, "SourceRootPath: '%wZ'", &SourceRootPath); } #endif @@ -624,34 +624,18 @@ if (SetupInf == INVALID_HANDLE_VALUE) { PopupError("Setup failed to load the file TXTSETUP.SIF.\n", - "ENTER = Reboot computer"); - - while(TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return QUIT_PAGE; - } - } + "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; } /* Open 'Version' section */ if (!SetupFindFirstLineW (SetupInf, L"Version", L"Signature", &Context)) { PopupError("Setup found a corrupt TXTSETUP.SIF.\n", - "ENTER = Reboot computer"); - - while(TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return QUIT_PAGE; - } - } + "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; } @@ -659,34 +643,18 @@ if (!INF_GetData (&Context, NULL, &Value)) { PopupError("Setup found a corrupt TXTSETUP.SIF.\n", - "ENTER = Reboot computer"); - - while(TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return QUIT_PAGE; - } - } + "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; } /* Check 'Signature' string */ if (_wcsicmp(Value, L"$ReactOS$") != 0) { PopupError("Setup found an invalid signature in TXTSETUP.SIF.\n", - "ENTER = Reboot computer"); - - while(TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return QUIT_PAGE; - } - } + "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; } CheckUnattendedSetup(); @@ -977,17 +945,9 @@ { /* FIXME: report error */ PopupError("Setup failed to load the keyboard layout list.\n", - "ENTER = Reboot computer"); - - while (TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return QUIT_PAGE; - } - } + "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; } } @@ -1372,7 +1332,8 @@ "\n" " \x07 Press F3 to quit Setup." " \x07 Press ENTER to continue.", - "F3= Quit ENTER = Continue"); + "F3= Quit ENTER = Continue", + NULL, POPUP_WAIT_NONE); while (TRUE) { CONSOLE_ConInKey (Ir); @@ -1454,8 +1415,8 @@ "of an already existing Partition!\n" "\n" " * Press any key to continue.", - NULL); - CONSOLE_ConInKey (Ir); + NULL, + Ir, POPUP_WAIT_ANY_KEY); return SELECT_PARTITION_PAGE; } @@ -1469,8 +1430,8 @@ PopupError ("You can not delete unpartitioned disk space!\n" "\n" " * Press any key to continue.", - NULL); - CONSOLE_ConInKey (Ir); + NULL, + Ir, POPUP_WAIT_ANY_KEY); return SELECT_PARTITION_PAGE; } @@ -2363,17 +2324,9 @@ DPRINT ("WritePartitionsToDisk() failed\n"); PopupError ("Setup failed to write partition tables.\n", - "ENTER = Reboot computer"); - - while (TRUE) - { - CONSOLE_ConInKey (Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return QUIT_PAGE; - } - } + "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; } /* Set DestinationRootPath */ @@ -2600,17 +2553,9 @@ { PopupError("Setup failed to find the 'SetupData' section\n" "in TXTSETUP.SIF.\n", - "ENTER = Reboot computer"); - - while (TRUE) - { - CONSOLE_ConInKey (Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return QUIT_PAGE; - } - } + "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; } /* Read the 'DefaultPath' data */ @@ -2698,17 +2643,8 @@ { char Buffer[128]; sprintf(Buffer, "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n", SectionName); - PopupError(Buffer, "ENTER = Reboot computer"); - - while(TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return(FALSE); - } - } + PopupError(Buffer, "ENTER = Reboot computer", Ir, POPUP_WAIT_ENTER); + return(FALSE); } /* @@ -2814,17 +2750,9 @@ { DPRINT("Creating directory '%S' failed: Status = 0x%08lx", PathBuffer, Status); PopupError("Setup could not create the install directory.", - "ENTER = Reboot computer"); - - while(TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return(FALSE); - } - } + "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); + return(FALSE); } @@ -2834,23 +2762,16 @@ if (SourceCabinet) { PopupError("Setup failed to find the 'Directories' section\n" - "in the cabinet.\n", "ENTER = Reboot computer"); + "in the cabinet.\n", "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); } else { PopupError("Setup failed to find the 'Directories' section\n" - "in TXTSETUP.SIF.\n", "ENTER = Reboot computer"); + "in TXTSETUP.SIF.\n", "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); } - - while(TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return(FALSE); - } - } + return(FALSE); } /* Enumerate the directory values and create the subdirectories */ @@ -2885,17 +2806,9 @@ { DPRINT("Creating directory '%S' failed: Status = 0x%08lx", PathBuffer, Status); PopupError("Setup could not create install directories.", - "ENTER = Reboot computer"); - - while (TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return(FALSE); - } - } + "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); + return(FALSE); } } } @@ -2925,17 +2838,9 @@ if (SetupFileQueue == NULL) { PopupError("Setup failed to open the copy file queue.\n", - "ENTER = Reboot computer"); - - while(TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return(QUIT_PAGE); - } - } + "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); + return(QUIT_PAGE); } if (!PrepareCopyPageInfFile(SetupInf, NULL, Ir)) @@ -2974,17 +2879,9 @@ if (InfFileData == NULL) { PopupError("Cabinet has no setup script.\n", - "ENTER = Reboot computer"); - - while(TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return QUIT_PAGE; - } - } + "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; } } else @@ -2992,17 +2889,9 @@ DPRINT("Cannot open cabinet: %S.\n", CabinetGetCabinetName()); PopupError("Cabinet not found.\n", - "ENTER = Reboot computer"); - - while(TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return QUIT_PAGE; - } - } + "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; } InfHandle = INF_OpenBufferedFileA(InfFileData, @@ -3013,17 +2902,9 @@ if (InfHandle == INVALID_HANDLE_VALUE) { PopupError("Cabinet has no valid inf file.\n", - "ENTER = Reboot computer"); - - while(TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return QUIT_PAGE; - } - } + "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; } CabinetCleanup(); @@ -3126,17 +3007,9 @@ { DPRINT("SetInstallPathValue() failed\n"); PopupError("Setup failed to set the initialize the registry.", - "ENTER = Reboot computer"); - - while(TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return QUIT_PAGE; - } - } + "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; } /* Create the default hives */ @@ -3145,17 +3018,9 @@ { DPRINT("NtInitializeRegistry() failed (Status %lx)\n", Status); PopupError("Setup failed to create the registry hives.", - "ENTER = Reboot computer"); - - while(TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return QUIT_PAGE; - } - } + "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; } /* Update registry */ @@ -3165,17 +3030,9 @@ { DPRINT1("SetupFindFirstLine() failed\n"); PopupError("Setup failed to find the registry data files.", - "ENTER = Reboot computer"); - - while(TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return QUIT_PAGE; - } - } + "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; } do @@ -3206,17 +3063,9 @@ DPRINT("Importing %S failed\n", File); PopupError("Setup failed to import a hive file.", - "ENTER = Reboot computer"); - - while(TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return QUIT_PAGE; - } - } + "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; } } while (SetupFindNextLine (&InfContext, &InfContext)); @@ -3226,17 +3075,9 @@ if (!ProcessDisplayRegistry(SetupInf, DisplayList)) { PopupError("Setup failed to update display registry settings.", - "ENTER = Reboot computer"); - - while(TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return QUIT_PAGE; - } - } + "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; } /* Update keyboard layout settings */ @@ -3244,17 +3085,9 @@ if (!ProcessKeyboardLayoutRegistry(LayoutList)) { PopupError("Setup failed to update keyboard layout settings.", - "ENTER = Reboot computer"); - - while(TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return QUIT_PAGE; - } - } + "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; } /* Update the mounted devices list */ @@ -3438,15 +3271,8 @@ if (DoesFileExist(L"\\Device\\Floppy0", L"\\") == FALSE) { PopupError("No disk in drive A:.", - "ENTER = Continue"); - while(TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - break; - } - + "ENTER = Continue", + Ir, POPUP_WAIT_ENTER); return BOOT_LOADER_FLOPPY_PAGE; } @@ -3487,17 +3313,9 @@ if (!NT_SUCCESS(Status)) { PopupError("Setup failed to install the FAT bootcode on the system partition.", - "ENTER = Reboot computer"); - - while(TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return QUIT_PAGE; - } - } + "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; } return SUCCESS_PAGE; @@ -3505,17 +3323,9 @@ else { PopupError("failed to install FAT bootcode on the system partition.", - "ENTER = Reboot computer"); - - while(TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return QUIT_PAGE; - } - } + "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; } return BOOT_LOADER_HARDDISK_PAGE; @@ -3669,22 +3479,24 @@ } -VOID NTAPI -NtProcessStartup(PPEB Peb) +static VOID +RunUSetup(VOID) { INPUT_RECORD Ir; PAGE_NUMBER Page; BOOL ret; - RtlNormalizeProcessParams(Peb->ProcessParameters); - - ProcessHeap = Peb->ProcessHeap; - INF_SetHeap(ProcessHeap); - SignalInitEvent(); - ret = AllocConsole(0); - if (!ret) + ret = AllocConsole(); + if (ret) + ret = AttachConsole(ATTACH_PARENT_PROCESS); + + if (!ret +#ifdef WIN32_USETUP + && GetLastError() != ERROR_ACCESS_DENIED +#endif + ) { PrintString("Unable to open the console\n\n"); PrintString("The most common cause of this is using an USB keyboard\n"); @@ -3693,6 +3505,16 @@ /* Raise a hard error (crash the system/BSOD) */ NtRaiseHardError(STATUS_SYSTEM_PROCESS_TERMINATED, 0,0,0,0,0); + } + else + { + CONSOLE_SCREEN_BUFFER_INFO csbi; + + StdInput = GetStdHandle(STD_INPUT_HANDLE); + StdOutput = GetStdHandle(STD_OUTPUT_HANDLE); + GetConsoleScreenBufferInfo(StdOutput, &csbi); + xScreen = csbi.dwSize.X; + yScreen = csbi.dwSize.Y; } @@ -3850,4 +3672,27 @@ NtTerminateProcess(NtCurrentProcess(), 0); } + +#ifdef WIN32_USETUP +int +main(void) +{ + ProcessHeap = GetProcessHeap(); + RunUSetup(); + return 0; +} + +#else + +VOID NTAPI +NtProcessStartup(PPEB Peb) +{ + RtlNormalizeProcessParams(Peb->ProcessParameters); + + ProcessHeap = Peb->ProcessHeap; + INF_SetHeap(ProcessHeap); + RunUSetup(); +} +#endif /* !WIN32_USETUP */ + /* EOF */

18 years, 1 month

[hpoussin] 23839: Fix build for Linux people, where gcc claims that it doesn't support I64 for printf. Thanks Usurp on IRC

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Thu Aug 31 16:31:34 2006 New Revision: 23839 URL: http://svn.reactos.org/svn/reactos?rev=23839&view=rev Log: Fix build for Linux people, where gcc claims that it doesn't support I64 for printf. Thanks Usurp on IRC Modified: trunk/reactos/base/setup/usetup/partlist.c Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c (original) +++ trunk/reactos/base/setup/usetup/partlist.c Thu Aug 31 16:31:34 2006 @@ -1083,7 +1083,7 @@ USHORT Width; USHORT Height; - ULONGLONG PartSize; + LARGE_INTEGER PartSize; PCHAR Unit; UCHAR Attribute; PCHAR PartType; @@ -1100,25 +1100,25 @@ #if 0 if (PartEntry->UnpartitionledLength >= 0x280000000ULL) /* 10 GB */ { - PartSize = (PartEntry->UnpartitionedLength + (1 << 29)) >> 30; + PartSize.QuadPart = (PartEntry->UnpartitionedLength + (1 << 29)) >> 30; Unit = "GB"; } else #endif if (PartEntry->UnpartitionedLength >= 0xA00000ULL) /* 10 MB */ { - PartSize = (PartEntry->UnpartitionedLength + (1 << 19)) >> 20; + PartSize.QuadPart = (PartEntry->UnpartitionedLength + (1 << 19)) >> 20; Unit = "MB"; } else { - PartSize = (PartEntry->UnpartitionedLength + (1 << 9)) >> 10; + PartSize.QuadPart = (PartEntry->UnpartitionedLength + (1 << 9)) >> 10; Unit = "KB"; } sprintf (LineBuffer, - " Unpartitioned space %6I64u %s", - PartSize, + " Unpartitioned space %6lu %s", + PartSize.u.LowPart, Unit); } else @@ -1152,40 +1152,40 @@ #if 0 if (PartEntry->PartInfo[0].PartitionLength.QuadPart >= 0x280000000LL) /* 10 GB */ { - PartSize = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 29)) >> 30; + PartSize.QuadPart = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 29)) >> 30; Unit = "GB"; } else #endif if (PartEntry->PartInfo[0].PartitionLength.QuadPart >= 0xA00000LL) /* 10 MB */ { - PartSize = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 19)) >> 20; + PartSize.QuadPart = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 19)) >> 20; Unit = "MB"; } else { - PartSize = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 9)) >> 10; + PartSize.QuadPart = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 9)) >> 10; Unit = "KB"; } if (PartType == NULL) { sprintf (LineBuffer, - "%c%c Type %-3u %6I64u %s", + "%c%c Type %-3u %6lu %s", (PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter, (PartEntry->DriveLetter == 0) ? '-' : ':', PartEntry->PartInfo[0].PartitionType, - PartSize, + PartSize.u.LowPart, Unit); } else { sprintf (LineBuffer, - "%c%c %-24s %6I64u %s", + "%c%c %-24s %6lu %s", (PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter, (PartEntry->DriveLetter == 0) ? '-' : ':', PartType, - PartSize, + PartSize.u.LowPart, Unit); } }

18 years, 1 month

[pborobia] 23838: Another test commit

by pborobia＠svn.reactos.org

Author: pborobia Date: Thu Aug 31 15:57:54 2006 New Revision: 23838 URL: http://svn.reactos.org/svn/reactos?rev=23838&view=rev Log: Another test commit Modified: branches/clipboard/dll/win32/user32/windows/clipboard.c Modified: branches/clipboard/dll/win32/user32/windows/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/clipboard/dll/win32/user32/wind… ============================================================================== --- branches/clipboard/dll/win32/user32/windows/clipboard.c (original) +++ branches/clipboard/dll/win32/user32/windows/clipboard.c Thu Aug 31 15:57:54 2006 @@ -1,21 +1,4 @@ -/* - * ReactOS kernel - * Copyright (C) 1998, 1999, 2000, 2001 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ + /* $Id$ * * PROJECT: ReactOS user32.dll

18 years, 1 month

[hpoussin] 23837: Fix Linux build (filename case problem...) Thanks gregj on IRC

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Thu Aug 31 15:09:05 2006 New Revision: 23837 URL: http://svn.reactos.org/svn/reactos?rev=23837&view=rev Log: Fix Linux build (filename case problem...) Thanks gregj on IRC Modified: trunk/reactos/lib/rtl/rtl.rbuild Modified: trunk/reactos/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.rbuild?rev=238… ============================================================================== --- trunk/reactos/lib/rtl/rtl.rbuild (original) +++ trunk/reactos/lib/rtl/rtl.rbuild Thu Aug 31 15:09:05 2006 @@ -32,13 +32,13 @@ <file>log_asm.s</file> <file>random_asm.S</file> <file>rtlswap.S</file> - <file>rtlmem.S</file> + <file>rtlmem.s</file> <file>pow_asm.s</file> <file>res_asm.s</file> <file>sin_asm.s</file> <file>sqrt_asm.s</file> - <file>tan_asm.s</file> - </directory> + <file>tan_asm.s</file> + </directory> </if> <file>access.c</file> <file>acl.c</file>

18 years, 1 month

[hpoussin] 23836: Cleanup in .inf file handling of usetup: - Equivalent setupapi functions have the same protoype as in Win32 API - Extra functions have the INF_* prefix

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Thu Aug 31 13:13:03 2006 New Revision: 23836 URL: http://svn.reactos.org/svn/reactos?rev=23836&view=rev Log: Cleanup in .inf file handling of usetup: - Equivalent setupapi functions have the same protoype as in Win32 API - Extra functions have the INF_* prefix Added: trunk/reactos/base/setup/usetup/inffile.c trunk/reactos/base/setup/usetup/inffile.h Modified: trunk/reactos/base/setup/usetup/bootsup.c trunk/reactos/base/setup/usetup/cabinet.c trunk/reactos/base/setup/usetup/console.c trunk/reactos/base/setup/usetup/console.h trunk/reactos/base/setup/usetup/drivesup.c trunk/reactos/base/setup/usetup/filequeue.c trunk/reactos/base/setup/usetup/filesup.c trunk/reactos/base/setup/usetup/format.c trunk/reactos/base/setup/usetup/fslist.c trunk/reactos/base/setup/usetup/genlist.c trunk/reactos/base/setup/usetup/inicache.c trunk/reactos/base/setup/usetup/keytrans.c trunk/reactos/base/setup/usetup/partlist.c trunk/reactos/base/setup/usetup/progress.c trunk/reactos/base/setup/usetup/registry.c trunk/reactos/base/setup/usetup/settings.c trunk/reactos/base/setup/usetup/usetup.c trunk/reactos/base/setup/usetup/usetup.h trunk/reactos/base/setup/usetup/usetup.rbuild 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 Aug 31 13:13:03 2006 @@ -24,7 +24,7 @@ * PROGRAMMER: Eric Kohl */ -#include <usetup.h> +#include "usetup.h" #define NDEBUG #include <debug.h> Modified: trunk/reactos/base/setup/usetup/cabinet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/cabinet.… ============================================================================== --- trunk/reactos/base/setup/usetup/cabinet.c (original) +++ trunk/reactos/base/setup/usetup/cabinet.c Thu Aug 31 13:13:03 2006 @@ -8,7 +8,7 @@ * CSH 15/08-2003 Created */ -#include <usetup.h> +#include "usetup.h" #include <zlib.h> #define NDEBUG Modified: trunk/reactos/base/setup/usetup/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/console.… ============================================================================== --- trunk/reactos/base/setup/usetup/console.c (original) +++ trunk/reactos/base/setup/usetup/console.c Thu Aug 31 13:13:03 2006 @@ -26,15 +26,15 @@ /* INCLUDES ******************************************************************/ -#include <usetup.h> +#include "usetup.h" #define NDEBUG #include <debug.h> /* GLOBALS ******************************************************************/ -static HANDLE StdInput = INVALID_HANDLE_VALUE; -static HANDLE StdOutput = INVALID_HANDLE_VALUE; +HANDLE StdInput = INVALID_HANDLE_VALUE; +HANDLE StdOutput = INVALID_HANDLE_VALUE; static SHORT xScreen = 0; static SHORT yScreen = 0; @@ -436,138 +436,133 @@ return NT_SUCCESS(Status); } - - - -VOID -CONSOLE_ConInKey(PINPUT_RECORD Buffer) +VOID +CONSOLE_ConInKey( + OUT PINPUT_RECORD Buffer) { ULONG Read; - while (TRUE) - { - ReadConsoleInput(StdInput, Buffer, 1, &Read); - - if ((Buffer->EventType == KEY_EVENT) && - (Buffer->Event.KeyEvent.bKeyDown == TRUE)) - break; - } -} - - -VOID -CONSOLE_ConOutChar(CHAR c) -{ - ULONG Written; - - WriteConsole(StdOutput, - &c, - 1, - &Written, - NULL); -} - - -VOID -CONSOLE_ConOutPuts(LPSTR szText) -{ - ULONG Written; - - WriteConsole(StdOutput, - szText, - strlen(szText), - &Written, - NULL); - WriteConsole(StdOutput, - "\n", - 1, - &Written, - NULL); -} - - -VOID -CONSOLE_ConOutPrintf(LPSTR szFormat, ...) -{ - CHAR szOut[256]; - DWORD dwWritten; - va_list arg_ptr; - - va_start(arg_ptr, szFormat); - vsprintf(szOut, szFormat, arg_ptr); - va_end(arg_ptr); - - WriteConsole(StdOutput, - szOut, - strlen(szOut), - &dwWritten, - NULL); -} - - - - + while (TRUE) + { + ReadConsoleInput(StdInput, Buffer, 1, &Read); + + if ((Buffer->EventType == KEY_EVENT) + && (Buffer->Event.KeyEvent.bKeyDown == TRUE)) + break; + } +} + +VOID +CONSOLE_ConOutChar( + IN CHAR c) +{ + ULONG Written; + + WriteConsole( + StdOutput, + &c, + 1, + &Written, + NULL); +} + +VOID +CONSOLE_ConOutPuts( + IN LPCSTR szText) +{ + ULONG Written; + + WriteConsole( + StdOutput, + szText, + strlen(szText), + &Written, + NULL); + WriteConsole( + StdOutput, + "\n", + 1, + &Written, + NULL); +} + +VOID +CONSOLE_ConOutPrintf( + IN LPCSTR szFormat, ...) +{ + CHAR szOut[256]; + DWORD dwWritten; + va_list arg_ptr; + + va_start(arg_ptr, szFormat); + vsprintf(szOut, szFormat, arg_ptr); + va_end(arg_ptr); + + WriteConsole( + StdOutput, + szOut, + strlen(szOut), + &dwWritten, + NULL); +} SHORT CONSOLE_GetCursorX(VOID) { - CONSOLE_SCREEN_BUFFER_INFO csbi; - - GetConsoleScreenBufferInfo(StdOutput, &csbi); - - return(csbi.dwCursorPosition.X); -} - + CONSOLE_SCREEN_BUFFER_INFO csbi; + + GetConsoleScreenBufferInfo(StdOutput, &csbi); + + return csbi.dwCursorPosition.X; +} SHORT CONSOLE_GetCursorY(VOID) { - CONSOLE_SCREEN_BUFFER_INFO csbi; - - GetConsoleScreenBufferInfo(StdOutput, &csbi); - - return(csbi.dwCursorPosition.Y); -} - - -VOID -CONSOLE_GetScreenSize(SHORT *maxx, - SHORT *maxy) -{ - CONSOLE_SCREEN_BUFFER_INFO csbi; - - GetConsoleScreenBufferInfo(StdOutput, &csbi); - - if (maxx) - *maxx = csbi.dwSize.X; - - if (maxy) - *maxy = csbi.dwSize.Y; -} - - -VOID -CONSOLE_SetCursorType(BOOL bInsert, - BOOL bVisible) -{ - CONSOLE_CURSOR_INFO cci; - - cci.dwSize = bInsert ? 10 : 99; - cci.bVisible = bVisible; - - SetConsoleCursorInfo(StdOutput, &cci); -} - - -VOID -CONSOLE_SetCursorXY(SHORT x, - SHORT y) -{ - COORD coPos; - - coPos.X = x; - coPos.Y = y; - SetConsoleCursorPosition(StdOutput, coPos); + CONSOLE_SCREEN_BUFFER_INFO csbi; + + GetConsoleScreenBufferInfo(StdOutput, &csbi); + + return csbi.dwCursorPosition.Y; +} + +VOID +CONSOLE_GetScreenSize( + OUT SHORT *maxx, + OUT SHORT *maxy) +{ + CONSOLE_SCREEN_BUFFER_INFO csbi; + + GetConsoleScreenBufferInfo(StdOutput, &csbi); + + *maxx = csbi.dwSize.X; + + *maxy = csbi.dwSize.Y; +} + +VOID +CONSOLE_SetCursorType( + IN BOOL bInsert, + IN BOOL bVisible) +{ + CONSOLE_CURSOR_INFO cci; + + cci.dwSize = bInsert ? 10 : 99; + cci.bVisible = bVisible; + + SetConsoleCursorInfo(StdOutput, &cci); +} + +VOID +CONSOLE_SetCursorXY( + IN SHORT x, + IN SHORT y) +{ + COORD coPos; + + coPos.X = x; + coPos.Y = y; + SetConsoleCursorPosition(StdOutput, coPos); } VOID @@ -594,284 +589,321 @@ &Written); } - -VOID -CONSOLE_SetStatusText(char* fmt, ...) -{ - char Buffer[128]; - va_list ap; - COORD coPos; - ULONG Written; - - va_start(ap, fmt); - vsprintf(Buffer, fmt, ap); - va_end(ap); - - coPos.X = 0; - coPos.Y = yScreen - 1; - - FillConsoleOutputAttribute(StdOutput, - BACKGROUND_WHITE, - xScreen, - coPos, - &Written); - - FillConsoleOutputCharacterA(StdOutput, - ' ', - xScreen, - coPos, - &Written); - - WriteConsoleOutputCharacterA(StdOutput, - Buffer, - strlen(Buffer), - coPos, - &Written); -} - - -VOID -CONSOLE_InvertTextXY(SHORT x, SHORT y, SHORT col, SHORT row) -{ - COORD coPos; - ULONG Written; - - for (coPos.Y = y; coPos.Y < y + row; coPos.Y++) - { - coPos.X = x; - - FillConsoleOutputAttribute(StdOutput, - FOREGROUND_BLUE | BACKGROUND_WHITE, - col, - coPos, - &Written); - } -} - - -VOID -CONSOLE_NormalTextXY(SHORT x, SHORT y, SHORT col, SHORT row) -{ - COORD coPos; - ULONG Written; - - for (coPos.Y = y; coPos.Y < y + row; coPos.Y++) - { - coPos.X = x; - - FillConsoleOutputAttribute(StdOutput, - FOREGROUND_BLUE | BACKGROUND_WHITE, - col, - coPos, - &Written); - } -} - - -VOID -CONSOLE_SetTextXY(SHORT x, SHORT y, PCHAR Text) -{ - COORD coPos; - ULONG Written; - - coPos.X = x; - coPos.Y = y; - - WriteConsoleOutputCharacterA(StdOutput, - Text, - strlen(Text), - coPos, - &Written); -} - - -VOID -CONSOLE_SetInputTextXY(SHORT x, SHORT y, SHORT len, PWCHAR Text) -{ - COORD coPos; - ULONG Length; - ULONG Written; - - coPos.X = x; - coPos.Y = y; - - Length = wcslen(Text); - if (Length > (ULONG)len - 1) - { - Length = len - 1; - } - - FillConsoleOutputAttribute(StdOutput, - BACKGROUND_WHITE, - len, - coPos, - &Written); - - WriteConsoleOutputCharacterW(StdOutput, - Text, - Length, - coPos, - &Written); - - coPos.X += Length; - FillConsoleOutputCharacterA(StdOutput, - '_', - 1, - coPos, - &Written); - - if ((ULONG)len > Length + 1) - { - coPos.X++; - FillConsoleOutputCharacterA(StdOutput, - ' ', - len - Length - 1, - coPos, - &Written); - } -} - - -VOID -CONSOLE_SetUnderlinedTextXY(SHORT x, SHORT y, PCHAR Text) -{ - COORD coPos; - ULONG Length; - ULONG Written; - - coPos.X = x; - coPos.Y = y; - - Length = strlen(Text); - - WriteConsoleOutputCharacterA(StdOutput, - Text, - Length, - coPos, - &Written); - - coPos.Y++; - FillConsoleOutputCharacterA(StdOutput, - 0xCD, - Length, - coPos, - &Written); -} - - -VOID -CONSOLE_SetInvertedTextXY(SHORT x, SHORT y, PCHAR Text) -{ - COORD coPos; - ULONG Length; - ULONG Written; - - coPos.X = x; - coPos.Y = y; - - Length = strlen(Text); - - FillConsoleOutputAttribute(StdOutput, - FOREGROUND_BLUE | BACKGROUND_WHITE, - Length, - coPos, - &Written); - - WriteConsoleOutputCharacterA(StdOutput, - Text, - Length, - coPos, - &Written); -} - - -VOID -CONSOLE_SetHighlightedTextXY(SHORT x, SHORT y, PCHAR Text) -{ - COORD coPos; - ULONG Length; - ULONG Written; - - coPos.X = x; - coPos.Y = y; - - Length = strlen(Text); - - FillConsoleOutputAttribute(StdOutput, - FOREGROUND_WHITE | FOREGROUND_INTENSITY | BACKGROUND_BLUE, - Length, - coPos, - &Written); - - WriteConsoleOutputCharacterA(StdOutput, - Text, - Length, - coPos, - &Written); -} - - -VOID -CONSOLE_PrintTextXY(SHORT x, SHORT y, char* fmt, ...) -{ - char buffer[512]; - va_list ap; - COORD coPos; - ULONG Written; - - va_start(ap, fmt); - vsprintf(buffer, fmt, ap); - va_end(ap); - - coPos.X = x; - coPos.Y = y; - - WriteConsoleOutputCharacterA(StdOutput, - buffer, - strlen(buffer), - coPos, - &Written); -} - - -VOID -CONSOLE_PrintTextXYN(SHORT x, SHORT y, SHORT len, char* fmt, ...) -{ - char buffer[512]; - va_list ap; - COORD coPos; - ULONG Length; - ULONG Written; - - va_start(ap, fmt); - vsprintf(buffer, fmt, ap); - va_end(ap); - - coPos.X = x; - coPos.Y = y; - - Length = strlen(buffer); - if (Length > (ULONG)len - 1) - { - Length = len - 1; - } - - WriteConsoleOutputCharacterA(StdOutput, - buffer, - Length, - coPos, - &Written); - - coPos.X += Length; - - if ((ULONG)len > Length) - { - FillConsoleOutputCharacterA(StdOutput, - ' ', - len - Length, - coPos, - &Written); - } +VOID +CONSOLE_SetStatusText( + IN LPCSTR fmt, ...) +{ + CHAR Buffer[128]; + va_list ap; + COORD coPos; + ULONG Written; + + va_start(ap, fmt); + vsprintf(Buffer, fmt, ap); + va_end(ap); + + coPos.X = 0; + coPos.Y = yScreen - 1; + + FillConsoleOutputAttribute( + StdOutput, + BACKGROUND_WHITE, + xScreen, + coPos, + &Written); + + FillConsoleOutputCharacterA( + StdOutput, + ' ', + xScreen, + coPos, + &Written); + + WriteConsoleOutputCharacterA( + StdOutput, + Buffer, + strlen(Buffer), + coPos, + &Written); +} + +VOID +CONSOLE_InvertTextXY( + IN SHORT x, + IN SHORT y, + IN SHORT col, + IN SHORT row) +{ + COORD coPos; + ULONG Written; + + for (coPos.Y = y; coPos.Y < y + row; coPos.Y++) + { + coPos.X = x; + + FillConsoleOutputAttribute( + StdOutput, + FOREGROUND_BLUE | BACKGROUND_WHITE, + col, + coPos, + &Written); + } +} + +VOID +CONSOLE_NormalTextXY( + IN SHORT x, + IN SHORT y, + IN SHORT col, + IN SHORT row) +{ + COORD coPos; + ULONG Written; + + for (coPos.Y = y; coPos.Y < y + row; coPos.Y++) + { + coPos.X = x; + + FillConsoleOutputAttribute( + StdOutput, + FOREGROUND_BLUE | BACKGROUND_WHITE, + col, + coPos, + &Written); + } +} + +VOID +CONSOLE_SetTextXY( + IN SHORT x, + IN SHORT y, + IN LPCSTR Text) +{ + COORD coPos; + ULONG Written; + + coPos.X = x; + coPos.Y = y; + + WriteConsoleOutputCharacterA( + StdOutput, + Text, + strlen(Text), + coPos, + &Written); +} + +VOID +CONSOLE_SetInputTextXY( + IN SHORT x, + IN SHORT y, + IN SHORT len, + IN LPCWSTR Text) +{ + COORD coPos; + ULONG Length; + ULONG Written; + + coPos.X = x; + coPos.Y = y; + + Length = wcslen(Text); + if (Length > (ULONG)len - 1) + Length = len - 1; + + FillConsoleOutputAttribute( + StdOutput, + BACKGROUND_WHITE, + len, + coPos, + &Written); + + WriteConsoleOutputCharacterW( + StdOutput, + Text, + Length, + coPos, + &Written); + + coPos.X += Length; + FillConsoleOutputCharacterA( + StdOutput, + '_', + 1, + coPos, + &Written); + + if ((ULONG)len > Length + 1) + { + coPos.X++; + FillConsoleOutputCharacterA( + StdOutput, + ' ', + len - Length - 1, + coPos, + &Written); + } +} + +VOID +CONSOLE_SetUnderlinedTextXY( + IN SHORT x, + IN SHORT y, + IN LPCSTR Text) +{ + COORD coPos; + ULONG Length; + ULONG Written; + + coPos.X = x; + coPos.Y = y; + + Length = strlen(Text); + + WriteConsoleOutputCharacterA( + StdOutput, + Text, + Length, + coPos, + &Written); + + coPos.Y++; + FillConsoleOutputCharacterA( + StdOutput, + 0xCD, + Length, + coPos, + &Written); +} + +VOID +CONSOLE_SetInvertedTextXY( + IN SHORT x, + IN SHORT y, + IN LPCSTR Text) +{ + COORD coPos; + ULONG Length; + ULONG Written; + + coPos.X = x; + coPos.Y = y; + + Length = strlen(Text); + + FillConsoleOutputAttribute( + StdOutput, + FOREGROUND_BLUE | BACKGROUND_WHITE, + Length, + coPos, + &Written); + + WriteConsoleOutputCharacterA( + StdOutput, + Text, + Length, + coPos, + &Written); +} + +VOID +CONSOLE_SetHighlightedTextXY( + IN SHORT x, + IN SHORT y, + IN LPCSTR Text) +{ + COORD coPos; + ULONG Length; + ULONG Written; + + coPos.X = x; + coPos.Y = y; + + Length = strlen(Text); + + FillConsoleOutputAttribute( + StdOutput, + FOREGROUND_WHITE | FOREGROUND_INTENSITY | BACKGROUND_BLUE, + Length, + coPos, + &Written); + + WriteConsoleOutputCharacterA( + StdOutput, + Text, + Length, + coPos, + &Written); +} + +VOID +CONSOLE_PrintTextXY( + IN SHORT x, + IN SHORT y, + IN LPCSTR fmt, ...) +{ + CHAR buffer[512]; + va_list ap; + COORD coPos; + ULONG Written; + + va_start(ap, fmt); + vsprintf(buffer, fmt, ap); + va_end(ap); + + coPos.X = x; + coPos.Y = y; + + WriteConsoleOutputCharacterA( + StdOutput, + buffer, + strlen(buffer), + coPos, + &Written); +} + +VOID +CONSOLE_PrintTextXYN( + IN SHORT x, + IN SHORT y, + IN SHORT len, + IN LPCSTR fmt, ...) +{ + CHAR buffer[512]; + va_list ap; + COORD coPos; + ULONG Length; + ULONG Written; + + va_start(ap, fmt); + vsprintf(buffer, fmt, ap); + va_end(ap); + + coPos.X = x; + coPos.Y = y; + + Length = strlen(buffer); + if (Length > (ULONG)len - 1) + Length = len - 1; + + WriteConsoleOutputCharacterA( + StdOutput, + buffer, + Length, + coPos, + &Written); + + coPos.X += Length; + + if ((ULONG)len > Length) + { + FillConsoleOutputCharacterA( + StdOutput, + ' ', + len - Length, + coPos, + &Written); + } } /* EOF */ Modified: trunk/reactos/base/setup/usetup/console.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/console.… ============================================================================== --- trunk/reactos/base/setup/usetup/console.h (original) +++ trunk/reactos/base/setup/usetup/console.h Thu Aug 31 13:13:03 2006 @@ -48,6 +48,8 @@ #define FOREGROUND_YELLOW (FOREGROUND_INTENSITY | FOREGROUND_RED | FOREGROUND_GREEN) #define BACKGROUND_WHITE (BACKGROUND_RED | BACKGROUND_GREEN | BACKGROUND_BLUE) +extern HANDLE StdInput, StdOutput; + BOOL WINAPI ConAllocConsole( IN DWORD dwProcessId); @@ -123,18 +125,24 @@ OUT LPDWORD lpNumberOfCharsWritten); - -VOID -CONSOLE_ConInKey(PINPUT_RECORD Buffer); - -VOID -CONSOLE_ConOutChar(CHAR c); - -VOID -CONSOLE_ConOutPuts(LPSTR szText); - -VOID -CONSOLE_ConOutPrintf(LPSTR szFormat, ...); +VOID +CONSOLE_ClearScreen(VOID); + +VOID +CONSOLE_ConInKey( + OUT PINPUT_RECORD Buffer); + +VOID +CONSOLE_ConOutChar( + IN CHAR c); + +VOID +CONSOLE_ConOutPrintf( + IN LPCSTR szFormat, ...); + +VOID +CONSOLE_ConOutPuts( + IN LPCSTR szText); SHORT CONSOLE_GetCursorX(VOID); @@ -143,49 +151,93 @@ CONSOLE_GetCursorY(VOID); VOID -CONSOLE_GetScreenSize(SHORT *maxx, - SHORT *maxy); - -VOID -CONSOLE_SetCursorType(BOOL bInsert, - BOOL bVisible); - -VOID -CONSOLE_SetCursorXY(SHORT x, - SHORT y); - -VOID -CONSOLE_ClearScreen(VOID); - -VOID -CONSOLE_SetStatusText(char* fmt, ...); - -VOID -CONSOLE_InvertTextXY(SHORT x, SHORT y, SHORT col, SHORT row); - -VOID -CONSOLE_NormalTextXY(SHORT x, SHORT y, SHORT col, SHORT row); - -VOID -CONSOLE_SetTextXY(SHORT x, SHORT y, PCHAR Text); - -VOID -CONSOLE_SetInputTextXY(SHORT x, SHORT y, SHORT len, PWCHAR Text); - -VOID -CONSOLE_SetUnderlinedTextXY(SHORT x, SHORT y, PCHAR Text); - -VOID -CONSOLE_SetInvertedTextXY(SHORT x, SHORT y, PCHAR Text); - -VOID -CONSOLE_SetHighlightedTextXY(SHORT x, SHORT y, PCHAR Text); - -VOID -CONSOLE_PrintTextXY(SHORT x, SHORT y, char* fmt, ...); - -VOID -CONSOLE_PrintTextXYN(SHORT x, SHORT y, SHORT len, char* fmt, ...); +CONSOLE_GetScreenSize( + OUT SHORT *maxx, + OUT SHORT *maxy); + +VOID +CONSOLE_InvertTextXY( + IN SHORT x, + IN SHORT y, + IN SHORT col, + IN SHORT row); + +VOID +CONSOLE_NormalTextXY( + IN SHORT x, + IN SHORT y, + IN SHORT col, + IN SHORT row); + +VOID +CONSOLE_PrintTextXY( + IN SHORT x, + IN SHORT y, + IN LPCSTR fmt, ...); + +VOID +CONSOLE_PrintTextXYN( + IN SHORT x, + IN SHORT y, + IN SHORT len, + IN LPCSTR fmt, ...); + +VOID +CONSOLE_SetCursorType( + IN BOOL bInsert, + IN BOOL bVisible); + +VOID +CONSOLE_SetCursorXY( + IN SHORT x, + IN SHORT y); + +VOID +CONSOLE_SetCursorXY( + IN SHORT x, + IN SHORT y); + +VOID +CONSOLE_SetHighlightedTextXY( + IN SHORT x, + IN SHORT y, + IN LPCSTR Text); + +VOID +CONSOLE_SetInputTextXY( + IN SHORT x, + IN SHORT y, + IN SHORT len, + IN LPCWSTR Text); + +VOID +CONSOLE_SetInputTextXY( + IN SHORT x, + IN SHORT y, + IN SHORT len, + IN LPCWSTR Text); + +VOID +CONSOLE_SetInvertedTextXY( + IN SHORT x, + IN SHORT y, + IN LPCSTR Text); + +VOID +CONSOLE_SetStatusText( + IN LPCSTR fmt, ...); + +VOID +CONSOLE_SetTextXY( + IN SHORT x, + IN SHORT y, + IN LPCSTR Text); + +VOID +CONSOLE_SetUnderlinedTextXY( + IN SHORT x, + IN SHORT y, + IN LPCSTR Text); #endif /* __CONSOLE_H__*/ Modified: trunk/reactos/base/setup/usetup/drivesup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/drivesup… ============================================================================== --- trunk/reactos/base/setup/usetup/drivesup.c (original) +++ trunk/reactos/base/setup/usetup/drivesup.c Thu Aug 31 13:13:03 2006 @@ -26,7 +26,7 @@ /* INCLUDES *****************************************************************/ -#include <usetup.h> +#include "usetup.h" #define NDEBUG #include <debug.h> Modified: trunk/reactos/base/setup/usetup/filequeue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/filequeu… ============================================================================== --- trunk/reactos/base/setup/usetup/filequeue.c (original) +++ trunk/reactos/base/setup/usetup/filequeue.c Thu Aug 31 13:13:03 2006 @@ -27,7 +27,7 @@ /* INCLUDES *****************************************************************/ -#include <usetup.h> +#include "usetup.h" #define NDEBUG #include <debug.h> Modified: trunk/reactos/base/setup/usetup/filesup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/filesup.… ============================================================================== --- trunk/reactos/base/setup/usetup/filesup.c (original) +++ trunk/reactos/base/setup/usetup/filesup.c Thu Aug 31 13:13:03 2006 @@ -27,7 +27,7 @@ /* INCLUDES *****************************************************************/ -#include <usetup.h> +#include "usetup.h" #define NDEBUG #include <debug.h> Modified: trunk/reactos/base/setup/usetup/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/format.c… ============================================================================== --- trunk/reactos/base/setup/usetup/format.c (original) +++ trunk/reactos/base/setup/usetup/format.c Thu Aug 31 13:13:03 2006 @@ -26,7 +26,7 @@ /* INCLUDES *****************************************************************/ -#include <usetup.h> +#include "usetup.h" #define NDEBUG #include <debug.h> Modified: trunk/reactos/base/setup/usetup/fslist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/fslist.c… ============================================================================== --- trunk/reactos/base/setup/usetup/fslist.c (original) +++ trunk/reactos/base/setup/usetup/fslist.c Thu Aug 31 13:13:03 2006 @@ -25,7 +25,7 @@ * Casper S. Hornstrup (chorns(a)users.sourceforge.net) */ -#include <usetup.h> +#include "usetup.h" #define NDEBUG #include <debug.h> Modified: trunk/reactos/base/setup/usetup/genlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/genlist.… ============================================================================== --- trunk/reactos/base/setup/usetup/genlist.c (original) +++ trunk/reactos/base/setup/usetup/genlist.c Thu Aug 31 13:13:03 2006 @@ -26,7 +26,7 @@ /* INCLUDES *****************************************************************/ -#include <usetup.h> +#include "usetup.h" #define NDEBUG #include <debug.h> Added: trunk/reactos/base/setup/usetup/inffile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/inffile.… ============================================================================== --- trunk/reactos/base/setup/usetup/inffile.c (added) +++ trunk/reactos/base/setup/usetup/inffile.c Thu Aug 31 13:13:03 2006 @@ -1,0 +1,197 @@ +/* + * ReactOS kernel + * Copyright (C) 2002 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS text-mode setup + * FILE: subsys/system/usetup/inffile.c + * PURPOSE: .inf files support functions + * PROGRAMMER: Hervé Poussineau + */ + +/* INCLUDES ******************************************************************/ + +#include "usetup.h" +#include <infros.h> + +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS *****************************************************************/ + +VOID WINAPI +InfpCloseInfFile( + IN HINF InfHandle) +{ + InfCloseFile(InfHandle); +} + +BOOL WINAPI +InfpFindFirstLineW( + IN HINF InfHandle, + IN PCWSTR Section, + IN PCWSTR Key, + IN OUT PINFCONTEXT Context) +{ + PINFCONTEXT pContext; + BOOL ret; + + ret = InfFindFirstLine(InfHandle, Section, Key, &pContext); + if (!ret) + return FALSE; + + memcpy(Context, pContext, sizeof(INFCONTEXT)); + InfFreeContext(pContext); + return TRUE; +} + +BOOL WINAPI +InfpFindNextLine( + IN PINFCONTEXT ContextIn, + OUT PINFCONTEXT ContextOut) +{ + return InfFindNextLine(ContextIn, ContextOut); +} + +BOOL WINAPI +InfpGetBinaryField( + IN PINFCONTEXT Context, + IN DWORD FieldIndex, + IN OUT BYTE* ReturnBuffer, + IN DWORD ReturnBufferSize, + OUT LPDWORD RequiredSize) +{ + return InfGetBinaryField(Context, FieldIndex, ReturnBuffer, ReturnBufferSize, RequiredSize); +} + +DWORD WINAPI +InfpGetFieldCount( + IN PINFCONTEXT Context) +{ + return (DWORD)InfGetFieldCount(Context); +} + +BOOL WINAPI +InfpGetIntField( + IN PINFCONTEXT Context, + IN DWORD FieldIndex, + OUT PINT IntegerValue) +{ + LONG IntegerValueL; + BOOL ret; + + ret = InfGetIntField(Context, FieldIndex, &IntegerValueL); + *IntegerValue = (INT)IntegerValueL; + return ret; +} + +BOOL WINAPI +InfpGetMultiSzFieldW( + IN PINFCONTEXT Context, + IN DWORD FieldIndex, + IN OUT PWSTR ReturnBuffer, + IN DWORD ReturnBufferSize, + OUT LPDWORD RequiredSize) +{ + return InfGetMultiSzField(Context, FieldIndex, ReturnBuffer, ReturnBufferSize, RequiredSize); +} + +BOOL WINAPI +InfpGetStringFieldW( + IN PINFCONTEXT Context, + IN DWORD FieldIndex, + IN OUT PWSTR ReturnBuffer, + IN DWORD ReturnBufferSize, + OUT PDWORD RequiredSize) +{ + return InfGetStringField(Context, FieldIndex, ReturnBuffer, ReturnBufferSize, RequiredSize); +} + +HINF WINAPI +InfpOpenInfFileW( + IN PCWSTR FileName, + IN PCWSTR InfClass, + IN DWORD InfStyle, + OUT PUINT ErrorLine) +{ + HINF hInf = NULL; + UNICODE_STRING FileNameU; + ULONG ErrorLineUL; + NTSTATUS Status; + + RtlInitUnicodeString(&FileNameU, FileName); + Status = InfOpenFile( + &hInf, + &FileNameU, + &ErrorLineUL); + *ErrorLine = (UINT)ErrorLineUL; + if (!NT_SUCCESS(Status)) + return NULL; + + return hInf; +} + +BOOLEAN +INF_GetData( + IN PINFCONTEXT Context, + OUT PWCHAR *Key, + OUT PWCHAR *Data) +{ + return InfGetData(Context, Key, Data); +} + +BOOLEAN +INF_GetDataField( + IN PINFCONTEXT Context, + IN ULONG FieldIndex, + OUT PWCHAR *Data) +{ + return InfGetDataField(Context, FieldIndex, Data); +} + +HINF WINAPI +INF_OpenBufferedFileA( + IN PSTR FileBuffer, + IN ULONG FileSize, + IN PCSTR InfClass, + IN DWORD InfStyle, + OUT PUINT ErrorLine) +{ + HINF hInf = NULL; + ULONG ErrorLineUL; + NTSTATUS Status; + + Status = InfOpenBufferedFile( + &hInf, + FileBuffer, + FileSize, + &ErrorLineUL); + *ErrorLine = (UINT)ErrorLineUL; + if (!NT_SUCCESS(Status)) + return NULL; + + return hInf; +} + +VOID INF_SetHeap( + IN PVOID Heap) +{ + InfSetHeap(Heap); +} + +/* EOF */ Added: trunk/reactos/base/setup/usetup/inffile.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/inffile.… ============================================================================== --- trunk/reactos/base/setup/usetup/inffile.h (added) +++ trunk/reactos/base/setup/usetup/inffile.h Thu Aug 31 13:13:03 2006 @@ -1,0 +1,135 @@ +/* + * ReactOS kernel + * Copyright (C) 2002 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS text-mode setup + * FILE: subsys/system/usetup/inffile.h + * PURPOSE: .inf files support functions + * PROGRAMMER: Hervé Poussineau + */ + +#ifndef __INFFILE_H__ +#define __INFFILE_H__ + +#include <infcommon.h> + +#define SetupCloseInfFile InfpCloseInfFile +#define SetupFindFirstLineW InfpFindFirstLineW +#define SetupFindNextLine InfpFindNextLine +#define SetupGetBinaryField InfpGetBinaryField +#define SetupGetFieldCount InfpGetFieldCount +#define SetupGetIntField InfpGetIntField +#define SetupGetMultiSzFieldW InfpGetMultiSzFieldW +#define SetupGetStringFieldW InfpGetStringFieldW +#define SetupOpenInfFileW InfpOpenInfFileW + +#define INF_STYLE_WIN4 0x00000002 + +/* FIXME: this structure is the one used in inflib, not in setupapi + * Delete it once we don't use inflib anymore */ +typedef struct _INFCONTEXT +{ + PVOID Inf; + PVOID Section; + PVOID Line; +} INFCONTEXT; + +VOID WINAPI +InfpCloseInfFile( + IN HINF InfHandle); + +BOOL WINAPI +InfpFindFirstLineW( + IN HINF InfHandle, + IN PCWSTR Section, + IN PCWSTR Key, + IN OUT PINFCONTEXT Context); + +BOOL WINAPI +InfpFindNextLine( + IN PINFCONTEXT ContextIn, + OUT PINFCONTEXT ContextOut); + +BOOL WINAPI +InfpGetBinaryField( + IN PINFCONTEXT Context, + IN DWORD FieldIndex, + IN OUT BYTE* ReturnBuffer, + IN DWORD ReturnBufferSize, + OUT LPDWORD RequiredSize); + +DWORD WINAPI +InfpGetFieldCount( + IN PINFCONTEXT Context); + +BOOL WINAPI +InfpGetIntField( + IN PINFCONTEXT Context, + IN DWORD FieldIndex, + OUT PINT IntegerValue); + +BOOL WINAPI +InfpGetMultiSzFieldW( + IN PINFCONTEXT Context, + IN DWORD FieldIndex, + IN OUT PWSTR ReturnBuffer, + IN DWORD ReturnBufferSize, + OUT LPDWORD RequiredSize); + +BOOL WINAPI +InfpGetStringFieldW( + IN PINFCONTEXT Context, + IN DWORD FieldIndex, + IN OUT PWSTR ReturnBuffer, + IN DWORD ReturnBufferSize, + OUT PDWORD RequiredSize); + +HINF WINAPI +InfpOpenInfFileW( + IN PCWSTR FileName, + IN PCWSTR InfClass, + IN DWORD InfStyle, + OUT PUINT ErrorLine); + +BOOLEAN +INF_GetData( + IN PINFCONTEXT Context, + OUT PWCHAR *Key, + OUT PWCHAR *Data); + +BOOLEAN +INF_GetDataField( + IN PINFCONTEXT Context, + IN ULONG FieldIndex, + OUT PWCHAR *Data); + +HINF WINAPI +INF_OpenBufferedFileA( + IN PSTR FileBuffer, + IN ULONG FileSize, + IN PCSTR InfClass, + IN DWORD InfStyle, + OUT PUINT ErrorLine); + +VOID INF_SetHeap( + IN PVOID Heap); + +#endif /* __INFFILE_H__*/ + +/* EOF */ Modified: trunk/reactos/base/setup/usetup/inicache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/inicache… ============================================================================== --- trunk/reactos/base/setup/usetup/inicache.c (original) +++ trunk/reactos/base/setup/usetup/inicache.c Thu Aug 31 13:13:03 2006 @@ -27,7 +27,7 @@ /* INCLUDES *****************************************************************/ -#include <usetup.h> +#include "usetup.h" #define NDEBUG #include <debug.h> Modified: trunk/reactos/base/setup/usetup/keytrans.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/keytrans… ============================================================================== --- trunk/reactos/base/setup/usetup/keytrans.c (original) +++ trunk/reactos/base/setup/usetup/keytrans.c Thu Aug 31 13:13:03 2006 @@ -25,7 +25,7 @@ * * NB: Hardcoded to US keyboard */ -#include <usetup.h> +#include "usetup.h" #define NDEBUG #include <debug.h> Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c (original) +++ trunk/reactos/base/setup/usetup/partlist.c Thu Aug 31 13:13:03 2006 @@ -25,7 +25,7 @@ * Casper S. Hornstrup (chorns(a)users.sourceforge.net) */ -#include <usetup.h> +#include "usetup.h" #define NDEBUG #include <debug.h> @@ -1237,7 +1237,7 @@ ULONG Written; USHORT Width; USHORT Height; - ULONGLONG DiskSize; + ULARGE_INTEGER DiskSize; PCHAR Unit; Width = List->Right - List->Left - 1; @@ -1250,35 +1250,35 @@ #if 0 if (DiskEntry->DiskSize >= 0x280000000ULL) /* 10 GB */ { - DiskSize = (DiskEntry->DiskSize + (1 << 29)) >> 30; + DiskSize.QuadPart = (DiskEntry->DiskSize + (1 << 29)) >> 30; Unit = "GB"; } else #endif { - DiskSize = (DiskEntry->DiskSize + (1 << 19)) >> 20; - if (DiskSize == 0) - DiskSize = 1; + DiskSize.QuadPart = (DiskEntry->DiskSize + (1 << 19)) >> 20; + if (DiskSize.QuadPart == 0) + DiskSize.QuadPart = 1; Unit = "MB"; } if (DiskEntry->DriverName.Length > 0) { sprintf (LineBuffer, - "%6I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ", - DiskSize, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S", + DiskSize.u.LowPart, Unit, DiskEntry->DiskNumber, DiskEntry->Port, DiskEntry->Bus, DiskEntry->Id, - &DiskEntry->DriverName); + DiskEntry->DriverName.Buffer); } else { sprintf (LineBuffer, - "%6I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)", - DiskSize, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)", + DiskSize.u.LowPart, Unit, DiskEntry->DiskNumber, DiskEntry->Port, Modified: trunk/reactos/base/setup/usetup/progress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/progress… ============================================================================== --- trunk/reactos/base/setup/usetup/progress.c (original) +++ trunk/reactos/base/setup/usetup/progress.c Thu Aug 31 13:13:03 2006 @@ -1,7 +1,7 @@ /* INCLUDES *****************************************************************/ -#include <usetup.h> +#include "usetup.h" #define NDEBUG #include <debug.h> Modified: trunk/reactos/base/setup/usetup/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/registry… ============================================================================== --- trunk/reactos/base/setup/usetup/registry.c (original) +++ trunk/reactos/base/setup/usetup/registry.c Thu Aug 31 13:13:03 2006 @@ -26,7 +26,7 @@ /* INCLUDES *****************************************************************/ -#include <usetup.h> +#include "usetup.h" #define NDEBUG #include <debug.h> @@ -257,13 +257,13 @@ } if (!(Flags & FLG_ADDREG_BINVALUETYPE) || - (Type == REG_DWORD && InfGetFieldCount (Context) == 5)) + (Type == REG_DWORD && SetupGetFieldCount (Context) == 5)) { PWCHAR Str = NULL; if (Type == REG_MULTI_SZ) { - if (!InfGetMultiSzField (Context, 5, NULL, 0, &Size)) + if (!SetupGetMultiSzFieldW (Context, 5, NULL, 0, &Size)) Size = 0; if (Size) @@ -272,7 +272,7 @@ if (Str == NULL) return FALSE; - InfGetMultiSzField (Context, 5, Str, Size, NULL); + SetupGetMultiSzFieldW (Context, 5, Str, Size, NULL); } if (Flags & FLG_ADDREG_APPEND) @@ -289,7 +289,7 @@ } else { - if (!InfGetStringField (Context, 5, NULL, 0, &Size)) + if (!SetupGetStringFieldW (Context, 5, NULL, 0, &Size)) Size = 0; if (Size) @@ -298,7 +298,7 @@ if (Str == NULL) return FALSE; - InfGetStringField (Context, 5, Str, Size, NULL); + SetupGetStringFieldW (Context, 5, Str, Size, NULL); } } @@ -344,7 +344,7 @@ { PUCHAR Data = NULL; - if (!InfGetBinaryField (Context, 5, NULL, 0, &Size)) + if (!SetupGetBinaryField (Context, 5, NULL, 0, &Size)) Size = 0; if (Size) @@ -354,7 +354,7 @@ return FALSE; DPRINT("setting binary data %wZ len %lu\n", ValueName, Size); - InfGetBinaryField (Context, 5, Data, Size, NULL); + SetupGetBinaryField (Context, 5, Data, Size, NULL); } NtSetValueKey (KeyHandle, @@ -481,35 +481,35 @@ UNICODE_STRING Value; PUNICODE_STRING ValuePtr; NTSTATUS Status; - ULONG Flags; + UINT Flags; ULONG Length; - PINFCONTEXT Context; + INFCONTEXT Context; HANDLE KeyHandle; BOOLEAN Ok; - Ok = InfFindFirstLine (hInf, Section, NULL, &Context); + Ok = SetupFindFirstLineW (hInf, Section, NULL, &Context); if (Ok) { - for (;Ok; Ok = InfFindNextLine (Context, Context)) + for (;Ok; Ok = SetupFindNextLine (&Context, &Context)) { /* get root */ - if (!InfGetStringField (Context, 1, Buffer, MAX_INF_STRING_LENGTH, NULL)) + if (!SetupGetStringFieldW (&Context, 1, Buffer, MAX_INF_STRING_LENGTH, NULL)) continue; if (!GetRootKey (Buffer)) continue; /* get key */ Length = wcslen (Buffer); - if (!InfGetStringField (Context, 2, Buffer + Length, MAX_INF_STRING_LENGTH - Length, NULL)) + if (!SetupGetStringFieldW (&Context, 2, Buffer + Length, MAX_INF_STRING_LENGTH - Length, NULL)) *Buffer = 0; DPRINT("KeyName: <%S>\n", Buffer); /* get flags */ - if (!InfGetIntField (Context, 4, (PLONG)&Flags)) + if (!SetupGetIntField (&Context, 4, (PINT)&Flags)) Flags = 0; DPRINT("Flags: %lx\n", Flags); @@ -547,7 +547,7 @@ } /* get value name */ - if (InfGetStringField (Context, 3, Buffer, MAX_INF_STRING_LENGTH, NULL)) + if (SetupGetStringFieldW (&Context, 3, Buffer, MAX_INF_STRING_LENGTH, NULL)) { RtlInitUnicodeString (&Value, Buffer); @@ -559,7 +559,7 @@ } /* and now do it */ - if (!do_reg_operation (KeyHandle, ValuePtr, Context, Flags)) + if (!do_reg_operation (KeyHandle, ValuePtr, &Context, Flags)) { NtClose (KeyHandle); return FALSE; @@ -567,7 +567,6 @@ NtClose (KeyHandle); } - InfFreeContext(Context); } return TRUE; @@ -580,25 +579,22 @@ BOOLEAN Delete) { WCHAR FileNameBuffer[MAX_PATH]; - UNICODE_STRING FileName; HINF hInf; - NTSTATUS Status; - ULONG ErrorLine; + UINT ErrorLine; /* Load inf file from install media. */ wcscpy(FileNameBuffer, SourceRootPath.Buffer); wcscat(FileNameBuffer, L"\\reactos\\"); wcscat(FileNameBuffer, Filename); - RtlInitUnicodeString(&FileName, - FileNameBuffer); - - Status = InfOpenFile(&hInf, - &FileName, + hInf = SetupOpenInfFileW( + FileNameBuffer, + NULL, + INF_STYLE_WIN4, &ErrorLine); - if (!NT_SUCCESS(Status)) - { - DPRINT1("InfOpenFile() failed (Status %lx)\n", Status); + if (hInf == INVALID_HANDLE_VALUE) + { + DPRINT1("SetupOpenInfFile() failed\n"); return FALSE; } @@ -607,7 +603,7 @@ DPRINT1("registry_callback() failed\n"); } - InfCloseFile (hInf); + SetupCloseInfFile (hInf); return TRUE; } Modified: trunk/reactos/base/setup/usetup/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/settings… ============================================================================== --- trunk/reactos/base/setup/usetup/settings.c (original) +++ trunk/reactos/base/setup/usetup/settings.c Thu Aug 31 13:13:03 2006 @@ -25,7 +25,7 @@ /* INCLUDES *****************************************************************/ -#include <usetup.h> +#include "usetup.h" #define NDEBUG #include <debug.h> @@ -121,7 +121,7 @@ { CHAR Buffer[128]; PGENERIC_LIST List; - PINFCONTEXT Context; + INFCONTEXT Context; PWCHAR KeyName; PWCHAR KeyValue; PWCHAR UserData; @@ -137,7 +137,7 @@ DPRINT("Computer identifier: '%S'\n", ComputerIdentifier); /* Search for matching device identifier */ - if (!InfFindFirstLine(InfFile, L"Map.Computer", NULL, &Context)) + if (!SetupFindFirstLineW(InfFile, L"Map.Computer", NULL, &Context)) { /* FIXME: error message */ return NULL; @@ -145,20 +145,20 @@ do { - if (!InfGetDataField(Context, 1, &KeyValue)) + if (!INF_GetDataField(&Context, 1, &KeyValue)) { /* FIXME: Handle error! */ - DPRINT("InfGetDataField() failed\n"); + DPRINT("INF_GetDataField() failed\n"); return NULL; } DPRINT("KeyValue: %S\n", KeyValue); if (wcsstr(ComputerIdentifier, KeyValue)) { - if (!InfGetDataField(Context, 0, &KeyName)) + if (!INF_GetDataField(&Context, 0, &KeyName)) { /* FIXME: Handle error! */ - DPRINT("InfGetDataField() failed\n"); + DPRINT("INF_GetDataField() failed\n"); return NULL; } @@ -166,14 +166,13 @@ wcscpy(ComputerKey, KeyName); } } - while (InfFindNextLine(Context, Context)); - InfFreeContext(Context); + while (SetupFindNextLine(&Context, &Context)); List = CreateGenericList(); if (List == NULL) return NULL; - if (!InfFindFirstLine (InfFile, L"Computer", NULL, &Context)) + if (!SetupFindFirstLineW (InfFile, L"Computer", NULL, &Context)) { DestroyGenericList(List, FALSE); return NULL; @@ -181,10 +180,10 @@ do { - if (!InfGetData (Context, &KeyName, &KeyValue)) + if (!INF_GetData (&Context, &KeyName, &KeyValue)) { /* FIXME: Handle error! */ - DPRINT("InfGetData() failed\n"); + DPRINT("INF_GetData() failed\n"); break; } @@ -202,8 +201,7 @@ AppendGenericListEntry(List, Buffer, UserData, _wcsicmp(KeyName, ComputerKey) ? FALSE : TRUE); } - while (InfFindNextLine(Context, Context)); - InfFreeContext(Context); + while (SetupFindNextLine(&Context, &Context)); return List; } @@ -373,7 +371,7 @@ { CHAR Buffer[128]; PGENERIC_LIST List; - PINFCONTEXT Context; + INFCONTEXT Context; PWCHAR KeyName; PWCHAR KeyValue; PWCHAR UserData; @@ -389,7 +387,7 @@ DPRINT("Display identifier: '%S'\n", DisplayIdentifier); /* Search for matching device identifier */ - if (!InfFindFirstLine(InfFile, L"Map.Display", NULL, &Context)) + if (!SetupFindFirstLineW(InfFile, L"Map.Display", NULL, &Context)) { /* FIXME: error message */ return NULL; @@ -397,20 +395,20 @@ do { - if (!InfGetDataField(Context, 1, &KeyValue)) + if (!INF_GetDataField(&Context, 1, &KeyValue)) { /* FIXME: Handle error! */ - DPRINT("InfGetDataField() failed\n"); + DPRINT("INF_GetDataField() failed\n"); return NULL; } DPRINT("KeyValue: %S\n", KeyValue); if (wcsstr(DisplayIdentifier, KeyValue)) { - if (!InfGetDataField(Context, 0, &KeyName)) + if (!INF_GetDataField(&Context, 0, &KeyName)) { /* FIXME: Handle error! */ - DPRINT("InfGetDataField() failed\n"); + DPRINT("INF_GetDataField() failed\n"); return NULL; } @@ -418,15 +416,14 @@ wcscpy(DisplayKey, KeyName); } } - while (InfFindNextLine(Context, Context)); - InfFreeContext(Context); + while (SetupFindNextLine(&Context, &Context)); List = CreateGenericList(); if (List == NULL) return NULL; - if (!InfFindFirstLine (InfFile, L"Display", NULL, &Context)) + if (!SetupFindFirstLineW (InfFile, L"Display", NULL, &Context)) { DestroyGenericList(List, FALSE); return NULL; @@ -434,15 +431,15 @@ do { - if (!InfGetDataField(Context, 0, &KeyName)) - { - DPRINT1("InfGetDataField() failed\n"); + if (!INF_GetDataField(&Context, 0, &KeyName)) + { + DPRINT1("INF_GetDataField() failed\n"); break; } - if (!InfGetDataField(Context, 1, &KeyValue)) - { - DPRINT1("InfGetDataField() failed\n"); + if (!INF_GetDataField(&Context, 1, &KeyValue)) + { + DPRINT1("INF_GetDataField() failed\n"); break; } @@ -464,8 +461,7 @@ UserData, _wcsicmp(KeyName, DisplayKey) ? FALSE : TRUE); } - while (InfFindNextLine(Context, Context)); - InfFreeContext(Context); + while (SetupFindNextLine(&Context, &Context)); #if 0 AppendGenericListEntry(List, "Other display driver", NULL, TRUE); @@ -501,7 +497,7 @@ ProcessDisplayRegistry(HINF InfFile, PGENERIC_LIST List) { PGENERIC_LIST_ENTRY Entry; - PINFCONTEXT Context; + INFCONTEXT Context; PWCHAR ServiceName; ULONG StartValue; NTSTATUS Status; @@ -518,16 +514,16 @@ return FALSE; } - if (!InfFindFirstLine(InfFile, L"Display", Entry->UserData, &Context)) - { - DPRINT("InfFindFirstLine() failed\n"); + if (!SetupFindFirstLineW(InfFile, L"Display", Entry->UserData, &Context)) + { + DPRINT("SetupFindFirstLineW() failed\n"); return FALSE; } /* Enable the right driver */ - if (!InfGetDataField(Context, 3, &ServiceName)) - { - DPRINT("InfGetDataField() failed\n"); + if (!INF_GetDataField(&Context, 3, &ServiceName)) + { + DPRINT("INF_GetDataField() failed\n"); return FALSE; } @@ -551,9 +547,9 @@ /* Set the resolution */ swprintf(RegPath, L"\\Registry\\Machine\\System\\CurrentControlSet\\Hardware Profiles\\Current\\System\\CurrentControlSet\\Services\\%s\\Device0", ServiceName); - if (!InfGetDataField(Context, 4, &Buffer)) - { - DPRINT("InfGetDataField() failed\n"); + if (!INF_GetDataField(&Context, 4, &Buffer)) + { + DPRINT("INF_GetDataField() failed\n"); return FALSE; } Width = wcstoul(Buffer, NULL, 10); @@ -570,9 +566,9 @@ } - if (!InfGetDataField(Context, 5, &Buffer)) - { - DPRINT("InfGetDataField() failed\n"); + if (!INF_GetDataField(&Context, 5, &Buffer)) + { + DPRINT("INF_GetDataField() failed\n"); return FALSE; } Hight = wcstoul(Buffer, 0, 0); @@ -588,9 +584,9 @@ return FALSE; } - if (!InfGetDataField(Context, 6, &Buffer)) - { - DPRINT("InfGetDataField() failed\n"); + if (!INF_GetDataField(&Context, 6, &Buffer)) + { + DPRINT("INF_GetDataField() failed\n"); return FALSE; } Bpp = wcstoul(Buffer, 0, 0); @@ -606,8 +602,6 @@ return FALSE; } - InfFreeContext(Context); - DPRINT("ProcessDisplayRegistry() done\n"); return TRUE; @@ -619,7 +613,7 @@ { CHAR Buffer[128]; PGENERIC_LIST List; - PINFCONTEXT Context; + INFCONTEXT Context; PWCHAR KeyName; PWCHAR KeyValue; PWCHAR UserData; @@ -628,7 +622,7 @@ if (List == NULL) return NULL; - if (!InfFindFirstLine (InfFile, L"Keyboard", NULL, &Context)) + if (!SetupFindFirstLineW (InfFile, L"Keyboard", NULL, &Context)) { DestroyGenericList(List, FALSE); return NULL; @@ -636,10 +630,10 @@ do { - if (!InfGetData (Context, &KeyName, &KeyValue)) + if (!INF_GetData (&Context, &KeyName, &KeyValue)) { /* FIXME: Handle error! */ - DPRINT("InfGetData() failed\n"); + DPRINT("INF_GetData() failed\n"); break; } @@ -656,8 +650,7 @@ sprintf(Buffer, "%S", KeyValue); AppendGenericListEntry(List, Buffer, UserData, FALSE); } - while (InfFindNextLine(Context, Context)); - InfFreeContext(Context); + while (SetupFindNextLine(&Context, &Context)); return List; } @@ -668,42 +661,37 @@ { CHAR Buffer[128]; PGENERIC_LIST List; - PINFCONTEXT Context; + INFCONTEXT Context; PWCHAR KeyName; PWCHAR KeyValue; PWCHAR UserData; WCHAR DefaultLayout[20]; /* Get default layout id */ - if (!InfFindFirstLine (InfFile, L"NLS", L"DefaultLayout", &Context)) + if (!SetupFindFirstLineW (InfFile, L"NLS", L"DefaultLayout", &Context)) return NULL; - if (!InfGetData (Context, NULL, &KeyValue)) - { - InfFreeContext(Context); - return NULL; - } + if (!INF_GetData (&Context, NULL, &KeyValue)) + return NULL; wcscpy(DefaultLayout, KeyValue); - InfFreeContext(Context); List = CreateGenericList(); if (List == NULL) return NULL; - if (!InfFindFirstLine (InfFile, L"KeyboardLayout", NULL, &Context)) + if (!SetupFindFirstLineW (InfFile, L"KeyboardLayout", NULL, &Context)) { DestroyGenericList(List, FALSE); - InfFreeContext(Context); return NULL; } do { - if (!InfGetData (Context, &KeyName, &KeyValue)) + if (!INF_GetData (&Context, &KeyName, &KeyValue)) { /* FIXME: Handle error! */ - DPRINT("InfGetData() failed\n"); + DPRINT("INF_GetData() failed\n"); break; } @@ -723,8 +711,7 @@ UserData, _wcsicmp(KeyName, DefaultLayout) ? FALSE : TRUE); } - while (InfFindNextLine(Context, Context)); - InfFreeContext(Context); + while (SetupFindNextLine(&Context, &Context)); return List; } Modified: trunk/reactos/base/setup/usetup/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.c… ============================================================================== --- trunk/reactos/base/setup/usetup/usetup.c (original) +++ trunk/reactos/base/setup/usetup/usetup.c Thu Aug 31 13:13:03 2006 @@ -25,7 +25,7 @@ * Casper S. Hornstrup (chorns(a)users.sourceforge.net) */ -#include <usetup.h> +#include "usetup.h" #define NDEBUG #include <debug.h> @@ -411,12 +411,10 @@ CheckUnattendedSetup(VOID) { WCHAR UnattendInfPath[MAX_PATH]; - UNICODE_STRING FileName; - PINFCONTEXT Context; + INFCONTEXT Context; HINF UnattendInf; - ULONG ErrorLine; - NTSTATUS Status; - LONG IntValue; + UINT ErrorLine; + INT IntValue; PWCHAR Value; if (DoesFileExist(SourcePath.Buffer, L"unattend.inf") == FALSE) @@ -429,34 +427,30 @@ wcscpy(UnattendInfPath, SourcePath.Buffer); wcscat(UnattendInfPath, L"\\unattend.inf"); - RtlInitUnicodeString(&FileName, - UnattendInfPath); - /* Load 'unattend.inf' from install media. */ - Status = InfOpenFile(&UnattendInf, - &FileName, + UnattendInf = SetupOpenInfFileW(UnattendInfPath, + NULL, + INF_STYLE_WIN4, &ErrorLine); - if (!NT_SUCCESS(Status)) - { - DPRINT("InfOpenFile() failed with status 0x%x\n", Status); + if (UnattendInf == INVALID_HANDLE_VALUE) + { + DPRINT("SetupOpenInfFileW() failed\n"); return; } /* Open 'Unattend' section */ - if (!InfFindFirstLine(UnattendInf, L"Unattend", L"Signature", &Context)) - { - DPRINT("InfFindFirstLine() failed for section 'Unattend'\n"); - InfFreeContext(Context); - InfCloseFile(UnattendInf); + if (!SetupFindFirstLineW(UnattendInf, L"Unattend", L"Signature", &Context)) + { + DPRINT("SetupFindFirstLineW() failed for section 'Unattend'\n"); + SetupCloseInfFile(&UnattendInf); return; } /* Get pointer 'Signature' key */ - if (!InfGetData(Context, NULL, &Value)) - { - DPRINT("InfGetData() failed for key 'Signature'\n"); - InfFreeContext(Context); - InfCloseFile(UnattendInf); + if (!INF_GetData(&Context, NULL, &Value)) + { + DPRINT("INF_GetData() failed for key 'Signature'\n"); + SetupCloseInfFile(&UnattendInf); return; } @@ -464,88 +458,75 @@ if (_wcsicmp(Value, L"$ReactOS$") != 0) { DPRINT("Signature not $ReactOS$\n"); - InfFreeContext(Context); - InfCloseFile(UnattendInf); + SetupCloseInfFile(&UnattendInf); return; } /* Search for 'DestinationDiskNumber' in the 'Unattend' section */ - if (!InfFindFirstLine(UnattendInf, L"Unattend", L"DestinationDiskNumber", &Context)) - { - DPRINT("InfFindFirstLine() failed for key 'DestinationDiskNumber'\n"); - InfFreeContext(Context); - InfCloseFile(UnattendInf); + if (!SetupFindFirstLineW(UnattendInf, L"Unattend", L"DestinationDiskNumber", &Context)) + { + DPRINT("SetupFindFirstLine() failed for key 'DestinationDiskNumber'\n"); + SetupCloseInfFile(&UnattendInf); return; } - if (!InfGetIntField(Context, 0, &IntValue)) - { - DPRINT("InfGetIntField() failed for key 'DestinationDiskNumber'\n"); - InfFreeContext(Context); - InfCloseFile(UnattendInf); + if (!SetupGetIntField(&Context, 0, &IntValue)) + { + DPRINT("SetupGetIntField() failed for key 'DestinationDiskNumber'\n"); + SetupCloseInfFile(&UnattendInf); return; } - UnattendDestinationDiskNumber = IntValue; - InfFreeContext(Context); + UnattendDestinationDiskNumber = (LONG)IntValue; /* Search for 'DestinationPartitionNumber' in the 'Unattend' section */ - if (!InfFindFirstLine(UnattendInf, L"Unattend", L"DestinationPartitionNumber", &Context)) - { - DPRINT("InfFindFirstLine() failed for key 'DestinationPartitionNumber'\n"); - InfFreeContext(Context); - InfCloseFile(UnattendInf); + if (!SetupFindFirstLineW(UnattendInf, L"Unattend", L"DestinationPartitionNumber", &Context)) + { + DPRINT("SetupFindFirstLine() failed for key 'DestinationPartitionNumber'\n"); + SetupCloseInfFile(UnattendInf); return; } - if (!InfGetIntField(Context, 0, &IntValue)) - { - DPRINT("InfGetIntField() failed for key 'DestinationPartitionNumber'\n"); - InfFreeContext(Context); - InfCloseFile(UnattendInf); + if (!SetupGetIntField(&Context, 0, &IntValue)) + { + DPRINT("SetupGetIntField() failed for key 'DestinationPartitionNumber'\n"); + SetupCloseInfFile(UnattendInf); return; } UnattendDestinationPartitionNumber = IntValue; - InfFreeContext(Context); /* Search for 'DestinationPartitionNumber' in the 'Unattend' section */ - if (!InfFindFirstLine(UnattendInf, L"Unattend", L"DestinationPartitionNumber", &Context)) - { - DPRINT("InfFindFirstLine() failed for key 'DestinationPartitionNumber'\n"); - InfCloseFile(UnattendInf); + if (!SetupFindFirstLineW(UnattendInf, L"Unattend", L"DestinationPartitionNumber", &Context)) + { + DPRINT("SetupFindFirstLine() failed for key 'DestinationPartitionNumber'\n"); + SetupCloseInfFile(UnattendInf); return; } /* Get pointer 'InstallationDirectory' key */ - if (!InfGetData(Context, NULL, &Value)) - { - DPRINT("InfGetData() failed for key 'InstallationDirectory'\n"); - InfFreeContext(Context); - InfCloseFile(UnattendInf); + if (!INF_GetData(&Context, NULL, &Value)) + { + DPRINT("INF_GetData() failed for key 'InstallationDirectory'\n"); + SetupCloseInfFile(UnattendInf); return; } wcscpy(UnattendInstallationDirectory, Value); - InfFreeContext(Context); - IsUnattendedSetup = TRUE; /* Search for 'MBRInstallType' in the 'Unattend' section */ - if (!InfFindFirstLine(UnattendInf, L"Unattend", L"MBRInstallType", &Context)) - { - DPRINT("InfFindFirstLine() failed for key 'MBRInstallType'\n"); - InfFreeContext(Context); - InfCloseFile(UnattendInf); + if (!SetupFindFirstLineW(UnattendInf, L"Unattend", L"MBRInstallType", &Context)) + { + DPRINT("SetupFindFirstLine() failed for key 'MBRInstallType'\n"); + SetupCloseInfFile(UnattendInf); return; } - if (!InfGetIntField(Context, 0, &IntValue)) - { - DPRINT("InfGetIntField() failed for key 'MBRInstallType'\n"); - InfFreeContext(Context); - InfCloseFile(UnattendInf); + if (!SetupGetIntField(&Context, 0, &IntValue)) + { + DPRINT("SetupGetIntField() failed for key 'MBRInstallType'\n"); + SetupCloseInfFile(UnattendInf); return; } UnattendMBRInstallType = IntValue; - InfFreeContext(Context); - - InfCloseFile(UnattendInf); + + SetupCloseInfFile(UnattendInf); DPRINT("Running unattended setup\n"); } @@ -562,10 +543,9 @@ SYSTEM_DEVICE_INFORMATION Sdi; NTSTATUS Status; WCHAR FileNameBuffer[MAX_PATH]; - UNICODE_STRING FileName; - PINFCONTEXT Context; + INFCONTEXT Context; PWCHAR Value; - ULONG ErrorLine; + UINT ErrorLine; ULONG ReturnSize; CONSOLE_SetStatusText(" Please wait..."); @@ -636,13 +616,12 @@ /* Load txtsetup.sif from install media. */ wcscpy(FileNameBuffer, SourceRootPath.Buffer); wcscat(FileNameBuffer, L"\\reactos\\txtsetup.sif"); - RtlInitUnicodeString(&FileName, - FileNameBuffer); - - Status = InfOpenFile(&SetupInf, - &FileName, + + SetupInf = SetupOpenInfFileW(FileNameBuffer, + NULL, + INF_STYLE_WIN4, &ErrorLine); - if (!NT_SUCCESS(Status)) + if (SetupInf == INVALID_HANDLE_VALUE) { PopupError("Setup failed to load the file TXTSETUP.SIF.\n", "ENTER = Reboot computer"); @@ -659,7 +638,7 @@ } /* Open 'Version' section */ - if (!InfFindFirstLine (SetupInf, L"Version", L"Signature", &Context)) + if (!SetupFindFirstLineW (SetupInf, L"Version", L"Signature", &Context)) { PopupError("Setup found a corrupt TXTSETUP.SIF.\n", "ENTER = Reboot computer"); @@ -677,9 +656,8 @@ /* Get pointer 'Signature' key */ - if (!InfGetData (Context, NULL, &Value)) - { - InfFreeContext(Context); + if (!INF_GetData (&Context, NULL, &Value)) + { PopupError("Setup found a corrupt TXTSETUP.SIF.\n", "ENTER = Reboot computer"); @@ -697,7 +675,6 @@ /* Check 'Signature' string */ if (_wcsicmp(Value, L"$ReactOS$") != 0) { - InfFreeContext(Context); PopupError("Setup found an invalid signature in TXTSETUP.SIF.\n", "ENTER = Reboot computer"); @@ -711,7 +688,6 @@ } } } - InfFreeContext(Context); CheckUnattendedSetup(); @@ -2605,7 +2581,7 @@ PPARTENTRY PartEntry; WCHAR InstallDir[51]; PWCHAR DefaultPath; - PINFCONTEXT Context; + INFCONTEXT Context; ULONG Length; if (PartitionList == NULL || @@ -2620,7 +2596,7 @@ PartEntry = PartitionList->CurrentPartition; /* Search for 'DefaultPath' in the 'SetupData' section */ - if (!InfFindFirstLine (SetupInf, L"SetupData", L"DefaultPath", &Context)) + if (!SetupFindFirstLineW (SetupInf, L"SetupData", L"DefaultPath", &Context)) { PopupError("Setup failed to find the 'SetupData' section\n" "in TXTSETUP.SIF.\n", @@ -2638,7 +2614,7 @@ } /* Read the 'DefaultPath' data */ - if (InfGetData (Context, NULL, &DefaultPath)) + if (INF_GetData (&Context, NULL, &DefaultPath)) { wcscpy(InstallDir, DefaultPath); } @@ -2646,7 +2622,6 @@ { wcscpy(InstallDir, L"\\ReactOS"); } - InfFreeContext(Context); Length = wcslen(InstallDir); CONSOLE_SetTextXY(6, 8, "Setup installs ReactOS files onto the selected partition. Choose a"); @@ -2711,15 +2686,15 @@ PWCHAR SourceCabinet, PINPUT_RECORD Ir) { - PINFCONTEXT FilesContext; - PINFCONTEXT DirContext; + INFCONTEXT FilesContext; + INFCONTEXT DirContext; PWCHAR FileKeyName; PWCHAR FileKeyValue; PWCHAR DirKeyValue; PWCHAR TargetFileName; /* Search for the SectionName section */ - if (!InfFindFirstLine (InfFile, SectionName, NULL, &FilesContext)) + if (!SetupFindFirstLineW (InfFile, SectionName, NULL, &FilesContext)) { char Buffer[128]; sprintf(Buffer, "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n", SectionName); @@ -2743,32 +2718,31 @@ do { /* Get source file name and target directory id */ - if (!InfGetData (FilesContext, &FileKeyName, &FileKeyValue)) + if (!INF_GetData (&FilesContext, &FileKeyName, &FileKeyValue)) { /* FIXME: Handle error! */ - DPRINT1("InfGetData() failed\n"); + DPRINT1("INF_GetData() failed\n"); break; } /* Get optional target file name */ - if (!InfGetDataField (FilesContext, 2, &TargetFileName)) + if (!INF_GetDataField (&FilesContext, 2, &TargetFileName)) TargetFileName = NULL; DPRINT ("FileKeyName: '%S' FileKeyValue: '%S'\n", FileKeyName, FileKeyValue); /* Lookup target directory */ - if (!InfFindFirstLine (InfFile, L"Directories", FileKeyValue, &DirContext)) + if (!SetupFindFirstLineW (InfFile, L"Directories", FileKeyValue, &DirContext)) { /* FIXME: Handle error! */ - DPRINT1("InfFindFirstLine() failed\n"); + DPRINT1("SetupFindFirstLine() failed\n"); break; } - if (!InfGetData (DirContext, NULL, &DirKeyValue)) + if (!INF_GetData (&DirContext, NULL, &DirKeyValue)) { /* FIXME: Handle error! */ - InfFreeContext(DirContext); - DPRINT1("InfGetData() failed\n"); + DPRINT1("INF_GetData() failed\n"); break; } @@ -2783,11 +2757,8 @@ /* FIXME: Handle error! */ DPRINT1("SetupQueueCopy() failed\n"); } - InfFreeContext(DirContext); - } - while (InfFindNextLine(FilesContext, FilesContext)); - - InfFreeContext(FilesContext); + } + while (SetupFindNextLine(&FilesContext, &FilesContext)); return TRUE; } @@ -2798,7 +2769,7 @@ PINPUT_RECORD Ir) { WCHAR PathBuffer[MAX_PATH]; - PINFCONTEXT DirContext; + INFCONTEXT DirContext; PWCHAR AdditionalSectionName = NULL; PWCHAR KeyValue; ULONG Length; @@ -2858,7 +2829,7 @@ /* Search for the 'Directories' section */ - if (!InfFindFirstLine(InfFile, L"Directories", NULL, &DirContext)) + if (!SetupFindFirstLineW(InfFile, L"Directories", NULL, &DirContext)) { if (SourceCabinet) { @@ -2885,7 +2856,7 @@ /* Enumerate the directory values and create the subdirectories */ do { - if (!InfGetData (DirContext, NULL, &KeyValue)) + if (!INF_GetData (&DirContext, NULL, &KeyValue)) { DPRINT1("break\n"); break; @@ -2928,9 +2899,7 @@ } } } - while (InfFindNextLine (DirContext, DirContext)); - - InfFreeContext(DirContext); + while (SetupFindNextLine (&DirContext, &DirContext)); return(TRUE); } @@ -2941,11 +2910,10 @@ { HINF InfHandle; WCHAR PathBuffer[MAX_PATH]; - PINFCONTEXT CabinetsContext; + INFCONTEXT CabinetsContext; ULONG InfFileSize; PWCHAR KeyValue; - NTSTATUS Status; - ULONG ErrorLine; + UINT ErrorLine; PVOID InfFileData; CONSOLE_SetTextXY(6, 8, "Setup prepares your computer for copying the ReactOS files. "); @@ -2976,7 +2944,7 @@ } /* Search for the 'Cabinets' section */ - if (!InfFindFirstLine (SetupInf, L"Cabinets", NULL, &CabinetsContext)) + if (!SetupFindFirstLineW (SetupInf, L"Cabinets", NULL, &CabinetsContext)) { return FILE_COPY_PAGE; } @@ -2987,7 +2955,7 @@ */ do { - if (!InfGetData (CabinetsContext, NULL, &KeyValue)) + if (!INF_GetData (&CabinetsContext, NULL, &KeyValue)) break; wcscpy(PathBuffer, SourcePath.Buffer); @@ -3037,11 +3005,12 @@ } } - Status = InfOpenBufferedFile(&InfHandle, - InfFileData, + InfHandle = INF_OpenBufferedFileA(InfFileData, InfFileSize, + NULL, + INF_STYLE_WIN4, &ErrorLine); - if (!NT_SUCCESS(Status)) + if (InfHandle == INVALID_HANDLE_VALUE) { PopupError("Cabinet has no valid inf file.\n", "ENTER = Reboot computer"); @@ -3064,9 +3033,7 @@ return QUIT_PAGE; } } - while (InfFindNextLine (CabinetsContext, CabinetsContext)); - - InfFreeContext(CabinetsContext); + while (SetupFindNextLine (&CabinetsContext, &CabinetsContext)); return FILE_COPY_PAGE; } @@ -3144,7 +3111,7 @@ static PAGE_NUMBER RegistryPage(PINPUT_RECORD Ir) { - PINFCONTEXT InfContext; + INFCONTEXT InfContext; PWSTR Action; PWSTR File; PWSTR Section; @@ -3194,9 +3161,9 @@ /* Update registry */ CONSOLE_SetStatusText(" Updating registry hives..."); - if (!InfFindFirstLine(SetupInf, L"HiveInfs.Install", NULL, &InfContext)) - { - DPRINT1("InfFindFirstLine() failed\n"); + if (!SetupFindFirstLineW(SetupInf, L"HiveInfs.Install", NULL, &InfContext)) + { + DPRINT1("SetupFindFirstLine() failed\n"); PopupError("Setup failed to find the registry data files.", "ENTER = Reboot computer"); @@ -3213,9 +3180,9 @@ do { - InfGetDataField (InfContext, 0, &Action); - InfGetDataField (InfContext, 1, &File); - InfGetDataField (InfContext, 2, &Section); + INF_GetDataField (&InfContext, 0, &Action); + INF_GetDataField (&InfContext, 1, &File); + INF_GetDataField (&InfContext, 2, &Section); DPRINT("Action: %S File: %S Section %S\n", Action, File, Section); @@ -3252,9 +3219,7 @@ } } } - while (InfFindNextLine (InfContext, InfContext)); - - InfFreeContext(InfContext); + while (SetupFindNextLine (&InfContext, &InfContext)); /* Update display registry settings */ CONSOLE_SetStatusText(" Updating display registry settings..."); @@ -3714,7 +3679,7 @@ RtlNormalizeProcessParams(Peb->ProcessParameters); ProcessHeap = Peb->ProcessHeap; - InfSetHeap(ProcessHeap); + INF_SetHeap(ProcessHeap); SignalInitEvent(); Modified: trunk/reactos/base/setup/usetup/usetup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.h… ============================================================================== --- trunk/reactos/base/setup/usetup/usetup.h (original) +++ trunk/reactos/base/setup/usetup/usetup.h Thu Aug 31 13:13:03 2006 @@ -54,11 +54,10 @@ /* ReactOS Version */ #include <reactos/buildno.h> -#include <infros.h> - /* Internal Headers */ #include "console.h" #include "partlist.h" +#include "inffile.h" #include "inicache.h" #include "filequeue.h" #include "progress.h" Modified: trunk/reactos/base/setup/usetup/usetup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.r… ============================================================================== --- trunk/reactos/base/setup/usetup/usetup.rbuild (original) +++ trunk/reactos/base/setup/usetup/usetup.rbuild Thu Aug 31 13:13:03 2006 @@ -1,4 +1,4 @@ -<module name="usetup" type="nativecui" installbase="system32" installname="usetup.exe" allowwarnings="true"> +<module name="usetup" type="nativecui" installbase="system32" installname="usetup.exe" allowwarnings="false"> <bootstrap base="reactos/system32" nameoncd="smss.exe" /> <include base="usetup">.</include> <include base="zlib">.</include> @@ -13,7 +13,7 @@ <library>inflib</library> <library>vfatlib</library> <library>ntdll</library> - <pch>usetup.h</pch> +  <compilationunit name="unit.c"> <file>bootsup.c</file> <file>cabinet.c</file> @@ -24,6 +24,7 @@ <file>format.c</file> <file>fslist.c</file> <file>genlist.c</file> + <file>inffile.c</file> <file>inicache.c</file> <file>keytrans.c</file> <file>partlist.c</file>

18 years, 1 month

[arty] 23835: Some intermediate work. We start loading the kernel now. Working on early boot memory mapping. We'll rely heavily on open firmware until we're on our own page table.

by arty＠svn.reactos.org

Author: arty Date: Thu Aug 31 12:01:30 2006 New Revision: 23835 URL: http://svn.reactos.org/svn/reactos?rev=23835&view=rev Log: Some intermediate work. We start loading the kernel now. Working on early boot memory mapping. We'll rely heavily on open firmware until we're on our own page table. Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c Thu Aug 31 12:01:30 2006 @@ -25,7 +25,7 @@ extern void BootMain( char * ); extern char *GetFreeLoaderVersionString(); of_proxy ofproxy; -void *PageDirectoryStart, *PageDirectoryEnd; +void *PageDirectoryStart, *PageDirectoryEnd, *mem_base = 0; static int chosen_package, stdin_handle, part_handle = -1; BOOLEAN AcpiPresent = FALSE; char BootPath[0x100] = { 0 }, BootPart[0x100] = { 0 }, CmdLine[0x100] = { 0 }; @@ -95,7 +95,7 @@ } BOOLEAN PpcConsKbHit() { - return TRUE; + return FALSE; } int PpcConsGetCh() { @@ -193,6 +193,14 @@ printf("PpcGetMemoryMap(%d)\n", MaxMemoryMapSize); + if( mem_base ) { + BiosMemoryMap[0].Type = MEMTYPE_USABLE; + BiosMemoryMap[0].BaseAddress = (ULONG)mem_base; + BiosMemoryMap[0].Length = TOTAL_HEAP_NEEDED; + printf("[cached] returning 1 element\n"); + return 1; + } + ofw_getprop(chosen_package, "memory", (char *)&memhandle, sizeof(memhandle)); ofw_getprop(chosen_package, "mmu", @@ -207,8 +215,10 @@ for( i = 0; i < returned / sizeof(int) && !num_mem; i += 2 ) { BiosMemoryMap[num_mem].Type = MEMTYPE_USABLE; BiosMemoryMap[num_mem].BaseAddress = memdata[i]; + mem_base = (void *)memdata[i]; BiosMemoryMap[num_mem].Length = memdata[i+1]; - if( BiosMemoryMap[num_mem].Length >= TOTAL_HEAP_NEEDED ) { + if( BiosMemoryMap[num_mem].Length >= TOTAL_HEAP_NEEDED && + total < TOTAL_HEAP_NEEDED ) { BiosMemoryMap[num_mem].Length = TOTAL_HEAP_NEEDED; ofw_claim(BiosMemoryMap[num_mem].BaseAddress, BiosMemoryMap[num_mem].Length, 0x1000); /* claim it */ @@ -248,7 +258,14 @@ PULONGLONG StartSector, PULONGLONG SectorCount, int *FsType ) { - return FALSE; + char *remain = strchr(SystemPath, '\\'); + if( remain ) { + strcpy( RemainingPath, remain+1 ); + } else { + RemainingPath[0] = 0; + } + *Device = 0; + return PpcDiskGetBootVolume(DriveNumber, StartSector, SectorCount, FsType); } BOOLEAN PpcDiskGetBootPath( char *OutBootPath, unsigned Size ) { @@ -318,6 +335,44 @@ VOID PpcHwDetect() { printf("PpcHwDetect\n"); +} + +BOOLEAN PpcDiskNormalizeSystemPath(char *SystemPath, unsigned Size) { + CHAR BootPath[256]; + ULONG PartitionNumber; + ULONG DriveNumber; + PARTITION_TABLE_ENTRY PartEntry; + char *p; + + if (!DissectArcPath(SystemPath, BootPath, &DriveNumber, &PartitionNumber)) + { + return FALSE; + } + + if (0 != PartitionNumber) + { + return TRUE; + } + + if (! DiskGetActivePartitionEntry(DriveNumber, + &PartEntry, + &PartitionNumber) || + PartitionNumber < 1 || 9 < PartitionNumber) + { + return FALSE; + } + + p = SystemPath; + while ('\0' != *p && 0 != _strnicmp(p, "partition(", 10)) { + p++; + } + p = strchr(p, ')'); + if (NULL == p || '0' != *(p - 1)) { + return FALSE; + } + *(p - 1) = '0' + PartitionNumber; + + return TRUE; } typedef unsigned int uint32_t; @@ -368,6 +423,7 @@ MachVtbl.GetMemoryMap = PpcGetMemoryMap; + MachVtbl.DiskNormalizeSystemPath = PpcDiskNormalizeSystemPath; MachVtbl.DiskGetBootVolume = PpcDiskGetBootVolume; MachVtbl.DiskGetSystemVolume = PpcDiskGetSystemVolume; MachVtbl.DiskGetBootPath = PpcDiskGetBootPath; Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c Thu Aug 31 12:01:30 2006 @@ -1,59 +1,68 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: Freeloader - * FILE: boot/freeldr/freeldr/multiboot.c - * PURPOSE: ReactOS Loader - * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + * FreeLoader + * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> + * Copyright (C) 2005 Alex Ionescu <alex(a)relsoft.net> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include <freeldr.h> -#include <internal/powerpc/ke.h> + +#include <of_call.h> #define NDEBUG #include <debug.h> -int xstrnicmp( const char *a, const char *b, int n ) { - while( n-- && *a && (*a++ == *b++) ); - return *a - *b; -} - -/* Base Addres of Kernel in Physical Memory */ -#define KERNEL_BASE_PHYS 0x200000 +static PVOID KernelMemory = 0; /* Bits to shift to convert a Virtual Address into an Offset in the Page Table */ #define PFN_SHIFT 12 /* Bits to shift to convert a Virtual Address into an Offset in the Page Directory */ -#define PDE_SHIFT 20 +#define PDE_SHIFT 22 #define PDE_SHIFT_PAE 18 - + /* Converts a Relative Address read from the Kernel into a Physical Address */ -#define RaToPa(p) \ - (ULONG_PTR)((ULONG_PTR)p + KERNEL_BASE_PHYS) - +ULONG RaToPa(ULONG p) { + return ofw_virt2phys((ULONG)(p + KernelMemory), 1); +} + /* Converts a Phsyical Address Pointer into a Page Frame Number */ #define PaPtrToPfn(p) \ (((ULONG_PTR)&p) >> PFN_SHIFT) - + /* Converts a Phsyical Address into a Page Frame Number */ #define PaToPfn(p) \ ((p) >> PFN_SHIFT) -#define STARTUP_BASE 0xF0000000 -#define HYPERSPACE_BASE 0xF0800000 +#define STARTUP_BASE 0xC0000000 +#define HYPERSPACE_BASE 0xC0400000 +#define HYPERSPACE_PAE_BASE 0xC0800000 #define APIC_BASE 0xFEC00000 #define KPCR_BASE 0xFF000000 - + #define LowMemPageTableIndex 0 -#define StartupPageTableIndex (STARTUP_BASE >> 20) / sizeof(HARDWARE_PTE_X86) -#define HyperspacePageTableIndex (HYPERSPACE_BASE >> 20) / sizeof(HARDWARE_PTE_X86) -#define KpcrPageTableIndex (KPCR_BASE >> 20) / sizeof(HARDWARE_PTE_X86) -#define ApicPageTableIndex (APIC_BASE >> 20) / sizeof(HARDWARE_PTE_X86) +#define StartupPageTableIndex (STARTUP_BASE >> 22) +#define HyperspacePageTableIndex (HYPERSPACE_BASE >> 22) +#define KpcrPageTableIndex (KPCR_BASE >> 22) +#define ApicPageTableIndex (APIC_BASE >> 22) #define LowMemPageTableIndexPae 0 #define StartupPageTableIndexPae (STARTUP_BASE >> 21) -#define HyperspacePageTableIndexPae (HYPERSPACE_BASE >> 21) +#define HyperspacePageTableIndexPae (HYPERSPACE_PAE_BASE >> 21) #define KpcrPageTableIndexPae (KPCR_BASE >> 21) #define ApicPageTableIndexPae (APIC_BASE >> 21) @@ -64,7 +73,7 @@ ULONG_PTR NextModuleBase = 0; /* Currently Opened Module */ -VOID *CurrentModule = NULL; +PLOADER_MODULE CurrentModule = NULL; /* Unrelocated Kernel Base in Virtual Memory */ ULONG_PTR KernelBase; @@ -78,7 +87,7 @@ /* FUNCTIONS *****************************************************************/ /*++ - * FrLdrStartup + * FrLdrStartup * INTERNAL * * Prepares the system for loading the Kernel. @@ -96,21 +105,34 @@ VOID NTAPI FrLdrStartup(ULONG Magic) -{ -#if 0 - /* Disable Interrupts */ - KeArchDisableInterrupts(); - - /* Re-initalize EFLAGS */ - KeArchEraseFlags(); - - /* Initialize the page directory */ - FrLdrSetupPageDirectory(); -#endif +{ } /*++ - * FrLdrGetKernelBase + * FrLdrSetupPae + * INTERNAL + * + * Configures PAE on a MP System, and sets the PDBR if it's supported, or if + * the system is UP. + * + * Params: + * Magic - Multiboot Magic + * + * Returns: + * None. + * + * Remarks: + * None. + * + *--*/ +VOID +FASTCALL +FrLdrSetupPae(ULONG Magic) +{ +} + +/*++ + * FrLdrGetKernelBase * INTERNAL * * Gets the Kernel Base to use. @@ -125,36 +147,59 @@ * will be used by the Kernel. * *--*/ -VOID +static VOID FASTCALL FrLdrGetKernelBase(VOID) { PCHAR p; - + + /* Set KernelBase */ + LoaderBlock.KernelBase = KernelBase; + /* Read Command Line */ p = (PCHAR)LoaderBlock.CommandLine; while ((p = strchr(p, '/')) != NULL) { - + /* Find "/3GB" */ - if (!xstrnicmp(p + 1, "3GB", 3)) { - + if (!_strnicmp(p + 1, "3GB", 3)) { + /* Make sure there's nothing following it */ if (p[4] == ' ' || p[4] == 0) { - + /* Use 3GB */ - KernelBase = 0xC0000000; + KernelBase = 0xE0000000; + LoaderBlock.KernelBase = 0xC0000000; } } p++; } - - /* Set KernelBase */ - LoaderBlock.KernelBase = KernelBase; } /*++ - * FrLdrSetupPageDirectory + * FrLdrGetPaeMode + * INTERNAL + * + * Determines whether PAE mode shoudl be enabled or not. + * + * Params: + * None. + * + * Returns: + * None. + * + * Remarks: + * None. + * + *--*/ +VOID +FASTCALL +FrLdrGetPaeMode(VOID) +{ +} + +/*++ + * FrLdrSetupPageDirectory * INTERNAL * * Sets up the ReactOS Startup Page Directory. @@ -174,199 +219,10 @@ FASTCALL FrLdrSetupPageDirectory(VOID) { -#if 0 - PPAGE_DIRECTORY_X86 PageDir; - PPAGE_DIRECTORY_TABLE_X64 PageDirTablePae; - PPAGE_DIRECTORY_X64 PageDirPae; - ULONG KernelPageTableIndex; - ULONG i; - - if (PaeModeEnabled) { - - /* Get the Kernel Table Index */ - KernelPageTableIndex = (KernelBase >> 21); - - /* Get the Startup Page Directory Table */ - PageDirTablePae = (PPAGE_DIRECTORY_TABLE_X64)&startup_pagedirectorytable_pae; - - /* Get the Startup Page Directory */ - PageDirPae = (PPAGE_DIRECTORY_X64)&startup_pagedirectory_pae; - - /* Set the Startup page directory table */ - for (i = 0; i < 4; i++) - { - PageDirTablePae->Pde[i].Valid = 1; - PageDirTablePae->Pde[i].PageFrameNumber = PaPtrToPfn(startup_pagedirectory_pae) + i; - } - - /* Set up the Low Memory PDE */ - for (i = 0; i < 2; i++) - { - PageDirPae->Pde[LowMemPageTableIndexPae + i].Valid = 1; - PageDirPae->Pde[LowMemPageTableIndexPae + i].Write = 1; - PageDirPae->Pde[LowMemPageTableIndexPae + i].PageFrameNumber = PaPtrToPfn(lowmem_pagetable_pae) + i; - } - - /* Set up the Kernel PDEs */ - for (i = 0; i < 3; i++) - { - PageDirPae->Pde[KernelPageTableIndex + i].Valid = 1; - PageDirPae->Pde[KernelPageTableIndex + i].Write = 1; - PageDirPae->Pde[KernelPageTableIndex + i].PageFrameNumber = PaPtrToPfn(kernel_pagetable_pae) + i; - } - - /* Set up the Startup PDE */ - for (i = 0; i < 4; i++) - { - PageDirPae->Pde[StartupPageTableIndexPae + i].Valid = 1; - PageDirPae->Pde[StartupPageTableIndexPae + i].Write = 1; - PageDirPae->Pde[StartupPageTableIndexPae + i].PageFrameNumber = PaPtrToPfn(startup_pagedirectory_pae) + i; - } - - /* Set up the Hyperspace PDE */ - for (i = 0; i < 2; i++) - { - PageDirPae->Pde[HyperspacePageTableIndexPae + i].Valid = 1; - PageDirPae->Pde[HyperspacePageTableIndexPae + i].Write = 1; - PageDirPae->Pde[HyperspacePageTableIndexPae + i].PageFrameNumber = PaPtrToPfn(hyperspace_pagetable_pae) + i; - } - - /* Set up the Apic PDE */ - for (i = 0; i < 2; i++) - { - PageDirPae->Pde[ApicPageTableIndexPae + i].Valid = 1; - PageDirPae->Pde[ApicPageTableIndexPae + i].Write = 1; - PageDirPae->Pde[ApicPageTableIndexPae + i].PageFrameNumber = PaPtrToPfn(apic_pagetable_pae) + i; - } - - /* Set up the KPCR PDE */ - PageDirPae->Pde[KpcrPageTableIndexPae].Valid = 1; - PageDirPae->Pde[KpcrPageTableIndexPae].Write = 1; - PageDirPae->Pde[KpcrPageTableIndexPae].PageFrameNumber = PaPtrToPfn(kpcr_pagetable_pae); - - /* Set up Low Memory PTEs */ - PageDirPae = (PPAGE_DIRECTORY_X64)&lowmem_pagetable_pae; - for (i=0; i<1024; i++) { - - PageDirPae->Pde[i].Valid = 1; - PageDirPae->Pde[i].Write = 1; - PageDirPae->Pde[i].Owner = 1; - PageDirPae->Pde[i].PageFrameNumber = i; - } - - /* Set up Kernel PTEs */ - PageDirPae = (PPAGE_DIRECTORY_X64)&kernel_pagetable_pae; - for (i=0; i<1536; i++) { - - PageDirPae->Pde[i].Valid = 1; - PageDirPae->Pde[i].Write = 1; - PageDirPae->Pde[i].PageFrameNumber = PaToPfn(KERNEL_BASE_PHYS) + i; - } - - /* Set up APIC PTEs */ - PageDirPae = (PPAGE_DIRECTORY_X64)&apic_pagetable_pae; - PageDirPae->Pde[0].Valid = 1; - PageDirPae->Pde[0].Write = 1; - PageDirPae->Pde[0].CacheDisable = 1; - PageDirPae->Pde[0].WriteThrough = 1; - PageDirPae->Pde[0].PageFrameNumber = PaToPfn(APIC_BASE); - PageDirPae->Pde[0x200].Valid = 1; - PageDirPae->Pde[0x200].Write = 1; - PageDirPae->Pde[0x200].CacheDisable = 1; - PageDirPae->Pde[0x200].WriteThrough = 1; - PageDirPae->Pde[0x200].PageFrameNumber = PaToPfn(APIC_BASE + KERNEL_BASE_PHYS); - - /* Set up KPCR PTEs */ - PageDirPae = (PPAGE_DIRECTORY_X64)&kpcr_pagetable_pae; - PageDirPae->Pde[0].Valid = 1; - PageDirPae->Pde[0].Write = 1; - PageDirPae->Pde[0].PageFrameNumber = 1; - - } else { - - /* Get the Kernel Table Index */ - KernelPageTableIndex = (KernelBase >> PDE_SHIFT) / sizeof(HARDWARE_PTE_X86); - - /* Get the Startup Page Directory */ - PageDir = (PPAGE_DIRECTORY_X86)&startup_pagedirectory; - - /* Set up the Low Memory PDE */ - PageDir->Pde[LowMemPageTableIndex].Valid = 1; - PageDir->Pde[LowMemPageTableIndex].Write = 1; - PageDir->Pde[LowMemPageTableIndex].PageFrameNumber = PaPtrToPfn(lowmem_pagetable); - - /* Set up the Kernel PDEs */ - PageDir->Pde[KernelPageTableIndex].Valid = 1; - PageDir->Pde[KernelPageTableIndex].Write = 1; - PageDir->Pde[KernelPageTableIndex].PageFrameNumber = PaPtrToPfn(kernel_pagetable); - PageDir->Pde[KernelPageTableIndex + 1].Valid = 1; - PageDir->Pde[KernelPageTableIndex + 1].Write = 1; - PageDir->Pde[KernelPageTableIndex + 1].PageFrameNumber = PaPtrToPfn(kernel_pagetable + 4096); - - /* Set up the Startup PDE */ - PageDir->Pde[StartupPageTableIndex].Valid = 1; - PageDir->Pde[StartupPageTableIndex].Write = 1; - PageDir->Pde[StartupPageTableIndex].PageFrameNumber = PaPtrToPfn(startup_pagedirectory); - - /* Set up the Hyperspace PDE */ - PageDir->Pde[HyperspacePageTableIndex].Valid = 1; - PageDir->Pde[HyperspacePageTableIndex].Write = 1; - PageDir->Pde[HyperspacePageTableIndex].PageFrameNumber = PaPtrToPfn(hyperspace_pagetable); - - /* Set up the Apic PDE */ - PageDir->Pde[ApicPageTableIndex].Valid = 1; - PageDir->Pde[ApicPageTableIndex].Write = 1; - PageDir->Pde[ApicPageTableIndex].PageFrameNumber = PaPtrToPfn(apic_pagetable); - - /* Set up the KPCR PDE */ - PageDir->Pde[KpcrPageTableIndex].Valid = 1; - PageDir->Pde[KpcrPageTableIndex].Write = 1; - PageDir->Pde[KpcrPageTableIndex].PageFrameNumber = PaPtrToPfn(kpcr_pagetable); - - /* Set up Low Memory PTEs */ - PageDir = (PPAGE_DIRECTORY_X86)&lowmem_pagetable; - for (i=0; i<1024; i++) { - - PageDir->Pde[i].Valid = 1; - PageDir->Pde[i].Write = 1; - PageDir->Pde[i].Owner = 1; - PageDir->Pde[i].PageFrameNumber = PaToPfn(i * PAGE_SIZE); - } - - /* Set up Kernel PTEs */ - PageDir = (PPAGE_DIRECTORY_X86)&kernel_pagetable; - for (i=0; i<1536; i++) { - - PageDir->Pde[i].Valid = 1; - PageDir->Pde[i].Write = 1; - PageDir->Pde[i].PageFrameNumber = PaToPfn(KERNEL_BASE_PHYS + i * PAGE_SIZE); - } - - /* Set up APIC PTEs */ - PageDir = (PPAGE_DIRECTORY_X86)&apic_pagetable; - PageDir->Pde[0].Valid = 1; - PageDir->Pde[0].Write = 1; - PageDir->Pde[0].CacheDisable = 1; - PageDir->Pde[0].WriteThrough = 1; - PageDir->Pde[0].PageFrameNumber = PaToPfn(APIC_BASE); - PageDir->Pde[0x200].Valid = 1; - PageDir->Pde[0x200].Write = 1; - PageDir->Pde[0x200].CacheDisable = 1; - PageDir->Pde[0x200].WriteThrough = 1; - PageDir->Pde[0x200].PageFrameNumber = PaToPfn(APIC_BASE + KERNEL_BASE_PHYS); - - /* Set up KPCR PTEs */ - PageDir = (PPAGE_DIRECTORY_X86)&kpcr_pagetable; - PageDir->Pde[0].Valid = 1; - PageDir->Pde[0].Write = 1; - PageDir->Pde[0].PageFrameNumber = 1; - } - return; -#endif } /*++ - * FrLdrMapKernel + * FrLdrMapKernel * INTERNAL * * Maps the Kernel into memory, does PE Section Mapping, initalizes the @@ -386,7 +242,6 @@ NTAPI FrLdrMapKernel(FILE *KernelImage) { -#if 0 PIMAGE_DOS_HEADER ImageHeader; PIMAGE_NT_HEADERS NtHeader; PIMAGE_SECTION_HEADER Section; @@ -395,7 +250,7 @@ ULONG_PTR SourceSection; ULONG_PTR TargetSection; ULONG SectionSize; - LONG i; + INT i; PIMAGE_DATA_DIRECTORY RelocationDDir; PIMAGE_BASE_RELOCATION RelocationDir, RelocationEnd; ULONG Count; @@ -407,10 +262,10 @@ /* Allocate 1024 bytes for PE Header */ ImageHeader = (PIMAGE_DOS_HEADER)MmAllocateMemory(1024); - + /* Make sure it was succesful */ if (ImageHeader == NULL) { - + return FALSE; } @@ -424,94 +279,97 @@ /* Now read the MZ header to get the offset to the PE Header */ NtHeader = (PIMAGE_NT_HEADERS)((PCHAR)ImageHeader + ImageHeader->e_lfanew); - + /* Get Kernel Base */ - KernelBase = NtHeader->OptionalHeader.ImageBase; + KernelBase = NtHeader->OptionalHeader.ImageBase; FrLdrGetKernelBase(); - + + printf("About to do RaToPa(%x)\n", + NtHeader->OptionalHeader.AddressOfEntryPoint); /* Save Entrypoint */ KernelEntry = RaToPa(NtHeader->OptionalHeader.AddressOfEntryPoint); - + printf("RaToPa -> %x\n", KernelEntry); + /* Save the Image Size */ ImageSize = NtHeader->OptionalHeader.SizeOfImage; - + /* Free the Header */ MmFreeMemory(ImageHeader); /* Set the file pointer to zero */ FsSetFilePointer(KernelImage, 0); + /* Allocate kernel memory */ + KernelMemory = MmAllocateMemory(ImageSize); + /* Load the file image */ - FsReadFile(KernelImage, ImageSize, NULL, (PVOID)KERNEL_BASE_PHYS); - + FsReadFile(KernelImage, ImageSize, NULL, KernelMemory); + /* Reload the NT Header */ - NtHeader = (PIMAGE_NT_HEADERS)((PCHAR)KERNEL_BASE_PHYS + ImageHeader->e_lfanew); - + NtHeader = (PIMAGE_NT_HEADERS)((PCHAR)KernelMemory + ImageHeader->e_lfanew); + /* Load the first section */ Section = IMAGE_FIRST_SECTION(NtHeader); SectionCount = NtHeader->FileHeader.NumberOfSections - 1; - + /* Now go to the last section */ Section += SectionCount; - - /* Walk each section backwards */ - for (i=SectionCount; i >= 0; i--, Section--) { - - /* Get the disk location and the memory location, and the size */ + + /* Walk each section backwards */ + for (i=(INT)SectionCount; i >= 0; i--, Section--) { + + /* Get the disk location and the memory location, and the size */ SourceSection = RaToPa(Section->PointerToRawData); TargetSection = RaToPa(Section->VirtualAddress); SectionSize = Section->SizeOfRawData; - + /* If the section is already mapped correctly, go to the next */ if (SourceSection == TargetSection) continue; - + /* Load it into memory */ memmove((PVOID)TargetSection, (PVOID)SourceSection, SectionSize); - + /* Check for unitilizated data */ if (Section->SizeOfRawData < Section->Misc.VirtualSize) { - + /* Zero it out */ - memset((PVOID)RaToPa(Section->VirtualAddress + Section->SizeOfRawData), + memset((PVOID)RaToPa(Section->VirtualAddress + Section->SizeOfRawData), 0, Section->Misc.VirtualSize - Section->SizeOfRawData); } } - + /* Get the Relocation Data Directory */ RelocationDDir = &NtHeader->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC]; - + /* Get the Relocation Section Start and End*/ - RelocationDir = (PIMAGE_BASE_RELOCATION)(KERNEL_BASE_PHYS + RelocationDDir->VirtualAddress); + RelocationDir = (PIMAGE_BASE_RELOCATION)(KernelMemory + RelocationDDir->VirtualAddress); RelocationEnd = (PIMAGE_BASE_RELOCATION)((ULONG_PTR)RelocationDir + RelocationDDir->Size); - + /* Calculate Difference between Real Base and Compiled Base*/ - Delta = KernelBase - NtHeader->OptionalHeader.ImageBase;; - + Delta = KernelBase - NtHeader->OptionalHeader.ImageBase; + /* Determine how far we shoudl relocate */ - MaxAddress = KERNEL_BASE_PHYS + ImageSize; - + MaxAddress = (ULONG)KernelMemory + ImageSize; + /* Relocate until we've processed all the blocks */ while (RelocationDir < RelocationEnd && RelocationDir->SizeOfBlock > 0) { - + /* See how many Relocation Blocks we have */ Count = (RelocationDir->SizeOfBlock - sizeof(IMAGE_BASE_RELOCATION)) / sizeof(USHORT); - + /* Calculate the Address of this Directory */ - Address = KERNEL_BASE_PHYS + RelocationDir->VirtualAddress; - + Address = (ULONG)KernelMemory + RelocationDir->VirtualAddress; + /* Calculate the Offset of the Type */ TypeOffset = (PUSHORT)(RelocationDir + 1); - for (i = 0; i < Count; i++) { - + for (i = 0; i < (INT)Count; i++) { + ShortPtr = (PUSHORT)(Address + (*TypeOffset & 0xFFF)); - /* Don't relocate after the end of the loaded driver */ - if ((ULONG_PTR)ShortPtr >= MaxAddress) break; - switch (*TypeOffset >> 12) { - + case IMAGE_REL_BASED_ABSOLUTE: break; @@ -528,65 +386,63 @@ *LongPtr += Delta; break; } - + TypeOffset++; } - + /* Move to the next Relocation Table */ RelocationDir = (PIMAGE_BASE_RELOCATION)((ULONG_PTR)RelocationDir + RelocationDir->SizeOfBlock); } - + /* Increase the next Load Base */ - NextModuleBase = ROUND_UP(KERNEL_BASE_PHYS + ImageSize, PAGE_SIZE); + NextModuleBase = ROUND_UP((ULONG)KernelMemory + ImageSize, PAGE_SIZE); /* Return Success */ -#endif return TRUE; } ULONG_PTR NTAPI -FrLdrLoadModule(FILE *ModuleImage, - LPCSTR ModuleName, +FrLdrLoadModule(FILE *ModuleImage, + LPCSTR ModuleName, PULONG ModuleSize) { -#if 0 ULONG LocalModuleSize; - PFRLDR_MODULE ModuleData; + PLOADER_MODULE ModuleData; LPSTR NameBuffer; LPSTR TempName; /* Get current module data structure and module name string array */ - ModuleData = &multiboot_modules[LoaderBlock.ModsCount]; - + ModuleData = &reactos_modules[LoaderBlock.ModsCount]; + /* Get only the Module Name */ do { - + TempName = strchr(ModuleName, '\\'); - + if(TempName) { ModuleName = TempName + 1; } } while(TempName); - NameBuffer = multiboot_module_strings[LoaderBlock.ModsCount]; + NameBuffer = reactos_module_strings[LoaderBlock.ModsCount]; /* Get Module Size */ LocalModuleSize = FsGetFileSize(ModuleImage); - + /* Fill out Module Data Structure */ - ModuleData->ModuleStart = NextModuleBase; - ModuleData->ModuleEnd = NextModuleBase + LocalModuleSize; - + ModuleData->ModStart = NextModuleBase; + ModuleData->ModEnd = NextModuleBase + LocalModuleSize; + /* Save name */ strcpy(NameBuffer, ModuleName); - ModuleData->ModuleName = NameBuffer; + ModuleData->String = (ULONG_PTR)NameBuffer; /* Load the file image */ FsReadFile(ModuleImage, LocalModuleSize, NULL, (PVOID)NextModuleBase); /* Move to next memory block and increase Module Count */ - NextModuleBase = ROUND_UP(ModuleData->ModuleEnd, PAGE_SIZE); + NextModuleBase = ROUND_UP(ModuleData->ModEnd, PAGE_SIZE); LoaderBlock.ModsCount++; /* Return Module Size if required */ @@ -594,63 +450,55 @@ *ModuleSize = LocalModuleSize; } - return(ModuleData->ModuleStart); -#else - return 0; -#endif + return(ModuleData->ModStart); } ULONG_PTR NTAPI FrLdrCreateModule(LPCSTR ModuleName) { -#if 0 - PFRLDR_MODULE ModuleData; + PLOADER_MODULE ModuleData; LPSTR NameBuffer; /* Get current module data structure and module name string array */ - ModuleData = &multiboot_modules[LoaderBlock.ModsCount]; - NameBuffer = multiboot_module_strings[LoaderBlock.ModsCount]; + ModuleData = &reactos_modules[LoaderBlock.ModsCount]; + NameBuffer = reactos_module_strings[LoaderBlock.ModsCount]; /* Set up the structure */ - ModuleData->ModuleStart = NextModuleBase; - ModuleData->ModuleEnd = -1; - + ModuleData->ModStart = NextModuleBase; + ModuleData->ModEnd = -1; + /* Copy the name */ strcpy(NameBuffer, ModuleName); - ModuleData->ModuleName = NameBuffer; + ModuleData->String = (ULONG_PTR)NameBuffer; /* Set the current Module */ CurrentModule = ModuleData; /* Return Module Base Address */ - return(ModuleData->ModuleStart); -#else - return 0; -#endif + return(ModuleData->ModStart); } BOOLEAN NTAPI -FrLdrCloseModule(ULONG_PTR ModuleBase, +FrLdrCloseModule(ULONG_PTR ModuleBase, ULONG ModuleSize) { -#if 0 - PFRLDR_MODULE ModuleData = CurrentModule; + PLOADER_MODULE ModuleData = CurrentModule; /* Make sure a module is opened */ if (ModuleData) { - + /* Make sure this is the right module and that it hasn't been closed */ - if ((ModuleBase == ModuleData->ModuleStart) && (ModuleData->ModuleEnd == -1)) { - + if ((ModuleBase == ModuleData->ModStart) && (ModuleData->ModEnd == (ULONG_PTR)-1)) { + /* Close the Module */ - ModuleData->ModuleEnd = ModuleData->ModuleStart + ModuleSize; + ModuleData->ModEnd = ModuleData->ModStart + ModuleSize; /* Set the next Module Base and increase the number of modules */ - NextModuleBase = ROUND_UP(ModuleData->ModuleEnd, PAGE_SIZE); + NextModuleBase = ROUND_UP(ModuleData->ModEnd, PAGE_SIZE); LoaderBlock.ModsCount++; - + /* Close the currently opened module */ CurrentModule = NULL; @@ -660,6 +508,5 @@ } /* Failure path */ -#endif return(FALSE); }

18 years, 1 month

[hpoussin] 23834: Clean up console functions in usetup. We now have 2 categories: - The same functions as in Win32 Console API, prefixed with Con - The helpers (which call Con* functions) prefixed with CONSOLE_ Do according changes in other files

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Thu Aug 31 10:14:25 2006 New Revision: 23834 URL: http://svn.reactos.org/svn/reactos?rev=23834&view=rev Log: Clean up console functions in usetup. We now have 2 categories: - The same functions as in Win32 Console API, prefixed with Con - The helpers (which call Con* functions) prefixed with CONSOLE_ Do according changes in other files Modified: trunk/reactos/base/setup/usetup/console.c trunk/reactos/base/setup/usetup/console.h trunk/reactos/base/setup/usetup/format.c trunk/reactos/base/setup/usetup/fslist.c trunk/reactos/base/setup/usetup/genlist.c trunk/reactos/base/setup/usetup/partlist.c trunk/reactos/base/setup/usetup/progress.c trunk/reactos/base/setup/usetup/usetup.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/setup/usetup/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/console.… Modified: trunk/reactos/base/setup/usetup/console.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/console.… Modified: trunk/reactos/base/setup/usetup/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/format.c… Modified: trunk/reactos/base/setup/usetup/fslist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/fslist.c… Modified: trunk/reactos/base/setup/usetup/genlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/genlist.… Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… Modified: trunk/reactos/base/setup/usetup/progress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/progress… Modified: trunk/reactos/base/setup/usetup/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.c…

18 years, 1 month

[ion] 23833: - Don't do fast system calls with the wrong DS/ES selectors. - Properly load DS/ES on system startup and GDT load - Use proper DS/ES during deprecated IRQ handling. - Always use GS as 0 for all of the above. - *FINALLY* fixes the oldest bug there ever was -> DS/ES corruption noticed in VMWare (And recently in QEMU+KERNELKQEMU, since it behaves internally like vmware). Hacks in trap code have FINALLY been removed!

by ion＠svn.reactos.org

Author: ion Date: Thu Aug 31 09:25:58 2006 New Revision: 23833 URL: http://svn.reactos.org/svn/reactos?rev=23833&view=rev Log: - Don't do fast system calls with the wrong DS/ES selectors. - Properly load DS/ES on system startup and GDT load - Use proper DS/ES during deprecated IRQ handling. - Always use GS as 0 for all of the above. - *FINALLY* fixes the oldest bug there ever was -> DS/ES corruption noticed in VMWare (And recently in QEMU+KERNELKQEMU, since it behaves internally like vmware). Hacks in trap code have FINALLY been removed! Modified: trunk/reactos/ntoskrnl/KrnlFun.c trunk/reactos/ntoskrnl/deprecated/irqhand.S trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S trunk/reactos/ntoskrnl/ke/i386/gdt.c trunk/reactos/ntoskrnl/ke/i386/main_asm.S trunk/reactos/ntoskrnl/ke/i386/trap.s Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=238… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (original) +++ trunk/reactos/ntoskrnl/KrnlFun.c Thu Aug 31 09:25:58 2006 @@ -28,8 +28,6 @@ // - Get rid of KiRosPrintAddress and use KiDumpParameterImages instead. // - Sanitize some context fields during conversions. // - Implement stack fault and segment fault handlers. -// - Figure out why ES/DS gets messed up in VMWare, when doing KiServiceExit only, -// and only when called from user-mode, and returning to user-mode. // - Add DR macro/save and VM macro/save. // - Implement KiCallbackReturn, KiGetTickCount, KiRaiseAssertion. // Modified: trunk/reactos/ntoskrnl/deprecated/irqhand.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/deprecated/irqhan… ============================================================================== --- trunk/reactos/ntoskrnl/deprecated/irqhand.S (original) +++ trunk/reactos/ntoskrnl/deprecated/irqhand.S Thu Aug 31 09:25:58 2006 @@ -8,10 +8,20 @@ pushl %fs pushl %gs pushl $0xceafbeef - movl $KGDT_R0_DATA,%eax - movl %eax,%ds - movl %eax,%es - movl %eax,%gs + + /* Load DS/ES (with override) */ + .intel_syntax noprefix + mov eax, KGDT_R3_DATA + RPL_MASK + .byte 0x66 + mov ds, ax + .byte 0x66 + mov es, ax + + /* Clear gs */ + xor eax, eax + .byte 0x66 + mov gs, ax + .att_syntax movl $KGDT_R0_PCR,%eax movl %eax,%fs pushl %esp Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/ctxswitch… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S (original) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S Thu Aug 31 09:25:58 2006 @@ -291,7 +291,7 @@ @KiSwapContextInternal@0: /* Set the Thread to running */ - mov byte ptr [esi+KTHREAD_STATE], Running + mov byte ptr es:[esi+KTHREAD_STATE], Running /* Save the IRQL */ push ecx Modified: trunk/reactos/ntoskrnl/ke/i386/gdt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/gdt.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/gdt.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/gdt.c Thu Aug 31 09:25:58 2006 @@ -115,9 +115,10 @@ __asm__ ("movl %0, %%ds\n\t" "movl %0, %%es\n\t" "movl %1, %%fs\n\t" - "movl %0, %%gs\n\t" + "xor %%ax, %%ax\n\t" + "movw %%ax, %%gs\n\t" : /* no output */ - : "a" (KGDT_R0_DATA), "d" (KGDT_R0_PCR)); + : "a" (KGDT_R3_DATA | RPL_MASK), "d" (KGDT_R0_PCR)); __asm__ ("pushl %0\n\t" "pushl $.l4\n\t" "lret\n\t" @@ -128,11 +129,12 @@ __asm { lgdt Descriptor; - mov ax, KGDT_R0_DATA; + mov ax, KGDT_R3_DATA | RPL_MASK; mov dx, KGDT_R0_PCR; mov ds, ax; mov es, ax; mov fs, dx; + xor ax, ax mov gs, ax; push KGDT_R0_CODE; push offset l4 ; Modified: trunk/reactos/ntoskrnl/ke/i386/main_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/main_asm.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/main_asm.S (original) +++ trunk/reactos/ntoskrnl/ke/i386/main_asm.S Thu Aug 31 09:25:58 2006 @@ -39,7 +39,16 @@ /* Load the PCR selector */ movl $KGDT_R0_PCR, %eax movl %eax, %fs - + + /* Load DS/ES (with override) */ + .intel_syntax noprefix + mov eax, KGDT_R3_DATA + RPL_MASK + .byte 0x66 + mov ds, ax + .byte 0x66 + mov es, ax + .att_syntax + cmpl $AP_MAGIC, %ecx jne .m1 Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s Thu Aug 31 09:25:58 2006 @@ -111,8 +111,8 @@ mov ecx, KGDT_R0_PCR mov fs, cx - /* Set DS/ES to Kernel Selector */ - mov ecx, KGDT_R0_DATA + /* Set DS/ES to User Selector */ + mov ecx, KGDT_R3_DATA | RPL_MASK mov ds, cx mov es, cx @@ -157,10 +157,6 @@ /* Skip the other registers */ sub esp, 0x48 - - /* Hack: it seems that on VMWare someone damages ES/DS on exit. Investigate! */ - mov dword ptr [esp+KTRAP_FRAME_DS], KGDT_R3_DATA + RPL_MASK - mov dword ptr [esp+KTRAP_FRAME_ES], KGDT_R3_DATA + RPL_MASK /* Make space for us on the stack */ sub ebp, 0x29C @@ -335,10 +331,6 @@ /* Check for, and deliver, User-Mode APCs if needed */ CHECK_FOR_APC_DELIVER 1 - /* Hack for VMWare: Sometimes ES/DS seem to be invalid when returning to user-mode. Investigate! */ - mov es, [ebp+KTRAP_FRAME_ES] - mov ds, [ebp+KTRAP_FRAME_DS] - /* Exit and cleanup */ TRAP_EPILOG FromSystemCall, DoRestorePreviousMode, DoNotRestoreSegments, DoNotRestoreVolatiles, DoRestoreEverything .endfunc

18 years, 1 month

[ion] 23832: - Implement more parts of the GPF Handler. - Add support for lazy loading. - QEMU + -kernel-qemu seems to work now. - Hack away the Win32k bug that's been there for ages (copy to user-mode from kernel-mode failing due to probe due to incorrect previous mode). It's not the right fix, but nobody seems to be willing to fix it, and it doesn't make anything less stable, sicne the actually copy is in SEH anyway. It opens a security vuln. (wow, not like we have 15000) in exchange for fixin

by ion＠svn.reactos.org

Author: ion Date: Thu Aug 31 08:10:33 2006 New Revision: 23832 URL: http://svn.reactos.org/svn/reactos?rev=23832&view=rev Log: - Implement more parts of the GPF Handler. - Add support for lazy loading. - QEMU + -kernel-qemu seems to work now. - Hack away the Win32k bug that's been there for ages (copy to user-mode from kernel-mode failing due to probe due to incorrect previous mode). It's not the right fix, but nobody seems to be willing to fix it, and it doesn't make anything less stable, sicne the actually copy is in SEH anyway. It opens a security vuln. (wow, not like we have 15000) in exchange for fixing dozens of win32k bugs and failures. Removed: trunk/reactos/lib/rtl/i386/zeromemory_asm.s Modified: trunk/reactos/ntoskrnl/KrnlFun.c trunk/reactos/ntoskrnl/ke/i386/trap.s trunk/reactos/subsystems/win32/win32k/misc/copy.c Removed: trunk/reactos/lib/rtl/i386/zeromemory_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/zeromemory_as… ============================================================================== --- trunk/reactos/lib/rtl/i386/zeromemory_asm.s (original) +++ trunk/reactos/lib/rtl/i386/zeromemory_asm.s (removed) @@ -1,61 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: zeromemory_asm.S - * PURPOSE: Memory functions - * PROGRAMMERS: Patrick Baggett (baggett.patrick(a)gmail.com) - * Alex Ionescu (alex(a)relsoft.net) - * Magnus Olsen (magnusolsen(a)greatlord.com) - */ - -.intel_syntax noprefix - -/* GLOBALS ****************************************************************/ - -.globl _RtlZeroMemory@8 // (no bug) (max optimze code) - -/* FUNCTIONS ***************************************************************/ - -_RtlZeroMemory@8: - mov ecx,dword [esp + 8 ] // Length - cmp ecx,0// if (Length==0) goto .zero - je 3f - - pushad // Save all register on the stack - mov edi, dword [esp + (4 + 32)] // Destination - xor eax,eax // ZeroFillByte = 0 - -// code for take four byte each time it loop - mov ebx,ecx // temp_Length = Length - shr ecx,2// Length = Length / sizeof(ULONG) - jz 1f // if (Length==0) goto .1byte - - shl ecx,2// Length = Length * sizeof(ULONG) - sub ebx,ecx // temp_Length = temp_Length - Length// - jz 2f // if (temp_Length==0) goto .4byte - -// move 4byte and 1byte - shr ecx,2// Length = Length / sizeof(ULONG) - cld // clear d flag - rep stosd// while (Length!=0) { (ULONG *) Destination[Length-1]=ZeroFillByte// Legnth = Legnth - 1 } - mov ecx,ebx // Length = temp_Length - rep stosb// while (Length!=0) { (UCHAR *) Destination[Length-1]=ZeroFillByte// Legnth = Legnth - 1 } - popad // restore register - ret 8 // return - -// move 1byte -1: - mov ecx,dword [esp + (12 +32) ] // Length - cld // clear d flag - rep stosb// while (Length!=0) { (UCHAR *) Destination[Length-1]=ZeroFillByte// Legnth = Legnth - 1 } - popad // restore register - ret 8 // return - -// move 4bytes -2: - shr ecx,2// Length = Length / sizeof(ULONG) - cld // clear d flag - rep stosd// while (Length!=0) { (ULONG *) Destination[Length-1]=ZeroFillByte// Legnth = Legnth - 1 } - popad // restore register -3: - ret 8 // return Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=238… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (original) +++ trunk/reactos/ntoskrnl/KrnlFun.c Thu Aug 31 08:10:33 2006 @@ -28,7 +28,6 @@ // - Get rid of KiRosPrintAddress and use KiDumpParameterImages instead. // - Sanitize some context fields during conversions. // - Implement stack fault and segment fault handlers. -// - Implement kernel-mode GPF handler, possibly fixing below: // - Figure out why ES/DS gets messed up in VMWare, when doing KiServiceExit only, // and only when called from user-mode, and returning to user-mode. // - Add DR macro/save and VM macro/save. Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s Thu Aug 31 08:10:33 2006 @@ -1215,7 +1215,6 @@ /* Otherwise, something is very wrong, raise an exception */ sti - jmp $ mov ebx, [ebp+KTRAP_FRAME_EIP] mov esi, -1 mov eax, STATUS_ACCESS_VIOLATION @@ -1329,21 +1328,77 @@ test dword ptr [edx+4], RPL_MASK jz UserModeGpf - /* FIXME: Handle IRET back to user-mode */ + /* Setup trap frame to copy */ + mov ecx, (KTRAP_FRAME_LENGTH - 12) / 4 + lea edx, [ebp+KTRAP_FRAME_ERROR_CODE] + +TrapCopy: + + /* Copy each field */ + mov eax, [edx] + mov [edx+12], eax + sub edx, 4 + loop TrapCopy + + /* Enable interrupts and adjust stack */ + sti + add esp, 12 + add ebp, 12 + + /* Setup exception record */ + mov ebx, [ebp+KTRAP_FRAME_EIP] + mov esi, [ebp+KTRAP_FRAME_ERROR_CODE] + and esi, 0xFFFF + mov eax, STATUS_ACCESS_VIOLATION + jmp _DispatchTwoParam + +MsrCheck: + + /* FIXME: Handle RDMSR/WRMSR */ int 3 jmp $ NotIretGpf: - /* FIXME: Handle RDMSR/WRMSR and lazy load */ + /* Check if this was an MSR opcode */ + cmp al, 0xF + jz MsrCheck + + /* Check if DS is Ring 3 */ + cmp word ptr [ebp+KTRAP_FRAME_DS], KGDT_R3_DATA + RPL_MASK + jz CheckEs + + /* Otherwise, fix it up */ + mov dword ptr [ebp+KTRAP_FRAME_DS], KGDT_R3_DATA + RPL_MASK + jmp ExitGpfTrap + +CheckEs: + + /* Check if ES is Ring 3 */ + cmp word ptr [ebp+KTRAP_FRAME_ES], KGDT_R3_DATA + RPL_MASK + jz UserModeGpf + + /* Otherwise, fix it up */ + mov dword ptr [ebp+KTRAP_FRAME_ES], KGDT_R3_DATA + RPL_MASK + jmp ExitGpfTrap + +SegPopGpf: + + /* Sanity check */ + lea eax, [ebp+KTRAP_FRAME_ESP] + cmp edx, eax + jz HandleSegPop int 3 - jmp $ - -SegPopGpf: - - /* Handle segment POP fault */ - int 3 - jmp $ + + /* Handle segment POP fault by setting it to 0 */ +HandleSegPop: + xor eax, eax + mov dword ptr [edx], eax + +ExitGpfTrap: + + /* Do a trap exit */ + TRAP_EPILOG NotFromSystemCall, DoNotRestorePreviousMode, DoNotRestoreSegments, DoRestoreVolatiles, DoRestoreEverything UserModeGpf: Modified: trunk/reactos/subsystems/win32/win32k/misc/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/mi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/misc/copy.c (original) +++ trunk/reactos/subsystems/win32/win32k/misc/copy.c Thu Aug 31 08:10:33 2006 @@ -4,7 +4,7 @@ NTSTATUS Status = STATUS_SUCCESS; _SEH_TRY { - ProbeForRead(Source,Bytes,1); + //ProbeForRead(Source,Bytes,1); RtlCopyMemory(Target,Source,Bytes); } _SEH_HANDLE { Status = _SEH_GetExceptionCode(); @@ -17,7 +17,7 @@ NTSTATUS Status = STATUS_SUCCESS; _SEH_TRY { - ProbeForWrite(Target,Bytes,1); + //ProbeForWrite(Target,Bytes,1); RtlCopyMemory(Target,Source,Bytes); } _SEH_HANDLE { Status = _SEH_GetExceptionCode();

18 years, 1 month

[pborobia] 23831: Testing commit

by pborobia＠svn.reactos.org

Author: pborobia Date: Thu Aug 31 07:12:14 2006 New Revision: 23831 URL: http://svn.reactos.org/svn/reactos?rev=23831&view=rev Log: Testing commit Modified: trunk/reactos/CREDITS Modified: trunk/reactos/CREDITS URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CREDITS?rev=23831&r1=23830… ============================================================================== --- trunk/reactos/CREDITS (original) +++ trunk/reactos/CREDITS Thu Aug 31 07:12:14 2006 @@ -46,6 +46,7 @@ Matt Pyne Mike Nordell ("tamlin") Nathan Woods <npwoods(a)mess.org> +Pablo Borobia <pborobia(a)gmail.com> Paolo Pantaleo <paolopan(a)freemail.it> Phillip Susi <phreak(a)iag.net> Rex Jolliff <rex(a)lvcablemodem.com>

18 years, 1 month

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 August 2006