wine-commits September 2013

wine-commits@winehq.org

2 participants
645 discussions

Joško Nikolić : po: Update Croatian translation.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: 436e8686f9694ca7a3d65dd808cbbf450a5016d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=436e8686f9694ca7a3d65dd80… Author: Joško Nikolić <josko.nikolic(a)fer.hr> Date: Tue Sep 24 06:06:21 2013 +0000 po: Update Croatian translation. --- po/hr.po | 62 +++++++++++++++++++++++++++++++++++++++++--------------------- 1 files changed, 41 insertions(+), 21 deletions(-) diff --git a/po/hr.po b/po/hr.po index 64f0e81..a221054 100644 --- a/po/hr.po +++ b/po/hr.po @@ -9736,7 +9736,7 @@ msgstr "" #: cmd.rc:346 msgid "Wine CMD Version %1!S!\n" -msgstr "Wine CMD verzija %1!5!\n" +msgstr "Wine CMD verzija %1!S!\n" #: cmd.rc:347 msgid "More? " @@ -9895,6 +9895,13 @@ msgid "" "\n" "Where 'command' is one of HELP, START, STOP or USE.\n" msgstr "" +"Sintaksa ove naredbe je:\n" +"\n" +"NET naredba [argumenti]\n" +" -ili-\n" +"NET naredba /HELP\n" +"\n" +"Gdje 'naredba' je jedno od HELP, START, STOP ili USE.\n" #: net.rc:28 msgid "" @@ -9905,6 +9912,12 @@ msgid "" "Displays the list of running services if 'service' is omitted. Otherwise " "'service' is the name of the service to start.\n" msgstr "" +"Sintaksa ove naredbe je:\n" +"\n" +"NET START [servis]\n" +"\n" +"Prikazuje popis servisa koji se izvode ukoliko se 'servis' izostavi. Inače " +"'servis' je ime servisa koji će se pokrenuti.\n" #: net.rc:29 msgid "" @@ -9938,31 +9951,31 @@ msgstr "" #: net.rc:34 msgid "The %1 service is starting.\n" -msgstr "" +msgstr "Servis %1 se pokreće.\n" #: net.rc:35 msgid "The %1 service was started successfully.\n" -msgstr "" +msgstr "Servis %1 je uspješno pokrenut.\n" #: net.rc:36 msgid "The %1 service failed to start.\n" -msgstr "" +msgstr "Servis %1 nije uspješno pokrenut.\n" #: net.rc:37 msgid "The %1 service is stopping.\n" -msgstr "" +msgstr "Servis %1 se zaustavlja.\n" #: net.rc:38 msgid "The %1 service was stopped successfully.\n" -msgstr "" +msgstr "Servis %1 je uspješno zaustavljen.\n" #: net.rc:39 msgid "The %1 service failed to stop.\n" -msgstr "" +msgstr "Servis %1 nije uspješno zaustavljen.\n" #: net.rc:41 msgid "There are no entries in the list.\n" -msgstr "" +msgstr "Nema unosa u listi.\n" #: net.rc:42 msgid "" @@ -9992,15 +10005,15 @@ msgstr "Dogodila se mrežna pogreška" #: net.rc:48 msgid "Connection is being made" -msgstr "" +msgstr "Veza se stvara" #: net.rc:49 msgid "Reconnecting" -msgstr "" +msgstr "Ponovno povezivanje" #: net.rc:40 msgid "The following services are running:\n" -msgstr "" +msgstr "Sljedeći servisi se izvode:\n" #: netstat.rc:27 msgid "Active Connections" @@ -10008,7 +10021,7 @@ msgstr "Aktivne veze" #: netstat.rc:28 msgid "Proto" -msgstr "" +msgstr "Proto" #: netstat.rc:29 msgid "Local Address" @@ -10902,20 +10915,26 @@ msgid "" "REG [ ADD | DELETE | QUERY ]\n" "REG command /?\n" msgstr "" +"Sintaksa ove naredbe je:\n" +"\n" +"REG [ ADD | DELETE | QUERY ]\n" +"REG naredba /?\n" #: reg.rc:28 msgid "" "REG ADD key_name [/v value_name | /ve] [/t type] [/s separator] [/d data] [/" "f]\n" msgstr "" +"REG ADD ime_ključa [/v ime_vrijednosti | /ve] [/t vrsta] [/s separator] [/d " +"podaci] [/f]\n" #: reg.rc:29 msgid "REG DELETE key_name [/v value_name | /ve | /va] [/f]\n" -msgstr "" +msgstr "REG DELETE ime_ključa [/v ime_vrijednosti | /ve | /va] [/f]\n" #: reg.rc:30 msgid "REG QUERY key_name [/v value_name | /ve] [/s]\n" -msgstr "" +msgstr "REG QUERY ime_ključa [/v ime_vrijednosti | /ve] [/s]\n" #: reg.rc:31 msgid "The operation completed successfully\n" @@ -10938,6 +10957,7 @@ msgstr "" msgid "" "Error: The system was unable to find the specified registry key or value\n" msgstr "" +"Greška: Sustav nije mogao pronaći navedeni ključ ili vrijednost u registru.\n" #: regedit.rc:31 msgid "&Registry" @@ -11021,11 +11041,11 @@ msgstr "" #: regedit.rc:226 msgid "Find:" -msgstr "" +msgstr "Pronađi:" #: regedit.rc:228 msgid "Find in:" -msgstr "" +msgstr "Pronađi u:" #: regedit.rc:229 msgid "Keys" @@ -11033,11 +11053,11 @@ msgstr "Ključevi" #: regedit.rc:230 msgid "Value names" -msgstr "" +msgstr "Imena vrijednosti" #: regedit.rc:231 msgid "Value content" -msgstr "" +msgstr "Sadržaj vrijednosti" #: regedit.rc:232 msgid "Whole string only" @@ -11061,11 +11081,11 @@ msgstr "&Izmjeni" #: regedit.rc:264 regedit.rc:277 regedit.rc:293 regedit.rc:306 msgid "Value name:" -msgstr "" +msgstr "Ime vrijednosti:" #: regedit.rc:266 regedit.rc:279 regedit.rc:295 regedit.rc:308 msgid "Value data:" -msgstr "" +msgstr "Podaci vrijednosti:" #: regedit.rc:274 msgid "Edit DWORD" @@ -12994,7 +13014,7 @@ msgid "" msgstr "" "Uzrok ovome može biti problem u programu ili nedostatak u Wine-u. Provjerite " "<a href=\"http://appdb.winehq.org\">bazu aplikacija</a>za savjete o " -"pokretanjuovog programa." +"pokretanju ovog programa." #: winedbg.rc:58 msgid "Show &Details"

1 0

Dmitry Timoshkov : gdiplus: GdipTransformRegion should not fail for an empty path.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: ec9a0d85705941e024c366a2f740a5f9e3d1419f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec9a0d85705941e024c366a2f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 24 11:25:57 2013 +0900 gdiplus: GdipTransformRegion should not fail for an empty path. --- dlls/gdiplus/region.c | 3 +++ dlls/gdiplus/tests/region.c | 1 - 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index d797459..7186518 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -1310,6 +1310,9 @@ static GpStatus transform_region_element(region_element* element, GpMatrix *matr } /* Fall-through to do the actual conversion. */ case RegionDataPath: + if (!element->elementdata.pathdata.path->pathdata.Count) + return Ok; + stat = GdipTransformMatrixPoints(matrix, element->elementdata.pathdata.path->pathdata.Points, element->elementdata.pathdata.path->pathdata.Count); diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 7d20c3c..dd2f76d 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -381,7 +381,6 @@ static void test_getregiondata(void) status = GdipCreateMatrix(&matrix); expect(Ok, status); status = GdipTransformRegion(region, matrix); -todo_wine expect(Ok, status); GdipDeleteMatrix(matrix);

1 0

Dmitry Timoshkov : gdiplus/tests: Add a test for GdipTransformRegion with an empty region path.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: 3870e5b25584a3d48b852bb6cc09a13fc7091916 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3870e5b25584a3d48b852bb6c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 24 11:25:12 2013 +0900 gdiplus/tests: Add a test for GdipTransformRegion with an empty region path. --- dlls/gdiplus/tests/region.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index a254bed..7d20c3c 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -117,6 +117,7 @@ static void test_getregiondata(void) DWORD buf[100]; GpRect rect; GpPath *path; + GpMatrix *matrix; memset(buf, 0xee, sizeof(buf)); @@ -376,6 +377,14 @@ static void test_getregiondata(void) ok((*(buf + 8) & (~ 0x00004000)) == 0x00000000, "expected 00000000 got %08x\n", *(buf + 8) & (~ 0x00004000)); + /* Transform an empty region */ + status = GdipCreateMatrix(&matrix); + expect(Ok, status); + status = GdipTransformRegion(region, matrix); +todo_wine + expect(Ok, status); + GdipDeleteMatrix(matrix); + status = GdipDeleteRegion(region); expect(Ok, status);

1 0

Dmitry Timoshkov : gdiplus/tests: Don't bother to delete a NULL hrgn.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: 108873320c4366d35891e8efa44a85bc77c6da57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=108873320c4366d35891e8efa… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 24 11:24:30 2013 +0900 gdiplus/tests: Don't bother to delete a NULL hrgn. --- dlls/gdiplus/tests/region.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index ee6e158..a254bed 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -860,12 +860,10 @@ static void test_gethrgn(void) status = GdipGetRegionHRgn(region, NULL, &hrgn); ok(status == Ok, "status %08x\n", status); ok(hrgn == NULL, "hrgn=%p\n", hrgn); - DeleteObject(hrgn); status = GdipGetRegionHRgn(region, graphics, &hrgn); ok(status == Ok, "status %08x\n", status); ok(hrgn == NULL, "hrgn=%p\n", hrgn); - DeleteObject(hrgn); status = GdipSetEmpty(region); ok(status == Ok, "status %08x\n", status);

1 0

Dmitry Timoshkov : gdiplus/tests: Print actual rectangle extents if the tests fail.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: fdeab06142ad6f21b43932740fa190af352ea78d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdeab06142ad6f21b43932740… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 24 11:23:48 2013 +0900 gdiplus/tests: Print actual rectangle extents if the tests fail. --- dlls/gdiplus/tests/region.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 3052f2e..ee6e158 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -86,7 +86,9 @@ static void verify_region(HRGN hrgn, const RECT *rc) { rect = (const RECT *)rgn.data.Buffer; trace("rect (%d,%d-%d,%d)\n", rect->left, rect->top, rect->right, rect->bottom); - ok(EqualRect(rect, rc), "rects don't match\n"); + ok(EqualRect(rect, rc), "expected (%d,%d)-(%d,%d), got (%d,%d)-(%d,%d)\n", + rc->left, rc->top, rc->right, rc->bottom, + rect->left, rect->top, rect->right, rect->bottom); } ok(rgn.data.rdh.dwSize == sizeof(rgn.data.rdh), "expected sizeof(rdh), got %u\n", rgn.data.rdh.dwSize); @@ -101,7 +103,9 @@ static void verify_region(HRGN hrgn, const RECT *rc) ok(rgn.data.rdh.nCount == 1, "expected 1, got %u\n", rgn.data.rdh.nCount); ok(rgn.data.rdh.nRgnSize == sizeof(RECT), "expected sizeof(RECT), got %u\n", rgn.data.rdh.nRgnSize); } - ok(EqualRect(&rgn.data.rdh.rcBound, rc), "rects don't match\n"); + ok(EqualRect(&rgn.data.rdh.rcBound, rc), "expected (%d,%d)-(%d,%d), got (%d,%d)-(%d,%d)\n", + rc->left, rc->top, rc->right, rc->bottom, + rgn.data.rdh.rcBound.left, rgn.data.rdh.rcBound.top, rgn.data.rdh.rcBound.right, rgn.data.rdh.rcBound.bottom); } static void test_getregiondata(void)

1 0

Dmitry Timoshkov : gdiplus/tests: Add a test for GdipTransformMatrixPoints with number of points == 0.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: 603ccca889663257ce017e4f67ee42ee7b32b008 URL: http://source.winehq.org/git/wine.git/?a=commit;h=603ccca889663257ce017e4f6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 24 11:22:55 2013 +0900 gdiplus/tests: Add a test for GdipTransformMatrixPoints with number of points == 0. --- dlls/gdiplus/tests/matrix.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/matrix.c b/dlls/gdiplus/tests/matrix.c index cf8f158..379a8fa 100644 --- a/dlls/gdiplus/tests/matrix.c +++ b/dlls/gdiplus/tests/matrix.c @@ -77,6 +77,9 @@ static void test_transform(void) GdipCreateMatrix2(1.0, -2.0, 30.0, 40.0, -500.0, 600.0, &matrix); + status = GdipTransformMatrixPoints(matrix, pts, 0); + expect(InvalidParameter, status); + status = GdipTransformMatrixPoints(matrix, pts, 10); expect(Ok, status);

1 0

Alexandre Julliard : configure: Build the makefile data into a temporary file instead of a shell variable.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: 49645b6ff9292099690d0fb2d66fff75147da3cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=49645b6ff9292099690d0fb2d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 24 12:33:16 2013 +0200 configure: Build the makefile data into a temporary file instead of a shell variable. --- aclocal.m4 | 92 ++++++++++++++++++++++-------------------------- configure | 111 +++++++++++++++++++++++++++++---------------------------- configure.ac | 25 +++++++++---- 3 files changed, 115 insertions(+), 113 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=49645b6ff9292099690d0…

1 0

Vincent Povirk : gdiplus: Always provide image data in the format requested by image encoders.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: 12586f76e34c64a0b33d5e4626d67d6a07ebaeff URL: http://source.winehq.org/git/wine.git/?a=commit;h=12586f76e34c64a0b33d5e462… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Aug 14 15:04:13 2013 -0500 gdiplus: Always provide image data in the format requested by image encoders. --- dlls/gdiplus/image.c | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 98c0bd0..0f97fd7 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -4002,6 +4002,7 @@ static GpStatus encode_image_WIC(GpImage *image, IStream* stream, HRESULT hr; UINT width, height; PixelFormat gdipformat=0; + const WICPixelFormatGUID *desired_wicformat; WICPixelFormatGUID wicformat; GpRect rc; BitmapData lockeddata; @@ -4054,20 +4055,40 @@ static GpStatus encode_image_WIC(GpImage *image, IStream* stream, { if (pixel_formats[i].gdip_format == bitmap->format) { - memcpy(&wicformat, pixel_formats[i].wic_format, sizeof(GUID)); + desired_wicformat = pixel_formats[i].wic_format; gdipformat = bitmap->format; break; } } if (!gdipformat) { - memcpy(&wicformat, &GUID_WICPixelFormat32bppBGRA, sizeof(GUID)); + desired_wicformat = &GUID_WICPixelFormat32bppBGRA; gdipformat = PixelFormat32bppARGB; } + memcpy(&wicformat, desired_wicformat, sizeof(GUID)); hr = IWICBitmapFrameEncode_SetPixelFormat(frameencode, &wicformat); } + if (SUCCEEDED(hr) && !IsEqualGUID(desired_wicformat, &wicformat)) + { + /* Encoder doesn't support this bitmap's format. */ + gdipformat = 0; + for (i=0; pixel_formats[i].wic_format; i++) + { + if (IsEqualGUID(&wicformat, pixel_formats[i].wic_format)) + { + gdipformat = bitmap->format; + break; + } + } + if (!gdipformat) + { + ERR("Cannot support encoder format %s\n", debugstr_guid(&wicformat)); + hr = E_FAIL; + } + } + if (SUCCEEDED(hr)) { stat = GdipBitmapLockBits(bitmap, &rc, ImageLockModeRead, gdipformat,

1 0

Vincent Povirk : gdiplus: Don' t expand the drawing area to include empty glyphs.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: 85b989c1fa09793e41b81a798f10f4649f8d6b39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85b989c1fa09793e41b81a798… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Sep 20 13:15:54 2013 -0500 gdiplus: Don't expand the drawing area to include empty glyphs. --- dlls/gdiplus/graphics.c | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 3c4b479..bd9b70b 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -6208,15 +6208,18 @@ static GpStatus SOFTWARE_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UI if (glyphsize > max_glyphsize) max_glyphsize = glyphsize; - left = pti[i].x + glyphmetrics.gmptGlyphOrigin.x; - top = pti[i].y - glyphmetrics.gmptGlyphOrigin.y; - right = pti[i].x + glyphmetrics.gmptGlyphOrigin.x + glyphmetrics.gmBlackBoxX; - bottom = pti[i].y - glyphmetrics.gmptGlyphOrigin.y + glyphmetrics.gmBlackBoxY; - - if (left < min_x) min_x = left; - if (top < min_y) min_y = top; - if (right > max_x) max_x = right; - if (bottom > max_y) max_y = bottom; + if (glyphsize != 0) + { + left = pti[i].x + glyphmetrics.gmptGlyphOrigin.x; + top = pti[i].y - glyphmetrics.gmptGlyphOrigin.y; + right = pti[i].x + glyphmetrics.gmptGlyphOrigin.x + glyphmetrics.gmBlackBoxX; + bottom = pti[i].y - glyphmetrics.gmptGlyphOrigin.y + glyphmetrics.gmBlackBoxY; + + if (left < min_x) min_x = left; + if (top < min_y) min_y = top; + if (right > max_x) max_x = right; + if (bottom > max_y) max_y = bottom; + } if (i+1 < length && (flags & DriverStringOptionsRealizedAdvance) == DriverStringOptionsRealizedAdvance) {

1 0

Vincent Povirk : gdiplus: Skip drawing lines of text with only empty glyphs .
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: ce9de5c4bb1470e0545cbdb2000fff3f9d164687 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce9de5c4bb1470e0545cbdb20… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Sep 20 13:12:45 2013 -0500 gdiplus: Skip drawing lines of text with only empty glyphs. --- dlls/gdiplus/graphics.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index a642bd8..3c4b479 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -6225,6 +6225,10 @@ static GpStatus SOFTWARE_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UI } } + if (max_glyphsize == 0) + /* Nothing to draw. */ + return Ok; + glyph_mask = GdipAlloc(max_glyphsize); text_mask = GdipAlloc((max_x - min_x) * (max_y - min_y)); text_mask_stride = max_x - min_x;

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
65
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 September 2013