Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 56211: [WIN32K] - Add EngAcquireSemaphoreShared prototype - implement RECTL_bIsWellOrdered - implement DbgLookupDHPDEV - start implementation of driver callback debug hooks
by tkreuzer＠svn.reactos.org 21 Mar '12

21 Mar '12

Author: tkreuzer Date: Wed Mar 21 20:50:04 2012 New Revision: 56211 URL: http://svn.reactos.org/svn/reactos?rev=56211&view=rev Log: [WIN32K] - Add EngAcquireSemaphoreShared prototype - implement RECTL_bIsWellOrdered - implement DbgLookupDHPDEV - start implementation of driver callback debug hooks Added: trunk/reactos/subsystems/win32/win32k/eng/drvdbg.c (with props) Modified: trunk/reactos/subsystems/win32/win32k/eng/pdevobj.c trunk/reactos/subsystems/win32/win32k/include/eng.h trunk/reactos/subsystems/win32/win32k/include/rect.h Added: trunk/reactos/subsystems/win32/win32k/eng/drvdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/drvdbg.c (added) +++ trunk/reactos/subsystems/win32/win32k/eng/drvdbg.c [iso-8859-1] Wed Mar 21 20:50:04 2012 @@ -1,0 +1,1264 @@ +/* + * PROJECT: Win32 subsystem + * LICENSE: GNU GPL, see COPYING in the top level directory + * FILE: subsystems/win32/win32k/eng/ddidbg.c + * PURPOSE: Debug hooks for display driver callbacks + * PROGRAMMERS: Timo Kreuzer + */ + +#include <win32k.h> +DBG_DEFAULT_CHANNEL(EngDev); + +PPDEVOBJ +NTAPI +DbgLookupDHPDEV(DHPDEV dhpdev); + +VOID +DbgDrvReserved(void) +{ + ASSERT(FALSE); +} + +DHPDEV +APIENTRY +DbgDrvEnablePDEV( + _In_ DEVMODEW *pdm, + _In_ LPWSTR pwszLogAddress, + ULONG cPat, + _In_opt_ HSURF *phsurfPatterns, + ULONG cjCaps, + _Out_ ULONG *pdevcaps, + ULONG cjDevInfo, + _Out_ DEVINFO *pdi, + HDEV hdev, + _In_ LPWSTR pwszDeviceName, + HANDLE hDriver) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)hdev; + + ASSERT(pdm); + ASSERT(hdev); + + return ppdev->pldev->pfn.EnablePDEV(pdm, + pwszLogAddress, + cPat, + phsurfPatterns, + cjCaps, + pdevcaps, + cjDevInfo, + pdi, + hdev, + pwszDeviceName, + hDriver); +} + +VOID +APIENTRY +DbgDrvCompletePDEV( + DHPDEV dhpdev, + HDEV hdev) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)hdev; + + ASSERT(ppdev); + + ppdev->pldev->pfn.CompletePDEV(dhpdev, hdev); +} + +VOID +APIENTRY +DbgDrvDisablePDEV( + DHPDEV dhpdev) +{ + PPDEVOBJ ppdev = DbgLookupDHPDEV(dhpdev); + + ASSERT(ppdev); + + ppdev->pldev->pfn.DisablePDEV(dhpdev); +} + +HSURF +APIENTRY +DbgDrvEnableSurface( + DHPDEV dhpdev) +{ + PPDEVOBJ ppdev = DbgLookupDHPDEV(dhpdev); + + ASSERT(ppdev); + + return ppdev->pldev->pfn.EnableSurface(dhpdev); +} + +VOID +APIENTRY +DbgDrvDisableSurface( + DHPDEV dhpdev) +{ + PPDEVOBJ ppdev = DbgLookupDHPDEV(dhpdev); + + ASSERT(ppdev); + + ppdev->pldev->pfn.DisableSurface(dhpdev); +} + +BOOL +APIENTRY +DbgDrvAssertMode( + _In_ DHPDEV dhpdev, + _In_ BOOL bEnable) +{ + PPDEVOBJ ppdev = DbgLookupDHPDEV(dhpdev); + + ASSERT(ppdev); + + return ppdev->pldev->pfn.AssertMode(dhpdev, bEnable); +} + +BOOL +APIENTRY +DbgDrvOffset( + SURFOBJ* pso, + LONG x1, + LONG x2, + FLONG fl) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)pso->hdev; + + ASSERT(FALSE); + return 0; +} + +ULONG +APIENTRY +DbgDrvResetPDEV( + DHPDEV dhpdev, + PVOID Reserved) +{ + PPDEVOBJ ppdev = DbgLookupDHPDEV(dhpdev); + + ASSERT(ppdev); + + return ppdev->pldev->pfn.ResetDevice(dhpdev, Reserved); +} + +VOID +APIENTRY +DbgDrvDisableDriver(void) +{ + ASSERT(FALSE); +} + +HBITMAP +APIENTRY +DbgDrvCreateDeviceBitmap( + DHPDEV dhpdev, + SIZEL sizl, + ULONG iFormat) +{ + PPDEVOBJ ppdev = DbgLookupDHPDEV(dhpdev); + + ASSERT(ppdev); + + return ppdev->pldev->pfn.CreateDeviceBitmap(dhpdev, sizl, iFormat); +} + +VOID +APIENTRY +DbgDrvDeleteDeviceBitmap( + DHSURF dhsurf) +{ + ASSERT(FALSE); +} + +BOOL +APIENTRY +DbgDrvRealizeBrush( + _In_ BRUSHOBJ *pbo, + _Inout_ SURFOBJ *psoTarget, + _In_ SURFOBJ *psoPattern, + _In_opt_ SURFOBJ *psoMask, + _In_ XLATEOBJ *pxlo, + _In_ ULONG iHatch) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)psoTarget->hdev; + ASSERT(FALSE); + return 0; +} + +ULONG +APIENTRY +DbgDrvDitherColor( + _In_ DHPDEV dhpdev, + _In_ ULONG iMode, + _In_ ULONG rgb, + _Inout_ ULONG *pul) +{ + PPDEVOBJ ppdev = DbgLookupDHPDEV(dhpdev); + + ASSERT(ppdev); + + return ppdev->pldev->pfn.DitherColor(dhpdev, iMode, rgb, pul); +} + +BOOL +APIENTRY +DbgDrvStrokePath( + _Inout_ SURFOBJ *pso, + _In_ PATHOBJ *ppo, + _In_ CLIPOBJ *pco, + _In_opt_ XFORMOBJ *pxo, + _In_ BRUSHOBJ *pbo, + _In_ POINTL *pptlBrushOrg, + _In_ LINEATTRS *plineattrs, + _In_ MIX mix) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)pso->hdev; + ASSERT(FALSE); + return 0; +} + +BOOL +APIENTRY +DbgDrvFillPath( + _Inout_ SURFOBJ *pso, + _In_ PATHOBJ *ppo, + _In_ CLIPOBJ *pco, + _In_ BRUSHOBJ *pbo, + _In_ POINTL *pptlBrushOrg, + _In_ MIX mix, + _In_ FLONG flOptions) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)pso->hdev; + ASSERT(FALSE); + return 0; +} + +BOOL +APIENTRY +DbgDrvStrokeAndFillPath( + _Inout_ SURFOBJ *pso, + _Inout_ PATHOBJ *ppo, + _In_ CLIPOBJ *pco, + _In_opt_ XFORMOBJ *pxo, + _In_ BRUSHOBJ *pboStroke, + _In_ LINEATTRS *plineattrs, + _In_ BRUSHOBJ *pboFill, + _In_ POINTL *pptlBrushOrg, + _In_ MIX mixFill, + _In_ FLONG flOptions) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)pso->hdev; + ASSERT(FALSE); + return 0; +} + +BOOL +APIENTRY +DbgDrvPaint( + IN SURFOBJ *pso, + IN CLIPOBJ *pco, + IN BRUSHOBJ *pbo, + IN POINTL *pptlBrushOrg, + IN MIX mix) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)pso->hdev; + return 0; +} + +BOOL +APIENTRY +DbgDrvBitBlt( + _Inout_ SURFOBJ *psoTrg, + _In_opt_ SURFOBJ *psoSrc, + _In_opt_ SURFOBJ *psoMask, + _In_opt_ CLIPOBJ *pco, + _In_opt_ XLATEOBJ *pxlo, + _In_ RECTL *prclTrg, + _When_(psoSrc, _In_) POINTL *pptlSrc, + _When_(psoMask, _In_) POINTL *pptlMask, + _In_opt_ BRUSHOBJ *pbo, + _When_(pbo, _In_) POINTL *pptlBrush, + _In_ ROP4 rop4) +{ + PSURFACE psurfTrg = CONTAINING_RECORD(psoTrg, SURFACE, SurfObj); + PSURFACE psurfSrc = CONTAINING_RECORD(psoSrc, SURFACE, SurfObj); + PPDEVOBJ ppdev; + + /* Get the right BitBlt function */ + if (psurfTrg->flags & HOOK_BITBLT) + { + ppdev = (PPDEVOBJ)psoTrg->hdev; + } + else + { + ASSERT(ROP4_USES_SOURCE(rop4)); + ASSERT(psurfSrc->flags & HOOK_BITBLT); + ppdev = (PPDEVOBJ)psoSrc->hdev; + } + + /* Sanity checks */ + ASSERT(IS_VALID_ROP4(rop4)); + ASSERT(psoTrg); + ASSERT(psoTrg->iBitmapFormat >= BMF_1BPP); + ASSERT(psoTrg->iBitmapFormat <= BMF_32BPP); + ASSERT(prclTrg); + ASSERT(prclTrg->left >= 0); + ASSERT(prclTrg->top >= 0); + ASSERT(prclTrg->right <= psoTrg->sizlBitmap.cx); + ASSERT(prclTrg->bottom <= psoTrg->sizlBitmap.cy); + ASSERT(RECTL_bIsWellOrdered(prclTrg)); + + if (ROP4_USES_SOURCE(rop4)) + { + ASSERT(psoSrc); + ASSERT(psoSrc->iBitmapFormat >= BMF_1BPP); + ASSERT(psoSrc->iBitmapFormat <= BMF_8RLE); + ASSERT(pptlSrc); + ASSERT(pptlSrc->x >= 0); + ASSERT(pptlSrc->y >= 0); + ASSERT(pptlSrc->x <= psoTrg->sizlBitmap.cx); + ASSERT(pptlSrc->y <= psoTrg->sizlBitmap.cy); + } + + if (ROP4_USES_MASK(rop4)) + { + ASSERT(psoMask); + ASSERT(psoMask->iBitmapFormat == BMF_1BPP); + ASSERT(pptlMask); + ASSERT(pptlMask->x >= 0); + ASSERT(pptlMask->y >= 0); + ASSERT(pptlMask->x <= psoMask->sizlBitmap.cx); + ASSERT(pptlMask->y <= psoMask->sizlBitmap.cy); + + } + + if (ROP4_USES_PATTERN(rop4)) + { + ASSERT(pbo); + ASSERT(pptlBrush); + } + + + return ppdev->pldev->pfn.BitBlt(psoTrg, + psoSrc, + psoMask, + pco, + pxlo, + prclTrg, + pptlSrc, + pptlMask, + pbo, + pptlBrush, + rop4); +} + +BOOL +APIENTRY +DbgDrvCopyBits( + SURFOBJ *psoTrg, + SURFOBJ *psoSrc, + CLIPOBJ *pco, + XLATEOBJ *pxlo, + RECTL *prclTrg, + POINTL *pptlSrc) +{ + PSURFACE psurfTrg = CONTAINING_RECORD(psoTrg, SURFACE, SurfObj); + PSURFACE psurfSrc = CONTAINING_RECORD(psoSrc, SURFACE, SurfObj); + PPDEVOBJ ppdev; + + /* Get the right BitBlt function */ + if (psurfTrg->flags & HOOK_COPYBITS) + { + ppdev = (PPDEVOBJ)psoTrg->hdev; + } + else + { + ASSERT(psurfSrc->flags & HOOK_COPYBITS); + ppdev = (PPDEVOBJ)psoSrc->hdev; + } + + return ppdev->pldev->pfn.CopyBits(psoTrg, + psoSrc, + pco, + pxlo, + prclTrg, + pptlSrc); + +} + +BOOL +APIENTRY +DbgDrvStretchBlt( + _Inout_ SURFOBJ *psoTrg, + _Inout_ SURFOBJ *psoSrc, + _In_opt_ SURFOBJ *psoMask, + _In_ CLIPOBJ *pco, + _In_opt_ XLATEOBJ *pxlo, + _In_opt_ COLORADJUSTMENT *pca, + _In_ POINTL *pptlHTOrg, + _In_ RECTL *prclDest, + _In_ RECTL *prclSrc, + _In_opt_ POINTL *pptlMask, + _In_ ULONG iMode) +{ + PSURFACE psurfTrg = CONTAINING_RECORD(psoTrg, SURFACE, SurfObj); + PSURFACE psurfSrc = CONTAINING_RECORD(psoSrc, SURFACE, SurfObj); + + return 0; +} + +BOOL +APIENTRY +DbgDrvSetPalette( + DHPDEV dhpdev, + PALOBJ *ppalo, + FLONG fl, + ULONG iStart, + ULONG cColors) +{ + PPDEVOBJ ppdev = DbgLookupDHPDEV(dhpdev); + + ASSERT(ppdev); + + return ppdev->pldev->pfn.SetPalette(dhpdev, ppalo, fl, iStart, cColors); +} + +BOOL +APIENTRY +DbgDrvTextOut( + SURFOBJ *pso, + STROBJ *pstro, + FONTOBJ *pfo, + CLIPOBJ *pco, + RECTL *prclExtra , + RECTL *prclOpaque, + BRUSHOBJ *pboFore, + BRUSHOBJ *pboOpaque, + POINTL *pptlOrg, + MIX mix) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)pso->hdev; + return 0; +} + +ULONG +APIENTRY +DbgDrvEscape( + _In_ SURFOBJ *pso, + _In_ ULONG iEsc, + _In_ ULONG cjIn, + _In_ PVOID pvIn, + _In_ ULONG cjOut, + _Out_ PVOID pvOut) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)pso->hdev; + return 0; +} + +ULONG +APIENTRY +DbgDrvDrawEscape( + _In_ SURFOBJ *pso, + _In_ ULONG iEsc, + _In_ CLIPOBJ *pco, + _In_ RECTL *prcl, + _In_ ULONG cjIn, + _In_ PVOID pvIn) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)pso->hdev; + return 0; +} + +PIFIMETRICS +APIENTRY +DbgDrvQueryFont( + DHPDEV dhpdev, + ULONG_PTR iFile, + ULONG iFace, + ULONG_PTR *pid) +{ + PPDEVOBJ ppdev = DbgLookupDHPDEV(dhpdev); + + ASSERT(ppdev); + + return ppdev->pldev->pfn.QueryFont(dhpdev, iFile, iFace, pid); +} + +PVOID +APIENTRY +DbgDrvQueryFontTree( + DHPDEV dhpdev, + ULONG_PTR iFile, + ULONG iFace, + ULONG iMode, + ULONG_PTR *pid) +{ + return 0; +} + +LONG +APIENTRY +DbgDrvQueryFontData( + DHPDEV dhpdev, + FONTOBJ *pfo, + ULONG iMode, + HGLYPH hg, + GLYPHDATA *pgd, + _Out_ PVOID pv, + ULONG cjSize) +{ + PPDEVOBJ ppdev = DbgLookupDHPDEV(dhpdev); + + ASSERT(ppdev); + + return ppdev->pldev->pfn.QueryFontData(dhpdev, pfo, iMode, hg, pgd, pv, cjSize); +} + +ULONG +APIENTRY +DbgDrvSetPointerShape( + _In_ SURFOBJ *pso, + _In_ SURFOBJ *psoMask, + _In_ SURFOBJ *psoColor, + _In_ XLATEOBJ *pxlo, + _In_ LONG xHot, + _In_ LONG yHot, + _In_ LONG x, + _In_ LONG y, + _In_ RECTL *prcl, + _In_ FLONG fl) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)pso->hdev; + return 0; +} + +VOID +APIENTRY +DbgDrvMovePointer( + _In_ SURFOBJ *pso, + _In_ LONG x, + _In_ LONG y, + _In_ RECTL *prcl) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)pso->hdev; +} + +BOOL +APIENTRY +DbgDrvLineTo( + SURFOBJ *pso, + CLIPOBJ *pco, + BRUSHOBJ *pbo, + LONG x1, + LONG y1, + LONG x2, + LONG y2, + RECTL *prclBounds, + MIX mix) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)pso->hdev; + return 0; +} + +BOOL +APIENTRY +DbgDrvSendPage( + _In_ SURFOBJ *pso) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)pso->hdev; + return 0; +} + +BOOL +APIENTRY +DbgDrvStartPage( + _In_ SURFOBJ *pso) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)pso->hdev; + return 0; +} + +BOOL +APIENTRY +DbgDrvEndDoc( + _In_ SURFOBJ *pso, + _In_ FLONG fl) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)pso->hdev; + return 0; +} + +BOOL +APIENTRY +DbgDrvStartDoc( + _In_ SURFOBJ *pso, + _In_ LPWSTR pwszDocName, + _In_ DWORD dwJobId) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)pso->hdev; + return 0; +} + +ULONG +APIENTRY +DbgDrvGetGlyphMode( + _In_ DHPDEV dhpdev, + _In_ FONTOBJ *pfo) +{ + PPDEVOBJ ppdev = DbgLookupDHPDEV(dhpdev); + + ASSERT(ppdev); + + return ppdev->pldev->pfn.GetGlyphMode(dhpdev, pfo); +} + +VOID +APIENTRY +DbgDrvSynchronize( + DHPDEV dhpdev, + RECTL *prcl) +{ + PPDEVOBJ ppdev = DbgLookupDHPDEV(dhpdev); + + ASSERT(ppdev); + + ppdev->pldev->pfn.Synchronize(dhpdev, prcl); +} + +ULONG_PTR +APIENTRY +DbgDrvSaveScreenBits( + SURFOBJ *pso, + ULONG iMode, + ULONG_PTR ident, + RECTL *prcl) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)pso->hdev; + return 0; +} + +ULONG +APIENTRY +DbgDrvGetModes( + _In_ HANDLE hDriver, + ULONG cjSize, + _Out_opt_ DEVMODEW *pdm) +{ + return 0; +} + +VOID +APIENTRY +DbgDrvFree( + PVOID pv, + ULONG_PTR id) +{ +} + +VOID +APIENTRY +DbgDrvDestroyFont( + FONTOBJ *pfo) +{ +} + +LONG +APIENTRY +DbgDrvQueryFontCaps( + ULONG culCaps, + ULONG *pulCaps) +{ + return 0; +} + +ULONG_PTR +APIENTRY +DbgDrvLoadFontFile( + ULONG cFiles, + ULONG_PTR *piFile, + PVOID *ppvView, + ULONG *pcjView, + DESIGNVECTOR *pdv, + ULONG ulLangID, + ULONG ulFastCheckSum) +{ + return 0; +} + +BOOL +APIENTRY +DbgDrvUnloadFontFile( + ULONG_PTR iFile) +{ + return 0; +} + +ULONG +APIENTRY +DbgDrvFontManagement( + _In_ SURFOBJ *pso, + _In_opt_ FONTOBJ *pfo, + _In_ ULONG iMode, + _In_ ULONG cjIn, + _In_ PVOID pvIn, + _In_ ULONG cjOut, + _Out_ PVOID pvOut) +{ + return 0; +} + +LONG +APIENTRY +DbgDrvQueryTrueTypeTable( + ULONG_PTR iFile, + ULONG ulFont, + ULONG ulTag, + PTRDIFF dpStart, + ULONG cjBuf, + BYTE *pjBuf, + PBYTE *ppjTable, + ULONG *pcjTable) +{ + return 0; +} + +LONG +APIENTRY +DbgDrvQueryTrueTypeOutline( + DHPDEV dhpdev, + FONTOBJ *pfo, + HGLYPH hglyph, + BOOL bMetricsOnly, + GLYPHDATA *pgldt, + ULONG cjBuf, + TTPOLYGONHEADER *ppoly) +{ + PPDEVOBJ ppdev = DbgLookupDHPDEV(dhpdev); + return 0; +} + +PVOID +APIENTRY +DbgDrvGetTrueTypeFile( + ULONG_PTR iFile, + ULONG *pcj) +{ + return 0; +} + +LONG +APIENTRY +DbgDrvQueryFontFile( + ULONG_PTR iFile, + ULONG ulMode, + ULONG cjBuf, + ULONG *pulBuf) +{ + return 0; +} + +VOID +APIENTRY +DbgDrvMovePanning( + LONG x, + LONG y, + FLONG fl) +{ + ERR("Obsolete driver function %s called!\n", __FUNCTION__); + ASSERT(FALSE); +} + +BOOL +APIENTRY +DbgDrvQueryAdvanceWidths( + DHPDEV dhpdev, + FONTOBJ *pfo, + ULONG iMode, + _In_ HGLYPH *phg, + _Out_ PVOID pvWidths, + ULONG cGlyphs) +{ + PPDEVOBJ ppdev = DbgLookupDHPDEV(dhpdev); + return 0; +} + +BOOL +APIENTRY +DbgDrvSetPixelFormat( + SURFOBJ *pso, + LONG iPixelFormat, + HWND hwnd) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)pso->hdev; + return 0; +} + +LONG +APIENTRY +DbgDrvDescribePixelFormat( + DHPDEV dhpdev, + LONG iPixelFormat, + ULONG cjpfd, + PIXELFORMATDESCRIPTOR *ppfd) +{ + PPDEVOBJ ppdev = DbgLookupDHPDEV(dhpdev); + + ASSERT(ppdev); + + return ppdev->pldev->pfn.DescribePixelFormat(dhpdev, iPixelFormat, cjpfd, ppfd); +} + +BOOL +APIENTRY +DbgDrvSwapBuffers( + SURFOBJ *pso, + WNDOBJ *pwo) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)pso->hdev; + return 0; +} + +BOOL +APIENTRY +DbgDrvStartBanding( + _In_ SURFOBJ *pso, + _In_ POINTL *pptl) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)pso->hdev; + return 0; +} + +BOOL +APIENTRY +DbgDrvNextBand( + _In_ SURFOBJ *pso, + _In_ POINTL *pptl) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)pso->hdev; + return 0; +} + +BOOL +APIENTRY +DbgDrvGetDirectDrawInfo( + DHPDEV dhpdev, + DD_HALINFO *pHalInfo, + DWORD *pdwNumHeaps, + VIDEOMEMORY *pvmList, + DWORD *pdwNumFourCCCodes, + DWORD *pdwFourCC) +{ + PPDEVOBJ ppdev = DbgLookupDHPDEV(dhpdev); + + ASSERT(ppdev); + + return ppdev->pldev->pfn.GetDirectDrawInfo(dhpdev, + pHalInfo, + pdwNumHeaps, + pvmList, + pdwNumFourCCCodes, + pdwFourCC); +} + +BOOL +APIENTRY +DbgDrvEnableDirectDraw( + DHPDEV dhpdev, + DD_CALLBACKS *pCallBacks, + DD_SURFACECALLBACKS *pSurfaceCallBacks, + DD_PALETTECALLBACKS *pPaletteCallBacks) +{ + PPDEVOBJ ppdev = DbgLookupDHPDEV(dhpdev); + + ASSERT(ppdev); + + return ppdev->pldev->pfn.EnableDirectDraw(dhpdev, + pCallBacks, + pSurfaceCallBacks, + pPaletteCallBacks); +} + +VOID +APIENTRY +DbgDrvDisableDirectDraw( + DHPDEV dhpdev) +{ + PPDEVOBJ ppdev = DbgLookupDHPDEV(dhpdev); + + ASSERT(ppdev); + + ppdev->pldev->pfn.DisableDirectDraw(dhpdev); +} + +BOOL +APIENTRY +DbgDrvQuerySpoolType(DHPDEV PDev, LPWSTR SpoolType) +{ + ERR("Obsolete driver function %s called!\n", __FUNCTION__); + ASSERT(FALSE); + return 0; +} + +HANDLE +APIENTRY +DbgDrvIcmCreateColorTransform( + _In_ DHPDEV dhpdev, + _In_ LPLOGCOLORSPACEW pLogColorSpace, + _In_opt_ PVOID pvSourceProfile, + _In_ ULONG cjSourceProfile, + _In_ PVOID pvDestProfile, + _In_ ULONG cjDestProfile, + _In_opt_ PVOID pvTargetProfile, + _In_ ULONG cjTargetProfile, + _In_ DWORD dwReserved) +{ + PPDEVOBJ ppdev = DbgLookupDHPDEV(dhpdev); + + ASSERT(ppdev); + + return ppdev->pldev->pfn.IcmCreateColorTransform(dhpdev, + pLogColorSpace, + pvSourceProfile, + cjSourceProfile, + pvDestProfile, + cjDestProfile, + pvTargetProfile, + cjTargetProfile, + dwReserved); +} + +BOOL +APIENTRY +DbgDrvIcmDeleteColorTransform( + _In_ DHPDEV dhpdev, + _In_ HANDLE hcmXform) +{ + PPDEVOBJ ppdev = DbgLookupDHPDEV(dhpdev); + + ASSERT(ppdev); + + return ppdev->pldev->pfn.IcmDeleteColorTransform(dhpdev, hcmXform); +} + +BOOL +APIENTRY +DbgDrvIcmCheckBitmapBits( + DHPDEV dhpdev, + HANDLE hColorTransform, + SURFOBJ *pso, + PBYTE paResults) +{ + PPDEVOBJ ppdev = DbgLookupDHPDEV(dhpdev); + + ASSERT(ppdev); + + return ppdev->pldev->pfn.IcmCheckBitmapBits(dhpdev, + hColorTransform, + pso, + paResults); +} + +BOOL +APIENTRY +DbgDrvIcmSetDeviceGammaRamp( + DHPDEV dhpdev, + ULONG iFormat, + LPVOID lpRamp) +{ + PPDEVOBJ ppdev = DbgLookupDHPDEV(dhpdev); + + ASSERT(ppdev); + + return ppdev->pldev->pfn.IcmSetDeviceGammaRamp(dhpdev, iFormat, lpRamp); +} + +BOOL +APIENTRY +DbgDrvGradientFill( + _Inout_ SURFOBJ *psoTrg, + _In_ CLIPOBJ *pco, + _In_opt_ XLATEOBJ *pxlo, + _In_ TRIVERTEX *pVertex, + _In_ ULONG nVertex, + _In_ PVOID pMesh, + _In_ ULONG nMesh, + _In_ RECTL *prclExtents, + _In_ POINTL *pptlDitherOrg, + _In_ ULONG ulMode) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)psoTrg->hdev; + return 0; +} + +BOOL +APIENTRY +DbgDrvStretchBltROP( + _Inout_ SURFOBJ *psoTrg, + _Inout_ SURFOBJ *psoSrc, + _In_opt_ SURFOBJ *psoMask, + _In_ CLIPOBJ *pco, + _In_opt_ XLATEOBJ *pxlo, + _In_opt_ COLORADJUSTMENT *pca, + _In_ POINTL *pptlHTOrg, + _In_ RECTL *prclDest, + _In_ RECTL *prclSrc, + _In_opt_ POINTL *pptlMask, + _In_ ULONG iMode, + _In_ BRUSHOBJ *pbo, + _In_ DWORD rop4) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)psoTrg->hdev; + return 0; +} + +BOOL +APIENTRY +DbgDrvPlgBlt( + _Inout_ SURFOBJ *psoTrg, + _Inout_ SURFOBJ *psoSrc, + _In_opt_ SURFOBJ *psoMsk, + _In_ CLIPOBJ *pco, + _In_opt_ XLATEOBJ *pxlo, + _In_opt_ COLORADJUSTMENT *pca, + _In_opt_ POINTL *pptlBrushOrg, + _In_ POINTFIX *pptfx, + _In_ RECTL *prcl, + _In_opt_ POINTL *pptl, + _In_ ULONG iMode) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)psoTrg->hdev; + return 0; +} + +BOOL +APIENTRY +DbgDrvAlphaBlend( + _Inout_ SURFOBJ *psoDest, + _In_ SURFOBJ *psoSrc, + _In_ CLIPOBJ *pco, + _In_opt_ XLATEOBJ *pxlo, + _In_ RECTL *prclDest, + _In_ RECTL *prclSrc, + _In_ BLENDOBJ *pBlendObj) +{ + return 0; +} + +VOID +APIENTRY +DbgSynthesizeFont(void) +{ + ASSERT(FALSE); +} + +VOID +APIENTRY +DbgGetSynthesizedFontFiles(void) +{ + ASSERT(FALSE); +} + +BOOL +APIENTRY +DbgDrvTransparentBlt( + _Inout_ SURFOBJ *psoTrg, + _In_ SURFOBJ *psoSrc, + _In_ CLIPOBJ *pco, + _In_opt_ XLATEOBJ *pxlo, + _In_ RECTL *prclDst, + _In_ RECTL *prclSrc, + _In_ ULONG iTransColor, + _In_ ULONG ulReserved) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)psoTrg->hdev; + return 0; +} + +ULONG +APIENTRY +DbgDrvQueryPerBandInfo( + _In_ SURFOBJ *pso, + _Inout_ PERBANDINFO *pbi) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)pso->hdev; + return 0; +} + +BOOL +APIENTRY +DbgDrvQueryDeviceSupport( + SURFOBJ *pso, + XLATEOBJ *pxlo, + XFORMOBJ *pxo, + ULONG iType, + ULONG cjIn, + _In_ PVOID pvIn, + ULONG cjOut, + _Out_ PVOID pvOut) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)pso->hdev; + ASSERT(ppdev); + + return ppdev->pldev->pfn.QueryDeviceSupport(pso, + pxlo, + (PVOID)pxo, // FIXME!!! + iType, + cjIn, + pvIn, + cjOut, + pvOut); +} + +HBITMAP +APIENTRY +DbgDrvDeriveSurface( + DD_DIRECTDRAW_GLOBAL *pDirectDraw, + DD_SURFACE_LOCAL *pSurface) +{ + return 0; +} + +PFD_GLYPHATTR +APIENTRY +DbgDrvQueryGlyphAttrs( + _In_ FONTOBJ *pfo, + _In_ ULONG iMode) +{ + return 0; +} + +VOID +APIENTRY +DbgDrvNotify( + SURFOBJ *pso, + ULONG iType, + PVOID pvData) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)pso->hdev; + ASSERT(ppdev); + + ppdev->pldev->pfn.Notify(pso, iType, pvData); +} + +VOID +APIENTRY +DbgDrvSynchronizeSurface( + SURFOBJ *pso, + RECTL *prcl, + FLONG fl) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)pso->hdev; + ASSERT(ppdev); + + ppdev->pldev->pfn.SynchronizeSurface(pso, prcl, fl); +} + +ULONG +APIENTRY +DbgDrvResetDevice( + DHPDEV dhpdev, + PVOID Reserved) +{ + PPDEVOBJ ppdev = DbgLookupDHPDEV(dhpdev); + ASSERT(ppdev); + + return ppdev->pldev->pfn.ResetDevice(dhpdev, Reserved); +} + +PVOID +apfnDbgDrvFunctions[] = +{ + DbgDrvEnablePDEV, + DbgDrvCompletePDEV, + DbgDrvDisablePDEV, + DbgDrvEnableSurface, + DbgDrvDisableSurface, + DbgDrvAssertMode, + DbgDrvOffset, + DbgDrvResetPDEV, + NULL, //DbgDrvDisableDriver, + DbgDrvReserved, // Unknown1 + DbgDrvCreateDeviceBitmap, + NULL, //DbgDrvDeleteDeviceBitmap, + DbgDrvRealizeBrush, + DbgDrvDitherColor, + DbgDrvStrokePath, + DbgDrvFillPath, + DbgDrvStrokeAndFillPath, + DbgDrvPaint, + DbgDrvBitBlt, + NULL, //DbgDrvCopyBits, + NULL, //DbgDrvStretchBlt, + DbgDrvReserved, + DbgDrvSetPalette, + NULL, //DbgDrvTextOut, + NULL, //DbgDrvEscape, + NULL, //DbgDrvDrawEscape, + DbgDrvQueryFont, + NULL, //DbgDrvQueryFontTree, + DbgDrvQueryFontData, + NULL, //DbgDrvSetPointerShape, + NULL, //DbgDrvMovePointer, + NULL, //DbgDrvLineTo, + NULL, //DbgDrvSendPage, + NULL, //DbgDrvStartPage, + NULL, //DbgDrvEndDoc, + NULL, //DbgDrvStartDoc, + DbgDrvReserved, + DbgDrvGetGlyphMode, + DbgDrvSynchronize, + DbgDrvReserved, + NULL, //DbgDrvSaveScreenBits, + NULL, //DbgDrvGetModes, + NULL, //DbgDrvFree, + NULL, //DbgDrvDestroyFont, + NULL, //DbgDrvQueryFontCaps, + NULL, //DbgDrvLoadFontFile, + NULL, //DbgDrvUnloadFontFile, + NULL, //DbgDrvFontManagement, + NULL, //DbgDrvQueryTrueTypeTable, + NULL, //DbgDrvQueryTrueTypeOutline, + NULL, //DbgDrvGetTrueTypeFile, + NULL, //DbgDrvQueryFontFile, + DbgDrvMovePanning, + NULL, //DbgDrvQueryAdvanceWidths, + NULL, //DbgDrvSetPixelFormat, + DbgDrvDescribePixelFormat, + NULL, //DbgDrvSwapBuffers, + NULL, //DbgDrvStartBanding, + NULL, //DbgDrvNextBand, + DbgDrvGetDirectDrawInfo, + DbgDrvEnableDirectDraw, + DbgDrvDisableDirectDraw, + DbgDrvQuerySpoolType, + DbgDrvReserved, + DbgDrvIcmCreateColorTransform, + DbgDrvIcmDeleteColorTransform, + DbgDrvIcmCheckBitmapBits, + DbgDrvIcmSetDeviceGammaRamp, + NULL, //DbgDrvGradientFill, + NULL, //DbgDrvStretchBltROP, + NULL, //DbgDrvPlgBlt, + NULL, //DbgDrvAlphaBlend, + NULL, //DbgSynthesizeFont, + NULL, //DbgGetSynthesizedFontFiles, + NULL, //DbgDrvTransparentBlt, + NULL, //DbgDrvQueryPerBandInfo, + DbgDrvQueryDeviceSupport, + DbgDrvReserved, + DbgDrvReserved, + DbgDrvReserved, + DbgDrvReserved, + DbgDrvReserved, + DbgDrvReserved, + DbgDrvReserved, + DbgDrvReserved, + NULL, //DbgDrvDeriveSurface, + NULL, //DbgDrvQueryGlyphAttrs, + DbgDrvNotify, + DbgDrvSynchronizeSurface, + DbgDrvResetDevice, + DbgDrvReserved, + DbgDrvReserved, + DbgDrvReserved +}; Propchange: trunk/reactos/subsystems/win32/win32k/eng/drvdbg.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/subsystems/win32/win32k/eng/pdevobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/pdevobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/pdevobj.c [iso-8859-1] Wed Mar 21 20:50:04 2012 @@ -25,6 +25,29 @@ return STATUS_SUCCESS; } +#if DBG +PPDEVOBJ +NTAPI +DbgLookupDHPDEV(DHPDEV dhpdev) +{ + PPDEVOBJ ppdev; + + /* Lock PDEV list */ + EngAcquireSemaphoreShared(ghsemPDEV); + + /* Walk through the list of PDEVs */ + for (ppdev = gppdevList; ppdev; ppdev = ppdev->ppdevNext) + { + /* Compare with the given DHPDEV */ + if (ppdev->dhpdev == dhpdev) break; + } + + /* Unlock PDEV list */ + EngReleaseSemaphore(ghsemPDEV); + + return ppdev; +} +#endif PPDEVOBJ PDEVOBJ_AllocPDEV() @@ -803,7 +826,7 @@ return NULL; /* Lock PDEV list */ - EngAcquireSemaphore(ghsemPDEV); + EngAcquireSemaphoreShared(ghsemPDEV); /* Walk through the list of PDEVs */ for (ppdev = gppdevList; ppdev; ppdev = ppdev->ppdevNext) Modified: trunk/reactos/subsystems/win32/win32k/include/eng.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/eng.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/eng.h [iso-8859-1] Wed Mar 21 20:50:04 2012 @@ -1,4 +1,9 @@ #pragma once + +VOID +NTAPI +EngAcquireSemaphoreShared( + IN HSEMAPHORE hsem); BOOL APIENTRY IntEngMaskBlt(SURFOBJ *psoDest, Modified: trunk/reactos/subsystems/win32/win32k/include/rect.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/rect.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/rect.h [iso-8859-1] Wed Mar 21 20:50:04 2012 @@ -46,6 +46,14 @@ } BOOL +FORCEINLINE +RECTL_bIsWellOrdered(const RECTL *prcl) +{ + return ((prcl->left <= prcl->right) && + (prcl->top <= prcl->bottom)); +} + +BOOL FASTCALL RECTL_bUnionRect(RECTL *prclDst, const RECTL *prcl1, const RECTL *prcl2); @@ -57,6 +65,6 @@ FASTCALL RECTL_vMakeWellOrdered(RECTL *prcl); -VOID +VOID FASTCALL RECTL_vInflateRect(RECTL *rect, INT dx, INT dy);

