Ros-diffs March 2009

ros-diffs@reactos.org

28 participants
483 discussions

[gschneider] 40166: - GetBitmapBits: This function should return DDB size since it's for 16 bit win only. So calculate this size instead of supplying the DIB size - BITMAP_GetObject: Don't always supply compression type BI_RGB, but distinguish compression from bitmap format. A problem with BI_BITFIELDS remains, since it can't be detected that way. Add a comment to GetDIBits too, same problem - this implicit BITFIELDS -> RGB issue could be the reason for some (delayed?) drawing problems - GetDIBi
by gschneider＠svn.reactos.org 21 Mar '09

21 Mar '09

Author: gschneider Date: Sat Mar 21 22:15:52 2009 New Revision: 40166 URL: http://svn.reactos.org/svn/reactos?rev=40166&view=rev Log: - GetBitmapBits: This function should return DDB size since it's for 16 bit win only. So calculate this size instead of supplying the DIB size - BITMAP_GetObject: Don't always supply compression type BI_RGB, but distinguish compression from bitmap format. A problem with BI_BITFIELDS remains, since it can't be detected that way. Add a comment to GetDIBits too, same problem - this implicit BITFIELDS -> RGB issue could be the reason for some (delayed?) drawing problems - GetDIBits: The palette information should be copied in both operation modes so move it to the beginning of the function - Fixes ~10 gdi32 bitmap winetests (but depends on used bit depth) Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Sat Mar 21 22:15:52 2009 @@ -485,7 +485,7 @@ OUT OPTIONAL PBYTE pUnsafeBits) { PSURFACE psurf; - LONG ret; + LONG bmSize, ret; if (pUnsafeBits != NULL && Bytes == 0) { @@ -499,16 +499,19 @@ return 0; } + bmSize = BITMAP_GetWidthBytes(psurf->SurfObj.sizlBitmap.cx, + BitsPerFormat(psurf->SurfObj.iBitmapFormat)) * + abs(psurf->SurfObj.sizlBitmap.cy); + /* If the bits vector is null, the function should return the read size */ if (pUnsafeBits == NULL) { - ret = psurf->SurfObj.cjBits; SURFACE_UnlockSurface(psurf); - return ret; + return bmSize; } /* Don't copy more bytes than the buffer has */ - Bytes = min(Bytes, psurf->SurfObj.cjBits); + Bytes = min(Bytes, bmSize); // FIXME: use MmSecureVirtualMemory _SEH2_TRY @@ -852,7 +855,30 @@ pds->dsBmih.biHeight = pds->dsBm.bmHeight; pds->dsBmih.biPlanes = pds->dsBm.bmPlanes; pds->dsBmih.biBitCount = pds->dsBm.bmBitsPixel; - pds->dsBmih.biCompression = 0; // FIXME! + switch (psurf->SurfObj.iBitmapFormat) + { + /* FIXME: What about BI_BITFIELDS? */ + case BMF_1BPP: + case BMF_4BPP: + case BMF_8BPP: + case BMF_16BPP: + case BMF_24BPP: + case BMF_32BPP: + pds->dsBmih.biCompression = BI_RGB; + break; + case BMF_4RLE: + pds->dsBmih.biCompression = BI_RLE4; + break; + case BMF_8RLE: + pds->dsBmih.biCompression = BI_RLE8; + break; + case BMF_JPEG: + pds->dsBmih.biCompression = BI_JPEG; + break; + case BMF_PNG: + pds->dsBmih.biCompression = BI_PNG; + break; + } pds->dsBmih.biSizeImage = psurf->SurfObj.cjBits; pds->dsBmih.biXPelsPerMeter = 0; pds->dsBmih.biYPelsPerMeter = 0; Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Sat Mar 21 22:15:52 2009 @@ -606,6 +606,9 @@ PBYTE ChkBits = Bits; PVOID ColorPtr; RGBQUAD *rgbQuads; + ULONG SourcePaletteType = 0; + ULONG DestPaletteType; + ULONG Index; DPRINT("Entered NtGdiGetDIBitsInternal()\n"); @@ -655,6 +658,163 @@ ColorPtr = ((PBYTE)Info + Info->bmiHeader.biSize); rgbQuads = (RGBQUAD *)ColorPtr; + + /* Copy palette information */ + if (Info->bmiHeader.biBitCount == BitsPerFormat(psurf->SurfObj.iBitmapFormat)) + { + hDestPalette = hSourcePalette; + bPaletteMatch = TRUE; + } + else + hDestPalette = BuildDIBPalette(Info, (PINT)&DestPaletteType); //hDestPalette = Dc->DevInfo->hpalDefault; + + SourcePalette = PALETTE_LockPalette(hSourcePalette); + /* FIXME - SourcePalette can be NULL!!! Don't assert here! */ + ASSERT(SourcePalette); + SourcePaletteType = SourcePalette->Mode; + PALETTE_UnlockPalette(SourcePalette); + + if (bPaletteMatch) + { + DestPalette = PALETTE_LockPalette(hDestPalette); + /* FIXME - DestPalette can be NULL!!!! Don't assert here!!! */ + DPRINT("DestPalette : %p\n", DestPalette); + ASSERT(DestPalette); + DestPaletteType = DestPalette->Mode; + } + else + { + DestPalette = SourcePalette; + } + + /* Copy palette. */ + /* FIXME: This is largely incomplete. ATM no Core!*/ + switch(Info->bmiHeader.biBitCount) + { + case 1: + case 4: + case 8: + Info->bmiHeader.biClrUsed = 0; + if ( psurf->hSecure && + BitsPerFormat(psurf->SurfObj.iBitmapFormat) == Info->bmiHeader.biBitCount) + { + if (Usage == DIB_RGB_COLORS) + { + if (DestPalette->NumColors != 1 << Info->bmiHeader.biBitCount) + Info->bmiHeader.biClrUsed = DestPalette->NumColors; + for (Index = 0; + Index < (1 << Info->bmiHeader.biBitCount) && Index < DestPalette->NumColors; + Index++) + { + rgbQuads[Index].rgbRed = DestPalette->IndexedColors[Index].peRed; + rgbQuads[Index].rgbGreen = DestPalette->IndexedColors[Index].peGreen; + rgbQuads[Index].rgbBlue = DestPalette->IndexedColors[Index].peBlue; + rgbQuads[Index].rgbReserved = 0; + } + } + else + { + PWORD Ptr = ColorPtr; + for (Index = 0; + Index < (1 << Info->bmiHeader.biBitCount); + Index++) + { + Ptr[Index] = (WORD)Index; + } + } + } + else + { + if (Usage == DIB_PAL_COLORS) + { + PWORD Ptr = ColorPtr; + for (Index = 0; + Index < (1 << Info->bmiHeader.biBitCount); + Index++) + { + Ptr[Index] = (WORD)Index; + } + } + else if (Info->bmiHeader.biBitCount > 1 && bPaletteMatch) + { + for (Index = 0; + Index < (1 << Info->bmiHeader.biBitCount) && Index < DestPalette->NumColors; + Index++) + { + Info->bmiColors[Index].rgbRed = DestPalette->IndexedColors[Index].peRed; + Info->bmiColors[Index].rgbGreen = DestPalette->IndexedColors[Index].peGreen; + Info->bmiColors[Index].rgbBlue = DestPalette->IndexedColors[Index].peBlue; + Info->bmiColors[Index].rgbReserved = 0; + } + } + else + { + switch(Info->bmiHeader.biBitCount) + { + case 1: + rgbQuads[0].rgbRed = rgbQuads[0].rgbGreen = rgbQuads[0].rgbBlue = 0; + rgbQuads[0].rgbReserved = 0; + rgbQuads[1].rgbRed = rgbQuads[1].rgbGreen = rgbQuads[1].rgbBlue = 0xff; + rgbQuads[1].rgbReserved = 0; + break; + case 4: + RtlCopyMemory(ColorPtr, EGAColorsQuads, sizeof(EGAColorsQuads)); + break; + case 8: + { + INT r, g, b; + RGBQUAD *color; + + RtlCopyMemory(rgbQuads, DefLogPaletteQuads, 10 * sizeof(RGBQUAD)); + RtlCopyMemory(rgbQuads + 246, DefLogPaletteQuads + 10, 10 * sizeof(RGBQUAD)); + color = rgbQuads + 10; + for(r = 0; r <= 5; r++) /* FIXME */ + for(g = 0; g <= 5; g++) + for(b = 0; b <= 5; b++) + { + color->rgbRed = (r * 0xff) / 5; + color->rgbGreen = (g * 0xff) / 5; + color->rgbBlue = (b * 0xff) / 5; + color->rgbReserved = 0; + color++; + } + } + break; + } + } + } + + case 15: + if (Info->bmiHeader.biCompression == BI_BITFIELDS) + { + ((PDWORD)Info->bmiColors)[0] = 0x7c00; + ((PDWORD)Info->bmiColors)[1] = 0x03e0; + ((PDWORD)Info->bmiColors)[2] = 0x001f; + } + break; + + case 16: + if (Info->bmiHeader.biCompression == BI_BITFIELDS) + { + ((PDWORD)Info->bmiColors)[0] = 0xf800; + ((PDWORD)Info->bmiColors)[1] = 0x07e0; + ((PDWORD)Info->bmiColors)[2] = 0x001f; + } + break; + + case 24: + case 32: + if (Info->bmiHeader.biCompression == BI_BITFIELDS) + { + ((PDWORD)Info->bmiColors)[0] = 0xff0000; + ((PDWORD)Info->bmiColors)[1] = 0x00ff00; + ((PDWORD)Info->bmiColors)[2] = 0x0000ff; + } + break; + } + + if (bPaletteMatch) + PALETTE_UnlockPalette(DestPalette); /* fill out the BITMAPINFO struct */ if (!ChkBits) @@ -678,6 +838,7 @@ Info->bmiHeader.biBitCount = BitsPerFormat(psurf->SurfObj.iBitmapFormat); switch (psurf->SurfObj.iBitmapFormat) { + /* FIXME: What about BI_BITFIELDS? */ case BMF_1BPP: case BMF_4BPP: case BMF_8BPP: @@ -715,166 +876,8 @@ else { SIZEL DestSize; - ULONG SourcePaletteType = 0; - ULONG DestPaletteType; POINTL SourcePoint; - ULONG Index; - - if (Info->bmiHeader.biBitCount == BitsPerFormat(psurf->SurfObj.iBitmapFormat)) - { - hDestPalette = hSourcePalette; - bPaletteMatch = TRUE; - } - else - hDestPalette = BuildDIBPalette(Info, (PINT)&DestPaletteType); //hDestPalette = Dc->DevInfo->hpalDefault; - - SourcePalette = PALETTE_LockPalette(hSourcePalette); - /* FIXME - SourcePalette can be NULL!!! Don't assert here! */ - ASSERT(SourcePalette); - SourcePaletteType = SourcePalette->Mode; - PALETTE_UnlockPalette(SourcePalette); - - if (bPaletteMatch) - { - DestPalette = PALETTE_LockPalette(hDestPalette); - /* FIXME - DestPalette can be NULL!!!! Don't assert here!!! */ - DPRINT("DestPalette : %p\n", DestPalette); - ASSERT(DestPalette); - DestPaletteType = DestPalette->Mode; - } - else - { - DestPalette = SourcePalette; - } - - /* Copy palette. */ - /* FIXME: This is largely incomplete. ATM no Core!*/ - switch(Info->bmiHeader.biBitCount) - { - case 1: - case 4: - case 8: - Info->bmiHeader.biClrUsed = 0; - if ( psurf->hSecure && - BitsPerFormat(psurf->SurfObj.iBitmapFormat) == Info->bmiHeader.biBitCount) - { - if (Usage == DIB_RGB_COLORS) - { - if (DestPalette->NumColors != 1 << Info->bmiHeader.biBitCount) - Info->bmiHeader.biClrUsed = DestPalette->NumColors; - for (Index = 0; - Index < (1 << Info->bmiHeader.biBitCount) && Index < DestPalette->NumColors; - Index++) - { - rgbQuads[Index].rgbRed = DestPalette->IndexedColors[Index].peRed; - rgbQuads[Index].rgbGreen = DestPalette->IndexedColors[Index].peGreen; - rgbQuads[Index].rgbBlue = DestPalette->IndexedColors[Index].peBlue; - rgbQuads[Index].rgbReserved = 0; - } - } - else - { - PWORD Ptr = ColorPtr; - for (Index = 0; - Index < (1 << Info->bmiHeader.biBitCount); - Index++) - { - Ptr[Index] = (WORD)Index; - } - } - } - else - { - if (Usage == DIB_PAL_COLORS) - { - PWORD Ptr = ColorPtr; - for (Index = 0; - Index < (1 << Info->bmiHeader.biBitCount); - Index++) - { - Ptr[Index] = (WORD)Index; - } - } - else if (Info->bmiHeader.biBitCount > 1 && bPaletteMatch) - { - for (Index = 0; - Index < (1 << Info->bmiHeader.biBitCount) && Index < DestPalette->NumColors; - Index++) - { - Info->bmiColors[Index].rgbRed = DestPalette->IndexedColors[Index].peRed; - Info->bmiColors[Index].rgbGreen = DestPalette->IndexedColors[Index].peGreen; - Info->bmiColors[Index].rgbBlue = DestPalette->IndexedColors[Index].peBlue; - Info->bmiColors[Index].rgbReserved = 0; - } - } - else - { - switch(Info->bmiHeader.biBitCount) - { - case 1: - rgbQuads[0].rgbRed = rgbQuads[0].rgbGreen = rgbQuads[0].rgbBlue = 0; - rgbQuads[0].rgbReserved = 0; - rgbQuads[1].rgbRed = rgbQuads[1].rgbGreen = rgbQuads[1].rgbBlue = 0xff; - rgbQuads[1].rgbReserved = 0; - break; - case 4: - RtlCopyMemory(ColorPtr, EGAColorsQuads, sizeof(EGAColorsQuads)); - break; - case 8: - { - INT r, g, b; - RGBQUAD *color; - - RtlCopyMemory(rgbQuads, DefLogPaletteQuads, 10 * sizeof(RGBQUAD)); - RtlCopyMemory(rgbQuads + 246, DefLogPaletteQuads + 10, 10 * sizeof(RGBQUAD)); - color = rgbQuads + 10; - for(r = 0; r <= 5; r++) /* FIXME */ - for(g = 0; g <= 5; g++) - for(b = 0; b <= 5; b++) - { - color->rgbRed = (r * 0xff) / 5; - color->rgbGreen = (g * 0xff) / 5; - color->rgbBlue = (b * 0xff) / 5; - color->rgbReserved = 0; - color++; - } - } - break; - } - } - } - - case 15: - if (Info->bmiHeader.biCompression == BI_BITFIELDS) - { - ((PDWORD)Info->bmiColors)[0] = 0x7c00; - ((PDWORD)Info->bmiColors)[1] = 0x03e0; - ((PDWORD)Info->bmiColors)[2] = 0x001f; - } - break; - - case 16: - if (Info->bmiHeader.biCompression == BI_BITFIELDS) - { - ((PDWORD)Info->bmiColors)[0] = 0xf800; - ((PDWORD)Info->bmiColors)[1] = 0x07e0; - ((PDWORD)Info->bmiColors)[2] = 0x001f; - } - break; - - case 24: - case 32: - if (Info->bmiHeader.biCompression == BI_BITFIELDS) - { - ((PDWORD)Info->bmiColors)[0] = 0xff0000; - ((PDWORD)Info->bmiColors)[1] = 0x00ff00; - ((PDWORD)Info->bmiColors)[2] = 0x0000ff; - } - break; - } - - if (bPaletteMatch) - PALETTE_UnlockPalette(DestPalette); + // // If we have a good dib pointer, why not just copy bits from there w/o XLATE'ing them. //

