Ros-diffs May 2012

ros-diffs@reactos.org

12 participants
227 discussions

[tkreuzer] 56521: [WIN32K] Fix regression of gdi32_winetest palette

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat May 5 22:50:47 2012 New Revision: 56521 URL: http://svn.reactos.org/svn/reactos?rev=56521&view=rev Log: [WIN32K] Fix regression of gdi32_winetest palette Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Sat May 5 22:50:47 2012 @@ -148,9 +148,12 @@ /* Loop all color indices in the DIB */ for (i = 0; i < cColors; i++) { - /* Get the RGB value from the DC palette, indexed by the DIB - color table value */ - crColor = PALETTE_ulGetRGBColorFromIndex(ppalDC, pwColors[i]); + /* Get the palette index and handle wraparound when exceeding + the number of colors in the DC palette */ + WORD wIndex = pwColors[i] % ppalDC->NumColors; + + /* USe the RGB value from the DC palette */ + crColor = PALETTE_ulGetRGBColorFromIndex(ppalDC, wIndex); PALETTE_vSetRGBColorForIndex(ppal, i, crColor); } }

12 years, 5 months

[tkreuzer] 56520: [WIN32K] Someone passes iUsage == 2, so don't assert in that case, but ignore it as long as it's not supported.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat May 5 22:06:15 2012 New Revision: 56520 URL: http://svn.reactos.org/svn/reactos?rev=56520&view=rev Log: [WIN32K] Someone passes iUsage == 2, so don't assert in that case, but ignore it as long as it's not supported. Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Sat May 5 22:06:15 2012 @@ -171,11 +171,11 @@ /* Mark the palette as a brush hack palette */ ppal->flFlags |= PAL_BRUSHHACK; } - else if (iUsage == 2) - { +// else if (iUsage == 2) +// { // FIXME: this one is undocumented - ASSERT(FALSE); - } +// ASSERT(FALSE); +// } else // if (iUsage == DIB_RGB_COLORS) { /* The colors are an array of RGBQUAD values */

12 years, 5 months

[tkreuzer] 56519: fix build

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat May 5 21:43:39 2012 New Revision: 56519 URL: http://svn.reactos.org/svn/reactos?rev=56519&view=rev Log: fix build Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Sat May 5 21:43:39 2012 @@ -1140,7 +1140,6 @@ PDC pdc; HBITMAP hbmTmp = 0; PSURFACE psurfTmp = 0, psurfDst = 0; - HPALETTE hpalDIB = 0; PPALETTE ppalDIB = 0; EXLATEOBJ exlo; PVOID pvBits;

12 years, 5 months

