Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 23735: * dont code during night :-))))
by janderwald＠svn.reactos.org 27 Aug '06

27 Aug '06

Author: janderwald Date: Sun Aug 27 04:51:43 2006 New Revision: 23735 URL: http://svn.reactos.org/svn/reactos?rev=23735&view=rev Log: * dont code during night :-)))) Modified: trunk/reactos/dll/win32/console/layout.c Modified: trunk/reactos/dll/win32/console/layout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/layout.c… ============================================================================== --- trunk/reactos/dll/win32/console/layout.c (original) +++ trunk/reactos/dll/win32/console/layout.c Sun Aug 27 04:51:43 2006 @@ -13,7 +13,6 @@ void PaintConsole(LPDRAWITEMSTRUCT drawItem, PConsoleInfo pConInfo) { - COLORREF bkColor; HBRUSH hBrush; RECT cRect, fRect; DWORD startx, starty; @@ -53,7 +52,7 @@ /* draw left box */ SetRect(&fRect, startx + 3, starty + 3, startx + 5, starty + 5); - FillRect(drawItem->hDC, &fRect, GetSysColor(COLOR_ACTIVEBORDER)); + FillRect(drawItem->hDC, &fRect, GetSysColorBrush(COLOR_ACTIVEBORDER)); /* draw window title */ SetRect(&fRect, startx + 7, starty + 3, cRect.right - 9, starty + 5); @@ -61,11 +60,11 @@ /* draw first right box */ SetRect(&fRect, fRect.right + 1, starty + 3, fRect.right + 3, starty + 5); - FillRect(drawItem->hDC, &fRect, GetSysColor(COLOR_ACTIVEBORDER)); + FillRect(drawItem->hDC, &fRect, GetSysColorBrush(COLOR_ACTIVEBORDER)); /* draw second right box */ SetRect(&fRect, fRect.right + 1, starty + 3, fRect.right + 3, starty + 5); - FillRect(drawItem->hDC, &fRect, GetSysColor(COLOR_ACTIVEBORDER)); + FillRect(drawItem->hDC, &fRect, GetSysColorBrush(COLOR_ACTIVEBORDER)); /* draw scrollbar */ SetRect(&fRect, cRect.right - 5, fRect.bottom + 1, cRect.right - 3, cRect.bottom - 3);

1 0

[janderwald] 23734: * optimize a few code paths * add error checking in various places * implement painting console image
by janderwald＠svn.reactos.org 27 Aug '06

27 Aug '06

Author: janderwald Date: Sun Aug 27 04:46:50 2006 New Revision: 23734 URL: http://svn.reactos.org/svn/reactos?rev=23734&view=rev Log: * optimize a few code paths * add error checking in various places * implement painting console image Modified: trunk/reactos/dll/win32/console/colors.c trunk/reactos/dll/win32/console/console.c trunk/reactos/dll/win32/console/console.h trunk/reactos/dll/win32/console/en.rc trunk/reactos/dll/win32/console/layout.c trunk/reactos/dll/win32/console/resource.h Modified: trunk/reactos/dll/win32/console/colors.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/colors.c… ============================================================================== --- trunk/reactos/dll/win32/console/colors.c (original) +++ trunk/reactos/dll/win32/console/colors.c Sun Aug 27 04:46:50 2006 @@ -217,24 +217,30 @@ { DWORD index = LOWORD(wParam) - IDC_STATIC_COLOR1; + if (index == pConInfo->ActiveStaticControl) + { + /* same static control was re-clicked */ + break; + } + SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_RED, GetRValue(s_Colors[index]), FALSE); SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_GREEN, GetGValue(s_Colors[index]), FALSE); SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_BLUE, GetBValue(s_Colors[index]), FALSE); /* update global struct */ - if (SendMessage(GetDlgItem(hwndDlg, IDC_RADIO_SCREEN_TEXT), BM_GETCHECK, 0, 0) & BST_CHECKED) + if (IsDlgButtonChecked(hwndDlg, IDC_RADIO_SCREEN_TEXT)) { pConInfo->ScreenText = s_Colors[index]; } - else if (SendMessage(GetDlgItem(hwndDlg, IDC_RADIO_SCREEN_BACKGROUND), BM_GETCHECK, 0, 0) & BST_CHECKED) + else if (IsDlgButtonChecked(hwndDlg, IDC_RADIO_SCREEN_BACKGROUND)) { pConInfo->ScreenBackground = s_Colors[index]; } - else if (SendMessage(GetDlgItem(hwndDlg, IDC_RADIO_POPUP_TEXT), BM_GETCHECK, 0, 0) & BST_CHECKED) + else if (IsDlgButtonChecked(hwndDlg, IDC_RADIO_POPUP_TEXT)) { pConInfo->PopupText = s_Colors[index]; } - else if (SendMessage(GetDlgItem(hwndDlg, IDC_RADIO_POPUP_BACKGROUND), BM_GETCHECK, 0, 0) & BST_CHECKED) + else if (IsDlgButtonChecked(hwndDlg, IDC_RADIO_POPUP_BACKGROUND)) { pConInfo->PopupBackground = s_Colors[index]; } Modified: trunk/reactos/dll/win32/console/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/console.… ============================================================================== --- trunk/reactos/dll/win32/console/console.c (original) +++ trunk/reactos/dll/win32/console/console.c Sun Aug 27 04:46:50 2006 @@ -62,8 +62,11 @@ pConInfo->PopupText = RGB(128, 0, 128); pConInfo->PopupBackground = RGB(255, 255, 255); pConInfo->WindowSize = (DWORD)MAKELONG(80, 25); - pConInfo->WindowPosition = -1; + pConInfo->WindowPosition = UINT_MAX; pConInfo->ScreenBuffer = MAKELONG(80, 300); + pConInfo->UseRasterFonts = TRUE; + pConInfo->FontSize = (DWORD)MAKELONG(8, 12); + pConInfo->FontWeight = FALSE; GetModuleFileName(NULL, pConInfo->szProcessName, MAX_PATH); GetStartupInfo(&StartupInfo); Modified: trunk/reactos/dll/win32/console/console.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/console.… ============================================================================== --- trunk/reactos/dll/win32/console/console.h (original) +++ trunk/reactos/dll/win32/console/console.h Sun Aug 27 04:46:50 2006 @@ -8,6 +8,7 @@ #include <cpl.h> #include <tchar.h> #include <stdio.h> +#include <limits.h> #include "resource.h" typedef struct @@ -22,6 +23,9 @@ { TCHAR szProcessName[MAX_PATH]; BOOLEAN AppliedConfig; + BOOLEAN UseRasterFonts; + DWORD FontSize; + DWORD FontWeight; DWORD CursorSize; DWORD NumberOfHistoryBuffers; DWORD HistoryBufferSize; Modified: trunk/reactos/dll/win32/console/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/en.rc?re… ============================================================================== --- trunk/reactos/dll/win32/console/en.rc (original) +++ trunk/reactos/dll/win32/console/en.rc Sun Aug 27 04:46:50 2006 @@ -55,7 +55,7 @@ LTEXT "Each character is:", -1, 130, 165, 75, 10 LTEXT "screen pixel wide\nscreen pixel high", -1, 140, 180, 65, 20 LTEXT "", IDC_FONT_SIZE_X, 125, 180, 10, 10 -LTEXT "", IDC_FONT_SIZE_Y, 125, 190, 10, 10 +LTEXT "", IDC_FONT_SIZE_Y, 125, 188, 10, 10 END IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 250, 220 @@ -147,4 +147,5 @@ IDS_CPLDESCRIPTION "Configures console properties." IDS_APPLY_SHORTCUT_ALL "Modify &shortcut that started this window" IDS_SCREEN_TEXT "C:\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" + IDS_RASTERFONTS "Raster Fonts" END Modified: trunk/reactos/dll/win32/console/layout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/layout.c… ============================================================================== --- trunk/reactos/dll/win32/console/layout.c (original) +++ trunk/reactos/dll/win32/console/layout.c Sun Aug 27 04:46:50 2006 @@ -15,17 +15,66 @@ { COLORREF bkColor; HBRUSH hBrush; - - bkColor = GetSysColor(COLOR_BACKGROUND); - hBrush = CreateSolidBrush(bkColor); - - FillRect(drawItem->hDC, &drawItem->rcItem, hBrush); - //TODO draw console image - //MoveToEx(drawItem->hDC, 0, 0, NULL); - //LineTo(drawItem->hDC, 10, 10); - //MoveToEx(drawItem->hDC, 30, 30, NULL); - //LineTo(drawItem->hDC, 40, 40); - + RECT cRect, fRect; + DWORD startx, starty; + DWORD endx, endy; + DWORD sizex, sizey; + + FillRect(drawItem->hDC, &drawItem->rcItem, GetSysColorBrush(COLOR_BACKGROUND)); + + sizex = drawItem->rcItem.right - drawItem->rcItem.left; + sizey = drawItem->rcItem.bottom - drawItem->rcItem.top; + + if (pConInfo->WindowPosition == UINT_MAX) + { + startx = sizex / 3; + starty = sizey / 3; + } + else + { + //TODO + // calculate pos correctly when console centered + startx = sizex / 3; + starty = sizey / 3; + } + + //TODO + // strech console when bold fonts are selected + endx = drawItem->rcItem.right - startx + 15; + endy = starty + sizey / 3; + + /* draw console size */ + SetRect(&cRect, startx, starty, endx, endy); + FillRect(drawItem->hDC, &cRect, GetSysColorBrush(COLOR_WINDOWFRAME)); + + /* draw console border */ + SetRect(&fRect, startx + 1, starty + 1, cRect.right - 1, cRect.bottom - 1); + FrameRect(drawItem->hDC, &fRect, GetSysColorBrush(COLOR_ACTIVEBORDER)); + + /* draw left box */ + SetRect(&fRect, startx + 3, starty + 3, startx + 5, starty + 5); + FillRect(drawItem->hDC, &fRect, GetSysColor(COLOR_ACTIVEBORDER)); + + /* draw window title */ + SetRect(&fRect, startx + 7, starty + 3, cRect.right - 9, starty + 5); + FillRect(drawItem->hDC, &fRect, GetSysColorBrush(COLOR_ACTIVECAPTION)); + + /* draw first right box */ + SetRect(&fRect, fRect.right + 1, starty + 3, fRect.right + 3, starty + 5); + FillRect(drawItem->hDC, &fRect, GetSysColor(COLOR_ACTIVEBORDER)); + + /* draw second right box */ + SetRect(&fRect, fRect.right + 1, starty + 3, fRect.right + 3, starty + 5); + FillRect(drawItem->hDC, &fRect, GetSysColor(COLOR_ACTIVEBORDER)); + + /* draw scrollbar */ + SetRect(&fRect, cRect.right - 5, fRect.bottom + 1, cRect.right - 3, cRect.bottom - 3); + FillRect(drawItem->hDC, &fRect, GetSysColorBrush(COLOR_SCROLLBAR)); + + /* draw console background */ + hBrush = CreateSolidBrush(pConInfo->ScreenBackground); + SetRect(&fRect, startx + 3, starty + 6, cRect.right - 6, cRect.bottom - 3); + FillRect(drawItem->hDC, &fRect, hBrush); DeleteObject((HGDIOBJ)hBrush); } @@ -33,7 +82,7 @@ { COLORREF pbkColor, ptColor; COLORREF nbkColor, ntColor; - HBRUSH hBrush; + HBRUSH hBrush = NULL; TCHAR szText[1024]; ZeroMemory(szText, sizeof(szText)); @@ -45,7 +94,7 @@ hBrush = CreateSolidBrush(nbkColor); ntColor = pConInfo->ScreenText; } - else + else if (drawItem->CtlID == IDC_STATIC_POPUP_COLOR) { nbkColor = pConInfo->PopupBackground; hBrush = CreateSolidBrush(nbkColor); @@ -58,16 +107,18 @@ } FillRect(drawItem->hDC, &drawItem->rcItem, hBrush); - DeleteObject((HGDIOBJ)hBrush); + if (ntColor == nbkColor) + { + /* text has same color -> invisible */ + return; + } + ptColor = SetTextColor(drawItem->hDC, ntColor); pbkColor = SetBkColor(drawItem->hDC, nbkColor); - if (ntColor != nbkColor) - { - /* hide text when it has same background color as text color */ - DrawText(drawItem->hDC, szText, _tcslen(szText), &drawItem->rcItem, 0); - } + DrawText(drawItem->hDC, szText, _tcslen(szText), &drawItem->rcItem, 0); SetTextColor(drawItem->hDC, ptColor); SetBkColor(drawItem->hDC, pbkColor); + DeleteObject((HGDIOBJ)hBrush); } Modified: trunk/reactos/dll/win32/console/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/resource… ============================================================================== --- trunk/reactos/dll/win32/console/resource.h (original) +++ trunk/reactos/dll/win32/console/resource.h Sun Aug 27 04:46:50 2006 @@ -91,5 +91,6 @@ //string ids #define IDS_SCREEN_TEXT 700 +#define IDS_RASTERFONTS 701 #endif

1 0

[greatlrd] 23733: forget commit rbuild file for win32k
by greatlrd＠svn.reactos.org 26 Aug '06

26 Aug '06

