Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mjmartin] 51006: [syssetup] - EnableUserModePnpManager: StartServiceW can fail due to the service already running. Check last error for such a case. Should fix bug #5846.
by mjmartin＠svn.reactos.org 10 Mar '11

10 Mar '11

Author: mjmartin Date: Thu Mar 10 10:36:49 2011 New Revision: 51006 URL: http://svn.reactos.org/svn/reactos?rev=51006&view=rev Log: [syssetup] - EnableUserModePnpManager: StartServiceW can fail due to the service already running. Check last error for such a case. Should fix bug #5846. Modified: trunk/reactos/dll/win32/syssetup/install.c Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Thu Mar 10 10:36:49 2011 @@ -506,7 +506,7 @@ } ret = StartServiceW(hService, 0, NULL); - if (!ret) + if ((!ret) && (GetLastError() != ERROR_SERVICE_ALREADY_RUNNING)) { DPRINT1("Unable to start service\n"); goto cleanup;

1 0

[tkreuzer] 51005: [WIN32K] - Fix calculation of dest rect in IntSetDIBits - Rewrite NtGdiStretchDIBitsInternal. It now calls NtGdiSetDIBitsToDeviceInternal in case of SRCCOPY and no stretching and ...
by tkreuzer＠svn.reactos.org 09 Mar '11

09 Mar '11

Author: tkreuzer Date: Wed Mar 9 15:46:13 2011 New Revision: 51005 URL: http://svn.reactos.org/svn/reactos?rev=51005&view=rev Log: [WIN32K] - Fix calculation of dest rect in IntSetDIBits - Rewrite NtGdiStretchDIBitsInternal. It now calls NtGdiSetDIBitsToDeviceInternal in case of SRCCOPY and no stretching and NtGdiCreateDIBitmapInternal + IntEngStretchBlt in the default case. This fixes RLE compressed dibs. - The code isn't yet perfect, Windows behaviour is pretty complex, especially in regard to topdown/bottomup DIBs and the whole code needs to be rewritten. It will cause one more failed bitmap test, but another one that was formerly only passing with legacy 9x behaviour now behaves correctly. See issue #5886 for more details. Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c 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] Wed Mar 9 15:46:13 2011 @@ -286,8 +286,7 @@ goto cleanup; } - rcDst.top = bmi->bmiHeader.biHeight < 0 ? - abs(bmi->bmiHeader.biHeight) - (ScanLines + StartScan) : StartScan; + rcDst.top = StartScan; rcDst.left = 0; rcDst.bottom = rcDst.top + ScanLines; rcDst.right = psurfDst->SurfObj.sizlBitmap.cx; @@ -296,7 +295,7 @@ ptSrc.y = 0; /* 1bpp bitmaps have 0 for white, 1 for black */ - EXLATEOBJ_vInitialize(&exlo, psurfSrc->ppal, psurfDst->ppal, 0xFFFFFF, 0, 0); + EXLATEOBJ_vInitialize(&exlo, psurfSrc->ppal, psurfDst->ppal, 0xFFFFFF, 0xFFFFFF, 0); result = IntEngCopyBits(&psurfDst->SurfObj, &psurfSrc->SurfObj, @@ -1030,133 +1029,158 @@ return ScanLines; } - +#define ROP_TO_ROP4(Rop) ((Rop) >> 16) + +W32KAPI INT APIENTRY NtGdiStretchDIBitsInternal( - HDC hDC, - INT XDest, - INT YDest, - INT DestWidth, - INT DestHeight, - INT XSrc, - INT YSrc, - INT SrcWidth, - INT SrcHeight, - LPBYTE Bits, - LPBITMAPINFO BitsInfo, - DWORD Usage, - DWORD ROP, - UINT cjMaxInfo, - UINT cjMaxBits, - HANDLE hcmXform) -{ + IN HDC hdc, + IN INT xDst, + IN INT yDst, + IN INT cxDst, + IN INT cyDst, + IN INT xSrc, + IN INT ySrc, + IN INT cxSrc, + IN INT cySrc, + IN OPTIONAL LPBYTE pjInit, + IN LPBITMAPINFO pbmi, + IN DWORD dwUsage, + IN DWORD dwRop, // ms ntgdi.h says dwRop4(?) + IN UINT cjMaxInfo, + IN UINT cjMaxBits, + IN HANDLE hcmXform) +{ + BOOL bResult = FALSE; + SIZEL sizel; + RECTL rcSrc, rcDst; PDC pdc; - INT ret = 0; - LONG height; - LONG width; - WORD planes, bpp; - DWORD compr, size; - HBITMAP hBitmap; - HBITMAP hOldBitmap; - HDC hdcMem; - PVOID pvBits; - PBYTE safeBits; - - if (!Bits || !BitsInfo) - return 0; - - safeBits = ExAllocatePoolWithTag(PagedPool, cjMaxBits, TAG_DIB); - if(!safeBits) - { - EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); - return 0; - } - - _SEH2_TRY - { - ProbeForRead(BitsInfo, cjMaxInfo, 1); - ProbeForRead(Bits, cjMaxBits, 1); - if (DIB_GetBitmapInfo(&BitsInfo->bmiHeader, &width, &height, &planes, &bpp, &compr, &size) == -1) - { - DPRINT1("Invalid bitmap\n"); - _SEH2_YIELD(goto cleanup;) - } - RtlCopyMemory(safeBits, Bits, cjMaxBits); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - DPRINT1("Error, failed to read the DIB bits\n"); - _SEH2_YIELD(goto cleanup;) - } - _SEH2_END - - if (width < 0) - { - DPRINT1("Bitmap has a negative width\n"); - return 0; - } - - hBitmap = NtGdiGetDCObject(hDC, OBJ_BITMAP); - - if (!(pdc = DC_LockDc(hDC))) - { - ExFreePoolWithTag(safeBits, TAG_DIB); + HBITMAP hbmTmp; + PSURFACE psurfTmp, psurfDst; + EXLATEOBJ exlo; + + if (!(pdc = DC_LockDc(hdc))) + { EngSetLastError(ERROR_INVALID_HANDLE); return 0; } - if (XDest == 0 && YDest == 0 && XSrc == 0 && XSrc == 0 && - DestWidth == SrcWidth && DestHeight == SrcHeight && - compr == BI_RGB && - ROP == SRCCOPY) - { - BITMAP bmp; - ret = IntGdiGetObject(hBitmap, sizeof(bmp), &bmp) == sizeof(bmp); - if (ret && - bmp.bmBitsPixel == bpp && - bmp.bmWidth == SrcWidth && - bmp.bmHeight == SrcHeight && - bmp.bmPlanes == planes) - { - /* fast path */ - ret = IntSetDIBits(pdc, hBitmap, 0, height, safeBits, BitsInfo, Usage); - DC_UnlockDc(pdc); - goto cleanup; - } - } - - /* slow path - need to use StretchBlt */ - - hBitmap = DIB_CreateDIBSection(pdc, BitsInfo, Usage, &pvBits, NULL, 0, 0); + /* Transform dest size */ + sizel.cx = cxDst; + sizel.cy = cyDst; + IntLPtoDP(pdc, (POINTL*)&sizel, 1); DC_UnlockDc(pdc); - if(!hBitmap) - { - DPRINT1("Error, failed to create a DIB section\n"); + /* Check if we can use NtGdiSetDIBitsToDeviceInternal */ + if (sizel.cx == cxSrc && sizel.cy == cySrc && dwRop == SRCCOPY) + { + /* Yes, we can! */ + return NtGdiSetDIBitsToDeviceInternal(hdc, + xDst, + yDst, + cxDst, + cyDst, + xSrc, + ySrc, + 0, + cySrc, + pjInit, + pbmi, + dwUsage, + cjMaxBits, + cjMaxInfo, + TRUE, + hcmXform); + } + + /* Create an intermediate bitmap from the DIB */ + hbmTmp = NtGdiCreateDIBitmapInternal(hdc, + cxSrc, + cySrc, + CBM_INIT, + pjInit, + pbmi, + dwUsage, + cjMaxInfo, + cjMaxBits, + 0, + hcmXform); + if (!hbmTmp) + { + DPRINT1("NtGdiCreateDIBitmapInternal failed\n"); + return 0; + } + + /* FIXME: locking twice is cheesy, coord tranlation in UM will fix it */ + if (!(pdc = DC_LockDc(hdc))) + { + DPRINT1("Could not lock dc\n"); + EngSetLastError(ERROR_INVALID_HANDLE); + GreDeleteObject(hbmTmp); + return 0; + } + + psurfTmp = SURFACE_ShareLockSurface(hbmTmp); + if (!psurfTmp) + { + DPRINT1("Could not lock bitmap :-(\n"); goto cleanup; } - hdcMem = NtGdiCreateCompatibleDC(hDC); - - RtlCopyMemory(pvBits, safeBits, cjMaxBits); - hOldBitmap = NtGdiSelectBitmap(hdcMem, hBitmap); - - /* Origin for DIBitmap may be bottom left (positive biHeight) or top - left (negative biHeight) */ - ret = NtGdiStretchBlt(hDC, XDest, YDest, DestWidth, DestHeight, - hdcMem, XSrc, abs(height) - SrcHeight - YSrc, - SrcWidth, SrcHeight, ROP, 0); - - if(ret) - ret = SrcHeight; - NtGdiSelectBitmap(hdcMem, hOldBitmap); - NtGdiDeleteObjectApp(hdcMem); - GreDeleteObject(hBitmap); - + psurfDst = pdc->dclevel.pSurface; + if (!psurfDst) + { + // CHECKME + bResult = TRUE; + goto cleanup; + } + + /* Calculate source and destination rect */ + rcSrc.left = xSrc; + rcSrc.top = ySrc; + rcSrc.right = xSrc + abs(cxSrc); + rcSrc.bottom = ySrc + abs(cySrc); + rcDst.left = xDst; + rcDst.top = yDst; + rcDst.right = rcDst.left + cxDst; + rcDst.bottom = rcDst.top + cyDst; + IntLPtoDP(pdc, (POINTL*)&rcDst, 2); + RECTL_vOffsetRect(&rcDst, pdc->ptlDCOrig.x, pdc->ptlDCOrig.y); + + /* Initialize XLATEOBJ */ + EXLATEOBJ_vInitialize(&exlo, + psurfTmp->ppal, + psurfDst->ppal, + RGB(0xff, 0xff, 0xff), + pdc->pdcattr->crBackgroundClr, + pdc->pdcattr->crForegroundClr); + + /* Prepare DC for blit */ + DC_vPrepareDCsForBlit(pdc, rcDst, NULL, rcSrc); + + /* Perform the stretch operation */ + bResult = IntEngStretchBlt(&psurfDst->SurfObj, + &psurfTmp->SurfObj, + NULL, + pdc->rosdc.CombinedClip, + &exlo.xlo, + &rcDst, + &rcSrc, + NULL, + &pdc->eboFill.BrushObject, + NULL, + ROP_TO_ROP4(dwRop)); + + /* Cleanup */ + DC_vFinishBlit(pdc, NULL); + EXLATEOBJ_vCleanup(&exlo); cleanup: - ExFreePoolWithTag(safeBits, TAG_DIB); - return ret; + if (psurfTmp) SURFACE_ShareUnlockSurface(psurfTmp); + if (hbmTmp) GreDeleteObject(hbmTmp); + if (pdc) DC_UnlockDc(pdc); + + return bResult; } @@ -1556,7 +1580,7 @@ bm.bmWidthBytes, BitmapFormat(bi->biBitCount * bi->biPlanes, bi->biCompression), BMF_DONTCACHE | BMF_USERMEM | BMF_NOZEROINIT | - (bi->biHeight < 0 ? BMF_TOPDOWN : 0), + ((bi->biHeight < 0) ? BMF_TOPDOWN : 0), bi->biSizeImage, bm.bmBits, 0);

1 0

[tkreuzer] 51004: [win32csr] Fix zero termination of harderror string parameters, when they are ansi. See issue #5983 for more details.
by tkreuzer＠svn.reactos.org 09 Mar '11

09 Mar '11

Author: tkreuzer Date: Wed Mar 9 15:31:25 2011 New Revision: 51004 URL: http://svn.reactos.org/svn/reactos?rev=51004&view=rev Log: [win32csr] Fix zero termination of harderror string parameters, when they are ansi. See issue #5983 for more details. Modified: trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c [iso-8859-1] Wed Mar 9 15:31:25 2011 @@ -118,7 +118,7 @@ ULONG nParam, UnicodeStringParameterMask, Size = 0; NTSTATUS Status; UNICODE_STRING TempStringU; - PWSTR ParamString; + CHAR *ParamString; UnicodeStringParameterMask = HardErrorMessage->UnicodeStringParameterMask; @@ -166,7 +166,8 @@ } /* Zero terminate the string */ - ParamString[TempStringU.Length / sizeof(WCHAR)] = 0; + ParamString[TempStringU.Length] = 0; + ParamString[TempStringU.Length + 1] = 0; DPRINT("ParamString=\'%S\'\n", ParamString); Parameters[nParam] = (ULONG_PTR)ParamString;

1 0

[tkreuzer] 51003: [CRT] Patch by Thomas Faber: Fix nt version of mbstowcs. See issue #5983 for more details.
by tkreuzer＠svn.reactos.org 09 Mar '11

09 Mar '11

Author: tkreuzer Date: Wed Mar 9 15:29:13 2011 New Revision: 51003 URL: http://svn.reactos.org/svn/reactos?rev=51003&view=rev Log: [CRT] Patch by Thomas Faber: Fix nt version of mbstowcs. See issue #5983 for more details. Modified: trunk/reactos/lib/sdk/crt/string/mbstowcs_nt.c Modified: trunk/reactos/lib/sdk/crt/string/mbstowcs_nt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/mbstowc… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/mbstowcs_nt.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/mbstowcs_nt.c [iso-8859-1] Wed Mar 9 15:29:13 2011 @@ -4,26 +4,35 @@ #include <ndk/rtlfuncs.h> #include <string.h> +WCHAR NTAPI RtlAnsiCharToUnicodeChar(IN OUT PUCHAR *AnsiChar); +#undef MB_CUR_MAX +#define MB_CUR_MAX 2 + /* * @implemented */ int mbtowc (wchar_t *wchar, const char *mbchar, size_t count) { - NTSTATUS Status; - ULONG Size; + UCHAR mbarr[MB_CUR_MAX] = { 0 }; + PUCHAR mbs = mbarr; + WCHAR wc; + + if (mbchar == NULL) + return 0; if (wchar == NULL) return 0; - Status = RtlMultiByteToUnicodeN (wchar, - sizeof(WCHAR), - &Size, - mbchar, - count); - if (!NT_SUCCESS(Status)) + memcpy(mbarr, mbchar, min(count, sizeof mbarr)); + + wc = RtlAnsiCharToUnicodeChar(&mbs); + + if (wc == L' ' && mbarr[0] != ' ') return -1; - return (int)Size; + *wchar = wc; + + return mbs - mbarr; } /*

1 0

[pschweitzer] 51002: [NTOSKRNL] Implemented FstubFixupEfiPartition(): Purpose is to let ReactOS handle realistic partitions length in case of an EFI/GPT protective MBR. Indeed, when formatting a di...
by pschweitzer＠svn.reactos.org 09 Mar '11

09 Mar '11

Author: pschweitzer Date: Wed Mar 9 10:33:13 2011 New Revision: 51002 URL: http://svn.reactos.org/svn/reactos?rev=51002&view=rev Log: [NTOSKRNL] Implemented FstubFixupEfiPartition(): Purpose is to let ReactOS handle realistic partitions length in case of an EFI/GPT protective MBR. Indeed, when formatting a disk to GPT, you add a protective MBR that contains a fake partition entry, with type 0xEE having the following property: its size is set to maximum allocatable size in MBR. In that case, if disk is small, you may go beyond disk size. This is why a fix to partition length may be needed when re-reading partition entry. This is the way ReactOS creates protective MBR. You may find some more information here: http://msdn.microsoft.com/en-us/windows/hardware/gg463525 Fixed xHalIoReadPartitionTable(): - Allocate a buffer that has the proper size (instead of allocating a buffer which is too big). Especially since this leads to partial init only some lines after. - Remove redundant & useless affectation. - Check/fix 0xEE partition length in case of an EFI/GPT protective MBR (see upper point). Modified: trunk/reactos/ntoskrnl/fstub/disksup.c Modified: trunk/reactos/ntoskrnl/fstub/disksup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/disksup.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fstub/disksup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fstub/disksup.c [iso-8859-1] Wed Mar 9 10:33:13 2011 @@ -23,6 +23,8 @@ #define AUTO_DRIVE MAXULONG #define PARTITION_MAGIC 0xaa55 + +#define EFI_PMBR_OSTYPE_EFI 0xEE #include <pshpack1.h> @@ -1355,6 +1357,24 @@ ASSERT(PartitionDescriptor->PartitionType == 0x55); } } + } +} + +VOID +NTAPI +FstubFixupEfiPartition(IN PPARTITION_DESCRIPTOR PartitionDescriptor, + IN ULONGLONG MaxOffset) +{ + ULONG PartitionLength; + PAGED_CODE(); + + /* Compute partition length (according to MBR entry) */ + PartitionLength = PartitionDescriptor->StartingSectorLsb0 + PartitionDescriptor->PartitionLengthLsb0; + /* In case the partition length goes beyond disk size... */ + if (PartitionLength > MaxOffset) + { + /* Resize partition to its maximum real length */ + PartitionDescriptor->PartitionLengthLsb0 = MaxOffset - PartitionDescriptor->StartingSectorLsb0; } } @@ -1425,7 +1445,7 @@ MaxOffset, MaxSector); /* Allocate our buffer */ - Buffer = ExAllocatePoolWithTag(NonPagedPool, PAGE_SIZE, TAG_FILE_SYSTEM); + Buffer = ExAllocatePoolWithTag(NonPagedPool, InputSize, TAG_FILE_SYSTEM); if (!Buffer) { /* Fail, free the input buffer */ @@ -1503,9 +1523,6 @@ PartitionDescriptor = (PPARTITION_DESCRIPTOR) &(((PUSHORT)Buffer)[PARTITION_TABLE_OFFSET]); - /* Get the partition type */ - PartitionType = PartitionDescriptor->PartitionType; - /* Start looping partitions */ j++; DPRINT("FSTUB: Partition Table %d:\n", j); @@ -1523,6 +1540,14 @@ DPRINT("\tOffset %#08lx for %#08lx Sectors\n", GET_STARTING_SECTOR(PartitionDescriptor), GET_PARTITION_LENGTH(PartitionDescriptor)); + + /* Check whether we're facing a protective MBR */ + if (PartitionType == EFI_PMBR_OSTYPE_EFI) + { + /* Partition length might be bigger than disk size */ + FstubFixupEfiPartition(PartitionDescriptor, + MaxOffset); + } /* Make sure that the partition is valid, unless it's the first */ if (!(HalpIsValidPartitionEntry(PartitionDescriptor,

1 0

[spetreolle] 51001: [ROSTESTS] Properly skip bitmap and outline tests in gdi32_winetest:font.
by spetreolle＠svn.reactos.org 08 Mar '11

08 Mar '11

Author: spetreolle Date: Tue Mar 8 11:30:14 2011 New Revision: 51001 URL: http://svn.reactos.org/svn/reactos?rev=51001&view=rev Log: [ROSTESTS] Properly skip bitmap and outline tests in gdi32_winetest:font. 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] Tue Mar 8 11:30:14 2011 @@ -313,9 +313,12 @@ SIZE size_orig; INT ret, i, width_orig, height_orig, scale, lfWidth; - skip("ROS-HACK: Skipping bitmap font tests!\n"); - return; - + if(!winetest_interactive) + { + skip("reactos bug 5401: Skipping bitmap font tests!\n"); + return; + } + hdc = GetDC(0); /* "System" has only 1 pixel size defined, otherwise the test breaks */ @@ -409,6 +412,12 @@ MAT2 mat2 = { {0x8000,0}, {0,0}, {0,0}, {0x8000,0} }; POINT pt; INT ret; + + if(!winetest_interactive) + { + skip("reactos bug 5401: Skipping outline font tests!\n"); + return; + } if (!is_truetype_font_installed("Arial")) {

1 0

[tkreuzer] 51000: [WIN32K] Fix a warning about an uninitialized variable :D
by tkreuzer＠svn.reactos.org 07 Mar '11

07 Mar '11

Author: tkreuzer Date: Mon Mar 7 22:14:14 2011 New Revision: 51000 URL: http://svn.reactos.org/svn/reactos?rev=51000&view=rev Log: [WIN32K] Fix a warning about an uninitialized variable :D Modified: trunk/reactos/subsystems/win32/win32k/objects/dclife.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] Mon Mar 7 22:14:14 2011 @@ -511,7 +511,8 @@ { pdcFirst = pdc1 ; prcFirst = &rc1; - pdcSecond = NULL ; + pdcSecond = NULL; + prcSecond = NULL; } if(pdcFirst && pdcFirst->dctype == DCTYPE_DIRECT)

1 0

[tkreuzer] 50999: [WIN32K] Fix IntCreateCompatibleBitmap, previously when the given DC was a memory DC with a dibsection selected, the function would only work if the dibsection was <= 8 bpp.
by tkreuzer＠svn.reactos.org 07 Mar '11

07 Mar '11

Author: tkreuzer Date: Mon Mar 7 22:06:23 2011 New Revision: 50999 URL: http://svn.reactos.org/svn/reactos?rev=50999&view=rev Log: [WIN32K] Fix IntCreateCompatibleBitmap, previously when the given DC was a memory DC with a dibsection selected, the function would only work if the dibsection was <= 8 bpp. Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.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] Mon Mar 7 22:06:23 2011 @@ -233,116 +233,111 @@ /* MS doc says if width or height is 0, return 1-by-1 pixel, monochrome bitmap */ if (0 == Width || 0 == Height) { - Bmp = NtGdiGetStockObject(DEFAULT_BITMAP); + return NtGdiGetStockObject(DEFAULT_BITMAP); + } + + if (Dc->dctype != DC_TYPE_MEMORY) + { + PSURFACE psurf; + + Bmp = GreCreateBitmap(abs(Width), + abs(Height), + 1, + Dc->ppdev->gdiinfo.cBitsPixel, + NULL); + psurf = SURFACE_ShareLockSurface(Bmp); + ASSERT(psurf); + /* Set palette */ + psurf->ppal = PALETTE_ShareLockPalette(Dc->ppdev->devinfo.hpalDefault); + /* Set flags */ + psurf->flags = API_BITMAP; + psurf->hdc = NULL; // Fixme + SURFACE_ShareUnlockSurface(psurf); } else { - if (Dc->dctype != DC_TYPE_MEMORY) - { - PSURFACE psurf; + DIBSECTION dibs; + INT Count; + PSURFACE psurf = Dc->dclevel.pSurface; + Count = BITMAP_GetObject(psurf, sizeof(dibs), &dibs); + + if (Count == sizeof(BITMAP)) + { + PSURFACE psurfBmp; Bmp = GreCreateBitmap(abs(Width), - abs(Height), - 1, - Dc->ppdev->gdiinfo.cBitsPixel, - NULL); - psurf = SURFACE_LockSurface(Bmp); - ASSERT(psurf); - /* Set palette */ - psurf->ppal = PALETTE_ShareLockPalette(Dc->ppdev->devinfo.hpalDefault); + abs(Height), + 1, + dibs.dsBm.bmBitsPixel, + NULL); + psurfBmp = SURFACE_LockSurface(Bmp); + ASSERT(psurfBmp); + /* Assign palette */ + psurfBmp->ppal = psurf->ppal; + GDIOBJ_IncrementShareCount((POBJ)psurf->ppal); /* Set flags */ - psurf->flags = API_BITMAP; - psurf->hdc = NULL; // Fixme - SURFACE_UnlockSurface(psurf); - } - else - { - DIBSECTION dibs; - INT Count; - PSURFACE psurf = Dc->dclevel.pSurface; - Count = BITMAP_GetObject(psurf, sizeof(dibs), &dibs); - - if (Count) + psurfBmp->flags = API_BITMAP; + psurfBmp->hdc = NULL; // Fixme + SURFACE_UnlockSurface(psurfBmp); + } + else if (Count == sizeof(DIBSECTION)) + { + /* A DIB section is selected in the DC */ + BYTE buf[sizeof(BITMAPINFOHEADER) + 256*sizeof(RGBQUAD)] = {0}; + PVOID Bits; + BITMAPINFO* bi = (BITMAPINFO*)buf; + + bi->bmiHeader.biSize = sizeof(bi->bmiHeader); + bi->bmiHeader.biWidth = Width; + bi->bmiHeader.biHeight = Height; + bi->bmiHeader.biPlanes = dibs.dsBmih.biPlanes; + bi->bmiHeader.biBitCount = dibs.dsBmih.biBitCount; + bi->bmiHeader.biCompression = dibs.dsBmih.biCompression; + bi->bmiHeader.biSizeImage = 0; + bi->bmiHeader.biXPelsPerMeter = dibs.dsBmih.biXPelsPerMeter; + bi->bmiHeader.biYPelsPerMeter = dibs.dsBmih.biYPelsPerMeter; + bi->bmiHeader.biClrUsed = dibs.dsBmih.biClrUsed; + bi->bmiHeader.biClrImportant = dibs.dsBmih.biClrImportant; + + if (bi->bmiHeader.biCompression == BI_BITFIELDS) { - if (Count == sizeof(BITMAP)) + /* Copy the color masks */ + RtlCopyMemory(bi->bmiColors, dibs.dsBitfields, 3*sizeof(RGBQUAD)); + } + else if (bi->bmiHeader.biBitCount <= 8) + { + /* Copy the color table */ + UINT Index; + PPALETTE PalGDI; + + if (!psurf->ppal) { - PSURFACE psurfBmp; - - Bmp = GreCreateBitmap(abs(Width), - abs(Height), - 1, - dibs.dsBm.bmBitsPixel, - NULL); - psurfBmp = SURFACE_LockSurface(Bmp); - ASSERT(psurfBmp); - /* Assign palette */ - psurfBmp->ppal = psurf->ppal; - GDIOBJ_IncrementShareCount((POBJ)psurf->ppal); - /* Set flags */ - psurfBmp->flags = API_BITMAP; - psurfBmp->hdc = NULL; // Fixme - SURFACE_UnlockSurface(psurfBmp); + EngSetLastError(ERROR_INVALID_HANDLE); + return 0; } - else + + PalGDI = PALETTE_LockPalette(psurf->ppal->BaseObject.hHmgr); + + for (Index = 0; + Index < 256 && Index < PalGDI->NumColors; + Index++) { - /* A DIB section is selected in the DC */ - BYTE buf[sizeof(BITMAPINFOHEADER) + 256*sizeof(RGBQUAD)] = {0}; - PVOID Bits; - BITMAPINFO* bi = (BITMAPINFO*)buf; - - bi->bmiHeader.biSize = sizeof(bi->bmiHeader); - bi->bmiHeader.biWidth = Width; - bi->bmiHeader.biHeight = Height; - bi->bmiHeader.biPlanes = dibs.dsBmih.biPlanes; - bi->bmiHeader.biBitCount = dibs.dsBmih.biBitCount; - bi->bmiHeader.biCompression = dibs.dsBmih.biCompression; - bi->bmiHeader.biSizeImage = 0; - bi->bmiHeader.biXPelsPerMeter = dibs.dsBmih.biXPelsPerMeter; - bi->bmiHeader.biYPelsPerMeter = dibs.dsBmih.biYPelsPerMeter; - bi->bmiHeader.biClrUsed = dibs.dsBmih.biClrUsed; - bi->bmiHeader.biClrImportant = dibs.dsBmih.biClrImportant; - - if (bi->bmiHeader.biCompression == BI_BITFIELDS) - { - /* Copy the color masks */ - RtlCopyMemory(bi->bmiColors, dibs.dsBitfields, 3*sizeof(RGBQUAD)); - } - else if (bi->bmiHeader.biBitCount <= 8) - { - /* Copy the color table */ - UINT Index; - PPALETTE PalGDI; - - if (!psurf->ppal) - { - EngSetLastError(ERROR_INVALID_HANDLE); - return 0; - } - - PalGDI = PALETTE_LockPalette(psurf->ppal->BaseObject.hHmgr); - - for (Index = 0; - Index < 256 && Index < PalGDI->NumColors; - Index++) - { - bi->bmiColors[Index].rgbRed = PalGDI->IndexedColors[Index].peRed; - bi->bmiColors[Index].rgbGreen = PalGDI->IndexedColors[Index].peGreen; - bi->bmiColors[Index].rgbBlue = PalGDI->IndexedColors[Index].peBlue; - bi->bmiColors[Index].rgbReserved = 0; - } - PALETTE_UnlockPalette(PalGDI); - - Bmp = DIB_CreateDIBSection(Dc, - bi, - DIB_RGB_COLORS, - &Bits, - NULL, - 0, - 0); - return Bmp; - } + bi->bmiColors[Index].rgbRed = PalGDI->IndexedColors[Index].peRed; + bi->bmiColors[Index].rgbGreen = PalGDI->IndexedColors[Index].peGreen; + bi->bmiColors[Index].rgbBlue = PalGDI->IndexedColors[Index].peBlue; + bi->bmiColors[Index].rgbReserved = 0; } + PALETTE_UnlockPalette(PalGDI); } + + Bmp = DIB_CreateDIBSection(Dc, + bi, + DIB_RGB_COLORS, + &Bits, + NULL, + 0, + 0); + return Bmp; } } return Bmp;

1 0

[tkreuzer] 50998: [WIN32K] clip the destination rect against the bounds of the destination and source surface. Fixes a crash of gdi32_winetest bitmap that occurs as soon as IntCreateCompatibleBitma...
by tkreuzer＠svn.reactos.org 07 Mar '11

07 Mar '11

Author: tkreuzer Date: Mon Mar 7 22:00:19 2011 New Revision: 50998 URL: http://svn.reactos.org/svn/reactos?rev=50998&view=rev Log: [WIN32K] clip the destination rect against the bounds of the destination and source surface. Fixes a crash of gdi32_winetest bitmap that occurs as soon as IntCreateCompatibleBitmap is fixed. Other Eng* code needs to be checked as well. Modified: trunk/reactos/subsystems/win32/win32k/eng/copybits.c Modified: trunk/reactos/subsystems/win32/win32k/eng/copybits.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/copybits.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/copybits.c [iso-8859-1] Mon Mar 7 22:00:19 2011 @@ -49,12 +49,28 @@ BLTINFO BltInfo; SURFACE *psurfDest; SURFACE *psurfSource; + RECTL rclDest = *DestRect; + POINTL ptlSrc = *SourcePoint; ASSERT(psoDest != NULL && psoSource != NULL && DestRect != NULL && SourcePoint != NULL); psurfSource = CONTAINING_RECORD(psoSource, SURFACE, SurfObj); psurfDest = CONTAINING_RECORD(psoDest, SURFACE, SurfObj); + /* Clip dest rect against source surface size / source point */ + if (psoSource->sizlBitmap.cx - ptlSrc.x < rclDest.right - rclDest.left) + rclDest.right = rclDest.left + psoSource->sizlBitmap.cx - ptlSrc.x; + if (psoSource->sizlBitmap.cy - ptlSrc.y < rclDest.bottom - rclDest.top) + rclDest.bottom = rclDest.top + psoSource->sizlBitmap.cy - ptlSrc.y; + + /* Clip dest rect against target surface size */ + if (rclDest.right > psoDest->sizlBitmap.cx) + rclDest.right = psoDest->sizlBitmap.cx; + if (rclDest.bottom > psoDest->sizlBitmap.cy) + rclDest.bottom = psoDest->sizlBitmap.cy; + if (RECTL_bIsEmptyRect(&rclDest)) return TRUE; + DestRect = &rclDest; + // FIXME: Don't punt to the driver's DrvCopyBits immediately. Instead, // mark the copy block function to be DrvCopyBits instead of the // GDI's copy bit function so as to remove clipping from the

1 0

[tkreuzer] 50997: [WIN32K] Update all brushes in DC_vPrepareDCsForBlit. This allows us to simplify the code elsewhere.
by tkreuzer＠svn.reactos.org 07 Mar '11

07 Mar '11

Author: tkreuzer Date: Mon Mar 7 21:55:17 2011 New Revision: 50997 URL: http://svn.reactos.org/svn/reactos?rev=50997&view=rev Log: [WIN32K] Update all brushes in DC_vPrepareDCsForBlit. This allows us to simplify the code elsewhere. Modified: trunk/reactos/subsystems/win32/win32k/objects/dclife.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] Mon Mar 7 21:55:17 2011 @@ -480,6 +480,15 @@ { PDC pdcFirst, pdcSecond; PRECT prcFirst, prcSecond; + + /* Update brushes */ + if (pdc1->pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY)) + DC_vUpdateFillBrush(pdc1); + if (pdc1->pdcattr->ulDirty_ & (DIRTY_LINE | DC_PEN_DIRTY)) + DC_vUpdateLineBrush(pdc1); + if(pdc1->pdcattr->ulDirty_ & DIRTY_TEXT) + DC_vUpdateTextBrush(pdc1); + /* Lock them in good order */ if(pdc2) {

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