Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 04/05: [DDK] Hack the IDmaChannel::PhysicalAddress ABI
by Bryan Kirk 15 Feb '22

15 Feb '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0944f808f8f2ef179f562… commit 0944f808f8f2ef179f5627c10908e30a812ee5cd Author: Bryan Kirk <Zero3K(a)teknik.io> AuthorDate: Sun Jan 23 08:57:08 2022 -0500 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Wed Feb 16 01:31:28 2022 +0300 [DDK] Hack the IDmaChannel::PhysicalAddress ABI --- sdk/include/ddk/portcls.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sdk/include/ddk/portcls.h b/sdk/include/ddk/portcls.h index 4a2342fe038..cb6c5939de4 100644 --- a/sdk/include/ddk/portcls.h +++ b/sdk/include/ddk/portcls.h @@ -704,6 +704,16 @@ typedef IUnregisterPhysicalConnection *PUNREGISTERPHYSICALCONNECTION; IDmaChannel Interface */ +/* C++ ABI HACK: IDmaChannel::PhysicalAddress */ +#if defined(__cplusplus) && !defined(_MSC_VER) +#define DEFINE_ABSTRACT_DMACHANNEL_PhysicalAddress \ + STDMETHOD_(PHYSICAL_ADDRESS*, PhysicalAddress)( THIS_ PHYSICAL_ADDRESS* pRet ) PURE; \ + PHYSICAL_ADDRESS PhysicalAddress() { PHYSICAL_ADDRESS tmp; PhysicalAddress(&tmp); return tmp; } +#else +#define DEFINE_ABSTRACT_DMACHANNEL_PhysicalAddress \ + STDMETHOD_(PHYSICAL_ADDRESS, PhysicalAddress)( THIS ) PURE +#endif + #define DEFINE_ABSTRACT_DMACHANNEL() \ STDMETHOD_(NTSTATUS, AllocateBuffer)( THIS_ \ IN ULONG BufferSize, \

1 0

[reactos] 03/05: [PSDK] Add GUIDs used by AC97 sample driver
by Bryan Kirk 15 Feb '22

15 Feb '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3d9ef5c7e7e43e8d68c42… commit 3d9ef5c7e7e43e8d68c424c8bc763bf6a8d4b63e Author: Bryan Kirk <Zero3K(a)teknik.io> AuthorDate: Sat Jan 22 19:38:50 2022 -0500 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Wed Feb 16 01:31:28 2022 +0300 [PSDK] Add GUIDs used by AC97 sample driver --- sdk/include/psdk/ksmedia.h | 100 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/sdk/include/psdk/ksmedia.h b/sdk/include/psdk/ksmedia.h index 84f24abf4db..83e717e9e93 100644 --- a/sdk/include/psdk/ksmedia.h +++ b/sdk/include/psdk/ksmedia.h @@ -508,6 +508,106 @@ DEFINE_GUIDSTRUCT("DFF21CE6-F70F-11D0-B917-00A0C9223196", KSNODETYPE_COMMUNICATI DEFINE_GUIDSTRUCT("DFF21CE7-F70F-11D0-B917-00A0C9223196", KSNODETYPE_LOW_FREQUENCY_EFFECTS_SPEAKER); #define KSNODETYPE_LOW_FREQUENCY_EFFECTS_SPEAKER DEFINE_GUIDNAMED(KSNODETYPE_LOW_FREQUENCY_EFFECTS_SPEAKER) +#define STATIC_KSAUDFNAME_PC_SPEAKER_VOLUME\ + 0x185FEDF0L, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3 +DEFINE_GUIDSTRUCT("185FEDF0-9905-11D1-95A9-00C04FB925D3", KSAUDFNAME_PC_SPEAKER_VOLUME); +#define KSAUDFNAME_PC_SPEAKER_VOLUME DEFINE_GUIDNAMED(KSAUDFNAME_PC_SPEAKER_VOLUME) + +#define STATIC_KSNODETYPE_PHONE_LINE\ + DEFINE_USB_TERMINAL_GUID(0x0501) +DEFINE_GUIDSTRUCT("DFF21EE1-F70F-11D0-B917-00A0C9223196", KSNODETYPE_PHONE_LINE); +#define KSNODETYPE_PHONE_LINE DEFINE_GUIDNAMED(KSNODETYPE_PHONE_LINE) + +#define STATIC_KSAUDFNAME_CD_AUDIO\ + 0x185FEDFBL, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3 +DEFINE_GUIDSTRUCT("185FEDFB-9905-11D1-95A9-00C04FB925D3", KSAUDFNAME_CD_AUDIO); +#define KSAUDFNAME_CD_AUDIO DEFINE_GUIDNAMED(KSAUDFNAME_CD_AUDIO) + +#define STATIC_KSAUDFNAME_PC_SPEAKER\ + 0x185FEDFFL, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3 +DEFINE_GUIDSTRUCT("185FEDFF-9905-11D1-95A9-00C04FB925D3", KSAUDFNAME_PC_SPEAKER); +#define KSAUDFNAME_PC_SPEAKER DEFINE_GUIDNAMED(KSAUDFNAME_PC_SPEAKER) + +#define STATIC_KSAUDFNAME_LINE_IN\ + 0x185FEDF9L, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3 +DEFINE_GUIDSTRUCT("185FEDF9-9905-11D1-95A9-00C04FB925D3", KSAUDFNAME_LINE_IN); +#define KSAUDFNAME_LINE_IN DEFINE_GUIDNAMED(KSAUDFNAME_LINE_IN) + +#define STATIC_KSAUDFNAME_VIDEO\ + 0x915daec4L, 0xa434, 0x11d2, 0xac, 0x52, 0x0, 0xc0, 0x4f, 0x8e, 0xfb, 0x68 +DEFINE_GUIDSTRUCT("915DAEC4-A434-11d2-AC52-00C04F8EFB68", KSAUDFNAME_VIDEO); +#define KSAUDFNAME_VIDEO DEFINE_GUIDNAMED(KSAUDFNAME_VIDEO) + +#define STATIC_KSAUDFNAME_AUX\ + 0x185FEDFEL, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3 +DEFINE_GUIDSTRUCT("185FEDFE-9905-11D1-95A9-00C04FB925D3", KSAUDFNAME_AUX); +#define KSAUDFNAME_AUX DEFINE_GUIDNAMED(KSAUDFNAME_AUX) + +#define STATIC_KSAUDFNAME_STEREO_MIX\ + 0xdff077L, 0x96e3, 0x11d2, 0xac, 0x4c, 0x0, 0xc0, 0x4f, 0x8e, 0xfb, 0x68 +DEFINE_GUIDSTRUCT("00DFF077-96E3-11d2-AC4C-00C04F8EFB68", KSAUDFNAME_STEREO_MIX); +#define KSAUDFNAME_STEREO_MIX DEFINE_GUIDNAMED(KSAUDFNAME_STEREO_MIX) + +#define STATIC_KSAUDFNAME_MONO_MIX\ + 0xdff078L, 0x96e3, 0x11d2, 0xac, 0x4c, 0x0, 0xc0, 0x4f, 0x8e, 0xfb, 0x68 +DEFINE_GUIDSTRUCT("00DFF078-96E3-11d2-AC4C-00C04F8EFB68", KSAUDFNAME_MONO_MIX); +#define KSAUDFNAME_MONO_MIX DEFINE_GUIDNAMED(KSAUDFNAME_MONO_MIX) + +#define STATIC_KSAUDFNAME_3D_CENTER\ + 0x9f0670b4L, 0x991f, 0x11d2, 0xac, 0x4d, 0x0, 0xc0, 0x4f, 0x8e, 0xfb, 0x68 +DEFINE_GUIDSTRUCT("9F0670B4-991F-11d2-AC4D-00C04F8EFB68", KSAUDFNAME_3D_CENTER); +#define KSAUDFNAME_3D_CENTER DEFINE_GUIDNAMED(KSAUDFNAME_3D_CENTER) + +#define STATIC_KSAUDFNAME_MONO_MIX_VOLUME\ + 0x22b0eafeL, 0x96e3, 0x11d2, 0xac, 0x4c, 0x0, 0xc0, 0x4f, 0x8e, 0xfb, 0x68 +DEFINE_GUIDSTRUCT("22B0EAFE-96E3-11d2-AC4C-00C04F8EFB68", KSAUDFNAME_MONO_MIX_VOLUME); +#define KSAUDFNAME_MONO_MIX_VOLUME DEFINE_GUIDNAMED(KSAUDFNAME_MONO_MIX_VOLUME) + +#define STATIC_KSAUDFNAME_STEREO_MIX_VOLUME\ + 0x1ad247edL, 0x96e3, 0x11d2, 0xac, 0x4c, 0x0, 0xc0, 0x4f, 0x8e, 0xfb, 0x68 +DEFINE_GUIDSTRUCT("1AD247ED-96E3-11d2-AC4C-00C04F8EFB68", KSAUDFNAME_STEREO_MIX_VOLUME); +#define KSAUDFNAME_STEREO_MIX_VOLUME DEFINE_GUIDNAMED(KSAUDFNAME_STEREO_MIX_VOLUME) + +#define STATIC_KSAUDFNAME_VIDEO_VOLUME\ + 0x9b46e708L, 0x992a, 0x11d2, 0xac, 0x4d, 0x0, 0xc0, 0x4f, 0x8e, 0xfb, 0x68 +DEFINE_GUIDSTRUCT("9B46E708-992A-11d2-AC4D-00C04F8EFB68", KSAUDFNAME_VIDEO_VOLUME); +#define KSAUDFNAME_VIDEO_VOLUME DEFINE_GUIDNAMED(KSAUDFNAME_VIDEO_VOLUME) + +#define STATIC_KSAUDFNAME_TREBLE\ + 0x185FEDE1L, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3 +DEFINE_GUIDSTRUCT("185FEDE1-9905-11D1-95A9-00C04FB925D3", KSAUDFNAME_TREBLE); +#define KSAUDFNAME_TREBLE DEFINE_GUIDNAMED(KSAUDFNAME_TREBLE) + +#define STATIC_KSAUDFNAME_BASS\ + 0x185FEDE0L, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3 +DEFINE_GUIDSTRUCT("185FEDE0-9905-11D1-95A9-00C04FB925D3", KSAUDFNAME_BASS); +#define KSAUDFNAME_BASS DEFINE_GUIDNAMED(KSAUDFNAME_BASS) + +#define STATIC_KSAUDFNAME_3D_DEPTH\ + 0x63ff5747L, 0x991f, 0x11d2, 0xac, 0x4d, 0x0, 0xc0, 0x4f, 0x8e, 0xfb, 0x68 +DEFINE_GUIDSTRUCT("63FF5747-991F-11d2-AC4D-00C04F8EFB68", KSAUDFNAME_3D_DEPTH); +#define KSAUDFNAME_3D_DEPTH DEFINE_GUIDNAMED(KSAUDFNAME_3D_DEPTH) + +#define STATIC_KSAUDFNAME_MONO_OUT\ + 0xf9b41dc3L, 0x96e2, 0x11d2, 0xac, 0x4c, 0x0, 0xc0, 0x4f, 0x8e, 0xfb, 0x68 +DEFINE_GUIDSTRUCT("F9B41DC3-96E2-11d2-AC4C-00C04F8EFB68", KSAUDFNAME_MONO_OUT); +#define KSAUDFNAME_MONO_OUT DEFINE_GUIDNAMED(KSAUDFNAME_MONO_OUT) + +#define STATIC_KSAUDFNAME_PC_SPEAKER_MUTE\ + 0x185FEDF1L, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3 +DEFINE_GUIDSTRUCT("185FEDF1-9905-11D1-95A9-00C04FB925D3", KSAUDFNAME_PC_SPEAKER_MUTE); +#define KSAUDFNAME_PC_SPEAKER_MUTE DEFINE_GUIDNAMED(KSAUDFNAME_PC_SPEAKER_MUTE) + +#define STATIC_KSAUDFNAME_ALTERNATE_MICROPHONE\ + 0x2bc31d6bL, 0x96e3, 0x11d2, 0xac, 0x4c, 0x0, 0xc0, 0x4f, 0x8e, 0xfb, 0x68 +DEFINE_GUIDSTRUCT("2BC31D6B-96E3-11d2-AC4C-00C04F8EFB68", KSAUDFNAME_ALTERNATE_MICROPHONE); +#define KSAUDFNAME_ALTERNATE_MICROPHONE DEFINE_GUIDNAMED(KSAUDFNAME_ALTERNATE_MICROPHONE) + +#define STATIC_KSAUDFNAME_VIDEO_MUTE\ + 0x9b46e709L, 0x992a, 0x11d2, 0xac, 0x4d, 0x0, 0xc0, 0x4f, 0x8e, 0xfb, 0x68 +DEFINE_GUIDSTRUCT("9B46E709-992A-11d2-AC4D-00C04F8EFB68", KSAUDFNAME_VIDEO_MUTE); +#define KSAUDFNAME_VIDEO_MUTE DEFINE_GUIDNAMED(KSAUDFNAME_VIDEO_MUTE) + /* Pins

