May 2010 - Wine-Commits - list.winehq.org

Alexandre Julliard : wine.inf: Copy l_intl.nls to the system32 directory.
by Alexandre Julliard May 7, 2010

May 7, 2010

Module: wine Branch: master Commit: 5978e4f0968116d0aef0411f21d6f7773dcbbc5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5978e4f0968116d0aef0411f2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 6 21:04:03 2010 +0200 wine.inf: Copy l_intl.nls to the system32 directory. --- tools/wine.inf.in | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 998ec7e..a8b3e6b 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -30,6 +30,7 @@ signature="$CHICAGO$" RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin32,FakeDlls UpdateInis=SystemIni +CopyFiles=(a)l_intl.nls AddReg=\ Classes,\ ContentIndex,\ @@ -55,6 +56,7 @@ AddReg=\ RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin32,FakeDlls UpdateInis=SystemIni +CopyFiles=(a)l_intl.nls AddReg=\ Classes,\ ContentIndex,\ @@ -81,6 +83,7 @@ AddReg=\ RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDlls UpdateInis=SystemIni +CopyFiles=(a)l_intl.nls AddReg=\ Classes,\ ContentIndex,\ @@ -107,6 +110,7 @@ AddReg=\ [Wow64Install] RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin32,FakeDllsWow64 +CopyFiles=(a)l_intl.nls AddReg=\ CurrentVersion,\ Debugger,\

1 0

Aric Stewart : usp10: Implement mirroring for bidi support.
by Alexandre Julliard May 7, 2010

May 7, 2010

