Ros-diffs July 2008

ros-diffs@reactos.org

25 participants
761 discussions

[pschweitzer] 34238: - Implemented a "method" to keep $Mft in memory. That's ugly, unsafe, etc. It will be improved with the use of CC. For now, it will help developing directory browsing - Free memory after use - Some code cleanup
by pschweitzer＠svn.reactos.org 01 Jul '08

01 Jul '08

Author: pschweitzer Date: Tue Jul 1 13:58:03 2008 New Revision: 34238 URL: http://svn.reactos.org/svn/reactos?rev=34238&view=rev Log: - Implemented a "method" to keep $Mft in memory. That's ugly, unsafe, etc. It will be improved with the use of CC. For now, it will help developing directory browsing - Free memory after use - Some code cleanup Modified: branches/pierre-fsd/drivers/filesystems/ntfs/fsctl.c Modified: branches/pierre-fsd/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] Tue Jul 1 13:58:03 2008 @@ -256,7 +256,7 @@ VolumeRecord = ExAllocatePoolWithTag(NonPagedPool, NtfsInfo->BytesPerFileRecord, TAG_NTFS); if (VolumeRecord == NULL) { - ExFreePool (MftRecord); + ExFreePool(MftRecord); return STATUS_INSUFFICIENT_RESOURCES; } @@ -265,7 +265,7 @@ Status = ReadFileRecord(DeviceExt, 3, VolumeRecord, MftRecord); if (!NT_SUCCESS(Status)) { - ExFreePool (MftRecord); + ExFreePool(MftRecord); return Status; } @@ -307,7 +307,8 @@ NtfsInfo->Flags = VolumeInfo->Flags; } - ExFreePool (MftRecord); + ExFreePool(MftRecord); + ExFreePool(VolumeRecord); return Status; } @@ -318,6 +319,7 @@ PIRP Irp) { PDEVICE_OBJECT NewDeviceObject = NULL; + PFILE_RECORD_HEADER MftRecord = NULL; PDEVICE_OBJECT DeviceToMount; PIO_STACK_LOCATION Stack; PNTFS_FCB Fcb = NULL; @@ -354,7 +356,7 @@ if (!NT_SUCCESS(Status)) goto ByeBye; - NewDeviceObject->Flags = NewDeviceObject->Flags | DO_DIRECT_IO; + NewDeviceObject->Flags |= DO_DIRECT_IO; Vcb = (PVOID)NewDeviceObject->DeviceExtension; RtlZeroMemory(Vcb, sizeof(NTFS_VCB)); @@ -424,6 +426,26 @@ &(NtfsGlobalData->CacheMgrCallbacks), Fcb); + /* FIXME: Use CC and get rid of this crappy code! */ + MftRecord = ExAllocatePoolWithTag(NonPagedPool, + Vcb->NtfsInfo.BytesPerFileRecord, TAG_NTFS); + if (MftRecord == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto ByeBye; + } + + Status = NtfsReadSectors(Vcb->StorageDevice, + Vcb->NtfsInfo.MftStart.u.LowPart * Vcb->NtfsInfo.SectorsPerCluster, + Vcb->NtfsInfo.BytesPerFileRecord / Vcb->NtfsInfo.BytesPerSector, + Vcb->NtfsInfo.BytesPerSector, + (PVOID)MftRecord, + TRUE); + if (!NT_SUCCESS(Status)) + goto ByeBye; + + Vcb->MftBuffer = MftRecord; + ExInitializeResourceLite(&Vcb->DirResource); KeInitializeSpinLock(&Vcb->FcbListLock); @@ -447,6 +469,8 @@ if (!NT_SUCCESS(Status)) { /* Cleanup */ + if (MftRecord) + ExFreePool(MftRecord); if (Vcb && Vcb->StreamFileObject) ObDereferenceObject(Vcb->StreamFileObject); if (Fcb)

1 0

[fireball] 34237: - Yes, Alex's code is perfect, sorry.
by fireball＠svn.reactos.org 01 Jul '08

01 Jul '08

Author: fireball Date: Tue Jul 1 12:59:29 2008 New Revision: 34237 URL: http://svn.reactos.org/svn/reactos?rev=34237&view=rev Log: - Yes, Alex's code is perfect, sorry. Modified: trunk/reactos/ntoskrnl/ke/apc.c Modified: trunk/reactos/ntoskrnl/ke/apc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/apc.c?rev=3423… ============================================================================== --- trunk/reactos/ntoskrnl/ke/apc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/apc.c [iso-8859-1] Tue Jul 1 12:59:29 2008 @@ -320,9 +320,6 @@ break; } - /* It's not pending anymore */ - Thread->ApcState.KernelApcPending = FALSE; - /* Get the next Entry */ ApcListEntry = Thread->ApcState.ApcListHead[KernelMode].Flink; Apc = CONTAINING_RECORD(ApcListEntry, KAPC, ApcListEntry);

1 0

[jmorlan] 34236: Fix under-allocation in LsaQueryInformationPolicy. (Bug 3428)
by jmorlan＠svn.reactos.org 01 Jul '08

01 Jul '08

Author: jmorlan Date: Tue Jul 1 11:35:01 2008 New Revision: 34236 URL: http://svn.reactos.org/svn/reactos?rev=34236&view=rev Log: Fix under-allocation in LsaQueryInformationPolicy. (Bug 3428) Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/lsa… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] Tue Jul 1 11:35:01 2008 @@ -460,7 +460,7 @@ }; SID_IDENTIFIER_AUTHORITY localSidAuthority = {SECURITY_NT_AUTHORITY}; - struct di * xdi = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(xdi)); + struct di * xdi = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*xdi)); HKEY key; BOOL useDefault = TRUE; LONG ret;

1 0

[silverblade] 34235: Made header for sbdsp.c and begun adding some test code to sb16_nt4
by silverblade＠svn.reactos.org 01 Jul '08

01 Jul '08

Author: silverblade Date: Tue Jul 1 11:32:36 2008 New Revision: 34235 URL: http://svn.reactos.org/svn/reactos?rev=34235&view=rev Log: Made header for sbdsp.c and begun adding some test code to sb16_nt4 Added: branches/silverblade-audio/include/reactos/libs/sound/sbdsp.h (with props) Modified: branches/silverblade-audio/drivers/multimedia/audio/sb16_nt4/main.c branches/silverblade-audio/include/reactos/libs/sound/time.h branches/silverblade-audio/lib/drivers/sound/sbdsp.c Modified: branches/silverblade-audio/drivers/multimedia/audio/sb16_nt4/main.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/drivers/multi… ============================================================================== --- branches/silverblade-audio/drivers/multimedia/audio/sb16_nt4/main.c [iso-8859-1] (original) +++ branches/silverblade-audio/drivers/multimedia/audio/sb16_nt4/main.c [iso-8859-1] Tue Jul 1 11:32:36 2008 @@ -14,6 +14,7 @@ #include <ntddsnd.h> #include <debug.h> +#include <sbdsp.h> #include <devname.h> typedef struct _SOUND_BLASTER_EXTENSION @@ -92,12 +93,13 @@ INFO_(IHVAUDIO, "Sound Blaster driver being unloaded"); } - +/* This is to be moved into the sound library later */ #define SOUND_PARAMETERS_KEYNAME_W L"Parameters" #define SOUND_DEVICES_KEYNAME_W L"Devices" #define SOUND_DEVICE_KEYNAME_PREFIX_W L"Device" /* NT4 */ +#if 0 ULONG GetSoundDeviceCount( IN PUNICODE_STRING RegistryPath) @@ -132,6 +134,31 @@ //ZwEnumerateKey(Key } +#endif + + +/* + This is purely for testing the sound library at present. Eventually this + should be re-formed to consider that some (admittedly slightly crazy) + users might have more than one sound blaster card, or perhaps might have + a different configuration. + + ie, this is pretty much as non-PnP as you can get! +*/ +STDCALL +NTSTATUS +ThisIsSparta(IN PDRIVER_OBJECT DriverObject) +{ + DEVICE_OBJECT device; + BOOLEAN result; + CreateSoundDeviceWithDefaultName(DriverObject, 0, 69, 0, &device); + + INFO_(IHVAUDIO, "Resetting SB..."); + result = ResetSoundBlasterDSP((PUCHAR)0x220, 10000); + INFO_(IHVAUDIO, "SB reset returns %d", result); + + return STATUS_SUCCESS; +} @@ -153,9 +180,7 @@ DriverObject->MajorFunction[IRP_MJ_WRITE] = WriteSoundBlaster; DriverObject->DriverUnload = UnloadSoundBlaster; - DEVICE_OBJECT device; - CreateSoundDeviceWithDefaultName(DriverObject, 0, 69, 0, &device); - - return STATUS_SUCCESS; + /* Hax */ + return ThisIsSparta(DriverObject); } Added: branches/silverblade-audio/include/reactos/libs/sound/sbdsp.h URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/include/react… ============================================================================== --- branches/silverblade-audio/include/reactos/libs/sound/sbdsp.h (added) +++ branches/silverblade-audio/include/reactos/libs/sound/sbdsp.h [iso-8859-1] Tue Jul 1 11:32:36 2008 @@ -1,0 +1,87 @@ +/* + ReactOS Sound System + Sound Blaster DSP support + + Author: + Andrew Greenwood (andrew.greenwood(a)silverblade.co.uk) + + History: + 26 May 2008 - Created + + Notes: + ... +*/ + +#ifndef ROS_SOUND_SBDSP_H +#define ROS_SOUND_SBDSP_H + +#include <sound/time.h> + +/* + Sound Blaster ports I/O +*/ +#define READ_SB_FM1_STATUS(bp) READ_PORT_UCHAR((PUCHAR) bp) +#define WRITE_SB_FM1_REGISTER(bp, x) WRITE_PORT_UCHAR((PUCHAR) bp, x) +#define WRITE_SB_FM1_DATA(bp, x) WRITE_PORT_UCHAR((PUCHAR) bp+0x01, x) + +#define READ_SB_AFM_STATUS(bp) READ_PORT_UCHAR((PUCHAR) bp+0x02) +#define WRITE_SB_AFM_REGISTER(bp, x) WRITE_PORT_UCHAR((PUCHAR) bp+0x02, x) +#define WRITE_SB_AFM_DATA(bp, x) WRITE_PORT_UCHAR((PUCHAR) bp+0x03, x) + +#define WRITE_SB_MIXER_REGISTER(bp, x) WRITE_PORT_UCHAR((PUCHAR) bp+0x04, x) +#define READ_SB_MIXER_DATA(bp) READ_PORT_UCHAR((PUCHAR) bp+0x05) +#define WRITE_SB_MIXER_DATA(bp, x) WRITE_PORT_UCHAR((PUCHAR) bp+0x05, x) + +#define WRITE_SB_DSP_RESET(bp, x) WRITE_PORT_UCHAR((PUCHAR) bp+0x06, x) + +#define READ_SB_FM2_STATUS(bp) READ_PORT_UCHAR((PUCHAR) bp+0x08) +#define WRITE_SB_FM2_REGISTER(bp, x) WRITE_PORT_UCHAR((PUCHAR) bp+0x08, x) +#define WRITE_SB_FM2_DATA(bp, x) WRITE_PORT_UCHAR((PUCHAR) bp+0x09, x) + +#define READ_SB_DSP_DATA(bp) READ_PORT_UCHAR((PUCHAR) bp+0x0A) +#define WRITE_SB_DSP_DATA(bp, x) WRITE_PORT_UCHAR((PUCHAR) bp+0x0C, x) +#define WRITE_SB_DSP_COMMAND(bp, x) WRITE_PORT_UCHAR((PUCHAR) bp+0x0C, x) + +#define READ_SB_DSP_WRITE_BUFFER_STATUS(bp) \ + ( READ_PORT_UCHAR((PUCHAR) bp+0x0C) & 0x01 ) + +#define READ_SB_DSP_READ_BUFFER_STATUS(bp) \ + ( READ_PORT_UCHAR((PUCHAR) bp+0x0E) & 0x01 ) + + +#define SB_DSP_READY 0xAA + +/* + Sound Blaster DSP commands + (partial list) +*/ +#define SB_DSP_OUTPUT_RATE 0x41 +#define SB_DSP_INPUT_RATE 0x42 +#define SB_DSP_BLOCK_SIZE 0x48 +#define SB_DSP_SPEAKER_ON 0xD1 +#define SB_DSP_SPEAKER_OFF 0xD3 +#define SB_DSP_SPEAKER_STATUS 0xD8 +#define SB_DSP_VERSION 0xE1 + + +/* + Routines +*/ +BOOLEAN +ResetSoundBlasterDSP( + IN PUCHAR BasePort, + IN ULONG Timeout); + +BOOLEAN +WaitForSoundBlasterDSPReady( + IN PUCHAR BasePort, + IN ULONG Timeout); + +NTSTATUS +GetSoundBlasterDSPVersion( + IN PUCHAR BasePort, + OUT PUCHAR MajorVersion, + OUT PUCHAR MinorVersion, + IN ULONG Timeout); + +#endif Propchange: branches/silverblade-audio/include/reactos/libs/sound/sbdsp.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/silverblade-audio/include/reactos/libs/sound/time.h URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/include/react… ============================================================================== --- branches/silverblade-audio/include/reactos/libs/sound/time.h [iso-8859-1] (original) +++ branches/silverblade-audio/include/reactos/libs/sound/time.h [iso-8859-1] Tue Jul 1 11:32:36 2008 @@ -9,8 +9,8 @@ 1 July 2008 - Created */ -#ifndef ROS_SOUND_TIME -#define ROS_SOUND_TIME +#ifndef ROS_SOUND_TIME_H +#define ROS_SOUND_TIME_H VOID SleepMs(ULONG Milliseconds); Modified: branches/silverblade-audio/lib/drivers/sound/sbdsp.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/sbdsp.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/sbdsp.c [iso-8859-1] Tue Jul 1 11:32:36 2008 @@ -13,53 +13,9 @@ */ #include <ntddk.h> -#include <sound/time.h> -/* - Sound Blaster ports I/O -*/ -#define READ_SB_FM1_STATUS(bp) READ_PORT_UCHAR((PUCHAR) bp) -#define WRITE_SB_FM1_REGISTER(bp, x) WRITE_PORT_UCHAR((PUCHAR) bp, x) -#define WRITE_SB_FM1_DATA(bp, x) WRITE_PORT_UCHAR((PUCHAR) bp+0x01, x) - -#define READ_SB_AFM_STATUS(bp) READ_PORT_UCHAR((PUCHAR) bp+0x02) -#define WRITE_SB_AFM_REGISTER(bp, x) WRITE_PORT_UCHAR((PUCHAR) bp+0x02, x) -#define WRITE_SB_AFM_DATA(bp, x) WRITE_PORT_UCHAR((PUCHAR) bp+0x03, x) - -#define WRITE_SB_MIXER_REGISTER(bp, x) WRITE_PORT_UCHAR((PUCHAR) bp+0x04, x) -#define READ_SB_MIXER_DATA(bp) READ_PORT_UCHAR((PUCHAR) bp+0x05) -#define WRITE_SB_MIXER_DATA(bp, x) WRITE_PORT_UCHAR((PUCHAR) bp+0x05, x) - -#define WRITE_SB_DSP_RESET(bp, x) WRITE_PORT_UCHAR((PUCHAR) bp+0x06, x) - -#define READ_SB_FM2_STATUS(bp) READ_PORT_UCHAR((PUCHAR) bp+0x08) -#define WRITE_SB_FM2_REGISTER(bp, x) WRITE_PORT_UCHAR((PUCHAR) bp+0x08, x) -#define WRITE_SB_FM2_DATA(bp, x) WRITE_PORT_UCHAR((PUCHAR) bp+0x09, x) - -#define READ_SB_DSP_DATA(bp) READ_PORT_UCHAR((PUCHAR) bp+0x0A) -#define WRITE_SB_DSP_DATA(bp, x) WRITE_PORT_UCHAR((PUCHAR) bp+0x0C, x) -#define WRITE_SB_DSP_COMMAND(bp, x) WRITE_PORT_UCHAR((PUCHAR) bp+0x0C, x) - -#define READ_SB_DSP_WRITE_BUFFER_STATUS(bp) \ - ( READ_PORT_UCHAR((PUCHAR) bp+0x0C) & 0x01 ) - -#define READ_SB_DSP_READ_BUFFER_STATUS(bp) \ - ( READ_PORT_UCHAR((PUCHAR) bp+0x0E) & 0x01 ) - - -#define SB_DSP_READY 0xAA - -/* - Sound Blaster DSP commands - (partial list) -*/ -#define SB_DSP_OUTPUT_RATE 0x41 -#define SB_DSP_INPUT_RATE 0x42 -#define SB_DSP_BLOCK_SIZE 0x48 -#define SB_DSP_SPEAKER_ON 0xD1 -#define SB_DSP_SPEAKER_OFF 0xD3 -#define SB_DSP_SPEAKER_STATUS 0xD8 -#define SB_DSP_VERSION 0xE1 +#include <time.h> +#include <sbdsp.h> BOOLEAN ResetSoundBlasterDSP(