1 0

[reactos] 02/05: [DDK] Fix and add portcls definitions used by AC97 driver sample
by Bryan Kirk 15 Feb '22

15 Feb '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=07baa95a018a219f7057c… commit 07baa95a018a219f7057c4fae7be37198e1ba9d0 Author: Bryan Kirk <Zero3K(a)teknik.io> AuthorDate: Sat Jan 22 18:59:49 2022 -0500 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Wed Feb 16 01:31:27 2022 +0300 [DDK] Fix and add portcls definitions used by AC97 driver sample --- sdk/include/ddk/portcls.h | 67 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 2 deletions(-) diff --git a/sdk/include/ddk/portcls.h b/sdk/include/ddk/portcls.h index 1c88b2401b8..4a2342fe038 100644 --- a/sdk/include/ddk/portcls.h +++ b/sdk/include/ddk/portcls.h @@ -333,7 +333,7 @@ typedef struct { ULONG FromNodePin; ULONG ToNode; ULONG ToNodePin; -} PCCONNECTION_DESCRIPTOR, *PPCCONNECTIONDESCRIPTOR; +} PCCONNECTION_DESCRIPTOR, *PPCCONNECTION_DESCRIPTOR; typedef struct { ULONG MaxGlobalInstanceCount; @@ -719,7 +719,7 @@ typedef IUnregisterPhysicalConnection *PUNREGISTERPHYSICALCONNECTION; IN ULONG BufferSize) PURE; \ \ STDMETHOD_(PVOID, SystemAddress)( THIS ) PURE; \ - STDMETHOD_(PHYSICAL_ADDRESS, PhysicalAddress)( THIS ) PURE; \ + DEFINE_ABSTRACT_DMACHANNEL_PhysicalAddress; \ STDMETHOD_(PADAPTER_OBJECT, GetAdapterObject)( THIS ) PURE; \ \ STDMETHOD_(void, CopyTo)( THIS_ \ @@ -1432,6 +1432,13 @@ DECLARE_INTERFACE_(IMiniportTopology,IMiniport) typedef IMiniportTopology *PMINIPORTTOPOLOGY; +#define IMP_IMiniportTopology\ + IMP_IMiniport;\ + STDMETHODIMP_(NTSTATUS) Init(\ + IN PUNKNOWN UnknownAdapter,\ + IN PRESOURCELIST ResourceList,\ + IN PPORTTOPOLOGY Port); + /* =============================================================== IMiniportWaveCyclicStream Interface */ @@ -1625,6 +1632,24 @@ DECLARE_INTERFACE_(IMiniportWavePciStream,IUnknown) typedef IMiniportWavePciStream *PMINIPORTWAVEPCISTREAM; +#define IMP_IMiniportWavePciStream\ + STDMETHODIMP_(NTSTATUS) SetFormat(\ + IN PKSDATAFORMAT DataFormat);\ + STDMETHODIMP_(NTSTATUS) SetState(\ + IN KSSTATE State);\ + STDMETHODIMP_(NTSTATUS) GetPosition(\ + OUT PULONGLONG Position);\ + STDMETHODIMP_(NTSTATUS) NormalizePhysicalPosition(\ + IN OUT PLONGLONG PhysicalPosition);\ + STDMETHODIMP_(NTSTATUS) GetAllocatorFraming(\ + OUT PKSALLOCATOR_FRAMING AllocatorFraming);\ + STDMETHODIMP_(NTSTATUS) RevokeMappings(\ + IN PVOID FirstTag,\ + IN PVOID LastTag,\ + OUT PULONG MappingsRevoked);\ + STDMETHODIMP_(void) MappingAvailable(void);\ + STDMETHODIMP_(void) Service(void); + /* =============================================================== IMiniportWavePci Interface */ @@ -1661,6 +1686,25 @@ DECLARE_INTERFACE_(IMiniportWavePci,IMiniport) typedef IMiniportWavePci *PMINIPORTWAVEPCI; +#define IMP_IMiniportWavePci\ + IMP_IMiniport;\ + STDMETHODIMP_(NTSTATUS) Init(\ + IN PUNKNOWN UnknownAdapter,\ + IN PRESOURCELIST ResourceList,\ + IN PPORTWAVEPCI Port,\ + OUT PSERVICEGROUP * ServiceGroup);\ + STDMETHODIMP_(NTSTATUS) NewStream(\ + OUT PMINIPORTWAVEPCISTREAM * Stream,\ + IN PUNKNOWN OuterUnknown ,\ + IN POOL_TYPE PoolType,\ + IN PPORTWAVEPCISTREAM PortStream,\ + IN ULONG Pin,\ + IN BOOLEAN Capture,\ + IN PKSDATAFORMAT DataFormat,\ + OUT PDMACHANNEL * DmaChannel,\ + OUT PSERVICEGROUP * ServiceGroup);\ + STDMETHODIMP_(void) Service(void); + #if !defined(DEFINE_ABSTRACT_MINIPORTWAVERTSTREAM) @@ -2222,6 +2266,25 @@ DEFINE_GUID(IID_IMusicTechnology, /* =============================================================== IPreFetchOffset Interface */ +#undef INTERFACE +#define INTERFACE IPreFetchOffset + +#if (NTDDI_VERSION >= NTDDI_WINXP) +DEFINE_GUID(IID_IPreFetchOffset, 0x7000f480L, 0xed44, 0x4e8b, 0xb3, 0x8a, 0x41, 0x2f, 0x8d, 0x7a, 0x50, 0x4d); +#endif + +DECLARE_INTERFACE_(IPreFetchOffset, IUnknown) +{ + DEFINE_ABSTRACT_UNKNOWN() + + STDMETHOD_(DWORD, SetPreFetchOffset)(THIS_ + IN ULONG PreFetchOffset) PURE; +}; + +#define IMP_IPreFetchOffset \ + STDMETHODIMP_(DWORD) SetPreFetchOffset(IN ULONG PreFetchOffset); + +typedef IPreFetchOffset *PPREFETCHOFFSET; /* =============================================================== PortCls API Functions

1 0

[reactos] 01/05: [PORTCLS] Centralize AddRef/Release implementation.
by Victor Perevertkin 15 Feb '22

