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

Akihiro Sagawa : gdi32/tests: Make GetStockObject tests pass on East-Asian machines.
by Alexandre Julliard 18 Jun '12

18 Jun '12

Module: wine Branch: master Commit: afdc84cf0366c8e161004bf1e7bf9ccedbb4c45a URL: http://source.winehq.org/git/wine.git/?a=commit;h=afdc84cf0366c8e161004bf1e… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Jun 16 23:15:51 2012 +0900 gdi32/tests: Make GetStockObject tests pass on East-Asian machines. --- dlls/gdi32/tests/font.c | 116 +++++++++++++++++++++++++++++++++++------------ 1 files changed, 87 insertions(+), 29 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 9e5602b..218b980 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4373,38 +4373,69 @@ static int get_font_dpi(const LOGFONT *lf) static void test_stock_fonts(void) { + static const int font[] = + { + ANSI_FIXED_FONT, ANSI_VAR_FONT, SYSTEM_FONT, DEVICE_DEFAULT_FONT, DEFAULT_GUI_FONT + /* SYSTEM_FIXED_FONT, OEM_FIXED_FONT */ + }; static const struct test_data { - int id, weight, height, dpi; + int charset, weight, height, dpi; const char face_name[LF_FACESIZE]; - } td[] = + } td[][11] = { - { ANSI_FIXED_FONT, FW_NORMAL, 12, 96, "Courier" }, - { ANSI_FIXED_FONT, FW_NORMAL, 12, 120, "Courier" }, - { ANSI_VAR_FONT, FW_NORMAL, 12, 96, "MS Sans Serif" }, - { ANSI_VAR_FONT, FW_NORMAL, 12, 120, "MS Sans Serif" }, - { SYSTEM_FONT, FW_BOLD, 16, 96, "System" }, - { SYSTEM_FONT, FW_BOLD, 20, 120, "System" }, - { DEVICE_DEFAULT_FONT, FW_BOLD, 16, 96, "System" }, - { DEVICE_DEFAULT_FONT, FW_BOLD, 20, 120, "System" }, - { DEFAULT_GUI_FONT, FW_NORMAL, -11, 96, "MS Shell Dlg" }, - { DEFAULT_GUI_FONT, FW_NORMAL, -13, 120, "MS Shell Dlg" } - - /*{ SYSTEM_FIXED_FONT, FW_NORMAL, 15, 96, "Fixedsys" },*/ - /*{ SYSTEM_FIXED_FONT, FW_NORMAL, 20, 120, "Fixedsys" },*/ - /*{ OEM_FIXED_FONT, FW_NORMAL, 16, 96, "Terminal" },*/ - /*{ OEM_FIXED_FONT, FW_NORMAL, 20, 120, "Terminal" },*/ + { /* ANSI_FIXED_FONT */ + { DEFAULT_CHARSET, FW_NORMAL, 12, 96, "Courier" }, + { DEFAULT_CHARSET, FW_NORMAL, 12, 120, "Courier" }, + { 0 } + }, + { /* ANSI_VAR_FONT */ + { DEFAULT_CHARSET, FW_NORMAL, 12, 96, "MS Sans Serif" }, + { DEFAULT_CHARSET, FW_NORMAL, 12, 120, "MS Sans Serif" }, + { 0 } + }, + { /* SYSTEM_FONT */ + { SHIFTJIS_CHARSET, FW_NORMAL, 18, 96, "System" }, + { SHIFTJIS_CHARSET, FW_NORMAL, 22, 120, "System" }, + { HANGEUL_CHARSET, FW_NORMAL, 16, 96, "System" }, + { HANGEUL_CHARSET, FW_NORMAL, 20, 120, "System" }, + { DEFAULT_CHARSET, FW_BOLD, 16, 96, "System" }, + { DEFAULT_CHARSET, FW_BOLD, 20, 120, "System" }, + { 0 } + }, + { /* DEVICE_DEFAULT_FONT */ + { SHIFTJIS_CHARSET, FW_NORMAL, 18, 96, "System" }, + { SHIFTJIS_CHARSET, FW_NORMAL, 22, 120, "System" }, + { HANGEUL_CHARSET, FW_NORMAL, 16, 96, "System" }, + { HANGEUL_CHARSET, FW_NORMAL, 20, 120, "System" }, + { DEFAULT_CHARSET, FW_BOLD, 16, 96, "System" }, + { DEFAULT_CHARSET, FW_BOLD, 20, 120, "System" }, + { 0 } + }, + { /* DEFAULT_GUI_FONT */ + { SHIFTJIS_CHARSET, FW_NORMAL, -12, 96, "?MS UI Gothic" }, + { SHIFTJIS_CHARSET, FW_NORMAL, -15, 120, "?MS UI Gothic" }, + { HANGEUL_CHARSET, FW_NORMAL, -12, 96, "?Gulim" }, + { HANGEUL_CHARSET, FW_NORMAL, -15, 120, "?Gulim" }, + { GB2312_CHARSET, FW_NORMAL, -12, 96, "?SimHei" }, + { GB2312_CHARSET, FW_NORMAL, -15, 120, "?SimHei" }, + { CHINESEBIG5_CHARSET, FW_NORMAL, -12, 96, "?MingLiU" }, + { CHINESEBIG5_CHARSET, FW_NORMAL, -15, 120, "?MingLiU" }, + { DEFAULT_CHARSET, FW_NORMAL, -11, 96, "MS Shell Dlg" }, + { DEFAULT_CHARSET, FW_NORMAL, -13, 120, "MS Shell Dlg" }, + { 0 } + } }; - int i; + int i, j; - for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + for (i = 0; i < sizeof(font)/sizeof(font[0]); i++) { HFONT hfont; LOGFONT lf; int ret; - hfont = GetStockObject(td[i].id); - ok(hfont != 0, "%d: GetStockObject(%d) failed\n", i, td[i].id); + hfont = GetStockObject(font[i]); + ok(hfont != 0, "%d: GetStockObject(%d) failed\n", i, font[i]); ret = GetObject(hfont, sizeof(lf), &lf); if (ret != sizeof(lf)) @@ -4414,16 +4445,43 @@ static void test_stock_fonts(void) continue; } - ret = get_font_dpi(&lf); - if (ret != td[i].dpi) + for (j = 0; td[i][j].face_name[0] != 0; j++) { - trace("%d: font %s %d dpi doesn't match test data %d\n", i, lf.lfFaceName, ret, td[i].dpi); - continue; - } + if (lf.lfCharSet != td[i][j].charset && td[i][j].charset != DEFAULT_CHARSET) + { + continue; + } - ok(td[i].weight == lf.lfWeight, "%d: expected lfWeight %d, got %d\n", i, td[i].weight, lf.lfWeight); - ok(td[i].height == lf.lfHeight, "%d: expected lfHeight %d, got %d\n", i, td[i].height, lf.lfHeight); - ok(!lstrcmp(td[i].face_name, lf.lfFaceName), "%d: expected lfFaceName %s, got %s\n", i, td[i].face_name, lf.lfFaceName); + ret = get_font_dpi(&lf); + if (ret != td[i][j].dpi) + { + trace("%d(%d): font %s %d dpi doesn't match test data %d\n", + i, j, lf.lfFaceName, ret, td[i][j].dpi); + continue; + } + + if ((font[i] == DEVICE_DEFAULT_FONT || font[i] == SYSTEM_FONT) && td[i][j].charset != DEFAULT_CHARSET) + todo_wine ok(td[i][j].weight == lf.lfWeight, "%d(%d): expected lfWeight %d, got %d\n", i, j, td[i][j].weight, lf.lfWeight); + else + ok(td[i][j].weight == lf.lfWeight, "%d(%d): expected lfWeight %d, got %d\n", i, j, td[i][j].weight, lf.lfWeight); + if ((font[i] == DEFAULT_GUI_FONT && td[i][j].charset != DEFAULT_CHARSET) || + ((font[i] == DEVICE_DEFAULT_FONT || font[i] == SYSTEM_FONT) && td[i][j].charset == SHIFTJIS_CHARSET)) + todo_wine ok(td[i][j].height == lf.lfHeight, "%d(%d): expected lfHeight %d, got %d\n", i, j, td[i][j].height, lf.lfHeight); + else + ok(td[i][j].height == lf.lfHeight, "%d(%d): expected lfHeight %d, got %d\n", i, j, td[i][j].height, lf.lfHeight); + if (td[i][j].face_name[0] == '?') + { + /* Wine doesn't have this font, skip this case for now. + Actually, the face name is localized on Windows and varies + dpending on Windows versions (e.g. Japanese NT4 vs win2k). */ + trace("%d(%d): default gui font is %s\n", i, j, lf.lfFaceName); + } + else + { + ok(!lstrcmp(td[i][j].face_name, lf.lfFaceName), "%d(%d): expected lfFaceName %s, got %s\n", i, j, td[i][j].face_name, lf.lfFaceName); + } + break; + } } }

1 0

André Hentschel : Wine 1.4.1 freigegeben
by Jeremy Newman 18 Jun '12

18 Jun '12

Module: website Branch: master Commit: baeb750e78ddb851ebcbc68439023675f0b80d12 URL: http://source.winehq.org/git/website.git/?a=commit;h=baeb750e78ddb851ebcbc6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jun 15 22:44:07 2012 +0200 Wine 1.4.1 freigegeben --- news/de/2012061501.xml | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/news/de/2012061501.xml b/news/de/2012061501.xml new file mode 100644 index 0000000..3390214 --- /dev/null +++ b/news/de/2012061501.xml @@ -0,0 +1,13 @@ +<news> +<date>15. Juni 2012</date> +<title>Wine 1.4.1 freigegeben</title> +<body> +<p> Die Wartungsversion 1.4.1 von Wine ist jetzt verfügbar.</p> +<p> <a href="{$root}/announce/1.4.1">Neuerungen (en)</a> in dieser Version:</p> +<ul> + <li>Updates in den Übersetzungen.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +<p>Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.4.1.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</p></body></news>

1 0

André Hentschel : Update German Homepage
by Jeremy Newman 18 Jun '12

18 Jun '12

Module: website Branch: master Commit: a8abbfbf84e61eb3735db846bec801a6b5ecdb01 URL: http://source.winehq.org/git/website.git/?a=commit;h=a8abbfbf84e61eb3735db8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jun 15 23:10:32 2012 +0200 Update German Homepage --- templates/de/home.template | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/templates/de/home.template b/templates/de/home.template index b961325..fe2a0c4 100644 --- a/templates/de/home.template +++ b/templates/de/home.template @@ -1,7 +1,7 @@ - - + +  - +  <div id="main_left"> @@ -14,8 +14,8 @@ <div class="info" onClick="document.location='{$root}/about/';"> <div class="icon"></div> <div class="text"> - <div class="title"><a href="{$root}/about/">Über</a></div> - <div class="subtitle">Erfahre mehr über das Wine-Projekt.</div> + <div class="title"><a href="{$root}/about/">Über</a></div> + <div class="subtitle">Erfahre mehr über das Wine-Projekt.</div> </div> </div> @@ -30,8 +30,8 @@ <div class="help" onClick="document.location='{$root}/help/';"> <div class="icon"></div> <div class="text"> - <div class="title"><a href="{$root}/help/">Unterstützung</a></div> - <div class="subtitle">Bekomme Hilfe zum Benutzen von Wine.</div> + <div class="title"><a href="{$root}/help/">Unterstützung</a></div> + <div class="subtitle">Hilfe zur Verwendung von Wine erhalten.</div> </div> </div> @@ -70,14 +70,14 @@ <td style="padding-left: 15px; padding-bottom: 2px;"> <b><a href="{$root}/announce/{$config_stable_release}">Wine {$config_stable_release}</a></b> <span class="small"> - (<a href="http://source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$config_…">Änderungen (en)</a>) + (<a href="http://source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$config_…">Neuerungen (en)</a>) </span> </td></tr> <tr><td>Entwicklungsversion:</td> <td style="padding-left: 15px;"> <b><a href="{$root}/announce/{$config_master_release}">Wine {$config_master_release}</a></b> <span class="small"> - (<a href="http://source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$config_…">Änderungen (en)</a>) + (<a href="http://source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$config_…">Neuerungen (en)</a>) </span> </td></tr> </table>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.4.1
by Jeremy Newman 18 Jun '12

18 Jun '12

Module: website Branch: master Commit: ceb80d07948739671332017eb6abd22b9e25a56b URL: http://source.winehq.org/git/website.git/?a=commit;h=ceb80d0794873967133201… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sun Jun 17 07:47:00 2012 +0200 Polish translation for release 1.4.1 --- news/pl/2012061501.xml | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/news/pl/2012061501.xml b/news/pl/2012061501.xml new file mode 100644 index 0000000..c8fa09f --- /dev/null +++ b/news/pl/2012061501.xml @@ -0,0 +1,13 @@ +<news> +<date>Czerwiec 15, 2012</date> +<title>Wydano Wine 1.4.1</title> +<body> +<p> Poprawione wydanie Wine 1.4.1 jest już dostępne.</p> +<p> <a href="{$root}/announce/1.4.1">Co nowego</a> w tym wydaniu: +<ul> + <li>Aktualizacje tłumaczeń.</li> + <li>Rozmaite poprawki błędów.</li> +</ul></p> +<p><p>Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.4.1.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</p></body></news>

1 0

Frédéric Delanoy : French translation for release 1.4.1
by Jeremy Newman 18 Jun '12

18 Jun '12

Module: website Branch: master Commit: e626795c345b638ba9cbf97f74914cc15907ed4d URL: http://source.winehq.org/git/website.git/?a=commit;h=e626795c345b638ba9cbf9… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jun 18 08:28:51 2012 +0200 French translation for release 1.4.1 --- news/fr/2012061501.xml | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/news/fr/2012061501.xml b/news/fr/2012061501.xml new file mode 100644 index 0000000..8c82bc2 --- /dev/null +++ b/news/fr/2012061501.xml @@ -0,0 +1,12 @@ +<news> +<date>15 juin 2012</date> +<title>Sortie de Wine 1.4.1</title> +<body> +<p> La version de maintenance 1.4.1 de Wine est disponible.</p> +<p> <a href="{$root}/announce/1.4.1">Nouveautés</a> de cette version : +<ul> + <li>Mises à jour de traductions.</li> + <li>Diverses corrections de bogues.</li> +</ul></p> +<p><p>Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.4.1.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</p></body></news>

1 0

Alexandre Julliard : Wine release 1.4.1
by Alexandre Julliard 15 Jun '12

15 Jun '12

Module: website Branch: master Commit: 4137e8beb8ed4eb0a4e64b00a05e581a53ce61be URL: http://source.winehq.org/git/website.git/?a=commit;h=4137e8beb8ed4eb0a4e64b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 15 21:26:22 2012 +0200 Wine release 1.4.1 --- news/en/2012061501.xml | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/news/en/2012061501.xml b/news/en/2012061501.xml new file mode 100644 index 0000000..7c0ff9f --- /dev/null +++ b/news/en/2012061501.xml @@ -0,0 +1,13 @@ +<news> +<date>June 15, 2012</date> +<title>Wine 1.4.1 Released</title> +<body> +<p> The Wine maintenance release 1.4.1 is now available.</p> +<p> <a href="{$root}/announce/1.4.1">What's new</a> in this release: +<ul> + <li>Translation updates.</li> + <li>Various bug fixes.</li> +</ul></p> +<p><p>The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.4.1.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</p></body></news>

1 0

Alexandre Julliard : gdi32: Fix a build failure on Mac OS X.
by Alexandre Julliard 15 Jun '12

15 Jun '12

Module: wine Branch: stable Commit: 7544ec4f40116e95a43d91d43524519cddd39429 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7544ec4f40116e95a43d91d43… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 15 19:16:14 2012 +0200 gdi32: Fix a build failure on Mac OS X. --- dlls/gdi32/freetype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 98c0c0b..ef2f152 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2380,7 +2380,7 @@ static void load_mac_font_callback(const void *value, void *context) if (path && CFStringGetFileSystemRepresentation(pathStr, path, len)) { TRACE("font file %s\n", path); - AddFontToList(path, NULL, 0, ADDFONT_EXTERNAL_FONT | ADDFONT_ADD_TO_CACHE); + AddFontFileToList(path, NULL, NULL, ADDFONT_EXTERNAL_FONT | ADDFONT_ADD_TO_CACHE); } HeapFree(GetProcessHeap(), 0, path); }

1 0

Alexandre Julliard : Release 1.4.1.
by Alexandre Julliard 15 Jun '12

15 Jun '12

Module: wine Branch: stable Commit: c6f036f73dd0a652d23bd1a15e4c8519b6903c7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6f036f73dd0a652d23bd1a15… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 15 21:17:00 2012 +0200 Release 1.4.1. --- ANNOUNCE | 956 +++++++++++++++++++++++++++++++------------------------------ VERSION | 2 +- configure | 18 +- 3 files changed, 498 insertions(+), 478 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c6f036f73dd0a652d23bd…

1 0

Tag wine-1.4.1 : Alexandre Julliard : Release 1.4.1
by Alexandre Julliard 15 Jun '12

15 Jun '12

Module: wine Branch: refs/tags/wine-1.4.1 Tag: b707d0408fbda3e8e0fadc6575986ca943f5d0f8 URL: http://source.winehq.org/git/wine.git/?a=tag;h=b707d0408fbda3e8e0fadc657598… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 15 21:17:00 2012 +0200 Release 1.4.1

1 0

André Hentschel : Fix typo in German news translation
by Jeremy Newman 15 Jun '12

15 Jun '12

Module: website Branch: master Commit: b5fd5abde0685a2fc8c216811194514bd5e4f00f URL: http://source.winehq.org/git/website.git/?a=commit;h=b5fd5abde0685a2fc8c216… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jun 15 00:08:31 2012 +0200 Fix typo in German news translation --- news/de/2012060801.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/news/de/2012060801.xml b/news/de/2012060801.xml index dca71e8..7b94242 100644 --- a/news/de/2012060801.xml +++ b/news/de/2012060801.xml @@ -9,7 +9,7 @@ <li>Systemsteuerungsapplet für Joysticks.</li> <li>Geräteabhängige Bitmaps werden nun durch die DIB Engine gerendert.</li> <li>Unterstützung für Videowiedergabe mit DirectX (VMR-9).</li> - <li>Erste Schritte in Richtungg eines D3D Shader Compilers.</li> + <li>Erste Schritte in Richtung eines D3D Shader Compilers.</li> <li>Fehlerbehebungen für den Build unter DragonFly BSD.</li> <li>Verschiedene Fehlerbehebungen.</li> </ul>

1 0