wine-commits June 2007

wine-commits@winehq.org

5 participants
856 discussions

Francois Gouget : regedit: Merge getRegClass() and getRegKeyName() to form parseKeyName().
by Alexandre Julliard 18 Jun '07

18 Jun '07

Module: wine Branch: master Commit: afa9d0a60da48a7efdca7114185b5e069b7b7c9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=afa9d0a60da48a7efdca71141… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 15 18:59:55 2007 +0200 regedit: Merge getRegClass() and getRegKeyName() to form parseKeyName(). Keep track of the full registry path (including the root key) in currentKeyName. This makes the error messages more informative. Reduce the number of global variables used by openKey() & co. Only use one variable, currentKeyHandle, to indicate whether a key is currently open or not. --- programs/regedit/regproc.c | 209 ++++++++++++++++++++----------------------- 1 files changed, 97 insertions(+), 112 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=afa9d0a60da48a7efdca7…

1 0

Francois Gouget : regedit: Don' t allow square-bracketed registry paths on the command line ( to match native).
by Alexandre Julliard 18 Jun '07

18 Jun '07

Module: wine Branch: master Commit: f6d5738d9a1a3117e2a43c4cb2ab673db37ed59e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6d5738d9a1a3117e2a43c4cb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 15 18:58:42 2007 +0200 regedit: Don't allow square-bracketed registry paths on the command line (to match native). The only place they are allowed is in .reg files, so exclusively deal with them in processRegEntry(). Fix detection of the trailing ']' in processRegEntry(): it can be followed by some garbage. --- programs/regedit/regproc.c | 54 ++++++++++++------------------------------- 1 files changed, 15 insertions(+), 39 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index ee7e195..7fab52b 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -276,15 +276,13 @@ static LONG setValue(LPSTR val_name, LPSTR val_data) /****************************************************************************** - * Extracts from [HKEY\some\key\path] or HKEY\some\key\path types of line + * Extracts from HKEY\some\key\path types of line * the key class (what ends before the first '\') */ static BOOL getRegClass(LPSTR lpClass, HKEY* hkey) { LPSTR classNameEnd; - LPSTR classNameBeg; unsigned int i; - char lpClassCopy[KEY_MAX_LEN]; if (lpClass == NULL) @@ -293,23 +291,11 @@ static BOOL getRegClass(LPSTR lpClass, HKEY* hkey) lstrcpynA(lpClassCopy, lpClass, KEY_MAX_LEN); classNameEnd = strchr(lpClassCopy, '\\'); /* The class name ends by '\' */ - if (!classNameEnd) /* or the whole string */ - { - classNameEnd = lpClassCopy + strlen(lpClassCopy); - if (classNameEnd[-1] == ']') - { - classNameEnd--; - } - } - *classNameEnd = '\0'; /* Isolate the class name */ - if (lpClassCopy[0] == '[') { - classNameBeg = lpClassCopy + 1; - } else { - classNameBeg = lpClassCopy; - } + if (classNameEnd) /* or the whole string */ + *classNameEnd = '\0'; /* Isolate the class name */ for (i = 0; i < REG_CLASS_NUMBER; i++) { - if (!strcmp(classNameBeg, reg_class_names[i])) { + if (!strcmp(lpClassCopy, reg_class_names[i])) { *hkey = reg_class_keys[i]; return TRUE; } @@ -318,7 +304,7 @@ static BOOL getRegClass(LPSTR lpClass, HKEY* hkey) } /****************************************************************************** - * Extracts from [HKEY\some\key\path] or HKEY\some\key\path types of line + * Extracts from HKEY\some\key\path types of line * the key name (what starts after the first '\') */ static LPSTR getRegKeyName(LPSTR lpLine) @@ -334,16 +320,6 @@ static LPSTR getRegKeyName(LPSTR lpLine) keyNameBeg = strchr(lpLineCopy, '\\'); /* The key name start by '\' */ if (keyNameBeg) { keyNameBeg++; /* is not part of the name */ - - if (lpLine[0] == '[') /* need to find matching ']' */ - { - LPSTR keyNameEnd; - - keyNameEnd = strrchr(lpLineCopy, ']'); - if (keyNameEnd) { - *keyNameEnd = '\0'; /* remove ']' from the key name */ - } - } } else { keyNameBeg = lpLineCopy + strlen(lpLineCopy); /* branch - empty string */ } @@ -489,22 +465,22 @@ static void processRegEntry(LPSTR stdInput) if ( stdInput[0] == '[') /* We are reading a new key */ { + LPSTR keyEnd; if ( bTheKeyIsOpen != FALSE ) closeKey(); /* Close the previous key before */ + /* Get rid of the square brackets */ + stdInput++; + keyEnd = strrchr(stdInput, ']'); + if (keyEnd) + *keyEnd='\0'; + /* delete the key if we encounter '-' at the start of reg key */ - if ( stdInput[1] == '-') + if ( stdInput[0] == '-') { - int last_chr = strlen(stdInput) - 1; - - /* skip leading "[-" and get rid of trailing "]" */ - if (stdInput[last_chr] == ']') - stdInput[last_chr] = '\0'; - delete_registry_key(stdInput+2); - return; + delete_registry_key(stdInput+1); } - - if ( openKey(stdInput) != ERROR_SUCCESS ) + else if ( openKey(stdInput) != ERROR_SUCCESS ) fprintf(stderr,"%s: setValue failed to open key %s\n", getAppName(), stdInput); } else if( ( bTheKeyIsOpen ) &&

1 0

Francois Gouget : regedit: Add missing '\n' to an error message.
by Alexandre Julliard 18 Jun '07

18 Jun '07

Module: wine Branch: master Commit: 8585fb3112b5ae204f0e2dd9844aa97dd2d9d560 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8585fb3112b5ae204f0e2dd98… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 15 18:57:57 2007 +0200 regedit: Add missing '\n' to an error message. --- programs/regedit/regproc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index d1d757d..ee7e195 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -62,7 +62,7 @@ static HKEY reg_class_keys[REG_CLASS_NUMBER] = { #define CHECK_ENOUGH_MEMORY(p) \ if (!(p)) \ { \ - fprintf(stderr,"%s: file %s, line %d: Not enough memory", \ + fprintf(stderr,"%s: file %s, line %d: Not enough memory\n", \ getAppName(), __FILE__, __LINE__); \ exit(NOT_ENOUGH_MEMORY); \ }

1 0

Paul Vriens : crypt32/tests: Don't crash on Vista.
by Alexandre Julliard 18 Jun '07

18 Jun '07

Module: wine Branch: master Commit: 5fb284721d3a4b80f66f2f6840d15ac2eac6e568 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fb284721d3a4b80f66f2f684… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Jun 15 16:55:21 2007 +0200 crypt32/tests: Don't crash on Vista. --- dlls/crypt32/tests/main.c | 72 ++++++++++++++++++++++++++------------------ 1 files changed, 42 insertions(+), 30 deletions(-) diff --git a/dlls/crypt32/tests/main.c b/dlls/crypt32/tests/main.c index 73ead4a..e55d2d3 100644 --- a/dlls/crypt32/tests/main.c +++ b/dlls/crypt32/tests/main.c @@ -44,16 +44,20 @@ static void test_findAttribute(void) ok(ret == NULL, "Expected failure\n"); ok(GetLastError() == 0xdeadbeef, "Last error was set to %08x\n", GetLastError()); - /* crashes - SetLastError(0xdeadbeef); - ret = CertFindAttribute(NULL, 1, NULL); - */ - /* returns NULL, last error is ERROR_INVALID_PARAMETER */ - SetLastError(0xdeadbeef); - ret = CertFindAttribute(NULL, 1, &attr); - ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d (%08x)\n", GetLastError(), - GetLastError()); + if (0) + { + /* crashes */ + SetLastError(0xdeadbeef); + ret = CertFindAttribute(NULL, 1, NULL); + /* returns NULL, last error is ERROR_INVALID_PARAMETER + * crashes on Vista + */ + SetLastError(0xdeadbeef); + ret = CertFindAttribute(NULL, 1, &attr); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d (%08x)\n", GetLastError(), + GetLastError()); + } /* returns NULL, last error not set */ SetLastError(0xdeadbeef); ret = CertFindAttribute("bogus", 1, &attr); @@ -85,16 +89,20 @@ static void test_findExtension(void) ok(ret == NULL, "Expected failure\n"); ok(GetLastError() == 0xdeadbeef, "Last error was set to %08x\n", GetLastError()); - /* crashes - SetLastError(0xdeadbeef); - ret = CertFindExtension(NULL, 1, NULL); - */ - /* returns NULL, last error is ERROR_INVALID_PARAMETER */ - SetLastError(0xdeadbeef); - ret = CertFindExtension(NULL, 1, &ext); - ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d (%08x)\n", GetLastError(), - GetLastError()); + if (0) + { + /* crashes */ + SetLastError(0xdeadbeef); + ret = CertFindExtension(NULL, 1, NULL); + /* returns NULL, last error is ERROR_INVALID_PARAMETER + * crashes on Vista + */ + SetLastError(0xdeadbeef); + ret = CertFindExtension(NULL, 1, &ext); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d (%08x)\n", GetLastError(), + GetLastError()); + } /* returns NULL, last error not set */ SetLastError(0xdeadbeef); ret = CertFindExtension("bogus", 1, &ext); @@ -126,16 +134,20 @@ static void test_findRDNAttr(void) }; CERT_NAME_INFO nameInfo = { sizeof(rdns) / sizeof(rdns[0]), rdns }; - /* crashes - SetLastError(0xdeadbeef); - ret = CertFindRDNAttr(NULL, NULL); - */ - /* returns NULL, last error is ERROR_INVALID_PARAMETER */ - SetLastError(0xdeadbeef); - ret = CertFindRDNAttr(NULL, &nameInfo); - ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d (%08x)\n", GetLastError(), - GetLastError()); + if (0) + { + /* crashes */ + SetLastError(0xdeadbeef); + ret = CertFindRDNAttr(NULL, NULL); + /* returns NULL, last error is ERROR_INVALID_PARAMETER + * crashes on Vista + */ + SetLastError(0xdeadbeef); + ret = CertFindRDNAttr(NULL, &nameInfo); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d (%08x)\n", GetLastError(), + GetLastError()); + } /* returns NULL, last error not set */ SetLastError(0xdeadbeef); ret = CertFindRDNAttr("bogus", &nameInfo);

1 0

appdb/include util.php
by WineHQ 17 Jun '07

17 Jun '07

ChangeSet ID: 31219 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/17 17:44:47 Modified files: include : util.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Cleanup make_bugzilla_version_list(). Use standard naming convention, add some documentation. Add a work around so a selected version, if not present, is added to the list and selected. This fixes the issue where editing an older test result leaves us in an unattainable position, we can't select the version since it was pruned from the list and we don't want to pick the wrong version for the results. Patch: http://cvs.winehq.org/patch.py?id=31219 Old revision New revision Changes Path 1.94 1.95 +25 -8 appdb/include/util.php Index: appdb/include/util.php diff -u -p appdb/include/util.php:1.94 appdb/include/util.php:1.95 --- appdb/include/util.php:1.94 17 Jun 2007 22:44:47 -0000 +++ appdb/include/util.php 17 Jun 2007 22:44:47 -0000 @@ -154,11 +154,14 @@ function get_xml_tag ($file, $mode = nul } /* bugzilla functions */ -function make_bugzilla_version_list($varname, $cvalue) -{ - $table = BUGZILLA_DB.".versions"; - $where = "WHERE product_id=".BUGZILLA_PRODUCT_ID; - $sQuery = "SELECT value FROM $table $where"; +// $sVarname - name of the selection array that this function will output +// this is the name to use to retrieve the selection on the form postback +// $sSelectedValue - the currently selected entry +function make_bugzilla_version_list($sVarname, $sSelectedValue) +{ + $sTable = BUGZILLA_DB.".versions"; + $sWhere = "WHERE product_id=".BUGZILLA_PRODUCT_ID; + $sQuery = "SELECT value FROM $sTable $sWhere"; $hResult = query_bugzilladb($sQuery); if(!$hResult) return; @@ -195,15 +198,29 @@ function make_bugzilla_version_list($var // build the selection array - echo "<select name='$varname'>\n"; + echo "<select name='$sVarname'>\n"; echo "<option value=\"\">Choose ...</option>\n"; + $bFoundSelectedValue = false; foreach($aVersions as $sKey => $sValue) { - if($sValue == $cvalue) + if($sValue == $sSelectedValue) + { echo "<option value=$sValue selected>$sValue\n"; - else + $bFoundSelectedValue = true; + } else + { echo "<option value=$sValue>$sValue\n"; + } } + + // if we didn't find the selected value and the selected value isn't empty + // then we should add the selected value to the list because we could have pruned + // the version that is to be selected + if(!$bFoundSelectedValue && $sSelectedValue) + { + echo "<option value=$sSelectedValue selected>$sSelectedValue\n"; + } + echo "</select>\n"; }

1 0

appdb/include sidebar.php
by WineHQ 17 Jun '07

17 Jun '07

ChangeSet ID: 31218 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/17 17:10:30 Modified files: include : sidebar.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Remove duplicate 'Appdb home' entry. Shorten the names of a few other entries Patch: http://cvs.winehq.org/patch.py?id=31218 Old revision New revision Changes Path 1.31 1.32 +3 -4 appdb/include/sidebar.php Index: appdb/include/sidebar.php diff -u -p appdb/include/sidebar.php:1.31 appdb/include/sidebar.php:1.32 --- appdb/include/sidebar.php:1.31 17 Jun 2007 22:10:30 -0000 +++ appdb/include/sidebar.php 17 Jun 2007 22:10:30 -0000 @@ -18,7 +18,6 @@ function global_sidebar_menu() $g->done(); $g = new htmlmenu("AppDB"); - $g->add("AppDB Home", BASE); $g->add("Screenshots", BASE."viewScreenshots.php"); $g->add("Browse Apps", BASE."appbrowse.php"); $g->add("Browse Newest Apps", BASE."browse_newest_apps.php"); @@ -28,9 +27,9 @@ function global_sidebar_menu() $g->add("Submit Application", BASE."objectManager.php?sClass=application_queue&". "sTitle=Submit+Application&sAction=add"); $g->add("Help & Documentation", BASE."help/"); - $g->add("AppDB Stats", BASE."appdbStats.php"); - $g->add("View Distributions (".distribution::objectGetEntriesCount(false, false).")", BASE."objectManager.php?sClass=distribution&bIsQueue=false&sTitle=View%20Distributions"); - $g->add("View Vendors (".vendor::objectGetEntriesCount(false, false).")", BASE."objectManager.php?sClass=vendor&bIsQueue=false&sTitle=View%20Vendors"); + $g->add("Statistics", BASE."appdbStats.php"); + $g->add("Distributions (".distribution::objectGetEntriesCount(false, false).")", BASE."objectManager.php?sClass=distribution&bIsQueue=false&sTitle=View%20Distributions"); + $g->add("Vendors (".vendor::objectGetEntriesCount(false, false).")", BASE."objectManager.php?sClass=vendor&bIsQueue=false&sTitle=View%20Vendors"); $g->add("Email your suggestions for improving the AppDB", "mailto:appdb@winehq.org"); $g->done();

1 0

appdb/ ./account.php include/util.php
by WineHQ 17 Jun '07

17 Jun '07

ChangeSet ID: 31217 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/17 11:59:42 Modified files: . : account.php include : util.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Encode the sReturnTo argument to the login page, otherwise we may have problems with some urls Patch: http://cvs.winehq.org/patch.py?id=31217 Old revision New revision Changes Path 1.36 1.37 +1 -1 appdb/account.php 1.93 1.94 +1 -1 appdb/include/util.php Index: appdb/account.php diff -u -p appdb/account.php:1.36 appdb/account.php:1.37 --- appdb/account.php:1.36 17 Jun 2007 16:59:42 -0000 +++ appdb/account.php 17 Jun 2007 16:59:42 -0000 @@ -209,7 +209,7 @@ function cmd_do_login() if($iResult == SUCCESS) { - $sReturnUrl = $aClean['sReturnTo']; + $sReturnUrl = urldecode($aClean['sReturnTo']); if(!$sReturnUrl) $sReturnUrl = apidb_fullurl("index.php"); addmsg("You are successfully logged in as '$oUser->sRealname'.", "green"); Index: appdb/include/util.php diff -u -p appdb/include/util.php:1.93 appdb/include/util.php:1.94 --- appdb/include/util.php:1.93 17 Jun 2007 16:59:42 -0000 +++ appdb/include/util.php 17 Jun 2007 16:59:42 -0000 @@ -907,7 +907,7 @@ function util_trim_description($sDescrip to the current page once he has logged in */ function login_url() { - $sCurrentUrl = $_SERVER['REQUEST_URI']; + $sCurrentUrl = urlencode($_SERVER['REQUEST_URI']); $sLoginUrl = BASE."account.php?sCmd=login"; /* If we are on the login page that means the URL already contains an sReturnTo value,

1 0

appdb/. apidb.css
by WineHQ 17 Jun '07

17 Jun '07

ChangeSet ID: 31216 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/17 11:58:52 Modified files: . : apidb.css Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Increase menu text size. Should make it easier for people to notice the menu options. Increase font size from 10px to 11px. Patch: http://cvs.winehq.org/patch.py?id=31216 Old revision New revision Changes Path 1.18 1.19 +4 -4 appdb/apidb.css Index: appdb/apidb.css diff -u -p appdb/apidb.css:1.18 appdb/apidb.css:1.19 --- appdb/apidb.css:1.18 17 Jun 2007 16:58:52 -0000 +++ appdb/apidb.css 17 Jun 2007 16:58:52 -0000 @@ -63,10 +63,10 @@ p.indent { padding-left: 1em; .menuTitle { font-size: 12px; color: #ffffff; font-weight: bold; text-decoration: none; } .menuTitle:visited { font-size: 12px; color: #ffffff; font-weight: bold; text-decoration: none; } .menuTitle:hover { font-size: 12px; color: #ffffff; font-weight: bold; text-decoration: none; } -.menuLink { font-size: 10px; color: #ffffff; font-weight: bold; } -.menuItem { font-size: 10px; color: #000000; } -.menuItem:visited { font-size: 10px; color: #000000; } -.menuItem:hover { font-size: 10px; color: #A50D0D; } +.menuLink { font-size: 11px; color: #ffffff; font-weight: bold; } +.menuItem { font-size: 11px; color: #000000; } +.menuItem:visited { font-size: 11px; color: #000000; } +.menuItem:hover { font-size: 11px; color: #A50D0D; } .topMenu { background-color: #601919; } .sideMenu { background-color: #FFFFFF; }

1 0

appdb/. screenshots.php
by WineHQ 16 Jun '07

16 Jun '07

ChangeSet ID: 31215 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/16 16:16:12 Modified files: . : screenshots.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Properly close all of the html frames we opened with html_frame_start(). Fixes a bug where the back link appears inside of a frame and the page rendering time appears in an odd red bar at the bottom of the page Patch: http://cvs.winehq.org/patch.py?id=31215 Old revision New revision Changes Path 1.45 1.46 +6 -2 appdb/screenshots.php Index: appdb/screenshots.php diff -u -p appdb/screenshots.php:1.45 appdb/screenshots.php:1.46 --- appdb/screenshots.php:1.45 16 Jun 2007 21:16:12 -0000 +++ appdb/screenshots.php 16 Jun 2007 21:16:12 -0000 @@ -69,6 +69,9 @@ if($hResult && mysql_num_rows($hResult)) echo "<div align=center><table><tr>\n"; while($oRow = mysql_fetch_object($hResult)) { + // if the current version changed then update the current version + // and close the previous html frame if this isn't the + // first frame if(!$aClean['iVersionId'] && $oRow->versionId != $currentVersionId) { if($currentVersionId) @@ -77,7 +80,7 @@ if($hResult && mysql_num_rows($hResult)) echo html_frame_end(); $c=1; } - $currentVersionId=$oRow->versionId; + $currentVersionId = $oRow->versionId; echo html_frame_start("Version ".Version::lookup_name($currentVersionId)); echo "<div align=center><table><tr>\n"; } @@ -104,7 +107,8 @@ if($hResult && mysql_num_rows($hResult)) } echo "</tr></table></div><br />\n"; - echo html_frame_end("Click thumbnail to view image in new window."); + echo html_frame_end(); // close the current version we are displaying + echo html_frame_end(); // close the "Screenshot Gallary..." html frame } else { echo "<p align=\"center\">There are currently no screenshots for the selected version of this application."; echo "<br />Please consider submitting a screenshot for the selected version yourself.</p>";

1 0

appdb/cron cleanup.php
by WineHQ 16 Jun '07

16 Jun '07

ChangeSet ID: 31214 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/16 12:04:56 Modified files: cron : cleanup.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Fix cron maintenance email subject for database error log emails. Forgot to flag $sEmailSubject as global Patch: http://cvs.winehq.org/patch.py?id=31214 Old revision New revision Changes Path 1.43 1.44 +1 -0 appdb/cron/cleanup.php Index: appdb/cron/cleanup.php diff -u -p appdb/cron/cleanup.php:1.43 appdb/cron/cleanup.php:1.44 --- appdb/cron/cleanup.php:1.43 16 Jun 2007 17: 4:56 -0000 +++ appdb/cron/cleanup.php 16 Jun 2007 17: 4:56 -0000 @@ -254,6 +254,7 @@ function orphanSessionListCheck() // report the database error log entries to the mailing list function reportErrorLogEntries() { + global $sEmailSubject; error_log::mail_admins_error_log($sEmailSubject); error_log::flush(); }

1 0

← Newer
1
...
36
37
38
39
40
41
42
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2007