January 2007 - Wine-Commits

Alexandre Julliard : wrc: Added support for utf-8 codepage.
by Alexandre Julliard Jan. 10, 2007

Jan. 10, 2007

Module: wine Branch: master Commit: 442243257b949a11f7d1f7e83954b8a5c9d84d4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=442243257b949a11f7d1f7e83… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 9 22:21:53 2007 +0100 wrc: Added support for utf-8 codepage. --- tools/wrc/parser.l | 3 ++- tools/wrc/utils.c | 32 ++++++++++++++++++++++---------- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l index 11d110f..f9034a5 100644 --- a/tools/wrc/parser.l +++ b/tools/wrc/parser.l @@ -347,12 +347,13 @@ static struct keyword *iskeyword(char *k <pp_pragma>[^\n]* yy_pop_state(); if (pedantic) parser_warning("Unrecognized #pragma directive '%s'",yytext); <pp_code_page>${ws}*default{ws}*$[^\n]* current_codepage = -1; yy_pop_state(); +<pp_code_page>${ws}*utf8{ws}*$[^\n]* current_codepage = CP_UTF8; yy_pop_state(); <pp_code_page>${ws}*[0-9]+{ws}*$[^\n]* { char *p = yytext; yy_pop_state(); while (*p < '0' || *p > '9') p++; current_codepage = strtol( p, NULL, 10 ); - if (current_codepage && !wine_cp_get_table( current_codepage )) + if (current_codepage && current_codepage != CP_UTF8 && !wine_cp_get_table( current_codepage )) { parser_error("Codepage %d not supported", current_codepage); current_codepage = 0; diff --git a/tools/wrc/utils.c b/tools/wrc/utils.c index 2e1630d..9e736d4 100644 --- a/tools/wrc/utils.c +++ b/tools/wrc/utils.c @@ -244,26 +244,38 @@ string_t *convert_string(const string_t { const union cptable *cptable = codepage ? wine_cp_get_table( codepage ) : NULL; string_t *ret = xmalloc(sizeof(*ret)); + int res; - if (!cptable && str->type != type) - error( "Current language is Unicode only, cannot convert strings" ); + if (!codepage && str->type != type) + parser_error( "Current language is Unicode only, cannot convert string" ); if((str->type == str_char) && (type == str_unicode)) { - ret->type = str_unicode; - ret->size = wine_cp_mbstowcs( cptable, 0, str->str.cstr, str->size, NULL, 0 ); + ret->type = str_unicode; + ret->size = cptable ? wine_cp_mbstowcs( cptable, 0, str->str.cstr, str->size, NULL, 0 ) + : wine_utf8_mbstowcs( 0, str->str.cstr, str->size, NULL, 0 ); ret->str.wstr = xmalloc( (ret->size+1) * sizeof(WCHAR) ); - wine_cp_mbstowcs( cptable, 0, str->str.cstr, str->size, ret->str.wstr, ret->size ); + if (cptable) + res = wine_cp_mbstowcs( cptable, MB_ERR_INVALID_CHARS, str->str.cstr, str->size, + ret->str.wstr, ret->size ); + else + res = wine_utf8_mbstowcs( MB_ERR_INVALID_CHARS, str->str.cstr, str->size, + ret->str.wstr, ret->size ); + if (res == -2) + parser_error( "Invalid character in string '%.*s' for codepage %u\n", + str->size, str->str.cstr, codepage ); ret->str.wstr[ret->size] = 0; } else if((str->type == str_unicode) && (type == str_char)) { - ret->type = str_char; - ret->size = wine_cp_wcstombs( cptable, 0, str->str.wstr, str->size, - NULL, 0, NULL, NULL ); + ret->type = str_char; + ret->size = cptable ? wine_cp_wcstombs( cptable, 0, str->str.wstr, str->size, NULL, 0, NULL, NULL ) + : wine_utf8_wcstombs( str->str.wstr, str->size, NULL, 0 ); ret->str.cstr = xmalloc( ret->size + 1 ); - wine_cp_wcstombs( cptable, 0, str->str.wstr, str->size, ret->str.cstr, ret->size, - NULL, NULL ); + if (cptable) + wine_cp_wcstombs( cptable, 0, str->str.wstr, str->size, ret->str.cstr, ret->size, NULL, NULL ); + else + wine_utf8_wcstombs( str->str.wstr, str->size, ret->str.cstr, ret->size ); ret->str.cstr[ret->size] = 0; } else if(str->type == str_unicode)

1 0

appdb/include testData.php
by WineHQ Jan. 10, 2007

Jan. 10, 2007

ChangeSet ID: 30873 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/09 21:44:26 Modified files: include : testData.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Test data processing emails should contain the name of the user accepting, rejecting or deleting the entries Patch: http://cvs.winehq.org/patch.py?id=30873 Old revision New revision Changes Path 1.19 1.20 +3 -3 appdb/include/testData.php Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.19 appdb/include/testData.php:1.20 --- appdb/include/testData.php:1.19 10 Jan 2007 3:44:26 -0000 +++ appdb/include/testData.php 10 Jan 2007 3:44:26 -0000 @@ -261,19 +261,19 @@ class testData{ { case "add": $sSubject = "Submitted testing data accepted"; - $sMsg = "The testing data you submitted for '$sName' has been accepted."; + $sMsg = "The testing data you submitted for '$sName' has been accepted by ".$_SESSION['current']->sRealname."."; $sMsg .= APPDB_ROOT."appview.php?iVersionId=".$this->iVersionId."&iTestingId=".$this->iTestingId."\n"; $sMsg .= "Administrators Responce:\n"; break; case "reject": $sSubject = "Submitted testing data rejected"; - $sMsg = "The testing data you submitted for '$sName' has been rejected."; + $sMsg = "The testing data you submitted for '$sName' has been rejected by ".$_SESSION['current']->sRealname."."; $sMsg .= APPDB_ROOT."testResults.php?sSub=view&iTestingId=".$this->iTestingId."\n"; $sMsg .= "Reason given:\n"; break; case "delete": $sSubject = "Submitted testing data deleted"; - $sMsg = "The testing data you submitted for '$sName' has been deleted."; + $sMsg = "The testing data you submitted for '$sName' has been deleted by ".$_SESSION['current']->sRealname."."; $sMsg .= "Reason given:\n"; break; }

1 0

appdb/ ./appview.php include/monitor.php inclu ...
by WineHQ Jan. 10, 2007

Jan. 10, 2007

ChangeSet ID: 30872 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/09 19:25:18 Modified files: . : appview.php include : monitor.php version.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Remove unused $iAppId parameter from monitor::find() Patch: http://cvs.winehq.org/patch.py?id=30872 Old revision New revision Changes Path 1.97 1.98 +1 -1 appdb/appview.php 1.11 1.12 +9 -12 appdb/include/monitor.php 1.92 1.93 +2 -3 appdb/include/version.php Index: appdb/appview.php diff -u -p appdb/appview.php:1.97 appdb/appview.php:1.98 --- appdb/appview.php:1.97 10 Jan 2007 1:25:18 -0000 +++ appdb/appview.php 10 Jan 2007 1:25:18 -0000 @@ -116,7 +116,7 @@ if ($aClean['sSub']) if($aClean['sSub'] == 'StopMonitoring') { $oMonitor = new Monitor(); - $oMonitor->find($_SESSION['current']->iUserId,$aClean['iAppId'],$aClean['iVersionId']); + $oMonitor->find($_SESSION['current']->iUserId, $aClean['iVersionId']); if($oMonitor->iMonitorId) { $oMonitor->delete(); Index: appdb/include/monitor.php diff -u -p appdb/include/monitor.php:1.11 appdb/include/monitor.php:1.12 --- appdb/include/monitor.php:1.11 10 Jan 2007 1:25:18 -0000 +++ appdb/include/monitor.php 10 Jan 2007 1:25:18 -0000 @@ -36,23 +36,20 @@ class Monitor { } } - function find($iUserId, $iAppId=0, $iVersionId=0) + function find($iUserId, $iVersionId=0) { - if($iUserId) + if($iUserId && $iVersionId) { - if($iVersionId) - { - $sQuery = "SELECT * + $sQuery = "SELECT * FROM appMonitors WHERE userId = '".$iUserId."' AND versionId = '".$iVersionId."'"; - $hResult = query_appdb($sQuery); - $oRow = mysql_fetch_object($hResult); - $this->iMonitorId = $oRow->monitorId; - $this->iAppId = $oRow->appId; - $this->iVersionId = $oRow->versionId; - $this->iUserId = $oRow->userId; - } + $hResult = query_appdb($sQuery); + $oRow = mysql_fetch_object($hResult); + $this->iMonitorId = $oRow->monitorId; + $this->iAppId = $oRow->appId; + $this->iVersionId = $oRow->versionId; + $this->iUserId = $oRow->userId; } } Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.92 appdb/include/version.php:1.93 --- appdb/include/version.php:1.92 10 Jan 2007 1:25:18 -0000 +++ appdb/include/version.php 10 Jan 2007 1:25:18 -0000 @@ -731,8 +731,7 @@ class Version { echo "<input type=hidden name=\"iVersionId\" value=\"".$this->iVersionId."\">"; echo "</form>"; $oMonitor = new Monitor(); - $oMonitor->find($_SESSION['current']->iUserId, - $oApp->iAppId,$this->iVersionId); + $oMonitor->find($_SESSION['current']->iUserId, $this->iVersionId); if(!$oMonitor->iMonitorId) { echo '<form method=post name=sMessage action=appview.php?iVersionId='.$this->iVersionId.'&iAppId='.$oApp->iAppId.'>'; @@ -780,7 +779,7 @@ class Version { echo "</td></tr>"; } $oMonitor = new Monitor(); - $oMonitor->find($_SESSION['current']->iUserId, $oApp->iAppId, $this->iVersionId); + $oMonitor->find($_SESSION['current']->iUserId, $this->iVersionId); if($oMonitor->iMonitorId) { echo '<tr><td colspan="2" align="center">';

1 0

Alexandre Julliard : wine_release: Use git-clean instead of make distclean to clean the source tree.
by Alexandre Julliard Jan. 9, 2007

Jan. 9, 2007

Module: tools Branch: master Commit: 078aaf39d3eeaf8db0f210577e8a7586b969955a URL: http://source.winehq.org/git/tools.git/?a=commit;h=078aaf39d3eeaf8db0f21057… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 9 16:18:59 2007 +0100 wine_release: Use git-clean instead of make distclean to clean the source tree. --- wine_release | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/wine_release b/wine_release index 78441ca..c3d1f60 100755 --- a/wine_release +++ b/wine_release @@ -82,11 +82,7 @@ echo "==== UPDATING WINE API STATS PAGE rm -f winapi_stats.txt # cleanup source tree -make --quiet distclean +git clean -q -d -x rm -rf .git -# homepage announcement -# edit the homepage to announce the new release... -# TODO - # end

1 0

Alexandre Julliard : git-to-cvs: Added detection of binary files.
by Alexandre Julliard Jan. 9, 2007

Jan. 9, 2007

Module: tools Branch: master Commit: 703edcb1376906c99f60690c405977d37361681e URL: http://source.winehq.org/git/tools.git/?a=commit;h=703edcb1376906c99f60690c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 28 14:47:14 2006 +0100 git-to-cvs: Added detection of binary files. --- git-to-cvs | 44 +++++++++++++++++++++++++++++++++++++------- 1 files changed, 37 insertions(+), 7 deletions(-) diff --git a/git-to-cvs b/git-to-cvs index e8b058b..bf587fc 100755 --- a/git-to-cvs +++ b/git-to-cvs @@ -67,13 +67,27 @@ sub create_dir($) } } +# this is the heuristic that git-diff uses +sub is_file_binary($) +{ + my $file = shift; + my $data; + open F, $file or return 0; + sysread F, $data, 8000; + close F; + return ($data =~ /\0/); +} + # cvs add a bunch of files -sub cvs_add_files(@) +sub cvs_add_files($@) { + my $is_binary = shift; my @files = @_; # first create dirs if needed foreach my $file (@files) { create_dir( $file ); } - shell "cvs", "-Q", "add", "-m", "", @files; + my @cmdline = ("cvs", "-Q", "add", "-m", ""); + push @cmdline, "-kb" if $is_binary; + shell @cmdline, @files; } # cvs rm a bunch of files @@ -192,7 +206,7 @@ sub make_cvsignore($) open CVSIGNORE, ">$dir/.cvsignore" or die "cannot create $dir/.cvsignore"; print CVSIGNORE join("\n", sort keys %patterns) . "\n"; close CVSIGNORE; - if ($op eq "A") { cvs_add_files( "$dir/.cvsignore" ); } + if ($op eq "A") { cvs_add_files( 0, "$dir/.cvsignore" ); } return $op; } } @@ -253,6 +267,8 @@ sub apply_git_commit($) { my $commit = shift; my @added = (); + my @added_bin = (); + my @added_text = (); my @modified = (); my @deleted = (); my @gitignores = (); @@ -278,16 +294,30 @@ sub apply_git_commit($) } } close COMMIT; - foreach my $file (@added) { print "A $file\n"; } - foreach my $file (@modified) { print "M $file\n"; } - foreach my $file (@deleted) { print "D $file\n"; } # get the modified files shell "git-read-tree", "--reset", $commit; shell "git-checkout-index", "-f", "-u", "--", @added, @modified, @gitignores if (@added || @modified || @gitignores); unlink @gitignores_deleted if (@gitignores_deleted); - cvs_add_files(@added) if (@added); + foreach my $file (@added) + { + if (is_file_binary($file)) + { + print "A $file (binary)\n"; + push @added_bin, $file; + } + else + { + print "A $file\n"; + push @added_text, $file; + } + } + foreach my $file (@modified) { print "M $file\n"; } + foreach my $file (@deleted) { print "D $file\n"; } + + cvs_add_files( 0, @added_text ) if (@added_text); + cvs_add_files( 1, @added_bin ) if (@added_bin); cvs_rm_files(@deleted) if (@deleted); foreach my $dir (get_file_dirs(@added, @modified, @deleted, @gitignores, @gitignores_deleted))

1 0

lostwages/ include/winehq.conf news/2007010901.xml
by Alexandre Julliard Jan. 9, 2007

Jan. 9, 2007

ChangeSet ID: 30871 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: julliard(a)winehq.org 2007/01/09 10:40:01 Modified files: include : winehq.conf Added files: news : 2007010901.xml Log message: Release 0.9.29 Patch: http://cvs.winehq.org/patch.py?id=30871 Old revision New revision Changes Path 1.51 1.52 +1 -1 lostwages/include/winehq.conf Added 1.1 +0 -0 lostwages/news/2007010901.xml Index: lostwages/include/winehq.conf diff -u -p lostwages/include/winehq.conf:1.51 lostwages/include/winehq.conf:1.52 --- lostwages/include/winehq.conf:1.51 9 Jan 2007 16:40: 1 -0000 +++ lostwages/include/winehq.conf 9 Jan 2007 16:40: 1 -0000 @@ -29,7 +29,7 @@ news_xml_path: news wwn_xml_path: wwn # Snapshot Date -snapshot_date: 0.9.28 +snapshot_date: 0.9.29 # Current RH Packages Snapshot Date snapshot_date_rh: 0.9.2 Index: lostwages/news/2007010901.xml diff -u -p /dev/null lostwages/news/2007010901.xml:1.1 --- /dev/null 9 Jan 2007 16:40: 1 -0000 +++ lostwages/news/2007010901.xml 9 Jan 2007 16:40: 1 -0000 @@ -0,0 +1,25 @@ +<news> +<date>January 9, 2007</date> +<title>Wine 0.9.29 Released</title> +<body> +<p>Wine 0.9.29 was released today, with the following main changes:</p> + +<ul> +<li>More work on the new Direct3D state management.</li> +<li>Debugger support for Mac OS.</li> +<li>Many OLE fixes and improvements.</li> +<li>Audio input support on Mac OS.</li> +<li>Lots of bug fixes.</li> +</ul> + +<p> +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.29.tar.bz2">available now</a>. +You can find out more about this release in the +<a href="?announce=0.9.29">announcement</a>. Check out our +<a href="/site/download">download page</a> for packages for your +distribution. +</p> +</body> +</news>

1 0

Tag wine-0.9.29 : Alexandre Julliard : Release 0.9.29
by Alexandre Julliard Jan. 9, 2007

Jan. 9, 2007

Module: wine Branch: refs/tags/wine-0.9.29 Tag: 893f80cc72b421ebece14c288e0e3475da3c61d2 URL: http://source.winehq.org/git/wine.git/?a=tag;h=893f80cc72b421ebece14c288e0e… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 9 16:42:47 2007 +0100 Release 0.9.29

1 0

Alexandre Julliard : Release 0.9.29.
by Alexandre Julliard Jan. 9, 2007

Jan. 9, 2007

Module: wine Branch: master Commit: d8c3e7de692c785e1c7679d0521cf8b12469b0b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8c3e7de692c785e1c7679d05… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 9 16:42:47 2007 +0100 Release 0.9.29. --- ANNOUNCE | 923 +++++++++++++++++------------ ChangeLog | 1936 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 +- configure | 18 +- 4 files changed, 2484 insertions(+), 395 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d8c3e7de692c785e1c767…

1 0

Alexandre Julliard : Update copyright info for the new year.
by Alexandre Julliard Jan. 9, 2007

Jan. 9, 2007

Module: wine Branch: master Commit: 515ce23f835c413445668619cbaba858b721a57c URL: http://source.winehq.org/git/wine.git/?a=commit;h=515ce23f835c413445668619c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 9 14:21:06 2007 +0100 Update copyright info for the new year. --- LICENSE | 2 +- include/wine/wine_common_ver.rc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index d2ae195..e86077c 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 1993-2006 the Wine project authors (see the file AUTHORS +Copyright (c) 1993-2007 the Wine project authors (see the file AUTHORS for a complete list) Wine is free software; you can redistribute it and/or modify it under diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc index 9b05eaa..1d33705 100644 --- a/include/wine/wine_common_ver.rc +++ b/include/wine/wine_common_ver.rc @@ -84,7 +84,7 @@ FILESUBTYPE WINE_FILESUBTYPE VALUE "FileDescription", WINE_FILEDESCRIPTION_STR VALUE "FileVersion", WINE_FILEVERSION_STR VALUE "InternalName", WINE_FILENAME - VALUE "LegalCopyright", "Copyright (c) 1993-2006 the Wine project authors (see the file AUTHORS for a complete list)" + VALUE "LegalCopyright", "Copyright (c) 1993-2007 the Wine project authors (see the file AUTHORS for a complete list)" VALUE "OriginalFilename", WINE_FILENAME_STR VALUE "ProductName", WINE_PRODUCTNAME_STR VALUE "ProductVersion", WINE_PRODUCTVERSION_STR

1 0

Francois Gouget : shlwapi/tests: Print GetLastError() in decimal with '%u'.
by Alexandre Julliard Jan. 9, 2007

Jan. 9, 2007

Module: wine Branch: master Commit: 052104b9e499ce82c7a7f591cb87c2ee8e97a88d URL: http://source.winehq.org/git/wine.git/?a=commit;h=052104b9e499ce82c7a7f591c… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 9 12:23:25 2007 +0100 shlwapi/tests: Print GetLastError() in decimal with '%u'. --- dlls/shlwapi/tests/ordinal.c | 54 +++++++++++++++++++++--------------------- 1 files changed, 27 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=052104b9e499ce82c7a7f…

1 0