ReactOS.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
List overview
Download
Ros-diffs
November 2005
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
ros-diffs@reactos.org
27 participants
875 discussions
Start a n
N
ew thread
[ion] 19732: - Support INIT section pragmas for msvc. Patch by Brezenbak.
by ion@svn.reactos.com
- Support INIT section pragmas for msvc. Patch by Brezenbak. Modified: trunk/reactos/ntoskrnl/cc/view.c Modified: trunk/reactos/ntoskrnl/cm/import.c Modified: trunk/reactos/ntoskrnl/cm/registry.c Modified: trunk/reactos/ntoskrnl/ex/callback.c Modified: trunk/reactos/ntoskrnl/ex/event.c Modified: trunk/reactos/ntoskrnl/ex/evtpair.c Modified: trunk/reactos/ntoskrnl/ex/init.c Modified: trunk/reactos/ntoskrnl/ex/lookas.c Modified: trunk/reactos/ntoskrnl/ex/mutant.c Modified: trunk/reactos/ntoskrnl/ex/profile.c Modified: trunk/reactos/ntoskrnl/ex/sem.c Modified: trunk/reactos/ntoskrnl/ex/time.c Modified: trunk/reactos/ntoskrnl/ex/timer.c Modified: trunk/reactos/ntoskrnl/ex/uuid.c Modified: trunk/reactos/ntoskrnl/ex/win32k.c Modified: trunk/reactos/ntoskrnl/ex/work.c Modified: trunk/reactos/ntoskrnl/fs/filelock.c Modified: trunk/reactos/ntoskrnl/fs/notify.c Modified: trunk/reactos/ntoskrnl/fs/util.c Modified: trunk/reactos/ntoskrnl/inbv/inbv.c Modified: trunk/reactos/ntoskrnl/io/arcname.c Modified: trunk/reactos/ntoskrnl/io/bootlog.c Modified: trunk/reactos/ntoskrnl/io/driver.c Modified: trunk/reactos/ntoskrnl/io/fs.c Modified: trunk/reactos/ntoskrnl/io/iomgr.c Modified: trunk/reactos/ntoskrnl/io/plugplay.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpnotify.c Modified: trunk/reactos/ntoskrnl/io/vpb.c Modified: trunk/reactos/ntoskrnl/kd/kdinit.c Modified: trunk/reactos/ntoskrnl/ke/bug.c Modified: trunk/reactos/ntoskrnl/ke/clock.c Modified: trunk/reactos/ntoskrnl/ke/device.c Modified: trunk/reactos/ntoskrnl/ke/dpc.c Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c Modified: trunk/reactos/ntoskrnl/ke/i386/tss.c Modified: trunk/reactos/ntoskrnl/ke/i386/vdm.c Modified: trunk/reactos/ntoskrnl/ke/main.c Modified: trunk/reactos/ntoskrnl/ke/usercall.c Modified: trunk/reactos/ntoskrnl/ldr/loader.c Modified: trunk/reactos/ntoskrnl/lpc/port.c Modified: trunk/reactos/ntoskrnl/mm/aspace.c Modified: trunk/reactos/ntoskrnl/mm/balance.c Modified: trunk/reactos/ntoskrnl/mm/freelist.c Modified: trunk/reactos/ntoskrnl/mm/i386/page.c Modified: trunk/reactos/ntoskrnl/mm/marea.c Modified: trunk/reactos/ntoskrnl/mm/mdl.c Modified: trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/ntoskrnl/mm/npool.c Modified: trunk/reactos/ntoskrnl/mm/pagefile.c Modified: trunk/reactos/ntoskrnl/mm/pageop.c Modified: trunk/reactos/ntoskrnl/mm/ppool.c Modified: trunk/reactos/ntoskrnl/mm/process.c Modified: trunk/reactos/ntoskrnl/mm/rmap.c Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/ob/namespc.c Modified: trunk/reactos/ntoskrnl/ob/symlink.c Modified: trunk/reactos/ntoskrnl/po/power.c Modified: trunk/reactos/ntoskrnl/ps/idle.c Modified: trunk/reactos/ntoskrnl/ps/job.c Modified: trunk/reactos/ntoskrnl/ps/locale.c Modified: trunk/reactos/ntoskrnl/ps/process.c Modified: trunk/reactos/ntoskrnl/ps/psmgr.c Modified: trunk/reactos/ntoskrnl/rtl/nls.c Modified: trunk/reactos/ntoskrnl/se/acl.c Modified: trunk/reactos/ntoskrnl/se/luid.c Modified: trunk/reactos/ntoskrnl/se/priv.c Modified: trunk/reactos/ntoskrnl/se/sd.c Modified: trunk/reactos/ntoskrnl/se/semgr.c Modified: trunk/reactos/ntoskrnl/se/sid.c Modified: trunk/reactos/ntoskrnl/se/token.c _____ Modified: trunk/reactos/ntoskrnl/cc/view.c --- trunk/reactos/ntoskrnl/cc/view.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/cc/view.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -36,6 +36,10 @@ #define NDEBUG #include <internal/debug.h> +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, CcInitView) +#endif + /* GLOBALS *******************************************************************/ /* _____ Modified: trunk/reactos/ntoskrnl/cm/import.c --- trunk/reactos/ntoskrnl/cm/import.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/cm/import.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -16,6 +16,10 @@ #include "cm.h" +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, CmImportHardwareHive) +#endif + /* GLOBALS ******************************************************************/ static BOOLEAN CmiHardwareHiveImported = FALSE; _____ Modified: trunk/reactos/ntoskrnl/cm/registry.c --- trunk/reactos/ntoskrnl/cm/registry.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/cm/registry.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -16,6 +16,13 @@ #include "cm.h" +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, CmInitHives) +#pragma alloc_text(INIT, CmInitializeRegistry) +#pragma alloc_text(INIT, CmInit2) +#endif + + /* GLOBALS ******************************************************************/ POBJECT_TYPE CmiKeyType = NULL; _____ Modified: trunk/reactos/ntoskrnl/ex/callback.c --- trunk/reactos/ntoskrnl/ex/callback.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/ex/callback.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -12,6 +12,11 @@ #define NDEBUG #include <internal/debug.h> +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, ExpInitializeCallbacks) +#endif + + /* TYPES ********************************************************************/ /* Mapping for Callback Object */ _____ Modified: trunk/reactos/ntoskrnl/ex/event.c --- trunk/reactos/ntoskrnl/ex/event.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/ex/event.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -14,6 +14,10 @@ #define NDEBUG #include <internal/debug.h> +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, ExpInitializeEventImplementation) +#endif + /* GLOBALS *******************************************************************/ POBJECT_TYPE ExEventObjectType = NULL; _____ Modified: trunk/reactos/ntoskrnl/ex/evtpair.c --- trunk/reactos/ntoskrnl/ex/evtpair.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/ex/evtpair.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -16,6 +16,10 @@ #define NDEBUG #include <internal/debug.h> +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, ExpInitializeEventPairImplementation) +#endif + /* GLOBALS *******************************************************************/ POBJECT_TYPE ExEventPairObjectType = NULL; _____ Modified: trunk/reactos/ntoskrnl/ex/init.c --- trunk/reactos/ntoskrnl/ex/init.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/ex/init.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -32,6 +32,18 @@ VOID PspPostInitSystemProcess(VOID); +static VOID INIT_FUNCTION InitSystemSharedUserPage (PCSZ ParameterLine); +VOID INIT_FUNCTION ExpDisplayNotice(VOID); +INIT_FUNCTION NTSTATUS ExpLoadInitialProcess(PHANDLE ProcessHandle, PHANDLE ThreadHandle); + +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, InitSystemSharedUserPage) +#pragma alloc_text(INIT, ExpDisplayNotice) +#pragma alloc_text(INIT, ExpLoadInitialProcess) +#pragma alloc_text(INIT, ExpInitializeExecutive) +#pragma alloc_text(INIT, ExInit2) +#endif + /* FUNCTIONS ****************************************************************/ static _____ Modified: trunk/reactos/ntoskrnl/ex/lookas.c --- trunk/reactos/ntoskrnl/ex/lookas.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/ex/lookas.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -15,6 +15,10 @@ #define NDEBUG #include <internal/debug.h> +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, ExpInitLookasideLists) +#endif + /* GLOBALS *******************************************************************/ LIST_ENTRY ExpNonPagedLookasideListHead; _____ Modified: trunk/reactos/ntoskrnl/ex/mutant.c --- trunk/reactos/ntoskrnl/ex/mutant.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/ex/mutant.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -15,6 +15,10 @@ #define NDEBUG #include <internal/debug.h> +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, ExpInitializeMutantImplementation) +#endif + #ifndef MUTANT_INCREMENT #define MUTANT_INCREMENT 1 #endif _____ Modified: trunk/reactos/ntoskrnl/ex/profile.c --- trunk/reactos/ntoskrnl/ex/profile.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/ex/profile.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -13,6 +13,10 @@ #include <ntoskrnl.h> #include <internal/debug.h> +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, ExpInitializeProfileImplementation) +#endif + /* FIXME: NDK This structure is a *GUESS* -- Alex */ typedef struct _EPROFILE { PEPROCESS Process; _____ Modified: trunk/reactos/ntoskrnl/ex/sem.c --- trunk/reactos/ntoskrnl/ex/sem.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/ex/sem.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -14,6 +14,10 @@ #define NDEBUG #include <internal/debug.h> +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, ExpInitializeSemaphoreImplementation() +#endif + /* GLOBALS ******************************************************************/ POBJECT_TYPE ExSemaphoreObjectType; _____ Modified: trunk/reactos/ntoskrnl/ex/time.c --- trunk/reactos/ntoskrnl/ex/time.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/ex/time.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -17,6 +17,10 @@ #define TICKSPERMINUTE 600000000 +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, ExpInitTimeZoneInfo) +#endif + /* GLOBALS ******************************************************************/ /* Note: Bias[minutes] = UTC - local time */ _____ Modified: trunk/reactos/ntoskrnl/ex/timer.c --- trunk/reactos/ntoskrnl/ex/timer.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/ex/timer.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -14,6 +14,11 @@ #define NDEBUG #include <internal/debug.h> +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, ExpInitializeTimerImplementation) +#endif + + /* TYPES ********************************************************************/ /* Executive Timer Object */ _____ Modified: trunk/reactos/ntoskrnl/ex/uuid.c --- trunk/reactos/ntoskrnl/ex/uuid.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/ex/uuid.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -26,7 +26,11 @@ #define SECS_15_OCT_1582_TO_1601 ((17 + 30 + 31 + 365 * 18 + 5) * SECSPERDAY) #define TICKS_15_OCT_1582_TO_1601 ((ULONGLONG)SECS_15_OCT_1582_TO_1601 * TICKSPERSEC) +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, ExpInitUuids) +#endif + /* GLOBALS ****************************************************************/ static FAST_MUTEX UuidMutex; _____ Modified: trunk/reactos/ntoskrnl/ex/win32k.c --- trunk/reactos/ntoskrnl/ex/win32k.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/ex/win32k.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -13,6 +13,10 @@ #define NDEBUG #include <internal/debug.h> +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, ExpWin32kInit) +#endif + /* DATA **********************************************************************/ POBJECT_TYPE ExWindowStationObjectType = NULL; _____ Modified: trunk/reactos/ntoskrnl/ex/work.c --- trunk/reactos/ntoskrnl/ex/work.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/ex/work.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -14,6 +14,10 @@ #define NDEBUG #include <internal/debug.h> +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, ExpInitializeWorkerThreads) +#endif + /* DEFINES *******************************************************************/ #define NUMBER_OF_WORKER_THREADS (5) _____ Modified: trunk/reactos/ntoskrnl/fs/filelock.c --- trunk/reactos/ntoskrnl/fs/filelock.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/fs/filelock.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -12,6 +12,11 @@ #define NDEBUG #include <internal/debug.h> +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, FsRtlpInitFileLockingImplementation) +#endif + + /* NOTE: I'm not using resource syncronization here, since FsRtlFastCheckLockForRead/Write _____ Modified: trunk/reactos/ntoskrnl/fs/notify.c --- trunk/reactos/ntoskrnl/fs/notify.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/fs/notify.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -13,7 +13,11 @@ //#define NDEBUG #include <internal/debug.h> +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, FsRtlpInitNotifyImplementation) +#endif + PAGED_LOOKASIDE_LIST NotifyEntryLookaside; typedef struct _NOTIFY_ENTRY @@ -61,7 +65,7 @@ static -inline +__inline BOOLEAN FsRtlpIsUnicodePath( PSTRING Path @@ -593,7 +597,7 @@ static -inline +__inline VOID FsRtlpCopyName( PFILE_NOTIFY_INFORMATION CurrentEntry, _____ Modified: trunk/reactos/ntoskrnl/fs/util.c --- trunk/reactos/ntoskrnl/fs/util.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/fs/util.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -21,9 +21,14 @@ /* GLOBALS *******************************************************************/ BOOLEAN STDCALL MmIsFileAPagingFile(PFILE_OBJECT FileObject); +VOID STDCALL INIT_FUNCTION RtlpInitializeResources(VOID); static ULONG FsRtlpAllocatedResources = 0; static PERESOURCE FsRtlpResources; +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, RtlpInitializeResources) +#endif + /* PRIVATE FUNCTIONS**********************************************************/ VOID _____ Modified: trunk/reactos/ntoskrnl/inbv/inbv.c --- trunk/reactos/ntoskrnl/inbv/inbv.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/inbv/inbv.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -15,7 +15,11 @@ #define NDEBUG #include <internal/debug.h> +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, InbvEnableBootDriver) +#endif + /* GLOBALS *******************************************************************/ /* DATA **********************************************************************/ _____ Modified: trunk/reactos/ntoskrnl/io/arcname.c --- trunk/reactos/ntoskrnl/io/arcname.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/io/arcname.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -15,6 +15,38 @@ #define NDEBUG #include <internal/debug.h> +static NTSTATUS +STDCALL INIT_FUNCTION +DiskQueryRoutine(PWSTR ValueName, + ULONG ValueType, + PVOID ValueData, + ULONG ValueLength, + PVOID Context, + PVOID EntryContext); + +static VOID INIT_FUNCTION +IopEnumerateBiosDisks(PLIST_ENTRY ListHead); + +static VOID INIT_FUNCTION +IopEnumerateDisks(PLIST_ENTRY ListHead); + +static NTSTATUS INIT_FUNCTION +IopAssignArcNamesToDisk(PDEVICE_OBJECT DeviceObject, ULONG RDisk, ULONG DiskNumber); + +static NTSTATUS INIT_FUNCTION +IopCheckCdromDevices(PULONG DeviceNumber); + +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, DiskQueryRoutine) +#pragma alloc_text(INIT, IopEnumerateBiosDisks) +#pragma alloc_text(INIT, IopEnumerateDisks) +#pragma alloc_text(INIT, IopAssignArcNamesToDisk) +#pragma alloc_text(INIT, IoCreateArcNames) +#pragma alloc_text(INIT, IopCheckCdromDevices) +#pragma alloc_text(INIT, IoCreateSystemRootLink) +#endif + + /* MACROS *******************************************************************/ #define FS_VOLUME_BUFFER_SIZE (MAX_PATH + sizeof(FILE_FS_VOLUME_INFORMATION)) _____ Modified: trunk/reactos/ntoskrnl/io/bootlog.c --- trunk/reactos/ntoskrnl/io/bootlog.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/io/bootlog.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -14,6 +14,10 @@ #define NDEBUG #include <internal/debug.h> +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, IopInitBootLog) +#pragma alloc_text(INIT, IopStartBootLog() +#endif /* GLOBALS ******************************************************************/ _____ Modified: trunk/reactos/ntoskrnl/io/driver.c --- trunk/reactos/ntoskrnl/io/driver.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/io/driver.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -19,11 +19,6 @@ extern ULONG KeTickCount; extern BOOLEAN SetupMode; -NTSTATUS -LdrProcessModule(PVOID ModuleLoadBase, - PUNICODE_STRING ModuleName, - PLDR_DATA_TABLE_ENTRY *ModuleObject); - typedef struct _SERVICE_GROUP { LIST_ENTRY GroupListEntry; @@ -80,6 +75,41 @@ VOID STDCALL IopDeleteDriver(PVOID ObjectBody); +NTSTATUS +LdrProcessModule(PVOID ModuleLoadBase, + PUNICODE_STRING ModuleName, + PLDR_DATA_TABLE_ENTRY *ModuleObject); + +VOID +FASTCALL +INIT_FUNCTION +IopDisplayLoadingMessage(PVOID ServiceName, + BOOLEAN Unicode); + +static VOID INIT_FUNCTION +MiFreeBootDriverMemory(PVOID StartAddress, ULONG Length); + +NTSTATUS FASTCALL INIT_FUNCTION +IopInitializeBuiltinDriver( + PDEVICE_NODE ModuleDeviceNode, + PVOID ModuleLoadBase, + PCHAR FileName, + ULONG ModuleLength); + +static INIT_FUNCTION NTSTATUS +IopLoadDriver(PSERVICE Service); + +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, IopInitDriverImplementation) +#pragma alloc_text(INIT, IopDisplayLoadingMessage) +#pragma alloc_text(INIT, IoCreateDriverList) +#pragma alloc_text(INIT, IoDestroyDriverList) +#pragma alloc_text(INIT, MiFreeBootDriverMemory) +#pragma alloc_text(INIT, IopInitializeBuiltinDriver) +#pragma alloc_text(INIT, IopLoadDriver) +#endif + + /* PRIVATE FUNCTIONS **********************************************************/ VOID @@ -1153,7 +1183,7 @@ return(STATUS_SUCCESS); } -VOID STATIC INIT_FUNCTION +static VOID INIT_FUNCTION MiFreeBootDriverMemory(PVOID StartAddress, ULONG Length) { ULONG i; _____ Modified: trunk/reactos/ntoskrnl/io/fs.c --- trunk/reactos/ntoskrnl/io/fs.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/io/fs.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -14,6 +14,9 @@ #define NDEBUG #include <internal/debug.h> +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, IoInitFileSystemImplementation) +#endif /* TYPES *******************************************************************/ _____ Modified: trunk/reactos/ntoskrnl/io/iomgr.c --- trunk/reactos/ntoskrnl/io/iomgr.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/io/iomgr.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -40,6 +40,18 @@ NPAGED_LOOKASIDE_LIST IoLargeIrpLookaside; NPAGED_LOOKASIDE_LIST IoSmallIrpLookaside; +VOID INIT_FUNCTION IopInitLookasideLists(VOID); + +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, IoInitCancelHandling) +#pragma alloc_text(INIT, IoInitShutdownNotification) +#pragma alloc_text(INIT, IopInitLookasideLists) +#pragma alloc_text(INIT, IoInit) +#pragma alloc_text(INIT, IoInit2) +#pragma alloc_text(INIT, IoInit3) +#endif + + /* INIT FUNCTIONS ************************************************************/ VOID _____ Modified: trunk/reactos/ntoskrnl/io/plugplay.c --- trunk/reactos/ntoskrnl/io/plugplay.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/io/plugplay.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -14,6 +14,9 @@ #define NDEBUG #include <internal/debug.h> +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, IopInitPlugPlayEvents) +#endif typedef struct _PNP_EVENT_ENTRY { _____ Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c --- trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -97,7 +97,16 @@ 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D, }; +static NTSTATUS INIT_FUNCTION +IopSetRootDeviceInstanceData(PDEVICE_NODE DeviceNode); +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, IopSetRootDeviceInstanceData) +#pragma alloc_text(INIT, PnpInit) +#pragma alloc_text(INIT, PnpInit2) +#endif + + /* FUNCTIONS *****************************************************************/ PDEVICE_NODE FASTCALL _____ Modified: trunk/reactos/ntoskrnl/io/pnpnotify.c --- trunk/reactos/ntoskrnl/io/pnpnotify.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/io/pnpnotify.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -15,6 +15,11 @@ #include <ntoskrnl.h> #include <internal/debug.h> +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, IopInitPnpNotificationImplementation) +#endif + + /* TYPES *******************************************************************/ typedef struct _PNP_NOTIFY_ENTRY _____ Modified: trunk/reactos/ntoskrnl/io/vpb.c --- trunk/reactos/ntoskrnl/io/vpb.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/io/vpb.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -14,6 +14,11 @@ #define NDEBUG #include <internal/debug.h> +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, IoInitVpbImplementation) +#endif + + /* GLOBALS *******************************************************************/ static KSPIN_LOCK IoVpbLock; _____ Modified: trunk/reactos/ntoskrnl/kd/kdinit.c --- trunk/reactos/ntoskrnl/kd/kdinit.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/kd/kdinit.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -11,6 +11,11 @@ #define NDEBUG #include <internal/debug.h> +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, KdInitSystem) +#endif + + /* Make bochs debug output in the very early boot phase available */ //#define AUTO_ENABLE_BOCHS _____ Modified: trunk/reactos/ntoskrnl/ke/bug.c --- trunk/reactos/ntoskrnl/ke/bug.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/ke/bug.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -15,6 +15,10 @@ #define NDEBUG #include <internal/debug.h> +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, KiInitializeBugCheck) +#endif + /* GLOBALS ******************************************************************/ static LIST_ENTRY BugcheckCallbackListHead = {NULL,NULL}; _____ Modified: trunk/reactos/ntoskrnl/ke/clock.c --- trunk/reactos/ntoskrnl/ke/clock.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/ke/clock.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -20,6 +20,10 @@ #define NDEBUG #include <internal/debug.h> +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, KiInitializeSystemClock) +#endif + /* GLOBALS ****************************************************************/ /* _____ Modified: trunk/reactos/ntoskrnl/ke/device.c --- trunk/reactos/ntoskrnl/ke/device.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/ke/device.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -11,6 +11,11 @@ #define NDEBUG #include <internal/debug.h> +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, KeFindConfigurationEntry) +#pragma alloc_text(INIT, KeFindConfigurationNextEntry) +#endif + /* * @implemented */ _____ Modified: trunk/reactos/ntoskrnl/ke/dpc.c --- trunk/reactos/ntoskrnl/ke/dpc.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/ke/dpc.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -21,6 +21,11 @@ #define NDEBUG #include <internal/debug.h> +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, KeInitDpc) +#endif + + /* TYPES *******************************************************************/ #define MAX_QUANTUM 0x7F _____ Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c --- trunk/reactos/ntoskrnl/ke/i386/exp.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -15,6 +15,11 @@ #define NDEBUG #include <internal/debug.h> +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, KeInitExceptions) +#endif + + /* * FIXMES: * - Put back VEH. _____ Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c --- trunk/reactos/ntoskrnl/ke/i386/kernel.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/ke/i386/kernel.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -29,9 +29,20 @@ extern PVOID Ki386InitialStackArray[MAXIMUM_PROCESSORS]; extern ULONG IdleProcessorMask; +static VOID INIT_FUNCTION Ki386GetCpuId(VOID); + +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, Ki386GetCpuId) +#pragma alloc_text(INIT, KeCreateApplicationProcessorIdleThread) +#pragma alloc_text(INIT, KePrepareForApplicationProcessorInit) +#pragma alloc_text(INIT, KeInit1) +#pragma alloc_text(INIT, KeInit2) +#pragma alloc_text(INIT, Ki386SetProcessorFeatures) +#endif + /* FUNCTIONS *****************************************************************/ -VOID INIT_FUNCTION STATIC +static VOID INIT_FUNCTION Ki386GetCpuId(VOID) { ULONG OrigFlags, Flags, FinalFlags; _____ Modified: trunk/reactos/ntoskrnl/ke/i386/tss.c --- trunk/reactos/ntoskrnl/ke/i386/tss.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/ke/i386/tss.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -14,6 +14,10 @@ #define NDEBUG #include <internal/debug.h> +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, Ki386BootInitializeTSS) +#endif + /* GLOBALS *******************************************************************/ typedef struct _KTSSNOIOPM _____ Modified: trunk/reactos/ntoskrnl/ke/i386/vdm.c --- trunk/reactos/ntoskrnl/ke/i386/vdm.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/ke/i386/vdm.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -13,6 +13,11 @@ #include <ntoskrnl.h> #include <internal/debug.h> +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, NtEarlyInitVdm) +#endif + + /* GLOBALS *******************************************************************/ static UCHAR OrigIVT[1024]; _____ Modified: trunk/reactos/ntoskrnl/ke/main.c --- trunk/reactos/ntoskrnl/ke/main.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/ke/main.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -64,6 +64,12 @@ extern unsigned int _image_base__; ULONG_PTR KERNEL_BASE = (ULONG_PTR)&_image_base__; +VOID INIT_FUNCTION _main(ULONG MultiBootMagic, PLOADER_PARAMETER_BLOCK _LoaderBlock); + +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, _main) +#endif + /* FUNCTIONS ****************************************************************/ /* _____ Modified: trunk/reactos/ntoskrnl/ke/usercall.c --- trunk/reactos/ntoskrnl/ke/usercall.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/ke/usercall.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -13,6 +13,10 @@ #define NDEBUG #include <internal/debug.h> +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, PsInitialiseW32Call) +#endif + /* FUNCTIONS *****************************************************************/ #if ALEX_CB_REWRITE _____ Modified: trunk/reactos/ntoskrnl/ldr/loader.c --- trunk/reactos/ntoskrnl/ldr/loader.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/ldr/loader.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -34,6 +34,12 @@ #define NDEBUG #include <internal/debug.h> +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, LdrInit1) +#pragma alloc_text(INIT, LdrInitModuleManagement) +#pragma alloc_text(INIT, LdrSafePEProcessModule) +#endif + /* GLOBALS *******************************************************************/ LIST_ENTRY ModuleListHead; _____ Modified: trunk/reactos/ntoskrnl/lpc/port.c --- trunk/reactos/ntoskrnl/lpc/port.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/lpc/port.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -14,6 +14,10 @@ #define NDEBUG #include <internal/debug.h> +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, LpcpInitSystem) +#endif + /* GLOBALS *******************************************************************/ _____ Modified: trunk/reactos/ntoskrnl/mm/aspace.c --- trunk/reactos/ntoskrnl/mm/aspace.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/mm/aspace.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -13,6 +13,11 @@ #include <ntoskrnl.h> #include <internal/debug.h> +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, MmInitializeKernelAddressSpace) +#endif + + /* GLOBALS ******************************************************************/ STATIC MADDRESS_SPACE KernelAddressSpace; _____ Modified: trunk/reactos/ntoskrnl/mm/balance.c --- trunk/reactos/ntoskrnl/mm/balance.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/mm/balance.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -14,6 +14,13 @@ #define NDEBUG #include <internal/debug.h> +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, MmInitializeBalancer) +#pragma alloc_text(INIT, MmInitializeMemoryConsumer) +#pragma alloc_text(INIT, MiInitBalancerThread) +#endif + + /* TYPES ********************************************************************/ typedef struct _MM_ALLOCATION_REQUEST { _____ Modified: trunk/reactos/ntoskrnl/mm/freelist.c --- trunk/reactos/ntoskrnl/mm/freelist.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/mm/freelist.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -15,6 +15,12 @@ #define NDEBUG #include <internal/debug.h> +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, MmInitializePageList) +#pragma alloc_text(INIT, MmInitZeroPageThread) +#endif + + /* TYPES *******************************************************************/ #define MM_PHYSICAL_PAGE_FREE (0x1) _____ Modified: trunk/reactos/ntoskrnl/mm/i386/page.c --- trunk/reactos/ntoskrnl/mm/i386/page.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/mm/i386/page.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -14,6 +14,12 @@ #define NDEBUG #include <internal/debug.h> +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, MmInitGlobalKernelPageDirectory) +#pragma alloc_text(INIT, MiInitPageDirectoryMap) +#endif + + /* GLOBALS *****************************************************************/ #define PA_BIT_PRESENT (0) _____ Modified: trunk/reactos/ntoskrnl/mm/marea.c --- trunk/reactos/ntoskrnl/mm/marea.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/mm/marea.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -47,6 +47,10 @@ #define NDEBUG #include <internal/debug.h> +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, MmInitMemoryAreas) +#endif + /* #define VALIDATE_MEMORY_AREAS */ /* FUNCTIONS *****************************************************************/ _____ Modified: trunk/reactos/ntoskrnl/mm/mdl.c --- trunk/reactos/ntoskrnl/mm/mdl.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/mm/mdl.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -14,6 +14,10 @@ #define NDEBUG #include <internal/debug.h> +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, MmInitializeMdlImplementation) +#endif + /* GLOBALS *******************************************************************/ #define TAG_MDL TAG('M', 'D', 'L', ' ') _____ Modified: trunk/reactos/ntoskrnl/mm/mminit.c --- trunk/reactos/ntoskrnl/mm/mminit.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/mm/mminit.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -39,6 +39,15 @@ extern ULONG init_stack; extern ULONG init_stack_top; +VOID INIT_FUNCTION NTAPI MmInitVirtualMemory(ULONG_PTR LastKernelAddress, ULONG KernelLength); + +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, MmInitVirtualMemory) +#pragma alloc_text(INIT, MmInit1) +#pragma alloc_text(INIT, MmInit2) +#pragma alloc_text(INIT, MmInit3) +#endif + /* FUNCTIONS ****************************************************************/ /* _____ Modified: trunk/reactos/ntoskrnl/mm/npool.c --- trunk/reactos/ntoskrnl/mm/npool.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/mm/npool.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -17,6 +17,10 @@ #define NDEBUG #include <internal/debug.h> +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, MiInitializeNonPagedPool) +#endif + #ifdef ENABLE_VALIDATE_POOL #define VALIDATE_POOL validate_kernel_pool() #else _____ Modified: trunk/reactos/ntoskrnl/mm/pagefile.c --- trunk/reactos/ntoskrnl/mm/pagefile.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/mm/pagefile.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -32,6 +32,11 @@ #define NDEBUG #include <internal/debug.h> +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, MmInitPagingFile) +#endif + + /* TYPES *********************************************************************/ typedef struct _PAGINGFILE _____ Modified: trunk/reactos/ntoskrnl/mm/pageop.c --- trunk/reactos/ntoskrnl/mm/pageop.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/mm/pageop.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -14,6 +14,11 @@ #define NDEBUG #include <internal/debug.h> +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, MmInitializePageOp) +#endif + + /* GLOBALS *******************************************************************/ #define PAGEOP_HASH_TABLE_SIZE (32) _____ Modified: trunk/reactos/ntoskrnl/mm/ppool.c --- trunk/reactos/ntoskrnl/mm/ppool.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/mm/ppool.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -19,6 +19,10 @@ #include <internal/debug.h> #endif//PPOOL_UMODE_TEST +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, MmInitializePagedPool) +#endif + #undef ASSERT #define ASSERT(x) if (!(x)) {DbgPrint("Assertion "#x" failed at %s:%d\n", __FILE__,__LINE__); KeBugCheck(0); } _____ Modified: trunk/reactos/ntoskrnl/mm/process.c --- trunk/reactos/ntoskrnl/mm/process.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/mm/process.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -206,7 +206,7 @@ /* Allocate the PEB */ Peb = MiCreatePebOrTeb(Process, (PVOID)((ULONG_PTR)MM_HIGHEST_VAD_ADDRESS + 1)); - ASSERT(Peb == (PVOID)0x7FFDF000) + ASSERT(Peb == (PVOID)0x7FFDF000); /* Map NLS Tables */ DPRINT("Mapping NLS\n"); _____ Modified: trunk/reactos/ntoskrnl/mm/rmap.c --- trunk/reactos/ntoskrnl/mm/rmap.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/mm/rmap.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -14,6 +14,10 @@ #define NDEBUG #include <internal/debug.h> +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, MmInitializeRmapList) +#endif + /* TYPES ********************************************************************/ typedef struct _MM_RMAP_ENTRY _____ Modified: trunk/reactos/ntoskrnl/mm/section.c --- trunk/reactos/ntoskrnl/mm/section.c 2005-11-28 23:21:24 UTC (rev 19731) +++ trunk/reactos/ntoskrnl/mm/section.c 2005-11-28 23:25:31 UTC (rev 19732) @@ -49,9 +49,14 @@ #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> - [truncated at 1000 lines; 279 more skipped]
19 years
1
0
0
0
[gvg] 19731: Fix the fix to RtlFindMessage
by gvg@svn.reactos.com
Fix the fix to RtlFindMessage Modified: trunk/reactos/lib/kernel32/misc/errormsg.c Modified: trunk/reactos/lib/rtl/message.c _____ Modified: trunk/reactos/lib/kernel32/misc/errormsg.c --- trunk/reactos/lib/kernel32/misc/errormsg.c 2005-11-28 22:25:11 UTC (rev 19730) +++ trunk/reactos/lib/kernel32/misc/errormsg.c 2005-11-28 23:21:24 UTC (rev 19731) @@ -383,7 +383,7 @@ LPWSTR from,f; DWORD width = dwFlags & FORMAT_MESSAGE_MAX_WIDTH_MASK; BOOL eos = FALSE; - CHAR ch; + WCHAR ch; TRACE("(0x%lx,%p,%ld,0x%lx,%p,%ld,%p)\n", dwFlags,lpSource,dwMessageId,dwLanguageId,lpBuffer,nSize,args); _____ Modified: trunk/reactos/lib/rtl/message.c --- trunk/reactos/lib/rtl/message.c 2005-11-28 22:25:11 UTC (rev 19730) +++ trunk/reactos/lib/rtl/message.c 2005-11-28 23:21:24 UTC (rev 19731) @@ -85,17 +85,20 @@ } } + if (MessageTable->NumberOfBlocks <= i) + { + return STATUS_MESSAGE_NOT_FOUND; + } + MessageEntry = (PRTL_MESSAGE_RESOURCE_ENTRY)((PUCHAR)MessageTable + MessageTable->Blocks[i].OffsetToEntries); DPRINT("EntryOffset 0x%08lx\n", EntryOffset); DPRINT("IdOffset 0x%08lx\n", IdOffset); DPRINT("MessageEntry: %p\n", MessageEntry); - - for (i = 0; i < MessageTable->NumberOfBlocks; i++) + for (i = 0; i < IdOffset; i++) { - if (MessageId >= MessageTable->Blocks[i].LowId && MessageId <= MessageTable->Blocks[i].HighId) - MessageEntry = (PRTL_MESSAGE_RESOURCE_ENTRY)((char *)MessageEntry + MessageEntry->Length); + MessageEntry = (PRTL_MESSAGE_RESOURCE_ENTRY)((PUCHAR)MessageEntry + (ULONG)MessageEntry->Length); } if (MessageEntry->Flags == 0)
19 years
1
0
0
0
[weiden] 19730: fixed some warnings
by weiden@svn.reactos.com
fixed some warnings Modified: trunk/reactos/tools/gendib/gendib.c _____ Modified: trunk/reactos/tools/gendib/gendib.c --- trunk/reactos/tools/gendib/gendib.c 2005-11-28 22:24:37 UTC (rev 19729) +++ trunk/reactos/tools/gendib/gendib.c 2005-11-28 22:25:11 UTC (rev 19730) @@ -119,8 +119,8 @@ typedef struct _ROPINFO { unsigned RopCode; - char *Name; - char *Operation; + const char *Name; + const char *Operation; int UsesDest; int UsesSource; int UsesPattern; @@ -170,7 +170,7 @@ } static void -Output(FILE *Out, char *Fmt, ...) +Output(FILE *Out, const char *Fmt, ...) { static unsigned Indent = 0; static int AtBOL = 1; @@ -253,9 +253,9 @@ CreateOperation(FILE *Out, unsigned Bpp, PROPINFO RopInfo, unsigned SourceBpp, unsigned Bits) { - char *Cast; - char *Dest; - char *Template; + const char *Cast; + const char *Dest; + const char *Template; MARK(Out); if (32 == Bits) @@ -307,7 +307,7 @@ static void CreateBase(FILE *Out, int Source, int Flags, unsigned Bpp) { - char *What = (Source ? "Source" : "Dest"); + const char *What = (Source ? "Source" : "Dest"); MARK(Out); Output(Out, "%sBase = (char *) BltInfo->%sSurface->pvScan0 +\n", What, What); @@ -370,8 +370,8 @@ CreateGetSource(FILE *Out, unsigned Bpp, PROPINFO RopInfo, int Flags, unsigned SourceBpp, unsigned Shift) { - char *AssignOp; - char *Before; + const char *AssignOp; + const char *Before; char After[8]; MARK(Out);
19 years
1
0
0
0
[ion] 19729: - Remove inlined gas assembly + c code mix in math.c and write the functions in real assembly code.
by ion@svn.reactos.com
- Remove inlined gas assembly + c code mix in math.c and write the functions in real assembly code. - Fix pch usage and qsort callback definition. RTL can now be built with msvc. Modified: trunk/reactos/lib/rtl/i386/math_asm.S Modified: trunk/reactos/lib/rtl/largeint.c Deleted: trunk/reactos/lib/rtl/math.c Modified: trunk/reactos/lib/rtl/qsort.c Modified: trunk/reactos/lib/rtl/rtl.h Modified: trunk/reactos/lib/rtl/rtl.xml _____ Modified: trunk/reactos/lib/rtl/i386/math_asm.S --- trunk/reactos/lib/rtl/i386/math_asm.S 2005-11-28 22:03:22 UTC (rev 19728) +++ trunk/reactos/lib/rtl/i386/math_asm.S 2005-11-28 22:24:37 UTC (rev 19729) @@ -28,7 +28,7 @@ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * OR SERVICES// LOSS OF USE, DATA, OR PROFITS// OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF @@ -48,12 +48,32 @@ .globl __alldiv .globl __aulldvrm .globl __alldvrm +.globl _atan +.globl _ceil +.globl _cos +.globl _fabs +.globl _floor +.globl _log +.globl _pow +.globl _sin +.globl _sqrt +.globl _tan +.globl __fltused +/* DATA ********************************************************************/ + +fzero: + .long 0 // Floating point zero + .long 0 // Floating point zero + +__fltused: + .long 0x9875 + /* FUNCTIONS ***************************************************************/ /* * long long - * __alldiv(long long Dividend, long long Divisor); + * __alldiv(long long Dividend, long long Divisor)// * * Parameters: * [ESP+04h] - long long Dividend @@ -71,7 +91,7 @@ /* * long long - * __allmul(long long Multiplier, long long Multiplicand); + * __allmul(long long Multiplier, long long Multiplicand)// * * Parameters: * [ESP+04h] - long long Multiplier @@ -114,7 +134,7 @@ /* * unsigned long long - * __aullrem(unsigned long long Dividend, unsigned long long Divisor); + * __aullrem(unsigned long long Dividend, unsigned long long Divisor)// * * Parameters: * [ESP+04h] - unsigned long long Dividend @@ -132,7 +152,7 @@ /* * long long - * __allshl(long long Value, unsigned char Shift); + * __allshl(long long Value, unsigned char Shift)// * * Parameters: * EDX:EAX - signed long long value to be shifted left @@ -154,7 +174,7 @@ /* * long long - * __allshr(long long Value, unsigned char Shift); + * __allshr(long long Value, unsigned char Shift)// * * Parameters: * EDX:EAX - signed long long value to be shifted right @@ -176,7 +196,7 @@ /* * unsigned long long - * __aulldiv(unsigned long long Dividend, unsigned long long Divisor); + * __aulldiv(unsigned long long Dividend, unsigned long long Divisor)// * * Parameters: * [ESP+04h] - unsigned long long Dividend @@ -194,7 +214,7 @@ /* * unsigned long long - * __aullshr(unsigned long long Value, unsigned char Shift); + * __aullshr(unsigned long long Value, unsigned char Shift)// * * Parameters: * EDX:EAX - unsigned long long value to be shifted right @@ -215,7 +235,7 @@ /* * long long - * __allrem(long long Dividend, long long Divisor); + * __allrem(long long Dividend, long long Divisor)// * * Parameters: * [ESP+04h] - long long Dividend @@ -629,3 +649,188 @@ ret 16 +_atan: + push ebp + mov ebp,esp + fld qword ptr [ebp+8] // Load real from stack + fld1 // Load constant 1 + fpatan // Take the arctangent + pop ebp + ret + +_ceil: + push ebp + mov ebp,esp + sub esp,4 // Allocate temporary space + fld qword ptr [ebp+8] // Load real from stack + fstcw [ebp-2] // Save control word + fclex // Clear exceptions + mov word ptr [ebp-4],0xb63 // Rounding control word + fldcw [ebp-4] // Set new rounding control + frndint // Round to integer + fclex // Clear exceptions + fldcw [ebp-2] // Restore control word + mov esp,ebp // Deallocate temporary space + pop ebp + ret + +_cos: + push ebp + mov ebp,esp // Point to the stack frame + fld qword ptr [ebp+8] // Load real from stack + fcos // Take the cosine + pop ebp + ret + +_fabs: + push ebp + mov ebp,esp + fld qword ptr [ebp+8] // Load real from stack + fabs // Take the absolute value + pop ebp + ret + +_floor: + push ebp + mov ebp,esp + sub esp,4 // Allocate temporary space + fld qword ptr [ebp+8] // Load real from stack + fstcw [ebp-2] // Save control word + fclex // Clear exceptions + mov word ptr [ebp-4],0x763 // Rounding control word + fldcw [ebp-4] // Set new rounding control + frndint // Round to integer + fclex // Clear exceptions + fldcw [ebp-2] // Restore control word + mov esp,ebp + pop ebp + ret + +_log: + push ebp + mov ebp,esp + fld qword ptr [ebp+8] // Load real from stack + fldln2 // Load log base e of 2 + fxch st(1) // Exchange st, st(1) + fyl2x // Compute the natural log(x) + pop ebp + ret + +_pow: + push ebp + mov ebp,esp + sub esp,12 // Allocate temporary space + push edi // Save register edi + push eax // Save register eax + mov dword ptr [ebp-12],0 // Set negation flag to zero + fld qword ptr [ebp+16] // Load real from stack + fld qword ptr [ebp+8] // Load real from stack + mov edi,offset flat:fzero // Point to real zero + fcom qword ptr [edi] // Compare x with zero + fstsw ax // Get the FPU status word + mov al,ah // Move condition flags to AL + lahf // Load Flags into AH + and al, 0b01000101 // Isolate C0, C2 and C3 + and ah,not 0b01000101 // Turn off CF, PF and ZF + or ah,al // Set new CF, PF and ZF + sahf // Store AH into Flags + jb __fpow1 // Re-direct if x < 0 + ja __fpow3 // Re-direct if x > 0 + fxch // Swap st, st(1) + fcom qword ptr [edi] // Compare y with zero + fxch // Restore x as top of stack + fstsw ax // Get the FPU status word + mov al,ah // Move condition flags to AL + lahf // Load Flags into AH + and al, 0b01000101 // Isolate C0, C2 and C3 + and ah,not 0b01000101 // Turn off CF, PF and ZF + or ah,al // Set new CF, PF and ZF + sahf // Store AH into Flags + ja __fpow3 // Re-direct if y > 0 + fstp st(1) // Set new stack top and pop + mov eax,1 // Set domain error (EDOM) + jmp __fpow5 // End of case +__fpow1: fxch // Put y on top of stack + fld st // Duplicate y as st(1) + frndint // Round to integer + fxch // Put y on top of stack + fcomp // y = int(y) ? + fstsw ax // Get the FPU status word + mov al,ah // Move condition flags to AL + lahf // Load Flags into AH + and al, 0b01000101 // Isolate C0, C2 and C3 + and ah,not 0b01000101 // Turn off CF, PF and ZF + or ah,al // Set new CF, PF and ZF + sahf // Store AH into Flags + je __fpow2 // Proceed if y = int(y) + fstp st(1) // Set new stack top and pop + fldz // Set result to zero + fstp st(1) // Set new stack top and pop + mov eax,1 // Set domain error (EDOM) + jmp __fpow5 // End of case +__fpow2: fist dword ptr [ebp-12] // Store y as integer + and dword ptr [ebp-12],1 // Set bit if y is odd + fxch // Put x on top of stack + fabs // x = |x| +__fpow3: fldln2 // Load log base e of 2 + fxch st(1) // Exchange st, st(1) + fyl2x // Compute the natural log(x) + fmulp // Compute y * ln(x) + fldl2e // Load log base 2(e) + fmulp st(1),st // Multiply x * log base 2(e) + fst st(1) // Push result + frndint // Round to integer + fsub st(1),st // Subtract + fxch // Exchange st, st(1) + f2xm1 // Compute 2 to the (x - 1) + fld1 // Load real number 1 + faddp // 2 to the x + fscale // Scale by power of 2 + fstp st(1) // Set new stack top and pop + test dword ptr [ebp-12],1 // Negation required ? + jz __fpow4 // No, re-direct + fchs // Negate the result +__fpow4: fstp qword ptr [ebp-8] // Save (double)pow(x, y) + fld qword ptr [ebp-8] // Load (double)pow(x, y) + fxam // Examine st + fstsw ax // Get the FPU status word + cmp ah,5 // Infinity ? + jne __fpow6 // No, end of case + mov eax,2 // Set range error (ERANGE) + // Get errno pointer offset +__fpow5: int 3 + mov edi,0 // TODO: offset flat:__crt_errno + mov edi,[edi] // Get C errno variable pointer + mov dword ptr [edi],eax // Set errno +__fpow6: pop eax // Restore register eax + pop edi // Restore register edi + mov esp,ebp // Deallocate temporary space + pop ebp + ret + +_sin: + push ebp // Save register bp + mov ebp,esp // Point to the stack frame + fld qword ptr [ebp+8] // Load real from stack + fsin // Take the sine + pop ebp // Restore register bp + ret + +_sqrt: + push ebp + mov ebp,esp + fld qword ptr [ebp+8] // Load real from stack + fsqrt // Take the square root + pop ebp + ret + +_tan: + push ebp + mov ebp,esp + sub esp,4 // Allocate temporary space + fld qword ptr [ebp+8] // Load real from stack + fptan // Take the tangent + fstp dword ptr [ebp-4] // Throw away the constant 1 + mov esp,ebp // Deallocate temporary space + pop ebp + ret _____ Modified: trunk/reactos/lib/rtl/largeint.c --- trunk/reactos/lib/rtl/largeint.c 2005-11-28 22:03:22 UTC (rev 19728) +++ trunk/reactos/lib/rtl/largeint.c 2005-11-28 22:24:37 UTC (rev 19729) @@ -7,7 +7,6 @@ /* INCLUDES *****************************************************************/ -#define NO_RTL_INLINES #include <rtl.h> #define NDEBUG _____ Deleted: trunk/reactos/lib/rtl/math.c --- trunk/reactos/lib/rtl/math.c 2005-11-28 22:03:22 UTC (rev 19728) +++ trunk/reactos/lib/rtl/math.c 2005-11-28 22:24:37 UTC (rev 19729) @@ -1,215 +0,0 @@ -/* COPYRIGHT: See COPYING in the top level directory - * Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. - * PROJECT: ReactOS system libraries - * FILE: lib/rtl/math.c - * PURPOSE: Math functions for i387. - * PROGRAMMER: John C. Bowman <bowman(a)ipp-garching.mpg.de> - */ - -/* INCLUDES *****************************************************************/ - -#include <rtl.h> - -#define NDEBUG -#include <debug.h> - -/* FUNCTIONS *****************************************************************/ - -double atan (double __x); -double ceil (double __x); -double cos (double __x); -double fabs (double __x); -double floor (double __x); -double log (double __x); -double __log2 (double __x); -double pow (double __x, double __y); -double sin (double __x); -double sqrt (double __x); -double tan (double __x); - -int _fltused = 0x9875; - -double atan (double __x) -{ - register double __val; - __asm __volatile__ - ("fld1\n\t" - "fpatan" - : "=t" (__val) : "0" (__x)); - - return __val; -} - -/* - * @implemented - */ -double ceil (double __x) -{ - register double __val; - __volatile unsigned short int __cw, __cwtmp; - - __asm __volatile ("fnstcw %0" : "=m" (__cw)); - __cwtmp = (__cw & 0xf3ff) | 0x0800; /* rounding up */ - __asm __volatile ("fldcw %0" : : "m" (__cwtmp)); - __asm __volatile ("frndint" : "=t" (__val) : "0" (__x)); - __asm __volatile ("fldcw %0" : : "m" (__cw)); - - return __val; -} - -/* - * @implemented - */ -double cos (double __x) -{ - register double __val; - __asm __volatile__ - ("fcos" - : "=t" (__val): "0" (__x)); - - return __val; -} - -/* - * @implemented - */ -double fabs (double __x) -{ - register double __val; - __asm __volatile__ - ("fabs" - : "=t" (__val) : "0" (__x)); - - return __val; -} - -/* - * @implemented - */ -double floor (double __x) -{ - register double __val; - __volatile unsigned short int __cw, __cwtmp; - - __asm __volatile ("fnstcw %0" : "=m" (__cw)); - __cwtmp = (__cw & 0xf3ff) | 0x0400; /* rounding down */ - __asm __volatile ("fldcw %0" : : "m" (__cwtmp)); - __asm __volatile ("frndint" : "=t" (__val) : "0" (__x)); - __asm __volatile ("fldcw %0" : : "m" (__cw)); - - return __val; -} - -/* - * @implemented - */ -double log (double __x) -{ - register double __val; - __asm __volatile__ - ("fldln2\n\t" - "fxch\n\t" - "fyl2x" - : "=t" (__val) : "0" (__x)); - - return __val; -} - -double __log2 (double __x) -{ - register double __val; - __asm __volatile__ - ("fld1\n\t" - "fxch\n\t" - "fyl2x" - : "=t" (__val) : "0" (__x)); - - return __val; -} - -/* - * @implemented - */ -double pow (double __x, double __y) -{ - register double __val, __exponent; - long __p = (long) __y; - - if (__x == 0.0 && __y > 0.0) - return 0.0; - if (__y == (double) __p) - { - double __r = 1.0; - if (__p == 0) - return 1.0; - if (__p < 0) - { - __p = -__p; - __x = 1.0 / __x; - } - while (1) - { - if (__p & 1) - __r *= __x; - __p >>= 1; - if (__p == 0) - return __r; - __x *= __x; - } - /* NOTREACHED */ - } - __asm __volatile__ - ("fmul %%st(1) # y * log2(x)\n\t" - "fst %%st(1)\n\t" - "frndint # int(y * log2(x))\n\t" - "fxch\n\t" - "fsub %%st(1) # fract(y * log2(x))\n\t" - "f2xm1 # 2^(fract(y * log2(x))) - 1\n\t" - : "=t" (__val), "=u" (__exponent) : "0" (__log2 (__x)), "1" (__y)); - __val += 1.0; - __asm __volatile__ - ("fscale" - : "=t" (__val) : "0" (__val), "u" (__exponent)); - - return __val; -} - -/* - * @implemented - */ -double sin (double __x) -{ - register double __val; - __asm __volatile__ - ("fsin" - : "=t" (__val) : "0" (__x)); - - return __val; -} - -/* - * @implemented - */ -double sqrt (double __x) -{ - register double __val; - __asm __volatile__ - ("fsqrt" - : "=t" (__val) : "0" (__x)); - - return __val; -} - -/* - * @implemented - */ -double tan (double __x) -{ - register double __val; - register double __val2 __attribute__ ((unused)); - __asm __volatile__ - ("fptan" - : "=t" (__val2), "=u" (__val) : "0" (__x)); - - return __val; -} _____ Modified: trunk/reactos/lib/rtl/qsort.c --- trunk/reactos/lib/rtl/qsort.c 2005-11-28 22:03:22 UTC (rev 19728) +++ trunk/reactos/lib/rtl/qsort.c 2005-11-28 22:24:37 UTC (rev 19729) @@ -37,16 +37,15 @@ * FILE: lib/rtl/qsort.c * PROGRAMMER: Adapted from CygWin newlib 2000-03-12. */ +#include <rtl.h> -#include <stddef.h> - #ifndef __GNUC__ #define inline #endif /* FIXME: these types should be from the default includes */ -typedef int (* _pfunccmp_t) (char *, char *); +typedef int (* _pfunccmp_t) (const void *, const void *); #define min(a,b) ((a)<(b)?(a):(b)) _____ Modified: trunk/reactos/lib/rtl/rtl.h --- trunk/reactos/lib/rtl/rtl.h 2005-11-28 22:03:22 UTC (rev 19728) +++ trunk/reactos/lib/rtl/rtl.h 2005-11-28 22:24:37 UTC (rev 19729) @@ -12,8 +12,9 @@ #define _NTSYSTEM_ #define _NTDLLBUILD_ #define WIN32_NO_STATUS -#define NTOS_MODE_USER #define _INC_SWPRINTF_INL_ +#define _CRT_SECURE_NO_DEPRECATE +#define NO_RTL_INLINES /* C Headers */ #include <stdio.h> _____ Modified: trunk/reactos/lib/rtl/rtl.xml --- trunk/reactos/lib/rtl/rtl.xml 2005-11-28 22:03:22 UTC (rev 19728) +++ trunk/reactos/lib/rtl/rtl.xml 2005-11-28 22:24:37 UTC (rev 19729) @@ -34,7 +34,6 @@ <file>handle.c</file> <file>heap.c</file> <file>image.c</file> - <file>math.c</file> <file>mem.c</file> <file>message.c</file> <file>largeint.c</file>
19 years
1
0
0
0
[gvg] 19728: Re-import wmc from Wine
by gvg@svn.reactos.com
Re-import wmc from Wine Modified: trunk/reactos/Makefile Modified: trunk/reactos/media/doc/README.WINE Added: trunk/reactos/tools/wmc/ Deleted: trunk/reactos/tools/wmc/Makefile.in Added: trunk/reactos/tools/wmc/mcy.tab.c Added: trunk/reactos/tools/wmc/mcy.tab.h Added: trunk/reactos/tools/wmc/wmc.mak Deleted: trunk/reactos/tools/wmc/wmc.man.in _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2005-11-28 22:01:21 UTC (rev 19727) +++ trunk/reactos/Makefile 2005-11-28 22:03:22 UTC (rev 19728) @@ -364,7 +364,7 @@ $(ERRCODES_H) $(ERRCODES_RC): $(WMC_TARGET) $(KERNEL32_MC) $(ECHO_WMC) - $(Q)$(WMC_TARGET) -i -H $(ERRCODES_H) -o $(ERRCODES_RC) $(KERNEL32_MC) + $(Q)$(WMC_TARGET) -i -U -H $(ERRCODES_H) -o $(ERRCODES_RC) $(KERNEL32_MC) .PHONY: msvc6 msvc6: $(RBUILD_TARGET) _____ Modified: trunk/reactos/media/doc/README.WINE --- trunk/reactos/media/doc/README.WINE 2005-11-28 22:01:21 UTC (rev 19727) +++ trunk/reactos/media/doc/README.WINE 2005-11-28 22:03:22 UTC (rev 19728) @@ -30,7 +30,7 @@ reactos/tools/wpp # Synced to Wine-0_9_2 reactos/tools/bin2res # Resource to binary converter reactos/tools/winebuild # Synced to Wine-0_9_2 -reactos/tools/wmc # Wine Message Compiler +reactos/tools/wmc # Synced to Wine-0_9_2 reactos/tools/wrc # Synced to Wine-0_9_2 reactos/tools/widl # Forked at Wine-20050930 _____ Copied: trunk/reactos/tools/wmc (from rev 19727, vendor/wine/tools/wmc/current) _____ Deleted: trunk/reactos/tools/wmc/Makefile.in --- vendor/wine/tools/wmc/current/Makefile.in 2005-11-28 22:01:21 UTC (rev 19727) +++ trunk/reactos/tools/wmc/Makefile.in 2005-11-28 22:03:22 UTC (rev 19728) @@ -1,45 +0,0 @@ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -EXEEXT = @EXEEXT@ - -PROGRAMS = wmc$(EXEEXT) -MANPAGES = wmc.man -MODULE = none - -C_SRCS = \ - lang.c \ - mcl.c \ - utils.c \ - wmc.c \ - write.c - -EXTRA_SRCS = mcy.y -EXTRA_OBJS = mcy.tab.o - -all: $(PROGRAMS) $(MANPAGES) - -mcl.o: mcy.tab.h - -@MAKE_RULES@ - -wmc$(EXEEXT): $(OBJS) - $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBUNICODE) $(LIBPORT) $(LEXLIB) $(LDFLAGS) - -mcy.tab.c mcy.tab.h: mcy.y - $(BISON) -d -t $(SRCDIR)/mcy.y -o mcy.tab.c - -# hack to allow parallel make -mcy.tab.h: mcy.tab.c -mcy.tab.o: mcy.tab.h - -install:: $(PROGRAMS) $(MANPAGES) - $(MKINSTALLDIRS) $(bindir) $(mandir)/man$(prog_manext) - $(INSTALL_DATA) wmc.man $(mandir)/man$(prog_manext)/wmc.$(prog_manext) - $(INSTALL_PROGRAM) wmc$(EXEEXT) $(bindir)/wmc$(EXEEXT) - -uninstall:: - $(RM) $(bindir)/wmc$(EXEEXT) $(mandir)/man$(prog_manext)/wmc.$(prog_manext) - -### Dependencies: _____ Added: trunk/reactos/tools/wmc/mcy.tab.c --- vendor/wine/tools/wmc/current/mcy.tab.c 2005-11-28 22:01:21 UTC (rev 19727) +++ trunk/reactos/tools/wmc/mcy.tab.c 2005-11-28 22:03:22 UTC (rev 19728) @@ -0,0 +1,2266 @@ +/* A Bison parser, made by GNU Bison 1.875c. */ + +/* Skeleton parser for Yacc-like parsing with Bison, + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program 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 General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +/* As a special exception, when this file is copied by Bison into a + Bison output file, you may use that output file without restriction. + This special exception was added by the Free Software Foundation + in version 1.24 of Bison. */ + +/* Written by Richard Stallman by simplifying the original so called + ``semantic'' parser. */ + +/* All symbols defined below should begin with yy or YY, to avoid + infringing on user name space. This should be done even for local + variables, as they might otherwise be expanded by user macros. + There are some unavoidable exceptions within include files to + define necessary library symbols; they are noted "INFRINGES ON + USER NAME SPACE" below. */ + +/* Identify Bison output. */ +#define YYBISON 1 + +/* Skeleton name. */ +#define YYSKELETON_NAME "yacc.c" + +/* Pure parsers. */ +#define YYPURE 0 + +/* Using locations. */ +#define YYLSP_NEEDED 0 + + + +/* Tokens. */ +#ifndef YYTOKENTYPE +# define YYTOKENTYPE + /* Put the tokens into the symbol table, so that GDB and other debuggers + know about them. */ + enum yytokentype { + tSEVNAMES = 258, + tFACNAMES = 259, + tLANNAMES = 260, + tBASE = 261, + tCODEPAGE = 262, + tTYPEDEF = 263, + tNL = 264, + tSYMNAME = 265, + tMSGEND = 266, + tSEVERITY = 267, + tFACILITY = 268, + tLANGUAGE = 269, + tMSGID = 270, + tIDENT = 271, + tLINE = 272, + tFILE = 273, + tCOMMENT = 274, + tNUMBER = 275, + tTOKEN = 276 + }; +#endif +#define tSEVNAMES 258 +#define tFACNAMES 259 +#define tLANNAMES 260 +#define tBASE 261 +#define tCODEPAGE 262 +#define tTYPEDEF 263 +#define tNL 264 +#define tSYMNAME 265 +#define tMSGEND 266 +#define tSEVERITY 267 +#define tFACILITY 268 +#define tLANGUAGE 269 +#define tMSGID 270 +#define tIDENT 271 +#define tLINE 272 +#define tFILE 273 +#define tCOMMENT 274 +#define tNUMBER 275 +#define tTOKEN 276 + + + + +/* Copy the first part of user declarations. */ +#line 39 "tools/wmc/mcy.y" + + +#include "config.h" + +#include <stdio.h> +#include <stdlib.h> +#include <assert.h> + +#include "utils.h" +#include "wmc.h" +#include "lang.h" + +static const char err_syntax[] = "Syntax error"; +static const char err_number[] = "Number expected"; +static const char err_ident[] = "Identifier expected"; +static const char err_assign[] = "'=' expected"; +static const char err_popen[] = "'(' expected"; +static const char err_pclose[] = "')' expected"; +static const char err_colon[] = "':' expected"; +static const char err_msg[] = "Message expected"; + +/* Scanner switches */ +int want_nl = 0; /* Request next newlinw */ +int want_line = 0; /* Request next complete line */ +int want_file = 0; /* Request next ident as filename */ + +node_t *nodehead = NULL; /* The list of all parsed elements */ +static node_t *nodetail = NULL; +lan_blk_t *lanblockhead; /* List of parsed elements transposed */ + +static int base = 16; /* Current printout base to use (8, 10 or 16) */ +static WCHAR *cast = NULL; /* Current typecast to use */ + +static int last_id = 0; /* The last message ID parsed */ +static int last_sev = 0; /* Last severity code parsed */ +static int last_fac = 0; /* Last facility code parsed */ +static WCHAR *last_sym = NULL;/* Last alias symbol parsed */ +static int have_sev; /* Set if severity parsed for current message */ +static int have_fac; /* Set if facility parsed for current message */ +static int have_sym; /* Set is symbol parsed for current message */ + +static cp_xlat_t *cpxlattab = NULL; /* Codepage translation table */ +static int ncpxlattab = 0; + +/* Prototypes */ +static WCHAR *merge(WCHAR *s1, WCHAR *s2); +static lanmsg_t *new_lanmsg(lan_cp_t *lcp, WCHAR *msg); +static msg_t *add_lanmsg(msg_t *msg, lanmsg_t *lanmsg); +static msg_t *complete_msg(msg_t *msg, int id); +static void add_node(node_e type, void *p); +static void do_add_token(tok_e type, token_t *tok, const char *code); +static void test_id(int id); +static int check_languages(node_t *head); +static lan_blk_t *block_messages(node_t *head); +static void add_cpxlat(int lan, int cpin, int cpout); +static cp_xlat_t *find_cpxlat(int lan); + + + +/* Enabling traces. */ +#ifndef YYDEBUG +# define YYDEBUG 1 +#endif + +/* Enabling verbose error messages. */ +#ifdef YYERROR_VERBOSE +# undef YYERROR_VERBOSE +# define YYERROR_VERBOSE 1 +#else +# define YYERROR_VERBOSE 0 +#endif + +#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) +#line 99 "tools/wmc/mcy.y" +typedef union YYSTYPE { + WCHAR *str; + unsigned num; + token_t *tok; + lanmsg_t *lmp; + msg_t *msg; + lan_cp_t lcp; +} YYSTYPE; +/* Line 191 of yacc.c. */ +#line 186 "tools/wmc/mcy.tab.c" +# define yystype YYSTYPE /* obsolescent; will be withdrawn */ +# define YYSTYPE_IS_DECLARED 1 +# define YYSTYPE_IS_TRIVIAL 1 +#endif + + + +/* Copy the second part of user declarations. */ + + +/* Line 214 of yacc.c. */ +#line 198 "tools/wmc/mcy.tab.c" + +#if ! defined (yyoverflow) || YYERROR_VERBOSE + +# ifndef YYFREE +# define YYFREE free +# endif +# ifndef YYMALLOC +# define YYMALLOC malloc +# endif + +/* The parser invokes alloca or malloc; define the necessary symbols. */ + +# ifdef YYSTACK_USE_ALLOCA +# if YYSTACK_USE_ALLOCA +# define YYSTACK_ALLOC alloca +# endif +# else +# if defined (alloca) || defined (_ALLOCA_H) +# define YYSTACK_ALLOC alloca +# else +# ifdef __GNUC__ +# define YYSTACK_ALLOC __builtin_alloca +# endif +# endif +# endif + +# ifdef YYSTACK_ALLOC + /* Pacify GCC's `empty if-body' warning. */ +# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) +# else +# if defined (__STDC__) || defined (__cplusplus) +# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */ +# define YYSIZE_T size_t +# endif +# define YYSTACK_ALLOC YYMALLOC +# define YYSTACK_FREE YYFREE +# endif +#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */ + + +#if (! defined (yyoverflow) \ + && (! defined (__cplusplus) \ + || (defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL))) + +/* A type that is properly aligned for any stack member. */ +union yyalloc +{ + short yyss; + YYSTYPE yyvs; + }; + +/* The size of the maximum gap between one aligned stack and the next. */ +# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) + +/* The size of an array large to enough to hold all stacks, each with + N elements. */ +# define YYSTACK_BYTES(N) \ + ((N) * (sizeof (short) + sizeof (YYSTYPE)) \ + + YYSTACK_GAP_MAXIMUM) + +/* Copy COUNT objects from FROM to TO. The source and destination do + not overlap. */ +# ifndef YYCOPY +# if defined (__GNUC__) && 1 < __GNUC__ +# define YYCOPY(To, From, Count) \ + __builtin_memcpy (To, From, (Count) * sizeof (*(From))) +# else +# define YYCOPY(To, From, Count) \ + do \ + { \ + register YYSIZE_T yyi; \ + for (yyi = 0; yyi < (Count); yyi++) \ + (To)[yyi] = (From)[yyi]; \ + } \ + while (0) +# endif +# endif + +/* Relocate STACK from its old location to the new one. The + local variables YYSIZE and YYSTACKSIZE give the old and new number of + elements in the stack, and YYPTR gives the new location of the + stack. Advance YYPTR to a properly aligned location for the next + stack. */ +# define YYSTACK_RELOCATE(Stack) \ + do \ + { \ + YYSIZE_T yynewbytes; \ + YYCOPY (&yyptr->Stack, Stack, yysize); \ + Stack = &yyptr->Stack; \ + yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ + yyptr += yynewbytes / sizeof (*yyptr); \ + } \ + while (0) + +#endif + +#if defined (__STDC__) || defined (__cplusplus) + typedef signed char yysigned_char; +#else + typedef short yysigned_char; +#endif + +/* YYFINAL -- State number of the termination state. */ +#define YYFINAL 30 +/* YYLAST -- Last index in YYTABLE. */ +#define YYLAST 165 + +/* YYNTOKENS -- Number of terminals. */ +#define YYNTOKENS 27 +/* YYNNTS -- Number of nonterminals. */ +#define YYNNTS 32 +/* YYNRULES -- Number of rules. */ +#define YYNRULES 104 +/* YYNRULES -- Number of states. */ +#define YYNSTATES 155 + +/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ +#define YYUNDEFTOK 2 +#define YYMAXUTOK 276 + +#define YYTRANSLATE(YYX) \ + ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) + +/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ +static const unsigned char yytranslate[] = +{ + 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 23, 24, 2, 26, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 25, 2, + 2, 22, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 1, 2, 3, 4, + 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, + 15, 16, 17, 18, 19, 20, 21 +}; + +#if YYDEBUG +/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in + YYRHS. */ +static const unsigned short yyprhs[] = +{ + 0, 0, 3, 5, 7, 10, 12, 14, 16, 18, + 24, 30, 34, 37, 43, 49, 53, 56, 62, 68, + 72, 75, 81, 87, 91, 94, 98, 102, 105, 109, + 113, 116, 118, 121, 123, 128, 132, 135, 137, 140, + 142, 147, 151, 154, 155, 158, 161, 163, 166, 168, + 176, 183, 188, 192, 195, 196, 199, 202, 204, 207, + 209, 215, 221, 226, 230, 233, 235, 237, 238, 243, + 247, 250, 251, 253, 256, 259, 260, 263, 266, 269, + 273, 277, 280, 284, 288, 291, 295, 299, 302, 304, + 307, 309, 314, 320, 326, 331, 334, 336, 339, 341, + 344, 346, 348, 349, 350 +}; + +/* YYRHS -- A `-1'-separated list of the rules' RHS. */ +static const yysigned_char yyrhs[] = +{ + 28, 0, -1, 29, -1, 30, -1, 29, 30, -1, + 31, -1, 43, -1, 19, -1, 1, -1, 3, 22, + 23, 32, 24, -1, 3, 22, 23, 32, 1, -1, + 3, 22, 1, -1, 3, 1, -1, 4, 22, 23, + 34, 24, -1, 4, 22, 23, 34, 1, -1, 4, + 22, 1, -1, 4, 1, -1, 5, 22, 23, 37, + 24, -1, 5, 22, 23, 37, 1, -1, 5, 22, + 1, -1, 5, 1, -1, 7, 22, 23, 40, 24, + -1, 7, 22, 23, 40, 1, -1, 7, 22, 1, + -1, 7, 1, -1, 8, 22, 16, -1, 8, 22, + 1, -1, 8, 1, -1, 6, 22, 20, -1, 6, + 22, 1, -1, 6, 1, -1, 33, -1, 32, 33, + -1, 1, -1, 55, 22, 20, 36, -1, 55, 22, + 1, -1, 55, 1, -1, 35, -1, 34, 35, -1, + 1, -1, 55, 22, 20, 36, -1, 55, 22, 1, + -1, 55, 1, -1, -1, 25, 16, -1, 25, 1, + -1, 38, -1, 37, 38, -1, 1, -1, 55, 22, + 20, 58, 25, 18, 39, -1, 55, 22, 20, 58, + 25, 1, -1, 55, 22, 20, 1, -1, 55, 22, + 1, -1, 55, 1, -1, -1, 25, 20, -1, 25, + 1, -1, 41, -1, 40, 41, -1, 1, -1, 42, + 22, 20, 25, 20, -1, 42, 22, 20, 25, 1, + -1, 42, 22, 20, 1, -1, 42, 22, 1, -1, + 42, 1, -1, 20, -1, 21, -1, -1, 45, 47, + 44, 51, -1, 15, 22, 46, -1, 15, 1, -1, + -1, 20, -1, 26, 20, -1, 26, 1, -1, -1, + 47, 49, -1, 47, 50, -1, 47, 48, -1, 10, + 22, 16, -1, 10, 22, 1, -1, 10, 1, -1, + 12, 22, 55, -1, 12, 22, 1, -1, 12, 1, + -1, 13, 22, 55, -1, 13, 22, 1, -1, 13, + 1, -1, 52, -1, 51, 52, -1, 1, -1, 53, + 57, 54, 11, -1, 14, 56, 22, 55, 9, -1, + 14, 56, 22, 55, 1, -1, 14, 56, 22, 1, + -1, 14, 1, -1, 17, -1, 54, 17, -1, 1, + -1, 54, 1, -1, 16, -1, 21, -1, -1, -1, + -1 +}; + +/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ +static const unsigned short yyrline[] = +{ + 0, 124, 124, 131, 132, 135, 136, 137, 138, 141, + 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, + 152, 153, 154, 155, 156, 157, 158, 159, 160, 172, + 173, 179, 180, 181, 184, 191, 192, 198, 199, 200, + 203, 210, 211, 214, 215, 216, 222, 223, 224, 227, + 235, 236, 237, 238, 241, 242, 243, 249, 250, 251, + 254, 264, 265, 266, 267, 270, 271, 281, 281, 284, + 289, 292, 293, 294, 295, 298, 299, 300, 301, 304, + 305, 306, 309, 317, 318, 321, 329, 330, 336, 337, + 338, 341, 349, 378, 379, 380, 383, 384, 385, 386, + 392, 393, 396, 399, 402 +}; +#endif + +#if YYDEBUG || YYERROR_VERBOSE +/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. + First, the terminals, then, starting at YYNTOKENS, nonterminals. */ +static const char *const yytname[] = +{ + "$end", "error", "$undefined", "tSEVNAMES", "tFACNAMES", "tLANNAMES", + "tBASE", "tCODEPAGE", "tTYPEDEF", "tNL", "tSYMNAME", "tMSGEND", + "tSEVERITY", "tFACILITY", "tLANGUAGE", "tMSGID", "tIDENT", "tLINE", + "tFILE", "tCOMMENT", "tNUMBER", "tTOKEN", "'='", "'('", "')'", "':'", + "'+'", "$accept", "file", "items", "decl", "global", "smaps", "smap", + "fmaps", "fmap", "alias", "lmaps", "lmap", "optcp", "cmaps", "cmap", + "clan", "msg", "@1", "msgid", "id", "sevfacsym", "sym", "sev", "fac", + "bodies", "body", "lang", "lines", "token", "setnl", "setline", + "setfile", 0 +}; +#endif + +# ifdef YYPRINT +/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to + token YYLEX-NUM. */ +static const unsigned short yytoknum[] = +{ + 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, + 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, + 275, 276, 61, 40, 41, 58, 43 +}; +# endif + +/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ +static const unsigned char yyr1[] = +{ + 0, 27, 28, 29, 29, 30, 30, 30, 30, 31, + 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, + 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, + 31, 32, 32, 32, 33, 33, 33, 34, 34, 34, + 35, 35, 35, 36, 36, 36, 37, 37, 37, 38, + 38, 38, 38, 38, 39, 39, 39, 40, 40, 40, + 41, 41, 41, 41, 41, 42, 42, 44, 43, 45, + 45, 46, 46, 46, 46, 47, 47, 47, 47, 48, + 48, 48, 49, 49, 49, 50, 50, 50, 51, 51, + 51, 52, 53, 53, 53, 53, 54, 54, 54, 54, + 55, 55, 56, 57, 58 +}; + +/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ +static const unsigned char yyr2[] = +{ + 0, 2, 1, 1, 2, 1, 1, 1, 1, 5, + 5, 3, 2, 5, 5, 3, 2, 5, 5, 3, + 2, 5, 5, 3, 2, 3, 3, 2, 3, 3, + 2, 1, 2, 1, 4, 3, 2, 1, 2, 1, + 4, 3, 2, 0, 2, 2, 1, 2, 1, 7, + 6, 4, 3, 2, 0, 2, 2, 1, 2, 1, + 5, 5, 4, 3, 2, 1, 1, 0, 4, 3, + 2, 0, 1, 2, 2, 0, 2, 2, 2, 3, + 3, 2, 3, 3, 2, 3, 3, 2, 1, 2, + 1, 4, 5, 5, 4, 2, 1, 2, 1, 2, + 1, 1, 0, 0, 0 +}; + +/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state + STATE-NUM when YYTABLE doesn't specify something else to do. Zero + means the default is an error. */ +static const unsigned char yydefact[] = +{ + 0, 8, 0, 0, 0, 0, 0, 0, 0, 7, + 0, 0, 3, 5, 6, 75, 12, 0, 16, 0, + 20, 0, 30, 0, 24, 0, 27, 0, 70, 71, + 1, 4, 67, 11, 0, 15, 0, 19, 0, 29, + 28, 23, 0, 26, 25, 72, 0, 69, 0, 0, + 0, 0, 78, 76, 77, 33, 100, 101, 0, 31, + 0, 39, 0, 37, 0, 48, 0, 46, 0, 59, + 65, 66, 0, 57, 0, 74, 73, 81, 0, 84, + 0, 87, 0, 90, 0, 68, 88, 103, 10, 9, + 32, 36, 0, 14, 13, 38, 42, 0, 18, 17, + 47, 53, 0, 22, 21, 58, 64, 0, 80, 79, + 83, 82, 86, 85, 95, 0, 89, 0, 35, 43, + 41, 43, 52, 0, 63, 0, 0, 98, 96, 0, + 0, 34, 40, 51, 0, 62, 0, 94, 0, 99, + 91, 97, 45, 44, 0, 61, 60, 93, 92, 50, + 54, 0, 49, 56, 55 +}; + +/* YYDEFGOTO[NTERM-NUM]. */ +static const short yydefgoto[] = +{ + -1, 10, 11, 12, 13, 58, 59, 62, 63, 131, + 66, 67, 152, 72, 73, 74, 14, 51, 15, 47, + 32, 52, 53, 54, 85, 86, 87, 129, 60, 115, + 117, 134 +}; + +/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing + STATE-NUM. */ +#define YYPACT_NINF -37 +static const short yypact[] = +{ + 132, -37, 18, 44, 46, 47, 48, 49, 50, -37, + 10, 113, -37, -37, -37, -37, -37, 11, -37, 14, + -37, 19, -37, 85, -37, 20, -37, 147, -37, -13, + -37, -37, 87, -37, 66, -37, 80, -37, 82, -37, + -37, -37, 64, -37, -37, -37, 107, -37, 51, 52, + 53, 3, -37, -37, -37, -37, -37, -37, 7, -37, + 54, -37, 8, -37, 55, -37, 17, -37, 56, -37, + -37, -37, 15, -37, 57, -37, -37, -37, 148, -37, + 88, -37, 90, -37, 58, -3, -37, -37, -37, -37, + -37, -37, 109, -37, -37, -37, -37, 114, -37, -37, + -37, -37, 121, -37, -37, -37, -37, 122, -37, -37, + -37, -37, -37, -37, -37, 38, -37, 129, -37, 36, + -37, 36, -37, 0, -37, 2, 91, -37, -37, 144, + 149, -37, -37, -37, 37, -37, 123, -37, 5, -37, + -37, -37, -37, -37, 4, -37, -37, -37, -37, -37, + 39, 124, -37, -37, -37 +}; + +/* YYPGOTO[NTERM-NUM]. */ +static const yysigned_char yypgoto[] = +{ + -37, -37, -37, 77, -37, -37, 35, -37, 1, -27, + -37, 29, -37, -37, 30, -37, -37, -37, -37, -37, + -37, -37, -37, -37, -37, 41, -37, -37, -36, -37, + -37, -37 +}; + +/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If + positive, shift that token. If negative, reduce the rule which + number is the opposite. If zero, do what YYDEFACT says. + If YYTABLE_NINF, syntax error. */ +#define YYTABLE_NINF -105 +static const short yytable[] = +{ + 64, 133, 68, 135, 83, 149, 147, 45, 88, 93, + 30, 84, 33, 46, 148, 35, 103, 84, 98, 16, + 37, 41, 150, 56, 56, -104, 64, 136, 57, 57, + 68, 89, 94, 56, 34, 70, 71, 36, 57, 104, + 17, 99, 38, 42, 111, 18, 113, 20, 22, 24, + 26, 28, 77, 79, 81, 91, 96, 101, 106, 114, + 126, 130, 144, 95, 151, 69, 19, 55, 21, 23, + 25, 27, 29, 78, 80, 82, 92, 97, 102, 107, + -102, 61, 56, 65, 70, 71, 39, 57, 31, 110, + 138, 112, 137, 90, 132, 100, 56, 48, 56, 49, + 50, 57, 105, 57, 56, 40, 56, 56, 75, 57, + 118, 57, 57, -2, 1, 120, 2, 3, 4, 5, + 6, 7, 122, 124, 145, 153, 116, 76, 8, 119, + 127, 0, 9, 1, 121, 2, 3, 4, 5, 6, + 7, 123, 125, 146, 154, 139, 128, 8, 43, 108, + 142, 9, 0, 0, 0, 140, 0, 0, 0, 0, + 0, 141, 0, 44, 109, 143 +}; + +static const yysigned_char yycheck[] = +{ + 36, 1, 38, 1, 1, 1, 1, 20, 1, 1, + 0, 14, 1, 26, 9, 1, 1, 14, 1, 1, + 1, 1, 18, 16, 16, 25, 62, 25, 21, 21, + 66, 24, 24, 16, 23, 20, 21, 23, 21, 24, + 22, 24, 23, 23, 80, 1, 82, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 22, 25, 25, 62, 25, 1, 22, 1, 22, 22, + 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, + 22, 1, 16, 1, 20, 21, 1, 21, 11, 1, + 126, 1, 1, 58, 121, 66, 16, 10, 16, 12, + 13, 21, 72, 21, 16, 20, 16, 16, 1, 21, + 1, 21, 21, 0, 1, 1, 3, 4, 5, 6, + 7, 8, 1, 1, 1, 1, 85, 20, 15, 20, + 1, -1, 19, 1, 20, 3, 4, 5, 6, 7, + 8, 20, 20, 20, 20, 1, 17, 15, 1, 1, + 1, 19, -1, -1, -1, 11, -1, -1, -1, -1, + -1, 17, -1, 16, 16, 16 +}; + +/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing + symbol of state STATE-NUM. */ +static const unsigned char yystos[] = +{ + 0, 1, 3, 4, 5, 6, 7, 8, 15, 19, + 28, 29, 30, 31, 43, 45, 1, 22, 1, 22, + 1, 22, 1, 22, 1, 22, 1, 22, 1, 22, + 0, 30, 47, 1, 23, 1, 23, 1, 23, 1, + 20, 1, 23, 1, 16, 20, 26, 46, 10, 12, + 13, 44, 48, 49, 50, 1, 16, 21, 32, 33, + 55, 1, 34, 35, 55, 1, 37, 38, 55, 1, + 20, 21, 40, 41, 42, 1, 20, 1, 22, 1, + 22, 1, 22, 1, 14, 51, 52, 53, 1, 24, + 33, 1, 22, 1, 24, 35, 1, 22, 1, 24, + 38, 1, 22, 1, 24, 41, 1, 22, 1, 16, + 1, 55, 1, 55, 1, 56, 52, 57, 1, 20, + 1, 20, 1, 20, 1, 20, 22, 1, 17, 54, + 25, 36, 36, 1, 58, 1, 25, 1, 55, 1, + 11, 17, 1, 16, 25, 1, 20, 1, 9, 1, + 18, 25, 39, 1, 20 +}; + +#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) +# define YYSIZE_T __SIZE_TYPE__ +#endif +#if ! defined (YYSIZE_T) && defined (size_t) +# define YYSIZE_T size_t +#endif +#if ! defined (YYSIZE_T) +# if defined (__STDC__) || defined (__cplusplus) +# include <stddef.h> /* INFRINGES ON USER NAME SPACE */ +# define YYSIZE_T size_t +# endif +#endif +#if ! defined (YYSIZE_T) +# define YYSIZE_T unsigned int +#endif + +#define yyerrok (yyerrstatus = 0) +#define yyclearin (yychar = YYEMPTY) +#define YYEMPTY (-2) +#define YYEOF 0 + +#define YYACCEPT goto yyacceptlab +#define YYABORT goto yyabortlab +#define YYERROR goto yyerrorlab + + +/* Like YYERROR except do call yyerror. This remains here temporarily + to ease the transition to the new meaning of YYERROR, for GCC. + Once GCC version 2 has supplanted version 1, this can go. */ + +#define YYFAIL goto yyerrlab + +#define YYRECOVERING() (!!yyerrstatus) + +#define YYBACKUP(Token, Value) \ +do \ + if (yychar == YYEMPTY && yylen == 1) \ + { \ + yychar = (Token); \ + yylval = (Value); \ + yytoken = YYTRANSLATE (yychar); \ + YYPOPSTACK; \ + goto yybackup; \ + } \ + else \ + { \ + yyerror ("syntax error: cannot back up");\ + YYERROR; \ + } \ +while (0) + +#define YYTERROR 1 +#define YYERRCODE 256 + +/* YYLLOC_DEFAULT -- Compute the default location (before the actions + are run). */ + +#ifndef YYLLOC_DEFAULT +# define YYLLOC_DEFAULT(Current, Rhs, N) \ + ((Current).first_line = (Rhs)[1].first_line, \ + (Current).first_column = (Rhs)[1].first_column, \ + (Current).last_line = (Rhs)[N].last_line, \ + (Current).last_column = (Rhs)[N].last_column) +#endif + +/* YYLEX -- calling `yylex' with the right arguments. */ + +#ifdef YYLEX_PARAM +# define YYLEX yylex (YYLEX_PARAM) +#else +# define YYLEX yylex () +#endif + +/* Enable debugging if requested. */ +#if YYDEBUG + +# ifndef YYFPRINTF +# include <stdio.h> /* INFRINGES ON USER NAME SPACE */ +# define YYFPRINTF fprintf +# endif + +# define YYDPRINTF(Args) \ +do { \ + if (yydebug) \ + YYFPRINTF Args; \ +} while (0) + +# define YYDSYMPRINT(Args) \ +do { \ + if (yydebug) \ + yysymprint Args; \ +} while (0) + +# define YYDSYMPRINTF(Title, Token, Value, Location) \ +do { \ + if (yydebug) \ + { \ + YYFPRINTF (stderr, "%s ", Title); \ + yysymprint (stderr, \ + Token, Value); \ + YYFPRINTF (stderr, "\n"); \ + } \ +} while (0) + +/*------------------------------------------------------------------. +| yy_stack_print -- Print the state stack from its BOTTOM up to its | +| TOP (included). | +`------------------------------------------------------------------*/ + +#if defined (__STDC__) || defined (__cplusplus) +static void +yy_stack_print (short *bottom, short *top) +#else +static void +yy_stack_print (bottom, top) + short *bottom; + short *top; +#endif +{ + YYFPRINTF (stderr, "Stack now"); + for (/* Nothing. */; bottom <= top; ++bottom) + YYFPRINTF (stderr, " %d", *bottom); + YYFPRINTF (stderr, "\n"); +} + +# define YY_STACK_PRINT(Bottom, Top) \ +do { \ + if (yydebug) \ + yy_stack_print ((Bottom), (Top)); \ +} while (0) + + +/*------------------------------------------------. +| Report that the YYRULE is going to be reduced. | +`------------------------------------------------*/ + +#if defined (__STDC__) || defined (__cplusplus) +static void +yy_reduce_print (int yyrule) +#else +static void +yy_reduce_print (yyrule) + int yyrule; +#endif +{ + int yyi; + unsigned int yylno = yyrline[yyrule]; + YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ", + yyrule - 1, yylno); + /* Print the symbols being reduced, and their result. */ + for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++) + YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]); + YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]); +} + +# define YY_REDUCE_PRINT(Rule) \ +do { \ + if (yydebug) \ + yy_reduce_print (Rule); \ +} while (0) + +/* Nonzero means print parse trace. It is left uninitialized so that + multiple parsers can coexist. */ +int yydebug; +#else /* !YYDEBUG */ +# define YYDPRINTF(Args) +# define YYDSYMPRINT(Args) +# define YYDSYMPRINTF(Title, Token, Value, Location) +# define YY_STACK_PRINT(Bottom, Top) +# define YY_REDUCE_PRINT(Rule) +#endif /* !YYDEBUG */ + + +/* YYINITDEPTH -- initial size of the parser's stacks. */ +#ifndef YYINITDEPTH +# define YYINITDEPTH 200 +#endif + +/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only + if the built-in stack extension method is used). + + Do not make this value too large; the results are undefined if + SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH) + evaluated with infinite-precision integer arithmetic. */ + +#if defined (YYMAXDEPTH) && YYMAXDEPTH == 0 +# undef YYMAXDEPTH +#endif + +#ifndef YYMAXDEPTH +# define YYMAXDEPTH 10000 +#endif + + + +#if YYERROR_VERBOSE + +# ifndef yystrlen +# if defined (__GLIBC__) && defined (_STRING_H) +# define yystrlen strlen +# else +/* Return the length of YYSTR. */ +static YYSIZE_T +# if defined (__STDC__) || defined (__cplusplus) +yystrlen (const char *yystr) +# else +yystrlen (yystr) + const char *yystr; +# endif +{ + register const char *yys = yystr; + + while (*yys++ != '\0') + continue; + + return yys - yystr - 1; +} +# endif +# endif + +# ifndef yystpcpy +# if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE) +# define yystpcpy stpcpy +# else +/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in + YYDEST. */ +static char * +# if defined (__STDC__) || defined (__cplusplus) +yystpcpy (char *yydest, const char *yysrc) +# else +yystpcpy (yydest, yysrc) + char *yydest; + const char *yysrc; +# endif +{ + register char *yyd = yydest; + register const char *yys = yysrc; + + while ((*yyd++ = *yys++) != '\0') + continue; + + return yyd - 1; +} +# endif +# endif + +#endif /* !YYERROR_VERBOSE */ + + + +#if YYDEBUG +/*--------------------------------. +| Print this symbol on YYOUTPUT. | +`--------------------------------*/ + +#if defined (__STDC__) || defined (__cplusplus) +static void +yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep) +#else +static void +yysymprint (yyoutput, yytype, yyvaluep) + FILE *yyoutput; + int yytype; + YYSTYPE *yyvaluep; +#endif +{ + /* Pacify ``unused variable'' warnings. */ + (void) yyvaluep; + + if (yytype < YYNTOKENS) + { + YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); +# ifdef YYPRINT + YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); +# endif + } + else + YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); + + switch (yytype) + { + default: + break; + } + YYFPRINTF (yyoutput, ")"); +} + +#endif /* ! YYDEBUG */ +/*-----------------------------------------------. +| Release the memory associated to this symbol. | +`-----------------------------------------------*/ + +#if defined (__STDC__) || defined (__cplusplus) +static void +yydestruct (int yytype, YYSTYPE *yyvaluep) +#else [truncated at 1000 lines; 1658 more skipped]
19 years
1
0
0
0
[gvg] 19727: Remove outdated wmc
by gvg@svn.reactos.com
Remove outdated wmc Deleted: trunk/reactos/tools/wmc/
19 years
1
0
0
0
[ion] 19726: - Make the NDK compatible with the MSDDK again.
by ion@svn.reactos.com
- Make the NDK compatible with the MSDDK again. - Fix some w32api incompatibility cruft since w32api insists on including winnt.h from kernel-mode. - Fix some stuff that was including both kernel-mode and user-mode headers together. - Use PISECURITY_DESCRIPTOR, not PSECURITY_DESCRIPTOR. Modified: trunk/reactos/drivers/multimedia/portcls/portcls.c Modified: trunk/reactos/drivers/multimedia/portcls/portcls.h Modified: trunk/reactos/drivers/net/afd/include/afd.h Modified: trunk/reactos/drivers/net/wshtcpip/wshtcpip.h Modified: trunk/reactos/drivers/video/displays/vga/vgaddi.h Modified: trunk/reactos/include/arc/arc.h Modified: trunk/reactos/include/ndk/cmfuncs.h Modified: trunk/reactos/include/ndk/exfuncs.h Modified: trunk/reactos/include/ndk/haltypes.h Modified: trunk/reactos/include/ndk/i386/ketypes.h Modified: trunk/reactos/include/ndk/ifssupp.h Modified: trunk/reactos/include/ndk/iofuncs.h Modified: trunk/reactos/include/ndk/ketypes.h Modified: trunk/reactos/include/ndk/mmfuncs.h Modified: trunk/reactos/include/ndk/obfuncs.h Modified: trunk/reactos/include/ndk/obtypes.h Modified: trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/include/ndk/rtltypes.h Modified: trunk/reactos/include/ndk/setypes.h Modified: trunk/reactos/lib/hid/precomp.h Modified: trunk/reactos/lib/rtl/bootdata.c Modified: trunk/reactos/ntoskrnl/cm/regobj.c Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/ob/security.c Modified: trunk/reactos/ntoskrnl/se/sd.c Modified: trunk/reactos/ntoskrnl/se/semgr.c Modified: trunk/reactos/w32api/include/ddk/ntifs.h Modified: trunk/reactos/w32api/include/ddk/winddk.h Modified: trunk/reactos/w32api/include/winnt.h _____ Modified: trunk/reactos/drivers/multimedia/portcls/portcls.c --- trunk/reactos/drivers/multimedia/portcls/portcls.c 2005-11-28 21:28:12 UTC (rev 19725) +++ trunk/reactos/drivers/multimedia/portcls/portcls.c 2005-11-28 21:40:21 UTC (rev 19726) @@ -25,8 +25,6 @@ * REVISION HISTORY: * 21 November 2005 Created James Tabor */ -#include <ddk/ntddk.h> -#include <windows.h> #include "portcls.h" _____ Modified: trunk/reactos/drivers/multimedia/portcls/portcls.h --- trunk/reactos/drivers/multimedia/portcls/portcls.h 2005-11-28 21:28:12 UTC (rev 19725) +++ trunk/reactos/drivers/multimedia/portcls/portcls.h 2005-11-28 21:40:21 UTC (rev 19726) @@ -13,7 +13,6 @@ extern "C" { #endif -#include <windef.h> #include <ddk/ntddk.h> #define PORTCLASSAPI extern _____ Modified: trunk/reactos/drivers/net/afd/include/afd.h --- trunk/reactos/drivers/net/afd/include/afd.h 2005-11-28 21:28:12 UTC (rev 19725) +++ trunk/reactos/drivers/net/afd/include/afd.h 2005-11-28 21:40:21 UTC (rev 19726) @@ -17,6 +17,8 @@ #include <tdikrnl.h> #include <tdiinfo.h> #include <string.h> +#define _WINBASE_ +#define _WINDOWS_H #include <winsock2.h> #include <afd/shared.h> _____ Modified: trunk/reactos/drivers/net/wshtcpip/wshtcpip.h --- trunk/reactos/drivers/net/wshtcpip/wshtcpip.h 2005-11-28 21:28:12 UTC (rev 19725) +++ trunk/reactos/drivers/net/wshtcpip/wshtcpip.h 2005-11-28 21:40:21 UTC (rev 19726) @@ -7,7 +7,9 @@ #ifndef __WSHTCPIP_H #define __WSHTCPIP_H -#include <ddk/ntddk.h> +#define WIN32_NO_STATUS +#include <windows.h> +#include <rtlfuncs.h> #include <wsahelp.h> #define EXPORT STDCALL _____ Modified: trunk/reactos/drivers/video/displays/vga/vgaddi.h --- trunk/reactos/drivers/video/displays/vga/vgaddi.h 2005-11-28 21:28:12 UTC (rev 19725) +++ trunk/reactos/drivers/video/displays/vga/vgaddi.h 2005-11-28 21:40:21 UTC (rev 19726) @@ -1,3 +1,5 @@ +#define _WINBASE_ +#define _WINDOWS_H #include <windef.h> #include <wingdi.h> #include <ddk/ntddk.h> _____ Modified: trunk/reactos/include/arc/arc.h --- trunk/reactos/include/arc/arc.h 2005-11-28 21:28:12 UTC (rev 19725) +++ trunk/reactos/include/arc/arc.h 2005-11-28 21:40:21 UTC (rev 19726) @@ -42,4 +42,17 @@ LPSTR Identifier; } CONFIGURATION_COMPONENT, *PCONFIGURATION_COMPONENT; +typedef struct _CONFIGURATION_COMPONENT_DATA +{ + struct _CONFIGURATION_COMPONENT_DATA *Parent; + struct _CONFIGURATION_COMPONENT_DATA *Child; + struct _CONFIGURATION_COMPONENT_DATA *Sibling; + CONFIGURATION_COMPONENT Component; +} CONFIGURATION_COMPONENT_DATA, *PCONFIGURATION_COMPONENT_DATA; + +typedef struct _ARC_DISK_INFORMATION +{ + LIST_ENTRY DiskSignatureListHead; +} ARC_DISK_INFORMATION, *PARC_DISK_INFORMATION; + #endif _____ Modified: trunk/reactos/include/ndk/cmfuncs.h --- trunk/reactos/include/ndk/cmfuncs.h 2005-11-28 21:28:12 UTC (rev 19725) +++ trunk/reactos/include/ndk/cmfuncs.h 2005-11-28 21:40:21 UTC (rev 19726) @@ -230,6 +230,7 @@ IN POBJECT_ATTRIBUTES KeyObjectAttributes ); +#ifdef NTOS_MODE_USER NTSTATUS NTAPI ZwCreateKey( @@ -242,6 +243,7 @@ IN PULONG Disposition OPTIONAL ); + NTSTATUS NTAPI ZwDeleteKey( @@ -426,6 +428,7 @@ IN PVOID Data, IN ULONG DataSize ); +#endif NTSTATUS NTAPI _____ Modified: trunk/reactos/include/ndk/exfuncs.h --- trunk/reactos/include/ndk/exfuncs.h 2005-11-28 21:28:12 UTC (rev 19725) +++ trunk/reactos/include/ndk/exfuncs.h 2005-11-28 21:40:21 UTC (rev 19726) @@ -417,12 +417,14 @@ IN OUT PRTL_ATOM Atom ); +#ifdef NTOS_MODE_USER NTSTATUS NTAPI ZwCancelTimer( IN HANDLE TimerHandle, OUT PBOOLEAN CurrentState OPTIONAL ); +#endif NTSTATUS NTAPI @@ -467,6 +469,7 @@ IN LONG MaximumCount ); +#ifdef NTOS_MODE_USER NTSTATUS NTAPI ZwCreateTimer( @@ -475,6 +478,7 @@ IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, IN TIMER_TYPE TimerType ); +#endif NTSTATUS NTAPI @@ -528,6 +532,7 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); +#ifdef NTOS_MODE_USER NTSTATUS NTAPI ZwOpenTimer( @@ -535,6 +540,7 @@ IN ACCESS_MASK DesiredAccess, IN POBJECT_ATTRIBUTES ObjectAttributes ); +#endif NTSTATUS NTAPI @@ -728,6 +734,7 @@ IN ULONG SystemInformationLength ); +#ifdef NTOS_MODE_USER NTSTATUS NTAPI ZwSetTimer( @@ -739,6 +746,7 @@ IN LONG Period OPTIONAL, OUT PBOOLEAN PreviousState OPTIONAL ); +#endif NTSTATUS NTAPI _____ Modified: trunk/reactos/include/ndk/haltypes.h --- trunk/reactos/include/ndk/haltypes.h 2005-11-28 21:28:12 UTC (rev 19725) +++ trunk/reactos/include/ndk/haltypes.h 2005-11-28 21:40:21 UTC (rev 19726) @@ -87,8 +87,8 @@ USHORT DockData1; USHORT DockData2; USHORT DockData3; - ULONG DockData3; ULONG DockData4; + ULONG DockData5; } PROFILE_PARAMETER_BLOCK, *PPROFILE_PARAMETER_BLOCK; typedef struct _HEADLESS_LOADER_BLOCK _____ Modified: trunk/reactos/include/ndk/i386/ketypes.h --- trunk/reactos/include/ndk/i386/ketypes.h 2005-11-28 21:28:12 UTC (rev 19725) +++ trunk/reactos/include/ndk/i386/ketypes.h 2005-11-28 21:40:21 UTC (rev 19726) @@ -86,7 +86,7 @@ } FX_SAVE_AREA, *PFX_SAVE_AREA; // -// FIXME: Trap Frame Definition +// Trap Frame Definition // typedef struct _KTRAP_FRAME { _____ Modified: trunk/reactos/include/ndk/ifssupp.h --- trunk/reactos/include/ndk/ifssupp.h 2005-11-28 21:28:12 UTC (rev 19725) +++ trunk/reactos/include/ndk/ifssupp.h 2005-11-28 21:40:21 UTC (rev 19726) @@ -19,7 +19,16 @@ #ifndef NTOS_MODE_USER #define _NTIFS_ +#define TOKEN_SOURCE_LENGTH 8 + +typedef enum _TOKEN_TYPE +{ + TokenPrimary = 1, + TokenImpersonation +} TOKEN_TYPE, *PTOKEN_TYPE; + typedef PVOID PRTL_HEAP_PARAMETERS; +typedef USHORT SECURITY_DESCRIPTOR_CONTROL, *PSECURITY_DESCRIPTOR_CONTROL; typedef struct _RTL_SPLAY_LINKS { @@ -93,7 +102,7 @@ typedef struct _KAPC_STATE { LIST_ENTRY ApcListHead[2]; - PKPROCESS Process; + struct _KPROCESS *Process; BOOLEAN KernelApcInProgress; BOOLEAN KernelApcPending; BOOLEAN UserApcPending; @@ -108,9 +117,40 @@ LIST_ENTRY ThreadListHead; } KQUEUE, *PKQUEUE, *RESTRICTED_POINTER PRKQUEUE; -typedef PVOID EX_RUNDOWN_REF; typedef PVOID EX_PUSH_LOCK; +typedef enum _RTL_GENERIC_COMPARE_RESULTS +{ + GenericLessThan, + GenericGreaterThan, + GenericEqual +} RTL_GENERIC_COMPARE_RESULTS; + +typedef struct _SID_IDENTIFIER_AUTHORITY +{ + UCHAR Value[6]; +} SID_IDENTIFIER_AUTHORITY, *PSID_IDENTIFIER_AUTHORITY; + +typedef struct _SID_AND_ATTRIBUTES +{ + PSID Sid; + ULONG Attributes; +} SID_AND_ATTRIBUTES, * PSID_AND_ATTRIBUTES; + +typedef struct _TOKEN_SOURCE +{ + CHAR SourceName[TOKEN_SOURCE_LENGTH]; + LUID SourceIdentifier; +} TOKEN_SOURCE, *PTOKEN_SOURCE; + +typedef struct _TOKEN_CONTROL +{ + LUID TokenId; + LUID AuthenticationId; + LUID ModifiedId; + TOKEN_SOURCE TokenSource; +} TOKEN_CONTROL, *PTOKEN_CONTROL; + typedef struct _SECURITY_CLIENT_CONTEXT { SECURITY_QUALITY_OF_SERVICE SecurityQos; @@ -121,12 +161,79 @@ TOKEN_CONTROL ClientTokenControl; } SECURITY_CLIENT_CONTEXT, *PSECURITY_CLIENT_CONTEXT; -typedef enum _RTL_GENERIC_COMPARE_RESULTS +typedef struct _SECURITY_DESCRIPTOR_RELATIVE { - GenericLessThan, - GenericGreaterThan, - GenericEqual -} RTL_GENERIC_COMPARE_RESULTS; + UCHAR Revision; + UCHAR Sbz1; + SECURITY_DESCRIPTOR_CONTROL Control; + ULONG Owner; + ULONG Group; + ULONG Sacl; + ULONG Dacl; +} SECURITY_DESCRIPTOR_RELATIVE, *PISECURITY_DESCRIPTOR_RELATIVE; +typedef struct _TOKEN_GROUPS +{ + ULONG GroupCount; + SID_AND_ATTRIBUTES Groups[ANYSIZE_ARRAY]; +} TOKEN_GROUPS, *PTOKEN_GROUPS; + +typedef struct _TOKEN_PRIVILEGES +{ + ULONG PrivilegeCount; + LUID_AND_ATTRIBUTES Privileges[ANYSIZE_ARRAY]; +} TOKEN_PRIVILEGES, *PTOKEN_PRIVILEGES; + +typedef struct _TOKEN_USER +{ + SID_AND_ATTRIBUTES User; +} TOKEN_USER, *PTOKEN_USER; + +typedef enum _TOKEN_INFORMATION_CLASS +{ + TokenUser = 1, + TokenGroups, + TokenPrivileges, + TokenOwner, + TokenPrimaryGroup, + TokenDefaultDacl, + TokenSource, + TokenType, + TokenImpersonationLevel, + TokenStatistics, + TokenRestrictedSids, + TokenSessionId, + TokenGroupsAndPrivileges, + TokenSessionReference, + TokenSandBoxInert, + TokenAuditPolicy, + TokenOrigin, + TokenElevationType, + TokenLinkedToken, + TokenElevation, + TokenIsRestricted, + TokenAccessInformation, + TokenVirtualization, + TokenIntegrityLevel, + TokenIntegrityLevelDesktop, + TokenMandatoryPolicy, + MaxTokenInfoClass +} TOKEN_INFORMATION_CLASS, *PTOKEN_INFORMATION_CLASS; + +typedef struct _TOKEN_OWNER +{ + PSID Owner; +} TOKEN_OWNER, *PTOKEN_OWNER; + +typedef struct _TOKEN_PRIMARY_GROUP +{ + PSID PrimaryGroup; +} TOKEN_PRIMARY_GROUP, *PTOKEN_PRIMARY_GROUP; + +typedef struct _TOKEN_DEFAULT_DACL +{ + PACL DefaultDacl; +} TOKEN_DEFAULT_DACL, *PTOKEN_DEFAULT_DACL; + #endif // !NTOS_MODE_USER #endif // _NTIFS_ _____ Modified: trunk/reactos/include/ndk/iofuncs.h --- trunk/reactos/include/ndk/iofuncs.h 2005-11-28 21:28:12 UTC (rev 19725) +++ trunk/reactos/include/ndk/iofuncs.h 2005-11-28 21:40:21 UTC (rev 19726) @@ -617,11 +617,13 @@ IN ULONG OutputBufferSize ); +#ifdef NTOS_MODE_USER NTSTATUS NTAPI ZwLoadDriver( IN PUNICODE_STRING DriverServiceName ); +#endif NTSYSCALLAPI NTSTATUS @@ -891,6 +893,7 @@ ULONG Unknown3 ); +NTSYSAPI NTSTATUS NTAPI ZwUnloadDriver( _____ Modified: trunk/reactos/include/ndk/ketypes.h --- trunk/reactos/include/ndk/ketypes.h 2005-11-28 21:28:12 UTC (rev 19725) +++ trunk/reactos/include/ndk/ketypes.h 2005-11-28 21:40:21 UTC (rev 19726) @@ -339,17 +339,6 @@ #include <arch/ketypes.h> // -// ARC Component Data -// -typedef struct _CONFIGURATION_COMPONENT_DATA -{ - struct _CONFIGURATION_COMPONENT_DATA *Parent; - struct _CONFIGURATION_COMPONENT_DATA *Child; - struct _CONFIGURATION_COMPONENT_DATA *Sibling; - CONFIGURATION_COMPONENT Component; -} CONFIGURATION_COMPONENT_DATA, *PCONFIGURATION_COMPONENT_DATA; - -// // Kernel Memory Node // typedef struct _KNODE @@ -374,7 +363,7 @@ CSHORT Type; CSHORT Size; LIST_ENTRY ProfileListEntry; - PKPROCESS Process; + struct _KPROCESS *Process; PVOID RangeBase; PVOID RangeLimit; ULONG BucketShift; @@ -696,7 +685,7 @@ KEXECUTE_OPTIONS Flags; /* 06B */ ULONG StackCount; /* 06C */ LIST_ENTRY ProcessListEntry; /* 070 */ -} KPROCESS; +} KPROCESS, *PKPROCESS; // // System Service Table Descriptor _____ Modified: trunk/reactos/include/ndk/mmfuncs.h --- trunk/reactos/include/ndk/mmfuncs.h 2005-11-28 21:28:12 UTC (rev 19725) +++ trunk/reactos/include/ndk/mmfuncs.h 2005-11-28 21:40:21 UTC (rev 19726) @@ -260,6 +260,7 @@ PULONG NumberOfBytesLocked ); +NTSYSAPI NTSTATUS NTAPI ZwMapViewOfSection( @@ -275,6 +276,7 @@ IN ULONG AccessProtection ); +NTSYSAPI NTSTATUS NTAPI ZwOpenSection( @@ -333,6 +335,7 @@ OUT PULONG NumberOfBytesUnlocked OPTIONAL ); +NTSYSAPI NTSTATUS NTAPI ZwUnmapViewOfSection( _____ Modified: trunk/reactos/include/ndk/obfuncs.h --- trunk/reactos/include/ndk/obfuncs.h 2005-11-28 21:28:12 UTC (rev 19725) +++ trunk/reactos/include/ndk/obfuncs.h 2005-11-28 21:40:21 UTC (rev 19726) @@ -269,6 +269,7 @@ IN BOOLEAN GenerateOnClose ); +NTSYSAPI NTSTATUS NTAPI ZwCreateDirectoryObject( @@ -313,6 +314,7 @@ IN HANDLE Object ); +NTSYSAPI NTSTATUS NTAPI ZwMakeTemporaryObject( @@ -335,6 +337,7 @@ POBJECT_ATTRIBUTES ObjectAttributes ); +NTSYSAPI NTSTATUS NTAPI ZwOpenSymbolicLinkObject( @@ -376,6 +379,7 @@ OUT PULONG ResultLength ); +NTSYSAPI NTSTATUS NTAPI ZwQuerySymbolicLinkObject( _____ Modified: trunk/reactos/include/ndk/obtypes.h --- trunk/reactos/include/ndk/obtypes.h 2005-11-28 21:28:12 UTC (rev 19725) +++ trunk/reactos/include/ndk/obtypes.h 2005-11-28 21:40:21 UTC (rev 19726) @@ -120,11 +120,11 @@ // // Dump Control Structure for Object Debugging // -typedef struct _OBJECT_DUMP_CONTROL +typedef struct _OB_DUMP_CONTROL { PVOID Stream; ULONG Detail; -} OBJECT_DUMP_CONTROL, *POBJECT_DUMP_CONTROL; +} OB_DUMP_CONTROL, *POB_DUMP_CONTROL; #ifndef NTOS_MODE_USER #ifndef _REACTOS_ @@ -196,6 +196,11 @@ OUT PULONG ReturnLength ); +typedef NTSTATUS +(NTAPI *OB_OKAYTOCLOSE_METHOD)( + VOID +); + #else // _____ Modified: trunk/reactos/include/ndk/rtlfuncs.h --- trunk/reactos/include/ndk/rtlfuncs.h 2005-11-28 21:28:12 UTC (rev 19725) +++ trunk/reactos/include/ndk/rtlfuncs.h 2005-11-28 21:40:21 UTC (rev 19726) @@ -1595,33 +1595,8 @@ IN BOOLEAN IsWinlogon ); -static __inline -struct _PEB* -NtCurrentPeb(VOID) -{ - struct _PEB *pPeb; +#define NtCurrentPeb() (NtCurrentTeb()->ProcessEnvironmentBlock) -#if defined(__GNUC__) - - __asm__ __volatile__ - ( - "movl %%fs:0x30, %0\n" /* fs:30h == Teb->Peb */ - : "=r" (pPeb) /* can't have two memory operands */ - : /* no inputs */ - ); - -#elif defined(_MSC_VER) - - __asm mov eax, fs:0x30; - __asm mov pPeb, eax - -#else -#error Unknown compiler for inline assembler -#endif - - return pPeb; -} - // // Environment/Path Functions // _____ Modified: trunk/reactos/include/ndk/rtltypes.h --- trunk/reactos/include/ndk/rtltypes.h 2005-11-28 21:28:12 UTC (rev 19725) +++ trunk/reactos/include/ndk/rtltypes.h 2005-11-28 21:40:21 UTC (rev 19726) @@ -537,11 +537,18 @@ CSHORT Milliseconds; CSHORT Weekday; } TIME_FIELDS, *PTIME_FIELDS; -#endif +#else // -// ACE Definition +// ACE Definitions // +typedef struct _ACE_HEADER +{ + UCHAR AceType; + UCHAR AceFlags; + USHORT AceSize; +} ACE_HEADER, *PACE_HEADER; +#endif typedef struct _ACE { ACE_HEADER Header; _____ Modified: trunk/reactos/include/ndk/setypes.h --- trunk/reactos/include/ndk/setypes.h 2005-11-28 21:28:12 UTC (rev 19725) +++ trunk/reactos/include/ndk/setypes.h 2005-11-28 21:40:21 UTC (rev 19726) @@ -24,10 +24,11 @@ // #include <umtypes.h> +#ifdef NTOS_MODE_USER + // // Privilege constants // -#ifdef NTOS_MODE_USER #define SE_MIN_WELL_KNOWN_PRIVILEGE (2L) #define SE_CREATE_TOKEN_PRIVILEGE (2L) #define SE_ASSIGNPRIMARYTOKEN_PRIVILEGE (3L) @@ -54,12 +55,11 @@ #define SE_CHANGE_NOTIFY_PRIVILEGE (23L) #define SE_REMOTE_SHUTDOWN_PRIVILEGE (24L) #define SE_MAX_WELL_KNOWN_PRIVILEGE (SE_REMOTE_SHUTDOWN_PRIVILEGE) -#endif +#else // -// Policy types +// Audit and Policy Structures // -#ifndef NTOS_MODE_USER typedef struct _SEP_AUDIT_POLICY_CATEGORIES { UCHAR System:4; _____ Modified: trunk/reactos/lib/hid/precomp.h --- trunk/reactos/lib/hid/precomp.h 2005-11-28 21:28:12 UTC (rev 19725) +++ trunk/reactos/lib/hid/precomp.h 2005-11-28 21:40:21 UTC (rev 19726) @@ -1,8 +1,16 @@ -#include <ddk/ntddk.h> +#define WIN32_NO_STATUS #include <windows.h> +#define DDKAPI __stdcall #define _HIDPI_ #define _HIDPI_NO_FUNCTION_MACROS_ +typedef VOID +(DDKAPI *PINTERFACE_REFERENCE)( + PVOID Context); +typedef VOID +(DDKAPI *PINTERFACE_DEREFERENCE)( + PVOID Context); +#include <ntndk.h> #include <ddk/hidusage.h> #include <ddk/hidclass.h> #include <ddk/hidpi.h> _____ Modified: trunk/reactos/lib/rtl/bootdata.c --- trunk/reactos/lib/rtl/bootdata.c 2005-11-28 21:28:12 UTC (rev 19725) +++ trunk/reactos/lib/rtl/bootdata.c 2005-11-28 21:40:21 UTC (rev 19726) @@ -126,7 +126,7 @@ static NTSTATUS RtlpSysVolCheckOwnerAndSecurity(IN HANDLE DirectoryHandle, - IN PSECURITY_DESCRIPTOR SecurityDescriptor) + IN PISECURITY_DESCRIPTOR SecurityDescriptor) { PSECURITY_DESCRIPTOR RelSD = NULL; PSECURITY_DESCRIPTOR NewRelSD = NULL; @@ -549,7 +549,7 @@ HANDLE hDirectory; UNICODE_STRING DirectoryName, NewPath; ULONG PathLen; - PSECURITY_DESCRIPTOR SecurityDescriptor = NULL; + PISECURITY_DESCRIPTOR SecurityDescriptor = NULL; PSID SystemSid = NULL; BOOLEAN AddSep = FALSE; NTSTATUS Status; _____ Modified: trunk/reactos/ntoskrnl/cm/regobj.c --- trunk/reactos/ntoskrnl/cm/regobj.c 2005-11-28 21:28:12 UTC (rev 19725) +++ trunk/reactos/ntoskrnl/cm/regobj.c 2005-11-28 21:40:21 UTC (rev 19726) @@ -336,7 +336,7 @@ static NTSTATUS CmiQuerySecurityDescriptor(PKEY_OBJECT KeyObject, SECURITY_INFORMATION SecurityInformation, - PSECURITY_DESCRIPTOR SecurityDescriptor, + PISECURITY_DESCRIPTOR SecurityDescriptor, PULONG BufferLength) { ULONG_PTR Current; _____ Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h --- trunk/reactos/ntoskrnl/include/ntoskrnl.h 2005-11-28 21:28:12 UTC (rev 19725) +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h 2005-11-28 21:40:21 UTC (rev 19726) @@ -13,8 +13,8 @@ #define _NTSYSTEM_ /* DDK/IFS/NDK Headers */ +#include <ddk/ntifs.h> #include <ddk/ntddk.h> -#include <ddk/ntifs.h> #include <ddk/wdmguid.h> #include <ndk/ntndk.h> _____ Modified: trunk/reactos/ntoskrnl/ob/security.c --- trunk/reactos/ntoskrnl/ob/security.c 2005-11-28 21:28:12 UTC (rev 19725) +++ trunk/reactos/ntoskrnl/ob/security.c 2005-11-28 21:40:21 UTC (rev 19726) @@ -263,7 +263,7 @@ IN ULONG RefBias) { /* HACK: Return the same descriptor back */ - PSECURITY_DESCRIPTOR SdCopy; + PISECURITY_DESCRIPTOR SdCopy; DPRINT1("ObLogSecurityDescriptor is not implemented!\n", InputSecurityDescriptor); SdCopy = ExAllocatePool(PagedPool, sizeof(*SdCopy)); _____ Modified: trunk/reactos/ntoskrnl/se/sd.c --- trunk/reactos/ntoskrnl/se/sd.c 2005-11-28 21:28:12 UTC (rev 19725) +++ trunk/reactos/ntoskrnl/se/sd.c 2005-11-28 21:40:21 UTC (rev 19726) @@ -113,7 +113,7 @@ NTSTATUS STDCALL SeSetWorldSecurityDescriptor(SECURITY_INFORMATION SecurityInformation, - PSECURITY_DESCRIPTOR SecurityDescriptor, + PISECURITY_DESCRIPTOR SecurityDescriptor, PULONG BufferLength) { ULONG_PTR Current; @@ -356,15 +356,16 @@ NTSTATUS STDCALL SeCaptureSecurityDescriptor( - IN PSECURITY_DESCRIPTOR OriginalSecurityDescriptor, + IN PSECURITY_DESCRIPTOR _OriginalSecurityDescriptor, IN KPROCESSOR_MODE CurrentMode, IN POOL_TYPE PoolType, IN BOOLEAN CaptureIfKernel, OUT PSECURITY_DESCRIPTOR *CapturedSecurityDescriptor ) { + PISECURITY_DESCRIPTOR OriginalSecurityDescriptor = _OriginalSecurityDescriptor; SECURITY_DESCRIPTOR DescriptorCopy; - PSECURITY_DESCRIPTOR NewDescriptor; + PISECURITY_DESCRIPTOR NewDescriptor; ULONG OwnerSAC = 0, GroupSAC = 0; ULONG OwnerSize = 0, GroupSize = 0; ULONG SaclSize = 0, DaclSize = 0; @@ -678,7 +679,7 @@ IN OUT PULONG Length, IN PSECURITY_DESCRIPTOR *ObjectsSecurityDescriptor OPTIONAL) { - PSECURITY_DESCRIPTOR ObjectSd; + PISECURITY_DESCRIPTOR ObjectSd; PISECURITY_DESCRIPTOR_RELATIVE RelSD; PSID Owner = NULL; PSID Group = NULL; @@ -873,11 +874,12 @@ */ BOOLEAN STDCALL SeValidSecurityDescriptor(IN ULONG Length, - IN PSECURITY_DESCRIPTOR SecurityDescriptor) + IN PSECURITY_DESCRIPTOR _SecurityDescriptor) { ULONG SdLength; PISID Sid; PACL Acl; + PISECURITY_DESCRIPTOR SecurityDescriptor = _SecurityDescriptor; if (Length < SECURITY_DESCRIPTOR_MIN_LENGTH) { _____ Modified: trunk/reactos/ntoskrnl/se/semgr.c --- trunk/reactos/ntoskrnl/se/semgr.c 2005-11-28 21:28:12 UTC (rev 19725) +++ trunk/reactos/ntoskrnl/se/semgr.c 2005-11-28 21:40:21 UTC (rev 19726) @@ -196,16 +196,17 @@ NTSTATUS STDCALL SeDefaultObjectMethod(PVOID Object, - SECURITY_OPERATION_CODE OperationType, + SECURITY_OPERATION_CODE OperationType, SECURITY_INFORMATION SecurityInformation, - PSECURITY_DESCRIPTOR SecurityDescriptor, + PSECURITY_DESCRIPTOR _SecurityDescriptor, PULONG ReturnLength, PSECURITY_DESCRIPTOR *OldSecurityDescriptor, POOL_TYPE PoolType, PGENERIC_MAPPING GenericMapping) { - PSECURITY_DESCRIPTOR ObjectSd; - PSECURITY_DESCRIPTOR NewSd; + PISECURITY_DESCRIPTOR ObjectSd; + PISECURITY_DESCRIPTOR NewSd; + PISECURITY_DESCRIPTOR SecurityDescriptor = _SecurityDescriptor; POBJECT_HEADER Header = BODY_TO_HEADER(Object); PSID Owner = 0; PSID Group = 0; @@ -541,15 +542,17 @@ * @implemented */ NTSTATUS STDCALL -SeAssignSecurity(PSECURITY_DESCRIPTOR ParentDescriptor OPTIONAL, - PSECURITY_DESCRIPTOR ExplicitDescriptor OPTIONAL, +SeAssignSecurity(PSECURITY_DESCRIPTOR _ParentDescriptor OPTIONAL, + PSECURITY_DESCRIPTOR _ExplicitDescriptor OPTIONAL, PSECURITY_DESCRIPTOR *NewDescriptor, BOOLEAN IsDirectoryObject, PSECURITY_SUBJECT_CONTEXT SubjectContext, PGENERIC_MAPPING GenericMapping, POOL_TYPE PoolType) { - PSECURITY_DESCRIPTOR Descriptor; + PISECURITY_DESCRIPTOR ParentDescriptor = _ParentDescriptor; + PISECURITY_DESCRIPTOR ExplicitDescriptor = _ExplicitDescriptor; + PISECURITY_DESCRIPTOR Descriptor; PTOKEN Token; ULONG OwnerLength = 0; ULONG GroupLength = 0; _____ Modified: trunk/reactos/w32api/include/ddk/ntifs.h --- trunk/reactos/w32api/include/ddk/ntifs.h 2005-11-28 21:28:12 UTC (rev 19725) +++ trunk/reactos/w32api/include/ddk/ntifs.h 2005-11-28 21:40:21 UTC (rev 19726) @@ -619,17 +619,6 @@ ULONG CompressedChunkSizes[ANYSIZE_ARRAY]; } COMPRESSED_DATA_INFO, *PCOMPRESSED_DATA_INFO; -#define EX_RUNDOWN_ACTIVE 0x1 -#define EX_RUNDOWN_COUNT_SHIFT 0x1 -#define EX_RUNDOWN_COUNT_INC (1 << EX_RUNDOWN_COUNT_SHIFT) - -typedef struct _EX_RUNDOWN_REF { - _ANONYMOUS_UNION union { - ULONG Count; - PVOID Ptr; - } DUMMYUNIONNAME; -} EX_RUNDOWN_REF, *PEX_RUNDOWN_REF; - #define EX_PUSH_LOCK_LOCK_V ((ULONG_PTR)0x0) #define EX_PUSH_LOCK_LOCK ((ULONG_PTR)0x1) #define EX_PUSH_LOCK_WAITING ((ULONG_PTR)0x2) @@ -655,6 +644,111 @@ }; } EX_PUSH_LOCK, *PEX_PUSH_LOCK; +typedef struct _SID_IDENTIFIER_AUTHORITY { + BYTE Value[6]; +} SID_IDENTIFIER_AUTHORITY,*PSID_IDENTIFIER_AUTHORITY,*LPSID_IDENTIFIER_AU THORITY; +typedef PVOID PSID; +typedef struct _SID { + BYTE Revision; + BYTE SubAuthorityCount; + SID_IDENTIFIER_AUTHORITY IdentifierAuthority; + DWORD SubAuthority[ANYSIZE_ARRAY]; +} SID, *PISID; +typedef struct _SID_AND_ATTRIBUTES { + PSID Sid; + DWORD Attributes; +} SID_AND_ATTRIBUTES, *PSID_AND_ATTRIBUTES; +typedef SID_AND_ATTRIBUTES SID_AND_ATTRIBUTES_ARRAY[ANYSIZE_ARRAY]; +typedef SID_AND_ATTRIBUTES_ARRAY *PSID_AND_ATTRIBUTES_ARRAY; +typedef struct _TOKEN_SOURCE { + CHAR SourceName[TOKEN_SOURCE_LENGTH]; + LUID SourceIdentifier; +} TOKEN_SOURCE,*PTOKEN_SOURCE; +typedef struct _TOKEN_CONTROL { + LUID TokenId; + LUID AuthenticationId; + LUID ModifiedId; + TOKEN_SOURCE TokenSource; +} TOKEN_CONTROL,*PTOKEN_CONTROL; +typedef struct _TOKEN_DEFAULT_DACL { + PACL DefaultDacl; +} TOKEN_DEFAULT_DACL,*PTOKEN_DEFAULT_DACL; +typedef struct _TOKEN_GROUPS { + DWORD GroupCount; + SID_AND_ATTRIBUTES Groups[ANYSIZE_ARRAY]; +} TOKEN_GROUPS,*PTOKEN_GROUPS,*LPTOKEN_GROUPS; +typedef struct _TOKEN_GROUPS_AND_PRIVILEGES { + ULONG SidCount; + ULONG SidLength; + PSID_AND_ATTRIBUTES Sids; + ULONG RestrictedSidCount; + ULONG RestrictedSidLength; + PSID_AND_ATTRIBUTES RestrictedSids; + ULONG PrivilegeCount; + ULONG PrivilegeLength; + PLUID_AND_ATTRIBUTES Privileges; + LUID AuthenticationId; +} TOKEN_GROUPS_AND_PRIVILEGES, *PTOKEN_GROUPS_AND_PRIVILEGES; +typedef struct _TOKEN_ORIGIN { + LUID OriginatingLogonSession; +} TOKEN_ORIGIN, *PTOKEN_ORIGIN; +typedef struct _TOKEN_OWNER { + PSID Owner; +} TOKEN_OWNER,*PTOKEN_OWNER; +typedef struct _TOKEN_PRIMARY_GROUP { + PSID PrimaryGroup; +} TOKEN_PRIMARY_GROUP,*PTOKEN_PRIMARY_GROUP; +typedef struct _TOKEN_PRIVILEGES { + DWORD PrivilegeCount; + LUID_AND_ATTRIBUTES Privileges[ANYSIZE_ARRAY]; +} TOKEN_PRIVILEGES,*PTOKEN_PRIVILEGES,*LPTOKEN_PRIVILEGES; +typedef enum tagTOKEN_TYPE { + TokenPrimary = 1, + TokenImpersonation +} TOKEN_TYPE,*PTOKEN_TYPE; +typedef struct _TOKEN_STATISTICS { + LUID TokenId; + LUID AuthenticationId; + LARGE_INTEGER ExpirationTime; + TOKEN_TYPE TokenType; + SECURITY_IMPERSONATION_LEVEL ImpersonationLevel; + DWORD DynamicCharged; + DWORD DynamicAvailable; + DWORD GroupCount; + DWORD PrivilegeCount; + LUID ModifiedId; +} TOKEN_STATISTICS, *PTOKEN_STATISTICS; +typedef struct _TOKEN_USER { + SID_AND_ATTRIBUTES User; +} TOKEN_USER, *PTOKEN_USER; +typedef DWORD SECURITY_INFORMATION,*PSECURITY_INFORMATION; +typedef WORD SECURITY_DESCRIPTOR_CONTROL,*PSECURITY_DESCRIPTOR_CONTROL; +typedef struct _SECURITY_DESCRIPTOR { + BYTE Revision; + BYTE Sbz1; + SECURITY_DESCRIPTOR_CONTROL Control; + PSID Owner; + PSID Group; + PACL Sacl; + PACL Dacl; +} SECURITY_DESCRIPTOR, *PISECURITY_DESCRIPTOR; +typedef struct _SECURITY_DESCRIPTOR_RELATIVE { + BYTE Revision; + BYTE Sbz1; + SECURITY_DESCRIPTOR_CONTROL Control; + DWORD Owner; + DWORD Group; + DWORD Sacl; + DWORD Dacl; +} SECURITY_DESCRIPTOR_RELATIVE, *PISECURITY_DESCRIPTOR_RELATIVE; +typedef enum _TOKEN_INFORMATION_CLASS { + TokenUser=1,TokenGroups,TokenPrivileges,TokenOwner, + TokenPrimaryGroup,TokenDefaultDacl,TokenSource,TokenType, + TokenImpersonationLevel,TokenStatistics,TokenRestrictedSids, + TokenSessionId,TokenGroupsAndPrivileges,TokenSessionReference, + TokenSandBoxInert,TokenAuditPolicy,TokenOrigin, +} TOKEN_INFORMATION_CLASS; + typedef struct _FILE_ACCESS_INFORMATION { ACCESS_MASK AccessFlags; } FILE_ACCESS_INFORMATION, *PFILE_ACCESS_INFORMATION; @@ -831,6 +925,17 @@ SID Sid; } FILE_GET_QUOTA_INFORMATION, *PFILE_GET_QUOTA_INFORMATION; +typedef struct _FILE_QUOTA_INFORMATION +{ + ULONG NextEntryOffset; + ULONG SidLength; + LARGE_INTEGER ChangeTime; + LARGE_INTEGER QuotaUsed; + LARGE_INTEGER QuotaThreshold; + LARGE_INTEGER QuotaLimit; + SID Sid; +} FILE_QUOTA_INFORMATION, *PFILE_QUOTA_INFORMATION; + typedef struct _FILE_INTERNAL_INFORMATION { LARGE_INTEGER IndexNumber; } FILE_INTERNAL_INFORMATION, *PFILE_INTERNAL_INFORMATION; _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2005-11-28 21:28:12 UTC (rev 19725) +++ trunk/reactos/w32api/include/ddk/winddk.h 2005-11-28 21:40:21 UTC (rev 19726) @@ -134,6 +134,10 @@ struct _DRIVE_LAYOUT_INFORMATION; struct _DRIVE_LAYOUT_INFORMATION_EX; +typedef PVOID PSECURITY_DESCRIPTOR; +typedef ULONG SECURITY_INFORMATION, *PSECURITY_INFORMATION; +typedef PVOID PSID; + DECLARE_INTERNAL_OBJECT(ADAPTER_OBJECT) DECLARE_INTERNAL_OBJECT(DMA_ADAPTER) DECLARE_INTERNAL_OBJECT(IO_STATUS_BLOCK) @@ -212,6 +216,10 @@ #define MAXIMUM_WAIT_OBJECTS 64 +#define EX_RUNDOWN_ACTIVE 0x1 +#define EX_RUNDOWN_COUNT_SHIFT 0x1 +#define EX_RUNDOWN_COUNT_INC (1 << EX_RUNDOWN_COUNT_SHIFT) + #define METHOD_BUFFERED 0 #define METHOD_IN_DIRECT 1 #define METHOD_OUT_DIRECT 2 @@ -1114,6 +1122,15 @@ ULONG OldIrql; } FAST_MUTEX, *PFAST_MUTEX; +typedef struct _EX_RUNDOWN_REF +{ + union + { + ULONG_PTR Count; + PVOID Ptr; + }; +} EX_RUNDOWN_REF, *PEX_RUNDOWN_REF; + typedef struct _KGATE { DISPATCHER_HEADER Header; [truncated at 1000 lines; 96 more skipped]
19 years
1
0
0
0
[jimtabor] 19725: Fix header includes.
by jimtabor@svn.reactos.com
Fix header includes. Modified: trunk/reactos/drivers/multimedia/portcls/portcls.c _____ Modified: trunk/reactos/drivers/multimedia/portcls/portcls.c --- trunk/reactos/drivers/multimedia/portcls/portcls.c 2005-11-28 19:41:01 UTC (rev 19724) +++ trunk/reactos/drivers/multimedia/portcls/portcls.c 2005-11-28 21:28:12 UTC (rev 19725) @@ -25,6 +25,7 @@ * REVISION HISTORY: * 21 November 2005 Created James Tabor */ +#include <ddk/ntddk.h> #include <windows.h> #include "portcls.h"
19 years
1
0
0
0
[turner] 19724: fixed the stretch code with some help from filip. small formatting changes.
by turner@svn.reactos.com
fixed the stretch code with some help from filip. small formatting changes. Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c --- trunk/reactos/subsys/win32k/ntuser/desktop.c 2005-11-28 19:36:57 UTC (rev 19723) +++ trunk/reactos/subsys/win32k/ntuser/desktop.c 2005-11-28 19:41:01 UTC (rev 19724) @@ -1205,8 +1205,12 @@ IntGdiGetClipBox(hDC, &Rect); hWndDesktop = IntGetDesktopWindow(); - if (!(WndDesktop = UserGetWindowObject(hWndDesktop))) + + WndDesktop = UserGetWindowObject(hWndDesktop); + if (!WndDesktop) + { RETURN(FALSE); + } DesktopBrush = (HBRUSH)IntGetClassLong(WndDesktop, GCL_HBRBACKGROUND, FALSE); //fixme: verify retval @@ -1215,11 +1219,13 @@ * Paint desktop background */ - if(WinSta->hbmWallpaper != NULL) + if (WinSta->hbmWallpaper != NULL) { PWINDOW_OBJECT DeskWin; - if((DeskWin = UserGetWindowObject(hWndDesktop))) + DeskWin = UserGetWindowObject(hWndDesktop); + + if (DeskWin) { SIZE sz; int x, y; @@ -1228,14 +1234,15 @@ sz.cx = DeskWin->WindowRect.right - DeskWin->WindowRect.left; sz.cy = DeskWin->WindowRect.bottom - DeskWin->WindowRect.top; - if(WinSta->WallpaperMode == wmStretch || - WinSta->WallpaperMode == wmTile) + if (WinSta->WallpaperMode == wmStretch || + WinSta->WallpaperMode == wmTile) { x = 0; y = 0; } else { + /* Find the upper left corner, can be negtive if the bitmap is bigger then the screen */ x = (sz.cx / 2) - (WinSta->cxWallpaper / 2); y = (sz.cy / 2) - (WinSta->cyWallpaper / 2); } @@ -1245,7 +1252,8 @@ { HBITMAP hOldBitmap; - if(x > 0 || y > 0) + /* fill in the area that the bitmap is not going to cover */ + if (x > 0 || y > 0) { /* FIXME - clip out the bitmap can be replaced with "NtGdiPatBlt(hDC, x, y, WinSta->cxWallpaper, WinSta->cyWallpaper, PATCOPY | DSTINVERT);" @@ -1255,82 +1263,55 @@ NtGdiSelectObject(hDC, PreviousBrush); } - //Do not fill the background after it is painted no matter the size of the picture + /*Do not fill the background after it is painted no matter the size of the picture */ doPatBlt = FALSE; hOldBitmap = NtGdiSelectObject(hWallpaperDC, WinSta->hbmWallpaper); - if(WinSta->WallpaperMode == wmStretch) + if (WinSta->WallpaperMode == wmStretch) { -#if 0 //Broken Stretch Code - /* Fix me, stretch the bitmap to fit the screen. I'm not smart enough to do this :( */ - BITMAPINFO bmINFO; - LPVOID pBits; - bmINFO.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - /* Get bits */ - NtGdiGetDIBits(hDC, - WinSta->hbmWallpaper, - 0, - WinSta->cyWallpaper, - NULL, // what goes here? - &bmINFO, - DIB_RGB_COLORS); - - bmINFO.bmiHeader.biCompression = BI_RGB; - - pBits = ExAllocatePool(PagedPool,bmINFO.bmiHeader.biSizeImage); - - if(pBits == NULL) - { - doPatBlt = TRUE; - } - else - { - - NtGdiGetDIBits(hDC, - WinSta->hbmWallpaper, - 0, - WinSta->cyWallpaper, - (LPVOID)pBits, // what goes here? - &bmINFO, - DIB_RGB_COLORS); - DPRINT1("Before Draw\n"); - - /* Stretch it to fit the screen */ - NtGdiStretchDIBits(hDC, - 0, - 0, - Rect.right, - Rect.bottom, - 0, - 0, - WinSta->cxWallpaper, - WinSta->cyWallpaper, - (LPVOID)pBits, // get this from NtGdiGetDiBits? - &bmINFO, // get this from NtGdiGetDiBits? - DIB_RGB_COLORS, - SRCCOPY); - ExFreePool(pBits); - } -#else - /* Draw nothing */ - doPatBlt = TRUE; -#endif //Broken Stretch Code + NtGdiStretchBlt(hDC, + x, + y, + Rect.right, + Rect.bottom, + hWallpaperDC, + 0, + 0, + WinSta->cxWallpaper, + WinSta->cyWallpaper, + SRCCOPY); } - else if(WinSta->WallpaperMode == wmTile) + else if (WinSta->WallpaperMode == wmTile) { - + /* paint the bitmap across the screen then down */ for(y = 0; y < Rect.bottom; y += WinSta->cyWallpaper) { for(x = 0; x < Rect.right; x += WinSta->cxWallpaper) { - NtGdiBitBlt(hDC, x, y, WinSta->cxWallpaper, WinSta->cyWallpaper, hWallpaperDC, 0, 0, SRCCOPY); + NtGdiBitBlt(hDC, + x, + y, + WinSta->cxWallpaper, + WinSta->cyWallpaper, + hWallpaperDC, + 0, + 0, + SRCCOPY); } } } else { - NtGdiBitBlt(hDC, x, y, WinSta->cxWallpaper, WinSta->cyWallpaper, hWallpaperDC, 0, 0, SRCCOPY); + NtGdiBitBlt(hDC, + x, + y, + WinSta->cxWallpaper, + WinSta->cyWallpaper, + hWallpaperDC, + 0, + 0, + SRCCOPY); } NtGdiSelectObject(hWallpaperDC, hOldBitmap); NtGdiDeleteDC(hWallpaperDC); @@ -1356,9 +1337,13 @@ RECT rect; if (*s_wszVersion) + { len = wcslen(s_wszVersion); + } else + { len = GetSystemVersionString(s_wszVersion); + } if (len) {
19 years
1
0
0
0
[gvg] 19723: No use in building the targets just to immediately clean them again
by gvg@svn.reactos.com
No use in building the targets just to immediately clean them again Modified: trunk/reactos/tools/bin2res/bin2res.mak Modified: trunk/reactos/tools/cdmake/cdmake.mak Modified: trunk/reactos/tools/mkhive/mkhive.mak _____ Modified: trunk/reactos/tools/bin2res/bin2res.mak --- trunk/reactos/tools/bin2res/bin2res.mak 2005-11-28 18:23:25 UTC (rev 19722) +++ trunk/reactos/tools/bin2res/bin2res.mak 2005-11-28 19:36:57 UTC (rev 19723) @@ -46,6 +46,6 @@ bin2res: $(BIN2RES_TARGET) .PHONY: bin2res_clean -bin2res_clean: $(BIN2RES_TARGET) +bin2res_clean: -@$(rm) $(BIN2RES_TARGET) $(BIN2RES_OBJECTS) 2>$(NUL) clean: bin2res_clean _____ Modified: trunk/reactos/tools/cdmake/cdmake.mak --- trunk/reactos/tools/cdmake/cdmake.mak 2005-11-28 18:23:25 UTC (rev 19722) +++ trunk/reactos/tools/cdmake/cdmake.mak 2005-11-28 19:36:57 UTC (rev 19723) @@ -46,6 +46,6 @@ ${host_gcc} $(CDMAKE_HOST_CFLAGS) -c $< -o $@ .PHONY: cdmake_clean -cdmake_clean: $(CDMAKE_TARGET) +cdmake_clean: -@$(rm) $(CDMAKE_TARGET) $(CDMAKE_OBJECTS) 2>$(NUL) clean: cdmake_clean _____ Modified: trunk/reactos/tools/mkhive/mkhive.mak --- trunk/reactos/tools/mkhive/mkhive.mak 2005-11-28 18:23:25 UTC (rev 19722) +++ trunk/reactos/tools/mkhive/mkhive.mak 2005-11-28 19:36:57 UTC (rev 19723) @@ -56,6 +56,6 @@ ${host_gcc} $(MKHIVE_HOST_CFLAGS) -c $< -o $@ .PHONY: mkhive_clean -mkhive_clean: $(MKHIVE_TARGET) +mkhive_clean: -@$(rm) $(MKHIVE_TARGET) $(MKHIVE_OBJECTS) 2>$(NUL) clean: mkhive_clean
19 years
1
0
0
0
← Newer
1
...
4
5
6
7
8
9
10
...
88
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
Results per page:
10
25
50
100
200