Ros-diffs January 2006

ros-diffs@reactos.org

23 participants
586 discussions

[ion] 20653: - Get chew and csq to compile.

by ion＠svn.reactos.org

- Get chew and csq to compile. Modified: trunk/reactos/drivers/lib/chew/workqueue.c Modified: trunk/reactos/drivers/lib/csq/csq.c _____ Modified: trunk/reactos/drivers/lib/chew/workqueue.c --- trunk/reactos/drivers/lib/chew/workqueue.c 2006-01-07 06:31:55 UTC (rev 20652) +++ trunk/reactos/drivers/lib/chew/workqueue.c 2006-01-07 07:00:31 UTC (rev 20653) @@ -60,7 +60,7 @@ } BOOLEAN ChewCreate -( PVOID *ItemPtr, UINT Bytes, VOID (*Worker)( PVOID ), PVOID UserSpace ) { +( PVOID *ItemPtr, SIZE_T Bytes, VOID (*Worker)( PVOID ), PVOID UserSpace ) { PWORK_ITEM Item; if( KeGetCurrentIrql() == PASSIVE_LEVEL ) { _____ Modified: trunk/reactos/drivers/lib/csq/csq.c --- trunk/reactos/drivers/lib/csq/csq.c 2006-01-07 06:31:55 UTC (rev 20652) +++ trunk/reactos/drivers/lib/csq/csq.c 2006-01-07 07:00:31 UTC (rev 20653) @@ -26,8 +26,8 @@ /* $Id$ */ #define __NTDRIVER__ +#include <ntifs.h> #include <ntddk.h> -#include <ntifs.h> static VOID NTAPI IopCsqCancelRoutine(PDEVICE_OBJECT DeviceObject,

18 years, 8 months

[ion] 20652: - Get kbd/mouclass compiling

by ion＠svn.reactos.org

- Get kbd/mouclass compiling Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.h Modified: trunk/reactos/drivers/input/mouclass/mouclass.h _____ Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.h --- trunk/reactos/drivers/input/kbdclass/kbdclass.h 2006-01-07 06:20:59 UTC (rev 20651) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.h 2006-01-07 06:31:55 UTC (rev 20652) @@ -3,15 +3,7 @@ #include <ntddkbd.h> #include <stdio.h> -#if defined(__GNUC__) - NTSTATUS NTAPI - IoAttachDeviceToDeviceStackSafe( - IN PDEVICE_OBJECT SourceDevice, - IN PDEVICE_OBJECT TargetDevice, - OUT PDEVICE_OBJECT *AttachedToDeviceObject); -#else - #error Unknown compiler! -#endif +#define MAX_PATH 260 typedef enum { _____ Modified: trunk/reactos/drivers/input/mouclass/mouclass.h --- trunk/reactos/drivers/input/mouclass/mouclass.h 2006-01-07 06:20:59 UTC (rev 20651) +++ trunk/reactos/drivers/input/mouclass/mouclass.h 2006-01-07 06:31:55 UTC (rev 20652) @@ -3,16 +3,7 @@ #include <ntddmou.h> #include <stdio.h> -#if defined(__GNUC__) - NTSTATUS NTAPI - IoAttachDeviceToDeviceStackSafe( - IN PDEVICE_OBJECT SourceDevice, - IN PDEVICE_OBJECT TargetDevice, - OUT PDEVICE_OBJECT *AttachedToDeviceObject); -#else - #error Unknown compiler! -#endif - +#define MAX_PATH 260 typedef enum { dsStopped,

18 years, 8 months

[ion] 20651: - Make NTFS compile on msvc.

by ion＠svn.reactos.org

- Make NTFS compile on msvc. Modified: trunk/reactos/drivers/fs/ntfs/mft.c Modified: trunk/reactos/drivers/fs/ntfs/ntfs.h Modified: trunk/reactos/drivers/fs/ntfs/volinfo.c _____ Modified: trunk/reactos/drivers/fs/ntfs/mft.c --- trunk/reactos/drivers/fs/ntfs/mft.c 2006-01-07 05:59:22 UTC (rev 20650) +++ trunk/reactos/drivers/fs/ntfs/mft.c 2006-01-07 06:20:59 UTC (rev 20651) @@ -169,6 +169,7 @@ PDEVICE_EXTENSION Vcb, PDEVICE_OBJECT DeviceObject) { + PNONRESIDENT_ATTRIBUTE NresAttr = (PNONRESIDENT_ATTRIBUTE)attr; if (attr->Nonresident == FALSE) { memcpy (buffer, @@ -176,7 +177,6 @@ ((PRESIDENT_ATTRIBUTE)attr)->ValueLength); } - PNONRESIDENT_ATTRIBUTE NresAttr = (PNONRESIDENT_ATTRIBUTE)attr; ReadExternalAttribute(Vcb, NresAttr, 0, (ULONG)(NresAttr->LastVcn) + 1, buffer); } @@ -194,17 +194,14 @@ PVOID p; ULONG BytesPerFileRecord = Vcb->NtfsInfo.BytesPerFileRecord; ULONG clusters = max(BytesPerFileRecord / Vcb->NtfsInfo.BytesPerCluster, 1); - - p = ExAllocatePool(NonPagedPool, clusters * Vcb->NtfsInfo.BytesPerCluster); - ULONGLONG vcn = index * BytesPerFileRecord / Vcb->NtfsInfo.BytesPerCluster; - - ReadVCN (Vcb, Mft, AttributeData, vcn, clusters, p); - LONG m = (Vcb->NtfsInfo.BytesPerCluster / BytesPerFileRecord) - 1; - ULONG n = m > 0 ? (index & m) : 0; + + p = ExAllocatePool(NonPagedPool, clusters * Vcb->NtfsInfo.BytesPerCluster); + ReadVCN (Vcb, Mft, AttributeData, vcn, clusters, p); + memcpy(file, (PVOID)((ULONG_PTR)p + n * BytesPerFileRecord), BytesPerFileRecord); ExFreePool(p); @@ -227,6 +224,7 @@ ULONGLONG runcount; ULONG readcount; ULONG left; + ULONG n; PUCHAR bytes = (PUCHAR)buffer; @@ -238,7 +236,7 @@ readcount = (ULONG)min (runcount, left); - ULONG n = readcount * Vcb->NtfsInfo.BytesPerCluster; + n = readcount * Vcb->NtfsInfo.BytesPerCluster; if (lcn == 0) memset(bytes, 0, n); _____ Modified: trunk/reactos/drivers/fs/ntfs/ntfs.h --- trunk/reactos/drivers/fs/ntfs/ntfs.h 2006-01-07 05:59:22 UTC (rev 20650) +++ trunk/reactos/drivers/fs/ntfs/ntfs.h 2006-01-07 06:20:59 UTC (rev 20651) @@ -1,8 +1,8 @@ #ifndef NTFS_H #define NTFS_H +#include <ntifs.h> #include <ntddk.h> -#include <ntifs.h> #include <ntdddisk.h> #include <ccros.h> @@ -10,8 +10,8 @@ #define CACHEPAGESIZE(pDeviceExt) \ - ((pDeviceExt)->NtfsInfo.BytesPerCluster > PAGE_SIZE ? \ - (pDeviceExt)->NtfsInfo.BytesPerCluster : PAGE_SIZE) + ((pDeviceExt)->NtfsInfo.UCHARsPerCluster > PAGE_SIZE ? \ + (pDeviceExt)->NtfsInfo.UCHARsPerCluster : PAGE_SIZE) #ifndef TAG #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) @@ -19,7 +19,7 @@ #define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) - +#include <pshpack1.h> typedef struct _BOOT_SECTOR { UCHAR Magic[3]; // 0x00 @@ -37,12 +37,13 @@ ULONGLONG MftLocation; ULONGLONG MftMirrLocation; CHAR ClustersPerMftRecord; - BYTE Unused3[3]; + UCHAR Unused3[3]; CHAR ClustersPerIndexRecord; - BYTE Unused4[3]; + UCHAR Unused4[3]; ULONGLONG SerialNumber; // 0x48 UCHAR BootCode[432]; // 0x50 -} __attribute__((packed)) BOOT_SECTOR, *PBOOT_SECTOR; +} BOOT_SECTOR, *PBOOT_SECTOR; +#include <poppack.h> //typedef struct _BootSector BootSector; @@ -91,6 +92,7 @@ #define FCB_CACHE_INITIALIZED 0x0001 #define FCB_IS_VOLUME_STREAM 0x0002 #define FCB_IS_VOLUME 0x0004 +#define MAX_PATH 260 typedef struct _FCB { @@ -187,7 +189,7 @@ ULONG BytesAllocated; /* Allocated size of the FILE record */ ULONGLONG BaseFileRecord; /* File reference to the base FILE record */ USHORT NextAttributeNumber; /* Next Attribute Id */ - USHORT Pading; /* Align to 4 byte boundary (XP) */ + USHORT Pading; /* Align to 4 UCHAR boundary (XP) */ ULONG MFTRecordNumber; /* Number of this MFT Record (XP) */ } FILE_RECORD_HEADER, *PFILE_RECORD_HEADER; _____ Modified: trunk/reactos/drivers/fs/ntfs/volinfo.c --- trunk/reactos/drivers/fs/ntfs/volinfo.c 2006-01-07 05:59:22 UTC (rev 20650) +++ trunk/reactos/drivers/fs/ntfs/volinfo.c 2006-01-07 06:20:59 UTC (rev 20651) @@ -27,14 +27,11 @@ /* INCLUDES *****************************************************************/ -#include <ntddk.h> +#include "ntfs.h" #define NDEBUG #include <debug.h> -#include "ntfs.h" - - /* FUNCTIONS ****************************************************************/ static NTSTATUS

18 years, 8 months

[ion] 20650: - Make CDFS work with msvc/ddk.

by ion＠svn.reactos.org

- Make CDFS work with msvc/ddk. Modified: trunk/reactos/drivers/fs/cdfs/cdfs.h Modified: trunk/reactos/drivers/fs/cdfs/dirctl.c Modified: trunk/reactos/drivers/fs/cdfs/fsctl.c _____ Modified: trunk/reactos/drivers/fs/cdfs/cdfs.h --- trunk/reactos/drivers/fs/cdfs/cdfs.h 2006-01-07 05:47:21 UTC (rev 20649) +++ trunk/reactos/drivers/fs/cdfs/cdfs.h 2006-01-07 05:59:22 UTC (rev 20650) @@ -1,8 +1,8 @@ #ifndef CDFS_H #define CDFS_H +#include <ntifs.h> #include <ntddk.h> -#include <ntifs.h> #include <ntddcdrm.h> #include <ccros.h> @@ -21,6 +21,7 @@ #define VOLUME_PARTITION_DESCRIPTOR_TYPE 3 #define VOLUME_DESCRIPTOR_SET_TERMINATOR 255 +#include <pshpack1.h> struct _DIR_RECORD { UCHAR RecordLength; // 1 @@ -42,7 +43,8 @@ ULONG VolumeSequenceNumber; // 29-32 UCHAR FileIdLength; // 33 UCHAR FileId[1]; // 34 -} __attribute__((packed)); +}; +#include <poppack.h> typedef struct _DIR_RECORD DIR_RECORD, *PDIR_RECORD; @@ -54,12 +56,13 @@ /* Volume Descriptor header*/ +#include <pshpack1.h> struct _VD_HEADER { UCHAR VdType; // 1 UCHAR StandardId[5]; // 2-6 UCHAR VdVersion; // 7 -} __attribute__((packed)); +}; typedef struct _VD_HEADER VD_HEADER, *PVD_HEADER; @@ -93,8 +96,7 @@ /* more data ... */ -} __attribute__((packed)); - +}; typedef struct _PVD PVD, *PPVD; @@ -125,7 +127,8 @@ UCHAR PublisherIdentifier[128]; // 319-446 // more data ... -} __attribute__((packed)); +}; +#include <poppack.h> typedef struct _SVD SVD, *PSVD; @@ -171,6 +174,8 @@ #define FCB_IS_VOLUME_STREAM 0x0002 #define FCB_IS_VOLUME 0x0004 +#define MAX_PATH 260 + typedef struct _FCB { FSRTL_COMMON_FCB_HEADER RFCB; _____ Modified: trunk/reactos/drivers/fs/cdfs/dirctl.c --- trunk/reactos/drivers/fs/cdfs/dirctl.c 2006-01-07 05:47:21 UTC (rev 20649) +++ trunk/reactos/drivers/fs/cdfs/dirctl.c 2006-01-07 05:59:22 UTC (rev 20650) @@ -381,12 +381,12 @@ DPRINT("CdfsGetNameInformation() called\n"); Length = wcslen(Fcb->ObjectName) * sizeof(WCHAR); - if ((sizeof (FILE_BOTH_DIRECTORY_INFORMATION) + Length) > BufferLength) + if ((sizeof (FILE_BOTH_DIR_INFORMATION) + Length) > BufferLength) return(STATUS_BUFFER_OVERFLOW); Info->FileNameLength = Length; Info->NextEntryOffset = - ROUND_UP(sizeof(FILE_BOTH_DIRECTORY_INFORMATION) + Length, 4); + ROUND_UP(sizeof(FILE_BOTH_DIR_INFORMATION) + Length, 4); memcpy(Info->FileName, Fcb->ObjectName, Length); return(STATUS_SUCCESS); @@ -404,12 +404,12 @@ DPRINT("CdfsGetDirectoryInformation() called\n"); Length = wcslen(Fcb->ObjectName) * sizeof(WCHAR); - if ((sizeof (FILE_BOTH_DIRECTORY_INFORMATION) + Length) > BufferLength) + if ((sizeof (FILE_BOTH_DIR_INFORMATION) + Length) > BufferLength) return(STATUS_BUFFER_OVERFLOW); Info->FileNameLength = Length; Info->NextEntryOffset = - ROUND_UP(sizeof(FILE_BOTH_DIRECTORY_INFORMATION) + Length, 4); + ROUND_UP(sizeof(FILE_BOTH_DIR_INFORMATION) + Length, 4); memcpy(Info->FileName, Fcb->ObjectName, Length); /* Convert file times */ @@ -447,7 +447,7 @@ static NTSTATUS CdfsGetFullDirectoryInformation(PFCB Fcb, PDEVICE_EXTENSION DeviceExt, - PFILE_FULL_DIRECTORY_INFORMATION Info, + PFILE_FULL_DIR_INFORMATION Info, ULONG BufferLength) { ULONG Length; @@ -455,12 +455,12 @@ DPRINT("CdfsGetFullDirectoryInformation() called\n"); Length = wcslen(Fcb->ObjectName) * sizeof(WCHAR); - if ((sizeof (FILE_BOTH_DIRECTORY_INFORMATION) + Length) > BufferLength) + if ((sizeof (FILE_BOTH_DIR_INFORMATION) + Length) > BufferLength) return(STATUS_BUFFER_OVERFLOW); Info->FileNameLength = Length; Info->NextEntryOffset = - ROUND_UP(sizeof(FILE_BOTH_DIRECTORY_INFORMATION) + Length, 4); + ROUND_UP(sizeof(FILE_BOTH_DIR_INFORMATION) + Length, 4); memcpy(Info->FileName, Fcb->ObjectName, Length); /* Convert file times */ @@ -500,7 +500,7 @@ static NTSTATUS CdfsGetBothDirectoryInformation(PFCB Fcb, PDEVICE_EXTENSION DeviceExt, - PFILE_BOTH_DIRECTORY_INFORMATION Info, + PFILE_BOTH_DIR_INFORMATION Info, ULONG BufferLength) { ULONG Length; @@ -508,12 +508,12 @@ DPRINT("CdfsGetBothDirectoryInformation() called\n"); Length = wcslen(Fcb->ObjectName) * sizeof(WCHAR); - if ((sizeof (FILE_BOTH_DIRECTORY_INFORMATION) + Length) > BufferLength) + if ((sizeof (FILE_BOTH_DIR_INFORMATION) + Length) > BufferLength) return(STATUS_BUFFER_OVERFLOW); Info->FileNameLength = Length; Info->NextEntryOffset = - ROUND_UP(sizeof(FILE_BOTH_DIRECTORY_INFORMATION) + Length, 4); + ROUND_UP(sizeof(FILE_BOTH_DIR_INFORMATION) + Length, 4); memcpy(Info->FileName, Fcb->ObjectName, Length); /* Convert file times */ @@ -682,14 +682,14 @@ case FileFullDirectoryInformation: Status = CdfsGetFullDirectoryInformation(&TempFcb, DeviceExtension, - (PFILE_FULL_DIRECTORY_INFORMATION)Buffer, + (PFILE_FULL_DIR_INFORMATION)Buffer, BufferLength); break; case FileBothDirectoryInformation: Status = CdfsGetBothDirectoryInformation(&TempFcb, DeviceExtension, - (PFILE_BOTH_DIRECTORY_INFORMATION)Buffer, + (PFILE_BOTH_DIR_INFORMATION)Buffer, BufferLength); break; _____ Modified: trunk/reactos/drivers/fs/cdfs/fsctl.c --- trunk/reactos/drivers/fs/cdfs/fsctl.c 2006-01-07 05:47:21 UTC (rev 20649) +++ trunk/reactos/drivers/fs/cdfs/fsctl.c 2006-01-07 05:59:22 UTC (rev 20650) @@ -36,7 +36,7 @@ /* FUNCTIONS ****************************************************************/ static __inline -int msf_to_lba (BYTE m, BYTE s, BYTE f) +int msf_to_lba (UCHAR m, UCHAR s, UCHAR f) { return (((m * 60) + s) * 75 + f) - 150; }

18 years, 8 months

[ion] 20649: - get sndblst and sound compiling on msvc.

by ion＠svn.reactos.org

- get sndblst and sound compiling on msvc. Modified: trunk/reactos/drivers/dd/sndblst/card.c Modified: trunk/reactos/drivers/dd/sndblst/dma.c Modified: trunk/reactos/drivers/dd/sndblst/portio.c Modified: trunk/reactos/drivers/dd/sndblst/sndblst.c Modified: trunk/reactos/drivers/dd/sndblst/sndblst.h Modified: trunk/reactos/drivers/dd/sound/wave.c Modified: trunk/reactos/drivers/dd/sound/wave.h _____ Modified: trunk/reactos/drivers/dd/sndblst/card.c --- trunk/reactos/drivers/dd/sndblst/card.c 2006-01-07 05:37:22 UTC (rev 20648) +++ trunk/reactos/drivers/dd/sndblst/card.c 2006-01-07 05:47:21 UTC (rev 20649) @@ -7,7 +7,7 @@ #include <ntddk.h> #include "sndblst.h" -VOID SetOutputSampleRate(UINT BasePort, UINT SampleRate) +VOID SetOutputSampleRate(ULONG BasePort, ULONG SampleRate) { // This only works for DSP v4.xx ONLY - need a workaround! DPRINT("Setting output sample rate\n"); @@ -22,7 +22,7 @@ } -VOID EnableSpeaker(UINT BasePort, BOOLEAN SpeakerOn) +VOID EnableSpeaker(ULONG BasePort, BOOLEAN SpeakerOn) { DPRINT("Setting speaker status %d\n", SpeakerOn); @@ -33,7 +33,7 @@ } -BOOLEAN IsSpeakerEnabled(UINT BasePort) +BOOLEAN IsSpeakerEnabled(ULONG BasePort) { DPRINT("Obtaining speaker status\n"); @@ -48,7 +48,7 @@ } -VOID BeginPlayback(UINT BasePort, UINT BitDepth, UINT Channels, UINT BlockSize) +VOID BeginPlayback(ULONG BasePort, ULONG BitDepth, ULONG Channels, ULONG BlockSize) { DPRINT("BeginPlayback(%d, %d, %d, %d)\n", BasePort, BitDepth, Channels, BlockSize); _____ Modified: trunk/reactos/drivers/dd/sndblst/dma.c --- trunk/reactos/drivers/dd/sndblst/dma.c 2006-01-07 05:37:22 UTC (rev 20648) +++ trunk/reactos/drivers/dd/sndblst/dma.c 2006-01-07 05:47:21 UTC (rev 20649) @@ -41,7 +41,7 @@ IN PVOID Context) { PDEVICE_EXTENSION Device = DeviceObject->DeviceExtension; - UINT zzz; + ULONG zzz; PUCHAR VirtualAddress = (PUCHAR) MmGetMdlVirtualAddress(Device->Mdl); DPRINT("IoMapTransfer\n"); _____ Modified: trunk/reactos/drivers/dd/sndblst/portio.c --- trunk/reactos/drivers/dd/sndblst/portio.c 2006-01-07 05:37:22 UTC (rev 20648) +++ trunk/reactos/drivers/dd/sndblst/portio.c 2006-01-07 05:47:21 UTC (rev 20649) @@ -12,7 +12,7 @@ #include <ntddk.h> #include "sndblst.h" -BOOLEAN WaitToSend(UINT BasePort) +BOOLEAN WaitToSend(ULONG BasePort) { int TimeOut; @@ -35,7 +35,7 @@ return TRUE; } -BOOLEAN WaitToReceive(UINT BasePort) +BOOLEAN WaitToReceive(ULONG BasePort) { int TimeOut; @@ -59,9 +59,9 @@ } -WORD InitSoundCard(UINT BasePort) +USHORT InitSoundCard(ULONG BasePort) { - UINT TimeOut; + ULONG TimeOut; BOOLEAN Status; UCHAR DSP_Major, DSP_Minor; _____ Modified: trunk/reactos/drivers/dd/sndblst/sndblst.c --- trunk/reactos/drivers/dd/sndblst/sndblst.c 2006-01-07 05:37:22 UTC (rev 20648) +++ trunk/reactos/drivers/dd/sndblst/sndblst.c 2006-01-07 05:47:21 UTC (rev 20649) @@ -20,7 +20,7 @@ /* INTERNAL VARIABLES ******************************************************/ -UINT DeviceCount = 0; +ULONG DeviceCount = 0; /* FUNCTIONS ***************************************************************/ @@ -38,7 +38,7 @@ // CONFIG Config; RTL_QUERY_REGISTRY_TABLE Table[2]; NTSTATUS s; - WORD DSP_Version = 0; + USHORT DSP_Version = 0; UCHAR DSP_Major = 0, DSP_Minor = 0; // This is TEMPORARY, to ensure that we don't process more than 1 device. @@ -228,7 +228,7 @@ * RETURNS: Success or failure */ { - UINT Channel; + ULONG Channel; DPRINT("BlasterCleanup() called!\n"); // Reset the device (should we do this?) @@ -255,8 +255,8 @@ { PIO_STACK_LOCATION Stack; PDEVICE_EXTENSION DeviceExtension; - UINT ByteCount; - PBYTE Data; + ULONG ByteCount; + PUCHAR Data; DPRINT("BlasterWrite() called!\n"); @@ -265,7 +265,7 @@ DPRINT("%d bytes\n", Stack->Parameters.Write.Length); - Data = (PBYTE) Irp->AssociatedIrp.SystemBuffer; + Data = (PUCHAR) Irp->AssociatedIrp.SystemBuffer; for (ByteCount = 0; ByteCount < Stack->Parameters.Write.Length; ByteCount ++) { @@ -307,7 +307,7 @@ /* case IOCTL_MIDI_PLAY : { DPRINT("Received IOCTL_MIDI_PLAY\n"); - Data = (PBYTE) Irp->AssociatedIrp.SystemBuffer; + Data = (PUCHAR) Irp->AssociatedIrp.SystemBuffer; DPRINT("Sending %d bytes of MIDI data to 0x%d:\n", Stack->Parameters.DeviceIoControl.InputBufferLength, DeviceExtension->Port); _____ Modified: trunk/reactos/drivers/dd/sndblst/sndblst.h --- trunk/reactos/drivers/dd/sndblst/sndblst.h 2006-01-07 05:37:22 UTC (rev 20648) +++ trunk/reactos/drivers/dd/sndblst/sndblst.h 2006-01-07 05:47:21 UTC (rev 20649) @@ -96,9 +96,9 @@ { PWSTR RegistryPath; PDRIVER_OBJECT DriverObject; - UINT Port; - UINT IRQ; - UINT DMA; + ULONG Port; + ULONG IRQ; + ULONG DMA; ULONG BufferSize; PADAPTER_OBJECT Adapter; PMDL Mdl; @@ -123,8 +123,8 @@ //typedef struct _CONFIG //{ -// UINT Port; -// UINT IRQ; +// ULONG Port; +// ULONG IRQ; //} CONFIG, *PCONFIG; /* @@ -139,9 +139,9 @@ Prototypes for functions in portio.c : */ -BOOLEAN WaitToSend(UINT BasePort); -BOOLEAN WaitToReceive(UINT BasePort); -WORD InitSoundCard(UINT BasePort); +BOOLEAN WaitToSend(ULONG BasePort); +BOOLEAN WaitToReceive(ULONG BasePort); +USHORT InitSoundCard(ULONG BasePort); /* Prototypes for functions in settings.c : @@ -168,9 +168,9 @@ -VOID SetOutputSampleRate(UINT BasePort, UINT SampleRate); -VOID EnableSpeaker(UINT BasePort, BOOLEAN SpeakerOn); -BOOLEAN IsSpeakerEnabled(UINT BasePort); -VOID BeginPlayback(UINT BasePort, UINT BitDepth, UINT Channels, UINT BlockSize); +VOID SetOutputSampleRate(ULONG BasePort, ULONG SampleRate); +VOID EnableSpeaker(ULONG BasePort, BOOLEAN SpeakerOn); +BOOLEAN IsSpeakerEnabled(ULONG BasePort); +VOID BeginPlayback(ULONG BasePort, ULONG BitDepth, ULONG Channels, ULONG BlockSize); #endif _____ Modified: trunk/reactos/drivers/dd/sound/wave.c --- trunk/reactos/drivers/dd/sound/wave.c 2006-01-07 05:37:22 UTC (rev 20648) +++ trunk/reactos/drivers/dd/sound/wave.c 2006-01-07 05:47:21 UTC (rev 20649) @@ -13,6 +13,7 @@ /* FUNCTIONS **************************************************************/ #include <ntddk.h> +#include <halfuncs.h> #include <string.h> #include <devices.h> @@ -38,7 +39,6 @@ void sb16_play(WAVE_HDR* wave) { - unsigned int eflags; ULONG MappedIrq; KIRQL Dirql; KAFFINITY Affinity; @@ -64,9 +64,7 @@ * saving the previous state of the interrupt flag */ - __asm__("pushf\n\tpop %0\n\tcli\n\t" - : "=m" (eflags) - : ); + _disable(); memcpy(sb16.buffer,(&wave->data),wave->dLen); @@ -82,9 +80,7 @@ // outb(0x21,(mask&~newmask)); // Restore the interrupt flag - __asm__("push %0\n\tpopf\n\t" - : - : "m" (eflags)); + _enable(); _____ Modified: trunk/reactos/drivers/dd/sound/wave.h --- trunk/reactos/drivers/dd/sound/wave.h 2006-01-07 05:37:22 UTC (rev 20648) +++ trunk/reactos/drivers/dd/sound/wave.h 2006-01-07 05:47:21 UTC (rev 20649) @@ -1,23 +1,25 @@ KIRQL irql; KAFFINITY affinity; +#include <pshpack1.h> typedef struct { - unsigned char rID[4] __attribute__((packed)); //4 0 - unsigned int rLen __attribute__((packed)); //4 4 - unsigned char wID[4] __attribute__((packed)); //4 8 - unsigned char fID[4] __attribute__((packed)); //4 12 - unsigned int fLen __attribute__((packed)); //4 16 - unsigned short wFormatTag __attribute__((packed)); //2 18 - unsigned short nChannels __attribute__((packed)); //2 20 - unsigned int nSamplesPerSec __attribute__((packed)); //2 22 - unsigned int nAvgBytesPerSec __attribute__((packed)); //2 24 - unsigned short nBlockAlign __attribute__((packed)); //2 26 - unsigned short FormatSpecific __attribute__((packed)); //2 28 - unsigned char dID[4] __attribute__((packed)); //4 30 - unsigned int dLen __attribute__((packed)); + unsigned char rID[4] ; //4 0 + unsigned int rLen ; //4 4 + unsigned char wID[4] ; //4 8 + unsigned char fID[4] ; //4 12 + unsigned int fLen ; //4 16 + unsigned short wFormatTag ; //2 18 + unsigned short nChannels ; //2 20 + unsigned int nSamplesPerSec ; //2 22 + unsigned int nAvgBytesPerSec ; //2 24 + unsigned short nBlockAlign ; //2 26 + unsigned short FormatSpecific ; //2 28 + unsigned char dID[4] ; //4 30 + unsigned int dLen ; unsigned char* data; }WAVE_HDR; +#include <poppack.h> void sb16_play(WAVE_HDR* wave); void dump_wav(WAVE_HDR* wave);

18 years, 8 months

[ion] 20648: - get mpu401, parallel and ramdrv to work on msvc.

by ion＠svn.reactos.org

- get mpu401, parallel and ramdrv to work on msvc. Modified: trunk/reactos/drivers/dd/mpu401/mpu401.c Modified: trunk/reactos/drivers/dd/mpu401/mpu401.h Modified: trunk/reactos/drivers/dd/mpu401/portio.c Modified: trunk/reactos/drivers/dd/parallel/parallel.c Modified: trunk/reactos/drivers/dd/ramdrv/ramdrv.c Modified: trunk/reactos/drivers/lib/bzip2/bzlib.h _____ Modified: trunk/reactos/drivers/dd/mpu401/mpu401.c --- trunk/reactos/drivers/dd/mpu401/mpu401.c 2006-01-07 05:23:59 UTC (rev 20647) +++ trunk/reactos/drivers/dd/mpu401/mpu401.c 2006-01-07 05:37:22 UTC (rev 20648) @@ -23,7 +23,7 @@ /* INTERNAL VARIABLES ******************************************************/ -UINT DeviceCount = 0; +ULONG DeviceCount = 0; /* FUNCTIONS ***************************************************************/ @@ -205,7 +205,7 @@ * RETURNS: Success or failure */ { - UINT Channel; + ULONG Channel; DPRINT("MPU401Cleanup() called!\n"); // Reset the device (should we do this?) @@ -240,8 +240,8 @@ { PIO_STACK_LOCATION Stack; PDEVICE_EXTENSION DeviceExtension; - UINT ByteCount; - PBYTE Data; + ULONG ByteCount; + PUCHAR Data; DPRINT("MPU401DeviceControl() called!\n"); @@ -256,7 +256,7 @@ case IOCTL_MIDI_PLAY : { DPRINT("Received IOCTL_MIDI_PLAY\n"); - Data = (PBYTE) Irp->AssociatedIrp.SystemBuffer; + Data = (PUCHAR) Irp->AssociatedIrp.SystemBuffer; DPRINT("Sending %d bytes of MIDI data to 0x%d:\n", Stack->Parameters.DeviceIoControl.InputBufferLength, DeviceExtension->Port); _____ Modified: trunk/reactos/drivers/dd/mpu401/mpu401.h --- trunk/reactos/drivers/dd/mpu401/mpu401.h 2006-01-07 05:23:59 UTC (rev 20647) +++ trunk/reactos/drivers/dd/mpu401/mpu401.h 2006-01-07 05:37:22 UTC (rev 20648) @@ -85,8 +85,8 @@ { PUNICODE_STRING RegistryPath; PDRIVER_OBJECT DriverObject; - UINT Port; - UINT IRQ; + ULONG Port; + ULONG IRQ; // KDPC Dpc; // KTIMER Timer; // KEVENT Event; @@ -110,8 +110,8 @@ //typedef struct _CONFIG //{ -// UINT Port; -// UINT IRQ; +// ULONG Port; +// ULONG IRQ; //} CONFIG, *PCONFIG; /* @@ -126,9 +126,9 @@ Prototypes for functions in portio.c : */ -BOOLEAN WaitToSend(UINT BasePort); -BOOLEAN WaitToReceive(UINT BasePort); -BOOLEAN InitUARTMode(UINT BasePort); +BOOLEAN WaitToSend(ULONG BasePort); +BOOLEAN WaitToReceive(ULONG BasePort); +BOOLEAN InitUARTMode(ULONG BasePort); /* Prototypes for functions in settings.c : _____ Modified: trunk/reactos/drivers/dd/mpu401/portio.c --- trunk/reactos/drivers/dd/mpu401/portio.c 2006-01-07 05:23:59 UTC (rev 20647) +++ trunk/reactos/drivers/dd/mpu401/portio.c 2006-01-07 05:37:22 UTC (rev 20648) @@ -13,7 +13,7 @@ #include "mpu401.h" -BOOLEAN WaitToSend(UINT BasePort) +BOOLEAN WaitToSend(ULONG BasePort) { int TimeOut; @@ -37,7 +37,7 @@ } -BOOLEAN WaitToReceive(UINT BasePort) +BOOLEAN WaitToReceive(ULONG BasePort) { int TimeOut; @@ -61,9 +61,9 @@ } -BOOLEAN InitUARTMode(UINT BasePort) +BOOLEAN InitUARTMode(ULONG BasePort) { - UINT TimeOut; + ULONG TimeOut; UCHAR Status = 0; DbgPrint("InitUARTMode() called\n"); _____ Modified: trunk/reactos/drivers/dd/parallel/parallel.c --- trunk/reactos/drivers/dd/parallel/parallel.c 2006-01-07 05:23:59 UTC (rev 20647) +++ trunk/reactos/drivers/dd/parallel/parallel.c 2006-01-07 05:37:22 UTC (rev 20648) @@ -83,7 +83,7 @@ { PIO_STACK_LOCATION Stack = IoGetCurrentIrpStackLocation(Irp); NTSTATUS status; - UINT i; + ULONG i; switch (Stack->MajorFunction) { _____ Modified: trunk/reactos/drivers/dd/ramdrv/ramdrv.c --- trunk/reactos/drivers/dd/ramdrv/ramdrv.c 2006-01-07 05:23:59 UTC (rev 20647) +++ trunk/reactos/drivers/dd/ramdrv/ramdrv.c 2006-01-07 05:37:22 UTC (rev 20648) @@ -98,7 +98,7 @@ void *tbuff; unsigned int dstlen = 1024 * 1440; FILE_STANDARD_INFORMATION finfo; - DWORD err; + ULONG err; DPRINT("Ramdisk driver\n"); _____ Modified: trunk/reactos/drivers/lib/bzip2/bzlib.h --- trunk/reactos/drivers/lib/bzip2/bzlib.h 2006-01-07 05:23:59 UTC (rev 20647) +++ trunk/reactos/drivers/lib/bzip2/bzlib.h 2006-01-07 05:37:22 UTC (rev 20648) @@ -308,9 +308,9 @@ ); #endif -extern _stdcall void *(*BZ2_malloc)( unsigned long size ); -extern _stdcall void (*BZ2_free)( void *ptr ); -_stdcall void BZ2_set_malloc_free( _stdcall void *(*malloc)(unsigned long size), _stdcall void (*free)(void *ptr) ); +extern void *(_stdcall *BZ2_malloc)( unsigned long size ); +extern void (*_stdcall BZ2_free)( void *ptr ); +void _stdcall BZ2_set_malloc_free( void *(_stdcall *malloc)(unsigned long size), void (_stdcall *free)(void *ptr) ); #ifdef __cplusplus }

18 years, 8 months

[jimtabor] 20647: Patch by Raimonds Praude raimonds.praude at sets.lv

by jimtabor＠svn.reactos.org

Patch by Raimonds Praude raimonds.praude at sets.lv Could not set the text limit for combo box. An application sent CB_LIMITTEXT text message, but it was not being processed. Now it is possible to set the text limit, 5 or 8 symbols, for instance. CB_LIMITTEXT message processing was added into ComboWndProc_common function in combo.c file. Modified: trunk/reactos/lib/user32/controls/combo.c _____ Modified: trunk/reactos/lib/user32/controls/combo.c --- trunk/reactos/lib/user32/controls/combo.c 2006-01-07 05:11:32 UTC (rev 20646) +++ trunk/reactos/lib/user32/controls/combo.c 2006-01-07 05:23:59 UTC (rev 20647) @@ -29,7 +29,6 @@ * TODO: * - ComboBox_[GS]etMinVisible() * - CB_GETMINVISIBLE, CB_SETMINVISIBLE - * - CB_LIMITTEXT * - CB_SETTOPINDEX */ @@ -2315,7 +2314,9 @@ return (lphc->wState & CBF_EUI) ? TRUE : FALSE; case CB_GETCOMBOBOXINFO: return COMBO_GetComboBoxInfo(lphc, (COMBOBOXINFO *)lParam); - + case CB_LIMITTEXT: + if( lphc->wState & CBF_EDIT ) + return SendMessageW(lphc->hWndEdit, EM_LIMITTEXT, wParam, lParam); default: if (message >= WM_USER) WARN("unknown msg WM_USER+%04x wp=%04x lp=%08lx\n",

18 years, 8 months

[ion] 20646: - Get green to compile with msvc/ddk.

by ion＠svn.reactos.org

- Get green to compile with msvc/ddk. Modified: trunk/reactos/drivers/dd/green/green.h Modified: trunk/reactos/drivers/dd/green/green.xml Modified: trunk/reactos/drivers/dd/green/keyboard.c _____ Modified: trunk/reactos/drivers/dd/green/green.h --- trunk/reactos/drivers/dd/green/green.h 2006-01-07 03:29:02 UTC (rev 20645) +++ trunk/reactos/drivers/dd/green/green.h 2006-01-07 05:11:32 UTC (rev 20646) @@ -1,38 +1,17 @@ +#include <stdarg.h> #include <ntddk.h> +#include <ndk/iotypes.h> +#include <windef.h> +#define WINBASEAPI +typedef struct _SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES, *PSECURITY_ATTRIBUTES; #include <ntddser.h> #include <kbdmou.h> #include <wincon.h> -#include <stdarg.h> +#include <drivers/blue/ntddblue.h> -#if defined(__GNUC__) - #include <drivers/blue/ntddblue.h> +#define INFINITE -1 +#define KEYBOARD_BUFFER_SIZE 100 - #define INFINITE 0xFFFFFFFF - - NTSTATUS NTAPI - ObReferenceObjectByName(PUNICODE_STRING ObjectPath, - ULONG Attributes, - PACCESS_STATE PassedAccessState, - ACCESS_MASK DesiredAccess, - POBJECT_TYPE ObjectType, - KPROCESSOR_MODE AccessMode, - PVOID ParseContext, - PVOID* ObjectPtr); - - typedef struct _CLASS_INFORMATION - { - PDEVICE_OBJECT DeviceObject; - PVOID CallBack; - } CLASS_INFORMATION, *PCLASS_INFORMATION; - - #define KEYBOARD_BUFFER_SIZE 100 - -#elif defined(_MSC_VER) - /* Nothing more to do */ -#else - #error Unknown compiler! -#endif - typedef enum { Green, @@ -50,7 +29,7 @@ COMMON_DEVICE_EXTENSION Common; PDEVICE_OBJECT Green; - CLASS_INFORMATION ClassInformation; + CONNECT_DATA ClassInformation; HANDLE WorkerThreadHandle; KDPC KeyboardDpc; _____ Modified: trunk/reactos/drivers/dd/green/green.xml --- trunk/reactos/drivers/dd/green/green.xml 2006-01-07 03:29:02 UTC (rev 20645) +++ trunk/reactos/drivers/dd/green/green.xml 2006-01-07 05:11:32 UTC (rev 20646) @@ -11,4 +11,5 @@ <file>pnp.c</file> <file>screen.c</file> <file>green.rc</file> + <pch>green.h</pch> </module> _____ Modified: trunk/reactos/drivers/dd/green/keyboard.c --- trunk/reactos/drivers/dd/green/keyboard.c 2006-01-07 03:29:02 UTC (rev 20645) +++ trunk/reactos/drivers/dd/green/keyboard.c 2006-01-07 05:11:32 UTC (rev 20646) @@ -154,8 +154,8 @@ Queue = DeviceExtension->ActiveQueue % 2; InterlockedIncrement((PLONG)&DeviceExtension->ActiveQueue); - (*(PSERVICE_CALLBACK_ROUTINE)DeviceExtension->ClassInformation.CallBack) ( - DeviceExtension->ClassInformation.DeviceObject, + (*(PSERVICE_CALLBACK_ROUTINE)DeviceExtension->ClassInformation.ClassServ ice)( + DeviceExtension->ClassInformation.ClassDeviceObject, DeviceExtension->KeyboardInputData[Queue], &DeviceExtension->KeyboardInputData[Queue][DeviceExtension->InputDataCou nt[Queue]], &InputDataConsumed); @@ -300,7 +300,7 @@ } DeviceExtension->ClassInformation = - *((PCLASS_INFORMATION)Stack->Parameters.DeviceIoControl.Type3InputBuffer ); + *((PCONNECT_DATA)Stack->Parameters.DeviceIoControl.Type3InputBuffer); /* Initialize serial port */ Fcr = 0;

18 years, 8 months

[turner] 20645: Remove NtGdiCheckColorsInGamut as it is not an API.

by turner＠svn.reactos.org

Remove NtGdiCheckColorsInGamut as it is not an API. Modified: trunk/reactos/include/win32k/ntgdibad.h Modified: trunk/reactos/subsys/win32k/objects/icm.c Modified: trunk/reactos/tools/nci/w32ksvc.db _____ Modified: trunk/reactos/include/win32k/ntgdibad.h --- trunk/reactos/include/win32k/ntgdibad.h 2006-01-07 02:14:42 UTC (rev 20644) +++ trunk/reactos/include/win32k/ntgdibad.h 2006-01-07 03:29:02 UTC (rev 20645) @@ -188,14 +188,6 @@ int XRadial2, int YRadial2); -/* Does not exist */ -BOOL -STDCALL -NtGdiCheckColorsInGamut(HDC hDC, - LPVOID RGBTriples, - LPVOID Buffer, - UINT Count); - /* Use NtGdiArcInternal with GdiTypeChord */ BOOL STDCALL _____ Modified: trunk/reactos/subsys/win32k/objects/icm.c --- trunk/reactos/subsys/win32k/objects/icm.c 2006-01-07 02:14:42 UTC (rev 20644) +++ trunk/reactos/subsys/win32k/objects/icm.c 2006-01-07 03:29:02 UTC (rev 20645) @@ -25,17 +25,6 @@ BOOL STDCALL -NtGdiCheckColorsInGamut(HDC hDC, - LPVOID RGBTriples, - LPVOID Buffer, - UINT Count) -{ - UNIMPLEMENTED; - return FALSE; -} - -BOOL -STDCALL NtGdiColorMatchToTarget(HDC hDC, HDC hDCTarget, DWORD Action) _____ Modified: trunk/reactos/tools/nci/w32ksvc.db --- trunk/reactos/tools/nci/w32ksvc.db 2006-01-07 02:14:42 UTC (rev 20644) +++ trunk/reactos/tools/nci/w32ksvc.db 2006-01-07 03:29:02 UTC (rev 20645) @@ -10,7 +10,6 @@ NtGdiBeginPath 1 NtGdiBitBlt 11 NtGdiCancelDC 1 -NtGdiCheckColorsInGamut 4 NtGdiChord 9 NtGdiCloseEnhMetaFile 1 NtGdiCloseFigure 1

18 years, 8 months

[ion] 20644: - Much cleaner way to get blue building (remove ugly header hacks)

by ion＠svn.reactos.org

- Much cleaner way to get blue building (remove ugly header hacks) - Get bootvid working too. Modified: trunk/reactos/drivers/dd/blue/blue.c Modified: trunk/reactos/drivers/dd/bootvid/bootvid.c _____ Modified: trunk/reactos/drivers/dd/blue/blue.c --- trunk/reactos/drivers/dd/blue/blue.c 2006-01-07 02:06:49 UTC (rev 20643) +++ trunk/reactos/drivers/dd/blue/blue.c 2006-01-07 02:14:42 UTC (rev 20644) @@ -12,25 +12,9 @@ /* INCLUDES ******************************************************************/ #include <ntddk.h> - -/* FIXME: W32API NEEDS TO BE FIXED */ -#ifdef _MSC_VER -/* - * Wincon.h can't be included due to missing user-mode types, - * so we'll define them here - */ -typedef ULONG DWORD, *LPDWORD; -typedef USHORT UINT, *LPWORD; -typedef USHORT WORD; -typedef UCHAR BYTE; -typedef INT BOOL; -typedef PVOID HWND; -typedef PVOID LPVOID; -#define WINAPI NTAPI -#define APIENTRY WINAPI +#include <windef.h> #define WINBASEAPI typedef struct _SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES, *PSECURITY_ATTRIBUTES; -#endif #include <wincon.h> #include <blue/ntddblue.h> _____ Modified: trunk/reactos/drivers/dd/bootvid/bootvid.c --- trunk/reactos/drivers/dd/bootvid/bootvid.c 2006-01-07 02:06:49 UTC (rev 20643) +++ trunk/reactos/drivers/dd/bootvid/bootvid.c 2006-01-07 02:14:42 UTC (rev 20644) @@ -24,6 +24,7 @@ /* INCLUDES ******************************************************************/ #include <ntddk.h> +#include <windef.h> #include <ndk/ldrfuncs.h> #include "bootvid.h" #include "ntbootvid.h" @@ -78,7 +79,7 @@ /* FUNCTIONS *****************************************************************/ -STATIC BOOLEAN FASTCALL +static BOOLEAN FASTCALL InbvFindBootimage() { PIMAGE_RESOURCE_DATA_ENTRY ResourceDataEntry; @@ -119,7 +120,7 @@ } -STATIC BOOLEAN FASTCALL +static BOOLEAN FASTCALL InbvMapVideoMemory(VOID) { PHYSICAL_ADDRESS PhysicalAddress; @@ -131,7 +132,7 @@ } -STATIC BOOLEAN FASTCALL +static BOOLEAN FASTCALL InbvUnmapVideoMemory(VOID) { MmUnmapIoSpace(VideoMemory, 0x10000); @@ -139,7 +140,7 @@ } -STATIC VOID FASTCALL +static VOID FASTCALL vgaPreCalc() { ULONG j; @@ -158,7 +159,7 @@ } -STATIC VOID FASTCALL +static VOID FASTCALL vgaSetRegisters(const VGA_REGISTERS *Registers) { UINT i; @@ -246,7 +247,7 @@ } -STATIC VOID FASTCALL +static VOID FASTCALL InbvSetColor(INT Index, UCHAR Red, UCHAR Green, UCHAR Blue) { WRITE_PORT_UCHAR(PELINDEX, Index); @@ -256,7 +257,7 @@ } -STATIC VOID FASTCALL +static VOID FASTCALL InbvSetBlackPalette() { register ULONG r = 0; @@ -276,7 +277,7 @@ } -STATIC VOID FASTCALL +static VOID FASTCALL InbvDisplayBitmap(ULONG Width, ULONG Height, PCHAR ImageData) { ULONG j, k, y; @@ -322,7 +323,7 @@ } -STATIC VOID FASTCALL +static VOID FASTCALL InbvDisplayCompressedBitmap() { PBITMAPV5HEADER bminfo; @@ -470,7 +471,7 @@ } -STATIC VOID FASTCALL +static VOID FASTCALL InbvFadeUpPalette() { PBITMAPV5HEADER bminfo; @@ -542,7 +543,7 @@ } -STATIC VOID STDCALL +static VOID STDCALL InbvBitmapThreadMain(PVOID Ignored) { if (InbvFindBootimage()) @@ -558,7 +559,7 @@ } -STATIC BOOLEAN STDCALL +static BOOLEAN STDCALL VidInitialize(VOID) { NTSTATUS Status;

18 years, 8 months

← Newer
1
...
41
42
43
44
45
46
47
...
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 January 2006