1 0

[cfinck] 40165: SVN maintenance: Set svn:eol-style to "native" for PHP, JS, SQL and TXT files
by cfinck＠svn.reactos.org 21 Mar '09

21 Mar '09

1 0

[cfinck] 40164: Sync all non-RosCMS stuff to r40163
by cfinck＠svn.reactos.org 21 Mar '09

21 Mar '09

1 0

[cfinck] 40163: This shouldn't have been committed in r38000...
by cfinck＠svn.reactos.org 21 Mar '09

21 Mar '09

Author: cfinck Date: Sat Mar 21 16:24:32 2009 New Revision: 40163 URL: http://svn.reactos.org/svn/reactos?rev=40163&view=rev Log: This shouldn't have been committed in r38000... Modified: trunk/web/reactos.org/htdocs/wiki/includes/Sanitizer.php Modified: trunk/web/reactos.org/htdocs/wiki/includes/Sanitizer.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/wiki/includ… ============================================================================== --- trunk/web/reactos.org/htdocs/wiki/includes/Sanitizer.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/wiki/includes/Sanitizer.php [iso-8859-1] Sat Mar 21 16:24:32 2009 @@ -1,4 +1,4 @@ -<?php +ï»¿<?php /** * XHTML sanitizer for MediaWiki * @@ -726,7 +726,6 @@ * @return HTML-encoded text fragment */ static function encodeAttribute( $text ) { - if( is_object( $text ) ) debug_print_backtrace(); $encValue = htmlspecialchars( $text, ENT_QUOTES ); // Whitespace is normalized during attribute decoding,

