wine-commits October 2011

wine-commits@winehq.org

3 participants
783 discussions

Alexandre Julliard : winex11: Fall back to client-side blit when the source needs palette mapping.
by Alexandre Julliard 11 Oct '11

11 Oct '11

Module: wine Branch: master Commit: 502104045209b68272f121fa0a0962692efcebad URL: http://source.winehq.org/git/wine.git/?a=commit;h=502104045209b68272f121fa0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 10 22:07:17 2011 +0200 winex11: Fall back to client-side blit when the source needs palette mapping. --- dlls/winex11.drv/bitblt.c | 130 +++++++++++++------------------------------- 1 files changed, 39 insertions(+), 91 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index e3703d3..c1df77a 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -583,89 +583,6 @@ int main() /*********************************************************************** - * BITBLT_GetSrcArea - * - * Retrieve an area from the source DC, mapping all the - * pixels to Windows colors. - */ -static int BITBLT_GetSrcArea( X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE *physDevDst, - Pixmap pixmap, GC gc, RECT *visRectSrc ) -{ - XImage *imageSrc; - register INT x, y; - int exposures = 0; - INT width = visRectSrc->right - visRectSrc->left; - INT height = visRectSrc->bottom - visRectSrc->top; - BOOL memdc = (GetObjectType(physDevSrc->dev.hdc) == OBJ_MEMDC); - - if (physDevSrc->depth == 1) - { - /* MSDN says if StretchBlt must convert a bitmap from monochrome - to color or vice versa, the foreground and background color of - the device context are used. In fact, it also applies to the - case when it is converted from mono to mono. */ - wine_tsx11_lock(); - if (X11DRV_PALETTE_XPixelToPalette && physDevDst->depth != 1) - { - XSetBackground( gdi_display, gc, X11DRV_PALETTE_XPixelToPalette[physDevDst->textPixel] ); - XSetForeground( gdi_display, gc, X11DRV_PALETTE_XPixelToPalette[physDevDst->backgroundPixel]); - } - else - { - XSetBackground( gdi_display, gc, physDevDst->textPixel ); - XSetForeground( gdi_display, gc, physDevDst->backgroundPixel ); - } - XCopyPlane( gdi_display, physDevSrc->drawable, pixmap, gc, - physDevSrc->dc_rect.left + visRectSrc->left, - physDevSrc->dc_rect.top + visRectSrc->top, - width, height, 0, 0, 1 ); - exposures++; - wine_tsx11_unlock(); - } - else /* color -> color */ - { - wine_tsx11_lock(); - if (!X11DRV_PALETTE_XPixelToPalette) - { - XCopyArea( gdi_display, physDevSrc->drawable, pixmap, gc, - physDevSrc->dc_rect.left + visRectSrc->left, - physDevSrc->dc_rect.top + visRectSrc->top, - width, height, 0, 0); - exposures++; - } - else - { - if (memdc) - imageSrc = XGetImage( gdi_display, physDevSrc->drawable, - physDevSrc->dc_rect.left + visRectSrc->left, - physDevSrc->dc_rect.top + visRectSrc->top, - width, height, AllPlanes, ZPixmap ); - else - { - /* Make sure we don't get a BadMatch error */ - XCopyArea( gdi_display, physDevSrc->drawable, pixmap, gc, - physDevSrc->dc_rect.left + visRectSrc->left, - physDevSrc->dc_rect.top + visRectSrc->top, - width, height, 0, 0); - exposures++; - imageSrc = XGetImage( gdi_display, pixmap, 0, 0, width, height, - AllPlanes, ZPixmap ); - } - for (y = 0; y < height; y++) - for (x = 0; x < width; x++) - XPutPixel(imageSrc, x, y, - X11DRV_PALETTE_XPixelToPalette[XGetPixel(imageSrc, x, y)]); - XPutImage( gdi_display, pixmap, gc, imageSrc, - 0, 0, 0, 0, width, height ); - XDestroyImage( imageSrc ); - } - wine_tsx11_unlock(); - } - return exposures; -} - - -/*********************************************************************** * BITBLT_GetDstArea * * Retrieve an area from the destination DC, mapping all the @@ -896,11 +813,12 @@ BOOL X11DRV_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, INT width, height; const BYTE *opcode; Pixmap src_pixmap; - GC tmpGC; + GC gc; if (src_dev->funcs != dst_dev->funcs || src->width != dst->width || src->height != dst->height || /* no stretching with core X11 */ - (physDevDst->depth == 1 && physDevSrc->depth != 1)) /* color -> mono done by hand */ + (physDevDst->depth == 1 && physDevSrc->depth != 1) || /* color -> mono done by hand */ + (X11DRV_PALETTE_XPixelToPalette && physDevSrc->depth != 1)) /* needs palette mapping */ { dst_dev = GET_NEXT_PHYSDEV( dst_dev, pStretchBlt ); return dst_dev->funcs->pStretchBlt( dst_dev, dst, src_dev, src, rop ); @@ -952,18 +870,48 @@ BOOL X11DRV_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, } wine_tsx11_lock(); - tmpGC = XCreateGC( gdi_display, physDevDst->drawable, 0, NULL ); - XSetSubwindowMode( gdi_display, tmpGC, IncludeInferiors ); - XSetGraphicsExposures( gdi_display, tmpGC, False ); + gc = XCreateGC( gdi_display, physDevDst->drawable, 0, NULL ); + XSetSubwindowMode( gdi_display, gc, IncludeInferiors ); + XSetGraphicsExposures( gdi_display, gc, False ); + + /* retrieve the source */ + src_pixmap = XCreatePixmap( gdi_display, root_window, width, height, physDevDst->depth ); + if (physDevSrc->depth == 1) + { + /* MSDN says if StretchBlt must convert a bitmap from monochrome + to color or vice versa, the foreground and background color of + the device context are used. In fact, it also applies to the + case when it is converted from mono to mono. */ + if (X11DRV_PALETTE_XPixelToPalette && physDevDst->depth != 1) + { + XSetBackground( gdi_display, gc, X11DRV_PALETTE_XPixelToPalette[physDevDst->textPixel] ); + XSetForeground( gdi_display, gc, X11DRV_PALETTE_XPixelToPalette[physDevDst->backgroundPixel]); + } + else + { + XSetBackground( gdi_display, gc, physDevDst->textPixel ); + XSetForeground( gdi_display, gc, physDevDst->backgroundPixel ); + } + XCopyPlane( gdi_display, physDevSrc->drawable, src_pixmap, gc, + physDevSrc->dc_rect.left + src->visrect.left, + physDevSrc->dc_rect.top + src->visrect.top, + width, height, 0, 0, 1 ); + } + else /* color -> color */ + { + XCopyArea( gdi_display, physDevSrc->drawable, src_pixmap, gc, + physDevSrc->dc_rect.left + src->visrect.left, + physDevSrc->dc_rect.top + src->visrect.top, + width, height, 0, 0 ); + } wine_tsx11_unlock(); - BITBLT_GetSrcArea( physDevSrc, physDevDst, src_pixmap, tmpGC, &src->visrect ); - execute_rop( physDevDst, src_pixmap, tmpGC, &dst->visrect, rop ); + execute_rop( physDevDst, src_pixmap, gc, &dst->visrect, rop ); wine_tsx11_lock(); XFreePixmap( gdi_display, src_pixmap ); - XFreeGC( gdi_display, tmpGC ); + XFreeGC( gdi_display, gc ); wine_tsx11_unlock(); done:

