Ros-diffs September 2009

ros-diffs@reactos.org

16 participants
270 discussions

[jimtabor] 43046: - Remove redundant null check. Spotted by Amine Khaldi.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Sep 14 02:36:08 2009 New Revision: 43046 URL: http://svn.reactos.org/svn/reactos?rev=43046&view=rev Log: - Remove redundant null check. Spotted by Amine Khaldi. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Mon Sep 14 02:36:08 2009 @@ -228,11 +228,7 @@ PTHREADINFO W32Thread; PHOOKTABLE Table = IntGetTable(Hook); - ASSERT(NULL != Table); - if (NULL == Table) - { - return; - } + ASSERT(NULL != Table); // At this point this should not be null! W32Thread = ((PTHREADINFO)Hook->Thread->Tcb.Win32Thread); ASSERT(W32Thread != NULL);

15 years, 1 month

[janderwald] 43045: - Remove obsolete code - Fix closing of virtual audio devices introduced 43035

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Sep 14 00:26:59 2009 New Revision: 43045 URL: http://svn.reactos.org/svn/reactos?rev=43045&view=rev Log: - Remove obsolete code - Fix closing of virtual audio devices introduced 43035 Modified: trunk/reactos/drivers/wdm/audio/sysaudio/pin.c Modified: trunk/reactos/drivers/wdm/audio/sysaudio/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/pin.c [iso-8859-1] Mon Sep 14 00:26:59 2009 @@ -61,31 +61,43 @@ return Status; } + + NTSTATUS NTAPI -Pin_fnRead( +Pin_fnWrite( PDEVICE_OBJECT DeviceObject, PIRP Irp) { PDISPATCH_CONTEXT Context; PIO_STACK_LOCATION IoStack; - ULONG BytesReturned; PFILE_OBJECT FileObject; NTSTATUS Status; + ULONG Length; /* Get current stack location */ IoStack = IoGetCurrentIrpStackLocation(Irp); + Length = IoStack->Parameters.Write.Length; + /* The dispatch context is stored in the FsContext member */ Context = (PDISPATCH_CONTEXT)IoStack->FileObject->FsContext; /* Sanity check */ ASSERT(Context); + if (Context->hMixerPin) + { + // FIXME + // call kmixer to convert stream + UNIMPLEMENTED + } + /* acquire real pin file object */ Status = ObReferenceObjectByHandle(Context->Handle, GENERIC_WRITE, IoFileObjectType, KernelMode, (PVOID*)&FileObject, NULL); if (!NT_SUCCESS(Status)) { + DPRINT1("failed\n"); Irp->IoStatus.Information = 0; Irp->IoStatus.Status = Status; /* Complete the irp */ @@ -93,179 +105,19 @@ return Status; } - /* Re-dispatch the request to the real target pin */ - Status = KsSynchronousIoControlDevice(FileObject, KernelMode, IOCTL_KS_READ_STREAM, - MmGetMdlVirtualAddress(Irp->MdlAddress), - IoStack->Parameters.Read.Length, - NULL, - 0, - &BytesReturned); - - /* release file object */ - ObDereferenceObject(FileObject); - - if (Context->hMixerPin) - { - // FIXME - // call kmixer to convert stream - UNIMPLEMENTED - } - - /* Save status and information */ - Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = 0; - /* Complete the irp */ - IoCompleteRequest(Irp, IO_NO_INCREMENT); - /* Done */ - return Status; -} - -NTSTATUS -NTAPI -Pin_fnWrite( - PDEVICE_OBJECT DeviceObject, - PIRP Irp) -{ - PDISPATCH_CONTEXT Context; - PIO_STACK_LOCATION IoStack; - PFILE_OBJECT FileObject; - PVOID Buffer; - NTSTATUS Status; - ULONG BytesReturned; - - /* Get current stack location */ - IoStack = IoGetCurrentIrpStackLocation(Irp); - - /* The dispatch context is stored in the FsContext member */ - Context = (PDISPATCH_CONTEXT)IoStack->FileObject->FsContext; - - /* Sanity check */ - ASSERT(Context); - - if (Context->hMixerPin) - { - // FIXME - // call kmixer to convert stream - UNIMPLEMENTED - } - - /* acquire real pin file object */ - Status = ObReferenceObjectByHandle(Context->Handle, GENERIC_WRITE, IoFileObjectType, KernelMode, (PVOID*)&FileObject, NULL); - if (!NT_SUCCESS(Status)) - { - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = Status; - /* Complete the irp */ - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return Status; - } - - Buffer = MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority); - - if (!Buffer) - { - /* insufficient resources */ - Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; - /* Complete the irp */ - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_INSUFFICIENT_RESOURCES; - } - - - /* call the portcls audio pin */ - Status = KsSynchronousIoControlDevice(FileObject, KernelMode, IOCTL_KS_WRITE_STREAM, - NULL, - 0, - Buffer, - IoStack->Parameters.Write.Length, - &BytesReturned); - - /* Release file object */ - ObDereferenceObject(FileObject); - - /* Save status and information */ - Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = BytesReturned; - /* Complete the irp */ - IoCompleteRequest(Irp, IO_NO_INCREMENT); - /* Done */ - return Status; -} - -NTSTATUS -NTAPI -Pin_fnFlush( - PDEVICE_OBJECT DeviceObject, - PIRP Irp) -{ - PDISPATCH_CONTEXT Context; - PIO_STACK_LOCATION IoStack; - PDEVICE_OBJECT PinDeviceObject; - PIRP PinIrp; - PFILE_OBJECT FileObject; - IO_STATUS_BLOCK IoStatus; - KEVENT Event; - NTSTATUS Status = STATUS_UNSUCCESSFUL; - - /* Get current stack location */ - IoStack = IoGetCurrentIrpStackLocation(Irp); - - /* The dispatch context is stored in the FsContext member */ - Context = (PDISPATCH_CONTEXT)IoStack->FileObject->FsContext; - - /* Sanity check */ - ASSERT(Context); - - - /* acquire real pin file object */ - Status = ObReferenceObjectByHandle(Context->Handle, GENERIC_WRITE, IoFileObjectType, KernelMode, (PVOID*)&FileObject, NULL); - if (!NT_SUCCESS(Status)) - { - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = Status; - /* Complete the irp */ - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return Status; - } - - /* Get Pin's device object */ - PinDeviceObject = IoGetRelatedDeviceObject(FileObject); - - /* release file object */ - ObDereferenceObject(FileObject); - - /* Initialize notification event */ - KeInitializeEvent(&Event, NotificationEvent, FALSE); - - /* build target irp */ - PinIrp = IoBuildSynchronousFsdRequest(IRP_MJ_FLUSH_BUFFERS, PinDeviceObject, NULL, 0, NULL, &Event, &IoStatus); - if (PinIrp) - { - - /* Get the next stack location */ - IoStack = IoGetNextIrpStackLocation(PinIrp); - /* The file object must be present in the irp as it contains the KSOBJECT_HEADER */ - IoStack->FileObject = FileObject; - - /* call the driver */ - Status = IoCallDriver(PinDeviceObject, PinIrp); - /* Has request already completed ? */ - if (Status == STATUS_PENDING) - { - /* Wait untill the request has completed */ - KeWaitForSingleObject(&Event, UserRequest, KernelMode, FALSE, NULL); - /* Update status */ - Status = IoStatus.Status; - } - } - - /* store status */ - Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = 0; - /* Complete the irp */ - IoCompleteRequest(Irp, IO_NO_INCREMENT); - /* Done */ - return Status; + /* skip current irp location */ + IoSkipCurrentIrpStackLocation(Irp); + + /* get next stack location */ + IoStack = IoGetNextIrpStackLocation(Irp); + /* store file object of next device object */ + IoStack->FileObject = FileObject; + IoStack->MajorFunction = IRP_MJ_DEVICE_CONTROL; + IoStack->Parameters.DeviceIoControl.IoControlCode = IOCTL_KS_WRITE_STREAM; //FIXME + IoStack->Parameters.DeviceIoControl.OutputBufferLength = Length; + + /* now call the driver */ + return IoCallDriver(IoGetRelatedDeviceObject(FileObject), Irp); } NTSTATUS @@ -297,68 +149,6 @@ Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; -} - -NTSTATUS -NTAPI -Pin_fnQuerySecurity( - PDEVICE_OBJECT DeviceObject, - PIRP Irp) -{ - DPRINT("Pin_fnQuerySecurity called DeviceObject %p Irp %p\n", DeviceObject); - - Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_UNSUCCESSFUL; -} - -NTSTATUS -NTAPI -Pin_fnSetSecurity( - PDEVICE_OBJECT DeviceObject, - PIRP Irp) -{ - - DPRINT("Pin_fnSetSecurity called DeviceObject %p Irp %p\n", DeviceObject); - - Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_UNSUCCESSFUL; -} - -BOOLEAN -NTAPI -Pin_fnFastDeviceIoControl( - PFILE_OBJECT FileObject, - BOOLEAN Wait, - PVOID InputBuffer, - ULONG InputBufferLength, - PVOID OutputBuffer, - ULONG OutputBufferLength, - ULONG IoControlCode, - PIO_STATUS_BLOCK IoStatus, - PDEVICE_OBJECT DeviceObject) -{ - return FALSE; -} - - -BOOLEAN -NTAPI -Pin_fnFastRead( - PFILE_OBJECT FileObject, - PLARGE_INTEGER FileOffset, - ULONG Length, - BOOLEAN Wait, - ULONG LockKey, - PVOID Buffer, - PIO_STATUS_BLOCK IoStatus, - PDEVICE_OBJECT DeviceObject) -{ - return FALSE; - } BOOLEAN @@ -404,7 +194,7 @@ Status = KsStreamIo(RealFileObject, NULL, NULL, NULL, NULL, 0, IoStatus, Buffer, Length, KSSTREAM_WRITE, UserMode); - //ObDereferenceObject(RealFileObject); + ObDereferenceObject(RealFileObject); if (NT_SUCCESS(Status)) return TRUE; @@ -415,14 +205,14 @@ static KSDISPATCH_TABLE PinTable = { Pin_fnDeviceIoControl, - Pin_fnRead, + KsDispatchInvalidDeviceRequest, Pin_fnWrite, - Pin_fnFlush, + KsDispatchInvalidDeviceRequest, Pin_fnClose, - Pin_fnQuerySecurity, - Pin_fnSetSecurity, - Pin_fnFastDeviceIoControl, - Pin_fnFastRead, + KsDispatchInvalidDeviceRequest, + KsDispatchInvalidDeviceRequest, + KsDispatchFastIoDeviceControlFailure, + KsDispatchFastReadFailure, Pin_fnFastWrite, };