1 0

[cfinck] 40162: Fix file encoding (= remove UTF-8 BOM)
by cfinck＠svn.reactos.org 21 Mar '09

21 Mar '09

Author: cfinck Date: Sat Mar 21 16:06:57 2009 New Revision: 40162 URL: http://svn.reactos.org/svn/reactos?rev=40162&view=rev Log: Fix file encoding (= remove UTF-8 BOM) Modified: trunk/web/reactos.org/htdocs/peoplemap/lang/ru.inc.php Modified: trunk/web/reactos.org/htdocs/peoplemap/lang/ru.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/l… ============================================================================== --- trunk/web/reactos.org/htdocs/peoplemap/lang/ru.inc.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/peoplemap/lang/ru.inc.php [iso-8859-1] Sat Mar 21 16:06:57 2009 @@ -1,4 +1,4 @@ -ï»¿<?php +<?php /* PROJECT: People Map of the ReactOS Website LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation

1 0

[cgutman] 40161: - Uncomment the NdisUnmapFile call in NdisCloseFile - Found by Dmitry Chapyshev
by cgutman＠svn.reactos.org 21 Mar '09

21 Mar '09

Author: cgutman Date: Sat Mar 21 16:01:12 2009 New Revision: 40161 URL: http://svn.reactos.org/svn/reactos?rev=40161&view=rev Log: - Uncomment the NdisUnmapFile call in NdisCloseFile - Found by Dmitry Chapyshev Modified: trunk/reactos/drivers/network/ndis/ndis/misc.c Modified: trunk/reactos/drivers/network/ndis/ndis/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] Sat Mar 21 16:01:12 2009 @@ -121,6 +121,19 @@ */ VOID EXPORT +NdisUnmapFile( + IN NDIS_HANDLE FileHandle) +{ + PNDIS_HANDLE_OBJECT HandleObject = (PNDIS_HANDLE_OBJECT) FileHandle; + + HandleObject->Mapped = FALSE; +} + +/* + * @implemented + */ +VOID +EXPORT NdisCloseFile( IN NDIS_HANDLE FileHandle) { @@ -134,10 +147,8 @@ ASSERT ( FileHandleObject->FileHandle ); - /* if ( FileHandleObject->Mapped ) NdisUnmapFile ( FileHandle ); - */ ZwClose ( FileHandleObject->FileHandle ); @@ -258,20 +269,6 @@ */ VOID EXPORT -NdisUnmapFile( - IN NDIS_HANDLE FileHandle) -{ - PNDIS_HANDLE_OBJECT HandleObject = (PNDIS_HANDLE_OBJECT) FileHandle; - - HandleObject->Mapped = FALSE; -} - - -/* - * @implemented - */ -VOID -EXPORT NdisGetCurrentProcessorCounts( OUT PULONG pIdleCount, OUT PULONG pKernelAndUser,