Author: greatlrd Date: Sun Aug 27 03:27:49 2006 New Revision: 23733 URL: http://svn.reactos.org/svn/reactos?rev=23733&view=rev Log: forget commit rbuild file for win32k Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/win32k.rbuild (original) +++ trunk/reactos/subsystems/win32/win32k/win32k.rbuild Sun Aug 27 03:27:49 2006 @@ -27,12 +27,14 @@ <if property="ARCH" value="i386"> <directory name="i386"> + <file>dib24bpp_hline.s</file> <file>dib32bpp_hline.s</file> <file>dib32bpp_colorfill.s</file> </directory> </if> <ifnot property="ARCH" value="i386"> + <file>dib24bppc.c</file> <file>dib32bppc.c</file> </ifnot>

1 0

[greatlrd] 23732: for 24bpp 1. Remove inline asm for hline and implement a asm version of it in intel syntax. (optimzeing of this version can be done better, but it for be done for now) 2. set eorly style on file I forget.
by greatlrd＠svn.reactos.org 26 Aug '06

26 Aug '06

Author: greatlrd Date: Sun Aug 27 03:26:39 2006 New Revision: 23732 URL: http://svn.reactos.org/svn/reactos?rev=23732&view=rev Log: for 24bpp 1. Remove inline asm for hline and implement a asm version of it in intel syntax. (optimzeing of this version can be done better, but it for be done for now) 2. set eorly style on file I forget. Added: trunk/reactos/subsystems/win32/win32k/dib/dib24bppc.c (with props) trunk/reactos/subsystems/win32/win32k/dib/i386/dib24bpp_hline.s (with props) Modified: trunk/reactos/subsystems/win32/win32k/dib/dib24bpp.c trunk/reactos/subsystems/win32/win32k/dib/dib32bppc.c (contents, props changed) trunk/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_colorfill.s (contents, props changed) trunk/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_hline.s (contents, props changed) Modified: trunk/reactos/subsystems/win32/win32k/dib/dib24bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib24bpp.c (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib24bpp.c Sun Aug 27 03:26:39 2006 @@ -38,105 +38,7 @@ return *(PUSHORT)(addr) + (*(addr + 2) << 16); } -VOID -DIB_24BPP_HLine(SURFOBJ *SurfObj, LONG x1, LONG x2, LONG y, ULONG c) -{ - PBYTE addr = (PBYTE)SurfObj->pvScan0 + y * SurfObj->lDelta + (x1 << 1) + x1; - ULONG Count = x2 - x1; -#if !defined(_M_IX86) || defined(_MSC_VER) - ULONG MultiCount; - ULONG Fill[3]; -#endif - - if (Count < 8) - { - /* For small fills, don't bother doing anything fancy */ - while (Count--) - { - *(PUSHORT)(addr) = c; - addr += 2; - *(addr) = c >> 16; - addr += 1; - } - } - else - { - /* Align to 4-byte address */ - while (0 != ((ULONG_PTR) addr & 0x3)) - { - *(PUSHORT)(addr) = c; - addr += 2; - *(addr) = c >> 16; - addr += 1; - Count--; - } - /* If the color we need to fill with is 0ABC, then the final mem pattern - * (note little-endianness) would be: - * - * |C.B.A|C.B.A|C.B.A|C.B.A| <- pixel borders - * |C.B.A.C|B.A.C.B|A.C.B.A| <- ULONG borders - * - * So, taking endianness into account again, we need to fill with these - * ULONGs: CABC BCAB ABCA */ -#if defined(_M_IX86) && !defined(_MSC_VER) - /* This is about 30% faster than the generic C code below */ - __asm__ __volatile__ ( -" movl %1, %%ecx\n" -" andl $0xffffff, %%ecx\n" /* 0ABC */ -" movl %%ecx, %%ebx\n" /* Construct BCAB in ebx */ -" shrl $8, %%ebx\n" -" movl %%ecx, %%eax\n" -" shll $16, %%eax\n" -" orl %%eax, %%ebx\n" -" movl %%ecx, %%edx\n" /* Construct ABCA in edx */ -" shll $8, %%edx\n" -" movl %%ecx, %%eax\n" -" shrl $16, %%eax\n" -" orl %%eax, %%edx\n" -" movl %%ecx, %%eax\n" /* Construct CABC in eax */ -" shll $24, %%eax\n" -" orl %%ecx, %%eax\n" -" movl %2, %%ecx\n" /* Load count */ -" shr $2, %%ecx\n" -" movl %3, %%edi\n" /* Load dest */ -"0:\n" -" movl %%eax, (%%edi)\n" /* Store 4 pixels, 12 bytes */ -" movl %%ebx, 4(%%edi)\n" -" movl %%edx, 8(%%edi)\n" -" addl $12, %%edi\n" -" dec %%ecx\n" -" jnz 0b\n" -" movl %%edi, %0\n" - : "=m"(addr) - : "m"(c), "m"(Count), "m"(addr) - : "%eax", "%ebx", "%ecx", "%edx", "%edi"); -#else - c = c & 0xffffff; /* 0ABC */ - Fill[0] = c | (c << 24); /* CABC */ - Fill[1] = (c >> 8) | (c << 16); /* BCAB */ - Fill[2] = (c << 8) | (c >> 16); /* ABCA */ - MultiCount = Count / 4; - do - { - *(PULONG)addr = Fill[0]; - addr += 4; - *(PULONG)addr = Fill[1]; - addr += 4; - *(PULONG)addr = Fill[2]; - addr += 4; - } - while (0 != --MultiCount); -#endif - Count = Count & 0x03; - while (0 != Count--) - { - *(PUSHORT)(addr) = c; - addr += 2; - *(addr) = c >> 16; - addr += 1; - } - } -} + VOID DIB_24BPP_VLine(SURFOBJ *SurfObj, LONG x, LONG y1, LONG y2, ULONG c) Added: trunk/reactos/subsystems/win32/win32k/dib/dib24bppc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib24bppc.c (added) +++ trunk/reactos/subsystems/win32/win32k/dib/dib24bppc.c Sun Aug 27 03:26:39 2006 @@ -1,0 +1,89 @@ +/* + * ReactOS W32 Subsystem + * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* $Id$ */ + +#include <w32k.h> + +#define NDEBUG +#include <debug.h> + +VOID +DIB_24BPP_HLine(SURFOBJ *SurfObj, LONG x1, LONG x2, LONG y, ULONG c) +{ + PBYTE addr = (PBYTE)SurfObj->pvScan0 + y * SurfObj->lDelta + (x1 << 1) + x1; + ULONG Count = x2 - x1; + + + if (Count < 8) + { + /* For small fills, don't bother doing anything fancy */ + while (Count--) + { + *(PUSHORT)(addr) = c; + addr += 2; + *(addr) = c >> 16; + addr += 1; + } + } + else + { + /* Align to 4-byte address */ + while (0 != ((ULONG_PTR) addr & 0x3)) + { + *(PUSHORT)(addr) = c; + addr += 2; + *(addr) = c >> 16; + addr += 1; + Count--; + } + /* If the color we need to fill with is 0ABC, then the final mem pattern + * (note little-endianness) would be: + * + * |C.B.A|C.B.A|C.B.A|C.B.A| <- pixel borders + * |C.B.A.C|B.A.C.B|A.C.B.A| <- ULONG borders + * + * So, taking endianness into account again, we need to fill with these + * ULONGs: CABC BCAB ABCA */ + + c = c & 0xffffff; /* 0ABC */ + Fill[0] = c | (c << 24); /* CABC */ + Fill[1] = (c >> 8) | (c << 16); /* BCAB */ + Fill[2] = (c << 8) | (c >> 16); /* ABCA */ + MultiCount = Count / 4; + do + { + *(PULONG)addr = Fill[0]; + addr += 4; + *(PULONG)addr = Fill[1]; + addr += 4; + *(PULONG)addr = Fill[2]; + addr += 4; + } + while (0 != --MultiCount); + + Count = Count & 0x03; + while (0 != Count--) + { + *(PUSHORT)(addr) = c; + addr += 2; + *(addr) = c >> 16; + addr += 1; + } + } +} Propchange: trunk/reactos/subsystems/win32/win32k/dib/dib24bppc.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/subsystems/win32/win32k/dib/dib24bppc.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Modified: trunk/reactos/subsystems/win32/win32k/dib/dib32bppc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib32bppc.c (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib32bppc.c Sun Aug 27 03:26:39 2006 @@ -1,51 +1,51 @@ -/* - * ReactOS W32 Subsystem - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 2004, 2005, 2006 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* $Id: */ - -#include <w32k.h> - -#define NDEBUG -#include <debug.h> - -VOID -DIB_32BPP_HLine(SURFOBJ *SurfObj, LONG x1, LONG x2, LONG y, ULONG c) -{ - PBYTE byteaddr = (ULONG_PTR)SurfObj->pvScan0 + y * SurfObj->lDelta; - PDWORD addr = (PDWORD)byteaddr + x1; - LONG cx = x1; - while(cx < x2) - { - *addr = (DWORD)c; - ++addr; - ++cx; - } -} - -BOOLEAN -DIB_32BPP_ColorFill(SURFOBJ* DestSurface, RECTL* DestRect, ULONG color) -{ - ULONG DestY; - - for (DestY = DestRect->top; DestY< DestRect->bottom; DestY++) - { - DIB_32BPP_HLine (DestSurface, DestRect->left, DestRect->right, DestY, color); - } - - return TRUE; +/* + * ReactOS W32 Subsystem + * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 2004, 2005, 2006 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* $Id: */ + +#include <w32k.h> + +#define NDEBUG +#include <debug.h> + +VOID +DIB_32BPP_HLine(SURFOBJ *SurfObj, LONG x1, LONG x2, LONG y, ULONG c) +{ + PBYTE byteaddr = (ULONG_PTR)SurfObj->pvScan0 + y * SurfObj->lDelta; + PDWORD addr = (PDWORD)byteaddr + x1; + LONG cx = x1; + while(cx < x2) + { + *addr = (DWORD)c; + ++addr; + ++cx; + } +} + +BOOLEAN +DIB_32BPP_ColorFill(SURFOBJ* DestSurface, RECTL* DestRect, ULONG color) +{ + ULONG DestY; + + for (DestY = DestRect->top; DestY< DestRect->bottom; DestY++) + { + DIB_32BPP_HLine (DestSurface, DestRect->left, DestRect->right, DestY, color); + } + + return TRUE; } Propchange: trunk/reactos/subsystems/win32/win32k/dib/dib32bppc.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/subsystems/win32/win32k/dib/dib32bppc.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/subsystems/win32/win32k/dib/i386/dib24bpp_hline.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/i386/dib24bpp_hline.s (added) +++ trunk/reactos/subsystems/win32/win32k/dib/i386/dib24bpp_hline.s Sun Aug 27 03:26:39 2006 @@ -1,0 +1,165 @@ +/* + * ReactOS W32 Subsystem + * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 2004, 2005, 2006 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* $Id: */ + +.globl _DIB_24BPP_HLine +.intel_syntax noprefix + +.def _DIB_24BPP_HLine; +.scl 2; +.type 32; +.endef + _DIB_24BPP_HLine: + push edi + push esi + push ebx + sub esp, 24 + mov ebx, [esp+40] + mov edi, [esp+52] + mov ecx, [esp+44] + mov eax, [ebx+36] + mov esi, [ebx+32] + mov edx, [esp+48] + imul eax, edi + sub edx, ecx + mov [esp], edx + add eax, esi + lea eax, [eax+ecx*2] + add eax, ecx + cmp edx, 7 + mov esi, edx + mov [esp+4], eax + ja Align4byte + lea eax, [edx-1] + mov [esp], eax + inc eax + jnz small_fill + add esp, 24 + pop ebx + pop esi + pop edi + ret + + /* For small fills, don't bother doing anything fancy */ + small_fill: + movzx ecx, word ptr [esp+58] + mov edx, [esp+4] + mov esi, [esp+56] + lea eax, [edx+2] + mov [esp+4], eax + mov [edx+2], cl + mov eax, [esp] + inc dword ptr [esp+4] + mov [edx], si + dec eax + mov [esp], eax + inc eax + jnz small_fill + add esp, 24 + pop ebx + pop esi + pop edi + ret + + Align4byte: + /* Align to 4-byte address */ + test al, 3 + mov ecx, eax + jz loop1 + lea esi, [esi+0] + lea edi, [edi+0] + + loopasmversion: + /* This is about 30% faster than the generic C code below */ + movzx edx, word ptr [esp+58] + lea edi, [ecx+2] + mov eax, [esp+56] + mov [esp+4], edi + mov [ecx+2], dl + mov ebx, [esp+4] + mov [ecx], ax + mov edx, [esp] + inc ebx + mov [esp+4], ebx + dec edx + test bl, 3 + mov [esp], edx + mov ecx, ebx + jnz loopasmversion + mov esi, edx + + loop1: + mov ecx, [esp+56] + and ecx, 16777215 + mov ebx, ecx + shr ebx, 8 + mov eax, ecx + shl eax, 16 + or ebx, eax + mov edx, ecx + shl edx, 8 + mov eax, ecx + shr eax, 16 + or edx, eax + mov eax, ecx + shl eax, 24 + or eax, ecx + mov ecx, [esp] + shr ecx, 2 + mov edi, [esp+4] + loop2: + mov [edi], eax + mov [edi+4], ebx + mov [edi+8], edx + add edi, 12 + dec ecx + jnz loop2 + mov [esp+4], edi + and esi, 3 + lea eax, [esi-1] + mov [esp], eax + inc eax + jnz leftoverfromthemainloop + add esp, 24 + pop ebx + pop esi + pop edi + ret + + leftoverfromthemainloop: + + /* Count = Count & 0x03; */ + mov ecx, [esp+4] + mov ebx, [esp+56] + lea esi, [ecx+2] + mov [ecx], bx + shr ebx, 16 + mov [esp+4], esi + mov [ecx+2], bl + mov eax, [esp] + inc dword ptr [esp+4] + dec eax + mov [esp], eax + inc eax + jnz leftoverfromthemainloop + add esp, 24 + pop ebx + pop esi + pop edi + ret Propchange: trunk/reactos/subsystems/win32/win32k/dib/i386/dib24bpp_hline.s ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/subsystems/win32/win32k/dib/i386/dib24bpp_hline.s ------------------------------------------------------------------------------ svn:keywords = author date id revision Modified: trunk/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_colorfill.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_colorfill.s (original) +++ trunk/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_colorfill.s Sun Aug 27 03:26:39 2006 @@ -1,93 +1,93 @@ - -/* - * ReactOS W32 Subsystem - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 2004, 2005, 2006 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* $Id: */ - .globl _DIB_32BPP_ColorFill - .intel_syntax noprefix - - .def _DIB_32BPP_ColorFill; - .scl 2; - .type 32; - .endef - - _DIB_32BPP_ColorFill: - sub esp, 24 - mov ecx, [esp+32] - mov [esp+8], ebx - mov ebx, [esp+28] - mov [esp+20], ebp - mov ebp, [esp+36] - mov [esp+12], esi - mov [esp+16], edi - mov edi, [ecx] - mov esi, [ecx+8] - mov edx, [ebx+36] - sub esi, edi - mov edi, [ecx+4] - mov eax, edi - imul eax, edx - add eax, [ebx+32] - mov ebx, [ecx] - lea eax, [eax+ebx*4] - mov [esp+4], eax - mov eax, [ecx+12] - cmp eax, edi - jbe end - sub eax, edi - mov [esp], eax - lea esi, [esi+0] - - for_loop: - mov eax, ebp - cld - mov ebx, esi - mov edi, [esp+4] - test edi, 3 - jnz algin_draw - mov ecx, esi - rep stosd - add [esp+4], edx - dec dword ptr [esp] - jnz for_loop - end: - mov ebx, [esp+8] - mov eax, 1 - mov esi, [esp+12] - mov edi, [esp+16] - mov ebp, [esp+20] - add esp, 24 - ret - - algin_draw: - stosd - dec ebx - mov ecx, ebx - rol eax, 16 - stosd - add [esp+4], edx - dec dword ptr [esp] - jnz for_loop - - mov ebx, [esp+8] - mov eax, 1 - mov esi, [esp+12] - mov edi, [esp+16] - mov ebp, [esp+20] - add esp, 24 - ret + +/* + * ReactOS W32 Subsystem + * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 2004, 2005, 2006 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* $Id: */ + .globl _DIB_32BPP_ColorFill + .intel_syntax noprefix + + .def _DIB_32BPP_ColorFill; + .scl 2; + .type 32; + .endef + + _DIB_32BPP_ColorFill: + sub esp, 24 + mov ecx, [esp+32] + mov [esp+8], ebx + mov ebx, [esp+28] + mov [esp+20], ebp + mov ebp, [esp+36] + mov [esp+12], esi + mov [esp+16], edi + mov edi, [ecx] + mov esi, [ecx+8] + mov edx, [ebx+36] + sub esi, edi + mov edi, [ecx+4] + mov eax, edi + imul eax, edx + add eax, [ebx+32] + mov ebx, [ecx] + lea eax, [eax+ebx*4] + mov [esp+4], eax + mov eax, [ecx+12] + cmp eax, edi + jbe end + sub eax, edi + mov [esp], eax + lea esi, [esi+0] + + for_loop: + mov eax, ebp + cld + mov ebx, esi + mov edi, [esp+4] + test edi, 3 + jnz algin_draw + mov ecx, esi + rep stosd + add [esp+4], edx + dec dword ptr [esp] + jnz for_loop + end: + mov ebx, [esp+8] + mov eax, 1 + mov esi, [esp+12] + mov edi, [esp+16] + mov ebp, [esp+20] + add esp, 24 + ret + + algin_draw: + stosd + dec ebx + mov ecx, ebx + rol eax, 16 + stosd + add [esp+4], edx + dec dword ptr [esp] + jnz for_loop + + mov ebx, [esp+8] + mov eax, 1 + mov esi, [esp+12] + mov edi, [esp+16] + mov ebp, [esp+20] + add esp, 24 + ret Propchange: trunk/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_colorfill.s ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_colorfill.s ------------------------------------------------------------------------------ svn:keywords = author date id revision Modified: trunk/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_hline.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_hline.s (original) +++ trunk/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_hline.s Sun Aug 27 03:26:39 2006 @@ -1,69 +1,69 @@ -/* - * ReactOS W32 Subsystem - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 2004, 2005, 2006 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* $Id: */ - -.globl _DIB_32BPP_HLine -.intel_syntax noprefix - -.def _DIB_32BPP_HLine; -.scl 2; -.type 32; -.endef - -_DIB_32BPP_HLine: - sub esp, 12 // rember the base is not hex it is dec - mov ecx, [esp+16] - mov [esp+4], ebx - mov edx, [esp+20] // edx = LONG x1 - mov [esp+8], edi - mov edi, [esp+28] - mov eax, [ecx+36] - mov ebx, [esp+24] // ebx = LONG x2 - imul eax, edi - mov edi, [ecx+32] - sub ebx, edx // cx = (x2 - x1) ; - add eax, edi - lea edx, [eax+edx*4] - mov [esp], edx - cld - mov eax, [esp+32] - mov edi, [esp] - test edi, 3 // Align to fullword boundary - jnz short _save_rest - mov ecx, ebx // Setup count of fullwords to fill - rep stosd - - mov ebx, [esp+4] - mov edi, [esp+8] - add esp, 12 - ret -_save_rest: - stosw - ror eax, 16 - mov ecx, ebx // Setup count of fullwords to fill - dec ecx - rep stosd // The actual fill - shr eax, 16 - stosw - - mov ebx, [esp+4] - mov edi, [esp+8] - add esp, 12 - ret - +/* + * ReactOS W32 Subsystem + * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 2004, 2005, 2006 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* $Id: */ + +.globl _DIB_32BPP_HLine +.intel_syntax noprefix + +.def _DIB_32BPP_HLine; +.scl 2; +.type 32; +.endef + +_DIB_32BPP_HLine: + sub esp, 12 // rember the base is not hex it is dec + mov ecx, [esp+16] + mov [esp+4], ebx + mov edx, [esp+20] // edx = LONG x1 + mov [esp+8], edi + mov edi, [esp+28] + mov eax, [ecx+36] + mov ebx, [esp+24] // ebx = LONG x2 + imul eax, edi + mov edi, [ecx+32] + sub ebx, edx // cx = (x2 - x1) ; + add eax, edi + lea edx, [eax+edx*4] + mov [esp], edx + cld + mov eax, [esp+32] + mov edi, [esp] + test edi, 3 // Align to fullword boundary + jnz short _save_rest + mov ecx, ebx // Setup count of fullwords to fill + rep stosd + + mov ebx, [esp+4] + mov edi, [esp+8] + add esp, 12 + ret +_save_rest: + stosw + ror eax, 16 + mov ecx, ebx // Setup count of fullwords to fill + dec ecx + rep stosd // The actual fill + shr eax, 16 + stosw + + mov ebx, [esp+4] + mov edi, [esp+8] + add esp, 12 + ret + Propchange: trunk/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_hline.s ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_hline.s ------------------------------------------------------------------------------ svn:keywords = author date id revision

1 0

[fireball] 23731: - Typecast a param so that it doesn't give an error in gcc - Make cmlib compilable as a makefile target "cmlib_host" (needed for linking with mkhive)
by fireball＠svn.reactos.org 26 Aug '06

26 Aug '06

Author: fireball Date: Sun Aug 27 01:19:34 2006 New Revision: 23731 URL: http://svn.reactos.org/svn/reactos?rev=23731&view=rev Log: - Typecast a param so that it doesn't give an error in gcc - Make cmlib compilable as a makefile target "cmlib_host" (needed for linking with mkhive) Modified: trunk/reactos/lib/cmlib/cmlib.mak trunk/reactos/lib/cmlib/hivecell.c Modified: trunk/reactos/lib/cmlib/cmlib.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.mak?rev=23… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.mak (original) +++ trunk/reactos/lib/cmlib/cmlib.mak Sun Aug 27 01:19:34 2006 @@ -28,7 +28,9 @@ $(subst $(CMLIB_BASE), $(CMLIB_INT), $(CMLIB_HOST_SOURCES:.c=.o)) CMLIB_HOST_CFLAGS = -O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ - -DCMLIB_HOST -D_M_IX86 -I$(CMLIB_BASE) -Iinclude/reactos -DDBG + -D_X86_ -D__i386__ -D_REACTOS_ \ + -DCMLIB_HOST -D_M_IX86 -I$(CMLIB_BASE) -Iinclude/reactos -Iinclude/psdk -Iinclude/ddk \ + -D__NO_CTYPE_INLINES $(CMLIB_HOST_TARGET): $(CMLIB_HOST_OBJECTS) | $(CMLIB_OUT) $(ECHO_AR) Modified: trunk/reactos/lib/cmlib/hivecell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivecell.c?rev=2… ============================================================================== --- trunk/reactos/lib/cmlib/hivecell.c (original) +++ trunk/reactos/lib/cmlib/hivecell.c Sun Aug 27 01:19:34 2006 @@ -143,7 +143,7 @@ ASSERT(FreeBlock != NULL); Storage = (FreeIndex & HCELL_TYPE_MASK) >> HCELL_TYPE_SHIFT; - Index = HvpComputeFreeListIndex(FreeBlock->Size); + Index = HvpComputeFreeListIndex((ULONG)FreeBlock->Size); FreeBlockData = (PHCELL_INDEX)(FreeBlock + 1); *FreeBlockData = RegistryHive->Storage[Storage].FreeDisplay[Index]; @@ -168,7 +168,7 @@ ASSERT(RegistryHive->ReadOnly == FALSE); Storage = (CellIndex & HCELL_TYPE_MASK) >> HCELL_TYPE_SHIFT; - Index = HvpComputeFreeListIndex(CellBlock->Size); + Index = HvpComputeFreeListIndex((ULONG)CellBlock->Size); pFreeCellOffset = &RegistryHive->Storage[Storage].FreeDisplay[Index]; while (*pFreeCellOffset != HCELL_NULL)

1 0

[greatlrd] 23730: fpr 32bpp 1. Remove inline asm from hline and convert it to own asm file with intel syntax. 2. Reimplement colorfill inline asm version and convert it to own asm file with intel syntax. the asm code can be optimze bit more. But for done
by greatlrd＠svn.reactos.org 26 Aug '06

26 Aug '06

Author: greatlrd Date: Sun Aug 27 01:18:33 2006 New Revision: 23730 URL: http://svn.reactos.org/svn/reactos?rev=23730&view=rev Log: fpr 32bpp 1. Remove inline asm from hline and convert it to own asm file with intel syntax. 2. Reimplement colorfill inline asm version and convert it to own asm file with intel syntax. the asm code can be optimze bit more. But for done Added: trunk/reactos/subsystems/win32/win32k/dib/dib32bppc.c trunk/reactos/subsystems/win32/win32k/dib/i386/ trunk/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_colorfill.s trunk/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_hline.s Modified: trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c trunk/reactos/subsystems/win32/win32k/win32k.rbuild Modified: trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c Sun Aug 27 01:18:33 2006 @@ -41,53 +41,6 @@ return (ULONG)(*addr); } -#if defined(_M_IX86) && !defined(_MSC_VER) -VOID -DIB_32BPP_HLine(SURFOBJ *SurfObj, LONG x1, LONG x2, LONG y, ULONG c) -{ - LONG cx = (x2 - x1) ; - PBYTE byteaddr = (PBYTE)SurfObj->pvScan0 + y * SurfObj->lDelta; - PDWORD addr = (PDWORD)byteaddr + x1; - - __asm__ __volatile__ ( -" cld\n" -" mov %0, %%eax\n" -" mov %2, %%edi\n" -" test $0x03, %%edi\n" /* Align to fullword boundary */ -" jnz 0f\n" -" mov %1,%%ecx\n" /* Setup count of fullwords to fill */ -" rep stosl\n" /* The actual fill */ -" jmp 1f\n" -"0:\n" -" stosw\n" -" ror $0x10,%%eax\n" -" mov %1,%%ecx\n" /* Setup count of fullwords to fill */ -" dec %%ecx\n" -" rep stosl\n" /* The actual fill */ -" shr $0x10,%%eax\n" -" stosw\n" -"1:\n" - : /* no output */ - : "m"(c), "r"(cx), "m"(addr) - : "%eax", "%ecx", "%edi"); - - -} -#else -VOID -DIB_32BPP_HLine(SURFOBJ *SurfObj, LONG x1, LONG x2, LONG y, ULONG c) -{ - PBYTE byteaddr = (ULONG_PTR)SurfObj->pvScan0 + y * SurfObj->lDelta; - PDWORD addr = (PDWORD)byteaddr + x1; - LONG cx = x1; - while(cx < x2) - { - *addr = (DWORD)c; - ++addr; - ++cx; - } -} -#endif VOID DIB_32BPP_VLine(SURFOBJ *SurfObj, LONG x, LONG y1, LONG y2, ULONG c) @@ -324,19 +277,7 @@ return TRUE; } -BOOLEAN -DIB_32BPP_ColorFill(SURFOBJ* DestSurface, RECTL* DestRect, ULONG color) -{ - ULONG DestY; - - for (DestY = DestRect->top; DestY< DestRect->bottom; DestY++) - { - DIB_32BPP_HLine (DestSurface, DestRect->left, DestRect->right, DestY, color); - } - - - return TRUE; -} + /* ======================================= Stretching functions goes below Added: trunk/reactos/subsystems/win32/win32k/dib/dib32bppc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib32bppc.c (added) +++ trunk/reactos/subsystems/win32/win32k/dib/dib32bppc.c Sun Aug 27 01:18:33 2006 @@ -1,0 +1,51 @@ +/* + * ReactOS W32 Subsystem + * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 2004, 2005, 2006 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* $Id: */ + +#include <w32k.h> + +#define NDEBUG +#include <debug.h> + +VOID +DIB_32BPP_HLine(SURFOBJ *SurfObj, LONG x1, LONG x2, LONG y, ULONG c) +{ + PBYTE byteaddr = (ULONG_PTR)SurfObj->pvScan0 + y * SurfObj->lDelta; + PDWORD addr = (PDWORD)byteaddr + x1; + LONG cx = x1; + while(cx < x2) + { + *addr = (DWORD)c; + ++addr; + ++cx; + } +} + +BOOLEAN +DIB_32BPP_ColorFill(SURFOBJ* DestSurface, RECTL* DestRect, ULONG color) +{ + ULONG DestY; + + for (DestY = DestRect->top; DestY< DestRect->bottom; DestY++) + { + DIB_32BPP_HLine (DestSurface, DestRect->left, DestRect->right, DestY, color); + } + + return TRUE; +} Added: trunk/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_colorfill.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_colorfill.s (added) +++ trunk/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_colorfill.s Sun Aug 27 01:18:33 2006 @@ -1,0 +1,93 @@ + +/* + * ReactOS W32 Subsystem + * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 2004, 2005, 2006 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* $Id: */ + .globl _DIB_32BPP_ColorFill + .intel_syntax noprefix + + .def _DIB_32BPP_ColorFill; + .scl 2; + .type 32; + .endef + + _DIB_32BPP_ColorFill: + sub esp, 24 + mov ecx, [esp+32] + mov [esp+8], ebx + mov ebx, [esp+28] + mov [esp+20], ebp + mov ebp, [esp+36] + mov [esp+12], esi + mov [esp+16], edi + mov edi, [ecx] + mov esi, [ecx+8] + mov edx, [ebx+36] + sub esi, edi + mov edi, [ecx+4] + mov eax, edi + imul eax, edx + add eax, [ebx+32] + mov ebx, [ecx] + lea eax, [eax+ebx*4] + mov [esp+4], eax + mov eax, [ecx+12] + cmp eax, edi + jbe end + sub eax, edi + mov [esp], eax + lea esi, [esi+0] + + for_loop: + mov eax, ebp + cld + mov ebx, esi + mov edi, [esp+4] + test edi, 3 + jnz algin_draw + mov ecx, esi + rep stosd + add [esp+4], edx + dec dword ptr [esp] + jnz for_loop + end: + mov ebx, [esp+8] + mov eax, 1 + mov esi, [esp+12] + mov edi, [esp+16] + mov ebp, [esp+20] + add esp, 24 + ret + + algin_draw: + stosd + dec ebx + mov ecx, ebx + rol eax, 16 + stosd + add [esp+4], edx + dec dword ptr [esp] + jnz for_loop + + mov ebx, [esp+8] + mov eax, 1 + mov esi, [esp+12] + mov edi, [esp+16] + mov ebp, [esp+20] + add esp, 24 + ret Added: trunk/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_hline.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_hline.s (added) +++ trunk/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_hline.s Sun Aug 27 01:18:33 2006 @@ -1,0 +1,69 @@ +/* + * ReactOS W32 Subsystem + * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 2004, 2005, 2006 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* $Id: */ + +.globl _DIB_32BPP_HLine +.intel_syntax noprefix + +.def _DIB_32BPP_HLine; +.scl 2; +.type 32; +.endef + +_DIB_32BPP_HLine: + sub esp, 12 // rember the base is not hex it is dec + mov ecx, [esp+16] + mov [esp+4], ebx + mov edx, [esp+20] // edx = LONG x1 + mov [esp+8], edi + mov edi, [esp+28] + mov eax, [ecx+36] + mov ebx, [esp+24] // ebx = LONG x2 + imul eax, edi + mov edi, [ecx+32] + sub ebx, edx // cx = (x2 - x1) ; + add eax, edi + lea edx, [eax+edx*4] + mov [esp], edx + cld + mov eax, [esp+32] + mov edi, [esp] + test edi, 3 // Align to fullword boundary + jnz short _save_rest + mov ecx, ebx // Setup count of fullwords to fill + rep stosd + + mov ebx, [esp+4] + mov edi, [esp+8] + add esp, 12 + ret +_save_rest: + stosw + ror eax, 16 + mov ecx, ebx // Setup count of fullwords to fill + dec ecx + rep stosd // The actual fill + shr eax, 16 + stosw + + mov ebx, [esp+4] + mov edi, [esp+8] + add esp, 12 + ret + Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/win32k.rbuild (original) +++ trunk/reactos/subsystems/win32/win32k/win32k.rbuild Sun Aug 27 01:18:33 2006 @@ -12,6 +12,7 @@ <define name="_SEH_NO_NATIVE_NLG" /> <define name="_WIN32K_" /> <pch>w32k.h</pch> + <directory name="dib"> <file>dib1bpp.c</file> <file>dib4bpp.c</file> @@ -23,7 +24,23 @@ <file>dib32bpp.c</file> <file>dib32gen.c</file> <file>dib.c</file> + + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>dib32bpp_hline.s</file> + <file>dib32bpp_colorfill.s</file> + </directory> + </if> + + <ifnot property="ARCH" value="i386"> + <file>dib32bppc.c</file> + </ifnot> + </directory> + + + + <directory name="eng"> <compilationunit name="eng.c"> <file>bitblt.c</file>

1 0

[fireball] 23729: Add testsets to building process too, so that they don't bitrot (compile time is neglectable)
by fireball＠svn.reactos.org 26 Aug '06

26 Aug '06

Author: fireball Date: Sun Aug 27 01:11:08 2006 New Revision: 23729 URL: http://svn.reactos.org/svn/reactos?rev=23729&view=rev Log: Add testsets to building process too, so that they don't bitrot (compile time is neglectable) 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 Sun Aug 27 01:11:08 2006 @@ -67,6 +67,9 @@ <directory name="taskmgr"> <xi:include href="taskmgr/taskmgr.rbuild" /> </directory> +<directory name="testsets"> + <xi:include href="testsets/testsets.rbuild" /> +</directory> <directory name="winefile"> <xi:include href="winefile/winefile.rbuild" /> </directory>

1 0

[fireball] 23728: Don't crash during disconnection if a device doesn't have a driver
by fireball＠svn.reactos.org 26 Aug '06

26 Aug '06

Author: fireball Date: Sun Aug 27 01:09:11 2006 New Revision: 23728 URL: http://svn.reactos.org/svn/reactos?rev=23728&view=rev Log: Don't crash during disconnection if a device doesn't have a driver Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/gendrv.c Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/gendrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/gendrv.c (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/gendrv.c Sun Aug 27 01:09:11 2006 @@ -922,6 +922,14 @@ pdrvr = pdev->dev_driver; dev_obj = pdev->dev_obj; } + + if (dev_obj == NULL) + { + // it means no driver was found for the device and thus no device object created + // we just do nothing here + return TRUE; + } + pdrvr_ext = (PGENDRV_DRVR_EXTENSION) pdrvr->driver_ext; pdev_ext = (PGENDRV_DEVICE_EXTENSION) dev_obj->DeviceExtension; }

1 0

[fireball] 23727: Dmitry Philippov: - Implement RTL_QUERY_REGISTRY_DELETE (which simply deletes the key after querying) - Fix REG_MULTI_SZ to actually walk through the whole data, not stopping at the first encountered 0 character. This makes the "ntdll_winetest.exe reg" test behave exactly as on Windows XP
by fireball＠svn.reactos.org 26 Aug '06

26 Aug '06

Author: fireball Date: Sun Aug 27 00:45:30 2006 New Revision: 23727 URL: http://svn.reactos.org/svn/reactos?rev=23727&view=rev Log: Dmitry Philippov: - Implement RTL_QUERY_REGISTRY_DELETE (which simply deletes the key after querying) - Fix REG_MULTI_SZ to actually walk through the whole data, not stopping at the first encountered 0 character. This makes the "ntdll_winetest.exe reg" test behave exactly as on Windows XP Modified: trunk/reactos/lib/rtl/registry.c Modified: trunk/reactos/lib/rtl/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/registry.c?rev=237… ============================================================================== --- trunk/reactos/lib/rtl/registry.c (original) +++ trunk/reactos/lib/rtl/registry.c Sun Aug 27 00:45:30 2006 @@ -9,7 +9,6 @@ /* * TODO: * - finish RtlQueryRegistryValues() - * - support RTL_QUERY_REGISTRY_DELETE */ /* INCLUDES *****************************************************************/ @@ -784,7 +783,7 @@ if (QueryEntry->Flags & RTL_QUERY_REGISTRY_DELETE) { - DPRINT1("FIXME: Delete value: %S\n", QueryEntry->Name); + Status = ZwDeleteValueKey(CurrentKeyHandle, &KeyName); } @@ -828,8 +827,9 @@ !(QueryEntry->Flags & RTL_QUERY_REGISTRY_NOEXPAND)) { DPRINT("Expand REG_MULTI_SZ type\n"); + ULONG DataSize = 0; StringPtr = (PWSTR)ValueInfo->Data; - while (*StringPtr != 0) + while (DataSize < (ValueInfo->DataLength-2)) { StringLen = (wcslen(StringPtr) + 1) * sizeof(WCHAR); Status = QueryEntry->QueryRoutine(QueryEntry->Name, @@ -841,6 +841,7 @@ if(!NT_SUCCESS(Status)) break; StringPtr = (PWSTR)((PUCHAR)StringPtr + StringLen); + DataSize += StringLen; } } else if ((ValueInfo->Type == REG_EXPAND_SZ) && @@ -889,8 +890,7 @@ if (QueryEntry->Flags & RTL_QUERY_REGISTRY_DELETE) { - DPRINT1("FIXME: Delete value: %S\n", QueryEntry->Name); - + Status = ZwDeleteValueKey(CurrentKeyHandle, &KeyName); } RtlpFreeMemory(ValueInfo, TAG_RTLREGISTRY);