15 years, 1 month

[janderwald] 43044: - Add back PHYSICAL_ADDRESS workarround for IDmaChannel::PhysicalAddress - Only define guids for gcc - Add missing PURE interface function definitions - Silence debug spam - Initialize ResourceList members - Fix calculation when allocating new resources entries - Fix building of portcls with msvc

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Sep 14 00:13:48 2009 New Revision: 43044 URL: http://svn.reactos.org/svn/reactos?rev=43044&view=rev Log: - Add back PHYSICAL_ADDRESS workarround for IDmaChannel::PhysicalAddress - Only define guids for gcc - Add missing PURE interface function definitions - Silence debug spam - Initialize ResourceList members - Fix calculation when allocating new resources entries - Fix building of portcls with msvc Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild trunk/reactos/drivers/wdm/audio/backpln/portcls/private.hpp trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.cpp [iso-8859-1] Mon Sep 14 00:13:48 2009 @@ -196,11 +196,16 @@ PHYSICAL_ADDRESS NTAPI -CDmaChannelInit::PhysicalAddress() +CDmaChannelInit::PhysicalAddress( + PPHYSICAL_ADDRESS Address) { DPRINT("CDmaChannelInit_PhysicalAdress: this %p Virtuell %p Physical High %x Low %x%\n", this, m_Buffer, m_Address.HighPart, m_Address.LowPart); - return m_Address; + PHYSICAL_ADDRESS Result; + + Address->QuadPart = m_Address.QuadPart; + Result.QuadPart = (PtrToUlong(Address)); + return Result; } VOID Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.cpp [iso-8859-1] Mon Sep 14 00:13:48 2009 @@ -6,9 +6,12 @@ * PROGRAMMER: Johannes Anderwald */ - +#ifdef _MSC_VER +#define PUT_GUIDS_HERE +#endif #include "private.hpp" +#ifndef _MSC_VER const GUID CLSID_PortTopology = {0xb4c90a32L, 0x5791, 0x11d0, {0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44}}; const GUID CLSID_PortMidi = {0xb4c90a43L, 0x5791, 0x11d0, {0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44}}; const GUID CLSID_PortWaveCyclic = {0xb4c90a2aL, 0x5791, 0x11d0, {0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44}}; @@ -98,3 +101,4 @@ const GUID IID_IUnregisterSubdevice = {0x16738177, 0xe199, 0x41f9, {0x9a, 0x87, 0xab, 0xb2, 0xa5, 0x43, 0x2f, 0x21}}; const GUID IID_IUnregisterPhysicalConnection = {0x6c38e231, 0x2a0d, 0x428d, {0x81, 0xf8, 0x07, 0xcc, 0x42, 0x8b, 0xb9, 0xa4}}; +#endif Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp [iso-8859-1] Mon Sep 14 00:13:48 2009 @@ -304,46 +304,46 @@ IN PDEVICE_OBJECT DeviceObject, IN ULONG FrameSize, IN ULONG Alignment, - IN PVOID SilenceBuffer); + IN PVOID SilenceBuffer) PURE; STDMETHOD_(NTSTATUS, AddMapping)(THIS_ IN PUCHAR Buffer, IN ULONG BufferSize, - IN PIRP Irp); + IN PIRP Irp) PURE; STDMETHOD_(NTSTATUS, GetMapping)(THIS_ OUT PUCHAR * Buffer, - OUT PULONG BufferSize); + OUT PULONG BufferSize) PURE; STDMETHOD_(VOID, UpdateMapping)(THIS_ - IN ULONG BytesWritten); - - STDMETHOD_(ULONG, NumMappings)(THIS); - - STDMETHOD_(ULONG, NumData)(THIS); - - STDMETHOD_(BOOL, MinimumDataAvailable)(THIS); - - STDMETHOD_(BOOL, CancelBuffers)(THIS); + IN ULONG BytesWritten) PURE; + + STDMETHOD_(ULONG, NumMappings)(THIS) PURE; + + STDMETHOD_(ULONG, NumData)(THIS) PURE; + + STDMETHOD_(BOOL, MinimumDataAvailable)(THIS) PURE; + + STDMETHOD_(BOOL, CancelBuffers)(THIS) PURE; STDMETHOD_(VOID, UpdateFormat)(THIS_ - IN PKSDATAFORMAT DataFormat); + IN PKSDATAFORMAT DataFormat) PURE; STDMETHOD_(NTSTATUS, GetMappingWithTag)(THIS_ IN PVOID Tag, OUT PPHYSICAL_ADDRESS PhysicalAddress, OUT PVOID *VirtualAddress, OUT PULONG ByteCount, - OUT PULONG Flags); + OUT PULONG Flags) PURE; STDMETHOD_(NTSTATUS, ReleaseMappingWithTag)(THIS_ - IN PVOID Tag); - - STDMETHOD_(BOOL, HasLastMappingFailed)(THIS); - STDMETHOD_(VOID, PrintQueueStatus)(THIS); + IN PVOID Tag) PURE; + + STDMETHOD_(BOOL, HasLastMappingFailed)(THIS) PURE; + STDMETHOD_(VOID, PrintQueueStatus)(THIS) PURE; STDMETHOD_(VOID, SetMinimumDataThreshold)(THIS_ - IN ULONG MinimumDataThreshold); - STDMETHOD_(ULONG, GetMinimumDataThreshold)(THIS); + IN ULONG MinimumDataThreshold) PURE; + STDMETHOD_(ULONG, GetMinimumDataThreshold)(THIS) PURE; }; @@ -633,20 +633,20 @@ IN KSPIN_DESCRIPTOR * PinDescriptor, IN PDEVICE_OBJECT DeviceObject) PURE; - STDMETHOD_(PVOID, GetIrpStream)(THIS); - STDMETHOD_(PMINIPORT, GetMiniport)(THIS); + STDMETHOD_(PVOID, GetIrpStream)(THIS) PURE; + STDMETHOD_(PMINIPORT, GetMiniport)(THIS) PURE; }; #define IMP_IPortPinWavePci \ IMP_IIrpTarget; \ STDMETHODIMP_(NTSTATUS) Init(THIS_ \ IN PPORTWAVEPCI Port, \ - IN PPORTFILTERWAVEPCI Filter, \ + IN PPORTFILTERWAVEPCI Filter, \ IN KSPIN_CONNECT * ConnectDetails, \ IN KSPIN_DESCRIPTOR * PinDescriptor, \ IN PDEVICE_OBJECT DeviceObject); \ \ - STDMETHODIMP_(PVOID) GetIrpStream(THIS); \ + STDMETHODIMP_(PVOID) GetIrpStream(); \ STDMETHODIMP_(PMINIPORT) GetMiniport(THIS) @@ -771,11 +771,11 @@ IN KSPIN_CONNECT * ConnectDetails, IN KSPIN_DESCRIPTOR * PinDescriptor) PURE; - STDMETHOD_(ULONG, GetCompletedPosition)(THIS); - STDMETHOD_(ULONG, GetCycleCount)(THIS); - STDMETHOD_(ULONG, GetDeviceBufferSize)(THIS); - STDMETHOD_(PVOID, GetIrpStream)(THIS); - STDMETHOD_(PMINIPORT, GetMiniport)(THIS); + STDMETHOD_(ULONG, GetCompletedPosition)(THIS) PURE; + STDMETHOD_(ULONG, GetCycleCount)(THIS) PURE; + STDMETHOD_(ULONG, GetDeviceBufferSize)(THIS) PURE; + STDMETHOD_(PVOID, GetIrpStream)(THIS) PURE; + STDMETHOD_(PMINIPORT, GetMiniport)(THIS) PURE; }; #define IMP_IPortPinWaveCyclic \ @@ -814,7 +814,7 @@ STDMETHOD_(NTSTATUS, FreePin)(THIS_ IN struct IPortPinDMus* Pin)PURE; - STDMETHOD_(VOID, NotifyPins)(THIS); + STDMETHOD_(VOID, NotifyPins)(THIS) PURE; }; typedef IPortFilterDMus *PPORTFILTERDMUS; @@ -848,7 +848,7 @@ IN KSPIN_DESCRIPTOR * PinDescriptor, IN PDEVICE_OBJECT DeviceObject) PURE; - STDMETHOD_(VOID, Notify)(THIS); + STDMETHOD_(VOID, Notify)(THIS) PURE; }; #define IMP_IPortPinDMus \ @@ -868,28 +868,95 @@ ***************************************************************************** */ +#define IMP_IDmaChannelEx \ + STDMETHODIMP_(NTSTATUS) AllocateBuffer( \ + IN ULONG BufferSize, \ + IN PPHYSICAL_ADDRESS PhysicalAddressConstraint OPTIONAL); \ + \ + STDMETHODIMP_(void) FreeBuffer(void); \ + STDMETHODIMP_(ULONG) TransferCount(void); \ + STDMETHODIMP_(ULONG) MaximumBufferSize(void); \ + STDMETHODIMP_(ULONG) AllocatedBufferSize(void); \ + STDMETHODIMP_(ULONG) BufferSize(void); \ + \ + STDMETHODIMP_(void) SetBufferSize( \ + IN ULONG BufferSize); \ + \ + STDMETHODIMP_(PVOID) SystemAddress(void); \ + STDMETHODIMP_(PHYSICAL_ADDRESS) PhysicalAddress( \ + IN PPHYSICAL_ADDRESS PhysicalAddressConstraint OPTIONAL); \ + STDMETHODIMP_(PADAPTER_OBJECT) GetAdapterObject(void); \ + \ + STDMETHODIMP_(void) CopyTo( \ + IN PVOID Destination, \ + IN PVOID Source, \ + IN ULONG ByteCount); \ + \ + STDMETHODIMP_(void) CopyFrom( \ + IN PVOID Destination, \ + IN PVOID Source, \ + IN ULONG ByteCount) + +#define IMP_IDmaChannelSlaveEx \ + IMP_IDmaChannelEx; \ + STDMETHODIMP_(NTSTATUS) Start( \ + IN ULONG MapSize, \ + IN BOOLEAN WriteToDevice); \ + \ + STDMETHODIMP_(NTSTATUS) Stop(void); \ + STDMETHODIMP_(ULONG) ReadCounter(void); \ + \ + STDMETHODIMP_(NTSTATUS) WaitForTC( \ + ULONG Timeout) + +#define IMP_IDmaChannelInit\ + IMP_IDmaChannelSlaveEx;\ + STDMETHODIMP_(NTSTATUS) Init( \ + IN PDEVICE_DESCRIPTION DeviceDescription, \ + IN PDEVICE_OBJECT DeviceObject) + +#define DEFINE_ABSTRACT_DMACHANNEL_EX() \ + STDMETHOD_(NTSTATUS, AllocateBuffer)( THIS_ \ + IN ULONG BufferSize, \ + IN PPHYSICAL_ADDRESS PhysicalAddressConstraint OPTIONAL) PURE; \ +\ + STDMETHOD_(void, FreeBuffer)( THIS ) PURE; \ + STDMETHOD_(ULONG, TransferCount)( THIS ) PURE; \ + STDMETHOD_(ULONG, MaximumBufferSize)( THIS ) PURE; \ + STDMETHOD_(ULONG, AllocatedBufferSize)( THIS ) PURE; \ + STDMETHOD_(ULONG, BufferSize)( THIS ) PURE; \ +\ + STDMETHOD_(void, SetBufferSize)( THIS_ \ + IN ULONG BufferSize) PURE; \ +\ + STDMETHOD_(PVOID, SystemAddress)( THIS ) PURE; \ + STDMETHOD_(PHYSICAL_ADDRESS, PhysicalAddress)( THIS_ \ + IN PPHYSICAL_ADDRESS Address) PURE; \ + STDMETHOD_(PADAPTER_OBJECT, GetAdapterObject)( THIS ) PURE; \ +\ + STDMETHOD_(void, CopyTo)( THIS_ \ + IN PVOID Destination, \ + IN PVOID Source, \ + IN ULONG ByteCount) PURE; \ +\ + STDMETHOD_(void, CopyFrom)( THIS_ \ + IN PVOID Destination, \ + IN PVOID Source, \ + IN ULONG ByteCount) PURE; + #undef INTERFACE #define INTERFACE IDmaChannelInit DECLARE_INTERFACE_(IDmaChannelInit, IUnknown) { DEFINE_ABSTRACT_UNKNOWN() - DEFINE_ABSTRACT_DMACHANNEL() + DEFINE_ABSTRACT_DMACHANNEL_EX() DEFINE_ABSTRACT_DMACHANNELSLAVE() STDMETHOD_(NTSTATUS, Init)( THIS_ IN PDEVICE_DESCRIPTION DeviceDescription, IN PDEVICE_OBJECT DeviceObject) PURE; }; - - - -#define IMP_IDmaChannelInit\ - IMP_IDmaChannelSlave;\ - STDMETHODIMP_(NTSTATUS) Init( \ - IN PDEVICE_DESCRIPTION DeviceDescription, \ - IN PDEVICE_OBJECT DeviceObject) - #undef INTERFACE @@ -1021,7 +1088,4 @@ IN ULONG Index \ ) - - - #endif Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild [iso-8859-1] Mon Sep 14 00:13:48 2009 @@ -15,6 +15,10 @@ <group compilerset="gcc"> <compilerflag compiler="cxx">-fno-exceptions</compilerflag> <compilerflag compiler="cxx">-fno-rtti</compilerflag> + </group> + + <group compilerset="msc"> + <compilerflag compiler="cxx">/GR-</compilerflag> </group> <file>adapter.cpp</file> Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/private.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/private.hpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/private.hpp [iso-8859-1] Mon Sep 14 00:13:48 2009 @@ -12,7 +12,7 @@ #include <ntddk.h> #include <portcls.h> -#define YDEBUG +#define NDEBUG #include <debug.h> #include <dmusicks.h> Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.cpp [iso-8859-1] Mon Sep 14 00:13:48 2009 @@ -34,7 +34,7 @@ } IMP_IResourceList; - CResourceList(IUnknown * OuterUnknown) {} + CResourceList(IUnknown * OuterUnknown) : m_OuterUnknown(OuterUnknown), m_PoolType(NonPagedPool), m_TranslatedResourceList(0), m_UntranslatedResourceList(0), m_NumberOfEntries(0) {} virtual ~CResourceList() {} public: @@ -88,7 +88,7 @@ IN CM_RESOURCE_TYPE Type) { ULONG Index, Count = 0; - PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; + PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor, UnPartialDescriptor; PC_ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); @@ -97,17 +97,30 @@ // no resource list return 0; } - + PC_ASSERT(m_TranslatedResourceList->List[0].PartialResourceList.Count == m_UntranslatedResourceList->List[0].PartialResourceList.Count); // I guess the translated and untranslated lists will be same length? for (Index = 0; Index < m_TranslatedResourceList->List[0].PartialResourceList.Count; Index ++ ) { PartialDescriptor = &m_TranslatedResourceList->List[0].PartialResourceList.PartialDescriptors[Index]; - DPRINT("Descriptor Type %u\n", PartialDescriptor->Type); + UnPartialDescriptor = &m_UntranslatedResourceList->List[0].PartialResourceList.PartialDescriptors[Index]; + DPRINT1("Descriptor Type %u\n", PartialDescriptor->Type); if (PartialDescriptor->Type == Type) { // Yay! Finally found one that matches! Count++; } + + if (PartialDescriptor->Type == CmResourceTypeInterrupt) + { + DPRINT1("Index %u TRANS Interrupt Number Affinity %x Level %u Vector %u\n", Index, PartialDescriptor->u.Interrupt.Affinity, PartialDescriptor->u.Interrupt.Level, PartialDescriptor->u.Interrupt.Vector, PartialDescriptor->u.Port.Start.LowPart, PartialDescriptor->Flags); + DPRINT1("Index %u UNTRANS Interrupt Number Affinity %x Level %u Vector %u\n", Index, UnPartialDescriptor->u.Interrupt.Affinity, UnPartialDescriptor->u.Interrupt.Level, UnPartialDescriptor->u.Interrupt.Vector, PartialDescriptor->u.Port.Start.LowPart, PartialDescriptor->Flags); + + } + else if (PartialDescriptor->Type == CmResourceTypePort) + { + DPRINT1("Index %u TRANS Port Length %u Start %u %u Flags %x\n", Index, PartialDescriptor->u.Port.Length, PartialDescriptor->u.Port.Start.HighPart, PartialDescriptor->u.Port.Start.LowPart, PartialDescriptor->Flags); + DPRINT1("Index %u UNTRANS Port Length %u Start %u %u Flags %x\n", Index, UnPartialDescriptor->u.Port.Length, UnPartialDescriptor->u.Port.Start.HighPart, UnPartialDescriptor->u.Port.Start.LowPart, UnPartialDescriptor->Flags); + } } DPRINT("Found %d type %d\n", Count, Type); @@ -200,9 +213,8 @@ NewTranslatedSize = FIELD_OFFSET(CM_RESOURCE_LIST, List[0].PartialResourceList.PartialDescriptors[ResourceCount+1]); TranslatedSize = FIELD_OFFSET(CM_RESOURCE_LIST, List[0].PartialResourceList.PartialDescriptors[ResourceCount]); #else - NewTranslatedSize = sizeof(CM_RESOURCE_LIST) + (ResourceCount > 0 ? (ResourceCount+1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) : 0); - TranslatedSize = sizeof(CM_RESOURCE_LIST) + (ResourceCount > 0 ? (ResourceCount) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) : 0); - + NewTranslatedSize = sizeof(CM_RESOURCE_LIST) - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) + (ResourceCount+1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); + TranslatedSize = sizeof(CM_RESOURCE_LIST) - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) + (ResourceCount) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); #endif NewTranslatedResources = (PCM_RESOURCE_LIST)AllocateItem(m_PoolType, NewTranslatedSize, TAG_PORTCLASS); if (!NewTranslatedResources) @@ -216,9 +228,8 @@ NewUntranslatedSize = FIELD_OFFSET(CM_RESOURCE_LIST, List[0].PartialResourceList.PartialDescriptors[ResourceCount+1]); UntranslatedSize = FIELD_OFFSET(CM_RESOURCE_LIST, List[0].PartialResourceList.PartialDescriptors[ResourceCount]); #else - NewUntranslatedSize = sizeof(CM_RESOURCE_LIST) + (ResourceCount > 0 ? (ResourceCount+1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) : 0); - UntranslatedSize = sizeof(CM_RESOURCE_LIST) + (ResourceCount > 0 ? (ResourceCount) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) : 0); - + NewUntranslatedSize = sizeof(CM_RESOURCE_LIST) - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) + (ResourceCount+1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); + UntranslatedSize = sizeof(CM_RESOURCE_LIST) - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) + (ResourceCount) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); #endif @@ -361,7 +372,7 @@ #ifdef _MSC_VER NewTranslatedSize = FIELD_OFFSET(CM_RESOURCE_LIST, List[0].PartialResourceList.PartialDescriptors[ResourceCount]); #else - NewTranslatedSize = sizeof(CM_RESOURCE_LIST) + (ResourceCount > 0 ? (ResourceCount-1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) : 0); + NewTranslatedSize = sizeof(CM_RESOURCE_LIST) - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) + (ResourceCount) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); #endif // store resource count @@ -372,7 +383,7 @@ #ifdef _MSC_VER NewUntranslatedSize = FIELD_OFFSET(CM_RESOURCE_LIST, List[0].PartialResourceList.PartialDescriptors[ResourceCount]); #else - NewUntranslatedSize = sizeof(CM_RESOURCE_LIST) + (ResourceCount > 0 ? (ResourceCount-1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) : 0); + NewUntranslatedSize = sizeof(CM_RESOURCE_LIST) - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) + (ResourceCount) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); #endif // allocate translated resource list @@ -454,6 +465,7 @@ NewList->m_OuterUnknown = OuterUnknown; NewList->m_PoolType = PoolType; NewList->m_Ref = 1; + NewList->m_NumberOfEntries = 0; *OutResourceList = (IResourceList*)NewList;

15 years, 1 month

[jimtabor] 43043: - Add query window for real process Id.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Sep 14 00:06:58 2009 New Revision: 43043 URL: http://svn.reactos.org/svn/reactos?rev=43043&view=rev Log: - Add query window for real process Id. Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Mon Sep 14 00:06:58 2009 @@ -2301,6 +2301,7 @@ #define QUERY_WINDOW_ACTIVE 0x02 #define QUERY_WINDOW_FOCUS 0x03 #define QUERY_WINDOW_ISHUNG 0x04 +#define QUERY_WINDOW_REAL_ID 0x05 DWORD NTAPI NtUserQueryWindow( Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Mon Sep 14 00:06:58 2009 @@ -276,6 +276,7 @@ } Win32Thread->MessageQueue = MsqCreateMessageQueue(Thread); Win32Thread->KeyboardLayout = W32kGetDefaultKeyLayout(); + Win32Thread->pEThread = Thread; } else { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Mon Sep 14 00:06:58 2009 @@ -4161,16 +4161,19 @@ NtUserQueryWindow(HWND hWnd, DWORD Index) { PWINDOW_OBJECT Window; + PWND pWnd; DWORD Result; DECLARE_RETURN(UINT); DPRINT("Enter NtUserQueryWindow\n"); UserEnterShared(); - if (!(Window = UserGetWindowObject(hWnd))) + if (!(Window = UserGetWindowObject(hWnd)) || !Window->Wnd) { RETURN( 0); } + + pWnd = Window->Wnd; switch(Index) { @@ -4193,6 +4196,9 @@ case QUERY_WINDOW_ISHUNG: Result = (DWORD)MsqIsHung(Window->MessageQueue); break; + + case QUERY_WINDOW_REAL_ID: + Result = (DWORD)pWnd->head.pti->pEThread->Cid.UniqueProcess; default: Result = (DWORD)NULL;

15 years, 1 month

[dgorbachev] 43042: Fix r43040 mistake.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Sun Sep 13 23:26:46 2009 New Revision: 43042 URL: http://svn.reactos.org/svn/reactos?rev=43042&view=rev Log: Fix r43040 mistake. Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Sun Sep 13 23:26:46 2009 @@ -743,7 +743,7 @@ const string& TARGET_CCValue = Environment::GetVariable ( "TARGET_CC" ); const string& ROS_PREFIXValue = Environment::GetVariable ( "ROS_PREFIX" ); - if ( ROS_PREFIXValue.length () > 0 ) + if ( TARGET_CCValue.length () > 0 ) { compilerPrefix = ""; compilerCommand = TARGET_CCValue;

15 years, 1 month

[sginsberg] 43041: - Fix some redefinition warnings caused by our headers' suckyness

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Sun Sep 13 23:23:54 2009 New Revision: 43041 URL: http://svn.reactos.org/svn/reactos?rev=43041&view=rev Log: - Fix some redefinition warnings caused by our headers' suckyness Modified: trunk/rosapps/applications/net/ncftp/libncftp/syshdrs.h trunk/rosapps/applications/net/ncftp/ncftp/syshdrs.h trunk/rosapps/applications/net/ncftp/sio/syshdrs.h Modified: trunk/rosapps/applications/net/ncftp/libncftp/syshdrs.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/ncftp/lib… ============================================================================== --- trunk/rosapps/applications/net/ncftp/libncftp/syshdrs.h [iso-8859-1] (original) +++ trunk/rosapps/applications/net/ncftp/libncftp/syshdrs.h [iso-8859-1] Sun Sep 13 23:23:54 2009 @@ -31,7 +31,9 @@ # include <sys/types.h> # include <sys/stat.h> # include <fcntl.h> +# undef strcasecmp # define strcasecmp stricmp +# undef strncasecmp # define strncasecmp strnicmp # define sleep WinSleep # ifndef S_ISREG Modified: trunk/rosapps/applications/net/ncftp/ncftp/syshdrs.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/ncftp/ncf… ============================================================================== --- trunk/rosapps/applications/net/ncftp/ncftp/syshdrs.h [iso-8859-1] (original) +++ trunk/rosapps/applications/net/ncftp/ncftp/syshdrs.h [iso-8859-1] Sun Sep 13 23:23:54 2009 @@ -44,7 +44,9 @@ # include <fcntl.h> # include <signal.h> # include <assert.h> +# undef strcasecmp # define strcasecmp stricmp +# undef strncasecmp # define strncasecmp strnicmp # define sleep WinSleep # ifndef S_ISREG Modified: trunk/rosapps/applications/net/ncftp/sio/syshdrs.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/ncftp/sio… ============================================================================== --- trunk/rosapps/applications/net/ncftp/sio/syshdrs.h [iso-8859-1] (original) +++ trunk/rosapps/applications/net/ncftp/sio/syshdrs.h [iso-8859-1] Sun Sep 13 23:23:54 2009 @@ -32,7 +32,9 @@ # include <sys/types.h> # include <sys/stat.h> # include <fcntl.h> +# undef strcasecmp # define strcasecmp stricmp +# undef strncasecmp # define strncasecmp strnicmp # define sleep(a) Sleep(a * 1000) # ifndef S_ISREG

