Ros-diffs November 2008

ros-diffs@reactos.org

28 participants
657 discussions

[sginsberg] 37743: - Remove system_header

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Sat Nov 29 14:17:45 2008 New Revision: 37743 URL: http://svn.reactos.org/svn/reactos?rev=37743&view=rev Log: - Remove system_header Modified: trunk/reactos/ntoskrnl/include/internal/powerpc/ke.h Modified: trunk/reactos/ntoskrnl/include/internal/powerpc/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/powerpc/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/powerpc/ke.h [iso-8859-1] Sat Nov 29 14:17:45 2008 @@ -20,10 +20,6 @@ #define __NTOSKRNL_INCLUDE_INTERNAL_POWERPC_KE_H #include <ndk/powerpc/ketypes.h> - -#if __GNUC__ >=3 -#pragma GCC system_header -#endif /* Possible values for KTHREAD's NpxState */ #define KPCR_BASE 0xff000000

15 years, 9 months

[sginsberg] 37742: - STDCALL -> NTAPI

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Sat Nov 29 14:14:45 2008 New Revision: 37742 URL: http://svn.reactos.org/svn/reactos?rev=37742&view=rev Log: - STDCALL -> NTAPI Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.c trunk/reactos/drivers/filesystems/cdfs/cdfs.h trunk/reactos/drivers/filesystems/cdfs/cleanup.c trunk/reactos/drivers/filesystems/cdfs/close.c trunk/reactos/drivers/filesystems/cdfs/create.c trunk/reactos/drivers/filesystems/cdfs/dirctl.c trunk/reactos/drivers/filesystems/cdfs/finfo.c trunk/reactos/drivers/filesystems/cdfs/fsctl.c trunk/reactos/drivers/filesystems/cdfs/rw.c trunk/reactos/drivers/filesystems/cdfs/volinfo.c trunk/reactos/drivers/filesystems/ext2/inc/protos.h trunk/reactos/drivers/filesystems/fs_rec/fs_rec.c trunk/reactos/drivers/filesystems/mup/create.c trunk/reactos/drivers/filesystems/mup/mup.c trunk/reactos/drivers/filesystems/mup/mup.h trunk/reactos/drivers/filesystems/npfs/create.c trunk/reactos/drivers/filesystems/npfs/finfo.c trunk/reactos/drivers/filesystems/npfs/fsctrl.c trunk/reactos/drivers/filesystems/npfs/npfs.c trunk/reactos/drivers/filesystems/npfs/npfs.h trunk/reactos/drivers/filesystems/npfs/rw.c trunk/reactos/drivers/filesystems/npfs/volume.c Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/cdfs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/cdfs.c [iso-8859-1] Sat Nov 29 14:14:45 2008 @@ -40,7 +40,7 @@ /* FUNCTIONS ****************************************************************/ -NTSTATUS STDCALL +NTSTATUS NTAPI DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath) /* Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/cdfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/cdfs.h [iso-8859-1] Sat Nov 29 14:14:45 2008 @@ -239,14 +239,14 @@ /* cleanup.c */ -NTSTATUS STDCALL +NTSTATUS NTAPI CdfsCleanup(PDEVICE_OBJECT DeviceObject, PIRP Irp); /* close.c */ -NTSTATUS STDCALL +NTSTATUS NTAPI CdfsClose(PDEVICE_OBJECT DeviceObject, PIRP Irp); @@ -276,14 +276,14 @@ /* create.c */ -NTSTATUS STDCALL +NTSTATUS NTAPI CdfsCreate(PDEVICE_OBJECT DeviceObject, PIRP Irp); /* dirctl.c */ -NTSTATUS STDCALL +NTSTATUS NTAPI CdfsDirectoryControl(PDEVICE_OBJECT DeviceObject, PIRP Irp); @@ -358,18 +358,18 @@ /* finfo.c */ -NTSTATUS STDCALL +NTSTATUS NTAPI CdfsQueryInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp); -NTSTATUS STDCALL +NTSTATUS NTAPI CdfsSetInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp); /* fsctl.c */ -NTSTATUS STDCALL +NTSTATUS NTAPI CdfsFileSystemControl(PDEVICE_OBJECT DeviceObject, PIRP Irp); @@ -392,28 +392,28 @@ /* rw.c */ -NTSTATUS STDCALL +NTSTATUS NTAPI CdfsRead(PDEVICE_OBJECT DeviceObject, PIRP Irp); -NTSTATUS STDCALL +NTSTATUS NTAPI CdfsWrite(PDEVICE_OBJECT DeviceObject, PIRP Irp); /* volinfo.c */ -NTSTATUS STDCALL +NTSTATUS NTAPI CdfsQueryVolumeInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp); -NTSTATUS STDCALL +NTSTATUS NTAPI CdfsSetVolumeInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp); /* cdfs.c */ -NTSTATUS STDCALL +NTSTATUS NTAPI DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath); Modified: trunk/reactos/drivers/filesystems/cdfs/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/cleanup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/cleanup.c [iso-8859-1] Sat Nov 29 14:14:45 2008 @@ -57,7 +57,7 @@ return STATUS_SUCCESS; } -NTSTATUS STDCALL +NTSTATUS NTAPI CdfsCleanup(PDEVICE_OBJECT DeviceObject, PIRP Irp) { Modified: trunk/reactos/drivers/filesystems/cdfs/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/close.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/close.c [iso-8859-1] Sat Nov 29 14:14:45 2008 @@ -76,7 +76,7 @@ } -NTSTATUS STDCALL +NTSTATUS NTAPI CdfsClose(PDEVICE_OBJECT DeviceObject, PIRP Irp) { Modified: trunk/reactos/drivers/filesystems/cdfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/create.c [iso-8859-1] Sat Nov 29 14:14:45 2008 @@ -259,7 +259,7 @@ } -NTSTATUS STDCALL +NTSTATUS NTAPI CdfsCreate(PDEVICE_OBJECT DeviceObject, PIRP Irp) { Modified: trunk/reactos/drivers/filesystems/cdfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/dirctl.c [iso-8859-1] Sat Nov 29 14:14:45 2008 @@ -760,7 +760,7 @@ -NTSTATUS STDCALL +NTSTATUS NTAPI CdfsDirectoryControl(PDEVICE_OBJECT DeviceObject, PIRP Irp) { Modified: trunk/reactos/drivers/filesystems/cdfs/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/finfo.c [iso-8859-1] Sat Nov 29 14:14:45 2008 @@ -326,7 +326,7 @@ /* * FUNCTION: Retrieve the specified file information */ -NTSTATUS STDCALL +NTSTATUS NTAPI CdfsQueryInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp) { @@ -444,7 +444,7 @@ /* * FUNCTION: Set the specified file information */ -NTSTATUS STDCALL +NTSTATUS NTAPI CdfsSetInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp) { Modified: trunk/reactos/drivers/filesystems/cdfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] Sat Nov 29 14:14:45 2008 @@ -534,7 +534,7 @@ } -NTSTATUS STDCALL +NTSTATUS NTAPI CdfsFileSystemControl(PDEVICE_OBJECT DeviceObject, PIRP Irp) { Modified: trunk/reactos/drivers/filesystems/cdfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/rw.c [iso-8859-1] Sat Nov 29 14:14:45 2008 @@ -178,7 +178,7 @@ } -NTSTATUS STDCALL +NTSTATUS NTAPI CdfsRead(PDEVICE_OBJECT DeviceObject, PIRP Irp) { @@ -229,7 +229,7 @@ } -NTSTATUS STDCALL +NTSTATUS NTAPI CdfsWrite(PDEVICE_OBJECT DeviceObject, PIRP Irp) { Modified: trunk/reactos/drivers/filesystems/cdfs/volinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/v… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/volinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/volinfo.c [iso-8859-1] Sat Nov 29 14:14:45 2008 @@ -162,7 +162,7 @@ } -NTSTATUS STDCALL +NTSTATUS NTAPI CdfsQueryVolumeInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp) { @@ -223,7 +223,7 @@ } -NTSTATUS STDCALL +NTSTATUS NTAPI CdfsSetVolumeInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp) { Modified: trunk/reactos/drivers/filesystems/ext2/inc/protos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/i… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/inc/protos.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/inc/protos.h [iso-8859-1] Sat Nov 29 14:14:45 2008 @@ -22,27 +22,27 @@ /************************************************************************* * Prototypes for the file sfsdinit.c *************************************************************************/ -extern NTSTATUS STDCALL DriverEntry( +extern NTSTATUS NTAPI DriverEntry( PDRIVER_OBJECT DriverObject, // created by the I/O sub-system PUNICODE_STRING RegistryPath); // path to the registry key -extern void STDCALL Ext2FsdInitializeFunctionPointers( +extern void NTAPI Ext2FsdInitializeFunctionPointers( PDRIVER_OBJECT DriverObject); // created by the I/O sub-system -extern VOID STDCALL Ext2QueueHandlerThread( +extern VOID NTAPI Ext2QueueHandlerThread( IN PVOID StartContext); /************************************************************************* * Prototypes for the file fsctrl.c *************************************************************************/ -extern NTSTATUS STDCALL Ext2FileSystemControl( +extern NTSTATUS NTAPI Ext2FileSystemControl( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp ); -extern NTSTATUS STDCALL Ext2VerifyVolume ( +extern NTSTATUS NTAPI Ext2VerifyVolume ( IN PIRP Irp, IN PIO_STACK_LOCATION IrpSp ); @@ -50,16 +50,16 @@ /************************************************************************* * Prototypes for the file create.c *************************************************************************/ -extern NTSTATUS STDCALL Ext2Create( +extern NTSTATUS NTAPI Ext2Create( PDEVICE_OBJECT DeviceObject, // the logical volume device object PIRP Irp); // I/O Request Packet -extern NTSTATUS STDCALL Ext2CommonCreate( +extern NTSTATUS NTAPI Ext2CommonCreate( PtrExt2IrpContext PtrIrpContext, PIRP PtrIrp, BOOLEAN FirstAttempt ); -extern NTSTATUS STDCALL Ext2OpenVolume( +extern NTSTATUS NTAPI Ext2OpenVolume( PtrExt2VCB PtrVCB, // volume to be opened PtrExt2IrpContext PtrIrpContext, // IRP context PIRP PtrIrp, // original/user IRP @@ -67,7 +67,7 @@ PIO_SECURITY_CONTEXT PtrSecurityContext, // caller's context (incl access) PFILE_OBJECT PtrNewFileObject); // I/O Mgr. created file object -extern NTSTATUS STDCALL Ext2OpenRootDirectory( +extern NTSTATUS NTAPI Ext2OpenRootDirectory( PtrExt2VCB PtrVCB, // volume to be opened PtrExt2IrpContext PtrIrpContext, // IRP context PIRP PtrIrp, // original/user IRP @@ -75,90 +75,90 @@ PIO_SECURITY_CONTEXT PtrSecurityContext, // caller's context (incl access) PFILE_OBJECT PtrNewFileObject); // I/O Mgr. created file object -extern void STDCALL Ext2InitializeFCB( +extern void NTAPI Ext2InitializeFCB( PtrExt2FCB PtrNewFCB, // FCB structure to be initialized PtrExt2VCB PtrVCB, // logical volume (VCB) pointer PtrExt2ObjectName PtrObjectName, // name of the object uint32 Flags, // is this a file/directory, etc. PFILE_OBJECT PtrFileObject);// optional file object to be initialized -extern PtrExt2FCB STDCALL Ext2LocateChildFCBInCore( +extern PtrExt2FCB NTAPI Ext2LocateChildFCBInCore( PtrExt2VCB PtrVCB, PUNICODE_STRING PtrName, ULONG ParentInodeNo ); -extern PtrExt2FCB STDCALL Ext2LocateFCBInCore( +extern PtrExt2FCB NTAPI Ext2LocateFCBInCore( PtrExt2VCB PtrVCB, ULONG InodeNo ); -extern ULONG STDCALL Ext2LocateFileInDisk( +extern ULONG NTAPI Ext2LocateFileInDisk( PtrExt2VCB PtrVCB, PUNICODE_STRING PtrCurrentName, PtrExt2FCB PtrParentFCB, ULONG *Type ); -extern ULONG STDCALL Ext2CreateFile( +extern ULONG NTAPI Ext2CreateFile( PtrExt2IrpContext PtrIrpContext, PtrExt2VCB PtrVCB, PUNICODE_STRING PtrName, PtrExt2FCB PtrParentFCB, ULONG Type); -extern BOOLEAN STDCALL Ext2OverwriteFile( +extern BOOLEAN NTAPI Ext2OverwriteFile( PtrExt2FCB PtrFCB, PtrExt2IrpContext PtrIrpContext); -extern BOOLEAN STDCALL Ext2SupersedeFile( +extern BOOLEAN NTAPI Ext2SupersedeFile( PtrExt2FCB PtrFCB, PtrExt2IrpContext PtrIrpContext); /************************************************************************* * Prototypes for the file misc.c *************************************************************************/ -extern NTSTATUS STDCALL Ext2InitializeZones( +extern NTSTATUS NTAPI Ext2InitializeZones( void); -extern void STDCALL Ext2DestroyZones( +extern void NTAPI Ext2DestroyZones( void); -extern BOOLEAN STDCALL Ext2IsIrpTopLevel( +extern BOOLEAN NTAPI Ext2IsIrpTopLevel( PIRP Irp); // the IRP sent to our dispatch routine -extern long STDCALL Ext2ExceptionFilter( +extern long NTAPI Ext2ExceptionFilter( PtrExt2IrpContext PtrIrpContext, PEXCEPTION_POINTERS PtrExceptionPointers); -extern NTSTATUS STDCALL Ext2ExceptionHandler( +extern NTSTATUS NTAPI Ext2ExceptionHandler( PtrExt2IrpContext PtrIrpContext, PIRP Irp); -extern void STDCALL Ext2LogEvent( +extern void NTAPI Ext2LogEvent( NTSTATUS Ext2EventLogId, // the Ext2 private message id NTSTATUS RC); // any NT error code we wish to log ... -extern PtrExt2ObjectName STDCALL Ext2AllocateObjectName( +extern PtrExt2ObjectName NTAPI Ext2AllocateObjectName( void); -extern void STDCALL Ext2ReleaseObjectName( +extern void NTAPI Ext2ReleaseObjectName( PtrExt2ObjectName PtrObjectName); -extern PtrExt2CCB STDCALL Ext2AllocateCCB( +extern PtrExt2CCB NTAPI Ext2AllocateCCB( void ); -extern PtrExt2FCB STDCALL Ext2GetUsedFCB( +extern PtrExt2FCB NTAPI Ext2GetUsedFCB( PtrExt2VCB PtrVCB ); -extern BOOLEAN STDCALL Ext2CloseClosableFCB( +extern BOOLEAN NTAPI Ext2CloseClosableFCB( PtrExt2FCB PtrFCB ); -extern void STDCALL Ext2ReleaseCCB( +extern void NTAPI Ext2ReleaseCCB( PtrExt2CCB PtrCCB); -extern PtrExt2FCB STDCALL Ext2AllocateFCB( +extern PtrExt2FCB NTAPI Ext2AllocateFCB( void); -extern NTSTATUS STDCALL Ext2CreateNewFCB( +extern NTSTATUS NTAPI Ext2CreateNewFCB( PtrExt2FCB *ReturnedFCB, LARGE_INTEGER AllocationSize, LARGE_INTEGER EndOfFile, @@ -166,106 +166,106 @@ PtrExt2VCB PtrVCB, PtrExt2ObjectName PtrObjectName); -extern NTSTATUS STDCALL Ext2CreateNewCCB( +extern NTSTATUS NTAPI Ext2CreateNewCCB( PtrExt2CCB *ReturnedCCB, PtrExt2FCB PtrFCB, PFILE_OBJECT PtrFileObject); -extern void STDCALL Ext2ReleaseFCB( +extern void NTAPI Ext2ReleaseFCB( PtrExt2FCB PtrFCB); -extern PtrExt2FileLockInfo STDCALL Ext2AllocateByteLocks( +extern PtrExt2FileLockInfo NTAPI Ext2AllocateByteLocks( void); -extern void STDCALL Ext2ReleaseByteLocks( +extern void NTAPI Ext2ReleaseByteLocks( PtrExt2FileLockInfo PtrByteLocks); -extern PtrExt2IrpContext STDCALL Ext2AllocateIrpContext( +extern PtrExt2IrpContext NTAPI Ext2AllocateIrpContext( PIRP Irp, PDEVICE_OBJECT PtrTargetDeviceObject); -extern void STDCALL Ext2ReleaseIrpContext( +extern void NTAPI Ext2ReleaseIrpContext( PtrExt2IrpContext PtrIrpContext); -extern NTSTATUS STDCALL Ext2PostRequest( +extern NTSTATUS NTAPI Ext2PostRequest( PtrExt2IrpContext PtrIrpContext, PIRP PtrIrp); -extern void STDCALL Ext2CommonDispatch( +extern void NTAPI Ext2CommonDispatch( void *Context); // actually an IRPContext structure -extern void STDCALL Ext2InitializeVCB( +extern void NTAPI Ext2InitializeVCB( PDEVICE_OBJECT PtrVolumeDeviceObject, PDEVICE_OBJECT PtrTargetDeviceObject, PVPB PtrVPB, PLARGE_INTEGER AllocationSize); -extern void STDCALL Ext2CompleteRequest( +extern void NTAPI Ext2CompleteRequest( IN PIRP Irp OPTIONAL, IN NTSTATUS Status ); -extern NTSTATUS STDCALL Ext2DenyAccess( +extern NTSTATUS NTAPI Ext2DenyAccess( IN PIRP Irp ); -extern NTSTATUS STDCALL Ext2GetFCB_CCB_VCB_FromFileObject( +extern NTSTATUS NTAPI Ext2GetFCB_CCB_VCB_FromFileObject( IN PFILE_OBJECT PtrFileObject, OUT PtrExt2FCB *PPtrFCB, OUT PtrExt2CCB *PPtrCCB, OUT PtrExt2VCB *PPtrVCB ); -extern void STDCALL Ext2CopyUnicodeString( +extern void NTAPI Ext2CopyUnicodeString( IN OUT PUNICODE_STRING PtrDestinationString, IN PUNICODE_STRING PtrSourceString ); -extern void STDCALL Ext2CopyWideCharToUnicodeString( +extern void NTAPI Ext2CopyWideCharToUnicodeString( IN OUT PUNICODE_STRING PtrDestinationString, IN PCWSTR PtrSourceString ); -extern void STDCALL Ext2CopyCharToUnicodeString( +extern void NTAPI Ext2CopyCharToUnicodeString( IN OUT PUNICODE_STRING PtrDestinationString, IN PCSTR PtrSourceString, IN USHORT SourceStringLength ); -extern void STDCALL Ext2CopyZCharToUnicodeString( +extern void NTAPI Ext2CopyZCharToUnicodeString( IN OUT PUNICODE_STRING PtrDestinationString, IN PCSTR PtrSourceString ); -extern void STDCALL Ext2DeallocateUnicodeString( +extern void NTAPI Ext2DeallocateUnicodeString( PUNICODE_STRING PtrUnicodeString ); -extern void STDCALL Ext2ZerooutUnicodeString( +extern void NTAPI Ext2ZerooutUnicodeString( PUNICODE_STRING PtrUnicodeString ); -extern BOOLEAN STDCALL Ext2SaveBCB( +extern BOOLEAN NTAPI Ext2SaveBCB( PtrExt2IrpContext PtrIrpContext, PBCB PtrBCB, PFILE_OBJECT PtrFileObject); -extern BOOLEAN STDCALL Ext2FlushSavedBCBs( +extern BOOLEAN NTAPI Ext2FlushSavedBCBs( PtrExt2IrpContext PtrIrpContext); -extern BOOLEAN STDCALL AssertBCB( +extern BOOLEAN NTAPI AssertBCB( PBCB PtrBCB); -extern ULONG STDCALL Ext2Align( +extern ULONG NTAPI Ext2Align( ULONG NumberToBeAligned, ULONG Alignment); -extern LONGLONG STDCALL Ext2Align64( +extern LONGLONG NTAPI Ext2Align64( LONGLONG NumberToBeAligned, LONGLONG Alignment); -extern ULONG STDCALL Ext2GetCurrentTime(); +extern ULONG NTAPI Ext2GetCurrentTime(); /************************************************************************* * Prototypes for the file cleanup.c *************************************************************************/ -extern NTSTATUS STDCALL Ext2Cleanup( +extern NTSTATUS NTAPI Ext2Cleanup( PDEVICE_OBJECT DeviceObject, // the logical volume device object PIRP Irp); // I/O Request Packet -extern NTSTATUS STDCALL Ext2CommonCleanup( +extern NTSTATUS NTAPI Ext2CommonCleanup( PtrExt2IrpContext PtrIrpContext, PIRP PtrIrp, BOOLEAN FirstAttempt ); @@ -273,11 +273,11 @@ /************************************************************************* * Prototypes for the file close.c *************************************************************************/ -extern NTSTATUS STDCALL Ext2Close( +extern NTSTATUS NTAPI Ext2Close( PDEVICE_OBJECT DeviceObject, // the logical volume device object PIRP Irp); // I/O Request Packet -extern NTSTATUS STDCALL Ext2CommonClose( +extern NTSTATUS NTAPI Ext2CommonClose( PtrExt2IrpContext PtrIrpContext, PIRP PtrIrp, BOOLEAN FirstAttempt ); @@ -285,24 +285,24 @@ /************************************************************************* * Prototypes for the file read.c *************************************************************************/ -extern NTSTATUS STDCALL Ext2Read( +extern NTSTATUS NTAPI Ext2Read( PDEVICE_OBJECT DeviceObject, // the logical volume device object PIRP Irp); // I/O Request Packet -extern NTSTATUS STDCALL Ext2CommonRead( +extern NTSTATUS NTAPI Ext2CommonRead( PtrExt2IrpContext PtrIrpContext, PIRP PtrIrp, BOOLEAN FirstAttempt ); -extern void * STDCALL Ext2GetCallersBuffer( +extern void * NTAPI Ext2GetCallersBuffer( PIRP PtrIrp); -extern NTSTATUS STDCALL Ext2LockCallersBuffer( +extern NTSTATUS NTAPI Ext2LockCallersBuffer( PIRP PtrIrp, BOOLEAN IsReadOperation, uint32 Length); -extern void STDCALL Ext2MdlComplete( +extern void NTAPI Ext2MdlComplete( PtrExt2IrpContext PtrIrpContext, PIRP PtrIrp, PIO_STACK_LOCATION PtrIoStackLocation, @@ -311,57 +311,57 @@ /************************************************************************* * Prototypes for the file write.c *************************************************************************/ -extern NTSTATUS STDCALL Ext2Write( +extern NTSTATUS NTAPI Ext2Write( PDEVICE_OBJECT DeviceObject, // the logical volume device object PIRP Irp); // I/O Request Packet -extern NTSTATUS STDCALL Ext2CommonWrite( +extern NTSTATUS NTAPI Ext2CommonWrite( PtrExt2IrpContext PtrIrpContext, PIRP PtrIrp); -extern void STDCALL Ext2DeferredWriteCallBack ( +extern void NTAPI Ext2DeferredWriteCallBack ( void *Context1, // Should be PtrIrpContext void *Context2); // Should be PtrIrp /************************************************************************* * Prototypes for the file fileinfo.c *************************************************************************/ -extern NTSTATUS STDCALL Ext2FileInfo( +extern NTSTATUS NTAPI Ext2FileInfo( PDEVICE_OBJECT DeviceObject, // the logical volume device object PIRP Irp); // I/O Request Packet -extern NTSTATUS STDCALL Ext2CommonFileInfo( +extern NTSTATUS NTAPI Ext2CommonFileInfo( PtrExt2IrpContext PtrIrpContext, PIRP PtrIrp); -extern NTSTATUS STDCALL Ext2GetBasicInformation( +extern NTSTATUS NTAPI Ext2GetBasicInformation( PtrExt2FCB PtrFCB, PFILE_BASIC_INFORMATION PtrBuffer, long *PtrReturnedLength); -extern NTSTATUS STDCALL Ext2GetStandardInformation( +extern NTSTATUS NTAPI Ext2GetStandardInformation( PtrExt2FCB PtrFCB, PFILE_STANDARD_INFORMATION PtrStdInformation, long *PtrReturnedLength); -extern NTSTATUS STDCALL Ext2GetNetworkOpenInformation( +extern NTSTATUS NTAPI Ext2GetNetworkOpenInformation( PtrExt2FCB PtrFCB, PFILE_NETWORK_OPEN_INFORMATION PtrNetworkOpenInformation, long *PtrReturnedLength ); -extern NTSTATUS STDCALL Ext2GetFullNameInformation( +extern NTSTATUS NTAPI Ext2GetFullNameInformation( PtrExt2FCB PtrFCB, PtrExt2CCB PtrCCB, PFILE_NAME_INFORMATION PtrNameInformation, long *PtrReturnedLength); -extern NTSTATUS STDCALL Ext2SetBasicInformation( +extern NTSTATUS NTAPI Ext2SetBasicInformation( PtrExt2IrpContext PtrIrpContext, PtrExt2FCB PtrFCB, PFILE_OBJECT PtrFileObject, PFILE_BASIC_INFORMATION PtrFileInformation ); -extern NTSTATUS STDCALL Ext2SetDispositionInformation( +extern NTSTATUS NTAPI Ext2SetDispositionInformation( PtrExt2FCB PtrFCB, PtrExt2CCB PtrCCB, PtrExt2VCB PtrVCB, @@ -370,7 +370,7 @@ PIRP PtrIrp, PFILE_DISPOSITION_INFORMATION PtrBuffer); -extern NTSTATUS STDCALL Ext2SetAllocationInformation( +extern NTSTATUS NTAPI Ext2SetAllocationInformation( PtrExt2FCB PtrFCB, PtrExt2CCB PtrCCB, PtrExt2VCB PtrVCB, @@ -382,24 +382,24 @@ /************************************************************************* * Prototypes for the file flush.c *************************************************************************/ -extern NTSTATUS STDCALL Ext2Flush( +extern NTSTATUS NTAPI Ext2Flush( PDEVICE_OBJECT DeviceObject, // the logical volume device object PIRP Irp); // I/O Request Packet -extern NTSTATUS STDCALL Ext2CommonFlush( +extern NTSTATUS NTAPI Ext2CommonFlush( PtrExt2IrpContext PtrIrpContext, PIRP PtrIrp); -extern void STDCALL Ext2FlushAFile( +extern void NTAPI Ext2FlushAFile( PtrExt2NTRequiredFCB PtrReqdFCB, PIO_STATUS_BLOCK PtrIoStatus); -extern void STDCALL Ext2FlushLogicalVolume( +extern void NTAPI Ext2FlushLogicalVolume( PtrExt2IrpContext PtrIrpContext, PIRP PtrIrp, PtrExt2VCB PtrVCB); -extern NTSTATUS STDCALL Ext2FlushCompletion( +extern NTSTATUS NTAPI Ext2FlushCompletion( PDEVICE_OBJECT PtrDeviceObject, PIRP PtrIrp, PVOID Context); @@ -407,15 +407,15 @@ /************************************************************************* * Prototypes for the file dircntrl.c *************************************************************************/ -extern NTSTATUS STDCALL Ext2DirControl( +extern NTSTATUS NTAPI Ext2DirControl( PDEVICE_OBJECT DeviceObject, // the logical volume device object PIRP Irp); // I/O Request Packet -extern NTSTATUS STDCALL Ext2CommonDirControl( +extern NTSTATUS NTAPI Ext2CommonDirControl( PtrExt2IrpContext PtrIrpContext, PIRP PtrIrp); -extern NTSTATUS STDCALL Ext2QueryDirectory( +extern NTSTATUS NTAPI Ext2QueryDirectory( PtrExt2IrpContext PtrIrpContext, PIRP PtrIrp, PEXTENDED_IO_STACK_LOCATION PtrIoStackLocation, @@ -423,7 +423,7 @@ PtrExt2FCB PtrFCB, PtrExt2CCB PtrCCB); -extern NTSTATUS STDCALL Ext2NotifyChangeDirectory( +extern NTSTATUS NTAPI Ext2NotifyChangeDirectory( PtrExt2IrpContext PtrIrpContext, PIRP PtrIrp, PEXTENDED_IO_STACK_LOCATION PtrIoStackLocation, @@ -434,41 +434,41 @@ /************************************************************************* * Prototypes for the file devcntrl.c *************************************************************************/ -extern NTSTATUS STDCALL Ext2DeviceControl( +extern NTSTATUS NTAPI Ext2DeviceControl( PDEVICE_OBJECT DeviceObject, // the logical volume device object PIRP Irp); // I/O Request Packet -extern NTSTATUS STDCALL Ext2CommonDeviceControl( +extern NTSTATUS NTAPI Ext2CommonDeviceControl( PtrExt2IrpContext PtrIrpContext, PIRP PtrIrp); -extern NTSTATUS STDCALL Ext2DevIoctlCompletion( +extern NTSTATUS NTAPI Ext2DevIoctlCompletion( PDEVICE_OBJECT PtrDeviceObject, PIRP PtrIrp, void *Context); -extern NTSTATUS STDCALL Ext2HandleQueryPath( +extern NTSTATUS NTAPI Ext2HandleQueryPath( void *BufferPointer); /************************************************************************* * Prototypes for the file shutdown.c *************************************************************************/ -extern NTSTATUS STDCALL Ext2Shutdown( +extern NTSTATUS NTAPI Ext2Shutdown( PDEVICE_OBJECT DeviceObject, // the logical volume device object PIRP Irp); // I/O Request Packet -extern NTSTATUS STDCALL Ext2CommonShutdown( +extern NTSTATUS NTAPI Ext2CommonShutdown( PtrExt2IrpContext PtrIrpContext, PIRP PtrIrp); /************************************************************************* * Prototypes for the file volinfo.c *************************************************************************/ -extern NTSTATUS STDCALL Ext2QueryVolInfo( +extern NTSTATUS NTAPI Ext2QueryVolInfo( PDEVICE_OBJECT DeviceObject, // the logical volume device object PIRP Irp); // I/O Request Packet -NTSTATUS STDCALL Ext2SetVolInfo( +NTSTATUS NTAPI Ext2SetVolInfo( IN PDEVICE_OBJECT DeviceObject, // the logical volume device object IN PIRP Irp); // I/O Request Packet @@ -476,7 +476,7 @@ /************************************************************************* * Prototypes for the file fastio.c *************************************************************************/ -extern BOOLEAN STDCALL Ext2FastIoCheckIfPossible( +extern BOOLEAN NTAPI Ext2FastIoCheckIfPossible( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN ULONG Length, @@ -486,7 +486,7 @@ OUT PIO_STATUS_BLOCK IoStatus, IN PDEVICE_OBJECT DeviceObject); -extern BOOLEAN STDCALL Ext2FastIoRead( +extern BOOLEAN NTAPI Ext2FastIoRead( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN ULONG Length, @@ -496,7 +496,7 @@ OUT PIO_STATUS_BLOCK IoStatus, IN PDEVICE_OBJECT DeviceObject); -extern BOOLEAN STDCALL Ext2FastIoWrite( +extern BOOLEAN NTAPI Ext2FastIoWrite( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN ULONG Length, @@ -506,21 +506,21 @@ OUT PIO_STATUS_BLOCK IoStatus, IN PDEVICE_OBJECT DeviceObject); -extern BOOLEAN STDCALL Ext2FastIoQueryBasicInfo( +extern BOOLEAN NTAPI Ext2FastIoQueryBasicInfo( IN PFILE_OBJECT FileObject, IN BOOLEAN Wait, OUT PFILE_BASIC_INFORMATION Buffer, OUT PIO_STATUS_BLOCK IoStatus, IN PDEVICE_OBJECT DeviceObject); -extern BOOLEAN STDCALL Ext2FastIoQueryStdInfo( +extern BOOLEAN NTAPI Ext2FastIoQueryStdInfo( IN PFILE_OBJECT FileObject, IN BOOLEAN Wait, OUT PFILE_STANDARD_INFORMATION Buffer, OUT PIO_STATUS_BLOCK IoStatus, IN PDEVICE_OBJECT DeviceObject); -extern BOOLEAN STDCALL Ext2FastIoLock( +extern BOOLEAN NTAPI Ext2FastIoLock( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN PLARGE_INTEGER Length, @@ -531,7 +531,7 @@ OUT PIO_STATUS_BLOCK IoStatus, IN PDEVICE_OBJECT DeviceObject); -extern BOOLEAN STDCALL Ext2FastIoUnlockSingle( +extern BOOLEAN NTAPI Ext2FastIoUnlockSingle( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN PLARGE_INTEGER Length, @@ -540,50 +540,50 @@ OUT PIO_STATUS_BLOCK IoStatus, IN PDEVICE_OBJECT DeviceObject); -extern BOOLEAN STDCALL Ext2FastIoUnlockAll( +extern BOOLEAN NTAPI Ext2FastIoUnlockAll( IN PFILE_OBJECT FileObject, PEPROCESS ProcessId, OUT PIO_STATUS_BLOCK IoStatus, IN PDEVICE_OBJECT DeviceObject); -extern BOOLEAN STDCALL Ext2FastIoUnlockAllByKey( +extern BOOLEAN NTAPI Ext2FastIoUnlockAllByKey( IN PFILE_OBJECT FileObject, PEPROCESS ProcessId, ULONG Key, OUT PIO_STATUS_BLOCK IoStatus, IN PDEVICE_OBJECT DeviceObject); -extern void STDCALL Ext2FastIoAcqCreateSec( +extern void NTAPI Ext2FastIoAcqCreateSec( IN PFILE_OBJECT FileObject); -extern void STDCALL Ext2FastIoRelCreateSec( +extern void NTAPI Ext2FastIoRelCreateSec( IN PFILE_OBJECT FileObject); -extern BOOLEAN STDCALL Ext2AcqLazyWrite( +extern BOOLEAN NTAPI Ext2AcqLazyWrite( IN PVOID Context, IN BOOLEAN Wait); -extern void STDCALL Ext2RelLazyWrite( +extern void NTAPI Ext2RelLazyWrite( IN PVOID Context); -extern BOOLEAN STDCALL Ext2AcqReadAhead( +extern BOOLEAN NTAPI Ext2AcqReadAhead( IN PVOID Context, IN BOOLEAN Wait); -extern void STDCALL Ext2RelReadAhead( +extern void NTAPI Ext2RelReadAhead( IN PVOID Context); // the remaining are only valid under NT Version 4.0 and later #if(_WIN32_WINNT >= 0x0400) -extern BOOLEAN STDCALL Ext2FastIoQueryNetInfo( +extern BOOLEAN NTAPI Ext2FastIoQueryNetInfo( IN PFILE_OBJECT FileObject, IN BOOLEAN Wait, OUT PFILE_NETWORK_OPEN_INFORMATION Buffer, OUT PIO_STATUS_BLOCK IoStatus, IN PDEVICE_OBJECT DeviceObject); -extern BOOLEAN STDCALL Ext2FastIoMdlRead( +extern BOOLEAN NTAPI Ext2FastIoMdlRead( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN ULONG Length, @@ -592,12 +592,12 @@ OUT PIO_STATUS_BLOCK IoStatus, IN PDEVICE_OBJECT DeviceObject); -extern BOOLEAN STDCALL Ext2FastIoMdlReadComplete( +extern BOOLEAN NTAPI Ext2FastIoMdlReadComplete( IN PFILE_OBJECT FileObject, OUT PMDL MdlChain, IN PDEVICE_OBJECT DeviceObject); -extern BOOLEAN STDCALL Ext2FastIoPrepareMdlWrite( +extern BOOLEAN NTAPI Ext2FastIoPrepareMdlWrite( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN ULONG Length, @@ -606,28 +606,28 @@ OUT PIO_STATUS_BLOCK IoStatus, IN PDEVICE_OBJECT DeviceObject); -extern BOOLEAN STDCALL Ext2FastIoMdlWriteComplete( +extern BOOLEAN NTAPI Ext2FastIoMdlWriteComplete( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, OUT PMDL MdlChain, IN PDEVICE_OBJECT DeviceObject); -extern NTSTATUS STDCALL Ext2FastIoAcqModWrite( +extern NTSTATUS NTAPI Ext2FastIoAcqModWrite( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER EndingOffset, OUT PERESOURCE *ResourceToRelease, IN PDEVICE_OBJECT DeviceObject); -extern NTSTATUS STDCALL Ext2FastIoRelModWrite( +extern NTSTATUS NTAPI Ext2FastIoRelModWrite( IN PFILE_OBJECT FileObject, IN PERESOURCE ResourceToRelease, IN PDEVICE_OBJECT DeviceObject); -extern NTSTATUS STDCALL Ext2FastIoAcqCcFlush( -IN PFILE_OBJECT FileObject, -IN PDEVICE_OBJECT DeviceObject); - -extern NTSTATUS STDCALL Ext2FastIoRelCcFlush( +extern NTSTATUS NTAPI Ext2FastIoAcqCcFlush( +IN PFILE_OBJECT FileObject, +IN PDEVICE_OBJECT DeviceObject); + +extern NTSTATUS NTAPI Ext2FastIoRelCcFlush( IN PFILE_OBJECT FileObject, IN PDEVICE_OBJECT DeviceObject); @@ -636,13 +636,13 @@ /************************************************************************* * Prototypes for the file DiskIO.c *************************************************************************/ -extern NTSTATUS STDCALL Ext2ReadLogicalBlocks( +extern NTSTATUS NTAPI Ext2ReadLogicalBlocks( PDEVICE_OBJECT PtrTargetDeviceObject, // the Target Device Object VOID *Buffer, // The Buffer that takes the data read in LARGE_INTEGER StartLogicalBlock, // The logical block from which reading is to start unsigned int NoOfLogicalBlocks); // The no. of logical blocks to be read -extern NTSTATUS STDCALL Ext2ReadPhysicalBlocks( +extern NTSTATUS NTAPI Ext2ReadPhysicalBlocks( PDEVICE_OBJECT PtrTargetDeviceObject, // the Target Device Object VOID *Buffer, // The Buffer that takes the data read in LARGE_INTEGER StartBlock, // The Physical block from which reading is to start @@ -652,32 +652,32 @@ * Prototypes for the file metadata.c *************************************************************************/ -extern void STDCALL Ext2InitializeFCBInodeInfo ( +extern void NTAPI Ext2InitializeFCBInodeInfo ( PtrExt2FCB PtrFCB ); -extern NTSTATUS STDCALL Ext2ReadInode( +extern NTSTATUS NTAPI Ext2ReadInode( PtrExt2VCB PtrVcb, // the Volume Control Block uint32 InodeNo, // The Inode no PEXT2_INODE PtrInode ); // The Inode Buffer -extern NTSTATUS STDCALL Ext2WriteInode( +extern NTSTATUS NTAPI Ext2WriteInode( PtrExt2IrpContext PtrIrpContext, PtrExt2VCB PtrVcb, // the Volume Control Block uint32 InodeNo, // The Inode no PEXT2_INODE PtrInode // The Inode Buffer ); -extern ULONG STDCALL Ext2AllocInode( +extern ULONG NTAPI Ext2AllocInode( PtrExt2IrpContext PtrIrpContext, PtrExt2VCB PtrVCB, ULONG ParentINodeNo ); -extern BOOLEAN STDCALL Ext2DeallocInode( +extern BOOLEAN NTAPI Ext2DeallocInode( PtrExt2IrpContext PtrIrpContext, PtrExt2VCB PtrVCB, ULONG INodeNo ); -extern BOOLEAN STDCALL Ext2MakeNewDirectoryEntry( +extern BOOLEAN NTAPI Ext2MakeNewDirectoryEntry( PtrExt2IrpContext PtrIrpContext, // The Irp context PtrExt2FCB PtrParentFCB, // Parent Folder FCB PFILE_OBJECT PtrFileObject, // Parent Folder Object @@ -685,54 +685,54 @@ ULONG Type, // The type of the new entry ULONG NewInodeNo); // The inode no of the new entry... -extern BOOLEAN STDCALL Ext2FreeDirectoryEntry( +extern BOOLEAN NTAPI Ext2FreeDirectoryEntry( PtrExt2IrpContext PtrIrpContext, PtrExt2FCB PtrParentFCB, PUNICODE_STRING PtrName); -extern BOOLEAN STDCALL Ext2AddBlockToFile( +extern BOOLEAN NTAPI Ext2AddBlockToFile( PtrExt2IrpContext PtrIrpContext, PtrExt2VCB PtrVCB, PtrExt2FCB PtrFCB, PFILE_OBJECT PtrFileObject, BOOLEAN UpdateFileSize); -extern BOOLEAN STDCALL Ext2ReleaseDataBlocks( +extern BOOLEAN NTAPI Ext2ReleaseDataBlocks( PtrExt2FCB PtrFCB, PtrExt2IrpContext PtrIrpContext); -extern BOOLEAN STDCALL Ext2TruncateFileAllocationSize( +extern BOOLEAN NTAPI Ext2TruncateFileAllocationSize( PtrExt2IrpContext PtrIrpContext, PtrExt2FCB PtrFCB, PFILE_OBJECT PtrFileObject, PLARGE_INTEGER PtrAllocationSize ); -extern ULONG STDCALL Ext2AllocBlock( +extern ULONG NTAPI Ext2AllocBlock( PtrExt2IrpContext PtrIrpContext, PtrExt2VCB PtrVCB, ULONG Count); -extern BOOLEAN STDCALL Ext2DeallocBlock( +extern BOOLEAN NTAPI Ext2DeallocBlock( PtrExt2IrpContext PtrIrpContext, PtrExt2VCB PtrVCB, ULONG BlockNo); -extern BOOLEAN STDCALL Ext2UpdateFileSize( +extern BOOLEAN NTAPI Ext2UpdateFileSize( PtrExt2IrpContext PtrIrpContext, PFILE_OBJECT PtrFileObject, PtrExt2FCB PtrFCB); -extern BOOLEAN STDCALL Ext2DeleteFile( +extern BOOLEAN NTAPI Ext2DeleteFile( PtrExt2FCB PtrFCB, PtrExt2IrpContext PtrIrpContext); -extern BOOLEAN STDCALL Ext2IsDirectoryEmpty( +extern BOOLEAN NTAPI Ext2IsDirectoryEmpty( PtrExt2FCB PtrFCB, PtrExt2CCB PtrCCB, PtrExt2IrpContext PtrIrpContext); -extern NTSTATUS STDCALL Ext2RenameOrLinkFile( +extern NTSTATUS NTAPI Ext2RenameOrLinkFile( PtrExt2FCB PtrSourceFCB, PFILE_OBJECT PtrSourceFileObject, PtrExt2IrpContext PtrIrpContext, @@ -741,7 +741,7 @@ /************************************************************************* * Prototypes for the file io.c *************************************************************************/ -extern NTSTATUS STDCALL Ext2PassDownSingleReadWriteIRP( +extern NTSTATUS NTAPI Ext2PassDownSingleReadWriteIRP( PtrExt2IrpContext PtrIrpContext, PIRP PtrIrp, PtrExt2VCB PtrVCB, @@ -749,7 +749,7 @@ uint32 ReadWriteLength, BOOLEAN SynchronousIo); -extern NTSTATUS STDCALL Ext2PassDownMultiReadWriteIRP( +extern NTSTATUS NTAPI Ext2PassDownMultiReadWriteIRP( PEXT2_IO_RUN PtrIoRuns, UINT Count, ULONG TotalReadWriteLength, @@ -757,24 +757,24 @@ PtrExt2FCB PtrFCB, BOOLEAN SynchronousIo); -extern NTSTATUS STDCALL Ext2SingleSyncCompletionRoutine( +extern NTSTATUS NTAPI Ext2SingleSyncCompletionRoutine( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID Contxt ); -extern NTSTATUS STDCALL Ext2SingleAsyncCompletionRoutine ( +extern NTSTATUS NTAPI Ext2SingleAsyncCompletionRoutine ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID Contxt ); -extern NTSTATUS STDCALL Ext2MultiSyncCompletionRoutine( +extern NTSTATUS NTAPI Ext2MultiSyncCompletionRoutine( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID Contxt); -extern NTSTATUS STDCALL Ext2MultiAsyncCompletionRoutine( +extern NTSTATUS NTAPI Ext2MultiAsyncCompletionRoutine( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID Contxt); Modified: trunk/reactos/drivers/filesystems/fs_rec/fs_rec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/fs_rec.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fs_rec/fs_rec.c [iso-8859-1] Sat Nov 29 14:14:45 2008 @@ -76,7 +76,7 @@ DRIVER_DISPATCH FsRecCreate; NTSTATUS -STDCALL +NTAPI FsRecCreate(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { @@ -105,7 +105,7 @@ DRIVER_DISPATCH FsRecClose; NTSTATUS -STDCALL +NTAPI FsRecClose(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { @@ -118,7 +118,7 @@ DRIVER_DISPATCH FsRecFsControl; NTSTATUS -STDCALL +NTAPI FsRecFsControl(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { @@ -173,7 +173,7 @@ DRIVER_UNLOAD FsRecUnload; VOID -STDCALL +NTAPI FsRecUnload(IN PDRIVER_OBJECT DriverObject) { PAGED_CODE(); @@ -190,7 +190,7 @@ } NTSTATUS -STDCALL +NTAPI FsRecRegisterFs(IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT ParentObject OPTIONAL, OUT PDEVICE_OBJECT *NewDeviceObject OPTIONAL, Modified: trunk/reactos/drivers/filesystems/mup/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/mup/cr… ============================================================================== --- trunk/reactos/drivers/filesystems/mup/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/mup/create.c [iso-8859-1] Sat Nov 29 14:14:45 2008 @@ -37,7 +37,7 @@ /* FUNCTIONS ****************************************************************/ -NTSTATUS STDCALL +NTSTATUS NTAPI MupCreate(PDEVICE_OBJECT DeviceObject, PIRP Irp) { Modified: trunk/reactos/drivers/filesystems/mup/mup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/mup/mu… ============================================================================== --- trunk/reactos/drivers/filesystems/mup/mup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/mup/mup.c [iso-8859-1] Sat Nov 29 14:14:45 2008 @@ -40,7 +40,7 @@ /* FUNCTIONS ****************************************************************/ -NTSTATUS STDCALL +NTSTATUS NTAPI DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath) /* Modified: trunk/reactos/drivers/filesystems/mup/mup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/mup/mu… ============================================================================== --- trunk/reactos/drivers/filesystems/mup/mup.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/mup/mup.h [iso-8859-1] Sat Nov 29 14:14:45 2008 @@ -19,13 +19,13 @@ /* create.c */ DRIVER_DISPATCH MupCreate; -NTSTATUS STDCALL +NTSTATUS NTAPI MupCreate(PDEVICE_OBJECT DeviceObject, PIRP Irp); /* mup.c */ -NTSTATUS STDCALL +NTSTATUS NTAPI DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath); Modified: trunk/reactos/drivers/filesystems/npfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/create.c [iso-8859-1] Sat Nov 29 14:14:45 2008 @@ -103,7 +103,7 @@ } -NTSTATUS STDCALL +NTSTATUS NTAPI NpfsCreate(PDEVICE_OBJECT DeviceObject, PIRP Irp) { @@ -308,7 +308,7 @@ } -NTSTATUS STDCALL +NTSTATUS NTAPI NpfsCreateNamedPipe(PDEVICE_OBJECT DeviceObject, PIRP Irp) { @@ -555,7 +555,7 @@ } -NTSTATUS STDCALL +NTSTATUS NTAPI NpfsCleanup(PDEVICE_OBJECT DeviceObject, PIRP Irp) { @@ -691,7 +691,7 @@ return STATUS_SUCCESS; } -NTSTATUS STDCALL +NTSTATUS NTAPI NpfsClose(PDEVICE_OBJECT DeviceObject, PIRP Irp) { Modified: trunk/reactos/drivers/filesystems/npfs/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/finfo.c [iso-8859-1] Sat Nov 29 14:14:45 2008 @@ -152,7 +152,7 @@ } -NTSTATUS STDCALL +NTSTATUS NTAPI NpfsQueryInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp) { @@ -222,7 +222,7 @@ } -NTSTATUS STDCALL +NTSTATUS NTAPI NpfsSetInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp) { Modified: trunk/reactos/drivers/filesystems/npfs/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/fsctrl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/fsctrl.c [iso-8859-1] Sat Nov 29 14:14:45 2008 @@ -17,7 +17,7 @@ /* FUNCTIONS *****************************************************************/ static DRIVER_CANCEL NpfsListeningCancelRoutine; -static VOID STDCALL +static VOID NTAPI NpfsListeningCancelRoutine(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { @@ -406,7 +406,7 @@ } -NTSTATUS STDCALL +NTSTATUS NTAPI NpfsFileSystemControl(PDEVICE_OBJECT DeviceObject, PIRP Irp) { @@ -523,7 +523,7 @@ } -NTSTATUS STDCALL +NTSTATUS NTAPI NpfsFlushBuffers(PDEVICE_OBJECT DeviceObject, PIRP Irp) { Modified: trunk/reactos/drivers/filesystems/npfs/npfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/npfs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/npfs.c [iso-8859-1] Sat Nov 29 14:14:45 2008 @@ -15,7 +15,7 @@ /* FUNCTIONS *****************************************************************/ -NTSTATUS STDCALL +NTSTATUS NTAPI DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath) { Modified: trunk/reactos/drivers/filesystems/npfs/npfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/npfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/npfs.h [iso-8859-1] Sat Nov 29 14:14:45 2008 @@ -99,39 +99,39 @@ #define PAGE_ROUND_UP(x) ( (((ULONG_PTR)x)%PAGE_SIZE) ? ((((ULONG_PTR)x)&(~(PAGE_SIZE-1)))+PAGE_SIZE) : ((ULONG_PTR)x) ) DRIVER_DISPATCH NpfsCreate; -NTSTATUS STDCALL NpfsCreate(PDEVICE_OBJECT DeviceObject, PIRP Irp); +NTSTATUS NTAPI NpfsCreate(PDEVICE_OBJECT DeviceObject, PIRP Irp); DRIVER_DISPATCH NpfsCreateNamedPipe; -NTSTATUS STDCALL NpfsCreateNamedPipe(PDEVICE_OBJECT DeviceObject, PIRP Irp); +NTSTATUS NTAPI NpfsCreateNamedPipe(PDEVICE_OBJECT DeviceObject, PIRP Irp); DRIVER_DISPATCH NpfsCleanup; -NTSTATUS STDCALL NpfsCleanup(PDEVICE_OBJECT DeviceObject, PIRP Irp); +NTSTATUS NTAPI NpfsCleanup(PDEVICE_OBJECT DeviceObject, PIRP Irp); DRIVER_DISPATCH NpfsClose; -NTSTATUS STDCALL NpfsClose(PDEVICE_OBJECT DeviceObject, PIRP Irp); +NTSTATUS NTAPI NpfsClose(PDEVICE_OBJECT DeviceObject, PIRP Irp); DRIVER_DISPATCH NpfsRead; -NTSTATUS STDCALL NpfsRead(PDEVICE_OBJECT DeviceObject, PIRP Irp); +NTSTATUS NTAPI NpfsRead(PDEVICE_OBJECT DeviceObject, PIRP Irp); DRIVER_DISPATCH NpfsWrite; -NTSTATUS STDCALL NpfsWrite(PDEVICE_OBJECT DeviceObject, PIRP Irp); +NTSTATUS NTAPI NpfsWrite(PDEVICE_OBJECT DeviceObject, PIRP Irp); DRIVER_DISPATCH NpfsFlushBuffers; -NTSTATUS STDCALL NpfsFlushBuffers(PDEVICE_OBJECT DeviceObject, PIRP Irp); +NTSTATUS NTAPI NpfsFlushBuffers(PDEVICE_OBJECT DeviceObject, PIRP Irp); DRIVER_DISPATCH NpfsFileSystemControl; -NTSTATUS STDCALL NpfsFileSystemControl(PDEVICE_OBJECT DeviceObject, PIRP Irp); +NTSTATUS NTAPI NpfsFileSystemControl(PDEVICE_OBJECT DeviceObject, PIRP Irp); DRIVER_DISPATCH NpfsQueryInformation; -NTSTATUS STDCALL NpfsQueryInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp); +NTSTATUS NTAPI NpfsQueryInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp); DRIVER_DISPATCH NpfsSetInformation; -NTSTATUS STDCALL NpfsSetInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp); +NTSTATUS NTAPI NpfsSetInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp); DRIVER_DISPATCH NpfsQueryVolumeInformation; -NTSTATUS STDCALL NpfsQueryVolumeInformation (PDEVICE_OBJECT DeviceObject, PIRP Irp); +NTSTATUS NTAPI NpfsQueryVolumeInformation (PDEVICE_OBJECT DeviceObject, PIRP Irp); -NTSTATUS STDCALL +NTSTATUS NTAPI DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath); Modified: trunk/reactos/drivers/filesystems/npfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/rw.c [iso-8859-1] Sat Nov 29 14:14:45 2008 @@ -44,7 +44,7 @@ #endif static DRIVER_CANCEL NpfsReadWriteCancelRoutine; -static VOID STDCALL +static VOID NTAPI NpfsReadWriteCancelRoutine(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { @@ -92,7 +92,7 @@ } } -static VOID STDCALL +static VOID NTAPI NpfsWaiterThread(PVOID InitContext) { PNPFS_THREAD_CONTEXT ThreadContext = (PNPFS_THREAD_CONTEXT) InitContext; @@ -288,7 +288,7 @@ return Status; } -NTSTATUS STDCALL +NTSTATUS NTAPI NpfsRead(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { @@ -599,7 +599,7 @@ return Status; } -NTSTATUS STDCALL +NTSTATUS NTAPI NpfsWrite(PDEVICE_OBJECT DeviceObject, PIRP Irp) { Modified: trunk/reactos/drivers/filesystems/npfs/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/v… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/volume.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/volume.c [iso-8859-1] Sat Nov 29 14:14:45 2008 @@ -59,7 +59,7 @@ } -NTSTATUS STDCALL +NTSTATUS NTAPI NpfsQueryVolumeInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp) {