1 0

Alexandre Julliard : winex11: Fall back to client-side blit for color -> monochrome conversions.
by Alexandre Julliard 11 Oct '11

11 Oct '11

Module: wine Branch: master Commit: 40c2f3ff48e959d8269e2ea52b53ee033e493fe9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40c2f3ff48e959d8269e2ea52… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 10 18:26:31 2011 +0200 winex11: Fall back to client-side blit for color -> monochrome conversions. --- dlls/winex11.drv/bitblt.c | 128 ++++++++++++--------------------------------- 1 files changed, 34 insertions(+), 94 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index c0ff7f3..e3703d3 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -582,21 +582,6 @@ int main() #endif /* BITBLT_TEST */ -/* return a mask for meaningful bits when doing an XGetPixel on an image */ -static unsigned long image_pixel_mask( X11DRV_PDEVICE *physDev ) -{ - unsigned long ret; - ColorShifts *shifts = physDev->color_shifts; - - if (!shifts) shifts = &X11DRV_PALETTE_default_shifts; - ret = (shifts->physicalRed.max << shifts->physicalRed.shift) | - (shifts->physicalGreen.max << shifts->physicalGreen.shift) | - (shifts->physicalBlue.max << shifts->physicalBlue.shift); - if (!ret) ret = (1 << physDev->depth) - 1; - return ret; -} - - /*********************************************************************** * BITBLT_GetSrcArea * @@ -606,40 +591,49 @@ static unsigned long image_pixel_mask( X11DRV_PDEVICE *physDev ) static int BITBLT_GetSrcArea( X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE *physDevDst, Pixmap pixmap, GC gc, RECT *visRectSrc ) { - XImage *imageSrc, *imageDst; + XImage *imageSrc; register INT x, y; int exposures = 0; INT width = visRectSrc->right - visRectSrc->left; INT height = visRectSrc->bottom - visRectSrc->top; BOOL memdc = (GetObjectType(physDevSrc->dev.hdc) == OBJ_MEMDC); - if (physDevSrc->depth == physDevDst->depth) + if (physDevSrc->depth == 1) { + /* MSDN says if StretchBlt must convert a bitmap from monochrome + to color or vice versa, the foreground and background color of + the device context are used. In fact, it also applies to the + case when it is converted from mono to mono. */ wine_tsx11_lock(); - if (!X11DRV_PALETTE_XPixelToPalette || - (physDevDst->depth == 1)) /* monochrome -> monochrome */ + if (X11DRV_PALETTE_XPixelToPalette && physDevDst->depth != 1) { - if (physDevDst->depth == 1) - { - /* MSDN says if StretchBlt must convert a bitmap from monochrome - to color or vice versa, the foreground and background color of - the device context are used. In fact, it also applies to the - case when it is converted from mono to mono. */ - XSetBackground( gdi_display, gc, physDevDst->textPixel ); - XSetForeground( gdi_display, gc, physDevDst->backgroundPixel ); - XCopyPlane( gdi_display, physDevSrc->drawable, pixmap, gc, - physDevSrc->dc_rect.left + visRectSrc->left, - physDevSrc->dc_rect.top + visRectSrc->top, - width, height, 0, 0, 1); - } - else - XCopyArea( gdi_display, physDevSrc->drawable, pixmap, gc, - physDevSrc->dc_rect.left + visRectSrc->left, - physDevSrc->dc_rect.top + visRectSrc->top, - width, height, 0, 0); + XSetBackground( gdi_display, gc, X11DRV_PALETTE_XPixelToPalette[physDevDst->textPixel] ); + XSetForeground( gdi_display, gc, X11DRV_PALETTE_XPixelToPalette[physDevDst->backgroundPixel]); + } + else + { + XSetBackground( gdi_display, gc, physDevDst->textPixel ); + XSetForeground( gdi_display, gc, physDevDst->backgroundPixel ); + } + XCopyPlane( gdi_display, physDevSrc->drawable, pixmap, gc, + physDevSrc->dc_rect.left + visRectSrc->left, + physDevSrc->dc_rect.top + visRectSrc->top, + width, height, 0, 0, 1 ); + exposures++; + wine_tsx11_unlock(); + } + else /* color -> color */ + { + wine_tsx11_lock(); + if (!X11DRV_PALETTE_XPixelToPalette) + { + XCopyArea( gdi_display, physDevSrc->drawable, pixmap, gc, + physDevSrc->dc_rect.left + visRectSrc->left, + physDevSrc->dc_rect.top + visRectSrc->top, + width, height, 0, 0); exposures++; } - else /* color -> color */ + else { if (memdc) imageSrc = XGetImage( gdi_display, physDevSrc->drawable, @@ -667,61 +661,6 @@ static int BITBLT_GetSrcArea( X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE *physDe } wine_tsx11_unlock(); } - else - { - if (physDevSrc->depth == 1) /* monochrome -> color */ - { - wine_tsx11_lock(); - if (X11DRV_PALETTE_XPixelToPalette) - { - XSetBackground( gdi_display, gc, X11DRV_PALETTE_XPixelToPalette[physDevDst->textPixel] ); - XSetForeground( gdi_display, gc, X11DRV_PALETTE_XPixelToPalette[physDevDst->backgroundPixel]); - } - else - { - XSetBackground( gdi_display, gc, physDevDst->textPixel ); - XSetForeground( gdi_display, gc, physDevDst->backgroundPixel ); - } - XCopyPlane( gdi_display, physDevSrc->drawable, pixmap, gc, - physDevSrc->dc_rect.left + visRectSrc->left, - physDevSrc->dc_rect.top + visRectSrc->top, - width, height, 0, 0, 1 ); - exposures++; - wine_tsx11_unlock(); - } - else /* color -> monochrome */ - { - unsigned long pixel_mask; - wine_tsx11_lock(); - /* FIXME: avoid BadMatch error */ - imageSrc = XGetImage( gdi_display, physDevSrc->drawable, - physDevSrc->dc_rect.left + visRectSrc->left, - physDevSrc->dc_rect.top + visRectSrc->top, - width, height, AllPlanes, ZPixmap ); - if (!imageSrc) - { - wine_tsx11_unlock(); - return exposures; - } - imageDst = X11DRV_DIB_CreateXImage( width, height, physDevDst->depth ); - if (!imageDst) - { - XDestroyImage(imageSrc); - wine_tsx11_unlock(); - return exposures; - } - pixel_mask = image_pixel_mask( physDevSrc ); - for (y = 0; y < height; y++) - for (x = 0; x < width; x++) - XPutPixel(imageDst, x, y, - !((XGetPixel(imageSrc,x,y) ^ physDevSrc->backgroundPixel) & pixel_mask)); - XPutImage( gdi_display, pixmap, gc, imageDst, - 0, 0, 0, 0, width, height ); - XDestroyImage( imageSrc ); - X11DRV_DIB_DestroyXImage( imageDst ); - wine_tsx11_unlock(); - } - } return exposures; } @@ -960,7 +899,8 @@ BOOL X11DRV_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, GC tmpGC; if (src_dev->funcs != dst_dev->funcs || - src->width != dst->width || src->height != dst->height) /* no stretching with core X11 */ + src->width != dst->width || src->height != dst->height || /* no stretching with core X11 */ + (physDevDst->depth == 1 && physDevSrc->depth != 1)) /* color -> mono done by hand */ { dst_dev = GET_NEXT_PHYSDEV( dst_dev, pStretchBlt ); return dst_dev->funcs->pStretchBlt( dst_dev, dst, src_dev, src, rop );

1 0

Frédéric Delanoy : French translation for release 1.3.30
by Jeremy Newman 10 Oct '11

10 Oct '11

Module: website Branch: master Commit: 2de7757c1dc20b456ee29c1d1a0ba2c39e473841 URL: http://source.winehq.org/git/website.git/?a=commit;h=2de7757c1dc20b456ee29c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Oct 10 21:11:46 2011 +0200 French translation for release 1.3.30 --- news/fr/2011101001.xml | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/news/fr/2011101001.xml b/news/fr/2011101001.xml new file mode 100644 index 0000000..9efbfdd --- /dev/null +++ b/news/fr/2011101001.xml @@ -0,0 +1,20 @@ +<news> +<date>10 octobre 2011</date> +<title>Sortie de Wine 1.3.30</title> +<body> +<p> La version de développement 1.3.30 de Wine est disponible.</p> +<p> <a href="{$root}/announce/1.3.30">Nouveautés</a> de cette version : +<ul> + <li>DirectSound réimplémenté au-dessus de MMDevAPI.</li> + <li>Prise en charge de StretchBlt dans le moteur DIB.</li> + <li>Interface utilisateur améliorée dans l'aide HTML.</li> + <li>Quelques correctifs MSXML.</li> + <li>Améliorations de performance dans cmd.</li> + <li>Diverses corrections de bogues.</li> +</ul></p> +<p><p>Le <a +href="http://prdownloads.sourceforge.net/wine/wine-1.3.30.tar.bz2">code +source</a> est disponible dès à présent. +Les paquets binaires sont en cours de construction, et apparaîtront sous peu +sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</p></body></news>

1 0

André Hentschel : Wine 1.3.30 freigegeben
by Jeremy Newman 10 Oct '11

10 Oct '11

Module: website Branch: master Commit: 8bb7351eea284eec3b4f169c9886741796b74ade URL: http://source.winehq.org/git/website.git/?a=commit;h=8bb7351eea284eec3b4f16… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 10 21:10:59 2011 +0200 Wine 1.3.30 freigegeben --- news/de/2011101001.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/de/2011101001.xml b/news/de/2011101001.xml new file mode 100644 index 0000000..2f4c7be --- /dev/null +++ b/news/de/2011101001.xml @@ -0,0 +1,17 @@ +<news> +<date>10. Oktober 2011</date> +<title>Wine 1.3.30 freigegeben</title> +<body> +<p> Die Entwicklungsversion 1.3.30 von Wine ist jetzt verfügbar.</p> +<p> <a href="{$root}/announce/1.3.30">Neuerungen (en)</a> in dieser Version:</p> +<ul> + <li>Neuimplementierung von DirectSound basierend auf MMDevAPI.</li> + <li>Unterstützung für StretchBlt in der DIB Engine.</li> + <li>Verbesserungen an der Benutzeroberfläche der HTML Hilfe.</li> + <li>Einige MSXML Fehlerbehebungen.</li> + <li>Leistungssteigerung in cmd.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +<p>Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.30.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</p></body></news>

1 0

Alexandre Julliard : Wine release 1.3.30
by Alexandre Julliard 10 Oct '11

10 Oct '11

Module: website Branch: master Commit: 98445019c1d8031b8991affeea743b54a4386c0b URL: http://source.winehq.org/git/website.git/?a=commit;h=98445019c1d8031b8991af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 10 20:10:46 2011 +0200 Wine release 1.3.30 --- news/en/2011101001.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2011101001.xml b/news/en/2011101001.xml new file mode 100644 index 0000000..ac6227f --- /dev/null +++ b/news/en/2011101001.xml @@ -0,0 +1,17 @@ +<news> +<date>October 10, 2011</date> +<title>Wine 1.3.30 Released</title> +<body> +<p> The Wine development release 1.3.30 is now available.</p> +<p> <a href="{$root}/announce/1.3.30">What's new</a> in this release: +<ul> + <li>DirectSound reimplemented on top of MMDevAPI.</li> + <li>Support for StretchBlt in the DIB engine.</li> + <li>User interface improvements in HTML help.</li> + <li>Some MSXML fixes.</li> + <li>Performance improvements in cmd.</li> + <li>Various bug fixes.</li> +</ul></p> +<p><p>The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.30.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</p></body></news>

1 0

Tag wine-1.3.30 : Alexandre Julliard : Release 1.3.30
by Alexandre Julliard 10 Oct '11

10 Oct '11

Module: wine Branch: refs/tags/wine-1.3.30 Tag: 2fbf04eab3b0706bc5955c7f0a04477ac18e116f URL: http://source.winehq.org/git/wine.git/?a=tag;h=2fbf04eab3b0706bc5955c7f0a04… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 10 19:58:48 2011 +0200 Release 1.3.30

1 0

Alexandre Julliard : Release 1.3.30.
by Alexandre Julliard 10 Oct '11

10 Oct '11

Module: wine Branch: master Commit: 13643f59be7a1ce4b9d7486069b4a4a2ff57d4ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=13643f59be7a1ce4b9d748606… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 10 19:58:48 2011 +0200 Release 1.3.30. --- ANNOUNCE | 1187 +++++++++++++++++++++++++++---------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 529 insertions(+), 678 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=13643f59be7a1ce4b9d74…

1 0

Alexandre Julliard : patches: Add a script to generate a list of regressions per author.
by Alexandre Julliard 10 Oct '11

10 Oct '11

Module: tools Branch: master Commit: 1ba92bc76756508da0ed0ecdd7ff8f2c737e775a URL: http://source.winehq.org/git/tools.git/?a=commit;h=1ba92bc76756508da0ed0ecd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 10 17:31:26 2011 +0200 patches: Add a script to generate a list of regressions per author. Based on the work of Henri Verbeet. --- patches/patches.css | 11 +++ patches/update-regressions | 172 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 183 insertions(+), 0 deletions(-) diff --git a/patches/patches.css b/patches/patches.css index ee1f8d9..9b2b8ca 100644 --- a/patches/patches.css +++ b/patches/patches.css @@ -125,6 +125,12 @@ table th { margin: 0; } +div.buglist { + margin: 5px 20px; + background-color: white; + width: 100%; + border: 1px solid #601919; +} table.main, table.legend { width: 100%; } table.legend ul { margin: 2px 0; } @@ -134,6 +140,11 @@ tr.odd { background-color: #f8e8e8; } .id, .status, .testbot { text-align: center; } .id, .status, .author { white-space: nowrap; padding: 0 3px; } +.sha1 { white-space: nowrap; font-family: monospace; padding: 2px 12px; } + +.id :link, .sha1 :link, .subject :link { color: #A50D0D; text-decoration: none; } +.id :visited, .sha1 :visited, .subject :visited { color: #ff0000; text-decoration: none; } +.id :hover, .sha1 :hover, .subject :hover { color: #FF6666; text-decoration: underline; } .nil, .nil :link, .nil :visited { color: blue; font-weight: bold; } .pending, .pending :link, .pending :visited { color: blue; } diff --git a/patches/update-regressions b/patches/update-regressions new file mode 100755 index 0000000..3a71509 --- /dev/null +++ b/patches/update-regressions @@ -0,0 +1,172 @@ +#!/usr/bin/perl -w +# +# Copyright 2011 Henri Verbeet +# Copyright 2011 Alexandre Julliard +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +use strict; +use warnings; +use Text::CSV::Encoded; +use CGI qw(:standard); +use open ':utf8'; +binmode STDOUT, ':utf8'; + +$ENV{"GIT_DIR"} = "/home/winehq/opt/source/git/wine.git"; + +my $bugzilla_base = "http://bugs.winehq.org/show_bug.cgi?id="; +my $gitweb_base = "http://source.winehq.org/git/wine.git/commit/"; +my $dest = "/home/winehq/opt/source"; + +my %regressions; +my %commits; +my @invalid; +my @unknown; + +my %authors; +my $count = 0; + +sub read_bugs() +{ + my $csv = Text::CSV::Encoded->new({ encoding_in => "utf-8", + encoding_out => "utf-8" }); + + open LIST, "-|", "wget", "-qO-", "http://bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bu…" or die "cannot query bug list"; + + <LIST>; # skip header line + while (<LIST>) + { + if ($csv->parse($_)) + { + my ($bug_id, $commit_id, $desc) = $csv->fields(); + $regressions{$bug_id} = { "commit_id" => $commit_id, "description" => $desc }; + + if (!$commit_id) + { + push @unknown, $bug_id; + next; + } + + if (!defined $commits{$commit_id}) + { + open LOG, "-|", "git", "log", "-1", "--format=\%an\%n\%s", $commit_id or die "cannot start git log"; + my $author = <LOG>; + my $subject = <LOG>; + chomp $author; + chomp $subject; + close LOG; + next unless $author && $subject; + $commits{$commit_id} = { "author" => $author, "subject" => $subject }; + } + push @{$authors{$commits{$commit_id}->{"author"}}}, $bug_id; + $count++; + } + else + { + my $err = $csv->error_input; + die "Failed to parse line: $err\n"; + } + } + close LIST; +} + +sub print_bugs($@) +{ + my $row = shift; + printf OUTPUT "<table class=\"main\">\n"; + foreach my $id (sort {$b <=> $a} @_) + { + my $regression = $regressions{$id}; + my $commit_id = $regression->{"commit_id"}; + + printf OUTPUT "<tr class=\"regression %s\">", ++$row & 1 ? "odd" : "even"; + printf OUTPUT "<td class=\"id\"><a href=\"%s%u\">%u</a></td>", $bugzilla_base, $id, $id; + printf OUTPUT "<td class=\"sha1\"><a href=\"%s%s\" title=\"%s\">%s</a></td>", + $gitweb_base, escapeHTML($commit_id), + escapeHTML($commits{$commit_id}->{"subject"}), escapeHTML(substr($commit_id,0,12)); + printf OUTPUT "<td class=\"subject\" width=\"100%%\"><a href=\"%s%u\">%s</a></td></tr>\n", + $bugzilla_base, $id, escapeHTML($regression->{"description"}); + } + printf OUTPUT "</table>\n"; +} + +read_bugs(); + +open OUTPUT, "> $dest/regressions.new" or die "cannot create $dest/regressions.new"; + +my $js = <<END; +function toggle_display(id) +{ + var e = document.getElementById(id); + var display = e.style.display; + e.style.display = display == "none" ? "" : "none"; +} +END + +print OUTPUT start_html(-title=>"Regressions", + -encoding=>"utf-8", + -style=>{src=>"patches/patches.css"}, + -script=>$js); + +print OUTPUT "<div id=\"logo_glass\"><a href=\"/regressions\"><img src=\"http://winehq.org/images/winehq_logo_glass_sm.png\"></a></div>\n"; +print OUTPUT "<div id=\"logo_text\"><a href=\"/regressions\"><img src=\"http://winehq.org/images/winehq_logo_text.png\" alt=\"WineHQ\" title=\"WineHQ\"></a></div>\n"; +print OUTPUT "<div id=\"tabs\"><ul>", + "<li><a href=\"http://www.winehq.org/\">WineHQ</a></li>", + "<li><a href=\"http://wiki.winehq.org/\">Wiki</a></li>", + "<li><a href=\"http://appdb.winehq.org/\">AppDB</a></li>", + "<li><a href=\"http://bugs.winehq.org/\">Bugzilla</a></li>", + "<li><a href=\"http://forums.winehq.org/\">Forums</a></li></ul></div>\n"; +print OUTPUT "<div id=\"logo_blurb\">Wine source repository – Regressions</div>\n"; + +print OUTPUT "<div id=\"main_content\"><div id=\"content\"><div class=\"main\">\n"; +printf OUTPUT "<h2>%u bisected regressions</h2>\n", $count; + +print OUTPUT "<table class=\"main\"><tr><th class=\"count\">Count</th>", + "<th style=\"width: 100%;\" class=\"author\">Author</th></tr>\n"; + +my $row = 0; +foreach my $author (sort {@{$authors{$b}} <=> @{$authors{$a}} || $a cmp $b} keys %authors) +{ + printf OUTPUT "<tr class=\"regression %s\"><td class=\"id\" valign=\"top\">" + ."<span onclick=\"toggle_display('bugs_%u');\">%u</span></td>", + $row & 1 ? "odd" : "even", $row, scalar(@{$authors{$author}}); + printf OUTPUT "<td class=\"author\"><span onclick=\"toggle_display('bugs_%u');\">%s</span>" + ."<div class=\"buglist\" id=\"bugs_%u\" style=\"display: none;\">\n", + $row, escapeHTML($author), $row; + print_bugs $row, @{$authors{$author}}; + print OUTPUT "</div></td></tr>"; + ++$row; +} +print OUTPUT "</table></div>\n"; + +print OUTPUT "<div class=\"main\">\n"; +printf OUTPUT "<h2>%u regressions without commit id</h2>\n", scalar @unknown; +print OUTPUT "<table class=\"main\"><tr><th class=\"id\">Id</th>", + "<th style=\"width: 100%;\" class=\"subject\">Description</th></tr>\n"; + +$row = 0; +foreach my $id (sort {$b <=> $a} @unknown) +{ + my $regression = $regressions{$id}; + printf OUTPUT "<tr class=\"buglist %s\">", ++$row & 1 ? "odd" : "even"; + printf OUTPUT "<td class=\"id\"><a href=\"%s%u\">%u</a></td>", $bugzilla_base, $id, $id; + printf OUTPUT "<td class=\"subject\"><a href=\"%s%u\">%s</a></td></tr>\n", + $bugzilla_base, $id, escapeHTML($regression->{"description"}); +} + +print OUTPUT "</table></div>\n"; +print OUTPUT end_html; +close OUTPUT; + +rename "$dest/regressions.new", "$dest/regressions" or die "failed to update regressions";

1 0

Huw Davies : wineps: The truetype metrics should now be obtained from gdi32 , so remove obsolete code.
by Alexandre Julliard 10 Oct '11

10 Oct '11

Module: wine Branch: master Commit: f24b0a80f391a80de506407513aea8c9c244eb54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f24b0a80f391a80de50640751… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 10 15:13:34 2011 +0100 wineps: The truetype metrics should now be obtained from gdi32, so remove obsolete code. --- dlls/wineps.drv/Makefile.in | 3 +- dlls/wineps.drv/afm.c | 5 - dlls/wineps.drv/psdrv.h | 1 - dlls/wineps.drv/truetype.c | 669 ------------------------------------------- 4 files changed, 1 insertions(+), 677 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f24b0a80f391a80de5064…

1 0

Huw Davies : gdi32: Require that we have freetype' s FT_Load_Sfnt_Table function and remove the hacky fallback.
by Alexandre Julliard 10 Oct '11

10 Oct '11

Module: wine Branch: master Commit: 570e68b82200bdd9981b2cd8fe9e68d35bad3cb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=570e68b82200bdd9981b2cd8f… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 10 14:15:56 2011 +0100 gdi32: Require that we have freetype's FT_Load_Sfnt_Table function and remove the hacky fallback. --- dlls/gdi32/freetype.c | 80 +++++++------------------------------------------ 1 files changed, 11 insertions(+), 69 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 8a687f4..9357766 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -155,7 +155,6 @@ static DWORD FT_SimpleVersion; static void *ft_handle = NULL; #define MAKE_FUNCPTR(f) static typeof(f) * p##f = NULL -MAKE_FUNCPTR(FT_Vector_Unit); MAKE_FUNCPTR(FT_Done_Face); MAKE_FUNCPTR(FT_Get_Char_Index); MAKE_FUNCPTR(FT_Get_Module); @@ -164,6 +163,7 @@ MAKE_FUNCPTR(FT_Get_Sfnt_Name_Count); MAKE_FUNCPTR(FT_Get_Sfnt_Table); MAKE_FUNCPTR(FT_Init_FreeType); MAKE_FUNCPTR(FT_Load_Glyph); +MAKE_FUNCPTR(FT_Load_Sfnt_Table); MAKE_FUNCPTR(FT_Matrix_Multiply); #ifdef FT_MULFIX_INLINED #define pFT_MulFix FT_MULFIX_INLINED @@ -175,13 +175,13 @@ MAKE_FUNCPTR(FT_New_Memory_Face); MAKE_FUNCPTR(FT_Outline_Get_Bitmap); MAKE_FUNCPTR(FT_Outline_Transform); MAKE_FUNCPTR(FT_Outline_Translate); +MAKE_FUNCPTR(FT_Render_Glyph); MAKE_FUNCPTR(FT_Select_Charmap); MAKE_FUNCPTR(FT_Set_Charmap); MAKE_FUNCPTR(FT_Set_Pixel_Sizes); MAKE_FUNCPTR(FT_Vector_Transform); -MAKE_FUNCPTR(FT_Render_Glyph); +MAKE_FUNCPTR(FT_Vector_Unit); static void (*pFT_Library_Version)(FT_Library,FT_Int*,FT_Int*,FT_Int*); -static FT_Error (*pFT_Load_Sfnt_Table)(FT_Face,FT_ULong,FT_Long,FT_Byte*,FT_ULong*); static FT_ULong (*pFT_Get_First_Char)(FT_Face,FT_UInt*); static FT_ULong (*pFT_Get_Next_Char)(FT_Face,FT_ULong,FT_UInt*); static FT_TrueTypeEngineType (*pFT_Get_TrueType_Engine_Type)(FT_Library); @@ -1397,57 +1397,6 @@ static void add_face_to_cache(Face *face) RegCloseKey(hkey_font_cache); } -/***************************************************************** - * load_sfnt_table - * - * Wrapper around FT_Load_Sfnt_Table to cope with older versions - * of FreeType that don't export this function. - * - */ -static FT_Error load_sfnt_table(FT_Face ft_face, FT_ULong table, FT_Long offset, FT_Byte *buf, FT_ULong *len) -{ - - FT_Error err; - - /* If the FT_Load_Sfnt_Table function is there we'll use it */ - if(pFT_Load_Sfnt_Table) - { - err = pFT_Load_Sfnt_Table(ft_face, table, offset, buf, len); - } -#ifdef HAVE_FREETYPE_INTERNAL_SFNT_H - else /* Do it the hard way */ - { - TT_Face tt_face = (TT_Face) ft_face; - SFNT_Interface *sfnt; - if (FT_Version.major==2 && FT_Version.minor==0) - { - /* 2.0.x */ - sfnt = *(SFNT_Interface**)((char*)tt_face + 528); - } - else - { - /* A field was added in the middle of the structure in 2.1.x */ - sfnt = *(SFNT_Interface**)((char*)tt_face + 532); - } - err = sfnt->load_any(tt_face, table, offset, buf, len); - } -#else - else - { - static int msg; - if(!msg) - { - MESSAGE("This version of Wine was compiled with freetype headers later than 2.2.0\n" - "but is being run with a freetype library without the FT_Load_Sfnt_Table function.\n" - "Please upgrade your freetype library.\n"); - msg++; - } - err = FT_Err_Unimplemented_Feature; - } -#endif - return err; -} - static inline int TestStyles(DWORD flags, DWORD styles) { return (flags & styles) == styles; @@ -1582,7 +1531,7 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ { FT_ULong len = 0; - if(!load_sfnt_table(ft_face, FT_MAKE_TAG('E','B','S','C'), 0, NULL, &len)) + if(!pFT_Load_Sfnt_Table(ft_face, FT_MAKE_TAG('E','B','S','C'), 0, NULL, &len)) { TRACE("Skipping Wine bitmap-only TrueType font %s\n", debugstr_a(file)); pFT_Done_Face(ft_face); @@ -1782,7 +1731,7 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ /* check for the presence of the 'CFF ' table to check if the font is Type1 */ tmp_size = 0; - if (pFT_Load_Sfnt_Table && !pFT_Load_Sfnt_Table(ft_face, FT_MAKE_TAG('C','F','F',' '), 0, NULL, &tmp_size)) + if (!pFT_Load_Sfnt_Table(ft_face, FT_MAKE_TAG('C','F','F',' '), 0, NULL, &tmp_size)) { TRACE("Font %s/%p is OTF Type1\n", wine_dbgstr_a(file), font_data_ptr); face->ntmFlags |= NTM_PS_OPENTYPE; @@ -2950,7 +2899,6 @@ static BOOL init_freetype(void) #define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(ft_handle, #f, NULL, 0)) == NULL){WARN("Can't find symbol %s\n", #f); goto sym_not_found;} - LOAD_FUNCPTR(FT_Vector_Unit) LOAD_FUNCPTR(FT_Done_Face) LOAD_FUNCPTR(FT_Get_Char_Index) LOAD_FUNCPTR(FT_Get_Module) @@ -2959,6 +2907,7 @@ static BOOL init_freetype(void) LOAD_FUNCPTR(FT_Get_Sfnt_Table) LOAD_FUNCPTR(FT_Init_FreeType) LOAD_FUNCPTR(FT_Load_Glyph) + LOAD_FUNCPTR(FT_Load_Sfnt_Table) LOAD_FUNCPTR(FT_Matrix_Multiply) #ifndef FT_MULFIX_INLINED LOAD_FUNCPTR(FT_MulFix) @@ -2968,16 +2917,15 @@ static BOOL init_freetype(void) LOAD_FUNCPTR(FT_Outline_Get_Bitmap) LOAD_FUNCPTR(FT_Outline_Transform) LOAD_FUNCPTR(FT_Outline_Translate) + LOAD_FUNCPTR(FT_Render_Glyph) LOAD_FUNCPTR(FT_Select_Charmap) LOAD_FUNCPTR(FT_Set_Charmap) LOAD_FUNCPTR(FT_Set_Pixel_Sizes) LOAD_FUNCPTR(FT_Vector_Transform) - LOAD_FUNCPTR(FT_Render_Glyph) - + LOAD_FUNCPTR(FT_Vector_Unit) #undef LOAD_FUNCPTR /* Don't warn if these ones are missing */ pFT_Library_Version = wine_dlsym(ft_handle, "FT_Library_Version", NULL, 0); - pFT_Load_Sfnt_Table = wine_dlsym(ft_handle, "FT_Load_Sfnt_Table", NULL, 0); pFT_Get_First_Char = wine_dlsym(ft_handle, "FT_Get_First_Char", NULL, 0); pFT_Get_Next_Char = wine_dlsym(ft_handle, "FT_Get_Next_Char", NULL, 0); pFT_Get_TrueType_Engine_Type = wine_dlsym(ft_handle, "FT_Get_TrueType_Engine_Type", NULL, 0); @@ -2987,12 +2935,6 @@ static BOOL init_freetype(void) #ifdef HAVE_FREETYPE_FTWINFNT_H pFT_Get_WinFNT_Header = wine_dlsym(ft_handle, "FT_Get_WinFNT_Header", NULL, 0); #endif - if(!wine_dlsym(ft_handle, "FT_Get_Postscript_Name", NULL, 0) && - !wine_dlsym(ft_handle, "FT_Sqrt64", NULL, 0)) { - /* try to avoid 2.0.4: >= 2.0.5 has FT_Get_Postscript_Name and - <= 2.0.3 has FT_Sqrt64 */ - goto sym_not_found; - } if(pFT_Init_FreeType(&library) != 0) { ERR("Can't init FreeType library\n"); @@ -3021,7 +2963,7 @@ sym_not_found: WINE_MESSAGE( "Wine cannot find certain functions that it needs inside the FreeType\n" "font library. To enable Wine to use TrueType fonts please upgrade\n" - "FreeType to at least version 2.0.5.\n" + "FreeType to at least version 2.1.4.\n" "http://www.freetype.org\n"); wine_dlclose(ft_handle, NULL, 0); ft_handle = NULL; @@ -6558,10 +6500,10 @@ DWORD WineEngGetFontData(GdiFont *font, DWORD table, DWORD offset, LPVOID buf, if(buf && len) { FT_ULong needed = 0; - err = load_sfnt_table(ft_face, table, offset, NULL, &needed); + err = pFT_Load_Sfnt_Table(ft_face, table, offset, NULL, &needed); if( !err && needed < len) len = needed; } - err = load_sfnt_table(ft_face, table, offset, buf, &len); + err = pFT_Load_Sfnt_Table(ft_face, table, offset, buf, &len); if(err) { TRACE("Can't find table %c%c%c%c\n",

1 0

← Newer
1
...
56
57
58
59
60
61
62
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2011