Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 32186: - Port LookupAccountNameA/W from Wine. This fixes VMWare Tools crash in NTDLL introduced by msiexec sync.
by fireball＠svn.reactos.org 07 Feb '08

07 Feb '08

Author: fireball Date: Thu Feb 7 17:05:10 2008 New Revision: 32186 URL: http://svn.reactos.org/svn/reactos?rev=32186&view=rev Log: - Port LookupAccountNameA/W from Wine. This fixes VMWare Tools crash in NTDLL introduced by msiexec sync. Modified: trunk/reactos/dll/win32/advapi32/sec/misc.c Modified: trunk/reactos/dll/win32/advapi32/sec/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/mis… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/misc.c (original) +++ trunk/reactos/dll/win32/advapi32/sec/misc.c Thu Feb 7 17:05:10 2008 @@ -2,13 +2,129 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/advapi32/sec/misc.c - * PURPOSE: Miscellaneous security functions + * PURPOSE: Miscellaneous security functions (some ported from Wine) */ #include <advapi32.h> #define NDEBUG #include <debug.h> + +/* Needed for LookupAccountNameW implementation from Wine */ + +typedef struct _AccountSid { + WELL_KNOWN_SID_TYPE type; + LPCWSTR account; + LPCWSTR domain; + SID_NAME_USE name_use; +} AccountSid; + +static const WCHAR Account_Operators[] = { 'A','c','c','o','u','n','t',' ','O','p','e','r','a','t','o','r','s',0 }; +static const WCHAR Administrator[] = {'A','d','m','i','n','i','s','t','r','a','t','o','r',0 }; +static const WCHAR Administrators[] = { 'A','d','m','i','n','i','s','t','r','a','t','o','r','s',0 }; +static const WCHAR ANONYMOUS_LOGON[] = { 'A','N','O','N','Y','M','O','U','S',' ','L','O','G','O','N',0 }; +static const WCHAR Authenticated_Users[] = { 'A','u','t','h','e','n','t','i','c','a','t','e','d',' ','U','s','e','r','s',0 }; +static const WCHAR Backup_Operators[] = { 'B','a','c','k','u','p',' ','O','p','e','r','a','t','o','r','s',0 }; +static const WCHAR BATCH[] = { 'B','A','T','C','H',0 }; +static const WCHAR Blank[] = { 0 }; +static const WCHAR BUILTIN[] = { 'B','U','I','L','T','I','N',0 }; +static const WCHAR Cert_Publishers[] = { 'C','e','r','t',' ','P','u','b','l','i','s','h','e','r','s',0 }; +static const WCHAR CREATOR_GROUP[] = { 'C','R','E','A','T','O','R',' ','G','R','O','U','P',0 }; +static const WCHAR CREATOR_GROUP_SERVER[] = { 'C','R','E','A','T','O','R',' ','G','R','O','U','P',' ','S','E','R','V','E','R',0 }; +static const WCHAR CREATOR_OWNER[] = { 'C','R','E','A','T','O','R',' ','O','W','N','E','R',0 }; +static const WCHAR CREATOR_OWNER_SERVER[] = { 'C','R','E','A','T','O','R',' ','O','W','N','E','R',' ','S','E','R','V','E','R',0 }; +static const WCHAR DIALUP[] = { 'D','I','A','L','U','P',0 }; +static const WCHAR Digest_Authentication[] = { 'D','i','g','e','s','t',' ','A','u','t','h','e','n','t','i','c','a','t','i','o','n',0 }; +static const WCHAR DOMAIN[] = {'D','O','M','A','I','N',0}; +static const WCHAR Domain_Admins[] = { 'D','o','m','a','i','n',' ','A','d','m','i','n','s',0 }; +static const WCHAR Domain_Computers[] = { 'D','o','m','a','i','n',' ','C','o','m','p','u','t','e','r','s',0 }; +static const WCHAR Domain_Controllers[] = { 'D','o','m','a','i','n',' ','C','o','n','t','r','o','l','l','e','r','s',0 }; +static const WCHAR Domain_Guests[] = { 'D','o','m','a','i','n',' ','G','u','e','s','t','s',0 }; +static const WCHAR Domain_Users[] = { 'D','o','m','a','i','n',' ','U','s','e','r','s',0 }; +static const WCHAR Enterprise_Admins[] = { 'E','n','t','e','r','p','r','i','s','e',' ','A','d','m','i','n','s',0 }; +static const WCHAR ENTERPRISE_DOMAIN_CONTROLLERS[] = { 'E','N','T','E','R','P','R','I','S','E',' ','D','O','M','A','I','N',' ','C','O','N','T','R','O','L','L','E','R','S',0 }; +static const WCHAR Everyone[] = { 'E','v','e','r','y','o','n','e',0 }; +static const WCHAR Group_Policy_Creator_Owners[] = { 'G','r','o','u','p',' ','P','o','l','i','c','y',' ','C','r','e','a','t','o','r',' ','O','w','n','e','r','s',0 }; +static const WCHAR Guest[] = { 'G','u','e','s','t',0 }; +static const WCHAR Guests[] = { 'G','u','e','s','t','s',0 }; +static const WCHAR INTERACTIVE[] = { 'I','N','T','E','R','A','C','T','I','V','E',0 }; +static const WCHAR LOCAL[] = { 'L','O','C','A','L',0 }; +static const WCHAR LOCAL_SERVICE[] = { 'L','O','C','A','L',' ','S','E','R','V','I','C','E',0 }; +static const WCHAR NETWORK[] = { 'N','E','T','W','O','R','K',0 }; +static const WCHAR Network_Configuration_Operators[] = { 'N','e','t','w','o','r','k',' ','C','o','n','f','i','g','u','r','a','t','i','o','n',' ','O','p','e','r','a','t','o','r','s',0 }; +static const WCHAR NETWORK_SERVICE[] = { 'N','E','T','W','O','R','K',' ','S','E','R','V','I','C','E',0 }; +static const WCHAR NT_AUTHORITY[] = { 'N','T',' ','A','U','T','H','O','R','I','T','Y',0 }; +static const WCHAR NT_Pseudo_Domain[] = { 'N','T',' ','P','s','e','u','d','o',' ','D','o','m','a','i','n',0 }; +static const WCHAR NTML_Authentication[] = { 'N','T','M','L',' ','A','u','t','h','e','n','t','i','c','a','t','i','o','n',0 }; +static const WCHAR NULL_SID[] = { 'N','U','L','L',' ','S','I','D',0 }; +static const WCHAR Other_Organization[] = { 'O','t','h','e','r',' ','O','r','g','a','n','i','z','a','t','i','o','n',0 }; +static const WCHAR Performance_Log_Users[] = { 'P','e','r','f','o','r','m','a','n','c','e',' ','L','o','g',' ','U','s','e','r','s',0 }; +static const WCHAR Performance_Monitor_Users[] = { 'P','e','r','f','o','r','m','a','n','c','e',' ','M','o','n','i','t','o','r',' ','U','s','e','r','s',0 }; +static const WCHAR Power_Users[] = { 'P','o','w','e','r',' ','U','s','e','r','s',0 }; +static const WCHAR Pre_Windows_2000_Compatible_Access[] = { 'P','r','e','-','W','i','n','d','o','w','s',' ','2','0','0','0',' ','C','o','m','p','a','t','i','b','l','e',' ','A','c','c','e','s','s',0 }; +static const WCHAR Print_Operators[] = { 'P','r','i','n','t',' ','O','p','e','r','a','t','o','r','s',0 }; +static const WCHAR PROXY[] = { 'P','R','O','X','Y',0 }; +static const WCHAR RAS_and_IAS_Servers[] = { 'R','A','S',' ','a','n','d',' ','I','A','S',' ','S','e','r','v','e','r','s',0 }; +static const WCHAR Remote_Desktop_Users[] = { 'R','e','m','o','t','e',' ','D','e','s','k','t','o','p',' ','U','s','e','r','s',0 }; +static const WCHAR REMOTE_INTERACTIVE_LOGON[] = { 'R','E','M','O','T','E',' ','I','N','T','E','R','A','C','T','I','V','E',' ','L','O','G','O','N',0 }; +static const WCHAR Replicators[] = { 'R','e','p','l','i','c','a','t','o','r','s',0 }; +static const WCHAR RESTRICTED[] = { 'R','E','S','T','R','I','C','T','E','D',0 }; +static const WCHAR SChannel_Authentication[] = { 'S','C','h','a','n','n','e','l',' ','A','u','t','h','e','n','t','i','c','a','t','i','o','n',0 }; +static const WCHAR Schema_Admins[] = { 'S','c','h','e','m','a',' ','A','d','m','i','n','s',0 }; +static const WCHAR SELF[] = { 'S','E','L','F',0 }; +static const WCHAR Server_Operators[] = { 'S','e','r','v','e','r',' ','O','p','e','r','a','t','o','r','s',0 }; +static const WCHAR SERVICE[] = { 'S','E','R','V','I','C','E',0 }; +static const WCHAR SYSTEM[] = { 'S','Y','S','T','E','M',0 }; +static const WCHAR TERMINAL_SERVER_USER[] = { 'T','E','R','M','I','N','A','L',' ','S','E','R','V','E','R',' ','U','S','E','R',0 }; +static const WCHAR This_Organization[] = { 'T','h','i','s',' ','O','r','g','a','n','i','z','a','t','i','o','n',0 }; +static const WCHAR Users[] = { 'U','s','e','r','s',0 }; + +static const AccountSid ACCOUNT_SIDS[] = { + { WinNullSid, NULL_SID, Blank, SidTypeWellKnownGroup }, + { WinWorldSid, Everyone, Blank, SidTypeWellKnownGroup }, + { WinLocalSid, LOCAL, Blank, SidTypeWellKnownGroup }, + { WinCreatorOwnerSid, CREATOR_OWNER, Blank, SidTypeWellKnownGroup }, + { WinCreatorGroupSid, CREATOR_GROUP, Blank, SidTypeWellKnownGroup }, + { WinCreatorOwnerServerSid, CREATOR_OWNER_SERVER, Blank, SidTypeWellKnownGroup }, + { WinCreatorGroupServerSid, CREATOR_GROUP_SERVER, Blank, SidTypeWellKnownGroup }, + { WinNtAuthoritySid, NT_Pseudo_Domain, NT_Pseudo_Domain, SidTypeDomain }, + { WinDialupSid, DIALUP, NT_AUTHORITY, SidTypeWellKnownGroup }, + { WinNetworkSid, NETWORK, NT_AUTHORITY, SidTypeWellKnownGroup }, + { WinBatchSid, BATCH, NT_AUTHORITY, SidTypeWellKnownGroup }, + { WinInteractiveSid, INTERACTIVE, NT_AUTHORITY, SidTypeWellKnownGroup }, + { WinServiceSid, SERVICE, NT_AUTHORITY, SidTypeWellKnownGroup }, + { WinAnonymousSid, ANONYMOUS_LOGON, NT_AUTHORITY, SidTypeWellKnownGroup }, + { WinProxySid, PROXY, NT_AUTHORITY, SidTypeWellKnownGroup }, + { WinEnterpriseControllersSid, ENTERPRISE_DOMAIN_CONTROLLERS, NT_AUTHORITY, SidTypeWellKnownGroup }, + { WinSelfSid, SELF, NT_AUTHORITY, SidTypeWellKnownGroup }, + { WinAuthenticatedUserSid, Authenticated_Users, NT_AUTHORITY, SidTypeWellKnownGroup }, + { WinRestrictedCodeSid, RESTRICTED, NT_AUTHORITY, SidTypeWellKnownGroup }, + { WinTerminalServerSid, TERMINAL_SERVER_USER, NT_AUTHORITY, SidTypeWellKnownGroup }, + { WinRemoteLogonIdSid, REMOTE_INTERACTIVE_LOGON, NT_AUTHORITY, SidTypeWellKnownGroup }, + { WinLocalSystemSid, SYSTEM, NT_AUTHORITY, SidTypeWellKnownGroup }, + { WinLocalServiceSid, LOCAL_SERVICE, NT_AUTHORITY, SidTypeWellKnownGroup }, + { WinNetworkServiceSid, NETWORK_SERVICE, NT_AUTHORITY, SidTypeWellKnownGroup }, + { WinBuiltinDomainSid, BUILTIN, BUILTIN, SidTypeDomain }, + { WinBuiltinAdministratorsSid, Administrators, BUILTIN, SidTypeAlias }, + { WinBuiltinUsersSid, Users, BUILTIN, SidTypeAlias }, + { WinBuiltinGuestsSid, Guests, BUILTIN, SidTypeAlias }, + { WinBuiltinPowerUsersSid, Power_Users, BUILTIN, SidTypeAlias }, + { WinBuiltinAccountOperatorsSid, Account_Operators, BUILTIN, SidTypeAlias }, + { WinBuiltinSystemOperatorsSid, Server_Operators, BUILTIN, SidTypeAlias }, + { WinBuiltinPrintOperatorsSid, Print_Operators, BUILTIN, SidTypeAlias }, + { WinBuiltinBackupOperatorsSid, Backup_Operators, BUILTIN, SidTypeAlias }, + { WinBuiltinReplicatorSid, Replicators, BUILTIN, SidTypeAlias }, + { WinBuiltinPreWindows2000CompatibleAccessSid, Pre_Windows_2000_Compatible_Access, BUILTIN, SidTypeAlias }, + { WinBuiltinRemoteDesktopUsersSid, Remote_Desktop_Users, BUILTIN, SidTypeAlias }, + { WinBuiltinNetworkConfigurationOperatorsSid, Network_Configuration_Operators, BUILTIN, SidTypeAlias }, + { WinNTLMAuthenticationSid, NTML_Authentication, NT_AUTHORITY, SidTypeWellKnownGroup }, + { WinDigestAuthenticationSid, Digest_Authentication, NT_AUTHORITY, SidTypeWellKnownGroup }, + { WinSChannelAuthenticationSid, SChannel_Authentication, NT_AUTHORITY, SidTypeWellKnownGroup }, + { WinThisOrganizationSid, This_Organization, NT_AUTHORITY, SidTypeWellKnownGroup }, + { WinOtherOrganizationSid, Other_Organization, NT_AUTHORITY, SidTypeWellKnownGroup }, + { WinBuiltinPerfMonitoringUsersSid, Performance_Monitor_Users, BUILTIN, SidTypeAlias }, + { WinBuiltinPerfLoggingUsersSid, Performance_Log_Users, BUILTIN, SidTypeAlias }, +}; /* Interface to ntmarta.dll ***************************************************/ @@ -984,20 +1100,42 @@ /****************************************************************************** * LookupAccountNameA [ADVAPI32.@] * - * @unimplemented + * @implemented */ BOOL STDCALL LookupAccountNameA (LPCSTR SystemName, LPCSTR AccountName, - PSID Sid, - LPDWORD SidLength, - LPSTR ReferencedDomainName, - LPDWORD hReferencedDomainNameLength, - PSID_NAME_USE SidNameUse) -{ - DPRINT1("LookupAccountNameA is unimplemented\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + PSID Sid, + LPDWORD SidLength, + LPSTR ReferencedDomainName, + LPDWORD hReferencedDomainNameLength, + PSID_NAME_USE SidNameUse) +{ + BOOL ret; + UNICODE_STRING lpSystemW; + UNICODE_STRING lpAccountW; + LPWSTR lpReferencedDomainNameW = NULL; + + RtlCreateUnicodeStringFromAsciiz(&lpSystemW, SystemName); + RtlCreateUnicodeStringFromAsciiz(&lpAccountW, AccountName); + + if (ReferencedDomainName) + lpReferencedDomainNameW = HeapAlloc(GetProcessHeap(), 0, *hReferencedDomainNameLength * sizeof(WCHAR)); + + ret = LookupAccountNameW(lpSystemW.Buffer, lpAccountW.Buffer, Sid, SidLength, lpReferencedDomainNameW, + hReferencedDomainNameLength, SidNameUse); + + if (ret && lpReferencedDomainNameW) + { + WideCharToMultiByte(CP_ACP, 0, lpReferencedDomainNameW, *hReferencedDomainNameLength, + ReferencedDomainName, *hReferencedDomainNameLength, NULL, NULL); + } + + RtlFreeUnicodeString(&lpSystemW); + RtlFreeUnicodeString(&lpAccountW); + HeapFree(GetProcessHeap(), 0, lpReferencedDomainNameW); + + return ret; } @@ -1006,18 +1144,71 @@ * * @unimplemented */ -BOOL STDCALL -LookupAccountNameW (LPCWSTR SystemName, - LPCWSTR AccountName, - PSID Sid, - LPDWORD SidLength, - LPWSTR ReferencedDomainName, - LPDWORD hReferencedDomainNameLength, - PSID_NAME_USE SidNameUse) -{ - DPRINT1("LookupAccountNameW is unimplemented\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; +BOOL WINAPI LookupAccountNameW(LPCWSTR lpSystemName, LPCWSTR lpAccountName, PSID Sid, + LPDWORD cbSid, LPWSTR ReferencedDomainName, + LPDWORD cchReferencedDomainName, PSID_NAME_USE peUse) +{ + /* Default implementation: Always return a default SID */ + SID_IDENTIFIER_AUTHORITY identifierAuthority = {SECURITY_NT_AUTHORITY}; + BOOL ret; + PSID pSid; + static const WCHAR dm[] = {'D','O','M','A','I','N',0}; + unsigned int i; + + DPRINT("%s %s %p %p %p %p %p - stub\n", lpSystemName, lpAccountName, + Sid, cbSid, ReferencedDomainName, cchReferencedDomainName, peUse); + + for (i = 0; i < (sizeof(ACCOUNT_SIDS) / sizeof(ACCOUNT_SIDS[0])); i++) + { + if (!wcscmp(lpAccountName, ACCOUNT_SIDS[i].account)) + { + if (*cchReferencedDomainName) + *ReferencedDomainName = '\0'; + *cchReferencedDomainName = 0; + *peUse = SidTypeWellKnownGroup; + return CreateWellKnownSid(ACCOUNT_SIDS[i].type, NULL, Sid, cbSid); + } + } + + ret = AllocateAndInitializeSid(&identifierAuthority, + 2, + SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, + 0, 0, 0, 0, 0, 0, + &pSid); + + if (!ret) + return FALSE; + + if (!RtlValidSid(pSid)) + { + FreeSid(pSid); + return FALSE; + } + + if (Sid != NULL && (*cbSid >= GetLengthSid(pSid))) + CopySid(*cbSid, Sid, pSid); + if (*cbSid < GetLengthSid(pSid)) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + ret = FALSE; + } + *cbSid = GetLengthSid(pSid); + + if (ReferencedDomainName != NULL && (*cchReferencedDomainName > wcslen(dm))) + wcscpy(ReferencedDomainName, dm); + + if (*cchReferencedDomainName <= wcslen(dm)) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + ret = FALSE; + } + + *cchReferencedDomainName = wcslen(dm)+1; + + FreeSid(pSid); + + return ret; }

1 0

[fireball] 32185: - Apply elf-changes changes to ntkrnlmp.rbuild. - Small formatting fix for ntoskrnl.rbuild.
by fireball＠svn.reactos.org 07 Feb '08

07 Feb '08

Author: fireball Date: Thu Feb 7 16:42:29 2008 New Revision: 32185 URL: http://svn.reactos.org/svn/reactos?rev=32185&view=rev Log: - Apply elf-changes changes to ntkrnlmp.rbuild. - Small formatting fix for ntoskrnl.rbuild. Modified: trunk/reactos/ntoskrnl/ntkrnlmp.rbuild trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/ntoskrnl/ntkrnlmp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntkrnlmp.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntkrnlmp.rbuild (original) +++ trunk/reactos/ntoskrnl/ntkrnlmp.rbuild Thu Feb 7 16:42:29 2008 @@ -16,6 +16,9 @@ <define name="_IN_KERNEL_" /> <if property="_WINKD_" value="1"> <define name="_WINKD_" /> + </if> + <if property="_ELF" value="1"> + <define name="_ELF_" /> </if> <include base="cmlib">.</include> <include base="ntoskrnl">include</include> @@ -363,8 +366,10 @@ <file>verifier.c</file> <file>virtual.c</file> <file>wset.c</file> - <file>elf32.c</file> - <file>elf64.c</file> + <if property="_ELF_" value="1"> + <file>elf32.c</file> + <file>elf64.c</file> + </if> </directory> <directory name="ob"> <file>obdir.c</file> Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Thu Feb 7 16:42:29 2008 @@ -363,7 +363,7 @@ <if property="_ELF_" value="1"> <file>elf32.c</file> <file>elf64.c</file> - </if> + </if> </directory> <directory name="ob"> <file>obdir.c</file>

1 0

[janderwald] 32184: - change cmd "control" to "control.exe" - fix over-translated strings - acquire full path for the traget executable and directly invoke CreateProcess - zero initialize param szTemp to fix a possible buffer overflow - fixes bug 3027
by janderwald＠svn.reactos.org 07 Feb '08

07 Feb '08

Author: janderwald Date: Thu Feb 7 14:23:38 2008 New Revision: 32184 URL: http://svn.reactos.org/svn/reactos?rev=32184&view=rev Log: - change cmd "control" to "control.exe" - fix over-translated strings - acquire full path for the traget executable and directly invoke CreateProcess - zero initialize param szTemp to fix a possible buffer overflow - fixes bug 3027 Modified: trunk/reactos/base/applications/msconfig/lang/bg-BG.rc trunk/reactos/base/applications/msconfig/lang/ca-ES.rc trunk/reactos/base/applications/msconfig/lang/cs-CZ.rc trunk/reactos/base/applications/msconfig/lang/de-DE.rc trunk/reactos/base/applications/msconfig/lang/el-GR.rc trunk/reactos/base/applications/msconfig/lang/en-US.rc trunk/reactos/base/applications/msconfig/lang/fr-FR.rc trunk/reactos/base/applications/msconfig/lang/hu-HU.rc trunk/reactos/base/applications/msconfig/lang/id-ID.rc trunk/reactos/base/applications/msconfig/lang/it-IT.rc trunk/reactos/base/applications/msconfig/lang/nb-NO.rc trunk/reactos/base/applications/msconfig/lang/nl-NL.rc trunk/reactos/base/applications/msconfig/lang/pl-PL.rc trunk/reactos/base/applications/msconfig/lang/pt-BR.rc trunk/reactos/base/applications/msconfig/lang/ru-RU.rc trunk/reactos/base/applications/msconfig/lang/th-TH.rc trunk/reactos/base/applications/msconfig/lang/uk-UA.rc trunk/reactos/base/applications/msconfig/lang/zh-CN.rc trunk/reactos/base/applications/msconfig/msconfig.rbuild trunk/reactos/base/applications/msconfig/precomp.h trunk/reactos/base/applications/msconfig/toolspage.c Modified: trunk/reactos/base/applications/msconfig/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/bg-BG.rc (original) +++ trunk/reactos/base/applications/msconfig/lang/bg-BG.rc Thu Feb 7 14:23:38 2008 @@ -158,7 +158,7 @@ IDS_TOOLS_SYSDM_NAME "Ñâîéñòâà íà ñèñòåìàòà" IDS_TOOLS_SYSDM_DESCR "Äàâà ñâåäåíèÿ çàêîìïþòúðà." - IDS_TOOLS_SYSDM_CMD "control" + IDS_TOOLS_SYSDM_CMD "control.exe" IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" IDS_STARTUP_COLUMN_ELEMENT "Ïðåäìåò" Modified: trunk/reactos/base/applications/msconfig/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/ca-ES.rc (original) +++ trunk/reactos/base/applications/msconfig/lang/ca-ES.rc Thu Feb 7 14:23:38 2008 @@ -157,7 +157,7 @@ IDS_TOOLS_SYSDM_NAME "Propietats del sistema" IDS_TOOLS_SYSDM_DESCR "Mostra la informacio d'aquest ordinador." - IDS_TOOLS_SYSDM_CMD "control" + IDS_TOOLS_SYSDM_CMD "control.exe" IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" IDS_STARTUP_COLUMN_ELEMENT "Element" Modified: trunk/reactos/base/applications/msconfig/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/cs-CZ.rc (original) +++ trunk/reactos/base/applications/msconfig/lang/cs-CZ.rc Thu Feb 7 14:23:38 2008 @@ -157,7 +157,7 @@ IDS_TOOLS_SYSDM_NAME "Systém" IDS_TOOLS_SYSDM_DESCR "Zobrazí informace o systému." - IDS_TOOLS_SYSDM_CMD "control" + IDS_TOOLS_SYSDM_CMD "control.exe" IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" IDS_STARTUP_COLUMN_ELEMENT "Poloka" Modified: trunk/reactos/base/applications/msconfig/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/de-DE.rc (original) +++ trunk/reactos/base/applications/msconfig/lang/de-DE.rc Thu Feb 7 14:23:38 2008 @@ -158,7 +158,7 @@ IDS_TOOLS_SYSDM_NAME "Systemeigenschaften" IDS_TOOLS_SYSDM_DESCR "Zeigt Informationen über diesen Rechner an." - IDS_TOOLS_SYSDM_CMD "control" + IDS_TOOLS_SYSDM_CMD "control.exe" IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" IDS_STARTUP_COLUMN_ELEMENT "Element" Modified: trunk/reactos/base/applications/msconfig/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/el-GR.rc (original) +++ trunk/reactos/base/applications/msconfig/lang/el-GR.rc Thu Feb 7 14:23:38 2008 @@ -157,7 +157,7 @@ IDS_TOOLS_SYSDM_NAME "Éäéüôçôåò óõóôÞìáôïò" IDS_TOOLS_SYSDM_DESCR "Åìöáíßæåé ðëçñïöïñßåò ãéá áõôüí ôïí õðïëïãéóôÞ." - IDS_TOOLS_SYSDM_CMD "control" + IDS_TOOLS_SYSDM_CMD "control.exe" IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" IDS_STARTUP_COLUMN_ELEMENT "Element" Modified: trunk/reactos/base/applications/msconfig/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/en-US.rc (original) +++ trunk/reactos/base/applications/msconfig/lang/en-US.rc Thu Feb 7 14:23:38 2008 @@ -157,7 +157,7 @@ IDS_TOOLS_SYSDM_NAME "System properties" IDS_TOOLS_SYSDM_DESCR "Shows information about this computer." - IDS_TOOLS_SYSDM_CMD "control" + IDS_TOOLS_SYSDM_CMD "control.exe" IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" IDS_STARTUP_COLUMN_ELEMENT "Element" Modified: trunk/reactos/base/applications/msconfig/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/fr-FR.rc (original) +++ trunk/reactos/base/applications/msconfig/lang/fr-FR.rc Thu Feb 7 14:23:38 2008 @@ -157,7 +157,7 @@ IDS_TOOLS_SYSDM_NAME "Propriétés système" IDS_TOOLS_SYSDM_DESCR "Affiche/modifie des information à propos de l'ordinateur." - IDS_TOOLS_SYSDM_CMD "control" + IDS_TOOLS_SYSDM_CMD "control.exe" IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" IDS_STARTUP_COLUMN_ELEMENT "Elément" Modified: trunk/reactos/base/applications/msconfig/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/hu-HU.rc (original) +++ trunk/reactos/base/applications/msconfig/lang/hu-HU.rc Thu Feb 7 14:23:38 2008 @@ -159,7 +159,7 @@ IDS_TOOLS_SYSDM_NAME "Rendszertulajdonságok" IDS_TOOLS_SYSDM_DESCR "Megjeleníti a számítógép információkat." - IDS_TOOLS_SYSDM_CMD "control" + IDS_TOOLS_SYSDM_CMD "control.exe" IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" IDS_STARTUP_COLUMN_ELEMENT "Element" Modified: trunk/reactos/base/applications/msconfig/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/id-ID.rc (original) +++ trunk/reactos/base/applications/msconfig/lang/id-ID.rc Thu Feb 7 14:23:38 2008 @@ -157,7 +157,7 @@ IDS_TOOLS_SYSDM_NAME "Properti Sistem" IDS_TOOLS_SYSDM_DESCR "Menampilkan informasi mengenai komputer ini." - IDS_TOOLS_SYSDM_CMD "control" + IDS_TOOLS_SYSDM_CMD "control.exe" IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" IDS_STARTUP_COLUMN_ELEMENT "Elemen" Modified: trunk/reactos/base/applications/msconfig/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/it-IT.rc (original) +++ trunk/reactos/base/applications/msconfig/lang/it-IT.rc Thu Feb 7 14:23:38 2008 @@ -157,7 +157,7 @@ IDS_TOOLS_SYSDM_NAME "Proprietà del sistema" IDS_TOOLS_SYSDM_DESCR "Mostra informazioni su questo pc." - IDS_TOOLS_SYSDM_CMD "control" + IDS_TOOLS_SYSDM_CMD "control.exe" IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" IDS_STARTUP_COLUMN_ELEMENT "Elemento" Modified: trunk/reactos/base/applications/msconfig/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/nb-NO.rc (original) +++ trunk/reactos/base/applications/msconfig/lang/nb-NO.rc Thu Feb 7 14:23:38 2008 @@ -157,7 +157,7 @@ IDS_TOOLS_SYSDM_NAME "System egenskaper" IDS_TOOLS_SYSDM_DESCR "Vis informasjon om denne datamaskinen." - IDS_TOOLS_SYSDM_CMD "kontroll" + IDS_TOOLS_SYSDM_CMD "control.exe" IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" IDS_STARTUP_COLUMN_ELEMENT "Element" Modified: trunk/reactos/base/applications/msconfig/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/nl-NL.rc (original) +++ trunk/reactos/base/applications/msconfig/lang/nl-NL.rc Thu Feb 7 14:23:38 2008 @@ -177,7 +177,7 @@ IDS_TOOLS_SYSDM_NAME "Systeemeigenschappen" IDS_TOOLS_SYSDM_DESCR "Toont informatie over deze computer" - IDS_TOOLS_SYSDM_CMD "control" + IDS_TOOLS_SYSDM_CMD "control.exe" IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" IDS_STARTUP_COLUMN_ELEMENT "Element" Modified: trunk/reactos/base/applications/msconfig/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/pl-PL.rc (original) +++ trunk/reactos/base/applications/msconfig/lang/pl-PL.rc Thu Feb 7 14:23:38 2008 @@ -163,7 +163,7 @@ IDS_TOOLS_SYSDM_NAME "W³aciwoci systemu" IDS_TOOLS_SYSDM_DESCR "Pokazuje informacje o tym komputerze." - IDS_TOOLS_SYSDM_CMD "control" + IDS_TOOLS_SYSDM_CMD "control.exe" IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" IDS_STARTUP_COLUMN_ELEMENT "Element" Modified: trunk/reactos/base/applications/msconfig/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/pt-BR.rc (original) +++ trunk/reactos/base/applications/msconfig/lang/pt-BR.rc Thu Feb 7 14:23:38 2008 @@ -163,7 +163,7 @@ IDS_TOOLS_SYSDM_NAME "Propriedades do sistema" IDS_TOOLS_SYSDM_DESCR "Mostra informações sobre este computador." - IDS_TOOLS_SYSDM_CMD "control" + IDS_TOOLS_SYSDM_CMD "control.exe" IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" IDS_STARTUP_COLUMN_ELEMENT "Item de inicialização" Modified: trunk/reactos/base/applications/msconfig/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/msconfig/lang/ru-RU.rc Thu Feb 7 14:23:38 2008 @@ -159,7 +159,7 @@ IDS_TOOLS_SYSDM_NAME "Íàñòðîéêè ñèñòåìû" IDS_TOOLS_SYSDM_DESCR "Ïîêàçàòü èíôîðìàöèþ îá ýòîì êîìïüþòåðå." - IDS_TOOLS_SYSDM_CMD "control" + IDS_TOOLS_SYSDM_CMD "control.exe" IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" IDS_STARTUP_COLUMN_ELEMENT "Ýëåìåíò" Modified: trunk/reactos/base/applications/msconfig/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/th-TH.rc (original) +++ trunk/reactos/base/applications/msconfig/lang/th-TH.rc Thu Feb 7 14:23:38 2008 @@ -177,7 +177,7 @@ IDS_TOOLS_SYSDM_NAME "¤Ø³ÊÁºÑµÔ¢Í§ÃÐºº" IDS_TOOLS_SYSDM_DESCR "áÊ´§¢éÍÁÙÅà¡ÕèÂÇ¡Ñº¤ÍÁ¾ÔÇàµÍÃì¹Õé" - IDS_TOOLS_SYSDM_CMD "ÊèÇ¹¤Çº¤ØÁ" + IDS_TOOLS_SYSDM_CMD "control.exe" IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" IDS_STARTUP_COLUMN_ELEMENT "ÊèÇ¹»ÃÐ¡Íº" Modified: trunk/reactos/base/applications/msconfig/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/uk-UA.rc (original) +++ trunk/reactos/base/applications/msconfig/lang/uk-UA.rc Thu Feb 7 14:23:38 2008 @@ -165,7 +165,7 @@ IDS_TOOLS_SYSDM_NAME "Âëàñòèâîñò³ ñèñòåìè" IDS_TOOLS_SYSDM_DESCR "Ïîêàçóº ³íôîðìàö³þ ïðî êîìï'þòåð." - IDS_TOOLS_SYSDM_CMD "control" + IDS_TOOLS_SYSDM_CMD "control.exe" IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" IDS_STARTUP_COLUMN_ELEMENT "Åëåìåíò" Modified: trunk/reactos/base/applications/msconfig/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/zh-CN.rc (original) +++ trunk/reactos/base/applications/msconfig/lang/zh-CN.rc Thu Feb 7 14:23:38 2008 @@ -177,7 +177,7 @@ IDS_TOOLS_SYSDM_NAME "ÏµÍ³ÊôÐÔ" IDS_TOOLS_SYSDM_DESCR "ÏÔÊ¾ÕâÌ¨¼ÆËã»úµÄÊôÐÔ" - IDS_TOOLS_SYSDM_CMD "control" + IDS_TOOLS_SYSDM_CMD "control.exe" IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" IDS_STARTUP_COLUMN_ELEMENT "Æô¶¯ÏîÄ¿" Modified: trunk/reactos/base/applications/msconfig/msconfig.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/msconfig.rbuild (original) +++ trunk/reactos/base/applications/msconfig/msconfig.rbuild Thu Feb 7 14:23:38 2008 @@ -12,6 +12,7 @@ <library>version</library> <library>comctl32</library> <library>shell32</library> + <library>shlwapi</library> <compilationunit name="unit.c"> <file>toolspage.c</file> <file>srvpage.c</file> Modified: trunk/reactos/base/applications/msconfig/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/precomp.h (original) +++ trunk/reactos/base/applications/msconfig/precomp.h Thu Feb 7 14:23:38 2008 @@ -4,6 +4,8 @@ #include <winuser.h> #include <tchar.h> #include <stdio.h> +#include <shlwapi.h> +#include <shlobj.h> #include "resource.h" #include "msconfig.h" Modified: trunk/reactos/base/applications/msconfig/toolspage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/toolspage.c (original) +++ trunk/reactos/base/applications/msconfig/toolspage.c Thu Feb 7 14:23:38 2008 @@ -13,13 +13,14 @@ HWND hToolsListCtrl; HWND hToolsDialog; -void AddItem ( DWORD, DWORD, DWORD, DWORD ); +void AddItem ( DWORD, DWORD, DWORD, DWORD, int ); void FillListView ( void ); DWORD ListItems_Cmds[20]; DWORD ListItems_Params[20]; +DWORD ListItems_Locations[20]; -void AddItem ( DWORD name_id, DWORD descr_id, DWORD cmd_id , DWORD param_id ) { +void AddItem ( DWORD name_id, DWORD descr_id, DWORD cmd_id , DWORD param_id, int csidl ) { TCHAR szTemp[256]; LV_ITEM item; @@ -34,6 +35,7 @@ ListItems_Cmds[item.iItem] = cmd_id; ListItems_Params[item.iItem] = param_id; + ListItems_Locations[item.iItem] = csidl; LoadString(hInst, descr_id, szTemp, 256); item.pszText = szTemp; @@ -42,21 +44,24 @@ } void FillListView ( void ) { - AddItem(IDS_TOOLS_CMD_NAME, IDS_TOOLS_CMD_DESCR, IDS_TOOLS_CMD_CMD, IDS_TOOLS_CMD_PARAM); - AddItem(IDS_TOOLS_REGEDIT_NAME, IDS_TOOLS_REGEDIT_DESCR, IDS_TOOLS_REGEDIT_CMD,IDS_TOOLS_REGEDIT_PARAM); - AddItem(IDS_TOOLS_SYSDM_NAME, IDS_TOOLS_SYSDM_DESCR, IDS_TOOLS_SYSDM_CMD, IDS_TOOLS_SYSDM_PARAM); - AddItem(IDS_TOOLS_INFO_NAME, IDS_TOOLS_INFO_DESCR, IDS_TOOLS_INFO_CMD, IDS_TOOLS_INFO_PARAM); + AddItem(IDS_TOOLS_CMD_NAME, IDS_TOOLS_CMD_DESCR, IDS_TOOLS_CMD_CMD, IDS_TOOLS_CMD_PARAM, CSIDL_SYSTEM); + AddItem(IDS_TOOLS_REGEDIT_NAME, IDS_TOOLS_REGEDIT_DESCR, IDS_TOOLS_REGEDIT_CMD,IDS_TOOLS_REGEDIT_PARAM, CSIDL_WINDOWS); + AddItem(IDS_TOOLS_SYSDM_NAME, IDS_TOOLS_SYSDM_DESCR, IDS_TOOLS_SYSDM_CMD, IDS_TOOLS_SYSDM_PARAM, CSIDL_SYSTEM); + AddItem(IDS_TOOLS_INFO_NAME, IDS_TOOLS_INFO_DESCR, IDS_TOOLS_INFO_CMD, IDS_TOOLS_INFO_PARAM, CSIDL_SYSTEM); } INT_PTR CALLBACK ToolsPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { LV_COLUMN column; - TCHAR szTemp[256]; + TCHAR szTemp[MAX_PATH*2]; TCHAR szTemp2[256]; + TCHAR * Ptr = NULL; LPNMITEMACTIVATE lpnmitem; LPNMHDR nmh; DWORD dwStyle; + PROCESS_INFORMATION pi; + STARTUPINFO si; switch (message) { @@ -96,9 +101,27 @@ { if (ListView_GetSelectionMark(hToolsListCtrl) != -1) { - LoadString(hInst, ListItems_Cmds[ListView_GetSelectionMark(hToolsListCtrl)], szTemp, 256); + if (SHGetSpecialFolderPath(NULL, szTemp, ListItems_Locations[ListView_GetSelectionMark(hToolsListCtrl)], FALSE)) + Ptr = PathAddBackslash(szTemp); + + if (!Ptr) + Ptr = szTemp; + + szTemp2[0] = _T('\0'); + LoadString(hInst, ListItems_Cmds[ListView_GetSelectionMark(hToolsListCtrl)], Ptr, 256); LoadString(hInst, ListItems_Params[ListView_GetSelectionMark(hToolsListCtrl)], szTemp2, 256); - ShellExecute(0, _T("open"), szTemp, szTemp2, _T(""), SW_NORMAL); + if (_tcslen(szTemp2)) + { + _tcscat(szTemp, _T(" ")); + _tcscat(Ptr, szTemp2); + } + ZeroMemory(&si, sizeof(STARTUPINFO)); + si.cb = sizeof(STARTUPINFO); + if (CreateProcess(NULL, szTemp, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) + { + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + } } } } @@ -117,6 +140,7 @@ if (lpnmitem->iItem > -1) { LoadString(hInst, ListItems_Cmds[lpnmitem->iItem], szTemp, 256); + szTemp2[0] = _T('\0'); LoadString(hInst, ListItems_Params[lpnmitem->iItem], szTemp2, 256); _tcscat(szTemp, _T(" ")); _tcscat(szTemp, szTemp2); @@ -129,9 +153,27 @@ lpnmitem = (LPNMITEMACTIVATE) lParam; if (lpnmitem->iItem > -1) { - LoadString(hInst, ListItems_Cmds[lpnmitem->iItem], szTemp, 256); + if (SHGetSpecialFolderPath(NULL, szTemp, ListItems_Locations[ListView_GetSelectionMark(hToolsListCtrl)], FALSE)) + Ptr = PathAddBackslash(szTemp); + + if (!Ptr) + Ptr = szTemp; + + szTemp2[0] = _T('\0'); + LoadString(hInst, ListItems_Cmds[lpnmitem->iItem], Ptr, 256); LoadString(hInst, ListItems_Params[lpnmitem->iItem], szTemp2, 256); - ShellExecute(0, _T("open"), szTemp, szTemp2, _T(""), SW_NORMAL); + if (_tcslen(szTemp2)) + { + _tcscat(szTemp, _T(" ")); + _tcscat(Ptr, szTemp2); + } + ZeroMemory(&si, sizeof(STARTUPINFO)); + si.cb = sizeof(STARTUPINFO); + if (CreateProcess(NULL, szTemp, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) + { + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + } } break; }

1 0

[janderwald] 32183: - improve control a bit so it that can execute cpl specified on the command line - ignore the function index, page index for now
by janderwald＠svn.reactos.org 07 Feb '08

07 Feb '08

Author: janderwald Date: Thu Feb 7 14:21:10 2008 New Revision: 32183 URL: http://svn.reactos.org/svn/reactos?rev=32183&view=rev Log: - improve control a bit so it that can execute cpl specified on the command line - ignore the function index, page index for now Modified: trunk/reactos/base/applications/control/control.c Modified: trunk/reactos/base/applications/control/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… ============================================================================== --- trunk/reactos/base/applications/control/control.c (original) +++ trunk/reactos/base/applications/control/control.c Thu Feb 7 14:21:10 2008 @@ -404,6 +404,7 @@ _tmain(int argc, const TCHAR *argv[]) { STARTUPINFO si; + TCHAR * szExt; si.cb = sizeof(si); GetStartupInfo(&si); @@ -436,6 +437,22 @@ { return RunControlPanel(_T("main.cpl"), 1); } + else if ((szExt = _tcsstr(argv[1], _T(".cpl")))) + { + TCHAR * szSep; + TCHAR szCPL[MAX_PATH]; + UINT selPage = 0; + + _tcscpy(szCPL, argv[1]); + szSep = _tcsstr(szCPL, _T(".cpl,")); + + if (szSep) + { + /* FIXME for now ignore page index */ + szSep[4] = _T('\0'); + } + return RunControlPanel(szCPL, selPage); + } return 0; }

1 0

[dreimer] 32182: Fix typo
by dreimer＠svn.reactos.org 07 Feb '08

07 Feb '08

Author: dreimer Date: Thu Feb 7 12:41:26 2008 New Revision: 32182 URL: http://svn.reactos.org/svn/reactos?rev=32182&view=rev Log: Fix typo Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cle… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd Thu Feb 7 12:41:26 2008 @@ -73,6 +73,7 @@ ) goto :EOF -:EOCif defined _ROSBE_VERSION ( +:EOC +if defined _ROSBE_VERSION ( title ReactOS Build Environment %_ROSBE_VERSION% )

1 0

[navaraf] 32181: Fix one more bug in adding subkeys.
by navaraf＠svn.reactos.org 07 Feb '08

07 Feb '08

Author: navaraf Date: Thu Feb 7 11:22:24 2008 New Revision: 32181 URL: http://svn.reactos.org/svn/reactos?rev=32181&view=rev Log: Fix one more bug in adding subkeys. Modified: trunk/reactos/tools/mkhive/cmi.c Modified: trunk/reactos/tools/mkhive/cmi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/cmi.c?rev=321… ============================================================================== --- trunk/reactos/tools/mkhive/cmi.c (original) +++ trunk/reactos/tools/mkhive/cmi.c Thu Feb 7 11:22:24 2008 @@ -176,7 +176,7 @@ { RtlMoveMemory(HashCell->List + i + 1, HashCell->List + i, - (HashCell->Count - 1 - i) * + (HashCell->Count - i) * sizeof(HashCell->List[0])); }

1 0

[navaraf] 32180: Fix hash table generating.
by navaraf＠svn.reactos.org 07 Feb '08

07 Feb '08

Author: navaraf Date: Thu Feb 7 11:04:17 2008 New Revision: 32180 URL: http://svn.reactos.org/svn/reactos?rev=32180&view=rev Log: Fix hash table generating. Modified: trunk/reactos/tools/mkhive/cmi.c Modified: trunk/reactos/tools/mkhive/cmi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/cmi.c?rev=321… ============================================================================== --- trunk/reactos/tools/mkhive/cmi.c (original) +++ trunk/reactos/tools/mkhive/cmi.c Thu Feb 7 11:04:17 2008 @@ -151,13 +151,12 @@ CmiAddKeyToHashTable( IN PCMHIVE RegistryHive, IN OUT PCM_KEY_FAST_INDEX HashCell, - IN PCM_KEY_NODE KeyCell, - IN HSTORAGE_TYPE StorageType, + IN HCELL_INDEX HashCellIndex, IN PCM_KEY_NODE NewKeyCell, IN HCELL_INDEX NKBOffset) { - ULONG i = KeyCell->SubKeyCounts[StorageType]; - ULONG HashKey; + ULONG i; + ULONG HashKey = 0; if (NewKeyCell->Flags & KEY_COMP_NAME) { @@ -167,13 +166,13 @@ min(NewKeyCell->NameLength, sizeof(ULONG))); } - for (i = 0; i < KeyCell->SubKeyCounts[StorageType]; i++) + for (i = 0; i < HashCell->Count; i++) { if (HashCell->List[i].HashKey > HashKey) break; } - if (i < KeyCell->SubKeyCounts[StorageType]) + if (i < HashCell->Count) { RtlMoveMemory(HashCell->List + i + 1, HashCell->List + i, @@ -183,7 +182,8 @@ HashCell->List[i].Cell = NKBOffset; HashCell->List[i].HashKey = HashKey; - HvMarkCellDirty(&RegistryHive->Hive, KeyCell->SubKeyLists[StorageType], FALSE); + HashCell->Count++; + HvMarkCellDirty(&RegistryHive->Hive, HashCellIndex, FALSE); return STATUS_SUCCESS; } @@ -211,10 +211,9 @@ } else { - ASSERT(SubKeyCount <= USHORT_MAX); NewHashBlock = (PCM_KEY_FAST_INDEX)HvGetCell (&RegistryHive->Hive, *HBOffset); NewHashBlock->Signature = CM_KEY_FAST_LEAF; - NewHashBlock->Count = SubKeyCount; + NewHashBlock->Count = 0; *HashBlock = NewHashBlock; } @@ -353,7 +352,8 @@ ParentKeyCell->SubKeyLists[Storage]); ASSERT(HashBlock->Signature == CM_KEY_FAST_LEAF); - if (((ParentKeyCell->SubKeyCounts[Storage] + 1) >= HashBlock->Count)) + if (HashBlock->Count == + ((HvGetCellSize(&RegistryHive->Hive, HashBlock) - FIELD_OFFSET(CM_KEY_FAST_INDEX, List)) / sizeof(CM_INDEX))) { PCM_KEY_FAST_INDEX NewHashBlock; HCELL_INDEX HTOffset; @@ -370,14 +370,11 @@ { return Status; } - - RtlZeroMemory( - &NewHashBlock->List[0], - sizeof(NewHashBlock->List[0]) * NewHashBlock->Count); RtlCopyMemory( &NewHashBlock->List[0], &HashBlock->List[0], sizeof(NewHashBlock->List[0]) * HashBlock->Count); + NewHashBlock->Count = HashBlock->Count; HvFreeCell (&RegistryHive->Hive, ParentKeyCell->SubKeyLists[Storage]); ParentKeyCell->SubKeyLists[Storage] = HTOffset; HashBlock = NewHashBlock; @@ -387,8 +384,7 @@ Status = CmiAddKeyToHashTable( RegistryHive, HashBlock, - ParentKeyCell, - Storage, + ParentKeyCell->SubKeyLists[Storage], NewKeyCell, NKBOffset); if (NT_SUCCESS(Status)) @@ -635,7 +631,6 @@ } else { - ASSERT(NameLength <= USHORT_MAX); NewValueCell = (PCM_KEY_VALUE)HvGetCell (&RegistryHive->Hive, *VBOffset); NewValueCell->Signature = CM_KEY_VALUE_SIGNATURE; NewValueCell->NameLength = (USHORT)NameLength;

1 0

[ros-arm-bringup] 32179: We now generate the correct ARM syscall stub code for system calls with IDs > 0x100. We never call KfRaise/LowerIrql in portable code anymore, isntead, we use Ke. We now have correctly defined IRQL routines for ARM, much more of the kernel builds as a result.
by ros-arm-bringup＠svn.reactos.org 07 Feb '08

07 Feb '08

Author: ros-arm-bringup Date: Thu Feb 7 10:10:13 2008 New Revision: 32179 URL: http://svn.reactos.org/svn/reactos?rev=32179&view=rev Log: We now generate the correct ARM syscall stub code for system calls with IDs > 0x100. We never call KfRaise/LowerIrql in portable code anymore, isntead, we use Ke. We now have correctly defined IRQL routines for ARM, much more of the kernel builds as a result. Modified: trunk/reactos/include/ddk/winddk.h trunk/reactos/include/reactos/armddk.h trunk/reactos/ntoskrnl/ex/fmutex.c trunk/reactos/ntoskrnl/ex/shutdown.c trunk/reactos/ntoskrnl/inbv/inbv.c trunk/reactos/ntoskrnl/io/iomgr/file.c trunk/reactos/ntoskrnl/io/iomgr/irp.c trunk/reactos/ntoskrnl/ke/apc.c trunk/reactos/ntoskrnl/ke/bug.c trunk/reactos/ntoskrnl/ke/ipi.c trunk/reactos/ntoskrnl/ps/thread.c trunk/reactos/tools/nci/ncitool.c Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Thu Feb 7 10:10:13 2008 @@ -9561,6 +9561,10 @@ DDKAPI KeRaiseIrqlToSynchLevel( VOID); + +#elif defined(_M_ARM) + +#include <armddk.h> #else Modified: trunk/reactos/include/reactos/armddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/armddk.h?r… ============================================================================== --- trunk/reactos/include/reactos/armddk.h (original) +++ trunk/reactos/include/reactos/armddk.h Thu Feb 7 10:10:13 2008 @@ -100,4 +100,24 @@ return (struct _TEB*)USERPCR->Teb; } +// +// IRQL Support on ARM is similar to MIPS/ALPHA +// +NTKERNELAPI +KIRQL +DDKAPI +KeSwapIrql( + IN KIRQL NewIrql +); + +NTKERNELAPI +KIRQL +NTAPI +KeRaiseIrqlToDpcLevel( + VOID +); + +#define KeLowerIrql(NewIrql) KeSwapIrql(NewIrql) +#define KeRaiseIrql(NewIrql, OldIrql) *(OldIrql) = KeSwapIrql(NewIrql) + #endif Modified: trunk/reactos/ntoskrnl/ex/fmutex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/fmutex.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ex/fmutex.c (original) +++ trunk/reactos/ntoskrnl/ex/fmutex.c Thu Feb 7 10:10:13 2008 @@ -109,7 +109,7 @@ ASSERT(KeGetCurrentIrql() <= APC_LEVEL); /* Raise IRQL to APC */ - OldIrql = KfRaiseIrql(APC_LEVEL); + KeRaiseIrql(APC_LEVEL, &OldIrql); /* Decrease the count */ if (InterlockedDecrement(&FastMutex->Count) != 0) @@ -145,7 +145,7 @@ } /* Lower IRQL back */ - KfLowerIrql(OldIrql); + KeLowerIrql(OldIrql); } /* @@ -181,7 +181,7 @@ ASSERT(KeGetCurrentIrql() <= APC_LEVEL); /* Raise to APC_LEVEL */ - OldIrql = KfRaiseIrql(APC_LEVEL); + KeRaiseIrql(APC_LEVEL, &OldIrql); /* Check if we can quickly acquire it */ if (InterlockedCompareExchange(&FastMutex->Count, 0, 1) == 1) @@ -194,7 +194,7 @@ else { /* Acquire attempt failed */ - KfLowerIrql(OldIrql); + KeLowerIrql(OldIrql); return FALSE; } } Modified: trunk/reactos/ntoskrnl/ex/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/shutdown.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/shutdown.c (original) +++ trunk/reactos/ntoskrnl/ex/shutdown.c Thu Feb 7 10:10:13 2008 @@ -29,13 +29,14 @@ IN PVOID SystemArgument1, IN PVOID SystemArgument2) { + KIRQL OldIrql; if (DeferredContext) { ExFreePool(DeferredContext); } while (TRUE) { - KfRaiseIrql(SYNCH_LEVEL); + KeRaiseIrql(SYNCH_LEVEL, &OldIrql); #if defined(_M_X86) Ke386HaltProcessor(); #else Modified: trunk/reactos/ntoskrnl/inbv/inbv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/inbv.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/inbv/inbv.c (original) +++ trunk/reactos/ntoskrnl/inbv/inbv.c Thu Feb 7 10:10:13 2008 @@ -157,7 +157,7 @@ if (InbvOldIrql < DISPATCH_LEVEL) { /* Raise IRQL to dispatch level */ - InbvOldIrql = KfRaiseIrql(DISPATCH_LEVEL); + KeRaiseIrql(DISPATCH_LEVEL, &InbvOldIrql); } /* Acquire the lock */ @@ -172,7 +172,7 @@ KiReleaseSpinLock(&BootDriverLock); /* If we were below dispatch level, lower IRQL back */ - if (InbvOldIrql < DISPATCH_LEVEL) KfLowerIrql(InbvOldIrql); + if (InbvOldIrql < DISPATCH_LEVEL) KeLowerIrql(InbvOldIrql); } VOID Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Thu Feb 7 10:10:13 2008 @@ -2748,7 +2748,7 @@ if (!NT_SUCCESS(Status)) return Status; /* IRP cancellations are synchronized at APC_LEVEL. */ - OldIrql = KfRaiseIrql(APC_LEVEL); + KeRaiseIrql(APC_LEVEL, &OldIrql); /* Get the current thread */ Thread = PsGetCurrentThread(); @@ -2775,7 +2775,7 @@ } /* Lower the IRQL */ - KfLowerIrql(OldIrql); + KeLowerIrql(OldIrql); /* Check if we had found an IRP */ if (OurIrpsInList) @@ -2791,7 +2791,7 @@ OurIrpsInList = FALSE; /* Raise IRQL */ - OldIrql = KfRaiseIrql(APC_LEVEL); + KeRaiseIrql(APC_LEVEL, &OldIrql); /* Now loop the list again */ NextEntry = ListHead->Flink; @@ -2811,7 +2811,7 @@ } /* Lower the IRQL */ - KfLowerIrql(OldIrql); + KeLowerIrql(OldIrql); } } Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irp.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irp.c Thu Feb 7 10:10:13 2008 @@ -1021,7 +1021,7 @@ Thread); /* Raise to APC to protect the IrpList */ - OldIrql = KfRaiseIrql(APC_LEVEL); + KeRaiseIrql(APC_LEVEL, &OldIrql); /* Start by cancelling all the IRPs in the current thread queue. */ ListHead = &Thread->IrpList; @@ -1045,7 +1045,7 @@ while (!IsListEmpty(&Thread->IrpList)) { /* Now we can lower */ - KfLowerIrql(OldIrql); + KeLowerIrql(OldIrql); /* Wait a short while and then look if all our IRPs were completed. */ KeDelayExecutionThread(KernelMode, FALSE, &Interval); @@ -1057,11 +1057,11 @@ if (!(Retries--)) IopRemoveThreadIrp(); /* Raise the IRQL Again */ - OldIrql = KfRaiseIrql(APC_LEVEL); + KeRaiseIrql(APC_LEVEL, &OldIrql); } /* We're done, lower the IRQL */ - KfLowerIrql(OldIrql); + KeLowerIrql(OldIrql); } /* Modified: trunk/reactos/ntoskrnl/ke/apc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/apc.c?rev=3217… ============================================================================== --- trunk/reactos/ntoskrnl/ke/apc.c (original) +++ trunk/reactos/ntoskrnl/ke/apc.c Thu Feb 7 10:10:13 2008 @@ -35,13 +35,15 @@ NTAPI KiCheckForKernelApcDelivery(VOID) { + KIRQL OldIrql; + /* We should only deliver at passive */ if (KeGetCurrentIrql() == PASSIVE_LEVEL) { /* Raise to APC and Deliver APCs, then lower back to Passive */ - KfRaiseIrql(APC_LEVEL); + KeRaiseIrql(APC_LEVEL, &OldIrql); KiDeliverApc(KernelMode, 0, 0); - KfLowerIrql(PASSIVE_LEVEL); + KeLowerIrql(PASSIVE_LEVEL); } else { Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=3217… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c (original) +++ trunk/reactos/ntoskrnl/ke/bug.c Thu Feb 7 10:10:13 2008 @@ -769,6 +769,7 @@ PVOID DriverBase; PLDR_DATA_TABLE_ENTRY LdrEntry; PULONG_PTR HardErrorParameters; + KIRQL OldIrql; #ifdef CONFIG_SMP LONG i = 0; #endif @@ -1115,7 +1116,7 @@ /* Raise IRQL to HIGH_LEVEL */ _disable(); - KfRaiseIrql(HIGH_LEVEL); + KeRaiseIrql(HIGH_LEVEL, &OldIrql); /* Avoid recursion */ if (!InterlockedDecrement((PLONG)&KeBugCheckCount)) @@ -1137,13 +1138,13 @@ #endif /* Display the BSOD */ - KfLowerIrql(APC_LEVEL); // This is a nastier hack than any ever before + KeLowerIrql(APC_LEVEL); // This is a nastier hack than any ever before KiDisplayBlueScreen(MessageId, IsHardError, HardErrCaption, HardErrMessage, AnsiName); - KfRaiseIrql(HIGH_LEVEL); + KeRaiseIrql(HIGH_LEVEL, &OldIrql); /* Check if the debugger is disabled but we can enable it */ if (!(KdDebuggerEnabled) && !(KdPitchDebugger)) Modified: trunk/reactos/ntoskrnl/ke/ipi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/ipi.c?rev=3217… ============================================================================== --- trunk/reactos/ntoskrnl/ke/ipi.c (original) +++ trunk/reactos/ntoskrnl/ke/ipi.c Thu Feb 7 10:10:13 2008 @@ -145,17 +145,17 @@ #error Not yet implemented! #else ULONG_PTR Status; - KIRQL OldIrql; + KIRQL OldIrql, OldIrql2; /* Raise to DPC level if required */ OldIrql = KeGetCurrentIrql(); - if (OldIrql < DISPATCH_LEVEL) OldIrql = KfRaiseIrql(DISPATCH_LEVEL); + if (OldIrql < DISPATCH_LEVEL) KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); /* Acquire the IPI lock */ KefAcquireSpinLockAtDpcLevel(&KiIpiLock); /* Raise to IPI level */ - KfRaiseIrql(IPI_LEVEL); + KeRaiseIrql(IPI_LEVEL, &OldIrql2); /* Call the function */ Status = Function(Argument); @@ -164,7 +164,7 @@ KefReleaseSpinLockFromDpcLevel(&KiIpiLock); /* Lower IRQL back */ - KfLowerIrql(OldIrql); + KeLowerIrql(OldIrql); return Status; #endif } Modified: trunk/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ps/thread.c (original) +++ trunk/reactos/ntoskrnl/ps/thread.c Thu Feb 7 10:10:13 2008 @@ -29,6 +29,7 @@ PETHREAD Thread; PTEB Teb; BOOLEAN DeadThread = FALSE; + KIRQL OldIrql; PAGED_CODE(); PSTRACE(PS_THREAD_DEBUG, "StartRoutine: %p StartContext: %p\n", StartRoutine, StartContext); @@ -68,7 +69,7 @@ } /* Raise to APC */ - KfRaiseIrql(APC_LEVEL); + KeRaiseIrql(APC_LEVEL, &OldIrql); /* Queue the User APC */ KiInitializeUserApc(NULL, Modified: trunk/reactos/tools/nci/ncitool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/ncitool.c?rev=32… ============================================================================== --- trunk/reactos/tools/nci/ncitool.c (original) +++ trunk/reactos/tools/nci/ncitool.c Thu Feb 7 10:10:13 2008 @@ -71,7 +71,7 @@ // // For now, only supports 0-4 arguments // -#define UserModeStub_arm " mov r12, #0x%x\n" \ +#define UserModeStub_arm " ldr r12, =%x\n" \ " swi #0x2E\n" \ " bx lr\n\n" @@ -104,7 +104,7 @@ #define KernelModeStub_mips " j KiSystemService\n" \ " nop\n" -#define KernelModeStub_arm " mov r12, #0x%x\n" \ +#define KernelModeStub_arm " ldr r12, =x%x\n" \ " swi #0x2E\n" \ " bx lr\n\n"

1 0

[ros-arm-bringup] 32178: We don't define types which are usually documented on "real" NT platforms in the NDK aynmore, but instead in the ARMDDK.h. This also avoids many ndk-from-ddk cross-header issues. Added x86-only guards around certain structures and functions which are non-portable. Also guarded certain inline functions. Added some more ARM structures, and filled out the KPRCB. Created ARM-specific headers when required. We can now have a buildable ARM kernel, minus a couple of compile err
by ros-arm-bringup＠svn.reactos.org 07 Feb '08

07 Feb '08

Author: ros-arm-bringup Date: Thu Feb 7 09:40:42 2008 New Revision: 32178 URL: http://svn.reactos.org/svn/reactos?rev=32178&view=rev Log: We don't define types which are usually documented on "real" NT platforms in the NDK aynmore, but instead in the ARMDDK.h. This also avoids many ndk-from-ddk cross-header issues. Added x86-only guards around certain structures and functions which are non-portable. Also guarded certain inline functions. Added some more ARM structures, and filled out the KPRCB. Created ARM-specific headers when required. We can now have a buildable ARM kernel, minus a couple of compile errors. Added: trunk/reactos/include/reactos/armddk.h (with props) trunk/reactos/ntoskrnl/include/internal/arm/ trunk/reactos/ntoskrnl/include/internal/arm/ke.h (with props) trunk/reactos/ntoskrnl/include/internal/arm/mm.h (with props) Modified: trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/ddk/winddk.h trunk/reactos/include/ndk/arm/ketypes.h trunk/reactos/include/ndk/kefuncs.h trunk/reactos/include/psdk/winnt.h trunk/reactos/ntoskrnl/include/internal/arch/intrin_i.h trunk/reactos/ntoskrnl/include/internal/arch/ke.h trunk/reactos/ntoskrnl/include/internal/arch/mm.h trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/include/internal/ke_x.h trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=32… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h (original) +++ trunk/reactos/include/ddk/ntifs.h Thu Feb 7 09:40:42 2008 @@ -297,9 +297,6 @@ #ifdef _X86_ #define HARDWARE_PTE HARDWARE_PTE_X86 #define PHARDWARE_PTE PHARDWARE_PTE_X86 -#else -#define HARDWARE_PTE ULONG -#define PHARDWARE_PTE PULONG #endif #define IO_CHECK_CREATE_PARAMETERS 0x0200 Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Thu Feb 7 09:40:42 2008 @@ -5570,9 +5570,9 @@ #elif defined(_M_ARM) // -// NT-ARM is not documented, need NDK +// NT-ARM is not documented, need DDK-ARM // -#include <arm/ketypes.h> +#include <armddk.h> #else #error Unknown architecture Modified: trunk/reactos/include/ndk/arm/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/arm/ketypes.h?… ============================================================================== --- trunk/reactos/include/ndk/arm/ketypes.h (original) +++ trunk/reactos/include/ndk/arm/ketypes.h Thu Feb 7 09:40:42 2008 @@ -22,19 +22,6 @@ // // Dependencies // - -// -// IRQLs -// -#define PASSIVE_LEVEL 0 -#define LOW_LEVEL 0 -#define APC_LEVEL 1 -#define DISPATCH_LEVEL 2 -#define IPI_LEVEL 7 -#define POWER_LEVEL 7 -#define PROFILE_LEVEL 8 -#define HIGH_LEVEL 8 -#define SYNCH_LEVEL (IPI_LEVEL - 1) // // IPI Types @@ -61,19 +48,6 @@ // Static Kernel-Mode Address start (use MM_KSEG0_BASE for actual) // #define KSEG0_BASE 0x80000000 - -// -// FIXME: mmtypes.h? -// -#define KIPCR 0xFFFFF000 -#define USPCR 0x7FFF0000 -#define PCR ((volatile KPCR * const)USPCR) -#define USERPCR ((volatile KPCR * const)KIPCR) - -// -// Synchronization-level IRQL -// -#define SYNCH_LEVEL DISPATCH_LEVEL // // Trap Frame Definition @@ -106,75 +80,23 @@ ULONG FpExtra[8]; } KTRAP_FRAME, *PKTRAP_FRAME; -// -// Processor Control Region -// On ARM, it's actually readable from user-mode, much like KUSER_SHARED_DATA -// -#ifdef NTOS_MODE_USER -#define PKINTERRUPT_ROUTINE PVOID // Hack! -#endif -typedef struct _KPCR -{ - ULONG MinorVersion; - ULONG MajorVersion; - PKINTERRUPT_ROUTINE InterruptRoutine[64]; - PVOID XcodeDispatch; - ULONG FirstLevelDcacheSize; - ULONG FirstLevelDcacheFillSize; - ULONG FirstLevelIcacheSize; - ULONG FirstLevelIcacheFillSize; - ULONG SecondLevelDcacheSize; - ULONG SecondLevelDcacheFillSize; - ULONG SecondLevelIcacheSize; - ULONG SecondLevelIcacheFillSize; - struct _KPRCB *Prcb; - struct _TEB *Teb; - PVOID TlsArray; - ULONG DcacheFillSize; - ULONG IcacheAlignment; - ULONG IcacheFillSize; - ULONG ProcessorId; - ULONG ProfileInterval; - ULONG ProfileCount; - ULONG StallExecutionCount; - ULONG StallScaleFactor; - CCHAR Number; - PVOID DataBusError; - PVOID InstructionBusError; - ULONG CachePolicy; - UCHAR IrqlMask[64]; - UCHAR IrqlTable[64]; - UCHAR CurrentIrql; - KAFFINITY SetMember; - struct _KTHREAD *CurrentThread; - KAFFINITY NotMember; - ULONG SystemReserved[6]; - ULONG DcacheAlignment; - ULONG HalReserved[64]; - BOOLEAN FirstLevelActive; - BOOLEAN DpcRoutineActive; - ULONG CurrentPid; - BOOLEAN OnInterruptStack; - PVOID SavedInitialStack; - PVOID SavedStackLimit; - PVOID SystemServiceDispatchStart; - PVOID SystemServiceDispatchEnd; - PVOID InterruptStack; - PVOID PanicStack; - PVOID BadVaddr; - PVOID InitialStack; - PVOID StackLimit; - ULONG QuantumEnd; -} KPCR, *PKPCR; - #ifndef NTOS_MODE_USER -// -// Stub -// -typedef struct _KFLOATING_SAVE -{ - ULONG Reserved; -} KFLOATING_SAVE, *PKFLOATING_SAVE; + +// +// Exception Frame Definition +// +typedef struct _KEXCEPTION_FRAME +{ + ULONG PlaceHolder; +} KEXCEPTION_FRAME, *PKEXCEPTION_FRAME; + +// +// Processor State +// +typedef struct _KPROCESSOR_STATE +{ + struct _CONTEXT ContextFrame; +} KPROCESSOR_STATE, *PKPROCESSOR_STATE; // // Processor Region Control Block @@ -187,9 +109,110 @@ struct _KTHREAD *NextThread; struct _KTHREAD *IdleThread; UCHAR Number; - // - // TODO - // + UCHAR Reserved; + USHORT BuildType; + KAFFINITY SetMember; + KPROCESSOR_STATE ProcessorState; + ULONG KernelReserved[16]; + ULONG HalReserved[16]; + KSPIN_LOCK_QUEUE LockQueue[LockQueueMaximumLock]; + struct _KTHREAD *NpxThread; + ULONG InterruptCount; + ULONG KernelTime; + ULONG UserTime; + ULONG DpcTime; + ULONG DebugDpcTime; + ULONG InterruptTime; + ULONG AdjustDpcThreshold; + ULONG PageColor; + UCHAR SkipTick; + UCHAR DebuggerSavedIRQL; + UCHAR NodeColor; + UCHAR Spare1; + ULONG NodeShiftedColor; + struct _KNODE *ParentNode; + ULONG MultiThreadProcessorSet; + struct _KPRCB *MultiThreadSetMaster; + ULONG SecondaryColorMask; + LONG Sleeping; + ULONG CcFastReadNoWait; + ULONG CcFastReadWait; + ULONG CcFastReadNotPossible; + ULONG CcCopyReadNoWait; + ULONG CcCopyReadWait; + ULONG CcCopyReadNoWaitMiss; + ULONG KeAlignmentFixupCount; + ULONG SpareCounter0; + ULONG KeDcacheFlushCount; + ULONG KeExceptionDispatchCount; + ULONG KeFirstLevelTbFills; + ULONG KeIcacheFlushCount; + ULONG KeSecondLevelTbFills; + ULONG KeSystemCalls; + volatile ULONG IoReadOperationCount; + volatile ULONG IoWriteOperationCount; + volatile ULONG IoOtherOperationCount; + LARGE_INTEGER IoReadTransferCount; + LARGE_INTEGER IoWriteTransferCount; + LARGE_INTEGER IoOtherTransferCount; + PP_LOOKASIDE_LIST PPLookasideList[16]; + PP_LOOKASIDE_LIST PPNPagedLookasideList[32]; + PP_LOOKASIDE_LIST PPPagedLookasideList[32]; + volatile ULONG PacketBarrier; + volatile ULONG ReverseStall; + PVOID IpiFrame; + volatile PVOID CurrentPacket[3]; + volatile ULONG TargetSet; + volatile PKIPI_WORKER WorkerRoutine; + volatile ULONG IpiFrozen; + volatile ULONG RequestSummary; + volatile struct _KPRCB *SignalDone; + struct _KDPC_DATA DpcData[2]; + PVOID DpcStack; + ULONG MaximumDpcQueueDepth; + ULONG DpcRequestRate; + ULONG MinimumDpcRate; + volatile UCHAR DpcInterruptRequested; + volatile UCHAR DpcThreadRequested; + volatile UCHAR DpcRoutineActive; + volatile UCHAR DpcThreadActive; + ULONG PrcbLock; + ULONG DpcLastCount; + volatile ULONG TimerHand; + volatile ULONG TimerRequest; + PVOID DpcThread; + KEVENT DpcEvent; + UCHAR ThreadDpcEnable; + volatile BOOLEAN QuantumEnd; + volatile UCHAR IdleSchedule; + LONG DpcSetEventRequest; + LONG TickOffset; + KDPC CallDpc; + LIST_ENTRY WaitListHead; + ULONG ReadySummary; + ULONG QueueIndex; + LIST_ENTRY DispatcherReadyListHead[32]; + SINGLE_LIST_ENTRY DeferredReadyListHead; + PVOID ChainedInterruptList; + LONG LookasideIrpFloat; + volatile LONG MmPageFaultCount; + volatile LONG MmCopyOnWriteCount; + volatile LONG MmTransitionCount; + volatile LONG MmCacheTransitionCount; + volatile LONG MmDemandZeroCount; + volatile LONG MmPageReadCount; + volatile LONG MmPageReadIoCount; + volatile LONG MmCacheReadCount; + volatile LONG MmCacheIoCount; + volatile LONG MmDirtyPagesWriteCount; + volatile LONG MmDirtyWriteIoCount; + volatile LONG MmMappedPagesWriteCount; + volatile LONG MmMappedWriteIoCount; + CHAR VendorString[13]; + ULONG MHz; + ULONG FeatureBits; + volatile LARGE_INTEGER IsrTime; + PROCESSOR_POWER_STATE PowerState; } KPRCB, *PKPRCB; // Modified: trunk/reactos/include/ndk/kefuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/kefuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/kefuncs.h (original) +++ trunk/reactos/include/ndk/kefuncs.h Thu Feb 7 09:40:42 2008 @@ -453,19 +453,21 @@ NTSTATUS NTAPI NtSetIntervalProfile( - ULONG Interval, - KPROFILE_SOURCE ClockSource -); - + IN ULONG Interval, + IN KPROFILE_SOURCE ClockSource +); + +#ifdef _M_IX86 NTSYSCALLAPI NTSTATUS NTAPI NtSetLdtEntries( - ULONG Selector1, - LDT_ENTRY LdtEntry1, - ULONG Selector2, - LDT_ENTRY LdtEntry2 -); + IN ULONG Selector1, + IN LDT_ENTRY LdtEntry1, + IN ULONG Selector2, + IN LDT_ENTRY LdtEntry2 +); +#endif NTSYSCALLAPI NTSTATUS @@ -659,19 +661,21 @@ NTSTATUS NTAPI ZwSetIntervalProfile( - ULONG Interval, - KPROFILE_SOURCE ClockSource -); - + IN ULONG Interval, + IN KPROFILE_SOURCE ClockSource +); + +#ifdef _M_IX86 NTSYSAPI NTSTATUS NTAPI ZwSetLdtEntries( - ULONG Selector1, - LDT_ENTRY LdtEntry1, - ULONG Selector2, - LDT_ENTRY LdtEntry2 -); + IN ULONG Selector1, + IN LDT_ENTRY LdtEntry1, + IN ULONG Selector2, + IN LDT_ENTRY LdtEntry2 +); +#endif NTSYSAPI NTSTATUS Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/winnt.h (original) +++ trunk/reactos/include/psdk/winnt.h Thu Feb 7 09:40:42 2008 @@ -4106,21 +4106,10 @@ #elif _M_ARM // -// NT-ARM is not documented, need NDK +// NT-ARM is not documented // -#define NTOS_MODE_USER -#include <arm/ketypes.h> +#include <armddk.h> -// -// FIXME: Move _M_ARM stuff away from here -// *** AND NOT IN THE NDK! NDK IS ONLY FOR OFFICIALLY OBTAINABLE/EXISTING NT -// -FORCEINLINE -struct _TEB* NtCurrentTeb(VOID) -{ - return (struct _TEB*)USERPCR->Teb; -} - #else static __inline__ struct _TEB * NtCurrentTeb(void) { Added: trunk/reactos/include/reactos/armddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/armddk.h?r… ============================================================================== --- trunk/reactos/include/reactos/armddk.h (added) +++ trunk/reactos/include/reactos/armddk.h Thu Feb 7 09:40:42 2008 @@ -1,0 +1,103 @@ +#ifndef _ARMDDK_ +#define _ARMDDK_ + +// +// IRQLs +// +#define PASSIVE_LEVEL 0 +#define LOW_LEVEL 0 +#define APC_LEVEL 1 +#define DISPATCH_LEVEL 2 +#define IPI_LEVEL 7 +#define POWER_LEVEL 7 +#define PROFILE_LEVEL 8 +#define HIGH_LEVEL 8 +#define SYNCH_LEVEL (IPI_LEVEL - 1) + +// +// FIXME: mmtypes.h? +// +#define KIPCR 0xFFFFF000 +#define USPCR 0x7FFF0000 +#define PCR ((volatile KPCR * const)USPCR) +#define USERPCR ((volatile KPCR * const)KIPCR) + +// +// Stub +// +typedef struct _KFLOATING_SAVE +{ + ULONG Reserved; +} KFLOATING_SAVE, *PKFLOATING_SAVE; + +// +// Processor Control Region +// On ARM, it's actually readable from user-mode, much like KUSER_SHARED_DATA +// +#ifdef _WINNT_H +#define PKINTERRUPT_ROUTINE PVOID // Hack! +#endif +typedef struct _KPCR +{ + ULONG MinorVersion; + ULONG MajorVersion; + PKINTERRUPT_ROUTINE InterruptRoutine[64]; + PVOID XcodeDispatch; + ULONG FirstLevelDcacheSize; + ULONG FirstLevelDcacheFillSize; + ULONG FirstLevelIcacheSize; + ULONG FirstLevelIcacheFillSize; + ULONG SecondLevelDcacheSize; + ULONG SecondLevelDcacheFillSize; + ULONG SecondLevelIcacheSize; + ULONG SecondLevelIcacheFillSize; + struct _KPRCB *Prcb; + struct _TEB *Teb; + PVOID TlsArray; + ULONG DcacheFillSize; + ULONG IcacheAlignment; + ULONG IcacheFillSize; + ULONG ProcessorId; + ULONG ProfileInterval; + ULONG ProfileCount; + ULONG StallExecutionCount; + ULONG StallScaleFactor; + CCHAR Number; + PVOID DataBusError; + PVOID InstructionBusError; + ULONG CachePolicy; + UCHAR IrqlMask[64]; + UCHAR IrqlTable[64]; + UCHAR CurrentIrql; + KAFFINITY SetMember; + struct _KTHREAD *CurrentThread; + KAFFINITY NotMember; + ULONG SystemReserved[6]; + ULONG DcacheAlignment; + ULONG HalReserved[64]; + BOOLEAN FirstLevelActive; + BOOLEAN DpcRoutineActive; + ULONG CurrentPid; + BOOLEAN OnInterruptStack; + PVOID SavedInitialStack; + PVOID SavedStackLimit; + PVOID SystemServiceDispatchStart; + PVOID SystemServiceDispatchEnd; + PVOID InterruptStack; + PVOID PanicStack; + PVOID BadVaddr; + PVOID InitialStack; + PVOID StackLimit; + ULONG QuantumEnd; +} KPCR, *PKPCR; + +// +// Get the current TEB +// +FORCEINLINE +struct _TEB* NtCurrentTeb(VOID) +{ + return (struct _TEB*)USERPCR->Teb; +} + +#endif Propchange: trunk/reactos/include/reactos/armddk.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/reactos/armddk.h ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/ntoskrnl/include/internal/arch/intrin_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arch/intrin_i.h (original) +++ trunk/reactos/ntoskrnl/include/internal/arch/intrin_i.h Thu Feb 7 09:40:42 2008 @@ -25,6 +25,10 @@ #include "../powerpc/intrin_i.h" #elif defined(_M_MIPS) #include "../mips/intrin_i.h" +#elif defined(_M_ARM) +// +// Not sure we'll need ARM internal intrinsics +// #else #error "Unknown processor" #endif Modified: trunk/reactos/ntoskrnl/include/internal/arch/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arch/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/arch/ke.h Thu Feb 7 09:40:42 2008 @@ -25,6 +25,8 @@ #include "../powerpc/ke.h" #elif defined(_M_MIPS) #include "../mips/ke.h" +#elif defined(_M_ARM) +#include "../arm/ke.h" #else #error "Unknown processor" #endif Modified: trunk/reactos/ntoskrnl/include/internal/arch/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arch/mm.h (original) +++ trunk/reactos/ntoskrnl/include/internal/arch/mm.h Thu Feb 7 09:40:42 2008 @@ -22,9 +22,11 @@ #ifdef _M_IX86 #include <internal/i386/mm.h> #elif defined(_M_PPC) -#include <internal/powerpc/ke.h> +#include <internal/powerpc/mm.h> #elif defined(_M_MIPS) -#include <internal/mips/ke.h> +#include <internal/mips/mm.h> +#elif defined(_M_ARM) +#include <internal/arm/mm.h> #else #error "Unknown processor" #endif Added: trunk/reactos/ntoskrnl/include/internal/arm/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/ke.h (added) +++ trunk/reactos/ntoskrnl/include/internal/arm/ke.h Thu Feb 7 09:40:42 2008 @@ -1,0 +1,1 @@ + Propchange: trunk/reactos/ntoskrnl/include/internal/arm/ke.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/ntoskrnl/include/internal/arm/ke.h ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: trunk/reactos/ntoskrnl/include/internal/arm/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/mm.h (added) +++ trunk/reactos/ntoskrnl/include/internal/arm/mm.h Thu Feb 7 09:40:42 2008 @@ -1,0 +1,1 @@ + Propchange: trunk/reactos/ntoskrnl/include/internal/arm/mm.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/ntoskrnl/include/internal/arm/mm.h ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h Thu Feb 7 09:40:42 2008 @@ -837,11 +837,16 @@ VOID ); +// +// We need to do major portability work +// +#ifdef _M_IX86 VOID NTAPI KiFlushNPXState( IN FLOATING_SAVE_AREA *SaveArea ); +#endif VOID NTAPI Modified: trunk/reactos/ntoskrnl/include/internal/ke_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke_x.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke_x.h Thu Feb 7 09:40:42 2008 @@ -350,6 +350,7 @@ VOID KiRundownThread(IN PKTHREAD Thread) { +#if defined(_M_IX86) || defined(_M_AMD64) /* Check if this is the NPX Thread */ if (KeGetCurrentPrcb()->NpxThread == Thread) { @@ -357,6 +358,7 @@ KeGetCurrentPrcb()->NpxThread = NULL; KeArchFnInit(); } +#endif } FORCEINLINE @@ -1552,6 +1554,11 @@ /* Flush the TLB by resetting CR3 */ #ifdef _M_PPC __asm__("sync\n\tisync\n\t"); +#elif _M_ARM + // + // We need to implement this! + // + ASSERTMSG("Need ARM flush routine\n", FALSE); #else __writecr3(__readcr3()); #endif Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h Thu Feb 7 09:40:42 2008 @@ -280,7 +280,7 @@ * Use IsPointerOffset to test whether a pointer should be interpreted as an offset * or as a pointer */ -#if defined(_X86_) || defined(_M_AMD64) || defined(_MIPS_) || defined(_PPC_) +#if defined(_X86_) || defined(_M_AMD64) || defined(_MIPS_) || defined(_PPC_) || defined(_ARM_) /* for x86 and x86-64 the MSB is 1 so we can simply test on that */ #define IsPointerOffset(Ptr) ((LONG_PTR)(Ptr) >= 0) @@ -310,10 +310,10 @@ C_ASSERT(FIELD_OFFSET(KPROCESS, DirectoryTableBase) == KPROCESS_DIRECTORY_TABLE_BASE); //C_ASSERT(FIELD_OFFSET(KPCR, Tib.ExceptionList) == KPCR_EXCEPTION_LIST); //C_ASSERT(FIELD_OFFSET(KPCR, Self) == KPCR_SELF); +#ifdef _M_IX86 C_ASSERT(FIELD_OFFSET(KPCR, IRR) == KPCR_IRR); C_ASSERT(FIELD_OFFSET(KPCR, IDR) == KPCR_IDR); C_ASSERT(FIELD_OFFSET(KPCR, Irql) == KPCR_IRQL); -#ifdef _M_IX86 C_ASSERT(FIELD_OFFSET(KIPCR, PrcbData) + FIELD_OFFSET(KPRCB, CurrentThread) == KPCR_CURRENT_THREAD); C_ASSERT(FIELD_OFFSET(KIPCR, PrcbData) + FIELD_OFFSET(KPRCB, NextThread) == KPCR_PRCB_NEXT_THREAD); C_ASSERT(FIELD_OFFSET(KIPCR, PrcbData) + FIELD_OFFSET(KPRCB, NpxThread) == KPCR_NPX_THREAD);

1 0

[ros-arm-bringup] 32177: We now only compile the ELF loader if _ELF_ is defined (both because this isn't a standard Windows feature, and because the current code is completely not portable with ARM)
by ros-arm-bringup＠svn.reactos.org 07 Feb '08

07 Feb '08

Author: ros-arm-bringup Date: Thu Feb 7 09:36:31 2008 New Revision: 32177 URL: http://svn.reactos.org/svn/reactos?rev=32177&view=rev Log: We now only compile the ELF loader if _ELF_ is defined (both because this isn't a standard Windows feature, and because the current code is completely not portable with ARM) Modified: trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c (original) +++ trunk/reactos/ntoskrnl/mm/section.c Thu Feb 7 09:36:31 2008 @@ -2631,7 +2631,9 @@ static PEXEFMT_LOADER ExeFmtpLoaders[] = { PeFmtCreateSection, +#ifdef __ELF ElfFmtCreateSection +#endif }; static Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Thu Feb 7 09:36:31 2008 @@ -12,6 +12,9 @@ <define name="_IN_KERNEL_" /> <if property="_WINKD_" value="1"> <define name="_WINKD_" /> + </if> + <if property="_ELF" value="1"> + <define name="_ELF_" /> </if> <include base="cmlib">.</include> <include base="ntoskrnl">include</include> @@ -357,8 +360,10 @@ <file>verifier.c</file> <file>virtual.c</file> <file>wset.c</file> - <file>elf32.c</file> - <file>elf64.c</file> + <if property="_ELF_" value="1"> + <file>elf32.c</file> + <file>elf64.c</file> + </if> </directory> <directory name="ob"> <file>obdir.c</file>

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