15 Feb '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6e97b4314f9550f771f38… commit 6e97b4314f9550f771f38f3959b25bc5ef171bbb Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Wed Feb 16 01:25:25 2022 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Wed Feb 16 01:31:27 2022 +0300 [PORTCLS] Centralize AddRef/Release implementation. And make it thread-safe. Co-authored-by: Thomas Faber <thomas.faber(a)reactos.org> --- drivers/wdm/audio/backpln/portcls/connection.cpp | 22 +---------- drivers/wdm/audio/backpln/portcls/dma_slave.cpp | 23 +----------- drivers/wdm/audio/backpln/portcls/drm_port.cpp | 22 +---------- drivers/wdm/audio/backpln/portcls/filter_dmus.cpp | 19 +--------- .../wdm/audio/backpln/portcls/filter_topology.cpp | 19 +--------- .../audio/backpln/portcls/filter_wavecyclic.cpp | 19 +--------- .../wdm/audio/backpln/portcls/filter_wavepci.cpp | 20 +--------- .../wdm/audio/backpln/portcls/filter_wavert.cpp | 20 +--------- drivers/wdm/audio/backpln/portcls/interrupt.cpp | 20 +--------- drivers/wdm/audio/backpln/portcls/irpstream.cpp | 19 +--------- .../wdm/audio/backpln/portcls/miniport_dmus.cpp | 43 +--------------------- drivers/wdm/audio/backpln/portcls/pin_dmus.cpp | 20 +--------- .../wdm/audio/backpln/portcls/pin_wavecyclic.cpp | 24 +----------- drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp | 22 +---------- drivers/wdm/audio/backpln/portcls/pin_wavert.cpp | 20 +--------- drivers/wdm/audio/backpln/portcls/port_dmus.cpp | 21 +---------- .../wdm/audio/backpln/portcls/port_topology.cpp | 22 +---------- .../wdm/audio/backpln/portcls/port_wavecyclic.cpp | 23 +----------- drivers/wdm/audio/backpln/portcls/port_wavepci.cpp | 23 +----------- drivers/wdm/audio/backpln/portcls/port_wavert.cpp | 24 +----------- .../audio/backpln/portcls/port_wavertstream.cpp | 21 +---------- drivers/wdm/audio/backpln/portcls/private.hpp | 33 +++++++++++++++++ drivers/wdm/audio/backpln/portcls/registry.cpp | 25 +++---------- drivers/wdm/audio/backpln/portcls/resource.cpp | 32 ++++++---------- .../wdm/audio/backpln/portcls/service_group.cpp | 22 +---------- drivers/wdm/audio/backpln/portcls/unregister.cpp | 25 +------------ drivers/wdm/audio/backpln/portcls/version.cpp | 24 +----------- 27 files changed, 80 insertions(+), 547 deletions(-) diff --git a/drivers/wdm/audio/backpln/portcls/connection.cpp b/drivers/wdm/audio/backpln/portcls/connection.cpp index ebaa8431eba..ffa71c80137 100644 --- a/drivers/wdm/audio/backpln/portcls/connection.cpp +++ b/drivers/wdm/audio/backpln/portcls/connection.cpp @@ -25,36 +25,16 @@ RtlCreateUnicodeString( ); -class CUnregisterPhysicalConnection : public IUnregisterPhysicalConnection +class CUnregisterPhysicalConnection : public CUnknownImpl<IUnregisterPhysicalConnection> { public: STDMETHODIMP QueryInterface( REFIID InterfaceId, PVOID* Interface); - STDMETHODIMP_(ULONG) AddRef() - { - InterlockedIncrement(&m_Ref); - return m_Ref; - } - STDMETHODIMP_(ULONG) Release() - { - InterlockedDecrement(&m_Ref); - - if (!m_Ref) - { - delete this; - return 0; - } - return m_Ref; - } IMP_IUnregisterPhysicalConnection; CUnregisterPhysicalConnection(IUnknown *OuterUnknown){} virtual ~CUnregisterPhysicalConnection(){} - -protected: - LONG m_Ref; - }; NTSTATUS diff --git a/drivers/wdm/audio/backpln/portcls/dma_slave.cpp b/drivers/wdm/audio/backpln/portcls/dma_slave.cpp index 40d5132f6f4..ef71d248981 100644 --- a/drivers/wdm/audio/backpln/portcls/dma_slave.cpp +++ b/drivers/wdm/audio/backpln/portcls/dma_slave.cpp @@ -14,7 +14,7 @@ #include <debug.h> -class CDmaChannelInit : public IDmaChannelInit +class CDmaChannelInit : public CUnknownImpl<IDmaChannelInit> { public: inline @@ -29,22 +29,6 @@ public: STDMETHODIMP QueryInterface( REFIID InterfaceId, PVOID* Interface); - STDMETHODIMP_(ULONG) AddRef() - { - InterlockedIncrement(&m_Ref); - return m_Ref; - } - STDMETHODIMP_(ULONG) Release() - { - InterlockedDecrement(&m_Ref); - - if (!m_Ref) - { - delete this; - return 0; - } - return m_Ref; - } IMP_IDmaChannelInit; CDmaChannelInit(IUnknown * OuterUnknown) : m_pDeviceObject(nullptr), @@ -60,8 +44,7 @@ public: m_Address({0}), m_Buffer(nullptr), m_Mdl(nullptr), - m_WriteToDevice(FALSE), - m_Ref(0) + m_WriteToDevice(FALSE) { } virtual ~CDmaChannelInit(){} @@ -89,8 +72,6 @@ protected: BOOLEAN m_WriteToDevice; friend IO_ALLOCATION_ACTION NTAPI AdapterControl(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID MapRegisterBase, IN PVOID Context); - - LONG m_Ref; }; diff --git a/drivers/wdm/audio/backpln/portcls/drm_port.cpp b/drivers/wdm/audio/backpln/portcls/drm_port.cpp index 04f694b12b2..6d10cd8d626 100644 --- a/drivers/wdm/audio/backpln/portcls/drm_port.cpp +++ b/drivers/wdm/audio/backpln/portcls/drm_port.cpp @@ -14,34 +14,14 @@ #include <debug.h> -class CDrmPort2 : public IDrmPort2 +class CDrmPort2 : public CUnknownImpl<IDrmPort2> { public: STDMETHODIMP QueryInterface( REFIID InterfaceId, PVOID* Interface); - STDMETHODIMP_(ULONG) AddRef() - { - InterlockedIncrement(&m_Ref); - return m_Ref; - } - STDMETHODIMP_(ULONG) Release() - { - InterlockedDecrement(&m_Ref); - - if (!m_Ref) - { - delete this; - return 0; - } - return m_Ref; - } IMP_IDrmPort2; CDrmPort2(IUnknown *OuterUnknown){} virtual ~CDrmPort2(){} - -protected: - LONG m_Ref; - }; NTSTATUS diff --git a/drivers/wdm/audio/backpln/portcls/filter_dmus.cpp b/drivers/wdm/audio/backpln/portcls/filter_dmus.cpp index 3d86166c82f..b375cd8b67e 100644 --- a/drivers/wdm/audio/backpln/portcls/filter_dmus.cpp +++ b/drivers/wdm/audio/backpln/portcls/filter_dmus.cpp @@ -14,27 +14,11 @@ #include <debug.h> -class CPortFilterDMus : public IPortFilterDMus +class CPortFilterDMus : public CUnknownImpl<IPortFilterDMus> { public: STDMETHODIMP QueryInterface( REFIID InterfaceId, PVOID* Interface); - STDMETHODIMP_(ULONG) AddRef() - { - InterlockedIncrement(&m_Ref); - return m_Ref; - } - STDMETHODIMP_(ULONG) Release() - { - InterlockedDecrement(&m_Ref); - - if (!m_Ref) - { - delete this; - return 0; - } - return m_Ref; - } IMP_IPortFilterDMus; CPortFilterDMus(IUnknown *OuterUnknown){} virtual ~CPortFilterDMus(){} @@ -43,7 +27,6 @@ protected: IPortDMus* m_Port; IPortPinDMus ** m_Pins; SUBDEVICE_DESCRIPTOR * m_Descriptor; - LONG m_Ref; }; NTSTATUS diff --git a/drivers/wdm/audio/backpln/portcls/filter_topology.cpp b/drivers/wdm/audio/backpln/portcls/filter_topology.cpp index 8acf5fed4dd..150de8c3cab 100644 --- a/drivers/wdm/audio/backpln/portcls/filter_topology.cpp +++ b/drivers/wdm/audio/backpln/portcls/filter_topology.cpp @@ -14,27 +14,11 @@ #include <debug.h> -class CPortFilterTopology : public IPortFilterTopology +class CPortFilterTopology : public CUnknownImpl<IPortFilterTopology> { public: STDMETHODIMP QueryInterface( REFIID InterfaceId, PVOID* Interface); - STDMETHODIMP_(ULONG) AddRef() - { - InterlockedIncrement(&m_Ref); - return m_Ref; - } - STDMETHODIMP_(ULONG) Release() - { - InterlockedDecrement(&m_Ref); - - if (!m_Ref) - { - delete this; - return 0; - } - return m_Ref; - } IMP_IPortFilterTopology; CPortFilterTopology(IUnknown *OuterUnknown){} virtual ~CPortFilterTopology(){} @@ -43,7 +27,6 @@ protected: IPortTopology * m_Port; SUBDEVICE_DESCRIPTOR * m_Descriptor; ISubdevice * m_SubDevice; - LONG m_Ref; }; diff --git a/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.cpp b/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.cpp index 29c9512a734..6a935da41c6 100644 --- a/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.cpp +++ b/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.cpp @@ -14,27 +14,11 @@ #include <debug.h> -class CPortFilterWaveCyclic : public IPortFilterWaveCyclic +class CPortFilterWaveCyclic : public CUnknownImpl<IPortFilterWaveCyclic> { public: STDMETHODIMP QueryInterface( REFIID InterfaceId, PVOID* Interface); - STDMETHODIMP_(ULONG) AddRef() - { - InterlockedIncrement(&m_Ref); - return m_Ref; - } - STDMETHODIMP_(ULONG) Release() - { - InterlockedDecrement(&m_Ref); - - if (!m_Ref) - { - delete this; - return 0; - } - return m_Ref; - } IMP_IPortFilterWaveCyclic; CPortFilterWaveCyclic(IUnknown *OuterUnknown){} virtual ~CPortFilterWaveCyclic(){} @@ -44,7 +28,6 @@ protected: IPortPinWaveCyclic ** m_Pins; SUBDEVICE_DESCRIPTOR * m_Descriptor; ISubdevice * m_SubDevice; - LONG m_Ref; }; NTSTATUS diff --git a/drivers/wdm/audio/backpln/portcls/filter_wavepci.cpp b/drivers/wdm/audio/backpln/portcls/filter_wavepci.cpp index 5c5d262956f..9bf3a9465b8 100644 --- a/drivers/wdm/audio/backpln/portcls/filter_wavepci.cpp +++ b/drivers/wdm/audio/backpln/portcls/filter_wavepci.cpp @@ -14,27 +14,11 @@ #include <debug.h> -class CPortFilterWavePci : public IPortFilterWavePci +class CPortFilterWavePci : public CUnknownImpl<IPortFilterWavePci> { public: STDMETHODIMP QueryInterface( REFIID InterfaceId, PVOID* Interface); - STDMETHODIMP_(ULONG) AddRef() - { - InterlockedIncrement(&m_Ref); - return m_Ref; - } - STDMETHODIMP_(ULONG) Release() - { - InterlockedDecrement(&m_Ref); - - if (!m_Ref) - { - delete this; - return 0; - } - return m_Ref; - } IMP_IPortFilterPci; CPortFilterWavePci(IUnknown *OuterUnknown){} virtual ~CPortFilterWavePci(){} @@ -43,8 +27,6 @@ protected: IPortWavePci* m_Port; IPortPinWavePci ** m_Pins; SUBDEVICE_DESCRIPTOR * m_Descriptor; - - LONG m_Ref; }; NTSTATUS diff --git a/drivers/wdm/audio/backpln/portcls/filter_wavert.cpp b/drivers/wdm/audio/backpln/portcls/filter_wavert.cpp index f421c2876e3..a91abafb880 100644 --- a/drivers/wdm/audio/backpln/portcls/filter_wavert.cpp +++ b/drivers/wdm/audio/backpln/portcls/filter_wavert.cpp @@ -14,38 +14,20 @@ #include <debug.h> -class CPortFilterWaveRT : public IPortFilterWaveRT +class CPortFilterWaveRT : public CUnknownImpl<IPortFilterWaveRT> { public: STDMETHODIMP QueryInterface( REFIID InterfaceId, PVOID* Interface); - STDMETHODIMP_(ULONG) AddRef() - { - InterlockedIncrement(&m_Ref); - return m_Ref; - } - STDMETHODIMP_(ULONG) Release() - { - InterlockedDecrement(&m_Ref); - - if (!m_Ref) - { - delete this; - return 0; - } - return m_Ref; - } IMP_IPortFilterWaveRT; CPortFilterWaveRT(IUnknown *OuterUnknown){} virtual ~CPortFilterWaveRT(){} protected: - IPortWaveRT* m_Port; IPortPinWaveRT ** m_Pins; SUBDEVICE_DESCRIPTOR * m_Descriptor; - LONG m_Ref; }; NTSTATUS diff --git a/drivers/wdm/audio/backpln/portcls/interrupt.cpp b/drivers/wdm/audio/backpln/portcls/interrupt.cpp index 05f66253baf..f733c615974 100644 --- a/drivers/wdm/audio/backpln/portcls/interrupt.cpp +++ b/drivers/wdm/audio/backpln/portcls/interrupt.cpp @@ -21,27 +21,11 @@ typedef struct PVOID DynamicContext; }SYNC_ENTRY, *PSYNC_ENTRY; -class CInterruptSync : public IInterruptSync +class CInterruptSync : public CUnknownImpl<IInterruptSync> { public: STDMETHODIMP QueryInterface( REFIID InterfaceId, PVOID* Interface); - STDMETHODIMP_(ULONG) AddRef() - { - InterlockedIncrement(&m_Ref); - return m_Ref; - } - STDMETHODIMP_(ULONG) Release() - { - InterlockedDecrement(&m_Ref); - - if (!m_Ref) - { - delete this; - return 0; - } - return m_Ref; - } IMP_IInterruptSync; CInterruptSync(IUnknown *OuterUnknown){} virtual ~CInterruptSync(){} @@ -59,8 +43,6 @@ public: PVOID m_DynamicContext; NTSTATUS m_Status; - LONG m_Ref; - friend BOOLEAN NTAPI CInterruptSynchronizedRoutine(IN PVOID ServiceContext); friend BOOLEAN NTAPI IInterruptServiceRoutine(IN PKINTERRUPT Interrupt, IN PVOID ServiceContext); }; diff --git a/drivers/wdm/audio/backpln/portcls/irpstream.cpp b/drivers/wdm/audio/backpln/portcls/irpstream.cpp index 75f0717ec88..4e2b701eca1 100644 --- a/drivers/wdm/audio/backpln/portcls/irpstream.cpp +++ b/drivers/wdm/audio/backpln/portcls/irpstream.cpp @@ -39,27 +39,11 @@ RemoveHeadList_IRP( /* no non canceled irp has been found */ return NULL; } -class CIrpQueue : public IIrpQueue +class CIrpQueue : public CUnknownImpl<IIrpQueue> { public: STDMETHODIMP QueryInterface( REFIID InterfaceId, PVOID* Interface); - STDMETHODIMP_(ULONG) AddRef() - { - InterlockedIncrement(&m_Ref); - return m_Ref; - } - STDMETHODIMP_(ULONG) Release() - { - InterlockedDecrement(&m_Ref); - - if (!m_Ref) - { - delete this; - return 0; - } - return m_Ref; - } IMP_IIrpQueue; CIrpQueue(IUnknown *OuterUnknown){} virtual ~CIrpQueue(){} @@ -83,7 +67,6 @@ protected: ULONG m_CurrentOffset; PIRP m_Irp; - volatile LONG m_Ref; }; typedef struct diff --git a/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp b/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp index 1f28043738b..f57aa72a7dc 100644 --- a/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp +++ b/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp @@ -66,13 +66,9 @@ const ULONG kMPUInputBufferSize = 128; * so it can expose this interface and CUnknown so it automatically gets * reference counting and aggregation support. */ -class CMiniportDMusUART -: public IMiniportDMus, - public IMusicTechnology, - public IPowerNotify +class CMiniportDMusUART : public CUnknownImpl<IMiniportDMus, IMusicTechnology, IPowerNotify> { private: - LONG m_Ref; // Reference count KSSTATE m_KSStateInput; // Miniport state (RUN/PAUSE/ACQUIRE/STOP) PPORTDMUS m_pPort; // Callback interface. PUCHAR m_pPortBase; // Base port address. @@ -105,23 +101,6 @@ private: public: STDMETHODIMP QueryInterface( REFIID InterfaceId, PVOID* Interface); - STDMETHODIMP_(ULONG) AddRef() - { - InterlockedIncrement(&m_Ref); - return m_Ref; - } - STDMETHODIMP_(ULONG) Release() - { - InterlockedDecrement(&m_Ref); - - if (!m_Ref) - { - delete this; - return 0; - } - return m_Ref; - } - CMiniportDMusUART(IUnknown * Unknown){} virtual ~CMiniportDMusUART(); @@ -204,10 +183,9 @@ public: * so it can expose this interface and CUnknown so it automatically gets * reference counting and aggregation support. */ -class CMiniportDMusUARTStream : public IMXF +class CMiniportDMusUARTStream : public CUnknownImpl<IMXF> { private: - LONG m_Ref; // Reference Count CMiniportDMusUART * m_pMiniport; // Parent. REFERENCE_TIME m_SnapshotTimeStamp; // Current snapshot of miniport's input timestamp. PUCHAR m_pPortBase; // Base port address. @@ -230,23 +208,6 @@ private: public: STDMETHODIMP QueryInterface( REFIID InterfaceId, PVOID* Interface); - STDMETHODIMP_(ULONG) AddRef() - { - InterlockedIncrement(&m_Ref); - return m_Ref; - } - STDMETHODIMP_(ULONG) Release() - { - InterlockedDecrement(&m_Ref); - - if (!m_Ref) - { - delete this; - return 0; - } - return m_Ref; - } - virtual ~CMiniportDMusUARTStream(); STDMETHODIMP_(NTSTATUS) Init diff --git a/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp b/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp index 106ca82a48d..ef07aabed7d 100644 --- a/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp +++ b/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp @@ -14,27 +14,11 @@ #include <debug.h> -class CPortPinDMus : public IPortPinDMus +class CPortPinDMus : public CUnknownImpl<IPortPinDMus> { public: STDMETHODIMP QueryInterface( REFIID InterfaceId, PVOID* Interface); - STDMETHODIMP_(ULONG) AddRef() - { - InterlockedIncrement(&m_Ref); - return m_Ref; - } - STDMETHODIMP_(ULONG) Release() - { - InterlockedDecrement(&m_Ref); - - if (!m_Ref) - { - delete this; - return 0; - } - return m_Ref; - } IMP_IPortPinDMus; IMP_IServiceSink; IMP_IMasterClock; @@ -76,8 +60,6 @@ protected: ULONG m_PostCompleted; ULONG m_LastTag; - - LONG m_Ref; }; typedef struct diff --git a/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp b/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp index 07451f6190a..ec67bb50ef0 100644 --- a/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp +++ b/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp @@ -14,8 +14,7 @@ #include <debug.h> -class CPortPinWaveCyclic : public IPortPinWaveCyclic, - public IServiceSink +class CPortPinWaveCyclic : public CUnknownImpl<IPortPinWaveCyclic, IServiceSink> { public: inline @@ -30,22 +29,6 @@ public: STDMETHODIMP QueryInterface( REFIID InterfaceId, PVOID* Interface); - STDMETHODIMP_(ULONG) AddRef() - { - InterlockedIncrement(&m_Ref); - return m_Ref; - } - STDMETHODIMP_(ULONG) Release() - { - InterlockedDecrement(&m_Ref); - - if (!m_Ref) - { - delete this; - return 0; - } - return m_Ref; - } IMP_IPortPinWaveCyclic; IMP_IServiceSink; CPortPinWaveCyclic(IUnknown *OuterUnknown) : @@ -73,8 +56,7 @@ public: m_EventListLock(0), m_EventList({nullptr}), m_ResetState(KSRESET_BEGIN), - m_Delay(0), - m_Ref(0) + m_Delay(0) { } virtual ~CPortPinWaveCyclic(){} @@ -125,8 +107,6 @@ protected: KSRESET m_ResetState; ULONG m_Delay; - - LONG m_Ref; }; diff --git a/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp b/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp index 9f681a000c2..879965edc32 100644 --- a/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp +++ b/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp @@ -14,29 +14,11 @@ #include <debug.h> -class CPortPinWavePci : public IPortPinWavePci, - public IServiceSink, - public IPortWavePciStream +class CPortPinWavePci : public CUnknownImpl<IPortPinWavePci, IServiceSink, IPortWavePciStream> { public: STDMETHODIMP QueryInterface( REFIID InterfaceId, PVOID* Interface); - STDMETHODIMP_(ULONG) AddRef() - { - InterlockedIncrement(&m_Ref); - return m_Ref; - } - STDMETHODIMP_(ULONG) Release() - { - InterlockedDecrement(&m_Ref); - - if (!m_Ref) - { - delete this; - return 0; - } - return m_Ref; - } IMP_IPortPinWavePci; IMP_IServiceSink; IMP_IPortWavePciStream; @@ -74,8 +56,6 @@ protected: KSALLOCATOR_FRAMING m_AllocatorFraming; - LONG m_Ref; - NTSTATUS NTAPI HandleKsProperty(IN PIRP Irp); NTSTATUS NTAPI HandleKsStream(IN PIRP Irp); }; diff --git a/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp b/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp index fcdfd1ce812..d259649d3c0 100644 --- a/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp +++ b/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp @@ -14,27 +14,11 @@ #include <debug.h> -class CPortPinWaveRT : public IPortPinWaveRT +class CPortPinWaveRT : public CUnknownImpl<IPortPinWaveRT> { public: STDMETHODIMP QueryInterface( REFIID InterfaceId, PVOID* Interface); - STDMETHODIMP_(ULONG) AddRef() - { - InterlockedIncrement(&m_Ref); - return m_Ref; - } - STDMETHODIMP_(ULONG) Release() - { - InterlockedDecrement(&m_Ref); - - if (!m_Ref) - { - delete this; - return 0; - } - return m_Ref; - } IMP_IPortPinWaveRT; CPortPinWaveRT(IUnknown *OuterUnknown){} virtual ~CPortPinWaveRT(){} @@ -68,8 +52,6 @@ protected: MEMORY_CACHING_TYPE m_CacheType; PMDL m_Mdl; - LONG m_Ref; - NTSTATUS NTAPI HandleKsProperty(IN PIRP Irp); NTSTATUS NTAPI HandleKsStream(IN PIRP Irp); VOID NTAPI SetStreamState(IN KSSTATE State); diff --git a/drivers/wdm/audio/backpln/portcls/port_dmus.cpp b/drivers/wdm/audio/backpln/portcls/port_dmus.cpp index 7eb94d2d6ec..8a3e8cdae13 100644 --- a/drivers/wdm/audio/backpln/portcls/port_dmus.cpp +++ b/drivers/wdm/audio/backpln/portcls/port_dmus.cpp @@ -14,28 +14,11 @@ #include <debug.h> -class CPortDMus : public IPortDMus, - public ISubdevice +class CPortDMus : public CUnknownImpl<IPortDMus, ISubdevice> { public: STDMETHODIMP QueryInterface( REFIID InterfaceId, PVOID* Interface); - STDMETHODIMP_(ULONG) AddRef() - { - InterlockedIncrement(&m_Ref); - return m_Ref; - } - STDMETHODIMP_(ULONG) Release() - { - InterlockedDecrement(&m_Ref); - - if (!m_Ref) - { - delete this; - return 0; - } - return m_Ref; - } IMP_IPortDMus; IMP_ISubdevice; CPortDMus(IUnknown *OuterUnknown){} @@ -55,8 +38,6 @@ protected: PPCFILTER_DESCRIPTOR m_pDescriptor; PSUBDEVICE_DESCRIPTOR m_SubDeviceDescriptor; - LONG m_Ref; - friend VOID GetDMusMiniport(IN IPortDMus * iface, IN PMINIPORTDMUS * Miniport, IN PMINIPORTMIDI * MidiMiniport); }; diff --git a/drivers/wdm/audio/backpln/portcls/port_topology.cpp b/drivers/wdm/audio/backpln/portcls/port_topology.cpp index 2c5cf4333fa..32467b3d6a4 100644 --- a/drivers/wdm/audio/backpln/portcls/port_topology.cpp +++ b/drivers/wdm/audio/backpln/portcls/port_topology.cpp @@ -14,29 +14,11 @@ #include <debug.h> -class CPortTopology : public IPortTopology, - public ISubdevice, - public IPortEvents +class CPortTopology : public CUnknownImpl<IPortTopology, ISubdevice, IPortEvents> { public: STDMETHODIMP QueryInterface( REFIID InterfaceId, PVOID* Interface); - STDMETHODIMP_(ULONG) AddRef() - { - InterlockedIncrement(&m_Ref); - return m_Ref; - } - STDMETHODIMP_(ULONG) Release() - { - InterlockedDecrement(&m_Ref); - - if (!m_Ref) - { - delete this; - return 0; - } - return m_Ref; - } IMP_IPortTopology; IMP_ISubdevice; IMP_IPortEvents; @@ -55,8 +37,6 @@ protected: PSUBDEVICE_DESCRIPTOR m_SubDeviceDescriptor; IPortFilterTopology * m_Filter; - LONG m_Ref; - friend PMINIPORTTOPOLOGY GetTopologyMiniport(PPORTTOPOLOGY Port); }; diff --git a/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp b/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp index cb54dcc275b..3a4f3545de7 100644 --- a/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp +++ b/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp @@ -16,32 +16,15 @@ GUID IID_IDmaChannelSlave; -class CPortWaveCyclic : public IPortWaveCyclic, - public IPortEvents, - public ISubdevice +class CPortWaveCyclic : public CUnknownImpl<IPortWaveCyclic, IPortEvents, ISubdevice> { public: STDMETHODIMP QueryInterface( REFIID InterfaceId, PVOID* Interface); - STDMETHODIMP_(ULONG) AddRef() - { - InterlockedIncrement(&m_Ref); - return m_Ref; - } - STDMETHODIMP_(ULONG) Release() - { - InterlockedDecrement(&m_Ref); - if (!m_Ref) - { - delete this; - return 0; - } - return m_Ref; - } IMP_IPortWaveCyclic; IMP_ISubdevice; IMP_IPortEvents; - CPortWaveCyclic(IUnknown *OuterUnknown) : m_Ref(0) {} + CPortWaveCyclic(IUnknown *OuterUnknown) {} virtual ~CPortWaveCyclic(){} protected: @@ -53,8 +36,6 @@ protected: PSUBDEVICE_DESCRIPTOR m_SubDeviceDescriptor; IPortFilterWaveCyclic * m_Filter; - LONG m_Ref; - friend PMINIPORTWAVECYCLIC GetWaveCyclicMiniport(IN IPortWaveCyclic* iface); friend PDEVICE_OBJECT GetDeviceObject(PPORTWAVECYCLIC iface); }; diff --git a/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp b/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp index 0186258c328..068d28256a8 100644 --- a/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp +++ b/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp @@ -14,30 +14,11 @@ #include <debug.h> -class CPortWavePci : public IPortWavePci, - public IPortEvents, - public ISubdevice, - public IServiceSink +class CPortWavePci : public CUnknownImpl<IPortWavePci, IPortEvents, ISubdevice, IServiceSink> { public: STDMETHODIMP QueryInterface( REFIID InterfaceId, PVOID* Interface); - STDMETHODIMP_(ULONG) AddRef() - { - InterlockedIncrement(&m_Ref); - return m_Ref; - } - STDMETHODIMP_(ULONG) Release() - { - InterlockedDecrement(&m_Ref); - - if (!m_Ref) - { - delete this; - return 0; - } - return m_Ref; - } IMP_IPortWavePci; IMP_ISubdevice; IMP_IPortEvents; @@ -59,8 +40,6 @@ protected: LIST_ENTRY m_EventList; KSPIN_LOCK m_EventListLock; - LONG m_Ref; - friend PDEVICE_OBJECT GetDeviceObjectFromPortWavePci(IPortWavePci* iface); friend PMINIPORTWAVEPCI GetWavePciMiniport(PPORTWAVEPCI iface); diff --git a/drivers/wdm/audio/backpln/portcls/port_wavert.cpp b/drivers/wdm/audio/backpln/portcls/port_wavert.cpp index 06e97c95b9c..c7f5f7d51ab 100644 --- a/drivers/wdm/audio/backpln/portcls/port_wavert.cpp +++ b/drivers/wdm/audio/backpln/portcls/port_wavert.cpp @@ -14,29 +14,11 @@ #include <debug.h> -class CPortWaveRT : public IPortWaveRT, - public IPortEvents, - public ISubdevice +class CPortWaveRT : public CUnknownImpl<IPortWaveRT, IPortEvents, ISubdevice> { public: STDMETHODIMP QueryInterface( REFIID InterfaceId, PVOID* Interface); - STDMETHODIMP_(ULONG) AddRef() - { - InterlockedIncrement(&m_Ref); - return m_Ref; - } - STDMETHODIMP_(ULONG) Release() - { - InterlockedDecrement(&m_Ref); - - if (!m_Ref) - { - delete this; - return 0; - } - return m_Ref; - } IMP_IPortWaveRT; IMP_ISubdevice; IMP_IPortEvents; @@ -57,8 +39,6 @@ protected: friend PMINIPORTWAVERT GetWaveRTMiniport(IN IPortWaveRT* iface); friend PDEVICE_OBJECT GetDeviceObjectFromPortWaveRT(PPORTWAVERT iface); - - LONG m_Ref; }; static GUID InterfaceGuids[3] = @@ -145,7 +125,7 @@ CPortWaveRT::QueryInterface( IsEqualGUIDAligned(refiid, IID_IUnknown)) { *Output = PVOID(PPORTWAVERT(this)); - PUNKNOWN(*Output)->AddRef(); + PUNKNOWN(*Output)->AddRef(); return STATUS_SUCCESS; } else if (IsEqualGUIDAligned(refiid, IID_IPortEvents)) diff --git a/drivers/wdm/audio/backpln/portcls/port_wavertstream.cpp b/drivers/wdm/audio/backpln/portcls/port_wavertstream.cpp index 3472c071f66..4689f07b609 100644 --- a/drivers/wdm/audio/backpln/portcls/port_wavertstream.cpp +++ b/drivers/wdm/audio/backpln/portcls/port_wavertstream.cpp @@ -14,34 +14,15 @@ #include <debug.h> -class CPortWaveRTStreamInit : public IPortWaveRTStreamInit +class CPortWaveRTStreamInit : public CUnknownImpl<IPortWaveRTStreamInit> { public: STDMETHODIMP QueryInterface( REFIID InterfaceId, PVOID* Interface); - STDMETHODIMP_(ULONG) AddRef() - { - InterlockedIncrement(&m_Ref); - return m_Ref; - } - STDMETHODIMP_(ULONG) Release() - { - InterlockedDecrement(&m_Ref); - - if (!m_Ref) - { - delete this; - return 0; - } - return m_Ref; - } IMP_IPortWaveRTStreamInit; CPortWaveRTStreamInit(IUnknown *OuterUnknown) {} virtual ~CPortWaveRTStreamInit() {} -protected: - LONG m_Ref; - }; NTSTATUS diff --git a/drivers/wdm/audio/backpln/portcls/private.hpp b/drivers/wdm/audio/backpln/portcls/private.hpp index 75549690577..f17d0788505 100644 --- a/drivers/wdm/audio/backpln/portcls/private.hpp +++ b/drivers/wdm/audio/backpln/portcls/private.hpp @@ -439,4 +439,37 @@ typedef struct PKSOBJECT_CREATE_ITEM CreateItem; }DISPATCH_CONTEXT, *PDISPATCH_CONTEXT; +template<typename... Interfaces> +class CUnknownImpl : public Interfaces... +{ +private: + volatile LONG m_Ref; +protected: + CUnknownImpl() : + m_Ref(0) + { + } + virtual ~CUnknownImpl() + { + } +public: + STDMETHODIMP_(ULONG) AddRef() + { + ULONG Ref = InterlockedIncrement(&m_Ref); + ASSERT(Ref < 0x10000); + return Ref; + } + STDMETHODIMP_(ULONG) Release() + { + ULONG Ref = InterlockedDecrement(&m_Ref); + ASSERT(Ref < 0x10000); + if (!Ref) + { + delete this; + return 0; + } + return Ref; + } +}; + #endif /* PORTCLS_PRIVATE_H */ diff --git a/drivers/wdm/audio/backpln/portcls/registry.cpp b/drivers/wdm/audio/backpln/portcls/registry.cpp index 35b7946d384..56a8cc144c8 100644 --- a/drivers/wdm/audio/backpln/portcls/registry.cpp +++ b/drivers/wdm/audio/backpln/portcls/registry.cpp @@ -14,30 +14,18 @@ #include <debug.h> -class CRegistryKey : public IRegistryKey +class CRegistryKey : public CUnknownImpl<IRegistryKey> { public: STDMETHODIMP QueryInterface( REFIID InterfaceId, PVOID* Interface); - STDMETHODIMP_(ULONG) AddRef() - { - InterlockedIncrement(&m_Ref); - return m_Ref; - } - STDMETHODIMP_(ULONG) Release() + IMP_IRegistryKey; + CRegistryKey(IUnknown * OuterUnknown, HANDLE hKey, BOOL CanDelete) : + m_hKey(hKey), + m_Deleted(FALSE), + m_CanDelete(CanDelete) { - InterlockedDecrement(&m_Ref); - - if (!m_Ref) - { - delete this; - return 0; - } - return m_Ref; } - - IMP_IRegistryKey; - CRegistryKey(IUnknown * OuterUnknown, HANDLE hKey, BOOL CanDelete) : m_hKey(hKey), m_Deleted(FALSE), m_CanDelete(CanDelete), m_Ref(0){} virtual ~CRegistryKey(); protected: @@ -45,7 +33,6 @@ protected: HANDLE m_hKey; BOOL m_Deleted; BOOL m_CanDelete; - LONG m_Ref; }; CRegistryKey::~CRegistryKey() diff --git a/drivers/wdm/audio/backpln/portcls/resource.cpp b/drivers/wdm/audio/backpln/portcls/resource.cpp index dfa4e7b7d83..19020345579 100644 --- a/drivers/wdm/audio/backpln/portcls/resource.cpp +++ b/drivers/wdm/audio/backpln/portcls/resource.cpp @@ -17,31 +17,22 @@ #include <debug.h> -class CResourceList : public IResourceList +class CResourceList : public CUnknownImpl<IResourceList> { public: STDMETHODIMP QueryInterface( REFIID InterfaceId, PVOID* Interface); - STDMETHODIMP_(ULONG) AddRef() - { - InterlockedIncrement(&m_Ref); - return m_Ref; - } - STDMETHODIMP_(ULONG) Release() - { - InterlockedDecrement(&m_Ref); - - if (!m_Ref) - { - delete this; - return 0; - } - return m_Ref; - } - IMP_IResourceList; - CResourceList(IUnknown * OuterUnknown) : m_OuterUnknown(OuterUnknown), m_PoolType(NonPagedPool), m_TranslatedResourceList(0), m_UntranslatedResourceList(0), m_NumberOfEntries(0), m_MaxEntries(0), m_Ref(0) {} + CResourceList(IUnknown * OuterUnknown) : + m_OuterUnknown(OuterUnknown), + m_PoolType(NonPagedPool), + m_TranslatedResourceList(0), + m_UntranslatedResourceList(0), + m_NumberOfEntries(0), + m_MaxEntries(0) + { + } virtual ~CResourceList(); public: @@ -51,7 +42,6 @@ public: PCM_RESOURCE_LIST m_UntranslatedResourceList; ULONG m_NumberOfEntries; ULONG m_MaxEntries; - LONG m_Ref; }; CResourceList::~CResourceList() @@ -461,7 +451,7 @@ PcNewResourceSublist( /* Store members */ NewList->m_OuterUnknown = OuterUnknown; NewList->m_PoolType = PoolType; - NewList->m_Ref = 1; + NewList->AddRef(); NewList->m_NumberOfEntries = 0; NewList->m_MaxEntries = MaximumEntries; diff --git a/drivers/wdm/audio/backpln/portcls/service_group.cpp b/drivers/wdm/audio/backpln/portcls/service_group.cpp index 50ebd7335a4..d3688a92c14 100644 --- a/drivers/wdm/audio/backpln/portcls/service_group.cpp +++ b/drivers/wdm/audio/backpln/portcls/service_group.cpp @@ -29,28 +29,11 @@ typedef struct IN PSERVICESINK pServiceSink; }GROUP_ENTRY, *PGROUP_ENTRY; -class CServiceGroup : public IServiceGroup +class CServiceGroup : public CUnknownImpl<IServiceGroup> { public: STDMETHODIMP QueryInterface( REFIID InterfaceId, PVOID* Interface); - STDMETHODIMP_(ULONG) AddRef() - { - InterlockedIncrement(&m_Ref); - return m_Ref; - } - STDMETHODIMP_(ULONG) Release() - { - InterlockedDecrement(&m_Ref); - - if (!m_Ref) - { - delete this; - return 0; - } - return m_Ref; - } - IMP_IServiceGroup; CServiceGroup(IUnknown * OuterUnknown); virtual ~CServiceGroup() {} @@ -65,9 +48,6 @@ protected: KSPIN_LOCK m_Lock; friend VOID NTAPI IServiceGroupDpc(IN struct _KDPC *Dpc, IN PVOID DeferredContext, IN PVOID SystemArgument1, IN PVOID SystemArgument2); - - LONG m_Ref; - }; diff --git a/drivers/wdm/audio/backpln/portcls/unregister.cpp b/drivers/wdm/audio/backpln/portcls/unregister.cpp index 9a3bc8cec66..ef9d7130888 100644 --- a/drivers/wdm/audio/backpln/portcls/unregister.cpp +++ b/drivers/wdm/audio/backpln/portcls/unregister.cpp @@ -14,37 +14,16 @@ #include <debug.h> -class CUnregisterSubdevice : public IUnregisterSubdevice +class CUnregisterSubdevice : public CUnknownImpl<IUnregisterSubdevice> { public: STDMETHODIMP QueryInterface( REFIID InterfaceId, PVOID* Interface); - STDMETHODIMP_(ULONG) AddRef() - { - InterlockedIncrement(&m_Ref); - return m_Ref; - } - STDMETHODIMP_(ULONG) Release() - { - InterlockedDecrement(&m_Ref); - - if (!m_Ref) - { - delete this; - return 0; - } - return m_Ref; - } - - IMP_IUnregisterSubdevice; - CUnregisterSubdevice(IUnknown * OuterUnknown) : m_Ref(0) {} + CUnregisterSubdevice(IUnknown * OuterUnknown) {} virtual ~CUnregisterSubdevice(){} -protected: - LONG m_Ref; - }; NTSTATUS diff --git a/drivers/wdm/audio/backpln/portcls/version.cpp b/drivers/wdm/audio/backpln/portcls/version.cpp index 629c74a4a6a..c3571cc7bd1 100644 --- a/drivers/wdm/audio/backpln/portcls/version.cpp +++ b/drivers/wdm/audio/backpln/portcls/version.cpp @@ -14,42 +14,20 @@ #include <debug.h> -class CPortClsVersion : public IPortClsVersion +class CPortClsVersion : public CUnknownImpl<IPortClsVersion> { public: STDMETHODIMP QueryInterface( REFIID InterfaceId, PVOID* Interface); - STDMETHODIMP_(ULONG) AddRef() - { - InterlockedIncrement(&m_Ref); - return m_Ref; - } - STDMETHODIMP_(ULONG) Release() - { - InterlockedDecrement(&m_Ref); - - if (!m_Ref) - { - delete this; - return 0; - } - return m_Ref; - } - IMP_IPortClsVersion; CPortClsVersion(IUnknown *OuterUnknown) { - m_Ref = 0; } virtual ~CPortClsVersion() { } - -protected: - LONG m_Ref; - };

