Ros-diffs April 2009

ros-diffs@reactos.org

25 participants
476 discussions

[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

[janderwald] 40582: - Partly implement SERVICE_CONFIG_FAILURE_ACTIONS in RQueryServiceConfig2W
by janderwald＠svn.reactos.org 18 Apr '09

18 Apr '09

Author: janderwald Date: Sat Apr 18 19:14:49 2009 New Revision: 40582 URL: http://svn.reactos.org/svn/reactos?rev=40582&view=rev Log: - Partly implement SERVICE_CONFIG_FAILURE_ACTIONS in RQueryServiceConfig2W Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Sat Apr 18 19:14:49 2009 @@ -4333,6 +4333,8 @@ HKEY hServiceKey = NULL; DWORD dwRequiredSize; LPWSTR lpDescription = NULL; + LPWSTR lpFailureCommand = NULL; + LPWSTR lpRebootMessage = NULL; DPRINT("RQueryServiceConfig2W() called\n"); @@ -4397,14 +4399,67 @@ } else if (dwInfoLevel & SERVICE_CONFIG_FAILURE_ACTIONS) { + LPWSTR lpStr; + LPSERVICE_FAILURE_ACTIONSW lpFailureActions = (LPSERVICE_FAILURE_ACTIONSW)lpBuffer; + UNIMPLEMENTED; - dwError = ERROR_CALL_NOT_IMPLEMENTED; + + dwError = ScmReadString(hServiceKey, + L"FailureCommand", + &lpFailureCommand); + + dwError = ScmReadString(hServiceKey, + L"RebootMessage", + &lpRebootMessage); + + dwRequiredSize = sizeof(SERVICE_FAILURE_ACTIONSW); + + if (lpFailureCommand) + dwRequiredSize += (wcslen(lpFailureCommand) + 1) * sizeof(WCHAR); + + if (lpRebootMessage) + dwRequiredSize += (wcslen(lpRebootMessage) + 1) * sizeof(WCHAR); + + if (cbBufSize < dwRequiredSize) + { + *pcbBytesNeeded = dwRequiredSize; + dwError = ERROR_INSUFFICIENT_BUFFER; + goto done; + } + + lpFailureActions->cActions = 0; + lpFailureActions->dwResetPeriod = 0; + lpFailureActions->lpCommand = NULL; + lpFailureActions->lpRebootMsg = NULL; + lpFailureActions->lpsaActions = NULL; + + lpStr = (LPWSTR)(lpFailureActions + 1); + if (lpRebootMessage) + { + wcscpy(lpStr, lpRebootMessage); + lpFailureActions->lpRebootMsg = (LPWSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpRebootMessage); + lpStr += wcslen(lpRebootMessage) + 1; + } + + if (lpFailureCommand) + { + wcscpy(lpStr, lpFailureCommand); + lpFailureActions->lpCommand = (LPWSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpFailureCommand); + lpStr += wcslen(lpRebootMessage) + 1; + } + dwError = STATUS_SUCCESS; goto done; } done: if (lpDescription != NULL) HeapFree(GetProcessHeap(), 0, lpDescription); + + if (lpRebootMessage != NULL) + HeapFree(GetProcessHeap(), 0, lpRebootMessage); + + if (lpFailureCommand != NULL) + HeapFree(GetProcessHeap(), 0, lpFailureCommand); if (hServiceKey != NULL) RegCloseKey(hServiceKey);

1 0

[cfinck] 40581: Hack: Add the APPDATA variable to the environment when logging in. Used to be in trunk, but was reverted there, because it's also accessible via CreateEnvironmentBlock under Windows. Need more time for researching the right thing to do here.
by cfinck＠svn.reactos.org 18 Apr '09

18 Apr '09

Author: cfinck Date: Sat Apr 18 19:08:52 2009 New Revision: 40581 URL: http://svn.reactos.org/svn/reactos?rev=40581&view=rev Log: Hack: Add the APPDATA variable to the environment when logging in. Used to be in trunk, but was reverted there, because it's also accessible via CreateEnvironmentBlock under Windows. Need more time for researching the right thing to do here. 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 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] Sat Apr 18 19:08:52 2009 @@ -175,6 +175,9 @@ 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); @@ -218,6 +221,18 @@ 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) { @@ -263,6 +278,8 @@ 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] Sat Apr 18 19:08:52 2009 @@ -39,6 +39,7 @@ #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] Sat Apr 18 19:08:52 2009 @@ -9,6 +9,7 @@ <library>advapi32</library> <library>userenv</library> <library>secur32</library> + <library>shell32</library> <file>sas.c</file> <file>screensaver.c</file> <file>setup.c</file>

1 0

[cfinck] 40580: Hack: Hackfix the HitTest problem in mstsc as it was done for previous releases
by cfinck＠svn.reactos.org 18 Apr '09

18 Apr '09

Author: cfinck Date: Sat Apr 18 18:57:31 2009 New Revision: 40580 URL: http://svn.reactos.org/svn/reactos?rev=40580&view=rev Log: Hack: Hackfix the HitTest problem in mstsc as it was done for previous releases Modified: branches/ros-branch-0_3_9/reactos/base/applications/mstsc/connectdialog.c Modified: branches/ros-branch-0_3_9/reactos/base/applications/mstsc/connectdialog.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_9/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_9/reactos/base/applications/mstsc/connectdialog.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_9/reactos/base/applications/mstsc/connectdialog.c [iso-8859-1] Sat Apr 18 18:57:31 2009 @@ -198,19 +198,12 @@ static VOID -GeneralOnInit(HWND hwnd, - PINFO pInfo) -{ - SetWindowLongPtrW(hwnd, - GWLP_USERDATA, - (LONG_PTR)pInfo); - - pInfo->hGeneralPage = hwnd; - +GeneralOnInit(PINFO pInfo) +{ SetWindowPos(pInfo->hGeneralPage, NULL, - 2, - 22, + 13, + 110, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); @@ -256,13 +249,14 @@ WPARAM wParam, LPARAM lParam) { - PINFO pInfo = (PINFO)GetWindowLongPtrW(hDlg, + PINFO pInfo = (PINFO)GetWindowLongPtrW(GetParent(hDlg), GWLP_USERDATA); switch (message) { case WM_INITDIALOG: - GeneralOnInit(hDlg, (PINFO)lParam); + pInfo->hGeneralPage = hDlg; + GeneralOnInit(pInfo); return TRUE; case WM_COMMAND: @@ -746,23 +740,16 @@ static VOID -DisplayOnInit(HWND hwnd, - PINFO pInfo) +DisplayOnInit(PINFO pInfo) { DISPLAY_DEVICEW displayDevice; DWORD iDevNum = 0; BOOL GotDev = FALSE; - SetWindowLongPtrW(hwnd, - GWLP_USERDATA, - (LONG_PTR)pInfo); - - pInfo->hDisplayPage = hwnd; - SetWindowPos(pInfo->hDisplayPage, NULL, - 2, - 22, + 13, + 110, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); @@ -836,13 +823,14 @@ WPARAM wParam, LPARAM lParam) { - PINFO pInfo = (PINFO)GetWindowLongPtrW(hDlg, + PINFO pInfo = (PINFO)GetWindowLongPtrW(GetParent(hDlg), GWLP_USERDATA); switch (message) { case WM_INITDIALOG: - DisplayOnInit(hDlg, (PINFO)lParam); + pInfo->hDisplayPage = hDlg; + DisplayOnInit(pInfo); return TRUE; case WM_DRAWITEM: @@ -986,11 +974,10 @@ pInfo->hTab = GetDlgItem(hwnd, IDC_TAB); if (pInfo->hTab) { - if (CreateDialogParamW(hInst, - MAKEINTRESOURCEW(IDD_GENERAL), - pInfo->hTab, - GeneralDlgProc, - (LPARAM)pInfo)) + if (CreateDialogW(hInst, + MAKEINTRESOURCEW(IDD_GENERAL), + hwnd, + (DLGPROC)GeneralDlgProc)) { WCHAR str[256]; ZeroMemory(&item, sizeof(TCITEM)); @@ -1001,11 +988,10 @@ (void)TabCtrl_InsertItem(pInfo->hTab, 0, &item); } - if (CreateDialogParamW(hInst, - MAKEINTRESOURCEW(IDD_DISPLAY), - pInfo->hTab, - DisplayDlgProc, - (LPARAM)pInfo)) + if (CreateDialogW(hInst, + MAKEINTRESOURCEW(IDD_DISPLAY), + hwnd, + (DLGPROC)DisplayDlgProc)) { WCHAR str[256]; ZeroMemory(&item, sizeof(TCITEM));

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
48
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

Ros-diffs April 2009