September 2007 - Wine-Commits

Francois Gouget : wintrust: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Sept. 12, 2007

Sept. 12, 2007

Module: wine Branch: master Commit: 2eeb4eaf1d9ad08a07d0e8af5f5ad4c859e3af49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2eeb4eaf1d9ad08a07d0e8af5… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 11 16:37:44 2007 +0200 wintrust: Fix compilation on systems that don't support nameless unions. --- dlls/wintrust/softpub.c | 71 +++++++++++++++++++++------------------- dlls/wintrust/tests/asn.c | 40 +++++++++++----------- dlls/wintrust/tests/softpub.c | 8 ++-- 3 files changed, 61 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2eeb4eaf1d9ad08a07d0e…

1 0

Francois Gouget : url: Update win32.api to fix the winapi_check warnings.
by Alexandre Julliard Sept. 12, 2007

Sept. 12, 2007

Module: wine Branch: master Commit: 4ce6a5fa3d00a747c4880d5e788c82acfce1cb5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ce6a5fa3d00a747c4880d5e7… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 11 16:36:42 2007 +0200 url: Update win32.api to fix the winapi_check warnings. --- tools/winapi/win32.api | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index b463a74..d61bc74 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -4987,6 +4987,21 @@ TW_UINT32 TW_MEMREF pTW_IDENTITY +%%url.dll + +%long + +BOOL +DWORD +HRESULT +HWND +int + +%str + +LPCSTR +LPSTR + %%urlmon.dll %long

1 0

Francois Gouget : crypt32: Fix the I_Crypt*Asn1*() prototypes. Add the i_cryptasn1tls.h header and use it.
by Alexandre Julliard Sept. 12, 2007

Sept. 12, 2007

Module: wine Branch: master Commit: b7bf91f5e8b4d7b033f2ad83e535dd345b563ae9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7bf91f5e8b4d7b033f2ad83e… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 11 16:48:04 2007 +0200 crypt32: Fix the I_Crypt*Asn1*() prototypes. Add the i_cryptasn1tls.h header and use it. --- dlls/crypt32/chain.c | 4 ++-- dlls/crypt32/crypt32.spec | 5 +++-- dlls/crypt32/main.c | 19 +++++++++++++------ include/Makefile.in | 1 + include/i_cryptasn1tls.h | 41 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 60 insertions(+), 10 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index ed23180..f2fa84e 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -178,7 +178,7 @@ BOOL WINAPI CertCreateCertificateChainEngine(PCERT_CHAIN_ENGINE_CONFIG pConfig, return ret; } -void WINAPI CertFreeCertificateChainEngine(HCERTCHAINENGINE hChainEngine) +VOID WINAPI CertFreeCertificateChainEngine(HCERTCHAINENGINE hChainEngine) { PCertificateChainEngine engine = (PCertificateChainEngine)hChainEngine; @@ -1008,7 +1008,7 @@ PCCERT_CHAIN_CONTEXT WINAPI CertDuplicateCertificateChain( return pChainContext; } -void WINAPI CertFreeCertificateChain(PCCERT_CHAIN_CONTEXT pChainContext) +VOID WINAPI CertFreeCertificateChain(PCCERT_CHAIN_CONTEXT pChainContext) { PCertificateChain chain = (PCertificateChain)pChainContext; diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index ac706c7..cbadf22 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -199,17 +199,18 @@ @ stdcall I_CryptFreeLruCache(ptr long long) @ stdcall I_CryptFreeTls(long long) @ stdcall I_CryptGetAsn1Decoder(long) +@ stdcall I_CryptGetAsn1Encoder(long) @ stdcall I_CryptGetDefaultCryptProv(long) @ stub I_CryptGetDefaultCryptProvForEncrypt @ stdcall I_CryptGetOssGlobal(long) @ stdcall I_CryptGetTls(long) @ stub I_CryptInsertLruEntry -@ stdcall I_CryptInstallAsn1Module(long long long) +@ stdcall I_CryptInstallAsn1Module(ptr long ptr) @ stdcall I_CryptInstallOssGlobal(long long long) @ stdcall I_CryptReadTrustedPublisherDWORDValueFromRegistry(wstr ptr) @ stub I_CryptReleaseLruEntry @ stdcall I_CryptSetTls(long ptr) -@ stdcall I_CryptUninstallAsn1Module(ptr) +@ stdcall I_CryptUninstallAsn1Module(long) @ stub I_CryptUninstallOssGlobal @ stub PFXExportCertStore @ stub PFXImportCertStore diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index 9e53e4b..db17447 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -26,6 +26,7 @@ #include "wincrypt.h" #include "winreg.h" #include "winuser.h" +#include "i_cryptasn1tls.h" #include "crypt32_private.h" #include "wine/debug.h" @@ -195,21 +196,27 @@ DWORD WINAPI I_CryptInstallOssGlobal(DWORD x, DWORD y, DWORD z) return ret; } -BOOL WINAPI I_CryptInstallAsn1Module(void *x, DWORD y, DWORD z) +BOOL WINAPI I_CryptInstallAsn1Module(ASN1module_t x, DWORD y, void* z) { - FIXME("%p %08x %08x\n", x, y, z); + FIXME("(%p %08x %p): stub\n", x, y, z); return TRUE; } -BOOL WINAPI I_CryptUninstallAsn1Module(void *x) +BOOL WINAPI I_CryptUninstallAsn1Module(HCRYPTASN1MODULE x) { - FIXME("%p\n", x); + FIXME("(%08x): stub\n", x); return TRUE; } -void *WINAPI I_CryptGetAsn1Decoder(long x) +ASN1decoding_t WINAPI I_CryptGetAsn1Decoder(HCRYPTASN1MODULE x) { - FIXME("%08lx\n", x); + FIXME("(%08x): stub\n", x); + return NULL; +} + +ASN1encoding_t WINAPI I_CryptGetAsn1Encoder(HCRYPTASN1MODULE x) +{ + FIXME("(%08x): stub\n", x); return NULL; } diff --git a/include/Makefile.in b/include/Makefile.in index 660977b..60b916a 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -183,6 +183,7 @@ SRCDIR_INCLUDES = \ guiddef.h \ hlguids.h \ htmlhelp.h \ + i_cryptasn1tls.h \ icm.h \ icmpapi.h \ idispids.h \ diff --git a/include/i_cryptasn1tls.h b/include/i_cryptasn1tls.h new file mode 100644 index 0000000..aee4adc --- /dev/null +++ b/include/i_cryptasn1tls.h @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2007 Francois Gouget + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_I_CRYPTASN1TLS_H +#define __WINE_I_CRYPTASN1TLS_H + +typedef void *ASN1decoding_t; +typedef void *ASN1encoding_t; +typedef void *ASN1module_t; +typedef DWORD HCRYPTASN1MODULE; + + +#ifdef __cplusplus +extern "C" { +#endif + +ASN1decoding_t WINAPI I_CryptGetAsn1Decoder(HCRYPTASN1MODULE); +ASN1encoding_t WINAPI I_CryptGetAsn1Encoder(HCRYPTASN1MODULE); +BOOL WINAPI I_CryptInstallAsn1Module(ASN1module_t, DWORD, void*); +BOOL WINAPI I_CryptUninstallAsn1Module(HCRYPTASN1MODULE); + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_I_CRYPTASN1TLS_H */

1 0

Roderick Colenbrander : wined3d: Move the memory code of LockRect to the end of the function.
by Alexandre Julliard Sept. 12, 2007

Sept. 12, 2007

Module: wine Branch: master Commit: 12e942b135b403ad9c088fb94bc3fd3129fd8186 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12e942b135b403ad9c088fb94… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Mon Sep 10 23:46:23 2007 +0200 wined3d: Move the memory code of LockRect to the end of the function. This is needed for PBOs because for those memory allocation works differently. --- dlls/wined3d/surface.c | 42 +++++++++++++++++++++++------------------- 1 files changed, 23 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index aecf7f2..4904f24 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -696,36 +696,19 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED This->Flags &= ~SFLAG_INSYSMEM; /* This is the marker that surface data has to be downloaded */ } - /* Calculate the correct start address to report */ + /* Calculate the dimensions of the locked rect */ if (NULL == pRect) { - pLockedRect->pBits = This->resource.allocatedMemory; This->lockedRect.left = 0; This->lockedRect.top = 0; This->lockedRect.right = This->currentDesc.Width; This->lockedRect.bottom = This->currentDesc.Height; TRACE("Locked Rect (%p) = l %d, t %d, r %d, b %d\n", &This->lockedRect, This->lockedRect.left, This->lockedRect.top, This->lockedRect.right, This->lockedRect.bottom); } else { - TRACE("Lock Rect (%p) = l %d, t %d, r %d, b %d\n", pRect, pRect->left, pRect->top, pRect->right, pRect->bottom); - - /* DXTn textures are based on compressed blocks of 4x4 pixels, each - * 16 bytes large (8 bytes in case of DXT1). Because of that Pitch has - * slightly different meaning compared to regular textures. For DXTn - * textures Pitch is the size of a row of blocks, 4 high and "width" - * long. The x offset is calculated differently as well, since moving 4 - * pixels to the right actually moves an entire 4x4 block to right, ie - * 16 bytes (8 in case of DXT1). */ - if (This->resource.format == WINED3DFMT_DXT1) { - pLockedRect->pBits = This->resource.allocatedMemory + (pLockedRect->Pitch * pRect->top / 4) + (pRect->left * 2); - } else if (This->resource.format == WINED3DFMT_DXT2 || This->resource.format == WINED3DFMT_DXT3 - || This->resource.format == WINED3DFMT_DXT4 || This->resource.format == WINED3DFMT_DXT5) { - pLockedRect->pBits = This->resource.allocatedMemory + (pLockedRect->Pitch * pRect->top / 4) + (pRect->left * 4); - } else { - pLockedRect->pBits = This->resource.allocatedMemory + (pLockedRect->Pitch * pRect->top) + (pRect->left * This->bytesPerPixel); - } This->lockedRect.left = pRect->left; This->lockedRect.top = pRect->top; This->lockedRect.right = pRect->right; This->lockedRect.bottom = pRect->bottom; + TRACE("Locked Rect (%p) = l %d, t %d, r %d, b %d\n", pRect, pRect->left, pRect->top, pRect->right, pRect->bottom); } if (This->Flags & SFLAG_NONPOW2) { @@ -872,6 +855,27 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED } lock_end: + /* Calculate the correct start address to report */ + if (NULL == pRect) { + pLockedRect->pBits = This->resource.allocatedMemory; + } else { + /* DXTn textures are based on compressed blocks of 4x4 pixels, each + * 16 bytes large (8 bytes in case of DXT1). Because of that Pitch has + * slightly different meaning compared to regular textures. For DXTn + * textures Pitch is the size of a row of blocks, 4 high and "width" + * long. The x offset is calculated differently as well, since moving 4 + * pixels to the right actually moves an entire 4x4 block to right, ie + * 16 bytes (8 in case of DXT1). */ + if (This->resource.format == WINED3DFMT_DXT1) { + pLockedRect->pBits = This->resource.allocatedMemory + (pLockedRect->Pitch * pRect->top / 4) + (pRect->left * 2); + } else if (This->resource.format == WINED3DFMT_DXT2 || This->resource.format == WINED3DFMT_DXT3 + || This->resource.format == WINED3DFMT_DXT4 || This->resource.format == WINED3DFMT_DXT5) { + pLockedRect->pBits = This->resource.allocatedMemory + (pLockedRect->Pitch * pRect->top / 4) + (pRect->left * 4); + } else { + pLockedRect->pBits = This->resource.allocatedMemory + (pLockedRect->Pitch * pRect->top) + (pRect->left * This->bytesPerPixel); + } + } + if (Flags & (WINED3DLOCK_NO_DIRTY_UPDATE | WINED3DLOCK_READONLY)) { /* Don't dirtify */ } else {

1 0

tools/ winetest/winetest.cron winetest/winetes ...
by Alexandre Julliard Sept. 12, 2007

Sept. 12, 2007

ChangeSet ID: 31375 CVSROOT: /opt/cvs-commit Module name: tools Changes by: julliard(a)winehq.org 2007/09/12 07:32:32 Removed files: winetest : winetest.cron winetest.conf winetest.cgi winetest.builds summary.js summary.css service.cgi resultform.html gather error.cgi dissect builds.txt README . : winegecko.php mozactivex.php mono.php download.inc.php Log message: Remove some more scripts that are in git now. Patch: http://cvs.winehq.org/patch.py?id=31375 Old revision New revision Changes Path 1.4 Removed +0 -0 tools/winetest/winetest.cron 1.5 Removed +0 -0 tools/winetest/winetest.conf 1.9 Removed +0 -0 tools/winetest/winetest.cgi 1.1 Removed +0 -0 tools/winetest/winetest.builds 1.4 Removed +0 -0 tools/winetest/summary.js 1.9 Removed +0 -0 tools/winetest/summary.css 1.24 Removed +0 -0 tools/winetest/service.cgi 1.2 Removed +0 -0 tools/winetest/resultform.html 1.31 Removed +0 -0 tools/winetest/gather 1.2 Removed +0 -0 tools/winetest/error.cgi 1.25 Removed +0 -0 tools/winetest/dissect 1.2 Removed +0 -0 tools/winetest/builds.txt 1.2 Removed +0 -0 tools/winetest/README 1.3 Removed +0 -0 tools/winegecko.php 1.3 Removed +0 -0 tools/mozactivex.php 1.1 Removed +0 -0 tools/mono.php 1.2 Removed +0 -0 tools/download.inc.php

1 0

Alexandre Julliard : Move the winetest scripts to the git repository.
by Alexandre Julliard Sept. 12, 2007

Sept. 12, 2007

Module: tools Branch: master Commit: fd4ab1425ad8fb3afea53ee21281f4103bc2b874 URL: http://source.winehq.org/git/tools.git/?a=commit;h=fd4ab1425ad8fb3afea53ee2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 12 14:23:45 2007 +0200 Move the winetest scripts to the git repository. --- winetest/README | 58 +++++++ winetest/builds.txt | 1 + winetest/dissect | 231 +++++++++++++++++++++++++ winetest/error.cgi | 46 +++++ winetest/gather | 425 ++++++++++++++++++++++++++++++++++++++++++++++ winetest/resultform.html | 43 +++++ winetest/service.cgi | 307 +++++++++++++++++++++++++++++++++ winetest/summary.css | 183 ++++++++++++++++++++ winetest/summary.js | 37 ++++ winetest/winetest.builds | 1 + winetest/winetest.cgi | 101 +++++++++++ winetest/winetest.conf | 19 ++ winetest/winetest.cron | 12 ++ 13 files changed, 1464 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=fd4ab1425ad8fb3afea5…

1 0

Alexandre Julliard : Move the download scripts to the git repository.
by Alexandre Julliard Sept. 12, 2007

Sept. 12, 2007

Module: tools Branch: master Commit: 9d8f29d984f0e85e00f0cdbccea4a311ef41c3ba URL: http://source.winehq.org/git/tools.git/?a=commit;h=9d8f29d984f0e85e00f0cdbc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 12 14:22:32 2007 +0200 Move the download scripts to the git repository. --- download.inc.php | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ mono.php | 27 ++++++++++++++++ mozactivex.php | 27 ++++++++++++++++ winegecko.php | 37 ++++++++++++++++++++++ 4 files changed, 180 insertions(+), 0 deletions(-) diff --git a/download.inc.php b/download.inc.php new file mode 100644 index 0000000..d0a8ef4 --- /dev/null +++ b/download.inc.php @@ -0,0 +1,89 @@ +<?php +/** + * Common code for Wine downloader scripts. + * + * Copyright (c) 2006 Jonathan Ernst + */ + +// List of common locations for files +$aList += array("http://switch.dl.sourceforge.net/sourceforge/wine/", + "http://surfnet.dl.sourceforge.net/sourceforge/wine/", + "http://citkit.dl.sourceforge.net/sourceforge/wine/", + "http://keihanna.dl.sourceforge.net/sourceforge/wine/", + "http://heanet.dl.sourceforge.net/sourceforge/wine/", + "http://easynews.dl.sourceforge.net/sourceforge/wine/", + "http://ovh.dl.sourceforge.net/sourceforge/wine/", + "http://jaist.dl.sourceforge.net/sourceforge/wine/", + "http://puzzle.dl.sourceforge.net/sourceforge/wine/", + "http://nchc.dl.sourceforge.net/sourceforge/wine/", + "http://switch.dl.sourceforge.net/sourceforge/wine/", + "http://kent.dl.sourceforge.net/sourceforge/wine/", + "http://optusnet.dl.sourceforge.net/sourceforge/wine/", + "http://mesh.dl.sourceforge.net/sourceforge/wine/", + "http://internap.dl.sourceforge.net/sourceforge/wine/", + "http://superb-east.dl.sourceforge.net/sourceforge/wine/", + "http://optusnet.dl.sourceforge.net/sourceforge/wine/", + "http://superb-west.dl.sourceforge.net/sourceforge/wine/", + "http://nchc.dl.sourceforge.net/sourceforge/wine/", + "http://umn.dl.sourceforge.net/sourceforge/wine/", + "http://belnet.dl.sourceforge.net/sourceforge/wine/", + "http://ufpr.dl.sourceforge.net/sourceforge/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 informations + $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 "<font color=\"green\">online</font>"; + else + echo "<font color=\"red\">offline</font>"; + echo "\n<br />"; + 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); +} +?> diff --git a/mono.php b/mono.php new file mode 100644 index 0000000..fbd6080 --- /dev/null +++ b/mono.php @@ -0,0 +1,27 @@ +<?php +/** + * Redirects to one of many URLs that have the Mono Windows installer available. + * + * Usage: + * mono.php + * (main usage, redirects to one of many URLs that have the Mono Windows installer available) + * + * mono.php?action=showlist + * (display a list of server and tells if the file is available for each server) + * + * Copyright (c) 2006 Jonathan Ernst + */ + + +// Name of the file +$sFileName = "mono-1.2.1-gtksharp-2.8.3-win32-1.exe"; + +// Exact size of the file: +$iFileSize = 46430421; + +// List of additional locations (commonly used locations are already in download.inc.php) +$aList = array("ftp://www.go-mono.com/archive/1.2.1/windows-installer/1/"); + +// Common code for Wine downloader scripts +require("download.inc.php"); +?> diff --git a/mozactivex.php b/mozactivex.php new file mode 100644 index 0000000..96da243 --- /dev/null +++ b/mozactivex.php @@ -0,0 +1,27 @@ +<?php +/** + * Redirects to one of many URLs that have the MozillaActiveX control available. + * + * Usage: + * mozactivex.php + * (main usage, redirects to one of many URLs that have the MozillaActiveX control available) + * + * mozactivex.php?action=showlist + * (display a list of server and tells if the file is available for each server) + * + * Copyright (c) 2005-2006 Jonathan Ernst + */ + + +// Name of the file +$sFileName = "MozillaControl1712-ReactOS.exe"; + +// Exact size of the file: +$iFileSize = 4735160; + +// 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/winegecko.php b/winegecko.php new file mode 100644 index 0000000..199e568 --- /dev/null +++ b/winegecko.php @@ -0,0 +1,37 @@ +<?php +/** + * Redirects to one of many URLs that have the Wine Gecko installer available. + * + * Usage: + * winegecko.php + * (main usage, redirects to one of many URLs that have the Wine Gecko installer available) + * + * winegecko.php?action=showlist + * (display a list of server and tells if the file is available for each server) + * + * Copyright (c) 2006 Jonathan Ernst + */ + +// Chek if a specific version was passed +if(isset($_GET['v'])) + $sVersion = $_GET['v']; + +// Name of the file +$sFileName = "wine_gecko".($sVersion?'-'.$sVersion:'').".cab"; + +// Size array +$aFileSizes = array( + 'default'=>5219822, + '0.0.1'=>5219822, + '0.1.0'=>5746895 +); + +// Exact size of the file: +$iFileSize = ($sVersion?$aFileSizes[$sVersion]:$aFileSizes['default']); + +// 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 : All modules are now moved from cvs to git.
by Alexandre Julliard Sept. 12, 2007

Sept. 12, 2007

Module: website Branch: master Commit: 9fbe64d458e14b94c0bcf5144a2db98804594655 URL: http://source.winehq.org/git/website.git/?a=commit;h=9fbe64d458e14b94c0bcf5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 12 12:35:40 2007 +0200 All modules are now moved from cvs to git. --- templates/en/cvs.template | 17 ----------------- templates/en/git.template | 27 +++++++++++++-------------- 2 files changed, 13 insertions(+), 31 deletions(-) diff --git a/templates/en/cvs.template b/templates/en/cvs.template index 93fafa9..f7e14b1 100644 --- a/templates/en/cvs.template +++ b/templates/en/cvs.template @@ -9,7 +9,6 @@ <ol> <li><a href="#co">Getting a local copy of Wine</a></li> - <li><a href="#modules">Other modules available via CVS from WineHQ</a></li> <li><a href="#docs">Documentation module available via CVS from Sourceforge</a></li> <li><a href="#sourcetree">Source Tree Browsing via the Web</a></li> </ol> @@ -33,22 +32,6 @@ cvs login <hr /> -<h1 id="modules">Other modules available via CVS from WineHQ</h1> - -<p>The WineHQ CVS server makes a couple of other things available as well. - To get these, log in anonymously as above and do - <code>cvs co <em>modulename</em></code> - where - <code><em>modulename</em></code> - is one of:</p> -<ul> - <li><tt>lostwages</tt> -- source for the WineHQ web site</li> - <li><tt>tools</tt> -- tools used on the WineHQ site</li> - <li><tt>appdb</tt> -- source for the application database web site</li> -</ul> - -<hr /> - <h1 id="docs">Documentation module available via CVS from Sourceforge</h1> <p>The documentation lives in a separate CVS tree on Sourceforge. To get the docs in diff --git a/templates/en/git.template b/templates/en/git.template index dcd73b9..951e4c6 100644 --- a/templates/en/git.template +++ b/templates/en/git.template @@ -18,9 +18,11 @@ such as the Linux Kernel source.</p> <ol> <li><a href="#clone">Getting a local copy of Wine</a></li> + <li><a href="#cleaning">Cleaning up your existing tree</a></li> <li><a href="#uptodate">Staying Up-To-Date</a></li> <li><a href="#sourcetree">Source Tree Browsing via the Web</a></li> <li><a href="#modules">Other modules available from WineHQ</a></li> + <li><a href="#clonecvs">Getting a local copy of Wine with CVS</a></li> <li><a href="#docs">Documentation module available from Sourceforge</a></li> </ol> @@ -34,7 +36,7 @@ such as the Linux Kernel source.</p> <hr /> -<h1 id="uptodate">Cleaning up your existing tree</h1> +<h1 id="cleaning">Cleaning up your existing tree</h1> <p>A quick way to clean up your tree after you've been modifying it and want to remove changes you haven't checked in is this: </p> @@ -58,7 +60,7 @@ you can use the following more dangerous command:</p> <hr /> -<h1>Staying Up-To-Date</h1> +<h1 id="uptodate">Staying Up-To-Date</h1> <p> First, make sure to clean your tree as described above, then run the following commands from the top level wine directory:</p> @@ -95,29 +97,26 @@ exports the following modules:</p> <ul> <li><a href="http://source.winehq.org/git/website.git">website.git</a> -- source for the WineHQ.org website</li> <li><a href="http://source.winehq.org/git/bugzilla.git">bugzilla.git</a> -- source for the bugzilla version used on the WineHQ site</li> + <li><a href="http://source.winehq.org/git/appdb.git">appdb.git</a> -- source for the application database web site</li> <li><a href="http://source.winehq.org/git/tools.git">tools.git</a> -- tools used on the WineHQ site</li> </ul> -<p>The WineHQ CVS server exports the following modules:</p> +<hr /> -<ul> - <li><tt>tools</tt> -- tools used on the WineHQ site</li> - <li><tt>appdb</tt> -- source for the application database web site</li> -</ul> +<h1 id="clonecvs">Getting a local copy of Wine with CVS</h1> + +<p>If you cannot use Git for some reason, the main source tree is + also available through CVS.</p> <p>To login to the CVS server, run in a terminal:</p> -<p><code>CVSROOT=:pserver:cvs(a)cvs.winehq.org:/home/wine cvs login</code></p> +<p><code>cvs -d :pserver:cvs(a)cvs.winehq.org:/home/wine login</code></p> <p>Use "cvs" as the password (without the quotes).</p> -<p>To get a git repository of one of the modules listed above -create a new directory and in a terminal run in that directory:</p> - -<p><code>git cvsimport -v -k -d :pserver:cvs(a)cvs.winehq.org:/home/wine MODULE</code></p> +<p>To check out the Wine source tree run:</p> -<p>Replace MODULE with one of the module names listed above.<br/> -But be aware that this can take quite some time.</p> +<p><code>cvs -z 3 -d :pserver:cvs(a)cvs.winehq.org:/home/wine checkout wine</code></p> <hr />

1 0

Alexandre Julliard : Replaced .cvsignore by .gitignore.
by Alexandre Julliard Sept. 12, 2007

Sept. 12, 2007

Module: appdb Branch: master Commit: e3ca73f7df72080226640d6e1f4c9d35efd5fc28 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=e3ca73f7df72080226640d6e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 12 12:06:18 2007 +0200 Replaced .cvsignore by .gitignore. --- .cvsignore | 1 - .gitignore | 2 ++ 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 1269488..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -data diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ee9e3f1 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/data +include/config.php

1 0

tools/. wineprint.dsl winehtml.dsl winedoc.css ...
by Alexandre Julliard Sept. 11, 2007

Sept. 11, 2007

ChangeSet ID: 31374 CVSROOT: /opt/cvs-commit Module name: tools Changes by: julliard(a)winehq.org 2007/09/11 14:48:57 Removed files: . : wineprint.dsl winehtml.dsl winedoc.css winapi_stats.php html2template Log message: Remove tools that are in git now. Patch: http://cvs.winehq.org/patch.py?id=31374 Old revision New revision Changes Path 1.1 Removed +0 -0 tools/wineprint.dsl 1.1 Removed +0 -0 tools/winehtml.dsl 1.1 Removed +0 -0 tools/winedoc.css 1.12 Removed +0 -0 tools/winapi_stats.php 1.2 Removed +0 -0 tools/html2template

1 0