October 2009 - Wine-commits

Gerald Pfeifer : winebuild: Add support for PLATFORM_FREEBSD.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: d222e8edf1983303a7f6ab1ba6bebf3770e00994 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d222e8edf1983303a7f6ab1ba… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Oct 5 02:24:57 2009 +0200 winebuild: Add support for PLATFORM_FREEBSD. --- tools/winebuild/build.h | 6 +++++- tools/winebuild/main.c | 3 +++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 07ac347..b942934 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -124,7 +124,11 @@ enum target_cpu enum target_platform { - PLATFORM_UNSPECIFIED, PLATFORM_APPLE, PLATFORM_SOLARIS, PLATFORM_WINDOWS + PLATFORM_UNSPECIFIED, + PLATFORM_APPLE, + PLATFORM_FREEBSD, + PLATFORM_SOLARIS, + PLATFORM_WINDOWS }; extern char *target_alias; diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 9fef1c4..4dfa63f 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -64,6 +64,8 @@ enum target_cpu target_cpu = CPU_POWERPC; #ifdef __APPLE__ enum target_platform target_platform = PLATFORM_APPLE; +#elif defined(__FreeBSD__) +enum target_platform target_platform = PLATFORM_FREEBSD; #elif defined(__sun) enum target_platform target_platform = PLATFORM_SOLARIS; #elif defined(_WIN32) @@ -111,6 +113,7 @@ static const struct { { "macos", PLATFORM_APPLE }, { "darwin", PLATFORM_APPLE }, + { "freebsd", PLATFORM_FREEBSD }, { "solaris", PLATFORM_SOLARIS }, { "windows", PLATFORM_WINDOWS }, { "winnt", PLATFORM_WINDOWS }

1 0

Joel Holdsworth : comdlg32: Replaced file dialog house icon with the shell icon for desktop.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: ee09534c27098bc8b00a7c0d5f9199232aab8fb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee09534c27098bc8b00a7c0d5… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Sat Oct 3 10:12:55 2009 +0100 comdlg32: Replaced file dialog house icon with the shell icon for desktop. --- dlls/comdlg32/800.bmp | Bin 1334 -> 0 bytes dlls/comdlg32/cdlg_xx.rc | 3 --- dlls/comdlg32/filedlg.c | 27 +++++++++++++++++++-------- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/comdlg32/800.bmp b/dlls/comdlg32/800.bmp deleted file mode 100644 index 3b7dae2..0000000 Binary files a/dlls/comdlg32/800.bmp and /dev/null differ diff --git a/dlls/comdlg32/cdlg_xx.rc b/dlls/comdlg32/cdlg_xx.rc index 0797897..24139d2 100644 --- a/dlls/comdlg32/cdlg_xx.rc +++ b/dlls/comdlg32/cdlg_xx.rc @@ -71,9 +71,6 @@ PD32_PORTRAIT ICON pd32_portrait.ico /* @makedep: pd32_landscape.ico */ PD32_LANDSCAPE ICON pd32_landscape.ico -/* @makedep: 800.bmp */ -800 BITMAP DISCARDABLE LOADONCALL "800.bmp" - /* @makedep: folder.ico */ FOLDER ICON folder.ico diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index a28c457..d1147eb 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -1320,15 +1320,16 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) {VIEW_LIST, FCIDM_TB_SMALLICON, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0 }, {VIEW_DETAILS, FCIDM_TB_REPORTVIEW, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0 }, }; - TBADDBITMAP tba[2]; + static const TBADDBITMAP tba = {HINST_COMMCTRL, IDB_VIEW_SMALL_COLOR}; + RECT rectTB; RECT rectlook; - FileOpenDlgInfos *fodInfos = GetPropA(hwnd,FileOpenDlgInfosStr); - tba[0].hInst = HINST_COMMCTRL; - tba[0].nID = IDB_VIEW_SMALL_COLOR; - tba[1].hInst = COMDLG32_hInstance; - tba[1].nID = 800; + HIMAGELIST toolbarImageList; + SHFILEINFOA shFileInfo; + ITEMIDLIST *desktopPidl; + + FileOpenDlgInfos *fodInfos = GetPropA(hwnd,FileOpenDlgInfosStr); TRACE("%p\n", fodInfos); @@ -1378,9 +1379,19 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) /* FIXME: use TB_LOADIMAGES when implemented */ /* SendMessageW(fodInfos->DlgInfos.hwndTB, TB_LOADIMAGES, IDB_VIEW_SMALL_COLOR, HINST_COMMCTRL);*/ SendMessageW(fodInfos->DlgInfos.hwndTB, TB_SETMAXTEXTROWS, 0, 0); - SendMessageW(fodInfos->DlgInfos.hwndTB, TB_ADDBITMAP, 12, (LPARAM) &tba[0]); - SendMessageW(fodInfos->DlgInfos.hwndTB, TB_ADDBITMAP, 1, (LPARAM) &tba[1]); + SendMessageW(fodInfos->DlgInfos.hwndTB, TB_ADDBITMAP, 12, (LPARAM) &tba); + + /* Retrieve and add desktop icon to the toolbar */ + toolbarImageList = (HIMAGELIST)SendMessageW(fodInfos->DlgInfos.hwndTB, TB_GETIMAGELIST, 0, 0L); + SHGetSpecialFolderLocation(hwnd, CSIDL_DESKTOP, &desktopPidl); + SHGetFileInfoA((LPCSTR)desktopPidl, 0, &shFileInfo, sizeof(shFileInfo), + SHGFI_PIDL | SHGFI_ICON | SHGFI_SMALLICON); + ImageList_AddIcon(toolbarImageList, shFileInfo.hIcon); + + DestroyIcon(shFileInfo.hIcon); + CoTaskMemFree(desktopPidl); + /* Finish Toolbar Construction */ SendMessageW(fodInfos->DlgInfos.hwndTB, TB_ADDBUTTONSW, 9, (LPARAM) tbb); SendMessageW(fodInfos->DlgInfos.hwndTB, TB_AUTOSIZE, 0, 0);

1 0

Joel Holdsworth : user32: Fixed CURSORICON_CreateIconFromBMI to preserve the alpha channel.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: c2202929ab4b6d1ce379865dfd8904186814f265 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2202929ab4b6d1ce379865df… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Mon Jun 29 19:10:36 2009 +0100 user32: Fixed CURSORICON_CreateIconFromBMI to preserve the alpha channel. --- dlls/user32/cursoricon.c | 147 +++++++++++++++++++++++++++------------------- 1 files changed, 87 insertions(+), 60 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 23de6a5..a74b79d 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -659,6 +659,39 @@ static CURSORICONFILEDIRENTRY *CURSORICON_FindBestIconFile( CURSORICONFILEDIR *d return &dir->idEntries[n]; } +/*********************************************************************** + * stretch_blt_icon + * + * A helper function that stretches a bitmap buffer into an HBITMAP. + * + * PARAMS + * hDest [I] The handle of the destination bitmap. + * pDestInfo [I] The BITMAPINFO of the destination bitmap. + * pSrcInfo [I] The BITMAPINFO of the source bitmap. + * pSrcBits [I] A pointer to the source bitmap buffer. + **/ +static BOOL stretch_blt_icon(HBITMAP hDest, BITMAPINFO *pDestInfo, BITMAPINFO *pSrcInfo, char *pSrcBits) +{ + HBITMAP hOld; + BOOL res = FALSE; + static HDC hdcMem = NULL; + + if (!hdcMem) + hdcMem = CreateCompatibleDC(screen_dc); + + if (hdcMem) + { + hOld = SelectObject(hdcMem, hDest); + res = StretchDIBits(hdcMem, + 0, 0, pDestInfo->bmiHeader.biWidth, pDestInfo->bmiHeader.biHeight, + 0, 0, pSrcInfo->bmiHeader.biWidth, pSrcInfo->bmiHeader.biHeight, + pSrcBits, pSrcInfo, DIB_RGB_COLORS, SRCCOPY); + SelectObject(hdcMem, hOld); + } + + return res; +} + static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, POINT16 hotspot, BOOL bIcon, DWORD dwVersion, @@ -666,12 +699,11 @@ static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, UINT cFlag ) { HGLOBAL16 hObj; - static HDC hdcMem; int sizeAnd, sizeXor; HBITMAP hAndBits = 0, hXorBits = 0; /* error condition for later */ BITMAP bmpXor, bmpAnd; - BOOL DoStretch; INT size; + BITMAPINFO *pSrcInfo, *pDestInfo; if (dwVersion == 0x00020000) { @@ -693,11 +725,10 @@ static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, if (!width) width = bmi->bmiHeader.biWidth; if (!height) height = bmi->bmiHeader.biHeight/2; - DoStretch = (bmi->bmiHeader.biHeight/2 != height) || - (bmi->bmiHeader.biWidth != width); /* Scale the hotspot */ - if (DoStretch && hotspot.x != ICON_HOTSPOT && hotspot.y != ICON_HOTSPOT) + if (((bmi->bmiHeader.biHeight/2 != height) || (bmi->bmiHeader.biWidth != width)) && + hotspot.x != ICON_HOTSPOT && hotspot.y != ICON_HOTSPOT) { hotspot.x = (hotspot.x * width) / bmi->bmiHeader.biWidth; hotspot.y = (hotspot.y * height) / (bmi->bmiHeader.biHeight / 2); @@ -706,8 +737,6 @@ static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, if (!screen_dc) screen_dc = CreateDCW( DISPLAYW, NULL, NULL, NULL ); if (screen_dc) { - BITMAPINFO* pInfo; - /* Make sure we have room for the monochrome bitmap later on. * Note that BITMAPINFOINFO and BITMAPCOREHEADER are the same * up to and including the biBitCount. In-memory icon resource @@ -719,40 +748,47 @@ static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, * BYTE icAND[] // DIB bits for AND mask */ - if ((pInfo = HeapAlloc( GetProcessHeap(), 0, - max(size, sizeof(BITMAPINFOHEADER) + 2*sizeof(RGBQUAD))))) + pSrcInfo = HeapAlloc( GetProcessHeap(), 0, + max(size, sizeof(BITMAPINFOHEADER) + 2*sizeof(RGBQUAD))); + pDestInfo = HeapAlloc( GetProcessHeap(), 0, + max(size, sizeof(BITMAPINFOHEADER) + 2*sizeof(RGBQUAD))); + if (pSrcInfo && pDestInfo) { - memcpy( pInfo, bmi, size ); - pInfo->bmiHeader.biHeight /= 2; + memcpy( pSrcInfo, bmi, size ); + pSrcInfo->bmiHeader.biHeight /= 2; + + memcpy( pDestInfo, bmi, size ); + pDestInfo->bmiHeader.biWidth = width; + pDestInfo->bmiHeader.biHeight = height; + pDestInfo->bmiHeader.biSizeImage = 0; /* Create the XOR bitmap */ + if(pSrcInfo->bmiHeader.biBitCount == 32) + { + void *pDIBBuffer = NULL; + hXorBits = CreateDIBSection(screen_dc, pDestInfo, DIB_RGB_COLORS, &pDIBBuffer, NULL, 0); - if (DoStretch) { + if(hXorBits) + { + if (!stretch_blt_icon(hXorBits, pDestInfo, pSrcInfo, (char*)bmi + size)) + { + DeleteObject(hXorBits); + hXorBits = 0; + } + } + } + else + { hXorBits = CreateCompatibleBitmap(screen_dc, width, height); + if(hXorBits) { - HBITMAP hOld; - BOOL res = FALSE; - - if (!hdcMem) hdcMem = CreateCompatibleDC(screen_dc); - if (hdcMem) { - hOld = SelectObject(hdcMem, hXorBits); - res = StretchDIBits(hdcMem, 0, 0, width, height, 0, 0, - bmi->bmiHeader.biWidth, bmi->bmiHeader.biHeight/2, - (char*)bmi + size, pInfo, DIB_RGB_COLORS, SRCCOPY); - SelectObject(hdcMem, hOld); + if(!stretch_blt_icon(hXorBits, pDestInfo, pSrcInfo, (char*)bmi + size)) + { + DeleteObject(hXorBits); + hXorBits = 0; + } } - if (!res) { DeleteObject(hXorBits); hXorBits = 0; } - } - } else { - if (is_dib_monochrome(bmi)) { - hXorBits = CreateBitmap(width, height, 1, 1, NULL); - SetDIBits(screen_dc, hXorBits, 0, height, - (char*)bmi + size, pInfo, DIB_RGB_COLORS); - } - else - hXorBits = CreateDIBitmap(screen_dc, &pInfo->bmiHeader, - CBM_INIT, (char*)bmi + size, pInfo, DIB_RGB_COLORS); } if( hXorBits ) @@ -761,51 +797,42 @@ static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, get_dib_width_bytes( bmi->bmiHeader.biWidth, bmi->bmiHeader.biBitCount ) * abs( bmi->bmiHeader.biHeight ) / 2; - pInfo->bmiHeader.biBitCount = 1; - if (pInfo->bmiHeader.biSize != sizeof(BITMAPCOREHEADER)) + pSrcInfo->bmiHeader.biBitCount = 1; + if (pSrcInfo->bmiHeader.biSize != sizeof(BITMAPCOREHEADER)) { - RGBQUAD *rgb = pInfo->bmiColors; + RGBQUAD *rgb = pSrcInfo->bmiColors; - pInfo->bmiHeader.biClrUsed = pInfo->bmiHeader.biClrImportant = 2; + pSrcInfo->bmiHeader.biClrUsed = pSrcInfo->bmiHeader.biClrImportant = 2; rgb[0].rgbBlue = rgb[0].rgbGreen = rgb[0].rgbRed = 0x00; rgb[1].rgbBlue = rgb[1].rgbGreen = rgb[1].rgbRed = 0xff; rgb[0].rgbReserved = rgb[1].rgbReserved = 0; } else { - RGBTRIPLE *rgb = (RGBTRIPLE *)(((BITMAPCOREHEADER *)pInfo) + 1); + RGBTRIPLE *rgb = (RGBTRIPLE *)(((BITMAPCOREHEADER *)pSrcInfo) + 1); rgb[0].rgbtBlue = rgb[0].rgbtGreen = rgb[0].rgbtRed = 0x00; rgb[1].rgbtBlue = rgb[1].rgbtGreen = rgb[1].rgbtRed = 0xff; } /* Create the AND bitmap */ + hAndBits = CreateBitmap(width, height, 1, 1, NULL); - if (DoStretch) { - if ((hAndBits = CreateBitmap(width, height, 1, 1, NULL))) { - HBITMAP hOld; - BOOL res = FALSE; - - if (!hdcMem) hdcMem = CreateCompatibleDC(screen_dc); - if (hdcMem) { - hOld = SelectObject(hdcMem, hAndBits); - res = StretchDIBits(hdcMem, 0, 0, width, height, 0, 0, - pInfo->bmiHeader.biWidth, pInfo->bmiHeader.biHeight, - xbits, pInfo, DIB_RGB_COLORS, SRCCOPY); - SelectObject(hdcMem, hOld); + if(!stretch_blt_icon(hAndBits, pDestInfo, pSrcInfo, xbits)) + { + DeleteObject(hAndBits); + hAndBits = 0; } - if (!res) { DeleteObject(hAndBits); hAndBits = 0; } - } - } else { - hAndBits = CreateBitmap(width, height, 1, 1, NULL); - - if (hAndBits) SetDIBits(screen_dc, hAndBits, 0, height, - xbits, pInfo, DIB_RGB_COLORS); + if( !hAndBits ) + { + DeleteObject( hXorBits ); + hXorBits = 0; + } } - if( !hAndBits ) DeleteObject( hXorBits ); - } - HeapFree( GetProcessHeap(), 0, pInfo ); + + HeapFree( GetProcessHeap(), 0, pSrcInfo ); + HeapFree( GetProcessHeap(), 0, pDestInfo ); } }

1 0

Alexandre Julliard : user32: Don't use a static dc for icon blitting.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 5cdd8a2a4889f3f2556e57e020ba2a3eb5ff3142 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cdd8a2a4889f3f2556e57e02… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 5 15:18:10 2009 +0200 user32: Don't use a static dc for icon blitting. --- dlls/user32/cursoricon.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index a74b79d..fca04ce 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -674,10 +674,7 @@ static BOOL stretch_blt_icon(HBITMAP hDest, BITMAPINFO *pDestInfo, BITMAPINFO *p { HBITMAP hOld; BOOL res = FALSE; - static HDC hdcMem = NULL; - - if (!hdcMem) - hdcMem = CreateCompatibleDC(screen_dc); + HDC hdcMem = CreateCompatibleDC(screen_dc); if (hdcMem) { @@ -687,6 +684,7 @@ static BOOL stretch_blt_icon(HBITMAP hDest, BITMAPINFO *pDestInfo, BITMAPINFO *p 0, 0, pSrcInfo->bmiHeader.biWidth, pSrcInfo->bmiHeader.biHeight, pSrcBits, pSrcInfo, DIB_RGB_COLORS, SRCCOPY); SelectObject(hdcMem, hOld); + DeleteDC( hdcMem ); } return res;

1 0

Eric Pouech : winmm: Correctly fill the yield-data parameter in mciGetYieldProc.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: dd6b7b7f367782a4f8b8753601bdffff772ff080 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd6b7b7f367782a4f8b875360… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Oct 4 14:31:04 2009 +0200 winmm: Correctly fill the yield-data parameter in mciGetYieldProc. --- dlls/winmm/mci.c | 1 + dlls/winmm/mmsystem.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 6fca013..216fb2a 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -2393,6 +2393,7 @@ YIELDPROC WINAPI mciGetYieldProc(MCIDEVICEID uDeviceID, DWORD* lpdwYieldData) WARN("Proc is 32 bit\n"); return NULL; } + if (lpdwYieldData) *lpdwYieldData = wmd->dwYieldData; return wmd->lpfnYieldProc; } diff --git a/dlls/winmm/mmsystem.c b/dlls/winmm/mmsystem.c index 4f320f7..fd065d0 100644 --- a/dlls/winmm/mmsystem.c +++ b/dlls/winmm/mmsystem.c @@ -647,6 +647,7 @@ YIELDPROC16 WINAPI mciGetYieldProc16(UINT16 uDeviceID, DWORD* lpdwYieldData) WARN("Proc is 32 bit\n"); return NULL; } + if (lpdwYieldData) *lpdwYieldData = wmd->dwYieldData; return (YIELDPROC16)wmd->lpfnYieldProc; }

1 0

Wim Lewis : winex11: Font metric cache file cleanups.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: d535419daa6409b3320e9f1c04ab939061492956 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d535419daa6409b3320e9f1c0… Author: Wim Lewis <wiml(a)hhhh.org> Date: Fri Oct 2 14:04:52 2009 -0700 winex11: Font metric cache file cleanups. --- dlls/winex11.drv/xfont.c | 30 ++++++++++++++++++++---------- 1 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/xfont.c b/dlls/winex11.drv/xfont.c index d3d3e8c..f761e9b 100644 --- a/dlls/winex11.drv/xfont.c +++ b/dlls/winex11.drv/xfont.c @@ -34,7 +34,9 @@ #endif #include <sys/types.h> #include <fcntl.h> +#include <errno.h> #include <math.h> +#include <limits.h> #include "windef.h" #include "winbase.h" @@ -2156,8 +2158,10 @@ static int XFONT_BuildMetrics(char** x_pattern, int res, unsigned x_checksum, in * * INIT ONLY */ -static BOOL XFONT_ReadCachedMetrics( int fd, int res, unsigned x_checksum, int x_count ) +static BOOL XFONT_ReadCachedMetrics( const char *path, int res, unsigned x_checksum, int x_count ) { + int fd = open( path, O_RDONLY ); + if( fd >= 0 ) { unsigned u; @@ -2270,6 +2274,8 @@ fail: HeapFree( GetProcessHeap(), 0, fontList ); fontList = NULL; close( fd ); + } else { + TRACE("fontcache '%s': %s\n", path, strerror(errno)); } return FALSE; } @@ -2855,7 +2861,7 @@ static void X11DRV_FONT_InitX11Metrics( void ) { char** x_pattern; unsigned x_checksum; - int i, x_count, fd, buf_size; + int i, x_count, buf_size; char *buffer; HKEY hkey; @@ -2879,7 +2885,7 @@ static void X11DRV_FONT_InitX11Metrics( void ) if( j ) x_checksum ^= __genericCheckSum( x_pattern[i], j ); } x_checksum |= X_PFONT_MAGIC; - buf_size = 128; + buf_size = PATH_MAX; buffer = HeapAlloc( GetProcessHeap(), 0, buf_size ); /* deal with systemwide font metrics cache */ @@ -2895,8 +2901,8 @@ static void X11DRV_FONT_InitX11Metrics( void ) if( buffer[0] ) { - fd = open( buffer, O_RDONLY ); - XFONT_ReadCachedMetrics(fd, DefResolution, x_checksum, x_count); + TRACE("system fontcache is '%s'\n", buffer); + XFONT_ReadCachedMetrics(buffer, DefResolution, x_checksum, x_count); } if (fontList == NULL) { @@ -2904,8 +2910,8 @@ static void X11DRV_FONT_InitX11Metrics( void ) buffer = XFONT_UserMetricsCache( buffer, &buf_size ); if( buffer[0] ) { - fd = open( buffer, O_RDONLY ); - XFONT_ReadCachedMetrics(fd, DefResolution, x_checksum, x_count); + TRACE("user fontcache is '%s'\n", buffer); + XFONT_ReadCachedMetrics(buffer, DefResolution, x_checksum, x_count); } } @@ -2914,11 +2920,15 @@ static void X11DRV_FONT_InitX11Metrics( void ) int n_ff = XFONT_BuildMetrics(x_pattern, DefResolution, x_checksum, x_count); if( buffer[0] ) /* update cached metrics */ { - fd = open( buffer, O_CREAT | O_TRUNC | O_RDWR, 0644 ); /* -rw-r--r-- */ - if( XFONT_WriteCachedMetrics( fd, x_checksum, x_count, n_ff ) == FALSE ) + int fd = open( buffer, O_CREAT | O_TRUNC | O_RDWR, 0666 ); + if ( fd < 0 ) + { + WARN("Unable to create fontcache '%s': %s\n", buffer, strerror(errno)); + } + else if( XFONT_WriteCachedMetrics( fd, x_checksum, x_count, n_ff ) == FALSE ) { WARN("Unable to write to fontcache '%s'\n", buffer); - if( fd >= 0) remove( buffer ); /* couldn't write entire file */ + remove( buffer ); /* couldn't write entire file */ } } }

1 0

Wim Lewis : winex11: Fix font metric cache filename generation.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: a1c66499bf6b93bc2c027b5786fe73615b1f8fb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1c66499bf6b93bc2c027b578… Author: Wim Lewis <wiml(a)hhhh.org> Date: Fri Oct 2 15:23:34 2009 -0700 winex11: Fix font metric cache filename generation. Recognize Mac OS X's launchd pathnames as being local. Avoid generating an invalid pathname if $DISPLAY contains slashes. Don't include the screen number in the cache filename. --- dlls/winex11.drv/xfont.c | 54 +++++++++++++++++++++++++++++++++++---------- 1 files changed, 42 insertions(+), 12 deletions(-) diff --git a/dlls/winex11.drv/xfont.c b/dlls/winex11.drv/xfont.c index f761e9b..5e160cc 100644 --- a/dlls/winex11.drv/xfont.c +++ b/dlls/winex11.drv/xfont.c @@ -1830,18 +1830,10 @@ static char* XFONT_UserMetricsCache( char* buffer, int* buf_size ) const char *confdir = wine_get_config_dir(); const char *display_name = XDisplayName(NULL); int len = strlen(confdir) + strlen(INIFontMetrics) + strlen(display_name) + 8; - int display = 0; - int screen = 0; + unsigned int display = 0; + unsigned int screen = 0; char *p, *ext; - /* - ** Normalize the display name, since on Red Hat systems, DISPLAY - ** is commonly set to one of either 'unix:0.0' or ':0' or ':0.0'. - ** after this code, all of the above will resolve to ':0.0'. - */ - if (!strncmp( display_name, "unix:", 5 )) display_name += 4; - p = strchr(display_name, ':'); - if (p) sscanf(p + 1, "%d.%d", &display, &screen); if ((len > *buf_size) && !(buffer = HeapReAlloc( GetProcessHeap(), 0, buffer, *buf_size = len ))) @@ -1854,8 +1846,46 @@ static char* XFONT_UserMetricsCache( char* buffer, int* buf_size ) ext = buffer + strlen(buffer); strcpy( ext, display_name ); - if (!(p = strchr( ext, ':' ))) p = ext + strlen(ext); - sprintf( p, ":%d.%d", display, screen ); + /* + ** Normalize the display name. The format of DISPLAY is + ** [protocol/] [hostname] :[:] num [.num] + ** + ** - on Red Hat systems, DISPLAY is commonly set to one of + ** either 'unix:0.0' or ':0' or ':0.0'. + ** - on MacOS X systems, DISPLAY is commonly set to + ** /tmp/foo/:0 + ** + ** after this code, all of the above will resolve to ':0.0'. + */ + p = strrchr(ext, ':'); + if (p) + { + sscanf(p + 1, "%u.%u", &display, &screen); + *p = 0; + if (display > 9999) + { + WARN("unlikely X11 display number\n"); + *buffer = 0; + return buffer; + } + } + if (!strcmp( ext, "unix" ) || + !strcmp( ext, "localhost" )) + *ext = 0; + if (!strncmp( ext, "/tmp/", 5 )) + *ext = 0; /* assume pathnames are local */ + + /* Deal with the possibility of slashes in the display name */ + for( p = ext; *p; p++ ) + if ( *p == '/' ) + *p = '_'; + + /* X11 fonts are per-display, not per-screen, so don't + ** include the screen number in the font cache filename */ + sprintf( ext + strlen(ext), ":%u", display ); + + TRACE("display '%s' -> cachefile '%s'\n", display_name, buffer); + return buffer; }

1 0

Alexandre Julliard : tools: Build all the tools with -D__WINESRC__.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: a4e22d4928132da6d56d412f9e0c1d4090c5ae38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4e22d4928132da6d56d412f9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 5 14:55:25 2009 +0200 tools: Build all the tools with -D__WINESRC__. --- tools/Makefile.in | 1 + tools/widl/Makefile.in | 1 + tools/winebuild/Makefile.in | 1 + tools/winedump/Makefile.in | 1 + tools/wmc/Makefile.in | 1 + tools/wrc/Makefile.in | 1 + 6 files changed, 6 insertions(+), 0 deletions(-) diff --git a/tools/Makefile.in b/tools/Makefile.in index b711a7b..496d7bf 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -4,6 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ EXEEXT = @EXEEXT@ MODULE = none +DEFS = -D__WINESRC__ $(EXTRADEFS) EXTRAINCL = @FREETYPEINCL@ FREETYPELIBS = @FREETYPELIBS@ diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in index 453276c..d0fea83 100644 --- a/tools/widl/Makefile.in +++ b/tools/widl/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ EXEEXT = @EXEEXT@ +DEFS = -D__WINESRC__ $(EXTRADEFS) PROGRAMS = widl$(EXEEXT) MANPAGES = widl.man diff --git a/tools/winebuild/Makefile.in b/tools/winebuild/Makefile.in index d78dfe0..c4ae029 100644 --- a/tools/winebuild/Makefile.in +++ b/tools/winebuild/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ EXEEXT = @EXEEXT@ +DEFS = -D__WINESRC__ $(EXTRADEFS) PROGRAMS = winebuild$(EXEEXT) MANPAGES = winebuild.man diff --git a/tools/winedump/Makefile.in b/tools/winedump/Makefile.in index 34445ad..bee2fcc 100644 --- a/tools/winedump/Makefile.in +++ b/tools/winedump/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ EXEEXT = @EXEEXT@ +DEFS = -D__WINESRC__ $(EXTRADEFS) PROGRAMS = winedump$(EXEEXT) MANPAGES = winedump.man diff --git a/tools/wmc/Makefile.in b/tools/wmc/Makefile.in index b54a19f..fba92ea 100644 --- a/tools/wmc/Makefile.in +++ b/tools/wmc/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ EXEEXT = @EXEEXT@ +DEFS = -D__WINESRC__ $(EXTRADEFS) PROGRAMS = wmc$(EXEEXT) wmc-installed MANPAGES = wmc.man diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in index 911d131..c8a8534 100644 --- a/tools/wrc/Makefile.in +++ b/tools/wrc/Makefile.in @@ -4,6 +4,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ EXEEXT = @EXEEXT@ +DEFS = -D__WINESRC__ $(EXTRADEFS) PROGRAMS = wrc$(EXEEXT) wrc-installed MANPAGES = wrc.man

1 0

Alexandre Julliard : loader: Build the loader with -D__WINESRC__.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: b1c235d364ac052fdc67d6323ca6fb09b12415e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1c235d364ac052fdc67d6323… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 5 14:55:34 2009 +0200 loader: Build the loader with -D__WINESRC__. --- loader/Makefile.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/loader/Makefile.in b/loader/Makefile.in index 8f4d2a2..5911159 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -2,6 +2,7 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = .. SRCDIR = @srcdir@ VPATH = @srcdir@ +DEFS = -D__WINESRC__ $(EXTRADEFS) C_SRCS = \ main.c \

1 0

Alexandre Julliard : msvideo: Pass the correct function address for 32-> 16 callbacks.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 4e276bf42a973bea57c6b2a12bcc8fe2782f5350 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e276bf42a973bea57c6b2a12… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 5 14:56:12 2009 +0200 msvideo: Pass the correct function address for 32->16 callbacks. --- dlls/msvideo.dll16/msvideo16.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvideo.dll16/msvideo16.c b/dlls/msvideo.dll16/msvideo16.c index faa8e62..6970278 100644 --- a/dlls/msvideo.dll16/msvideo16.c +++ b/dlls/msvideo.dll16/msvideo16.c @@ -670,7 +670,7 @@ BOOL16 VFWAPI ICInfo16(DWORD fccType, DWORD fccHandler, ICINFO16 *lpicinfo) * * */ -static LRESULT CALLBACK IC_Callback3216(DWORD pfn16, HIC hic, HDRVR hdrv, UINT msg, DWORD lp1, DWORD lp2) +static LRESULT CALLBACK IC_Callback3216(DWORD pfn16, HIC hic, HDRVR hdrv, UINT msg, LPARAM lp1, LPARAM lp2) { WORD args[8]; DWORD ret = 0; @@ -781,7 +781,7 @@ HIC16 VFWAPI ICOpenFunction16(DWORD fccType, DWORD fccHandler, UINT16 wMode, FAR LeaveCriticalSection(&msvideo_cs); return 0; } - if ((hic32 = ICOpenFunction(fccType, fccHandler, wMode, IC_Callback3216))) + if ((hic32 = ICOpenFunction(fccType, fccHandler, wMode, (DRIVERPROC)thunk))) thunk->hIC16 = HIC_16(hic32); else thunk->pfn16 = 0;

1 0