[ros-diffs] [ion] 19413: - Misc janitorial fixes by Brezenbak to fix some MSVC compile errors.

- Misc janitorial fixes by Brezenbak to fix some MSVC compile errors.
Modified: trunk/reactos/ntoskrnl/ex/fmutex.c
Modified: trunk/reactos/ntoskrnl/ex/init.c
Modified: trunk/reactos/ntoskrnl/fs/filelock.c
Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h
Modified: trunk/reactos/ntoskrnl/include/internal/ke.h
Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h
Modified: trunk/reactos/ntoskrnl/io/bootlog.c
Modified: trunk/reactos/ntoskrnl/io/disk.c
Modified: trunk/reactos/ntoskrnl/kd/kdio.c
Modified: trunk/reactos/ntoskrnl/kdbg/kdb.h
Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c
Modified: trunk/reactos/ntoskrnl/ke/apc.c
Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c
Modified: trunk/reactos/ntoskrnl/ke/process.c
Modified: trunk/reactos/ntoskrnl/ke/wait.c
Modified: trunk/reactos/ntoskrnl/lpc/reply.c
Modified: trunk/reactos/ntoskrnl/mm/cont.c
Modified: trunk/reactos/ntoskrnl/mm/npool.c
Modified: trunk/reactos/ntoskrnl/mm/rpoolmgr.h
Modified: trunk/reactos/ntoskrnl/ob/sdcache.c
  _____  

Modified: trunk/reactos/ntoskrnl/ex/fmutex.c
--- trunk/reactos/ntoskrnl/ex/fmutex.c	2005-11-21 18:10:55 UTC (rev
19412)
+++ trunk/reactos/ntoskrnl/ex/fmutex.c	2005-11-21 18:38:09 UTC (rev
19413)
@@ -81,9 +81,9 @@

 FASTCALL
 ExAcquireFastMutex(PFAST_MUTEX FastMutex)
 {
+    KIRQL OldIrql;
     ASSERT_IRQL_LESS_OR_EQUAL(APC_LEVEL);
-    KIRQL OldIrql;
-   
+
     /* Raise IRQL to APC */
     OldIrql = KfRaiseIrql(APC_LEVEL);
    
@@ -180,8 +180,8 @@
 FASTCALL
 ExTryToAcquireFastMutex(PFAST_MUTEX FastMutex)
 {
+    KIRQL OldIrql;
     ASSERT_IRQL_LESS_OR_EQUAL(APC_LEVEL);
-    KIRQL OldIrql;
 
     /* Raise to APC_LEVEL */
     OldIrql = KfRaiseIrql(APC_LEVEL);
  _____  

Modified: trunk/reactos/ntoskrnl/ex/init.c
--- trunk/reactos/ntoskrnl/ex/init.c	2005-11-21 18:10:55 UTC (rev
19412)
+++ trunk/reactos/ntoskrnl/ex/init.c	2005-11-21 18:38:09 UTC (rev
19413)
@@ -220,7 +220,7 @@

     }
 }
 
-inline
+__inline
 VOID
 STDCALL
 ExecuteRuntimeAsserts(VOID)
@@ -255,7 +255,7 @@
     ASSERT(sizeof(FX_SAVE_AREA) == SIZEOF_FX_SAVE_AREA);
 }
 
-inline
+__inline
 VOID
 STDCALL
 ParseAndCacheLoadedModules(VOID)
@@ -303,7 +303,7 @@
     }
 }
 
-inline
+__inline
 VOID
 STDCALL
 ParseCommandLine(PULONG MaxMem,
  _____  

Modified: trunk/reactos/ntoskrnl/fs/filelock.c
--- trunk/reactos/ntoskrnl/fs/filelock.c	2005-11-21 18:10:55 UTC
(rev 19412)
+++ trunk/reactos/ntoskrnl/fs/filelock.c	2005-11-21 18:38:09 UTC
(rev 19413)
@@ -27,7 +27,7 @@

 
 
 
-inline BOOLEAN
+__inline BOOLEAN
 IsOverlappingLock(
    PFILE_LOCK_INFO Lock,
    PLARGE_INTEGER StartOffset,
@@ -48,7 +48,7 @@
 }
 
 
-inline BOOLEAN
+__inline BOOLEAN
 IsSurroundingLock(
    PFILE_LOCK_INFO Lock,
    PLARGE_INTEGER StartOffset,
  _____  

Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h
--- trunk/reactos/ntoskrnl/include/internal/i386/ke.h	2005-11-21
18:10:55 UTC (rev 19412)
+++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h	2005-11-21
18:38:09 UTC (rev 19413)
@@ -266,9 +266,11 @@

 #define Ke386GetPageTableDirectory(X) \
                                 __asm mov eax, cr3; \
                                 __asm mov X, eax;
-#define Ke386SetPageTableDirectory(X) \
-                                __asm mov eax, X; \
-	                        __asm mov cr3, eax;
+static __forceinline void Ke386SetPageTableDirectory(ULONG X)
+{
+    __asm mov eax, X
+    __asm mov cr3, eax
+}
 #else
 #error Unknown compiler for inline assembler
 #endif
  _____  

Modified: trunk/reactos/ntoskrnl/include/internal/ke.h
--- trunk/reactos/ntoskrnl/include/internal/ke.h	2005-11-21
18:10:55 UTC (rev 19412)
+++ trunk/reactos/ntoskrnl/include/internal/ke.h	2005-11-21
18:38:09 UTC (rev 19413)
@@ -244,7 +244,7 @@

 );
 
 KIRQL
-inline
+__inline
 FASTCALL
 KeAcquireDispatcherDatabaseLock(VOID);
 
@@ -363,7 +363,7 @@
 );
 
 VOID
-inline
+__inline
 FASTCALL
 KiSatisfyObjectWait(
     PDISPATCHER_HEADER Object,
@@ -371,7 +371,7 @@
 );
 
 BOOLEAN
-inline
+__inline
 FASTCALL
 KiIsObjectSignaled(
     PDISPATCHER_HEADER Object,
@@ -379,7 +379,7 @@
 );
 
 VOID
-inline
+__inline
 FASTCALL
 KiSatisifyMultipleObjectWaits(PKWAIT_BLOCK WaitBlock);
 
  _____  

Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h
--- trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h	2005-11-21
18:10:55 UTC (rev 19412)
+++ trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h	2005-11-21
18:38:09 UTC (rev 19413)
@@ -255,7 +255,7 @@

 #define ICI_SQ(SizeQuery, SizeSet, AlignmentQuery, AlignmentSet, Flags)
\
   { SizeQuery, SizeSet, AlignmentQuery, AlignmentSet, Flags }
 
-static inline NTSTATUS
+static __inline NTSTATUS
 DefaultSetInfoBufferCheck(UINT Class,
                           const INFORMATION_CLASS_INFO *ClassList,
                           UINT ClassListEntries,
@@ -304,7 +304,7 @@
     return Status;
 }
 
-static inline NTSTATUS
+static __inline NTSTATUS
 DefaultQueryInfoBufferCheck(UINT Class,
                             const INFORMATION_CLASS_INFO *ClassList,
                             UINT ClassListEntries,
  _____  

Modified: trunk/reactos/ntoskrnl/io/bootlog.c
--- trunk/reactos/ntoskrnl/io/bootlog.c	2005-11-21 18:10:55 UTC (rev
19412)
+++ trunk/reactos/ntoskrnl/io/bootlog.c	2005-11-21 18:38:09 UTC (rev
19413)
@@ -310,8 +310,11 @@

       ExReleaseResourceLite(&IopBootLogResource);
       return;
     }
-
+#if defined (__GNUC__)
   Status = IopWriteLogFile(L"ReactOS "KERNEL_VERSION_STR);
+#elif defined (_MSC_VER)
+  Status = IopWriteLogFile("ReactOS "KERNEL_VERSION_STR);
+#endif
   if (!NT_SUCCESS(Status))
     {
       DPRINT1("IopWriteLogFile() failed (Status %lx)\n", Status);
  _____  

Modified: trunk/reactos/ntoskrnl/io/disk.c
--- trunk/reactos/ntoskrnl/io/disk.c	2005-11-21 18:10:55 UTC (rev
19412)
+++ trunk/reactos/ntoskrnl/io/disk.c	2005-11-21 18:38:09 UTC (rev
19413)
@@ -1070,7 +1070,7 @@

 			      AUTO_DRIVE,
 			      DOSDEVICE_DRIVE_REMOVABLE,
                               0,
-                              (LARGE_INTEGER)0LL,
+                              RtlConvertLongToLargeInteger(0),
                               hKey);
 	    }
 	}
@@ -1101,7 +1101,7 @@
 		      (i < 2) ? i : AUTO_DRIVE,
 		      DOSDEVICE_DRIVE_REMOVABLE,
                       0,
-                      (LARGE_INTEGER)0LL,
+                      RtlConvertLongToLargeInteger(0),
                       hKey);
     }
 
@@ -1121,7 +1121,7 @@
 		      AUTO_DRIVE,
 		      DOSDEVICE_DRIVE_CDROM,
                       0,
-                      (LARGE_INTEGER)0LL,
+                      RtlConvertLongToLargeInteger(0),
                       hKey);
     }
 
  _____  

Modified: trunk/reactos/ntoskrnl/kd/kdio.c
--- trunk/reactos/ntoskrnl/kd/kdio.c	2005-11-21 18:10:55 UTC (rev
19412)
+++ trunk/reactos/ntoskrnl/kd/kdio.c	2005-11-21 18:38:09 UTC (rev
19413)
@@ -263,10 +263,11 @@

 KdpPrintString(LPSTR String,
                ULONG Length)
 {
-    if (!KdpDebugMode.Value) return 0;
     PLIST_ENTRY CurrentEntry;
     PKD_DISPATCH_TABLE CurrentTable;
 
+    if (!KdpDebugMode.Value) return 0;
+
     /* Call the registered handlers */
     CurrentEntry = KdProviders.Flink;
     while (CurrentEntry != &KdProviders)
  _____  

Modified: trunk/reactos/ntoskrnl/kdbg/kdb.h
--- trunk/reactos/ntoskrnl/kdbg/kdb.h	2005-11-21 18:10:55 UTC (rev
19412)
+++ trunk/reactos/ntoskrnl/kdbg/kdb.h	2005-11-21 18:38:09 UTC (rev
19413)
@@ -87,7 +87,7 @@

 
 /* from i386/kdb_help.S */
 
-STDCALL VOID
+VOID STDCALL
 KdbpStackSwitchAndCall(
    IN PVOID NewStack,
    IN VOID (*Function)(VOID));
  _____  

Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c
--- trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c	2005-11-21 18:10:55 UTC
(rev 19412)
+++ trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c	2005-11-21 18:38:09 UTC
(rev 19413)
@@ -559,7 +559,7 @@

                         IN PLDR_DATA_TABLE_ENTRY Module)
 {
   /* Load symbols for the image if available */
-  DPRINT("Loading driver %wZ symbols (driver @ %08x)\n", Filename,
Module->Base);
+  DPRINT("Loading driver %wZ symbols (driver @ %08x)\n", Filename,
Module->DllBase);
 
   Module->PatchInformation = NULL;
 
@@ -664,7 +664,7 @@
         DPRINT("Installed symbols: %s@%08x-%08x %p\n",
 	       FileName,
 	       ModuleObject->DllBase,
-	       ModuleObject->SizeOfImage + ModuleObject->DllBase,
+	       ModuleObject->SizeOfImage + (ULONG)ModuleObject->DllBase,
 	       ModuleObject->PatchInformation);
      }
   }
  _____  

Modified: trunk/reactos/ntoskrnl/ke/apc.c
--- trunk/reactos/ntoskrnl/ke/apc.c	2005-11-21 18:10:55 UTC (rev
19412)
+++ trunk/reactos/ntoskrnl/ke/apc.c	2005-11-21 18:38:09 UTC (rev
19413)
@@ -1064,7 +1064,7 @@

     return Status;
 }
 
-static inline
+static __inline
 VOID RepairList(PLIST_ENTRY Original,
                 PLIST_ENTRY Copy,
                 KPROCESSOR_MODE Mode)
  _____  

Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c
--- trunk/reactos/ntoskrnl/ke/i386/kernel.c	2005-11-21 18:10:55 UTC
(rev 19412)
+++ trunk/reactos/ntoskrnl/ke/i386/kernel.c	2005-11-21 18:38:09 UTC
(rev 19413)
@@ -170,11 +170,12 @@

 NTAPI
 KePrepareForApplicationProcessorInit(ULONG Id)
 {
-  DPRINT("KePrepareForApplicationProcessorInit(Id %d)\n", Id);
   PFN_TYPE PrcPfn;
   PKIPCR Pcr;
   PKIPCR BootPcr;
 
+  DPRINT("KePrepareForApplicationProcessorInit(Id %d)\n", Id);
+
   BootPcr = (PKIPCR)KPCR_BASE;
   Pcr = (PKIPCR)((ULONG_PTR)KPCR_BASE + Id * PAGE_SIZE);
 
  _____  

Modified: trunk/reactos/ntoskrnl/ke/process.c
--- trunk/reactos/ntoskrnl/ke/process.c	2005-11-21 18:10:55 UTC (rev
19412)
+++ trunk/reactos/ntoskrnl/ke/process.c	2005-11-21 18:38:09 UTC (rev
19413)
@@ -36,7 +36,7 @@

 
 /* FUNCTIONS
*****************************************************************/
 
-static inline void
+static __inline void
 UpdatePageDirs(PKTHREAD Thread, PKPROCESS Process)
 {
     /*
  _____  

Modified: trunk/reactos/ntoskrnl/ke/wait.c
--- trunk/reactos/ntoskrnl/ke/wait.c	2005-11-21 18:10:55 UTC (rev
19412)
+++ trunk/reactos/ntoskrnl/ke/wait.c	2005-11-21 18:38:09 UTC (rev
19413)
@@ -27,7 +27,7 @@

 /* FUNCTIONS
*****************************************************************/
 
 BOOLEAN
-inline
+__inline
 FASTCALL
 KiCheckAlertability(BOOLEAN Alertable,
                     PKTHREAD CurrentThread,
@@ -771,7 +771,7 @@
 }
 
 BOOLEAN
-inline
+__inline
 FASTCALL
 KiIsObjectSignaled(PDISPATCHER_HEADER Object,
                    PKTHREAD Thread)
@@ -802,7 +802,7 @@
 }
 
 VOID
-inline
+__inline
 FASTCALL
 KiSatisifyMultipleObjectWaits(PKWAIT_BLOCK WaitBlock)
 {
@@ -819,7 +819,7 @@
 }
 
 VOID
-inline
+__inline
 FASTCALL
 KeInitializeDispatcherHeader(DISPATCHER_HEADER* Header,
                              ULONG Type,
@@ -835,7 +835,7 @@
 }
 
 KIRQL
-inline
+__inline
 FASTCALL
 KeAcquireDispatcherDatabaseLock(VOID)
 {
@@ -846,7 +846,7 @@
 }
 
 VOID
-inline
+__inline
 FASTCALL
 KeAcquireDispatcherDatabaseLockAtDpcLevel(VOID)
 {
@@ -854,7 +854,7 @@
 }
 
 VOID
-inline
+__inline
 FASTCALL
 KeInitializeDispatcher(VOID)
 {
@@ -863,7 +863,7 @@
 }
 
 VOID
-inline
+__inline
 FASTCALL
 KeReleaseDispatcherDatabaseLock(KIRQL OldIrql)
 {
@@ -882,7 +882,7 @@
 }
 
 VOID
-inline
+__inline
 FASTCALL
 KeReleaseDispatcherDatabaseLockFromDpcLevel(VOID)
 {
  _____  

Modified: trunk/reactos/ntoskrnl/lpc/reply.c
--- trunk/reactos/ntoskrnl/lpc/reply.c	2005-11-21 18:10:55 UTC (rev
19412)
+++ trunk/reactos/ntoskrnl/lpc/reply.c	2005-11-21 18:38:09 UTC (rev
19413)
@@ -163,7 +163,7 @@

    PreviousMode = ExGetPreviousMode();
 
    DPRINT("NtReplyWaitReceivePortEx(PortHandle %x, LpcReply %x, "
-	  "LpcMessage %x)\n", PortHandle, LpcReply, LpcMessage);
+	  "LpcMessage %x)\n", PortHandle, ReplyMessage, ReceiveMessage);
 
    if (PreviousMode != KernelMode)
      {
  _____  

Modified: trunk/reactos/ntoskrnl/mm/cont.c
--- trunk/reactos/ntoskrnl/mm/cont.c	2005-11-21 18:10:55 UTC (rev
19412)
+++ trunk/reactos/ntoskrnl/mm/cont.c	2005-11-21 18:38:09 UTC (rev
19413)
@@ -16,7 +16,7 @@

 
 /* FUNCTIONS
*****************************************************************/
 
-VOID STATIC
+static VOID 
 MmFreeContinuousPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID
Address,
                      PFN_TYPE Page, SWAPENTRY SwapEntry,
                      BOOLEAN Dirty)
@@ -93,7 +93,7 @@
                                &MArea,
                                FALSE,
                                0,
-                               (PHYSICAL_ADDRESS)0LL);
+                               RtlConvertLongToLargeInteger(0));
    MmUnlockAddressSpace(MmGetKernelAddressSpace());
 
    if (!NT_SUCCESS(Status))
@@ -158,9 +158,9 @@
                             IN PHYSICAL_ADDRESS
HighestAcceptableAddress)
 {
    return MmAllocateContiguousMemorySpecifyCache(NumberOfBytes,
-                                                 (PHYSICAL_ADDRESS)0LL,
+
RtlConvertLongToLargeInteger(0),
 
HighestAcceptableAddress,
-                                                 (PHYSICAL_ADDRESS)0LL,
+
RtlConvertLongToLargeInteger(0),
                                                  MmCached);
 }
 
  _____  

Modified: trunk/reactos/ntoskrnl/mm/npool.c
--- trunk/reactos/ntoskrnl/mm/npool.c	2005-11-21 18:10:55 UTC (rev
19412)
+++ trunk/reactos/ntoskrnl/mm/npool.c	2005-11-21 18:38:09 UTC (rev
19413)
@@ -1472,7 +1472,7 @@

    DPRINT("freeing block %x\n",blk);
 
    POOL_TRACE("ExFreePool(block %x), size %d, caller
%x\n",block,blk->hdr.Size,
-              block->Caller);
+              blk->Caller);
    KeAcquireSpinLock(&MmNpoolLock, &oldIrql);
 
    VALIDATE_POOL;
  _____  

Modified: trunk/reactos/ntoskrnl/mm/rpoolmgr.h
--- trunk/reactos/ntoskrnl/mm/rpoolmgr.h	2005-11-21 18:10:55 UTC
(rev 19412)
+++ trunk/reactos/ntoskrnl/mm/rpoolmgr.h	2005-11-21 18:38:09 UTC
(rev 19413)
@@ -496,7 +496,7 @@

 	return NextBlock;
 }
 
-inline static void*
+static __inline void*
 RHdrToBody ( void* blk )
 /*
  * FUNCTION: Translate a block header address to the corresponding
block
@@ -506,7 +506,7 @@
 	return ( (void *) ((char*)blk + sizeof(R_USED) + R_RZ) );
 }
 
-inline static PR_USED
+static __inline PR_USED
 RBodyToHdr ( void* addr )
 {
 	return (PR_USED)
  _____  

Modified: trunk/reactos/ntoskrnl/ob/sdcache.c
--- trunk/reactos/ntoskrnl/ob/sdcache.c	2005-11-21 18:10:55 UTC (rev
19412)
+++ trunk/reactos/ntoskrnl/ob/sdcache.c	2005-11-21 18:38:09 UTC (rev
19413)
@@ -52,7 +52,7 @@

 }
 
 
-static inline VOID
+static __inline VOID
 ObpSdCacheLock(VOID)
 {
   /* can't acquire a fast mutex in the early boot process... */
@@ -63,7 +63,7 @@
 }
 
 
-static inline VOID
+static __inline VOID
 ObpSdCacheUnlock(VOID)
 {
   /* can't acquire a fast mutex in the early boot process... */