October 2011 - Wine-Commits

Huw Davies : gdi32/tests: Remove the no longer used todo functionality of the test_color macro.
by Alexandre Julliard Oct. 19, 2011

Oct. 19, 2011

Module: wine Branch: master Commit: 6aece157a09b47f83a8344a66aa43b4c57f8e3ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=6aece157a09b47f83a8344a66… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 19 12:42:00 2011 +0100 gdi32/tests: Remove the no longer used todo functionality of the test_color macro. --- dlls/gdi32/tests/bitmap.c | 74 ++++++++++++++++++++------------------------- 1 files changed, 33 insertions(+), 41 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index f5fd5fd..e688835 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -338,21 +338,13 @@ static void test_dib_info(HBITMAP hbm, const void *bits, const BITMAPINFOHEADER ok(ret == 0, "%d != 0\n", ret); } -#define test_color_todo(got, exp, txt, todo) \ - if (!todo && got != exp && screen_depth < 24) { \ - todo_wine ok(0, #txt " failed at %d-bit screen depth: got 0x%06x expected 0x%06x - skipping DIB tests\n", \ - screen_depth, (UINT)got, (UINT)exp); \ - return; \ - } else if (todo) todo_wine { ok(got == exp, #txt " failed: got 0x%06x expected 0x%06x\n", (UINT)got, (UINT)exp); } \ - else ok(got == exp, #txt " failed: got 0x%06x expected 0x%06x\n", (UINT)got, (UINT)exp) \ - -#define test_color(hdc, color, exp, todo_setp, todo_getp) \ +#define test_color(hdc, color, exp) \ { \ COLORREF c; \ c = SetPixel(hdc, 0, 0, color); \ - test_color_todo(c, exp, SetPixel, todo_setp); \ + ok(c == exp, "SetPixel failed: got 0x%06x expected 0x%06x\n", c, (UINT)exp); \ c = GetPixel(hdc, 0, 0); \ - test_color_todo(c, exp, GetPixel, todo_getp); \ + ok(c == exp, "GetPixel failed: got 0x%06x expected 0x%06x\n", c, (UINT)exp); \ } static void test_dib_bits_access( HBITMAP hdib, void *bits ) @@ -580,19 +572,19 @@ static void test_dibsections(void) c0 = RGB(pbmi->bmiColors[0].rgbRed, pbmi->bmiColors[0].rgbGreen, pbmi->bmiColors[0].rgbBlue); c1 = RGB(pbmi->bmiColors[1].rgbRed, pbmi->bmiColors[1].rgbGreen, pbmi->bmiColors[1].rgbBlue); - test_color(hdcmem, DIBINDEX(0), c0, 0, 0); - test_color(hdcmem, DIBINDEX(1), c1, 0, 0); - test_color(hdcmem, DIBINDEX(2), c0, 0, 0); - test_color(hdcmem, PALETTEINDEX(0), c0, 0, 0); - test_color(hdcmem, PALETTEINDEX(1), c0, 0, 0); - test_color(hdcmem, PALETTEINDEX(2), c0, 0, 0); + test_color(hdcmem, DIBINDEX(0), c0); + test_color(hdcmem, DIBINDEX(1), c1); + test_color(hdcmem, DIBINDEX(2), c0); + test_color(hdcmem, PALETTEINDEX(0), c0); + test_color(hdcmem, PALETTEINDEX(1), c0); + test_color(hdcmem, PALETTEINDEX(2), c0); test_color(hdcmem, PALETTERGB(pbmi->bmiColors[0].rgbRed, pbmi->bmiColors[0].rgbGreen, - pbmi->bmiColors[0].rgbBlue), c0, 0, 0); + pbmi->bmiColors[0].rgbBlue), c0); test_color(hdcmem, PALETTERGB(pbmi->bmiColors[1].rgbRed, pbmi->bmiColors[1].rgbGreen, - pbmi->bmiColors[1].rgbBlue), c1, 0, 0); - test_color(hdcmem, PALETTERGB(0, 0, 0), c0, 0, 0); - test_color(hdcmem, PALETTERGB(0xff, 0xff, 0xff), c0, 0, 0); - test_color(hdcmem, PALETTERGB(0, 0, 0xfe), c1, 0, 0); + pbmi->bmiColors[1].rgbBlue), c1); + test_color(hdcmem, PALETTERGB(0, 0, 0), c0); + test_color(hdcmem, PALETTERGB(0xff, 0xff, 0xff), c0); + test_color(hdcmem, PALETTERGB(0, 0, 0xfe), c1); SelectObject(hdcmem, oldbm); DeleteObject(hdib); @@ -656,9 +648,9 @@ static void test_dibsections(void) for (i = 0; i < 256; i++) { test_color(hdcmem, DIBINDEX(i), - RGB(pbmi->bmiColors[i].rgbRed, pbmi->bmiColors[i].rgbGreen, pbmi->bmiColors[i].rgbBlue), 0, 0); + RGB(pbmi->bmiColors[i].rgbRed, pbmi->bmiColors[i].rgbGreen, pbmi->bmiColors[i].rgbBlue)); test_color(hdcmem, PALETTERGB(pbmi->bmiColors[i].rgbRed, pbmi->bmiColors[i].rgbGreen, pbmi->bmiColors[i].rgbBlue), - RGB(pbmi->bmiColors[i].rgbRed, pbmi->bmiColors[i].rgbGreen, pbmi->bmiColors[i].rgbBlue), 0, 0); + RGB(pbmi->bmiColors[i].rgbRed, pbmi->bmiColors[i].rgbGreen, pbmi->bmiColors[i].rgbBlue)); } SelectObject(hdcmem, oldbm); @@ -704,22 +696,22 @@ static void test_dibsections(void) c0 = RGB(plogpal->palPalEntry[0].peRed, plogpal->palPalEntry[0].peGreen, plogpal->palPalEntry[0].peBlue); c1 = RGB(plogpal->palPalEntry[1].peRed, plogpal->palPalEntry[1].peGreen, plogpal->palPalEntry[1].peBlue); - test_color(hdcmem, DIBINDEX(0), c0, 0, 0); - test_color(hdcmem, DIBINDEX(1), c1, 0, 0); - test_color(hdcmem, DIBINDEX(2), c0, 0, 0); - test_color(hdcmem, PALETTEINDEX(0), c0, 0, 0); - test_color(hdcmem, PALETTEINDEX(1), c1, 0, 0); - test_color(hdcmem, PALETTEINDEX(2), c0, 0, 0); + test_color(hdcmem, DIBINDEX(0), c0); + test_color(hdcmem, DIBINDEX(1), c1); + test_color(hdcmem, DIBINDEX(2), c0); + test_color(hdcmem, PALETTEINDEX(0), c0); + test_color(hdcmem, PALETTEINDEX(1), c1); + test_color(hdcmem, PALETTEINDEX(2), c0); test_color(hdcmem, PALETTERGB(plogpal->palPalEntry[0].peRed, plogpal->palPalEntry[0].peGreen, - plogpal->palPalEntry[0].peBlue), c0, 0, 0); + plogpal->palPalEntry[0].peBlue), c0); test_color(hdcmem, PALETTERGB(plogpal->palPalEntry[1].peRed, plogpal->palPalEntry[1].peGreen, - plogpal->palPalEntry[1].peBlue), c1, 0, 0); - test_color(hdcmem, PALETTERGB(0, 0, 0), c1, 0, 0); - test_color(hdcmem, PALETTERGB(0xff, 0xff, 0xff), c0, 0, 0); - test_color(hdcmem, PALETTERGB(0, 0, 0xfe), c0, 0, 0); - test_color(hdcmem, PALETTERGB(0, 1, 0), c1, 0, 0); - test_color(hdcmem, PALETTERGB(0x3f, 0, 0x3f), c1, 0, 0); - test_color(hdcmem, PALETTERGB(0x40, 0, 0x40), c0, 0, 0); + plogpal->palPalEntry[1].peBlue), c1); + test_color(hdcmem, PALETTERGB(0, 0, 0), c1); + test_color(hdcmem, PALETTERGB(0xff, 0xff, 0xff), c0); + test_color(hdcmem, PALETTERGB(0, 0, 0xfe), c0); + test_color(hdcmem, PALETTERGB(0, 1, 0), c1); + test_color(hdcmem, PALETTERGB(0x3f, 0, 0x3f), c1); + test_color(hdcmem, PALETTERGB(0x40, 0, 0x40), c0); /* Bottom and 2nd row from top green, everything else magenta */ bits[0] = bits[1] = 0xff; @@ -795,11 +787,11 @@ static void test_dibsections(void) for (i = 0; i < 256; i++) { test_color(hdcmem, DIBINDEX(i), - RGB(plogpal->palPalEntry[i].peRed, plogpal->palPalEntry[i].peGreen, plogpal->palPalEntry[i].peBlue), 0, 0); + RGB(plogpal->palPalEntry[i].peRed, plogpal->palPalEntry[i].peGreen, plogpal->palPalEntry[i].peBlue)); test_color(hdcmem, PALETTEINDEX(i), - RGB(plogpal->palPalEntry[i].peRed, plogpal->palPalEntry[i].peGreen, plogpal->palPalEntry[i].peBlue), 0, 0); + RGB(plogpal->palPalEntry[i].peRed, plogpal->palPalEntry[i].peGreen, plogpal->palPalEntry[i].peBlue)); test_color(hdcmem, PALETTERGB(plogpal->palPalEntry[i].peRed, plogpal->palPalEntry[i].peGreen, plogpal->palPalEntry[i].peBlue), - RGB(plogpal->palPalEntry[i].peRed, plogpal->palPalEntry[i].peGreen, plogpal->palPalEntry[i].peBlue), 0, 0); + RGB(plogpal->palPalEntry[i].peRed, plogpal->palPalEntry[i].peGreen, plogpal->palPalEntry[i].peBlue)); } SelectPalette(hdcmem, oldpal, TRUE);

1 0

Huw Davies : gdi32: Implement GetPixel.
by Alexandre Julliard Oct. 19, 2011

Oct. 19, 2011

Module: wine Branch: master Commit: f6c7e96a61bf6755f005bb7d1883154ffacc65c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6c7e96a61bf6755f005bb7d1… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 19 12:41:58 2011 +0100 gdi32: Implement GetPixel. --- dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/dibdrv/dibdrv.h | 1 + dlls/gdi32/dibdrv/graphics.c | 23 +++++++++++++++++++ dlls/gdi32/tests/bitmap.c | 50 +++++++++++++++++++++--------------------- dlls/gdi32/tests/palette.c | 1 - 5 files changed, 50 insertions(+), 27 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 877c132..335baae 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -554,7 +554,7 @@ const struct gdi_dc_funcs dib_driver = NULL, /* pGetICMProfile */ dibdrv_GetImage, /* pGetImage */ NULL, /* pGetNearestColor */ - NULL, /* pGetPixel */ + dibdrv_GetPixel, /* pGetPixel */ NULL, /* pGetPixelFormat */ NULL, /* pGetSystemPaletteEntries */ NULL, /* pGetTextExtentExPoint */ diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index e5f4645..74a786d 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -106,6 +106,7 @@ extern DWORD dibdrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct g struct bitblt_coords *src, struct bitblt_coords *dst, BLENDFUNCTION func ) DECLSPEC_HIDDEN; extern DWORD dibdrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, struct gdi_image_bits *bits, struct bitblt_coords *src ) DECLSPEC_HIDDEN; +extern COLORREF dibdrv_GetPixel( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL dibdrv_LineTo( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL dibdrv_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) DECLSPEC_HIDDEN; extern BOOL dibdrv_PaintRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index b68b17e..65f5b9a 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -57,6 +57,29 @@ static RECT get_device_rect( HDC hdc, int left, int top, int right, int bottom, } /*********************************************************************** + * dibdrv_GetPixel + */ +COLORREF dibdrv_GetPixel( PHYSDEV dev, INT x, INT y ) +{ + dibdrv_physdev *pdev = get_dibdrv_pdev( dev ); + POINT pt; + DWORD pixel; + + TRACE( "(%p, %d, %d)\n", dev, x, y ); + + pt.x = x; + pt.y = y; + LPtoDP( dev->hdc, &pt, 1 ); + + if (pt.x < 0 || pt.x >= pdev->dib.width || + pt.y < 0 || pt.y >= pdev->dib.height) + return CLR_INVALID; + + pixel = pdev->dib.funcs->get_pixel( &pdev->dib, &pt ); + return pdev->dib.funcs->pixel_to_colorref( &pdev->dib, pixel ); +} + +/*********************************************************************** * dibdrv_LineTo */ BOOL dibdrv_LineTo( PHYSDEV dev, INT x, INT y ) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index bf18b9b..f5fd5fd 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -580,19 +580,19 @@ static void test_dibsections(void) c0 = RGB(pbmi->bmiColors[0].rgbRed, pbmi->bmiColors[0].rgbGreen, pbmi->bmiColors[0].rgbBlue); c1 = RGB(pbmi->bmiColors[1].rgbRed, pbmi->bmiColors[1].rgbGreen, pbmi->bmiColors[1].rgbBlue); - test_color(hdcmem, DIBINDEX(0), c0, 0, 1); - test_color(hdcmem, DIBINDEX(1), c1, 0, 1); - test_color(hdcmem, DIBINDEX(2), c0, 0, 1); - test_color(hdcmem, PALETTEINDEX(0), c0, 0, 1); - test_color(hdcmem, PALETTEINDEX(1), c0, 0, 1); - test_color(hdcmem, PALETTEINDEX(2), c0, 0, 1); + test_color(hdcmem, DIBINDEX(0), c0, 0, 0); + test_color(hdcmem, DIBINDEX(1), c1, 0, 0); + test_color(hdcmem, DIBINDEX(2), c0, 0, 0); + test_color(hdcmem, PALETTEINDEX(0), c0, 0, 0); + test_color(hdcmem, PALETTEINDEX(1), c0, 0, 0); + test_color(hdcmem, PALETTEINDEX(2), c0, 0, 0); test_color(hdcmem, PALETTERGB(pbmi->bmiColors[0].rgbRed, pbmi->bmiColors[0].rgbGreen, - pbmi->bmiColors[0].rgbBlue), c0, 0, 1); + pbmi->bmiColors[0].rgbBlue), c0, 0, 0); test_color(hdcmem, PALETTERGB(pbmi->bmiColors[1].rgbRed, pbmi->bmiColors[1].rgbGreen, - pbmi->bmiColors[1].rgbBlue), c1, 0, 1); - test_color(hdcmem, PALETTERGB(0, 0, 0), c0, 0, 1); - test_color(hdcmem, PALETTERGB(0xff, 0xff, 0xff), c0, 0, 1); - test_color(hdcmem, PALETTERGB(0, 0, 0xfe), c1, 0, 1); + pbmi->bmiColors[1].rgbBlue), c1, 0, 0); + test_color(hdcmem, PALETTERGB(0, 0, 0), c0, 0, 0); + test_color(hdcmem, PALETTERGB(0xff, 0xff, 0xff), c0, 0, 0); + test_color(hdcmem, PALETTERGB(0, 0, 0xfe), c1, 0, 0); SelectObject(hdcmem, oldbm); DeleteObject(hdib); @@ -704,22 +704,22 @@ static void test_dibsections(void) c0 = RGB(plogpal->palPalEntry[0].peRed, plogpal->palPalEntry[0].peGreen, plogpal->palPalEntry[0].peBlue); c1 = RGB(plogpal->palPalEntry[1].peRed, plogpal->palPalEntry[1].peGreen, plogpal->palPalEntry[1].peBlue); - test_color(hdcmem, DIBINDEX(0), c0, 0, 1); - test_color(hdcmem, DIBINDEX(1), c1, 0, 1); - test_color(hdcmem, DIBINDEX(2), c0, 0, 1); - test_color(hdcmem, PALETTEINDEX(0), c0, 0, 1); - test_color(hdcmem, PALETTEINDEX(1), c1, 0, 1); - test_color(hdcmem, PALETTEINDEX(2), c0, 0, 1); + test_color(hdcmem, DIBINDEX(0), c0, 0, 0); + test_color(hdcmem, DIBINDEX(1), c1, 0, 0); + test_color(hdcmem, DIBINDEX(2), c0, 0, 0); + test_color(hdcmem, PALETTEINDEX(0), c0, 0, 0); + test_color(hdcmem, PALETTEINDEX(1), c1, 0, 0); + test_color(hdcmem, PALETTEINDEX(2), c0, 0, 0); test_color(hdcmem, PALETTERGB(plogpal->palPalEntry[0].peRed, plogpal->palPalEntry[0].peGreen, - plogpal->palPalEntry[0].peBlue), c0, 0, 1); + plogpal->palPalEntry[0].peBlue), c0, 0, 0); test_color(hdcmem, PALETTERGB(plogpal->palPalEntry[1].peRed, plogpal->palPalEntry[1].peGreen, - plogpal->palPalEntry[1].peBlue), c1, 0, 1); - test_color(hdcmem, PALETTERGB(0, 0, 0), c1, 0, 1); - test_color(hdcmem, PALETTERGB(0xff, 0xff, 0xff), c0, 0, 1); - test_color(hdcmem, PALETTERGB(0, 0, 0xfe), c0, 0, 1); - test_color(hdcmem, PALETTERGB(0, 1, 0), c1, 0, 1); - test_color(hdcmem, PALETTERGB(0x3f, 0, 0x3f), c1, 0, 1); - test_color(hdcmem, PALETTERGB(0x40, 0, 0x40), c0, 0, 1); + plogpal->palPalEntry[1].peBlue), c1, 0, 0); + test_color(hdcmem, PALETTERGB(0, 0, 0), c1, 0, 0); + test_color(hdcmem, PALETTERGB(0xff, 0xff, 0xff), c0, 0, 0); + test_color(hdcmem, PALETTERGB(0, 0, 0xfe), c0, 0, 0); + test_color(hdcmem, PALETTERGB(0, 1, 0), c1, 0, 0); + test_color(hdcmem, PALETTERGB(0x3f, 0, 0x3f), c1, 0, 0); + test_color(hdcmem, PALETTERGB(0x40, 0, 0x40), c0, 0, 0); /* Bottom and 2nd row from top green, everything else magenta */ bits[0] = bits[1] = 0xff; diff --git a/dlls/gdi32/tests/palette.c b/dlls/gdi32/tests/palette.c index 0a5822a..039be59 100644 --- a/dlls/gdi32/tests/palette.c +++ b/dlls/gdi32/tests/palette.c @@ -109,7 +109,6 @@ static void test_DIB_PAL_COLORS(void) { SetPixel( memhdc, 0, 0, setColor ); chkColor = RGB( logpalettedata[3].peRed, logpalettedata[3].peGreen, logpalettedata[3].peBlue ); getColor = GetPixel( memhdc, 0, 0 ); -todo_wine /* this will be removed with the GetPixel patch */ ok( getColor == chkColor, "getColor=%08X\n", (UINT)getColor ); SelectPalette( memhdc, hpalOld, FALSE );

1 0

Huw Davies : gdi32/tests: Add tests for GetPixel.
by Alexandre Julliard Oct. 19, 2011

Oct. 19, 2011

Module: wine Branch: master Commit: 2e724343406e96a7ea1907d46490a69e7c3ab022 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e724343406e96a7ea1907d46… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 19 12:41:59 2011 +0100 gdi32/tests: Add tests for GetPixel. --- dlls/gdi32/tests/dib.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index f440420..844ccef 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -1990,11 +1990,22 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh for (i = 0; i < 256; i++) { - COLORREF s; + COLORREF s, g; s = SetPixel( hdc, i * 2, 10, DIBINDEX(i) ); + g = GetPixel( hdc, i * 2, 10 ); + ok( s == g, "got %08x and %08x\n", s, g ); + s = SetPixel( hdc, i * 2, 20, PALETTEINDEX(i) ); + g = GetPixel( hdc, i * 2, 20 ); + ok( s == g, "got %08x and %08x\n", s, g ); + s = SetPixel( hdc, i * 2, 30, RGB( (i & 0x07) << 5, (i & 0x38) << 2, i & 0xc0 ) ); + g = GetPixel( hdc, i * 2, 30 ); + ok( s == g, "got %08x and %08x\n", s, g ); + s = SetPixel( hdc, i * 2, 40, PALETTERGB( (i & 0x07) << 5, (i & 0x38) << 2, i & 0xc0 ) ); + g = GetPixel( hdc, i * 2, 40 ); + ok( s == g, "got %08x and %08x\n", s, g ); } compare_hash(bmi, bits, sha1, "SetPixel");

1 0

Huw Davies : gdi32/tests: Add tests for SetPixel.
by Alexandre Julliard Oct. 19, 2011

Oct. 19, 2011

Module: wine Branch: master Commit: 07e652b330d1a1843dfed24e00a3e232a2afca76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07e652b330d1a1843dfed24e0… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 19 12:41:56 2011 +0100 gdi32/tests: Add tests for SetPixel. --- dlls/gdi32/tests/dib.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index 4c81330..f440420 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -131,6 +131,7 @@ static const char *sha1_graphics_a8r8g8b8[] = "af99228aa4cfbd1f61bd824db046144a3c6c2ed7", "568f87f0194ca19b69a5b2bcdef795d89c5721ce", "257d114354a93e681225072bcde756f155b70496", + "0cdf6fee6721d60d5d5ed26b1989eacddc16b14e", NULL }; @@ -189,6 +190,7 @@ static const char *sha1_graphics_a8b8g8r8[] = "af99228aa4cfbd1f61bd824db046144a3c6c2ed7", "25675c30adfe24d6cae60793b156dfdaa36ac3ba", "2c4f116451b571106beba8b85da8e4b923937246", + "9c8f3063504a81bbbfa8558e111c63d8bc36dbbf", NULL }; @@ -247,6 +249,7 @@ static const char *sha1_graphics_r10g10b10[] = "36f6db4fbe2a1630a7597d3a446f2902755c96ef", "d3f08946300e1700865042aed121870e292d1095", "abb56db94becb64d663b51f0ea6b4bd535a88ba0", + "3a81fe558c69ca0aea7e7191771ed86cf4321a5a", NULL }; @@ -305,6 +308,7 @@ static const char *sha1_graphics_r6g6b6[] = "325279e76367200d3fd7194d81c09fd139988ece", "c3def160a1e847605ff0fc7edd30397fa90635a0", "50acb1597c4d53ad63225376d2aa36f64e8a229d", + "796fd861474aa7861bd0384127df755458757ec3", NULL }; @@ -363,6 +367,7 @@ static const char *sha1_graphics_24[] = "d347ca5c6c4b6a61389247c3b6f61564033e8c25", "ee315634ed92da3a32c2675ecd1b369471c60936", "3491e2bd81e70dd203c8551cc2d39b19401caafe", + "826de85271b67a11e7bd1a6596b58a045a96b69e", NULL }; @@ -425,6 +430,7 @@ static const char *sha1_graphics_r5g5b5[] = "dab47c9dc149e570045d699598b14a613bf319b3", "2daca4d26a086ed34894693be0b0374402232809", "bf0e0b74ce5686b73c527843e0d0df0cd10efefe", + "517e32a8c0312b5676d498583ea092b0f198f2bc", NULL }; @@ -482,6 +488,7 @@ static const char *sha1_graphics_r4g4b4[] = "07b10c3f191d0a93e5e5694aae37dcad407e10f5", "f7900e60347029876ba55e8f0c4c02e89deb36b6", "734d4a7836891d729f4a9ec6916ead78eecb2596", + "d8ba2e556fd64c9c2f1746496e6e7dd7a487cd6d", NULL }; @@ -545,6 +552,7 @@ static const char *sha1_graphics_8_color[] = "678979a45126a76eb629992cd64734862f53a555", "2f7ba8803604c032cb1a1228bc021f0f1c03e245", "0204f06422a01787f7379d0edb51104bb023758a", + "1f9a21eba2f2ce87768a5618d9cfefa7e48fb386", NULL }; @@ -613,6 +621,7 @@ static const char *sha1_graphics_8_grayscale[] = "09640bad951c33e7d70a1fced83b1869f65b3fc5", "cb9ea8137eca1450e049879772f5c11a0e11ff0a", "a05e05b2e6e515baa59ea032d063ca11e70a72b5", + "d908c86b7301666a8d7999b831841115a4938181", NULL }; @@ -674,6 +683,7 @@ static const char *sha1_graphics_8[] = "465d9cd0a77ab4fcf035aa67544b2a26269e0b09", "600d6b2713d5e4c0d90c02660245ed26c7ae3033", "963d1fa8608c8b743e972eb9a4e9f3fc53c6c7e8", + "ba49de83c4668fb08956221f465b93e7dd6a3383", NULL }; @@ -731,6 +741,7 @@ static const char *sha1_graphics_4[] = "d8af3868c66c7d6dac35ec8ee0317b38a6910bb1", "ec8e2aebfb4a1c28ebcd0e053b9e4d8638b50951", "da401c745421f6bdfaefd590ab99dee948dce412", + "38a3b6edcba2a1fba6064f0b4d771aedae7f4673", NULL }; @@ -788,6 +799,7 @@ static const char *sha1_graphics_4_grayscale[] = "b5ee51cfc73acb59a2f6124509ea236f8fc7f9f7", "d374d4d92c940ae42a9b42c14d744341b68a8c14", "25ec9fd2eeb1514ba4e0458a444149a5456cf63a", + "2e4dc1e859350289575ffc2a47cd0033efca6c32", NULL }; @@ -860,6 +872,7 @@ static const char *sha1_graphics_1[] = "88763f8e8fcf4f78fa864325791a9dd35a0bd279", "013cee26bac8f815eadad4bfc012d9b5d01c3b7f", "6b2cb2346b5820bdd0251cd6a4aeb5c22ee82e85", + "6c4640b17e072efc682044c499e5a4f3481b7c87", NULL }; @@ -1975,6 +1988,18 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh compare_hash(bmi, bits, sha1, "Colors"); memset(bits, 0xcc, dib_size); + for (i = 0; i < 256; i++) + { + COLORREF s; + s = SetPixel( hdc, i * 2, 10, DIBINDEX(i) ); + s = SetPixel( hdc, i * 2, 20, PALETTEINDEX(i) ); + s = SetPixel( hdc, i * 2, 30, RGB( (i & 0x07) << 5, (i & 0x38) << 2, i & 0xc0 ) ); + s = SetPixel( hdc, i * 2, 40, PALETTERGB( (i & 0x07) << 5, (i & 0x38) << 2, i & 0xc0 ) ); + } + + compare_hash(bmi, bits, sha1, "SetPixel"); + memset(bits, 0xcc, dib_size); + SelectObject(hdc, orig_brush); SelectObject(hdc, orig_pen); DeleteObject(hrgn);

1 0

Marcus Meissner : user.exe16: Fixed incorrect sizeof() (Coverity).
by Alexandre Julliard Oct. 19, 2011

Oct. 19, 2011

Module: wine Branch: master Commit: 90ca362013855872729aeb8794ce2d867371e5ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=90ca362013855872729aeb879… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Oct 18 22:10:11 2011 +0200 user.exe16: Fixed incorrect sizeof() (Coverity). --- dlls/user.exe16/user.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index 01125ff..705620b 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -1357,7 +1357,7 @@ LONG WINAPI TabbedTextOut16( HDC16 hdc, INT16 x, INT16 y, LPCSTR lpstr, INT16 count, INT16 nb_tabs, const INT16 *tabs16, INT16 tab_org ) { LONG ret; - INT i, *tabs = HeapAlloc( GetProcessHeap(), 0, nb_tabs * sizeof(tabs) ); + INT i, *tabs = HeapAlloc( GetProcessHeap(), 0, nb_tabs * sizeof(*tabs) ); if (!tabs) return 0; for (i = 0; i < nb_tabs; i++) tabs[i] = tabs16[i]; ret = TabbedTextOutA( HDC_32(hdc), x, y, lpstr, count, nb_tabs, tabs, tab_org ); @@ -1373,7 +1373,7 @@ DWORD WINAPI GetTabbedTextExtent16( HDC16 hdc, LPCSTR lpstr, INT16 count, INT16 nb_tabs, const INT16 *tabs16 ) { LONG ret; - INT i, *tabs = HeapAlloc( GetProcessHeap(), 0, nb_tabs * sizeof(tabs) ); + INT i, *tabs = HeapAlloc( GetProcessHeap(), 0, nb_tabs * sizeof(*tabs) ); if (!tabs) return 0; for (i = 0; i < nb_tabs; i++) tabs[i] = tabs16[i]; ret = GetTabbedTextExtentA( HDC_32(hdc), lpstr, count, nb_tabs, tabs );

1 0

Alexandre Julliard : ntdll: Unwind the stack before calling exit/ abort_thread on i386 the same way we do on x86_64.
by Alexandre Julliard Oct. 19, 2011

Oct. 19, 2011

Module: wine Branch: master Commit: 62b7069fa941c6ac1c923f0a7986261e290862c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62b7069fa941c6ac1c923f0a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 19 12:59:58 2011 +0200 ntdll: Unwind the stack before calling exit/abort_thread on i386 the same way we do on x86_64. --- dlls/ntdll/ntdll_misc.h | 4 +++ dlls/ntdll/signal_i386.c | 49 +++++++++++++++++++++++++++++++++++++++------ 2 files changed, 46 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 4956537..20f1c45 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -224,6 +224,10 @@ struct ntdll_thread_data int wait_fd[2]; /* 1ec/300 fd for sleeping server requests */ BOOL wow64_redir; /* 1f4/308 Wow64 filesystem redirection flag */ pthread_t pthread_id; /* 1f8/310 pthread thread id */ +#ifdef __i386__ + WINE_VM86_TEB_INFO vm86; /* 1fc vm86 private data */ + void *exit_frame; /* 204 exit frame pointer */ +#endif }; static inline struct ntdll_thread_data *ntdll_get_thread_data(void) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 6c8e8e2..e839994 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2473,9 +2473,41 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, } +extern void DECLSPEC_NORETURN call_thread_entry_point( LPTHREAD_START_ROUTINE entry, void *arg ); +__ASM_GLOBAL_FUNC( call_thread_entry_point, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "pushl %ebx\n\t" + __ASM_CFI(".cfi_rel_offset %ebx,-4\n\t") + "pushl %esi\n\t" + __ASM_CFI(".cfi_rel_offset %esi,-8\n\t") + "pushl %edi\n\t" + __ASM_CFI(".cfi_rel_offset %edi,-12\n\t") + "pushl %ebp\n\t" + "pushl 12(%ebp)\n\t" + "pushl 8(%ebp)\n\t" + "call " __ASM_NAME("call_thread_func") ); + +extern void DECLSPEC_NORETURN call_thread_exit_func( int status, void (*func)(int), void *frame ); +__ASM_GLOBAL_FUNC( call_thread_exit_func, + "movl 4(%esp),%eax\n\t" + "movl 8(%esp),%ecx\n\t" + "movl 12(%esp),%ebp\n\t" + __ASM_CFI(".cfi_def_cfa %ebp,4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + __ASM_CFI(".cfi_rel_offset %ebx,-4\n\t") + __ASM_CFI(".cfi_rel_offset %esi,-8\n\t") + __ASM_CFI(".cfi_rel_offset %edi,-12\n\t") + "leal -20(%ebp),%esp\n\t" + "pushl %eax\n\t" + "call *%ecx" ); + /* wrapper for apps that don't declare the thread function correctly */ -extern void DECLSPEC_NORETURN call_thread_func( LPTHREAD_START_ROUTINE entry, void *arg ); -__ASM_GLOBAL_FUNC(call_thread_func, +extern void DECLSPEC_NORETURN call_thread_func_wrapper( LPTHREAD_START_ROUTINE entry, void *arg ); +__ASM_GLOBAL_FUNC(call_thread_func_wrapper, "pushl %ebp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") @@ -2490,13 +2522,14 @@ __ASM_GLOBAL_FUNC(call_thread_func, "int $3" ) /*********************************************************************** - * call_thread_entry_point + * call_thread_func */ -void call_thread_entry_point( LPTHREAD_START_ROUTINE entry, void *arg ) +void call_thread_func( LPTHREAD_START_ROUTINE entry, void *arg, void *frame ) { + ntdll_get_thread_data()->exit_frame = frame; __TRY { - call_thread_func( entry, arg ); + call_thread_func_wrapper( entry, arg ); } __EXCEPT(unhandled_exception_filter) { @@ -2511,7 +2544,8 @@ void call_thread_entry_point( LPTHREAD_START_ROUTINE entry, void *arg ) */ void WINAPI RtlExitUserThread( ULONG status ) { - exit_thread( status ); + if (!ntdll_get_thread_data()->exit_frame) exit_thread( status ); + call_thread_exit_func( status, exit_thread, ntdll_get_thread_data()->exit_frame ); } /*********************************************************************** @@ -2519,7 +2553,8 @@ void WINAPI RtlExitUserThread( ULONG status ) */ void abort_thread( int status ) { - terminate_thread( status ); + if (!ntdll_get_thread_data()->exit_frame) terminate_thread( status ); + call_thread_exit_func( status, terminate_thread, ntdll_get_thread_data()->exit_frame ); } /**********************************************************************

1 0

Aric Stewart : user32: Recalculate string length when cropping string to fit.
by Alexandre Julliard Oct. 19, 2011

Oct. 19, 2011

Module: wine Branch: master Commit: 67196377b5b2fd28e7ef3d8bbb674740ddfe0508 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67196377b5b2fd28e7ef3d8bb… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Oct 19 08:37:25 2011 -0500 user32: Recalculate string length when cropping string to fit. --- dlls/user32/edit.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 039e7c9..dffc72a 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -2489,6 +2489,7 @@ static void EDIT_EM_ReplaceSel(EDITSTATE *es, BOOL can_undo, LPCWSTR lpsz_replac while ((es->text_width > fw) && s + strl >= s) { strcpyW(es->text + s + strl - 1, es->text + s + strl); strl--; + es->text_length = -1; EDIT_InvalidateUniscribeData(es); EDIT_CalcLineWidth_SL(es); }

1 0

Huw Davies : gdi32: Add support for non-rgb colorrefs.
by Alexandre Julliard Oct. 19, 2011

Oct. 19, 2011

Module: wine Branch: master Commit: a3b5f270a89052425d35238710466e668bfe0588 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3b5f270a89052425d3523871… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 19 12:41:52 2011 +0100 gdi32: Add support for non-rgb colorrefs. --- dlls/gdi32/dibdrv/objects.c | 58 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 56 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 6b278c8..a1f6829 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -123,6 +123,54 @@ static inline BOOL rgbquad_equal(const RGBQUAD *a, const RGBQUAD *b) return FALSE; } +static COLORREF make_rgb_colorref( dibdrv_physdev *pdev, COLORREF color, + BOOL *got_pixel, DWORD *pixel ) +{ + BYTE type = color >> 24; + WORD index = LOWORD( color ); + HPALETTE pal = GetCurrentObject( pdev->dev.hdc, OBJ_PAL ); + PALETTEENTRY pal_ent; + + *pixel = 0; + *got_pixel = FALSE; + + switch( type ) + { + case 0: break; + + case 0x10: /* DIBINDEX */ + *got_pixel = TRUE; + *pixel = 0; + color = RGB(0, 0, 0); + + if (pdev->dib.bit_count <= 8 && index < (1 << pdev->dib.bit_count)) + { + *pixel = index; + if (index < pdev->dib.color_table_size) + color = RGB( pdev->dib.color_table[index].rgbRed, + pdev->dib.color_table[index].rgbGreen, + pdev->dib.color_table[index].rgbBlue ); + } + break; + + case 2: /* PALETTERGB */ + color &= 0xffffff; + break; + + case 1: /* PALETTEINDEX */ + if (!GetPaletteEntries( pal, index, 1, &pal_ent )) + GetPaletteEntries( pal, 0, 1, &pal_ent ); + color = RGB( pal_ent.peRed, pal_ent.peGreen, pal_ent.peBlue ); + break; + + default: + FIXME("Unhandled color type %08x\n", color); + color &= 0xffffff; + } + + return color; +} + /****************************************************************** * get_pixel_color * @@ -135,11 +183,17 @@ static inline BOOL rgbquad_equal(const RGBQUAD *a, const RGBQUAD *b) DWORD get_pixel_color( dibdrv_physdev *pdev, COLORREF color, BOOL mono_fixup ) { RGBQUAD fg_quad; + BOOL got_pixel; + DWORD pixel; + COLORREF rgb_ref; + + rgb_ref = make_rgb_colorref( pdev, color, &got_pixel, &pixel ); + if (got_pixel) return pixel; if (pdev->dib.bit_count != 1 || !mono_fixup) - return pdev->dib.funcs->colorref_to_pixel( &pdev->dib, color ); + return pdev->dib.funcs->colorref_to_pixel( &pdev->dib, rgb_ref ); - fg_quad = rgbquad_from_colorref( color ); + fg_quad = rgbquad_from_colorref( rgb_ref ); if(rgbquad_equal(&fg_quad, pdev->dib.color_table)) return 0; if(rgbquad_equal(&fg_quad, pdev->dib.color_table + 1))

1 0

Huw Davies : gdi32: Add pixel_to_colorref primitives.
by Alexandre Julliard Oct. 19, 2011

Oct. 19, 2011

Module: wine Branch: master Commit: ddbaa9491a7953886d1b5d4c9b671a0048e61eb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddbaa9491a7953886d1b5d4c9… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 19 12:41:54 2011 +0100 gdi32: Add pixel_to_colorref primitives. --- dlls/gdi32/dibdrv/dibdrv.h | 1 + dlls/gdi32/dibdrv/primitives.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 6d96e77..b23e931 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -145,6 +145,7 @@ typedef struct primitive_funcs void (* blend_rect)(const dib_info *dst, const RECT *rc, const dib_info *src, const POINT *origin, BLENDFUNCTION blend); DWORD (* colorref_to_pixel)(const dib_info *dib, COLORREF color); + COLORREF (* pixel_to_colorref)(const dib_info *dib, DWORD pixel); void (* convert_to)(dib_info *dst, const dib_info *src, const RECT *src_rect); BOOL (* create_rop_masks)(const dib_info *dib, const dib_info *hatch, const rop_mask *fg, const rop_mask *bg, rop_mask_bits *bits); diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index 7477a79..594d05d 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -1132,6 +1132,37 @@ static inline RGBQUAD colortable_entry(const dib_info *dib, DWORD index) return default_rgb; } +static COLORREF pixel_to_colorref_888(const dib_info *dib, DWORD pixel) +{ + return ( ((pixel >> 16) & 0xff) | (pixel & 0xff00) | ((pixel << 16) & 0xff0000) ); +} + +static COLORREF pixel_to_colorref_masks(const dib_info *dib, DWORD pixel) +{ + return RGB( get_field( pixel, dib->red_shift, dib->red_len ), + get_field( pixel, dib->green_shift, dib->green_len ), + get_field( pixel, dib->blue_shift, dib->blue_len ) ); +} + +static COLORREF pixel_to_colorref_555(const dib_info *dib, DWORD pixel) +{ + return RGB( ((pixel >> 7) & 0xf8) | ((pixel >> 12) & 0x07), + ((pixel >> 2) & 0xf8) | ((pixel >> 7) & 0x07), + ((pixel << 3) & 0xf8) | ((pixel >> 2) & 0x07) ); +} + +static COLORREF pixel_to_colorref_colortable(const dib_info *dib, DWORD pixel) +{ + RGBQUAD quad = colortable_entry( dib, pixel ); + + return RGB( quad.rgbRed, quad.rgbGreen, quad.rgbBlue ); +} + +static COLORREF pixel_to_colorref_null(const dib_info *dib, DWORD pixel) +{ + return 0; +} + static inline BOOL bit_fields_match(const dib_info *d1, const dib_info *d2) { assert( d1->bit_count > 8 && d1->bit_count == d2->bit_count ); @@ -4320,6 +4351,7 @@ const primitive_funcs funcs_8888 = copy_rect_32, blend_rect_8888, colorref_to_pixel_888, + pixel_to_colorref_888, convert_to_8888, create_rop_masks_32, stretch_row_32, @@ -4333,6 +4365,7 @@ const primitive_funcs funcs_32 = copy_rect_32, blend_rect_32, colorref_to_pixel_masks, + pixel_to_colorref_masks, convert_to_32, create_rop_masks_32, stretch_row_32, @@ -4346,6 +4379,7 @@ const primitive_funcs funcs_24 = copy_rect_24, blend_rect_24, colorref_to_pixel_888, + pixel_to_colorref_888, convert_to_24, create_rop_masks_24, stretch_row_24, @@ -4359,6 +4393,7 @@ const primitive_funcs funcs_555 = copy_rect_16, blend_rect_555, colorref_to_pixel_555, + pixel_to_colorref_555, convert_to_555, create_rop_masks_16, stretch_row_16, @@ -4372,6 +4407,7 @@ const primitive_funcs funcs_16 = copy_rect_16, blend_rect_16, colorref_to_pixel_masks, + pixel_to_colorref_masks, convert_to_16, create_rop_masks_16, stretch_row_16, @@ -4385,6 +4421,7 @@ const primitive_funcs funcs_8 = copy_rect_8, blend_rect_8, colorref_to_pixel_colortable, + pixel_to_colorref_colortable, convert_to_8, create_rop_masks_8, stretch_row_8, @@ -4398,6 +4435,7 @@ const primitive_funcs funcs_4 = copy_rect_4, blend_rect_4, colorref_to_pixel_colortable, + pixel_to_colorref_colortable, convert_to_4, create_rop_masks_4, stretch_row_4, @@ -4411,6 +4449,7 @@ const primitive_funcs funcs_1 = copy_rect_1, blend_rect_1, colorref_to_pixel_colortable, + pixel_to_colorref_colortable, convert_to_1, create_rop_masks_1, stretch_row_1, @@ -4424,6 +4463,7 @@ const primitive_funcs funcs_null = copy_rect_null, blend_rect_null, colorref_to_pixel_null, + pixel_to_colorref_null, convert_to_null, create_rop_masks_null, stretch_row_null,

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard Oct. 19, 2011

Oct. 19, 2011

Module: wine Branch: master Commit: 1b4b274f6959aee43324c5037c95158dfd6f8a45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b4b274f6959aee43324c5037… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 18 22:27:45 2011 +0200 po: Update French translation. --- po/fr.po | 30 ++++++++++-------------------- 1 files changed, 10 insertions(+), 20 deletions(-) diff --git a/po/fr.po b/po/fr.po index 5790885..835e89a 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6750,9 +6750,8 @@ msgid "Trash" msgstr "Corbeille" #: shlwapi.rc:27 -#, fuzzy msgid "%d bytes" -msgstr "%ld octets" +msgstr "%d octets" #: shlwapi.rc:28 msgctxt "time unit: hours" @@ -11462,60 +11461,51 @@ msgstr "" "Nombre invalide de paramètres - Utilisez xcopy /? pour obtenir de l'aide\n" #: xcopy.rc:28 -#, fuzzy msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "" -"Paramètre invalide « %s » - Utilisez xcopy /? pour obtenir de l'aide\n" +"Paramètre « %1 » invalide - Utilisez xcopy /? pour obtenir de l'aide\n" #: xcopy.rc:29 msgid "Press <enter> to begin copying\n" msgstr "Appuyez sur ENTRÉE pour démarrer la copie\n" #: xcopy.rc:30 -#, fuzzy msgid "%1!d! file(s) would be copied\n" -msgstr "%d fichier(s) seront copiés\n" +msgstr "%1!d! fichier(s) seront copiés\n" #: xcopy.rc:31 -#, fuzzy msgid "%1!d! file(s) copied\n" -msgstr "%d fichier(s) copiés\n" +msgstr "%1!d! fichier(s) copiés\n" #: xcopy.rc:34 -#, fuzzy msgid "" "Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" -"« %s » est-il un fichier ou un répertoire\n" +"« %1 » est-il un fichier ou un répertoire\n" "dans la destination ?\n" "(F - Fichier, R - Répertoire)\n" #: xcopy.rc:35 -#, fuzzy msgid "%1? (Yes|No)\n" -msgstr "%s ? (Oui|Non)\n" +msgstr "%1 ? (Oui|Non)\n" #: xcopy.rc:36 -#, fuzzy msgid "Overwrite %1? (Yes|No|All)\n" -msgstr "Écraser %s ? (Oui|Non|Tous)\n" +msgstr "Écraser %1 ? (Oui|Non|Tous)\n" #: xcopy.rc:37 -#, fuzzy msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" -msgstr "La copie de « %s » vers « %s » a échoué avec le code de retour %d\n" +msgstr "La copie de « %1 » vers « %2 » a échoué avec le code de retour %3!d!\n" #: xcopy.rc:38 -#, fuzzy msgid "Failed to open '%1'\n" -msgstr "Impossible d'ouvrir « %s »\n" +msgstr "Impossible d'ouvrir « %1 »\n" #: xcopy.rc:39 -#, fuzzy msgid "Failed during reading of '%1'\n" -msgstr "Impossible de lire « %s »\n" +msgstr "Impossible de lire « %1 »\n" #: xcopy.rc:43 msgctxt "File key"

1 0