Ros-diffs June 2005

ros-diffs@reactos.org

22 participants
649 discussions

[navaraf] 16019: Remove few more dead headers.
by navaraf＠svn.reactos.com 17 Jun '05

17 Jun '05

Remove few more dead headers. Deleted: trunk/reactos/include/basetsd.h Deleted: trunk/reactos/include/ntddk.h Deleted: trunk/reactos/include/ntsecapi.h Deleted: trunk/reactos/include/schemadef.h Deleted: trunk/reactos/include/tmschema.h Deleted: trunk/reactos/include/uxtheme.h _____ Deleted: trunk/reactos/include/basetsd.h --- trunk/reactos/include/basetsd.h 2005-06-17 20:54:24 UTC (rev 16018) +++ trunk/reactos/include/basetsd.h 2005-06-17 21:35:33 UTC (rev 16019) @@ -1,133 +0,0 @@ -#ifndef _ROS_BASETSD_H -#define _ROS_BASETSD_H -#if __GNUC__ >=3 -#pragma GCC system_header -#endif - -#ifdef __USE_W32API - -#include_next <basetsd.h> - -#ifdef __GNUC__ -#ifndef __int64 -#define __int64 long long -#endif -#endif - -#else /* __USE_W32API */ - -#ifdef __GNUC__ -#ifndef __int64 -#define __int64 long long -#endif -#endif - -#if defined(_WIN64) -#define __int3264 __int64 -#define ADDRESS_TAG_BIT 0x40000000000UI64 -#else /* !_WIN64 */ -#define __int3264 __int32 -#define ADDRESS_TAG_BIT 0x80000000UL -#define HandleToUlong( h ) ((ULONG)(ULONG_PTR)(h) ) -#define HandleToLong( h ) ((LONG)(LONG_PTR) (h) ) -#define LongToHandle( h) ((HANDLE)(LONG_PTR) (h)) -#define PtrToUlong( p ) ((ULONG)(ULONG_PTR) (p) ) -#define PtrToLong( p ) ((LONG)(LONG_PTR) (p) ) -#define PtrToUint( p ) ((UINT)(UINT_PTR) (p) ) -#define PtrToInt( p ) ((INT)(INT_PTR) (p) ) -#define PtrToUshort( p ) ((unsigned short)(ULONG_PTR)(p) ) -#define PtrToShort( p ) ((short)(LONG_PTR)(p) ) -#define IntToPtr( i ) ((VOID*)(INT_PTR)((int)i)) -#define UIntToPtr( ui ) ((VOID*)(UINT_PTR)((unsigned int)ui)) -#define LongToPtr( l ) ((VOID*)(LONG_PTR)((long)l)) -#define ULongToPtr( ul ) ((VOID*)(ULONG_PTR)((unsigned long)ul)) -#endif /* !_WIN64 */ - -#define UlongToPtr(ul) ULongToPtr(ul) -#define UintToPtr(ui) UIntToPtr(ui) -#define MAXUINT_PTR (~((UINT_PTR)0)) -#define MAXINT_PTR ((INT_PTR)(MAXUINT_PTR >> 1)) -#define MININT_PTR (~MAXINT_PTR) -#define MAXULONG_PTR (~((ULONG_PTR)0)) -#define MAXLONG_PTR ((LONG_PTR)(MAXULONG_PTR >> 1)) -#define MINLONG_PTR (~MAXLONG_PTR) -#define MAXUHALF_PTR ((UHALF_PTR)~0) -#define MAXHALF_PTR ((HALF_PTR)(MAXUHALF_PTR >> 1)) -#define MINHALF_PTR (~MAXHALF_PTR) - -#ifndef RC_INVOKED -#ifdef __cplusplus -extern "C" { -#endif -typedef long LONG32, *PLONG32; -#ifndef XFree86Server -typedef int INT32, *PINT32; -#endif /* ndef XFree86Server */ -typedef unsigned int ULONG32, *PULONG32; -typedef unsigned int DWORD32, *PDWORD32; -typedef unsigned int UINT32, *PUINT32; - -#if defined(_WIN64) -typedef __int64 INT_PTR, *PINT_PTR; -typedef unsigned __int64 UINT_PTR, *PUINT_PTR; -typedef __int64 LONG_PTR, *PLONG_PTR; -typedef unsigned __int64 ULONG_PTR, *PULONG_PTR; -typedef unsigned __int64 HANDLE_PTR; -typedef unsigned int UHALF_PTR, *PUHALF_PTR; -typedef int HALF_PTR, *PHALF_PTR; - -#if 0 /* TODO when WIN64 is here */ -inline unsigned long HandleToUlong(const void* h ) - { return((unsigned long) h ); } -inline long HandleToLong( const void* h ) - { return((long) h ); } -inline void* LongToHandle( const long h ) - { return((void*) (INT_PTR) h ); } -inline unsigned long PtrToUlong( const void* p) - { return((unsigned long) p ); } -inline unsigned int PtrToUint( const void* p ) - { return((unsigned int) p ); } -inline unsigned short PtrToUshort( const void* p ) - { return((unsigned short) p ); } -inline long PtrToLong( const void* p ) - { return((long) p ); } -inline int PtrToInt( const void* p ) - { return((int) p ); } -inline short PtrToShort( const void* p ) - { return((short) p ); } -inline void* IntToPtr( const int i ) - { return( (void*)(INT_PTR)i ); } -inline void* UIntToPtr(const unsigned int ui) - { return( (void*)(UINT_PTR)ui ); } -inline void* LongToPtr( const long l ) - { return( (void*)(LONG_PTR)l ); } -inline void* ULongToPtr( const unsigned long ul ) - { return( (void*)(ULONG_PTR)ul ); } -#endif /* 0_ */ - -#else /* !_WIN64 */ -typedef int INT_PTR, *PINT_PTR; -typedef unsigned int UINT_PTR, *PUINT_PTR; -typedef long LONG_PTR, *PLONG_PTR; -typedef unsigned long ULONG_PTR, *PULONG_PTR; -typedef unsigned short UHALF_PTR, *PUHALF_PTR; -typedef short HALF_PTR, *PHALF_PTR; -typedef unsigned long HANDLE_PTR; -#endif /* !_WIN64 */ - -typedef ULONG_PTR SIZE_T, *PSIZE_T; -typedef LONG_PTR SSIZE_T, *PSSIZE_T; -typedef ULONG_PTR DWORD_PTR, *PDWORD_PTR; -typedef __int64 LONG64, *PLONG64; -typedef __int64 INT64, *PINT64; -typedef unsigned __int64 ULONG64, *PULONG64; -typedef unsigned __int64 DWORD64, *PDWORD64; -typedef unsigned __int64 UINT64, *PUINT64; -#ifdef __cplusplus -} -#endif -#endif /* !RC_INVOKED */ - -#endif /* !__USE_W32API */ - -#endif /* _ROS_BASETSD_H */ _____ Deleted: trunk/reactos/include/ntddk.h --- trunk/reactos/include/ntddk.h 2005-06-17 20:54:24 UTC (rev 16018) +++ trunk/reactos/include/ntddk.h 2005-06-17 21:35:33 UTC (rev 16019) @@ -1,5 +0,0 @@ - -/* (RJJ) some programs look for the DDK header here... */ - -#include <ddk/ntddk.h> - _____ Deleted: trunk/reactos/include/ntsecapi.h --- trunk/reactos/include/ntsecapi.h 2005-06-17 20:54:24 UTC (rev 16018) +++ trunk/reactos/include/ntsecapi.h 2005-06-17 21:35:33 UTC (rev 16019) @@ -1,579 +0,0 @@ -/* - * Copyright (C) 1999 Juergen Schmied - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifdef __USE_W32API -#include_next <ntsecapi.h> -#else - -#ifndef __WINE_NTSECAPI_H -#define __WINE_NTSECAPI_H - -#ifdef __cplusplus -extern "C" { -#endif /* defined(__cplusplus) */ - -typedef enum _SECURITY_LOGON_TYPE { - Interactive = 2, - Network, - Batch, - Service, - Proxy, - Unlock, - NetworkCleartext, - NewCredentials, - RemoteInteractive, - CachedInteractive, - CachedRemoteInteractive, - CachedUnlock -} SECURITY_LOGON_TYPE, *PSECURITY_LOGON_TYPE; - -typedef enum _POLICY_NOTIFICATION_INFORMATION_CLASS { - - PolicyNotifyAuditEventsInformation = 1, - PolicyNotifyAccountDomainInformation, - PolicyNotifyServerRoleInformation, - PolicyNotifyDnsDomainInformation, - PolicyNotifyDomainEfsInformation, - PolicyNotifyDomainKerberosTicketInformation, - PolicyNotifyMachineAccountPasswordInformation - -} POLICY_NOTIFICATION_INFORMATION_CLASS, *PPOLICY_NOTIFICATION_INFORMATION_CLASS; - -typedef ULONG LSA_OPERATIONAL_MODE, *PLSA_OPERATIONAL_MODE; - -/* Policy access rights */ -#define POLICY_VIEW_LOCAL_INFORMATION 0x00000001L -#define POLICY_VIEW_AUDIT_INFORMATION 0x00000002L -#define POLICY_GET_PRIVATE_INFORMATION 0x00000004L -#define POLICY_TRUST_ADMIN 0x00000008L -#define POLICY_CREATE_ACCOUNT 0x00000010L -#define POLICY_CREATE_SECRET 0x00000020L -#define POLICY_CREATE_PRIVILEGE 0x00000040L -#define POLICY_SET_DEFAULT_QUOTA_LIMITS 0x00000080L -#define POLICY_SET_AUDIT_REQUIREMENTS 0x00000100L -#define POLICY_AUDIT_LOG_ADMIN 0x00000200L -#define POLICY_SERVER_ADMIN 0x00000400L -#define POLICY_LOOKUP_NAMES 0x00000800L -#define POLICY_NOTIFICATION 0x00001000L - -#define POLICY_ALL_ACCESS ( \ - STANDARD_RIGHTS_REQUIRED | \ - POLICY_VIEW_LOCAL_INFORMATION | \ - POLICY_VIEW_AUDIT_INFORMATION | \ - POLICY_GET_PRIVATE_INFORMATION | \ - POLICY_TRUST_ADMIN | \ - POLICY_CREATE_ACCOUNT | \ - POLICY_CREATE_SECRET | \ - POLICY_CREATE_PRIVILEGE | \ - POLICY_SET_DEFAULT_QUOTA_LIMITS | \ - POLICY_SET_AUDIT_REQUIREMENTS | \ - POLICY_AUDIT_LOG_ADMIN | \ - POLICY_SERVER_ADMIN | \ - POLICY_LOOKUP_NAMES) - - -#define POLICY_READ ( \ - STANDARD_RIGHTS_READ | \ - POLICY_VIEW_AUDIT_INFORMATION | \ - POLICY_GET_PRIVATE_INFORMATION) - -#define POLICY_WRITE ( \ - STANDARD_RIGHTS_WRITE | \ - POLICY_TRUST_ADMIN | \ - POLICY_CREATE_ACCOUNT | \ - POLICY_CREATE_SECRET | \ - POLICY_CREATE_PRIVILEGE | \ - POLICY_SET_DEFAULT_QUOTA_LIMITS | \ - POLICY_SET_AUDIT_REQUIREMENTS | \ - POLICY_AUDIT_LOG_ADMIN | \ - POLICY_SERVER_ADMIN) - -#define POLICY_EXECUTE ( \ - STANDARD_RIGHTS_EXECUTE | \ - POLICY_VIEW_LOCAL_INFORMATION | \ - POLICY_LOOKUP_NAMES) - -typedef UNICODE_STRING LSA_UNICODE_STRING, *PLSA_UNICODE_STRING; -/* FIXME: Microsoft declares an LSA_STRING as ascii but changing this breaks secur32.dll so someone will need to figure out what to do here */ -typedef struct _LSA_STRING -{ - USHORT Length; - USHORT MaximumLength; - PWSTR Buffer; -} LSA_STRING, *PLSA_STRING; -typedef OBJECT_ATTRIBUTES LSA_OBJECT_ATTRIBUTES, *PLSA_OBJECT_ATTRIBUTES; - -typedef PVOID LSA_HANDLE, *PLSA_HANDLE; - -typedef enum -{ - PolicyAuditLogInformation = 1, - PolicyAuditEventsInformation, - PolicyPrimaryDomainInformation, - PolicyPdAccountInformation, - PolicyAccountDomainInformation, - PolicyLsaServerRoleInformation, - PolicyReplicaSourceInformation, - PolicyDefaultQuotaInformation, - PolicyModificationInformation, - PolicyAuditFullSetInformation, - PolicyAuditFullQueryInformation, - PolicyDnsDomainInformation, - PolicyEfsInformation -} POLICY_INFORMATION_CLASS, *PPOLICY_INFORMATION_CLASS; - -typedef ULONG POLICY_AUDIT_EVENT_OPTIONS, *PPOLICY_AUDIT_EVENT_OPTIONS; - -typedef struct _POLICY_AUDIT_EVENTS_INFO -{ - WINBOOL AuditingMode; - PPOLICY_AUDIT_EVENT_OPTIONS EventAuditingOptions; - ULONG MaximumAuditEventCount; -} POLICY_AUDIT_EVENTS_INFO, *PPOLICY_AUDIT_EVENTS_INFO; - -typedef struct _LSA_FOREST_TRUST_DOMAIN_INFO { - - PSID Sid; - LSA_UNICODE_STRING DnsName; - LSA_UNICODE_STRING NetbiosName; - -} LSA_FOREST_TRUST_DOMAIN_INFO, *PLSA_FOREST_TRUST_DOMAIN_INFO; - - -#define MAX_FOREST_TRUST_BINARY_DATA_SIZE ( 128 * 1024 ) - -typedef struct _LSA_FOREST_TRUST_BINARY_DATA { - - ULONG Length; - PUCHAR Buffer; - -} LSA_FOREST_TRUST_BINARY_DATA, *PLSA_FOREST_TRUST_BINARY_DATA; - -typedef enum { - - ForestTrustTopLevelName, - ForestTrustTopLevelNameEx, - ForestTrustDomainInfo, - ForestTrustRecordTypeLast = ForestTrustDomainInfo - -} LSA_FOREST_TRUST_RECORD_TYPE; - -typedef struct _LSA_AUTH_INFORMATION { - - LARGE_INTEGER LastUpdateTime; - ULONG AuthType; - ULONG AuthInfoLength; - PUCHAR AuthInfo; -} LSA_AUTH_INFORMATION, *PLSA_AUTH_INFORMATION; - -typedef struct _TRUSTED_DOMAIN_AUTH_INFORMATION { - - ULONG IncomingAuthInfos; - PLSA_AUTH_INFORMATION IncomingAuthenticationInformation; - PLSA_AUTH_INFORMATION IncomingPreviousAuthenticationInformation; - ULONG OutgoingAuthInfos; - PLSA_AUTH_INFORMATION OutgoingAuthenticationInformation; - PLSA_AUTH_INFORMATION OutgoingPreviousAuthenticationInformation; - -} TRUSTED_DOMAIN_AUTH_INFORMATION, *PTRUSTED_DOMAIN_AUTH_INFORMATION; - -typedef struct _LSA_FOREST_TRUST_RECORD { - - ULONG Flags; - LSA_FOREST_TRUST_RECORD_TYPE ForestTrustType; - LARGE_INTEGER Time; - - - union { - - LSA_UNICODE_STRING TopLevelName; - LSA_FOREST_TRUST_DOMAIN_INFO DomainInfo; - LSA_FOREST_TRUST_BINARY_DATA Data; - } ForestTrustData; - -} LSA_FOREST_TRUST_RECORD, *PLSA_FOREST_TRUST_RECORD; - -typedef struct _LSA_TRANSLATED_SID { - - SID_NAME_USE Use; - ULONG RelativeId; - LONG DomainIndex; - -} LSA_TRANSLATED_SID, *PLSA_TRANSLATED_SID; - -typedef struct _LSA_TRANSLATED_SID2 { - - SID_NAME_USE Use; - PSID Sid; - LONG DomainIndex; - ULONG Flags; - -} LSA_TRANSLATED_SID2, *PLSA_TRANSLATED_SID2; - -typedef struct _LSA_TRANSLATED_NAME { - - SID_NAME_USE Use; - LSA_UNICODE_STRING Name; - LONG DomainIndex; - -} LSA_TRANSLATED_NAME, *PLSA_TRANSLATED_NAME; - -typedef enum { - - CollisionTdo, - CollisionXref, - CollisionOther - -} LSA_FOREST_TRUST_COLLISION_RECORD_TYPE; - -typedef struct _LSA_FOREST_TRUST_COLLISION_RECORD { - - ULONG Index; - LSA_FOREST_TRUST_COLLISION_RECORD_TYPE Type; - ULONG Flags; - LSA_UNICODE_STRING Name; - -} LSA_FOREST_TRUST_COLLISION_RECORD, *PLSA_FOREST_TRUST_COLLISION_RECORD; - -typedef struct _LSA_FOREST_TRUST_COLLISION_INFORMATION { - - ULONG RecordCount; - PLSA_FOREST_TRUST_COLLISION_RECORD * Entries; - -} LSA_FOREST_TRUST_COLLISION_INFORMATION, *PLSA_FOREST_TRUST_COLLISION_INFORMATION; - -typedef struct _TRUSTED_DOMAIN_INFORMATION_EX { - - LSA_UNICODE_STRING Name; - LSA_UNICODE_STRING FlatName; - PSID Sid; - ULONG TrustDirection; - ULONG TrustType; - ULONG TrustAttributes; - -} TRUSTED_DOMAIN_INFORMATION_EX, *PTRUSTED_DOMAIN_INFORMATION_EX; - -typedef ULONG LSA_ENUMERATION_HANDLE, *PLSA_ENUMERATION_HANDLE; - -typedef struct _LSA_TRUST_INFORMATION { - - LSA_UNICODE_STRING Name; - PSID Sid; - -} LSA_TRUST_INFORMATION, *PLSA_TRUST_INFORMATION; - -typedef struct _LSA_REFERENCED_DOMAIN_LIST { - - ULONG Entries; - PLSA_TRUST_INFORMATION Domains; - -} LSA_REFERENCED_DOMAIN_LIST, *PLSA_REFERENCED_DOMAIN_LIST; - -typedef enum _POLICY_DOMAIN_INFORMATION_CLASS { - - PolicyDomainEfsInformation = 2, - PolicyDomainKerberosTicketInformation - -} POLICY_DOMAIN_INFORMATION_CLASS, *PPOLICY_DOMAIN_INFORMATION_CLASS; - -typedef struct _POLICY_PRIMARY_DOMAIN_INFO -{ - LSA_UNICODE_STRING Name; - PSID Sid; -} POLICY_PRIMARY_DOMAIN_INFO, *PPOLICY_PRIMARY_DOMAIN_INFO; - -typedef struct _POLICY_ACCOUNT_DOMAIN_INFO -{ - LSA_UNICODE_STRING DomainName; - PSID DomainSid; -} POLICY_ACCOUNT_DOMAIN_INFO, *PPOLICY_ACCOUNT_DOMAIN_INFO; - -typedef struct _LSA_FOREST_TRUST_INFORMATION { - - ULONG RecordCount; - PLSA_FOREST_TRUST_RECORD * Entries; - -} LSA_FOREST_TRUST_INFORMATION, *PLSA_FOREST_TRUST_INFORMATION; - -typedef struct _SECURITY_LOGON_SESSION_DATA { - ULONG Size ; - LUID LogonId ; - LSA_UNICODE_STRING UserName ; - LSA_UNICODE_STRING LogonDomain ; - LSA_UNICODE_STRING AuthenticationPackage ; - ULONG LogonType ; - ULONG Session ; - PSID Sid ; - LARGE_INTEGER LogonTime ; - LSA_UNICODE_STRING LogonServer ; - LSA_UNICODE_STRING DnsDomainName ; - LSA_UNICODE_STRING Upn ; -} SECURITY_LOGON_SESSION_DATA, * PSECURITY_LOGON_SESSION_DATA ; - -typedef enum _TRUSTED_INFORMATION_CLASS { - - TrustedDomainNameInformation = 1, - TrustedControllersInformation, - TrustedPosixOffsetInformation, - TrustedPasswordInformation, - TrustedDomainInformationBasic, - TrustedDomainInformationEx, - TrustedDomainAuthInformation, - TrustedDomainFullInformation, - TrustedDomainAuthInformationInternal, - TrustedDomainFullInformationInternal, - TrustedDomainInformationEx2Internal, - TrustedDomainFullInformation2Internal, - -} TRUSTED_INFORMATION_CLASS, *PTRUSTED_INFORMATION_CLASS; - -ULONG -STDCALL -LsaNtStatusToWinError(NTSTATUS Status); -NTSTATUS -STDCALL -LsaOpenPolicy(PLSA_UNICODE_STRING lsaucs,PLSA_OBJECT_ATTRIBUTES lsaoa,ACCESS_MASK access,PLSA_HANDLE lsah); -NTSTATUS -STDCALL -LsaQueryInformationPolicy(LSA_HANDLE lsah,POLICY_INFORMATION_CLASS pic,PVOID* pv); -NTSTATUS -STDCALL -LsaFreeMemory(PVOID pv); -NTSTATUS -STDCALL -LsaClose(LSA_HANDLE ObjectHandle); -NTSTATUS -STDCALL -LsaAddAccountRights( - LSA_HANDLE PolicyHandle, - PSID AccountSid, - PLSA_UNICODE_STRING UserRights, - ULONG CountOfRights - ); -NTSTATUS -STDCALL -LsaCreateTrustedDomainEx( - LSA_HANDLE PolicyHandle, - PTRUSTED_DOMAIN_INFORMATION_EX TrustedDomainInformation, - PTRUSTED_DOMAIN_AUTH_INFORMATION AuthenticationInformation, - ACCESS_MASK DesiredAccess, - PLSA_HANDLE TrustedDomainHandle - ); -NTSTATUS -STDCALL -LsaDeleteTrustedDomain( - LSA_HANDLE PolicyHandle, - PSID TrustedDomainSid - ); -NTSTATUS -STDCALL -LsaEnumerateAccountRights( - LSA_HANDLE PolicyHandle, - PSID AccountSid, - PLSA_UNICODE_STRING *UserRights, - PULONG CountOfRights - ); -NTSTATUS -STDCALL -LsaEnumerateAccountsWithUserRight( - LSA_HANDLE PolicyHandle, - OPTIONAL PLSA_UNICODE_STRING UserRights, - PVOID *EnumerationBuffer, - PULONG CountReturned - ); -NTSTATUS -STDCALL -LsaEnumerateTrustedDomains( - LSA_HANDLE PolicyHandle, - PLSA_ENUMERATION_HANDLE EnumerationContext, - PVOID *Buffer, - ULONG PreferedMaximumLength, - PULONG CountReturned - ); -NTSTATUS -STDCALL -LsaEnumerateTrustedDomainsEx( - LSA_HANDLE PolicyHandle, - PLSA_ENUMERATION_HANDLE EnumerationContext, - PVOID *Buffer, - ULONG PreferedMaximumLength, - PULONG CountReturned - ); -NTSTATUS -STDCALL -LsaLookupNames( - LSA_HANDLE PolicyHandle, - ULONG Count, - PLSA_UNICODE_STRING Names, - PLSA_REFERENCED_DOMAIN_LIST *ReferencedDomains, - PLSA_TRANSLATED_SID *Sids - ); -NTSTATUS -STDCALL -LsaLookupNames2( - LSA_HANDLE PolicyHandle, - ULONG Flags, - ULONG Count, - PLSA_UNICODE_STRING Names, - PLSA_REFERENCED_DOMAIN_LIST *ReferencedDomains, - PLSA_TRANSLATED_SID2 *Sids - ); -NTSTATUS -STDCALL -LsaLookupSids( - LSA_HANDLE PolicyHandle, - ULONG Count, - PSID *Sids, - PLSA_REFERENCED_DOMAIN_LIST *ReferencedDomains, - PLSA_TRANSLATED_NAME *Names - ); -NTSTATUS -STDCALL -LsaOpenTrustedDomainByName( - LSA_HANDLE PolicyHandle, - PLSA_UNICODE_STRING TrustedDomainName, - ACCESS_MASK DesiredAccess, - PLSA_HANDLE TrustedDomainHandle - ); -NTSTATUS -STDCALL -LsaQueryDomainInformationPolicy( - LSA_HANDLE PolicyHandle, - POLICY_DOMAIN_INFORMATION_CLASS InformationClass, - PVOID *Buffer - ); -NTSTATUS -STDCALL -LsaQueryForestTrustInformation( - LSA_HANDLE PolicyHandle, - PLSA_UNICODE_STRING TrustedDomainName, - PLSA_FOREST_TRUST_INFORMATION * ForestTrustInfo - ); -NTSTATUS -STDCALL -LsaQueryTrustedDomainInfoByName( - LSA_HANDLE PolicyHandle, - PLSA_UNICODE_STRING TrustedDomainName, - TRUSTED_INFORMATION_CLASS InformationClass, - PVOID *Buffer - ); -NTSTATUS -STDCALL -LsaQueryTrustedDomainInfo( - LSA_HANDLE PolicyHandle, - PSID TrustedDomainSid, - TRUSTED_INFORMATION_CLASS InformationClass, - PVOID *Buffer - ); -NTSTATUS -STDCALL -LsaRemoveAccountRights( - LSA_HANDLE PolicyHandle, - PSID AccountSid, - BOOLEAN AllRights, - PLSA_UNICODE_STRING UserRights, - ULONG CountOfRights - ); -NTSTATUS -STDCALL -LsaRetrievePrivateData( - LSA_HANDLE PolicyHandle, - PLSA_UNICODE_STRING KeyName, - PLSA_UNICODE_STRING * PrivateData - ); -NTSTATUS -STDCALL -LsaSetDomainInformationPolicy( - LSA_HANDLE PolicyHandle, - POLICY_DOMAIN_INFORMATION_CLASS InformationClass, - PVOID Buffer - ); -NTSTATUS -STDCALL -LsaSetInformationPolicy( - LSA_HANDLE PolicyHandle, - POLICY_INFORMATION_CLASS InformationClass, - PVOID Buffer - ); -NTSTATUS -STDCALL -LsaSetForestTrustInformation( - LSA_HANDLE PolicyHandle, - PLSA_UNICODE_STRING TrustedDomainName, - PLSA_FOREST_TRUST_INFORMATION ForestTrustInfo, - WINBOOL CheckOnly, - PLSA_FOREST_TRUST_COLLISION_INFORMATION * CollisionInfo - ); -NTSTATUS -STDCALL -LsaSetTrustedDomainInfoByName( - LSA_HANDLE PolicyHandle, - PLSA_UNICODE_STRING TrustedDomainName, - TRUSTED_INFORMATION_CLASS InformationClass, - PVOID Buffer - ); -NTSTATUS -STDCALL -LsaSetTrustedDomainInformation( - LSA_HANDLE PolicyHandle, - PSID TrustedDomainSid, - TRUSTED_INFORMATION_CLASS InformationClass, - PVOID Buffer - ); -NTSTATUS -STDCALL -LsaStorePrivateData( - LSA_HANDLE PolicyHandle, - PLSA_UNICODE_STRING KeyName, - PLSA_UNICODE_STRING PrivateData - ); -NTSTATUS -STDCALL -LsaEnumerateLogonSessions( -PULONG LogonSessionCount, -PLUID * LogonSessionList -); - -NTSTATUS -STDCALL -LsaGetLogonSessionData( -PLUID LogonId, -PSECURITY_LOGON_SESSION_DATA * ppLogonSessionData -); -NTSTATUS -STDCALL -LsaRegisterPolicyChangeNotification( -POLICY_NOTIFICATION_INFORMATION_CLASS InformationClass, -HANDLE NotificationEventHandle -); - -NTSTATUS -STDCALL -LsaUnregisterPolicyChangeNotification( -POLICY_NOTIFICATION_INFORMATION_CLASS InformationClass, -HANDLE NotificationEventHandle -); - - -#ifdef __cplusplus -} /* extern "C" */ -#endif /* defined(__cplusplus) */ - -#endif /* !defined(__WINE_NTSECAPI_H) */ - -#endif /* __USE_W32API */ _____ Deleted: trunk/reactos/include/schemadef.h --- trunk/reactos/include/schemadef.h 2005-06-17 20:54:24 UTC (rev 16018) +++ trunk/reactos/include/schemadef.h 2005-06-17 21:35:33 UTC (rev 16019) @@ -1,111 +0,0 @@ -#ifndef SCHEMA_STRINGS - -# ifndef SCHEMADEF_H -# define SCHEMADEF_H - -# define SCHEMADEF_VERSION (1) - -struct TMPROPINFO -{ - LPCWSTR pszName; - SHORT sEnumVal; - BYTE bPrimVal; -}; - -struct TMSCHEMAINFO -{ - DWORD dwSize; - int iSchemaDefVersion; - int iThemeMgrVersion; - int iPropCount; - const struct TMPROPINFO * pPropTable; -}; - -# define BEGIN_TM_SCHEMA(NAME__) -# define BEGIN_TM_PROPS() enum PropValues { DummyProp = 49, -# define BEGIN_TM_ENUM(NAME__) enum NAME__ { - -# define BEGIN_TM_CLASS_PARTS(NAME__) \ - enum NAME__##PARTS { NAME__##PartFiller0, - -# define BEGIN_TM_PART_STATES(NAME__) \ - enum NAME__##STATES { NAME__##StateFiller0, - - -# define TM_PROP(VAL__, PREFIX__, NAME__, PRIMVAL__) \ - PREFIX__##_##NAME__ = VAL__, - -# define TM_ENUM(VAL__, PREFIX__, NAME__) PREFIX__##_##NAME__ = VAL__, -# define TM_PART(VAL__, PREFIX__, NAME__) PREFIX__##_##NAME__ = VAL__, -# define TM_STATE(VAL__, PREFIX__, NAME__) PREFIX__##_##NAME__ = VAL__, - -# define END_TM_CLASS_PARTS() }; -# define END_TM_PART_STATES() }; -# define END_TM_PROPS() }; -# define END_TM_ENUM() }; -# define END_TM_SCHEMA(NAME__) - -# endif - -# else - -# undef BEGIN_TM_SCHEMA -# undef BEGIN_TM_PROPS -# undef BEGIN_TM_ENUM -# undef BEGIN_TM_CLASS_PARTS -# undef BEGIN_TM_PART_STATES -# undef TM_PROP -# undef TM_PART -# undef TM_STATE -# undef TM_ENUM -# undef END_TM_CLASS_PARTS -# undef END_TM_PART_STATES -# undef END_TM_PROPS -# undef END_TM_ENUM -# undef END_TM_SCHEMA - -# define BEGIN_TM_SCHEMA(NAME__) static const TMPROPINFO NAME__[] = { -# define BEGIN_TM_PROPS() -# define BEGIN_TM_ENUM(NAME__) { L#NAME__, TMT_ENUMDEF, TMT_ENUMDEF }, - -# define BEGIN_TM_CLASS_PARTS(NAME__) \ - { L#NAME__ L"PARTS", TMT_ENUMDEF, TMT_ENUMDEF }, - -# define BEGIN_TM_PART_STATES(NAME__) \ - { L#NAME__ L"STATES", TMT_ENUMDEF, TMT_ENUMDEF }, - - -# define TM_PROP(VAL__, PREFIX__, NAME__, PRIMVAL__) \ - { L#NAME__, PREFIX__##_##NAME__, TMT_##PRIMVAL__ }, - -# define TM_PART(VAL__, PREFIX__, NAME__) \ - { L#NAME__, PREFIX__##_##NAME__, TMT_ENUMVAL }, - -# define TM_STATE(VAL__, PREFIX__, NAME__) \ - { L#NAME__, PREFIX__##_##NAME__, TMT_ENUMVAL }, - -# define TM_ENUM(VAL__, PREFIX__, NAME__) \ - { L#NAME__, PREFIX__##_##NAME__, TMT_ENUMVAL }, - - -# define END_TM_CLASS_PARTS() -# define END_TM_PART_STATES() -# define END_TM_PROPS() -# define END_TM_ENUM() -# define END_TM_SCHEMA(NAME__) \ - }; \ - \ - static const TMSCHEMAINFO * GetSchemaInfo(void) \ - { \ - static TMSCHEMAINFO si = { sizeof(si) }; \ - si.iSchemaDefVersion = SCHEMADEF_VERSION; \ - si.iThemeMgrVersion = THEMEMGR_VERSION; \ - si.iPropCount = sizeof(NAME__) / sizeof(NAME__[0]); \ - si.pPropTable = NAME__; \ - \ - return &si; \ - } - -# endif - -/* EOF */ _____ Deleted: trunk/reactos/include/tmschema.h --- trunk/reactos/include/tmschema.h 2005-06-17 20:54:24 UTC (rev 16018) +++ trunk/reactos/include/tmschema.h 2005-06-17 21:35:33 UTC (rev 16019) @@ -1,1085 +0,0 @@ -#if (defined(SCHEMA_STRINGS)) || (!defined(TMSCHEMA_H)) - -#define TMSCHEMA_H - -#include "schemadef.h" - -#define THEMEMGR_VERSION 1 - -BEGIN_TM_SCHEMA(ThemeMgrSchema) - - BEGIN_TM_ENUM(BGTYPE) - TM_ENUM(0, BT, IMAGEFILE) - TM_ENUM(1, BT, BORDERFILL) - TM_ENUM(2, BT, NONE) - END_TM_ENUM() - - BEGIN_TM_ENUM(IMAGELAYOUT) - TM_ENUM(0, IL, VERTICAL) - TM_ENUM(1, IL, HORIZONTAL) - END_TM_ENUM() - - BEGIN_TM_ENUM(BORDERTYPE) - TM_ENUM(0, BT, RECT) - TM_ENUM(1, BT, ROUNDRECT) - TM_ENUM(2, BT, ELLIPSE) - END_TM_ENUM() - - BEGIN_TM_ENUM(FILLTYPE) - TM_ENUM(0, FT, SOLID) - TM_ENUM(1, FT, VERTGRADIENT) - TM_ENUM(2, FT, HORZGRADIENT) - TM_ENUM(3, FT, RADIALGRADIENT) - TM_ENUM(4, FT, TILEIMAGE) - END_TM_ENUM() - - BEGIN_TM_ENUM(SIZINGTYPE) - TM_ENUM(0, ST, TRUESIZE) - TM_ENUM(1, ST, STRETCH) - TM_ENUM(2, ST, TILE) - END_TM_ENUM() - - BEGIN_TM_ENUM(HALIGN) - TM_ENUM(0, HA, LEFT) - TM_ENUM(1, HA, CENTER) - TM_ENUM(2, HA, RIGHT) - END_TM_ENUM() - - BEGIN_TM_ENUM(CONTENTALIGNMENT) - TM_ENUM(0, CA, LEFT) - TM_ENUM(1, CA, CENTER) - TM_ENUM(2, CA, RIGHT) - END_TM_ENUM() - - BEGIN_TM_ENUM(VALIGN) - TM_ENUM(0, VA, TOP) - TM_ENUM(1, VA, CENTER) - TM_ENUM(2, VA, BOTTOM) - END_TM_ENUM() - - BEGIN_TM_ENUM(OFFSETTYPE) - TM_ENUM(0, OT, TOPLEFT) - TM_ENUM(1, OT, TOPRIGHT) - TM_ENUM(2, OT, TOPMIDDLE) - TM_ENUM(3, OT, BOTTOMLEFT) - TM_ENUM(4, OT, BOTTOMRIGHT) - TM_ENUM(5, OT, BOTTOMMIDDLE) - TM_ENUM(6, OT, MIDDLELEFT) - TM_ENUM(7, OT, MIDDLERIGHT) - TM_ENUM(8, OT, LEFTOFCAPTION) - TM_ENUM(9, OT, RIGHTOFCAPTION) - TM_ENUM(10, OT, LEFTOFLASTBUTTON) - TM_ENUM(11, OT, RIGHTOFLASTBUTTON) - TM_ENUM(12, OT, ABOVELASTBUTTON) - TM_ENUM(13, OT, BELOWLASTBUTTON) - END_TM_ENUM() - - BEGIN_TM_ENUM(ICONEFFECT) - TM_ENUM(0, ICE, NONE) - TM_ENUM(1, ICE, GLOW) - TM_ENUM(2, ICE, SHADOW) - TM_ENUM(3, ICE, PULSE) - TM_ENUM(4, ICE, ALPHA) - END_TM_ENUM() - - BEGIN_TM_ENUM(TEXTSHADOWTYPE) - TM_ENUM(0, TST, NONE) - TM_ENUM(1, TST, SINGLE) - TM_ENUM(2, TST, CONTINUOUS) - END_TM_ENUM() - - BEGIN_TM_ENUM(GLYPHTYPE) - TM_ENUM(0, GT, NONE) - TM_ENUM(1, GT, IMAGEGLYPH) - TM_ENUM(2, GT, FONTGLYPH) - END_TM_ENUM() - - BEGIN_TM_ENUM(IMAGESELECTTYPE) - TM_ENUM(0, IST, NONE) - TM_ENUM(1, IST, SIZE) - TM_ENUM(2, IST, DPI) - END_TM_ENUM() - - BEGIN_TM_ENUM(TRUESIZESCALINGTYPE) - TM_ENUM(0, TSST, NONE) - TM_ENUM(1, TSST, SIZE) - TM_ENUM(2, TSST, DPI) - END_TM_ENUM() - - BEGIN_TM_ENUM(GLYPHFONTSIZINGTYPE) - TM_ENUM(0, GFST, NONE) - TM_ENUM(1, GFST, SIZE) - TM_ENUM(2, GFST, DPI) - END_TM_ENUM() - - BEGIN_TM_PROPS() - - TM_PROP(201, TMT, STRING, STRING) - TM_PROP(202, TMT, INT, INT) - TM_PROP(203, TMT, BOOL, BOOL) - TM_PROP(204, TMT, COLOR, COLOR) - TM_PROP(205, TMT, MARGINS, MARGINS) - TM_PROP(206, TMT, FILENAME, FILENAME) - TM_PROP(207, TMT, SIZE, SIZE) - TM_PROP(208, TMT, POSITION, POSITION) - TM_PROP(209, TMT, RECT, RECT) - TM_PROP(210, TMT, FONT, FONT) - TM_PROP(211, TMT, INTLIST, INTLIST) - - TM_PROP(401, TMT, COLORSCHEMES, STRING) - TM_PROP(402, TMT, SIZES, STRING) - TM_PROP(403, TMT, CHARSET, INT) - -#define TMT_FIRST_RCSTRING_NAME TMT_DISPLAYNAME -#define TMT_LAST_RCSTRING_NAME TMT_DESCRIPTION - - TM_PROP(601, TMT, DISPLAYNAME, STRING) - TM_PROP(602, TMT, TOOLTIP, STRING) - TM_PROP(603, TMT, COMPANY, STRING) - TM_PROP(604, TMT, AUTHOR, STRING) - TM_PROP(605, TMT, COPYRIGHT, STRING) - TM_PROP(606, TMT, URL, STRING) - TM_PROP(607, TMT, VERSION, STRING) - TM_PROP(608, TMT, DESCRIPTION, STRING) - -#define TMT_FIRSTFONT TMT_CAPTIONFONT -#define TMT_LASTFONT TMT_ICONTITLEFONT - [truncated at 1000 lines; 1411 more skipped]

1 0

[gvg] 16018: - Correctly translate output rect
by gvg＠svn.reactos.com 17 Jun '05

17 Jun '05

- Correctly translate output rect - Don't call DIB routines for empty (clipped away) rectangles Modified: trunk/reactos/subsys/win32k/eng/bitblt.c _____ Modified: trunk/reactos/subsys/win32k/eng/bitblt.c --- trunk/reactos/subsys/win32k/eng/bitblt.c 2005-06-17 20:32:22 UTC (rev 16017) +++ trunk/reactos/subsys/win32k/eng/bitblt.c 2005-06-17 20:54:24 UTC (rev 16018) @@ -290,7 +290,7 @@ return TRUE; } - if (NULL != SourcePoint) + if (UsesSource && NULL != SourcePoint) { InputRect.left = SourcePoint->x; InputRect.right = SourcePoint->x + (DestRect->right - DestRect->left); @@ -362,10 +362,10 @@ return FALSE; } - OutputRect.left = DestRect->left + Translate.x; - OutputRect.right = DestRect->right + Translate.x; - OutputRect.top = DestRect->top + Translate.y; - OutputRect.bottom = DestRect->bottom + Translate.y; + OutputRect.left += Translate.x; + OutputRect.right += Translate.x; + OutputRect.top += Translate.y; + OutputRect.bottom += Translate.y; if(BrushOrigin) { @@ -412,11 +412,13 @@ ClipRect.right = ClipRegion->rclBounds.right + Translate.x; ClipRect.top = ClipRegion->rclBounds.top + Translate.y; ClipRect.bottom = ClipRegion->rclBounds.bottom + Translate.y; - EngIntersectRect(&CombinedRect, &OutputRect, &ClipRect); - Pt.x = InputPoint.x + CombinedRect.left - OutputRect.left; - Pt.y = InputPoint.y + CombinedRect.top - OutputRect.top; - Ret = (*BltRectFunc)(OutputObj, InputObj, Mask, ColorTranslation, - &CombinedRect, &Pt, MaskOrigin, Brush, &AdjustedBrushOrigin, Rop4); + if (EngIntersectRect(&CombinedRect, &OutputRect, &ClipRect)) + { + Pt.x = InputPoint.x + CombinedRect.left - OutputRect.left; + Pt.y = InputPoint.y + CombinedRect.top - OutputRect.top; + Ret = (*BltRectFunc)(OutputObj, InputObj, Mask, ColorTranslation, + &CombinedRect, &Pt, MaskOrigin, Brush, &AdjustedBrushOrigin, Rop4); + } break; case DC_COMPLEX: Ret = TRUE; @@ -446,12 +448,15 @@ ClipRect.right = RectEnum.arcl[i].right + Translate.x; ClipRect.top = RectEnum.arcl[i].top + Translate.y; ClipRect.bottom = RectEnum.arcl[i].bottom + Translate.y; - EngIntersectRect(&CombinedRect, &OutputRect, &ClipRect); - Pt.x = InputPoint.x + CombinedRect.left - OutputRect.left; - Pt.y = InputPoint.y + CombinedRect.top - OutputRect.top; - Ret = (*BltRectFunc)(OutputObj, InputObj, Mask, ColorTranslation, - &CombinedRect, &Pt, MaskOrigin, Brush, &AdjustedBrushOrigin, Rop4) && - Ret; + if (EngIntersectRect(&CombinedRect, &OutputRect, &ClipRect)) + { + Pt.x = InputPoint.x + CombinedRect.left - OutputRect.left; + Pt.y = InputPoint.y + CombinedRect.top - OutputRect.top; + Ret = (*BltRectFunc)(OutputObj, InputObj, Mask, + ColorTranslation, &CombinedRect, &Pt, + MaskOrigin, Brush, &AdjustedBrushOrigin, + Rop4) && Ret; + } } } while(EnumMore); @@ -1001,15 +1006,21 @@ ClipRect.right = ClipRegion->rclBounds.right + Translate.x; ClipRect.top = ClipRegion->rclBounds.top + Translate.y; ClipRect.bottom = ClipRegion->rclBounds.bottom + Translate.y; - EngIntersectRect(&CombinedRect, &OutputRect, &ClipRect); - Pt.x = InputPoint.x + CombinedRect.left - OutputRect.left; - Pt.y = InputPoint.y + CombinedRect.top - OutputRect.top; - if(Mask->iBitmapFormat == BMF_8BPP) - Ret = AlphaBltMask(OutputObj, InputObj, Mask, DestColorTranslation, SourceColorTranslation, - &CombinedRect, &Pt, MaskOrigin, Brush, &AdjustedBrushOrigin); - else - Ret = BltMask(OutputObj, InputObj, Mask, DestColorTranslation, - &CombinedRect, &Pt, MaskOrigin, Brush, &AdjustedBrushOrigin, R4_MASK); + if (EngIntersectRect(&CombinedRect, &OutputRect, &ClipRect)) + { + Pt.x = InputPoint.x + CombinedRect.left - OutputRect.left; + Pt.y = InputPoint.y + CombinedRect.top - OutputRect.top; + if(Mask->iBitmapFormat == BMF_8BPP) + { + Ret = AlphaBltMask(OutputObj, InputObj, Mask, DestColorTranslation, SourceColorTranslation, + &CombinedRect, &Pt, MaskOrigin, Brush, &AdjustedBrushOrigin); + } + else + { + Ret = BltMask(OutputObj, InputObj, Mask, DestColorTranslation, + &CombinedRect, &Pt, MaskOrigin, Brush, &AdjustedBrushOrigin, R4_MASK); + } + } break; case DC_COMPLEX: Ret = TRUE; @@ -1039,15 +1050,26 @@ ClipRect.right = RectEnum.arcl[i].right + Translate.x; ClipRect.top = RectEnum.arcl[i].top + Translate.y; ClipRect.bottom = RectEnum.arcl[i].bottom + Translate.y; - EngIntersectRect(&CombinedRect, &OutputRect, &ClipRect); - Pt.x = InputPoint.x + CombinedRect.left - OutputRect.left; - Pt.y = InputPoint.y + CombinedRect.top - OutputRect.top; - if(Mask->iBitmapFormat == BMF_8BPP) - Ret = AlphaBltMask(OutputObj, InputObj, Mask, DestColorTranslation, SourceColorTranslation, - &CombinedRect, &Pt, MaskOrigin, Brush, &AdjustedBrushOrigin) && Ret; - else - Ret = BltMask(OutputObj, InputObj, Mask, DestColorTranslation, - &CombinedRect, &Pt, MaskOrigin, Brush, &AdjustedBrushOrigin, R4_MASK) && Ret; + if (EngIntersectRect(&CombinedRect, &OutputRect, &ClipRect)) + { + Pt.x = InputPoint.x + CombinedRect.left - OutputRect.left; + Pt.y = InputPoint.y + CombinedRect.top - OutputRect.top; + if(Mask->iBitmapFormat == BMF_8BPP) + { + Ret = AlphaBltMask(OutputObj, InputObj, Mask, + DestColorTranslation, + SourceColorTranslation, + &CombinedRect, &Pt, MaskOrigin, Brush, + &AdjustedBrushOrigin) && Ret; + } + else + { + Ret = BltMask(OutputObj, InputObj, Mask, + DestColorTranslation, &CombinedRect, &Pt, + MaskOrigin, Brush, &AdjustedBrushOrigin, + R4_MASK) && Ret; + } + } } } while(EnumMore);

1 0

[mf] 16017: remove tabs for proper indenting
by mf＠svn.reactos.com 17 Jun '05

17 Jun '05

remove tabs for proper indenting Modified: trunk/reactos/subsys/system/winefile/resource.h Modified: trunk/reactos/subsys/system/winefile/winefile.h _____ Modified: trunk/reactos/subsys/system/winefile/resource.h --- trunk/reactos/subsys/system/winefile/resource.h 2005-06-17 20:30:57 UTC (rev 16016) +++ trunk/reactos/subsys/system/winefile/resource.h 2005-06-17 20:32:22 UTC (rev 16017) @@ -19,69 +19,69 @@ /* images */ -#define IDB_TOOLBAR 100 -#define IDB_DRIVEBAR 101 -#define IDB_IMAGES 102 -#define IDI_WINEFILE 100 +#define IDB_TOOLBAR 100 +#define IDB_DRIVEBAR 101 +#define IDB_IMAGES 102 +#define IDI_WINEFILE 100 /* accellerators and menus */ -#define IDA_WINEFILE 101 -#define IDM_WINEFILE 102 +#define IDA_WINEFILE 101 +#define IDM_WINEFILE 102 /* dialogs */ -#define IDD_EXECUTE 103 -#define IDD_SELECT_DESTINATION 104 -#define IDD_DIALOG_VIEW_TYPE 105 -#define IDD_DIALOG_PROPERTIES 106 +#define IDD_EXECUTE 103 +#define IDD_SELECT_DESTINATION 104 +#define IDD_DIALOG_VIEW_TYPE 105 +#define IDD_DIALOG_PROPERTIES 106 /* control ids */ -#define ID_ACTIVATE 101 -#define ID_EXECUTE 105 -#define ID_FILE_MOVE 106 -#define ID_FILE_COPY 107 -#define ID_FILE_DELETE 108 -#define ID_FILE_EXIT 115 -#define ID_FORMAT_DISK 203 -#define ID_CONNECT_NETWORK_DRIVE 252 -#define ID_DISCONNECT_NETWORK_DRIVE 253 -#define ID_VIEW_NAME 401 -#define ID_VIEW_ALL_ATTRIBUTES 402 -#define ID_VIEW_SELECTED_ATTRIBUTES 403 -#define ID_VIEW_SORT_NAME 404 -#define ID_VIEW_SORT_TYPE 405 -#define ID_VIEW_SORT_SIZE 406 -#define ID_VIEW_SORT_DATE 407 -#define ID_VIEW_FILTER 409 -#define ID_VIEW_SPLIT 414 -#define ID_SELECT_FONT 510 -#define ID_VIEW_TOOL_BAR 508 -#define ID_VIEW_DRIVE_BAR 507 -#define ID_VIEW_STATUSBAR 503 +#define ID_ACTIVATE 101 +#define ID_EXECUTE 105 +#define ID_FILE_MOVE 106 +#define ID_FILE_COPY 107 +#define ID_FILE_DELETE 108 +#define ID_FILE_EXIT 115 +#define ID_FORMAT_DISK 203 +#define ID_CONNECT_NETWORK_DRIVE 252 +#define ID_DISCONNECT_NETWORK_DRIVE 253 +#define ID_VIEW_NAME 401 +#define ID_VIEW_ALL_ATTRIBUTES 402 +#define ID_VIEW_SELECTED_ATTRIBUTES 403 +#define ID_VIEW_SORT_NAME 404 +#define ID_VIEW_SORT_TYPE 405 +#define ID_VIEW_SORT_SIZE 406 +#define ID_VIEW_SORT_DATE 407 +#define ID_VIEW_FILTER 409 +#define ID_VIEW_SPLIT 414 +#define ID_SELECT_FONT 510 +#define ID_VIEW_TOOL_BAR 508 +#define ID_VIEW_DRIVE_BAR 507 +#define ID_VIEW_STATUSBAR 503 -#define ID_ABOUT 1803 -#define ID_REFRESH 1704 -#define ID_EDIT_PROPERTIES 57656 -#define ID_WINDOW_NEW 0xE130 -#define ID_WINDOW_ARRANGE 0xE131 -#define ID_WINDOW_CASCADE 0xE132 -#define ID_WINDOW_TILE_HORZ 0xE133 -#define ID_WINDOW_TILE_VERT 0xE134 -#define ID_WINDOW_SPLIT 0xE135 -#define ID_HELP_USING 0xE144 -#define ID_HELP 0xE146 +#define ID_ABOUT 1803 +#define ID_REFRESH 1704 +#define ID_EDIT_PROPERTIES 57656 +#define ID_WINDOW_NEW 0xE130 +#define ID_WINDOW_ARRANGE 0xE131 +#define ID_WINDOW_CASCADE 0xE132 +#define ID_WINDOW_TILE_HORZ 0xE133 +#define ID_WINDOW_TILE_VERT 0xE134 +#define ID_WINDOW_SPLIT 0xE135 +#define ID_HELP_USING 0xE144 +#define ID_HELP 0xE146 -#define IDC_VIEW_PATTERN 1000 -#define IDC_VIEW_TYPE_DIRECTORIES 1001 -#define IDC_VIEW_TYPE_PROGRAMS 1002 -#define IDC_VIEW_TYPE_DOCUMENTS 1003 -#define IDC_VIEW_TYPE_OTHERS 1004 -#define IDC_VIEW_TYPE_HIDDEN 1005 +#define IDC_VIEW_PATTERN 1000 +#define IDC_VIEW_TYPE_DIRECTORIES 1001 +#define IDC_VIEW_TYPE_PROGRAMS 1002 +#define IDC_VIEW_TYPE_DOCUMENTS 1003 +#define IDC_VIEW_TYPE_OTHERS 1004 +#define IDC_VIEW_TYPE_HIDDEN 1005 #define IDC_STATIC_PROP_FILENAME 1006 #define IDC_STATIC_PROP_PATH 1007 @@ -90,57 +90,57 @@ #define IDC_STATIC_PROP_COPYRIGHT 1010 #define IDC_STATIC_PROP_SIZE 1011 #define IDC_CHECK_READONLY 1012 -#define IDC_CHECK_ARCHIVE 1013 -#define IDC_CHECK_COMPRESSED 1014 -#define IDC_CHECK_HIDDEN 1015 -#define IDC_CHECK_SYSTEM 1016 -#define IDC_LIST_PROP_VERSION_TYPES 1017 -#define IDC_LIST_PROP_VERSION_VALUES 1018 +#define IDC_CHECK_ARCHIVE 1013 +#define IDC_CHECK_COMPRESSED 1014 +#define IDC_CHECK_HIDDEN 1015 +#define IDC_CHECK_SYSTEM 1016 +#define IDC_LIST_PROP_VERSION_TYPES 1017 +#define IDC_LIST_PROP_VERSION_VALUES 1018 /* winefile extensions */ -#define ID_ABOUT_WINE 0x8000 -#define ID_LICENSE 0x8001 -#define ID_NO_WARRANTY 0x8002 -#define ID_WINDOW_AUTOSORT 0x8003 -#define ID_VIEW_FULLSCREEN 0x8004 -#define ID_PREFERRED_SIZES 0x8005 +#define ID_ABOUT_WINE 0x8000 +#define ID_LICENSE 0x8001 +#define ID_NO_WARRANTY 0x8002 +#define ID_WINDOW_AUTOSORT 0x8003 +#define ID_VIEW_FULLSCREEN 0x8004 +#define ID_PREFERRED_SIZES 0x8005 /* string table */ -#define IDS_FONT_SEL_DLG_NAME 1101 -#define IDS_FONT_SEL_ERROR 1103 +#define IDS_FONT_SEL_DLG_NAME 1101 +#define IDS_FONT_SEL_ERROR 1103 -#define IDS_WINEFILE 1200 -#define IDS_ERROR 1201 -#define IDS_ROOT_FS 1202 -#define IDS_UNIXFS 1203 -#define IDS_DESKTOP 1204 -#define IDS_SHELL 1205 -#define IDS_TITLEFMT 1206 -#define IDS_NO_IMPL 1207 -#define IDS_WINE 1208 -#define IDS_WINE_FILE 1209 +#define IDS_WINEFILE 1200 +#define IDS_ERROR 1201 +#define IDS_ROOT_FS 1202 +#define IDS_UNIXFS 1203 +#define IDS_DESKTOP 1204 +#define IDS_SHELL 1205 +#define IDS_TITLEFMT 1206 +#define IDS_NO_IMPL 1207 +#define IDS_WINE 1208 +#define IDS_WINE_FILE 1209 -#define IDS_COL_NAME 1210 -#define IDS_COL_SIZE 1211 -#define IDS_COL_CDATE 1212 -#define IDS_COL_ADATE 1213 -#define IDS_COL_MDATE 1214 -#define IDS_COL_IDX 1215 -#define IDS_COL_LINKS 1216 -#define IDS_COL_ATTR 1217 -#define IDS_COL_SEC 1218 -#define IDS_FREE_SPACE_FMT 1219 +#define IDS_COL_NAME 1210 +#define IDS_COL_SIZE 1211 +#define IDS_COL_CDATE 1212 +#define IDS_COL_ADATE 1213 +#define IDS_COL_MDATE 1214 +#define IDS_COL_IDX 1215 +#define IDS_COL_LINKS 1216 +#define IDS_COL_ATTR 1217 +#define IDS_COL_SEC 1218 +#define IDS_FREE_SPACE_FMT 1219 /* range for drive bar command ids: 0x9000..0x90FF */ #ifdef __WINE__ -#define ID_DRIVE_UNIX_FS 0x9000 +#define ID_DRIVE_UNIX_FS 0x9000 #endif -#define ID_DRIVE_SHELL_NS 0x9001 +#define ID_DRIVE_SHELL_NS 0x9001 -#define ID_DRIVE_FIRST 0x9002 +#define ID_DRIVE_FIRST 0x9002 _____ Modified: trunk/reactos/subsys/system/winefile/winefile.h --- trunk/reactos/subsys/system/winefile/winefile.h 2005-06-17 20:30:57 UTC (rev 16016) +++ trunk/reactos/subsys/system/winefile/winefile.h 2005-06-17 20:32:22 UTC (rev 16017) @@ -35,7 +35,7 @@ #include <commdlg.h> #ifdef UNICODE -#define _UNICODE +#define _UNICODE #include <wchar.h> #endif #include <tchar.h> @@ -46,14 +46,14 @@ #include <locale.h> #ifndef __WINE__ -#include <malloc.h> /* for alloca() */ +#include <malloc.h> /* for alloca() */ #endif -#include <shellapi.h> /* for ShellExecute() */ -#include <shlobj.h> /* for SHFormatDrive() */ +#include <shellapi.h> /* for ShellExecute() */ +#include <shlobj.h> /* for SHFormatDrive() */ #ifndef _NO_EXTENSIONS -#define _SHELL_FOLDERS +#define _SHELL_FOLDERS #endif /* _NO_EXTENSIONS */ #ifndef FILE_ATTRIBUTE_NOT_CONTENT_INDEXED @@ -64,81 +64,81 @@ #endif -#ifdef _DEBUG -#define ASSERT(x) {if (!(x)) DebugBreak();} +#ifdef _DEBUG +#define ASSERT(x) {if (!(x)) DebugBreak();} #else -#define ASSERT(x) /* nothing */ +#define ASSERT(x) /* nothing */ #endif -#define BUFFER_LEN 1024 +#define BUFFER_LEN 1024 enum IMAGE { - IMG_NONE=-1, IMG_FILE=0, IMG_DOCUMENT, IMG_EXECUTABLE, - IMG_FOLDER, IMG_OPEN_FOLDER, IMG_FOLDER_PLUS,IMG_OPEN_PLUS, IMG_OPEN_MINUS, - IMG_FOLDER_UP, IMG_FOLDER_CUR + IMG_NONE=-1, IMG_FILE=0, IMG_DOCUMENT, IMG_EXECUTABLE, + IMG_FOLDER, IMG_OPEN_FOLDER, IMG_FOLDER_PLUS,IMG_OPEN_PLUS, IMG_OPEN_MINUS, + IMG_FOLDER_UP, IMG_FOLDER_CUR }; -#define IMAGE_WIDTH 16 -#define IMAGE_HEIGHT 13 -#define SPLIT_WIDTH 5 -#define TREE_LINE_DX 3 +#define IMAGE_WIDTH 16 +#define IMAGE_HEIGHT 13 +#define SPLIT_WIDTH 5 +#define TREE_LINE_DX 3 -#define IDW_STATUSBAR 0x100 -#define IDW_TOOLBAR 0x101 -#define IDW_DRIVEBAR 0x102 -#define IDW_FIRST_CHILD 0xC000 /*0x200*/ +#define IDW_STATUSBAR 0x100 +#define IDW_TOOLBAR 0x101 +#define IDW_DRIVEBAR 0x102 +#define IDW_FIRST_CHILD 0xC000 /*0x200*/ -#define IDW_TREE_LEFT 3 -#define IDW_TREE_RIGHT 6 -#define IDW_HEADER_LEFT 2 -#define IDW_HEADER_RIGHT 5 +#define IDW_TREE_LEFT 3 +#define IDW_TREE_RIGHT 6 +#define IDW_HEADER_LEFT 2 +#define IDW_HEADER_RIGHT 5 -#define WM_DISPATCH_COMMAND 0xBF80 +#define WM_DISPATCH_COMMAND 0xBF80 -#define COLOR_COMPRESSED RGB(0,0,255) -#define COLOR_SELECTION RGB(0,0,128) +#define COLOR_COMPRESSED RGB(0,0,255) +#define COLOR_SELECTION RGB(0,0,128) #ifdef _NO_EXTENSIONS -#define COLOR_SPLITBAR WHITE_BRUSH +#define COLOR_SPLITBAR WHITE_BRUSH #else -#define COLOR_SPLITBAR LTGRAY_BRUSH +#define COLOR_SPLITBAR LTGRAY_BRUSH #endif -#define FRM_CALC_CLIENT 0xBF83 -#define Frame_CalcFrameClient(hwnd, prt) ((BOOL)SNDMSG(hwnd, FRM_CALC_CLIENT, 0, (LPARAM)(PRECT)prt)) +#define FRM_CALC_CLIENT 0xBF83 +#define Frame_CalcFrameClient(hwnd, prt) ((BOOL)SNDMSG(hwnd, FRM_CALC_CLIENT, 0, (LPARAM)(PRECT)prt)) typedef struct { - HANDLE hInstance; - HACCEL haccel; - ATOM hframeClass; - HWND hwndParent; + HANDLE hInstance; + HACCEL haccel; + ATOM hframeClass; + HWND hwndParent; - HWND hMainWnd; - HMENU hMenuFrame; - HMENU hWindowsMenu; - HMENU hLanguageMenu; - HMENU hMenuView; - HMENU hMenuOptions; - HWND hmdiclient; - HWND hstatusbar; - HWND htoolbar; - HWND hdrivebar; - HFONT hfont; + HWND hMainWnd; + HMENU hMenuFrame; + HMENU hWindowsMenu; + HMENU hLanguageMenu; + HMENU hMenuView; + HMENU hMenuOptions; + HWND hmdiclient; + HWND hstatusbar; + HWND htoolbar; + HWND hdrivebar; + HFONT hfont; - TCHAR num_sep; - SIZE spaceSize; + TCHAR num_sep; + SIZE spaceSize; HIMAGELIST himl; - TCHAR drives[BUFFER_LEN]; - BOOL prescan_node; /*TODO*/ + TCHAR drives[BUFFER_LEN]; + BOOL prescan_node; /*TODO*/ #ifdef _SHELL_FOLDERS - IShellFolder* iDesktop; - IMalloc* iMalloc; - UINT cfStrFName; + IShellFolder* iDesktop; + IMalloc* iMalloc; + UINT cfStrFName; #endif } WINEFILE_GLOBALS;

1 0

[chorns] 16016: External modules area
by chorns＠svn.reactos.com 17 Jun '05

17 Jun '05

External modules area Modified: trunk/reactos/ReactOS.xml Added: trunk/reactos/modules/ Added: trunk/reactos/modules/directory.xml Added: trunk/reactos/modules/empty.xml _____ Modified: trunk/reactos/ReactOS.xml --- trunk/reactos/ReactOS.xml 2005-06-17 20:28:06 UTC (rev 16015) +++ trunk/reactos/ReactOS.xml 2005-06-17 20:30:57 UTC (rev 16016) @@ -57,6 +57,9 @@ <directory name="media"> <xi:include href="media/directory.xml" /> </directory> + <directory name="modules"> + <xi:include href="modules/directory.xml" /> + </directory> <directory name="ntoskrnl"> <xi:include href="ntoskrnl/ntoskrnl.xml" /> </directory> _____ Added: trunk/reactos/modules/directory.xml --- trunk/reactos/modules/directory.xml 2005-06-17 20:28:06 UTC (rev 16015) +++ trunk/reactos/modules/directory.xml 2005-06-17 20:30:57 UTC (rev 16016) @@ -0,0 +1,5 @@ +<xi:include href="rosapps/directory.xml"> + <xi:fallback> + <xi:include href="empty.xml" /> + </xi:fallback> +</xi:include> Property changes on: trunk/reactos/modules/directory.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/modules/empty.xml Property changes on: trunk/reactos/modules/empty.xml ___________________________________________________________________ Name: svn:eol-style + native

1 0

[mf] 16015: sync to Wine's latest "warning fixes"
by mf＠svn.reactos.com 17 Jun '05

17 Jun '05

sync to Wine's latest "warning fixes" Modified: trunk/reactos/subsys/system/winefile/license.c Modified: trunk/reactos/subsys/system/winefile/splitpath.c _____ Modified: trunk/reactos/subsys/system/winefile/license.c --- trunk/reactos/subsys/system/winefile/license.c 2005-06-17 20:23:31 UTC (rev 16014) +++ trunk/reactos/subsys/system/winefile/license.c 2005-06-17 20:28:06 UTC (rev 16015) @@ -16,8 +16,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "windows.h" +#include "winefile.h" +#ifdef __WINE__ + static const CHAR LicenseCaption[] = "LICENSE"; static const CHAR License[] = "This library is free software; you can redistribute it and/or " @@ -50,3 +52,5 @@ { MessageBoxA(hwnd, NoWarranty, NoWarrantyCaption, MB_ICONEXCLAMATION|MB_OK); } + +#endif _____ Modified: trunk/reactos/subsys/system/winefile/splitpath.c --- trunk/reactos/subsys/system/winefile/splitpath.c 2005-06-17 20:23:31 UTC (rev 16014) +++ trunk/reactos/subsys/system/winefile/splitpath.c 2005-06-17 20:28:06 UTC (rev 16015) @@ -16,12 +16,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define WIN32_LEAN_AND_MEAN -#define WIN32_EXTRA_LEAN +#include "winefile.h" -#include <windows.h> - #ifdef __WINE__ #ifdef UNICODE

1 0

[mf] 16014: remove old headerfile "license.h"
by mf＠svn.reactos.com 17 Jun '05

17 Jun '05

remove old headerfile "license.h" Deleted: trunk/reactos/subsys/system/winefile/license.h Modified: trunk/reactos/subsys/system/winefile/winefile.dsp _____ Deleted: trunk/reactos/subsys/system/winefile/license.h --- trunk/reactos/subsys/system/winefile/license.h 2005-06-17 20:22:08 UTC (rev 16013) +++ trunk/reactos/subsys/system/winefile/license.h 2005-06-17 20:23:31 UTC (rev 16014) @@ -1,24 +0,0 @@ -VOID WineLicense(HWND hWnd, LPCSTR lpszLanguage); -VOID WineWarranty(HWND hWnd, LPCSTR language); - -typedef struct -{ - LPCSTR License, LicenseCaption; - LPCSTR Warranty, WarrantyCaption; -} LICENSE; - -extern LICENSE WineLicense_Cz; -extern LICENSE WineLicense_Da; -extern LICENSE WineLicense_De; -extern LICENSE WineLicense_En; -extern LICENSE WineLicense_Eo; -extern LICENSE WineLicense_Es; -extern LICENSE WineLicense_Fi; -extern LICENSE WineLicense_Fr; -extern LICENSE WineLicense_Hu; -extern LICENSE WineLicense_It; -extern LICENSE WineLicense_Ko; -extern LICENSE WineLicense_No; -extern LICENSE WineLicense_Pl; -extern LICENSE WineLicense_Po; -extern LICENSE WineLicense_Va; _____ Modified: trunk/reactos/subsys/system/winefile/winefile.dsp --- trunk/reactos/subsys/system/winefile/winefile.dsp 2005-06-17 20:22:08 UTC (rev 16013) +++ trunk/reactos/subsys/system/winefile/winefile.dsp 2005-06-17 20:23:31 UTC (rev 16014) @@ -251,10 +251,6 @@ # End Source File # Begin Source File -SOURCE=.\license.h -# End Source File -# Begin Source File - SOURCE=.\resource.h # End Source File # Begin Source File

1 0

[mf] 16013: Update Copyright information from Wine's repository
by mf＠svn.reactos.com 17 Jun '05

17 Jun '05

Update Copyright information from Wine's repository Modified: trunk/reactos/subsys/system/winefile/cs.rc _____ Modified: trunk/reactos/subsys/system/winefile/cs.rc --- trunk/reactos/subsys/system/winefile/cs.rc 2005-06-17 20:09:20 UTC (rev 16012) +++ trunk/reactos/subsys/system/winefile/cs.rc 2005-06-17 20:22:08 UTC (rev 16013) @@ -2,6 +2,10 @@ * WineFile * Czech Language Support * + * Copyright 2000 Martin Fuchs + * Copyright 2002 Steven Edwards + * Copyright 2002 Alexandre Julliard + * Copyright 2004 David Kredba * Copyright 2005 Denzil <d3nzil(a)gmail.com> * * This library is free software; you can redistribute it and/or

1 0

[navaraf] 16012: Add definition of PKBUGCHECK_REASON_CALLBACK_ROUTINE, KBUGCHECK_REASON_CALLBACK_RECORD and KBUGCHECK_CALLBACK_REASON.
by navaraf＠svn.reactos.com 17 Jun '05

17 Jun '05

Add definition of PKBUGCHECK_REASON_CALLBACK_ROUTINE, KBUGCHECK_REASON_CALLBACK_RECORD and KBUGCHECK_CALLBACK_REASON. Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2005-06-17 20:01:51 UTC (rev 16011) +++ trunk/reactos/w32api/include/ddk/winddk.h 2005-06-17 20:09:20 UTC (rev 16012) @@ -3933,12 +3933,35 @@ PVOID Parameter; } WORK_QUEUE_ITEM, *PWORK_QUEUE_ITEM; +typedef enum _KBUGCHECK_CALLBACK_REASON { + KbCallbackInvalid, + KbCallbackReserved1, + KbCallbackSecondaryDumpData, + KbCallbackDumpIo, +} KBUGCHECK_CALLBACK_REASON; + +typedef VOID +(DDKAPI *PKBUGCHECK_REASON_CALLBACK_ROUTINE)( + IN KBUGCHECK_CALLBACK_REASON Reason, + IN struct _KBUGCHECK_REASON_CALLBACK_RECORD *Record, + IN OUT PVOID ReasonSpecificData, + IN ULONG ReasonSpecificDataLength); + +typedef struct _KBUGCHECK_REASON_CALLBACK_RECORD { + LIST_ENTRY Entry; + PKBUGCHECK_REASON_CALLBACK_ROUTINE CallbackRoutine; + PUCHAR Component; + ULONG_PTR Checksum; + KBUGCHECK_CALLBACK_REASON Reason; + UCHAR State; +} KBUGCHECK_REASON_CALLBACK_RECORD, *PKBUGCHECK_REASON_CALLBACK_RECORD; + typedef enum _KBUGCHECK_BUFFER_DUMP_STATE { - BufferEmpty, - BufferInserted, - BufferStarted, - BufferFinished, - BufferIncomplete + BufferEmpty, + BufferInserted, + BufferStarted, + BufferFinished, + BufferIncomplete } KBUGCHECK_BUFFER_DUMP_STATE; typedef VOID

1 0

[navaraf] 16011: Cleanup the indenting of HAL types and move the STDCALL/FASTCALL keywords at the right place in the declarations.
by navaraf＠svn.reactos.com 17 Jun '05

17 Jun '05

Cleanup the indenting of HAL types and move the STDCALL/FASTCALL keywords at the right place in the declarations. Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2005-06-17 19:43:51 UTC (rev 16010) +++ trunk/reactos/w32api/include/ddk/winddk.h 2005-06-17 20:01:51 UTC (rev 16011) @@ -2082,66 +2082,62 @@ } ARBITER_INTERFACE, *PARBITER_INTERFACE; typedef enum _HAL_QUERY_INFORMATION_CLASS { - HalInstalledBusInformation, - HalProfileSourceInformation, - HalInformationClassUnused1, - HalPowerInformation, - HalProcessorSpeedInformation, - HalCallbackInformation, - HalMapRegisterInformation, - HalMcaLogInformation, - HalFrameBufferCachingInformation, - HalDisplayBiosInformation, - HalProcessorFeatureInformation, - HalNumaTopologyInterface, - HalErrorInformation, - HalCmcLogInformation, - HalCpeLogInformation, - HalQueryMcaInterface, - HalQueryAMLIIllegalIOPortAddresses, - HalQueryMaxHotPlugMemoryAddress, - HalPartitionIpiInterface, - HalPlatformInformation, - HalQueryProfileSourceList + HalInstalledBusInformation, + HalProfileSourceInformation, + HalInformationClassUnused1, + HalPowerInformation, + HalProcessorSpeedInformation, + HalCallbackInformation, + HalMapRegisterInformation, + HalMcaLogInformation, + HalFrameBufferCachingInformation, + HalDisplayBiosInformation, + HalProcessorFeatureInformation, + HalNumaTopologyInterface, + HalErrorInformation, + HalCmcLogInformation, + HalCpeLogInformation, + HalQueryMcaInterface, + HalQueryAMLIIllegalIOPortAddresses, + HalQueryMaxHotPlugMemoryAddress, + HalPartitionIpiInterface, + HalPlatformInformation, + HalQueryProfileSourceList } HAL_QUERY_INFORMATION_CLASS, *PHAL_QUERY_INFORMATION_CLASS; typedef enum _HAL_SET_INFORMATION_CLASS { - HalProfileSourceInterval, - HalProfileSourceInterruptHandler, - HalMcaRegisterDriver, - HalKernelErrorHandler, - HalCmcRegisterDriver, - HalCpeRegisterDriver, - HalMcaLog, - HalCmcLog, - HalCpeLog, - HalGenerateCmcInterrupt + HalProfileSourceInterval, + HalProfileSourceInterruptHandler, + HalMcaRegisterDriver, + HalKernelErrorHandler, + HalCmcRegisterDriver, + HalCpeRegisterDriver, + HalMcaLog, + HalCmcLog, + HalCpeLog, + HalGenerateCmcInterrupt } HAL_SET_INFORMATION_CLASS, *PHAL_SET_INFORMATION_CLASS; /* Function Type Defintions for Dispatch Functions */ -typedef -VOID -(*PDEVICE_CONTROL_COMPLETION)( - IN struct _DEVICE_CONTROL_CONTEXT *ControlContext - ); +typedef VOID +(DDKAPI *PDEVICE_CONTROL_COMPLETION)( + IN struct _DEVICE_CONTROL_CONTEXT *ControlContext); -typedef struct _DEVICE_CONTROL_CONTEXT -{ - NTSTATUS Status; - PDEVICE_HANDLER_OBJECT DeviceHandler; - PDEVICE_OBJECT DeviceObject; - ULONG ControlCode; - PVOID Buffer; - PULONG BufferLength; - PVOID Context; +typedef struct _DEVICE_CONTROL_CONTEXT { + NTSTATUS Status; + PDEVICE_HANDLER_OBJECT DeviceHandler; + PDEVICE_OBJECT DeviceObject; + ULONG ControlCode; + PVOID Buffer; + PULONG BufferLength; + PVOID Context; } DEVICE_CONTROL_CONTEXT, *PDEVICE_CONTROL_CONTEXT; -typedef struct _PM_DISPATCH_TABLE -{ - ULONG Signature; - ULONG Version; - PVOID Function[1]; +typedef struct _PM_DISPATCH_TABLE { + ULONG Signature; + ULONG Version; + PVOID Function[1]; } PM_DISPATCH_TABLE, *PPM_DISPATCH_TABLE; typedef enum _RESOURCE_TRANSLATION_DIRECTION { @@ -2177,145 +2173,160 @@ PTRANSLATE_RESOURCE_REQUIREMENTS_HANDLER TranslateResourceRequirements; } TRANSLATOR_INTERFACE, *PTRANSLATOR_INTERFACE; -typedef NTSTATUS STDCALL -(*pHalDeviceControl)(IN PDEVICE_HANDLER_OBJECT DeviceHandler, - IN PDEVICE_OBJECT DeviceObject, - IN ULONG ControlCode, - IN OUT PVOID Buffer OPTIONAL, - IN OUT PULONG BufferLength OPTIONAL, - IN PVOID Context, - IN PDEVICE_CONTROL_COMPLETION CompletionRoutine); +typedef NTSTATUS +(DDKAPI *pHalDeviceControl)( + IN PDEVICE_HANDLER_OBJECT DeviceHandler, + IN PDEVICE_OBJECT DeviceObject, + IN ULONG ControlCode, + IN OUT PVOID Buffer OPTIONAL, + IN OUT PULONG BufferLength OPTIONAL, + IN PVOID Context, + IN PDEVICE_CONTROL_COMPLETION CompletionRoutine); -typedef VOID FASTCALL -(*pHalExamineMBR)(IN PDEVICE_OBJECT DeviceObject, - IN ULONG SectorSize, - IN ULONG MBRTypeIdentifier, - OUT PVOID *Buffer); +typedef VOID +(DDKFASTAPI *pHalExamineMBR)( + IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + IN ULONG MBRTypeIdentifier, + OUT PVOID *Buffer); -typedef VOID FASTCALL -(*pHalIoAssignDriveLetters)(IN struct _LOADER_PARAMETER_BLOCK *LoaderBlock, - IN PSTRING NtDeviceName, - OUT PUCHAR NtSystemPath, - OUT PSTRING NtSystemPathString); +typedef VOID +(DDKFASTAPI *pHalIoAssignDriveLetters)( + IN struct _LOADER_PARAMETER_BLOCK *LoaderBlock, + IN PSTRING NtDeviceName, + OUT PUCHAR NtSystemPath, + OUT PSTRING NtSystemPathString); -typedef NTSTATUS FASTCALL -(*pHalIoReadPartitionTable)(IN PDEVICE_OBJECT DeviceObject, - IN ULONG SectorSize, - IN BOOLEAN ReturnRecognizedPartitions, - OUT PDRIVE_LAYOUT_INFORMATION *PartitionBuffer); +typedef NTSTATUS +(DDKFASTAPI *pHalIoReadPartitionTable)( + IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + IN BOOLEAN ReturnRecognizedPartitions, + OUT PDRIVE_LAYOUT_INFORMATION *PartitionBuffer); -typedef NTSTATUS FASTCALL -(*pHalIoSetPartitionInformation)(IN PDEVICE_OBJECT DeviceObject, - IN ULONG SectorSize, - IN ULONG PartitionNumber, - IN ULONG PartitionType); +typedef NTSTATUS +(DDKFASTAPI *pHalIoSetPartitionInformation)( + IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + IN ULONG PartitionNumber, + IN ULONG PartitionType); -typedef NTSTATUS FASTCALL -(*pHalIoWritePartitionTable)(IN PDEVICE_OBJECT DeviceObject, - IN ULONG SectorSize, - IN ULONG SectorsPerTrack, - IN ULONG NumberOfHeads, - IN PDRIVE_LAYOUT_INFORMATION PartitionBuffer); +typedef NTSTATUS +(DDKFASTAPI *pHalIoWritePartitionTable)( + IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + IN ULONG SectorsPerTrack, + IN ULONG NumberOfHeads, + IN PDRIVE_LAYOUT_INFORMATION PartitionBuffer); -typedef PBUS_HANDLER FASTCALL -(*pHalHandlerForBus)(IN INTERFACE_TYPE InterfaceType, - IN ULONG BusNumber); +typedef PBUS_HANDLER +(DDKFASTAPI *pHalHandlerForBus)( + IN INTERFACE_TYPE InterfaceType, + IN ULONG BusNumber); -typedef VOID FASTCALL -(*pHalReferenceBusHandler)(IN PBUS_HANDLER BusHandler); +typedef VOID +(DDKFASTAPI *pHalReferenceBusHandler)( + IN PBUS_HANDLER BusHandler); -typedef NTSTATUS STDCALL -(*pHalQuerySystemInformation)(IN HAL_QUERY_INFORMATION_CLASS InformationClass, - IN ULONG BufferSize, - IN OUT PVOID Buffer, - OUT PULONG ReturnedLength); +typedef NTSTATUS +(DDKAPI *pHalQuerySystemInformation)( + IN HAL_QUERY_INFORMATION_CLASS InformationClass, + IN ULONG BufferSize, + IN OUT PVOID Buffer, + OUT PULONG ReturnedLength); +typedef NTSTATUS +(DDKAPI *pHalSetSystemInformation)( + IN HAL_SET_INFORMATION_CLASS InformationClass, + IN ULONG BufferSize, + IN PVOID Buffer); -typedef NTSTATUS STDCALL -(*pHalSetSystemInformation)(IN HAL_SET_INFORMATION_CLASS InformationClass, - IN ULONG BufferSize, - IN PVOID Buffer); +typedef NTSTATUS +(DDKAPI *pHalQueryBusSlots)( + IN PBUS_HANDLER BusHandler, + IN ULONG BufferSize, + OUT PULONG SlotNumbers, + OUT PULONG ReturnedLength); - -typedef NTSTATUS STDCALL -(*pHalQueryBusSlots)(IN PBUS_HANDLER BusHandler, - IN ULONG BufferSize, - OUT PULONG SlotNumbers, - OUT PULONG ReturnedLength); - -typedef NTSTATUS STDCALL -(*pHalInitPnpDriver)(VOID); +typedef NTSTATUS +(DDKAPI *pHalInitPnpDriver)( + VOID); -typedef NTSTATUS STDCALL -(*pHalInitPowerManagement)(IN PPM_DISPATCH_TABLE PmDriverDispatchTable, - OUT PPM_DISPATCH_TABLE *PmHalDispatchTable); +typedef NTSTATUS +(DDKAPI *pHalInitPowerManagement)( + IN PPM_DISPATCH_TABLE PmDriverDispatchTable, + OUT PPM_DISPATCH_TABLE *PmHalDispatchTable); -typedef struct _DMA_ADAPTER * STDCALL -(*pHalGetDmaAdapter)(IN PVOID Context, - IN struct _DEVICE_DESCRIPTION *DeviceDescriptor, - OUT PULONG NumberOfMapRegisters); +typedef struct _DMA_ADAPTER* +(DDKAPI *pHalGetDmaAdapter)( + IN PVOID Context, + IN struct _DEVICE_DESCRIPTION *DeviceDescriptor, + OUT PULONG NumberOfMapRegisters); -typedef NTSTATUS STDCALL -(*pHalGetInterruptTranslator)(IN INTERFACE_TYPE ParentInterfaceType, - IN ULONG ParentBusNumber, - IN INTERFACE_TYPE BridgeInterfaceType, - IN USHORT Size, - IN USHORT Version, - OUT PTRANSLATOR_INTERFACE Translator, - OUT PULONG BridgeBusNumber); +typedef NTSTATUS +(DDKAPI *pHalGetInterruptTranslator)( + IN INTERFACE_TYPE ParentInterfaceType, + IN ULONG ParentBusNumber, + IN INTERFACE_TYPE BridgeInterfaceType, + IN USHORT Size, + IN USHORT Version, + OUT PTRANSLATOR_INTERFACE Translator, + OUT PULONG BridgeBusNumber); -typedef NTSTATUS STDCALL (*pHalStartMirroring)(VOID); +typedef NTSTATUS +(DDKAPI *pHalStartMirroring)( + VOID); -typedef NTSTATUS STDCALL (*pHalEndMirroring)(IN ULONG PassNumber); +typedef NTSTATUS +(DDKAPI *pHalEndMirroring)( + IN ULONG PassNumber); -typedef NTSTATUS STDCALL -(*pHalMirrorPhysicalMemory)(IN PHYSICAL_ADDRESS PhysicalAddress, - IN LARGE_INTEGER NumberOfBytes); +typedef NTSTATUS +(DDKAPI *pHalMirrorPhysicalMemory)( + IN PHYSICAL_ADDRESS PhysicalAddress, + IN LARGE_INTEGER NumberOfBytes); -typedef NTSTATUS STDCALL -(*pHalMirrorVerify)(IN PHYSICAL_ADDRESS PhysicalAddress, - IN LARGE_INTEGER NumberOfBytes); +typedef NTSTATUS +(DDKAPI *pHalMirrorVerify)( + IN PHYSICAL_ADDRESS PhysicalAddress, + IN LARGE_INTEGER NumberOfBytes); -typedef VOID STDCALL -(*pHalEndOfBoot)(VOID); +typedef VOID +(DDKAPI *pHalEndOfBoot)( + VOID); -typedef BOOLEAN STDCALL -(*PHAL_RESET_DISPLAY_PARAMETERS)(ULONG Columns, ULONG Rows); +typedef BOOLEAN +(DDKAPI *PHAL_RESET_DISPLAY_PARAMETERS)( + ULONG Columns, ULONG Rows); typedef struct { - ULONG Version; - pHalQuerySystemInformation HalQuerySystemInformation; - pHalSetSystemInformation HalSetSystemInformation; - pHalQueryBusSlots HalQueryBusSlots; - ULONG Spare1; - pHalExamineMBR HalExamineMBR; - pHalIoAssignDriveLetters HalIoAssignDriveLetters; - pHalIoReadPartitionTable HalIoReadPartitionTable; - pHalIoSetPartitionInformation HalIoSetPartitionInformation; - pHalIoWritePartitionTable HalIoWritePartitionTable; - - pHalHandlerForBus HalReferenceHandlerForBus; - pHalReferenceBusHandler HalReferenceBusHandler; - pHalReferenceBusHandler HalDereferenceBusHandler; - - pHalInitPnpDriver HalInitPnpDriver; - pHalInitPowerManagement HalInitPowerManagement; - - pHalGetDmaAdapter HalGetDmaAdapter; - pHalGetInterruptTranslator HalGetInterruptTranslator; - - pHalStartMirroring HalStartMirroring; - pHalEndMirroring HalEndMirroring; - pHalMirrorPhysicalMemory HalMirrorPhysicalMemory; - pHalEndOfBoot HalEndOfBoot; - pHalMirrorVerify HalMirrorVerify; - + ULONG Version; + pHalQuerySystemInformation HalQuerySystemInformation; + pHalSetSystemInformation HalSetSystemInformation; + pHalQueryBusSlots HalQueryBusSlots; + ULONG Spare1; + pHalExamineMBR HalExamineMBR; + pHalIoAssignDriveLetters HalIoAssignDriveLetters; + pHalIoReadPartitionTable HalIoReadPartitionTable; + pHalIoSetPartitionInformation HalIoSetPartitionInformation; + pHalIoWritePartitionTable HalIoWritePartitionTable; + pHalHandlerForBus HalReferenceHandlerForBus; + pHalReferenceBusHandler HalReferenceBusHandler; + pHalReferenceBusHandler HalDereferenceBusHandler; + pHalInitPnpDriver HalInitPnpDriver; + pHalInitPowerManagement HalInitPowerManagement; + pHalGetDmaAdapter HalGetDmaAdapter; + pHalGetInterruptTranslator HalGetInterruptTranslator; + pHalStartMirroring HalStartMirroring; + pHalEndMirroring HalEndMirroring; + pHalMirrorPhysicalMemory HalMirrorPhysicalMemory; + pHalEndOfBoot HalEndOfBoot; + pHalMirrorVerify HalMirrorVerify; } HAL_DISPATCH, *PHAL_DISPATCH; +extern HAL_DISPATCH HalDispatchTable; +#define HALDISPATCH HalDispatchTable -extern HAL_DISPATCH HalDispatchTable; -#define HALDISPATCH HalDispatchTable - typedef enum _FILE_INFORMATION_CLASS { FileDirectoryInformation = 1, FileFullDirectoryInformation, @@ -6230,7 +6241,7 @@ IN PDEVICE_OBJECT DeviceObject, IN ULONG SectorSize, IN ULONG MBRTypeIdentifier, - OUT PVOID Buffer); + OUT PVOID *Buffer); NTOSAPI VOID

1 0

[navaraf] 16010: Remove definiton of PHAL_RESET_DISPLAY_PARAMETERS.
by navaraf＠svn.reactos.com 17 Jun '05

17 Jun '05

Remove definiton of PHAL_RESET_DISPLAY_PARAMETERS. Modified: trunk/reactos/drivers/video/videoprt/dispatch.c _____ Modified: trunk/reactos/drivers/video/videoprt/dispatch.c --- trunk/reactos/drivers/video/videoprt/dispatch.c 2005-06-17 19:27:49 UTC (rev 16009) +++ trunk/reactos/drivers/video/videoprt/dispatch.c 2005-06-17 19:43:51 UTC (rev 16010) @@ -25,7 +25,6 @@ /* EXTERNAL FUNCTIONS *********************************************************/ -typedef PVOID PHAL_RESET_DISPLAY_PARAMETERS; VOID STDCALL HalAcquireDisplayOwnership(IN PHAL_RESET_DISPLAY_PARAMETERS ResetDisplayParameters); VOID STDCALL HalReleaseDisplayOwnership();

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
65
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2005