[ros-diffs] [ion] 24465: - Some misc changes to fix some of the 250+ warnings in the MSVC build.
ion at svn.reactos.org
ion at svn.reactos.org
Mon Oct 9 07:59:22 CEST 2006
Author: ion
Date: Mon Oct 9 09:59:18 2006
New Revision: 24465
URL: http://svn.reactos.org/svn/reactos?rev=24465&view=rev
Log:
- Some misc changes to fix some of the 250+ warnings in the MSVC build.
Modified:
trunk/reactos/ntoskrnl/cm/registry.c
trunk/reactos/ntoskrnl/ex/event.c
trunk/reactos/ntoskrnl/ex/sem.c
trunk/reactos/ntoskrnl/ex/time.c
trunk/reactos/ntoskrnl/fs/filelock.c
trunk/reactos/ntoskrnl/fs/mcb.c
trunk/reactos/ntoskrnl/include/internal/ex.h
trunk/reactos/ntoskrnl/include/ntoskrnl.h
trunk/reactos/ntoskrnl/io/iomgr/bootlog.c
trunk/reactos/ntoskrnl/io/iomgr/iomgr.c
trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c
trunk/reactos/ntoskrnl/ke/bug.c
trunk/reactos/ntoskrnl/mm/i386/pfault.c
trunk/reactos/ntoskrnl/mm/mminit.c
trunk/reactos/ntoskrnl/ntoskrnl.def
trunk/reactos/ntoskrnl/ps/job.c
Modified: trunk/reactos/ntoskrnl/cm/registry.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/registry.c?rev=24465&r1=24464&r2=24465&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/cm/registry.c (original)
+++ trunk/reactos/ntoskrnl/cm/registry.c Mon Oct 9 09:59:18 2006
@@ -21,9 +21,7 @@
#include "cm.h"
#if defined (ALLOC_PRAGMA)
-#pragma alloc_text(INIT, CmInitHives)
-#pragma alloc_text(INIT, CmInitializeRegistry)
-#pragma alloc_text(INIT, CmInit2)
+#pragma alloc_text(INIT, CmInitSystem1)
#endif
/* GLOBALS ******************************************************************/
Modified: trunk/reactos/ntoskrnl/ex/event.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/event.c?rev=24465&r1=24464&r2=24465&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/ex/event.c (original)
+++ trunk/reactos/ntoskrnl/ex/event.c Mon Oct 9 09:59:18 2006
@@ -19,7 +19,7 @@
/* GLOBALS *******************************************************************/
-POBJECT_TYPE ExEventObjectType = NULL;
+POBJECT_TYPE _ExEventObjectType = NULL;
GENERIC_MAPPING ExpEventMapping =
{
Modified: trunk/reactos/ntoskrnl/ex/sem.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sem.c?rev=24465&r1=24464&r2=24465&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/ex/sem.c (original)
+++ trunk/reactos/ntoskrnl/ex/sem.c Mon Oct 9 09:59:18 2006
@@ -14,12 +14,12 @@
#include <internal/debug.h>
#if defined (ALLOC_PRAGMA)
-#pragma alloc_text(INIT, ExpInitializeSemaphoreImplementation()
+#pragma alloc_text(INIT, ExpInitializeSemaphoreImplementation)
#endif
/* GLOBALS ******************************************************************/
-POBJECT_TYPE ExSemaphoreObjectType;
+POBJECT_TYPE _ExSemaphoreObjectType;
GENERIC_MAPPING ExSemaphoreMapping =
{
Modified: trunk/reactos/ntoskrnl/ex/time.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/time.c?rev=24465&r1=24464&r2=24465&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/ex/time.c (original)
+++ trunk/reactos/ntoskrnl/ex/time.c Mon Oct 9 09:59:18 2006
@@ -14,10 +14,6 @@
#include <internal/debug.h>
#define TICKSPERMINUTE 600000000
-
-#if defined (ALLOC_PRAGMA)
-#pragma alloc_text(INIT, ExpInitTimeZoneInfo)
-#endif
/* GLOBALS ******************************************************************/
Modified: trunk/reactos/ntoskrnl/fs/filelock.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fs/filelock.c?rev=24465&r1=24464&r2=24465&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/fs/filelock.c (original)
+++ trunk/reactos/ntoskrnl/fs/filelock.c Mon Oct 9 09:59:18 2006
@@ -11,11 +11,6 @@
#include <ntoskrnl.h>
#define NDEBUG
#include <internal/debug.h>
-
-#if defined (ALLOC_PRAGMA)
-#pragma alloc_text(INIT, FsRtlpInitFileLockingImplementation)
-#endif
-
/*
NOTE:
Modified: trunk/reactos/ntoskrnl/fs/mcb.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fs/mcb.c?rev=24465&r1=24464&r2=24465&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/fs/mcb.c (original)
+++ trunk/reactos/ntoskrnl/fs/mcb.c Mon Oct 9 09:59:18 2006
@@ -312,9 +312,9 @@
IN ULONG SectorCount)
{
/* Call the large function */
- return FsRtlRemoveLargeMcbEntry(&Mcb->DummyFieldThatSizesThisStructureCorrectly,
- (LONGLONG)Vbn,
- (LONGLONG)SectorCount);
+ FsRtlRemoveLargeMcbEntry(&Mcb->DummyFieldThatSizesThisStructureCorrectly,
+ (LONGLONG)Vbn,
+ (LONGLONG)SectorCount);
}
Modified: trunk/reactos/ntoskrnl/include/internal/ex.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/ex.h?rev=24465&r1=24464&r2=24465&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/ex.h (original)
+++ trunk/reactos/ntoskrnl/include/internal/ex.h Mon Oct 9 09:59:18 2006
@@ -9,6 +9,7 @@
extern ULONG ExpTickCountMultiplier;
extern ULONG ExpLastTimeZoneBias;
extern POBJECT_TYPE ExEventPairObjectType;
+extern POBJECT_TYPE _ExEventObjectType, _ExSemaphoreObjectType;
extern ULONG NtBuildNumber;
extern ULONG NtMajorVersion;
extern ULONG NtMinorVersion;
Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/ntoskrnl.h?rev=24465&r1=24464&r2=24465&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/include/ntoskrnl.h (original)
+++ trunk/reactos/ntoskrnl/include/ntoskrnl.h Mon Oct 9 09:59:18 2006
@@ -62,6 +62,8 @@
//
#define IoFileObjectType _IoFileObjectType
#define PsThreadType _PsThreadType
+#define ExEventObjectType _ExEventObjectType
+#define ExSemaphoreObjectType _ExSemaphoreObjectType
#define KdDebuggerEnabled _KdDebuggerEnabled
#define KdDebuggerNotPresent _KdDebuggerNotPresent
#define FsRtlLegalAnsiCharacterArray _FsRtlLegalAnsiCharacterArray
Modified: trunk/reactos/ntoskrnl/io/iomgr/bootlog.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/bootlog.c?rev=24465&r1=24464&r2=24465&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/io/iomgr/bootlog.c (original)
+++ trunk/reactos/ntoskrnl/io/iomgr/bootlog.c Mon Oct 9 09:59:18 2006
@@ -16,7 +16,7 @@
#if defined (ALLOC_PRAGMA)
#pragma alloc_text(INIT, IopInitBootLog)
-#pragma alloc_text(INIT, IopStartBootLog()
+#pragma alloc_text(INIT, IopStartBootLog)
#endif
/* GLOBALS ******************************************************************/
Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomgr.c?rev=24465&r1=24464&r2=24465&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/io/iomgr/iomgr.c (original)
+++ trunk/reactos/ntoskrnl/io/iomgr/iomgr.c Mon Oct 9 09:59:18 2006
@@ -59,7 +59,7 @@
#pragma alloc_text(INIT, IoInitCancelHandling)
#pragma alloc_text(INIT, IoInitShutdownNotification)
#pragma alloc_text(INIT, IopInitLookasideLists)
-#pragma alloc_text(INIT, IoInit)
+#pragma alloc_text(INIT, IoInitSystem)
#endif
/* INIT FUNCTIONS ************************************************************/
Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c?rev=24465&r1=24464&r2=24465&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original)
+++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Mon Oct 9 09:59:18 2006
@@ -28,9 +28,6 @@
#if defined (ALLOC_PRAGMA)
#pragma alloc_text(INIT, PnpInit)
#pragma alloc_text(INIT, PnpInit2)
-#pragma alloc_text(INIT, IopUpdateRootKey)
-#pragma alloc_text(INIT, IopEnumerateDetectedDevices)
-#pragma alloc_text(INIT, IopIsAcpiComputer)
#endif
typedef struct _INVALIDATE_DEVICE_RELATION_DATA
@@ -41,7 +38,7 @@
NTSTATUS Status;
} INVALIDATE_DEVICE_RELATION_DATA, *PINVALIDATE_DEVICE_RELATION_DATA;
-static VOID CALLBACK
+static VOID NTAPI
IopInvalidateDeviceRelations(
IN PDEVICE_OBJECT DeviceObject,
IN PVOID InvalidateContext);
@@ -2456,7 +2453,7 @@
* The call can be make synchronous by defining the Event field
* of the INVALIDATE_DEVICE_RELATION_DATA structure
*/
-static VOID CALLBACK
+static VOID NTAPI
IopInvalidateDeviceRelations(
IN PDEVICE_OBJECT DeviceObject,
IN PVOID InvalidateContext) /* PINVALIDATE_DEVICE_RELATION_DATA */
@@ -2476,7 +2473,7 @@
NTSTATUS Status;
ULONG i;
- DPRINT("DeviceObject 0x%p, Type %d\n", DeviceObject, Type);
+ DPRINT("DeviceObject 0x%p\n", DeviceObject);
DPRINT("Sending IRP_MN_QUERY_DEVICE_RELATIONS to device stack\n");
Modified: trunk/reactos/ntoskrnl/ke/bug.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=24465&r1=24464&r2=24465&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/ke/bug.c (original)
+++ trunk/reactos/ntoskrnl/ke/bug.c Mon Oct 9 09:59:18 2006
@@ -851,7 +851,7 @@
}
/* Raise IRQL to HIGH_LEVEL */
- Ke386DisableInterrupts();
+ _disable();
KeRaiseIrql(HIGH_LEVEL, &OldIrql);
/* Unlock the Kernel Adress Space if we own it */
Modified: trunk/reactos/ntoskrnl/mm/i386/pfault.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/pfault.c?rev=24465&r1=24464&r2=24465&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/mm/i386/pfault.c (original)
+++ trunk/reactos/ntoskrnl/mm/i386/pfault.c Mon Oct 9 09:59:18 2006
@@ -43,7 +43,7 @@
/* it's safe to enable interrupts after cr2 has been saved */
if (Tf->EFlags & (X86_EFLAGS_VM|X86_EFLAGS_IF))
{
- Ke386EnableInterrupts();
+ _enable();
}
if (cr2 >= (ULONG_PTR)MmSystemRangeStart)
Modified: trunk/reactos/ntoskrnl/mm/mminit.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=24465&r1=24464&r2=24465&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/mm/mminit.c (original)
+++ trunk/reactos/ntoskrnl/mm/mminit.c Mon Oct 9 09:59:18 2006
@@ -19,6 +19,7 @@
/*
* Compiler defined symbols
*/
+extern unsigned int _image_base__;
extern unsigned int _text_start__;
extern unsigned int _text_end__;
@@ -158,7 +159,6 @@
0,
BoundaryAddressMultiple);
- extern unsigned int _image_base__;
BaseAddress = (PVOID)&_image_base__;
Length = PAGE_ROUND_UP(((ULONG_PTR)&_text_end__)) - (ULONG_PTR)&_image_base__;
ParamLength = ParamLength - Length;
Modified: trunk/reactos/ntoskrnl/ntoskrnl.def
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.def?rev=24465&r1=24464&r2=24465&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/ntoskrnl.def (original)
+++ trunk/reactos/ntoskrnl/ntoskrnl.def Mon Oct 9 09:59:18 2006
@@ -99,11 +99,11 @@
ExDeleteNPagedLookasideList at 4
ExDeletePagedLookasideList at 4
ExDeleteResourceLite at 4
-ExDesktopObjectType DATA
+ExDesktopObjectType
ExDisableResourceBoostLite at 4
ExEnumHandleTable at 16
@ExEnterCriticalRegionAndAcquireFastMutexUnsafe at 4
-ExEventObjectType DATA
+ExEventObjectType=_ExEventObjectType
ExExtendZone at 12
ExFreePool at 4
ExFreePoolWithTag at 8
@@ -152,7 +152,7 @@
@ExReleaseFastMutexUnsafeAndLeaveCriticalRegion at 4
ExReleaseResourceForThreadLite at 8
@ExReleaseResourceLite at 4
-ExSemaphoreObjectType DATA
+ExSemaphoreObjectType=_ExSemaphoreObjectType
ExSetResourceOwnerPointer at 8
ExSetTimerResolution at 8
ExSystemExceptionFilter at 0
Modified: trunk/reactos/ntoskrnl/ps/job.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/job.c?rev=24465&r1=24464&r2=24465&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/ps/job.c (original)
+++ trunk/reactos/ntoskrnl/ps/job.c Mon Oct 9 09:59:18 2006
@@ -14,9 +14,6 @@
#define NDEBUG
#include <internal/debug.h>
-#if defined (ALLOC_PRAGMA)
-#pragma alloc_text(INIT, PsInitJobManagment)
-#endif
/* GLOBALS *******************************************************************/
More information about the Ros-diffs
mailing list