Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dgoette] 383: update bugzilla subsystem with new db layout
by dgoette＠svn.reactos.org 19 Apr '09

19 Apr '09

Author: dgoette Date: Sun Apr 19 19:50:52 2009 New Revision: 383 URL: http://svn.reactos.org/svn/reactos?rev=383&view=rev Log: update bugzilla subsystem with new db layout Modified: branches/danny-web/www/www.reactos.org/bugzilla/Bugzilla/Auth/Login/ROSCMS.… branches/danny-web/www/www.reactos.org/bugzilla/Bugzilla/Auth/Verify/ROSCMS… Modified: branches/danny-web/www/www.reactos.org/bugzilla/Bugzilla/Auth/Login/ROSCMS.… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/b… ============================================================================== --- branches/danny-web/www/www.reactos.org/bugzilla/Bugzilla/Auth/Login/ROSCMS.… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/bugzilla/Bugzilla/Auth/Login/ROSCMS.… [iso-8859-1] Sun Apr 19 19:50:52 2009 @@ -80,29 +80,28 @@ } my $browser_agent_clean = $ENV{'HTTP_USER_AGENT'}; trick_taint($browser_agent_clean); - my $query = "SELECT m.map_subsys_userid, m.map_roscms_userid " . - " FROM $roscms_db_name.user_sessions s, " . - " $roscms_db_name.users u, " . - " $roscms_db_name.subsys_mappings m " . - " WHERE s.usersession_id = ? " . - " AND (s.usersession_expires IS NULL OR " . - " NOW() <= s.usersession_expires) " . - " AND u.user_id = s.usersession_user_id " . - " AND (u.user_setting_ipaddress = 'false' OR " . - " s.usersession_ipaddress = ?) " . - " AND (u.user_setting_browseragent = 'false' OR " . - " s.usersession_browseragent = ?) " . - " AND m.map_roscms_userid = s.usersession_user_id " . - " AND m.map_subsys_name = 'bugzilla'"; + my $query = "SELECT m.subsys_user_id, m.user_id " . + " FROM $roscms_db_name.roscms_accounts_sessions s " . + " JOIN $roscms_db_name.roscms_accounts u ON s.user_id = u.id " . + " JOIN $roscms_db_name.roscms_rel_accounts_subsys m ON m.user_id=u.id " . + " WHERE s.id = ? " . + " AND (s.expires IS NULL OR " . + " NOW() <= s.expires) " . + " AND (s.ip = 'false' OR " . + " s.ip = ?) " . + " AND (s.browseragent = 'false' OR " . + " s.browseragent = ?) " . + " AND m.subsys = 'bugzilla'"; + my @params = ($session_id_clean, $remote_addr_clean, $browser_agent_clean); ($user_id, $roscms_user_id) = $dbh->selectrow_array($query, undef, @params); if ($user_id) { # Update time of last session use - $query = "UPDATE $roscms_db_name.user_sessions " . - " SET usersession_expires = DATE_ADD(NOW(), INTERVAL 30 MINUTE) " . - " WHERE usersession_id = ? " . - " AND usersession_expires IS NOT NULL"; + $query = "UPDATE $roscms_db_name.roscms_accounts_sessions " . + " SET expires = DATE_ADD(NOW(), INTERVAL 30 MINUTE) " . + " WHERE id = ? " . + " AND expires IS NOT NULL"; @params = ($session_id_clean); $dbh->do($query, undef, @params); @@ -110,7 +109,7 @@ # We don't check the password explicitly here as we only deal with the session cookie. # To show the Verify module that it should trust us, we pass the MD5 password hash to it. This should be secure as long as we're the only one who knows this MD5 hash. my $username = user_id_to_login($user_id); - (my $md5_password) = $dbh->selectrow_array("SELECT user_roscms_password FROM $roscms_db_name.users WHERE user_id = ?", undef, $roscms_user_id); + (my $md5_password) = $dbh->selectrow_array("SELECT password FROM $roscms_db_name.roscms_accounts WHERE id = ?", undef, $roscms_user_id); # We need to set a parameter for the Auth::Persist::ROSCMS module $cgi->param('ROSCMS_login', 1); Modified: branches/danny-web/www/www.reactos.org/bugzilla/Bugzilla/Auth/Verify/ROSCMS… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/b… ============================================================================== --- branches/danny-web/www/www.reactos.org/bugzilla/Bugzilla/Auth/Verify/ROSCMS… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/bugzilla/Bugzilla/Auth/Verify/ROSCMS… [iso-8859-1] Sun Apr 19 19:50:52 2009 @@ -62,12 +62,11 @@ $md5_password = md5_hex($password); } - my $query = "SELECT u.user_roscms_password " . - "FROM $roscms_db_name.users u, " . - " $roscms_db_name.subsys_mappings m " . - "WHERE u.user_id = m.map_roscms_userid " . - " AND m.map_subsys_name = 'bugzilla' " . - " AND m.map_subsys_userid = ?"; + my $query = "SELECT u.password " . + "FROM $roscms_db_name.roscms_accounts u " . + "JOIN $roscms_db_name.roscms_rel_accounts_subsys m ON u.id=m.user_id " . + "WHERE m.subsys = 'bugzilla' " . + " AND m.subsys_user_id = ?"; (my $valid_md5_password) = $dbh->selectrow_array($query, undef, $user_id); return { failure => AUTH_LOGINFAILED }

