wine-commits December 2011

wine-commits@winehq.org

2 participants
810 discussions

Alexandre Julliard : gdi32: Don' t create a default color table for pattern brushes, use the DC colors instead.
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: 65a2c885f1148966f841d1fd2f4e2cbd6c7f7768 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65a2c885f1148966f841d1fd2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 12:23:12 2011 +0100 gdi32: Don't create a default color table for pattern brushes, use the DC colors instead. --- dlls/gdi32/brush.c | 4 ++-- dlls/gdi32/dibdrv/objects.c | 29 ++++++++++++++++++++++++----- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index dc8eb90..384ef12 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -79,8 +79,6 @@ static BOOL store_bitmap_bits( BRUSHOBJ *brush, BITMAPOBJ *bmp ) return FALSE; } - if (info->bmiHeader.biBitCount <= 8 && !info->bmiHeader.biClrUsed) fill_default_color_table( info ); - /* release the unneeded space */ HeapReAlloc( GetProcessHeap(), HEAP_REALLOC_IN_PLACE_ONLY, info, get_dib_info_size( info, DIB_RGB_COLORS )); @@ -162,6 +160,8 @@ BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void **bits, UINT * if (brush->info) { memcpy( info, brush->info, get_dib_info_size( brush->info, brush->usage )); + if (info->bmiHeader.biBitCount <= 8 && !info->bmiHeader.biClrUsed) + fill_default_color_table( info ); *bits = brush->bits.ptr; *usage = brush->usage; ret = TRUE; diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 9ab3bcd..9229915 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1468,10 +1468,11 @@ static BOOL matching_pattern_format( dib_info *dib, dib_info *pattern ) return TRUE; } -static BOOL select_pattern_brush( dibdrv_physdev *pdev ) +static BOOL select_pattern_brush( dibdrv_physdev *pdev, BOOL *needs_reselect ) { char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *info = (BITMAPINFO *)buffer; + RGBQUAD color_table[2]; RECT rect; dib_info pattern; @@ -1490,12 +1491,31 @@ static BOOL select_pattern_brush( dibdrv_physdev *pdev ) copy_bitmapinfo( info, pdev->brush_pattern_info ); fill_color_table_from_pal_colors( info, pdev->dev.hdc ); init_dib_info_from_bitmapinfo( &pattern, info, pdev->brush_pattern_bits, 0 ); + *needs_reselect = TRUE; } else { init_dib_info_from_bitmapinfo( &pattern, pdev->brush_pattern_info, pdev->brush_pattern_bits, 0 ); } + if (pattern.bit_count == 1 && !pattern.color_table) + { + /* monochrome DDB pattern uses DC colors */ + COLORREF color = GetTextColor( pdev->dev.hdc ); + color_table[0].rgbRed = GetRValue( color ); + color_table[0].rgbGreen = GetGValue( color ); + color_table[0].rgbBlue = GetBValue( color ); + color_table[0].rgbReserved = 0; + color = GetBkColor( pdev->dev.hdc ); + color_table[1].rgbRed = GetRValue( color ); + color_table[1].rgbGreen = GetGValue( color ); + color_table[1].rgbBlue = GetBValue( color ); + color_table[1].rgbReserved = 0; + pattern.color_table = color_table; + pattern.color_table_size = 2; + *needs_reselect = TRUE; + } + copy_dib_color_info(&pdev->brush_dib, &pdev->dib); pdev->brush_dib.height = pattern.height; @@ -1537,13 +1557,14 @@ static BOOL pattern_brush(dibdrv_physdev *pdev, dib_info *dib, int num, const RE int i, j; const WINEREGION *clip; POINT origin; + BOOL needs_reselect = FALSE; if(pdev->brush_and_bits == NULL) { switch(pdev->brush_style) { case BS_DIBPATTERN: - if (!pdev->brush_dib.bits.ptr && !select_pattern_brush( pdev )) + if (!pdev->brush_dib.bits.ptr && !select_pattern_brush( pdev, &needs_reselect )) return FALSE; if(!create_pattern_brush_bits(pdev)) return FALSE; @@ -1600,9 +1621,7 @@ static BOOL pattern_brush(dibdrv_physdev *pdev, dib_info *dib, int num, const RE } release_wine_region( region ); - /* we need to recompute the bits each time for DIB_PAL_COLORS */ - if (pdev->brush_style == BS_DIBPATTERN && pdev->brush_pattern_usage == DIB_PAL_COLORS) - free_pattern_brush( pdev ); + if (needs_reselect) free_pattern_brush( pdev ); return TRUE; }

1 0

Alexandre Julliard : gdi32: Select the pattern brush only when first used.
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: d5fe87e2e89ed485c9a2c481eb7c43b391047b1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5fe87e2e89ed485c9a2c481e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 8 12:12:54 2011 +0100 gdi32: Select the pattern brush only when first used. --- dlls/gdi32/dibdrv/dc.c | 14 ------ dlls/gdi32/dibdrv/dibdrv.h | 2 +- dlls/gdi32/dibdrv/objects.c | 98 ++++++++++++++++++++---------------------- 3 files changed, 48 insertions(+), 66 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 6bcce26..ed7b0f7 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -167,20 +167,6 @@ static BOOL init_dib_info(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD return TRUE; } -BOOL init_dib_info_from_brush(dib_info *dib, const BITMAPINFO *bi, void *bits, UINT usage, HDC hdc) -{ - if (bi->bmiHeader.biClrUsed && usage == DIB_PAL_COLORS) - { - char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; - BITMAPINFO *info = (BITMAPINFO *)buffer; - - copy_bitmapinfo( info, bi ); - fill_color_table_from_pal_colors( info, hdc ); - return init_dib_info_from_bitmapinfo( dib, info, bits, private_color_table ); - } - return init_dib_info_from_bitmapinfo(dib, bi, bits, private_color_table ); -} - BOOL init_dib_info_from_bitmapinfo(dib_info *dib, const BITMAPINFO *info, void *bits, enum dib_info_flags flags) { return init_dib_info( dib, &info->bmiHeader, (const DWORD *)info->bmiColors, diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 2aa672d..d388f91 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -103,6 +103,7 @@ typedef struct dibdrv_physdev const BITMAPINFO *brush_pattern_info; void *brush_pattern_bits; UINT brush_pattern_usage; + HBITMAP brush_pattern_bitmap; BOOL (* brush_rects)(struct dibdrv_physdev *pdev, dib_info *dib, int num, const RECT *rects, HRGN clip); /* background */ @@ -226,7 +227,6 @@ extern void get_rop_codes(INT rop, struct rop_codes *codes) DECLSPEC_HIDDEN; extern void calc_and_xor_masks(INT rop, DWORD color, DWORD *and, DWORD *xor) DECLSPEC_HIDDEN; extern void update_brush_rop( dibdrv_physdev *pdev, INT rop ) DECLSPEC_HIDDEN; extern void reset_dash_origin(dibdrv_physdev *pdev) DECLSPEC_HIDDEN; -extern BOOL init_dib_info_from_brush(dib_info *dib, const BITMAPINFO *bi, void *bits, UINT usage, HDC hdc) DECLSPEC_HIDDEN; extern BOOL init_dib_info_from_bitmapinfo(dib_info *dib, const BITMAPINFO *info, void *bits, enum dib_info_flags flags) DECLSPEC_HIDDEN; extern BOOL init_dib_info_from_bitmapobj(dib_info *dib, BITMAPOBJ *bmp, enum dib_info_flags flags) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 14f1260..9ab3bcd 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1468,35 +1468,62 @@ static BOOL matching_pattern_format( dib_info *dib, dib_info *pattern ) return TRUE; } -static void select_pattern_brush( dibdrv_physdev *pdev, dib_info *pattern ) +static BOOL select_pattern_brush( dibdrv_physdev *pdev ) { + char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *info = (BITMAPINFO *)buffer; RECT rect; + dib_info pattern; + + if (!pdev->brush_pattern_info) + { + BITMAPOBJ *bmp = GDI_GetObjPtr( pdev->brush_pattern_bitmap, OBJ_BITMAP ); + BOOL ret; + + if (!bmp) return FALSE; + ret = init_dib_info_from_bitmapobj( &pattern, bmp, 0 ); + GDI_ReleaseObj( pdev->brush_pattern_bitmap ); + if (!ret) return FALSE; + } + else if (pdev->brush_pattern_info->bmiHeader.biClrUsed && pdev->brush_pattern_usage == DIB_PAL_COLORS) + { + copy_bitmapinfo( info, pdev->brush_pattern_info ); + fill_color_table_from_pal_colors( info, pdev->dev.hdc ); + init_dib_info_from_bitmapinfo( &pattern, info, pdev->brush_pattern_bits, 0 ); + } + else + { + init_dib_info_from_bitmapinfo( &pattern, pdev->brush_pattern_info, pdev->brush_pattern_bits, 0 ); + } - free_pattern_brush( pdev ); copy_dib_color_info(&pdev->brush_dib, &pdev->dib); - pdev->brush_dib.height = pattern->height; - pdev->brush_dib.width = pattern->width; + pdev->brush_dib.height = pattern.height; + pdev->brush_dib.width = pattern.width; pdev->brush_dib.stride = get_dib_stride( pdev->brush_dib.width, pdev->brush_dib.bit_count ); - if (matching_pattern_format( &pdev->brush_dib, pattern )) + if (matching_pattern_format( &pdev->brush_dib, &pattern )) { - pdev->brush_dib.bits.ptr = pattern->bits.ptr; + pdev->brush_dib.bits.ptr = pattern.bits.ptr; pdev->brush_dib.bits.is_copy = FALSE; pdev->brush_dib.bits.free = NULL; - return; } + else + { + pdev->brush_dib.bits.ptr = HeapAlloc( GetProcessHeap(), 0, + pdev->brush_dib.height * pdev->brush_dib.stride ); + pdev->brush_dib.bits.is_copy = TRUE; + pdev->brush_dib.bits.free = free_heap_bits; - pdev->brush_dib.bits.ptr = HeapAlloc( GetProcessHeap(), 0, - pdev->brush_dib.height * pdev->brush_dib.stride ); - pdev->brush_dib.bits.is_copy = TRUE; - pdev->brush_dib.bits.free = free_heap_bits; + rect.left = rect.top = 0; + rect.right = pattern.width; + rect.bottom = pattern.height; - rect.left = rect.top = 0; - rect.right = pattern->width; - rect.bottom = pattern->height; + pdev->brush_dib.funcs->convert_to(&pdev->brush_dib, &pattern, &rect); + } - pdev->brush_dib.funcs->convert_to(&pdev->brush_dib, pattern, &rect); + free_dib_info( &pattern ); + return TRUE; } /********************************************************************** @@ -1516,15 +1543,8 @@ static BOOL pattern_brush(dibdrv_physdev *pdev, dib_info *dib, int num, const RE switch(pdev->brush_style) { case BS_DIBPATTERN: - if (pdev->brush_pattern_usage == DIB_PAL_COLORS) - { - dib_info pattern; - if (!init_dib_info_from_brush( &pattern, pdev->brush_pattern_info, - pdev->brush_pattern_bits, DIB_PAL_COLORS, pdev->dev.hdc )) - return FALSE; - select_pattern_brush( pdev, &pattern ); - free_dib_info( &pattern ); - } + if (!pdev->brush_dib.bits.ptr && !select_pattern_brush( pdev )) + return FALSE; if(!create_pattern_brush_bits(pdev)) return FALSE; break; @@ -1582,7 +1602,7 @@ static BOOL pattern_brush(dibdrv_physdev *pdev, dib_info *dib, int num, const RE /* we need to recompute the bits each time for DIB_PAL_COLORS */ if (pdev->brush_style == BS_DIBPATTERN && pdev->brush_pattern_usage == DIB_PAL_COLORS) - free_pattern_brush_bits( pdev ); + free_pattern_brush( pdev ); return TRUE; } @@ -1614,38 +1634,14 @@ HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, HBITMAP bitmap, if (bitmap || info) /* pattern brush */ { - dib_info pattern; - BOOL ret; - - if (!info) - { - BITMAPOBJ *bmp = GDI_GetObjPtr( bitmap, OBJ_BITMAP ); - - if (!bmp) return 0; - ret = init_dib_info_from_bitmapobj( &pattern, bmp, 0 ); - GDI_ReleaseObj( bitmap ); - if (!ret) return 0; - select_pattern_brush( pdev, &pattern ); - free_dib_info( &pattern ); - } - else if (usage != DIB_PAL_COLORS) - { - if (!init_dib_info_from_brush( &pattern, info, bits, DIB_RGB_COLORS, 0 )) return 0; - select_pattern_brush( pdev, &pattern ); - free_dib_info( &pattern ); - } - else - { - /* brush is actually selected only when it's used */ - free_pattern_brush( pdev ); - } - pdev->brush_rects = pattern_brush; pdev->brush_style = BS_DIBPATTERN; pdev->brush_pattern_info = info; pdev->brush_pattern_bits = bits; pdev->brush_pattern_usage = usage; + pdev->brush_pattern_bitmap = bitmap; pdev->defer &= ~DEFER_BRUSH; + free_pattern_brush( pdev ); /* brush is actually selected only when it's used */ return next->funcs->pSelectBrush( next, hbrush, bitmap, info, bits, usage ); }

1 0

Alexandre Julliard : gdi32: Add a flag to request a default color table from init_dib_info.
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: d353c95d474e9891dcfc6000620add57b08c23c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d353c95d474e9891dcfc60006… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 11:44:11 2011 +0100 gdi32: Add a flag to request a default color table from init_dib_info. --- dlls/gdi32/bitblt.c | 14 -------------- dlls/gdi32/dib.c | 1 - dlls/gdi32/dibdrv/bitblt.c | 5 ++--- dlls/gdi32/dibdrv/dc.c | 19 +++++++++++-------- dlls/gdi32/dibdrv/dibdrv.h | 3 ++- 5 files changed, 15 insertions(+), 27 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 7167c4a..1638f46 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -321,20 +321,6 @@ BOOL nulldrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, err = dst_dev->funcs->pBlendImage( dst_dev, dst_info, &bits, src, dst, func ); if (err == ERROR_BAD_FORMAT) { - /* 1-bpp source without a color table uses black & white */ - if (src_info->bmiHeader.biBitCount == 1 && !src_info->bmiHeader.biClrUsed) - { - src_info->bmiColors[0].rgbRed = 0; - src_info->bmiColors[0].rgbGreen = 0; - src_info->bmiColors[0].rgbBlue = 0; - src_info->bmiColors[0].rgbReserved = 0; - src_info->bmiColors[1].rgbRed = 0xff; - src_info->bmiColors[1].rgbGreen = 0xff; - src_info->bmiColors[1].rgbBlue = 0xff; - src_info->bmiColors[1].rgbReserved = 0; - src_info->bmiHeader.biClrUsed = 2; - } - err = convert_bits( src_info, src, dst_info, &bits, TRUE ); if (!err) err = dst_dev->funcs->pBlendImage( dst_dev, dst_info, &bits, src, dst, func ); } diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 4d2ece9..d97b30f 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1155,7 +1155,6 @@ void get_ddb_bitmapinfo( BITMAPOBJ *bmp, BITMAPINFO *info ) info->bmiHeader.biYPelsPerMeter = 0; info->bmiHeader.biClrUsed = 0; info->bmiHeader.biClrImportant = 0; - if (info->bmiHeader.biBitCount <= 8) fill_default_color_table( info ); } BITMAPINFO *copy_packed_dib( const BITMAPINFO *src_info, UINT usage ) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index 28e2fac..24ae1b2 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -927,7 +927,6 @@ static BOOL matching_color_info( const dib_info *dib, const BITMAPINFO *info ) case 8: { RGBQUAD *color_table = (RGBQUAD *)((char *)info + info->bmiHeader.biSize); - if (!info->bmiHeader.biClrUsed) return FALSE; if (dib->color_table_size != info->bmiHeader.biClrUsed) return FALSE; return !memcmp( color_table, dib->color_table, dib->color_table_size * sizeof(RGBQUAD) ); } @@ -1327,7 +1326,7 @@ DWORD blend_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bitbl if (!init_dib_info_from_bitmapinfo( &src_dib, src_info, src_bits, 0 ) ) return ERROR_BAD_FORMAT; - if (!init_dib_info_from_bitmapinfo( &dst_dib, dst_info, dst_bits, 0 ) ) + if (!init_dib_info_from_bitmapinfo( &dst_dib, dst_info, dst_bits, default_color_table ) ) return ERROR_BAD_FORMAT; return blend_rect( &dst_dib, &dst->visrect, &src_dib, &src->visrect, NULL, blend ); @@ -1345,7 +1344,7 @@ DWORD gradient_bitmapinfo( const BITMAPINFO *info, void *bits, TRIVERTEX *vert_a DWORD ret = ERROR_SUCCESS; HRGN tmp_rgn = 0; - if (!init_dib_info_from_bitmapinfo( &dib, info, bits, 0 )) return ERROR_BAD_FORMAT; + if (!init_dib_info_from_bitmapinfo( &dib, info, bits, default_color_table )) return ERROR_BAD_FORMAT; switch (mode) { diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 2f06d62..6bcce26 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -153,6 +153,11 @@ static BOOL init_dib_info(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD dib->color_table = color_table; dib->color_table_size = bi->biClrUsed; } + else if (flags & default_color_table) + { + dib->color_table = (RGBQUAD *)get_default_color_table( dib->bit_count ); + dib->color_table_size = dib->color_table ? (1 << dib->bit_count) : 0; + } else { dib->color_table = NULL; @@ -186,10 +191,9 @@ BOOL init_dib_info_from_bitmapobj(dib_info *dib, BITMAPOBJ *bmp, enum dib_info_f { if (!bmp->dib) { - char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; - BITMAPINFO *info = (BITMAPINFO *)buffer; + BITMAPINFO info; - get_ddb_bitmapinfo( bmp, info ); + get_ddb_bitmapinfo( bmp, &info ); if (!bmp->bitmap.bmBits) { int width_bytes = get_dib_stride( bmp->bitmap.bmWidth, bmp->bitmap.bmBitsPixel ); @@ -197,8 +201,7 @@ BOOL init_dib_info_from_bitmapobj(dib_info *dib, BITMAPOBJ *bmp, enum dib_info_f bmp->bitmap.bmHeight * width_bytes ); if (!bmp->bitmap.bmBits) return FALSE; } - return init_dib_info_from_bitmapinfo( dib, info, bmp->bitmap.bmBits, - flags | private_color_table ); + return init_dib_info_from_bitmapinfo( dib, &info, bmp->bitmap.bmBits, flags ); } return init_dib_info( dib, &bmp->dib->dsBmih, bmp->dib->dsBitfields, bmp->color_table, bmp->dib->dsBm.bmBits, flags ); @@ -261,9 +264,9 @@ DWORD convert_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bit dib_info src_dib, dst_dib; DWORD ret; - if ( !init_dib_info_from_bitmapinfo( &src_dib, src_info, src_bits, 0 ) ) + if ( !init_dib_info_from_bitmapinfo( &src_dib, src_info, src_bits, default_color_table ) ) return ERROR_BAD_FORMAT; - if ( !init_dib_info_from_bitmapinfo( &dst_dib, dst_info, dst_bits, 0 ) ) + if ( !init_dib_info_from_bitmapinfo( &dst_dib, dst_info, dst_bits, default_color_table ) ) return ERROR_BAD_FORMAT; __TRY @@ -405,7 +408,7 @@ static HBITMAP dibdrv_SelectBitmap( PHYSDEV dev, HBITMAP bitmap ) free_dib_info(&pdev->dib); pdev->defer = 0; - if(!init_dib_info_from_bitmapobj(&pdev->dib, bmp, 0)) + if(!init_dib_info_from_bitmapobj(&pdev->dib, bmp, default_color_table)) pdev->defer |= DEFER_FORMAT; GDI_ReleaseObj( bitmap ); diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 6f01a5e..2aa672d 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -20,7 +20,8 @@ enum dib_info_flags { - private_color_table = 1 + private_color_table = 1, + default_color_table = 2 }; typedef struct

1 0

Alexandre Julliard : gdi32: Use the default DIB color table to create system and halftone palettes.
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: c5895ead6a778ecee4dd31f1549d6b730146a970 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5895ead6a778ecee4dd31f15… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 11:16:59 2011 +0100 gdi32: Use the default DIB color table to create system and halftone palettes. --- dlls/gdi32/palette.c | 151 +++++++++----------------------------------- dlls/gdi32/tests/palette.c | 39 +++++++++++ 2 files changed, 70 insertions(+), 120 deletions(-) diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index f172897..338d860 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -72,40 +72,6 @@ static UINT SystemPaletteUse = SYSPAL_STATIC; /* currently not considered */ static HPALETTE hPrimaryPalette = 0; /* used for WM_PALETTECHANGED */ static HPALETTE hLastRealizedPalette = 0; /* UnrealizeObject() needs it */ -#define NB_RESERVED_COLORS 20 /* number of fixed colors in system palette */ - -static const PALETTEENTRY sys_pal_template[NB_RESERVED_COLORS] = -{ - /* first 10 entries in the system palette */ - /* red green blue flags */ - { 0x00, 0x00, 0x00, 0 }, - { 0x80, 0x00, 0x00, 0 }, - { 0x00, 0x80, 0x00, 0 }, - { 0x80, 0x80, 0x00, 0 }, - { 0x00, 0x00, 0x80, 0 }, - { 0x80, 0x00, 0x80, 0 }, - { 0x00, 0x80, 0x80, 0 }, - { 0xc0, 0xc0, 0xc0, 0 }, - { 0xc0, 0xdc, 0xc0, 0 }, - { 0xa6, 0xca, 0xf0, 0 }, - - /* ... c_min/2 dynamic colorcells */ - - /* ... gap (for sparse palettes) */ - - /* ... c_min/2 dynamic colorcells */ - - { 0xff, 0xfb, 0xf0, 0 }, - { 0xa0, 0xa0, 0xa4, 0 }, - { 0x80, 0x80, 0x80, 0 }, - { 0xff, 0x00, 0x00, 0 }, - { 0x00, 0xff, 0x00, 0 }, - { 0xff, 0xff, 0x00, 0 }, - { 0x00, 0x00, 0xff, 0 }, - { 0xff, 0x00, 0xff, 0 }, - { 0x00, 0xff, 0xff, 0 }, - { 0xff, 0xff, 0xff, 0 } /* last 10 */ -}; /*********************************************************************** * PALETTE_Init @@ -114,21 +80,30 @@ static const PALETTEENTRY sys_pal_template[NB_RESERVED_COLORS] = */ HPALETTE PALETTE_Init(void) { - HPALETTE hpalette; - LOGPALETTE * palPtr; + const RGBQUAD *entries = get_default_color_table( 8 ); + char buffer[FIELD_OFFSET( LOGPALETTE, palPalEntry[20] )]; + LOGPALETTE *palPtr = (LOGPALETTE *)buffer; + int i; /* create default palette (20 system colors) */ - palPtr = HeapAlloc( GetProcessHeap(), 0, - sizeof(LOGPALETTE) + (NB_RESERVED_COLORS-1)*sizeof(PALETTEENTRY)); - if (!palPtr) return FALSE; - palPtr->palVersion = 0x300; - palPtr->palNumEntries = NB_RESERVED_COLORS; - memcpy( palPtr->palPalEntry, sys_pal_template, sizeof(sys_pal_template) ); - hpalette = CreatePalette( palPtr ); - HeapFree( GetProcessHeap(), 0, palPtr ); - return hpalette; + palPtr->palNumEntries = 20; + for (i = 0; i < 10; i++) + { + palPtr->palPalEntry[i].peRed = entries[i].rgbRed; + palPtr->palPalEntry[i].peGreen = entries[i].rgbGreen; + palPtr->palPalEntry[i].peBlue = entries[i].rgbBlue; + palPtr->palPalEntry[i].peFlags = 0; + } + for (i = 10; i < 20; i++) + { + palPtr->palPalEntry[i].peRed = entries[236 + i].rgbRed; + palPtr->palPalEntry[i].peGreen = entries[236 + i].rgbGreen; + palPtr->palPalEntry[i].peBlue = entries[236 + i].rgbBlue; + palPtr->palPalEntry[i].peFlags = 0; + } + return CreatePalette( palPtr ); } @@ -151,8 +126,6 @@ HPALETTE WINAPI CreatePalette( if (!palette) return 0; TRACE("entries=%i\n", palette->palNumEntries); - size = sizeof(LOGPALETTE) + (palette->palNumEntries - 1) * sizeof(PALETTEENTRY); - if (!(palettePtr = HeapAlloc( GetProcessHeap(), 0, sizeof(*palettePtr) ))) return 0; palettePtr->unrealize = NULL; palettePtr->version = palette->palVersion; @@ -191,83 +164,21 @@ HPALETTE WINAPI CreatePalette( HPALETTE WINAPI CreateHalftonePalette( HDC hdc) /* [in] Handle to device context */ { + const RGBQUAD *entries = get_default_color_table( 8 ); + char buffer[FIELD_OFFSET( LOGPALETTE, palPalEntry[256] )]; + LOGPALETTE *pal = (LOGPALETTE *)buffer; int i; - struct { - WORD Version; - WORD NumberOfEntries; - PALETTEENTRY aEntries[256]; - } Palette; - - Palette.Version = 0x300; - Palette.NumberOfEntries = 256; - GetSystemPaletteEntries(hdc, 0, 256, Palette.aEntries); - - Palette.NumberOfEntries = 20; - for (i = 0; i < Palette.NumberOfEntries; i++) + pal->palVersion = 0x300; + pal->palNumEntries = 256; + for (i = 0; i < 256; i++) { - Palette.aEntries[i].peRed=0xff; - Palette.aEntries[i].peGreen=0xff; - Palette.aEntries[i].peBlue=0xff; - Palette.aEntries[i].peFlags=0x00; + pal->palPalEntry[i].peRed = entries[i].rgbRed; + pal->palPalEntry[i].peGreen = entries[i].rgbGreen; + pal->palPalEntry[i].peBlue = entries[i].rgbBlue; + pal->palPalEntry[i].peFlags = 0; } - - Palette.aEntries[0].peRed=0x00; - Palette.aEntries[0].peBlue=0x00; - Palette.aEntries[0].peGreen=0x00; - - /* the first 6 */ - for (i=1; i <= 6; i++) - { - Palette.aEntries[i].peRed=(i%2)?0x80:0; - Palette.aEntries[i].peGreen=(i==2)?0x80:(i==3)?0x80:(i==6)?0x80:0; - Palette.aEntries[i].peBlue=(i>3)?0x80:0; - } - - for (i=7; i <= 12; i++) - { - switch(i) - { - case 7: - Palette.aEntries[i].peRed=0xc0; - Palette.aEntries[i].peBlue=0xc0; - Palette.aEntries[i].peGreen=0xc0; - break; - case 8: - Palette.aEntries[i].peRed=0xc0; - Palette.aEntries[i].peGreen=0xdc; - Palette.aEntries[i].peBlue=0xc0; - break; - case 9: - Palette.aEntries[i].peRed=0xa6; - Palette.aEntries[i].peGreen=0xca; - Palette.aEntries[i].peBlue=0xf0; - break; - case 10: - Palette.aEntries[i].peRed=0xff; - Palette.aEntries[i].peGreen=0xfb; - Palette.aEntries[i].peBlue=0xf0; - break; - case 11: - Palette.aEntries[i].peRed=0xa0; - Palette.aEntries[i].peGreen=0xa0; - Palette.aEntries[i].peBlue=0xa4; - break; - case 12: - Palette.aEntries[i].peRed=0x80; - Palette.aEntries[i].peGreen=0x80; - Palette.aEntries[i].peBlue=0x80; - } - } - - for (i=13; i <= 18; i++) - { - Palette.aEntries[i].peRed=(i%2)?0xff:0; - Palette.aEntries[i].peGreen=(i==14)?0xff:(i==15)?0xff:(i==18)?0xff:0; - Palette.aEntries[i].peBlue=(i>15)?0xff:0x00; - } - - return CreatePalette((LOGPALETTE *)&Palette); + return CreatePalette( pal ); } diff --git a/dlls/gdi32/tests/palette.c b/dlls/gdi32/tests/palette.c index 039be59..4f14d7a 100644 --- a/dlls/gdi32/tests/palette.c +++ b/dlls/gdi32/tests/palette.c @@ -144,8 +144,47 @@ static void test_palette_entries(void) ok( palEntry.peFlags == getEntryResult.peFlags, "palEntry.peFlags (%#x) != getEntryResult.peFlags (%#x)\n", palEntry.peFlags, getEntryResult.peFlags ); } +static void test_halftone_palette(void) +{ + HDC hdc; + HPALETTE pal; + PALETTEENTRY entries[256]; + PALETTEENTRY defpal[20]; + int i, count; + + hdc = GetDC(0); + + count = GetPaletteEntries( GetStockObject(DEFAULT_PALETTE), 0, 20, defpal ); + ok( count == 20, "wrong size %u\n", count ); + + pal = CreateHalftonePalette( hdc ); + count = GetPaletteEntries( pal, 0, 256, entries ); + ok( count == 256 || broken(count == 20), /* nt 4 */ + "wrong size %u\n", count ); + + /* first and last 10 match the default palette */ + for (i = 0; i < 10; i++) + ok( entries[i].peRed == defpal[i].peRed && + entries[i].peGreen == defpal[i].peGreen && + entries[i].peBlue == defpal[i].peBlue && + !entries[i].peFlags, + "%u: wrong color %02x,%02x,%02x,%02x\n", i, + entries[i].peRed, entries[i].peGreen, entries[i].peBlue, entries[i].peFlags ); + for (i = count - 10; i < count; i++) + ok( entries[i].peRed == defpal[i - count + 20].peRed && + entries[i].peGreen == defpal[i - count + 20].peGreen && + entries[i].peBlue == defpal[i - count + 20].peBlue && + !entries[i].peFlags, + "%u: wrong color %02x,%02x,%02x,%02x\n", i, + entries[i].peRed, entries[i].peGreen, entries[i].peBlue, entries[i].peFlags ); + + DeleteObject( pal ); + ReleaseDC( 0, hdc ); +} + START_TEST(palette) { test_DIB_PAL_COLORS(); test_palette_entries(); + test_halftone_palette(); }

1 0

Alexandre Julliard : gdi32: Store the default color tables as static data.
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: 3a9cabb8c4a72cf9e1247dfbf29d070b573d3eb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a9cabb8c4a72cf9e1247dfbf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 8 17:03:28 2011 +0100 gdi32: Store the default color tables as static data. --- dlls/gdi32/dib.c | 150 ++++++++++++++++++++++++++++------------------ dlls/gdi32/gdi_private.h | 1 + 2 files changed, 93 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3a9cabb8c4a72cf9e1247…

1 0

Alexandre Julliard : gdi32: GetCharABCWidthsFloatW must succeed with non-TrueType fonts.
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: 27eb63b0829d5d38ed4b0ed99d240db872620d09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27eb63b0829d5d38ed4b0ed99… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 11:14:09 2011 +0100 gdi32: GetCharABCWidthsFloatW must succeed with non-TrueType fonts. --- dlls/gdi32/font.c | 9 +++++++++ dlls/gdi32/freetype.c | 3 --- dlls/gdi32/tests/font.c | 14 +++++++++++++- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 0d308b0..d2dfd44 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2656,6 +2656,7 @@ BOOL WINAPI GetCharABCWidthsW( HDC hdc, UINT firstChar, UINT lastChar, PHYSDEV dev; unsigned int i; BOOL ret; + TEXTMETRICW tm; if (!dc) return FALSE; @@ -2665,6 +2666,14 @@ BOOL WINAPI GetCharABCWidthsW( HDC hdc, UINT firstChar, UINT lastChar, return FALSE; } + /* unlike GetCharABCWidthsFloatW, this one is supposed to fail on non-TrueType fonts */ + dev = GET_DC_PHYSDEV( dc, pGetTextMetrics ); + if (!dev->funcs->pGetTextMetrics( dev, &tm ) || !(tm.tmPitchAndFamily & TMPF_TRUETYPE)) + { + release_dc_ptr( dc ); + return FALSE; + } + dev = GET_DC_PHYSDEV( dc, pGetCharABCWidths ); ret = dev->funcs->pGetCharABCWidths( dev, firstChar, lastChar, abc ); if (ret) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 3a1ae99..959f4aa 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6416,9 +6416,6 @@ static BOOL freetype_GetCharABCWidths( PHYSDEV dev, UINT firstChar, UINT lastCha TRACE("%p, %d, %d, %p\n", physdev->font, firstChar, lastChar, buffer); - if(!FT_IS_SCALABLE(physdev->font->ft_face)) - return FALSE; - GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 30296a5..cc34fed 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -41,6 +41,7 @@ static DWORD (WINAPI *pGdiGetCodePage)(HDC hdc); static BOOL (WINAPI *pGetCharABCWidthsI)(HDC hdc, UINT first, UINT count, LPWORD glyphs, LPABC abc); static BOOL (WINAPI *pGetCharABCWidthsA)(HDC hdc, UINT first, UINT last, LPABC abc); static BOOL (WINAPI *pGetCharABCWidthsW)(HDC hdc, UINT first, UINT last, LPABC abc); +static BOOL (WINAPI *pGetCharABCWidthsFloatW)(HDC hdc, UINT first, UINT last, LPABCFLOAT abc); static DWORD (WINAPI *pGetFontUnicodeRanges)(HDC hdc, LPGLYPHSET lpgs); static DWORD (WINAPI *pGetGlyphIndicesA)(HDC hdc, LPCSTR lpstr, INT count, LPWORD pgi, DWORD flags); static DWORD (WINAPI *pGetGlyphIndicesW)(HDC hdc, LPCWSTR lpstr, INT count, LPWORD pgi, DWORD flags); @@ -63,6 +64,7 @@ static void init(void) pGetCharABCWidthsI = (void *)GetProcAddress(hgdi32, "GetCharABCWidthsI"); pGetCharABCWidthsA = (void *)GetProcAddress(hgdi32, "GetCharABCWidthsA"); pGetCharABCWidthsW = (void *)GetProcAddress(hgdi32, "GetCharABCWidthsW"); + pGetCharABCWidthsFloatW = (void *)GetProcAddress(hgdi32, "GetCharABCWidthsFloatW"); pGetFontUnicodeRanges = (void *)GetProcAddress(hgdi32, "GetFontUnicodeRanges"); pGetGlyphIndicesA = (void *)GetProcAddress(hgdi32, "GetGlyphIndicesA"); pGetGlyphIndicesW = (void *)GetProcAddress(hgdi32, "GetGlyphIndicesW"); @@ -936,6 +938,7 @@ static void test_GetCharABCWidths(void) LOGFONTA lf; HFONT hfont; ABC abc[1]; + ABCFLOAT abcf[1]; WORD glyphs[1]; DWORD nb; static const struct @@ -973,7 +976,7 @@ static void test_GetCharABCWidths(void) }; UINT i; - if (!pGetCharABCWidthsA || !pGetCharABCWidthsW || !pGetCharABCWidthsI) + if (!pGetCharABCWidthsA || !pGetCharABCWidthsW || !pGetCharABCWidthsFloatW || !pGetCharABCWidthsI) { win_skip("GetCharABCWidthsA/W/I not available on this platform\n"); return; @@ -1008,6 +1011,15 @@ static void test_GetCharABCWidths(void) ret = pGetCharABCWidthsW(hdc, 'a', 'a', abc); ok(!ret, "GetCharABCWidthsW should have failed\n"); + ret = pGetCharABCWidthsFloatW(NULL, 'a', 'a', abcf); + ok(!ret, "GetCharABCWidthsFloatW should have failed\n"); + + ret = pGetCharABCWidthsFloatW(hdc, 'a', 'a', NULL); + ok(!ret, "GetCharABCWidthsFloatW should have failed\n"); + + ret = pGetCharABCWidthsFloatW(hdc, 'a', 'a', abcf); + ok(ret, "GetCharABCWidthsFloatW should have succeeded\n"); + hfont = SelectObject(hdc, hfont); DeleteObject(hfont);

1 0

Dmitry Timoshkov : user32: Strip WS_CAPTION|WS_SYSMENU when a dialog has DS_CONTROL style set.
by Alexandre Julliard 12 Dec '11

12 Dec '11

1 0

Eric Pouech : d3d: Fixed a couple of warnings for 64bit targets.
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: 1d3952ed9f6885784b4f97b11a01a68dcbf9d205 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d3952ed9f6885784b4f97b11… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Dec 11 15:05:08 2011 +0100 d3d: Fixed a couple of warnings for 64bit targets. --- dlls/d3d8/tests/device.c | 2 +- dlls/d3d9/tests/device.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 6467858..bf4e1ea 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -893,7 +893,7 @@ static void test_cursor_pos(void) flush_events(); ok(!expect_pos->x && !expect_pos->y, "Didn't receive MOUSEMOVE %u (%d, %d).\n", - expect_pos - points, expect_pos->x, expect_pos->y); + (unsigned)(expect_pos - points), expect_pos->x, expect_pos->y); refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index abd3685..e3767bb 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3237,7 +3237,7 @@ static void test_cursor_pos(void) flush_events(); ok(!expect_pos->x && !expect_pos->y, "Didn't receive MOUSEMOVE %u (%d, %d).\n", - expect_pos - points, expect_pos->x, expect_pos->y); + (unsigned)(expect_pos - points), expect_pos->x, expect_pos->y); refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Hwang YunSong : po: Updated Korean translation.
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: 8985c5339754e2049976a18d9f05da1b8f45ed9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8985c5339754e2049976a18d9… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Sun Dec 11 23:27:07 2011 +0900 po: Updated Korean translation. --- po/ko.po | 92 +++++++++++++++++++++++++++++--------------------------------- 1 files changed, 43 insertions(+), 49 deletions(-) diff --git a/po/ko.po b/po/ko.po index 80b7cf4..042c600 100644 --- a/po/ko.po +++ b/po/ko.po @@ -114,7 +114,6 @@ msgid "Wine Gecko Installer" msgstr "Wine Gecko 설치관리자" #: appwiz.rc:100 -#, fuzzy msgid "" "Wine could not find a Gecko package which is needed for applications " "embedding HTML to work correctly. Wine can automatically download and " @@ -124,13 +123,13 @@ msgid "" "href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> for " "details." msgstr "" -"Wine은 HTML 임베딩 프로그램이 정상적으로 작동하기 위해서 필요로 하는 Gecko 패" -"키지를 찾을 수 없습니다. WIne은 당신을 위해 자동으로 다운로드하고 설치할 것입" -"니다.\n" -"\n" +"Wine은 HTML 임베딩 프로그램이 정상적으로 작동하기 위해서 필요로 하는 Gecko 키" +"지를 찾을 수 없습니다. Wine은 당신을 위해 자동으로 다운로드하고 설치할 것입니" +"다.\n" "\n" -"주위:당신의 배포판의 패키지를 대신 사용하는 것을 추천합니다. 자세한 것은 " -"http://wiki.winehq.org/Gecko를 보십시오." +"주위:당신의 배포판의 패키지를 대신 사용하는 것을 추천합니다. 자세한 것은 <a " +"href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> 보십시" +"오." #: appwiz.rc:106 msgid "&Install" @@ -2205,7 +2204,6 @@ msgid "Welcome to the Certificate Import Wizard" msgstr "인증서 가져오기 마법사에 온 것을 환영합니다" #: cryptui.rc:283 -#, fuzzy msgid "" "This wizard helps you import certificates, certificate revocation lists, and " "certificate trust lists from a file to a certificate store.\n" @@ -2217,9 +2215,14 @@ msgid "" "\n" "To continue, click Next." msgstr "" +"이 마법사는 당신이 인증서,인증서 폐기 목록을 가져오는 데 도움을 주고,파일에" +"서 인증서 신뢰 목록을 인증서 저장소으로 가져오는 데도 도움을 줍니다.\n" +"\n" "이 인증서는 당신이나 당신이 통신에 사용하는 컴퓨터를 신원보증하는 데 사용됩니" -"다. 또한 메세지에 사인하고 인증하는 데도 사용됩니다. 인증서 보관소는 인증" -"서, 인증서 파기 목록, 인증서 신뢰 목록의 저장소입니다." +"다. 또한 메세지에 사인하고 인증하는 데도 사용됩니다.인증서 보관소는 인증서, " +"인증서 파기 목록, 인증서 신뢰 목록의저장소입니다.\n" +"\n" +"계속하려면,다음을 클릭하십시오." #: cryptui.rc:291 cryptui.rc:427 msgid "&File name:" @@ -2334,7 +2337,6 @@ msgid "Welcome to the Certificate Export Wizard" msgstr "인증서 내보내기 마법사에 오신 것을 환영합니다" #: cryptui.rc:373 -#, fuzzy msgid "" "This wizard helps you export certificates, certificate revocation lists, and " "certificate trust lists from a certificate store to a file.\n" @@ -2346,9 +2348,15 @@ msgid "" "\n" "To continue, click Next." msgstr "" +"이 마법사는 당신이 인증서,인증서 폐기 목록을 내보오는 데 도움을 주고,인증서 " +"신뢰 목록을 인증서 저장소의 인증서 신뢰 목록을 파일로 내보내는 데도 도움을 줍" +"니다.\n" +"\n" "이 인증서는 당신이나 당신이 통신에 사용하는 컴퓨터를 신원보증하는 데 사용됩니" -"다. 또한 메세지에 사인하고 인증하는 데도 사용됩니다. 인증서 보관소는 인증" -"서, 인증서 파기 목록, 인증서 신뢰 목록의 저장소입니다." +"다. 또한 메세지에 사인하고 인증하는 데도 사용됩니다.인증서 보관소는 인증서, " +"인증서 파기 목록, 인증서 신뢰 목록의저장소입니다.\n" +"\n" +"계속 하려면, 다음을 클릭하십시오." #: cryptui.rc:381 msgid "" @@ -2990,9 +2998,8 @@ msgid "Mapping" msgstr "매핑" #: dinput.rc:53 -#, fuzzy msgid "Show Assigned First" -msgstr "할당 정렬" +msgstr "우선 할당 보기" #: dinput.rc:34 msgid "Action" @@ -6761,9 +6768,8 @@ msgid "&Data Rate" msgstr "데이타 전송율(&D)" #: msvfw32.rc:52 -#, fuzzy msgid "kB/sec" -msgstr "KB/sec" +msgstr "킬로바이트/초" #: msvfw32.rc:25 msgid "Full Frames (Uncompressed)" @@ -7242,9 +7248,8 @@ msgid "us" msgstr "마이크로초" #: serialui.rc:25 -#, fuzzy msgid "Settings for %s" -msgstr "%s 속성" +msgstr "%s 설정" #: serialui.rc:28 msgid "Baud Rate" @@ -9836,19 +9841,16 @@ msgid "N" msgstr "아니오" #: cmd.rc:294 -#, fuzzy msgid "File association missing for extension %1\n" -msgstr "이 파일확장자 %s에 연결된 풀그림이 없습니다.\n" +msgstr "이 파일확장자 %1에 연결된 풀그림이 없습니다.\n" #: cmd.rc:295 -#, fuzzy msgid "No open command associated with file type '%1'\n" -msgstr "이 파일 형식 '%s'과 연결된 어떠한 명령도 없습니다.'\n" +msgstr "이 파일 형식 '%1'과 연결된 어떠한 명령도 없습니다.'\n" #: cmd.rc:296 -#, fuzzy msgid "Overwrite %1" -msgstr "%s 덮어쓰기" +msgstr "%1 덮어쓰기" #: cmd.rc:297 msgid "More..." @@ -9867,23 +9869,20 @@ msgid "Syntax error\n" msgstr "문법 오류\n" #: cmd.rc:303 -#, fuzzy msgid "No help available for %1\n" -msgstr "%s를 위한 어떠한 도움말도 찾을 수 없습니다\n" +msgstr "%1를 위한 어떠한 도움말도 찾을 수 없습니다\n" #: cmd.rc:304 msgid "Target to GOTO not found\n" msgstr "GOTO 타겟을 찾을 수 없습니다\n" #: cmd.rc:305 -#, fuzzy msgid "Current Date is %1\n" -msgstr "현재 날짜는 %s\n" +msgstr "현재 날짜는 %1임\n" #: cmd.rc:306 -#, fuzzy msgid "Current Time is %1\n" -msgstr "현재 시간은 %s\n" +msgstr "현재 시간은 %s임\n" #: cmd.rc:307 msgid "Enter new date: " @@ -9894,9 +9893,8 @@ msgid "Enter new time: " msgstr "새 시간 입력: " #: cmd.rc:309 -#, fuzzy msgid "Environment variable %1 not defined\n" -msgstr "환경 변수 %s 는 정의되지 않았습니다\n" +msgstr "환경 변수 %1 는 정의되지 않았습니다\n" #: cmd.rc:310 xcopy.rc:38 msgid "Failed to open '%1'\n" @@ -9912,19 +9910,16 @@ msgid "A" msgstr "A" #: cmd.rc:313 -#, fuzzy msgid "%1, Delete" -msgstr "%s, 삭제" +msgstr "%1, 삭제" #: cmd.rc:314 -#, fuzzy msgid "Echo is %1\n" -msgstr "에코(Echo)는 %s\n" +msgstr "에코(Echo)는 %1임\n" #: cmd.rc:315 -#, fuzzy msgid "Verify is %1\n" -msgstr "검증(Verify)은 %s\n" +msgstr "검증(Verify)은 %1임\n" #: cmd.rc:316 msgid "Verify must be ON or OFF\n" @@ -9935,15 +9930,14 @@ msgid "Parameter error\n" msgstr "매개변수 오류\n" #: cmd.rc:318 -#, fuzzy msgid "" "Volume in drive %1!c! is %2\n" "Volume Serial Number is %3!04x!-%4!04x!\n" "\n" msgstr "" -"%c 드라이브의 볼륨은 %s\n" -" 볼륨 시리얼 번호는 %04x-%04x\n" -"\n" +"드라이브 %1!c!의 볼륨은 %2임\n" +" 볼륨 시리얼 번호는 %3!04x!-%4!04x!\n" +"임\n" #: cmd.rc:319 msgid "Volume label (11 characters, ENTER for none)?" @@ -9962,9 +9956,8 @@ msgid "Wine Command Prompt" msgstr "Wine 명령 프롬프트" #: cmd.rc:323 -#, fuzzy msgid "CMD Version %1!S!\n" -msgstr "CMD 버젼 %s\n" +msgstr "CMD 버젼 %1!S!\n" #: cmd.rc:324 msgid "More? " @@ -13212,7 +13205,6 @@ msgstr "" "을 끼쳐드린 거에 대하여 유감을 표함니다." #: winedbg.rc:53 -#, fuzzy msgid "" "This can be caused by a problem in the program or a deficiency in Wine. You " "may want to check the <a href=\"http://appdb.winehq.org\">Application " @@ -13221,11 +13213,13 @@ msgid "" "If this problem is not present under Windows and has not been reported yet, " "you can <a href=\"http://wiki.winehq.org/Bugs\">file a bug report</a>." msgstr "" -"프로그램의 문제나 Wind의 결함으로 위해 발생할 수 있습니다. 당신은 실행한 프로" -"그램에 대하여 http://appdb.winehq.org 의 팁을 확인 할 수 있습니다. .\n" +"이 문제는 프로그램의 문제나 Wine의 결함으로 위해 발생할 수 있습니다. 당신은실" +"행한 프로그램에 대하여 <a href=\"http://appdb.winehq.org\">Application " +"Database</a> 에서 관련 팁을 살펴 볼 수 있습니다.\n" "\n" "만약 이 문제가 윈도우에서는 존재하지 않고, 아직 버그로 보고되지 않았으면 , 당" -"신은 http://bugs.winehq.org에 버그로 보고할 수 있습니다." +"신은 <a href=\"http://wiki.winehq.org/Bugs\">파일을 버그로 보고할 수 있습니다" +"</a>." #: winedbg.rc:35 msgid "Wine program crash"

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: 5d892e63e679a3d47b7a915a110878c4f5582432 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d892e63e679a3d47b7a915a1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 11 16:15:51 2011 +0300 po: Update Russian translation. --- po/ru.po | 248 ++++++++++++++++++++++++++++++-------------------------------- 1 files changed, 119 insertions(+), 129 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5d892e63e679a3d47b7a9…

1 0

← Newer
1
...
48
49
50
51
52
53
54
...
81
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 December 2011