Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 63993: [HPP] Implement support for variable substitution
by tkreuzer＠svn.reactos.org 30 Aug '14

30 Aug '14

Author: tkreuzer Date: Sat Aug 30 17:18:48 2014 New Revision: 63993 URL: http://svn.reactos.org/svn/reactos?rev=63993&view=rev Log: [HPP] Implement support for variable substitution Added: trunk/reactos/tools/hpp/CMakeLists.txt (with props) Modified: trunk/reactos/tools/hpp/hpp.c Added: trunk/reactos/tools/hpp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/hpp/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/tools/hpp/CMakeLists.txt (added) +++ trunk/reactos/tools/hpp/CMakeLists.txt [iso-8859-1] Sat Aug 30 17:18:48 2014 @@ -0,0 +1 @@ +add_executable(hpp hpp.c) Propchange: trunk/reactos/tools/hpp/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/tools/hpp/hpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/hpp/hpp.c?rev=63993&… ============================================================================== --- trunk/reactos/tools/hpp/hpp.c [iso-8859-1] (original) +++ trunk/reactos/tools/hpp/hpp.c [iso-8859-1] Sat Aug 30 17:18:48 2014 @@ -23,9 +23,12 @@ typedef struct _DEFINE { struct _DEFINE *pNext; - int len; int val; - char szName[1]; + char *pszName; + unsigned int cchName; + char *pszValue; + unsigned int cchValue; + char achBuffer[1]; } DEFINE, *PDEFINE; DEFINE *gpDefines = 0; @@ -58,7 +61,7 @@ #endif i++; } - return(newpath); + return newpath; } char* @@ -160,45 +163,87 @@ return len; } - -void -WriteLine(char *pszLine, FILE *fileOut) -{ - char * pszEnd; - - pszEnd = strchr(pszLine, '\n'); - if (pszEnd) - { - int len = pszEnd - pszLine + 1; - fwrite(pszLine, 1, len, fileOut); - } -} - -int -EvaluateConstant(const char *p, char **pNext) +PDEFINE +FindDefine(const char *p, char **pNext) { PDEFINE pDefine; - int len; - - len = strxlen(p); + int cchName; + + cchName = strxlen(p); if (pNext) - *pNext = (char*)p + len; + *pNext = (char*)p + cchName; /* search for the define in the global list */ pDefine = gpDefines; while (pDefine != 0) { - trace("found a define: %s\n", pDefine->szName); - if (pDefine->len == len) - { - if (strncmp(p, pDefine->szName, len) == 0) - { - return pDefine->val; + trace("found a define: %s\n", pDefine->pszName); + if (pDefine->cchName == cchName) + { + if (strncmp(p, pDefine->pszName, cchName) == 0) + { + return pDefine; } } pDefine = pDefine->pNext; } return 0; +} + +void +WriteLine(char *pchLine, FILE *fileOut) +{ + char *pch, *pchLineEnd, *pchVariable; + int len; + PDEFINE pDefine; + + pchLineEnd = strchr(pchLine, '\n'); + if (pchLineEnd == 0) + return; + + len = pchLineEnd - pchLine + 1; + + pch = pchLine; + while (len > 0) + { + /* Check if there is a $ variable in the line */ + pchVariable = strchr(pch, '$'); + if (pchVariable && (pchVariable < pchLineEnd)) + { + fwrite(pch, 1, pchVariable - pch, fileOut); + + pDefine = FindDefine(pchVariable + 1, &pch); + if (pDefine != 0) + { + fwrite(pDefine->pszValue, 1, pDefine->cchValue, fileOut); + } + else + { + len = strxlen(pchVariable + 1) + 1; + error("Could not find variable '%.*s'\n", len, pchVariable); + fwrite(pchVariable, 1, pch - pchVariable, fileOut); + } + + len = pchLineEnd - pch; + } + else + { + fwrite(pch, 1, len, fileOut); + break; + } + } +} + +int +EvaluateConstant(const char *p, char **pNext) +{ + PDEFINE pDefine; + + pDefine = FindDefine(p, pNext); + if (!pDefine) + return 0; + + return pDefine->val; } int @@ -289,7 +334,7 @@ } else { - error("+Parse error: expected '(' or operator in Line %d, got %c\n", + error("+Parse error: expected '(' or operator in Line %d, got %c\n", iLine, pstart[0]); return -1; } @@ -317,7 +362,7 @@ ParseInputFile(const char *pszInFile, FILE *fileOut) { char* pInputData, *pCurrentLine, *p1, *p2; - size_t cbInFileLenth, len; + size_t cbInFileLenth; int iIfLevel, iCopyLevel; trace("parsing input file: %s\n", pszInFile); @@ -393,33 +438,75 @@ if (strncmp(pCurrentLine, "$define", 7) == 0) { PDEFINE pDefine; + char *pchName, *pchValue; + size_t cchName, cchValue; trace("found $define\n"); p1 = GetNextChar(pCurrentLine + 7); if (*p1 != '(') { - error("Parse error: expected '(' at %s:%d\n", + error("Parse error: expected '(' at %s:%d\n", pszInFile, iLine); return -1; } - p1 = GetNextChar(p1 + 1); - len = strxlen(p1); - p2 = p1 + len; - if (*p2 != ')') + + pchName = GetNextChar(p1 + 1); + cchName = strxlen(pchName); + p1 = GetNextChar(pchName + cchName); + + /* Check for assignment */ + if (*p1 == '=') + { + trace("found $define with assignment\n"); + pchValue = GetNextChar(p1 + 1); + cchValue = strxlen(pchValue); + p1 = GetNextChar(pchValue + cchValue); + } + else + { + pchValue = 0; + cchValue = 0; + } + + /* Allocate a DEFINE structure */ + pDefine = malloc(sizeof(DEFINE) + cchName + cchValue + 2); + if (pDefine == 0) + { + error("Failed to allocate %u bytes\n", + sizeof(DEFINE) + cchName + cchValue + 2); + return -1; + } + + pDefine->pszName = pDefine->achBuffer; + strncpy(pDefine->pszName, pchName, cchName); + pDefine->pszName[cchName] = 0; + pDefine->cchName = cchName; + pDefine->val = 1; + + if (pchValue != 0) + { + pDefine->pszValue = &pDefine->achBuffer[cchName + 1]; + strncpy(pDefine->pszValue, pchValue, cchValue); + pDefine->pszValue[cchValue] = 0; + pDefine->cchValue = cchValue; + } + else + { + pDefine->pszValue = 0; + pDefine->cchValue = 0; + } + + /* Insert the new define into the global list */ + pDefine->pNext = gpDefines; + gpDefines = pDefine; + + /* Check for closing ')' */ + if (*p1 != ')') { error("Parse error: expected ')' at %s:%d\n", pszInFile, iLine); return -1; } - - /* Insert the new define into the global list */ - pDefine = malloc(sizeof(DEFINE) + len); - strncpy(pDefine->szName, p1, len); - pDefine->szName[len] = 0; - pDefine->len = len; - pDefine->val = 1; - pDefine->pNext = gpDefines; - gpDefines = pDefine; } /* Check for $if */ @@ -457,7 +544,7 @@ p1 = GetNextChar(pCurrentLine + 8); if (*p1 != '(') { - error("Parse error: expected '(' at %s:%d, found '%c'\n", + error("Parse error: expected '(' at %s:%d, found '%c'\n", pszInFile, iLine, *p1); return -1; } @@ -470,7 +557,7 @@ /* Restore the global file name */ gpszCurFile = pszInFile; - + /* Restore the zeroed character */ *p2 = ')';

