Ros-diffs February 2011

ros-diffs@reactos.org

18 participants
352 discussions

[janderwald] 50900: [WDMAUD.DRV] - Check if the provided waveformat is at least size of WAVEFORMAT - Compute extra details such as the size or wBitsPerSample from the provided members - Backup i/o ...

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Feb 25 16:00:26 2011 New Revision: 50900 URL: http://svn.reactos.org/svn/reactos?rev=50900&view=rev Log: [WDMAUD.DRV] - Check if the provided waveformat is at least size of WAVEFORMAT - Compute extra details such as the size or wBitsPerSample from the provided members - Backup i/o completion handle before commiting the audio buffer as the struct might have already been released - Fixes playback of mmsys cpl - Found by DPH! Modified: trunk/reactos/dll/win32/wdmaud.drv/legacy.c Modified: trunk/reactos/dll/win32/wdmaud.drv/legacy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/legac… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/legacy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/legacy.c [iso-8859-1] Fri Feb 25 16:00:26 2011 @@ -476,7 +476,7 @@ DeviceInfo.u.WaveFormatEx.nSamplesPerSec = WaveFormat->nSamplesPerSec; DeviceInfo.u.WaveFormatEx.nBlockAlign = WaveFormat->nBlockAlign; DeviceInfo.u.WaveFormatEx.nAvgBytesPerSec = WaveFormat->nAvgBytesPerSec; - DeviceInfo.u.WaveFormatEx.wBitsPerSample = WaveFormat->wBitsPerSample; + DeviceInfo.u.WaveFormatEx.wBitsPerSample = (DeviceInfo.u.WaveFormatEx.nAvgBytesPerSec * 8) / (DeviceInfo.u.WaveFormatEx.nSamplesPerSec * DeviceInfo.u.WaveFormatEx.nChannels); #endif Result = SyncOverlappedDeviceIoControl(KernelHandle, @@ -492,14 +492,19 @@ return TranslateInternalMmResult(Result); } - /* Store format */ - Instance->WaveFormatEx.cbSize = WaveFormat->cbSize; - Instance->WaveFormatEx.wFormatTag = WaveFormat->wFormatTag; - Instance->WaveFormatEx.nChannels = WaveFormat->nChannels; - Instance->WaveFormatEx.nSamplesPerSec = WaveFormat->nSamplesPerSec; - Instance->WaveFormatEx.nBlockAlign = WaveFormat->nBlockAlign; - Instance->WaveFormatEx.nAvgBytesPerSec = WaveFormat->nAvgBytesPerSec; - Instance->WaveFormatEx.wBitsPerSample = WaveFormat->wBitsPerSample; + if (WaveFormatSize >= sizeof(WAVEFORMAT)) + { + /* Store format */ + Instance->WaveFormatEx.wFormatTag = WaveFormat->wFormatTag; + Instance->WaveFormatEx.nChannels = WaveFormat->nChannels; + Instance->WaveFormatEx.nSamplesPerSec = WaveFormat->nSamplesPerSec; + Instance->WaveFormatEx.nBlockAlign = WaveFormat->nBlockAlign; + Instance->WaveFormatEx.nAvgBytesPerSec = WaveFormat->nAvgBytesPerSec; + } + + /* store details */ + Instance->WaveFormatEx.cbSize = sizeof(WAVEFORMATEX); + Instance->WaveFormatEx.wBitsPerSample = (DeviceInfo.u.WaveFormatEx.nAvgBytesPerSec * 8) / (DeviceInfo.u.WaveFormatEx.nSamplesPerSec * DeviceInfo.u.WaveFormatEx.nChannels); /* Store sound device handle instance handle */ Instance->Handle = (PVOID)DeviceInfo.hDevice; @@ -617,7 +622,7 @@ // create completion event - Overlap->Standard.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + Overlap->Standard.hEvent = Handle = CreateEventW(NULL, FALSE, FALSE, NULL); if (Overlap->Standard.hEvent == NULL) { // no memory @@ -641,12 +646,10 @@ } // close event handle - CloseHandle(Overlap->Standard.hEvent); + CloseHandle(Handle); return MMSYSERR_NOERROR; } - - MMRESULT WdmAudSetWaveStateByLegacy(

