wine-commits September 2011

wine-commits@winehq.org

2 participants
996 discussions

Hans Leidekker : msi: Support TrueType font files in MsiGetFileVersion.
by Alexandre Julliard 20 Sep '11

20 Sep '11

Module: wine Branch: master Commit: 2788a95c8eeae8ce9e03762ff9bdf1b7783d88a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2788a95c8eeae8ce9e03762ff… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 20 11:31:41 2011 +0200 msi: Support TrueType font files in MsiGetFileVersion. --- dlls/msi/action.c | 2 +- dlls/msi/files.c | 2 +- dlls/msi/font.c | 11 ++++- dlls/msi/msi.c | 134 ++++++++++++++++++++++++++-------------------------- dlls/msi/msipriv.h | 2 +- 5 files changed, 79 insertions(+), 72 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 478addd..d81c9b7 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2196,7 +2196,7 @@ static UINT calculate_file_cost( MSIPACKAGE *package ) msi_free( file_version ); continue; } - else if ((font_version = font_version_from_file( file->TargetPath ))) + else if ((font_version = msi_font_version_from_file( file->TargetPath ))) { if (msi_compare_font_versions( font_version, file->Version ) < 0) { diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 9aa2098..210e012 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -103,7 +103,7 @@ static msi_file_state calculate_install_state( MSIPACKAGE *package, MSIFILE *fil msi_free( file_version ); return state; } - else if ((font_version = font_version_from_file( file->TargetPath ))) + else if ((font_version = msi_font_version_from_file( file->TargetPath ))) { TRACE("new %s old %s\n", debugstr_w(file->Version), debugstr_w(font_version)); diff --git a/dlls/msi/font.c b/dlls/msi/font.c index df8b81f..df7b4e7 100644 --- a/dlls/msi/font.c +++ b/dlls/msi/font.c @@ -186,15 +186,22 @@ static WCHAR *font_name_from_file( const WCHAR *filename ) return ret; } -WCHAR *font_version_from_file( const WCHAR *filename ) +WCHAR *msi_font_version_from_file( const WCHAR *filename ) { + static const WCHAR dotzerodotzeroW[] = {'.','0','.','0',0}; WCHAR *version, *p, *ret = NULL; + int len; if ((p = version = load_ttf_name_id( filename, NAME_ID_VERSION ))) { while (*p && !isdigitW( *p )) p++; - ret = msi_alloc( (strlenW( p ) + 1) * sizeof(WCHAR) ); + len = strlenW( p ) + strlenW(dotzerodotzeroW) + 1; + ret = msi_alloc( len * sizeof(WCHAR) ); strcpyW( ret, p ); + if ((p = strchrW( p, '.' )) && !(p = strchrW( p + 1, '.' ))) + { + strcatW( ret, dotzerodotzeroW ); + } msi_free( version ); } return ret; diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 7506338..c1ebe17 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -3017,11 +3017,8 @@ end: return ret; } -/****************************************************************** - * MsiGetFileVersionW [MSI.@] - */ -UINT WINAPI MsiGetFileVersionW(LPCWSTR szFilePath, LPWSTR lpVersionBuf, - LPDWORD pcchVersionBuf, LPWSTR lpLangBuf, LPDWORD pcchLangBuf) +static UINT get_file_version( const WCHAR *path, WCHAR *verbuf, DWORD *verlen, + WCHAR *langbuf, DWORD *langlen ) { static const WCHAR szVersionResource[] = {'\\',0}; static const WCHAR szVersionFormat[] = { @@ -3030,91 +3027,94 @@ UINT WINAPI MsiGetFileVersionW(LPCWSTR szFilePath, LPWSTR lpVersionBuf, '\\','V','a','r','F','i','l','e','I','n','f','o','\\', 'T','r','a','n','s','l','a','t','i','o','n',0}; static const WCHAR szLangFormat[] = {'%','d',0}; - UINT ret = 0; - DWORD dwVerLen, gle; - LPVOID lpVer = NULL; + UINT ret = ERROR_SUCCESS; + DWORD len, error; + LPVOID version; VS_FIXEDFILEINFO *ffi; USHORT *lang; - UINT puLen; WCHAR tmp[32]; - TRACE("%s %p %d %p %d\n", debugstr_w(szFilePath), - lpVersionBuf, pcchVersionBuf?*pcchVersionBuf:0, - lpLangBuf, pcchLangBuf?*pcchLangBuf:0); - - if ((lpVersionBuf && !pcchVersionBuf) || - (lpLangBuf && !pcchLangBuf)) - return ERROR_INVALID_PARAMETER; - - dwVerLen = GetFileVersionInfoSizeW(szFilePath, NULL); - if( !dwVerLen ) + if (!(len = GetFileVersionInfoSizeW( path, NULL ))) { - gle = GetLastError(); - if (gle == ERROR_BAD_PATHNAME) - return ERROR_FILE_NOT_FOUND; - else if (gle == ERROR_RESOURCE_DATA_NOT_FOUND) - return ERROR_FILE_INVALID; - - return gle; + error = GetLastError(); + if (error == ERROR_BAD_PATHNAME) return ERROR_FILE_NOT_FOUND; + return error; } - - lpVer = msi_alloc(dwVerLen); - if( !lpVer ) + if (!(version = msi_alloc( len ))) return ERROR_OUTOFMEMORY; + if (!GetFileVersionInfoW( path, 0, len, version )) { - ret = ERROR_OUTOFMEMORY; - goto end; + msi_free( version ); + return GetLastError(); } - - if( !GetFileVersionInfoW(szFilePath, 0, dwVerLen, lpVer) ) + if (verlen) { - ret = GetLastError(); - goto end; - } - - if (pcchVersionBuf) - { - if( VerQueryValueW(lpVer, szVersionResource, (LPVOID*)&ffi, &puLen) && - (puLen > 0) ) + if (VerQueryValueW( version, szVersionResource, (LPVOID *)&ffi, &len ) && len > 0) { - wsprintfW(tmp, szVersionFormat, - HIWORD(ffi->dwFileVersionMS), LOWORD(ffi->dwFileVersionMS), - HIWORD(ffi->dwFileVersionLS), LOWORD(ffi->dwFileVersionLS)); - if (lpVersionBuf) lstrcpynW(lpVersionBuf, tmp, *pcchVersionBuf); - - if (strlenW(tmp) >= *pcchVersionBuf) - ret = ERROR_MORE_DATA; - - *pcchVersionBuf = lstrlenW(tmp); + sprintfW( tmp, szVersionFormat, + HIWORD(ffi->dwFileVersionMS), LOWORD(ffi->dwFileVersionMS), + HIWORD(ffi->dwFileVersionLS), LOWORD(ffi->dwFileVersionLS) ); + if (verbuf) lstrcpynW( verbuf, tmp, *verlen ); + len = strlenW( tmp ); + if (len >= *verlen) ret = ERROR_MORE_DATA; + *verlen = len; } else { - if (lpVersionBuf) *lpVersionBuf = 0; - *pcchVersionBuf = 0; + if (verbuf) *verbuf = 0; + *verlen = 0; } } - - if (pcchLangBuf) + if (langlen) { - if (VerQueryValueW(lpVer, szLangResource, (LPVOID*)&lang, &puLen) && - (puLen > 0)) + if (VerQueryValueW( version, szLangResource, (LPVOID *)&lang, &len ) && len > 0) { - wsprintfW(tmp, szLangFormat, *lang); - if (lpLangBuf) lstrcpynW(lpLangBuf, tmp, *pcchLangBuf); - - if (strlenW(tmp) >= *pcchLangBuf) - ret = ERROR_MORE_DATA; - - *pcchLangBuf = lstrlenW(tmp); + sprintfW( tmp, szLangFormat, *lang ); + if (langbuf) lstrcpynW( langbuf, tmp, *langlen ); + len = strlenW( tmp ); + if (len >= *langlen) ret = ERROR_MORE_DATA; + *langlen = len; } else { - if (lpLangBuf) *lpLangBuf = 0; - *pcchLangBuf = 0; + if (langbuf) *langbuf = 0; + *langlen = 0; } } + msi_free( version ); + return ret; +} -end: - msi_free(lpVer); + +/****************************************************************** + * MsiGetFileVersionW [MSI.@] + */ +UINT WINAPI MsiGetFileVersionW( LPCWSTR path, LPWSTR verbuf, LPDWORD verlen, + LPWSTR langbuf, LPDWORD langlen ) +{ + UINT ret; + + TRACE("%s %p %u %p %u\n", debugstr_w(path), verbuf, verlen ? *verlen : 0, + langbuf, langlen ? *langlen : 0); + + if ((verbuf && !verlen) || (langbuf && !langlen)) + return ERROR_INVALID_PARAMETER; + + ret = get_file_version( path, verbuf, verlen, langbuf, langlen ); + if (ret == ERROR_RESOURCE_DATA_NOT_FOUND) + { + int len; + WCHAR *version = msi_font_version_from_file( path ); + if (!version) return ERROR_FILE_INVALID; + len = strlenW( version ); + if (*verlen > len) + { + strcpyW( verbuf, version ); + ret = ERROR_SUCCESS; + } + else ret = ERROR_MORE_DATA; + *verlen = len; + msi_free( version ); + } return ret; } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 7fbab61..2c38d66 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1022,7 +1022,7 @@ extern MSIASSEMBLY *msi_load_assembly(MSIPACKAGE *, MSICOMPONENT *) DECLSPEC_HID extern UINT msi_install_assembly(MSIPACKAGE *, MSICOMPONENT *) DECLSPEC_HIDDEN; extern BOOL msi_init_assembly_caches(MSIPACKAGE *) DECLSPEC_HIDDEN; extern void msi_destroy_assembly_caches(MSIPACKAGE *) DECLSPEC_HIDDEN; -extern WCHAR *font_version_from_file(const WCHAR *) DECLSPEC_HIDDEN; +extern WCHAR *msi_font_version_from_file(const WCHAR *) DECLSPEC_HIDDEN; extern WCHAR **msi_split_string(const WCHAR *, WCHAR) DECLSPEC_HIDDEN; /* media */

1 0

Hans Leidekker : mscms: Fix OpenColorProfile to handle relative file names.
by Alexandre Julliard 20 Sep '11

20 Sep '11

Module: wine Branch: master Commit: 7200072622dc14873bd0a9430c5dfd5949a6ebe9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7200072622dc14873bd0a9430… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 20 11:31:13 2011 +0200 mscms: Fix OpenColorProfile to handle relative file names. --- dlls/mscms/Makefile.in | 2 +- dlls/mscms/profile.c | 21 ++++++++++++++++++++- dlls/mscms/tests/profile.c | 10 ++++++++++ 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/mscms/Makefile.in b/dlls/mscms/Makefile.in index 9a55cdb..6589598 100644 --- a/dlls/mscms/Makefile.in +++ b/dlls/mscms/Makefile.in @@ -1,6 +1,6 @@ MODULE = mscms.dll IMPORTLIB = mscms -IMPORTS = advapi32 +IMPORTS = shlwapi advapi32 EXTRALIBS = @LCMSLIBS@ C_SRCS = \ diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index 7fc94be..c4eae9d 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -30,6 +30,7 @@ #include "wingdi.h" #include "winuser.h" #include "winreg.h" +#include "shlwapi.h" #include "icm.h" #include "mscms_priv.h" @@ -1470,7 +1471,25 @@ HPROFILE WINAPI OpenColorProfileW( PPROFILE profile, DWORD access, DWORD sharing if (!flags) return NULL; if (!sharing) sharing = FILE_SHARE_READ; - handle = CreateFileW( profile->pProfileData, flags, sharing, NULL, creation, 0, NULL ); + if (!PathIsRelativeW( profile->pProfileData )) + handle = CreateFileW( profile->pProfileData, flags, sharing, NULL, creation, 0, NULL ); + else + { + DWORD size; + WCHAR *path; + + if (!GetColorDirectoryW( NULL, NULL, &size ) && GetLastError() == ERROR_MORE_DATA) + { + size += (strlenW( profile->pProfileData ) + 2) * sizeof(WCHAR); + if (!(path = HeapAlloc( GetProcessHeap(), 0, size ))) return NULL; + GetColorDirectoryW( NULL, path, &size ); + PathAddBackslashW( path ); + strcatW( path, profile->pProfileData ); + } + else return NULL; + handle = CreateFileW( path, flags, sharing, NULL, creation, 0, NULL ); + HeapFree( GetProcessHeap(), 0, path ); + } if (handle == INVALID_HANDLE_VALUE) { WARN( "Unable to open color profile %u\n", GetLastError() ); diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index 7cbface..d4293ff 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -952,6 +952,16 @@ static void test_OpenColorProfileA(void) ret = pCloseColorProfile( handle ); ok( ret, "CloseColorProfile() failed (%d)\n", GetLastError() ); + + profile.dwType = PROFILE_FILENAME; + profile.pProfileData = (void *)"sRGB Color Space Profile.icm"; + profile.cbDataSize = sizeof("sRGB Color Space Profile.icm"); + + handle = pOpenColorProfileA( &profile, PROFILE_READ, FILE_SHARE_READ, OPEN_EXISTING ); + ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + + ret = pCloseColorProfile( handle ); + ok( ret, "CloseColorProfile() failed (%d)\n", GetLastError() ); } }

1 0

Austin English : urlmon: Add a stub for RegisterMediaTypes().
by Alexandre Julliard 20 Sep '11

20 Sep '11

Module: wine Branch: master Commit: 7c527199b6ccc8bffb72d72ddd9f2498e53ac19c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c527199b6ccc8bffb72d72dd… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Sep 19 14:24:02 2011 -0700 urlmon: Add a stub for RegisterMediaTypes(). --- dlls/urlmon/urlmon.spec | 2 +- dlls/urlmon/urlmon_main.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index d3867e1..14b1aba 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -72,7 +72,7 @@ @ stdcall RegisterBindStatusCallback(ptr ptr ptr long) @ stdcall RegisterFormatEnumerator(ptr ptr long) @ stub RegisterMediaTypeClass -@ stub RegisterMediaTypes +@ stdcall RegisterMediaTypes(long ptr ptr) @ stdcall ReleaseBindInfo(ptr) @ stdcall RevokeBindStatusCallback(ptr ptr) @ stdcall RevokeFormatEnumerator(ptr ptr) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 5ba9c00..4d60977 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -935,3 +935,13 @@ BOOL WINAPI URLMON_423(DWORD unknown1, DWORD unknown2, DWORD unknown3, DWORD unk FIXME("stub: %d %d %d %d\n", unknown1, unknown2, unknown3, unknown4); return FALSE; } + +/*********************************************************************** + * RegisterMediaTypes + * Added in IE3, registers known MIME-type strings. + */ +HRESULT WINAPI RegisterMediaTypes(UINT types, LPCSTR *szTypes, CLIPFORMAT *cfTypes) +{ + FIXME("stub: %u %p %p\n", types, szTypes, cfTypes); + return E_INVALIDARG; +}

1 0

Alexandre Julliard : gdi32: Force colors to black and white for 1-bpp source in AlphaBlend.
by Alexandre Julliard 20 Sep '11

20 Sep '11

Module: wine Branch: master Commit: 514b006df240441efc50be7c42680e423a80402d URL: http://source.winehq.org/git/wine.git/?a=commit;h=514b006df240441efc50be7c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 20 15:27:36 2011 +0200 gdi32: Force colors to black and white for 1-bpp source in AlphaBlend. --- dlls/gdi32/bitblt.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 98ced52..294901d 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -293,6 +293,20 @@ BOOL nulldrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, err = dst_dev->funcs->pBlendImage( dst_dev, dst_info, &bits, src, dst, func ); if (err == ERROR_BAD_FORMAT) { + /* 1-bpp source without a color table uses black & white */ + if (src_info->bmiHeader.biBitCount == 1 && !src_info->bmiHeader.biClrUsed) + { + src_info->bmiColors[0].rgbRed = 0; + src_info->bmiColors[0].rgbGreen = 0; + src_info->bmiColors[0].rgbBlue = 0; + src_info->bmiColors[0].rgbReserved = 0; + src_info->bmiColors[1].rgbRed = 0xff; + src_info->bmiColors[1].rgbGreen = 0xff; + src_info->bmiColors[1].rgbBlue = 0xff; + src_info->bmiColors[1].rgbReserved = 0; + src_info->bmiHeader.biClrUsed = 2; + } + err = convert_bits( src_info, src, dst_info, &bits ); if (!err) err = dst_dev->funcs->pBlendImage( dst_dev, dst_info, &bits, src, dst, func ); }

1 0

Alexandre Julliard : winex11: Implement a BlendImage entry point in the XRender driver.
by Alexandre Julliard 20 Sep '11

20 Sep '11

Module: wine Branch: master Commit: fb4dc8a544b3089937650e92cbde81c22406b7c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb4dc8a544b3089937650e92c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 20 12:00:00 2011 +0200 winex11: Implement a BlendImage entry point in the XRender driver. --- dlls/winex11.drv/xrender.c | 76 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 75 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 7dd32cc..cdd71e8 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2766,6 +2766,80 @@ x11drv_fallback: /*********************************************************************** + * xrenderdrv_BlendImage + */ +static DWORD xrenderdrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct gdi_image_bits *bits, + struct bitblt_coords *src, struct bitblt_coords *dst, + BLENDFUNCTION func ) +{ + struct xrender_physdev *physdev = get_xrender_dev( dev ); + DWORD ret; + enum wxr_format format; + XRenderPictFormat *pict_format; + Picture dst_pict, src_pict, mask_pict; + Pixmap src_pixmap; + BOOL use_repeat; + + if (!X11DRV_XRender_Installed) + { + dev = GET_NEXT_PHYSDEV( dev, pBlendImage ); + return dev->funcs->pBlendImage( dev, info, bits, src, dst, func ); + } + + format = get_xrender_format_from_bitmapinfo( info, func.AlphaFormat & AC_SRC_ALPHA ); + if (!(pict_format = pict_formats[format])) goto update_format; + + /* make sure we can create an image with the same bpp */ + if (info->bmiHeader.biBitCount != pixmap_formats[pict_format->depth]->bits_per_pixel) + goto update_format; + + if (format == WXR_FORMAT_MONO && physdev->format != WXR_FORMAT_MONO) + goto update_format; + + if (!bits) return ERROR_SUCCESS; /* just querying the format */ + + ret = create_image_pixmap( info, bits, src, format, &src_pixmap, &src_pict, &use_repeat ); + if (!ret) + { + double xscale, yscale; + + X11DRV_LockDIBSection( physdev->x11dev, DIB_Status_GdiMod ); + + if (!use_repeat) + { + xscale = src->width / (double)dst->width; + yscale = src->height / (double)dst->height; + } + else xscale = yscale = 1; /* no scaling needed with a repeating source */ + + dst_pict = get_xrender_picture( physdev, 0, &dst->visrect ); + + EnterCriticalSection( &xrender_cs ); + mask_pict = get_mask_pict( func.SourceConstantAlpha * 257 ); + + wine_tsx11_lock(); + xrender_blit( PictOpOver, src_pict, mask_pict, dst_pict, src->x, src->y, + physdev->x11dev->dc_rect.left + dst->x, + physdev->x11dev->dc_rect.top + dst->y, + xscale, yscale, dst->width, dst->height ); + pXRenderFreePicture( gdi_display, src_pict ); + XFreePixmap( gdi_display, src_pixmap ); + wine_tsx11_unlock(); + + LeaveCriticalSection( &xrender_cs ); + + X11DRV_UnlockDIBSection( physdev->x11dev, TRUE ); + } + return ret; + +update_format: + if (info->bmiHeader.biHeight > 0) info->bmiHeader.biHeight = -info->bmiHeader.biHeight; + set_color_info( physdev->pict_format, info ); + return ERROR_BAD_FORMAT; +} + + +/*********************************************************************** * xrenderdrv_AlphaBlend */ static BOOL xrenderdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, @@ -2881,7 +2955,7 @@ static const struct gdi_dc_funcs xrender_funcs = NULL, /* pArc */ NULL, /* pArcTo */ NULL, /* pBeginPath */ - NULL, /* pBlendImage */ + xrenderdrv_BlendImage, /* pBlendImage */ NULL, /* pChoosePixelFormat */ NULL, /* pChord */ NULL, /* pCloseFigure */

1 0

Alexandre Julliard : winex11: Set XRender clipping lazily when retrieving the destination picture.
by Alexandre Julliard 20 Sep '11

20 Sep '11

Module: wine Branch: master Commit: 3be01b185dcb8637a1ddd1b607bad47097a96a7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3be01b185dcb8637a1ddd1b60… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 20 11:51:43 2011 +0200 winex11: Set XRender clipping lazily when retrieving the destination picture. --- dlls/winex11.drv/graphics.c | 2 +- dlls/winex11.drv/x11drv.h | 1 - dlls/winex11.drv/xrender.c | 142 ++++++++++++++----------------------------- 3 files changed, 48 insertions(+), 97 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3be01b185dcb8637a1ddd…

1 0

Alexandre Julliard : winex11: Add a helper function to create the source pixmap from an image.
by Alexandre Julliard 20 Sep '11

20 Sep '11

Module: wine Branch: master Commit: aa4655e8995e14e49450f6b23866b80e186a8329 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa4655e8995e14e49450f6b23… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 20 11:21:00 2011 +0200 winex11: Add a helper function to create the source pixmap from an image. --- dlls/winex11.drv/xrender.c | 124 ++++++++++++++++++++++++++------------------ 1 files changed, 74 insertions(+), 50 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index b991935..384275f 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2388,6 +2388,56 @@ static void get_colors( struct xrender_physdev *physdev_src, struct xrender_phys get_xrender_color( physdev_dst->pict_format, physdev_dst->x11dev->backgroundPixel, bg ); } +/* create a pixmap and render picture for an image */ +static DWORD create_image_pixmap( BITMAPINFO *info, const struct gdi_image_bits *bits, + struct bitblt_coords *src, enum wxr_format format, + Pixmap *pixmap, Picture *pict, BOOL *use_repeat ) +{ + DWORD ret; + int width = src->visrect.right - src->visrect.left; + int height = src->visrect.bottom - src->visrect.top; + int depth = pict_formats[format]->depth; + struct gdi_image_bits dst_bits; + XRenderPictureAttributes pa; + XImage *image; + + wine_tsx11_lock(); + image = XCreateImage( gdi_display, visual, depth, ZPixmap, 0, NULL, + info->bmiHeader.biWidth, height, 32, 0 ); + wine_tsx11_unlock(); + if (!image) return ERROR_OUTOFMEMORY; + + ret = copy_image_bits( info, (format == WXR_FORMAT_R8G8B8), image, bits, &dst_bits, src, NULL, ~0u ); + if (ret) return ret; + + image->data = dst_bits.ptr; + /* hack: make sure the bits are readable if we are reading from a DIB section */ + /* to be removed once we get rid of DIB access protections */ + if (!dst_bits.is_copy) IsBadReadPtr( dst_bits.ptr, image->height * image->bytes_per_line ); + + *use_repeat = (width == 1 && height == 1); + pa.repeat = *use_repeat ? RepeatNormal : RepeatNone; + + wine_tsx11_lock(); + *pixmap = XCreatePixmap( gdi_display, root_window, width, height, depth ); + XPutImage( gdi_display, *pixmap, get_bitmap_gc( depth ), image, + src->visrect.left, 0, 0, 0, width, height ); + *pict = pXRenderCreatePicture( gdi_display, *pixmap, pict_formats[format], CPRepeat, &pa ); + wine_tsx11_unlock(); + + /* make coordinates relative to the pixmap */ + src->x -= src->visrect.left; + src->y -= src->visrect.top; + OffsetRect( &src->visrect, -src->visrect.left, -src->visrect.top ); + + image->data = NULL; + wine_tsx11_lock(); + XDestroyImage( image ); + wine_tsx11_unlock(); + if (dst_bits.free) dst_bits.free( &dst_bits ); + return ret; +} + static void xrender_stretch_blit( struct xrender_physdev *physdev_src, struct xrender_physdev *physdev_dst, Drawable drawable, HRGN clip, const struct bitblt_coords *src, const struct bitblt_coords *dst ) @@ -2488,21 +2538,18 @@ static void xrender_stretch_blit( struct xrender_physdev *physdev_src, struct xr HeapFree( GetProcessHeap(), 0, clip_data ); } -static void xrender_put_image( XImage *image, HRGN clip, XRenderPictFormat *src_format, + +static void xrender_put_image( Pixmap src_pixmap, Picture src_pict, HRGN clip, XRenderPictFormat *dst_format, struct xrender_physdev *physdev, - Drawable drawable, struct bitblt_coords *src, struct bitblt_coords *dst ) + Drawable drawable, struct bitblt_coords *src, + struct bitblt_coords *dst, BOOL use_repeat ) { int x_src, y_src, x_dst, y_dst; - Picture dst_pict, src_pict; + Picture dst_pict; XRenderPictureAttributes pa; - Pixmap src_pixmap; double xscale, yscale; RGNDATA *clip_data = NULL; - /* make source relative to tmp pixmap origin */ - x_src = src->x - src->visrect.left; - y_src = src->y - src->visrect.top; - if (drawable) /* using an intermediate pixmap */ { if (clip) clip_data = X11DRV_GetRegionData( clip, 0 ); @@ -2524,35 +2571,25 @@ static void xrender_put_image( XImage *image, HRGN clip, XRenderPictFormat *src_ if (clip) clip_data = add_xrender_clipping_region( physdev, clip ); } - if (image->width == 1 && image->height == 1) - { - pa.repeat = RepeatNormal; - xscale = yscale = 1; /* no scaling needed with a repeating source */ - } - else + if (!use_repeat) { - pa.repeat = RepeatNone; xscale = src->width / (double)dst->width; yscale = src->height / (double)dst->height; } + else xscale = yscale = 1; /* no scaling needed with a repeating source */ + x_src = src->x; + y_src = src->y; if (src->width < 0) x_src += src->width + 1; if (src->height < 0) y_src += src->height + 1; if (dst->width < 0) x_dst += dst->width + 1; if (dst->height < 0) y_dst += dst->height + 1; wine_tsx11_lock(); - src_pixmap = XCreatePixmap( gdi_display, root_window, image->width, image->height, src_format->depth ); - XPutImage( gdi_display, src_pixmap, get_bitmap_gc( src_format->depth ), - image, src->visrect.left, 0, 0, 0, image->width, image->height ); - src_pict = pXRenderCreatePicture( gdi_display, src_pixmap, src_format, CPRepeat, &pa ); - xrender_blit( PictOpSrc, src_pict, 0, dst_pict, x_src, y_src, x_dst, y_dst, xscale, yscale, abs( dst->width ), abs( dst->height )); if (drawable) pXRenderFreePicture( gdi_display, dst_pict ); - pXRenderFreePicture( gdi_display, src_pict ); - XFreePixmap( gdi_display, src_pixmap ); wine_tsx11_unlock(); if (!drawable) update_xrender_clipping( physdev, clip_data ); @@ -2655,12 +2692,13 @@ static DWORD xrenderdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMA struct xrender_physdev *physdev; X_PHYSBITMAP *bitmap; DWORD ret; - XImage *image; Pixmap tmp_pixmap; GC gc; - struct gdi_image_bits dst_bits; enum wxr_format src_format, dst_format; XRenderPictFormat *pict_format; + Pixmap src_pixmap; + Picture src_pict; + BOOL use_repeat; if (!X11DRV_XRender_Installed) goto x11drv_fallback; @@ -2691,24 +2729,11 @@ static DWORD xrenderdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMA if (!bits) return ERROR_SUCCESS; /* just querying the format */ - wine_tsx11_lock(); - image = XCreateImage( gdi_display, visual, pict_format->depth, ZPixmap, 0, NULL, - info->bmiHeader.biWidth, src->visrect.bottom - src->visrect.top, 32, 0 ); - wine_tsx11_unlock(); - if (!image) return ERROR_OUTOFMEMORY; - - ret = copy_image_bits( info, (src_format == WXR_FORMAT_R8G8B8), - image, bits, &dst_bits, src, NULL, ~0u ); - + ret = create_image_pixmap( info, bits, src, src_format, &src_pixmap, &src_pict, &use_repeat ); if (!ret) { struct bitblt_coords tmp; - image->data = dst_bits.ptr; - /* hack: make sure the bits are readable if we are reading from a DIB section */ - /* to be removed once we get rid of DIB access protections */ - if (!dst_bits.is_copy) IsBadReadPtr( dst_bits.ptr, image->height * image->bytes_per_line ); - if (bitmap) { HRGN rgn = CreateRectRgnIndirect( &dst->visrect ); @@ -2716,8 +2741,8 @@ static DWORD xrenderdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMA X11DRV_DIB_Lock( bitmap, DIB_Status_GdiMod ); - xrender_put_image( image, rgn, pict_formats[src_format], pict_formats[dst_format], - NULL, bitmap->pixmap, src, dst ); + xrender_put_image( src_pixmap, src_pict, rgn, pict_formats[dst_format], + NULL, bitmap->pixmap, src, dst, use_repeat ); X11DRV_DIB_Unlock( bitmap, TRUE ); DeleteObject( rgn ); @@ -2746,8 +2771,8 @@ static DWORD xrenderdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMA tmp.visrect.bottom - tmp.visrect.top, physdev->x11dev->depth ); wine_tsx11_unlock(); - xrender_put_image( image, NULL, pict_format, physdev->pict_format, - NULL, tmp_pixmap, src, &tmp ); + xrender_put_image( src_pixmap, src_pict, NULL, physdev->pict_format, + NULL, tmp_pixmap, src, &tmp, use_repeat ); execute_rop( physdev->x11dev, tmp_pixmap, gc, &dst->visrect, rop ); wine_tsx11_lock(); @@ -2761,20 +2786,19 @@ static DWORD xrenderdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMA { HRGN rgn = CreateRectRgnIndirect( &dst->visrect ); if (clip) CombineRgn( rgn, rgn, clip, RGN_AND ); - xrender_put_image( image, rgn, pict_format, physdev->pict_format, physdev, 0, src, dst ); + xrender_put_image( src_pixmap, src_pict, rgn, + physdev->pict_format, physdev, 0, src, dst, use_repeat ); DeleteObject( rgn ); } - X11DRV_UnlockDIBSection( physdev->x11dev, !ret ); + X11DRV_UnlockDIBSection( physdev->x11dev, TRUE ); } - image->data = NULL; + wine_tsx11_lock(); + pXRenderFreePicture( gdi_display, src_pict ); + XFreePixmap( gdi_display, src_pixmap ); + wine_tsx11_unlock(); } - - wine_tsx11_lock(); - XDestroyImage( image ); - wine_tsx11_unlock(); - if (dst_bits.free) dst_bits.free( &dst_bits ); return ret; update_format:

1 0

Piotr Caban : msvcr90: Fix _vswprintf_p implementation.
by Alexandre Julliard 20 Sep '11

20 Sep '11

Module: wine Branch: master Commit: af6fd252ef8d630be82b9dba3199d5990c80e2b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af6fd252ef8d630be82b9dba3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 20 10:32:29 2011 +0200 msvcr90: Fix _vswprintf_p implementation. --- dlls/msvcr90/msvcr90.c | 8 ++++++++ dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/wcs.c | 2 +- include/msvcrt/stdio.h | 1 + include/msvcrt/wchar.h | 1 + 5 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c index fd24f11..6b97e2f 100644 --- a/dlls/msvcr90/msvcr90.c +++ b/dlls/msvcr90/msvcr90.c @@ -358,3 +358,11 @@ void* CDECL _CRT_RTC_INITW(void *unk1, void *unk2, int unk3, int unk4, int unk5) TRACE("%p %p %x %x %x\n", unk1, unk2, unk3, unk4, unk5); return NULL; } + +/********************************************************************* + * _vswprintf_p (MSVCR90.@) + */ +int CDECL MSVCR90__vswprintf_p(wchar_t *buffer, size_t length, const wchar_t *format, __ms_va_list args) +{ + return _vswprintf_p_l(buffer, length, format, NULL, args); +} diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index ffdc931..c93efdd 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1107,7 +1107,7 @@ @ cdecl _vswprintf_c(ptr long wstr ptr) msvcrt._vswprintf_c @ cdecl _vswprintf_c_l(ptr long wstr ptr ptr) msvcrt._vswprintf_c_l @ cdecl _vswprintf_l(ptr wstr ptr ptr) msvcrt._vswprintf_l -@ cdecl _vswprintf_p(ptr long wstr ptr) msvcrt._vswprintf +@ cdecl _vswprintf_p(ptr long wstr ptr) MSVCR90__vswprintf_p @ cdecl _vswprintf_p_l(ptr long wstr ptr ptr) msvcrt._vswprintf_p_l @ cdecl _vswprintf_s_l(ptr long wstr ptr ptr) msvcrt._vswprintf_s_l @ stub _vwprintf_l diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index d771d4f..0327ccb 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -709,7 +709,7 @@ int CDECL MSVCRT_vswprintf_p_l(MSVCRT_wchar_t *buffer, MSVCRT_size_t length, *MSVCRT__errno() = MSVCRT_EINVAL; return ret; } else if(ret == 0) - ret = pf_printf_w(puts_clbk_str_w, &puts_ctx, format, locale, TRUE, TRUE, + ret = pf_printf_w(puts_clbk_str_w, &puts_ctx, format, locale, FALSE, TRUE, arg_clbk_valist, NULL, &args); else ret = pf_printf_w(puts_clbk_str_w, &puts_ctx, format, locale, TRUE, TRUE, diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 4e43635..e2c1669 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -191,6 +191,7 @@ int __cdecl _snwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,...); int __cdecl _vscwprintf(const wchar_t*,__ms_va_list); int __cdecl _vsnwprintf(wchar_t*,size_t,const wchar_t*,__ms_va_list); int __cdecl _vsnwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,__ms_va_list); +int __cdecl _vswprintf_p_l(wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list); FILE* __cdecl _wfdopen(int,const wchar_t*); FILE* __cdecl _wfopen(const wchar_t*,const wchar_t*); errno_t __cdecl _wfopen_s(FILE**,const wchar_t*,const wchar_t*); diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index eab28b7..4c26624 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -322,6 +322,7 @@ int __cdecl _snwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,...); int __cdecl _vscwprintf(const wchar_t*,__ms_va_list); int __cdecl _vsnwprintf(wchar_t*,size_t,const wchar_t*,__ms_va_list); int __cdecl _vsnwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,__ms_va_list); +int __cdecl _vswprintf_p_l(wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list); FILE* __cdecl _wfdopen(int,const wchar_t*); FILE* __cdecl _wfopen(const wchar_t*,const wchar_t*); errno_t __cdecl _wfopen_s(FILE**,const wchar_t*,const wchar_t*);

1 0

Dmitry Timoshkov : kernel32: Add a test to show that uninitialized sections are not special regarding protection flags .
by Alexandre Julliard 20 Sep '11

20 Sep '11

Module: wine Branch: master Commit: 0f500eac9881a6a49b925b560983f5f6388aa786 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f500eac9881a6a49b925b560… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 20 17:48:12 2011 +0900 kernel32: Add a test to show that uninitialized sections are not special regarding protection flags. --- dlls/kernel32/tests/loader.c | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 866daba..ce59843 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -567,7 +567,25 @@ static void test_section_access(void) { IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY }, { IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_READ }, { IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY }, - { IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY } + { IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY }, + + { IMAGE_SCN_CNT_INITIALIZED_DATA, PAGE_NOACCESS }, + { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ, PAGE_READONLY }, + { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY }, + { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE }, + { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY }, + { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_READ }, + { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY }, + { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY }, + + { IMAGE_SCN_CNT_UNINITIALIZED_DATA, PAGE_NOACCESS }, + { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_READ, PAGE_READONLY }, + { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY }, + { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE }, + { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY }, + { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_READ }, + { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY }, + { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY } }; static const char filler[0x1000]; static const char section_data[0x10] = "section data"; @@ -651,6 +669,11 @@ static void test_section_access(void) "%d: VirtualQuery error %d\n", i, GetLastError()); ok(info.BaseAddress == (char *)hlib + section.VirtualAddress, "%d: got %p != expected %p\n", i, info.BaseAddress, (char *)hlib + section.VirtualAddress); ok(info.RegionSize == si.dwPageSize, "%d: got %#lx != expected %#x\n", i, info.RegionSize, si.dwPageSize); + /* FIXME: remove the condition below once Wine is fixed */ + if ((td[i].scn_file_access & IMAGE_SCN_MEM_WRITE) && + (td[i].scn_file_access & IMAGE_SCN_CNT_UNINITIALIZED_DATA)) + todo_wine ok(info.Protect == td[i].scn_page_access, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].scn_page_access); + else ok(info.Protect == td[i].scn_page_access, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].scn_page_access); ok(info.AllocationBase == hlib, "%d: %p != %p\n", i, info.AllocationBase, hlib); ok(info.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "%d: %#x != PAGE_EXECUTE_WRITECOPY\n", i, info.AllocationProtect);

1 0

Nikolay Sivov : comctl32/monthcal: Fix today date box painting.
by Alexandre Julliard 20 Sep '11

20 Sep '11

Module: wine Branch: master Commit: 229d4e210999cb9b31baa7c66458cbd2a7d9706c URL: http://source.winehq.org/git/wine.git/?a=commit;h=229d4e210999cb9b31baa7c66… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 20 11:35:54 2011 +0400 comctl32/monthcal: Fix today date box painting. --- dlls/comctl32/monthcal.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index dfa3d6e..762a792 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -987,14 +987,20 @@ static void MONTHCAL_PaintTodayTitle(const MONTHCAL_INFO *infoPtr, HDC hdc, cons /* today mark + focus */ static void MONTHCAL_PaintFocusAndCircle(const MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT *ps) { - if((infoPtr->minSel.wMonth == infoPtr->todaysDate.wMonth) && - (infoPtr->minSel.wYear == infoPtr->todaysDate.wYear) && - !(infoPtr->dwStyle & MCS_NOTODAYCIRCLE)) + /* circle today date if only it's in fully visible month */ + if (!(infoPtr->dwStyle & MCS_NOTODAYCIRCLE)) { - MONTHCAL_CircleDay(infoPtr, hdc, &infoPtr->todaysDate); + INT i; + + for (i = 0; i < MONTHCAL_GetCalCount(infoPtr); i++) + if (!MONTHCAL_CompareMonths(&infoPtr->todaysDate, &infoPtr->calendars[i].month)) + { + MONTHCAL_CircleDay(infoPtr, hdc, &infoPtr->todaysDate); + break; + } } - if(!MONTHCAL_IsDateEqual(&infoPtr->focusedSel, &st_null)) + if (!MONTHCAL_IsDateEqual(&infoPtr->focusedSel, &st_null)) { RECT r; MONTHCAL_GetDayRect(infoPtr, &infoPtr->focusedSel, &r, -1);

1 0

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 September 2011