1 0

[greatlrd] 23726: fix a typo
by greatlrd＠svn.reactos.org 26 Aug '06

26 Aug '06

Author: greatlrd Date: Sat Aug 26 23:44:47 2006 New Revision: 23726 URL: http://svn.reactos.org/svn/reactos?rev=23726&view=rev Log: fix a typo Modified: trunk/reactos/boot/bootdata/txtsetup.sif Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif Sat Aug 26 23:44:47 2006 @@ -70,13 +70,13 @@ vga = "VGA Display (640x480x8)",,Vga,640,480,8 vbe_640x480x8 = "VESA Display (640x480x8)",,VBE,640,480,8 vbe_640x480x16 = "VESA Display (640x480x16)",,VBE,640,480,16 -vbe_640x480x32 = "VESA Display (640x480x16)",,VBE,640,480,32 +vbe_640x480x32 = "VESA Display (640x480x32)",,VBE,640,480,32 vbe_800x600x8 = "VESA Display (800x600x8)",,VBE,800,600,8 vbe = "VESA Display (800x600x16)",,VBE,800,600,16 -vbe_800x600x32 = "VESA Display (800x600x8)",,VBE,800,600,32 +vbe_800x600x32 = "VESA Display (800x600x32)",,VBE,800,600,32 vbe_1024x768x8 = "VESA Display (1024x768x8)",,VBE,1024,768,8 vbe_1024x768x16 = "VESA Display (1024x768x16)",,VBE,1024,768,16 -vbe_1024x768x32 = "VESA Display (1024x768x16)",,VBE,1024,768,32 +vbe_1024x768x32 = "VESA Display (1024x768x32)",,VBE,1024,768,32

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