Ros-diffs August 2023

ros-diffs@reactos.org

30 participants
167 discussions

[reactos] 05/10: [KERNEL32] Export more Vista APIs

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2549e10c3808b2f4dcd66… commit 2549e10c3808b2f4dcd66a42e35bc7f0df56b4eb Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Aug 5 15:19:15 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Aug 11 19:00:42 2023 +0300 [KERNEL32] Export more Vista APIs Create kernel32_vista_static library and link both kernel32_vista and kernel32 to it. Export some vista functions from kernel32. Export BaseProcessInitPostImport for Vista+, too, because ntdll needs to dynamically link to it. --- dll/win32/kernel32/CMakeLists.txt | 2 +- dll/win32/kernel32/kernel32.spec | 81 ++++++++++++------------ dll/win32/kernel32/kernel32_vista/CMakeLists.txt | 10 +-- dll/win32/kernel32/winnls/string/lang.c | 6 ++ dll/win32/kernel32/winnls/string/lcformat.c | 14 ++++ 5 files changed, 67 insertions(+), 46 deletions(-) diff --git a/dll/win32/kernel32/CMakeLists.txt b/dll/win32/kernel32/CMakeLists.txt index 1cc82f9d42b..555aaab31dc 100644 --- a/dll/win32/kernel32/CMakeLists.txt +++ b/dll/win32/kernel32/CMakeLists.txt @@ -125,7 +125,7 @@ set_module_type(kernel32 win32dll ENTRYPOINT DllMain 12) set_subsystem(kernel32 console) ################# END HACK ################# -target_link_libraries(kernel32 kernel32_shared wine chkstk ${PSEH_LIB}) +target_link_libraries(kernel32 kernel32_vista_static kernel32_shared wine chkstk ${PSEH_LIB}) add_importlibs(kernel32 ntdll) add_pch(kernel32 k32.h SOURCE) add_dependencies(kernel32 psdk errcodes asm) diff --git a/dll/win32/kernel32/kernel32.spec b/dll/win32/kernel32/kernel32.spec index ebf7e91adcb..f1b6314052c 100644 --- a/dll/win32/kernel32/kernel32.spec +++ b/dll/win32/kernel32/kernel32.spec @@ -1,5 +1,5 @@ -@ stdcall -stub -version=0x600+ AcquireSRWLockExclusive(ptr) NTDLL.RtlAcquireSRWLockExclusive -@ stdcall -stub -version=0x600+ AcquireSRWLockShared(ptr) NTDLL.RtlAcquireSRWLockShared +@ stdcall -version=0x600+ AcquireSRWLockExclusive(ptr) NTDLL.RtlAcquireSRWLockExclusive +@ stdcall -version=0x600+ AcquireSRWLockShared(ptr) NTDLL.RtlAcquireSRWLockShared @ stdcall ActivateActCtx(ptr ptr) @ stdcall AddAtomA(str) @ stdcall AddAtomW(wstr) @@ -16,8 +16,8 @@ @ stdcall AllocConsole() @ stdcall AllocateUserPhysicalPages(long ptr ptr) @ stdcall -stub -version=0x600+ AllocateUserPhysicalPagesNuma(ptr ptr ptr long) -@ stdcall -stub -version=0x600+ ApplicationRecoveryFinished(long) -@ stdcall -stub -version=0x600+ ApplicationRecoveryInProgress(ptr) +@ stdcall -version=0x600+ ApplicationRecoveryFinished(long) +@ stdcall -version=0x600+ ApplicationRecoveryInProgress(ptr) @ stdcall AreFileApisANSI() @ stdcall AssignProcessToJobObject(ptr ptr) @ stdcall AttachConsole(long) @@ -33,6 +33,7 @@ @ stdcall BaseInitAppcompatCacheSupport() @ stdcall BaseIsAppcompatInfrastructureDisabled() IsShimInfrastructureDisabled @ stdcall -version=0x501-0x502 BaseProcessInitPostImport() +@ stdcall -version=0x600+ BaseProcessInitPostImport() # HACK: This export is dynamicaly imported by ntdll ;@ stdcall -version=0x502 -arch=x86_64 BaseProcessStart() @ stdcall BaseQueryModuleData(str str ptr ptr ptr) ;check @ stub -version=0x600+ BaseThreadInitThunk @@ -344,7 +345,7 @@ @ stdcall FreeUserPhysicalPages(long long long) @ stdcall GenerateConsoleCtrlEvent(long long) @ stdcall GetACP() -@ stub -version=0x600+ GetApplicationRecoveryCallback +@ stdcall -version=0x600+ GetApplicationRecoveryCallback(ptr ptr ptr ptr ptr) @ stub -version=0x600+ GetApplicationRestartSettings @ stdcall GetAtomNameA(long ptr long) @ stdcall GetAtomNameW(long ptr long) @@ -423,7 +424,7 @@ @ stdcall GetConsoleTitleW(ptr long) @ stdcall GetConsoleWindow() @ stdcall GetCurrencyFormatA(long long str ptr str long) -@ stub -version=0x600+ GetCurrencyFormatEx +@ stdcall -version=0x600+ GetCurrencyFormatEx(wstr long wstr ptr wstr long) @ stdcall GetCurrencyFormatW(long long wstr ptr wstr long) @ stdcall GetCurrentActCtx(ptr) @ stdcall GetCurrentConsoleFont(long long ptr) @@ -459,7 +460,7 @@ @ stdcall GetEnvironmentStringsW() @ stdcall GetEnvironmentVariableA(str ptr long) @ stdcall GetEnvironmentVariableW(wstr ptr long) -@ stub -version=0x600+ GetErrorMode +@ stdcall -version=0x600+ GetErrorMode() @ stdcall GetExitCodeProcess(long ptr) @ stdcall GetExitCodeThread(long ptr) @ stdcall GetExpandedNameA(str ptr) @@ -470,17 +471,17 @@ @ stub -version=0x600+ GetFileAttributesTransactedA @ stub -version=0x600+ GetFileAttributesTransactedW @ stdcall GetFileAttributesW(wstr) -@ stub -version=0x600+ GetFileBandwidthReservation +@ stdcall -version=0x600+ GetFileBandwidthReservation(ptr ptr ptr ptr ptr ptr) @ stdcall GetFileInformationByHandle(long ptr) -@ stub -version=0x600+ GetFileInformationByHandleEx -@ stub -version=0x600+ GetFileMUIInfo -@ stub -version=0x600+ GetFileMUIPath +@ stdcall -version=0x600+ GetFileInformationByHandleEx(ptr long ptr long) +@ stdcall -version=0x600+ GetFileMUIInfo(long wstr ptr ptr) +@ stdcall -version=0x600+ GetFileMUIPath(long wstr wstr ptr wstr ptr ptr) @ stdcall GetFileSize(long ptr) @ stdcall GetFileSizeEx(long ptr) @ stdcall GetFileTime(long ptr ptr ptr) @ stdcall GetFileType(long) -@ stub -version=0x600+ GetFinalPathNameByHandleA -@ stub -version=0x600+ GetFinalPathNameByHandleW +@ stdcall -version=0x600+ GetFinalPathNameByHandleA(ptr str long long) +@ stdcall -version=0x600+ GetFinalPathNameByHandleW(ptr wstr long long) @ stdcall GetFirmwareEnvironmentVariableA(str str ptr long) @ stdcall GetFirmwareEnvironmentVariableW(wstr wstr ptr long) @ stdcall GetFullPathNameA(str long ptr ptr) @@ -600,7 +601,7 @@ @ stdcall GetSystemFirmwareTable(long long ptr long) @ stdcall GetSystemInfo(ptr) @ stdcall GetSystemPowerStatus(ptr) -@ stub -version=0x600+ GetSystemPreferredUILanguages +@ stdcall -version=0x600+ GetSystemPreferredUILanguages(long ptr wstr ptr) @ stdcall GetSystemRegistryQuota(ptr ptr) @ stdcall GetSystemTime(ptr) @ stdcall GetSystemTimeAdjustment(ptr ptr ptr) @@ -623,26 +624,26 @@ @ stdcall GetThreadIOPendingFlag(long ptr) @ stdcall GetThreadId(ptr) @ stdcall GetThreadLocale() -@ stub -version=0x600+ GetThreadPreferredUILanguages +@ stdcall -version=0x600+ GetThreadPreferredUILanguages(long ptr wstr ptr) @ stdcall GetThreadPriority(long) @ stdcall GetThreadPriorityBoost(long ptr) @ stdcall GetThreadSelectorEntry(long long ptr) @ stdcall GetThreadTimes(long ptr ptr ptr ptr) -@ stub -version=0x600+ GetThreadUILanguage +@ stdcall -version=0x600+ GetThreadUILanguage() @ stdcall GetTickCount() -@ stub -version=0x600+ GetTickCount64 +@ stdcall -version=0x600+ -ret64 GetTickCount64() @ stdcall GetTimeFormatA(long long ptr str ptr long) @ 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 -@ stub -version=0x600+ GetUILanguageInfo +@ stdcall -version=0x600+ GetUILanguageInfo(long wstr wstr ptr ptr) @ stdcall GetUserDefaultLCID() @ stdcall GetUserDefaultLangID() @ stdcall -version=0x600+ GetUserDefaultLocaleName(wstr long) @ stdcall GetUserDefaultUILanguage() @ stdcall GetUserGeoID(long) -@ stub -version=0x600+ GetUserPreferredUILanguages +@ stdcall -version=0x600+ GetUserPreferredUILanguages(long ptr wstr ptr) @ stdcall GetVDMCurrentDirectories(long long) @ stdcall GetVersion() @ stdcall GetVersionExA(ptr) @@ -709,15 +710,15 @@ @ stdcall InitAtomTable(long) @ stub -version=0x600+ InitOnceBeginInitialize @ stub -version=0x600+ InitOnceComplete -@ stub -version=0x600+ InitOnceExecuteOnce +@ stdcall -version=0x600+ InitOnceExecuteOnce(ptr ptr ptr ptr) @ stub -version=0x600+ InitOnceInitialize -@ stub -version=0x600+ InitializeConditionVariable +@ stdcall -version=0x600+ InitializeConditionVariable(ptr) ntdll.RtlInitializeConditionVariable @ stdcall InitializeCriticalSection(ptr) @ stdcall InitializeCriticalSectionAndSpinCount(ptr long) -@ stub -version=0x600+ InitializeCriticalSectionEx +@ stdcall -version=0x600+ InitializeCriticalSectionEx(ptr long long) @ stub -version=0x600+ InitializeProcThreadAttributeList @ stdcall InitializeSListHead(ptr) ntdll.RtlInitializeSListHead -@ stub -version=0x600+ InitializeSRWLock +@ stdcall -version=0x600+ InitializeSRWLock(ptr) ntdll.RtlInitializeSRWLock @ stdcall -arch=i386 -ret64 InterlockedCompareExchange64(ptr double double) ntdll.RtlInterlockedCompareExchange64 @ stdcall -arch=i386 InterlockedCompareExchange(ptr long long) @ stdcall -arch=i386 InterlockedDecrement(ptr) @@ -727,7 +728,7 @@ @ stdcall -arch=i386 InterlockedIncrement(ptr) @ stdcall InterlockedPopEntrySList(ptr) ntdll.RtlInterlockedPopEntrySList @ stdcall InterlockedPushEntrySList(ptr ptr) ntdll.RtlInterlockedPushEntrySList -@ stub -version=0x600+ InterlockedPushListSList +@ fastcall -version=0x600+ InterlockedPushListSList(ptr ptr ptr long) ntdll.RtlInterlockedPushListSList @ stdcall InvalidateConsoleDIBits(long long) @ stdcall IsBadCodePtr(ptr) @ stdcall IsBadHugeReadPtr(ptr long) @@ -747,7 +748,7 @@ @ stdcall IsProcessInJob(long long ptr) @ stdcall IsProcessorFeaturePresent(long) @ stdcall IsSystemResumeAutomatic() -@ stub -version=0x600+ IsThreadAFiber +@ stdcall -version=0x600+ IsThreadAFiber() @ stub -version=0x600+ IsThreadpoolTimerSet @ stdcall IsTimeZoneRedirectionEnabled() @ stub -version=0x600+ IsValidCalDateTime @@ -756,7 +757,7 @@ @ stdcall IsValidLocale(long long) @ stdcall -version=0x501-0x502 IsValidUILanguage(long) @ stdcall IsWow64Process(ptr ptr) -@ stub -version=0x600+ LCIDToLocaleName +@ stdcall -version=0x600+ LCIDToLocaleName(long wstr long long) @ stdcall LCMapStringA(long long str long ptr long) @ stdcall -version=0x600+ LCMapStringEx(long long wstr long ptr long ptr ptr long) @ stdcall LCMapStringW(long long wstr long ptr long) @@ -792,7 +793,7 @@ @ stdcall LocalShrink(long long) @ stdcall LocalSize(long) @ stdcall LocalUnlock(long) -@ stub -version=0x600+ LocaleNameToLCID +@ stdcall -version=0x600+ LocaleNameToLCID(wstr long) @ stdcall LockFile(long long long long long) @ stdcall LockFileEx(long long long long long ptr) @ stdcall LockResource(long) @@ -832,7 +833,7 @@ @ stdcall OpenEventA(long long str) @ stdcall OpenEventW(long long wstr) @ stdcall OpenFile(str ptr long) -@ stub -version=0x600+ OpenFileById +@ stdcall -version=0x600+ OpenFileById(ptr ptr long long ptr long) @ stdcall OpenFileMappingA(long long str) @ stdcall OpenFileMappingW(long long wstr) @ stdcall OpenJobObjectA(long long str) @@ -869,8 +870,8 @@ @ stdcall QueryDepthSList(ptr) ntdll.RtlQueryDepthSList @ stdcall QueryDosDeviceA(str ptr long) @ stdcall QueryDosDeviceW(wstr ptr long) -@ stub -version=0x600+ QueryFullProcessImageNameA -@ stub -version=0x600+ QueryFullProcessImageNameW +@ stdcall -version=0x600+ QueryFullProcessImageNameA(ptr long str ptr) +@ stdcall -version=0x600+ QueryFullProcessImageNameW(ptr long wstr ptr) @ stub -version=0x600+ QueryIdleProcessorCycleTime @ stdcall QueryInformationJobObject(long long ptr long ptr) @ stdcall QueryMemoryResourceNotification(ptr ptr) @@ -899,8 +900,8 @@ @ stdcall ReadFileEx(long ptr long ptr ptr) @ stdcall ReadFileScatter(long ptr long ptr ptr) @ stdcall ReadProcessMemory(long ptr ptr long ptr) -@ stub -version=0x600+ RegisterApplicationRecoveryCallback -@ stub -version=0x600+ RegisterApplicationRestart +@ stdcall -version=0x600+ RegisterApplicationRecoveryCallback(ptr ptr long long) +@ stdcall -version=0x600+ RegisterApplicationRestart(wstr long) @ stdcall RegisterConsoleIME(ptr ptr) @ stdcall RegisterConsoleOS2(long) @ stdcall RegisterConsoleVDM(long long long long long long long long long long long) @@ -912,8 +913,8 @@ @ stdcall ReleaseActCtx(ptr) @ stdcall ReleaseMutex(long) @ stub -version=0x600+ ReleaseMutexWhenCallbackReturns -@ stub -version=0x600+ ReleaseSRWLockExclusive -@ stub -version=0x600+ ReleaseSRWLockShared +@ stdcall -version=0x600+ ReleaseSRWLockExclusive(ptr) ntdll.RtlReleaseSRWLockExclusive +@ stdcall -version=0x600+ ReleaseSRWLockShared(ptr) ntdll.RtlReleaseSRWLockShared @ stdcall ReleaseSemaphore(long long ptr) @ stub -version=0x600+ ReleaseSemaphoreWhenCallbackReturns @ stdcall RemoveDirectoryA(str) @@ -1025,7 +1026,7 @@ @ stub -version=0x600+ SetFileAttributesTransactedA @ stub -version=0x600+ SetFileAttributesTransactedW @ stdcall SetFileAttributesW(wstr long) -@ stub -version=0x600+ SetFileBandwidthReservation +@ stdcall -version=0x600+ SetFileBandwidthReservation(ptr long long long ptr ptr) @ stdcall SetFileCompletionNotificationModes(ptr long) @ stub -version=0x600+ SetFileInformationByHandle @ stub -version=0x600+ SetFileIoOverlappedRange @@ -1075,7 +1076,7 @@ @ stdcall SetThreadExecutionState(long) @ stdcall SetThreadIdealProcessor(long long) @ stdcall SetThreadLocale(long) -@ stub -version=0x600+ SetThreadPreferredUILanguages +@ stdcall -version=0x600+ SetThreadPreferredUILanguages(long wstr ptr) @ stdcall SetThreadPriority(long long) @ stdcall SetThreadPriorityBoost(long long) @ stdcall SetThreadStackGuarantee(ptr) @@ -1099,8 +1100,8 @@ @ stdcall SignalObjectAndWait(long long long long) @ stdcall SizeofResource(long long) @ stdcall Sleep(long) -@ stub -version=0x600+ SleepConditionVariableCS -@ stub -version=0x600+ SleepConditionVariableSRW +@ stdcall -version=0x600+ SleepConditionVariableCS(ptr ptr long) +@ stdcall -version=0x600+ SleepConditionVariableSRW(ptr ptr long long) @ stdcall SleepEx(long long) @ stub -version=0x600+ StartThreadpoolIo @ stub -version=0x600+ SubmitThreadpoolWork @@ -1175,8 +1176,8 @@ @ stub -version=0x600+ WaitForThreadpoolWorkCallbacks @ stdcall WaitNamedPipeA(str long) @ stdcall WaitNamedPipeW(wstr long) -@ stub -version=0x600+ WakeAllConditionVariable -@ stub -version=0x600+ WakeConditionVariable +@ stdcall -version=0x600+ WakeAllConditionVariable(ptr) ntdll.RtlWakeAllConditionVariable +@ stdcall -version=0x600+ WakeConditionVariable(ptr) ntdll.RtlWakeConditionVariable @ stub -version=0x600+ WerGetFlags @ stub -version=0x600+ WerRegisterFile @ stub -version=0x600+ WerRegisterMemoryBlock diff --git a/dll/win32/kernel32/kernel32_vista/CMakeLists.txt b/dll/win32/kernel32/kernel32_vista/CMakeLists.txt index 51efae70f8b..acc53b9d80a 100644 --- a/dll/win32/kernel32/kernel32_vista/CMakeLists.txt +++ b/dll/win32/kernel32/kernel32_vista/CMakeLists.txt @@ -7,17 +7,17 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/subsys) spec2def(kernel32_vista.dll kernel32_vista.spec ADD_IMPORTLIB) list(APPEND SOURCE - DllMain.c GetFileInformationByHandleEx.c GetTickCount64.c InitOnceExecuteOnce.c sync.c - vista.c - ${CMAKE_CURRENT_BINARY_DIR}/kernel32_vista.def) + vista.c) -add_library(kernel32_vista MODULE ${SOURCE}) +add_library(kernel32_vista_static ${SOURCE}) +add_dependencies(kernel32_vista_static psdk) +add_library(kernel32_vista MODULE DllMain.c ${CMAKE_CURRENT_BINARY_DIR}/kernel32_vista.def) set_module_type(kernel32_vista win32dll ENTRYPOINT DllMain 12) -target_link_libraries(kernel32_vista kernel32_shared) +target_link_libraries(kernel32_vista kernel32_vista_static kernel32_shared) add_importlibs(kernel32_vista kernel32 ntdll_vista ntdll) add_delay_importlibs(kernel32_vista ntdll_vista) add_dependencies(kernel32_vista psdk) diff --git a/dll/win32/kernel32/winnls/string/lang.c b/dll/win32/kernel32/winnls/string/lang.c index b75bd4972c2..51f1edf0175 100644 --- a/dll/win32/kernel32/winnls/string/lang.c +++ b/dll/win32/kernel32/winnls/string/lang.c @@ -32,6 +32,12 @@ DEBUG_CHANNEL(nls); #include "japanese.h" #endif +#undef WINVER +#define WINVER 0x600 + +/* From winnls.h */ +#define LOCALE_NAME_USER_DEFAULT NULL + #define REG_SZ 1 extern int wine_fold_string(int flags, const WCHAR *src, int srclen, WCHAR *dst, int dstlen); extern int wine_get_sortkey(int flags, const WCHAR *src, int srclen, char *dst, int dstlen); diff --git a/dll/win32/kernel32/winnls/string/lcformat.c b/dll/win32/kernel32/winnls/string/lcformat.c index 5e5b529df9e..5761035109f 100644 --- a/dll/win32/kernel32/winnls/string/lcformat.c +++ b/dll/win32/kernel32/winnls/string/lcformat.c @@ -31,6 +31,20 @@ #include <debug.h> DEBUG_CHANNEL(nls); +#undef _WIN32_WINNT +#undef WINVER +#define _WIN32_WINNT DLL_EXPORT_VERSION +#define WINVER DLL_EXPORT_VERSION + +LCID WINAPI LocaleNameToLCID(_In_ LPCWSTR, _In_ DWORD); +#define LOCALE_SSHORTESTDAYNAME1 96 +#define LOCALE_SSHORTESTDAYNAME2 97 +#define LOCALE_SSHORTESTDAYNAME3 98 +#define LOCALE_SSHORTESTDAYNAME4 99 +#define LOCALE_SSHORTESTDAYNAME5 100 +#define LOCALE_SSHORTESTDAYNAME6 101 +#define LOCALE_SSHORTESTDAYNAME7 102 + #define CRITICAL_SECTION RTL_CRITICAL_SECTION #define CRITICAL_SECTION_DEBUG RTL_CRITICAL_SECTION_DEBUG #define CALINFO_MAX_YEAR 2029

1 year, 1 month

[reactos] 04/10: [NTDLL] Fix some vista exports

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=49da1cdbebf6293fa5c17… commit 49da1cdbebf6293fa5c17645d13ba9ad547425d2 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Aug 5 15:05:20 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Aug 11 19:00:42 2023 +0300 [NTDLL] Fix some vista exports Make sure RtlRemovePrivileges gets compiled, when DLL_EXPORT_VERSION is 0x600+ Enable all existing functions from rtl_vista. Hack CsrNewThread export to exist on later versions, too --- dll/ntdll/def/ntdll.spec | 30 +++++++++++++++--------------- sdk/lib/rtl/priv.c | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dll/ntdll/def/ntdll.spec b/dll/ntdll/def/ntdll.spec index 96200db55dc..801feeca335 100644 --- a/dll/ntdll/def/ntdll.spec +++ b/dll/ntdll/def/ntdll.spec @@ -38,7 +38,7 @@ @ stdcall CsrFreeCaptureBuffer(ptr) @ stdcall CsrGetProcessId() @ stdcall CsrIdentifyAlertableThread() -@ stdcall -version=0x502 CsrNewThread() +@ stdcall -version=0x502+ CsrNewThread() # Should be only 0x502, but we need it for now @ stdcall -version=0x502 CsrProbeForRead(ptr long long) @ stdcall -version=0x502 CsrProbeForWrite(ptr long long) @ stdcall CsrSetPriorityClass(ptr ptr) @@ -607,8 +607,8 @@ @ stdcall RtlAcquirePrivilege(ptr long long ptr) @ stdcall RtlAcquireResourceExclusive(ptr long) @ stdcall RtlAcquireResourceShared(ptr long) -@ stdcall -stub -version=0x600+ RtlAcquireSRWLockExclusive(ptr) -@ stdcall -stub -version=0x600+ RtlAcquireSRWLockShared(ptr) +@ stdcall -version=0x600+ RtlAcquireSRWLockExclusive(ptr) +@ stdcall -version=0x600+ RtlAcquireSRWLockShared(ptr) @ stdcall RtlActivateActivationContext(long ptr ptr) @ stdcall RtlActivateActivationContextEx(long ptr ptr ptr) @ stdcall -arch=x86_64,arm RtlActivateActivationContextUnsafeFast(ptr ptr) @@ -936,7 +936,7 @@ @ stdcall RtlInitUnicodeStringEx(ptr wstr) @ stdcall -stub RtlInitializeAtomPackage(ptr) @ stdcall RtlInitializeBitMap(ptr long long) -@ stdcall -stub -version=0x600+ RtlInitializeConditionVariable(ptr) +@ stdcall -version=0x600+ RtlInitializeConditionVariable(ptr) @ stdcall RtlInitializeContext(ptr ptr ptr ptr ptr) @ stdcall RtlInitializeCriticalSection(ptr) @ stdcall RtlInitializeCriticalSectionAndSpinCount(ptr long) @@ -949,7 +949,7 @@ @ stdcall RtlInitializeRXact(ptr long ptr) @ stdcall RtlInitializeResource(ptr) @ stdcall RtlInitializeSListHead(ptr) -@ stdcall -stub -version=0x600+ RtlInitializeSRWLock(ptr) +@ stdcall -version=0x600+ RtlInitializeSRWLock(ptr) @ stdcall RtlInitializeSid(ptr ptr long) @ stdcall RtlInsertElementGenericTable(ptr ptr long ptr) @ stdcall RtlInsertElementGenericTableAvl(ptr ptr long ptr) @@ -1108,8 +1108,8 @@ @ stdcall RtlReleasePrivilege(ptr) @ stdcall RtlReleaseRelativeName(ptr) @ stdcall RtlReleaseResource(ptr) -@ stdcall -stub -version=0x600+ RtlReleaseSRWLockExclusive(ptr) -@ stdcall -stub -version=0x600+ RtlReleaseSRWLockShared(ptr) +@ stdcall -version=0x600+ RtlReleaseSRWLockExclusive(ptr) +@ stdcall -version=0x600+ RtlReleaseSRWLockShared(ptr) @ stdcall RtlRemoteCall(ptr ptr ptr long ptr long long) @ stdcall -version=0x600+ RtlRemovePrivileges(ptr ptr long) @ stdcall RtlRemoveVectoredContinueHandler(ptr) @@ -1124,10 +1124,10 @@ @ stdcall RtlRevertMemoryStream(ptr) @ stdcall RtlRunDecodeUnicodeString(long ptr) @ stdcall RtlRunEncodeUnicodeString(long ptr) -@ stdcall -stub -version=0x600+ RtlRunOnceBeginInitialize(ptr long ptr) -@ stdcall -stub -version=0x600+ RtlRunOnceComplete(ptr long ptr) -@ stdcall -stub -version=0x600+ RtlRunOnceExecuteOnce(ptr ptr ptr ptr) -@ stdcall -stub -version=0x600+ RtlRunOnceInitialize(ptr) +@ stdcall -version=0x600+ RtlRunOnceBeginInitialize(ptr long ptr) +@ stdcall -version=0x600+ RtlRunOnceComplete(ptr long ptr) +@ stdcall -version=0x600+ RtlRunOnceExecuteOnce(ptr ptr ptr ptr) +@ stdcall -version=0x600+ RtlRunOnceInitialize(ptr) @ stdcall RtlSecondsSince1970ToTime(long ptr) @ stdcall RtlSecondsSince1980ToTime(long ptr) @ stdcall RtlSeekMemoryStream(ptr int64 long ptr) @@ -1177,8 +1177,8 @@ @ stub -version=0x600+ RtlSidHashLookup @ stub -version=0x600+ RtlSidIsHigherLevel @ stdcall RtlSizeHeap(long long ptr) -@ stdcall -stub -version=0x600+ RtlSleepConditionVariableCS(ptr ptr ptr) -@ stdcall -stub -version=0x600+ RtlSleepConditionVariableSRW(ptr ptr ptr long) +@ stdcall -version=0x600+ RtlSleepConditionVariableCS(ptr ptr ptr) +@ stdcall -version=0x600+ RtlSleepConditionVariableSRW(ptr ptr ptr long) @ stdcall RtlSplay(ptr) @ stdcall RtlStartRXact(ptr) @ stdcall RtlStatMemoryStream(ptr ptr long) @@ -1250,8 +1250,8 @@ @ stdcall RtlValidateUnicodeString(long ptr) @ stdcall RtlVerifyVersionInfo(ptr long double) @ stdcall -arch=x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) -@ stdcall -stub -version=0x600+ RtlWakeAllConditionVariable(ptr) -@ stdcall -stub -version=0x600+ RtlWakeConditionVariable(ptr) +@ stdcall -version=0x600+ RtlWakeAllConditionVariable(ptr) +@ stdcall -version=0x600+ RtlWakeConditionVariable(ptr) @ stdcall RtlWalkFrameChain(ptr long long) @ stdcall RtlWalkHeap(long ptr) @ stub -version=0x600+ RtlWerpReportException diff --git a/sdk/lib/rtl/priv.c b/sdk/lib/rtl/priv.c index 0070140103f..d8240265359 100644 --- a/sdk/lib/rtl/priv.c +++ b/sdk/lib/rtl/priv.c @@ -487,7 +487,7 @@ RtlAdjustPrivilege(IN ULONG Privilege, return STATUS_SUCCESS; } -#if (NTDDI_VERSION >= NTDDI_VISTA) +#if (NTDDI_VERSION >= NTDDI_VISTA) || (DLL_EXPORT_VERSION >= _WIN32_WINNT_VISTA) /** * @brief

