Ros-diffs

ros-diffs@reactos.org

17 participants
81085 discussions

[reactos] 07/10: [CRT] Make _controlfp_s portable

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=994d5e0ad1a5b194e2c60… commit 994d5e0ad1a5b194e2c60ea395dfc2dcf19b95dc Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Aug 6 09:50:39 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Aug 11 19:00:42 2023 +0300 [CRT] Make _controlfp_s portable --- sdk/lib/crt/float/_controlfp_s.c | 31 +++++++++++++++++++++++++++++++ sdk/lib/crt/float/arm/_controlfp.c | 13 ------------- sdk/lib/crt/float/float.cmake | 1 + sdk/lib/crt/float/i386/cntrlfp.c | 22 ---------------------- 4 files changed, 32 insertions(+), 35 deletions(-) diff --git a/sdk/lib/crt/float/_controlfp_s.c b/sdk/lib/crt/float/_controlfp_s.c new file mode 100644 index 00000000000..5f5363770ce --- /dev/null +++ b/sdk/lib/crt/float/_controlfp_s.c @@ -0,0 +1,31 @@ +/* + * PROJECT: ReactOS CRT library + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Implementation of _controlfp_s (adapted from wine msvcrt/math.c) + * COPYRIGHT: Copyright 2000 Jon Griffiths + * Copyright 2010 Piotr Caban + * Copyright 2021 Roman Masanin <36927roma(a)gmail.com> + */ + +#include <precomp.h> +#include <float.h> + +#ifdef _M_ARM +#define INVALID_MASK ~(_MCW_EM | _MCW_RC | _MCW_DN) +#else +#define INVALID_MASK ~(_MCW_EM | _MCW_IC | _MCW_RC | _MCW_PC | _MCW_DN) +#endif + +int CDECL _controlfp_s(unsigned int* cur, unsigned int newval, unsigned int mask) +{ + unsigned int val; + + if (!MSVCRT_CHECK_PMT((newval & mask & INVALID_MASK) == 0)) + { + if (cur) *cur = _controlfp(0, 0); /* retrieve it anyway */ + return EINVAL; + } + val = _controlfp(newval, mask); + if (cur) *cur = val; + return 0; +} diff --git a/sdk/lib/crt/float/arm/_controlfp.c b/sdk/lib/crt/float/arm/_controlfp.c index 2c697841ea2..1bce54126d9 100644 --- a/sdk/lib/crt/float/arm/_controlfp.c +++ b/sdk/lib/crt/float/arm/_controlfp.c @@ -68,16 +68,3 @@ unsigned int CDECL _control87(unsigned int newval, unsigned int mask) return flags; } -int CDECL _controlfp_s(unsigned int *cur, unsigned int newval, unsigned int mask) -{ - unsigned int val; - - if (!MSVCRT_CHECK_PMT( !(newval & mask & ~(_MCW_EM | _MCW_RC | _MCW_DN)) )) - { - if (cur) *cur = _controlfp(0, 0); /* retrieve it anyway */ - return EINVAL; - } - val = _controlfp(newval, mask); - if (cur) *cur = val; - return 0; -} diff --git a/sdk/lib/crt/float/float.cmake b/sdk/lib/crt/float/float.cmake index d3ca0e6a9c6..86568dcb7d1 100644 --- a/sdk/lib/crt/float/float.cmake +++ b/sdk/lib/crt/float/float.cmake @@ -6,6 +6,7 @@ list(APPEND LIBCNTPR_FLOAT_SOURCE list(APPEND CRT_FLOAT_SOURCE ${LIBCNTPR_FLOAT_SOURCE} float/chgsign.c + float/_controlfp_s.c float/copysign.c float/fpclass.c float/fpecode.c diff --git a/sdk/lib/crt/float/i386/cntrlfp.c b/sdk/lib/crt/float/i386/cntrlfp.c index b78cbc7cd26..09fe41449e6 100644 --- a/sdk/lib/crt/float/i386/cntrlfp.c +++ b/sdk/lib/crt/float/i386/cntrlfp.c @@ -113,25 +113,3 @@ unsigned int CDECL _control87(unsigned int newval, unsigned int mask) return flags; } - -/********************************************************************* - * _controlfp_s (MSVCRT.@) - */ -int CDECL _controlfp_s(unsigned int *cur, unsigned int newval, unsigned int mask) -{ -#ifdef __i386__ - unsigned int val; - - if (!MSVCRT_CHECK_PMT( !(newval & mask & ~(_MCW_EM | _MCW_IC | _MCW_RC | _MCW_PC | _MCW_DN)))) - { - if (cur) *cur = _controlfp( 0, 0 ); /* retrieve it anyway */ - return EINVAL; - } - val = _controlfp( newval, mask ); - if (cur) *cur = val; - return 0; -#else - FIXME(":Not Implemented!\n"); - return 0; -#endif -}

1 year, 5 months

[reactos] 06/10: [ADVAPI32] Fix some vista exports

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a17dd3a7a92c2f9c0bc99… commit a17dd3a7a92c2f9c0bc994c79299b0e1df510bba Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Aug 5 15:42:39 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Aug 11 19:00:42 2023 +0300 [ADVAPI32] Fix some vista exports ETW trace exports only exist on NT 0x502 ntdll, so limit the forwarders accordingly. Exports do exist on advapi32 Vista+, so for now these are stubs. --- dll/win32/advapi32/advapi32.spec | 63 ++++++++++++++++++++++++++-------------- 1 file changed, 42 insertions(+), 21 deletions(-) diff --git a/dll/win32/advapi32/advapi32.spec b/dll/win32/advapi32/advapi32.spec index 27adda4610d..7394948e011 100644 --- a/dll/win32/advapi32/advapi32.spec +++ b/dll/win32/advapi32/advapi32.spec @@ -66,8 +66,10 @@ @ stdcall CommandLineFromMsiDescriptor(wstr ptr ptr) @ stub ComputeAccessTokenFromCodeAuthzLevel @ stdcall ControlService(long long ptr) -@ stdcall ControlTraceA(double str ptr long) ntdll.EtwControlTraceA -@ stdcall ControlTraceW(double wstr ptr long) ntdll.EtwControlTraceW +@ stdcall -version=0x502 ControlTraceA(double str ptr long) ntdll.EtwControlTraceA +@ stdcall -stub -version=0x600+ ControlTraceA(double str ptr long) +@ stdcall -version=0x502 ControlTraceW(double wstr ptr long) ntdll.EtwControlTraceW +@ stdcall -stub -version=0x600+ ControlTraceW(double wstr ptr long) @ stub ConvertAccessToSecurityDescriptorA @ stub ConvertAccessToSecurityDescriptorW @ stub ConvertSDToStringSDRootDomainA @@ -201,7 +203,8 @@ @ stdcall ElfReportEventA(long long long long ptr long long ptr ptr long ptr ptr) @ stdcall ElfReportEventAndSourceW(long long ptr long long long ptr ptr long long ptr ptr long ptr ptr) @ stdcall ElfReportEventW(long long long long ptr long long ptr ptr long ptr ptr) -@ stdcall EnableTrace(long long long ptr double) ntdll.EtwEnableTrace +@ stdcall -version=0x502 EnableTrace(long long long ptr double) ntdll.EtwEnableTrace +@ stdcall -stub -version=0x600+ EnableTrace(long long long ptr double) @ stdcall EncryptFileA(str) @ stdcall EncryptFileW(wstr) @ stub EncryptedFileKeyInfo @@ -213,15 +216,18 @@ @ stdcall EnumServicesStatusExA(long long long long ptr long ptr ptr ptr str) @ stdcall EnumServicesStatusExW(long long long long ptr long ptr ptr ptr wstr) @ stdcall EnumServicesStatusW(long long long ptr long ptr ptr ptr) -@ stdcall EnumerateTraceGuids(ptr long ptr) ntdll.EtwEnumerateTraceGuids +@ stdcall -version=0x502 EnumerateTraceGuids(ptr long ptr) ntdll.EtwEnumerateTraceGuids +@ stdcall -stub -version=0x600+ EnumerateTraceGuids(ptr long ptr) @ stdcall EqualDomainSid(ptr ptr ptr) @ stdcall EqualPrefixSid(ptr ptr) @ stdcall EqualSid(ptr ptr) @ stdcall FileEncryptionStatusA(str ptr) @ stdcall FileEncryptionStatusW(wstr ptr) @ stdcall FindFirstFreeAce(ptr ptr) -@ stdcall FlushTraceA(double str ptr) ntdll.EtwFlushTraceA -@ stdcall FlushTraceW(double wstr ptr) ntdll.EtwFlushTraceW +@ stdcall -version=0x502 FlushTraceA(double str ptr) ntdll.EtwFlushTraceA +@ stdcall -stub -version=0x600+ FlushTraceA(double str ptr) +@ stdcall -version=0x502 FlushTraceW(double wstr ptr) ntdll.EtwFlushTraceW +@ stdcall -stub -version=0x600+ FlushTraceW(double wstr ptr) @ stub FreeEncryptedFileKeyInfo @ stdcall FreeEncryptionCertificateHashList(ptr) @ stdcall FreeInheritedFromArray(ptr long ptr) @@ -439,8 +445,10 @@ @ stdcall PrivilegedServiceAuditAlarmW(wstr wstr long ptr long) @ stub ProcessIdleTasks @ stdcall ProcessTrace(ptr long ptr ptr) -@ stdcall QueryAllTracesA(ptr long ptr) ntdll.EtwQueryAllTracesA -@ stdcall QueryAllTracesW(ptr long ptr) ntdll.EtwQueryAllTracesW +@ stdcall -version=0x502 QueryAllTracesA(ptr long ptr) ntdll.EtwQueryAllTracesA +@ stdcall -stub -version=0x600+ QueryAllTracesA(ptr long ptr) +@ stdcall -version=0x502 QueryAllTracesW(ptr long ptr) ntdll.EtwQueryAllTracesW +@ stdcall -stub -version=0x600+ QueryAllTracesW(ptr long ptr) @ stdcall QueryRecoveryAgentsOnEncryptedFile(wstr ptr) @ stdcall QueryServiceConfig2A(long long ptr long ptr) @ stdcall QueryServiceConfig2W(long long ptr long ptr) @@ -451,8 +459,10 @@ @ stdcall QueryServiceObjectSecurity(long long ptr long ptr) @ stdcall QueryServiceStatus(long ptr) @ stdcall QueryServiceStatusEx(long long ptr long ptr) -@ stdcall QueryTraceA(double str ptr) ntdll.EtwQueryTraceA -@ stdcall QueryTraceW(double str ptr) ntdll.EtwQueryTraceA +@ stdcall -version=0x502 QueryTraceA(double str ptr) ntdll.EtwQueryTraceA +@ stdcall -stub -version=0x600+ QueryTraceA(double str ptr) +@ stdcall -version=0x502 QueryTraceW(double str ptr) ntdll.EtwQueryTraceW +@ stdcall -stub -version=0x600+ QueryTraceW(double str ptr) @ stdcall QueryUsersOnEncryptedFile(wstr ptr) @ stdcall ReadEncryptedFileRaw(ptr ptr ptr) @ stdcall ReadEventLogA(long long long ptr long ptr ptr) @@ -587,10 +597,14 @@ @ stdcall StartServiceCtrlDispatcherA(ptr) @ stdcall StartServiceCtrlDispatcherW(ptr) @ stdcall StartServiceW(long long ptr) -@ stdcall StartTraceA(ptr str ptr) ntdll.EtwStartTraceA -@ stdcall StartTraceW(ptr wstr ptr) ntdll.EtwStartTraceW -@ stdcall StopTraceA(double str ptr) ntdll.EtwStopTraceA -@ stdcall StopTraceW(double wstr ptr) ntdll.EtwStopTraceA +@ stdcall -version=0x502 StartTraceA(ptr str ptr) ntdll.EtwStartTraceA +@ stdcall -stub -version=0x600+ StartTraceA(ptr str ptr) +@ stdcall -version=0x502 StartTraceW(ptr wstr ptr) ntdll.EtwStartTraceW +@ stdcall -stub -version=0x600+ StartTraceW(ptr wstr ptr) +@ stdcall -version=0x502 StopTraceA(double str ptr) ntdll.EtwStopTraceA +@ stdcall -stub -version=0x600+ StopTraceA(double str ptr) +@ stdcall -version=0x502 StopTraceW(double wstr ptr) ntdll.EtwStopTraceW +@ stdcall -stub -version=0x600+ StopTraceW(double wstr ptr) @ stdcall SystemFunction001(ptr ptr ptr) @ stdcall SystemFunction002(ptr ptr ptr) @ stdcall SystemFunction003(ptr ptr) @@ -629,7 +643,8 @@ @ stdcall SystemFunction036(ptr long) # RtlGenRandom @ stdcall SystemFunction040(ptr long long) # RtlEncryptMemory @ stdcall SystemFunction041(ptr long long) # RtlDecryptMemory -@ stdcall TraceEvent(double ptr) ntdll.EtwTraceEvent +@ stdcall -version=0x502 TraceEvent(double ptr) ntdll.EtwTraceEvent +@ stdcall -stub -version=0x600+ TraceEvent(double ptr) @ stdcall TraceEventInstance(double ptr ptr ptr) ntdll.EtwTraceEventInstance @ varargs TraceMessage() ntdll.EtwTraceMessage @ stdcall TraceMessageVa() ntdll.EtwTraceMessageVa @@ -641,8 +656,10 @@ @ stdcall UnlockServiceDatabase(ptr) @ stub UnregisterIdleTask @ stdcall UnregisterTraceGuids(double) ntdll.EtwUnregisterTraceGuids -@ stdcall UpdateTraceA(double str ptr) ntdll.EtwUpdateTraceA -@ stdcall UpdateTraceW(double wstr ptr) ntdll.EtwUpdateTraceW +@ stdcall -version=0x502 UpdateTraceA(double str ptr) ntdll.EtwUpdateTraceA +@ stdcall -stub -version=0x600+ UpdateTraceA(double str ptr) +@ stdcall -version=0x502 UpdateTraceW(double wstr ptr) ntdll.EtwUpdateTraceW +@ stdcall -stub -version=0x600+ UpdateTraceW(double wstr ptr) @ stub WdmWmiServiceMain @ stub WmiCloseBlock @ stub WmiCloseTraceWithCursor @@ -660,8 +677,10 @@ @ stub WmiGetTraceHeader @ stub WmiMofEnumerateResourcesA @ stub WmiMofEnumerateResourcesW -@ stdcall WmiNotificationRegistrationA(ptr long ptr long long) ntdll.EtwNotificationRegistrationA -@ stdcall WmiNotificationRegistrationW(ptr long ptr long long) ntdll.EtwNotificationRegistrationW +@ stdcall -version=0x502 WmiNotificationRegistrationA(ptr long ptr long long) ntdll.EtwNotificationRegistrationA +@ stdcall -stub -version=0x600+ WmiNotificationRegistrationA(ptr long ptr long long) +@ stdcall -version=0x502 WmiNotificationRegistrationW(ptr long ptr long long) ntdll.EtwNotificationRegistrationW +@ stdcall -stub -version=0x600+ WmiNotificationRegistrationW(ptr long ptr long long) @ stub WmiOpenBlock @ stub WmiOpenTraceWithCursor @ stub WmiParseTraceEvent @@ -674,8 +693,10 @@ @ stub WmiQuerySingleInstanceMultipleA @ stub WmiQuerySingleInstanceMultipleW @ stub WmiQuerySingleInstanceW -@ stdcall WmiReceiveNotificationsA(long long long long) ntdll.EtwReceiveNotificationsA -@ stdcall WmiReceiveNotificationsW(long long long long) ntdll.EtwReceiveNotificationsW +@ stdcall -version=0x502 WmiReceiveNotificationsA(long long long long) ntdll.EtwReceiveNotificationsA +@ stdcall -stub -version=0x600+ WmiReceiveNotificationsA(long long long long) +@ stdcall -version=0x502 WmiReceiveNotificationsW(long long long long) ntdll.EtwReceiveNotificationsW +@ stdcall -stub -version=0x600+ WmiReceiveNotificationsW(long long long long) @ stub WmiSetSingleInstanceA @ stub WmiSetSingleInstanceW @ stub WmiSetSingleItemA

1 year, 5 months

[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, 5 months

[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, 5 months

[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, 5 months

[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, 5 months

[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, 5 months

[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, 5 months

[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, 5 months

[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, 5 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs