Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 25827: add to bootcd to highlight the paint issue
by gedmurphy＠svn.reactos.org 17 Feb '07

17 Feb '07

Author: gedmurphy Date: Sat Feb 17 03:23:53 2007 New Revision: 25827 URL: http://svn.reactos.org/svn/reactos?rev=25827&view=rev Log: add to bootcd to highlight the paint issue Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Sat Feb 17 03:23:53 2007 @@ -32,6 +32,7 @@ ; Base files base\applications\cacls\cacls.exe 1 base\applications\calc\calc.exe 1 +base\applications\charmap\charmap.exe 1 base\applications\cmdutils\find\find.exe 1 base\applications\cmdutils\more\more.exe 1 base\applications\control\control.exe 1

1 0

[gedmurphy] 25826: add to build
by gedmurphy＠svn.reactos.org 17 Feb '07

17 Feb '07

Author: gedmurphy Date: Sat Feb 17 03:22:21 2007 New Revision: 25826 URL: http://svn.reactos.org/svn/reactos?rev=25826&view=rev Log: add to build Modified: trunk/reactos/base/applications/applications.rbuild Modified: trunk/reactos/base/applications/applications.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/applicat… ============================================================================== --- trunk/reactos/base/applications/applications.rbuild (original) +++ trunk/reactos/base/applications/applications.rbuild Sat Feb 17 03:22:21 2007 @@ -6,6 +6,9 @@ </directory> <directory name="calc"> <xi:include href="calc/calc.rbuild" /> +</directory> +<directory name="charmap"> + <xi:include href="charmap/charmap.rbuild" /> </directory> <directory name="cmdutils"> <xi:include href="cmdutils/cmdutils.rbuild" />

1 0

[gedmurphy] 25825: - halfplement charmap.exe - tested in ROS, by no means perfect but we cant least see the various glyphs within a font - this app highlights an issue with our paint code (not yet investigated)
by gedmurphy＠svn.reactos.org 17 Feb '07

17 Feb '07

Author: gedmurphy Date: Sat Feb 17 03:13:35 2007 New Revision: 25825 URL: http://svn.reactos.org/svn/reactos?rev=25825&view=rev Log: - halfplement charmap.exe - tested in ROS, by no means perfect but we cant least see the various glyphs within a font - this app highlights an issue with our paint code (not yet investigated) Added: trunk/reactos/base/applications/charmap/ trunk/reactos/base/applications/charmap/about.c trunk/reactos/base/applications/charmap/charmap.c trunk/reactos/base/applications/charmap/charmap.rbuild trunk/reactos/base/applications/charmap/charmap.rc trunk/reactos/base/applications/charmap/lang/ trunk/reactos/base/applications/charmap/lang/en-US.rc trunk/reactos/base/applications/charmap/lrgcell.c trunk/reactos/base/applications/charmap/manifest.xml trunk/reactos/base/applications/charmap/map.c trunk/reactos/base/applications/charmap/precomp.h trunk/reactos/base/applications/charmap/res/ trunk/reactos/base/applications/charmap/res/charmap.ico (with props) trunk/reactos/base/applications/charmap/resource.h trunk/reactos/base/applications/charmap/rsrc.rc Added: trunk/reactos/base/applications/charmap/about.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/about.c (added) +++ trunk/reactos/base/applications/charmap/about.c Sat Feb 17 03:13:35 2007 @@ -1,0 +1,55 @@ +#include <precomp.h> + + +INT_PTR CALLBACK +AboutDialogProc(HWND hDlg, + UINT message, + WPARAM wParam, + LPARAM lParam) +{ + HWND hLicenseEditWnd; + HICON hIcon = NULL; + TCHAR strLicense[700]; + + switch (message) + { + case WM_INITDIALOG: + + hIcon = LoadImage(hInstance, + MAKEINTRESOURCE(IDI_ICON), + IMAGE_ICON, + 16, + 16, + 0); + + SendMessage(hDlg, + WM_SETICON, + ICON_SMALL, + (LPARAM)hIcon); + + hLicenseEditWnd = GetDlgItem(hDlg, + IDC_LICENSE_EDIT); + + LoadString(hInstance, + IDS_LICENSE, + strLicense, + sizeof(strLicense) / sizeof(TCHAR)); + + SetWindowText(hLicenseEditWnd, + strLicense); + return TRUE; + + case WM_COMMAND: + if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL)) + { + DestroyIcon(hIcon); + EndDialog(hDlg, + LOWORD(wParam)); + return TRUE; + } + + break; + } + + return FALSE; +} Added: trunk/reactos/base/applications/charmap/charmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/charmap.c (added) +++ trunk/reactos/base/applications/charmap/charmap.c Sat Feb 17 03:13:35 2007 @@ -1,0 +1,267 @@ +#include <precomp.h> + +const TCHAR szMapWndClass[] = TEXT("FontMapWnd"); +const TCHAR szLrgCellWndClass[] = TEXT("LrgCellWnd"); + +HINSTANCE hInstance; + +/* Font-enumeration callback */ +int CALLBACK +EnumFontNames(ENUMLOGFONTEX *lpelfe, + NEWTEXTMETRICEX *lpntme, + DWORD FontType, + LPARAM lParam) +{ + HWND hwndCombo = (HWND)lParam; + TCHAR *pszName = lpelfe->elfLogFont.lfFaceName; + + /* make sure font doesn't already exist in our list */ + if(SendMessage(hwndCombo, + CB_FINDSTRING, + 0, + (LPARAM)pszName) == CB_ERR) + { + INT idx; + BOOL fFixed; + BOOL fTrueType; + + /* add the font */ + idx = (INT)SendMessage(hwndCombo, + CB_ADDSTRING, + 0, + (LPARAM)pszName); + + /* record the font's attributes (Fixedwidth and Truetype) */ + fFixed = (lpelfe->elfLogFont.lfPitchAndFamily & FIXED_PITCH) ? TRUE : FALSE; + fTrueType = (lpelfe->elfLogFont.lfOutPrecision == OUT_STROKE_PRECIS) ? TRUE : FALSE; + + /* store this information in the list-item's userdata area */ + SendMessage(hwndCombo, + CB_SETITEMDATA, + idx, + MAKEWPARAM(fFixed, fTrueType)); + } + + return 1; +} + + +/* Initialize the font-list by enumeration all system fonts */ +static VOID +FillFontStyleComboList(HWND hwndCombo) +{ + HDC hdc; + LOGFONT lf; + + /* FIXME: for fun, draw each font in its own style */ + HFONT hFont = GetStockObject(DEFAULT_GUI_FONT); + SendMessage(hwndCombo, + WM_SETFONT, + (WPARAM)hFont, + 0); + + lf.lfCharSet = DEFAULT_CHARSET; + lf.lfFaceName[0] = _T('\0'); // all fonts + lf.lfPitchAndFamily = 0; + + hdc = GetDC(hwndCombo); + + /* store the list of fonts in the combo */ + EnumFontFamiliesEx(hdc, + &lf, + (FONTENUMPROC)EnumFontNames, + (LPARAM)hwndCombo, + 0); + + ReleaseDC(hwndCombo, + hdc); + + /* set default to Arial */ + SendMessage(hwndCombo, + CB_SELECTSTRING, + -1, + (LPARAM)_T("Arial")); +} + + +static VOID +ChangeMapFont(HWND hDlg) +{ + HWND hCombo; + HWND hMap; + LPTSTR lpFontName; + INT Len; + + hCombo = GetDlgItem(hDlg, IDC_FONTCOMBO); + + Len = GetWindowTextLength(hCombo); + + if (Len != 0) + { + lpFontName = HeapAlloc(GetProcessHeap(), + 0, + (Len + 1) * sizeof(TCHAR)); + + if (lpFontName) + { + SendMessage(hCombo, + WM_GETTEXT, + 31, + (LPARAM)lpFontName); + + hMap = GetDlgItem(hDlg, IDC_FONTMAP); + + SendMessage(hMap, + FM_SETFONT, + 0, + (LPARAM)lpFontName); + } + } +} + + +BOOL CALLBACK +DlgProc(HWND hDlg, + UINT Message, + WPARAM wParam, + LPARAM lParam) +{ + static HICON hSmIcon = NULL; + static HICON hBgIcon = NULL; + + switch(Message) + { + case WM_INITDIALOG: + { + hSmIcon = LoadImage(hInstance, + MAKEINTRESOURCE(IDI_ICON), + IMAGE_ICON, + 16, + 16, + 0); + hBgIcon = LoadImage(hInstance, + MAKEINTRESOURCE(IDI_ICON), + IMAGE_ICON, + 32, + 32, + 0); + + SendMessage(hDlg, + WM_SETICON, + ICON_SMALL, + (LPARAM)hSmIcon); + SendMessage(hDlg, + WM_SETICON, + ICON_BIG, + (LPARAM)hBgIcon); + + FillFontStyleComboList(GetDlgItem(hDlg, + IDC_FONTCOMBO)); + + ChangeMapFont(hDlg); + } + break; + + case WM_CLOSE: + { + EndDialog(hDlg, 0); + } + break; + + case WM_COMMAND: + { + switch(LOWORD(wParam)) + { + case IDC_FONTCOMBO: + { + if (HIWORD(wParam) == CBN_SELCHANGE) + { + ChangeMapFont(hDlg); + } + } + break; + + case IDOK: + EndDialog(hDlg, 0); + break; + + case IDC_ABOUT: + DialogBox(hInstance, + MAKEINTRESOURCE(IDD_ABOUTBOX), + hDlg, + AboutDialogProc); + break; + } + } + break; + + default: + return FALSE; + } + + return TRUE; +} + +BOOL +RegisterControls(HINSTANCE hInstance) +{ + WNDCLASS wc = {0}; + + //wc.style = CS_DBLCLKS; + wc.lpfnWndProc = MapWndProc; + wc.cbWndExtra = sizeof(PMAP); + wc.hInstance = hInstance; + wc.hCursor = LoadCursor(NULL, + (LPTSTR)IDC_ARROW); + wc.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); + wc.lpszClassName = szMapWndClass; + + if (RegisterClass(&wc)) + { + wc.lpfnWndProc = LrgCellWndProc; + wc.cbWndExtra = 0; + wc.lpszClassName = szLrgCellWndClass; + + return RegisterClass(&wc) != 0; + } + + return FALSE; +} + +VOID +UnregisterControls(HINSTANCE hInstance) +{ + UnregisterClass(szMapWndClass, + hInstance); + + UnregisterClass(szLrgCellWndClass, + hInstance); +} + + +INT WINAPI +WinMain(HINSTANCE hInst, + HINSTANCE hPrev, + LPSTR Cmd, + int iCmd) +{ + INITCOMMONCONTROLSEX iccx; + INT Ret; + + hInstance = hInst; + + iccx.dwSize = sizeof(INITCOMMONCONTROLSEX); + iccx.dwICC = ICC_TAB_CLASSES; + InitCommonControlsEx(&iccx); + + RegisterControls(hInstance); + + Ret = DialogBox(hInstance, + MAKEINTRESOURCE(IDD_CHARMAP), + NULL, + (DLGPROC)DlgProc); + + UnregisterControls(hInstance); + + return Ret; +} Added: trunk/reactos/base/applications/charmap/charmap.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/charmap.rbuild (added) +++ trunk/reactos/base/applications/charmap/charmap.rbuild Sat Feb 17 03:13:35 2007 @@ -1,0 +1,25 @@ +<?xml version="1.0"?> +<rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> + <module name="charmap" type="win32gui" installbase="system32" installname="charmap.exe"> + <include base="charmap">.</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <library>ntdll</library> + <library>gdi32</library> + <library>kernel32</library> + <library>user32</library> + <library>comctl32</library> + <compilationunit name="unit.c"> + <file>about.c</file> + <file>charmap.c</file> + <file>lrgcell.c</file> + <file>map.c</file> + </compilationunit> + <file>charmap.rc</file> + <pch>precomp.h</pch> + </module> +</rbuild> Added: trunk/reactos/base/applications/charmap/charmap.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/charmap.rc (added) +++ trunk/reactos/base/applications/charmap/charmap.rc Sat Feb 17 03:13:35 2007 @@ -1,0 +1,11 @@ +#include <windows.h> +#include <commctrl.h> +#include "resource.h" + + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Character Map\0" +#define REACTOS_STR_INTERNAL_NAME "charmap\0" +#define REACTOS_STR_ORIGINAL_FILENAME "charmap.exe\0" +#include <reactos/version.rc> + +#include "rsrc.rc" Added: trunk/reactos/base/applications/charmap/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/en-US.rc (added) +++ trunk/reactos/base/applications/charmap/lang/en-US.rc Sat Feb 17 03:13:35 2007 @@ -1,0 +1,35 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233 +CAPTION "Character Map" +FONT 8,"MS Sans Serif",0,0 +STYLE WS_BORDER | WS_VISIBLE | WS_SYSMENU +BEGIN + LTEXT "Font :", IDC_STATIC, 6, 7, 24, 9 + COMBOBOX IDC_FONTCOMBO, 36, 5, 196, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS + PUSHBUTTON "Help", IDC_CMHELP, 235, 5, 35, 13 + PUSHBUTTON "?", IDC_ABOUT, 272, 5, 14, 13 + CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156 + LTEXT "Characters to copy :", IDC_STATIC, 6, 188, 66, 9 + EDITTEXT IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "Select", IDC_SELECT, 194, 186, 46, 13 + PUSHBUTTON "Copy", IDC_COPY, 244, 186, 46, 13, WS_DISABLED + //AUTOCHECKBOX "Advanced view", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP + //EDITTEXT IDC_DISPLAY, 8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY +END + +IDD_ABOUTBOX DIALOGEX 22,16,210,182 +CAPTION "About Character Map" +FONT 8,"MS Sans Serif",0,0 +STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + LTEXT "Character Map v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 150, 36 + PUSHBUTTON "Close", IDOK, 75, 162, 44, 15 + ICON IDI_ICON, IDC_STATIC, 10, 10, 7, 30 + EDITTEXT IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_LICENSE "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.\r\n\r\nThis 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.\r\n\r\nYou 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." +END Added: trunk/reactos/base/applications/charmap/lrgcell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lrgcell.c (added) +++ trunk/reactos/base/applications/charmap/lrgcell.c Sat Feb 17 03:13:35 2007 @@ -1,0 +1,152 @@ +#include <precomp.h> + + +static HFONT +SetLrgFont(PMAP infoPtr) +{ + LOGFONT lf; + HFONT hFont = NULL; + HDC hdc; + HWND hCombo; + LPTSTR lpFontName; + INT Len; + + hCombo = GetDlgItem(infoPtr->hParent, IDC_FONTCOMBO); + + Len = GetWindowTextLength(hCombo); + + if (Len != 0) + { + lpFontName = HeapAlloc(GetProcessHeap(), + 0, + (Len + 1) * sizeof(TCHAR)); + + if (lpFontName) + { + SendMessage(hCombo, + WM_GETTEXT, + 31, + (LPARAM)lpFontName); + + ZeroMemory(&lf, sizeof(lf)); + + hdc = GetDC(infoPtr->hLrgWnd); + lf.lfHeight = GetDeviceCaps(hdc, + LOGPIXELSY) / 2; + ReleaseDC(infoPtr->hLrgWnd, hdc); + + lf.lfCharSet = DEFAULT_CHARSET; + lstrcpy(lf.lfFaceName, + lpFontName); + + hFont = CreateFontIndirect(&lf); + + HeapFree(GetProcessHeap(), + 0, + lpFontName); + } + } + + return hFont; +} + + +LRESULT CALLBACK +LrgCellWndProc(HWND hwnd, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + PMAP infoPtr; + LRESULT Ret = 0; + static INT cxClient, cyClient; + static RECT rc; + static HFONT hFont = NULL; + + infoPtr = (PMAP)GetWindowLongPtr(hwnd, + GWLP_USERDATA); + + if (infoPtr == NULL && uMsg != WM_CREATE) + { + goto HandleDefaultMessage; + } + + switch (uMsg) + { + case WM_CREATE: + { + infoPtr = (PMAP)(((LPCREATESTRUCT)lParam)->lpCreateParams); + + SetWindowLongPtr(hwnd, + GWLP_USERDATA, + (LONG_PTR)infoPtr); + + hFont = SetLrgFont(infoPtr); + + break; + } + + case WM_SIZE: + { + cxClient = LOWORD(lParam); + cyClient = HIWORD(lParam); + + rc.left = 0; + rc.top = 0; + rc.right = cxClient; + rc.bottom = cyClient; + + break; + } + + case WM_PAINT: + { + PAINTSTRUCT ps; + HDC hdc; + HFONT hOldFont; + + hdc = BeginPaint(hwnd, + &ps); + + Rectangle(hdc, + 0, + 0, + cxClient, + cyClient); + + hOldFont = SelectObject(hdc, hFont); + + DrawText(hdc, + &infoPtr->pActiveCell->ch, + 1, + &rc, + DT_CENTER | DT_VCENTER | DT_SINGLELINE); + + SelectObject(hdc, hOldFont); + + EndPaint(hwnd, + &ps); + + break; + } + + case WM_DESTROY: + { + DeleteObject(hFont); + + break; + } + + default: + { +HandleDefaultMessage: + Ret = DefWindowProc(hwnd, + uMsg, + wParam, + lParam); + break; + } + } + + return Ret; +} Added: trunk/reactos/base/applications/charmap/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/manifest.xml (added) +++ trunk/reactos/base/applications/charmap/manifest.xml Sat Feb 17 03:13:35 2007 @@ -1,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly + xmlns="urn:schemas-microsoft-com:asm.v1" + manifestVersion="1.0"> +<assemblyIdentity + name="Win32 Application.default.App" + processorArchitecture="x86" + version="1.0.0.0" + type="win32"/> +<description>ReactOS Character Map</description> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="x86" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> Added: trunk/reactos/base/applications/charmap/map.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/map.c (added) +++ trunk/reactos/base/applications/charmap/map.c Sat Feb 17 03:13:35 2007 @@ -1,0 +1,484 @@ +#include <precomp.h> + + +static VOID +TagFontToCell(PCELL pCell, + TCHAR ch) +{ + pCell->ch = ch; +} + + +static VOID +SetGrid(PMAP infoPtr) +{ + INT x, y; + + for (y = 0; y < YCELLS; y++) + for (x = 0; x < XCELLS; x++) + { + infoPtr->Cells[y][x].CellExt.left = x * infoPtr->CellSize.cx + 1; + infoPtr->Cells[y][x].CellExt.top = y * infoPtr->CellSize.cy + 1; + infoPtr->Cells[y][x].CellExt.right = (x + 1) * infoPtr->CellSize.cx + 2; + infoPtr->Cells[y][x].CellExt.bottom = (y + 1) * infoPtr->CellSize.cy + 2; + + CopyRect(&infoPtr->Cells[y][x].CellInt, + &infoPtr->Cells[y][x].CellExt); + + InflateRect(&infoPtr->Cells[y][x].CellInt, + -1, + -1); + } +} + +static VOID +DrawActiveCell(PMAP infoPtr, + HDC hdc) +{ + Rectangle(hdc, + infoPtr->pActiveCell->CellInt.left, + infoPtr->pActiveCell->CellInt.top, + infoPtr->pActiveCell->CellInt.right, + infoPtr->pActiveCell->CellInt.bottom); + +} + + +static VOID +DrawGrid(PMAP infoPtr, + HDC hdc) +{ + INT x, y; + + for (y = 0; y < YCELLS; y++) + for (x = 0; x < XCELLS; x++) + { + Rectangle(hdc, + infoPtr->Cells[y][x].CellExt.left, + infoPtr->Cells[y][x].CellExt.top, + infoPtr->Cells[y][x].CellExt.right, + infoPtr->Cells[y][x].CellExt.bottom); + } + + if (infoPtr->pActiveCell) + DrawActiveCell(infoPtr, + hdc); +} + + +static VOID +FillGrid(PMAP infoPtr, + HDC hdc) +{ + //GLYPHSET gs; + HFONT hOldFont; + TCHAR ch; + INT x, y; + + hOldFont = SelectObject(hdc, + infoPtr->hFont); + + for (y = 0; y < YCELLS; y++) + for (x = 0; x < XCELLS; x++) + { + ch = (TCHAR)((256 * infoPtr->iPage) + (XCELLS * y) + x); + + TagFontToCell(&infoPtr->Cells[y][x], ch); + + DrawText(hdc, + &ch, + 1, + &infoPtr->Cells[y][x].CellInt, + DT_CENTER | DT_VCENTER | DT_SINGLELINE); + } + + SelectObject(hdc, + hOldFont); +} + + +static BOOL +CreateLargeCell(PMAP infoPtr) +{ + RECT rLarge; + + CopyRect(&rLarge, + &infoPtr->pActiveCell->CellExt); + + MapWindowPoints(infoPtr->hMapWnd, + infoPtr->hParent, + (LPPOINT)&rLarge, + 2); + + InflateRect(&rLarge, + XLARGE - XCELLS, + YLARGE - YCELLS); + + infoPtr->hLrgWnd = CreateWindowEx(0, + szLrgCellWndClass, + NULL, + WS_CHILDWINDOW | WS_VISIBLE, + rLarge.left, + rLarge.top, + rLarge.right - rLarge.left, + rLarge.bottom - rLarge.top, + infoPtr->hParent, + NULL, + hInstance, + infoPtr); + if (!infoPtr->hLrgWnd) + return FALSE; + + return TRUE; +} + + +static VOID +MoveLargeCell(PMAP infoPtr) +{ + RECT rLarge; + + CopyRect(&rLarge, + &infoPtr->pActiveCell->CellExt); + + MapWindowPoints(infoPtr->hMapWnd, + infoPtr->hParent, + (LPPOINT)&rLarge, + 2); + + InflateRect(&rLarge, + XLARGE - XCELLS, + YLARGE - YCELLS); + + MoveWindow(infoPtr->hLrgWnd, + rLarge.left, + rLarge.top, + rLarge.right - rLarge.left, + rLarge.bottom - rLarge.top, + TRUE); + + InvalidateRect(infoPtr->hLrgWnd, + NULL, + TRUE); +} + + +static VOID +SetFont(PMAP infoPtr, + LPTSTR lpFontName) +{ + HDC hdc; + + if (infoPtr->hFont) + DeleteObject(infoPtr->hFont); + + ZeroMemory(&infoPtr->CurrentFont, + sizeof(LOGFONT)); + + hdc = GetDC(infoPtr->hMapWnd); + infoPtr->CurrentFont.lfHeight = GetDeviceCaps(hdc, + LOGPIXELSY) / 5; + ReleaseDC(infoPtr->hMapWnd, hdc); + + infoPtr->CurrentFont.lfCharSet = DEFAULT_CHARSET; + lstrcpy(infoPtr->CurrentFont.lfFaceName, + lpFontName); + + infoPtr->hFont = CreateFontIndirect(&infoPtr->CurrentFont); + + InvalidateRect(infoPtr->hMapWnd, + NULL, + TRUE); +} + + +static VOID +OnClick(PMAP infoPtr, + WORD ptx, + WORD pty) +{ + POINT pt; + INT x, y; + + pt.x = ptx; + pt.y = pty; + + for (x = 0; x < XCELLS; x++) + for (y = 0; y < YCELLS; y++) + { + if (PtInRect(&infoPtr->Cells[y][x].CellInt, + pt)) + { + /* if the cell is not already active */ + if (!infoPtr->Cells[y][x].bActive) + { + /* set previous active cell to inactive */ + if (infoPtr->pActiveCell) + { + /* invalidate normal cells, required when + * moving a small active cell via keyboard */ + if (!infoPtr->pActiveCell->bLarge) + { + InvalidateRect(infoPtr->hMapWnd, + &infoPtr->pActiveCell->CellInt, + TRUE); + } + + infoPtr->pActiveCell->bActive = FALSE; + infoPtr->pActiveCell->bLarge = FALSE; + } + + /* set new cell to active */ + infoPtr->pActiveCell = &infoPtr->Cells[y][x]; + infoPtr->pActiveCell->bActive = TRUE; + infoPtr->pActiveCell->bLarge = TRUE; + if (infoPtr->hLrgWnd) + MoveLargeCell(infoPtr); + else + CreateLargeCell(infoPtr); + } + else + { + /* flick between large and small */ + if (infoPtr->pActiveCell->bLarge) + { + DestroyWindow(infoPtr->hLrgWnd); + infoPtr->hLrgWnd = NULL; + } + else + { + CreateLargeCell(infoPtr); + } + + infoPtr->pActiveCell->bLarge = (infoPtr->pActiveCell->bLarge) ? FALSE : TRUE; + } + + break; + } + } +} + + +static BOOL +OnCreate(PMAP infoPtr, + HWND hwnd, + HWND hParent) +{ + RECT rc; + BOOL Ret = FALSE; + + infoPtr = HeapAlloc(GetProcessHeap(), + 0, + sizeof(MAP)); + if (infoPtr) + { + SetLastError(0); + SetWindowLongPtr(hwnd, + 0, + (DWORD_PTR)infoPtr); + if (GetLastError() == 0) + { + ZeroMemory(infoPtr, + sizeof(MAP)); + + infoPtr->hMapWnd = hwnd; + infoPtr->hParent = hParent; + + GetClientRect(hwnd, &rc); + infoPtr->ClientSize.cx = rc.right; + infoPtr->ClientSize.cy = rc.bottom; + infoPtr->CellSize.cx = infoPtr->ClientSize.cx / XCELLS; + infoPtr->CellSize.cy = infoPtr->ClientSize.cy / YCELLS; + + infoPtr->pActiveCell = NULL; + + SetGrid(infoPtr); + + SetScrollRange(hwnd, SB_VERT, 0, 255, FALSE); + SetScrollPos(hwnd, SB_VERT, 0, TRUE); + + Ret = TRUE; + } + } + + return Ret; +} + + +static VOID +OnVScroll(PMAP infoPtr, + INT Value, + INT Pos) +{ + switch (Value) + { + case SB_LINEUP: + infoPtr->iPage -= 1; + break; + + case SB_LINEDOWN: + infoPtr->iPage += 1; + break; + + case SB_PAGEUP: + infoPtr->iPage -= 16; + break; + + case SB_PAGEDOWN: + infoPtr->iPage += 16; + break; + + case SB_THUMBPOSITION: + infoPtr->iPage = Pos; + break; + + default: + break; + } + + infoPtr->iPage = max(0, + min(infoPtr->iPage, + 255)); + + SetScrollPos(infoPtr->hMapWnd, + SB_VERT, + infoPtr->iPage, + TRUE); + + InvalidateRect(infoPtr->hMapWnd, + NULL, + TRUE); +} + + +static VOID +OnPaint(PMAP infoPtr, + WPARAM wParam) +{ + PAINTSTRUCT ps; + HDC hdc; + + + if (wParam != 0) + { + if (!GetUpdateRect(infoPtr->hMapWnd, + &ps.rcPaint, + TRUE)) + { + return; + } + hdc = (HDC)wParam; + } + else + { + hdc = BeginPaint(infoPtr->hMapWnd, + &ps); + if (hdc == NULL) + { + return; + } + } + + DrawGrid(infoPtr, + hdc); + + FillGrid(infoPtr, + hdc); + + if (wParam == 0) + { + EndPaint(infoPtr->hMapWnd, + &ps); + } +} + + +LRESULT CALLBACK +MapWndProc(HWND hwnd, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + PMAP infoPtr; + LRESULT Ret = 0; + + infoPtr = (PMAP)GetWindowLongPtr(hwnd, + 0); + + switch (uMsg) + { + case WM_CREATE: + { + if (!OnCreate(infoPtr, + hwnd, + ((LPCREATESTRUCTW)lParam)->hwndParent)) + { + return (LRESULT)-1; + } + + break; + } + + case WM_LBUTTONDOWN: + { + OnClick(infoPtr, + LOWORD(lParam), + HIWORD(lParam)); + + break; + } + + case WM_VSCROLL: + { + OnVScroll(infoPtr, + LOWORD(wParam), + HIWORD(wParam)); + + break; + } + + case FM_SETFONT: + { + LPTSTR lpFontName = (LPTSTR)lParam; + + SetFont(infoPtr, + lpFontName); + + HeapFree(GetProcessHeap(), + 0, + lpFontName); + + break; + } + + case WM_PAINT: + { + OnPaint(infoPtr, + wParam); + break; + } + + case WM_DESTROY: + { + DeleteObject(infoPtr->hFont); + HeapFree(GetProcessHeap(), + 0, + infoPtr); + SetWindowLongPtr(hwnd, + 0, + (DWORD_PTR)NULL); + break; + } + + default: + { + Ret = DefWindowProc(hwnd, + uMsg, + wParam, + lParam); + break; + } + } + + return Ret; +} Added: trunk/reactos/base/applications/charmap/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/precomp.h (added) +++ trunk/reactos/base/applications/charmap/precomp.h Sat Feb 17 03:13:35 2007 @@ -1,0 +1,51 @@ +#ifndef __CHARMAP_PRECOMP_H +#define __CHARMAP_PRECOMP_H +#include <windows.h> +#include <stdio.h> +#include <tchar.h> +#include <commctrl.h> +#include "resource.h" + +#define XCELLS 20 +#define YCELLS 10 +#define XLARGE 45 +#define YLARGE 25 + +#define FM_SETFONT (WM_USER + 1) + +extern HINSTANCE hInstance; +extern const TCHAR szMapWndClass[]; +extern const TCHAR szLrgCellWndClass[]; + + +typedef struct _CELL +{ + RECT CellExt; + RECT CellInt; + BOOL bActive; + BOOL bLarge; + TCHAR ch; +} CELL, *PCELL; + +typedef struct _MAP +{ + HWND hMapWnd; + HWND hParent; + HWND hLrgWnd; + SIZE ClientSize; + SIZE CellSize; + CELL Cells[YCELLS][XCELLS]; + PCELL pActiveCell; + HFONT hFont; + LOGFONT CurrentFont; + INT iPage; +} MAP, *PMAP; + +BOOL RegisterControls(HINSTANCE hInstance); +VOID UnregisterControls(HINSTANCE hInstance); + +INT_PTR CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); +LRESULT CALLBACK LrgCellWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); +LRESULT CALLBACK MapWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); + +#endif /* __DEVMGMT_PRECOMP_H */ Added: trunk/reactos/base/applications/charmap/res/charmap.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/charmap/res/charmap.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/charmap/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/resource.h (added) +++ trunk/reactos/base/applications/charmap/resource.h Sat Feb 17 03:13:35 2007 @@ -1,0 +1,18 @@ +#define IDC_STATIC -1 + +#define IDI_ICON 100 + +#define IDD_CHARMAP 200 +#define IDD_ABOUTBOX 201 +#define IDC_FONTCOMBO 1001 +#define IDC_CMHELP 1002 +#define IDC_ABOUT 1003 +#define IDC_FONTMAP 1004 +#define IDC_TEXTBOX 1005 +#define IDC_SELECT 1006 +#define IDC_COPY 1007 +#define IDC_ADVVIEW 1008 +#define IDC_DISPLAY 1009 +#define IDC_SCROLL 1010 +#define IDS_LICENSE 1011 +#define IDC_LICENSE_EDIT 1012 Added: trunk/reactos/base/applications/charmap/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/rsrc.rc (added) +++ trunk/reactos/base/applications/charmap/rsrc.rc Sat Feb 17 03:13:35 2007 @@ -1,0 +1,11 @@ +#include <windows.h> +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +1 24 DISCARDABLE "manifest.xml" + +IDI_ICON ICON "res/charmap.ico" + +#include "lang/en-US.rc" +

1 0

[greatlrd] 25824: adding more test case for test_NtGdiDdQueryDirectDrawObject not complete yet
by greatlrd＠svn.reactos.org 16 Feb '07

16 Feb '07

Author: greatlrd Date: Fri Feb 16 23:14:24 2007 New Revision: 25824 URL: http://svn.reactos.org/svn/reactos?rev=25824&view=rev Log: adding more test case for test_NtGdiDdQueryDirectDrawObject not complete yet Modified: trunk/rosapps/dxtest/win32kdxtest/main.c Modified: trunk/rosapps/dxtest/win32kdxtest/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/dxtest/win32kdxtest/main.c… ============================================================================== --- trunk/rosapps/dxtest/win32kdxtest/main.c (original) +++ trunk/rosapps/dxtest/win32kdxtest/main.c Fri Feb 16 23:14:24 2007 @@ -1,3 +1,7 @@ + + +/* All testcase are base how windows 2000 sp4 acting */ + #include <stdio.h> /* SDK/DDK/NDK Headers. */ @@ -97,6 +101,25 @@ DWORD *puNumFourCC = NULL; DWORD *puFourCC = NULL; + DD_HALINFO HalInfo; + DWORD CallBackFlags = 0; + D3DNTHAL_CALLBACKS D3dCallbacks; + D3DNTHAL_GLOBALDRIVERDATA D3dDriverData; + DD_D3DBUFCALLBACKS D3dBufferCallbacks; + DDSURFACEDESC D3dTextureFormats; + DWORD NumHeaps = 0; + VIDEOMEMORY vmList; + DWORD NumFourCC = 0; + DWORD FourCC = 0; + + /* clear data */ + memset(&vmList,0,sizeof(VIDEOMEMORY)); + memset(&D3dTextureFormats,0,sizeof(DDSURFACEDESC)); + memset(&D3dBufferCallbacks,0,sizeof(DD_D3DBUFCALLBACKS)); + memset(&D3dDriverData,0,sizeof(D3DNTHAL_GLOBALDRIVERDATA)); + memset(&D3dCallbacks,0,sizeof(D3DNTHAL_CALLBACKS)); + memset(&HalInfo,0,sizeof(DD_HALINFO)); + printf("Start testing of NtGdiDdQueryDirectDrawObject\n"); /* testing NULL */ @@ -106,7 +129,7 @@ puD3dTextureFormats, puNumHeaps, puvmList, puNumFourCC, puFourCC); - testing_noteq(retValue,0,fails,"1. NtGdiDdQueryDirectDrawObject(NULL, ...);\0"); + testing_noteq(retValue,FALSE,fails,"1. NtGdiDdQueryDirectDrawObject(NULL, ...);\0"); testing_noteq(pHalInfo,NULL,fails,"2. NtGdiDdQueryDirectDrawObject(NULL, ...);\0"); testing_noteq(pCallBackFlags,NULL,fails,"3. NtGdiDdQueryDirectDrawObject(NULL, ...);\0"); testing_noteq(puD3dCallbacks,NULL,fails,"4. NtGdiDdQueryDirectDrawObject(NULL, ...);\0"); @@ -123,7 +146,7 @@ puvmList, puNumFourCC, puFourCC); - testing_noteq(retValue,0,fails,"1. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0"); + testing_noteq(retValue,FALSE,fails,"1. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0"); testing_noteq(pHalInfo,NULL,fails,"2. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0"); testing_noteq(pCallBackFlags,NULL,fails,"3. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0"); testing_noteq(puD3dCallbacks,NULL,fails,"4. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0"); @@ -133,8 +156,29 @@ testing_noteq(puNumFourCC,NULL,fails,"8. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0"); testing_noteq(puFourCC,NULL,fails,"9. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0"); - - + /* + * we expect the pHalInfo will be fill in and correct but we expect return value be + * false + */ + + pHalInfo = &HalInfo; + retValue = sysNtGdiDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, + pCallBackFlags, puD3dCallbacks, + puD3dDriverData, puD3dBufferCallbacks, + puD3dTextureFormats, puNumHeaps, + puvmList, puNumFourCC, + puFourCC); + + testing_noteq(retValue,FALSE,fails,"1. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); + testing_eq(pHalInfo,NULL,fails,"2. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); + testing_noteq(pCallBackFlags,NULL,fails,"3. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); + testing_noteq(puD3dCallbacks,NULL,fails,"4. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); + testing_noteq(puD3dDriverData,NULL,fails,"5. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); + testing_noteq(puD3dBufferCallbacks,NULL,fails,"6. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); + testing_noteq(puD3dTextureFormats,NULL,fails,"7. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); + testing_noteq(puNumFourCC,NULL,fails,"8. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); + testing_noteq(puFourCC,NULL,fails,"9. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); + testing_noteq(pHalInfo->dwSize,sizeof(DD_HALINFO),fails,"10. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); show_status(fails, "NtGdiDdQueryDirectDrawObject\0"); }

1 0

[ion] 25823: - Delete KD/KDBG directories.
by ion＠svn.reactos.org 16 Feb '07

16 Feb '07

Author: ion Date: Fri Feb 16 21:44:32 2007 New Revision: 25823 URL: http://svn.reactos.org/svn/reactos?rev=25823&view=rev Log: - Delete KD/KDBG directories. Removed: branches/alex-kd-branch/reactos/ntoskrnl/kd/ branches/alex-kd-branch/reactos/ntoskrnl/kdbg/

1 0

[ion] 25822: - Disable i8042prt debugger hack. - Remove HAL kd routines. - Do INT3 in DebugService calls since the KiDebugService increases EIP by one. - Stub NtQuery/SetDebugFilterState. - Remove all KDBG symbol/process/thread callouts. Remove GDB hacks. - Stub out KdInitSystem and KdPollBreakI. - Stub KdpEnterDebuggerException. - Disable DebugPrint. - Optimize KiDebugService by having it jump into the INT3 trap handler.
by ion＠svn.reactos.org 16 Feb '07

16 Feb '07

Author: ion Date: Fri Feb 16 21:43:16 2007 New Revision: 25822 URL: http://svn.reactos.org/svn/reactos?rev=25822&view=rev Log: - Disable i8042prt debugger hack. - Remove HAL kd routines. - Do INT3 in DebugService calls since the KiDebugService increases EIP by one. - Stub NtQuery/SetDebugFilterState. - Remove all KDBG symbol/process/thread callouts. Remove GDB hacks. - Stub out KdInitSystem and KdPollBreakI. - Stub KdpEnterDebuggerException. - Disable DebugPrint. - Optimize KiDebugService by having it jump into the INT3 trap handler. Modified: branches/alex-kd-branch/reactos/drivers/input/i8042prt/keyboard.c branches/alex-kd-branch/reactos/hal/hal/hal.c branches/alex-kd-branch/reactos/hal/halx86/generic/misc.c branches/alex-kd-branch/reactos/lib/rtl/i386/debug_asm.S branches/alex-kd-branch/reactos/ntoskrnl/ex/dbgctrl.c branches/alex-kd-branch/reactos/ntoskrnl/include/internal/kd.h branches/alex-kd-branch/reactos/ntoskrnl/io/iomgr/driver.c branches/alex-kd-branch/reactos/ntoskrnl/io/iomgr/iomgr.c branches/alex-kd-branch/reactos/ntoskrnl/io/pnpmgr/pnpreport.c branches/alex-kd-branch/reactos/ntoskrnl/ke/bug.c branches/alex-kd-branch/reactos/ntoskrnl/ke/i386/exp.c branches/alex-kd-branch/reactos/ntoskrnl/ke/i386/trap.s branches/alex-kd-branch/reactos/ntoskrnl/ldr/loader.c branches/alex-kd-branch/reactos/ntoskrnl/mm/ppool.c branches/alex-kd-branch/reactos/ntoskrnl/mm/rmap.c branches/alex-kd-branch/reactos/ntoskrnl/ntoskrnl.def branches/alex-kd-branch/reactos/ntoskrnl/ntoskrnl.rbuild branches/alex-kd-branch/reactos/ntoskrnl/ps/kill.c branches/alex-kd-branch/reactos/ntoskrnl/rtl/misc.c Modified: branches/alex-kd-branch/reactos/drivers/input/i8042prt/keyboard.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/drivers/… ============================================================================== --- branches/alex-kd-branch/reactos/drivers/input/i8042prt/keyboard.c (original) +++ branches/alex-kd-branch/reactos/drivers/input/i8042prt/keyboard.c Fri Feb 16 21:43:16 2007 @@ -771,6 +771,6 @@ /* We hope kernel would understand this. If * that's not the case, nothing would happen. */ - KdpServiceDispatcher(TAG('R', 'o', 's', ' '), (PVOID)Key, NULL); + //KdpServiceDispatcher(TAG('R', 'o', 's', ' '), (PVOID)Key, NULL); #endif /* __REACTOS__ */ } Modified: branches/alex-kd-branch/reactos/hal/hal/hal.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/hal/hal/… ============================================================================== --- branches/alex-kd-branch/reactos/hal/hal/hal.c (original) +++ branches/alex-kd-branch/reactos/hal/hal/hal.c Fri Feb 16 21:43:16 2007 @@ -727,132 +727,6 @@ } -BOOLEAN -NTAPI -KdPortGetByte( - PUCHAR ByteRecieved) -{ - UNIMPLEMENTED; - - return TRUE; -} - - -BOOLEAN -NTAPI -KdPortGetByteEx( - PKD_PORT_INFORMATION PortInformation, - PUCHAR ByteRecieved) -{ - UNIMPLEMENTED; - - return TRUE; -} - - -BOOLEAN -NTAPI -KdPortInitialize( - PKD_PORT_INFORMATION PortInformation, - ULONG Unknown1, - ULONG Unknown2) -{ - UNIMPLEMENTED; - - return TRUE; -} - - -BOOLEAN -NTAPI -KdPortInitializeEx( - PKD_PORT_INFORMATION PortInformation, - ULONG Unknown1, - ULONG Unknown2) -{ - UNIMPLEMENTED; - - return TRUE; -} - - -BOOLEAN -NTAPI -KdPortPollByte( - PUCHAR ByteRecieved) -{ - UNIMPLEMENTED; - - return TRUE; -} - - -BOOLEAN -NTAPI -KdPortPollByteEx( - PKD_PORT_INFORMATION PortInformation, - PUCHAR ByteRecieved) -{ - UNIMPLEMENTED; - - return TRUE; -} - - -VOID -NTAPI -KdPortPutByte( - UCHAR ByteToSend) -{ - UNIMPLEMENTED; -} - - -VOID -NTAPI -KdPortPutByteEx( - PKD_PORT_INFORMATION PortInformation, - UCHAR ByteToSend) -{ - UNIMPLEMENTED; -} - - -VOID -NTAPI -KdPortRestore(VOID) -{ - UNIMPLEMENTED; -} - - -VOID -NTAPI -KdPortSave(VOID) -{ - UNIMPLEMENTED; -} - - -BOOLEAN -NTAPI -KdPortDisableInterrupts() -{ - UNIMPLEMENTED; - - return FALSE; -} - - -BOOLEAN -NTAPI -KdPortEnableInterrupts() -{ - UNIMPLEMENTED; - - return FALSE; -} - #undef KeAcquireSpinLock VOID NTAPI Modified: branches/alex-kd-branch/reactos/hal/halx86/generic/misc.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/hal/halx… ============================================================================== --- branches/alex-kd-branch/reactos/hal/halx86/generic/misc.c (original) +++ branches/alex-kd-branch/reactos/hal/halx86/generic/misc.c Fri Feb 16 21:43:16 2007 @@ -77,7 +77,7 @@ /* Halt the system */ HalDisplayString("\n*** The system has halted ***\n"); - KeEnterKernelDebugger(); + //KeEnterKernelDebugger(); } /* Modified: branches/alex-kd-branch/reactos/lib/rtl/i386/debug_asm.S URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/lib/rtl/… ============================================================================== --- branches/alex-kd-branch/reactos/lib/rtl/i386/debug_asm.S (original) +++ branches/alex-kd-branch/reactos/lib/rtl/i386/debug_asm.S Fri Feb 16 21:43:16 2007 @@ -51,7 +51,7 @@ mov ecx, [ebp+8] mov edx, [ebp+12] int 0x2D - //int 3 + int 3 /* Restore stack */ pop ebp @@ -79,7 +79,7 @@ mov ebx, [ebp+20] mov edi, [ebp+24] int 0x2D - //int 3 + int 3 /* Restore registers */ pop ebx Modified: branches/alex-kd-branch/reactos/ntoskrnl/ex/dbgctrl.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/ex/dbgctrl.c (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/ex/dbgctrl.c Fri Feb 16 21:43:16 2007 @@ -13,6 +13,25 @@ #include <internal/debug.h> /* FUNCTIONS *****************************************************************/ + +NTSYSCALLAPI +NTSTATUS +NTAPI +NtQueryDebugFilterState(ULONG ComponentId, + ULONG Level) +{ + return STATUS_SUCCESS; +} + +NTSYSCALLAPI +NTSTATUS +NTAPI +NtSetDebugFilterState(ULONG ComponentId, + ULONG Level, + BOOLEAN State) +{ + return STATUS_SUCCESS; +} /*++ * @name NtSystemDebugControl @@ -71,7 +90,6 @@ break; case SysDbgQueryVersion: - KDB_LOADUSERMODULE_HOOK((PLDR_DATA_TABLE_ENTRY) InputBuffer); break; default: Modified: branches/alex-kd-branch/reactos/ntoskrnl/include/internal/kd.h URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/include/internal/kd.h (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/include/internal/kd.h Fri Feb 16 21:43:16 2007 @@ -1,245 +1,9 @@ -#ifndef __INCLUDE_INTERNAL_KERNEL_DEBUGGER_H -#define __INCLUDE_INTERNAL_KERNEL_DEBUGGER_H - // // Kernel Debugger Port Definition // -typedef struct _KD_PORT_INFORMATION -{ - ULONG ComPort; - ULONG BaudRate; - ULONG BaseAddress; -} KD_PORT_INFORMATION, *PKD_PORT_INFORMATION; - -struct _KD_DISPATCH_TABLE; -extern KD_PORT_INFORMATION GdbPortInfo; extern BOOLEAN _KdDebuggerEnabled; extern BOOLEAN _KdDebuggerNotPresent; extern BOOLEAN KdBreakAfterSymbolLoad; - -BOOLEAN -NTAPI -KdPortInitialize( - PKD_PORT_INFORMATION PortInformation, - ULONG Unknown1, - ULONG Unknown2 -); - -BOOLEAN -NTAPI -KdPortInitializeEx( - PKD_PORT_INFORMATION PortInformation, - ULONG Unknown1, - ULONG Unknown2 -); - -BOOLEAN -NTAPI -KdPortGetByte( - PUCHAR ByteRecieved); - -BOOLEAN -NTAPI -KdPortGetByteEx( - PKD_PORT_INFORMATION PortInformation, - PUCHAR ByteRecieved); - -VOID -NTAPI -KdPortPutByte( - UCHAR ByteToSend -); - -VOID -NTAPI -KdPortPutByteEx( - PKD_PORT_INFORMATION PortInformation, - UCHAR ByteToSend -); - -/* SYMBOL ROUTINES **********************************************************/ -#ifdef __NTOSKRNL__ - -#if defined(KDBG) || defined(DBG) - -VOID -KdbSymLoadUserModuleSymbols(IN PLDR_DATA_TABLE_ENTRY LdrModule); - -VOID -KdbSymFreeProcessSymbols(IN PEPROCESS Process); - -VOID -KdbSymLoadDriverSymbols( - IN PUNICODE_STRING Filename, - IN PLDR_DATA_TABLE_ENTRY Module -); - -VOID -KdbSymUnloadDriverSymbols(IN PLDR_DATA_TABLE_ENTRY ModuleObject); - -VOID -KdbSymProcessBootSymbols(IN PUNICODE_STRING FileName); - -VOID -KdbSymInit( - IN PLDR_DATA_TABLE_ENTRY NtoskrnlTextSection, - IN PLDR_DATA_TABLE_ENTRY LdrHalTextSection -); - -BOOLEAN -KdbSymPrintAddress(IN PVOID Address); - -VOID -KdbDeleteProcessHook(IN PEPROCESS Process); - -NTSTATUS -KdbSymGetAddressInformation( - IN PROSSYM_INFO RosSymInfo, - IN ULONG_PTR RelativeAddress, - OUT PULONG LineNumber OPTIONAL, - OUT PCH FileName OPTIONAL, - OUT PCH FunctionName OPTIONAL -); - -typedef struct _KDB_MODULE_INFO -{ - WCHAR Name[256]; - ULONG_PTR Base; - ULONG Size; - PROSSYM_INFO RosSymInfo; -} KDB_MODULE_INFO, *PKDB_MODULE_INFO; - -/* MACROS FOR NON-KDBG BUILDS ************************************************/ - -# define KDB_LOADUSERMODULE_HOOK(LDRMOD) KdbSymLoadUserModuleSymbols(LDRMOD) -# define KDB_LOADDRIVER_HOOK(FILENAME, MODULE) KdbSymLoadDriverSymbols(FILENAME, MODULE) -# define KDB_UNLOADDRIVER_HOOK(MODULE) KdbSymUnloadDriverSymbols(MODULE) -# define KDB_LOADERINIT_HOOK(NTOS, HAL) KdbSymInit(NTOS, HAL) -# define KDB_SYMBOLFILE_HOOK(FILENAME) KdbSymProcessBootSymbols(FILENAME) -#else -# define KDB_LOADUSERMODULE_HOOK(LDRMOD) do { } while (0) -# define KDB_LOADDRIVER_HOOK(FILENAME, MODULE) do { } while (0) -# define KDB_UNLOADDRIVER_HOOK(MODULE) do { } while (0) -# define KDB_LOADERINIT_HOOK(NTOS, HAL) do { } while (0) -# define KDB_SYMBOLFILE_HOOK(FILENAME) do { } while (0) -# define KDB_CREATE_THREAD_HOOK(CONTEXT) do { } while (0) -#endif - -#if defined(KDBG) || defined(DBG) -# define KeRosPrintAddress(ADDRESS) KdbSymPrintAddress(ADDRESS) -#else -# define KeRosPrintAddress(ADDRESS) KiRosPrintAddress(ADDRESS) -#endif - -#ifdef KDBG -# define KdbInit() KdbpCliInit() -# define KdbModuleLoaded(FILENAME) KdbpCliModuleLoaded(FILENAME) -# define KDB_DELETEPROCESS_HOOK(PROCESS) KdbDeleteProcessHook(PROCESS) -#else -# define KdbEnterDebuggerException(ER, PM, C, TF, F) kdHandleException -# define KdbInit() do { } while (0) -# define KdbEnter() do { } while (0) -# define KdbModuleLoaded(X) do { } while (0) -# define KDB_DELETEPROCESS_HOOK(PROCESS) do { } while (0) -#endif - -/* KD ROUTINES ***************************************************************/ - -typedef enum _KD_CONTINUE_TYPE -{ - kdContinue = 0, - kdDoNotHandleException, - kdHandleException -} KD_CONTINUE_TYPE; - -typedef -VOID -(STDCALL*PKDP_INIT_ROUTINE)( - struct _KD_DISPATCH_TABLE *DispatchTable, - ULONG BootPhase -); - -typedef -VOID -(STDCALL*PKDP_PRINT_ROUTINE)( - LPSTR String, - ULONG Length -); - -typedef -VOID -(STDCALL*PKDP_PROMPT_ROUTINE)(PCH String); - -typedef -KD_CONTINUE_TYPE -(STDCALL*PKDP_EXCEPTION_ROUTINE)( - PEXCEPTION_RECORD ExceptionRecord, - PCONTEXT Context, - PKTRAP_FRAME TrapFrame -); - -/* INIT ROUTINES *************************************************************/ - -VOID -STDCALL -KdpScreenInit( - struct _KD_DISPATCH_TABLE *DispatchTable, - ULONG BootPhase -); - -VOID -STDCALL -KdpSerialInit( - struct _KD_DISPATCH_TABLE *DispatchTable, - ULONG BootPhase -); - -VOID -STDCALL -KdpInitDebugLog( - struct _KD_DISPATCH_TABLE *DispatchTable, - ULONG BootPhase -); - -VOID -STDCALL -KdpBochsInit( - struct _KD_DISPATCH_TABLE *DispatchTable, - ULONG BootPhase -); - -VOID -STDCALL -KdpGdbStubInit( - struct _KD_DISPATCH_TABLE *DispatchTable, - ULONG BootPhase); - -/* KD ROUTINES ***************************************************************/ - -BOOLEAN -NTAPI -KdpCallGdb( - IN PKTRAP_FRAME TrapFrame, - IN PEXCEPTION_RECORD ExceptionRecord, - IN PCONTEXT Context -); - -ULONG -STDCALL -KdpPrintString( - LPSTR String, - ULONG Length); - -BOOLEAN -STDCALL -KdpDetectConflicts(PCM_RESOURCE_LIST DriverList); - -VOID -STDCALL -KdpBochsDebugPrint( - IN PCH Message, - IN ULONG Length -); /* KD GLOBALS ***************************************************************/ @@ -254,99 +18,4 @@ IN BOOLEAN SecondChance ); -/* serial debug connection */ -#define DEFAULT_DEBUG_PORT 2 /* COM2 */ -#define DEFAULT_DEBUG_COM1_IRQ 4 /* COM1 IRQ */ -#define DEFAULT_DEBUG_COM2_IRQ 3 /* COM2 IRQ */ -#define DEFAULT_DEBUG_BAUD_RATE 115200 /* 115200 Baud */ - -/* KD Native Modes */ -#define KdScreen 0 -#define KdSerial 1 -#define KdFile 2 -#define KdBochs 3 -#define KdMax 4 - -/* KD Private Debug Modes */ -typedef struct _KDP_DEBUG_MODE -{ - union - { - struct - { - /* Native Modes */ - UCHAR Screen :1; - UCHAR Serial :1; - UCHAR File :1; - UCHAR Bochs :1; - - /* Currently Supported Wrappers */ - UCHAR Pice :1; - UCHAR Gdb :1; - }; - - /* Generic Value */ - ULONG Value; - }; -} KDP_DEBUG_MODE; - -/* KD Internal Debug Services */ -typedef enum _KDP_DEBUG_SERVICE -{ - DumpNonPagedPool = 0x1e, /* a */ - ManualBugCheck = 0x30, /* b */ - DumpNonPagedPoolStats = 0x2e, /* c */ - DumpNewNonPagedPool = 0x20, /* d */ - DumpNewNonPagedPoolStats = 0x12, /* e */ - DumpAllThreads = 0x21, /* f */ - DumpUserThreads = 0x22, /* g */ - KdSpare1 = 0x23, /* h */ - KdSpare2 = 0x17, /* i */ - KdSpare3 = 0x24, /* j */ - EnterDebugger = 0x25 /* k */ -} KDP_DEBUG_SERVICE; - -/* Dispatch Table for Wrapper Functions */ -typedef struct _KD_DISPATCH_TABLE -{ - LIST_ENTRY KdProvidersList; - PKDP_INIT_ROUTINE KdpInitRoutine; - PKDP_PRINT_ROUTINE KdpPrintRoutine; - PKDP_PROMPT_ROUTINE KdpPromptRoutine; - PKDP_EXCEPTION_ROUTINE KdpExceptionRoutine; -} KD_DISPATCH_TABLE, *PKD_DISPATCH_TABLE; - -/* The current Debugging Mode */ -extern KDP_DEBUG_MODE KdpDebugMode; - -/* The current Port IRQ */ -extern ULONG KdpPortIrq; - -/* The current Port */ -extern ULONG KdpPort; - -/* Port Information for the Serial Native Mode */ -extern KD_PORT_INFORMATION SerialPortInfo; - -/* Init Functions for Native Providers */ -extern PKDP_INIT_ROUTINE InitRoutines[KdMax]; - -/* Wrapper Init Function */ -extern PKDP_INIT_ROUTINE WrapperInitRoutine; - -/* Dispatch Tables for Native Providers */ -extern KD_DISPATCH_TABLE DispatchTable[KdMax]; - -/* Dispatch Table for the Wrapper */ -extern KD_DISPATCH_TABLE WrapperTable; - -/* The KD Native Provider List */ -extern LIST_ENTRY KdProviders; - -/* Whether to enter KDB as early as possible or not */ -extern BOOLEAN KdpEarlyBreak; - extern PKDEBUG_ROUTINE KiDebugRoutine; - -#endif -#endif /* __INCLUDE_INTERNAL_KERNEL_DEBUGGER_H */ Modified: branches/alex-kd-branch/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/io/iomgr/driver.c Fri Feb 16 21:43:16 2007 @@ -494,8 +494,6 @@ Status = LdrProcessModule(LdrEntry->DllBase, &ServiceImagePath, ModuleObject); - - KDB_SYMBOLFILE_HOOK(&SearchName); break; } @@ -805,7 +803,7 @@ return STATUS_SUCCESS; } -static VOID INIT_FUNCTION +VOID INIT_FUNCTION MiFreeBootDriverMemory(PVOID StartAddress, ULONG Length) { ULONG i; @@ -890,9 +888,6 @@ return Status; } - /* Load symbols */ - KDB_SYMBOLFILE_HOOK(ModuleName); - /* * Strip the file extension from ServiceName */ @@ -945,9 +940,6 @@ { PLIST_ENTRY ListHead, NextEntry; PLDR_DATA_TABLE_ENTRY LdrEntry; -#ifdef DBG - UNICODE_STRING NtosSymName = RTL_CONSTANT_STRING(L"ntoskrnl.sym"); -#endif PDEVICE_NODE DeviceNode; PDRIVER_OBJECT DriverObject; LDR_DATA_TABLE_ENTRY ModuleObject; @@ -992,9 +984,6 @@ IopFreeDeviceNode(DeviceNode); return; } - - /* Hack for NTOSKRNL.SYM */ - KDB_SYMBOLFILE_HOOK(&NtosSymName); /* Loop the boot modules */ ListHead = &KeLoaderBlock->LoadOrderListHead; Modified: branches/alex-kd-branch/reactos/ntoskrnl/io/iomgr/iomgr.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/io/iomgr/iomgr.c (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/io/iomgr/iomgr.c Fri Feb 16 21:43:16 2007 @@ -517,12 +517,6 @@ /* Mark the system boot partition */ if (!IopMarkBootPartition(LoaderBlock)) return FALSE; - /* Read KDB Data */ - KdbInit(); - - /* I/O is now setup for disk access, so phase 3 */ - KdInitSystem(3, LoaderBlock); - /* Load services for devices found by PnP manager */ IopInitializePnpServices(IopRootDeviceNode, FALSE); Modified: branches/alex-kd-branch/reactos/ntoskrnl/io/pnpmgr/pnpreport.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/io/pnpmgr/pnpreport.c (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/io/pnpmgr/pnpreport.c Fri Feb 16 21:43:16 2007 @@ -89,16 +89,6 @@ *ConflictDetected = FALSE; - /* FIXME: Manually indicate conflicts with KD Ports */ - if (DriverList) - { - if (KdpDetectConflicts(DriverList)) - { - *ConflictDetected = TRUE; - return STATUS_CONFLICTING_ADDRESSES; - } - } - if (PopSystemPowerDeviceNode != NULL && DriverListSize > 0) { /* We hope legacy devices will be enumerated by ACPI */ Modified: branches/alex-kd-branch/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/ke/bug.c (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/ke/bug.c Fri Feb 16 21:43:16 2007 @@ -99,7 +99,7 @@ } /* Print it out */ - if (!KeRosPrintAddress((PVOID)Addr)) DbgPrint("<%X>", Addr); + if (!KiRosPrintAddress((PVOID)Addr)) DbgPrint("<%X>", Addr); /* Go to the next frame */ DbgPrint("\n"); Modified: branches/alex-kd-branch/reactos/ntoskrnl/ke/i386/exp.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/ke/i386/exp.c (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/ke/i386/exp.c Fri Feb 16 21:43:16 2007 @@ -15,6 +15,47 @@ #include <debug.h> /* GLOBALS *******************************************************************/ + +BOOLEAN +NTAPI +KdpEnterDebuggerException(IN PKTRAP_FRAME TrapFrame, + IN PKEXCEPTION_FRAME ExceptionFrame, + IN PEXCEPTION_RECORD ExceptionRecord, + IN PCONTEXT Context, + IN KPROCESSOR_MODE PreviousMode, + IN BOOLEAN SecondChance) +{ + /* HACK (just like all this routine */ + if (ExceptionRecord->ExceptionCode == STATUS_BREAKPOINT) + { + Context->Eip++; + return TRUE; + } + + return FALSE; +} + +BOOLEAN +NTAPI +KdInitSystem(IN ULONG BootPhase, + IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + /* STUB */ + return TRUE; +} + +BOOLEAN +NTAPI +KdPollBreakIn(VOID) +{ + /* STUB */ + return FALSE; +} + +BOOLEAN _KdDebuggerEnabled = FALSE; +BOOLEAN _KdDebuggerNotPresent = TRUE; +BOOLEAN KdBreakAfterSymbolLoad = FALSE; +PKDEBUG_ROUTINE KiDebugRoutine = KdpEnterDebuggerException; /* DR Registers in the CONTEXT structure */ UCHAR KiDebugRegisterContextOffsets[9] = @@ -800,7 +841,7 @@ /* Set the context flags */ Context.ContextFlags = CONTEXT_FULL | CONTEXT_DEBUG_REGISTERS; - /* Check if User Mode or if the debugger isenabled */ + /* Check if User Mode or if the debugger is enabled */ if ((PreviousMode == UserMode) || (KdDebuggerEnabled)) { /* Add the FPU Flag */ @@ -846,9 +887,6 @@ goto Handled; } - /* HACK: GDB Entry */ - if (KdpCallGdb(TrapFrame, ExceptionRecord, &Context)) goto Handled; - /* If the Debugger couldn't handle it, dispatch the exception */ if (RtlDispatchException(ExceptionRecord, &Context)) goto Handled; } @@ -893,9 +931,6 @@ /* Exception was handled */ goto Handled; } - - /* HACK: GDB Entry */ - if (KdpCallGdb(TrapFrame, ExceptionRecord, &Context)) goto Handled; /* Forward exception to user mode debugger */ if (DbgkForwardException(ExceptionRecord, TRUE, FALSE)) goto Exit; @@ -1046,3 +1081,5 @@ return (NTSTATUS)OldEip; } + + Modified: branches/alex-kd-branch/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/ke/i386/trap.s (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/ke/i386/trap.s Fri Feb 16 21:43:16 2007 @@ -228,22 +228,6 @@ /* Copy the parameters */ rep movsd -#ifdef DBG - /* - * The following lines are for the benefit of GDB. It will see the return - * address of the "call ebx" below, find the last label before it and - * thinks that that's the start of the function. It will then check to see - * if it starts with a standard function prolog (push ebp, mov ebp,esp1). - * When that standard function prolog is not found, it will stop the - * stack backtrace. Since we do want to backtrace into usermode, let's - * make GDB happy and create a standard prolog. - */ -KiSystemService: - push ebp - mov ebp,esp - pop ebp -#endif - /* Do the System Call */ call ebx @@ -482,50 +466,15 @@ TRAP_PROLOG kids /* Increase EIP so we skip the INT3 */ - //inc dword ptr [ebp+KTRAP_FRAME_EIP] + inc dword ptr [ebp+KTRAP_FRAME_EIP] /* Call debug service dispatcher */ mov eax, [ebp+KTRAP_FRAME_EAX] mov ecx, [ebp+KTRAP_FRAME_ECX] mov edx, [ebp+KTRAP_FRAME_EAX] - /* Check for V86 mode */ - test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK - jnz NotUserMode - - /* Check if this is kernel or user-mode */ - test byte ptr [ebp+KTRAP_FRAME_CS], 1 - jz CallDispatch - cmp word ptr [ebp+KTRAP_FRAME_CS], KGDT_R3_CODE + RPL_MASK - jnz NotUserMode - - /* Re-enable interrupts */ -VdmProc: - sti - - /* Call the debug routine */ -CallDispatch: - mov esi, ecx - mov edi, edx - mov edx, eax - mov ecx, 3 - push edi - push esi - push edx - call _KdpServiceDispatcher@12 - -NotUserMode: - - /* Get the current process */ - mov ebx, [fs:KPCR_CURRENT_THREAD] - mov ebx, [ebx+KTHREAD_APCSTATE_PROCESS] - - /* Check if this is a VDM Process */ - //cmp dword ptr [ebx+EPROCESS_VDM_OBJECTS], 0 - //jz VdmProc - - /* Exit through common routine */ - jmp _Kei386EoiHelper@0 + /* Jump to INT3 handler */ + jmp PrepareInt3 .endfunc .func NtRaiseException@12 @@ -819,7 +768,11 @@ /* Enter trap */ TRAP_PROLOG kit3 + /* Set status code */ + mov eax, 0 //STATUS_SUCCESS + /* Check for V86 */ +PrepareInt3: test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK jnz V86Int3 Modified: branches/alex-kd-branch/reactos/ntoskrnl/ldr/loader.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/ldr/loader.c (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/ldr/loader.c Fri Feb 16 21:43:16 2007 @@ -135,9 +135,6 @@ /* Insert it into the list */ InsertTailList(&ModuleListHead, &HalModuleObject->InLoadOrderLinks); - - /* Hook for KDB on initialization of the loader. */ - KDB_LOADERINIT_HOOK(NtoskrnlModuleObject, HalModuleObject); } NTSTATUS @@ -320,9 +317,6 @@ *ModuleObject = Module; - /* Hook for KDB on loading a driver. */ - KDB_LOADDRIVER_HOOK(Filename, Module); - return(STATUS_SUCCESS); } @@ -337,9 +331,6 @@ KeAcquireSpinLock(&ModuleListLock,&Irql); RemoveEntryList(&ModuleObject->InLoadOrderLinks); KeReleaseSpinLock(&ModuleListLock, Irql); - - /* Hook for KDB on unloading a driver. */ - KDB_UNLOADDRIVER_HOOK(ModuleObject); /* Free module section */ // MmFreeSection(ModuleObject->DllBase); Modified: branches/alex-kd-branch/reactos/ntoskrnl/mm/ppool.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/mm/ppool.c (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/mm/ppool.c Fri Feb 16 21:43:16 2007 @@ -27,7 +27,7 @@ #define R_MUTEX FAST_MUTEX #define R_ACQUIRE_MUTEX(pool) /*DPRINT1("Acquiring PPool Mutex\n");*/ ExAcquireFastMutex(&pool->Mutex) #define R_RELEASE_MUTEX(pool) /*DPRINT1("Releasing PPool Mutex\n");*/ ExReleaseFastMutex(&pool->Mutex) -#define R_PRINT_ADDRESS(addr) KeRosPrintAddress(addr) +#define R_PRINT_ADDRESS(addr) KiRosPrintAddress(addr) #define R_PANIC() KeBugCheck(0) #define R_DEBUG DbgPrint #define R_GET_STACK_FRAMES(ptr,cnt) RtlWalkFrameChain((PVOID*)ptr,cnt, 0) Modified: branches/alex-kd-branch/reactos/ntoskrnl/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/mm/rmap.c (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/mm/rmap.c Fri Feb 16 21:43:16 2007 @@ -428,9 +428,9 @@ { DbgPrint("MmInsertRmap tries to add a second rmap entry for address %p\n current caller ", current_entry->Address); - KeRosPrintAddress(new_entry->Caller); + DbgPrint(new_entry->Caller); DbgPrint("\n previous caller "); - KeRosPrintAddress(current_entry->Caller); + DbgPrint(current_entry->Caller); DbgPrint("\n"); KeBugCheck(0); } Modified: branches/alex-kd-branch/reactos/ntoskrnl/ntoskrnl.def URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/ntoskrnl.def (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/ntoskrnl.def Fri Feb 16 21:43:16 2007 @@ -518,16 +518,7 @@ @IofCallDriver@8 @IofCompleteRequest@8 IoIsWdmVersionAvailable@8 -KdChangeOption@24 KdComPortInUse DATA -KdDebuggerEnabled=_KdDebuggerEnabled -KdDebuggerNotPresent=_KdDebuggerNotPresent -KdDisableDebugger@0 -KdEnableDebugger@0 -KdEnteredDebugger -KdPollBreakIn@0 -KdPowerTransition@4 -KdpServiceDispatcher@12 Ke386CallBios@8 @KeAcquireGuardedMutex@4 @KeAcquireGuardedMutexUnsafe@4 @@ -552,7 +543,7 @@ KeDisconnectInterrupt@4 KeEnterCriticalRegion@0=_KeEnterCriticalRegion@0 KeEnterGuardedRegion@0=_KeEnterGuardedRegion@0 -KeEnterKernelDebugger@0 +;KeEnterKernelDebugger@0 KeFindConfigurationEntry@16 KeFindConfigurationNextEntry@20 KeFlushEntireTb@8 @@ -675,7 +666,7 @@ KiCheckForKernelApcDelivery@0 KiDeliverApc@12 KiDispatchInterrupt@0 -KiEnableTimerWatchdog +;KiEnableTimerWatchdog KiIpiServiceRoutine@8 @KiReleaseSpinLock@4 KiUnexpectedInterrupt Modified: branches/alex-kd-branch/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/ntoskrnl.rbuild Fri Feb 16 21:43:16 2007 @@ -89,31 +89,6 @@ <file>newcm.c</file> <file>cmdata.c</file> </directory> - <directory name="kdbg"> - <if property="ARCH" value="i386"> - <directory name="i386"> - <if property="KDBG" value="1"> - <group> - <file>i386-dis.c</file> - <file>kdb_help.S</file> - <file>longjmp.S</file> - <file>setjmp.S</file> - </group> - </if> - </directory> - </if> - <if property="KDBG" value="1"> - <file>kdb.c</file> - <file>kdb_cli.c</file> - <file>kdb_expr.c</file> - <file>kdb_keyboard.c</file> - <file>kdb_serial.c</file> - <file>kdb_string.c</file> - </if> - <if property="DBG_OR_KDBG" value="true"> - <file>kdb_symbols.c</file> - </if> - </directory> <directory name="dbgk"> <file>dbgkutil.c</file> <file>debug.c</file> @@ -217,15 +192,6 @@ <file>pnpreport.c</file> <file>pnproot.c</file> </directory> - </directory> - <directory name="kd"> - <directory name="wrappers"> - <file>bochs.c</file> - <file>gdbstub.c</file> - </directory> - <file>kdinit.c</file> - <file>kdio.c</file> - <file>kdmain.c</file> </directory> <directory name="ldr"> <file>loader.c</file> Modified: branches/alex-kd-branch/reactos/ntoskrnl/ps/kill.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/ps/kill.c (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/ps/kill.c Fri Feb 16 21:43:16 2007 @@ -286,9 +286,6 @@ /* Detach */ KeUnstackDetachProcess(&ApcState); } - - /* KDB hook */ - KDB_DELETEPROCESS_HOOK(Process); /* Check if we have an address space, and clean it */ if (Process->HasAddressSpace) Modified: branches/alex-kd-branch/reactos/ntoskrnl/rtl/misc.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/rtl/misc.c (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/rtl/misc.c Fri Feb 16 21:43:16 2007 @@ -30,7 +30,8 @@ IN ULONG Level) { /* Temporary hack */ - KdpPrintString(DebugString->Buffer, DebugString->Length); + //KdpPrintString(DebugString->Buffer, DebugString->Length); + //HalDisplayString((PCHAR)DebugString->Buffer); return STATUS_SUCCESS; } @@ -85,3 +86,5 @@ return STATUS_INVALID_PARAMETER; } + +

1 0

[ion] 25821: - Create KD branch. All debugging support is removed in this branch (no symbols, kd, kdbg, dbg) in hopes of cleanly implementing some of the low-level exception facilities, to remove potential sources of bugs, and to properly implement KD64 so that WinDBG can be used to debug ReactOS.
by ion＠svn.reactos.org 16 Feb '07

16 Feb '07

Author: ion Date: Fri Feb 16 21:37:34 2007 New Revision: 25821 URL: http://svn.reactos.org/svn/reactos?rev=25821&view=rev Log: - Create KD branch. All debugging support is removed in this branch (no symbols, kd, kdbg, dbg) in hopes of cleanly implementing some of the low-level exception facilities, to remove potential sources of bugs, and to properly implement KD64 so that WinDBG can be used to debug ReactOS. Added: branches/alex-kd-branch/reactos/ - copied from r25820, trunk/reactos/

1 0

[ion] 25820: - KD Branch
by ion＠svn.reactos.org 16 Feb '07

16 Feb '07

Author: ion Date: Fri Feb 16 21:37:15 2007 New Revision: 25820 URL: http://svn.reactos.org/svn/reactos?rev=25820&view=rev Log: - KD Branch Removed: branches/alex-kd-branch/reactos/

1 0

[ion] 25819: - KD Branch
by ion＠svn.reactos.org 16 Feb '07

16 Feb '07

Author: ion Date: Fri Feb 16 21:36:17 2007 New Revision: 25819 URL: http://svn.reactos.org/svn/reactos?rev=25819&view=rev Log: - KD Branch Added: branches/alex-kd-branch/reactos/

1 0

[ion] 25818: - KD Branch
by ion＠svn.reactos.org 16 Feb '07

16 Feb '07

Author: ion Date: Fri Feb 16 21:35:38 2007 New Revision: 25818 URL: http://svn.reactos.org/svn/reactos?rev=25818&view=rev Log: - KD Branch Added: branches/alex-kd-branch/

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