Ros-diffs October 2009

ros-diffs@reactos.org

26 participants
641 discussions

[cwittich] 43418: [SYSAUDIO] -pass the correct amount of parameters to DPRINT
by cwittich＠svn.reactos.org 12 Oct '09

12 Oct '09

Author: cwittich Date: Mon Oct 12 23:06:21 2009 New Revision: 43418 URL: http://svn.reactos.org/svn/reactos?rev=43418&view=rev Log: [SYSAUDIO] -pass the correct amount of parameters to DPRINT Modified: trunk/reactos/drivers/wdm/audio/sysaudio/pin.c Modified: trunk/reactos/drivers/wdm/audio/sysaudio/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/pin.c [iso-8859-1] Mon Oct 12 23:06:21 2009 @@ -20,7 +20,7 @@ PFILE_OBJECT FileObject; PIO_STACK_LOCATION IoStack; - DPRINT("Pin_fnDeviceIoControl called DeviceObject %p Irp %p\n", DeviceObject); + DPRINT("Pin_fnDeviceIoControl called DeviceObject %p Irp %p\n", DeviceObject, Irp); /* Get current stack location */ IoStack = IoGetCurrentIrpStackLocation(Irp); @@ -136,7 +136,7 @@ PDISPATCH_CONTEXT Context; PIO_STACK_LOCATION IoStack; - DPRINT("Pin_fnClose called DeviceObject %p Irp %p\n", DeviceObject); + DPRINT("Pin_fnClose called DeviceObject %p Irp %p\n", DeviceObject, Irp); /* Get current stack location */ IoStack = IoGetCurrentIrpStackLocation(Irp);

1 0

[mkupfer] 43417: - small fix for SystemParametersInfo-call for DragFullWindows - disable incomplete UserPref settings
by mkupfer＠svn.reactos.org 12 Oct '09

12 Oct '09

Author: mkupfer Date: Mon Oct 12 23:02:25 2009 New Revision: 43417 URL: http://svn.reactos.org/svn/reactos?rev=43417&view=rev Log: - small fix for SystemParametersInfo-call for DragFullWindows - disable incomplete UserPref settings Modified: trunk/reactos/dll/cpl/desk/appearance.c Modified: trunk/reactos/dll/cpl/desk/appearance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/appearance.c?… ============================================================================== --- trunk/reactos/dll/cpl/desk/appearance.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/appearance.c [iso-8859-1] Mon Oct 12 23:02:25 2009 @@ -363,10 +363,10 @@ */ g->Theme.Effects.bTooltipAnimation = g->Theme.Effects.bMenuAnimation; g->Theme.Effects.bTooltipFade = g->Theme.Effects.bMenuFade; - SystemParametersInfo(SPI_SETDRAGFULLWINDOWS, g->Theme.Effects.bDragFullWindows, (PVOID)&g->Theme.Effects.bDragFullWindows, SPIF_UPDATEINIFILE|SPIF_SENDCHANGE); + SystemParametersInfo(SPI_SETDRAGFULLWINDOWS, g->Theme.Effects.bDragFullWindows, NULL, SPIF_UPDATEINIFILE|SPIF_SENDCHANGE); //UPDATE_USERPREF(KEYBOARDCUES, &g->Theme.Effects.bKeyboardCues); //UPDATE_USERPREF(ACTIVEWINDOWTRACKING, &g->Theme.Effects.bActiveWindowTracking); - UPDATE_USERPREF(MENUANIMATION, &g->Theme.Effects.bMenuAnimation); + //UPDATE_USERPREF(MENUANIMATION, &g->Theme.Effects.bMenuAnimation); //UPDATE_USERPREF(COMBOBOXANIMATION, &g->Theme.Effects.bComboBoxAnimation); //UPDATE_USERPREF(LISTBOXSMOOTHSCROLLING, &g->Theme.Effects.bListBoxSmoothScrolling); //UPDATE_USERPREF(GRADIENTCAPTIONS, &g->Theme.Effects.bGradientCaptions);

1 0

[fireball] 43416: [kernel32] - Remove incorrect null-termination of a string. Thanks to Russel for spotting. See issue #4820 for more details.
by fireball＠svn.reactos.org 12 Oct '09

12 Oct '09

Author: fireball Date: Mon Oct 12 21:45:12 2009 New Revision: 43416 URL: http://svn.reactos.org/svn/reactos?rev=43416&view=rev Log: [kernel32] - Remove incorrect null-termination of a string. Thanks to Russel for spotting. See issue #4820 for more details. Modified: trunk/reactos/dll/win32/kernel32/misc/ldr.c Modified: trunk/reactos/dll/win32/kernel32/misc/ldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ld… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/ldr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/ldr.c [iso-8859-1] Mon Oct 12 21:45:12 2009 @@ -92,7 +92,6 @@ Pos += GetWindowsDirectoryW(EnvironmentBufferW + Pos, Length - Pos); EnvironmentBufferW[Pos++] = L';'; Pos += GetEnvironmentVariableW(L"PATH", EnvironmentBufferW + Pos, Length - Pos); - EnvironmentBufferW[Pos] = 0; SetLastError(LastError); return EnvironmentBufferW;

1 0

[janderwald] 43415: - Add missing types
by janderwald＠svn.reactos.org 12 Oct '09

12 Oct '09

Author: janderwald Date: Mon Oct 12 21:21:10 2009 New Revision: 43415 URL: http://svn.reactos.org/svn/reactos?rev=43415&view=rev Log: - Add missing types Modified: trunk/reactos/include/psdk/ks.h trunk/reactos/include/psdk/ksmedia.h Modified: trunk/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=4341… ============================================================================== --- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Mon Oct 12 21:21:10 2009 @@ -380,6 +380,25 @@ KSPROPERTY_CONNECTION_ALLOCATORFRAMING_EX, KSPROPERTY_CONNECTION_STARTAT } KSPROPERTY_CONNECTION; + +#define DEFINE_KSPROPERTY_ITEM_CONNECTION_STATE(GetHandler, SetHandler)\ + DEFINE_KSPROPERTY_ITEM(\ + KSPROPERTY_CONNECTION_STATE,\ + (GetHandler),\ + sizeof(KSPROPERTY),\ + sizeof(KSSTATE),\ + (SetHandler),\ + NULL, 0, NULL, NULL, 0) + +#define DEFINE_KSPROPERTY_ITEM_CONNECTION_DATAFORMAT(GetHandler, SetHandler)\ + DEFINE_KSPROPERTY_ITEM(\ + KSPROPERTY_CONNECTION_DATAFORMAT,\ + (GetHandler),\ + sizeof(KSPROPERTY),\ + 0,\ + (SetHandler),\ + NULL, 0, NULL, NULL, 0) + #define KSEVENTSETID_Connection \ 0x7f4bcbe0L, 0x9ea5, 0x11cf, 0xa5, 0xd6, 0x28, 0xdb, 0x04, 0xc1, 0x00, 0x00 @@ -619,7 +638,7 @@ */ #define STATIC_KSPROPTYPESETID_General \ - 0x97E99BA0L, 0xBDEA, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 + 0x97E99BA0L, 0xBDEA, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00} DEFINE_GUIDSTRUCT("97E99BA0-BDEA-11CF-A5D6-28DB04C10000", KSPROPTYPESETID_General); #define KSPROPTYPESETID_General DEFINE_GUIDNAMED(KSPROPTYPESETID_General) Modified: trunk/reactos/include/psdk/ksmedia.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ksmedia.h?rev… ============================================================================== --- trunk/reactos/include/psdk/ksmedia.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ksmedia.h [iso-8859-1] Mon Oct 12 21:21:10 2009 @@ -464,7 +464,7 @@ #define KSPROPSETID_AC3 DEFINE_GUIDNAMED(KSPROPSETID_AC3) #define STATIC_KSPROPSETID_Audio\ - 0x45FFAAA0L, 0x6E1B, 0x11D0, 0xBC, 0xF2, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00 + 0x45FFAAA0L, 0x6E1B, 0x11D0, {0xBC, 0xF2, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00} DEFINE_GUIDSTRUCT("45FFAAA0-6E1B-11D0-BCF2-444553540000", KSPROPSETID_Audio); #define KSPROPSETID_Audio DEFINE_GUIDNAMED(KSPROPSETID_Audio)

1 0

[janderwald] 43414: [PORTCLS] - Store MiniportStream & pin instance in subdevice descriptor - Simplify irp handling code in class IIrpStream - Rewrite CPortPinWaveCyclic code to handle property request. It now uses PcHandlePropertyWithTable, which calls the supported property request handlers via a callback. The code is now a lot cleaner as KsPropertyHandler peforms input & output length checks and also handles basic support requests - Implement a Audio position handler for CPortPinWaveCyclic -
by janderwald＠svn.reactos.org 12 Oct '09

12 Oct '09

