Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gschneider] 47138: [WIN32K] - Check the supplied scancode instead of the state buffer whether a key is up - Fixes the calculator keyboard input regression introduced with r35117 - Ref: http://www.osronline.com/ddkx/w98ddk/keycnt_4ilz.htm and wine implementation See issue #3727 for more details.
by gschneider＠svn.reactos.org 08 May '10

08 May '10

Author: gschneider Date: Sun May 9 00:26:48 2010 New Revision: 47138 URL: http://svn.reactos.org/svn/reactos?rev=47138&view=rev Log: [WIN32K] - Check the supplied scancode instead of the state buffer whether a key is up - Fixes the calculator keyboard input regression introduced with r35117 - Ref: http://www.osronline.com/ddkx/w98ddk/keycnt_4ilz.htm and wine implementation See issue #3727 for more details. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] Sun May 9 00:26:48 2010 @@ -42,7 +42,9 @@ /* Key States */ #define KS_DOWN_MASK 0xc0 #define KS_DOWN_BIT 0x80 -#define KS_LOCK_BIT 0x01 +#define KS_LOCK_BIT 0x01 +/* Scan Codes */ +#define SC_KEY_UP 0x8000 /* lParam bits */ #define LP_EXT_BIT (1<<24) /* From kbdxx.c -- Key changes with numlock */ @@ -720,6 +722,11 @@ DPRINT("Enter NtUserSetKeyboardState\n"); UserEnterShared();//fixme: this syscall doesnt seem to need any locking... + /* Key up? */ + if (wScanCode & SC_KEY_UP) + { + RETURN(0); + } if( !NT_SUCCESS(MmCopyFromCaller(KeyStateBuf, lpKeyState, @@ -729,8 +736,8 @@ RETURN(0); } - /* Virtual code is correct and key is pressed currently? */ - if (wVirtKey < 0x100 && KeyStateBuf[wVirtKey] & KS_DOWN_BIT) + /* Virtual code is correct? */ + if (wVirtKey < 0x100) { OutPwszBuff = ExAllocatePoolWithTag(NonPagedPool,sizeof(WCHAR) * cchBuff, TAG_STRING); if( !OutPwszBuff ) @@ -752,8 +759,6 @@ MmCopyToCaller(pwszBuff,OutPwszBuff,sizeof(WCHAR)*cchBuff); ExFreePoolWithTag(OutPwszBuff, TAG_STRING); } - else - ret = 0; RETURN(ret);

1 0

[jgardou] 47137: [WIN32K] - attach devinfo->hpalDefault to the pdevobj after enabling it - attach this palette to surfaces attached to this pdevobj through EngModifySurface - use this palette in several place Partially fixes icon drawing after mode switch
by jgardou＠svn.reactos.org 08 May '10

08 May '10