1 0

[tfaber] 56210: [USP10] - Apply fixes from Wine 1.4. Fixes invalid free in notepad and other edit control users See issue #6966 for more details.
by tfaber＠svn.reactos.org 21 Mar '12

21 Mar '12

Author: tfaber Date: Wed Mar 21 20:39:41 2012 New Revision: 56210 URL: http://svn.reactos.org/svn/reactos?rev=56210&view=rev Log: [USP10] - Apply fixes from Wine 1.4. Fixes invalid free in notepad and other edit control users See issue #6966 for more details. Modified: trunk/reactos/dll/win32/usp10/opentype.c trunk/reactos/dll/win32/usp10/shape.c trunk/reactos/dll/win32/usp10/usp10.c trunk/reactos/dll/win32/usp10/usp10_internal.h trunk/reactos/dll/win32/usp10/usp10_ros.diff trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/usp10/opentype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/opentype.c… ============================================================================== --- trunk/reactos/dll/win32/usp10/opentype.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/opentype.c [iso-8859-1] Wed Mar 21 20:39:41 2012 @@ -438,9 +438,12 @@ int char_count = 0; int k; - for (k = 0; k < cChars; k++) - if (pwLogClust[k] == i) + k = USP10_FindGlyphInLogClust(pwLogClust, cChars, i); + if (k >= 0) + { + for (; k < cChars && pwLogClust[k] == i; k++) char_count++; + } class = GDEF_get_glyph_class(psc->GDEF_Table, pwGlyphs[i]); @@ -868,12 +871,15 @@ script = (const GSUB_ScriptList*)((const BYTE*)header + GET_BE_WORD(header->ScriptList)); psc->script_count = GET_BE_WORD(script->ScriptCount); TRACE("initializing %i scripts in this font\n",psc->script_count); - psc->scripts = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(LoadedScript) * psc->script_count); - for (i = 0; i < psc->script_count; i++) - { - int offset = GET_BE_WORD(script->ScriptRecord[i].Script); - psc->scripts[i].tag = MS_MAKE_TAG(script->ScriptRecord[i].ScriptTag[0], script->ScriptRecord[i].ScriptTag[1], script->ScriptRecord[i].ScriptTag[2], script->ScriptRecord[i].ScriptTag[3]); - psc->scripts[i].table = ((const BYTE*)script + offset); + if (psc->script_count) + { + psc->scripts = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(LoadedScript) * psc->script_count); + for (i = 0; i < psc->script_count; i++) + { + int offset = GET_BE_WORD(script->ScriptRecord[i].Script); + psc->scripts[i].tag = MS_MAKE_TAG(script->ScriptRecord[i].ScriptTag[0], script->ScriptRecord[i].ScriptTag[1], script->ScriptRecord[i].ScriptTag[2], script->ScriptRecord[i].ScriptTag[3]); + psc->scripts[i].table = ((const BYTE*)script + offset); + } } } } @@ -923,15 +929,18 @@ script->default_language.tag = MS_MAKE_TAG('d','f','l','t'); script->default_language.table = (const BYTE*)table + GET_BE_WORD(table->DefaultLangSys); - TRACE("Deflang %p, LangCount %i\n",script->default_language.table, script->language_count); - - script->languages = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LoadedLanguage) * script->language_count); - - for (i = 0; i < script->language_count; i++) - { - int offset = GET_BE_WORD(table->LangSysRecord[i].LangSys); - script->languages[i].tag = MS_MAKE_TAG(table->LangSysRecord[i].LangSysTag[0], table->LangSysRecord[i].LangSysTag[1], table->LangSysRecord[i].LangSysTag[2], table->LangSysRecord[i].LangSysTag[3]); - script->languages[i].table = ((const BYTE*)table + offset); + if (script->language_count) + { + TRACE("Deflang %p, LangCount %i\n",script->default_language.table, script->language_count); + + script->languages = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LoadedLanguage) * script->language_count); + + for (i = 0; i < script->language_count; i++) + { + int offset = GET_BE_WORD(table->LangSysRecord[i].LangSys); + script->languages[i].tag = MS_MAKE_TAG(table->LangSysRecord[i].LangSysTag[0], table->LangSysRecord[i].LangSysTag[1], table->LangSysRecord[i].LangSysTag[2], table->LangSysRecord[i].LangSysTag[3]); + script->languages[i].table = ((const BYTE*)table + offset); + } } } } @@ -1016,23 +1025,26 @@ language->feature_count = GET_BE_WORD(lang->FeatureCount); TRACE("%i features\n",language->feature_count); - language->features = HeapAlloc(GetProcessHeap(),0,sizeof(LoadedFeature)*language->feature_count); - - feature_list = (const GSUB_FeatureList*)((const BYTE*)header + GET_BE_WORD(header->FeatureList)); - - for (i = 0; i < language->feature_count; i++) - { - const GSUB_Feature *feature; - int j; - int index = GET_BE_WORD(lang->FeatureIndex[i]); - - language->features[i].tag = MS_MAKE_TAG(feature_list->FeatureRecord[index].FeatureTag[0], feature_list->FeatureRecord[index].FeatureTag[1], feature_list->FeatureRecord[index].FeatureTag[2], feature_list->FeatureRecord[index].FeatureTag[3]); - language->features[i].feature = ((const BYTE*)feature_list + GET_BE_WORD(feature_list->FeatureRecord[index].Feature)); - feature = (const GSUB_Feature*)language->features[i].feature; - language->features[i].lookup_count = GET_BE_WORD(feature->LookupCount); - language->features[i].lookups = HeapAlloc(GetProcessHeap(),0,sizeof(WORD) * language->features[i].lookup_count); - for (j = 0; j < language->features[i].lookup_count; j++) - language->features[i].lookups[j] = GET_BE_WORD(feature->LookupListIndex[j]); + if (language->feature_count) + { + language->features = HeapAlloc(GetProcessHeap(),0,sizeof(LoadedFeature)*language->feature_count); + + feature_list = (const GSUB_FeatureList*)((const BYTE*)header + GET_BE_WORD(header->FeatureList)); + + for (i = 0; i < language->feature_count; i++) + { + const GSUB_Feature *feature; + int j; + int index = GET_BE_WORD(lang->FeatureIndex[i]); + + language->features[i].tag = MS_MAKE_TAG(feature_list->FeatureRecord[index].FeatureTag[0], feature_list->FeatureRecord[index].FeatureTag[1], feature_list->FeatureRecord[index].FeatureTag[2], feature_list->FeatureRecord[index].FeatureTag[3]); + language->features[i].feature = ((const BYTE*)feature_list + GET_BE_WORD(feature_list->FeatureRecord[index].Feature)); + feature = (const GSUB_Feature*)language->features[i].feature; + language->features[i].lookup_count = GET_BE_WORD(feature->LookupCount); + language->features[i].lookups = HeapAlloc(GetProcessHeap(),0,sizeof(WORD) * language->features[i].lookup_count); + for (j = 0; j < language->features[i].lookup_count; j++) + language->features[i].lookups[j] = GET_BE_WORD(feature->LookupListIndex[j]); + } } } } Modified: trunk/reactos/dll/win32/usp10/shape.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/shape.c?re… ============================================================================== --- trunk/reactos/dll/win32/usp10/shape.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/shape.c [iso-8859-1] Wed Mar 21 20:39:41 2012 @@ -2359,13 +2359,11 @@ int char_index[20]; int char_count = 0; - for (k = 0; k < cChars; k++) - { - if (pwLogClust[k] == i) - { - char_index[char_count] = k; - char_count++; - } + k = USP10_FindGlyphInLogClust(pwLogClust, cChars, i); + if (k>=0) + { + for (; k < cChars && pwLogClust[k] == i; k++) + char_index[char_count++] = k; } if (char_count == 0) @@ -2425,13 +2423,11 @@ int char_count = 0; BOOL isInit, isFinal; - for (k = 0; k < cChars; k++) - { - if (pwLogClust[k] == i) - { - char_index[char_count] = k; - char_count++; - } + k = USP10_FindGlyphInLogClust(pwLogClust, cChars, i); + if (k>=0) + { + for (; k < cChars && pwLogClust[k] == i; k++) + char_index[char_count++] = k; } isInit = (i == initGlyph || (i+dirR > 0 && i+dirR < cGlyphs && spaces[i+dirR])); @@ -2534,13 +2530,11 @@ int char_index[20]; int char_count = 0; - for (k = 0; k < cChars; k++) - { - if (pwLogClust[k] == i) - { - char_index[char_count] = k; - char_count++; - } + k = USP10_FindGlyphInLogClust(pwLogClust, cChars, i); + if (k>=0) + { + for (; k < cChars && pwLogClust[k] == i; k++) + char_index[char_count++] = k; } if (char_count == 0) @@ -2581,13 +2575,11 @@ int char_index[20]; int char_count = 0; - for (k = 0; k < cChars; k++) - { - if (pwLogClust[k] == i) - { - char_index[char_count] = k; - char_count++; - } + k = USP10_FindGlyphInLogClust(pwLogClust, cChars, i); + if (k>=0) + { + for (; k < cChars && pwLogClust[k] == i; k++) + char_index[char_count++] = k; } if (char_count == 0) @@ -2614,13 +2606,11 @@ int char_index[20]; int char_count = 0; - for (k = 0; k < cChars; k++) - { - if (pwLogClust[k] == i) - { - char_index[char_count] = k; - char_count++; - } + k = USP10_FindGlyphInLogClust(pwLogClust, cChars, i); + if (k>=0) + { + for (; k < cChars && pwLogClust[k] == i; k++) + char_index[char_count++] = k; } if (char_count == 0) @@ -2658,13 +2648,11 @@ int char_index[20]; int char_count = 0; - for (k = 0; k < cChars; k++) - { - if (pwLogClust[k] == i) - { - char_index[char_count] = k; - char_count++; - } + k = USP10_FindGlyphInLogClust(pwLogClust, cChars, i); + if (k>=0) + { + for (; k < cChars && pwLogClust[k] == i; k++) + char_index[char_count++] = k; } if (override_gsub) Modified: trunk/reactos/dll/win32/usp10/usp10.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.c?re… ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] Wed Mar 21 20:39:41 2012 @@ -25,6 +25,7 @@ */ #include <stdarg.h> +#include <stdlib.h> #include "windef.h" #include "winbase.h" @@ -703,6 +704,11 @@ int* logical2visual; } StringAnalysis; +typedef struct { + BOOL ascending; + WORD target; +} FindGlyph_struct; + static inline void *heap_alloc(SIZE_T size) { return HeapAlloc(GetProcessHeap(), 0, size); @@ -879,6 +885,46 @@ } while (1); return SCRIPT_UNDEFINED; +} + +static int compare_FindGlyph(const void *a, const void* b) +{ + const FindGlyph_struct *find = (FindGlyph_struct*)a; + const WORD *idx= (WORD*)b; + int rc = 0; + + if ( find->target > *idx) + rc = 1; + else if (find->target < *idx) + rc = -1; + + if (!find->ascending) + rc *= -1; + return rc; +} + +int USP10_FindGlyphInLogClust(const WORD* pwLogClust, int cChars, WORD target) +{ + FindGlyph_struct fgs; + WORD *ptr; + INT k; + + if (pwLogClust[0] < pwLogClust[cChars-1]) + fgs.ascending = TRUE; + else + fgs.ascending = FALSE; + + fgs.target = target; + ptr = bsearch(&fgs, pwLogClust, cChars, sizeof(WORD), compare_FindGlyph); + + if (!ptr) + return -1; + + for (k = (ptr - pwLogClust)-1; k >= 0 && pwLogClust[k] == target; k--) + ; + k++; + + return k; } /*********************************************************************** @@ -1726,19 +1772,12 @@ hr = ScriptItemize(pString, cString, num_items, &sControl, &sState, analysis->pItem, &analysis->numItems); - while (hr == E_OUTOFMEMORY) - { - SCRIPT_ITEM *tmp; - - num_items *= 2; - if (!(tmp = heap_realloc_zero(analysis->pItem, num_items * sizeof(SCRIPT_ITEM) + 1))) - goto error; - - analysis->pItem = tmp; - hr = ScriptItemize(pString, cString, num_items, psControl, psState, analysis->pItem, - &analysis->numItems); - } - if (hr != S_OK) goto error; + if FAILED(hr) + { + if (hr == E_OUTOFMEMORY) + hr = E_INVALIDARG; + goto error; + } /* set back to out of memory for default goto error behaviour */ hr = E_OUTOFMEMORY; @@ -1817,6 +1856,13 @@ } } + /* FIXME: When we properly shape Hangul remove this check */ + if ((dwFlags & SSA_LINK) && !analysis->glyphs[i].fallbackFont && analysis->pItem[i].a.eScript == Script_Hangul) + analysis->pItem[i].a.fNoGlyphIndex = TRUE; + + if ((dwFlags & SSA_LINK) && !analysis->glyphs[i].fallbackFont && !scriptInformation[analysis->pItem[i].a.eScript].props.fComplex) + analysis->pItem[i].a.fNoGlyphIndex = TRUE; + hr = ScriptShape(hdc, sc, &pStr[analysis->pItem[i].iCharPos], cChar, numGlyphs, &analysis->pItem[i].a, glyphs, pwLogClust, psva, &numGlyphsReturned); @@ -1873,13 +1919,9 @@ static inline BOOL does_glyph_start_cluster(const SCRIPT_VISATTR *pva, const WORD *pwLogClust, int cChars, int glyph, int direction) { - int i; - if (pva[glyph].fClusterStart) return TRUE; - for (i = 0; i < cChars; i++) - if (pwLogClust[i] == glyph) break; - if (i != cChars) + if (USP10_FindGlyphInLogClust(pwLogClust, cChars, glyph) >= 0) return TRUE; return FALSE; @@ -2309,16 +2351,14 @@ static inline int get_glyph_cluster_advance(const int* piAdvance, const SCRIPT_VISATTR *pva, const WORD *pwLogClust, int cGlyphs, int cChars, int glyph, int direction) { int advance; - int log_clust_max = 0; - int i; + int log_clust_max; advance = piAdvance[glyph]; - for (i = 0; i < cChars; i++) - { - if (pwLogClust[i] > log_clust_max) - log_clust_max = pwLogClust[i]; - } + if (pwLogClust[0] > pwLogClust[cChars-1]) + log_clust_max = pwLogClust[0]; + else + log_clust_max = pwLogClust[cChars-1]; if (glyph > log_clust_max) return advance; Modified: trunk/reactos/dll/win32/usp10/usp10_internal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10_inte… ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10_internal.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/usp10_internal.h [iso-8859-1] Wed Mar 21 20:39:41 2012 @@ -204,6 +204,8 @@ #define BIDI_WEAK 2 #define BIDI_NEUTRAL 0 +int USP10_FindGlyphInLogClust(const WORD* pwLogClust, int cChars, WORD target) DECLSPEC_HIDDEN; + BOOL BIDI_DetermineLevels( LPCWSTR lpString, INT uCount, const SCRIPT_STATE *s, const SCRIPT_CONTROL *c, WORD *lpOutLevels ) DECLSPEC_HIDDEN; BOOL BIDI_GetStrengths(LPCWSTR lpString, INT uCount, const SCRIPT_CONTROL *c, Modified: trunk/reactos/dll/win32/usp10/usp10_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10_ros.… ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/usp10_ros.diff [iso-8859-1] Wed Mar 21 20:39:41 2012 @@ -2,9 +2,9 @@ =================================================================== --- usp10.c (revision 54504) +++ usp10.c (working copy) -@@ -1989,3 +3159,9 @@ - for (i = 0; i < num_glyphs; i++) justify[i] = advance[i]; - return S_OK; +@@ -3621,3 +3621,9 @@ + + return SHAPE_GetFontFeatureTags(hdc, (ScriptCache *)*psc, psa, tagScript, tagLangSys, cMaxTags, pFeatureTags, pcTags); } + +BOOL gbLpkPresent = FALSE; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Mar 21 20:39:41 2012 @@ -168,7 +168,7 @@ reactos/dll/win32/updspapi # Synced to Wine-1.3.37 reactos/dll/win32/url # Autosync reactos/dll/win32/urlmon # Autosync -reactos/dll/win32/usp10 # Synced to Wine-1.3.37 +reactos/dll/win32/usp10 # Synced to Wine-1.4 reactos/dll/win32/uxtheme # Forked reactos/dll/win32/version # Autosync reactos/dll/win32/wer # Autosync