1 0

[cfinck] 40588: - Revert r40581, this hack doesn't work anymore - Add a similar hack to CreateEnvironmentBlock, APPDATA is set properly now
by cfinck＠svn.reactos.org 19 Apr '09

19 Apr '09

Author: cfinck Date: Sun Apr 19 18:41:41 2009 New Revision: 40588 URL: http://svn.reactos.org/svn/reactos?rev=40588&view=rev Log: - Revert r40581, this hack doesn't work anymore - Add a similar hack to CreateEnvironmentBlock, APPDATA is set properly now Modified: branches/ros-branch-0_3_9/reactos/base/system/winlogon/sas.c branches/ros-branch-0_3_9/reactos/base/system/winlogon/winlogon.h branches/ros-branch-0_3_9/reactos/base/system/winlogon/winlogon.rbuild branches/ros-branch-0_3_9/reactos/dll/win32/userenv/environment.c Modified: branches/ros-branch-0_3_9/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_9/reactos/base/s… ============================================================================== --- branches/ros-branch-0_3_9/reactos/base/system/winlogon/sas.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_9/reactos/base/system/winlogon/sas.c [iso-8859-1] Sun Apr 19 18:41:41 2009 @@ -175,9 +175,6 @@ SIZE_T EnvBlockSize = 0, ProfileSize = 0; BOOLEAN Old; BOOL ret = FALSE; - UNICODE_STRING VariableName; - UNICODE_STRING VariableValue; - WCHAR AppDataPath[MAX_PATH]; /* Loading personal settings */ DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_LOADINGYOURPERSONALSETTINGS); @@ -221,18 +218,6 @@ WARN("WL: CreateEnvironmentBlock() failed\n"); goto cleanup; } - - /* Use SHGetFolderPathW for getting the AppData path */ - if(SHGetFolderPathW(NULL, CSIDL_APPDATA, Session->UserToken, SHGFP_TYPE_CURRENT, AppDataPath) == E_FAIL) - { - WARN("WL: SHGetFolderPathW() failed\n"); - goto cleanup; - } - - /* Some environment variables need to be set by winlogon (verified against Windows XP winlogon) */ - RtlInitUnicodeString(&VariableName, L"APPDATA"); - RtlInitUnicodeString(&VariableValue, AppDataPath); - RtlSetEnvironmentVariable((PWSTR*)&lpEnvironment, &VariableName, &VariableValue); if (Session->Profile->dwType == WLX_PROFILE_TYPE_V2_0 && Session->Profile->pszEnvironment) { @@ -278,8 +263,6 @@ DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_APPLYINGYOURPERSONALSETTINGS); UpdatePerUserSystemParameters(0, TRUE); - - /* FIXME: Set the "Volatile Environment" key for the new user */ /* Set default language */ if (!SetDefaultLanguage(TRUE)) Modified: branches/ros-branch-0_3_9/reactos/base/system/winlogon/winlogon.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_9/reactos/base/s… ============================================================================== --- branches/ros-branch-0_3_9/reactos/base/system/winlogon/winlogon.h [iso-8859-1] (original) +++ branches/ros-branch-0_3_9/reactos/base/system/winlogon/winlogon.h [iso-8859-1] Sun Apr 19 18:41:41 2009 @@ -39,7 +39,6 @@ #include <ntsecapi.h> #include <accctrl.h> #include <aclapi.h> -#include <shlobj.h> #include <reactos/winlogon.h> Modified: branches/ros-branch-0_3_9/reactos/base/system/winlogon/winlogon.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_9/reactos/base/s… ============================================================================== --- branches/ros-branch-0_3_9/reactos/base/system/winlogon/winlogon.rbuild [iso-8859-1] (original) +++ branches/ros-branch-0_3_9/reactos/base/system/winlogon/winlogon.rbuild [iso-8859-1] Sun Apr 19 18:41:41 2009 @@ -9,7 +9,6 @@ <library>advapi32</library> <library>userenv</library> <library>secur32</library> - <library>shell32</library> <file>sas.c</file> <file>screensaver.c</file> <file>setup.c</file> Modified: branches/ros-branch-0_3_9/reactos/dll/win32/userenv/environment.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_9/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_9/reactos/dll/win32/userenv/environment.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_9/reactos/dll/win32/userenv/environment.c [iso-8859-1] Sun Apr 19 18:41:41 2009 @@ -379,6 +379,9 @@ L"USERPROFILE", Buffer, FALSE); + + wcscat(Buffer, L"\\Application Data"); + SetUserEnvironmentVariable(lpEnvironment, L"APPDATA", Buffer, FALSE); } /* FIXME: Set 'USERDOMAIN' variable */

1 0

[dgoette] 382: move install folder to resources, leave a comment how to re-enable it
by dgoette＠svn.reactos.org 19 Apr '09

19 Apr '09

Author: dgoette Date: Sun Apr 19 13:01:53 2009 New Revision: 382 URL: http://svn.reactos.org/svn/reactos?rev=382&view=rev Log: move install folder to resources, leave a comment how to re-enable it Added: branches/danny-web/resources/forum/ branches/danny-web/resources/forum/install/ (props changed) - copied from r381, branches/danny-web/www/www.reactos.org/forum/install/ branches/danny-web/www/www.reactos.org/forum/INSTALL.txt (with props) Removed: branches/danny-web/www/www.reactos.org/forum/install/ Propchange: branches/danny-web/resources/forum/install/ ------------------------------------------------------------------------------ svn:mergeinfo = /trunk/web/reactos.org/htdocs/forum/install:288-336,343-346 Added: branches/danny-web/www/www.reactos.org/forum/INSTALL.txt URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/f… ============================================================================== --- branches/danny-web/www/www.reactos.org/forum/INSTALL.txt (added) +++ branches/danny-web/www/www.reactos.org/forum/INSTALL.txt [iso-8859-1] Sun Apr 19 13:01:53 2009 @@ -1,0 +1,1 @@ +If you want to install, you need to copy the install folder from ressources/forum to this folder and call this folder in your web-browser. Propchange: branches/danny-web/www/www.reactos.org/forum/INSTALL.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[dgoette] 381: remove preference for setting duration of sessions (it's asked at login every time)
by dgoette＠svn.reactos.org 19 Apr '09

