From ef09f86407971826bf88fdf8db7e9dfdda082863 Mon Sep 17 00:00:00 2001 From: Filip Navara Date: Fri, 17 Jun 2005 17:15:55 +0000 Subject: [PATCH] Use W32API. svn path=/trunk/; revision=15995 --- reactos/drivers/bus/acpi/acpi.xml | 2 +- reactos/drivers/storage/atapi/atapi.c | 1 - reactos/drivers/storage/atapi/atapi.xml | 1 + reactos/drivers/storage/cdrom/cdrom.c | 9 ++++++--- reactos/drivers/storage/cdrom/cdrom.xml | 1 + reactos/drivers/storage/class2/class2.c | 3 +++ reactos/drivers/storage/class2/class2.xml | 1 + reactos/drivers/storage/disk/disk.c | 2 ++ reactos/drivers/storage/disk/disk.xml | 1 + reactos/drivers/storage/diskdump/diskdump.c | 4 +++- reactos/drivers/storage/diskdump/diskdump.xml | 1 + reactos/drivers/storage/floppy/floppy.h | 2 -- reactos/drivers/storage/floppy/floppy.xml | 1 + reactos/drivers/storage/scsiport/scsiport.c | 7 +++---- reactos/drivers/storage/scsiport/scsiport.xml | 1 + reactos/drivers/storage/scsiport/scsiport_int.h | 3 +++ 16 files changed, 28 insertions(+), 12 deletions(-) diff --git a/reactos/drivers/bus/acpi/acpi.xml b/reactos/drivers/bus/acpi/acpi.xml index f1c193d7ece..2c6c4e5be59 100644 --- a/reactos/drivers/bus/acpi/acpi.xml +++ b/reactos/drivers/bus/acpi/acpi.xml @@ -1,7 +1,7 @@ include ospm/include - + ntoskrnl hal diff --git a/reactos/drivers/storage/atapi/atapi.c b/reactos/drivers/storage/atapi/atapi.c index a039a160a11..1a8cc551252 100644 --- a/reactos/drivers/storage/atapi/atapi.c +++ b/reactos/drivers/storage/atapi/atapi.c @@ -52,7 +52,6 @@ #include #include #include -#include #include "atapi.h" diff --git a/reactos/drivers/storage/atapi/atapi.xml b/reactos/drivers/storage/atapi/atapi.xml index 0da47ba870f..a1faf98d4bb 100644 --- a/reactos/drivers/storage/atapi/atapi.xml +++ b/reactos/drivers/storage/atapi/atapi.xml @@ -1,5 +1,6 @@ + . ntoskrnl hal diff --git a/reactos/drivers/storage/cdrom/cdrom.c b/reactos/drivers/storage/cdrom/cdrom.c index e8baab68cc0..a003f14e836 100644 --- a/reactos/drivers/storage/cdrom/cdrom.c +++ b/reactos/drivers/storage/cdrom/cdrom.c @@ -35,9 +35,12 @@ #include #include -#include #include +#include +#include +#include #include +#include #define NDEBUG #include @@ -134,7 +137,7 @@ VOID STDCALL CdromTimerRoutine(IN PDEVICE_OBJECT DeviceObject, IN PVOID Context); -VOID +VOID STDCALL CdromWorkItem(IN PDEVICE_OBJECT DeviceObject, IN PVOID Context); @@ -1633,7 +1636,7 @@ CdromTimerRoutine(IN PDEVICE_OBJECT DeviceObject, } -VOID +VOID STDCALL CdromWorkItem(IN PDEVICE_OBJECT DeviceObject, IN PVOID Context) { diff --git a/reactos/drivers/storage/cdrom/cdrom.xml b/reactos/drivers/storage/cdrom/cdrom.xml index 4cb23c80998..1514c70af66 100644 --- a/reactos/drivers/storage/cdrom/cdrom.xml +++ b/reactos/drivers/storage/cdrom/cdrom.xml @@ -1,5 +1,6 @@ + ntoskrnl hal class2 diff --git a/reactos/drivers/storage/class2/class2.c b/reactos/drivers/storage/class2/class2.c index 5071fe9e92a..c325d51348f 100644 --- a/reactos/drivers/storage/class2/class2.c +++ b/reactos/drivers/storage/class2/class2.c @@ -33,12 +33,15 @@ /* INCLUDES *****************************************************************/ #include +#include #include #include +#include #define NDEBUG #include +#define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) #define VERSION "0.0.2" diff --git a/reactos/drivers/storage/class2/class2.xml b/reactos/drivers/storage/class2/class2.xml index f6bb6ace0bf..ba572c86a89 100644 --- a/reactos/drivers/storage/class2/class2.xml +++ b/reactos/drivers/storage/class2/class2.xml @@ -1,5 +1,6 @@ + ntoskrnl hal diff --git a/reactos/drivers/storage/disk/disk.c b/reactos/drivers/storage/disk/disk.c index 9b2cf1d5593..a28a857842d 100644 --- a/reactos/drivers/storage/disk/disk.c +++ b/reactos/drivers/storage/disk/disk.c @@ -28,9 +28,11 @@ /* INCLUDES *****************************************************************/ #include +#include #include #include #include +#include #define NDEBUG #include diff --git a/reactos/drivers/storage/disk/disk.xml b/reactos/drivers/storage/disk/disk.xml index f485138ce76..b37c329ece5 100644 --- a/reactos/drivers/storage/disk/disk.xml +++ b/reactos/drivers/storage/disk/disk.xml @@ -1,5 +1,6 @@ + -lgcc ntoskrnl hal diff --git a/reactos/drivers/storage/diskdump/diskdump.c b/reactos/drivers/storage/diskdump/diskdump.c index 376c9f02d80..2ca4d6c4d87 100644 --- a/reactos/drivers/storage/diskdump/diskdump.c +++ b/reactos/drivers/storage/diskdump/diskdump.c @@ -29,8 +29,10 @@ #include #include -#include +#include #include +#include +#include #include #include "../scsiport/scsiport_int.h" diff --git a/reactos/drivers/storage/diskdump/diskdump.xml b/reactos/drivers/storage/diskdump/diskdump.xml index 22816ebbcd2..a1156b59233 100644 --- a/reactos/drivers/storage/diskdump/diskdump.xml +++ b/reactos/drivers/storage/diskdump/diskdump.xml @@ -1,5 +1,6 @@ + ntoskrnl hal diff --git a/reactos/drivers/storage/floppy/floppy.h b/reactos/drivers/storage/floppy/floppy.h index b479a3c55e7..031e897b31c 100644 --- a/reactos/drivers/storage/floppy/floppy.h +++ b/reactos/drivers/storage/floppy/floppy.h @@ -29,13 +29,11 @@ #define MAX_DRIVES_PER_CONTROLLER 4 #define MAX_CONTROLLERS 4 -#ifdef _MSC_VER /* MS doesn't prototype this but the w2k kernel exports it */ int _cdecl swprintf(const WCHAR *, ...); /* need ioctls in ddk build mode */ #include -#endif /* missing from ros headers */ /* TODO: fix this right */ diff --git a/reactos/drivers/storage/floppy/floppy.xml b/reactos/drivers/storage/floppy/floppy.xml index 6be2bdc993c..afc62088952 100644 --- a/reactos/drivers/storage/floppy/floppy.xml +++ b/reactos/drivers/storage/floppy/floppy.xml @@ -1,5 +1,6 @@ + . ntoskrnl hal diff --git a/reactos/drivers/storage/scsiport/scsiport.c b/reactos/drivers/storage/scsiport/scsiport.c index 93d6dabcf87..da66b435940 100644 --- a/reactos/drivers/storage/scsiport/scsiport.c +++ b/reactos/drivers/storage/scsiport/scsiport.c @@ -33,7 +33,7 @@ #include #include #include -#include +#include #define NDEBUG #include @@ -2337,7 +2337,8 @@ SpiBuildDeviceMap (PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, { PSCSI_PORT_LUN_EXTENSION LunExtension; OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; + UNICODE_STRING KeyName = + RTL_CONSTANT_STRING(L"\\Registry\\Machine\\Hardware\\DeviceMap\\Scsi"); UNICODE_STRING ValueName; WCHAR NameBuffer[64]; ULONG Disposition; @@ -2365,8 +2366,6 @@ SpiBuildDeviceMap (PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, } /* Open or create the 'Scsi' subkey */ - RtlRosInitUnicodeStringFromLiteral(&KeyName, - L"\\Registry\\Machine\\Hardware\\DeviceMap\\Scsi"); InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE | OBJ_OPENIF, diff --git a/reactos/drivers/storage/scsiport/scsiport.xml b/reactos/drivers/storage/scsiport/scsiport.xml index 7f6dc63d34b..b311a4ad841 100644 --- a/reactos/drivers/storage/scsiport/scsiport.xml +++ b/reactos/drivers/storage/scsiport/scsiport.xml @@ -1,5 +1,6 @@ + . ntoskrnl diff --git a/reactos/drivers/storage/scsiport/scsiport_int.h b/reactos/drivers/storage/scsiport/scsiport_int.h index e9aeba834d4..1615d31e0e1 100644 --- a/reactos/drivers/storage/scsiport/scsiport_int.h +++ b/reactos/drivers/storage/scsiport/scsiport_int.h @@ -7,6 +7,9 @@ #define VERSION "0.0.3" +#define PAGE_ROUND_UP(x) ( (((ULONG_PTR)x)%PAGE_SIZE) ? ((((ULONG_PTR)x)&(~(PAGE_SIZE-1)))+PAGE_SIZE) : ((ULONG_PTR)x) ) +#define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) + typedef enum _SCSI_PORT_TIMER_STATES { IDETimerIdle,