November 2015 - Wine-Commits

Alexandre Julliard : x3daudio1_7: Remove unused debug channel.
by Alexandre Julliard Nov. 5, 2015

Nov. 5, 2015

Module: wine Branch: master Commit: 97e7affe32b9c25e43d86775ee70703031ab21cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=97e7affe32b9c25e43d86775e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 5 18:54:24 2015 +0900 x3daudio1_7: Remove unused debug channel. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/x3daudio1_7/main.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/x3daudio1_7/main.c b/dlls/x3daudio1_7/main.c index 7f64112..5d1a5a5 100644 --- a/dlls/x3daudio1_7/main.c +++ b/dlls/x3daudio1_7/main.c @@ -15,6 +15,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + #include "config.h" #include <stdarg.h> @@ -22,10 +23,6 @@ #include "winbase.h" #include "x3daudio.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(x3daudio); - BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { switch (reason)

1 0

Alex Henrie : opengl32: Avoid double initialization of variables in WGL functions.
by Alexandre Julliard Nov. 5, 2015

Nov. 5, 2015

Module: wine Branch: master Commit: 268070d9a8fc3210ac3ffe2e6a9943dbd89c042b URL: http://source.winehq.org/git/wine.git/?a=commit;h=268070d9a8fc3210ac3ffe2e6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Nov 3 22:06:13 2015 -0700 opengl32: Avoid double initialization of variables in WGL functions. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/wgl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index acfb243..ee2ae25 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -1057,7 +1057,7 @@ BOOL WINAPI wglGetPixelFormatAttribfvARB( HDC hdc, int format, int layer, UINT c */ HPBUFFERARB WINAPI wglCreatePbufferARB( HDC hdc, int format, int width, int height, const int *attribs ) { - HPBUFFERARB ret = 0; + HPBUFFERARB ret; struct wgl_pbuffer *pbuffer; struct opengl_funcs *funcs = get_dc_funcs( hdc ); @@ -1749,7 +1749,7 @@ GLint WINAPI glDebugEntry( GLint unknown1, GLint unknown2 ) static GLubyte *filter_extensions_list(const char *extensions, const char *disabled) { - char *p, *str = NULL; + char *p, *str; const char *end; p = str = HeapAlloc(GetProcessHeap(), 0, strlen(extensions) + 2); @@ -1785,7 +1785,7 @@ static GLuint *filter_extensions_index(const char *disabled) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; const char *ext, *end, *gl_ext; - GLuint *disabled_exts = NULL, *new_disabled_exts; + GLuint *disabled_exts, *new_disabled_exts; unsigned int i = 0, j, disabled_size; GLint extensions_count;

1 0

Sebastian Lackner : server: Wake up APC if we fail to allocate a handle in target process.
by Alexandre Julliard Nov. 5, 2015

Nov. 5, 2015

Module: wine Branch: master Commit: 41f7f19cb578c60d65dd8321d1de63aa9c09e271 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41f7f19cb578c60d65dd8321d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Nov 5 05:41:58 2015 +0100 server: Wake up APC if we fail to allocate a handle in target process. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/thread.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/thread.c b/server/thread.c index d65ea89..bad2231 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1500,10 +1500,10 @@ DECL_HANDLER(select) /* Optimization: ignore APC_NONE calls, they are only used to * wake up a thread, but since we got here the thread woke up already. */ - if (apc->call.type != APC_NONE) + if (apc->call.type != APC_NONE && + (reply->apc_handle = alloc_handle( current->process, apc, SYNCHRONIZE, 0 ))) { - if ((reply->apc_handle = alloc_handle( current->process, apc, SYNCHRONIZE, 0 ))) - reply->call = apc->call; + reply->call = apc->call; release_object( apc ); break; }

1 0

Martin Storsjo : ucrtbase: Implement _get_stream_buffer_pointers.
by Alexandre Julliard Nov. 5, 2015

Nov. 5, 2015

Module: wine Branch: master Commit: 8cc5b07e9d0aedffd4251d2e8942cb8368920bf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cc5b07e9d0aedffd4251d2e8… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Nov 4 12:25:27 2015 +0200 ucrtbase: Implement _get_stream_buffer_pointers. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-stdio-l1-1-0.spec | 2 +- dlls/msvcrt/file.c | 15 +++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec index 2db8222..30570da 100644 --- a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec +++ b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec @@ -55,7 +55,7 @@ @ cdecl _get_fmode(ptr) ucrtbase._get_fmode @ cdecl _get_osfhandle(long) ucrtbase._get_osfhandle @ cdecl _get_printf_count_output() ucrtbase._get_printf_count_output -@ stub _get_stream_buffer_pointers +@ cdecl _get_stream_buffer_pointers(ptr ptr ptr ptr) ucrtbase._get_stream_buffer_pointers @ cdecl _getc_nolock(ptr) ucrtbase._getc_nolock @ cdecl _getcwd(str long) ucrtbase._getcwd @ cdecl _getdcwd(long str long) ucrtbase._getdcwd diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index f1de534..22bb925 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -5303,3 +5303,18 @@ int CDECL MSVCRT__setmaxstdio(int newmax) MSVCRT_max_streams = newmax; return MSVCRT_max_streams; } + +/********************************************************************* + * _get_stream_buffer_pointers (UCRTBASE.@) + */ +int CDECL MSVCRT__get_stream_buffer_pointers(MSVCRT_FILE *file, char*** base, + char*** ptr, int** count) +{ + if (base) + *base = &file->_base; + if (ptr) + *ptr = &file->_ptr; + if (count) + *count = &file->_cnt; + return 0; +} diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 6877bef..4e8b3bb 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -373,7 +373,7 @@ @ cdecl _get_pgmptr(ptr) @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output @ stub _get_purecall_handler -@ stub _get_stream_buffer_pointers +@ cdecl _get_stream_buffer_pointers(ptr ptr ptr ptr) MSVCRT__get_stream_buffer_pointers @ cdecl _get_terminate() MSVCRT__get_terminate @ stub _get_thread_local_invalid_parameter_handler @ cdecl _get_timezone(ptr)

1 0

Dmitry Timoshkov : widl: Attribute uuid() takes precedence over 'hidden'.
by Alexandre Julliard Nov. 5, 2015

Nov. 5, 2015

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 : oleaut32/tests: Add a bunch of new tests for typelib generation.
by Alexandre Julliard Nov. 5, 2015

Nov. 5, 2015

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

Józef Kucia : d3d11: Add support for mapping 3D textures.
by Alexandre Julliard Nov. 5, 2015

Nov. 5, 2015

Module: wine Branch: master Commit: 1c980f70935ead15eb78993d87f0fa249e1cabef URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c980f70935ead15eb78993d8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 4 23:37:12 2015 +0100 d3d11: Add support for mapping 3D textures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 1 + dlls/d3d11/texture.c | 8 ++++++++ dlls/d3d11/utils.c | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index b6d84c0..932d518 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -133,6 +133,7 @@ struct d3d_texture3d HRESULT d3d_texture3d_create(struct d3d_device *device, const D3D11_TEXTURE3D_DESC *desc, const D3D11_SUBRESOURCE_DATA *data, struct d3d_texture3d **texture) DECLSPEC_HIDDEN; +struct d3d_texture3d *unsafe_impl_from_ID3D11Texture3D(ID3D11Texture3D *iface) DECLSPEC_HIDDEN; /* ID3D11Buffer, ID3D10Buffer */ struct d3d_buffer diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index ef4c3ac..9c7f299 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -887,6 +887,14 @@ static const struct ID3D10Texture3DVtbl d3d10_texture3d_vtbl = d3d10_texture3d_GetDesc, }; +struct d3d_texture3d *unsafe_impl_from_ID3D11Texture3D(ID3D11Texture3D *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d11_texture3d_vtbl); + return impl_from_ID3D11Texture3D(iface); +} + static const struct wined3d_parent_ops d3d_texture3d_wined3d_parent_ops = { d3d_texture3d_wined3d_object_released, diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index 31dffa3..4253689 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -518,6 +518,10 @@ struct wined3d_resource *wined3d_resource_from_d3d11_resource(ID3D11Resource *re return wined3d_texture_get_resource(unsafe_impl_from_ID3D11Texture2D( (ID3D11Texture2D *)resource)->wined3d_texture); + case D3D11_RESOURCE_DIMENSION_TEXTURE3D: + return wined3d_texture_get_resource(unsafe_impl_from_ID3D11Texture3D( + (ID3D11Texture3D *)resource)->wined3d_texture); + default: FIXME("Unhandled resource dimension %#x.\n", dimension); return NULL;

1 0

Jacek Caban : Use dl.winehq.org for downloading Gecko and Mono.
by Alexandre Julliard Nov. 5, 2015

Nov. 5, 2015

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 Nov. 5, 2015

Nov. 5, 2015

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 Nov. 5, 2015

Nov. 5, 2015

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