[tkreuzer] 56518: [WIN32K] Implement CreateDIBPalette(), replacing BuildDIBPalette. It creates a palette without a handle and handles DIB_PAL_COLORS as well as DIB_RGB_COLORS. Additionally it now h...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat May 5 21:39:35 2012 New Revision: 56518 URL: http://svn.reactos.org/svn/reactos?rev=56518&view=rev Log: [WIN32K] Implement CreateDIBPalette(), replacing BuildDIBPalette. It creates a palette without a handle and handles DIB_PAL_COLORS as well as DIB_RGB_COLORS. Additionally it now handles DIB_PAL_BRUSHHACK, which is used for DIB brushes, when DIB_PAL_COLORS is passed to CreateDIBPatternBrush(). The palette is not created directly, but instead the indices into the DC palette are put into the palette and the real palette is created, when the brush is realized. The latter is not yet handled. Modified: trunk/reactos/win32ss/gdi/ntgdi/brush.h trunk/reactos/win32ss/gdi/ntgdi/dib.h trunk/reactos/win32ss/gdi/ntgdi/dibobj.c trunk/reactos/win32ss/gdi/ntgdi/palette.c trunk/reactos/win32ss/gdi/ntgdi/palette.h Modified: trunk/reactos/win32ss/gdi/ntgdi/brush.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/brush.h?… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/brush.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/brush.h [iso-8859-1] Sat May 5 21:39:35 2012 @@ -56,8 +56,8 @@ // DWORD dwUnknown30; SURFACE * psurfTrg; struct _PALETTE * ppalSurf; -// PALETTE * ppalDC; -// PALETTE * ppal3; + struct _PALETTE * ppalDC; + struct _PALETTE * ppalDIB; // DWORD dwUnknown44; BRUSH * pbrush; FLONG flattrs; Modified: trunk/reactos/win32ss/gdi/ntgdi/dib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dib.h?re… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dib.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dib.h [iso-8859-1] Sat May 5 21:39:35 2012 @@ -9,3 +9,5 @@ HPALETTE FASTCALL BuildDIBPalette (CONST BITMAPINFO *bmi); BITMAPINFO* FASTCALL DIB_ConvertBitmapInfo(CONST BITMAPINFO* bmi, DWORD Usage); VOID FASTCALL DIB_FreeConvertedBitmapInfo(BITMAPINFO* converted, BITMAPINFO* orig); + +#define DIB_PAL_BRUSHHACK 3 Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Sat May 5 21:39:35 2012 @@ -103,6 +103,157 @@ { 0xff, 0xff, 0xff } }; +PPALETTE +NTAPI +CreateDIBPalette( + _In_ const BITMAPINFO *pbmi, + _In_ PDC pdc, + _In_ ULONG iUsage) +{ + PPALETTE ppal; + ULONG i, cColors; + + /* Check if the colors are indexed */ + if (pbmi->bmiHeader.biBitCount <= 8) + { + /* We create a "full" palette */ + cColors = 1 << pbmi->bmiHeader.biBitCount; + + /* Allocate the palette */ + ppal = PALETTE_AllocPalette(PAL_INDEXED, + cColors, + NULL, + 0, + 0, + 0); + + /* Check if the BITMAPINFO specifies how many colors to use */ + if (pbmi->bmiHeader.biClrUsed != 0) + { + /* This is how many colors we can actually process */ + cColors = min(cColors, pbmi->bmiHeader.biClrUsed); + } + + /* Check how to use the colors */ + if (iUsage == DIB_PAL_COLORS) + { + COLORREF crColor; + + /* The colors are an array of WORD indices into the DC palette */ + PWORD pwColors = (PWORD)((PCHAR)pbmi + pbmi->bmiHeader.biSize); + + /* Use the DCs palette or, if no DC is given, the default one */ + PPALETTE ppalDC = pdc ? pdc->dclevel.ppal : gppalDefault; + + /* Loop all color indices in the DIB */ + for (i = 0; i < cColors; i++) + { + /* Get the RGB value from the DC palette, indexed by the DIB + color table value */ + crColor = PALETTE_ulGetRGBColorFromIndex(ppalDC, pwColors[i]); + PALETTE_vSetRGBColorForIndex(ppal, i, crColor); + } + } + else if (iUsage == DIB_PAL_BRUSHHACK) + { + /* The colors are an array of WORD indices into the DC palette */ + PWORD pwColors = (PWORD)((PCHAR)pbmi + pbmi->bmiHeader.biSize); + + /* Loop all color indices in the DIB */ + for (i = 0; i < cColors; i++) + { + /* Set the index directly as the RGB color, the real palette + containing RGB values will be calculated when the brush is + realized */ + PALETTE_vSetRGBColorForIndex(ppal, i, pwColors[i]); + } + + /* Mark the palette as a brush hack palette */ + ppal->flFlags |= PAL_BRUSHHACK; + } + else if (iUsage == 2) + { + // FIXME: this one is undocumented + ASSERT(FALSE); + } + else // if (iUsage == DIB_RGB_COLORS) + { + /* The colors are an array of RGBQUAD values */ + RGBQUAD *prgb = (RGBQUAD*)((PCHAR)pbmi + pbmi->bmiHeader.biSize); + + // FIXME: do we need to handle PALETTEINDEX / PALETTERGB macro? + + /* Loop all color indices in the DIB */ + for (i = 0; i < cColors; i++) + { + /* Get the color value and translate it to a COLORREF */ + RGBQUAD rgb = prgb[i]; + COLORREF crColor = RGB(rgb.rgbRed, rgb.rgbGreen, rgb.rgbBlue); + + /* Set the RGB value in the palette */ + PALETTE_vSetRGBColorForIndex(ppal, i, crColor); + } + } + } + else + { + /* This is a bitfield / RGB palette */ + ULONG flRedMask, flGreenMask, flBlueMask; + + /* Check if the DIB contains bitfield values */ + if (pbmi->bmiHeader.biCompression == BI_BITFIELDS) + { + /* Check if we have a v4/v5 header */ + if (pbmi->bmiHeader.biSize >= sizeof(BITMAPV4HEADER)) + { + /* The masks are dedicated fields in the header */ + PBITMAPV4HEADER pbmV4Header = (PBITMAPV4HEADER)&pbmi->bmiHeader; + flRedMask = pbmV4Header->bV4RedMask; + flGreenMask = pbmV4Header->bV4GreenMask; + flBlueMask = pbmV4Header->bV4BlueMask; + } + else + { + /* The masks are the first 3 values in the DIB color table */ + PDWORD pdwColors = (PVOID)((PCHAR)pbmi + pbmi->bmiHeader.biSize); + flRedMask = pdwColors[0]; + flGreenMask = pdwColors[1]; + flBlueMask = pdwColors[2]; + } + } + else + { + /* Check what bit depth we have. Note: optimization flags are + calculated in PALETTE_AllocPalette() */ + if (pbmi->bmiHeader.biBitCount == 16) + { + /* This is an RGB 555 palette */ + flRedMask = 0x7C00; + flGreenMask = 0x03E0; + flBlueMask = 0x001F; + } + else + { + /* This is an RGB 888 palette */ + flRedMask = 0xFF0000; + flGreenMask = 0x00FF00; + flBlueMask = 0x0000FF; + } + } + + /* Allocate the bitfield palette */ + ppal = PALETTE_AllocPalette(PAL_BITFIELDS, + 0, + NULL, + flRedMask, + flGreenMask, + flBlueMask); + } + + /* We're done, return the palette */ + return ppal; +} + UINT APIENTRY @@ -251,7 +402,6 @@ RECT rcDst; POINTL ptSrc; EXLATEOBJ exlo; - HPALETTE hpalDIB = 0; PPALETTE ppalDIB = 0; SourceBitmap = GreCreateBitmapEx(bmi->bmiHeader.biWidth, @@ -280,18 +430,10 @@ } /* Create a palette for the DIB */ - hpalDIB = BuildDIBPalette(bmi); - if (!hpalDIB) + ppalDIB = CreateDIBPalette(bmi, DC, ColorUse); + if (!ppalDIB) { EngSetLastError(ERROR_NO_SYSTEM_RESOURCES); - goto cleanup; - } - - /* Lock the DIB palette */ - ppalDIB = PALETTE_ShareLockPalette(hpalDIB); - if (!ppalDIB) - { - EngSetLastError(ERROR_INVALID_HANDLE); goto cleanup; } @@ -323,7 +465,6 @@ cleanup: if (ppalDIB) PALETTE_ShareUnlockPalette(ppalDIB); - if (hpalDIB) GreDeleteObject(hpalDIB); if(psurfSrc) SURFACE_ShareUnlockSurface(psurfSrc); if(psurfDst) SURFACE_ShareUnlockSurface(psurfDst); GreDeleteObject(SourceBitmap); @@ -364,7 +505,6 @@ SIZEL SourceSize; EXLATEOBJ exlo; PPALETTE ppalDIB = NULL; - HPALETTE hpalDIB = NULL; LPBITMAPINFO pbmiSafe; if (!Bits) return 0; @@ -455,20 +595,11 @@ ASSERT(pSurf->ppal); /* Create a palette for the DIB */ - hpalDIB = BuildDIBPalette(bmi); - if (!hpalDIB) + ppalDIB = CreateDIBPalette(bmi, pDC, ColorUse); + if (!ppalDIB) { EngSetLastError(ERROR_NO_SYSTEM_RESOURCES); Status = STATUS_NO_MEMORY; - goto Exit; - } - - /* Lock the DIB palette */ - ppalDIB = PALETTE_ShareLockPalette(hpalDIB); - if (!ppalDIB) - { - EngSetLastError(ERROR_INVALID_HANDLE); - Status = STATUS_UNSUCCESSFUL; goto Exit; } @@ -509,7 +640,6 @@ if (pSourceSurf) EngUnlockSurface(pSourceSurf); if (hSourceBitmap) EngDeleteSurface((HSURF)hSourceBitmap); - if (hpalDIB) GreDeleteObject(hpalDIB); DC_UnlockDc(pDC); Exit2: ExFreePool(pbmiSafe); @@ -1118,15 +1248,7 @@ } /* Create a palette for the DIB */ - hpalDIB = BuildDIBPalette(pbmi); - if (!hpalDIB) - { - bResult = FALSE; - goto cleanup; - } - - /* Lock the DIB palette */ - ppalDIB = PALETTE_ShareLockPalette(hpalDIB); + ppalDIB = CreateDIBPalette(pbmi, pdc, dwUsage); if (!ppalDIB) { bResult = FALSE; @@ -1162,7 +1284,6 @@ EXLATEOBJ_vCleanup(&exlo); cleanup: if (ppalDIB) PALETTE_ShareUnlockPalette(ppalDIB); - if (hpalDIB) GreDeleteObject(hpalDIB); if (psurfTmp) SURFACE_ShareUnlockSurface(psurfTmp); if (hbmTmp) GreDeleteObject(hbmTmp); if (pdc) DC_UnlockDc(pdc); @@ -1439,7 +1560,7 @@ HBITMAP res = 0; SURFACE *bmp = NULL; void *mapBits = NULL; - HPALETTE hpal ; + PPALETTE ppalDIB; // Fill BITMAP32 structure with DIB data CONST BITMAPINFOHEADER *bi = &bmi->bmiHeader; @@ -1534,33 +1655,6 @@ // hSecure = MmSecureVirtualMemory(bm.bmBits, totalSize, PAGE_READWRITE); hSecure = (HANDLE)0x1; // HACK OF UNIMPLEMENTED KERNEL STUFF !!!! - if (usage == DIB_PAL_COLORS) - { - if(dc) - { - PPALETTE ppalDc; - ppalDc = PALETTE_ShareLockPalette(dc->dclevel.hpal); - hpal = DIB_MapPaletteColors(ppalDc, bmi); - PALETTE_ShareUnlockPalette(ppalDc); - } - else - { - /* For DIB Brushes */ - DPRINT1("FIXME: Unsupported DIB_PAL_COLORS without a DC to map colors.\n"); - /* HACK */ - hpal = (HPALETTE) 0xFFFFFFFF; - } - } - else - { - hpal = BuildDIBPalette(bmi); - } - - if(!hpal) - { - DPRINT1("Error: Could not create a palette for the DIB.\n"); - goto cleanup; - } // Create Device Dependent Bitmap and add DIB pointer //Size.cx = bm.bmWidth; @@ -1598,19 +1692,12 @@ bmp->flags = API_BITMAP; bmp->biClrImportant = bi->biClrImportant; - /* HACK */ - if(hpal != (HPALETTE)0xFFFFFFFF) - { - PPALETTE ppal = PALETTE_ShareLockPalette(hpal); - - if (ppal) - { - if (bmp->ppal) PALETTE_ShareUnlockPalette(bmp->ppal); - bmp->ppal = ppal; - } - - /* Lazy delete hpal, it will be freed at surface release */ - GreDeleteObject(hpal); + /* Create a palette for the DIB */ + ppalDIB = CreateDIBPalette(bmi, dc, usage); + if (ppalDIB) + { + if (bmp->ppal) PALETTE_ShareUnlockPalette(bmp->ppal); + bmp->ppal = ppalDIB; } // Clean up in case of errors @@ -1774,112 +1861,6 @@ return hpal; } -HPALETTE -FASTCALL -BuildDIBPalette(CONST BITMAPINFO *bmi) -{ - WORD bits; - ULONG ColorCount; - HPALETTE hpal; - PPALETTE ppal; - ULONG RedMask = 0, GreenMask = 0, BlueMask = 0; - PDWORD pdwColors = (PDWORD)((PBYTE)bmi + bmi->bmiHeader.biSize); - ULONG paletteType, i; - - // Determine Bits Per Pixel - bits = bmi->bmiHeader.biBitCount; - - // Determine paletteType from Bits Per Pixel - if (bits <= 8) - { - paletteType = PAL_INDEXED; - RedMask = GreenMask = BlueMask = 0; - } - else if (bmi->bmiHeader.biCompression == BI_BITFIELDS) - { - paletteType = PAL_BITFIELDS; - if (bmi->bmiHeader.biSize >= sizeof(BITMAPV4HEADER)) - { - PBITMAPV4HEADER pV4Header = (PBITMAPV4HEADER)&bmi->bmiHeader; - RedMask = pV4Header->bV4RedMask; - GreenMask = pV4Header->bV4GreenMask; - BlueMask = pV4Header->bV4BlueMask; - } - else - { - RedMask = pdwColors[0]; - GreenMask = pdwColors[1]; - BlueMask = pdwColors[2]; - } - } - else - { - paletteType = PAL_BITFIELDS; - switch (bits) - { - case 16: - paletteType |= PAL_RGB16_555; - RedMask = 0x7C00; - GreenMask = 0x03E0; - BlueMask = 0x001F; - break; - - case 24: - case 32: - paletteType |= PAL_BGR; - RedMask = 0xFF0000; - GreenMask = 0x00FF00; - BlueMask = 0x0000FF; - break; - } - } - - if (bmi->bmiHeader.biClrUsed == 0) - { - ColorCount = 1 << bmi->bmiHeader.biBitCount; - } - else - { - ColorCount = bmi->bmiHeader.biClrUsed; - } - - if (paletteType == PAL_INDEXED) - { - RGBQUAD* pColors = (RGBQUAD*)((PBYTE)bmi + bmi->bmiHeader.biSize); - - /* Allocate a palette */ - ppal = PALETTE_AllocPalWithHandle(PAL_INDEXED, - ColorCount, - NULL, - 0, 0, 0); - if (!ppal) return NULL; - - /* Copy all colors */ - for (i = 0; i < ColorCount; i++) - { - ppal->IndexedColors[i].peRed = pColors[i].rgbRed; - ppal->IndexedColors[i].peGreen = pColors[i].rgbGreen; - ppal->IndexedColors[i].peBlue = pColors[i].rgbBlue; - ppal->IndexedColors[i].peFlags = 0; - } - - /* Get palette handle and unlock the palette */ - hpal = ppal->BaseObject.hHmgr; - PALETTE_UnlockPalette(ppal); - } - else - { - ppal = PALETTE_AllocPalWithHandle(paletteType, 0, - NULL, - RedMask, GreenMask, BlueMask); - - hpal = ppal->BaseObject.hHmgr; - PALETTE_UnlockPalette(ppal); - } - - return hpal; -} - /* Converts a BITMAPCOREINFO to a BITMAPINFO structure, * or does nothing if it's already a BITMAPINFO (or V4 or V5) */ BITMAPINFO* Modified: trunk/reactos/win32ss/gdi/ntgdi/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/palette.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/palette.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/palette.c [iso-8859-1] Sat May 5 21:39:35 2012 @@ -151,7 +151,7 @@ PALETTE_AllocPalette( _In_ ULONG iMode, _In_ ULONG cColors, - _In_ PULONG pulColors, + _In_opt_ PULONG pulColors, _In_ FLONG flRed, _In_ FLONG flGreen, _In_ FLONG flBlue) Modified: trunk/reactos/win32ss/gdi/ntgdi/palette.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/palette.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/palette.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/palette.h [iso-8859-1] Sat May 5 21:39:35 2012 @@ -62,7 +62,7 @@ PALETTE_AllocPalette( _In_ ULONG iMode, _In_ ULONG cColors, - _In_ PULONG pulColors, + _In_opt_ PULONG pulColors, _In_ FLONG flRed, _In_ FLONG flGreen, _In_ FLONG flBlue); @@ -140,6 +140,16 @@ ppal->IndexedColors[ulIndex].peBlue); } +FORCEINLINE +VOID +PALETTE_vSetRGBColorForIndex(PPALETTE ppal, ULONG ulIndex, COLORREF crColor) +{ + if (ulIndex >= ppal->NumColors) return; + ppal->IndexedColors[ulIndex].peRed = GetRValue(crColor); + ppal->IndexedColors[ulIndex].peGreen = GetGValue(crColor); + ppal->IndexedColors[ulIndex].peBlue = GetBValue(crColor); +} + HPALETTE NTAPI GreCreatePaletteInternal(

12 years, 5 months

[tkreuzer] 56517: [WIN32K] When dereferencing an object without a handle, don't check for the ready-to-die flag

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat May 5 21:09:08 2012 New Revision: 56517 URL: http://svn.reactos.org/svn/reactos?rev=56517&view=rev Log: [WIN32K] When dereferencing an object without a handle, don't check for the ready-to-die flag Modified: trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c Modified: trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] Sat May 5 21:09:08 2012 @@ -479,6 +479,8 @@ /* Must not be exclusively locked */ ASSERT(pobj->cExclusiveLock == 0); + DBG_LOGEVENT(&pobj->slhLog, EVENT_DEREFERENCE, cRefs); + /* Check if the object has a handle */ if (GDI_HANDLE_GET_INDEX(pobj->hHmgr)) { @@ -492,6 +494,9 @@ /* Check if we reached 0 and handle bit is not set */ if (cRefs == 0) { + /* Make sure it's ok to delete the object */ + ASSERT(pobj->BaseFlags & BASEFLAG_READY_TO_DIE); + /* Check if the handle was process owned */ if (gpentHmgr[ulIndex].ObjectOwner.ulObj != GDI_OBJ_HMGR_PUBLIC && gpentHmgr[ulIndex].ObjectOwner.ulObj != GDI_OBJ_HMGR_NONE) @@ -504,6 +509,9 @@ /* Push entry to the free list */ ENTRY_vPushFreeEntry(&gpentHmgr[ulIndex]); + + /* Free the object */ + GDIOBJ_vFreeObject(pobj); } } else @@ -511,18 +519,13 @@ /* Decrement the objects reference count */ ASSERT(pobj->ulShareCount > 0); cRefs = InterlockedDecrement((LONG*)&pobj->ulShareCount); - } - - DBG_LOGEVENT(&pobj->slhLog, EVENT_DEREFERENCE, cRefs); - - /* Check if we reached 0 */ - if (cRefs == 0) - { - /* Make sure it's ok to delete the object */ - ASSERT(pobj->BaseFlags & BASEFLAG_READY_TO_DIE); - - /* Free the object */ - GDIOBJ_vFreeObject(pobj); + + /* Check if we reached 0 */ + if (cRefs == 0) + { + /* Free the object */ + GDIOBJ_vFreeObject(pobj); + } } }

12 years, 5 months

[sir_richard] 56516: [NTOS]: Cleanup MiQueryAddressState.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Sat May 5 19:37:34 2012 New Revision: 56516 URL: http://svn.reactos.org/svn/reactos?rev=56516&view=rev Log: [NTOS]: Cleanup MiQueryAddressState. Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Sat May 5 19:37:34 2012 @@ -1308,7 +1308,7 @@ PMMPDE PointerPde; MMPTE TempPte; BOOLEAN DemandZeroPte = TRUE, ValidPte = FALSE; - ULONG State = MEM_RESERVE, Protect = 0, LockChange; + ULONG State = MEM_RESERVE, Protect = 0; ASSERT((Vad->StartingVpn <= ((ULONG_PTR)Va >> PAGE_SHIFT)) && (Vad->EndingVpn >= ((ULONG_PTR)Va >> PAGE_SHIFT))); @@ -1322,31 +1322,23 @@ /* Return the next range */ *NextVa = (PVOID)((ULONG_PTR)Va + PAGE_SIZE); - /* Loop to make sure the PDE is valid */ - do - { - /* Try again */ - LockChange = 0; - - /* Is the PDE empty? */ - if (!PointerPde->u.Long) - { - /* No address in this range used yet, move to the next PDE range */ - *NextVa = MiPdeToAddress(PointerPde + 1); - break; - } - - /* The PDE is not empty, but is it faulted in? */ - if (!PointerPde->u.Hard.Valid) - { - /* It isn't, go ahead and do the fault */ - LockChange = MiMakeSystemAddressValid(MiPdeToPte(PointerPde), - TargetProcess); - } - - /* Check if the PDE was faulted in, making the PTE readable */ - if (!LockChange) ValidPte = TRUE; - } while (LockChange); + /* Is the PDE demand-zero? */ + if (PointerPde->u.Long != 0) + { + /* It is not. Is it valid? */ + if (PointerPde->u.Hard.Valid == 0) + { + /* Is isn't, fault it in */ + PointerPte = MiPteToAddress(PointerPde); + MiMakeSystemAddressValid(PointerPte, TargetProcess); + ValidPte = TRUE; + } + } + else + { + /* It is, skip it and move to the next PDE */ + *NextVa = MiPdeToAddress(PointerPde + 1); + } /* Is it safe to try reading the PTE? */ if (ValidPte) @@ -1355,36 +1347,52 @@ /* Capture the PTE */ TempPte = *PointerPte; - if (TempPte.u.Long) + if (TempPte.u.Long != 0) { /* The PTE is valid, so it's not zeroed out */ DemandZeroPte = FALSE; - /* Check if it's valid or has a valid protection mask */ - ASSERT(TempPte.u.Soft.Prototype == 0); - if ((TempPte.u.Soft.Protection != MM_DECOMMIT) || - (TempPte.u.Hard.Valid == 1)) - { - /* This means it's committed */ - State = MEM_COMMIT; - - /* Get protection state of this page */ - Protect = MiGetPageProtection(PointerPte); - } - else + /* Is it a decommited, invalid, or faulted PTE? */ + if ((TempPte.u.Soft.Protection == MM_DECOMMIT) && + (TempPte.u.Hard.Valid == 0) && + ((TempPte.u.Soft.Prototype == 0) || + (TempPte.u.Soft.PageFileHigh == MI_PTE_LOOKUP_NEEDED))) { /* Otherwise our defaults should hold */ ASSERT(Protect == 0); ASSERT(State == MEM_RESERVE); } + else + { + /* This means it's committed */ + State = MEM_COMMIT; + + /* Get protection state of this page */ + Protect = MiGetPageProtection(PointerPte); + + /* Check if this is an image-backed VAD */ + if ((TempPte.u.Soft.Valid == 0) && + (TempPte.u.Soft.Prototype == 1) && + (Vad->u.VadFlags.PrivateMemory == 0) && + (Vad->ControlArea)) + { + DPRINT1("Not supported\n"); + ASSERT(FALSE); + } + } } } /* Check if this was a demand-zero PTE, since we need to find the state */ if (DemandZeroPte) { - /* Check if the VAD is for committed memory */ - if (Vad->u.VadFlags.MemCommit) + /* Check if this is private commited memory, or an image-backed VAD */ + if ((Vad->u.VadFlags.PrivateMemory == 0) && (Vad->ControlArea)) + { + DPRINT1("Not supported\n"); + ASSERT(FALSE); + } + else if (Vad->u.VadFlags.MemCommit) { /* This is committed memory */ State = MEM_COMMIT;

12 years, 5 months

[sir_richard] 56515: [NTOS]: Attempt to hackfix MiGetPageProtection to support the case seen in OllyDBG. [NTOS]: Implement Case C of NtFreeVirtualMemory, which is sometimes seen in some heap logs. ...

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Sat May 5 19:26:21 2012 New Revision: 56515 URL: http://svn.reactos.org/svn/reactos?rev=56515&view=rev Log: [NTOS]: Attempt to hackfix MiGetPageProtection to support the case seen in OllyDBG. [NTOS]: Implement Case C of NtFreeVirtualMemory, which is sometimes seen in some heap logs. The hard part is figuring out the right amount of committed/decommitted pages. Only supports 2-level paging for now as the algorithm is already messy enough. Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Sat May 5 19:26:21 2012 @@ -27,6 +27,168 @@ OUT PULONG OldAccessProtection OPTIONAL); /* PRIVATE FUNCTIONS **********************************************************/ + +ULONG +NTAPI +MiCalculatePageCommitment(IN ULONG_PTR StartingAddress, + IN ULONG_PTR EndingAddress, + IN PMMVAD Vad, + IN PEPROCESS Process) +{ + PMMPTE PointerPte, LastPte, PointerPde; + ULONG CommittedPages; + + /* Compute starting and ending PTE and PDE addresses */ + PointerPde = MiAddressToPde(StartingAddress); + PointerPte = MiAddressToPte(StartingAddress); + LastPte = MiAddressToPte(EndingAddress); + + /* Handle commited pages first */ + if (Vad->u.VadFlags.MemCommit == 1) + { + /* This is a committed VAD, so Assume the whole range is committed */ + CommittedPages = BYTES_TO_PAGES(EndingAddress - StartingAddress); + + /* Is the PDE demand-zero? */ + PointerPde = MiAddressToPte(PointerPte); + if (PointerPde->u.Long != 0) + { + /* It is not. Is it valid? */ + if (PointerPde->u.Hard.Valid == 0) + { + /* Fault it in */ + PointerPte = MiPteToAddress(PointerPde); + MiMakeSystemAddressValid(PointerPte, Process); + } + } + else + { + /* It is, skip it and move to the next PDE, unless we're done */ + PointerPde++; + PointerPte = MiPteToAddress(PointerPde); + if (PointerPte > LastPte) return CommittedPages; + } + + /* Now loop all the PTEs in the range */ + while (PointerPte <= LastPte) + { + /* Have we crossed a PDE boundary? */ + if (MiIsPteOnPdeBoundary(PointerPte)) + { + /* Is this PDE demand zero? */ + PointerPde = MiAddressToPte(PointerPte); + if (PointerPde->u.Long != 0) + { + /* It isn't -- is it valid? */ + if (PointerPde->u.Hard.Valid == 0) + { + /* Nope, fault it in */ + PointerPte = MiPteToAddress(PointerPde); + MiMakeSystemAddressValid(PointerPte, Process); + } + } + else + { + /* It is, skip it and move to the next PDE */ + PointerPde++; + PointerPte = MiPteToAddress(PointerPde); + continue; + } + } + + /* Is this PTE demand zero? */ + if (PointerPte->u.Long != 0) + { + /* It isn't -- is it a decommited, invalid, or faulted PTE? */ + if ((PointerPte->u.Soft.Protection == MM_DECOMMIT) && + (PointerPte->u.Hard.Valid == 0) && + ((PointerPte->u.Soft.Prototype == 0) || + (PointerPte->u.Soft.PageFileHigh == MI_PTE_LOOKUP_NEEDED))) + { + /* It is, so remove it from the count of commited pages */ + CommittedPages--; + } + } + + /* Move to the next PTE */ + PointerPte++; + } + + /* Return how many committed pages there still are */ + return CommittedPages; + } + + /* This is a non-commited VAD, so assume none of it is committed */ + CommittedPages = 0; + + /* Is the PDE demand-zero? */ + PointerPde = MiAddressToPte(PointerPte); + if (PointerPde->u.Long != 0) + { + /* It isn't -- is it invalid? */ + if (PointerPde->u.Hard.Valid == 0) + { + /* It is, so page it in */ + PointerPte = MiPteToAddress(PointerPde); + MiMakeSystemAddressValid(PointerPte, Process); + } + } + else + { + /* It is, so skip it and move to the next PDE */ + PointerPde++; + PointerPte = MiPteToAddress(PointerPde); + if (PointerPte > LastPte) return CommittedPages; + } + + /* Loop all the PTEs in this PDE */ + while (PointerPte <= LastPte) + { + /* Have we crossed a PDE boundary? */ + if (MiIsPteOnPdeBoundary(PointerPte)) + { + /* Is this new PDE demand-zero? */ + PointerPde = MiAddressToPte(PointerPte); + if (PointerPde->u.Long != 0) + { + /* It isn't. Is it valid? */ + if (PointerPde->u.Hard.Valid == 0) + { + /* It isn't, so make it valid */ + PointerPte = MiPteToAddress(PointerPde); + MiMakeSystemAddressValid(PointerPte, Process); + } + } + else + { + /* It is, so skip it and move to the next one */ + PointerPde++; + PointerPte = MiPteToAddress(PointerPde); + continue; + } + } + + /* Is this PTE demand-zero? */ + if (PointerPte->u.Long != 0) + { + /* Nope. Is it a valid, non-decommited, non-paged out PTE? */ + if ((PointerPte->u.Soft.Protection != MM_DECOMMIT) || + (PointerPte->u.Hard.Valid == 1) || + ((PointerPte->u.Soft.Prototype == 1) && + (PointerPte->u.Soft.PageFileHigh != MI_PTE_LOOKUP_NEEDED))) + { + /* It is! So we'll treat this as a committed page */ + CommittedPages++; + } + } + + /* Move to the next PTE */ + PointerPte++; + } + + /* Return how many committed pages we found in this VAD */ + return CommittedPages; +} ULONG NTAPI @@ -1118,18 +1280,19 @@ /* If we get here, the PTE is valid, so look up the page in PFN database */ Pfn = MiGetPfnEntry(TempPte.u.Hard.PageFrameNumber); - if (!Pfn->u3.e1.PrototypePte) { /* Return protection of the original pte */ + ASSERT(Pfn->u4.AweAllocation == 0); return MmProtectToValue[Pfn->OriginalPte.u.Soft.Protection]; } - /* This is hardware PTE */ - UNIMPLEMENTED; - ASSERT(FALSE); - - return PAGE_NOACCESS; + /* This is software PTE */ + DPRINT1("Prototype PTE: %lx %p\n", TempPte.u.Hard.PageFrameNumber, Pfn); + DPRINT1("VA: %p\n", MiPteToAddress(&TempPte)); + DPRINT1("Mask: %lx\n", TempPte.u.Soft.Protection); + DPRINT1("Mask2: %lx\n", Pfn->OriginalPte.u.Soft.Protection); + return MmProtectToValue[TempPte.u.Soft.Protection]; } ULONG @@ -4049,11 +4212,13 @@ // and then change the ending address of the VAD to be a bit // smaller. // - // NOT YET IMPLEMENTED IN ARM3. - // - DPRINT1("Case C not handled\n"); - Status = STATUS_FREE_VM_NOT_AT_BASE; - goto FailPath; + MiLockWorkingSet(CurrentThread, AddressSpace); + CommitReduction = MiCalculatePageCommitment(StartingAddress, + EndingAddress, + Vad, + Process); + Vad->u.VadFlags.CommitCharge -= CommitReduction; + Vad->EndingVpn = ((ULONG_PTR)StartingAddress - 1) >> PAGE_SHIFT; } else {

12 years, 5 months

[tkreuzer] 56514: [WIN32K] Rename PALETTE_AllocPalette2 to PALETTE_AllocPalette, allocate PALETTE and color array in one allocation, improve code

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat May 5 17:29:34 2012 New Revision: 56514 URL: http://svn.reactos.org/svn/reactos?rev=56514&view=rev Log: [WIN32K] Rename PALETTE_AllocPalette2 to PALETTE_AllocPalette, allocate PALETTE and color array in one allocation, improve code Modified: trunk/reactos/win32ss/gdi/ntgdi/palette.c trunk/reactos/win32ss/gdi/ntgdi/palette.h Modified: trunk/reactos/win32ss/gdi/ntgdi/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/palette.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/palette.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/palette.c [iso-8859-1] Sat May 5 17:29:34 2012 @@ -145,62 +145,81 @@ lpPalE[i].peFlags = PC_SYS_USED | (lpPalE[i].peFlags & 0x07); } + PPALETTE NTAPI -PALETTE_AllocPalette2(ULONG Mode, - ULONG NumColors, - ULONG *Colors, - ULONG Red, - ULONG Green, - ULONG Blue) -{ - PPALETTE PalGDI; - - PalGDI = (PPALETTE)GDIOBJ_AllocateObject(GDIObjType_PAL_TYPE, - sizeof(PALETTE), - BASEFLAG_LOOKASIDE); - if (!PalGDI) - { - DPRINT1("Could not allocate a palette.\n"); +PALETTE_AllocPalette( + _In_ ULONG iMode, + _In_ ULONG cColors, + _In_ PULONG pulColors, + _In_ FLONG flRed, + _In_ FLONG flGreen, + _In_ FLONG flBlue) +{ + PPALETTE ppal; + ULONG fl = 0, cjSize = sizeof(PALETTE); + + /* Check if the palette has entries */ + if (iMode == PAL_INDEXED) + { + /* Check color count */ + if ((cColors == 0) || (cColors > 1024)) return NULL; + + /* Allocate enough space for the palete entries */ + cjSize += cColors * sizeof(PALETTEENTRY); + } + else + { + /* There are no palette entries */ + cColors = 0; + + /* We can use the lookaside list */ + fl |= BASEFLAG_LOOKASIDE; + } + + /* Allocate the object (without a handle!) */ + ppal = (PPALETTE)GDIOBJ_AllocateObject(GDIObjType_PAL_TYPE, cjSize, fl); + if (!ppal) + { return NULL; } - PalGDI->flFlags = Mode; - - if (NumColors > 0) - { - PalGDI->IndexedColors = ExAllocatePoolWithTag(PagedPool, - sizeof(PALETTEENTRY) * NumColors, - TAG_PALETTE); - if (NULL == PalGDI->IndexedColors) - { - GDIOBJ_vDeleteObject(&PalGDI->BaseObject); - return NULL; - } - if (Colors) RtlCopyMemory(PalGDI->IndexedColors, Colors, sizeof(PALETTEENTRY) * NumColors); - } - - if (Mode & PAL_INDEXED) - { - PalGDI->NumColors = NumColors; - } - else if (Mode & PAL_BITFIELDS) - { - PalGDI->RedMask = Red; - PalGDI->GreenMask = Green; - PalGDI->BlueMask = Blue; - - if (Red == 0x7c00 && Green == 0x3E0 && Blue == 0x1F) - PalGDI->flFlags |= PAL_RGB16_555; - else if (Red == 0xF800 && Green == 0x7E0 && Blue == 0x1F) - PalGDI->flFlags |= PAL_RGB16_565; - else if (Red == 0xFF0000 && Green == 0xFF00 && Blue == 0xFF) - PalGDI->flFlags |= PAL_BGR; - else if (Red == 0xFF && Green == 0xFF00 && Blue == 0xFF0000) - PalGDI->flFlags |= PAL_RGB; - } - - return PalGDI; + /* Set mode, color count and entry pointer */ + ppal->flFlags = iMode; + ppal->NumColors = cColors; + ppal->IndexedColors = ppal->apalColors; + + /* Check what kind of palette this is */ + if (iMode & PAL_INDEXED) + { + /* Check if we got a color array */ + if (pulColors) + { + /* Copy the entries */ + RtlCopyMemory(ppal->IndexedColors, + pulColors, + cColors * sizeof(ULONG)); + } + } + else if (iMode & PAL_BITFIELDS) + { + /* Copy the color masks */ + ppal->RedMask = flRed; + ppal->GreenMask = flGreen; + ppal->BlueMask = flBlue; + + /* Check what masks we have and set optimization flags */ + if ((flRed == 0x7c00) && (flGreen == 0x3E0) && (flBlue == 0x1F)) + ppal->flFlags |= PAL_RGB16_555; + else if ((flRed == 0xF800) && (flGreen == 0x7E0) && (flBlue == 0x1F)) + ppal->flFlags |= PAL_RGB16_565; + else if ((flRed == 0xFF0000) && (flGreen == 0xFF00) && (flBlue == 0xFF)) + ppal->flFlags |= PAL_BGR; + else if ((flRed == 0xFF) && (flGreen == 0xFF00) && (flBlue == 0xFF0000)) + ppal->flFlags |= PAL_RGB; + } + + return ppal; } PPALETTE @@ -216,7 +235,7 @@ PPALETTE ppal; /* Allocate the palette without a handle */ - ppal = PALETTE_AllocPalette2(iMode, cColors, pulColors, flRed, flGreen, flBlue); + ppal = PALETTE_AllocPalette(iMode, cColors, pulColors, flRed, flGreen, flBlue); if (!ppal) return NULL; /* Insert the palette into the handle table */ @@ -384,7 +403,7 @@ PPALETTE ppal; HPALETTE hpal; - ppal = PALETTE_AllocPalette2(iMode, cColors, pulColors, flRed, flGreen, flBlue); + ppal = PALETTE_AllocPalette(iMode, cColors, pulColors, flRed, flGreen, flBlue); if (!ppal) return NULL; hpal = GDIOBJ_hInsertObject(&ppal->BaseObject, GDI_OBJ_HMGR_PUBLIC); Modified: trunk/reactos/win32ss/gdi/ntgdi/palette.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/palette.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/palette.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/palette.h [iso-8859-1] Sat May 5 17:29:34 2012 @@ -59,7 +59,7 @@ PPALETTE NTAPI -PALETTE_AllocPalette2( +PALETTE_AllocPalette( _In_ ULONG iMode, _In_ ULONG cColors, _In_ PULONG pulColors, @@ -146,13 +146,3 @@ IN LPLOGPALETTE pLogPal, IN UINT cEntries); -//// - -HPALETTE -FASTCALL -PALETTE_AllocPalette(ULONG Mode, - ULONG NumColors, - ULONG *Colors, - ULONG Red, - ULONG Green, - ULONG Blue);

12 years, 5 months

[tfaber] 56513: [WINETESTS] - Do not multiply define WINVER and friends - Add missing _WIN32_WINNT define in rpcrt4_winetest. Already sent to Wine(TM)

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat May 5 16:54:37 2012 New Revision: 56513 URL: http://svn.reactos.org/svn/reactos?rev=56513&view=rev Log: [WINETESTS] - Do not multiply define WINVER and friends - Add missing _WIN32_WINNT define in rpcrt4_winetest. Already sent to Wine(TM) Modified: trunk/rostests/winetests/comctl32/CMakeLists.txt trunk/rostests/winetests/ntdll/CMakeLists.txt trunk/rostests/winetests/rpcrt4/CMakeLists.txt trunk/rostests/winetests/rpcrt4/ndr_marshall.c Modified: trunk/rostests/winetests/comctl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/CMakeL… ============================================================================== --- trunk/rostests/winetests/comctl32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/CMakeLists.txt [iso-8859-1] Sat May 5 16:54:37 2012 @@ -1,11 +1,7 @@ + +remove_definitions(-D_WIN32_WINNT=0x502 -D_WIN32_IE=0x600) add_definitions(-D__ROS_LONG64__) - -remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x600) - -remove_definitions(-D_WIN32_IE=0x600) -add_definitions(-D_WIN32_IE=0x500) list(APPEND SOURCE comboex.c @@ -42,8 +38,7 @@ else() # FIXME: http://www.cmake.org/Bug/view.php?id=12998 #add_target_compile_flags(comctl32_winetest "-Wno-format") - #allow_warnings(comctl32_winetest) - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-format -Wno-error") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-format") endif() set_module_type(comctl32_winetest win32cui) Modified: trunk/rostests/winetests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/CMakeList… ============================================================================== --- trunk/rostests/winetests/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/CMakeLists.txt [iso-8859-1] Sat May 5 16:54:37 2012 @@ -1,7 +1,7 @@ -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) +remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502) + +add_definitions(-D__ROS_LONG64__) list(APPEND SOURCE atom.c Modified: trunk/rostests/winetests/rpcrt4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/CMakeLis… ============================================================================== --- trunk/rostests/winetests/rpcrt4/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/CMakeLists.txt [iso-8859-1] Sat May 5 16:54:37 2012 @@ -1,10 +1,7 @@ remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x500) - -add_definitions( - -D__ROS_LONG64__) +add_definitions(-D__ROS_LONG64__) include_directories(${CMAKE_CURRENT_BINARY_DIR}) @@ -47,5 +44,4 @@ if(NOT MSVC) add_target_compile_flags(rpcrt4_winetest "-Wno-format") - allow_warnings(rpcrt4_winetest) endif() Modified: trunk/rostests/winetests/rpcrt4/ndr_marshall.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/ndr_mars… ============================================================================== --- trunk/rostests/winetests/rpcrt4/ndr_marshall.c [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/ndr_marshall.c [iso-8859-1] Sat May 5 16:54:37 2012 @@ -20,6 +20,7 @@ #include <stdarg.h> +#define _WIN32_WINNT 0x0500 #define NTDDI_WIN2K 0x05000000 #define NTDDI_VERSION NTDDI_WIN2K /* for some MIDL_STUB_MESSAGE fields */

12 years, 5 months

[tkreuzer] 56512: [GDI32_APITEST] - Try to fix some more test fails on win 2003

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat May 5 14:19:22 2012 New Revision: 56512 URL: http://svn.reactos.org/svn/reactos?rev=56512&view=rev Log: [GDI32_APITEST] - Try to fix some more test fails on win 2003 Modified: trunk/rostests/apitests/gdi32/DPtoLP.c trunk/rostests/apitests/gdi32/GetObject.c Modified: trunk/rostests/apitests/gdi32/DPtoLP.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/DPtoLP.c?r… ============================================================================== --- trunk/rostests/apitests/gdi32/DPtoLP.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/DPtoLP.c [iso-8859-1] Sat May 5 14:19:22 2012 @@ -11,7 +11,6 @@ void Test_DPtoLP_Params() { - BOOL ret; HDC hdc; POINT apt[2]; @@ -21,53 +20,43 @@ apt[1].y = 1000; SetLastError(ERROR_SUCCESS); - ret = DPtoLP(NULL, NULL, 0); - ok(ret == 1, "Expected ret == 1, got %d\n", ret); - ok(GetLastError() == ERROR_SUCCESS, "Exected ERROR_SUCCESS, got %ld\n", GetLastError()); + ok_int(DPtoLP(NULL, NULL, 0), 1); + ok_err(ERROR_SUCCESS); - ret = DPtoLP(NULL, NULL, -1); - ok(ret == 1, "Expected ret == 1, got %d\n", ret); - ok(GetLastError() == ERROR_SUCCESS, "Exected ERROR_SUCCESS, got %ld\n", GetLastError()); + ok_int(DPtoLP(NULL, NULL, -1), 1); + ok_err(ERROR_SUCCESS); - ret = DPtoLP(NULL, (PVOID)0x80000000, -1); - ok(ret == 1, "Expected ret == 1, got %d\n", ret); - ok(GetLastError() == ERROR_SUCCESS, "Exected ERROR_SUCCESS, got %ld\n", GetLastError()); + ok_int(DPtoLP(NULL, (PVOID)0x80000000, -1), 1); + ok_err(ERROR_SUCCESS); - ret = DPtoLP(NULL, NULL, 2); - ok(ret == 0, "Expected ret == 0, got %d\n", ret); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "Exected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); + ok_int(DPtoLP(NULL, NULL, 2), 0); + ok_err(ERROR_INVALID_PARAMETER); SetLastError(ERROR_SUCCESS); - ret = DPtoLP(NULL, apt, 2); - ok(ret == 0, "Expected ret == 0, got %d\n", ret); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "Exected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); + ok_int(DPtoLP(NULL, apt, 2), 0); + ok_err(ERROR_INVALID_PARAMETER); SetLastError(ERROR_SUCCESS); - ret = DPtoLP(NULL, apt, 0); - ok(ret == 1, "Expected ret == 1, got %d\n", ret); - ok(GetLastError() == ERROR_SUCCESS, "Exected ERROR_SUCCESS, got %ld\n", GetLastError()); + ok_int(DPtoLP(NULL, apt, 0), 1); + ok(GetLastError() == ERROR_SUCCESS, "Exected ERROR_SUCCESS, got %ld\n", GetLastError()); SetLastError(ERROR_SUCCESS); - ret = DPtoLP(NULL, apt, -2); - ok(ret == 1, "Expected ret == 1, got %d\n", ret); - ok(GetLastError() == ERROR_SUCCESS, "Exected ERROR_SUCCESS, got %ld\n", GetLastError()); + ok_int(DPtoLP(NULL, apt, -2), 1); + ok_err(ERROR_SUCCESS); SetLastError(ERROR_SUCCESS); - ret = DPtoLP((HDC)-4, apt, -2); - ok(ret == 1, "Expected ret == 1, got %d\n", ret); - ok(GetLastError() == ERROR_SUCCESS, "Exected ERROR_SUCCESS, got %ld\n", GetLastError()); + ok_int(DPtoLP((HDC)-4, apt, -2), 1); + ok_err(ERROR_SUCCESS); hdc = GetDC(0); SetLastError(ERROR_SUCCESS); - ret = DPtoLP(hdc, NULL, 2); - ok(ret == 1, "Expected ret == 1, got %d\n", ret); - ok(GetLastError() == ERROR_SUCCESS, "Exected ERROR_SUCCESS, got %ld\n", GetLastError()); + ok_int(DPtoLP(hdc, NULL, 2), 1); + ok_err(ERROR_SUCCESS); hdc = GetDC(0); SetLastError(ERROR_SUCCESS); - ret = DPtoLP(hdc, (PVOID)0x80000000, 2); - ok(ret == 1, "Expected ret == 1, got %d\n", ret); - ok(GetLastError() == ERROR_SUCCESS, "Exected ERROR_SUCCESS, got %ld\n", GetLastError()); + ok_int(DPtoLP(hdc, (PVOID)0x80000000, 2), 1); + ok_err(ERROR_SUCCESS); ReleaseDC(0, hdc); @@ -75,10 +64,10 @@ void Test_DPtoLP() { - BOOL ret; HDC hdc; POINT apt[2]; XFORM xform; + LONG lLogPixelsX, lLogPixelsY; apt[0].x = 1; apt[0].y = 1; @@ -86,23 +75,23 @@ apt[1].y = 1000; hdc = GetDC(0); + lLogPixelsX = GetDeviceCaps(hdc, LOGPIXELSX); + lLogPixelsY = GetDeviceCaps(hdc, LOGPIXELSY); SetMapMode(hdc, MM_TEXT); - ret = DPtoLP(hdc, apt, 2); - ok(ret == 1, "Expected ret == 1, got %d\n", ret); + ok_int(DPtoLP(hdc, apt, 2), 1); ok_int(apt[0].x, 1); ok_int(apt[0].y, 1); ok_int(apt[1].x, -1000); ok_int(apt[1].y, 1000); + apt[0].x = 100; apt[0].y = 256; apt[1].x = -1000; apt[1].y = 1000; SetMapMode(hdc, MM_LOMETRIC); - ret = DPtoLP(hdc, apt, 2); - ok(ret == 1, "Expected ret == 1, got %d\n", ret); - ok_int(apt[0].x, 4); - ok_int(apt[0].y, -4); - ok_int(apt[1].x, -3527); - ok_int(apt[1].y, -3527); - + ok_int(DPtoLP(hdc, apt, 2), 1); + ok_int(apt[0].x * lLogPixelsX, 33888 ); + ok_int(apt[0].y * lLogPixelsY, -86688 ); + ok_int(apt[1].x * lLogPixelsX, -338688 ); + ok_int(apt[1].y * lLogPixelsY, -338688 ); SetGraphicsMode(hdc, GM_ADVANCED); SetMapMode(hdc, MM_ANISOTROPIC); @@ -110,73 +99,61 @@ xform.eM12 = 0.; xform.eM21 = 0.; xform.eM22 = 1.; - xform.eDx = 4294967167.999999761; + xform.eDx = (FLOAT)4294967167.999999761; xform.eDy = 1.; - ret = SetWorldTransform(hdc, &xform); - ok(ret == 1, "ret\n"); + ok_int(SetWorldTransform(hdc, &xform), 1); - ret = DPtoLP(hdc, apt, 2); - ok(ret == 1, "Expected ret == 0, got %d\n", ret); - ok_int(apt[0].x, 526); - ok_int(apt[0].y, 13); - ok_int(apt[1].x, -11929); - ok_int(apt[1].y, 12440); + apt[0].x = 100; apt[0].y = 256; apt[1].x = -1000; apt[1].y = 1000; + ok_int(DPtoLP(hdc, apt, 2), 1); + ok_int(apt[0].x * lLogPixelsX, 58464 ); + ok_int(apt[0].y * lLogPixelsY, -86784 ); + ok_int(apt[1].x * lLogPixelsX, -314112 ); + ok_int(apt[1].y * lLogPixelsY, -338784 ); + apt[0].x = 100; apt[0].y = 256; apt[1].x = -1000; apt[1].y = 1000; xform.eM11 = 10000000.; - ret = SetWorldTransform(hdc, &xform); - ret = DPtoLP(hdc, apt, 2); - ok(ret == 1, "Expected ret == 0, got %d\n", ret); - ok_int(apt[0].x, -429); - ok_int(apt[0].y, -47); - ok_int(apt[1].x, -429); - ok_int(apt[1].y, -43881); + ok_int(SetWorldTransform(hdc, &xform), 1); + ok_int(DPtoLP(hdc, apt, 2), 1); + ok_int(apt[0].x * lLogPixelsX, -41184 ); + ok_int(apt[0].y * lLogPixelsY, -86784 ); + ok_int(apt[1].x * lLogPixelsX, -41184 ); + ok_int(apt[1].y * lLogPixelsY, -338784 ); + apt[0].x = 100; apt[0].y = 256; apt[1].x = -1000; apt[1].y = 1000; xform.eM11 = 1.; - xform.eDx = 4294967167.999999762; // this is too big - ret = SetWorldTransform(hdc, &xform); - ok(ret == 1, "ret\n"); - ret = DPtoLP(hdc, apt, 2); - ok(ret == 0, "Expected ret == 0, got %d\n", ret); - ok_int(apt[0].x, -429); - ok_int(apt[0].y, -47); - ok_int(apt[1].x, -429); - ok_int(apt[1].y, -43881); + xform.eDx = (FLOAT)4294967167.999999762; // this is too big + ok_int(SetWorldTransform(hdc, &xform), 1); + ok_int(DPtoLP(hdc, apt, 2), 0); + ok_int(apt[0].x, 100 ); + ok_int(apt[0].y, 256 ); + ok_int(apt[1].x, -1000 ); + ok_int(apt[1].y, 1000 ); xform.eM11 = 2.; - xform.eDx = 4294967167.999999762; - ret = SetWorldTransform(hdc, &xform); - ok(ret == 1, "ret\n"); - ret = DPtoLP(hdc, apt, 2); - ok(ret == 1, "Expected ret == 1, got %d\n", ret); - ok_int(apt[0].x, 2147482891); - ok_int(apt[0].y, 165); - ok_int(apt[1].x, 2147482891); - ok_int(apt[1].y, 154782); + xform.eDx = (FLOAT)4294967167.999999762; + ok_int(SetWorldTransform(hdc, &xform), 1); + ok_int(DPtoLP(hdc, apt, 2), 1); + ok_int(apt[0].x * lLogPixelsX, 16896 ); + ok_int(apt[0].y * lLogPixelsY, -86784 ); + ok_int(apt[1].x * lLogPixelsX, -169344 ); + ok_int(apt[1].y * lLogPixelsY, -338784 ); - apt[0].x = 1; - apt[0].y = 1; - apt[1].x = -1000; - apt[1].y = 1000; - + apt[0].x = 100; apt[0].y = 256; apt[1].x = -1000; apt[1].y = 1000; xform.eM11 = 10000000.; - ret = SetWorldTransform(hdc, &xform); - ok(ret == 1, "ret\n"); - ret = DPtoLP(hdc, apt, 2); - ok(ret == 1, "Expected ret == 1, got %d\n", ret); - ok_int(apt[0].x, -429); - ok_int(apt[0].y, -5); - ok_int(apt[1].x, -429); - ok_int(apt[1].y, -3528); + ok_int(SetWorldTransform(hdc, &xform), 1); + ok_int(DPtoLP(hdc, apt, 2), 1); + ok_int(apt[0].x * lLogPixelsX, -41184 ); + ok_int(apt[0].y * lLogPixelsY, -86784 ); + ok_int(apt[1].x * lLogPixelsX, -41184 ); + ok_int(apt[1].y * lLogPixelsY, -338784 ); xform.eM11 = 1000000.; - ret = SetWorldTransform(hdc, &xform); - ok(ret == 1, "ret\n"); - ret = DPtoLP(hdc, apt, 2); - ok(ret == 1, "Expected ret == 1, got %d\n", ret); - ok_int(apt[0].x, -4295); - ok_int(apt[0].y, 17); - ok_int(apt[1].x, -4295); - ok_int(apt[1].y, 12443); + ok_int(SetWorldTransform(hdc, &xform), 1); + ok_int(DPtoLP(hdc, apt, 2), 1); + ok_int(apt[0].x * lLogPixelsX, -412320 ); + ok_int(apt[0].y * lLogPixelsY, 306048 ); + ok_int(apt[1].x * lLogPixelsX, -412320 ); + ok_int(apt[1].y * lLogPixelsY, 1195104 ); ReleaseDC(0, hdc); } Modified: trunk/rostests/apitests/gdi32/GetObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetObject.… ============================================================================== --- trunk/rostests/apitests/gdi32/GetObject.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetObject.c [iso-8859-1] Sat May 5 14:19:22 2012 @@ -127,15 +127,15 @@ //ok(GetObject(hBrush, sizeof(LOGBRUSH), plogbrush) == 0, "\n"); // fails on win7 /* Test invalid buffer */ - SetLastError(ERROR_SUCCESS); + SetLastError(0xbadbad00); ok(GetObjectA(GetStockObject(WHITE_BRUSH), sizeof(LOGBRUSH), (PVOID)0xc0000000) == 0, "\n"); - ok(GetLastError() == ERROR_NOACCESS, "expected ERROR_NOACCESS, got %ld\n", GetLastError()); + ok((GetLastError() == 0xbadbad00) || (GetLastError() == ERROR_NOACCESS), "wrong error: %ld\n", GetLastError()); SetLastError(ERROR_SUCCESS); ok(GetObjectW(GetStockObject(BLACK_PEN), sizeof(LOGPEN), (PVOID)0xc0000000) == 0, "\n"); - ok(GetLastError() == ERROR_NOACCESS, "expected ERROR_NOACCESS, got %ld\n", GetLastError()); + ok((GetLastError() == 0xbadbad00) || (GetLastError() == ERROR_NOACCESS), "wrong error: %ld\n", GetLastError()); SetLastError(ERROR_SUCCESS); ok(GetObjectW(GetStockObject(21), sizeof(BITMAP), (PVOID)0xc0000000) == 0, "\n"); - ok(GetLastError() == ERROR_NOACCESS, "expected ERROR_NOACCESS, got %ld\n", GetLastError()); + ok((GetLastError() == 0xbadbad00) || (GetLastError() == ERROR_NOACCESS), "wrong error: %ld\n", GetLastError()); SetLastError(ERROR_SUCCESS); ok(GetObjectW(GetStockObject(SYSTEM_FONT), sizeof(LOGFONT), (PVOID)0xc0000000) == 0, "\n"); ok(GetLastError() == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %ld\n", GetLastError()); @@ -157,11 +157,11 @@ /* Test buffer size of 0 */ SetLastError(ERROR_SUCCESS); - ok(GetObjectA(GetStockObject(WHITE_BRUSH), 0, &TestStruct) == sizeof(LOGBRUSH), "\n"); + ok_long(GetObjectA(GetStockObject(WHITE_BRUSH), 0, &TestStruct), sizeof(LOGBRUSH)); ok(GetLastError() == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %ld\n", GetLastError()); SetLastError(ERROR_SUCCESS); ok(GetObjectA(GetStockObject(BLACK_PEN), 0, &TestStruct) == 0, "\n"); - ok(GetLastError() == ERROR_NOACCESS, "expected ERROR_NOACCESS, got %ld\n", GetLastError()); + ok((GetLastError() == 0xbadbad00) || (GetLastError() == ERROR_NOACCESS), "wrong error: %ld\n", GetLastError()); SetLastError(ERROR_SUCCESS); ok(GetObjectW(GetStockObject(SYSTEM_FONT), 0, &TestStruct) == 0, "\n"); ok(GetLastError() == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %ld\n", GetLastError()); @@ -458,7 +458,7 @@ ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %ld\n", GetLastError()); SetLastError(ERROR_SUCCESS); ok(GetObject(hPen, 0, &extlogpen) == 0, "\n"); - ok(GetLastError() == ERROR_NOACCESS, "got %ld\n", GetLastError()); + ok((GetLastError() == 0xbadbad00) || (GetLastError() == ERROR_NOACCESS), "wrong error: %ld\n", GetLastError()); SetLastError(ERROR_SUCCESS); ok(GetObject(hPen, 4, &extlogpen) == 0, "\n"); ok(GetLastError() == ERROR_SUCCESS, "got %ld\n", GetLastError()); @@ -627,19 +627,18 @@ SetLastError(ERROR_SUCCESS); GetObjectA((HANDLE)GDI_OBJECT_TYPE_COLORSPACE, 0, NULL); //ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_COLORSPACE, 0, NULL) == 60, "\n");// FIXME: what structure? fails on win7 - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "\n"); + ok_err(ERROR_INSUFFICIENT_BUFFER); SetLastError(ERROR_SUCCESS); ok(GetObjectW((HANDLE)GDI_OBJECT_TYPE_COLORSPACE, 0, NULL) == 0, "\n"); - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "\n"); + ok_err(ERROR_INSUFFICIENT_BUFFER); SetLastError(ERROR_SUCCESS); ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_COLORSPACE, 327, buffer) == 0, "\n"); - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %ld\n", GetLastError()); + ok_err(ERROR_INSUFFICIENT_BUFFER); ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_COLORSPACE, 328, buffer) == 0, "\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); - - ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_COLORSPACE, 328, NULL) == 0, "\n"); - //ok(ret == 0, "Expected ... got %d\n", ret); - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %ld\n", GetLastError()); + ok_err(ERROR_INVALID_PARAMETER); + + ok_long(GetObjectA((HANDLE)GDI_OBJECT_TYPE_COLORSPACE, 328, NULL), 0); + ok_err(ERROR_INSUFFICIENT_BUFFER); } void

12 years, 5 months

← Newer
1
...
14
15
16
17
18
19
20
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2012