Ros-diffs April 2009

ros-diffs@reactos.org

25 participants
476 discussions

[cgutman] 40471: - Don't close the connection handle and dereference the connection object when we run out of memory because it will cause a crash when AfdCleanupSocket tries to do the same - Fixes bug 4362
by cgutman＠svn.reactos.org 12 Apr '09

12 Apr '09

Author: cgutman Date: Sun Apr 12 09:07:15 2009 New Revision: 40471 URL: http://svn.reactos.org/svn/reactos?rev=40471&view=rev Log: - Don't close the connection handle and dereference the connection object when we run out of memory because it will cause a crash when AfdCleanupSocket tries to do the same - Fixes bug 4362 Modified: trunk/reactos/drivers/network/afd/afd/listen.c Modified: trunk/reactos/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/li… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] Sun Apr 12 09:07:15 2009 @@ -143,9 +143,6 @@ Qelt = ExAllocatePool( NonPagedPool, sizeof(*Qelt) ); if( !Qelt ) { - /* Is this correct? */ - TdiCloseDevice( FCB->Connection.Handle, - FCB->Connection.Object ); Status = STATUS_NO_MEMORY; } else { UINT AddressType =

1 0

[jmorlan] 40470: - RtlSetEnvironmentVariable: Removing a variable that didn't exist in the first place should still returns STATUS_SUCCESS. - Removing a variable can be done by using a pointer to a UNICODE_STRING with a NULL Buffer as the value, as well as just passing NULL as the value.
by jmorlan＠svn.reactos.org 12 Apr '09

12 Apr '09

Author: jmorlan Date: Sun Apr 12 08:41:33 2009 New Revision: 40470 URL: http://svn.reactos.org/svn/reactos?rev=40470&view=rev Log: - RtlSetEnvironmentVariable: Removing a variable that didn't exist in the first place should still returns STATUS_SUCCESS. - Removing a variable can be done by using a pointer to a UNICODE_STRING with a NULL Buffer as the value, as well as just passing NULL as the value. Modified: trunk/reactos/dll/win32/kernel32/misc/env.c trunk/reactos/lib/rtl/env.c Modified: trunk/reactos/dll/win32/kernel32/misc/env.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/en… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/env.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/env.c [iso-8859-1] Sun Apr 12 08:41:33 2009 @@ -244,21 +244,12 @@ RtlInitUnicodeString (&VarName, lpName); - if (lpValue) - { - RtlInitUnicodeString (&VarValue, - lpValue); - - Status = RtlSetEnvironmentVariable (NULL, - &VarName, - &VarValue); - } - else - { - Status = RtlSetEnvironmentVariable (NULL, - &VarName, - NULL); - } + RtlInitUnicodeString (&VarValue, + lpValue); + + Status = RtlSetEnvironmentVariable (NULL, + &VarName, + &VarValue); if (!NT_SUCCESS(Status)) { Modified: trunk/reactos/lib/rtl/env.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/env.c?rev=40470&r1… ============================================================================== --- trunk/reactos/lib/rtl/env.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/env.c [iso-8859-1] Sun Apr 12 08:41:33 2009 @@ -354,7 +354,7 @@ } found: - if (Value != NULL) + if (Value != NULL && Value->Buffer != NULL) { hole_len = tail - hole; /* calculate new environment size */ @@ -472,10 +472,6 @@ memmove(head, tail, (env_end - tail) * sizeof(WCHAR)); - } - else - { - Status = STATUS_VARIABLE_NOT_FOUND; } }

1 0

[gschneider] 40469: - Don't copy data to null buffer, just return the string length in this case - Fix some buffer calculation problems, handle buffer termination if it's shorter than the font string - Fixes >= 10 gdi32 font winetests (NtGdiGetTextFaceW/NtGdiGetTextFaceA related)
by gschneider＠svn.reactos.org 11 Apr '09

11 Apr '09

Author: gschneider Date: Sun Apr 12 01:24:25 2009 New Revision: 40469 URL: http://svn.reactos.org/svn/reactos?rev=40469&view=rev Log: - Don't copy data to null buffer, just return the string length in this case - Fix some buffer calculation problems, handle buffer termination if it's shorter than the font string - Fixes >= 10 gdi32 font winetests (NtGdiGetTextFaceW/NtGdiGetTextFaceA related) Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] Sun Apr 12 01:24:25 2009 @@ -326,6 +326,7 @@ HFONT hFont; PTEXTOBJ TextObj; NTSTATUS Status; + INT fLen, ret; /* FIXME: Handle bAliasName */ @@ -341,16 +342,32 @@ TextObj = RealizeFontInit(hFont); ASSERT(TextObj != NULL); - Count = min(Count, wcslen(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfFaceName)); - Status = MmCopyToCaller(FaceName, TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfFaceName, Count * sizeof(WCHAR)); + fLen = wcslen(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfFaceName) + 1; + + if (FaceName != NULL) + { + Count = min(Count, fLen); + Status = MmCopyToCaller(FaceName, TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfFaceName, Count * sizeof(WCHAR)); + if (!NT_SUCCESS(Status)) + { + TEXTOBJ_UnlockText(TextObj); + SetLastNtError(Status); + return 0; + } + /* Terminate if we copied only part of the font name */ + if (Count > 0 && Count < fLen) + { + FaceName[Count - 1] = '\0'; + } + ret = Count; + } + else + { + ret = fLen; + } + TEXTOBJ_UnlockText(TextObj); - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return 0; - } - - return Count; + return ret; } W32KAPI

1 0

[tkreuzer] 40468: remove doenloader from rosapps build
by tkreuzer＠svn.reactos.org 11 Apr '09

11 Apr '09

Author: tkreuzer Date: Sun Apr 12 00:29:31 2009 New Revision: 40468 URL: http://svn.reactos.org/svn/reactos?rev=40468&view=rev Log: remove doenloader from rosapps build Modified: trunk/rosapps/applications/applications.rbuild Modified: trunk/rosapps/applications/applications.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/applications.… ============================================================================== --- trunk/rosapps/applications/applications.rbuild [iso-8859-1] (original) +++ trunk/rosapps/applications/applications.rbuild [iso-8859-1] Sun Apr 12 00:29:31 2009 @@ -11,10 +11,6 @@ <directory name="devutils"> <xi:include href="devutils/directory.rbuild" /> - </directory> - - <directory name="downloader"> - <xi:include href="downloader/downloader.rbuild" /> </directory> <!--

1 0

[fireball] 40467: - Delete cis, expat-rbuild, old_reactx, winldr and xen branches.
by fireball＠svn.reactos.org 11 Apr '09

11 Apr '09

Author: fireball Date: Sun Apr 12 00:18:48 2009 New Revision: 40467 URL: http://svn.reactos.org/svn/reactos?rev=40467&view=rev Log: - Delete cis, expat-rbuild, old_reactx, winldr and xen branches. Removed: branches/cis/ branches/expat-rbuild/ branches/old_reactx/ branches/winldr/ branches/xen/

1 0

[sginsberg] 40466: - Reapply the gdi32 bitmap font test ROS-HACK -- the tests still fail on the build server
by sginsberg＠svn.reactos.org 11 Apr '09

11 Apr '09

Author: sginsberg Date: Sun Apr 12 00:15:26 2009 New Revision: 40466 URL: http://svn.reactos.org/svn/reactos?rev=40466&view=rev Log: - Reapply the gdi32 bitmap font test ROS-HACK -- the tests still fail on the build server Modified: trunk/rostests/winetests/gdi32/font.c Modified: trunk/rostests/winetests/gdi32/font.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/font.c?re… ============================================================================== --- trunk/rostests/winetests/gdi32/font.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/font.c [iso-8859-1] Sun Apr 12 00:15:26 2009 @@ -284,6 +284,9 @@ TEXTMETRICA tm_orig; SIZE size_orig; INT ret, i, width_orig, height_orig, scale, lfWidth; + + skip("ROS-HACK: Skipping bitmap font tests!\n"); + return; hdc = GetDC(0);

1 0

[tkreuzer] 40465: [FORMATTING] Fix indentation, no code change
by tkreuzer＠svn.reactos.org 11 Apr '09

11 Apr '09

Author: tkreuzer Date: Sat Apr 11 23:04:06 2009 New Revision: 40465 URL: http://svn.reactos.org/svn/reactos?rev=40465&view=rev Log: [FORMATTING] Fix indentation, no code change Modified: trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c 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 [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c [iso-8859-1] Sat Apr 11 23:04:06 2009 @@ -26,19 +26,19 @@ VOID DIB_32BPP_PutPixel(SURFOBJ *SurfObj, LONG x, LONG y, ULONG c) { - PBYTE byteaddr = (PBYTE)SurfObj->pvScan0 + y * SurfObj->lDelta; - PDWORD addr = (PDWORD)byteaddr + x; - - *addr = c; + PBYTE byteaddr = (PBYTE)SurfObj->pvScan0 + y * SurfObj->lDelta; + PDWORD addr = (PDWORD)byteaddr + x; + + *addr = c; } ULONG DIB_32BPP_GetPixel(SURFOBJ *SurfObj, LONG x, LONG y) { - PBYTE byteaddr = (PBYTE)SurfObj->pvScan0 + y * SurfObj->lDelta; - PDWORD addr = (PDWORD)byteaddr + x; - - return (ULONG)(*addr); + PBYTE byteaddr = (PBYTE)SurfObj->pvScan0 + y * SurfObj->lDelta; + PDWORD addr = (PDWORD)byteaddr + x; + + return (ULONG)(*addr); } @@ -47,234 +47,250 @@ { - PBYTE byteaddr = (PBYTE)SurfObj->pvScan0 + y1 * SurfObj->lDelta; - PDWORD addr = (PDWORD)byteaddr + x; - LONG lDelta = SurfObj->lDelta >> 2; // >> 2 == / sizeof(DWORD) - - byteaddr = (PBYTE)addr; - while(y1++ < y2) - { - *addr = (DWORD)c; - addr += lDelta; - } + PBYTE byteaddr = (PBYTE)SurfObj->pvScan0 + y1 * SurfObj->lDelta; + PDWORD addr = (PDWORD)byteaddr + x; + LONG lDelta = SurfObj->lDelta >> 2; // >> 2 == / sizeof(DWORD) + + byteaddr = (PBYTE)addr; + while (y1++ < y2) + { + *addr = (DWORD)c; + addr += lDelta; + } } BOOLEAN DIB_32BPP_BitBltSrcCopy(PBLTINFO BltInfo) { - LONG i, j, sx, sy, xColor, f1; - PBYTE SourceBits, DestBits, SourceLine, DestLine; - PBYTE SourceBits_4BPP, SourceLine_4BPP; - PDWORD Source32, Dest32; - - DestBits = (PBYTE)BltInfo->DestSurface->pvScan0 + (BltInfo->DestRect.top * BltInfo->DestSurface->lDelta) + 4 * BltInfo->DestRect.left; - - switch(BltInfo->SourceSurface->iBitmapFormat) - { - case BMF_1BPP: - - sx = BltInfo->SourcePoint.x; - sy = BltInfo->SourcePoint.y; - - for (j=BltInfo->DestRect.top; j<BltInfo->DestRect.bottom; j++) - { - sx = BltInfo->SourcePoint.x; - for (i=BltInfo->DestRect.left; i<BltInfo->DestRect.right; i++) - { - if(DIB_1BPP_GetPixel(BltInfo->SourceSurface, sx, sy) == 0) - { - DIB_32BPP_PutPixel(BltInfo->DestSurface, i, j, XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, 0)); - } else { - DIB_32BPP_PutPixel(BltInfo->DestSurface, i, j, XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, 1)); - } - sx++; - } - sy++; - } - break; - - case BMF_4BPP: - SourceBits_4BPP = (PBYTE)BltInfo->SourceSurface->pvScan0 + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + (BltInfo->SourcePoint.x >> 1); - - for (j=BltInfo->DestRect.top; j<BltInfo->DestRect.bottom; j++) - { - SourceLine_4BPP = SourceBits_4BPP; - sx = BltInfo->SourcePoint.x; - f1 = sx & 1; - - for (i=BltInfo->DestRect.left; i<BltInfo->DestRect.right; i++) - { - xColor = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, - (*SourceLine_4BPP & altnotmask[f1]) >> (4 * (1 - f1))); - DIB_32BPP_PutPixel(BltInfo->DestSurface, i, j, xColor); - if(f1 == 1) { SourceLine_4BPP++; f1 = 0; } else { f1 = 1; } - sx++; - } - - SourceBits_4BPP += BltInfo->SourceSurface->lDelta; - } - break; - - case BMF_8BPP: - SourceLine = (PBYTE)BltInfo->SourceSurface->pvScan0 + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + BltInfo->SourcePoint.x; - DestLine = DestBits; - - for (j = BltInfo->DestRect.top; j < BltInfo->DestRect.bottom; j++) - { - SourceBits = SourceLine; - DestBits = DestLine; - - for (i = BltInfo->DestRect.left; i < BltInfo->DestRect.right; i++) - { - xColor = *SourceBits; - *((PDWORD) DestBits) = (DWORD)XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, xColor); - SourceBits += 1; - DestBits += 4; - } - - SourceLine += BltInfo->SourceSurface->lDelta; - DestLine += BltInfo->DestSurface->lDelta; - } - break; - - case BMF_16BPP: - SourceLine = (PBYTE)BltInfo->SourceSurface->pvScan0 + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + 2 * BltInfo->SourcePoint.x; - DestLine = DestBits; - - for (j = BltInfo->DestRect.top; j < BltInfo->DestRect.bottom; j++) - { - SourceBits = SourceLine; - DestBits = DestLine; - - for (i = BltInfo->DestRect.left; i < BltInfo->DestRect.right; i++) - { - xColor = *((PWORD) SourceBits); - *((PDWORD) DestBits) = (DWORD)XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, xColor); - SourceBits += 2; - DestBits += 4; - } - - SourceLine += BltInfo->SourceSurface->lDelta; - DestLine += BltInfo->DestSurface->lDelta; - } - break; - - case BMF_24BPP: - SourceLine = (PBYTE)BltInfo->SourceSurface->pvScan0 + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + 3 * BltInfo->SourcePoint.x; - DestLine = DestBits; - - for (j = BltInfo->DestRect.top; j < BltInfo->DestRect.bottom; j++) - { - SourceBits = SourceLine; - DestBits = DestLine; - - for (i = BltInfo->DestRect.left; i < BltInfo->DestRect.right; i++) - { - xColor = (*(SourceBits + 2) << 0x10) + - (*(SourceBits + 1) << 0x08) + - (*(SourceBits)); - *((PDWORD)DestBits) = (DWORD)XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, xColor); - SourceBits += 3; - DestBits += 4; - } - - SourceLine += BltInfo->SourceSurface->lDelta; - DestLine += BltInfo->DestSurface->lDelta; - } - break; - - case BMF_32BPP: - if (NULL == BltInfo->XlateSourceToDest || 0 != (BltInfo->XlateSourceToDest->flXlate & XO_TRIVIAL)) - { - if (BltInfo->DestRect.top < BltInfo->SourcePoint.y) - { - SourceBits = (PBYTE)BltInfo->SourceSurface->pvScan0 + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + 4 * BltInfo->SourcePoint.x; - for (j = BltInfo->DestRect.top; j < BltInfo->DestRect.bottom; j++) - { - RtlMoveMemory(DestBits, SourceBits, 4 * (BltInfo->DestRect.right - BltInfo->DestRect.left)); - SourceBits += BltInfo->SourceSurface->lDelta; - DestBits += BltInfo->DestSurface->lDelta; - } - } - else - { - SourceBits = (PBYTE)BltInfo->SourceSurface->pvScan0 + ((BltInfo->SourcePoint.y + BltInfo->DestRect.bottom - BltInfo->DestRect.top - 1) * BltInfo->SourceSurface->lDelta) + 4 * BltInfo->SourcePoint.x; - DestBits = (PBYTE)BltInfo->DestSurface->pvScan0 + ((BltInfo->DestRect.bottom - 1) * BltInfo->DestSurface->lDelta) + 4 * BltInfo->DestRect.left; - for (j = BltInfo->DestRect.bottom - 1; BltInfo->DestRect.top <= j; j--) - { - RtlMoveMemory(DestBits, SourceBits, 4 * (BltInfo->DestRect.right - BltInfo->DestRect.left)); - SourceBits -= BltInfo->SourceSurface->lDelta; - DestBits -= BltInfo->DestSurface->lDelta; - } - } - } - else - { - if (BltInfo->DestRect.top < BltInfo->SourcePoint.y) - { - SourceBits = ((PBYTE)BltInfo->SourceSurface->pvScan0 + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + 4 * BltInfo->SourcePoint.x); - for (j = BltInfo->DestRect.top; j < BltInfo->DestRect.bottom; j++) - { - if (BltInfo->DestRect.left < BltInfo->SourcePoint.x) - { - Dest32 = (DWORD *) DestBits; - Source32 = (DWORD *) SourceBits; - for (i = BltInfo->DestRect.left; i < BltInfo->DestRect.right; i++) - { - *Dest32++ = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, *Source32++); - } - } + LONG i, j, sx, sy, xColor, f1; + PBYTE SourceBits, DestBits, SourceLine, DestLine; + PBYTE SourceBits_4BPP, SourceLine_4BPP; + PDWORD Source32, Dest32; + + DestBits = (PBYTE)BltInfo->DestSurface->pvScan0 + + (BltInfo->DestRect.top * BltInfo->DestSurface->lDelta) + + 4 * BltInfo->DestRect.left; + + switch (BltInfo->SourceSurface->iBitmapFormat) + { + case BMF_1BPP: + + sx = BltInfo->SourcePoint.x; + sy = BltInfo->SourcePoint.y; + + for (j=BltInfo->DestRect.top; j<BltInfo->DestRect.bottom; j++) + { + sx = BltInfo->SourcePoint.x; + for (i=BltInfo->DestRect.left; i<BltInfo->DestRect.right; i++) + { + if (DIB_1BPP_GetPixel(BltInfo->SourceSurface, sx, sy) == 0) + { + DIB_32BPP_PutPixel(BltInfo->DestSurface, i, j, XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, 0)); + } else { + DIB_32BPP_PutPixel(BltInfo->DestSurface, i, j, XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, 1)); + } + sx++; + } + sy++; + } + break; + + case BMF_4BPP: + SourceBits_4BPP = (PBYTE)BltInfo->SourceSurface->pvScan0 + + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + + (BltInfo->SourcePoint.x >> 1); + + for (j=BltInfo->DestRect.top; j<BltInfo->DestRect.bottom; j++) + { + SourceLine_4BPP = SourceBits_4BPP; + sx = BltInfo->SourcePoint.x; + f1 = sx & 1; + + for (i=BltInfo->DestRect.left; i<BltInfo->DestRect.right; i++) + { + xColor = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, + (*SourceLine_4BPP & altnotmask[f1]) >> (4 * (1 - f1))); + DIB_32BPP_PutPixel(BltInfo->DestSurface, i, j, xColor); + if (f1 == 1) { + SourceLine_4BPP++; + f1 = 0; + } else { + f1 = 1; + } + sx++; + } + + SourceBits_4BPP += BltInfo->SourceSurface->lDelta; + } + break; + + case BMF_8BPP: + SourceLine = (PBYTE)BltInfo->SourceSurface->pvScan0 + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + BltInfo->SourcePoint.x; + DestLine = DestBits; + + for (j = BltInfo->DestRect.top; j < BltInfo->DestRect.bottom; j++) + { + SourceBits = SourceLine; + DestBits = DestLine; + + for (i = BltInfo->DestRect.left; i < BltInfo->DestRect.right; i++) + { + xColor = *SourceBits; + *((PDWORD) DestBits) = (DWORD)XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, xColor); + SourceBits += 1; + DestBits += 4; + } + + SourceLine += BltInfo->SourceSurface->lDelta; + DestLine += BltInfo->DestSurface->lDelta; + } + break; + + case BMF_16BPP: + SourceLine = (PBYTE)BltInfo->SourceSurface->pvScan0 + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + 2 * BltInfo->SourcePoint.x; + DestLine = DestBits; + + for (j = BltInfo->DestRect.top; j < BltInfo->DestRect.bottom; j++) + { + SourceBits = SourceLine; + DestBits = DestLine; + + for (i = BltInfo->DestRect.left; i < BltInfo->DestRect.right; i++) + { + xColor = *((PWORD) SourceBits); + *((PDWORD) DestBits) = (DWORD)XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, xColor); + SourceBits += 2; + DestBits += 4; + } + + SourceLine += BltInfo->SourceSurface->lDelta; + DestLine += BltInfo->DestSurface->lDelta; + } + break; + + case BMF_24BPP: + SourceLine = (PBYTE)BltInfo->SourceSurface->pvScan0 + + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + + 3 * BltInfo->SourcePoint.x; + DestLine = DestBits; + + for (j = BltInfo->DestRect.top; j < BltInfo->DestRect.bottom; j++) + { + SourceBits = SourceLine; + DestBits = DestLine; + + for (i = BltInfo->DestRect.left; i < BltInfo->DestRect.right; i++) + { + xColor = (*(SourceBits + 2) << 0x10) + + (*(SourceBits + 1) << 0x08) + + (*(SourceBits)); + *((PDWORD)DestBits) = (DWORD)XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, xColor); + SourceBits += 3; + DestBits += 4; + } + + SourceLine += BltInfo->SourceSurface->lDelta; + DestLine += BltInfo->DestSurface->lDelta; + } + break; + + case BMF_32BPP: + if (NULL == BltInfo->XlateSourceToDest || + 0 != (BltInfo->XlateSourceToDest->flXlate & XO_TRIVIAL)) + { + if (BltInfo->DestRect.top < BltInfo->SourcePoint.y) + { + SourceBits = (PBYTE)BltInfo->SourceSurface->pvScan0 + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + 4 * BltInfo->SourcePoint.x; + for (j = BltInfo->DestRect.top; j < BltInfo->DestRect.bottom; j++) + { + RtlMoveMemory(DestBits, SourceBits, 4 * (BltInfo->DestRect.right - BltInfo->DestRect.left)); + SourceBits += BltInfo->SourceSurface->lDelta; + DestBits += BltInfo->DestSurface->lDelta; + } + } else - { - Dest32 = (DWORD *) DestBits + (BltInfo->DestRect.right - BltInfo->DestRect.left - 1); - Source32 = (DWORD *) SourceBits + (BltInfo->DestRect.right - BltInfo->DestRect.left - 1); - for (i = BltInfo->DestRect.right - 1; BltInfo->DestRect.left <= i; i--) - { - *Dest32-- = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, *Source32--); - } - } - SourceBits += BltInfo->SourceSurface->lDelta; - DestBits += BltInfo->DestSurface->lDelta; - } - } - else - { - SourceBits = (PBYTE)BltInfo->SourceSurface->pvScan0 + ((BltInfo->SourcePoint.y + BltInfo->DestRect.bottom - BltInfo->DestRect.top - 1) * BltInfo->SourceSurface->lDelta) + 4 * BltInfo->SourcePoint.x; - DestBits = (PBYTE)BltInfo->DestSurface->pvScan0 + ((BltInfo->DestRect.bottom - 1) * BltInfo->DestSurface->lDelta) + 4 * BltInfo->DestRect.left; - for (j = BltInfo->DestRect.bottom - 1; BltInfo->DestRect.top <= j; j--) - { - if (BltInfo->DestRect.left < BltInfo->SourcePoint.x) - { - Dest32 = (DWORD *) DestBits; - Source32 = (DWORD *) SourceBits; - for (i = BltInfo->DestRect.left; i < BltInfo->DestRect.right; i++) - { - *Dest32++ = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, *Source32++); - } - } + { + SourceBits = (PBYTE)BltInfo->SourceSurface->pvScan0 + + ((BltInfo->SourcePoint.y + + BltInfo->DestRect.bottom + - BltInfo->DestRect.top - 1) * BltInfo->SourceSurface->lDelta) + + 4 * BltInfo->SourcePoint.x; + DestBits = (PBYTE)BltInfo->DestSurface->pvScan0 + ((BltInfo->DestRect.bottom - 1) * BltInfo->DestSurface->lDelta) + 4 * BltInfo->DestRect.left; + for (j = BltInfo->DestRect.bottom - 1; BltInfo->DestRect.top <= j; j--) + { + RtlMoveMemory(DestBits, SourceBits, 4 * (BltInfo->DestRect.right - BltInfo->DestRect.left)); + SourceBits -= BltInfo->SourceSurface->lDelta; + DestBits -= BltInfo->DestSurface->lDelta; + } + } + } + else + { + if (BltInfo->DestRect.top < BltInfo->SourcePoint.y) + { + SourceBits = ((PBYTE)BltInfo->SourceSurface->pvScan0 + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + 4 * BltInfo->SourcePoint.x); + for (j = BltInfo->DestRect.top; j < BltInfo->DestRect.bottom; j++) + { + if (BltInfo->DestRect.left < BltInfo->SourcePoint.x) + { + Dest32 = (DWORD *) DestBits; + Source32 = (DWORD *) SourceBits; + for (i = BltInfo->DestRect.left; i < BltInfo->DestRect.right; i++) + { + *Dest32++ = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, *Source32++); + } + } + else + { + Dest32 = (DWORD *) DestBits + (BltInfo->DestRect.right - BltInfo->DestRect.left - 1); + Source32 = (DWORD *) SourceBits + (BltInfo->DestRect.right - BltInfo->DestRect.left - 1); + for (i = BltInfo->DestRect.right - 1; BltInfo->DestRect.left <= i; i--) + { + *Dest32-- = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, *Source32--); + } + } + SourceBits += BltInfo->SourceSurface->lDelta; + DestBits += BltInfo->DestSurface->lDelta; + } + } else - { - Dest32 = (DWORD *) DestBits + (BltInfo->DestRect.right - BltInfo->DestRect.left - 1); - Source32 = (DWORD *) SourceBits + (BltInfo->DestRect.right - BltInfo->DestRect.left - 1); - for (i = BltInfo->DestRect.right - 1; BltInfo->DestRect.left <= i; i--) - { - *Dest32-- = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, *Source32--); - } - } - SourceBits -= BltInfo->SourceSurface->lDelta; - DestBits -= BltInfo->DestSurface->lDelta; - } - } - } - break; - - default: - DPRINT1("DIB_32BPP_Bitblt: Unhandled Source BPP: %u\n", BitsPerFormat(BltInfo->SourceSurface->iBitmapFormat)); - return FALSE; - } - - return TRUE; + { + SourceBits = (PBYTE)BltInfo->SourceSurface->pvScan0 + ((BltInfo->SourcePoint.y + BltInfo->DestRect.bottom - BltInfo->DestRect.top - 1) * BltInfo->SourceSurface->lDelta) + 4 * BltInfo->SourcePoint.x; + DestBits = (PBYTE)BltInfo->DestSurface->pvScan0 + ((BltInfo->DestRect.bottom - 1) * BltInfo->DestSurface->lDelta) + 4 * BltInfo->DestRect.left; + for (j = BltInfo->DestRect.bottom - 1; BltInfo->DestRect.top <= j; j--) + { + if (BltInfo->DestRect.left < BltInfo->SourcePoint.x) + { + Dest32 = (DWORD *) DestBits; + Source32 = (DWORD *) SourceBits; + for (i = BltInfo->DestRect.left; i < BltInfo->DestRect.right; i++) + { + *Dest32++ = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, *Source32++); + } + } + else + { + Dest32 = (DWORD *) DestBits + (BltInfo->DestRect.right - BltInfo->DestRect.left - 1); + Source32 = (DWORD *) SourceBits + (BltInfo->DestRect.right - BltInfo->DestRect.left - 1); + for (i = BltInfo->DestRect.right - 1; BltInfo->DestRect.left <= i; i--) + { + *Dest32-- = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, *Source32--); + } + } + SourceBits -= BltInfo->SourceSurface->lDelta; + DestBits -= BltInfo->DestSurface->lDelta; + } + } + } + break; + + default: + DPRINT1("DIB_32BPP_Bitblt: Unhandled Source BPP: %u\n", BitsPerFormat(BltInfo->SourceSurface->iBitmapFormat)); + return FALSE; + } + + return TRUE; } BOOLEAN @@ -282,61 +298,61 @@ RECTL* DestRect, RECTL *SourceRect, XLATEOBJ *ColorTranslation, ULONG iTransColor) { - ULONG X, Y, SourceX, SourceY = 0, Source = 0, wd; - ULONG *DestBits; - - LONG DstHeight; - LONG DstWidth; - LONG SrcHeight; - LONG SrcWidth; - - DstHeight = DestRect->bottom - DestRect->top; - DstWidth = DestRect->right - DestRect->left; - SrcHeight = SourceRect->bottom - SourceRect->top; - SrcWidth = SourceRect->right - SourceRect->left; - - DestBits = (ULONG*)((PBYTE)DestSurf->pvScan0 + - (DestRect->left << 2) + - DestRect->top * DestSurf->lDelta); - wd = DestSurf->lDelta - ((DestRect->right - DestRect->left) << 2); - - for(Y = DestRect->top; Y < DestRect->bottom; Y++) - { - SourceY = SourceRect->top+(Y - DestRect->top) * SrcHeight / DstHeight; - for(X = DestRect->left; X < DestRect->right; X++, DestBits++) - { - SourceX = SourceRect->left+(X - DestRect->left) * SrcWidth / DstWidth; - if (SourceX >= 0 && SourceY >= 0 && - SourceSurf->sizlBitmap.cx > SourceX && SourceSurf->sizlBitmap.cy > SourceY) - { - Source = DIB_GetSourceIndex(SourceSurf, SourceX, SourceY); - if(Source != iTransColor) + ULONG X, Y, SourceX, SourceY = 0, Source = 0, wd; + ULONG *DestBits; + + LONG DstHeight; + LONG DstWidth; + LONG SrcHeight; + LONG SrcWidth; + + DstHeight = DestRect->bottom - DestRect->top; + DstWidth = DestRect->right - DestRect->left; + SrcHeight = SourceRect->bottom - SourceRect->top; + SrcWidth = SourceRect->right - SourceRect->left; + + DestBits = (ULONG*)((PBYTE)DestSurf->pvScan0 + + (DestRect->left << 2) + + DestRect->top * DestSurf->lDelta); + wd = DestSurf->lDelta - ((DestRect->right - DestRect->left) << 2); + + for (Y = DestRect->top; Y < DestRect->bottom; Y++) + { + SourceY = SourceRect->top+(Y - DestRect->top) * SrcHeight / DstHeight; + for (X = DestRect->left; X < DestRect->right; X++, DestBits++) { - *DestBits = XLATEOBJ_iXlate(ColorTranslation, Source); + SourceX = SourceRect->left+(X - DestRect->left) * SrcWidth / DstWidth; + if (SourceX >= 0 && SourceY >= 0 && + SourceSurf->sizlBitmap.cx > SourceX && SourceSurf->sizlBitmap.cy > SourceY) + { + Source = DIB_GetSourceIndex(SourceSurf, SourceX, SourceY); + if (Source != iTransColor) + { + *DestBits = XLATEOBJ_iXlate(ColorTranslation, Source); + } + } } - } - } - - DestBits = (ULONG*)((ULONG_PTR)DestBits + wd); - } - - return TRUE; + + DestBits = (ULONG*)((ULONG_PTR)DestBits + wd); + } + + return TRUE; } typedef union { - ULONG ul; - struct { - UCHAR red; - UCHAR green; - UCHAR blue; - UCHAR alpha; - } col; + ULONG ul; + struct { + UCHAR red; + UCHAR green; + UCHAR blue; + UCHAR alpha; + } col; } NICEPIXEL32; static __inline UCHAR Clamp8(ULONG val) { - return (val > 255) ? 255 : val; + return (val > 255) ? 255 : val; } BOOLEAN @@ -344,77 +360,77 @@ RECTL* SourceRect, CLIPOBJ* ClipRegion, XLATEOBJ* ColorTranslation, BLENDOBJ* BlendObj) { - INT Rows, Cols, SrcX, SrcY; - register PULONG Dst; - ULONG DstDelta; - BLENDFUNCTION BlendFunc; - register NICEPIXEL32 DstPixel, SrcPixel; - UCHAR Alpha, SrcBpp; - - DPRINT("DIB_32BPP_AlphaBlend: srcRect: (%d,%d)-(%d,%d), dstRect: (%d,%d)-(%d,%d)\n", - SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom, - DestRect->left, DestRect->top, DestRect->right, DestRect->bottom); - - ASSERT(DestRect->bottom - DestRect->top == SourceRect->bottom - SourceRect->top && - DestRect->right - DestRect->left == SourceRect->right - SourceRect->left); - - BlendFunc = BlendObj->BlendFunction; - if (BlendFunc.BlendOp != AC_SRC_OVER) - { - DPRINT1("BlendOp != AC_SRC_OVER\n"); - return FALSE; - } - if (BlendFunc.BlendFlags != 0) - { - DPRINT1("BlendFlags != 0\n"); - return FALSE; - } - if ((BlendFunc.AlphaFormat & ~AC_SRC_ALPHA) != 0) - { - DPRINT1("Unsupported AlphaFormat (0x%x)\n", BlendFunc.AlphaFormat); - return FALSE; - } - if ((BlendFunc.AlphaFormat & AC_SRC_ALPHA) != 0 && - BitsPerFormat(Source->iBitmapFormat) != 32) - { - DPRINT1("Source bitmap must be 32bpp when AC_SRC_ALPHA is set\n"); - return FALSE; - } - - Dst = (PULONG)((ULONG_PTR)Dest->pvScan0 + (DestRect->top * Dest->lDelta) + - (DestRect->left << 2)); - DstDelta = Dest->lDelta - ((DestRect->right - DestRect->left) << 2); - SrcBpp = BitsPerFormat(Source->iBitmapFormat); - - Rows = DestRect->bottom - DestRect->top; - SrcY = SourceRect->top; - while (--Rows >= 0) - { - Cols = DestRect->right - DestRect->left; - SrcX = SourceRect->left; - while (--Cols >= 0) - { - SrcPixel.ul = DIB_GetSource(Source, SrcX++, SrcY, ColorTranslation); - SrcPixel.col.red = SrcPixel.col.red * BlendFunc.SourceConstantAlpha / 255; - SrcPixel.col.green = SrcPixel.col.green * BlendFunc.SourceConstantAlpha / 255; - SrcPixel.col.blue = SrcPixel.col.blue * BlendFunc.SourceConstantAlpha / 255; - SrcPixel.col.alpha = (SrcBpp == 32) ? (SrcPixel.col.alpha * BlendFunc.SourceConstantAlpha / 255) : BlendFunc.SourceConstantAlpha; - - Alpha = ((BlendFunc.AlphaFormat & AC_SRC_ALPHA) != 0) ? - SrcPixel.col.alpha : BlendFunc.SourceConstantAlpha; - - DstPixel.ul = *Dst; - DstPixel.col.red = Clamp8(DstPixel.col.red * (255 - Alpha) / 255 + SrcPixel.col.red); - DstPixel.col.green = Clamp8(DstPixel.col.green * (255 - Alpha) / 255 + SrcPixel.col.green); - DstPixel.col.blue = Clamp8(DstPixel.col.blue * (255 - Alpha) / 255 + SrcPixel.col.blue); - DstPixel.col.alpha = Clamp8(DstPixel.col.alpha * (255 - Alpha) / 255 + SrcPixel.col.alpha); - *Dst++ = DstPixel.ul; - } - Dst = (PULONG)((ULONG_PTR)Dst + DstDelta); - SrcY++; - } - - return TRUE; + INT Rows, Cols, SrcX, SrcY; + register PULONG Dst; + ULONG DstDelta; + BLENDFUNCTION BlendFunc; + register NICEPIXEL32 DstPixel, SrcPixel; + UCHAR Alpha, SrcBpp; + + DPRINT("DIB_32BPP_AlphaBlend: srcRect: (%d,%d)-(%d,%d), dstRect: (%d,%d)-(%d,%d)\n", + SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom, + DestRect->left, DestRect->top, DestRect->right, DestRect->bottom); + + ASSERT(DestRect->bottom - DestRect->top == SourceRect->bottom - SourceRect->top && + DestRect->right - DestRect->left == SourceRect->right - SourceRect->left); + + BlendFunc = BlendObj->BlendFunction; + if (BlendFunc.BlendOp != AC_SRC_OVER) + { + DPRINT1("BlendOp != AC_SRC_OVER\n"); + return FALSE; + } + if (BlendFunc.BlendFlags != 0) + { + DPRINT1("BlendFlags != 0\n"); + return FALSE; + } + if ((BlendFunc.AlphaFormat & ~AC_SRC_ALPHA) != 0) + { + DPRINT1("Unsupported AlphaFormat (0x%x)\n", BlendFunc.AlphaFormat); + return FALSE; + } + if ((BlendFunc.AlphaFormat & AC_SRC_ALPHA) != 0 && + BitsPerFormat(Source->iBitmapFormat) != 32) + { + DPRINT1("Source bitmap must be 32bpp when AC_SRC_ALPHA is set\n"); + return FALSE; + } + + Dst = (PULONG)((ULONG_PTR)Dest->pvScan0 + (DestRect->top * Dest->lDelta) + + (DestRect->left << 2)); + DstDelta = Dest->lDelta - ((DestRect->right - DestRect->left) << 2); + SrcBpp = BitsPerFormat(Source->iBitmapFormat); + + Rows = DestRect->bottom - DestRect->top; + SrcY = SourceRect->top; + while (--Rows >= 0) + { + Cols = DestRect->right - DestRect->left; + SrcX = SourceRect->left; + while (--Cols >= 0) + { + SrcPixel.ul = DIB_GetSource(Source, SrcX++, SrcY, ColorTranslation); + SrcPixel.col.red = SrcPixel.col.red * BlendFunc.SourceConstantAlpha / 255; + SrcPixel.col.green = SrcPixel.col.green * BlendFunc.SourceConstantAlpha / 255; + SrcPixel.col.blue = SrcPixel.col.blue * BlendFunc.SourceConstantAlpha / 255; + SrcPixel.col.alpha = (SrcBpp == 32) ? (SrcPixel.col.alpha * BlendFunc.SourceConstantAlpha / 255) : BlendFunc.SourceConstantAlpha; + + Alpha = ((BlendFunc.AlphaFormat & AC_SRC_ALPHA) != 0) ? + SrcPixel.col.alpha : BlendFunc.SourceConstantAlpha; + + DstPixel.ul = *Dst; + DstPixel.col.red = Clamp8(DstPixel.col.red * (255 - Alpha) / 255 + SrcPixel.col.red); + DstPixel.col.green = Clamp8(DstPixel.col.green * (255 - Alpha) / 255 + SrcPixel.col.green); + DstPixel.col.blue = Clamp8(DstPixel.col.blue * (255 - Alpha) / 255 + SrcPixel.col.blue); + DstPixel.col.alpha = Clamp8(DstPixel.col.alpha * (255 - Alpha) / 255 + SrcPixel.col.alpha); + *Dst++ = DstPixel.ul; + } + Dst = (PULONG)((ULONG_PTR)Dst + DstDelta); + SrcY++; + } + + return TRUE; } /* EOF */

1 0

[sginsberg] 40464: - Remove the "ROS-HACK" for gdi32 bitmap font tests -- this doesn't crash the system anymore
by sginsberg＠svn.reactos.org 11 Apr '09

11 Apr '09

Author: sginsberg Date: Sat Apr 11 22:54:22 2009 New Revision: 40464 URL: http://svn.reactos.org/svn/reactos?rev=40464&view=rev Log: - Remove the "ROS-HACK" for gdi32 bitmap font tests -- this doesn't crash the system anymore Modified: trunk/rostests/winetests/gdi32/font.c Modified: trunk/rostests/winetests/gdi32/font.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/font.c?re… ============================================================================== --- trunk/rostests/winetests/gdi32/font.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/font.c [iso-8859-1] Sat Apr 11 22:54:22 2009 @@ -284,9 +284,6 @@ TEXTMETRICA tm_orig; SIZE size_orig; INT ret, i, width_orig, height_orig, scale, lfWidth; - - skip("ROS-HACK: Skipping bitmap font tests!\n"); - return; hdc = GetDC(0);

1 0

[gedmurphy] 40463: remove downloader from rosapps
by gedmurphy＠svn.reactos.org 11 Apr '09

11 Apr '09

Author: gedmurphy Date: Sat Apr 11 20:58:21 2009 New Revision: 40463 URL: http://svn.reactos.org/svn/reactos?rev=40463&view=rev Log: remove downloader from rosapps Removed: trunk/rosapps/applications/downloader/

1 0

[gedmurphy] 40462: Remove the old rosapps entries
by gedmurphy＠svn.reactos.org 11 Apr '09

11 Apr '09

Author: gedmurphy Date: Sat Apr 11 20:56:22 2009 New Revision: 40462 URL: http://svn.reactos.org/svn/reactos?rev=40462&view=rev Log: Remove the old rosapps entries 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 [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sat Apr 11 20:56:22 2009 @@ -655,8 +655,6 @@ modules\rosapps\applications\devutils\gdihv\gdihv.exe 1 optional modules\rosapps\applications\devutils\genguid\genguid.exe 1 optional modules\rosapps\applications\sysutils\gettype\gettype.exe 1 optional -modules\rosapps\applications\downloader\downloader.exe 1 optional -modules\rosapps\applications\downloader\downloader.xml 1 optional modules\rosapps\applications\net\ncftp\ncftp.exe 1 optional modules\rosapps\applications\net\netreg\netreg.exe 1 optional modules\rosapps\applications\net\niclist\niclist.exe 1 optional

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
48
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 April 2009