wine-commits November 2015

wine-commits@winehq.org

2 participants
623 discussions

Dmitry Timoshkov : oleaut32/tests: Add a bunch of new tests for typelib generation.
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: wine Branch: master Commit: fa567adfb7edd7040dd8bbf33267f1ec3fa2d6b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa567adfb7edd7040dd8bbf33… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 3 13:32:38 2015 +0800 oleaut32/tests: Add a bunch of new tests for typelib generation. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/test_tlb.idl | 59 +++++++++ dlls/oleaut32/tests/typelib.c | 259 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 298 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fa567adfb7edd7040dd8b…

1 0

Dmitry Timoshkov : widl: Ignore assignment of a duplicate uuid.
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: wine Branch: master Commit: 42c328ddf4b12e556ef95853cda6d5fa0328f39d URL: http://source.winehq.org/git/wine.git/?a=commit;h=42c328ddf4b12e556ef95853c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 3 13:32:22 2015 +0800 widl: Ignore assignment of a duplicate uuid. MSDN KB285146 article describes this behaviour, and the tests confirm that. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/write_msft.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 3cbae92..7396944 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -494,10 +494,22 @@ static int ctl2_alloc_guid( MSFT_GuidEntry *guid_space; int hash_key; + chat("adding uuid {%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n", + guid->guid.Data1, guid->guid.Data2, guid->guid.Data3, + guid->guid.Data4[0], guid->guid.Data4[1], guid->guid.Data4[2], guid->guid.Data4[3], + guid->guid.Data4[4], guid->guid.Data4[5], guid->guid.Data4[6], guid->guid.Data4[7]); + hash_key = ctl2_hash_guid(&guid->guid); offset = ctl2_find_guid(typelib, hash_key, &guid->guid); - if (offset != -1) return offset; + if (offset != -1) + { + warning("duplicate uuid {%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n", + guid->guid.Data1, guid->guid.Data2, guid->guid.Data3, + guid->guid.Data4[0], guid->guid.Data4[1], guid->guid.Data4[2], guid->guid.Data4[3], + guid->guid.Data4[4], guid->guid.Data4[5], guid->guid.Data4[6], guid->guid.Data4[7]); + return -1; + } offset = ctl2_alloc_segment(typelib, MSFT_SEG_GUID, sizeof(MSFT_GuidEntry), 0);

1 0

Dmitry Timoshkov : widl: Attributes of the alias are supposed to replace attributes of a tag in the typelib.
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: wine Branch: master Commit: 58b0788a2d0b7303adbafca5e3038455e49f1b8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=58b0788a2d0b7303adbafca5e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 3 13:32:13 2015 +0800 widl: Attributes of the alias are supposed to replace attributes of a tag in the typelib. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/typelib.c | 2 +- tools/widl/parser.y | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 1d13b89..e8b2cb4 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -4297,7 +4297,7 @@ static const type_info info[] = { }, { "cc", - "{00000000-0000-0000-0000-000000000000}", + "{016fe2ec-b2c8-45f8-b23b-39e53a75396c}", /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4, /*#vtbl*/ 0, /*#func*/ 0 }, diff --git a/tools/widl/parser.y b/tools/widl/parser.y index e7f2ead..7de7567 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1893,6 +1893,10 @@ static type_t *reg_typedefs(decl_spec_t *decl_spec, declarator_list_t *decls, at { if (!type->name) type->name = gen_name(); + + /* replace existing attributes when generating a typelib */ + if (do_typelib) + type->attrs = attrs; } LIST_FOR_EACH_ENTRY( decl, decls, const declarator_t, entry )

1 0

Dmitry Timoshkov : widl: Avoid generating duplicate typelib entries for structure tag names.
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: wine Branch: master Commit: ded915aa7c450429a74f136efa35a1b58d83a63f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ded915aa7c450429a74f136ef… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 3 13:32:01 2015 +0800 widl: Avoid generating duplicate typelib entries for structure tag names. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typetree.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 5925d40..e316614 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -300,7 +300,12 @@ type_t *type_new_enum(const char *name, struct namespace *namespace, int defined type_t *type_new_struct(char *name, struct namespace *namespace, int defined, var_list_t *fields) { type_t *tag_type = name ? find_type(name, namespace, tsSTRUCT) : NULL; - type_t *t = make_type(TYPE_STRUCT); + type_t *t; + + /* avoid creating duplicate typelib type entries */ + if (tag_type && do_typelib) return tag_type; + + t = make_type(TYPE_STRUCT); t->name = name; t->namespace = namespace;

1 0

Dmitry Timoshkov : widl: Attribute uuid() takes precedence over 'hidden'.
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: wine Branch: master Commit: 3cd67463bf0bd41b8fe5e8d811683129fcaea6f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cd67463bf0bd41b8fe5e8d81… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 3 13:30:42 2015 +0800 widl: Attribute uuid() takes precedence over 'hidden'. This means that definition like [uuid(016fe2ec-b2c8-45f8-b23b-39e53a753900),hidden] typedef struct _m { int m1; } m; makes both '_m' and 'm' appear in the typelib, and the tests confirm that. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index b42b4a2..e7f2ead 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -123,7 +123,6 @@ static statement_t *make_statement_importlib(const char *str); static statement_t *make_statement_module(type_t *type); static statement_t *make_statement_typedef(var_list_t *names); static statement_t *make_statement_import(const char *str); -static statement_t *make_statement_typedef(var_list_t *names); static statement_list_t *append_statement(statement_list_t *list, statement_t *stmt); static statement_list_t *append_statements(statement_list_t *, statement_list_t *); static attr_list_t *append_attribs(attr_list_t *, attr_list_t *); @@ -1881,22 +1880,20 @@ static type_t *reg_typedefs(decl_spec_t *decl_spec, declarator_list_t *decls, at const declarator_t *decl; type_t *type = decl_spec->type; + if (is_attr(attrs, ATTR_UUID) && !is_attr(attrs, ATTR_PUBLIC)) + attrs = append_attr( attrs, make_attr(ATTR_PUBLIC) ); + /* We must generate names for tagless enum, struct or union. Typedef-ing a tagless enum, struct or union means we want the typedef to be included in a library hence the public attribute. */ - if ((type_get_type_detect_alias(type) == TYPE_ENUM || - type_get_type_detect_alias(type) == TYPE_STRUCT || - type_get_type_detect_alias(type) == TYPE_UNION || - type_get_type_detect_alias(type) == TYPE_ENCAPSULATED_UNION) && - !type->name) + if (type_get_type_detect_alias(type) == TYPE_ENUM || + type_get_type_detect_alias(type) == TYPE_STRUCT || + type_get_type_detect_alias(type) == TYPE_UNION || + type_get_type_detect_alias(type) == TYPE_ENCAPSULATED_UNION) { - if (! is_attr(attrs, ATTR_PUBLIC) && ! is_attr (attrs, ATTR_HIDDEN)) - attrs = append_attr( attrs, make_attr(ATTR_PUBLIC) ); - type->name = gen_name(); + if (!type->name) + type->name = gen_name(); } - else if (is_attr(attrs, ATTR_UUID) && !is_attr(attrs, ATTR_PUBLIC) - && !is_attr(attrs, ATTR_HIDDEN)) - attrs = append_attr( attrs, make_attr(ATTR_PUBLIC) ); LIST_FOR_EACH_ENTRY( decl, decls, const declarator_t, entry ) {

1 0

Dmitry Timoshkov : widl: Avoid adding duplicate type definitions if tag and typedef names are the same.
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: wine Branch: master Commit: f7581c763d5789a165527c12d1bc2bf1368c4f7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7581c763d5789a165527c12d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 3 13:28:53 2015 +0800 widl: Avoid adding duplicate type definitions if tag and typedef names are the same. Fix handing of the following .idl snippet: typedef [uuid(b14b6bb5-904e-4ff9-b247-bd361f7a0001)] struct g { int g1; } g; [uuid(b14b6bb5-904e-4ff9-b247-bd361f7a0002)] interface test_iface : IUnknown { HRESULT test([in] g *ptr); } Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/write_msft.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index daa0366..3cbae92 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2181,7 +2181,7 @@ static void add_union_typeinfo(msft_typelib_t *typelib, type_t *tunion) static void add_typedef_typeinfo(msft_typelib_t *typelib, type_t *tdef) { msft_typeinfo_t *msft_typeinfo = NULL; - int alignment, datatype1, datatype2, size; + int alignment, datatype1, datatype2, size, duplicate = 0; type_t *type; if (-1 < tdef->typelib_idx) @@ -2194,6 +2194,8 @@ static void add_typedef_typeinfo(msft_typelib_t *typelib, type_t *tdef) tdef->typelib_idx = typelib->typelib_header.nrtypeinfos; msft_typeinfo = create_msft_typeinfo(typelib, TKIND_ALIAS, tdef->name, tdef->attrs); } + else + duplicate = 1; encode_type(typelib, get_type_vt(type), type, &datatype1, &size, &alignment, &datatype2); @@ -2205,6 +2207,10 @@ static void add_typedef_typeinfo(msft_typelib_t *typelib, type_t *tdef) msft_typeinfo->typeinfo->datatype2 = datatype2; msft_typeinfo->typeinfo->typekind |= (alignment << 11 | alignment << 6); } + + /* avoid adding duplicate type definitions */ + if (duplicate) + tdef->typelib_idx = type->typelib_idx; } static void add_coclass_typeinfo(msft_typelib_t *typelib, type_t *cls)

1 0

Alexandre Julliard : makefiles: Generate correct dependencies for included typelib files.
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: wine Branch: master Commit: 8e81f6d58234c17f5de6d2219ef47c6d01a4a4a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e81f6d58234c17f5de6d2219… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 5 14:25:35 2015 +0900 makefiles: Generate correct dependencies for included typelib files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/xmlparser.idl | 2 +- dlls/msxml3/xmlparser.idl | 2 +- tools/makedep.c | 133 ++++++++++++++++++++++++++++------------ 3 files changed, 96 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8e81f6d58234c17f5de6d…

1 0

Jacek Caban : Use dl.winehq.org for downloading Gecko and Mono.
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: tools Branch: master Commit: 7d0e36c8e152664b3f221cf85af763b28f63681a URL: http://source.winehq.org/git/tools.git/?a=commit;h=7d0e36c8e152664b3f221cf8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 5 15:19:04 2015 +0100 Use dl.winehq.org for downloading Gecko and Mono. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- download.inc.php | 105 +------------------------------------------------------ winegecko.php | 51 +-------------------------- winemono.php | 17 +-------- 3 files changed, 3 insertions(+), 170 deletions(-) diff --git a/download.inc.php b/download.inc.php index 17811a6..14287da 100644 --- a/download.inc.php +++ b/download.inc.php @@ -5,108 +5,5 @@ * Copyright (c) 2006 Jonathan Ernst */ -// SourceForge can do better job at redirecting to the mirror than us. However, -// it redirects to HTML page by default for web browser user agents. New enough -// Wine set user agent to 'Wine Addon Downloader', so redirect them directly -// to SourceForge. For older Wine and other user agents, fallback to random -// known mirror. -if(strcmp($_SERVER['HTTP_USER_AGENT'], 'Wine Addon Downloader') === 0) { - header("Location: http://sourceforge.net/projects/wine/files/".$sFileName); - exit; -} - -if(!$iFileSize) { - header("HTTP/1.0 404 Not Found"); - exit; -} - -// List of common locations for files -$aList += array("http://freefr.dl.sourceforge.net/project/wine/", - "http://heanet.dl.sourceforge.net/project/wine/", - "http://garr.dl.sourceforge.net/project/wine/", - "http://mesh.dl.sourceforge.net/project/wine/", - "http://puzzle.dl.sourceforge.net/project/wine/", - "http://switch.dl.sourceforge.net/project/wine/", - "http://kent.dl.sourceforge.net/project/wine/", - "http://netcologne.dl.sourceforge.net/project/wine/", - "http://ignum.dl.sourceforge.net/project/wine/", - "http://ovh.dl.sourceforge.net/project/wine/", - "http://sunet.dl.sourceforge.net/project/wine/", - "http://surfnet.dl.sourceforge.net/project/wine/", - "http://citylan.dl.sourceforge.net/project/wine/", - "http://space.dl.sourceforge.net/project/wine/", - "http://iweb.dl.sourceforge.net/project/wine/", - "http://voxel.dl.sourceforge.net/project/wine/", - "http://cdnetworks-kr-1.dl.sourceforge.net/project/wine/", - "http://cdnetworks-kr-2.dl.sourceforge.net/project/wine/", - "http://nchc.dl.sourceforge.net/project/wine/", - "http://ncu.dl.sourceforge.net/project/wine/", - "http://jaist.dl.sourceforge.net/project/wine/", - "http://superb-sea2.dl.sourceforge.net/project/wine/", - "http://softlayer.dl.sourceforge.net/project/wine/", - "http://biznetnetworks.dl.sourceforge.net/project/wine/", - "http://ufpr.dl.sourceforge.net/project/wine/", - "http://cdnetworks-us-2.dl.sourceforge.net/project/wine/", - "http://cdnetworks-us-1.dl.sourceforge.net/project/wine/", - "http://waix.dl.sourceforge.net/project/wine/", - "http://internode.dl.sourceforge.net/project/wine/", - "http://transact.dl.sourceforge.net/project/wine/" - ); - - -function is_downloadable($sUrl) -{ - global $iFileSize; - $parse = parse_url($sUrl); - // open a socket connection - if($fp = @fsockopen($parse['host'], 80, $errno, $errstr, 10)) - { - // set request - $get = "HEAD ".$parse['path']." HTTP/1.1\r\n". - "Host: ".$parse['host']."\r\n". - "Connection: close\r\n\r\n"; - fputs($fp, $get); - while(!feof($fp)) - { - // get ONLY header information - $header .= fgets($fp, 128); - } - fclose($fp); - // match file size - preg_match('/Content-Length:\s([0-9].+?)\s/', $header, $matches); - $iSize = intval($matches[1]); - if($iSize == $iFileSize) return TRUE; - } - return FALSE; -} - - -if($_REQUEST['action']=="showlist") -{ - echo "<h2>List of mirrors available for file ".$sFileName." (".$iFileSize." bytes)</h2>"; - foreach($aList as $sLocation) - { - echo $sLocation.": "; - if(is_downloadable($sLocation.$sFileName)) - echo "online"; - else - echo "offline"; - echo "\n "; - flush(); - } -} else -{ - $iRand = rand(0, (sizeof($aList)-1)); - $sUrl = $aList[$iRand].$sFileName; - // we continue as long as we didn't find a working mirror and we didn't tried all the mirrors - while(!is_downloadable($sUrl) && sizeof($aAlreadyTried)<sizeof($aList)) - { - $aAlreadyTried[$iRand] = true; - // we loop until we take a random mirror that we didn't already tried ; of course if we have already tried all mirrors we stop - while($aAlreadyTried[$iRand] == true && sizeof($aAlreadyTried)<sizeof($aList)) - $iRand = rand(0, (sizeof($aList)-1)); - $sUrl = $aList[$iRand].$sFileName; - } - header("Location: ".$sUrl); -} +header("Location: http://dl.winehq.org/wine/".$sFileName); ?> diff --git a/winegecko.php b/winegecko.php index 0e07406..5afaa1f 100644 --- a/winegecko.php +++ b/winegecko.php @@ -19,7 +19,7 @@ $sVersion = '0.0.1'; $sFileSuffix = ''; // Folder which contains wine gecko files -$sFolder = 'Wine%20Gecko'; +$sFolder = 'wine-gecko'; // Check if a specific version was passed if(isset($_GET['v'])) { @@ -48,55 +48,6 @@ default: // Name of the file $sFileName = sprintf('%s/%s/wine_gecko-%s.%s', $sFolder, $sVersion, $sFileSuffix, $sExt); -// Size array -$aFileSizes = array( - '0.0.1'=>5219822, - '0.1.0'=>5746895, - '0.9.0'=>7806669, - '0.9.1'=>7806837, - '1.0.0-x86'=>8119486, - '1.1.0-x86'=>8868851, - '1.1.0-x86_64'=>8940997, - '1.2.0-x86'=>12604928, - '1.2.0-x86_64'=>12841472, - '1.3-x86'=>13609984, - '1.3-x86_64'=>13835776, - '1.4-x86'=>14732288, - '1.4-x86_64'=>14980096, - '1.5-x86'=>15950848, - '1.5-x86_64'=>16345088, - '1.6-x86'=>16802816, - '1.6-x86_64'=>17251328, - '1.7-x86'=>16995328, - '1.7-x86_64'=>17438720, - '1.8-x86'=>17774592, - '1.8-x86_64'=>18238976, - '1.9-x86'=>19060224, - '1.9-x86_64'=>19622400, - '2.21-x86'=>20871680, - '2.21-x86_64'=>21646336, - '2.24-beta1-x86'=>22354944, - '2.24-beta1-x86_64'=>23590400, - '2.24-x86'=>22373888, - '2.24-x86_64'=>23608320, - '2.34-beta1-x86'=>28131328, - '2.34-beta1-x86_64'=>29696000, - '2.34-beta2-x86'=>28270080, - '2.34-beta2-x86_64'=>29807616, - '2.34-x86'=>28269568, - '2.34-x86_64'=>29802496, - '2.36-beta1-x86'=>29698560, - '2.36-beta1-x86_64'=>31211008, - '2.36-x86'=>29718016, - '2.36-x86_64'=>31222784 -); - -// Exact size of the file: -$iFileSize = $aFileSizes[$sFileSuffix]; - -// List of additional locations (commonly used locations are already in download.inc.php) -$aList = array(); - // Common code for Wine downloader scripts require("download.inc.php"); ?> diff --git a/winemono.php b/winemono.php index a6d7583..799c3d7 100644 --- a/winemono.php +++ b/winemono.php @@ -10,7 +10,7 @@ $sVersion = '4.5.6'; $sFileSuffix = ''; // Folder which contains files -$sFolder = 'Wine%20Mono'; +$sFolder = 'wine-mono'; // Check if a specific version was passed if(isset($_GET['v'])) { @@ -25,21 +25,6 @@ $sExt = 'msi'; // Name of the file $sFileName = sprintf('%s/%s/wine-mono-%s.%s', $sFolder, $sVersion, $sFileSuffix, $sExt); -// Size array -$aFileSizes = array( - '0.0.4'=>44408320, - '0.0.8'=>46967296, - '4.5.2'=>52502528, - '4.5.4'=>53706752, - '4.5.6'=>53705216 -); - -// Exact size of the file: -$iFileSize = $aFileSizes[$sFileSuffix]; - -// List of additional locations (commonly used locations are already in download.inc.php) -$aList = array(); - // Common code for Wine downloader scripts require("download.inc.php"); ?>

1 0

Alexandre Julliard : update-winehq: Update the source download URL.
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: tools Branch: master Commit: 69639af132fa26a75c6bb33b5445e7df159a6a3a URL: http://source.winehq.org/git/tools.git/?a=commit;h=69639af132fa26a75c6bb33b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 5 00:36:15 2015 +0900 update-winehq: Update the source download URL. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- update-winehq | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/update-winehq b/update-winehq index bfabc81..efcf1d5 100755 --- a/update-winehq +++ b/update-winehq @@ -90,7 +90,9 @@ while (<ANNOUNCE>) } } -push @text, "The source is <a href=\"http://prdownloads.sourceforge.net/wine/wine-$rel.tar.bz2\">available now</a>.\n"; +(my $dir = $rel) =~ s/^([0-9]+\.[0-9]+).*/$1/; + +push @text, "The source is <a href=\"//dl.winehq.org/wine/source/$dir/wine-$rel.tar.bz2\">available now</a>.\n"; push @text, "Binary packages are in the process of being built, and will appear soon at their respective <a href=\"{\$root}/download\">download locations</a>.\n"; push @text, "</body></news>\n"; close ANNOUNCE;

1 0

Alexandre Julliard : Update source download URLs.
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: website Branch: master Commit: aaf9d2057c75cf1728241c52544b1b5a7a6a32be URL: http://source.winehq.org/git/website.git/?a=commit;h=aaf9d2057c75cf1728241c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 5 00:22:29 2015 +0900 Update source download URLs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- templates/de/download.template | 4 ++-- templates/en/download.template | 4 ++-- templates/fr/download.template | 4 ++-- templates/he/download.template | 4 ++-- templates/pl/download.template | 4 ++-- templates/pt/download.template | 4 ++-- templates/tr/download.template | 4 ++-- templates/uk/download.template | 4 ++-- templates/zh-cn/download.template | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/templates/de/download.template b/templates/de/download.template index c44773a..b1cd325 100644 --- a/templates/de/download.template +++ b/templates/de/download.template @@ -140,7 +140,7 @@ für das Hosten der Wine-Webseite erbeten hat. </tr> <tr bgcolor="#ffffff"> - <td> <a href="http://ftp.winehq.org/pub/wine/source/" target="_blank">winehq.org</a></td> + <td> <a href="//dl.winehq.org/wine/source/" target="_blank">winehq.org</a></td> <td> Unsere offizielle Website für freigegebenen Quellcode. </td> </tr> @@ -150,7 +150,7 @@ für das Hosten der Wine-Webseite erbeten hat. </tr> <tr bgcolor="#ffffff"> - <td><a href="http://ibiblio.org/pub/linux/system/emulators/wine/">ibiblio.org</a></td> + <td><a href="http://mirrors.ibiblio.org/wine/source/">ibiblio.org</a></td> <td> Alternative Downloadseite für offizielle Quellcode- und Dokumentations-Tarballs. </td> </tr> diff --git a/templates/en/download.template b/templates/en/download.template index 7001c9b..eadf9e8 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -135,7 +135,7 @@ requested in exchange for hosting the Wine web site. </tr> <tr bgcolor="#ffffff"> - <td> <a href="http://ftp.winehq.org/pub/wine/source/" target="_blank">winehq.org</a></td> + <td> <a href="//dl.winehq.org/wine/source/" target="_blank">winehq.org</a></td> <td> Our official source release site. </td> </tr> @@ -145,7 +145,7 @@ requested in exchange for hosting the Wine web site. </tr> <tr bgcolor="#ffffff"> - <td><a href="http://ibiblio.org/pub/linux/system/emulators/wine/">ibiblio.org</a></td> + <td><a href="http://mirrors.ibiblio.org/wine/source/">ibiblio.org</a></td> <td> Alternative download site for the official source and documentation tarballs. </td> </tr> diff --git a/templates/fr/download.template b/templates/fr/download.template index 971e073..0391209 100644 --- a/templates/fr/download.template +++ b/templates/fr/download.template @@ -146,7 +146,7 @@ href="http://wiki.winehq.org/ThirdPartyApplications">applications tierces</a>.</ </tr> <tr bgcolor="#ffffff"> - <td> <a href="http://ftp.winehq.org/pub/wine/source/" target="_blank">winehq.org</a></td> + <td> <a href="//dl.winehq.org/wine/source/" target="_blank">winehq.org</a></td> <td> Site officiel de téléchargement. </td> </tr> @@ -156,7 +156,7 @@ href="http://wiki.winehq.org/ThirdPartyApplications">applications tierces</a>.</ </tr> <tr bgcolor="#ffffff"> - <td><a href="http://ibiblio.org/pub/linux/system/emulators/wine/">ibiblio.org</a></td> + <td><a href="http://mirrors.ibiblio.org/wine/source/">ibiblio.org</a></td> <td> Site de téléchargement alternatif pour les tarballs officiels de sources et de documentation.</td> </tr> diff --git a/templates/he/download.template b/templates/he/download.template index 1a36569..53107ba 100644 --- a/templates/he/download.template +++ b/templates/he/download.template @@ -133,7 +133,7 @@ </tr> <tr bgcolor="#ffffff"> - <td> <a href="http://ftp.winehq.org/pub/wine/source/" target="_blank">winehq.org</a></td> + <td> <a href="//dl.winehq.org/wine/source/" target="_blank">winehq.org</a></td> <td> אתר הפצת קוד המקור הרשמי שלנו. </td> </tr> @@ -143,7 +143,7 @@ </tr> <tr bgcolor="#ffffff"> - <td><a href="http://ibiblio.org/pub/linux/system/emulators/wine/">ibiblio.org</a></td> + <td><a href="http://mirrors.ibiblio.org/wine/source/">ibiblio.org</a></td> <td> אתר הורדה חלופי לקוד המקור הרשמי וקובצי ה־tarball של התיעוד. </td> </tr> diff --git a/templates/pl/download.template b/templates/pl/download.template index 10e09f8..c22d2d7 100644 --- a/templates/pl/download.template +++ b/templates/pl/download.template @@ -139,7 +139,7 @@ stronę wiki</a> w poszukiwaniu aplikacji osób trzecich. </tr> <tr bgcolor="#ffffff"> - <td> <a href="http://ftp.winehq.org/pub/wine/source/" target="_blank">winehq.org</a></td> + <td> <a href="//dl.winehq.org/wine/source/" target="_blank">winehq.org</a></td> <td> Nasza oficjalna strona źródeł. </td> </tr> @@ -149,7 +149,7 @@ stronę wiki</a> w poszukiwaniu aplikacji osób trzecich. </tr> <tr bgcolor="#ffffff"> - <td><a href="http://ibiblio.org/pub/linux/system/emulators/wine/">ibiblio.org</a></td> + <td><a href="http://mirrors.ibiblio.org/wine/source/">ibiblio.org</a></td> <td> Alternatywna strona z oficjalnymi źródłami i dokumentacją. </td> </tr> diff --git a/templates/pt/download.template b/templates/pt/download.template index fad296b..fdc1dca 100644 --- a/templates/pt/download.template +++ b/templates/pt/download.template @@ -130,7 +130,7 @@ de terceiros. </tr> <tr bgcolor="#ffffff"> - <td> <a href="http://ftp.winehq.org/pub/wine/source/" target="_blank">winehq.org</a></td> + <td> <a href="//dl.winehq.org/wine/source/" target="_blank">winehq.org</a></td> <td> Nosso sítio oficial para lançamentos. </td> </tr> @@ -140,7 +140,7 @@ de terceiros. </tr> <tr bgcolor="#ffffff"> - <td><a href="http://ibiblio.org/pub/linux/system/emulators/wine/">ibiblio.org</a></td> + <td><a href="http://mirrors.ibiblio.org/wine/source/">ibiblio.org</a></td> <td> Sítio alternativo para o descarregamento dos tarballs com código fonte e documentação oficiais. </td> </tr> diff --git a/templates/tr/download.template b/templates/tr/download.template index 8689d07..7ee7d98 100644 --- a/templates/tr/download.template +++ b/templates/tr/download.template @@ -129,7 +129,7 @@ </tr> <tr bgcolor="#ffffff"> - <td> <a href="http://sourceforge.net/projects/wine/files/Source/" target="_blank">sourceforge.net</a></td> + <td> <a href="//dl.winehq.org/wine/source/" target="_blank">winehq.org</a></td> <td> Resmi kaynak yayın sitemiz. </td> </tr> @@ -139,7 +139,7 @@ </tr> <tr bgcolor="#ffffff"> - <td><a href="http://ibiblio.org/pub/linux/system/emulators/wine/">ibiblio.org</a></td> + <td><a href="http://mirrors.ibiblio.org/wine/source/">ibiblio.org</a></td> <td> Resmi kaynak ve belgeler için alternatif indirme sitesi. </td> </tr> diff --git a/templates/uk/download.template b/templates/uk/download.template index a36ebc1..3f2751f 100644 --- a/templates/uk/download.template +++ b/templates/uk/download.template @@ -136,7 +136,7 @@ </tr> <tr bgcolor="#ffffff"> - <td> <a href="http://sourceforge.net/projects/wine/files/Source/" target="_blank">sourceforge.net</a></td> + <td> <a href="//dl.winehq.org/wine/source/" target="_blank">winehq.org</a></td> <td> Наш офіційний сайт. </td> </tr> @@ -146,7 +146,7 @@ </tr> <tr bgcolor="#ffffff"> - <td><a href="http://ibiblio.org/pub/linux/system/emulators/wine/">ibiblio.org</a></td> + <td><a href="http://mirrors.ibiblio.org/wine/source/">ibiblio.org</a></td> <td> Альтернативний лінк для завантаження вихідних файлів та документації. </td> </tr> diff --git a/templates/zh-cn/download.template b/templates/zh-cn/download.template index 3ce949d..265afba 100644 --- a/templates/zh-cn/download.template +++ b/templates/zh-cn/download.template @@ -133,7 +133,7 @@ requested in exchange for hosting the Wine web site. </tr> <tr bgcolor="#ffffff"> - <td> <a href="http://sourceforge.net/projects/wine/files/Source/" target="_blank">sourceforge.net</a></td> + <td> <a href="//dl.winehq.org/wine/source/" target="_blank">winehq.org</a></td> <td> 我们的正式源码发布站点。</td> </tr> @@ -143,7 +143,7 @@ requested in exchange for hosting the Wine web site. </tr> <tr bgcolor="#ffffff"> - <td><a href="http://ibiblio.org/pub/linux/system/emulators/wine/">ibiblio.org</a></td> + <td><a href="http://mirrors.ibiblio.org/wine/source/">ibiblio.org</a></td> <td> 正式源码和文档包可选下载站点。</td> </tr>

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2015