Ros-diffs July 2010

ros-diffs@reactos.org

17 participants
467 discussions

[ekohl] 48378: [LSASRV] - Move all includes into a common header file. - Create a (still incomplete) well-known-sid lookup table and use it in LsarLookupSids. - Add missing file headers.
by ekohl＠svn.reactos.org 31 Jul '10

31 Jul '10

Author: ekohl Date: Sat Jul 31 11:24:16 2010 New Revision: 48378 URL: http://svn.reactos.org/svn/reactos?rev=48378&view=rev Log: [LSASRV] - Move all includes into a common header file. - Create a (still incomplete) well-known-sid lookup table and use it in LsarLookupSids. - Add missing file headers. Added: trunk/reactos/dll/win32/lsasrv/sids.c (with props) Modified: trunk/reactos/dll/win32/advapi32/sec/misc.c trunk/reactos/dll/win32/lsasrv/authport.c trunk/reactos/dll/win32/lsasrv/lsarpc.c trunk/reactos/dll/win32/lsasrv/lsasrv.c trunk/reactos/dll/win32/lsasrv/lsasrv.h trunk/reactos/dll/win32/lsasrv/lsasrv.rbuild trunk/reactos/dll/win32/lsasrv/privileges.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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/misc.c [iso-8859-1] Sat Jul 31 11:24:16 2010 @@ -15,123 +15,6 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(advapi); - -/* 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 ***************************************************/ Modified: trunk/reactos/dll/win32/lsasrv/authport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/authport.… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/authport.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/authport.c [iso-8859-1] Sat Jul 31 11:24:16 2010 @@ -8,15 +8,8 @@ /* INCLUDES ****************************************************************/ -#define WIN32_NO_STATUS -#include <windows.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> -#include "lsass.h" #include "lsasrv.h" - -#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(lsasrv); Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Sat Jul 31 11:24:16 2010 @@ -1,17 +1,15 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: Local Security Authority (LSA) Server + * FILE: reactos/dll/win32/lsasrv/lsarpc.h + * PURPOSE: RPC interface functions + * + * PROGRAMMERS: Eric Kohl + */ + /* INCLUDES ****************************************************************/ -#define WIN32_NO_STATUS -#include <windows.h> -#include <ntsecapi.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> - -#include <string.h> - #include "lsasrv.h" -#include "lsa_s.h" - -#include <wine/debug.h> typedef enum _LSA_DB_HANDLE_TYPE { @@ -432,7 +430,6 @@ { SID_IDENTIFIER_AUTHORITY IdentifierAuthority = {SECURITY_NT_AUTHORITY}; static const UNICODE_STRING DomainName = RTL_CONSTANT_STRING(L"DOMAIN"); - static const UNICODE_STRING UserName = RTL_CONSTANT_STRING(L"Administrator"); PLSAPR_REFERENCED_DOMAIN_LIST OutputDomains = NULL; PLSAPR_TRANSLATED_NAME OutputNames = NULL; ULONG OutputNamesLength; @@ -501,16 +498,8 @@ RtlCopyMemory(OutputDomains->Domains[i].Name.Buffer, DomainName.Buffer, DomainName.MaximumLength); } - - for (i = 0; i < SidEnumBuffer->Entries; i++) - { - OutputNames[i].Use = SidTypeWellKnownGroup; - OutputNames[i].DomainIndex = i; - OutputNames[i].Name.Buffer = MIDL_user_allocate(UserName.MaximumLength); - OutputNames[i].Name.Length = UserName.Length; - OutputNames[i].Name.MaximumLength = UserName.MaximumLength; - RtlCopyMemory(OutputNames[i].Name.Buffer, UserName.Buffer, UserName.MaximumLength); - } + Status = LsapLookupSids(SidEnumBuffer, + OutputNames); *ReferencedDomains = OutputDomains; @@ -519,7 +508,7 @@ TranslatedNames->Entries = SidEnumBuffer->Entries; TranslatedNames->Names = OutputNames; - return STATUS_SUCCESS; + return Status; } Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.c [iso-8859-1] Sat Jul 31 11:24:16 2010 @@ -8,14 +8,7 @@ /* INCLUDES ****************************************************************/ -#define WIN32_NO_STATUS -#include <windows.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> - #include "lsasrv.h" - -#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(lsasrv); @@ -29,6 +22,9 @@ DWORD dwError; TRACE("LsapInitLsa() called\n"); + + /* Initialize the well known SIDs */ + LsapInitSids(); /* Start the RPC server */ LsarStartRpcServer(); Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.h?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] Sat Jul 31 11:24:16 2010 @@ -6,6 +6,20 @@ * * PROGRAMMERS: Eric Kohl */ + +#define WIN32_NO_STATUS +#include <windows.h> +#include <ntsecapi.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> + +#include <string.h> + +#include "lsass.h" +#include "lsa_s.h" + +#include <wine/debug.h> + /* authport.c */ NTSTATUS StartAuthenticationPort(VOID); @@ -20,4 +34,13 @@ NTSTATUS LsarpLookupPrivilegeValue(PUNICODE_STRING Name, - PLUID Value); + PLUID Value); + +/* sids.h */ +NTSTATUS +LsapInitSids(VOID); + +NTSTATUS +LsapLookupSids(PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, + PLSAPR_TRANSLATED_NAME OutputNames); + Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.rb… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.rbuild [iso-8859-1] Sat Jul 31 11:24:16 2010 @@ -12,5 +12,6 @@ <file>lsarpc.c</file> <file>lsasrv.c</file> <file>privileges.c</file> + <file>sids.c</file> <file>lsasrv.rc</file> </module> Modified: trunk/reactos/dll/win32/lsasrv/privileges.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/privilege… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/privileges.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/privileges.c [iso-8859-1] Sat Jul 31 11:24:16 2010 @@ -1,14 +1,13 @@ -#define WIN32_NO_STATUS -#include <windows.h> -#include <ntsecapi.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: Local Security Authority (LSA) Server + * FILE: reactos/dll/win32/lsasrv/privileges.c + * PURPOSE: Privilege lookup functions + * + * PROGRAMMERS: Eric Kohl + */ -#include <wchar.h> -#include <string.h> - - -#include <wine/debug.h> +#include "lsasrv.h" typedef struct Added: trunk/reactos/dll/win32/lsasrv/sids.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/sids.c?re… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/sids.c (added) +++ trunk/reactos/dll/win32/lsasrv/sids.c [iso-8859-1] Sat Jul 31 11:24:16 2010 @@ -1,0 +1,422 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: Local Security Authority (LSA) Server + * FILE: reactos/dll/win32/lsasrv/sids.c + * PURPOSE: Sid / Name lookup functions + * + * PROGRAMMERS: Eric Kohl + */ +#include "lsasrv.h" + +WINE_DEFAULT_DEBUG_CHANNEL(lsasrv); + + +typedef struct _WELL_KNOWN_SID +{ + LIST_ENTRY ListEntry; + PSID Sid; + UNICODE_STRING Name; + UNICODE_STRING Domain; + SID_NAME_USE NameUse; +} WELL_KNOWN_SID, *PWELL_KNOWN_SID; + + +static SID_IDENTIFIER_AUTHORITY NullSidAuthority = {SECURITY_NULL_SID_AUTHORITY}; +static SID_IDENTIFIER_AUTHORITY WorldSidAuthority = {SECURITY_WORLD_SID_AUTHORITY}; +static SID_IDENTIFIER_AUTHORITY LocalSidAuthority = {SECURITY_LOCAL_SID_AUTHORITY}; +static SID_IDENTIFIER_AUTHORITY CreatorSidAuthority = {SECURITY_CREATOR_SID_AUTHORITY}; +static SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY}; + +LIST_ENTRY WellKnownSidListHead; + + + +#if 0 +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 }, +}; +#endif + + +BOOLEAN +LsapCreateSid(PSID_IDENTIFIER_AUTHORITY IdentifierAuthority, + UCHAR SubAuthorityCount, + PULONG SubAuthorities, + PWSTR Name, + PWSTR Domain, + SID_NAME_USE NameUse) +{ + PWELL_KNOWN_SID SidEntry; + PULONG p; + ULONG i; + + SidEntry = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(WELL_KNOWN_SID)); + if (SidEntry == NULL) + return FALSE; + + InitializeListHead(&SidEntry->ListEntry); + + SidEntry->Sid = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + RtlLengthRequiredSid(SubAuthorityCount)); + if (SidEntry->Sid == NULL) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, SidEntry); + return FALSE; + } + + RtlInitializeSid(SidEntry->Sid, + IdentifierAuthority, + SubAuthorityCount); + + for (i = 0; i < (ULONG)SubAuthorityCount; i++) + { + p = RtlSubAuthoritySid(SidEntry->Sid, i); + *p = SubAuthorities[i]; + } + + RtlInitUnicodeString(&SidEntry->Name, + Name); + + RtlInitUnicodeString(&SidEntry->Domain, + Domain); + + SidEntry->NameUse = NameUse; + + InsertTailList(&WellKnownSidListHead, + &SidEntry->ListEntry); + + return TRUE; +} + + +NTSTATUS +LsapInitSids(VOID) +{ + ULONG SubAuthorities[5]; + + InitializeListHead(&WellKnownSidListHead); + + /* Null Sid */ + SubAuthorities[0] = SECURITY_NULL_RID; + LsapCreateSid(&NullSidAuthority, + 1, + SubAuthorities, + L"NULL SID", + L"", + SidTypeWellKnownGroup); + + /* World Sid */ + SubAuthorities[0] = SECURITY_WORLD_RID; + LsapCreateSid(&WorldSidAuthority, + 1, + SubAuthorities, + L"Everyone", + L"", + SidTypeWellKnownGroup); + + /* Local Sid */ + SubAuthorities[0] = SECURITY_LOCAL_RID; + LsapCreateSid(&LocalSidAuthority, + 1, + SubAuthorities, + L"LOCAL", + L"", + SidTypeWellKnownGroup); + + /* Creator Owner Sid */ + SubAuthorities[0] = SECURITY_CREATOR_OWNER_RID; + LsapCreateSid(&CreatorSidAuthority, + 1, + SubAuthorities, + L"CREATOR OWNER", + L"", + SidTypeWellKnownGroup); + + /* Creator Group Sid */ + SubAuthorities[0] = SECURITY_CREATOR_GROUP_RID; + LsapCreateSid(&CreatorSidAuthority, + 1, + SubAuthorities, + L"CREATOR GROUP", + L"", + SidTypeWellKnownGroup); + + /* Creator Owner Server Sid */ + SubAuthorities[0] = SECURITY_CREATOR_OWNER_SERVER_RID; + LsapCreateSid(&CreatorSidAuthority, + 1, + SubAuthorities, + L"CREATOR OWNER SERVER", + L"", + SidTypeWellKnownGroup); + + /* Creator Group Server Sid */ + SubAuthorities[0] = SECURITY_CREATOR_GROUP_SERVER_RID; + LsapCreateSid(&CreatorSidAuthority, + 1, + SubAuthorities, + L"CREATOR GROUP SERVER", + L"", + SidTypeWellKnownGroup); + + /* NT Domain Sid */ + LsapCreateSid(&NtAuthority, + 0, + NULL, + L"", + L"NT Pseudo Domain", + SidTypeDomain); + + /* Dialup Sid */ + SubAuthorities[0] = SECURITY_DIALUP_RID; + LsapCreateSid(&NtAuthority, + 1, + SubAuthorities, + L"DIALUP", + L"NT AUTHORITY", + SidTypeWellKnownGroup); + + /* Network Sid */ + SubAuthorities[0] = SECURITY_NETWORK_RID; + LsapCreateSid(&NtAuthority, + 1, + SubAuthorities, + L"NETWORK", + L"NT AUTHORITY", + SidTypeWellKnownGroup); + + /* Batch Sid*/ + SubAuthorities[0] = SECURITY_BATCH_RID; + LsapCreateSid(&NtAuthority, + 1, + SubAuthorities, + L"BATCH", + L"NT AUTHORITY", + SidTypeWellKnownGroup); + + /* Interactive Sid */ + SubAuthorities[0] = SECURITY_INTERACTIVE_RID; + LsapCreateSid(&NtAuthority, + 1, + SubAuthorities, + L"INTERACTIVE", + L"NT AUTHORITY", + SidTypeWellKnownGroup); + + /* Service Sid */ + SubAuthorities[0] = SECURITY_SERVICE_RID; + LsapCreateSid(&NtAuthority, + 1, + SubAuthorities, + L"SERVICE", + L"NT AUTHORITY", + SidTypeWellKnownGroup); + + /* Anonymous Logon Sid */ + SubAuthorities[0] = SECURITY_ANONYMOUS_LOGON_RID; + LsapCreateSid(&NtAuthority, + 1, + SubAuthorities, + L"ANONYMOUS LOGON", + L"NT AUTHORITY", + SidTypeWellKnownGroup); + + /* FIXME: Add more well known sids */ + + return STATUS_SUCCESS; +} + + +PWELL_KNOWN_SID +LsapLookupWellKnownSid(PSID Sid) +{ + PLIST_ENTRY ListEntry; + PWELL_KNOWN_SID Ptr; + + ListEntry = WellKnownSidListHead.Flink; + while (ListEntry != &WellKnownSidListHead) + { + Ptr = CONTAINING_RECORD(ListEntry, + WELL_KNOWN_SID, + ListEntry); + if (RtlEqualSid(Sid, Ptr->Sid)) + { + return Ptr; + } + + ListEntry = ListEntry->Flink; + } + + return NULL; +} + + +NTSTATUS +LsapLookupSids(PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, + PLSAPR_TRANSLATED_NAME OutputNames) +{ + static const UNICODE_STRING UserName = RTL_CONSTANT_STRING(L"Administrator"); + PWELL_KNOWN_SID ptr; + ULONG Mapped = 0; + ULONG i; + NTSTATUS Status; + + PSID *Sids = (PSID *) SidEnumBuffer->SidInfo; + +TRACE("LsapLookupSids(%p, %p)\n", SidEnumBuffer, OutputNames); +TRACE("SidEnumBuffer->Entries: %lu\n", SidEnumBuffer->Entries); +TRACE("SidEnumBuffer->SidInfo: %p\n", SidEnumBuffer->SidInfo); + + for (i = 0; i < SidEnumBuffer->Entries; i++) + { +TRACE("i: %lu\n", i); + ptr = LsapLookupWellKnownSid(Sids[i]); + if (ptr != NULL) + { + OutputNames[i].Use = ptr->NameUse; + + OutputNames[i].DomainIndex = i; /* Fixme */ + + OutputNames[i].Name.Buffer = MIDL_user_allocate(ptr->Name.MaximumLength); + OutputNames[i].Name.Length = ptr->Name.Length; + OutputNames[i].Name.MaximumLength = ptr->Name.MaximumLength; + RtlCopyMemory(OutputNames[i].Name.Buffer, ptr->Name.Buffer, ptr->Name.MaximumLength); + + Mapped++; + } + else + { + OutputNames[i].Use = SidTypeWellKnownGroup; + OutputNames[i].DomainIndex = i; + OutputNames[i].Name.Buffer = MIDL_user_allocate(UserName.MaximumLength); + OutputNames[i].Name.Length = UserName.Length; + OutputNames[i].Name.MaximumLength = UserName.MaximumLength; + RtlCopyMemory(OutputNames[i].Name.Buffer, UserName.Buffer, UserName.MaximumLength); + + Mapped++; + } + } + + if (Mapped == 0) + Status = STATUS_NONE_MAPPED; + else if (Mapped < SidEnumBuffer->Entries) + Status = STATUS_SOME_NOT_MAPPED; + else + Status = STATUS_SUCCESS; + + return Status; +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/lsasrv/sids.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/lsasrv/sids.c ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision

1 0

[ekohl] 48377: [LSASRV] Replace hard-coded privilege names by privilege names from the PSDK.
by ekohl＠svn.reactos.org 31 Jul '10

31 Jul '10

Author: ekohl Date: Sat Jul 31 09:06:42 2010 New Revision: 48377 URL: http://svn.reactos.org/svn/reactos?rev=48377&view=rev Log: [LSASRV] Replace hard-coded privilege names by privilege names from the PSDK. Modified: trunk/reactos/dll/win32/lsasrv/privileges.c Modified: trunk/reactos/dll/win32/lsasrv/privileges.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/privilege… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/privileges.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/privileges.c [iso-8859-1] Sat Jul 31 09:06:42 2010 @@ -20,35 +20,35 @@ static const PRIVILEGE_DATA WellKnownPrivileges[] = { - {{SE_CREATE_TOKEN_PRIVILEGE, 0}, L"SeCreateTokenPrivilege"}, - {{SE_ASSIGNPRIMARYTOKEN_PRIVILEGE, 0}, L"SeAssignPrimaryTokenPrivilege"}, - {{SE_LOCK_MEMORY_PRIVILEGE, 0}, L"SeLockMemoryPrivilege"}, - {{SE_INCREASE_QUOTA_PRIVILEGE, 0}, L"SeIncreaseQuotaPrivilege"}, - {{SE_MACHINE_ACCOUNT_PRIVILEGE, 0}, L"SeMachineAccountPrivilege"}, - {{SE_TCB_PRIVILEGE, 0}, L"SeTcbPrivilege"}, - {{SE_SECURITY_PRIVILEGE, 0}, L"SeSecurityPrivilege"}, - {{SE_TAKE_OWNERSHIP_PRIVILEGE, 0}, L"SeTakeOwnershipPrivilege"}, - {{SE_LOAD_DRIVER_PRIVILEGE, 0}, L"SeLoadDriverPrivilege"}, - {{SE_SYSTEM_PROFILE_PRIVILEGE, 0}, L"SeSystemProfilePrivilege"}, - {{SE_SYSTEMTIME_PRIVILEGE, 0}, L"SeSystemtimePrivilege"}, - {{SE_PROF_SINGLE_PROCESS_PRIVILEGE, 0}, L"SeProfileSingleProcessPrivilege"}, - {{SE_INC_BASE_PRIORITY_PRIVILEGE, 0}, L"SeIncreaseBasePriorityPrivilege"}, - {{SE_CREATE_PAGEFILE_PRIVILEGE, 0}, L"SeCreatePagefilePrivilege"}, - {{SE_CREATE_PERMANENT_PRIVILEGE, 0}, L"SeCreatePermanentPrivilege"}, - {{SE_BACKUP_PRIVILEGE, 0}, L"SeBackupPrivilege"}, - {{SE_RESTORE_PRIVILEGE, 0}, L"SeRestorePrivilege"}, - {{SE_SHUTDOWN_PRIVILEGE, 0}, L"SeShutdownPrivilege"}, - {{SE_DEBUG_PRIVILEGE, 0}, L"SeDebugPrivilege"}, - {{SE_AUDIT_PRIVILEGE, 0}, L"SeAuditPrivilege"}, - {{SE_SYSTEM_ENVIRONMENT_PRIVILEGE, 0}, L"SeSystemEnvironmentPrivilege"}, - {{SE_CHANGE_NOTIFY_PRIVILEGE, 0}, L"SeChangeNotifyPrivilege"}, - {{SE_REMOTE_SHUTDOWN_PRIVILEGE, 0}, L"SeRemoteShutdownPrivilege"}, - {{SE_UNDOCK_PRIVILEGE, 0}, L"SeUndockPrivilege"}, - {{SE_SYNC_AGENT_PRIVILEGE, 0}, L"SeSyncAgentPrivilege"}, - {{SE_ENABLE_DELEGATION_PRIVILEGE, 0}, L"SeEnableDelegationPrivilege"}, - {{SE_MANAGE_VOLUME_PRIVILEGE, 0}, L"SeManageVolumePrivilege"}, - {{SE_IMPERSONATE_PRIVILEGE, 0}, L"SeImpersonatePrivilege"}, - {{SE_CREATE_GLOBAL_PRIVILEGE, 0}, L"SeCreateGlobalPrivilege"} + {{SE_CREATE_TOKEN_PRIVILEGE, 0}, SE_CREATE_TOKEN_NAME}, + {{SE_ASSIGNPRIMARYTOKEN_PRIVILEGE, 0}, SE_ASSIGNPRIMARYTOKEN_NAME}, + {{SE_LOCK_MEMORY_PRIVILEGE, 0}, SE_LOCK_MEMORY_NAME}, + {{SE_INCREASE_QUOTA_PRIVILEGE, 0}, SE_INCREASE_QUOTA_NAME}, + {{SE_MACHINE_ACCOUNT_PRIVILEGE, 0}, SE_MACHINE_ACCOUNT_NAME}, + {{SE_TCB_PRIVILEGE, 0}, SE_TCB_NAME}, + {{SE_SECURITY_PRIVILEGE, 0}, SE_SECURITY_NAME}, + {{SE_TAKE_OWNERSHIP_PRIVILEGE, 0}, SE_TAKE_OWNERSHIP_NAME}, + {{SE_LOAD_DRIVER_PRIVILEGE, 0}, SE_LOAD_DRIVER_NAME}, + {{SE_SYSTEM_PROFILE_PRIVILEGE, 0}, SE_SYSTEM_PROFILE_NAME}, + {{SE_SYSTEMTIME_PRIVILEGE, 0}, SE_SYSTEMTIME_NAME}, + {{SE_PROF_SINGLE_PROCESS_PRIVILEGE, 0}, SE_PROF_SINGLE_PROCESS_NAME}, + {{SE_INC_BASE_PRIORITY_PRIVILEGE, 0}, SE_INC_BASE_PRIORITY_NAME}, + {{SE_CREATE_PAGEFILE_PRIVILEGE, 0}, SE_CREATE_PAGEFILE_NAME}, + {{SE_CREATE_PERMANENT_PRIVILEGE, 0}, SE_CREATE_PERMANENT_NAME}, + {{SE_BACKUP_PRIVILEGE, 0}, SE_BACKUP_NAME}, + {{SE_RESTORE_PRIVILEGE, 0}, SE_RESTORE_NAME}, + {{SE_SHUTDOWN_PRIVILEGE, 0}, SE_SHUTDOWN_NAME}, + {{SE_DEBUG_PRIVILEGE, 0}, SE_DEBUG_NAME}, + {{SE_AUDIT_PRIVILEGE, 0}, SE_AUDIT_NAME}, + {{SE_SYSTEM_ENVIRONMENT_PRIVILEGE, 0}, SE_SYSTEM_ENVIRONMENT_NAME}, + {{SE_CHANGE_NOTIFY_PRIVILEGE, 0}, SE_CHANGE_NOTIFY_NAME}, + {{SE_REMOTE_SHUTDOWN_PRIVILEGE, 0}, SE_REMOTE_SHUTDOWN_NAME}, + {{SE_UNDOCK_PRIVILEGE, 0}, SE_UNDOCK_NAME}, + {{SE_SYNC_AGENT_PRIVILEGE, 0}, SE_SYNC_AGENT_NAME}, + {{SE_ENABLE_DELEGATION_PRIVILEGE, 0}, SE_ENABLE_DELEGATION_NAME}, + {{SE_MANAGE_VOLUME_PRIVILEGE, 0}, SE_MANAGE_VOLUME_NAME}, + {{SE_IMPERSONATE_PRIVILEGE, 0}, SE_IMPERSONATE_NAME}, + {{SE_CREATE_GLOBAL_PRIVILEGE, 0}, SE_CREATE_GLOBAL_NAME} };

1 0

[gadamopoulos] 48376: [browseui] - keep the hacky declaration of SHANDLE_PTR and make it work with msvc as well - Make BEGIN_MSG_MAP compatible with msvc
by gadamopoulos＠svn.reactos.org 31 Jul '10

31 Jul '10

Author: gadamopoulos Date: Sat Jul 31 07:53:06 2010 New Revision: 48376 URL: http://svn.reactos.org/svn/reactos?rev=48376&view=rev Log: [browseui] - keep the hacky declaration of SHANDLE_PTR and make it work with msvc as well - Make BEGIN_MSG_MAP compatible with msvc Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp trunk/reactos/lib/atl/atlwin.h Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/shellbr… ============================================================================== --- trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Sat Jul 31 07:53:06 2010 @@ -124,9 +124,7 @@ "language='*'\"") #endif // __GNUC__ -#ifdef __GNUC__ #define SHANDLE_PTR LONG -#endif // __GNUC__ struct categoryCacheHeader { Modified: trunk/reactos/lib/atl/atlwin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/atlwin.h?rev=48376… ============================================================================== --- trunk/reactos/lib/atl/atlwin.h [iso-8859-1] (original) +++ trunk/reactos/lib/atl/atlwin.h [iso-8859-1] Sat Jul 31 07:53:06 2010 @@ -24,7 +24,7 @@ #define GCCU(x) x __attribute__((unused)) #define Unused(x) #else -#define GCCU(x) +#define GCCU(x) x #define Unused(x) (x); #endif // __GNUC__

1 0

[ekohl] 48375: [PSDK] Add missing privilege names.
by ekohl＠svn.reactos.org 31 Jul '10

31 Jul '10

Author: ekohl Date: Sat Jul 31 07:09:40 2010 New Revision: 48375 URL: http://svn.reactos.org/svn/reactos?rev=48375&view=rev Log: [PSDK] Add missing privilege names. Modified: trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sat Jul 31 07:09:40 2010 @@ -742,7 +742,12 @@ #define SE_SYSTEM_ENVIRONMENT_NAME TEXT("SeSystemEnvironmentPrivilege") #define SE_CHANGE_NOTIFY_NAME TEXT("SeChangeNotifyPrivilege") #define SE_REMOTE_SHUTDOWN_NAME TEXT("SeRemoteShutdownPrivilege") -#define SE_CREATE_GLOBAL_NAME TEXT("SeCreateGlobalPrivilege") +#define SE_UNDOCK_NAME TEXT("SeUndockPrivilege") +#define SE_SYNC_AGENT_NAME TEXT("SeSyncAgentPrivilege") +#define SE_ENABLE_DELEGATION_NAME TEXT("SeEnableDelegationPrivilege") +#define SE_MANAGE_VOLUME_NAME TEXT("SeManageVolumePrivilege") +#define SE_IMPERSONATE_NAME TEXT("SeImpersonatePrivilege") +#define SE_CREATE_GLOBAL_NAME TEXT("SeCreateGlobalPrivilege") #define SE_GROUP_MANDATORY 1 #define SE_GROUP_ENABLED_BY_DEFAULT 2 #define SE_GROUP_ENABLED 4

1 0

[tkreuzer] 48374: [NTOS] - Completely rework MiBuildPfnDatabaseFromPages to be portable and support PAE and 64 bit as well. The pfn setting code has been factored out and is used for every level of page tables. MiIsRegularMemory is completely removed, it's a waste of time to loop all MADs for each and every valid PTE. The PFNs that are used for the page tables themselves must be memory tracked by the PFN database anyway, the actual mapped pages might not be, but a check if the page index is belo
by tkreuzer＠svn.reactos.org 31 Jul '10

31 Jul '10

Author: tkreuzer Date: Sat Jul 31 02:47:50 2010 New Revision: 48374 URL: http://svn.reactos.org/svn/reactos?rev=48374&view=rev Log: [NTOS] - Completely rework MiBuildPfnDatabaseFromPages to be portable and support PAE and 64 bit as well. The pfn setting code has been factored out and is used for every level of page tables. MiIsRegularMemory is completely removed, it's a waste of time to loop all MADs for each and every valid PTE. The PFNs that are used for the page tables themselves must be memory tracked by the PFN database anyway, the actual mapped pages might not be, but a check if the page index is below MmHighestPhysicalPage and the PFN entry is in mapped memory is enough. This way we might set PFN entries that are not actually tracked, but that doesn't hurt. Also don't check for some arbitrary value when handling the pfns, no reason to exclude some part of the page table from this procedure. - Remove an unneccessary Update of the ListEntry pointer in MiMapPfnDatabase Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/mm.h branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/i386/mm.h branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/mminit.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/mm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] Sat Jul 31 02:47:50 2010 @@ -11,6 +11,7 @@ #define PAE_PAGE_MASK(x) ((x)&(~0xfffLL)) /* Memory layout base addresses */ +#define MI_DEFAULT_SYSTEM_RANGE_START (PVOID)0xFFFF080000000000ULL #define HYPER_SPACE 0xFFFFF70000000000ULL #define HYPER_SPACE_END 0xFFFFF77FFFFFFFFFULL #define MI_SESSION_SPACE_MINIMUM (PVOID)0xFFFFF90000000000ULL @@ -24,7 +25,6 @@ #define MI_DEBUG_MAPPING (PVOID)0xFFFFFFFF80000000ULL // FIXME #define MI_HIGHEST_SYSTEM_ADDRESS (PVOID)0xFFFFFFFFFFFFFFFFULL #define MI_SYSTEM_CACHE_WS_START (PVOID)0xFFFFF78000001000ULL // CHECKME - #define MI_LOWEST_VAD_ADDRESS (PVOID)0x000000007FF00000ULL #define MI_SYSTEM_PTE_BASE (PVOID)MiAddressToPte(KSEG0_BASE) @@ -123,13 +123,34 @@ /* Convert a PTE into a corresponding address */ PVOID FORCEINLINE -MiPteToAddress(PMMPTE Pte) -{ - /* Use signed math */ - LONG64 Temp = (LONG64)Pte; - Temp <<= 25; - Temp >>= 16; - return (PVOID)Temp; +MiPteToAddress(PMMPTE PointerPte) +{ + /* Use signed math */ + return (PVOID)(((LONG64)PointerPte << 25) >> 16); +} + +PVOID +FORCEINLINE +MiPdeToAddress(PMMPTE PointerPde) +{ + /* Use signed math */ + return (PVOID)(((LONG64)PointerPde << 34) >> 16); +} + +PVOID +FORCEINLINE +MiPpeToAddress(PMMPTE PointerPpe) +{ + /* Use signed math */ + return (PVOID)(((LONG64)PointerPpe << 43) >> 16); +} + +PVOID +FORCEINLINE +MiPxeToAddress(PMMPTE PointerPxe) +{ + /* Use signed math */ + return (PVOID)(((LONG64)PointerPxe << 52) >> 16); } BOOLEAN @@ -172,6 +193,9 @@ /* Easy accessing PFN in PTE */ #define PFN_FROM_PTE(v) ((v)->u.Hard.PageFrameNumber) +#define PFN_FROM_PDE(v) ((v)->u.Hard.PageFrameNumber) +#define PFN_FROM_PPE(v) ((v)->u.Hard.PageFrameNumber) +#define PFN_FROM_PXE(v) ((v)->u.Hard.PageFrameNumber) // FIXME, only copied from x86 #define MI_MAKE_LOCAL_PAGE(x) ((x)->u.Hard.Global = 0) Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/i386/mm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/i386/mm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/i386/mm.h [iso-8859-1] Sat Jul 31 02:47:50 2010 @@ -20,14 +20,18 @@ #define PAGETABLE_MAP (0xc0000000) #define PAGEDIRECTORY_MAP (0xc0000000 + (PAGETABLE_MAP / (1024))) +#define MI_DEFAULT_SYSTEM_RANGE_START (PVOID)0x80000000 + /* FIXME: These are different for PAE */ #define PTE_BASE 0xC0000000 #define PDE_BASE 0xC0300000 #define PDE_TOP 0xC0300FFF #define PTE_TOP 0xC03FFFFF -#define PTE_PER_PAGE 1024 #define HYPER_SPACE 0xC0400000 #define HYPER_SPACE_END 0xC07FFFFF + +#define PDE_PER_PAGE 1024 +#define PTE_PER_PAGE 1024 /* Converting address to a corresponding PDE or PTE entry */ #define MiAddressToPde(x) \ @@ -41,6 +45,7 @@ // Convert a PTE into a corresponding address // #define MiPteToAddress(PTE) ((PVOID)((ULONG)(PTE) << 10)) +#define MiPdeToAddress(PDE) ((PVOID)((ULONG)(PDE) << 20)) #define MiIsPdeForAddressValid(Pde) (MiAddressToPde(Address)->u.Hard.Valid) #define ADDR_TO_PAGE_TABLE(v) (((ULONG)(v)) / (1024 * PAGE_SIZE)) @@ -51,6 +56,7 @@ /* Easy accessing PFN in PTE */ #define PFN_FROM_PTE(v) ((v)->u.Hard.PageFrameNumber) +#define PFN_FROM_PDE(v) ((v)->u.Hard.PageFrameNumber) #define MI_MAKE_LOCAL_PAGE(x) ((x)->u.Hard.Global = 0) #define MI_MAKE_DIRTY_PAGE(x) ((x)->u.Hard.Dirty = 1) Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Sat Jul 31 02:47:50 2010 @@ -12,7 +12,7 @@ #define NDEBUG #include <debug.h> -#line 15 "ARMÂ³::INIT" +#line 16 "mminit.c" #define MODULE_INVOLVED_IN_ARM3 #include "miarm.h" @@ -607,70 +607,12 @@ } } -BOOLEAN -NTAPI -MiIsRegularMemory(IN PLOADER_PARAMETER_BLOCK LoaderBlock, - IN PFN_NUMBER Pfn) -{ - PLIST_ENTRY NextEntry; - PMEMORY_ALLOCATION_DESCRIPTOR MdBlock; - - /* Loop the memory descriptors */ - NextEntry = LoaderBlock->MemoryDescriptorListHead.Flink; - while (NextEntry != &LoaderBlock->MemoryDescriptorListHead) - { - /* Get the memory descriptor */ - MdBlock = CONTAINING_RECORD(NextEntry, - MEMORY_ALLOCATION_DESCRIPTOR, - ListEntry); - - /* Check if this PFN could be part of the block */ - if (Pfn >= (MdBlock->BasePage)) - { - /* Check if it really is part of the block */ - if (Pfn < (MdBlock->BasePage + MdBlock->PageCount)) - { - /* Check if the block is actually memory we don't map */ - if ((MdBlock->MemoryType == LoaderFirmwarePermanent) || - (MdBlock->MemoryType == LoaderBBTMemory) || - (MdBlock->MemoryType == LoaderSpecialMemory)) - { - /* We don't need PFN database entries for this memory */ - break; - } - - /* This is memory we want to map */ - return TRUE; - } - } - else - { - /* Blocks are ordered, so if it's not here, it doesn't exist */ - break; - } - - /* Get to the next descriptor */ - NextEntry = MdBlock->ListEntry.Flink; - } - - /* Check if this PFN is actually from our free memory descriptor */ - if ((Pfn >= MxOldFreeDescriptor.BasePage) && - (Pfn < MxOldFreeDescriptor.BasePage + MxOldFreeDescriptor.PageCount)) - { - /* We use these pages for initial mappings, so we do want to count them */ - return TRUE; - } - - /* Otherwise this isn't memory that we describe or care about */ - return FALSE; -} - VOID NTAPI MiMapPfnDatabase(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { ULONG BasePage, PageCount, PageFrameIndex; - PLIST_ENTRY NextEntry; + PLIST_ENTRY ListEntry; PMEMORY_ALLOCATION_DESCRIPTOR MdBlock; PMMPTE PointerPte, LastPte; MMPTE TempPte = ValidKernelPte; @@ -681,12 +623,12 @@ OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); /* Loop the memory descriptors */ - for (NextEntry = LoaderBlock->MemoryDescriptorListHead.Flink; - NextEntry != &LoaderBlock->MemoryDescriptorListHead; - NextEntry = MdBlock->ListEntry.Flink) + for (ListEntry = LoaderBlock->MemoryDescriptorListHead.Flink; + ListEntry != &LoaderBlock->MemoryDescriptorListHead; + ListEntry = ListEntry->Flink) { /* Get the descriptor */ - MdBlock = CONTAINING_RECORD(NextEntry, + MdBlock = CONTAINING_RECORD(ListEntry, MEMORY_ALLOCATION_DESCRIPTOR, ListEntry); @@ -788,9 +730,6 @@ Pfn1++; } } - - /* Do the next address range */ - NextEntry = MdBlock->ListEntry.Flink; } /* Now handle the remaininng pages from the free descriptor */ @@ -813,104 +752,121 @@ KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); } +static +VOID +MiSetupPfnForPageTable( + PFN_NUMBER PageFrameIndex, + PMMPTE PointerPte) +{ + PMMPFN Pfn; + PMMPDE PointerPde; + + /* Get the pfn entry for this page */ + Pfn = MiGetPfnEntry(PageFrameIndex); + + /* Check if it's valid memory */ + if ((PageFrameIndex <= MmHighestPhysicalPage) && + (MmIsAddressValid(Pfn)) && + (MmIsAddressValid(Pfn + 1))) + { + /* Setup the PFN entry */ + Pfn->u1.WsIndex = 0; + Pfn->u2.ShareCount++; + Pfn->PteAddress = PointerPte; + Pfn->OriginalPte = *PointerPte; + Pfn->u3.e1.PageLocation = ActiveAndValid; + Pfn->u3.e1.CacheAttribute = MiNonCached; + Pfn->u3.e2.ReferenceCount = 1; + Pfn->u4.PteFrame = PFN_FROM_PTE(MiAddressToPte(PointerPte)); + } + + /* Increase the shared count of the PFN entry for the PDE */ + PointerPde = MiAddressToPde(MiPteToAddress(PointerPte)); + Pfn = MiGetPfnEntry(PFN_FROM_PTE(PointerPde)); + ASSERT(Pfn != NULL); + Pfn->u2.ShareCount++; +} + VOID NTAPI MiBuildPfnDatabaseFromPages(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { + PVOID Address = NULL; + PFN_NUMBER PageFrameIndex; PMMPDE PointerPde; PMMPTE PointerPte; - ULONG i, Count, j; - PFN_NUMBER PageFrameIndex, StartupPdIndex, PtePageIndex; - PMMPFN Pfn1, Pfn2; - ULONG_PTR BaseAddress = 0; - - /* PFN of the startup page directory */ - StartupPdIndex = PFN_FROM_PTE(MiAddressToPde(PDE_BASE)); - - /* Start with the first PDE and scan them all */ - PointerPde = MiAddressToPde(NULL); - Count = PD_COUNT * PDE_COUNT; - for (i = 0; i < Count; i++) - { - /* Check for valid PDE */ - if (PointerPde->u.Hard.Valid == 1) - { - /* Get the PFN from it */ - PageFrameIndex = PFN_FROM_PTE(PointerPde); - - /* Do we want a PFN entry for this page? */ - if (MiIsRegularMemory(LoaderBlock, PageFrameIndex)) + ULONG k, l; +#if (_MI_PAGING_LEVELS >= 3) + PMMPDE PointerPpe; + ULONG j; +#endif +#if (_MI_PAGING_LEVELS == 4) + PMMPDE PointerPxe; + ULONG i; +#endif + +#if (_MI_PAGING_LEVELS == 4) + /* Loop all PXEs in the PML4 */ + PointerPxe = MiAddressToPxe(Address); + for (i = 0; i < PXE_PER_PAGE; i++, PointerPxe++) + { + /* Skip invalid PXEs */ + if (!PointerPxe->u.Hard.Valid) continue; + + /* Handle the PFN */ + PageFrameIndex = PFN_FROM_PXE(PointerPxe); + MiSetupPfnForPageTable(PageFrameIndex, PointerPxe); + + /* Get starting VA for this PXE */ + Address = MiPxeToAddress(PointerPxe); +#endif +#if (_MI_PAGING_LEVELS >= 3) + /* Loop all PPEs in this PDP */ + PointerPpe = MiAddressToPpe(Address); + for (j = 0; j < PPE_PER_PAGE; j++, PointerPpe++) + { + /* Skip invalid PPEs */ + if (!PointerPpe->u.Hard.Valid) continue; + + /* Handle the PFN */ + PageFrameIndex = PFN_FROM_PPE(PointerPpe); + MiSetupPfnForPageTable(PageFrameIndex, PointerPpe); + + /* Get starting VA for this PPE */ + Address = MiPpeToAddress(PointerPpe); +#endif + /* Loop all PDEs in this PD */ + PointerPde = MiAddressToPde(Address); + for (k = 0; k < PDE_PER_PAGE; k++, PointerPde++) { - /* Yes we do, set it up */ - Pfn1 = MiGetPfnEntry(PageFrameIndex); - Pfn1->u4.PteFrame = StartupPdIndex; - Pfn1->PteAddress = PointerPde; - Pfn1->u2.ShareCount++; - Pfn1->u3.e2.ReferenceCount = 1; - Pfn1->u3.e1.PageLocation = ActiveAndValid; - Pfn1->u3.e1.CacheAttribute = MiNonCached; + /* Skip invalid PDEs */ + if (!PointerPde->u.Hard.Valid) continue; + + /* Handle the PFN */ + PageFrameIndex = PFN_FROM_PDE(PointerPde); + MiSetupPfnForPageTable(PageFrameIndex, PointerPde); + + /* Get starting VA for this PDE */ + Address = MiPdeToAddress(PointerPde); + + /* Loop all PTEs in this PT */ + PointerPte = MiAddressToPte(Address); + for (l = 0; l < PTE_PER_PAGE; l++, PointerPte++) + { + /* Skip invalid PTEs */ + if (!PointerPte->u.Hard.Valid) continue; + + /* Handle the PFN */ + PageFrameIndex = PFN_FROM_PTE(PointerPte); + MiSetupPfnForPageTable(PageFrameIndex, PointerPte); + } } - else - { - /* No PFN entry */ - Pfn1 = NULL; - } - - /* Now get the PTE and scan the pages */ - PointerPte = MiAddressToPte(BaseAddress); - for (j = 0; j < PTE_COUNT; j++) - { - /* Check for a valid PTE */ - if (PointerPte->u.Hard.Valid == 1) - { - /* Increase the shared count of the PFN entry for the PDE */ - ASSERT(Pfn1 != NULL); - Pfn1->u2.ShareCount++; - - /* Now check if the PTE is valid memory too */ - PtePageIndex = PFN_FROM_PTE(PointerPte); - if (MiIsRegularMemory(LoaderBlock, PtePageIndex)) - { - /* - * Only add pages above the end of system code or pages - * that are part of nonpaged pool - */ - if ((BaseAddress >= 0xA0000000) || - ((BaseAddress >= (ULONG_PTR)MmNonPagedPoolStart) && - (BaseAddress < (ULONG_PTR)MmNonPagedPoolStart + - MmSizeOfNonPagedPoolInBytes))) - { - /* Get the PFN entry and make sure it too is valid */ - Pfn2 = MiGetPfnEntry(PtePageIndex); - if ((MmIsAddressValid(Pfn2)) && - (MmIsAddressValid(Pfn2 + 1))) - { - /* Setup the PFN entry */ - Pfn2->u4.PteFrame = PageFrameIndex; - Pfn2->PteAddress = PointerPte; - Pfn2->u2.ShareCount++; - Pfn2->u3.e2.ReferenceCount = 1; - Pfn2->u3.e1.PageLocation = ActiveAndValid; - Pfn2->u3.e1.CacheAttribute = MiNonCached; - } - } - } - } - - /* Next PTE */ - PointerPte++; - BaseAddress += PAGE_SIZE; - } - } - else - { - /* Next PDE mapped address */ - BaseAddress += PDE_MAPPED_VA; - } - - /* Next PTE */ - PointerPde++; - } +#if (_MI_PAGING_LEVELS >= 3) + } +#endif +#if (_MI_PAGING_LEVELS == 4) + } +#endif } VOID

1 0

[akhaldi] 48373: [CMAKE] - CMake is awesome, unlike rbuild, and can work with vanilla winebuild. - Dedicated to Richard.
by akhaldi＠svn.reactos.org 30 Jul '10

30 Jul '10

Author: akhaldi Date: Fri Jul 30 22:10:00 2010 New Revision: 48373 URL: http://svn.reactos.org/svn/reactos?rev=48373&view=rev Log: [CMAKE] - CMake is awesome, unlike rbuild, and can work with vanilla winebuild. - Dedicated to Richard. Removed: branches/cmake-bringup/tools/winebuild/ros_diff.patch Modified: branches/cmake-bringup/tools/winebuild/CMakeLists.txt branches/cmake-bringup/tools/winebuild/Makefile.in branches/cmake-bringup/tools/winebuild/build.h branches/cmake-bringup/tools/winebuild/import.c branches/cmake-bringup/tools/winebuild/main.c branches/cmake-bringup/tools/winebuild/parser.c branches/cmake-bringup/tools/winebuild/relay.c branches/cmake-bringup/tools/winebuild/res32.c branches/cmake-bringup/tools/winebuild/spec16.c branches/cmake-bringup/tools/winebuild/spec32.c branches/cmake-bringup/tools/winebuild/utils.c branches/cmake-bringup/tools/winebuild/winebuild.man.in Modified: branches/cmake-bringup/tools/winebuild/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/winebuild/C… ============================================================================== --- branches/cmake-bringup/tools/winebuild/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/tools/winebuild/CMakeLists.txt [iso-8859-1] Fri Jul 30 22:10:00 2010 @@ -1,3 +1,5 @@ + +add_definitions(-DEXEEXT=".exe") file(GLOB_RECURSE SOURCE "*.c") Modified: branches/cmake-bringup/tools/winebuild/Makefile.in URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/winebuild/M… ============================================================================== --- branches/cmake-bringup/tools/winebuild/Makefile.in [iso-8859-1] (original) +++ branches/cmake-bringup/tools/winebuild/Makefile.in [iso-8859-1] Fri Jul 30 22:10:00 2010 @@ -35,5 +35,3 @@ uninstall:: $(RM) $(DESTDIR)$(bindir)/winebuild$(EXEEXT) $(DESTDIR)$(mandir)/man$(prog_manext)/winebuild.$(prog_manext) - -@DEPENDENCIES@ # everything below this line is overwritten by make depend Modified: branches/cmake-bringup/tools/winebuild/build.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/winebuild/b… ============================================================================== --- branches/cmake-bringup/tools/winebuild/build.h [iso-8859-1] (original) +++ branches/cmake-bringup/tools/winebuild/build.h [iso-8859-1] Fri Jul 30 22:10:00 2010 @@ -38,8 +38,6 @@ #define min(a,b) (((a) < (b)) ? (a) : (b)) #endif -#define EXEEXT ".exe" - typedef enum { TYPE_VARIABLE, /* variable */ @@ -49,7 +47,6 @@ TYPE_STDCALL, /* stdcall function (Win32) */ TYPE_CDECL, /* cdecl function (Win32) */ TYPE_VARARGS, /* varargs function (Win32) */ - TYPE_FASTCALL, /* fastcall function (Win32) */ TYPE_EXTERN, /* external symbol (Win32) */ TYPE_NBTYPES } ORD_TYPE; @@ -149,6 +146,7 @@ #define FLAG_FORWARD 0x100 /* function is a forwarded name */ #define FLAG_EXT_LINK 0x200 /* function links to an external symbol */ +#define FLAG_EXPORT32 0x400 /* 32-bit export in 16-bit spec file */ #define FLAG_CPU(cpu) (0x01000 << (cpu)) #define FLAG_CPU_MASK (FLAG_CPU(CPU_LAST + 1) - FLAG_CPU(0)) @@ -211,10 +209,12 @@ __attribute__ ((__format__ (__printf__, 1, 2))); extern int output( const char *format, ... ) __attribute__ ((__format__ (__printf__, 1, 2))); +extern void output_cfi( const char *format, ... ) + __attribute__ ((__format__ (__printf__, 1, 2))); +extern char *find_tool( const char *name, const char * const *names ); extern const char *get_as_command(void); extern const char *get_ld_command(void); extern const char *get_nm_command(void); -extern const char *get_windres_command(void); extern char *get_temp_file_name( const char *prefix, const char *suffix ); extern void output_standard_file_header(void); extern FILE *open_input_file( const char *srcdir, const char *name ); @@ -246,18 +246,21 @@ extern void add_ignore_symbol( const char *name ); extern void add_extra_ld_symbol( const char *name ); extern void read_undef_symbols( DLLSPEC *spec, char **argv ); -extern int resolve_imports( DLLSPEC *spec ); +extern void resolve_imports( DLLSPEC *spec ); +extern int is_undefined( const char *name ); extern int has_imports(void); extern int has_relays( DLLSPEC *spec ); extern void output_get_pc_thunk(void); extern void output_module( DLLSPEC *spec ); extern void output_stubs( DLLSPEC *spec ); extern void output_imports( DLLSPEC *spec ); +extern void output_import_lib( DLLSPEC *spec, char **argv ); extern void output_exports( DLLSPEC *spec ); extern int load_res32_file( const char *name, DLLSPEC *spec ); extern void output_resources( DLLSPEC *spec ); extern void output_bin_resources( DLLSPEC *spec, unsigned int start_rva ); extern void output_fake_module( DLLSPEC *spec ); +extern void output_def_file( DLLSPEC *spec, int include_private ); extern void load_res16_file( const char *name, DLLSPEC *spec ); extern void output_res16_data( DLLSPEC *spec ); extern void output_bin_res16_data( DLLSPEC *spec ); @@ -266,13 +269,10 @@ extern void output_spec16_file( DLLSPEC *spec ); extern void output_fake_module16( DLLSPEC *spec16 ); extern void output_res_o_file( DLLSPEC *spec ); - -extern void BuildRelays16(void); -extern void BuildRelays32(void); -extern void BuildSpec16File( DLLSPEC *spec ); +extern void output_asm_relays(void); +extern void output_asm_relays16(void); + extern void BuildSpec32File( DLLSPEC *spec ); -extern void BuildDef32File( DLLSPEC *spec ); -extern void BuildPedllFile( DLLSPEC *spec ); extern void add_16bit_exports( DLLSPEC *spec32, DLLSPEC *spec16 ); extern int parse_spec_file( FILE *file, DLLSPEC *spec ); @@ -315,6 +315,7 @@ extern int save_temps; extern int link_ext_symbols; extern int force_pointer_size; +extern int unwind_tables; extern char *input_file_name; extern char *spec_file_name; Modified: branches/cmake-bringup/tools/winebuild/import.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/winebuild/i… ============================================================================== --- branches/cmake-bringup/tools/winebuild/import.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/winebuild/import.c [iso-8859-1] Fri Jul 30 22:10:00 2010 @@ -466,7 +466,7 @@ for (i = 0; i < spec->nb_entry_points; i++) { ORDDEF *odp = &spec->entry_points[i]; - if (odp->type == TYPE_STUB || odp->type == TYPE_ABS) continue; + if (odp->type == TYPE_STUB || odp->type == TYPE_ABS || odp->type == TYPE_VARIABLE) continue; if (odp->flags & FLAG_FORWARD) continue; if (find_name( odp->link_name, &undef_symbols )) { @@ -508,7 +508,7 @@ for (i = 0; i < spec->nb_entry_points; i++) { ORDDEF *odp = &spec->entry_points[i]; - if (odp->type == TYPE_STUB || odp->type == TYPE_ABS) continue; + if (odp->type == TYPE_STUB || odp->type == TYPE_ABS || odp->type == TYPE_VARIABLE) continue; if (odp->flags & FLAG_FORWARD) continue; fprintf( f, "\t%s %s\n", get_asm_ptr_keyword(), asm_name(odp->link_name) ); } @@ -585,7 +585,7 @@ } /* resolve the imports for a Win32 module */ -int resolve_imports( DLLSPEC *spec ) +void resolve_imports( DLLSPEC *spec ) { int i; unsigned int j, removed; @@ -628,8 +628,12 @@ sort_names( &undef_symbols ); check_undefined_exports( spec ); - - return 1; +} + +/* check if symbol is still undefined */ +int is_undefined( const char *name ) +{ + return find_name( name, &undef_symbols ) != NULL; } /* output the get_pc thunk if needed */ @@ -641,9 +645,10 @@ output( "\t.align %d\n", get_alignment(4) ); output( "\t%s\n", func_declaration("__wine_spec_get_pc_thunk_eax") ); output( "%s:\n", asm_name("__wine_spec_get_pc_thunk_eax") ); - output( "\tpopl %%eax\n" ); - output( "\tpushl %%eax\n" ); + output_cfi( ".cfi_startproc" ); + output( "\tmovl (%%esp),%%eax\n" ); output( "\tret\n" ); + output_cfi( ".cfi_endproc" ); output_function_size( "__wine_spec_get_pc_thunk_eax" ); } @@ -653,6 +658,7 @@ output( "\n\t.align %d\n", get_alignment(4) ); output( "\t%s\n", func_declaration(name) ); output( "%s\n", asm_globl(name) ); + output_cfi( ".cfi_startproc" ); switch(target_cpu) { @@ -668,9 +674,7 @@ } break; case CPU_x86_64: - output( "\t.cfi_startproc\n" ); output( "\tjmpq *%s+%d(%%rip)\n", table, pos ); - output( "\t.cfi_endproc\n" ); break; case CPU_SPARC: if ( !UsePIC ) @@ -721,6 +725,7 @@ output( "\tbctr\n" ); break; } + output_cfi( ".cfi_endproc" ); output_function_size( name ); } @@ -964,21 +969,27 @@ output( "%s:\n", asm_name(delayed_import_loaders)); output( "\t%s\n", func_declaration("__wine_delay_load_asm") ); output( "%s:\n", asm_name("__wine_delay_load_asm") ); + output_cfi( ".cfi_startproc" ); switch(target_cpu) { case CPU_x86: output( "\tpushl %%ecx\n" ); + output_cfi( ".cfi_adjust_cfa_offset 4" ); output( "\tpushl %%edx\n" ); + output_cfi( ".cfi_adjust_cfa_offset 4" ); output( "\tpushl %%eax\n" ); + output_cfi( ".cfi_adjust_cfa_offset 4" ); output( "\tcall %s\n", asm_name("__wine_spec_delay_load") ); + output_cfi( ".cfi_adjust_cfa_offset -4" ); output( "\tpopl %%edx\n" ); + output_cfi( ".cfi_adjust_cfa_offset -4" ); output( "\tpopl %%ecx\n" ); + output_cfi( ".cfi_adjust_cfa_offset -4" ); output( "\tjmp *%%eax\n" ); break; case CPU_x86_64: - output( "\t.cfi_startproc\n" ); output( "\tsubq $88,%%rsp\n" ); - output( "\t.cfi_adjust_cfa_offset 88\n" ); + output_cfi( ".cfi_adjust_cfa_offset 88" ); output( "\tmovq %%rdx,80(%%rsp)\n" ); output( "\tmovq %%rcx,72(%%rsp)\n" ); output( "\tmovq %%r8,64(%%rsp)\n" ); @@ -994,9 +1005,8 @@ output( "\tmovq 72(%%rsp),%%rcx\n" ); output( "\tmovq 80(%%rsp),%%rdx\n" ); output( "\taddq $88,%%rsp\n" ); - output( "\t.cfi_adjust_cfa_offset -88\n" ); + output_cfi( ".cfi_adjust_cfa_offset -88" ); output( "\tjmp *%%rax\n" ); - output( "\t.cfi_endproc\n" ); break; case CPU_SPARC: output( "\tsave %%sp, -96, %%sp\n" ); @@ -1064,6 +1074,7 @@ output( "\tbctr\n"); break; } + output_cfi( ".cfi_endproc" ); output_function_size( "__wine_delay_load_asm" ); output( "\n" ); @@ -1076,6 +1087,7 @@ const char *name = odp->name ? odp->name : odp->export_name; output( ".L__wine_delay_imp_%d_%s:\n", i, name ); + output_cfi( ".cfi_startproc" ); switch(target_cpu) { case CPU_x86: @@ -1083,10 +1095,8 @@ output( "\tjmp %s\n", asm_name("__wine_delay_load_asm") ); break; case CPU_x86_64: - output( "\t.cfi_startproc\n" ); output( "\tmovq $%d,%%rax\n", (idx << 16) | j ); output( "\tjmp %s\n", asm_name("__wine_delay_load_asm") ); - output( "\t.cfi_endproc\n" ); break; case CPU_SPARC: output( "\tset %d, %%g1\n", (idx << 16) | j ); @@ -1128,6 +1138,7 @@ } break; } + output_cfi( ".cfi_endproc" ); } idx++; } @@ -1210,6 +1221,7 @@ output( "\t.align %d\n", get_alignment(4) ); output( "\t%s\n", func_declaration(name) ); output( "%s:\n", asm_name(name) ); + output_cfi( ".cfi_startproc" ); switch (target_cpu) { @@ -1225,7 +1237,8 @@ output(" \tnop\n" ); output(" \tnop\n" ); - output( "\tsubl $4,%%esp\n" ); + output( "\tsubl $12,%%esp\n" ); + output_cfi( ".cfi_adjust_cfa_offset 12" ); if (UsePIC) { output( "\tcall %s\n", asm_name("__wine_spec_get_pc_thunk_eax") ); @@ -1233,31 +1246,30 @@ if (exp_name) { output( "\tleal .L%s_string-1b(%%eax),%%ecx\n", name ); - output( "\tpushl %%ecx\n" ); + output( "\tmovl %%ecx,4(%%esp)\n" ); count++; } else - output( "\tpushl $%d\n", odp->ordinal ); + output( "\tmovl $%d,4(%%esp)\n", odp->ordinal ); output( "\tleal .L__wine_spec_file_name-1b(%%eax),%%ecx\n" ); - output( "\tpushl %%ecx\n" ); + output( "\tmovl %%ecx,(%%esp)\n" ); } else { if (exp_name) { - output( "\tpushl $.L%s_string\n", name ); + output( "\tmovl $.L%s_string,4(%%esp)\n", name ); count++; } else - output( "\tpushl $%d\n", odp->ordinal ); - output( "\tpushl $.L__wine_spec_file_name\n" ); + output( "\tmovl $%d,4(%%esp)\n", odp->ordinal ); + output( "\tmovl $.L__wine_spec_file_name,(%%esp)\n" ); } output( "\tcall %s\n", asm_name("__wine_spec_unimplemented_stub") ); break; case CPU_x86_64: - output( "\t.cfi_startproc\n" ); output( "\tsubq $8,%%rsp\n" ); - output( "\t.cfi_adjust_cfa_offset 8\n" ); + output_cfi( ".cfi_adjust_cfa_offset 8" ); output( "\tleaq .L__wine_spec_file_name(%%rip),%%rdi\n" ); if (exp_name) { @@ -1267,11 +1279,11 @@ else output( "\tmovq $%d,%%rsi\n", odp->ordinal ); output( "\tcall %s\n", asm_name("__wine_spec_unimplemented_stub") ); - output( "\t.cfi_endproc\n" ); break; default: assert(0); } + output_cfi( ".cfi_endproc" ); output_function_size( name ); } @@ -1304,3 +1316,52 @@ if (nb_imports || ext_link_imports.count || has_stubs(spec) || has_relays(spec)) output_get_pc_thunk(); } + +/* output an import library for a Win32 module and additional object files */ +void output_import_lib( DLLSPEC *spec, char **argv ) +{ + char *dlltool, *def_file; + char *cmd; + int err; + + if (target_platform != PLATFORM_WINDOWS) + fatal_error( "Unix-style import libraries not supported yet\n" ); + + def_file = get_temp_file_name( output_file_name, ".def" ); + fclose( output_file ); + if (!(output_file = fopen( def_file, "w" ))) + fatal_error( "Unable to create output file '%s'\n", def_file ); + output_def_file( spec, 0 ); + fclose( output_file ); + output_file = NULL; + + dlltool = find_tool( "dlltool", NULL ); + cmd = xmalloc( strlen(dlltool) + strlen(output_file_name) + strlen(def_file) + 12 ); + sprintf( cmd, "%s -k -l %s -d %s", dlltool, output_file_name, def_file ); + if (verbose) fprintf( stderr, "%s\n", cmd ); + err = system( cmd ); + if (err) fatal_error( "%s failed with status %d\n", dlltool, err ); + free( cmd ); + free( dlltool ); + + if (argv[0]) + { + char *ar = find_tool( "ar", NULL ); + int i, len; + + for (i = len = 0; argv[i]; i++) len += strlen(argv[i]) + 1; + cmd = xmalloc( strlen(ar) + strlen(output_file_name) + len + 5 ); + sprintf( cmd, "%s rs %s", ar, output_file_name ); + for (i = 0; argv[i]; i++) + { + strcat( cmd, " " ); + strcat( cmd, argv[i] ); + } + if (verbose) fprintf( stderr, "%s\n", cmd ); + err = system( cmd ); + if (err) fatal_error( "%s failed with status %d\n", dlltool, err ); + free( cmd ); + free( ar ); + } + output_file_name = NULL; +} Modified: branches/cmake-bringup/tools/winebuild/main.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/winebuild/m… ============================================================================== --- branches/cmake-bringup/tools/winebuild/main.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/winebuild/main.c [iso-8859-1] Fri Jul 30 22:10:00 2010 @@ -47,10 +47,11 @@ int save_temps = 0; int link_ext_symbols = 0; int force_pointer_size = 0; - -#if defined(TARGET_i386) +int unwind_tables = 0; + +#ifdef __i386__ enum target_cpu target_cpu = CPU_x86; -#elif defined(TARGET_amd64) +#elif defined(__x86_64__) enum target_cpu target_cpu = CPU_x86_64; #elif defined(__sparc__) enum target_cpu target_cpu = CPU_SPARC; @@ -58,7 +59,7 @@ enum target_cpu target_cpu = CPU_ALPHA; #elif defined(__powerpc__) enum target_cpu target_cpu = CPU_POWERPC; -#elif defined(TARGET_arm) +#elif defined(__arm__) enum target_cpu target_cpu = CPU_ARM; #else #error Unsupported CPU @@ -100,10 +101,8 @@ MODE_DLL, MODE_EXE, MODE_DEF, - MODE_RELAY16, - MODE_RELAY32, - MODE_RESOURCES, - MODE_PEDLL + MODE_IMPLIB, + MODE_RESOURCES }; static enum exec_mode_values exec_mode = MODE_NONE; @@ -118,6 +117,7 @@ { "darwin", PLATFORM_APPLE }, { "freebsd", PLATFORM_FREEBSD }, { "solaris", PLATFORM_SOLARIS }, + { "mingw32", PLATFORM_WINDOWS }, { "windows", PLATFORM_WINDOWS }, { "winnt", PLATFORM_WINDOWS } }; @@ -136,6 +136,23 @@ if ((p = strrchr( spec->file_name, '.' ))) { if (!strcmp( p, ".spec" ) || !strcmp( p, ".def" )) *p = 0; + } +} + +/* set the dll name from the file name */ +static void init_dll_name( DLLSPEC *spec ) +{ + if (!spec->file_name) + { + char *p; + spec->file_name = xstrdup( output_file_name ); + if ((p = strrchr( spec->file_name, '.' ))) *p = 0; + } + if (!spec->dll_name) /* set default name from file name */ + { + char *p; + spec->dll_name = xstrdup( spec->file_name ); + if ((p = strrchr( spec->dll_name, '.' ))) *p = 0; } } @@ -221,7 +238,7 @@ " -e, --entry=FUNC Set the DLL entry point function (default: DllMain)\n" " -E, --export=FILE Export the symbols defined in the .spec or .def file\n" " --external-symbols Allow linking to external symbols\n" -" -f FLAGS Compiler flags (only -fPIC is supported)\n" +" -f FLAGS Compiler flags (-fPIC and -fasynchronous-unwind-tables are supported)\n" " -F, --filename=DLLFILE Set the DLL filename (default: from input file name)\n" " --fake-module Create a fake binary module\n" " -h, --help Display this help message\n" @@ -234,7 +251,7 @@ " --ld-cmd=LD Command to use for linking (default: ld)\n" " -l, --library=LIB Import the specified library\n" " -L, --library-path=DIR Look for imports libraries in DIR\n" -" -m32, -m64 Force building 32-bit resp. 64-bit code\n" +" -m16, -m32, -m64 Force building 16-bit, 32-bit resp. 64-bit code\n" " -M, --main-module=MODULE Set the name of the main module for a Win16 dll\n" " --nm-cmd=NM Command to use to get undefined symbols (default: nm)\n" " --nxcompat=y|n Set the NX compatibility flag (default: yes)\n" @@ -251,10 +268,8 @@ " --dll Build a .c file from a .spec or .def file\n" " --def Build a .def file from a .spec file\n" " --exe Build a .c file for an executable\n" -" --relay16 Build the 16-bit relay assembly routines\n" -" --relay32 Build the 32-bit relay assembly routines\n" +" --implib Build an import library\n" " --resources Build a .o file for the resource files\n\n" -" --pedll Build a .c file for PE dll\n\n" "The mode options are mutually exclusive; you must specify one and only one.\n\n"; enum long_options_values @@ -262,6 +277,7 @@ LONG_OPT_DLL = 1, LONG_OPT_DEF, LONG_OPT_EXE, + LONG_OPT_IMPLIB, LONG_OPT_ASCMD, LONG_OPT_EXTERNAL_SYMS, LONG_OPT_FAKE_MODULE, @@ -269,13 +285,10 @@ LONG_OPT_LDCMD, LONG_OPT_NMCMD, LONG_OPT_NXCOMPAT, - LONG_OPT_RELAY16, - LONG_OPT_RELAY32, LONG_OPT_RESOURCES, LONG_OPT_SAVE_TEMPS, LONG_OPT_SUBSYSTEM, - LONG_OPT_VERSION, - LONG_OPT_PEDLL + LONG_OPT_VERSION }; static const char short_options[] = "C:D:E:F:H:I:K:L:M:N:b:d:e:f:hi:kl:m:o:r:u:vw"; @@ -285,6 +298,7 @@ { "dll", 0, 0, LONG_OPT_DLL }, { "def", 0, 0, LONG_OPT_DEF }, { "exe", 0, 0, LONG_OPT_EXE }, + { "implib", 0, 0, LONG_OPT_IMPLIB }, { "as-cmd", 1, 0, LONG_OPT_ASCMD }, { "external-symbols", 0, 0, LONG_OPT_EXTERNAL_SYMS }, { "fake-module", 0, 0, LONG_OPT_FAKE_MODULE }, @@ -292,13 +306,10 @@ { "ld-cmd", 1, 0, LONG_OPT_LDCMD }, { "nm-cmd", 1, 0, LONG_OPT_NMCMD }, { "nxcompat", 1, 0, LONG_OPT_NXCOMPAT }, - { "relay16", 0, 0, LONG_OPT_RELAY16 }, - { "relay32", 0, 0, LONG_OPT_RELAY32 }, { "resources", 0, 0, LONG_OPT_RESOURCES }, { "save-temps", 0, 0, LONG_OPT_SAVE_TEMPS }, { "subsystem", 1, 0, LONG_OPT_SUBSYSTEM }, { "version", 0, 0, LONG_OPT_VERSION }, - { "pedll", 1, 0, LONG_OPT_PEDLL }, /* aliases for short options */ { "target", 1, 0, 'b' }, { "delay-lib", 1, 0, 'd' }, @@ -371,9 +382,10 @@ lib_path[nb_lib_paths++] = xstrdup( optarg ); break; case 'm': - if (strcmp( optarg, "32" ) && strcmp( optarg, "64" )) - fatal_error( "Invalid -m option '%s', expected -m32 or -m64\n", optarg ); - if (!strcmp( optarg, "32" )) force_pointer_size = 4; + if (strcmp( optarg, "16" ) && strcmp( optarg, "32" ) && strcmp( optarg, "64" )) + fatal_error( "Invalid -m option '%s', expected -m16, -m32 or -m64\n", optarg ); + if (!strcmp( optarg, "16" )) spec->type = SPEC_WIN16; + else if (!strcmp( optarg, "32" )) force_pointer_size = 4; else force_pointer_size = 8; break; case 'M': @@ -394,6 +406,8 @@ break; case 'f': if (!strcmp( optarg, "PIC") || !strcmp( optarg, "pic")) UsePIC = 1; + else if (!strcmp( optarg, "asynchronous-unwind-tables")) unwind_tables = 1; + else if (!strcmp( optarg, "no-asynchronous-unwind-tables")) unwind_tables = 0; /* ignore all other flags */ break; case 'h': @@ -461,6 +475,9 @@ set_exec_mode( MODE_EXE ); if (!spec->subsystem) spec->subsystem = IMAGE_SUBSYSTEM_WINDOWS_GUI; break; + case LONG_OPT_IMPLIB: + set_exec_mode( MODE_IMPLIB ); + break; case LONG_OPT_ASCMD: as_command = xstrdup( optarg ); break; @@ -483,12 +500,6 @@ if (optarg[0] == 'n' || optarg[0] == 'N') spec->dll_characteristics &= ~IMAGE_DLLCHARACTERISTICS_NX_COMPAT; break; - case LONG_OPT_RELAY16: - set_exec_mode( MODE_RELAY16 ); - break; - case LONG_OPT_RELAY32: - set_exec_mode( MODE_RELAY32 ); - break; case LONG_OPT_RESOURCES: set_exec_mode( MODE_RESOURCES ); break; @@ -501,11 +512,6 @@ case LONG_OPT_VERSION: printf( "winebuild version " PACKAGE_VERSION "\n" ); exit(0); - case LONG_OPT_PEDLL: - set_exec_mode( MODE_PEDLL ); - spec_file_name = xstrdup( optarg ); - set_dll_file_name( optarg, spec ); - break; case '?': usage(1); break; @@ -514,6 +520,7 @@ if (spec->file_name && !strchr( spec->file_name, '.' )) strcat( spec->file_name, exec_mode == MODE_EXE ? ".exe" : ".dll" ); + init_dll_name( spec ); switch (target_cpu) { @@ -615,14 +622,6 @@ case MODE_DLL: if (spec->subsystem != IMAGE_SUBSYSTEM_NATIVE) spec->characteristics |= IMAGE_FILE_DLL; - if (!spec_file_name) fatal_error( "missing .spec file\n" ); - if (spec->type == SPEC_WIN32 && spec->main_module) /* embedded 16-bit module */ - { - spec->type = SPEC_WIN16; - load_resources( argv, spec ); - if (parse_input_file( spec )) BuildSpec16File( spec ); - break; - } /* fall through */ case MODE_EXE: load_resources( argv, spec ); @@ -648,23 +647,14 @@ break; case MODE_DEF: if (argv[0]) fatal_error( "file argument '%s' not allowed in this mode\n", argv[0] ); - if (spec->type == SPEC_WIN16) fatal_error( "Cannot yet build .def file for 16-bit dlls\n" ); if (!spec_file_name) fatal_error( "missing .spec file\n" ); if (!parse_input_file( spec )) break; - BuildDef32File( spec ); - break; - case MODE_RELAY16: - if (argv[0]) fatal_error( "file argument '%s' not allowed in this mode\n", argv[0] ); - BuildRelays16(); - break; - case MODE_RELAY32: - if (argv[0]) fatal_error( "file argument '%s' not allowed in this mode\n", argv[0] ); - BuildRelays32(); - break; - case MODE_PEDLL: - if (argv[0]) fatal_error( "file argument '%s' not allowed in this mode\n", argv[0] ); + output_def_file( spec, 1 ); + break; + case MODE_IMPLIB: + if (!spec_file_name) fatal_error( "missing .spec file\n" ); if (!parse_input_file( spec )) break; - BuildPedllFile( spec ); + output_import_lib( spec, argv ); break; case MODE_RESOURCES: load_resources( argv, spec ); Modified: branches/cmake-bringup/tools/winebuild/parser.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/winebuild/p… ============================================================================== --- branches/cmake-bringup/tools/winebuild/parser.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/winebuild/parser.c [iso-8859-1] Fri Jul 30 22:10:00 2010 @@ -56,7 +56,6 @@ "stdcall", /* TYPE_STDCALL */ "cdecl", /* TYPE_CDECL */ "varargs", /* TYPE_VARARGS */ - "fastcall", /* TYPE_FASTCALL */ "extern" /* TYPE_EXTERN */ }; @@ -229,25 +228,17 @@ { const char *token; unsigned int i; - - switch(spec->type) - { - case SPEC_WIN16: - if (odp->type == TYPE_STDCALL) - { - error( "'stdcall' not supported for Win16\n" ); - return 0; - } - break; - case SPEC_WIN32: - if (odp->type == TYPE_PASCAL) - { - error( "'pascal' not supported for Win32\n" ); - return 0; - } - break; - default: - break; + int is_win32 = (spec->type == SPEC_WIN32) || (odp->flags & FLAG_EXPORT32); + + if (!is_win32 && odp->type == TYPE_STDCALL) + { + error( "'stdcall' not supported for Win16\n" ); + return 0; + } + if (is_win32 && odp->type == TYPE_PASCAL) + { + error( "'pascal' not supported for Win32\n" ); + return 0; } if (!(token = GetToken(0))) return 0; @@ -289,7 +280,7 @@ return 0; } - if (spec->type == SPEC_WIN32) + if (is_win32) { if (strcmp(token, "long") && strcmp(token, "ptr") && @@ -297,7 +288,7 @@ strcmp(token, "wstr") && strcmp(token, "double")) { - error( "Type '%s' not supported for Win32\n", token ); + error( "Type '%s' not supported for Win32 function\n", token ); return 0; } } @@ -326,7 +317,7 @@ odp->link_name = xstrdup( token ); if (strchr( odp->link_name, '.' )) { - if (spec->type == SPEC_WIN16) + if (!is_win32) { error( "Forwarded functions not supported for Win16\n" ); return 0; @@ -422,7 +413,7 @@ * * Parse the optional flags for an entry point in a .spec file. */ -static const char *parse_spec_flags( ORDDEF *odp ) +static const char *parse_spec_flags( DLLSPEC *spec, ORDDEF *odp ) { unsigned int i; const char *token; @@ -437,7 +428,12 @@ while (cpu_name) { if (!strcmp( cpu_name, "win32" )) - odp->flags |= FLAG_CPU_WIN32; + { + if (spec->type == SPEC_WIN32) + odp->flags |= FLAG_CPU_WIN32; + else + odp->flags |= FLAG_EXPORT32; + } else if (!strcmp( cpu_name, "win64" )) odp->flags |= FLAG_CPU_WIN64; else @@ -500,7 +496,13 @@ } if (!(token = GetToken(0))) goto error; - if (*token == '-' && !(token = parse_spec_flags( odp ))) goto error; + if (*token == '-' && !(token = parse_spec_flags( spec, odp ))) goto error; + + if (ordinal == -1 && spec->type != SPEC_WIN32 && !(odp->flags & FLAG_EXPORT32)) + { + error( "'@' ordinals not supported for Win16\n" ); + goto error; + } odp->name = xstrdup( token ); odp->lineno = current_line; @@ -522,7 +524,6 @@ case TYPE_STDCALL: case TYPE_VARARGS: case TYPE_CDECL: - case TYPE_FASTCALL: if (!parse_spec_export( odp, spec )) goto error; break; case TYPE_ABS: @@ -652,7 +653,8 @@ { const char *name1 = all_names[i]->name ? all_names[i]->name : all_names[i]->export_name; const char *name2 = all_names[i+1]->name ? all_names[i+1]->name : all_names[i+1]->export_name; - if (!strcmp( name1, name2 )) + if (!strcmp( name1, name2 ) && + !((all_names[i]->flags ^ all_names[i+1]->flags) & FLAG_EXPORT32)) { current_line = max( all_names[i]->lineno, all_names[i+1]->lineno ); error( "'%s' redefined\n%s:%d: First defined here\n", @@ -739,12 +741,21 @@ */ void add_16bit_exports( DLLSPEC *spec32, DLLSPEC *spec16 ) { + int i; ORDDEF *odp; + + spec32->file_name = xstrdup( spec16->file_name ); + if (spec16->characteristics & IMAGE_FILE_DLL) + { + spec32->characteristics = IMAGE_FILE_DLL; + spec32->init_func = xstrdup( "__wine_spec_dll_entry" ); + } /* add an export for the NE module */ odp = add_entry_point( spec32 ); odp->type = TYPE_EXTERN; + odp->flags = FLAG_PRIVATE; odp->name = xstrdup( "__wine_spec_dos_header" ); odp->lineno = 0; odp->ordinal = 1; @@ -754,12 +765,32 @@ { odp = add_entry_point( spec32 ); odp->type = TYPE_EXTERN; + odp->flags = FLAG_PRIVATE; odp->name = xstrdup( "__wine_spec_main_module" ); odp->lineno = 0; odp->ordinal = 2; odp->link_name = xstrdup( ".L__wine_spec_main_module" ); } + /* add the explicit win32 exports */ + + for (i = 1; i <= spec16->limit; i++) + { + ORDDEF *odp16 = spec16->ordinals[i]; + + if (!odp16 || !odp16->name) continue; + if (!(odp16->flags & FLAG_EXPORT32)) continue; + + odp = add_entry_point( spec32 ); + odp->flags = odp16->flags & ~FLAG_EXPORT32; + odp->type = odp16->type; + odp->name = xstrdup( odp16->name ); + odp->lineno = odp16->lineno; + odp->ordinal = -1; + odp->link_name = xstrdup( odp16->link_name ); + strcpy( odp->u.func.arg_types, odp16->u.func.arg_types ); + } + assign_names( spec32 ); assign_ordinals( spec32 ); } @@ -785,11 +816,6 @@ if (!(token = GetToken(1))) continue; if (strcmp(token, "@") == 0) { - if (spec->type != SPEC_WIN32) - { - error( "'@' ordinals not supported for Win16\n" ); - continue; - } if (!parse_spec_ordinal( -1, spec )) continue; } else if (IsNumberString(token)) @@ -947,32 +973,33 @@ /* check for other optional keywords */ - if (token && !strcmp( token, "NONAME" )) - { - if (odp->ordinal == -1) - { - error( "NONAME requires an ordinal\n" ); + while (token) + { + if (!strcmp( token, "NONAME" )) + { + if (odp->ordinal == -1) + { + error( "NONAME requires an ordinal\n" ); + goto error; + } + odp->export_name = odp->name; + odp->name = NULL; + odp->flags |= FLAG_NONAME; + } + else if (!strcmp( token, "PRIVATE" )) + { + odp->flags |= FLAG_PRIVATE; + } + else if (!strcmp( token, "DATA" )) + { + odp->type = TYPE_EXTERN; + } + else + { + error( "Garbage text '%s' found at end of export declaration\n", token ); goto error; } - odp->export_name = odp->name; - odp->name = NULL; - odp->flags |= FLAG_NONAME; token = GetToken(1); - } - if (token && !strcmp( token, "PRIVATE" )) - { - odp->flags |= FLAG_PRIVATE; - token = GetToken(1); - } - if (token && !strcmp( token, "DATA" )) - { - odp->type = TYPE_EXTERN; - token = GetToken(1); - } - if (token) - { - error( "Garbage text '%s' found at end of export declaration\n", token ); - goto error; } return 1; Modified: branches/cmake-bringup/tools/winebuild/relay.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/winebuild/r… ============================================================================== --- branches/cmake-bringup/tools/winebuild/relay.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/winebuild/relay.c [iso-8859-1] Fri Jul 30 22:10:00 2010 @@ -386,13 +386,20 @@ function_header( name ); /* Function entry sequence */ + output_cfi( ".cfi_startproc" ); output( "\tpushl %%ebp\n" ); + output_cfi( ".cfi_adjust_cfa_offset 4" ); + output_cfi( ".cfi_rel_offset %%ebp,0" ); output( "\tmovl %%esp, %%ebp\n" ); + output_cfi( ".cfi_def_cfa_register %%ebp" ); /* Save the 32-bit registers */ output( "\tpushl %%ebx\n" ); + output_cfi( ".cfi_rel_offset %%ebx,-4" ); output( "\tpushl %%esi\n" ); + output_cfi( ".cfi_rel_offset %%esi,-8" ); output( "\tpushl %%edi\n" ); + output_cfi( ".cfi_rel_offset %%edi,-12" ); output( "\t.byte 0x64\n\tmov %%gs,(%d)\n", GS_OFFSET ); /* Setup exception frame */ @@ -443,12 +450,18 @@ /* Restore the 32-bit registers */ output( "\tpopl %%edi\n" ); + output_cfi( ".cfi_same_value %%edi" ); output( "\tpopl %%esi\n" ); + output_cfi( ".cfi_same_value %%esi" ); output( "\tpopl %%ebx\n" ); + output_cfi( ".cfi_same_value %%ebx" ); /* Function exit sequence */ output( "\tpopl %%ebp\n" ); + output_cfi( ".cfi_def_cfa %%esp,4" ); + output_cfi( ".cfi_same_value %%ebp" ); output( "\tret $12\n" ); + output_cfi( ".cfi_endproc" ); /* Start of the actual CallTo16 routine */ @@ -652,11 +665,18 @@ /* Entry code */ + output_cfi( ".cfi_startproc" ); output( "\tpushl %%ebp\n" ); + output_cfi( ".cfi_adjust_cfa_offset 4" ); + output_cfi( ".cfi_rel_offset %%ebp,0" ); output( "\tmovl %%esp,%%ebp\n" ); + output_cfi( ".cfi_def_cfa_register %%ebp" ); output( "\tpushl %%edi\n" ); + output_cfi( ".cfi_rel_offset %%edi,-4" ); output( "\tpushl %%esi\n" ); + output_cfi( ".cfi_rel_offset %%esi,-8" ); output( "\tpushl %%ebx\n" ); + output_cfi( ".cfi_rel_offset %%ebx,-12" ); /* Get pointer to temporary area and save the 32-bit stack pointer */ @@ -694,10 +714,16 @@ /* Restore registers and return */ output( "\tpopl %%ebx\n" ); + output_cfi( ".cfi_same_value %%ebx" ); output( "\tpopl %%esi\n" ); + output_cfi( ".cfi_same_value %%esi" ); output( "\tpopl %%edi\n" ); + output_cfi( ".cfi_same_value %%edi" ); output( "\tpopl %%ebp\n" ); + output_cfi( ".cfi_def_cfa %%esp,4" ); + output_cfi( ".cfi_same_value %%ebp" ); output( "\tret\n" ); + output_cfi( ".cfi_endproc" ); output_function_size( isEx ? "CALL32_CBClientEx" : "CALL32_CBClient" ); /* '16-bit' return stub */ @@ -721,7 +747,7 @@ /******************************************************************* - * BuildCallFrom32Regs + * build_call_from_regs_x86 * * Build a 32-bit-to-Wine call-back function for a 'register' function. * 'args' is the number of dword arguments. @@ -746,18 +772,23 @@ * pointer on return (with the return address and arguments already * removed). */ -static void BuildCallFrom32Regs(void) +static void build_call_from_regs_x86(void) { static const int STACK_SPACE = 128 + 0x2cc /* sizeof(CONTEXT86) */; /* Function header */ - function_header( "__wine_call_from_32_regs" ); + output( "\t.text\n" ); + function_header( "__wine_call_from_regs" ); /* Allocate some buffer space on the stack */ + output_cfi( ".cfi_startproc" ); output( "\tpushl %%ebp\n" ); - output( "\tmovl %%esp,%%ebp\n "); + output_cfi( ".cfi_adjust_cfa_offset 4" ); + output_cfi( ".cfi_rel_offset %%ebp,0" ); + output( "\tmovl %%esp,%%ebp\n" ); + output_cfi( ".cfi_def_cfa_register %%ebp" ); output( "\tleal -%d(%%esp),%%esp\n", STACK_SPACE ); /* Build the context structure */ @@ -845,12 +876,15 @@ output( "\tpopl %%ds\n" ); output( "\tiret\n" ); - output_function_size( "__wine_call_from_32_regs" ); - - function_header( "__wine_call_from_32_restore_regs" ); + output_cfi( ".cfi_endproc" ); + output_function_size( "__wine_call_from_regs" ); + + function_header( "__wine_restore_regs" ); + output_cfi( ".cfi_startproc" ); output( "\tmovl 4(%%esp),%%ecx\n" ); output( "\tjmp 2b\n" ); - output_function_size( "__wine_call_from_32_restore_regs" ); + output_cfi( ".cfi_endproc" ); + output_function_size( "__wine_restore_regs" ); } @@ -902,23 +936,15 @@ /******************************************************************* - * BuildRelays16 + * output_asm_relays16 * * Build all the 16-bit relay callbacks */ -void BuildRelays16(void) +void output_asm_relays16(void) { - if (target_cpu != CPU_x86) - { - output( "/* File not used with this architecture. Do not edit! */\n\n" ); - return; - } - /* File header */ - output( "/* File generated automatically. Do not edit! */\n\n" ); output( "\t.text\n" ); - output( "%s:\n\n", asm_name("__wine_spec_thunk_text_16") ); output( "%s\n", asm_globl("__wine_call16_start") ); @@ -957,14 +983,11 @@ output( "\n\t.data\n\t.align %d\n", get_alignment(4) ); output( "%s\n\t.long 0\n", asm_globl("CallTo16_DataSelector") ); output( "%s\n\t.long 0\n", asm_globl("CallTo16_TebSelector") ); - if (UsePIC) output( "wine_ldt_copy_ptr:\t.long %s\n", asm_name("wine_ldt_copy") ); output( "\t.text\n" ); - output( "%s:\n\n", asm_name("__wine_spec_thunk_text_32") ); - BuildCallFrom32Regs(); + output( "%s:\n", asm_name("__wine_spec_thunk_text_32") ); + build_call_from_regs_x86(); output_function_size( "__wine_spec_thunk_text_32" ); - - output_gnu_stack_note(); } @@ -991,48 +1014,49 @@ /* Function header */ + output( "\t.text\n" ); function_header( "__wine_call_from_regs" ); - output( "\t.cfi_startproc\n" ); + output_cfi( ".cfi_startproc" ); output( "\tsubq $%u,%%rsp\n", STACK_SPACE ); - output( "\t.cfi_adjust_cfa_offset %u\n", STACK_SPACE ); + output_cfi( ".cfi_adjust_cfa_offset %u", STACK_SPACE ); /* save registers into the context */ output( "\tmovq %%rax,0x78(%%rsp)\n" ); - output( "\t.cfi_rel_offset %%rax,0x78\n" ); + output_cfi( ".cfi_rel_offset %%rax,0x78" ); output( "\tmovq %u(%%rsp),%%rax\n", STACK_SPACE + 16 ); /* saved %rcx on stack */ output( "\tmovq %%rax,0x80(%%rsp)\n" ); - output( "\t.cfi_rel_offset %%rcx,0x80\n" ); + output_cfi( ".cfi_rel_offset %%rcx,0x80" ); output( "\tmovq %u(%%rsp),%%rax\n", STACK_SPACE + 24 ); /* saved %rdx on stack */ - output( "\t.cfi_rel_offset %%rdx,0x88\n" ); + output_cfi( ".cfi_rel_offset %%rdx,0x88" ); output( "\tmovq %%rax,0x88(%%rsp)\n" ); output( "\tmovq %%rbx,0x90(%%rsp)\n" ); - output( "\t.cfi_rel_offset %%rbx,0x90\n" ); + output_cfi( ".cfi_rel_offset %%rbx,0x90" ); output( "\tleaq %u(%%rsp),%%rax\n", STACK_SPACE + 16 ); output( "\tmovq %%rax,0x98(%%rsp)\n" ); output( "\tmovq %%rbp,0xa0(%%rsp)\n" ); - output( "\t.cfi_rel_offset %%rbp,0xa0\n" ); + output_cfi( ".cfi_rel_offset %%rbp,0xa0" ); output( "\tmovq %%rsi,0xa8(%%rsp)\n" ); - output( "\t.cfi_rel_offset %%rsi,0xa8\n" ); + output_cfi( ".cfi_rel_offset %%rsi,0xa8" ); output( "\tmovq %%rdi,0xb0(%%rsp)\n" ); - output( "\t.cfi_rel_offset %%rdi,0xb0\n" ); + output_cfi( ".cfi_rel_offset %%rdi,0xb0" ); output( "\tmovq %%r8,0xb8(%%rsp)\n" ); - output( "\t.cfi_rel_offset %%r8,0xb8\n" ); + output_cfi( ".cfi_rel_offset %%r8,0xb8" ); output( "\tmovq %%r9,0xc0(%%rsp)\n" ); - output( "\t.cfi_rel_offset %%r9,0xc0\n" ); + output_cfi( ".cfi_rel_offset %%r9,0xc0" ); output( "\tmovq %%r10,0xc8(%%rsp)\n" ); - output( "\t.cfi_rel_offset %%r10,0xc8\n" ); + output_cfi( ".cfi_rel_offset %%r10,0xc8" ); output( "\tmovq %%r11,0xd0(%%rsp)\n" ); - output( "\t.cfi_rel_offset %%r11,0xd0\n" ); + output_cfi( ".cfi_rel_offset %%r11,0xd0" ); output( "\tmovq %%r12,0xd8(%%rsp)\n" ); - output( "\t.cfi_rel_offset %%r12,0xd8\n" ); + output_cfi( ".cfi_rel_offset %%r12,0xd8" ); output( "\tmovq %%r13,0xe0(%%rsp)\n" ); - output( "\t.cfi_rel_offset %%r13,0xe0\n" ); + output_cfi( ".cfi_rel_offset %%r13,0xe0" ); output( "\tmovq %%r14,0xe8(%%rsp)\n" ); - output( "\t.cfi_rel_offset %%r14,0xe8\n" ); + output_cfi( ".cfi_rel_offset %%r14,0xe8" ); output( "\tmovq %%r15,0xf0(%%rsp)\n" ); - output( "\t.cfi_rel_offset %%r15,0xf0\n" ); + output_cfi( ".cfi_rel_offset %%r15,0xf0" ); output( "\tmovq %u(%%rsp),%%rax\n", STACK_SPACE + 8 ); output( "\tmovq %%rax,0xf8(%%rsp)\n" ); @@ -1041,7 +1065,7 @@ for (i = 0; i < 16; i++) { output( "\tmovdqa %%xmm%u,0x%x(%%rsp)\n", i, 0x1a0 + 16 * i ); - output( "\t.cfi_rel_offset %%xmm%u,0x%x\n", i, 0x1a0 + 16 * i ); + output_cfi( ".cfi_rel_offset %%xmm%u,0x%x", i, 0x1a0 + 16 * i ); } output( "\tmovw %%cs,0x38(%%rsp)\n" ); @@ -1065,7 +1089,7 @@ output( "\tcmpq %%rax,%%rcx\n" ); output( "\tcmovgq %%rcx,%%rax\n" ); output( "\tmovq %%rsp,%%rbx\n" ); - output( "\t.cfi_def_cfa_register %%rbx\n" ); + output_cfi( ".cfi_def_cfa_register %%rbx" ); output( "\tleaq 16(,%%rax,8),%%rax\n" ); /* add 8 for context arg and 8 for rounding */ output( "\tandq $~15,%%rax\n" ); output( "\tsubq %%rax,%%rsp\n" ); @@ -1087,36 +1111,36 @@ /* restore the context structure */ output( "1:\tmovq 0x80(%%rbx),%%rcx\n" ); - output( "\t.cfi_same_value %%rcx\n" ); + output_cfi( ".cfi_same_value %%rcx" ); output( "\tmovq 0x88(%%rbx),%%rdx\n" ); - output( "\t.cfi_same_value %%rdx\n" ); + output_cfi( ".cfi_same_value %%rdx" ); output( "\tmovq 0xa0(%%rbx),%%rbp\n" ); - output( "\t.cfi_same_value %%rbp\n" ); + output_cfi( ".cfi_same_value %%rbp" ); output( "\tmovq 0xa8(%%rbx),%%rsi\n" ); - output( "\t.cfi_same_value %%rsi\n" ); + output_cfi( ".cfi_same_value %%rsi" ); output( "\tmovq 0xb0(%%rbx),%%rdi\n" ); - output( "\t.cfi_same_value %%rdi\n" ); + output_cfi( ".cfi_same_value %%rdi" ); output( "\tmovq 0xb8(%%rbx),%%r8\n" ); - output( "\t.cfi_same_value %%r8\n" ); + output_cfi( ".cfi_same_value %%r8" ); output( "\tmovq 0xc0(%%rbx),%%r9\n" ); - output( "\t.cfi_same_value %%r9\n" ); + output_cfi( ".cfi_same_value %%r9" ); output( "\tmovq 0xc8(%%rbx),%%r10\n" ); - output( "\t.cfi_same_value %%r10\n" ); + output_cfi( ".cfi_same_value %%r10" ); output( "\tmovq 0xd0(%%rbx),%%r11\n" ); - output( "\t.cfi_same_value %%r11\n" ); + output_cfi( ".cfi_same_value %%r11" ); output( "\tmovq 0xd8(%%rbx),%%r12\n" ); - output( "\t.cfi_same_value %%r12\n" ); + output_cfi( ".cfi_same_value %%r12" ); output( "\tmovq 0xe0(%%rbx),%%r13\n" ); - output( "\t.cfi_same_value %%r13\n" ); + output_cfi( ".cfi_same_value %%r13" ); output( "\tmovq 0xe8(%%rbx),%%r14\n" ); - output( "\t.cfi_same_value %%r14\n" ); + output_cfi( ".cfi_same_value %%r14" ); output( "\tmovq 0xf0(%%rbx),%%r15\n" ); - output( "\t.cfi_same_value %%r15\n" ); + output_cfi( ".cfi_same_value %%r15" ); for (i = 0; i < 16; i++) { output( "\tmovdqa 0x%x(%%rbx),%%xmm%u\n", 0x1a0 + 16 * i, i ); - output( "\t.cfi_same_value %%xmm%u\n", i ); + output_cfi( ".cfi_same_value %%xmm%u", i ); } output( "\tfxrstor 0x100(%%rbx)\n" ); output( "\tldmxcsr 0x34(%%rbx)\n" ); @@ -1134,49 +1158,35 @@ output( "\tmovq 0x78(%%rbx),%%rax\n" ); output( "\tmovq 0x90(%%rbx),%%rbx\n" ); output( "\tiretq\n" ); - output( "\t.cfi_endproc\n" ); + output_cfi( ".cfi_endproc" ); output_function_size( "__wine_call_from_regs" ); function_header( "__wine_restore_regs" ); - output( "\t.cfi_startproc\n" ); + output_cfi( ".cfi_startproc" ); output( "\tmovq %%rcx,%%rbx\n" ); output( "\tjmp 1b\n" ); - output( "\t.cfi_endproc\n" ); + output_cfi( ".cfi_endproc" ); output_function_size( "__wine_restore_regs" ); } /******************************************************************* - * BuildRelays32 - * - * Build all the 32-bit relay callbacks + * output_asm_relays + * + * Build all the assembly relay callbacks */ -void BuildRelays32(void) +void output_asm_relays(void) { switch (target_cpu) { case CPU_x86: - output( "/* File generated automatically. Do not edit! */\n\n" ); - output( "\t.text\n" ); - output( "%s:\n\n", asm_name("__wine_spec_thunk_text_32") ); - - /* 32-bit register entry point */ - BuildCallFrom32Regs(); - - output_function_size( "__wine_spec_thunk_text_32" ); - output_gnu_stack_note(); + build_call_from_regs_x86(); break; - case CPU_x86_64: - output( "/* File generated automatically. Do not edit! */\n\n" ); - output( "\t.text\n" ); build_call_from_regs_x86_64(); - output_gnu_stack_note(); break; - default: - output( "/* File not used with this architecture. Do not edit! */\n\n" ); - return; + break; } } Modified: branches/cmake-bringup/tools/winebuild/res32.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/winebuild/r… ============================================================================== --- branches/cmake-bringup/tools/winebuild/res32.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/winebuild/res32.c [iso-8859-1] Fri Jul 30 22:10:00 2010 @@ -35,14 +35,12 @@ #include "build.h" typedef unsigned short WCHAR; -typedef unsigned short WORD; -typedef unsigned int DWORD; /* Unicode string or integer id */ struct string_id { WCHAR *str; /* ptr to Unicode string */ - WORD id; /* integer id if str is NULL */ + unsigned short id; /* integer id if str is NULL */ }; /* descriptor for a resource */ @@ -197,7 +195,7 @@ /* all values must be zero except header size */ static int check_header(void) { - DWORD size; + unsigned int size; if (get_dword()) return 0; /* data size */ size = get_dword(); /* header size */ @@ -216,14 +214,18 @@ /* load the next resource from the current file */ static void load_next_resource( DLLSPEC *spec ) { - DWORD hdr_size; + unsigned int hdr_size; struct resource *res = add_resource( spec ); res->data_size = get_dword(); hdr_size = get_dword(); if (hdr_size & 3) fatal_error( "%s header size not aligned\n", input_buffer_filename ); - - res->data = input_buffer + input_buffer_pos - 2*sizeof(DWORD) + hdr_size; + if (hdr_size < 32) fatal_error( "%s invalid header size %u\n", input_buffer_filename, hdr_size ); + + res->data = input_buffer + input_buffer_pos - 2*sizeof(unsigned int) + hdr_size; + if ((const unsigned char *)res->data < input_buffer || + (const unsigned char *)res->data >= input_buffer + input_buffer_size) + fatal_error( "%s invalid header size %u\n", input_buffer_filename, hdr_size ); get_string( &res->type ); get_string( &res->name ); if (input_buffer_pos & 2) get_word(); /* align to dword boundary */ @@ -654,13 +656,14 @@ if (res_file) { - const char *prog = get_windres_command(); + char *prog = find_tool( "windres", NULL ); char *cmd = xmalloc( strlen(prog) + strlen(res_file) + strlen(output_file_name) + 9 ); sprintf( cmd, "%s -i %s -o %s", prog, res_file, output_file_name ); if (verbose) fprintf( stderr, "%s\n", cmd ); err = system( cmd ); if (err) fatal_error( "%s failed with status %d\n", prog, err ); free( cmd ); + free( prog ); } output_file_name = NULL; /* so we don't try to assemble it */ } Removed: branches/cmake-bringup/tools/winebuild/ros_diff.patch URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/winebuild/r… ============================================================================== --- branches/cmake-bringup/tools/winebuild/ros_diff.patch [iso-8859-1] (original) +++ branches/cmake-bringup/tools/winebuild/ros_diff.patch (removed) @@ -1,388 +1,0 @@ -Index: build.h -=================================================================== ---- build.h (Revision 4) -+++ build.h (Arbeitskopie) -@@ -38,6 +38,8 @@ - #define min(a,b) (((a) < (b)) ? (a) : (b)) - #endif - -+#define EXEEXT ".exe" -+ - typedef enum - { - TYPE_VARIABLE, /* variable */ -@@ -47,6 +49,7 @@ - TYPE_STDCALL, /* stdcall function (Win32) */ - TYPE_CDECL, /* cdecl function (Win32) */ - TYPE_VARARGS, /* varargs function (Win32) */ -+ TYPE_FASTCALL, /* fastcall function (Win32) */ - TYPE_EXTERN, /* external symbol (Win32) */ - TYPE_NBTYPES - } ORD_TYPE; -@@ -269,6 +272,7 @@ - extern void BuildSpec16File( DLLSPEC *spec ); - extern void BuildSpec32File( DLLSPEC *spec ); - extern void BuildDef32File( DLLSPEC *spec ); -+extern void BuildPedllFile( DLLSPEC *spec ); - - extern void add_16bit_exports( DLLSPEC *spec32, DLLSPEC *spec16 ); - extern int parse_spec_file( FILE *file, DLLSPEC *spec ); -Index: main.c -=================================================================== ---- main.c (Revision 4) -+++ main.c (Arbeitskopie) -@@ -48,9 +48,9 @@ - int link_ext_symbols = 0; - int force_pointer_size = 0; - --#ifdef __i386__ -+#if defined(TARGET_i386) - enum target_cpu target_cpu = CPU_x86; --#elif defined(__x86_64__) -+#elif defined(TARGET_amd64) - enum target_cpu target_cpu = CPU_x86_64; - #elif defined(__sparc__) - enum target_cpu target_cpu = CPU_SPARC; -@@ -58,7 +58,7 @@ - enum target_cpu target_cpu = CPU_ALPHA; - #elif defined(__powerpc__) - enum target_cpu target_cpu = CPU_POWERPC; --#elif defined(__arm__) -+#elif defined(TARGET_arm) - enum target_cpu target_cpu = CPU_ARM; - #else - #error Unsupported CPU -@@ -102,7 +102,8 @@ - MODE_DEF, - MODE_RELAY16, - MODE_RELAY32, -- MODE_RESOURCES -+ MODE_RESOURCES, -+ MODE_PEDLL - }; - - static enum exec_mode_values exec_mode = MODE_NONE; -@@ -253,6 +254,7 @@ - " --relay16 Build the 16-bit relay assembly routines\n" - " --relay32 Build the 32-bit relay assembly routines\n" - " --resources Build a .o file for the resource files\n\n" -+" --pedll Build a .c file for PE dll\n\n" - "The mode options are mutually exclusive; you must specify one and only one.\n\n"; - - enum long_options_values -@@ -272,7 +274,8 @@ - LONG_OPT_RESOURCES, - LONG_OPT_SAVE_TEMPS, - LONG_OPT_SUBSYSTEM, -- LONG_OPT_VERSION -+ LONG_OPT_VERSION, -+ LONG_OPT_PEDLL - }; - - static const char short_options[] = "C:D:E:F:H:I:K:L:M:N:b:d:e:f:hi:kl:m:o:r:u:vw"; -@@ -295,6 +298,7 @@ - { "save-temps", 0, 0, LONG_OPT_SAVE_TEMPS }, - { "subsystem", 1, 0, LONG_OPT_SUBSYSTEM }, - { "version", 0, 0, LONG_OPT_VERSION }, -+ { "pedll", 1, 0, LONG_OPT_PEDLL }, - /* aliases for short options */ - { "target", 1, 0, 'b' }, - { "delay-lib", 1, 0, 'd' }, -@@ -497,6 +501,11 @@ - case LONG_OPT_VERSION: - printf( "winebuild version " PACKAGE_VERSION "\n" ); - exit(0); -+ case LONG_OPT_PEDLL: -+ set_exec_mode( MODE_PEDLL ); -+ spec_file_name = xstrdup( optarg ); -+ set_dll_file_name( optarg, spec ); -+ break; - case '?': - usage(1); - break; -@@ -652,6 +661,11 @@ - if (argv[0]) fatal_error( "file argument '%s' not allowed in this mode\n", argv[0] ); - BuildRelays32(); - break; -+ case MODE_PEDLL: -+ if (argv[0]) fatal_error( "file argument '%s' not allowed in this mode\n", argv[0] ); -+ if (!parse_input_file( spec )) break; -+ BuildPedllFile( spec ); -+ break; - case MODE_RESOURCES: - load_resources( argv, spec ); - output_res_o_file( spec ); -Index: parser.c -=================================================================== ---- parser.c (Revision 4) -+++ parser.c (Arbeitskopie) -@@ -56,6 +56,7 @@ - "stdcall", /* TYPE_STDCALL */ - "cdecl", /* TYPE_CDECL */ - "varargs", /* TYPE_VARARGS */ -+ "fastcall", /* TYPE_FASTCALL */ - "extern" /* TYPE_EXTERN */ - }; - -@@ -521,6 +522,7 @@ - case TYPE_STDCALL: - case TYPE_VARARGS: - case TYPE_CDECL: -+ case TYPE_FASTCALL: - if (!parse_spec_export( odp, spec )) goto error; - break; - case TYPE_ABS: -Index: res32.c -=================================================================== ---- res32.c (Revision 4) -+++ res32.c (Arbeitskopie) -@@ -35,12 +35,14 @@ - #include "build.h" - - typedef unsigned short WCHAR; -+typedef unsigned short WORD; -+typedef unsigned int DWORD; - - /* Unicode string or integer id */ - struct string_id - { - WCHAR *str; /* ptr to Unicode string */ -- unsigned short id; /* integer id if str is NULL */ -+ WORD id; /* integer id if str is NULL */ - }; - - /* descriptor for a resource */ -@@ -195,7 +197,7 @@ - /* all values must be zero except header size */ - static int check_header(void) - { -- unsigned int size; -+ DWORD size; - - if (get_dword()) return 0; /* data size */ - size = get_dword(); /* header size */ -@@ -214,14 +216,14 @@ - /* load the next resource from the current file */ - static void load_next_resource( DLLSPEC *spec ) - { -- unsigned int hdr_size; -+ DWORD hdr_size; - struct resource *res = add_resource( spec ); - - res->data_size = get_dword(); - hdr_size = get_dword(); - if (hdr_size & 3) fatal_error( "%s header size not aligned\n", input_buffer_filename ); - -- res->data = input_buffer + input_buffer_pos - 2*sizeof(unsigned int) + hdr_size; -+ res->data = input_buffer + input_buffer_pos - 2*sizeof(DWORD) + hdr_size; - get_string( &res->type ); - get_string( &res->name ); - if (input_buffer_pos & 2) get_word(); /* align to dword boundary */ -Index: spec32.c -=================================================================== ---- spec32.c (Revision 4) -+++ spec32.c (Arbeitskopie) -@@ -74,6 +74,28 @@ - } - - /******************************************************************* -+ * make_internal_name -+ * -+ * Generate an internal name for an entry point. Used for stubs etc. -+ */ -+static const char *make_internal_name( const ORDDEF *odp, DLLSPEC *spec, const char *prefix ) -+{ -+ static char buffer[256]; -+ if (odp->name || odp->export_name) -+ { -+ char *p; -+ sprintf( buffer, "__wine_%s_%s_%s", prefix, spec->file_name, -+ odp->name ? odp->name : odp->export_name ); -+ /* make sure name is a legal C identifier */ -+ for (p = buffer; *p; p++) if (!isalnum(*p) && *p != '_') break; -+ if (!*p) return buffer; -+ } -+ sprintf( buffer, "__wine_%s_%s_%d", prefix, make_c_identifier(spec->file_name), odp->ordinal ); -+ return buffer; -+} -+ -+ -+/******************************************************************* - * output_relay_debug - * - * Output entry points for relay debugging -@@ -341,6 +363,44 @@ - - - /******************************************************************* -+ * output_stub_funcs -+ * -+ * Output the functions for stub entry points -+ */ -+static void output_stub_funcs( DLLSPEC *spec ) -+{ -+ int i; -+ -+#if 0 -+ for (i = 0; i < spec->nb_entry_points; i++) -+ { -+ ORDDEF *odp = &spec->entry_points[i]; -+ if (odp->type != TYPE_STUB) continue; -+ fprintf( outfile, "#ifdef __GNUC__\n" ); -+ fprintf( outfile, "extern void __wine_spec_unimplemented_stub( const char *module, const char *func ) __attribute__((noreturn));\n" ); -+ fprintf( outfile, "#else\n" ); -+ fprintf( outfile, "extern void __wine_spec_unimplemented_stub( const char *module, const char *func );\n" ); -+ fprintf( outfile, "#endif\n\n" ); -+ break; -+ } -+#endif -+ -+ for (i = 0; i < spec->nb_entry_points; i++) -+ { -+ const ORDDEF *odp = &spec->entry_points[i]; -+ if (odp->type != TYPE_STUB) continue; -+ output( "void %s(void) ", make_internal_name( odp, spec, "stub" ) ); -+ if (odp->name) -+ output( "{ __wine_spec_unimplemented_stub(__wine_spec_file_name, \"%s\"); }\n", odp->name ); -+ else if (odp->export_name) -+ output( "{ __wine_spec_unimplemented_stub(__wine_spec_file_name, \"%s\"); }\n", odp->export_name ); -+ else -+ output( "{ __wine_spec_unimplemented_stub(__wine_spec_file_name, \"%d\"); }\n", odp->ordinal ); -+ } -+} -+ -+ -+/******************************************************************* - * output_asm_constructor - * - * Output code for calling a dll constructor. -@@ -795,10 +855,6 @@ - - if (!(odp->flags & FLAG_PRIVATE)) total++; - -- if (odp->type == TYPE_STUB) continue; -- -- output( " %s", name ); -- - switch(odp->type) - { - case TYPE_EXTERN: -@@ -807,12 +863,14 @@ - case TYPE_VARARGS: - case TYPE_CDECL: - /* try to reduce output */ -+ output( " %s", name ); - if(strcmp(name, odp->link_name) || (odp->flags & FLAG_FORWARD)) - output( "=%s", odp->link_name ); - break; - case TYPE_STDCALL: - { - int at_param = strlen(odp->u.func.arg_types) * get_ptr_size(); -+ output( " %s", name ); - if (!kill_at && target_cpu == CPU_x86) output( "@%d", at_param ); - if (odp->flags & FLAG_FORWARD) - { -@@ -825,6 +883,50 @@ - } - break; - } -+ case TYPE_FASTCALL: -+ { -+ int at_param = strlen(odp->u.func.arg_types) * get_ptr_size(); -+ output( " " ); -+ if (!kill_at) output( "@" ); -+ output( "%s", name ); -+ if (!kill_at) output( "@%d", at_param ); -+ if (odp->flags & FLAG_FORWARD) -+ { -+ output( "=" ); -+ output( "%s", odp->link_name ); -+ } -+ else if (strcmp(name, odp->link_name)) /* try to reduce output */ -+ { -+ output( "=" ); -+ if (!kill_at) output( "@" ); -+ output( "%s", odp->link_name ); -+ if (!kill_at) output( "@%d", at_param ); -+ } -+ break; -+ } -+ case TYPE_STUB: -+ { -+ output( " %s", name ); -+ if (!kill_at) -+ { -+ const char *check = name + strlen(name); -+ while (name != check && -+ '0' <= check[-1] && check[-1] <= '9') -+ { -+ check--; -+ } -+ if (name != check && check != name + strlen(name) && -+ '@' == check[-1]) -+ { -+ output("%s", check - 1); -+ } -+ } -+ if (odp->name || odp->export_name) -+ { -+ output("=%s", make_internal_name( odp, spec, "stub" )); -+ } -+ break; -+ } - default: - assert(0); - } -@@ -836,3 +939,52 @@ - } - if (!total) warning( "%s: Import library doesn't export anything\n", spec->file_name ); - } -+ -+ -+/******************************************************************* -+ * BuildPedllFile -+ * -+ * Build a PE DLL C file from a spec file. -+ */ -+void BuildPedllFile( DLLSPEC *spec ) -+{ -+ int i, has_stubs = 0; -+ -+ output_standard_file_header(); -+ -+ for (i = 0; i < spec->nb_entry_points; i++) -+ { -+ const ORDDEF *odp = &spec->entry_points[i]; -+ if (odp->type == TYPE_STUB) -+ { -+ has_stubs = 1; -+ break; -+ } -+ } -+ -+ if (!has_stubs) -+ { -+ output( "/* This file is intentionally left blank */\n"); -+ return; -+ } -+ -+ output( "#include <stdarg.h>\n"); -+ output( "#include \"windef.h\"\n"); -+ output( "#include \"winbase.h\"\n"); -+ output( "#include \"wine/config.h\"\n"); -+ output( "#include \"wine/exception.h\"\n\n"); -+ -+ output( "void __wine_spec_unimplemented_stub( const char *module, const char *function )\n"); -+ output( "{\n"); -+ output( " ULONG_PTR args[2];\n"); -+ output( "\n"); -+ output( " args[0] = (ULONG_PTR)module;\n"); -+ output( " args[1] = (ULONG_PTR)function;\n"); -+ output( " RaiseException( EXCEPTION_WINE_STUB, EH_NONCONTINUABLE, 2, args );\n"); -+ output( "}\n\n"); -+ -+ output( "static const char __wine_spec_file_name[] = \"%s\";\n\n", spec->file_name ); -+ -+ /* Output the stub functions */ -+ output_stub_funcs( spec ); -+} Modified: branches/cmake-bringup/tools/winebuild/spec16.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/winebuild/s… ============================================================================== --- branches/cmake-bringup/tools/winebuild/spec16.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/winebuild/spec16.c [iso-8859-1] Fri Jul 30 22:10:00 2010 @@ -57,26 +57,11 @@ static inline int is_function( const ORDDEF *odp ) { + if (odp->flags & FLAG_EXPORT32) return 0; return (odp->type == TYPE_CDECL || odp->type == TYPE_PASCAL || odp->type == TYPE_VARARGS || odp->type == TYPE_STUB); -} - -static void init_dll_name( DLLSPEC *spec ) -{ - if (!spec->file_name) - { - char *p; - spec->file_name = xstrdup( output_file_name ); - if ((p = strrchr( spec->file_name, '.' ))) *p = 0; - } - if (!spec->dll_name) /* set default name from file name */ - { - char *p; - spec->dll_name = xstrdup( spec->file_name ); - if ((p = strrchr( spec->dll_name, '.' ))) *p = 0; - } } /******************************************************************* @@ -130,6 +115,7 @@ int selector = 0; ORDDEF *odp = spec->ordinals[i]; if (!odp) continue; + if (odp->flags & FLAG_EXPORT32) continue; switch (odp->type) { @@ -326,12 +312,17 @@ output( "\t.align %d\n", get_alignment(4) ); output( "\t%s\n", func_declaration(name) ); output( "%s:\n", name ); + output_cfi( ".cfi_startproc" ); output( "\tpushl %%ebp\n" ); + output_cfi( ".cfi_adjust_cfa_offset 4" ); + output_cfi( ".cfi_rel_offset %%ebp,0" ); output( "\tmovl %%esp,%%ebp\n" ); + output_cfi( ".cfi_def_cfa_register %%ebp" ); stack_words = 2; if (needs_ldt) { output( "\tpushl %%esi\n" ); + output_cfi( ".cfi_rel_offset %%esi,-4" ); stack_words++; if (UsePIC) { @@ -404,10 +395,16 @@ output( "\tcall *8(%%ebp)\n" ); - if (needs_ldt) output( "\tmovl -4(%%ebp),%%esi\n" ); - + if (needs_ldt) + { + output( "\tmovl -4(%%ebp),%%esi\n" ); + output_cfi( ".cfi_same_value %%esi" ); + } output( "\tleave\n" ); + output_cfi( ".cfi_def_cfa %%esp,4" ); + output_cfi( ".cfi_same_value %%ebp" ); output( "\tret\n" ); + output_cfi( ".cfi_endproc" ); output_function_size( name ); } @@ -473,81 +470,6 @@ if (compare( &list[j], &list[i] )) list[++j] = list[i]; } return j + 1; -} - - -/******************************************************************* - * output_init_code - * - * Output the dll initialization code. - */ -static void output_init_code( const DLLSPEC *spec ) -{ - char name[80]; - - sprintf( name, ".L__wine_spec_%s_init", make_c_identifier(spec->dll_name) ); - - output( "\n/* dll initialization code */\n\n" ); - output( "\t.text\n" ); - output( "\t.align 4\n" ); - output( "\t%s\n", func_declaration(name) ); - output( "%s:\n", name ); - output( "\tsubl $4,%%esp\n" ); - if (UsePIC) - { - output( "\tcall %s\n", asm_name("__wine_spec_get_pc_thunk_eax") ); - output( "1:\tleal .L__wine_spec_file_name-1b(%%eax),%%ecx\n" ); - output( "\tpushl %%ecx\n" ); - output( "\tleal .L__wine_spec_dos_header-1b(%%eax),%%ecx\n" ); - output( "\tpushl %%ecx\n" ); - } - else - { - output( "\tpushl $.L__wine_spec_file_name\n" ); - output( "\tpushl $.L__wine_spec_dos_header\n" ); - } - output( "\tcall %s\n", asm_name("__wine_dll_register_16") ); - output( "\taddl $12,%%esp\n" ); - output( "\tret\n" ); - output_function_size( name ); - - sprintf( name, ".L__wine_spec_%s_fini", make_c_identifier(spec->dll_name) ); - - output( "\t.align 4\n" ); - output( "\t%s\n", func_declaration(name) ); - output( "%s:\n", name ); - output( "\tsubl $8,%%esp\n" ); - if (UsePIC) - { - output( "\tcall %s\n", asm_name("__wine_spec_get_pc_thunk_eax") ); - output( "1:\tleal .L__wine_spec_dos_header-1b(%%eax),%%ecx\n" ); - output( "\tpushl %%ecx\n" ); - } - else - { - output( "\tpushl $.L__wine_spec_dos_header\n" ); - } - output( "\tcall %s\n", asm_name("__wine_dll_unregister_16") ); - output( "\taddl $12,%%esp\n" ); - output( "\tret\n" ); - output_function_size( name ); - - if (target_platform == PLATFORM_APPLE) - { - output( "\t.mod_init_func\n" ); - output( "\t.align %d\n", get_alignment(4) ); - output( "\t.long .L__wine_spec_%s_init\n", make_c_identifier(spec->dll_name) ); - output( "\t.mod_term_func\n" ); - output( "\t.align %d\n", get_alignment(4) ); - output( "\t.long .L__wine_spec_%s_fini\n", make_c_identifier(spec->dll_name) ); - } - else - { - output( "\t.section \".init\",\"ax\"\n" ); - output( "\tcall .L__wine_spec_%s_init\n", make_c_identifier(spec->dll_name) ); - output( "\t.section \".fini\",\"ax\"\n" ); - output( "\tcall .L__wine_spec_%s_fini\n", make_c_identifier(spec->dll_name) ); - } } @@ -704,6 +626,7 @@ { ORDDEF *odp = spec->ordinals[i]; if (!odp || !odp->name[0]) continue; + if (odp->flags & FLAG_EXPORT32) continue; output_resident_name( odp->name, i ); } output( "\t.byte 0\n" ); @@ -844,28 +767,6 @@ /******************************************************************* - * BuildSpec16File - * - * Build a Win16 assembly file from a spec file. - */ -void BuildSpec16File( DLLSPEC *spec ) -{ - init_dll_name( spec ); - output_standard_file_header(); - output_module16( spec ); - output_init_code( spec ); - - output( "\n\t%s\n", get_asm_string_section() ); - output( ".L__wine_spec_file_name:\n" ); - output( "\t%s \"%s\"\n", get_asm_string_keyword(), spec->file_name ); - - output_stubs( spec ); - output_get_pc_thunk(); - output_gnu_stack_note(); -} - - -/******************************************************************* * output_spec16_file * * Output the complete data for a spec 16-bit file. @@ -873,15 +774,6 @@ void output_spec16_file( DLLSPEC *spec16 ) { DLLSPEC *spec32 = alloc_dll_spec(); - - init_dll_name( spec16 ); - spec32->file_name = xstrdup( spec16->file_name ); - - if (spec16->characteristics & IMAGE_FILE_DLL) - { - spec32->characteristics = IMAGE_FILE_DLL; - spec32->init_func = xstrdup( "__wine_spec_dll_entry" ); - } resolve_imports( spec16 ); add_16bit_exports( spec32, spec16 ); @@ -892,6 +784,7 @@ output_stubs( spec16 ); output_exports( spec32 ); output_imports( spec16 ); + if (is_undefined( "__wine_call_from_16" )) output_asm_relays16(); if (spec16->main_module) { output( "\n\t%s\n", get_asm_string_section() ); @@ -918,7 +811,6 @@ unsigned int i, rsrctab, restab, namelen, modtab, imptab, enttab, cbenttab, codeseg, dataseg, rsrcdata; - init_dll_name( spec ); init_output_buffer(); rsrctab = lfanew; Modified: branches/cmake-bringup/tools/winebuild/spec32.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/winebuild/s… ============================================================================== --- branches/cmake-bringup/tools/winebuild/spec32.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/winebuild/spec32.c [iso-8859-1] Fri Jul 30 22:10:00 2010 @@ -72,28 +72,6 @@ } return 0; } - -/******************************************************************* - * make_internal_name - * - * Generate an internal name for an entry point. Used for stubs etc. - */ -static const char *make_internal_name( const ORDDEF *odp, DLLSPEC *spec, const char *prefix ) -{ - static char buffer[256]; - if (odp->name || odp->export_name) - { - char *p; - sprintf( buffer, "__wine_%s_%s_%s", prefix, spec->file_name, - odp->name ? odp->name : odp->export_name ); - /* make sure name is a legal C identifier */ - for (p = buffer; *p; p++) if (!isalnum(*p) && *p != '_') break; - if (!*p) return buffer; - } - sprintf( buffer, "__wine_%s_%s_%d", prefix, make_c_identifier(spec->file_name), odp->ordinal ); - return buffer; -} - /******************************************************************* * output_relay_debug @@ -359,44 +337,6 @@ output( "\t%s .L__wine_spec_relay_arg_types\n", get_asm_ptr_keyword() ); output_relay_debug( spec ); -} - - -/******************************************************************* - * output_stub_funcs - * - * Output the functions for stub entry points - */ -static void output_stub_funcs( DLLSPEC *spec ) -{ - int i; - -#if 0 - for (i = 0; i < spec->nb_entry_points; i++) - { - ORDDEF *odp = &spec->entry_points[i]; - if (odp->type != TYPE_STUB) continue; - fprintf( outfile, "#ifdef __GNUC__\n" ); - fprintf( outfile, "extern void __wine_spec_unimplemented_stub( const char *module, const char *func ) __attribute__((noreturn));\n" ); - fprintf( outfile, "#else\n" ); - fprintf( outfile, "extern void __wine_spec_unimplemented_stub( const char *module, const char *func );\n" ); - fprintf( outfile, "#endif\n\n" ); - break; - } -#endif - - for (i = 0; i < spec->nb_entry_points; i++) - { - const ORDDEF *odp = &spec->entry_points[i]; - if (odp->type != TYPE_STUB) continue; - output( "void %s(void) ", make_internal_name( odp, spec, "stub" ) ); - if (odp->name) - output( "{ __wine_spec_unimplemented_stub(__wine_spec_file_name, \"%s\"); }\n", odp->name ); - else if (odp->export_name) - output( "{ __wine_spec_unimplemented_stub(__wine_spec_file_name, \"%s\"); }\n", odp->export_name ); - else - output( "{ __wine_spec_unimplemented_stub(__wine_spec_file_name, \"%d\"); }\n", odp->ordinal ); - } } @@ -614,6 +554,7 @@ output_stubs( spec ); output_exports( spec ); output_imports( spec ); + if (is_undefined( "__wine_call_from_regs" )) output_asm_relays(); output_resources( spec ); output_gnu_stack_note(); } @@ -822,14 +763,22 @@ /******************************************************************* - * BuildDef32File + * output_def_file * * Build a Win32 def file from a spec file. */ -void BuildDef32File( DLLSPEC *spec ) +void output_def_file( DLLSPEC *spec, int include_private ) { + DLLSPEC *spec32 = NULL; const char *name; int i, total; + + if (spec->type == SPEC_WIN16) + { + spec32 = alloc_dll_spec(); + add_16bit_exports( spec32, spec ); + spec = spec32; + } if (spec_file_name) output( "; File generated automatically from %s; do not edit!\n\n", @@ -854,6 +803,11 @@ else continue; if (!(odp->flags & FLAG_PRIVATE)) total++; + else if (!include_private) continue; + + if (odp->type == TYPE_STUB) continue; + + output( " %s", name ); switch(odp->type) { @@ -863,14 +817,12 @@ case TYPE_VARARGS: case TYPE_CDECL: /* try to reduce output */ - output( " %s", name ); if(strcmp(name, odp->link_name) || (odp->flags & FLAG_FORWARD)) output( "=%s", odp->link_name ); break; case TYPE_STDCALL: { int at_param = strlen(odp->u.func.arg_types) * get_ptr_size(); - output( " %s", name ); if (!kill_at && target_cpu == CPU_x86) output( "@%d", at_param ); if (odp->flags & FLAG_FORWARD) { @@ -883,50 +835,6 @@ } break; } - case TYPE_FASTCALL: - { - int at_param = strlen(odp->u.func.arg_types) * get_ptr_size(); - output( " " ); - if (!kill_at) output( "@" ); - output( "%s", name ); - if (!kill_at) output( "@%d", at_param ); - if (odp->flags & FLAG_FORWARD) - { - output( "=" ); - output( "%s", odp->link_name ); - } - else if (strcmp(name, odp->link_name)) /* try to reduce output */ - { - output( "=" ); - if (!kill_at) output( "@" ); - output( "%s", odp->link_name ); - if (!kill_at) output( "@%d", at_param ); - } - break; - } - case TYPE_STUB: - { - output( " %s", name ); - if (!kill_at) - { - const char *check = name + strlen(name); - while (name != check && - '0' <= check[-1] && check[-1] <= '9') - { - check--; - } - if (name != check && check != name + strlen(name) && - '@' == check[-1]) - { - output("%s", check - 1); - } - } - if (odp->name || odp->export_name) - { - output("=%s", make_internal_name( odp, spec, "stub" )); - } - break; - } default: assert(0); } @@ -937,53 +845,5 @@ output( "\n" ); } if (!total) warning( "%s: Import library doesn't export anything\n", spec->file_name ); + if (spec32) free_dll_spec( spec32 ); } - - -/******************************************************************* - * BuildPedllFile - * - * Build a PE DLL C file from a spec file. - */ -void BuildPedllFile( DLLSPEC *spec ) -{ - int i, has_stubs = 0; - - output_standard_file_header(); - - for (i = 0; i < spec->nb_entry_points; i++) - { - const ORDDEF *odp = &spec->entry_points[i]; - if (odp->type == TYPE_STUB) - { - has_stubs = 1; - break; - } - } - - if (!has_stubs) - { - output( "/* This file is intentionally left blank */\n"); - return; - } - - output( "#include <stdarg.h>\n"); - output( "#include \"windef.h\"\n"); - output( "#include \"winbase.h\"\n"); - output( "#include \"wine/config.h\"\n"); - output( "#include \"wine/exception.h\"\n\n"); - - output( "void __wine_spec_unimplemented_stub( const char *module, const char *function )\n"); - output( "{\n"); - output( " ULONG_PTR args[2];\n"); - output( "\n"); - output( " args[0] = (ULONG_PTR)module;\n"); - output( " args[1] = (ULONG_PTR)function;\n"); - output( " RaiseException( EXCEPTION_WINE_STUB, EH_NONCONTINUABLE, 2, args );\n"); - output( "}\n\n"); - - output( "static const char __wine_spec_file_name[] = \"%s\";\n\n", spec->file_name ); - - /* Output the stub functions */ - output_stub_funcs( spec ); -} Modified: branches/cmake-bringup/tools/winebuild/utils.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/winebuild/u… ============================================================================== --- branches/cmake-bringup/tools/winebuild/utils.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/winebuild/utils.c [iso-8859-1] Fri Jul 30 22:10:00 2010 @@ -54,6 +54,7 @@ { "i586", CPU_x86 }, { "i686", CPU_x86 }, { "i786", CPU_x86 }, + { "amd64", CPU_x86_64 }, { "x86_64", CPU_x86_64 }, { "sparc", CPU_SPARC }, { "alpha", CPU_ALPHA }, @@ -199,14 +200,24 @@ } /* find a build tool in the path, trying the various names */ -static char *find_tool( const char * const *names ) +char *find_tool( const char *name, const char * const *names ) { static char **dirs; static unsigned int count, maxlen; char *p, *file; + const char *alt_names[2]; unsigned int i, len; struct stat st; + + if (target_alias) + { + file = xmalloc( strlen(target_alias) + strlen(name) + 2 ); + strcpy( file, target_alias ); + strcat( file, "-" ); + strcat( file, name ); + return file; + } if (!dirs) { @@ -230,6 +241,13 @@ for (i = 0; i < count; i++) maxlen = max( maxlen, strlen(dirs[i])+2 ); } + if (!names) + { + alt_names[0] = name; + alt_names[1] = NULL; + names = alt_names; + } + while (*names) { len = strlen(*names) + sizeof(EXEEXT) + 1; @@ -249,24 +267,15 @@ free( file ); names++; } - return NULL; + return xstrdup( name ); } const char *get_as_command(void) { if (!as_command) { - if (target_alias) - { - as_command = xmalloc( strlen(target_alias) + sizeof("-as") ); - strcpy( as_command, target_alias ); - strcat( as_command, "-as" ); - } - else - { - static const char * const commands[] = { "gas", "as", NULL }; - if (!(as_command = find_tool( commands ))) as_command = xstrdup("as"); - } + static const char * const commands[] = { "gas", "as", NULL }; + as_command = find_tool( "as", commands ); if (force_pointer_size) { @@ -284,17 +293,8 @@ { if (!ld_command) { - if (target_alias) - { - ld_command = xmalloc( strlen(target_alias) + sizeof("-ld") ); - strcpy( ld_command, target_alias ); - strcat( ld_command, "-ld" ); - } - else - { - static const char * const commands[] = { "ld", "gld", NULL }; - if (!(ld_command = find_tool( commands ))) ld_command = xstrdup("ld"); - } + static const char * const commands[] = { "ld", "gld", NULL }; + ld_command = find_tool( "ld", commands ); if (force_pointer_size) { @@ -306,7 +306,7 @@ args = (force_pointer_size == 8) ? " -arch x86_64" : " -arch i386"; break; case PLATFORM_FREEBSD: - args = (force_pointer_size == 8) ? " -m elf_x86_64" : " -m elf_i386_fbsd"; + args = (force_pointer_size == 8) ? " -m elf_x86_64_fbsd" : " -m elf_i386_fbsd"; break; default: args = (force_pointer_size == 8) ? " -m elf_x86_64" : " -m elf_i386"; @@ -323,40 +323,10 @@ { if (!nm_command) { - if (target_alias) - { - nm_command = xmalloc( strlen(target_alias) + sizeof("-nm") ); - strcpy( nm_command, target_alias ); - strcat( nm_command, "-nm" ); - } - else - { - static const char * const commands[] = { "nm", "gnm", NULL }; - if (!(nm_command = find_tool( commands ))) nm_command = xstrdup("nm"); - } + static const char * const commands[] = { "nm", "gnm", NULL }; + nm_command = find_tool( "nm", commands ); } return nm_command; -} - -const char *get_windres_command(void) -{ - static char *windres_command; - - if (!windres_command) - { - if (target_alias) - { - windres_command = xmalloc( strlen(target_alias) + sizeof("-windres") ); - strcpy( windres_command, target_alias ); - strcat( windres_command, "-windres" ); - } - else - { - static const char * const commands[] = { "windres", NULL }; - if (!(windres_command = find_tool( commands ))) windres_command = xstrdup("windres"); - } - } - return windres_command; } /* get a name for a temp file, automatically cleaned up on exit */ @@ -905,6 +875,19 @@ } } +/* output a .cfi directive */ +void output_cfi( const char *format, ... ) +{ + va_list valist; + + if (!unwind_tables) return; + va_start( valist, format ); + fputc( '\t', output_file ); + vfprintf( output_file, format, valist ); + fputc( '\n', output_file ); + va_end( valist ); +} + /* output the GNU note for non-exec stack */ void output_gnu_stack_note(void) { Modified: branches/cmake-bringup/tools/winebuild/winebuild.man.in URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/winebuild/w… ============================================================================== --- branches/cmake-bringup/tools/winebuild/winebuild.man.in [iso-8859-1] (original) +++ branches/cmake-bringup/tools/winebuild/winebuild.man.in [iso-8859-1] Fri Jul 30 22:10:00 2010 @@ -46,13 +46,9 @@ Build a .def file from a spec file. The .spec file is specified via the -E option. This is used when building dlls with a PE (Win32) compiler. .TP -.B \--relay16 -Generate the assembly code for the 16-bit relay routines. This is for -Wine internal usage only, you should never need to use this option. -.TP -.B \--relay32 -Generate the assembly code for the 32-bit relay routines. This is for -Wine internal usage only, you should never need to use this option. +.BI \--implib +Build a PE import library from a spec file. The .spec file is +specified via the -E option. .TP .B \--resources Generate a .o file containing all the input resources. This is useful @@ -105,8 +101,10 @@ .I forward specification must be used instead). .TP -.BI \-f\ flags -Ignored for compatibility with the C compiler. +.BI \-f\ option +Specify a code generation option. Currently \fB\-fPIC\fR and +\fB\-fasynchronous-unwind-tables\fR are supported. Other options are +ignored for compatibility with the C compiler. .TP .B \--fake-module Create a fake PE module for a dll or exe, instead of the normal @@ -159,13 +157,13 @@ \fIlibname.def\fR file in the directories specified with the \fB-L\fR option. .TP -.B \-m32, -m64 -Generate 32-bit, respectively 64-bit code. +.B \-m16, -m32, -m64 +Generate 16-bit, 32-bit, respectively 64-bit code. .TP .BI \-M,\ --main-module= module -Specify that we are building a 16-bit dll, that will ultimately be -linked together with the 32-bit dll specified in \fImodule\fR. Only -meaningful in \fB--dll\fR mode. +When building a 16-bit dll, set the name of its 32-bit counterpart to +\fImodule\fR. This is used to enforce that the load order for the +16-bit dll matches that of the 32-bit one. .TP .BI \-N,\ --dll-name= dllname Set the internal name of the module. It is only used in Win16 @@ -213,10 +211,7 @@ for a graphical executable, .br .B native -for a native-mode dll, -.br -.B win16 -for a 16-bit module. +for a native-mode dll. .br The entry point of a command line executable is a normal C \fBmain\fR function. A \fBwmain\fR function can be used instead if you need the @@ -303,7 +298,11 @@ name is still exported. .TP .BI -arch= cpu[,cpu] -The entry point is only available on the specified CPU architecture(s). +The entry point is only available on the specified CPU +architecture(s). The names \fBwin32\fR and \fBwin64\fR match all +32-bit, respectively 64-bit, CPU architectures. In 16-bit dlls, +specifying \fB-arch=win32\fR causes the entry point to be exported +from the 32-bit wrapper module. .SS "Function ordinals" Syntax: .br

1 0

[fireball] 48372: [BRANCHES] - nwin32 served us very good, but time has come... Deletion supported by Stefan Ginsberg.
by fireball＠svn.reactos.org 30 Jul '10

30 Jul '10

Author: fireball Date: Fri Jul 30 21:45:08 2010 New Revision: 48372 URL: http://svn.reactos.org/svn/reactos?rev=48372&view=rev Log: [BRANCHES] - nwin32 served us very good, but time has come... Deletion supported by Stefan Ginsberg. Removed: branches/nwin32/

1 0

[gadamopoulos] 48371: [shell32] - Fix a compilation error with msvc
by gadamopoulos＠svn.reactos.org 30 Jul '10

30 Jul '10

Author: gadamopoulos Date: Fri Jul 30 18:37:51 2010 New Revision: 48371 URL: http://svn.reactos.org/svn/reactos?rev=48371&view=rev Log: [shell32] - Fix a compilation error with msvc Modified: trunk/reactos/dll/win32/shell32/shlfileop.c Modified: trunk/reactos/dll/win32/shell32/shlfileop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfileo… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfileop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfileop.c [iso-8859-1] Fri Jul 30 18:37:51 2010 @@ -550,7 +550,7 @@ return GetLastError(); } -static WINAPI DWORD SHOperationProgressRoutine(LARGE_INTEGER TotalFileSize, LARGE_INTEGER TotalBytesTransferred, LARGE_INTEGER StreamSize, LARGE_INTEGER StreamBytesTransferred, DWORD dwStreamNumber, DWORD dwCallbackReason, HANDLE hSourceFile, HANDLE hDestinationFile, LPVOID lpData) +static DWORD WINAPI SHOperationProgressRoutine(LARGE_INTEGER TotalFileSize, LARGE_INTEGER TotalBytesTransferred, LARGE_INTEGER StreamSize, LARGE_INTEGER StreamBytesTransferred, DWORD dwStreamNumber, DWORD dwCallbackReason, HANDLE hSourceFile, HANDLE hDestinationFile, LPVOID lpData) { FILE_OPERATION_CONTEXT * Context; LARGE_INTEGER Progress;

1 0

[gadamopoulos] 48370: [ndis.h] - Fix compilation with msvc
by gadamopoulos＠svn.reactos.org 30 Jul '10

30 Jul '10

Author: gadamopoulos Date: Fri Jul 30 17:05:17 2010 New Revision: 48370 URL: http://svn.reactos.org/svn/reactos?rev=48370&view=rev Log: [ndis.h] - Fix compilation with msvc Modified: trunk/reactos/include/ddk/ndis.h Modified: trunk/reactos/include/ddk/ndis.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ndis.h?rev=483… ============================================================================== --- trunk/reactos/include/ddk/ndis.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ndis.h [iso-8859-1] Fri Jul 30 17:05:17 2010 @@ -2895,8 +2895,8 @@ IN PNDIS_PACKET Packet); NDISAPI -NTAPI PNDIS_PACKET_STACK +NTAPI NdisIMGetCurrentPacketStack( IN PNDIS_PACKET Packet, OUT BOOLEAN * StacksRemaining);

1 0

[jgardou] 48369: [WIN32K] - Cast Colors to RGBQUAD in EngCreateBitmap, since that's what they are. - Copy selected palette of the DC when creating a DIBSection with DIB_PAL_COLORS. - Do not try to get Colors in NtGdiGetDIBitsInternal when bpp == 0, this doesn't make any sense. - Get rid of SURFACE::dsBitfields and SURFACE::biClrUsed. - Use RGB as default palette mod when creating the DIB Palette.
by jgardou＠svn.reactos.org 30 Jul '10

30 Jul '10

Author: jgardou Date: Fri Jul 30 02:15:46 2010 New Revision: 48369 URL: http://svn.reactos.org/svn/reactos?rev=48369&view=rev Log: [WIN32K] - Cast Colors to RGBQUAD in EngCreateBitmap, since that's what they are. - Copy selected palette of the DC when creating a DIBSection with DIB_PAL_COLORS. - Do not try to get Colors in NtGdiGetDIBitsInternal when bpp == 0, this doesn't make any sense. - Get rid of SURFACE::dsBitfields and SURFACE::biClrUsed. - Use RGB as default palette mod when creating the DIB Palette. Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/surface.h branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c branches/reactos-yarotows/subsystems/win32/win32k/objects/palette.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/surface.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/include/surface.h [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/include/surface.h [iso-8859-1] Fri Jul 30 02:15:46 2010 @@ -39,8 +39,6 @@ //UINT unk_078; /* reactos specific */ - DWORD dsBitfields[3]; // hack, should probably use palette instead - DWORD biClrUsed; DWORD biClrImportant; } SURFACE, *PSURFACE; Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Fri Jul 30 02:15:46 2010 @@ -1032,11 +1032,11 @@ pds->dsBmih.biSizeImage = psurf->SurfObj.cjBits; pds->dsBmih.biXPelsPerMeter = 0; pds->dsBmih.biYPelsPerMeter = 0; - pds->dsBmih.biClrUsed = psurf->biClrUsed; + pds->dsBmih.biClrUsed = psurf->ppal->NumColors; pds->dsBmih.biClrImportant = psurf->biClrImportant; - pds->dsBitfields[0] = psurf->dsBitfields[0]; - pds->dsBitfields[1] = psurf->dsBitfields[1]; - pds->dsBitfields[2] = psurf->dsBitfields[2]; + pds->dsBitfields[0] = psurf->ppal->RedMask; + pds->dsBitfields[1] = psurf->ppal->GreenMask; + pds->dsBitfields[2] = psurf->ppal->BlueMask; pds->dshSection = psurf->hDIBSection; pds->dsOffset = psurf->dwOffset; Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Fri Jul 30 02:15:46 2010 @@ -705,7 +705,6 @@ goto done; } -get_info: /* Fill in the structure */ switch(bpp) { @@ -755,8 +754,7 @@ Info->bmiHeader.biClrImportant = 0; ScanLines = psurf->SurfObj.sizlBitmap.cy; /* Get Complete info now */ - bpp = Info->bmiHeader.biBitCount ; - goto get_info; + goto done; case 1: case 4: @@ -916,7 +914,12 @@ case 16: if (Info->bmiHeader.biCompression == BI_BITFIELDS) { - if (psurf->hSecure) RtlCopyMemory( Info->bmiColors, psurf->dsBitfields, 3 * sizeof(DWORD) ); + if (psurf->hSecure) + { + ((PDWORD)Info->bmiColors)[0] = psurf->ppal->RedMask; + ((PDWORD)Info->bmiColors)[1] = psurf->ppal->GreenMask; + ((PDWORD)Info->bmiColors)[2] = psurf->ppal->BlueMask; + } else { ((PDWORD)Info->bmiColors)[0] = 0xf800; @@ -930,7 +933,12 @@ case 32: if (Info->bmiHeader.biCompression == BI_BITFIELDS) { - if (psurf->hSecure) RtlCopyMemory( Info->bmiColors, psurf->dsBitfields, 3 * sizeof(DWORD) ); + if (psurf->hSecure) + { + ((PDWORD)Info->bmiColors)[0] = psurf->ppal->RedMask; + ((PDWORD)Info->bmiColors)[1] = psurf->ppal->GreenMask; + ((PDWORD)Info->bmiColors)[2] = psurf->ppal->BlueMask; + } else { ((PDWORD)Info->bmiColors)[0] = 0xff0000; @@ -1427,7 +1435,7 @@ SURFACE *bmp = NULL; void *mapBits = NULL; HPALETTE hpal ; - ULONG palMode = PAL_INDEXED; + INT palMode = PAL_INDEXED; // Fill BITMAP32 structure with DIB data CONST BITMAPINFOHEADER *bi = &bmi->bmiHeader; @@ -1435,10 +1443,7 @@ ULONG totalSize; BITMAP bm; SIZEL Size; - CONST RGBQUAD *lpRGB = NULL; HANDLE hSecure; - DWORD dsBitfields[3] = {0}; - ULONG ColorCount; DPRINT("format (%ld,%ld), planes %d, bpp %d, size %ld, colors %ld (%s)\n", bi->biWidth, bi->biHeight, bi->biPlanes, bi->biBitCount, @@ -1520,54 +1525,27 @@ if (usage == DIB_PAL_COLORS) { - lpRGB = DIB_MapPaletteColors(dc, bmi); - ColorCount = bi->biClrUsed; - if (ColorCount == 0) - { - ColorCount = max(1 << bi->biBitCount, 256); - } - } - else if(bi->biBitCount <= 8) - { - lpRGB = bmi->bmiColors; - ColorCount = 1 << bi->biBitCount; - } - else + PPALETTE pdcPal ; + pdcPal = PALETTE_LockPalette(dc->dclevel.hpal); + if(!pdcPal) + { + DPRINT1("Unable to lock DC palette?!\n"); + goto cleanup; + } + if(pdcPal->Mode != PAL_INDEXED) + { + DPRINT1("Not indexed palette selected in the DC?!\n"); + PALETTE_UnlockPalette(pdcPal); + } + hpal = PALETTE_AllocPalette(PAL_INDEXED, + pdcPal->NumColors, + (ULONG*)pdcPal->IndexedColors, 0, 0, 0); + PALETTE_UnlockPalette(pdcPal); + } + else { - lpRGB = NULL; - ColorCount = 0; + hpal = BuildDIBPalette(bmi, &palMode); } - - /* Set dsBitfields values */ - if (usage == DIB_PAL_COLORS || bi->biBitCount <= 8) - { - dsBitfields[0] = dsBitfields[1] = dsBitfields[2] = 0; - palMode = PAL_INDEXED; - } - else if (bi->biCompression == BI_RGB) - { - dsBitfields[0] = dsBitfields[1] = dsBitfields[2] = 0; - switch (bi->biBitCount) - { - case 15: - palMode = PAL_RGB16_555; - break; - - case 16: - palMode = PAL_RGB16_565; - break; - - case 24: - case 32: - palMode = PAL_RGB; - break; - } - } - else - { - RtlCopyMemory(dsBitfields, bmi->bmiColors, sizeof(dsBitfields)); - palMode = PAL_BITFIELDS; - } // Create Device Dependent Bitmap and add DIB pointer Size.cx = bm.bmWidth; @@ -1600,18 +1578,9 @@ bmp->hSecure = hSecure; bmp->dwOffset = offset; bmp->flags = API_BITMAP; - bmp->dsBitfields[0] = dsBitfields[0]; - bmp->dsBitfields[1] = dsBitfields[1]; - bmp->dsBitfields[2] = dsBitfields[2]; - bmp->biClrUsed = ColorCount; bmp->biClrImportant = bi->biClrImportant; - hpal = PALETTE_AllocPalette(palMode, ColorCount, (ULONG*)lpRGB, - dsBitfields[0], - dsBitfields[1], - dsBitfields[2]); - - bmp->ppal = PALETTE_ShareLockPalette(hpal); + bmp->ppal = PALETTE_ShareLockPalette(hpal); /* Lazy delete hpal, it will be freed at surface release */ GreDeleteObject(hpal); @@ -1641,11 +1610,6 @@ SURFACE_FreeSurfaceByHandle(res); res = 0; } - } - - if (lpRGB != bmi->bmiColors && lpRGB) - { - ExFreePoolWithTag((PVOID)lpRGB, TAG_COLORMAP); } if (bmp) @@ -1853,7 +1817,7 @@ } else { - *paletteType = PAL_BGR; + *paletteType = PAL_RGB; RedMask = 0xff0000; GreenMask = 0x00ff00; BlueMask = 0x0000ff; @@ -1874,7 +1838,7 @@ } else { - hPal = PALETTE_AllocPalette(*paletteType, ColorCount, + hPal = PALETTE_AllocPalette(*paletteType, 0, NULL, RedMask, GreenMask, BlueMask); } Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/palette.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/palette.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/palette.c [iso-8859-1] Fri Jul 30 02:15:46 2010 @@ -392,7 +392,15 @@ { HPALETTE Palette; - Palette = PALETTE_AllocPalette(Mode, NumColors, Colors, Red, Green, Blue); + /* Low order three bytes are RGB -> RGBQUAD */ + if(Mode == PAL_INDEXED) + { + Palette = PALETTE_AllocPaletteIndexedRGB(NumColors, (RGBQUAD*)Colors); + } + else + { + Palette = PALETTE_AllocPalette(Mode, NumColors, Colors, Red, Green, Blue); + } if (Palette != NULL) { GDIOBJ_SetOwnership(Palette, NULL);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2010