April 2010 - Wine-commits - list.winehq.org

Vincent Povirk : gdiplus: Use UnitPixel for metafile bounds when creating from HMETAFILE.
by Alexandre Julliard 16 Apr '10

16 Apr '10

Module: wine Branch: master Commit: 2f9c6091fcecdb7a249b54e3966935e887280b2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f9c6091fcecdb7a249b54e39… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Apr 15 13:32:44 2010 -0500 gdiplus: Use UnitPixel for metafile bounds when creating from HMETAFILE. --- dlls/gdiplus/graphics.c | 6 +++--- dlls/gdiplus/tests/image.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 7510fa0..7b3f64f 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1273,10 +1273,10 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete, (*metafile)->bounds.X = ((REAL) placeable->BoundingBox.Left) / ((REAL) placeable->Inch); (*metafile)->bounds.Y = ((REAL) placeable->BoundingBox.Top) / ((REAL) placeable->Inch); (*metafile)->bounds.Width = ((REAL) (placeable->BoundingBox.Right - - placeable->BoundingBox.Left)) / ((REAL) placeable->Inch); + - placeable->BoundingBox.Left)); (*metafile)->bounds.Height = ((REAL) (placeable->BoundingBox.Bottom - - placeable->BoundingBox.Top)) / ((REAL) placeable->Inch); - (*metafile)->unit = UnitInch; + - placeable->BoundingBox.Top)); + (*metafile)->unit = UnitPixel; if(delete) DeleteMetaFile(hwmf); diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 0ca22e5..fdfd2b2 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -942,11 +942,11 @@ static void test_createfromwmf(void) stat = GdipGetImageBounds(img, &bounds, &unit); expect(Ok, stat); - todo_wine expect(UnitPixel, unit); + expect(UnitPixel, unit); expectf(0.0, bounds.X); expectf(0.0, bounds.Y); - todo_wine expectf(320.0, bounds.Width); - todo_wine expectf(320.0, bounds.Height); + expectf(320.0, bounds.Width); + expectf(320.0, bounds.Height); stat = GdipGetImageHorizontalResolution(img, &res); expect(Ok, stat);

1 0

Frédéric Delanoy : loader: Fix French translation of wine manpage.
by Alexandre Julliard 16 Apr '10

16 Apr '10

Module: wine Branch: master Commit: 32ceee8bf1c0a979f57e10279cc132f88ec9fd56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32ceee8bf1c0a979f57e10279… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Apr 9 01:31:59 2010 +0200 loader: Fix French translation of wine manpage. --- loader/wine.fr.man.in | 146 ++++++++++++++++++++++++------------------------- 1 files changed, 72 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=32ceee8bf1c0a979f57e1…

1 0

Vincent Povirk : gdiplus: Use a helper function to draw image data from bitmaps in software.
by Alexandre Julliard 16 Apr '10

16 Apr '10

Module: wine Branch: master Commit: 9c380b1e8e8cf3fb965675285d0bf48c535ac6b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c380b1e8e8cf3fb965675285… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Apr 15 14:11:07 2010 -0500 gdiplus: Use a helper function to draw image data from bitmaps in software. This will make it possible to use the same codepath for non-bitmap graphics objects and to create a software implementation for other drawing operations. --- dlls/gdiplus/graphics.c | 60 +++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 53 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 7b3f64f..6a1dc10 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -173,6 +173,35 @@ static void transform_and_round_points(GpGraphics *graphics, POINT *pti, } } +/* Draw non-premultiplied ARGB data to the given graphics object */ +static GpStatus alpha_blend_pixels(GpGraphics *graphics, INT dst_x, INT dst_y, + const BYTE *src, INT src_width, INT src_height, INT src_stride) +{ + if (graphics->image && graphics->image->type == ImageTypeBitmap) + { + GpBitmap *dst_bitmap = (GpBitmap*)graphics->image; + INT x, y; + + for (x=0; x<src_width; x++) + { + for (y=0; y<src_height; y++) + { + ARGB dst_color, src_color; + GdipBitmapGetPixel(dst_bitmap, x+dst_x, y+dst_y, &dst_color); + src_color = ((ARGB*)(src + src_stride * y))[x]; + GdipBitmapSetPixel(dst_bitmap, x+dst_x, y+dst_y, color_over(dst_color, src_color)); + } + } + + return Ok; + } + else + { + ERR("Not implemented for non-bitmap DC's\n"); + return GenericError; + } +} + static ARGB blend_colors(ARGB start, ARGB end, REAL position) { ARGB result=0; @@ -1939,9 +1968,10 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image if (use_software) { RECT src_area, dst_area; - int i, x, y; + int i, x, y, stride; GpMatrix *dst_to_src; REAL m11, m12, m21, m22, mdx, mdy; + LPBYTE data; src_area.left = srcx*dx; src_area.top = srcy*dy; @@ -1975,13 +2005,22 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image return stat; } + data = GdipAlloc(sizeof(ARGB) * (dst_area.right - dst_area.left) * (dst_area.bottom - dst_area.top)); + if (!data) + { + GdipDeleteMatrix(dst_to_src); + return OutOfMemory; + } + + stride = sizeof(ARGB) * (dst_area.right - dst_area.left); + for (x=dst_area.left; x<dst_area.right; x++) { for (y=dst_area.top; y<dst_area.bottom; y++) { GpPointF src_pointf; int src_x, src_y; - ARGB src_color, dst_color; + ARGB *src_color; src_pointf.X = x; src_pointf.Y = y; @@ -1991,18 +2030,25 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image src_x = roundr(src_pointf.X); src_y = roundr(src_pointf.Y); + src_color = (ARGB*)(data + stride * (y - dst_area.top) + sizeof(ARGB) * (x - dst_area.left)); + if (src_x < src_area.left || src_x >= src_area.right || src_y < src_area.top || src_y >= src_area.bottom) /* FIXME: Use wrapmode */ - continue; - - GdipBitmapGetPixel(bitmap, src_x, src_y, &src_color); - GdipBitmapGetPixel((GpBitmap*)graphics->image, x, y, &dst_color); - GdipBitmapSetPixel((GpBitmap*)graphics->image, x, y, color_over(dst_color, src_color)); + *src_color = 0; + else + GdipBitmapGetPixel(bitmap, src_x, src_y, src_color); } } GdipDeleteMatrix(dst_to_src); + + stat = alpha_blend_pixels(graphics, dst_area.left, dst_area.top, + data, dst_area.right - dst_area.left, dst_area.bottom - dst_area.top, stride); + + GdipFree(data); + + return stat; } else {

1 0

Vincent Povirk : gdiplus: Transform bitmaps to non-rectangular parallelograms in software.
by Alexandre Julliard 16 Apr '10

16 Apr '10

Module: wine Branch: master Commit: 7791f02fd9de1e2e89603d55b2f8b693b2a155e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7791f02fd9de1e2e89603d55b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Apr 15 14:48:47 2010 -0500 gdiplus: Transform bitmaps to non-rectangular parallelograms in software. --- dlls/gdiplus/graphics.c | 49 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 45 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 6a1dc10..5a75fd0 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -197,8 +197,47 @@ static GpStatus alpha_blend_pixels(GpGraphics *graphics, INT dst_x, INT dst_y, } else { - ERR("Not implemented for non-bitmap DC's\n"); - return GenericError; + HDC hdc; + HBITMAP hbitmap, old_hbm=NULL; + BITMAPINFOHEADER bih; + BYTE *temp_bits; + BLENDFUNCTION bf; + + hdc = CreateCompatibleDC(0); + + bih.biSize = sizeof(BITMAPINFOHEADER); + bih.biWidth = src_width; + bih.biHeight = -src_height; + bih.biPlanes = 1; + bih.biBitCount = 32; + bih.biCompression = BI_RGB; + bih.biSizeImage = 0; + bih.biXPelsPerMeter = 0; + bih.biYPelsPerMeter = 0; + bih.biClrUsed = 0; + bih.biClrImportant = 0; + + hbitmap = CreateDIBSection(hdc, (BITMAPINFO*)&bih, DIB_RGB_COLORS, + (void**)&temp_bits, NULL, 0); + + convert_32bppARGB_to_32bppPARGB(src_width, src_height, temp_bits, + 4 * src_width, src, src_stride); + + old_hbm = SelectObject(hdc, hbitmap); + + bf.BlendOp = AC_SRC_OVER; + bf.BlendFlags = 0; + bf.SourceConstantAlpha = 255; + bf.AlphaFormat = AC_SRC_ALPHA; + + GdiAlphaBlend(graphics->hdc, dst_x, dst_y, src_width, src_height, + hdc, 0, 0, src_width, src_height, bf); + + SelectObject(hdc, old_hbm); + DeleteDC(hdc); + DeleteObject(hbitmap); + + return Ok; } } @@ -1895,7 +1934,6 @@ GpStatus WINGDIPAPI GdipDrawImagePointsI(GpGraphics *graphics, GpImage *image, return NotImplemented; } -/* FIXME: partially implemented (only works for rectangular parallelograms) */ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image, GDIPCONST GpPointF *points, INT count, REAL srcx, REAL srcy, REAL srcwidth, REAL srcheight, GpUnit srcUnit, GDIPCONST GpImageAttributes* imageAttributes, @@ -1923,6 +1961,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image if (image->picture) { + /* FIXME: partially implemented (only works for rectangular parallelograms) */ if(srcUnit == UnitInch) dx = dy = (REAL) INCH_HIMETRIC; else if(srcUnit == UnitPixel){ @@ -1956,7 +1995,9 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image else return NotImplemented; - if (graphics->image && graphics->image->type == ImageTypeBitmap) + if (ptf[1].Y != ptf[0].Y || ptf[2].X != ptf[0].X) + use_software = 1; + else if (graphics->image && graphics->image->type == ImageTypeBitmap) { GpBitmap *dst_bitmap = (GpBitmap*)graphics->image; if (!(dst_bitmap->format == PixelFormat16bppRGB555 ||

1 0

Vincent Povirk : gdiplus: Correct the coordinate transform for non-rectangular parallelograms.
by Alexandre Julliard 16 Apr '10

16 Apr '10

Module: wine Branch: master Commit: bb9c1878c3aeb2b0ee17b57be23c07b661ade45c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb9c1878c3aeb2b0ee17b57be… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Apr 15 15:13:34 2010 -0500 gdiplus: Correct the coordinate transform for non-rectangular parallelograms. Apparently matrices in gdiplus don't work the way I think they do. --- dlls/gdiplus/graphics.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 5a75fd0..b0cba47 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2030,11 +2030,11 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image } m11 = (ptf[1].X - ptf[0].X) / srcwidth; - m12 = (ptf[2].X - ptf[0].X) / srcheight; - mdx = ptf[0].X - m11 * srcx - m12 * srcy; - m21 = (ptf[1].Y - ptf[0].Y) / srcwidth; + m21 = (ptf[2].X - ptf[0].X) / srcheight; + mdx = ptf[0].X - m11 * srcx - m21 * srcy; + m12 = (ptf[1].Y - ptf[0].Y) / srcwidth; m22 = (ptf[2].Y - ptf[0].Y) / srcheight; - mdy = ptf[0].Y - m21 * srcx - m22 * srcy; + mdy = ptf[0].Y - m12 * srcx - m22 * srcy; stat = GdipCreateMatrix2(m11, m12, m21, m22, mdx, mdy, &dst_to_src); if (stat != Ok) return stat;

1 0

Alexandre Julliard : configure: Don' t disable 32-bit programs on Wow64 to support a future 32-bit compatibility mode .
by Alexandre Julliard 16 Apr '10

16 Apr '10

Module: wine Branch: master Commit: 980b688fd8acd8edbce3ea84238ea166cebb3fb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=980b688fd8acd8edbce3ea842… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 15 22:52:36 2010 +0200 configure: Don't disable 32-bit programs on Wow64 to support a future 32-bit compatibility mode. --- configure | 4 ---- configure.ac | 4 ---- 2 files changed, 0 insertions(+), 8 deletions(-) diff --git a/configure b/configure index 6db971a..7557ad9 100755 --- a/configure +++ b/configure @@ -4121,12 +4121,8 @@ then WOW64_DISABLE=\# enable_fonts=${enable_fonts:-no} - enable_rpcss=${enable_rpcss:-no} enable_server=${enable_server:-no} enable_tools=${enable_tools:-no} - enable_wineboot=${enable_wineboot:-no} - enable_winedbg=${enable_winedbg:-no} - enable_winemenubuilder=${enable_winemenubuilder:-no} test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib32" fi diff --git a/configure.ac b/configure.ac index bd1276b..4aa7cfd 100644 --- a/configure.ac +++ b/configure.ac @@ -190,12 +190,8 @@ then fi AC_SUBST([WOW64_DISABLE],[\#]) enable_fonts=${enable_fonts:-no} - enable_rpcss=${enable_rpcss:-no} enable_server=${enable_server:-no} enable_tools=${enable_tools:-no} - enable_wineboot=${enable_wineboot:-no} - enable_winedbg=${enable_winedbg:-no} - enable_winemenubuilder=${enable_winemenubuilder:-no} test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib32" fi

1 0

Alexandre Julliard : wine.inf: Register iexplore from the system directory so that the 32-bit version gets registered too .
by Alexandre Julliard 16 Apr '10

16 Apr '10

Module: wine Branch: master Commit: 53dfaf0d58e38672a53b1e0fc4f9217e5eebf6a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53dfaf0d58e38672a53b1e0fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 15 22:52:54 2010 +0200 wine.inf: Register iexplore from the system directory so that the 32-bit version gets registered too. --- tools/wine.inf.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 53c3461..998ec7e 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2532,7 +2532,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,wintrust.dll,1 11,,wmiutils.dll,1 11,,wuapi.dll,1 -16422,Internet Explorer,iexplore.exe,1 +11,,iexplore.exe,1 ; 32bit-only fake dlls [FakeDllsWin32]

1 0

Alexandre Julliard : winex11: Mask out the alpha channel when converting from color to monochrome.
by Alexandre Julliard 16 Apr '10

16 Apr '10

Module: wine Branch: master Commit: da57adf2711f7cde8e2a8ea326f73222583d7129 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da57adf2711f7cde8e2a8ea32… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 15 22:53:27 2010 +0200 winex11: Mask out the alpha channel when converting from color to monochrome. --- dlls/winex11.drv/bitblt.c | 39 ++++++++++++++++++++++++++++----------- 1 files changed, 28 insertions(+), 11 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index c9aa7cf..94620df 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -552,6 +552,21 @@ static void get_colors(X11DRV_PDEVICE *physDevDst, X11DRV_PDEVICE *physDevSrc, } } +/* 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_StretchRow * @@ -617,7 +632,7 @@ static void BITBLT_ShrinkRow( int *rowSrc, int *rowDst, */ static void BITBLT_GetRow( XImage *image, int *pdata, INT row, INT start, INT width, INT depthDst, - int fg, int bg, BOOL swap) + int fg, int bg, unsigned long pixel_mask, BOOL swap) { register INT i; @@ -655,9 +670,9 @@ static void BITBLT_GetRow( XImage *image, int *pdata, INT row, else /* color -> monochrome */ { if (swap) for (i = 0; i < width; i++) - *pdata-- = (XGetPixel( image, i, row ) == bg) ? 1 : 0; + *pdata-- = ((XGetPixel( image, i, row ) & pixel_mask) == bg) ? 1 : 0; else for (i = 0; i < width; i++) - *pdata++ = (XGetPixel( image, i, row ) == bg) ? 1 : 0; + *pdata++ = ((XGetPixel( image, i, row ) & pixel_mask) == bg) ? 1 : 0; } } } @@ -673,7 +688,8 @@ static void BITBLT_StretchImage( XImage *srcImage, XImage *dstImage, INT widthSrc, INT heightSrc, INT widthDst, INT heightDst, RECT *visRectSrc, RECT *visRectDst, - int foreground, int background, WORD mode ) + int foreground, int background, + unsigned long pixel_mask, WORD mode ) { int *rowSrc, *rowDst, *pixel; char *pdata; @@ -740,7 +756,7 @@ static void BITBLT_StretchImage( XImage *srcImage, XImage *dstImage, hswap ? widthSrc - visRectSrc->right : visRectSrc->left, visRectSrc->right - visRectSrc->left, - dstImage->depth, foreground, background, hswap ); + dstImage->depth, foreground, background, pixel_mask, hswap ); /* Stretch or shrink it */ if (hstretch) @@ -799,7 +815,7 @@ static void BITBLT_StretchImage( XImage *srcImage, XImage *dstImage, hswap ? widthSrc - visRectSrc->right : visRectSrc->left, visRectSrc->right - visRectSrc->left, - dstImage->depth, foreground, background, hswap ); + dstImage->depth, foreground, background, pixel_mask, hswap ); /* Stretch or shrink it */ if (hstretch) @@ -901,9 +917,8 @@ static int BITBLT_GetSrcAreaStretch( X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE rectDst.bottom - rectDst.top, physDevDst->depth ); BITBLT_StretchImage( imageSrc, imageDst, src->width, src->height, dst->width, dst->height, &rectSrc, &rectDst, - fg, physDevDst->depth != 1 ? - bg : physDevSrc->backgroundPixel, - GetStretchBltMode(physDevDst->hdc) ); + fg, physDevDst->depth != 1 ? bg : physDevSrc->backgroundPixel, + image_pixel_mask( physDevSrc ), GetStretchBltMode(physDevDst->hdc) ); wine_tsx11_lock(); XPutImage( gdi_display, pixmap, gc, imageDst, 0, 0, 0, 0, rectDst.right - rectDst.left, rectDst.bottom - rectDst.top ); @@ -1013,6 +1028,7 @@ static int BITBLT_GetSrcArea( X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE *physDe } else /* color -> monochrome */ { + unsigned long pixel_mask; wine_tsx11_lock(); /* FIXME: avoid BadMatch error */ imageSrc = XGetImage( gdi_display, physDevSrc->drawable, @@ -1031,10 +1047,11 @@ static int BITBLT_GetSrcArea( X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE *physDe 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) ); + 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 );

1 0

Alexandre Julliard : msvcrt: Initialize exported common variables to fix the build on Mac OS.
by Alexandre Julliard 16 Apr '10

16 Apr '10

Module: wine Branch: master Commit: d4880b7a1f929997c60e69da77a8b1ca07ee71af URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4880b7a1f929997c60e69da7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 16 12:01:35 2010 +0200 msvcrt: Initialize exported common variables to fix the build on Mac OS. --- dlls/msvcrt/ctype.c | 2 +- dlls/msvcrt/locale.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c index 7baa572..7e7d9f0 100644 --- a/dlls/msvcrt/ctype.c +++ b/dlls/msvcrt/ctype.c @@ -55,7 +55,7 @@ WORD MSVCRT__ctype [257] = { * changes to affect ctypes (i.e. isleadbyte), we use a second table * and update its flags whenever the current locale changes. */ -WORD* MSVCRT__pctype; +WORD* MSVCRT__pctype = NULL; /********************************************************************* * __pctype_func (MSVCRT.@) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 55d2ca9..59d94ae 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -44,8 +44,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); #define MAX_ELEM_LEN 64 /* Max length of country/language/CP string */ #define MAX_LOCALE_LENGTH 256 MSVCRT__locale_t MSVCRT_locale = NULL; -int MSVCRT___lc_codepage; -int MSVCRT___lc_collate_cp; +int MSVCRT___lc_codepage = 0; +int MSVCRT___lc_collate_cp = 0; HANDLE MSVCRT___lc_handle[MSVCRT_LC_MAX - MSVCRT_LC_MIN + 1] = { 0 }; unsigned char charmax = CHAR_MAX;

1 0

Vincent Povirk : gdiplus: Ensure GdipGetGenericFontFamilySansSerif returns a truetype font.
by Alexandre Julliard 16 Apr '10

16 Apr '10

Module: wine Branch: master Commit: 049aa8dacd8135ac11e9deee982c14959e9511fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=049aa8dacd8135ac11e9deee9… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Apr 15 11:40:21 2010 -0500 gdiplus: Ensure GdipGetGenericFontFamilySansSerif returns a truetype font. --- dlls/gdiplus/font.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 37cca71..0b7f9f6 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -829,15 +829,21 @@ GpStatus WINGDIPAPI GdipGetGenericFontFamilySerif(GpFontFamily **nativeFamily) */ GpStatus WINGDIPAPI GdipGetGenericFontFamilySansSerif(GpFontFamily **nativeFamily) { - /* FIXME: On Windows this is called Microsoft Sans Serif, this shouldn't - * affect anything */ - static const WCHAR MSSansSerif[] = {'M','S',' ','S','a','n','s',' ','S','e','r','i','f','\0'}; + GpStatus stat; + static const WCHAR MicrosoftSansSerif[] = {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f','\0'}; + static const WCHAR Tahoma[] = {'T','a','h','o','m','a','\0'}; TRACE("(%p)\n", nativeFamily); if (nativeFamily == NULL) return InvalidParameter; - return GdipCreateFontFamilyFromName(MSSansSerif, NULL, nativeFamily); + stat = GdipCreateFontFamilyFromName(MicrosoftSansSerif, NULL, nativeFamily); + + if (stat == FontFamilyNotFound) + /* FIXME: Microsoft Sans Serif is not installed on Wine. */ + stat = GdipCreateFontFamilyFromName(Tahoma, NULL, nativeFamily); + + return stat; } /*****************************************************************************

1 0