December 2006 - Wine-Commits

appdb/include maintainer.php
by WineHQ Dec. 9, 2006

Dec. 9, 2006

ChangeSet ID: 30436 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/12/08 22:34:07 Modified files: include : maintainer.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Auto-accept a maintainer request if the user has sufficient privileges. Patch: http://cvs.winehq.org/patch.py?id=30436 Old revision New revision Changes Path 1.19 1.20 +10 -1 appdb/include/maintainer.php Index: appdb/include/maintainer.php diff -u -p appdb/include/maintainer.php:1.19 appdb/include/maintainer.php:1.20 --- appdb/include/maintainer.php:1.19 9 Dec 2006 4:34: 7 -0000 +++ appdb/include/maintainer.php 9 Dec 2006 4:34: 7 -0000 @@ -49,7 +49,7 @@ class maintainer "VALUES ('?', '?', '?', '?', '?', ?, '?')", $this->iAppId, $this->iVersionId, $this->iUserId, $this->sMaintainReason, - $this->bSuperMaintainer, "NOW()", 'true'); + $this->bSuperMaintainer, "NOW()", $this->mustBeQueued() ? "true" : "false"); /* this objects id is the insert id returned by mysql */ $this->iMaintainerId = mysql_insert_id(); @@ -128,6 +128,15 @@ class maintainer return $hResult; } + function mustBeQueued() + { + /* In place for future fine-grained permisson system, only allow admins for now */ + if($_SESSION['current']->hasPriv("admin")) + return FALSE; + else + return TRUE; + } + function delete() { $sQuery = "DELETE from appMaintainers where maintainerId = '?'";

1 0

appdb/include bugs.php
by WineHQ Dec. 9, 2006

Dec. 9, 2006

ChangeSet ID: 30435 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/12/08 22:30:48 Modified files: include : bugs.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> If a user deletes a bug link he has submitted himself, don't send him an e-mail saying the link has been rejected. Patch: http://cvs.winehq.org/patch.py?id=30435 Old revision New revision Changes Path 1.16 1.17 +1 -1 appdb/include/bugs.php Index: appdb/include/bugs.php diff -u -p appdb/include/bugs.php:1.16 appdb/include/bugs.php:1.17 --- appdb/include/bugs.php:1.16 9 Dec 2006 4:30:48 -0000 +++ appdb/include/bugs.php 9 Dec 2006 4:30:48 -0000 @@ -159,7 +159,7 @@ class Bug { if(!$bSilent) $this->SendNotificationMail(true); } - if($this->iSubmitterId) + if($this->iSubmitterId && ($this->iSubmitterId != $oUser->iUserId)) { $this->mailSubmitter(true); }

1 0

appdb/include application.php
by WineHQ Dec. 9, 2006

Dec. 9, 2006

ChangeSet ID: 30434 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/12/08 22:29:20 Modified files: include : application.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> The function refers to its own class, so use $this instead of $oApp. Also prevent the application name from being printed twice. Patch: http://cvs.winehq.org/patch.py?id=30434 Old revision New revision Changes Path 1.77 1.78 +3 -3 appdb/include/application.php Index: appdb/include/application.php diff -u -p appdb/include/application.php:1.77 appdb/include/application.php:1.78 --- appdb/include/application.php:1.77 9 Dec 2006 4:29:20 -0000 +++ appdb/include/application.php 9 Dec 2006 4:29:20 -0000 @@ -345,12 +345,12 @@ class Application { { case "add": $sSubject = "Submitted application accepted"; - $sMsg = "The application you submitted (".$this->sName." ".$this->sName.") has been accepted by ".$_SESSION['current']->sRealname."."; + $sMsg = "The application you submitted (".$this->sName.") has been accepted by ".$_SESSION['current']->sRealname."."; $sMsg .= "Administrators Responce:\n"; break; case "reject": $sSubject = "Submitted application rejected"; - $sMsg = "The application you submitted (".$this->sName." ".$this->sName.") has been rejected by ".$_SESSION['current']->sRealname."."; + $sMsg = "The application you submitted (".$this->sName.") has been rejected by ".$_SESSION['current']->sRealname."."; $sMsg .= "Clicking on the link in this email will allow you to modify and resubmit the application. "; $sMsg .= "A link to your queue of applications and versions will also show up on the left hand side of the Appdb site once you have logged in. "; $sMsg .= APPDB_ROOT."appsubmit.php?sub=view&apptype=application&appId=".$this->iAppId."\n"; @@ -358,7 +358,7 @@ class Application { break; case "delete": $sSubject = "Submitted application deleted"; - $sMsg = "The application you submitted (".$oApp->sName." ".$this->sName.") has been deleted by ".$_SESSION['current']->sRealname."."; + $sMsg = "The application you submitted (".$this->sName.") has been deleted by ".$_SESSION['current']->sRealname."."; $sMsg .= "Reason given:\n"; break;

1 0

appdb/include version.php
by WineHQ Dec. 9, 2006

Dec. 9, 2006

ChangeSet ID: 30433 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/12/08 22:28:20 Modified files: include : version.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Colourize the maintainer's rating and version fields with the appropriate rating colours, both in the application and version view. This should make it easier for users to identify working versions, and it also prevents the maintainer's rating from being 'overshadowed' by the test results. Patch: http://cvs.winehq.org/patch.py?id=30433 Old revision New revision Changes Path 1.86 1.87 +12 -4 appdb/include/version.php Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.86 appdb/include/version.php:1.87 --- appdb/include/version.php:1.86 9 Dec 2006 4:28:20 -0000 +++ appdb/include/version.php 9 Dec 2006 4:28:20 -0000 @@ -662,9 +662,14 @@ class Version { echo " </td></tr>\n"; } + if($this->sTestedRating != "/" && $this->sTestedRating) + $sMaintainerColor = $this->sTestedRating; + else + $sMaintainerColor = "color0"; + // rating Area - echo "<tr class=\"color1\" valign=\"top\"><td>Maintainer Rating</td><td>".$this->sTestedRating."</td></tr>\n"; - echo "<tr class=\"color0\" valign=\"top\"><td>Maintainers Version</td><td>".$this->sTestedRelease."</td></tr>\n"; + echo "<tr class=\"$sMaintainerColor\" valign=\"top\"><td>Maintainer’s Rating</td><td>".$this->sTestedRating."</td></tr>\n"; + echo "<tr class=\"$sMaintainerColor\" valign=\"top\"><td>Maintainer’s Version</td><td>".$this->sTestedRelease."</td></tr>\n"; // image $img = Screenshot::get_random_screenshot_img($oApp->iAppId, $this->iVersionId, false); @@ -923,12 +928,15 @@ class Version { // set row color $bgcolor = ($c % 2 == 0) ? "color0" : "color1"; + if($oVersion->sTestedRating && $oVersion->sTestedRating != "/") + $sRatingColor = "class=\"$oVersion->sTestedRating\""; + //display row echo "<tr class=$bgcolor>\n"; echo " <td><a href=\"".BASE."appview.php?iVersionId=".$iVersionId."\">".$oVersion->sName."</a></td>\n"; echo " <td>".util_trim_description($oVersion->sDescription)."</td>\n"; - echo " <td align=center>".$oVersion->sTestedRating."</td>\n"; - echo " <td align=center>".$oVersion->sTestedRelease."</td>\n"; + echo " <td $sRatingColor align=center>".$oVersion->sTestedRating."</td>\n"; + echo " <td $sRatingColor align=center>".$oVersion->sTestedRelease."</td>\n"; echo " <td align=center>".Comment::get_comment_count_for_versionid($oVersion->iVersionId)."</td>\n"; echo "</tr>\n\n";

1 0

Alexandre Julliard : update-winehq: New script to update the WineHQ homepage for a new release.
by Alexandre Julliard Dec. 8, 2006

Dec. 8, 2006

Module: tools Branch: master Commit: bdd47941cd035cabd8493ba7d18a18338d964457 URL: http://source.winehq.org/git/tools.git/?a=commit;h=bdd47941cd035cabd8493ba7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 8 16:36:44 2006 +0100 update-winehq: New script to update the WineHQ homepage for a new release. --- update-winehq | 129 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 129 insertions(+), 0 deletions(-) diff --git a/update-winehq b/update-winehq new file mode 100755 index 0000000..c6a7e87 --- /dev/null +++ b/update-winehq @@ -0,0 +1,129 @@ +#!/usr/bin/perl -w +# +# Update the winehq.org homepage from the ANNOUNCE file of a new Wine release +# +# Copyright 2006 Alexandre Julliard +# +# Usage: update-winehq [announce-file] +# +# Must be run from the top-level dir of a CVS checkout of the lostwages module +# + +sub xml_escape($) +{ + my $str = shift; + $str =~ s/&/&/g; + $str =~ s/</</g; + $str =~ s/>/>/g; + my @chars = unpack "U*", $str; + $str = join "", map { ($_ > 127) ? sprintf "&#%u;", $_ : chr($_); } @chars; + return $str; +} + +my $rel; +my $changes = "\n"; + +die "Not in lostwages dir?" unless -d "news" && -f "include/winehq.conf"; +system("cvs", "-Q", "update", "include", "news") == 0 or die "cvs update failed"; + +# Parse the ANNOUNCE file + +open ANNOUNCE, $ARGV[0] || "ANNOUNCE" or die "cannot open ANNOUNCE"; +my $whats_new = 0; +while (<ANNOUNCE>) +{ + chomp; + if (/^This is release (\S*) /) + { + $rel = $1; + next; + } + if (/^What's new in this release/) + { + $whats_new = 1; + next; + } + if ($whats_new && /^ *- (.*)$/) + { + $changes .= "<li>" . xml_escape($1) . "</li>\n"; + next; + } + if ($whats_new && /^\s*$/) + { + last; + } +} +close ANNOUNCE; + +# Update snapshot date in winehq.conf + +my @lines = (); +open CONF, "<include/winehq.conf" or die "cannot open include/winehq.conf"; +while (<CONF>) +{ + s/^snapshot_date:.*$/snapshot_date: $rel/; + push @lines, $_; +} +close CONF; + +open NEWCONF, ">include/winehq.conf" or die "cannot update include/winehq.conf"; +print NEWCONF @lines; +close NEWCONF; +print "Updated include/winehq.conf\n"; + +# Create the news file + +my $newsdate = `date +%Y%m%d`; +chomp $newsdate; +my $newscount = 1; +my $newsfile; + +do +{ + $newsfile = sprintf "news/%s%02u.xml", $newsdate, $newscount++; +} +while (-f "$newsfile"); + +open NEWS, ">$newsfile" or die "cannot create $newsfile"; + +my $date = `date "+%B %e, %Y"`; +chomp $date; + +print NEWS <<EOF; +<news> +<date>$date</date> +<title>Wine $rel Released</title> +<body> +Wine $rel was released today, with the following main changes: + +<ul>$changes</ul> + + +Binary packages are in the process of being built and it may take a +few days for them to appear, but the source is +<a href="http://prdownloads.sourceforge.net/wine/wine-$rel.tar.bz2">available now</a>. +You can find out more about this release in the +<a href="?announce=$rel">announcement</a>. Check out our +<a href="/site/download">download page</a> for packages for your +distribution. + +</body> +</news> +EOF + +close NEWS; +print "Created $newsfile\n"; + +# Commit changes + +if (system("cvs", "-Q", "add", $newsfile)) +{ + unlink $newsfile; + die "cvs add $newsfile failed"; +} + +if (system("cvs", "commit", "-m", "Release $rel", "include/winehq.conf", $newsfile)) +{ + unlink $newsfile; + die "cvs commit failed"; +}

1 0

lostwages/ include/winehq.conf news/2006120801.xml
by Alexandre Julliard Dec. 8, 2006

Dec. 8, 2006

ChangeSet ID: 30432 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: julliard(a)winehq.org 2006/12/08 16:11:16 Modified files: include : winehq.conf Added files: news : 2006120801.xml Log message: Release 0.9.27 Patch: http://cvs.winehq.org/patch.py?id=30432 Old revision New revision Changes Path 1.49 1.50 +1 -1 lostwages/include/winehq.conf Added 1.1 +0 -0 lostwages/news/2006120801.xml Index: lostwages/include/winehq.conf diff -u -p lostwages/include/winehq.conf:1.49 lostwages/include/winehq.conf:1.50 --- lostwages/include/winehq.conf:1.49 8 Dec 2006 22:11:16 -0000 +++ lostwages/include/winehq.conf 8 Dec 2006 22:11:16 -0000 @@ -29,7 +29,7 @@ news_xml_path: news wwn_xml_path: wwn # Snapshot Date -snapshot_date: 0.9.26 +snapshot_date: 0.9.27 # Current RH Packages Snapshot Date snapshot_date_rh: 0.9.2 Index: lostwages/news/2006120801.xml diff -u -p /dev/null lostwages/news/2006120801.xml:1.1 --- /dev/null 8 Dec 2006 22:11:16 -0000 +++ lostwages/news/2006120801.xml 8 Dec 2006 22:11:16 -0000 @@ -0,0 +1,25 @@ +<news> +<date>December 8, 2006</date> +<title>Wine 0.9.27 Released</title> +<body> +Wine 0.9.27 was released today, with the following main changes: + +<ul> +<li>Better support for noexec kernels.</li> +<li>Better Dwarf support in dbghelp.</li> +<li>Several Winsock fixes.</li> +<li>Various code cleanups.</li> +<li>Lots of bug fixes.</li> +</ul> + + +Binary packages are in the process of being built and it may take a +few days for them to appear, but the source is +<a href="http://prdownloads.sourceforge.net/wine/wine-0.9.27.tar.bz2">available now</a>. +You can find out more about this release in the +<a href="?announce=0.9.27">announcement</a>. Check out our +<a href="/site/download">download page</a> for packages for your +distribution. + +</body> +</news>

1 0

Alexandre Julliard : Release 0.9.27.
by Alexandre Julliard Dec. 8, 2006

Dec. 8, 2006

Module: wine Branch: master Commit: 5c06093457c826323db2491db04d04769c7a7aac URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c06093457c826323db2491db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 8 22:34:42 2006 +0100 Release 0.9.27. --- ANNOUNCE | 821 +++++++++++++++++------------- ChangeLog | 1699 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 +- configure | 18 +- 4 files changed, 2174 insertions(+), 366 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5c06093457c826323db24…

1 0

Tag wine-0.9.27 : Alexandre Julliard : Release 0.9.27
by Alexandre Julliard Dec. 8, 2006

Dec. 8, 2006

Module: wine Branch: refs/tags/wine-0.9.27 Tag: 65445e07ee5ce9f9ecb3e65555f2686bcc815128 URL: http://source.winehq.org/git/wine.git/?a=tag;h=65445e07ee5ce9f9ecb3e65555f2… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 8 22:34:44 2006 +0100 Release 0.9.27

1 0

Alexandre Julliard : gdi32: Don' t assume that the font codepages change with the user locale.
by Alexandre Julliard Dec. 8, 2006

Dec. 8, 2006

Module: wine Branch: master Commit: 33eadd39d4278718ea552b3ef6b6068401066622 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33eadd39d4278718ea552b3ef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 8 13:00:53 2006 +0100 gdi32: Don't assume that the font codepages change with the user locale. Codepages can be set independently with LC_CTYPE. --- dlls/gdi32/freetype.c | 27 +++++++++++++-------------- 1 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index ab4a266..9344515 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1558,36 +1558,35 @@ static void add_font_list(HKEY hkey, con static void update_font_info(void) { - char buf[80]; + char buf[40], cpbuf[40]; DWORD len, type; HKEY hkey = 0; UINT i, ansi_cp = 0, oem_cp = 0; - LCID lcid = GetUserDefaultLCID(); if (RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Fonts", &hkey) != ERROR_SUCCESS) return; + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_IDEFAULTANSICODEPAGE|LOCALE_RETURN_NUMBER|LOCALE_NOUSEROVERRIDE, + (WCHAR *)&ansi_cp, sizeof(ansi_cp)/sizeof(WCHAR)); + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_IDEFAULTCODEPAGE|LOCALE_RETURN_NUMBER|LOCALE_NOUSEROVERRIDE, + (WCHAR *)&oem_cp, sizeof(oem_cp)/sizeof(WCHAR)); + sprintf( cpbuf, "%u,%u", ansi_cp, oem_cp ); + len = sizeof(buf); - if (RegQueryValueExA(hkey, "Locale", 0, &type, (BYTE *)buf, &len) == ERROR_SUCCESS && type == REG_SZ) + if (RegQueryValueExA(hkey, "Codepages", 0, &type, (BYTE *)buf, &len) == ERROR_SUCCESS && type == REG_SZ) { - if (strtoul(buf, NULL, 16 ) == lcid) /* already set correctly */ + if (!strcmp( buf, cpbuf )) /* already set correctly */ { RegCloseKey(hkey); return; } - TRACE("updating registry, locale changed %s -> %08x\n", debugstr_a(buf), lcid); + TRACE("updating registry, codepages changed %s -> %u,%u\n", buf, ansi_cp, oem_cp); } - else TRACE("updating registry, locale changed none -> %08x\n", lcid); + else TRACE("updating registry, codepages changed none -> %u,%u\n", ansi_cp, oem_cp); - sprintf(buf, "%08x", lcid); - RegSetValueExA(hkey, "Locale", 0, REG_SZ, (const BYTE *)buf, strlen(buf)+1); + RegSetValueExA(hkey, "Codepages", 0, REG_SZ, (const BYTE *)cpbuf, strlen(cpbuf)+1); RegCloseKey(hkey); - GetLocaleInfoW(lcid, LOCALE_IDEFAULTANSICODEPAGE|LOCALE_RETURN_NUMBER|LOCALE_NOUSEROVERRIDE, - (WCHAR *)&ansi_cp, sizeof(ansi_cp)/sizeof(WCHAR)); - GetLocaleInfoW(lcid, LOCALE_IDEFAULTCODEPAGE|LOCALE_RETURN_NUMBER|LOCALE_NOUSEROVERRIDE, - (WCHAR *)&oem_cp, sizeof(oem_cp)/sizeof(WCHAR)); - for (i = 0; i < sizeof(nls_update_font_list)/sizeof(nls_update_font_list[0]); i++) { if (nls_update_font_list[i].ansi_cp == ansi_cp && @@ -1612,7 +1611,7 @@ static void update_font_info(void) return; } } - FIXME("there is no font defaults for lcid %04x/ansi_cp %u\n", lcid, ansi_cp); + FIXME("there is no font defaults for codepages %u,%u\n", ansi_cp, oem_cp); } /*************************************************************

1 0

Alexandre Julliard : msvcrt: Use LOCALE_USER_DEFAULT to get the proper codepage for the Unix locale.
by Alexandre Julliard Dec. 8, 2006

Dec. 8, 2006

Module: wine Branch: master Commit: ec7f2f88028ff2b53425565dce74c93bd5d0b6aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec7f2f88028ff2b53425565dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 8 12:56:17 2006 +0100 msvcrt: Use LOCALE_USER_DEFAULT to get the proper codepage for the Unix locale. --- dlls/msvcrt/locale.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 05150b9..32d73d0 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -549,7 +549,7 @@ int CDECL _setmbcp(int cp) } else if(cp == _MB_CP_LOCALE) { - GetLocaleInfoW( GetUserDefaultLCID(), LOCALE_IDEFAULTANSICODEPAGE|LOCALE_RETURN_NUMBER, + GetLocaleInfoW( LOCALE_USER_DEFAULT, LOCALE_IDEFAULTANSICODEPAGE|LOCALE_RETURN_NUMBER, (WCHAR *)&msvcrt_current_lc_all_cp, sizeof(INT)/sizeof(WCHAR) ); } else if(cp == _MB_CP_SBCS)

1 0