1 year, 1 month

[reactos] 03/10: [SPEC2DEF] Add missing "--version" to help output

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=55e0cab5973de8fce067a… commit 55e0cab5973de8fce067ae46ebe734537204447f Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Aug 5 14:58:17 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Aug 11 19:00:42 2023 +0300 [SPEC2DEF] Add missing "--version" to help output --- sdk/tools/spec2def/spec2def.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/tools/spec2def/spec2def.c b/sdk/tools/spec2def/spec2def.c index ee50fe01f35..2ec775cc390 100644 --- a/sdk/tools/spec2def/spec2def.c +++ b/sdk/tools/spec2def/spec2def.c @@ -1404,6 +1404,7 @@ void usage(void) " -s=<file> generate a stub file\n" " --ms MSVC compatibility\n" " -n=<name> name of the dll\n" + " --version=<version> Sets the version to create exports for\n" " --implib generate a def file for an import library\n" " --no-private-warnings suppress warnings about symbols that should be -private\n" " -a=<arch> set architecture to <arch> (i386, x86_64, arm, arm64)\n"

1 year, 1 month

[reactos] 02/10: [SDK] Define _NTSYSTEM_ in stubs.h

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f229726da9543386d09a1… commit f229726da9543386d09a157bb474c7190bc888ce Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Aug 5 14:57:38 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Aug 11 19:00:42 2023 +0300 [SDK] Define _NTSYSTEM_ in stubs.h We don't want to import RtlRaiseException, when building stubs for NTDLL. --- sdk/include/reactos/stubs.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/include/reactos/stubs.h b/sdk/include/reactos/stubs.h index 21b85d492da..6b5cd36372c 100644 --- a/sdk/include/reactos/stubs.h +++ b/sdk/include/reactos/stubs.h @@ -1,4 +1,5 @@ #define WIN32_NO_STATUS +#define _NTSYSTEM_ #include <windef.h> #ifndef PRIx64

1 year, 1 month

[reactos] 01/10: [CMAKE] Add DLL_EXPORT_VERSION config option

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3c2bfb570fa745cd2d5fb… commit 3c2bfb570fa745cd2d5fb2b755204ac7ac9c22b2 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Aug 5 14:56:11 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Aug 11 19:00:42 2023 +0300 [CMAKE] Add DLL_EXPORT_VERSION config option Set this to e.g. 0x600 to build with Vista exports --- CMakeLists.txt | 3 ++- sdk/cmake/config.cmake | 3 +++ sdk/cmake/gcc.cmake | 8 +++++--- sdk/cmake/msvc.cmake | 8 +++++--- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 19b3c6b6931..12dd07e5085 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -232,7 +232,8 @@ Enable this if the module uses typeid or dynamic_cast. You will probably need to -D_WIN32_WINNT=0x502 -D_WIN32_WINDOWS=0x502 -D_SETUPAPI_VER=0x502 - -DMINGW_HAS_SECURE_API=1) + -DMINGW_HAS_SECURE_API=1 + -DDLL_EXPORT_VERSION=${DLL_EXPORT_VERSION}) # Arch Options if(ARCH STREQUAL "i386") diff --git a/sdk/cmake/config.cmake b/sdk/cmake/config.cmake index 5e6243dd35a..77b26a0383e 100644 --- a/sdk/cmake/config.cmake +++ b/sdk/cmake/config.cmake @@ -114,3 +114,6 @@ endif() set(USE_DUMMY_PSEH FALSE CACHE BOOL "Whether to disable PSEH support.") + +set(DLL_EXPORT_VERSION "0x502" CACHE STRING +"The NT version the user mode DLLs target.") diff --git a/sdk/cmake/gcc.cmake b/sdk/cmake/gcc.cmake index 03b481b0140..a4a013ed6a0 100644 --- a/sdk/cmake/gcc.cmake +++ b/sdk/cmake/gcc.cmake @@ -345,11 +345,11 @@ function(fixup_load_config _target) DEPENDS native-pefixup) endfunction() -function(generate_import_lib _libname _dllname _spec_file) +function(generate_import_lib _libname _dllname _spec_file __version_arg) # Generate the def for the import lib add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_libname}_implib.def - COMMAND native-spec2def -n=${_dllname} -a=${ARCH2} ${ARGN} --implib -d=${CMAKE_CURRENT_BINARY_DIR}/${_libname}_implib.def ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} + COMMAND native-spec2def ${__version_arg} -n=${_dllname} -a=${ARCH2} ${ARGN} --implib -d=${CMAKE_CURRENT_BINARY_DIR}/${_libname}_implib.def ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} native-spec2def) # With this, we let DLLTOOL create an import library @@ -415,6 +415,8 @@ function(spec2def _dllname _spec_file) if(__spec2def_VERSION) set(__version_arg "--version=0x${__spec2def_VERSION}") + else() + set(__version_arg "--version=${DLL_EXPORT_VERSION}") endif() # Generate exports def and C stubs file for the DLL @@ -429,7 +431,7 @@ function(spec2def _dllname _spec_file) set(_extraflags --no-private-warnings) endif() - generate_import_lib(lib${_file} ${_dllname} ${_spec_file} ${_extraflags}) + generate_import_lib(lib${_file} ${_dllname} ${_spec_file} ${_extraflags} "${__version_arg}") endif() endfunction() diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index 3981715190b..8dcfc8d43cc 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -312,7 +312,7 @@ function(fixup_load_config _target) # msvc knows how to generate a load_config so no hacks here endfunction() -function(generate_import_lib _libname _dllname _spec_file) +function(generate_import_lib _libname _dllname _spec_file __version_arg) set(_def_file ${CMAKE_CURRENT_BINARY_DIR}/${_libname}_implib.def) set(_asm_stubs_file ${CMAKE_CURRENT_BINARY_DIR}/${_libname}_stubs.asm) @@ -320,7 +320,7 @@ function(generate_import_lib _libname _dllname _spec_file) # Generate the def and asm stub files add_custom_command( OUTPUT ${_asm_stubs_file} ${_def_file} - COMMAND native-spec2def --ms -a=${SPEC2DEF_ARCH} --implib -n=${_dllname} -d=${_def_file} -l=${_asm_stubs_file} ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} + COMMAND native-spec2def --ms ${__version_arg} -a=${SPEC2DEF_ARCH} --implib -n=${_dllname} -d=${_def_file} -l=${_asm_stubs_file} ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} native-spec2def) # Compile the generated asm stub file @@ -386,6 +386,8 @@ function(spec2def _dllname _spec_file) if(__spec2def_VERSION) set(__version_arg "--version=0x${__spec2def_VERSION}") + else() + set(__version_arg "--version=${DLL_EXPORT_VERSION}") endif() # Generate exports def and C stubs file for the DLL @@ -395,7 +397,7 @@ function(spec2def _dllname _spec_file) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} native-spec2def) if(__spec2def_ADD_IMPORTLIB) - generate_import_lib(lib${_file} ${_dllname} ${_spec_file}) + generate_import_lib(lib${_file} ${_dllname} ${_spec_file} "${__version_arg}") if(__spec2def_NO_PRIVATE_WARNINGS) set_property(TARGET lib${_file} APPEND PROPERTY STATIC_LIBRARY_OPTIONS /ignore:4104) endif()

1 year, 1 month

[reactos] 03/03: [MSPAINT] Update Russian (ru-RU) translation

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a970c50a830773be4968d… commit a970c50a830773be4968d7c041e336e6311ee307 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Fri Aug 11 15:52:46 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Fri Aug 11 15:52:46 2023 +0300 [MSPAINT] Update Russian (ru-RU) translation Addendum to ba53f72a87f and e6c23361a12. --- base/applications/mspaint/lang/ru-RU.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/applications/mspaint/lang/ru-RU.rc b/base/applications/mspaint/lang/ru-RU.rc index 94e187feb63..05bfa15efc9 100644 --- a/base/applications/mspaint/lang/ru-RU.rc +++ b/base/applications/mspaint/lang/ru-RU.rc @@ -266,6 +266,6 @@ BEGIN IDS_PRINTRES "%d x %d точек/см" IDS_CANTPASTE "Не удалось вставить из буфера обмена. Формат данных либо некорректный, либо не поддерживается." IDS_SAVEERROR "Не удалось сохранить точечный рисунок в файл:\n\n%s" - IDS_CANTSENDMAIL "Failed to send a mail." - IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" + IDS_CANTSENDMAIL "Не удалось отправить письмо." + IDS_LOSECOLOR "В результате этой операции сведения о цвете будут потеряны. Продолжить?" END

1 year, 1 month

[reactos] 02/03: [EXPLORER] Update Russian (ru-RU) translation

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=153a9a05aa98b63a03454… commit 153a9a05aa98b63a034549c182d62d120f803dc7 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Fri Aug 11 15:40:56 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Fri Aug 11 15:52:33 2023 +0300 [EXPLORER] Update Russian (ru-RU) translation Addendum to 28ae9fb7384. --- base/shell/explorer/lang/ru-RU.rc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/base/shell/explorer/lang/ru-RU.rc b/base/shell/explorer/lang/ru-RU.rc index 671484c0795..1dd2a57fe91 100644 --- a/base/shell/explorer/lang/ru-RU.rc +++ b/base/shell/explorer/lang/ru-RU.rc @@ -82,7 +82,7 @@ BEGIN AUTOCHECKBOX "Отображать панель задач &поверх других окон", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Группировать схожие кнопки панели задач", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Отображать панель &быстрого запуска", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - AUTOCHECKBOX "U&se small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 + AUTOCHECKBOX "&Использовать маленькие значки", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -105,15 +105,15 @@ CAPTION "Область уведомлений" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 - GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + GROUPBOX "Значки", IDC_STATIC, 6, 36, 240, 56 LTEXT "Можно избежать загромождения области уведомлений, скрывая значки, которые давно не использовались.", IDC_STATIC, 13, 48, 223, 16 - AUTOCHECKBOX "Скрывать &неиспользуемые значки", IDC_TASKBARPROP_HIDEICONS, 13, 70, 128, 10 + AUTOCHECKBOX "&Скрывать неиспользуемые значки", IDC_TASKBARPROP_HIDEICONS, 13, 70, 128, 10 PUSHBUTTON "&Настроить...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 - GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 - LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + GROUPBOX "Системные значки", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Выберите, какие системные значки показывать всегда.", IDC_STATIC, 13, 113, 223, 8 AUTOCHECKBOX "Отображать &часы", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 - AUTOCHECKBOX "Отображать &секунды", IDC_TASKBARPROP_SECONDS, 120, 127, 83, 10, WS_DISABLED - AUTOCHECKBOX "&Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 + AUTOCHECKBOX "Отображать секунды", IDC_TASKBARPROP_SECONDS, 120, 127, 84, 10, WS_DISABLED + AUTOCHECKBOX "&Рабочий стол", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 END IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240

1 year, 1 month

[reactos] 01/03: [EXPLORER] Add missing mnemonic keys to keep sync with en-US.rc

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3bb028380aacbb2553e95… commit 3bb028380aacbb2553e95c62df3c861a1de44271 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Fri Aug 11 15:34:22 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Fri Aug 11 15:52:32 2023 +0300 [EXPLORER] Add missing mnemonic keys to keep sync with en-US.rc Addendum to 28ae9fb7384. --- base/shell/explorer/lang/bg-BG.rc | 4 ++-- base/shell/explorer/lang/cs-CZ.rc | 4 ++-- base/shell/explorer/lang/de-DE.rc | 4 ++-- base/shell/explorer/lang/es-ES.rc | 4 ++-- base/shell/explorer/lang/et-EE.rc | 4 ++-- base/shell/explorer/lang/eu-ES.rc | 4 ++-- base/shell/explorer/lang/fi-FI.rc | 4 ++-- base/shell/explorer/lang/fr-FR.rc | 4 ++-- base/shell/explorer/lang/he-IL.rc | 4 ++-- base/shell/explorer/lang/hi-IN.rc | 4 ++-- base/shell/explorer/lang/hu-HU.rc | 4 ++-- base/shell/explorer/lang/id-ID.rc | 4 ++-- base/shell/explorer/lang/it-IT.rc | 4 ++-- base/shell/explorer/lang/ja-JP.rc | 4 ++-- base/shell/explorer/lang/ko-KR.rc | 4 ++-- base/shell/explorer/lang/lt-LT.rc | 4 ++-- base/shell/explorer/lang/ms-MY.rc | 4 ++-- base/shell/explorer/lang/nl-NL.rc | 4 ++-- base/shell/explorer/lang/no-NO.rc | 4 ++-- base/shell/explorer/lang/pl-PL.rc | 4 ++-- base/shell/explorer/lang/pt-BR.rc | 4 ++-- base/shell/explorer/lang/pt-PT.rc | 4 ++-- base/shell/explorer/lang/ro-RO.rc | 4 ++-- base/shell/explorer/lang/ru-RU.rc | 4 ++-- base/shell/explorer/lang/sk-SK.rc | 4 ++-- base/shell/explorer/lang/sq-AL.rc | 4 ++-- base/shell/explorer/lang/tr-TR.rc | 4 ++-- base/shell/explorer/lang/uk-UA.rc | 4 ++-- base/shell/explorer/lang/zh-CN.rc | 4 ++-- base/shell/explorer/lang/zh-HK.rc | 4 ++-- base/shell/explorer/lang/zh-TW.rc | 4 ++-- 31 files changed, 62 insertions(+), 62 deletions(-) diff --git a/base/shell/explorer/lang/bg-BG.rc b/base/shell/explorer/lang/bg-BG.rc index f4efc7fc621..f426f017b53 100644 --- a/base/shell/explorer/lang/bg-BG.rc +++ b/base/shell/explorer/lang/bg-BG.rc @@ -79,7 +79,7 @@ BEGIN AUTOCHECKBOX "Лентата със задачите стои над останалите прозорци", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "Групиране на приложенията в лентата със задачите", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Показване на бърз старт", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 + AUTOCHECKBOX "U&se small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -110,7 +110,7 @@ BEGIN LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 AUTOCHECKBOX "&Часовник", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 AUTOCHECKBOX "Покажи секундите", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED - AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 + AUTOCHECKBOX "&Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 END IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 diff --git a/base/shell/explorer/lang/cs-CZ.rc b/base/shell/explorer/lang/cs-CZ.rc index af53b5a26dc..f2703454ba8 100644 --- a/base/shell/explorer/lang/cs-CZ.rc +++ b/base/shell/explorer/lang/cs-CZ.rc @@ -78,7 +78,7 @@ BEGIN AUTOCHECKBOX "&Zobrazit hlavní panel nad ostatními okny", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Seskupovat podobná tlačítka hlavního panelu", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Zobrazit &panel Snadné spuštění", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 + AUTOCHECKBOX "U&se small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -109,7 +109,7 @@ BEGIN LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 AUTOCHECKBOX "&Zobrazit hodiny", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 AUTOCHECKBOX "Zobrazit sekundy", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED - AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 + AUTOCHECKBOX "&Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 END IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 diff --git a/base/shell/explorer/lang/de-DE.rc b/base/shell/explorer/lang/de-DE.rc index 9de204a5e59..6c582df58c2 100644 --- a/base/shell/explorer/lang/de-DE.rc +++ b/base/shell/explorer/lang/de-DE.rc @@ -82,7 +82,7 @@ BEGIN AUTOCHECKBOX "&Taskleiste immer im Vordergrund halten", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "Ähnliche Buttons &gruppieren", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Schnellstartleiste &anzeigen", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 + AUTOCHECKBOX "U&se small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -113,7 +113,7 @@ BEGIN LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 AUTOCHECKBOX "&Uhr Anzeigen", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 AUTOCHECKBOX "Sekunden Anzeigen", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED - AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 + AUTOCHECKBOX "&Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 END IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 diff --git a/base/shell/explorer/lang/es-ES.rc b/base/shell/explorer/lang/es-ES.rc index 72656875165..ce1cb64085c 100644 --- a/base/shell/explorer/lang/es-ES.rc +++ b/base/shell/explorer/lang/es-ES.rc @@ -82,7 +82,7 @@ BEGIN AUTOCHECKBOX "Mantener la barra de tareas &siempre visible", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Agrupar botones similares de la barra de tareas", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Mostrar Inicio rápi&do", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 + AUTOCHECKBOX "U&se small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -113,7 +113,7 @@ BEGIN LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 AUTOCHECKBOX "Re&loj", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 AUTOCHECKBOX "Mostrar segundos", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED - AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 + AUTOCHECKBOX "&Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 END IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 diff --git a/base/shell/explorer/lang/et-EE.rc b/base/shell/explorer/lang/et-EE.rc index bcf309d01e9..55547a78c38 100644 --- a/base/shell/explorer/lang/et-EE.rc +++ b/base/shell/explorer/lang/et-EE.rc @@ -78,7 +78,7 @@ BEGIN AUTOCHECKBOX "Hoia &tegumiriba muude akende peall", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Rühmita sarnased tegumiriba nupud", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Kuva &kiirkäivitusikoonid", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 + AUTOCHECKBOX "U&se small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -109,7 +109,7 @@ BEGIN LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 AUTOCHECKBOX "Kuva &kell", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 AUTOCHECKBOX "Kuva sekundeid", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED - AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 + AUTOCHECKBOX "&Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 END IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 diff --git a/base/shell/explorer/lang/eu-ES.rc b/base/shell/explorer/lang/eu-ES.rc index 2b727731c11..12dc7a089fc 100644 --- a/base/shell/explorer/lang/eu-ES.rc +++ b/base/shell/explorer/lang/eu-ES.rc @@ -78,7 +78,7 @@ BEGIN AUTOCHECKBOX "&Eduki ataza-barra beste leihoen gainean", IDC_TASKBARPROP_ONTOP, 13,71,200,10 AUTOCHECKBOX "Elkart&u ataza-barrako antzeko botoiak", IDC_TASKBARPROP_GROUP, 13,84,200,10 AUTOCHECKBOX "Era&kutsi abiarazte bizkorra", IDC_TASKBARPROP_SHOWQL, 13,97,200,10 - AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 + AUTOCHECKBOX "U&se small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -109,7 +109,7 @@ BEGIN LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 AUTOCHECKBOX "Er&lojua", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 AUTOCHECKBOX "Erakutsi segunduak", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED - AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 + AUTOCHECKBOX "&Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 END IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 diff --git a/base/shell/explorer/lang/fi-FI.rc b/base/shell/explorer/lang/fi-FI.rc index 1b2acd2379e..f608afac06b 100644 --- a/base/shell/explorer/lang/fi-FI.rc +++ b/base/shell/explorer/lang/fi-FI.rc @@ -78,7 +78,7 @@ BEGIN AUTOCHECKBOX "&Pidä tehtäväpalkki muiden ikkunoiden päällä", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Ryhmitä samankaltaiset tehtäväpalkin painikkeet", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Näytä p&ikakäynnistys", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 + AUTOCHECKBOX "U&se small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -109,7 +109,7 @@ BEGIN LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 AUTOCHECKBOX "Näytä &kello", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 AUTOCHECKBOX "Näytä &sekunnit", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED - AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 + AUTOCHECKBOX "&Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 END IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 diff --git a/base/shell/explorer/lang/fr-FR.rc b/base/shell/explorer/lang/fr-FR.rc index 9daca429631..473c1aa8dfa 100644 --- a/base/shell/explorer/lang/fr-FR.rc +++ b/base/shell/explorer/lang/fr-FR.rc @@ -79,7 +79,7 @@ BEGIN AUTOCHECKBOX "Garder la barre des &tâches au-dessus des autres fenêtres", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Grouper les boutons similaires de la barre des tâches", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Montrer la &zone de lancement rapide", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 + AUTOCHECKBOX "U&se small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -110,7 +110,7 @@ BEGIN LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 AUTOCHECKBOX "&Horloge", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 AUTOCHECKBOX "Afficher les secondes", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED - AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 + AUTOCHECKBOX "&Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 END IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 diff --git a/base/shell/explorer/lang/he-IL.rc b/base/shell/explorer/lang/he-IL.rc index 8a1c55b5b0b..b704b545af8 100644 --- a/base/shell/explorer/lang/he-IL.rc +++ b/base/shell/explorer/lang/he-IL.rc @@ -78,7 +78,7 @@ BEGIN AUTOCHECKBOX "השאר את שורת המשימות תמיד מעל", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "קבץ לחצנים דומים", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "הראה את סרגל הפעלה מהירה", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 + AUTOCHECKBOX "U&se small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -109,7 +109,7 @@ BEGIN LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 AUTOCHECKBOX "שעון", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED - AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 + AUTOCHECKBOX "&Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 END IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 diff --git a/base/shell/explorer/lang/hi-IN.rc b/base/shell/explorer/lang/hi-IN.rc index 0c8558f2316..0c2cfa6784b 100644 --- a/base/shell/explorer/lang/hi-IN.rc +++ b/base/shell/explorer/lang/hi-IN.rc @@ -78,7 +78,7 @@ BEGIN AUTOCHECKBOX "टास्कबार को अन्य विंडो के शीर्ष पर रखें", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&समान टास्कबार बटन का समूह करे", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "&त्वरित लॉन्च दिखाएं", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 + AUTOCHECKBOX "U&se small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -109,7 +109,7 @@ BEGIN LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 AUTOCHECKBOX "&घड़ी दिखाओ", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 AUTOCHECKBOX "सेकंड दिखाएं", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED - AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 + AUTOCHECKBOX "&Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 END IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 diff --git a/base/shell/explorer/lang/hu-HU.rc b/base/shell/explorer/lang/hu-HU.rc index f09fa414fea..d5c5aa5560b 100644 --- a/base/shell/explorer/lang/hu-HU.rc +++ b/base/shell/explorer/lang/hu-HU.rc @@ -78,7 +78,7 @@ BEGIN AUTOCHECKBOX "A tálca mindig legyen &látható a többi ablak előtt", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "Hasonló tálca gombok &csoportosítása", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "&Gyorsindító megjelenítése", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 + AUTOCHECKBOX "U&se small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -109,7 +109,7 @@ BEGIN LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 AUTOCHECKBOX "Az óra &megjelenítése", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 AUTOCHECKBOX "Má&sodpercek megjelenítése", IDC_TASKBARPROP_SECONDS, 120, 127, 100, 10, WS_DISABLED - AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 + AUTOCHECKBOX "&Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 END IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 diff --git a/base/shell/explorer/lang/id-ID.rc b/base/shell/explorer/lang/id-ID.rc index d6ed221bbb5..7e0c29a7cd2 100644 --- a/base/shell/explorer/lang/id-ID.rc +++ b/base/shell/explorer/lang/id-ID.rc @@ -79,7 +79,7 @@ BEGIN AUTOCHECKBOX "Te&mpatkan bilah tugas pada bagian atas jendela lain", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "K&elompokkan tombol bilah tugas yang sama", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Tampilkan peluncur &cepat", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 + AUTOCHECKBOX "U&se small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -110,7 +110,7 @@ BEGIN LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 AUTOCHECKBOX "Tampil&kan jam", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 AUTOCHECKBOX "Tampilkan detik", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED - AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 + AUTOCHECKBOX "&Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 END IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 diff --git a/base/shell/explorer/lang/it-IT.rc b/base/shell/explorer/lang/it-IT.rc index 23a9b50159e..571f4c5f6f2 100644 --- a/base/shell/explorer/lang/it-IT.rc +++ b/base/shell/explorer/lang/it-IT.rc @@ -79,7 +79,7 @@ BEGIN AUTOCHECKBOX "Mantenere la Barra delle applicazioni in &primo piano", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Raggruppare pulsanti simili", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Mostrare Avvio &veloce", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 + AUTOCHECKBOX "U&se small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -110,7 +110,7 @@ BEGIN LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 AUTOCHECKBOX "Orolog&io", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED - AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 + AUTOCHECKBOX "&Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 END IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 diff --git a/base/shell/explorer/lang/ja-JP.rc b/base/shell/explorer/lang/ja-JP.rc index e8914d2f4ba..b93e3ab9fb5 100644 --- a/base/shell/explorer/lang/ja-JP.rc +++ b/base/shell/explorer/lang/ja-JP.rc @@ -80,7 +80,7 @@ BEGIN AUTOCHECKBOX "タスクバーを他のウインドウ上に保つ(&T)", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "類似するタスクバーボタンをグループ化する(&G)", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "クイック起動の表示(&Q)", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 + AUTOCHECKBOX "U&se small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -111,7 +111,7 @@ BEGIN LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 AUTOCHECKBOX "時計(&K)", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 AUTOCHECKBOX "秒を表示", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED - AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 + AUTOCHECKBOX "&Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 END IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 diff --git a/base/shell/explorer/lang/ko-KR.rc b/base/shell/explorer/lang/ko-KR.rc index 29abc0cc171..93c3527f512 100644 --- a/base/shell/explorer/lang/ko-KR.rc +++ b/base/shell/explorer/lang/ko-KR.rc @@ -79,7 +79,7 @@ BEGIN AUTOCHECKBOX "Keep the &taskbar on top of other windows", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Group similar taskbar buttons", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Show &Quick Launch", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 + AUTOCHECKBOX "U&se small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -110,7 +110,7 @@ BEGIN LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 AUTOCHECKBOX "Show cloc&k", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED - AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 + AUTOCHECKBOX "&Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 END IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 diff --git a/base/shell/explorer/lang/lt-LT.rc b/base/shell/explorer/lang/lt-LT.rc index 92d51c80bc0..bdd783cc19e 100644 --- a/base/shell/explorer/lang/lt-LT.rc +++ b/base/shell/explorer/lang/lt-LT.rc @@ -78,7 +78,7 @@ BEGIN AUTOCHECKBOX "Keep the &taskbar on top of other windows", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Group similar taskbar buttons", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Show &Quick Launch", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 + AUTOCHECKBOX "U&se small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -109,7 +109,7 @@ BEGIN LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 AUTOCHECKBOX "Cloc&k", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED - AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 + AUTOCHECKBOX "&Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 END IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 diff --git a/base/shell/explorer/lang/ms-MY.rc b/base/shell/explorer/lang/ms-MY.rc index 712a8aedf62..b5c046d694f 100644 --- a/base/shell/explorer/lang/ms-MY.rc +++ b/base/shell/explorer/lang/ms-MY.rc @@ -78,7 +78,7 @@ BEGIN AUTOCHECKBOX "Simpan bar &tugas ini di atas tetingkap lain", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "Butan&g bar tugas kumpulkan dengan sama", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Paparkan Pelancaran Pantas(&Q)", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 + AUTOCHECKBOX "U&se small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -109,7 +109,7 @@ BEGIN LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 AUTOCHECKBOX "Tunjukkan jam(&K)", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 AUTOCHECKBOX "Tunjukkan saat", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED - AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 + AUTOCHECKBOX "&Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 END IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 diff --git a/base/shell/explorer/lang/nl-NL.rc b/base/shell/explorer/lang/nl-NL.rc index a81d0c2fee4..11fa4d02da7 100644 --- a/base/shell/explorer/lang/nl-NL.rc +++ b/base/shell/explorer/lang/nl-NL.rc @@ -79,7 +79,7 @@ BEGIN AUTOCHECKBOX "Taakbalk altijd o&p voorgrond weergeven", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Gelijksoortige knoppen gegroepeerd weergeven", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Werkbalk &Snel starten weergeven", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 + AUTOCHECKBOX "U&se small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -110,7 +110,7 @@ BEGIN LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 AUTOCHECKBOX "&Klok", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED - AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 + AUTOCHECKBOX "&Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 END IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 diff --git a/base/shell/explorer/lang/no-NO.rc b/base/shell/explorer/lang/no-NO.rc index a9852d3e74a..3b37e8be177 100644 --- a/base/shell/explorer/lang/no-NO.rc +++ b/base/shell/explorer/lang/no-NO.rc @@ -78,7 +78,7 @@ BEGIN AUTOCHECKBOX "Behold &oppgavelinjen på toppen over andre vinduer", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Grupper og lignende knapper på oppgavelinjen", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Vis &hurtigstart", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 + AUTOCHECKBOX "U&se small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -109,7 +109,7 @@ BEGIN LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 AUTOCHECKBOX "Show clock", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED - AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 + AUTOCHECKBOX "&Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 END IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 diff --git a/base/shell/explorer/lang/pl-PL.rc b/base/shell/explorer/lang/pl-PL.rc index c282ada24bb..5fb0ea79d9a 100644 --- a/base/shell/explorer/lang/pl-PL.rc +++ b/base/shell/explorer/lang/pl-PL.rc @@ -81,7 +81,7 @@ BEGIN AUTOCHECKBOX "&Trzymaj pasek zadań na wierzchu", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Grupuj podobne przyciski paska zadań", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Pokaż pasek &Szybkiego uruchamiania", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 + AUTOCHECKBOX "U&se small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -112,7 +112,7 @@ BEGIN LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 AUTOCHECKBOX "Pokaż &zegar", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 AUTOCHECKBOX "Pokaż sekundy", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED - AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 + AUTOCHECKBOX "&Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 END IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 diff --git a/base/shell/explorer/lang/pt-BR.rc b/base/shell/explorer/lang/pt-BR.rc index 9c36ed9a014..efdb495cada 100644 --- a/base/shell/explorer/lang/pt-BR.rc +++ b/base/shell/explorer/lang/pt-BR.rc @@ -79,7 +79,7 @@ BEGIN AUTOCHECKBOX "&Manter barra de tarefas sobre outros janelas", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Agrupar botões similares da barra de tarefas", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "&Exibir Inicialização Rápida", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 + AUTOCHECKBOX "U&se small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -110,7 +110,7 @@ BEGIN LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 AUTOCHECKBOX "Reló&gio", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED - AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 + AUTOCHECKBOX "&Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 END IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 diff --git a/base/shell/explorer/lang/pt-PT.rc b/base/shell/explorer/lang/pt-PT.rc index 5cd3bd3ad36..dcc1584103d 100644 --- a/base/shell/explorer/lang/pt-PT.rc +++ b/base/shell/explorer/lang/pt-PT.rc @@ -80,7 +80,7 @@ BEGIN AUTOCHECKBOX "&Manter a barra de tarefas sobre outras janelas", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Agrupar botões similares da barra de tarefas", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "&Mostrar Iniciação Rápida", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 + AUTOCHECKBOX "U&se small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -111,7 +111,7 @@ BEGIN LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 AUTOCHECKBOX "Reló&gio", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 AUTOCHECKBOX "Mostrar segundos", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED - AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 + AUTOCHECKBOX "&Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 END IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 diff --git a/base/shell/explorer/lang/ro-RO.rc b/base/shell/explorer/lang/ro-RO.rc index e89edc15445..7ad4423780e 100644 --- a/base/shell/explorer/lang/ro-RO.rc +++ b/base/shell/explorer/lang/ro-RO.rc @@ -79,7 +79,7 @@ BEGIN AUTOCHECKBOX "&Menține bara de activități deasupra celorlalte ferestre", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Grupează butoanele similare din bara de activități", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Afișează bara „&Lansări rapide”", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 + AUTOCHECKBOX "U&se small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -110,7 +110,7 @@ BEGIN LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 AUTOCHECKBOX "Afișează &ceas", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 AUTOCHECKBOX "Afișează s&ecunde", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED - AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 + AUTOCHECKBOX "&Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 END IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 diff --git a/base/shell/explorer/lang/ru-RU.rc b/base/shell/explorer/lang/ru-RU.rc index d4ccba1fc5e..671484c0795 100644 --- a/base/shell/explorer/lang/ru-RU.rc +++ b/base/shell/explorer/lang/ru-RU.rc @@ -82,7 +82,7 @@ BEGIN AUTOCHECKBOX "Отображать панель задач &поверх других окон", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Группировать схожие кнопки панели задач", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Отображать панель &быстрого запуска", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 + AUTOCHECKBOX "U&se small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -113,7 +113,7 @@ BEGIN LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 AUTOCHECKBOX "Отображать &часы", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 AUTOCHECKBOX "Отображать &секунды", IDC_TASKBARPROP_SECONDS, 120, 127, 83, 10, WS_DISABLED - AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 + AUTOCHECKBOX "&Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 END IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 diff --git a/base/shell/explorer/lang/sk-SK.rc b/base/shell/explorer/lang/sk-SK.rc index 7a52a8316c5..a87dd997c0d 100644 --- a/base/shell/explorer/lang/sk-SK.rc +++ b/base/shell/explorer/lang/sk-SK.rc @@ -78,7 +78,7 @@ BEGIN AUTOCHECKBOX "Zo&brazovať panel úloh nad ostatnými oknami", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 // Ponechať panel úloh nad ostatnými oknami AUTOCHECKBOX "&Zoskupovať podobné tlačidlá na paneli s nástrojmi", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Zobraziť panel &Rýchle spustenie", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 + AUTOCHECKBOX "U&se small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -109,7 +109,7 @@ BEGIN LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 AUTOCHECKBOX "Ho&diny", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED - AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 + AUTOCHECKBOX "&Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 END IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 diff --git a/base/shell/explorer/lang/sq-AL.rc b/base/shell/explorer/lang/sq-AL.rc index b12786ebff2..f29e0d76988 100644 --- a/base/shell/explorer/lang/sq-AL.rc +++ b/base/shell/explorer/lang/sq-AL.rc @@ -78,7 +78,7 @@ BEGIN AUTOCHECKBOX "Mbaj &taskbar mbi dritaret e tjera", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Grupo butonat e njejte në taskbar", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Shfaq &Quick Launch", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 + AUTOCHECKBOX "U&se small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -109,7 +109,7 @@ BEGIN LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 AUTOCHECKBOX "Shfaq Ora", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED - AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 + AUTOCHECKBOX "&Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 END IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 diff --git a/base/shell/explorer/lang/tr-TR.rc b/base/shell/explorer/lang/tr-TR.rc index 3914ee4abfb..606b1971bb1 100644 --- a/base/shell/explorer/lang/tr-TR.rc +++ b/base/shell/explorer/lang/tr-TR.rc @@ -79,7 +79,7 @@ BEGIN AUTOCHECKBOX "Gö&rev Çubuğunu Pencerelerin Üstünde Tut", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Benzer Görev Çubuğu Düğmelerini Gruplandır", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "&Hızlı Başlat'ı Göster", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 + AUTOCHECKBOX "U&se small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -110,7 +110,7 @@ BEGIN LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 AUTOCHECKBOX "&Saat", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 AUTOCHECKBOX "S&aniyeleri Göster", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED - AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 + AUTOCHECKBOX "&Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 END IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 diff --git a/base/shell/explorer/lang/uk-UA.rc b/base/shell/explorer/lang/uk-UA.rc index 790a92c91de..a5b1b7c02b6 100644 --- a/base/shell/explorer/lang/uk-UA.rc +++ b/base/shell/explorer/lang/uk-UA.rc @@ -82,7 +82,7 @@ BEGIN AUTOCHECKBOX "&Поверх інших вікон", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Групувати схожі кнопки", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Відображати панель &швидкого запуску", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 + AUTOCHECKBOX "U&se small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -113,7 +113,7 @@ BEGIN LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 AUTOCHECKBOX "&Годинник", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 AUTOCHECKBOX "Показувати секунди", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED - AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 + AUTOCHECKBOX "&Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 END IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 diff --git a/base/shell/explorer/lang/zh-CN.rc b/base/shell/explorer/lang/zh-CN.rc index 3408a84d095..d987482e8b6 100644 --- a/base/shell/explorer/lang/zh-CN.rc +++ b/base/shell/explorer/lang/zh-CN.rc @@ -80,7 +80,7 @@ BEGIN AUTOCHECKBOX "将任务栏保持在其它窗口的前端(&T)", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "分组类似任务栏按钮(&G)", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "显示快速启动(&Q)", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 + AUTOCHECKBOX "U&se small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -111,7 +111,7 @@ BEGIN LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 AUTOCHECKBOX "显示时钟(&K)", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 AUTOCHECKBOX "显示秒", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED - AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 + AUTOCHECKBOX "&Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 END IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 diff --git a/base/shell/explorer/lang/zh-HK.rc b/base/shell/explorer/lang/zh-HK.rc index 36daeb70dc3..9f0b03056b6 100644 --- a/base/shell/explorer/lang/zh-HK.rc +++ b/base/shell/explorer/lang/zh-HK.rc @@ -79,7 +79,7 @@ BEGIN AUTOCHECKBOX "使工作列顯示在最上層(&T)", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "合併類似的工作列按鈕(&G)", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "顯示快速啟動(&Q)", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 + AUTOCHECKBOX "U&se small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -110,7 +110,7 @@ BEGIN LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 AUTOCHECKBOX "小時鐘(&K)", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 AUTOCHECKBOX "顯示秒", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED - AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 + AUTOCHECKBOX "&Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 END IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 diff --git a/base/shell/explorer/lang/zh-TW.rc b/base/shell/explorer/lang/zh-TW.rc index e29a34e5e05..930a50cb349 100644 --- a/base/shell/explorer/lang/zh-TW.rc +++ b/base/shell/explorer/lang/zh-TW.rc @@ -80,7 +80,7 @@ BEGIN AUTOCHECKBOX "使工作列顯示在最上層(&T)", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "合併類似的工作列按鈕(&G)", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "顯示快速啟動(&Q)", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 + AUTOCHECKBOX "U&se small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -111,7 +111,7 @@ BEGIN LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 AUTOCHECKBOX "小時鐘(&K)", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 AUTOCHECKBOX "顯示秒", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED - AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 + AUTOCHECKBOX "&Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 END IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240

1 year, 1 month

[reactos] 01/01: [ATTRIB] De-duplicate code; handle reparse points; verify path concatenation (#4215)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ec0cc847b93cbcf92efd7… commit ec0cc847b93cbcf92efd7f67140f863a3489dcbd Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Dec 29 04:01:40 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Aug 11 13:49:27 2023 +0200 [ATTRIB] De-duplicate code; handle reparse points; verify path concatenation (#4215) - Simplify duplicated code by having one EnumFiles() function using callbacks to perform actual action on enumerated files. PrintAttribute() and ChangeAttribute() duplicate their functionality, except for the actual difference of displaying the file attributes vs. changing them. Instead, move that per-file action into two callbacks, create a file enumerator function that contains the common functionality, and make it call the callback passed in parameter to it. - Reparse points can be encountered during enumeration. In this case, don't try to go into too many reparse-point levels (maximum two). - Verify that paths/file names concatenation don't overflow (with the StringCch* functions returning an error), as this could cause an infinite loop in case of recursive-enumeration, and the position where the new path part would be appended turns out to be just at the end of the buffer. --- base/applications/cmdutils/attrib/attrib.c | 455 +++++++++++++++-------------- 1 file changed, 237 insertions(+), 218 deletions(-) diff --git a/base/applications/cmdutils/attrib/attrib.c b/base/applications/cmdutils/attrib/attrib.c index 821bfd52faf..3f62a42c684 100644 --- a/base/applications/cmdutils/attrib/attrib.c +++ b/base/applications/cmdutils/attrib/attrib.c @@ -1,35 +1,10 @@ /* - * ATTRIB.C - attrib internal command. - * - * - * History: - * - * 04-Dec-1998 Eric Kohl - * started - * - * 09-Dec-1998 Eric Kohl - * implementation works, except recursion ("attrib /s"). - * - * 05-Jan-1999 Eric Kohl - * major rewrite. - * fixed recursion ("attrib /s"). - * started directory support ("attrib /s /d"). - * updated help text. - * - * 14-Jan-1999 Eric Kohl - * Unicode ready! - * - * 19-Jan-1999 Eric Kohl - * Redirection ready! - * - * 21-Jan-1999 Eric Kohl - * Added check for invalid filenames. - * - * 23-Jan-1999 Eric Kohl - * Added handling of multiple filenames. - * - * 02-Apr-2005 (Magnus Olsen <magnus(a)greatlord.com>) - * Remove all hardcoded strings in En.rc + * PROJECT: ReactOS Attrib Command + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Displays or changes file attributes recursively. + * COPYRIGHT: Copyright 1998-2019 Eric Kohl <eric.kohl(a)reactos.org> + * Copyright 2021 Doug Lyons <douglyons(a)douglyons.com> + * Copyright 2021-2023 Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> */ #include <stdio.h> @@ -39,15 +14,22 @@ #include <winbase.h> #include <wincon.h> #include <winuser.h> +#include <strsafe.h> #include <conutils.h> #include "resource.h" +/* Enable to support extended attributes. + * See https://ss64.com/nt/attrib.html for an exhaustive list. */ +// TODO: If you enable this, translations need to be updated as well! +//#define EXTENDED_ATTRIBUTES + +#define ALL_FILES_PATTERN L"*.*" // It may also be possible to use L"*" (shorter) + CON_SCREEN StdOutScreen = INIT_CON_SCREEN(StdOut); -static -VOID +static VOID ErrorMessage( _In_ DWORD dwErrorCode, _In_opt_ PCWSTR pszMsg, @@ -77,217 +59,257 @@ ErrorMessage( ConPrintf(StdErr, L" %s\n", pszMsg); } -/* Returns TRUE if anything is printed, FALSE otherwise */ -static -BOOL -PrintAttribute( - LPWSTR pszPath, - LPWSTR pszFile, - BOOL bRecurse, - BOOL bDirectories) -{ - WIN32_FIND_DATAW findData; - HANDLE hFind; - WCHAR szFullName[MAX_PATH]; - LPWSTR pszFileName; - BOOL bFound = FALSE; - BOOL bIsDir; - BOOL bExactMatch; - DWORD Error; - - /* prepare full file name buffer */ - wcscpy(szFullName, pszPath); - pszFileName = szFullName + wcslen(szFullName); - - /* display all subdirectories */ - if (bRecurse) - { - /* append *.* */ - wcscpy(pszFileName, L"*.*"); - hFind = FindFirstFileW(szFullName, &findData); - if (hFind == INVALID_HANDLE_VALUE) - { - Error = GetLastError(); - if ((Error != ERROR_DIRECTORY) && (Error != ERROR_SHARING_VIOLATION) - && (Error != ERROR_FILE_NOT_FOUND)) - { - ErrorMessage(Error, pszFile); - } - return FALSE; - } - - do - { - if (!(findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) - continue; - - if (!wcscmp(findData.cFileName, L".") || - !wcscmp(findData.cFileName, L"..")) - { - continue; - } +/** + * @brief Displays attributes for the given file. + * @return Always TRUE (success). + **/ +static BOOL +PrintAttributes( + _In_ PWIN32_FIND_DATAW pFindData, + _In_ PCWSTR pszFullName, + _Inout_opt_ PVOID Context) +{ + DWORD dwAttributes = pFindData->dwFileAttributes; + + UNREFERENCED_PARAMETER(Context); + + ConPrintf(StdOut, +#ifdef EXTENDED_ATTRIBUTES + L"%c %c%c%c %c %s\n", +#else + L"%c %c%c%c %s\n", +#endif + (dwAttributes & FILE_ATTRIBUTE_ARCHIVE) ? L'A' : L' ', + (dwAttributes & FILE_ATTRIBUTE_SYSTEM) ? L'S' : L' ', + (dwAttributes & FILE_ATTRIBUTE_HIDDEN) ? L'H' : L' ', + (dwAttributes & FILE_ATTRIBUTE_READONLY) ? L'R' : L' ', +#ifdef EXTENDED_ATTRIBUTES + (dwAttributes & FILE_ATTRIBUTE_NOT_CONTENT_INDEXED) ? L'I' : L' ', +#endif + pszFullName); + + return TRUE; +} - wcscpy(pszFileName, findData.cFileName); - wcscat(pszFileName, L"\\"); - bFound |= PrintAttribute(szFullName, pszFile, bRecurse, bDirectories); - } - while (FindNextFileW(hFind, &findData)); - FindClose(hFind); - } +typedef struct _ATTRIBS_MASKS +{ + DWORD dwMask; + DWORD dwAttrib; +} ATTRIBS_MASKS, *PATTRIBS_MASKS; + +/** + * @brief Changes attributes for the given file. + * @return TRUE if anything changed, FALSE otherwise. + **/ +static BOOL +ChangeAttributes( + _In_ PWIN32_FIND_DATAW pFindData, + _In_ PCWSTR pszFullName, + _Inout_opt_ PVOID Context) +{ + PATTRIBS_MASKS AttribsMasks = (PATTRIBS_MASKS)Context; + DWORD dwAttributes; - /* append file name */ - wcscpy(pszFileName, pszFile); + dwAttributes = ((pFindData->dwFileAttributes & ~AttribsMasks->dwMask) | AttribsMasks->dwAttrib); + return SetFileAttributesW(pszFullName, dwAttributes); +} - /* search current directory */ - hFind = FindFirstFileW(szFullName, &findData); - if (hFind == INVALID_HANDLE_VALUE) - { - return bFound; - } - do - { - bIsDir = findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY; - bExactMatch = wcsicmp(findData.cFileName, pszFile) == 0; +#define ENUM_RECURSE 0x01 +#define ENUM_DIRECTORIES 0x02 - if (bIsDir && !bDirectories && !bExactMatch) - continue; +typedef BOOL +(*PENUMFILES_CALLBACK)( + _In_ PWIN32_FIND_DATAW pFindData, + _In_ PCWSTR pszFullName, + _Inout_opt_ PVOID Context); - if (!wcscmp(findData.cFileName, L".") || - !wcscmp(findData.cFileName, L"..")) - { - continue; - } +typedef struct _ENUMFILES_CTX +{ + /* Fixed data */ + _In_ PCWSTR FileName; + _In_ DWORD Flags; - wcscpy(pszFileName, findData.cFileName); + /* Callback invoked on each enumerated file/directory */ + _In_ PENUMFILES_CALLBACK Callback; + _In_ PVOID Context; - ConPrintf(StdOut, - L"%c %c%c%c %s\n", - (findData.dwFileAttributes & FILE_ATTRIBUTE_ARCHIVE) ? L'A' : L' ', - (findData.dwFileAttributes & FILE_ATTRIBUTE_SYSTEM) ? L'S' : L' ', - (findData.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) ? L'H' : L' ', - (findData.dwFileAttributes & FILE_ATTRIBUTE_READONLY) ? L'R' : L' ', - szFullName); - bFound = TRUE; - } - while (FindNextFileW(hFind, &findData)); - FindClose(hFind); + /* Dynamic data */ + WIN32_FIND_DATAW findData; + ULONG uReparseLevel; - return bFound; -} + /* The full path buffer the function will act recursively */ + // PWSTR FullPath; // Use a relocated buffer once long paths become supported! + size_t cchBuffer; // Buffer size + WCHAR FullPathBuffer[MAX_PATH + _countof("\\" ALL_FILES_PATTERN)]; +} ENUMFILES_CTX, *PENUMFILES_CTX; -/* Returns TRUE if anything changed, FALSE otherwise */ -static -BOOL -ChangeAttribute( - LPWSTR pszPath, - LPWSTR pszFile, - BOOL bRecurse, - BOOL bDirectories, - DWORD dwMask, - DWORD dwAttrib) +/* Returns TRUE if anything is done, FALSE otherwise */ +static BOOL +EnumFilesWorker( + _Inout_ PENUMFILES_CTX EnumCtx, + _Inout_ off_t offFilePart) // Offset to the file name inside FullPathBuffer { - WIN32_FIND_DATAW findData; + BOOL bFound = FALSE; + HRESULT hRes; HANDLE hFind; - WCHAR szFullName[MAX_PATH]; - LPWSTR pszFileName; - BOOL bFound = FALSE; - BOOL bIsDir; - BOOL bExactMatch; - DWORD dwAttribute; - DWORD Error; - - /* prepare full file name buffer */ - wcscpy(szFullName, pszPath); - pszFileName = szFullName + wcslen(szFullName); - - /* display all subdirectories */ - if (bRecurse) + PWSTR findFileName = EnumCtx->findData.cFileName; + PWSTR pFilePart = EnumCtx->FullPathBuffer + offFilePart; + size_t cchRemaining = EnumCtx->cchBuffer - offFilePart; + + /* Recurse over all subdirectories */ + if (EnumCtx->Flags & ENUM_RECURSE) { - /* append *.* */ - wcscpy(pszFileName, L"*.*"); + /* Append '*.*' */ + hRes = StringCchCopyW(pFilePart, cchRemaining, ALL_FILES_PATTERN); + if (hRes != S_OK) + { + if (hRes == STRSAFE_E_INSUFFICIENT_BUFFER) + { + // TODO: If this fails, try to reallocate EnumCtx->FullPathBuffer by + // increasing its size by _countof(EnumCtx->findData.cFileName) + 1 + // to satisfy this copy, as well as the one made in the loop below. + } + // else + ConPrintf(StdErr, L"Directory level too deep: %s\n", EnumCtx->FullPathBuffer); + return FALSE; + } - hFind = FindFirstFileW(szFullName, &findData); + hFind = FindFirstFileW(EnumCtx->FullPathBuffer, &EnumCtx->findData); if (hFind == INVALID_HANDLE_VALUE) { - Error = GetLastError(); - if ((Error != ERROR_DIRECTORY) && (Error != ERROR_SHARING_VIOLATION) - && (Error != ERROR_FILE_NOT_FOUND)) + DWORD Error = GetLastError(); + if ((Error != ERROR_DIRECTORY) && + (Error != ERROR_SHARING_VIOLATION) && + (Error != ERROR_FILE_NOT_FOUND)) { - ErrorMessage(Error, pszFile); + ErrorMessage(Error, EnumCtx->FullPathBuffer); } return FALSE; } do { - if (!(findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) + BOOL bIsReparse; + size_t offNewFilePart; + + if (!(EnumCtx->findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) continue; - if (!wcscmp(findData.cFileName, L".") || - !wcscmp(findData.cFileName, L"..")) - { + if (!wcscmp(findFileName, L".") || !wcscmp(findFileName, L"..")) continue; + + /* Allow at most 2 levels of reparse points / symbolic links */ + bIsReparse = !!(EnumCtx->findData.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT); + if (bIsReparse) + { + if (EnumCtx->uReparseLevel < 2) + EnumCtx->uReparseLevel++; + else + continue; } - wcscpy(pszFileName, findData.cFileName); - wcscat(pszFileName, L"\\"); - bFound |= ChangeAttribute(szFullName, pszFile, bRecurse, bDirectories, - dwMask, dwAttrib); + hRes = StringCchPrintfExW(pFilePart, cchRemaining, + NULL, &offNewFilePart, 0, + L"%s\\", findFileName); + /* Offset to the new file name part */ + offNewFilePart = EnumCtx->cchBuffer - offNewFilePart; + + bFound |= EnumFilesWorker(EnumCtx, offNewFilePart); + + /* Recalculate the file part pointer and the number of characters + * remaining: the buffer may have been enlarged and relocated. */ + pFilePart = EnumCtx->FullPathBuffer + offFilePart; + cchRemaining = EnumCtx->cchBuffer - offFilePart; + + /* If we went through a reparse point / symbolic link, decrease level */ + if (bIsReparse) + EnumCtx->uReparseLevel--; } - while (FindNextFileW(hFind, &findData)); + while (FindNextFileW(hFind, &EnumCtx->findData)); FindClose(hFind); } - /* append file name */ - wcscpy(pszFileName, pszFile); + /* Append the file name pattern to search for */ + hRes = StringCchCopyW(pFilePart, cchRemaining, EnumCtx->FileName); - /* search current directory */ - hFind = FindFirstFileW(szFullName, &findData); + /* Search in the current directory */ + hFind = FindFirstFileW(EnumCtx->FullPathBuffer, &EnumCtx->findData); if (hFind == INVALID_HANDLE_VALUE) - { return bFound; - } do { - bIsDir = findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY; - bExactMatch = wcsicmp(findData.cFileName, pszFile) == 0; + BOOL bIsDir = !!(EnumCtx->findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY); + BOOL bExactMatch = (wcsicmp(findFileName, EnumCtx->FileName) == 0); - if (bIsDir && !bDirectories && !bExactMatch) + if (bIsDir && !(EnumCtx->Flags & ENUM_DIRECTORIES) && !bExactMatch) continue; - if (!wcscmp(findData.cFileName, L".") || - !wcscmp(findData.cFileName, L"..")) - { + if (!wcscmp(findFileName, L".") || !wcscmp(findFileName, L"..")) continue; - } - if (bRecurse && bIsDir && !bDirectories) + /* If we recursively enumerate files excluding directories, + * exclude any directory from the enumeration. */ + if (bIsDir && !(EnumCtx->Flags & ENUM_DIRECTORIES) && (EnumCtx->Flags & ENUM_RECURSE)) continue; - wcscpy(pszFileName, findData.cFileName); - - dwAttribute = (findData.dwFileAttributes & ~dwMask) | dwAttrib; - - SetFileAttributes(szFullName, dwAttribute); + StringCchCopyW(pFilePart, cchRemaining, findFileName); + /* bFound = */ EnumCtx->Callback(&EnumCtx->findData, EnumCtx->FullPathBuffer, EnumCtx->Context); bFound = TRUE; } - while (FindNextFileW(hFind, &findData)); + while (FindNextFileW(hFind, &EnumCtx->findData)); FindClose(hFind); return bFound; } +static BOOL +AttribEnumFiles( + _In_ PCWSTR pszPath, + _In_ PCWSTR pszFile, + _In_ DWORD fFlags, + _In_ PATTRIBS_MASKS AttribsMasks) +{ + ENUMFILES_CTX EnumContext = {0}; + size_t offFilePart; + HRESULT hRes; + + EnumContext.FileName = pszFile; + EnumContext.Flags = fFlags; + EnumContext.Callback = (AttribsMasks->dwMask == 0 ? PrintAttributes : ChangeAttributes); + EnumContext.Context = (AttribsMasks->dwMask == 0 ? NULL : AttribsMasks); + + /* Prepare the full file path buffer */ + EnumContext.cchBuffer = _countof(EnumContext.FullPathBuffer); + hRes = StringCchCopyExW(EnumContext.FullPathBuffer, + EnumContext.cchBuffer, + pszPath, + NULL, + &offFilePart, + 0); + if (hRes != S_OK) + return FALSE; + + /* Offset to the file name part */ + offFilePart = EnumContext.cchBuffer - offFilePart; + if (EnumContext.FullPathBuffer[offFilePart - 1] != L'\\') + { + EnumContext.FullPathBuffer[offFilePart] = L'\\'; + EnumContext.FullPathBuffer[offFilePart + 1] = UNICODE_NULL; + offFilePart++; + } + + return EnumFilesWorker(&EnumContext, offFilePart); +} + int wmain(int argc, WCHAR *argv[]) { INT i; - BOOL bRecurse = FALSE; - BOOL bDirectories = FALSE; - DWORD dwAttrib = 0; - DWORD dwMask = 0; + DWORD dwEnumFlags = 0; + ATTRIBS_MASKS AttribsMasks = {0}; BOOL bFound = FALSE; PWSTR pszFileName; WCHAR szFilePath[MAX_PATH + 2] = L""; // + 2 to reserve an extra path separator and a NULL-terminator. @@ -309,9 +331,9 @@ int wmain(int argc, WCHAR *argv[]) else /* Retrieve the enumeration modes */ if (wcsicmp(argv[i], L"/s") == 0) - bRecurse = TRUE; + dwEnumFlags |= ENUM_RECURSE; else if (wcsicmp(argv[i], L"/d") == 0) - bDirectories = TRUE; + dwEnumFlags |= ENUM_DIRECTORIES; else { /* Unknown option */ @@ -334,37 +356,47 @@ int wmain(int argc, WCHAR *argv[]) switch (towupper(argv[i][1])) { case L'A': - dwMask |= FILE_ATTRIBUTE_ARCHIVE; + AttribsMasks.dwMask |= FILE_ATTRIBUTE_ARCHIVE; if (bAdd) - dwAttrib |= FILE_ATTRIBUTE_ARCHIVE; + AttribsMasks.dwAttrib |= FILE_ATTRIBUTE_ARCHIVE; else - dwAttrib &= ~FILE_ATTRIBUTE_ARCHIVE; + AttribsMasks.dwAttrib &= ~FILE_ATTRIBUTE_ARCHIVE; break; case L'S': - dwMask |= FILE_ATTRIBUTE_SYSTEM; + AttribsMasks.dwMask |= FILE_ATTRIBUTE_SYSTEM; if (bAdd) - dwAttrib |= FILE_ATTRIBUTE_SYSTEM; + AttribsMasks.dwAttrib |= FILE_ATTRIBUTE_SYSTEM; else - dwAttrib &= ~FILE_ATTRIBUTE_SYSTEM; + AttribsMasks.dwAttrib &= ~FILE_ATTRIBUTE_SYSTEM; break; case L'H': - dwMask |= FILE_ATTRIBUTE_HIDDEN; + AttribsMasks.dwMask |= FILE_ATTRIBUTE_HIDDEN; if (bAdd) - dwAttrib |= FILE_ATTRIBUTE_HIDDEN; + AttribsMasks.dwAttrib |= FILE_ATTRIBUTE_HIDDEN; else - dwAttrib &= ~FILE_ATTRIBUTE_HIDDEN; + AttribsMasks.dwAttrib &= ~FILE_ATTRIBUTE_HIDDEN; break; case L'R': - dwMask |= FILE_ATTRIBUTE_READONLY; + AttribsMasks.dwMask |= FILE_ATTRIBUTE_READONLY; if (bAdd) - dwAttrib |= FILE_ATTRIBUTE_READONLY; + AttribsMasks.dwAttrib |= FILE_ATTRIBUTE_READONLY; else - dwAttrib &= ~FILE_ATTRIBUTE_READONLY; + AttribsMasks.dwAttrib &= ~FILE_ATTRIBUTE_READONLY; break; +#ifdef EXTENDED_ATTRIBUTES + case L'I': + AttribsMasks.dwMask |= FILE_ATTRIBUTE_NOT_CONTENT_INDEXED; + if (bAdd) + AttribsMasks.dwAttrib |= FILE_ATTRIBUTE_NOT_CONTENT_INDEXED; + else + AttribsMasks.dwAttrib &= ~FILE_ATTRIBUTE_NOT_CONTENT_INDEXED; + break; +#endif + default: ConResPrintf(StdErr, STRING_ERROR_INVALID_PARAM_FORMAT, argv[i]); return -1; @@ -380,19 +412,10 @@ int wmain(int argc, WCHAR *argv[]) /* If no file specification was found, operate on all files of the current directory */ if (!bFound) { - DWORD len = GetCurrentDirectoryW(_countof(szFilePath) - 2, szFilePath); - if (szFilePath[len - 1] != L'\\') - { - szFilePath[len] = L'\\'; - szFilePath[len + 1] = UNICODE_NULL; - } - pszFileName = L"*.*"; - - if (dwMask == 0) - bFound = PrintAttribute(szFilePath, pszFileName, bRecurse, bDirectories); - else - bFound = ChangeAttribute(szFilePath, pszFileName, bRecurse, bDirectories, dwMask, dwAttrib); + GetCurrentDirectoryW(_countof(szFilePath) - 2, szFilePath); + pszFileName = ALL_FILES_PATTERN; + bFound = AttribEnumFiles(szFilePath, pszFileName, dwEnumFlags, &AttribsMasks); if (!bFound) ConResPrintf(StdOut, STRING_FILE_NOT_FOUND, pszFileName); @@ -419,11 +442,7 @@ int wmain(int argc, WCHAR *argv[]) pszFileName = L""; } - if (dwMask == 0) - bFound = PrintAttribute(szFilePath, pszFileName, bRecurse, bDirectories); - else - bFound = ChangeAttribute(szFilePath, pszFileName, bRecurse, bDirectories, dwMask, dwAttrib); - + bFound = AttribEnumFiles(szFilePath, pszFileName, dwEnumFlags, &AttribsMasks); if (!bFound) ConResPrintf(StdOut, STRING_FILE_NOT_FOUND, argv[i]); }

1 year, 1 month

[reactos] 01/01: [MSPAINT] Support converting to black and white (#5554)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e6c23361a12e994d529c5… commit e6c23361a12e994d529c5ab6c1ce904300b3bb71 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Aug 11 20:27:12 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Aug 11 20:27:12 2023 +0900 [MSPAINT] Support converting to black and white (#5554) - Add ImageModel::IsBlackAndWhite and ImageModel::PushBlackAndWhite helper functions. - Add CAttributesDialog::m_bBlackAndWhite. - If IDD_ATTRIBUTESRB4 is checked, then make the bitmap black and white. - Add IDS_LOSECOLOR to show message. CORE-19094 --- base/applications/mspaint/dialogs.cpp | 7 +++++- base/applications/mspaint/dialogs.h | 1 + base/applications/mspaint/history.cpp | 44 +++++++++++++++++++++++++++++++++ base/applications/mspaint/history.h | 2 ++ base/applications/mspaint/lang/bg-BG.rc | 1 + base/applications/mspaint/lang/cs-CZ.rc | 1 + base/applications/mspaint/lang/de-DE.rc | 1 + base/applications/mspaint/lang/en-GB.rc | 1 + base/applications/mspaint/lang/en-US.rc | 1 + base/applications/mspaint/lang/es-ES.rc | 1 + base/applications/mspaint/lang/et-EE.rc | 1 + base/applications/mspaint/lang/eu-ES.rc | 1 + base/applications/mspaint/lang/fr-FR.rc | 1 + base/applications/mspaint/lang/he-IL.rc | 1 + base/applications/mspaint/lang/hu-HU.rc | 1 + base/applications/mspaint/lang/id-ID.rc | 1 + base/applications/mspaint/lang/it-IT.rc | 1 + base/applications/mspaint/lang/ja-JP.rc | 1 + base/applications/mspaint/lang/nl-NL.rc | 1 + base/applications/mspaint/lang/no-NO.rc | 1 + base/applications/mspaint/lang/pl-PL.rc | 1 + base/applications/mspaint/lang/pt-BR.rc | 1 + base/applications/mspaint/lang/pt-PT.rc | 1 + base/applications/mspaint/lang/ro-RO.rc | 1 + base/applications/mspaint/lang/ru-RU.rc | 1 + base/applications/mspaint/lang/sk-SK.rc | 1 + base/applications/mspaint/lang/sq-AL.rc | 1 + base/applications/mspaint/lang/sv-SE.rc | 1 + base/applications/mspaint/lang/tr-TR.rc | 1 + base/applications/mspaint/lang/uk-UA.rc | 1 + base/applications/mspaint/lang/vi-VN.rc | 1 + base/applications/mspaint/lang/zh-CN.rc | 1 + base/applications/mspaint/lang/zh-HK.rc | 1 + base/applications/mspaint/lang/zh-TW.rc | 1 + base/applications/mspaint/resource.h | 1 + base/applications/mspaint/winproc.cpp | 17 ++++++++++++- 36 files changed, 100 insertions(+), 2 deletions(-) diff --git a/base/applications/mspaint/dialogs.cpp b/base/applications/mspaint/dialogs.cpp index 7ec302dfe7f..9cda67b3d72 100644 --- a/base/applications/mspaint/dialogs.cpp +++ b/base/applications/mspaint/dialogs.cpp @@ -103,10 +103,14 @@ LRESULT CAttributesDialog::OnInitDialog(UINT nMsg, WPARAM wParam, LPARAM lParam, newHeight = imageModel.GetHeight(); CheckDlgButton(IDD_ATTRIBUTESRB3, BST_CHECKED); - CheckDlgButton(IDD_ATTRIBUTESRB5, BST_CHECKED); SetDlgItemInt(IDD_ATTRIBUTESEDIT1, newWidth, FALSE); SetDlgItemInt(IDD_ATTRIBUTESEDIT2, newHeight, FALSE); + if (imageModel.IsBlackAndWhite()) + CheckRadioButton(IDD_ATTRIBUTESRB4, IDD_ATTRIBUTESRB5, IDD_ATTRIBUTESRB4); + else + CheckRadioButton(IDD_ATTRIBUTESRB4, IDD_ATTRIBUTESRB5, IDD_ATTRIBUTESRB5); + if (g_isAFile) { TCHAR date[100]; @@ -142,6 +146,7 @@ LRESULT CAttributesDialog::OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL LRESULT CAttributesDialog::OnOk(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) { + m_bBlackAndWhite = (IsDlgButtonChecked(IDD_ATTRIBUTESRB4) == BST_CHECKED); EndDialog(1); return 0; } diff --git a/base/applications/mspaint/dialogs.h b/base/applications/mspaint/dialogs.h index d760c59d556..f4354de11fe 100644 --- a/base/applications/mspaint/dialogs.h +++ b/base/applications/mspaint/dialogs.h @@ -64,6 +64,7 @@ public: public: int newWidth; int newHeight; + BOOL m_bBlackAndWhite; }; class CStretchSkewDialog : public CDialogImpl<CStretchSkewDialog> diff --git a/base/applications/mspaint/history.cpp b/base/applications/mspaint/history.cpp index 3f1878ad3d3..8867a53025a 100644 --- a/base/applications/mspaint/history.cpp +++ b/base/applications/mspaint/history.cpp @@ -267,3 +267,47 @@ HBITMAP ImageModel::CopyBitmap() m_hbmOld = ::SelectObject(m_hDrawingDC, m_hBms[m_currInd]); // Re-select return ret; } + +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; +} + +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); + + PushImageForUndo(hNewBitmap); +} diff --git a/base/applications/mspaint/history.h b/base/applications/mspaint/history.h index b9fe323db67..5bee4105240 100644 --- a/base/applications/mspaint/history.h +++ b/base/applications/mspaint/history.h @@ -37,6 +37,8 @@ public: void RotateNTimes90Degrees(int iN); void Clamp(POINT& pt) const; void NotifyImageChanged(); + BOOL IsBlackAndWhite(); + void PushBlackAndWhite(); protected: HDC m_hDrawingDC; // The device context for this class diff --git a/base/applications/mspaint/lang/bg-BG.rc b/base/applications/mspaint/lang/bg-BG.rc index 66bf74763c3..cfc791946ae 100644 --- a/base/applications/mspaint/lang/bg-BG.rc +++ b/base/applications/mspaint/lang/bg-BG.rc @@ -264,4 +264,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/cs-CZ.rc b/base/applications/mspaint/lang/cs-CZ.rc index 57608b40f96..32d33bf98d2 100644 --- a/base/applications/mspaint/lang/cs-CZ.rc +++ b/base/applications/mspaint/lang/cs-CZ.rc @@ -264,4 +264,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/de-DE.rc b/base/applications/mspaint/lang/de-DE.rc index fb947b1eeb2..20fb505484f 100644 --- a/base/applications/mspaint/lang/de-DE.rc +++ b/base/applications/mspaint/lang/de-DE.rc @@ -263,4 +263,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/en-GB.rc b/base/applications/mspaint/lang/en-GB.rc index 9dc21b13c6a..b5267ad1d0e 100644 --- a/base/applications/mspaint/lang/en-GB.rc +++ b/base/applications/mspaint/lang/en-GB.rc @@ -263,4 +263,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/en-US.rc b/base/applications/mspaint/lang/en-US.rc index 805c239e8d0..987e1ab7449 100644 --- a/base/applications/mspaint/lang/en-US.rc +++ b/base/applications/mspaint/lang/en-US.rc @@ -264,4 +264,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/es-ES.rc b/base/applications/mspaint/lang/es-ES.rc index a851b972dfc..850307363b6 100644 --- a/base/applications/mspaint/lang/es-ES.rc +++ b/base/applications/mspaint/lang/es-ES.rc @@ -266,4 +266,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/et-EE.rc b/base/applications/mspaint/lang/et-EE.rc index 78d33480f3a..b3996096fd2 100644 --- a/base/applications/mspaint/lang/et-EE.rc +++ b/base/applications/mspaint/lang/et-EE.rc @@ -263,4 +263,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/eu-ES.rc b/base/applications/mspaint/lang/eu-ES.rc index f9f38cd2056..708d62466d2 100644 --- a/base/applications/mspaint/lang/eu-ES.rc +++ b/base/applications/mspaint/lang/eu-ES.rc @@ -264,4 +264,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/fr-FR.rc b/base/applications/mspaint/lang/fr-FR.rc index 8ea08410321..9fd0034abdc 100644 --- a/base/applications/mspaint/lang/fr-FR.rc +++ b/base/applications/mspaint/lang/fr-FR.rc @@ -264,4 +264,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/he-IL.rc b/base/applications/mspaint/lang/he-IL.rc index 7735f853725..1623e258a0c 100644 --- a/base/applications/mspaint/lang/he-IL.rc +++ b/base/applications/mspaint/lang/he-IL.rc @@ -266,4 +266,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/hu-HU.rc b/base/applications/mspaint/lang/hu-HU.rc index 03315eabded..07f84d6a3a9 100644 --- a/base/applications/mspaint/lang/hu-HU.rc +++ b/base/applications/mspaint/lang/hu-HU.rc @@ -264,4 +264,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/id-ID.rc b/base/applications/mspaint/lang/id-ID.rc index eeda00200d3..556aa5efb6c 100644 --- a/base/applications/mspaint/lang/id-ID.rc +++ b/base/applications/mspaint/lang/id-ID.rc @@ -263,4 +263,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/it-IT.rc b/base/applications/mspaint/lang/it-IT.rc index 63ad7624367..ae66f2a3e33 100644 --- a/base/applications/mspaint/lang/it-IT.rc +++ b/base/applications/mspaint/lang/it-IT.rc @@ -264,4 +264,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/ja-JP.rc b/base/applications/mspaint/lang/ja-JP.rc index a98a0f73bab..c6e72466acc 100644 --- a/base/applications/mspaint/lang/ja-JP.rc +++ b/base/applications/mspaint/lang/ja-JP.rc @@ -265,4 +265,5 @@ BEGIN IDS_CANTPASTE "クリップボードからの貼り付けに失敗しました。データ形式が間違っているか、未対応です。" IDS_SAVEERROR "次のファイルとして画像を保存するのに失敗しました:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/nl-NL.rc b/base/applications/mspaint/lang/nl-NL.rc index 29daec70fc7..199c8be03f7 100644 --- a/base/applications/mspaint/lang/nl-NL.rc +++ b/base/applications/mspaint/lang/nl-NL.rc @@ -263,4 +263,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/no-NO.rc b/base/applications/mspaint/lang/no-NO.rc index 7a16a4d668f..3cc7679639f 100644 --- a/base/applications/mspaint/lang/no-NO.rc +++ b/base/applications/mspaint/lang/no-NO.rc @@ -263,4 +263,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/pl-PL.rc b/base/applications/mspaint/lang/pl-PL.rc index b35b2691d2a..04dde3f8aa4 100644 --- a/base/applications/mspaint/lang/pl-PL.rc +++ b/base/applications/mspaint/lang/pl-PL.rc @@ -266,4 +266,5 @@ BEGIN IDS_CANTPASTE "Nie można wkleić ze schowka. Format danych jest nieprawidłowy lub nieobsługiwany." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/pt-BR.rc b/base/applications/mspaint/lang/pt-BR.rc index c551cd77671..fc38012623b 100644 --- a/base/applications/mspaint/lang/pt-BR.rc +++ b/base/applications/mspaint/lang/pt-BR.rc @@ -264,4 +264,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/pt-PT.rc b/base/applications/mspaint/lang/pt-PT.rc index 7ff2ba98503..7457d339fee 100644 --- a/base/applications/mspaint/lang/pt-PT.rc +++ b/base/applications/mspaint/lang/pt-PT.rc @@ -264,4 +264,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/ro-RO.rc b/base/applications/mspaint/lang/ro-RO.rc index 447e01c5337..516d15bc335 100644 --- a/base/applications/mspaint/lang/ro-RO.rc +++ b/base/applications/mspaint/lang/ro-RO.rc @@ -265,4 +265,5 @@ BEGIN IDS_CANTPASTE "Nu a putut fi lipit din clipboard. Formatul de date este fie incorect, fie nesuportat." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/ru-RU.rc b/base/applications/mspaint/lang/ru-RU.rc index 125eadbcfdf..94e187feb63 100644 --- a/base/applications/mspaint/lang/ru-RU.rc +++ b/base/applications/mspaint/lang/ru-RU.rc @@ -267,4 +267,5 @@ BEGIN IDS_CANTPASTE "Не удалось вставить из буфера обмена. Формат данных либо некорректный, либо не поддерживается." IDS_SAVEERROR "Не удалось сохранить точечный рисунок в файл:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/sk-SK.rc b/base/applications/mspaint/lang/sk-SK.rc index dd80ce12592..16695f6d212 100644 --- a/base/applications/mspaint/lang/sk-SK.rc +++ b/base/applications/mspaint/lang/sk-SK.rc @@ -263,4 +263,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/sq-AL.rc b/base/applications/mspaint/lang/sq-AL.rc index a60ef9a2774..916fb382a0d 100644 --- a/base/applications/mspaint/lang/sq-AL.rc +++ b/base/applications/mspaint/lang/sq-AL.rc @@ -263,4 +263,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/sv-SE.rc b/base/applications/mspaint/lang/sv-SE.rc index dfe72b9b0b9..95a379dbdf8 100644 --- a/base/applications/mspaint/lang/sv-SE.rc +++ b/base/applications/mspaint/lang/sv-SE.rc @@ -264,4 +264,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/tr-TR.rc b/base/applications/mspaint/lang/tr-TR.rc index fab8c39fcc3..42706400c2d 100644 --- a/base/applications/mspaint/lang/tr-TR.rc +++ b/base/applications/mspaint/lang/tr-TR.rc @@ -264,4 +264,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/uk-UA.rc b/base/applications/mspaint/lang/uk-UA.rc index f0e0676589a..3df7b6724fa 100644 --- a/base/applications/mspaint/lang/uk-UA.rc +++ b/base/applications/mspaint/lang/uk-UA.rc @@ -265,4 +265,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/vi-VN.rc b/base/applications/mspaint/lang/vi-VN.rc index b1c7c2cc227..6d5847da4b3 100644 --- a/base/applications/mspaint/lang/vi-VN.rc +++ b/base/applications/mspaint/lang/vi-VN.rc @@ -263,4 +263,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/zh-CN.rc b/base/applications/mspaint/lang/zh-CN.rc index 43fa7f34582..ec8eab59263 100644 --- a/base/applications/mspaint/lang/zh-CN.rc +++ b/base/applications/mspaint/lang/zh-CN.rc @@ -266,4 +266,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/zh-HK.rc b/base/applications/mspaint/lang/zh-HK.rc index ff88459ddc6..748acf93f03 100644 --- a/base/applications/mspaint/lang/zh-HK.rc +++ b/base/applications/mspaint/lang/zh-HK.rc @@ -264,4 +264,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/zh-TW.rc b/base/applications/mspaint/lang/zh-TW.rc index 10401e53cb8..d3c35628019 100644 --- a/base/applications/mspaint/lang/zh-TW.rc +++ b/base/applications/mspaint/lang/zh-TW.rc @@ -264,4 +264,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/resource.h b/base/applications/mspaint/resource.h index 4ec9f9a0f98..310554de200 100644 --- a/base/applications/mspaint/resource.h +++ b/base/applications/mspaint/resource.h @@ -222,3 +222,4 @@ #define IDS_CANTPASTE 940 #define IDS_SAVEERROR 941 #define IDS_CANTSENDMAIL 942 +#define IDS_LOSECOLOR 943 diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 7aa25091766..3db01639a34 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -949,7 +949,22 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH { if (attributesDialog.DoModal(mainWindow.m_hWnd)) { - imageModel.Crop(attributesDialog.newWidth, attributesDialog.newHeight, 0, 0); + if (attributesDialog.m_bBlackAndWhite && !imageModel.IsBlackAndWhite()) + { + CString strText(MAKEINTRESOURCE(IDS_LOSECOLOR)); + CString strTitle(MAKEINTRESOURCE(IDS_PROGRAMNAME)); + INT id = MessageBox(strText, strTitle, MB_ICONINFORMATION | MB_YESNOCANCEL); + if (id != IDYES) + break; + + imageModel.PushBlackAndWhite(); + } + + if (imageModel.GetWidth() != attributesDialog.newWidth || + imageModel.GetHeight() != attributesDialog.newHeight) + { + imageModel.Crop(attributesDialog.newWidth, attributesDialog.newHeight); + } } break; }

1 year, 1 month

← Newer
1
...
8
9
10
11
12
13
14
...
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