1 0

[hbelusca] 63992: [CONSRV]: Start implementing popup windows (it's what you see when you press e.g. the F7 key in your console, when you run cmd.exe).
by hbelusca＠svn.reactos.org 30 Aug '14

30 Aug '14

Author: hbelusca Date: Sat Aug 30 16:20:32 2014 New Revision: 63992 URL: http://svn.reactos.org/svn/reactos?rev=63992&view=rev Log: [CONSRV]: Start implementing popup windows (it's what you see when you press e.g. the F7 key in your console, when you run cmd.exe). Added: branches/condrv_restructure/win32ss/user/winsrv/consrv/popup.c (with props) branches/condrv_restructure/win32ss/user/winsrv/consrv/popup.h (with props) Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv.cmake branches/condrv_restructure/win32ss/user/winsrv/consrv/console.c branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv.cmake URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv.cmake [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv.cmake [iso-8859-1] Sat Aug 30 16:20:32 2014 @@ -14,6 +14,7 @@ consrv/history.c consrv/init.c consrv/lineinput.c + consrv/popup.c consrv/settings.c consrv/subsysreg.c consrv/condrv/coninput.c Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/console.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/console.c [iso-8859-1] Sat Aug 30 16:20:32 2014 @@ -436,6 +436,9 @@ Console->LineInsertToggle = Console->InsertMode = ConsoleInfo.InsertMode; Console->QuickEdit = ConsoleInfo.QuickEdit; + + /* Popup windows */ + InitializeListHead(&Console->PopupWindows); /* Colour table */ memcpy(Console->Colors, ConsoleInfo.Colors, sizeof(ConsoleInfo.Colors)); Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h [iso-8859-1] Sat Aug 30 16:20:32 2014 @@ -168,7 +168,8 @@ HANDLE ErrorHardwareEvent; /****************************** Other properties ******************************/ - COLORREF Colors[16]; /* Colour palette */ + LIST_ENTRY PopupWindows; /*List of popup windows */ + COLORREF Colors[16]; /* Colour palette */ } WINSRV_CONSOLE, *PWINSRV_CONSOLE; Added: branches/condrv_restructure/win32ss/user/winsrv/consrv/popup.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/popup.c (added) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/popup.c [iso-8859-1] Sat Aug 30 16:20:32 2014 @@ -0,0 +1,248 @@ +/* + * LICENSE: GPL - See COPYING in the top level directory + * PROJECT: ReactOS Console Server DLL + * FILE: win32ss/user/winsrv/consrv/popup.c + * PURPOSE: Console popup windows + * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + * + * NOTE: Strongly inspired by the DrawBox function + * from base/setup/usetup/interface/usetup.c, written by: + * Eric Kohl (revision 3753) + * Hervé Poussineau (revision 24718) + * and *UiDisplayMenu from FreeLdr. + */ + +/* INCLUDES *******************************************************************/ + +#include "consrv.h" +#include "popup.h" + +#define NDEBUG +#include <debug.h> + + +/* PRIVATE FUNCTIONS **********************************************************/ + +NTSTATUS NTAPI +ConDrvFillConsoleOutput(IN PCONSOLE Console, + IN PTEXTMODE_SCREEN_BUFFER Buffer, + IN CODE_TYPE CodeType, + IN CODE_ELEMENT Code, + IN ULONG NumCodesToWrite, + IN PCOORD WriteCoord, + OUT PULONG NumCodesWritten OPTIONAL); +NTSTATUS NTAPI +ConDrvReadConsoleOutput(IN PCONSOLE Console, + IN PTEXTMODE_SCREEN_BUFFER Buffer, + IN BOOLEAN Unicode, + OUT PCHAR_INFO CharInfo/*Buffer*/, + IN OUT PSMALL_RECT ReadRegion); +NTSTATUS NTAPI +ConDrvWriteConsoleOutput(IN PCONSOLE Console, + IN PTEXTMODE_SCREEN_BUFFER Buffer, + IN BOOLEAN Unicode, + IN PCHAR_INFO CharInfo/*Buffer*/, + IN OUT PSMALL_RECT WriteRegion); + + +static VOID +DrawBox(PTEXTMODE_SCREEN_BUFFER Buffer, + IN SHORT xLeft, + IN SHORT yTop, + IN SHORT Width, + IN SHORT Height) +{ + COORD coPos; + DWORD Written; + + /* Set screen attributes */ + coPos.X = xLeft; + for (coPos.Y = yTop; coPos.Y < yTop + Height; coPos.Y++) + { + ConDrvFillConsoleOutput(Buffer->Header.Console, + Buffer, + CODE_ATTRIBUTE, + (CODE_ELEMENT)(WORD)Buffer->PopupDefaultAttrib, + Width, + &coPos, + &Written); + } + + /* draw upper left corner */ + coPos.X = xLeft; + coPos.Y = yTop; + ConDrvFillConsoleOutput(Buffer->Header.Console, + Buffer, + CODE_ASCII, + (CODE_ELEMENT)(CHAR)0xDA, // '+', + 1, + &coPos, + &Written); + + /* draw upper edge */ + coPos.X = xLeft + 1; + coPos.Y = yTop; + ConDrvFillConsoleOutput(Buffer->Header.Console, + Buffer, + CODE_ASCII, + (CODE_ELEMENT)(CHAR)0xC4, // '-', + Width - 2, + &coPos, + &Written); + + /* draw upper right corner */ + coPos.X = xLeft + Width - 1; + coPos.Y = yTop; + ConDrvFillConsoleOutput(Buffer->Header.Console, + Buffer, + CODE_ASCII, + (CODE_ELEMENT)(CHAR)0xBF, // '+', + 1, + &coPos, + &Written); + + /* Draw right edge, inner space and left edge */ + for (coPos.Y = yTop + 1; coPos.Y < yTop + Height - 1; coPos.Y++) + { + coPos.X = xLeft; + ConDrvFillConsoleOutput(Buffer->Header.Console, + Buffer, + CODE_ASCII, + (CODE_ELEMENT)(CHAR)0xB3, // '|', + 1, + &coPos, + &Written); + + coPos.X = xLeft + 1; + ConDrvFillConsoleOutput(Buffer->Header.Console, + Buffer, + CODE_ASCII, + (CODE_ELEMENT)(CHAR)' ', + Width - 2, + &coPos, + &Written); + + coPos.X = xLeft + Width - 1; + ConDrvFillConsoleOutput(Buffer->Header.Console, + Buffer, + CODE_ASCII, + (CODE_ELEMENT)(CHAR)0xB3, // '|', + 1, + &coPos, + &Written); + } + + /* draw lower left corner */ + coPos.X = xLeft; + coPos.Y = yTop + Height - 1; + ConDrvFillConsoleOutput(Buffer->Header.Console, + Buffer, + CODE_ASCII, + (CODE_ELEMENT)(CHAR)0xC0, // '+', + 1, + &coPos, + &Written); + + /* draw lower edge */ + coPos.X = xLeft + 1; + coPos.Y = yTop + Height - 1; + ConDrvFillConsoleOutput(Buffer->Header.Console, + Buffer, + CODE_ASCII, + (CODE_ELEMENT)(CHAR)0xC4, // '-', + Width - 2, + &coPos, + &Written); + + /* draw lower right corner */ + coPos.X = xLeft + Width - 1; + coPos.Y = yTop + Height - 1; + ConDrvFillConsoleOutput(Buffer->Header.Console, + Buffer, + CODE_ASCII, + (CODE_ELEMENT)(CHAR)0xD9, // '+', + 1, + &coPos, + &Written); +} + + +/* PUBLIC FUNCTIONS ***********************************************************/ + +PPOPUP_WINDOW +CreatePopupWindow(PTEXTMODE_SCREEN_BUFFER Buffer, + SHORT xLeft, + SHORT yTop, + SHORT Width, + SHORT Height) +{ + PPOPUP_WINDOW Popup; + SMALL_RECT Region; + + /* Create the popup window */ + Popup = ConsoleAllocHeap(HEAP_ZERO_MEMORY, sizeof(*Popup)); + if (Popup == NULL) return NULL; + + Popup->ScreenBuffer = Buffer; + Popup->Origin.X = xLeft; + Popup->Origin.Y = yTop; + Popup->Size.X = Width; + Popup->Size.Y = Height; + + /* Save old contents */ + Popup->OldContents = ConsoleAllocHeap(HEAP_ZERO_MEMORY, + Popup->Size.X * Popup->Size.Y * + sizeof(*Popup->OldContents)); + if (Popup->OldContents == NULL) + { + ConsoleFreeHeap(Popup); + return NULL; + } + Region.Left = Popup->Origin.X; + Region.Top = Popup->Origin.Y; + Region.Right = Popup->Origin.X + Popup->Size.X - 1; + Region.Bottom = Popup->Origin.Y + Popup->Size.Y - 1; + ConDrvReadConsoleOutput(Buffer->Header.Console, + Buffer, + TRUE, + Popup->OldContents, + &Region); + + /* Draw it */ + DrawBox(Buffer, + xLeft, yTop, + Width, Height); + + /* Add it into the list of popups */ + InsertTailList(&Buffer->Header.Console->PopupWindows, &Popup->ListEntry); + + return Popup; +} + +VOID +DestroyPopupWindow(PPOPUP_WINDOW Popup) +{ + SMALL_RECT Region; + + if (Popup == NULL) return; + + /* Remove it from the list of popups */ + RemoveEntryList(&Popup->ListEntry); + + /* Restore the old screen-buffer contents */ + Region.Left = Popup->Origin.X; + Region.Top = Popup->Origin.Y; + Region.Right = Popup->Origin.X + Popup->Size.X - 1; + Region.Bottom = Popup->Origin.Y + Popup->Size.Y - 1; + ConDrvWriteConsoleOutput(Popup->ScreenBuffer->Header.Console, + Popup->ScreenBuffer, + TRUE, + Popup->OldContents, + &Region); + + /* Free memory */ + ConsoleFreeHeap(Popup->OldContents); + ConsoleFreeHeap(Popup); +} + +/* EOF */ Propchange: branches/condrv_restructure/win32ss/user/winsrv/consrv/popup.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/condrv_restructure/win32ss/user/winsrv/consrv/popup.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/popup.h (added) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/popup.h [iso-8859-1] Sat Aug 30 16:20:32 2014 @@ -0,0 +1,36 @@ +/* + * LICENSE: GPL - See COPYING in the top level directory + * PROJECT: ReactOS Console Server DLL + * FILE: win32ss/user/winsrv/consrv/popup.h + * PURPOSE: Console popup windows + * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ + +#pragma once + +typedef +VOID +(NTAPI *PPOPUP_INPUT_ROUTINE)(VOID); + +typedef struct _POPUP_WINDOW +{ + LIST_ENTRY ListEntry; /* Entry in console's list of popups */ + PTEXTMODE_SCREEN_BUFFER ScreenBuffer; /* Associated screen-buffer */ + + // SMALL_RECT Region; /* The region the popup occupies */ + COORD Origin; /* Origin of the popup window */ + COORD Size; /* Size of the popup window */ + + PCHAR_INFO OldContents; /* The data under the popup window */ + PPOPUP_INPUT_ROUTINE PopupInputRoutine; /* Routine called when input is received */ +} POPUP_WINDOW, *PPOPUP_WINDOW; + + +PPOPUP_WINDOW +CreatePopupWindow(PTEXTMODE_SCREEN_BUFFER Buffer, + SHORT xLeft, + SHORT yTop, + SHORT Width, + SHORT Height); +VOID +DestroyPopupWindow(PPOPUP_WINDOW Popup); Propchange: branches/condrv_restructure/win32ss/user/winsrv/consrv/popup.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[hbelusca] 63991: [CONDRV] - In ConDrvChangeScreenBufferAttributes, change also the popup attributes. - In some functions we need to check validity of Read/WriteCoord parameters, add fixme for now, ...
by hbelusca＠svn.reactos.org 30 Aug '14

30 Aug '14

Author: hbelusca Date: Sat Aug 30 16:18:07 2014 New Revision: 63991 URL: http://svn.reactos.org/svn/reactos?rev=63991&view=rev Log: [CONDRV] - In ConDrvChangeScreenBufferAttributes, change also the popup attributes. - In some functions we need to check validity of Read/WriteCoord parameters, add fixme for now, that need to be fixed later on. Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] Sat Aug 30 16:18:07 2014 @@ -363,7 +363,7 @@ COORD TopLeft = {0}; ULONG NumCodesToWrite; - USHORT OldScreenAttrib; + USHORT OldScreenAttrib, OldPopupAttrib; if (Console == NULL || Buffer == NULL) { @@ -375,6 +375,7 @@ NumCodesToWrite = Buffer->ScreenBufferSize.X * Buffer->ScreenBufferSize.Y; OldScreenAttrib = Buffer->ScreenDefaultAttrib; + OldPopupAttrib = Buffer->PopupDefaultAttrib; X = TopLeft.X; Y = (TopLeft.Y + Buffer->VirtualY) % Buffer->ScreenBufferSize.Y; @@ -395,10 +396,14 @@ /* Foreground color */ if ((Ptr->Attributes & 0x0F) == (OldScreenAttrib & 0x0F)) Ptr->Attributes = (Ptr->Attributes & 0xFFF0) | (NewScreenAttrib & 0x0F); + if ((Ptr->Attributes & 0x0F) == (OldPopupAttrib & 0x0F)) + Ptr->Attributes = (Ptr->Attributes & 0xFFF0) | (NewPopupAttrib & 0x0F); /* Background color */ if ((Ptr->Attributes & 0xF0) == (OldScreenAttrib & 0xF0)) Ptr->Attributes = (Ptr->Attributes & 0xFF0F) | (NewScreenAttrib & 0xF0); + if ((Ptr->Attributes & 0xF0) == (OldPopupAttrib & 0xF0)) + Ptr->Attributes = (Ptr->Attributes & 0xFF0F) | (NewPopupAttrib & 0xF0); // ++Ptr; @@ -715,6 +720,10 @@ /* Validity checks */ ASSERT(Console == Buffer->Header.Console); ASSERT((StringBuffer != NULL) || (StringBuffer == NULL && NumCodesToRead == 0)); + + // + // FIXME: Make overflow checks on ReadCoord !!!!!! + // if (NumCodesRead) *NumCodesRead = 0; @@ -826,6 +835,10 @@ ASSERT(Console == Buffer->Header.Console); ASSERT((StringBuffer != NULL) || (StringBuffer == NULL && NumCodesToWrite == 0)); + // + // FIXME: Make overflow checks on WriteCoord !!!!!! + // + if (NumCodesWritten) *NumCodesWritten = 0; switch (CodeType) @@ -953,6 +966,10 @@ /* Validity check */ ASSERT(Console == Buffer->Header.Console); + + // + // FIXME: Make overflow checks on WriteCoord !!!!!! + // if (NumCodesWritten) *NumCodesWritten = 0;

1 0

[hbelusca] 63990: [CONSRV]: Code formatting only.
by hbelusca＠svn.reactos.org 30 Aug '14

30 Aug '14

Author: hbelusca Date: Sat Aug 30 15:59:35 2014 New Revision: 63990 URL: http://svn.reactos.org/svn/reactos?rev=63990&view=rev Log: [CONSRV]: Code formatting only. Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/lineinput.c Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/lineinput.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/lineinput.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/lineinput.c [iso-8859-1] Sat Aug 30 15:59:35 2014 @@ -165,7 +165,6 @@ { UINT Pos = Console->LinePos; UNICODE_STRING Entry; - // INT HistPos; /* * First, deal with control keys... @@ -173,159 +172,207 @@ switch (KeyEvent->wVirtualKeyCode) { - case VK_ESCAPE: - /* Clear entire line */ - LineInputSetPos(Console, 0); - LineInputEdit(Console, Console->LineSize, 0, NULL); - return; - case VK_HOME: - /* Move to start of line. With CTRL, erase everything left of cursor */ - LineInputSetPos(Console, 0); - if (KeyEvent->dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) - LineInputEdit(Console, Pos, 0, NULL); - return; - case VK_END: - /* Move to end of line. With CTRL, erase everything right of cursor */ - if (KeyEvent->dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) - LineInputEdit(Console, Console->LineSize - Pos, 0, NULL); - else - LineInputSetPos(Console, Console->LineSize); - return; - case VK_LEFT: - /* Move left. With CTRL, move to beginning of previous word */ - if (KeyEvent->dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) - { - while (Pos > 0 && Console->LineBuffer[Pos - 1] == L' ') Pos--; - while (Pos > 0 && Console->LineBuffer[Pos - 1] != L' ') Pos--; - } - else - { - Pos -= (Pos > 0); - } - LineInputSetPos(Console, Pos); - return; - case VK_RIGHT: - case VK_F1: - /* Move right. With CTRL, move to beginning of next word */ - if (KeyEvent->dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) - { - while (Pos < Console->LineSize && Console->LineBuffer[Pos] != L' ') Pos++; - while (Pos < Console->LineSize && Console->LineBuffer[Pos] == L' ') Pos++; + case VK_ESCAPE: + { + /* Clear entire line */ + LineInputSetPos(Console, 0); + LineInputEdit(Console, Console->LineSize, 0, NULL); + return; + } + + case VK_HOME: + { + /* Move to start of line. With CTRL, erase everything left of cursor */ + LineInputSetPos(Console, 0); + if (KeyEvent->dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) + LineInputEdit(Console, Pos, 0, NULL); + return; + } + + case VK_END: + { + /* Move to end of line. With CTRL, erase everything right of cursor */ + if (KeyEvent->dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) + LineInputEdit(Console, Console->LineSize - Pos, 0, NULL); + else + LineInputSetPos(Console, Console->LineSize); + return; + } + + case VK_LEFT: + { + /* Move left. With CTRL, move to beginning of previous word */ + if (KeyEvent->dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) + { + while (Pos > 0 && Console->LineBuffer[Pos - 1] == L' ') Pos--; + while (Pos > 0 && Console->LineBuffer[Pos - 1] != L' ') Pos--; + } + else + { + Pos -= (Pos > 0); + } LineInputSetPos(Console, Pos); - } - else - { - /* Recall one character (but don't overwrite current line) */ + return; + } + + case VK_RIGHT: + case VK_F1: + { + /* Move right. With CTRL, move to beginning of next word */ + if (KeyEvent->dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) + { + while (Pos < Console->LineSize && Console->LineBuffer[Pos] != L' ') Pos++; + while (Pos < Console->LineSize && Console->LineBuffer[Pos] == L' ') Pos++; + LineInputSetPos(Console, Pos); + } + else + { + /* Recall one character (but don't overwrite current line) */ + HistoryGetCurrentEntry(Console, ExeName, &Entry); + if (Pos < Console->LineSize) + LineInputSetPos(Console, Pos + 1); + else if (Pos * sizeof(WCHAR) < Entry.Length) + LineInputEdit(Console, 0, 1, &Entry.Buffer[Pos]); + } + return; + } + + case VK_INSERT: + { + /* Toggle between insert and overstrike */ + Console->LineInsertToggle = !Console->LineInsertToggle; + TermSetCursorInfo(Console, Console->ActiveBuffer); + return; + } + + case VK_DELETE: + { + /* Remove character to right of cursor */ + if (Pos != Console->LineSize) + LineInputEdit(Console, 1, 0, NULL); + return; + } + + case VK_PRIOR: + { + /* Recall first history entry */ + LineInputRecallHistory(Console, ExeName, -((WORD)-1)); + return; + } + + case VK_NEXT: + { + /* Recall last history entry */ + LineInputRecallHistory(Console, ExeName, +((WORD)-1)); + return; + } + + case VK_UP: + case VK_F5: + { + /* + * Recall previous history entry. On first time, actually recall the + * current (usually last) entry; on subsequent times go back. + */ + LineInputRecallHistory(Console, ExeName, Console->LineUpPressed ? -1 : 0); + Console->LineUpPressed = TRUE; + return; + } + + case VK_DOWN: + { + /* Recall next history entry */ + LineInputRecallHistory(Console, ExeName, +1); + return; + } + + case VK_F3: + { + /* Recall remainder of current history entry */ HistoryGetCurrentEntry(Console, ExeName, &Entry); - if (Pos < Console->LineSize) - LineInputSetPos(Console, Pos + 1); - else if (Pos * sizeof(WCHAR) < Entry.Length) - LineInputEdit(Console, 0, 1, &Entry.Buffer[Pos]); - } - return; - case VK_INSERT: - /* Toggle between insert and overstrike */ - Console->LineInsertToggle = !Console->LineInsertToggle; - TermSetCursorInfo(Console, Console->ActiveBuffer); - return; - case VK_DELETE: - /* Remove character to right of cursor */ - if (Pos != Console->LineSize) - LineInputEdit(Console, 1, 0, NULL); - return; - case VK_PRIOR: - /* Recall first history entry */ - LineInputRecallHistory(Console, ExeName, -((WORD)-1)); - return; - case VK_NEXT: - /* Recall last history entry */ - LineInputRecallHistory(Console, ExeName, +((WORD)-1)); - return; - case VK_UP: - case VK_F5: - /* - * Recall previous history entry. On first time, actually recall the - * current (usually last) entry; on subsequent times go back. - */ - LineInputRecallHistory(Console, ExeName, Console->LineUpPressed ? -1 : 0); - Console->LineUpPressed = TRUE; - return; - case VK_DOWN: - /* Recall next history entry */ - LineInputRecallHistory(Console, ExeName, +1); - return; - case VK_F3: - /* Recall remainder of current history entry */ - HistoryGetCurrentEntry(Console, ExeName, &Entry); - if (Pos * sizeof(WCHAR) < Entry.Length) - { - UINT InsertSize = (Entry.Length / sizeof(WCHAR) - Pos); - UINT DeleteSize = min(Console->LineSize - Pos, InsertSize); - LineInputEdit(Console, DeleteSize, InsertSize, &Entry.Buffer[Pos]); - } - return; - case VK_F6: - /* Insert a ^Z character */ - KeyEvent->uChar.UnicodeChar = 26; - break; - case VK_F7: - if (KeyEvent->dwControlKeyState & (LEFT_ALT_PRESSED | RIGHT_ALT_PRESSED)) - HistoryDeleteCurrentBuffer(Console, ExeName); - return; - case VK_F8: - - { - UNICODE_STRING EntryFound; - - Entry.Length = Console->LinePos * sizeof(WCHAR); // == Pos * sizeof(WCHAR) - Entry.Buffer = Console->LineBuffer; - - if (HistoryFindEntryByPrefix(Console, ExeName, &Entry, &EntryFound)) - { - LineInputEdit(Console, Console->LineSize - Pos, - EntryFound.Length / sizeof(WCHAR) - Pos, - &EntryFound.Buffer[Pos]); - /* Cursor stays where it was */ - LineInputSetPos(Console, Pos); - } - } -#if 0 - PHISTORY_BUFFER Hist; - - /* Search for history entries starting with input. */ - Hist = HistoryCurrentBuffer(Console, ExeName); - if (!Hist || Hist->NumEntries == 0) return; - - /* - * Like Up/F5, on first time start from current (usually last) entry, - * but on subsequent times start at previous entry. - */ - if (Console->LineUpPressed) - Hist->Position = (Hist->Position ? Hist->Position : Hist->NumEntries) - 1; - Console->LineUpPressed = TRUE; - - Entry.Length = Console->LinePos * sizeof(WCHAR); // == Pos * sizeof(WCHAR) - Entry.Buffer = Console->LineBuffer; - - /* - * Keep going backwards, even wrapping around to the end, - * until we get back to starting point. - */ - HistPos = Hist->Position; - do - { - if (RtlPrefixUnicodeString(&Entry, &Hist->Entries[HistPos], FALSE)) - { - Hist->Position = HistPos; + if (Pos * sizeof(WCHAR) < Entry.Length) + { + UINT InsertSize = (Entry.Length / sizeof(WCHAR) - Pos); + UINT DeleteSize = min(Console->LineSize - Pos, InsertSize); + LineInputEdit(Console, DeleteSize, InsertSize, &Entry.Buffer[Pos]); + } + return; + } + + case VK_F6: + { + /* Insert a ^Z character */ + KeyEvent->uChar.UnicodeChar = 26; + break; + } + + case VK_F7: + { + if (KeyEvent->dwControlKeyState & (LEFT_ALT_PRESSED | RIGHT_ALT_PRESSED)) + HistoryDeleteCurrentBuffer(Console, ExeName); + return; + } + + case VK_F8: + { + UNICODE_STRING EntryFound; + + Entry.Length = Console->LinePos * sizeof(WCHAR); // == Pos * sizeof(WCHAR) + Entry.Buffer = Console->LineBuffer; + + if (HistoryFindEntryByPrefix(Console, ExeName, &Entry, &EntryFound)) + { LineInputEdit(Console, Console->LineSize - Pos, - Hist->Entries[HistPos].Length / sizeof(WCHAR) - Pos, - &Hist->Entries[HistPos].Buffer[Pos]); + EntryFound.Length / sizeof(WCHAR) - Pos, + &EntryFound.Buffer[Pos]); /* Cursor stays where it was */ LineInputSetPos(Console, Pos); - return; - } - if (--HistPos < 0) HistPos += Hist->NumEntries; - } while (HistPos != Hist->Position); + } + + return; + } +#if 0 + { + PHISTORY_BUFFER Hist; + INT HistPos; + + /* Search for history entries starting with input. */ + Hist = HistoryCurrentBuffer(Console, ExeName); + if (!Hist || Hist->NumEntries == 0) return; + + /* + * Like Up/F5, on first time start from current (usually last) entry, + * but on subsequent times start at previous entry. + */ + if (Console->LineUpPressed) + Hist->Position = (Hist->Position ? Hist->Position : Hist->NumEntries) - 1; + Console->LineUpPressed = TRUE; + + Entry.Length = Console->LinePos * sizeof(WCHAR); // == Pos * sizeof(WCHAR) + Entry.Buffer = Console->LineBuffer; + + /* + * Keep going backwards, even wrapping around to the end, + * until we get back to starting point. + */ + HistPos = Hist->Position; + do + { + if (RtlPrefixUnicodeString(&Entry, &Hist->Entries[HistPos], FALSE)) + { + Hist->Position = HistPos; + LineInputEdit(Console, Console->LineSize - Pos, + Hist->Entries[HistPos].Length / sizeof(WCHAR) - Pos, + &Hist->Entries[HistPos].Buffer[Pos]); + /* Cursor stays where it was */ + LineInputSetPos(Console, Pos); + return; + } + if (--HistPos < 0) HistPos += Hist->NumEntries; + } while (HistPos != Hist->Position); + + return; + } #endif return; @@ -333,7 +380,7 @@ /* - * OK, we can continue... + * OK, we deal with normal keys, we can continue... */ if (KeyEvent->uChar.UnicodeChar == L'\b' && Console->InputBuffer.Mode & ENABLE_PROCESSED_INPUT)

1 0

[akhaldi] 63989: [W32KNAPI_APITEST] * Here's another memset call..
by akhaldi＠svn.reactos.org 30 Aug '14

30 Aug '14

Author: akhaldi Date: Sat Aug 30 12:05:36 2014 New Revision: 63989 URL: http://svn.reactos.org/svn/reactos?rev=63989&view=rev Log: [W32KNAPI_APITEST] * Here's another memset call.. Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateDIBSection.c Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateDIBSection.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateDIBSection.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateDIBSection.c [iso-8859-1] Sat Aug 30 12:05:36 2014 @@ -381,7 +381,7 @@ pbV4h->bV4BlueMask = 0; pbV4h->bV4AlphaMask = 0; pbV4h->bV4CSType = 0; - memset(&pbV4h->bV4Endpoints, sizeof(CIEXYZTRIPLE), 0); + memset(&pbV4h->bV4Endpoints, 0, sizeof(CIEXYZTRIPLE)); pbV4h->bV4GammaRed = 0; pbV4h->bV4GammaGreen = 0; pbV4h->bV4GammaBlue = 0;

1 0

[akhaldi] 63988: [W32KNAPI_APITEST] * Fix a memset call. CID 1223160. CORE-7975
by akhaldi＠svn.reactos.org 30 Aug '14

30 Aug '14

Author: akhaldi Date: Sat Aug 30 12:03:58 2014 New Revision: 63988 URL: http://svn.reactos.org/svn/reactos?rev=63988&view=rev Log: [W32KNAPI_APITEST] * Fix a memset call. CID 1223160. CORE-7975 Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateDIBSection.c Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateDIBSection.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateDIBSection.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateDIBSection.c [iso-8859-1] Sat Aug 30 12:03:58 2014 @@ -417,7 +417,7 @@ pbV5h->bV5BlueMask = 0; pbV5h->bV5AlphaMask = 0; pbV5h->bV5CSType = 0; - memset(&pbV5h->bV5Endpoints, sizeof(CIEXYZTRIPLE), 0); + memset(&pbV5h->bV5Endpoints, 0, sizeof(CIEXYZTRIPLE)); pbV5h->bV5GammaRed = 0; pbV5h->bV5GammaGreen = 0; pbV5h->bV5GammaBlue = 0;

1 0

[akhaldi] 63987: [W32KNAPI_APITEST] * Remove some unused pointer values. CID 1223186. CORE-7975
by akhaldi＠svn.reactos.org 30 Aug '14

30 Aug '14

Author: akhaldi Date: Sat Aug 30 11:53:17 2014 New Revision: 63987 URL: http://svn.reactos.org/svn/reactos?rev=63987&view=rev Log: [W32KNAPI_APITEST] * Remove some unused pointer values. CID 1223186. CORE-7975 Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateBitmap.c Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateBitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateBitmap.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateBitmap.c [iso-8859-1] Sat Aug 30 11:53:17 2014 @@ -165,28 +165,28 @@ /* Test height 0 params */ SetLastError(ERROR_SUCCESS); - TEST((hBmp = NtGdiCreateBitmap(1, 0, 1, 1, NULL)) == NULL); + TEST(NtGdiCreateBitmap(1, 0, 1, 1, NULL) == NULL); TEST(GetLastError() == ERROR_INVALID_PARAMETER); /* Test height -1 params */ SetLastError(ERROR_SUCCESS); - TEST((hBmp = NtGdiCreateBitmap(1, -1, 1, 1, NULL)) == NULL); + TEST(NtGdiCreateBitmap(1, -1, 1, 1, NULL) == NULL); TEST(GetLastError() == ERROR_INVALID_PARAMETER); /* Test witdth 0 params */ SetLastError(ERROR_SUCCESS); - TEST((hBmp = NtGdiCreateBitmap(0, 1, 1, 1, NULL)) == NULL); + TEST(NtGdiCreateBitmap(0, 1, 1, 1, NULL) == NULL); TEST(GetLastError() == ERROR_INVALID_PARAMETER); /* Test witdth -1 params */ SetLastError(ERROR_SUCCESS); - TEST((hBmp = NtGdiCreateBitmap(-1, 0, 1, 1, NULL)) == NULL); + TEST(NtGdiCreateBitmap(-1, 0, 1, 1, NULL) == NULL); TEST(GetLastError() == ERROR_INVALID_PARAMETER); /* Test witdth -1 params */ SetLastError(ERROR_SUCCESS); - TEST((hBmp = NtGdiCreateBitmap(0, 0, 1, 1, NULL)) == NULL); + TEST(NtGdiCreateBitmap(0, 0, 1, 1, NULL) == NULL); TEST(GetLastError() == ERROR_INVALID_PARAMETER);

1 0

[akhaldi] 63986: [USER32] * Remove unused pointer. CID 1223187. CORE-7975
by akhaldi＠svn.reactos.org 30 Aug '14

30 Aug '14

Author: akhaldi Date: Sat Aug 30 11:38:16 2014 New Revision: 63986 URL: http://svn.reactos.org/svn/reactos?rev=63986&view=rev Log: [USER32] * Remove unused pointer. CID 1223187. CORE-7975 Modified: trunk/reactos/win32ss/user/user32/windows/menu.c Modified: trunk/reactos/win32ss/user/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/menu.c [iso-8859-1] Sat Aug 30 11:38:16 2014 @@ -4586,11 +4586,10 @@ UINT uIDCheckItem, UINT uCheck) { - PMENU pMenu; PITEM item; DWORD Ret; - if (!(pMenu = ValidateHandle(hmenu, TYPE_MENU))) + if (!ValidateHandle(hmenu, TYPE_MENU)) return -1; if (!(item = MENU_FindItem( &hmenu, &uIDCheckItem, uCheck ))) return -1;

1 0

[tfaber] 63985: [FREELDR] - Improve GetPciIrqRoutingTable. Patch by Sergey Chernov (serrox at ya dot ru), small modifications by me. CORE-8440
by tfaber＠svn.reactos.org 30 Aug '14

30 Aug '14

Author: tfaber Date: Sat Aug 30 10:59:25 2014 New Revision: 63985 URL: http://svn.reactos.org/svn/reactos?rev=63985&view=rev Log: [FREELDR] - Improve GetPciIrqRoutingTable. Patch by Sergey Chernov (serrox at ya dot ru), small modifications by me. CORE-8440 Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c [iso-8859-1] Sat Aug 30 10:59:25 2014 @@ -41,6 +41,14 @@ { TRACE("Found signature\n"); + if (Table->TableSize < FIELD_OFFSET(PCI_IRQ_ROUTING_TABLE, Slot) || + Table->TableSize % 16 != 0) + { + ERR("Invalid routing table size (%u) at %p. Continue searching...\n", Table->TableSize, Table); + Table = (PPCI_IRQ_ROUTING_TABLE)((ULONG_PTR)Table + 0x10); + continue; + } + Ptr = (PUCHAR)Table; Sum = 0; for (i = 0; i < Table->TableSize; i++) @@ -50,17 +58,19 @@ if ((Sum & 0xFF) != 0) { - ERR("Invalid routing table\n"); - return NULL; - } - - TRACE("Valid checksum\n"); - - return Table; + ERR("Invalid routing table checksum (%#lx) at %p. Continue searching...\n", Sum & 0xFF, Table); + } + else + { + TRACE("Valid checksum\n"); + return Table; + } } Table = (PPCI_IRQ_ROUTING_TABLE)((ULONG_PTR)Table + 0x10); } + + ERR("No valid routing table found!\n"); return NULL; }

1 0

[tfaber] 63984: [UNIATA] - Update to 0.45a8 CORE-8432 #resolve
by tfaber＠svn.reactos.org 30 Aug '14

30 Aug '14

Author: tfaber Date: Sat Aug 30 10:17:53 2014 New Revision: 63984 URL: http://svn.reactos.org/svn/reactos?rev=63984&view=rev Log: [UNIATA] - Update to 0.45a8 CORE-8432 #resolve Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h trunk/reactos/drivers/storage/ide/uniata/bm_devs.h trunk/reactos/drivers/storage/ide/uniata/config.h trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp trunk/reactos/drivers/storage/ide/uniata/id_init.cpp trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp trunk/reactos/drivers/storage/ide/uniata/id_sata.h trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/atapi.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/atapi.h [iso-8859-1] Sat Aug 30 10:17:53 2014 @@ -938,6 +938,7 @@ USHORT v30:1; USHORT Reserved:10; } SATA; + USHORT Flags; } TransportMajor; USHORT TransportMinor; // 223 Modified: trunk/reactos/drivers/storage/ide/uniata/bm_devs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/bm_devs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/bm_devs.h [iso-8859-1] Sat Aug 30 10:17:53 2014 @@ -319,12 +319,13 @@ #define ATA_M88SX6042 0x604211ab #define ATA_M88SX6081 0x608111ab #define ATA_M88SX7042 0x704211ab -#define ATA_M88SX6101 0x610111ab -#define ATA_M88SX6102 0x610211ab -#define ATA_M88SX6111 0x611111ab -#define ATA_M88SX6121 0x612111ab -#define ATA_M88SX6141 0x614111ab -#define ATA_M88SX6145 0x614511ab +#define ATA_M88SE6101 0x610111ab +#define ATA_M88SE6102 0x610211ab +#define ATA_M88SE6111 0x611111ab +#define ATA_M88SE6121 0x612111ab +#define ATA_M88SE6141 0x614111ab +#define ATA_M88SE6145 0x614511ab +#define ATA_M88SE9123 0x91231b4b #define ATA_MARVELL2_ID 0x1b4b #define ATA_MICRON_ID 0x1042 @@ -934,6 +935,7 @@ PCI_DEV_HW_SPEC_BM( 6121, 11ab, 0x00, ATA_UDMA6, "Marvell 88SX6121" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 6141, 11ab, 0x00, ATA_UDMA6, "Marvell 88SX6141" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 6145, 11ab, 0x00, ATA_UDMA6, "Marvell 88SX6145" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 9123, 1b4b, 0x00, ATA_UDMA6, "Marvell 88SX9123" , UNIATA_SATA | UNIATA_AHCI ), /* PCI_DEV_HW_SPEC_BM( 91a4, 1b4b, 0x00, ATA_UDMA6, "Marvell 88SE912x" , 0 ),*/ PCI_DEV_HW_SPEC_BM( 01bc, 10de, 0x00, ATA_UDMA5, "nVidia nForce" , 0 ), @@ -1139,11 +1141,12 @@ */ PCI_DEV_HW_SPEC_BM( 5513, 1039, 0xc2, ATA_UDMA2, "SiS ATA-xxx" , 0 ), PCI_DEV_HW_SPEC_BM( 5513, 1039, 0x00, ATA_WDMA2, "SiS ATA-xxx" , 0 ), + PCI_DEV_HW_SPEC_BM( 5518, 1039, 0x00, ATA_UDMA6, "SiS 962/3" , SIS133NEW | SIS_BASE ), PCI_DEV_HW_SPEC_BM( 0601, 1039, 0x00, ATA_WDMA2, "SiS ATA-xxx" , 0 ), - PCI_DEV_HW_SPEC_BM( 1183, 1039, 0x00, ATA_UDMA6, "SiS PATA-1183" , SIS133NEW), - PCI_DEV_HW_SPEC_BM( 1182, 1039, 0x00, ATA_SA150, "SiS SATA 1182" , SISSATA | UNIATA_SATA), - PCI_DEV_HW_SPEC_BM( 0183, 1039, 0x00, ATA_SA150, "SiS SATA 183" , SISSATA | UNIATA_SATA), + PCI_DEV_HW_SPEC_BM( 1183, 1039, 0x00, ATA_SA150, "SiS 1183 SATA" , SISSATA), + PCI_DEV_HW_SPEC_BM( 1182, 1039, 0x00, ATA_SA150, "SiS 1182" , SISSATA | UNIATA_SATA), + PCI_DEV_HW_SPEC_BM( 0183, 1039, 0x00, ATA_SA150, "SiS 183 RAID" , SISSATA | UNIATA_SATA), PCI_DEV_HW_SPEC_BM( 0182, 1039, 0x00, ATA_SA150, "SiS SATA 182" , SISSATA | UNIATA_SATA), PCI_DEV_HW_SPEC_BM( 0181, 1039, 0x00, ATA_SA150, "SiS SATA 181" , SISSATA | UNIATA_SATA), PCI_DEV_HW_SPEC_BM( 0180, 1039, 0x00, ATA_SA150, "SiS SATA 180" , SISSATA | UNIATA_SATA), Modified: trunk/reactos/drivers/storage/ide/uniata/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/config.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/config.h [iso-8859-1] Sat Aug 30 10:17:53 2014 @@ -43,6 +43,7 @@ /***************************************/ //#define UNIATA_DUMP_ATAPI +#define UNIATA_DUMP_RW /***************************************/ // Optimization for uni-processor machines Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] Sat Aug 30 10:17:53 2014 @@ -1677,6 +1677,25 @@ ULONGLONG NativeNumOfSectors=0; ULONGLONG cylinders=0; ULONGLONG tmp_cylinders=0; + + KdPrint2((PRINT_PREFIX "PhysLogSectorSize %#x, %#x, offset %#x\n", + deviceExtension->FullIdentifyData.PhysLogSectorSize, + deviceExtension->FullIdentifyData.LargeSectorSize, + deviceExtension->FullIdentifyData.LogicalSectorOffset + )); + + KdPrint2((PRINT_PREFIX "NV PM_Sup %d, PM_En %d, En %d, PM ver %#x ver %#x\n", + deviceExtension->FullIdentifyData.NVCache_PM_Supported, + deviceExtension->FullIdentifyData.NVCache_PM_Enabled, + deviceExtension->FullIdentifyData.NVCache_Enabled, + deviceExtension->FullIdentifyData.NVCache_PM_Version, + deviceExtension->FullIdentifyData.NVCache_Version + )); + + KdPrint2((PRINT_PREFIX "R-rate %#x\n", + deviceExtension->FullIdentifyData.NominalMediaRotationRate + )); + // Read very-old-style drive geometry KdPrint2((PRINT_PREFIX "CHS %#x:%#x:%#x\n", deviceExtension->FullIdentifyData.NumberOfCylinders, @@ -2243,6 +2262,7 @@ UniataAhciReset(HwDeviceExtension, j); } else { KdPrint2((PRINT_PREFIX " skip not implemented\n")); + continue; } } else { KdPrint2((PRINT_PREFIX " ATA path, chan %#x\n", chan)); @@ -5181,6 +5201,7 @@ } else { + KdPrint2((PRINT_PREFIX "AtapiInterrupt: !DRQ, !BUSY, WordsLeft %#x\n", AtaReq->WordsLeft)); if (AtaReq->WordsLeft) { // Funky behaviour seen with PCI IDE (not all, just one). @@ -5568,7 +5589,7 @@ } else if (interruptReason == (ATAPI_IR_IO_toHost | ATAPI_IR_COD_Cmd) && !(statusByte & IDE_STATUS_DRQ)) { KdPrint2((PRINT_PREFIX "AtapiInterrupt: interruptReason = CompleteRequest\n")); - // Command complete. We exactly know this because os IReason. + // Command complete. We exactly know this because of IReason. if(DmaTransfer) { KdPrint2((PRINT_PREFIX "AtapiInterrupt: CompleteRequest, was DmaTransfer\n")); @@ -5582,6 +5603,9 @@ AtaReq->DataBuffer += wordCount; AtaReq->WordsLeft -= wordCount; AtaReq->WordsTransfered += wordCount; + + KdPrint2((PRINT_PREFIX "AtapiInterrupt: wordCount %#x, WordsTransfered %#x\n", wordCount, AtaReq->WordsTransfered)); + } //if (AtaReq->WordsLeft) { // status = SRB_STATUS_DATA_OVERRUN; @@ -6921,6 +6945,13 @@ case SCSIOP_WRITE16: // all right break; + case SCSIOP_READ_CD: + case SCSIOP_READ_CD_MSF: + if(deviceExtension->opt_AtapiDmaRawRead) { + // all right + break; + } + /* FALL THROUGH */ default: KdPrint2((PRINT_PREFIX "AtapiSendCommand: SRB_STATUS_BUSY\n")); return SRB_STATUS_BUSY; @@ -7100,6 +7131,7 @@ } break; case SCSIOP_READ_CD: + case SCSIOP_READ_CD_MSF: if(deviceExtension->opt_AtapiDmaRawRead) goto call_dma_setup; break; Modified: trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp [iso-8859-1] Sat Aug 30 10:17:53 2014 @@ -105,6 +105,7 @@ ULONG addr; ph_addr = MmGetPhysicalAddress(data); + KdPrint3((PRINT_PREFIX "AtapiVirtToPhysAddr_: %x -> %8.8x:%8.8x\n", data, ph_addr.HighPart, ph_addr.LowPart)); if(!ph_addru && ph_addr.HighPart) { // do so until we add 64bit address support // or some workaround Modified: trunk/reactos/drivers/storage/ide/uniata/id_init.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_init.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_init.cpp [iso-8859-1] Sat Aug 30 10:17:53 2014 @@ -355,9 +355,9 @@ } static BUSMASTER_CONTROLLER_INFORMATION const SiSAdapters[] = { - PCI_DEV_HW_SPEC_BM( 1183, 1039, 0x00, ATA_UDMA6, "SiS 1183" , SIS133NEW), + PCI_DEV_HW_SPEC_BM( 1183, 1039, 0x00, ATA_SA150, "SiS 1183 IDE" , SIS133NEW), PCI_DEV_HW_SPEC_BM( 1182, 1039, 0x00, ATA_SA150, "SiS 1182" , SISSATA | UNIATA_SATA), - PCI_DEV_HW_SPEC_BM( 0183, 1039, 0x00, ATA_SA150, "SiS 183" , SISSATA | UNIATA_SATA), + PCI_DEV_HW_SPEC_BM( 0183, 1039, 0x00, ATA_SA150, "SiS 183 RAID" , SISSATA | UNIATA_SATA), PCI_DEV_HW_SPEC_BM( 0182, 1039, 0x00, ATA_SA150, "SiS 182" , SISSATA | UNIATA_SATA), PCI_DEV_HW_SPEC_BM( 0181, 1039, 0x00, ATA_SA150, "SiS 181" , SISSATA | UNIATA_SATA), PCI_DEV_HW_SPEC_BM( 0180, 1039, 0x00, ATA_SA150, "SiS 180" , SISSATA | UNIATA_SATA), @@ -376,7 +376,7 @@ /* PCI_DEV_HW_SPEC_BM( 0640, 1039, 0x00, ATA_UDMA4, "SiS 640" , SIS_SOUTH ),*/ PCI_DEV_HW_SPEC_BM( 0635, 1039, 0x00, ATA_UDMA5, "SiS 635" , SIS100NEW ), PCI_DEV_HW_SPEC_BM( 0633, 1039, 0x00, ATA_UDMA5, "SiS 633" , SIS100NEW ), - PCI_DEV_HW_SPEC_BM( 0630, 1039, 0x00, ATA_UDMA5, "SiS 630S" , SIS100OLD ), + PCI_DEV_HW_SPEC_BM( 0630, 1039, 0x30, ATA_UDMA5, "SiS 630S" , SIS100OLD ), PCI_DEV_HW_SPEC_BM( 0630, 1039, 0x00, ATA_UDMA4, "SiS 630" , SIS66 ), PCI_DEV_HW_SPEC_BM( 0620, 1039, 0x00, ATA_UDMA4, "SiS 620" , SIS66 ), @@ -2390,6 +2390,9 @@ break; } } + if(deviceExtension->HwFlags & UNIATA_SATA) { + // do nothing for SATA + } else if(ChipType == SIS133NEW) { USHORT tmp16; // check 80-pin cable Modified: trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp [iso-8859-1] Sat Aug 30 10:17:53 2014 @@ -645,9 +645,7 @@ PHW_CHANNEL chan; ULONG offs; ULONG BaseMemAddress; -#ifdef DBG ULONG PI; -#endif //DBG ULONG CAP; ULONG CAP2; ULONG BOHC; @@ -757,11 +755,12 @@ if(CAP & AHCI_CAP_SAM) { KdPrint2((PRINT_PREFIX " AHCI legasy SATA\n")); } -#ifdef DBG + /* get the number of HW channels */ PI = UniataAhciReadHostPort4(deviceExtension, IDX_AHCI_PI); + deviceExtension->AHCI_PI = PI; KdPrint2((PRINT_PREFIX " AHCI PI %#x\n", PI)); -#endif //DBG + CAP2 = UniataAhciReadHostPort4(deviceExtension, IDX_AHCI_CAP2); if(CAP2 & AHCI_CAP2_BOH) { KdPrint2((PRINT_PREFIX " retry BOHC\n")); @@ -977,18 +976,22 @@ max((CAP & AHCI_CAP_NOP_MASK)+1, n); KdPrint2((PRINT_PREFIX " CommandSlots %d\n", (CAP & AHCI_CAP_NCS_MASK)>>8 )); - KdPrint2((PRINT_PREFIX " Channels %d\n", n)); + KdPrint2((PRINT_PREFIX " Detected Channels %d / %d\n", NumberChannels, n)); switch(deviceExtension->DevID) { - case ATA_M88SX6111: + case ATA_M88SE6111: + KdPrint2((PRINT_PREFIX " Marvell M88SE6111 -> 1\n")); NumberChannels = 1; break; - case ATA_M88SX6121: - NumberChannels = 2; + case ATA_M88SE6121: + KdPrint2((PRINT_PREFIX " Marvell M88SE6121 -> 2\n")); + NumberChannels = min(NumberChannels, 2); break; - case ATA_M88SX6141: - case ATA_M88SX6145: - NumberChannels = 4; + case ATA_M88SE6141: + case ATA_M88SE6145: + case ATA_M88SE9123: + KdPrint2((PRINT_PREFIX " Marvell M88SE614x/9123 -> 4\n")); + NumberChannels = min(NumberChannels, 4); break; } // switch() @@ -997,6 +1000,7 @@ found = FALSE; goto exit_detect; } + KdPrint2((PRINT_PREFIX " Adjusted Channels %d\n", NumberChannels)); #ifdef DBG v_Mj = ((version >> 20) & 0xf0) + ((version >> 16) & 0x0f); Modified: trunk/reactos/drivers/storage/ide/uniata/id_sata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_sata.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_sata.h [iso-8859-1] Sat Aug 30 10:17:53 2014 @@ -407,8 +407,18 @@ IN ULONG Length = 0 ); -#define UniataAhciChanImplemented(deviceExtension, c) \ - (((deviceExtension)->AHCI_PI) & (1 << c)) +__inline +BOOLEAN +UniataAhciChanImplemented( + IN PHW_DEVICE_EXTENSION deviceExtension, + IN ULONG c + ) +{ +#ifdef DBG + KdPrint2((PRINT_PREFIX "imp: %#x & %#x\n", (deviceExtension)->AHCI_PI, (1<<c) )); +#endif + return (((deviceExtension)->AHCI_PI) & ((ULONG)1 << c)) ? TRUE : FALSE; +} // end UniataAhciChanImplemented() #endif //__UNIATA_SATA__H__ Modified: trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h [iso-8859-1] Sat Aug 30 10:17:53 2014 @@ -1,10 +1,10 @@ -#define UNIATA_VER_STR "45a3" -#define UNIATA_VER_DOT 0.45.1.3 +#define UNIATA_VER_STR "45a8" +#define UNIATA_VER_DOT 0.45.1.8 #define UNIATA_VER_MJ 0 #define UNIATA_VER_MN 45 #define UNIATA_VER_SUB_MJ 1 -#define UNIATA_VER_SUB_MN 3 -#define UNIATA_VER_DOT_COMMA 0,45,1,3 -#define UNIATA_VER_DOT_STR "0.45.1.3" +#define UNIATA_VER_SUB_MN 8 +#define UNIATA_VER_DOT_COMMA 0,45,1,8 +#define UNIATA_VER_DOT_STR "0.45.1.8" #define UNIATA_VER_YEAR 2014 #define UNIATA_VER_YEAR_STR "2014"

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