15 years, 1 month

[dgorbachev] 43040: Fix GCC detection in RBuild (first check TARGET_CC).

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Sun Sep 13 23:18:21 2009 New Revision: 43040 URL: http://svn.reactos.org/svn/reactos?rev=43040&view=rev Log: Fix GCC detection in RBuild (first check TARGET_CC). Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Sun Sep 13 23:18:21 2009 @@ -740,12 +740,24 @@ if ( ProjectNode.configuration.Compiler == GnuGcc ) { + const string& TARGET_CCValue = Environment::GetVariable ( "TARGET_CC" ); const string& ROS_PREFIXValue = Environment::GetVariable ( "ROS_PREFIX" ); + if ( ROS_PREFIXValue.length () > 0 ) { - compilerPrefix = ROS_PREFIXValue; - compilerCommand = compilerPrefix + "-gcc"; + compilerPrefix = ""; + compilerCommand = TARGET_CCValue; detectedCompiler = TryToDetectThisCompiler ( compilerCommand ); + } + + if ( !detectedCompiler ) + { + if ( ROS_PREFIXValue.length () > 0 ) + { + compilerPrefix = ROS_PREFIXValue; + compilerCommand = compilerPrefix + "-gcc"; + detectedCompiler = TryToDetectThisCompiler ( compilerCommand ); + } } #if defined(WIN32) if ( !detectedCompiler )

15 years, 1 month

[janderwald] 43039: - Fix typo

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Sep 13 23:10:33 2009 New Revision: 43039 URL: http://svn.reactos.org/svn/reactos?rev=43039&view=rev Log: - Fix typo Modified: trunk/reactos/include/psdk/ks.h Modified: trunk/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=4303… ============================================================================== --- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Sun Sep 13 23:10:33 2009 @@ -82,7 +82,7 @@ #if defined(__cplusplus) && _MSC_VER >= 1100 #define DEFINE_GUIDSTRUCT(guid, name) struct __declspec(uuid(guid)) name - #define DEFINE_GUIDNAMED(name) __uidof(struct name) + #define DEFINE_GUIDNAMED(name) __uuidof(struct name) #else #define DEFINE_GUIDSTRUCT(guid, name) DEFINE_GUIDEX(name) #define DEFINE_GUIDNAMED(name) name

15 years, 1 month

[dgorbachev] 43038: Silence compiler warnings for all GCC 4.4.x versions.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Sun Sep 13 20:51:44 2009 New Revision: 43038 URL: http://svn.reactos.org/svn/reactos?rev=43038&view=rev Log: Silence compiler warnings for all GCC 4.4.x versions. Modified: trunk/reactos/dll/win32/ws2_32_new/src/select.c trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.cpp Modified: trunk/reactos/dll/win32/ws2_32_new/src/select.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/s… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/select.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/select.c [iso-8859-1] Sun Sep 13 20:51:44 2009 @@ -53,8 +53,8 @@ DPRINT("select: %lx %p %p %p %p\n", s, readfds, writefds, exceptfds, timeout); #if defined(__GNUC__) && \ - (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ == 40400) - /* Silence incorrect GCC 4.4.0 warning */ + (__GNUC__ * 100 + __GNUC_MINOR__ == 404) + /* Silence incorrect GCC 4.4.x warning */ Handle = 0; #endif Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.cpp [iso-8859-1] Sun Sep 13 20:51:44 2009 @@ -76,8 +76,8 @@ PC_ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); #if defined(__GNUC__) && \ - (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ == 40400) - /* Silence incorrect GCC 4.4.0 warning */ + (__GNUC__ * 100 + __GNUC_MINOR__ == 404) + /* Silence incorrect GCC 4.4.x warning */ SubDeviceEntry = NULL; #endif

