November 2010 - Wine-Commits

André Hentschel : include: Merge the ia64 ifdefs into one.
by Alexandre Julliard Nov. 1, 2010

Nov. 1, 2010

Module: wine Branch: master Commit: 5f6ea28c99ce86ea811499c360d9770ba5824e75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f6ea28c99ce86ea811499c36… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Oct 29 17:13:21 2010 +0200 include: Merge the ia64 ifdefs into one. --- include/winnt.h | 474 +++++++++++++++++++++++++++---------------------------- 1 files changed, 235 insertions(+), 239 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5f6ea28c99ce86ea81149…

1 0

Aric Stewart : ups10: Corrected rtl implementation for ScriptStringXtoCP and ScriptStringXtoCP.
by Alexandre Julliard Nov. 1, 2010

Nov. 1, 2010

Module: wine Branch: master Commit: 7891f05b88ab7b274c4cb9d4864ee92612ff241d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7891f05b88ab7b274c4cb9d48… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Oct 29 13:48:48 2010 -0500 ups10: Corrected rtl implementation for ScriptStringXtoCP and ScriptStringXtoCP. --- dlls/usp10/tests/usp10.c | 16 +++++----------- dlls/usp10/usp10.c | 24 ++++++++++++++++++++---- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 1b7bab4..56385c6 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1363,7 +1363,7 @@ static void test_ScriptStringXtoCP_CPtoX(HDC hdc) hr = ScriptStringCPtoX(ssa, Cp, FALSE, &lead); ok(hr == S_OK, "ScriptStringCPtoX should return S_OK not %08x\n", hr); if (rtl[Cp]) - todo_wine ok(lead > trail, "Leading values should be after trialing for rtl chracters(%i)\n",Cp); + ok(lead > trail, "Leading values should be after trialing for rtl chracters(%i)\n",Cp); else ok(lead < trail, "Trailing values should be after leading for ltr chracters(%i)\n",Cp); @@ -1375,9 +1375,7 @@ static void test_ScriptStringXtoCP_CPtoX(HDC hdc) if (rtl[Cp]) X--; else X++; hr = ScriptStringXtoCP(ssa, X, &Ch, &iTrailing); ok(hr == S_OK, "ScriptStringXtoCP should return S_OK not %08x\n", hr); - if (rtl[Cp]) todo_wine ok(Cp == Ch, "ScriptStringXtoCP should return Ch = %d not %d for X = %d\n", Cp, Ch, trail); - if (rtl[Cp]) todo_wine ok(iTrailing == FALSE, "ScriptStringXtoCP should return iTrailing = 0 not %d for X = %d\n", iTrailing, X); @@ -1386,9 +1384,7 @@ static void test_ScriptStringXtoCP_CPtoX(HDC hdc) if (rtl[Cp]) X++; else X--; hr = ScriptStringXtoCP(ssa, X, &Ch, &iTrailing); ok(hr == S_OK, "ScriptStringXtoCP should return S_OK not %08x\n", hr); - if (rtl[Cp]) todo_wine ok(Cp == Ch, "ScriptStringXtoCP should return Ch = %d not %d for X = %d\n", Cp, Ch, trail); - if (rtl[Cp]) todo_wine ok(iTrailing == TRUE, "ScriptStringXtoCP should return iTrailing = 1 not %d for X = %d\n", iTrailing, X); @@ -1399,10 +1395,9 @@ static void test_ScriptStringXtoCP_CPtoX(HDC hdc) X++; hr = ScriptStringXtoCP(ssa, X, &Ch, &iTrailing); ok(hr == S_OK, "ScriptStringXtoCP should return S_OK not %08x\n", hr); - if (rtl[Cp]) todo_wine ok(Cp + 1 == Ch, "ScriptStringXtoCP should return Ch = %d not %d for X = %d\n", Cp + 1, Ch, trail); if (rtl[Cp+1]) - todo_wine ok(iTrailing == TRUE, "ScriptStringXtoCP should return iTrailing = 1 not %d for X = %d\n", + ok(iTrailing == TRUE, "ScriptStringXtoCP should return iTrailing = 1 not %d for X = %d\n", iTrailing, X); else ok(iTrailing == FALSE, "ScriptStringXtoCP should return iTrailing = 0 not %d for X = %d\n", @@ -1416,10 +1411,9 @@ static void test_ScriptStringXtoCP_CPtoX(HDC hdc) X--; hr = ScriptStringXtoCP(ssa, X, &Ch, &iTrailing); ok(hr == S_OK, "ScriptStringXtoCP should return S_OK not %08x\n", hr); - if (rtl[Cp]) todo_wine ok(Cp - 1 == Ch, "ScriptStringXtoCP should return Ch = %d not %d for X = %d\n", Cp - 1, Ch, trail); if (Cp != 0 && rtl[Cp-1]) - todo_wine ok(iTrailing == FALSE, "ScriptStringXtoCP should return iTrailing = 0 not %d for X = %d\n", + ok(iTrailing == FALSE, "ScriptStringXtoCP should return iTrailing = 0 not %d for X = %d\n", iTrailing, X); else ok(iTrailing == TRUE, "ScriptStringXtoCP should return iTrailing = 1 not %d for X = %d\n", @@ -1436,8 +1430,8 @@ static void test_ScriptStringXtoCP_CPtoX(HDC hdc) X--; hr = ScriptStringXtoCP(ssa, X, &Ch, &iTrailing); ok(hr == S_OK, "ScriptStringXtoCP should return S_OK not %08x\n", hr); - todo_wine ok(Ch == 1, "ScriptStringXtoCP should return Ch = 1 not %d for X outside leading edge when rtl\n", Ch); - todo_wine ok(iTrailing == FALSE, "ScriptStringXtoCP should return iTrailing = 0 not %d for X = outside leading edge when rtl\n", + ok(Ch == 1, "ScriptStringXtoCP should return Ch = 1 not %d for X outside leading edge when rtl\n", Ch); + ok(iTrailing == FALSE, "ScriptStringXtoCP should return iTrailing = 0 not %d for X = outside leading edge when rtl\n", iTrailing); } else diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 65f6d2c..e483868 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -936,6 +936,7 @@ HRESULT WINAPI ScriptStringCPtoX(SCRIPT_STRING_ANALYSIS ssa, int icp, BOOL fTrai int runningX = 0; int runningCp = 0; StringAnalysis* analysis = ssa; + BOOL itemTrailing; TRACE("(%p), %d, %d, (%p)\n", ssa, icp, fTrailing, pX); @@ -950,15 +951,19 @@ HRESULT WINAPI ScriptStringCPtoX(SCRIPT_STRING_ANALYSIS ssa, int icp, BOOL fTrai for(i=0; i<analysis->numItems; i++) { + if (analysis->pItem[i].a.fRTL) + itemTrailing = !fTrailing; + else + itemTrailing = fTrailing; for(j=0; j<analysis->glyphs[i].numGlyphs; j++) { - if(runningCp == icp && fTrailing == FALSE) + if(runningCp == icp && itemTrailing == FALSE) { *pX = runningX; return S_OK; } runningX += analysis->glyphs[i].piAdvance[j]; - if(runningCp == icp && fTrailing == TRUE) + if(runningCp == icp && itemTrailing == TRUE) { *pX = runningX; return S_OK; @@ -992,8 +997,16 @@ HRESULT WINAPI ScriptStringXtoCP(SCRIPT_STRING_ANALYSIS ssa, int iX, int* piCh, /* out of range */ if(iX < 0) { - *piCh = -1; - *piTrailing = TRUE; + if (analysis->pItem[0].a.fRTL) + { + *piCh = 1; + *piTrailing = FALSE; + } + else + { + *piCh = -1; + *piTrailing = TRUE; + } return S_OK; } @@ -1009,6 +1022,9 @@ HRESULT WINAPI ScriptStringXtoCP(SCRIPT_STRING_ANALYSIS ssa, int iX, int* piCh, *piTrailing = TRUE; else *piTrailing = FALSE; + + if (analysis->pItem[i].a.fRTL) + *piTrailing = !*piTrailing; return S_OK; } runningX += width;

1 0

Yaron Shahrabani : hhctrl.ocx: Added Hebrew translation.
by Alexandre Julliard Nov. 1, 2010

Nov. 1, 2010

Module: wine Branch: master Commit: b36946038283c19a4a8c762c937a9e88107de70d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b36946038283c19a4a8c762c9… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Wed Oct 27 12:35:11 2010 +0200 hhctrl.ocx: Added Hebrew translation. --- dlls/hhctrl.ocx/He.rc | 63 +++++++++++++++++++++++++++++++++++++++++++ dlls/hhctrl.ocx/Makefile.in | 1 + 2 files changed, 64 insertions(+), 0 deletions(-) diff --git a/dlls/hhctrl.ocx/He.rc b/dlls/hhctrl.ocx/He.rc new file mode 100644 index 0000000..8b1faa3 --- /dev/null +++ b/dlls/hhctrl.ocx/He.rc @@ -0,0 +1,63 @@ +/* + * HTML Help resources + * Hebrew Language Support + * + * Copyright 2005 James Hawkins + * Copyright 2010 Yaron Shahrabani <sh.yaron(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +#pragma code_page(65001) + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_CONTENTS "&תכנים" + IDS_INDEX "מ&פתח נושאים" + IDS_SEARCH "&חיפוש" + IDS_FAVORITES "מו&עדפים" +END + +STRINGTABLE +BEGIN + IDTB_EXPAND "הצגה" + IDTB_CONTRACT "הסתרה" + IDTB_STOP "עצירה" + IDTB_REFRESH "רענון" + IDTB_BACK "חזרה" + IDTB_HOME "דף הבית" + IDTB_SYNC "סנכרון" + IDTB_PRINT "הדפסה" + IDTB_OPTIONS "אפשרויות" + IDTB_FORWARD "קדימה" + IDTB_NOTES "IDTB_NOTES" + IDTB_BROWSE_FWD "IDTB_BROWSE_FWD" + IDTB_BROWSE_BACK "IDT_BROWSE_BACK" + IDTB_CONTENTS "IDTB_CONTENTS" + IDTB_INDEX "IDTB_INDEX" + IDTB_SEARCH "IDTB_SEARCH" + IDTB_HISTORY "IDTB_HISTORY" + IDTB_FAVORITES "IDTB_FAVORITES" + IDTB_JUMP1 "מעבר 1" + IDTB_JUMP2 "מעבר 2" + IDTB_CUSTOMIZE "התאמה אישית" + IDTB_ZOOM "תקריב" + IDTB_TOC_NEXT "IDTB_TOC_NEXT" + IDTB_TOC_PREV "IDTB_TOC_PREV" +END diff --git a/dlls/hhctrl.ocx/Makefile.in b/dlls/hhctrl.ocx/Makefile.in index 7e3ced1..737a614 100644 --- a/dlls/hhctrl.ocx/Makefile.in +++ b/dlls/hhctrl.ocx/Makefile.in @@ -21,6 +21,7 @@ RC_SRCS = \ Es.rc \ Fi.rc \ Fr.rc \ + He.rc \ Hu.rc \ It.rc \ Ja.rc \

1 0

Alexandre Julliard : patches: Add a "bad sequence" patch status.
by Alexandre Julliard Nov. 1, 2010

Nov. 1, 2010

Module: tools Branch: master Commit: 0ac1df0fd92d3854ab9142621207a8519ba8b95f URL: http://source.winehq.org/git/tools.git/?a=commit;h=0ac1df0fd92d3854ab914262… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 1 12:54:19 2010 +0100 patches: Add a "bad sequence" patch status. --- patches/expire | 1 + patches/patches.css | 1 + patches/update | 2 ++ 3 files changed, 4 insertions(+), 0 deletions(-) diff --git a/patches/expire b/patches/expire index fb72956..c4d49f3 100755 --- a/patches/expire +++ b/patches/expire @@ -35,6 +35,7 @@ my %status_expiry = "rejected" => 7, "split" => 7, "depend" => 7, + "sequence" => 7, "superseded" => 1, "testcase" => 7, "testfail" => 7, diff --git a/patches/patches.css b/patches/patches.css index 4aa21ec..6e0e206 100644 --- a/patches/patches.css +++ b/patches/patches.css @@ -50,6 +50,7 @@ tr.odd { background-color: #f8e8e8; } .testbot, .testbot :link, .testbot :visited { color: green; } .depend, .depend :link, .depend :visited { color: #e08000; } .superseded, .superseded :link, .superseded :visited { color: #e08000; } +.sequence, .sequence :link, .sequence :visited { color: #e08000; } .deferred, .deferred :link, .deferred :visited { color: #e08000; } .testcase, .testcase :link, .testcase :visited { color: #e08000; } .other, .other :link, .other :visited { color: #e08000; } diff --git a/patches/update b/patches/update index d9387f9..ef24a7f 100755 --- a/patches/update +++ b/patches/update @@ -38,6 +38,7 @@ my %status_descr = "split" => "Needs splitting", "depend" => "Dependency", "superseded" => "Superseded", + "sequence" => "Bad sequence", "testcase" => "Needs tests", "testfail" => "Test failure", ); @@ -50,6 +51,7 @@ my @legend = [ "committed", "<ul><li>You have done everything right; congratulations!</li>" . "<li>You screwed up but AJ missed it, send a fix before someone notices ;-)</li></ul>" ], [ "depend", "<ul><li>The patch is part of a series in which a previous patch hasn't been applied. Resend when the dependent patch is fixed.</li></ul>" ], + [ "sequence", "<ul><li>The patch is part of a series but it's not correctly numbered. Resend the series with correct sequence numbers to enable the <a href=\"http://testbot.winehq.org/\">testbot</a> to figure it out.</li></ul>" ], [ "superseded", "<ul><li>An updated version of the patch has been submitted.</li>" . "<li>Someone else fixed the problem already.</li></ul>" ], [ "testcase", "<ul><li>You need to write some test cases demonstrating that the patch is correct.</li></ul>" ],

1 0

Frédéric Delanoy : French translation for release 1.3.6
by Jeremy Newman Nov. 1, 2010

Nov. 1, 2010

Module: website Branch: master Commit: 2afbc10cd4bd89629b7c45ac0a1f8d03683d42d1 URL: http://source.winehq.org/git/website.git/?a=commit;h=2afbc10cd4bd89629b7c45… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Oct 30 00:17:31 2010 +0200 French translation for release 1.3.6 --- news/fr/2010102901.xml | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/news/fr/2010102901.xml b/news/fr/2010102901.xml new file mode 100644 index 0000000..655ce57 --- /dev/null +++ b/news/fr/2010102901.xml @@ -0,0 +1,21 @@ +<news> +<date>29 octobre 2010</date> +<title>Sortie de Wine 1.3.6</title> +<body> + La version de développement 1.3.6 de Wine est à présent disponible. + <a href="{$root}/announce/1.3.6">Nouveautés</a> de cette version : +<ul> + <li>Support des filtres GStreamer.</li> + <li>Curseurs standards associés aux curseurs natifs du bureau.</li> + <li>Meilleure prise en charge des programmes d'installations utilisant des services.</li> + <li>Diverses améliorations MSXML.</li> + <li>Décodeur pour les images au format TGA.</li> + <li>Mises à jour de traductions.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a +href="http://prdownloads.sourceforge.net/wine/wine-1.3.6.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. +</body></news>

1 0

André Hentschel : Wine 1.3.6 freigegeben
by Jeremy Newman Nov. 1, 2010

Nov. 1, 2010

Module: website Branch: master Commit: ae53354eeb671edb616fb35d1fc19b24e24f8a87 URL: http://source.winehq.org/git/website.git/?a=commit;h=ae53354eeb671edb616fb3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Oct 29 20:20:58 2010 +0200 Wine 1.3.6 freigegeben --- news/de/2010102901.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/de/2010102901.xml b/news/de/2010102901.xml new file mode 100644 index 0000000..3bd57f5 --- /dev/null +++ b/news/de/2010102901.xml @@ -0,0 +1,18 @@ +<news> +<date>29. Oktober 2010</date> +<title>Wine 1.3.6 freigegeben</title> +<body> + Die Entwicklungsversion 1.3.6 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.3.6">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung für GStreamer Filter.</li> + <li>Anzeigen von Standard Mauszeigern als native Desktop Zeiger.</li> + <li>Verbesserte Unterstützung für Installer mit Diensten.</li> + <li>Viele MSXML Verbesserungen.</li> + <li>Decoder für TGA-formatierte Bilder.</li> + <li>Updates in den Übersetzungen.</li> + <li>Verschiedenste Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.6.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0