wine-commits April 2010

wine-commits@winehq.org

2 participants
898 discussions

Henri Verbeet : wined3d: The currentDesc and pow2 width/ height are the same for power of two textures.
by Alexandre Julliard 16 Apr '10

16 Apr '10

Module: wine Branch: master Commit: 7f6ab3c06e921074c6944eda8b3dd9863fe6e49c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f6ab3c06e921074c6944eda8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 15 19:21:21 2010 +0200 wined3d: The currentDesc and pow2 width/height are the same for power of two textures. --- dlls/wined3d/surface.c | 20 ++++---------------- 1 files changed, 4 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 177001e..182e219 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4515,22 +4515,10 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D glPixelStorei(GL_UNPACK_ROW_LENGTH, width); LEAVE_GL(); - if (This->Flags & SFLAG_NONPOW2) { - TRACE("non power of two support\n"); - if (mem || (This->Flags & SFLAG_PBO)) - { - surface_upload_data(This, gl_info, &desc, srgb, - This->currentDesc.Width, This->currentDesc.Height, mem); - } - } else { - /* When making the realloc conditional, keep in mind that GL_APPLE_client_storage may be in use, and This->resource.allocatedMemory - * changed. So also keep track of memory changes. In this case the texture has to be reallocated - */ - if (mem || (This->Flags & SFLAG_PBO)) - { - surface_upload_data(This, gl_info, &desc, srgb, - This->pow2Width, This->pow2Height, mem); - } + if (mem || (This->Flags & SFLAG_PBO)) + { + surface_upload_data(This, gl_info, &desc, srgb, + This->currentDesc.Width, This->currentDesc.Height, mem); } /* Restore the default pitch */

1 0

Henri Verbeet : wined3d: Get rid of glRect from IWineD3DSurfaceImpl.
by Alexandre Julliard 16 Apr '10

16 Apr '10

Module: wine Branch: master Commit: 65797d7f75f6a740e3ede64bccec04520499c620 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65797d7f75f6a740e3ede64bc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 15 19:21:20 2010 +0200 wined3d: Get rid of glRect from IWineD3DSurfaceImpl. 604caf0caae888c5765198416e9b5640a9e64efa supposedly removed the "oversized texture" code, but this was still left over. --- dlls/wined3d/device.c | 4 ---- dlls/wined3d/surface.c | 34 +++++++--------------------------- dlls/wined3d/swapchain.c | 4 ---- dlls/wined3d/wined3d_private.h | 3 --- 4 files changed, 7 insertions(+), 38 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 91e595c..986d042 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6196,10 +6196,6 @@ static HRESULT updateSurfaceDesc(IWineD3DSurfaceImpl *surface, const WINED3DPRES while (surface->pow2Width < pPresentationParameters->BackBufferWidth) surface->pow2Width <<= 1; while (surface->pow2Height < pPresentationParameters->BackBufferHeight) surface->pow2Height <<= 1; } - surface->glRect.left = 0; - surface->glRect.top = 0; - surface->glRect.right = surface->pow2Width; - surface->glRect.bottom = surface->pow2Height; if (surface->texture_name) { diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index fc24bb4..177001e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1560,7 +1560,6 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This, BOOL srgb) void surface_prepare_texture(IWineD3DSurfaceImpl *surface, const struct wined3d_gl_info *gl_info, BOOL srgb) { DWORD alloc_flag = srgb ? SFLAG_SRGBALLOCATED : SFLAG_ALLOCATED; - GLsizei width, height; CONVERT_TYPES convert; struct wined3d_format_desc desc; @@ -1570,19 +1569,9 @@ void surface_prepare_texture(IWineD3DSurfaceImpl *surface, const struct wined3d_ if(convert != NO_CONVERSION) surface->Flags |= SFLAG_CONVERTED; else surface->Flags &= ~SFLAG_CONVERTED; - if (surface->Flags & SFLAG_NONPOW2) - { - width = surface->pow2Width; - height = surface->pow2Height; - } - else - { - width = surface->glRect.right - surface->glRect.left; - height = surface->glRect.bottom - surface->glRect.top; - } - surface_bind_and_dirtify(surface, srgb); - surface_allocate_surface(surface, gl_info, &desc, srgb, width, height); + surface_allocate_surface(surface, gl_info, &desc, srgb, + surface->pow2Width, surface->pow2Height); surface->Flags |= alloc_flag; } @@ -3981,13 +3970,9 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_PrivateSetup(IWineD3DSurface *iface) { /* We should never use this surface in combination with OpenGL! */ TRACE("(%p) Creating an oversized surface: %ux%u\n", This, This->pow2Width, This->pow2Height); - - /* This will be initialized on the first blt */ - This->glRect.left = 0; - This->glRect.top = 0; - This->glRect.right = 0; - This->glRect.bottom = 0; - } else { + } + else + { /* Don't use ARB_TEXTURE_RECTANGLE in case the surface format is P8 and EXT_PALETTED_TEXTURE is used in combination with texture uploads (RTL_READTEX/RTL_TEXTEX). The reason is that EXT_PALETTED_TEXTURE doesn't work in combination with ARB_TEXTURE_RECTANGLE. @@ -4002,11 +3987,6 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_PrivateSetup(IWineD3DSurface *iface) { This->pow2Height = This->currentDesc.Height; This->Flags &= ~(SFLAG_NONPOW2 | SFLAG_NORMCOORD); } - - This->glRect.left = 0; - This->glRect.top = 0; - This->glRect.right = This->pow2Width; - This->glRect.bottom = This->pow2Height; } if(This->resource.usage & WINED3DUSAGE_RENDERTARGET) { @@ -4548,8 +4528,8 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D */ if (mem || (This->Flags & SFLAG_PBO)) { - surface_upload_data(This, gl_info, &desc, srgb, This->glRect.right - This->glRect.left, - This->glRect.bottom - This->glRect.top, mem); + surface_upload_data(This, gl_info, &desc, srgb, + This->pow2Width, This->pow2Height, mem); } } diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 1265abc..9929037 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -256,10 +256,6 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO cursor.texture_level = 0; cursor.currentDesc.Width = This->device->cursorWidth; cursor.currentDesc.Height = This->device->cursorHeight; - cursor.glRect.left = 0; - cursor.glRect.top = 0; - cursor.glRect.right = cursor.currentDesc.Width; - cursor.glRect.bottom = cursor.currentDesc.Height; /* The cursor must have pow2 sizes */ cursor.pow2Width = cursor.currentDesc.Width; cursor.pow2Height = cursor.currentDesc.Height; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4652be5..dc57762 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2065,9 +2065,6 @@ struct IWineD3DSurfaceImpl /* A method to retrieve the drawable size. Not in the Vtable to make it changeable */ void (*get_drawable_size)(struct wined3d_context *context, UINT *width, UINT *height); - /* Oversized texture */ - RECT glRect; - /* PBO */ GLuint pbo; GLuint texture_name;

1 0

Vincent Povirk : gdiplus: Do not create FontFamilies for bitmap fonts.
by Alexandre Julliard 16 Apr '10

16 Apr '10

Module: wine Branch: master Commit: 531219f84d0d6fa236283e5c3d061b5f752df793 URL: http://source.winehq.org/git/wine.git/?a=commit;h=531219f84d0d6fa236283e5c3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Apr 15 11:49:20 2010 -0500 gdiplus: Do not create FontFamilies for bitmap fonts. --- dlls/gdiplus/font.c | 5 ++++- dlls/gdiplus/tests/font.c | 3 --- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 0b7f9f6..3a29771 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -521,7 +521,7 @@ GpStatus WINGDIPAPI GdipGetFontHeightGivenDPI(GDIPCONST GpFont *font, REAL dpi, static INT CALLBACK is_font_installed_proc(const LOGFONTW *elf, const TEXTMETRICW *ntm, DWORD type, LPARAM lParam) { - if (!ntm) + if (!ntm || type == RASTER_FONTTYPE) { return 1; } @@ -966,6 +966,9 @@ static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm, GpFontCollection* fonts = (GpFontCollection*)lParam; int i; + if (type == RASTER_FONTTYPE) + return 1; + /* skip duplicates */ for (i=0; i<fonts->count; i++) if (strcmpiW(lfw->lfFaceName, fonts->FontFamilies[i]->FamilyName) == 0) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 1bf2c1e..80f11bc 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -192,12 +192,9 @@ static void test_fontfamily (void) expect (FontFamilyNotFound, stat); /* Bitmap fonts are not found */ -todo_wine -{ stat = GdipCreateFontFamilyFromName (MSSansSerif, NULL, &family); expect (FontFamilyNotFound, stat); if(stat == Ok) GdipDeleteFontFamily(family); -} stat = GdipCreateFontFamilyFromName (arial, NULL, &family); if(stat == FontFamilyNotFound)

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

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

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 : 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 : 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

Aric Stewart : usp10/tests: Expanded tests for ScriptShape.
by Alexandre Julliard 15 Apr '10

15 Apr '10

Module: wine Branch: master Commit: d4b853695276be6d1492a909a263bcc7ce4ca828 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4b853695276be6d1492a909a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Apr 15 09:23:04 2010 -0500 usp10/tests: Expanded tests for ScriptShape. --- dlls/usp10/tests/usp10.c | 125 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 119 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 1a9301b..b7f3d2f 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -289,16 +289,14 @@ static void test_ScriptItemize( void ) static void test_ScriptShape(HDC hdc) { - static const WCHAR test1[] = {'t', 'e', 's', 't',0}; - BOOL ret; + static const WCHAR test1[] = {'w', 'i', 'n', 'e',0}; + static const WCHAR test2[] = {0x202B, 'i', 'n', 0x202C,0}; HRESULT hr; SCRIPT_CACHE sc = NULL; - WORD glyphs[4], logclust[4]; + WORD glyphs[4], glyphs2[4], logclust[4]; SCRIPT_VISATTR attrs[4]; SCRIPT_ITEM items[2]; - int nb, widths[4]; - GOFFSET offset[4]; - ABC abc[4]; + int nb; hr = ScriptItemize(test1, 4, 2, NULL, NULL, items, NULL); ok(!hr, "ScriptItemize should return S_OK not %08x\n", hr); @@ -324,8 +322,122 @@ static void test_ScriptShape(HDC hdc) ok(!hr, "ScriptShape should return S_OK not %08x\n", hr); ok(items[0].a.fNoGlyphIndex == FALSE, "fNoGlyphIndex TRUE\n"); + + memset(glyphs,-1,sizeof(glyphs)); + memset(logclust,-1,sizeof(logclust)); + memset(attrs,-1,sizeof(attrs)); hr = ScriptShape(NULL, &sc, test1, 4, 4, &items[0].a, glyphs, logclust, attrs, &nb); ok(!hr, "ScriptShape should return S_OK not %08x\n", hr); + ok(nb == 4, "Wrong number of items\n"); + ok(logclust[0] == 0, "clusters out of order\n"); + ok(logclust[1] == 1, "clusters out of order\n"); + ok(logclust[2] == 2, "clusters out of order\n"); + ok(logclust[3] == 3, "clusters out of order\n"); + ok(attrs[0].uJustification == SCRIPT_JUSTIFY_CHARACTER, "uJustification incorrect\n"); + ok(attrs[1].uJustification == SCRIPT_JUSTIFY_CHARACTER, "uJustification incorrect\n"); + ok(attrs[2].uJustification == SCRIPT_JUSTIFY_CHARACTER, "uJustification incorrect\n"); + ok(attrs[3].uJustification == SCRIPT_JUSTIFY_CHARACTER, "uJustification incorrect\n"); + ok(attrs[0].fClusterStart == 1, "fClusterStart incorrect\n"); + ok(attrs[1].fClusterStart == 1, "fClusterStart incorrect\n"); + ok(attrs[2].fClusterStart == 1, "fClusterStart incorrect\n"); + ok(attrs[3].fClusterStart == 1, "fClusterStart incorrect\n"); + ok(attrs[0].fDiacritic == 0, "fDiacritic incorrect\n"); + ok(attrs[1].fDiacritic == 0, "fDiacritic incorrect\n"); + ok(attrs[2].fDiacritic == 0, "fDiacritic incorrect\n"); + ok(attrs[3].fDiacritic == 0, "fDiacritic incorrect\n"); + ok(attrs[0].fZeroWidth == 0, "fZeroWidth incorrect\n"); + ok(attrs[1].fZeroWidth == 0, "fZeroWidth incorrect\n"); + ok(attrs[2].fZeroWidth == 0, "fZeroWidth incorrect\n"); + ok(attrs[3].fZeroWidth == 0, "fZeroWidth incorrect\n"); + + ScriptFreeCache(&sc); + sc = NULL; + + memset(glyphs2,-1,sizeof(glyphs2)); + memset(logclust,-1,sizeof(logclust)); + memset(attrs,-1,sizeof(attrs)); + hr = ScriptShape(hdc, &sc, test2, 4, 4, &items[0].a, glyphs2, logclust, attrs, &nb); + ok(hr == S_OK, "ScriptShape should return S_OK not %08x\n", hr); + ok(nb == 4, "Wrong number of items\n"); + ok(glyphs2[0] == 0, "Incorrect glyph for 0x202B\n"); + ok(glyphs2[3] == 0, "Incorrect glyph for 0x202C\n"); + ok(logclust[0] == 0, "clusters out of order\n"); + ok(logclust[1] == 1, "clusters out of order\n"); + ok(logclust[2] == 2, "clusters out of order\n"); + ok(logclust[3] == 3, "clusters out of order\n"); + ok(attrs[0].uJustification == SCRIPT_JUSTIFY_CHARACTER, "uJustification incorrect\n"); + ok(attrs[1].uJustification == SCRIPT_JUSTIFY_CHARACTER, "uJustification incorrect\n"); + ok(attrs[2].uJustification == SCRIPT_JUSTIFY_CHARACTER, "uJustification incorrect\n"); + ok(attrs[3].uJustification == SCRIPT_JUSTIFY_CHARACTER, "uJustification incorrect\n"); + ok(attrs[0].fClusterStart == 1, "fClusterStart incorrect\n"); + ok(attrs[1].fClusterStart == 1, "fClusterStart incorrect\n"); + ok(attrs[2].fClusterStart == 1, "fClusterStart incorrect\n"); + ok(attrs[3].fClusterStart == 1, "fClusterStart incorrect\n"); + ok(attrs[0].fDiacritic == 0, "fDiacritic incorrect\n"); + ok(attrs[1].fDiacritic == 0, "fDiacritic incorrect\n"); + ok(attrs[2].fDiacritic == 0, "fDiacritic incorrect\n"); + ok(attrs[3].fDiacritic == 0, "fDiacritic incorrect\n"); + ok(attrs[0].fZeroWidth == 0, "fZeroWidth incorrect\n"); + ok(attrs[1].fZeroWidth == 0, "fZeroWidth incorrect\n"); + ok(attrs[2].fZeroWidth == 0, "fZeroWidth incorrect\n"); + ok(attrs[3].fZeroWidth == 0, "fZeroWidth incorrect\n"); + + /* modify LTR to RTL */ + items[0].a.fRTL = 1; + memset(glyphs2,-1,sizeof(glyphs2)); + memset(logclust,-1,sizeof(logclust)); + memset(attrs,-1,sizeof(attrs)); + hr = ScriptShape(hdc, &sc, test1, 4, 4, &items[0].a, glyphs2, logclust, attrs, &nb); + ok(!hr, "ScriptShape should return S_OK not %08x\n", hr); + ok(nb == 4, "Wrong number of items\n"); + ok(glyphs2[0] == glyphs[3], "Glyphs not reordered properly\n"); + ok(glyphs2[1] == glyphs[2], "Glyphs not reordered properly\n"); + ok(glyphs2[2] == glyphs[1], "Glyphs not reordered properly\n"); + ok(glyphs2[3] == glyphs[0], "Glyphs not reordered properly\n"); + ok(logclust[0] == 3, "clusters out of order\n"); + ok(logclust[1] == 2, "clusters out of order\n"); + ok(logclust[2] == 1, "clusters out of order\n"); + ok(logclust[3] == 0, "clusters out of order\n"); + ok(attrs[0].uJustification == SCRIPT_JUSTIFY_CHARACTER, "uJustification incorrect\n"); + ok(attrs[1].uJustification == SCRIPT_JUSTIFY_CHARACTER, "uJustification incorrect\n"); + ok(attrs[2].uJustification == SCRIPT_JUSTIFY_CHARACTER, "uJustification incorrect\n"); + ok(attrs[3].uJustification == SCRIPT_JUSTIFY_CHARACTER, "uJustification incorrect\n"); + ok(attrs[0].fClusterStart == 1, "fClusterStart incorrect\n"); + ok(attrs[1].fClusterStart == 1, "fClusterStart incorrect\n"); + ok(attrs[2].fClusterStart == 1, "fClusterStart incorrect\n"); + ok(attrs[3].fClusterStart == 1, "fClusterStart incorrect\n"); + ok(attrs[0].fDiacritic == 0, "fDiacritic incorrect\n"); + ok(attrs[1].fDiacritic == 0, "fDiacritic incorrect\n"); + ok(attrs[2].fDiacritic == 0, "fDiacritic incorrect\n"); + ok(attrs[3].fDiacritic == 0, "fDiacritic incorrect\n"); + ok(attrs[0].fZeroWidth == 0, "fZeroWidth incorrect\n"); + ok(attrs[1].fZeroWidth == 0, "fZeroWidth incorrect\n"); + ok(attrs[2].fZeroWidth == 0, "fZeroWidth incorrect\n"); + ok(attrs[3].fZeroWidth == 0, "fZeroWidth incorrect\n"); + + ScriptFreeCache(&sc); +} + +static void test_ScriptPlace(HDC hdc) +{ + static const WCHAR test1[] = {'t', 'e', 's', 't',0}; + BOOL ret; + HRESULT hr; + SCRIPT_CACHE sc = NULL; + WORD glyphs[4], logclust[4]; + SCRIPT_VISATTR attrs[4]; + SCRIPT_ITEM items[2]; + int nb, widths[4]; + GOFFSET offset[4]; + ABC abc[4]; + + hr = ScriptItemize(test1, 4, 2, NULL, NULL, items, NULL); + ok(!hr, "ScriptItemize should return S_OK not %08x\n", hr); + ok(items[0].a.fNoGlyphIndex == FALSE, "fNoGlyphIndex TRUE\n"); + + hr = ScriptShape(hdc, &sc, test1, 4, 4, &items[0].a, glyphs, logclust, attrs, &nb); + ok(!hr, "ScriptShape should return S_OK not %08x\n", hr); + ok(items[0].a.fNoGlyphIndex == FALSE, "fNoGlyphIndex TRUE\n"); hr = ScriptPlace(hdc, &sc, glyphs, 4, NULL, &items[0].a, widths, NULL, NULL); ok(hr == E_INVALIDARG, "ScriptPlace should return E_INVALIDARG not %08x\n", hr); @@ -1667,6 +1779,7 @@ START_TEST(usp10) test_ScriptCacheGetHeight(hdc); test_ScriptGetGlyphABCWidth(hdc); test_ScriptShape(hdc); + test_ScriptPlace(hdc); test_ScriptGetFontProperties(hdc); test_ScriptTextOut(hdc);

1 0

Maarten Lankhorst : mmdevapi: Don' t load openal on older openal-soft versions.
by Alexandre Julliard 15 Apr '10

15 Apr '10

Module: wine Branch: master Commit: e9cee6fbe03c1b63dbe38726b5e42b4f64f05daa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9cee6fbe03c1b63dbe38726b… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 14 21:18:42 2010 +0200 mmdevapi: Don't load openal on older openal-soft versions. --- dlls/mmdevapi/devenum.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 0f6f45d..41011e7 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -732,16 +732,40 @@ static void openal_setformat(MMDevice *This, DWORD freq) } } +static int blacklist_pulse; + static int blacklist(const char *dev) { #ifdef __linux__ if (strncmp(dev, "OSS ", 4)) return 1; #endif + if (blacklist_pulse && !strncmp(dev, "PulseAudio ", 11)) + return 1; if (strstr(dev, "ALSA") && strstr(dev, "hw:")) return 1; return 0; } +static void pulse_fixup(const char *devstr, const char **defstr) { + static int warned; + + if (!blacklist_pulse && !local_contexts) + blacklist_pulse = 1; + + if (!blacklist_pulse || !devstr || strncmp(*defstr, "PulseAudio ", 11)) + return; + + if (!warned++) { + ERR("Disabling pulseaudio because of old openal version\n"); + ERR("Please upgrade to openal-soft v1.12 or newer\n"); + } + while (*devstr && !strncmp(devstr, "PulseAudio ", 11)) { + devstr += strlen(devstr) + 1; + } + TRACE("New default: %s\n", devstr); + *defstr = devstr; +} + static void openal_scanrender(void) { WCHAR name[MAX_PATH]; @@ -756,6 +780,7 @@ static void openal_scanrender(void) defaultstr = palcGetString(NULL, ALC_DEFAULT_DEVICE_SPECIFIER); devstr = palcGetString(NULL, ALC_DEVICE_SPECIFIER); } + pulse_fixup(devstr, &defaultstr); defblacklisted = blacklist(defaultstr); if (defblacklisted) WARN("Disabling blacklist because %s is blacklisted\n", defaultstr); @@ -796,6 +821,7 @@ static void openal_scancapture(void) EnterCriticalSection(&openal_crst); devstr = palcGetString(NULL, ALC_CAPTURE_DEVICE_SPECIFIER); defaultstr = palcGetString(NULL, ALC_CAPTURE_DEFAULT_DEVICE_SPECIFIER); + pulse_fixup(devstr, &defaultstr); defblacklisted = blacklist(defaultstr); if (defblacklisted) WARN("Disabling blacklist because %s is blacklisted\n", defaultstr);

1 0

← Newer
1
...
44
45
46
47
48
49
50
...
90
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 April 2010