Ros-diffs

ros-diffs@reactos.org

81390 discussions

[navaraf] 15979: Define KEBUGCHECK and KEBUGCHECKEX here.
by navaraf＠svn.reactos.com 17 Jun '05

17 Jun '05

Define KEBUGCHECK and KEBUGCHECKEX here. Modified: trunk/reactos/include/debug.h _____ Modified: trunk/reactos/include/debug.h --- trunk/reactos/include/debug.h 2005-06-17 13:12:45 UTC (rev 15978) +++ trunk/reactos/include/debug.h 2005-06-17 13:13:37 UTC (rev 15979) @@ -93,4 +93,9 @@ #error Unsupported architecture. #endif +#ifndes KEBUGCHECK +#define KEBUGCHECK(a) DbgPrint("KeBugCheck (0x%X) at %s:%i\n", a, __FILE__,__LINE__), KeBugCheck(a) +#define KEBUGCHECKEX(a,b,c,d,e) DbgPrint("KeBugCheckEx (0x%X, 0x%X, 0x%X, 0x%X, 0x%X) at %s:%i\n", a, b, c, d, e, __FILE__,__LINE__), KeBugCheckEx(a,b,c,d,e) +#endif + #endif /* __INTERNAL_DEBUG */

1 0

[navaraf] 15978: A bit of W32API friendliness...
by navaraf＠svn.reactos.com 17 Jun '05

17 Jun '05

A bit of W32API friendliness... Modified: trunk/reactos/include/ddk/ntbootvid.h _____ Modified: trunk/reactos/include/ddk/ntbootvid.h --- trunk/reactos/include/ddk/ntbootvid.h 2005-06-17 13:05:11 UTC (rev 15977) +++ trunk/reactos/include/ddk/ntbootvid.h 2005-06-17 13:12:45 UTC (rev 15978) @@ -7,5 +7,5 @@ typedef struct { - BOOL STDCALL_FUNC (*ResetDisplay)(VOID); + BOOL (STDCALL *ResetDisplay)(VOID); } NTBOOTVID_FUNCTION_TABLE;

1 0

[navaraf] 15977: Use W32API.
by navaraf＠svn.reactos.com 17 Jun '05

17 Jun '05

Use W32API. Modified: trunk/reactos/drivers/lib/csq/csq.xml _____ Modified: trunk/reactos/drivers/lib/csq/csq.xml --- trunk/reactos/drivers/lib/csq/csq.xml 2005-06-17 13:00:03 UTC (rev 15976) +++ trunk/reactos/drivers/lib/csq/csq.xml 2005-06-17 13:05:11 UTC (rev 15977) @@ -1,3 +1,4 @@ <module name="csq" type="staticlibrary"> + <define name="__USE_W32API"/> <file>csq.c</file> </module>

1 0

[navaraf] 15976: Allow csq.h to be included along with ntddk.h.
by navaraf＠svn.reactos.com 17 Jun '05

17 Jun '05

Allow csq.h to be included along with ntddk.h. Modified: trunk/reactos/include/ddk/csq.h _____ Modified: trunk/reactos/include/ddk/csq.h --- trunk/reactos/include/ddk/csq.h 2005-06-17 12:59:27 UTC (rev 15975) +++ trunk/reactos/include/ddk/csq.h 2005-06-17 13:00:03 UTC (rev 15976) @@ -45,6 +45,12 @@ #ifndef _REACTOS_CSQ_H #define _REACTOS_CSQ_H +/* + * Prevent including the CSQ definitions twice. They're present in NTDDK + * now too, except the *_EX versions. + */ +#ifndef IO_TYPE_CSQ_IRP_CONTEXT + struct _IO_CSQ; @@ -76,24 +82,6 @@ /* - * Function to insert an IRP into the queue with extended context information. - * This is useful if you need to be able to de-queue particular IRPs more - * easily in some cases. - * - * Same deal as above; sample implementation: - * - NTSTATUS NTAPI CsqInsertIrpEx(PIO_CSQ Csq, PIRP Irp, PVOID InsertContext) - { - CsqInsertIrp(Csq, Irp); - return STATUS_PENDING; - } - * - */ -typedef NTSTATUS (NTAPI *PIO_CSQ_INSERT_IRP_EX) (struct _IO_CSQ *Csq, - PIRP Irp, - PVOID InsertContext); - -/* * Function to remove an IRP from the queue. * * Sample: @@ -188,7 +176,6 @@ */ #define IO_TYPE_CSQ_IRP_CONTEXT 1 #define IO_TYPE_CSQ 2 -#define IO_TYPE_CSQ_EX 3 /* * IO_CSQ - Queue control structure @@ -213,8 +200,30 @@ PIO_CSQ Csq; } IO_CSQ_IRP_CONTEXT, *PIO_CSQ_IRP_CONTEXT; +#endif /* IO_TYPE_CSQ_IRP_CONTEXT */ +/* See IO_TYPE_CSQ_* above */ +#define IO_TYPE_CSQ_EX 3 + /* + * Function to insert an IRP into the queue with extended context information. + * This is useful if you need to be able to de-queue particular IRPs more + * easily in some cases. + * + * Same deal as above; sample implementation: + * + NTSTATUS NTAPI CsqInsertIrpEx(PIO_CSQ Csq, PIRP Irp, PVOID InsertContext) + { + CsqInsertIrp(Csq, Irp); + return STATUS_PENDING; + } + * + */ +typedef NTSTATUS (NTAPI *PIO_CSQ_INSERT_IRP_EX) (struct _IO_CSQ *Csq, + PIRP Irp, + PVOID InsertContext); + +/* * CANCEL-SAFE QUEUE DDIs * * These device driver interfaces are called to make use of the queue. Again,

1 0

[navaraf] 15975: Include the prototypes for CcRosInitializeFileCache and CcRosReleaseFileCache even when compiling w/ W32API.
by navaraf＠svn.reactos.com 17 Jun '05

17 Jun '05

Include the prototypes for CcRosInitializeFileCache and CcRosReleaseFileCache even when compiling w/ W32API. Modified: trunk/reactos/include/ddk/ntifs.h _____ Modified: trunk/reactos/include/ddk/ntifs.h --- trunk/reactos/include/ddk/ntifs.h 2005-06-17 12:57:31 UTC (rev 15974) +++ trunk/reactos/include/ddk/ntifs.h 2005-06-17 12:59:27 UTC (rev 15975) @@ -2,6 +2,12 @@ #include_next <ddk/ntifs.h> +NTSTATUS STDCALL +CcRosInitializeFileCache (PFILE_OBJECT FileObject, + ULONG CacheSegmentSize); +NTSTATUS STDCALL +CcRosReleaseFileCache (PFILE_OBJECT FileObject); + #else /* __USE_W32API */ #ifndef __INCLUDE_DDK_NTIFS_H

1 0

[navaraf] 15974: - Fix prototype of IoCsqInitialize.
by navaraf＠svn.reactos.com 17 Jun '05

17 Jun '05

- Fix prototype of IoCsqInitialize. - Define IO_TYPE_CSQ and IO_TYPE_CSQ_IRP_CONTEXT. Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2005-06-17 12:31:49 UTC (rev 15973) +++ trunk/reactos/w32api/include/ddk/winddk.h 2005-06-17 12:57:31 UTC (rev 15974) @@ -2700,6 +2700,9 @@ ULONG FullCreateOptions; } IO_SECURITY_CONTEXT, *PIO_SECURITY_CONTEXT; +#define IO_TYPE_CSQ_IRP_CONTEXT 1 +#define IO_TYPE_CSQ 2 + struct _IO_CSQ; typedef struct _IO_CSQ_IRP_CONTEXT { @@ -6551,7 +6554,7 @@ IN PUNICODE_STRING DeviceName); NTOSAPI -VOID +NTSTATUS DDKAPI IoCsqInitialize( PIO_CSQ Csq,

1 0

[navaraf] 15973: Get rid of obsolete makefile.
by navaraf＠svn.reactos.com 17 Jun '05

17 Jun '05

Get rid of obsolete makefile. Deleted: trunk/reactos/drivers/lib/csq/GNUmakefile _____ Deleted: trunk/reactos/drivers/lib/csq/GNUmakefile --- trunk/reactos/drivers/lib/csq/GNUmakefile 2005-06-17 12:29:33 UTC (rev 15972) +++ trunk/reactos/drivers/lib/csq/GNUmakefile 2005-06-17 12:31:49 UTC (rev 15973) @@ -1,9 +0,0 @@ -PATH_TO_TOP = ../../.. - -TARGET_TYPE = kmlibrary -TARGET_NAME = csq -TARGET_CFLAGS = -Wall -Werror -TARGET_OBJECTS = csq.o - -include $(PATH_TO_TOP)/rules.mak -include $(TOOLS_PATH)/helper.mk

1 0

[navaraf] 15972: Build file system drivers w/ W32API headers.
by navaraf＠svn.reactos.com 17 Jun '05

17 Jun '05

Build file system drivers w/ W32API headers. Modified: trunk/reactos/drivers/fs/cdfs/cdfs.h Modified: trunk/reactos/drivers/fs/cdfs/cdfs.xml Modified: trunk/reactos/drivers/fs/cdfs/create.c Modified: trunk/reactos/drivers/fs/cdfs/dirctl.c Modified: trunk/reactos/drivers/fs/cdfs/fcb.c Modified: trunk/reactos/drivers/fs/cdfs/fsctl.c Modified: trunk/reactos/drivers/fs/fs_rec/cdfs.c Modified: trunk/reactos/drivers/fs/fs_rec/fat.c Modified: trunk/reactos/drivers/fs/fs_rec/fs_rec.c Modified: trunk/reactos/drivers/fs/fs_rec/fs_rec.xml Modified: trunk/reactos/drivers/fs/fs_rec/ntfs.c Modified: trunk/reactos/drivers/fs/fs_rec/udfs.c Modified: trunk/reactos/drivers/fs/ms/create.c Modified: trunk/reactos/drivers/fs/ms/finfo.c Modified: trunk/reactos/drivers/fs/ms/fsctrl.c Modified: trunk/reactos/drivers/fs/ms/msfs.c Modified: trunk/reactos/drivers/fs/ms/msfs.xml Modified: trunk/reactos/drivers/fs/ms/rw.c Modified: trunk/reactos/drivers/fs/mup/create.c Modified: trunk/reactos/drivers/fs/mup/mup.h Modified: trunk/reactos/drivers/fs/mup/mup.xml Modified: trunk/reactos/drivers/fs/np/create.c Modified: trunk/reactos/drivers/fs/np/finfo.c Modified: trunk/reactos/drivers/fs/np/fsctrl.c Modified: trunk/reactos/drivers/fs/np/npfs.c Modified: trunk/reactos/drivers/fs/np/npfs.h Modified: trunk/reactos/drivers/fs/np/npfs.xml Modified: trunk/reactos/drivers/fs/np/rw.c Modified: trunk/reactos/drivers/fs/np/volume.c Modified: trunk/reactos/drivers/fs/ntfs/fcb.c Modified: trunk/reactos/drivers/fs/ntfs/fsctl.c Modified: trunk/reactos/drivers/fs/ntfs/ntfs.h Modified: trunk/reactos/drivers/fs/ntfs/ntfs.xml _____ Modified: trunk/reactos/drivers/fs/cdfs/cdfs.h --- trunk/reactos/drivers/fs/cdfs/cdfs.h 2005-06-17 12:24:29 UTC (rev 15971) +++ trunk/reactos/drivers/fs/cdfs/cdfs.h 2005-06-17 12:29:33 UTC (rev 15972) @@ -213,7 +213,9 @@ ULONG LastOffset; } CCB, *PCCB; +#ifndef TAG #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) +#endif #define TAG_CCB TAG('I', 'C', 'C', 'B') _____ Modified: trunk/reactos/drivers/fs/cdfs/cdfs.xml --- trunk/reactos/drivers/fs/cdfs/cdfs.xml 2005-06-17 12:24:29 UTC (rev 15971) +++ trunk/reactos/drivers/fs/cdfs/cdfs.xml 2005-06-17 12:29:33 UTC (rev 15972) @@ -1,6 +1,7 @@ <module name="cdfs" type="kernelmodedriver" installbase="system32/drivers" installname="cdfs.sys"> <bootstrap base="reactos" /> <include base="cdfs">.</include> + <define name="__USE_W32API" /> <library>ntoskrnl</library> <library>hal</library> <file>cdfs.c</file> _____ Modified: trunk/reactos/drivers/fs/cdfs/create.c --- trunk/reactos/drivers/fs/cdfs/create.c 2005-06-17 12:24:29 UTC (rev 15971) +++ trunk/reactos/drivers/fs/cdfs/create.c 2005-06-17 12:29:33 UTC (rev 15972) @@ -29,6 +29,7 @@ /* INCLUDES *****************************************************************/ #include <ddk/ntddk.h> +#include <ntddcdrm.h> #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/drivers/fs/cdfs/dirctl.c --- trunk/reactos/drivers/fs/cdfs/dirctl.c 2005-06-17 12:24:29 UTC (rev 15971) +++ trunk/reactos/drivers/fs/cdfs/dirctl.c 2005-06-17 12:29:33 UTC (rev 15972) @@ -39,6 +39,7 @@ /* DEFINES ******************************************************************/ #define ROUND_DOWN(N, S) (((N) / (S)) * (S)) +#define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) /* FUNCTIONS ****************************************************************/ _____ Modified: trunk/reactos/drivers/fs/cdfs/fcb.c --- trunk/reactos/drivers/fs/cdfs/fcb.c 2005-06-17 12:24:29 UTC (rev 15971) +++ trunk/reactos/drivers/fs/cdfs/fcb.c 2005-06-17 12:29:33 UTC (rev 15972) @@ -29,7 +29,6 @@ /* INCLUDES *****************************************************************/ #include <ddk/ntddk.h> -#include <ntos/kefuncs.h> #define NDEBUG #include <debug.h> @@ -39,7 +38,6 @@ /* MACROS *******************************************************************/ -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define TAG_FCB TAG('I', 'F', 'C', 'B') #define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) _____ Modified: trunk/reactos/drivers/fs/cdfs/fsctl.c --- trunk/reactos/drivers/fs/cdfs/fsctl.c 2005-06-17 12:24:29 UTC (rev 15971) +++ trunk/reactos/drivers/fs/cdfs/fsctl.c 2005-06-17 12:29:33 UTC (rev 15972) @@ -29,6 +29,7 @@ /* INCLUDES *****************************************************************/ #include <ddk/ntddk.h> +#include <ntddcdrm.h> #include <ntos/minmax.h> #define NDEBUG _____ Modified: trunk/reactos/drivers/fs/fs_rec/cdfs.c --- trunk/reactos/drivers/fs/fs_rec/cdfs.c 2005-06-17 12:24:29 UTC (rev 15971) +++ trunk/reactos/drivers/fs/fs_rec/cdfs.c 2005-06-17 12:29:33 UTC (rev 15972) @@ -27,8 +27,9 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <rosrtl/string.h> +#include <ntifs.h> +#include <ntdddisk.h> +#include <ntddcdrm.h> #define NDEBUG #include <debug.h> @@ -102,7 +103,8 @@ IN PIRP Irp) { PIO_STACK_LOCATION Stack; - UNICODE_STRING RegistryPath; + static UNICODE_STRING RegistryPath = + RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet\\Se rvices\\Cdfs"); NTSTATUS Status; Stack = IoGetCurrentIrpStackLocation(Irp); @@ -121,8 +123,6 @@ case IRP_MN_LOAD_FILE_SYSTEM: DPRINT("Cdfs: IRP_MN_LOAD_FILE_SYSTEM\n"); - RtlRosInitUnicodeStringFromLiteral(&RegistryPath, - L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\Cdfs"); Status = ZwLoadDriver(&RegistryPath); if (!NT_SUCCESS(Status)) { _____ Modified: trunk/reactos/drivers/fs/fs_rec/fat.c --- trunk/reactos/drivers/fs/fs_rec/fat.c 2005-06-17 12:24:29 UTC (rev 15971) +++ trunk/reactos/drivers/fs/fs_rec/fat.c 2005-06-17 12:29:33 UTC (rev 15972) @@ -27,8 +27,8 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <rosrtl/string.h> +#include <ntifs.h> +#include <ntdddisk.h> #define NDEBUG #include <debug.h> @@ -186,7 +186,8 @@ IN PIRP Irp) { PIO_STACK_LOCATION Stack; - UNICODE_STRING RegistryPath; + static UNICODE_STRING RegistryPath = + RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet\\Se rvices\\Vfatfs"); NTSTATUS Status; Stack = IoGetCurrentIrpStackLocation(Irp); @@ -205,8 +206,6 @@ case IRP_MN_LOAD_FILE_SYSTEM: DPRINT("FAT: IRP_MN_LOAD_FILE_SYSTEM\n"); - RtlRosInitUnicodeStringFromLiteral(&RegistryPath, - L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\Vfatfs"); Status = ZwLoadDriver(&RegistryPath); if (!NT_SUCCESS(Status)) { _____ Modified: trunk/reactos/drivers/fs/fs_rec/fs_rec.c --- trunk/reactos/drivers/fs/fs_rec/fs_rec.c 2005-06-17 12:24:29 UTC (rev 15971) +++ trunk/reactos/drivers/fs/fs_rec/fs_rec.c 2005-06-17 12:29:33 UTC (rev 15972) @@ -27,7 +27,7 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#include <ntifs.h> #define NDEBUG #include <debug.h> @@ -154,7 +154,7 @@ NULL, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, - OPEN_EXISTING, + FILE_OPEN, 0, NULL, 0); _____ Modified: trunk/reactos/drivers/fs/fs_rec/fs_rec.xml --- trunk/reactos/drivers/fs/fs_rec/fs_rec.xml 2005-06-17 12:24:29 UTC (rev 15971) +++ trunk/reactos/drivers/fs/fs_rec/fs_rec.xml 2005-06-17 12:29:33 UTC (rev 15972) @@ -1,5 +1,6 @@ <module name="fs_rec" type="kernelmodedriver" installbase="system32/drivers" installname="fs_rec.sys"> <include base="fs_rec">.</include> + <define name="__USE_W32API" /> <library>ntoskrnl</library> <library>hal</library> <file>blockdev.c</file> _____ Modified: trunk/reactos/drivers/fs/fs_rec/ntfs.c --- trunk/reactos/drivers/fs/fs_rec/ntfs.c 2005-06-17 12:24:29 UTC (rev 15971) +++ trunk/reactos/drivers/fs/fs_rec/ntfs.c 2005-06-17 12:29:33 UTC (rev 15972) @@ -27,7 +27,8 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#include <ntifs.h> +#include <ntdddisk.h> #define NDEBUG #include <debug.h> @@ -99,7 +100,8 @@ IN PIRP Irp) { PIO_STACK_LOCATION Stack; - UNICODE_STRING RegistryPath; + static UNICODE_STRING RegistryPath = + RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet\\Se rvices\\Ntfs"); NTSTATUS Status; Stack = IoGetCurrentIrpStackLocation(Irp); @@ -119,8 +121,6 @@ case IRP_MN_LOAD_FILE_SYSTEM: DPRINT("NTFS: IRP_MN_LOAD_FILE_SYSTEM\n"); - RtlInitUnicodeString(&RegistryPath, - L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\Ntfs"); Status = ZwLoadDriver(&RegistryPath); if (!NT_SUCCESS(Status)) { _____ Modified: trunk/reactos/drivers/fs/fs_rec/udfs.c --- trunk/reactos/drivers/fs/fs_rec/udfs.c 2005-06-17 12:24:29 UTC (rev 15971) +++ trunk/reactos/drivers/fs/fs_rec/udfs.c 2005-06-17 12:29:33 UTC (rev 15972) @@ -27,8 +27,9 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <rosrtl/string.h> +#include <ntifs.h> +#include <ntdddisk.h> +#include <ntddcdrm.h> #define NDEBUG #include <debug.h> @@ -258,7 +259,8 @@ IN PIRP Irp) { PIO_STACK_LOCATION Stack; - UNICODE_STRING RegistryPath; + static UNICODE_STRING RegistryPath = + RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet\\Se rvices\\Udfs"); NTSTATUS Status; Stack = IoGetCurrentIrpStackLocation(Irp); @@ -277,8 +279,6 @@ case IRP_MN_LOAD_FILE_SYSTEM: DPRINT("Udfs: IRP_MN_LOAD_FILE_SYSTEM\n"); - RtlRosInitUnicodeStringFromLiteral(&RegistryPath, - L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\Udfs"); Status = ZwLoadDriver(&RegistryPath); if (!NT_SUCCESS(Status)) { _____ Modified: trunk/reactos/drivers/fs/ms/create.c --- trunk/reactos/drivers/fs/ms/create.c 2005-06-17 12:24:29 UTC (rev 15971) +++ trunk/reactos/drivers/fs/ms/create.c 2005-06-17 12:29:33 UTC (rev 15972) @@ -9,8 +9,9 @@ /* INCLUDES ******************************************************************/ -#include <ddk/ntddk.h> -#include <ddk/iotypes.h> /* FIXME: Temporary Until NDK implemented */ +#include <ntifs.h> +/* FIXME: The headers are broken! */ +#undef CreateMailslot #include "msfs.h" #define NDEBUG @@ -137,7 +138,10 @@ return(STATUS_NO_MEMORY); } - if (!RtlCreateUnicodeString(&Mailslot->Name, FileObject->FileName.Buffer)) + Mailslot->Name.Length = FileObject->FileName.Length; + Mailslot->Name.MaximumLength = Mailslot->Name.Length + sizeof(UNICODE_NULL); + Mailslot->Name.Buffer = ExAllocatePool(NonPagedPool, Mailslot->Name.MaximumLength); + if (Mailslot->Name.Buffer == NULL) { ExFreePool(Mailslot); @@ -149,6 +153,8 @@ return(STATUS_NO_MEMORY); } + RtlCopyUnicodeString(&Mailslot->Name, &FileObject->FileName); + Fcb = ExAllocatePool(NonPagedPool, sizeof(MSFS_FCB)); if (Fcb == NULL) { _____ Modified: trunk/reactos/drivers/fs/ms/finfo.c --- trunk/reactos/drivers/fs/ms/finfo.c 2005-06-17 12:24:29 UTC (rev 15971) +++ trunk/reactos/drivers/fs/ms/finfo.c 2005-06-17 12:29:33 UTC (rev 15972) @@ -9,7 +9,7 @@ /* INCLUDES ******************************************************************/ -#include <ddk/ntddk.h> +#include <ntifs.h> #include "msfs.h" #define NDEBUG @@ -31,19 +31,19 @@ Mailslot = Fcb->Mailslot; - Buffer->MaxMessageSize = Mailslot->MaxMessageSize; - Buffer->Timeout = Mailslot->TimeOut; + Buffer->MaximumMessageSize = Mailslot->MaxMessageSize; + Buffer->ReadTimeout = Mailslot->TimeOut; KeAcquireSpinLock(&Mailslot->MessageListLock, &oldIrql); - Buffer->MessageCount = Mailslot->MessageCount; + Buffer->MessagesAvailable = Mailslot->MessageCount; if (Mailslot->MessageCount == 0) { - Buffer->NextSize = 0; + Buffer->NextMessageSize = 0; } else { /* FIXME: read size of first message (head) */ - Buffer->NextSize = 0; + Buffer->NextMessageSize = 0; } KeReleaseSpinLock(&Mailslot->MessageListLock, oldIrql); @@ -61,7 +61,7 @@ if (*BufferLength < sizeof(FILE_MAILSLOT_SET_INFORMATION)) return(STATUS_BUFFER_OVERFLOW); - Fcb->Mailslot->TimeOut = Buffer->Timeout; + Fcb->Mailslot->TimeOut = Buffer->ReadTimeout; return(STATUS_SUCCESS); } _____ Modified: trunk/reactos/drivers/fs/ms/fsctrl.c --- trunk/reactos/drivers/fs/ms/fsctrl.c 2005-06-17 12:24:29 UTC (rev 15971) +++ trunk/reactos/drivers/fs/ms/fsctrl.c 2005-06-17 12:29:33 UTC (rev 15972) @@ -9,7 +9,7 @@ /* INCLUDES ******************************************************************/ -#include <ddk/ntddk.h> +#include <ntifs.h> #include "msfs.h" //#define NDEBUG _____ Modified: trunk/reactos/drivers/fs/ms/msfs.c --- trunk/reactos/drivers/fs/ms/msfs.c 2005-06-17 12:24:29 UTC (rev 15971) +++ trunk/reactos/drivers/fs/ms/msfs.c 2005-06-17 12:29:33 UTC (rev 15972) @@ -9,7 +9,7 @@ /* INCLUDES ******************************************************************/ -#include <ddk/ntddk.h> +#include <ntifs.h> #include "msfs.h" #define NDEBUG _____ Modified: trunk/reactos/drivers/fs/ms/msfs.xml --- trunk/reactos/drivers/fs/ms/msfs.xml 2005-06-17 12:24:29 UTC (rev 15971) +++ trunk/reactos/drivers/fs/ms/msfs.xml 2005-06-17 12:29:33 UTC (rev 15972) @@ -1,5 +1,6 @@ <module name="msfs" type="kernelmodedriver" installbase="system32/drivers" installname="msfs.sys"> <include base="msfs">.</include> + <define name="__USE_W32API" /> <library>ntoskrnl</library> <library>hal</library> <file>create.c</file> _____ Modified: trunk/reactos/drivers/fs/ms/rw.c --- trunk/reactos/drivers/fs/ms/rw.c 2005-06-17 12:24:29 UTC (rev 15971) +++ trunk/reactos/drivers/fs/ms/rw.c 2005-06-17 12:29:33 UTC (rev 15972) @@ -9,8 +9,7 @@ /* INCLUDES ******************************************************************/ -#include <ddk/ntddk.h> -#include <ntos/minmax.h> +#include <ntifs.h> #include "msfs.h" #define NDEBUG _____ Modified: trunk/reactos/drivers/fs/mup/create.c --- trunk/reactos/drivers/fs/mup/create.c 2005-06-17 12:24:29 UTC (rev 15971) +++ trunk/reactos/drivers/fs/mup/create.c 2005-06-17 12:29:33 UTC (rev 15972) @@ -27,7 +27,7 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#include <ntifs.h> //#define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/drivers/fs/mup/mup.h --- trunk/reactos/drivers/fs/mup/mup.h 2005-06-17 12:24:29 UTC (rev 15971) +++ trunk/reactos/drivers/fs/mup/mup.h 2005-06-17 12:29:33 UTC (rev 15972) @@ -1,10 +1,9 @@ #ifndef MUP_H #define MUP_H -#include <ddk/ntifs.h> - - +#ifndef TAG #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) +#endif #define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) _____ Modified: trunk/reactos/drivers/fs/mup/mup.xml --- trunk/reactos/drivers/fs/mup/mup.xml 2005-06-17 12:24:29 UTC (rev 15971) +++ trunk/reactos/drivers/fs/mup/mup.xml 2005-06-17 12:29:33 UTC (rev 15972) @@ -1,5 +1,6 @@ <module name="mup" type="kernelmodedriver" installbase="system32/drivers" installname="mup.sys"> <include base="mup">.</include> + <define name="__USE_W32API" /> <library>ntoskrnl</library> <library>hal</library> <file>create.c</file> _____ Modified: trunk/reactos/drivers/fs/np/create.c --- trunk/reactos/drivers/fs/np/create.c 2005-06-17 12:24:29 UTC (rev 15971) +++ trunk/reactos/drivers/fs/np/create.c 2005-06-17 12:29:33 UTC (rev 15972) @@ -9,8 +9,7 @@ /* INCLUDES ******************************************************************/ -#include <ddk/ntddk.h> - +#include <ntifs.h> #include "npfs.h" #define NDEBUG @@ -387,7 +386,10 @@ return STATUS_NO_MEMORY; } - if (RtlCreateUnicodeString(&Pipe->PipeName, FileObject->FileName.Buffer) == FALSE) + Pipe->PipeName.Length = FileObject->FileName.Length; + Pipe->PipeName.MaximumLength = Pipe->PipeName.Length + sizeof(UNICODE_NULL); + Pipe->PipeName.Buffer = ExAllocatePool(NonPagedPool, Pipe->PipeName.MaximumLength); + if (Pipe->PipeName.Buffer == NULL) { KeUnlockMutex(&DeviceExt->PipeListLock); ExFreePool(Pipe); @@ -398,6 +400,8 @@ return STATUS_NO_MEMORY; } + RtlCopyUnicodeString(&Pipe->PipeName, &FileObject->FileName); + InitializeListHead(&Pipe->ServerFcbListHead); InitializeListHead(&Pipe->ClientFcbListHead); InitializeListHead(&Pipe->WaiterListHead); _____ Modified: trunk/reactos/drivers/fs/np/finfo.c --- trunk/reactos/drivers/fs/np/finfo.c 2005-06-17 12:24:29 UTC (rev 15971) +++ trunk/reactos/drivers/fs/np/finfo.c 2005-06-17 12:29:33 UTC (rev 15972) @@ -9,7 +9,7 @@ /* INCLUDES ******************************************************************/ -#include <ddk/ntddk.h> +#include <ntifs.h> #include "npfs.h" #define NDEBUG _____ Modified: trunk/reactos/drivers/fs/np/fsctrl.c --- trunk/reactos/drivers/fs/np/fsctrl.c 2005-06-17 12:24:29 UTC (rev 15971) +++ trunk/reactos/drivers/fs/np/fsctrl.c 2005-06-17 12:29:33 UTC (rev 15972) @@ -10,7 +10,8 @@ /* INCLUDES ******************************************************************/ -#include <ddk/ntddk.h> +#include <ntifs.h> +#include <napi/npipe.h> #include "npfs.h" #define NDEBUG _____ Modified: trunk/reactos/drivers/fs/np/npfs.c --- trunk/reactos/drivers/fs/np/npfs.c 2005-06-17 12:24:29 UTC (rev 15971) +++ trunk/reactos/drivers/fs/np/npfs.c 2005-06-17 12:29:33 UTC (rev 15972) @@ -9,7 +9,7 @@ /* INCLUDES ******************************************************************/ -#include <ddk/ntddk.h> +#include <ntifs.h> #include "npfs.h" #define NDEBUG @@ -28,8 +28,8 @@ DPRINT("Named Pipe FSD 0.0.2\n"); - ASSERT (sizeof(NPFS_CONTEXT) <= sizeof (((PIRP)NULL)->Tail.Overlay.DriverContext)); - ASSERT (sizeof(NPFS_WAITER_ENTRY) <= sizeof(((PIRP)NULL)->Tail.Overlay.DriverContext)); + ASSERT (sizeof(NPFS_CONTEXT) <= FIELD_OFFSET(IRP, Tail.Overlay.DriverContext)); + ASSERT (sizeof(NPFS_WAITER_ENTRY) <= FIELD_OFFSET(IRP, Tail.Overlay.DriverContext)); DriverObject->MajorFunction[IRP_MJ_CREATE] = NpfsCreate; DriverObject->MajorFunction[IRP_MJ_CREATE_NAMED_PIPE] = _____ Modified: trunk/reactos/drivers/fs/np/npfs.h --- trunk/reactos/drivers/fs/np/npfs.h 2005-06-17 12:24:29 UTC (rev 15971) +++ trunk/reactos/drivers/fs/np/npfs.h 2005-06-17 12:29:33 UTC (rev 15972) @@ -94,6 +94,7 @@ #define KeUnlockMutex(x) KeReleaseMutex(x, FALSE); +#define PAGE_ROUND_UP(x) ( (((ULONG_PTR)x)%PAGE_SIZE) ? ((((ULONG_PTR)x)&(~(PAGE_SIZE-1)))+PAGE_SIZE) : ((ULONG_PTR)x) ) NTSTATUS STDCALL NpfsCreate(PDEVICE_OBJECT DeviceObject, PIRP Irp); NTSTATUS STDCALL NpfsCreateNamedPipe(PDEVICE_OBJECT DeviceObject, PIRP Irp); _____ Modified: trunk/reactos/drivers/fs/np/npfs.xml --- trunk/reactos/drivers/fs/np/npfs.xml 2005-06-17 12:24:29 UTC (rev 15971) +++ trunk/reactos/drivers/fs/np/npfs.xml 2005-06-17 12:29:33 UTC (rev 15972) @@ -1,5 +1,6 @@ <module name="npfs" type="kernelmodedriver" installbase="system32/drivers" installname="npfs.sys"> <include base="npfs">.</include> + <define name="__USE_W32API" /> <library>ntoskrnl</library> <library>hal</library> <file>create.c</file> _____ Modified: trunk/reactos/drivers/fs/np/rw.c --- trunk/reactos/drivers/fs/np/rw.c 2005-06-17 12:24:29 UTC (rev 15971) +++ trunk/reactos/drivers/fs/np/rw.c 2005-06-17 12:29:33 UTC (rev 15972) @@ -9,7 +9,7 @@ /* INCLUDES ******************************************************************/ -#include <ddk/ntddk.h> +#include <ntifs.h> #include <rosrtl/minmax.h> #include "npfs.h" _____ Modified: trunk/reactos/drivers/fs/np/volume.c --- trunk/reactos/drivers/fs/np/volume.c 2005-06-17 12:24:29 UTC (rev 15971) +++ trunk/reactos/drivers/fs/np/volume.c 2005-06-17 12:29:33 UTC (rev 15972) @@ -9,7 +9,7 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#include <ntifs.h> #include <wchar.h> #define NDEBUG _____ Modified: trunk/reactos/drivers/fs/ntfs/fcb.c --- trunk/reactos/drivers/fs/ntfs/fcb.c 2005-06-17 12:24:29 UTC (rev 15971) +++ trunk/reactos/drivers/fs/ntfs/fcb.c 2005-06-17 12:29:33 UTC (rev 15972) @@ -27,9 +27,6 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <ntos/kefuncs.h> - #include "ntfs.h" #define NDEBUG _____ Modified: trunk/reactos/drivers/fs/ntfs/fsctl.c --- trunk/reactos/drivers/fs/ntfs/fsctl.c 2005-06-17 12:24:29 UTC (rev 15971) +++ trunk/reactos/drivers/fs/ntfs/fsctl.c 2005-06-17 12:29:33 UTC (rev 15972) @@ -28,14 +28,12 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <ntos/minmax.h> +#include "ntfs.h" +#include <ntdddisk.h> //#define NDEBUG #include <debug.h> -#include "ntfs.h" - /* FUNCTIONS ****************************************************************/ static NTSTATUS _____ Modified: trunk/reactos/drivers/fs/ntfs/ntfs.h --- trunk/reactos/drivers/fs/ntfs/ntfs.h 2005-06-17 12:24:29 UTC (rev 15971) +++ trunk/reactos/drivers/fs/ntfs/ntfs.h 2005-06-17 12:29:33 UTC (rev 15972) @@ -10,7 +10,9 @@ ((pDeviceExt)->NtfsInfo.BytesPerCluster > PAGE_SIZE ? \ (pDeviceExt)->NtfsInfo.BytesPerCluster : PAGE_SIZE) +#ifndef TAG #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) +#endif #define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) @@ -128,8 +130,6 @@ ULONG LastOffset; } CCB, *PCCB; -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) - #define TAG_CCB TAG('I', 'C', 'C', 'B') typedef struct _____ Modified: trunk/reactos/drivers/fs/ntfs/ntfs.xml --- trunk/reactos/drivers/fs/ntfs/ntfs.xml 2005-06-17 12:24:29 UTC (rev 15971) +++ trunk/reactos/drivers/fs/ntfs/ntfs.xml 2005-06-17 12:29:33 UTC (rev 15972) @@ -1,6 +1,7 @@ <module name="ntfs" type="kernelmodedriver" installbase="system32/drivers" installname="ntfs.sys"> <bootstrap base="reactos" /> <include base="ntfs">.</include> + <define name="__USE_W32API" /> <library>ntoskrnl</library> <library>hal</library> <file>attrib.c</file>

1 0

[navaraf] 15971: Make the ASSERT macros GCC friendly.
by navaraf＠svn.reactos.com 17 Jun '05

17 Jun '05

Make the ASSERT macros GCC friendly. Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2005-06-17 11:40:11 UTC (rev 15970) +++ trunk/reactos/w32api/include/ddk/winddk.h 2005-06-17 12:24:29 UTC (rev 15971) @@ -4358,20 +4358,20 @@ #ifdef DBG #define ASSERT(exp) \ - ((!(exp)) ? \ - (RtlAssert( #exp, __FILE__, __LINE__, NULL ), FALSE) : TRUE) + (VOID)((!(exp)) ? \ + RtlAssert( #exp, __FILE__, __LINE__, NULL ), FALSE : TRUE) #define ASSERTMSG(msg, exp) \ - ((!(exp)) ? \ - (RtlAssert( #exp, __FILE__, __LINE__, msg ), FALSE) : TRUE) + (VOID)((!(exp)) ? \ + RtlAssert( #exp, __FILE__, __LINE__, msg ), FALSE : TRUE) #define RTL_SOFT_ASSERT(exp) \ - ((!(_exp)) ? \ - (DbgPrint("%s(%d): Soft assertion failed\n Expression: %s\n", __FILE__, __LINE__, #exp), FALSE) : TRUE) + (VOID)((!(_exp)) ? \ + DbgPrint("%s(%d): Soft assertion failed\n Expression: %s\n", __FILE__, __LINE__, #exp), FALSE : TRUE) #define RTL_SOFT_ASSERTMSG(msg, exp) \ - ((!(exp)) ? \ - (DbgPrint("%s(%d): Soft assertion failed\n Expression: %s\n Message: %s\n", __FILE__, __LINE__, #exp, (msg)), FALSE) : TRUE) + (VOID)((!(exp)) ? \ + DbgPrint("%s(%d): Soft assertion failed\n Expression: %s\n Message: %s\n", __FILE__, __LINE__, #exp, (msg)), FALSE : TRUE) #define RTL_VERIFY(exp) ASSERT(exp) #define RTL_VERIFYMSG(msg, exp) ASSERT(msg, exp)

1 0

[navaraf] 15970: Use W32API.
by navaraf＠svn.reactos.com 17 Jun '05

17 Jun '05

Use W32API. Modified: trunk/reactos/drivers/dd/blue/blue.xml Modified: trunk/reactos/drivers/dd/bootvid/bootvid.c Modified: trunk/reactos/drivers/dd/bootvid/bootvid.xml Modified: trunk/reactos/drivers/dd/debugout/debugout.xml Modified: trunk/reactos/drivers/dd/mpu401/mpu401.xml Modified: trunk/reactos/drivers/dd/parallel/parallel.xml Modified: trunk/reactos/drivers/dd/ramdrv/ramdrv.c Modified: trunk/reactos/drivers/dd/ramdrv/ramdrv.xml Modified: trunk/reactos/drivers/dd/sound/sound.xml _____ Modified: trunk/reactos/drivers/dd/blue/blue.xml --- trunk/reactos/drivers/dd/blue/blue.xml 2005-06-17 11:29:07 UTC (rev 15969) +++ trunk/reactos/drivers/dd/blue/blue.xml 2005-06-17 11:40:11 UTC (rev 15970) @@ -1,5 +1,6 @@ <module name="blue" type="kernelmodedriver" installbase="system32/drivers" installname="blue.sys"> <bootstrap base="reactos" /> + <define name="__USE_W32API" /> <library>ntoskrnl</library> <library>hal</library> <file>blue.c</file> _____ Modified: trunk/reactos/drivers/dd/bootvid/bootvid.c --- trunk/reactos/drivers/dd/bootvid/bootvid.c 2005-06-17 11:29:07 UTC (rev 15969) +++ trunk/reactos/drivers/dd/bootvid/bootvid.c 2005-06-17 11:40:11 UTC (rev 15970) @@ -25,7 +25,8 @@ #include <ddk/ntddk.h> #include <ddk/ntbootvid.h> -#include <rosrtl/string.h> +#include <ntos/ldrtypes.h> +#include <ddk/ldrfuncs.h> #include "bootvid.h" #include "resource.h" @@ -634,7 +635,7 @@ DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath) { PDEVICE_OBJECT BootVidDevice; - UNICODE_STRING DeviceName; + UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\BootVid"); NTSTATUS Status; BootVidDriverObject = DriverObject; @@ -648,8 +649,6 @@ DriverObject->Flags |= DO_BUFFERED_IO; /* Create device */ - RtlRosInitUnicodeStringFromLiteral(&DeviceName, L"\\Device\\BootVid"); - Status = IoCreateDevice( DriverObject, 0, _____ Modified: trunk/reactos/drivers/dd/bootvid/bootvid.xml --- trunk/reactos/drivers/dd/bootvid/bootvid.xml 2005-06-17 11:29:07 UTC (rev 15969) +++ trunk/reactos/drivers/dd/bootvid/bootvid.xml 2005-06-17 11:40:11 UTC (rev 15970) @@ -1,5 +1,6 @@ <module name="bootvid" type="kernelmodedriver" installbase="system32/drivers" installname="bootvid.sys"> <include base="bootvid">.</include> + <define name="__USE_W32API" /> <library>ntoskrnl</library> <library>hal</library> <file>bootvid.c</file> _____ Modified: trunk/reactos/drivers/dd/debugout/debugout.xml --- trunk/reactos/drivers/dd/debugout/debugout.xml 2005-06-17 11:29:07 UTC (rev 15969) +++ trunk/reactos/drivers/dd/debugout/debugout.xml 2005-06-17 11:40:11 UTC (rev 15970) @@ -1,5 +1,6 @@ <module name="debugout" type="kernelmodedriver"> <include base="debugout">.</include> + <define name="__USE_W32API" /> <library>ntoskrnl</library> <library>hal</library> <file>debugout.c</file> _____ Modified: trunk/reactos/drivers/dd/mpu401/mpu401.xml --- trunk/reactos/drivers/dd/mpu401/mpu401.xml 2005-06-17 11:29:07 UTC (rev 15969) +++ trunk/reactos/drivers/dd/mpu401/mpu401.xml 2005-06-17 11:40:11 UTC (rev 15970) @@ -1,5 +1,6 @@ <module name="mpu401" type="kernelmodedriver"> <include base="mpu401">.</include> + <define name="__USE_W32API" /> <library>ntoskrnl</library> <library>hal</library> <file>mpu401.c</file> _____ Modified: trunk/reactos/drivers/dd/parallel/parallel.xml --- trunk/reactos/drivers/dd/parallel/parallel.xml 2005-06-17 11:29:07 UTC (rev 15969) +++ trunk/reactos/drivers/dd/parallel/parallel.xml 2005-06-17 11:40:11 UTC (rev 15970) @@ -1,5 +1,6 @@ <module name="parallel" type="kernelmodedriver"> <include base="parallel">.</include> + <define name="__USE_W32API" /> <library>ntoskrnl</library> <library>hal</library> <file>parallel.c</file> _____ Modified: trunk/reactos/drivers/dd/ramdrv/ramdrv.c --- trunk/reactos/drivers/dd/ramdrv/ramdrv.c 2005-06-17 11:29:07 UTC (rev 15969) +++ trunk/reactos/drivers/dd/ramdrv/ramdrv.c 2005-06-17 11:40:11 UTC (rev 15970) @@ -1,7 +1,7 @@ #include <ntddk.h> +#include <ntdddisk.h> #include "ramdrv.h" #include <debug.h> -#include <rosrtl/string.h> #include "../../lib/bzip2/bzlib.h" NTSTATUS STDCALL RamdrvDispatchDeviceControl(PDEVICE_OBJECT DeviceObject, @@ -84,11 +84,12 @@ NTSTATUS STDCALL DriverEntry(IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath) { - UNICODE_STRING DeviceName = ROS_STRING_INITIALIZER(L"\\Device\\Ramdisk"); + UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\Ramdisk"); NTSTATUS Status; PDEVICE_OBJECT DeviceObject; PRAMDRV_DEVICE_EXTENSION devext; - UNICODE_STRING LinkName; + UNICODE_STRING LinkName = RTL_CONSTANT_STRING(L"\\??\\Z:"); + UNICODE_STRING ImageName = RTL_CONSTANT_STRING(L"\\Device\\Floppy0\\ramdisk.bz2"); HANDLE file; OBJECT_ATTRIBUTES objattr; IO_STATUS_BLOCK iosb; @@ -128,12 +129,10 @@ Status = STATUS_INSUFFICIENT_RESOURCES; goto cleandevice; } - RtlRosInitUnicodeStringFromLiteral( &LinkName, L"\\??\\Z:" ); IoCreateSymbolicLink( &LinkName, &DeviceName ); - RtlRosInitUnicodeStringFromLiteral( &LinkName, L"\\Device\\Floppy0\\ramdisk.bz2" ); InitializeObjectAttributes( &objattr, - &LinkName, + &ImageName, 0, 0, 0 ); _____ Modified: trunk/reactos/drivers/dd/ramdrv/ramdrv.xml --- trunk/reactos/drivers/dd/ramdrv/ramdrv.xml 2005-06-17 11:29:07 UTC (rev 15969) +++ trunk/reactos/drivers/dd/ramdrv/ramdrv.xml 2005-06-17 11:40:11 UTC (rev 15970) @@ -1,5 +1,6 @@ <module name="ramdrv" type="kernelmodedriver"> <include base="ramdrv">.</include> + <define name="__USE_W32API" /> <library>ntoskrnl</library> <library>hal</library> <library>bzip2</library> _____ Modified: trunk/reactos/drivers/dd/sound/sound.xml --- trunk/reactos/drivers/dd/sound/sound.xml 2005-06-17 11:29:07 UTC (rev 15969) +++ trunk/reactos/drivers/dd/sound/sound.xml 2005-06-17 11:40:11 UTC (rev 15970) @@ -1,4 +1,5 @@ <module name="sound" type="kernelmodedriver"> + <define name="__USE_W32API" /> <library>ntoskrnl</library> <library>hal</library> <file>dsp.c</file>

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs