July 2006 - Wine-Commits - list.winehq.org

Robert Shearman : advapi32: Fix the service function being called when extended is
by Alexandre Julliard July 6, 2006

July 6, 2006

Module: wine Branch: refs/heads/master Commit: cc5aceb4f0a0de8cd07b15b1181f86dbcdf66a82 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cc5aceb4f0a0de8cd07b15b… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jul 3 13:49:10 2006 +0100 advapi32: Fix the service function being called when extended is either set or not set (reported by Andrey Turkin). --- dlls/advapi32/service.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 2ceb8a2..10b3c67 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -610,14 +610,14 @@ static BOOL service_handle_control(HANDL if (service_accepts_control(service, dwControl)) { - if (service->extended && service->handler.handler) + if (service->extended && service->handler.handler_ex) { - service->handler.handler(dwControl); + service->handler.handler_ex(dwControl, 0, NULL, service->context); ret = ERROR_SUCCESS; } - else if (service->handler.handler_ex) + else if (service->handler.handler) { - service->handler.handler_ex(dwControl, 0, NULL, service->context); + service->handler.handler(dwControl); ret = ERROR_SUCCESS; } }

1 0

Dmitry Timoshkov : Avoid non-portable WCHAR[] constructs.
by Alexandre Julliard July 6, 2006

July 6, 2006

Module: wine Branch: refs/heads/master Commit: 081563e7ec75cb747973e2f12482d4464d5d2891 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=081563e7ec75cb747973e2f… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Jul 3 19:54:10 2006 +0900 Avoid non-portable WCHAR[] constructs. --- dlls/crypt32/protectdata.c | 6 +++--- dlls/msi/table.c | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/protectdata.c b/dlls/crypt32/protectdata.c index 6b12f2d..4b7cfc9 100644 --- a/dlls/crypt32/protectdata.c +++ b/dlls/crypt32/protectdata.c @@ -107,7 +107,7 @@ struct protect_data_t }; /* this is used to check if an incoming structure was built by Wine */ -static const char * crypt_magic_str = "Wine Crypt32 ok"; +static const char crypt_magic_str[] = "Wine Crypt32 ok"; /* debugging tool to print strings of hex chars */ static const char * @@ -835,8 +835,8 @@ BOOL WINAPI CryptProtectData(DATA_BLOB* DWORD dwFlags, DATA_BLOB* pDataOut) { + static const WCHAR empty_str[1]; BOOL rc = FALSE; - HCRYPTPROV hProv; struct protect_data_t protect_data; HCRYPTHASH hHash; @@ -861,7 +861,7 @@ BOOL WINAPI CryptProtectData(DATA_BLOB* /* Windows appears to create an empty szDataDescr instead of maintaining * a NULL */ if (!szDataDescr) - szDataDescr=(WCHAR[]){'\0'}; + szDataDescr = empty_str; /* get crypt context */ if (!CryptAcquireContextW(&hProv,NULL,NULL,CRYPT32_PROTECTDATA_PROV,CRYPT_VERIFYCONTEXT)) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 96623df..810cbb8 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1680,7 +1680,6 @@ static void dump_table( string_table *st for( i=0; i<(rawsize/2); i++ ) { sval = msi_string_lookup_id( st, rawdata[i] ); - if( !sval ) sval = (WCHAR[]) {0}; MESSAGE(" %04x %s\n", rawdata[i], debugstr_w(sval) ); } }

1 0

appdb/include session.php
by WineHQ July 6, 2006

July 6, 2006

ChangeSet ID: 26199 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/06 00:00:38 Modified files: include : session.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> session::destroy() should call session_destroy() only if a session exists Patch: http://cvs.winehq.org/patch.py?id=26199 Old revision New revision Changes Path 1.11 1.12 +2 -1 appdb/include/session.php Index: appdb/include/session.php diff -u -p appdb/include/session.php:1.11 appdb/include/session.php:1.12 --- appdb/include/session.php:1.11 6 Jul 2006 5: 0:38 -0000 +++ appdb/include/session.php 6 Jul 2006 5: 0:38 -0000 @@ -54,7 +54,8 @@ class session // destroy session function destroy () { - session_destroy(); + if(session_id() != "") + session_destroy(); } // open session file (not needed for DB access)

1 0

appdb/ ./account.php ./preferences.php include ...
by WineHQ July 6, 2006

July 6, 2006

ChangeSet ID: 26198 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/05 23:46:13 Modified files: . : account.php preferences.php include : form_edit.php form_login.php form_new.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Fix variable naming of preferences/account related form variables to match our coding standards Patch: http://cvs.winehq.org/patch.py?id=26198 Old revision New revision Changes Path 1.25 1.26 +21 -20 appdb/account.php 1.26 1.27 +19 -19 appdb/preferences.php 1.8 1.9 +5 -5 appdb/include/form_edit.php 1.5 1.6 +3 -3 appdb/include/form_login.php 1.7 1.8 +7 -7 appdb/include/form_new.php

1 0

appdb/cron cleanup.php
by WineHQ July 6, 2006

July 6, 2006

ChangeSet ID: 26197 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/05 23:39:02 Modified files: cron : cleanup.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Purge orphaned messages from sessionMessages that are older than 1 day after notifying admins of the number of orphaned messages. We currently have over 150k messages stuck in this table with the earliest dating back to 2004. We need to ensure that this doesn't occur again and that we can detect leaked messages as these represent bugs in the appdb code. Patch: http://cvs.winehq.org/patch.py?id=26197 Old revision New revision Changes Path 1.26 1.27 +32 -2 appdb/cron/cleanup.php Index: appdb/cron/cleanup.php diff -u -p appdb/cron/cleanup.php:1.26 appdb/cron/cleanup.php:1.27 --- appdb/cron/cleanup.php:1.26 6 Jul 2006 4:39: 2 -0000 +++ appdb/cron/cleanup.php 6 Jul 2006 4:39: 2 -0000 @@ -72,7 +72,8 @@ notifyAdminsOfCleanupExecution($usersWar /* check to see if there are orphaned versions in the database */ orphanVersionCheck(); - +/* check to see if we have any orphaned messages stuck in sessionMessages table */ +orphanSessionMessagesCheck(); /* Users that are unwarned and inactive since $iMonths */ @@ -149,7 +150,7 @@ function orphanVersionCheck() $found_orphans = false; $sMsg = "Found these orphaned versions in the database with\r\n"; - $sMSg = "this sql command '".$sQuery."'\r\n"; + $sMsg.= "this sql command '".$sQuery."'\r\n"; /* don't report anything if no orphans are found */ if(mysql_num_rows($hResult) == 0) @@ -167,3 +168,32 @@ function orphanVersionCheck() if($sEmail) mail_appdb($sEmail, $sSubject, $sMsg); } + +/* this function checks to see if we have any orphaned session messages */ +/* These orphaned messages are an indication that we've put a message into */ +/* the system without displaying it and it becomes effectively lost forever */ +/* so we'll want to purge them here after reporting how many we have */ +function orphanSessionMessagesCheck() +{ + $iSessionMessageDayLimit = 1; /* the number of days a session message must be stuck before being purges */ + + /* get a count of the messages older than $iSessionMessageDayLimit */ + $sQuery = "SELECT count(*) as cnt from sessionMessages where TO_DAYS(NOW()) - TO_DAYS(time) > ?"; + $hResult = query_parameters($sQuery, $iSessionMessageDayLimit); + + $oRow = mysql_fetch_object($hResult); + $iMessages = $oRow->cnt; + + $sMsg = "Found ".$iMessages." that have been orphaned in the sessionMessages table for longer than ".$iSessionMessageDayLimit." days\r\n"; + $sMsg.= " Purging these messages.\r\n"; + + $sSubject = "Messages orphaned in sessionMessages\r\n"; + + $sEmail = User::get_notify_email_address_list(null, null); /* get list admins */ + if($sEmail) + mail_appdb($sEmail, $sSubject, $sMsg); + + /* purge the messages older than $iSessionMessageDayLimit */ + $sQuery = "DELETE from sessionMessages where TO_DAYS(NOW()) - TO_DAYS(time) > ?"; + $hResult = query_parameters($sQuery, $iSessionMessageDayLimit); +}

1 0

appdb/ ./account.php include/user.php
by WineHQ July 6, 2006

July 6, 2006

ChangeSet ID: 26196 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/05 23:21:04 Modified files: . : account.php include : user.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Use $GLOBALS['session']->destroy() instead of setting $_SESSION['current'] = "". Using "" means that $_SESSION['current'] could be set but be a string. Don't call addmsg() after logging out otherwise the session message will be lost and can show up for other users or be stuck in the database Patch: http://cvs.winehq.org/patch.py?id=26196 Old revision New revision Changes Path 1.24 1.25 +0 -4 appdb/account.php 1.73 1.74 +5 -4 appdb/include/user.php Index: appdb/account.php diff -u -p appdb/account.php:1.24 appdb/account.php:1.25 --- appdb/account.php:1.24 6 Jul 2006 4:21: 4 -0000 +++ appdb/account.php 6 Jul 2006 4:21: 4 -0000 @@ -58,10 +58,6 @@ function do_account($sCmd = null) if($_SESSION['current']) $_SESSION['current']->logout(); - /* destroy all session variables */ - $GLOBALS['session']->destroy(); - - addmsg("You are successfully logged out.", "green"); redirect(apidb_fullurl("index.php")); exit; } Index: appdb/include/user.php diff -u -p appdb/include/user.php:1.73 appdb/include/user.php:1.74 --- appdb/include/user.php:1.73 6 Jul 2006 4:21: 4 -0000 +++ appdb/include/user.php 6 Jul 2006 4:21: 4 -0000 @@ -82,15 +82,16 @@ class User { return SUCCESS; } - /* null out the session variable for the current user since we failed to login */ - $_SESSION['current'] = ""; + /* destroy all session variables since we failed to login */ + $GLOBALS['session']->destroy(); + return USER_LOGIN_FAILED; } function logout() { - /* null out the session current variable to log us out */ - $_SESSION['current'] = ""; + /* destroy all session variables since we are logging out */ + $GLOBALS['session']->destroy(); }

1 0

appdb/. account.php
by WineHQ July 6, 2006

July 6, 2006

ChangeSet ID: 26195 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/05 22:45:17 Modified files: . : account.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Cleanup variable naming in account.php Patch: http://cvs.winehq.org/patch.py?id=26195 Old revision New revision Changes Path 1.23 1.24 +27 -27 appdb/account.php Index: appdb/account.php diff -u -p appdb/account.php:1.23 appdb/account.php:1.24 --- appdb/account.php:1.23 6 Jul 2006 3:45:17 -0000 +++ appdb/account.php 6 Jul 2006 3:45:17 -0000 @@ -22,12 +22,12 @@ do_account($aClean['cmd']); /** - * process according to $cmd from URL + * process according to $sCmd from URL */ -function do_account($cmd = null) +function do_account($sCmd = null) { - if (!$cmd) return 0; - switch($cmd) + if (!$sCmd) return 0; + switch($sCmd) { case "new": apidb_header("New Account"); @@ -73,10 +73,10 @@ function do_account($cmd = null) /** * retry */ -function retry($cmd, $msg) +function retry($sCmd, $sMsg) { - addmsg($msg, "red"); - do_account($cmd); + addmsg($sMsg, "red"); + do_account($sCmd); } @@ -115,23 +115,23 @@ function cmd_do_new() return; } - $user = new User(); + $oUser = new User(); - $result = $user->create($aClean['ext_email'], $aClean['ext_password'], $aClean['ext_realname'], $aClean['CVSrelease'] ); + $iResult = $oUser->create($aClean['ext_email'], $aClean['ext_password'], $aClean['ext_realname'], $aClean['CVSrelease'] ); - if($result == SUCCESS) + if($iResult == SUCCESS) { /* if we can log the user in, log them in automatically */ - $user->login($aClean['ext_email'], $aClean['ext_password']); + $oUser->login($aClean['ext_email'], $aClean['ext_password']); addmsg("Account created! (".$aClean['ext_email'].")", "green"); redirect(apidb_fullurl()); } - else if($result == USER_CREATE_EXISTS) + else if($iResult == USER_CREATE_EXISTS) { addmsg("An account with this e-mail exists already.", "red"); retry("new", "Failed to create account"); - } else if($result = USER_CREATE_FAILED) + } else if($iResult = USER_CREATE_FAILED) { addmsg("Error while creating a new user.", "red"); retry("new", "Failed to create account"); @@ -161,24 +161,24 @@ function cmd_send_passwd() redirect(apidb_fullurl("account.php?cmd=login")); } - $note = '(<b>Note</b>: accounts for <b>appdb</b>.winehq.org and <b>bugs</b>.winehq.org ' + $shNote = '(<b>Note</b>: accounts for <b>appdb</b>.winehq.org and <b>bugs</b>.winehq.org ' .'are separated, so You might need to <b>create second</b> account for appdb.)'; - $userid = User::exists($aClean['ext_email']); - $passwd = User::generate_passwd(); - $user = new User($userid); - if ($userid) + $iUserId = User::exists($aClean['ext_email']); + $sPasswd = User::generate_passwd(); + $oUser = new User($iUserId); + if ($iUserId) { - if ($user->update_password($passwd)) + if ($oUser->update_password($sPasswd)) { $sSubject = "Application DB Lost Password"; $sMsg = "We have received a request that you lost your password.\r\n"; $sMsg .= "We will create a new password for you. You can then change\r\n"; $sMsg .= "your password at the Preferences screen.\r\n"; - $sMsg .= "Your new password is: ".$passwd."\r\n"; + $sMsg .= "Your new password is: ".$sPasswd."\r\n"; - if (mail_appdb($user->sEmail, $sSubject ,$sMsg)) + if (mail_appdb($oUser->sEmail, $sSubject ,$sMsg)) { addmsg("Your new password has been emailed to you.", "green"); } @@ -195,7 +195,7 @@ function cmd_send_passwd() else { addmsg("Sorry, that user (".$aClean['ext_email'].") does not exist.<br><br>" - .$note, "red"); + .$shNote, "red"); } redirect(apidb_fullurl("account.php?cmd=login")); @@ -211,16 +211,16 @@ function cmd_do_login() $aClean['ext_email'] = makeSafe($_POST['ext_email']); $aClean['ext_password'] = makeSafe($_POST['ext_password']); - $user = new User(); - $result = $user->login($aClean['ext_email'], $aClean['ext_password']); + $oUser = new User(); + $iResult = $oUser->login($aClean['ext_email'], $aClean['ext_password']); - if($result == SUCCESS) + if($iResult == SUCCESS) { - addmsg("You are successfully logged in as '$user->sRealname'.", "green"); + addmsg("You are successfully logged in as '$oUser->sRealname'.", "green"); redirect(apidb_fullurl("index.php")); } else { - retry("login","Login failed ".$note); + retry("login","Login failed ".$shNote); } }

1 0

appdb/ ./account.php include/user.php
by WineHQ July 6, 2006

July 6, 2006

ChangeSet ID: 26194 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/05 22:37:50 Modified files: . : account.php include : user.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Move $_SESSION['current'] manipulation into user class. Add user::logout() to keep user::login() and logout() symmetrical Patch: http://cvs.winehq.org/patch.py?id=26194 Old revision New revision Changes Path 1.22 1.23 +7 -4 appdb/account.php 1.72 1.73 +13 -0 appdb/include/user.php Index: appdb/account.php diff -u -p appdb/account.php:1.22 appdb/account.php:1.23 --- appdb/account.php:1.22 6 Jul 2006 3:37:50 -0000 +++ appdb/account.php 6 Jul 2006 3:37:50 -0000 @@ -54,7 +54,13 @@ function do_account($cmd = null) exit; case "logout": + /* if we are logged in, log us out */ + if($_SESSION['current']) + $_SESSION['current']->logout(); + + /* destroy all session variables */ $GLOBALS['session']->destroy(); + addmsg("You are successfully logged out.", "green"); redirect(apidb_fullurl("index.php")); exit; @@ -116,8 +122,7 @@ function cmd_do_new() if($result == SUCCESS) { /* if we can log the user in, log them in automatically */ - if($user->login($aClean['ext_email'], $aClean['ext_password']) == SUCCESS) - $_SESSION['current'] = $user; + $user->login($aClean['ext_email'], $aClean['ext_password']); addmsg("Account created! (".$aClean['ext_email'].")", "green"); redirect(apidb_fullurl()); @@ -211,13 +216,11 @@ function cmd_do_login() if($result == SUCCESS) { - $_SESSION['current'] = $user; addmsg("You are successfully logged in as '$user->sRealname'.", "green"); redirect(apidb_fullurl("index.php")); } else { retry("login","Login failed ".$note); - $_SESSION['current'] = ""; } } Index: appdb/include/user.php diff -u -p appdb/include/user.php:1.72 appdb/include/user.php:1.73 --- appdb/include/user.php:1.72 6 Jul 2006 3:37:50 -0000 +++ appdb/include/user.php 6 Jul 2006 3:37:50 -0000 @@ -75,11 +75,24 @@ class User { // Update timestamp and clear the inactivity flag if it was set query_parameters("UPDATE user_list SET stamp = ?, inactivity_warned = '?' WHERE userid='?'", "NOW()", "false", $this->iUserId); + + /* set the session variable for the current user to this user object */ + $_SESSION['current'] = $this; + return SUCCESS; } + + /* null out the session variable for the current user since we failed to login */ + $_SESSION['current'] = ""; return USER_LOGIN_FAILED; } + function logout() + { + /* null out the session current variable to log us out */ + $_SESSION['current'] = ""; + } + /* * Creates a new user.

1 0

wiki/winehq winehq.py
by Dimi Paun July 5, 2006

July 5, 2006

ChangeSet ID: 1152075624609997554755868 CVSROOT: /cvsroot/wine Module name: wiki Changes by: dimi(a)sc8-pr-cvs9.sourceforge.net 2006/07/04 22:00:24 Modified files: winehq : winehq.py Log message: Fix the new menu to look like all the others. Old revision New revision Changes Path 1.4 1.5 +6 -4 wiki/winehq/winehq.py Index: wiki/winehq/winehq.py diff -u -p wiki/winehq/winehq.py:1.4 wiki/winehq/winehq.py:1.5 --- wiki/winehq/winehq.py 5 Jul 2006 5: 0:24 -0000 +++ /dev/null 5 Jul 2006 5: 0:24 -0000 @@ -278,10 +278,12 @@ searchBlur(e); u'<div class="sidepanel">', self.sidetitle(_("WineHQ Menu")), u' <div class="sidecontent">', - u' <li><a href="http://www.winehq.org/"> WineHQ</a></li>', - u' <li><a href="http://appdb.winehq.org/"> AppDB</a></li>', - u' <li><a href="http://bugs.winehq.org/"> Bugzilla</a></li>', - u' <li><a href="http://wiki.winehq.org/"> Wine Wiki</a></li>', + u' <ul class="navibar">', + u' <li class="wikilink"><a href="http://www.winehq.org/">WineHQ</a></li>', + u' <li class="wikilink"><a href="http://appdb.winehq.org/">AppDB</a></li>', + u' <li class="wikilink"><a href="http://bugs.winehq.org/">Bugzilla</a></li>', + u' <li class="wikilink"><a href="http://wiki.winehq.org/">Wine Wiki</a></li>', + u' </ul>', u' </div>', u'</div>', ]

1 0

wiki/winehq winehq.py
by Dimi Paun July 5, 2006

July 5, 2006

ChangeSet ID: 1152074725423617532783286 CVSROOT: /cvsroot/wine Module name: wiki Changes by: dimi(a)sc8-pr-cvs9.sourceforge.net 2006/07/04 21:45:25 Modified files: winehq : winehq.py Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Update menus for all sites to have a common "WineHQ Menu". Old revision New revision Changes Path 1.3 1.4 +17 -0 wiki/winehq/winehq.py Index: wiki/winehq/winehq.py diff -u -p wiki/winehq/winehq.py:1.3 wiki/winehq/winehq.py:1.4 --- wiki/winehq/winehq.py 5 Jul 2006 4:45:25 -0000 +++ /dev/null 5 Jul 2006 4:45:25 -0000 @@ -271,6 +271,22 @@ searchBlur(e); ''' return html % args + def winepanel(self, d): + """ Create wiki panel """ + _ = self.request.getText + html = [ + u'<div class="sidepanel">', + self.sidetitle(_("WineHQ Menu")), + u' <div class="sidecontent">', + u' <li><a href="http://www.winehq.org/"> WineHQ</a></li>', + u' <li><a href="http://appdb.winehq.org/"> AppDB</a></li>', + u' <li><a href="http://bugs.winehq.org/"> Bugzilla</a></li>', + u' <li><a href="http://wiki.winehq.org/"> Wine Wiki</a></li>', + u' </div>', + u'</div>', + ] + return u'\n'.join(html) + def wikipanel(self, d): """ Create wiki panel """ _ = self.request.getText @@ -351,6 +367,7 @@ searchBlur(e); # Sidebar u'<div id="sidebar">', + self.winepanel(d), self.wikipanel(d), self.pagepanel(d), self.userpanel(d),

1 0