wine-commits May 2012

wine-commits@winehq.org

2 participants
737 discussions

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard 24 May '12

24 May '12

Module: wine Branch: master Commit: 56b2af461a20d4451370ed4fb260c2d92994c9e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56b2af461a20d4451370ed4fb… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Wed May 23 21:45:51 2012 +0900 po: Update Korean translation. --- po/ko.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/po/ko.po b/po/ko.po index 017a1d8..908ab49 100644 --- a/po/ko.po +++ b/po/ko.po @@ -123,9 +123,9 @@ msgid "" "href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> for " "details." msgstr "" -"Wine은 HTML 임베딩 프로그램이 정상적으로 작동하기 위해서 필요로 하는 Gecko 키" -"지를 찾을 수 없습니다. Wine은 당신을 위해 자동으로 다운로드하고 설치할 것입니" -"다.\n" +"Wine은 HTML 임베딩 프로그램이 정상적으로 작동하기 위해서 필요로 하는 Gecko 패" +"키지를 찾을 수 없습니다. Wine은 당신을 위해 자동으로 다운로드하고 설치할 것입" +"니다.\n" "\n" "주위:당신의 배포판의 패키지를 대신 사용하는 것을 추천합니다. 자세한 것은 <a " "href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> 보십시"

1 0

Dmitry Timoshkov : comctl32: Use WARN instead of ERR if a toolbar index is out of range.
by Alexandre Julliard 24 May '12

24 May '12

Module: wine Branch: master Commit: 92a81c215f0a6540212a68b4300f6f69a4e8fa76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92a81c215f0a6540212a68b43… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu May 24 14:43:36 2012 +0900 comctl32: Use WARN instead of ERR if a toolbar index is out of range. --- dlls/comctl32/toolbar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index da13aa2..cd19a58 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -428,7 +428,7 @@ TOOLBAR_GetImageListForDrawing (const TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPt if (!TOOLBAR_IsValidBitmapIndex(infoPtr,btnPtr->iBitmap)) { if (btnPtr->iBitmap == I_IMAGENONE) return NULL; - ERR("bitmap for ID %d, index %d is not valid, number of bitmaps in imagelist: %d\n", + WARN("bitmap for ID %d, index %d is not valid, number of bitmaps in imagelist: %d\n", HIWORD(btnPtr->iBitmap), LOWORD(btnPtr->iBitmap), infoPtr->nNumBitmaps); return NULL; }

1 0

Alexander Morozov : wininet: Add "Content-Disposition" field.
by Alexandre Julliard 24 May '12

24 May '12

Module: wine Branch: master Commit: ef95a7938462f6dcc15a82124a36f19e9a72f81e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef95a7938462f6dcc15a82124… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Wed May 23 17:49:24 2012 +0400 wininet: Add "Content-Disposition" field. --- dlls/wininet/http.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index f26f45f..0e3c1a3 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -98,6 +98,7 @@ static const WCHAR szAllow[] = { 'A','l','l','o','w',0 }; static const WCHAR szCache_Control[] = { 'C','a','c','h','e','-','C','o','n','t','r','o','l',0 }; static const WCHAR szConnection[] = { 'C','o','n','n','e','c','t','i','o','n',0 }; static const WCHAR szContent_Base[] = { 'C','o','n','t','e','n','t','-','B','a','s','e',0 }; +static const WCHAR szContent_Disposition[] = { 'C','o','n','t','e','n','t','-','D','i','s','p','o','s','i','t','i','o','n',0 }; static const WCHAR szContent_Encoding[] = { 'C','o','n','t','e','n','t','-','E','n','c','o','d','i','n','g',0 }; static const WCHAR szContent_ID[] = { 'C','o','n','t','e','n','t','-','I','D',0 }; static const WCHAR szContent_Language[] = { 'C','o','n','t','e','n','t','-','L','a','n','g','u','a','g','e',0 }; @@ -3277,7 +3278,7 @@ static const LPCWSTR header_lookup[] = { szCookie, /* HTTP_QUERY_COOKIE = 44 */ NULL, /* HTTP_QUERY_REQUEST_METHOD = 45 */ NULL, /* HTTP_QUERY_REFRESH = 46 */ - NULL, /* HTTP_QUERY_CONTENT_DISPOSITION = 47 */ + szContent_Disposition, /* HTTP_QUERY_CONTENT_DISPOSITION = 47 */ szAge, /* HTTP_QUERY_AGE = 48 */ szCache_Control, /* HTTP_QUERY_CACHE_CONTROL = 49 */ szContent_Base, /* HTTP_QUERY_CONTENT_BASE = 50 */

1 0

Alexandre Julliard : winex11: Always create the brush pixmap from the pattern bits.
by Alexandre Julliard 24 May '12

24 May '12

Module: wine Branch: master Commit: 995e2104df603af1feea7999fefe4765a655d2ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=995e2104df603af1feea7999f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 23 21:44:59 2012 +0200 winex11: Always create the brush pixmap from the pattern bits. --- dlls/winex11.drv/brush.c | 79 +------------------------------------------- dlls/winex11.drv/x11drv.h | 1 - dlls/winex11.drv/xrender.c | 44 ++++++------------------ 3 files changed, 12 insertions(+), 112 deletions(-) diff --git a/dlls/winex11.drv/brush.c b/dlls/winex11.drv/brush.c index 6574eb8..3406190 100644 --- a/dlls/winex11.drv/brush.c +++ b/dlls/winex11.drv/brush.c @@ -210,76 +210,6 @@ static void BRUSH_SelectSolidBrush( X11DRV_PDEVICE *physDev, COLORREF color ) } -/*********************************************************************** - * BRUSH_SelectPatternBrush - */ -static void BRUSH_SelectPatternBrush( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, X_PHYSBITMAP *physBitmap ) -{ - BITMAP bitmap; - - GetObjectW( hbitmap, sizeof(bitmap), &bitmap ); - - wine_tsx11_lock(); - - if (physDev->brush.pixmap) XFreePixmap( gdi_display, physDev->brush.pixmap ); - - if ((physDev->depth == 1) && (physBitmap->depth != 1)) - { - /* Special case: a color pattern on a monochrome DC */ - physDev->brush.pixmap = XCreatePixmap( gdi_display, root_window, - bitmap.bmWidth, bitmap.bmHeight, 1); - /* FIXME: should probably convert to monochrome instead */ - XCopyPlane( gdi_display, physBitmap->pixmap, physDev->brush.pixmap, - get_bitmap_gc(1), 0, 0, bitmap.bmWidth, bitmap.bmHeight, 0, 0, 1 ); - } - else - { - physDev->brush.pixmap = XCreatePixmap( gdi_display, root_window, - bitmap.bmWidth, bitmap.bmHeight, physBitmap->depth ); - XCopyArea( gdi_display, physBitmap->pixmap, physDev->brush.pixmap, - get_bitmap_gc(physBitmap->depth), 0, 0, bitmap.bmWidth, bitmap.bmHeight, 0, 0 ); - } - wine_tsx11_unlock(); - - if (physBitmap->depth > 1) - { - physDev->brush.fillStyle = FillTiled; - physDev->brush.pixel = 0; /* Ignored */ - } - else - { - physDev->brush.fillStyle = FillOpaqueStippled; - physDev->brush.pixel = -1; /* Special case (see DC_SetupGCForBrush) */ - } -} - -/* create a bitmap appropriate for the given DIB pattern brush */ -HBITMAP create_brush_bitmap( X11DRV_PDEVICE *physDev, const struct brush_pattern *pattern ) -{ - HDC memdc; - int bpp = screen_bpp; - HBITMAP bitmap; - const BITMAPINFO *info = pattern->info; - - if (physDev->depth == 1 || info->bmiHeader.biBitCount == 1) bpp = 1; - bitmap = CreateBitmap( info->bmiHeader.biWidth, abs(info->bmiHeader.biHeight), 1, bpp, NULL ); - if (!bitmap) return 0; - - /* make sure it's owned by x11drv */ - memdc = CreateCompatibleDC( physDev->dev.hdc ); - SelectObject( memdc, bitmap ); - DeleteDC( memdc ); - if (!X11DRV_get_phys_bitmap( bitmap )) - { - DeleteObject( bitmap ); - return 0; - } - - SetDIBits( physDev->dev.hdc, bitmap, 0, abs(info->bmiHeader.biHeight), - pattern->bits.ptr, info, pattern->usage ); - return bitmap; -} - static BOOL select_pattern_brush( X11DRV_PDEVICE *physdev, const struct brush_pattern *pattern ) { XVisualInfo vis; @@ -330,14 +260,7 @@ HBRUSH X11DRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_patter if (pattern) /* pattern brush */ { - X_PHYSBITMAP *physbitmap; - HBITMAP bitmap = pattern->bitmap; - - if (!bitmap || !(physbitmap = X11DRV_get_phys_bitmap( bitmap ))) - { - if (!select_pattern_brush( physDev, pattern )) return 0; - } - else BRUSH_SelectPatternBrush( physDev, bitmap, physbitmap ); + if (!select_pattern_brush( physDev, pattern )) return 0; TRACE("BS_PATTERN\n"); physDev->brush.style = BS_PATTERN; return hbrush; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 9b05e3e..7ea8164 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -221,7 +221,6 @@ extern void X11DRV_Xcursor_Init(void) DECLSPEC_HIDDEN; extern void X11DRV_BITMAP_Init(void) DECLSPEC_HIDDEN; extern void X11DRV_XInput2_Init(void) DECLSPEC_HIDDEN; -extern HBITMAP create_brush_bitmap( X11DRV_PDEVICE *physDev, const struct brush_pattern *pattern ) DECLSPEC_HIDDEN; extern X_PHYSBITMAP *X11DRV_get_phys_bitmap( HBITMAP hbitmap ) DECLSPEC_HIDDEN; extern X_PHYSBITMAP *X11DRV_init_phys_bitmap( HBITMAP hbitmap ) DECLSPEC_HIDDEN; extern X_PHYSBITMAP *X11DRV_create_phys_bitmap( HBITMAP hbitmap, const BITMAP *bitmap, int depth ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index ffd1b4d..91a6bd2 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2589,56 +2589,34 @@ fallback: static HBRUSH xrenderdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_pattern *pattern ) { struct xrender_physdev *physdev = get_xrender_dev( dev ); - X_PHYSBITMAP *physbitmap; - BOOL delete_bitmap = FALSE; - BITMAP bm; - HBITMAP bitmap; Pixmap pixmap; - XRenderPictFormat *pict_format; - Picture src_pict, dst_pict; - XRenderPictureAttributes pa; + XVisualInfo vis; + XRenderPictFormat *format = physdev->pict_format; if (!pattern) goto x11drv_fallback; + if (pattern->info->bmiHeader.biBitCount == 1) goto x11drv_fallback; if (physdev->format == WXR_FORMAT_MONO) goto x11drv_fallback; - bitmap = pattern->bitmap; - if (!bitmap || !(physbitmap = X11DRV_get_phys_bitmap( bitmap ))) - { - if (!(bitmap = create_brush_bitmap( physdev->x11dev, pattern ))) return 0; - physbitmap = X11DRV_get_phys_bitmap( bitmap ); - delete_bitmap = TRUE; - } - - if (physbitmap->format == WXR_FORMAT_MONO) goto x11drv_fallback; - if (!(pict_format = pict_formats[physbitmap->format])) goto x11drv_fallback; + memset( &vis, 0, sizeof(vis) ); + vis.depth = format->depth; + vis.red_mask = format->direct.redMask << format->direct.red; + vis.green_mask = format->direct.greenMask << format->direct.green; + vis.blue_mask = format->direct.blueMask << format->direct.blue; - GetObjectW( bitmap, sizeof(bm), &bm ); + pixmap = create_pixmap_from_image( physdev->dev.hdc, &vis, pattern->info, + &pattern->bits, pattern->usage ); + if (!pixmap) return 0; wine_tsx11_lock(); - pixmap = XCreatePixmap( gdi_display, root_window, bm.bmWidth, bm.bmHeight, - physdev->pict_format->depth ); - - pa.repeat = RepeatNone; - src_pict = pXRenderCreatePicture(gdi_display, physbitmap->pixmap, pict_format, CPRepeat, &pa); - dst_pict = pXRenderCreatePicture(gdi_display, pixmap, physdev->pict_format, CPRepeat, &pa); - - xrender_blit( PictOpSrc, src_pict, 0, dst_pict, 0, 0, bm.bmWidth, bm.bmHeight, - 0, 0, bm.bmWidth, bm.bmHeight, 1.0, 1.0 ); - pXRenderFreePicture( gdi_display, src_pict ); - pXRenderFreePicture( gdi_display, dst_pict ); - if (physdev->x11dev->brush.pixmap) XFreePixmap( gdi_display, physdev->x11dev->brush.pixmap ); physdev->x11dev->brush.pixmap = pixmap; physdev->x11dev->brush.fillStyle = FillTiled; physdev->x11dev->brush.pixel = 0; /* ignored */ physdev->x11dev->brush.style = BS_PATTERN; wine_tsx11_unlock(); - - if (delete_bitmap) DeleteObject( bitmap ); return hbrush; x11drv_fallback: - if (delete_bitmap) DeleteObject( bitmap ); dev = GET_NEXT_PHYSDEV( dev, pSelectBrush ); return dev->funcs->pSelectBrush( dev, hbrush, pattern ); }

1 0

Alexandre Julliard : gdi32: Always store a copy of the bitmap bits for pattern brushes.
by Alexandre Julliard 24 May '12

24 May '12

Module: wine Branch: master Commit: a196ad8fc1687e3814c978ecf6224dbf7db18c86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a196ad8fc1687e3814c978ecf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 23 21:12:04 2012 +0200 gdi32: Always store a copy of the bitmap bits for pattern brushes. --- dlls/gdi32/brush.c | 90 ++++++++----------------------------------- dlls/gdi32/dibdrv/objects.c | 12 +----- dlls/gdi32/gdi_private.h | 1 - dlls/gdi32/pen.c | 6 +-- 4 files changed, 18 insertions(+), 91 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index cb5a163..e0dd599 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -55,88 +55,37 @@ static const struct gdi_obj_funcs brush_funcs = }; -/* fetch the contents of the brush bitmap and cache them in the brush pattern */ -void cache_pattern_bits( PHYSDEV physdev, struct brush_pattern *pattern ) +static BOOL copy_bitmap( struct brush_pattern *brush, HBITMAP bitmap ) { + char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256])]; + BITMAPINFO *info = (BITMAPINFO *)buffer; struct gdi_image_bits bits; struct bitblt_coords src; - BITMAPINFO *info; - BITMAPOBJ *bmp; - - if (pattern->info) return; /* already cached */ - if (!(bmp = GDI_GetObjPtr( pattern->bitmap, OBJ_BITMAP ))) return; - - /* we don't need to cache if we are selecting into the same type of DC */ - if (physdev && bmp->funcs == physdev->funcs) goto done; + BITMAPOBJ *bmp = GDI_GetObjPtr( bitmap, OBJ_BITMAP ); - if (!(info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) goto done; + if (!bmp) return FALSE; src.visrect.left = src.x = 0; src.visrect.top = src.y = 0; src.visrect.right = src.width = bmp->dib.dsBm.bmWidth; src.visrect.bottom = src.height = bmp->dib.dsBm.bmHeight; - if (bmp->funcs->pGetImage( NULL, pattern->bitmap, info, &bits, &src )) - { - HeapFree( GetProcessHeap(), 0, info ); - goto done; - } - - /* release the unneeded space */ - HeapReAlloc( GetProcessHeap(), HEAP_REALLOC_IN_PLACE_ONLY, info, - get_dib_info_size( info, DIB_RGB_COLORS )); - pattern->info = info; - pattern->bits = bits; - pattern->usage = DIB_RGB_COLORS; - -done: - GDI_ReleaseObj( pattern->bitmap ); -} + if (bmp->funcs->pGetImage( NULL, bitmap, info, &bits, &src )) goto done; -static BOOL copy_bitmap( struct brush_pattern *brush, HBITMAP bitmap ) -{ - BITMAPINFO *info; - BITMAPOBJ *bmp = GDI_GetObjPtr( bitmap, OBJ_BITMAP ); - - if (!bmp) return FALSE; - - if (!is_bitmapobj_dib( bmp )) + brush->bits = bits; + if (!bits.free) { - if ((brush->bitmap = CreateBitmap( bmp->dib.dsBm.bmWidth, bmp->dib.dsBm.bmHeight, - bmp->dib.dsBm.bmPlanes, bmp->dib.dsBm.bmBitsPixel, NULL ))) - { - if (bmp->funcs->pCopyBitmap( bitmap, brush->bitmap )) - { - BITMAPOBJ *copy = GDI_GetObjPtr( brush->bitmap, OBJ_BITMAP ); - copy->funcs = bmp->funcs; - GDI_ReleaseObj( copy ); - } - else - { - DeleteObject( brush->bitmap ); - brush->bitmap = 0; - } - } - GDI_ReleaseObj( bitmap ); - return brush->bitmap != 0; + if (!(brush->bits.ptr = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ))) goto done; + memcpy( brush->bits.ptr, bits.ptr, info->bmiHeader.biSizeImage ); + brush->bits.free = free_heap_bits; } - info = HeapAlloc( GetProcessHeap(), 0, - get_dib_info_size( (BITMAPINFO *)&bmp->dib.dsBmih, DIB_RGB_COLORS )); - if (!info) goto done; - info->bmiHeader = bmp->dib.dsBmih; - if (info->bmiHeader.biCompression == BI_BITFIELDS) - memcpy( &info->bmiHeader + 1, bmp->dib.dsBitfields, sizeof(bmp->dib.dsBitfields) ); - else if (info->bmiHeader.biClrUsed) - memcpy( &info->bmiHeader + 1, bmp->color_table, info->bmiHeader.biClrUsed * sizeof(RGBQUAD) ); - if (!(brush->bits.ptr = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ))) + if (!(brush->info = HeapAlloc( GetProcessHeap(), 0, get_dib_info_size( info, DIB_RGB_COLORS )))) { - HeapFree( GetProcessHeap(), 0, info ); + if (brush->bits.free) brush->bits.free( &brush->bits ); goto done; } - memcpy( brush->bits.ptr, bmp->dib.dsBm.bmBits, info->bmiHeader.biSizeImage ); - brush->bits.is_copy = TRUE; - brush->bits.free = free_heap_bits; - brush->info = info; + memcpy( brush->info, info, get_dib_info_size( info, DIB_RGB_COLORS )); + brush->bits.is_copy = FALSE; /* the bits can't be modified */ brush->usage = DIB_RGB_COLORS; done: @@ -200,7 +149,6 @@ BOOL store_brush_pattern( LOGBRUSH *brush, struct brush_pattern *pattern ) void free_brush_pattern( struct brush_pattern *pattern ) { if (pattern->bits.free) pattern->bits.free( &pattern->bits ); - if (pattern->bitmap) DeleteObject( pattern->bitmap ); HeapFree( GetProcessHeap(), 0, pattern->info ); } @@ -211,8 +159,6 @@ BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void **bits, UINT * if (!(brush = GDI_GetObjPtr( handle, OBJ_BRUSH ))) return FALSE; - if (!brush->pattern.info) cache_pattern_bits( NULL, &brush->pattern ); - if (brush->pattern.info) { memcpy( info, brush->pattern.info, get_dib_info_size( brush->pattern.info, brush->pattern.usage )); @@ -495,11 +441,7 @@ static HGDIOBJ BRUSH_SelectObject( HGDIOBJ handle, HDC hdc ) PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSelectBrush ); struct brush_pattern *pattern = &brush->pattern; - if (!pattern->info) - { - if (pattern->bitmap) cache_pattern_bits( physdev, pattern ); - else pattern = NULL; - } + if (!pattern->info) pattern = NULL; GDI_inc_ref_count( handle ); GDI_ReleaseObj( handle ); diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index dd47ee1..35164e6 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1873,17 +1873,7 @@ static BOOL select_pattern_brush( dibdrv_physdev *pdev, dib_brush *brush, BOOL * if (pattern.bit_count == 1 && !pattern.color_table) dither = FALSE; /* monochrome DDB pattern brushes don't get dithered */ - if (!brush->pattern.info) - { - BITMAPOBJ *bmp = GDI_GetObjPtr( brush->pattern.bitmap, OBJ_BITMAP ); - BOOL ret; - - if (!bmp) return FALSE; - ret = init_dib_info_from_bitmapobj( &pattern, bmp ); - GDI_ReleaseObj( brush->pattern.bitmap ); - if (!ret) return FALSE; - } - else if (brush->pattern.info->bmiHeader.biClrUsed && brush->pattern.usage == DIB_PAL_COLORS) + if (brush->pattern.info->bmiHeader.biClrUsed && brush->pattern.usage == DIB_PAL_COLORS) { copy_bitmapinfo( info, brush->pattern.info ); fill_color_table_from_pal_colors( info, pdev->dev.hdc ); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index db8fd24..36d0131 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -221,7 +221,6 @@ extern DWORD stretch_bits( const BITMAPINFO *src_info, struct bitblt_coords *src struct gdi_image_bits *bits, int mode ) DECLSPEC_HIDDEN; /* brush.c */ -extern void cache_pattern_bits( PHYSDEV physdev, struct brush_pattern *pattern ) DECLSPEC_HIDDEN; extern BOOL store_brush_pattern( LOGBRUSH *brush, struct brush_pattern *pattern ) DECLSPEC_HIDDEN; extern void free_brush_pattern( struct brush_pattern *pattern ) DECLSPEC_HIDDEN; extern BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void **bits, UINT *usage ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/pen.c b/dlls/gdi32/pen.c index 1d04dae..6695ee9 100644 --- a/dlls/gdi32/pen.c +++ b/dlls/gdi32/pen.c @@ -243,11 +243,7 @@ static HGDIOBJ PEN_SelectObject( HGDIOBJ handle, HDC hdc ) break; case OBJ_EXTPEN: pattern = &pen->pattern; - if (!pattern->info) - { - if (pattern->bitmap) cache_pattern_bits( physdev, pattern ); - else pattern = NULL; - } + if (!pattern->info) pattern = NULL; break; default: GDI_ReleaseObj( handle );

1 0

Alexandre Julliard : gdi32: Don' t use the DC colors when drawing a monochrome pattern to a monochrome DDB.
by Alexandre Julliard 24 May '12

24 May '12

Module: wine Branch: master Commit: 8a86f6c99329fd5a325428f4824580131a8fd767 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a86f6c99329fd5a325428f48… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 23 12:30:23 2012 +0200 gdi32: Don't use the DC colors when drawing a monochrome pattern to a monochrome DDB. --- dlls/gdi32/dibdrv/objects.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index d865768..dd47ee1 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1870,6 +1870,9 @@ static BOOL select_pattern_brush( dibdrv_physdev *pdev, dib_brush *brush, BOOL * dib_info pattern; BOOL dither = (brush->dib.bit_count == 1); + if (pattern.bit_count == 1 && !pattern.color_table) + dither = FALSE; /* monochrome DDB pattern brushes don't get dithered */ + if (!brush->pattern.info) { BITMAPOBJ *bmp = GDI_GetObjPtr( brush->pattern.bitmap, OBJ_BITMAP ); @@ -1892,7 +1895,8 @@ static BOOL select_pattern_brush( dibdrv_physdev *pdev, dib_brush *brush, BOOL * init_dib_info_from_bitmapinfo( &pattern, brush->pattern.info, brush->pattern.bits.ptr ); } - if (pattern.bit_count == 1 && !pattern.color_table) + if (pattern.bit_count == 1 && !pattern.color_table && + (pdev->dib.bit_count != 1 || pdev->dib.color_table)) { /* monochrome DDB pattern uses DC colors */ DWORD pixel; @@ -1916,7 +1920,6 @@ static BOOL select_pattern_brush( dibdrv_physdev *pdev, dib_brush *brush, BOOL * pattern.color_table = color_table; pattern.color_table_size = 2; *needs_reselect = TRUE; - dither = FALSE; /* DDB pattern brushes don't get dithered */ } copy_dib_color_info(&brush->dib, &pdev->dib);

1 0

Alexandre Julliard : gdi32: Implement dithering of solid brushes when drawing to DDBs.
by Alexandre Julliard 24 May '12

24 May '12

Module: wine Branch: master Commit: 139aeba3ef44f11c21ef38d598746ad2aebeb50c URL: http://source.winehq.org/git/wine.git/?a=commit;h=139aeba3ef44f11c21ef38d59… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 23 11:14:16 2012 +0200 gdi32: Implement dithering of solid brushes when drawing to DDBs. --- dlls/gdi32/dibdrv/dibdrv.h | 1 + dlls/gdi32/dibdrv/objects.c | 69 +++++++++++++-- dlls/gdi32/dibdrv/primitives.c | 189 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 249 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=139aeba3ef44f11c21ef3…

1 0

Lauri Kenttä : po: Update Swedish translation.
by Alexandre Julliard 23 May '12

23 May '12

Module: wine Branch: master Commit: 6afed7a52b8b8ce1b984ae961a5958ff2becfe1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6afed7a52b8b8ce1b984ae961… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Wed May 23 19:41:22 2012 +0300 po: Update Swedish translation. --- po/sv.po | 37 ++++++++++++++++++------------------- 1 files changed, 18 insertions(+), 19 deletions(-) diff --git a/po/sv.po b/po/sv.po index d7d9062..6507a49 100644 --- a/po/sv.po +++ b/po/sv.po @@ -157,21 +157,10 @@ msgid "Cancel" msgstr "Avbryt" #: appwiz.rc:112 -#, fuzzy -#| msgid "Wine Gecko Installer" msgid "Wine Mono Installer" -msgstr "Wine Gecko Installationsprogram" +msgstr "Wine Mono Installationsprogram" #: appwiz.rc:115 -#, fuzzy -#| msgid "" -#| "Wine could not find a Gecko package which is needed for applications " -#| "embedding HTML to work correctly. Wine can automatically download and " -#| "install it for you.\n" -#| "\n" -#| "Note: it is recommended to use your distribution's packages instead. See " -#| "<a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> " -#| "for details." msgid "" "Wine could not find a Mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" @@ -180,13 +169,12 @@ msgid "" "href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"Wine kunde inte hitta paketet Gecko vilket krävs för att program med " -"inbäddad HTML ska fungera korrekt. Wine kan hämta och installera det " -"automatiskt åt dig.\n" +"Wine kunde inte hitta paketet Mono vilket krävs för att .NET-program ska " +"fungera korrekt. Wine kan hämta och installera det automatiskt åt dig.\n" "\n" "Obs: Du rekommenderas att använda din distributions paket i stället. Se <a " -"href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> för " -"mer information." +"href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> för mer " +"information." #: appwiz.rc:28 msgid "Add/Remove Programs" @@ -3058,7 +3046,7 @@ msgstr "" #: gdi32.rc:41 msgid "OEM/DOS" -msgstr "" +msgstr "OEM/DOS" #: gphoto2.rc:27 msgid "Files on Camera" @@ -9963,7 +9951,7 @@ msgstr "Plats:" #: hostname.rc:27 msgid "Usage: hostname\n" -msgstr "" +msgstr "Användning: hostname\n" #: hostname.rc:28 msgid "Error: Invalid option '%c'.\n" @@ -10062,6 +10050,12 @@ msgid "" "Displays the list of running services if 'service' is omitted. Otherwise " "'service' is the name of the service to start.\n" msgstr "" +"Syntax för detta kommando är:\n" +"\n" +"NET START [tjänst]\n" +"\n" +"Visar listan på tjänster som redan körs om 'tjänst' utelämnas. Annars är " +"'tjänst' namnet på tjänsten att starta.\n" #: net.rc:29 msgid "" @@ -10071,6 +10065,11 @@ msgid "" "\n" "Where 'service' is the name of the service to stop.\n" msgstr "" +"Syntax för detta kommando är:\n" +"\n" +"NET STOP tjänst\n" +"\n" +"Där 'tjänst' är namnet på tjänsten att stoppa.\n" #: net.rc:30 msgid "Stopping dependent service: %1\n"

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 23 May '12

23 May '12

Module: wine Branch: master Commit: 786bcf99efa77446c60f00d7b46dc1a701a27ffa URL: http://source.winehq.org/git/wine.git/?a=commit;h=786bcf99efa77446c60f00d7b… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Wed May 23 19:41:21 2012 +0300 po: Update Finnish translation. --- po/fi.po | 21 +++++---------------- 1 files changed, 5 insertions(+), 16 deletions(-) diff --git a/po/fi.po b/po/fi.po index 2581565..f54e878 100644 --- a/po/fi.po +++ b/po/fi.po @@ -155,21 +155,10 @@ msgid "Cancel" msgstr "Peruuta" #: appwiz.rc:112 -#, fuzzy -#| msgid "Wine Gecko Installer" msgid "Wine Mono Installer" -msgstr "Wine Gecko -asennusohjelma" +msgstr "Wine Mono -asennusohjelma" #: appwiz.rc:115 -#, fuzzy -#| msgid "" -#| "Wine could not find a Gecko package which is needed for applications " -#| "embedding HTML to work correctly. Wine can automatically download and " -#| "install it for you.\n" -#| "\n" -#| "Note: it is recommended to use your distribution's packages instead. See " -#| "<a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> " -#| "for details." msgid "" "Wine could not find a Mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" @@ -178,12 +167,12 @@ msgid "" "href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"Wine ei löytänyt Gecko-pakettia, jota tarvitaan HTML:ää sisältävien " -"ohjelmien toimintaan. Wine voi ladata ja asentaa sen puolestasi.\n" +"Wine ei löytänyt Mono-pakettia, jota tarvitaan, jotta .NET-sovellukset " +"toimisivat oikein. Wine voi ladata ja asentaa sen puolestasi.\n" "\n" "Huomaa, että on suositeltavampaa käyttää oman jakelusi paketteja. " -"Lisätietoja: <a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/" -"Gecko</a>." +"Lisätietoja: <a href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/" +"Mono</a>." #: appwiz.rc:28 msgid "Add/Remove Programs"

1 0

Jacek Caban : wininet: Moved querying INTERNET_OPTION_REQUEST_FLAGS implementation to HTTPREQ_QueryOption .
by Alexandre Julliard 23 May '12

23 May '12

Module: wine Branch: master Commit: c0400560b54458335b77af847c46a65722199af3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0400560b54458335b77af847… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 23 18:24:02 2012 +0200 wininet: Moved querying INTERNET_OPTION_REQUEST_FLAGS implementation to HTTPREQ_QueryOption. --- dlls/wininet/http.c | 10 ++++++++++ dlls/wininet/internet.c | 20 ++++++++------------ dlls/wininet/tests/internet.c | 16 ++++++++++++++++ 3 files changed, 34 insertions(+), 12 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index da10282..f26f45f 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2158,6 +2158,16 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe *size = sizeof(DWORD); *(DWORD *)buffer = req->connect_timeout; return ERROR_SUCCESS; + case INTERNET_OPTION_REQUEST_FLAGS: + TRACE("INTERNET_OPTION_REQUEST_FLAGS\n"); + + if (*size < sizeof(DWORD)) + return ERROR_INSUFFICIENT_BUFFER; + + *(DWORD*)buffer = 4; + *size = sizeof(DWORD); + + return ERROR_SUCCESS; } return INET_QueryOption(hdr, option, buffer, size, unicode); diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 66f25eb..a41225f 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1214,7 +1214,7 @@ HINTERNET WINAPI InternetConnectW(HINTERNET hInternet, HINTERNET rc = NULL; DWORD res = ERROR_SUCCESS; - TRACE("(%p, %s, %i, %s, %s, %i, %i, %lx)\n", hInternet, debugstr_w(lpszServerName), + TRACE("(%p, %s, %i, %s, %s, %i, %x, %lx)\n", hInternet, debugstr_w(lpszServerName), nServerPort, debugstr_w(lpszUserName), debugstr_w(lpszPassword), dwService, dwFlags, dwContext); @@ -2319,17 +2319,6 @@ static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL u /* FIXME: This function currently handles more options than it should. Options requiring * proper handles should be moved to proper functions */ switch(option) { - case INTERNET_OPTION_REQUEST_FLAGS: - TRACE("INTERNET_OPTION_REQUEST_FLAGS\n"); - - if (*size < sizeof(ULONG)) - return ERROR_INSUFFICIENT_BUFFER; - - *(ULONG*)buffer = 4; - *size = sizeof(ULONG); - - return ERROR_SUCCESS; - case INTERNET_OPTION_HTTP_VERSION: if (*size < sizeof(HTTP_VERSION_INFO)) return ERROR_INSUFFICIENT_BUFFER; @@ -2471,7 +2460,9 @@ static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL u return res; } + case INTERNET_OPTION_REQUEST_FLAGS: case INTERNET_OPTION_USER_AGENT: + *size = 0; return ERROR_INTERNET_INCORRECT_HANDLE_TYPE; case INTERNET_OPTION_POLICY: return ERROR_INVALID_PARAMETER; @@ -2509,6 +2500,11 @@ DWORD INET_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD * *size = sizeof(DWORD_PTR); return ERROR_SUCCESS; + case INTERNET_OPTION_REQUEST_FLAGS: + WARN("INTERNET_OPTION_REQUEST_FLAGS\n"); + *size = sizeof(DWORD); + return ERROR_INTERNET_INCORRECT_HANDLE_TYPE; + case INTERNET_OPTION_MAX_CONNS_PER_SERVER: case INTERNET_OPTION_MAX_CONNS_PER_1_0_SERVER: WARN("Called on global option %u\n", option); diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 8d91661..3567cc8 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -212,6 +212,22 @@ static void test_InternetQueryOptionA(void) ok(retval == 0,"Got wrong return value %d\n",retval); ok(err == ERROR_INTERNET_INCORRECT_HANDLE_TYPE, "Got wrong error code %d\n",err); + SetLastError(0xdeadbeef); + len = sizeof(DWORD); + retval = InternetQueryOptionA(hurl,INTERNET_OPTION_REQUEST_FLAGS,NULL,&len); + err = GetLastError(); + ok(retval == 0,"Got wrong return value %d\n",retval); + ok(err == ERROR_INTERNET_INCORRECT_HANDLE_TYPE, "Got wrong error code %d\n",err); + ok(len == sizeof(DWORD), "len = %d\n", len); + + SetLastError(0xdeadbeef); + len = sizeof(DWORD); + retval = InternetQueryOptionA(NULL,INTERNET_OPTION_REQUEST_FLAGS,NULL,&len); + err = GetLastError(); + ok(retval == 0,"Got wrong return value %d\n",retval); + ok(err == ERROR_INTERNET_INCORRECT_HANDLE_TYPE, "Got wrong error code %d\n",err); + ok(!len, "len = %d\n", len); + InternetCloseHandle(hurl); InternetCloseHandle(hinet);

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
74
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2012