[ros-diffs] [fireball] 31376: - Isolate Hal* #defines, which are absent in WDK, they should not be used in kernel development.

Author: fireball
Date: Fri Dec 21 17:58:18 2007
New Revision: 31376

URL: http://svn.reactos.org/svn/reactos?rev=31376&view=rev
Log:
- Isolate Hal* #defines, which are absent in WDK, they should not be used in kernel
development.

Modified:
    trunk/reactos/include/ddk/winddk.h
    trunk/reactos/ntoskrnl/fstub/disksup.c

Modified: trunk/reactos/include/ddk/winddk.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=3…
==============================================================================
--- trunk/reactos/include/ddk/winddk.h (original)
+++ trunk/reactos/include/ddk/winddk.h Fri Dec 21 17:58:18 2007
@@ -3016,11 +3016,6 @@
 #define HalQuerySystemInformation       HALDISPATCH->HalQuerySystemInformation
 #define HalSetSystemInformation         HALDISPATCH->HalSetSystemInformation
 #define HalQueryBusSlots                HALDISPATCH->HalQueryBusSlots
-#define HalDeviceControl                HALDISPATCH->HalDeviceControl
-#define HalIoAssignDriveLetters         HALDISPATCH->HalIoAssignDriveLetters
-#define HalIoReadPartitionTable         HALDISPATCH->HalIoReadPartitionTable
-#define HalIoSetPartitionInformation    HALDISPATCH->HalIoSetPartitionInformation
-#define HalIoWritePartitionTable        HALDISPATCH->HalIoWritePartitionTable
 #define HalReferenceHandlerForBus       HALDISPATCH->HalReferenceHandlerForBus
 #define HalReferenceBusHandler          HALDISPATCH->HalReferenceBusHandler
 #define HalDereferenceBusHandler        HALDISPATCH->HalDereferenceBusHandler
@@ -3033,6 +3028,14 @@
 #define HalMirrorPhysicalMemory         HALDISPATCH->HalMirrorPhysicalMemory
 #define HalEndOfBoot                    HALDISPATCH->HalEndOfBoot
 #define HalMirrorVerify                 HALDISPATCH->HalMirrorVerify
+
+#ifndef _NTOSKRNL_
+#define HalDeviceControl                HALDISPATCH->HalDeviceControl
+#define HalIoAssignDriveLetters         HALDISPATCH->HalIoAssignDriveLetters
+#define HalIoReadPartitionTable         HALDISPATCH->HalIoReadPartitionTable
+#define HalIoSetPartitionInformation    HALDISPATCH->HalIoSetPartitionInformation
+#define HalIoWritePartitionTable        HALDISPATCH->HalIoWritePartitionTable
+#endif
 
 typedef enum _FILE_INFORMATION_CLASS {
   FileDirectoryInformation = 1,

Modified: trunk/reactos/ntoskrnl/fstub/disksup.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/disksup.c?r…
==============================================================================
--- trunk/reactos/ntoskrnl/fstub/disksup.c (original)
+++ trunk/reactos/ntoskrnl/fstub/disksup.c Fri Dec 21 17:58:18 2007
@@ -2228,10 +2228,10 @@
               IN ULONG MbrTypeIdentifier,
               OUT PVOID *MbrBuffer)
 {
-    HalDispatchTable.HalExamineMBR(DeviceObject,
-                                   SectorSize,
-                                   MbrTypeIdentifier,
-                                   MbrBuffer);
+    HALDISPATCH->HalExamineMBR(DeviceObject,
+                               SectorSize,
+                               MbrTypeIdentifier,
+                               MbrBuffer);
 }
 
 /*
@@ -2244,10 +2244,10 @@
                      IN BOOLEAN ReturnRecognizedPartitions,
                      IN OUT PDRIVE_LAYOUT_INFORMATION *PartitionBuffer)
 {
-    return HalIoReadPartitionTable(DeviceObject,
-                                   SectorSize,
-                                   ReturnRecognizedPartitions,
-                                   PartitionBuffer);
+    return HALDISPATCH->HalIoReadPartitionTable(DeviceObject,
+                                                SectorSize,
+                                                ReturnRecognizedPartitions,
+                                                PartitionBuffer);
 }
 
 /*
@@ -2260,10 +2260,10 @@
                           IN ULONG PartitionNumber,
                           IN ULONG PartitionType)
 {
-    return HalIoSetPartitionInformation(DeviceObject,
-                                        SectorSize,
-                                        PartitionNumber,
-                                        PartitionType);
+    return HALDISPATCH->HalIoSetPartitionInformation(DeviceObject,
+                                                     SectorSize,
+                                                     PartitionNumber,
+                                                     PartitionType);
 }
 
 /*
@@ -2277,11 +2277,11 @@
                       IN ULONG NumberOfHeads,
                       IN PDRIVE_LAYOUT_INFORMATION PartitionBuffer)
 {
-    return HalIoWritePartitionTable(DeviceObject,
-                                    SectorSize,
-                                    SectorsPerTrack,
-                                    NumberOfHeads,
-                                    PartitionBuffer);
+    return HALDISPATCH->HalIoWritePartitionTable(DeviceObject,
+                                                 SectorSize,
+                                                 SectorsPerTrack,
+                                                 NumberOfHeads,
+                                                 PartitionBuffer);
 }
 
 /*
@@ -2294,10 +2294,10 @@
                      OUT PUCHAR NtSystemPath,
                      OUT PSTRING NtSystemPathString)
 {
-    HalIoAssignDriveLetters(LoaderBlock,
-                            NtDeviceName,
-                            NtSystemPath,
-                            NtSystemPathString);
+    HALDISPATCH->HalIoAssignDriveLetters(LoaderBlock,
+                                         NtDeviceName,
+                                         NtSystemPath,
+                                         NtSystemPathString);
 }
 
 /* EOF */