1 0

[dchapyshev] 40160: - Fix typo
by dchapyshev＠svn.reactos.org 21 Mar '09

21 Mar '09

Author: dchapyshev Date: Sat Mar 21 15:50:33 2009 New Revision: 40160 URL: http://svn.reactos.org/svn/reactos?rev=40160&view=rev Log: - Fix typo Modified: trunk/web/reactos.org/htdocs/peoplemap/lang/ru.inc.php Modified: trunk/web/reactos.org/htdocs/peoplemap/lang/ru.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/l… ============================================================================== --- trunk/web/reactos.org/htdocs/peoplemap/lang/ru.inc.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/peoplemap/lang/ru.inc.php [iso-8859-1] Sat Mar 21 15:50:33 2009 @@ -4,7 +4,7 @@ LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation PURPOSE: Translation COPYRIGHT: Copyright 2007-2009 Colin Finck <mail(a)colinfinck.de> - TRANSLATOR: Dnitry Chapyshev + TRANSLATOR: Dmitry Chapyshev charset=utf-8 without BOM */

1 0

[dchapyshev] 40158: - Add Russian translation for peoplemap
by dchapyshev＠svn.reactos.org 21 Mar '09

21 Mar '09

Author: dchapyshev Date: Sat Mar 21 15:32:17 2009 New Revision: 40158 URL: http://svn.reactos.org/svn/reactos?rev=40158&view=rev Log: - Add Russian translation for peoplemap Added: trunk/web/reactos.org/htdocs/peoplemap/lang/ru.inc.php (with props) Modified: trunk/web/reactos.org/htdocs/peoplemap/languages.inc.php Added: trunk/web/reactos.org/htdocs/peoplemap/lang/ru.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/l… ============================================================================== --- trunk/web/reactos.org/htdocs/peoplemap/lang/ru.inc.php (added) +++ trunk/web/reactos.org/htdocs/peoplemap/lang/ru.inc.php [iso-8859-1] Sat Mar 21 15:32:17 2009 @@ -1,0 +1,51 @@ +ï»¿<?php +/* + PROJECT: People Map of the ReactOS Website + LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + PURPOSE: Translation + COPYRIGHT: Copyright 2007-2009 Colin Finck <mail(a)colinfinck.de> + TRANSLATOR: Dnitry Chapyshev + + charset=utf-8 without BOM +*/ + + $peoplemap_langres["header"] = '<a href="http://www.reactos.org/">ÐÐ»Ð°Ð²Ð½Ð°Ñ</a> > ÐÐ°ÑÑÐ° Ð»ÑÐ´ÐµÐ¹ ReactOS'; + $peoplemap_langres["title"] = "ÐÐ°ÑÑÐ° Ð»ÑÐ´ÐµÐ¹ ReactOS"; + $peoplemap_langres["intro"] = "Ð¡Ð»ÐµÐ´ÑÑÑÐ°Ñ ÐºÐ°ÑÑÐ° Ð¿Ð¾ÐºÐ°Ð·ÑÐ²Ð°ÐµÑ ÑÐ°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ ÑÐ°Ð·ÑÐ°Ð±Ð¾ÑÑÐ¸ÐºÐ¾Ð² Ð¸ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹ ReactOS."; + + $peoplemap_langres["filter"] = "Ð¤Ð¸Ð»ÑÑÑ Ð¿Ð¾ Ð³ÑÑÐ¿Ð¿Ðµ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ"; + $peoplemap_langres["filter_intro"] = "ÐÐ°Ð¶Ð¼Ð¸ÑÐµ ÑÐ»Ð°Ð¶Ð¾Ðº Ð½Ð°Ð¿ÑÐ¾ÑÐ¸Ð² Ð³ÑÑÐ¿Ð¿Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹, ÑÑÐ¾Ð±Ñ Ð¿Ð¾ÐºÐ°Ð·Ð°ÑÑ Ð¸Ð»Ð¸ ÑÐºÑÑÑÑ Ð¸Ñ ÑÐ°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ñ ÐºÐ°ÑÑÑ."; + + $peoplemap_langres["add"] = "ÐÐ¾Ð¸ÑÐº Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ð¸ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ ÐµÐ³Ð¾ Ð½Ð° ÐºÐ°ÑÑÑ"; + $peoplemap_langres["add_username"] = "ÐÐ¼Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ"; + $peoplemap_langres["add_fullname"] = "ÐÐ¾Ð»Ð½Ð¾Ðµ Ð¸Ð¼Ñ"; + + $peoplemap_langres["mylocation"] = "ÐÐ¾Ðµ ÑÐ°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð½Ð° ÐºÐ°ÑÑÐµ"; + $peoplemap_langres["mylocation_login"] = "ÐÑ Ð´Ð¾Ð»Ð¶Ð½Ñ Ð±ÑÑÑ Ð°Ð²ÑÐ¾ÑÐ¸Ð·Ð¾Ð²Ð°Ð½Ñ, ÑÑÐ¾Ð±Ñ ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ Ð²Ð°ÑÐµ ÑÐ°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ."; + $peoplemap_langres["mylocation_login_page"] = "ÐÐ²ÑÐ¾ÑÐ¸Ð·Ð°ÑÐ¸Ñ"; + $peoplemap_langres["mylocation_intro"] = "ÐÐ´ÐµÑÑ Ð²Ñ Ð¼Ð¾Ð¶ÐµÑÐµ ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ Ð²Ð°ÑÐµ ÑÐ°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð½Ð° ÐºÐ°ÑÑÐµ. ÐÑ Ð¼Ð¾Ð¶ÐµÑÐµ ÑÐ´ÐµÐ»Ð°ÑÑ ÑÑÐ¾ Ð¾Ð´Ð½Ð¸Ð¼ Ð¸Ð· ÑÐ»ÐµÐ´ÑÑÑÐ¸Ñ ÑÐ¿Ð¾ÑÐ¾Ð±Ð¾Ð²:"; + $peoplemap_langres["mylocation_marker_intro"] = "ÐÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÐµ Ð¼Ð°ÑÐºÐµÑ Ð² Ð²Ð°ÑÐµ ÑÐ°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð½Ð° ÐºÐ°ÑÑÐµ."; + $peoplemap_langres["mylocation_marker_button"] = "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ Ð¼Ð°ÑÐºÐµÑ"; + $peoplemap_langres["mylocation_marker_save_intro"] = "ÐÐ°Ð¶Ð¼Ð¸ÑÐµ ÐºÐ½Ð¾Ð¿ÐºÑ Ð´Ð»Ñ ÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ð¸Ñ<br>Ð²Ð°ÑÐµÐ³Ð¾ ÑÐ°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ."; + $peoplemap_langres["mylocation_marker_save_button"] = "Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ Ð¼Ð¾Ðµ ÑÐ°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ"; + $peoplemap_langres["mylocation_marker_cancel"] = "ÐÑÐ¼ÐµÐ½Ð°"; + $peoplemap_langres["mylocation_coordinates_intro"] = "ÐÐ²ÐµÐ´Ð¸ÑÐµ ÐºÐ¾Ð¾ÑÐ´Ð¸Ð½Ð°ÑÑ ÑÐ°Ð¼Ð¾ÑÑÐ¾ÑÑÐµÐ»ÑÐ½Ð¾:"; + $peoplemap_langres["mylocation_coordinates_button"] = "Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ"; + $peoplemap_langres["mylocation_coordinates_invalid"] = "ÐÑÐ¾ Ð½ÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½ÑÐµ ÐºÐ¾Ð¾ÑÐ´Ð¸Ð½Ð°ÑÑ!"; + $peoplemap_langres["mylocation_delete_intro"] = "ÐÑÐ¿Ð¾Ð»ÑÐ·ÑÑ Ð´Ð°Ð½Ð½ÑÑ ÐºÐ½Ð¾Ð¿ÐºÑ, Ð²Ñ Ð¼Ð¾Ð¶ÐµÑÐµ ÑÐ´Ð°Ð»Ð¸ÑÑ ÑÐ²Ð¾Ðµ ÑÐ°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ñ ÐºÐ°ÑÑÑ."; + $peoplemap_langres["mylocation_delete_button"] = "Ð£Ð´Ð°Ð»Ð¸ÑÑ Ð¼Ð¾Ðµ ÑÐ°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ"; + + $peoplemap_langres["latitude"] = "Ð¨Ð¸ÑÐ¾ÑÐ°"; + $peoplemap_langres["longitude"] = "ÐÐ¾Ð»Ð³Ð¾ÑÐ°"; + $peoplemap_langres["removefrommap"] = "Ð£Ð´Ð°Ð»Ð¸ÑÑ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ñ ÐºÐ°ÑÑÑ"; + $peoplemap_langres["minquerylength"] = "ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð²Ð²ÐµÐ´Ð¸ÑÐµ Ð¿ÐµÑÐ²ÑÐµ 3 ÑÐ¸Ð¼Ð²Ð¾Ð»Ð°."; + $peoplemap_langres["nousers"] = "ÐÐ¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½ Ð½Ð° ÐºÐ°ÑÑÐµ!"; + $peoplemap_langres["activatejs"] = "ÐÑ Ð´Ð¾Ð»Ð¶Ð½Ñ Ð²ÐºÐ»ÑÑÐ¸ÑÑ JavaScript, ÑÑÐ¾Ð±Ñ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ ÐºÐ°ÑÑÑ Ð»ÑÐ´ÐµÐ¹!"; + $peoplemap_langres["unsupportedbrowser"] = "ÐÐ°ÑÑÐ° Ð»ÑÐ´ÐµÐ¹ Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÑÑÑ Ð²Ð°ÑÐ¸Ð¼ Ð±ÑÐ°ÑÐ·ÐµÑÐ¾Ð¼."; + + $peoplemap_langres["count1"] = "ÐÐ¾ÐºÐ°Ð·Ð°Ð½Ð¾ <strong>"; + $peoplemap_langres["count2"] = " Ð¸Ð· "; + $peoplemap_langres["count3"] = "</strong> Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹ Ñ Ð´Ð°Ð½Ð½ÑÐ¼Ð¸ Ð½Ð° ÐºÐ°ÑÑÐµ ("; + $peoplemap_langres["count4"] = " - Ð²ÑÐµÐ³Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹)"; + $peoplemap_langres["icons"] = "ÐÐºÐ¾Ð½ÐºÐ°"; +?> Propchange: trunk/web/reactos.org/htdocs/peoplemap/lang/ru.inc.php ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/web/reactos.org/htdocs/peoplemap/languages.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/l… ============================================================================== --- trunk/web/reactos.org/htdocs/peoplemap/languages.inc.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/peoplemap/languages.inc.php [iso-8859-1] Sat Mar 21 15:32:17 2009 @@ -13,5 +13,6 @@ "de" => "Deutsch (German)", "es" => "EspaÃ±ol (Spanish)", "pl" => "Polski (Polish)", + "ru" => "Ð ÑÑÑÐºÐ¸Ð¹ (Russian)", ); ?>

1 0

[cfinck] 40157: Enable the Crash Recovery feature when doing the RegTest. Now the new sysreg2 just needs to be set up on the Buildslave and we might finally be able to remove all those "Skip Test xyz, because ROS sucks" hacks.
by cfinck＠svn.reactos.org 21 Mar '09

21 Mar '09

Author: cfinck Date: Sat Mar 21 15:21:12 2009 New Revision: 40157 URL: http://svn.reactos.org/svn/reactos?rev=40157&view=rev Log: Enable the Crash Recovery feature when doing the RegTest. Now the new sysreg2 just needs to be set up on the Buildslave and we might finally be able to remove all those "Skip Test xyz, because ROS sucks" hacks. Modified: trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf Modified: trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootcdregtes… ============================================================================== --- trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf [iso-8859-1] Sat Mar 21 15:21:12 2009 @@ -51,4 +51,4 @@ ; after 3rd boot ; [GuiRunOnce] -%SystemRoot%\system32\rosautotest.exe /s +%SystemRoot%\system32\rosautotest.exe /r /s

1 0

[fireball] 40156: - Allocate and initialize setup loader block. - Add setup loader block pointer conversion to WinLdrInitializePhase1 (if it exists). - Temporary: provide empty boot options string.
by fireball＠svn.reactos.org 21 Mar '09

