Ros-diffs September 2005

ros-diffs@reactos.org

22 participants
582 discussions

[ion] 17651: - NDK compatibility fixes for MSDDK. Use NTAPI instead of STDCALL, and use NTSYSAPI instead of NTOSAPI.

by ion＠svn.reactos.com

- NDK compatibility fixes for MSDDK. Use NTAPI instead of STDCALL, and use NTSYSAPI instead of NTOSAPI. - Remove some functions/types in NDK that were already documented in DDK/IFS. - Fixup syscall structures for the table and fix protoype of KeAdd/RemoveServiceDescriptorTable. Modified: trunk/reactos/drivers/fs/ms/msfs.h Modified: trunk/reactos/include/ndk/cctypes.h Modified: trunk/reactos/include/ndk/extypes.h Modified: trunk/reactos/include/ndk/halfuncs.h Modified: trunk/reactos/include/ndk/haltypes.h Modified: trunk/reactos/include/ndk/i386/ketypes.h Modified: trunk/reactos/include/ndk/inbvfuncs.h Modified: trunk/reactos/include/ndk/kdfuncs.h Modified: trunk/reactos/include/ndk/kefuncs.h Modified: trunk/reactos/include/ndk/ketypes.h Modified: trunk/reactos/include/ndk/ldrfuncs.h Modified: trunk/reactos/include/ndk/mmfuncs.h Modified: trunk/reactos/include/ndk/obfuncs.h Modified: trunk/reactos/include/ndk/obtypes.h Modified: trunk/reactos/include/ndk/potypes.h Modified: trunk/reactos/include/ndk/psfuncs.h Modified: trunk/reactos/include/ndk/pstypes.h Modified: trunk/reactos/include/ndk/sefuncs.h Modified: trunk/reactos/include/ndk/setypes.h Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c Modified: trunk/reactos/ntoskrnl/ke/process.c Modified: trunk/reactos/subsys/win32k/main/dllmain.c Modified: trunk/reactos/tools/nci/ncitool.c Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/drivers/fs/ms/msfs.h --- trunk/reactos/drivers/fs/ms/msfs.h 2005-09-04 23:48:19 UTC (rev 17650) +++ trunk/reactos/drivers/fs/ms/msfs.h 2005-09-05 04:48:20 UTC (rev 17651) @@ -2,7 +2,7 @@ #define __SERVICES_FS_MS_MSFS_H #include <ntifs.h> -#include <ndk/iotypes.h> +#include <ndk/ntndk.h> /* * FIXME: GCC doesn't have a working option for defaulting to a calling _____ Modified: trunk/reactos/include/ndk/cctypes.h --- trunk/reactos/include/ndk/cctypes.h 2005-09-04 23:48:19 UTC (rev 17650) +++ trunk/reactos/include/ndk/cctypes.h 2005-09-05 04:48:20 UTC (rev 17651) @@ -13,9 +13,8 @@ /* DEPENDENCIES **************************************************************/ /* EXPORTED DATA *************************************************************/ -extern ULONG NTOSAPI CcFastMdlReadWait; -extern ULONG NTOSAPI CcFastReadNotPossible; -extern ULONG NTOSAPI CcFastReadWait; +extern ULONG NTSYSAPI CcFastReadNotPossible; +extern ULONG NTSYSAPI CcFastReadWait; /* ENUMERATIONS **************************************************************/ _____ Modified: trunk/reactos/include/ndk/extypes.h --- trunk/reactos/include/ndk/extypes.h 2005-09-04 23:48:19 UTC (rev 17650) +++ trunk/reactos/include/ndk/extypes.h 2005-09-05 04:48:20 UTC (rev 17651) @@ -14,9 +14,9 @@ /* EXPORTED DATA *************************************************************/ #ifndef NTOS_MODE_USER -extern POBJECT_TYPE NTOSAPI ExIoCompletionType; -extern NTOSAPI POBJECT_TYPE ExMutantObjectType; -extern NTOSAPI POBJECT_TYPE ExTimerType; +extern POBJECT_TYPE NTSYSAPI ExIoCompletionType; +extern POBJECT_TYPE NTSYSAPI ExMutantObjectType; +extern POBJECT_TYPE NTSYSAPI ExTimerType; #endif /* CONSTANTS *****************************************************************/ @@ -46,9 +46,9 @@ #ifndef NTOS_MODE_USER typedef struct _EX_QUEUE_WORKER_INFO { - UCHAR QueueDisabled:1; - UCHAR MakeThreadsAsNecessary:1; - UCHAR WaitMode:1; + ULONG QueueDisabled:1; + ULONG MakeThreadsAsNecessary:1; + ULONG WaitMode:1; ULONG WorkerCount:29; } EX_QUEUE_WORKER_INFO, *PEX_QUEUE_WORKER_INFO; _____ Modified: trunk/reactos/include/ndk/halfuncs.h --- trunk/reactos/include/ndk/halfuncs.h 2005-09-04 23:48:19 UTC (rev 17650) +++ trunk/reactos/include/ndk/halfuncs.h 2005-09-05 04:48:20 UTC (rev 17651) @@ -16,31 +16,16 @@ /* PROTOTYPES ****************************************************************/ -VOID -STDCALL -HalAcquireDisplayOwnership( - IN PHAL_RESET_DISPLAY_PARAMETERS ResetDisplayParameters -); - BOOLEAN -STDCALL +NTAPI HalQueryDisplayOwnership(VOID); BOOLEAN -STDCALL +NTAPI HalAllProcessorsStarted(VOID); -NTSTATUS -STDCALL -HalAllocateAdapterChannel( - IN PADAPTER_OBJECT AdapterObject, - IN PWAIT_CONTEXT_BLOCK WaitContextBlock, - IN ULONG NumberOfMapRegisters, - IN PDRIVER_CONTROL ExecutionRoutine -); - BOOLEAN -STDCALL +NTAPI HalBeginSystemInterrupt( ULONG Vector, KIRQL Irql, @@ -48,20 +33,20 @@ ); BOOLEAN -STDCALL +NTAPI HalDisableSystemInterrupt( ULONG Vector, KIRQL Irql ); VOID -STDCALL +NTAPI HalDisplayString ( IN PCHAR String ); BOOLEAN -STDCALL +NTAPI HalEnableSystemInterrupt( ULONG Vector, KIRQL Irql, @@ -69,14 +54,14 @@ ); VOID -STDCALL +NTAPI HalEndSystemInterrupt( KIRQL Irql, ULONG Vector ); BOOLEAN -STDCALL +NTAPI HalGetEnvironmentVariable( PCH Name, PCH Value, @@ -84,25 +69,25 @@ ); VOID -STDCALL +NTAPI HalInitializeProcessor( ULONG ProcessorNumber, PVOID ProcessorStack ); BOOLEAN -STDCALL +NTAPI HalInitSystem( ULONG BootPhase, PLOADER_PARAMETER_BLOCK LoaderBlock ); BOOLEAN -STDCALL +NTAPI HalQueryDisplayOwnership(VOID); VOID -STDCALL +NTAPI HalReportResourceUsage(VOID); VOID @@ -112,37 +97,37 @@ ); VOID -STDCALL +NTAPI HalReleaseDisplayOwnership(VOID); VOID -STDCALL +NTAPI HalReturnToFirmware( FIRMWARE_REENTRY Action ); VOID -STDCALL +NTAPI HalRequestIpi( ULONG Unknown ); BOOLEAN -STDCALL +NTAPI HalSetEnvironmentVariable( IN PCH Name, IN PCH Value ); BOOLEAN -STDCALL +NTAPI HalStartNextProcessor( ULONG Unknown1, ULONG Unknown2 ); VOID -STDCALL +NTAPI IoAssignDriveLetters( struct _LOADER_PARAMETER_BLOCK *LoaderBlock, PSTRING NtDeviceName, _____ Modified: trunk/reactos/include/ndk/haltypes.h --- trunk/reactos/include/ndk/haltypes.h 2005-09-04 23:48:19 UTC (rev 17650) +++ trunk/reactos/include/ndk/haltypes.h 2005-09-05 04:48:20 UTC (rev 17651) @@ -12,7 +12,7 @@ /* DEPENDENCIES **************************************************************/ /* EXPORTED DATA *************************************************************/ -extern ULONG NTOSAPI KdComPortInUse; +extern ULONG NTSYSAPI KdComPortInUse; /* CONSTANTS *****************************************************************/ @@ -50,9 +50,9 @@ } HAL_PRIVATE_DISPATCH, *PHAL_PRIVATE_DISPATCH; #ifdef __NTOSKRNL__ -extern NTOSAPI HAL_PRIVATE_DISPATCH HalPrivateDispatchTable; +extern HAL_PRIVATE_DISPATCH NTSYSAPI HalPrivateDispatchTable; #else -extern NTOSAPI PHAL_PRIVATE_DISPATCH HalPrivateDispatchTable; +extern PHAL_PRIVATE_DISPATCH NTSYSAPI HalPrivateDispatchTable; #endif #define HAL_PRIVATE_DISPATCH_VERSION 1 _____ Modified: trunk/reactos/include/ndk/i386/ketypes.h --- trunk/reactos/include/ndk/i386/ketypes.h 2005-09-04 23:48:19 UTC (rev 17650) +++ trunk/reactos/include/ndk/i386/ketypes.h 2005-09-05 04:48:20 UTC (rev 17651) @@ -117,29 +117,29 @@ typedef struct _LDT_ENTRY { - WORD LimitLow; - WORD BaseLow; + USHORT LimitLow; + USHORT BaseLow; union { struct { - BYTE BaseMid; - BYTE Flags1; - BYTE Flags2; - BYTE BaseHi; + UCHAR BaseMid; + UCHAR Flags1; + UCHAR Flags2; + UCHAR BaseHi; } Bytes; struct { - DWORD BaseMid : 8; - DWORD Type : 5; - DWORD Dpl : 2; - DWORD Pres : 1; - DWORD LimitHi : 4; - DWORD Sys : 1; - DWORD Reserved_0 : 1; - DWORD Default_Big : 1; - DWORD Granularity : 1; - DWORD BaseHi : 8; + ULONG BaseMid : 8; + ULONG Type : 5; + ULONG Dpl : 2; + ULONG Pres : 1; + ULONG LimitHi : 4; + ULONG Sys : 1; + ULONG Reserved_0 : 1; + ULONG Default_Big : 1; + ULONG Granularity : 1; + ULONG BaseHi : 8; } Bits; } HighWord; } LDT_ENTRY, *PLDT_ENTRY, *LPLDT_ENTRY; @@ -216,28 +216,28 @@ typedef struct _DESCRIPTOR { - WORD Pad; - WORD Limit; - DWORD Base; + USHORT Pad; + USHORT Limit; + ULONG Base; } KDESCRIPTOR, *PKDESCRIPTOR; typedef struct _KSPECIAL_REGISTERS { - DWORD Cr0; - DWORD Cr2; - DWORD Cr3; - DWORD Cr4; - DWORD KernelDr0; - DWORD KernelDr1; - DWORD KernelDr2; - DWORD KernelDr3; - DWORD KernelDr6; - DWORD KernelDr7; + ULONG Cr0; + ULONG Cr2; + ULONG Cr3; + ULONG Cr4; + ULONG KernelDr0; + ULONG KernelDr1; + ULONG KernelDr2; + ULONG KernelDr3; + ULONG KernelDr6; + ULONG KernelDr7; KDESCRIPTOR Gdtr; KDESCRIPTOR Idtr; - WORD Tr; - WORD Ldtr; - DWORD Reserved[6]; + USHORT Tr; + USHORT Ldtr; + ULONG Reserved[6]; } KSPECIAL_REGISTERS, *PKSPECIAL_REGISTERS; #pragma pack(push,4) @@ -384,32 +384,45 @@ */ typedef struct _KIPCR { - KPCR_TIB Tib; /* 00 */ - struct _KPCR *Self; /* 1C */ - struct _KPRCB *Prcb; /* 20 */ - KIRQL Irql; /* 24 */ - ULONG IRR; /* 28 */ - ULONG IrrActive; /* 2C */ - ULONG IDR; /* 30 */ - PVOID KdVersionBlock; /* 34 */ - PUSHORT IDT; /* 38 */ - PUSHORT GDT; /* 3C */ - struct _KTSS *TSS; /* 40 */ - USHORT MajorVersion; /* 44 */ - USHORT MinorVersion; /* 46 */ - KAFFINITY SetMember; /* 48 */ - ULONG StallScaleFactor; /* 4C */ - UCHAR SparedUnused; /* 50 */ - UCHAR Number; /* 51 */ - UCHAR Reserved; /* 52 */ - UCHAR L2CacheAssociativity; /* 53 */ - ULONG VdmAlert; /* 54 */ - ULONG KernelReserved[14]; /* 58 */ - ULONG L2CacheSize; /* 90 */ - ULONG HalReserved[16]; /* 94 */ - ULONG InterruptMode; /* D4 */ - UCHAR KernelReserved2[0x48]; /* D8 */ - KPRCB PrcbData; /* 120 */ + union + { + NT_TIB NtTib; + struct + { + struct _EXCEPTION_REGISTRATION_RECORD *Used_ExceptionList; + PVOID Used_StackBase; + PVOID PerfGlobalGroupMask; + PVOID TssCopy; + ULONG ContextSwitches; + KAFFINITY SetMemberCopy; + PVOID Used_Self; + }; + }; + struct _KPCR *Self; /* 1C */ + struct _KPRCB *Prcb; /* 20 */ + KIRQL Irql; /* 24 */ + ULONG IRR; /* 28 */ + ULONG IrrActive; /* 2C */ + ULONG IDR; /* 30 */ + PVOID KdVersionBlock; /* 34 */ + PUSHORT IDT; /* 38 */ + PUSHORT GDT; /* 3C */ + struct _KTSS *TSS; /* 40 */ + USHORT MajorVersion; /* 44 */ + USHORT MinorVersion; /* 46 */ + KAFFINITY SetMember; /* 48 */ + ULONG StallScaleFactor; /* 4C */ + UCHAR SparedUnused; /* 50 */ + UCHAR Number; /* 51 */ + UCHAR Reserved; /* 52 */ + UCHAR L2CacheAssociativity; /* 53 */ + ULONG VdmAlert; /* 54 */ + ULONG KernelReserved[14]; /* 58 */ + ULONG L2CacheSize; /* 90 */ + ULONG HalReserved[16]; /* 94 */ + ULONG InterruptMode; /* D4 */ + UCHAR KernelReserved2[0x48]; /* D8 */ + KPRCB PrcbData; /* 120 */ } KIPCR, *PKIPCR; #pragma pack(pop) @@ -507,9 +520,6 @@ #include <poppack.h> /* i386 Doesn't have Exception Frames */ -typedef struct _KEXCEPTION_FRAME -{ +typedef struct _KEXCEPTION_FRAME KEXCEPTION_FRAME, *PKEXCEPTION_FRAME; -} KEXCEPTION_FRAME, *PKEXCEPTION_FRAME; - #endif _____ Modified: trunk/reactos/include/ndk/inbvfuncs.h --- trunk/reactos/include/ndk/inbvfuncs.h 2005-09-04 23:48:19 UTC (rev 17650) +++ trunk/reactos/include/ndk/inbvfuncs.h 2005-09-05 04:48:20 UTC (rev 17651) @@ -16,53 +16,53 @@ /* PROTOTYPES ****************************************************************/ VOID -STDCALL +NTAPI InbvAcquireDisplayOwnership(VOID); BOOLEAN -STDCALL +NTAPI InbvCheckDisplayOwnership(VOID); BOOLEAN -STDCALL +NTAPI InbvDisplayString( IN PCHAR String ); VOID -STDCALL +NTAPI InbvEnableBootDriver( IN BOOLEAN Enable ); BOOLEAN -STDCALL +NTAPI InbvEnableDisplayString( IN BOOLEAN Enable ); VOID -STDCALL +NTAPI InbvInstallDisplayStringFilter( IN PVOID Unknown ); BOOLEAN -STDCALL +NTAPI InbvIsBootDriverInstalled(VOID); VOID -STDCALL +NTAPI InbvNotifyDisplayOwnershipLost( IN PVOID Callback ); BOOLEAN -STDCALL +NTAPI InbvResetDisplay(VOID); VOID -STDCALL +NTAPI InbvSetScrollRegion( IN ULONG Left, IN ULONG Top, @@ -71,13 +71,13 @@ ); VOID -STDCALL +NTAPI InbvSetTextColor( IN ULONG Color ); VOID -STDCALL +NTAPI InbvSolidColorFill( IN ULONG Left, IN ULONG Top, @@ -87,15 +87,15 @@ ); VOID -STDCALL +NTAPI VidCleanUp(VOID); -BOOL -STDCALL +BOOLEAN +NTAPI VidResetDisplay(VOID); BOOLEAN -STDCALL +NTAPI VidIsBootDriverInstalled(VOID); #endif _____ Modified: trunk/reactos/include/ndk/kdfuncs.h --- trunk/reactos/include/ndk/kdfuncs.h 2005-09-04 23:48:19 UTC (rev 17650) +++ trunk/reactos/include/ndk/kdfuncs.h 2005-09-05 04:48:20 UTC (rev 17651) @@ -14,79 +14,79 @@ /* PROTOTYPES ****************************************************************/ -BYTE -STDCALL +UCHAR +NTAPI KdPollBreakIn(VOID); BOOLEAN -STDCALL +NTAPI KdPortInitialize( PKD_PORT_INFORMATION PortInformation, - DWORD Unknown1, - DWORD Unknown2 + ULONG Unknown1, + ULONG Unknown2 ); BOOLEAN -STDCALL +NTAPI KdPortInitializeEx( PKD_PORT_INFORMATION PortInformation, - DWORD Unknown1, - DWORD Unknown2 + ULONG Unknown1, + ULONG Unknown2 ); BOOLEAN -STDCALL +NTAPI KdPortGetByte( PUCHAR ByteRecieved ); BOOLEAN -STDCALL +NTAPI KdPortGetByteEx( PKD_PORT_INFORMATION PortInformation, PUCHAR ByteRecieved ); BOOLEAN -STDCALL +NTAPI KdPortPollByte( PUCHAR ByteRecieved ); BOOLEAN -STDCALL +NTAPI KdPortPollByteEx( PKD_PORT_INFORMATION PortInformation, PUCHAR ByteRecieved ); VOID -STDCALL +NTAPI KdPortPutByte( UCHAR ByteToSend ); VOID -STDCALL +NTAPI KdPortPutByteEx( PKD_PORT_INFORMATION PortInformation, UCHAR ByteToSend ); VOID -STDCALL +NTAPI KdPortRestore(VOID); VOID -STDCALL +NTAPI KdPortSave (VOID); BOOLEAN -STDCALL +NTAPI KdPortDisableInterrupts(VOID); BOOLEAN -STDCALL +NTAPI KdPortEnableInterrupts(VOID); #endif _____ Modified: trunk/reactos/include/ndk/kefuncs.h --- trunk/reactos/include/ndk/kefuncs.h 2005-09-04 23:48:19 UTC (rev 17650) +++ trunk/reactos/include/ndk/kefuncs.h 2005-09-05 04:48:20 UTC (rev 17651) @@ -14,8 +14,18 @@ /* PROTOTYPES ****************************************************************/ +BOOLEAN +NTAPI +KeAddSystemServiceTable( + PULONG_PTR Base, + PULONG Count OPTIONAL, + ULONG Limit, + PUCHAR Number, + ULONG Index +); + VOID -STDCALL +NTAPI KeInitializeApc( IN PKAPC Apc, IN PKTHREAD Thread, @@ -28,7 +38,7 @@ ); VOID -STDCALL +NTAPI KeEnterKernelDebugger(VOID); VOID @@ -44,7 +54,7 @@ ); VOID -STDCALL +NTAPI KiDeliverApc( IN KPROCESSOR_MODE PreviousMode, IN PVOID Reserved, @@ -52,81 +62,34 @@ ); VOID -STDCALL +NTAPI KiDispatchInterrupt(VOID); - -BOOLEAN -STDCALL -KeAreApcsDisabled( - VOID - ); - VOID -STDCALL -KeFlushQueuedDpcs( - VOID - ); - -ULONG -STDCALL -KeGetRecommendedSharedDataAlignment( - VOID - ); - -ULONG -STDCALL -KeQueryRuntimeThread( - IN PKTHREAD Thread, - OUT PULONG UserTime - ); - -BOOLEAN -STDCALL -KeSetKernelStackSwapEnable( - IN BOOLEAN Enable - ); - -BOOLEAN -STDCALL -KeDeregisterBugCheckReasonCallback( - IN PKBUGCHECK_REASON_CALLBACK_RECORD CallbackRecord - ); - -BOOLEAN -STDCALL -KeRegisterBugCheckReasonCallback( - IN PKBUGCHECK_REASON_CALLBACK_RECORD CallbackRecord, - IN PKBUGCHECK_REASON_CALLBACK_ROUTINE CallbackRoutine, - IN KBUGCHECK_CALLBACK_REASON Reason, - IN PUCHAR Component - ); - -VOID -STDCALL +NTAPI KeTerminateThread( IN KPRIORITY Increment ); BOOLEAN -STDCALL +NTAPI KeIsAttachedProcess(VOID); BOOLEAN -STDCALL +NTAPI KeIsExecutingDpc( VOID ); VOID -STDCALL +NTAPI KeSetEventBoostPriority( IN PKEVENT Event, IN PKTHREAD *Thread OPTIONAL ); PCONFIGURATION_COMPONENT_DATA -STDCALL +NTAPI KeFindConfigurationNextEntry( IN PCONFIGURATION_COMPONENT_DATA Child, IN CONFIGURATION_CLASS Class, @@ -136,7 +99,7 @@ ); PCONFIGURATION_COMPONENT_DATA -STDCALL +NTAPI KeFindConfigurationEntry( IN PCONFIGURATION_COMPONENT_DATA Child, IN CONFIGURATION_CLASS Class, @@ -145,57 +108,45 @@ ); VOID -STDCALL +NTAPI KeFlushEntireTb( IN BOOLEAN Unknown, IN BOOLEAN CurrentCpuOnly ); VOID -STDCALL -KeRevertToUserAffinityThread( - VOID -); - -VOID -STDCALL +NTAPI KiCoprocessorError( VOID ); VOID -STDCALL +NTAPI KiUnexpectedInterrupt( VOID ); VOID -STDCALL +NTAPI KeSetDmaIoCoherency( IN ULONG Coherency ); VOID -STDCALL +NTAPI KeSetProfileIrql( IN KIRQL ProfileIrql ); NTSTATUS -STDCALL +NTAPI KeSetAffinityThread( PKTHREAD Thread, KAFFINITY Affinity ); -VOID -STDCALL -KeSetSystemAffinityThread( - IN KAFFINITY Affinity -); - NTSTATUS -STDCALL +NTAPI KeUserModeCallback( IN ULONG FunctionID, IN PVOID InputBuffer, @@ -205,14 +156,14 @@ ); VOID -STDCALL +NTAPI KeSetTimeIncrement( IN ULONG MaxIncrement, IN ULONG MinIncrement ); VOID -STDCALL +NTAPI KeInitializeInterrupt( PKINTERRUPT InterruptObject, PKSERVICE_ROUTINE ServiceRoutine, @@ -228,19 +179,19 @@ ); BOOLEAN -STDCALL +NTAPI KeConnectInterrupt( PKINTERRUPT InterruptObject ); BOOLEAN -STDCALL +NTAPI KeDisconnectInterrupt( PKINTERRUPT InterruptObject ); PKPROCESS -STDCALL +NTAPI KeGetCurrentProcess( VOID ); @@ -252,36 +203,10 @@ ULONG Value2 ); -LONG -STDCALL -KeReadStateMutant( - IN PKMUTANT Mutant -); - -VOID -STDCALL -KeInitializeMutant( - IN PKMUTANT Mutant, - IN BOOLEAN InitialOwner -); - -LONG -STDCALL -KeReleaseMutant( - IN PKMUTANT Mutant, - IN KPRIORITY Increment, - IN BOOLEAN Abandon, - IN BOOLEAN Wait -); - NTSTATUS -STDCALL +NTAPI KeRaiseUserException( IN NTSTATUS ExceptionCode ); -VOID -STDCALL -KeFlushWriteBuffer(VOID); - #endif _____ Modified: trunk/reactos/include/ndk/ketypes.h --- trunk/reactos/include/ndk/ketypes.h 2005-09-04 23:48:19 UTC (rev 17650) +++ trunk/reactos/include/ndk/ketypes.h 2005-09-05 04:48:20 UTC (rev 17651) @@ -19,28 +19,11 @@ #define SSDT_MAX_ENTRIES 4 #define PROCESSOR_FEATURE_MAX 64 #define CONTEXT_DEBUGGER (CONTEXT_FULL | CONTEXT_FLOATING_POINT) -#define THREAD_WAIT_OBJECTS 4 -#define THREAD_ALERT 0x4 #ifdef NTOS_MODE_USER #define SharedUserData ((KUSER_SHARED_DATA * CONST) USER_SHARED_DATA) #endif -/* EXPORTED DATA *************************************************************/ -#ifndef NTOS_MODE_USER -extern CHAR NTOSAPI KeNumberProcessors; -extern LOADER_PARAMETER_BLOCK NTOSAPI KeLoaderBlock; -extern ULONG NTOSAPI KeDcacheFlushCount; -extern ULONG NTOSAPI KeIcacheFlushCount; -extern KAFFINITY NTOSAPI KeActiveProcessors; -extern ULONG NTOSAPI KiDmaIoCoherency; /* RISC Architectures only */ -extern ULONG NTOSAPI KeMaximumIncrement; -extern ULONG NTOSAPI KeMinimumIncrement; -extern ULONG NTOSAPI NtBuildNumber; -extern SSDT_ENTRY NTOSAPI KeServiceDescriptorTable[SSDT_MAX_ENTRIES]; -extern SSDT_ENTRY NTOSAPI KeServiceDescriptorTableShadow[SSDT_MAX_ENTRIES]; -#endif - /* ENUMERATIONS **************************************************************/ #ifdef NTOS_MODE_USER @@ -166,6 +149,7 @@ /* FUNCTION TYPES ************************************************************/ +#ifdef NTOS_MODE_USER typedef VOID (NTAPI *PKNORMAL_ROUTINE)( IN PVOID NormalContext, @@ -177,6 +161,7 @@ IN PVOID TimerContext, IN ULONG TimerLowValue, IN LONG TimerHighValue); +#endif /* TYPES *********************************************************************/ @@ -486,6 +471,32 @@ ULONG StackCount; /* 06C */ LIST_ENTRY ProcessListEntry; /* 070 */ } KPROCESS; + +typedef struct _KSERVICE_TABLE_DESCRIPTOR +{ + PULONG_PTR Base; + PULONG Count; + ULONG Limit; +#if defined(_IA64_) + LONG TableBaseGpOffset; +#endif + PUCHAR Number; +} KSERVICE_TABLE_DESCRIPTOR, *PKSERVICE_TABLE_DESCRIPTOR; #endif /* !NTOS_MODE_USER */ +/* EXPORTED DATA *************************************************************/ +#ifndef NTOS_MODE_USER +extern CHAR NTSYSAPI KeNumberProcessors; +extern LOADER_PARAMETER_BLOCK NTSYSAPI KeLoaderBlock; +extern ULONG NTSYSAPI KeDcacheFlushCount; +extern ULONG NTSYSAPI KeIcacheFlushCount; +extern KAFFINITY NTSYSAPI KeActiveProcessors; +extern ULONG NTSYSAPI KiDmaIoCoherency; /* RISC Architectures only */ +extern ULONG NTSYSAPI KeMaximumIncrement; +extern ULONG NTSYSAPI KeMinimumIncrement; +extern ULONG NTSYSAPI NtBuildNumber; +extern KSERVICE_TABLE_DESCRIPTOR NTSYSAPI KeServiceDescriptorTable[SSDT_MAX_ENTRIES]; +extern KSERVICE_TABLE_DESCRIPTOR NTSYSAPI KeServiceDescriptorTableShadow[SSDT_MAX_ENTRIES]; #endif + +#endif _____ Modified: trunk/reactos/include/ndk/ldrfuncs.h --- trunk/reactos/include/ndk/ldrfuncs.h 2005-09-04 23:48:19 UTC (rev 17650) +++ trunk/reactos/include/ndk/ldrfuncs.h 2005-09-05 04:48:20 UTC (rev 17651) @@ -17,7 +17,7 @@ /* PROTOTYPES ****************************************************************/ NTSTATUS -STDCALL +NTAPI LdrAccessResource( IN PVOID BaseAddress, IN PIMAGE_RESOURCE_DATA_ENTRY ResourceDataEntry, @@ -26,7 +26,7 @@ [truncated at 1000 lines; 821 more skipped]

19 years

[ion] 17650: - Fix kernel32 and ntoskrnl build issues.

by ion＠svn.reactos.com

- Fix kernel32 and ntoskrnl build issues. - Define public version of DEVOBJ_EXTENSION in DDK. Modified: trunk/reactos/lib/kernel32/file/mailslot.c Modified: trunk/reactos/ntoskrnl/io/device.c Modified: trunk/reactos/ntoskrnl/io/deviface.c Modified: trunk/reactos/ntoskrnl/io/file.c Modified: trunk/reactos/ntoskrnl/io/plugplay.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c Modified: trunk/reactos/w32api/include/ddk/winddk.h Modified: trunk/reactos/w32api/include/ntdef.h _____ Modified: trunk/reactos/lib/kernel32/file/mailslot.c --- trunk/reactos/lib/kernel32/file/mailslot.c 2005-09-04 23:26:35 UTC (rev 17649) +++ trunk/reactos/lib/kernel32/file/mailslot.c 2005-09-04 23:48:19 UTC (rev 17650) @@ -167,10 +167,12 @@ DWORD lReadTimeout) { FILE_MAILSLOT_SET_INFORMATION Buffer; + LARGE_INTEGER Timeout; IO_STATUS_BLOCK Iosb; NTSTATUS Status; - Buffer.ReadTimeout.QuadPart = lReadTimeout * -10000; + Timeout.QuadPart = lReadTimeout * -10000; + Buffer.ReadTimeout = &Timeout; Status = NtSetInformationFile(hMailslot, &Iosb, _____ Modified: trunk/reactos/ntoskrnl/io/device.c --- trunk/reactos/ntoskrnl/io/device.c 2005-09-04 23:26:35 UTC (rev 17649) +++ trunk/reactos/ntoskrnl/io/device.c 2005-09-04 23:48:19 UTC (rev 17650) @@ -336,17 +336,17 @@ OUT PDEVICE_OBJECT *AttachedToDeviceObject) { PDEVICE_OBJECT AttachedDevice; - PDEVOBJ_EXTENSION SourceDeviceExtension; + PEXTENDED_DEVOBJ_EXTENSION SourceDeviceExtension; DPRINT("IoAttachDeviceToDeviceStack(SourceDevice 0x%p, TargetDevice 0x%p)\n", SourceDevice, TargetDevice); /* Get the Attached Device and source extension */ AttachedDevice = IoGetAttachedDevice(TargetDevice); - SourceDeviceExtension = SourceDevice->DeviceObjectExtension; + SourceDeviceExtension = (PEXTENDED_DEVOBJ_EXTENSION)SourceDevice->DeviceObjectExtension; /* Make sure that it's in a correct state */ - if (!(AttachedDevice->DeviceObjectExtension->ExtensionFlags & + if (!(((PEXTENDED_DEVOBJ_EXTENSION)AttachedDevice->DeviceObjectExtension)-> ExtensionFlags & (DOE_UNLOAD_PENDING | DOE_DELETE_PENDING | DOE_REMOVE_PENDING | DOE_REMOVE_PROCESSED))) { @@ -624,7 +624,7 @@ } /* I guess this should be removed later... but it shouldn't cause problems */ - DeviceObject->DeviceObjectExtension->ExtensionFlags |= DOE_DELETE_PENDING; + ((PEXTENDED_DEVOBJ_EXTENSION)DeviceObject->DeviceObjectExtension)->Exten sionFlags |= DOE_DELETE_PENDING; /* Make the object temporary. This should automatically remove the device from the namespace */ @@ -650,7 +650,7 @@ DPRINT("IoDetachDevice(TargetDevice 0x%p)\n", TargetDevice); /* Remove the attachment */ - TargetDevice->AttachedDevice->DeviceObjectExtension->AttachedTo = NULL; + ((PEXTENDED_DEVOBJ_EXTENSION)TargetDevice->AttachedDevice->DeviceObjectE xtension)->AttachedTo = NULL; TargetDevice->AttachedDevice = NULL; } @@ -758,7 +758,7 @@ IoGetDeviceAttachmentBaseRef(IN PDEVICE_OBJECT DeviceObject) { /* Return the attached Device */ - return (DeviceObject->DeviceObjectExtension->AttachedTo); + return (((PEXTENDED_DEVOBJ_EXTENSION)DeviceObject->DeviceObjectExtension)->Atta chedTo); } /* @@ -790,7 +790,7 @@ IoGetDiskDeviceObject(IN PDEVICE_OBJECT FileSystemDeviceObject, OUT PDEVICE_OBJECT *DiskDeviceObject) { - PDEVOBJ_EXTENSION DeviceExtension; + PEXTENDED_DEVOBJ_EXTENSION DeviceExtension; PVPB Vpb; KIRQL OldIrql; @@ -801,7 +801,7 @@ IoAcquireVpbSpinLock(&OldIrql); /* Get the Device Extension */ - DeviceExtension = FileSystemDeviceObject->DeviceObjectExtension; + DeviceExtension = (PEXTENDED_DEVOBJ_EXTENSION)FileSystemDeviceObject->DeviceObjectExtensio n; /* Make sure this one has a VPB too */ Vpb = DeviceExtension->Vpb; @@ -825,7 +825,7 @@ STDCALL IoGetLowerDeviceObject(IN PDEVICE_OBJECT DeviceObject) { - PDEVOBJ_EXTENSION DeviceExtension = DeviceObject->DeviceObjectExtension; + PEXTENDED_DEVOBJ_EXTENSION DeviceExtension = (PEXTENDED_DEVOBJ_EXTENSION)DeviceObject->DeviceObjectExtension; PDEVICE_OBJECT LowerDeviceObject = NULL; /* Make sure it's not getting deleted */ _____ Modified: trunk/reactos/ntoskrnl/io/deviface.c --- trunk/reactos/ntoskrnl/io/deviface.c 2005-09-04 23:26:35 UTC (rev 17649) +++ trunk/reactos/ntoskrnl/io/deviface.c 2005-09-04 23:48:19 UTC (rev 17650) @@ -618,8 +618,8 @@ ASSERT(PdoNameInfo->Name.Length); /* Create base key name for this interface: HKLM\SYSTEM\CurrentControlSet\Control\DeviceClasses\{GUID} */ - ASSERT(PhysicalDeviceObject->DeviceObjectExtension->DeviceNode); - InstancePath = &PhysicalDeviceObject->DeviceObjectExtension->DeviceNode->InstancePath; + ASSERT(((PEXTENDED_DEVOBJ_EXTENSION)PhysicalDeviceObject->DeviceObjectEx tension)->DeviceNode); + InstancePath = &((PEXTENDED_DEVOBJ_EXTENSION)PhysicalDeviceObject->DeviceObjectExtensio n)->DeviceNode->InstancePath; BaseKeyName.Length = wcslen(BaseKeyString) * sizeof(WCHAR); BaseKeyName.MaximumLength = BaseKeyName.Length + GuidString.Length; _____ Modified: trunk/reactos/ntoskrnl/io/file.c --- trunk/reactos/ntoskrnl/io/file.c 2005-09-04 23:26:35 UTC (rev 17649) +++ trunk/reactos/ntoskrnl/io/file.c 2005-09-04 23:48:19 UTC (rev 17650) @@ -751,7 +751,7 @@ PFILE_OBJECT FileObject = NULL; PDEVICE_OBJECT DeviceObject; PIRP Irp; - PIO_STACK_LOCATION StackLoc; + PEXTENDED_IO_STACK_LOCATION StackLoc; IO_SECURITY_CONTEXT SecurityContext; KPROCESSOR_MODE AccessMode; HANDLE LocalHandle; @@ -999,7 +999,7 @@ * Get the stack location for the new * IRP and prepare it. */ - StackLoc = IoGetNextIrpStackLocation(Irp); + StackLoc = (PEXTENDED_IO_STACK_LOCATION)IoGetNextIrpStackLocation(Irp); StackLoc->MinorFunction = 0; StackLoc->Flags = (UCHAR)Options; StackLoc->Control = 0; _____ Modified: trunk/reactos/ntoskrnl/io/plugplay.c --- trunk/reactos/ntoskrnl/io/plugplay.c 2005-09-04 23:26:35 UTC (rev 17649) +++ trunk/reactos/ntoskrnl/io/plugplay.c 2005-09-04 23:48:19 UTC (rev 17650) @@ -439,7 +439,7 @@ if (DeviceObject == NULL) return STATUS_NO_SUCH_DEVICE; - DeviceNode = DeviceObject->DeviceObjectExtension->DeviceNode; + DeviceNode = ((PEXTENDED_DEVOBJ_EXTENSION)DeviceObject->DeviceObjectExtension)->Devic eNode; } switch (RelatedDeviceData->Relation) @@ -518,7 +518,7 @@ if (DeviceObject == NULL) return STATUS_NO_SUCH_DEVICE; - DeviceNode = DeviceObject->DeviceObjectExtension->DeviceNode; + DeviceNode = ((PEXTENDED_DEVOBJ_EXTENSION)DeviceObject->DeviceObjectExtension)->Devic eNode; switch (StatusData->Operation) { @@ -559,7 +559,7 @@ if (DeviceObject == NULL) return STATUS_NO_SUCH_DEVICE; - DeviceNode = DeviceObject->DeviceObjectExtension->DeviceNode; + DeviceNode = ((PEXTENDED_DEVOBJ_EXTENSION)DeviceObject->DeviceObjectExtension)->Devic eNode; DepthData->Depth = DeviceNode->Level; _____ Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c --- trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-09-04 23:26:35 UTC (rev 17649) +++ trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-09-04 23:48:19 UTC (rev 17650) @@ -30,7 +30,7 @@ IopGetDeviceNode( PDEVICE_OBJECT DeviceObject) { - return DeviceObject->DeviceObjectExtension->DeviceNode; + return ((PEXTENDED_DEVOBJ_EXTENSION)DeviceObject->DeviceObjectExtension)->Devic eNode; } NTSTATUS @@ -619,7 +619,7 @@ Node->PhysicalDeviceObject = PhysicalDeviceObject; - PhysicalDeviceObject->DeviceObjectExtension->DeviceNode = Node; + ((PEXTENDED_DEVOBJ_EXTENSION)PhysicalDeviceObject->DeviceObjectExtension )->DeviceNode = Node; if (ParentNode) { _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2005-09-04 23:26:35 UTC (rev 17649) +++ trunk/reactos/w32api/include/ddk/winddk.h 2005-09-04 23:48:19 UTC (rev 17650) @@ -2668,6 +2668,13 @@ KSPIN_LOCK SpinLock; } ERESOURCE, *PERESOURCE; +typedef struct _DEVOBJ_EXTENSION +{ + CSHORT Type; + USHORT Size; + PDEVICE_OBJECT DeviceObject; +} DEVOBJ_EXTENSION, *PDEVOBJ_EXTENSION; + typedef struct _DRIVER_EXTENSION { struct _DRIVER_OBJECT *DriverObject; PDRIVER_ADD_DEVICE AddDevice; _____ Modified: trunk/reactos/w32api/include/ntdef.h --- trunk/reactos/w32api/include/ntdef.h 2005-09-04 23:26:35 UTC (rev 17649) +++ trunk/reactos/w32api/include/ntdef.h 2005-09-04 23:48:19 UTC (rev 17650) @@ -8,6 +8,7 @@ #define RESTRICTED_POINTER #define NTAPI __stdcall + #define OBJ_INHERIT 0x00000002 #define OBJ_PERMANENT 0x00000010 #define OBJ_EXCLUSIVE 0x00000020

19 years

[ion] 17649: - Define NTSYSAPI and NTSYSCALLAPI

by ion＠svn.reactos.com

- Define NTSYSAPI and NTSYSCALLAPI Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2005-09-04 23:18:34 UTC (rev 17648) +++ trunk/reactos/w32api/include/ddk/winddk.h 2005-09-04 23:26:35 UTC (rev 17649) @@ -38,6 +38,7 @@ #define DDKFASTAPI __fastcall #define DDKCDECLAPI __cdecl +/* FIXME: REMOVE THIS UNCOMPATIBLE CRUFT!!! */ #if defined(_NTOSKRNL_) #ifndef NTOSAPI #define NTOSAPI DECL_EXPORT @@ -82,6 +83,18 @@ # define _DDK_DUMMYUNION_N_MEMBER(n, name) name #endif +#if !defined(_NTSYSTEM_) +#define NTSYSAPI DECLSPEC_IMPORT +#define NTSYSCALLAPI DECLSPEC_IMPORT +#else +#define NTSYSAPI +#if defined(_NTDLLBUILD_) +#define NTSYSCALLAPI +#else +#define NTSYSCALLAPI DECLSPEC_ADDRSAFE +#endif +#endif + /* ** Forward declarations */

19 years

[ion] 17648: - Fix incorrect PFILE_MAILSLOT_SET_INFORMATION definition

by ion＠svn.reactos.com

- Fix incorrect PFILE_MAILSLOT_SET_INFORMATION definition - Fix MSFS to build with MSDDK. - Fix iotypes.h to be MSDDK compatible. 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.h Modified: trunk/reactos/drivers/fs/ms/rw.c Modified: trunk/reactos/include/ndk/iotypes.h Modified: trunk/reactos/w32api/include/ddk/ntifs.h _____ Modified: trunk/reactos/drivers/fs/ms/create.c --- trunk/reactos/drivers/fs/ms/create.c 2005-09-04 22:33:28 UTC (rev 17647) +++ trunk/reactos/drivers/fs/ms/create.c 2005-09-04 23:18:34 UTC (rev 17648) @@ -17,7 +17,7 @@ /* FUNCTIONS *****************************************************************/ -NTSTATUS STDCALL +NTSTATUS DEFAULTAPI MsfsCreate(PDEVICE_OBJECT DeviceObject, PIRP Irp) { @@ -101,7 +101,7 @@ } -NTSTATUS STDCALL +NTSTATUS DEFAULTAPI MsfsCreateMailslot(PDEVICE_OBJECT DeviceObject, PIRP Irp) { @@ -229,7 +229,7 @@ } -NTSTATUS STDCALL +NTSTATUS DEFAULTAPI MsfsClose(PDEVICE_OBJECT DeviceObject, PIRP Irp) { _____ Modified: trunk/reactos/drivers/fs/ms/finfo.c --- trunk/reactos/drivers/fs/ms/finfo.c 2005-09-04 22:33:28 UTC (rev 17647) +++ trunk/reactos/drivers/fs/ms/finfo.c 2005-09-04 23:18:34 UTC (rev 17648) @@ -60,13 +60,13 @@ if (*BufferLength < sizeof(FILE_MAILSLOT_SET_INFORMATION)) return(STATUS_BUFFER_OVERFLOW); - Fcb->Mailslot->TimeOut = Buffer->ReadTimeout; + Fcb->Mailslot->TimeOut = *Buffer->ReadTimeout; return(STATUS_SUCCESS); } -NTSTATUS STDCALL +NTSTATUS DEFAULTAPI MsfsQueryInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp) { @@ -132,7 +132,7 @@ } -NTSTATUS STDCALL +NTSTATUS DEFAULTAPI MsfsSetInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp) { _____ Modified: trunk/reactos/drivers/fs/ms/fsctrl.c --- trunk/reactos/drivers/fs/ms/fsctrl.c 2005-09-04 22:33:28 UTC (rev 17647) +++ trunk/reactos/drivers/fs/ms/fsctrl.c 2005-09-04 23:18:34 UTC (rev 17648) @@ -17,7 +17,7 @@ /* FUNCTIONS *****************************************************************/ -NTSTATUS STDCALL +NTSTATUS DEFAULTAPI MsfsFileSystemControl(PDEVICE_OBJECT DeviceObject, PIRP Irp) { _____ Modified: trunk/reactos/drivers/fs/ms/msfs.c --- trunk/reactos/drivers/fs/ms/msfs.c 2005-09-04 22:33:28 UTC (rev 17647) +++ trunk/reactos/drivers/fs/ms/msfs.c 2005-09-04 23:18:34 UTC (rev 17648) @@ -17,7 +17,7 @@ /* FUNCTIONS *****************************************************************/ -NTSTATUS STDCALL +NTSTATUS NTAPI DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath) { _____ Modified: trunk/reactos/drivers/fs/ms/msfs.h --- trunk/reactos/drivers/fs/ms/msfs.h 2005-09-04 22:33:28 UTC (rev 17647) +++ trunk/reactos/drivers/fs/ms/msfs.h 2005-09-04 23:18:34 UTC (rev 17648) @@ -4,6 +4,22 @@ #include <ntifs.h> #include <ndk/iotypes.h> +/* + * FIXME: GCC doesn't have a working option for defaulting to a calling + * convention. It will always default to cdecl. The MS DDK was designed + * for compilers which support this option, and thus some of their headers + * do not specify STDCALL or NTAPI everywhere. As such, callbacks will be + * interpreted as cdecl on gcc, while they should be stdcall. Defining + * NTAPI manually won't work either, since msvc will realize that the + * two definitions are different. So we have to use something to close + * the compatibility gap, until someone fixes gcc. + */ +#ifdef _MSC_VER +#define DEFAULTAPI +#else +#define DEFAULTAPI __stdcall +#endif + typedef struct _MSFS_DEVICE_EXTENSION { LIST_ENTRY MailslotListHead; @@ -48,16 +64,16 @@ #define KeUnlockMutex(x) KeReleaseMutex(x, FALSE); -NTSTATUS STDCALL MsfsCreate(PDEVICE_OBJECT DeviceObject, PIRP Irp); -NTSTATUS STDCALL MsfsCreateMailslot(PDEVICE_OBJECT DeviceObject, PIRP Irp); -NTSTATUS STDCALL MsfsClose(PDEVICE_OBJECT DeviceObject, PIRP Irp); +NTSTATUS DEFAULTAPI MsfsCreate(PDEVICE_OBJECT DeviceObject, PIRP Irp); +NTSTATUS DEFAULTAPI MsfsCreateMailslot(PDEVICE_OBJECT DeviceObject, PIRP Irp); +NTSTATUS DEFAULTAPI MsfsClose(PDEVICE_OBJECT DeviceObject, PIRP Irp); -NTSTATUS STDCALL MsfsQueryInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp); -NTSTATUS STDCALL MsfsSetInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp); +NTSTATUS DEFAULTAPI MsfsQueryInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp); +NTSTATUS DEFAULTAPI MsfsSetInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp); -NTSTATUS STDCALL MsfsRead(PDEVICE_OBJECT DeviceObject, PIRP Irp); -NTSTATUS STDCALL MsfsWrite(PDEVICE_OBJECT DeviceObject, PIRP Irp); +NTSTATUS DEFAULTAPI MsfsRead(PDEVICE_OBJECT DeviceObject, PIRP Irp); +NTSTATUS DEFAULTAPI MsfsWrite(PDEVICE_OBJECT DeviceObject, PIRP Irp); -NTSTATUS STDCALL MsfsFileSystemControl(PDEVICE_OBJECT DeviceObject, PIRP Irp); +NTSTATUS DEFAULTAPI MsfsFileSystemControl(PDEVICE_OBJECT DeviceObject, PIRP Irp); #endif /* __SERVICES_FS_NP_NPFS_H */ _____ Modified: trunk/reactos/drivers/fs/ms/rw.c --- trunk/reactos/drivers/fs/ms/rw.c 2005-09-04 22:33:28 UTC (rev 17647) +++ trunk/reactos/drivers/fs/ms/rw.c 2005-09-04 23:18:34 UTC (rev 17648) @@ -17,7 +17,7 @@ /* FUNCTIONS *****************************************************************/ -NTSTATUS STDCALL +NTSTATUS DEFAULTAPI MsfsRead(PDEVICE_OBJECT DeviceObject, PIRP Irp) { @@ -93,7 +93,7 @@ } -NTSTATUS STDCALL +NTSTATUS DEFAULTAPI MsfsWrite(PDEVICE_OBJECT DeviceObject, PIRP Irp) { _____ Modified: trunk/reactos/include/ndk/iotypes.h --- trunk/reactos/include/ndk/iotypes.h 2005-09-04 22:33:28 UTC (rev 17647) +++ trunk/reactos/include/ndk/iotypes.h 2005-09-04 23:18:34 UTC (rev 17648) @@ -14,11 +14,10 @@ /* EXPORTED DATA *************************************************************/ #ifndef NTOS_MODE_USER -extern POBJECT_TYPE NTOSAPI IoAdapterObjectType; -extern POBJECT_TYPE NTOSAPI IoDeviceHandlerObjectType; -extern POBJECT_TYPE NTOSAPI IoDeviceObjectType; -extern POBJECT_TYPE NTOSAPI IoDriverObjectType; -extern POBJECT_TYPE NTOSAPI IoFileObjectType; +extern POBJECT_TYPE NTSYSAPI IoAdapterObjectType; +extern POBJECT_TYPE NTSYSAPI IoDeviceHandlerObjectType; +extern POBJECT_TYPE NTSYSAPI IoDeviceObjectType; +extern POBJECT_TYPE NTSYSAPI IoDriverObjectType; #endif /* CONSTANTS *****************************************************************/ @@ -369,7 +368,7 @@ typedef struct _FILE_MAILSLOT_SET_INFORMATION { - LARGE_INTEGER ReadTimeout; + PLARGE_INTEGER ReadTimeout; } FILE_MAILSLOT_SET_INFORMATION, *PFILE_MAILSLOT_SET_INFORMATION; typedef struct _FILE_BOTH_DIR_INFORMATION @@ -554,12 +553,12 @@ struct _DEVICE_NODE *PrevSibling; struct _DEVICE_NODE *NextSibling; struct _DEVICE_NODE *Child; - UINT Level; + ULONG Level; struct _PO_DEVICE_NOTIFY *Notify; PNP_DEVNODE_STATE State; PNP_DEVNODE_STATE PreviousState; PNP_DEVNODE_STATE StateHistory[20]; - UINT StateHistoryEntry; + ULONG StateHistoryEntry; INT CompletionStatus; PIRP PendingIrp; ULONG Flags; @@ -625,7 +624,7 @@ UCHAR ResourcesChanged; } PI_RESOURCE_ARBITER_ENTRY, *PPI_RESOURCE_ARBITER_ENTRY; -typedef struct _DEVOBJ_EXTENSION +typedef struct _EXTENDED_DEVOBJ_EXTENSION { CSHORT Type; USHORT Size; @@ -639,7 +638,7 @@ LONG StartIoKey; ULONG StartIoFlags; struct _VPB *Vpb; -} DEVOBJ_EXTENSION, *PDEVOBJ_EXTENSION; +} EXTENDED_DEVOBJ_EXTENSION, *PEXTENDED_DEVOBJ_EXTENSION; typedef struct _PRIVATE_DRIVER_EXTENSIONS { _____ Modified: trunk/reactos/w32api/include/ddk/ntifs.h --- trunk/reactos/w32api/include/ddk/ntifs.h 2005-09-04 22:33:28 UTC (rev 17647) +++ trunk/reactos/w32api/include/ddk/ntifs.h 2005-09-04 23:18:34 UTC (rev 17648) @@ -899,7 +899,7 @@ } FILE_MAILSLOT_QUERY_INFORMATION, *PFILE_MAILSLOT_QUERY_INFORMATION; typedef struct _FILE_MAILSLOT_SET_INFORMATION { - LARGE_INTEGER ReadTimeout; + PLARGE_INTEGER ReadTimeout; } FILE_MAILSLOT_SET_INFORMATION, *PFILE_MAILSLOT_SET_INFORMATION; typedef struct _FILE_MODE_INFORMATION {

19 years

[ion] 17647: - Fix typo in NDK

by ion＠svn.reactos.com

- Fix typo in NDK - Fix compilation of NPFS and MSFS and increase their compile speed by using PCH. 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.h Modified: trunk/reactos/drivers/fs/ms/msfs.xml Modified: trunk/reactos/drivers/fs/ms/rw.c Modified: trunk/reactos/drivers/fs/np/create.c Modified: trunk/reactos/drivers/fs/np/npfs.xml Modified: trunk/reactos/include/ndk/iotypes.h _____ Modified: trunk/reactos/drivers/fs/ms/create.c --- trunk/reactos/drivers/fs/ms/create.c 2005-09-04 22:20:22 UTC (rev 17646) +++ trunk/reactos/drivers/fs/ms/create.c 2005-09-04 22:33:28 UTC (rev 17647) @@ -9,8 +9,6 @@ /* INCLUDES ******************************************************************/ -#include <ntifs.h> -#include <ndk/iotypes.h> #include "msfs.h" #define NDEBUG @@ -107,7 +105,7 @@ MsfsCreateMailslot(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - PIO_STACK_LOCATION IoStack; + PEXTENDED_IO_STACK_LOCATION IoStack; PFILE_OBJECT FileObject; PMSFS_DEVICE_EXTENSION DeviceExtension; PMSFS_MAILSLOT Mailslot; @@ -119,7 +117,7 @@ DPRINT("MsfsCreateMailslot(DeviceObject %p Irp %p)\n", DeviceObject, Irp); - IoStack = IoGetCurrentIrpStackLocation(Irp); + IoStack = (PEXTENDED_IO_STACK_LOCATION)IoGetCurrentIrpStackLocation(Irp); DeviceExtension = DeviceObject->DeviceExtension; FileObject = IoStack->FileObject; Buffer = IoStack->Parameters.CreateMailslot.Parameters; _____ Modified: trunk/reactos/drivers/fs/ms/finfo.c --- trunk/reactos/drivers/fs/ms/finfo.c 2005-09-04 22:20:22 UTC (rev 17646) +++ trunk/reactos/drivers/fs/ms/finfo.c 2005-09-04 22:33:28 UTC (rev 17647) @@ -9,7 +9,6 @@ /* INCLUDES ******************************************************************/ -#include <ntifs.h> #include "msfs.h" #define NDEBUG _____ Modified: trunk/reactos/drivers/fs/ms/fsctrl.c --- trunk/reactos/drivers/fs/ms/fsctrl.c 2005-09-04 22:20:22 UTC (rev 17646) +++ trunk/reactos/drivers/fs/ms/fsctrl.c 2005-09-04 22:33:28 UTC (rev 17647) @@ -9,10 +9,9 @@ /* INCLUDES ******************************************************************/ -#include <ntifs.h> #include "msfs.h" -//#define NDEBUG +#define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/drivers/fs/ms/msfs.c --- trunk/reactos/drivers/fs/ms/msfs.c 2005-09-04 22:20:22 UTC (rev 17646) +++ trunk/reactos/drivers/fs/ms/msfs.c 2005-09-04 22:33:28 UTC (rev 17647) @@ -9,7 +9,6 @@ /* INCLUDES ******************************************************************/ -#include <ntifs.h> #include "msfs.h" #define NDEBUG _____ Modified: trunk/reactos/drivers/fs/ms/msfs.h --- trunk/reactos/drivers/fs/ms/msfs.h 2005-09-04 22:20:22 UTC (rev 17646) +++ trunk/reactos/drivers/fs/ms/msfs.h 2005-09-04 22:33:28 UTC (rev 17647) @@ -1,6 +1,9 @@ #ifndef __SERVICES_FS_MS_MSFS_H #define __SERVICES_FS_MS_MSFS_H +#include <ntifs.h> +#include <ndk/iotypes.h> + typedef struct _MSFS_DEVICE_EXTENSION { LIST_ENTRY MailslotListHead; _____ Modified: trunk/reactos/drivers/fs/ms/msfs.xml --- trunk/reactos/drivers/fs/ms/msfs.xml 2005-09-04 22:20:22 UTC (rev 17646) +++ trunk/reactos/drivers/fs/ms/msfs.xml 2005-09-04 22:33:28 UTC (rev 17647) @@ -9,4 +9,5 @@ <file>msfs.c</file> <file>rw.c</file> <file>msfs.rc</file> + <pch>msfs.h</pch> </module> _____ Modified: trunk/reactos/drivers/fs/ms/rw.c --- trunk/reactos/drivers/fs/ms/rw.c 2005-09-04 22:20:22 UTC (rev 17646) +++ trunk/reactos/drivers/fs/ms/rw.c 2005-09-04 22:33:28 UTC (rev 17647) @@ -9,7 +9,6 @@ /* INCLUDES ******************************************************************/ -#include <ntifs.h> #include "msfs.h" #define NDEBUG _____ Modified: trunk/reactos/drivers/fs/np/create.c --- trunk/reactos/drivers/fs/np/create.c 2005-09-04 22:20:22 UTC (rev 17646) +++ trunk/reactos/drivers/fs/np/create.c 2005-09-04 22:33:28 UTC (rev 17647) @@ -107,7 +107,7 @@ NpfsCreate(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - PIO_STACK_LOCATION IoStack; + PEXTENDED_IO_STACK_LOCATION IoStack; PFILE_OBJECT FileObject; PNPFS_PIPE Pipe; PNPFS_FCB ClientFcb; @@ -118,7 +118,7 @@ DPRINT("NpfsCreate(DeviceObject %p Irp %p)\n", DeviceObject, Irp); DeviceExt = (PNPFS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - IoStack = IoGetCurrentIrpStackLocation(Irp); + IoStack = (PEXTENDED_IO_STACK_LOCATION)IoGetCurrentIrpStackLocation(Irp); FileObject = IoStack->FileObject; DPRINT("FileObject %p\n", FileObject); DPRINT("FileName %wZ\n", &FileObject->FileName); @@ -307,7 +307,7 @@ NpfsCreateNamedPipe(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - PIO_STACK_LOCATION IoStack; + PEXTENDED_IO_STACK_LOCATION IoStack; PFILE_OBJECT FileObject; PNPFS_DEVICE_EXTENSION DeviceExt; PNPFS_PIPE Pipe; @@ -318,7 +318,7 @@ DPRINT("NpfsCreateNamedPipe(DeviceObject %p Irp %p)\n", DeviceObject, Irp); DeviceExt = (PNPFS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - IoStack = IoGetCurrentIrpStackLocation(Irp); + IoStack = (PEXTENDED_IO_STACK_LOCATION)IoGetCurrentIrpStackLocation(Irp); FileObject = IoStack->FileObject; DPRINT("FileObject %p\n", FileObject); DPRINT("Pipe name %wZ\n", &FileObject->FileName); _____ Modified: trunk/reactos/drivers/fs/np/npfs.xml --- trunk/reactos/drivers/fs/np/npfs.xml 2005-09-04 22:20:22 UTC (rev 17646) +++ trunk/reactos/drivers/fs/np/npfs.xml 2005-09-04 22:33:28 UTC (rev 17647) @@ -10,4 +10,5 @@ <file>rw.c</file> <file>volume.c</file> <file>npfs.rc</file> + <pch>npfs.h</pch> </module> _____ Modified: trunk/reactos/include/ndk/iotypes.h --- trunk/reactos/include/ndk/iotypes.h 2005-09-04 22:20:22 UTC (rev 17646) +++ trunk/reactos/include/ndk/iotypes.h 2005-09-04 22:33:28 UTC (rev 17647) @@ -889,7 +889,7 @@ PFILE_OBJECT FileObject; PIO_COMPLETION_ROUTINE CompletionRoutine; PVOID Context; -} IO_STACK_LOCATION, *PIO_STACK_LOCATION; +} EXTENDED_IO_STACK_LOCATION, *PEXTENDED_IO_STACK_LOCATION; #if !defined(_ALPHA_) #include <poppack.h> #endif

19 years

[hpoussin] 17646: Fix SetComputerNameA/W. They were sending a bad parameter to SetComputerNameExA/W. Thanks Hartmut

by hpoussin＠svn.reactos.com

Fix SetComputerNameA/W. They were sending a bad parameter to SetComputerNameExA/W. Thanks Hartmut Modified: trunk/reactos/lib/kernel32/misc/computername.c _____ Modified: trunk/reactos/lib/kernel32/misc/computername.c --- trunk/reactos/lib/kernel32/misc/computername.c 2005-09-04 22:16:57 UTC (rev 17645) +++ trunk/reactos/lib/kernel32/misc/computername.c 2005-09-04 22:20:22 UTC (rev 17646) @@ -384,7 +384,7 @@ BOOL STDCALL SetComputerNameA (LPCSTR lpComputerName) { - return SetComputerNameExA( ComputerNameNetBIOS, lpComputerName ); + return SetComputerNameExA( ComputerNamePhysicalNetBIOS, lpComputerName ); } @@ -394,7 +394,7 @@ BOOL STDCALL SetComputerNameW (LPCWSTR lpComputerName) { - return SetComputerNameExW( ComputerNameNetBIOS, lpComputerName ); + return SetComputerNameExW( ComputerNamePhysicalNetBIOS, lpComputerName ); }

19 years

[ion] 17645: - Fix incompatible IO_STACK_LOCATION definition in W32api ddk/winddk.k

by ion＠svn.reactos.com

- Fix incompatible IO_STACK_LOCATION definition in W32api ddk/winddk.k - Add EXTENDED_IO_STACK_LOCATION to NDK, with the full definition. Modified: trunk/reactos/include/ndk/iotypes.h Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/include/ndk/iotypes.h --- trunk/reactos/include/ndk/iotypes.h 2005-09-04 22:13:30 UTC (rev 17644) +++ trunk/reactos/include/ndk/iotypes.h 2005-09-04 22:16:57 UTC (rev 17645) @@ -647,7 +647,253 @@ PVOID ClientIdentificationAddress; CHAR Extension[1]; } PRIVATE_DRIVER_EXTENSIONS, *PPRIVATE_DRIVER_EXTENSIONS; + +#if !defined(_ALPHA_) +#include <pshpack4.h> #endif +typedef struct _EXTENDED_IO_STACK_LOCATION +{ + UCHAR MajorFunction; + UCHAR MinorFunction; + UCHAR Flags; + UCHAR Control; + union + { + struct + { + PIO_SECURITY_CONTEXT SecurityContext; + ULONG Options; + USHORT FileAttributes; + USHORT ShareAccess; + ULONG EaLength; + } Create; + struct + { + PIO_SECURITY_CONTEXT SecurityContext; + ULONG Options; + USHORT Reserved; + USHORT ShareAccess; + struct _NAMED_PIPE_CREATE_PARAMETERS *Parameters; + } CreatePipe; + struct + { + PIO_SECURITY_CONTEXT SecurityContext; + ULONG Options; + USHORT Reserved; + USHORT ShareAccess; + struct _MAILSLOT_CREATE_PARAMETERS *Parameters; + } CreateMailslot; + struct + { + ULONG Length; + ULONG Key; + LARGE_INTEGER ByteOffset; + } Read; + struct + { + ULONG Length; + ULONG Key; + LARGE_INTEGER ByteOffset; + } Write; + struct + { + ULONG Length; + PUNICODE_STRING FileName; + FILE_INFORMATION_CLASS FileInformationClass; + ULONG FileIndex; + } QueryDirectory; + struct + { + ULONG Length; + ULONG CompletionFilter; + } NotifyDirectory; + struct + { + ULONG Length; + FILE_INFORMATION_CLASS FileInformationClass; + } QueryFile; + struct + { + ULONG Length; + FILE_INFORMATION_CLASS FileInformationClass; + PFILE_OBJECT FileObject; + union + { + struct + { + BOOLEAN ReplaceIfExists; + BOOLEAN AdvanceOnly; + }; + ULONG ClusterCount; + HANDLE DeleteHandle; + }; + } SetFile; + struct + { + ULONG Length; + PVOID EaList; + ULONG EaListLength; + ULONG EaIndex; + } QueryEa; + struct + { + ULONG Length; + } SetEa; + struct + { + ULONG Length; + FS_INFORMATION_CLASS FsInformationClass; + } QueryVolume; + struct + { + ULONG Length; + FS_INFORMATION_CLASS FsInformationClass; + } SetVolume; + struct + { + ULONG OutputBufferLength; + ULONG InputBufferLength; + ULONG FsControlCode; + PVOID Type3InputBuffer; + } FileSystemControl; + struct + { + PLARGE_INTEGER Length; + ULONG Key; + LARGE_INTEGER ByteOffset; + } LockControl; + struct + { + ULONG OutputBufferLength; + ULONG InputBufferLength; + ULONG IoControlCode; + PVOID Type3InputBuffer; + } DeviceIoControl; + struct + { + SECURITY_INFORMATION SecurityInformation; + ULONG POINTER_ALIGNMENT Length; + } QuerySecurity; + struct + { + SECURITY_INFORMATION SecurityInformation; + PSECURITY_DESCRIPTOR SecurityDescriptor; + } SetSecurity; + struct + { + PVPB Vpb; + PDEVICE_OBJECT DeviceObject; + } MountVolume; + struct + { + PVPB Vpb; + PDEVICE_OBJECT DeviceObject; + } VerifyVolume; + struct + { + struct _SCSI_REQUEST_BLOCK *Srb; + } Scsi; + struct + { + ULONG Length; + PSID StartSid; + struct _FILE_GET_QUOTA_INFORMATION *SidList; + ULONG SidListLength; + } QueryQuota; + struct + { + ULONG Length; + } SetQuota; + struct + { + DEVICE_RELATION_TYPE Type; + } QueryDeviceRelations; + struct + { + CONST GUID *InterfaceType; + USHORT Size; + USHORT Version; + PINTERFACE Interface; + PVOID InterfaceSpecificData; + } QueryInterface; + struct + { + PDEVICE_CAPABILITIES Capabilities; + } DeviceCapabilities; + struct + { + PIO_RESOURCE_REQUIREMENTS_LIST IoResourceRequirementList; + } FilterResourceRequirements; + struct + { + ULONG WhichSpace; + PVOID Buffer; + ULONG Offset; + ULONG Length; + } ReadWriteConfig; + struct + { + BOOLEAN Lock; + } SetLock; + struct + { + BUS_QUERY_ID_TYPE IdType; + } QueryId; + struct + { + DEVICE_TEXT_TYPE DeviceTextType; + LCID LocaleId; + } QueryDeviceText; + struct + { + BOOLEAN InPath; + BOOLEAN Reserved[3]; + DEVICE_USAGE_NOTIFICATION_TYPE Type; + } UsageNotification; + struct + { + SYSTEM_POWER_STATE PowerState; + } WaitWake; + struct + { + PPOWER_SEQUENCE PowerSequence; + } PowerSequence; + struct + { + ULONG SystemContext; + POWER_STATE_TYPE Type; + POWER_STATE State; + POWER_ACTION ShutdownType; + } Power; + struct + { + PCM_RESOURCE_LIST AllocatedResources; + PCM_RESOURCE_LIST AllocatedResourcesTranslated; + } StartDevice; + struct + { + ULONG_PTR ProviderId; + PVOID DataPath; + ULONG BufferSize; + PVOID Buffer; + } WMI; + struct + { + PVOID Argument1; + PVOID Argument2; + PVOID Argument3; + PVOID Argument4; + } Others; + } Parameters; + PDEVICE_OBJECT DeviceObject; + PFILE_OBJECT FileObject; + PIO_COMPLETION_ROUTINE CompletionRoutine; + PVOID Context; +} IO_STACK_LOCATION, *PIO_STACK_LOCATION; +#if !defined(_ALPHA_) +#include <poppack.h> +#endif +#endif /* FUNCTION TYPES ************************************************************/ _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2005-09-04 22:13:30 UTC (rev 17644) +++ trunk/reactos/w32api/include/ddk/winddk.h 2005-09-04 22:16:57 UTC (rev 17645) @@ -3180,23 +3180,7 @@ USHORT ShareAccess; ULONG POINTER_ALIGNMENT EaLength; } Create; - /* FIXME: CreatePipe and CreateMailslot aren't defined in official - * DDK/IFS headers. */ struct { - PIO_SECURITY_CONTEXT SecurityContext; - ULONG Options; - USHORT Reserved; - USHORT ShareAccess; - struct _NAMED_PIPE_CREATE_PARAMETERS *Parameters; - } CreatePipe; - struct { - PIO_SECURITY_CONTEXT SecurityContext; - ULONG Options; - USHORT Reserved; - USHORT ShareAccess; - struct _MAILSLOT_CREATE_PARAMETERS *Parameters; - } CreateMailslot; - struct { ULONG Length; ULONG POINTER_ALIGNMENT Key; LARGE_INTEGER ByteOffset;

19 years

[hpoussin] 17644: Fix definition of STDCALL. Thanks Alex

by hpoussin＠svn.reactos.com

Fix definition of STDCALL. Thanks Alex Modified: trunk/reactos/drivers/fs/fs_rec/fs_rec.h _____ Modified: trunk/reactos/drivers/fs/fs_rec/fs_rec.h --- trunk/reactos/drivers/fs/fs_rec/fs_rec.h 2005-09-04 22:12:35 UTC (rev 17643) +++ trunk/reactos/drivers/fs/fs_rec/fs_rec.h 2005-09-04 22:13:30 UTC (rev 17644) @@ -29,7 +29,7 @@ #include <ntddcdrm.h> #ifdef _MSC_VER -#define STDCALL +#define STDCALL __stdcall #endif /* Filesystem types (add new filesystems here)*/

19 years

[hpoussin] 17643: Alex prefers that we don't locally define structures that not in the DDK/IFS kit, but that we use the NDK headers.

by hpoussin＠svn.reactos.com

Alex prefers that we don't locally define structures that not in the DDK/IFS kit, but that we use the NDK headers. This change breaks the compilation with the DDK/IFS kit only. Modified: trunk/reactos/drivers/fs/np/create.c Modified: trunk/reactos/drivers/fs/np/npfs.h _____ Modified: trunk/reactos/drivers/fs/np/create.c --- trunk/reactos/drivers/fs/np/create.c 2005-09-04 21:44:02 UTC (rev 17642) +++ trunk/reactos/drivers/fs/np/create.c 2005-09-04 22:12:35 UTC (rev 17643) @@ -107,7 +107,7 @@ NpfsCreate(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - PEXTENDED_IO_STACK_LOCATION IoStack; + PIO_STACK_LOCATION IoStack; PFILE_OBJECT FileObject; PNPFS_PIPE Pipe; PNPFS_FCB ClientFcb; @@ -118,7 +118,7 @@ DPRINT("NpfsCreate(DeviceObject %p Irp %p)\n", DeviceObject, Irp); DeviceExt = (PNPFS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - IoStack = (PEXTENDED_IO_STACK_LOCATION)IoGetCurrentIrpStackLocation(Irp); + IoStack = IoGetCurrentIrpStackLocation(Irp); FileObject = IoStack->FileObject; DPRINT("FileObject %p\n", FileObject); DPRINT("FileName %wZ\n", &FileObject->FileName); @@ -307,7 +307,7 @@ NpfsCreateNamedPipe(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - PEXTENDED_IO_STACK_LOCATION IoStack; + PIO_STACK_LOCATION IoStack; PFILE_OBJECT FileObject; PNPFS_DEVICE_EXTENSION DeviceExt; PNPFS_PIPE Pipe; @@ -318,7 +318,7 @@ DPRINT("NpfsCreateNamedPipe(DeviceObject %p Irp %p)\n", DeviceObject, Irp); DeviceExt = (PNPFS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - IoStack = (PEXTENDED_IO_STACK_LOCATION)IoGetCurrentIrpStackLocation(Irp); + IoStack = IoGetCurrentIrpStackLocation(Irp); FileObject = IoStack->FileObject; DPRINT("FileObject %p\n", FileObject); DPRINT("Pipe name %wZ\n", &FileObject->FileName); _____ Modified: trunk/reactos/drivers/fs/np/npfs.h --- trunk/reactos/drivers/fs/np/npfs.h 2005-09-04 21:44:02 UTC (rev 17642) +++ trunk/reactos/drivers/fs/np/npfs.h 2005-09-04 22:12:35 UTC (rev 17643) @@ -2,57 +2,8 @@ #define __DRIVERS_FS_NP_NPFS_H #include <ntifs.h> - -#if defined(__GNUC__) #include <ndk/iotypes.h> -#define EXTENDED_IO_STACK_LOCATION IO_STACK_LOCATION -#define PEXTENDED_IO_STACK_LOCATION PIO_STACK_LOCATION -#elif defined(_MSC_VER) -#define STDCALL -#define KEBUGCHECK KeBugCheck -typedef struct _NAMED_PIPE_CREATE_PARAMETERS -{ - ULONG NamedPipeType; - ULONG ReadMode; - ULONG CompletionMode; - ULONG MaximumInstances; - ULONG InboundQuota; - ULONG OutboundQuota; - LARGE_INTEGER DefaultTimeout; - BOOLEAN TimeoutSpecified; -} NAMED_PIPE_CREATE_PARAMETERS, *PNAMED_PIPE_CREATE_PARAMETERS; -typedef struct _EXTENDED_IO_STACK_LOCATION { - - /* Included for padding */ - UCHAR MajorFunction; - UCHAR MinorFunction; - UCHAR Flags; - UCHAR Control; - - union { - - struct { - PIO_SECURITY_CONTEXT SecurityContext; - ULONG Options; - USHORT Reserved; - USHORT ShareAccess; - PNAMED_PIPE_CREATE_PARAMETERS Parameters; - } CreatePipe; - - } Parameters; - PDEVICE_OBJECT DeviceObject; - PFILE_OBJECT FileObject; - PIO_COMPLETION_ROUTINE CompletionRoutine; - PVOID Context; - -} EXTENDED_IO_STACK_LOCATION, *PEXTENDED_IO_STACK_LOCATION; - - -#else -#error Unknown compiler -#endif - typedef struct _NPFS_DEVICE_EXTENSION { LIST_ENTRY PipeListHead;

19 years

[hpoussin] 17642: Allow compilation of npfs driver with MSVC

by hpoussin＠svn.reactos.com

Allow compilation of npfs driver with MSVC 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.rc 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/np/create.c --- trunk/reactos/drivers/fs/np/create.c 2005-09-04 21:14:54 UTC (rev 17641) +++ trunk/reactos/drivers/fs/np/create.c 2005-09-04 21:44:02 UTC (rev 17642) @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: drivers/fs/np/create.c @@ -9,13 +8,11 @@ /* INCLUDES ******************************************************************/ -#include <ntifs.h> -#include <ndk/iotypes.h> -#include "npfs.h" - #define NDEBUG #include <debug.h> +#include "npfs.h" + /* FUNCTIONS *****************************************************************/ static PNPFS_PIPE @@ -110,7 +107,7 @@ NpfsCreate(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - PIO_STACK_LOCATION IoStack; + PEXTENDED_IO_STACK_LOCATION IoStack; PFILE_OBJECT FileObject; PNPFS_PIPE Pipe; PNPFS_FCB ClientFcb; @@ -121,14 +118,14 @@ DPRINT("NpfsCreate(DeviceObject %p Irp %p)\n", DeviceObject, Irp); DeviceExt = (PNPFS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - IoStack = IoGetCurrentIrpStackLocation(Irp); + IoStack = (PEXTENDED_IO_STACK_LOCATION)IoGetCurrentIrpStackLocation(Irp); FileObject = IoStack->FileObject; DPRINT("FileObject %p\n", FileObject); DPRINT("FileName %wZ\n", &FileObject->FileName); Irp->IoStatus.Information = 0; - SpecialAccess = ((IoStack->Parameters.Create.ShareAccess & 3) == 3); + SpecialAccess = ((IoStack->Parameters.CreatePipe.ShareAccess & 3) == 3); if (SpecialAccess) { DPRINT("NpfsCreate() open client end for special use!\n"); @@ -310,7 +307,7 @@ NpfsCreateNamedPipe(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - PIO_STACK_LOCATION IoStack; + PEXTENDED_IO_STACK_LOCATION IoStack; PFILE_OBJECT FileObject; PNPFS_DEVICE_EXTENSION DeviceExt; PNPFS_PIPE Pipe; @@ -321,7 +318,7 @@ DPRINT("NpfsCreateNamedPipe(DeviceObject %p Irp %p)\n", DeviceObject, Irp); DeviceExt = (PNPFS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - IoStack = IoGetCurrentIrpStackLocation(Irp); + IoStack = (PEXTENDED_IO_STACK_LOCATION)IoGetCurrentIrpStackLocation(Irp); FileObject = IoStack->FileObject; DPRINT("FileObject %p\n", FileObject); DPRINT("Pipe name %wZ\n", &FileObject->FileName); @@ -416,8 +413,8 @@ Pipe->MaximumInstances = Buffer->MaximumInstances; Pipe->CurrentInstances = 0; Pipe->TimeOut = Buffer->DefaultTimeout; - if (!(IoStack->Parameters.Create.Options & FILE_PIPE_OUTBOUND) || - IoStack->Parameters.Create.Options & FILE_PIPE_FULL_DUPLEX) + if (!(IoStack->Parameters.CreatePipe.Options & FILE_PIPE_OUTBOUND) || + IoStack->Parameters.CreatePipe.Options & FILE_PIPE_FULL_DUPLEX) { if (Buffer->InboundQuota == 0) { @@ -441,7 +438,7 @@ Pipe->InboundQuota = 0; } - if (IoStack->Parameters.Create.Options & (FILE_PIPE_FULL_DUPLEX|FILE_PIPE_OUTBOUND)) + if (IoStack->Parameters.CreatePipe.Options & (FILE_PIPE_FULL_DUPLEX|FILE_PIPE_OUTBOUND)) { if (Buffer->OutboundQuota == 0) { @@ -540,7 +537,7 @@ PFILE_OBJECT FileObject; PNPFS_FCB Fcb, OtherSide; PNPFS_PIPE Pipe; - BOOL Server; + BOOLEAN Server; DPRINT("NpfsCleanup(DeviceObject %p Irp %p)\n", DeviceObject, Irp); @@ -676,7 +673,7 @@ PFILE_OBJECT FileObject; PNPFS_FCB Fcb; PNPFS_PIPE Pipe; - BOOL Server; + BOOLEAN Server; DPRINT("NpfsClose(DeviceObject %p Irp %p)\n", DeviceObject, Irp); _____ Modified: trunk/reactos/drivers/fs/np/finfo.c --- trunk/reactos/drivers/fs/np/finfo.c 2005-09-04 21:14:54 UTC (rev 17641) +++ trunk/reactos/drivers/fs/np/finfo.c 2005-09-04 21:44:02 UTC (rev 17642) @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: drivers/fs/np/finfo.c @@ -9,12 +8,11 @@ /* INCLUDES ******************************************************************/ -#include <ntifs.h> -#include "npfs.h" - #define NDEBUG #include <debug.h> +#include "npfs.h" + /* FUNCTIONS *****************************************************************/ static _____ Modified: trunk/reactos/drivers/fs/np/fsctrl.c --- trunk/reactos/drivers/fs/np/fsctrl.c 2005-09-04 21:14:54 UTC (rev 17641) +++ trunk/reactos/drivers/fs/np/fsctrl.c 2005-09-04 21:44:02 UTC (rev 17642) @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: drivers/fs/np/fsctrl.c @@ -10,12 +9,11 @@ /* INCLUDES ******************************************************************/ -#include <ntifs.h> -#include "npfs.h" - #define NDEBUG #include <debug.h> +#include "npfs.h" + /* FUNCTIONS *****************************************************************/ static VOID STDCALL @@ -170,7 +168,7 @@ NTSTATUS Status; PNPFS_FCB OtherSide; PNPFS_PIPE Pipe; - BOOL Server; + BOOLEAN Server; DPRINT("NpfsDisconnectPipe()\n"); _____ Modified: trunk/reactos/drivers/fs/np/npfs.c --- trunk/reactos/drivers/fs/np/npfs.c 2005-09-04 21:14:54 UTC (rev 17641) +++ trunk/reactos/drivers/fs/np/npfs.c 2005-09-04 21:44:02 UTC (rev 17642) @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: drivers/fs/np/mount.c @@ -9,12 +8,11 @@ /* INCLUDES ******************************************************************/ -#include <ntifs.h> -#include "npfs.h" - #define NDEBUG #include <debug.h> +#include "npfs.h" + /* FUNCTIONS *****************************************************************/ NTSTATUS STDCALL _____ Modified: trunk/reactos/drivers/fs/np/npfs.h --- trunk/reactos/drivers/fs/np/npfs.h 2005-09-04 21:14:54 UTC (rev 17641) +++ trunk/reactos/drivers/fs/np/npfs.h 2005-09-04 21:44:02 UTC (rev 17642) @@ -1,8 +1,58 @@ -/* $Id$ */ - #ifndef __DRIVERS_FS_NP_NPFS_H #define __DRIVERS_FS_NP_NPFS_H +#include <ntifs.h> + +#if defined(__GNUC__) +#include <ndk/iotypes.h> +#define EXTENDED_IO_STACK_LOCATION IO_STACK_LOCATION +#define PEXTENDED_IO_STACK_LOCATION PIO_STACK_LOCATION + +#elif defined(_MSC_VER) +#define STDCALL +#define KEBUGCHECK KeBugCheck +typedef struct _NAMED_PIPE_CREATE_PARAMETERS +{ + ULONG NamedPipeType; + ULONG ReadMode; + ULONG CompletionMode; + ULONG MaximumInstances; + ULONG InboundQuota; + ULONG OutboundQuota; + LARGE_INTEGER DefaultTimeout; + BOOLEAN TimeoutSpecified; +} NAMED_PIPE_CREATE_PARAMETERS, *PNAMED_PIPE_CREATE_PARAMETERS; +typedef struct _EXTENDED_IO_STACK_LOCATION { + + /* Included for padding */ + UCHAR MajorFunction; + UCHAR MinorFunction; + UCHAR Flags; + UCHAR Control; + + union { + + struct { + PIO_SECURITY_CONTEXT SecurityContext; + ULONG Options; + USHORT Reserved; + USHORT ShareAccess; + PNAMED_PIPE_CREATE_PARAMETERS Parameters; + } CreatePipe; + + } Parameters; + PDEVICE_OBJECT DeviceObject; + PFILE_OBJECT FileObject; + PIO_COMPLETION_ROUTINE CompletionRoutine; + PVOID Context; + +} EXTENDED_IO_STACK_LOCATION, *PEXTENDED_IO_STACK_LOCATION; + + +#else +#error Unknown compiler +#endif + typedef struct _NPFS_DEVICE_EXTENSION { LIST_ENTRY PipeListHead; _____ Modified: trunk/reactos/drivers/fs/np/npfs.rc --- trunk/reactos/drivers/fs/np/npfs.rc 2005-09-04 21:14:54 UTC (rev 17641) +++ trunk/reactos/drivers/fs/np/npfs.rc 2005-09-04 21:44:02 UTC (rev 17642) @@ -1,5 +1,3 @@ -/* $Id$ */ - #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "Named Pipe IFS Driver\0" #define REACTOS_STR_INTERNAL_NAME "npfs\0" _____ Modified: trunk/reactos/drivers/fs/np/npfs.xml --- trunk/reactos/drivers/fs/np/npfs.xml 2005-09-04 21:14:54 UTC (rev 17641) +++ trunk/reactos/drivers/fs/np/npfs.xml 2005-09-04 21:44:02 UTC (rev 17642) @@ -1,6 +1,6 @@ <module name="npfs" type="kernelmodedriver" installbase="system32/drivers" installname="npfs.sys"> <include base="npfs">.</include> - <define name="__USE_W32API" /> + <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-09-04 21:14:54 UTC (rev 17641) +++ trunk/reactos/drivers/fs/np/rw.c 2005-09-04 21:44:02 UTC (rev 17642) @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: drivers/fs/np/rw.c @@ -9,12 +8,11 @@ /* INCLUDES ******************************************************************/ -#include <ntifs.h> -#include "npfs.h" - #define NDEBUG #include <debug.h> +#include "npfs.h" + /* FUNCTIONS *****************************************************************/ #ifndef NDEBUG @@ -431,7 +429,7 @@ } else { - PNPFS_CONTEXT Context = (PNPFS_CONTEXT)&Irp->Tail.Overlay.DriverContext; + Context = (PNPFS_CONTEXT)&Irp->Tail.Overlay.DriverContext; Context->WaitEvent = &Fcb->ReadEvent; Status = NpfsAddWaitingReadWriteRequest(DeviceObject, Irp); _____ Modified: trunk/reactos/drivers/fs/np/volume.c --- trunk/reactos/drivers/fs/np/volume.c 2005-09-04 21:14:54 UTC (rev 17641) +++ trunk/reactos/drivers/fs/np/volume.c 2005-09-04 21:44:02 UTC (rev 17642) @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: drivers/fs/npfs/volume.c @@ -9,9 +8,6 @@ /* INCLUDES *****************************************************************/ -#include <ntifs.h> -#include <wchar.h> - #define NDEBUG #include <debug.h>

19 years

← Newer
1
...
51
52
53
54
55
56
57
58
59
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2005