1 0

[silverblade] 34234: Split sb16_nt4 into a common sound static library and made sb16_nt4 compile against this (intention is to re-use the lib for portcls later on).
by silverblade＠svn.reactos.org 01 Jul '08

01 Jul '08

Author: silverblade Date: Tue Jul 1 11:09:10 2008 New Revision: 34234 URL: http://svn.reactos.org/svn/reactos?rev=34234&view=rev Log: Split sb16_nt4 into a common sound static library and made sb16_nt4 compile against this (intention is to re-use the lib for portcls later on). Added: branches/silverblade-audio/include/reactos/libs/sound/ branches/silverblade-audio/include/reactos/libs/sound/devname.h (with props) branches/silverblade-audio/include/reactos/libs/sound/midi.h (with props) branches/silverblade-audio/include/reactos/libs/sound/midiuart.h (with props) branches/silverblade-audio/include/reactos/libs/sound/time.h (with props) branches/silverblade-audio/lib/drivers/sound/ branches/silverblade-audio/lib/drivers/sound/devname.c - copied unchanged from r34233, branches/silverblade-audio/drivers/multimedia/audio/sb16_nt4/devname.c branches/silverblade-audio/lib/drivers/sound/hardware.c (with props) branches/silverblade-audio/lib/drivers/sound/midiuart.c (with props) branches/silverblade-audio/lib/drivers/sound/sbdsp.c (with props) branches/silverblade-audio/lib/drivers/sound/sound.rbuild (with props) branches/silverblade-audio/lib/drivers/sound/time.c (with props) Removed: branches/silverblade-audio/drivers/multimedia/audio/sb16_nt4/devname.c Modified: branches/silverblade-audio/drivers/multimedia/audio/sb16_nt4/main.c branches/silverblade-audio/drivers/multimedia/audio/sb16_nt4/sb16_nt4.rbuild branches/silverblade-audio/lib/drivers/directory.rbuild Removed: branches/silverblade-audio/drivers/multimedia/audio/sb16_nt4/devname.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/drivers/multi… ============================================================================== --- branches/silverblade-audio/drivers/multimedia/audio/sb16_nt4/devname.c [iso-8859-1] (original) +++ branches/silverblade-audio/drivers/multimedia/audio/sb16_nt4/devname.c (removed) @@ -1,384 +1,0 @@ -/* - ReactOS Sound System - Device naming & creation helper routines - - Author: - Andrew Greenwood (andrew.greenwood(a)silverblade.co.uk) - - History: - 25 May 2008 - Created -*/ - -#include <ntddk.h> -#include <ntddsnd.h> -#include <debug.h> - -/* - Default device names - - Just to keep things tidy, we define a structure to hold both the \\Device - and \\DosDevices names, and then fill this structure with the default - device names that can be found in NTDDSND.H -*/ - -typedef struct _DEVICE_NAME_GROUP -{ - PCWSTR DeviceName; - PCWSTR DosDeviceName; -} DEVICE_NAME_GROUP; - -DEVICE_NAME_GROUP SoundDeviceNameBodies[6] = -{ - { - DD_WAVE_IN_DEVICE_NAME_U, - DD_WAVE_IN_DOS_DEVICE_NAME_U - }, - { - DD_WAVE_OUT_DEVICE_NAME_U, - DD_WAVE_OUT_DOS_DEVICE_NAME_U - }, - { - DD_MIDI_IN_DEVICE_NAME_U, - DD_MIDI_IN_DOS_DEVICE_NAME_U - }, - { - DD_MIDI_OUT_DEVICE_NAME_U, - DD_MIDI_OUT_DOS_DEVICE_NAME_U - }, - { - DD_MIX_DEVICE_NAME_U, - DD_MIX_DOS_DEVICE_NAME_U - }, - { - DD_AUX_DEVICE_NAME_U, - DD_AUX_DOS_DEVICE_NAME_U - } -}; - - -/* - ConstructDeviceName - - This takes a wide-character string containing the device name body (for - example, "\\Device\\WaveOut") and appends the device index, forming a - string like "\\Device\\WaveOut0", and so on. - - The resulting device name is a unicode string. -*/ - -NTSTATUS -ConstructDeviceName( - IN PCWSTR Path, - IN UCHAR Index, - OUT PUNICODE_STRING DeviceName) -{ - UNICODE_STRING UnicodePath; - UNICODE_STRING UnicodeIndex; - WCHAR IndexStringBuffer[5]; - USHORT Size; - USHORT LastCharacterIndex; - - /* Check for NULL parameters */ - if ( ( ! Path ) || ( ! DeviceName ) ) - { - ERR_(IHVAUDIO, "Unexpected NULL parameter"); - return STATUS_INVALID_PARAMETER; - } - - /* Range-check */ - if ( Index >= SOUND_MAX_DEVICES ) - { - ERR_(IHVAUDIO, "Device index %d out of range", Index); - return STATUS_INVALID_PARAMETER; - } - - /* Initialise the unicode path string */ - RtlInitUnicodeString(&UnicodePath, Path); - - /* Calculate the length to hold the full string */ - Size = UnicodePath.Length + - sizeof(IndexStringBuffer) + - sizeof(UNICODE_NULL); - - /* Allocate memory for DeviceName */ - DeviceName->Buffer = ExAllocatePool(PagedPool, Size); - DeviceName->MaximumLength = Size; - - if ( ! DeviceName->Buffer ) - { - ERR_(IHVAUDIO, "Couldn't allocate memory for device name string"); - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* Copy the path */ - RtlCopyUnicodeString(DeviceName, &UnicodePath); - - /* Convert Index to string and append */ - UnicodeIndex.Buffer = IndexStringBuffer; - UnicodeIndex.MaximumLength = sizeof(IndexStringBuffer); - - RtlIntegerToUnicodeString((ULONG)Index, 10, &UnicodeIndex); - RtlAppendUnicodeStringToString(DeviceName, &UnicodeIndex); - - /* Terminate the string */ - LastCharacterIndex = DeviceName->Length / sizeof(UNICODE_NULL); - DeviceName->Buffer[LastCharacterIndex] = UNICODE_NULL; - - return STATUS_SUCCESS; -} - - -/* - FreeUnicodeStringBuffer - - A small helper routine to free a unicode string buffer, nullify the - buffer and reset the lengths to zero. -*/ - -VOID -FreeUnicodeStringBuffer(IN PUNICODE_STRING String) -{ - ASSERT(String != NULL); - ASSERT(String->Buffer != NULL); - - ExFreePool(String->Buffer); - - String->Buffer = NULL; - String->Length = 0; - String->MaximumLength = 0; -} - - -/* - GetDefaultSoundDeviceNameBodies - - Simply accesses the SoundDeviceNameBodies struct defined earlier and - fills the DeviceNameBody and DosDeviceNameBody parameters accordingly. - - Basically a "safe" way to access the array and perform two assignments - with one call, as this will assign the name and DOS name if a valid - DeviceType is passed, otherwise it will fail with STATUS_INVALID_PARAMETER. -*/ - -NTSTATUS -GetDefaultSoundDeviceNameBodies( - IN UCHAR DeviceType, - OUT PCWSTR* DeviceNameBody, - OUT PCWSTR* DosDeviceNameBody) -{ - ASSERT(DeviceNameBody != NULL); - ASSERT(DosDeviceNameBody != NULL); - - if ( DeviceType > MAX_DEVICE_TYPE ) - { - ERR_(IHVAUDIO, "Invalid device type"); - return STATUS_INVALID_PARAMETER; - } - - *DeviceNameBody = SoundDeviceNameBodies[DeviceType].DeviceName; - *DosDeviceNameBody = SoundDeviceNameBodies[DeviceType].DosDeviceName; - - return STATUS_SUCCESS; -} - - -/* - ConstructSoundDeviceNames - - Given two wide-character strings and a device index, convert these into - two unicode strings with the index appended to the end. - - This is intended for converting a device name and a DOS device name at - the same time. -*/ - -NTSTATUS -ConstructSoundDeviceNames( - IN PCWSTR DeviceNameBody, - IN PCWSTR DosDeviceNameBody, - IN UCHAR Index, - OUT PUNICODE_STRING FullDeviceName, - OUT PUNICODE_STRING FullDosDeviceName) -{ - NTSTATUS Status; - - /* Check for NULL parameters */ - if ( ( ! DeviceNameBody ) || ( ! DosDeviceNameBody ) || - ( ! FullDeviceName ) || ( ! FullDosDeviceName ) ) - { - ERR_(IHVAUDIO, "Unexpected NULL parameter"); - return STATUS_INVALID_PARAMETER; - } - - /* Range-check */ - if ( Index >= SOUND_MAX_DEVICES ) - { - ERR_(IHVAUDIO, "Device %d exceeds maximum", Index); - return STATUS_INVALID_PARAMETER; - } - - Status = ConstructDeviceName(DeviceNameBody, Index, FullDeviceName); - - if ( ! NT_SUCCESS(Status) ) - { - /* No need to clean up on failure here */ - return Status; - } - - Status = ConstructDeviceName(DosDeviceNameBody, Index, FullDosDeviceName); - - if ( ! NT_SUCCESS(Status) ) - { - /* We need to free the string we successfully got earlier */ - FreeUnicodeStringBuffer(FullDeviceName); - return Status; - } - - return STATUS_SUCCESS; -} - - -/* - CreateSoundDevice - - Creates a device and symbolically-links a DOS device to this. Use this - when you want to specify alternative device names to the defaults - (eg: "\\Device\\MySoundDev" rather than "\\Device\\WaveOut") -*/ - -NTSTATUS -CreateSoundDevice( - IN PDRIVER_OBJECT DriverObject, - IN PCWSTR WideDeviceName, - IN PCWSTR WideDosDeviceName, - IN UCHAR Index, - IN ULONG ExtensionSize, - OUT PDEVICE_OBJECT DeviceObject) -{ - NTSTATUS Status; - - UNICODE_STRING DeviceName; - UNICODE_STRING DosDeviceName; - - /* Check for NULL parameters */ - if ( ( ! DriverObject ) || ( ! DeviceObject ) || - ( ! WideDeviceName ) || ( ! WideDosDeviceName ) ) - { - ERR_(IHVAUDIO, "Unexpected NULL parameter"); - return STATUS_INVALID_PARAMETER; - } - - /* Range-check */ - if ( Index >= SOUND_MAX_DEVICES ) - { - ERR_(IHVAUDIO, "Device index %d exceeds maximum", Index); - return STATUS_INVALID_PARAMETER; - } - - /* Construct the device and DOS device names */ - Status = ConstructSoundDeviceNames(WideDeviceName, - WideDosDeviceName, - Index, - &DeviceName, - &DosDeviceName); - - if ( ! NT_SUCCESS(Status) ) - { - return Status; - } - - /* Now create the device */ - Status = IoCreateDevice(DriverObject, - ExtensionSize, - &DeviceName, - FILE_DEVICE_SOUND, - 0, - FALSE, - &DeviceObject); - - if ( ! NT_SUCCESS(Status) ) - { - /* These will have been allocated by ConstructSoundDeviceNames */ - FreeUnicodeStringBuffer(&DeviceName); - FreeUnicodeStringBuffer(&DosDeviceName); - - return Status; - } - - /* Create a symbolic link for the DOS deviec name */ - Status = IoCreateSymbolicLink(&DosDeviceName, &DeviceName); - - if ( ! NT_SUCCESS(Status) ) - { - /* IoDeleteDevice( --- What are we deleting? */ - - /* These will have been allocated by ConstructSoundDeviceNames */ - FreeUnicodeStringBuffer(&DeviceName); - FreeUnicodeStringBuffer(&DosDeviceName); - - return Status; - } - - return STATUS_SUCCESS; -} - - -/* - CreateSoundDeviceWithDefaultName - - Similar to CreateSoundDevice, except this uses the default device names - ("\\Device\\WaveOut" etc.) based on the DeviceType parameter. -*/ - -NTSTATUS -CreateSoundDeviceWithDefaultName( - IN PDRIVER_OBJECT DriverObject, - IN UCHAR DeviceType, - IN UCHAR Index, - IN ULONG ExtensionSize, - OUT PDEVICE_OBJECT DeviceObject) -{ - NTSTATUS Status; - PCWSTR WideDeviceName = NULL; - PCWSTR WideDosDeviceName = NULL; - - /* Check for NULL parameters */ - if ( ( ! DriverObject ) || ( ! DeviceObject ) ) - { - ERR_(IHVAUDIO, "Unexpected NULL parameter"); - return STATUS_INVALID_PARAMETER; - } - - /* Range-check */ - if ( Index >= SOUND_MAX_DEVICES ) - { - ERR_(IHVAUDIO, "Device index %d exceeds maximum", Index); - return STATUS_INVALID_PARAMETER; - } - - /* Look-up the default name based on the device type */ - Status = GetDefaultSoundDeviceNameBodies(DeviceType, - &WideDeviceName, - &WideDosDeviceName); - - if ( ! NT_SUCCESS(Status) ) - { - return Status; - } - - /* Go create the device! */ - Status = CreateSoundDevice(DriverObject, - WideDeviceName, - WideDosDeviceName, - Index, - ExtensionSize, - DeviceObject); - - if ( ! NT_SUCCESS(Status) ) - { - /* No clean-up to do */ - return Status; - } - - return STATUS_SUCCESS; -} Modified: branches/silverblade-audio/drivers/multimedia/audio/sb16_nt4/main.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/drivers/multi… ============================================================================== --- branches/silverblade-audio/drivers/multimedia/audio/sb16_nt4/main.c [iso-8859-1] (original) +++ branches/silverblade-audio/drivers/multimedia/audio/sb16_nt4/main.c [iso-8859-1] Tue Jul 1 11:09:10 2008 @@ -13,6 +13,8 @@ #include <ntddk.h> #include <ntddsnd.h> #include <debug.h> + +#include <devname.h> typedef struct _SOUND_BLASTER_EXTENSION { @@ -90,6 +92,49 @@ INFO_(IHVAUDIO, "Sound Blaster driver being unloaded"); } + +#define SOUND_PARAMETERS_KEYNAME_W L"Parameters" +#define SOUND_DEVICES_KEYNAME_W L"Devices" +#define SOUND_DEVICE_KEYNAME_PREFIX_W L"Device" + +/* NT4 */ +ULONG +GetSoundDeviceCount( + IN PUNICODE_STRING RegistryPath) +{ + NTSTATUS Status; + OBJECT_ATTRIBUTES Attributes; + HANDLE KeyHandle; + ULONG DeviceCount = 0; + PCWSTR RegistryPathBuffer; + UNICODE_STRING FullRegistryPath; + ULONG PathLength; + + //PathLength = RegistryPath.Length +; + + /* TODO */ + /*RegistryPathBuffer = ExAllocatePoolWithTag(PAGED_POOL,*/ + + InitializeObjectAttributes(&Attributes, + RegistryPath, + OBJ_KERNEL_HANDLE, + NULL, + NULL); + + Status = ZwOpenKey(&KeyHandle, + KEY_QUERY_VALUE | KEY_ENUMERATE_SUB_KEYS, + &Attributes); + + if ( ! NT_SUCCESS(Status) ) + { + return 0; + } + + //ZwEnumerateKey(Key +} + + + NTSTATUS STDCALL DriverEntry( IN PDRIVER_OBJECT DriverObject, @@ -108,6 +153,9 @@ DriverObject->MajorFunction[IRP_MJ_WRITE] = WriteSoundBlaster; DriverObject->DriverUnload = UnloadSoundBlaster; + DEVICE_OBJECT device; + CreateSoundDeviceWithDefaultName(DriverObject, 0, 69, 0, &device); + return STATUS_SUCCESS; } Modified: branches/silverblade-audio/drivers/multimedia/audio/sb16_nt4/sb16_nt4.rbuild URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/drivers/multi… ============================================================================== --- branches/silverblade-audio/drivers/multimedia/audio/sb16_nt4/sb16_nt4.rbuild [iso-8859-1] (original) +++ branches/silverblade-audio/drivers/multimedia/audio/sb16_nt4/sb16_nt4.rbuild [iso-8859-1] Tue Jul 1 11:09:10 2008 @@ -1,11 +1,13 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="sb16_nt4" type="kernelmodedriver" installbase="system32/drivers" installname="sndblst.sys" allowwarnings="true"> + <linkerflag>-lgcc</linkerflag> <include base="sb16_nt4">.</include> <include base="sb16_nt4">..</include> + <include base="ReactOS">include/reactos/libs/sound</include> <importlibrary definition="sb16_nt4.def" /> + <library>sound</library> <library>ntoskrnl</library> <library>hal</library> - <file>test.c</file> - <file>devname.c</file> + <file>main.c</file> </module> Added: branches/silverblade-audio/include/reactos/libs/sound/devname.h URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/include/react… ============================================================================== --- branches/silverblade-audio/include/reactos/libs/sound/devname.h (added) +++ branches/silverblade-audio/include/reactos/libs/sound/devname.h [iso-8859-1] Tue Jul 1 11:09:10 2008 @@ -1,0 +1,113 @@ +/* + ReactOS Sound System + Device naming & creation helper routines + + Author: + Andrew Greenwood (andrew.greenwood(a)silverblade.co.uk) + + History: + 25 May 2008 - Created +*/ + +#ifndef ROS_DEVNAME +#define ROS_DEVNAME + +/* + ConstructDeviceName + + This takes a wide-character string containing the device name body (for + example, "\\Device\\WaveOut") and appends the device index, forming a + string like "\\Device\\WaveOut0", and so on. + + The resulting device name is a unicode string. +*/ + +NTSTATUS +ConstructDeviceName( + IN PCWSTR Path, + IN UCHAR Index, + OUT PUNICODE_STRING DeviceName); + + +/* + FreeUnicodeStringBuffer + + A small helper routine to free a unicode string buffer, nullify the + buffer and reset the lengths to zero. +*/ + +VOID +FreeUnicodeStringBuffer(IN PUNICODE_STRING String); + + +/* + GetDefaultSoundDeviceNameBodies + + Simply accesses the SoundDeviceNameBodies struct defined earlier and + fills the DeviceNameBody and DosDeviceNameBody parameters accordingly. + + Basically a "safe" way to access the array and perform two assignments + with one call, as this will assign the name and DOS name if a valid + DeviceType is passed, otherwise it will fail with STATUS_INVALID_PARAMETER. +*/ + +NTSTATUS +GetDefaultSoundDeviceNameBodies( + IN UCHAR DeviceType, + OUT PCWSTR* DeviceNameBody, + OUT PCWSTR* DosDeviceNameBody); + + +/* + ConstructSoundDeviceNames + + Given two wide-character strings and a device index, convert these into + two unicode strings with the index appended to the end. + + This is intended for converting a device name and a DOS device name at + the same time. +*/ + +NTSTATUS +ConstructSoundDeviceNames( + IN PCWSTR DeviceNameBody, + IN PCWSTR DosDeviceNameBody, + IN UCHAR Index, + OUT PUNICODE_STRING FullDeviceName, + OUT PUNICODE_STRING FullDosDeviceName); + + +/* + CreateSoundDevice + + Creates a device and symbolically-links a DOS device to this. Use this + when you want to specify alternative device names to the defaults + (eg: "\\Device\\MySoundDev" rather than "\\Device\\WaveOut") +*/ + +NTSTATUS +CreateSoundDevice( + IN PDRIVER_OBJECT DriverObject, + IN PCWSTR WideDeviceName, + IN PCWSTR WideDosDeviceName, + IN UCHAR Index, + IN ULONG ExtensionSize, + OUT PDEVICE_OBJECT DeviceObject); + + +/* + CreateSoundDeviceWithDefaultName + + Similar to CreateSoundDevice, except this uses the default device names + ("\\Device\\WaveOut" etc.) based on the DeviceType parameter. +*/ + +NTSTATUS +CreateSoundDeviceWithDefaultName( + IN PDRIVER_OBJECT DriverObject, + IN UCHAR DeviceType, + IN UCHAR Index, + IN ULONG ExtensionSize, + OUT PDEVICE_OBJECT DeviceObject); + +#endif Propchange: branches/silverblade-audio/include/reactos/libs/sound/devname.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/silverblade-audio/include/reactos/libs/sound/midi.h URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/include/react… ============================================================================== --- branches/silverblade-audio/include/reactos/libs/sound/midi.h (added) +++ branches/silverblade-audio/include/reactos/libs/sound/midi.h [iso-8859-1] Tue Jul 1 11:09:10 2008 @@ -1,0 +1,39 @@ +/* + ReactOS Sound System + MIDI constants + + Author: + Andrew Greenwood (andrew.greenwood(a)silverblade.co.uk) + + History: + 26 May 2008 - Created +*/ + +#ifndef ROS_MIDI +#define ROS_MIDI + +/* Channel-based MIDI status bytes */ +#define MIDI_NOTE_OFF 0x80 +#define MIDI_NOTE_ON 0x90 +#define MIDI_KEY_PRESSURE 0xA0 +#define MIDI_CONTROL_CHANGE 0xB0 +#define MIDI_PROGRAM_CHANGE 0xC0 +#define MIDI_CHANNEL_PRESSURE 0xD0 +#define MIDI_PITCH_BEND 0xE0 + +/* System MIDI status bytes */ +#define MIDI_SYSEX_START 0xF0 +#define MIDI_QUARTER_FRAME 0xF1 +#define MIDI_SONG_POSITION 0xF2 +#define MIDI_SONG_SELECT 0xF3 +#define MIDI_TUNE_REQUEST 0xF6 +#define MIDI_SYSEX_END 0xF7 +#define MIDI_CLOCK 0xF8 +#define MIDI_TICK 0xF9 +#define MIDI_START 0xFA +#define MIDI_CONTINUE 0xFB +#define MIDI_STOP 0xFC +#define MIDI_ACTIVE_SENSE 0xFE +#define MIDI_RESET 0xFF + +#endif Propchange: branches/silverblade-audio/include/reactos/libs/sound/midi.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/silverblade-audio/include/reactos/libs/sound/midiuart.h URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/include/react… ============================================================================== --- branches/silverblade-audio/include/reactos/libs/sound/midiuart.h (added) +++ branches/silverblade-audio/include/reactos/libs/sound/midiuart.h [iso-8859-1] Tue Jul 1 11:09:10 2008 @@ -1,0 +1,111 @@ +/* + ReactOS Sound System + MIDI UART support + + Author: + Andrew Greenwood (andrew.greenwood(a)silverblade.co.uk) + + History: + 26 May 2008 - Created + + Notes: + MIDI UART is fairly simple. There are two ports - one is a data + port and is read/write, the other is a command/status port where + you can write commands, and read status. + + We use a subset of the functionality offered by the original MPU-401 + hardware, which is pretty much the only part implemented in sound + cards these days, known as "MIDI UART" mode. +*/ + +#ifndef ROS_MIDIUART +#define ROS_MIDIUART + +/* Port read/write abstraction (no wait) */ +#define WRITE_MIDIUART_DATA(bp, x) WRITE_PORT_UCHAR((PUCHAR) bp, x) +#define READ_MIDIUART_DATA(bp) READ_PORT_UCHAR((PUCHAR) bp) +#define WRITE_MIDIUART_COMMAND(bp, x) WRITE_PORT_UCHAR((PUCHAR) bp+1, x) +#define READ_MIDIUART_STATUS(bp) READ_PORT_UCHAR((PUCHAR) bp+1) + +/* Status flags */ +#define MIDIUART_STATUS_DTR 0x40 +#define MIDIUART_STATUS_CTS 0x80 + + +/* + WaitForMidiUartStatus + + A universal routine for waiting for one or more bits to be set on the + MIDI UART command/status port. (Not a particularly efficient wait as + this polls the port until it's ready!) + + If the timeout is reached, the function returns FALSE. Otherwise, when + the specified flag(s) become set, the function returns TRUE. +*/ + +BOOLEAN +WaitForMidiUartStatus( + IN PUCHAR UartBasePort, + IN UCHAR StatusFlags, + IN ULONG Timeout); + +/* Waits for the CTS status bit to be set */ +#define WaitForMidiUartCTS(UartBasePort, Timeout) \ + WaitForMidiUartStatus(UartBasePort, MIDIUART_STATUS_CTS, Timeout) + +/* Waits for the DTR status bit to be set */ +#define WaitForMidiUartDTR(UartBasePort, Timeout) \ + WaitForMidiUartStatus(UartBasePort, MIDIUART_STATUS_DTR, Timeout) + +/* + WriteMidiUartByte + + Wait for the CTS bit to be set on the command/status port, before + writing to the data port. If CTS does not get set within the timeout + period, returns FALSE. Otherwise, returns TRUE. +*/ + +BOOLEAN +WriteMidiUartByte( + IN PUCHAR UartBasePort, + IN UCHAR Data, + IN ULONG Timeout); + + +/* + WriteMidiUartMulti + + Write multiple bytes to the MIDI UART data port. The timeout applies on a + per-byte basis. If it is reached for any byte, the function will return + FALSE. + + All data is written "as-is" - there are no checks made as to the validity + of the data. +*/ + +BOOLEAN +WriteMidiUartMulti( + IN PUCHAR UartBasePort, + IN PUCHAR Data, + IN ULONG DataLength, + IN ULONG Timeout); + + +/* + ReadMidiUartByte + + Wait for the DTR bit to be set on the command/status port, before + reading from the data port. If DTR does not get set within the + timeout period, returns FALSE. Otherwise, returns TRUE. + + On success, the read data is stored in the location specified by + the Data parameter. +*/ + +BOOLEAN +ReadMidiUartByte( + IN PUCHAR UartBasePort, + OUT UCHAR* Data, + IN ULONG Timeout); + +#endif Propchange: branches/silverblade-audio/include/reactos/libs/sound/midiuart.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/silverblade-audio/include/reactos/libs/sound/time.h URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/include/react… ============================================================================== --- branches/silverblade-audio/include/reactos/libs/sound/time.h (added) +++ branches/silverblade-audio/include/reactos/libs/sound/time.h [iso-8859-1] Tue Jul 1 11:09:10 2008 @@ -1,0 +1,21 @@ +/* + ReactOS Sound System + Timing helper + + Author: + Andrew Greenwood (andrew.greenwood(a)silverblade.co.uk) + + History: + 1 July 2008 - Created +*/ + +#ifndef ROS_SOUND_TIME +#define ROS_SOUND_TIME + +VOID +SleepMs(ULONG Milliseconds); + +ULONG +QuerySystemTimeMs(); + +#endif Propchange: branches/silverblade-audio/include/reactos/libs/sound/time.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/silverblade-audio/lib/drivers/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/d… ============================================================================== --- branches/silverblade-audio/lib/drivers/directory.rbuild [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/directory.rbuild [iso-8859-1] Tue Jul 1 11:09:10 2008 @@ -13,4 +13,7 @@ <directory name="chew"> <xi:include href="chew/chew.rbuild" /> </directory> + <directory name="sound"> + <xi:include href="sound/sound.rbuild" /> + </directory> </group> Added: branches/silverblade-audio/lib/drivers/sound/hardware.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/hardware.c (added) +++ branches/silverblade-audio/lib/drivers/sound/hardware.c [iso-8859-1] Tue Jul 1 11:09:10 2008 @@ -1,0 +1,66 @@ +/* + ReactOS Sound System + Hardware interaction helper + + Author: + Andrew Greenwood (andrew.greenwood(a)silverblade.co.uk) + + History: + 25 May 2008 - Created + + Notes: + This uses some obsolete calls (eg: HalGetInterruptVector). + Might be worth updating this in future to use some of the + recommended functions like IoReportDetectedDevice and + IoReportResourceForDetection... +*/ + +#include <ntddk.h> +#include <ntddsnd.h> +#include <debug.h> + +/* NOTE: Disconnect using IoDisconnectInterrupt */ + +NTSTATUS +LegacyAttachInterrupt( + IN PDEVICE_OBJECT DeviceObject, + IN UCHAR Irq, + IN PKSERVICE_ROUTINE ServiceRoutine, + OUT PKINTERRUPT* InterruptObject) +{ + NTSTATUS Status; + ULONG Vector; + KIRQL IrqLevel; + KAFFINITY Affinity; + + INFO_(IHVAUDIO, "Obtaining interrupt vector"); + + Vector = HalGetInterruptVector(Isa, + 0, + Irq, + Irq, + &IrqLevel, + &Affinity); + + INFO_(IHVAUDIO, "Vector %d", Vector); + INFO_(IHVAUDIO, "Connecting IRQ %d", Irq); + + Status = IoConnectInterrupt(InterruptObject, + ServiceRoutine, + DeviceObject, + NULL, + Vector, + IrqLevel, + IrqLevel, + Latched, + FALSE, + Affinity, + FALSE); + + if ( Status == STATUS_INVALID_PARAMETER ) + { + Status = STATUS_DEVICE_CONFIGURATION_ERROR; + } + + return Status; +} Propchange: branches/silverblade-audio/lib/drivers/sound/hardware.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/silverblade-audio/lib/drivers/sound/midiuart.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/midiuart.c (added) +++ branches/silverblade-audio/lib/drivers/sound/midiuart.c [iso-8859-1] Tue Jul 1 11:09:10 2008 @@ -1,0 +1,172 @@ +/* + ReactOS Sound System + MIDI UART support + + Author: + Andrew Greenwood (andrew.greenwood(a)silverblade.co.uk) + + History: + 26 May 2008 - Created + + Notes: + Functions documented in midiuart.h +*/ + +#include <ntddk.h> +#include "midiuart.h" + +BOOLEAN +WaitForMidiUartStatus( + IN PUCHAR UartBasePort, + IN UCHAR StatusFlags, + IN ULONG Timeout) +{ + ULONG RemainingTime = Timeout; + + while ( RemainingTime -- ) + { + if ( READ_MIDIUART_STATUS(UartBasePort) & StatusFlags ) + { + return TRUE; + } + } + + return FALSE; +} + +BOOLEAN +WriteMidiUartByte( + IN PUCHAR UartBasePort, + IN UCHAR Data, + IN ULONG Timeout) +{ + if ( ! WaitForMidiUartCTS(UartBasePort, Timeout) ) + { + return FALSE; + } + + WRITE_MIDIUART_DATA(UartBasePort, Data); + + return TRUE; +} + +BOOLEAN +WriteMidiUartMulti( + IN PUCHAR UartBasePort, + IN PUCHAR Data, + IN ULONG DataLength, + IN ULONG Timeout) +{ + ULONG DataIndex; + + for ( DataIndex = 0; DataIndex < DataLength; ++ DataIndex ) + { + if ( ! WriteMidiUartByte(UartBasePort, Data[DataIndex], Timeout) ) + { + /* We failed - don't try writing any more */ + return FALSE; + } + } + + return TRUE; +} + +BOOLEAN +ReadMidiUartByte( + IN PUCHAR UartBasePort, + OUT UCHAR* Data, + IN ULONG Timeout) +{ + if ( ! Data ) + { + return FALSE; + } + + if ( ! WaitForMidiUartDTR(UartBasePort, Timeout) ) + { + return FALSE; + } + + *Data = READ_MIDIUART_DATA(UartBasePort); + + return TRUE; +} + + +/* Experimental OO-style stuff */ +/* +typedef struct _MIDIUART +{ + PUCHAR BasePort; + ULONG Timeout; +} MIDIUART, *PMIDIUART; + +NTSTATUS +MidiUart_Create( + IN PUCHAR BasePort, + IN ULONG Timeout, + OUT PMIDIUART* MidiUart) +{ + PMIDIUART NewMidiUart; + + if ( ! MidiUart ) + return STATUS_INVALID_PARAMETER; + + NewMidiUart = ExAllocatePoolWithTag(sizeof(MIDIUART), PAGED_POOL, 'MIDU'); + + if ( ! NewMidiUart ) + return STATUS_INSUFFICIENT_RESOURCES; + + NewMidiUart->BasePort = BasePort; + NewMidiUart->Timeout = Timeout; + + *MidiUart = NewMidiUart; + + return STATUS_SUCCESS; +} + +BOOLEAN +MidiUart_WaitForStatus( + IN PMIDIUART MidiUart, + IN UCHAR StatusFlags) +{ + if ( ! MidiUart) + return FALSE; + + return WaitForMidiUartStatus(MidiUart->BasePort, + StatusFlags, + MidiUart->Timeout); +} + +#define MidiUart_WaitForCTS(inst) \ + MidiUart_WaitForStatus(inst, MIDIUART_STATUS_CTS) + +#define MidiUart_WaitForDTR(inst) \ + MidiUart_WaitForStatus(inst, MIDIUART_STATUS_DTR) + +BOOLEAN +MidiUart_WriteByte( + IN PMIDIUART MidiUart, + IN UCHAR Data) +{ + if ( ! MidiUart ) + return FALSE; + + return WriteMidiUartByte(MidiUart->BasePort, + Data, + MidiUart->Timeout); +} + +BOOLEAN +MidiUart_ReadByte( + IN PMIDIUART MidiUart, + OUT PUCHAR Data) +{ + if ( ! MidiUart ) + return FALSE; + + return ReadMidiUartByte(MidiUart->BasePort, + Data, + MidiUart->Timeout); +} +*/ Propchange: branches/silverblade-audio/lib/drivers/sound/midiuart.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/silverblade-audio/lib/drivers/sound/sbdsp.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/sbdsp.c (added) +++ branches/silverblade-audio/lib/drivers/sound/sbdsp.c [iso-8859-1] Tue Jul 1 11:09:10 2008 @@ -1,0 +1,119 @@ +/* + ReactOS Sound System + Sound Blaster DSP support + + Author: + Andrew Greenwood (andrew.greenwood(a)silverblade.co.uk) + + History: + 26 May 2008 - Created + + Notes: + ... +*/ + +#include <ntddk.h> +#include <sound/time.h> + +/* + Sound Blaster ports I/O +*/ +#define READ_SB_FM1_STATUS(bp) READ_PORT_UCHAR((PUCHAR) bp) +#define WRITE_SB_FM1_REGISTER(bp, x) WRITE_PORT_UCHAR((PUCHAR) bp, x) +#define WRITE_SB_FM1_DATA(bp, x) WRITE_PORT_UCHAR((PUCHAR) bp+0x01, x) + +#define READ_SB_AFM_STATUS(bp) READ_PORT_UCHAR((PUCHAR) bp+0x02) +#define WRITE_SB_AFM_REGISTER(bp, x) WRITE_PORT_UCHAR((PUCHAR) bp+0x02, x) +#define WRITE_SB_AFM_DATA(bp, x) WRITE_PORT_UCHAR((PUCHAR) bp+0x03, x) + +#define WRITE_SB_MIXER_REGISTER(bp, x) WRITE_PORT_UCHAR((PUCHAR) bp+0x04, x) +#define READ_SB_MIXER_DATA(bp) READ_PORT_UCHAR((PUCHAR) bp+0x05) +#define WRITE_SB_MIXER_DATA(bp, x) WRITE_PORT_UCHAR((PUCHAR) bp+0x05, x) + +#define WRITE_SB_DSP_RESET(bp, x) WRITE_PORT_UCHAR((PUCHAR) bp+0x06, x) + +#define READ_SB_FM2_STATUS(bp) READ_PORT_UCHAR((PUCHAR) bp+0x08) +#define WRITE_SB_FM2_REGISTER(bp, x) WRITE_PORT_UCHAR((PUCHAR) bp+0x08, x) +#define WRITE_SB_FM2_DATA(bp, x) WRITE_PORT_UCHAR((PUCHAR) bp+0x09, x) + +#define READ_SB_DSP_DATA(bp) READ_PORT_UCHAR((PUCHAR) bp+0x0A) +#define WRITE_SB_DSP_DATA(bp, x) WRITE_PORT_UCHAR((PUCHAR) bp+0x0C, x) +#define WRITE_SB_DSP_COMMAND(bp, x) WRITE_PORT_UCHAR((PUCHAR) bp+0x0C, x) + +#define READ_SB_DSP_WRITE_BUFFER_STATUS(bp) \ + ( READ_PORT_UCHAR((PUCHAR) bp+0x0C) & 0x01 ) + +#define READ_SB_DSP_READ_BUFFER_STATUS(bp) \ + ( READ_PORT_UCHAR((PUCHAR) bp+0x0E) & 0x01 ) + + +#define SB_DSP_READY 0xAA + +/* + Sound Blaster DSP commands + (partial list) +*/ +#define SB_DSP_OUTPUT_RATE 0x41 +#define SB_DSP_INPUT_RATE 0x42 +#define SB_DSP_BLOCK_SIZE 0x48 +#define SB_DSP_SPEAKER_ON 0xD1 +#define SB_DSP_SPEAKER_OFF 0xD3 +#define SB_DSP_SPEAKER_STATUS 0xD8 +#define SB_DSP_VERSION 0xE1 + +BOOLEAN +ResetSoundBlasterDSP( + IN PUCHAR BasePort, + IN ULONG Timeout) +{ + ULONG Expiry; + KTIMER Timer; + KIRQL CurrentIrqLevel = KeGetCurrentIrql(); + + /* Should be called from DriverEntry with this IRQL */ + ASSERT(CurrentIrqLevel == PASSIVE_LEVEL); + + KeInitializeTimer(&Timer); + + WRITE_SB_DSP_RESET(BasePort, 0x01); + SleepMs(50); /* Should be enough */ + WRITE_SB_DSP_RESET(BasePort, 0x00); + + Expiry = QuerySystemTimeMs() + Timeout; + + while ( (QuerySystemTimeMs() < Expiry) || ( Timeout == 0) ) + { + if ( READ_SB_DSP_DATA(BasePort) == SB_DSP_READY ) + { + return TRUE; + } + } + + return FALSE; +} + +BOOLEAN +WaitForSoundBlasterDSPReady( + IN PUCHAR BasePort, + IN ULONG Timeout) +{ + ULONG Expiry = QuerySystemTimeMs() + Timeout; + + while ( (QuerySystemTimeMs() < Expiry) || (Timeout == 0) ) + { + // ... + } + + return FALSE; +} + +NTSTATUS +GetSoundBlasterDSPVersion( + IN PUCHAR BasePort, + OUT PUCHAR MajorVersion, + OUT PUCHAR MinorVersion, + IN ULONG Timeout) +{ + /* TODO */ + return STATUS_NOT_SUPPORTED; +} Propchange: branches/silverblade-audio/lib/drivers/sound/sbdsp.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/silverblade-audio/lib/drivers/sound/sound.rbuild URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/sound.rbuild (added) +++ branches/silverblade-audio/lib/drivers/sound/sound.rbuild [iso-8859-1] Tue Jul 1 11:09:10 2008 @@ -1,0 +1,13 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="sound" type="staticlibrary" allowwarnings="true"> + <define name="__NTDRIVER__"/> + <define name="KERNEL"/> + <include base="sound">.</include> + <include base="ReactOS">include/reactos/libs/sound</include> + <file>devname.c</file> + <file>hardware.c</file> + <file>midiuart.c</file> + <file>sbdsp.c</file> + <file>time.c</file> +</module> Propchange: branches/silverblade-audio/lib/drivers/sound/sound.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/silverblade-audio/lib/drivers/sound/time.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/time.c (added) +++ branches/silverblade-audio/lib/drivers/sound/time.c [iso-8859-1] Tue Jul 1 11:09:10 2008 @@ -1,0 +1,47 @@ +/* + ReactOS Sound System + Timing helper + + Author: + Andrew Greenwood (andrew.greenwood(a)silverblade.co.uk) + + History: + 31 May 2008 - Created + + Notes: + Timing may require testing! +*/ + +/* + Nanoseconds are fun! You must try some! + 1 ns = .000000001 seconds = .0000001 ms + 100 ns = .0000001 seconds = .00001 ms + 10000 ns = .00001 seconds = .001 ms + 1000000 ns = .001 seconds = 1 ms +*/ + +#include <ntddk.h> + +VOID +SleepMs(ULONG Milliseconds) +{ + LARGE_INTEGER Period; + + Period.QuadPart = -Milliseconds; + Period.QuadPart *= 10000; + + KeDelayExecutionThread(KernelMode, FALSE, &Period); +} + +ULONG +QuerySystemTimeMs() +{ + LARGE_INTEGER Time; + + KeQuerySystemTime(&Time); + + Time.QuadPart /= 10000; + + return (ULONG) Time.QuadPart; +} + Propchange: branches/silverblade-audio/lib/drivers/sound/time.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[jimtabor] 34233: Arc, Ellipse: - Converted over to use the new fill square algorithm for fill arcs and draw/fill ellipse. - Tested with (Area.exe) Yuan program. Chord work and the CW/CCW works as it should. - The pie angle still floats with aspect ratio of ellipse and not point fixed. Work in progress.
by jimtabor＠svn.reactos.org 01 Jul '08

01 Jul '08

Author: jimtabor Date: Tue Jul 1 08:30:44 2008 New Revision: 34233 URL: http://svn.reactos.org/svn/reactos?rev=34233&view=rev Log: Arc, Ellipse: - Converted over to use the new fill square algorithm for fill arcs and draw/fill ellipse. - Tested with (Area.exe) Yuan program. Chord work and the CW/CCW works as it should. - The pie angle still floats with aspect ratio of ellipse and not point fixed. Work in progress. Modified: trunk/reactos/subsystems/win32/win32k/objects/arc.c trunk/reactos/subsystems/win32/win32k/objects/drawing.c trunk/reactos/subsystems/win32/win32k/objects/fillshap.c Modified: trunk/reactos/subsystems/win32/win32k/objects/arc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/arc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/arc.c [iso-8859-1] Tue Jul 1 08:30:44 2008 @@ -42,7 +42,7 @@ ARCTYPE arctype) { PDC_ATTR Dc_Attr; - RECTL RectBounds; + RECTL RectBounds, RectSEpts; PGDIBRUSHOBJ PenBrushObj; GDIBRUSHINST PenBrushInst; BITMAPOBJ *BitmapObj; @@ -67,17 +67,6 @@ (Bottom - Top == 1)))) return TRUE; - if (dc->DcLevel.flPath & DCPATH_CLOCKWISE) - { - INT X, Y; - X = XRadialStart; - Y = YRadialStart; - XRadialStart = XRadialEnd; - YRadialStart = YRadialEnd; - XRadialEnd = X; - YRadialEnd = Y; - } - Dc_Attr = dc->pDc_Attr; if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; @@ -105,25 +94,31 @@ if (!PenWidth) PenWidth = 1; PenBrushObj->ptPenWidth.x = PenWidth; - Left += dc->ptlDCOrig.x; - Right += dc->ptlDCOrig.x; - Top += dc->ptlDCOrig.y; - Bottom += dc->ptlDCOrig.y; - - XRadialStart += dc->ptlDCOrig.x; - YRadialStart += dc->ptlDCOrig.y; - XRadialEnd += dc->ptlDCOrig.x; - YRadialEnd += dc->ptlDCOrig.y; - - DPRINT("1: StartX: %d, StartY: %d, EndX: %d, EndY: %d\n", - XRadialStart,YRadialStart,XRadialEnd,YRadialEnd); - RectBounds.left = Left; RectBounds.right = Right; RectBounds.top = Top; RectBounds.bottom = Bottom; + RectSEpts.left = XRadialStart; + RectSEpts.top = YRadialStart; + RectSEpts.right = XRadialEnd; + RectSEpts.bottom = YRadialEnd; + IntLPtoDP(dc, (LPPOINT)&RectBounds, 2); + IntLPtoDP(dc, (LPPOINT)&RectSEpts, 2); + + RectBounds.left += dc->ptlDCOrig.x; + RectBounds.right += dc->ptlDCOrig.x; + RectBounds.top += dc->ptlDCOrig.y; + RectBounds.bottom += dc->ptlDCOrig.y; + + RectSEpts.left += dc->ptlDCOrig.x; + RectSEpts.top += dc->ptlDCOrig.y; + RectSEpts.right += dc->ptlDCOrig.x; + RectSEpts.bottom += dc->ptlDCOrig.y; + + DPRINT("1: StartX: %d, StartY: %d, EndX: %d, EndY: %d\n", + RectSEpts.left,RectSEpts.top,RectSEpts.right,RectSEpts.bottom); DPRINT("1: Left: %d, Top: %d, Right: %d, Bottom: %d\n", RectBounds.left,RectBounds.top,RectBounds.right,RectBounds.bottom); @@ -132,8 +127,8 @@ RadiusY = max((RectBounds.bottom - RectBounds.top) / 2, 1); CenterX = (RectBounds.right + RectBounds.left) / 2; CenterY = (RectBounds.bottom + RectBounds.top) / 2; - AngleEnd = atan2((YRadialEnd - CenterY), XRadialEnd - CenterX)*(360.0/(M_PI*2)); - AngleStart = atan2((YRadialStart - CenterY), XRadialStart - CenterX)*(360.0/(M_PI*2)); + AngleEnd = atan2((RectSEpts.bottom - CenterY), RectSEpts.right - CenterX)*(360.0/(M_PI*2)); + AngleStart = atan2((RectSEpts.top - CenterY), RectSEpts.left - CenterX)*(360.0/(M_PI*2)); SfCx = (Rcos(AngleStart) * RadiusX); SfCy = (Rsin(AngleStart) * RadiusY); @@ -175,7 +170,7 @@ if (dc->DcLevel.flPath & DCPATH_CLOCKWISE) { - DPRINT("Arc CW\n"); + DPRINT1("Arc CW\n"); for (; AngS < AngT; AngS += Factor) { x = (RadiusX * Rcos(AngS)); @@ -197,7 +192,7 @@ } else { - DPRINT("Arc CCW\n"); + DPRINT1("Arc CCW\n"); for (; AngT < AngS; AngS -= Factor) { x = (RadiusX * Rcos(AngS)); Modified: trunk/reactos/subsystems/win32/win32k/objects/drawing.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/drawing.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/drawing.c [iso-8859-1] Tue Jul 1 08:30:44 2008 @@ -81,12 +81,11 @@ rect(int x, int y, int width, int height) { Rect r; - r.x = x; - r.y = y; - r.width = width; - r.height = height; - return r; + r.y = y; + r.width = width; + r.height = height; + return r; } @@ -107,11 +106,13 @@ INTERNAL_CALL app_fill_rect(DC *dc, Rect r, PGDIBRUSHOBJ BrushObj) { + DWORD ROP = PATCOPY; RECTL DestRect; BITMAPOBJ *BitmapObj; GDIBRUSHINST BrushInst; POINTL BrushOrigin; BOOL Ret = TRUE; + PDC_ATTR Dc_Attr = NULL; ASSERT(BrushObj); @@ -124,6 +125,8 @@ if (!(BrushObj->flAttrs & GDIBRUSH_IS_NULL)) { + Dc_Attr = dc->pDc_Attr; + if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr; /* fix negative spaces */ if (r.width < 0) @@ -146,6 +149,11 @@ BrushOrigin.x = BrushObj->ptOrigin.x; BrushOrigin.y = BrushObj->ptOrigin.y; + if (Dc_Attr->jROP2 == R2_XORPEN) + ROP = PATINVERT; + else + ROP = PATCOPY; + IntGdiInitBrushInstance(&BrushInst, BrushObj, dc->XlateBrush); Ret = IntEngBitBlt( @@ -159,11 +167,299 @@ NULL, &BrushInst.BrushObject, // use pDC->eboFill &BrushOrigin, - ROP3_TO_ROP4(PATCOPY)); + ROP3_TO_ROP4(ROP)); } BITMAPOBJ_UnlockBitmap(BitmapObj); return (int)Ret; +} + +static +int +INTERNAL_CALL +app_fill_rect_pen(DC *dc, Rect r, PGDIBRUSHOBJ BrushObj) +{ + DWORD ROP = PATCOPY; + RECTL DestRect; + BITMAPOBJ *BitmapObj; + GDIBRUSHINST BrushInst; + POINTL BrushOrigin; + BOOL Ret = TRUE; + PDC_ATTR Dc_Attr = NULL; + + ASSERT(BrushObj); + + BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap); + if (BitmapObj == NULL) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return 0; + } + + if (!(BrushObj->flAttrs & GDIBRUSH_IS_NULL)) + { + Dc_Attr = dc->pDc_Attr; + if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr; + + /* fix negative spaces */ + if (r.width < 0) + { + r.x += r.width; + r.width = 0 - r.width; + } + if (r.height < 0) + { + r.y += r.height; + r.height = 0 - r.height; + } + + DestRect.left = r.x; + DestRect.right = r.x + r.width; + + DestRect.top = r.y; + DestRect.bottom = r.y + r.height; + + BrushOrigin.x = BrushObj->ptOrigin.x; + BrushOrigin.y = BrushObj->ptOrigin.y; + + if (Dc_Attr->jROP2 == R2_XORPEN) + ROP = PATINVERT; + else + ROP = PATCOPY; + + IntGdiInitBrushInstance(&BrushInst, BrushObj, dc->XlatePen); + + Ret = IntEngBitBlt( + &BitmapObj->SurfObj, + NULL, + NULL, + dc->CombinedClip, + NULL, + &DestRect, + NULL, + NULL, + &BrushInst.BrushObject, // use pDC->eboFill + &BrushOrigin, + ROP3_TO_ROP4(ROP)); + } + + BITMAPOBJ_UnlockBitmap(BitmapObj); + return (int)Ret; +} + + +/* + * Drawing an ellipse with a certain line thickness. + * Use an inner and and outer ellipse and fill the spaces between. + * The inner ellipse uses all UPPERCASE letters, the outer lowercase. + * + * This algorithm is based on the fill_ellipse algorithm presented + * above, but uses two ellipse calculations, and some fix-up code + * to avoid pathological cases where the inner ellipse is almost + * the same size as the outer (in which case the border of the + * elliptical curve might otherwise have appeared broken). + */ +static +int +INTERNAL_CALL +app_draw_ellipse(DC *g, Rect r, PGDIBRUSHOBJ BrushObj) +{ + /* Outer ellipse: e(x,y) = b*b*x*x + a*a*y*y - a*a*b*b */ + + int a = r.width / 2; + int b = r.height / 2; + int x = 0; + int y = b; + long a2 = a*a; + long b2 = b*b; + long xcrit = (3 * a2 / 4) + 1; + long ycrit = (3 * b2 / 4) + 1; + long t = b2 + a2 - 2*a2*b; /* t = e(x+1,y-1) */ + long dxt = b2*(3+x+x); + long dyt = a2*(3-y-y); + int d2xt = b2+b2; + int d2yt = a2+a2; + + int w = BrushObj->ptPenWidth.x; + + /* Inner ellipse: E(X,Y) = B*B*X*X + A*A*Y*Y - A*A*B*B */ + + int A = a-w > 0 ? a-w : 0; + int B = b-w > 0 ? b-w : 0; + int X = 0; + int Y = B; + long A2 = A*A; + long B2 = B*B; + long XCRIT = (3 * A2 / 4) + 1; + long YCRIT = (3 * B2 / 4) + 1; + long T = B2 + A2 - 2*A2*B; /* T = E(X+1,Y-1) */ + long DXT = B2*(3+X+X); + long DYT = A2*(3-Y-Y); + int D2XT = B2+B2; + int D2YT = A2+A2; + + int movedown, moveout; + int innerX = 0, prevx, prevy, W; + Rect r1, r2; + int result = 1; + +// START_DEBUG(); + + if ((r.width <= 2) || (r.height <= 2)) + return app_fill_rect_pen(g, r, BrushObj); + + r1.x = r.x + a; + r1.y = r.y; + r1.width = r.width & 1; /* i.e. if width is odd */ + r1.height = 1; + + r2 = r1; + r2.y = r.y + r.height - 1; + + prevx = r1.x; + prevy = r1.y; + + while (y > 0) + { + while (Y == y) + { + innerX = X; + + if (T + A2*Y < XCRIT) /* E(X+1,Y-1/2) <= 0 */ + { + /* move outwards to encounter edge */ + X += 1; + T += DXT; + DXT += D2XT; + } + else if (T - B2*X >= YCRIT) /* e(x+1/2,y-1) > 0 */ + { + /* drop down one line */ + Y -= 1; + T += DYT; + DYT += D2YT; + } + else { + /* drop diagonally down and out */ + X += 1; + Y -= 1; + T += DXT + DYT; + DXT += D2XT; + DYT += D2YT; + } + } + + movedown = moveout = 0; + + W = x - innerX; + if (r1.x + W < prevx) + W = prevx - r1.x; + if (W < w) + W = w; + + if (t + a2*y < xcrit) /* e(x+1,y-1/2) <= 0 */ + { + /* move outwards to encounter edge */ + x += 1; + t += dxt; + dxt += d2xt; + + moveout = 1; + } + else if (t - b2*x >= ycrit) /* e(x+1/2,y-1) > 0 */ + { + /* drop down one line */ + y -= 1; + t += dyt; + dyt += d2yt; + + movedown = 1; + } + else { + /* drop diagonally down and out */ + x += 1; + y -= 1; + t += dxt + dyt; + dxt += d2xt; + dyt += d2yt; + + movedown = 1; + moveout = 1; + } + + if (movedown) { + if (r1.width == 0) { + r1.x -= 1; r1.width += 2; + r2.x -= 1; r2.width += 2; + moveout = 0; + } + + if (r1.x < r.x) + r1.x = r2.x = r.x; + if (r1.width > r.width) + r1.width = r2.width = r.width; + if (r1.y == r2.y-1) { + r1.x = r2.x = r.x; + r1.width = r2.width = r.width; + } + + if ((r1.y < r.y+w) || (r1.x+W >= r1.x+r1.width-W)) + { + result &= app_fill_rect_pen(g, r1, BrushObj); + result &= app_fill_rect_pen(g, r2, BrushObj); + + prevx = r1.x; + prevy = r1.y; + } + else if (r1.y+r1.height < r2.y) + { + /* draw distinct rectangles */ + result &= app_fill_rect_pen(g, rect(r1.x,r1.y, + W,1), BrushObj); + result &= app_fill_rect_pen(g, rect( + r1.x+r1.width-W,r1.y,W,1), BrushObj); + result &= app_fill_rect_pen(g, rect(r2.x, + r2.y,W,1), BrushObj); + result &= app_fill_rect_pen(g, rect( + r2.x+r2.width-W,r2.y,W,1), BrushObj); + + prevx = r1.x; + prevy = r1.y; + } + + /* move down */ + r1.y += 1; + r2.y -= 1; + } + + if (moveout) { + /* move outwards */ + r1.x -= 1; r1.width += 2; + r2.x -= 1; r2.width += 2; + } + } + if ((x <= a) && (prevy < r2.y)) { + /* draw final line */ + r1.height = r1.y+r1.height-r2.y; + r1.y = r2.y; + + W = w; + if (r.x + W != prevx) + W = prevx - r.x; + if (W < w) + W = w; + + if (W+W >= r.width) { + result &= app_fill_rect_pen(g, rect(r.x, r1.y, + r.width, r1.height), BrushObj); + return result; + } + + result &= app_fill_rect_pen(g, rect(r.x, r1.y, W, r1.height), BrushObj); + result &= app_fill_rect_pen(g, rect(r.x+r.width-W, r1.y, + W, r1.height), BrushObj); + } + return result; } /* @@ -652,14 +948,11 @@ /* find arc wedge line end points */ p1 = app_boundary_point(r, start_angle); p2 = app_boundary_point(r, end_angle); - p0 = pt(r.x + r.width/2, r.y + r.height/2); if (Chord) - { - int zx, zy; - zx = (p0.x-p1.x)/2; - zy = (p2.y-p1.y)/2; - p0 = pt(p1.x+zx,p0.y+zy); - } + p0 = pt((p1.x+p2.x)/2,(p1.y+p2.y)/2); + else + p0 = pt(r.x + r.width/2, r.y + r.height/2); + /* initialise rectangles to be drawn */ r1.x = r.x + a; r1.y = r.y; @@ -785,8 +1078,7 @@ PGDIBRUSHOBJ FillBrushObj; int Start = ceill(StartArc); int End = ceill(EndArc); - Rect r; - BOOL Chord = (arctype == GdiTypeChord); + BOOL Chord = (arctype == GdiTypeChord), ret; Dc_Attr = dc->pDc_Attr; if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; @@ -798,18 +1090,52 @@ SetLastWin32Error(ERROR_INTERNAL_ERROR); return FALSE; } - r.x = XLeft; - r.y = YLeft; - r.width = Width; - r.height = Height; // Sort out alignment here. - app_fill_arc(dc, r, - (dc->DcLevel.flPath & DCPATH_CLOCKWISE) ? -End : -Start, - (dc->DcLevel.flPath & DCPATH_CLOCKWISE) ? -Start : -End, - FillBrushObj, Chord); - + ret = app_fill_arc(dc, rect( XLeft, YLeft, Width, Height), + (dc->DcLevel.flPath & DCPATH_CLOCKWISE) ? -End : -Start, + (dc->DcLevel.flPath & DCPATH_CLOCKWISE) ? -Start : -End, + FillBrushObj, Chord); BRUSHOBJ_UnlockBrush(FillBrushObj); - return TRUE; + return ret; } +BOOL +FASTCALL +IntDrawEllipse( PDC dc, + INT XLeft, + INT YLeft, + INT Width, + INT Height, + PGDIBRUSHOBJ PenBrushObj) +{ + return (BOOL)app_draw_ellipse(dc, rect( XLeft, YLeft, Width, Height), PenBrushObj); +} + +BOOL +FASTCALL +IntFillEllipse( PDC dc, + INT XLeft, + INT YLeft, + INT Width, + INT Height) +{ + BOOL ret; + PDC_ATTR Dc_Attr; + PGDIBRUSHOBJ FillBrushObj; + + Dc_Attr = dc->pDc_Attr; + if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; + + FillBrushObj = BRUSHOBJ_LockBrush(Dc_Attr->hbrush); + if (NULL == FillBrushObj) + { + DPRINT1("FillEllipse Fail\n"); + SetLastWin32Error(ERROR_INTERNAL_ERROR); + return FALSE; + } + ret = (BOOL)app_fill_ellipse(dc, rect( XLeft, YLeft, Width, Height), FillBrushObj); + + BRUSHOBJ_UnlockBrush(FillBrushObj); + return ret; +} Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] Tue Jul 1 08:30:44 2008 @@ -41,6 +41,12 @@ &RectBounds, \ ROP2_TO_MIX(Dc_Attr->jROP2)); +#define Rsin(d) ((d) == 0.0 ? 0.0 : ((d) == 90.0 ? 1.0 : sin(d*M_PI/180.0))) +#define Rcos(d) ((d) == 0.0 ? 1.0 : ((d) == 90.0 ? 0.0 : cos(d*M_PI/180.0))) + +BOOL FASTCALL IntFillEllipse( PDC dc, INT XLeft, INT YLeft, INT Width, INT Height); +BOOL FASTCALL IntDrawEllipse( PDC dc, INT XLeft, INT YLeft, INT Width, INT Height, PGDIBRUSHOBJ PenBrushObj); + BOOL FASTCALL IntGdiPolygon(PDC dc, PPOINT UnsafePoints, @@ -133,9 +139,9 @@ ret = IntEngLineTo(&BitmapObj->SurfObj, dc->CombinedClip, &PenBrushInst.BrushObject, - UnsafePoints[Count-1].x, /* From */ + UnsafePoints[Count-1].x, /* From */ UnsafePoints[Count-1].y, - UnsafePoints[0].x, /* To */ + UnsafePoints[0].x, /* To */ UnsafePoints[0].y, &DestRect, ROP2_TO_MIX(Dc_Attr->jROP2)); /* MIX */ @@ -156,6 +162,7 @@ { if (PATH_IsPathOpen(dc->DcLevel)) return PATH_PolyPolygon ( dc, Points, PolyCounts, Count); + while (--Count >=0) { if (!IntGdiPolygon ( dc, Points, *PolyCounts )) @@ -179,247 +186,124 @@ * This function uses optimized Bresenham's ellipse algorithm. It draws * four lines of the ellipse in one pass. * - * Todo - * Make it look like a Windows ellipse. */ BOOL STDCALL NtGdiEllipse( HDC hDC, - int nLeftRect, - int nTopRect, - int nRightRect, - int nBottomRect) + int Left, + int Top, + int Right, + int Bottom) { - int ix, iy; - int A, B, C, D; - int da, db; - int NewA, NewB, NewC, NewD; - int nx, ny; - int CenterX, CenterY; - int RadiusX, RadiusY; - int Temp; - PGDIBRUSHOBJ FillBrush, PenBrush; - GDIBRUSHINST FillBrushInst, PenBrushInst; - BITMAPOBJ *BitmapObj; - RECTL RectBounds; PDC dc; PDC_ATTR Dc_Attr; - BOOL ret = TRUE, Cond1, Cond2; -/* top - ___________________ - +| | - | | - | | - left | | right - | | - | | - 0|___________________| - 0 bottom + - */ - /* - * Check the parameters. - */ - DPRINT("nLeftRect: %d, nTopRect: %d, nRightRect: %d, nBottomRect: %d\n",nLeftRect,nTopRect,nRightRect,nBottomRect); - - if ((nLeftRect == nRightRect) || (nTopRect == nBottomRect)) return TRUE; - - /* - * Get pointers to all necessary GDI objects. - */ + RECTL RectBounds; + PGDIBRUSHOBJ PenBrushObj; + BOOL ret = TRUE; + LONG PenWidth, PenOrigWidth; + LONG RadiusX, RadiusY, CenterX, CenterY; + + if ((Left == Right) || (Top == Bottom)) return TRUE; dc = DC_LockDc(hDC); if (dc == NULL) { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } if (dc->DC_Type == DC_TYPE_INFO) { + DC_UnlockDc(dc); + /* Yes, Windows really returns TRUE in this case */ + return TRUE; + } + + if (PATH_IsPathOpen(dc->DcLevel)) + { + ret = PATH_Ellipse(dc, Left, Top, Right, Bottom); DC_UnlockDc(dc); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } - - if (PATH_IsPathOpen(dc->DcLevel)) - { - ret = PATH_Ellipse(dc, nLeftRect, nTopRect, nRightRect, nBottomRect); - DC_UnlockDc(dc); - return ret; - } - - if (nRightRect < nLeftRect) - { - INT tmp = nRightRect; nRightRect = nLeftRect; nLeftRect = tmp; - } - if (nBottomRect < nTopRect) - { - INT tmp = nBottomRect; nBottomRect = nTopRect; nTopRect = tmp; + return ret; + } + + if (Right < Left) + { + INT tmp = Right; Right = Left; Left = tmp; + } + if (Bottom < Top) + { + INT tmp = Bottom; Bottom = Top; Top = tmp; } Dc_Attr = dc->pDc_Attr; if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; - FillBrush = BRUSHOBJ_LockBrush(Dc_Attr->hbrush); - if (NULL == FillBrush) - { + PenBrushObj = PENOBJ_LockPen(Dc_Attr->hpen); + if (NULL == PenBrushObj) + { + DPRINT1("Ellipse Fail 1\n"); DC_UnlockDc(dc); SetLastWin32Error(ERROR_INTERNAL_ERROR); return FALSE; } - PenBrush = PENOBJ_LockPen(Dc_Attr->hpen); - if (NULL == PenBrush) - { - BRUSHOBJ_UnlockBrush(FillBrush); - DC_UnlockDc(dc); - SetLastWin32Error(ERROR_INTERNAL_ERROR); - return FALSE; - } - - BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap); - if (NULL == BitmapObj) - { - BRUSHOBJ_UnlockBrush(FillBrush); - PENOBJ_UnlockPen(PenBrush); - DC_UnlockDc(dc); - SetLastWin32Error(ERROR_INTERNAL_ERROR); - return FALSE; - } - - IntGdiInitBrushInstance(&FillBrushInst, FillBrush, dc->XlateBrush); - IntGdiInitBrushInstance(&PenBrushInst, PenBrush, dc->XlatePen); - - RectBounds.left = nLeftRect; - RectBounds.right = nRightRect; - RectBounds.top = nTopRect; - RectBounds.bottom = nBottomRect; - + PenOrigWidth = PenWidth = PenBrushObj->ptPenWidth.x; + if (PenBrushObj->ulPenStyle == PS_NULL) PenWidth = 0; + + if (PenBrushObj->ulPenStyle == PS_INSIDEFRAME) + { + if (2*PenWidth > (Right - Left)) PenWidth = (Right -Left + 1)/2; + if (2*PenWidth > (Bottom - Top)) PenWidth = (Bottom -Top + 1)/2; + Left += PenWidth / 2; + Right -= (PenWidth - 1) / 2; + Top += PenWidth / 2; + Bottom -= (PenWidth - 1) / 2; + } + + if (!PenWidth) PenWidth = 1; + PenBrushObj->ptPenWidth.x = PenWidth; + + RectBounds.left = Left; + RectBounds.right = Right; + RectBounds.top = Top; + RectBounds.bottom = Bottom; + IntLPtoDP(dc, (LPPOINT)&RectBounds, 2); - DPRINT("1: Left: %d, Top: %d, Right: %d, Bottom: %d\n", - RectBounds.left,RectBounds.top,RectBounds.right,RectBounds.bottom); - + RectBounds.left += dc->ptlDCOrig.x; RectBounds.right += dc->ptlDCOrig.x; RectBounds.top += dc->ptlDCOrig.y; RectBounds.bottom += dc->ptlDCOrig.y; - DPRINT("2: Left: %d, Top: %d, Right: %d, Bottom: %d\n", + + // Setup for dynamic width and height. + RadiusX = max((RectBounds.right - RectBounds.left) / 2, 2); // Needs room + RadiusY = max((RectBounds.bottom - RectBounds.top) / 2, 2); + CenterX = (RectBounds.right + RectBounds.left) / 2; + CenterY = (RectBounds.bottom + RectBounds.top) / 2; + + DPRINT("Ellipse 1: Left: %d, Top: %d, Right: %d, Bottom: %d\n", RectBounds.left,RectBounds.top,RectBounds.right,RectBounds.bottom); - RadiusX = max((RectBounds.right - RectBounds.left) >> 1, 1); - RadiusY = max((RectBounds.bottom - RectBounds.top) >> 1, 1); - CenterX = RectBounds.left + RadiusX; - CenterY = RectBounds.top + RadiusY; - DPRINT("3: RadiusX: %d, RadiusY: %d, CenterX: %d, CenterY: %d\n", - RadiusX,RadiusY,CenterX,CenterY); - - if (RadiusX > RadiusY) - { - nx = RadiusX; - ny = RadiusY; - } - else - { - nx = RadiusY; - ny = RadiusX; - } - da = -1; - db = 0xFFFF; - ix = 0; - iy = nx * 64; - NewA = 0; - NewB = (iy + 32) >> 6; - NewC = 0; - NewD = (NewB * ny) / nx; - - do { - A = NewA; - B = NewB; - C = NewC; - D = NewD; - - ix += iy / nx; - iy -= ix / nx; - NewA = (ix + 32) >> 6; - NewB = (iy + 32) >> 6; - NewC = (NewA * ny) / nx; - NewD = (NewB * ny) / nx; - - if (RadiusX > RadiusY) - { - Temp = A; A = C; C = Temp; - Temp = B; B = D; D = Temp; - Cond1 = ((C != NewA) || (B != NewD)) && (NewC <= NewD); - Cond2 = ((D != NewB) || (A != NewC)) && (NewC <= B); - } - else - { - Cond1 = ((C != NewC) || (B != NewB)) && (NewA <= NewB); - Cond2 = ((D != NewD) || (A != NewA)) && (NewA <= B); - } - - /* - * Draw the lines going from inner to outer (+ mirrored). - */ - - if ((A > da) && (A < db)) - { - PUTLINE(CenterX - D, CenterY + A, CenterX + D, CenterY + A, FillBrushInst); - if (A) - { - PUTLINE(CenterX - D, CenterY - A, CenterX + D, CenterY - A, FillBrushInst); - } - da = A; - } - - /* - * Draw the lines going from outer to inner (+ mirrored). - */ - - if ((B < db) && (B > da)) - { - PUTLINE(CenterX - C, CenterY + B, CenterX + C, CenterY + B, FillBrushInst); - PUTLINE(CenterX - C, CenterY - B, CenterX + C, CenterY - B, FillBrushInst); - db = B; - } - - /* - * Draw the pixels on the margin. - */ - - if (Cond1) - { - PUTPIXEL(CenterX + C, CenterY + B, PenBrushInst); - if (C) - PUTPIXEL(CenterX - C, CenterY + B, PenBrushInst); - if (B) - { - PUTPIXEL(CenterX + C, CenterY - B, PenBrushInst); - if (C) - PUTPIXEL(CenterX - C, CenterY - B, PenBrushInst); - } - } - - if (Cond2) - { - PUTPIXEL(CenterX + D, CenterY + A, PenBrushInst); - if (D) - PUTPIXEL(CenterX - D, CenterY + A, PenBrushInst); - if (A) - { - PUTPIXEL(CenterX + D, CenterY - A, PenBrushInst); - if (D) - PUTPIXEL(CenterX - D, CenterY - A, PenBrushInst); - } - } - } while (B > A); - - BITMAPOBJ_UnlockBitmap(BitmapObj); - BRUSHOBJ_UnlockBrush(FillBrush); - PENOBJ_UnlockPen(PenBrush); + DPRINT("Ellipse 2: XLeft: %d, YLeft: %d, Width: %d, Height: %d\n", + CenterX - RadiusX, CenterY + RadiusY, RadiusX*2, RadiusY*2); + + ret = IntFillEllipse( dc, + CenterX - RadiusX, + CenterY - RadiusY, + RadiusX*2, // Width + RadiusY*2); // Height + if (ret) + ret = IntDrawEllipse( dc, + CenterX - RadiusX, + CenterY - RadiusY, + RadiusX*2, // Width + RadiusY*2, // Height + PenBrushObj); + + PenBrushObj->ptPenWidth.x = PenOrigWidth; + PENOBJ_UnlockPen(PenBrushObj); DC_UnlockDc(dc); - DPRINT("NtGdiEllipse exit \n"); + DPRINT("Ellipse Exit.\n"); return ret; }

1 0

[fireball] 34232: Yuri Sidorov <jura@cp-lab.com> - Prevent boolean flags from being optimized away by compiler (due to PSEH usage) by making them volatile. See issue #3408 for more details.
by fireball＠svn.reactos.org 01 Jul '08

01 Jul '08

Author: fireball Date: Tue Jul 1 05:48:50 2008 New Revision: 34232 URL: http://svn.reactos.org/svn/reactos?rev=34232&view=rev Log: Yuri Sidorov <jura(a)cp-lab.com> - Prevent boolean flags from being optimized away by compiler (due to PSEH usage) by making them volatile. See issue #3408 for more details. Modified: trunk/reactos/ntoskrnl/mm/virtual.c Modified: trunk/reactos/ntoskrnl/mm/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/virtual.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] Tue Jul 1 05:48:50 2008 @@ -70,7 +70,7 @@ PFN_NUMBER MdlBuffer[(sizeof(MDL) / sizeof(PFN_NUMBER)) + MI_MAPPED_COPY_PAGES + 1]; PMDL Mdl = (PMDL)MdlBuffer; ULONG TotalSize, CurrentSize, RemainingSize; - BOOLEAN FailedInProbe = FALSE, FailedInMapping = FALSE, FailedInMoving; + volatile BOOLEAN FailedInProbe = FALSE, FailedInMapping = FALSE, FailedInMoving; BOOLEAN PagesLocked; PVOID CurrentAddress = SourceAddress, CurrentTargetAddress = TargetAddress; PVOID MdlAddress; @@ -225,7 +225,7 @@ { UCHAR StackBuffer[MI_POOL_COPY_BYTES]; ULONG TotalSize, CurrentSize, RemainingSize; - BOOLEAN FailedInProbe = FALSE, FailedInMoving, HavePoolAddress = FALSE; + volatile BOOLEAN FailedInProbe = FALSE, FailedInMoving, HavePoolAddress = FALSE; PVOID CurrentAddress = SourceAddress, CurrentTargetAddress = TargetAddress; PVOID PoolAddress; KAPC_STATE ApcState;

1 0

[fireball] 34231: - Fix code comments, in addition to 34230. See issue #3426 for more details.
by fireball＠svn.reactos.org 01 Jul '08

01 Jul '08

Author: fireball Date: Tue Jul 1 05:40:20 2008 New Revision: 34231 URL: http://svn.reactos.org/svn/reactos?rev=34231&view=rev Log: - Fix code comments, in addition to 34230. See issue #3426 for more details. Modified: trunk/reactos/ntoskrnl/ke/apc.c Modified: trunk/reactos/ntoskrnl/ke/apc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/apc.c?rev=3423… ============================================================================== --- trunk/reactos/ntoskrnl/ke/apc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/apc.c [iso-8859-1] Tue Jul 1 05:40:20 2008 @@ -137,7 +137,7 @@ } else { - /* Special APC, find the first Normal APC in the list */ + /* Special APC, find the last one in the list */ ListHead = &ApcState->ApcListHead[ApcMode]; NextEntry = ListHead->Blink; while (NextEntry != ListHead) @@ -148,7 +148,7 @@ /* Is this a No-Normal APC? If so, break */ if (!QueuedApc->NormalRoutine) break; - /* Move to the next APC in the Queue */ + /* Move to the previous APC in the Queue */ NextEntry = NextEntry->Blink; }

1 0

[fireball] 34230: - Fix a problem with normal and special APCs being inserted in the wrong order, spotted by Jury Sidorov. Now Borland Turbo Debugger should be able to debug applications, also it can fix hangs in other applications. - When delivering kernel APC, set the pending flag to false (by analogy with delivering user APC and clearing its pending flag). See issue #3426 for more details.
by fireball＠svn.reactos.org 01 Jul '08

01 Jul '08

Author: fireball Date: Tue Jul 1 05:08:14 2008 New Revision: 34230 URL: http://svn.reactos.org/svn/reactos?rev=34230&view=rev Log: - Fix a problem with normal and special APCs being inserted in the wrong order, spotted by Jury Sidorov. Now Borland Turbo Debugger should be able to debug applications, also it can fix hangs in other applications. - When delivering kernel APC, set the pending flag to false (by analogy with delivering user APC and clearing its pending flag). See issue #3426 for more details. Modified: trunk/reactos/ntoskrnl/ke/apc.c (contents, props changed) Modified: trunk/reactos/ntoskrnl/ke/apc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/apc.c?rev=3423… ============================================================================== --- trunk/reactos/ntoskrnl/ke/apc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/apc.c [iso-8859-1] Tue Jul 1 05:08:14 2008 @@ -145,8 +145,8 @@ /* Get the APC */ QueuedApc = CONTAINING_RECORD(NextEntry, KAPC, ApcListEntry); - /* Is this a Normal APC? If so, break */ - if (QueuedApc->NormalRoutine) break; + /* Is this a No-Normal APC? If so, break */ + if (!QueuedApc->NormalRoutine) break; /* Move to the next APC in the Queue */ NextEntry = NextEntry->Blink; @@ -320,6 +320,9 @@ break; } + /* It's not pending anymore */ + Thread->ApcState.KernelApcPending = FALSE; + /* Get the next Entry */ ApcListEntry = Thread->ApcState.ApcListHead[KernelMode].Flink; Apc = CONTAINING_RECORD(ApcListEntry, KAPC, ApcListEntry); Propchange: trunk/reactos/ntoskrnl/ke/apc.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[jimtabor] 34229: Setup drawing default to CCW not CW.
by jimtabor＠svn.reactos.org 01 Jul '08

01 Jul '08

Author: jimtabor Date: Tue Jul 1 00:24:58 2008 New Revision: 34229 URL: http://svn.reactos.org/svn/reactos?rev=34229&view=rev Log: Setup drawing default to CCW not CW. Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Tue Jul 1 00:24:58 2008 @@ -840,7 +840,7 @@ NewDC->erclWindow.top = NewDC->erclWindow.left = 0; NewDC->erclWindow.right = ((PGDIDEVICE)NewDC->pPDev)->GDIInfo.ulHorzRes; NewDC->erclWindow.bottom = ((PGDIDEVICE)NewDC->pPDev)->GDIInfo.ulVertRes; - NewDC->DcLevel.flPath = DCPATH_CLOCKWISE; + NewDC->DcLevel.flPath &= ~DCPATH_CLOCKWISE; // Default is CCW. DC_UnlockDc( NewDC );

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2008