Module: wine Branch: master Commit: 4377cc62f849dbee52ddea1ba3e556ca6bba4938 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4377cc62f849dbee52ddea1ba… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu May 6 08:28:57 2010 -0500 usp10: Implement mirroring for bidi support. --- dlls/usp10/tests/usp10.c | 24 ++++++++++++++++++++++++ dlls/usp10/usp10.c | 39 ++++++++++++++++++++++++++++++++------- 2 files changed, 56 insertions(+), 7 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index f76f95c..2d7641d 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -582,12 +582,15 @@ static void test_ScriptGetCMap(HDC hdc, unsigned short pwOutGlyphs[256]) SCRIPT_CACHE psc = NULL; int cInChars; int cChars; + unsigned short pwOutGlyphs2[256]; unsigned short pwOutGlyphs3[256]; DWORD dwFlags; int cnt; static const WCHAR TestItem1[] = {'T', 'e', 's', 't', 'a', 0}; static const WCHAR TestItem2[] = {0x202B, 'i', 'n', 0x202C,0}; + static const WCHAR TestItem3[] = {'a','b','c','d','(','<','{','[',0x2039,0}; + static const WCHAR TestItem3b[] = {'a','b','c','d',')','>','}',']',0x203A,0}; /* Check to make sure that SCRIPT_CACHE gets allocated ok */ dwFlags = 0; @@ -640,6 +643,27 @@ static void test_ScriptGetCMap(HDC hdc, unsigned short pwOutGlyphs[256]) ok(pwOutGlyphs3[0] == 0, "Glyph 0 should be default glyph\n"); ok(pwOutGlyphs3[3] == 0, "Glyph 0 should be default glyph\n"); + + cInChars = cChars = 9; + hr = ScriptGetCMap(hdc, &psc, TestItem3b, cInChars, dwFlags, pwOutGlyphs2); + ok (hr == S_OK, "ScriptGetCMap should return S_OK not (%08x)\n", hr); + ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n"); + + cInChars = cChars = 9; + dwFlags = SGCM_RTL; + hr = ScriptGetCMap(hdc, &psc, TestItem3, cInChars, dwFlags, pwOutGlyphs3); + ok (hr == S_OK, "ScriptGetCMap should return S_OK not (%08x)\n", hr); + ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n"); + ok(pwOutGlyphs3[0] == pwOutGlyphs2[0], "glyph incorrectly altered\n"); + ok(pwOutGlyphs3[1] == pwOutGlyphs2[1], "glyph incorreclty altered\n"); + ok(pwOutGlyphs3[2] == pwOutGlyphs2[2], "glyph incorreclty altered\n"); + ok(pwOutGlyphs3[3] == pwOutGlyphs2[3], "glyph incorreclty altered\n"); + ok(pwOutGlyphs3[4] == pwOutGlyphs2[4], "glyph not mirrored correctly\n"); + ok(pwOutGlyphs3[5] == pwOutGlyphs2[5], "glyph not mirrored correctly\n"); + ok(pwOutGlyphs3[6] == pwOutGlyphs2[6], "glyph not mirrored correctly\n"); + ok(pwOutGlyphs3[7] == pwOutGlyphs2[7], "glyph not mirrored correctly\n"); + ok(pwOutGlyphs3[8] == pwOutGlyphs2[8], "glyph not mirrored correctly\n"); + hr = ScriptFreeCache( &psc); ok (!psc, "psc is not null after ScriptFreeCache\n"); } diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 3a7fcd1..43a3b5e 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -271,6 +271,12 @@ static HRESULT init_script_cache(const HDC hdc, SCRIPT_CACHE *psc) return S_OK; } +static WCHAR mirror_char( WCHAR ch ) +{ + extern const WCHAR wine_mirror_map[]; + return ch + wine_mirror_map[wine_mirror_map[ch >> 8] + (ch & 0xff)]; +} + /*********************************************************************** * DllMain * @@ -1392,13 +1398,18 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, for (i = 0; i < cChars; i++) { int idx = i; + WCHAR chInput; if (rtl) idx = cChars - 1 - i; - if (!(pwOutGlyphs[i] = get_cache_glyph(psc, pwcChars[idx]))) + if (psa->fRTL) + chInput = mirror_char(pwcChars[idx]); + else + chInput = pwcChars[idx]; + if (!(pwOutGlyphs[i] = get_cache_glyph(psc, chInput))) { WORD glyph; if (!hdc) return E_PENDING; - if (GetGlyphIndicesW(hdc, &pwcChars[idx], 1, &glyph, 0) == GDI_ERROR) return S_FALSE; - pwOutGlyphs[i] = set_cache_glyph(psc, pwcChars[idx], glyph); + if (GetGlyphIndicesW(hdc, &chInput, 1, &glyph, 0) == GDI_ERROR) return S_FALSE; + pwOutGlyphs[i] = set_cache_glyph(psc, chInput, glyph); } } } @@ -1408,6 +1419,7 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, for (i = 0; i < cChars; i++) { int idx = i; + /* No mirroring done here */ if (rtl) idx = cChars - 1 - i; pwOutGlyphs[i] = pwcChars[idx]; } @@ -1534,24 +1546,37 @@ HRESULT WINAPI ScriptGetCMap(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcInChars { for (i = 0; i < cChars; i++) { - if (!(pwOutGlyphs[i] = get_cache_glyph(psc, pwcInChars[i]))) + WCHAR inChar; + if (dwFlags == SGCM_RTL) + inChar = mirror_char(pwcInChars[i]); + else + inChar = pwcInChars[i]; + if (!(pwOutGlyphs[i] = get_cache_glyph(psc, inChar))) { WORD glyph; if (!hdc) return E_PENDING; - if (GetGlyphIndicesW(hdc, &pwcInChars[i], 1, &glyph, GGI_MARK_NONEXISTING_GLYPHS) == GDI_ERROR) return S_FALSE; + if (GetGlyphIndicesW(hdc, &inChar, 1, &glyph, GGI_MARK_NONEXISTING_GLYPHS) == GDI_ERROR) return S_FALSE; if (glyph == 0xffff) { hr = S_FALSE; glyph = 0x0; } - pwOutGlyphs[i] = set_cache_glyph(psc, pwcInChars[i], glyph); + pwOutGlyphs[i] = set_cache_glyph(psc, inChar, glyph); } } } else { TRACE("no glyph translation\n"); - for (i = 0; i < cChars; i++) pwOutGlyphs[i] = pwcInChars[i]; + for (i = 0; i < cChars; i++) + { + WCHAR inChar; + if (dwFlags == SGCM_RTL) + inChar = mirror_char(pwcInChars[i]); + else + inChar = pwcInChars[i]; + pwOutGlyphs[i] = inChar; + } } return hr; }

1 0

Alexandre Julliard : libwine: Generate a table for BiDi character mirroring .
by Alexandre Julliard May 7, 2010

May 7, 2010

Module: wine Branch: master Commit: 6f3f505f0471301f7d621594672a3e72f4c78be7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f3f505f0471301f7d6215946… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 6 19:51:13 2010 +0200 libwine: Generate a table for BiDi character mirroring. --- dlls/usp10/Makefile.in | 1 + dlls/usp10/mirror.c | 437 ++++++++++++++++++++++++++++++++++++++++++++++++ libs/wine/cpmap.pl | 35 ++++ 3 files changed, 473 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6f3f505f0471301f7d621…

1 0

Alexandre Julliard : libwine: Download Unicode data files from unicode. org as needed in cpmap.pl.
by Alexandre Julliard May 7, 2010

May 7, 2010

Module: wine Branch: master Commit: 65a82cb1802386795d8a3b134aa918cb3af74cc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65a82cb1802386795d8a3b134… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 6 18:23:38 2010 +0200 libwine: Download Unicode data files from unicode.org as needed in cpmap.pl. --- libs/wine/cpmap.pl | 68 ++++++++++++++++++++++++++++++++-------------------- 1 files changed, 42 insertions(+), 26 deletions(-) diff --git a/libs/wine/cpmap.pl b/libs/wine/cpmap.pl index 69aae01..6cf7d7e 100755 --- a/libs/wine/cpmap.pl +++ b/libs/wine/cpmap.pl @@ -21,15 +21,12 @@ use strict; -# base directory for ftp.unicode.org files -my $BASEDIR = "ftp.unicode.org/Public/"; -my $MAPPREFIX = $BASEDIR . "MAPPINGS/"; - -# UnicodeData file -my $UNICODEDATA = $BASEDIR . "UNIDATA/UnicodeData.txt"; +# base URLs for www.unicode.org files +my $MAPPINGS = "http://www.unicode.org/Public/MAPPINGS"; +my $UNIDATA = "http://www.unicode.org/Public/5.0.0/ucd"; # Sort keys file -my $SORTKEYS = "www.unicode.org/reports/tr10/allkeys.txt"; +my $SORTKEYS = "http://www.unicode.org/reports/tr10/allkeys.txt"; # Defaults mapping my $DEFAULTS = "./defaults"; @@ -203,6 +200,23 @@ my @compose_table = (); ################################################################ +# fetch a unicode.org file and open it +sub open_data_file($) +{ + my $url = shift; + (my $name = $url) =~ s/^.*\///; + local *FILE; + unless (-f "data/$name") + { + print "Fetching $url...\n"; + mkdir "data"; + !system "wget", "-q", "-O", "data/$name", $url or die "cannot fetch $url"; + } + open FILE, "<data/$name" or die "cannot open data/$name"; + return *FILE; +} + +################################################################ # read in the defaults file sub READ_DEFAULTS($) { @@ -234,12 +248,12 @@ sub READ_DEFAULTS($) } die "Unrecognized line $_\n"; } + close DEFAULTS; # now build mappings from the decomposition field of the Unicode database - open UNICODEDATA, "$UNICODEDATA" or die "Cannot open $UNICODEDATA"; - print "Loading $UNICODEDATA\n"; - while (<UNICODEDATA>) + my $UNICODE_DATA = open_data_file "$UNIDATA/UnicodeData.txt"; + while (<$UNICODE_DATA>) { # Decode the fields ... my ($code, $name, $cat, $comb, $bidi, @@ -344,6 +358,7 @@ sub READ_DEFAULTS($) } $unicode_defaults[$src] = $dst; } + close $UNICODE_DATA; # patch the category of some special characters @@ -360,9 +375,9 @@ sub READ_DEFAULTS($) sub READ_FILE($) { my $name = shift; - open INPUT,$name or die "Cannot open $name"; + my $INPUT = open_data_file $name; - while (<INPUT>) + while (<$INPUT>) { next if /^\#/; # skip comments next if /^$/; # skip empty lines @@ -391,6 +406,7 @@ sub READ_FILE($) } die "$name: Unrecognized line $_\n"; } + close $INPUT; } @@ -485,8 +501,8 @@ sub READ_JIS0208_FILE($) $cp2uni[0xa1c0] = 0xff3c; $uni2cp[0xff3c] = 0xa1c0; - open INPUT, "$name" or die "Cannot open $name"; - while (<INPUT>) + my $INPUT = open_data_file $name; + while (<$INPUT>) { next if /^\#/; # skip comments next if /^$/; # skip empty lines @@ -501,6 +517,7 @@ sub READ_JIS0208_FILE($) } die "$name: Unrecognized line $_\n"; } + close $INPUT; } @@ -511,9 +528,8 @@ sub READ_SORTKEYS_FILE() my @sortkeys = (); for (my $i = 0; $i < 65536; $i++) { $sortkeys[$i] = [ -1, 0, 0, 0, 0 ] }; - open INPUT, "$SORTKEYS" or die "Cannot open $SORTKEYS"; - print "Loading $SORTKEYS\n"; - while (<INPUT>) + my $INPUT = open_data_file $SORTKEYS; + while (<$INPUT>) { next if /^\#/; # skip comments next if /^$/; # skip empty lines @@ -533,7 +549,7 @@ sub READ_SORTKEYS_FILE() } die "$SORTKEYS: Unrecognized line $_\n"; } - close INPUT; + close $INPUT; # compress the keys to 32 bit: # key 1 to 16 bits, key 2 to 8 bits, key 3 to 4 bits, key 4 to 1 bit @@ -1206,9 +1222,9 @@ sub handle_bestfit_file($$$) my ($lb_cur, $lb_end); my @lb_ranges = (); - open INPUT,$MAPPREFIX . $filename or die "Cannot open $filename"; + my $INPUT = open_data_file "$MAPPINGS/$filename" or die "Cannot open $filename"; - while (<INPUT>) + while (<$INPUT>) { next if /^;/; # skip comments next if /^\s*$/; # skip empty lines @@ -1278,7 +1294,7 @@ sub handle_bestfit_file($$$) } die "$filename: Unrecognized line $_\n"; } - close INPUT; + close $INPUT; my $output = sprintf "c_%03d.c", $codepage; open OUTPUT,">$output.new" or die "Cannot create $output"; @@ -1288,7 +1304,7 @@ sub handle_bestfit_file($$$) # dump all tables printf OUTPUT "/* code page %03d (%s) */\n", $codepage, $comment; - printf OUTPUT "/* generated from %s */\n", $MAPPREFIX . $filename; + printf OUTPUT "/* generated from $MAPPINGS/$filename */\n"; printf OUTPUT "/* DO NOT EDIT!! */\n\n"; printf OUTPUT "#include \"wine/unicode.h\"\n\n"; @@ -1310,14 +1326,14 @@ sub HANDLE_FILE(@) @uni2cp = (); # symbol codepage file is special - if ($codepage == 20932) { READ_JIS0208_FILE($MAPPREFIX . $filename); } + if ($codepage == 20932) { READ_JIS0208_FILE "$MAPPINGS/$filename"; } elsif ($codepage == 20127) { fill_20127_codepage(); } elsif ($filename =~ /\/bestfit/) { handle_bestfit_file( $filename, $has_glyphs, $comment ); return; } - else { READ_FILE($MAPPREFIX . $filename); } + else { READ_FILE "$MAPPINGS/$filename"; } ADD_DEFAULT_MAPPINGS(); @@ -1331,8 +1347,8 @@ sub HANDLE_FILE(@) printf OUTPUT "/* code page %03d (%s) */\n", $codepage, $comment; if ($filename) { - printf OUTPUT "/* generated from %s */\n", $MAPPREFIX . $filename; - printf OUTPUT "/* DO NOT EDIT!! */\n\n"; + print OUTPUT "/* generated from $MAPPINGS/$filename */\n"; + print OUTPUT "/* DO NOT EDIT!! */\n\n"; } else {

1 0

Alexandre Julliard : libwine: Update the character tables to Unicode 5.2.
by Alexandre Julliard May 7, 2010

May 7, 2010

1 0

Łukasz Wojniłowicz : Add Ubuntu 10. 04 to Download page (Polish transaltion)
by Jeremy Newman May 6, 2010

May 6, 2010

Module: website Branch: master Commit: 3275aa7b02bcaf42d9b514f933bddc372d45921e URL: http://source.winehq.org/git/website.git/?a=commit;h=3275aa7b02bcaf42d9b514… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Tue May 4 08:35:51 2010 +0200 Add Ubuntu 10.04 to Download page (Polish transaltion) --- templates/pl/download.template | 2 +- templates/pl/download/deb.template | 35 +++++++++++++++++++++-------------- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/templates/pl/download.template b/templates/pl/download.template index 140759b..b53ae15 100644 --- a/templates/pl/download.template +++ b/templates/pl/download.template @@ -57,7 +57,7 @@ <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> <td> <a href="{$root}/download/deb">Ubuntu</a> - binare i źródłowe paczki .deb dla Ubuntu Karmic (9.10), Ubuntu Hardy (8.04), Intrepid (8.10), i Jaunty (9.04) + binare i źródłowe paczki .deb dla Ubuntu Lucid (10.04), Karmic (9.10), Ubuntu Hardy (8.04), Intrepid (8.10), i Jaunty (9.04) <td><a href="mailto:scott(a)open-vote.org">Scott Ritchie</a></td> </tr> diff --git a/templates/pl/download/deb.template b/templates/pl/download/deb.template index b4469b4..e8ebaba 100644 --- a/templates/pl/download/deb.template +++ b/templates/pl/download/deb.template @@ -3,7 +3,7 @@ <h1 class="title"><a href="http://www.ubuntu.com/" target="_new"><img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu Logo" border="0"></a> Wine dla Ubuntu i pochodnych Ubuntu -<a href="http://www.debian.org/" target="_new"><img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu Logo" border="0"></a></h1> +<a href="http://www.ubuntu.com/" target="_new"><img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu Logo" border="0"></a></h1> Ubuntu i inne dystrybucje bazujące na Debianie używają specjalnego narzędzia zwanego APT do zarządzania @@ -28,10 +28,12 @@ działa, to nie musisz używać paczek beta. Otwórz źródła oprogramowania z menu System->Administracja->źródła oprogramowania. Następnie przejdź na zakładkę Oprogramowanie osób trzecich i kliknij Dodaj... -<img src="{$root}/images/distro/ubuntu-softwaresources1.png" width="531" height="509" alt="System->Administration->Software Sources->Third Party Software" border="0"> +<img src="{$root}/images/distro/ubuntu-ppa.png" width="531" height="509" alt="System->Administration->Software Sources->Third Party Software" border="0"> Następnie, wklej jedną z poniższych linijek zależnie od wersji twojego systemu. +Dla Ubuntu Lucid (10.04): +ppa:ubuntu-wine/ppa Dla Ubuntu Karmic (9.10): ppa:ubuntu-wine/ppa Dla Ubuntu Jaunty (9.04): @@ -41,15 +43,16 @@ działa, to nie musisz używać paczek beta. Dla Ubuntu Hardy (8.04): deb http://wine.budgetdedicated.com/apt hardy main #WineHQ - Ubuntu 8.04 "Hardy Heron" -<h2>Przyznanie zaufania repozytorium APT WineHQ i instalowanie Wine:</h2> +<h2>Przyznanie zaufania repozytorium APT WineHQ (tylko dla Ubuntu 9.04 i wcześniejszych):</h2> -Po dodaniu repozytorium, potrzebujesz również dodać -klucz do tego repozytorium do twojej systemowej listy zaufanych kluczy. +Po dodaniu repozytorium, musisz również dodać klucz do tego +repozytorium do swojej systemowej listy zaufanych kluczy. Dla Ubuntu 9.04 i wcześniejszych, <a href="http://wine.budgetdedicated.com/apt/Scott%20Ritchie.gpg">Pobierz -i zapisz klucz Scotta Ritchiego</a> (prawy przycisk myszy -> zapisz jako) na pulpicie. Następnie przejdź na -zakładkę Uwierzytelnianie , kliknij Zaimportuj plik klucza..., i wybierz plik klucza, którego właśnie zapisałeś (Scott Ritchie.gpg). Możesz usunąć ten plik po wykonaniu tego kroku. +i zapisz klucz Scotta Ritchiego</a> (prawy przycisk myszy -> zapisz jako) na pulpicie. +Następnie przejdź na zakładkę Uwierzytelnianie , kliknij Zaimportuj plik klucza..., i wybierz plik klucza, +którego właśnie zapisałeś (Scott Ritchie.gpg). Możesz usunąć ten plik po wykonaniu tego kroku. <img src="{$root}/images/distro/ubuntu-softwaresources2.png" width="531" height="509" alt="System->Administration->Software Sources->Authentication" border="0"> @@ -80,13 +83,17 @@ dostępne w <h2>Alternatywne komendy wiersza poleceń do zainstalowania Wine:</h2> -Możliwe jest także dodanie repozytoriów Wine i -zainstalowanie go z wiersza poleceń. Jest to użyteczne w przypadku -Kubuntu, Xubuntu, i innych pochodnych Ubuntu. +Możliwe jest także dodanie repozytoriów Wine i zainstalowanie go z wiersza poleceń. +Jest to użyteczne w przypadku Kubuntu, Xubuntu, i innych pochodnych Ubuntu. +Aby to zrobić będziesz musiał wpisać poniższe linijki w terminalowym wierszu poleceń + +<h3>Dla Ubuntu 10.04 (Lucid) i 9.10 (Karmic):</h3> + +sudo add-apt-repository ppa:ubuntu-wine/ppa -Najpierw otwórz okno terminalu Aplikacje->Akcesoria->Terminal . Następnie dodaj klucz -repozytorium do systemowej listy zaufanych kluczy APT przez wklejenie -następującej linijki do twojego terminalu: +<h3>Dla Ubuntu 9.04 i wcześniejszych:</h3> +Dodaj klucz repozytorium do swojej systemowej listy zaufanych kluczy poprzez +kopiuj/wklej następujących linijek w terminalu: wget -q http://wine.budgetdedicated.com/apt/387EE263.gpg -O- | sudo apt-key add - @@ -104,4 +111,4 @@ update'. . Teraz możesz zainstalować Wine zwyczajnie lub wpisując 'sud install wine' w terminalu. -Bardzo szybki i niezawodny webhosting dla repozytoriów APT jest łaskawie dostarczany przez <a href="http://www.budgetdedicated.com/">budgetdedicated.com</a>. +Bardzo szybki i niezawodny webhosting dla repozytoriów APT uprzejmie dostarcza <a href="http://www.budgetdedicated.com/">budgetdedicated.com</a>.

1 0

Detlef Riekenberg : msiexec: Use resource in msi for a help dialog to allow translation.
by Alexandre Julliard May 6, 2010

May 6, 2010

Module: wine Branch: master Commit: 2a9b4e0142ea3a2fc24c33bc7dfaa508ecfa8927 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a9b4e0142ea3a2fc24c33bc7… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu May 6 17:24:53 2010 +0200 msiexec: Use resource in msi for a help dialog to allow translation. --- dlls/msi/msi_Bg.rc | 28 +++++++++++++++++- dlls/msi/msi_Da.rc | 28 +++++++++++++++++- dlls/msi/msi_De.rc | 29 +++++++++++++++++- dlls/msi/msi_En.rc | 29 +++++++++++++++++- dlls/msi/msi_Eo.rc | 28 +++++++++++++++++- dlls/msi/msi_Es.rc | 28 +++++++++++++++++- dlls/msi/msi_Fi.rc | 28 +++++++++++++++++- dlls/msi/msi_Fr.rc | 28 +++++++++++++++++- dlls/msi/msi_Hu.rc | 28 +++++++++++++++++- dlls/msi/msi_It.rc | 28 +++++++++++++++++- dlls/msi/msi_Ko.rc | 28 +++++++++++++++++- dlls/msi/msi_Lt.rc | 28 +++++++++++++++++- dlls/msi/msi_Nl.rc | 28 +++++++++++++++++- dlls/msi/msi_No.rc | 28 +++++++++++++++++- dlls/msi/msi_Pl.rc | 28 +++++++++++++++++- dlls/msi/msi_Pt.rc | 56 ++++++++++++++++++++++++++++++++++- dlls/msi/msi_Ro.rc | 28 +++++++++++++++++- dlls/msi/msi_Ru.rc | 28 +++++++++++++++++- dlls/msi/msi_Si.rc | 28 +++++++++++++++++- dlls/msi/msi_Sv.rc | 28 +++++++++++++++++- dlls/msi/msi_Tr.rc | 28 +++++++++++++++++- dlls/msi/msi_Uk.rc | 28 +++++++++++++++++- dlls/msi/msi_Zh.rc | 56 ++++++++++++++++++++++++++++++++++- programs/msiexec/msiexec.c | 70 +++++++++++++++++++++++-------------------- 24 files changed, 714 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2a9b4e0142ea3a2fc24c3…

1 0

Vincent Povirk : ole32: Rewrite transacted storage to be more lazy.
by Alexandre Julliard May 6, 2010

May 6, 2010

Module: wine Branch: master Commit: d07a4868a11a282acafa4cefcf3cac53da82277d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d07a4868a11a282acafa4cefc… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 5 14:23:12 2010 -0500 ole32: Rewrite transacted storage to be more lazy. When creating a new transacted storage object (or reverting an existing one), rather than copy the original storage, we simply create a "stub directory entry" for the root. As stub entries are accessed, we fill in their data from the parent and create new stubs for any linked entries. The streams have copy on write semantics - reads are from the original entry until a change is made, then we make a copy in the scratch file. When committing transacted storages, we have to create a new tree with the new data so that the storage entry can be modified in one step, but unmodified sections of the tree can now be shared between the new tree and the old. An entry can be shared if it and all entries reachable from it are unmodified. In the trivial case where nothing has been modified, we don't have to make a new tree at all. --- dlls/ole32/storage32.c | 792 +++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 646 insertions(+), 146 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d07a4868a11a282acafa4…

1 0

Huw Davies : gdi32: Add support for ETO_PDY and improve world transform support.
by Alexandre Julliard May 6, 2010

May 6, 2010

Module: wine Branch: master Commit: d92ed5bd079fc83ba30e17bb9776ad8db8c316a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d92ed5bd079fc83ba30e17bb9… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 6 14:05:39 2010 +0100 gdi32: Add support for ETO_PDY and improve world transform support. --- dlls/gdi32/font.c | 135 +++++++++++++++++++++++++++----------------- dlls/gdi32/path.c | 32 ++++------- dlls/wineps.drv/text.c | 17 +++-- dlls/winex11.drv/xrender.c | 105 ++++++++++++++++++++-------------- 4 files changed, 166 insertions(+), 123 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d92ed5bd079fc83ba30e1…

1 0

Vincent Povirk : ole32: Always move unmodified streams instead of copying on commit.
by Alexandre Julliard May 6, 2010

May 6, 2010

Module: wine Branch: master Commit: e40afcb2b66bcd8609cb086f00b7e5ce3f11dcb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e40afcb2b66bcd8609cb086f0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 4 17:40:55 2010 -0500 ole32: Always move unmodified streams instead of copying on commit. --- dlls/ole32/storage32.c | 107 ++++++++++++++++++++++++++++++++++++++++++----- dlls/ole32/storage32.h | 11 +++++ 2 files changed, 106 insertions(+), 12 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index a9354c9..8bae897 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2351,6 +2351,21 @@ static BlockChainStream **StorageImpl_GetCachedBlockChainStream(StorageImpl *Thi return &This->blockChainCache[free_index]; } +static void StorageImpl_DeleteCachedBlockChainStream(StorageImpl *This, DirRef index) +{ + int i; + + for (i=0; i<BLOCKCHAIN_CACHE_SIZE; i++) + { + if (This->blockChainCache[i] && This->blockChainCache[i]->ownerDirEntry == index) + { + BlockChainStream_Destroy(This->blockChainCache[i]); + This->blockChainCache[i] = NULL; + return; + } + } +} + static HRESULT StorageImpl_StreamReadAt(StorageBaseImpl *base, DirRef index, ULARGE_INTEGER offset, ULONG size, void *buffer, ULONG *bytesRead) { @@ -2542,6 +2557,30 @@ static HRESULT StorageImpl_StreamWriteAt(StorageBaseImpl *base, DirRef index, } } +static HRESULT StorageImpl_StreamLink(StorageBaseImpl *base, DirRef dst, + DirRef src) +{ + StorageImpl *This = (StorageImpl*)base; + DirEntry dst_data, src_data; + HRESULT hr; + + hr = StorageImpl_ReadDirEntry(This, dst, &dst_data); + + if (SUCCEEDED(hr)) + hr = StorageImpl_ReadDirEntry(This, src, &src_data); + + if (SUCCEEDED(hr)) + { + StorageImpl_DeleteCachedBlockChainStream(This, src); + dst_data.startingBlock = src_data.startingBlock; + dst_data.size = src_data.size; + + hr = StorageImpl_WriteDirEntry(This, dst, &dst_data); + } + + return hr; +} + /* * Virtual function table for the IStorage32Impl class. */ @@ -2577,7 +2616,8 @@ static const StorageBaseImplVtbl StorageImpl_BaseVtbl = StorageImpl_DestroyDirEntry, StorageImpl_StreamReadAt, StorageImpl_StreamWriteAt, - StorageImpl_StreamSetSize + StorageImpl_StreamSetSize, + StorageImpl_StreamLink }; static HRESULT StorageImpl_Construct( @@ -4298,8 +4338,9 @@ static void TransactedSnapshotImpl_DestroyTemporaryCopy( { entry = &This->entries[cursor]; - StorageBaseImpl_StreamSetSize(This->transactedParent, - entry->newTransactedParentEntry, zero); + if (entry->stream_dirty) + StorageBaseImpl_StreamSetSize(This->transactedParent, + entry->newTransactedParentEntry, zero); StorageBaseImpl_DestroyDirEntry(This->transactedParent, entry->newTransactedParentEntry); @@ -4366,9 +4407,19 @@ static HRESULT TransactedSnapshotImpl_CopyTree(TransactedSnapshotImpl* This) return hr; } - hr = StorageBaseImpl_CopyStream( - This->transactedParent, entry->newTransactedParentEntry, - (StorageBaseImpl*)This, cursor); + if (entry->stream_dirty) + { + hr = StorageBaseImpl_CopyStream( + This->transactedParent, entry->newTransactedParentEntry, + This->scratch, entry->stream_entry); + } + else if (entry->data.size.QuadPart) + { + hr = StorageBaseImpl_StreamLink( + This->transactedParent, entry->newTransactedParentEntry, + entry->transactedParentEntry); + } + if (FAILED(hr)) { cursor = TransactedSnapshotImpl_FindNextChild(This, cursor); @@ -4457,12 +4508,8 @@ static HRESULT WINAPI TransactedSnapshotImpl_Commit( else if (entry->read && entry->transactedParentEntry != entry->newTransactedParentEntry) { if (entry->transactedParentEntry != DIRENTRY_NULL) - { - StorageBaseImpl_StreamSetSize(This->transactedParent, - entry->transactedParentEntry, zero); StorageBaseImpl_DestroyDirEntry(This->transactedParent, entry->transactedParentEntry); - } if (entry->stream_dirty) { StorageBaseImpl_StreamSetSize(This->scratch, entry->stream_entry, zero); @@ -4739,6 +4786,31 @@ static HRESULT TransactedSnapshotImpl_StreamSetSize(StorageBaseImpl *base, return hr; } +static HRESULT TransactedSnapshotImpl_StreamLink(StorageBaseImpl *base, + DirRef dst, DirRef src) +{ + TransactedSnapshotImpl* This = (TransactedSnapshotImpl*) base; + HRESULT hr; + TransactedDirEntry *dst_entry, *src_entry; + + hr = TransactedSnapshotImpl_EnsureReadEntry(This, src); + if (FAILED(hr)) return hr; + + hr = TransactedSnapshotImpl_EnsureReadEntry(This, dst); + if (FAILED(hr)) return hr; + + dst_entry = &This->entries[dst]; + src_entry = &This->entries[src]; + + dst_entry->stream_dirty = src_entry->stream_dirty; + dst_entry->stream_entry = src_entry->stream_entry; + dst_entry->transactedParentEntry = src_entry->transactedParentEntry; + dst_entry->newTransactedParentEntry = src_entry->newTransactedParentEntry; + dst_entry->data.size = src_entry->data.size; + + return S_OK; +} + static const IStorageVtbl TransactedSnapshotImpl_Vtbl = { StorageBaseImpl_QueryInterface, @@ -4771,7 +4843,8 @@ static const StorageBaseImplVtbl TransactedSnapshotImpl_BaseVtbl = TransactedSnapshotImpl_DestroyDirEntry, TransactedSnapshotImpl_StreamReadAt, TransactedSnapshotImpl_StreamWriteAt, - TransactedSnapshotImpl_StreamSetSize + TransactedSnapshotImpl_StreamSetSize, + TransactedSnapshotImpl_StreamLink }; static HRESULT TransactedSnapshotImpl_Construct(StorageBaseImpl *parentStorage, @@ -4974,6 +5047,15 @@ static HRESULT StorageInternalImpl_StreamSetSize(StorageBaseImpl *base, index, newsize); } +static HRESULT StorageInternalImpl_StreamLink(StorageBaseImpl *base, + DirRef dst, DirRef src) +{ + StorageInternalImpl* This = (StorageInternalImpl*) base; + + return StorageBaseImpl_StreamLink(This->parentStorage, + dst, src); +} + /****************************************************************************** ** ** Storage32InternalImpl_Commit @@ -5333,7 +5415,8 @@ static const StorageBaseImplVtbl StorageInternalImpl_BaseVtbl = StorageInternalImpl_DestroyDirEntry, StorageInternalImpl_StreamReadAt, StorageInternalImpl_StreamWriteAt, - StorageInternalImpl_StreamSetSize + StorageInternalImpl_StreamSetSize, + StorageInternalImpl_StreamLink }; /****************************************************************************** diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index f25351b..19f3f2d 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -263,6 +263,7 @@ struct StorageBaseImplVtbl { HRESULT (*StreamReadAt)(StorageBaseImpl*,DirRef,ULARGE_INTEGER,ULONG,void*,ULONG*); HRESULT (*StreamWriteAt)(StorageBaseImpl*,DirRef,ULARGE_INTEGER,ULONG,const void*,ULONG*); HRESULT (*StreamSetSize)(StorageBaseImpl*,DirRef,ULARGE_INTEGER); + HRESULT (*StreamLink)(StorageBaseImpl*,DirRef,DirRef); }; static inline void StorageBaseImpl_Destroy(StorageBaseImpl *This) @@ -320,6 +321,16 @@ static inline HRESULT StorageBaseImpl_StreamSetSize(StorageBaseImpl *This, return This->baseVtbl->StreamSetSize(This, index, newsize); } +/* Make dst point to the same stream that src points to. Other stream operations + * will not work properly for entries that point to the same stream, so this + * must be a very temporary state, and only one entry pointing to a given stream + * may be reachable at any given time. */ +static inline HRESULT StorageBaseImpl_StreamLink(StorageBaseImpl *This, + DirRef dst, DirRef src) +{ + return This->baseVtbl->StreamLink(This, dst, src); +} + /**************************************************************************** * StorageBaseImpl stream list handlers */

1 0