Author: jgardou Date: Sun May 9 00:10:41 2010 New Revision: 47137 URL: http://svn.reactos.org/svn/reactos?rev=47137&view=rev Log: [WIN32K] - attach devinfo->hpalDefault to the pdevobj after enabling it - attach this palette to surfaces attached to this pdevobj through EngModifySurface - use this palette in several place Partially fixes icon drawing after mode switch Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/engbrush.c branches/reactos-yarotows/subsystems/win32/win32k/eng/pdevobj.c branches/reactos-yarotows/subsystems/win32/win32k/eng/surface.c branches/reactos-yarotows/subsystems/win32/win32k/eng/xlate.c branches/reactos-yarotows/subsystems/win32/win32k/include/pdevobj.h branches/reactos-yarotows/subsystems/win32/win32k/objects/bitblt.c branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c branches/reactos-yarotows/subsystems/win32/win32k/objects/fillshap.c branches/reactos-yarotows/subsystems/win32/win32k/objects/freetype.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/engbrush.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/engbrush.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/engbrush.c [iso-8859-1] Sun May 9 00:10:41 2010 @@ -18,8 +18,6 @@ NTAPI EBRUSHOBJ_vInit(EBRUSHOBJ *pebo, PBRUSH pbrush, PDC pdc) { - HPALETTE hpal = NULL; - ASSERT(pebo); ASSERT(pbrush); ASSERT(pdc); @@ -35,12 +33,20 @@ pebo->crCurrentText = pdc->pdcattr->crForegroundClr; pebo->psurfTrg = pdc->dclevel.pSurface; -// ASSERT(pebo->psurfTrg); // FIXME: some dcs don't have a surface - - if (pebo->psurfTrg) - hpal = pebo->psurfTrg->hDIBPalette; - if (!hpal) hpal = pPrimarySurface->devinfo.hpalDefault; - pebo->ppalSurf = PALETTE_ShareLockPalette(hpal); + ASSERT(pebo->psurfTrg); + + if (pebo->psurfTrg->hDIBPalette) + { + pebo->ppalSurf = PALETTE_ShareLockPalette(pebo->psurfTrg->hDIBPalette); + } + else if (pebo->psurfTrg->ppal) + { + pebo->ppalSurf = pebo->psurfTrg->ppal; + GDIOBJ_IncrementShareCount(&pebo->ppalSurf->BaseObject); + } + else + pebo->ppalSurf = PALETTE_ShareLockPalette(pdc->ppdev->devinfo.hpalDefault); + if (!pebo->ppalSurf) pebo->ppalSurf = &gpalRGB; Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/pdevobj.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/pdevobj.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/pdevobj.c [iso-8859-1] Sun May 9 00:10:41 2010 @@ -63,6 +63,12 @@ /* Release the surface and let the driver free it */ SURFACE_ShareUnlockSurface(ppdev->pSurface); ppdev->pfn.DisableSurface(ppdev->dhpdev); + } + + /* Do we have a palette? */ + if(ppdev->ppalSurf) + { + PALETTE_ShareUnlockPalette(ppdev->ppalSurf); } /* Disable PDEV */ @@ -132,6 +138,10 @@ if (ppdev->gdiinfo.ulLogPixelsY == 0) ppdev->gdiinfo.ulLogPixelsY = 96; + + /* Setup Palette */ + GDIOBJ_SetOwnership(ppdev->devinfo.hpalDefault, NULL); + ppdev->ppalSurf = PALETTE_ShareLockPalette(ppdev->devinfo.hpalDefault); DPRINT1("PDEVOBJ_bEnablePDEV - dhpdev = %p\n", ppdev->dhpdev); Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/surface.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/surface.c [iso-8859-1] Sun May 9 00:10:41 2010 @@ -134,6 +134,12 @@ { GreDeleteObject(psurf->hDIBPalette); } + } + + /* Free palette */ + if(psurf->ppal) + { + PALETTE_ShareUnlockPalette(psurf->ppal); } return TRUE; @@ -731,6 +737,9 @@ /* Hook up specified functions */ psurf->flHooks = flHooks; + /* Get palette */ + psurf->ppal = PALETTE_ShareLockPalette(ppdev->devinfo.hpalDefault); + SURFACE_UnlockSurface(psurf); return TRUE; @@ -773,6 +782,9 @@ /* Hook up specified functions */ psurf->flHooks = flHooks; + /* Get palette */ + psurf->ppal = PALETTE_ShareLockPalette(ppdev->devinfo.hpalDefault); + SURFACE_UnlockSurface(psurf); return TRUE; Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/xlate.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] Sun May 9 00:10:41 2010 @@ -603,7 +603,6 @@ PDC pdcDst) { PSURFACE psurfDst, psurfSrc; - HPALETTE hpalSrc, hpalDst; PPALETTE ppalSrc, ppalDst, ppalDstDc; DPRINT("Enter EXLATEOBJ_vInitXlateFromDCs\n"); @@ -619,18 +618,33 @@ return; } - hpalSrc = psurfSrc->hDIBPalette; - if (!hpalSrc) - hpalSrc = pPrimarySurface->devinfo.hpalDefault; - - ppalSrc = PALETTE_ShareLockPalette(hpalSrc); - if (!ppalSrc) + if (psurfSrc->hDIBPalette) + { + ppalSrc = PALETTE_ShareLockPalette(psurfSrc->hDIBPalette); + } + else if (psurfSrc->ppal) + { + ppalSrc = psurfSrc->ppal; + GDIOBJ_IncrementShareCount(&ppalSrc->BaseObject); + } + else + ppalSrc = PALETTE_ShareLockPalette(pdcSrc->ppdev->devinfo.hpalDefault); + + if(!ppalSrc) return; - hpalDst = psurfDst->hDIBPalette; - if (!hpalDst) hpalDst = pPrimarySurface->devinfo.hpalDefault; - - ppalDst = PALETTE_ShareLockPalette(hpalDst); + if (psurfDst->hDIBPalette) + { + ppalDst = PALETTE_ShareLockPalette(psurfDst->hDIBPalette); + } + else if (psurfDst->ppal) + { + ppalDst = psurfDst->ppal; + GDIOBJ_IncrementShareCount(&ppalDst->BaseObject); + } + else + ppalDst = PALETTE_ShareLockPalette(pdcDst->ppdev->devinfo.hpalDefault); + if (!ppalDst) { PALETTE_ShareUnlockPalette(ppalSrc); @@ -683,7 +697,6 @@ COLORREF crForegroundClr, COLORREF crBackgroundClr) { - HPALETTE hpalDst = NULL; PPALETTE ppalDst, ppalPattern; SURFACE *psurfPattern; @@ -694,9 +707,18 @@ EXLATEOBJ_vInitTrivial(pexlo); - hpalDst = psurfDst->hDIBPalette; - if (!hpalDst) hpalDst = pPrimarySurface->devinfo.hpalDefault; - ppalDst = PALETTE_ShareLockPalette(hpalDst); + if (psurfDst->hDIBPalette) + { + ppalDst = PALETTE_ShareLockPalette(psurfDst->hDIBPalette); + } + else if (psurfDst->ppal) + { + ppalDst = psurfDst->ppal; + GDIOBJ_IncrementShareCount(&ppalDst->BaseObject); + } + else + ppalDst = PALETTE_ShareLockPalette(pPrimarySurface->devinfo.hpalDefault); + if (!ppalDst) { DPRINT1("No ppalDst!\n"); Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/pdevobj.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/include/pdevobj.h [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/include/pdevobj.h [iso-8859-1] Sun May 9 00:10:41 2010 @@ -116,7 +116,7 @@ // ULONG TagSig; struct _LDEVOBJ * pldev; DHPDEV dhpdev; /* DHPDEV for device. */ - PVOID ppalSurf; /* PEPALOBJ/PPALETTE for this device. */ + struct _PALETTE* ppalSurf; /* PEPALOBJ/PPALETTE for this device. */ DEVINFO devinfo; GDIINFO gdiinfo; PSURFACE pSurface; /* SURFACE for this device. */ Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] Sun May 9 00:10:41 2010 @@ -328,9 +328,7 @@ PGDIOBJ apObj[2]; RECTL rcDest, rcSrc; SURFACE *BitmapDest, *BitmapSrc = NULL; - HPALETTE SourcePalette = 0, DestPalette = 0; - PPALETTE PalDestGDI, PalSourceGDI; - USHORT PalDestMode, PalSrcMode; + PPALETTE PalSourceGDI; ULONG TransparentColor = 0; BOOL Ret = FALSE; EXLATEOBJ exlo; @@ -396,42 +394,29 @@ goto done; } - DestPalette = BitmapDest->hDIBPalette; - if (!DestPalette) DestPalette = pPrimarySurface->devinfo.hpalDefault; - - SourcePalette = BitmapSrc->hDIBPalette; - if (!SourcePalette) SourcePalette = pPrimarySurface->devinfo.hpalDefault; - - if(!(PalSourceGDI = PALETTE_LockPalette(SourcePalette))) + if (BitmapSrc->hDIBPalette) + PalSourceGDI = PALETTE_ShareLockPalette(BitmapSrc->hDIBPalette); + else if (BitmapSrc->ppal) + { + GDIOBJ_IncrementShareCount(&BitmapSrc->ppal->BaseObject); + PalSourceGDI = BitmapSrc->ppal ; + } + else + PalSourceGDI = PALETTE_ShareLockPalette(pPrimarySurface->devinfo.hpalDefault) ; + + if(!PalSourceGDI) { SetLastWin32Error(ERROR_INVALID_HANDLE); goto done; - } - PalSrcMode = PalSourceGDI->Mode; - PALETTE_UnlockPalette(PalSourceGDI); - - if(DestPalette != SourcePalette) - { - if (!(PalDestGDI = PALETTE_LockPalette(DestPalette))) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - goto done; - } - PalDestMode = PalDestGDI->Mode; - PALETTE_UnlockPalette(PalDestGDI); - } - else - { - PalDestMode = PalSrcMode; - PalDestGDI = PalSourceGDI; } /* Translate Transparent (RGB) Color to the source palette */ EXLATEOBJ_vInitialize(&exlo, &gpalRGB, PalSourceGDI, 0, 0, 0); TransparentColor = XLATEOBJ_iXlate(&exlo.xlo, (ULONG)TransColor); EXLATEOBJ_vCleanup(&exlo); - - EXLATEOBJ_vInitialize(&exlo, PalSourceGDI, PalDestGDI, 0, 0, 0); + PALETTE_ShareUnlockPalette(PalSourceGDI); + + EXLATEOBJ_vInitXlateFromDCs(&exlo, DCSrc, DCDest); Ret = IntEngTransparentBlt(&BitmapDest->SurfObj, &BitmapSrc->SurfObj, DCDest->rosdc.CombinedClip, &exlo.xlo, &rcDest, &rcSrc, Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Sun May 9 00:10:41 2010 @@ -143,11 +143,23 @@ { if (Dc->dctype != DC_TYPE_MEMORY) { + PSURFACE psurf; Bmp = IntGdiCreateBitmap(abs(Width), abs(Height), Dc->ppdev->gdiinfo.cPlanes, Dc->ppdev->gdiinfo.cBitsPixel, NULL); + /* Set palette */ + psurf = SURFACE_LockSurface(Bmp); + if(!psurf) + { + DPRINT1("Could not lock surface?\n"); + } + else + { + psurf->ppal = PALETTE_ShareLockPalette(Dc->ppdev->devinfo.hpalDefault); + SURFACE_UnlockSurface(psurf); + } } else { @@ -334,7 +346,6 @@ BOOL bInRect = FALSE; SURFACE *psurf; SURFOBJ *pso; - HPALETTE hpal = 0; PPALETTE ppal; EXLATEOBJ exlo; HBITMAP hBmpTmp; @@ -362,9 +373,15 @@ if (psurf) { pso = &psurf->SurfObj; - hpal = psurf->hDIBPalette; - if (!hpal) hpal = pPrimarySurface->devinfo.hpalDefault; - ppal = PALETTE_ShareLockPalette(hpal); + if(psurf->hDIBPalette) + ppal = PALETTE_ShareLockPalette(psurf->hDIBPalette); + else if (psurf->ppal) + { + ppal = psurf->ppal; + GDIOBJ_IncrementShareCount(&ppal->BaseObject); + } + else + ppal = PALETTE_ShareLockPalette(dc->ppdev->devinfo.hpalDefault); if (psurf->SurfObj.iBitmapFormat == BMF_1BPP && !psurf->hSecure) { Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Sun May 9 00:10:41 2010 @@ -230,7 +230,7 @@ EXLATEOBJ exlo; PPALETTE ppalDDB, ppalDIB; //RGBQUAD *lpRGB; - HPALETTE DDB_Palette, DIB_Palette; + HPALETTE DIB_Palette; ULONG DIB_Palette_Type; INT DIBWidth; @@ -279,15 +279,17 @@ // Use hDIBPalette if it exists if (bitmap->hDIBPalette) { - DDB_Palette = bitmap->hDIBPalette; + ppalDDB = PALETTE_ShareLockPalette(bitmap->hDIBPalette); + } + else if (bitmap->ppal) + { + ppalDDB = bitmap->ppal; + GDIOBJ_IncrementShareCount(&ppalDDB->BaseObject); } else - { // Destination palette obtained from the hDC - DDB_Palette = DC->ppdev->devinfo.hpalDefault; - } - - ppalDDB = PALETTE_LockPalette(DDB_Palette); + ppalDDB = PALETTE_ShareLockPalette(DC->ppdev->devinfo.hpalDefault); + if (NULL == ppalDDB) { EngUnlockSurface(SourceSurf); @@ -304,6 +306,7 @@ EngUnlockSurface(SourceSurf); EngDeleteSurface((HSURF)SourceBitmap); SURFACE_UnlockSurface(bitmap); + PALETTE_ShareUnlockPalette(ppalDDB); SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); return 0; } @@ -336,7 +339,7 @@ // Clean up EXLATEOBJ_vCleanup(&exlo); PALETTE_UnlockPalette(ppalDIB); - PALETTE_UnlockPalette(ppalDDB); + PALETTE_ShareUnlockPalette(ppalDDB); PALETTE_FreePaletteByHandle(DIB_Palette); EngUnlockSurface(SourceSurf); EngDeleteSurface((HSURF)SourceBitmap); @@ -441,7 +444,7 @@ SIZEL SourceSize; EXLATEOBJ exlo; PPALETTE ppalDDB = NULL, ppalDIB = NULL; - HPALETTE hpalDDB, hpalDIB = NULL; + HPALETTE hpalDIB = NULL; ULONG DIBPaletteType; if (!Bits) return 0; @@ -474,15 +477,7 @@ return 0; } - /* Use destination palette obtained from the DC by default */ - hpalDDB = pDC->ppdev->devinfo.hpalDefault; - - /* Try to use hDIBPalette if it exists */ pSurf = pDC->dclevel.pSurface; - if (pSurf && pSurf->hDIBPalette) - { - hpalDDB = pSurf->hDIBPalette; - } pDestSurf = pSurf ? &pSurf->SurfObj : NULL; @@ -528,7 +523,18 @@ } /* Obtain destination palette */ - ppalDDB = PALETTE_LockPalette(hpalDDB); + if (pSurf && pSurf->hDIBPalette) + { + ppalDDB = PALETTE_ShareLockPalette(pSurf->hDIBPalette); + } + else if (pSurf && pSurf->ppal) + { + ppalDDB = pSurf->ppal; + GDIOBJ_IncrementShareCount(&ppalDDB->BaseObject); + } + else + ppalDDB = PALETTE_ShareLockPalette(pDC->ppdev->devinfo.hpalDefault); + if (!ppalDDB) { SetLastWin32Error(ERROR_INVALID_HANDLE); @@ -547,7 +553,7 @@ /* Lock the DIB palette */ ppalDIB = PALETTE_LockPalette(hpalDIB); - if (!ppalDDB) + if (!ppalDIB) { SetLastWin32Error(ERROR_INVALID_HANDLE); Status = STATUS_UNSUCCESSFUL; @@ -558,7 +564,7 @@ EXLATEOBJ_vInitialize(&exlo, ppalDIB, ppalDDB, 0, 0, 0); /* Copy the bits */ - DPRINT("BitsToDev with dstsurf=(%d|%d) (%d|%d), src=(%d|%d) w=%d h=%d\n", + DPRINT("BitsToDev with dstsurf=(%d|%d) (%d|%d), src=(%d|%d) w=%d h=%d\n", rcDest.left, rcDest.top, rcDest.right, rcDest.bottom, ptSource.x, ptSource.y, SourceSize.cx, SourceSize.cy); Status = IntEngBitBlt(pDestSurf, @@ -583,7 +589,7 @@ } if (ppalDIB) PALETTE_UnlockPalette(ppalDIB); - if (ppalDDB) PALETTE_UnlockPalette(ppalDDB); + if (ppalDDB) PALETTE_ShareUnlockPalette(ppalDDB); if (pSourceSurf) EngUnlockSurface(pSourceSurf); if (hSourceBitmap) EngDeleteSurface((HSURF)hSourceBitmap); @@ -611,7 +617,6 @@ PDC Dc; SURFACE *psurf = NULL; HBITMAP hDestBitmap = NULL; - HPALETTE hSourcePalette = NULL; HPALETTE hDestPalette = NULL; PPALETTE ppalSrc = NULL; PPALETTE ppalDst = NULL; @@ -636,7 +641,7 @@ _SEH2_TRY { ProbeForRead(&Info->bmiHeader.biSize, sizeof(DWORD), 1); - + ProbeForWrite(Info, Info->bmiHeader.biSize, 1); // Comp for Core. if (ChkBits) ProbeForWrite(ChkBits, MaxBits, 1); } @@ -658,18 +663,30 @@ DC_UnlockDc(Dc); return 0; } - DC_UnlockDc(Dc); /* Get a pointer to the source bitmap object */ psurf = SURFACE_LockSurface(hBitmap); if (psurf == NULL) - return 0; - - hSourcePalette = psurf->hDIBPalette; - if (!hSourcePalette) - { - hSourcePalette = pPrimarySurface->devinfo.hpalDefault; - } + { + DC_UnlockDc(Dc); + return 0; + } + + if (psurf->hDIBPalette) + { + ppalSrc = PALETTE_ShareLockPalette(psurf->hDIBPalette); + } + else if (psurf->ppal) + { + ppalSrc = psurf->ppal; + GDIOBJ_IncrementShareCount(&ppalSrc->BaseObject); + } + else + ppalSrc = PALETTE_ShareLockPalette(Dc->ppdev->devinfo.hpalDefault); + + DC_UnlockDc(Dc); + + ASSERT(ppalSrc != NULL); ColorPtr = ((PBYTE)Info + Info->bmiHeader.biSize); rgbQuads = (RGBQUAD *)ColorPtr; @@ -680,15 +697,11 @@ Info->bmiHeader.biBitCount != 15 && Info->bmiHeader.biBitCount != 16) || !ChkBits) { - hDestPalette = hSourcePalette; + ppalDst = ppalSrc; bPaletteMatch = TRUE; } else hDestPalette = BuildDIBPalette(Info, (PINT)&DestPaletteType); //hDestPalette = Dc->DevInfo->hpalDefault; - - ppalSrc = PALETTE_LockPalette(hSourcePalette); - /* FIXME - ppalSrc can be NULL!!! Don't assert here! */ - ASSERT(ppalSrc); if (!bPaletteMatch) { @@ -696,10 +709,6 @@ /* FIXME - ppalDst can be NULL!!!! Don't assert here!!! */ DPRINT("ppalDst : %p\n", ppalDst); ASSERT(ppalDst); - } - else - { - ppalDst = ppalSrc; } /* Copy palette. */ @@ -970,7 +979,7 @@ } } cleanup: - PALETTE_UnlockPalette(ppalSrc); + PALETTE_ShareUnlockPalette(ppalSrc); if (hDestBitmap != NULL) EngDeleteSurface((HSURF)hDestBitmap); Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] Sun May 9 00:10:41 2010 @@ -872,7 +872,6 @@ POINTL DitherOrg; ULONG i; BOOL Ret; - HPALETTE hDestPalette; ASSERT(dc); ASSERT(pVertex); @@ -936,10 +935,19 @@ /* FIXME - psurf can be NULL!!! Don't assert but handle this case gracefully! */ ASSERT(psurf); - hDestPalette = psurf->hDIBPalette; - if (!hDestPalette) hDestPalette = pPrimarySurface->devinfo.hpalDefault; - - PalDestGDI = PALETTE_LockPalette(hDestPalette); + if (psurf->hDIBPalette) + { + PalDestGDI = PALETTE_ShareLockPalette(psurf->hDIBPalette); + } + else if (psurf->ppal) + { + PalDestGDI = psurf->ppal; + GDIOBJ_IncrementShareCount(&PalDestGDI->BaseObject); + } + else + // Destination palette obtained from the hDC + PalDestGDI = PALETTE_ShareLockPalette(dc->ppdev->devinfo.hpalDefault); + EXLATEOBJ_vInitialize(&exlo, &gpalRGB, PalDestGDI, 0, 0, 0); Ret = IntEngGradientFill(&psurf->SurfObj, @@ -956,7 +964,7 @@ EXLATEOBJ_vCleanup(&exlo); if (PalDestGDI) - PALETTE_UnlockPalette(PalDestGDI); + PALETTE_ShareUnlockPalette(PalDestGDI); return Ret; } @@ -1089,7 +1097,6 @@ PDC dc; PDC_ATTR pdcattr; SURFACE *psurf = NULL; - HPALETTE hpal; PPALETTE ppal; EXLATEOBJ exlo; BOOL Ret = FALSE; @@ -1135,9 +1142,18 @@ goto cleanup; } - hpal = dc->dclevel.pSurface->hDIBPalette; - if (!hpal) hpal = pPrimarySurface->devinfo.hpalDefault; - ppal = PALETTE_ShareLockPalette(hpal); + if (psurf->hDIBPalette) + { + ppal = PALETTE_ShareLockPalette(psurf->hDIBPalette); + } + else if (psurf->ppal) + { + ppal = psurf->ppal; + GDIOBJ_IncrementShareCount(&ppal->BaseObject); + } + else + // Destination palette obtained from the hDC + ppal = PALETTE_ShareLockPalette(dc->ppdev->devinfo.hpalDefault); EXLATEOBJ_vInitialize(&exlo, &gpalRGB, ppal, 0, 0xffffff, 0); Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Sun May 9 00:10:41 2010 @@ -3168,7 +3168,6 @@ BOOLEAN Render; POINT Start; BOOL DoBreak = FALSE; - HPALETTE hDestPalette; PPALETTE ppalDst; USHORT DxShift; @@ -3440,14 +3439,22 @@ SurfObj = &psurf->SurfObj ; /* Create the xlateobj */ - hDestPalette = psurf->hDIBPalette; - if (!hDestPalette) hDestPalette = pPrimarySurface->devinfo.hpalDefault; - //if (!hDestPalette) hDestPalette = StockObjects[DEFAULT_PALETTE];//pPrimarySurface->devinfo.hpalDefault; - ppalDst = PALETTE_LockPalette(hDestPalette); + if (psurf->hDIBPalette) + { + ppalDst = PALETTE_ShareLockPalette(psurf->hDIBPalette); + } + else if (psurf->ppal) + { + ppalDst = psurf->ppal; + GDIOBJ_IncrementShareCount(&ppalDst->BaseObject); + } + else + // Destination palette obtained from the hDC + ppalDst = PALETTE_ShareLockPalette(dc->ppdev->devinfo.hpalDefault); ASSERT(ppalDst); EXLATEOBJ_vInitialize(&exloRGB2Dst, &gpalRGB, ppalDst, 0, 0, 0); EXLATEOBJ_vInitialize(&exloDst2RGB, ppalDst, &gpalRGB, 0, 0, 0); - PALETTE_UnlockPalette(ppalDst); + PALETTE_ShareUnlockPalette(ppalDst); if ((fuOptions & ETO_OPAQUE) && (dc->pdcattr->ulDirty_ & DIRTY_BACKGROUND)) DC_vUpdateBackgroundBrush(dc) ;

1 0

[cgutman] 47136: [USBDRIVER] - Fix an off-by-one error in the probing code - Scan all PCI buses instead of just the first two - Fix a horrible bug that resulted in reinitializing EHCI controllers as UHCI controllers which caused a crash on VirtualBox (with _MULTI_UHCI) - Implement support for multiple EHCI controllers and enable support for multiple UHCI controllers (greatly increases compatibility with real hardware because the first controller detected is often internal)
by cgutman＠svn.reactos.org 08 May '10

08 May '10

Author: cgutman Date: Sat May 8 23:53:57 2010 New Revision: 47136 URL: http://svn.reactos.org/svn/reactos?rev=47136&view=rev Log: [USBDRIVER] - Fix an off-by-one error in the probing code - Scan all PCI buses instead of just the first two - Fix a horrible bug that resulted in reinitializing EHCI controllers as UHCI controllers which caused a crash on VirtualBox (with _MULTI_UHCI) - Implement support for multiple EHCI controllers and enable support for multiple UHCI controllers (greatly increases compatibility with real hardware because the first controller detected is often internal) Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c trunk/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.rbuild Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c [iso-8859-1] Sat May 8 23:53:57 2010 @@ -3461,18 +3461,19 @@ PDEVICE_OBJECT pdev; BYTE buffer[sizeof(PCI_COMMON_CONFIG)]; PEHCI_DEVICE_EXTENSION pdev_ext; + LONG count = 0; slot_num.u.AsULONG = 0; pci_config = (PPCI_COMMON_CONFIG) buffer; pdev = NULL; - //scan the bus to find ehci controller - for(bus = 0; bus < 3; bus++) /* enum bus0-bus2 */ - { - for(i = 0; i < PCI_MAX_DEVICES; i++) + //scan the PCI buses to find ehci controller + for (bus = 0; bus <= PCI_MAX_BRIDGE_NUMBER; bus++) //Yes, it should be <= + { + for(i = 0; i <= PCI_MAX_DEVICES; i++) { slot_num.u.bits.DeviceNumber = i; - for(j = 0; j < PCI_MAX_FUNCTIONS; j++) + for(j = 0; j <= PCI_MAX_FUNCTION; j++) { slot_num.u.bits.FunctionNumber = j; @@ -3490,9 +3491,12 @@ { //well, we find our usb host controller( EHCI ), create device pdev = ehci_alloc(drvr_obj, reg_path, ((bus << 8) | (i << 3) | j), dev_mgr); - - if (!pdev) - continue; + if (pdev) +#ifdef _MULTI_EHCI + count++; +#else + goto LBL_LOOPOUT; +#endif } } @@ -3500,6 +3504,11 @@ break; } } + +#ifndef _MULTI_EHCI +LBL_LOOPOUT: +#endif + DbgPrint("Found %d EHCI controllers\n", count); if (pdev) { Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c [iso-8859-1] Sat May 8 23:53:57 2010 @@ -626,13 +626,13 @@ count = 0; pdev = NULL; - //scan the bus to find uhci controller - for(bus = 0; bus < 3; bus++) /* enum bus0-bus2 */ - { - for(i = 0; i < PCI_MAX_DEVICES; i++) + //scan the PCI buses to find uhci controller + for (bus = 0; bus <= PCI_MAX_BRIDGE_NUMBER; bus++) + { + for(i = 0; i <= PCI_MAX_DEVICES; i++) { slot_num.u.bits.DeviceNumber = i; - for(j = 0; j < PCI_MAX_FUNCTIONS; j++) + for(j = 0; j <= PCI_MAX_FUNCTION; j++) { slot_num.u.bits.FunctionNumber = j; @@ -645,18 +645,15 @@ if (ret == 2) /*no device on the slot */ break; - if (pci_config->BaseClass == 0x0c && pci_config->SubClass == 0x03) + if (pci_config->BaseClass == 0x0c && pci_config->SubClass == 0x03 && + pci_config->ProgIf == 0x00) { // well, we find our usb host controller, create device -#ifdef _MULTI_UHCI - { - pdev = uhci_alloc(drvr_obj, reg_path, ((bus << 8) | (i << 3) | j), dev_mgr); - if (pdev) - count++; - } -#else pdev = uhci_alloc(drvr_obj, reg_path, ((bus << 8) | (i << 3) | j), dev_mgr); if (pdev) +#ifdef _MULTI_UHCI + count++; +#else goto LBL_LOOPOUT; #endif } @@ -669,6 +666,8 @@ #ifndef _MULTI_UHCI LBL_LOOPOUT: #endif + DbgPrint("Found %d UHCI controllers\n", count); + if (pdev) { pdev_ext = pdev->DeviceExtension; Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.rbuild [iso-8859-1] Sat May 8 23:53:57 2010 @@ -2,6 +2,8 @@ <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="usbdriver" type="kernelmodedriver" installbase="system32/drivers" installname="usbdriver.sys"> <define name="INCLUDE_EHCI" /> + <define name="_MULTI_UHCI" /> + <define name="_MULTI_EHCI" /> <define name="_X86" /> <include base="usbdriver">.</include> <library>ntoskrnl</library>

1 0

[fireball] 47135: - Fix release build.
by fireball＠svn.reactos.org 08 May '10

08 May '10

Author: fireball Date: Sat May 8 22:38:58 2010 New Revision: 47135 URL: http://svn.reactos.org/svn/reactos?rev=47135&view=rev Log: - Fix release build. Modified: trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild Modified: trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/setup… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild [iso-8859-1] Sat May 8 22:38:58 2010 @@ -5,13 +5,13 @@ <library>freeldr_startup</library> <library>freeldr_base64k</library> <library>freeldr_base</library> + <library>mini_hal</library> <library>freeldr_arch</library> <library>setupldr_main</library> <library>rossym</library> <library>cmlib</library> <library>rtl</library> <library>libcntpr</library> - <library>mini_hal</library> <group linkerset="ld"> <linkerflag>-nostartfiles</linkerflag> <linkerflag>-nostdlib</linkerflag>

1 0

[khornicek] 47134: [WIN32K] - Bring back support for RLE compressed bitmaps. - Merge the decompress functions for 4bb and 8bpp bitmaps to one generic function. - Simplify SURFMEM_bCreateDib a bit by not allowing PNG/JPEG compression at all. See issue #5276 for more details.
by khornicek＠svn.reactos.org 08 May '10

08 May '10

Author: khornicek Date: Sat May 8 20:09:45 2010 New Revision: 47134 URL: http://svn.reactos.org/svn/reactos?rev=47134&view=rev Log: [WIN32K] - Bring back support for RLE compressed bitmaps. - Merge the decompress functions for 4bb and 8bpp bitmaps to one generic function. - Simplify SURFMEM_bCreateDib a bit by not allowing PNG/JPEG compression at all. See issue #5276 for more details. Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/surface.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/surface.c [iso-8859-1] Sat May 8 20:09:45 2010 @@ -204,48 +204,59 @@ return NewBitmap; } -VOID Decompress4bpp(SIZEL Size, BYTE *CompressedBits, BYTE *UncompressedBits, LONG Delta) -{ - int x = 0; - int y = Size.cy - 1; - int c; - int length; - int width = ((Size.cx+1)/2); - int height = Size.cy - 1; +BOOL DecompressBitmap(SIZEL Size, BYTE *CompressedBits, BYTE *UncompressedBits, LONG Delta, ULONG Format) +{ + INT x = 0; + INT y = Size.cy - 1; + INT c; + INT length; + INT width; + INT height = Size.cy - 1; BYTE *begin = CompressedBits; BYTE *bits = CompressedBits; BYTE *temp; - while (y >= 0) - { - length = *bits++ / 2; - if (length) - { - c = *bits++; - while (length--) - { - if (x >= width) break; - temp = UncompressedBits + (((height - y) * Delta) + x); - x++; - *temp = c; - } - } - else - { - length = *bits++; - switch (length) - { + INT shift = 0; + + if (Format == BMF_4RLE) + shift = 1; + else if(Format != BMF_8RLE) + return FALSE; + + width = ((Size.cx + shift) >> shift); + + _SEH2_TRY + { + while (y >= 0) + { + length = (*bits++) >> shift; + if (length) + { + c = *bits++; + while (length--) + { + if (x >= width) break; + temp = UncompressedBits + (((height - y) * Delta) + x); + x++; + *temp = c; + } + } + else + { + length = *bits++; + switch (length) + { case RLE_EOL: x = 0; y--; break; case RLE_END: - return; + _SEH2_YIELD(return TRUE); case RLE_DELTA: - x += (*bits++)/2; - y -= (*bits++)/2; + x += (*bits++) >> shift; + y -= (*bits++) >> shift; break; default: - length /= 2; + length = length >> shift; while (length--) { c = *bits++; @@ -260,69 +271,18 @@ { bits++; } - } - } - } -} - -VOID Decompress8bpp(SIZEL Size, BYTE *CompressedBits, BYTE *UncompressedBits, LONG Delta) -{ - int x = 0; - int y = Size.cy - 1; - int c; - int length; - int width = Size.cx; - int height = Size.cy - 1; - BYTE *begin = CompressedBits; - BYTE *bits = CompressedBits; - BYTE *temp; - while (y >= 0) - { - length = *bits++; - if (length) - { - c = *bits++; - while (length--) - { - if (x >= width) break; - temp = UncompressedBits + (((height - y) * Delta) + x); - x++; - *temp = c; - } - } - else - { - length = *bits++; - switch (length) - { - case RLE_EOL: - x = 0; - y--; - break; - case RLE_END: - return; - case RLE_DELTA: - x += *bits++; - y -= *bits++; - break; - default: - while (length--) - { - c = *bits++; - if (x < width) - { - temp = UncompressedBits + (((height - y) * Delta) + x); - x++; - *temp = c; - } - } - if ((bits - begin) & 1) - { - bits++; - } - } - } - } + } + } + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + DPRINT1("Decoding error\n"); + _SEH2_YIELD(return FALSE); + } + _SEH2_END; + + return TRUE; } HBITMAP FASTCALL @@ -362,7 +322,7 @@ pso->cjBits = pso->lDelta * Size.cy; UncompressedFormat = BMF_4BPP; UncompressedBits = EngAllocMem(FL_ZERO_MEMORY, pso->cjBits, TAG_DIB); - Decompress4bpp(Size, (BYTE *)Bits, (BYTE *)UncompressedBits, pso->lDelta); + DecompressBitmap(Size, (BYTE *)Bits, (BYTE *)UncompressedBits, pso->lDelta, Format); } else if (Format == BMF_8RLE) { @@ -370,7 +330,7 @@ pso->cjBits = pso->lDelta * Size.cy; UncompressedFormat = BMF_8BPP; UncompressedBits = EngAllocMem(FL_ZERO_MEMORY, pso->cjBits, TAG_DIB); - Decompress8bpp(Size, (BYTE *)Bits, (BYTE *)UncompressedBits, pso->lDelta); + DecompressBitmap(Size, (BYTE *)Bits, (BYTE *)UncompressedBits, pso->lDelta, Format); } else { @@ -467,6 +427,7 @@ PSURFACE psurf; SIZEL LocalSize; BOOLEAN AllocatedLocally = FALSE; + PVOID DecompressedBits = NULL; /* * First, check the format so we can get the aligned scanline width. @@ -500,17 +461,29 @@ break; case BMF_8RLE: + ScanLine = (BitmapInfo->Width + 3) & ~3; + Compressed = TRUE; + break; case BMF_4RLE: + ScanLine = ((BitmapInfo->Width + 7) & ~7) >> 1; + Compressed = TRUE; + break; + case BMF_JPEG: case BMF_PNG: - Compressed = TRUE; - break; + ASSERT(FALSE); // ENGDDI shouldn't be creating PNGs for drivers ;-) + DPRINT1("No support for JPEG and PNG formats\n"); + return NULL; default: DPRINT1("Invalid bitmap format\n"); return NULL; } + /* Save local bitmap size */ + LocalSize.cy = BitmapInfo->Height; + LocalSize.cx = BitmapInfo->Width; + /* Does the device manage its own surface? */ if (!Bits) { @@ -519,7 +492,8 @@ { /* Note: we should not be seeing this scenario from ENGDDI */ ASSERT(FALSE); - Size = BitmapInfo->Size; + DPRINT1("RLE compressed bitmap requested with no valid bitmap bits\n"); + return NULL; } else { @@ -551,6 +525,22 @@ { /* Should not have asked for user memory */ ASSERT((BitmapInfo->Flags & BMF_USERMEM) == 0); + + if (Compressed) + { + DecompressedBits = EngAllocMem(FL_ZERO_MEMORY, BitmapInfo->Height * ScanLine, TAG_DIB); + + if(!DecompressedBits) + return NULL; + + if(!DecompressBitmap(LocalSize, (BYTE *)Bits, (BYTE *)DecompressedBits, ScanLine, BitmapInfo->Format)) + { + EngFreeMem(DecompressedBits); + return NULL; + } + + BitmapInfo->Format = (BitmapInfo->Format == BMF_4RLE) ? BMF_4BPP : BMF_8BPP; + } } /* Allocate the actual surface object structure */ @@ -564,6 +554,8 @@ else EngFreeMem(Bits); } + if (DecompressedBits) + EngFreeMem(DecompressedBits); return NULL; } @@ -584,11 +576,9 @@ pso->fjBitmap = BitmapInfo->Flags & (BMF_TOPDOWN | BMF_UMPDMEM | BMF_USERMEM); /* Save size and type */ - LocalSize.cy = BitmapInfo->Height; - LocalSize.cx = BitmapInfo->Width; pso->sizlBitmap = LocalSize; pso->iType = STYPE_BITMAP; - + /* Device-managed surface, no flags or dimension */ pso->dhsurf = 0; pso->dhpdev = NULL; @@ -599,48 +589,28 @@ psurf->hSecure = NULL; psurf->hDIBSection = NULL; psurf->flHooks = 0; - + /* Set bits */ - pso->pvBits = Bits; - - /* Check for bitmap type */ - if (!Compressed) - { - /* Number of bits is based on the height times the scanline */ - pso->cjBits = BitmapInfo->Height * ScanLine; - if (BitmapInfo->Flags & BMF_TOPDOWN) - { - /* For topdown, the base address starts with the bits */ - pso->pvScan0 = pso->pvBits; - pso->lDelta = ScanLine; - } - else - { - /* Otherwise we start with the end and go up */ - pso->pvScan0 = (PVOID)((ULONG_PTR)pso->pvBits + pso->cjBits - ScanLine); - pso->lDelta = -ScanLine; - } + if(Compressed) + pso->pvBits = DecompressedBits; + else + pso->pvBits = Bits; + + /* Number of bits is based on the height times the scanline */ + pso->cjBits = BitmapInfo->Height * ScanLine; + if (BitmapInfo->Flags & BMF_TOPDOWN) + { + /* For topdown, the base address starts with the bits */ + pso->pvScan0 = pso->pvBits; + pso->lDelta = ScanLine; } else { - /* Compressed surfaces don't have scanlines! */ - pso->lDelta = 0; - pso->cjBits = BitmapInfo->Size; - - /* Check for JPG or PNG */ - if ((BitmapInfo->Format != BMF_JPEG) && (BitmapInfo->Format != BMF_PNG)) - { - /* Wherever the bit data is */ - pso->pvScan0 = pso->pvBits; - } - else - { - /* Fancy formats don't use a base address */ - pso->pvScan0 = NULL; - ASSERT(FALSE); // ENGDDI shouldn't be creating PNGs for drivers ;-) - } - } - + /* Otherwise we start with the end and go up */ + pso->pvScan0 = (PVOID)((ULONG_PTR)pso->pvBits + pso->cjBits - ScanLine); + pso->lDelta = -ScanLine; + } + /* Finally set the handle and uniq */ pso->hsurf = (HSURF)psurf->BaseObject.hHmgr; pso->iUniq = 0;

1 0

[jgardou] 47133: Sync with trunk r47129
by jgardou＠svn.reactos.org 08 May '10

08 May '10

Author: jgardou Date: Sat May 8 19:23:51 2010 New Revision: 47133 URL: http://svn.reactos.org/svn/reactos?rev=47133&view=rev Log: Sync with trunk r47129 Added: branches/reactos-yarotows/base/system/winlogon/environment.c - copied unchanged from r47132, trunk/reactos/base/system/winlogon/environment.c branches/reactos-yarotows/include/reactos/wine/commctrl.h - copied unchanged from r47132, trunk/reactos/include/reactos/wine/commctrl.h Modified: branches/reactos-yarotows/ (props changed) branches/reactos-yarotows/base/applications/wordpad/wordpad.rbuild branches/reactos-yarotows/base/shell/explorer/taskbar/traynotify.cpp branches/reactos-yarotows/base/system/winlogon/sas.c branches/reactos-yarotows/base/system/winlogon/winlogon.c branches/reactos-yarotows/base/system/winlogon/winlogon.h branches/reactos-yarotows/base/system/winlogon/winlogon.rbuild branches/reactos-yarotows/dll/cpl/usrmgr/usrmgr.rbuild branches/reactos-yarotows/dll/win32/comctl32/comctl32.rbuild branches/reactos-yarotows/dll/win32/gdi32/objects/region.c branches/reactos-yarotows/dll/win32/netcfgx/netcfgx.rbuild branches/reactos-yarotows/dll/win32/netshell/netshell.rbuild branches/reactos-yarotows/dll/win32/user32/user32.rbuild branches/reactos-yarotows/dll/win32/userenv/environment.c branches/reactos-yarotows/include/psdk/commctrl.h branches/reactos-yarotows/subsystems/win32/win32k/eng/bitblt.c branches/reactos-yarotows/subsystems/win32/win32k/include/msgqueue.h branches/reactos-yarotows/subsystems/win32/win32k/ntuser/focus.c branches/reactos-yarotows/subsystems/win32/win32k/ntuser/message.c branches/reactos-yarotows/subsystems/win32/win32k/ntuser/msgqueue.c branches/reactos-yarotows/subsystems/win32/win32k/ntuser/winpos.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/reactos-yarotows/base/applications/wordpad/wordpad.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/shell/explorer/taskbar/traynotify.cpp URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/shell/exp… Modified: branches/reactos-yarotows/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/system/wi… Modified: branches/reactos-yarotows/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/system/wi… Modified: branches/reactos-yarotows/base/system/winlogon/winlogon.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/system/wi… Modified: branches/reactos-yarotows/base/system/winlogon/winlogon.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/system/wi… Modified: branches/reactos-yarotows/dll/cpl/usrmgr/usrmgr.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/cpl/usrmgr… Modified: branches/reactos-yarotows/dll/win32/comctl32/comctl32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/comc… Modified: branches/reactos-yarotows/dll/win32/gdi32/objects/region.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/gdi3… Modified: branches/reactos-yarotows/dll/win32/netcfgx/netcfgx.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/netc… Modified: branches/reactos-yarotows/dll/win32/netshell/netshell.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/nets… Modified: branches/reactos-yarotows/dll/win32/user32/user32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/user… Modified: branches/reactos-yarotows/dll/win32/userenv/environment.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/user… Modified: branches/reactos-yarotows/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/psdk/c… Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/msgqueue.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win…

1 0

[tkreuzer] 47132: Revert r47130, it was already comitted.
by tkreuzer＠svn.reactos.org 08 May '10

08 May '10

Author: tkreuzer Date: Sat May 8 18:42:03 2010 New Revision: 47132 URL: http://svn.reactos.org/svn/reactos?rev=47132&view=rev Log: Revert r47130, it was already comitted. Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateCompatibleDC.c trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDeleteObjectApp.c Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateCompatibleDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateCompatibleDC.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateCompatibleDC.c [iso-8859-1] Sat May 8 18:42:03 2010 @@ -21,8 +21,6 @@ /* The default pen should be GetStockObject(BLACK_PEN) */ hObj = SelectObject(hDC, GetStockObject(WHITE_PEN)); TEST(hObj == GetStockObject(BLACK_PEN)); - - TEST(NtGdiDeleteObjectApp(hDC) != 0); TEST(NtGdiDeleteObjectApp(hDC) != 0); Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDeleteObjectApp.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDeleteObjectApp.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDeleteObjectApp.c [iso-8859-1] Sat May 8 18:42:03 2010 @@ -23,27 +23,7 @@ TEST(NtGdiDeleteObjectApp(hdc) == 1); TEST(GetLastError() == 0); TEST(IsHandleValid(hdc) == 0); - - /* Delete a display DC */ - SetLastError(0); - hdc = CreateDC("DISPLAY", NULL, NULL, NULL); - ASSERT(IsHandleValid(hdc) == 1); - TEST(NtGdiDeleteObjectApp(hdc) != 0); - TEST(GetLastError() == 0); - TEST(IsHandleValid(hdc) == 1); - TEST(SelectObject(hdc, GetStockObject(WHITE_PEN)) == NULL); - TESTX(GetLastError() == ERROR_INVALID_PARAMETER, "GetLasterror returned 0x%08x\n", (unsigned int)GetLastError()); - - /* Once more */ - SetLastError(0); - hdc = GetDC(0); - ASSERT(IsHandleValid(hdc) == 1); - TEST(NtGdiDeleteObjectApp(hdc) != 0); - TEST(GetLastError() == 0); - TEST(IsHandleValid(hdc) == 1); - TEST(SelectObject(hdc, GetStockObject(WHITE_PEN)) == NULL); - TESTX(GetLastError() == ERROR_INVALID_PARAMETER, "GetLasterror returned 0x%08x\n", (unsigned int)GetLastError()); - + /* Delete a display DC */ SetLastError(0); hdc = CreateDC("DISPLAY", NULL, NULL, NULL);

1 0

[jgardou] 47131: [WIN32K] - Allow NtGdiDeleteObjectApp to delete a permanent DC, as windows does it. This is not exactly what windows does, but no one should use a DeletedDC'ed DC anyway. Fixes "No! You Naughty Application" debug spam and some wine tests
by jgardou＠svn.reactos.org 08 May '10

08 May '10

Author: jgardou Date: Sat May 8 18:41:41 2010 New Revision: 47131 URL: http://svn.reactos.org/svn/reactos?rev=47131&view=rev Log: [WIN32K] - Allow NtGdiDeleteObjectApp to delete a permanent DC, as windows does it. This is not exactly what windows does, but no one should use a DeletedDC'ed DC anyway. Fixes "No! You Naughty Application" debug spam and some wine tests Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] Sat May 8 18:41:41 2010 @@ -801,11 +801,28 @@ if (!Force) { + /* Windows permits NtGdiDeleteObjectApp to delete a permanent DC + * For some reason, it's still a valid handle, pointing to some kernel data. + * Not sure if this is a bug, a feature, some cache stuff... Who knows? + * See NtGdiDeleteObjectApp test for details */ if (DCToDelete->fs & DC_FLAG_PERMANENT) { - DPRINT1("No! You Naughty Application!\n"); DC_UnlockDc(DCToDelete); - return UserReleaseDC(NULL, hDC, FALSE); + if(UserReleaseDC(NULL, hDC, FALSE)) + { + /* ReactOs feature : call UserReleaseDC + * I don't think windows does it. + * Still, complain, no one should ever call DeleteDC + * on a window DC */ + DPRINT1("No, you naughty application!\n"); + return TRUE; + } + else + { + /* This is not a window owned DC. + * Force its deletion */ + return IntGdiDeleteDC(hDC, TRUE); + } } }

1 0

[tkreuzer] 47130: [w32knapi} Patch by Jerome Gardou: add some more tests for NtGdiDeleteObjectApp
by tkreuzer＠svn.reactos.org 08 May '10

08 May '10

Author: tkreuzer Date: Sat May 8 18:38:05 2010 New Revision: 47130 URL: http://svn.reactos.org/svn/reactos?rev=47130&view=rev Log: [w32knapi} Patch by Jerome Gardou: add some more tests for NtGdiDeleteObjectApp Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateCompatibleDC.c trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDeleteObjectApp.c Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateCompatibleDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateCompatibleDC.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateCompatibleDC.c [iso-8859-1] Sat May 8 18:38:05 2010 @@ -21,6 +21,8 @@ /* The default pen should be GetStockObject(BLACK_PEN) */ hObj = SelectObject(hDC, GetStockObject(WHITE_PEN)); TEST(hObj == GetStockObject(BLACK_PEN)); + + TEST(NtGdiDeleteObjectApp(hDC) != 0); TEST(NtGdiDeleteObjectApp(hDC) != 0); Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDeleteObjectApp.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDeleteObjectApp.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDeleteObjectApp.c [iso-8859-1] Sat May 8 18:38:05 2010 @@ -23,7 +23,27 @@ TEST(NtGdiDeleteObjectApp(hdc) == 1); TEST(GetLastError() == 0); TEST(IsHandleValid(hdc) == 0); - + + /* Delete a display DC */ + SetLastError(0); + hdc = CreateDC("DISPLAY", NULL, NULL, NULL); + ASSERT(IsHandleValid(hdc) == 1); + TEST(NtGdiDeleteObjectApp(hdc) != 0); + TEST(GetLastError() == 0); + TEST(IsHandleValid(hdc) == 1); + TEST(SelectObject(hdc, GetStockObject(WHITE_PEN)) == NULL); + TESTX(GetLastError() == ERROR_INVALID_PARAMETER, "GetLasterror returned 0x%08x\n", (unsigned int)GetLastError()); + + /* Once more */ + SetLastError(0); + hdc = GetDC(0); + ASSERT(IsHandleValid(hdc) == 1); + TEST(NtGdiDeleteObjectApp(hdc) != 0); + TEST(GetLastError() == 0); + TEST(IsHandleValid(hdc) == 1); + TEST(SelectObject(hdc, GetStockObject(WHITE_PEN)) == NULL); + TESTX(GetLastError() == ERROR_INVALID_PARAMETER, "GetLasterror returned 0x%08x\n", (unsigned int)GetLastError()); + /* Delete a display DC */ SetLastError(0); hdc = CreateDC("DISPLAY", NULL, NULL, NULL);

1 0

[ekohl] 47129: [WINLOGON] - Move environment creation to a separate file. - Impersonate the new user and create the 'Volatile Environment' key for the new user.
by ekohl＠svn.reactos.org 08 May '10

08 May '10

Author: ekohl Date: Sat May 8 18:30:56 2010 New Revision: 47129 URL: http://svn.reactos.org/svn/reactos?rev=47129&view=rev Log: [WINLOGON] - Move environment creation to a separate file. - Impersonate the new user and create the 'Volatile Environment' key for the new user. Added: trunk/reactos/base/system/winlogon/environment.c (with props) Modified: trunk/reactos/base/system/winlogon/sas.c trunk/reactos/base/system/winlogon/winlogon.h trunk/reactos/base/system/winlogon/winlogon.rbuild Added: trunk/reactos/base/system/winlogon/environment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/envir… ============================================================================== --- trunk/reactos/base/system/winlogon/environment.c (added) +++ trunk/reactos/base/system/winlogon/environment.c [iso-8859-1] Sat May 8 18:30:56 2010 @@ -1,0 +1,129 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Winlogon + * FILE: base/system/winlogon/environment.c + * PURPOSE: User environment routines + * PROGRAMMERS: Thomas Weidenmueller (w3seek(a)users.sourceforge.net) + * Hervé Poussineau (hpoussin(a)reactos.org) + * Eric Kohl + */ + +/* INCLUDES *****************************************************************/ + +#include "winlogon.h" + +#include <wine/debug.h> + +WINE_DEFAULT_DEBUG_CHANNEL(winlogon); + +/* GLOBALS ******************************************************************/ + + +/* FUNCTIONS ****************************************************************/ + +BOOL +CreateUserEnvironment(IN PWLSESSION Session, + IN LPVOID *lpEnvironment, + IN LPWSTR *lpFullEnv) +{ + LPCWSTR wstr; + SIZE_T EnvBlockSize = 0, ProfileSize = 0; + LPVOID lpEnviron = NULL; + LPWSTR lpFullEnviron = NULL; + HKEY hKey; + DWORD dwDisp; + LONG lError; + HKEY hKeyCurrentUser; + + TRACE("WL: CreateUserEnvironment called\n"); + + /* Create environment block for the user */ + if (!CreateEnvironmentBlock(&lpEnviron, + Session->UserToken, + TRUE)) + { + WARN("WL: CreateEnvironmentBlock() failed\n"); + return FALSE; + } + + if (Session->Profile->dwType == WLX_PROFILE_TYPE_V2_0 && Session->Profile->pszEnvironment) + { + /* Count required size for full environment */ + wstr = (LPCWSTR)lpEnviron; + while (*wstr != UNICODE_NULL) + { + SIZE_T size = wcslen(wstr) + 1; + wstr += size; + EnvBlockSize += size; + } + + wstr = Session->Profile->pszEnvironment; + while (*wstr != UNICODE_NULL) + { + SIZE_T size = wcslen(wstr) + 1; + wstr += size; + ProfileSize += size; + } + + /* Allocate enough memory */ + lpFullEnviron = HeapAlloc(GetProcessHeap, 0, (EnvBlockSize + ProfileSize + 1) * sizeof(WCHAR)); + if (!lpFullEnviron) + { + TRACE("HeapAlloc() failed\n"); + return FALSE; + } + + /* Fill user environment block */ + CopyMemory(lpFullEnviron, + lpEnviron, + EnvBlockSize * sizeof(WCHAR)); + CopyMemory(&lpFullEnviron[EnvBlockSize], + Session->Profile->pszEnvironment, + ProfileSize * sizeof(WCHAR)); + lpFullEnviron[EnvBlockSize + ProfileSize] = UNICODE_NULL; + } + else + { + lpFullEnviron = (LPWSTR)lpEnviron; + } + + /* Impersonate the new user */ + ImpersonateLoggedOnUser(Session->UserToken); + + /* Open the new users HKCU key */ + lError = RegOpenCurrentUser(KEY_CREATE_SUB_KEY, + &hKeyCurrentUser); + if (lError == ERROR_SUCCESS) + { + /* Create the 'Volatile Environment' key */ + lError = RegCreateKeyExW(hKeyCurrentUser, + L"Volatile Environment", + 0, + NULL, + REG_OPTION_VOLATILE, + KEY_WRITE, + NULL, + &hKey, + &dwDisp); + if (lError == ERROR_SUCCESS) + { + RegCloseKey(hKey); + } + else + { + WARN("WL: RegCreateKeyExW() failed (Error: %ld)\n", lError); + } + + RegCloseKey(hKeyCurrentUser); + } + + /* Revert the impersonation */ + RevertToSelf(); + + *lpEnvironment = lpEnviron; + *lpFullEnv = lpFullEnviron; + + TRACE("WL: CreateUserEnvironment done\n"); + + return TRUE; +} Propchange: trunk/reactos/base/system/winlogon/environment.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/winlogon/environment.c ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] Sat May 8 18:30:56 2010 @@ -171,8 +171,6 @@ PROFILEINFOW ProfileInfo; LPVOID lpEnvironment = NULL; LPWSTR lpFullEnv = NULL; - LPCWSTR wstr; - SIZE_T EnvBlockSize = 0, ProfileSize = 0; BOOLEAN Old; BOOL ret = FALSE; @@ -210,55 +208,10 @@ } /* Create environment block for the user */ - if (!CreateEnvironmentBlock( - &lpEnvironment, - Session->UserToken, - TRUE)) - { - WARN("WL: CreateEnvironmentBlock() failed\n"); - goto cleanup; - } - - if (Session->Profile->dwType == WLX_PROFILE_TYPE_V2_0 && Session->Profile->pszEnvironment) - { - /* Count required size for full environment */ - wstr = (LPCWSTR)lpEnvironment; - while (*wstr != UNICODE_NULL) - { - SIZE_T size = wcslen(wstr) + 1; - wstr += size; - EnvBlockSize += size; - } - wstr = Session->Profile->pszEnvironment; - while (*wstr != UNICODE_NULL) - { - SIZE_T size = wcslen(wstr) + 1; - wstr += size; - ProfileSize += size; - } - - /* Allocate enough memory */ - lpFullEnv = HeapAlloc(GetProcessHeap, 0, (EnvBlockSize + ProfileSize + 1) * sizeof(WCHAR)); - if (!lpFullEnv) - { - TRACE("HeapAlloc() failed\n"); - goto cleanup; - } - - /* Fill user environment block */ - CopyMemory( - lpFullEnv, - lpEnvironment, - EnvBlockSize * sizeof(WCHAR)); - CopyMemory( - &lpFullEnv[EnvBlockSize], - Session->Profile->pszEnvironment, - ProfileSize * sizeof(WCHAR)); - lpFullEnv[EnvBlockSize + ProfileSize] = UNICODE_NULL; - } - else - { - lpFullEnv = (LPWSTR)lpEnvironment; + if (!CreateUserEnvironment(Session, &lpEnvironment, &lpFullEnv)) + { + WARN("WL: SetUserEnvironment() failed\n"); + goto cleanup; } DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_APPLYINGYOURPERSONALSETTINGS); Modified: trunk/reactos/base/system/winlogon/winlogon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.h [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.h [iso-8859-1] Sat May 8 18:30:56 2010 @@ -179,6 +179,12 @@ BOOL WINAPI UpdatePerUserSystemParameters(DWORD dwUnknown, DWORD dwReserved); + +/* environment.c */ +BOOL +CreateUserEnvironment(IN PWLSESSION Session, + IN LPVOID *lpEnvironment, + IN LPWSTR *lpFullEnv); /* sas.c */ BOOL Modified: trunk/reactos/base/system/winlogon/winlogon.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.rbuild [iso-8859-1] Sat May 8 18:30:56 2010 @@ -8,6 +8,7 @@ <library>advapi32</library> <library>userenv</library> <library>secur32</library> + <file>environment.c</file> <file>sas.c</file> <file>screensaver.c</file> <file>setup.c</file>

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