1 0

[reactos] 02/02: [PORTCLS] Don't leak CPortWaveCyclic.
by Thomas Faber 15 Feb '22

15 Feb '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7db9fb3ba6d798f7ab294… commit 7db9fb3ba6d798f7ab2946aa83bd6bb75aa3f88d Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Tue Feb 15 08:40:20 2022 -0500 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Tue Feb 15 08:43:08 2022 -0500 [PORTCLS] Don't leak CPortWaveCyclic. --- drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp b/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp index f7c0afcb30c..cb54dcc275b 100644 --- a/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp +++ b/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp @@ -33,7 +33,7 @@ public: InterlockedDecrement(&m_Ref); if (!m_Ref) { - //delete this; + delete this; return 0; } return m_Ref; @@ -41,7 +41,7 @@ public: IMP_IPortWaveCyclic; IMP_ISubdevice; IMP_IPortEvents; - CPortWaveCyclic(IUnknown *OuterUnknown){} + CPortWaveCyclic(IUnknown *OuterUnknown) : m_Ref(0) {} virtual ~CPortWaveCyclic(){} protected:

1 0

[reactos] 01/02: [PORTCLS] Do not rely on operator new to zero memory.
by Thomas Faber 15 Feb '22

15 Feb '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ec1eb52ebf3cf8ff62a0e… commit ec1eb52ebf3cf8ff62a0e1ea8f9dfa1e7b6c33dd Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Jan 16 23:02:39 2022 -0500 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Tue Feb 15 08:43:05 2022 -0500 [PORTCLS] Do not rely on operator new to zero memory. The standard operator new does not do this, and GCC will in fact optimize out any zeroing done in the operator. --- drivers/wdm/audio/backpln/portcls/dma_slave.cpp | 24 +++++++++++---- .../wdm/audio/backpln/portcls/pin_wavecyclic.cpp | 35 ++++++++++++++++++---- 2 files changed, 49 insertions(+), 10 deletions(-) diff --git a/drivers/wdm/audio/backpln/portcls/dma_slave.cpp b/drivers/wdm/audio/backpln/portcls/dma_slave.cpp index 4a0553b3ba8..40d5132f6f4 100644 --- a/drivers/wdm/audio/backpln/portcls/dma_slave.cpp +++ b/drivers/wdm/audio/backpln/portcls/dma_slave.cpp @@ -24,10 +24,7 @@ public: POOL_TYPE PoolType, ULONG Tag) { - PVOID P = ExAllocatePoolWithTag(PoolType, Size, Tag); - if (P) - RtlZeroMemory(P, Size); - return P; + return ExAllocatePoolWithTag(PoolType, Size, Tag); } STDMETHODIMP QueryInterface( REFIID InterfaceId, PVOID* Interface); @@ -49,7 +46,24 @@ public: return m_Ref; } IMP_IDmaChannelInit; - CDmaChannelInit(IUnknown * OuterUnknown){} + CDmaChannelInit(IUnknown * OuterUnknown) : + m_pDeviceObject(nullptr), + m_pAdapter(nullptr), + m_DmaStarted(FALSE), + m_MapSize(0), + m_MapRegisterBase(nullptr), + m_LastTransferCount(0), + m_MaximumBufferSize(0), + m_MaxMapRegisters(0), + m_AllocatedBufferSize(0), + m_BufferSize(0), + m_Address({0}), + m_Buffer(nullptr), + m_Mdl(nullptr), + m_WriteToDevice(FALSE), + m_Ref(0) + { + } virtual ~CDmaChannelInit(){} protected: diff --git a/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp b/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp index 56eba19a438..07451f6190a 100644 --- a/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp +++ b/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp @@ -25,10 +25,7 @@ public: POOL_TYPE PoolType, ULONG Tag) { - PVOID P = ExAllocatePoolWithTag(PoolType, Size, Tag); - if (P) - RtlZeroMemory(P, Size); - return P; + return ExAllocatePoolWithTag(PoolType, Size, Tag); } STDMETHODIMP QueryInterface( REFIID InterfaceId, PVOID* Interface); @@ -51,7 +48,35 @@ public: } IMP_IPortPinWaveCyclic; IMP_IServiceSink; - CPortPinWaveCyclic(IUnknown *OuterUnknown){} + CPortPinWaveCyclic(IUnknown *OuterUnknown) : + m_Port(nullptr), + m_Filter(nullptr), + m_KsPinDescriptor(nullptr), + m_Miniport(nullptr), + m_ServiceGroup(nullptr), + m_DmaChannel(nullptr), + m_Stream(nullptr), + m_State(KSSTATE_STOP), + m_Format(nullptr), + m_ConnectDetails(nullptr), + m_CommonBuffer(nullptr), + m_CommonBufferSize(0), + m_CommonBufferOffset(0), + m_IrpQueue(nullptr), + m_FrameSize(0), + m_Capture(FALSE), + m_TotalPackets(0), + m_StopCount(0), + m_Position({0}), + m_AllocatorFraming({{0}}), + m_Descriptor(nullptr), + m_EventListLock(0), + m_EventList({nullptr}), + m_ResetState(KSRESET_BEGIN), + m_Delay(0), + m_Ref(0) + { + } virtual ~CPortPinWaveCyclic(){} protected:

1 0

[reactos] 01/01: [SHELL32_APITEST] ShellExecCmdLine: Close newly-opened windows
by Katayama Hirofumi MZ 15 Feb '22

15 Feb '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=418edcd2bf95b5c9ca6fd… commit 418edcd2bf95b5c9ca6fd3710323e2b1e821aee4 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Feb 15 20:15:36 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Feb 15 20:15:36 2022 +0900 [SHELL32_APITEST] ShellExecCmdLine: Close newly-opened windows ROSTESTS-378 --- .../rostests/apitests/shell32/ShellExecCmdLine.cpp | 49 ++++++++++++++-------- 1 file changed, 31 insertions(+), 18 deletions(-) diff --git a/modules/rostests/apitests/shell32/ShellExecCmdLine.cpp b/modules/rostests/apitests/shell32/ShellExecCmdLine.cpp index 699def5e114..e869e6deee5 100644 --- a/modules/rostests/apitests/shell32/ShellExecCmdLine.cpp +++ b/modules/rostests/apitests/shell32/ShellExecCmdLine.cpp @@ -594,6 +594,33 @@ static BOOL CALLBACK EnumWindowsProc(HWND hwnd, LPARAM lParam) return TRUE; } +static void CleanupNewlyCreatedWindows(void) +{ + EnumWindows(EnumWindowsProc, (LPARAM)&s_wi1); + for (UINT i1 = 0; i1 < s_wi1.count; ++i1) + { + BOOL bFound = FALSE; + for (UINT i0 = 0; i0 < s_wi0.count; ++i0) + { + if (s_wi1.phwnd[i1] == s_wi0.phwnd[i0]) + { + bFound = TRUE; + break; + } + } + if (!bFound) + { + DWORD dwPID; + GetWindowThreadProcessId(s_wi1.phwnd[i1], &dwPID); + HANDLE hProcess = OpenProcess(PROCESS_TERMINATE, TRUE, dwPID); + TerminateProcess(hProcess, -1); + CloseHandle(hProcess); + } + } + free(s_wi1.phwnd); + ZeroMemory(&s_wi1, sizeof(s_wi1)); +} + static void DoEntry(const TEST_ENTRY *pEntry) { HRESULT hr; @@ -632,24 +659,7 @@ static void DoEntry(const TEST_ENTRY *pEntry) ok(result == pEntry->result, "Line %d: result expected %d, was %d\n", pEntry->lineno, pEntry->result, result); - // close newly opened windows - EnumWindows(EnumWindowsProc, (LPARAM)&s_wi1); - for (UINT i1 = 0; i1 < s_wi1.count; ++i1) - { - BOOL bFound = FALSE; - for (UINT i0 = 0; i0 < s_wi0.count; ++i0) - { - if (s_wi1.phwnd[i1] == s_wi0.phwnd[i0]) - { - bFound = TRUE; - break; - } - } - if (!bFound) - PostMessageW(s_wi1.phwnd[i1], WM_CLOSE, 0, 0); - } - free(s_wi1.phwnd); - ZeroMemory(&s_wi1, sizeof(s_wi1)); + CleanupNewlyCreatedWindows(); } START_TEST(ShellExecCmdLine) @@ -733,6 +743,9 @@ START_TEST(ShellExecCmdLine) DoEntry(&s_entries_2[i]); } + Sleep(2000); + CleanupNewlyCreatedWindows(); + // clean up ok(DeleteFileW(s_win_test_exe), "failed to delete the test file\n"); ok(DeleteFileW(s_sys_bat_file), "failed to delete the test file\n");

1 0

[reactos] 01/01: [NTUSER] Improve UserFreeInputContext and UserDestroyInputContext
by Katayama Hirofumi MZ 15 Feb '22

15 Feb '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2b2366ab9012d4464e5de… commit 2b2366ab9012d4464e5de88e5877e3e6f2a429eb Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Feb 15 19:07:50 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Feb 15 19:07:50 2022 +0900 [NTUSER] Improve UserFreeInputContext and UserDestroyInputContext CORE-18044 --- win32ss/user/ntuser/ime.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/win32ss/user/ntuser/ime.c b/win32ss/user/ntuser/ime.c index 14771e828ac..f29f4e4cfa4 100644 --- a/win32ss/user/ntuser/ime.c +++ b/win32ss/user/ntuser/ime.c @@ -1218,13 +1218,22 @@ AllocInputContextObject(PDESKTOP pDesk, VOID UserFreeInputContext(PVOID Object) { - PIMC pIMC = Object; + PIMC pIMC = Object, *ppIMC; PTHREADINFO pti; if (!pIMC) return; + /* Find the IMC in the list and remove it */ pti = pIMC->head.pti; + for (ppIMC = &pti->spDefaultImc; *ppIMC; ppIMC = &(*ppIMC)->pImcNext) + { + if (*ppIMC == pIMC) + { + *ppIMC = pIMC->pImcNext; + break; + } + } ExFreePoolWithTag(pIMC, USERTAG_IME); @@ -1234,25 +1243,13 @@ VOID UserFreeInputContext(PVOID Object) BOOLEAN UserDestroyInputContext(PVOID Object) { - PIMC pIMC = Object, pImc0; - PTHREADINFO pti; + PIMC pIMC = Object; if (!pIMC) return TRUE; UserMarkObjectDestroy(pIMC); - /* Find the IMC in the list and remove it */ - pti = pIMC->head.pti; - for (pImc0 = pti->spDefaultImc; pImc0; pImc0 = pImc0->pImcNext) - { - if (pImc0->pImcNext == pIMC) - { - pImc0->pImcNext = pIMC->pImcNext; - break; - } - } - return UserDeleteObject(pIMC->head.h, TYPE_INPUTCONTEXT); }

1 0

[reactos] 01/01: [MSPAINT] Implement skew (#4362)
by Katayama Hirofumi MZ 14 Feb '22

14 Feb '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dfd06ee8fc53882a6ef3d… commit dfd06ee8fc53882a6ef3d7a126aff809cea811f7 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Feb 14 16:18:18 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Feb 14 16:18:18 2022 +0900 [MSPAINT] Implement skew (#4362) - Add SkewDIB helper function in dib.cpp. - Implement Stretch and Skew feature by SelectionModel::StretchSkew and ImageModel::StretchSkew. - Move ColorKeyedMaskBlt function. CORE-16634 --- base/applications/mspaint/dib.cpp | 56 ++++++++++++++++++++++++++++ base/applications/mspaint/dib.h | 2 + base/applications/mspaint/drawing.cpp | 33 ++++++++++++++++ base/applications/mspaint/drawing.h | 5 +++ base/applications/mspaint/history.cpp | 16 +++++++- base/applications/mspaint/selection.cpp | 33 ---------------- base/applications/mspaint/selectionmodel.cpp | 46 +++++++++++++++++++++-- base/applications/mspaint/selectionmodel.h | 1 + base/applications/mspaint/winproc.cpp | 12 +++++- 9 files changed, 165 insertions(+), 39 deletions(-) diff --git a/base/applications/mspaint/dib.cpp b/base/applications/mspaint/dib.cpp index 711071752ad..01c23fa84bf 100644 --- a/base/applications/mspaint/dib.cpp +++ b/base/applications/mspaint/dib.cpp @@ -9,6 +9,7 @@ /* INCLUDES *********************************************************/ #include "precomp.h" +#include <math.h> /* FUNCTIONS ********************************************************/ @@ -243,3 +244,58 @@ HBITMAP Rotate90DegreeBlt(HDC hDC1, INT cx, INT cy, BOOL bRight) DeleteDC(hDC2); return hbm2; } + +#ifndef M_PI + #define M_PI 3.14159265 +#endif + +HBITMAP SkewDIB(HDC hDC1, HBITMAP hbm, INT nDegree, BOOL bVertical) +{ + if (nDegree == 0) + return CopyDIBImage(hbm); + + const double eTan = tan(abs(nDegree) * M_PI / 180); + + BITMAP bm; + GetObjectW(hbm, sizeof(bm), &bm); + INT cx = bm.bmWidth, cy = bm.bmHeight, dx = 0, dy = 0; + if (bVertical) + dy = INT(cx * eTan); + else + dx = INT(cy * eTan); + + if (dx == 0 && dy == 0) + return CopyDIBImage(hbm); + + HBITMAP hbmNew = CreateColorDIB(cx + dx, cy + dy, RGB(255, 255, 255)); + if (!hbmNew) + return NULL; + + HDC hDC2 = CreateCompatibleDC(NULL); + HGDIOBJ hbm2Old = SelectObject(hDC2, hbmNew); + if (bVertical) + { + for (INT x = 0; x < cx; ++x) + { + INT delta = INT(x * eTan); + if (nDegree > 0) + BitBlt(hDC2, x, (dy - delta), 1, cy, hDC1, x, 0, SRCCOPY); + else + BitBlt(hDC2, x, delta, 1, cy, hDC1, x, 0, SRCCOPY); + } + } + else + { + for (INT y = 0; y < cy; ++y) + { + INT delta = INT(y * eTan); + if (nDegree > 0) + BitBlt(hDC2, (dx - delta), y, cx, 1, hDC1, 0, y, SRCCOPY); + else + BitBlt(hDC2, delta, y, cx, 1, hDC1, 0, y, SRCCOPY); + } + } + SelectObject(hDC2, hbm2Old); + DeleteDC(hDC2); + return hbmNew; +} diff --git a/base/applications/mspaint/dib.h b/base/applications/mspaint/dib.h index b045be15a50..e0f8d14f19a 100644 --- a/base/applications/mspaint/dib.h +++ b/base/applications/mspaint/dib.h @@ -29,3 +29,5 @@ void ShowFileLoadError(LPCTSTR name); HBITMAP SetBitmapAndInfo(HBITMAP hBitmap, LPCTSTR name, DWORD dwFileSize, BOOL isFile); HBITMAP Rotate90DegreeBlt(HDC hDC1, INT cx, INT cy, BOOL bRight); + +HBITMAP SkewDIB(HDC hDC1, HBITMAP hbm, INT nDegree, BOOL bVertical); diff --git a/base/applications/mspaint/drawing.cpp b/base/applications/mspaint/drawing.cpp index 059559252b9..490ff9a0a62 100644 --- a/base/applications/mspaint/drawing.cpp +++ b/base/applications/mspaint/drawing.cpp @@ -307,3 +307,36 @@ Text(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF fg, COLORREF bg, LPCT RestoreDC(hdc, iSaveDC); // Restore } + +BOOL +ColorKeyedMaskBlt(HDC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, + HDC hdcSrc, int nXSrc, int nYSrc, HBITMAP hbmMask, int xMask, int yMask, + DWORD dwRop, COLORREF keyColor) +{ + HDC hTempDC; + HDC hTempDC2; + HBITMAP hTempBm; + HBRUSH hTempBrush; + HBITMAP hTempMask; + + hTempDC = CreateCompatibleDC(hdcSrc); + hTempDC2 = CreateCompatibleDC(hdcSrc); + hTempBm = CreateCompatibleBitmap(hTempDC, nWidth, nHeight); + SelectObject(hTempDC, hTempBm); + hTempBrush = CreateSolidBrush(keyColor); + SelectObject(hTempDC, hTempBrush); + BitBlt(hTempDC, 0, 0, nWidth, nHeight, hdcSrc, nXSrc, nYSrc, SRCCOPY); + PatBlt(hTempDC, 0, 0, nWidth, nHeight, PATINVERT); + hTempMask = CreateBitmap(nWidth, nHeight, 1, 1, NULL); + SelectObject(hTempDC2, hTempMask); + BitBlt(hTempDC2, 0, 0, nWidth, nHeight, hTempDC, 0, 0, SRCCOPY); + SelectObject(hTempDC, hbmMask); + BitBlt(hTempDC2, 0, 0, nWidth, nHeight, hTempDC, xMask, yMask, SRCAND); + MaskBlt(hdcDest, nXDest, nYDest, nWidth, nHeight, hdcSrc, nXSrc, nYSrc, hTempMask, xMask, yMask, dwRop); + DeleteDC(hTempDC); + DeleteDC(hTempDC2); + DeleteObject(hTempBm); + DeleteObject(hTempBrush); + DeleteObject(hTempMask); + return TRUE; +} diff --git a/base/applications/mspaint/drawing.h b/base/applications/mspaint/drawing.h index 017b71f6ddb..26178a83395 100644 --- a/base/applications/mspaint/drawing.h +++ b/base/applications/mspaint/drawing.h @@ -35,3 +35,8 @@ void RectSel(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2); void SelectionFrame(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF system_selection_color); void Text(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF fg, COLORREF bg, LPCTSTR lpchText, HFONT font, LONG style); + +extern BOOL +ColorKeyedMaskBlt(HDC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, + HDC hdcSrc, int nXSrc, int nYSrc, HBITMAP hbmMask, int xMask, int yMask, + DWORD dwRop, COLORREF keyColor); diff --git a/base/applications/mspaint/history.cpp b/base/applications/mspaint/history.cpp index d771fd37225..f0a3691ed5e 100644 --- a/base/applications/mspaint/history.cpp +++ b/base/applications/mspaint/history.cpp @@ -192,7 +192,21 @@ void ImageModel::StretchSkew(int nStretchPercentX, int nStretchPercentY, int nSk int oldHeight = GetHeight(); INT newWidth = oldWidth * nStretchPercentX / 100; INT newHeight = oldHeight * nStretchPercentY / 100; - Insert(CopyDIBImage(hBms[currInd], newWidth, newHeight)); + if (oldWidth != newWidth || oldHeight != newHeight) + { + HBITMAP hbm0 = CopyDIBImage(hBms[currInd], newWidth, newHeight); + Insert(hbm0); + } + if (nSkewDegX) + { + HBITMAP hbm1 = SkewDIB(hDrawingDC, hBms[currInd], nSkewDegX, FALSE); + Insert(hbm1); + } + if (nSkewDegY) + { + HBITMAP hbm2 = SkewDIB(hDrawingDC, hBms[currInd], nSkewDegY, TRUE); + Insert(hbm2); + } if (GetWidth() != oldWidth || GetHeight() != oldHeight) NotifyDimensionsChanged(); NotifyImageChanged(); diff --git a/base/applications/mspaint/selection.cpp b/base/applications/mspaint/selection.cpp index 992b946a28a..3a87a21f19d 100644 --- a/base/applications/mspaint/selection.cpp +++ b/base/applications/mspaint/selection.cpp @@ -21,39 +21,6 @@ const LPCTSTR CSelectionWindow::m_lpszCursorLUT[9] = { /* action to mouse cursor IDC_SIZENESW, IDC_SIZENS, IDC_SIZENWSE }; -BOOL -ColorKeyedMaskBlt(HDC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, - HDC hdcSrc, int nXSrc, int nYSrc, HBITMAP hbmMask, int xMask, int yMask, - DWORD dwRop, COLORREF keyColor) -{ - HDC hTempDC; - HDC hTempDC2; - HBITMAP hTempBm; - HBRUSH hTempBrush; - HBITMAP hTempMask; - - hTempDC = CreateCompatibleDC(hdcSrc); - hTempDC2 = CreateCompatibleDC(hdcSrc); - hTempBm = CreateCompatibleBitmap(hTempDC, nWidth, nHeight); - SelectObject(hTempDC, hTempBm); - hTempBrush = CreateSolidBrush(keyColor); - SelectObject(hTempDC, hTempBrush); - BitBlt(hTempDC, 0, 0, nWidth, nHeight, hdcSrc, nXSrc, nYSrc, SRCCOPY); - PatBlt(hTempDC, 0, 0, nWidth, nHeight, PATINVERT); - hTempMask = CreateBitmap(nWidth, nHeight, 1, 1, NULL); - SelectObject(hTempDC2, hTempMask); - BitBlt(hTempDC2, 0, 0, nWidth, nHeight, hTempDC, 0, 0, SRCCOPY); - SelectObject(hTempDC, hbmMask); - BitBlt(hTempDC2, 0, 0, nWidth, nHeight, hTempDC, xMask, yMask, SRCAND); - MaskBlt(hdcDest, nXDest, nYDest, nWidth, nHeight, hdcSrc, nXSrc, nYSrc, hTempMask, xMask, yMask, dwRop); - DeleteDC(hTempDC); - DeleteDC(hTempDC2); - DeleteObject(hTempBm); - DeleteObject(hTempBrush); - DeleteObject(hTempMask); - return TRUE; -} - void CSelectionWindow::ForceRefreshSelectionContents() { if (::IsWindowVisible(selectionWindow)) diff --git a/base/applications/mspaint/selectionmodel.cpp b/base/applications/mspaint/selectionmodel.cpp index c65ae21ac84..3cd41e1f64f 100644 --- a/base/applications/mspaint/selectionmodel.cpp +++ b/base/applications/mspaint/selectionmodel.cpp @@ -124,9 +124,6 @@ void SelectionModel::DrawBackgroundRect(HDC hDCImage, COLORREF crBg) Rect(hDCImage, m_rcSrc.left, m_rcSrc.top, m_rcSrc.right, m_rcSrc.bottom, crBg, crBg, 0, 1); } -extern BOOL -ColorKeyedMaskBlt(HDC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, HDC hdcSrc, int nXSrc, int nYSrc, HBITMAP hbmMask, int xMask, int yMask, DWORD dwRop, COLORREF keyColor); - void SelectionModel::DrawSelection(HDC hDCImage, COLORREF crBg, BOOL bBgTransparent) { if (!bBgTransparent) @@ -239,6 +236,49 @@ void SelectionModel::RotateNTimes90Degrees(int iN) NotifyRefreshNeeded(); } +void SelectionModel::StretchSkew(int nStretchPercentX, int nStretchPercentY, int nSkewDegX, int nSkewDegY) +{ + if (nStretchPercentX == 100 && nStretchPercentY == 100 && nSkewDegX == 0 && nSkewDegY == 0) + return; + + imageModel.DeleteSelection(); + imageModel.CopyPrevious(); + + INT oldWidth = RECT_WIDTH(m_rcDest); + INT oldHeight = RECT_HEIGHT(m_rcDest); + INT newWidth = oldWidth * nStretchPercentX / 100; + INT newHeight = oldHeight * nStretchPercentY / 100; + + if (oldWidth != newWidth || oldHeight != newHeight) + { + SelectObject(m_hDC, m_hBm); + HBITMAP hbm0 = CopyDIBImage(m_hBm, newWidth, newHeight); + InsertFromHBITMAP(hbm0, m_rcDest.left, m_rcDest.top); + DeleteObject(hbm0); + } + + if (nSkewDegX) + { + SelectObject(m_hDC, m_hBm); + HBITMAP hbm1 = SkewDIB(m_hDC, m_hBm, nSkewDegX, FALSE); + InsertFromHBITMAP(hbm1, m_rcDest.left, m_rcDest.top); + DeleteObject(hbm1); + } + + if (nSkewDegY) + { + SelectObject(m_hDC, m_hBm); + HBITMAP hbm2 = SkewDIB(m_hDC, m_hBm, nSkewDegY, TRUE); + InsertFromHBITMAP(hbm2, m_rcDest.left, m_rcDest.top); + DeleteObject(hbm2); + } + + selectionWindow.ShowWindow(SW_SHOWNOACTIVATE); + selectionWindow.ForceRefreshSelectionContents(); + placeSelWin(); + NotifyRefreshNeeded(); +} + HBITMAP SelectionModel::GetBitmap() const { return m_hBm; diff --git a/base/applications/mspaint/selectionmodel.h b/base/applications/mspaint/selectionmodel.h index b3a6982dffe..fbb208fed4b 100644 --- a/base/applications/mspaint/selectionmodel.h +++ b/base/applications/mspaint/selectionmodel.h @@ -54,6 +54,7 @@ public: void FlipHorizontally(); void FlipVertically(); void RotateNTimes90Degrees(int iN); + void StretchSkew(int nStretchPercentX, int nStretchPercentY, int nSkewDegX = 0, int nSkewDegY = 0); HBITMAP GetBitmap() const; int PtStackSize() const; void DrawFramePoly(HDC hDCImage); diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 3bc14f6ae72..74e27a67661 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -695,8 +695,16 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH { if (stretchSkewDialog.DoModal(mainWindow.m_hWnd)) { - imageModel.StretchSkew(stretchSkewDialog.percentage.x, stretchSkewDialog.percentage.y, - stretchSkewDialog.angle.x, stretchSkewDialog.angle.y); + if (::IsWindowVisible(selectionWindow)) + { + selectionModel.StretchSkew(stretchSkewDialog.percentage.x, stretchSkewDialog.percentage.y, + stretchSkewDialog.angle.x, stretchSkewDialog.angle.y); + } + else + { + imageModel.StretchSkew(stretchSkewDialog.percentage.x, stretchSkewDialog.percentage.y, + stretchSkewDialog.angle.x, stretchSkewDialog.angle.y); + } } break; }

1 0

[reactos] 01/01: [MSPAINT] Implement canvas rotation (#4360)
by Katayama Hirofumi MZ 14 Feb '22

14 Feb '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2d9091904730fcec3b743… commit 2d9091904730fcec3b743d8af3cba0aa8aae1553 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Feb 14 12:08:34 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Feb 14 12:08:34 2022 +0900 [MSPAINT] Implement canvas rotation (#4360) - Add Rotate90DegreeBlt function to dib.cpp. - Implement ImageModel::RotateNTimes90Degrees and SelectionModel::RotateNTimes90Degrees. - Improve ToolsModel::SetBackgroundTransparent. - Extend and improve SelectionModel::InsertFromHBITMAP. CORE-16634 --- base/applications/mspaint/dib.cpp | 35 ++++++++++++++++++++++++++++ base/applications/mspaint/dib.h | 2 ++ base/applications/mspaint/history.cpp | 16 ++++++++++++- base/applications/mspaint/main.cpp | 3 ++- base/applications/mspaint/selection.cpp | 1 + base/applications/mspaint/selectionmodel.cpp | 24 +++++++++++++++---- base/applications/mspaint/selectionmodel.h | 2 +- base/applications/mspaint/toolsmodel.cpp | 2 ++ base/applications/mspaint/winproc.cpp | 8 +++++++ 9 files changed, 86 insertions(+), 7 deletions(-) diff --git a/base/applications/mspaint/dib.cpp b/base/applications/mspaint/dib.cpp index 53a12f71602..711071752ad 100644 --- a/base/applications/mspaint/dib.cpp +++ b/base/applications/mspaint/dib.cpp @@ -208,3 +208,38 @@ HBITMAP DoLoadImageFile(HWND hwnd, LPCTSTR name, BOOL fIsMainFile) return hBitmap; } + +HBITMAP Rotate90DegreeBlt(HDC hDC1, INT cx, INT cy, BOOL bRight) +{ + HBITMAP hbm2 = CreateDIBWithProperties(cy, cx); + if (!hbm2) + return NULL; + + HDC hDC2 = CreateCompatibleDC(NULL); + HGDIOBJ hbm2Old = SelectObject(hDC2, hbm2); + if (bRight) + { + for (INT y = 0; y < cy; ++y) + { + for (INT x = 0; x < cx; ++x) + { + COLORREF rgb = GetPixel(hDC1, x, y); + SetPixelV(hDC2, cy - (y + 1), x, rgb); + } + } + } + else + { + for (INT y = 0; y < cy; ++y) + { + for (INT x = 0; x < cx; ++x) + { + COLORREF rgb = GetPixel(hDC1, x, y); + SetPixelV(hDC2, y, cx - (x + 1), rgb); + } + } + } + SelectObject(hDC2, hbm2Old); + DeleteDC(hDC2); + return hbm2; +} diff --git a/base/applications/mspaint/dib.h b/base/applications/mspaint/dib.h index 21c73a7dd13..b045be15a50 100644 --- a/base/applications/mspaint/dib.h +++ b/base/applications/mspaint/dib.h @@ -27,3 +27,5 @@ HBITMAP DoLoadImageFile(HWND hwnd, LPCTSTR name, BOOL fIsMainFile); void ShowFileLoadError(LPCTSTR name); HBITMAP SetBitmapAndInfo(HBITMAP hBitmap, LPCTSTR name, DWORD dwFileSize, BOOL isFile); + +HBITMAP Rotate90DegreeBlt(HDC hDC1, INT cx, INT cy, BOOL bRight); diff --git a/base/applications/mspaint/history.cpp b/base/applications/mspaint/history.cpp index bc0749148fa..d771fd37225 100644 --- a/base/applications/mspaint/history.cpp +++ b/base/applications/mspaint/history.cpp @@ -245,11 +245,25 @@ void ImageModel::FlipVertically() void ImageModel::RotateNTimes90Degrees(int iN) { - if (iN == 2) + switch (iN) { + case 1: + case 3: + DeleteObject(hBms[(currInd + 1) % HISTORYSIZE]); + hBms[(currInd + 1) % HISTORYSIZE] = Rotate90DegreeBlt(hDrawingDC, GetWidth(), GetHeight(), iN == 1); + currInd = (currInd + 1) % HISTORYSIZE; + if (undoSteps < HISTORYSIZE - 1) + undoSteps++; + redoSteps = 0; + SelectObject(hDrawingDC, hBms[currInd]); + imageSaved = FALSE; + NotifyDimensionsChanged(); + break; + case 2: CopyPrevious(); StretchBlt(hDrawingDC, GetWidth() - 1, GetHeight() - 1, -GetWidth(), -GetHeight(), GetDC(), 0, 0, GetWidth(), GetHeight(), SRCCOPY); + break; } NotifyImageChanged(); } diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index 4d285c2874d..f040ad7d300 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -344,7 +344,8 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument if (fontsDialog.IsWindow() && IsDialogMessage(fontsDialog, &messages)) continue; - TranslateAccelerator(hwnd, haccel, &messages); + if (TranslateAccelerator(hwnd, haccel, &messages)) + continue; /* Translate virtual-key messages into character messages */ TranslateMessage(&messages); diff --git a/base/applications/mspaint/selection.cpp b/base/applications/mspaint/selection.cpp index d3e7fe6065a..992b946a28a 100644 --- a/base/applications/mspaint/selection.cpp +++ b/base/applications/mspaint/selection.cpp @@ -266,6 +266,7 @@ LRESULT CSelectionWindow::OnToolsModelSettingsChanged(UINT nMsg, WPARAM wParam, LRESULT CSelectionWindow::OnSelectionModelRefreshNeeded(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { + ForceRefreshSelectionContents(); return 0; } diff --git a/base/applications/mspaint/selectionmodel.cpp b/base/applications/mspaint/selectionmodel.cpp index 86d34dbd86d..c65ae21ac84 100644 --- a/base/applications/mspaint/selectionmodel.cpp +++ b/base/applications/mspaint/selectionmodel.cpp @@ -165,7 +165,7 @@ void SelectionModel::ScaleContentsToFit() DeleteDC(hTempDC); } -void SelectionModel::InsertFromHBITMAP(HBITMAP hBm) +void SelectionModel::InsertFromHBITMAP(HBITMAP hBm, INT x, INT y) { HDC hTempDC; HBITMAP hTempMask; @@ -174,14 +174,15 @@ void SelectionModel::InsertFromHBITMAP(HBITMAP hBm) DeleteObject(SelectObject(m_hDC, m_hBm)); SetRectEmpty(&m_rcSrc); - m_rcDest.left = m_rcDest.top = 0; + m_rcDest.left = x; + m_rcDest.top = y; m_rcDest.right = m_rcDest.left + GetDIBWidth(m_hBm); m_rcDest.bottom = m_rcDest.top + GetDIBHeight(m_hBm); hTempDC = CreateCompatibleDC(m_hDC); hTempMask = CreateBitmap(RECT_WIDTH(m_rcDest), RECT_HEIGHT(m_rcDest), 1, 1, NULL); SelectObject(hTempDC, hTempMask); - Rect(hTempDC, m_rcDest.left, m_rcDest.top, m_rcDest.right, m_rcDest.bottom, 0x00ffffff, 0x00ffffff, 1, 1); + Rect(hTempDC, 0, 0, RECT_WIDTH(m_rcDest), RECT_HEIGHT(m_rcDest), 0x00ffffff, 0x00ffffff, 1, 1); DeleteObject(m_hMask); m_hMask = hTempMask; DeleteDC(hTempDC); @@ -211,14 +212,29 @@ void SelectionModel::FlipVertically() void SelectionModel::RotateNTimes90Degrees(int iN) { - if (iN == 2) + HBITMAP hbm; + switch (iN) { + case 1: + case 3: + imageModel.DeleteSelection(); + imageModel.CopyPrevious(); + SelectObject(m_hDC, m_hBm); + hbm = Rotate90DegreeBlt(m_hDC, RECT_WIDTH(m_rcDest), RECT_HEIGHT(m_rcDest), iN == 1); + InsertFromHBITMAP(hbm, m_rcDest.left, m_rcDest.top); + DeleteObject(hbm); + selectionWindow.ShowWindow(SW_SHOWNOACTIVATE); + selectionWindow.ForceRefreshSelectionContents(); + placeSelWin(); + break; + case 2: SelectObject(m_hDC, m_hMask); StretchBlt(m_hDC, RECT_WIDTH(m_rcDest) - 1, RECT_HEIGHT(m_rcDest) - 1, -RECT_WIDTH(m_rcDest), -RECT_HEIGHT(m_rcDest), m_hDC, 0, 0, RECT_WIDTH(m_rcDest), RECT_HEIGHT(m_rcDest), SRCCOPY); SelectObject(m_hDC, m_hBm); StretchBlt(m_hDC, RECT_WIDTH(m_rcDest) - 1, RECT_HEIGHT(m_rcDest) - 1, -RECT_WIDTH(m_rcDest), -RECT_HEIGHT(m_rcDest), m_hDC, 0, 0, RECT_WIDTH(m_rcDest), RECT_HEIGHT(m_rcDest), SRCCOPY); + break; } NotifyRefreshNeeded(); } diff --git a/base/applications/mspaint/selectionmodel.h b/base/applications/mspaint/selectionmodel.h index 0243bc08f96..b3a6982dffe 100644 --- a/base/applications/mspaint/selectionmodel.h +++ b/base/applications/mspaint/selectionmodel.h @@ -50,7 +50,7 @@ public: void DrawSelection(HDC hDCImage, COLORREF crBg = 0, BOOL bBgTransparent = FALSE); void DrawSelectionStretched(HDC hDCImage); void ScaleContentsToFit(); - void InsertFromHBITMAP(HBITMAP hBm); + void InsertFromHBITMAP(HBITMAP hBm, INT x = 0, INT y = 0); void FlipHorizontally(); void FlipVertically(); void RotateNTimes90Degrees(int iN); diff --git a/base/applications/mspaint/toolsmodel.cpp b/base/applications/mspaint/toolsmodel.cpp index e42b04c6230..5d5c7fecd0d 100644 --- a/base/applications/mspaint/toolsmodel.cpp +++ b/base/applications/mspaint/toolsmodel.cpp @@ -141,6 +141,8 @@ void ToolsModel::SetBackgroundTransparent(BOOL bTransparent) { m_transpBg = bTransparent; NotifyToolSettingsChanged(); + if (selectionWindow.IsWindow()) + selectionWindow.ForceRefreshSelectionContents(); } int ToolsModel::GetZoom() const diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index b76a310070b..3bc14f6ae72 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -664,6 +664,10 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH imageModel.FlipVertically(); break; case 3: /* rotate 90 degrees */ + if (::IsWindowVisible(selectionWindow)) + selectionModel.RotateNTimes90Degrees(1); + else + imageModel.RotateNTimes90Degrees(1); break; case 4: /* rotate 180 degrees */ if (::IsWindowVisible(selectionWindow)) @@ -672,6 +676,10 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH imageModel.RotateNTimes90Degrees(2); break; case 5: /* rotate 270 degrees */ + if (::IsWindowVisible(selectionWindow)) + selectionModel.RotateNTimes90Degrees(3); + else + imageModel.RotateNTimes90Degrees(3); break; } break;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs