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

Alexandre Julliard : configure: Create a symlink from l_intl. nls in the build tree, and install it.
by Alexandre Julliard 07 May '10

07 May '10

Module: wine Branch: master Commit: 321d3883bf07016cc14699da0bc4de3781fb8871 URL: http://source.winehq.org/git/wine.git/?a=commit;h=321d3883bf07016cc14699da0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 6 20:51:53 2010 +0200 configure: Create a symlink from l_intl.nls in the build tree, and install it. --- configure | 3 +++ configure.ac | 1 + tools/Makefile.in | 8 +++++++- 3 files changed, 11 insertions(+), 1 deletions(-) diff --git a/configure b/configure index 52410fb..a178112 100755 --- a/configure +++ b/configure @@ -14220,6 +14220,8 @@ if test "x$enable_fonts" != xno; then ac_config_links="$ac_config_links fonts/tahomabd.ttf:fonts/tahomabd.ttf" test "$srcdir" = "." || wine_fn_config_symlink fonts/tahomabd.ttf fi +ac_config_links="$ac_config_links tools/l_intl.nls:tools/l_intl.nls" +test "$srcdir" = "." || wine_fn_config_symlink tools/l_intl.nls ac_config_links="$ac_config_links wine:tools/winewrapper" wine_fn_config_symlink wine @@ -15538,6 +15540,7 @@ do "fonts/symbol.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/symbol.ttf:fonts/symbol.ttf" ;; "fonts/tahoma.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/tahoma.ttf:fonts/tahoma.ttf" ;; "fonts/tahomabd.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/tahomabd.ttf:fonts/tahomabd.ttf" ;; + "tools/l_intl.nls") CONFIG_LINKS="$CONFIG_LINKS tools/l_intl.nls:tools/l_intl.nls" ;; "wine") CONFIG_LINKS="$CONFIG_LINKS wine:tools/winewrapper" ;; "dlls/gdi32/enhmfdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi32/enhmfdrv" ;; "dlls/gdi32/mfdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi32/mfdrv" ;; diff --git a/configure.ac b/configure.ac index 227dee5..4224e37 100644 --- a/configure.ac +++ b/configure.ac @@ -2170,6 +2170,7 @@ WINE_CONFIG_SYMLINK(fonts/marlett.ttf,,enable_fonts) WINE_CONFIG_SYMLINK(fonts/symbol.ttf,,enable_fonts) WINE_CONFIG_SYMLINK(fonts/tahoma.ttf,,enable_fonts) WINE_CONFIG_SYMLINK(fonts/tahomabd.ttf,,enable_fonts) +WINE_CONFIG_SYMLINK(tools/l_intl.nls) WINE_CONFIG_SYMLINK(wine,tools/winewrapper) WINE_CONFIG_EXTRA_DIR(dlls/gdi32/enhmfdrv) diff --git a/tools/Makefile.in b/tools/Makefile.in index 39209f9..447ab62 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -70,6 +70,7 @@ wineapploader: wineapploader.in install install-lib:: wine.inf $(INSTALLDIRS) $(INSTALL_DATA) wine.inf $(DESTDIR)$(datadir)/wine/wine.inf + $(INSTALL_DATA) $(SRCDIR)/l_intl.nls $(DESTDIR)$(datadir)/wine/l_intl.nls $(INSTALL_DATA) $(SRCDIR)/wine.desktop $(DESTDIR)$(datadir)/applications/wine.desktop -$(UPDATE_DESKTOP_DATABASE) @@ -79,7 +80,12 @@ install install-dev:: $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext) $(INSTALL_DATA) winemaker.de.man $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/winemaker.$(prog_manext) uninstall:: - $(RM) $(DESTDIR)$(bindir)/winemaker $(DESTDIR)$(mandir)/man$(prog_manext)/winemaker.$(prog_manext) $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/winemaker.$(prog_manext) $(DESTDIR)$(datadir)/wine/wine.inf $(DESTDIR)$(datadir)/applications/wine.desktop + $(RM) $(DESTDIR)$(datadir)/wine/wine.inf \ + $(DESTDIR)$(datadir)/wine/l_intl.nls \ + $(DESTDIR)$(datadir)/applications/wine.desktop \ + $(DESTDIR)$(bindir)/winemaker \ + $(DESTDIR)$(mandir)/man$(prog_manext)/winemaker.$(prog_manext) \ + $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/winemaker.$(prog_manext) -$(UPDATE_DESKTOP_DATABASE) depend: makedep$(EXEEXT)

1 0

Alexandre Julliard : user32: Use the correct rop when blitting an icon in DrawIconEx.
by Alexandre Julliard 07 May '10

07 May '10

Module: wine Branch: master Commit: 4c03fd013812dcc499b83e8b34c074f36acf801b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c03fd013812dcc499b83e8b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 7 12:41:40 2010 +0200 user32: Use the correct rop when blitting an icon in DrawIconEx. --- dlls/user32/cursoricon.c | 8 ++++---- dlls/user32/tests/cursoricon.c | 9 +++------ 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index f4bdcdb..bafe4a7 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -2275,8 +2275,7 @@ BOOL WINAPI DrawIconEx( HDC hdc, INT x0, INT y0, HICON hIcon, oldFg = SetTextColor( hdc, RGB(0,0,0) ); oldBg = SetBkColor( hdc, RGB(255,255,255) ); - if (((flags & DI_MASK) && !(flags & DI_IMAGE)) || - ((flags & DI_MASK) && !has_alpha)) + if ((flags & DI_MASK) && !has_alpha) { hAndBits = CreateBitmap ( ptr->nWidth, ptr->nHeight, 1, 1, ptr + 1 ); if (hAndBits) @@ -2341,13 +2340,14 @@ BOOL WINAPI DrawIconEx( HDC hdc, INT x0, INT y0, HICON hIcon, } else { + DWORD rop = (flags & DI_MASK) ? SRCINVERT : SRCCOPY; hBitTemp = SelectObject( hMemDC, hXorBits ); if (DoOffscreen) StretchBlt (hDC_off, 0, 0, cxWidth, cyWidth, - hMemDC, 0, 0, ptr->nWidth, ptr->nHeight, SRCPAINT); + hMemDC, 0, 0, ptr->nWidth, ptr->nHeight, rop); else StretchBlt (hdc, x0, y0, cxWidth, cyWidth, - hMemDC, 0, 0, ptr->nWidth, ptr->nHeight, SRCPAINT); + hMemDC, 0, 0, ptr->nWidth, ptr->nHeight, rop); SelectObject( hMemDC, hBitTemp ); } diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 2a4100e..21e0dca 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1190,15 +1190,12 @@ static void test_DrawIconEx(void) check_DrawIconEx(hdcDst, FALSE, 0x80A0B0C0, 32, DI_MASK, 0x00FFFFFF, 0x00000000, 0x00000000, __LINE__); check_DrawIconEx(hdcDst, TRUE, 0x80A0B0C0, 32, DI_MASK, 0x00FFFFFF, 0x00FFFFFF, 0x00FFFFFF, __LINE__); - todo_wine - { - check_DrawIconEx(hdcDst, FALSE, 0x00A0B0C0, 32, DI_IMAGE, 0x00FFFFFF, 0x00C0B0A0, 0x00C0B0A0, __LINE__); - check_DrawIconEx(hdcDst, TRUE, 0x00A0B0C0, 32, DI_IMAGE, 0x00FFFFFF, 0x00C0B0A0, 0x00C0B0A0, __LINE__); - } + check_DrawIconEx(hdcDst, FALSE, 0x00A0B0C0, 32, DI_IMAGE, 0x00FFFFFF, 0x00C0B0A0, 0x00C0B0A0, __LINE__); + check_DrawIconEx(hdcDst, TRUE, 0x00A0B0C0, 32, DI_IMAGE, 0x00FFFFFF, 0x00C0B0A0, 0x00C0B0A0, __LINE__); /* Test normal drawing */ check_DrawIconEx(hdcDst, FALSE, 0x00A0B0C0, 32, DI_NORMAL, 0x00FFFFFF, 0x00C0B0A0, 0x00C0B0A0, __LINE__); - todo_wine check_DrawIconEx(hdcDst, TRUE, 0x00A0B0C0, 32, DI_NORMAL, 0x00FFFFFF, 0x003F4F5F, 0x003F4F5F, __LINE__); + check_DrawIconEx(hdcDst, TRUE, 0x00A0B0C0, 32, DI_NORMAL, 0x00FFFFFF, 0x003F4F5F, 0x003F4F5F, __LINE__); check_DrawIconEx(hdcDst, FALSE, 0xFFA0B0C0, 32, DI_NORMAL, 0x00FFFFFF, 0x00C0B0A0, 0x00C0B0A0, __LINE__); /* Test alpha blending */

1 0

Alexandre Julliard : libwine: Download Unicode data files from unicode. org as needed in cpmap.pl.
by Alexandre Julliard 07 May '10

07 May '10

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 07 May '10

07 May '10

1 0

Alexandre Julliard : libwine: Generate a table for BiDi character mirroring .
by Alexandre Julliard 07 May '10

07 May '10

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

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

06 May '10

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

Piotr Caban : msvcrt: Sync msvcr* dlls.
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: 4733bd8162822d6680a1790e4c12b427ce2654e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4733bd8162822d6680a1790e4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 6 14:28:21 2010 +0200 msvcrt: Sync msvcr* dlls. --- dlls/msvcr100/msvcr100.spec | 36 ++++++++++++++++++------------------ dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 6 +++--- dlls/msvcr90/msvcr90.spec | 6 +++--- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 2d30cfe..2117c05 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -332,13 +332,13 @@ @ cdecl ___lc_collate_cp_func() msvcrt.___lc_collate_cp_func @ cdecl ___lc_handle_func() msvcrt.___lc_handle_func @ cdecl ___mb_cur_max_func() msvcrt.___mb_cur_max_func -@ stub ___mb_cur_max_l_func +@ cdecl ___mb_cur_max_l_func(ptr) msvcrt.___mb_cur_max_l_func @ cdecl ___setlc_active_func() msvcrt.___setlc_active_func @ cdecl ___unguarded_readlc_active_add_func() msvcrt.___unguarded_readlc_active_add_func @ extern __argc msvcrt.__argc @ extern __argv msvcrt.__argv @ extern __badioinfo msvcrt.__badioinfo -@ stub __clean_type_info_names_internal +@ cdecl __clean_type_info_names_internal(ptr) msvcr90.__clean_type_info_names_internal @ stub __control87_2 @ stub __create_locale @ cdecl __crtCompareStringA(long long str long str long) msvcrt.__crtCompareStringA @@ -422,8 +422,8 @@ @ cdecl __setusermatherr(ptr) msvcrt.__setusermatherr @ stub __strncnt @ stub __swprintf_l -@ stub __sys_errlist -@ stub __sys_nerr +@ cdecl __sys_errlist() msvcr90.__sys_errlist +@ cdecl __sys_nerr() msvcr90.__sys_nerr @ cdecl __threadhandle() msvcrt.__threadhandle @ cdecl __threadid() msvcrt.__threadid @ stub __timezone @@ -475,7 +475,7 @@ @ cdecl _c_exit() msvcrt._c_exit @ cdecl _cabs(long) msvcrt._cabs @ cdecl _callnewh(long) msvcrt._callnewh -@ stub _calloc_crt +@ cdecl _calloc_crt(long long) msvcrt.calloc @ cdecl _cexit() msvcrt._cexit @ cdecl _cgets(str) msvcrt._cgets @ stub _cgets_s @@ -537,7 +537,7 @@ @ stub _dupenv_s @ cdecl _ecvt(double long ptr ptr) msvcrt._ecvt @ stub _ecvt_s -@ stub _encoded_null +@ cdecl _encoded_null() msvcr90._encoded_null @ cdecl _endthread() msvcrt._endthread @ cdecl _endthreadex(long) msvcrt._endthreadex @ extern _environ msvcrt._environ @@ -682,19 +682,19 @@ @ stub _heapused @ cdecl _heapwalk(ptr) msvcrt._heapwalk @ cdecl _hypot(double double) msvcrt._hypot -@ stub _hypotf +@ cdecl _hypotf(double double) msvcrt._hypotf @ cdecl _i64toa(long long ptr long) msvcrt._i64toa @ stub _i64toa_s @ cdecl _i64tow(long long ptr long) msvcrt._i64tow @ stub _i64tow_s @ stub _initptd @ cdecl _initterm(ptr ptr) msvcrt._initterm -@ stub _initterm_e +@ cdecl _initterm_e(ptr ptr) msvcr90._initterm_e @ stub _inp @ stub _inpd @ stub _inpw @ cdecl _invalid_parameter(wstr wstr wstr long long) msvcrt._invalid_parameter -@ stub _invalid_parameter_noinfo +@ cdecl _invalid_parameter_noinfo() msvcr90._invalid_parameter_noinfo @ stub _invalid_parameter_noinfo_noreturn @ stub _invoke_watson @ extern _iob msvcrt._iob @@ -820,7 +820,7 @@ @ stub _ltow_s @ cdecl _makepath(ptr str str str str) msvcrt._makepath @ stub _makepath_s -@ stub _malloc_crt +@ cdecl _malloc_crt(long) msvcrt.malloc @ cdecl _mbbtombc(long) msvcrt._mbbtombc @ stub _mbbtombc_l @ cdecl _mbbtype(long long) msvcrt._mbbtype @@ -946,10 +946,10 @@ @ stub _mbstok_l @ stub _mbstok_s @ stub _mbstok_s_l -@ stub _mbstowcs_l -@ stub _mbstowcs_s_l +@ cdecl _mbstowcs_l(ptr str long ptr) msvcrt._mbstowcs_l +@ cdecl _mbstowcs_s_l(ptr ptr long str long ptr) msvcrt._mbstowcs_s_l @ cdecl _mbstrlen(str) msvcrt._mbstrlen -@ stub _mbstrlen_l +@ cdecl _mbstrlen_l(str ptr) msvcrt._mbstrlen_l @ stub _mbstrnlen @ stub _mbstrnlen_l @ cdecl _mbsupr(str) msvcrt._mbsupr @@ -996,7 +996,7 @@ @ stub _pwctype @ cdecl _read(long ptr long) msvcrt._read @ stub _realloc_crt -@ stub _recalloc +@ cdecl _recalloc(ptr long long) msvcr90._recalloc @ stub _recalloc_crt @ stub _resetstkoflw @ cdecl _rmdir(str) msvcrt._rmdir @@ -1148,7 +1148,7 @@ @ extern _tzname msvcrt._tzname @ cdecl _tzset() msvcrt._tzset @ cdecl _ui64toa(long long ptr long) msvcrt._ui64toa -@ stub _ui64toa_s +@ cdecl _ui64toa_s(long ptr long long) msvcrt._ui64toa_s @ cdecl _ui64tow(long long ptr long) msvcrt._ui64tow @ stub _ui64tow_s @ cdecl _ultoa(long ptr long) msvcrt._ultoa @@ -1219,7 +1219,7 @@ @ cdecl _vswprintf_c(ptr long wstr ptr) msvcrt._vswprintf_c @ cdecl _vswprintf_c_l(ptr long wstr ptr ptr) msvcrt._vswprintf_c_l @ cdecl _vswprintf_l(ptr long wstr ptr ptr) msvcrt._vswprintf_l -@ stub _vswprintf_p +@ cdecl _vswprintf_p(ptr long wstr ptr) msvcrt._vswprintf @ cdecl _vswprintf_p_l(ptr long wstr ptr ptr) msvcrt._vswprintf_p_l @ cdecl _vswprintf_s_l(ptr long wstr ptr ptr) msvcrt._vswprintf_s_l @ stub _vwprintf_l @@ -1263,7 +1263,7 @@ @ cdecl _wcstoi64(wstr ptr long) msvcrt._wcstoi64 @ cdecl _wcstoi64_l(wstr ptr long ptr) msvcrt._wcstoi64_l @ stub _wcstol_l -@ stub _wcstombs_l +@ cdecl _wcstombs_l(ptr ptr long ptr) msvcrt._wcstombs_l @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) msvcrt._wcstombs_s_l @ cdecl _wcstoui64(wstr ptr long) msvcrt._wcstoui64 @ cdecl _wcstoui64_l(wstr ptr long ptr) msvcrt._wcstoui64_l @@ -1483,7 +1483,7 @@ @ stub mbsrtowcs @ stub mbsrtowcs_s @ cdecl mbstowcs(ptr str long) msvcrt.mbstowcs -@ stub mbstowcs_s +@ cdecl mbstowcs_s(ptr ptr long str long) msvcrt.mbstowcs_s @ cdecl mbtowc(wstr str long) msvcrt.mbtowc @ cdecl memchr(ptr long long) msvcrt.memchr @ cdecl memcmp(ptr ptr long) msvcrt.memcmp diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 866d49a..edf3da4 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -446,7 +446,7 @@ @ cdecl _onexit(ptr) msvcrt._onexit @ varargs _open(str long) msvcrt._open @ cdecl _open_osfhandle(long long) msvcrt._open_osfhandle -@ stub _osplatform +@ extern _osplatform msvcrt._osplatform @ extern _osver msvcrt._osver @ stub _outp @ stub _outpd diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 20240e0..f0d6255 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -441,7 +441,7 @@ @ cdecl _onexit(ptr) msvcrt._onexit @ varargs _open(str long) msvcrt._open @ cdecl _open_osfhandle(long long) msvcrt._open_osfhandle -@ stub _osplatform +@ extern _osplatform msvcrt._osplatform @ extern _osver msvcrt._osver @ cdecl -i386 _outp(long long) msvcrt._outp @ cdecl -i386 _outpd(long long) msvcrt._outpd diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 8b82783..0249277 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -522,7 +522,7 @@ @ stub _heapused @ cdecl _heapwalk(ptr) msvcrt._heapwalk @ cdecl _hypot(double double) msvcrt._hypot -@ stub _hypotf +@ cdecl _hypotf(double double) msvcrt._hypotf @ cdecl _i64toa(long long ptr long) msvcrt._i64toa @ stub _i64toa_s @ cdecl _i64tow(long long ptr long) msvcrt._i64tow @@ -788,7 +788,7 @@ @ cdecl _mbstowcs_l(ptr str long ptr) msvcrt._mbstowcs_l @ cdecl _mbstowcs_s_l(ptr ptr long str long ptr) msvcrt._mbstowcs_s_l @ cdecl _mbstrlen(str) msvcrt._mbstrlen -@ stub _mbstrlen_l +@ cdecl _mbstrlen_l(str ptr) msvcrt._mbstrlen_l @ stub _mbstrnlen @ stub _mbstrnlen_l @ cdecl _mbsupr(str) msvcrt._mbsupr @@ -1109,7 +1109,7 @@ @ cdecl _wcstoi64(wstr ptr long) msvcrt._wcstoi64 @ cdecl _wcstoi64_l(wstr ptr long ptr) msvcrt._wcstoi64_l @ stub _wcstol_l -@ stub _wcstombs_l +@ cdecl _wcstombs_l(ptr ptr long ptr) msvcrt._wcstombs_l @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) msvcrt._wcstombs_s_l @ cdecl _wcstoui64(wstr ptr long) msvcrt._wcstoui64 @ cdecl _wcstoui64_l(wstr ptr long ptr) msvcrt._wcstoui64_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 9594535..be4a675 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -510,7 +510,7 @@ @ stub _heapused @ cdecl _heapwalk(ptr) msvcrt._heapwalk @ cdecl _hypot(double double) msvcrt._hypot -@ stub _hypotf +@ cdecl _hypotf(double double) msvcrt.hypotf @ cdecl _i64toa(long long ptr long) msvcrt._i64toa @ stub _i64toa_s @ cdecl _i64tow(long long ptr long) msvcrt._i64tow @@ -776,7 +776,7 @@ @ cdecl _mbstowcs_l(ptr str long ptr) msvcrt._mbstowcs_l @ cdecl _mbstowcs_s_l(ptr ptr long str long ptr) msvcrt._mbstowcs_s_l @ cdecl _mbstrlen(str) msvcrt._mbstrlen -@ stub _mbstrlen_l +@ cdecl _mbstrlen_l(str ptr) msvcrt._mbstrlen_l @ stub _mbstrnlen @ stub _mbstrnlen_l @ cdecl _mbsupr(str) msvcrt._mbsupr @@ -1096,7 +1096,7 @@ @ cdecl _wcstoi64(wstr ptr long) msvcrt._wcstoi64 @ cdecl _wcstoi64_l(wstr ptr long ptr) msvcrt._wcstoi64_l @ stub _wcstol_l -@ stub _wcstombs_l +@ cdecl _wcstombs_l(ptr ptr long ptr) msvcrt._wcstombs_l @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) msvcrt._wcstombs_s_l @ cdecl _wcstoui64(wstr ptr long) msvcrt._wcstoui64 @ cdecl _wcstoui64_l(wstr ptr long ptr) msvcrt._wcstoui64_l

1 0

Huw Davies : gdi32: Add support for ETO_PDY and improve world transform support.
by Alexandre Julliard 06 May '10

06 May '10

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: Rewrite transacted storage to be more lazy.
by Alexandre Julliard 06 May '10

06 May '10

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

Vincent Povirk : ole32: Always move unmodified streams instead of copying on commit.
by Alexandre Julliard 06 May '10

06 May '10

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