Author: sginsberg
Date: Thu Aug 20 15:57:16 2009
New Revision: 42807
URL: http://svn.reactos.org/svn/reactos?rev=42807&view=rev
Log:
- Get rid of DECLSPEC_EXPORT from DDK
- "Isolate Hal* #defines, which are absent in WDK, they should not be used in
kernel development." No, exactly, and they shouldn't be used in Xbox HAL either
Modified:
trunk/reactos/hal/halx86/xbox/part_xbox.c
trunk/reactos/include/ddk/ntdef.h
trunk/reactos/include/ddk/winddk.h
Modified: trunk/reactos/hal/halx86/xbox/part_xbox.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/xbox/part_xbox.c?rev=42807&r1=42806&r2=42807&view=diff
==============================================================================
--- trunk/reactos/hal/halx86/xbox/part_xbox.c [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/xbox/part_xbox.c [iso-8859-1] Thu Aug 20 15:57:16
2009
@@ -304,7 +304,10 @@
return STATUS_ACCESS_DENIED;
}
-#define HalExamineMBR HALDISPATCH->HalExamineMBR
+#define HalExamineMBR HALDISPATCH->HalExamineMBR
+#define HalIoReadPartitionTable HALDISPATCH->HalIoReadPartitionTable
+#define HalIoSetPartitionInformation
HALDISPATCH->HalIoSetPartitionInformation
+#define HalIoWritePartitionTable HALDISPATCH->HalIoWritePartitionTable
void
HalpXboxInitPartIo(void)
Modified: trunk/reactos/include/ddk/ntdef.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntdef.h?rev=42807&r1=42806&r2=42807&view=diff
==============================================================================
--- trunk/reactos/include/ddk/ntdef.h [iso-8859-1] (original)
+++ trunk/reactos/include/ddk/ntdef.h [iso-8859-1] Thu Aug 20 15:57:16 2009
@@ -193,7 +193,6 @@
// Done the same way as in windef.h for now
#define DECLSPEC_IMPORT __declspec(dllimport)
-#define DECLSPEC_EXPORT __declspec(dllexport)
#define DECLSPEC_NORETURN __declspec(noreturn)
Modified: trunk/reactos/include/ddk/winddk.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=42807&r1=42806&r2=42807&view=diff
==============================================================================
--- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original)
+++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Thu Aug 20 15:57:16 2009
@@ -2855,7 +2855,7 @@
extern NTSYSAPI PHAL_DISPATCH HalDispatchTable;
#define HALDISPATCH ((PHAL_DISPATCH)&HalDispatchTable)
#else
-extern DECLSPEC_EXPORT HAL_DISPATCH HalDispatchTable;
+extern __declspec(dllexport) HAL_DISPATCH HalDispatchTable;
#define HALDISPATCH (&HalDispatchTable)
#endif
@@ -2876,14 +2876,6 @@
#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,