Author: janderwald Date: Mon Oct 12 21:20:33 2009 New Revision: 43414 URL: http://svn.reactos.org/svn/reactos?rev=43414&view=rev Log: [PORTCLS] - Store MiniportStream & pin instance in subdevice descriptor - Simplify irp handling code in class IIrpStream - Rewrite CPortPinWaveCyclic code to handle property request. It now uses PcHandlePropertyWithTable, which calls the supported property request handlers via a callback. The code is now a lot cleaner as KsPropertyHandler peforms input & output length checks and also handles basic support requests - Implement a Audio position handler for CPortPinWaveCyclic - Use the IDmaChannel::CopyFrom when copying sound bytes from an dma buffer. Fixes recording of sound with KsStudio - Make sure that the GUID_NULL handler only adds guid which are not already present in the guid array. Fixes duplicate entries of properties of Nodes in KsStudio - Handle Basic Support requests in a default way when the driver doesnt provide a BasicSupport handler Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/private.hpp trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp [iso-8859-1] Mon Oct 12 21:20:33 2009 @@ -215,6 +215,8 @@ LIST_ENTRY PhysicalConnectionList; UNICODE_STRING RefString; PUNKNOWN UnknownMiniport; + PUNKNOWN UnknownStream; + PVOID PortPin; }SUBDEVICE_DESCRIPTOR, *PSUBDEVICE_DESCRIPTOR; #undef INTERFACE Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp [iso-8859-1] Mon Oct 12 21:20:33 2009 @@ -111,41 +111,32 @@ // get current irp stack location IoStack = IoGetCurrentIrpStackLocation(Irp); - if (!Buffer) - { - if (!Irp->MdlAddress) + PC_ASSERT(!Buffer); + + if (!Irp->MdlAddress) + { + // ioctl from KsStudio + // Wdmaud already probes buffers, therefore no need to probe it again + // probe the stream irp + Status = KsProbeStreamIrp(Irp, KSSTREAM_READ | KSPROBE_ALLOCATEMDL | KSPROBE_PROBEANDLOCK | KSPROBE_ALLOWFORMATCHANGE | KSPROBE_SYSTEMADDRESS, 0); + + // check for success + if (!NT_SUCCESS(Status)) { - // ioctl from KsStudio - // Wdmaud already probes buffers, therefore no need to probe it again - // probe the stream irp - Status = KsProbeStreamIrp(Irp, KSSTREAM_WRITE | KSPROBE_ALLOCATEMDL | KSPROBE_PROBEANDLOCK | KSPROBE_ALLOWFORMATCHANGE | KSPROBE_SYSTEMADDRESS, 0); - - // check for success - if (!NT_SUCCESS(Status)) - { - DPRINT1("KsProbeStreamIrp failed with %x\n", Status); - return Status; - } + DPRINT1("KsProbeStreamIrp failed with %x\n", Status); + return Status; } - // get the stream header - Header = (PKSSTREAM_HEADER)Irp->AssociatedIrp.SystemBuffer; - PC_ASSERT(Header); - PC_ASSERT(Irp->MdlAddress); - - DPRINT("Size %u DataUsed %u FrameExtent %u SizeHeader %u\n", Header->Size, Header->DataUsed, Header->FrameExtent, sizeof(KSSTREAM_HEADER)); - - if (Irp->RequestorMode != KernelMode) - { - // use allocated mdl - Header->Data = MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority); - PC_ASSERT(Header->Data); - } - } - else - { - // HACK - Header = (PKSSTREAM_HEADER)Buffer; - } + } + // get the stream header + Header = (PKSSTREAM_HEADER)Irp->AssociatedIrp.SystemBuffer; + PC_ASSERT(Header); + PC_ASSERT(Irp->MdlAddress); + + DPRINT1("Size %u DataUsed %u FrameExtent %u SizeHeader %u NumDataAvailable %u OutputLength %u\n", Header->Size, Header->DataUsed, Header->FrameExtent, sizeof(KSSTREAM_HEADER), m_NumDataAvailable, IoStack->Parameters.DeviceIoControl.OutputBufferLength); + + Header->Data = MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority); + PC_ASSERT(Header->Data); + //PC_ASSERT(Header->Size == IoStack->Parameters.DeviceIoControl.OutputBufferLength); // HACK Irp->Tail.Overlay.DriverContext[2] = (PVOID)Header; @@ -209,6 +200,8 @@ if (!Irp) { + DPRINT1("NoIrp\n"); + return STATUS_UNSUCCESSFUL; // no irp available, use silence buffer *Buffer = (PUCHAR)m_SilenceBuffer; *BufferSize = m_MaxFrameSize; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp [iso-8859-1] Mon Oct 12 21:20:33 2009 @@ -698,7 +698,7 @@ DPRINT("CPortPinDMus::Init entered\n"); - m_Format = (PKSDATAFORMAT)ExAllocatePoolWithTag(NonPagedPool, DataFormat->FormatSize, TAG_PORTCLASS); + m_Format = (PKSDATAFORMAT)AllocateItem(NonPagedPool, DataFormat->FormatSize, TAG_PORTCLASS); if (!m_Format) return STATUS_INSUFFICIENT_RESOURCES; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp [iso-8859-1] Mon Oct 12 21:20:33 2009 @@ -48,6 +48,9 @@ friend VOID NTAPI CloseStreamRoutineWaveCyclic(IN PDEVICE_OBJECT DeviceObject, IN PVOID Context); friend VOID NTAPI SetStreamWorkerRoutineWaveCyclic(IN PDEVICE_OBJECT DeviceObject, IN PVOID Context); + friend NTSTATUS NTAPI PinWaveCyclicState(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); + friend NTSTATUS NTAPI PinWaveCyclicDataFormat(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); + friend NTSTATUS NTAPI PinWaveCyclicAudioPosition(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); IPortWaveCyclic * m_Port; IPortFilterWaveCyclic * m_Filter; @@ -71,6 +74,8 @@ ULONG m_TotalPackets; ULONG m_StopCount; + KSAUDIO_POSITION m_Position; + SUBDEVICE_DESCRIPTOR m_Descriptor; ULONG m_Delay; @@ -85,6 +90,32 @@ KSSTATE State; }SETSTREAM_CONTEXT, *PSETSTREAM_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); + + +DEFINE_KSPROPERTY_CONNECTIONSET(PinWaveCyclicConnectionSet, PinWaveCyclicState, PinWaveCyclicDataFormat); +DEFINE_KSPROPERTY_AUDIOSET(PinWaveCyclicAudioSet, PinWaveCyclicAudioPosition); + +KSPROPERTY_SET PinWaveCyclicPropertySet[] = +{ + { + &KSPROPSETID_Connection, + sizeof(PinWaveCyclicConnectionSet) / sizeof(KSPROPERTY_ITEM), + (const KSPROPERTY_ITEM*)&PinWaveCyclicConnectionSet, + 0, + NULL + }, + { + &KSPROPSETID_Audio, + sizeof(PinWaveCyclicAudioSet) / sizeof(KSPROPERTY_ITEM), + (const KSPROPERTY_ITEM*)&PinWaveCyclicAudioSet, + 0, + NULL + } +}; + //================================================================================================================================== NTSTATUS @@ -111,6 +142,222 @@ } return STATUS_UNSUCCESSFUL; +} + + + +NTSTATUS +NTAPI +PinWaveCyclicAudioPosition( + IN PIRP Irp, + IN PKSIDENTIFIER Request, + IN OUT PVOID Data) +{ + CPortPinWaveCyclic *Pin; + PSUBDEVICE_DESCRIPTOR Descriptor; + + // get sub device descriptor + Descriptor = (PSUBDEVICE_DESCRIPTOR)KSPROPERTY_ITEM_IRP_STORAGE(Irp); + + // sanity check + PC_ASSERT(Descriptor); + PC_ASSERT(Descriptor->PortPin); + PC_ASSERT_IRQL(DISPATCH_LEVEL); + + // cast to pin impl + Pin = (CPortPinWaveCyclic*)Descriptor->PortPin; + + //sanity check + PC_ASSERT(Pin->m_Stream); + + if (Request->Flags & KSPROPERTY_TYPE_GET) + { + // FIXME non multithreading-safe + // copy audio position + RtlMoveMemory(Data, &Pin->m_Position, sizeof(KSAUDIO_POSITION)); + + DPRINT1("Play %lu Record %lu\n", Pin->m_Position.PlayOffset, Pin->m_Position.WriteOffset); + Irp->IoStatus.Information = sizeof(KSAUDIO_POSITION); + return STATUS_SUCCESS; + } + + // not supported + return STATUS_NOT_SUPPORTED; +} + + +NTSTATUS +NTAPI +PinWaveCyclicState( + IN PIRP Irp, + IN PKSIDENTIFIER Request, + IN OUT PVOID Data) +{ + NTSTATUS Status = STATUS_UNSUCCESSFUL; + CPortPinWaveCyclic *Pin; + PSUBDEVICE_DESCRIPTOR Descriptor; + PKSSTATE State = (PKSSTATE)Data; + + // get sub device descriptor + Descriptor = (PSUBDEVICE_DESCRIPTOR)KSPROPERTY_ITEM_IRP_STORAGE(Irp); + + // sanity check + PC_ASSERT(Descriptor); + PC_ASSERT(Descriptor->PortPin); + PC_ASSERT_IRQL(DISPATCH_LEVEL); + + // cast to pin impl + Pin = (CPortPinWaveCyclic*)Descriptor->PortPin; + + //sanity check + PC_ASSERT(Pin->m_Stream); + + if (Request->Flags & KSPROPERTY_TYPE_SET) + { + // try set stream + Status = Pin->m_Stream->SetState(*State); + + DPRINT("Setting state %u %x\n", *State, Status); + if (NT_SUCCESS(Status)) + { + // store new state + Pin->m_State = *State; + } + // store result + Irp->IoStatus.Information = sizeof(KSSTATE); + return Status; + } + else if (Request->Flags & KSPROPERTY_TYPE_GET) + { + // get current stream state + *State = Pin->m_State; + // store result + Irp->IoStatus.Information = sizeof(KSSTATE); + + return STATUS_SUCCESS; + } + + // unsupported request + return STATUS_NOT_SUPPORTED; +} + +NTSTATUS +NTAPI +PinWaveCyclicDataFormat( + IN PIRP Irp, + IN PKSIDENTIFIER Request, + IN OUT PVOID Data) +{ + NTSTATUS Status = STATUS_UNSUCCESSFUL; + CPortPinWaveCyclic *Pin; + PSUBDEVICE_DESCRIPTOR Descriptor; + PIO_STACK_LOCATION IoStack; + + // get current irp stack location + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // get sub device descriptor + Descriptor = (PSUBDEVICE_DESCRIPTOR)KSPROPERTY_ITEM_IRP_STORAGE(Irp); + + // sanity check + PC_ASSERT(Descriptor); + PC_ASSERT(Descriptor->PortPin); + + // cast to pin impl + Pin = (CPortPinWaveCyclic*)Descriptor->PortPin; + + //sanity check + PC_ASSERT(Pin->m_Stream); + PC_ASSERT(Pin->m_Format); + + if (Request->Flags & KSPROPERTY_TYPE_SET) + { + // try to change data format + PKSDATAFORMAT NewDataFormat, DataFormat = (PKSDATAFORMAT)Irp->UserBuffer; + ULONG Size = min(Pin->m_Format->FormatSize, DataFormat->FormatSize); + + if (RtlCompareMemory(DataFormat, Pin->m_Format, Size) == Size) + { + // format is identical + Irp->IoStatus.Information = DataFormat->FormatSize; + return STATUS_SUCCESS; + } + + // new change request + PC_ASSERT(Pin->m_State == KSSTATE_STOP); + // FIXME queue a work item when Irql != PASSIVE_LEVEL + PC_ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); + + // allocate new data format + NewDataFormat = (PKSDATAFORMAT)AllocateItem(NonPagedPool, DataFormat->FormatSize, TAG_PORTCLASS); + if (!NewDataFormat) + { + // not enough memory + return STATUS_NO_MEMORY; + } + + // copy new data format + RtlMoveMemory(NewDataFormat, DataFormat, DataFormat->FormatSize); + + // set new format + Status = Pin->m_Stream->SetFormat(NewDataFormat); + if (NT_SUCCESS(Status)) + { + // free old format + FreeItem(Pin->m_Format, TAG_PORTCLASS); + + // update irp queue with new format + Pin->m_IrpQueue->UpdateFormat((PKSDATAFORMAT)NewDataFormat); + + // store new format + Pin->m_Format = NewDataFormat; + Irp->IoStatus.Information = NewDataFormat->FormatSize; + +#if 0 + PC_ASSERT(NewDataFormat->FormatSize == sizeof(KSDATAFORMAT_WAVEFORMATEX)); + PC_ASSERT(IsEqualGUIDAligned(((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->DataFormat.MajorFormat, KSDATAFORMAT_TYPE_AUDIO)); + PC_ASSERT(IsEqualGUIDAligned(((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->DataFormat.SubFormat, KSDATAFORMAT_SUBTYPE_PCM)); + PC_ASSERT(IsEqualGUIDAligned(((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->DataFormat.Specifier, KSDATAFORMAT_SPECIFIER_WAVEFORMATEX)); + + + DPRINT1("NewDataFormat: Channels %u Bits %u Samples %u\n", ((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.nChannels, + ((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.wBitsPerSample, + ((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.nSamplesPerSec); +#endif + + } + else + { + // failed to set format + FreeItem(NewDataFormat, TAG_PORTCLASS); + } + + + // done + return Status; + } + else if (Request->Flags & KSPROPERTY_TYPE_GET) + { + // get current data format + PC_ASSERT(Pin->m_Format); + + if (Pin->m_Format->FormatSize > IoStack->Parameters.DeviceIoControl.OutputBufferLength) + { + // buffer too small + Irp->IoStatus.Information = Pin->m_Format->FormatSize; + return STATUS_MORE_ENTRIES; + } + // copy data format + RtlMoveMemory(Data, Pin->m_Format, Pin->m_Format->FormatSize); + // store result size + Irp->IoStatus.Information = Pin->m_Format->FormatSize; + + // done + return STATUS_SUCCESS; + } + + // unsupported request + return STATUS_NOT_SUPPORTED; } @@ -138,7 +385,7 @@ if (m_Capture) { - m_DmaChannel->CopyTo(Buffer, (PUCHAR)m_CommonBuffer + m_CommonBufferOffset, BytesToCopy); + m_DmaChannel->CopyFrom(Buffer, (PUCHAR)m_CommonBuffer + m_CommonBufferOffset, BytesToCopy); } else { @@ -149,6 +396,7 @@ m_CommonBufferOffset += BytesToCopy; BufferLength = Position - m_CommonBufferOffset; + m_Position.PlayOffset += BytesToCopy; } } @@ -174,9 +422,9 @@ BytesToCopy = min(BufferLength, BufferSize); - if (m_Capture) - { - m_DmaChannel->CopyTo(Buffer, + if (m_Capture) + { + m_DmaChannel->CopyFrom(Buffer, (PUCHAR)m_CommonBuffer + m_CommonBufferOffset, BytesToCopy); } @@ -189,6 +437,7 @@ m_IrpQueue->UpdateMapping(BytesToCopy); m_CommonBufferOffset += BytesToCopy; + m_Position.PlayOffset += BytesToCopy; BufferLength = m_CommonBufferSize - m_CommonBufferOffset; } @@ -330,7 +579,7 @@ } Status = m_Stream->GetPosition(&Position); - DPRINT("Position %u Buffer %p BufferSize %u ActiveIrpOffset %u\n", Position, Buffer, m_CommonBufferSize, BufferSize); + DPRINT1("Position %u Buffer %p BufferSize %u ActiveIrpOffset %u Capture %u\n", Position, Buffer, m_CommonBufferSize, BufferSize, m_Capture); if (Position < m_CommonBufferOffset) { @@ -372,203 +621,36 @@ DPRINT("IPortPinWave_HandleKsProperty entered\n"); - if (IoStack->Parameters.DeviceIoControl.InputBufferLength < sizeof(KSPROPERTY)) - { - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + IoStack = IoGetCurrentIrpStackLocation(Irp); + + if (IoStack->Parameters.DeviceIoControl.IoControlCode != IOCTL_KS_PROPERTY) + { + DPRINT1("Unhandled function %lx Length %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode, IoStack->Parameters.DeviceIoControl.InputBufferLength); + + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_INVALID_PARAMETER; - } - - Property = (PKSPROPERTY)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; - - if (IsEqualGUIDAligned(Property->Set, GUID_NULL)) - { - if (Property->Flags & KSPROPERTY_TYPE_SETSUPPORT) - { - if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(GUID)) - { - // buffer too small - Irp->IoStatus.Status = STATUS_BUFFER_OVERFLOW; - Irp->IoStatus.Information = sizeof(GUID); - IoCompleteRequest(Irp, IO_NO_INCREMENT); - - return STATUS_BUFFER_OVERFLOW; - } - // FIXME copy guids - // KSPROPSETID_Audio when available - // KSPROPSETID_Sysaudio_Pin - - RtlMoveMemory(Irp->UserBuffer, &KSPROPSETID_Connection, sizeof(GUID)); - - Irp->IoStatus.Status = STATUS_SUCCESS; - Irp->IoStatus.Information = sizeof(GUID); - IoCompleteRequest(Irp, IO_NO_INCREMENT); - - return STATUS_SUCCESS; - } - } - - - if (IsEqualGUIDAligned(Property->Set, KSPROPSETID_Connection)) - { - if (Property->Id == KSPROPERTY_CONNECTION_STATE) - { - PKSSTATE State = (PKSSTATE)Irp->UserBuffer; - - PC_ASSERT_IRQL(DISPATCH_LEVEL); - if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(KSSTATE)) - { - Irp->IoStatus.Information = sizeof(KSSTATE); - Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_BUFFER_TOO_SMALL; - } - - if (Property->Flags & KSPROPERTY_TYPE_SET) - { - Status = STATUS_UNSUCCESSFUL; - Irp->IoStatus.Information = 0; - - if (m_Stream) - { - Status = m_Stream->SetState(*State); - - DPRINT1("Setting state %u %x\n", *State, Status); - if (NT_SUCCESS(Status)) - { - m_State = *State; - } - } - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return Status; - } - else if (Property->Flags & KSPROPERTY_TYPE_GET) - { - *State = m_State; - Irp->IoStatus.Information = sizeof(KSSTATE); - Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; - } - } - else if (Property->Id == KSPROPERTY_CONNECTION_DATAFORMAT) - { - PKSDATAFORMAT DataFormat = (PKSDATAFORMAT)Irp->UserBuffer; - if (Property->Flags & KSPROPERTY_TYPE_SET) - { - PKSDATAFORMAT NewDataFormat; - if (!RtlCompareMemory(DataFormat, m_Format, DataFormat->FormatSize)) - { - Irp->IoStatus.Information = DataFormat->FormatSize; - Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; - } - - NewDataFormat = (PKSDATAFORMAT)AllocateItem(NonPagedPool, DataFormat->FormatSize, TAG_PORTCLASS); - if (!NewDataFormat) - { - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_NO_MEMORY; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_NO_MEMORY; - } - RtlMoveMemory(NewDataFormat, DataFormat, DataFormat->FormatSize); - - if (m_Stream) - { - PC_ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); - PC_ASSERT(NewDataFormat->FormatSize == sizeof(KSDATAFORMAT_WAVEFORMATEX)); - PC_ASSERT(IsEqualGUIDAligned(((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->DataFormat.MajorFormat, KSDATAFORMAT_TYPE_AUDIO)); - PC_ASSERT(IsEqualGUIDAligned(((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->DataFormat.SubFormat, KSDATAFORMAT_SUBTYPE_PCM)); - PC_ASSERT(IsEqualGUIDAligned(((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->DataFormat.Specifier, KSDATAFORMAT_SPECIFIER_WAVEFORMATEX)); - - PC_ASSERT(m_State == KSSTATE_STOP); - DPRINT1("NewDataFormat: Channels %u Bits %u Samples %u\n", ((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.nChannels, - ((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.wBitsPerSample, - ((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.nSamplesPerSec); - - Status = m_Stream->SetFormat(NewDataFormat); - if (NT_SUCCESS(Status)) - { - if (m_Format) - ExFreePoolWithTag(m_Format, TAG_PORTCLASS); - - m_IrpQueue->UpdateFormat((PKSDATAFORMAT)NewDataFormat); - m_Format = NewDataFormat; - Irp->IoStatus.Information = DataFormat->FormatSize; - Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; - } - } - DPRINT1("Failed to set format\n"); - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_UNSUCCESSFUL; - } - else if (Property->Flags & KSPROPERTY_TYPE_GET) - { - if (!m_Format) - { - DPRINT1("No format\n"); - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_UNSUCCESSFUL; - } - if (m_Format->FormatSize > IoStack->Parameters.DeviceIoControl.OutputBufferLength) - { - Irp->IoStatus.Information = m_Format->FormatSize; - Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_BUFFER_TOO_SMALL; - } - - RtlMoveMemory(DataFormat, m_Format, m_Format->FormatSize); - Irp->IoStatus.Information = DataFormat->FormatSize; - Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; - } - } - else if (Property->Id == KSPROPERTY_CONNECTION_ALLOCATORFRAMING) - { - PKSALLOCATOR_FRAMING Framing = (PKSALLOCATOR_FRAMING)Irp->UserBuffer; - - PC_ASSERT_IRQL(DISPATCH_LEVEL); - // Validate input buffer - if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(KSALLOCATOR_FRAMING)) - { - Irp->IoStatus.Information = sizeof(KSALLOCATOR_FRAMING); - Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_BUFFER_TOO_SMALL; - } - // Clear frame structure - RtlZeroMemory(Framing, sizeof(KSALLOCATOR_FRAMING)); - // store requested frame size - Framing->FrameSize = m_FrameSize; - // FIXME fill in struct - - Irp->IoStatus.Information = sizeof(KSALLOCATOR_FRAMING); - Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; - } - } - - RtlStringFromGUID(Property->Set, &GuidString); - DPRINT1("Unhandeled property Set |%S| Id %u Flags %x\n", GuidString.Buffer, Property->Id, Property->Flags); - RtlFreeUnicodeString(&GuidString); - - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_NOT_IMPLEMENTED; + return STATUS_SUCCESS; + } + + Status = PcHandlePropertyWithTable(Irp, m_Descriptor.FilterPropertySetCount, m_Descriptor.FilterPropertySet, &m_Descriptor); + + if (Status == STATUS_NOT_FOUND) + { + Property = (PKSPROPERTY)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; + + RtlStringFromGUID(Property->Set, &GuidString); + DPRINT1("Unhandeled property Set |%S| Id %u Flags %x\n", GuidString.Buffer, Property->Id, Property->Flags); + RtlFreeUnicodeString(&GuidString); + } + + if (Status != STATUS_PENDING) + { + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } + + return Status; } NTSTATUS @@ -576,11 +658,26 @@ CPortPinWaveCyclic::HandleKsStream( IN PIRP Irp) { + NTSTATUS Status; InterlockedIncrement((PLONG)&m_TotalPackets); DPRINT("IPortPinWaveCyclic_HandleKsStream entered Total %u State %x MinData %u\n", m_TotalPackets, m_State, m_IrpQueue->NumData()); - m_IrpQueue->AddMapping(NULL, 0, Irp); + Status = m_IrpQueue->AddMapping(NULL, 0, Irp); + + if (NT_SUCCESS(Status)) + { + + PKSSTREAM_HEADER Header = (PKSSTREAM_HEADER)Irp->AssociatedIrp.SystemBuffer; + PC_ASSERT(Header); + + if (m_Capture) + m_Position.WriteOffset += Header->FrameExtent; + else + m_Position.WriteOffset += Header->DataUsed; + + } + return STATUS_PENDING; } @@ -918,10 +1015,39 @@ } #endif - DPRINT("CPortPinWaveCyclic::Init Status %x\n", Status); - if (!NT_SUCCESS(Status)) return Status; + + ISubdevice * Subdevice = NULL; + // get subdevice interface + Status = Port->QueryInterface(IID_ISubdevice, (PVOID*)&Subdevice); + + if (!NT_SUCCESS(Status)) + return Status; + + PSUBDEVICE_DESCRIPTOR SubDeviceDescriptor = NULL; + + Status = Subdevice->GetDescriptor(&SubDeviceDescriptor); + if (!NT_SUCCESS(Status)) + { + // failed to get descriptor + Subdevice->Release(); + return Status; + } + + /* set up subdevice descriptor */ + RtlZeroMemory(&m_Descriptor, sizeof(SUBDEVICE_DESCRIPTOR)); + m_Descriptor.FilterPropertySet = PinWaveCyclicPropertySet; + m_Descriptor.FilterPropertySetCount = sizeof(PinWaveCyclicPropertySet) / sizeof(KSPROPERTY_SET); + m_Descriptor.UnknownStream = (PUNKNOWN)m_Stream; + m_Descriptor.DeviceDescriptor = SubDeviceDescriptor->DeviceDescriptor; + m_Descriptor.UnknownMiniport = SubDeviceDescriptor->UnknownMiniport; + m_Descriptor.PortPin = (PVOID)this; + + DPRINT("CPortPinWaveCyclic::Init Status %x\n", Status); + + // release subdevice descriptor + Subdevice->Release(); Status = m_ServiceGroup->AddMember(PSERVICESINK(this)); if (!NT_SUCCESS(Status)) @@ -955,7 +1081,7 @@ return Status; } - m_Format = (PKSDATAFORMAT)ExAllocatePoolWithTag(NonPagedPool, DataFormat->FormatSize, TAG_PORTCLASS); + m_Format = (PKSDATAFORMAT)AllocateItem(NonPagedPool, DataFormat->FormatSize, TAG_PORTCLASS); if (!m_Format) return STATUS_INSUFFICIENT_RESOURCES; @@ -972,7 +1098,6 @@ DPRINT1("Setting state to pause %x\n", m_Stream->SetState(KSSTATE_PAUSE)); m_State = KSSTATE_PAUSE; - //m_ServiceGroup->RequestDelayedService(m_Delay); return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp [iso-8859-1] Mon Oct 12 21:20:33 2009 @@ -751,7 +751,7 @@ DPRINT("IPortPinWavePci_fnInit entered\n"); - m_Format = (PKSDATAFORMAT)ExAllocatePoolWithTag(NonPagedPool, DataFormat->FormatSize, TAG_PORTCLASS); + m_Format = (PKSDATAFORMAT)AllocateItem(NonPagedPool, DataFormat->FormatSize, TAG_PORTCLASS); if (!m_Format) return STATUS_INSUFFICIENT_RESOURCES; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/private.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/private.hpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/private.hpp [iso-8859-1] Mon Oct 12 21:20:33 2009 @@ -313,6 +313,31 @@ IN ULONG PropertySetCount, IN PKSPROPERTY_SET PropertySet, IN PSUBDEVICE_DESCRIPTOR Descriptor); + +#define DEFINE_KSPROPERTY_CONNECTIONSET(PinSet,\ + PropStateHandler, PropDataFormatHandler)\ +DEFINE_KSPROPERTY_TABLE(PinSet) {\ + DEFINE_KSPROPERTY_ITEM_CONNECTION_STATE(PropStateHandler, PropStateHandler),\ + DEFINE_KSPROPERTY_ITEM_CONNECTION_DATAFORMAT(PropDataFormatHandler, PropDataFormatHandler)\ +} + +#define DEFINE_KSPROPERTY_ITEM_AUDIO_POSITION(GetHandler, SetHandler)\ + DEFINE_KSPROPERTY_ITEM(\ + KSPROPERTY_AUDIO_POSITION,\ + (GetHandler),\ + sizeof(KSPROPERTY),\ + sizeof(KSAUDIO_POSITION),\ + (SetHandler),\ + NULL, 0, NULL, NULL, 0) + +#define DEFINE_KSPROPERTY_AUDIOSET(PinSet,\ + PropPositionHandler)\ +DEFINE_KSPROPERTY_TABLE(PinSet) {\ + DEFINE_KSPROPERTY_ITEM_AUDIO_POSITION(PropPositionHandler, PropPositionHandler)\ +} + + + #define DEFINE_KSPROPERTY_PINPROPOSEDATAFORMAT(PinSet,\ PropGeneral, PropInstances, PropIntersection)\ Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp [iso-8859-1] Mon Oct 12 21:20:33 2009 @@ -101,29 +101,50 @@ PC_ASSERT(Node->AutomationTable->PropertyCount); PC_ASSERT(Node->AutomationTable->PropertyItemSize); - Irp->IoStatus.Information = sizeof(GUID) * Node->AutomationTable->PropertyCount; - if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(GUID) * Node->AutomationTable->PropertyCount) - { - // buffer too small - return STATUS_MORE_ENTRIES; - } - + Buffer = (LPGUID)AllocateItem(NonPagedPool, sizeof (GUID) * Node->AutomationTable->PropertyCount, TAG_PORTCLASS); + if (!Buffer) + return STATUS_INSUFFICIENT_RESOURCES; + + + ULONG Count = 0, SubIndex; PropertyItem = (PCPROPERTY_ITEM*)Node->AutomationTable->Properties; - Buffer = (LPGUID)Irp->UserBuffer; - - for(Index = 0; Index < Node->AutomationTable->PropertyCount; Index++) - { - RtlMoveMemory(Buffer, PropertyItem->Set, sizeof(GUID)); - Buffer++; - + for (Index = 0; Index < Node->AutomationTable->PropertyCount; Index++) + { + BOOL Found = FALSE; + for (SubIndex = 0; SubIndex < Count; Index++) + { + if (IsEqualGUIDAligned(Buffer[SubIndex], *PropertyItem->Set)) + { + Found = TRUE; + break; + } + } + if (!Found) + { + RtlMoveMemory(&Buffer[Count], PropertyItem->Set, sizeof (GUID)); + Count++; + } PropertyItem = (PPCPROPERTY_ITEM)((ULONG_PTR)PropertyItem + Node->AutomationTable->PropertyItemSize); } + + Irp->IoStatus.Information = sizeof (GUID) * Count; + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof (GUID) * Count) + { + // buffer too small + FreeItem(Buffer, TAG_PORTCLASS); + return STATUS_MORE_ENTRIES; + } + + RtlMoveMemory(Irp->UserBuffer, Buffer, sizeof (GUID) * Count); + FreeItem(Buffer, TAG_PORTCLASS); return STATUS_SUCCESS; } else /*if (Property->Property.Flags == (KSPROPERTY_TYPE_BASICSUPPORT | KSPROPERTY_TYPE_TOPOLOGY) || Property->Property.Flags == (KSPROPERTY_TYPE_GET | KSPROPERTY_TYPE_TOPOLOGY) || Property->Property.Flags == (KSPROPERTY_TYPE_SET | KSPROPERTY_TYPE_TOPOLOGY)) */ { + //UNICODE_STRING GuidString; + if (Property->NodeId >= SubDeviceDescriptor->DeviceDescriptor->NodeCount) { // request is out of bounds @@ -137,7 +158,7 @@ { // request is out of bounds Irp->IoStatus.Information = 0; - return STATUS_INVALID_PARAMETER; + return STATUS_NOT_FOUND; } PC_ASSERT(Node->AutomationTable); @@ -145,19 +166,56 @@ PC_ASSERT(Node->AutomationTable->PropertyItemSize); PropertyItem = (PCPROPERTY_ITEM*)Node->AutomationTable->Properties; - //Flags = (PULONG)Irp->UserBuffer; for(Index = 0; Index < Node->AutomationTable->PropertyCount; Index++) { if (IsEqualGUIDAligned(*PropertyItem->Set, Property->Property.Set) && PropertyItem->Id == Property->Property.Id) { + if (Property->Property.Flags & KSPROPERTY_TYPE_BASICSUPPORT) + { + if (!(PropertyItem->Flags & KSPROPERTY_TYPE_BASICSUPPORT)) + { + PC_ASSERT(IoStack->Parameters.DeviceIoControl.OutputBufferLength >= sizeof(ULONG)); + PULONG Flags = (PULONG)Irp->UserBuffer; + + /* reset flags */ + *Flags = 0; + + if (PropertyItem->Flags & KSPROPERTY_TYPE_SET) + *Flags |= KSPROPERTY_TYPE_SET; + + if (PropertyItem->Flags & KSPROPERTY_TYPE_GET) + *Flags |= KSPROPERTY_TYPE_GET; + + Irp->IoStatus.Information = sizeof(ULONG); + + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength >= sizeof(KSPROPERTY_DESCRIPTION)) + { + /* get output buffer */ + PKSPROPERTY_DESCRIPTION Description = (PKSPROPERTY_DESCRIPTION)Irp->UserBuffer; + + /* store result */ + Description->DescriptionSize = sizeof(KSPROPERTY_DESCRIPTION); + Description->PropTypeSet.Set = KSPROPTYPESETID_General; + Description->PropTypeSet.Id = 0; + Description->PropTypeSet.Flags = 0; + Description->MembersListCount = 0; + Description->Reserved = 0; + + Irp->IoStatus.Information = sizeof(KSPROPERTY_DESCRIPTION); + } + return STATUS_SUCCESS; + } + } + + PropertyRequest = (PPCPROPERTY_REQUEST)AllocateItem(NonPagedPool, sizeof(PCPROPERTY_REQUEST), TAG_PORTCLASS); if (!PropertyRequest) return STATUS_INSUFFICIENT_RESOURCES; PC_ASSERT(SubDeviceDescriptor->UnknownMiniport); PropertyRequest->MajorTarget = SubDeviceDescriptor->UnknownMiniport; - //PropertyRequest->MinorTarget = (PUNKNOWN)0xABADCAFE; + PropertyRequest->MinorTarget = SubDeviceDescriptor->UnknownStream; PropertyRequest->Irp = Irp; PropertyRequest->Node = Property->NodeId; PropertyRequest->PropertyItem = PropertyItem; @@ -176,20 +234,21 @@ Irp->IoStatus.Information = PropertyRequest->ValueSize; ExFreePool(PropertyRequest); } +#if 0 + RtlStringFromGUID(Property->Property.Set, &GuidString); + DPRINT1("Id %u Flags %x Set %S FlagsItem %x Status %x\n", Property->Property.Id, Property->Property.Flags, GuidString.Buffer, PropertyItem->Flags, Status); + RtlFreeUnicodeString(&GuidString); +#endif return Status; } PropertyItem = (PPCPROPERTY_ITEM)((ULONG_PTR)PropertyItem + Node->AutomationTable->PropertyItemSize); } +#if 0 + RtlStringFromGUID(Property->Property.Set, &GuidString); + DPRINT1("Id %u Flags %x Set %S Status %x\n", Property->Property.Id, Property->Property.Flags, GuidString.Buffer, Status); + RtlFreeUnicodeString(&GuidString); +#endif } -#if 0 - else - { - UNICODE_STRING GuidString; - RtlStringFromGUID(Property->Property.Set, &GuidString); - DPRINT1("Id %u Flags %x Set %S\n", Property->Property.Id, Property->Property.Flags, GuidString.Buffer); - DbgBreakPoint(); - } -#endif } return Status; }

1 0

[gschneider] 43413: [sol], [spider] - Allow to select a card back from all twelve possibilities (instead of four), related to bug #2535 [spider] - Fix encoding of the Spanish resource file, thanks elhoir and gabriel_it
by gschneider＠svn.reactos.org 12 Oct '09

12 Oct '09

Author: gschneider Date: Mon Oct 12 20:52:44 2009 New Revision: 43413 URL: http://svn.reactos.org/svn/reactos?rev=43413&view=rev Log: [sol], [spider] - Allow to select a card back from all twelve possibilities (instead of four), related to bug #2535 [spider] - Fix encoding of the Spanish resource file, thanks elhoir and gabriel_it Modified: trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc trunk/reactos/base/applications/games/solitaire/lang/ca-ES.rc trunk/reactos/base/applications/games/solitaire/lang/cs-CZ.rc trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc trunk/reactos/base/applications/games/solitaire/lang/el-GR.rc trunk/reactos/base/applications/games/solitaire/lang/en-US.rc trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc trunk/reactos/base/applications/games/solitaire/lang/eu-ES.rc trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc trunk/reactos/base/applications/games/solitaire/lang/ja-JP.rc trunk/reactos/base/applications/games/solitaire/lang/ko-KR.rc trunk/reactos/base/applications/games/solitaire/lang/lt-LT.rc trunk/reactos/base/applications/games/solitaire/lang/nl-NL.rc trunk/reactos/base/applications/games/solitaire/lang/no-NO.rc trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc trunk/reactos/base/applications/games/solitaire/lang/ro-RO.rc trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc trunk/reactos/base/applications/games/solitaire/resource.h trunk/reactos/base/applications/games/solitaire/solitaire.h trunk/reactos/base/applications/games/spider/lang/de-DE.rc trunk/reactos/base/applications/games/spider/lang/en-US.rc trunk/reactos/base/applications/games/spider/lang/es-ES.rc trunk/reactos/base/applications/games/spider/lang/it-IT.rc trunk/reactos/base/applications/games/spider/lang/ja-JP.rc trunk/reactos/base/applications/games/spider/lang/ru-RU.rc trunk/reactos/base/applications/games/spider/resource.h trunk/reactos/base/applications/games/spider/spider.h Modified: trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc [iso-8859-1] Mon Oct 12 20:52:44 2009 @@ -29,17 +29,25 @@ PUSHBUTTON "Îòêàç", IDCANCEL, 101, 97, 50, 14 END -IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +IDD_CARDBACK DIALOGEX 6, 6, 186, 104 CAPTION "Èçáîð íà ãðúá çà êàðòèòå" FONT 8, "MS Shell Dlg" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT BEGIN - CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 - CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 - CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 - CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 - DEFPUSHBUTTON "Äîáðå", IDOK, 104, 77, 54, 13 - PUSHBUTTON "Îòêàç", IDCANCEL, 162, 77, 54, 13 + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32 + CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32 + CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32 + CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32 + CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32 + CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32 + CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32 + CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32 + CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32 + DEFPUSHBUTTON "Äîáðå", IDOK, 66, 84, 54, 13 + PUSHBUTTON "Îòêàç", IDCANCEL, 126, 84, 54, 13 END /* Strings */ Modified: trunk/reactos/base/applications/games/solitaire/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/ca-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/ca-ES.rc [iso-8859-1] Mon Oct 12 20:52:44 2009 @@ -29,17 +29,25 @@ END -IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +IDD_CARDBACK DIALOGEX 6, 6, 186, 104 CAPTION "Seleccioneu l'anvers" FONT 8, "MS Shell Dlg" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT BEGIN - CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 - CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 - CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 - CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 - DEFPUSHBUTTON "Acceptar", IDOK, 104, 77, 54, 13 - PUSHBUTTON "CancelÂ·lar", IDCANCEL, 162, 77, 54, 13 + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32 + CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32 + CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32 + CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32 + CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32 + CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32 + CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32 + CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32 + CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32 + DEFPUSHBUTTON "Acceptar", IDOK, 66, 84, 54, 13 + PUSHBUTTON "CancelÂ·lar", IDCANCEL, 126, 84, 54, 13 END Modified: trunk/reactos/base/applications/games/solitaire/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/cs-CZ.rc [iso-8859-1] Mon Oct 12 20:52:44 2009 @@ -28,17 +28,25 @@ END -IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +IDD_CARDBACK DIALOGEX 6, 6, 186, 104 CAPTION "Vybrat rub karet" FONT 8, "MS Shell Dlg" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT BEGIN - CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 - CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 - CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 - CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 - DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13 - PUSHBUTTON "Storno", IDCANCEL, 162, 77, 54, 13 + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32 + CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32 + CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32 + CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32 + CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32 + CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32 + CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32 + CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32 + CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32 + DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13 + PUSHBUTTON "Storno", IDCANCEL, 126, 84, 54, 13 END Modified: trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc [iso-8859-1] Mon Oct 12 20:52:44 2009 @@ -28,17 +28,25 @@ PUSHBUTTON "Abbrechen",IDCANCEL,101,97,50,14 END -IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +IDD_CARDBACK DIALOGEX 6, 6, 186, 104 CAPTION "Kartenhintergrund wählen" FONT 8, "MS Shell Dlg" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT BEGIN - CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 - CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 - CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 - CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 - DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13 - PUSHBUTTON "Abbrechen", IDCANCEL, 162, 77, 54, 13 + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32 + CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32 + CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32 + CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32 + CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32 + CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32 + CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32 + CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32 + CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32 + DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13 + PUSHBUTTON "Abbrechen", IDCANCEL, 126, 84, 54, 13 END Modified: trunk/reactos/base/applications/games/solitaire/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/el-GR.rc [iso-8859-1] Mon Oct 12 20:52:44 2009 @@ -28,17 +28,25 @@ PUSHBUTTON "Áêýñùóç", IDCANCEL, 101, 97, 50, 14 END -IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +IDD_CARDBACK DIALOGEX 6, 6, 186, 104 CAPTION "Select Card Back" FONT 8, "MS Shell Dlg" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT BEGIN - CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 - CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 - CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 - CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 - DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13 - PUSHBUTTON "Cancel", IDCANCEL, 162, 77, 54, 13 + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32 + CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32 + CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32 + CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32 + CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32 + CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32 + CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32 + CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32 + CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32 + DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13 + PUSHBUTTON "Cancel", IDCANCEL, 126, 84, 54, 13 END Modified: trunk/reactos/base/applications/games/solitaire/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/en-US.rc [iso-8859-1] Mon Oct 12 20:52:44 2009 @@ -29,17 +29,25 @@ END -IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +IDD_CARDBACK DIALOGEX 6, 6, 186, 104 CAPTION "Select Card Back" FONT 8, "MS Shell Dlg" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT BEGIN - CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 - CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 - CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 - CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 - DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13 - PUSHBUTTON "Cancel", IDCANCEL, 162, 77, 54, 13 + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32 + CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32 + CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32 + CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32 + CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32 + CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32 + CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32 + CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32 + CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32 + DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13 + PUSHBUTTON "Cancel", IDCANCEL, 126, 84, 54, 13 END Modified: trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc [iso-8859-1] Mon Oct 12 20:52:44 2009 @@ -30,17 +30,25 @@ END -IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +IDD_CARDBACK DIALOGEX 6, 6, 186, 104 CAPTION "Seleccionar el reverso" FONT 8, "MS Shell Dlg" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT BEGIN - CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 - CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 - CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 - CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 - DEFPUSHBUTTON "Aceptar", IDOK, 104, 77, 54, 13 - PUSHBUTTON "Cancelar", IDCANCEL, 162, 77, 54, 13 + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32 + CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32 + CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32 + CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32 + CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32 + CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32 + CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32 + CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32 + CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32 + DEFPUSHBUTTON "Aceptar", IDOK, 66, 84, 54, 13 + PUSHBUTTON "Cancelar", IDCANCEL, 126, 84, 54, 13 END Modified: trunk/reactos/base/applications/games/solitaire/lang/eu-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/eu-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/eu-ES.rc [iso-8859-1] Mon Oct 12 20:52:44 2009 @@ -28,17 +28,25 @@ PUSHBUTTON "Utzi", IDCANCEL, 101, 97, 50, 14 END -IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +IDD_CARDBACK DIALOGEX 6, 6, 186, 104 CAPTION "Hautatu karten atzealdea" FONT 8, "MS Shell Dlg" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT BEGIN - CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 - CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 - CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 - CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 - DEFPUSHBUTTON "Ados", IDOK, 104, 77, 54, 13 - PUSHBUTTON "Utzi", IDCANCEL, 162, 77, 54, 13 + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32 + CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32 + CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32 + CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32 + CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32 + CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32 + CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32 + CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32 + CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32 + DEFPUSHBUTTON "Ados", IDOK, 66, 84, 54, 13 + PUSHBUTTON "Utzi", IDCANCEL, 126, 84, 54, 13 END Modified: trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc [iso-8859-1] Mon Oct 12 20:52:44 2009 @@ -28,17 +28,25 @@ PUSHBUTTON "Annuler", IDCANCEL, 101, 97, 50, 14 END -IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +IDD_CARDBACK DIALOGEX 6, 6, 186, 104 CAPTION "Sélectionnez le tarot des cartes" FONT 8, "MS Shell Dlg" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT BEGIN - CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 - CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 - CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 - CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 - DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13 - PUSHBUTTON "Annuler", IDCANCEL, 162, 77, 54, 13 + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32 + CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32 + CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32 + CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32 + CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32 + CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32 + CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32 + CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32 + CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32 + DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13 + PUSHBUTTON "Annuler", IDCANCEL, 126, 84, 54, 13 END Modified: trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc [iso-8859-1] Mon Oct 12 20:52:44 2009 @@ -29,17 +29,25 @@ PUSHBUTTON "Batal", IDCANCEL, 101, 97, 50, 14 END -IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +IDD_CARDBACK DIALOGEX 6, 6, 186, 104 CAPTION "Select Card Back" FONT 8, "MS Shell Dlg" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT BEGIN - CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 - CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 - CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 - CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 - DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13 - PUSHBUTTON "Cancel", IDCANCEL, 162, 77, 54, 13 + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32 + CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32 + CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32 + CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32 + CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32 + CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32 + CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32 + CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32 + CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32 + DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13 + PUSHBUTTON "Cancel", IDCANCEL, 126, 84, 54, 13 END Modified: trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc [iso-8859-1] Mon Oct 12 20:52:44 2009 @@ -29,17 +29,25 @@ PUSHBUTTON "Annulla", IDCANCEL, 101, 97, 50, 14 END -IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +IDD_CARDBACK DIALOGEX 6, 6, 186, 104 CAPTION "Scegli il retro delle carte" FONT 8, "MS Shell Dlg" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT BEGIN - CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 - CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 - CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 - CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 - DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13 - PUSHBUTTON "Annulla", IDCANCEL, 162, 77, 54, 13 + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32 + CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32 + CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32 + CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32 + CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32 + CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32 + CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32 + CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32 + CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32 + DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13 + PUSHBUTTON "Annulla", IDCANCEL, 126, 84, 54, 13 END Modified: trunk/reactos/base/applications/games/solitaire/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/ja-JP.rc [iso-8859-1] Mon Oct 12 20:52:44 2009 @@ -29,17 +29,25 @@ END -IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +IDD_CARDBACK DIALOGEX 6, 6, 186, 104 CAPTION "J[hÌwiðIð" FONT 9, "MS UI Gothic" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT BEGIN - CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 - CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 - CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 - CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 - DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13 - PUSHBUTTON "LZ", IDCANCEL, 162, 77, 54, 13 + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32 + CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32 + CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32 + CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32 + CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32 + CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32 + CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32 + CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32 + CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32 + DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13 + PUSHBUTTON "LZ", IDCANCEL, 126, 84, 54, 13 END Modified: trunk/reactos/base/applications/games/solitaire/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/ko-KR.rc [iso-8859-1] Mon Oct 12 20:52:44 2009 @@ -25,17 +25,25 @@ END -IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +IDD_CARDBACK DIALOGEX 6, 6, 186, 104 CAPTION "Ä«µå ¹«´Ì ¼±ÅÃ" FONT 8, "MS Shell Dlg" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT BEGIN - CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 - CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 - CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 - CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 - DEFPUSHBUTTON "È®ÀÎ", IDOK, 104, 77, 54, 13 - PUSHBUTTON "Ãë¼Ò", IDCANCEL, 162, 77, 54, 13 + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32 + CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32 + CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32 + CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32 + CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32 + CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32 + CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32 + CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32 + CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32 + DEFPUSHBUTTON "È®ÀÎ", IDOK, 66, 84, 54, 13 + PUSHBUTTON "Ãë¼Ò", IDCANCEL, 126, 84, 54, 13 END Modified: trunk/reactos/base/applications/games/solitaire/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/lt-LT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/lt-LT.rc [iso-8859-1] Mon Oct 12 20:52:44 2009 @@ -30,17 +30,25 @@ END -IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +IDD_CARDBACK DIALOGEX 6, 6, 186, 104 CAPTION "Kortø virðelio pasirinkimas" FONT 8, "MS Shell Dlg" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT BEGIN - CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 - CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 - CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 - CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 - DEFPUSHBUTTON "Gerai", IDOK, 104, 77, 54, 13 - PUSHBUTTON "Atsisakyti", IDCANCEL, 162, 77, 54, 13 + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32 + CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32 + CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32 + CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32 + CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32 + CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32 + CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32 + CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32 + CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32 + DEFPUSHBUTTON "Gerai", IDOK, 66, 84, 54, 13 + PUSHBUTTON "Atsisakyti", IDCANCEL, 126, 84, 54, 13 END Modified: trunk/reactos/base/applications/games/solitaire/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/nl-NL.rc [iso-8859-1] Mon Oct 12 20:52:44 2009 @@ -29,17 +29,25 @@ END -IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +IDD_CARDBACK DIALOGEX 6, 6, 186, 104 CAPTION "Achterzijde selecteren" FONT 8, "MS Shell Dlg" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT BEGIN - CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 - CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 - CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 - CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 - DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13 - PUSHBUTTON "Annuleren", IDCANCEL, 162, 77, 54, 13 + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32 + CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32 + CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32 + CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32 + CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32 + CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32 + CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32 + CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32 + CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32 + DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13 + PUSHBUTTON "Annuleren", IDCANCEL, 126, 84, 54, 13 END Modified: trunk/reactos/base/applications/games/solitaire/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/no-NO.rc [iso-8859-1] Mon Oct 12 20:52:44 2009 @@ -29,17 +29,25 @@ PUSHBUTTON "Avbryt", IDCANCEL, 101, 97, 50, 14 END -IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +IDD_CARDBACK DIALOGEX 6, 6, 186, 104 CAPTION "Velg kort" FONT 8, "MS Shell Dlg" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT BEGIN - CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 - CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 - CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 - CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 - DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13 - PUSHBUTTON "Avbryt", IDCANCEL, 162, 77, 54, 13 + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32 + CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32 + CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32 + CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32 + CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32 + CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32 + CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32 + CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32 + CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32 + DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13 + PUSHBUTTON "Avbryt", IDCANCEL, 126, 84, 54, 13 END Modified: trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc [iso-8859-1] Mon Oct 12 20:52:44 2009 @@ -28,17 +28,25 @@ PUSHBUTTON "Anuluj", IDCANCEL, 101, 97, 50, 14 END -IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +IDD_CARDBACK DIALOGEX 6, 6, 186, 104 CAPTION "Wybieranie koszulki karty" FONT 8, "MS Shell Dlg" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT BEGIN - CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 - CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 - CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 - CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 - DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13 - PUSHBUTTON "Anuluj", IDCANCEL, 162, 77, 54, 13 + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32 + CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32 + CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32 + CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32 + CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32 + CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32 + CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32 + CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32 + CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32 + DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13 + PUSHBUTTON "Anuluj", IDCANCEL, 126, 84, 54, 13 END Modified: trunk/reactos/base/applications/games/solitaire/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/ro-RO.rc [iso-8859-1] Mon Oct 12 20:52:44 2009 @@ -30,17 +30,25 @@ END -IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +IDD_CARDBACK DIALOGEX 6, 6, 186, 104 CAPTION "AlegeÈi setul de cÄrÈi" FONT 8, "MS Shell Dlg" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT BEGIN - CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 - CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 - CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 - CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 - DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13 - PUSHBUTTON "Anulare", IDCANCEL, 162, 77, 54, 13 + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32 + CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32 + CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32 + CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32 + CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32 + CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32 + CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32 + CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32 + CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32 + DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13 + PUSHBUTTON "Anulare", IDCANCEL, 126, 84, 54, 13 END Modified: trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc [iso-8859-1] Mon Oct 12 20:52:44 2009 @@ -22,17 +22,25 @@ PUSHBUTTON "Îòìåíà", IDCANCEL, 101, 97, 50, 14 END -IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +IDD_CARDBACK DIALOGEX 6, 6, 186, 104 CAPTION "Âûáîð îáëîæêè êàðò" FONT 8, "MS Shell Dlg" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT BEGIN - CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 - CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 - CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 - CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 - DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13 - PUSHBUTTON "Îòìåíà", IDCANCEL, 162, 77, 54, 13 + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32 + CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32 + CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32 + CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32 + CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32 + CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32 + CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32 + CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32 + CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32 + DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13 + PUSHBUTTON "Îòìåíà", IDCANCEL, 126, 84, 54, 13 END Modified: trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc [iso-8859-1] Mon Oct 12 20:52:44 2009 @@ -30,17 +30,25 @@ PUSHBUTTON "Zrui", IDCANCEL, 101, 97, 50, 14 END -IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +IDD_CARDBACK DIALOGEX 6, 6, 186, 104 CAPTION "Výber rubu kariet" FONT 8, "MS Shell Dlg" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT BEGIN - CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 - CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 - CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 - CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 - DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13 - PUSHBUTTON "Zrui", IDCANCEL, 162, 77, 54, 13 + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32 + CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32 + CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32 + CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32 + CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32 + CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32 + CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32 + CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32 + CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32 + DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13 + PUSHBUTTON "Zrui", IDCANCEL, 126, 84, 54, 13 END Modified: trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc [iso-8859-1] Mon Oct 12 20:52:44 2009 @@ -29,17 +29,25 @@ PUSHBUTTON "Â¡àÅÔ¡", IDCANCEL, 101, 97, 50, 14 END -IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +IDD_CARDBACK DIALOGEX 6, 6, 186, 104 CAPTION "Select Card Back" FONT 8, "MS Shell Dlg" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT BEGIN - CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 - CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 - CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 - CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 - DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13 - PUSHBUTTON "Cancel", IDCANCEL, 162, 77, 54, 13 + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32 + CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32 + CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32 + CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32 + CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32 + CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32 + CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32 + CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32 + CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32 + DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13 + PUSHBUTTON "Cancel", IDCANCEL, 126, 84, 54, 13 END Modified: trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc [iso-8859-1] Mon Oct 12 20:52:44 2009 @@ -28,17 +28,25 @@ PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 101, 97, 50, 14 END -IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +IDD_CARDBACK DIALOGEX 6, 6, 186, 104 CAPTION "Âèáðàòè ñîðî÷êó" FONT 8, "MS Shell Dlg" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT BEGIN - CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 - CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 - CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 - CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 - DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13 - PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 162, 77, 54, 13 + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32 + CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32 + CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32 + CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32 + CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32 + CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32 + CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32 + CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32 + CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32 + DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13 + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 126, 84, 54, 13 END Modified: trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc [iso-8859-1] Mon Oct 12 20:52:44 2009 @@ -29,17 +29,25 @@ PUSHBUTTON "È¡Ïû", IDCANCEL, 101, 97, 50, 14 END -IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +IDD_CARDBACK DIALOGEX 6, 6, 186, 104 CAPTION "Ñ¡¶¨Ö½ÅÆ±³ÃæÍ¼°¸" FONT 8, "MS Shell Dlg" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT BEGIN - CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 - CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 - CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 - CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 - DEFPUSHBUTTON "È·¶¨", IDOK, 104, 77, 54, 13 - PUSHBUTTON "È¡Ïû", IDCANCEL, 162, 77, 54, 13 + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32 + CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32 + CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32 + CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32 + CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32 + CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32 + CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32 + CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32 + CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32 + DEFPUSHBUTTON "È·¶¨", IDOK, 66, 84, 54, 13 + PUSHBUTTON "È¡Ïû", IDCANCEL, 126, 84, 54, 13 END Modified: trunk/reactos/base/applications/games/solitaire/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/resource.h [iso-8859-1] Mon Oct 12 20:52:44 2009 @@ -25,6 +25,14 @@ #define IDC_CARDBACK2 1252 #define IDC_CARDBACK3 1253 #define IDC_CARDBACK4 1254 +#define IDC_CARDBACK5 1255 +#define IDC_CARDBACK6 1256 +#define IDC_CARDBACK7 1257 +#define IDC_CARDBACK8 1258 +#define IDC_CARDBACK9 1259 +#define IDC_CARDBACK10 1260 +#define IDC_CARDBACK11 1261 +#define IDC_CARDBACK12 1262 /* Strings */ #define IDS_SOL_NAME 1300 Modified: trunk/reactos/base/applications/games/solitaire/solitaire.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solitaire.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/solitaire.h [iso-8859-1] Mon Oct 12 20:52:44 2009 @@ -8,11 +8,12 @@ #define OPTION_SHOW_STATUS 4 #define OPTION_THREE_CARDS 8 #define CARDBACK_START IDC_CARDBACK1 -#define CARDBACK_END IDC_CARDBACK4 +#define CARDBACK_END IDC_CARDBACK12 #define NUM_CARDBACKS (CARDBACK_END - CARDBACK_START + 1) #define CARDBACK_RES_START 53 -#define CARDBACK_OPTIONS_WIDTH 72 -#define CARDBACK_OPTIONS_HEIGHT 96 +/* Display option cards with half the size */ +#define CARDBACK_OPTIONS_WIDTH 36 +#define CARDBACK_OPTIONS_HEIGHT 48 extern DWORD dwOptions; Modified: trunk/reactos/base/applications/games/spider/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/spider/lang/de-DE.rc [iso-8859-1] Mon Oct 12 20:52:44 2009 @@ -13,17 +13,25 @@ /* Dialogs */ -IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +IDD_CARDBACK DIALOGEX 6, 6, 186, 104 CAPTION "Kartenhintergrund wählen" FONT 8, "MS Shell Dlg" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT BEGIN - CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 - CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 - CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 - CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 - DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13 - PUSHBUTTON "Abbrechen", IDCANCEL, 162, 77, 54, 13 + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32 + CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32 + CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32 + CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32 + CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32 + CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32 + CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32 + CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32 + CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32 + DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13 + PUSHBUTTON "Abbrechen", IDCANCEL, 126, 84, 54, 13 END IDD_DIFFICULTY DIALOGEX DISCARDABLE 100, 100, 120, 80 Modified: trunk/reactos/base/applications/games/spider/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/spider/lang/en-US.rc [iso-8859-1] Mon Oct 12 20:52:44 2009 @@ -13,17 +13,25 @@ /* Dialogs */ -IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +IDD_CARDBACK DIALOGEX 6, 6, 186, 104 CAPTION "Select Card Back" FONT 8, "MS Shell Dlg" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT BEGIN - CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 - CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 - CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 - CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 - DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13 - PUSHBUTTON "Cancel", IDCANCEL, 162, 77, 54, 13 + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32 + CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32 + CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32 + CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32 + CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32 + CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32 + CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32 + CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32 + CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32 + DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13 + PUSHBUTTON "Cancel", IDCANCEL, 126, 84, 54, 13 END IDD_DIFFICULTY DIALOGEX DISCARDABLE 100, 100, 106, 80 Modified: trunk/reactos/base/applications/games/spider/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/spider/lang/es-ES.rc [iso-8859-1] Mon Oct 12 20:52:44 2009 @@ -13,17 +13,25 @@ /* Dialogs */ -IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +IDD_CARDBACK DIALOGEX 6, 6, 186, 104 CAPTION "Escoge Reverso de Carta" FONT 8, "MS Shell Dlg" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT BEGIN - CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 - CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 - CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 - CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 - DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13 - PUSHBUTTON "Cancelar", IDCANCEL, 162, 77, 54, 13 + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32 + CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32 + CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32 + CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32 + CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32 + CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32 + CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32 + CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32 + CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32 + DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13 + PUSHBUTTON "Cancelar", IDCANCEL, 126, 84, 54, 13 END IDD_DIFFICULTY DIALOGEX DISCARDABLE 100, 100, 106, 80 @@ -31,9 +39,9 @@ CAPTION "Dificultad" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "FÃ¡cil: &Un Color", IDC_DIF_ONECOLOR, 8, 10, 80, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "Fácil: &Un Color", IDC_DIF_ONECOLOR, 8, 10, 80, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "Medio: &Dos Colores", IDC_DIF_TWOCOLORS, 8, 23, 80, 10 - AUTORADIOBUTTON "DifÃcil: &Cuatro Colores", IDC_DIF_FOURCOLORS, 8, 36, 90, 10 + AUTORADIOBUTTON "Difícil: &Cuatro Colores", IDC_DIF_FOURCOLORS, 8, 36, 90, 10 DEFPUSHBUTTON "OK", IDOK, 8, 58, 40, 14 PUSHBUTTON "Cancelar", IDCANCEL, 58, 58, 40, 14 @@ -45,9 +53,9 @@ BEGIN IDS_SPI_NAME "Spider" IDS_SPI_ABOUT "Solitario Spider por Gregor Schneider\n\nCardLib version 1.0" - IDS_SPI_QUIT "Â¿Salir del juego actual?" - IDS_SPI_WIN "Â¡Enhorabuena, ganaste!" - IDS_SPI_DEAL "Â¿Jugar de nuevo?" + IDS_SPI_QUIT "¿Salir del juego actual?" + IDS_SPI_WIN "¡Enhorabuena, ganaste!" + IDS_SPI_DEAL "¿Jugar de nuevo?" END Modified: trunk/reactos/base/applications/games/spider/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/spider/lang/it-IT.rc [iso-8859-1] Mon Oct 12 20:52:44 2009 @@ -13,17 +13,25 @@ /* Dialogs */ -IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +IDD_CARDBACK DIALOGEX 6, 6, 186, 104 CAPTION "Scelta del mazzo" FONT 8, "MS Shell Dlg" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT BEGIN - CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 - CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 - CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 - CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 - DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13 - PUSHBUTTON "Annulla", IDCANCEL, 162, 77, 54, 13 + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32 + CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32 + CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32 + CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32 + CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32 + CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32 + CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32 + CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32 + CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32 + DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13 + PUSHBUTTON "Annulla", IDCANCEL, 126, 84, 54, 13 END IDD_DIFFICULTY DIALOGEX DISCARDABLE 100, 100, 106, 80 Modified: trunk/reactos/base/applications/games/spider/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/spider/lang/ja-JP.rc [iso-8859-1] Mon Oct 12 20:52:44 2009 @@ -13,17 +13,25 @@ /* Dialogs */ -IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +IDD_CARDBACK DIALOGEX 6, 6, 186, 104 CAPTION "J[hÌwiðIð" FONT 9, "MS UI Gothic" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT BEGIN - CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 - CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 - CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 - CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 - DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13 - PUSHBUTTON "LZ", IDCANCEL, 162, 77, 54, 13 + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32 + CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32 + CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32 + CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32 + CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32 + CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32 + CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32 + CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32 + CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32 + DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13 + PUSHBUTTON "LZ", IDCANCEL, 126, 84, 54, 13 END IDD_DIFFICULTY DIALOGEX DISCARDABLE 100, 100, 106, 80 Modified: trunk/reactos/base/applications/games/spider/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/spider/lang/ru-RU.rc [iso-8859-1] Mon Oct 12 20:52:44 2009 @@ -13,17 +13,25 @@ /* Dialogs */ -IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +IDD_CARDBACK DIALOGEX 6, 6, 186, 104 CAPTION "Âûáîð îôîðìëåíèÿ" FONT 8, "MS Shell Dlg" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT BEGIN - CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 - CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 - CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 - CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 - DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13 - PUSHBUTTON "Îòìåíà", IDCANCEL, 162, 77, 54, 13 + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32 + CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32 + CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32 + CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32 + CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32 + CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32 + CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32 + CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32 + CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32 + DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13 + PUSHBUTTON "Îòìåíà", IDCANCEL, 126, 84, 54, 13 END IDD_DIFFICULTY DIALOGEX DISCARDABLE 100, 100, 106, 80 Modified: trunk/reactos/base/applications/games/spider/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/spider/resource.h [iso-8859-1] Mon Oct 12 20:52:44 2009 @@ -17,10 +17,19 @@ #define IDC_CARDBACK2 1252 #define IDC_CARDBACK3 1253 #define IDC_CARDBACK4 1254 -#define IDD_DIFFICULTY 1260 -#define IDC_DIF_ONECOLOR 1261 -#define IDC_DIF_TWOCOLORS 1262 -#define IDC_DIF_FOURCOLORS 1263 +#define IDC_CARDBACK5 1255 +#define IDC_CARDBACK6 1256 +#define IDC_CARDBACK7 1257 +#define IDC_CARDBACK8 1258 +#define IDC_CARDBACK9 1259 +#define IDC_CARDBACK10 1260 +#define IDC_CARDBACK11 1261 +#define IDC_CARDBACK12 1262 + +#define IDD_DIFFICULTY 1270 +#define IDC_DIF_ONECOLOR 1271 +#define IDC_DIF_TWOCOLORS 1272 +#define IDC_DIF_FOURCOLORS 1273 /* Strings */ #define IDS_SPI_NAME 1300 Modified: trunk/reactos/base/applications/games/spider/spider.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/spider.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/spider/spider.h [iso-8859-1] Mon Oct 12 20:52:44 2009 @@ -5,11 +5,12 @@ #define DIFFICULTY_TWO_COLORS 2 #define DIFFICULTY_FOUR_COLORS 3 #define CARDBACK_START IDC_CARDBACK1 -#define CARDBACK_END IDC_CARDBACK4 +#define CARDBACK_END IDC_CARDBACK12 #define NUM_CARDBACKS (CARDBACK_END - CARDBACK_START + 1) #define CARDBACK_RES_START 53 -#define CARDBACK_OPTIONS_WIDTH 72 -#define CARDBACK_OPTIONS_HEIGHT 96 +/* Display option cards with half the size */ +#define CARDBACK_OPTIONS_WIDTH 36 +#define CARDBACK_OPTIONS_HEIGHT 48 #define X_BORDER 6 #define Y_BORDER 12

