Ros-diffs

ros-diffs@reactos.org

12 participants
81034 discussions

[reactos] 01/01: [MMSYS] Improve Japanese (ja-JP) translation

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=17530af2619ea5c22baa8… commit 17530af2619ea5c22baa82c1e90efc803df191ed Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Nov 3 08:53:36 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Nov 3 08:53:36 2023 +0900 [MMSYS] Improve Japanese (ja-JP) translation CORE-18706 --- dll/cpl/mmsys/lang/ja-JP.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/cpl/mmsys/lang/ja-JP.rc b/dll/cpl/mmsys/lang/ja-JP.rc index a29e91705e7..e834a3a7ab8 100644 --- a/dll/cpl/mmsys/lang/ja-JP.rc +++ b/dll/cpl/mmsys/lang/ja-JP.rc @@ -179,7 +179,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "マルチチャンネル" FONT 9, "MS UI Gothic" BEGIN - LTEXT "By moving the sliders below you can adjust the volume of all speakers connected to this computer.", 9506, 8, 4, 212, 24 + LTEXT "下のスライダーを移動すると、このコンピューターに接続されているすべてのスピーカーの音量を調整できます。", 9506, 8, 4, 212, 24 LTEXT "低", 9473, 65, 31, 14, 8 LTEXT "", 9472, 5, 31, 55, 8 CONTROL "スライダー1", 9475, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 29, 108, 17

1 year, 2 months

[reactos] 01/01: [PORTCLS] Remove meaningless YDEBUG (#5858)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c6c6c62cb5b44468aad38… commit c6c6c62cb5b44468aad38b0604339a97f80b1b69 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Thu Nov 2 13:14:12 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Nov 2 13:14:12 2023 +0100 [PORTCLS] Remove meaningless YDEBUG (#5858) Addendum to b77ebc4 (r54584). Follow-up of #5818. --- drivers/wdm/audio/backpln/portcls/adapter.cpp | 4 ---- drivers/wdm/audio/backpln/portcls/api.cpp | 8 ------- drivers/wdm/audio/backpln/portcls/connection.cpp | 7 ------ drivers/wdm/audio/backpln/portcls/dispatcher.cpp | 9 ------- drivers/wdm/audio/backpln/portcls/dll.cpp | 4 ---- drivers/wdm/audio/backpln/portcls/dma_slave.cpp | 7 ------ drivers/wdm/audio/backpln/portcls/drm.cpp | 3 --- drivers/wdm/audio/backpln/portcls/drm_port.cpp | 5 ---- drivers/wdm/audio/backpln/portcls/filter_dmus.cpp | 7 ------ .../wdm/audio/backpln/portcls/filter_topology.cpp | 6 ----- .../audio/backpln/portcls/filter_wavecyclic.cpp | 6 ----- .../wdm/audio/backpln/portcls/filter_wavepci.cpp | 5 ---- .../wdm/audio/backpln/portcls/filter_wavert.cpp | 3 --- drivers/wdm/audio/backpln/portcls/interrupt.cpp | 10 -------- drivers/wdm/audio/backpln/portcls/irp.cpp | 10 -------- drivers/wdm/audio/backpln/portcls/irpstream.cpp | 5 ---- drivers/wdm/audio/backpln/portcls/miniport.cpp | 4 ---- .../wdm/audio/backpln/portcls/miniport_dmus.cpp | 3 --- .../wdm/audio/backpln/portcls/miniport_fmsynth.cpp | 6 ----- drivers/wdm/audio/backpln/portcls/pin_dmus.cpp | 13 +--------- .../wdm/audio/backpln/portcls/pin_wavecyclic.cpp | 28 ---------------------- drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp | 19 +-------------- drivers/wdm/audio/backpln/portcls/pin_wavert.cpp | 8 +------ drivers/wdm/audio/backpln/portcls/pool.cpp | 5 ---- drivers/wdm/audio/backpln/portcls/port.cpp | 3 --- drivers/wdm/audio/backpln/portcls/port_dmus.cpp | 11 --------- .../wdm/audio/backpln/portcls/port_topology.cpp | 12 ---------- .../wdm/audio/backpln/portcls/port_wavecyclic.cpp | 15 +----------- drivers/wdm/audio/backpln/portcls/port_wavepci.cpp | 11 +-------- drivers/wdm/audio/backpln/portcls/port_wavert.cpp | 12 ---------- .../audio/backpln/portcls/port_wavertstream.cpp | 5 ---- drivers/wdm/audio/backpln/portcls/power.cpp | 8 ------- .../wdm/audio/backpln/portcls/propertyhandler.cpp | 4 ---- drivers/wdm/audio/backpln/portcls/purecall.cpp | 8 ------- drivers/wdm/audio/backpln/portcls/registry.cpp | 4 ---- drivers/wdm/audio/backpln/portcls/resource.cpp | 5 ---- .../wdm/audio/backpln/portcls/service_group.cpp | 6 ----- drivers/wdm/audio/backpln/portcls/undoc.cpp | 14 ----------- drivers/wdm/audio/backpln/portcls/unregister.cpp | 3 --- drivers/wdm/audio/backpln/portcls/version.cpp | 5 ---- 40 files changed, 5 insertions(+), 306 deletions(-) diff --git a/drivers/wdm/audio/backpln/portcls/adapter.cpp b/drivers/wdm/audio/backpln/portcls/adapter.cpp index 0b5e87d7795..32fd9ccf161 100644 --- a/drivers/wdm/audio/backpln/portcls/adapter.cpp +++ b/drivers/wdm/audio/backpln/portcls/adapter.cpp @@ -11,10 +11,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> // @@ -201,7 +198,6 @@ cleanup: // delete created fdo IoDeleteDevice(fdo); - return status; } diff --git a/drivers/wdm/audio/backpln/portcls/api.cpp b/drivers/wdm/audio/backpln/portcls/api.cpp index fa006ef5253..7f9538686e2 100644 --- a/drivers/wdm/audio/backpln/portcls/api.cpp +++ b/drivers/wdm/audio/backpln/portcls/api.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> NTSTATUS @@ -150,10 +147,8 @@ PcUnregisterIoTimeout( if (!pDeviceObject || !pDeviceObject->DeviceExtension) return STATUS_INVALID_PARAMETER; - DeviceExtension = (PPCLASS_DEVICE_EXTENSION)pDeviceObject->DeviceExtension; - KeAcquireSpinLock(&DeviceExtension->TimerListLock, &OldIrql); ListEntry = DeviceExtension->TimerList.Flink; @@ -181,8 +176,6 @@ PcUnregisterIoTimeout( return STATUS_NOT_FOUND; } - - NTSTATUS NTAPI PcCompletePendingPropertyRequest( @@ -263,4 +256,3 @@ PcDmaSlaveDescription( return STATUS_SUCCESS; } - diff --git a/drivers/wdm/audio/backpln/portcls/connection.cpp b/drivers/wdm/audio/backpln/portcls/connection.cpp index ffa71c80137..58894664ad1 100644 --- a/drivers/wdm/audio/backpln/portcls/connection.cpp +++ b/drivers/wdm/audio/backpln/portcls/connection.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> extern @@ -24,7 +21,6 @@ RtlCreateUnicodeString( PCWSTR SourceString ); - class CUnregisterPhysicalConnection : public CUnknownImpl<IUnregisterPhysicalConnection> { public: @@ -175,7 +171,6 @@ RegisterConnection( FromString = &SymEntry->SymbolicLink; } - if (ToUnknown) { Status = ToUnknown->QueryInterface(IID_ISubdevice, (PVOID*)&ToSubDevice); @@ -192,7 +187,6 @@ RegisterConnection( goto cleanup; } - SymEntry = (PSYMBOLICLINK_ENTRY)CONTAINING_RECORD(ToSubDeviceDescriptor->SymbolicLinkList.Flink, SYMBOLICLINK_ENTRY, Entry); ToString = &SymEntry->SymbolicLink; @@ -229,7 +223,6 @@ RegisterConnection( InsertTailList(&FromSubDeviceDescriptor->PhysicalConnectionList, &FromEntry->Entry); } - if (ToSubDeviceDescriptor) { ToEntry->FromPin = ToPin; diff --git a/drivers/wdm/audio/backpln/portcls/dispatcher.cpp b/drivers/wdm/audio/backpln/portcls/dispatcher.cpp index 063a5728fb4..9fd133e5f91 100644 --- a/drivers/wdm/audio/backpln/portcls/dispatcher.cpp +++ b/drivers/wdm/audio/backpln/portcls/dispatcher.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> NTSTATUS @@ -48,7 +45,6 @@ Dispatch_fnRead( // get dispatch context DispatchContext = (PDISPATCH_CONTEXT)IoStack->FileObject->FsContext; - // let IrpTarget handle request return DispatchContext->Target->Read(DeviceObject, Irp); } @@ -68,7 +64,6 @@ Dispatch_fnWrite( // get dispatch context DispatchContext = (PDISPATCH_CONTEXT)IoStack->FileObject->FsContext; - // let IrpTarget handle request return DispatchContext->Target->Write(DeviceObject, Irp); } @@ -88,7 +83,6 @@ Dispatch_fnFlush( // get dispatch context DispatchContext = (PDISPATCH_CONTEXT)IoStack->FileObject->FsContext; - // let IrpTarget handle request return DispatchContext->Target->Flush(DeviceObject, Irp); } @@ -135,7 +129,6 @@ Dispatch_fnQuerySecurity( // get dispatch context DispatchContext = (PDISPATCH_CONTEXT)IoStack->FileObject->FsContext; - // let IrpTarget handle request return DispatchContext->Target->QuerySecurity(DeviceObject, Irp); } @@ -181,7 +174,6 @@ Dispatch_fnFastDeviceIoControl( return DispatchContext->Target->FastDeviceIoControl(FileObject, Wait, InputBuffer, InputBufferLength, OutputBuffer, OutputBufferLength, IoControlCode, IoStatus, DeviceObject); } - BOOLEAN NTAPI Dispatch_fnFastRead( @@ -279,4 +271,3 @@ NewDispatchObject( DPRINT("KsAllocateObjectHeader result %x Target %p Context %p\n", Status, Target, DispatchContext); return Status; } - diff --git a/drivers/wdm/audio/backpln/portcls/dll.cpp b/drivers/wdm/audio/backpln/portcls/dll.cpp index 354c1964b2a..63832017caf 100644 --- a/drivers/wdm/audio/backpln/portcls/dll.cpp +++ b/drivers/wdm/audio/backpln/portcls/dll.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> extern @@ -23,7 +20,6 @@ DllInitialize(ULONG Unknown) return 0; } - extern "C" { diff --git a/drivers/wdm/audio/backpln/portcls/dma_slave.cpp b/drivers/wdm/audio/backpln/portcls/dma_slave.cpp index ef71d248981..34f68dc65e4 100644 --- a/drivers/wdm/audio/backpln/portcls/dma_slave.cpp +++ b/drivers/wdm/audio/backpln/portcls/dma_slave.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> class CDmaChannelInit : public CUnknownImpl<IDmaChannelInit> @@ -74,8 +71,6 @@ protected: friend IO_ALLOCATION_ACTION NTAPI AdapterControl(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID MapRegisterBase, IN PVOID Context); }; - - //--------------------------------------------------------------- // IUnknown methods // @@ -235,7 +230,6 @@ CDmaChannelInit::PhysicalAddress( return Result; } - #endif VOID @@ -257,7 +251,6 @@ CDmaChannelInit::BufferSize() return m_BufferSize; } - PVOID NTAPI CDmaChannelInit::SystemAddress() diff --git a/drivers/wdm/audio/backpln/portcls/drm.cpp b/drivers/wdm/audio/backpln/portcls/drm.cpp index d4c93c03126..abd953db992 100644 --- a/drivers/wdm/audio/backpln/portcls/drm.cpp +++ b/drivers/wdm/audio/backpln/portcls/drm.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> NTSTATUS diff --git a/drivers/wdm/audio/backpln/portcls/drm_port.cpp b/drivers/wdm/audio/backpln/portcls/drm_port.cpp index 6d10cd8d626..e6ee225db28 100644 --- a/drivers/wdm/audio/backpln/portcls/drm_port.cpp +++ b/drivers/wdm/audio/backpln/portcls/drm_port.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> class CDrmPort2 : public CUnknownImpl<IDrmPort2> @@ -134,5 +131,3 @@ NewIDrmPort( *OutPort = (PDRMPORT2)This; return STATUS_SUCCESS; } - - diff --git a/drivers/wdm/audio/backpln/portcls/filter_dmus.cpp b/drivers/wdm/audio/backpln/portcls/filter_dmus.cpp index b375cd8b67e..13711d85498 100644 --- a/drivers/wdm/audio/backpln/portcls/filter_dmus.cpp +++ b/drivers/wdm/audio/backpln/portcls/filter_dmus.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> class CPortFilterDMus : public CUnknownImpl<IPortFilterDMus> @@ -287,7 +284,6 @@ CPortFilterDMus::Init( return STATUS_SUCCESS; } - NTSTATUS NTAPI CPortFilterDMus::FreePin( @@ -321,7 +317,6 @@ CPortFilterDMus::NotifyPins() } } - NTSTATUS NewPortFilterDMus( OUT PPORTFILTERDMUS * OutFilter) @@ -339,5 +334,3 @@ NewPortFilterDMus( return STATUS_SUCCESS; } - - diff --git a/drivers/wdm/audio/backpln/portcls/filter_topology.cpp b/drivers/wdm/audio/backpln/portcls/filter_topology.cpp index 150de8c3cab..f7cbdda4924 100644 --- a/drivers/wdm/audio/backpln/portcls/filter_topology.cpp +++ b/drivers/wdm/audio/backpln/portcls/filter_topology.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> class CPortFilterTopology : public CUnknownImpl<IPortFilterTopology> @@ -29,7 +26,6 @@ protected: ISubdevice * m_SubDevice; }; - NTSTATUS NTAPI CPortFilterTopology::QueryInterface( @@ -70,7 +66,6 @@ CPortFilterTopology::NewIrpTarget( return STATUS_NOT_SUPPORTED; } - NTSTATUS NTAPI CPortFilterTopology::DeviceIoControl( @@ -232,7 +227,6 @@ CPortFilterTopology::Init( SUBDEVICE_DESCRIPTOR * Descriptor; NTSTATUS Status; - // get our private interface Status = Port->QueryInterface(IID_ISubdevice, (PVOID*)&ISubDevice); if (!NT_SUCCESS(Status)) diff --git a/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.cpp b/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.cpp index 6a935da41c6..bae79593c7e 100644 --- a/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.cpp +++ b/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> class CPortFilterWaveCyclic : public CUnknownImpl<IPortFilterWaveCyclic> @@ -312,7 +309,6 @@ CPortFilterWaveCyclic::Init( return STATUS_SUCCESS; } - NTSTATUS NTAPI CPortFilterWaveCyclic::FreePin( @@ -332,7 +328,6 @@ CPortFilterWaveCyclic::FreePin( return STATUS_UNSUCCESSFUL; } - NTSTATUS NewPortFilterWaveCyclic( OUT IPortFilterWaveCyclic ** OutFilter) @@ -351,4 +346,3 @@ NewPortFilterWaveCyclic( return STATUS_SUCCESS; } - diff --git a/drivers/wdm/audio/backpln/portcls/filter_wavepci.cpp b/drivers/wdm/audio/backpln/portcls/filter_wavepci.cpp index 9bf3a9465b8..1d1bf7781fd 100644 --- a/drivers/wdm/audio/backpln/portcls/filter_wavepci.cpp +++ b/drivers/wdm/audio/backpln/portcls/filter_wavepci.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> class CPortFilterWavePci : public CUnknownImpl<IPortFilterWavePci> @@ -91,7 +88,6 @@ CPortFilterWavePci::NewIrpTarget( return STATUS_UNSUCCESSFUL; } - // now create the pin Status = NewPortPinWavePci(&Pin); if (!NT_SUCCESS(Status)) @@ -313,7 +309,6 @@ CPortFilterWavePci::FreePin( return STATUS_UNSUCCESSFUL; } - NTSTATUS NewPortFilterWavePci( OUT IPortFilterWavePci ** OutFilter) diff --git a/drivers/wdm/audio/backpln/portcls/filter_wavert.cpp b/drivers/wdm/audio/backpln/portcls/filter_wavert.cpp index a91abafb880..99b32680e68 100644 --- a/drivers/wdm/audio/backpln/portcls/filter_wavert.cpp +++ b/drivers/wdm/audio/backpln/portcls/filter_wavert.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> class CPortFilterWaveRT : public CUnknownImpl<IPortFilterWaveRT> diff --git a/drivers/wdm/audio/backpln/portcls/interrupt.cpp b/drivers/wdm/audio/backpln/portcls/interrupt.cpp index f733c615974..91ce323e0b2 100644 --- a/drivers/wdm/audio/backpln/portcls/interrupt.cpp +++ b/drivers/wdm/audio/backpln/portcls/interrupt.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> typedef struct @@ -47,13 +44,10 @@ public: friend BOOLEAN NTAPI IInterruptServiceRoutine(IN PKINTERRUPT Interrupt, IN PVOID ServiceContext); }; - //--------------------------------------------------------------- // IUnknown methods // - - NTSTATUS NTAPI CInterruptSync::QueryInterface( @@ -72,7 +66,6 @@ CInterruptSync::QueryInterface( return STATUS_SUCCESS; } - if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) { DPRINT1("CInterruptSync::QueryInterface: no interface!!! iface %S\n", GuidString.Buffer); @@ -86,7 +79,6 @@ CInterruptSync::QueryInterface( // CInterruptSync methods // - BOOLEAN NTAPI CInterruptSynchronizedRoutine( @@ -219,7 +211,6 @@ IInterruptServiceRoutine( } } - NTSTATUS NTAPI CInterruptSync::Connect() @@ -255,7 +246,6 @@ CInterruptSync::Connect() return Status; } - VOID NTAPI CInterruptSync::Disconnect() diff --git a/drivers/wdm/audio/backpln/portcls/irp.cpp b/drivers/wdm/audio/backpln/portcls/irp.cpp index 8d775bfe493..2130c29be94 100644 --- a/drivers/wdm/audio/backpln/portcls/irp.cpp +++ b/drivers/wdm/audio/backpln/portcls/irp.cpp @@ -11,10 +11,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> typedef struct @@ -23,7 +20,6 @@ typedef struct PDEVICE_OBJECT DeviceObject; }QUERY_POWER_CONTEXT, *PQUERY_POWER_CONTEXT; - NTSTATUS NTAPI PortClsCreate( @@ -35,7 +31,6 @@ PortClsCreate( return KsDispatchIrp(DeviceObject, Irp); } - NTSTATUS NTAPI PortClsPnp( @@ -53,7 +48,6 @@ PortClsPnp( DeviceExt = (PPCLASS_DEVICE_EXTENSION) DeviceObject->DeviceExtension; IoStack = IoGetCurrentIrpStackLocation(Irp); - DPRINT("PortClsPnp called %u\n", IoStack->MinorFunction); //PC_ASSERT(DeviceExt); @@ -203,7 +197,6 @@ PwrCompletionFunction( FreeItem(PwrContext, TAG_PORTCLASS); } - NTSTATUS NTAPI PortClsPower( @@ -460,7 +453,6 @@ PcDispatchIrp( return STATUS_SUCCESS; } - NTSTATUS NTAPI PcCompleteIrp( @@ -512,8 +504,6 @@ CompletionRoutine( if (_InvokeOnCancel) _IrpSp->Control |= SL_INVOKE_ON_CANCEL; \ } - - NTSTATUS NTAPI PcForwardIrpSynchronous( diff --git a/drivers/wdm/audio/backpln/portcls/irpstream.cpp b/drivers/wdm/audio/backpln/portcls/irpstream.cpp index 4e2b701eca1..a79259fa082 100644 --- a/drivers/wdm/audio/backpln/portcls/irpstream.cpp +++ b/drivers/wdm/audio/backpln/portcls/irpstream.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> static @@ -86,7 +83,6 @@ typedef struct #define STREAM_DATA_OFFSET (0) - NTSTATUS NTAPI CIrpQueue::QueryInterface( @@ -248,7 +244,6 @@ CIrpQueue::AddMapping( } } - // now get a system address for the user buffers Header = (PKSSTREAM_HEADER)Irp->AssociatedIrp.SystemBuffer; Mdl = Irp->MdlAddress; diff --git a/drivers/wdm/audio/backpln/portcls/miniport.cpp b/drivers/wdm/audio/backpln/portcls/miniport.cpp index 8f00823770f..f7f4b44c836 100644 --- a/drivers/wdm/audio/backpln/portcls/miniport.cpp +++ b/drivers/wdm/audio/backpln/portcls/miniport.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> PVOID @@ -79,4 +76,3 @@ PcNewMiniport( DPRINT("PcNewMiniport Status %x\n", Status); return Status; } - diff --git a/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp b/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp index f57aa72a7dc..70cee8d66b3 100644 --- a/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp +++ b/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp @@ -9,10 +9,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> // + for absolute / - for relative diff --git a/drivers/wdm/audio/backpln/portcls/miniport_fmsynth.cpp b/drivers/wdm/audio/backpln/portcls/miniport_fmsynth.cpp index 44d479047d2..a84cd33674f 100644 --- a/drivers/wdm/audio/backpln/portcls/miniport_fmsynth.cpp +++ b/drivers/wdm/audio/backpln/portcls/miniport_fmsynth.cpp @@ -8,12 +8,6 @@ #include "private.hpp" -#ifndef YDEBUG -#define NDEBUG -#endif - -#include <debug.h> - NTSTATUS NewMiniportFmSynth( OUT PMINIPORT* OutMiniport, IN REFCLSID ClassId) diff --git a/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp b/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp index ef07aabed7d..9455d3fcbb2 100644 --- a/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp +++ b/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> class CPortPinDMus : public CUnknownImpl<IPortPinDMus> @@ -46,7 +43,6 @@ protected: PMINIPORTMIDI m_MidiMiniport; PMINIPORTMIDISTREAM m_MidiStream; - KSSTATE m_State; PKSDATAFORMAT m_Format; KSPIN_CONNECT * m_ConnectDetails; @@ -124,7 +120,6 @@ CPortPinDMus::GetBuffer( return STATUS_SUCCESS; } - NTSTATUS NTAPI CPortPinDMus::PutBuffer( @@ -147,7 +142,6 @@ CPortPinDMus::SetState( return STATUS_NOT_IMPLEMENTED; } - NTSTATUS NTAPI CPortPinDMus::PutMessage( @@ -157,7 +151,6 @@ CPortPinDMus::PutMessage( return STATUS_SUCCESS; } - NTSTATUS NTAPI CPortPinDMus::ConnectOutput( @@ -167,7 +160,6 @@ CPortPinDMus::ConnectOutput( return STATUS_NOT_IMPLEMENTED; } - NTSTATUS NTAPI CPortPinDMus::DisconnectOutput( @@ -255,7 +247,6 @@ CPortPinDMus::TransferMidiDataToDMus() Event->Event.cbEvent = (USHORT)BufferSize; Event->Event.uData.pbData = (PBYTE)Buffer; - if (!Root) Root = Event; else @@ -276,8 +267,6 @@ CPortPinDMus::TransferMidiDataToDMus() DPRINT("Status %x\n", Status); } - - VOID NTAPI CPortPinDMus::RequestService() @@ -295,6 +284,7 @@ CPortPinDMus::RequestService() } //================================================================================================================================== + NTSTATUS NTAPI CPortPinDMus::QueryInterface( @@ -629,4 +619,3 @@ NewPortPinDMus( return STATUS_SUCCESS; } - diff --git a/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp b/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp index ec67bb50ef0..15495d2aeef 100644 --- a/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp +++ b/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> class CPortPinWaveCyclic : public CUnknownImpl<IPortPinWaveCyclic, IServiceSink> @@ -109,7 +106,6 @@ protected: ULONG m_Delay; }; - typedef struct { ULONG bLoopedStreaming; @@ -121,8 +117,6 @@ typedef struct ULONG bLoopedStreaming; }ENDOFSTREAM_EVENT_CONTEXT, *PENDOFSTREAM_EVENT_CONTEXT; - - NTSTATUS NTAPI PinWaveCyclicState(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); NTSTATUS NTAPI PinWaveCyclicDataFormat(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); NTSTATUS NTAPI PinWaveCyclicAudioPosition(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); @@ -131,7 +125,6 @@ NTSTATUS NTAPI PinWaveCyclicAddEndOfStreamEvent(IN PIRP Irp, IN PKSEVENTDATA Ev NTSTATUS NTAPI PinWaveCyclicAddLoopedStreamEvent(IN PIRP Irp, IN PKSEVENTDATA EventData, IN PKSEVENT_ENTRY EventEntry); NTSTATUS NTAPI PinWaveCyclicDRMHandler(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); - DEFINE_KSPROPERTY_CONNECTIONSET(PinWaveCyclicConnectionSet, PinWaveCyclicState, PinWaveCyclicDataFormat, PinWaveCyclicAllocatorFraming); DEFINE_KSPROPERTY_AUDIOSET(PinWaveCyclicAudioSet, PinWaveCyclicAudioPosition); DEFINE_KSPROPERTY_DRMSET(PinWaveCyclicDRMSet, PinWaveCyclicDRMHandler); @@ -156,7 +149,6 @@ KSEVENT_ITEM PinWaveCyclicStreamingEventSet = 0 }; - KSPROPERTY_SET PinWaveCyclicPropertySet[] = { { @@ -196,7 +188,6 @@ KSEVENT_SET PinWaveCyclicEventSet[] = } }; - //================================================================================================================================== NTSTATUS @@ -237,7 +228,6 @@ PinWaveCyclicDRMHandler( return STATUS_INVALID_PARAMETER; } - NTSTATUS NTAPI PinWaveCyclicAddEndOfStreamEvent( @@ -335,7 +325,6 @@ PinWaveCyclicAllocatorFraming( // cast to pin impl Pin = (CPortPinWaveCyclic*)Descriptor->PortPin; - if (Request->Flags & KSPROPERTY_TYPE_GET) { // copy pin framing @@ -452,7 +441,6 @@ PinSetStateWorkerRoutine( } - NTSTATUS NTAPI PinWaveCyclicState( @@ -600,7 +588,6 @@ PinWaveCyclicDataFormat( PC_ASSERT(IsEqualGUIDAligned(((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->DataFormat.SubFormat, KSDATAFORMAT_SUBTYPE_PCM)); PC_ASSERT(IsEqualGUIDAligned(((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->DataFormat.Specifier, KSDATAFORMAT_SPECIFIER_WAVEFORMATEX)); - DPRINT("NewDataFormat: Channels %u Bits %u Samples %u\n", ((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.nChannels, ((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.wBitsPerSample, ((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.nSamplesPerSec); @@ -613,7 +600,6 @@ PinWaveCyclicDataFormat( FreeItem(NewDataFormat, TAG_PORTCLASS); } - // done return Status; } @@ -773,7 +759,6 @@ CPortPinWaveCyclic::UpdateCommonBufferOverlap( PUCHAR Buffer; NTSTATUS Status; - BufferLength = Gap = m_CommonBufferSize - m_CommonBufferOffset; BufferLength = Length = min(BufferLength, MaxTransferCount); while(BufferLength) @@ -1076,7 +1061,6 @@ CPortPinWaveCyclic::Close( m_Stream = NULL; } - if (m_Filter) { // disconnect pin from filter @@ -1141,7 +1125,6 @@ CPortPinWaveCyclic::FastDeviceIoControl( return KsDispatchFastIoDeviceControlFailure(FileObject, Wait, InputBuffer, InputBufferLength, OutputBuffer, OutputBufferLength, IoControlCode, StatusBlock, DeviceObject); } - BOOLEAN NTAPI CPortPinWaveCyclic::FastRead( @@ -1157,7 +1140,6 @@ CPortPinWaveCyclic::FastRead( return KsDispatchFastReadFailure(FileObject, FileOffset, Length, Wait, LockKey, Buffer, StatusBlock, DeviceObject); } - BOOLEAN NTAPI CPortPinWaveCyclic::FastWrite( @@ -1173,7 +1155,6 @@ CPortPinWaveCyclic::FastWrite( return KsDispatchFastReadFailure(FileObject, FileOffset, Length, Wait, LockKey, Buffer, StatusBlock, DeviceObject); } - NTSTATUS NTAPI CPortPinWaveCyclic::Init( @@ -1218,7 +1199,6 @@ CPortPinWaveCyclic::Init( while(TRUE); } - Status = m_Miniport->NewStream(&m_Stream, NULL, NonPagedPool, @@ -1321,7 +1301,6 @@ CPortPinWaveCyclic::Init( DPRINT1("Bits %u Samples %u Channels %u Tag %u FrameSize %u CommonBufferSize %lu, CommonBuffer %p\n", ((PKSDATAFORMAT_WAVEFORMATEX)(DataFormat))->WaveFormatEx.wBitsPerSample, ((PKSDATAFORMAT_WAVEFORMATEX)(DataFormat))->WaveFormatEx.nSamplesPerSec, ((PKSDATAFORMAT_WAVEFORMATEX)(DataFormat))->WaveFormatEx.nChannels, ((PKSDATAFORMAT_WAVEFORMATEX)(DataFormat))->WaveFormatEx.wFormatTag, m_FrameSize, m_CommonBufferSize, m_DmaChannel->SystemAddress()); - /* set up allocator framing */ m_AllocatorFraming.RequirementsFlags = KSALLOCATOR_REQUIREMENTF_SYSTEM_MEMORY | KSALLOCATOR_REQUIREMENTF_PREFERENCES_ONLY; m_AllocatorFraming.PoolType = NonPagedPool; @@ -1354,7 +1333,6 @@ CPortPinWaveCyclic::Init( return STATUS_SUCCESS; } - ULONG NTAPI CPortPinWaveCyclic::GetCompletedPosition() @@ -1363,7 +1341,6 @@ CPortPinWaveCyclic::GetCompletedPosition() return 0; } - ULONG NTAPI CPortPinWaveCyclic::GetCycleCount() @@ -1372,7 +1349,6 @@ CPortPinWaveCyclic::GetCycleCount() return 0; } - ULONG NTAPI CPortPinWaveCyclic::GetDeviceBufferSize() @@ -1380,7 +1356,6 @@ CPortPinWaveCyclic::GetDeviceBufferSize() return m_CommonBufferSize; } - PVOID NTAPI CPortPinWaveCyclic::GetIrpStream() @@ -1388,7 +1363,6 @@ CPortPinWaveCyclic::GetIrpStream() return (PVOID)m_IrpQueue; } - PMINIPORT NTAPI CPortPinWaveCyclic::GetMiniport() @@ -1396,7 +1370,6 @@ CPortPinWaveCyclic::GetMiniport() return (PMINIPORT)m_Miniport; } - NTSTATUS NewPortPinWaveCyclic( OUT IPortPinWaveCyclic ** OutPin) @@ -1414,4 +1387,3 @@ NewPortPinWaveCyclic( return STATUS_SUCCESS; } - diff --git a/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp b/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp index 879965edc32..97f2d8311da 100644 --- a/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp +++ b/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> class CPortPinWavePci : public CUnknownImpl<IPortPinWavePci, IServiceSink, IPortWavePciStream> @@ -93,7 +90,6 @@ KSPROPERTY_SET PinWavePciPropertySet[] = } }; - NTSTATUS NTAPI PinWavePciAllocatorFraming( @@ -115,7 +111,6 @@ PinWavePciAllocatorFraming( // cast to pin impl Pin = (CPortPinWavePci*)Descriptor->PortPin; - if (Request->Flags & KSPROPERTY_TYPE_GET) { // copy pin framing @@ -168,7 +163,6 @@ PinWavePciAudioPosition( return STATUS_NOT_SUPPORTED; } - NTSTATUS NTAPI PinWavePciState( @@ -330,7 +324,6 @@ PinWavePciDataFormat( PC_ASSERT(IsEqualGUIDAligned(((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->DataFormat.SubFormat, KSDATAFORMAT_SUBTYPE_PCM)); PC_ASSERT(IsEqualGUIDAligned(((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->DataFormat.Specifier, KSDATAFORMAT_SPECIFIER_WAVEFORMATEX)); - DPRINT("NewDataFormat: Channels %u Bits %u Samples %u\n", ((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.nChannels, ((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.wBitsPerSample, ((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.nSamplesPerSec); @@ -343,7 +336,6 @@ PinWavePciDataFormat( FreeItem(NewDataFormat, TAG_PORTCLASS); } - // done return Status; } @@ -371,8 +363,8 @@ PinWavePciDataFormat( return STATUS_NOT_SUPPORTED; } - //================================================================================================================================== + NTSTATUS NTAPI CPortPinWavePci::QueryInterface( @@ -396,7 +388,6 @@ CPortPinWavePci::QueryInterface( return STATUS_SUCCESS; } - if (IsEqualGUIDAligned(refiid, IID_IPortWavePciStream)) { *Output = PVOID(PPORTWAVEPCISTREAM(this)); @@ -440,7 +431,6 @@ CPortPinWavePci::TerminatePacket() return STATUS_SUCCESS; } - VOID NTAPI CPortPinWavePci::RequestService() @@ -554,7 +544,6 @@ CPortPinWavePci::HandleKsStream( return Status; } - NTSTATUS NTAPI CPortPinWavePci::DeviceIoControl( @@ -639,7 +628,6 @@ CPortPinWavePci::Close( m_IrpQueue = NULL; } - if (m_ServiceGroup) { // remove member from service group @@ -766,7 +754,6 @@ CPortPinWavePci::FastWrite( return FALSE; } - NTSTATUS NTAPI CPortPinWavePci::Init( @@ -960,7 +947,6 @@ CPortPinWavePci::Init( } } - return STATUS_SUCCESS; } @@ -971,7 +957,6 @@ CPortPinWavePci::GetIrpStream() return (PVOID)m_IrpQueue; } - PMINIPORT NTAPI CPortPinWavePci::GetMiniport() @@ -979,7 +964,6 @@ CPortPinWavePci::GetMiniport() return (PMINIPORT)m_Miniport; } - NTSTATUS NewPortPinWavePci( OUT IPortPinWavePci ** OutPin) @@ -997,4 +981,3 @@ NewPortPinWavePci( return STATUS_SUCCESS; } - diff --git a/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp b/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp index d259649d3c0..922b952bbb8 100644 --- a/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp +++ b/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> class CPortPinWaveRT : public CUnknownImpl<IPortPinWaveRT> @@ -60,7 +57,6 @@ protected: }; - typedef struct { CPortPinWaveRT *Pin; @@ -68,8 +64,8 @@ typedef struct KSSTATE State; }SETSTREAM_CONTEXT, *PSETSTREAM_CONTEXT; - //================================================================================================================================== + NTSTATUS NTAPI CPortPinWaveRT::QueryInterface( @@ -286,7 +282,6 @@ CPortPinWaveRT::DeviceIoControl( IoStack = IoGetCurrentIrpStackLocation(Irp); - switch (IoStack->Parameters.DeviceIoControl.IoControlCode) { case IOCTL_KS_PROPERTY: @@ -671,7 +666,6 @@ cleanup: return Status; } - NTSTATUS NewPortPinWaveRT( OUT IPortPinWaveRT ** OutPin) diff --git a/drivers/wdm/audio/backpln/portcls/pool.cpp b/drivers/wdm/audio/backpln/portcls/pool.cpp index 63ee67edcdd..03ed6b365fb 100644 --- a/drivers/wdm/audio/backpln/portcls/pool.cpp +++ b/drivers/wdm/audio/backpln/portcls/pool.cpp @@ -8,11 +8,6 @@ #include "private.hpp" -#ifndef YDEBUG -#define NDEBUG -#endif -#include <debug.h> - PVOID AllocateItem( IN POOL_TYPE PoolType, diff --git a/drivers/wdm/audio/backpln/portcls/port.cpp b/drivers/wdm/audio/backpln/portcls/port.cpp index 504291a0d7d..2cd774de1ef 100644 --- a/drivers/wdm/audio/backpln/portcls/port.cpp +++ b/drivers/wdm/audio/backpln/portcls/port.cpp @@ -9,10 +9,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> NTSTATUS diff --git a/drivers/wdm/audio/backpln/portcls/port_dmus.cpp b/drivers/wdm/audio/backpln/portcls/port_dmus.cpp index 8a3e8cdae13..f2bfe94f072 100644 --- a/drivers/wdm/audio/backpln/portcls/port_dmus.cpp +++ b/drivers/wdm/audio/backpln/portcls/port_dmus.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> class CPortDMus : public CUnknownImpl<IPortDMus, ISubdevice> @@ -79,7 +76,6 @@ KSPROPERTY_SET PortDMusPropertySet[] = } }; - //--------------------------------------------------------------- // IUnknown interface functions // @@ -302,7 +298,6 @@ CPortDMus::Init( return STATUS_SUCCESS; } - NTSTATUS NTAPI CPortDMus::NewRegistryKey( @@ -393,7 +388,6 @@ CPortDMus::NewIrpTarget( return STATUS_SUCCESS; } - Status = NewPortFilterDMus(&Filter); if (!NT_SUCCESS(Status)) { @@ -462,7 +456,6 @@ CPortDMus::PowerChangeNotify( return STATUS_SUCCESS; } - NTSTATUS NTAPI CPortDMus::PinCount( @@ -485,8 +478,6 @@ CPortDMus::PinCount( return STATUS_UNSUCCESSFUL; } - - NTSTATUS NewPortDMus( OUT PPORT* OutPort) @@ -508,8 +499,6 @@ NewPortDMus( } - - VOID GetDMusMiniport( IN IPortDMus * iface, diff --git a/drivers/wdm/audio/backpln/portcls/port_topology.cpp b/drivers/wdm/audio/backpln/portcls/port_topology.cpp index 32467b3d6a4..8e346b223ea 100644 --- a/drivers/wdm/audio/backpln/portcls/port_topology.cpp +++ b/drivers/wdm/audio/backpln/portcls/port_topology.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> class CPortTopology : public CUnknownImpl<IPortTopology, ISubdevice, IPortEvents> @@ -78,7 +75,6 @@ KSPROPERTY_SET TopologyPropertySet[] = // IPortEvents // - void NTAPI CPortTopology::AddEventToEventList( @@ -100,7 +96,6 @@ CPortTopology::GenerateEventList( UNIMPLEMENTED; } - //--------------------------------------------------------------- // IUnknown interface functions // @@ -255,7 +250,6 @@ CPortTopology::Init( NULL, m_pDescriptor); - DPRINT("IPortTopology_fnInit success\n"); if (NT_SUCCESS(Status)) { @@ -266,7 +260,6 @@ CPortTopology::Init( return STATUS_SUCCESS; } - NTSTATUS NTAPI CPortTopology::NewRegistryKey( @@ -431,7 +424,6 @@ CPortTopology::PinCount( return STATUS_UNSUCCESSFUL; } - NTSTATUS NTAPI PcCreatePinDispatch( @@ -456,7 +448,6 @@ PcCreatePinDispatch( PC_ASSERT(Filter != NULL); PC_ASSERT_IRQL(PASSIVE_LEVEL); - #if KS_IMPLEMENTED Status = KsReferenceSoftwareBusObject(DeviceExt->KsDeviceHeader); if (!NT_SUCCESS(Status) && Status != STATUS_NOT_IMPLEMENTED) @@ -517,7 +508,6 @@ PcCreateItemDispatch( // sanity checks PC_ASSERT(SubDevice != NULL); - #if KS_IMPLEMENTED Status = KsReferenceSoftwareBusObject(DeviceExt->KsDeviceHeader); if (!NT_SUCCESS(Status) && Status != STATUS_NOT_IMPLEMENTED) @@ -571,7 +561,6 @@ PcCreateItemDispatch( return STATUS_SUCCESS; } - NTSTATUS NewPortTopology( OUT PPORT* OutPort) @@ -594,7 +583,6 @@ NewPortTopology( return Status; } - 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 3a4f3545de7..04525ab53f8 100644 --- a/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp +++ b/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> GUID IID_IDmaChannelSlave; @@ -87,7 +84,6 @@ KSPROPERTY_SET WaveCyclicPropertySet[] = //KSEVENTSETID_LoopedStreaming, Type = KSEVENT_LOOPEDSTREAMING_POSITION //KSEVENTSETID_Connection, Type = KSEVENT_CONNECTION_ENDOFSTREAM, - //--------------------------------------------------------------- // IPortEvents // @@ -100,7 +96,6 @@ CPortWaveCyclic::AddEventToEventList( UNIMPLEMENTED; } - void NTAPI CPortWaveCyclic::GenerateEventList( @@ -227,7 +222,6 @@ CPortWaveCyclic::Init( return Status; } - // get the miniport device descriptor Status = Miniport->GetDescription(&m_pDescriptor); if (!NT_SUCCESS(Status)) @@ -283,7 +277,6 @@ CPortWaveCyclic::Init( return STATUS_SUCCESS; } - NTSTATUS NTAPI CPortWaveCyclic::NewRegistryKey( @@ -300,7 +293,6 @@ CPortWaveCyclic::NewRegistryKey( return PcNewRegistryKey(OutRegistryKey, OuterUnknown, RegistryKeyType, DesiredAccess, m_pDeviceObject, (ISubdevice*)this, ObjectAttributes, CreateOptions, Disposition); } - //--------------------------------------------------------------- // IPortWaveCyclic interface functions // @@ -431,7 +423,6 @@ CPortWaveCyclic::NewIrpTarget( return Status; } - NTSTATUS NTAPI CPortWaveCyclic::ReleaseChildren() @@ -459,7 +450,6 @@ CPortWaveCyclic::ReleaseChildren() return STATUS_SUCCESS; } - NTSTATUS NTAPI CPortWaveCyclic::GetDescriptor( @@ -473,7 +463,6 @@ CPortWaveCyclic::GetDescriptor( return STATUS_SUCCESS; } - NTSTATUS NTAPI CPortWaveCyclic::DataRangeIntersection( @@ -494,7 +483,6 @@ CPortWaveCyclic::DataRangeIntersection( return STATUS_UNSUCCESSFUL; } - NTSTATUS NTAPI CPortWaveCyclic::PowerChangeNotify( @@ -530,8 +518,8 @@ CPortWaveCyclic::PinCount( return STATUS_UNSUCCESSFUL; } - ///-------------------------------------------------------------- + PMINIPORTWAVECYCLIC GetWaveCyclicMiniport( IN IPortWaveCyclic* iface) @@ -573,4 +561,3 @@ NewPortWaveCyclic( DPRINT("NewPortWaveCyclic %p Status %u\n", Port, Status); return Status; } - diff --git a/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp b/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp index 068d28256a8..e630e20958d 100644 --- a/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp +++ b/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> class CPortWavePci : public CUnknownImpl<IPortWavePci, IPortEvents, ISubdevice, IServiceSink> @@ -82,7 +79,6 @@ KSPROPERTY_SET WavePciPropertySet[] = } }; - //--------------------------------------------------------------- // IPortEvents // @@ -101,8 +97,6 @@ CPortWavePci::AddEventToEventList( KeReleaseSpinLock(&m_EventListLock, OldIrql); } - - void NTAPI CPortWavePci::GenerateEventList( @@ -268,7 +262,6 @@ CPortWavePci::Init( NULL, m_pDescriptor); - if (!NT_SUCCESS(Status)) { DPRINT("PcCreateSubdeviceDescriptor failed with %x\n", Status); @@ -277,7 +270,7 @@ CPortWavePci::Init( } // did we get a service group - if (ServiceGroup) + if (ServiceGroup) { // store service group in context m_ServiceGroup = ServiceGroup; @@ -512,7 +505,6 @@ CPortWavePci::PinCount( return STATUS_UNSUCCESSFUL; } - NTSTATUS NewPortWavePci( OUT PPORT* OutPort) @@ -536,7 +528,6 @@ NewPortWavePci( } - PDEVICE_OBJECT GetDeviceObjectFromPortWavePci( IPortWavePci* iface) diff --git a/drivers/wdm/audio/backpln/portcls/port_wavert.cpp b/drivers/wdm/audio/backpln/portcls/port_wavert.cpp index c7f5f7d51ab..0a809b467af 100644 --- a/drivers/wdm/audio/backpln/portcls/port_wavert.cpp +++ b/drivers/wdm/audio/backpln/portcls/port_wavert.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> class CPortWaveRT : public CUnknownImpl<IPortWaveRT, IPortEvents, ISubdevice> @@ -81,8 +78,6 @@ KSPROPERTY_SET WaveRTPropertySet[] = //KSEVENTSETID_LoopedStreaming, Type = KSEVENT_LOOPEDSTREAMING_POSITION //KSEVENTSETID_Connection, Type = KSEVENT_CONNECTION_ENDOFSTREAM, - - //--------------------------------------------------------------- // IPortEvents // @@ -95,7 +90,6 @@ CPortWaveRT::AddEventToEventList( UNIMPLEMENTED; } - void NTAPI CPortWaveRT::GenerateEventList( @@ -237,7 +231,6 @@ CPortWaveRT::Init( return Status; } - // get the miniport device descriptor Status = Miniport->GetDescription(&m_pDescriptor); if (!NT_SUCCESS(Status)) @@ -291,12 +284,10 @@ CPortWaveRT::Init( // increment reference on resource list ResourceList->AddRef(); - DPRINT("IPortWaveRT successfully initialized\n"); return STATUS_SUCCESS; } - NTSTATUS NTAPI CPortWaveRT::NewRegistryKey( @@ -343,7 +334,6 @@ CPortWaveRT::NewIrpTarget( return STATUS_SUCCESS; } - Status = NewPortFilterWaveRT(&Filter); if (!NT_SUCCESS(Status)) { @@ -459,7 +449,6 @@ GetDeviceObjectFromPortWaveRT( // IPortWaveRT constructor // - NTSTATUS NewPortWaveRT( OUT PPORT* OutPort) @@ -481,4 +470,3 @@ NewPortWaveRT( DPRINT("NewPortWaveRT %p Status %u\n", Port, Status); return Status; } - diff --git a/drivers/wdm/audio/backpln/portcls/port_wavertstream.cpp b/drivers/wdm/audio/backpln/portcls/port_wavertstream.cpp index 4689f07b609..7f01f35bcb9 100644 --- a/drivers/wdm/audio/backpln/portcls/port_wavertstream.cpp +++ b/drivers/wdm/audio/backpln/portcls/port_wavertstream.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> class CPortWaveRTStreamInit : public CUnknownImpl<IPortWaveRTStreamInit> @@ -44,7 +41,6 @@ CPortWaveRTStreamInit::QueryInterface( return STATUS_UNSUCCESSFUL; } - PMDL NTAPI CPortWaveRTStreamInit::AllocatePagesForMdl( @@ -157,7 +153,6 @@ CPortWaveRTStreamInit::GetPhysicalPageAddress( return Result; } - NTSTATUS NewPortWaveRTStream( PPORTWAVERTSTREAM *OutStream) diff --git a/drivers/wdm/audio/backpln/portcls/power.cpp b/drivers/wdm/audio/backpln/portcls/power.cpp index 17bfceca966..0f0f00c2d67 100644 --- a/drivers/wdm/audio/backpln/portcls/power.cpp +++ b/drivers/wdm/audio/backpln/portcls/power.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> NTSTATUS @@ -31,7 +28,6 @@ PcRegisterAdapterPowerManagement( if (!pUnknown || !pvContext) return STATUS_INVALID_PARAMETER; - pDeviceObject = (PDEVICE_OBJECT)pvContext; DeviceExt = (PPCLASS_DEVICE_EXTENSION)pDeviceObject->DeviceExtension; @@ -71,8 +67,6 @@ PcUnregisterAdapterPowerManagement( return STATUS_SUCCESS; } - - static VOID NTAPI @@ -114,7 +108,5 @@ PcRequestNewPowerState( KeWaitForSingleObject((PVOID)&Event, Executive, KernelMode, FALSE, NULL); } - return Status; } - diff --git a/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp b/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp index a63bff78b10..5aa07fcf998 100644 --- a/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp +++ b/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> NTSTATUS @@ -90,7 +87,6 @@ HandleNecessaryPropertyInstances( Result = (PULONG)Data; - // check if the miniport supports the IPinCount interface Status = SubDevice->PinCount(Pin->PinId, &FilterNecessary, &FilterCurrent, &FilterPossible, &GlobalCurrent, &GlobalPossible); diff --git a/drivers/wdm/audio/backpln/portcls/purecall.cpp b/drivers/wdm/audio/backpln/portcls/purecall.cpp index 6f078cc9191..ee5588c1d78 100644 --- a/drivers/wdm/audio/backpln/portcls/purecall.cpp +++ b/drivers/wdm/audio/backpln/portcls/purecall.cpp @@ -8,12 +8,6 @@ #include "private.hpp" -#ifndef YDEBUG -#define NDEBUG -#endif - -#include <debug.h> - extern "C" { void __cxa_pure_virtual() @@ -21,7 +15,5 @@ extern "C" { // put error handling here DbgBreakPoint(); - } } - diff --git a/drivers/wdm/audio/backpln/portcls/registry.cpp b/drivers/wdm/audio/backpln/portcls/registry.cpp index 56a8cc144c8..d157365d1ed 100644 --- a/drivers/wdm/audio/backpln/portcls/registry.cpp +++ b/drivers/wdm/audio/backpln/portcls/registry.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> class CRegistryKey : public CUnknownImpl<IRegistryKey> @@ -44,7 +41,6 @@ CRegistryKey::~CRegistryKey() } } - NTSTATUS NTAPI CRegistryKey::QueryInterface( diff --git a/drivers/wdm/audio/backpln/portcls/resource.cpp b/drivers/wdm/audio/backpln/portcls/resource.cpp index 19020345579..21b90254e00 100644 --- a/drivers/wdm/audio/backpln/portcls/resource.cpp +++ b/drivers/wdm/audio/backpln/portcls/resource.cpp @@ -11,10 +11,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> class CResourceList : public CUnknownImpl<IResourceList> @@ -220,7 +217,6 @@ CResourceList::AddEntry( /* Sanity check */ PC_ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); - /* Is there still room for another entry */ if (m_NumberOfEntries >= m_MaxEntries) { @@ -293,7 +289,6 @@ CResourceList::UntranslatedList() return m_UntranslatedResourceList; } - PORTCLASSAPI NTSTATUS NTAPI diff --git a/drivers/wdm/audio/backpln/portcls/service_group.cpp b/drivers/wdm/audio/backpln/portcls/service_group.cpp index d3688a92c14..8a2b83334e0 100644 --- a/drivers/wdm/audio/backpln/portcls/service_group.cpp +++ b/drivers/wdm/audio/backpln/portcls/service_group.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> VOID @@ -50,13 +47,10 @@ protected: friend VOID NTAPI IServiceGroupDpc(IN struct _KDPC *Dpc, IN PVOID DeferredContext, IN PVOID SystemArgument1, IN PVOID SystemArgument2); }; - - //--------------------------------------------------------------- // IUnknown methods // - NTSTATUS NTAPI CServiceGroup::QueryInterface( diff --git a/drivers/wdm/audio/backpln/portcls/undoc.cpp b/drivers/wdm/audio/backpln/portcls/undoc.cpp index d6a42baa1ab..6bd1a1bb23b 100644 --- a/drivers/wdm/audio/backpln/portcls/undoc.cpp +++ b/drivers/wdm/audio/backpln/portcls/undoc.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> NTSTATUS @@ -98,7 +95,6 @@ PcHandlePropertyWithTable( // store device descriptor KSPROPERTY_ITEM_IRP_STORAGE(Irp) = (PKSPROPERTY_ITEM)SubDeviceDescriptor; - // then try KsPropertyHandler return KsPropertyHandler(Irp, PropertySetCount, PropertySet); } @@ -181,7 +177,6 @@ PropertyItemDispatch( PropertyRequest->Irp = Irp; PropertyRequest->Verb = Property->Flags; - // check if this is filter / pin property request if (!(Property->Flags & KSPROPERTY_TYPE_TOPOLOGY)) { @@ -324,8 +319,6 @@ ASSERT(PropertyItem->Set); // RtlStringFromGUID(*PropertyItem->Set, &GuidBuffer); // DPRINT1("PcAddToPropertyTable Adding Item Set %S Id %lu Flags %lx\n", GuidBuffer.Buffer, PropertyItem->Id, PropertyItem->Flags); - - //DPRINT1("FilterPropertySetCount %lu\n", SubDeviceDescriptor->FilterPropertySetCount); // first step check if the property set is present already for(Index = 0; Index < SubDeviceDescriptor->FilterPropertySetCount; Index++) @@ -516,9 +509,6 @@ PcCaptureFormat( return STATUS_NOT_IMPLEMENTED; } - - - VOID DumpAutomationTable( IN PPCAUTOMATION_TABLE AutomationTable, @@ -631,7 +621,6 @@ DumpAutomationTable( DPRINT("=====================================================================\n"); } - VOID DumpFilterDescriptor( IN PPCFILTER_DESCRIPTOR FilterDescription) @@ -649,7 +638,6 @@ DumpFilterDescriptor( // dump filter description table DumpAutomationTable((PPCAUTOMATION_TABLE)FilterDescription->AutomationTable, L"Filter", L""); - if (FilterDescription->PinCount) { if (FilterDescription->PinSize >= sizeof(PCPIN_DESCRIPTOR)) @@ -678,7 +666,6 @@ DumpFilterDescriptor( } } - if (FilterDescription->Nodes) { if (FilterDescription->NodeSize >= sizeof(PCNODE_DESCRIPTOR)) @@ -1002,4 +989,3 @@ PcValidateConnectRequest( { return KsValidateConnectRequest(Irp, Factory->PinDescriptorCount, Factory->KsPinDescriptor, Connect); } - diff --git a/drivers/wdm/audio/backpln/portcls/unregister.cpp b/drivers/wdm/audio/backpln/portcls/unregister.cpp index ef9d7130888..b4ace6d9eaf 100644 --- a/drivers/wdm/audio/backpln/portcls/unregister.cpp +++ b/drivers/wdm/audio/backpln/portcls/unregister.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> class CUnregisterSubdevice : public CUnknownImpl<IUnregisterSubdevice> diff --git a/drivers/wdm/audio/backpln/portcls/version.cpp b/drivers/wdm/audio/backpln/portcls/version.cpp index c3571cc7bd1..fb102188a6f 100644 --- a/drivers/wdm/audio/backpln/portcls/version.cpp +++ b/drivers/wdm/audio/backpln/portcls/version.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include <debug.h> class CPortClsVersion : public CUnknownImpl<IPortClsVersion> @@ -30,8 +27,6 @@ public: } }; - - //--------------------------------------------------------------- // IPortClsVersion interface functions //

1 year, 2 months

[reactos] 01/01: [IMM32][SDK] Add CtfAImmIsIME, CtfImmSetAppCompatFlags etc. (#5862)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dabb3f4d61da14bfb25c6… commit dabb3f4d61da14bfb25c650a05f5943bea8ea4b4 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Nov 2 08:16:12 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Nov 2 08:16:12 2023 +0900 [IMM32][SDK] Add CtfAImmIsIME, CtfImmSetAppCompatFlags etc. (#5862) - Add CtfAImmIsIME, CtfImmIsCiceroStartedInThread and CtfImmSetAppCompatFlags functions. - Implement CtfImmDispatchDefImeMessage function. - Modify imm32.spec. - Add the prototypes of ImmGetAppCompatFlags, CtfAImmIsIME, CtfImmIsCiceroStartedInThread, CtfImmSetAppCompatFlags, and CtfImmDispatchDefImeMessage into <imm32_undoc.h>. CORE-19268 --- dll/win32/imm32/ctf.c | 62 +++++++++++++++++++++++++++++++++++++-- dll/win32/imm32/imm32.spec | 5 +++- dll/win32/imm32/keymsg.c | 7 ++++- dll/win32/imm32/precomp.h | 1 + sdk/include/reactos/imm32_undoc.h | 11 +++++++ 5 files changed, 82 insertions(+), 4 deletions(-) diff --git a/dll/win32/imm32/ctf.c b/dll/win32/imm32/ctf.c index eeeae62b588..b403cb3ad59 100644 --- a/dll/win32/imm32/ctf.c +++ b/dll/win32/imm32/ctf.c @@ -29,6 +29,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(imm); * this folder. */ +/* "Active IMM" compatibility flags */ +DWORD g_aimm_compat_flags = 0; + /* The instance of the CTF IME file */ HINSTANCE g_hCtfIme = NULL; @@ -192,6 +195,45 @@ CtfImeDestroyThreadMgr(VOID) return CTF_IME_FN(CtfImeDestroyThreadMgr)(); } +/*********************************************************************** + * CtfAImmIsIME (IMM32.@) + * + * @return TRUE if CTF IME or IMM IME is enabled. + */ +BOOL WINAPI +CtfAImmIsIME(_In_ HKL hKL) +{ + TRACE("(%p)\n", hKL); + if (!Imm32LoadCtfIme()) + return ImmIsIME(hKL); + return CTF_IME_FN(CtfImeIsIME)(hKL); +} + +/*********************************************************************** + * CtfImmIsCiceroStartedInThread (IMM32.@) + * + * @return TRUE if Cicero is started in the current thread. + */ +BOOL WINAPI +CtfImmIsCiceroStartedInThread(VOID) +{ + TRACE("()\n"); + return !!(GetWin32ClientInfo()->CI_flags & 0x200); +} + +/*********************************************************************** + * CtfImmSetAppCompatFlags (IMM32.@) + * + * Sets the application compatibility flags. + */ +VOID WINAPI +CtfImmSetAppCompatFlags(_In_ DWORD dwFlags) +{ + TRACE("(0x%08X)\n", dwFlags); + if (!(dwFlags & 0xF0FFFFFF)) + g_aimm_compat_flags = dwFlags; +} + /*********************************************************************** * This function calls the same name function of the CTF IME side. */ @@ -361,6 +403,18 @@ CtfImmHideToolbarWnd(VOID) return 0; } +BOOL Imm32InsideLoaderLock(VOID) +{ + return (NtCurrentTeb()->ProcessEnvironmentBlock->LoaderLock->OwningThread == + NtCurrentTeb()->ClientId.UniqueThread); +} + +/* FIXME: Use RTL */ +BOOL WINAPI RtlDllShutdownInProgress(VOID) +{ + return FALSE; +} + /*********************************************************************** * CtfImmDispatchDefImeMessage(IMM32.@) */ @@ -371,8 +425,12 @@ CtfImmDispatchDefImeMessage( _In_ WPARAM wParam, _In_ LPARAM lParam) { - /* FIXME("(%p, %u, %p, %p)\n", hWnd, uMsg, wParam, lParam); */ - return 0; + TRACE("(%p, %u, %p, %p)\n", hWnd, uMsg, wParam, lParam); + + if (RtlDllShutdownInProgress() || Imm32InsideLoaderLock() || !Imm32LoadCtfIme()) + return 0; + + return CTF_IME_FN(CtfImeDispatchDefImeMessage)(hWnd, uMsg, wParam, lParam); } /*********************************************************************** diff --git a/dll/win32/imm32/imm32.spec b/dll/win32/imm32/imm32.spec index eec7202482a..89293195098 100644 --- a/dll/win32/imm32/imm32.spec +++ b/dll/win32/imm32/imm32.spec @@ -1,6 +1,8 @@ @ stdcall CtfAImmActivate(ptr) @ stdcall CtfAImmDeactivate(long) +@ stdcall CtfAImmIsIME(ptr) @ stdcall CtfImmIsCiceroEnabled() +@ stdcall CtfImmIsCiceroStartedInThread() @ stdcall CtfImmIsTextFrameServiceDisabled() @ stdcall CtfImmTIMActivate(ptr) @ stdcall CtfImmRestoreToolbarWnd(long) @@ -8,6 +10,7 @@ @ stdcall CtfImmDispatchDefImeMessage(ptr long ptr ptr) @ stdcall CtfImmIsGuidMapEnable(ptr) @ stdcall CtfImmGetGuidAtom(ptr long ptr) +@ stdcall CtfImmSetAppCompatFlags(long) @ stdcall ImmActivateLayout(ptr) @ stdcall ImmAssociateContext(ptr ptr) @ stdcall ImmAssociateContextEx(ptr ptr long) @@ -31,6 +34,7 @@ @ stdcall ImmEscapeW(long ptr long ptr) @ stdcall ImmFreeLayout(long) @ stdcall ImmGenerateMessage(ptr) +@ stdcall ImmGetAppCompatFlags(ptr) @ stdcall ImmGetCandidateListA(long long ptr long) @ stdcall ImmGetCandidateListCountA(long ptr) @ stdcall ImmGetCandidateListCountW(long ptr) @@ -84,7 +88,6 @@ @ stdcall ImmLockIMCC(ptr) @ stdcall ImmLockImeDpi(ptr) @ stdcall ImmNotifyIME(ptr long long long) -@ stub ImmPenAuxInput @ stdcall ImmProcessKey(ptr long long long long) @ stdcall ImmPutImeMenuItemsIntoMappedFile(ptr) @ stdcall ImmReSizeIMCC(ptr long) diff --git a/dll/win32/imm32/keymsg.c b/dll/win32/imm32/keymsg.c index 3e05fe416b9..3f2fb48be31 100644 --- a/dll/win32/imm32/keymsg.c +++ b/dll/win32/imm32/keymsg.c @@ -752,18 +752,23 @@ UINT WINAPI ImmGetVirtualKey(HWND hWnd) return ret; } +/*********************************************************************** + * ImmGetAppCompatFlags (IMM32.@) + */ DWORD WINAPI ImmGetAppCompatFlags(HIMC hIMC) { PCLIENTIMC pClientIMC; DWORD dwFlags; + TRACE("(%p)\n", hIMC); + pClientIMC = ImmLockClientImc(hIMC); if (IS_NULL_UNEXPECTEDLY(pClientIMC)) return 0; dwFlags = pClientIMC->dwCompatFlags; ImmUnlockClientImc(pClientIMC); - return dwFlags; + return (dwFlags | g_aimm_compat_flags); } /*********************************************************************** diff --git a/dll/win32/imm32/precomp.h b/dll/win32/imm32/precomp.h index 6e0512af409..8fc4b27d4b7 100644 --- a/dll/win32/imm32/precomp.h +++ b/dll/win32/imm32/precomp.h @@ -75,6 +75,7 @@ extern PIMEDPI gpImeDpiList; extern PSERVERINFO gpsi; extern SHAREDINFO gSharedInfo; extern HANDLE ghImmHeap; +extern DWORD g_aimm_compat_flags; BOOL Imm32GetSystemLibraryPath(LPWSTR pszPath, DWORD cchPath, LPCWSTR pszFileName); VOID APIENTRY LogFontAnsiToWide(const LOGFONTA *plfA, LPLOGFONTW plfW); diff --git a/sdk/include/reactos/imm32_undoc.h b/sdk/include/reactos/imm32_undoc.h index 49cb047182a..d2622dd8423 100644 --- a/sdk/include/reactos/imm32_undoc.h +++ b/sdk/include/reactos/imm32_undoc.h @@ -20,9 +20,20 @@ VOID WINAPI ImmUnlockClientImc(PCLIENTIMC pClientImc); PIMEDPI WINAPI ImmLockImeDpi(HKL hKL); VOID WINAPI ImmUnlockImeDpi(PIMEDPI pImeDpi); HRESULT WINAPI CtfImmTIMActivate(HKL hKL); +DWORD WINAPI ImmGetAppCompatFlags(HIMC hIMC); HRESULT WINAPI CtfAImmActivate(_Out_opt_ HINSTANCE *phinstCtfIme); HRESULT WINAPI CtfAImmDeactivate(_In_ BOOL bDestroy); +BOOL WINAPI CtfAImmIsIME(_In_ HKL hKL); +BOOL WINAPI CtfImmIsCiceroStartedInThread(VOID); +VOID WINAPI CtfImmSetAppCompatFlags(_In_ DWORD dwFlags); + +LRESULT WINAPI +CtfImmDispatchDefImeMessage( + _In_ HWND hWnd, + _In_ UINT uMsg, + _In_ WPARAM wParam, + _In_ LPARAM lParam); #ifdef __cplusplus } // extern "C"

1 year, 2 months

[reactos] 01/01: [NTUSER] Fix system menu mouse handing (#5822)

by Egor Ananyin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=64997887ebf21249f81f6… commit 64997887ebf21249f81f628ee25a5913a24e6fdf Author: Egor Ananyin <ananinegor(a)gmail.com> AuthorDate: Thu Nov 2 02:11:46 2023 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Nov 1 23:11:46 2023 +0000 [NTUSER] Fix system menu mouse handing (#5822) Add a check for the system menu opened from the app icon. Fixes CORE-19258 --- win32ss/user/ntuser/menu.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c index a5273ea2096..b02eb7b88cf 100644 --- a/win32ss/user/ntuser/menu.c +++ b/win32ss/user/ntuser/menu.c @@ -3555,7 +3555,9 @@ static BOOL FASTCALL MENU_ButtonDown(MTRACKER* pmt, PMENU PtMenu, UINT Flags) { UINT id = 0; PITEM item; - if (IS_SYSTEM_MENU(PtMenu)) + + // Special check for the icon system menu + if (IS_SYSTEM_MENU(PtMenu) && !(PtMenu->fFlags & MNF_POPUP)) { item = PtMenu->rgItems; } @@ -3599,7 +3601,8 @@ static INT FASTCALL MENU_ButtonUp(MTRACKER *pmt, PMENU PtMenu, UINT Flags) UINT Id = 0; ITEM *item; - if ( IS_SYSTEM_MENU(PtMenu) ) + // Special check for the icon system menu + if (IS_SYSTEM_MENU(PtMenu) && !(PtMenu->fFlags & MNF_POPUP)) { item = PtMenu->rgItems; }

1 year, 2 months

[reactos] 01/01: [SHELL32] Update Romanian (ro-RO) translation (#5838)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c1b12b3f468ae403a736c… commit c1b12b3f468ae403a736c51d0c99d52b203901a5 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Wed Nov 1 17:56:50 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Nov 1 16:56:50 2023 +0100 [SHELL32] Update Romanian (ro-RO) translation (#5838) --- dll/win32/shell32/lang/ro-RO.rc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index fa976a2f9fe..9905afb38e5 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -1,5 +1,10 @@ -/* Translators: Ștefan Fulea (stefan dot fulea at mail dot com) - * Andrei Miloiu (miloiuandrei(a)gmail.com) */ +/* + * PROJECT: ReactOS Shell + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Romanian resource file + * TRANSLATORS: Copyright 2011-2019 Ștefan Fulea <stefan.fulea(a)mail.com> + * Copyright 2022-2023 Andrei Miloiu <miloiuandrei(a)gmail.com> + */ LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT @@ -655,7 +660,7 @@ Sigur doriți să deschideți acest fișier?", IDC_STATIC, 35, 5, 230, 60 END IDD_NEWEXTENSION DIALOGEX 0, 0, 260, 75 -CAPTION "Ceare nouă extensie" +CAPTION "Crează o nouă extensie" STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" BEGIN

1 year, 2 months

[reactos] 01/01: [BOOTDATA] Add SMP Entry (#5859)

by Justin Miller

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0a951f111291e84485aa8… commit 0a951f111291e84485aa82c74e3066dbbcee05b7 Author: Justin Miller <justin.miller(a)reactos.org> AuthorDate: Wed Nov 1 06:43:44 2023 -0700 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Nov 1 06:43:44 2023 -0700 [BOOTDATA] Add SMP Entry (#5859) [HALX86] Enable SMP Hal for x86 [BOOTDATA] add livecd and set entrys --- boot/bootdata/livecd.ini | 6 ++++++ boot/bootdata/txtsetup.sif | 10 +++++----- hal/halx86/CMakeLists.txt | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/boot/bootdata/livecd.ini b/boot/bootdata/livecd.ini index 0b034df9b1a..5e12037ff44 100644 --- a/boot/bootdata/livecd.ini +++ b/boot/bootdata/livecd.ini @@ -9,6 +9,7 @@ MinimalUI=Yes [Operating Systems] LiveCD="LiveCD" LiveCD_Debug="LiveCD (Debug)" +LiveCD_Macpi="LiveCD ACPI SMP (Debug)" LiveCD_Aacpi="LiveCD ACPI APIC (Debug)" LiveCD_VBoxDebug="LiveCD (VBox Debug)" LiveCD_Screen="LiveCD (Screen)" @@ -24,6 +25,11 @@ BootType=Windows2003 SystemPath=\reactos Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /MININT +[LiveCD_Macpi] +BootType=Windows2003 +SystemPath=\reactos +Options=/HAL=halmacpi.dll /KERNEL=ntkrnlmp.exe /DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /MININT + [LiveCD_Aacpi] BootType=Windows2003 SystemPath=\reactos diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index 1c084276ce4..bb2e9d9d892 100644 --- a/boot/bootdata/txtsetup.sif +++ b/boot/bootdata/txtsetup.sif @@ -229,7 +229,7 @@ DefaultLanguage = 00000409 pci_up = "Standard PC Uniprocessor" ;pci_mp = "Standard PC Multiprocessor" acpi_up = "ACPI PC Uniprocessor" -;acpi_mp = "ACPI PC Multiprocessor" +acpi_mp = "ACPI PC Multiprocessor" apic_up = "Standard APIC PC Uniprocessor" aacpi_up = "ACPI APIC PC Uniprocessor" xbox = "Original Xbox (x86 based)" @@ -244,7 +244,7 @@ x64_mp = "Standard x64 Multiprocessor" pci_up = "PC UP" ;pci_mp = "PC MP" acpi_up = "ACPI UP" -;acpi_mp = "ACPI MP" +acpi_mp = "ACPI MP" apic_up = "APIC UP" aacpi_up = "AAPIC UP" xbox = "Xbox" @@ -266,9 +266,9 @@ hal.dll = 1,,,,,,,2,,,,1,2 ntoskrnl.exe = 1,,,,,,,2,,,,1,2 halacpi.dll = 1,,,,,,,2,,,hal.dll,1,2 -;[Files.acpi_mp] -;ntkrnlmp.exe = 1,,,,,,,2,,,ntoskrnl.exe,1,2 -;halacpi.dll = 1,,,,,,,2,,,hal.dll,1,2 +[Files.acpi_mp] +ntkrnlmp.exe = 1,,,,,,,2,,,ntoskrnl.exe,1,2 +halmacpi.dll = 1,,,,,,,2,,,hal.dll,1,2 [Files.apic_up] ntoskrnl.exe = 1,,,,,,,2,,,,1,2 diff --git a/hal/halx86/CMakeLists.txt b/hal/halx86/CMakeLists.txt index dc22b0c9614..193a4ab8ab8 100644 --- a/hal/halx86/CMakeLists.txt +++ b/hal/halx86/CMakeLists.txt @@ -66,7 +66,7 @@ if(ARCH STREQUAL "i386") add_hal(halxbox SOURCES xbox/halxbox.rc COMPONENTS xbox up) add_hal(halpc98 SOURCES pc98/halpc98.rc COMPONENTS pc98 up) - #add_hal(halmacpi SOURCES smp/halmacpi.rc COMPONENTS generic acpi smp apic) + add_hal(halmacpi SOURCES smp/halmacpi.rc COMPONENTS generic acpi smp apic) #add_hal(halmp SOURCES mp/halmp.rc COMPONENTS generic legacy smp apic) elseif(ARCH STREQUAL "amd64")

1 year, 2 months

[reactos] 01/01: [TASKMGR] Hold Shift to bypass MessageBox confirmation (#5845)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5d1be078f82e372c4dbfb… commit 5d1be078f82e372c4dbfb055cdb683d8d02dffe9 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Wed Nov 1 13:43:33 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Nov 1 13:43:33 2023 +0100 [TASKMGR] Hold Shift to bypass MessageBox confirmation (#5845) Allow the user to hold shift to automatically answer IDYES when killing/debugging a process or changing the priority. --- base/applications/taskmgr/debug.c | 2 +- base/applications/taskmgr/endproc.c | 4 ++-- base/applications/taskmgr/priority.c | 2 +- base/applications/taskmgr/taskmgr.c | 8 ++++++++ base/applications/taskmgr/taskmgr.h | 1 + 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/base/applications/taskmgr/debug.c b/base/applications/taskmgr/debug.c index 678597a350c..0e25a2a22f1 100644 --- a/base/applications/taskmgr/debug.c +++ b/base/applications/taskmgr/debug.c @@ -30,7 +30,7 @@ void ProcessPage_OnDebug(void) LoadStringW(hInst, IDS_MSG_WARNINGDEBUG, szTemp, _countof(szTemp)); LoadStringW(hInst, IDS_MSG_TASKMGRWARNING, szTempA, _countof(szTempA)); - if (MessageBoxW(hMainWnd, szTemp, szTempA, MB_YESNO | MB_ICONWARNING) != IDYES) + if (!ConfirmMessageBox(hMainWnd, szTemp, szTempA, MB_YESNO | MB_ICONWARNING)) { GetLastErrorText(strErrorText, _countof(strErrorText)); LoadStringW(hInst, IDS_MSG_UNABLEDEBUGPROCESS, szTemp, _countof(szTemp)); diff --git a/base/applications/taskmgr/endproc.c b/base/applications/taskmgr/endproc.c index 9f4a2ee647e..a94cb9153a0 100644 --- a/base/applications/taskmgr/endproc.c +++ b/base/applications/taskmgr/endproc.c @@ -39,7 +39,7 @@ void ProcessPage_OnEndProcess(void) /* if this is a standard process just ask for confirmation before doing it */ LoadStringW(hInst, IDS_MSG_WARNINGTERMINATING, strErrorText, 256); LoadStringW(hInst, IDS_MSG_TASKMGRWARNING, szTitle, 256); - if (MessageBoxW(hMainWnd, strErrorText, szTitle, MB_YESNO|MB_ICONWARNING|MB_TOPMOST) != IDYES) + if (!ConfirmMessageBox(hMainWnd, strErrorText, szTitle, MB_YESNO|MB_ICONWARNING|MB_TOPMOST)) { if (hProcess) CloseHandle(hProcess); return; @@ -169,7 +169,7 @@ void ProcessPage_OnEndProcessTree(void) LoadStringW(hInst, IDS_MSG_WARNINGTERMINATING, strErrorText, 256); LoadStringW(hInst, IDS_MSG_TASKMGRWARNING, szTitle, 256); - if (MessageBoxW(hMainWnd, strErrorText, szTitle, MB_YESNO|MB_ICONWARNING) != IDYES) + if (!ConfirmMessageBox(hMainWnd, strErrorText, szTitle, MB_YESNO|MB_ICONWARNING)) { if (hProcess) CloseHandle(hProcess); return; diff --git a/base/applications/taskmgr/priority.c b/base/applications/taskmgr/priority.c index 028c297f8e0..d72eda92365 100644 --- a/base/applications/taskmgr/priority.c +++ b/base/applications/taskmgr/priority.c @@ -22,7 +22,7 @@ void DoSetPriority(DWORD priority) LoadStringW(hInst, IDS_MSG_TASKMGRWARNING, szTitle, 256); LoadStringW(hInst, IDS_MSG_WARNINGCHANGEPRIORITY, szText, 260); - if (MessageBoxW(hMainWnd, szText, szTitle, MB_YESNO|MB_ICONWARNING) != IDYES) + if (!ConfirmMessageBox(hMainWnd, szText, szTitle, MB_YESNO|MB_ICONWARNING)) return; hProcess = OpenProcess(PROCESS_SET_INFORMATION, FALSE, dwProcessId); diff --git a/base/applications/taskmgr/taskmgr.c b/base/applications/taskmgr/taskmgr.c index 9dedb5e1093..686abc37352 100644 --- a/base/applications/taskmgr/taskmgr.c +++ b/base/applications/taskmgr/taskmgr.c @@ -1056,6 +1056,14 @@ void TaskManager_OnTabWndSelChange(void) } } +BOOL ConfirmMessageBox(HWND hWnd, LPCWSTR Text, LPCWSTR Title, UINT Type) +{ + UINT positive = ((Type & 0xF) <= MB_OKCANCEL ? IDOK : IDYES); + if (GetKeyState(VK_SHIFT) < 0) + return TRUE; + return (MessageBoxW(hWnd, Text, Title, Type) == positive); +} + VOID ShowWin32Error(DWORD dwError) { LPWSTR lpMessageBuffer; diff --git a/base/applications/taskmgr/taskmgr.h b/base/applications/taskmgr/taskmgr.h index fe387718c40..d0a8920fa1d 100644 --- a/base/applications/taskmgr/taskmgr.h +++ b/base/applications/taskmgr/taskmgr.h @@ -80,6 +80,7 @@ void TaskManager_OnRestoreMainWindow(void); void TaskManager_OnMenuSelect(HWND hWnd, UINT nItemID, UINT nFlags, HMENU hSysMenu); void TaskManager_OnViewUpdateSpeed(DWORD); void TaskManager_OnTabWndSelChange(void); +BOOL ConfirmMessageBox(HWND hWnd, LPCWSTR Text, LPCWSTR Title, UINT Type); VOID ShowWin32Error(DWORD dwError); LPTSTR GetLastErrorText( LPTSTR lpszBuf, DWORD dwSize ); DWORD EndLocalThread(HANDLE *hThread, DWORD dwThread);

1 year, 2 months

[reactos] 01/01: [DSOUND_NEW][HDAUDBUS] Replace meaningless YDEBUG (#5857)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=31876ba8c20cd96c0dd57… commit 31876ba8c20cd96c0dd570327b9b3988778c0bd8 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Wed Nov 1 13:39:05 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Nov 1 13:39:05 2023 +0100 [DSOUND_NEW][HDAUDBUS] Replace meaningless YDEBUG (#5857) and move debug.h after all includes. Addendum to 60b0afc3a (PR #5818) dsound_new: Addendum to 5974fe1 (r45584). hdaudbus: Addendum to cf7fc81 (r68311). --- dll/directx/dsound_new/precomp.h | 13 +++++-------- drivers/wdm/audio/hdaudbus/hdaudbus.h | 15 ++++++--------- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/dll/directx/dsound_new/precomp.h b/dll/directx/dsound_new/precomp.h index 1df6e7abf4a..c527d844e87 100644 --- a/dll/directx/dsound_new/precomp.h +++ b/dll/directx/dsound_new/precomp.h @@ -15,8 +15,6 @@ #include <dsconf.h> #include <vfwmsgs.h> #include <setupapi.h> -#define YDEBUG -#include <debug.h> #include <ks.h> #include <ksmedia.h> #include <limits.h> @@ -24,6 +22,8 @@ #include "resource.h" +// #define NDEBUG +#include <debug.h> /* factory method */ typedef HRESULT (CALLBACK *LPFNCREATEINSTANCE)(IUnknown* pUnkOuter, REFIID riid, LPVOID* ppvObject); @@ -35,7 +35,6 @@ typedef struct LPFNCREATEINSTANCE lpfnCI; } INTERFACE_TABLE; - typedef struct tagFILTERINFO { SP_DEVINFO_DATA DeviceData; @@ -74,7 +73,6 @@ IClassFactory_fnConstructor( PLONG pcRefDll, REFIID riidInst); - /* devicelist.c */ HRESULT @@ -107,7 +105,6 @@ NewDirectSound( REFIID riid, LPVOID* ppvObject); - /* misc.c */ VOID @@ -136,7 +133,6 @@ CreateCompatiblePin( OUT LPWAVEFORMATEX WaveFormatOut, OUT PHANDLE hPin); - DWORD SyncOverlappedDeviceIoControl( IN HANDLE Handle, @@ -153,7 +149,6 @@ PrimaryDirectSoundBuffer_Write( LPVOID Buffer, DWORD BufferSize); - DWORD OpenPin( HANDLE hFilter, @@ -229,6 +224,7 @@ NewSecondarySoundBuffer( LPDIRECTSOUNDBUFFER8 PrimaryBuffer); /* property.c */ + HRESULT CALLBACK NewKsPropertySet( @@ -245,8 +241,8 @@ NewDirectSoundCapture( REFIID riid, LPVOID* ppvObject); - /* capturebuffer.c */ + HRESULT NewDirectSoundCaptureBuffer( LPDIRECTSOUNDCAPTUREBUFFER8 *OutBuffer, @@ -254,6 +250,7 @@ NewDirectSoundCaptureBuffer( LPCDSCBUFFERDESC lpcDSBufferDesc); /* notify.c */ + VOID DoNotifyPositionEvents( LPDIRECTSOUNDNOTIFY iface, diff --git a/drivers/wdm/audio/hdaudbus/hdaudbus.h b/drivers/wdm/audio/hdaudbus/hdaudbus.h index 5c4c4ab8aa4..89d216c1b76 100644 --- a/drivers/wdm/audio/hdaudbus/hdaudbus.h +++ b/drivers/wdm/audio/hdaudbus/hdaudbus.h @@ -1,18 +1,18 @@ #pragma once -#define YDEBUG #include <ntddk.h> -#include <debug.h> #include <initguid.h> #include <hdaudio.h> #include <stdio.h> #include <ntstrsafe.h> -#define TAG_HDA 'bADH' +// Include Haiku headers +#include "driver.h" +// #define NDEBUG +#include <debug.h> -// include Haiku headers -#include "driver.h" +#define TAG_HDA 'bADH' #define MAKE_RATE(base, multiply, divide) \ ((base == 44100 ? FORMAT_44_1_BASE_RATE : 0) \ @@ -29,7 +29,6 @@ #define ALIGN(size, align) (((size) + align - 1) & ~(align - 1)) - typedef struct { ULONG response; ULONG flags; @@ -61,7 +60,6 @@ typedef struct }HDA_CODEC_ENTRY, *PHDA_CODEC_ENTRY; - typedef struct { BOOLEAN IsFDO; @@ -92,7 +90,6 @@ typedef struct PDEVICE_OBJECT FDO; }HDA_PDO_DEVICE_EXTENSION, *PHDA_PDO_DEVICE_EXTENSION; - typedef struct { ULONG device : 16; ULONG vendor : 16; @@ -107,7 +104,6 @@ typedef struct { ULONG _reserved2 : 8; }CODEC_RESPONSE, *PCODEC_RESPONSE; - PVOID AllocateItem( IN POOL_TYPE PoolType, @@ -118,6 +114,7 @@ FreeItem( IN PVOID Item); /* fdo.cpp */ + KSERVICE_ROUTINE HDA_InterruptService; IO_DPC_ROUTINE HDA_DpcForIsr;

1 year, 2 months

[reactos] 01/01: [IMM32][SDK] Add CtfAImmActivate/Deactivate functions (#5835)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b3194e320cfd143fa7f3a… commit b3194e320cfd143fa7f3ad4183f8b3305a113b07 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Oct 31 22:45:28 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Oct 31 22:45:28 2023 +0900 [IMM32][SDK] Add CtfAImmActivate/Deactivate functions (#5835) - Add dll/win32/imm32/CtfImeTable.h for CTF IME functions. - Implementing Imm32CheckAndApplyAppCompat, Imm32LoadCtfIme, and Imm32EnumCreateCtfICProc helper functions. - Add CtfAImmActivate and CtfAImmDeactivate functions. - s/CI_TFSDISABLED/CI_TSFDISABLED/ CORE-19268 --- dll/win32/imm32/CtfImeTable.h | 18 +++ dll/win32/imm32/ctf.c | 329 +++++++++++++++++++++++++++++++++++--- dll/win32/imm32/imm32.spec | 2 + dll/win32/imm32/precomp.h | 4 +- sdk/include/reactos/imm32_undoc.h | 6 +- win32ss/include/ntuser.h | 6 +- 6 files changed, 334 insertions(+), 31 deletions(-) diff --git a/dll/win32/imm32/CtfImeTable.h b/dll/win32/imm32/CtfImeTable.h new file mode 100644 index 00000000000..14f701b6c46 --- /dev/null +++ b/dll/win32/imm32/CtfImeTable.h @@ -0,0 +1,18 @@ +/* + * PROJECT: ReactOS IMM32 + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Defining the CTF IME file interface + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +/* The valid CTF IME file contains the following functions: */ + +/* DEFINE_CTF_IME_FN(func_name, ret_type, params) */ +DEFINE_CTF_IME_FN(CtfImeCreateThreadMgr, HRESULT, (VOID)) +DEFINE_CTF_IME_FN(CtfImeDestroyThreadMgr, HRESULT, (VOID)) +DEFINE_CTF_IME_FN(CtfImeCreateInputContext, HRESULT, (HIMC hIMC)) +DEFINE_CTF_IME_FN(CtfImeDestroyInputContext, HRESULT, (HIMC hIMC)) +DEFINE_CTF_IME_FN(CtfImeSetActiveContextAlways, HRESULT, (DWORD dwFIXME1, DWORD dwFIXME2, DWORD dwFIXME3, DWORD dwFIXME4)) +DEFINE_CTF_IME_FN(CtfImeProcessCicHotkey, HRESULT, (DWORD dwFIXME1, DWORD dwFIXME2, DWORD dwFIXME3)) +DEFINE_CTF_IME_FN(CtfImeDispatchDefImeMessage, LRESULT, (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)) +DEFINE_CTF_IME_FN(CtfImeIsIME, BOOL, (HKL hKL)) diff --git a/dll/win32/imm32/ctf.c b/dll/win32/imm32/ctf.c index 8495725ed0f..eeeae62b588 100644 --- a/dll/win32/imm32/ctf.c +++ b/dll/win32/imm32/ctf.c @@ -2,7 +2,7 @@ * PROJECT: ReactOS IMM32 * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Implementing the IMM32 Cicero-aware Text Framework (CTF) - * COPYRIGHT: Copyright 2022 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + * COPYRIGHT: Copyright 2022-2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ #include "precomp.h" @@ -17,62 +17,326 @@ WINE_DEFAULT_DEBUG_CHANNEL(imm); * https://googleprojectzero.blogspot.com/2019/08/down-rabbit-hole.html */ -// Win: LoadCtfIme -HMODULE APIENTRY Imm32LoadCtfIme(VOID) +/* + * TSF stands for "Text Services Framework". "Cicero" is the code name of TSF. + * CTF stands for "Cicero-aware Text Framework". + * + * Comparing with old-style IMM IME, the combination of CTF IME and TSF provides + * new-style and high-level input method. + * + * The CTF IME file is a DLL file that the software developer distributes. + * The export functions of the CTF IME file are defined in "CtfImeTable.h" of + * this folder. + */ + +/* The instance of the CTF IME file */ +HINSTANCE g_hCtfIme = NULL; + +/* Define the function types (FN_...) for CTF IME functions */ +#undef DEFINE_CTF_IME_FN +#define DEFINE_CTF_IME_FN(func_name, ret_type, params) \ + typedef ret_type (WINAPI *FN_##func_name)params; +#include "CtfImeTable.h" + +/* Define the global variables (g_pfn...) for CTF IME functions */ +#undef DEFINE_CTF_IME_FN +#define DEFINE_CTF_IME_FN(func_name, ret_type, params) \ + FN_##func_name g_pfn##func_name = NULL; +#include "CtfImeTable.h" + +/* The macro that gets the variable name from the CTF IME function name */ +#define CTF_IME_FN(func_name) g_pfn##func_name + +/* The type of ApphelpCheckIME function in apphelp.dll */ +typedef BOOL (WINAPI *FN_ApphelpCheckIME)(_In_z_ LPCWSTR AppName); + +/* FIXME: This is kernel32 function. We have to declare this in some header. */ +BOOL WINAPI +BaseCheckAppcompatCache(_In_z_ LPCWSTR ApplicationName, + _In_ HANDLE FileHandle, + _In_opt_z_ LPCWSTR Environment, + _Out_ PULONG pdwReason); + +/*********************************************************************** + * This function checks whether the app's IME is disabled by application + * compatibility patcher. + */ +BOOL +Imm32CheckAndApplyAppCompat( + _In_ ULONG dwReason, + _In_z_ LPCWSTR pszAppName) { - return NULL; + HINSTANCE hinstApphelp; + FN_ApphelpCheckIME pApphelpCheckIME; + + /* Query the application compatibility patcher */ + if (BaseCheckAppcompatCache(pszAppName, INVALID_HANDLE_VALUE, NULL, &dwReason)) + return TRUE; /* The app's IME is not disabled */ + + /* Load apphelp.dll if necessary */ + hinstApphelp = GetModuleHandleW(L"apphelp.dll"); + if (!hinstApphelp) + { + hinstApphelp = LoadLibraryW(L"apphelp.dll"); + if (!hinstApphelp) + return TRUE; /* There is no apphelp.dll. The app's IME is not disabled */ + } + + /* Is ApphelpCheckIME implemented? */ + pApphelpCheckIME = (FN_ApphelpCheckIME)GetProcAddress(hinstApphelp, "ApphelpCheckIME"); + if (!pApphelpCheckIME) + return TRUE; /* Not implemented. The app's IME is not disabled */ + + /* Is the app's IME disabled or not? */ + return pApphelpCheckIME(pszAppName); } -// Win: Internal_CtfImeDestroyInputContext -HRESULT APIENTRY Imm32CtfImeDestroyInputContext(HIMC hIMC) +/*********************************************************************** + * This function loads the CTF IME file if necessary and establishes + * communication with the CTF IME. + */ +HINSTANCE +Imm32LoadCtfIme(VOID) +{ + BOOL bSuccess = FALSE; + IMEINFOEX ImeInfoEx; + WCHAR szImeFile[MAX_PATH]; + + /* Lock the IME interface */ + RtlEnterCriticalSection(&gcsImeDpi); + + do + { + if (g_hCtfIme) /* Already loaded? */ + { + bSuccess = TRUE; + break; + } + + /* + * NOTE: (HKL)0x04090409 is English US keyboard (default). + * The Cicero keyboard logically uses English US keyboard. + */ + if (!ImmLoadLayout((HKL)ULongToHandle(0x04090409), &ImeInfoEx)) + break; + + /* Build a path string in system32. The installed IME file must be in system32. */ + Imm32GetSystemLibraryPath(szImeFile, _countof(szImeFile), ImeInfoEx.wszImeFile); + + /* Is the CTF IME disabled by app compatibility patcher? */ + if (!Imm32CheckAndApplyAppCompat(0, szImeFile)) + break; /* This IME is disabled */ + + /* Load a CTF IME file */ + g_hCtfIme = LoadLibraryW(szImeFile); + if (!g_hCtfIme) + break; + + /* Assume success */ + bSuccess = TRUE; + + /* Retrieve the CTF IME functions */ +#undef DEFINE_CTF_IME_FN +#define DEFINE_CTF_IME_FN(func_name, ret_type, params) \ + CTF_IME_FN(func_name) = (FN_##func_name)GetProcAddress(g_hCtfIme, #func_name); \ + if (!CTF_IME_FN(func_name)) \ + { \ + bSuccess = FALSE; /* Failed */ \ + break; \ + } +#include "CtfImeTable.h" + } while (0); + + /* Unload the CTF IME if failed */ + if (!bSuccess) + { + /* Set NULL to the function pointers */ +#undef DEFINE_CTF_IME_FN +#define DEFINE_CTF_IME_FN(func_name, ret_type, params) CTF_IME_FN(func_name) = NULL; +#include "CtfImeTable.h" + + if (g_hCtfIme) + { + FreeLibrary(g_hCtfIme); + g_hCtfIme = NULL; + } + } + + /* Unlock the IME interface */ + RtlLeaveCriticalSection(&gcsImeDpi); + + return g_hCtfIme; +} + +/*********************************************************************** + * This function calls the same name function of the CTF IME side. + */ +HRESULT +CtfImeCreateThreadMgr(VOID) { if (!Imm32LoadCtfIme()) return E_FAIL; -#if 1 - FIXME("(%p)\n", hIMC); - return E_NOTIMPL; -#else - return g_pfnCtfImeDestroyInputContext(hIMC); -#endif + return CTF_IME_FN(CtfImeCreateThreadMgr)(); +} + +/*********************************************************************** + * This function calls the same name function of the CTF IME side. + */ +HRESULT +CtfImeDestroyThreadMgr(VOID) +{ + if (!Imm32LoadCtfIme()) + return E_FAIL; + + return CTF_IME_FN(CtfImeDestroyThreadMgr)(); +} + +/*********************************************************************** + * This function calls the same name function of the CTF IME side. + */ +HRESULT +CtfImeCreateInputContext( + _In_ HIMC hIMC) +{ + if (!Imm32LoadCtfIme()) + return E_FAIL; + + return CTF_IME_FN(CtfImeCreateInputContext)(hIMC); +} + +/*********************************************************************** + * This function calls the same name function of the CTF IME side. + */ +HRESULT +CtfImeDestroyInputContext(_In_ HIMC hIMC) +{ + if (!Imm32LoadCtfIme()) + return E_FAIL; + + return CTF_IME_FN(CtfImeDestroyInputContext)(hIMC); +} + +/*********************************************************************** + * The callback function to activate CTF IMEs. Used in CtfAImmActivate. + */ +static BOOL CALLBACK +Imm32EnumCreateCtfICProc( + _In_ HIMC hIMC, + _In_ LPARAM lParam) +{ + UNREFERENCED_PARAMETER(lParam); + CtfImeCreateInputContext(hIMC); + return TRUE; /* Continue */ } -// Win: CtfImmTIMDestroyInputContext -HRESULT APIENTRY CtfImmTIMDestroyInputContext(HIMC hIMC) +/*********************************************************************** + * This function calls CtfImeDestroyInputContext if possible. + */ +HRESULT +CtfImmTIMDestroyInputContext( + _In_ HIMC hIMC) { if (!IS_CICERO_MODE() || (GetWin32ClientInfo()->dwCompatFlags2 & 2)) return E_NOINTERFACE; - return Imm32CtfImeDestroyInputContext(hIMC); + return CtfImeDestroyInputContext(hIMC); } -// Win: CtfImmTIMCreateInputContext -HRESULT APIENTRY CtfImmTIMCreateInputContext(HIMC hIMC) +HRESULT +CtfImmTIMCreateInputContext( + _In_ HIMC hIMC) { TRACE("(%p)\n", hIMC); return E_NOTIMPL; } +/*********************************************************************** + * CtfAImmActivate (IMM32.@) + * + * This function activates "Active IMM" (AIMM) and TSF. + */ +HRESULT WINAPI +CtfAImmActivate( + _Out_opt_ HINSTANCE *phinstCtfIme) +{ + HRESULT hr; + HINSTANCE hinstCtfIme; + + TRACE("(%p)\n", phinstCtfIme); + + /* Load a CTF IME file if necessary */ + hinstCtfIme = Imm32LoadCtfIme(); + + /* Create a thread manager of the CTF IME */ + hr = CtfImeCreateThreadMgr(); + if (hr == S_OK) + { + /* Update CI_... flags of the thread client info */ + GetWin32ClientInfo()->CI_flags |= CI_AIMMACTIVATED; /* Activate AIMM */ + GetWin32ClientInfo()->CI_flags &= ~CI_TSFDISABLED; /* Enable TSF */ + + /* Create the CTF input contexts */ + ImmEnumInputContext(0, Imm32EnumCreateCtfICProc, 0); + } + + if (phinstCtfIme) + *phinstCtfIme = hinstCtfIme; + + return hr; +} + +/*********************************************************************** + * CtfAImmDeactivate (IMM32.@) + * + * This function de-activates "Active IMM" (AIMM) and TSF. + */ +HRESULT WINAPI +CtfAImmDeactivate( + _In_ BOOL bDestroy) +{ + HRESULT hr; + + if (!bDestroy) + return E_FAIL; + + hr = CtfImeDestroyThreadMgr(); + if (hr == S_OK) + { + GetWin32ClientInfo()->CI_flags &= ~CI_AIMMACTIVATED; /* Deactivate AIMM */ + GetWin32ClientInfo()->CI_flags |= CI_TSFDISABLED; /* Disable TSF */ + } + + return hr; +} + /*********************************************************************** * CtfImmIsCiceroEnabled (IMM32.@) + * + * @return TRUE if Cicero is enabled. */ -BOOL WINAPI CtfImmIsCiceroEnabled(VOID) +BOOL WINAPI +CtfImmIsCiceroEnabled(VOID) { return IS_CICERO_MODE(); } /*********************************************************************** * CtfImmIsTextFrameServiceDisabled(IMM32.@) + * + * @return TRUE if TSF is disabled. */ -BOOL WINAPI CtfImmIsTextFrameServiceDisabled(VOID) +BOOL WINAPI +CtfImmIsTextFrameServiceDisabled(VOID) { - return !!(GetWin32ClientInfo()->CI_flags & CI_TFSDISABLED); + return !!(GetWin32ClientInfo()->CI_flags & CI_TSFDISABLED); } /*********************************************************************** * CtfImmTIMActivate(IMM32.@) */ -HRESULT WINAPI CtfImmTIMActivate(HKL hKL) +HRESULT WINAPI +CtfImmTIMActivate(_In_ HKL hKL) { FIXME("(%p)\n", hKL); return E_NOTIMPL; @@ -81,7 +345,8 @@ HRESULT WINAPI CtfImmTIMActivate(HKL hKL) /*********************************************************************** * CtfImmRestoreToolbarWnd(IMM32.@) */ -VOID WINAPI CtfImmRestoreToolbarWnd(DWORD dwStatus) +VOID WINAPI +CtfImmRestoreToolbarWnd(_In_ DWORD dwStatus) { FIXME("(0x%lx)\n", dwStatus); } @@ -89,7 +354,8 @@ VOID WINAPI CtfImmRestoreToolbarWnd(DWORD dwStatus) /*********************************************************************** * CtfImmHideToolbarWnd(IMM32.@) */ -DWORD WINAPI CtfImmHideToolbarWnd(VOID) +DWORD WINAPI +CtfImmHideToolbarWnd(VOID) { FIXME("()\n"); return 0; @@ -98,7 +364,12 @@ DWORD WINAPI CtfImmHideToolbarWnd(VOID) /*********************************************************************** * CtfImmDispatchDefImeMessage(IMM32.@) */ -LRESULT WINAPI CtfImmDispatchDefImeMessage(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +LRESULT WINAPI +CtfImmDispatchDefImeMessage( + _In_ HWND hWnd, + _In_ UINT uMsg, + _In_ WPARAM wParam, + _In_ LPARAM lParam) { /* FIXME("(%p, %u, %p, %p)\n", hWnd, uMsg, wParam, lParam); */ return 0; @@ -107,7 +378,9 @@ LRESULT WINAPI CtfImmDispatchDefImeMessage(HWND hWnd, UINT uMsg, WPARAM wParam, /*********************************************************************** * CtfImmIsGuidMapEnable(IMM32.@) */ -BOOL WINAPI CtfImmIsGuidMapEnable(HIMC hIMC) +BOOL WINAPI +CtfImmIsGuidMapEnable( + _In_ HIMC hIMC) { DWORD dwThreadId; HKL hKL; @@ -138,7 +411,11 @@ BOOL WINAPI CtfImmIsGuidMapEnable(HIMC hIMC) /*********************************************************************** * CtfImmGetGuidAtom(IMM32.@) */ -HRESULT WINAPI CtfImmGetGuidAtom(HIMC hIMC, DWORD dwUnknown, LPDWORD pdwGuidAtom) +HRESULT WINAPI +CtfImmGetGuidAtom( + _In_ HIMC hIMC, + _In_ DWORD dwUnknown, + _Out_ LPDWORD pdwGuidAtom) { HRESULT hr = E_FAIL; PIMEDPI pImeDpi; diff --git a/dll/win32/imm32/imm32.spec b/dll/win32/imm32/imm32.spec index 92ac837fffd..eec7202482a 100644 --- a/dll/win32/imm32/imm32.spec +++ b/dll/win32/imm32/imm32.spec @@ -1,3 +1,5 @@ +@ stdcall CtfAImmActivate(ptr) +@ stdcall CtfAImmDeactivate(long) @ stdcall CtfImmIsCiceroEnabled() @ stdcall CtfImmIsTextFrameServiceDisabled() @ stdcall CtfImmTIMActivate(ptr) diff --git a/dll/win32/imm32/precomp.h b/dll/win32/imm32/precomp.h index 6db1f8d6e4d..6e0512af409 100644 --- a/dll/win32/imm32/precomp.h +++ b/dll/win32/imm32/precomp.h @@ -143,7 +143,6 @@ BOOL WINAPI Imm32IsImcAnsi(HIMC hIMC); #define IS_CROSS_THREAD_HIMC(hIMC) IS_TRUE_UNEXPECTEDLY(Imm32IsCrossThreadAccess(hIMC)) #define IS_CROSS_PROCESS_HWND(hWnd) IS_TRUE_UNEXPECTEDLY(Imm32IsCrossProcessAccess(hWnd)) #define ImeDpi_IsUnicode(pImeDpi) ((pImeDpi)->ImeInfo.fdwProperty & IME_PROP_UNICODE) -#define IS_16BIT_MODE() (GetWin32ClientInfo()->dwTIFlags & TIF_16BIT) DWORD APIENTRY CandidateListWideToAnsi(const CANDIDATELIST *pWideCL, LPCANDIDATELIST pAnsiCL, DWORD dwBufLen, @@ -189,3 +188,6 @@ PTHREADINFO FASTCALL Imm32CurrentPti(VOID); HBITMAP Imm32LoadBitmapFromBytes(const BYTE *pb); BOOL Imm32StoreBitmapToBytes(HBITMAP hbm, LPBYTE pbData, DWORD cbDataMax); + +HRESULT CtfImmTIMCreateInputContext(_In_ HIMC hIMC); +HRESULT CtfImmTIMDestroyInputContext(_In_ HIMC hIMC); diff --git a/sdk/include/reactos/imm32_undoc.h b/sdk/include/reactos/imm32_undoc.h index dadff68b031..49cb047182a 100644 --- a/sdk/include/reactos/imm32_undoc.h +++ b/sdk/include/reactos/imm32_undoc.h @@ -14,14 +14,16 @@ extern "C" { BOOL WINAPI ImmGetImeInfoEx(PIMEINFOEX pImeInfoEx, IMEINFOEXCLASS SearchType, PVOID pvSearchKey); +BOOL WINAPI ImmLoadLayout(HKL hKL, PIMEINFOEX pImeInfoEx); PCLIENTIMC WINAPI ImmLockClientImc(HIMC hImc); VOID WINAPI ImmUnlockClientImc(PCLIENTIMC pClientImc); PIMEDPI WINAPI ImmLockImeDpi(HKL hKL); VOID WINAPI ImmUnlockImeDpi(PIMEDPI pImeDpi); -HRESULT APIENTRY CtfImmTIMCreateInputContext(HIMC hIMC); -HRESULT APIENTRY CtfImmTIMDestroyInputContext(HIMC hIMC); HRESULT WINAPI CtfImmTIMActivate(HKL hKL); +HRESULT WINAPI CtfAImmActivate(_Out_opt_ HINSTANCE *phinstCtfIme); +HRESULT WINAPI CtfAImmDeactivate(_In_ BOOL bDestroy); + #ifdef __cplusplus } // extern "C" #endif diff --git a/win32ss/include/ntuser.h b/win32ss/include/ntuser.h index e1a3ee9788a..1cb0fb2db4c 100644 --- a/win32ss/include/ntuser.h +++ b/win32ss/include/ntuser.h @@ -302,8 +302,9 @@ typedef struct _CALLBACKWND #define CI_INITTHREAD 0x00000008 #define CI_CURTHPRHOOK 0x00000010 #define CI_CLASSESREGISTERED 0x00000020 -#define CI_IMMACTIVATE 0x00000040 -#define CI_TFSDISABLED 0x00000400 +#define CI_IMMACTIVATE 0x00000040 /* IMM/IME (Asian input) */ +#define CI_TSFDISABLED 0x00000400 /* TSF (Text Services Framework a.k.a. Cicero) */ +#define CI_AIMMACTIVATED 0x00000800 /* Active IMM (AIMM) */ /* * CLIENTINFO structure. @@ -1231,6 +1232,7 @@ typedef enum IMEINFOEXCLASS #define IS_IME_HKL(hkl) ((((ULONG_PTR)(hkl)) & 0xF0000000) == 0xE0000000) #define IS_IMM_MODE() (gpsi && (gpsi->dwSRVIFlags & SRVINFO_IMM32)) #define IS_CICERO_MODE() (gpsi && (gpsi->dwSRVIFlags & SRVINFO_CICERO_ENABLED)) +#define IS_16BIT_MODE() (GetWin32ClientInfo()->dwTIFlags & TIF_16BIT) typedef struct tagIMEUI {

1 year, 2 months

[reactos] 01/01: [SETUPLIB][NTUSER] Toggle input language/layout on Alt+Shift / Ctrl+Shift (#5839)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=25b7447818f0fad111607… commit 25b7447818f0fad1116070598bc88730c90c86b0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Oct 31 22:37:49 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Oct 31 22:37:49 2023 +0900 [SETUPLIB][NTUSER] Toggle input language/layout on Alt+Shift / Ctrl+Shift (#5839) - Respect the toggle key settings. - Change the hot key settings in base/setup/lib/mui.c. - Revert IntDefWindowProc function about Alt+Shift handling. - Delete some code in co_IntProcessKeyboardMessage for Alt+Shift handling. - Add IntGetNextKL, IntLanguageToggle, and IntCheckLanguageToggle helper functions. - Modify ProcessKeyEvent and UserGetLanguageToggle functions to support [Left Alt]+Shift and Ctrl+Shift. - Improve WM_INPUTLANGCHANGEREQUEST handling. - Message handling shouldn't access kbswitch directly. CORE-10667 --- base/setup/lib/mui.c | 5 +- win32ss/user/ntuser/defwnd.c | 19 ------ win32ss/user/ntuser/input.h | 4 +- win32ss/user/ntuser/keyboard.c | 128 ++++++++++++++++++++++++++++++++++- win32ss/user/ntuser/misc.c | 18 +++-- win32ss/user/ntuser/msgqueue.c | 64 ------------------ win32ss/user/ntuser/ntuser.h | 2 +- win32ss/user/ntuser/sysparams.c | 7 +- win32ss/user/user32/windows/defwnd.c | 27 +++++--- 9 files changed, 164 insertions(+), 110 deletions(-) diff --git a/base/setup/lib/mui.c b/base/setup/lib/mui.c index 8b511cfa56a..cc2bda08eef 100644 --- a/base/setup/lib/mui.c +++ b/base/setup/lib/mui.c @@ -359,10 +359,7 @@ AddKbLayoutsToRegistry( uIndex++; } - if (uIndex > 1) - AddHotkeySettings(L"2", L"2", L"1"); - else - AddHotkeySettings(L"3", L"3", L"3"); + AddHotkeySettings(L"1", L"1", L"2"); NtClose(SubKeyHandle); NtClose(KeyHandle); diff --git a/win32ss/user/ntuser/defwnd.c b/win32ss/user/ntuser/defwnd.c index de4b4e12e18..83050064b8c 100644 --- a/win32ss/user/ntuser/defwnd.c +++ b/win32ss/user/ntuser/defwnd.c @@ -531,7 +531,6 @@ DefWndScreenshot(PWND pWnd) /* Win32k counterpart of User DefWindowProc */ -/* Win: xxxRealDefWindowProc */ LRESULT FASTCALL IntDefWindowProc( PWND Wnd, @@ -946,24 +945,6 @@ IntDefWindowProc( wParamTmp = UserGetKeyState(VK_SHIFT) & 0x8000 ? SC_PREVWINDOW : SC_NEXTWINDOW; co_IntSendMessage( Active, WM_SYSCOMMAND, wParamTmp, wParam ); } - else if (wParam == VK_SHIFT) // Alt+Shift - { - RTL_ATOM ClassAtom = 0; - UNICODE_STRING ustrClass, ustrWindow; - HWND hwndSwitch; - - RtlInitUnicodeString(&ustrClass, L"kbswitcher"); - RtlInitUnicodeString(&ustrWindow, L""); - - IntGetAtomFromStringOrAtom(&ustrClass, &ClassAtom); - - hwndSwitch = IntFindWindow(UserGetDesktopWindow(), NULL, ClassAtom, &ustrWindow); - if (hwndSwitch) - { -#define ID_NEXTLAYOUT 10003 - UserPostMessage(hwndSwitch, WM_COMMAND, ID_NEXTLAYOUT, (LPARAM)UserHMGetHandle(Wnd)); - } - } } else if( wParam == VK_F10 ) { diff --git a/win32ss/user/ntuser/input.h b/win32ss/user/ntuser/input.h index 3cae36048f1..35105947d68 100644 --- a/win32ss/user/ntuser/input.h +++ b/win32ss/user/ntuser/input.h @@ -75,8 +75,10 @@ VOID NTAPI UserProcessKeyboardInput(PKEYBOARD_INPUT_DATA pKeyInput); BOOL NTAPI UserSendKeyboardInput(KEYBDINPUT *pKbdInput, BOOL bInjected); PKL NTAPI UserHklToKbl(HKL hKl); BOOL NTAPI UserSetDefaultInputLang(HKL hKl); -extern int gLanguageToggleKeyState; +extern INT gLanguageToggleKeyState; extern DWORD gdwLanguageToggleKey; +extern INT gLayoutToggleKeyState; +extern DWORD gdwLayoutToggleKey; /* Mouse */ WORD FASTCALL UserGetMouseButtonsState(VOID); diff --git a/win32ss/user/ntuser/keyboard.c b/win32ss/user/ntuser/keyboard.c index 61f59296be0..3d8bed1ad25 100644 --- a/win32ss/user/ntuser/keyboard.c +++ b/win32ss/user/ntuser/keyboard.c @@ -15,8 +15,10 @@ static BYTE gafAsyncKeyStateRecentDown[256 / 8]; // 1 bit per key static PKEYBOARD_INDICATOR_TRANSLATION gpKeyboardIndicatorTrans = NULL; static KEYBOARD_INDICATOR_PARAMETERS gIndicators = {0, 0}; KEYBOARD_ATTRIBUTES gKeyboardInfo; -int gLanguageToggleKeyState = 0; -DWORD gdwLanguageToggleKey = 0; +INT gLanguageToggleKeyState = 0; +DWORD gdwLanguageToggleKey = 1; +INT gLayoutToggleKeyState = 0; +DWORD gdwLayoutToggleKey = 2; /* FUNCTIONS *****************************************************************/ @@ -791,6 +793,92 @@ cleanup: UserReleaseDC(pWnd, hdc, FALSE); } +/* Find the next/previous keyboard layout of the same/different language */ +static PKL FASTCALL +IntGetNextKL( + _In_ PKL pKL, + _In_ BOOL bNext, + _In_ BOOL bSameLang) +{ + PKL pFirstKL = pKL; + LANGID LangID = LOWORD(pKL->hkl); + + do + { + pKL = (bNext ? pKL->pklNext : pKL->pklPrev); + + if (!(pKL->dwKL_Flags & KLF_UNLOAD) && bSameLang == (LangID == LOWORD(pKL->hkl))) + return pKL; + } while (pKL != pFirstKL); + + return pFirstKL; +} + +/* Perform layout toggle by [Left Alt]+Shift or Ctrl+Shift */ +static VOID +IntLanguageToggle( + _In_ PUSER_MESSAGE_QUEUE pFocusQueue, + _In_ BOOL bSameLang, + _In_ INT nKeyState) +{ + PWND pWnd = pFocusQueue->spwndFocus; + HWND hWnd; + WPARAM wParam = 0; + PTHREADINFO pti; + PKL pkl; + + if (!pWnd) + pWnd = pFocusQueue->spwndActive; + if (!pWnd) + return; + + pti = pWnd->head.pti; + pkl = pti->KeyboardLayout; + + if (nKeyState == INPUTLANGCHANGE_FORWARD) + pkl = IntGetNextKL(pkl, TRUE, bSameLang); + else if (nKeyState == INPUTLANGCHANGE_BACKWARD) + pkl = IntGetNextKL(pkl, FALSE, bSameLang); + + if (gSystemFS & pkl->dwFontSigs) + wParam |= INPUTLANGCHANGE_SYSCHARSET; + + hWnd = UserHMGetHandle(pWnd); + UserPostMessage(hWnd, WM_INPUTLANGCHANGEREQUEST, wParam, (LPARAM)pkl->hkl); +} + +/* Check Language Toggle by [Left Alt]+Shift or Ctrl+Shift */ +static BOOL +IntCheckLanguageToggle( + _In_ PUSER_MESSAGE_QUEUE pFocusQueue, + _In_ BOOL bIsDown, + _In_ WORD wVk, + _Inout_ PINT pKeyState) +{ + if (bIsDown) /* Toggle key combination is pressed? */ + { + if (wVk == VK_LSHIFT) + *pKeyState = INPUTLANGCHANGE_FORWARD; + else if (wVk == VK_RSHIFT) + *pKeyState = INPUTLANGCHANGE_BACKWARD; + else if (!wVk && IS_KEY_DOWN(gafAsyncKeyState, VK_LSHIFT)) + *pKeyState = INPUTLANGCHANGE_FORWARD; + else if (!wVk && IS_KEY_DOWN(gafAsyncKeyState, VK_RSHIFT)) + *pKeyState = INPUTLANGCHANGE_BACKWARD; + else + return FALSE; + } + else + { + if (*pKeyState == 0) + return FALSE; + + IntLanguageToggle(pFocusQueue, (pKeyState == &gLayoutToggleKeyState), *pKeyState); + *pKeyState = 0; + } + return TRUE; +} + /* * UserSendKeyboardInput * @@ -808,6 +896,7 @@ ProcessKeyEvent(WORD wVk, WORD wScanCode, DWORD dwFlags, BOOL bInjected, DWORD d BOOL bWasSimpleDown = FALSE, bPostMsg = TRUE, bIsSimpleDown; MSG Msg; static BOOL bMenuDownRecently = FALSE; + BOOL bLangToggled = FALSE; /* Get virtual key without shifts (VK_(L|R)* -> VK_*) */ wSimpleVk = IntSimplifyVk(wVk); @@ -906,6 +995,41 @@ ProcessKeyEvent(WORD wVk, WORD wScanCode, DWORD dwFlags, BOOL bInjected, DWORD d TRACE("Alt-Tab/Esc Pressed wParam %x\n",wVk); } + /* + * Check Language/Layout Toggle by [Left Alt]+Shift or Ctrl+Shift. + * @see https://learn.microsoft.com/en-us/previous-versions/windows/it-pro/windows-… + */ + if (gdwLanguageToggleKey == 1 || gdwLanguageToggleKey == 2) + { + if (wSimpleVk == VK_SHIFT) /* Shift key is pressed or released */ + { + UINT targetKey = ((gdwLanguageToggleKey == 1) ? VK_LMENU : VK_CONTROL); + if (IS_KEY_DOWN(gafAsyncKeyState, targetKey)) + bLangToggled = IntCheckLanguageToggle(pFocusQueue, bIsDown, wVk, &gLanguageToggleKeyState); + } + else if ((wSimpleVk == VK_MENU && gdwLanguageToggleKey == 1) || + (wSimpleVk == VK_CONTROL && gdwLanguageToggleKey == 2)) + { + if (IS_KEY_DOWN(gafAsyncKeyState, VK_SHIFT)) + bLangToggled = IntCheckLanguageToggle(pFocusQueue, bIsDown, 0, &gLanguageToggleKeyState); + } + } + if (!bLangToggled && (gdwLayoutToggleKey == 1 || gdwLayoutToggleKey == 2)) + { + if (wSimpleVk == VK_SHIFT) /* Shift key is pressed or released */ + { + UINT targetKey = ((gdwLayoutToggleKey == 1) ? VK_LMENU : VK_CONTROL); + if (IS_KEY_DOWN(gafAsyncKeyState, targetKey)) + IntCheckLanguageToggle(pFocusQueue, bIsDown, wVk, &gLayoutToggleKeyState); + } + else if ((wSimpleVk == VK_MENU && gdwLayoutToggleKey == 1) || + (wSimpleVk == VK_CONTROL && gdwLayoutToggleKey == 2)) + { + if (IS_KEY_DOWN(gafAsyncKeyState, VK_SHIFT)) + IntCheckLanguageToggle(pFocusQueue, bIsDown, 0, &gLayoutToggleKeyState); + } + } + if (bIsDown && wVk == VK_SNAPSHOT) { if (pFocusQueue && diff --git a/win32ss/user/ntuser/misc.c b/win32ss/user/ntuser/misc.c index ae458de7a42..b5b0f27ac0a 100644 --- a/win32ss/user/ntuser/misc.c +++ b/win32ss/user/ntuser/misc.c @@ -76,19 +76,27 @@ IntTID2PTI(HANDLE id) return pti; } +/** + * @see https://learn.microsoft.com/en-us/previous-versions/windows/it-pro/windows-… + */ DWORD FASTCALL -UserGetLanguageToggle(VOID) +UserGetLanguageToggle( + _In_ PCWSTR pszType, + _In_ DWORD dwDefaultValue) { NTSTATUS Status; - DWORD dwValue = 0; + DWORD dwValue = dwDefaultValue; + WCHAR szBuff[4]; - Status = RegReadUserSetting(L"Keyboard Layout\\Toggle", L"Layout Hotkey", REG_SZ, &dwValue, sizeof(dwValue)); + Status = RegReadUserSetting(L"Keyboard Layout\\Toggle", pszType, REG_SZ, szBuff, sizeof(szBuff)); if (NT_SUCCESS(Status)) { - dwValue = atoi((char *)&dwValue); - TRACE("Layout Hotkey %d\n",dwValue); + szBuff[RTL_NUMBER_OF(szBuff) - 1] = UNICODE_NULL; + dwValue = _wtoi(szBuff); } + + TRACE("%ls: %lu\n", pszType, dwValue); return dwValue; } diff --git a/win32ss/user/ntuser/msgqueue.c b/win32ss/user/ntuser/msgqueue.c index 7f308530749..a808073374d 100644 --- a/win32ss/user/ntuser/msgqueue.c +++ b/win32ss/user/ntuser/msgqueue.c @@ -1770,7 +1770,6 @@ BOOL co_IntProcessKeyboardMessage(MSG* Msg, BOOL* RemoveMessages) PWND pWnd; UINT ImmRet; BOOL Ret = TRUE; - WPARAM wParam = Msg->wParam; PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); if (Msg->message == VK_PACKET) @@ -1852,69 +1851,6 @@ BOOL co_IntProcessKeyboardMessage(MSG* Msg, BOOL* RemoveMessages) } } - if ( *RemoveMessages && (Msg->message == WM_SYSKEYDOWN || Msg->message == WM_KEYDOWN) ) - { - if (gdwLanguageToggleKey < 3) - { - if (IS_KEY_DOWN(gafAsyncKeyState, gdwLanguageToggleKey == 1 ? VK_LMENU : VK_CONTROL)) // L Alt 1 or Ctrl 2 . - { - if ( wParam == VK_LSHIFT ) gLanguageToggleKeyState = INPUTLANGCHANGE_FORWARD; // Left Alt - Left Shift, Next - //// FIXME : It seems to always be VK_LSHIFT. - if ( wParam == VK_RSHIFT ) gLanguageToggleKeyState = INPUTLANGCHANGE_BACKWARD; // Left Alt - Right Shift, Previous - } - } - } - - //// Key Up! Alt Key Ctrl Key - if ( *RemoveMessages && (Msg->message == WM_SYSKEYUP || Msg->message == WM_KEYUP) ) - { - // When initializing win32k: Reading from the registry hotkey combination - // to switch the keyboard layout and store it to global variable. - // Using this combination of hotkeys in this function - - if ( gdwLanguageToggleKey < 3 && - IS_KEY_DOWN(gafAsyncKeyState, gdwLanguageToggleKey == 1 ? VK_LMENU : VK_CONTROL) ) - { - if ( Msg->wParam == VK_SHIFT && !(IS_KEY_DOWN(gafAsyncKeyState, VK_SHIFT))) - { - WPARAM wParamILR; - PKL pkl = pti->KeyboardLayout; - - if (pWnd) UserDerefObjectCo(pWnd); - - //// Seems to override message window. - if (!(pWnd = pti->MessageQueue->spwndFocus)) - { - pWnd = pti->MessageQueue->spwndActive; - } - if (pWnd) UserRefObjectCo(pWnd, &Ref); - - if (pkl != NULL && gLanguageToggleKeyState) - { - TRACE("Posting WM_INPUTLANGCHANGEREQUEST KeyState %d\n", gLanguageToggleKeyState ); - - wParamILR = gLanguageToggleKeyState; - // If system character set and font signature send flag. - if ( gSystemFS & pkl->dwFontSigs ) - { - wParamILR |= INPUTLANGCHANGE_SYSCHARSET; - } - - UserPostMessage( UserHMGetHandle(pWnd), - WM_INPUTLANGCHANGEREQUEST, - wParamILR, - (LPARAM)pkl->hkl ); - - gLanguageToggleKeyState = 0; - //// Keep looping. - Ret = FALSE; - //// Skip the rest. - goto Exit; - } - } - } - } - if (co_HOOK_CallHooks( WH_KEYBOARD, *RemoveMessages ? HC_ACTION : HC_NOREMOVE, LOWORD(Msg->wParam), diff --git a/win32ss/user/ntuser/ntuser.h b/win32ss/user/ntuser/ntuser.h index 01232f9323a..7c878c4f793 100644 --- a/win32ss/user/ntuser/ntuser.h +++ b/win32ss/user/ntuser/ntuser.h @@ -37,7 +37,7 @@ VOID FASTCALL UserEnterExclusive(VOID); VOID FASTCALL UserLeave(VOID); BOOL FASTCALL UserIsEntered(VOID); BOOL FASTCALL UserIsEnteredExclusive(VOID); -DWORD FASTCALL UserGetLanguageToggle(VOID); +DWORD FASTCALL UserGetLanguageToggle(_In_ LPCWSTR pszType, _In_ DWORD dwDefaultValue); _Success_(return != FALSE) BOOL diff --git a/win32ss/user/ntuser/sysparams.c b/win32ss/user/ntuser/sysparams.c index 552a63e1f6a..95bfbe7ca78 100644 --- a/win32ss/user/ntuser/sysparams.c +++ b/win32ss/user/ntuser/sysparams.c @@ -355,7 +355,8 @@ SpiUpdatePerUserSystemParameters(VOID) if (SPITESTPREF(UPM_COMBOBOXANIMATION)) gpsi->PUSIFlags |= PUSIF_COMBOBOXANIMATION; if (SPITESTPREF(UPM_LISTBOXSMOOTHSCROLLING)) gpsi->PUSIFlags |= PUSIF_LISTBOXSMOOTHSCROLLING; } - gdwLanguageToggleKey = UserGetLanguageToggle(); + gdwLanguageToggleKey = UserGetLanguageToggle(L"Language Hotkey", 1); + gdwLayoutToggleKey = UserGetLanguageToggle(L"Layout Hotkey", 2); g_bWindowSnapEnabled = IntIsWindowSnapEnabled(); } @@ -1470,9 +1471,9 @@ SpiGetSet(UINT uiAction, UINT uiParam, PVOID pvParam, FLONG fl) } case SPI_SETLANGTOGGLE: - gdwLanguageToggleKey = UserGetLanguageToggle(); + gdwLayoutToggleKey = UserGetLanguageToggle(L"Layout Hotkey", 2); + gdwLanguageToggleKey = UserGetLanguageToggle(L"Language Hotkey", 1); return gdwLanguageToggleKey; - break; case SPI_GETWINDOWSEXTENSION: ERR("SPI_GETWINDOWSEXTENSION is unimplemented\n"); diff --git a/win32ss/user/user32/windows/defwnd.c b/win32ss/user/user32/windows/defwnd.c index cbb421209dc..dbc5b43e9ff 100644 --- a/win32ss/user/user32/windows/defwnd.c +++ b/win32ss/user/user32/windows/defwnd.c @@ -547,22 +547,27 @@ User32DefWindowProc(HWND hWnd, case WM_INPUTLANGCHANGEREQUEST: { - HKL NewHkl; + HKL hNewKL; + HWND hwndFocus; - if(wParam & INPUTLANGCHANGE_BACKWARD - && wParam & INPUTLANGCHANGE_FORWARD) - { + if ((wParam & INPUTLANGCHANGE_BACKWARD) && (wParam & INPUTLANGCHANGE_FORWARD)) return FALSE; - } - - //FIXME: What to do with INPUTLANGCHANGE_SYSCHARSET ? - if(wParam & INPUTLANGCHANGE_BACKWARD) NewHkl = (HKL) HKL_PREV; - else if(wParam & INPUTLANGCHANGE_FORWARD) NewHkl = (HKL) HKL_NEXT; - else NewHkl = (HKL) lParam; + hwndFocus = GetFocus(); + if (hwndFocus && hwndFocus != hWnd && + GetClassLongPtrW(hWnd, GCW_ATOM) != (ULONG_PTR)WC_DIALOG) + { + return SendMessageW(hwndFocus, Msg, wParam, lParam); + } - NtUserActivateKeyboardLayout(NewHkl, KLF_SETFORPROCESS); + if (wParam & INPUTLANGCHANGE_FORWARD) + hNewKL = (HKL)UlongToHandle(HKL_NEXT); + else if (wParam & INPUTLANGCHANGE_BACKWARD) + hNewKL = (HKL)UlongToHandle(HKL_PREV); + else + hNewKL = (HKL)lParam; + NtUserActivateKeyboardLayout(hNewKL, KLF_SETFORPROCESS); return TRUE; }

1 year, 2 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs