From 4705fbc38afb8a4bfd3ba50b0710d80668ffcce3 Mon Sep 17 00:00:00 2001 From: Stefan Ginsberg Date: Thu, 20 Aug 2009 13:57:16 +0000 Subject: [PATCH] - 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 svn path=/trunk/; revision=42807 --- reactos/hal/halx86/xbox/part_xbox.c | 5 ++++- reactos/include/ddk/ntdef.h | 1 - reactos/include/ddk/winddk.h | 10 +--------- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/reactos/hal/halx86/xbox/part_xbox.c b/reactos/hal/halx86/xbox/part_xbox.c index 56065c0e2de..1ae2591502e 100644 --- a/reactos/hal/halx86/xbox/part_xbox.c +++ b/reactos/hal/halx86/xbox/part_xbox.c @@ -304,7 +304,10 @@ HalpXboxIoWritePartitionTable(IN PDEVICE_OBJECT DeviceObject, 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) diff --git a/reactos/include/ddk/ntdef.h b/reactos/include/ddk/ntdef.h index 10b3156fa77..045c86b30e8 100644 --- a/reactos/include/ddk/ntdef.h +++ b/reactos/include/ddk/ntdef.h @@ -193,7 +193,6 @@ typedef unsigned long POINTER_64; // FIXME! HACK!!! // 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) diff --git a/reactos/include/ddk/winddk.h b/reactos/include/ddk/winddk.h index 38d20b0e7be..76a88971845 100644 --- a/reactos/include/ddk/winddk.h +++ b/reactos/include/ddk/winddk.h @@ -2855,7 +2855,7 @@ typedef struct { 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 @@ -2877,14 +2877,6 @@ extern DECLSPEC_EXPORT HAL_DISPATCH HalDispatchTable; #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, FileFullDirectoryInformation,