1 0

[tfaber] 56209: [USER32/EDIT] - Remove whitespace differences and mark ReactOS changes to make Wine-syncing easier
by tfaber＠svn.reactos.org 21 Mar '12

21 Mar '12

Author: tfaber Date: Wed Mar 21 18:33:01 2012 New Revision: 56209 URL: http://svn.reactos.org/svn/reactos?rev=56209&view=rev Log: [USER32/EDIT] - Remove whitespace differences and mark ReactOS changes to make Wine-syncing easier Modified: trunk/reactos/dll/win32/user32/controls/edit.c Modified: trunk/reactos/dll/win32/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] Wed Mar 21 18:33:01 2012 @@ -85,7 +85,7 @@ LINE_END ending; INT width; /* width of the line in pixels */ INT index; /* line index into the buffer */ - SCRIPT_STRING_ANALYSIS ssa; /* Uniscribe Data */ + SCRIPT_STRING_ANALYSIS ssa; /* Uniscribe Data */ struct tagLINEDEF *next; } LINEDEF; @@ -142,11 +142,11 @@ */ UINT composition_len; /* length of composition, 0 == no composition */ int composition_start; /* the character position for the composition */ - /* - * Uniscribe Data - */ - SCRIPT_LOGATTR *logAttr; - SCRIPT_STRING_ANALYSIS ssa; /* Uniscribe Data for single line controls */ + /* + * Uniscribe Data + */ + SCRIPT_LOGATTR *logAttr; + SCRIPT_STRING_ANALYSIS ssa; /* Uniscribe Data for single line controls */ } EDITSTATE; @@ -235,7 +235,7 @@ msg = WM_CTLCOLOREDIT; /* why do we notify to es->hwndParent, and we send this one to GetParent()? */ - hbrush = GetControlBrush(es->hwndSelf, hdc, msg); + hbrush = GetControlBrush(es->hwndSelf, hdc, msg); // reactos r54259 return hbrush; } @@ -257,7 +257,7 @@ * allows to be called without linebreaks between s[0] up to * s[count - 1]. Remember it is only called * internally, so we can decide this for ourselves. - * Additional we will always be breaking the full string. + * Additional we will always be breaking the full string. * */ static INT EDIT_WordBreakProc(EDITSTATE *es, LPWSTR s, INT index, INT count, INT action) @@ -340,7 +340,7 @@ countA = WideCharToMultiByte(CP_ACP, 0, es->text + start, count, NULL, 0, NULL, NULL); textA = HeapAlloc(GetProcessHeap(), 0, countA); - if (textA == NULL) return 0; + if (textA == NULL) return 0; // reactos r33503 WideCharToMultiByte(CP_ACP, 0, es->text + start, count, textA, countA, NULL, NULL); TRACE_(relay)("(ANSI wordbrk=%p,str=%s,idx=%d,cnt=%d,act=%d)\n", es->word_break_proc, debugstr_an(textA, countA), index, countA, action); @@ -522,7 +522,7 @@ insert it into the link list */ LINEDEF *new_line = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LINEDEF)); if (new_line == NULL) // reactos r33509 - break; // reactos r33509 + break; // reactos r33509 new_line->next = previous_line->next; previous_line->next = new_line; current_line = new_line; @@ -764,7 +764,6 @@ } } - /********************************************************************* * * EDIT_CalcLineWidth_SL @@ -892,7 +891,7 @@ if (trailing) index++; } else - index = 0; + index = 0; } else index = es->x_offset; @@ -1216,7 +1215,7 @@ { if (!es->text) { - CHAR *textA = NULL; // ReactOS Hacked! + CHAR *textA = NULL; // ReactOS Hacked! r45670 //UINT countA = 0; if(es->hloc32W) @@ -2216,7 +2215,7 @@ TRACE("line=%d\n", line); - ssa = EDIT_UpdateUniscribeData(es, dc, line); + ssa = EDIT_UpdateUniscribeData(es, dc, line); pos = EDIT_EM_PosFromChar(es, EDIT_EM_LineIndex(es, line), FALSE); x = (short)LOWORD(pos); y = (short)HIWORD(pos); @@ -2257,7 +2256,7 @@ } if (ssa) - ScriptStringOut(ssa, x, y, 0, &es->format_rect, s - li, e - li, FALSE); + ScriptStringOut(ssa, x, y, 0, &es->format_rect, s - li, e - li, FALSE); else if (rev && (s != e) && ((es->flags & EF_FOCUSED) || (es->style & ES_NOHIDESEL))) { x += EDIT_PaintText(es, dc, x, y, line, 0, s - li, FALSE); @@ -2554,7 +2553,7 @@ s = es->selection_start; e = es->selection_end; - EDIT_InvalidateUniscribeData(es); + EDIT_InvalidateUniscribeData(es); if ((s == e) && !strl) return; @@ -3006,8 +3005,8 @@ ulength = strlenW(es->undo_text); utext = HeapAlloc(GetProcessHeap(), 0, (ulength + 1) * sizeof(WCHAR)); - if (utext == NULL) // reactos r33503 - return FALSE; // reactos r33503 + if (utext == NULL) // reactos r33503 + return FALSE; // reactos r33503 strcpyW(utext, es->undo_text); @@ -3273,7 +3272,7 @@ UINT start = es->selection_start; UINT end = es->selection_end; - BOOL selectedItem; + BOOL selectedItem; // reactos r40667 ORDER_UINT(start, end); /* undo */ @@ -3293,6 +3292,7 @@ { RECT rc; /* Windows places the menu at the edit's center in this case */ + // reactos r55202 GetClientRect(es->hwndSelf, &rc); MapWindowPoints(es->hwndSelf, 0, (POINT *)&rc, 2); //WIN_GetRectangles( es->hwndSelf, COORDS_SCREEN, NULL, &rc ); @@ -3303,7 +3303,7 @@ if (!(es->flags & EF_FOCUSED)) SetFocus(es->hwndSelf); -#ifdef __REACTOS__ +#ifdef __REACTOS__ // r40667 selectedItem = TrackPopupMenu(popup, TPM_LEFTALIGN | TPM_RIGHTBUTTON | TPM_RETURNCMD, x, y, 0, es->hwndSelf, NULL); // Added see Revision 43925 comments. switch (selectedItem) { @@ -3705,9 +3705,9 @@ (es->style & ES_NOHIDESEL)); dc = hdc ? hdc : BeginPaint(es->hwndSelf, &ps); - /* The dc we use for calculating may not be the one we paint into. - This is the safest action. */ - EDIT_InvalidateUniscribeData(es); + /* The dc we use for calculating may not be the one we paint into. + This is the safest action. */ + EDIT_InvalidateUniscribeData(es); GetClientRect(es->hwndSelf, &rcClient); /* get the background brush */ @@ -3913,8 +3913,8 @@ EDIT_NOTIFY_PARENT(es, EN_CHANGE); } EDIT_EM_ScrollCaret(es); - EDIT_UpdateScrollInfo(es); - EDIT_InvalidateUniscribeData(es); + EDIT_UpdateScrollInfo(es); + EDIT_InvalidateUniscribeData(es); } @@ -4645,7 +4645,7 @@ { EDITSTATE *es = (EDITSTATE *)GetWindowLongPtrW( hwnd, 0 ); LRESULT result = 0; -#ifdef __REACTOS__ +#ifdef __REACTOS__ // r50219 PWND pWnd; pWnd = ValidateHwnd(hwnd); @@ -4909,7 +4909,7 @@ result = EDIT_WM_NCDestroy(es); // es = NULL; reactos #ifdef __REACTOS__ - NtUserSetWindowFNID(hwnd, FNID_DESTROY); + NtUserSetWindowFNID(hwnd, FNID_DESTROY); #endif break; @@ -5204,6 +5204,7 @@ return result; } +// reactos /********************************************************************* * * EditWndProc (USER32.@) @@ -5230,6 +5231,7 @@ { editW, /* name */ CS_DBLCLKS | CS_PARENTDC, /* style */ + // reactos EditWndProcA, /* procA */ EditWndProcW, /* procW */ #ifndef _WIN64

1 0

[akhaldi] 56208: [CMAKE] * Properly handle the dep file creation for resource files.
by akhaldi＠svn.reactos.org 21 Mar '12

21 Mar '12

Author: akhaldi Date: Wed Mar 21 16:46:49 2012 New Revision: 56208 URL: http://svn.reactos.org/svn/reactos?rev=56208&view=rev Log: [CMAKE] * Properly handle the dep file creation for resource files. Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=56208&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Wed Mar 21 16:46:49 2012 @@ -168,6 +168,7 @@ set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -x assembler-with-cpp -o <OBJECT> -I${REACTOS_SOURCE_DIR}/include/asm -I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> -D__ASM__ -c <SOURCE>") set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff <FLAGS> -DRC_INVOKED -D__WIN32__=1 -D__FLAT__=1 ${I18N_DEFS} <DEFINES> <SOURCE> <OBJECT>") +set(CMAKE_DEPFILE_FLAGS_RC "--preprocessor \"<CMAKE_C_COMPILER> -E -xc-header -MMD -MF <DEPFILE> -MT <OBJECT>\"") # Optional 3rd parameter: stdcall stack bytes function(set_entrypoint MODULE ENTRYPOINT)

1 0

[tfaber] 56207: [WSHTCPIP] - Fix MSVC warnings, more useful DPRINT [RTL/HEAP] - Do not use RtlFillMemory with a 32 bit pattern (CID 13722)
by tfaber＠svn.reactos.org 21 Mar '12

21 Mar '12

Author: tfaber Date: Wed Mar 21 15:36:59 2012 New Revision: 56207 URL: http://svn.reactos.org/svn/reactos?rev=56207&view=rev Log: [WSHTCPIP] - Fix MSVC warnings, more useful DPRINT [RTL/HEAP] - Do not use RtlFillMemory with a 32 bit pattern (CID 13722) Modified: trunk/reactos/dll/win32/wshtcpip/wshtcpip.c trunk/reactos/lib/rtl/heappage.c Modified: trunk/reactos/dll/win32/wshtcpip/wshtcpip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wshtcpip/wshtcpi… ============================================================================== --- trunk/reactos/dll/win32/wshtcpip/wshtcpip.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wshtcpip/wshtcpip.c [iso-8859-1] Wed Mar 21 15:36:59 2012 @@ -75,7 +75,7 @@ OUT PSOCKADDR Sockaddr, OUT PINT SockaddrLength) { - DWORD Size = 2 * sizeof(UINT); + INT Size = 2 * sizeof(UINT); if (*SockaddrLength < Size) { @@ -184,10 +184,15 @@ } break; + case SOL_SOCKET: + DPRINT1("SOL_SOCKET option %d\n", OptionName); + break; + default: DPRINT1("Unknown level: %d\n", Level); - return 0; - } + break; + } + return 0; } INT @@ -215,7 +220,7 @@ OUT PSOCKADDR Sockaddr, OUT PINT SockaddrLength) { - DWORD Size = 2 * sizeof(UINT); + INT Size = 2 * sizeof(UINT); if (*SockaddrLength < Size) { @@ -456,7 +461,7 @@ } Context->RequestQueue = NULL; break; - + default: DPRINT1("Unwanted notification received! (%d)\n", NotifyEvent); break; Modified: trunk/reactos/lib/rtl/heappage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heappage.c?rev=562… ============================================================================== --- trunk/reactos/lib/rtl/heappage.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heappage.c [iso-8859-1] Wed Mar 21 15:36:59 2012 @@ -1464,7 +1464,7 @@ } /* Start preparing the 1st page. Fill it with the default filler */ - RtlFillMemory(Base, PAGE_SIZE, DPH_FILL); + RtlFillMemoryUlong(Base, PAGE_SIZE, DPH_FILL); /* Set flags in the "HEAP" structure */ HeapPtr = (PHEAP)Base;

1 0

[cgutman] 56206: [NTOSKRNL] - Once again require a reboot for driver replacement since this seems to cause new issues with devices being enumerated multiple times on vmware
by cgutman＠svn.reactos.org 21 Mar '12

21 Mar '12

Author: cgutman Date: Wed Mar 21 15:19:42 2012 New Revision: 56206 URL: http://svn.reactos.org/svn/reactos?rev=56206&view=rev Log: [NTOSKRNL] - Once again require a reboot for driver replacement since this seems to cause new issues with devices being enumerated multiple times on vmware Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/plugpla… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] Wed Mar 21 15:19:42 2012 @@ -597,15 +597,17 @@ /* Check if there's already a driver loaded for this device */ if (DeviceNode->Flags & DNF_ADDED) { +#if 0 /* Remove the device node */ Status = IopRemoveDevice(DeviceNode); if (NT_SUCCESS(Status)) { /* Invalidate device relations for the parent to reenumerate the device */ + DPRINT1("A new driver will be loaded for '%wZ' (FDO above removed)\n", &DeviceNode->InstancePath); Status = IoSynchronousInvalidateDeviceRelations(DeviceNode->Parent->PhysicalDeviceObject, BusRelations); - DPRINT1("A new driver has been loaded for '%wZ' (FDO above removed)\n", &DeviceNode->InstancePath); } else +#endif { /* A driver has already been loaded for this device */ DPRINT1("A reboot is required for the current driver for '%wZ' to be replaced\n", &DeviceNode->InstancePath); @@ -623,8 +625,8 @@ if (NT_SUCCESS(Status)) { /* Start the service and begin PnP initialization of the device again */ + DPRINT1("A new driver will be loaded for '%wZ' (no FDO above)\n", &DeviceNode->InstancePath); Status = IopActionInitChildServices(DeviceNode, DeviceNode->Parent); - DPRINT1("A new driver will be loaded for '%wZ' (no FDO above)\n", &DeviceNode->InstancePath); } }

1 0

[cgutman] 56205: [NTOSKRNL] - Print the parent devices when a duplicate device is detected
by cgutman＠svn.reactos.org 21 Mar '12

21 Mar '12

Author: cgutman Date: Wed Mar 21 15:10:15 2012 New Revision: 56205 URL: http://svn.reactos.org/svn/reactos?rev=56205&view=rev Log: [NTOSKRNL] - Print the parent devices when a duplicate device is detected Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Wed Mar 21 15:10:15 2012 @@ -2006,7 +2006,12 @@ OldDeviceObject = IopGetDeviceObjectFromDeviceInstance(&InstancePathU); if (OldDeviceObject != NULL) { + PDEVICE_NODE OldDeviceNode = IopGetDeviceNode(OldDeviceObject); + DPRINT1("Duplicate device instance '%wZ'\n", &InstancePathU); + DPRINT1("Current instance parent: '%wZ'\n", &DeviceNode->Parent->InstancePath); + DPRINT1("Old instance parent: '%wZ'\n", &OldDeviceNode->Parent->InstancePath); + KeBugCheckEx(PNP_DETECTED_FATAL_ERROR, 0x01, (ULONG_PTR)DeviceNode->PhysicalDeviceObject,

1 0

[cgutman] 56204: - Fix device manager view by connection in ACPI mode [NTOSKRNL] - Bugcheck if a driver reports a PDO with a non-unique instance ID [ACPI] - Check that we're not reporting the same ...
by cgutman＠svn.reactos.org 21 Mar '12

21 Mar '12

Author: cgutman Date: Wed Mar 21 14:35:52 2012 New Revision: 56204 URL: http://svn.reactos.org/svn/reactos?rev=56204&view=rev Log: - Fix device manager view by connection in ACPI mode [NTOSKRNL] - Bugcheck if a driver reports a PDO with a non-unique instance ID [ACPI] - Check that we're not reporting the same device multiple times Modified: trunk/reactos/drivers/bus/acpi/acpienum.c trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/drivers/bus/acpi/acpienum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpienum.… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpienum.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpienum.c [iso-8859-1] Wed Mar 21 14:35:52 2012 @@ -45,10 +45,38 @@ for (entry = FdoData->ListOfPDOs.Flink; entry != &FdoData->ListOfPDOs; entry = entry->Flink) { - pdoData = CONTAINING_RECORD (entry, PDO_DEVICE_DATA, Link); - //dont duplicate devices - if(pdoData->AcpiHandle == Device->handle) + struct acpi_device *CurrentDevice; + + pdoData = CONTAINING_RECORD (entry, PDO_DEVICE_DATA, Link); + + //dont duplicate devices + if (pdoData->AcpiHandle == Device->handle) + return STATUS_SUCCESS; + + //check everything but fixed feature devices + if (pdoData->AcpiHandle) + acpi_bus_get_device(pdoData->AcpiHandle, &CurrentDevice); + else + continue; + + //check if the HID matches + if (strstr(Device->pnp.hardware_id, CurrentDevice->pnp.hardware_id)) + { + //check if UID exists for both and matches + if (Device->flags.unique_id && CurrentDevice->flags.unique_id && + strstr(Device->pnp.unique_id, CurrentDevice->pnp.unique_id)) + { + /* We have a UID on both but they're the same so we have to ignore it */ + DPRINT1("Detected duplicate device: %hs %hs\n", Device->pnp.hardware_id, Device->pnp.unique_id); return STATUS_SUCCESS; + } + else if (!Device->flags.unique_id && !CurrentDevice->flags.unique_id) + { + /* No UID so we can only legally have 1 of these devices */ + DPRINT1("Detected duplicate device: %hs\n", Device->pnp.hardware_id); + return STATUS_SUCCESS; + } + } } DPRINT("Exposing PDO\n" Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/plugpla… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] Wed Mar 21 14:35:52 2012 @@ -141,7 +141,7 @@ } -static PDEVICE_OBJECT +PDEVICE_OBJECT IopGetDeviceObjectFromDeviceInstance(PUNICODE_STRING DeviceInstance) { if (IopRootDeviceNode == NULL) Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Wed Mar 21 14:35:52 2012 @@ -49,6 +49,9 @@ NTSTATUS IopPrepareDeviceForRemoval(PDEVICE_OBJECT DeviceObject, BOOLEAN Force); + +PDEVICE_OBJECT +IopGetDeviceObjectFromDeviceInstance(PUNICODE_STRING DeviceInstance); PDEVICE_NODE FASTCALL @@ -1850,7 +1853,9 @@ HANDLE InstanceKey = NULL; UNICODE_STRING ValueName; UNICODE_STRING ParentIdPrefix = { 0, 0, NULL }; + UNICODE_STRING InstancePathU; DEVICE_CAPABILITIES DeviceCapabilities; + PDEVICE_OBJECT OldDeviceObject; DPRINT("IopActionInterrogateDeviceStack(%p, %p)\n", DeviceNode, Context); DPRINT("PDO 0x%p\n", DeviceNode->PhysicalDeviceObject); @@ -1991,11 +1996,25 @@ } RtlFreeUnicodeString(&ParentIdPrefix); - if (!RtlCreateUnicodeString(&DeviceNode->InstancePath, InstancePath)) + if (!RtlCreateUnicodeString(&InstancePathU, InstancePath)) { DPRINT("No resources\n"); /* FIXME: Cleanup and disable device */ } + + /* Verify that this is not a duplicate */ + OldDeviceObject = IopGetDeviceObjectFromDeviceInstance(&InstancePathU); + if (OldDeviceObject != NULL) + { + DPRINT1("Duplicate device instance '%wZ'\n", &InstancePathU); + KeBugCheckEx(PNP_DETECTED_FATAL_ERROR, + 0x01, + (ULONG_PTR)DeviceNode->PhysicalDeviceObject, + (ULONG_PTR)OldDeviceObject, + 0); + } + + DeviceNode->InstancePath = InstancePathU; DPRINT("InstancePath is %S\n", DeviceNode->InstancePath.Buffer);

1 0

[tkreuzer] 56203: [FTFD] Fix a typo, add a trace, add a comment
by tkreuzer＠svn.reactos.org 21 Mar '12

21 Mar '12

Author: tkreuzer Date: Wed Mar 21 10:59:16 2012 New Revision: 56203 URL: http://svn.reactos.org/svn/reactos?rev=56203&view=rev Log: [FTFD] Fix a typo, add a trace, add a comment Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c [iso-8859-1] Wed Mar 21 10:59:16 2012 @@ -188,6 +188,7 @@ /* Check if there is rotation / skewing (cannot use iComplexity!?) */ if (!FLOATOBJ_bIsNull(&fxform.eM12) || !FLOATOBJ_bIsNull(&fxform.eM21)) { + TRACE("Setting extended xform\n"); //__debugbreak(); /* Create a transformation matrix that is applied after the character @@ -386,14 +387,17 @@ } /* Copy some values from the font structure */ - pfddm->fxMaxAscender = (pfont->metrics.fxMaxAscender + 15) & ~0x0f; - pfddm->fxMaxDescender = (pfont->metrics.fxMaxDescender + 15) & ~0x0f; pfddm->ptlUnderline1 = pfont->metrics.ptlUnderline1; pfddm->ptlStrikeout = pfont->metrics.ptlStrikeout; pfddm->ptlULThickness = pfont->metrics.ptlULThickness; pfddm->ptlSOThickness = pfont->metrics.ptlSOThickness; pfddm->cxMax = pfont->sizlMax.cx; pfddm->cyMax = pfont->sizlMax.cy; + + /* These values are rounded to pixels to fix inconsistent height + of marked text and the rest of the marked row in XP list boxes */ + pfddm->fxMaxAscender = (pfont->metrics.fxMaxAscender + 15) & ~0x0f; + pfddm->fxMaxDescender = (pfont->metrics.fxMaxDescender + 15) & ~0x0f; /* Convert the base vectors from FLOATOBJ to FLOATL */ pfddm->pteBase.x = FLOATOBJ_GetFloat(&pfont->ptefBase.x); @@ -460,7 +464,7 @@ /* D is the glyph advance width. Convert it from 26.6 to 28.4 fixpoint format */ pgd->fxD = ftglyph->advance.x >> 2; // FIXME: should be projected on the x-axis - /* Get the bitnmap size */ + /* Get the bitmap size */ sizlBitmap.cx = ftglyph->bitmap.width; sizlBitmap.cy = ftglyph->bitmap.rows; Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c [iso-8859-1] Wed Mar 21 10:59:16 2012 @@ -29,7 +29,7 @@ * \brief Searches for a specific table in TrueType and OpenType font files * \param pvView - The address where the font file is mapped * \param cjView - Size of the mapped font file - * \param iFace - 1-based index of the font in the font file. + * \param ulFont - 1-based index of the font in the font file. * \param ulTag - Identifier tag of the table to search * \param pulLength - Pointer to an ULONG that recieves the table length, * Can be NULL.

1 0

[arty] 56202: [NTOSKRNL] Fix another place where a non-rounded address is used.
by arty＠svn.reactos.org 21 Mar '12

21 Mar '12

Author: arty Date: Wed Mar 21 10:18:39 2012 New Revision: 56202 URL: http://svn.reactos.org/svn/reactos?rev=56202&view=rev Log: [NTOSKRNL] Fix another place where a non-rounded address is used. Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Wed Mar 21 10:18:39 2012 @@ -1431,7 +1431,7 @@ } MmLockAddressSpace(AddressSpace); Status = MmCreateVirtualMapping(Process, - Address, + PAddress, Region->Protect, &Page, 1);

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