21 Mar '09

Author: fireball Date: Sat Mar 21 14:11:44 2009 New Revision: 40156 URL: http://svn.reactos.org/svn/reactos?rev=40156&view=rev Log: - Allocate and initialize setup loader block. - Add setup loader block pointer conversion to WinLdrInitializePhase1 (if it exists). - Temporary: provide empty boot options string. Modified: trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c trunk/reactos/boot/freeldr/freeldr/windows/winldr.c Modified: trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c [iso-8859-1] Sat Mar 21 14:11:44 2009 @@ -21,6 +21,8 @@ #include <freeldr.h> #include <ndk/ldrtypes.h> +#include <arc/setupblk.h> + #include <debug.h> // TODO: Move to .h @@ -155,6 +157,7 @@ CHAR SystemPath[512], SearchPath[512]; CHAR FileName[512]; CHAR BootPath[512]; + CHAR LoadOptions[512]; LPCSTR BootOptions; PVOID NtosBase = NULL, HalBase = NULL, KdComBase = NULL; BOOLEAN Status; @@ -163,6 +166,7 @@ HINF InfHandle; INFCONTEXT InfContext; PLOADER_PARAMETER_BLOCK LoaderBlock, LoaderBlockVA; + PSETUP_LOADER_BLOCK SetupBlock; KERNEL_ENTRY_POINT KiSystemStartup; PLDR_DATA_TABLE_ENTRY KernelDTE, HalDTE, KdComDTE = NULL; // Mm-related things @@ -249,6 +253,14 @@ /* Allocate and minimalistic-initialize LPB */ AllocateAndInitLPB(&LoaderBlock); + /* Allocate and initialize setup loader block */ + SetupBlock = MmHeapAlloc(sizeof(SETUP_LOADER_BLOCK)); + RtlZeroMemory(SetupBlock, sizeof(SETUP_LOADER_BLOCK)); + LoaderBlock->SetupLdrBlock = SetupBlock; + + /* Set textmode setup flag */ + SetupBlock->Flags = SETUPLDR_TEXT_MODE; + /* Detect hardware */ UseRealHeap = TRUE; LoaderBlock->ConfigurationRoot = MachHwDetect(); @@ -300,7 +312,8 @@ WinLdrSetupForNt(LoaderBlock, &GdtIdt, &PcrBasePage, &TssBasePage); /* Initialize Phase 1 - no drivers loading anymore */ - WinLdrInitializePhase1(LoaderBlock, (PCHAR)BootOptions, SystemPath, BootPath, _WIN32_WINNT_WS03); + LoadOptions[0] = 0; + WinLdrInitializePhase1(LoaderBlock, LoadOptions, SystemPath, BootPath, _WIN32_WINNT_WS03); /* Save entry-point pointer and Loader block VAs */ KiSystemStartup = (KERNEL_ENTRY_POINT)KernelDTE->EntryPoint; @@ -325,6 +338,11 @@ //WinLdrpDumpBootDriver(LoaderBlockVA); //WinLdrpDumpArcDisks(LoaderBlockVA); + /*asm(".intel_syntax noprefix\n"); + asm("test1:\n"); + asm("jmp test1\n"); + asm(".att_syntax\n");*/ + /* Pass control */ (*KiSystemStartup)(LoaderBlockVA); Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Sat Mar 21 14:11:44 2009 @@ -201,7 +201,11 @@ Extension->DrvDBImage = PaToVa(WinLdrLoadModule(MiscFiles, &Extension->DrvDBSize, LoaderRegistryData)); + /* Convert extension and setup block pointers */ LoaderBlock->Extension = PaToVa(Extension); + + if (LoaderBlock->SetupLdrBlock) + LoaderBlock->SetupLdrBlock = PaToVa(LoaderBlock->SetupLdrBlock); } // Last step before going virtual

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
49
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2009