19 Apr '09

Author: dgoette Date: Sun Apr 19 12:36:59 2009 New Revision: 381 URL: http://svn.reactos.org/svn/reactos?rev=381&view=rev Log: remove preference for setting duration of sessions (it's asked at login every time) Modified: branches/danny-web/www/www.reactos.org/roscms/convert3to4.sql branches/danny-web/www/www.reactos.org/roscms/lib/om/Login.class.php branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_User_Login.clas… branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_User_ProfileEdi… Modified: branches/danny-web/www/www.reactos.org/roscms/convert3to4.sql URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/convert3to4.sql [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/convert3to4.sql [iso-8859-1] Sun Apr 19 12:36:59 2009 @@ -585,7 +585,6 @@ match_session tinyint(1) NOT NULL default '1', match_browseragent tinyint(1) NOT NULL default '0', match_ip tinyint(1) NOT NULL default '0', - match_session_expire tinyint(1) NOT NULL default '1', activation varchar(200) collate utf8_unicode_ci NOT NULL COMMENT 'account / email', activation_password varchar(50) collate utf8_unicode_ci NOT NULL COMMENT 'code to activate the new password', created datetime NOT NULL, @@ -618,7 +617,6 @@ u.user_setting_multisession, u.user_setting_browseragent, u.user_setting_ipaddress, - u.user_setting_timeout, CONCAT(u.user_register_activation,u.user_email_activation) AS activation, u.user_roscms_getpwd_id, u.user_register, Modified: branches/danny-web/www/www.reactos.org/roscms/lib/om/Login.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/lib/om/Login.class.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/lib/om/Login.class.php [iso-8859-1] Sun Apr 19 12:36:59 2009 @@ -83,7 +83,7 @@ $stmt=&DBConnection::getInstance()->prepare("SELECT s.user_id, s.expires FROM ".ROSCMST_SESSIONS." s JOIN ".ROSCMST_USERS." u ON u.id = s.user_id WHERE s.id = :session_id AND (u.match_ip IS FALSE OR s.ip=:ip ) AND (u.match_browseragent IS FALSE OR s.browseragent = :agent) AND u.disabled IS FALSE LIMIT 1"); } else{ - $stmt=&DBConnection::getInstance()->prepare("SELECT m.subsys_user_id AS user_id, s.expires FROM ".ROSCMST_SESSIONS." s JOIN ".ROSCMST_USERS." u ON u.id = s.user_id JOIN ".ROSCMST_SUBSYS." m ON m.user_id = s.user_id WHERE s.id = :session_id AND (u.match_ip IS FALSE OR s.ip = :ip) AND (u.match_browseragent IS FALSE OR s.browseragent = :agent) AND m.subsys = :subsys AND u.disabled IS FALSE LIMIT 1"); + $stmt=&DBConnection::getInstance()->prepare("SELECT s.user_id, s.expires FROM ".ROSCMST_SESSIONS." s JOIN ".ROSCMST_USERS." u ON u.id = s.user_id JOIN ".ROSCMST_SUBSYS." m ON m.user_id = s.user_id WHERE s.id = :session_id AND (u.match_ip IS FALSE OR s.ip = :ip) AND (u.match_browseragent IS FALSE OR s.browseragent = :agent) AND m.subsys = :subsys AND u.disabled IS FALSE LIMIT 1"); $stmt->bindParam('subsys',$subsys,PDO::PARAM_STR); } $stmt->bindParam('session_id',$session_id,PDO::PARAM_INT); @@ -203,7 +203,7 @@ } // register granted access rights - $stmt=&DBConnection::getInstance()->prepare(" SELECT a.name_short FROM ".ROSCMST_AREA." a JOIN ".ROSCMST_AREA_ACCESS." r ON r.area_id = a.id JOIN ".ROSCMST_MEMBERSHIPS." m ON m.group_id = r.group_id WHERE m.user_id =:user_id"); + $stmt=&DBConnection::getInstance()->prepare("SELECT a.name_short FROM ".ROSCMST_AREA." a JOIN ".ROSCMST_AREA_ACCESS." r ON r.area_id = a.id JOIN ".ROSCMST_MEMBERSHIPS." m ON m.group_id = r.group_id WHERE m.user_id =:user_id"); $stmt->bindparam('user_id',$user['id'],PDO::PARAM_INT); $stmt->execute(); Modified: branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_User_Login.clas… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_User_Login.clas… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_User_Login.clas… [iso-8859-1] Sun Apr 19 12:36:59 2009 @@ -112,7 +112,7 @@ } // get user data - $stmt=&DBConnection::getInstance()->prepare("SELECT id, password, logins, disabled, match_session, match_session_expire FROM ".ROSCMST_USERS." WHERE name = :user_name LIMIT 1"); + $stmt=&DBConnection::getInstance()->prepare("SELECT id, password, logins, disabled, match_session FROM ".ROSCMST_USERS." WHERE name = :user_name LIMIT 1"); $stmt->bindParam('user_name',$user_name,PDO::PARAM_STR); $stmt->execute() or die('DB error (user login #1)!'); $user = $stmt->fetchOnce(); @@ -170,12 +170,12 @@ } // expire = NULL - if (isset($_POST['loginoption2']) && $_POST['loginoption2'] == 'notimeout' && $user['match_session_expire'] == true) { - $stmt=&DBConnection::getInstance()->prepare("INSERT INTO ".ROSCMST_SESSIONS." (id, user_id, expires, browseragent, ipaddress) VALUES (:session_id, :user_id, NULL, :useragent, :ip)"); + if (isset($_POST['loginoption2']) && $_POST['loginoption2'] == 'notimeout') { + $stmt=&DBConnection::getInstance()->prepare("INSERT INTO ".ROSCMST_SESSIONS." (id, user_id, expires, browseragent, ip) VALUES (:session_id, :user_id, NULL, :useragent, :ip)"); $cookie_time = 0x7fffffff; // 31.12.1969 } - // expire = 'DATE_ADD(NOW(), INTERVAL 60 MINUTE)'; + // expire = 'DATE_ADD(NOW(), INTERVAL 30 MINUTE)'; else { $stmt=&DBConnection::getInstance()->prepare("INSERT INTO ".ROSCMST_SESSIONS." (id, user_id, expires, browseragent, ip) VALUES (:session_id, :user_id, DATE_ADD(NOW(), INTERVAL 30 MINUTE), :useragent, :ip)"); $cookie_time = time() + 30 * 60; Modified: branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_User_ProfileEdi… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_User_ProfileEdi… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_User_ProfileEdi… [iso-8859-1] Sun Apr 19 12:36:59 2009 @@ -73,7 +73,7 @@ <div class="corner_TR"></div> </div>'); - $stmt=&DBConnection::getInstance()->prepare("SELECT id, name, fullname, email, activation, homepage, country_id, lang_id, timezone_id, occupation, match_session, match_browseragent, match_ip, match_session_expire FROM ".ROSCMST_USERS." WHERE id = :user_id LIMIT 1"); + $stmt=&DBConnection::getInstance()->prepare("SELECT id, name, fullname, email, activation, homepage, country_id, lang_id, timezone_id, occupation, match_session, match_browseragent, match_ip FROM ".ROSCMST_USERS." WHERE id = :user_id LIMIT 1"); $stmt->bindParam('user_id',ThisUser::getInstance()->id(),PDO::PARAM_INT); $stmt->execute(); $profile = $stmt->fetchOnce(); @@ -145,7 +145,7 @@ } // update account data - $stmt=&DBConnection::getInstance()->prepare("UPDATE ".ROSCMST_USERS." SET modified = NOW( ) , fullname = :fullname, homepage = :website, lang_id = :language, country_id = :country, timezone_id = :timezone, occupation = :occupation, match_session = :setting_multisession, match_browseragent = :setting_browser, match_ip = :setting_ip, match_session_expire = :setting_timeout WHERE id = :user_id LIMIT 1"); + $stmt=&DBConnection::getInstance()->prepare("UPDATE ".ROSCMST_USERS." SET modified = NOW( ) , fullname = :fullname, homepage = :website, lang_id = :language, country_id = :country, timezone_id = :timezone, occupation = :occupation, match_session = :setting_multisession, match_browseragent = :setting_browser, match_ip = :setting_ip WHERE id = :user_id LIMIT 1"); $stmt->bindParam('fullname',htmlspecialchars($_POST['userfullname']),PDO::PARAM_STR); $stmt->bindParam('website',$_POST['userwebsite'],PDO::PARAM_STR); $stmt->bindParam('language',$_POST['language'],PDO::PARAM_INT); @@ -155,7 +155,6 @@ $stmt->bindValue('setting_multisession',isset($_POST['loginoption1']),PDO::PARAM_BOOL); $stmt->bindValue('setting_browser',isset($_POST['loginoption2']),PDO::PARAM_BOOL); $stmt->bindValue('setting_ip',isset($_POST['loginoption3']),PDO::PARAM_BOOL); - $stmt->bindValue('setting_timeout',isset($_POST['loginoption4']),PDO::PARAM_BOOL); $stmt->bindParam('user_id',$profile['id'],PDO::PARAM_INT); $stmt->execute(); @@ -338,9 +337,6 @@ <br /> <input name="loginoption3" style="width:auto;" type="checkbox" id="loginoption3" value="true"'.((isset($_POST['loginoption3']) || (empty($_POST['registerpost']) && $profile['match_ip'] == true)) ? ' checked="checked"' : '').' tabindex="13" /> <label style="display:inline;" for="loginoption3">IP Address Check</label> - <br /> - <input name="loginoption4" style="width:auto;" type="checkbox" id="loginoption4" value="true"'.((isset($_POST['loginoption4']) || (empty($_POST['registerpost']) && $profile['match_session_expire'] == true)) ? ' checked="checked"' : '').' tabindex="14" /> - <label style="display:inline;" for="loginoption4">Log me on automatically</label> </fieldset> <div class="field">

1 0

[cgutman] 40587: - Print the current and maximum lookahead to aid in debugging certain miniport drivers
by cgutman＠svn.reactos.org 19 Apr '09

19 Apr '09

Author: cgutman Date: Sun Apr 19 08:20:09 2009 New Revision: 40587 URL: http://svn.reactos.org/svn/reactos?rev=40587&view=rev Log: - Print the current and maximum lookahead to aid in debugging certain miniport drivers Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Sun Apr 19 08:20:09 2009 @@ -1608,6 +1608,10 @@ return NdisStatus; } + + NDIS_DbgPrint(MIN_TRACE, ("Current lookahead is %ld\n", Adapter->NdisMiniportBlock.CurrentLookahead)); + NDIS_DbgPrint(MIN_TRACE, ("Maximum lookahead is %ld\n", Adapter->NdisMiniportBlock.MaximumLookahead)); + NdisStatus = MiniQueryInformation(Adapter, OID_GEN_MAXIMUM_SEND_PACKETS, sizeof(ULONG), &Adapter->NdisMiniportBlock.MaxSendPackets, &BytesWritten);

1 0

[cgutman] 40586: - Stub MiniSetComplete and MiniQueryComplete - Register more handlers
by cgutman＠svn.reactos.org 19 Apr '09

19 Apr '09

Author: cgutman Date: Sun Apr 19 07:35:06 2009 New Revision: 40586 URL: http://svn.reactos.org/svn/reactos?rev=40586&view=rev Log: - Stub MiniSetComplete and MiniQueryComplete - Register more handlers Modified: trunk/reactos/drivers/network/ndis/include/protocol.h trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/include/protocol.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/inclu… ============================================================================== --- trunk/reactos/drivers/network/ndis/include/protocol.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/include/protocol.h [iso-8859-1] Sun Apr 19 07:35:06 2009 @@ -49,6 +49,12 @@ PLOGICAL_ADAPTER Adapter, PNDIS_PACKET Packet); +VOID NTAPI +ProSendPackets( + IN NDIS_HANDLE NdisBindingHandle, + IN PPNDIS_PACKET PacketArray, + IN UINT NumberOfPackets); + #endif /* __PROTOCOL_H */ /* EOF */ Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Sun Apr 19 07:35:06 2009 @@ -257,6 +257,22 @@ KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); NDIS_DbgPrint(MAX_TRACE, ("Leaving.\n")); +} + +VOID NTAPI +MiniQueryComplete( + IN NDIS_HANDLE MiniportAdapterHandle, + IN NDIS_STATUS Status) +{ + UNIMPLEMENTED; +} + +VOID NTAPI +MiniSetComplete( + IN NDIS_HANDLE MiniportAdapterHandle, + IN NDIS_STATUS Status) +{ + UNIMPLEMENTED; } @@ -1825,6 +1841,9 @@ Adapter->NdisMiniportBlock.PacketIndicateHandler= MiniIndicateReceivePacket; Adapter->NdisMiniportBlock.StatusHandler = MiniStatus; Adapter->NdisMiniportBlock.StatusCompleteHandler= MiniStatusComplete; + Adapter->NdisMiniportBlock.SendPacketsHandler = ProSendPackets; + Adapter->NdisMiniportBlock.QueryCompleteHandler = MiniQueryComplete; + Adapter->NdisMiniportBlock.SetCompleteHandler = MiniSetComplete; /* * Call MiniportInitialize.

1 0

[dgoette] 380: fix copy&paste failure
by dgoette＠svn.reactos.org 18 Apr '09

18 Apr '09

Author: dgoette Date: Sat Apr 18 23:20:56 2009 New Revision: 380 URL: http://svn.reactos.org/svn/reactos?rev=380&view=rev Log: fix copy&paste failure Modified: branches/danny-web/www/www.reactos.org/forum/includes/auth/auth_roscms.php Modified: branches/danny-web/www/www.reactos.org/forum/includes/auth/auth_roscms.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/f… ============================================================================== --- branches/danny-web/www/www.reactos.org/forum/includes/auth/auth_roscms.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/forum/includes/auth/auth_roscms.php [iso-8859-1] Sat Apr 18 23:20:56 2009 @@ -67,7 +67,7 @@ global $config; // Check if our current RosCMS login is (still) valid, check the session expiration time and perform session cleanups. - $valid_login = (Subsystem_PHPBB::in(Login::REQUIRED, $config['script_path']) != 0); + $valid_login = (Subsystem_PHPBB::in(Login::OPTIONAL, $config['script_path']) != 0); // If we have a valid login, but the phpBB user ID is still ANONYMOUS, the user was logged in to RosCMS, but not yet to phpBB. // So do that now. @@ -83,9 +83,9 @@ global $db, $config; // Get the User ID of the logged in user (if any), check the session expiration time and perform session cleanups. - $userid = (int)Subsystem_PHPBB::in(Login::REQUIRED, $config['script_path']); + $userid = (int)Subsystem_PHPBB::in(Login::OPTIONAL, $config['script_path']); - if($userid) + if($userid > 0) { // Return the phpBB user row if a user is logged in. $sql = "SELECT * FROM " . USERS_TABLE . " WHERE user_id = $userid";

1 0

[cgutman] 40585: - Return a better status for STATUS_CANCELLED, STATUS_FILE_CLOSED, and STATUS_REMOTE_NOT_LISTENING
by cgutman＠svn.reactos.org 18 Apr '09

18 Apr '09

Author: cgutman Date: Sat Apr 18 21:00:54 2009 New Revision: 40585 URL: http://svn.reactos.org/svn/reactos?rev=40585&view=rev Log: - Return a better status for STATUS_CANCELLED, STATUS_FILE_CLOSED, and STATUS_REMOTE_NOT_LISTENING Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Sat Apr 18 21:00:54 2009 @@ -320,6 +320,7 @@ if( ReturnedBytes ) *ReturnedBytes = Received; break; + case STATUS_FILE_CLOSED: case STATUS_END_OF_FILE: *Errno = WSAESHUTDOWN; break; @@ -342,24 +343,20 @@ break; case STATUS_REMOTE_NOT_LISTENING: DbgPrint("MSAFD: STATUS_REMOTE_NOT_LISTENING\n"); - *Errno = WSAECONNRESET; + *Errno = WSAECONNREFUSED; break; case STATUS_NETWORK_UNREACHABLE: DbgPrint("MSAFD: STATUS_NETWORK_UNREACHABLE\n"); *Errno = WSAENETUNREACH; break; - case STATUS_FILE_CLOSED: - DbgPrint("MSAFD: STATUS_FILE_CLOSED\n"); - *Errno = WSAENOTSOCK; - break; case STATUS_INVALID_PARAMETER: DbgPrint("MSAFD: STATUS_INVALID_PARAMETER\n"); *Errno = WSAEINVAL; break; - case STATUS_CANCELLED: - DbgPrint("MSAFD: STATUS_CANCELLED\n"); - *Errno = WSAENOTSOCK; - break; + case STATUS_CANCELLED: + DbgPrint("MSAFD: STATUS_CANCELLED\n"); + *Errno = WSA_OPERATION_ABORTED; + break; default: DbgPrint("MSAFD: Error %x is unknown\n", Status); *Errno = WSAEINVAL;

1 0

[gschneider] 40584: - Don't crash copying from a null pointer in a non client size calculation - Several thousand more user32 win winetests should be executed now
by gschneider＠svn.reactos.org 18 Apr '09

18 Apr '09

Author: gschneider Date: Sat Apr 18 20:25:18 2009 New Revision: 40584 URL: http://svn.reactos.org/svn/reactos?rev=40584&view=rev Log: - Don't crash copying from a null pointer in a non client size calculation - Several thousand more user32 win winetests should be executed now Modified: trunk/reactos/dll/win32/user32/windows/nonclient.c Modified: trunk/reactos/dll/win32/user32/windows/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/n… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/nonclient.c [iso-8859-1] Sat Apr 18 20:25:18 2009 @@ -502,7 +502,13 @@ DWORD Style = GetClassLongW(hWnd, GCL_STYLE); DWORD ExStyle; SIZE WindowBorders; - RECT OrigRect = *Rect; + RECT OrigRect; + + if (Rect == NULL) + { + return Result; + } + OrigRect = *Rect; if (CalcSizeStruct) {

1 0

[cgutman] 40583: - Handle STATUS_NETWORK_UNREACHABLE
by cgutman＠svn.reactos.org 18 Apr '09

18 Apr '09

Author: cgutman Date: Sat Apr 18 19:35:34 2009 New Revision: 40583 URL: http://svn.reactos.org/svn/reactos?rev=40583&view=rev Log: - Handle STATUS_NETWORK_UNREACHABLE Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Sat Apr 18 19:35:34 2009 @@ -343,6 +343,10 @@ case STATUS_REMOTE_NOT_LISTENING: DbgPrint("MSAFD: STATUS_REMOTE_NOT_LISTENING\n"); *Errno = WSAECONNRESET; + break; + case STATUS_NETWORK_UNREACHABLE: + DbgPrint("MSAFD: STATUS_NETWORK_UNREACHABLE\n"); + *Errno = WSAENETUNREACH; break; case STATUS_FILE_CLOSED: DbgPrint("MSAFD: STATUS_FILE_CLOSED\n");

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs