Ros-diffs August 2023

ros-diffs@reactos.org

30 participants
167 discussions

[reactos] 02/10: [NTOS:SE] Declare function prototypes & add OBJECT_TYPE_LIST_INTERNAL

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5654ce7b9a1ccd7f35ec6… commit 5654ce7b9a1ccd7f35ec6ae5d27f218ff6bb15d9 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Tue Jun 20 10:55:35 2023 +0200 Commit: unknown <george.bisoc(a)reactos.org> CommitDate: Tue Aug 22 17:54:17 2023 +0200 [NTOS:SE] Declare function prototypes & add OBJECT_TYPE_LIST_INTERNAL OBJECT_TYPE_LIST_INTERNAL will serve as an internal kernel data structure to hold validated object type contents that are copied from UM. The difference between the public and the internal one is that the internal structure has an additional member for access check rights that have been granted on each object element in the list. --- ntoskrnl/include/internal/se.h | 36 +++++++++++++++++++++++++++++++++--- ntoskrnl/se/audit.c | 4 ++-- 2 files changed, 35 insertions(+), 5 deletions(-) diff --git a/ntoskrnl/include/internal/se.h b/ntoskrnl/include/internal/se.h index d261b03c54a..db32e6bff73 100644 --- a/ntoskrnl/include/internal/se.h +++ b/ntoskrnl/include/internal/se.h @@ -3,7 +3,7 @@ * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Internal header for the Security Manager * COPYRIGHT: Copyright Eric Kohl - * Copyright 2022 George Bișoc <george.bisoc(a)reactos.org> + * Copyright 2022-2023 George Bișoc <george.bisoc(a)reactos.org> */ #pragma once @@ -45,6 +45,16 @@ typedef struct _ACCESS_CHECK_RIGHTS ACCESS_MASK DeniedAccessRights; } ACCESS_CHECK_RIGHTS, *PACCESS_CHECK_RIGHTS; +// +// Internal object type list structure +// +typedef struct _OBJECT_TYPE_LIST_INTERNAL +{ + GUID ObjectTypeGuid; + USHORT Level; + ACCESS_CHECK_RIGHTS ObjectAccessRights; +} OBJECT_TYPE_LIST_INTERNAL, *POBJECT_TYPE_LIST_INTERNAL; + typedef enum _ACCESS_CHECK_RIGHT_TYPE { AccessCheckMaximum, @@ -304,6 +314,14 @@ SepDumpTokenDebugInfo( VOID SepDumpAccessRightsStats( _In_ PACCESS_CHECK_RIGHTS AccessRights); + +VOID +SepDumpAccessAndStatusList( + _In_ PACCESS_MASK GrantedAccessList, + _In_ PNTSTATUS AccessStatusList, + _In_ BOOLEAN IsResultList, + _In_ POBJECT_TYPE_LIST_INTERNAL ObjectTypeList, + _In_ ULONG ObjectTypeListLength); #endif // DBG // @@ -827,16 +845,28 @@ SepReleaseSecurityQualityOfService( // // Object type list functions // +PGUID +SepGetObjectTypeGuidFromAce( + _In_ PACE Ace, + _In_ BOOLEAN IsAceDenied); + +BOOLEAN +SepObjectTypeGuidInList( + _In_reads_(ObjectTypeListLength) POBJECT_TYPE_LIST_INTERNAL ObjectTypeList, + _In_ ULONG ObjectTypeListLength, + _In_ PGUID ObjectTypeGuid, + _Out_ PULONG ObjectIndex); + NTSTATUS SeCaptureObjectTypeList( _In_reads_opt_(ObjectTypeListLength) POBJECT_TYPE_LIST ObjectTypeList, _In_ ULONG ObjectTypeListLength, _In_ KPROCESSOR_MODE PreviousMode, - _Out_ POBJECT_TYPE_LIST *CapturedObjectTypeList); + _Out_ POBJECT_TYPE_LIST_INTERNAL *CapturedObjectTypeList); VOID SeReleaseObjectTypeList( - _In_ _Post_invalid_ POBJECT_TYPE_LIST CapturedObjectTypeList, + _In_ _Post_invalid_ POBJECT_TYPE_LIST_INTERNAL CapturedObjectTypeList, _In_ KPROCESSOR_MODE PreviousMode); // diff --git a/ntoskrnl/se/audit.c b/ntoskrnl/se/audit.c index e2a5cc49c23..aae45beb31f 100644 --- a/ntoskrnl/se/audit.c +++ b/ntoskrnl/se/audit.c @@ -497,7 +497,7 @@ SepAccessCheckAndAuditAlarmWorker( _In_ ACCESS_MASK DesiredAccess, _In_ AUDIT_EVENT_TYPE AuditType, _In_ BOOLEAN HaveAuditPrivilege, - _In_reads_opt_(ObjectTypeListLength) POBJECT_TYPE_LIST ObjectTypeList, + _In_reads_opt_(ObjectTypeListLength) POBJECT_TYPE_LIST_INTERNAL ObjectTypeList, _In_ ULONG ObjectTypeListLength, _In_ PGENERIC_MAPPING GenericMapping, _Out_writes_(ObjectTypeListLength) PACCESS_MASK GrantedAccessList, @@ -641,7 +641,7 @@ SepAccessCheckAndAuditAlarm( ACCESS_MASK GrantedAccess, *SafeGrantedAccessList; NTSTATUS AccessStatus, *SafeAccessStatusList; PSID CapturedPrincipalSelfSid; - POBJECT_TYPE_LIST CapturedObjectTypeList; + POBJECT_TYPE_LIST_INTERNAL CapturedObjectTypeList; ULONG i; BOOLEAN LocalGenerateOnClose; NTSTATUS Status;

1 year

[reactos] 01/10: [NTOS:SE] Update the NT access check syscalls SAL2 annotations

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=edcf3f5363cbaf212654f… commit edcf3f5363cbaf212654f78eda5542b1d7cea4be Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Tue Jun 20 10:42:08 2023 +0200 Commit: unknown <george.bisoc(a)reactos.org> CommitDate: Tue Aug 22 17:53:45 2023 +0200 [NTOS:SE] Update the NT access check syscalls SAL2 annotations The newly updated SAL2 annotations reflect those from Process Hacker. Also these syscalls must have their function's status code checked, as most of other Native syscalls have them checked. --- sdk/include/ndk/sefuncs.h | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/sdk/include/ndk/sefuncs.h b/sdk/include/ndk/sefuncs.h index b0227a223d0..3c24177cb16 100644 --- a/sdk/include/ndk/sefuncs.h +++ b/sdk/include/ndk/sefuncs.h @@ -13,6 +13,7 @@ Abstract: Author: Alex Ionescu (alexi(a)tinykrnl.org) - Updated - 27-Feb-2006 + George Bișoc (george.bisoc(a)reactos.org) - Updated - 23-Apr-2023 --*/ @@ -79,6 +80,8 @@ SeTokenImpersonationLevel( // // Native Calls // +_Must_inspect_result_ +__kernel_entry NTSYSCALLAPI NTSTATUS NTAPI @@ -87,40 +90,44 @@ NtAccessCheck( _In_ HANDLE ClientToken, _In_ ACCESS_MASK DesiredAccess, _In_ PGENERIC_MAPPING GenericMapping, - _Out_ PPRIVILEGE_SET PrivilegeSet, - _Out_ PULONG ReturnLength, + _Out_writes_bytes_(*PrivilegeSetLength) PPRIVILEGE_SET PrivilegeSet, + _Inout_ PULONG PrivilegeSetLength, _Out_ PACCESS_MASK GrantedAccess, _Out_ PNTSTATUS AccessStatus); +_Must_inspect_result_ +NTSYSCALLAPI NTSTATUS NTAPI NtAccessCheckByType( _In_ PSECURITY_DESCRIPTOR SecurityDescriptor, - _In_ PSID PrincipalSelfSid, + _In_opt_ PSID PrincipalSelfSid, _In_ HANDLE ClientToken, _In_ ACCESS_MASK DesiredAccess, - _In_ POBJECT_TYPE_LIST ObjectTypeList, - _In_ ULONG ObjectTypeLength, + _In_reads_opt_(ObjectTypeListLength) POBJECT_TYPE_LIST ObjectTypeList, + _In_ ULONG ObjectTypeListLength, _In_ PGENERIC_MAPPING GenericMapping, - _In_ PPRIVILEGE_SET PrivilegeSet, + _Out_writes_bytes_(*PrivilegeSetLength) PPRIVILEGE_SET PrivilegeSet, _Inout_ PULONG PrivilegeSetLength, _Out_ PACCESS_MASK GrantedAccess, _Out_ PNTSTATUS AccessStatus); +_Must_inspect_result_ +NTSYSCALLAPI NTSTATUS NTAPI NtAccessCheckByTypeResultList( _In_ PSECURITY_DESCRIPTOR SecurityDescriptor, - _In_ PSID PrincipalSelfSid, + _In_opt_ PSID PrincipalSelfSid, _In_ HANDLE ClientToken, _In_ ACCESS_MASK DesiredAccess, - _In_ POBJECT_TYPE_LIST ObjectTypeList, - _In_ ULONG ObjectTypeLength, + _In_reads_(ObjectTypeListLength) POBJECT_TYPE_LIST ObjectTypeList, + _In_ ULONG ObjectTypeListLength, _In_ PGENERIC_MAPPING GenericMapping, - _In_ PPRIVILEGE_SET PrivilegeSet, + _Out_writes_bytes_(*PrivilegeSetLength) PPRIVILEGE_SET PrivilegeSet, _Inout_ PULONG PrivilegeSetLength, - _Out_ PACCESS_MASK GrantedAccess, - _Out_ PNTSTATUS AccessStatus); + _Out_writes_(ObjectTypeListLength) PACCESS_MASK GrantedAccess, + _Out_writes_(ObjectTypeListLength) PNTSTATUS AccessStatus); _Must_inspect_result_ __kernel_entry NTSYSCALLAPI @@ -331,8 +338,8 @@ ZwAccessCheck( _In_ HANDLE ClientToken, _In_ ACCESS_MASK DesiredAccess, _In_ PGENERIC_MAPPING GenericMapping, - _Out_ PPRIVILEGE_SET PrivilegeSet, - _Out_ PULONG ReturnLength, + _Out_writes_bytes_(*PrivilegeSetLength) PPRIVILEGE_SET PrivilegeSet, + _Out_ PULONG PrivilegeSetLength, _Out_ PACCESS_MASK GrantedAccess, _Out_ PNTSTATUS AccessStatus);

1 year

[reactos] 01/01: [KERNEL32] Improve a few NT6 stubs

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=08629037ea7cfda9fab9e… commit 08629037ea7cfda9fab9e898b38c8e66ef77373a Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Aug 12 08:54:16 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Aug 22 18:46:31 2023 +0300 [KERNEL32] Improve a few NT6 stubs --- dll/win32/kernel32/kernel32.spec | 52 ++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/dll/win32/kernel32/kernel32.spec b/dll/win32/kernel32/kernel32.spec index 2853c50d579..e72f99fb295 100644 --- a/dll/win32/kernel32/kernel32.spec +++ b/dll/win32/kernel32/kernel32.spec @@ -169,12 +169,12 @@ @ stdcall -version=0x600+ CreateSymbolicLinkW(wstr wstr long) @ stdcall CreateTapePartition(long long long long) @ stdcall CreateThread(ptr long ptr long long ptr) -@ stub -version=0x600+ CreateThreadpool -@ stub -version=0x600+ CreateThreadpoolCleanupGroup -@ stub -version=0x600+ CreateThreadpoolIo -@ stub -version=0x600+ CreateThreadpoolTimer -@ stub -version=0x600+ CreateThreadpoolWait -@ stub -version=0x600+ CreateThreadpoolWork +@ stdcall -stub -version=0x600+ CreateThreadpool(ptr) +@ stdcall -stub -version=0x600+ CreateThreadpoolCleanupGroup() +@ stdcall -stub -version=0x600+ CreateThreadpoolIo(ptr ptr ptr ptr) +@ stdcall -stub -version=0x600+ CreateThreadpoolTimer(ptr ptr ptr) +@ stdcall -stub -version=0x600+ CreateThreadpoolWait(ptr ptr ptr) +@ stdcall -stub -version=0x600+ CreateThreadpoolWork(ptr ptr ptr) @ stdcall CreateTimerQueue() @ stdcall CreateTimerQueueTimer(ptr long ptr ptr long long long) @ stdcall CreateToolhelp32Snapshot(long long) @@ -202,7 +202,7 @@ @ stub -version=0x600+ DeleteFileTransactedA @ stub -version=0x600+ DeleteFileTransactedW @ stdcall DeleteFileW(wstr) -@ stub -version=0x600+ DeleteProcThreadAttributeList +@ stdcall -stub -version=0x600+ DeleteProcThreadAttributeList(ptr) @ stdcall DeleteTimerQueue(long) @ stdcall DeleteTimerQueueEx(long long) @ stdcall DeleteTimerQueueTimer(long long long) @@ -418,7 +418,7 @@ @ stdcall GetConsoleOutputCP() @ stdcall GetConsoleProcessList(ptr long) ; missing in XP SP3 @ stdcall GetConsoleScreenBufferInfo(long ptr) -@ stub -version=0x600+ GetConsoleScreenBufferInfoEx +@ stdcall -stub -version=0x600+ GetConsoleScreenBufferInfoEx(ptr ptr) @ stdcall GetConsoleSelectionInfo(ptr) @ stdcall GetConsoleTitleA(ptr long) @ stdcall GetConsoleTitleW(ptr long) @@ -544,7 +544,7 @@ @ stdcall GetNumberOfConsoleMouseButtons(ptr) @ stdcall GetOEMCP() @ stdcall GetOverlappedResult(long ptr ptr long) -@ stub -version=0x600+ GetPhysicallyInstalledSystemMemory +@ stdcall -stub -version=0x600+ GetPhysicallyInstalledSystemMemory(ptr) @ stdcall GetPriorityClass(long) @ stdcall GetPrivateProfileIntA(str str long str) @ stdcall GetPrivateProfileIntW(wstr wstr long wstr) @@ -593,7 +593,7 @@ @ stub -version=0x600+ GetSystemDEPPolicy @ stdcall GetSystemDefaultLCID() @ stdcall GetSystemDefaultLangID() -@ stub -version=0x600+ GetSystemDefaultLocaleName +@ stdcall -stub -version=0x600+ GetSystemDefaultLocaleName(ptr long) @ stdcall GetSystemDefaultUILanguage() @ stdcall GetSystemDirectoryA(ptr long) @ stdcall GetSystemDirectoryW(ptr long) @@ -620,7 +620,7 @@ @ stdcall GetTempPathA(long ptr) @ stdcall GetTempPathW(long ptr) @ stdcall GetThreadContext(long ptr) -@ stub -version=0x600+ GetThreadErrorMode +@ stdcall -stub -version=0x600+ GetThreadErrorMode() @ stdcall GetThreadIOPendingFlag(long ptr) @ stdcall GetThreadId(ptr) @ stdcall GetThreadLocale() @@ -636,7 +636,7 @@ @ stdcall -version=0x600+ GetTimeFormatEx(wstr long ptr wstr wstr long) @ stdcall GetTimeFormatW(long long ptr wstr ptr long) @ stdcall GetTimeZoneInformation(ptr) -@ stub -version=0x600+ GetTimeZoneInformationForYear +@ stdcall -stub -version=0x600+ GetTimeZoneInformationForYear(long ptr ptr) @ stdcall -version=0x600+ GetUILanguageInfo(long wstr wstr ptr ptr) @ stdcall GetUserDefaultLCID() @ stdcall GetUserDefaultLangID() @@ -704,19 +704,19 @@ @ stdcall -version=0x351-0x502 HeapUsage(long long long long ptr) @ stdcall HeapValidate(long long ptr) @ stdcall HeapWalk(long ptr) -@ stub -version=0x600+ IdnToAscii -@ stub -version=0x600+ IdnToNameprepUnicode -@ stub -version=0x600+ IdnToUnicode +@ stdcall -stub -version=0x600+ IdnToAscii(long wstr long ptr long) +@ stdcall -stub -version=0x600+ IdnToNameprepUnicode(long wstr long ptr long) +@ stdcall -stub -version=0x600+ IdnToUnicode(long wstr long ptr long) @ stdcall InitAtomTable(long) -@ stub -version=0x600+ InitOnceBeginInitialize -@ stub -version=0x600+ InitOnceComplete +@ stdcall -stub -version=0x600+ InitOnceBeginInitialize(ptr long ptr ptr) +@ stdcall -stub -version=0x600+ InitOnceComplete(ptr long ptr) @ stdcall -version=0x600+ InitOnceExecuteOnce(ptr ptr ptr ptr) -@ stub -version=0x600+ InitOnceInitialize +@ stdcall -stub -version=0x600+ InitOnceInitialize(ptr) @ stdcall -version=0x600+ InitializeConditionVariable(ptr) ntdll.RtlInitializeConditionVariable @ stdcall InitializeCriticalSection(ptr) @ stdcall InitializeCriticalSectionAndSpinCount(ptr long) @ stdcall -version=0x600+ InitializeCriticalSectionEx(ptr long long) -@ stub -version=0x600+ InitializeProcThreadAttributeList +@ stdcall -stub -version=0x600+ InitializeProcThreadAttributeList(ptr long long ptr) @ stdcall InitializeSListHead(ptr) ntdll.RtlInitializeSListHead @ stdcall -version=0x600+ InitializeSRWLock(ptr) ntdll.RtlInitializeSRWLock @ stdcall -arch=i386 -ret64 InterlockedCompareExchange64(ptr double double) ntdll.RtlInterlockedCompareExchange64 @@ -744,7 +744,7 @@ @ stdcall IsDBCSLeadByteEx(long long) @ stdcall IsDebuggerPresent() @ stdcall IsNLSDefinedString(long long ptr long long) -@ stub -version=0x600+ IsNormalizedString +@ stdcall -stub -version=0x600+ IsNormalizedString(long wstr long) @ stdcall IsProcessInJob(long long ptr) @ stdcall IsProcessorFeaturePresent(long) @ stdcall IsSystemResumeAutomatic() @@ -826,8 +826,8 @@ @ stub -version=0x600+ NlsUpdateLocale @ stub -version=0x600+ NlsUpdateSystemLocale @ stub -version=0x600+ NlsWriteEtwEvent -@ stub -version=0x600+ NormalizeString -@ stub -version=0x600+ NotifyUILanguageChange +@ stdcall -stub -version=0x600+ NormalizeString(long wstr long ptr long) +@ stdcall -stub -version=0x600+ NotifyUILanguageChange(long wstr wstr long ptr) @ stdcall OpenConsoleW(wstr long long long) @ stdcall -version=0x500-0x502 OpenDataFile(long long) @ stdcall OpenEventA(long long str) @@ -1072,7 +1072,7 @@ @ stdcall SetTermsrvAppInstallMode(long) @ stdcall SetThreadAffinityMask(long long) @ stdcall SetThreadContext(long ptr) -@ stub -version=0x600+ SetThreadErrorMode +@ stdcall -stub -version=0x600+ SetThreadErrorMode(long ptr) @ stdcall SetThreadExecutionState(long) @ stdcall SetThreadIdealProcessor(long long) @ stdcall SetThreadLocale(long) @@ -1104,7 +1104,7 @@ @ stdcall -version=0x600+ SleepConditionVariableSRW(ptr ptr long long) @ stdcall SleepEx(long long) @ stub -version=0x600+ StartThreadpoolIo -@ stub -version=0x600+ SubmitThreadpoolWork +@ stdcall -stub -version=0x600+ SubmitThreadpoolWork(ptr) @ stdcall SuspendThread(long) @ stdcall SwitchToFiber(ptr) @ stdcall SwitchToThread() @@ -1138,7 +1138,7 @@ @ stdcall UnregisterWait(long) @ stdcall UnregisterWaitEx(long long) @ stub -version=0x600+ UpdateCalendarDayOfWeek -@ stub -version=0x600+ UpdateProcThreadAttribute +@ stdcall -stub -version=0x600+ UpdateProcThreadAttribute(ptr long ptr ptr ptr ptr ptr) @ stdcall UpdateResourceA(long str str long ptr long) @ stdcall UpdateResourceW(long wstr wstr long ptr long) @ stdcall VDMConsoleOperation(long long) @@ -1173,7 +1173,7 @@ @ stub -version=0x600+ WaitForThreadpoolIoCallbacks @ stub -version=0x600+ WaitForThreadpoolTimerCallbacks @ stub -version=0x600+ WaitForThreadpoolWaitCallbacks -@ stub -version=0x600+ WaitForThreadpoolWorkCallbacks +@ stdcall -stub -version=0x600+ WaitForThreadpoolWorkCallbacks(ptr long) @ stdcall WaitNamedPipeA(str long) @ stdcall WaitNamedPipeW(wstr long) @ stdcall -version=0x600+ WakeAllConditionVariable(ptr) ntdll.RtlWakeAllConditionVariable

1 year

[reactos] 01/01: [COM_APITEST] shdocvw: Add CLSID_MruPidlList (#5602)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fec935ec24951d279c55f… commit fec935ec24951d279c55f023d236d9a24501d83f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Aug 22 23:07:46 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Aug 22 23:07:46 2023 +0900 [COM_APITEST] shdocvw: Add CLSID_MruPidlList (#5602) CORE-9283 --- modules/rostests/apitests/com/com_apitest.c | 1 + modules/rostests/apitests/com/com_apitest.h | 2 ++ modules/rostests/apitests/com/shdocvw.c | 7 +++++++ 3 files changed, 10 insertions(+) diff --git a/modules/rostests/apitests/com/com_apitest.c b/modules/rostests/apitests/com/com_apitest.c index 66d22ada9b2..3200c556c7c 100644 --- a/modules/rostests/apitests/com/com_apitest.c +++ b/modules/rostests/apitests/com/com_apitest.c @@ -205,6 +205,7 @@ static KNOWN_INTERFACE KnownInterfaces[] = { ID_NAME(IID_IMenuPopup), TRUE }, { ID_NAME(IID_IModalWindow) }, { ID_NAME(IID_IMoniker) }, + { ID_NAME(IID_IMruPidlList) }, { ID_NAME(IID_IMultiMonitorDockingSite), TRUE }, { ID_NAME(IID_IMultiQI), TRUE }, { ID_NAME(IID_INameSpaceTreeControl), TRUE }, diff --git a/modules/rostests/apitests/com/com_apitest.h b/modules/rostests/apitests/com/com_apitest.h index d4b208db94c..c8c8ad08d12 100644 --- a/modules/rostests/apitests/com/com_apitest.h +++ b/modules/rostests/apitests/com/com_apitest.h @@ -87,6 +87,7 @@ DEFINE_GUID(CLSID_ImgCtxThumbnailExtractor,0x7376d660, 0xc583, 0x11d0, 0xa3, 0xa DEFINE_GUID(CLSID_MenuDeskBar, 0xECD4FC4F, 0x521C, 0x11D0, 0xB7, 0x92, 0x00, 0xA0, 0xC9, 0x03, 0x12, 0xE1); DEFINE_GUID(CLSID_MenuToolbarBase, 0x40b96610, 0xb522, 0x11d1, 0xb3, 0xb4, 0x00, 0xaa, 0x00, 0x6e, 0xfd, 0xe7); DEFINE_GUID(CLSID_MruLongList, 0x53BD6B4E, 0x3780, 0x4693, 0xAF, 0xC3, 0x71, 0x61, 0xC2, 0xF3, 0xEE, 0x9C); +DEFINE_GUID(CLSID_MruPidlList, 0x42AEDC87, 0x2188, 0x41FD, 0xB9, 0xA3, 0x0C, 0x96, 0x6F, 0xEA, 0xBE, 0xC1); DEFINE_GUID(CLSID_QuickLinks, 0x0E5CBF21, 0xD15F, 0x11D0, 0x83, 0x01, 0x00, 0xAA, 0x00, 0x5B, 0x43, 0x83); DEFINE_GUID(CLSID_ShellFolderView, 0x62112aa1, 0xebe4, 0x11cf, 0xa5, 0xfb, 0x00, 0x20, 0xaf, 0xe7, 0x29, 0x2d); DEFINE_GUID(CLSID_ShellImageDataFactory, 0x66e4e4fb, 0xf385, 0x4dd0, 0x8d, 0x74, 0xa2, 0xef, 0xd1, 0xbc, 0x61, 0x78); @@ -142,6 +143,7 @@ DEFINE_GUID(IID_IHWEventHandler, 0xc1fb73d0, 0xec3a, 0x4ba2, 0xb5, 0x1 DEFINE_GUID(IID_IHWEventHandler2, 0xcfcc809f, 0x295d, 0x42e8, 0x9f, 0xfc, 0x42, 0x4b, 0x33, 0xc4, 0x87, 0xe6); DEFINE_GUID(IID_IInitializeWithBindCtx, 0x71c0d2bc, 0x726d, 0x45cc, 0xa6, 0xc0, 0x2e, 0x31, 0xc1, 0xdb, 0x21, 0x59); DEFINE_GUID(IID_IItemNameLimits, 0x1df0d7f1, 0xb267, 0x4d28, 0x8b, 0x10, 0x12, 0xe2, 0x32, 0x02, 0xa5, 0xc4); +DEFINE_GUID(IID_IMruPidlList, 0x47851649, 0xa2ef, 0x4e67, 0xba, 0xec, 0xc6, 0xa1, 0x53, 0xac, 0x72, 0xec); DEFINE_GUID(IID_IMultiMonitorDockingSite, 0x03879de0, 0xa205, 0x11d0, 0x99, 0xcb, 0x00, 0xc0, 0x4f, 0xd6, 0x55, 0xe1); DEFINE_GUID(IID_INamespaceWalk, 0x57ced8a7, 0x3f4a, 0x432c, 0x93, 0x50, 0x30, 0xf2, 0x44, 0x83, 0xf7, 0x4f); DEFINE_GUID(IID_INamespaceWalkCB, 0xd92995f8, 0xcf5e, 0x4a76, 0xbf, 0x59, 0xea, 0xd3, 0x9e, 0xa2, 0xb9, 0x7e); diff --git a/modules/rostests/apitests/com/shdocvw.c b/modules/rostests/apitests/com/shdocvw.c index 5b746969d2a..34ea3efb43d 100644 --- a/modules/rostests/apitests/com/shdocvw.c +++ b/modules/rostests/apitests/com/shdocvw.c @@ -88,6 +88,13 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] = { 0x0, &IID_IUnknown }, } }, + { + ID_NAME(CLSID_MruPidlList), + { + { 0x0, &IID_IMruPidlList }, + { 0x0, &IID_IUnknown }, + } + }, { ID_NAME(CLSID_SH_FavBand), {

1 year

[reactos] 01/01: [REACTOS] Fix typos in comments (#5591)

by Andriy Shevchenko

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2ea03b5b22c9d22a949ce… commit 2ea03b5b22c9d22a949ce498276d494b8bdc758b Author: Andriy Shevchenko <nfxpnk(a)gmail.com> AuthorDate: Tue Aug 22 16:20:29 2023 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Aug 22 16:20:29 2023 +0300 [REACTOS] Fix typos in comments (#5591) Fixing typos in code comments enhances code readability and comprehension for developers and collaborators. --- sdk/lib/rtl/handle.c | 2 +- sdk/tools/rsym/rsym64.c | 2 +- sdk/tools/utf16le/utf16le.cpp | 2 +- sdk/tools/winesync/winesync.py | 2 +- subsystems/csr/csrsrv/procsup.c | 2 +- subsystems/csr/csrsrv/status.h | 4 ++-- subsystems/mvdm/ntvdm/bios/bios32/bios32.c | 2 +- subsystems/mvdm/ntvdm/cpu/cpu.c | 2 +- win32ss/drivers/miniport/vga_new/vga.c | 4 ++-- win32ss/gdi/eng/device.c | 2 +- win32ss/gdi/eng/ldevobj.c | 2 +- win32ss/gdi/ntgdi/gdipool.c | 2 +- win32ss/reactx/dxg/historic.c | 2 +- win32ss/reactx/ntddraw/d3d.c | 2 +- win32ss/user/ntuser/desktop.c | 2 +- win32ss/user/ntuser/hook.c | 2 +- win32ss/user/ntuser/hotkey.c | 4 ++-- win32ss/user/ntuser/input.c | 2 +- win32ss/user/ntuser/kbdlayout.c | 2 +- win32ss/user/ntuser/windc.c | 2 +- win32ss/user/user32/controls/ghost.c | 2 +- win32ss/user/user32/misc/misc.c | 2 +- 22 files changed, 25 insertions(+), 25 deletions(-) diff --git a/sdk/lib/rtl/handle.c b/sdk/lib/rtl/handle.c index 5c24199199b..d811f805be5 100644 --- a/sdk/lib/rtl/handle.c +++ b/sdk/lib/rtl/handle.c @@ -71,7 +71,7 @@ RtlAllocateHandle( /* Check if we are out of free handles entries */ if (HandleTable->FreeHandles == NULL) { - /* Check if we don't have uncomitted handle entries yet */ + /* Check if we don't have uncommitted handle entries yet */ if (HandleTable->UnCommittedHandles == NULL) { /* Use the maximum number of handle entries */ diff --git a/sdk/tools/rsym/rsym64.c b/sdk/tools/rsym/rsym64.c index 80861e4814f..07e5596fa08 100644 --- a/sdk/tools/rsym/rsym64.c +++ b/sdk/tools/rsym/rsym64.c @@ -781,7 +781,7 @@ ParsePEHeaders(PFILE_INFO File) File->UsedSections = 0; File->eh_frame.idx = -1; - /* Allocate array of chars, specifiying whether to copy the section */ + /* Allocate array of chars, specifying whether to copy the section */ File->UseSection = malloc(File->AllSections); for (i = 0; i < File->AllSections; i++) diff --git a/sdk/tools/utf16le/utf16le.cpp b/sdk/tools/utf16le/utf16le.cpp index 391205cbba5..cf41bc0f8c7 100644 --- a/sdk/tools/utf16le/utf16le.cpp +++ b/sdk/tools/utf16le/utf16le.cpp @@ -180,7 +180,7 @@ public: wchar_t ret = (wchar_t)-1; switch (encoding) { - case detect: // if still unknwon + case detect: // if still unknown encoding = utf8; // assume utf8 as default case utf8: unsigned char c, tmp; diff --git a/sdk/tools/winesync/winesync.py b/sdk/tools/winesync/winesync.py index cdee060db52..d596a5dd710 100644 --- a/sdk/tools/winesync/winesync.py +++ b/sdk/tools/winesync/winesync.py @@ -259,7 +259,7 @@ class wine_sync: return True, warning_message def revert_staged_patchset(self): - # revert all of this in one commmit + # revert all of this in one commit staged_patch_dir_path = os.path.join(self.reactos_src, self.staged_patch_dir) if not os.path.isdir(staged_patch_dir_path): return True diff --git a/subsystems/csr/csrsrv/procsup.c b/subsystems/csr/csrsrv/procsup.c index 7abf0d1f6d6..82b5dbbee3c 100644 --- a/subsystems/csr/csrsrv/procsup.c +++ b/subsystems/csr/csrsrv/procsup.c @@ -1048,7 +1048,7 @@ CsrLockProcessByClientId(IN HANDLE Pid, * @return TRUE if the reversion was succesful, FALSE otherwise. * * @remarks Impersonation can be recursive; as such, the impersonation token - * will only be deleted once the CSR Thread's impersonaton count + * will only be deleted once the CSR Thread's impersonation count * has reached zero. * *--*/ diff --git a/subsystems/csr/csrsrv/status.h b/subsystems/csr/csrsrv/status.h index c8b922f905a..1eebf18a820 100644 --- a/subsystems/csr/csrsrv/status.h +++ b/subsystems/csr/csrsrv/status.h @@ -14,7 +14,7 @@ * up the DosDevices Object Directory, and initializing each component. * * procsup.c - Handles all internal functions dealing with the CSR Process Object, - * including de/allocation, de/referencing, un/locking, prority, and + * including de/allocation, de/referencing, un/locking, priority, and * lookups. Also handles all external APIs which touch the CSR Process Object. * * server.c - Handles all internal functions related to loading and managing Server @@ -24,7 +24,7 @@ * * session.c - Handles all internal functions dealing with the CSR Session Object, * including de/allocation, de/referencing, and un/locking. Holds the SB API - * Dispatch/Name Tables and the public CsrSv API Interface for commmunication + * Dispatch/Name Tables and the public CsrSv API Interface for communication * with the Session Manager. * * thredsup.c - Handles all internal functions dealing with the CSR Thread Object, diff --git a/subsystems/mvdm/ntvdm/bios/bios32/bios32.c b/subsystems/mvdm/ntvdm/bios/bios32/bios32.c index 95b2a31f0cf..a5c06c5295f 100644 --- a/subsystems/mvdm/ntvdm/bios/bios32/bios32.c +++ b/subsystems/mvdm/ntvdm/bios/bios32/bios32.c @@ -442,7 +442,7 @@ static VOID WINAPI BiosMiscService(LPWORD Stack) case 0xC2: { // FIXME: Reenable this call when we understand why - // our included mouse driver doesn't correctly reeanble + // our included mouse driver doesn't correctly reenable // mouse reporting! // BiosMousePs2Interface(Stack); // break; diff --git a/subsystems/mvdm/ntvdm/cpu/cpu.c b/subsystems/mvdm/ntvdm/cpu/cpu.c index 2fcbc00dd80..1e0cc03c21a 100644 --- a/subsystems/mvdm/ntvdm/cpu/cpu.c +++ b/subsystems/mvdm/ntvdm/cpu/cpu.c @@ -131,7 +131,7 @@ LONG CpuExceptionFilter(IN PEXCEPTION_POINTERS ExceptionInfo) /* * Check whether the access exception was done inside the virtual memory space - * (caused by an emulated app) or outside (casued by a bug in ourselves). + * (caused by an emulated app) or outside (caused by a bug in ourselves). */ if (Address < (ULONG_PTR)BaseAddress || Address >= (ULONG_PTR)BaseAddress + MAX_ADDRESS) diff --git a/win32ss/drivers/miniport/vga_new/vga.c b/win32ss/drivers/miniport/vga_new/vga.c index 41906254181..1b2da4b548b 100644 --- a/win32ss/drivers/miniport/vga_new/vga.c +++ b/win32ss/drivers/miniport/vga_new/vga.c @@ -749,10 +749,10 @@ Return Value: // eVb: 1.13 [END] // - // Always return succcess since settings the text mode will fail on + // Always return success since settings the text mode will fail on // non-x86. // - // Also, failiure to set the text mode is not fatal in any way, since + // Also, failure to set the text mode is not fatal in any way, since // this operation must be followed by another set mode operation. // diff --git a/win32ss/gdi/eng/device.c b/win32ss/gdi/eng/device.c index ed6c00435e2..d9f6b8a9465 100644 --- a/win32ss/gdi/eng/device.c +++ b/win32ss/gdi/eng/device.c @@ -200,7 +200,7 @@ EngpUpdateGraphicsDeviceList(VOID) ERR("VGA adapter = %lu\n", iVGACompatible); } - /* Get the maximum mumber of adapters */ + /* Get the maximum number of adapters */ if (!RegReadDWORD(hkey, L"MaxObjectNumber", &ulMaxObjectNumber)) { ERR("Could not read MaxObjectNumber, defaulting to 0.\n"); diff --git a/win32ss/gdi/eng/ldevobj.c b/win32ss/gdi/eng/ldevobj.c index 9582c8e943a..b4f13b88d19 100644 --- a/win32ss/gdi/eng/ldevobj.c +++ b/win32ss/gdi/eng/ldevobj.c @@ -407,7 +407,7 @@ LDEVOBJ_pLoadDriver( /* Check if the ldev is associated with a file */ if (pldev->pGdiDriverInfo) { - /* Check for match (case insensative) */ + /* Check for match (case insensitive) */ if (RtlEqualUnicodeString(&pldev->pGdiDriverInfo->DriverName, &strDriverName, TRUE)) { /* Image found in LDEV list */ diff --git a/win32ss/gdi/ntgdi/gdipool.c b/win32ss/gdi/ntgdi/gdipool.c index d85972f38dd..9a19cbea1b6 100644 --- a/win32ss/gdi/ntgdi/gdipool.c +++ b/win32ss/gdi/ntgdi/gdipool.c @@ -184,7 +184,7 @@ GdiPoolAllocate( cjOffset = ulIndex * pPool->cjAllocSize; pvAlloc = (PVOID)((ULONG_PTR)pSection->pvBaseAddress + cjOffset); - /* Check if memory is comitted */ + /* Check if memory is committed */ ulPageBit = 1 << (cjOffset / PAGE_SIZE); ulPageBit |= 1 << ((cjOffset + pPool->cjAllocSize - 1) / PAGE_SIZE); if ((pSection->ulCommitBitmap & ulPageBit) != ulPageBit) diff --git a/win32ss/reactx/dxg/historic.c b/win32ss/reactx/dxg/historic.c index a24eee8c634..e25d3196f94 100644 --- a/win32ss/reactx/dxg/historic.c +++ b/win32ss/reactx/dxg/historic.c @@ -18,7 +18,7 @@ * The function DxDxgGenericThunk redirects DirectX calls to other functions. * * @param ULONG_PTR ulIndex -* The functions we want redirct +* The functions we want to redirect * * @param ULONG_PTR ulHandle * Unknown diff --git a/win32ss/reactx/ntddraw/d3d.c b/win32ss/reactx/ntddraw/d3d.c index 07eb7297829..8eb87a5879f 100644 --- a/win32ss/reactx/ntddraw/d3d.c +++ b/win32ss/reactx/ntddraw/d3d.c @@ -135,7 +135,7 @@ NtGdiD3dContextCreate(HANDLE hDirectDrawLocal, * @name NtGdiD3dContextDestroy * @implemented * -* The Function NtGdiD3dContextDestroy destorys the context data we got from NtGdiD3dContextCreate +* The Function NtGdiD3dContextDestroy destroys the context data we got from NtGdiD3dContextCreate * It redirects to dxg.sys in windows XP/2003, dxkrnl.sys in vista and is fully implemented * in win32k.sys in windows 2000 and below * diff --git a/win32ss/user/ntuser/desktop.c b/win32ss/user/ntuser/desktop.c index 16b7aa0b8c2..7f200cbfc92 100644 --- a/win32ss/user/ntuser/desktop.c +++ b/win32ss/user/ntuser/desktop.c @@ -170,7 +170,7 @@ IntDesktopObjectDelete( if (pdesk->spwndMessage) co_UserDestroyWindow(pdesk->spwndMessage); - /* Remove the desktop from the window station's list of associcated desktops */ + /* Remove the desktop from the window station's list of associated desktops */ RemoveEntryList(&pdesk->ListEntry); /* Free the heap */ diff --git a/win32ss/user/ntuser/hook.c b/win32ss/user/ntuser/hook.c index 8f82d5b2f46..b9879c01320 100644 --- a/win32ss/user/ntuser/hook.c +++ b/win32ss/user/ntuser/hook.c @@ -43,7 +43,7 @@ IntLoadHookModule(int iHookID, HHOOK hHook, BOOL Unload) { /* A callback in user mode can trigger UserLoadApiHook to be called and as a result IntLoadHookModule will be called recursively. - To solve this we set the flag that means that the appliaction has + To solve this we set the flag that means that the application has loaded the api hook before the callback and in case of error we remove it */ ppi->W32PF_flags |= W32PF_APIHOOKLOADED; diff --git a/win32ss/user/ntuser/hotkey.c b/win32ss/user/ntuser/hotkey.c index 93b43d100d8..d2ae2c4766f 100644 --- a/win32ss/user/ntuser/hotkey.c +++ b/win32ss/user/ntuser/hotkey.c @@ -7,7 +7,7 @@ */ /* - * FIXME: Hotkey notifications are triggered by keyboard input (physical or programatically) + * FIXME: Hotkey notifications are triggered by keyboard input (physical or programmatically) * and since only desktops on WinSta0 can receive input in seems very wrong to allow * windows/threads on destops not belonging to WinSta0 to set hotkeys (receive notifications). * -- Gunnar @@ -52,7 +52,7 @@ StartDebugHotKeys(VOID) } UserRegisterHotKey(PWND_BOTTOM, IDHK_SHIFTF12, MOD_SHIFT, vk); UserRegisterHotKey(PWND_BOTTOM, IDHK_F12, 0, vk); - TRACE("Start up the debugger hotkeys!! If you see this you eneabled debugprints. Congrats!\n"); + TRACE("Start up the debugger hotkeys!! If you see this you enabled debugprints. Congrats!\n"); } /* diff --git a/win32ss/user/ntuser/input.c b/win32ss/user/ntuser/input.c index 9c2c69b353c..f153bcf59a6 100644 --- a/win32ss/user/ntuser/input.c +++ b/win32ss/user/ntuser/input.c @@ -42,7 +42,7 @@ IntLastInputTick(BOOL bUpdate) /* * DoTheScreenSaver * - * Check if scrensaver should be started and sends message to SAS window + * Check if screensaver should be started and sends message to SAS window */ VOID FASTCALL DoTheScreenSaver(VOID) diff --git a/win32ss/user/ntuser/kbdlayout.c b/win32ss/user/ntuser/kbdlayout.c index ef66cad9ddc..33875c2cebf 100644 --- a/win32ss/user/ntuser/kbdlayout.c +++ b/win32ss/user/ntuser/kbdlayout.c @@ -579,7 +579,7 @@ IntReorderKeyboardLayouts( /* * UserSetDefaultInputLang * - * Sets default kyboard layout for system. Called from UserSystemParametersInfo. + * Sets default keyboard layout for system. Called from UserSystemParametersInfo. */ BOOL NTAPI diff --git a/win32ss/user/ntuser/windc.c b/win32ss/user/ntuser/windc.c index 9a4a7dde211..0f2d2781e30 100644 --- a/win32ss/user/ntuser/windc.c +++ b/win32ss/user/ntuser/windc.c @@ -1022,7 +1022,7 @@ NtUserGetDC(HWND hWnd) * Select logical palette into device context. * \param hDC handle to the device context * \param hpal handle to the palette - * \param ForceBackground If this value is FALSE the logical palette will be copied to the device palette only when the applicatioon + * \param ForceBackground If this value is FALSE the logical palette will be copied to the device palette only when the application * is in the foreground. If this value is TRUE then map the colors in the logical palette to the device * palette colors in the best way. * \return old palette diff --git a/win32ss/user/user32/controls/ghost.c b/win32ss/user/user32/controls/ghost.c index 0abc0648731..dac759f3843 100644 --- a/win32ss/user/user32/controls/ghost.c +++ b/win32ss/user/user32/controls/ghost.c @@ -331,7 +331,7 @@ Ghost_OnNCPaint(HWND hwnd, HRGN hrgn, BOOL bUnicode) { HDC hdc; - // do the default behaivour + // do the default behaviour if (bUnicode) DefWindowProcW(hwnd, WM_NCPAINT, (WPARAM)hrgn, 0); else diff --git a/win32ss/user/user32/misc/misc.c b/win32ss/user/user32/misc/misc.c index 621ec567f8e..d834697b6a1 100644 --- a/win32ss/user/user32/misc/misc.c +++ b/win32ss/user/user32/misc/misc.c @@ -61,7 +61,7 @@ GetW32ThreadInfo(VOID) * 2) pSecurityInfo - type of information to retrieve * 3) pSecurityDescriptor - buffer which receives descriptor * 4) dwLength - size, in bytes, of buffer 'pSecurityDescriptor' - * 5) pdwLengthNeeded - reseives actual size of descriptor + * 5) pdwLengthNeeded - receives actual size of the descriptor * * Return Vaules: * TRUE on success

1 year

[reactos] 01/01: [SHLWAPI][SDK][SHELL32_APITEST][SHLWAPI_WINETEST] Property Bag on Desktop Upgrade (#5590)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a2d8e464c805122243f47… commit a2d8e464c805122243f474801d2c96f2d40eca8d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Aug 22 12:01:20 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Aug 22 12:01:20 2023 +0900 [SHLWAPI][SDK][SHELL32_APITEST][SHLWAPI_WINETEST] Property Bag on Desktop Upgrade (#5590) - Add CDesktopUpgradePropertyBag class. - Implement SHGetDesktopUpgradePropertyBag function. CORE-9283 --- dll/win32/shlwapi/ordinal.c | 2 + dll/win32/shlwapi/propbag.cpp | 195 ++++++++++++++++++++++- modules/rostests/apitests/shell32/ShellState.cpp | 3 +- modules/rostests/winetests/shlwapi/ordinal.c | 5 + sdk/include/reactos/shlwapi_undoc.h | 19 +++ 5 files changed, 221 insertions(+), 3 deletions(-) diff --git a/dll/win32/shlwapi/ordinal.c b/dll/win32/shlwapi/ordinal.c index 6f8855fd10a..985b79a9f40 100644 --- a/dll/win32/shlwapi/ordinal.c +++ b/dll/win32/shlwapi/ordinal.c @@ -4505,6 +4505,7 @@ BOOL WINAPI SHSkipJunction(IBindCtx *pbc, const CLSID *pclsid) */ HKEY WINAPI SHGetShellKey(DWORD flags, LPCWSTR sub_key, BOOL create) { +#ifndef __REACTOS__ enum _shellkey_flags { SHKEY_Root_HKCU = 0x1, SHKEY_Root_HKLM = 0x2, @@ -4520,6 +4521,7 @@ HKEY WINAPI SHGetShellKey(DWORD flags, LPCWSTR sub_key, BOOL create) SHKEY_Subkey_MUICache = 0x5000, SHKEY_Subkey_FileExts = 0x6000 }; +#endif static const WCHAR explorerW[] = {'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\', diff --git a/dll/win32/shlwapi/propbag.cpp b/dll/win32/shlwapi/propbag.cpp index ce65aa6c6a0..fbd5b87a49b 100644 --- a/dll/win32/shlwapi/propbag.cpp +++ b/dll/win32/shlwapi/propbag.cpp @@ -719,7 +719,7 @@ SHGetIniStringUTF7W( return SHGetIniStringW(lpAppName, lpKeyName + 1, lpReturnedString, nSize, lpFileName); return GetPrivateProfileStringW(lpAppName, lpKeyName, L"", lpReturnedString, nSize, lpFileName); -} +} /************************************************************************** * SHSetIniStringUTF7W (SHLWAPI.474) @@ -995,3 +995,196 @@ SHCreatePropertyBagOnProfileSection( return pIniPB->QueryInterface(riid, ppvObj); } + +class CDesktopUpgradePropertyBag : public CBasePropertyBag +{ +protected: + BOOL _AlreadyUpgraded(HKEY hKey); + VOID _MarkAsUpgraded(HKEY hkey); + HRESULT _ReadFlags(VARIANT *pvari); + HRESULT _ReadItemPositions(VARIANT *pvari); + IStream* _GetOldDesktopViewStream(); + IStream* _NewStreamFromOld(IStream *pOldStream); + +public: + CDesktopUpgradePropertyBag() : CBasePropertyBag(0) { } + + STDMETHODIMP Read( + _In_z_ LPCWSTR pszPropName, + _Inout_ VARIANT *pvari, + _Inout_opt_ IErrorLog *pErrorLog) override; + + STDMETHODIMP Write(_In_z_ LPCWSTR pszPropName, _In_ VARIANT *pvari) override + { + return E_NOTIMPL; + } +}; + +VOID CDesktopUpgradePropertyBag::_MarkAsUpgraded(HKEY hkey) +{ + DWORD dwValue = TRUE; + SHSetValueW(hkey, NULL, L"Upgrade", REG_DWORD, &dwValue, sizeof(dwValue)); +} + +BOOL CDesktopUpgradePropertyBag::_AlreadyUpgraded(HKEY hKey) +{ + // Check the existence of the value written in _MarkAsUpgraded. + DWORD dwValue, cbData = sizeof(dwValue); + return SHGetValueW(hKey, NULL, L"Upgrade", NULL, &dwValue, &cbData) == ERROR_SUCCESS; +} + +typedef DWORDLONG DESKVIEW_FLAGS; // 64-bit data + +HRESULT CDesktopUpgradePropertyBag::_ReadFlags(VARIANT *pvari) +{ + DESKVIEW_FLAGS Flags; + DWORD cbValue = sizeof(Flags); + if (SHGetValueW(HKEY_CURRENT_USER, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\DeskView", + L"Settings", + NULL, + &Flags, + &cbValue) != ERROR_SUCCESS || cbValue < sizeof(Flags)) + { + return E_FAIL; + } + + V_UINT(pvari) = ((UINT)(Flags >> 32)) | 0x220; // FIXME: Magic number + V_VT(pvari) = VT_UINT; + return S_OK; +} + +typedef struct tagOLD_STREAM_HEADER +{ + WORD wMagic; + WORD awUnknown[6]; + WORD wSize; +} OLD_STREAM_HEADER, *POLD_STREAM_HEADER; + +IStream* CDesktopUpgradePropertyBag::_NewStreamFromOld(IStream *pOldStream) +{ + OLD_STREAM_HEADER Header; + HRESULT hr = pOldStream->Read(&Header, sizeof(Header), NULL); + if (FAILED(hr) || Header.wMagic != 28) + return NULL; + + // Move stream pointer + LARGE_INTEGER li; + li.QuadPart = Header.wSize - sizeof(Header); + hr = pOldStream->Seek(li, STREAM_SEEK_CUR, NULL); + if (FAILED(hr)) + return NULL; + + // Get the size + ULARGE_INTEGER uli; + hr = IStream_Size(pOldStream, &uli); + if (FAILED(hr)) + return NULL; + + // Create new stream and attach + CComPtr<IStream> pNewStream; + pNewStream.Attach(SHCreateMemStream(NULL, 0)); + if (!pNewStream) + return NULL; + + // Subtract Header.wSize from the size + uli.QuadPart -= Header.wSize; + + // Copy to pNewStream + hr = pOldStream->CopyTo(pNewStream, uli, NULL, NULL); + if (FAILED(hr)) + return NULL; + + li.QuadPart = 0; + pNewStream->Seek(li, STREAM_SEEK_SET, NULL); + + return pNewStream.Detach(); +} + +IStream* CDesktopUpgradePropertyBag::_GetOldDesktopViewStream() +{ + HKEY hKey = SHGetShellKey(SHKEY_Root_HKCU, L"Streams\\Desktop", FALSE); + if (!hKey) + return NULL; + + CComPtr<IStream> pOldStream; + if (!_AlreadyUpgraded(hKey)) + { + pOldStream.Attach(SHOpenRegStream2W(hKey, NULL, L"ViewView2", 0)); + if (pOldStream) + { + ULARGE_INTEGER uli; + HRESULT hr = IStream_Size(pOldStream, &uli); + if (SUCCEEDED(hr) && !uli.QuadPart) + pOldStream.Release(); + } + + if (!pOldStream) + pOldStream.Attach(SHOpenRegStream2W(hKey, NULL, L"ViewView", 0)); + + _MarkAsUpgraded(hKey); + } + + ::RegCloseKey(hKey); + return pOldStream.Detach(); +} + +HRESULT CDesktopUpgradePropertyBag::_ReadItemPositions(VARIANT *pvari) +{ + CComPtr<IStream> pOldStream; + pOldStream.Attach(_GetOldDesktopViewStream()); + if (!pOldStream) + return E_FAIL; + + HRESULT hr = E_FAIL; + IStream *pNewStream = _NewStreamFromOld(pOldStream); + if (pNewStream) + { + V_UNKNOWN(pvari) = pNewStream; + V_VT(pvari) = VT_UNKNOWN; + hr = S_OK; + } + + return hr; +} + +STDMETHODIMP +CDesktopUpgradePropertyBag::Read( + _In_z_ LPCWSTR pszPropName, + _Inout_ VARIANT *pvari, + _Inout_opt_ IErrorLog *pErrorLog) +{ + UNREFERENCED_PARAMETER(pErrorLog); + + VARTYPE vt = V_VT(pvari); + + HRESULT hr = E_FAIL; + if (StrCmpW(L"FFlags", pszPropName) == 0) + hr = _ReadFlags(pvari); + else if (StrCmpNW(L"ItemPos", pszPropName, 7) == 0) + hr = _ReadItemPositions(pvari); + + if (FAILED(hr)) + { + ::VariantInit(pvari); + return hr; + } + + return ::VariantChangeType(pvari, pvari, 0, vt); +} + +/************************************************************************** + * SHGetDesktopUpgradePropertyBag (Not exported; used in CViewStatePropertyBag) + * + * Creates or gets a property bag object for desktop upgrade + * + * @param riid Specifies either IID_IUnknown, IID_IPropertyBag or IID_IPropertyBag2. + * @param ppvObj Receives an IPropertyBag pointer. + * @return An HRESULT value. S_OK on success, non-zero on failure. + */ +HRESULT SHGetDesktopUpgradePropertyBag(REFIID riid, void **ppvObj) +{ + *ppvObj = NULL; + CComPtr<CDesktopUpgradePropertyBag> pPropBag(new CDesktopUpgradePropertyBag()); + return pPropBag->QueryInterface(riid, ppvObj); +} diff --git a/modules/rostests/apitests/shell32/ShellState.cpp b/modules/rostests/apitests/shell32/ShellState.cpp index 7c50806d2fd..97ae49c719a 100644 --- a/modules/rostests/apitests/shell32/ShellState.cpp +++ b/modules/rostests/apitests/shell32/ShellState.cpp @@ -12,6 +12,7 @@ #include <shellutils.h> #include <strsafe.h> #include <shlwapi.h> +#include <shlwapi_undoc.h> /* [HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer] */ /* The contents of RegValue ShellState. */ @@ -72,8 +73,6 @@ static int read_key(REGSHELLSTATE *prss) return 0; } -extern "C" HKEY WINAPI SHGetShellKey(DWORD flags, LPCWSTR sub_key, BOOL create); - static int read_advanced_key(SHELLSTATE* pss) { HKEY hKey; diff --git a/modules/rostests/winetests/shlwapi/ordinal.c b/modules/rostests/winetests/shlwapi/ordinal.c index cd9231351e6..f4ea269f2ce 100644 --- a/modules/rostests/winetests/shlwapi/ordinal.c +++ b/modules/rostests/winetests/shlwapi/ordinal.c @@ -33,6 +33,9 @@ #include "docobj.h" #include "shobjidl.h" #include "shlobj.h" +#ifdef __REACTOS__ + #include <shlwapi_undoc.h> +#endif /* Function ptrs for ordinal calls */ static HMODULE hShlwapi; @@ -2796,6 +2799,7 @@ static void test_SHSetIniString(void) DeleteFileW(TestIniW); } +#ifndef __REACTOS__ enum _shellkey_flags { SHKEY_Root_HKCU = 0x1, SHKEY_Root_HKLM = 0x2, @@ -2811,6 +2815,7 @@ enum _shellkey_flags { SHKEY_Subkey_MUICache = 0x5000, SHKEY_Subkey_FileExts = 0x6000 }; +#endif static void test_SHGetShellKey(void) { diff --git a/sdk/include/reactos/shlwapi_undoc.h b/sdk/include/reactos/shlwapi_undoc.h index 270bc344291..37363db934b 100644 --- a/sdk/include/reactos/shlwapi_undoc.h +++ b/sdk/include/reactos/shlwapi_undoc.h @@ -217,6 +217,25 @@ SHSetIniStringUTF7W( _In_opt_z_ LPCWSTR lpString, _In_z_ LPCWSTR lpFileName); +enum _shellkey_flags +{ + SHKEY_Root_HKCU = 0x1, + SHKEY_Root_HKLM = 0x2, + SHKEY_Key_Explorer = 0x00, + SHKEY_Key_Shell = 0x10, + SHKEY_Key_ShellNoRoam = 0x20, + SHKEY_Key_Classes = 0x30, + SHKEY_Subkey_Default = 0x0000, + SHKEY_Subkey_ResourceName = 0x1000, + SHKEY_Subkey_Handlers = 0x2000, + SHKEY_Subkey_Associations = 0x3000, + SHKEY_Subkey_Volatile = 0x4000, + SHKEY_Subkey_MUICache = 0x5000, + SHKEY_Subkey_FileExts = 0x6000 +}; + +HKEY WINAPI SHGetShellKey(DWORD flags, LPCWSTR sub_key, BOOL create); + int WINAPIV ShellMessageBoxWrapW(

1 year

[reactos] 01/01: [KMTEST:TcpIp] Use 10 second timeout value instead of INFINITE (#5586)

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e7cb6f49209b95fcac7fc… commit e7cb6f49209b95fcac7fcf55918cb29289abe455 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Aug 21 21:46:20 2023 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Aug 21 21:46:20 2023 +0300 [KMTEST:TcpIp] Use 10 second timeout value instead of INFINITE (#5586) * [KMTEST:TcpIp] Use 10 second timeout value instead of INFINITE On x64 the test sometimes fails to connect and then times out on the testbot, causing the system to be rebooted. Co-authored-by: Stanislav Motylkov <x86corez(a)gmail.com> --- modules/rostests/kmtests/tcpip/TcpIp_user.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/rostests/kmtests/tcpip/TcpIp_user.c b/modules/rostests/kmtests/tcpip/TcpIp_user.c index 60286d2e48a..f28972ff21c 100644 --- a/modules/rostests/kmtests/tcpip/TcpIp_user.c +++ b/modules/rostests/kmtests/tcpip/TcpIp_user.c @@ -113,7 +113,8 @@ START_TEST(TcpIpConnect) Error = KmtSendToDriver(IOCTL_TEST_CONNECT); ok_eq_ulong(Error, ERROR_SUCCESS); - WaitForSingleObject(AcceptThread, INFINITE); + Error = WaitForSingleObject(AcceptThread, 10 * 1000); + ok(Error == WAIT_OBJECT_0, "AcceptThread timed out\n"); UnloadTcpIpTestDriver();

1 year

[reactos] 01/01: [KERNEL32] Add CompareStringOrdinal from wine-3.21

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3a0b53386c2126a44f02c… commit 3a0b53386c2126a44f02c7787381612c4b9434a1 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Aug 13 15:43:10 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Aug 20 15:17:41 2023 +0300 [KERNEL32] Add CompareStringOrdinal from wine-3.21 --- dll/win32/kernel32/kernel32.spec | 2 +- dll/win32/kernel32/winnls/string/lang.c | 25 ++++++++++++++++++++++++- sdk/include/ndk/rtlfuncs.h | 12 ++++++++++++ 3 files changed, 37 insertions(+), 2 deletions(-) diff --git a/dll/win32/kernel32/kernel32.spec b/dll/win32/kernel32/kernel32.spec index f1b6314052c..2853c50d579 100644 --- a/dll/win32/kernel32/kernel32.spec +++ b/dll/win32/kernel32/kernel32.spec @@ -87,7 +87,7 @@ @ stdcall CompareFileTime(ptr ptr) @ stdcall CompareStringA(long long str long str long) @ stdcall -version=0x600+ CompareStringEx(wstr long wstr long wstr long ptr ptr ptr) -@ stdcall -stub -version=0x600+ CompareStringOrdinal(wstr long wstr long long) +@ stdcall -version=0x600+ CompareStringOrdinal(wstr long wstr long long) @ stdcall CompareStringW(long long wstr long wstr long) @ stdcall ConnectNamedPipe(long ptr) ;@ stdcall -arch=x86_64 ConsoleIMERoutine() diff --git a/dll/win32/kernel32/winnls/string/lang.c b/dll/win32/kernel32/winnls/string/lang.c index 51f1edf0175..1d3fdbe4a1b 100644 --- a/dll/win32/kernel32/winnls/string/lang.c +++ b/dll/win32/kernel32/winnls/string/lang.c @@ -33,7 +33,7 @@ DEBUG_CHANNEL(nls); #endif #undef WINVER -#define WINVER 0x600 +#define WINVER DLL_EXPORT_VERSION /* From winnls.h */ #define LOCALE_NAME_USER_DEFAULT NULL @@ -2765,6 +2765,29 @@ INT WINAPI CompareStringA(LCID lcid, DWORD flags, return ret; } +#if (WINVER >= 0x0600) +/****************************************************************************** + * CompareStringOrdinal (KERNEL32.@) + */ +INT WINAPI CompareStringOrdinal(const WCHAR *str1, INT len1, const WCHAR *str2, INT len2, BOOL ignore_case) +{ + int ret; + + if (!str1 || !str2) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + if (len1 < 0) len1 = strlenW(str1); + if (len2 < 0) len2 = strlenW(str2); + + ret = RtlCompareUnicodeStrings( str1, len1, str2, len2, ignore_case ); + if (ret < 0) return CSTR_LESS_THAN; + if (ret > 0) return CSTR_GREATER_THAN; + return CSTR_EQUAL; +} +#endif + #ifdef __REACTOS__ HANDLE NLS_RegOpenKey(HANDLE hRootKey, LPCWSTR szKeyName) #else diff --git a/sdk/include/ndk/rtlfuncs.h b/sdk/include/ndk/rtlfuncs.h index 05dc37686ba..47830b87990 100644 --- a/sdk/include/ndk/rtlfuncs.h +++ b/sdk/include/ndk/rtlfuncs.h @@ -2123,6 +2123,18 @@ RtlCompareUnicodeString( BOOLEAN CaseInsensitive ); +_Must_inspect_result_ +NTSYSAPI +LONG +NTAPI +RtlCompareUnicodeStrings( + _In_reads_(String1Length) PCWCH String1, + _In_ SIZE_T String1Length, + _In_reads_(String2Length) PCWCH String2, + _In_ SIZE_T String2Length, + _In_ BOOLEAN CaseInSensitive +); + NTSYSAPI VOID NTAPI

1 year, 1 month

[reactos] 01/01: [MSPAINT] Sync translations between the main and popup menus

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dafa00b554319ef6c5c01… commit dafa00b554319ef6c5c0129f3c0103576c6882f1 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sun Aug 20 12:06:04 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun Aug 20 12:06:08 2023 +0300 [MSPAINT] Sync translations between the main and popup menus Also some minor corrections and fixes for mnemonic keys. --- base/applications/mspaint/lang/bg-BG.rc | 54 ++++++++++++++++----------------- base/applications/mspaint/lang/cs-CZ.rc | 50 +++++++++++++++--------------- base/applications/mspaint/lang/de-DE.rc | 52 +++++++++++++++---------------- base/applications/mspaint/lang/en-GB.rc | 8 ++--- base/applications/mspaint/lang/en-US.rc | 8 ++--- base/applications/mspaint/lang/es-ES.rc | 54 ++++++++++++++++----------------- base/applications/mspaint/lang/et-EE.rc | 26 ++++++++-------- base/applications/mspaint/lang/eu-ES.rc | 54 ++++++++++++++++----------------- base/applications/mspaint/lang/fr-FR.rc | 54 ++++++++++++++++----------------- base/applications/mspaint/lang/he-IL.rc | 20 ++++++------ base/applications/mspaint/lang/hu-HU.rc | 54 ++++++++++++++++----------------- base/applications/mspaint/lang/id-ID.rc | 20 ++++++------ base/applications/mspaint/lang/it-IT.rc | 52 +++++++++++++++---------------- base/applications/mspaint/lang/ja-JP.rc | 4 +-- base/applications/mspaint/lang/nl-NL.rc | 52 +++++++++++++++---------------- base/applications/mspaint/lang/no-NO.rc | 54 ++++++++++++++++----------------- base/applications/mspaint/lang/pl-PL.rc | 2 +- base/applications/mspaint/lang/pt-BR.rc | 22 +++++++------- base/applications/mspaint/lang/pt-PT.rc | 20 ++++++------ base/applications/mspaint/lang/ro-RO.rc | 36 +++++++++++----------- base/applications/mspaint/lang/sk-SK.rc | 50 +++++++++++++++--------------- base/applications/mspaint/lang/sq-AL.rc | 38 +++++++++++------------ base/applications/mspaint/lang/sv-SE.rc | 50 +++++++++++++++--------------- base/applications/mspaint/lang/tr-TR.rc | 20 ++++++------ base/applications/mspaint/lang/uk-UA.rc | 50 +++++++++++++++--------------- base/applications/mspaint/lang/vi-VN.rc | 30 +++++++++--------- base/applications/mspaint/lang/zh-CN.rc | 24 +++++++-------- base/applications/mspaint/lang/zh-HK.rc | 24 +++++++-------- base/applications/mspaint/lang/zh-TW.rc | 24 +++++++-------- 29 files changed, 503 insertions(+), 503 deletions(-) diff --git a/base/applications/mspaint/lang/bg-BG.rc b/base/applications/mspaint/lang/bg-BG.rc index cfc791946ae..cf525cd4514 100644 --- a/base/applications/mspaint/lang/bg-BG.rc +++ b/base/applications/mspaint/lang/bg-BG.rc @@ -37,18 +37,18 @@ BEGIN END POPUP "&Обработка" BEGIN - MENUITEM "Назад\tCtrl+Z", IDM_EDITUNDO - MENUITEM "Напред\tCtrl+Y", IDM_EDITREDO + MENUITEM "&Назад\tCtrl+Z", IDM_EDITUNDO + MENUITEM "Н&апред\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Отрязване\tCtrl+X", IDM_EDITCUT - MENUITEM "Копиране\tCtrl+C", IDM_EDITCOPY - MENUITEM "Поставяне\tCtrl+V", IDM_EDITPASTE - MENUITEM "Изтриване на избраното\tDel", IDM_EDITDELETESELECTION - MENUITEM "Обръщане на избора", IDM_EDITINVERTSELECTION - MENUITEM "Избиране на всичко\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "От&рязване\tCtrl+X", IDM_EDITCUT + MENUITEM "&Запомняне\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Поставяне\tCtrl+V", IDM_EDITPASTE + MENUITEM "&Изтриване на избраното\tDel", IDM_EDITDELETESELECTION + MENUITEM "О&бръщане на избора", IDM_EDITINVERTSELECTION + MENUITEM "Избиране на &всичко\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Запомняне в...", IDM_EDITCOPYTO - MENUITEM "Поставяне в...", IDM_EDITPASTEFROM + MENUITEM "Запо&мняне в...", IDM_EDITCOPYTO + MENUITEM "По&ставяне в...", IDM_EDITPASTEFROM END POPUP "Из&глед" BEGIN @@ -77,13 +77,13 @@ BEGIN END POPUP "Из&ображение" BEGIN - MENUITEM "Завъртане\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Разпъване/Изкривяване\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Изрязване", IDM_IMAGECROP - MENUITEM "Обръщане на цветовете\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "Принадлежности\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Изтриване на изображението\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE - MENUITEM "Непрозрачно изчертаване", IDM_IMAGEDRAWOPAQUE + MENUITEM "З&авъртане...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "Разпъва&не/Изкривяване...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "Из&рязване", IDM_IMAGECROP + MENUITEM "&Обръщане на цветовете\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Принадлежности\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "&Изтриване на изображението\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "Непрозра&чно изчертаване", IDM_IMAGEDRAWOPAQUE END POPUP "&Цветове" BEGIN @@ -104,18 +104,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "От&рязване\tCtrl+X", IDM_EDITCUT + MENUITEM "&Запомняне\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Поставяне\tCtrl+V", IDM_EDITPASTE + MENUITEM "&Изтриване на избраното\tDel", IDM_EDITDELETESELECTION + MENUITEM "Избиране на &всичко\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Запо&мняне в...", IDM_EDITCOPYTO + MENUITEM "По&ставяне в...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "З&авъртане...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "Разпъва&не/Изкривяване...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Обръщане на цветовете\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/cs-CZ.rc b/base/applications/mspaint/lang/cs-CZ.rc index 32d33bf98d2..c6a8c018a83 100644 --- a/base/applications/mspaint/lang/cs-CZ.rc +++ b/base/applications/mspaint/lang/cs-CZ.rc @@ -37,18 +37,18 @@ BEGIN END POPUP "Úpr&avy" BEGIN - MENUITEM "Zpět\tCtrl+Z", IDM_EDITUNDO - MENUITEM "Znovu\tCtrl+Y", IDM_EDITREDO + MENUITEM "&Zpět\tCtrl+Z", IDM_EDITUNDO + MENUITEM "Z&novu\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Vyjmout\tCtrl+X", IDM_EDITCUT - MENUITEM "Kopírovat\tCtrl+C", IDM_EDITCOPY - MENUITEM "Vložit\tCtrl+V", IDM_EDITPASTE - MENUITEM "Vymazat výběr\tDel", IDM_EDITDELETESELECTION - MENUITEM "Invertovat výběr", IDM_EDITINVERTSELECTION + MENUITEM "Vyjmou&t\tCtrl+X", IDM_EDITCUT + MENUITEM "&Kopírovat\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Vložit\tCtrl+V", IDM_EDITPASTE + MENUITEM "Vy&mazat výběr\tDel", IDM_EDITDELETESELECTION + MENUITEM "&Invertovat výběr", IDM_EDITINVERTSELECTION MENUITEM "Vybrat v&še\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Kopírovat do...", IDM_EDITCOPYTO - MENUITEM "Vložit z...", IDM_EDITPASTEFROM + MENUITEM "Kopírovat &do...", IDM_EDITCOPYTO + MENUITEM "V&ložit z...", IDM_EDITPASTEFROM END POPUP "&Zobrazit" BEGIN @@ -77,13 +77,13 @@ BEGIN END POPUP "&Obrázek" BEGIN - MENUITEM "Překlopit nebo otočit...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Oříznout", IDM_IMAGECROP - MENUITEM "Inverovat barvy\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "Atributy...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Vymazat obrázek", IDM_IMAGEDELETEIMAGE - MENUITEM "Kreslit neprůhledně", IDM_IMAGEDRAWOPAQUE + MENUITEM "&Překlopit nebo otočit...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Oříznout", IDM_IMAGECROP + MENUITEM "&Inverovat barvy\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Atributy...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "Vy&mazat obrázek", IDM_IMAGEDELETEIMAGE + MENUITEM "&Kreslit neprůhledně", IDM_IMAGEDRAWOPAQUE END POPUP "&Barvy" BEGIN @@ -104,18 +104,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Vyjmou&t\tCtrl+X", IDM_EDITCUT + MENUITEM "&Kopírovat\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Vložit\tCtrl+V", IDM_EDITPASTE + MENUITEM "Vy&mazat výběr\tDel", IDM_EDITDELETESELECTION + MENUITEM "Vybrat v&še\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Kopírovat &do...", IDM_EDITCOPYTO + MENUITEM "V&ložit z...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Překlopit nebo otočit...\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Inverovat barvy\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/de-DE.rc b/base/applications/mspaint/lang/de-DE.rc index 20fb505484f..97466efcbb1 100644 --- a/base/applications/mspaint/lang/de-DE.rc +++ b/base/applications/mspaint/lang/de-DE.rc @@ -36,18 +36,18 @@ BEGIN END POPUP "&Bearbeiten" BEGIN - MENUITEM "Rückgängig\tStrg+Z", IDM_EDITUNDO - MENUITEM "Wiederholen\tStrg+Y", IDM_EDITREDO + MENUITEM "&Rückgängig\tStrg+Z", IDM_EDITUNDO + MENUITEM "&Wiederholen\tStrg+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Ausschneiden\tStrg+X", IDM_EDITCUT - MENUITEM "Kopieren\tStrg+C", IDM_EDITCOPY - MENUITEM "Einfügen\tStrg+V", IDM_EDITPASTE - MENUITEM "Auswahl löschen\tEntf", IDM_EDITDELETESELECTION - MENUITEM "Markierung umkehren", IDM_EDITINVERTSELECTION + MENUITEM "&Ausschneiden\tStrg+X", IDM_EDITCUT + MENUITEM "&Kopieren\tStrg+C", IDM_EDITCOPY + MENUITEM "&Einfügen\tStrg+V", IDM_EDITPASTE + MENUITEM "Auswahl &löschen\tEntf", IDM_EDITDELETESELECTION + MENUITEM "Markierung &umkehren", IDM_EDITINVERTSELECTION MENUITEM "Alles &markieren\tStrg+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Kopieren nach...", IDM_EDITCOPYTO - MENUITEM "Einfügen aus...", IDM_EDITPASTEFROM + MENUITEM "Kopieren &nach...", IDM_EDITCOPYTO + MENUITEM "Einfügen au&s...", IDM_EDITPASTEFROM END POPUP "&Ansicht" BEGIN @@ -76,13 +76,13 @@ BEGIN END POPUP "B&ild" BEGIN - MENUITEM "Drehen/Spiegeln...\tStrg+D", IDM_IMAGEROTATEMIRROR - MENUITEM "Strecken/Zerren...\tStrg+K", IDM_IMAGESTRETCHSKEW - MENUITEM "Zuschneiden", IDM_IMAGECROP - MENUITEM "Farben umkehren\tStrg+U", IDM_IMAGEINVERTCOLORS - MENUITEM "Attribute...\tStrg+E", IDM_IMAGEATTRIBUTES - MENUITEM "Bild löschen\tStrg+Umschalt+N", IDM_IMAGEDELETEIMAGE - MENUITEM "Deckend zeichnen", IDM_IMAGEDRAWOPAQUE + MENUITEM "&Drehen/Spiegeln...\tStrg+D", IDM_IMAGEROTATEMIRROR + MENUITEM "Strecken/&Zerren...\tStrg+K", IDM_IMAGESTRETCHSKEW + MENUITEM "Zu&schneiden", IDM_IMAGECROP + MENUITEM "Farben &umkehren\tStrg+U", IDM_IMAGEINVERTCOLORS + MENUITEM "&Attribute...\tStrg+E", IDM_IMAGEATTRIBUTES + MENUITEM "&Bild löschen\tStrg+Umschalt+N", IDM_IMAGEDELETEIMAGE + MENUITEM "D&eckend zeichnen", IDM_IMAGEDRAWOPAQUE END POPUP "&Farben" BEGIN @@ -103,18 +103,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "&Ausschneiden\tStrg+X", IDM_EDITCUT + MENUITEM "&Kopieren\tStrg+C", IDM_EDITCOPY + MENUITEM "&Einfügen\tStrg+V", IDM_EDITPASTE + MENUITEM "Auswahl &löschen\tEntf", IDM_EDITDELETESELECTION + MENUITEM "Alles &markieren\tStrg+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Kopieren &nach...", IDM_EDITCOPYTO + MENUITEM "Einfügen au&s...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Drehen/Spiegeln...\tStrg+D", IDM_IMAGEROTATEMIRROR + MENUITEM "Strecken/&Zerren...\tStrg+K", IDM_IMAGESTRETCHSKEW + MENUITEM "Farben &umkehren\tStrg+U", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/en-GB.rc b/base/applications/mspaint/lang/en-GB.rc index b5267ad1d0e..6a714ff0998 100644 --- a/base/applications/mspaint/lang/en-GB.rc +++ b/base/applications/mspaint/lang/en-GB.rc @@ -78,10 +78,10 @@ BEGIN BEGIN MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Crop", IDM_IMAGECROP + MENUITEM "C&rop", IDM_IMAGECROP MENUITEM "&Invert colours\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "&Attributes...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Delete image\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "&Clear image\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE MENUITEM "&Draw opaque", IDM_IMAGEDRAWOPAQUE END POPUP "&Colours" @@ -103,8 +103,8 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "Cu&t\tCtrl+X", IDM_EDITCUT + MENUITEM "&Copy\tCtrl+C", IDM_EDITCOPY MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL diff --git a/base/applications/mspaint/lang/en-US.rc b/base/applications/mspaint/lang/en-US.rc index 987e1ab7449..029eaa11384 100644 --- a/base/applications/mspaint/lang/en-US.rc +++ b/base/applications/mspaint/lang/en-US.rc @@ -79,10 +79,10 @@ BEGIN BEGIN MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Crop", IDM_IMAGECROP + MENUITEM "C&rop", IDM_IMAGECROP MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "&Attributes...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Delete image\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "&Clear image\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE MENUITEM "&Draw opaque", IDM_IMAGEDRAWOPAQUE END POPUP "&Colors" @@ -104,8 +104,8 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "Cu&t\tCtrl+X", IDM_EDITCUT + MENUITEM "&Copy\tCtrl+C", IDM_EDITCOPY MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL diff --git a/base/applications/mspaint/lang/es-ES.rc b/base/applications/mspaint/lang/es-ES.rc index 850307363b6..5ad11ac1f2c 100644 --- a/base/applications/mspaint/lang/es-ES.rc +++ b/base/applications/mspaint/lang/es-ES.rc @@ -39,18 +39,18 @@ BEGIN END POPUP "&Edición" BEGIN - MENUITEM "Deshacer\tCtrl+Z", IDM_EDITUNDO - MENUITEM "Rehacer\tCtrl+Y", IDM_EDITREDO + MENUITEM "&Deshacer\tCtrl+Z", IDM_EDITUNDO + MENUITEM "&Rehacer\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Cortar\tCtrl+X", IDM_EDITCUT - MENUITEM "Copiar\tCtrl+C", IDM_EDITCOPY - MENUITEM "Pegar\tCtrl+V", IDM_EDITPASTE - MENUITEM "Borrar selección\tSupr", IDM_EDITDELETESELECTION - MENUITEM "Invertir selección", IDM_EDITINVERTSELECTION - MENUITEM "Seleccionar todo\tCtrl+E", IDM_EDITSELECTALL + MENUITEM "Cor&tar\tCtrl+X", IDM_EDITCUT + MENUITEM "&Copiar\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Pegar\tCtrl+V", IDM_EDITPASTE + MENUITEM "&Borrar selección\tSupr", IDM_EDITDELETESELECTION + MENUITEM "&Invertir selección", IDM_EDITINVERTSELECTION + MENUITEM "Seleccionar t&odo\tCtrl+E", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Copiar a...", IDM_EDITCOPYTO - MENUITEM "Pegar desde...", IDM_EDITPASTEFROM + MENUITEM "Copiar &a...", IDM_EDITCOPYTO + MENUITEM "Pegar d&esde...", IDM_EDITPASTEFROM END POPUP "&Ver" BEGIN @@ -79,13 +79,13 @@ BEGIN END POPUP "&Imagen" BEGIN - MENUITEM "Rotar/Invertir...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Estirar/Inclinar...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Recortar", IDM_IMAGECROP - MENUITEM "Invertir colores\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "Atributos...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Borrar imagen\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE - MENUITEM "Dibujar figuras opacas", IDM_IMAGEDRAWOPAQUE + MENUITEM "&Rotar/Invertir...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "E&stirar/Inclinar...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "Re&cortar", IDM_IMAGECROP + MENUITEM "&Invertir colores\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Atributos...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "&Borrar imagen\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "Dibujar figuras &opacas", IDM_IMAGEDRAWOPAQUE END POPUP "&Colores" BEGIN @@ -106,18 +106,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Cor&tar\tCtrl+X", IDM_EDITCUT + MENUITEM "&Copiar\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Pegar\tCtrl+V", IDM_EDITPASTE + MENUITEM "&Borrar selección\tSupr", IDM_EDITDELETESELECTION + MENUITEM "Seleccionar t&odo\tCtrl+E", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Copiar &a...", IDM_EDITCOPYTO + MENUITEM "Pegar d&esde...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Rotar/Invertir...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "E&stirar/Inclinar...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invertir colores\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/et-EE.rc b/base/applications/mspaint/lang/et-EE.rc index b3996096fd2..6103e1608cb 100644 --- a/base/applications/mspaint/lang/et-EE.rc +++ b/base/applications/mspaint/lang/et-EE.rc @@ -41,7 +41,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Lõika\tCtrl+X", IDM_EDITCUT MENUITEM "&Kopeeri\tCtrl+C", IDM_EDITCOPY - MENUITEM "K&leebi\tCtrl+V", IDM_EDITPASTE + MENUITEM "Kl&eebi\tCtrl+V", IDM_EDITPASTE MENUITEM "Kustuta &valik\tDel", IDM_EDITDELETESELECTION MENUITEM "&Pööra valikut", IDM_EDITINVERTSELECTION MENUITEM "Vali k&õik\tCtrl+A", IDM_EDITSELECTALL @@ -76,12 +76,12 @@ BEGIN END POPUP "&Pilt" BEGIN - MENUITEM "Pööra/&Peegelda...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "Pööra/Pee&gelda...\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "&Venita/Kalluta...\tCtrl+W", IDM_IMAGESTRETCHSKEW MENUITEM "&Kärbi", IDM_IMAGECROP MENUITEM "&Pööra värvid\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "&Atribuudid...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Kustuta pilt\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "Ku&stuta pilt\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE MENUITEM "&Joonista läbipaistmatult", IDM_IMAGEDRAWOPAQUE END POPUP "&Värvid" @@ -103,18 +103,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "&Lõika\tCtrl+X", IDM_EDITCUT + MENUITEM "&Kopeeri\tCtrl+C", IDM_EDITCOPY + MENUITEM "Kl&eebi\tCtrl+V", IDM_EDITPASTE + MENUITEM "Kustuta &valik\tDel", IDM_EDITDELETESELECTION + MENUITEM "Vali k&õik\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Kopee&ri asukohta...", IDM_EDITCOPYTO + MENUITEM "Klee&bi asukohast...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "Pööra/Pee&gelda...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Venita/Kalluta...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Pööra värvid\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/eu-ES.rc b/base/applications/mspaint/lang/eu-ES.rc index 708d62466d2..3340d338c46 100644 --- a/base/applications/mspaint/lang/eu-ES.rc +++ b/base/applications/mspaint/lang/eu-ES.rc @@ -37,18 +37,18 @@ BEGIN END POPUP "&Editatu" BEGIN - MENUITEM "Desegin\tCtrl+Z", IDM_EDITUNDO - MENUITEM "Errepikatu\tCtrl+Y", IDM_EDITREDO + MENUITEM "&Desegin\tCtrl+Z", IDM_EDITUNDO + MENUITEM "E&rrepikatu\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Ebaki\tCtrl+X", IDM_EDITCUT - MENUITEM "Kopiatu\tCtrl+C", IDM_EDITCOPY - MENUITEM "Itsasti\tCtrl+V", IDM_EDITPASTE - MENUITEM "Selekzioa ezabatu\tDel", IDM_EDITDELETESELECTION - MENUITEM "selekzioa alderantzikatu", IDM_EDITINVERTSELECTION - MENUITEM "Huatatu dena\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "E&baki\tCtrl+X", IDM_EDITCUT + MENUITEM "&Kopiatu\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Itsasti\tCtrl+V", IDM_EDITPASTE + MENUITEM "Selekzioa &ezabatu\tDel", IDM_EDITDELETESELECTION + MENUITEM "Selekzioa &alderantzikatu", IDM_EDITINVERTSELECTION + MENUITEM "&Huatatu dena\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Kopiatu hona...", IDM_EDITCOPYTO - MENUITEM "Itsasti hemendik...", IDM_EDITPASTEFROM + MENUITEM "Kopiatu h&ona...", IDM_EDITCOPYTO + MENUITEM "Itsasti he&mendik...", IDM_EDITPASTEFROM END POPUP "&Ikusi" BEGIN @@ -77,13 +77,13 @@ BEGIN END POPUP "I&rudia" BEGIN - MENUITEM "Irauli/biratu...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Hedatu/Zeharkatu...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Moztu", IDM_IMAGECROP - MENUITEM "Alderantzikatu koloreak\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "Atributuak...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Garbitu irudia\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE - MENUITEM "Marraztu opako", IDM_IMAGEDRAWOPAQUE + MENUITEM "I&rauli/biratu...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "He&datu/Zeharkatu...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Moztu", IDM_IMAGECROP + MENUITEM "A&lderantzikatu koloreak\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Atributuak...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "&Garbitu irudia\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "Marraztu &opako", IDM_IMAGEDRAWOPAQUE END POPUP "&Koloreak" BEGIN @@ -104,18 +104,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "E&baki\tCtrl+X", IDM_EDITCUT + MENUITEM "&Kopiatu\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Itsasti\tCtrl+V", IDM_EDITPASTE + MENUITEM "Selekzioa &ezabatu\tDel", IDM_EDITDELETESELECTION + MENUITEM "&Huatatu dena\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Kopiatu h&ona...", IDM_EDITCOPYTO + MENUITEM "Itsasti he&mendik...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "I&rauli/biratu...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "He&datu/Zeharkatu...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "A&lderantzikatu koloreak\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/fr-FR.rc b/base/applications/mspaint/lang/fr-FR.rc index 9fd0034abdc..6fb2dc383be 100644 --- a/base/applications/mspaint/lang/fr-FR.rc +++ b/base/applications/mspaint/lang/fr-FR.rc @@ -37,18 +37,18 @@ BEGIN END POPUP "&Edition" BEGIN - MENUITEM "Annuler\tCtrl+Z", IDM_EDITUNDO - MENUITEM "Rétablir\tCtrl+Y", IDM_EDITREDO + MENUITEM "&Annuler\tCtrl+Z", IDM_EDITUNDO + MENUITEM "&Rétablir\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Couper\tCtrl+X", IDM_EDITCUT - MENUITEM "Copier\tCtrl+C", IDM_EDITCOPY - MENUITEM "Coller\tCtrl+V", IDM_EDITPASTE - MENUITEM "Effacer la sélection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Inverser la sélection", IDM_EDITINVERTSELECTION - MENUITEM "Sélectionner tout\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Co&uper\tCtrl+X", IDM_EDITCUT + MENUITEM "&Copier\tCtrl+C", IDM_EDITCOPY + MENUITEM "C&oller\tCtrl+V", IDM_EDITPASTE + MENUITEM "&Effacer la sélection\tDel", IDM_EDITDELETESELECTION + MENUITEM "&Inverser la sélection", IDM_EDITINVERTSELECTION + MENUITEM "&Sélectionner tout\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Copier vers...", IDM_EDITCOPYTO - MENUITEM "Coller à partir de...", IDM_EDITPASTEFROM + MENUITEM "Copier &vers...", IDM_EDITCOPYTO + MENUITEM "Coller à &partir de...", IDM_EDITPASTEFROM END POPUP "&Affichage" BEGIN @@ -77,13 +77,13 @@ BEGIN END POPUP "&Image" BEGIN - MENUITEM "Retourner/Faire pivoter...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Agrandir/Pencher...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Rogner", IDM_IMAGECROP - MENUITEM "Inverser les couleurs\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "Attributs...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Effacer l'image\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE - MENUITEM "Dessiner opaque", IDM_IMAGEDRAWOPAQUE + MENUITEM "&Retourner/Faire pivoter...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Agrandir/Pencher...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "Ro&gner", IDM_IMAGECROP + MENUITEM "&Inverser les couleurs\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Attributs...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "&Effacer l'image\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "Dessiner &opaque", IDM_IMAGEDRAWOPAQUE END POPUP "&Couleurs" BEGIN @@ -104,18 +104,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Co&uper\tCtrl+X", IDM_EDITCUT + MENUITEM "&Copier\tCtrl+C", IDM_EDITCOPY + MENUITEM "C&oller\tCtrl+V", IDM_EDITPASTE + MENUITEM "&Effacer la sélection\tDel", IDM_EDITDELETESELECTION + MENUITEM "&Sélectionner tout\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Copier &vers...", IDM_EDITCOPYTO + MENUITEM "Coller à &partir de...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Retourner/Faire pivoter...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Agrandir/Pencher...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Inverser les couleurs\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/he-IL.rc b/base/applications/mspaint/lang/he-IL.rc index 1623e258a0c..1dff4387dc0 100644 --- a/base/applications/mspaint/lang/he-IL.rc +++ b/base/applications/mspaint/lang/he-IL.rc @@ -77,7 +77,7 @@ BEGIN POPUP "ת&מונה" BEGIN MENUITEM "סובב/הפוך...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW MENUITEM "חתוך", IDM_IMAGECROP MENUITEM "הפוך צבעים\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "תכונות...\tCtrl+E", IDM_IMAGEATTRIBUTES @@ -103,18 +103,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "גזור\tCtrl+X", IDM_EDITCUT + MENUITEM "העתק\tCtrl+C", IDM_EDITCOPY + MENUITEM "הדבק\tCtrl+V", IDM_EDITPASTE + MENUITEM "מחק בחירה\tDel", IDM_EDITDELETESELECTION + MENUITEM "בחר הכל\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "העתק ל...", IDM_EDITCOPYTO + MENUITEM "הדבק מ...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "סובב/הפוך...\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "הפוך צבעים\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/hu-HU.rc b/base/applications/mspaint/lang/hu-HU.rc index 07f84d6a3a9..1d97acb2681 100644 --- a/base/applications/mspaint/lang/hu-HU.rc +++ b/base/applications/mspaint/lang/hu-HU.rc @@ -37,18 +37,18 @@ BEGIN END POPUP "S&zerkesztés" BEGIN - MENUITEM "Visszavonás\tCtrl+Z", IDM_EDITUNDO - MENUITEM "Ismét\tCtrl+Y", IDM_EDITREDO + MENUITEM "&Visszavonás\tCtrl+Z", IDM_EDITUNDO + MENUITEM "&Ismét\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Kivágás\tCtrl+X", IDM_EDITCUT - MENUITEM "Másolás\tCtrl+C", IDM_EDITCOPY - MENUITEM "Beillesztés\tCtrl+V", IDM_EDITPASTE - MENUITEM "Kijelölés törlése\tDel", IDM_EDITDELETESELECTION - MENUITEM "Kijelölés megfordítása", IDM_EDITINVERTSELECTION - MENUITEM "Mindent kijelöl\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Kivá&gás\tCtrl+X", IDM_EDITCUT + MENUITEM "&Másolás\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Beillesztés\tCtrl+V", IDM_EDITPASTE + MENUITEM "Kijelölés &törlése\tDel", IDM_EDITDELETESELECTION + MENUITEM "Kijelölés megf&ordítása", IDM_EDITINVERTSELECTION + MENUITEM "Mindent &kijelöl\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Másolás fájlba...", IDM_EDITCOPYTO - MENUITEM "Fájl beillesztése...", IDM_EDITPASTEFROM + MENUITEM "Másolás &fájlba...", IDM_EDITCOPYTO + MENUITEM "Fájl b&eillesztése...", IDM_EDITPASTEFROM END POPUP "&Nézet" BEGIN @@ -77,13 +77,13 @@ BEGIN END POPUP "&Kép" BEGIN - MENUITEM "Forgatás/Tükrözés...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Nyújtás/Döntés...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Vágás", IDM_IMAGECROP - MENUITEM "Színek megfordítása\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "Attribútumok...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Kép törlése\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE - MENUITEM "Nem átlátszó", IDM_IMAGEDRAWOPAQUE + MENUITEM "&Forgatás/Tükrözés...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "Nyújtás/&Döntés...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Vágás", IDM_IMAGECROP + MENUITEM "&Színek megfordítása\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Attribútumok...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "&Kép törlése\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "&Nem átlátszó", IDM_IMAGEDRAWOPAQUE END POPUP "Szín&ek" BEGIN @@ -104,18 +104,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Kivá&gás\tCtrl+X", IDM_EDITCUT + MENUITEM "&Másolás\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Beillesztés\tCtrl+V", IDM_EDITPASTE + MENUITEM "Kijelölés &törlése\tDel", IDM_EDITDELETESELECTION + MENUITEM "Mindent &kijelöl\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Másolás &fájlba...", IDM_EDITCOPYTO + MENUITEM "Fájl b&eillesztése...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Forgatás/Tükrözés...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "Nyújtás/&Döntés...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Színek megfordítása\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/id-ID.rc b/base/applications/mspaint/lang/id-ID.rc index 556aa5efb6c..3ae30e7f170 100644 --- a/base/applications/mspaint/lang/id-ID.rc +++ b/base/applications/mspaint/lang/id-ID.rc @@ -103,18 +103,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "&Gunting\tCtrl+X", IDM_EDITCUT + MENUITEM "&Salin\tCtrl+C", IDM_EDITCOPY + MENUITEM "Te&mpel\tCtrl+V", IDM_EDITPASTE + MENUITEM "Hapus &Pilihan\tDel", IDM_EDITDELETESELECTION + MENUITEM "Pilih S&emua\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Salin &ke...", IDM_EDITCOPYTO + MENUITEM "Tempel da&ri...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "Putar/&Cermin...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Perluas/Condongkan...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Balikkan warna\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/it-IT.rc b/base/applications/mspaint/lang/it-IT.rc index ae66f2a3e33..9327ca498e5 100644 --- a/base/applications/mspaint/lang/it-IT.rc +++ b/base/applications/mspaint/lang/it-IT.rc @@ -37,18 +37,18 @@ BEGIN END POPUP "&Modifica" BEGIN - MENUITEM "Annulla\tCtrl+Z", IDM_EDITUNDO - MENUITEM "Ripeti\tCtrl+Y", IDM_EDITREDO + MENUITEM "&Annulla\tCtrl+Z", IDM_EDITUNDO + MENUITEM "&Ripeti\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Taglia\tCtrl+X", IDM_EDITCUT - MENUITEM "Copia\tCtrl+C", IDM_EDITCOPY - MENUITEM "Incolla\tCtrl+V", IDM_EDITPASTE - MENUITEM "Cancella area selezionata\tCanc", IDM_EDITDELETESELECTION - MENUITEM "Inverte selezione", IDM_EDITINVERTSELECTION + MENUITEM "&Taglia\tCtrl+X", IDM_EDITCUT + MENUITEM "&Copia\tCtrl+C", IDM_EDITCOPY + MENUITEM "I&ncolla\tCtrl+V", IDM_EDITPASTE + MENUITEM "Cance&lla area selezionata\tCanc", IDM_EDITDELETESELECTION + MENUITEM "&Inverte selezione", IDM_EDITINVERTSELECTION MENUITEM "Sele&ziona tutto\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Copia su...", IDM_EDITCOPYTO - MENUITEM "Incolla da...", IDM_EDITPASTEFROM + MENUITEM "Copia &su...", IDM_EDITCOPYTO + MENUITEM "Incolla &da...", IDM_EDITPASTEFROM END POPUP "&Visualizza" BEGIN @@ -77,13 +77,13 @@ BEGIN END POPUP "&Immagine" BEGIN - MENUITEM "Capovolgi/ruota...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Ritaglia", IDM_IMAGECROP - MENUITEM "Inverti colori\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "Attributi...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Cancella immagine\tCtrl+Maiusc+N", IDM_IMAGEDELETEIMAGE - MENUITEM "Opaco", IDM_IMAGEDRAWOPAQUE + MENUITEM "Ca&povolgi/ruota...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Ritaglia", IDM_IMAGECROP + MENUITEM "&Inverti colori\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Attributi...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "&Cancella immagine\tCtrl+Maiusc+N", IDM_IMAGEDELETEIMAGE + MENUITEM "&Opaco", IDM_IMAGEDRAWOPAQUE END POPUP "&Colori" BEGIN @@ -104,18 +104,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "&Taglia\tCtrl+X", IDM_EDITCUT + MENUITEM "&Copia\tCtrl+C", IDM_EDITCOPY + MENUITEM "I&ncolla\tCtrl+V", IDM_EDITPASTE + MENUITEM "Cance&lla area selezionata\tCanc", IDM_EDITDELETESELECTION + MENUITEM "Sele&ziona tutto\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Copia &su...", IDM_EDITCOPYTO + MENUITEM "Incolla &da...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "Ca&povolgi/ruota...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "S&tretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Inverti colori\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/ja-JP.rc b/base/applications/mspaint/lang/ja-JP.rc index 5042af212b7..5969044d5b4 100644 --- a/base/applications/mspaint/lang/ja-JP.rc +++ b/base/applications/mspaint/lang/ja-JP.rc @@ -80,10 +80,10 @@ BEGIN BEGIN MENUITEM "回転と反転(&M)\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "伸縮と傾斜(&S)\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "切り取り(&C)", IDM_IMAGECROP + MENUITEM "切り取り(&R)", IDM_IMAGECROP MENUITEM "色の反転(&I)\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "画像の属性(&A)\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "画像の削除\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "画像の削除(&C)\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE MENUITEM "不透明色を描画する(&D)", IDM_IMAGEDRAWOPAQUE END POPUP "色(&C)" diff --git a/base/applications/mspaint/lang/nl-NL.rc b/base/applications/mspaint/lang/nl-NL.rc index 199c8be03f7..a6c32b7e7ab 100644 --- a/base/applications/mspaint/lang/nl-NL.rc +++ b/base/applications/mspaint/lang/nl-NL.rc @@ -36,18 +36,18 @@ BEGIN END POPUP "Be&werken" BEGIN - MENUITEM "Ongedaan maken\tCtrl+Z", IDM_EDITUNDO - MENUITEM "Opnieuw\tCtrl+Y", IDM_EDITREDO + MENUITEM "On&gedaan maken\tCtrl+Z", IDM_EDITUNDO + MENUITEM "Opni&euw\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Knippen\tCtrl+X", IDM_EDITCUT - MENUITEM "Kopiëren\tCtrl+C", IDM_EDITCOPY - MENUITEM "Plakken\tCtrl+V", IDM_EDITPASTE - MENUITEM "Selectie wissen\tDel", IDM_EDITDELETESELECTION - MENUITEM "Selectie omkeren", IDM_EDITINVERTSELECTION + MENUITEM "&Knippen\tCtrl+X", IDM_EDITCUT + MENUITEM "K&opiëren\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Plakken\tCtrl+V", IDM_EDITPASTE + MENUITEM "Selectie &wissen\tDel", IDM_EDITDELETESELECTION + MENUITEM "Selectie o&mkeren", IDM_EDITINVERTSELECTION MENUITEM "&Alles selecteren\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Kopiëren naar...", IDM_EDITCOPYTO - MENUITEM "Plakken uit...", IDM_EDITPASTEFROM + MENUITEM "Kopiëren &naar...", IDM_EDITCOPYTO + MENUITEM "Plakken &uit...", IDM_EDITPASTEFROM END POPUP "Beel&d" BEGIN @@ -76,13 +76,13 @@ BEGIN END POPUP "&Afbeelding" BEGIN - MENUITEM "Spiegelen/draaien...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Bijsnijden", IDM_IMAGECROP - MENUITEM "Negatief\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "Kenmerken...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Afbeelding wissen", IDM_IMAGEDELETEIMAGE - MENUITEM "Ondoorzichtig tekenen", IDM_IMAGEDRAWOPAQUE + MENUITEM "&Spiegelen/draaien...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "S&tretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Bijsnijden", IDM_IMAGECROP + MENUITEM "Negat&ief\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "K&enmerken...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "&Afbeelding wissen", IDM_IMAGEDELETEIMAGE + MENUITEM "&Ondoorzichtig tekenen", IDM_IMAGEDRAWOPAQUE END POPUP "&Kleuren" BEGIN @@ -103,18 +103,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "&Knippen\tCtrl+X", IDM_EDITCUT + MENUITEM "K&opiëren\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Plakken\tCtrl+V", IDM_EDITPASTE + MENUITEM "Selectie &wissen\tDel", IDM_EDITDELETESELECTION + MENUITEM "&Alles selecteren\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Kopiëren &naar...", IDM_EDITCOPYTO + MENUITEM "Plakken &uit...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Spiegelen/draaien...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "S&tretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "Negat&ief\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/no-NO.rc b/base/applications/mspaint/lang/no-NO.rc index 3cc7679639f..4c4f0398db5 100644 --- a/base/applications/mspaint/lang/no-NO.rc +++ b/base/applications/mspaint/lang/no-NO.rc @@ -36,18 +36,18 @@ BEGIN END POPUP "&Rediger" BEGIN - MENUITEM "Angre\tCtrl+Z", IDM_EDITUNDO - MENUITEM "Gjenopprett\tCtrl+Y", IDM_EDITREDO + MENUITEM "A&ngre\tCtrl+Z", IDM_EDITUNDO + MENUITEM "&Gjenopprett\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Klipp ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Kopier\tCtrl+C", IDM_EDITCOPY - MENUITEM "Lim inn\tCtrl+V", IDM_EDITPASTE - MENUITEM "Slett valgt\tDel", IDM_EDITDELETESELECTION - MENUITEM "Invertere valg", IDM_EDITINVERTSELECTION - MENUITEM "Velg alt\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Klipp &ut\tCtrl+X", IDM_EDITCUT + MENUITEM "&Kopier\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Lim inn\tCtrl+V", IDM_EDITPASTE + MENUITEM "&Slett valgt\tDel", IDM_EDITDELETESELECTION + MENUITEM "&Invertere valg", IDM_EDITINVERTSELECTION + MENUITEM "Velg &alt\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Kopier til...", IDM_EDITCOPYTO - MENUITEM "Lim inn fra...", IDM_EDITPASTEFROM + MENUITEM "Kopier &til...", IDM_EDITCOPYTO + MENUITEM "Lim inn &fra...", IDM_EDITPASTEFROM END POPUP "&Vis" BEGIN @@ -76,13 +76,13 @@ BEGIN END POPUP "&Bilde" BEGIN - MENUITEM "Roter/speile...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Beskjær", IDM_IMAGECROP - MENUITEM "Invertere farger\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "Attributter...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Fjern bilde\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE - MENUITEM "Gjør ugjennomsiktig", IDM_IMAGEDRAWOPAQUE + MENUITEM "&Roter/speile...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Beskjær", IDM_IMAGECROP + MENUITEM "&Invertere farger\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Attributter...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "&Fjern bilde\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "Gjør &ugjennomsiktig", IDM_IMAGEDRAWOPAQUE END POPUP "&Farger" BEGIN @@ -103,18 +103,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Klipp &ut\tCtrl+X", IDM_EDITCUT + MENUITEM "&Kopier\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Lim inn\tCtrl+V", IDM_EDITPASTE + MENUITEM "&Slett valgt\tDel", IDM_EDITDELETESELECTION + MENUITEM "Velg &alt\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Kopier &til...", IDM_EDITCOPYTO + MENUITEM "Lim inn &fra...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Roter/speile...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "Str&etch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invertere farger\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/pl-PL.rc b/base/applications/mspaint/lang/pl-PL.rc index 04dde3f8aa4..d29933dd321 100644 --- a/base/applications/mspaint/lang/pl-PL.rc +++ b/base/applications/mspaint/lang/pl-PL.rc @@ -107,7 +107,7 @@ BEGIN POPUP "Popup #0" BEGIN MENUITEM "&Wytnij\tCtrl+X", IDM_EDITCUT - MENUITEM "Kopiuj\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Kopiuj\tCtrl+C", IDM_EDITCOPY MENUITEM "Wkl&ej\tCtrl+V", IDM_EDITPASTE MENUITEM "Wyczyść z&aznaczenie\tDel", IDM_EDITDELETESELECTION MENUITEM "&Zaznacz wszystko\tCtrl+A", IDM_EDITSELECTALL diff --git a/base/applications/mspaint/lang/pt-BR.rc b/base/applications/mspaint/lang/pt-BR.rc index fc38012623b..c178150a2a5 100644 --- a/base/applications/mspaint/lang/pt-BR.rc +++ b/base/applications/mspaint/lang/pt-BR.rc @@ -79,7 +79,7 @@ BEGIN BEGIN MENUITEM "Inverter/&girar...\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "&Alongar/inclinar...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Cortar", IDM_IMAGECROP + MENUITEM "&Cortar", IDM_IMAGECROP MENUITEM "&Inverter cores\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "A&tributos...\tCtrl+E", IDM_IMAGEATTRIBUTES MENUITEM "&Limpar imagem\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE @@ -104,18 +104,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "&Recortar\tCtrl+X", IDM_EDITCUT + MENUITEM "&Copiar\tCtrl+C", IDM_EDITCOPY + MENUITEM "C&olar\tCtrl+V", IDM_EDITPASTE + MENUITEM "&Limpar seleção\tDel", IDM_EDITDELETESELECTION + MENUITEM "Selecionar &tudo\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Copiar &para...", IDM_EDITCOPYTO + MENUITEM "Colar &de...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "Inverter/&girar...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Alongar/inclinar...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Inverter cores\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/pt-PT.rc b/base/applications/mspaint/lang/pt-PT.rc index 7457d339fee..155c6b3e9a2 100644 --- a/base/applications/mspaint/lang/pt-PT.rc +++ b/base/applications/mspaint/lang/pt-PT.rc @@ -104,18 +104,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Cor&tar\tCtrl+X", IDM_EDITCUT + MENUITEM "&Copiar\tCtrl+C", IDM_EDITCOPY + MENUITEM "Co&lar\tCtrl+V", IDM_EDITPASTE + MENUITEM "Limpar &selecção\tDel", IDM_EDITDELETESELECTION + MENUITEM "Seleccionar &tudo\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "C&opiar para...", IDM_EDITCOPYTO + MENUITEM "Colar &de...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "I&nverter/rodar...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Redimensionar/Torcer...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Inverter cores\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/ro-RO.rc b/base/applications/mspaint/lang/ro-RO.rc index 134acf54bc1..b74925b6523 100644 --- a/base/applications/mspaint/lang/ro-RO.rc +++ b/base/applications/mspaint/lang/ro-RO.rc @@ -16,17 +16,17 @@ BEGIN POPUP "&Fișier" BEGIN MENUITEM "&Nou\tCtrl+N", IDM_FILENEW - MENUITEM "&Deschidere…\tCtrl+O", IDM_FILEOPEN + MENUITEM "&Deschidere...\tCtrl+O", IDM_FILEOPEN MENUITEM "&Păstrează\tCtrl+S", IDM_FILESAVE - MENUITEM "Păst&rare în…", IDM_FILESAVEAS + MENUITEM "Păst&rare în...", IDM_FILESAVEAS MENUITEM SEPARATOR - MENUITEM "Din aparat media…", IDM_FILEFROMSCANNERORCAMERA + MENUITEM "Din aparat media...", IDM_FILEFROMSCANNERORCAMERA MENUITEM SEPARATOR MENUITEM "Pre&vizionează pagina", IDM_FILEPAGEVIEW - MENUITEM "C&onfigurare pagină…", IDM_FILEPAGESETUP - MENUITEM "I&mprimă…\tCtrl+P", IDM_FILEPRINT + MENUITEM "C&onfigurare pagină...", IDM_FILEPAGESETUP + MENUITEM "I&mprimă...\tCtrl+P", IDM_FILEPRINT MENUITEM SEPARATOR - MENUITEM "Transmite…", IDM_FILESEND + MENUITEM "Transmite...", IDM_FILESEND MENUITEM SEPARATOR MENUITEM "Decor de birou (în c&arou)", IDM_FILEASWALLPAPERPLANE MENUITEM "Decor de birou (&centrat)", IDM_FILEASWALLPAPERCENTERED @@ -48,8 +48,8 @@ BEGIN MENUITEM "In&versează selecția", IDM_EDITINVERTSELECTION MENUITEM "Selecte&ază tot\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opiere în…", IDM_EDITCOPYTO - MENUITEM "Lipire di&n…", IDM_EDITPASTEFROM + MENUITEM "C&opiere în...", IDM_EDITCOPYTO + MENUITEM "Lipire di&n...", IDM_EDITPASTEFROM END POPUP "&Afișare" BEGIN @@ -78,26 +78,26 @@ BEGIN END POPUP "I&magine" BEGIN - MENUITEM "&Rotire/Oglindire…\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Întin&dere/Înclinare…\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Rotire/Oglindire...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "Întin&dere/Înclinare...\tCtrl+W", IDM_IMAGESTRETCHSKEW MENUITEM "Recoltea&ză", IDM_IMAGECROP MENUITEM "In&versează culorile\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "&Atribute…\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "&Atribute...\tCtrl+E", IDM_IMAGEATTRIBUTES MENUITEM "Șt&erge imaginea", IDM_IMAGEDELETEIMAGE MENUITEM "Mod &opac", IDM_IMAGEDRAWOPAQUE END POPUP "&Culori" BEGIN - MENUITEM "&Editare paletă…", IDM_COLORSEDITPALETTE + MENUITEM "&Editare paletă...", IDM_COLORSEDITPALETTE MENUITEM SEPARATOR MENUITEM "Paletă &modernă", IDM_COLORSMODERNPALETTE MENUITEM "Paletă &veche", IDM_COLORSOLDPALETTE END POPUP "Aj&utor" BEGIN - MENUITEM "&Manual…", IDM_HELPHELPTOPICS + MENUITEM "&Manual...", IDM_HELPHELPTOPICS MENUITEM SEPARATOR - MENUITEM "&Despre…", IDM_HELPINFO + MENUITEM "&Despre...", IDM_HELPINFO END END @@ -105,14 +105,14 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "Dec&upează\tCtrl+X", IDM_EDITCUT - MENUITEM "Copia&ză\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Decupează\tCtrl+X", IDM_EDITCUT + MENUITEM "&Copiază\tCtrl+C", IDM_EDITCOPY MENUITEM "&Lipește\tCtrl+V", IDM_EDITPASTE MENUITEM "Șt&erge selecția\tDel", IDM_EDITDELETESELECTION - MENUITEM "Selectea&ză tot\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Selecte&ază tot\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR MENUITEM "C&opiere în...", IDM_EDITCOPYTO - MENUITEM "Lipire &din...", IDM_EDITPASTEFROM + MENUITEM "Lipire di&n...", IDM_EDITPASTEFROM MENUITEM SEPARATOR MENUITEM "&Rotire/Oglindire...\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "Întindere/În&clinare...\tCtrl+W", IDM_IMAGESTRETCHSKEW diff --git a/base/applications/mspaint/lang/sk-SK.rc b/base/applications/mspaint/lang/sk-SK.rc index 16695f6d212..ab02f98cf27 100644 --- a/base/applications/mspaint/lang/sk-SK.rc +++ b/base/applications/mspaint/lang/sk-SK.rc @@ -36,18 +36,18 @@ BEGIN END POPUP "&Upraviť" BEGIN - MENUITEM "Späť\tCtrl+Z", IDM_EDITUNDO - MENUITEM "Znova\tCtrl+Y", IDM_EDITREDO + MENUITEM "&Späť\tCtrl+Z", IDM_EDITUNDO + MENUITEM "&Znova\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Vystrihnúť\tCtrl+X", IDM_EDITCUT - MENUITEM "Kopírovať\tCtrl+C", IDM_EDITCOPY - MENUITEM "Prilepiť\tCtrl+V", IDM_EDITPASTE - MENUITEM "Vymazať výber\tDel", IDM_EDITDELETESELECTION - MENUITEM "Invertovať výber", IDM_EDITINVERTSELECTION + MENUITEM "&Vystrihnúť\tCtrl+X", IDM_EDITCUT + MENUITEM "&Kopírovať\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Prilepiť\tCtrl+V", IDM_EDITPASTE + MENUITEM "Vy&mazať výber\tDel", IDM_EDITDELETESELECTION + MENUITEM "&Invertovať výber", IDM_EDITINVERTSELECTION MENUITEM "Vy&brať všetko\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Kopírovať do...", IDM_EDITCOPYTO - MENUITEM "Prilepiť z...", IDM_EDITPASTEFROM + MENUITEM "K&opírovať do...", IDM_EDITCOPYTO + MENUITEM "P&rilepiť z...", IDM_EDITPASTEFROM END POPUP "&Zobraziť" BEGIN @@ -76,13 +76,13 @@ BEGIN END POPUP "&Obrázok" BEGIN - MENUITEM "Prevrátiť alebo otočiť...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Orezať", IDM_IMAGECROP - MENUITEM "Invertovať farby\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "Atribúty...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Vymazať obrázok\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE - MENUITEM "Kresliť nepriesvitne", IDM_IMAGEDRAWOPAQUE + MENUITEM "Pr&evrátiť alebo otočiť...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Orezať", IDM_IMAGECROP + MENUITEM "&Invertovať farby\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Atribúty...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "Vy&mazať obrázok\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "&Kresliť nepriesvitne", IDM_IMAGEDRAWOPAQUE END POPUP "&Farby" BEGIN @@ -103,18 +103,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "&Vystrihnúť\tCtrl+X", IDM_EDITCUT + MENUITEM "&Kopírovať\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Prilepiť\tCtrl+V", IDM_EDITPASTE + MENUITEM "Vy&mazať výber\tDel", IDM_EDITDELETESELECTION + MENUITEM "Vy&brať všetko\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "K&opírovať do...", IDM_EDITCOPYTO + MENUITEM "P&rilepiť z...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "Pr&evrátiť alebo otočiť...\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Invertovať farby\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/sq-AL.rc b/base/applications/mspaint/lang/sq-AL.rc index 916fb382a0d..e19521d570e 100644 --- a/base/applications/mspaint/lang/sq-AL.rc +++ b/base/applications/mspaint/lang/sq-AL.rc @@ -36,18 +36,18 @@ BEGIN END POPUP "&Modifiko" BEGIN - MENUITEM "&v\tCtrl+Z", IDM_EDITUNDO + MENUITEM "&Undo\tCtrl+Z", IDM_EDITUNDO MENUITEM "&Perserit\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Prej\tCtrl+X", IDM_EDITCUT + MENUITEM "Pre&j\tCtrl+X", IDM_EDITCUT MENUITEM "&Kopjo\tCtrl+C", IDM_EDITCOPY MENUITEM "&Ngjit\tCtrl+V", IDM_EDITPASTE - MENUITEM "Fshi perzgjedhjen\tDel", IDM_EDITDELETESELECTION - MENUITEM "Kthe perzgjedhjen", IDM_EDITINVERTSELECTION - MENUITEM "Perzgjedh te gjitha\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "&Fshi perzgjedhjen\tDel", IDM_EDITDELETESELECTION + MENUITEM "Kth&e perzgjedhjen", IDM_EDITINVERTSELECTION + MENUITEM "Perzgjedh te gjith&a\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Kopjo tek...", IDM_EDITCOPYTO - MENUITEM "Ngjit nga...", IDM_EDITPASTEFROM + MENUITEM "K&opjo tek...", IDM_EDITCOPYTO + MENUITEM "N&gjit nga...", IDM_EDITPASTEFROM END POPUP "Shiko" BEGIN @@ -77,11 +77,11 @@ BEGIN POPUP "&Imazhe" BEGIN MENUITEM "Rrotullu/&Pamjen...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&&Streq/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Streq/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW MENUITEM "&Copto", IDM_IMAGECROP MENUITEM "&Inverto ngjyrat\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "&Atributet...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Fshi foton\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "&Fshi foton\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE MENUITEM "Vizato errët", IDM_IMAGEDRAWOPAQUE END POPUP "Ngjyrat" @@ -103,18 +103,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Pre&j\tCtrl+X", IDM_EDITCUT + MENUITEM "&Kopjo\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Ngjit\tCtrl+V", IDM_EDITPASTE + MENUITEM "&Fshi perzgjedhjen\tDel", IDM_EDITDELETESELECTION + MENUITEM "Perzgjedh te gjith&a\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "K&opjo tek...", IDM_EDITCOPYTO + MENUITEM "N&gjit nga...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "Rrotullu/&Pamjen...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Streq/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Inverto ngjyrat\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/sv-SE.rc b/base/applications/mspaint/lang/sv-SE.rc index 95a379dbdf8..cdfc04e71a3 100644 --- a/base/applications/mspaint/lang/sv-SE.rc +++ b/base/applications/mspaint/lang/sv-SE.rc @@ -37,18 +37,18 @@ BEGIN END POPUP "&Redigera" BEGIN - MENUITEM "Ångra\tCtrl+Z", IDM_EDITUNDO - MENUITEM "Göra om\tCtrl+Y", IDM_EDITREDO + MENUITEM "Å&ngra\tCtrl+Z", IDM_EDITUNDO + MENUITEM "&Göra om\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Klipp ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Kopiera\tCtrl+C", IDM_EDITCOPY - MENUITEM "Klistra in\tCtrl+V", IDM_EDITPASTE - MENUITEM "Ta bort\tDel", IDM_EDITDELETESELECTION - MENUITEM "Invertera val", IDM_EDITINVERTSELECTION + MENUITEM "Klipp &ut\tCtrl+X", IDM_EDITCUT + MENUITEM "&Kopiera\tCtrl+C", IDM_EDITCOPY + MENUITEM "K&listra in\tCtrl+V", IDM_EDITPASTE + MENUITEM "Ta &bort\tDel", IDM_EDITDELETESELECTION + MENUITEM "&Invertera val", IDM_EDITINVERTSELECTION MENUITEM "&Markera allt\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Kopiera till...", IDM_EDITCOPYTO - MENUITEM "Klistra från...", IDM_EDITPASTEFROM + MENUITEM "Ko&piera till...", IDM_EDITCOPYTO + MENUITEM "Klistra &från...", IDM_EDITPASTEFROM END POPUP "&Visa" BEGIN @@ -77,13 +77,13 @@ BEGIN END POPUP "&Bild" BEGIN - MENUITEM "Rotera/Spegelvänd...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Beskära", IDM_IMAGECROP - MENUITEM "Invertera färger\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "Attribut...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Radera bild\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE - MENUITEM "???Draw opaque", IDM_IMAGEDRAWOPAQUE + MENUITEM "&Rotera/Spegelvänd...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Beskära", IDM_IMAGECROP + MENUITEM "&Invertera färger\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Attribut...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "Ra&dera bild\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "Draw &opaque", IDM_IMAGEDRAWOPAQUE END POPUP "&Färger" BEGIN @@ -104,18 +104,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Klipp &ut\tCtrl+X", IDM_EDITCUT + MENUITEM "&Kopiera\tCtrl+C", IDM_EDITCOPY + MENUITEM "K&listra in\tCtrl+V", IDM_EDITPASTE + MENUITEM "Ta &bort\tDel", IDM_EDITDELETESELECTION + MENUITEM "&Markera allt\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Ko&piera till...", IDM_EDITCOPYTO + MENUITEM "Klistra &från...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Rotera/Spegelvänd...\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Invertera färger\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/tr-TR.rc b/base/applications/mspaint/lang/tr-TR.rc index 42706400c2d..de836e273e4 100644 --- a/base/applications/mspaint/lang/tr-TR.rc +++ b/base/applications/mspaint/lang/tr-TR.rc @@ -104,18 +104,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "&Kes\tCtrl+X", IDM_EDITCUT + MENUITEM "K&opyala\tCtrl+C", IDM_EDITCOPY + MENUITEM "Y&apıştır\tCtrl+V", IDM_EDITPASTE + MENUITEM "&Seçimi Sil\tDel", IDM_EDITDELETESELECTION + MENUITEM "&Tümünü Seç\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Ş&uraya Kopyala...", IDM_EDITCOPYTO + MENUITEM "Şu&radan Yapıştır...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Döndür ya da Yansıt...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Yeniden Boyutlandır veya Eğ...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "Re&nkleri Tersine Çevir\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/uk-UA.rc b/base/applications/mspaint/lang/uk-UA.rc index 3df7b6724fa..e50eb7b1877 100644 --- a/base/applications/mspaint/lang/uk-UA.rc +++ b/base/applications/mspaint/lang/uk-UA.rc @@ -38,18 +38,18 @@ BEGIN END POPUP "&Редагування" BEGIN - MENUITEM "Скасувати\tCtrl+Z", IDM_EDITUNDO - MENUITEM "Повторити\tCtrl+Y", IDM_EDITREDO + MENUITEM "&Скасувати\tCtrl+Z", IDM_EDITUNDO + MENUITEM "&Повторити\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Вирізати\tCtrl+X", IDM_EDITCUT - MENUITEM "Копіювати\tCtrl+C", IDM_EDITCOPY - MENUITEM "Вставити\tCtrl+V", IDM_EDITPASTE - MENUITEM "Видалити виділення\tDel", IDM_EDITDELETESELECTION - MENUITEM "Обернути виділення", IDM_EDITINVERTSELECTION + MENUITEM "&Вирізати\tCtrl+X", IDM_EDITCUT + MENUITEM "&Копіювати\tCtrl+C", IDM_EDITCOPY + MENUITEM "Вс&тавити\tCtrl+V", IDM_EDITPASTE + MENUITEM "Ви&далити виділення\tDel", IDM_EDITDELETESELECTION + MENUITEM "&Обернути виділення", IDM_EDITINVERTSELECTION MENUITEM "Виді&лити все\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Копіювати до файлу...", IDM_EDITCOPYTO - MENUITEM "Вставити з файлу...", IDM_EDITPASTEFROM + MENUITEM "Ко&піювати до файлу...", IDM_EDITCOPYTO + MENUITEM "Вставити з &файлу...", IDM_EDITPASTEFROM END POPUP "В&игляд" BEGIN @@ -78,13 +78,13 @@ BEGIN END POPUP "&Зображення" BEGIN - MENUITEM "Відобразити/повернути...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Обітнути", IDM_IMAGECROP - MENUITEM "Обернути кольори\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "Атрибути...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Видалити малюнок\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE - MENUITEM "Непрозоре тло", IDM_IMAGEDRAWOPAQUE + MENUITEM "Відо&бразити/повернути...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "Обі&тнути", IDM_IMAGECROP + MENUITEM "&Обернути кольори\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Атрибути...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "Ви&далити малюнок\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "Не&прозоре тло", IDM_IMAGEDRAWOPAQUE END POPUP "&Кольори" BEGIN @@ -105,18 +105,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "&Вирізати\tCtrl+X", IDM_EDITCUT + MENUITEM "&Копіювати\tCtrl+C", IDM_EDITCOPY + MENUITEM "Вс&тавити\tCtrl+V", IDM_EDITPASTE + MENUITEM "Ви&далити виділення\tDel", IDM_EDITDELETESELECTION + MENUITEM "Виді&лити все\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Ко&піювати до файлу...", IDM_EDITCOPYTO + MENUITEM "Вставити з &файлу...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "Відо&бразити/повернути...\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Обернути кольори\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/vi-VN.rc b/base/applications/mspaint/lang/vi-VN.rc index 6d5847da4b3..07cc7fa0ae0 100644 --- a/base/applications/mspaint/lang/vi-VN.rc +++ b/base/applications/mspaint/lang/vi-VN.rc @@ -37,17 +37,17 @@ BEGIN POPUP "&Chỉnh sửa" BEGIN MENUITEM "&Quay về trạng thái trước\tCtrl+Z", IDM_EDITUNDO - MENUITEM "&Quay về trạng thái sau đó\tCtrl+Y", IDM_EDITREDO + MENUITEM "Qua&y về trạng thái sau đó\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR MENUITEM "Cắ&t\tCtrl+X", IDM_EDITCUT MENUITEM "&Sao chép\tCtrl+C", IDM_EDITCOPY MENUITEM "&Dán\tCtrl+V", IDM_EDITPASTE MENUITEM "Xó&a phần đã chọn\tDel", IDM_EDITDELETESELECTION MENUITEM "&Nghịch đảo phần chọn", IDM_EDITINVERTSELECTION - MENUITEM "Chọn &Tất cả\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "C&họn Tất cả\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "S&ao chép đến...", IDM_EDITCOPYTO - MENUITEM "Dán &từ...", IDM_EDITPASTEFROM + MENUITEM "Sa&o chép đến...", IDM_EDITCOPYTO + MENUITEM "Dán t&ừ...", IDM_EDITPASTEFROM END POPUP "&Xem" BEGIN @@ -81,7 +81,7 @@ BEGIN MENUITEM "&Cắt hình ảnh", IDM_IMAGECROP MENUITEM "&Nghịch đảo màu sắc (âm bản)\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "&Thuộc tính...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Xóa hình ảnh\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "&Xóa hình ảnh\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE MENUITEM "&Vẽ nét mờ", IDM_IMAGEDRAWOPAQUE END POPUP "&Màu sắc" @@ -103,18 +103,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Cắ&t\tCtrl+X", IDM_EDITCUT + MENUITEM "&Sao chép\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Dán\tCtrl+V", IDM_EDITPASTE + MENUITEM "Xó&a phần đã chọn\tDel", IDM_EDITDELETESELECTION + MENUITEM "C&họn Tất cả\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "S&ao chép đến...", IDM_EDITCOPYTO + MENUITEM "Dán t&ừ...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "Xoay/&Lật hình ảnh...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Kéo dãn/Nghiêng...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Nghịch đảo màu sắc (âm bản)\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/zh-CN.rc b/base/applications/mspaint/lang/zh-CN.rc index ec8eab59263..6a5e2d6349e 100644 --- a/base/applications/mspaint/lang/zh-CN.rc +++ b/base/applications/mspaint/lang/zh-CN.rc @@ -81,10 +81,10 @@ BEGIN BEGIN MENUITEM "旋转/镜像...(&M)\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "拉伸/倾斜...(&S)\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "剪裁(&C)", IDM_IMAGECROP + MENUITEM "剪裁(&R)", IDM_IMAGECROP MENUITEM "反色(&I)\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "属性(&A)...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "删除图像\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "删除图像(&C)\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE MENUITEM "不透明处理(&D)", IDM_IMAGEDRAWOPAQUE END POPUP "颜色(&C)" @@ -106,18 +106,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "剪切(&T)\tCtrl+X", IDM_EDITCUT + MENUITEM "复制(&C)\tCtrl+C", IDM_EDITCOPY + MENUITEM "粘贴(&P)\tCtrl+V", IDM_EDITPASTE + MENUITEM "删除选中区域(&L)\tDel", IDM_EDITDELETESELECTION + MENUITEM "全部选择(&A)\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "复制到(&O)...", IDM_EDITCOPYTO + MENUITEM "从...粘贴(&F)", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "旋转/镜像...(&M)\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "拉伸/倾斜...(&S)\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "反色(&I)\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/zh-HK.rc b/base/applications/mspaint/lang/zh-HK.rc index 748acf93f03..f3429ab9c1f 100644 --- a/base/applications/mspaint/lang/zh-HK.rc +++ b/base/applications/mspaint/lang/zh-HK.rc @@ -79,10 +79,10 @@ BEGIN BEGIN MENUITEM "旋轉／翻轉(&M)...\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "拉伸／傾斜(&S)...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "剪裁(&C)", IDM_IMAGECROP + MENUITEM "剪裁(&R)", IDM_IMAGECROP MENUITEM "顏色反轉(&I)\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "屬性(&A)...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "刪除圖像\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "刪除圖像(&C)\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE MENUITEM "不透明處理(&D)", IDM_IMAGEDRAWOPAQUE END POPUP "顏色(&C)" @@ -104,18 +104,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "剪下(&T)\tCtrl+X", IDM_EDITCUT + MENUITEM "複製(&C)\tCtrl+C", IDM_EDITCOPY + MENUITEM "貼上(&P)\tCtrl+V", IDM_EDITPASTE + MENUITEM "刪除選中區域(&L)\tDel", IDM_EDITDELETESELECTION + MENUITEM "全選(&A)\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "複製到(&O)...", IDM_EDITCOPYTO + MENUITEM "從...貼上(&F)", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "旋轉／翻轉(&M)...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "拉伸／傾斜(&S)...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "顏色反轉(&I)\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/zh-TW.rc b/base/applications/mspaint/lang/zh-TW.rc index d3c35628019..953bf47b481 100644 --- a/base/applications/mspaint/lang/zh-TW.rc +++ b/base/applications/mspaint/lang/zh-TW.rc @@ -79,10 +79,10 @@ BEGIN BEGIN MENUITEM "旋轉／翻轉(&M)...\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "拉伸／傾斜(&S)...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "剪裁(&C)", IDM_IMAGECROP + MENUITEM "剪裁(&R)", IDM_IMAGECROP MENUITEM "顏色反轉(&I)\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "屬性(&A)...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "刪除圖像\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "刪除圖像(&C)\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE MENUITEM "不透明處理(&D)", IDM_IMAGEDRAWOPAQUE END POPUP "顏色(&C)" @@ -104,18 +104,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "剪下(&T)\tCtrl+X", IDM_EDITCUT + MENUITEM "複製(&C)\tCtrl+C", IDM_EDITCOPY + MENUITEM "貼上(&P)\tCtrl+V", IDM_EDITPASTE + MENUITEM "刪除選中區域(&L)\tDel", IDM_EDITDELETESELECTION + MENUITEM "全選(&A)\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "複製到(&O)...", IDM_EDITCOPYTO + MENUITEM "從...貼上(&F)", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "旋轉／翻轉(&M)...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "拉伸／傾斜(&S)...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "顏色反轉(&I)\tCtrl+I", IDM_IMAGEINVERTCOLORS END END

1 year, 1 month

[reactos] 01/01: [MSPAINT] Speed up for black and white (#5563)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=455c1fe1b989a3c1a6731… commit 455c1fe1b989a3c1a6731e2aa8beb2bdf05fdf2f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Aug 20 16:46:18 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Aug 20 16:46:18 2023 +0900 [MSPAINT] Speed up for black and white (#5563) Follow-up to #5554. - Speed up ImageModel::PushBlackAndWhite by using GetDIBits and SetDIBits. CORE-19094 --- base/applications/mspaint/dib.cpp | 93 +++++++++++++++++++++++++++++++++++ base/applications/mspaint/dib.h | 2 + base/applications/mspaint/history.cpp | 44 ++++------------- 3 files changed, 104 insertions(+), 35 deletions(-) diff --git a/base/applications/mspaint/dib.cpp b/base/applications/mspaint/dib.cpp index c12a2f013a8..e770f5494d0 100644 --- a/base/applications/mspaint/dib.cpp +++ b/base/applications/mspaint/dib.cpp @@ -13,6 +13,13 @@ float g_xDpi = 96; float g_yDpi = 96; SYSTEMTIME g_fileTime; +#define WIDTHBYTES(i) (((i) + 31) / 32 * 4) + +struct BITMAPINFOEX : BITMAPINFO +{ + RGBQUAD bmiColorsExtra[256 - 1]; +}; + /* FUNCTIONS ********************************************************/ // Convert DPI (dots per inch) into PPCM (pixels per centimeter) @@ -519,3 +526,89 @@ HBITMAP BitmapFromHEMF(HENHMETAFILE hEMF) return hbm; } + +BOOL IsBitmapBlackAndWhite(HBITMAP hbm) +{ + BITMAP bm; + if (!::GetObjectW(hbm, sizeof(bm), &bm)) + return FALSE; + + if (bm.bmBitsPixel == 1) + return TRUE; + + BITMAPINFOEX bmi; + ZeroMemory(&bmi, sizeof(bmi)); + bmi.bmiHeader.biSize = sizeof(bmi.bmiHeader); + bmi.bmiHeader.biWidth = bm.bmWidth; + bmi.bmiHeader.biHeight = bm.bmHeight; + bmi.bmiHeader.biPlanes = 1; + bmi.bmiHeader.biBitCount = 24; + + DWORD widthbytes = WIDTHBYTES(24 * bm.bmWidth); + DWORD cbBits = widthbytes * bm.bmHeight; + LPBYTE pbBits = new BYTE[cbBits]; + + HDC hdc = ::CreateCompatibleDC(NULL); + ::GetDIBits(hdc, hbm, 0, bm.bmHeight, pbBits, &bmi, DIB_RGB_COLORS); + ::DeleteDC(hdc); + + BOOL bBlackAndWhite = TRUE; + for (LONG y = 0; y < bm.bmHeight; ++y) + { + LPBYTE pbLine = &pbBits[widthbytes * y]; + for (LONG x = 0; x < bm.bmWidth; ++x) + { + BYTE Blue = *pbLine++; + BYTE Green = *pbLine++; + BYTE Red = *pbLine++; + COLORREF rgbColor = RGB(Red, Green, Blue); + if (rgbColor != RGB(0, 0, 0) && rgbColor != RGB(255, 255, 255)) + { + bBlackAndWhite = FALSE; + goto Finish; + } + } + } + +Finish: + delete[] pbBits; + + return bBlackAndWhite; +} + +HBITMAP ConvertToBlackAndWhite(HBITMAP hbm) +{ + BITMAP bm; + if (!::GetObject(hbm, sizeof(bm), &bm)) + return NULL; + + BITMAPINFOEX bmi; + ZeroMemory(&bmi, sizeof(bmi)); + bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bmi.bmiHeader.biWidth = bm.bmWidth; + bmi.bmiHeader.biHeight = bm.bmHeight; + bmi.bmiHeader.biPlanes = 1; + bmi.bmiHeader.biBitCount = 1; + bmi.bmiColors[1].rgbBlue = 255; + bmi.bmiColors[1].rgbGreen = 255; + bmi.bmiColors[1].rgbRed = 255; + HDC hdc = ::CreateCompatibleDC(NULL); + LPVOID pvMonoBits; + HBITMAP hMonoBitmap = ::CreateDIBSection(hdc, &bmi, DIB_RGB_COLORS, &pvMonoBits, NULL, 0); + if (!hMonoBitmap) + { + ::DeleteDC(hdc); + return NULL; + } + + HBITMAP hNewBitmap = CreateDIBWithProperties(bm.bmWidth, bm.bmHeight); + if (hNewBitmap) + { + ::GetDIBits(hdc, hbm, 0, bm.bmHeight, pvMonoBits, &bmi, DIB_RGB_COLORS); + ::SetDIBits(hdc, hNewBitmap, 0, bm.bmHeight, pvMonoBits, &bmi, DIB_RGB_COLORS); + } + ::DeleteObject(hMonoBitmap); + ::DeleteDC(hdc); + + return hNewBitmap; +} diff --git a/base/applications/mspaint/dib.h b/base/applications/mspaint/dib.h index cefdb6e42b5..bb9d933a14a 100644 --- a/base/applications/mspaint/dib.h +++ b/base/applications/mspaint/dib.h @@ -7,10 +7,12 @@ #pragma once +BOOL IsBitmapBlackAndWhite(HBITMAP hbm); HBITMAP CreateDIBWithProperties(int width, int height); HBITMAP CreateMonoBitmap(int width, int height, BOOL bWhite); HBITMAP CreateColorDIB(int width, int height, COLORREF rgb); HBITMAP CachedBufferDIB(HBITMAP hbm, int minimalWidth, int minimalHeight); +HBITMAP ConvertToBlackAndWhite(HBITMAP hbm); HBITMAP CopyMonoImage(HBITMAP hbm, INT cx = 0, INT cy = 0); diff --git a/base/applications/mspaint/history.cpp b/base/applications/mspaint/history.cpp index 8867a53025a..4451b06f927 100644 --- a/base/applications/mspaint/history.cpp +++ b/base/applications/mspaint/history.cpp @@ -270,44 +270,18 @@ HBITMAP ImageModel::CopyBitmap() BOOL ImageModel::IsBlackAndWhite() { - LONG cxWidth = GetWidth(), cyHeight = GetHeight(); - for (LONG y = 0; y < cyHeight; ++y) - { - for (LONG x = 0; x < cxWidth; ++x) - { - COLORREF rgbColor = ::GetPixel(m_hDrawingDC, x, y); - if (rgbColor != RGB(0, 0, 0) && rgbColor != RGB(255, 255, 255)) - return FALSE; - } - } - return TRUE; + ::SelectObject(m_hDrawingDC, m_hbmOld); // De-select + BOOL bBlackAndWhite = IsBitmapBlackAndWhite(m_hBms[m_currInd]); + m_hbmOld = ::SelectObject(m_hDrawingDC, m_hBms[m_currInd]); // Re-select + return bBlackAndWhite; } void ImageModel::PushBlackAndWhite() { - HBITMAP hNewBitmap = CopyBitmap(); - if (!hNewBitmap) - return; - - HDC hdc2 = ::CreateCompatibleDC(NULL); - HGDIOBJ hbm2Old = ::SelectObject(hdc2, hNewBitmap); - LONG cxWidth = GetWidth(), cyHeight = GetHeight(); - for (LONG y = 0; y < cyHeight; ++y) - { - for (LONG x = 0; x < cxWidth; ++x) - { - COLORREF rgbColor = ::GetPixel(m_hDrawingDC, x, y); - BYTE Red = GetRValue(rgbColor); - BYTE Green = GetGValue(rgbColor); - BYTE Blue = GetBValue(rgbColor); - if ((Red + Green + Blue) / 3 >= 255 / 2) - ::SetPixelV(hdc2, x, y, RGB(255, 255, 255)); // White - else - ::SetPixelV(hdc2, x, y, RGB(0, 0, 0)); // Black - } - } - ::SelectObject(hdc2, hbm2Old); - ::DeleteDC(hdc2); + ::SelectObject(m_hDrawingDC, m_hbmOld); // De-select + HBITMAP hNewBitmap = ConvertToBlackAndWhite(m_hBms[m_currInd]); + m_hbmOld = ::SelectObject(m_hDrawingDC, m_hBms[m_currInd]); // Re-select - PushImageForUndo(hNewBitmap); + if (hNewBitmap) + PushImageForUndo(hNewBitmap); }

1 year, 1 month

← Newer
1
2
3
4
5
6
7
8
9
...
17
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 August 2023