1 0

[sginsberg] 43412: - Fix usbdlib.h -- don't assume that the basic calling convention is stdcall.
by sginsberg＠svn.reactos.org 12 Oct '09

12 Oct '09

Author: sginsberg Date: Mon Oct 12 20:40:18 2009 New Revision: 43412 URL: http://svn.reactos.org/svn/reactos?rev=43412&view=rev Log: - Fix usbdlib.h -- don't assume that the basic calling convention is stdcall. Modified: trunk/reactos/include/ddk/usbdlib.h Modified: trunk/reactos/include/ddk/usbdlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/usbdlib.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/usbdlib.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/usbdlib.h [iso-8859-1] Mon Oct 12 20:40:18 2009 @@ -125,6 +125,7 @@ DECLSPEC_IMPORT VOID +NTAPI USBD_GetUSBDIVersion( OUT PUSBD_VERSION_INFORMATION VersionInformation ); @@ -132,6 +133,7 @@ DECLSPEC_IMPORT PUSB_INTERFACE_DESCRIPTOR +NTAPI USBD_ParseConfigurationDescriptor( IN PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor, IN UCHAR InterfaceNumber, @@ -140,6 +142,7 @@ DECLSPEC_IMPORT PURB +NTAPI USBD_CreateConfigurationRequest( IN PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor, OUT PUSHORT Siz @@ -147,6 +150,7 @@ DECLSPEC_IMPORT PUSB_COMMON_DESCRIPTOR +NTAPI USBD_ParseDescriptors( IN PVOID DescriptorBuffer, IN ULONG TotalLength, @@ -156,6 +160,7 @@ DECLSPEC_IMPORT PUSB_INTERFACE_DESCRIPTOR +NTAPI USBD_ParseConfigurationDescriptorEx( IN PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor, IN PVOID StartPosition, @@ -168,6 +173,7 @@ DECLSPEC_IMPORT PURB +NTAPI USBD_CreateConfigurationRequestEx( IN PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor, IN PUSBD_INTERFACE_LIST_ENTRY InterfaceList @@ -176,6 +182,7 @@ DECLSPEC_IMPORT ULONG +NTAPI USBD_GetInterfaceLength( IN PUSB_INTERFACE_DESCRIPTOR InterfaceDescriptor, IN PUCHAR BufferEnd @@ -183,6 +190,7 @@ DECLSPEC_IMPORT VOID +NTAPI USBD_RegisterHcFilter( IN PDEVICE_OBJECT DeviceObject, IN PDEVICE_OBJECT FilterDeviceObject @@ -192,6 +200,7 @@ DECLSPEC_IMPORT NTSTATUS +NTAPI USBD_GetPdoRegistryParameter( IN PDEVICE_OBJECT PhysicalDeviceObject, IN PVOID Parameter, @@ -202,6 +211,7 @@ DECLSPEC_IMPORT NTSTATUS +NTAPI USBD_QueryBusTime( IN PDEVICE_OBJECT RootHubPdo, OUT PULONG CurrentFrame @@ -211,6 +221,7 @@ DECLSPEC_IMPORT ULONG +NTAPI USBD_CalculateUsbBandwidth( IN ULONG MaxPacketSize, IN UCHAR EndpointType, @@ -223,6 +234,7 @@ DECLSPEC_IMPORT USBD_STATUS +NTAPI USBD_ValidateConfigurationDescriptor( IN PUSB_CONFIGURATION_DESCRIPTOR ConfigDesc, IN ULONG BufferLength,

1 0

[janderwald] 43411: - Revert 43410
by janderwald＠svn.reactos.org 12 Oct '09

12 Oct '09

Author: janderwald Date: Mon Oct 12 20:27:00 2009 New Revision: 43411 URL: http://svn.reactos.org/svn/reactos?rev=43411&view=rev Log: - Revert 43410 Modified: trunk/reactos/drivers/base/beep/beep.c Modified: trunk/reactos/drivers/base/beep/beep.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/beep/beep.c?r… ============================================================================== --- trunk/reactos/drivers/base/beep/beep.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/beep/beep.c [iso-8859-1] Mon Oct 12 20:27:00 2009 @@ -288,7 +288,7 @@ IoDeleteDevice(DeviceObject); } - +DRIVER_STARTIO BeepStartIo; VOID NTAPI BeepStartIo(IN PDEVICE_OBJECT DeviceObject, @@ -303,7 +303,7 @@ /* Acquire the cancel lock and make sure the IRP is valid */ IoAcquireCancelSpinLock(&CancelIrql); - if (Irp->Cancel) + if (!Irp) { /* It's not, release the lock and quit */ IoReleaseCancelSpinLock(CancelIrql);

1 0

[janderwald] 43410: - Fix typo
by janderwald＠svn.reactos.org 12 Oct '09

12 Oct '09

Author: janderwald Date: Mon Oct 12 20:20:23 2009 New Revision: 43410 URL: http://svn.reactos.org/svn/reactos?rev=43410&view=rev Log: - Fix typo Modified: trunk/reactos/drivers/base/beep/beep.c Modified: trunk/reactos/drivers/base/beep/beep.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/beep/beep.c?r… ============================================================================== --- trunk/reactos/drivers/base/beep/beep.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/beep/beep.c [iso-8859-1] Mon Oct 12 20:20:23 2009 @@ -288,7 +288,7 @@ IoDeleteDevice(DeviceObject); } -DRIVER_STARTIO BeepStartIo; + VOID NTAPI BeepStartIo(IN PDEVICE_OBJECT DeviceObject, @@ -303,7 +303,7 @@ /* Acquire the cancel lock and make sure the IRP is valid */ IoAcquireCancelSpinLock(&CancelIrql); - if (!Irp) + if (Irp->Cancel) { /* It's not, release the lock and quit */ IoReleaseCancelSpinLock(CancelIrql);

1 0

[fireball] 43409: - Remove PatBlt driver routine and instead call it from StretchBlt handler. Unregresses arwinss after syncing. Mouse cursor is still totally broken though.
by fireball＠svn.reactos.org 12 Oct '09

12 Oct '09

Author: fireball Date: Mon Oct 12 20:10:24 2009 New Revision: 43409 URL: http://svn.reactos.org/svn/reactos?rev=43409&view=rev Log: - Remove PatBlt driver routine and instead call it from StretchBlt handler. Unregresses arwinss after syncing. Mouse cursor is still totally broken though. Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] Mon Oct 12 20:10:24 2009 @@ -398,31 +398,6 @@ return FALSE; } -#if 0 -BOOL CDECL RosDrv_PatBlt( NTDRV_PDEVICE *physDev, INT left, INT top, INT width, INT height, DWORD rop ) -{ - POINT pts[2], ptBrush; - - /* Map coordinates */ - pts[0].x = left; - pts[0].y = top; - pts[1].x = left + width; - pts[1].y = top + height; - - LPtoDP(physDev->hUserDC, pts, 2); - width = pts[1].x - pts[0].x; - height = pts[1].y - pts[0].y; - left = pts[0].x; - top = pts[0].y; - - /* Update brush origin */ - GetBrushOrgEx(physDev->hUserDC, &ptBrush); - RosGdiSetBrushOrg(physDev->hKernelDC, ptBrush.x, ptBrush.y); - - return RosGdiPatBlt(physDev->hKernelDC, left, top, width, height, rop); -} -#endif - BOOL CDECL RosDrv_Pie( NTDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) { @@ -777,8 +752,16 @@ GetBrushOrgEx(physDevDst->hUserDC, &ptBrush); RosGdiSetBrushOrg(physDevDst->hKernelDC, ptBrush.x, ptBrush.y); - return RosGdiStretchBlt(physDevDst->hKernelDC, xDst, yDst, widthDst, heightDst, - physDevSrc->hKernelDC, xSrc, ySrc, widthSrc, heightSrc, rop); + if (!physDevSrc) + { + /* This is PatBlt */ + return RosGdiPatBlt(physDevDst->hKernelDC, xDst, yDst, widthDst, heightDst, rop); + } + else + { + return RosGdiStretchBlt(physDevDst->hKernelDC, xDst, yDst, widthDst, heightDst, + physDevSrc->hKernelDC, xSrc, ySrc, widthSrc, heightSrc, rop); + } } BOOL CDECL RosDrv_SwapBuffers(NTDRV_PDEVICE *physDev)

1 0

← Newer
1
...
45
46
47
48
49
50
51
...
65
Older →

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 October 2009