15 years, 9 months

[greatlrd] 37741: cleanup the code a bit in DdCreateSurface and comment up what left todo

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat Nov 29 14:10:56 2008 New Revision: 37741 URL: http://svn.reactos.org/svn/reactos?rev=37741&view=rev Log: cleanup the code a bit in DdCreateSurface and comment up what left todo Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/gdi32/… ============================================================================== --- branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] Sat Nov 29 14:10:56 2008 @@ -437,7 +437,6 @@ { LPDDRAWI_DDRAWSURFACE_LCL lcl = pCreateSurface->lplpSList[0]; - /* Fixme for opengl hel emulations */ DPRINT1("DdCreateSurface entered\n"); pCreateSurface->ddRVal = DD_OK; @@ -451,7 +450,6 @@ hrc = IWineD3DDevice_GetDisplayMode(pWineD3DDevice, 0, &Mode); if(FAILED(hrc)) { - if ((lcl->dwFlags & DDRAWISURF_HASPIXELFORMAT) == 0) { switch(pCreateSurface->lpDD->vmiData.ddpfDisplay.dwRGBBitCount) @@ -527,7 +525,6 @@ if (pCreateSurface->ddRVal == DD_OK) { - for (i=0;i<SurfaceCount;i++) { @@ -536,41 +533,66 @@ object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IWineD3DSurface)); if (NULL == object) { - DPRINT1("Allocation of memory failed\n"); pCreateSurface->ddRVal = DDERR_OUTOFVIDEOMEMORY; break; } lcl->hDDSurface = (ULONG_PTR) object; } - - if ( pCreateSurface->ddRVal == DD_OK) + } + + if ( pCreateSurface->ddRVal == DD_OK) + { + for (i=0;i<SurfaceCount;i++) { - for (i=0;i<SurfaceCount;i++) - { - LPDDRAWI_DDRAWSURFACE_LCL lcl = pCreateSurface->lplpSList[i]; - - hrc = IWineD3DDevice_CreateSurface(pWineD3DDevice, - Mode.Width, - Mode.Height, - Mode.Format, - TRUE /* Lockable */, - FALSE /* Discard */, - i, - (IWineD3DSurface **)&lcl->hDDSurface, - WINED3DRTYPE_SURFACE, /**/ - WINED3DUSAGE_DYNAMIC & WINED3DUSAGE_MASK, - WINED3DPOOL_DEFAULT, - WINED3DMULTISAMPLE_NONE, - 0 /* MultiSampleQuality */, - 0 /* SharedHandle */, - SURFACE_OPENGL, - (IUnknown *)Parent); - } - if (hrc != D3D_OK ) - { - pCreateSurface->ddRVal = DDERR_GENERIC; - } + LPDDRAWI_DDRAWSURFACE_LCL lcl = pCreateSurface->lplpSList[i]; + + hrc = IWineD3DDevice_CreateSurface(pWineD3DDevice, + Mode.Width, + Mode.Height, + Mode.Format, + TRUE /* Lockable */, + FALSE /* Discard */, + i, + (IWineD3DSurface **)&lcl->hDDSurface, + WINED3DRTYPE_SURFACE, /**/ + WINED3DUSAGE_DYNAMIC & WINED3DUSAGE_MASK, + WINED3DPOOL_DEFAULT, + WINED3DMULTISAMPLE_NONE, + 0 /* MultiSampleQuality */, + 0 /* SharedHandle */, + SURFACE_OPENGL, + (IUnknown *)Parent); + } + if (hrc != D3D_OK ) + { + pCreateSurface->ddRVal = DDERR_GENERIC; } + } + + /* FIXME see look at wine ddraw file ddraw how this thing works and in functions IDirectDrawImpl_CreateSurface */ + + /* FIXME some way check see if it frist time to create primary surface */ + if ( (desc2.ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE)) ) + { + /* FIXME see wine ddraw/ddraw.c setup IDirectDrawImpl_AttachD3DDevice */ + } + else + { + /* FIXME see wine ddraw/ddraw.c setup IDirectDrawImpl_CreateGDISwapChain */ + } + + if (desc2.ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP) + { + /* FIXME see wine ddraw/ddraw.c setup IWineD3DDevice_CreateCubeTexture */ + } + else + { + /* FIXME see wine ddraw/ddraw.c setup IWineD3DDevice_CreateTexture */ + } + + if (pCreateSurface->ddRVal != DD_OK) + { + /* FIXME free memory from lcl->hDDSurface when we fail */ } /* Return */

15 years, 9 months

[gschneider] 37740: - Updated msvcrt winetests introduced new printf testcases and new failures - fixed: - Special qualifiers with short gG formats may even skip all decimal digits, but the separator is applied nonetheless - Padding spaces on the right caused problems in exponential format, because those are split into two parts, the padding was done in between - Failing fwprintf test was removed from the tests, so the printf test is passed completely now

by gschneider＠svn.reactos.org

Author: gschneider Date: Sat Nov 29 13:39:53 2008 New Revision: 37740 URL: http://svn.reactos.org/svn/reactos?rev=37740&view=rev Log: - Updated msvcrt winetests introduced new printf testcases and new failures - fixed: - Special qualifiers with short gG formats may even skip all decimal digits, but the separator is applied nonetheless - Padding spaces on the right caused problems in exponential format, because those are split into two parts, the padding was done in between - Failing fwprintf test was removed from the tests, so the printf test is passed completely now Modified: trunk/reactos/lib/sdk/crt/stdio/lnx_sprintf.c Modified: trunk/reactos/lib/sdk/crt/stdio/lnx_sprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/lnx_spri… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/lnx_sprintf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/lnx_sprintf.c [iso-8859-1] Sat Nov 29 13:39:53 2008 @@ -166,6 +166,7 @@ int i = 0; int j = 0; int ro = 0; + int isize; double frac, intr; double p; @@ -194,6 +195,7 @@ exp_sign -= 2; // g -> e and G -> E else exp_sign = 'f'; + if (type & SPECIAL) precision--; } if ( exp_sign == 'e' || exp_sign == 'E' ) @@ -210,6 +212,13 @@ /* size-5 because "e+abc" is going to follow */ buf = numberf(buf, end, num/pow(10.0L,(long double)e), 'f', size-5, precision, type); + isize = 4; + while(*(buf-1) == ' ') + { + isize++; + --buf; + } + if (buf <= end) *buf = exp_sign; ++buf; @@ -217,7 +226,7 @@ ie = (long)e; type = LEFT | SIGN | PLUS; - buf = number(buf, end, ie, 10, 3, 3, type); + buf = number(buf, end, ie, 10, isize, 3, type); return buf; } @@ -259,15 +268,16 @@ digits[i] = (int)p + '0'; i--; } + i = precision; size -= precision; - - if ( precision >= 1 || type & SPECIAL) - { - digits[i++] = '.'; - size--; - } } + + if ( precision >= 1 || type & SPECIAL) + { + digits[i++] = '.'; + size--; + } ro = 0; if ( frac > 0.5 )

15 years, 9 months

[sginsberg] 37739: - Kill off ramdrv, it is deprecated since a long time ago. See issue #3422 for more details.

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Sat Nov 29 13:35:04 2008 New Revision: 37739 URL: http://svn.reactos.org/svn/reactos?rev=37739&view=rev Log: - Kill off ramdrv, it is deprecated since a long time ago. See issue #3422 for more details. Removed: trunk/rosapps/drivers/ramdrv/ Modified: trunk/rosapps/drivers/directory.rbuild Modified: trunk/rosapps/drivers/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/drivers/directory.rbuild?r… ============================================================================== --- trunk/rosapps/drivers/directory.rbuild [iso-8859-1] (original) +++ trunk/rosapps/drivers/directory.rbuild [iso-8859-1] Sat Nov 29 13:35:04 2008 @@ -7,8 +7,4 @@ <directory name="green"> <xi:include href="green/green.rbuild" /> </directory> - - <directory name="ramdrv"> - <xi:include href="ramdrv/ramdrv.rbuild" /> - </directory> </group>

15 years, 9 months

[greatlrd] 37738: sorry forget cleanup the code a bit in CReatesurface

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat Nov 29 13:24:40 2008 New Revision: 37738 URL: http://svn.reactos.org/svn/reactos?rev=37738&view=rev Log: sorry forget cleanup the code a bit in CReatesurface Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/gdi32/… ============================================================================== --- branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] Sat Nov 29 13:24:40 2008 @@ -445,14 +445,12 @@ lcl->lpGbl->wWidth = desc2.dwWidth; lcl->lpGbl->wHeight = desc2.dwHeight; lcl->lpGbl->dwLinearSize = desc2.dwLinearSize; - RtlCopyMemory(&lcl->lpGbl->ddpfSurface, &desc2.ddpfPixelFormat, sizeof(DDPIXELFORMAT)) + RtlCopyMemory(&lcl->lpGbl->ddpfSurface, &desc2.ddpfPixelFormat, sizeof(DDPIXELFORMAT)); /* Get the video mode from WineD3D - we will need it */ - hr = IWineD3DDevice_GetDisplayMode(pWineD3DDevice, 0, &Mode); - if(FAILED(hr)) + hrc = IWineD3DDevice_GetDisplayMode(pWineD3DDevice, 0, &Mode); + if(FAILED(hrc)) { - - ERR("Failed to read display mode from wined3d\n"); if ((lcl->dwFlags & DDRAWISURF_HASPIXELFORMAT) == 0) { @@ -527,7 +525,7 @@ } } - if (pCreateSurface->ddRVal = DD_OK) + if (pCreateSurface->ddRVal == DD_OK) { @@ -551,7 +549,6 @@ { LPDDRAWI_DDRAWSURFACE_LCL lcl = pCreateSurface->lplpSList[i]; - pWineD3DDevice->CreateSurface( hrc = IWineD3DDevice_CreateSurface(pWineD3DDevice, Mode.Width, Mode.Height,

15 years, 9 months

[greatlrd] 37737: Createsurface now detect if it screen res or desc size it should use, and which level each surface are create in.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat Nov 29 13:21:30 2008 New Revision: 37737 URL: http://svn.reactos.org/svn/reactos?rev=37737&view=rev Log: Createsurface now detect if it screen res or desc size it should use, and which level each surface are create in. Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/gdi32/… ============================================================================== --- branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] Sat Nov 29 13:21:30 2008 @@ -396,10 +396,10 @@ DdCreateSurface(LPDDHAL_CREATESURFACEDATA pCreateSurface) { /* Fixme for opengl hel emulations */ - ULONG SurfaceCount; DDSURFACEDESC2 desc2; LPDDSURFACEDESC pSurfaceDesc; + WINED3DDISPLAYMODE Mode; HRESULT hrc = DD_OK; UINT Height; @@ -409,7 +409,7 @@ IWineD3D *pWined3d = (IWineD3D*) GetDdHandle(pCreateSurface->lpDD->hDD); IWineD3DDevice * pWineD3DDevice = (IWineD3DDevice*) pCreateSurface->lpDD->dwUnused3; void *Parent = NULL; - + if ( (!pWined3d) || (!pWineD3DDevice)) { @@ -435,19 +435,112 @@ pCreateSurface->ddRVal = DDERR_GENERIC; if (SurfaceCount != 0) { + LPDDRAWI_DDRAWSURFACE_LCL lcl = pCreateSurface->lplpSList[0]; + /* Fixme for opengl hel emulations */ DPRINT1("DdCreateSurface entered\n"); pCreateSurface->ddRVal = DD_OK; + + lcl->lpGbl->wWidth = desc2.dwWidth; + lcl->lpGbl->wHeight = desc2.dwHeight; + lcl->lpGbl->dwLinearSize = desc2.dwLinearSize; + RtlCopyMemory(&lcl->lpGbl->ddpfSurface, &desc2.ddpfPixelFormat, sizeof(DDPIXELFORMAT)) + + /* Get the video mode from WineD3D - we will need it */ + hr = IWineD3DDevice_GetDisplayMode(pWineD3DDevice, 0, &Mode); + if(FAILED(hr)) + { + + ERR("Failed to read display mode from wined3d\n"); + + if ((lcl->dwFlags & DDRAWISURF_HASPIXELFORMAT) == 0) + { + switch(pCreateSurface->lpDD->vmiData.ddpfDisplay.dwRGBBitCount) + { + case 8: + Mode.Format = WINED3DFMT_P8; + break; + + case 15: + Mode.Format = WINED3DFMT_X1R5G5B5; + break; + + case 16: + Mode.Format = WINED3DFMT_R5G6B5; + break; + + case 24: + Mode.Format = WINED3DFMT_R8G8B8; + break; + + case 32: + Mode.Format = WINED3DFMT_X8R8G8B8; + break; + + default: + pCreateSurface->ddRVal = DDERR_GENERIC; + break; + } + + Mode.Width = pCreateSurface->lpDD->vmiData.dwDisplayWidth; + Mode.Height = pCreateSurface->lpDD->vmiData.dwDisplayHeight; + } + else + { + if (lcl->lpGbl->ddpfSurface.dwFlags & DDPF_FOURCC) + { + Mode.Format = lcl->lpGbl->ddpfSurface.dwFourCC; + } + else + { + switch(lcl->lpGbl->ddpfSurface.dwRGBBitCount) + { + case 8: + Mode.Format = WINED3DFMT_P8; + break; + + case 15: + Mode.Format = WINED3DFMT_X1R5G5B5; + break; + + case 16: + Mode.Format = WINED3DFMT_R5G6B5; + break; + + case 24: + Mode.Format = WINED3DFMT_R8G8B8; + break; + + case 32: + Mode.Format = WINED3DFMT_X8R8G8B8; + break; + + default: + pCreateSurface->ddRVal = DDERR_GENERIC; + break; + } + } + Mode.Width = lcl->lpGbl->wWidth; + Mode.Height = lcl->lpGbl->wHeight; + } + } + } + + if (pCreateSurface->ddRVal = DD_OK) + { + for (i=0;i<SurfaceCount;i++) { LPDDRAWI_DDRAWSURFACE_LCL lcl = pCreateSurface->lplpSList[i]; + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IWineD3DSurface)); if (NULL == object) { DPRINT1("Allocation of memory failed\n"); pCreateSurface->ddRVal = DDERR_OUTOFVIDEOMEMORY; + break; } lcl->hDDSurface = (ULONG_PTR) object; } @@ -458,13 +551,14 @@ { LPDDRAWI_DDRAWSURFACE_LCL lcl = pCreateSurface->lplpSList[i]; + pWineD3DDevice->CreateSurface( hrc = IWineD3DDevice_CreateSurface(pWineD3DDevice, - Width, - Height, - WINED3DFMT_R8G8B8, + Mode.Width, + Mode.Height, + Mode.Format, TRUE /* Lockable */, FALSE /* Discard */, - 1, + i, (IWineD3DSurface **)&lcl->hDDSurface, WINED3DRTYPE_SURFACE, /**/ WINED3DUSAGE_DYNAMIC & WINED3DUSAGE_MASK,

15 years, 9 months

[gschneider] 37736: Update msvcrt winetest, test_codepage still disabled as before

by gschneider＠svn.reactos.org

Author: gschneider Date: Sat Nov 29 13:18:59 2008 New Revision: 37736 URL: http://svn.reactos.org/svn/reactos?rev=37736&view=rev Log: Update msvcrt winetest, test_codepage still disabled as before Modified: trunk/rostests/winetests/msvcrt/cpp.c trunk/rostests/winetests/msvcrt/dir.c trunk/rostests/winetests/msvcrt/file.c trunk/rostests/winetests/msvcrt/printf.c trunk/rostests/winetests/msvcrt/scanf.c trunk/rostests/winetests/msvcrt/string.c trunk/rostests/winetests/msvcrt/time.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/msvcrt/cpp.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/cpp.c?re… Modified: trunk/rostests/winetests/msvcrt/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/dir.c?re… Modified: trunk/rostests/winetests/msvcrt/file.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/file.c?r… Modified: trunk/rostests/winetests/msvcrt/printf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/printf.c… Modified: trunk/rostests/winetests/msvcrt/scanf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/scanf.c?… Modified: trunk/rostests/winetests/msvcrt/string.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/string.c… Modified: trunk/rostests/winetests/msvcrt/time.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/time.c?r…

15 years, 9 months

[greatlrd] 37735: trying implement DdCreateSurface for wined3d

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat Nov 29 11:53:51 2008 New Revision: 37735 URL: http://svn.reactos.org/svn/reactos?rev=37735&view=rev Log: trying implement DdCreateSurface for wined3d Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/gdi32/… ============================================================================== --- branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] Sat Nov 29 11:53:51 2008 @@ -396,259 +396,94 @@ DdCreateSurface(LPDDHAL_CREATESURFACEDATA pCreateSurface) { /* Fixme for opengl hel emulations */ - HEL_OGL_STUB; - -#if 0 - DWORD Return = DDHAL_DRIVER_NOTHANDLED; - ULONG SurfaceCount = pCreateSurface->dwSCnt; - DD_SURFACE_LOCAL DdSurfaceLocal; - DD_SURFACE_MORE DdSurfaceMore; - DD_SURFACE_GLOBAL DdSurfaceGlobal; - - HANDLE hPrevSurface, hSurface; - - PDD_SURFACE_LOCAL pDdSurfaceLocal = NULL; - PDD_SURFACE_MORE pDdSurfaceMore = NULL; - PDD_SURFACE_GLOBAL pDdSurfaceGlobal = NULL; - - PDD_SURFACE_LOCAL ptmpDdSurfaceLocal = NULL; - PDD_SURFACE_MORE ptmpDdSurfaceMore = NULL; - PDD_SURFACE_GLOBAL ptmpDdSurfaceGlobal = NULL; - PHANDLE phSurface = NULL, puhSurface = NULL; - ULONG i; - LPDDSURFACEDESC pSurfaceDesc = NULL; - - /* TODO : Speed optimze, most games/dx apps/program does not want 1 surface, they want lest 2 - * so we need incress the stack so it can contain 2 surface instead of one, this will incress - * the speed of the apps when it trying alloc buffer. How to incress the surface stack space - * we need create a own struct for DD_SURFACE_LOCAL DdSurfaceLocal, DD_SURFACE_MORE DdSurfaceMore - * DD_SURFACE_GLOBAL DdSurfaceGlobal. HANDLE hPrevSurface, hSurface. like - * struct { DD_SURFACE_LOCAL DdSurfaceLocal1, DD_SURFACE_LOCAL DdSurfaceLocal2 } - * lest so it contain two surface. maybe 4. we need watch what is most common here before - * we create the size activate this IF when you start doing the optimze and please also - * take report from user which value they got here - */ -#if 1 - { - char buffer[1024]; \ - sprintf ( buffer, "Function %s : Optimze max to %d Surface ? (%s:%d)\n", __FUNCTION__, (int)SurfaceCount,__FILE__,__LINE__ ); - OutputDebugStringA(buffer); - } -#endif - - /* Check how many surfaces there are */ - if (SurfaceCount != 1) - { - /* We got more that one surface so we need alloc memory for them */ - pDdSurfaceLocal = (PDD_SURFACE_LOCAL) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (sizeof(DD_SURFACE_LOCAL) * SurfaceCount )); - pDdSurfaceMore = (PDD_SURFACE_MORE) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (sizeof(DD_SURFACE_MORE) * SurfaceCount )); - pDdSurfaceGlobal = (PDD_SURFACE_GLOBAL) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (sizeof(DD_SURFACE_GLOBAL) * SurfaceCount )); - phSurface = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (sizeof(HANDLE) * SurfaceCount )); - puhSurface = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (sizeof(HANDLE) * SurfaceCount )); - - /* check if we sueese alloc all memory we need */ - if ((pDdSurfaceLocal == NULL) || (pDdSurfaceMore == NULL) || (pDdSurfaceGlobal == NULL) || (phSurface == NULL) || (puhSurface == NULL)) - { - pCreateSurface->ddRVal = DDERR_OUTOFMEMORY; - - if ( pDdSurfaceLocal != NULL ) - { - HeapFree(GetProcessHeap(), 0, pDdSurfaceLocal); - } - - if ( pDdSurfaceMore != NULL ) - { - HeapFree(GetProcessHeap(), 0, pDdSurfaceMore); - } - - if ( phSurface != NULL ) - { - HeapFree(GetProcessHeap(), 0, phSurface); - } - - if ( puhSurface != NULL ) - { - HeapFree(GetProcessHeap(), 0, puhSurface); - } - - return DDHAL_DRIVER_HANDLED; - } + + ULONG SurfaceCount; + DDSURFACEDESC2 desc2; + LPDDSURFACEDESC pSurfaceDesc; + + HRESULT hrc = DD_OK; + UINT Height; + UINT Width; + INT i; + IWineD3DSurface *object; + IWineD3D *pWined3d = (IWineD3D*) GetDdHandle(pCreateSurface->lpDD->hDD); + IWineD3DDevice * pWineD3DDevice = (IWineD3DDevice*) pCreateSurface->lpDD->dwUnused3; + void *Parent = NULL; + + if ( (!pWined3d) || + (!pWineD3DDevice)) + { + return DDHAL_DRIVER_NOTHANDLED; + } + + SurfaceCount = pCreateSurface->dwSCnt; + pSurfaceDesc = pCreateSurface->lpDDSurfaceDesc; + Height = pSurfaceDesc->dwHeight; + Width = pSurfaceDesc->dwWidth; + + if (pSurfaceDesc->dwSize == sizeof(DDSURFACEDESC2)) + { + RtlCopyMemory(&desc2,pSurfaceDesc,sizeof(DDSURFACEDESC2)); } else { - /* We'll use what we have on the stack */ - pDdSurfaceLocal = &DdSurfaceLocal; - pDdSurfaceMore = &DdSurfaceMore; - pDdSurfaceGlobal = &DdSurfaceGlobal; - phSurface = &hPrevSurface; - puhSurface = &hSurface; - - /* Clear the structures */ - RtlZeroMemory(&DdSurfaceLocal, sizeof(DdSurfaceLocal)); - RtlZeroMemory(&DdSurfaceGlobal, sizeof(DdSurfaceGlobal)); - RtlZeroMemory(&DdSurfaceMore, sizeof(DdSurfaceMore)); - } - - /* check if we got a surface or not */ - if (SurfaceCount!=0) - { - /* Loop for each surface */ - ptmpDdSurfaceGlobal = pDdSurfaceGlobal; - ptmpDdSurfaceLocal = pDdSurfaceLocal; - ptmpDdSurfaceMore = pDdSurfaceMore; - pSurfaceDesc = pCreateSurface->lpDDSurfaceDesc; - - for (i = 0; i < SurfaceCount; i++) - { - LPDDRAWI_DDRAWSURFACE_LCL lcl = pCreateSurface->lplpSList[i]; - LPDDRAWI_DDRAWSURFACE_GBL gpl = pCreateSurface->lplpSList[i]->lpGbl; - - phSurface[i] = (HANDLE)lcl->hDDSurface; - ptmpDdSurfaceLocal->ddsCaps.dwCaps = lcl->ddsCaps.dwCaps; - - ptmpDdSurfaceLocal->dwFlags = (ptmpDdSurfaceLocal->dwFlags & - (0xB0000000 | DDRAWISURF_INMASTERSPRITELIST | - DDRAWISURF_HELCB | DDRAWISURF_FRONTBUFFER | - DDRAWISURF_BACKBUFFER | DDRAWISURF_INVALID | - DDRAWISURF_DCIBUSY | DDRAWISURF_DCILOCK)) | - (lcl->dwFlags & DDRAWISURF_DRIVERMANAGED); - - ptmpDdSurfaceGlobal->wWidth = gpl->wWidth; - ptmpDdSurfaceGlobal->wHeight = gpl->wHeight; - ptmpDdSurfaceGlobal->lPitch = gpl->lPitch; - ptmpDdSurfaceGlobal->fpVidMem = gpl->fpVidMem; - ptmpDdSurfaceGlobal->dwBlockSizeX = gpl->dwBlockSizeX; - ptmpDdSurfaceGlobal->dwBlockSizeY = gpl->dwBlockSizeY; - - if (lcl->dwFlags & DDRAWISURF_HASPIXELFORMAT) - { - RtlCopyMemory( &ptmpDdSurfaceGlobal->ddpfSurface , - &gpl->ddpfSurface, - sizeof(DDPIXELFORMAT)); - - ptmpDdSurfaceGlobal->ddpfSurface.dwSize = sizeof(DDPIXELFORMAT); - } - else - { - RtlCopyMemory( &ptmpDdSurfaceGlobal->ddpfSurface , - &gpl->lpDD->vmiData.ddpfDisplay, - sizeof(DDPIXELFORMAT)); - } - - /* Note if lcl->lpSurfMore is NULL zero out - * ptmpDdSurfaceMore->ddsCapsEx.dwCaps2, - * dwCaps3, dwCaps4, ptmpDdSurfaceMore->dwSurfaceHandle - */ - if (lcl->lpSurfMore) - { - ptmpDdSurfaceMore->ddsCapsEx.dwCaps2 = lcl->lpSurfMore->ddsCapsEx.dwCaps2; - ptmpDdSurfaceMore->ddsCapsEx.dwCaps3 = lcl->lpSurfMore->ddsCapsEx.dwCaps3; - ptmpDdSurfaceMore->ddsCapsEx.dwCaps4 = lcl->lpSurfMore->ddsCapsEx.dwCaps4; - ptmpDdSurfaceMore->dwSurfaceHandle = lcl->lpSurfMore->dwSurfaceHandle; - } - - - /* count to next SurfaceCount */ - ptmpDdSurfaceGlobal = (PDD_SURFACE_GLOBAL) (((PBYTE) ((ULONG_PTR) ptmpDdSurfaceGlobal)) + sizeof(DD_SURFACE_GLOBAL)); - ptmpDdSurfaceLocal = (PDD_SURFACE_LOCAL) (((PBYTE) ((ULONG_PTR) ptmpDdSurfaceLocal)) + sizeof(DD_SURFACE_LOCAL)); - ptmpDdSurfaceMore = (PDD_SURFACE_MORE) (((PBYTE) ((ULONG_PTR) ptmpDdSurfaceMore)) + sizeof(DD_SURFACE_MORE)); - } - } - - /* Call win32k now */ + RtlZeroMemory(&desc2,sizeof(DDSURFACEDESC2)); + RtlCopyMemory(&desc2,pSurfaceDesc,sizeof(DDSURFACEDESC)); + desc2.dwSize = sizeof(DDSURFACEDESC2); + } + pCreateSurface->ddRVal = DDERR_GENERIC; - - Return = NtGdiDdCreateSurface(GetDdHandle(pCreateSurface->lpDD->hDD), - (HANDLE *)phSurface, - pSurfaceDesc, - pDdSurfaceGlobal, - pDdSurfaceLocal, - pDdSurfaceMore, - (PDD_CREATESURFACEDATA)pCreateSurface, - puhSurface); - - if (SurfaceCount == 0) - { - pCreateSurface->ddRVal = DDERR_GENERIC; - } - else - { - ptmpDdSurfaceMore = pDdSurfaceMore; - ptmpDdSurfaceGlobal = pDdSurfaceGlobal; - ptmpDdSurfaceLocal = pDdSurfaceLocal; + if (SurfaceCount != 0) + { + /* Fixme for opengl hel emulations */ + DPRINT1("DdCreateSurface entered\n"); + + pCreateSurface->ddRVal = DD_OK; for (i=0;i<SurfaceCount;i++) { LPDDRAWI_DDRAWSURFACE_LCL lcl = pCreateSurface->lplpSList[i]; - LPDDRAWI_DDRAWSURFACE_GBL gpl = pCreateSurface->lplpSList[i]->lpGbl; - - gpl->lPitch = ptmpDdSurfaceGlobal->lPitch; - gpl->fpVidMem = ptmpDdSurfaceGlobal->fpVidMem; - gpl->dwBlockSizeX = ptmpDdSurfaceGlobal->dwBlockSizeX; - gpl->dwBlockSizeY = ptmpDdSurfaceGlobal->dwBlockSizeY; - - if (lcl->dwFlags & DDRAWISURF_HASPIXELFORMAT) - { - RtlCopyMemory( &gpl->ddpfSurface, &ptmpDdSurfaceGlobal->ddpfSurface , sizeof(DDPIXELFORMAT)); - } - - if (pCreateSurface->ddRVal != DD_OK) - { - gpl->fpVidMem = 0; - if (lcl->hDDSurface) - { - NtGdiDdDeleteSurfaceObject( (HANDLE)lcl->hDDSurface); - } - lcl->hDDSurface = 0; - } - else - { - - lcl->hDDSurface = (ULONG_PTR) puhSurface[i]; - } - - lcl->ddsCaps.dwCaps = ptmpDdSurfaceLocal->ddsCaps.dwCaps; - if (lcl->lpSurfMore) - { - lcl->lpSurfMore->ddsCapsEx.dwCaps2 = ptmpDdSurfaceMore->ddsCapsEx.dwCaps2; - lcl->lpSurfMore->ddsCapsEx.dwCaps3 = ptmpDdSurfaceMore->ddsCapsEx.dwCaps3; - lcl->lpSurfMore->ddsCapsEx.dwCaps4 = ptmpDdSurfaceMore->ddsCapsEx.dwCaps4; - } - - /* count to next SurfaceCount */ - ptmpDdSurfaceGlobal = (PDD_SURFACE_GLOBAL) (((PBYTE) ((ULONG_PTR) ptmpDdSurfaceGlobal)) + sizeof(DD_SURFACE_GLOBAL)); - ptmpDdSurfaceLocal = (PDD_SURFACE_LOCAL) (((PBYTE) ((ULONG_PTR) ptmpDdSurfaceLocal)) + sizeof(DD_SURFACE_LOCAL)); - ptmpDdSurfaceMore = (PDD_SURFACE_MORE) (((PBYTE) ((ULONG_PTR) ptmpDdSurfaceMore)) + sizeof(DD_SURFACE_MORE)); + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IWineD3DSurface)); + if (NULL == object) + { + DPRINT1("Allocation of memory failed\n"); + pCreateSurface->ddRVal = DDERR_OUTOFVIDEOMEMORY; + } + lcl->hDDSurface = (ULONG_PTR) object; } - } - - /* Check if we have to free all our local allocations */ - if (SurfaceCount > 1) - { - if ( pDdSurfaceLocal != NULL ) + + if ( pCreateSurface->ddRVal == DD_OK) { - HeapFree(GetProcessHeap(), 0, pDdSurfaceLocal); + for (i=0;i<SurfaceCount;i++) + { + LPDDRAWI_DDRAWSURFACE_LCL lcl = pCreateSurface->lplpSList[i]; + + hrc = IWineD3DDevice_CreateSurface(pWineD3DDevice, + Width, + Height, + WINED3DFMT_R8G8B8, + TRUE /* Lockable */, + FALSE /* Discard */, + 1, + (IWineD3DSurface **)&lcl->hDDSurface, + WINED3DRTYPE_SURFACE, /**/ + WINED3DUSAGE_DYNAMIC & WINED3DUSAGE_MASK, + WINED3DPOOL_DEFAULT, + WINED3DMULTISAMPLE_NONE, + 0 /* MultiSampleQuality */, + 0 /* SharedHandle */, + SURFACE_OPENGL, + (IUnknown *)Parent); + } + if (hrc != D3D_OK ) + { + pCreateSurface->ddRVal = DDERR_GENERIC; + } } - - if ( pDdSurfaceMore != NULL ) - { - HeapFree(GetProcessHeap(), 0, pDdSurfaceMore); - } - - if ( phSurface != NULL ) - { - HeapFree(GetProcessHeap(), 0, phSurface); - } - - if ( puhSurface != NULL ) - { - HeapFree(GetProcessHeap(), 0, puhSurface); - } } /* Return */ - return Return; -#endif + return DDHAL_DRIVER_HANDLED; } /*

