Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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 31 Aug '06

31 Aug '06

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>

1 0

[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 31 Aug '06

31 Aug '06

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); }

1 0

[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 31 Aug '06

31 Aug '06

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…

1 0

[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 31 Aug '06

31 Aug '06

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

1 0

[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 31 Aug '06

31 Aug '06

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();

1 0

[pborobia] 23831: Testing commit
by pborobia＠svn.reactos.org 31 Aug '06

31 Aug '06

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>

1 0

[ion] 23830: - Write new, optimized, small, working and clean functions (fixes booting, last few commits broke it for me): - RtlCompareMemory - RtlCompareMemoryUlong - RtlFillMemory - RtlFillMemoryUlong - RtlFillMemoryUlongUlong - RtlMoveMemory - RtlZeroMemory - RtlPrefetchMemoryNonTemporal - RtlUshortByteSwap - RtlUlongByteSwap - RtlUlonglongByteSwap
by ion＠svn.reactos.org 31 Aug '06

31 Aug '06

Author: ion Date: Thu Aug 31 05:20:55 2006 New Revision: 23830 URL: http://svn.reactos.org/svn/reactos?rev=23830&view=rev Log: - Write new, optimized, small, working and clean functions (fixes booting, last few commits broke it for me): - RtlCompareMemory - RtlCompareMemoryUlong - RtlFillMemory - RtlFillMemoryUlong - RtlFillMemoryUlongUlong - RtlMoveMemory - RtlZeroMemory - RtlPrefetchMemoryNonTemporal - RtlUshortByteSwap - RtlUlongByteSwap - RtlUlonglongByteSwap Added: trunk/reactos/lib/rtl/i386/rtlmem.s trunk/reactos/lib/rtl/i386/rtlswap.S Removed: trunk/reactos/lib/rtl/i386/comparememory_asm.s trunk/reactos/lib/rtl/i386/comparememory_ulong_asm.s trunk/reactos/lib/rtl/i386/fillmemory_asm.s trunk/reactos/lib/rtl/i386/fillmemory_ulong_asm.s trunk/reactos/lib/rtl/i386/memgeni386.c trunk/reactos/lib/rtl/i386/prefetchmemory_asm.s trunk/reactos/lib/rtl/i386/rtlulongbyteswap.s trunk/reactos/lib/rtl/i386/rtlulonglongbyteswap.s trunk/reactos/lib/rtl/i386/rtlushortbyteswap.s trunk/reactos/lib/rtl/mem.c trunk/reactos/lib/rtl/memgen.c Modified: trunk/reactos/lib/rtl/rtl.rbuild Removed: trunk/reactos/lib/rtl/i386/comparememory_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/comparememory… ============================================================================== --- trunk/reactos/lib/rtl/i386/comparememory_asm.s (original) +++ trunk/reactos/lib/rtl/i386/comparememory_asm.s (removed) @@ -1,44 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: comparememory_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 _RtlCompareMemory@12 // [4] (no bug) - -/* FUNCTIONS ***************************************************************/ - -_RtlCompareMemory@12: - xor eax,eax // count = 0 - mov ecx, dword [esp + 12 ] // ecx = Length - cmp ecx,0 // if (Length==0) goto .zero - je 3f - - push edi// register that does not to be save eax,ecx,edx to - push ebx// the stack for protetion - - mov edi, dword [esp + (4 + 8)] // edi = Destination - mov edx, dword [esp + (8 + 8)] // edx = Source - -1: - mov bl,byte [edi + eax ] // if (src[count]!=des[count]) goto .pop_zero - cmp byte [edx + eax ],bl - jne 2f - - inc eax // count = count + 1 - dec ecx // Length = Length - 1 - jnz 1b // if (Length!=0) goto .loop_1byte - -2: - pop ebx // restore regiester - pop edi -3: - ret 12 // return count Removed: trunk/reactos/lib/rtl/i386/comparememory_ulong_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/comparememory… ============================================================================== --- trunk/reactos/lib/rtl/i386/comparememory_ulong_asm.s (original) +++ trunk/reactos/lib/rtl/i386/comparememory_ulong_asm.s (removed) @@ -1,44 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: comparememory_ulong_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 _RtlCompareMemoryUlong@12 // [5] (no bug) - -/* FUNCTIONS ***************************************************************/ - -_RtlCompareMemoryUlong@12: - xor eax,eax - mov ecx, dword [esp + 8 ] // ecx = Length - shr ecx,2 // Length / sizeof(ULONG) - jz 1f // if (Length==0) goto .zero - - push edi// register that does not to be save eax,ecx,edx to - push ebx// the stack for protetion - - mov edi, dword [esp + (4 + 8)] // edx = Destination - mov eax, dword [esp + (12 + 8)] // ebx = value - mov ebx,ecx - cld - repe scasd - - inc ecx - mov eax,ebx - - sub eax,ecx - shl eax,2 - - pop ebx - pop edi - -1: - ret 12 Removed: trunk/reactos/lib/rtl/i386/fillmemory_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/fillmemory_as… ============================================================================== --- trunk/reactos/lib/rtl/i386/fillmemory_asm.s (original) +++ trunk/reactos/lib/rtl/i386/fillmemory_asm.s (removed) @@ -1,31 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: fillmemory_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 _RtlFillMemory@12 //[4] (no bug) - -/* FUNCTIONS ***************************************************************/ - -_RtlFillMemory@12: - mov ecx,dword [esp + 8 ] // ecx = Length - cmp ecx,0// if (Length==0) goto .zero - je 2f - - mov edx, dword [esp + 4] // edx = Destination - mov eax, dword [esp + 12] // eax = fill -1: - mov byte [edx + ecx -1],al // src[Length - 1] = fill - dec ecx // Length = Length - 1 - jnz 1b // if (Length!=0) goto .loop -2: - ret 12 // return Removed: trunk/reactos/lib/rtl/i386/fillmemory_ulong_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/fillmemory_ul… ============================================================================== --- trunk/reactos/lib/rtl/i386/fillmemory_ulong_asm.s (original) +++ trunk/reactos/lib/rtl/i386/fillmemory_ulong_asm.s (removed) @@ -1,31 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: fillmemory_ulong_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 _RtlFillMemoryUlong@12 // (no bug) (max optimze code) - -/* FUNCTIONS ***************************************************************/ - -_RtlFillMemoryUlong@12: - mov ecx, dword [esp + 8 ] // Length - shr ecx,2// Length = Length / sizeof(ULONG) - jz 1f // if (Length==0) goto .zero - - push edi - mov edi, dword [esp + (4 + 4)] // Destination - mov eax, dword [esp + (12 + 4)] // Fill - cld - rep stosd// while (Length>0) {Destination[Length-1]=Fill// Length = Length - 1} - pop edi -1: - ret 12 Removed: trunk/reactos/lib/rtl/i386/memgeni386.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/memgeni386.c?… ============================================================================== --- trunk/reactos/lib/rtl/i386/memgeni386.c (original) +++ trunk/reactos/lib/rtl/i386/memgeni386.c (removed) @@ -1,75 +1,0 @@ -/* COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: lib/rtl/mem.c - * PURPOSE: Memory functions - * PROGRAMMER: David Welch (welch(a)mcmail.com) - */ - -/* INCLUDES *****************************************************************/ - -#include <rtl.h> - -#define NDEBUG -#include <debug.h> - -#undef RtlUlonglongByteSwap -#undef RtlUlongByteSwap -#undef RtlUshortByteSwap - -USHORT UshortByteSwap (IN USHORT Source); -ULONG UlongByteSwap (IN ULONG Source); -ULONGLONG UlonglongByteSwap (IN ULONGLONG Source); - -/************************************************************************* - * RtlUshortByteSwap - * - * Swap the bytes of an unsigned short value. - * - * - * @implemented - */ -USHORT FASTCALL -RtlUshortByteSwap (IN USHORT Source) -{ - return UshortByteSwap (Source); -} - - - -/************************************************************************* - * RtlUlongByteSwap [NTDLL.@] - * - * Swap the bytes of an unsigned int value. - * - * - * @implemented - */ -ULONG -FASTCALL -RtlUlongByteSwap( - IN ULONG Source -) -{ - return UlongByteSwap(Source); -} - - -/************************************************************************* - * RtlUlonglongByteSwap - * - * Swap the bytes of an unsigned long long value. - * - * PARAMS - * i [I] Value to swap bytes of - * - * - * @implemented - */ -ULONGLONG FASTCALL -RtlUlonglongByteSwap (IN ULONGLONG Source) -{ - return UlonglongByteSwap(Source); -} - - -/* EOF */ Removed: trunk/reactos/lib/rtl/i386/prefetchmemory_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/prefetchmemor… ============================================================================== --- trunk/reactos/lib/rtl/i386/prefetchmemory_asm.s (original) +++ trunk/reactos/lib/rtl/i386/prefetchmemory_asm.s (removed) @@ -1,30 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: prefetchmemory_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 @RtlPrefetchMemoryNonTemporal@8 - -/* FUNCTIONS ***************************************************************/ - -@RtlPrefetchMemoryNonTemporal@8: - ret /* Overwritten by ntoskrnl/ke/i386/kernel.c if SSE is supported (see Ki386SetProcessorFeatures() ) */ - - mov eax, [_Ke386CacheAlignment] // Get cache line size - - // This is fastcall, so ecx = address, edx = size -fetch_next_line: - prefetchnta byte ptr [ecx] // prefechnta(address) - add ecx, eax // address = address + cache_line_size - sub edx, eax // count = count - cache_line_size - ja fetch_next_line // goto fetch_next_line - ret Added: trunk/reactos/lib/rtl/i386/rtlmem.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/rtlmem.s?rev=… ============================================================================== --- trunk/reactos/lib/rtl/i386/rtlmem.s (added) +++ trunk/reactos/lib/rtl/i386/rtlmem.s Thu Aug 31 05:20:55 2006 @@ -1,0 +1,312 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Run-Time Library + * PURPOSE: Memory functions + * FILE: lib/rtl/i386/rtlswap.S + * PROGRAMER: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +.intel_syntax noprefix + +/* GLOBALS *******************************************************************/ + +.globl _RtlCompareMemory@12 +.globl _RtlCompareMemoryUlong@12 +.globl _RtlFillMemory@12 +.globl _RtlFillMemoryUlong@12 +.globl _RtlMoveMemory@12 +.globl _RtlZeroMemory@8 +.globl @RtlPrefetchMemoryNonTemporal@8 + +/* FUNCTIONS *****************************************************************/ + +.func RtlCompareMemory@12 +_RtlCompareMemory@12: + + /* Save volatiles */ + push esi + push edi + + /* Clear direction flag and load pointers and size in ULONGs */ + cld + mov esi, [esp+12] + mov edi, [esp+16] + mov ecx, [esp+20] + shr ecx, 2 + jz NoUlongs + + /* Compare the ULONGs */ + repe cmpsd + jnz NotEqual + +NoUlongs: + + /* Compare what's left */ + mov ecx, [esp+20] + and ecx, 3 + jz NoneLeft + repe cmpsb + jnz NotEqual2 + +NoneLeft: + + /* We're done, return full count */ + mov eax, [esp+20] + pop edi + pop esi + ret 12 + +NotEqual: + /* Compare the last ULONG */ + sub esi, 4 + sub edi, 4 + mov ecx, 5 + repe cmpsb + +NotEqual2: + + /* Remember how many mathced */ + dec esi + sub esi, [esp+20] + + /* Return count */ + mov eax, esi + pop edi + pop esi + ret 12 +.endfunc + +.func RtlCompareMemoryUlong@12 +_RtlCompareMemoryUlong@12: + + /* Get pointers and size in ULONGs */ + push edi + mov edi, [esp+8] + mov ecx, [esp+12] + mov eax, [esp+16] + shr ecx, 2 + + /* Do the compare and check result */ + repe scasd + jz Done + sub esi, 4 + + /* Return count */ +Done: + sub edi, [esp+8] + mov eax, edi + pop edi + ret 12 +.endfunc + +.func RtlFillMemory@12 +_RtlFillMemory@12: + + /* Get pointers and size */ + push edi + mov edi, [esp+8] + mov ecx, [esp+12] + + /* Get pattern */ + mov al, [esp+16] + mov ah, al + shr eax, 16 + mov al, [esp+16] + mov ah, al + + /* Clear direction flag and set ULONG size and UCHAR remainder */ + cld + mov edx, ecx + and edx, 3 + shr ecx, 2 + + /* Do the fill */ + rep stosd + or ecx, ecx + jnz ByteFill + + /* Return */ + pop edi + ret 12 + +ByteFill: + /* Fill what's left */ + rep stosb + pop edi + ret 12 +.endfunc + +.func RtlFillMemoryUlong@12 +_RtlFillMemoryUlong@12: + + /* Get pointer, size and pattern */ + push edi + mov edi, [esp+8] + mov ecx, [esp+12] + mov eax, [esp+16] + shr ecx, 2 + + /* Do the fill and return */ + rep stosd + pop edi + ret 12 +.endfunc + +.func RtlFillMemoryUlonglong@16 +_RtlFillMemoryUlonglong@16: + + /* Save volatiles */ + push edi + push esi + + /* Get pointer, size and pattern */ + mov ecx, [esp+16] + mov esi, [esp+12] + mov eax, [esp+20] + shr ecx, 2 + sub ecx, 2 + + /* Save the first part */ + mov [esi], eax + + /* Read second part */ + mov eax, [esp+24] + lea edi, [esi+8] + mov [esi+4], eax + + /* Do the fill and return */ + rep movsd + pop esi + pop edi + ret 16 +.endfunc + +.func RtlZeroMemory@8 +_RtlZeroMemory@8: + + /* Get pointers and size */ + push edi + mov edi, [esp+8] + mov ecx, [esp+12] + + /* Get pattern */ + xor eax, eax + + /* Clear direction flag and set ULONG size and UCHAR remainder */ + cld + mov edx, ecx + and edx, 3 + shr ecx, 2 + + /* Do the fill */ + rep stosd + or ecx, ecx + jnz ByteZero + + /* Return */ + pop edi + ret 8 + +ByteZero: + /* Fill what's left */ + rep stosb + pop edi + ret 8 +.endfunc + +.func RtlMoveMemory@12 +_RtlMoveMemory@12: + + /* Save volatiles */ + push esi + push edi + + /* Get pointers and size */ + mov esi, [esp+16] + mov edi, [esp+12] + mov ecx, [esp+20] + cld + + /* Check for overlap */ + cmp esi, edi + jbe Overlap + + /* Set ULONG size and UCHAR remainder */ +DoMove: + mov edx, ecx + and edx, 3 + shr ecx, 2 + + /* Do the move */ + rep movsd + or ecx, ecx + jnz ByteMove + + /* Return */ + pop edi + pop esi + ret 12 + +ByteMove: + /* Move what's left */ + rep stosb + +DoneMove: + pop edi + pop esi + ret 12 + +Overlap: + /* Avoid full overlap */ + jz DoneMove + + /* Remove overlap */ + mov eax, edi + sub eax, esi + cmp ecx, eax + jbe DoMove + + /* Set direction flag for backward move */ + std + + /* Can only move some bytes, calculate how many */ + add esi, ecx + add edi, ecx + dec esi + dec edi + + /* Do the move, reset flag and return */ + rep movsb + cld + jmp DoneMove +.endfunc + +.func @RtlPrefetchMemoryNonTemporal@8, @RtlPrefetchMemoryNonTemporal@8 +@RtlPrefetchMemoryNonTemporal@8: + + /* + * Overwritten by ntoskrnl/ke/i386/kernel.c if SSE is supported + * (see Ki386SetProcessorFeatures()) + */ + ret + + /* Get granularity */ + mov eax, [_Ke386CacheAlignment] + +FetchLine: + + /* Prefetch this line */ + prefetchnta byte ptr [ecx] + + /* Update address and count */ + add ecx, eax + sub edx, eax + + /* Keep looping for the next line, or return if done */ + ja FetchLine + ret +.endfunc + +/* FIXME: HACK */ +_Ke386CacheAlignment: + .long 0x40 Added: trunk/reactos/lib/rtl/i386/rtlswap.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/rtlswap.S?rev… ============================================================================== --- trunk/reactos/lib/rtl/i386/rtlswap.S (added) +++ trunk/reactos/lib/rtl/i386/rtlswap.S Thu Aug 31 05:20:55 2006 @@ -1,0 +1,53 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Run-Time Library + * PURPOSE: Byte swap functions + * FILE: lib/rtl/i386/rtlswap.S + * PROGRAMER: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +.intel_syntax noprefix + +.globl @RtlUshortByteSwap@4 +.globl @RtlUlongByteSwap@4 +.globl @RtlUlonglongByteSwap@8 + +/* FUNCTIONS ***************************************************************/ + +.func @RtlUshortByteSwap@4, @RtlUshortByteSwap@4 +@RtlUshortByteSwap@4: + + /* Swap high and low bits */ + mov ah, cl + mov al, ch + ret +.endfunc + +.func @RtlUlongByteSwap@4, @RtlUlongByteSwap@4 +@RtlUlongByteSwap@4: + + /* Swap high and low bits */ + mov eax, ecx + bswap eax + ret +.endfunc + +.func @RtlUlonglongByteSwap@8, @RtlUlonglongByteSwap@8 +@RtlUlonglongByteSwap@8: + + /* Get 64-bit integer */ + mov edx, [esp+8] + mov eax, [esp+4] + + /* Swap it */ + bswap edx + bswap eax + + /* Return it */ + mov ecx, eax + mov eax, edx + mov edx, ecx + ret +.endfunc + + Removed: trunk/reactos/lib/rtl/i386/rtlulongbyteswap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/rtlulongbytes… ============================================================================== --- trunk/reactos/lib/rtl/i386/rtlulongbyteswap.s (original) +++ trunk/reactos/lib/rtl/i386/rtlulongbyteswap.s (removed) @@ -1,21 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Run-Time Library - * FILE: lib/rtl/i386/RtlUlongByteSwap.S - * PROGRAMER: Magnus Olsen (magnus(a)greatlord.com) - */ - -.globl _UlongByteSwap - -.intel_syntax noprefix - -/* FUNCTIONS ***************************************************************/ - -_UlongByteSwap: - push ebp // save base - mov ebp,esp // move stack to base - mov eax,[ebp+8] // load the ULONG - bswap eax // swap the ULONG - pop ebp // restore the base - ret Removed: trunk/reactos/lib/rtl/i386/rtlulonglongbyteswap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/rtlulonglongb… ============================================================================== --- trunk/reactos/lib/rtl/i386/rtlulonglongbyteswap.s (original) +++ trunk/reactos/lib/rtl/i386/rtlulonglongbyteswap.s (removed) @@ -1,23 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Run-Time Library - * FILE: lib/rtl/i386/RtlUlonglongByteSwap.S - * PROGRAMER: Magnus Olsen (magnus(a)greatlord.com) - */ - -.globl _UlonglongByteSwap - -.intel_syntax noprefix - -/* FUNCTIONS ***************************************************************/ - -_UlonglongByteSwap: - push ebp // save base - mov ebp,esp // move stack to base - mov edx,[ebp+8] // load the higher part of ULONGLONG - mov eax,[ebp+12] // load the lower part of ULONGLONG - bswap edx // swap the higher part - bswap eax // swap the lower part - pop ebp // restore the base - ret Removed: trunk/reactos/lib/rtl/i386/rtlushortbyteswap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/rtlushortbyte… ============================================================================== --- trunk/reactos/lib/rtl/i386/rtlushortbyteswap.s (original) +++ trunk/reactos/lib/rtl/i386/rtlushortbyteswap.s (removed) @@ -1,22 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Run-Time Library - * FILE: lib/rtl/i386/RtlUlongByteSwap.S - * PROGRAMER: Magnus Olsen (magnus(a)greatlord.com) - */ - -.globl _UshortByteSwap - -.intel_syntax noprefix - -/* FUNCTIONS ***************************************************************/ - -_UshortByteSwap: - push ebp // save base - mov ebp,esp // move stack to base - mov eax,[ebp+8] // load the USHORT - bswap eax // swap the USHORT, xchg is slow so we use bswap with rol - rol eax,16 // make it USHORT - pop ebp // restore the base - ret Removed: trunk/reactos/lib/rtl/mem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/mem.c?rev=23829&vi… ============================================================================== --- trunk/reactos/lib/rtl/mem.c (original) +++ trunk/reactos/lib/rtl/mem.c (removed) @@ -1,173 +1,0 @@ -/* COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: lib/rtl/mem.c - * PURPOSE: Memory functions - * PROGRAMMER: David Welch (welch(a)mcmail.com) - */ - -/* INCLUDES *****************************************************************/ - -#include <rtl.h> - -#define NDEBUG -#include <debug.h> - - -/* FUNCTIONS *****************************************************************/ - -/****************************************************************************** - * RtlCompareMemory [NTDLL.@] - * - * Compare one block of memory with another - * - * PARAMS - * Source1 [I] Source block - * Source2 [I] Block to compare to Source1 - * Length [I] Number of bytes to fill - * - * RETURNS - * The length of the first byte at which Source1 and Source2 differ, or Length - * if they are the same. - * - * @implemented - */ -SIZE_T NTAPI -RtlCompareMemory(IN const VOID *Source1, - IN const VOID *Source2, - IN SIZE_T Length) -{ - SIZE_T i; - for(i=0; (i<Length) && (((PUCHAR)Source1)[i]==((PUCHAR)Source2)[i]); i++) - ; - return i; -} - - -/* - * @implemented - */ -ULONG -NTAPI -RtlCompareMemoryUlong ( - PVOID Source, - ULONG Length, - ULONG Value -) -/* - * FUNCTION: Compares a block of ULONGs with an ULONG and returns the number of equal bytes - * ARGUMENTS: - * Source = Block to compare - * Length = Number of bytes to compare - * Value = Value to compare - * RETURNS: Number of equal bytes - */ -{ - PULONG ptr = (PULONG)Source; - ULONG len = Length / sizeof(ULONG); - ULONG i; - - for (i = 0; i < len; i++) - { - if (*ptr != Value) - break; - ptr++; - } - - return (ULONG)((PCHAR)ptr - (PCHAR)Source); -} - - -#undef RtlFillMemory -/* - * @implemented - */ -VOID -NTAPI -RtlFillMemory ( - PVOID Destination, - ULONG Length, - UCHAR Fill -) -{ - memset(Destination, Fill, Length); -} - - - -/* - * @implemented - */ -VOID -NTAPI -RtlFillMemoryUlong ( - PVOID Destination, - ULONG Length, - ULONG Fill -) -{ - PULONG Dest = Destination; - ULONG Count = Length / sizeof(ULONG); - - while (Count > 0) - { - *Dest = Fill; - Dest++; - Count--; - } -} - - -#undef RtlMoveMemory -/* - * @implemented - */ -VOID -NTAPI -RtlMoveMemory ( - PVOID Destination, - CONST VOID * Source, - ULONG Length -) -{ - memmove ( - Destination, - Source, - Length - ); -} - -/* -* @implemented -*/ -VOID -FASTCALL -RtlPrefetchMemoryNonTemporal( - IN PVOID Source, - IN SIZE_T Length - ) -{ - /* By nature of prefetch, this is non-portable. */ - (void)Source; - (void)Length; -} - - -#undef RtlZeroMemory -/* - * @implemented - */ -VOID -NTAPI -RtlZeroMemory ( - PVOID Destination, - ULONG Length -) -{ - RtlFillMemory ( - Destination, - Length, - 0 - ); -} - -/* EOF */ Removed: trunk/reactos/lib/rtl/memgen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/memgen.c?rev=23829… ============================================================================== --- trunk/reactos/lib/rtl/memgen.c (original) +++ trunk/reactos/lib/rtl/memgen.c (removed) @@ -1,77 +1,0 @@ -/* COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: lib/rtl/mem.c - * PURPOSE: Memory functions - * PROGRAMMER: David Welch (welch(a)mcmail.com) - */ - -/* INCLUDES *****************************************************************/ - -#include <rtl.h> - -#define NDEBUG -#include <debug.h> - -#undef RtlUlonglongByteSwap -#undef RtlUlongByteSwap -#undef RtlUshortByteSwap - -/************************************************************************* - * RtlUshortByteSwap - * - * Swap the bytes of an unsigned short value. - * - * NOTES - * Based on the inline versions in Wine winternl.h - * - * @implemented - */ -USHORT FASTCALL -RtlUshortByteSwap (IN USHORT Source) -{ - return (Source >> 8) | (Source << 8); -} - - - -/************************************************************************* - * RtlUlongByteSwap [NTDLL.@] - * - * Swap the bytes of an unsigned int value. - * - * NOTES - * Based on the inline versions in Wine winternl.h - * - * @implemented - */ -ULONG -FASTCALL -RtlUlongByteSwap( - IN ULONG Source -) -{ - return ((ULONG)RtlUshortByteSwap((USHORT)Source) << 16) | RtlUshortByteSwap((USHORT)(Source >> 16)); -} - - -/************************************************************************* - * RtlUlonglongByteSwap - * - * Swap the bytes of an unsigned long long value. - * - * PARAMS - * i [I] Value to swap bytes of - * - * RETURNS - * The value with its bytes swapped. - * - * @implemented - */ -ULONGLONG FASTCALL -RtlUlonglongByteSwap (IN ULONGLONG Source) -{ - return ((ULONGLONG) RtlUlongByteSwap (Source) << 32) | RtlUlongByteSwap (Source>>32); -} - - -/* EOF */ 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 05:20:55 2006 @@ -22,37 +22,24 @@ <file>aullshr_asm.s</file> <file>ceil_asm.s</file> <file>chkstk_asm.s</file> - <file>comparememory_asm.s</file> - <file>comparememory_ulong_asm.s</file> <file>cos_asm.s</file> <file>debug_asm.S</file> <file>except_asm.s</file> <file>exception.c</file> <file>fabs_asm.s</file> - <file>fillmemory_asm.s</file> - <file>fillmemory_ulong_asm.s</file> <file>floor_asm.s</file> <file>ftol_asm.s</file> <file>log_asm.s</file> <file>random_asm.S</file> - <file>memgeni386.c</file> - <file>rtlushortbyteswap.s</file> - <file>rtlulongbyteswap.s</file> - <file>rtlulonglongbyteswap.s</file> + <file>rtlswap.S</file> + <file>rtlmem.S</file> <file>pow_asm.s</file> - <file>prefetchmemory_asm.s</file> <file>res_asm.s</file> <file>sin_asm.s</file> <file>sqrt_asm.s</file> <file>tan_asm.s</file> - <file>zeromemory_asm.s</file> </directory> </if> - - <ifnot property="ARCH" value="i386"> - <file>memgen.c</file> - </ifnot> - <file>access.c</file> <file>acl.c</file> <file>atom.c</file> @@ -73,7 +60,6 @@ <file>handle.c</file> <file>heap.c</file> <file>image.c</file> - <file>mem.c</file> <file>message.c</file> <file>largeint.c</file> <file>luid.c</file>

1 0

[weiden] 23829: Fix difference in signedness warnings
by weiden＠svn.reactos.org 30 Aug '06

30 Aug '06

Author: weiden Date: Thu Aug 31 01:47:38 2006 New Revision: 23829 URL: http://svn.reactos.org/svn/reactos?rev=23829&view=rev Log: Fix difference in signedness warnings Modified: trunk/reactos/ntoskrnl/ke/bug.c trunk/reactos/ntoskrnl/vdm/vdmexec.c Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=2382… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c (original) +++ trunk/reactos/ntoskrnl/ke/bug.c Thu Aug 31 01:47:38 2006 @@ -543,7 +543,7 @@ /* Save the IRQL and set hardware trigger */ Prcb->DebuggerSavedIRQL = KeGetCurrentIrql(); - InterlockedIncrement(&KiHardwareTrigger); + InterlockedIncrement((PLONG)&KiHardwareTrigger); /* Capture the CPU Context */ RtlCaptureContext(&Prcb->ProcessorState.ContextFrame); @@ -857,7 +857,7 @@ } /* Avoid recursion */ - if (!InterlockedDecrement(&KeBugCheckCount)) + if (!InterlockedDecrement((PLONG)&KeBugCheckCount)) { /* Set CPU that is bug checking now */ KeBugCheckOwner = Prcb->Number; Modified: trunk/reactos/ntoskrnl/vdm/vdmexec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/vdm/vdmexec.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/vdm/vdmexec.c (original) +++ trunk/reactos/ntoskrnl/vdm/vdmexec.c Thu Aug 31 01:47:38 2006 @@ -212,12 +212,12 @@ if (VdmTib->VdmContext.EFlags & EFLAGS_INTERRUPT_MASK) { /* Enable them as well */ - InterlockedOr(VdmState, EFLAGS_INTERRUPT_MASK); + InterlockedOr((PLONG)VdmState, EFLAGS_INTERRUPT_MASK); } else { /* Disable them */ - InterlockedAnd(VdmState, ~EFLAGS_INTERRUPT_MASK); + InterlockedAnd((PLONG)VdmState, ~EFLAGS_INTERRUPT_MASK); } /* Enable the interrupt flag */

1 0

[weiden] 23828: Use the new ProbeForWriteIoStatusBlock macro
by weiden＠svn.reactos.org 30 Aug '06

30 Aug '06

Author: weiden Date: Thu Aug 31 01:45:17 2006 New Revision: 23828 URL: http://svn.reactos.org/svn/reactos?rev=23828&view=rev Log: Use the new ProbeForWriteIoStatusBlock macro Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c trunk/reactos/ntoskrnl/io/iomgr/iocomp.c trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Thu Aug 31 01:45:17 2006 @@ -1271,9 +1271,7 @@ _SEH_TRY { ProbeForWriteHandle(FileHandle); - ProbeForWrite(IoStatusBlock, - sizeof(IO_STATUS_BLOCK), - sizeof(ULONG)); + ProbeForWriteIoStatusBlock(IoStatusBlock); if (AllocationSize) { SafeAllocationSize = ProbeForReadLargeInteger(AllocationSize); @@ -2150,9 +2148,7 @@ _SEH_TRY { /* Probe the I/O Status Block */ - ProbeForWrite(IoStatusBlock, - sizeof(IO_STATUS_BLOCK), - sizeof(ULONG)); + ProbeForWriteIoStatusBlock(IoStatusBlock); } _SEH_HANDLE { Modified: trunk/reactos/ntoskrnl/io/iomgr/iocomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iocomp.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iocomp.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iocomp.c Thu Aug 31 01:45:17 2006 @@ -429,9 +429,7 @@ ProbeForWritePointer(ApcContext); /* Probe the I/O Status Block */ - ProbeForWrite(IoStatusBlock, - sizeof(IO_STATUS_BLOCK), - sizeof(ULONG)); + ProbeForWriteIoStatusBlock(IoStatusBlock); if (Timeout) { /* Probe and capture the timeout */ Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Thu Aug 31 01:45:17 2006 @@ -218,9 +218,7 @@ _SEH_TRY { /* Probe the status block */ - ProbeForWrite(IoStatusBlock, - sizeof(IO_STATUS_BLOCK), - sizeof(ULONG)); + ProbeForWriteIoStatusBlock(IoStatusBlock); /* Check if this is buffered I/O */ if (AccessType == METHOD_BUFFERED) @@ -826,9 +824,7 @@ _SEH_TRY { /* Probe the I/O Status block */ - ProbeForWrite(IoStatusBlock, - sizeof(IO_STATUS_BLOCK), - sizeof(ULONG)); + ProbeForWriteIoStatusBlock(IoStatusBlock); } _SEH_HANDLE { @@ -960,9 +956,7 @@ _SEH_TRY { /* Probe the I/O STatus block */ - ProbeForWrite(IoStatusBlock, - sizeof(IO_STATUS_BLOCK), - sizeof(ULONG)); + ProbeForWriteIoStatusBlock(IoStatusBlock); /* Probe the buffer */ if (BufferSize) ProbeForWrite(Buffer, BufferSize, sizeof(ULONG)); @@ -1104,9 +1098,7 @@ _SEH_TRY { /* Probe the I/O STatus block */ - ProbeForWrite(IoStatusBlock, - sizeof(IO_STATUS_BLOCK), - sizeof(ULONG)); + ProbeForWriteIoStatusBlock(IoStatusBlock); /* Probe and capture the large integers */ CapturedByteOffset = ProbeForReadLargeInteger(ByteOffset); @@ -1263,9 +1255,7 @@ _SEH_TRY { /* Probe the I/O Status Block */ - ProbeForWrite(IoStatusBlock, - sizeof(IO_STATUS_BLOCK), - sizeof(ULONG)); + ProbeForWriteIoStatusBlock(IoStatusBlock); /* Probe the file information */ ProbeForWrite(FileInformation, Length, sizeof(ULONG)); @@ -1502,9 +1492,7 @@ _SEH_TRY { /* Probe the I/O Status block */ - ProbeForWrite(IoStatusBlock, - sizeof(IO_STATUS_BLOCK), - sizeof(ULONG)); + ProbeForWriteIoStatusBlock(IoStatusBlock); /* Probe the information */ if (Length) ProbeForWrite(FileInformation, Length, 1); @@ -1783,9 +1771,7 @@ _SEH_TRY { /* Probe the status block */ - ProbeForWrite(IoStatusBlock, - sizeof(IO_STATUS_BLOCK), - sizeof(ULONG)); + ProbeForWriteIoStatusBlock(IoStatusBlock); /* Probe the read buffer */ ProbeForWrite(Buffer, Length, 1); @@ -2046,9 +2032,7 @@ _SEH_TRY { /* Probe the I/O Status block */ - ProbeForWrite(IoStatusBlock, - sizeof(IO_STATUS_BLOCK), - sizeof(ULONG)); + ProbeForWriteIoStatusBlock(IoStatusBlock); /* Probe the information */ if (Length) ProbeForRead(FileInformation, Length, 1); @@ -2407,9 +2391,7 @@ _SEH_TRY { /* Probe the I/O Status block */ - ProbeForWrite(IoStatusBlock, - sizeof(IO_STATUS_BLOCK), - sizeof(ULONG)); + ProbeForWriteIoStatusBlock(IoStatusBlock); /* Probe and capture the large integers */ CapturedByteOffset = ProbeForReadLargeInteger(ByteOffset); @@ -2597,9 +2579,7 @@ } /* Probe the status block */ - ProbeForWrite(IoStatusBlock, - sizeof(IO_STATUS_BLOCK), - sizeof(ULONG)); + ProbeForWriteIoStatusBlock(IoStatusBlock); /* Probe the read buffer */ ProbeForRead(Buffer, Length, 1); @@ -2839,9 +2819,7 @@ _SEH_TRY { /* Probe the I/O Status block */ - ProbeForWrite(IoStatusBlock, - sizeof(IO_STATUS_BLOCK), - sizeof(ULONG)); + ProbeForWriteIoStatusBlock(IoStatusBlock); /* Probe the information */ if (Length) ProbeForWrite(FsInformation, Length, 1); @@ -2989,9 +2967,7 @@ _SEH_TRY { /* Probe the I/O Status block */ - ProbeForWrite(IoStatusBlock, - sizeof(IO_STATUS_BLOCK), - sizeof(ULONG)); + ProbeForWriteIoStatusBlock(IoStatusBlock); /* Probe the information */ if (Length) ProbeForRead(FsInformation, Length, 1);

1 0

[weiden] 23827: - Fix some probing macros - Add probing macros for IO_STATUS_BLOCK structures - Added two inline functions ProbeArrayForRead() and ProbeArrayForWrite(), mainly for use in win32k as they also check for integer overflows.
by weiden＠svn.reactos.org 30 Aug '06

30 Aug '06

Author: weiden Date: Thu Aug 31 01:44:12 2006 New Revision: 23827 URL: http://svn.reactos.org/svn/reactos?rev=23827&view=rev Log: - Fix some probing macros - Add probing macros for IO_STATUS_BLOCK structures - Added two inline functions ProbeArrayForRead() and ProbeArrayForWrite(), mainly for use in win32k as they also check for integer overflows. Modified: trunk/reactos/include/reactos/probe.h Modified: trunk/reactos/include/reactos/probe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/probe.h?re… ============================================================================== --- trunk/reactos/include/reactos/probe.h (original) +++ trunk/reactos/include/reactos/probe.h Thu Aug 31 01:44:12 2006 @@ -8,6 +8,7 @@ static const UNICODE_STRING __emptyUnicodeString = {0}; static const LARGE_INTEGER __emptyLargeInteger = {{0, 0}}; static const ULARGE_INTEGER __emptyULargeInteger = {{0, 0}}; +static const IO_STATUS_BLOCK __emptyIoStatusBlock = {{0}, 0}; #if defined(_WIN32K_) /* @@ -40,20 +41,20 @@ #define ProbeForWriteInt(Ptr) ProbeForWriteGenericType(Ptr, INT) #define ProbeForWriteUlonglong(Ptr) ProbeForWriteGenericType(Ptr, ULONGLONG) #define ProbeForWriteLonglong(Ptr) ProbeForWriteGenericType(Ptr, LONGLONG) -#define ProbeForWriteLonglong(Ptr) ProbeForWriteGenericType(Ptr, LONGLONG) #define ProbeForWritePointer(Ptr) ProbeForWriteGenericType(Ptr, PVOID) #define ProbeForWriteHandle(Ptr) ProbeForWriteGenericType(Ptr, HANDLE) #define ProbeForWriteLangid(Ptr) ProbeForWriteGenericType(Ptr, LANGID) #define ProbeForWriteSize_t(Ptr) ProbeForWriteGenericType(Ptr, SIZE_T) -#define ProbeForWriteLargeInteger(Ptr) ProbeForWriteGenericType(&(Ptr)->QuadPart, LONGLONG) -#define ProbeForWriteUlargeInteger(Ptr) ProbeForWriteGenericType(&(Ptr)->QuadPart, ULONGLONG) -#define ProbeForWriteUnicodeString(Ptr) ProbeForWriteGenericType(Ptr, UNICODE_STRING) +#define ProbeForWriteLargeInteger(Ptr) ProbeForWriteGenericType(&((PLARGE_INTEGER)Ptr)->QuadPart, LONGLONG) +#define ProbeForWriteUlargeInteger(Ptr) ProbeForWriteGenericType(&((PULARGE_INTEGER)Ptr)->QuadPart, ULONGLONG) +#define ProbeForWriteUnicodeString(Ptr) ProbeForWriteGenericType((PUNICODE_STRING)Ptr, UNICODE_STRING) +#define ProbeForWriteIoStatusBlock(Ptr) ProbeForWriteGenericType((PIO_STATUS_BLOCK)Ptr, IO_STATUS_BLOCK) #define ProbeForReadGenericType(Ptr, Type, Default) \ (((ULONG_PTR)(Ptr) + sizeof(Type) - 1 < (ULONG_PTR)(Ptr) || \ (ULONG_PTR)(Ptr) + sizeof(Type) - 1 >= (ULONG_PTR)MmUserProbeAddress) ? \ ExRaiseStatus (STATUS_ACCESS_VIOLATION), Default : \ - *(Type *)(Ptr)) + *(const volatile Type *)(Ptr)) #define ProbeForReadBoolean(Ptr) ProbeForReadGenericType(Ptr, BOOLEAN, FALSE) #define ProbeForReadUchar(Ptr) ProbeForReadGenericType(Ptr, UCHAR, 0) @@ -70,9 +71,10 @@ #define ProbeForReadHandle(Ptr) ProbeForReadGenericType(Ptr, HANDLE, NULL) #define ProbeForReadLangid(Ptr) ProbeForReadGenericType(Ptr, LANGID, 0) #define ProbeForReadSize_t(Ptr) ProbeForReadGenericType(Ptr, SIZE_T, 0) -#define ProbeForReadLargeInteger(Ptr) ProbeForReadGenericType(Ptr, LARGE_INTEGER, __emptyLargeInteger) -#define ProbeForReadUlargeInteger(Ptr) ProbeForReadGenericType(Ptr, ULARGE_INTEGER, __emptyULargeInteger) -#define ProbeForReadUnicodeString(Ptr) ProbeForReadGenericType(Ptr, UNICODE_STRING, __emptyUnicodeString) +#define ProbeForReadLargeInteger(Ptr) ProbeForReadGenericType((const LARGE_INTEGER *)(Ptr), LARGE_INTEGER, __emptyLargeInteger) +#define ProbeForReadUlargeInteger(Ptr) ProbeForReadGenericType((const ULARGE_INTEGER *)(Ptr), ULARGE_INTEGER, __emptyULargeInteger) +#define ProbeForReadUnicodeString(Ptr) ProbeForReadGenericType((const UNICODE_STRING *)(Ptr), UNICODE_STRING, __emptyUnicodeString) +#define ProbeForReadIoStatusBlock(Ptr) ProbeForReadGenericType((const IO_STATUS_BLOCK *)(Ptr), IO_STATUS_BLOCK, __emptyIoStatusBlock) #define ProbeAndZeroHandle(Ptr) \ do { \ @@ -86,12 +88,61 @@ /* * Inlined Probing Macros */ + +#if defined(_WIN32K_) +static __inline +VOID +NTAPI +ProbeArrayForRead(IN const VOID *ArrayPtr, + IN ULONG ItemSize, + IN ULONG ItemCount, + IN ULONG Alignment) +{ + ULONG ArraySize; + + /* Check for integer overflow */ + ArraySize = ItemSize * ItemCount; + if (ArraySize / ItemSize != ItemCount) + { + RtlRaiseStatus (STATUS_INVALID_PARAMETER); + } + + /* Probe the array */ + ProbeForRead(ArrayPtr, + ArraySize, + Alignment); +} + +static __inline +VOID +NTAPI +ProbeArrayForWrite(IN OUT PVOID ArrayPtr, + IN ULONG ItemSize, + IN ULONG ItemCount, + IN ULONG Alignment) +{ + ULONG ArraySize; + + /* Check for integer overflow */ + ArraySize = ItemSize * ItemCount; + if (ArraySize / ItemSize != ItemCount) + { + RtlRaiseStatus (STATUS_INVALID_PARAMETER); + } + + /* Probe the array */ + ProbeForWrite(ArrayPtr, + ArraySize, + Alignment); +} +#endif /* _WIN32K_ */ + static __inline NTSTATUS NTAPI ProbeAndCaptureUnicodeString(OUT PUNICODE_STRING Dest, IN KPROCESSOR_MODE CurrentMode, - IN PUNICODE_STRING UnsafeSrc) + IN const UNICODE_STRING *UnsafeSrc) { NTSTATUS Status = STATUS_SUCCESS; WCHAR *Buffer = NULL;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs