August 2006 - Wine-commits - list.winehq.org

Mikołaj Zalewski : regedit: Put language-dependent strings in resources.
by Alexandre Julliard 23 Aug '06

23 Aug '06

Module: wine Branch: master Commit: 1ee7095e4147b1821d5d07cb9f196a8dc7f8a63f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1ee7095e4147b1821d5d07c… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Aug 23 14:11:39 2006 +0200 regedit: Put language-dependent strings in resources. --- programs/regedit/En.rc | 16 ++++++++++++++++ programs/regedit/Pl.rc | 16 ++++++++++++++++ programs/regedit/about.c | 4 +++- programs/regedit/childwnd.c | 2 +- programs/regedit/framewnd.c | 15 +++++++++++---- programs/regedit/listview.c | 24 ++++++++++++++++-------- programs/regedit/main.c | 3 ++- programs/regedit/main.h | 2 +- programs/regedit/resource.h | 8 ++++++++ 9 files changed, 74 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=1ee7095e4147b1821d5…

1 0

Mikołaj Zalewski : shlwapi: Move strings used by StrFromTimeInterval to resources.
by Alexandre Julliard 23 Aug '06

23 Aug '06

Module: wine Branch: master Commit: f108b034cb0b075863c8af07431f08fdb50bade0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f108b034cb0b075863c8af0… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Aug 23 14:13:32 2006 +0200 shlwapi: Move strings used by StrFromTimeInterval to resources. --- dlls/shlwapi/resource.h | 3 +++ dlls/shlwapi/shlwapi_De.rc | 3 +++ dlls/shlwapi/shlwapi_En.rc | 3 +++ dlls/shlwapi/shlwapi_Eo.rc | 3 +++ dlls/shlwapi/shlwapi_Es.rc | 3 +++ dlls/shlwapi/shlwapi_Fi.rc | 3 +++ dlls/shlwapi/shlwapi_Fr.rc | 3 +++ dlls/shlwapi/shlwapi_Hu.rc | 3 +++ dlls/shlwapi/shlwapi_It.rc | 3 +++ dlls/shlwapi/shlwapi_Ja.rc | 3 +++ dlls/shlwapi/shlwapi_Ko.rc | 3 +++ dlls/shlwapi/shlwapi_Nl.rc | 3 +++ dlls/shlwapi/shlwapi_No.rc | 3 +++ dlls/shlwapi/shlwapi_Pl.rc | 3 +++ dlls/shlwapi/shlwapi_Pt.rc | 3 +++ dlls/shlwapi/shlwapi_Tr.rc | 3 +++ dlls/shlwapi/string.c | 13 +++++-------- 17 files changed, 53 insertions(+), 8 deletions(-) diff --git a/dlls/shlwapi/resource.h b/dlls/shlwapi/resource.h index c06dbf7..7359ffe 100644 --- a/dlls/shlwapi/resource.h +++ b/dlls/shlwapi/resource.h @@ -21,6 +21,9 @@ #ifndef WINE_SHLWAPI_RESOURCE_H #define WINE_SHLWAPI_RESOURCE_H #define IDS_BYTES_FORMAT 64 +#define IDS_TIME_INTERVAL_HOURS 65 +#define IDS_TIME_INTERVAL_MINUTES 66 +#define IDS_TIME_INTERVAL_SECONDS 67 /* These numbers match native ID's and shouldn't be abitrarily changed */ #define IDD_ERR_DIALOG 0x1200 diff --git a/dlls/shlwapi/shlwapi_De.rc b/dlls/shlwapi/shlwapi_De.rc index a98005d..c9ac965 100644 --- a/dlls/shlwapi/shlwapi_De.rc +++ b/dlls/shlwapi/shlwapi_De.rc @@ -37,4 +37,7 @@ FONT 8, "MS Shell Dlg" STRINGTABLE DISCARDABLE { IDS_BYTES_FORMAT "%ld Bytes" + IDS_TIME_INTERVAL_HOURS " hr" + IDS_TIME_INTERVAL_MINUTES " min" + IDS_TIME_INTERVAL_SECONDS " sec" } diff --git a/dlls/shlwapi/shlwapi_En.rc b/dlls/shlwapi/shlwapi_En.rc index a8d1980..5a327f0 100644 --- a/dlls/shlwapi/shlwapi_En.rc +++ b/dlls/shlwapi/shlwapi_En.rc @@ -37,4 +37,7 @@ FONT 8, "MS Shell Dlg" STRINGTABLE DISCARDABLE { IDS_BYTES_FORMAT "%ld bytes" + IDS_TIME_INTERVAL_HOURS " hr" + IDS_TIME_INTERVAL_MINUTES " min" + IDS_TIME_INTERVAL_SECONDS " sec" } diff --git a/dlls/shlwapi/shlwapi_Eo.rc b/dlls/shlwapi/shlwapi_Eo.rc index dcbcdaf..71b3710 100644 --- a/dlls/shlwapi/shlwapi_Eo.rc +++ b/dlls/shlwapi/shlwapi_Eo.rc @@ -37,4 +37,7 @@ FONT 8, "MS Shell Dlg" STRINGTABLE DISCARDABLE { IDS_BYTES_FORMAT "%ld bytes" + IDS_TIME_INTERVAL_HOURS " hr" + IDS_TIME_INTERVAL_MINUTES " min" + IDS_TIME_INTERVAL_SECONDS " sec" } diff --git a/dlls/shlwapi/shlwapi_Es.rc b/dlls/shlwapi/shlwapi_Es.rc index 61782c9..3a325db 100644 --- a/dlls/shlwapi/shlwapi_Es.rc +++ b/dlls/shlwapi/shlwapi_Es.rc @@ -37,4 +37,7 @@ FONT 8, "MS Shell Dlg" STRINGTABLE DISCARDABLE { IDS_BYTES_FORMAT "%ld bytes" + IDS_TIME_INTERVAL_HOURS " hr" + IDS_TIME_INTERVAL_MINUTES " min" + IDS_TIME_INTERVAL_SECONDS " sec" } diff --git a/dlls/shlwapi/shlwapi_Fi.rc b/dlls/shlwapi/shlwapi_Fi.rc index 5ba5d3c..ea9b395 100644 --- a/dlls/shlwapi/shlwapi_Fi.rc +++ b/dlls/shlwapi/shlwapi_Fi.rc @@ -37,4 +37,7 @@ FONT 8, "MS Shell Dlg" STRINGTABLE DISCARDABLE { IDS_BYTES_FORMAT "%ld bytes" + IDS_TIME_INTERVAL_HOURS " hr" + IDS_TIME_INTERVAL_MINUTES " min" + IDS_TIME_INTERVAL_SECONDS " sec" } diff --git a/dlls/shlwapi/shlwapi_Fr.rc b/dlls/shlwapi/shlwapi_Fr.rc index e84403d..e80b870 100644 --- a/dlls/shlwapi/shlwapi_Fr.rc +++ b/dlls/shlwapi/shlwapi_Fr.rc @@ -37,4 +37,7 @@ FONT 8, "MS Shell Dlg" STRINGTABLE DISCARDABLE { IDS_BYTES_FORMAT "%ld bytes" + IDS_TIME_INTERVAL_HOURS " hr" + IDS_TIME_INTERVAL_MINUTES " min" + IDS_TIME_INTERVAL_SECONDS " sec" } diff --git a/dlls/shlwapi/shlwapi_Hu.rc b/dlls/shlwapi/shlwapi_Hu.rc index 52efedc..9aa253e 100644 --- a/dlls/shlwapi/shlwapi_Hu.rc +++ b/dlls/shlwapi/shlwapi_Hu.rc @@ -37,4 +37,7 @@ FONT 8, "MS Shell Dlg" STRINGTABLE DISCARDABLE { IDS_BYTES_FORMAT "%ld bytes" + IDS_TIME_INTERVAL_HOURS " hr" + IDS_TIME_INTERVAL_MINUTES " min" + IDS_TIME_INTERVAL_SECONDS " sec" } diff --git a/dlls/shlwapi/shlwapi_It.rc b/dlls/shlwapi/shlwapi_It.rc index cdb113e..ff1ff5b 100644 --- a/dlls/shlwapi/shlwapi_It.rc +++ b/dlls/shlwapi/shlwapi_It.rc @@ -37,4 +37,7 @@ FONT 8, "MS Shell Dlg" STRINGTABLE DISCARDABLE { IDS_BYTES_FORMAT "%ld bytes" + IDS_TIME_INTERVAL_HOURS " hr" + IDS_TIME_INTERVAL_MINUTES " min" + IDS_TIME_INTERVAL_SECONDS " sec" } diff --git a/dlls/shlwapi/shlwapi_Ja.rc b/dlls/shlwapi/shlwapi_Ja.rc index 7ac8d41..dbcc441 100644 --- a/dlls/shlwapi/shlwapi_Ja.rc +++ b/dlls/shlwapi/shlwapi_Ja.rc @@ -37,4 +37,7 @@ FONT 9, "MS UI Gothic" STRINGTABLE DISCARDABLE { IDS_BYTES_FORMAT "%ld bytes" + IDS_TIME_INTERVAL_HOURS " hr" + IDS_TIME_INTERVAL_MINUTES " min" + IDS_TIME_INTERVAL_SECONDS " sec" } diff --git a/dlls/shlwapi/shlwapi_Ko.rc b/dlls/shlwapi/shlwapi_Ko.rc index bb8641c..62a8ddf 100644 --- a/dlls/shlwapi/shlwapi_Ko.rc +++ b/dlls/shlwapi/shlwapi_Ko.rc @@ -38,4 +38,7 @@ FONT 8, "MS Shell Dlg" STRINGTABLE DISCARDABLE { IDS_BYTES_FORMAT "%ld ��Ʈ" + IDS_TIME_INTERVAL_HOURS " hr" + IDS_TIME_INTERVAL_MINUTES " min" + IDS_TIME_INTERVAL_SECONDS " sec" } diff --git a/dlls/shlwapi/shlwapi_Nl.rc b/dlls/shlwapi/shlwapi_Nl.rc index 5d25780..4c93061 100644 --- a/dlls/shlwapi/shlwapi_Nl.rc +++ b/dlls/shlwapi/shlwapi_Nl.rc @@ -37,4 +37,7 @@ FONT 8, "MS Shell Dlg" STRINGTABLE DISCARDABLE { IDS_BYTES_FORMAT "%ld bytes" + IDS_TIME_INTERVAL_HOURS " hr" + IDS_TIME_INTERVAL_MINUTES " min" + IDS_TIME_INTERVAL_SECONDS " sec" } diff --git a/dlls/shlwapi/shlwapi_No.rc b/dlls/shlwapi/shlwapi_No.rc index 779fdc5..4df42c8 100644 --- a/dlls/shlwapi/shlwapi_No.rc +++ b/dlls/shlwapi/shlwapi_No.rc @@ -37,4 +37,7 @@ FONT 8, "MS Shell Dlg" STRINGTABLE DISCARDABLE { IDS_BYTES_FORMAT "%ld byte" + IDS_TIME_INTERVAL_HOURS " hr" + IDS_TIME_INTERVAL_MINUTES " min" + IDS_TIME_INTERVAL_SECONDS " sec" } diff --git a/dlls/shlwapi/shlwapi_Pl.rc b/dlls/shlwapi/shlwapi_Pl.rc index 8942a77..467ee8d 100644 --- a/dlls/shlwapi/shlwapi_Pl.rc +++ b/dlls/shlwapi/shlwapi_Pl.rc @@ -38,4 +38,7 @@ FONT 8, "MS Shell Dlg" STRINGTABLE DISCARDABLE { IDS_BYTES_FORMAT "%ld bajt�w" + IDS_TIME_INTERVAL_HOURS " godz." + IDS_TIME_INTERVAL_MINUTES " min." + IDS_TIME_INTERVAL_SECONDS " s" } diff --git a/dlls/shlwapi/shlwapi_Pt.rc b/dlls/shlwapi/shlwapi_Pt.rc index c0fb168..c11693a 100644 --- a/dlls/shlwapi/shlwapi_Pt.rc +++ b/dlls/shlwapi/shlwapi_Pt.rc @@ -37,4 +37,7 @@ FONT 8, "MS Shell Dlg" STRINGTABLE DISCARDABLE { IDS_BYTES_FORMAT "%ld bytes" + IDS_TIME_INTERVAL_HOURS " hr" + IDS_TIME_INTERVAL_MINUTES " min" + IDS_TIME_INTERVAL_SECONDS " sec" } diff --git a/dlls/shlwapi/shlwapi_Tr.rc b/dlls/shlwapi/shlwapi_Tr.rc index a55641b..1545362 100644 --- a/dlls/shlwapi/shlwapi_Tr.rc +++ b/dlls/shlwapi/shlwapi_Tr.rc @@ -37,4 +37,7 @@ FONT 8, "MS Shell Dlg" STRINGTABLE DISCARDABLE { IDS_BYTES_FORMAT "%ld bytes" + IDS_TIME_INTERVAL_HOURS " hr" + IDS_TIME_INTERVAL_MINUTES " min" + IDS_TIME_INTERVAL_SECONDS " sec" } diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index 8551c91..ac5970f 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -1996,14 +1996,14 @@ inline static int SHLWAPI_FormatSignific * Internal helper for StrFromTimeIntervalW. */ static int WINAPI SHLWAPI_WriteTimeClass(LPWSTR lpszOut, DWORD dwValue, - LPCWSTR lpszClass, int iDigits) + UINT uClassStringId, int iDigits) { WCHAR szBuff[64], *szOut = szBuff + 32; szOut = SHLWAPI_WriteReverseNum(szOut, dwValue); iDigits = SHLWAPI_FormatSignificant(szOut + 1, iDigits); *szOut = ' '; - strcpyW(szBuff + 32, lpszClass); + LoadStringW(shlwapi_hInstance, uClassStringId, szBuff + 32, 32); strcatW(lpszOut, szOut); return iDigits; } @@ -2064,9 +2064,6 @@ INT WINAPI StrFromTimeIntervalA(LPSTR lp INT WINAPI StrFromTimeIntervalW(LPWSTR lpszStr, UINT cchMax, DWORD dwMS, int iDigits) { - static const WCHAR szHr[] = {' ','h','r','\0'}; - static const WCHAR szMin[] = {' ','m','i','n','\0'}; - static const WCHAR szSec[] = {' ','s','e','c','\0'}; INT iRet = 0; TRACE("(%p,%d,%ld,%d)\n", lpszStr, cchMax, dwMS, iDigits); @@ -2092,13 +2089,13 @@ INT WINAPI StrFromTimeIntervalW(LPWSTR l szCopy[0] = '\0'; if (dwHours) - iDigits = SHLWAPI_WriteTimeClass(szCopy, dwHours, szHr, iDigits); + iDigits = SHLWAPI_WriteTimeClass(szCopy, dwHours, IDS_TIME_INTERVAL_HOURS, iDigits); if (dwMinutes && iDigits) - iDigits = SHLWAPI_WriteTimeClass(szCopy, dwMinutes, szMin, iDigits); + iDigits = SHLWAPI_WriteTimeClass(szCopy, dwMinutes, IDS_TIME_INTERVAL_MINUTES, iDigits); if (iDigits) /* Always write seconds if we have significant digits */ - SHLWAPI_WriteTimeClass(szCopy, dwMS, szSec, iDigits); + SHLWAPI_WriteTimeClass(szCopy, dwMS, IDS_TIME_INTERVAL_SECONDS, iDigits); lstrcpynW(lpszStr, szCopy, cchMax); iRet = strlenW(lpszStr);

1 0

Alexandre Julliard : DEVELOPERS-HINTS: Moved to the Wiki by Tom Wickline.
by Alexandre Julliard 23 Aug '06

23 Aug '06

Module: wine Branch: master Commit: e3d0794aff622cc2235780b347f17985a63905f9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e3d0794aff622cc2235780b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 23 15:58:51 2006 +0200 DEVELOPERS-HINTS: Moved to the Wiki by Tom Wickline. --- DEVELOPERS-HINTS | 577 ------------------------------------------------------ 1 files changed, 0 insertions(+), 577 deletions(-) delete mode 100644 DEVELOPERS-HINTS Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=e3d0794aff622cc2235…

1 0

Paul Vriens : winecfg: Make sure we can use a large text.
by Alexandre Julliard 23 Aug '06

23 Aug '06

Module: wine Branch: master Commit: 343153e2e5d5902663ea78caf67994a08ac888c9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=343153e2e5d5902663ea78c… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Wed Aug 23 12:01:35 2006 +0200 winecfg: Make sure we can use a large text. --- programs/winecfg/winecfg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/winecfg.c b/programs/winecfg/winecfg.c index 818efed..d383482 100644 --- a/programs/winecfg/winecfg.c +++ b/programs/winecfg/winecfg.c @@ -76,7 +76,7 @@ void set_window_title(HWND dialog) WCHAR* load_string (UINT id) { - WCHAR buf[100]; + WCHAR buf[1024]; int len; WCHAR* newStr;

1 0

Mikołaj Zalewski : regedit: Remove custom filter from open/save dialogs.
by Alexandre Julliard 23 Aug '06

23 Aug '06

Module: wine Branch: master Commit: 798a54f938f4057603223a05075e66c9963f4c58 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=798a54f938f4057603223a0… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Aug 23 14:09:46 2006 +0200 regedit: Remove custom filter from open/save dialogs. --- programs/regedit/framewnd.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 216ed89..bac86ee 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -258,8 +258,6 @@ static UINT_PTR CALLBACK ImportRegistryF return 0L; } -#define MAX_CUSTOM_FILTER_SIZE 50 -TCHAR CustomFilterBuffer[MAX_CUSTOM_FILTER_SIZE]; TCHAR FileNameBuffer[_MAX_PATH]; TCHAR FileTitleBuffer[_MAX_PATH]; @@ -271,9 +269,7 @@ static BOOL InitOpenFileName(HWND hWnd, pofn->hInstance = hInst; pofn->lpstrFilter = _T("Registration Files\0*.reg\0Win9x/NT4 Registration Files (REGEDIT4)\0*.reg\0All Files (*.*)\0*.*\0\0"); - pofn->lpstrCustomFilter = CustomFilterBuffer; - pofn->nMaxCustFilter = MAX_CUSTOM_FILTER_SIZE; - pofn->nFilterIndex = 0; + pofn->nFilterIndex = 1; pofn->lpstrFile = FileNameBuffer; pofn->nMaxFile = _MAX_PATH; pofn->lpstrFileTitle = FileTitleBuffer;

1 0

Paul Vriens : wintrust: Add some documentation.
by Alexandre Julliard 23 Aug '06

23 Aug '06

Module: wine Branch: master Commit: 5c0ea644da7007d3d4552081b48b52e4f90d635e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5c0ea644da7007d3d455208… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Wed Aug 23 10:40:06 2006 +0200 wintrust: Add some documentation. --- dlls/wintrust/wintrust_main.c | 45 +++++++++++++++++++++++++++++++++++------ 1 files changed, 38 insertions(+), 7 deletions(-) diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index 4928116..d3b4dab 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -52,6 +52,18 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWO /*********************************************************************** * CryptCATAdminAcquireContext (WINTRUST.@) + * + * Get a catalog administrator context handle. + * + * PARAMS + * catAdmin [O] Pointer to the context handle. + * sysSystem [I] Pointer to a GUID for the needed subsystem. + * dwFlags [I] Reserved. + * + * RETURNS + * Success: TRUE. catAdmin contains the context handle. + * Failure: FAIL. + * */ BOOL WINAPI CryptCATAdminAcquireContext(HCATADMIN* catAdmin, const GUID *sysSystem, DWORD dwFlags ) @@ -88,6 +100,17 @@ HCATINFO WINAPI CryptCATAdminEnumCatalog /*********************************************************************** * CryptCATAdminReleaseContext (WINTRUST.@) + * + * Release a catalog administrator context handle. + * + * PARAMS + * catAdmin [I] Pointer to the context handle. + * dwFlags [I] Reserved. + * + * RETURNS + * Success: TRUE. + * Failure: FAIL. + * */ BOOL WINAPI CryptCATAdminReleaseContext(HCATADMIN hCatAdmin, DWORD dwFlags ) { @@ -111,17 +134,25 @@ BOOL WINAPI TrustIsCertificateSelfSigned /*********************************************************************** * WinVerifyTrust (WINTRUST.@) + * + * Verifies an object by calling the specified trust provider. + * + * PARAMS + * hwnd [I] Handle to a caller window. + * ActionID [I] Pointer to a GUID that identifies the action to perform. + * ActionData [I] Information used by the trust provider to verify the object. + * + * RETURNS + * Success: Zero. + * Failure: A TRUST_E_* error code. + * + * NOTES + * Trust providers can be found at: + * HKLM\SOFTWARE\Microsoft\Cryptography\Providers\Trust\ */ LONG WINAPI WinVerifyTrust( HWND hwnd, GUID *ActionID, WINTRUST_DATA* ActionData ) { FIXME("%p %s %p\n", hwnd, debugstr_guid(ActionID), ActionData); - - /* Trust providers can be found at: - * HKLM\SOFTWARE\Microsoft\Cryptography\Providers\Trust\CertCheck\ - * - * Process Explorer is now happy with ERROR_SUCCESS - */ - return ERROR_SUCCESS; }

1 0

lostwages/templates/en status_ui.template
by Jeremy Newman 23 Aug '06

23 Aug '06

ChangeSet ID: 27585 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/08/23 14:54:19 Modified files: templates/en : status_ui.template Log message: Mike McCormack <mike(a)codeweavers.com> Update the status page to use Git Remove "primary worker" entries. Outdated and spam feed... Patch: http://cvs.winehq.org/patch.py?id=27585 Old revision New revision Changes Path 1.21 1.22 +47 -110 lostwages/templates/en/status_ui.template

1 0

tools/. winedoc_release wine_release
by Alexandre Julliard 23 Aug '06

23 Aug '06

ChangeSet ID: 27584 CVSROOT: /opt/cvs-commit Module name: tools Changes by: julliard(a)winehq.org 2006/08/23 08:41:57 Removed files: . : winedoc_release wine_release Log message: Moved the release scripts to the git repository. Patch: http://cvs.winehq.org/patch.py?id=27584 Old revision New revision Changes Path 1.5 Removed +0 -0 tools/winedoc_release 1.18 Removed +0 -0 tools/wine_release Index: tools/winedoc_release diff -u -p tools/winedoc_release:1.5 /dev/null --- tools/winedoc_release 23 Aug 2006 13:41:57 -0000 +++ /dev/null 23 Aug 2006 13:41:57 -0000 @@ -1,80 +0,0 @@ -#!/bin/sh - -# This script is ran after a new release of Wine. It updates the website -# and FTP for the new wine release. - -# usage: winedoc_release <winedoc version> - -set -e - -if [ $# -lt 1 ] -then - echo "Usage: $0 version|cvs" - exit 1 -fi - -version=$1 - -# nuke old attempt (if any) -rm -rf wine-docs-$version - -if [ "$version" = "cvs" ] -then - cvs -z9 -d :pserver:anonymous(a)cvs.sourceforge.net:/cvsroot/wine co -d wine-docs-cvs docs -else - if [ -f wine-docs-$version.tar.bz2 ] - then - echo "Already have Wine docs, skipping download" - else - ncftpget ftp://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-$version.tar.bz2 - fi - tar xfj wine-docs-$version.tar.bz2 - rm wine-docs-$version.tar.bz2 -fi - -echo "==== BUILDING SGML DOCUMENTATION ====" - -books="wineusr-guide winedev-guide winelib-guide wine-faq" -langs="en" -site_base_dir="/home/winehq/opt/lostwages" -guides_base_dir="$site_base_dir/docs" -winehq_base_dir="$site_base_dir/templates" - -cd wine-docs-$version - -for lang in $langs -do - [ -d $guides_base_dir/$lang ] || mkdir $guides_base_dir/$lang - [ -d $winehq_base_dir/$lang/docs ] || mkdir $winehq_base_dir/$lang/docs - cp ../winedoc.css $guides_base_dir/$lang - - cd $lang - for book in $books - do - echo "* $book" - - # build guides as single files (only for releases) - if [ "$version" != "cvs" ] - then - docbook2html -u -d ../../winehtml.dsl $book.sgml - docbook2pdf -d ../../wineprint.dsl $book.sgml - docbook2ps -d ../../wineprint.dsl $book.sgml - mv $book.html $book.pdf $book.ps $guides_base_dir/$lang - fi - - # build the online html version - docbook2html -d ../../winehtml.dsl -o $book.web $book.sgml - [ -d $winehq_base_dir/$lang/docs/$book ] || mkdir $winehq_base_dir/$lang/docs/$book - for f in $book.web/*.htm - do - ../../html2template -i $f -o $winehq_base_dir/$lang/docs/$book/`basename $f .htm`.template - done - rm -rf $book.web - done - cd .. -done - -cd .. -rm -rf wine-docs-$version - -# end Index: tools/wine_release diff -u -p tools/wine_release:1.18 /dev/null --- tools/wine_release 23 Aug 2006 13:41:57 -0000 +++ /dev/null 23 Aug 2006 13:41:57 -0000 @@ -1,87 +0,0 @@ -#!/bin/sh - -# This script is ran after a new release of Wine. It updates the website -# and FTP for the new wine release. - -# usage: wine_release <old version> <new version> - -set -e - -if [ $# -lt 2 ] -then - echo "Usage: $0 oldver newver" - exit 1 -fi - -oldver=$1 -version=$2 - -# nuke old attempt (if any) -rm -rf wine-$version - -git clone -l -n git/wine.git wine-$version -(cd wine-$version && git checkout -b dummy wine-$version) - -# move wine link -rm -f wine -ln -s wine-$version wine - -# make cross reference database for LXR -# note that we must have write permission in this directory -echo "==== UPDATING LXR ====" -cd db -rm -rf wine-$version -mkdir wine-$version -cd wine-$version -../../bin/genxref ../../wine-$version -chmod +r fileidx xref - -# make Glimpse index -##glimpseindex -n -H . ../../wine-$version -##chmod +r .glimpse* -cd ../.. - -(echo "wine-$version"; cat wine-versions) | uniq > wine-versions.new && mv wine-versions.new wine-versions - -# update man page and documentation -echo "==== UPDATING DOCUMENTATION ====" -cd wine-$version -./configure - -manpages="\ - loader/wine.man \ - server/wineserver.man \ - tools/winemaker.man \ - tools/widl/widl.man \ - tools/winebuild/winebuild.man \ - tools/winedump/winedump.man \ - tools/winegcc/winegcc.man \ - tools/wmc/wmc.man \ - tools/wrc/wrc.man" - -for f in $manpages -do - name=`basename $f .man` - make -C `dirname $f` $name.man - nroff -man $f | ../bin/man2html | ../html2template -o /home/winehq/opt/lostwages/templates/en/docs/$name.template -done - -git diff --stat wine-$oldver wine-$version >../ds$version.txt - -make htmlpages && rm -rf ../WineAPI && mv documentation/html ../WineAPI - -# Wine API Stats -echo "==== UPDATING WINE API STATS PAGE ====" -./tools/winapi/winapi_extract --pseudo-stub-statistics --no-verbose --no-progress > winapi_stats.txt -../winapi_stats.php > /home/winehq/opt/lostwages/templates/en/winapi_stats.template -rm -f winapi_stats.txt - -# cleanup source tree -make distclean -rm -rf .git - -# homepage announcement -# edit the homepage to announce the new release... -# TODO - -# end

1 0

Alexandre Julliard : configure: Remove -O2 disable hack for MacOS now that gcc is fixed.
by Alexandre Julliard 23 Aug '06

23 Aug '06

Module: wine Branch: master Commit: 03244197e0e4f69897b6beb580ee12142a400b41 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=03244197e0e4f69897b6beb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 23 12:50:55 2006 +0200 configure: Remove -O2 disable hack for MacOS now that gcc is fixed. --- configure | 1 - configure.ac | 3 --- 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 3f05a32..f96eb86 100755 --- a/configure +++ b/configure @@ -15375,7 +15375,6 @@ fi *powerpc*) LDDLLFLAGS="$LDDLLFLAGS -read_only_relocs warning" ;; esac - CFLAGS=`echo "$CFLAGS" | sed -e s/-O2/-O1/` ;; *) DLLFLAGS="$DLLFLAGS -fPIC" diff --git a/configure.ac b/configure.ac index dc2c337..72a41a0 100644 --- a/configure.ac +++ b/configure.ac @@ -1056,9 +1056,6 @@ case $host_os in LDDLLFLAGS="$LDDLLFLAGS -read_only_relocs warning" dnl FIXME ;; esac - dnl Disable optimizations because of force_align_arg_pointer bug - dnl FIXME: should be removed when gcc is fixed - CFLAGS=`echo "$CFLAGS" | sed -e s/-O2/-O1/` ;; *) DLLFLAGS="$DLLFLAGS -fPIC"

1 0

Detlef Riekenberg : configure: Show messages about additional packages with --verbose.
by Alexandre Julliard 23 Aug '06

23 Aug '06

Module: wine Branch: master Commit: e84a382b74640912842532fa6b2ee661c316f88b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e84a382b74640912842532f… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Aug 21 05:28:17 2006 +0200 configure: Show messages about additional packages with --verbose. --- configure | 150 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 142 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 292 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=e84a382b74640912842…

1 0