13 years, 7 months

[janderwald] 50899: [SHELL32] - Check the correct pidl instead of the free one - Found by the amazing DPH!

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Feb 25 15:11:51 2011 New Revision: 50899 URL: http://svn.reactos.org/svn/reactos?rev=50899&view=rev Log: [SHELL32] - Check the correct pidl instead of the free one - Found by the amazing DPH! Modified: trunk/reactos/dll/win32/shell32/she_ocmenu.c Modified: trunk/reactos/dll/win32/shell32/she_ocmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/she_ocme… ============================================================================== --- trunk/reactos/dll/win32/shell32/she_ocmenu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/she_ocmenu.c [iso-8859-1] Fri Feb 25 15:11:51 2011 @@ -1219,8 +1219,8 @@ ERR("no mem\n"); return E_OUTOFMEMORY; } - if (_ILIsDesktop(pidl_child) || _ILIsMyDocuments(pidl_child) || _ILIsControlPanel(pidl_child) || _ILIsNetHood(pidl_child) || - _ILIsBitBucket(pidl_child) || _ILIsDrive(pidl_child) || _ILIsCPanelStruct(pidl_child) || _ILIsFolder(pidl_child) || _ILIsControlPanel(pidl_folder)) + if (_ILIsDesktop(pidl) || _ILIsMyDocuments(pidl) || _ILIsControlPanel(pidl) || _ILIsNetHood(pidl) || + _ILIsBitBucket(pidl) || _ILIsDrive(pidl) || _ILIsCPanelStruct(pidl) || _ILIsFolder(pidl) || _ILIsControlPanel(pidl)) { TRACE("pidl is a folder\n"); SHFree((void*)pidl);

13 years, 7 months

[fireball] 50898: [RTL/DPH] - Fix wrong pointer comparison in RtlpDebugPageHeapFree(). Should check for NULL pointer freeing, instead of checking for NULL heap pointer.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Feb 25 14:13:10 2011 New Revision: 50898 URL: http://svn.reactos.org/svn/reactos?rev=50898&view=rev Log: [RTL/DPH] - Fix wrong pointer comparison in RtlpDebugPageHeapFree(). Should check for NULL pointer freeing, instead of checking for NULL heap pointer. Modified: trunk/reactos/lib/rtl/heappage.c Modified: trunk/reactos/lib/rtl/heappage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heappage.c?rev=508… ============================================================================== --- trunk/reactos/lib/rtl/heappage.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heappage.c [iso-8859-1] Fri Feb 25 14:13:10 2011 @@ -1813,7 +1813,7 @@ PDPH_BLOCK_INFORMATION Info; /* Check for a NULL pointer freeing */ - if (!HeapPtr) + if (!Ptr) { if (RtlpDphBreakOptions & DPH_BREAK_ON_NULL_FREE) {

13 years, 7 months

[janderwald] 50897: [MMEBUDDY] - Store the internal state if an audio stream has been stopped - Construct a thread when WODM_RESTART is received. This thread then triggers performs a callback to th...

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Feb 25 14:10:31 2011 New Revision: 50897 URL: http://svn.reactos.org/svn/reactos?rev=50897&view=rev Log: [MMEBUDDY] - Store the internal state if an audio stream has been stopped - Construct a thread when WODM_RESTART is received. This thread then triggers performs a callback to the wave thread, which finally restarts playback - Only start the wave thread when playback is active (not paused by WODM_PAUSE) - Fixes playback in Winamp 5.601 despite graphical issues - Tested in Vbox 4.0 + 512MB RAM + Winamp 5.601 Modified: trunk/reactos/include/reactos/libs/sound/mmebuddy.h trunk/reactos/lib/drivers/sound/mmebuddy/mmewrap.c trunk/reactos/lib/drivers/sound/mmebuddy/wave/header.c trunk/reactos/lib/drivers/sound/mmebuddy/wave/streaming.c Modified: trunk/reactos/include/reactos/libs/sound/mmebuddy.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/sound… ============================================================================== --- trunk/reactos/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] Fri Feb 25 14:10:31 2011 @@ -366,6 +366,7 @@ HANDLE hStopEvent; HANDLE hResetEvent; BOOL ResetInProgress; + BOOL bPaused; } SOUND_DEVICE_INSTANCE, *PSOUND_DEVICE_INSTANCE; /* This lives in WAVEHDR.reserved */ @@ -702,6 +703,9 @@ StopStreaming( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance); +VOID +InitiateSoundStreaming( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance); /* kernel.c Modified: trunk/reactos/lib/drivers/sound/mmebuddy/mmewrap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/mmewrap.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/mmewrap.c [iso-8859-1] Fri Feb 25 14:10:31 2011 @@ -29,6 +29,7 @@ PMMFUNCTION_TABLE FunctionTable; PSOUND_DEVICE SoundDevice; PSOUND_DEVICE_INSTANCE SoundDeviceInstance; + BOOL OldState; VALIDATE_MMSYS_PARAMETER( PrivateHandle ); SoundDeviceInstance = (PSOUND_DEVICE_INSTANCE) PrivateHandle; @@ -52,6 +53,20 @@ } /* Try change state */ Result = FunctionTable->SetState(SoundDeviceInstance, bStart); + + if ( MMSUCCESS(Result) ) + { + /* Get old audio stream state */ + OldState = SoundDeviceInstance->bPaused; + + /* Store audio stream pause state */ + SoundDeviceInstance->bPaused = !bStart; + + if (SoundDeviceInstance->bPaused == FALSE && OldState == TRUE) + { + InitiateSoundStreaming(SoundDeviceInstance); + } + } return Result; } Modified: trunk/reactos/lib/drivers/sound/mmebuddy/wave/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/wave/header.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/wave/header.c [iso-8859-1] Fri Feb 25 14:10:31 2011 @@ -242,7 +242,11 @@ SoundDeviceInstance->HeadWaveHeader = WaveHeader; SoundDeviceInstance->TailWaveHeader = WaveHeader; - DoWaveStreaming(SoundDeviceInstance); + /* Only do wave streaming when the stream has not been paused */ + if (SoundDeviceInstance->bPaused == FALSE) + { + DoWaveStreaming(SoundDeviceInstance); + } } else { @@ -258,7 +262,11 @@ SoundDeviceInstance->TailWaveHeader = WaveHeader; DUMP_WAVEHDR_QUEUE(SoundDeviceInstance); - DoWaveStreaming(SoundDeviceInstance); + /* Only do wave streaming when the stream has not been paused */ + if ( SoundDeviceInstance->bPaused == FALSE ) + { + DoWaveStreaming(SoundDeviceInstance); + } } } Modified: trunk/reactos/lib/drivers/sound/mmebuddy/wave/streaming.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/wave/streaming.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/wave/streaming.c [iso-8859-1] Fri Feb 25 14:10:31 2011 @@ -361,3 +361,37 @@ StopStreamingInSoundThread, NULL); } + +MMRESULT +PerformWaveStreaming( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN PVOID Parameter) +{ + DoWaveStreaming(SoundDeviceInstance); + + return MMSYSERR_NOERROR; +} + +DWORD +WINAPI +WaveActivateSoundStreaming( + IN PVOID lpParameter) +{ + CallSoundThread((PSOUND_DEVICE_INSTANCE)lpParameter, + PerformWaveStreaming, + NULL); + + ExitThread(0); +} + +VOID +InitiateSoundStreaming( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance) +{ + HANDLE hThread; + + hThread = CreateThread(NULL, 0, WaveActivateSoundStreaming, (PVOID)SoundDeviceInstance, 0, NULL); + + if (hThread != NULL) + CloseHandle(hThread); +}

13 years, 7 months

[fireball] 50895: [SECUR32] - Don't leave packageinfo uninitialized. Even though it's not the way it should work, wine's rpcrt4 doesn't really expect that function to return no packages at all. Sho...

by fireball＠svn.reactos.org

Author: fireball Date: Thu Feb 24 22:50:00 2011 New Revision: 50895 URL: http://svn.reactos.org/svn/reactos?rev=50895&view=rev Log: [SECUR32] - Don't leave packageinfo uninitialized. Even though it's not the way it should work, wine's rpcrt4 doesn't really expect that function to return no packages at all. Should prevent freeing an unitialized pointer. See issue #5778 for more details. Modified: trunk/reactos/dll/win32/secur32/sspi.c Modified: trunk/reactos/dll/win32/secur32/sspi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/sspi.c?r… ============================================================================== --- trunk/reactos/dll/win32/secur32/sspi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/secur32/sspi.c [iso-8859-1] Thu Feb 24 22:50:00 2011 @@ -80,7 +80,7 @@ SECURITY_STATUS ret = SEC_E_OK; *pcPackages = 0; - + *ppPackageInfo = NULL; /* if (packageTable) { @@ -113,7 +113,7 @@ } */ FreeContextBuffer(info); } - + *ppPackageInfo = NULL; UNIMPLEMENTED; return ret;

13 years, 7 months

[janderwald] 50894: [WDMAUD.DRV] - Set wave in pins into run state - Fixes hang of ReactOS sndrec32, though it crashes then instantly. Needs more investigation

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Feb 24 14:38:16 2011 New Revision: 50894 URL: http://svn.reactos.org/svn/reactos?rev=50894&view=rev Log: [WDMAUD.DRV] - Set wave in pins into run state - Fixes hang of ReactOS sndrec32, though it crashes then instantly. Needs more investigation Modified: trunk/reactos/dll/win32/wdmaud.drv/legacy.c Modified: trunk/reactos/dll/win32/wdmaud.drv/legacy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/legac… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/legacy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/legacy.c [iso-8859-1] Thu Feb 24 14:38:16 2011 @@ -528,18 +528,18 @@ Instance->BufferCount = 100; } - if (DeviceType == WAVE_OUT_DEVICE_TYPE) - { - /* Now start the stream */ - DeviceInfo.u.State = KSSTATE_RUN; - SyncOverlappedDeviceIoControl(KernelHandle, - IOCTL_SETDEVICE_STATE, - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - NULL); - } + /* Now acquire resources */ + DeviceInfo.u.State = KSSTATE_ACQUIRE; + SyncOverlappedDeviceIoControl(KernelHandle, IOCTL_SETDEVICE_STATE, (LPVOID) &DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), (LPVOID) &DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), NULL); + + /* pause the pin */ + DeviceInfo.u.State = KSSTATE_PAUSE; + SyncOverlappedDeviceIoControl(KernelHandle, IOCTL_SETDEVICE_STATE, (LPVOID) &DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), (LPVOID) &DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), NULL); + + /* start the pin */ + DeviceInfo.u.State = KSSTATE_RUN; + SyncOverlappedDeviceIoControl(KernelHandle, IOCTL_SETDEVICE_STATE, (LPVOID) &DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), (LPVOID) &DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), NULL); + return MMSYSERR_NOERROR; }

13 years, 7 months

[tkreuzer] 50893: [WIN32K] Fix possible lock leak in failure case of NtGdiSetBoundsRect. Fixes a failed assertion spotted by r3ddr4g0n.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Feb 24 14:18:55 2011 New Revision: 50893 URL: http://svn.reactos.org/svn/reactos?rev=50893&view=rev Log: [WIN32K] Fix possible lock leak in failure case of NtGdiSetBoundsRect. Fixes a failed assertion spotted by r3ddr4g0n. Modified: trunk/reactos/subsystems/win32/win32k/objects/dcutil.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dcutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dcutil.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dcutil.c [iso-8859-1] Thu Feb 24 14:18:55 2011 @@ -540,6 +540,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + DC_UnlockDc(pdc); _SEH2_YIELD(return 0;) } _SEH2_END; @@ -550,6 +551,6 @@ if (flags & DCB_ENABLE) pdc->fs |= DC_ACCUM_APP; if (flags & DCB_DISABLE) pdc->fs &= ~DC_ACCUM_APP; - DC_UnlockDc( pdc ); + DC_UnlockDc(pdc); return ret; }

13 years, 7 months

[fireball] 50892: [RTL/DPH] - Implement ValidateHeap API for DPH. Fixes attempts to validate DPH as a normal heap.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Feb 24 12:59:52 2011 New Revision: 50892 URL: http://svn.reactos.org/svn/reactos?rev=50892&view=rev Log: [RTL/DPH] - Implement ValidateHeap API for DPH. Fixes attempts to validate DPH as a normal heap. Modified: trunk/reactos/lib/rtl/heap.c trunk/reactos/lib/rtl/heap.h trunk/reactos/lib/rtl/heappage.c Modified: trunk/reactos/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.c?rev=50892&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap.c [iso-8859-1] Thu Feb 24 12:59:52 2011 @@ -3707,7 +3707,9 @@ BOOLEAN HeapLocked = FALSE; BOOLEAN HeapValid; - // FIXME Check for special heap + /* Check for page heap */ + if (Heap->ForceFlags & HEAP_FLAG_PAGE_ALLOCS) + return RtlpDebugPageHeapValidate(HeapPtr, Flags, Block); /* Check signature */ if (Heap->Signature != HEAP_SIGNATURE) Modified: trunk/reactos/lib/rtl/heap.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.h?rev=50892&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.h [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap.h [iso-8859-1] Thu Feb 24 12:59:52 2011 @@ -435,6 +435,12 @@ ULONG UserFlagsReset, ULONG UserFlagsSet); +BOOLEAN +NTAPI +RtlpDebugPageHeapValidate(PVOID HeapPtr, + ULONG Flags, + PVOID Block); + SIZE_T NTAPI RtlpPageHeapSize(HANDLE HeapPtr, ULONG Flags, Modified: trunk/reactos/lib/rtl/heappage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heappage.c?rev=508… ============================================================================== --- trunk/reactos/lib/rtl/heappage.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heappage.c [iso-8859-1] Thu Feb 24 12:59:52 2011 @@ -191,6 +191,10 @@ VOID NTAPI RtlpDphReportCorruptedBlock(PDPH_HEAP_ROOT DphRoot, ULONG Reserved, PVOID Block, ULONG ValidationInfo); +BOOLEAN NTAPI +RtlpDphNormalHeapValidate(PDPH_HEAP_ROOT DphRoot, ULONG Flags, PVOID BaseAddress); + + VOID NTAPI RtlpDphRaiseException(NTSTATUS Status) { @@ -2224,4 +2228,68 @@ return Size; } +BOOLEAN +NTAPI +RtlpDebugPageHeapValidate(PVOID HeapHandle, + ULONG Flags, + PVOID BaseAddress) +{ + PDPH_HEAP_ROOT DphRoot; + PDPH_HEAP_BLOCK Node = NULL; + BOOLEAN Valid = FALSE; + + /* Get a pointer to the heap root */ + DphRoot = RtlpDphPointerFromHandle(HeapHandle); + if (!DphRoot) return -1; + + /* Add heap flags */ + Flags |= DphRoot->HeapFlags; + + /* Acquire the heap lock */ + RtlpDphPreProcessing(DphRoot, Flags); + + /* Find busy memory */ + if (BaseAddress) + Node = RtlpDphFindBusyMemory(DphRoot, BaseAddress); + + if (!Node) + { + /* This block was not found in page heap, or the request is to validate all normal heap */ + Valid = RtlpDphNormalHeapValidate(DphRoot, Flags, BaseAddress); + } + + /* Leave the heap lock */ + RtlpDphPostProcessing(DphRoot); + + /* Return result of a normal heap validation */ + if (BaseAddress && !Node) + return Valid; + + /* Otherwise return our own result */ + if (!BaseAddress || Node) Valid = TRUE; + + return Valid; +} + +BOOLEAN +NTAPI +RtlpDphNormalHeapValidate(PDPH_HEAP_ROOT DphRoot, + ULONG Flags, + PVOID BaseAddress) +{ + PDPH_BLOCK_INFORMATION BlockInfo = (PDPH_BLOCK_INFORMATION)BaseAddress - 1; + if (!BaseAddress) + { + /* Validate all normal heap */ + return RtlValidateHeap(DphRoot->NormalHeap, Flags, NULL); + } + + // FIXME: Check is this a normal heap block + /*if (!RtlpDphIsNormalHeapBlock(DphRoot, BaseAddress, &ValidationInfo)) + { + }*/ + + return RtlValidateHeap(DphRoot->NormalHeap, Flags, BlockInfo); +} + /* EOF */

13 years, 7 months

[fireball] 50891: [PING] - Add Ukrainian translation by Eugene Sakara.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Feb 24 12:35:44 2011 New Revision: 50891 URL: http://svn.reactos.org/svn/reactos?rev=50891&view=rev Log: [PING] - Add Ukrainian translation by Eugene Sakara. Added: trunk/reactos/base/applications/network/ping/lang/uk-UA.rc (with props) Modified: trunk/reactos/base/applications/network/ping/ping.rc Added: trunk/reactos/base/applications/network/ping/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/lang/uk-UA.rc (added) +++ trunk/reactos/base/applications/network/ping/lang/uk-UA.rc [iso-8859-1] Thu Feb 24 12:35:44 2011 @@ -1,0 +1,43 @@ +/* + * PROJECT: Ping for ReactOS + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/network/ping/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for Ping + * TRANSLATORS: Sakara Eugene + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_USAGE "\nÂèêîðèñòàííÿ: ping [-t] [-n count] [-l size] [-w timeout] õîñò\n\n\ +Îïö³¿:\n\ + -t Ï³íã âêàçàíîãî âóçëà ïîêè íå áóäå çä³éñòåíà ðó÷íà çóïèíêà.\n\ + Äëÿ çóïèíêè íàòèñí³òü Control-C.\n\ + -n count ×èñëî çàïèò³â, ÿê³ áóäóòü ï³äïðàâëåí³.\n\ + -l size Ðîçì³ð áóôåðà â³äïðàâêè.\n\ + -w timeout ×àñ î÷³êóâàííÿ êîæíî¿ â³äïîâ³ä³ â ì³ë³ñåêóíäàõ.\n\n\0" + + IDS_PING_WITH_BYTES "\nÎáì³í ïàêåòàìè ç %1 [%2] ïî %3!d! áàéò:\n\n\0" + IDS_PING_STATISTICS "\nÑòàòèñòèêà Ping äëÿ %1:\n\0" + IDS_PACKETS_SENT_RECEIVED_LOST " Ïàêåò³â: â³äïðàâëåíî = %1!d!, îòðèìàíî = %2!d!, âòðà÷åíî = %3!d! (%4!d!%% âòðàò),\n\0" + IDS_APPROXIMATE_ROUND_TRIP "Ïðèáëèçíèé ÷àñ ïðèéîìó-ïåðåäà÷³:\n\0" + IDS_MIN_MAX_AVERAGE " Ì³í³ìàëüíå = %1, Ìàêñèìàëüíå = %2, Ñåðåäíº = %3\n\0" + IDS_NOT_ENOUGH_RESOURCES "Íåäîñòàòíüî â³ëüíèõ ðåñóðñ³â.\n\0" + IDS_UNKNOWN_HOST "Íåâ³äîìèé õîñò %1.\n\0" + IDS_SETSOCKOPT_FAILED "setsockopt íåâäàëèé (%1!d!).\n\0" + IDS_COULD_NOT_CREATE_SOCKET "Íå âäàëîñÿ ñòâîðèòè ñîêåò (#%1!d!).\n\0" + IDS_COULD_NOT_INIT_WINSOCK "Íå âäàëîñÿ ³í³ö³àë³çóâàòè winsock dll.\n\0" + IDS_DEST_MUST_BE_SPECIFIED "²ì'ÿ àáî IP-àäðåñà õîñòó ïîâèííå áóòè âêàçàíå.\n\0" + IDS_BAD_PARAMETER "Ïîãàíèé ïàðàìåòð %1.\n\0" + IDS_BAD_OPTION_FORMAT "Íåâ³ðíèé ôîðìàò îïö³¿ %1.\n\0" + IDS_BAD_OPTION "Ïîãàíà îïö³ÿ %1.\n\0" + IDS_BAD_VALUE_OPTION_L "Íåïðàâèëüíå çíà÷åííÿ äëÿ îïö³¿ -l, äîïóñòèìèé ä³àïàçîí â³ä 0 äî %1!d!.\n\0" + IDS_REPLY_FROM "Â³äïîâ³äü â³ä %1: áàéò³â=%2!d! ÷àñ%3%4 TTL=%5!d!\n\0" + IDS_DEST_UNREACHABLE "Õîñò íåäîñòóïíèé.\n\0" + IDS_COULD_NOT_TRANSMIT "Íå âäàëîñÿ ïåðåäàòè äàí³ (%1!d!).\n\0" + IDS_COULD_NOT_RECV "Íå âäàëîñÿ îòðèìàòè äàí³ (%1!d!).\n\0" + IDS_REQUEST_TIMEOUT "Î÷³êóâàííÿ çàïèòó.\n\0" + IDS_MS "ìñ\0" + IDS_1MS "1ìñ\0" +END Propchange: trunk/reactos/base/applications/network/ping/lang/uk-UA.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/network/ping/ping.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/ping.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/ping.rc [iso-8859-1] Thu Feb 24 12:35:44 2011 @@ -13,3 +13,4 @@ #include "lang/fr-FR.rc" #include "lang/pl-PL.rc" #include "lang/it-IT.rc" +#include "lang/uk-UA.rc"

13 years, 7 months

[tkreuzer] 50890: [COMCTL32] - Fix include order of resources. - remove comctl_Cn.rc, it contains and outdated simplified chineese translation, that wine has in comctl_Zh.rc

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Feb 24 12:34:59 2011 New Revision: 50890 URL: http://svn.reactos.org/svn/reactos?rev=50890&view=rev Log: [COMCTL32] - Fix include order of resources. - remove comctl_Cn.rc, it contains and outdated simplified chineese translation, that wine has in comctl_Zh.rc Removed: trunk/reactos/dll/win32/comctl32/comctl_Cn.rc Modified: trunk/reactos/dll/win32/comctl32/rsrc.rc Removed: trunk/reactos/dll/win32/comctl32/comctl_Cn.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Cn.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Cn.rc (removed) @@ -1,90 +1,0 @@ -/* - * Copyright 2002 Tisheng Chen - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED -#pragma code_page(936) - -IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "ÊôÐÔ %s" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "È·¶¨", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP - PUSHBUTTON "È¡Ïû", IDCANCEL,58,122,50,14 - PUSHBUTTON "Ó¦ÓÃ(&A)", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED - PUSHBUTTON "°ïÖú", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP - CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 -END - - -IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Wizard" -FONT 8, "MS Shell Dlg" -BEGIN - PUSHBUTTON "< ÉÏÒ»²½(&B)", IDC_BACK_BUTTON,71,138,50,14 - DEFPUSHBUTTON "ÏÂÒ»²½(&N) >", IDC_NEXT_BUTTON,121,138,50,14 - DEFPUSHBUTTON "½áÊø", IDC_FINISH_BUTTON,121,138,50,14 - PUSHBUTTON "È¡Ïû", IDCANCEL,178,138,50,14 - PUSHBUTTON "°ïÖú", IDHELP,235,138,50,14,WS_GROUP - LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN - CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 - LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE -END - - -IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "×Ô¶¨Òå¹¤¾ßÀ¸" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "¹Ø±Õ(&C)", IDCANCEL,308,6,44,14 - PUSHBUTTON "ÖØÖÃ(&e)", IDC_RESET_BTN,308,23,44,14 - PUSHBUTTON "°ïÖú(&H)", IDC_HELP_BTN,308,40,44,14 - PUSHBUTTON "ÉÏÒÆ(&U)", IDC_MOVEUP_BTN,308,74,44,14 - PUSHBUTTON "ÏÂÒÆ(&D)", IDC_MOVEDN_BTN,308,91,44,14 - LTEXT "¿ÉÓÃ¹¤¾ßÀ¸°´Å¥(&V):", -1,4,5,84,10 - LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP - PUSHBUTTON "Ìí¼Ó(&A) ->", IDOK, 131, 42, 44, 14 - PUSHBUTTON "<- É¾³ý(&R)", IDC_REMOVE_BTN,131,62,44,14 - LTEXT "µ±Ç°¹¤¾ßÀ¸°´Å¥(&T):", -1,182,5,78,10 - LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP -END - -STRINGTABLE DISCARDABLE -{ - IDS_CLOSE "¹Ø±Õ" -} - -STRINGTABLE DISCARDABLE -{ - IDM_TODAY "Today:" - IDM_GOTODAY "Go to today" -} - -STRINGTABLE DISCARDABLE -{ - IDS_SEPARATOR "·Ö¸ô·û" -} - -STRINGTABLE DISCARDABLE -{ - HKY_NONE "None" -} - -#pragma code_page(default) Modified: trunk/reactos/dll/win32/comctl32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/rsrc.rc… ============================================================================== --- trunk/reactos/dll/win32/comctl32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/rsrc.rc [iso-8859-1] Thu Feb 24 12:34:59 2011 @@ -94,24 +94,26 @@ #include "comctl_Cs.rc" #include "comctl_El.rc" #include "comctl_En.rc" +#include "comctl_Eo.rc" #include "comctl_Es.rc" #include "comctl_Hu.rc" -#include "comctl_It.rc" -#include "comctl_Ko.rc" -//#include "comctl_Nl.rc" -//#include "comctl_No.rc" -//#include "comctl_Pl.rc" -//#include "comctl_Sk.rc" -//#include "comctl_Sv.rc" -//#include "comctl_Th.rc" -//#include "comctl_Tr.rc" -//#include "comctl_Uk.rc" +#include "comctl_Nl.rc" +#include "comctl_No.rc" +#include "comctl_Pl.rc" +#include "comctl_Sk.rc" +#include "comctl_Sv.rc" +#include "comctl_Th.rc" +#include "comctl_Tr.rc" +#include "comctl_Uk.rc" /* UTF-8 */ #include "comctl_Da.rc" #include "comctl_De.rc" #include "comctl_Fr.rc" +#include "comctl_He.rc" +#include "comctl_It.rc" #include "comctl_Ja.rc" +#include "comctl_Ko.rc" #include "comctl_Lt.rc" #include "comctl_Pt.rc" #include "comctl_Ro.rc"

13 years, 7 months

← Newer
1
2
3
4
5
6
7
8
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2011