Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 51854: * Consistently mark KeBugCheckEx with the noreturn attribute. Patch by Igor Paliychuk.
by akhaldi＠svn.reactos.org 22 May '11

22 May '11

Author: akhaldi Date: Sun May 22 22:08:01 2011 New Revision: 51854 URL: http://svn.reactos.org/svn/reactos?rev=51854&view=rev Log: * Consistently mark KeBugCheckEx with the noreturn attribute. Patch by Igor Paliychuk. Modified: trunk/reactos/boot/freeldr/freeldr/debug.c trunk/reactos/include/ddk/wdm.h trunk/reactos/include/xdk/kefuncs.h Modified: trunk/reactos/boot/freeldr/freeldr/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/debug… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] Sun May 22 22:08:01 2011 @@ -340,6 +340,7 @@ return 0; } +DECLSPEC_NORETURN NTKERNELAPI VOID NTAPI Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=5185… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Sun May 22 22:08:01 2011 @@ -9772,8 +9772,8 @@ } #endif -NTKERNELAPI -//DECLSPEC_NORETURN +DECLSPEC_NORETURN +NTKERNELAPI VOID NTAPI KeBugCheckEx( Modified: trunk/reactos/include/xdk/kefuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/kefuncs.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/kefuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/kefuncs.h [iso-8859-1] Sun May 22 22:08:01 2011 @@ -207,8 +207,8 @@ } #endif -NTKERNELAPI -//DECLSPEC_NORETURN +DECLSPEC_NORETURN +NTKERNELAPI VOID NTAPI KeBugCheckEx(

1 0

[tkreuzer] 51853: [GDI FONT DRIVER] - Calculate bounding box in fixpoints and round up/down - Make sure the bitmaps don't exceed the previously calculated maximum size. Webdings has suchs glyphs fo...
by tkreuzer＠svn.reactos.org 22 May '11

22 May '11

Author: tkreuzer Date: Sun May 22 21:26:22 2011 New Revision: 51853 URL: http://svn.reactos.org/svn/reactos?rev=51853&view=rev Log: [GDI FONT DRIVER] - Calculate bounding box in fixpoints and round up/down - Make sure the bitmaps don't exceed the previously calculated maximum size. Webdings has suchs glyphs for unknown reasons. - Handle 0 pixel bitmaps by only zeroing the 1st byte of the destination bitmap - Pass ponter to GLYPHBITS structure to FtfdCopyBits and use its size instead of freetype's glyph size Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/copybits.c branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/todo.txt Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/copybits.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/copybits.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/copybits.c [iso-8859-1] Sun May 22 21:26:22 2011 @@ -11,19 +11,19 @@ static VOID FtfdCopyBits_S1D1( - BYTE *pjDest, + GLYPHBITS *pgb, FT_Bitmap *ftbitmap) { ULONG ulRows, ulDstDelta, ulSrcDelta; PBYTE pjDstLine, pjSrcLine; - pjDstLine = pjDest; - ulDstDelta = (ftbitmap->width + 7) / 8; + pjDstLine = pgb->aj; + ulDstDelta = (pgb->sizlBitmap.cx + 7) / 8; pjSrcLine = ftbitmap->buffer; ulSrcDelta = abs(ftbitmap->pitch); - ulRows = ftbitmap->rows; + ulRows = pgb->sizlBitmap.cy; while (ulRows--) { /* Copy one line */ @@ -38,7 +38,7 @@ static VOID FtfdCopyBits_S8D1( - BYTE *pjDest, + GLYPHBITS *pgb, FT_Bitmap *ftbitmap) { __debugbreak(); @@ -48,7 +48,7 @@ static VOID FtfdCopyBits_S1D4( - BYTE *pjDest, + GLYPHBITS *pgb, FT_Bitmap *ftbitmap) { ULONG ulRows, ulSrcDelta; @@ -56,15 +56,15 @@ //__debugbreak(); - pjDstLine = pjDest; + pjDstLine = pgb->aj; pjSrcLine = ftbitmap->buffer; ulSrcDelta = abs(ftbitmap->pitch); - ulRows = ftbitmap->rows; + ulRows = pgb->sizlBitmap.cy; while (ulRows--) { - ULONG ulWidth = ftbitmap->width; + ULONG ulWidth = pgb->sizlBitmap.cx; BYTE j, *pjSrc; static USHORT ausExpand[] = {0x0000, 0x000f, 0x00f0, 0x00ff, 0x0f00, 0x0f0f, 0x0ff0, 0x0fff, @@ -102,19 +102,19 @@ static VOID FtfdCopyBits_S8D4( - BYTE *pjDest, + GLYPHBITS *pgb, FT_Bitmap *ftbitmap) { ULONG ulRows, ulDstDelta, ulSrcDelta; PBYTE pjDstLine, pjSrcLine; - pjDstLine = pjDest; - ulDstDelta = (ftbitmap->width*4 + 7) / 8; + pjDstLine = pgb->aj; + ulDstDelta = (pgb->sizlBitmap.cx*4 + 7) / 8; pjSrcLine = ftbitmap->buffer; ulSrcDelta = abs(ftbitmap->pitch); - ulRows = ftbitmap->rows; + ulRows = pgb->sizlBitmap.cy; while (ulRows--) { ULONG ulWidth = ulDstDelta; @@ -127,7 +127,7 @@ j = (*pjSrc++) & 0xf0; /* Get the 2nd pixel */ - if (ulWidth > 0 || !(ftbitmap->width & 1)) + if (ulWidth > 0 || !(pgb->sizlBitmap.cx & 1)) j |= (*pjSrc++) >> 4; *pjDstLine++ = j; } @@ -137,24 +137,30 @@ } } -void +VOID NTAPI FtfdCopyBits( BYTE jBppDst, - BYTE *pjDest, + GLYPHBITS *pgb, FT_Bitmap *ftbitmap) { + /* handle empty bitmaps */ + if (ftbitmap->width == 0 || ftbitmap->rows == 0) + { + pgb->aj[0] = 0; + return; + } if (jBppDst == 1) { if (ftbitmap->pixel_mode == FT_PIXEL_MODE_MONO) { - FtfdCopyBits_S1D1(pjDest, ftbitmap); + FtfdCopyBits_S1D1(pgb, ftbitmap); } else if (ftbitmap->pixel_mode == FT_PIXEL_MODE_GRAY && ftbitmap->num_grays == 256) { - FtfdCopyBits_S8D1(pjDest, ftbitmap); + FtfdCopyBits_S8D1(pgb, ftbitmap); } else { @@ -167,12 +173,12 @@ { if (ftbitmap->pixel_mode == FT_PIXEL_MODE_MONO) { - FtfdCopyBits_S1D4(pjDest, ftbitmap); + FtfdCopyBits_S1D4(pgb, ftbitmap); } else if (ftbitmap->pixel_mode == FT_PIXEL_MODE_GRAY && ftbitmap->num_grays == 256) { - FtfdCopyBits_S8D4(pjDest, ftbitmap); + FtfdCopyBits_S8D4(pgb, ftbitmap); } else { Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h [iso-8859-1] Sun May 22 21:26:22 2011 @@ -125,7 +125,7 @@ POINTL ptlStrikeout; POINTL ptlULThickness; POINTL ptlSOThickness; - POINTL aptlBBox[4]; + POINTL aptfxBBox[4]; }; }; FIX fxMaxAscender; @@ -147,7 +147,7 @@ FT_Face ftface; FD_XFORM fdxQuantized; FTFD_DEVICEMETRICS metrics; - RECTL rclBBox; + RECTL rcfxBBox; SIZEL sizlMax; POINTEF ptefBase; POINTEF ptefSide; @@ -349,5 +349,5 @@ NTAPI FtfdCopyBits( BYTE jBppDst, - BYTE *pjDest, + GLYPHBITS *pgb, FT_Bitmap *ftbitmap); 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] Sun May 22 21:26:22 2011 @@ -237,14 +237,14 @@ pmetrics->ptlULThickness.y = pface->ifiex.ifi.fwdUnderscoreSize; pmetrics->ptlSOThickness.x = 0; pmetrics->ptlSOThickness.y = pface->ifiex.ifi.fwdStrikeoutSize; - pmetrics->aptlBBox[0].x = ftface->bbox.xMin; - pmetrics->aptlBBox[0].y = ftface->bbox.yMin; - pmetrics->aptlBBox[1].x = ftface->bbox.xMax; - pmetrics->aptlBBox[1].y = ftface->bbox.yMin; - pmetrics->aptlBBox[2].x = ftface->bbox.xMax; - pmetrics->aptlBBox[2].y = ftface->bbox.yMax; - pmetrics->aptlBBox[3].x = ftface->bbox.xMin; - pmetrics->aptlBBox[3].y = ftface->bbox.yMax; + pmetrics->aptfxBBox[0].x = ftface->bbox.xMin << 4; + pmetrics->aptfxBBox[0].y = ftface->bbox.yMin << 4; + pmetrics->aptfxBBox[1].x = ftface->bbox.xMax << 4; + pmetrics->aptfxBBox[1].y = ftface->bbox.yMin << 4; + pmetrics->aptfxBBox[2].x = ftface->bbox.xMax << 4; + pmetrics->aptfxBBox[2].y = ftface->bbox.yMax << 4; + pmetrics->aptfxBBox[3].x = ftface->bbox.xMin << 4; + pmetrics->aptfxBBox[3].y = ftface->bbox.yMax << 4; /* Transform all coordinates into device space */ if (!XFORMOBJ_bApplyXform(pxo, XF_LTOL, 8, pmetrics->aptl, pmetrics->aptl)) @@ -254,23 +254,29 @@ return NULL; } - /* Extract the bounding box in device coordinates */ - pfont->rclBBox.left = min(pmetrics->aptlBBox[0].x, pmetrics->aptlBBox[1].x); - pfont->rclBBox.left = min(pfont->rclBBox.left, pmetrics->aptlBBox[2].x); - pfont->rclBBox.left = min(pfont->rclBBox.left, pmetrics->aptlBBox[3].x); - pfont->rclBBox.right = max(pmetrics->aptlBBox[0].x, pmetrics->aptlBBox[1].x); - pfont->rclBBox.right = max(pfont->rclBBox.right, pmetrics->aptlBBox[2].x); - pfont->rclBBox.right = max(pfont->rclBBox.right, pmetrics->aptlBBox[3].x); - pfont->rclBBox.top = min(pmetrics->aptlBBox[0].y, pmetrics->aptlBBox[1].y); - pfont->rclBBox.top = min(pfont->rclBBox.top, pmetrics->aptlBBox[2].y); - pfont->rclBBox.top = min(pfont->rclBBox.top, pmetrics->aptlBBox[3].y); - pfont->rclBBox.bottom = max(pmetrics->aptlBBox[0].y, pmetrics->aptlBBox[1].y); - pfont->rclBBox.bottom = max(pfont->rclBBox.bottom, pmetrics->aptlBBox[2].y); - pfont->rclBBox.bottom = max(pfont->rclBBox.bottom, pmetrics->aptlBBox[3].y); - - /* Calculate maximum extents */ - pfont->sizlMax.cx = pfont->rclBBox.right - pfont->rclBBox.left; - pfont->sizlMax.cy = pfont->rclBBox.bottom - pfont->rclBBox.top; + /* Extract the bounding box in FIX device coordinates */ + pfont->rcfxBBox.left = min(pmetrics->aptfxBBox[0].x, pmetrics->aptfxBBox[1].x); + pfont->rcfxBBox.left = min(pfont->rcfxBBox.left, pmetrics->aptfxBBox[2].x); + pfont->rcfxBBox.left = min(pfont->rcfxBBox.left, pmetrics->aptfxBBox[3].x); + pfont->rcfxBBox.right = max(pmetrics->aptfxBBox[0].x, pmetrics->aptfxBBox[1].x); + pfont->rcfxBBox.right = max(pfont->rcfxBBox.right, pmetrics->aptfxBBox[2].x); + pfont->rcfxBBox.right = max(pfont->rcfxBBox.right, pmetrics->aptfxBBox[3].x); + pfont->rcfxBBox.top = min(pmetrics->aptfxBBox[0].y, pmetrics->aptfxBBox[1].y); + pfont->rcfxBBox.top = min(pfont->rcfxBBox.top, pmetrics->aptfxBBox[2].y); + pfont->rcfxBBox.top = min(pfont->rcfxBBox.top, pmetrics->aptfxBBox[3].y); + pfont->rcfxBBox.bottom = max(pmetrics->aptfxBBox[0].y, pmetrics->aptfxBBox[1].y); + pfont->rcfxBBox.bottom = max(pfont->rcfxBBox.bottom, pmetrics->aptfxBBox[2].y); + pfont->rcfxBBox.bottom = max(pfont->rcfxBBox.bottom, pmetrics->aptfxBBox[3].y); + + /* Round the bounding box margings to pixels */ + pfont->rcfxBBox.left = pfont->rcfxBBox.left & ~0xf; + pfont->rcfxBBox.top = pfont->rcfxBBox.top & ~0xf; + pfont->rcfxBBox.right = (pfont->rcfxBBox.right + 0xf) & ~0xf; + pfont->rcfxBBox.bottom = (pfont->rcfxBBox.bottom + 0xf) & ~0xf; + + /* Calculate maximum extents in pixels */ + pfont->sizlMax.cx = (pfont->rcfxBBox.right - pfont->rcfxBBox.left) >> 4; + pfont->sizlMax.cy = (pfont->rcfxBBox.bottom - pfont->rcfxBBox.top) >> 4; /* Fixup some minimum values */ if (pmetrics->ptlULThickness.y <= 0) pmetrics->ptlULThickness.y = 1; @@ -309,7 +315,6 @@ PFTFD_FONT pfont = FtfdGetFontInstance(pfo); PFTFD_FACE pface = pfont->pface; FT_Face ftface = pfont->ftface; - XFORMOBJ *pxo; TRACE("FtfdQueryMaxExtents\n"); @@ -322,9 +327,6 @@ WARN("cjSize = %ld\n", cjSize); return FD_ERROR; } - - /* Get the XFORMOBJ */ - pxo = FONTOBJ_pxoGetXform(pfo); /* Accelerator flags (ignored atm) */ pfddm->flRealizedType = 0; @@ -416,6 +418,7 @@ { PFTFD_FONT pfont = pfo->pvProducer; FT_GlyphSlot ftglyph = pfont->ftface->glyph; + SIZEL sizlBitmap; pgd->gdf.pgb = pvGlyphData; pgd->hg = hg; @@ -436,15 +439,23 @@ /* D is the glyph advance width */ pgd->fxD = ftglyph->advance.x / 4; // FIXME: should be projected on the x-axis + /* Get the bitnmap size */ + sizlBitmap.cx = ftglyph->bitmap.width; + sizlBitmap.cy = ftglyph->bitmap.rows; + + /* Make the bitmap at least 1x1 pixel large */ + if (sizlBitmap.cx == 0) sizlBitmap.cx++; + if (sizlBitmap.cy == 0) sizlBitmap.cy++; + + /* Don't let the bitmap be larger than the maximum */ + sizlBitmap.cx = min(sizlBitmap.cx, pfont->sizlMax.cx); + sizlBitmap.cy = min(sizlBitmap.cy, pfont->sizlMax.cy); + /* This is the box in which the bitmap fits */ pgd->rclInk.left = ftglyph->bitmap_left; pgd->rclInk.top = -ftglyph->bitmap_top; - pgd->rclInk.right = pgd->rclInk.left + ftglyph->bitmap.width; - pgd->rclInk.bottom = pgd->rclInk.top + ftglyph->bitmap.rows; - - /* Make the bitmap at least 1x1 pixel large */ - if (ftglyph->bitmap.width == 0) pgd->rclInk.right++; - if (ftglyph->bitmap.rows == 0) pgd->rclInk.bottom++; + pgd->rclInk.right = pgd->rclInk.left + sizlBitmap.cx; + pgd->rclInk.bottom = pgd->rclInk.top + sizlBitmap.cy; /* FIX representation of bitmap top and bottom */ pgd->fxInkBottom = (-pgd->rclInk.bottom) << 4; @@ -456,12 +467,6 @@ pgd->ptqD.y.LowPart = 0; pgd->ptqD.y.HighPart = 0; - if (ftglyph->bitmap.width > pfont->sizlMax.cx || - ftglyph->bitmap.rows > pfont->sizlMax.cy) - { - __debugbreak(); - } - //__debugbreak(); } @@ -485,13 +490,9 @@ if (pgb->sizlBitmap.cx == 0) pgb->sizlBitmap.cx++; if (pgb->sizlBitmap.cy == 0) pgb->sizlBitmap.cy++; - if (pgb->sizlBitmap.cx > pfont->sizlMax.cx || - pgb->sizlBitmap.cy > pfont->sizlMax.cy) - { - WARN("The size of the bitmap exceeds the maximum size\n"); - __debugbreak(); - return; - } + /* Don't let the bitmap be larger than the maximum */ + pgb->sizlBitmap.cx = min(pgb->sizlBitmap.cx, pfont->sizlMax.cx); + pgb->sizlBitmap.cy = min(pgb->sizlBitmap.cy, pfont->sizlMax.cy); cjBitmapSize = BITMAP_SIZE(pgb->sizlBitmap.cx, pgb->sizlBitmap.cy, @@ -505,7 +506,7 @@ } /* Copy the bitmap */ - FtfdCopyBits(pfont->jBpp, pgb->aj, &ftglyph->bitmap); + FtfdCopyBits(pfont->jBpp, pgb, &ftglyph->bitmap); //TRACE("QueryGlyphBits hg=%lx, (%ld,%ld) cjSize=%ld, need %ld\n", // hg, pgb->sizlBitmap.cx, pgb->sizlBitmap.cy, cjSize, Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/todo.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/todo.txt [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/todo.txt [iso-8859-1] Sun May 22 21:26:22 2011 @@ -7,8 +7,8 @@ - FtfdDisablePDEV: 100% done - FtfdEscape: unimplemented, probably unneccessary - FtfdLoadFontFile: 95% done -- FtfdQueryFont: 70% done, depends on FtfdInitIfiMetrics -- FtfdQueryFontTree: 70% done, depends on FtfdInitGlyphSet and FtfdInitKerningPairs +- FtfdQueryFont: 80% done, depends on FtfdInitIfiMetrics +- FtfdQueryFontTree: 90% done, depends on FtfdInitGlyphSet and FtfdInitKerningPairs - FtfdUnloadFontFile: 100% done, depends on FtfdDestroyFace - FtfdQueryFontFile: 50% - implement QFF_DESCRIPTION, unimportant @@ -32,21 +32,18 @@ ------------------- - FtfdInitIfiMetrics: 80% done - handle other font types than TTF/OTF - - dpwszFamilyName, dpwszStyleName, dpwszFaceName: locale - - dpwszUniqueName: get from 'name' table + - localized dpwszFamilyName, dpwszStyleName, dpwszFaceName + - get dpwszUniqueName from 'name' table - dpFontSim: implement - - dpCharSets: implement - fwdMacLineGap: from hhea table - fwdMaxCharInc: check/fix - fwdCapHeight: check/fix - - fwdUnderscorePosition: fix - - chFirstChar, chLastChar, chDefaultChar, chBreakChar: fix - - wcDefaultChar, wcBreakChar: fix - ptlBaseline: fix - ptlCaret: use hhea table caretSlopeRun, caretSlopeRise - Put most important charset into slot 0 -- FtfdInitGlyphSet: 100% done +- FtfdInitGlyphSet: 90% done + - completely handle symbol and other charsets - FtfdInitKerningPairs: 90% done - Should we do complete glyph -> unicode expansion? @@ -55,6 +52,7 @@ - FtfdCreateFontInstance: 95% - FtfdGetFontInstance: 100% done - FtfdQueryMaxExtents: 90% done + - check lNonLinear* and lMin* - FtfdLoadGlyph: 80% done - hande accelerator flags for bitmap / outline @@ -62,17 +60,20 @@ - handle vertical layout - handle ptqD for rotation / skewing -- FtfdQueryGlyphBits: 90% depends on FtfdCopyBitmap4Bpp and FtfdCopyBitmap1Bpp +- FtfdQueryGlyphBits: 90% depends on FtfdCopyBits - FtfdQueryGlyphOutline: unimplemented -- FtfdCopyBitmap4Bpp: 90 % +- FtfdCopyBits: 70 % depends on FtfdCopyBits_S1D1, FtfdCopyBits_S1D4, + FtfdCopyBits_S8D1, FtfdCopyBits_S8D4 + +- FtfdCopyBits_S1D1: 95 % + - Can we use full memcpy? +- FtfdCopyBits_S1D4: 100 % +- FtfdCopyBits_S8D1: unimpemented +- FtfdCopyBits_S8D4: 90% - add rounding - - Could need optimization -- FtfdCopyBitmap1Bpp: 90 % - - Can we use full memcpy? When replacing the original ttf driver ----------------------------------------------- -- Horizontal metrics are broken -- Marlett symbols are wrong +- arrow symbol in startmenu is broken

1 0

[janderwald] 51852: [OHCI] - Add check that controller is functional state - enable interrupts after the controller has been started - partly implement isr routine
by janderwald＠svn.reactos.org 22 May '11

22 May '11

Author: janderwald Date: Sun May 22 20:48:50 2011 New Revision: 51852 URL: http://svn.reactos.org/svn/reactos?rev=51852&view=rev Log: [OHCI] - Add check that controller is functional state - enable interrupts after the controller has been started - partly implement isr routine Modified: branches/usb-bringup/drivers/usb/usbohci/hardware.cpp branches/usb-bringup/drivers/usb/usbohci/usbohci.h Modified: branches/usb-bringup/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Sun May 22 20:48:50 2011 @@ -22,7 +22,7 @@ VOID NTAPI -EhciDefferedRoutine( +OhciDefferedRoutine( IN PKDPC Dpc, IN PVOID DeferredContext, IN PVOID SystemArgument1, @@ -82,7 +82,7 @@ // friend function friend BOOLEAN NTAPI InterruptServiceRoutine(IN PKINTERRUPT Interrupt, IN PVOID ServiceContext); - friend VOID NTAPI EhciDefferedRoutine(IN PKDPC Dpc, IN PVOID DeferredContext, IN PVOID SystemArgument1, IN PVOID SystemArgument2); + friend VOID NTAPI OhciDefferedRoutine(IN PKDPC Dpc, IN PVOID DeferredContext, IN PVOID SystemArgument1, IN PVOID SystemArgument2); friend VOID NTAPI StatusChangeWorkItemRoutine(PVOID Context); // constructor / destructor CUSBHardwareDevice(IUnknown *OuterUnknown){} @@ -249,7 +249,7 @@ case CmResourceTypeInterrupt: { KeInitializeDpc(&m_IntDpcObject, - EhciDefferedRoutine, + OhciDefferedRoutine, this); Status = IoConnectInterrupt(&m_Interrupt, @@ -522,6 +522,21 @@ WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_CONTROL_OFFSET), Control); // + // wait a bit + // + KeStallExecutionProcessor(100); + + // + // is the controller started + // + Control = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_CONTROL_OFFSET)); + + // + // assert that the controller has been started + // + ASSERT((Control & OHCI_HC_FUNCTIONAL_STATE_MASK) == OHCI_HC_FUNCTIONAL_STATE_OPERATIONAL); + + // // retrieve number of ports // for(Index = 0; Index < 10; Index++) @@ -562,6 +577,12 @@ // print out number ports // DPRINT1("NumberOfPorts %lu\n", m_NumberOfPorts); + + + // + // now enable the interrupts + // + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_INTERRUPT_ENABLE_OFFSET), OHCI_NORMAL_INTERRUPTS | OHCI_MASTER_INTERRUPT_ENABLE); // // done @@ -938,19 +959,150 @@ IN PKINTERRUPT Interrupt, IN PVOID ServiceContext) { - ASSERT(FALSE); + CUSBHardwareDevice *This; + ULONG DoneHead, Status, Acknowledge = 0; + + // + // get context + // + This = (CUSBHardwareDevice*) ServiceContext; + + DPRINT1("InterruptServiceRoutine\n"); + + // + // get done head + // + DoneHead = This->m_HCCA->DoneHead; + + // + // check if zero + // + if (DoneHead == 0) + { + // + // the interrupt was not caused by DoneHead update + // check if something important happened + // + Status = READ_REGISTER_ULONG((PULONG)((PUCHAR)This->m_Base + OHCI_INTERRUPT_STATUS_OFFSET)) & READ_REGISTER_ULONG((PULONG)((PUCHAR)This->m_Base + OHCI_INTERRUPT_ENABLE_OFFSET)) & (~OHCI_WRITEBACK_DONE_HEAD); + if (Status == 0) + { + // + // nothing happened, appears to be shared interrupt + // + return FALSE; + } + } + else + { + // + // DoneHead update happened, check if there are other events too + // + Status = OHCI_WRITEBACK_DONE_HEAD; + + // + // since ed descriptors are 16 byte aligned, the controller sets the lower bits if there were other interrupt requests + // + if (DoneHead & OHCI_DONE_INTERRUPTS) + { + // + // get other events + // + Status |= READ_REGISTER_ULONG((PULONG)((PUCHAR)This->m_Base + OHCI_INTERRUPT_STATUS_OFFSET)) & READ_REGISTER_ULONG((PULONG)((PUCHAR)This->m_Base + OHCI_INTERRUPT_ENABLE_OFFSET)); + } + } + + // + // sanity check + // + ASSERT(Status != 0); + + if (Status & OHCI_WRITEBACK_DONE_HEAD) + { + // + // head completed + // + DPRINT1("InterruptServiceRoutine> Done Head completion\n"); + + // + // FIXME: handle event + // + Acknowledge |= OHCI_WRITEBACK_DONE_HEAD; + } + + if (Status & OHCI_RESUME_DETECTED) + { + // + // resume + // + DPRINT1("InterruptServiceRoutine> Resume\n"); + Acknowledge |= OHCI_RESUME_DETECTED; + } + + + if (Status & OHCI_UNRECOVERABLE_ERROR) + { + DPRINT1("InterruptServiceRoutine> Controller error\n"); + // + // halt controller + // + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)(This->m_Base + OHCI_CONTROL_OFFSET)), OHCI_HC_FUNCTIONAL_STATE_RESET); + } + + if (Status & OHCI_ROOT_HUB_STATUS_CHANGE) + { + // + // new device has arrived + // + DPRINT1("InterruptServiceRoutine> New Device arrival\n"); + + // + // disable interrupt as it will fire untill the port has been reset + // + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)(This->m_Base + OHCI_INTERRUPT_DISABLE_OFFSET)), OHCI_ROOT_HUB_STATUS_CHANGE); + Acknowledge |= OHCI_ROOT_HUB_STATUS_CHANGE; + } + + // + // is there something to acknowledge + // + if (Acknowledge) + { + // + // ack change + // + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)(This->m_Base + OHCI_INTERRUPT_STATUS_OFFSET)), Acknowledge); + } + + // + // defer processing + // + DPRINT1("Status %x\n", Status); + KeInsertQueueDpc(&This->m_IntDpcObject, This, (PVOID)Status); + + // + // interrupt handled + // return TRUE; } -VOID NTAPI -EhciDefferedRoutine( +VOID +NTAPI +OhciDefferedRoutine( IN PKDPC Dpc, IN PVOID DeferredContext, IN PVOID SystemArgument1, IN PVOID SystemArgument2) { - ASSERT(FALSE); - return; + CUSBHardwareDevice *This; + ULONG CStatus; + + // + // get parameters + // + This = (CUSBHardwareDevice*) SystemArgument1; + CStatus = (ULONG) SystemArgument2; + + } VOID Modified: branches/usb-bringup/drivers/usb/usbohci/usbohci.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbohci/usbohci.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbohci/usbohci.h [iso-8859-1] Sun May 22 20:48:50 2011 @@ -49,7 +49,7 @@ // // tag for allocations // -#define TAG_USBOHCI 'ICHE' +#define TAG_USBOHCI 'ICHO' // // assert for c++ - taken from portcls

1 0

[janderwald] 51851: [USBOHCI] - Start of OHCI support - Based on new usbehci driver and Haiku USB Stack - Driver initializes the controller and retrieve number of ports
by janderwald＠svn.reactos.org 22 May '11

22 May '11

Author: janderwald Date: Sun May 22 19:36:13 2011 New Revision: 51851 URL: http://svn.reactos.org/svn/reactos?rev=51851&view=rev Log: [USBOHCI] - Start of OHCI support - Based on new usbehci driver and Haiku USB Stack - Driver initializes the controller and retrieve number of ports Added: branches/usb-bringup/drivers/usb/usbohci/ (props changed) - copied from r51850, branches/usb-bringup/drivers/usb/usbehci_new/ branches/usb-bringup/drivers/usb/usbohci/usbohci.cpp - copied, changed from r51850, branches/usb-bringup/drivers/usb/usbehci_new/usbehci.cpp branches/usb-bringup/drivers/usb/usbohci/usbohci.h - copied, changed from r51850, branches/usb-bringup/drivers/usb/usbehci_new/usbehci.h branches/usb-bringup/drivers/usb/usbohci/usbohci.rc - copied, changed from r51850, branches/usb-bringup/drivers/usb/usbehci_new/usbehci.rc Removed: branches/usb-bringup/drivers/usb/usbohci/usbehci.cpp branches/usb-bringup/drivers/usb/usbohci/usbehci.h branches/usb-bringup/drivers/usb/usbohci/usbehci.rc Modified: branches/usb-bringup/drivers/usb/usbohci/CMakeLists.txt branches/usb-bringup/drivers/usb/usbohci/hardware.cpp branches/usb-bringup/drivers/usb/usbohci/hardware.h branches/usb-bringup/drivers/usb/usbohci/hcd_controller.cpp branches/usb-bringup/drivers/usb/usbohci/hub_controller.cpp branches/usb-bringup/drivers/usb/usbohci/interfaces.h branches/usb-bringup/drivers/usb/usbohci/memory_manager.cpp branches/usb-bringup/drivers/usb/usbohci/misc.cpp branches/usb-bringup/drivers/usb/usbohci/purecall.cpp branches/usb-bringup/drivers/usb/usbohci/usb_device.cpp branches/usb-bringup/drivers/usb/usbohci/usb_queue.cpp branches/usb-bringup/drivers/usb/usbohci/usb_request.cpp [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/usb-bringup/drivers/usb/usbohci/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… Modified: branches/usb-bringup/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… Modified: branches/usb-bringup/drivers/usb/usbohci/hardware.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… Modified: branches/usb-bringup/drivers/usb/usbohci/hcd_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… Modified: branches/usb-bringup/drivers/usb/usbohci/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… Modified: branches/usb-bringup/drivers/usb/usbohci/interfaces.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… Modified: branches/usb-bringup/drivers/usb/usbohci/memory_manager.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… Modified: branches/usb-bringup/drivers/usb/usbohci/misc.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… Modified: branches/usb-bringup/drivers/usb/usbohci/purecall.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… Modified: branches/usb-bringup/drivers/usb/usbohci/usb_device.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… Modified: branches/usb-bringup/drivers/usb/usbohci/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… Modified: branches/usb-bringup/drivers/usb/usbohci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… Removed: branches/usb-bringup/drivers/usb/usbohci/usbehci.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… Removed: branches/usb-bringup/drivers/usb/usbohci/usbehci.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… Removed: branches/usb-bringup/drivers/usb/usbohci/usbehci.rc URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… Copied: branches/usb-bringup/drivers/usb/usbohci/usbohci.cpp (from r51850, branches/usb-bringup/drivers/usb/usbehci_new/usbehci.cpp) URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… Copied: branches/usb-bringup/drivers/usb/usbohci/usbohci.h (from r51850, branches/usb-bringup/drivers/usb/usbehci_new/usbehci.h) URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… Copied: branches/usb-bringup/drivers/usb/usbohci/usbohci.rc (from r51850, branches/usb-bringup/drivers/usb/usbehci_new/usbehci.rc) URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci…

1 0

[tkreuzer] 51850: [GDI FONT DRIVER] - Calculate fxMaxAscender and fxMaxDescender for the FD_DEVICEMETRICS differenly
by tkreuzer＠svn.reactos.org 22 May '11

22 May '11

Author: tkreuzer Date: Sun May 22 17:36:34 2011 New Revision: 51850 URL: http://svn.reactos.org/svn/reactos?rev=51850&view=rev Log: [GDI FONT DRIVER] - Calculate fxMaxAscender and fxMaxDescender for the FD_DEVICEMETRICS differenly Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h [iso-8859-1] Sun May 22 17:36:34 2011 @@ -114,19 +114,22 @@ PFTFD_FACE apface[1]; } FTFD_FILE, *PFTFD_FILE; -typedef union _FTFD_DEVICEMETRICS -{ - POINTL aptl[10]; - struct +typedef struct _FTFD_DEVICEMETRICS +{ + union { - POINTFIX ptfxMaxAscender; - POINTFIX ptfxMaxDescender; - POINTL ptlUnderline1; - POINTL ptlStrikeout; - POINTL ptlULThickness; - POINTL ptlSOThickness; - POINTL aptlBBox[4]; + POINTL aptl[8]; + struct + { + POINTL ptlUnderline1; + POINTL ptlStrikeout; + POINTL ptlULThickness; + POINTL ptlSOThickness; + POINTL aptlBBox[4]; + }; }; + FIX fxMaxAscender; + FIX fxMaxDescender; } FTFD_DEVICEMETRICS; typedef struct _POINTEF 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] Sun May 22 17:36:34 2011 @@ -146,6 +146,14 @@ /* Normalize the base vectors and get their length */ efScaleX = FtfdNormalizeBaseVector(&pfont->ptefBase); efScaleY = FtfdNormalizeBaseVector(&pfont->ptefSide); + + /* Calculate maximum ascender and descender */ + efTemp = efScaleY; + FLOATOBJ_MulLong(&efTemp, pface->ifiex.ifi.fwdWinAscender << 4); + pfont->metrics.fxMaxAscender = FLOATOBJ_GetLong(&efTemp); + efTemp = efScaleY; + FLOATOBJ_MulLong(&efTemp, pface->ifiex.ifi.fwdWinDescender << 4); + pfont->metrics.fxMaxDescender = FLOATOBJ_GetLong(&efTemp); /* The coordinate transformation given by Windows transforms from font * space to device space. Since we use FT_Set_Char_Size, which allows @@ -221,10 +229,6 @@ /* Prepare required coordinates in font space */ pmetrics = &pfont->metrics; - pmetrics->ptfxMaxAscender.x = 0; - pmetrics->ptfxMaxAscender.y = pface->ifiex.ifi.fwdWinAscender << 4; - pmetrics->ptfxMaxDescender.x = 0; - pmetrics->ptfxMaxDescender.y = pface->ifiex.ifi.fwdWinDescender << 4; pmetrics->ptlUnderline1.x = 0; pmetrics->ptlUnderline1.y = -pface->ifiex.ifi.fwdUnderscorePosition; pmetrics->ptlStrikeout.x = 0; @@ -243,7 +247,7 @@ pmetrics->aptlBBox[3].y = ftface->bbox.yMax; /* Transform all coordinates into device space */ - if (!XFORMOBJ_bApplyXform(pxo, XF_LTOL, 10, pmetrics->aptl, pmetrics->aptl)) + if (!XFORMOBJ_bApplyXform(pxo, XF_LTOL, 8, pmetrics->aptl, pmetrics->aptl)) { WARN("Failed apply coordinate transformation.\n"); EngFreeMem(pfont); @@ -332,8 +336,8 @@ pfddm->lD = 0; /* Copy some values from the font structure */ - pfddm->fxMaxAscender = pfont->metrics.ptfxMaxAscender.y; - pfddm->fxMaxDescender = pfont->metrics.ptfxMaxDescender.y; + pfddm->fxMaxAscender = pfont->metrics.fxMaxAscender; + pfddm->fxMaxDescender = pfont->metrics.fxMaxDescender; pfddm->ptlUnderline1 = pfont->metrics.ptlUnderline1; pfddm->ptlStrikeout = pfont->metrics.ptlStrikeout; pfddm->ptlULThickness = pfont->metrics.ptlULThickness;

1 0

[tkreuzer] 51849: [GDI FONT DRIVER] - Improve BITMAP_SIZE macro - Make the bitmaps always at least 1x1 pixel in size (fixes a crash, when opening desktop context menu) - Calculate maximum extents b...
by tkreuzer＠svn.reactos.org 22 May '11

22 May '11

Author: tkreuzer Date: Sun May 22 16:07:23 2011 New Revision: 51849 URL: http://svn.reactos.org/svn/reactos?rev=51849&view=rev Log: [GDI FONT DRIVER] - Improve BITMAP_SIZE macro - Make the bitmaps always at least 1x1 pixel in size (fixes a crash, when opening desktop context menu) - Calculate maximum extents by transforming all 4 coordinates of the bounding box. Fixes broken sizes being calculated when the glyph is rotated. Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h [iso-8859-1] Sun May 22 16:07:23 2011 @@ -116,7 +116,7 @@ typedef union _FTFD_DEVICEMETRICS { - POINTL aptl[7]; + POINTL aptl[10]; struct { POINTFIX ptfxMaxAscender; @@ -125,7 +125,7 @@ POINTL ptlStrikeout; POINTL ptlULThickness; POINTL ptlSOThickness; - SIZEL sizlMax; + POINTL aptlBBox[4]; }; } FTFD_DEVICEMETRICS; @@ -144,6 +144,8 @@ FT_Face ftface; FD_XFORM fdxQuantized; FTFD_DEVICEMETRICS metrics; + RECTL rclBBox; + SIZEL sizlMax; POINTEF ptefBase; POINTEF ptefSide; SIZEL sizlScale; 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] Sun May 22 16:07:23 2011 @@ -12,7 +12,7 @@ #define FLOATL_1 0x3f800000 #define BITMAP_SIZE(cx, cy, bpp) \ - ((((((cx * bpp) + 7) >> 3) * cy) + 3) & ~3) + (((((((cx) * (bpp)) + 7) >> 3) * (cy)) + 3) & ~3) #define GLYPHBITS_SIZE(cx, cy, bpp) \ (FIELD_OFFSET(GLYPHBITS, aj) + BITMAP_SIZE(cx, cy, bpp)) @@ -233,16 +233,40 @@ pmetrics->ptlULThickness.y = pface->ifiex.ifi.fwdUnderscoreSize; pmetrics->ptlSOThickness.x = 0; pmetrics->ptlSOThickness.y = pface->ifiex.ifi.fwdStrikeoutSize; - pmetrics->sizlMax.cx = ftface->bbox.xMax - ftface->bbox.xMin; - pmetrics->sizlMax.cy = ftface->bbox.yMax - ftface->bbox.yMin; + pmetrics->aptlBBox[0].x = ftface->bbox.xMin; + pmetrics->aptlBBox[0].y = ftface->bbox.yMin; + pmetrics->aptlBBox[1].x = ftface->bbox.xMax; + pmetrics->aptlBBox[1].y = ftface->bbox.yMin; + pmetrics->aptlBBox[2].x = ftface->bbox.xMax; + pmetrics->aptlBBox[2].y = ftface->bbox.yMax; + pmetrics->aptlBBox[3].x = ftface->bbox.xMin; + pmetrics->aptlBBox[3].y = ftface->bbox.yMax; /* Transform all coordinates into device space */ - if (!XFORMOBJ_bApplyXform(pxo, XF_LTOL, 7, pmetrics->aptl, pmetrics->aptl)) + if (!XFORMOBJ_bApplyXform(pxo, XF_LTOL, 10, pmetrics->aptl, pmetrics->aptl)) { WARN("Failed apply coordinate transformation.\n"); EngFreeMem(pfont); return NULL; } + + /* Extract the bounding box in device coordinates */ + pfont->rclBBox.left = min(pmetrics->aptlBBox[0].x, pmetrics->aptlBBox[1].x); + pfont->rclBBox.left = min(pfont->rclBBox.left, pmetrics->aptlBBox[2].x); + pfont->rclBBox.left = min(pfont->rclBBox.left, pmetrics->aptlBBox[3].x); + pfont->rclBBox.right = max(pmetrics->aptlBBox[0].x, pmetrics->aptlBBox[1].x); + pfont->rclBBox.right = max(pfont->rclBBox.right, pmetrics->aptlBBox[2].x); + pfont->rclBBox.right = max(pfont->rclBBox.right, pmetrics->aptlBBox[3].x); + pfont->rclBBox.top = min(pmetrics->aptlBBox[0].y, pmetrics->aptlBBox[1].y); + pfont->rclBBox.top = min(pfont->rclBBox.top, pmetrics->aptlBBox[2].y); + pfont->rclBBox.top = min(pfont->rclBBox.top, pmetrics->aptlBBox[3].y); + pfont->rclBBox.bottom = max(pmetrics->aptlBBox[0].y, pmetrics->aptlBBox[1].y); + pfont->rclBBox.bottom = max(pfont->rclBBox.bottom, pmetrics->aptlBBox[2].y); + pfont->rclBBox.bottom = max(pfont->rclBBox.bottom, pmetrics->aptlBBox[3].y); + + /* Calculate maximum extents */ + pfont->sizlMax.cx = pfont->rclBBox.right - pfont->rclBBox.left; + pfont->sizlMax.cy = pfont->rclBBox.bottom - pfont->rclBBox.top; /* Fixup some minimum values */ if (pmetrics->ptlULThickness.y <= 0) pmetrics->ptlULThickness.y = 1; @@ -314,8 +338,8 @@ pfddm->ptlStrikeout = pfont->metrics.ptlStrikeout; pfddm->ptlULThickness = pfont->metrics.ptlULThickness; pfddm->ptlSOThickness = pfont->metrics.ptlSOThickness; - pfddm->cxMax = pfont->metrics.sizlMax.cx; - pfddm->cyMax = pfont->metrics.sizlMax.cy; + pfddm->cxMax = pfont->sizlMax.cx; + pfddm->cyMax = pfont->sizlMax.cy; /* Convert the base vectors from FLOATOBJ to FLOATL */ pfddm->pteBase.x = FLOATOBJ_GetFloat(&pfont->ptefBase.x); @@ -414,19 +438,26 @@ pgd->rclInk.right = pgd->rclInk.left + ftglyph->bitmap.width; pgd->rclInk.bottom = pgd->rclInk.top + ftglyph->bitmap.rows; + /* Make the bitmap at least 1x1 pixel large */ + if (ftglyph->bitmap.width == 0) pgd->rclInk.right++; + if (ftglyph->bitmap.rows == 0) pgd->rclInk.bottom++; + /* FIX representation of bitmap top and bottom */ pgd->fxInkBottom = (-pgd->rclInk.bottom) << 4; pgd->fxInkTop = pgd->rclInk.top << 4; - - /* Make the bitmap at least 1x1 pixel large */ - if (ftglyph->bitmap.width == 0) pgd->rclInk.right++; - if (ftglyph->bitmap.rows == 0) pgd->rclInk.bottom++; // FIXME: pgd->ptqD.x.LowPart = pgd->fxD; pgd->ptqD.x.HighPart = 0; pgd->ptqD.y.LowPart = 0; pgd->ptqD.y.HighPart = 0; + + if (ftglyph->bitmap.width > pfont->sizlMax.cx || + ftglyph->bitmap.rows > pfont->sizlMax.cy) + { + __debugbreak(); + } + //__debugbreak(); } @@ -446,6 +477,18 @@ pgb->sizlBitmap.cx = ftglyph->bitmap.width; pgb->sizlBitmap.cy = ftglyph->bitmap.rows; + /* Make the bitmap at least 1x1 pixel large */ + if (pgb->sizlBitmap.cx == 0) pgb->sizlBitmap.cx++; + if (pgb->sizlBitmap.cy == 0) pgb->sizlBitmap.cy++; + + if (pgb->sizlBitmap.cx > pfont->sizlMax.cx || + pgb->sizlBitmap.cy > pfont->sizlMax.cy) + { + WARN("The size of the bitmap exceeds the maximum size\n"); + __debugbreak(); + return; + } + cjBitmapSize = BITMAP_SIZE(pgb->sizlBitmap.cx, pgb->sizlBitmap.cy, pfont->jBpp); @@ -472,7 +515,8 @@ PATHOBJ *ppo, ULONG cjSize) { - + WARN("FtfdQueryGlyphOutline is unimplemented\n"); + __debugbreak(); } BOOL @@ -507,6 +551,7 @@ ULONG cjSize) { PFTFD_FONT pfont = FtfdGetFontInstance(pfo); + ULONG cx, cy; //TRACE("FtfdQueryFontData, iMode=%ld, hg=%lx, pgd=%p, pv=%p, cjSize=%ld\n", // iMode, hg, pgd, pv, cjSize); @@ -528,9 +573,11 @@ FtfdQueryGlyphBits(pfo, hg, pv, cjSize); } - /* Return the size for a 1bpp bitmap */ - return GLYPHBITS_SIZE(pfont->ftface->glyph->bitmap.width, - pfont->ftface->glyph->bitmap.rows, + /* Return the size for a bitmap at least 1x1 pixels */ + cx = pfont->ftface->glyph->bitmap.width; + cy = pfont->ftface->glyph->bitmap.rows; + return GLYPHBITS_SIZE(cx > 0 ? cx : 1, + cy > 0 ? cy : 1, pfont->jBpp); case QFD_GLYPHANDOUTLINE:

1 0

[gadamopoulos] 51848: [uxtheme] - Implement handling WM_NCHITTEST
by gadamopoulos＠svn.reactos.org 22 May '11

22 May '11

Author: gadamopoulos Date: Sun May 22 15:47:47 2011 New Revision: 51848 URL: http://svn.reactos.org/svn/reactos?rev=51848&view=rev Log: [uxtheme] - Implement handling WM_NCHITTEST Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c [iso-8859-1] Sun May 22 15:47:47 2011 @@ -7,6 +7,7 @@ */ #include <windows.h> +#include <windowsx.h> #include "undocuser.h" #include "vfwmsgs.h" #include "uxtheme.h" @@ -47,6 +48,12 @@ BUTTON_DISABLED , BUTTON_INACTIVE } THEME_BUTTON_STATES; + +#define HASSIZEGRIP(Style, ExStyle, ParentStyle, WindowRect, ParentClientRect) \ + ((!(Style & WS_CHILD) && (Style & WS_THICKFRAME) && !(Style & WS_MAXIMIZE)) || \ + ((Style & WS_CHILD) && (ParentStyle & WS_THICKFRAME) && !(ParentStyle & WS_MAXIMIZE) && \ + (WindowRect.right - WindowRect.left == ParentClientRect.right) && \ + (WindowRect.bottom - WindowRect.top == ParentClientRect.bottom))) #define HAS_MENU(hwnd,style) ((((style) & (WS_CHILD | WS_POPUP)) != WS_CHILD) && GetMenu(hwnd)) @@ -640,6 +647,228 @@ if (Pressed) SendMessageW(hWnd, WM_SYSCOMMAND, SCMsg, 0); +} + + +static LRESULT +DefWndNCHitTest(HWND hWnd, POINT Point) +{ + RECT WindowRect; + POINT ClientPoint; + WINDOWINFO wi; + + GetWindowInfo(hWnd, &wi); + + if (!PtInRect(&wi.rcWindow, Point)) + { + return HTNOWHERE; + } + WindowRect = wi.rcWindow; + + if (UserHasWindowEdge(wi.dwStyle, wi.dwExStyle)) + { + LONG XSize, YSize; + + InflateRect(&WindowRect, -(int)wi.cxWindowBorders, -(int)wi.cyWindowBorders); + XSize = GetSystemMetrics(SM_CXSIZE) * GetSystemMetrics(SM_CXBORDER); + YSize = GetSystemMetrics(SM_CYSIZE) * GetSystemMetrics(SM_CYBORDER); + if (!PtInRect(&WindowRect, Point)) + { + BOOL ThickFrame; + + ThickFrame = (wi.dwStyle & WS_THICKFRAME); + if (Point.y < WindowRect.top) + { + if(wi.dwStyle & WS_MINIMIZE) + return HTCAPTION; + if(!ThickFrame) + return HTBORDER; + if (Point.x < (WindowRect.left + XSize)) + return HTTOPLEFT; + if (Point.x >= (WindowRect.right - XSize)) + return HTTOPRIGHT; + return HTTOP; + } + if (Point.y >= WindowRect.bottom) + { + if(wi.dwStyle & WS_MINIMIZE) + return HTCAPTION; + if(!ThickFrame) + return HTBORDER; + if (Point.x < (WindowRect.left + XSize)) + return HTBOTTOMLEFT; + if (Point.x >= (WindowRect.right - XSize)) + return HTBOTTOMRIGHT; + return HTBOTTOM; + } + if (Point.x < WindowRect.left) + { + if(wi.dwStyle & WS_MINIMIZE) + return HTCAPTION; + if(!ThickFrame) + return HTBORDER; + if (Point.y < (WindowRect.top + YSize)) + return HTTOPLEFT; + if (Point.y >= (WindowRect.bottom - YSize)) + return HTBOTTOMLEFT; + return HTLEFT; + } + if (Point.x >= WindowRect.right) + { + if(wi.dwStyle & WS_MINIMIZE) + return HTCAPTION; + if(!ThickFrame) + return HTBORDER; + if (Point.y < (WindowRect.top + YSize)) + return HTTOPRIGHT; + if (Point.y >= (WindowRect.bottom - YSize)) + return HTBOTTOMRIGHT; + return HTRIGHT; + } + } + } + else + { + if (wi.dwExStyle & WS_EX_STATICEDGE) + InflateRect(&WindowRect, -GetSystemMetrics(SM_CXBORDER), + -GetSystemMetrics(SM_CYBORDER)); + if (!PtInRect(&WindowRect, Point)) + return HTBORDER; + } + + if ((wi.dwStyle & WS_CAPTION) == WS_CAPTION) + { + if (wi.dwExStyle & WS_EX_TOOLWINDOW) + WindowRect.top += GetSystemMetrics(SM_CYSMCAPTION); + else + WindowRect.top += GetSystemMetrics(SM_CYCAPTION); + + if (!PtInRect(&WindowRect, Point)) + { + + INT ButtonWidth; + + if (wi.dwExStyle & WS_EX_TOOLWINDOW) + ButtonWidth = GetSystemMetrics(SM_CXSMSIZE); + else + ButtonWidth = GetSystemMetrics(SM_CXSIZE); + + ButtonWidth -= 4; + ButtonWidth+= BUTTON_GAP_SIZE; + + if (wi.dwStyle & WS_SYSMENU) + { + if (wi.dwExStyle & WS_EX_TOOLWINDOW) + { + WindowRect.right -= ButtonWidth; + } + else + { + if(!(wi.dwExStyle & WS_EX_DLGMODALFRAME)) + WindowRect.left += ButtonWidth; + WindowRect.right -= ButtonWidth; + } + } + if (Point.x < WindowRect.left) + return HTSYSMENU; + if (WindowRect.right <= Point.x) + return HTCLOSE; + if (wi.dwStyle & WS_MAXIMIZEBOX || wi.dwStyle & WS_MINIMIZEBOX) + WindowRect.right -= ButtonWidth; + if (Point.x >= WindowRect.right) + return HTMAXBUTTON; + if (wi.dwStyle & WS_MINIMIZEBOX) + WindowRect.right -= ButtonWidth; + if (Point.x >= WindowRect.right) + return HTMINBUTTON; + return HTCAPTION; + } + } + + if(!(wi.dwStyle & WS_MINIMIZE)) + { + HMENU menu; + + ClientPoint = Point; + ScreenToClient(hWnd, &ClientPoint); + GetClientRect(hWnd, &wi.rcClient); + + if (PtInRect(&wi.rcClient, ClientPoint)) + { + return HTCLIENT; + } + + if ((menu = GetMenu(hWnd)) && !(wi.dwStyle & WS_CHILD)) + { + if (Point.x > 0 && Point.x < WindowRect.right && ClientPoint.y < 0) + return HTMENU; + } + + if (wi.dwExStyle & WS_EX_CLIENTEDGE) + { + InflateRect(&WindowRect, -2 * GetSystemMetrics(SM_CXBORDER), + -2 * GetSystemMetrics(SM_CYBORDER)); + } + + if ((wi.dwStyle & WS_VSCROLL) && (wi.dwStyle & WS_HSCROLL) && + (WindowRect.bottom - WindowRect.top) > GetSystemMetrics(SM_CYHSCROLL)) + { + RECT ParentRect, TempRect = WindowRect, TempRect2 = WindowRect; + HWND Parent = GetParent(hWnd); + + TempRect.bottom -= GetSystemMetrics(SM_CYHSCROLL); + if ((wi.dwExStyle & WS_EX_LEFTSCROLLBAR) != 0) + TempRect.right = TempRect.left + GetSystemMetrics(SM_CXVSCROLL); + else + TempRect.left = TempRect.right - GetSystemMetrics(SM_CXVSCROLL); + if (PtInRect(&TempRect, Point)) + return HTVSCROLL; + + TempRect2.top = TempRect2.bottom - GetSystemMetrics(SM_CYHSCROLL); + if ((wi.dwExStyle & WS_EX_LEFTSCROLLBAR) != 0) + TempRect2.left += GetSystemMetrics(SM_CXVSCROLL); + else + TempRect2.right -= GetSystemMetrics(SM_CXVSCROLL); + if (PtInRect(&TempRect2, Point)) + return HTHSCROLL; + + TempRect.top = TempRect2.top; + TempRect.bottom = TempRect2.bottom; + if(Parent) + GetClientRect(Parent, &ParentRect); + if (PtInRect(&TempRect, Point) && HASSIZEGRIP(wi.dwStyle, wi.dwExStyle, + GetWindowLongW(Parent, GWL_STYLE), wi.rcWindow, ParentRect)) + { + if ((wi.dwExStyle & WS_EX_LEFTSCROLLBAR) != 0) + return HTBOTTOMLEFT; + else + return HTBOTTOMRIGHT; + } + } + else + { + if (wi.dwStyle & WS_VSCROLL) + { + RECT TempRect = WindowRect; + + if ((wi.dwExStyle & WS_EX_LEFTSCROLLBAR) != 0) + TempRect.right = TempRect.left + GetSystemMetrics(SM_CXVSCROLL); + else + TempRect.left = TempRect.right - GetSystemMetrics(SM_CXVSCROLL); + if (PtInRect(&TempRect, Point)) + return HTVSCROLL; + } + else if (wi.dwStyle & WS_HSCROLL) + { + RECT TempRect = WindowRect; + TempRect.top = TempRect.bottom - GetSystemMetrics(SM_CYHSCROLL); + if (PtInRect(&TempRect, Point)) + return HTHSCROLL; + } + } + } + + return HTNOWHERE; } LRESULT CALLBACK @@ -669,6 +898,13 @@ default: return DefWndProc(hWnd, Msg, wParam, lParam); } + case WM_NCHITTEST: + { + POINT Point; + Point.x = GET_X_LPARAM(lParam); + Point.y = GET_Y_LPARAM(lParam); + return DefWndNCHitTest(hWnd, Point); + } default: return DefWndProc(hWnd, Msg, wParam, lParam); }

1 0

[gadamopoulos] 51847: [uxtheme] - Implement DrawClassicFrame, heavily based on user32
by gadamopoulos＠svn.reactos.org 22 May '11

22 May '11

Author: gadamopoulos Date: Sun May 22 15:37:32 2011 New Revision: 51847 URL: http://svn.reactos.org/svn/reactos?rev=51847&view=rev Log: [uxtheme] - Implement DrawClassicFrame, heavily based on user32 Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c [iso-8859-1] Sun May 22 15:37:32 2011 @@ -69,6 +69,22 @@ } return ret; +} + +static BOOL +UserHasWindowEdge(DWORD Style, DWORD ExStyle) +{ + if (Style & WS_MINIMIZE) + return TRUE; + if (ExStyle & WS_EX_DLGMODALFRAME) + return TRUE; + if (ExStyle & WS_EX_STATICEDGE) + return FALSE; + if (Style & WS_THICKFRAME) + return TRUE; + if (Style == WS_DLGFRAME || Style == WS_CAPTION) + return TRUE; + return FALSE; } HICON @@ -395,7 +411,71 @@ static void DrawClassicFrame(PDRAW_CONTEXT context, RECT* prcCurrent) { - + /* Draw outer edge */ + if (UserHasWindowEdge(context->wi.dwStyle, context->wi.dwExStyle)) + { + DrawEdge(context->hDC, prcCurrent, EDGE_RAISED, BF_RECT | BF_ADJUST); + } + else if (context->wi.dwExStyle & WS_EX_STATICEDGE) + { + DrawEdge(context->hDC, prcCurrent, BDR_SUNKENINNER, BF_RECT | BF_ADJUST | BF_FLAT); + } + + /* Firstly the "thick" frame */ + if ((context->wi.dwStyle & WS_THICKFRAME) && !(context->wi.dwStyle & WS_MINIMIZE)) + { + INT Width = + (GetSystemMetrics(SM_CXFRAME) - GetSystemMetrics(SM_CXDLGFRAME)) * + GetSystemMetrics(SM_CXBORDER); + INT Height = + (GetSystemMetrics(SM_CYFRAME) - GetSystemMetrics(SM_CYDLGFRAME)) * + GetSystemMetrics(SM_CYBORDER); + + SelectObject(context->hDC, GetSysColorBrush( + context->Active ? COLOR_ACTIVEBORDER : COLOR_INACTIVEBORDER)); + + /* Draw frame */ + PatBlt(context->hDC, prcCurrent->left, prcCurrent->top, + prcCurrent->right - prcCurrent->left, Height, PATCOPY); + PatBlt(context->hDC, prcCurrent->left, prcCurrent->top, + Width, prcCurrent->bottom - prcCurrent->top, PATCOPY); + PatBlt(context->hDC, prcCurrent->left, prcCurrent->bottom, + prcCurrent->right - prcCurrent->left, -Height, PATCOPY); + PatBlt(context->hDC, prcCurrent->right, prcCurrent->top, + -Width, prcCurrent->bottom - prcCurrent->top, PATCOPY); + + InflateRect(prcCurrent, -Width, -Height); + } + + /* Now the other bit of the frame */ + if (context->wi.dwStyle & (WS_DLGFRAME | WS_BORDER) || context->wi.dwExStyle & WS_EX_DLGMODALFRAME) + { + INT Width = GetSystemMetrics(SM_CXBORDER); + INT Height = GetSystemMetrics(SM_CYBORDER); + + SelectObject(context->hDC, GetSysColorBrush( + (context->wi.dwExStyle & (WS_EX_DLGMODALFRAME | WS_EX_CLIENTEDGE)) ? COLOR_3DFACE : + (context->wi.dwExStyle & WS_EX_STATICEDGE) ? COLOR_WINDOWFRAME : + (context->wi.dwStyle & (WS_DLGFRAME | WS_THICKFRAME)) ? COLOR_3DFACE : + COLOR_WINDOWFRAME)); + + /* Draw frame */ + PatBlt(context->hDC, prcCurrent->left, prcCurrent->top, + prcCurrent->right - prcCurrent->left, Height, PATCOPY); + PatBlt(context->hDC, prcCurrent->left, prcCurrent->top, + Width, prcCurrent->bottom - prcCurrent->top, PATCOPY); + PatBlt(context->hDC, prcCurrent->left, prcCurrent->bottom, + prcCurrent->right - prcCurrent->left, -Height, PATCOPY); + PatBlt(context->hDC, prcCurrent->right, prcCurrent->top, + -Width, prcCurrent->bottom - prcCurrent->top, PATCOPY); + + InflateRect(prcCurrent, -Width, -Height); + } + + if (context->wi.dwExStyle & WS_EX_CLIENTEDGE) + { + DrawEdge(context->hDC, prcCurrent, EDGE_SUNKEN, BF_RECT | BF_ADJUST); + } } static void

1 0

[gadamopoulos] 51846: [uxtheme] - Implement handling WM_NCMOUSEMOVE, WM_NCMOUSELEAVE and WM_NCLBUTTONDOWN, needed for painting the caption buttons when the user hovers or clicks them
by gadamopoulos＠svn.reactos.org 22 May '11

22 May '11

Author: gadamopoulos Date: Sun May 22 15:31:18 2011 New Revision: 51846 URL: http://svn.reactos.org/svn/reactos?rev=51846&view=rev Log: [uxtheme] - Implement handling WM_NCMOUSEMOVE, WM_NCMOUSELEAVE and WM_NCLBUTTONDOWN, needed for painting the caption buttons when the user hovers or clicks them Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c [iso-8859-1] Sun May 22 15:31:18 2011 @@ -252,6 +252,48 @@ DrawThemeBackground(pcontext->theme, pcontext->hDC, iPartId, iStateId, &rcPart, NULL); } +static DWORD +ThemeGetButtonState(DWORD htCurrect, DWORD htHot, DWORD htDown, BOOL Active) +{ + if (htHot == htCurrect) + return BUTTON_HOT; + if (!Active) + return BUTTON_INACTIVE; + if (htDown == htCurrect) + return BUTTON_PRESSED; + + return BUTTON_NORMAL; +} + +/* Used only from mouse event handlers */ +static void +ThemeDrawCaptionButtons(PDRAW_CONTEXT pcontext, DWORD htHot, DWORD htDown) +{ + RECT rcCurrent; + + /* Check if the window has caption buttons */ + if (!((pcontext->wi.dwStyle & WS_CAPTION) && (pcontext->wi.dwStyle & WS_SYSMENU))) + return ; + + rcCurrent.top = rcCurrent.left = 0; + rcCurrent.right = pcontext->wi.rcWindow.right - pcontext->wi.rcWindow.left; + rcCurrent.bottom = pcontext->CaptionHeight; + + /* Add a padding around the objects of the caption */ + InflateRect(&rcCurrent, -(int)pcontext->wi.cyWindowBorders-BUTTON_GAP_SIZE, + -(int)pcontext->wi.cyWindowBorders-BUTTON_GAP_SIZE); + + /* Draw the buttons */ + ThemeDrawCaptionButton(pcontext, &rcCurrent, CLOSEBUTTON, + ThemeGetButtonState(HTCLOSE, htHot, htDown, pcontext->Active)); + ThemeDrawCaptionButton(pcontext, &rcCurrent, MAXBUTTON, + ThemeGetButtonState(HTMAXBUTTON, htHot, htDown, pcontext->Active)); + ThemeDrawCaptionButton(pcontext, &rcCurrent, MINBUTTON, + ThemeGetButtonState(HTMINBUTTON, htHot, htDown, pcontext->Active)); + ThemeDrawCaptionButton(pcontext, &rcCurrent, HELPBUTTON, + ThemeGetButtonState(HTHELP, htHot, htDown, pcontext->Active)); +} + static void ThemeDrawCaption(PDRAW_CONTEXT pcontext, RECT* prcCurrent) { @@ -421,6 +463,105 @@ return 0; } +static LRESULT +ThemeHandleNcMouseMove(HWND hWnd, DWORD ht) +{ + DRAW_CONTEXT context; + TRACKMOUSEEVENT tme; + + tme.cbSize = sizeof(TRACKMOUSEEVENT); + tme.dwFlags = TME_QUERY; + tme.hwndTrack = hWnd; + TrackMouseEvent(&tme); + if (tme.dwFlags != (TME_LEAVE | TME_NONCLIENT)) + { + tme.hwndTrack = hWnd; + tme.dwFlags = TME_LEAVE | TME_NONCLIENT; + TrackMouseEvent(&tme); + } + + ThemeInitDrawContext(&context, hWnd, 0); + ThemeDrawCaptionButtons(&context, ht, 0); + ThemeCleanupDrawContext(&context); + + return 0; +} + +static LRESULT +ThemeHandleNcMouseLeave(HWND hWnd) +{ + DRAW_CONTEXT context; + + ThemeInitDrawContext(&context, hWnd, 0); + ThemeDrawCaptionButtons(&context, 0, 0); + ThemeCleanupDrawContext(&context); + + return 0; +} + +static VOID +ThemeHandleButton(HWND hWnd, WPARAM wParam) +{ + MSG Msg; + BOOL Pressed = TRUE, OldState; + WPARAM SCMsg, ht; + ULONG Style; + DRAW_CONTEXT context; + + Style = GetWindowLongW(hWnd, GWL_STYLE); + switch (wParam) + { + case HTCLOSE: + if (!(Style & WS_SYSMENU)) + return; + SCMsg = SC_CLOSE; + break; + case HTMINBUTTON: + if (!(Style & WS_MINIMIZEBOX)) + return; + SCMsg = ((Style & WS_MINIMIZE) ? SC_RESTORE : SC_MINIMIZE); + break; + case HTMAXBUTTON: + if (!(Style & WS_MAXIMIZEBOX)) + return; + SCMsg = ((Style & WS_MAXIMIZE) ? SC_RESTORE : SC_MAXIMIZE); + break; + default : + return; + } + + ThemeInitDrawContext(&context, hWnd, 0); + ThemeDrawCaptionButtons(&context, 0, wParam); + + SetCapture(hWnd); + + for (;;) + { + if (GetMessageW(&Msg, 0, WM_MOUSEFIRST, WM_MOUSELAST) <= 0) + break; + + if (Msg.message == WM_LBUTTONUP) + break; + + if (Msg.message != WM_MOUSEMOVE) + continue; + + OldState = Pressed; + ht = SendMessage(hWnd, WM_NCHITTEST, 0, MAKELPARAM(Msg.pt.x, Msg.pt.y)); + Pressed = (ht == wParam); + + ThemeDrawCaptionButtons(&context, 0, Pressed ? wParam: 0); + } + + ThemeDrawCaptionButtons(&context, 0, 0); + ThemeCleanupDrawContext(&context); + + ReleaseCapture(); + + if (Pressed) + SendMessageW(hWnd, WM_SYSCOMMAND, SCMsg, 0); +} + LRESULT CALLBACK ThemeWndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam, WNDPROC DefWndProc) { @@ -431,6 +572,23 @@ case WM_NCACTIVATE: ThemeHandleNCPaint(hWnd, (HRGN)1); return TRUE; + case WM_NCMOUSEMOVE: + return ThemeHandleNcMouseMove(hWnd, wParam); + case WM_NCMOUSELEAVE: + return ThemeHandleNcMouseLeave(hWnd); + case WM_NCLBUTTONDOWN: + switch (wParam) + { + case HTMINBUTTON: + case HTMAXBUTTON: + case HTCLOSE: + { + ThemeHandleButton(hWnd, wParam); + return 0; + } + default: + return DefWndProc(hWnd, Msg, wParam, lParam); + } default: return DefWndProc(hWnd, Msg, wParam, lParam); }

1 0

[osiejka] 51845: [MSVC] Final fix for MSVC build of base\application resources
by osiejka＠svn.reactos.org 22 May '11

22 May '11

Author: osiejka Date: Sun May 22 13:56:46 2011 New Revision: 51845 URL: http://svn.reactos.org/svn/reactos?rev=51845&view=rev Log: [MSVC] Final fix for MSVC build of base\application resources Modified: trunk/reactos/base/applications/cacls/rsrc.rc trunk/reactos/base/applications/rapps/rsrc.rc trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc Modified: trunk/reactos/base/applications/cacls/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/rs… ============================================================================== --- trunk/reactos/base/applications/cacls/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cacls/rsrc.rc [iso-8859-1] Sun May 22 13:56:46 2011 @@ -23,4 +23,4 @@ // UTF-8 #pragma code_page(65001) -#include "lang/pl-PL.rc +#include "lang/pl-PL.rc" Modified: trunk/reactos/base/applications/rapps/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/rs… ============================================================================== --- trunk/reactos/base/applications/rapps/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rsrc.rc [iso-8859-1] Sun May 22 13:56:46 2011 @@ -12,4 +12,4 @@ #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" #include "lang/sv-SE.rc" -#include "lang/uk-UA.rc +#include "lang/uk-UA.rc" Modified: trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc [iso-8859-1] Sun May 22 13:56:46 2011 @@ -647,4 +647,4 @@ IDS_STATUS_PROCESSES "Procesy: %d" IDS_Not_Responding "Nie odpowiada" IDS_Running "Uruchomiony" -END +END

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