15 years, 1 month

[dchapyshev] 43037: - Fix cursor position bug after turn off word wrap. Patch by Alexey Komarov See issue #3702 for more details.

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sun Sep 13 07:36:24 2009 New Revision: 43037 URL: http://svn.reactos.org/svn/reactos?rev=43037&view=rev Log: - Fix cursor position bug after turn off word wrap. Patch by Alexey Komarov See issue #3702 for more details. Modified: trunk/reactos/base/applications/notepad/dialog.c Modified: trunk/reactos/base/applications/notepad/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/dialog.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/dialog.c [iso-8859-1] Sun Sep 13 07:36:24 2009 @@ -22,6 +22,8 @@ #include <notepad.h> +LRESULT CALLBACK EDIT_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); + static const TCHAR helpfile[] = _T("notepad.hlp"); static const TCHAR empty_str[] = _T(""); static const TCHAR szDefaultExt[] = _T("txt"); @@ -695,6 +697,7 @@ RECT rc, rcstatus; DWORD size; LPTSTR pTemp; + TCHAR buff[MAX_PATH]; Globals.bWrapLongLines = !Globals.bWrapLongLines; @@ -725,10 +728,13 @@ Globals.hEdit = CreateWindowEx(WS_EX_CLIENTEDGE, edit, NULL, dwStyle, 0, 0, rc.right, rc.bottom, Globals.hMainWnd, NULL, Globals.hInstance, NULL); - SendMessage(Globals.hEdit, WM_SETFONT, (WPARAM)Globals.hFont, (LPARAM)FALSE); + SendMessage(Globals.hEdit, WM_SETFONT, (WPARAM)Globals.hFont, FALSE); SendMessage(Globals.hEdit, EM_LIMITTEXT, 0, 0); SetWindowText(Globals.hEdit, pTemp); SetFocus(Globals.hEdit); + Globals.EditProc = (WNDPROC) SetWindowLongPtr(Globals.hEdit, GWLP_WNDPROC, (LONG_PTR)EDIT_WndProc); + _stprintf(buff, Globals.szStatusBarLineCol, 1, 1); + SendMessage(Globals.hStatusBar, SB_SETTEXT, SB_SIMPLEID, (LPARAM)buff); HeapFree(GetProcessHeap(), 0, pTemp); DrawMenuBar(Globals.hMainWnd); } @@ -879,7 +885,7 @@ col = dwStart - SendMessage(Globals.hEdit, EM_LINEINDEX, (WPARAM)line, 0); _stprintf(buff, Globals.szStatusBarLineCol, line+1, col+1); - SendMessage(Globals.hStatusBar, SB_SETTEXT, (WPARAM) SB_SIMPLEID, (LPARAM)buff); + SendMessage(Globals.hStatusBar, SB_SETTEXT, SB_SIMPLEID, (LPARAM)buff); } VOID DIALOG_ViewStatusBar(VOID)

15 years, 1 month

← Newer
1
...
18
19
20
21
22
23
24
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2009