Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 23503: Implement CreateWellKnownSid and IsWellKnownSid, by ripping the Wine implementation (created by Robert Reif)
by hpoussin＠svn.reactos.org 06 Aug '06

06 Aug '06

Author: hpoussin Date: Sun Aug 6 22:22:36 2006 New Revision: 23503 URL: http://svn.reactos.org/svn/reactos?rev=23503&view=rev Log: Implement CreateWellKnownSid and IsWellKnownSid, by ripping the Wine implementation (created by Robert Reif) Modified: trunk/reactos/dll/win32/advapi32/misc/logon.c trunk/reactos/dll/win32/advapi32/sec/sid.c trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/dll/win32/advapi32/misc/logon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/lo… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/logon.c (original) +++ trunk/reactos/dll/win32/advapi32/misc/logon.c Sun Aug 6 22:22:36 2006 @@ -666,7 +666,7 @@ DPRINT ("SamGetUserSid() failed\n"); RtlAllocateAndInitializeSid (&SystemAuthority, 5, - SECURITY_NT_NON_UNIQUE_RID, + SECURITY_NT_NON_UNIQUE, 0x12345678, 0x12345678, 0x12345678, Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sid… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/sid.c (original) +++ trunk/reactos/dll/win32/advapi32/sec/sid.c Sun Aug 6 22:22:36 2006 @@ -31,6 +31,63 @@ DWORD value; } ACEFLAG, *LPACEFLAG; +typedef struct _MAX_SID +{ + /* same fields as struct _SID */ + BYTE Revision; + BYTE SubAuthorityCount; + SID_IDENTIFIER_AUTHORITY IdentifierAuthority; + DWORD SubAuthority[SID_MAX_SUB_AUTHORITIES]; +} MAX_SID; + +typedef struct WELLKNOWNSID +{ + WCHAR wstr[2]; + WELL_KNOWN_SID_TYPE Type; + MAX_SID Sid; +} WELLKNOWNSID; + +static const WELLKNOWNSID WellKnownSids[] = +{ + { {0,0}, WinNullSid, { SID_REVISION, 1, { SECURITY_NULL_SID_AUTHORITY }, { SECURITY_NULL_RID } } }, + { {'W','D'}, WinWorldSid, { SID_REVISION, 1, { SECURITY_WORLD_SID_AUTHORITY }, { SECURITY_WORLD_RID } } }, + { {0,0}, WinLocalSid, { SID_REVISION, 1, { SECURITY_LOCAL_SID_AUTHORITY }, { SECURITY_LOCAL_RID } } }, + { {'C','O'}, WinCreatorOwnerSid, { SID_REVISION, 1, { SECURITY_CREATOR_SID_AUTHORITY }, { SECURITY_CREATOR_OWNER_RID } } }, + { {'C','G'}, WinCreatorGroupSid, { SID_REVISION, 1, { SECURITY_CREATOR_SID_AUTHORITY }, { SECURITY_CREATOR_GROUP_RID } } }, + { {0,0}, WinCreatorOwnerServerSid, { SID_REVISION, 1, { SECURITY_CREATOR_SID_AUTHORITY }, { SECURITY_CREATOR_OWNER_SERVER_RID } } }, + { {0,0}, WinCreatorGroupServerSid, { SID_REVISION, 1, { SECURITY_CREATOR_SID_AUTHORITY }, { SECURITY_CREATOR_GROUP_SERVER_RID } } }, + { {0,0}, WinNtAuthoritySid, { SID_REVISION, 0, { SECURITY_NT_AUTHORITY }, { } } }, + { {0,0}, WinDialupSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_DIALUP_RID } } }, + { {'N','U'}, WinNetworkSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_NETWORK_RID } } }, + { {0,0}, WinBatchSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_BATCH_RID } } }, + { {'I','U'}, WinInteractiveSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_INTERACTIVE_RID } } }, + { {'S','U'}, WinServiceSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_SERVICE_RID } } }, + { {'A','N'}, WinAnonymousSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_ANONYMOUS_LOGON_RID } } }, + { {0,0}, WinProxySid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_PROXY_RID } } }, + { {'E','D'}, WinEnterpriseControllersSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_ENTERPRISE_CONTROLLERS_RID } } }, + { {'P','S'}, WinSelfSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_PRINCIPAL_SELF_RID } } }, + { {'A','U'}, WinAuthenticatedUserSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_AUTHENTICATED_USER_RID } } }, + { {'R','C'}, WinRestrictedCodeSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_RESTRICTED_CODE_RID } } }, + { {0,0}, WinTerminalServerSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_TERMINAL_SERVER_RID } } }, + { {0,0}, WinRemoteLogonIdSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_REMOTE_LOGON_RID } } }, + { {'S','Y'}, WinLocalSystemSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_LOCAL_SYSTEM_RID } } }, + { {'L','S'}, WinLocalServiceSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_LOCAL_SERVICE_RID } } }, + { {'N','S'}, WinNetworkServiceSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_NETWORK_SERVICE_RID } } }, + { {0,0}, WinBuiltinDomainSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID } } }, + { {'B','A'}, WinBuiltinAdministratorsSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ADMINS } } }, + { {'B','U'}, WinBuiltinUsersSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_USERS } } }, + { {'B','G'}, WinBuiltinGuestsSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_GUESTS } } }, + { {'P','U'}, WinBuiltinPowerUsersSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_POWER_USERS } } }, + { {'A','O'}, WinBuiltinAccountOperatorsSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ACCOUNT_OPS } } }, + { {'S','O'}, WinBuiltinSystemOperatorsSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_SYSTEM_OPS } } }, + { {'P','O'}, WinBuiltinPrintOperatorsSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_PRINT_OPS } } }, + { {'B','O'}, WinBuiltinBackupOperatorsSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_BACKUP_OPS } } }, + { {'R','E'}, WinBuiltinReplicatorSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_REPLICATOR } } }, + { {'R','U'}, WinBuiltinPreWindows2000CompatibleAccessSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_PREW2KCOMPACCESS } } }, + { {'R','D'}, WinBuiltinRemoteDesktopUsersSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_REMOTE_DESKTOP_USERS } } }, + { {'N','O'}, WinBuiltinNetworkConfigurationOperatorsSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_NETWORK_CONFIGURATION_OPS } } }, +}; + static const SID sidWorld = { SID_REVISION, 1, { SECURITY_WORLD_SID_AUTHORITY} , { SECURITY_WORLD_RID } }; /* @@ -67,6 +124,57 @@ static const WCHAR SDDL_INHERITED[] = {'I','D',0}; static const WCHAR SDDL_AUDIT_SUCCESS[] = {'S','A',0}; static const WCHAR SDDL_AUDIT_FAILURE[] = {'F','A',0}; + +static const char * debugstr_sid(PSID sid) +{ + int auth = 0; + SID * psid = (SID *)sid; + + if (psid == NULL) + return "(null)"; + + auth = psid->IdentifierAuthority.Value[5] + + (psid->IdentifierAuthority.Value[4] << 8) + + (psid->IdentifierAuthority.Value[3] << 16) + + (psid->IdentifierAuthority.Value[2] << 24); + + switch (psid->SubAuthorityCount) { + case 0: + return wine_dbg_sprintf("S-%d-%d", psid->Revision, auth); + case 1: + return wine_dbg_sprintf("S-%d-%d-%lu", psid->Revision, auth, + psid->SubAuthority[0]); + case 2: + return wine_dbg_sprintf("S-%d-%d-%lu-%lu", psid->Revision, auth, + psid->SubAuthority[0], psid->SubAuthority[1]); + case 3: + return wine_dbg_sprintf("S-%d-%d-%lu-%lu-%lu", psid->Revision, auth, + psid->SubAuthority[0], psid->SubAuthority[1], psid->SubAuthority[2]); + case 4: + return wine_dbg_sprintf("S-%d-%d-%lu-%lu-%lu-%lu", psid->Revision, auth, + psid->SubAuthority[0], psid->SubAuthority[1], psid->SubAuthority[2], + psid->SubAuthority[3]); + case 5: + return wine_dbg_sprintf("S-%d-%d-%lu-%lu-%lu-%lu-%lu", psid->Revision, auth, + psid->SubAuthority[0], psid->SubAuthority[1], psid->SubAuthority[2], + psid->SubAuthority[3], psid->SubAuthority[4]); + case 6: + return wine_dbg_sprintf("S-%d-%d-%lu-%lu-%lu-%lu-%lu-%lu", psid->Revision, auth, + psid->SubAuthority[3], psid->SubAuthority[1], psid->SubAuthority[2], + psid->SubAuthority[0], psid->SubAuthority[4], psid->SubAuthority[5]); + case 7: + return wine_dbg_sprintf("S-%d-%d-%lu-%lu-%lu-%lu-%lu-%lu-%lu", psid->Revision, auth, + psid->SubAuthority[0], psid->SubAuthority[1], psid->SubAuthority[2], + psid->SubAuthority[3], psid->SubAuthority[4], psid->SubAuthority[5], + psid->SubAuthority[6]); + case 8: + return wine_dbg_sprintf("S-%d-%d-%lu-%lu-%lu-%lu-%lu-%lu-%lu-%lu", psid->Revision, auth, + psid->SubAuthority[0], psid->SubAuthority[1], psid->SubAuthority[2], + psid->SubAuthority[3], psid->SubAuthority[4], psid->SubAuthority[5], + psid->SubAuthority[6], psid->SubAuthority[7]); + } + return "(too-big)"; +} /* set last error code from NT status and get the proper boolean return value */ /* used for functions that are a simple wrapper around the corresponding ntdll API */ @@ -1020,7 +1128,36 @@ OUT PSID pSid, IN OUT DWORD* cbSid) { - FIXME("unimplemented!\n", __FUNCTION__); + int i; + TRACE("(%d, %s, %p, %p)\n", WellKnownSidType, debugstr_sid(DomainSid), pSid, cbSid); + + if (DomainSid != NULL) { + FIXME("Only local computer supported!\n"); + SetLastError(ERROR_INVALID_PARAMETER); /* FIXME */ + return FALSE; + } + + if (cbSid == NULL || pSid == NULL) { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + for (i = 0; i < sizeof(WellKnownSids)/sizeof(WellKnownSids[0]); i++) { + if (WellKnownSids[i].Type == WellKnownSidType) { + DWORD length = GetSidLengthRequired(WellKnownSids[i].Sid.SubAuthorityCount); + + if (*cbSid < length) { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } + + CopyMemory(pSid, &WellKnownSids[i].Sid.Revision, length); + *cbSid = length; + return TRUE; + } + } + + SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } @@ -1032,7 +1169,14 @@ IsWellKnownSid(IN PSID pSid, IN WELL_KNOWN_SID_TYPE WellKnownSidType) { - FIXME("unimplemented!\n", __FUNCTION__); + int i; + TRACE("(%s, %d)\n", debugstr_sid(pSid), WellKnownSidType); + + for (i = 0; i < sizeof(WellKnownSids)/sizeof(WellKnownSids[0]); i++) + if (WellKnownSids[i].Type == WellKnownSidType) + if (EqualSid(pSid, (PSID)&(WellKnownSids[i].Sid.Revision))) + return TRUE; + return FALSE; } Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/winnt.h (original) +++ trunk/reactos/include/psdk/winnt.h Sun Aug 6 22:22:36 2006 @@ -529,19 +529,39 @@ #define SECURITY_LOGON_IDS_RID_COUNT 0x3 #define SID_REVISION 1 -#define DOMAIN_USER_RID_ADMIN 0x1F4L -#define DOMAIN_USER_RID_GUEST 0x1F5L -#define DOMAIN_GROUP_RID_ADMINS 0x200L -#define DOMAIN_GROUP_RID_USERS 0x201L -#define DOMAIN_ALIAS_RID_ADMINS 0x220L -#define DOMAIN_ALIAS_RID_USERS 0x221L -#define DOMAIN_ALIAS_RID_GUESTS 0x222L -#define DOMAIN_ALIAS_RID_POWER_USERS 0x223L -#define DOMAIN_ALIAS_RID_ACCOUNT_OPS 0x224L -#define DOMAIN_ALIAS_RID_SYSTEM_OPS 0x225L -#define DOMAIN_ALIAS_RID_PRINT_OPS 0x226L -#define DOMAIN_ALIAS_RID_BACKUP_OPS 0x227L -#define DOMAIN_ALIAS_RID_REPLICATOR 0x228L + +#define FOREST_USER_RID_MAX 0x000001F3L +#define DOMAIN_USER_RID_ADMIN 0x000001F4L +#define DOMAIN_USER_RID_GUEST 0x000001F5L +#define DOMAIN_USER_RID_KRBTGT 0x000001F6L +#define DOMAIN_USER_RID_MAX 0x000003E7L + +#define DOMAIN_GROUP_RID_ADMINS 0x00000200L +#define DOMAIN_GROUP_RID_USERS 0x00000201L +#define DOMAIN_GROUP_RID_GUESTS 0x00000202L + +#define DOMAIN_ALIAS_RID_ADMINS 0x00000220L +#define DOMAIN_ALIAS_RID_USERS 0x00000221L +#define DOMAIN_ALIAS_RID_GUESTS 0x00000222L +#define DOMAIN_ALIAS_RID_POWER_USERS 0x00000223L + +#define DOMAIN_ALIAS_RID_ACCOUNT_OPS 0x00000224L +#define DOMAIN_ALIAS_RID_SYSTEM_OPS 0x00000225L +#define DOMAIN_ALIAS_RID_PRINT_OPS 0x00000226L +#define DOMAIN_ALIAS_RID_BACKUP_OPS 0x00000227L + +#define DOMAIN_ALIAS_RID_REPLICATOR 0x00000228L +#define DOMAIN_ALIAS_RID_RAS_SERVERS 0x00000229L +#define DOMAIN_ALIAS_RID_PREW2KCOMPACCESS 0x0000022AL +#define DOMAIN_ALIAS_RID_REMOTE_DESKTOP_USERS 0x0000022BL +#define DOMAIN_ALIAS_RID_NETWORK_CONFIGURATION_OPS 0x0000022CL +#define DOMAIN_ALIAS_RID_INCOMING_FOREST_TRUST_BUILDERS 0x0000022DL + +#define DOMAIN_ALIAS_RID_MONITORING_USERS 0x0000022EL +#define DOMAIN_ALIAS_RID_LOGGING_USERS 0x0000022FL +#define DOMAIN_ALIAS_RID_AUTHORIZATIONACCESS 0x00000230L +#define DOMAIN_ALIAS_RID_TS_LICENSE_SERVERS 0x00000231L +#define DOMAIN_ALIAS_RID_DCOM_USERS 0x00000232L typedef enum {

1 0

[hpoussin] 23502: Add more SID defines
by hpoussin＠svn.reactos.org 06 Aug '06

06 Aug '06

Author: hpoussin Date: Sun Aug 6 22:08:16 2006 New Revision: 23502 URL: http://svn.reactos.org/svn/reactos?rev=23502&view=rev Log: Add more SID defines Modified: trunk/reactos/include/psdk/winbase.h trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h (original) +++ trunk/reactos/include/psdk/winbase.h Sun Aug 6 22:08:16 2006 @@ -1225,6 +1225,7 @@ HANDLE WINAPI CreateWaitableTimerA(LPSECURITY_ATTRIBUTES,BOOL,LPCSTR); HANDLE WINAPI CreateWaitableTimerW(LPSECURITY_ATTRIBUTES,BOOL,LPCWSTR); #if (_WIN32_WINNT >= 0x0501) +BOOL WINAPI CreateWellKnownSid(WELL_KNOWN_SID_TYPE,PSID,PSID,DWORD*); BOOL WINAPI DeactivateActCtx(DWORD,ULONG_PTR); #endif BOOL WINAPI DebugActiveProcess(DWORD); @@ -1679,6 +1680,7 @@ BOOL WINAPI IsValidSecurityDescriptor(PSECURITY_DESCRIPTOR); BOOL WINAPI IsValidSid(PSID); #if (_WIN32_WINNT >= 0x0501) +BOOL WINAPI IsWellKnownSid(PSID,WELL_KNOWN_SID_TYPE); BOOL WINAPI IsWow64Process(HANDLE,PBOOL); #endif void WINAPI LeaveCriticalSection(LPCRITICAL_SECTION); Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/winnt.h (original) +++ trunk/reactos/include/psdk/winnt.h Sun Aug 6 22:08:16 2006 @@ -479,36 +479,55 @@ * SID_IDENTIFIER_AUTHORITY aNullSidAuthority = {SECURITY_NULL_SID_AUTHORITY}; */ #define SID_MAX_SUB_AUTHORITIES 15 -#define SECURITY_NULL_SID_AUTHORITY {0,0,0,0,0,0} -#define SECURITY_WORLD_SID_AUTHORITY {0,0,0,0,0,1} -#define SECURITY_LOCAL_SID_AUTHORITY {0,0,0,0,0,2} -#define SECURITY_CREATOR_SID_AUTHORITY {0,0,0,0,0,3} -#define SECURITY_NON_UNIQUE_AUTHORITY {0,0,0,0,0,4} -#define SECURITY_NT_AUTHORITY {0,0,0,0,0,5} -#define SECURITY_NULL_RID 0 -#define SECURITY_WORLD_RID (0x00000000L) -#define SECURITY_LOCAL_RID 0 -#define SECURITY_CREATOR_OWNER_RID 0 -#define SECURITY_CREATOR_GROUP_RID 1 -#define SECURITY_DIALUP_RID 1 -#define SECURITY_NETWORK_RID 2 -#define SECURITY_BATCH_RID 3 -#define SECURITY_INTERACTIVE_RID 4 -#define SECURITY_LOGON_IDS_RID 5 -#define SECURITY_SERVICE_RID 6 -#define SECURITY_LOCAL_SYSTEM_RID 18 -#define SECURITY_BUILTIN_DOMAIN_RID 32 -#define SECURITY_PRINCIPAL_SELF_RID 10 -#define SECURITY_CREATOR_OWNER_SERVER_RID 0x2 -#define SECURITY_CREATOR_GROUP_SERVER_RID 0x3 + +/* security entities */ +#define SECURITY_NULL_RID (0x00000000L) +#define SECURITY_WORLD_RID (0x00000000L) +#define SECURITY_LOCAL_RID (0X00000000L) + +#define SECURITY_NULL_SID_AUTHORITY {0,0,0,0,0,0} + +/* S-1-1 */ +#define SECURITY_WORLD_SID_AUTHORITY {0,0,0,0,0,1} + +/* S-1-2 */ +#define SECURITY_LOCAL_SID_AUTHORITY {0,0,0,0,0,2} + +/* S-1-3 */ +#define SECURITY_CREATOR_SID_AUTHORITY {0,0,0,0,0,3} +#define SECURITY_CREATOR_OWNER_RID (0x00000000L) +#define SECURITY_CREATOR_GROUP_RID (0x00000001L) +#define SECURITY_CREATOR_OWNER_SERVER_RID (0x00000002L) +#define SECURITY_CREATOR_GROUP_SERVER_RID (0x00000003L) + +/* S-1-4 */ +#define SECURITY_NON_UNIQUE_AUTHORITY {0,0,0,0,0,4} + +/* S-1-5 */ +#define SECURITY_NT_AUTHORITY {0,0,0,0,0,5} +#define SECURITY_DIALUP_RID 0x00000001L +#define SECURITY_NETWORK_RID 0x00000002L +#define SECURITY_BATCH_RID 0x00000003L +#define SECURITY_INTERACTIVE_RID 0x00000004L +#define SECURITY_LOGON_IDS_RID 0x00000005L +#define SECURITY_SERVICE_RID 0x00000006L +#define SECURITY_ANONYMOUS_LOGON_RID 0x00000007L +#define SECURITY_PROXY_RID 0x00000008L +#define SECURITY_ENTERPRISE_CONTROLLERS_RID 0x00000009L +#define SECURITY_SERVER_LOGON_RID SECURITY_ENTERPRISE_CONTROLLERS_RID +#define SECURITY_PRINCIPAL_SELF_RID 0x0000000AL +#define SECURITY_AUTHENTICATED_USER_RID 0x0000000BL +#define SECURITY_RESTRICTED_CODE_RID 0x0000000CL +#define SECURITY_TERMINAL_SERVER_RID 0x0000000DL +#define SECURITY_REMOTE_LOGON_RID 0x0000000EL +#define SECURITY_THIS_ORGANIZATION_RID 0x0000000FL +#define SECURITY_LOCAL_SYSTEM_RID 0x00000012L +#define SECURITY_LOCAL_SERVICE_RID 0x00000013L +#define SECURITY_NETWORK_SERVICE_RID 0x00000014L +#define SECURITY_NT_NON_UNIQUE 0x00000015L +#define SECURITY_BUILTIN_DOMAIN_RID 0x00000020L + #define SECURITY_LOGON_IDS_RID_COUNT 0x3 -#define SECURITY_ANONYMOUS_LOGON_RID 0x7 -#define SECURITY_PROXY_RID 0x8 -#define SECURITY_ENTERPRISE_CONTROLLERS_RID 0x9 -#define SECURITY_SERVER_LOGON_RID SECURITY_ENTERPRISE_CONTROLLERS_RID -#define SECURITY_AUTHENTICATED_USER_RID 0xB -#define SECURITY_RESTRICTED_CODE_RID 0xC -#define SECURITY_NT_NON_UNIQUE_RID 0x15 #define SID_REVISION 1 #define DOMAIN_USER_RID_ADMIN 0x1F4L #define DOMAIN_USER_RID_GUEST 0x1F5L

1 0

[hpoussin] 23501: Cleanup shutdown code path. Now, the user can logoff and logon again.
by hpoussin＠svn.reactos.org 06 Aug '06

06 Aug '06

Author: hpoussin Date: Sun Aug 6 19:47:04 2006 New Revision: 23501 URL: http://svn.reactos.org/svn/reactos?rev=23501&view=rev Log: Cleanup shutdown code path. Now, the user can logoff and logon again. Modified: trunk/reactos/base/system/winlogon/sas.c trunk/reactos/base/system/winlogon/wlx.c Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c (original) +++ trunk/reactos/base/system/winlogon/sas.c Sun Aug 6 19:47:04 2006 @@ -149,7 +149,10 @@ Session->Gina.Functions.WlxDisplaySASNotice(Session->Gina.Context); } if (WLX_SHUTTINGDOWN(wlxAction)) + { + Session->Gina.Functions.WlxShutdown(Session->Gina.Context, wlxAction); HandleShutdown(Session, wlxAction); + } break; case WLX_SAS_ACTION_TASKLIST: /* 0x07 */ SwitchDesktop(WLSession->ApplicationDesktop); @@ -256,128 +259,164 @@ static DWORD WINAPI LogoffShutdownThread(LPVOID Parameter) { - PLOGOFF_SHUTDOWN_DATA LSData = (PLOGOFF_SHUTDOWN_DATA) Parameter; - - if (! ImpersonateLoggedOnUser(LSData->Session->UserToken)) - { - DPRINT1("ImpersonateLoggedOnUser failed with error %d\n", GetLastError()); - return 0; - } - if (! ExitWindowsEx(EWX_INTERNAL_KILL_USER_APPS | (LSData->Flags & EWX_FLAGS_MASK) - | (EWX_LOGOFF == (LSData->Flags & EWX_ACTION_MASK) ? EWX_INTERNAL_FLAG_LOGOFF : 0), - 0)) - { - DPRINT1("Unable to kill user apps, error %d\n", GetLastError()); - RevertToSelf(); - return 0; - } - RevertToSelf(); - - /* This is not right (see top of reactos/dll/win32/user32/misc/exit.c), - * but this should be enough atm */ - switch (LSData->Flags & EWX_ACTION_MASK) - { - case EWX_SHUTDOWN: - NtShutdownSystem(ShutdownNoReboot); - break; - case EWX_REBOOT: - NtShutdownSystem(ShutdownReboot); - break; - default: - UNIMPLEMENTED; - } - - HeapFree(GetProcessHeap(), 0, LSData); - - return 1; + PLOGOFF_SHUTDOWN_DATA LSData = (PLOGOFF_SHUTDOWN_DATA) Parameter; + + if (!ImpersonateLoggedOnUser(LSData->Session->UserToken)) + { + ERR("ImpersonateLoggedOnUser failed with error %lu\n", GetLastError()); + return 0; + } + + /* Close processes of the interactive user */ + if (!ExitWindowsEx( + EWX_INTERNAL_KILL_USER_APPS | (LSData->Flags & EWX_FLAGS_MASK) | + (EWX_LOGOFF == (LSData->Flags & EWX_ACTION_MASK) ? EWX_INTERNAL_FLAG_LOGOFF : 0), + 0)) + { + ERR("Unable to kill user apps, error %lu\n", GetLastError()); + RevertToSelf(); + return 0; + } + + /* FIXME: Call ExitWindowsEx() to terminate COM processes */ + + RevertToSelf(); + + return 1; +} + +static NTSTATUS +CheckPrivilegeForRequestedAction( + IN UINT Action, + IN DWORD RequestingProcessId) +{ + HANDLE Process; + HANDLE Token; + BOOL CheckResult; + PPRIVILEGE_SET PrivSet; + + TRACE("CheckPrivilegeForRequestedAction(%u)\n", Action); + + if (Action == EWX_LOGOFF) + /* No privilege needed to log off */ + return STATUS_SUCCESS; + + /* Check for invalid arguments */ + if (Action != EWX_SHUTDOWN && Action != EWX_REBOOT && Action != EWX_POWEROFF) + { + ERR("Invalid exit action %u\n", Action); + return STATUS_INVALID_PARAMETER; + } + + Process = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, RequestingProcessId); + if (!Process) + { + WARN("OpenProcess() failed with error %lu\n", GetLastError()); + return STATUS_INVALID_HANDLE; + } + if (!OpenProcessToken(Process, TOKEN_QUERY, &Token)) + { + WARN("OpenProcessToken() failed with error %lu\n", GetLastError()); + CloseHandle(Process); + return STATUS_INVALID_HANDLE; + } + CloseHandle(Process); + PrivSet = HeapAlloc(GetProcessHeap(), 0, sizeof(PRIVILEGE_SET) + sizeof(LUID_AND_ATTRIBUTES)); + if (!PrivSet) + { + ERR("Failed to allocate mem for privilege set\n"); + CloseHandle(Token); + return STATUS_NO_MEMORY; + } + PrivSet->PrivilegeCount = 1; + PrivSet->Control = PRIVILEGE_SET_ALL_NECESSARY; + if (!LookupPrivilegeValue(NULL, SE_SHUTDOWN_NAME, &PrivSet->Privilege[0].Luid)) + { + WARN("LookupPrivilegeValue() failed with error %lu\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, PrivSet); + CloseHandle(Token); + return STATUS_UNSUCCESSFUL; + } + if (!PrivilegeCheck(Token, PrivSet, &CheckResult)) + { + WARN("PrivilegeCheck() failed with error %lu\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, PrivSet); + CloseHandle(Token); + return STATUS_ACCESS_DENIED; + } + HeapFree(GetProcessHeap(), 0, PrivSet); + CloseHandle(Token); + + if (!CheckResult) + { + WARN("SE_SHUTDOWN privilege not enabled\n"); + return STATUS_ACCESS_DENIED; + } } static LRESULT -HandleExitWindows(PWLSESSION Session, DWORD RequestingProcessId, UINT Flags) -{ - UINT Action; - HANDLE Process; - HANDLE Token; - HANDLE Thread; - BOOL CheckResult; - PPRIVILEGE_SET PrivSet; - PLOGOFF_SHUTDOWN_DATA LSData; - - /* Check parameters */ - Action = Flags & EWX_ACTION_MASK; - if (EWX_LOGOFF != Action && EWX_SHUTDOWN != Action && EWX_REBOOT != Action - && EWX_POWEROFF != Action) - { - DPRINT1("Invalid ExitWindows action 0x%x\n", Action); - return STATUS_INVALID_PARAMETER; - } - - /* Check privilege */ - if (EWX_LOGOFF != Action) - { - Process = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, RequestingProcessId); - if (NULL == Process) - { - DPRINT1("OpenProcess failed with error %d\n", GetLastError()); - return STATUS_INVALID_HANDLE; - } - if (! OpenProcessToken(Process, TOKEN_QUERY, &Token)) - { - DPRINT1("OpenProcessToken failed with error %d\n", GetLastError()); - CloseHandle(Process); - return STATUS_INVALID_HANDLE; - } - CloseHandle(Process); - PrivSet = HeapAlloc(GetProcessHeap(), 0, sizeof(PRIVILEGE_SET) + sizeof(LUID_AND_ATTRIBUTES)); - if (NULL == PrivSet) - { - DPRINT1("Failed to allocate mem for privilege set\n"); - CloseHandle(Token); - return STATUS_NO_MEMORY; - } - PrivSet->PrivilegeCount = 1; - PrivSet->Control = PRIVILEGE_SET_ALL_NECESSARY; - if (! LookupPrivilegeValue(NULL, SE_SHUTDOWN_NAME, &PrivSet->Privilege[0].Luid)) - { - DPRINT1("LookupPrivilegeValue failed with error %d\n", GetLastError()); - HeapFree(GetProcessHeap(), 0, PrivSet); - CloseHandle(Token); - return STATUS_UNSUCCESSFUL; - } - if (! PrivilegeCheck(Token, PrivSet, &CheckResult)) - { - DPRINT1("PrivilegeCheck failed with error %d\n", GetLastError()); - HeapFree(GetProcessHeap(), 0, PrivSet); - CloseHandle(Token); - return STATUS_ACCESS_DENIED; - } - HeapFree(GetProcessHeap(), 0, PrivSet); - CloseHandle(Token); - if (! CheckResult) - { - DPRINT1("SE_SHUTDOWN privilege not enabled\n"); - return STATUS_ACCESS_DENIED; - } - } - - LSData = HeapAlloc(GetProcessHeap(), 0, sizeof(LOGOFF_SHUTDOWN_DATA)); - if (NULL == LSData) - { - DPRINT1("Failed to allocate mem for thread data\n"); - return STATUS_NO_MEMORY; - } - LSData->Flags = Flags; - LSData->Session = Session; - Thread = CreateThread(NULL, 0, LogoffShutdownThread, (LPVOID) LSData, 0, NULL); - if (NULL == Thread) - { - DPRINT1("Unable to create shutdown thread, error %d\n", GetLastError()); - HeapFree(GetProcessHeap(), 0, LSData); - return STATUS_UNSUCCESSFUL; - } - CloseHandle(Thread); - - return 1; +HandleExitWindows( + IN OUT PWLSESSION Session, + IN DWORD RequestingProcessId, + IN UINT Flags) +{ + UINT Action; + PLOGOFF_SHUTDOWN_DATA LSData; + HANDLE hThread; + NTSTATUS Status; + + /* Check parameters */ + Action = Flags & EWX_ACTION_MASK; + if (Action != EWX_LOGOFF && + Action != EWX_SHUTDOWN && + Action != EWX_REBOOT && + Action != EWX_POWEROFF) + { + ERR("Invalid ExitWindows action 0x%x\n", Action); + return STATUS_INVALID_PARAMETER; + } + + /* Check privilege */ + Status = CheckPrivilegeForRequestedAction(Action, RequestingProcessId); + if (!NT_SUCCESS(Status)) + return Status; + + /* Prepare data for logoff/shutdown thread */ + LSData = HeapAlloc(GetProcessHeap(), 0, sizeof(LOGOFF_SHUTDOWN_DATA)); + if (!LSData) + { + ERR("Failed to allocate mem for thread data\n"); + return STATUS_NO_MEMORY; + } + LSData->Flags = Flags; + LSData->Session = Session; + + /* Run logoff/shutdown thread */ + hThread = CreateThread(NULL, 0, LogoffShutdownThread, (LPVOID)LSData, 0, NULL); + if (!hThread) + { + ERR("Unable to create shutdown thread, error %lu\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, LSData); + return STATUS_UNSUCCESSFUL; + } + WaitForSingleObject(hThread, INFINITE); + CloseHandle(hThread); + HeapFree(GetProcessHeap(), 0, LSData); + + Session->LogonStatus = WKSTA_IS_LOGGED_OFF; + if (Action == EWX_LOGOFF) + { + DispatchSAS(Session, WLX_SAS_TYPE_TIMEOUT); + return 1; + } + + /* Handle shutdown */ + FIXME("FIXME: Call ExitWindowEx in SYSTEM process context\n"); + + FIXME("FIXME: Call SMSS API #1\n"); + NtShutdownSystem(ShutdownNoReboot); /* FIXME: should go in smss */ + + return 1; } static LRESULT CALLBACK Modified: trunk/reactos/base/system/winlogon/wlx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/wlx.c… ============================================================================== --- trunk/reactos/base/system/winlogon/wlx.c (original) +++ trunk/reactos/base/system/winlogon/wlx.c Sun Aug 6 19:47:04 2006 @@ -57,6 +57,9 @@ HANDLE hWlx) { ULONG_PTR OldValue; + + TRACE("WlxUseCtrlAltDel()\n"); + WlxSetOption(hWlx, WLX_OPTION_USE_CTRL_ALT_DEL, TRUE, &OldValue); } @@ -69,6 +72,9 @@ PVOID pWlxContext) { ULONG_PTR OldValue; + + TRACE("WlxSetContextPointer(%p)\n", pWlxContext); + WlxSetOption(hWlx, WLX_OPTION_CONTEXT_POINTER, (ULONG_PTR)pWlxContext, &OldValue); } @@ -80,6 +86,7 @@ HANDLE hWlx, DWORD dwSasType) { + TRACE("WlxSasNotify(0x%lx)\n", dwSasType); DispatchSAS((PWLSESSION)hWlx, dwSasType); } @@ -92,6 +99,9 @@ DWORD Timeout) { PWLSESSION Session = (PWLSESSION)hWlx; + + TRACE("WlxSetTimeout(%lu)\n", Timeout); + Session->DialogTimeout = Timeout; return TRUE; } @@ -121,6 +131,7 @@ LPWSTR lpszTitle, UINT fuStyle) { + TRACE("WlxMessageBox()\n"); /* FIXME: Provide a custom window proc to be able to handle timeout */ return MessageBoxW(hwndOwner, lpszText, lpszTitle, fuStyle); } @@ -136,6 +147,8 @@ HWND hwndOwner, DLGPROC dlgprc) { + TRACE("WlxDialogBox()\n"); + if (PreviousWindowProc != NULL) return -1; PreviousWindowProc = dlgprc; @@ -154,6 +167,8 @@ DLGPROC dlgprc, LPARAM dwInitParam) { + TRACE("WlxDialogBoxParam()\n"); + if (PreviousWindowProc != NULL) return -1; PreviousWindowProc = dlgprc; @@ -171,6 +186,8 @@ HWND hwndOwner, DLGPROC dlgprc) { + TRACE("WlxDialogBoxIndirect()\n"); + if (PreviousWindowProc != NULL) return -1; PreviousWindowProc = dlgprc; @@ -189,6 +206,8 @@ DLGPROC dlgprc, LPARAM dwInitParam) { + TRACE("WlxDialogBoxIndirectParam()\n"); + if (PreviousWindowProc != NULL) return -1; PreviousWindowProc = dlgprc; @@ -203,6 +222,9 @@ HANDLE hWlx) { PWLSESSION Session = (PWLSESSION)hWlx; + + TRACE("WlxSwitchDesktopToUser()\n"); + return (int)SwitchDesktop(Session->ApplicationDesktop); } @@ -214,6 +236,9 @@ HANDLE hWlx) { PWLSESSION Session = (PWLSESSION)hWlx; + + TRACE("WlxSwitchDesktopToWinlogon()\n"); + return (int)SwitchDesktop(Session->WinlogonDesktop); } @@ -308,6 +333,8 @@ ULONG_PTR* OldValue) { PWLSESSION Session = (PWLSESSION)hWlx; + + TRACE("WlxSetOption(%lu)\n", Option); switch (Option) { @@ -337,6 +364,8 @@ ULONG_PTR* Value) { PWLSESSION Session = (PWLSESSION)hWlx; + + TRACE("WlxGetOption(%lu)\n", Option); switch (Option) { @@ -460,7 +489,7 @@ return FALSE; } -static const +static WLX_DISPATCH_VERSION_1_4 FunctionTable = { WlxUseCtrlAltDel, WlxSetContextPointer, @@ -559,8 +588,15 @@ /* Assume current version */ *DllVersion = WLX_CURRENT_VERSION; } - else if (!Functions->WlxNegotiate(WLX_CURRENT_VERSION, DllVersion)) - goto cleanup; + else + { + TRACE("About to negociate with Gina %S. Winlogon uses version %lx\n", + GinaDll, WLX_CURRENT_VERSION); + if (!Functions->WlxNegotiate(WLX_CURRENT_VERSION, DllVersion)) + goto cleanup; + } + + TRACE("Gina uses WLX_VERSION %lx\n", *DllVersion); if (*DllVersion >= WLX_VERSION_1_0) {

1 0

[hpoussin] 23500: Update French translation
by hpoussin＠svn.reactos.org 06 Aug '06

06 Aug '06

Author: hpoussin Date: Sun Aug 6 19:40:47 2006 New Revision: 23500 URL: http://svn.reactos.org/svn/reactos?rev=23500&view=rev Log: Update French translation Modified: trunk/reactos/base/shell/cmd/Fr.rc Modified: trunk/reactos/base/shell/cmd/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/Fr.rc?rev=2… ============================================================================== --- trunk/reactos/base/shell/cmd/Fr.rc (original) +++ trunk/reactos/base/shell/cmd/Fr.rc Sun Aug 6 19:40:47 2006 @@ -387,7 +387,8 @@ STRING_REN_HELP3, " %lu fichiers renommés\n" STRING_RMDIR_HELP, "Efface un répertoire.\n\n\ -RMDIR [lecteur:]chemin\nRD [lecteur:]chemin" +RMDIR [lecteur:]chemin\nRD [lecteur:]chemin" +STRING_RMDIR_HELP2, "Le répertoire n'est pas vide !\n" STRING_SCREEN_HELP, "Déplace le curseur, optionnellement affiche du texte\n\n\ SCREEN lig col [texte]\n\n\ @@ -471,7 +472,7 @@ STRING_VERSION_HELP4, "\n This program is free software; you can redistribute it and/or modify\n\ it under the terms of the GNU General Public License as published by\n\ the Free Software Foundation; either version 2 of the License, or\n\ - (at your option) any later version." + (at your option) any later version.\n" STRING_VERSION_HELP5, "\nEnvoyer les rapports d'erreur à <ros-dev(a)reactos.org>.\n\ Les mises à jour sont disponibles à : http://www.reactos.org" @@ -502,13 +503,69 @@ RESTORE restaure la fenêtre\n\ titre titre de la fenêtre" +STRING_HELP1, "List of all available commands (+ description)\n\n\ + command /? For more information on a specific command\n\n\ +? List all available commands without description).\n\ +ALIAS Sets, removes or shows aliases.\n\ +ATTRIB Displays or changes file attributes.\n\ +BEEP Beep the speaker.\n\ +CALL Calls one batch program from another.\n\ +CD Displays the name of or changes the current directory.\n\ +CHCP Displays or sets the active code page number.\n\ +CHOICE Waits for the user to choose one of a set of choices.\n\ +CLS Clears the screen.\n\ +CMD Starts a new instance of the ReactOS command interpreter.\n\ +COLOR Sets the default console foreground and background colors.\n\ +COPY Copies one or more files to another location.\n\ +DATE Displays or sets the date.\n\ +DELETE Deletes one or more files.\n\ +DIR Displays a list of files and subdirectories in a directory.\n\ +ECHO Displays messages, or turns command echoing on or off.\n\ +ERASE Deletes one or more files.\n\ +EXIT Quits the CMD.EXE program (command interpreter).\n\ +FOR Runs a specified command for each file in a set of files.\n\ +FREE (free) disc space.\n\ +GOTO Directs the ReactOS command interpreter to a labeled line in\n\ + a batch program.\n\ +HELP Provides Help information for ReactOS commands.\n\ +HISTORY List alle commands which has been used\n\ +IF Performs conditional processing in batch programs.\n\ +LABEL Creates, changes, or deletes the volume label of a disk.\n\ +MD Creates a directory.\n\ +MKDIR Creates a directory.\n\ +MOVE Moves one or more files from one directory to another\n\ + directory.\n\ +PATH Displays or sets a search path for executable files.\n\ +PAUSE Suspends processing of a batch file and displays a message.\n\ +POPD Restores the previous value of the current directory saved by\n\ + PUSHD.\n\ +PROMPT Changes the command prompt.\n\ +PUSHD Saves the current directory then changes it.\n\ +RD Removes a directory.\n\ +REM Records comments (remarks) in batch files.\n\ +REN Renames a file or files.\n\ +RENAME Renames a file or files.\n\ +RMDIR Removes a directory.\n\ +SCREEN Move cursor and optionally print text.\n\ +SET Displays, sets, or removes ReactOS environment variables.\n\ +SHIFT Shifts the position of replaceable parameters in batch files.\n" +STRING_HELP2, "START Starts a separate window to run a specified program or command.\n\ + Executes command.\n\ +TIME Displays or sets the system time.\n\ +TIMER Allow the use of ten stopwaches.\n\ +TITLE Sets the window title for a CMD.EXE session.\n\ +TYPE Displays the contents of a text file.\n\ +VER Displays the ReactOS version.\n\ +VERIFY Tells ReactOS whether to verify that your files are written\n\ + correctly to a disk.\n\ +VOL Displays a disk volume label and serial number.\n" + STRING_CHOICE_OPTION "ON" STRING_COPY_OPTION, "ONT" STRING_ALIAS_ERROR, "Ligne de commande trop longue après remplacement de l'alias!\n" STRING_BATCH_ERROR, "Erreur à l'ouverture du fichier batch\n" STRING_CHCP_ERROR1, "Page de codes actuelle : %u\n" -STRING_ERROR_INVALID_PARAM_FORMAT, "Format de paramètre incorrect - %s\n" STRING_CHCP_ERROR4, "Page de code invalide \n" STRING_CHOICE_ERROR, "Option invalide. Format attendu: /C[:]options" STRING_CHOICE_ERROR_TXT, "Option invalide. Format attendu: /T[:]c,nn" @@ -545,8 +602,6 @@ STRING_MOVE_ERROR1, "[OK]\n" STRING_MOVE_ERROR2, "[Erreur]\n" -STRING_PATH_ERROR, "CMD: Pas dans l'environnement '%s'\n" - STRING_REN_ERROR1, "MoveFile() a échoué. Erreur: %lu\n" STRING_START_ERROR1, "No batch support at the moment!" @@ -564,6 +619,16 @@ STRING_ERROR_PATH_NOT_FOUND, "Chemin non trouvé\n" STRING_ERROR_FILE_NOT_FOUND, "Fichier non trouvé\n" STRING_ERROR_REQ_PARAM_MISSING, "Paramètre requis manquant\n" +STRING_ERROR_INVALID_DRIVE, "Lecteur spécifié introuvable\n" +STRING_ERROR_INVALID_PARAM_FORMAT, "Format de paramètre incorrect - %s\n" +STRING_ERROR_BADCOMMAND, "Commande ou nom de fichier inconnu\n" +STRING_ERROR_OUT_OF_MEMORY, "Erreur Pas assez de mémoire.\n" +STRING_ERROR_CANNOTPIPE, "Error! Cannot pipe! Cannot open temporary file!\n" +STRING_ERROR_D_PAUSEMSG, "Appuyez sur une touche pour continuer . . ." +STRING_ERROR_DRIVER_NOT_READY, "Lecteur non prêt" + +STRING_PATH_ERROR, "CMD: Pas dans l'environnement '%s'\n" + STRING_CMD_SHELLINFO, "\n Interpréteur de ligne de commandes ReactOS" STRING_VERSION_RUNVER, " tournant sur %s" STRING_COPY_FILE, " %d fichier(s) copié(s)\n" @@ -572,4 +637,10 @@ STRING_SCREEN_COL, "valeur invalide pour col" STRING_SCREEN_ROW, "valeur invalide pour lig" STRING_TIMER_TIME "Le timer n°%d est %s: " + +STRING_INVALID_OPERAND, "Opérande invalide." +STRING_EXPECTED_CLOSE_PAREN, "Attendu ')'." +STRING_EXPECTED_NUMBER_OR_VARIABLE,"Attendu nombre ou nom de variable." +STRING_SYNTAX_COMMAND_INCORRECT, "La syntaxe the la commande est incorrecte." + }

1 0

[hpoussin] 23499: Fix a few referencing bugs (Object type must be specified if AccessMode is UserMode)
by hpoussin＠svn.reactos.org 06 Aug '06

06 Aug '06

Author: hpoussin Date: Sun Aug 6 19:38:56 2006 New Revision: 23499 URL: http://svn.reactos.org/svn/reactos?rev=23499&view=rev Log: Fix a few referencing bugs (Object type must be specified if AccessMode is UserMode) Modified: trunk/reactos/ntoskrnl/cm/regobj.c Modified: trunk/reactos/ntoskrnl/cm/regobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regobj.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regobj.c (original) +++ trunk/reactos/ntoskrnl/cm/regobj.c Sun Aug 6 19:38:56 2006 @@ -55,7 +55,7 @@ { ObReferenceObjectByPointer(NameSpaceRoot, DIRECTORY_TRAVERSE, - NULL, + CmiKeyType, ObjectCreateInfo->ProbeMode); CurrentObject = NameSpaceRoot; } @@ -147,7 +147,7 @@ ObReferenceObjectByPointer(FoundObject, STANDARD_RIGHTS_REQUIRED, - NULL, + CmiKeyType, UserMode); if (End != NULL) { @@ -197,7 +197,7 @@ ObReferenceObjectByPointer(NextObject, DIRECTORY_TRAVERSE, - NULL, + CmiKeyType, ObjectCreateInfo->ProbeMode); } @@ -789,7 +789,7 @@ ObReferenceObjectByPointer(ParentKey, STANDARD_RIGHTS_REQUIRED, - NULL, + CmiKeyType, UserMode); NewKey->ParentKey = ParentKey; }

1 0

[hpoussin] 23498: STDCALL -> NTAPI Update my mail address
by hpoussin＠svn.reactos.org 06 Aug '06

06 Aug '06

Author: hpoussin Date: Sun Aug 6 19:37:21 2006 New Revision: 23498 URL: http://svn.reactos.org/svn/reactos?rev=23498&view=rev Log: STDCALL -> NTAPI Update my mail address Modified: trunk/reactos/drivers/base/serial/circularbuffer.c trunk/reactos/drivers/base/serial/cleanup.c trunk/reactos/drivers/base/serial/close.c trunk/reactos/drivers/base/serial/create.c trunk/reactos/drivers/base/serial/devctrl.c trunk/reactos/drivers/base/serial/info.c trunk/reactos/drivers/base/serial/legacy.c trunk/reactos/drivers/base/serial/misc.c trunk/reactos/drivers/base/serial/pnp.c trunk/reactos/drivers/base/serial/power.c trunk/reactos/drivers/base/serial/rw.c trunk/reactos/drivers/base/serial/serial.c trunk/reactos/drivers/base/serial/serial.h Modified: trunk/reactos/drivers/base/serial/circularbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/serial/circul… ============================================================================== --- trunk/reactos/drivers/base/serial/circularbuffer.c (original) +++ trunk/reactos/drivers/base/serial/circularbuffer.c Sun Aug 6 19:37:21 2006 @@ -4,7 +4,7 @@ * FILE: drivers/dd/serial/circularbuffer.c * PURPOSE: Operations on a circular buffer * - * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.com) + * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.org) */ #define NDEBUG Modified: trunk/reactos/drivers/base/serial/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/serial/cleanu… ============================================================================== --- trunk/reactos/drivers/base/serial/cleanup.c (original) +++ trunk/reactos/drivers/base/serial/cleanup.c Sun Aug 6 19:37:21 2006 @@ -4,13 +4,13 @@ * FILE: drivers/dd/serial/cleanup.c * PURPOSE: Serial IRP_MJ_CLEANUP operations * - * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.com) + * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.org) */ #define NDEBUG #include "serial.h" -NTSTATUS STDCALL +NTSTATUS NTAPI SerialCleanup( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) Modified: trunk/reactos/drivers/base/serial/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/serial/close.… ============================================================================== --- trunk/reactos/drivers/base/serial/close.c (original) +++ trunk/reactos/drivers/base/serial/close.c Sun Aug 6 19:37:21 2006 @@ -4,13 +4,13 @@ * FILE: drivers/dd/serial/close.c * PURPOSE: Serial IRP_MJ_CLOSE operations * - * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.com) + * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.org) */ #define NDEBUG #include "serial.h" -NTSTATUS STDCALL +NTSTATUS NTAPI SerialClose( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) Modified: trunk/reactos/drivers/base/serial/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/serial/create… ============================================================================== --- trunk/reactos/drivers/base/serial/create.c (original) +++ trunk/reactos/drivers/base/serial/create.c Sun Aug 6 19:37:21 2006 @@ -4,13 +4,13 @@ * FILE: drivers/dd/serial/create.c * PURPOSE: Serial IRP_MJ_CREATE operations * - * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.com) + * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.org) */ #define NDEBUG #include "serial.h" -NTSTATUS STDCALL +NTSTATUS NTAPI SerialCreate( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) Modified: trunk/reactos/drivers/base/serial/devctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/serial/devctr… ============================================================================== --- trunk/reactos/drivers/base/serial/devctrl.c (original) +++ trunk/reactos/drivers/base/serial/devctrl.c Sun Aug 6 19:37:21 2006 @@ -4,7 +4,7 @@ * FILE: drivers/dd/serial/devctrl.c * PURPOSE: Serial IRP_MJ_DEVICE_CONTROL operations * - * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.com) + * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.org) */ #define NDEBUG @@ -45,7 +45,7 @@ } } -NTSTATUS STDCALL +NTSTATUS NTAPI SerialSetBaudRate( IN PSERIAL_DEVICE_EXTENSION DeviceExtension, IN ULONG NewBaudRate) @@ -54,6 +54,9 @@ USHORT divisor; PUCHAR ComPortBase = (PUCHAR)DeviceExtension->BaseAddress; NTSTATUS Status = STATUS_SUCCESS; + + if (NewBaudRate == 0) + return STATUS_INVALID_PARAMETER; divisor = (USHORT)(BAUD_CLOCK / (CLOCKS_PER_BIT * NewBaudRate)); BaudRate = BAUD_CLOCK / (CLOCKS_PER_BIT * divisor); @@ -80,7 +83,7 @@ return Status; } -NTSTATUS STDCALL +NTSTATUS NTAPI SerialSetLineControl( IN PSERIAL_DEVICE_EXTENSION DeviceExtension, IN PSERIAL_LINE_CONTROL NewSettings) @@ -272,7 +275,7 @@ return STATUS_SUCCESS; } -NTSTATUS STDCALL +NTSTATUS NTAPI SerialDeviceControl( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) Modified: trunk/reactos/drivers/base/serial/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/serial/info.c… ============================================================================== --- trunk/reactos/drivers/base/serial/info.c (original) +++ trunk/reactos/drivers/base/serial/info.c Sun Aug 6 19:37:21 2006 @@ -4,13 +4,13 @@ * FILE: drivers/dd/serial/info.c * PURPOSE: Serial IRP_MJ_QUERY_INFORMATION operations * - * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.com) + * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.org) */ #define NDEBUG #include "serial.h" -NTSTATUS STDCALL +NTSTATUS NTAPI SerialQueryInformation( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) Modified: trunk/reactos/drivers/base/serial/legacy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/serial/legacy… ============================================================================== --- trunk/reactos/drivers/base/serial/legacy.c (original) +++ trunk/reactos/drivers/base/serial/legacy.c Sun Aug 6 19:37:21 2006 @@ -4,7 +4,7 @@ * FILE: drivers/bus/serial/legacy.c * PURPOSE: Legacy serial port enumeration * - * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.com) + * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.org) * Mark Junker (mjscod(a)gmx.de) */ Modified: trunk/reactos/drivers/base/serial/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/serial/misc.c… ============================================================================== --- trunk/reactos/drivers/base/serial/misc.c (original) +++ trunk/reactos/drivers/base/serial/misc.c Sun Aug 6 19:37:21 2006 @@ -4,14 +4,14 @@ * FILE: drivers/dd/serial/misc.c * PURPOSE: Misceallenous operations * - * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.com) + * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.org) */ /* FIXME: call IoAcquireRemoveLock/IoReleaseRemoveLock around each I/O operation */ #define NDEBUG #include "serial.h" -static NTSTATUS STDCALL +static NTSTATUS NTAPI ForwardIrpAndWaitCompletion( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -50,7 +50,7 @@ return Status; } -NTSTATUS STDCALL +NTSTATUS NTAPI ForwardIrpAndForget( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) @@ -63,7 +63,7 @@ return IoCallDriver(LowerDevice, Irp); } -VOID STDCALL +VOID NTAPI SerialReceiveByte( IN PKDPC Dpc, IN PVOID pDeviceExtension, // real type PSERIAL_DEVICE_EXTENSION @@ -100,7 +100,7 @@ WRITE_PORT_UCHAR(SER_IER(ComPortBase), IER | SR_IER_DATA_RECEIVED); } -VOID STDCALL +VOID NTAPI SerialSendByte( IN PKDPC Dpc, IN PVOID pDeviceExtension, // real type PSERIAL_DEVICE_EXTENSION @@ -138,7 +138,7 @@ KeReleaseSpinLock(&DeviceExtension->OutputBufferLock, Irql); } -BOOLEAN STDCALL +BOOLEAN NTAPI SerialInterruptService( IN PKINTERRUPT Interrupt, IN OUT PVOID ServiceContext) @@ -179,6 +179,14 @@ KeInsertQueueDpc(&DeviceExtension->ReceivedByteDpc, NULL, NULL); else ; /* FIXME: stop reception */ + } + if (MSR & SR_MSR_RI_CHANGED) + { + DPRINT("SR_MSR_RI_CHANGED changed: now %d\n", MSR & SI_MSR_RI); + } + if (MSR & SR_MSR_DCD_CHANGED) + { + DPRINT("SR_MSR_DCD_CHANGED changed: now %d\n", MSR & SR_MSR_DCD); } IER = READ_PORT_UCHAR(SER_IER(ComPortBase)); WRITE_PORT_UCHAR(SER_IER(ComPortBase), IER | SR_IER_MSR_CHANGE); Modified: trunk/reactos/drivers/base/serial/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/serial/pnp.c?… ============================================================================== --- trunk/reactos/drivers/base/serial/pnp.c (original) +++ trunk/reactos/drivers/base/serial/pnp.c Sun Aug 6 19:37:21 2006 @@ -4,7 +4,7 @@ * FILE: drivers/dd/serial/pnp.c * PURPOSE: Serial IRP_MJ_PNP operations * - * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.com) + * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.org) */ /* FIXME: call IoAcquireRemoveLock/IoReleaseRemoveLock around each I/O operation */ @@ -12,7 +12,7 @@ #define NDEBUG #include "serial.h" -NTSTATUS STDCALL +NTSTATUS NTAPI SerialAddDeviceInternal( IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT Pdo, @@ -104,7 +104,7 @@ return Status; } -NTSTATUS STDCALL +NTSTATUS NTAPI SerialAddDevice( IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT Pdo) @@ -122,7 +122,7 @@ return SerialAddDeviceInternal(DriverObject, Pdo, UartUnknown, NULL, NULL); } -NTSTATUS STDCALL +NTSTATUS NTAPI SerialPnpStartDevice( IN PDEVICE_OBJECT DeviceObject, IN PCM_RESOURCE_LIST ResourceList, @@ -294,7 +294,7 @@ return STATUS_SUCCESS; } -NTSTATUS STDCALL +NTSTATUS NTAPI SerialPnp( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) Modified: trunk/reactos/drivers/base/serial/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/serial/power.… ============================================================================== --- trunk/reactos/drivers/base/serial/power.c (original) +++ trunk/reactos/drivers/base/serial/power.c Sun Aug 6 19:37:21 2006 @@ -4,13 +4,13 @@ * FILE: drivers/dd/serial/power.c * PURPOSE: Serial IRP_MJ_POWER operations * - * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.com) + * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.org) */ #define NDEBUG #include "serial.h" -NTSTATUS STDCALL +NTSTATUS NTAPI SerialPower( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) Modified: trunk/reactos/drivers/base/serial/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/serial/rw.c?r… ============================================================================== --- trunk/reactos/drivers/base/serial/rw.c (original) +++ trunk/reactos/drivers/base/serial/rw.c Sun Aug 6 19:37:21 2006 @@ -4,7 +4,7 @@ * FILE: drivers/dd/serial/create.c * PURPOSE: Serial IRP_MJ_READ/IRP_MJ_WRITE operations * - * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.com) + * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.org) */ #define NDEBUG @@ -113,7 +113,7 @@ Irp->IoStatus.Status = STATUS_SUCCESS; } -static VOID STDCALL +static VOID NTAPI SerialReadWorkItem( IN PDEVICE_OBJECT DeviceObject, IN PVOID pWorkItemData /* real type PWORKITEM_DATA */) @@ -134,7 +134,7 @@ ExFreePoolWithTag(pWorkItemData, SERIAL_TAG); } -NTSTATUS STDCALL +NTSTATUS NTAPI SerialRead( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) @@ -245,7 +245,7 @@ return Status; } -NTSTATUS STDCALL +NTSTATUS NTAPI SerialWrite( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) Modified: trunk/reactos/drivers/base/serial/serial.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/serial/serial… ============================================================================== --- trunk/reactos/drivers/base/serial/serial.c (original) +++ trunk/reactos/drivers/base/serial/serial.c Sun Aug 6 19:37:21 2006 @@ -4,13 +4,13 @@ * FILE: drivers/dd/serial/serial.c * PURPOSE: Serial driver loading/unloading * - * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.com) + * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.org) */ //#define NDEBUG #include "serial.h" -static VOID STDCALL +static VOID NTAPI DriverUnload(IN PDRIVER_OBJECT DriverObject) { // nothing to do here yet @@ -19,7 +19,7 @@ /* * Standard DriverEntry method. */ -NTSTATUS STDCALL +NTSTATUS NTAPI DriverEntry( IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegPath) Modified: trunk/reactos/drivers/base/serial/serial.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/serial/serial… ============================================================================== --- trunk/reactos/drivers/base/serial/serial.h (original) +++ trunk/reactos/drivers/base/serial/serial.h Sun Aug 6 19:37:21 2006 @@ -4,7 +4,7 @@ * FILE: drivers/dd/serial/serial.h * PURPOSE: Serial driver header * - * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.com) + * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.org) */ #include <ntddk.h> @@ -15,8 +15,6 @@ #if defined(__GNUC__) #include <debug.h> #elif defined(_MSC_VER) - #define STDCALL - #define DPRINT1 DbgPrint("(%s:%d) ", __FILE__, __LINE__), DbgPrint #define CHECKPOINT1 DbgPrint("(%s:%d)\n", __FILE__, __LINE__) #define DPRINT @@ -31,12 +29,14 @@ #define PST_RS232 1 #define COMMPROP_INITIALIZED 0xE73CF52E -/* FIXME: I don't know why it is not defined anywhere... */ -NTSTATUS STDCALL +#ifndef _NTIFS_ +/* Why is it only defined in ntifs.h file? */ +NTSTATUS NTAPI IoAttachDeviceToDeviceStackSafe( IN PDEVICE_OBJECT SourceDevice, IN PDEVICE_OBJECT TargetDevice, OUT PDEVICE_OBJECT *AttachedToDeviceObject); +#endif typedef enum { @@ -129,45 +129,45 @@ #define SER_THR(x) ((x)+0) /* Transmit Register */ #define SER_DLL(x) ((x)+0) /* Baud Rate Divisor LSB */ #define SER_IER(x) ((x)+1) /* Interrupt Enable Register */ -#define SR_IER_DATA_RECEIVED 0x01 -#define SR_IER_THR_EMPTY 0x02 -#define SR_IER_LSR_CHANGE 0x04 -#define SR_IER_MSR_CHANGE 0x08 -#define SR_IER_SLEEP_MODE 0x10 /* Uart >= 16750 */ -#define SR_IER_LOW_POWER 0x20 /* Uart >= 16750 */ +#define SR_IER_DATA_RECEIVED 0x01 +#define SR_IER_THR_EMPTY 0x02 +#define SR_IER_LSR_CHANGE 0x04 +#define SR_IER_MSR_CHANGE 0x08 +#define SR_IER_SLEEP_MODE 0x10 /* Uart >= 16750 */ +#define SR_IER_LOW_POWER 0x20 /* Uart >= 16750 */ #define SER_DLM(x) ((x)+1) /* Baud Rate Divisor MSB */ #define SER_IIR(x) ((x)+2) /* Interrupt Identification Register */ -#define SR_IIR_SELF 0x00 -#define SR_IIR_ID_MASK 0x07 -#define SR_IIR_MSR_CHANGE SR_IIR_SELF +#define SR_IIR_SELF 0x00 +#define SR_IIR_ID_MASK 0x07 +#define SR_IIR_MSR_CHANGE SR_IIR_SELF #define SR_IIR_THR_EMPTY (SR_IIR_SELF | 2) #define SR_IIR_DATA_RECEIVED (SR_IIR_SELF | 4) #define SR_IIR_ERROR (SR_IIR_SELF | 6) #define SER_FCR(x) ((x)+2) /* FIFO Control Register (Uart >= 16550A) */ -#define SR_FCR_ENABLE_FIFO 0x01 -#define SR_FCR_CLEAR_RCVR (0x02 | SR_FCR_ENABLE_FIFO) -#define SR_FCR_CLEAR_XMIT (0x04 | SR_FCR_ENABLE_FIFO) -#define SR_FCR_1_BYTE (0x00 | SR_FCR_ENABLE_FIFO) -#define SR_FCR_4_BYTES (0x40 | SR_FCR_ENABLE_FIFO) -#define SR_FCR_8_BYTES (0x80 | SR_FCR_ENABLE_FIFO) -#define SR_FCR_14_BYTES (0xC0 | SR_FCR_ENABLE_FIFO) +#define SR_FCR_ENABLE_FIFO 0x01 +#define SR_FCR_CLEAR_RCVR (0x02 | SR_FCR_ENABLE_FIFO) +#define SR_FCR_CLEAR_XMIT (0x04 | SR_FCR_ENABLE_FIFO) +#define SR_FCR_1_BYTE (0x00 | SR_FCR_ENABLE_FIFO) +#define SR_FCR_4_BYTES (0x40 | SR_FCR_ENABLE_FIFO) +#define SR_FCR_8_BYTES (0x80 | SR_FCR_ENABLE_FIFO) +#define SR_FCR_14_BYTES (0xC0 | SR_FCR_ENABLE_FIFO) #define SER_LCR(x) ((x)+3) /* Line Control Register */ -#define SR_LCR_CS5 0x00 -#define SR_LCR_CS6 0x01 -#define SR_LCR_CS7 0x02 -#define SR_LCR_CS8 0x03 -#define SR_LCR_ST1 0x00 -#define SR_LCR_ST2 0x04 -#define SR_LCR_PNO 0x00 -#define SR_LCR_POD 0x08 -#define SR_LCR_PEV 0x18 -#define SR_LCR_PMK 0x28 -#define SR_LCR_PSP 0x38 -#define SR_LCR_BRK 0x40 -#define SR_LCR_DLAB 0x80 +#define SR_LCR_CS5 0x00 +#define SR_LCR_CS6 0x01 +#define SR_LCR_CS7 0x02 +#define SR_LCR_CS8 0x03 +#define SR_LCR_ST1 0x00 +#define SR_LCR_ST2 0x04 +#define SR_LCR_PNO 0x00 +#define SR_LCR_POD 0x08 +#define SR_LCR_PEV 0x18 +#define SR_LCR_PMK 0x28 +#define SR_LCR_PSP 0x38 +#define SR_LCR_BRK 0x40 +#define SR_LCR_DLAB 0x80 #define SER_MCR(x) ((x)+4) /* Modem Control Register */ -#define SR_MCR_DTR 0x01 -#define SR_MCR_RTS 0x02 +#define SR_MCR_DTR SERIAL_DTR_STATE +#define SR_MCR_RTS SERIAL_RTS_STATE #define SER_LSR(x) ((x)+5) /* Line Status Register */ #define SR_LSR_DATA_RECEIVED 0x01 #define SR_LSR_OVERRUN_ERROR 0x02 @@ -182,11 +182,11 @@ #define SR_MSR_DSR_CHANGED 0x02 #define SR_MSR_RI_CHANGED 0x04 #define SR_MSR_DCD_CHANGED 0x08 -#define SR_MSR_CTS 0x10 /* Clear To Send */ -#define SR_MSR_DSR 0x20 /* Data Set Ready */ -#define SI_MSR_RI 0x40 /* Ring Indicator */ -#define SR_MSR_DCD 0x80 /* Data Carrier Detect */ -#define SER_SCR(x) ((x)+7) /* Scratch Pad Register */ +#define SR_MSR_CTS SERIAL_CTS_STATE /* Clear To Send */ +#define SR_MSR_DSR SERIAL_DSR_STATE /* Data Set Ready */ +#define SI_MSR_RI SERIAL_RI_STATE /* Ring Indicator */ +#define SR_MSR_DCD SERIAL_DCD_STATE /* Data Carrier Detect */ +#define SER_SCR(x) ((x)+7) /* Scratch Pad Register, Uart >= Uart16450 */ /************************************ circularbuffer.c */ @@ -221,45 +221,45 @@ /************************************ cleanup.c */ -NTSTATUS STDCALL +NTSTATUS NTAPI SerialCleanup( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); /************************************ close.c */ -NTSTATUS STDCALL +NTSTATUS NTAPI SerialClose( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); /************************************ create.c */ -NTSTATUS STDCALL +NTSTATUS NTAPI SerialCreate( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); /************************************ devctrl.c */ -NTSTATUS STDCALL +NTSTATUS NTAPI SerialDeviceControl( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -NTSTATUS STDCALL +NTSTATUS NTAPI SerialSetBaudRate( IN PSERIAL_DEVICE_EXTENSION DeviceExtension, IN ULONG NewBaudRate); -NTSTATUS STDCALL +NTSTATUS NTAPI SerialSetLineControl( IN PSERIAL_DEVICE_EXTENSION DeviceExtension, IN PSERIAL_LINE_CONTROL NewSettings); /************************************ info.c */ -NTSTATUS STDCALL +NTSTATUS NTAPI SerialQueryInformation( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); @@ -277,33 +277,33 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -NTSTATUS STDCALL +NTSTATUS NTAPI ForwardIrpAndForget( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -VOID STDCALL +VOID NTAPI SerialReceiveByte( IN PKDPC Dpc, IN PVOID pDeviceExtension, // real type PSERIAL_DEVICE_EXTENSION IN PVOID pByte, // real type UCHAR IN PVOID Unused); -VOID STDCALL +VOID NTAPI SerialSendByte( IN PKDPC Dpc, IN PVOID pDeviceExtension, // real type PSERIAL_DEVICE_EXTENSION IN PVOID Unused1, IN PVOID Unused2); -BOOLEAN STDCALL +BOOLEAN NTAPI SerialInterruptService( IN PKINTERRUPT Interrupt, IN OUT PVOID ServiceContext); /************************************ pnp.c */ -NTSTATUS STDCALL +NTSTATUS NTAPI SerialAddDeviceInternal( IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT Pdo, @@ -311,44 +311,37 @@ IN PULONG pComPortNumber OPTIONAL, OUT PDEVICE_OBJECT* pFdo OPTIONAL); -NTSTATUS STDCALL +NTSTATUS NTAPI SerialAddDevice( IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT Pdo); -NTSTATUS STDCALL +NTSTATUS NTAPI SerialPnpStartDevice( IN PDEVICE_OBJECT DeviceObject, IN PCM_RESOURCE_LIST ResourceList, IN PCM_RESOURCE_LIST ResourceListTranslated); -NTSTATUS STDCALL +NTSTATUS NTAPI SerialPnp( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); /************************************ power.c */ -NTSTATUS STDCALL +NTSTATUS NTAPI SerialPower( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); /************************************ rw.c */ -NTSTATUS STDCALL +NTSTATUS NTAPI SerialRead( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -NTSTATUS STDCALL +NTSTATUS NTAPI SerialWrite( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); - -/************************************ serial.c */ - -NTSTATUS STDCALL -DriverEntry( - IN PDRIVER_OBJECT DriverObject, - IN PUNICODE_STRING RegPath);

1 0

[hpoussin] 23497: Fix return type in .idl file (advapi32.dll and services.exe already agreed on a error code status as return type)
by hpoussin＠svn.reactos.org 06 Aug '06

06 Aug '06

Author: hpoussin Date: Sun Aug 6 18:29:19 2006 New Revision: 23497 URL: http://svn.reactos.org/svn/reactos?rev=23497&view=rev Log: Fix return type in .idl file (advapi32.dll and services.exe already agreed on a error code status as return type) Modified: trunk/reactos/base/system/services/rpcserver.c trunk/reactos/include/reactos/idl/svcctl.idl 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 (original) +++ trunk/reactos/base/system/services/rpcserver.c Sun Aug 6 18:29:19 2006 @@ -1522,7 +1522,7 @@ /* Function 16 */ -unsigned int +unsigned long ScmrOpenServiceW(handle_t BindingHandle, unsigned int hSCManager, wchar_t *lpServiceName, Modified: trunk/reactos/include/reactos/idl/svcctl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/svcctl… ============================================================================== --- trunk/reactos/include/reactos/idl/svcctl.idl (original) +++ trunk/reactos/include/reactos/idl/svcctl.idl Sun Aug 6 18:29:19 2006 @@ -46,11 +46,11 @@ [in] SC_HANDLE hSCObject); /* Function 1 */ - BOOL ScmrControlService([in] handle_t BindingHandle, - [in] SC_HANDLE hService, - [in] DWORD dwControl, - [out] SERVICE_STATUS *lpServiceStatus); -/* [out] LPSERVICE_STATUS lpServiceStatus); */ + DWORD ScmrControlService([in] handle_t BindingHandle, + [in] SC_HANDLE hService, + [in] DWORD dwControl, + [out] SERVICE_STATUS *lpServiceStatus); +/* [out] LPSERVICE_STATUS lpServiceStatus); */ /* Function 2 */ DWORD ScmrDeleteService([in] handle_t BindingHandle, @@ -165,11 +165,11 @@ [out] SC_HANDLE *hScm); /* Function 16 */ - SC_HANDLE ScmrOpenServiceW([in] handle_t BindingHandle, - [in] SC_HANDLE hSCManager, - [in, string] LPCWSTR lpServiceName, - [in] DWORD dwDesiredAccess, - [out] SC_HANDLE *hScm); + DWORD ScmrOpenServiceW([in] handle_t BindingHandle, + [in] SC_HANDLE hSCManager, + [in, string] LPCWSTR lpServiceName, + [in] DWORD dwDesiredAccess, + [out] SC_HANDLE *hScm); /* Function 17 */ DWORD ScmrQueryServiceConfigW([in] handle_t BindingHandle,

1 0

[hpoussin] 23496: - Add dsgetdc.h header - Add missing constants SECURITY_MIN_SID_SIZE/SECURITY_MAX_SID_SIZE - Define FreeInheritedFromArray only when _WIN32_WINNT >= 0x0501
by hpoussin＠svn.reactos.org 06 Aug '06

06 Aug '06

Author: hpoussin Date: Sun Aug 6 16:03:31 2006 New Revision: 23496 URL: http://svn.reactos.org/svn/reactos?rev=23496&view=rev Log: - Add dsgetdc.h header - Add missing constants SECURITY_MIN_SID_SIZE/SECURITY_MAX_SID_SIZE - Define FreeInheritedFromArray only when _WIN32_WINNT >= 0x0501 Added: trunk/reactos/include/psdk/dsgetdc.h (with props) Modified: trunk/reactos/include/psdk/aclapi.h trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/aclapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/aclapi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/aclapi.h (original) +++ trunk/reactos/include/psdk/aclapi.h Sun Aug 6 16:03:31 2006 @@ -27,7 +27,9 @@ VOID WINAPI BuildTrusteeWithObjectsAndSidW(PTRUSTEE_W,POBJECTS_AND_SID,GUID*,GUID*,PSID); VOID WINAPI BuildTrusteeWithSidA(PTRUSTEE_A,PSID); VOID WINAPI BuildTrusteeWithSidW(PTRUSTEE_W,PSID); +#if (_WIN32_WINNT >= 0x0501) DWORD WINAPI FreeInheritedFromArray(PINHERITED_FROMW,USHORT,PFN_OBJECT_MGR_FUNCTS); +#endif DWORD WINAPI GetAuditedPermissionsFromAclA(PACL,PTRUSTEE_A,PACCESS_MASK,PACCESS_MASK); DWORD WINAPI GetAuditedPermissionsFromAclW(PACL,PTRUSTEE_W,PACCESS_MASK,PACCESS_MASK); DWORD WINAPI GetEffectiveRightsFromAclA(PACL,PTRUSTEE_A,PACCESS_MASK); Added: trunk/reactos/include/psdk/dsgetdc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dsgetdc.h?rev… ============================================================================== --- trunk/reactos/include/psdk/dsgetdc.h (added) +++ trunk/reactos/include/psdk/dsgetdc.h Sun Aug 6 16:03:31 2006 @@ -1,0 +1,115 @@ +#ifndef _DSGETDC_H +#define _DSGETDC_H +#if __GNUC__ >=3 +#pragma GCC system_header +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +#define DS_DOMAIN_IN_FOREST 0x01 +#define DS_DOMAIN_DIRECT_OUTBOUND 0x02 +#define DS_DOMAIN_TREE_ROOT 0x04 +#define DS_DOMAIN_PRIMARY 0x08 +#define DS_DOMAIN_NATIVE_MODE 0x10 +#define DS_DOMAIN_DIRECT_INBOUND 0x20 + +typedef struct _DOMAIN_CONTROLLER_INFOA +{ + LPSTR DomainControllerName; + LPSTR DomainControllerAddress; + ULONG DomainControllerAddressType; + GUID DomainGuid; + LPSTR DomainName; + LPSTR DnsForestName; + ULONG Flags; + LPSTR DcSiteName; + LPSTR ClientSiteName; +} DOMAIN_CONTROLLER_INFOA, *PDOMAIN_CONTROLLER_INFOA; + +typedef struct _DOMAIN_CONTROLLER_INFOW +{ + LPWSTR DomainControllerName; + LPWSTR DomainControllerAddress; + ULONG DomainControllerAddressType; + GUID DomainGuid; + LPWSTR DomainName; + LPWSTR DnsForestName; + ULONG Flags; + LPWSTR DcSiteName; + LPWSTR ClientSiteName; +} DOMAIN_CONTROLLER_INFOW, *PDOMAIN_CONTROLLER_INFOW; + +typedef struct _DS_DOMAIN_TRUSTSA +{ + LPSTR NetbiosDomainName; + LPSTR DnsDomainName; + ULONG Flags; + ULONG ParentIndex; + ULONG TrustType; + ULONG TrustAttributes; + PSID DomainSid; + GUID DomainGuid; +} DS_DOMAIN_TRUSTSA, *PDS_DOMAIN_TRUSTSA; + +typedef struct _DS_DOMAIN_TRUSTSW +{ + LPWSTR NetbiosDomainName; + LPWSTR DnsDomainName; + ULONG Flags; + ULONG ParentIndex; + ULONG TrustType; + ULONG TrustAttributes; + PSID DomainSid; + GUID DomainGuid; +} DS_DOMAIN_TRUSTSW, *PDS_DOMAIN_TRUSTSW; + +DWORD +DsEnumerateDomainTrustsA( + LPSTR ServerName, + ULONG Flags, + PDS_DOMAIN_TRUSTSA* Domains, + PULONG DomainCount); + +DWORD +DsEnumerateDomainTrustsW( + LPWSTR ServerName, + ULONG Flags, + PDS_DOMAIN_TRUSTSW* Domains, + PULONG DomainCount); + +DWORD +DsGetDcNameA( + LPCSTR ComputerName, + LPCSTR DomainName, + GUID* DomainGuid, + LPCSTR SiteName, + ULONG Flags, + PDOMAIN_CONTROLLER_INFOA* DomainControllerInfo); + +DWORD +DsGetDcNameW( + LPCWSTR ComputerName, + LPCWSTR DomainName, + GUID* DomainGuid, + LPCWSTR SiteName, + ULONG Flags, + PDOMAIN_CONTROLLER_INFOW* DomainControllerInfo); + +#ifdef UNICODE +typedef DOMAIN_CONTROLLER_INFOW DOMAIN_CONTROLLER_INFO, *PDOMAIN_CONTROLLER_INFO; +typedef DS_DOMAIN_TRUSTSW DS_DOMAIN_TRUSTS, *PDS_DOMAIN_TRUSTS; +#define DsEnumerateDomainTrusts DsEnumerateDomainTrustsW +#define DsGetDcName DsGetDcNameW +#else +typedef DOMAIN_CONTROLLER_INFOA DOMAIN_CONTROLLER_INFO, *PDOMAIN_CONTROLLER_INFO; +typedef DS_DOMAIN_TRUSTSA DS_DOMAIN_TRUSTS, *PDS_DOMAIN_TRUSTS; +#define DsEnumerateDomainTrusts DsEnumerateDomainTrustsA +#define DsGetDcName DsGetDcNameA +#endif + +#ifdef __cplusplus +} +#endif +#endif Propchange: trunk/reactos/include/psdk/dsgetdc.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/psdk/dsgetdc.h ------------------------------------------------------------------------------ svn:keywords = author date revision Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/winnt.h (original) +++ trunk/reactos/include/psdk/winnt.h Sun Aug 6 16:03:31 2006 @@ -2334,6 +2334,8 @@ SID_IDENTIFIER_AUTHORITY IdentifierAuthority; DWORD SubAuthority[ANYSIZE_ARRAY]; } SID, *PISID; +#define SECURITY_MIN_SID_SIZE (sizeof(SID)) +#define SECURITY_MAX_SID_SIZE (FIELD_OFFSET(SID, SubAuthority) + SID_MAX_SUB_AUTHORITIES * sizeof(DWORD)) typedef struct _SID_AND_ATTRIBUTES { PSID Sid; DWORD Attributes;

1 0

[greatlrd] 23495: forget remove one line in DirectDraw_GetAvailableVidMem sorry
by greatlrd＠svn.reactos.org 06 Aug '06

06 Aug '06

Author: greatlrd Date: Sun Aug 6 14:29:56 2006 New Revision: 23495 URL: http://svn.reactos.org/svn/reactos?rev=23495&view=rev Log: forget remove one line in DirectDraw_GetAvailableVidMem sorry Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddr… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Sun Aug 6 14:29:56 2006 @@ -1326,11 +1326,9 @@ { return DDERR_NODRIVERSUPPORT; } - - mem.lpDD = &This->mDDrawGlobal; - mem.ddRVal = DDERR_NOTPALETTIZED; - + mem.lpDD = This->mDDrawLocal.lpGbl; + mem.ddRVal = DDERR_NOTPALETTIZED; mem.DDSCaps.dwCaps = ddscaps->dwCaps; mem.ddsCapsEx.dwCaps2 = ddscaps->dwCaps2; mem.ddsCapsEx.dwCaps3 = ddscaps->dwCaps3;

1 0

[greatlrd] 23494: fixing some bugs in DirectDraw_GetAvailableVidMem
by greatlrd＠svn.reactos.org 06 Aug '06

06 Aug '06

Author: greatlrd Date: Sun Aug 6 14:28:08 2006 New Revision: 23494 URL: http://svn.reactos.org/svn/reactos?rev=23494&view=rev Log: fixing some bugs in DirectDraw_GetAvailableVidMem Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddr… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Sun Aug 6 14:28:08 2006 @@ -1330,15 +1330,20 @@ mem.lpDD = &This->mDDrawGlobal; mem.ddRVal = DDERR_NOTPALETTIZED; + mem.lpDD = This->mDDrawLocal.lpGbl; + mem.DDSCaps.dwCaps = ddscaps->dwCaps; + mem.ddsCapsEx.dwCaps2 = ddscaps->dwCaps2; + mem.ddsCapsEx.dwCaps3 = ddscaps->dwCaps3; + mem.ddsCapsEx.dwCaps4 = ddscaps->dwCaps4; + if (This->mDDrawGlobal.lpDDCBtmp->HALDDMiscellaneous.GetAvailDriverMemory(&mem) == DDHAL_DRIVER_HANDLED); { - ddscaps->dwCaps = mem.DDSCaps.dwCaps; - ddscaps->dwCaps2 = mem.ddsCapsEx.dwCaps2; - ddscaps->dwCaps3 = mem.ddsCapsEx.dwCaps3; - ddscaps->dwCaps4 = mem.ddsCapsEx.dwCaps4; - *total = mem.dwTotal; + if (total !=NULL) + { + *total = mem.dwTotal; + } + *free = mem.dwFree; - return mem.ddRVal; }

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