15 years, 9 months

[gschneider] 37734: - Added support for floating point and exponential formats to *printf functions - Based on the tools/ssprintf.cpp implementation, ported to C with changes made to comply with msvcrt behaviour - Reduces msvcrt winetest printf failure from 13 down to 1 - same failure as WinXP - Related bugs: bug #1533, bug #3727, bug #3878

by gschneider＠svn.reactos.org

Author: gschneider Date: Sat Nov 29 11:07:09 2008 New Revision: 37734 URL: http://svn.reactos.org/svn/reactos?rev=37734&view=rev Log: - Added support for floating point and exponential formats to *printf functions - Based on the tools/ssprintf.cpp implementation, ported to C with changes made to comply with msvcrt behaviour - Reduces msvcrt winetest printf failure from 13 down to 1 - same failure as WinXP - Related bugs: bug #1533, bug #3727, bug #3878 Modified: trunk/reactos/lib/sdk/crt/stdio/lnx_sprintf.c Modified: trunk/reactos/lib/sdk/crt/stdio/lnx_sprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/lnx_spri… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/lnx_sprintf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/lnx_sprintf.c [iso-8859-1] Sat Nov 29 11:07:09 2008 @@ -1,6 +1,8 @@ /* - * PROGRAMMERS: David Welch + * PROGRAMMERS: + * David Welch * Eric Kohl + * Gregor Schneider * * TODO: * - Verify the implementation of '%Z'. @@ -23,13 +25,14 @@ #include <tchar.h> #define ZEROPAD 1 /* pad with zero */ -#define SIGN 2 /* unsigned/signed long */ +#define SIGN 2 /* unsigned/signed */ #define PLUS 4 /* show plus */ #define SPACE 8 /* space if plus */ #define LEFT 16 /* left justified */ #define SPECIAL 32 /* 0x */ #define LARGE 64 /* use 'ABCDEF' instead of 'abcdef' */ -#define REMOVEHEX 256 /* use 256 as remve 0x frim BASE 16 */ +#define ZEROTRUNC 128 /* truncate zero's */ +#define REMOVEHEX 256 /* remove 0x from BASE 16 */ static __inline @@ -146,105 +149,229 @@ return buf; } +typedef struct { + unsigned int mantissal:32; + unsigned int mantissah:20; + unsigned int exponent:11; + unsigned int sign:1; +} ieee_double_t; + static char * -numberf(char * buf, char * end, double num, int base, int size, int precision, int type) -{ - char c,sign,tmp[66]; - const char *digits; - const char *small_digits = "0123456789abcdefghijklmnopqrstuvwxyz"; - const char *large_digits = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - int i; - long long x; - - /* FIXME - the float version of number is direcly copy of number - */ - - digits = (type & LARGE) ? large_digits : small_digits; - if (type & LEFT) - type &= ~ZEROPAD; - if (base < 2 || base > 36) - return 0; - c = (type & ZEROPAD) ? '0' : ' '; - sign = 0; - if (num < 0) { - sign = '-'; - num = -num; +numberf(char * buf, char * end, double num, char exp_sign, int size, int precision, int type) +{ + double exponent = 0.0; + double e; + long ie; + + int i = 0; + int j = 0; + int ro = 0; + + double frac, intr; + double p; + + char c, sign, digits[66]; + char *tmp; + + union + { + double* __n; + ieee_double_t* n; + } n; + + n.__n = &num; + + if ( exp_sign == 'g' || exp_sign == 'G' || exp_sign == 'e' || exp_sign == 'E' ) + { + ie = ((unsigned int)n.n->exponent - (unsigned int)0x3ff); + exponent = ie/3.321928; + } + + if ( exp_sign == 'g' || exp_sign == 'G' ) + { + type |= ZEROTRUNC; + if ( exponent < -4 || fabs(exponent) >= precision ) + exp_sign -= 2; // g -> e and G -> E + else + exp_sign = 'f'; + } + + if ( exp_sign == 'e' || exp_sign == 'E' ) + { + frac = modf(exponent,&e); + /* FIXME: this exponent over-/underflow scheme doesn't comply with the wanted behaviour + * needed at all or completely different in original? */ +#if 0 + if ( frac > 0.5 ) + e++; + else if ( frac < -0.5 ) + e--; +#endif + + /* size-5 because "e+abc" is going to follow */ + buf = numberf(buf, end, num/pow(10.0L,(long double)e), 'f', size-5, precision, type); + if (buf <= end) + *buf = exp_sign; + ++buf; size--; - } else if (type & PLUS) { - sign = '+'; - size--; - } else if (type & SPACE) { - sign = ' '; - size--; - } - if (type & SPECIAL) { - if (base == 16) - size -= 2; - else if (base == 8) + + ie = (long)e; + type = LEFT | SIGN | PLUS; + buf = number(buf, end, ie, 10, 3, 3, type); + return buf; + } + + if ( exp_sign == 'f' ) + { + if (type & LEFT) + type &= ~ZEROPAD; + + c = (type & ZEROPAD) ? '0' : ' '; + sign = 0; + + if (num < 0) + { + sign = '-'; + num = fabs(num); size--; - } - i = 0; - if (num == 0) - tmp[i++] = '0'; - else while (num != 0) - { - x = num; - tmp[i++] = digits[do_div(&x,base)]; - num=x; - } - if (i > precision) - precision = i; - size -= precision; - if (!(type&(ZEROPAD+LEFT))) { - while(size-->0) { + } + else if (type & PLUS) + { + sign = '+'; + size--; + } + else if (type & SPACE) + { + sign = ' '; + size--; + } + + frac = modf(num,&intr); + + // # flags forces a . and prevents truncation of trailing zero's + if ( precision > 0 ) + { + i = precision-1; + while ( i >= 0 ) + { + frac*=10.0L; + frac = modf(frac, &p); + digits[i] = (int)p + '0'; + i--; + } + i = precision; + size -= precision; + + if ( precision >= 1 || type & SPECIAL) + { + digits[i++] = '.'; + size--; + } + } + + ro = 0; + if ( frac > 0.5 ) + { + ro = 1; + } + + if ( intr == 0.0 ) + { + digits[i++] = '0'; + size--; + } + else + { + while ( intr > 0.0 ) + { + p = intr; + intr/=10.0L; + modf(intr, &intr); + + p -= 10.0*intr; + + digits[i++] = (int)p + '0'; + size--; + } + } + + j = 0; + while ( j < i && ro == 1) + { + if ( digits[j] >= '0' && digits[j] <= '8' ) + { + digits[j]++; + ro = 0; + } + else if ( digits[j] == '9' ) + { + digits[j] = '0'; + } + j++; + } + if ( ro == 1 ) + digits[i++] = '1'; + + digits[i] = 0; + + if (!(type & (ZEROPAD+LEFT))) + { + while(size-->0) + { + if (buf <= end) + *buf = ' '; + ++buf; + } + } + if (sign) + { + if (buf <= end) + *buf = sign; + ++buf; + } + + if (!(type & (ZEROPAD+LEFT))) + { + while(size-->0) + { + if (buf <= end) + *buf = ' '; + ++buf; + } + } + + if (!(type & LEFT)) + { + while (size-- > 0) + { + if (buf <= end) + *buf = c; + ++buf; + } + } + + tmp = digits; + if ( type & ZEROTRUNC && ((type & SPECIAL) != SPECIAL) ) + { + j = 0; + while ( j < i && ( *tmp == '0' || *tmp == '.' )) + { + tmp++; + i--; + } + } + while (i-- > 0) + { + if (buf <= end) + *buf = tmp[i]; + ++buf; + } + while (size-- > 0) + { if (buf <= end) *buf = ' '; - ++buf; - } - } - if (sign) { - if (buf <= end) - *buf = sign; - ++buf; - } - if (type & SPECIAL) { - if (base==8) { - if (buf <= end) - *buf = '0'; - ++buf; - } else if (base==16) { - if (buf <= end) - *buf = '0'; - ++buf; - if (buf <= end) - *buf = digits[33]; - ++buf; - } - } - if (!(type & LEFT)) { - while (size-- > 0) { - if (buf <= end) - *buf = c; - ++buf; - } - } - if (type & ZEROPAD) { - while (i < precision--) { - if (buf <= end) - *buf = '0'; - ++buf; - } - } - while (i-- > 0) { - if (buf <= end) - *buf = tmp[i]; - ++buf; - } - while (size-- > 0) { - if (buf <= end) - *buf = ' '; - ++buf; + buf++; + } } return buf; } @@ -367,8 +494,6 @@ int precision; /* min. # of digits for integers; max number of chars for from string */ int qualifier; /* 'h', 'l', 'L', 'I' or 'w' for integer fields */ - - /* clear the string buffer with zero so we do not need NULL terment it at end */ str = buf; end = buf + cnt - 1; @@ -596,7 +721,7 @@ } else { if ( precision == -1 ) precision = 6; - str = numberf(str, end, _double, base, field_width, precision, flags); + str = numberf(str, end, _double, *fmt, field_width, precision, flags); } continue;

15 years, 9 months

← Newer
1
2
3
4
5
6
7
8
...
66
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 November 2008