May 2012 - Wine-commits - list.winehq.org

Jacek Caban : appwiz.cpl: Replace install_wine_gecko with configurable install_addon.
by Alexandre Julliard 15 May '12

15 May '12

Module: wine Branch: master Commit: f25f97d86a5370f84cfb0bfc5b85472dd5d16b00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f25f97d86a5370f84cfb0bfc5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 15 11:48:31 2012 +0200 appwiz.cpl: Replace install_wine_gecko with configurable install_addon. --- dlls/appwiz.cpl/addons.c | 18 ++++++++++-------- dlls/appwiz.cpl/appwiz.c | 2 +- dlls/appwiz.cpl/appwiz.h | 6 +++++- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 8703f97..1cff5c4 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -84,7 +84,7 @@ static const addon_info_t addons_info[] = { } }; -static const addon_info_t *addon = &addons_info[0]; +static const addon_info_t *addon; static HWND install_dialog = NULL; static LPWSTR url = NULL; @@ -553,18 +553,20 @@ static INT_PTR CALLBACK installer_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARA return FALSE; } -BOOL install_wine_gecko(void) +BOOL install_addon(addon_t addon_type) { if(!*ARCH_STRING) return FALSE; + addon = addons_info+addon_type; + /* - * Try to find Gecko .cab file in following order: - * - directory stored in GeckoCabDir value of HKCU/Wine/Software/MSHTML key - * - $datadir/gecko/ - * - $INSTALL_DATADIR/wine/gecko/ - * - /usr/share/wine/gecko/ - * - download from URL stored in GeckoUrl value of HKCU/Wine/Software/MSHTML key + * Try to find addon .msi file in following order: + * - directory stored in $dir_config_key value of HKCU/Wine/Software/$config_key key + * - $datadir/$addon_subdir/ + * - $INSTALL_DATADIR/wine/$addon_subdir/ + * - /usr/share/wine/$addon_subdir/ + * - download from URL stored in $url_config_key value of HKCU/Wine/Software/$config_key key */ if(!install_from_registered_dir() && !install_from_default_dir() diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index 1d8f47c..14ace66 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -975,7 +975,7 @@ static LONG start_params(const WCHAR *params) return FALSE; if(!strcmpW(params, install_geckoW)) { - install_wine_gecko(); + install_addon(ADDON_GECKO); return TRUE; } diff --git a/dlls/appwiz.cpl/appwiz.h b/dlls/appwiz.cpl/appwiz.h index d4f9375..6e189fa 100644 --- a/dlls/appwiz.cpl/appwiz.h +++ b/dlls/appwiz.cpl/appwiz.h @@ -16,7 +16,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -BOOL install_wine_gecko(void) DECLSPEC_HIDDEN; +typedef enum { + ADDON_GECKO +} addon_t; + +BOOL install_addon(addon_t) DECLSPEC_HIDDEN; extern HINSTANCE hInst DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : winex11: Add a helper to create a pixmap from an image .
by Alexandre Julliard 15 May '12

15 May '12

Module: wine Branch: master Commit: 3e8ad9a064cfce36752233a7a7439b11dac01074 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e8ad9a064cfce36752233a7a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 11 13:48:19 2012 +0200 winex11: Add a helper to create a pixmap from an image. --- dlls/winex11.drv/bitblt.c | 126 +++++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 2 + 2 files changed, 128 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 413f4e4..6dec77f 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -937,6 +937,16 @@ static void free_ximage_bits( struct gdi_image_bits *bits ) wine_tsx11_unlock(); } +/* only for use on sanitized BITMAPINFO structures */ +static inline int get_dib_info_size( const BITMAPINFO *info, UINT coloruse ) +{ + if (info->bmiHeader.biCompression == BI_BITFIELDS) + return sizeof(BITMAPINFOHEADER) + 3 * sizeof(DWORD); + if (coloruse == DIB_PAL_COLORS) + return sizeof(BITMAPINFOHEADER) + info->bmiHeader.biClrUsed * sizeof(WORD); + return FIELD_OFFSET( BITMAPINFO, bmiColors[info->bmiHeader.biClrUsed] ); +} + /* store the palette or color mask data in the bitmap info structure */ static void set_color_info( const XVisualInfo *vis, BITMAPINFO *info ) { @@ -1464,6 +1474,122 @@ DWORD X11DRV_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, /*********************************************************************** + * put_pixmap_image + * + * Simplified equivalent of X11DRV_PutImage that writes directly to a pixmap. + */ +static DWORD put_pixmap_image( Pixmap pixmap, const XVisualInfo *vis, + BITMAPINFO *info, const struct gdi_image_bits *bits ) +{ + DWORD ret; + XImage *image; + struct bitblt_coords coords; + struct gdi_image_bits dst_bits; + const XPixmapFormatValues *format = pixmap_formats[vis->depth]; + const int *mapping = NULL; + + if (!format) return ERROR_INVALID_PARAMETER; + if (info->bmiHeader.biPlanes != 1) goto update_format; + if (info->bmiHeader.biBitCount != format->bits_per_pixel) goto update_format; + /* FIXME: could try to handle 1-bpp using XCopyPlane */ + if (!matching_color_info( vis, info )) goto update_format; + if (!bits) return ERROR_SUCCESS; /* just querying the format */ + + coords.x = 0; + coords.y = 0; + coords.width = info->bmiHeader.biWidth; + coords.height = abs( info->bmiHeader.biHeight ); + SetRect( &coords.visrect, 0, 0, coords.width, coords.height ); + + wine_tsx11_lock(); + image = XCreateImage( gdi_display, visual, vis->depth, ZPixmap, 0, NULL, + coords.width, coords.height, 32, 0 ); + wine_tsx11_unlock(); + if (!image) return ERROR_OUTOFMEMORY; + + if (image->bits_per_pixel == 4 || image->bits_per_pixel == 8) + mapping = X11DRV_PALETTE_PaletteToXPixel; + + if (!(ret = copy_image_bits( info, is_r8g8b8(vis), image, bits, &dst_bits, &coords, mapping, ~0u ))) + { + image->data = dst_bits.ptr; + wine_tsx11_lock(); + XPutImage( gdi_display, pixmap, get_bitmap_gc( vis->depth ), + image, 0, 0, 0, 0, coords.width, coords.height ); + wine_tsx11_unlock(); + image->data = NULL; + } + + wine_tsx11_lock(); + XDestroyImage( image ); + wine_tsx11_unlock(); + if (dst_bits.free) dst_bits.free( &dst_bits ); + return ret; + +update_format: + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biBitCount = format->bits_per_pixel; + if (info->bmiHeader.biHeight > 0) info->bmiHeader.biHeight = -info->bmiHeader.biHeight; + set_color_info( vis, info ); + return ERROR_BAD_FORMAT; +} + + +/*********************************************************************** + * create_pixmap_from_image + */ +Pixmap create_pixmap_from_image( HDC hdc, const XVisualInfo *vis, const BITMAPINFO *info, + const struct gdi_image_bits *bits, UINT coloruse ) +{ + static const RGBQUAD default_colortable[2] = { { 0x00, 0x00, 0x00 }, { 0xff, 0xff, 0xff } }; + char dst_buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + char src_buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *dst_info = (BITMAPINFO *)dst_buffer; + BITMAPINFO *src_info = (BITMAPINFO *)src_buffer; + struct gdi_image_bits dst_bits; + Pixmap pixmap; + DWORD err; + HBITMAP dib; + + wine_tsx11_lock(); + pixmap = XCreatePixmap( gdi_display, root_window, + info->bmiHeader.biWidth, abs(info->bmiHeader.biHeight), vis->depth ); + wine_tsx11_unlock(); + if (!pixmap) return 0; + + memcpy( src_info, info, get_dib_info_size( info, coloruse )); + memcpy( dst_info, info, get_dib_info_size( info, coloruse )); + + if (coloruse == DIB_PAL_COLORS || + (err = put_pixmap_image( pixmap, vis, dst_info, bits )) == ERROR_BAD_FORMAT) + { + if (dst_info->bmiHeader.biBitCount == 1) /* set a default color table for 1-bpp */ + memcpy( dst_info->bmiColors, default_colortable, sizeof(default_colortable) ); + dib = CreateDIBSection( hdc, dst_info, coloruse, &dst_bits.ptr, 0, 0 ); + if (dib) + { + if (src_info->bmiHeader.biBitCount == 1 && !src_info->bmiHeader.biClrUsed) + memcpy( src_info->bmiColors, default_colortable, sizeof(default_colortable) ); + SetDIBits( hdc, dib, 0, abs(info->bmiHeader.biHeight), bits->ptr, src_info, coloruse ); + dst_bits.free = NULL; + dst_bits.is_copy = TRUE; + err = put_pixmap_image( pixmap, vis, dst_info, &dst_bits ); + DeleteObject( dib ); + } + else err = ERROR_OUTOFMEMORY; + } + + if (!err) return pixmap; + + wine_tsx11_lock(); + XFreePixmap( gdi_display, pixmap ); + wine_tsx11_unlock(); + return 0; + +} + + +/*********************************************************************** * get_pixmap_image * * Equivalent of X11DRV_GetImage that reads directly from a pixmap. diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index d17565b..7ed4bdd 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -229,6 +229,8 @@ extern Pixmap X11DRV_get_pixmap( HBITMAP hbitmap ) DECLSPEC_HIDDEN; extern DWORD copy_image_bits( BITMAPINFO *info, BOOL is_r8g8b8, XImage *image, const struct gdi_image_bits *src_bits, struct gdi_image_bits *dst_bits, struct bitblt_coords *coords, const int *mapping, unsigned int zeropad_mask ) DECLSPEC_HIDDEN; +extern Pixmap create_pixmap_from_image( HDC hdc, const XVisualInfo *vis, const BITMAPINFO *info, + const struct gdi_image_bits *bits, UINT coloruse ) DECLSPEC_HIDDEN; extern DWORD get_pixmap_image( Pixmap pixmap, int width, int height, const XVisualInfo *vis, BITMAPINFO *info, struct gdi_image_bits *bits ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : winex11: Use the create_pixmap_from_image helper to select DIB pattern brushes.
by Alexandre Julliard 15 May '12

15 May '12

Module: wine Branch: master Commit: bf2ad337b55dbc8498b28ce78708c5ac62107461 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf2ad337b55dbc8498b28ce78… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 11 15:28:24 2012 +0200 winex11: Use the create_pixmap_from_image helper to select DIB pattern brushes. --- dlls/winex11.drv/brush.c | 47 ++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 41 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/brush.c b/dlls/winex11.drv/brush.c index ea41f8a..6574eb8 100644 --- a/dlls/winex11.drv/brush.c +++ b/dlls/winex11.drv/brush.c @@ -280,6 +280,45 @@ HBITMAP create_brush_bitmap( X11DRV_PDEVICE *physDev, const struct brush_pattern return bitmap; } +static BOOL select_pattern_brush( X11DRV_PDEVICE *physdev, const struct brush_pattern *pattern ) +{ + XVisualInfo vis; + Pixmap pixmap; + const BITMAPINFO *info = pattern->info; + + memset( &vis, 0, sizeof(vis) ); + vis.visual = visual; + vis.visualid = visual->visualid; + + if (physdev->depth > 1 && info->bmiHeader.biBitCount > 1) + { + vis.depth = screen_depth; + vis.red_mask = visual->red_mask; + vis.green_mask = visual->green_mask; + vis.blue_mask = visual->blue_mask; + } + else vis.depth = 1; + + pixmap = create_pixmap_from_image( physdev->dev.hdc, &vis, info, &pattern->bits, pattern->usage ); + if (!pixmap) return FALSE; + + wine_tsx11_lock(); + if (physdev->brush.pixmap) XFreePixmap( gdi_display, physdev->brush.pixmap ); + physdev->brush.pixmap = pixmap; + + if (vis.depth == 1) + { + physdev->brush.fillStyle = FillOpaqueStippled; + physdev->brush.pixel = -1; /* Special case (see DC_SetupGCForBrush) */ + } + else + { + physdev->brush.fillStyle = FillTiled; + physdev->brush.pixel = 0; /* Ignored */ + } + wine_tsx11_unlock(); + return TRUE; +} /*********************************************************************** * SelectBrush (X11DRV.@) @@ -293,18 +332,14 @@ HBRUSH X11DRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_patter { X_PHYSBITMAP *physbitmap; HBITMAP bitmap = pattern->bitmap; - BOOL delete_bitmap = FALSE; if (!bitmap || !(physbitmap = X11DRV_get_phys_bitmap( bitmap ))) { - if (!(bitmap = create_brush_bitmap( physDev, pattern ))) return 0; - physbitmap = X11DRV_get_phys_bitmap( bitmap ); - delete_bitmap = TRUE; + if (!select_pattern_brush( physDev, pattern )) return 0; } - BRUSH_SelectPatternBrush( physDev, bitmap, physbitmap ); + else BRUSH_SelectPatternBrush( physDev, bitmap, physbitmap ); TRACE("BS_PATTERN\n"); physDev->brush.style = BS_PATTERN; - if (delete_bitmap) DeleteObject( bitmap ); return hbrush; }

1 0

Alexandre Julliard : winex11: Use the create_pixmap_from_image helper to export XA_PIXMAP clipboard formats .
by Alexandre Julliard 15 May '12

15 May '12

Module: wine Branch: master Commit: e85895e4c5eb46d1579adbf5e175d8b6f186f9bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e85895e4c5eb46d1579adbf5e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 11 15:27:04 2012 +0200 winex11: Use the create_pixmap_from_image helper to export XA_PIXMAP clipboard formats. --- dlls/winex11.drv/clipboard.c | 40 ++++++++++++++++------------------------ 1 files changed, 16 insertions(+), 24 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index ac17bdd..8dc3f0e 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1758,7 +1758,6 @@ static HANDLE X11DRV_CLIPBOARD_ExportString(Display *display, Window requestor, static HANDLE X11DRV_CLIPBOARD_ExportXAPIXMAP(Display *display, Window requestor, Atom aTarget, Atom rprop, LPWINE_CLIPDATA lpdata, LPDWORD lpBytes) { - HDC hdc, memdc; HANDLE hData; unsigned char* lpData; @@ -1770,33 +1769,26 @@ static HANDLE X11DRV_CLIPBOARD_ExportXAPIXMAP(Display *display, Window requestor if (!lpdata->drvData) /* If not already rendered */ { - /* Create a DDB from the DIB */ - - Pixmap pixmap = 0; - X_PHYSBITMAP *physBitmap; - HBITMAP hBmp; + Pixmap pixmap; + XVisualInfo vis; LPBITMAPINFO pbmi; + struct gdi_image_bits bits; + + memset( &vis, 0, sizeof(vis) ); + vis.visual = visual; + vis.depth = screen_depth; + vis.visualid = visual->visualid; + vis.class = visual->class; + vis.red_mask = visual->red_mask; + vis.green_mask = visual->green_mask; + vis.blue_mask = visual->blue_mask; - hdc = GetDC(0); pbmi = GlobalLock( lpdata->hData ); - hBmp = CreateDIBitmap( hdc, &pbmi->bmiHeader, CBM_INIT, - (LPBYTE)pbmi + bitmap_info_size( pbmi, DIB_RGB_COLORS ), - pbmi, DIB_RGB_COLORS ); + bits.ptr = (LPBYTE)pbmi + bitmap_info_size( pbmi, DIB_RGB_COLORS ); + bits.free = NULL; + bits.is_copy = FALSE; + pixmap = create_pixmap_from_image( 0, &vis, pbmi, &bits, DIB_RGB_COLORS ); GlobalUnlock( lpdata->hData ); - - /* make sure it's owned by x11drv */ - memdc = CreateCompatibleDC( hdc ); - SelectObject( memdc, hBmp ); - DeleteDC( memdc ); - - /* clear the physBitmap so that we can steal its pixmap */ - if ((physBitmap = X11DRV_get_phys_bitmap( hBmp ))) - { - pixmap = physBitmap->pixmap; - physBitmap->pixmap = 0; - } - DeleteObject( hBmp ); - ReleaseDC( 0, hdc ); lpdata->drvData = pixmap; }

1 0

Alexandre Julliard : winex11: Use the create_pixmap_from_image helper to create color cursors.
by Alexandre Julliard 15 May '12

15 May '12

Module: wine Branch: master Commit: 70a9bb95186ffd5032a0bd177cb6aea2856816ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=70a9bb95186ffd5032a0bd177… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 15 15:46:23 2012 +0200 winex11: Use the create_pixmap_from_image helper to create color cursors. --- dlls/winex11.drv/mouse.c | 53 +++++++++++++++++++++++---------------------- 1 files changed, 27 insertions(+), 26 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 2d38406..ef9dca9 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1013,18 +1013,19 @@ done: */ static Cursor create_xlib_cursor( HDC hdc, const ICONINFOEXW *icon, int width, int height ) { + char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *info = (BITMAPINFO *)buffer; XColor fg, bg; Cursor cursor = None; - HBITMAP xor_bitmap = 0; - BITMAPINFO *info; + XVisualInfo vis; + Pixmap xor_pixmap, mask_pixmap; + struct gdi_image_bits bits; unsigned int *color_bits = NULL, *ptr; unsigned char *mask_bits = NULL, *xor_bits = NULL; int i, x, y, has_alpha = 0; int rfg, gfg, bfg, rbg, gbg, bbg, fgBits, bgBits; unsigned int width_bytes = (width + 31) / 32 * 4; - if (!(info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) - return FALSE; info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); info->bmiHeader.biWidth = width; info->bmiHeader.biHeight = -height; @@ -1048,7 +1049,6 @@ static Cursor create_xlib_cursor( HDC hdc, const ICONINFOEXW *icon, int width, i /* compute fg/bg color and xor bitmap based on average of the color values */ - if (!(xor_bitmap = CreateBitmap( width, height, 1, 1, NULL ))) goto done; rfg = gfg = bfg = rbg = gbg = bbg = fgBits = 0; for (y = 0, ptr = color_bits; y < height; y++) { @@ -1090,8 +1090,8 @@ static Cursor create_xlib_cursor( HDC hdc, const ICONINFOEXW *icon, int width, i else bg.red = bg.green = bg.blue = 0; info->bmiHeader.biBitCount = 1; + info->bmiHeader.biClrUsed = 0; info->bmiHeader.biSizeImage = width_bytes * height; - SetDIBits( hdc, xor_bitmap, 0, height, xor_bits, info, DIB_RGB_COLORS ); /* generate mask from the alpha channel if we have one */ @@ -1100,37 +1100,38 @@ static Cursor create_xlib_cursor( HDC hdc, const ICONINFOEXW *icon, int width, i if (has_alpha) { - /* make sure the bitmaps are owned by x11drv */ - HBITMAP orig = SelectObject( hdc, icon->hbmMask ); - SelectObject( hdc, xor_bitmap ); - SelectObject( hdc, orig ); - memset( mask_bits, 0, width_bytes * height ); for (y = 0, ptr = color_bits; y < height; y++) for (x = 0; x < width; x++, ptr++) if ((*ptr >> 24) > 25) /* more than 10% alpha */ mask_bits[y * width_bytes + x / 8] |= 0x80 >> (x % 8); + } + else /* invert the mask */ + { + ptr = (unsigned int *)mask_bits; + for (i = 0; i < info->bmiHeader.biSizeImage / sizeof(*ptr); i++, ptr++) *ptr ^= ~0u; + } - info->bmiHeader.biBitCount = 1; - info->bmiHeader.biSizeImage = width_bytes * height; - SetDIBits( hdc, icon->hbmMask, 0, height, mask_bits, info, DIB_RGB_COLORS ); + vis.depth = 1; + bits.ptr = xor_bits; + bits.free = NULL; + bits.is_copy = TRUE; + if (!(xor_pixmap = create_pixmap_from_image( hdc, &vis, info, &bits, DIB_RGB_COLORS ))) goto done; - wine_tsx11_lock(); - cursor = XCreatePixmapCursor( gdi_display, - X11DRV_get_pixmap(xor_bitmap), - X11DRV_get_pixmap(icon->hbmMask), - &fg, &bg, icon->xHotspot, icon->yHotspot ); - wine_tsx11_unlock(); - } - else + bits.ptr = mask_bits; + mask_pixmap = create_pixmap_from_image( hdc, &vis, info, &bits, DIB_RGB_COLORS ); + + wine_tsx11_lock(); + if (mask_pixmap) { - cursor = create_cursor_from_bitmaps( xor_bitmap, icon->hbmMask, width, height, 0, 0, - &fg, &bg, icon->xHotspot, icon->yHotspot ); + cursor = XCreatePixmapCursor( gdi_display, xor_pixmap, mask_pixmap, + &fg, &bg, icon->xHotspot, icon->yHotspot ); + XFreePixmap( gdi_display, mask_pixmap ); } + XFreePixmap( gdi_display, xor_pixmap ); + wine_tsx11_unlock(); done: - DeleteObject( xor_bitmap ); - HeapFree( GetProcessHeap(), 0, info ); HeapFree( GetProcessHeap(), 0, color_bits ); HeapFree( GetProcessHeap(), 0, xor_bits ); HeapFree( GetProcessHeap(), 0, mask_bits );

1 0

Alexandre Julliard : winex11: Use the create_pixmap_from_image helper to create monochrome cursors.
by Alexandre Julliard 15 May '12

15 May '12

Module: wine Branch: master Commit: 8ee12778f90d7796fff2f1befa385d576fe7d2d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ee12778f90d7796fff2f1bef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 15 16:18:34 2012 +0200 winex11: Use the create_pixmap_from_image helper to create monochrome cursors. --- dlls/winex11.drv/mouse.c | 126 ++++++++++++++++++++++++++-------------------- 1 files changed, 72 insertions(+), 54 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index ef9dca9..718efa6 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -936,24 +936,51 @@ done: /*********************************************************************** - * create_cursor_from_bitmaps + * create_xlib_monochrome_cursor * - * Create an X11 cursor from source bitmaps. + * Create a monochrome X cursor from a Windows one. */ -static Cursor create_cursor_from_bitmaps( HBITMAP src_xor, HBITMAP src_and, int width, int height, - int xor_y, int and_y, XColor *fg, XColor *bg, - int hotspot_x, int hotspot_y ) +static Cursor create_xlib_monochrome_cursor( HDC hdc, const ICONINFOEXW *icon, int width, int height ) { - HDC src = 0, dst = 0; - HBITMAP bits = 0, mask = 0, mask_inv = 0; + char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *info = (BITMAPINFO *)buffer; + const int and_y = 0; + const int xor_y = height; + unsigned int width_bytes = (width + 31) / 32 * 4; + unsigned char *mask_bits = NULL; + GC gc; + XColor fg, bg; + XVisualInfo vis; + Pixmap src_pixmap, bits_pixmap, mask_pixmap; + struct gdi_image_bits bits; Cursor cursor = 0; - if (!(src = CreateCompatibleDC( 0 ))) goto done; - if (!(dst = CreateCompatibleDC( 0 ))) goto done; + info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + info->bmiHeader.biWidth = width; + info->bmiHeader.biHeight = -height * 2; + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biBitCount = 1; + info->bmiHeader.biCompression = BI_RGB; + info->bmiHeader.biSizeImage = width_bytes * height * 2; + info->bmiHeader.biXPelsPerMeter = 0; + info->bmiHeader.biYPelsPerMeter = 0; + info->bmiHeader.biClrUsed = 0; + info->bmiHeader.biClrImportant = 0; + + if (!(mask_bits = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ))) goto done; + if (!GetDIBits( hdc, icon->hbmMask, 0, height * 2, mask_bits, info, DIB_RGB_COLORS )) goto done; + + vis.depth = 1; + bits.ptr = mask_bits; + bits.free = NULL; + bits.is_copy = TRUE; + if (!(src_pixmap = create_pixmap_from_image( hdc, &vis, info, &bits, DIB_RGB_COLORS ))) goto done; - if (!(bits = CreateBitmap( width, height, 1, 1, NULL ))) goto done; - if (!(mask = CreateBitmap( width, height, 1, 1, NULL ))) goto done; - if (!(mask_inv = CreateBitmap( width, height, 1, 1, NULL ))) goto done; + wine_tsx11_lock(); + bits_pixmap = XCreatePixmap( gdi_display, root_window, width, height, 1 ); + mask_pixmap = XCreatePixmap( gdi_display, root_window, width, height, 1 ); + gc = XCreateGC( gdi_display, src_pixmap, 0, NULL ); + XSetGraphicsExposures( gdi_display, gc, False ); /* We have to do some magic here, as cursors are not fully * compatible between Windows and X11. Under X11, there are @@ -973,45 +1000,41 @@ static Cursor create_cursor_from_bitmaps( HBITMAP src_xor, HBITMAP src_and, int * Bits = not 'And' and 'Xor' or 'And2' and 'Xor2' * Mask = not 'And' or 'Xor' or 'And2' and 'Xor2' */ - SelectObject( src, src_and ); - SelectObject( dst, bits ); - BitBlt( dst, 0, 0, width, height, src, 0, and_y, SRCCOPY ); - SelectObject( dst, mask ); - BitBlt( dst, 0, 0, width, height, src, 0, and_y, SRCCOPY ); - SelectObject( dst, mask_inv ); - BitBlt( dst, 0, 0, width, height, src, 0, and_y, SRCCOPY ); - SelectObject( src, src_xor ); - BitBlt( dst, 0, 0, width, height, src, 0, xor_y, SRCAND /* src & dst */ ); - SelectObject( dst, bits ); - BitBlt( dst, 0, 0, width, height, src, 0, xor_y, SRCERASE /* src & ~dst */ ); - SelectObject( dst, mask ); - BitBlt( dst, 0, 0, width, height, src, 0, xor_y, 0xdd0228 /* src | ~dst */ ); + XSetFunction( gdi_display, gc, GXcopy ); + XCopyArea( gdi_display, src_pixmap, bits_pixmap, gc, 0, and_y, width, height, 0, 0 ); + XCopyArea( gdi_display, src_pixmap, mask_pixmap, gc, 0, and_y, width, height, 0, 0 ); + XSetFunction( gdi_display, gc, GXandReverse ); + XCopyArea( gdi_display, src_pixmap, bits_pixmap, gc, 0, xor_y, width, height, 0, 0 ); + XSetFunction( gdi_display, gc, GXorReverse ); + XCopyArea( gdi_display, src_pixmap, mask_pixmap, gc, 0, xor_y, width, height, 0, 0 ); /* additional white */ - SelectObject( src, mask_inv ); - BitBlt( dst, 1, 1, width, height, src, 0, 0, SRCPAINT /* src | dst */); - SelectObject( dst, bits ); - BitBlt( dst, 1, 1, width, height, src, 0, 0, SRCPAINT /* src | dst */ ); - - wine_tsx11_lock(); - cursor = XCreatePixmapCursor( gdi_display, X11DRV_get_pixmap(bits), X11DRV_get_pixmap(mask), - fg, bg, hotspot_x, hotspot_y ); + XSetFunction( gdi_display, gc, GXand ); + XCopyArea( gdi_display, src_pixmap, src_pixmap, gc, 0, xor_y, width, height, 0, and_y ); + XSetFunction( gdi_display, gc, GXor ); + XCopyArea( gdi_display, src_pixmap, mask_pixmap, gc, 0, and_y, width, height, 1, 1 ); + XCopyArea( gdi_display, src_pixmap, bits_pixmap, gc, 0, and_y, width, height, 1, 1 ); + XFreeGC( gdi_display, gc ); + + fg.red = fg.green = fg.blue = 0xffff; + bg.red = bg.green = bg.blue = 0; + cursor = XCreatePixmapCursor( gdi_display, bits_pixmap, mask_pixmap, + &fg, &bg, icon->xHotspot, icon->yHotspot ); + XFreePixmap( gdi_display, src_pixmap ); + XFreePixmap( gdi_display, bits_pixmap ); + XFreePixmap( gdi_display, mask_pixmap ); wine_tsx11_unlock(); done: - DeleteDC( src ); - DeleteDC( dst ); - DeleteObject( bits ); - DeleteObject( mask ); - DeleteObject( mask_inv ); + HeapFree( GetProcessHeap(), 0, mask_bits ); return cursor; } /*********************************************************************** - * create_xlib_cursor + * create_xlib_color_cursor * - * Create an X cursor from a Windows one. + * Create a color X cursor from a Windows one. */ -static Cursor create_xlib_cursor( HDC hdc, const ICONINFOEXW *icon, int width, int height ) +static Cursor create_xlib_color_cursor( HDC hdc, const ICONINFOEXW *icon, int width, int height ) { char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *info = (BITMAPINFO *)buffer; @@ -1148,6 +1171,7 @@ static Cursor create_cursor( HANDLE handle ) Cursor cursor = 0; ICONINFOEXW info; BITMAP bm; + HDC hdc; if (!handle) return get_empty_cursor(); @@ -1173,30 +1197,24 @@ static Cursor create_cursor( HANDLE handle ) info.yHotspot = bm.bmHeight / 2; } + hdc = CreateCompatibleDC( 0 ); + if (info.hbmColor) { - HDC hdc = CreateCompatibleDC( 0 ); - if (hdc) - { #ifdef SONAME_LIBXCURSOR - if (pXcursorImagesLoadCursor) - cursor = create_xcursor_cursor( hdc, &info, handle, bm.bmWidth, bm.bmHeight ); + if (pXcursorImagesLoadCursor) + cursor = create_xcursor_cursor( hdc, &info, handle, bm.bmWidth, bm.bmHeight ); #endif - if (!cursor) cursor = create_xlib_cursor( hdc, &info, bm.bmWidth, bm.bmHeight ); - } + if (!cursor) cursor = create_xlib_color_cursor( hdc, &info, bm.bmWidth, bm.bmHeight ); DeleteObject( info.hbmColor ); - DeleteDC( hdc ); } else { - XColor fg, bg; - fg.red = fg.green = fg.blue = 0xffff; - bg.red = bg.green = bg.blue = 0; - cursor = create_cursor_from_bitmaps( info.hbmMask, info.hbmMask, bm.bmWidth, bm.bmHeight, - bm.bmHeight, 0, &fg, &bg, info.xHotspot, info.yHotspot ); + cursor = create_xlib_monochrome_cursor( hdc, &info, bm.bmWidth, bm.bmHeight ); } DeleteObject( info.hbmMask ); + DeleteDC( hdc ); return cursor; }

1 0

Francois Gouget : wineqtdecoder: Fix the spelling of the available variables.
by Alexandre Julliard 15 May '12

15 May '12

Module: wine Branch: master Commit: e8e067eb4031397e342a1408959c9c2a355f66fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8e067eb4031397e342a14089… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 15 09:47:11 2012 +0200 wineqtdecoder: Fix the spelling of the available variables. --- dlls/wineqtdecoder/qtdatahandler.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wineqtdecoder/qtdatahandler.c b/dlls/wineqtdecoder/qtdatahandler.c index 4d3b0a3..cfcb676 100644 --- a/dlls/wineqtdecoder/qtdatahandler.c +++ b/dlls/wineqtdecoder/qtdatahandler.c @@ -188,12 +188,12 @@ static pascal ComponentResult myDataHGetAvailableFileSize ( DataHandler dh, Handle storage = GetComponentInstanceStorage(dh); DHData *data = (DHData*)*storage; LONGLONG total; - LONGLONG avaliable; + LONGLONG available; TRACE("%p\n",dh); - IAsyncReader_Length(data->dataRef.pReader,&total,&avaliable); - *fileSize = avaliable; + IAsyncReader_Length(data->dataRef.pReader,&total,&available); + *fileSize = available; return noErr; } @@ -202,11 +202,11 @@ static pascal ComponentResult myDataHGetFileSize ( DataHandler dh, long *fileSiz Handle storage = GetComponentInstanceStorage(dh); DHData *data = (DHData*)*storage; LONGLONG total; - LONGLONG avaliable; + LONGLONG available; TRACE("%p\n",dh); - IAsyncReader_Length(data->dataRef.pReader,&total,&avaliable); + IAsyncReader_Length(data->dataRef.pReader,&total,&available); *fileSize = total; return noErr; } @@ -411,12 +411,12 @@ static pascal ComponentResult myDataHGetFileSize64(DataHandler dh, wide * fileSi Handle storage = GetComponentInstanceStorage(dh); DHData *data = (DHData*)*storage; LONGLONG total; - LONGLONG avaliable; + LONGLONG available; SInt64 total64; TRACE("%p\n",dh); - IAsyncReader_Length(data->dataRef.pReader,&total,&avaliable); + IAsyncReader_Length(data->dataRef.pReader,&total,&available); total64 = total; *fileSize = SInt64ToWide(total64); return noErr; @@ -427,13 +427,13 @@ static pascal ComponentResult myDataHGetAvailableFileSize64(DataHandler dh, wide Handle storage = GetComponentInstanceStorage(dh); DHData *data = (DHData*)*storage; LONGLONG total; - LONGLONG avaliable; + LONGLONG available; SInt64 total64; TRACE("%p\n",dh); - IAsyncReader_Length(data->dataRef.pReader,&total,&avaliable); - total64 = avaliable; + IAsyncReader_Length(data->dataRef.pReader,&total,&available); + total64 = available; *fileSize = SInt64ToWide(total64); return noErr; }

1 0

Francois Gouget : user32: Fix the spelling of the hRecipient variable.
by Alexandre Julliard 15 May '12

15 May '12

Module: wine Branch: master Commit: b89a49d4816c251de4bc70186769a182e81ab5d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b89a49d4816c251de4bc70186… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 15 09:47:23 2012 +0200 user32: Fix the spelling of the hRecipient variable. --- dlls/user32/misc.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 5fc601a..ef7fff6 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -505,7 +505,7 @@ HDEVNOTIFY WINAPI RegisterDeviceNotificationA(HANDLE hnd, LPVOID notifyfilter, D * notifications about a device. * * PARAMS - * hRecepient [I] Window or service status handle that + * hRecipient [I] Window or service status handle that * will receive notifications. * pNotificationFilter [I] DEV_BROADCAST_HDR followed by some * type-specific data. @@ -518,13 +518,13 @@ HDEVNOTIFY WINAPI RegisterDeviceNotificationA(HANDLE hnd, LPVOID notifyfilter, D * NOTES * * The dwFlags parameter can be one of two values: - *| DEVICE_NOTIFY_WINDOW_HANDLE - hRecepient is a window handle - *| DEVICE_NOTIFY_SERVICE_HANDLE - hRecepient is a service status handle + *| DEVICE_NOTIFY_WINDOW_HANDLE - hRecipient is a window handle + *| DEVICE_NOTIFY_SERVICE_HANDLE - hRecipient is a service status handle */ -HDEVNOTIFY WINAPI RegisterDeviceNotificationW(HANDLE hRecepient, LPVOID pNotificationFilter, DWORD dwFlags) +HDEVNOTIFY WINAPI RegisterDeviceNotificationW(HANDLE hRecipient, LPVOID pNotificationFilter, DWORD dwFlags) { FIXME("(hwnd=%p, filter=%p,flags=0x%08x) returns a fake device notification handle!\n", - hRecepient,pNotificationFilter,dwFlags ); + hRecipient,pNotificationFilter,dwFlags ); return (HDEVNOTIFY) 0xcafeaffe; }

1 0

Francois Gouget : taskmgr: Fix the spelling of the AdjustControlPosition() function.
by Alexandre Julliard 15 May '12

15 May '12

Module: wine Branch: master Commit: ec6a0fdb612cbc419a930a8bb6f523aa78f45ba6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec6a0fdb612cbc419a930a8bb… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 15 09:46:51 2012 +0200 taskmgr: Fix the spelling of the AdjustControlPosition() function. --- programs/taskmgr/perfpage.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/programs/taskmgr/perfpage.c b/programs/taskmgr/perfpage.c index 2d3b485..5276de7 100644 --- a/programs/taskmgr/perfpage.c +++ b/programs/taskmgr/perfpage.c @@ -102,7 +102,7 @@ static void AdjustFrameSize(HWND hCntrl, HWND hDlg, int nXDifference, int nYDiff InvalidateRect(hCntrl, NULL, TRUE); } -static void AdjustControlPostion(HWND hCntrl, HWND hDlg, int nXDifference, int nYDifference) +static void AdjustControlPosition(HWND hCntrl, HWND hDlg, int nXDifference, int nYDifference) { AdjustFrameSize(hCntrl, hDlg, nXDifference, nYDifference, 0); } @@ -404,18 +404,18 @@ PerformancePageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) AdjustCntrlPos(IDS_TOTALS_PROCESS_COUNT, hDlg, 0, nYDifference); AdjustCntrlPos(IDS_TOTALS_THREAD_COUNT, hDlg, 0, nYDifference); - AdjustControlPostion(hPerformancePageCommitChargeTotalEdit, hDlg, 0, nYDifference); - AdjustControlPostion(hPerformancePageCommitChargeLimitEdit, hDlg, 0, nYDifference); - AdjustControlPostion(hPerformancePageCommitChargePeakEdit, hDlg, 0, nYDifference); - AdjustControlPostion(hPerformancePageKernelMemoryTotalEdit, hDlg, 0, nYDifference); - AdjustControlPostion(hPerformancePageKernelMemoryPagedEdit, hDlg, 0, nYDifference); - AdjustControlPostion(hPerformancePageKernelMemoryNonPagedEdit, hDlg, 0, nYDifference); - AdjustControlPostion(hPerformancePagePhysicalMemoryTotalEdit, hDlg, 0, nYDifference); - AdjustControlPostion(hPerformancePagePhysicalMemoryAvailableEdit, hDlg, 0, nYDifference); - AdjustControlPostion(hPerformancePagePhysicalMemorySystemCacheEdit, hDlg, 0, nYDifference); - AdjustControlPostion(hPerformancePageTotalsHandleCountEdit, hDlg, 0, nYDifference); - AdjustControlPostion(hPerformancePageTotalsProcessCountEdit, hDlg, 0, nYDifference); - AdjustControlPostion(hPerformancePageTotalsThreadCountEdit, hDlg, 0, nYDifference); + AdjustControlPosition(hPerformancePageCommitChargeTotalEdit, hDlg, 0, nYDifference); + AdjustControlPosition(hPerformancePageCommitChargeLimitEdit, hDlg, 0, nYDifference); + AdjustControlPosition(hPerformancePageCommitChargePeakEdit, hDlg, 0, nYDifference); + AdjustControlPosition(hPerformancePageKernelMemoryTotalEdit, hDlg, 0, nYDifference); + AdjustControlPosition(hPerformancePageKernelMemoryPagedEdit, hDlg, 0, nYDifference); + AdjustControlPosition(hPerformancePageKernelMemoryNonPagedEdit, hDlg, 0, nYDifference); + AdjustControlPosition(hPerformancePagePhysicalMemoryTotalEdit, hDlg, 0, nYDifference); + AdjustControlPosition(hPerformancePagePhysicalMemoryAvailableEdit, hDlg, 0, nYDifference); + AdjustControlPosition(hPerformancePagePhysicalMemorySystemCacheEdit, hDlg, 0, nYDifference); + AdjustControlPosition(hPerformancePageTotalsHandleCountEdit, hDlg, 0, nYDifference); + AdjustControlPosition(hPerformancePageTotalsProcessCountEdit, hDlg, 0, nYDifference); + AdjustControlPosition(hPerformancePageTotalsThreadCountEdit, hDlg, 0, nYDifference); { static int lastX, lastY;

1 0

Francois Gouget : usp10: Fix the spelling of the Consonant_is_post_base_form() function.
by Alexandre Julliard 15 May '12

15 May '12

Module: wine Branch: master Commit: 7796895b74b2b60e03e5948b310e0eb7c475052c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7796895b74b2b60e03e5948b3… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 15 09:47:41 2012 +0200 usp10: Fix the spelling of the Consonant_is_post_base_form() function. --- dlls/usp10/indic.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/indic.c b/dlls/usp10/indic.c index df2a977..62834d1 100644 --- a/dlls/usp10/indic.c +++ b/dlls/usp10/indic.c @@ -208,7 +208,7 @@ static INT Indic_process_next_syllable( LPCWSTR input, INT cChar, INT start, INT return parse_consonant_syllable(input, cChar, start, main, next, lex); } -static BOOL Consonent_is_post_base_form(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPCWSTR pwChar, IndicSyllable *s, lexical_function lexical, BOOL modern) +static BOOL Consonant_is_post_base_form(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPCWSTR pwChar, IndicSyllable *s, lexical_function lexical, BOOL modern) { if (is_consonant(lexical(pwChar[s->base])) && s->base > s->start && lexical(pwChar[s->base-1]) == lex_Halant) { @@ -225,7 +225,7 @@ static BOOL Consonent_is_post_base_form(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCac return FALSE; } -static BOOL Consonent_is_below_base_form(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPCWSTR pwChar, IndicSyllable *s, lexical_function lexical, BOOL modern) +static BOOL Consonant_is_below_base_form(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPCWSTR pwChar, IndicSyllable *s, lexical_function lexical, BOOL modern) { if (is_consonant(lexical(pwChar[s->base])) && s->base > s->start && lexical(pwChar[s->base-1]) == lex_Halant) { @@ -242,7 +242,7 @@ static BOOL Consonent_is_below_base_form(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCa return FALSE; } -static BOOL Consonent_is_pre_base_form(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPCWSTR pwChar, IndicSyllable *s, lexical_function lexical, BOOL modern) +static BOOL Consonant_is_pre_base_form(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPCWSTR pwChar, IndicSyllable *s, lexical_function lexical, BOOL modern) { if (is_consonant(lexical(pwChar[s->base])) && s->base > s->start && lexical(pwChar[s->base-1]) == lex_Halant) { @@ -259,7 +259,7 @@ static BOOL Consonent_is_pre_base_form(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCach return FALSE; } -static BOOL Consonent_is_ralf(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPCWSTR pwChar, IndicSyllable *s, lexical_function lexical) +static BOOL Consonant_is_ralf(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPCWSTR pwChar, IndicSyllable *s, lexical_function lexical) { if ((lexical(pwChar[s->start])==lex_Ra) && s->end > s->start && lexical(pwChar[s->start+1]) == lex_Halant) return (SHAPE_does_GSUB_feature_apply_to_chars(hdc, psa, psc, &pwChar[s->start], 1, 2, "rphf") > 0); @@ -273,7 +273,7 @@ static int FindBaseConsonant(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LP BOOL pref = FALSE; /* remove ralf from consideration */ - if (Consonent_is_ralf(hdc, psa, psc, input, s, lex)) + if (Consonant_is_ralf(hdc, psa, psc, input, s, lex)) { s->ralf = s->start; s->start+=2; @@ -290,7 +290,7 @@ static int FindBaseConsonant(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LP } } - while ((blwf = Consonent_is_below_base_form(hdc, psa, psc, input, s, lex, modern)) || Consonent_is_post_base_form(hdc, psa, psc, input, s, lex, modern) || (pref = Consonent_is_pre_base_form(hdc, psa, psc, input, s, lex, modern))) + while ((blwf = Consonant_is_below_base_form(hdc, psa, psc, input, s, lex, modern)) || Consonant_is_post_base_form(hdc, psa, psc, input, s, lex, modern) || (pref = Consonant_is_pre_base_form(hdc, psa, psc, input, s, lex, modern))) { if (blwf && s->blwf == -1) s->blwf = s->base - 1;

1 0