Ros-diffs July 2024

ros-diffs@reactos.org

7 participants
31 discussions

[reactos] 01/01: [SHELL32] Follow-up of #7169 (#7175)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=73e795656379a0519b9bc… commit 73e795656379a0519b9bc93d4ba035b12e221d5b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jul 29 20:37:42 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jul 29 20:37:42 2024 +0900 [SHELL32] Follow-up of #7169 (#7175) Follow-up of #7169 JIRA issue: CORE-19595 - Revert some code in RecycleBinGeneric::DeleteFile. --- dll/win32/shell32/shellrecyclebin/recyclebin_generic.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dll/win32/shell32/shellrecyclebin/recyclebin_generic.cpp b/dll/win32/shell32/shellrecyclebin/recyclebin_generic.cpp index c9a010e12b0..a7ad1b00de0 100644 --- a/dll/win32/shell32/shellrecyclebin/recyclebin_generic.cpp +++ b/dll/win32/shell32/shellrecyclebin/recyclebin_generic.cpp @@ -97,7 +97,15 @@ STDMETHODIMP RecycleBinGeneric::DeleteFile(LPCWSTR szFileName) /* Get associated volume path */ WCHAR szVolume[MAX_PATH]; +#ifndef __REACTOS__ + if (!GetVolumePathNameW(szFullName, szVolume, _countof(szVolume))) + { + CoTaskMemFree(szFullName); + return HRESULT_FROM_WIN32(GetLastError()); + } +#else swprintf(szVolume, L"%c:\\", szFullName[0]); +#endif /* Skip namespace (if any): "\\.\" or "\\?\" */ if (szVolume[0] == '\\' && @@ -130,7 +138,7 @@ STDMETHODIMP RecycleBinGeneric::EmptyRecycleBin() if (dwLogicalDrives == 0) return HRESULT_FROM_WIN32(GetLastError()); - for (DWORD i = 0; i < L'Z' - L'A' + 1; i++) + for (DWORD i = 0; i < 'Z' - 'A' + 1; i++) { if (!(dwLogicalDrives & (1 << i))) continue;

4 months, 4 weeks

[reactos] 01/01: [SDK][NTUSER] s/KLF_UNLOAD/KL_UNLOAD/ (#7196)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7dd081e945a1d3756666c… commit 7dd081e945a1d3756666c2e4c32b32ac74fe7b03 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jul 29 19:30:49 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jul 29 19:30:49 2024 +0900 [SDK][NTUSER] s/KLF_UNLOAD/KL_UNLOAD/ (#7196) JIRA issue: CORE-19268 - Rename KLF_UNLOAD as KL_UNLOAD. - Move it from win32ss/user/ntuser/input.h to sdk/include/reactos/undocuser.h. - Add UKL_NOACTIVATENEXT constant and use it. --- sdk/include/reactos/undocuser.h | 6 ++++++ win32ss/user/ntuser/input.h | 3 --- win32ss/user/ntuser/kbdlayout.c | 32 +++++++++++++------------------- win32ss/user/ntuser/keyboard.c | 2 +- 4 files changed, 20 insertions(+), 23 deletions(-) diff --git a/sdk/include/reactos/undocuser.h b/sdk/include/reactos/undocuser.h index b2bc7a8ccc9..ab289d056b9 100644 --- a/sdk/include/reactos/undocuser.h +++ b/sdk/include/reactos/undocuser.h @@ -175,6 +175,12 @@ extern "C" { #define SBRG_PAGEDOWNLEFT 4 /* the page down or page left region */ #define SBRG_BOTTOMLEFTBTN 5 /* the bottom or left button */ +// Keyboard Layout undocumented flags +#define KL_UNLOAD 0x20000000 + +// co_IntUnloadKeyboardLayoutEx undocumented flags +#define UKL_NOACTIVATENEXT 0x80000000 + BOOL WINAPI UpdatePerUserSystemParameters(DWORD dwReserved, BOOL bEnable); BOOL WINAPI SetLogonNotifyWindow(HWND Wnd); BOOL WINAPI KillSystemTimer(HWND,UINT_PTR); diff --git a/win32ss/user/ntuser/input.h b/win32ss/user/ntuser/input.h index 35105947d68..fdf8c13cc5f 100644 --- a/win32ss/user/ntuser/input.h +++ b/win32ss/user/ntuser/input.h @@ -47,9 +47,6 @@ typedef struct _ATTACHINFO extern PATTACHINFO gpai; -/* Keyboard layout undocumented flags */ -#define KLF_UNLOAD 0x20000000 - /* Key States */ #define KS_DOWN_BIT 0x80 #define KS_LOCK_BIT 0x01 diff --git a/win32ss/user/ntuser/kbdlayout.c b/win32ss/user/ntuser/kbdlayout.c index 31c016d3e97..d72b561a38b 100644 --- a/win32ss/user/ntuser/kbdlayout.c +++ b/win32ss/user/ntuser/kbdlayout.c @@ -32,7 +32,6 @@ typedef PVOID (*PFN_KBDLAYERDESCRIPTOR)(VOID); /* * Retrieves a PKL by an input locale identifier (HKL). * @implemented - * Win: HKLtoPKL */ PKL FASTCALL IntHKLtoPKL(_Inout_ PTHREADINFO pti, _In_ HKL hKL) { @@ -50,7 +49,7 @@ PKL FASTCALL IntHKLtoPKL(_Inout_ PTHREADINFO pti, _In_ HKL hKL) do { pKL = pKL->pklNext; - if (!(pKL->dwKL_Flags & KLF_UNLOAD)) + if (!(pKL->dwKL_Flags & KL_UNLOAD)) return pKL; } while (pKL != pFirstKL); } @@ -59,13 +58,13 @@ PKL FASTCALL IntHKLtoPKL(_Inout_ PTHREADINFO pti, _In_ HKL hKL) do { pKL = pKL->pklPrev; - if (!(pKL->dwKL_Flags & KLF_UNLOAD)) + if (!(pKL->dwKL_Flags & KL_UNLOAD)) return pKL; } while (pKL != pFirstKL); } else if (HIWORD(hKL)) /* hKL is a full input locale identifier */ { - /* No KLF_UNLOAD check */ + /* No KL_UNLOAD check */ do { if (pKL->hkl == hKL) @@ -76,7 +75,7 @@ PKL FASTCALL IntHKLtoPKL(_Inout_ PTHREADINFO pti, _In_ HKL hKL) } else /* Language only specified */ { - /* No KLF_UNLOAD check */ + /* No KL_UNLOAD check */ do { if (LOWORD(pKL->hkl) == LOWORD(hKL)) /* Low word is language ID */ @@ -92,7 +91,6 @@ PKL FASTCALL IntHKLtoPKL(_Inout_ PTHREADINFO pti, _In_ HKL hKL) /* * A helper function for NtUserGetKeyboardLayoutList. * @implemented - * Win: _GetKeyboardLayoutList */ static UINT APIENTRY IntGetKeyboardLayoutList( @@ -114,7 +112,7 @@ IntGetKeyboardLayoutList( /* Count the effective PKLs */ do { - if (!(pKL->dwKL_Flags & KLF_UNLOAD)) + if (!(pKL->dwKL_Flags & KL_UNLOAD)) ++ret; pKL = pKL->pklNext; } while (pKL != pFirstKL); @@ -124,7 +122,7 @@ IntGetKeyboardLayoutList( /* Copy the effective HKLs to pHklBuff */ do { - if (!(pKL->dwKL_Flags & KLF_UNLOAD)) + if (!(pKL->dwKL_Flags & KL_UNLOAD)) { *pHklBuff = pKL->hkl; ++pHklBuff; @@ -489,7 +487,7 @@ UserUnloadKbl(PKL pKl) if (pKl->head.cLockObj > 1) { /* Layout is used by other threads */ - pKl->dwKL_Flags |= KLF_UNLOAD; + pKl->dwKL_Flags |= KL_UNLOAD; return FALSE; } @@ -521,7 +519,7 @@ W32kGetDefaultKeyLayout(VOID) /* Return not unloaded layout */ do { - if (!(pKl->dwKL_Flags & KLF_UNLOAD)) + if (!(pKl->dwKL_Flags & KL_UNLOAD)) return pKl; pKl = pKl->pklPrev; /* Confirmed on Win2k */ @@ -556,7 +554,6 @@ UserHklToKbl(HKL hKl) return NULL; } -// Win: ReorderKeyboardLayouts VOID FASTCALL IntReorderKeyboardLayouts( _Inout_ PWINSTATION_OBJECT pWinSta, @@ -813,7 +810,6 @@ co_UserActivateKeyboardLayout( return hOldKL; } -/* Win: xxxActivateKeyboardLayout */ HKL APIENTRY co_IntActivateKeyboardLayout( _Inout_ PWINSTATION_OBJECT pWinSta, @@ -837,7 +833,6 @@ co_IntActivateKeyboardLayout( return co_UserActivateKeyboardLayout(pKL, uFlags, pWnd); } -// Win: xxxInternalUnloadKeyboardLayout static BOOL APIENTRY co_IntUnloadKeyboardLayoutEx( _Inout_ PWINSTATION_OBJECT pWinSta, @@ -848,16 +843,16 @@ co_IntUnloadKeyboardLayoutEx( USER_REFERENCE_ENTRY Ref1, Ref2; PTHREADINFO pti = gptiCurrent; - if (pKL == gspklBaseLayout && !(dwFlags & 0x80000000)) + if (pKL == gspklBaseLayout && !(dwFlags & UKL_NOACTIVATENEXT)) return FALSE; UserRefObjectCo(pKL, &Ref1); /* Add reference */ /* Regard as unloaded */ UserMarkObjectDestroy(pKL); - pKL->dwKL_Flags |= KLF_UNLOAD; + pKL->dwKL_Flags |= KL_UNLOAD; - if (!(dwFlags & 0x80000000) && pti->KeyboardLayout == pKL) + if (!(dwFlags & UKL_NOACTIVATENEXT) && pti->KeyboardLayout == pKL) { pNextKL = IntHKLtoPKL(pti, UlongToHandle(HKL_NEXT)); if (pNextKL) @@ -885,7 +880,6 @@ co_IntUnloadKeyboardLayoutEx( return TRUE; } -// Win: xxxUnloadKeyboardLayout static BOOL APIENTRY IntUnloadKeyboardLayout(_Inout_ PWINSTATION_OBJECT pWinSta, _In_ HKL hKL) { @@ -957,7 +951,7 @@ co_IntLoadKeyboardLayoutEx( { /* Find last not unloaded layout */ PKL pLastKL = gspklBaseLayout->pklPrev; - while (pLastKL != gspklBaseLayout && (pLastKL->dwKL_Flags & KLF_UNLOAD)) + while (pLastKL != gspklBaseLayout && (pLastKL->dwKL_Flags & KL_UNLOAD)) pLastKL = pLastKL->pklPrev; /* Add new layout to the list */ @@ -978,7 +972,7 @@ co_IntLoadKeyboardLayoutEx( } /* If this layout was prepared to unload, undo it */ - pNewKL->dwKL_Flags &= ~KLF_UNLOAD; + pNewKL->dwKL_Flags &= ~KL_UNLOAD; /* Reorder if necessary */ if (Flags & KLF_REORDER) diff --git a/win32ss/user/ntuser/keyboard.c b/win32ss/user/ntuser/keyboard.c index 3d8bed1ad25..3e187da36e4 100644 --- a/win32ss/user/ntuser/keyboard.c +++ b/win32ss/user/ntuser/keyboard.c @@ -807,7 +807,7 @@ IntGetNextKL( { pKL = (bNext ? pKL->pklNext : pKL->pklPrev); - if (!(pKL->dwKL_Flags & KLF_UNLOAD) && bSameLang == (LangID == LOWORD(pKL->hkl))) + if (!(pKL->dwKL_Flags & KL_UNLOAD) && bSameLang == (LangID == LOWORD(pKL->hkl))) return pKL; } while (pKL != pFirstKL);

4 months, 4 weeks

[reactos] 01/01: [SHELL32] RecycleBin5: Make it C++ (#7174)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=90a5b9a83f2215085a0a6… commit 90a5b9a83f2215085a0a628c996eeb32e60853fc Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jul 29 09:20:36 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jul 29 09:20:36 2024 +0900 [SHELL32] RecycleBin5: Make it C++ (#7174) Modernize code. JIRA issue: CORE-19595 Rewrite RecycleBin5 in C++. --- dll/win32/shell32/shellrecyclebin/CMakeLists.txt | 3 +- .../shell32/shellrecyclebin/recyclebin_private.h | 3 +- .../{recyclebin_v5.c => recyclebin_v5.cpp} | 401 ++++++++++----------- 3 files changed, 195 insertions(+), 212 deletions(-) diff --git a/dll/win32/shell32/shellrecyclebin/CMakeLists.txt b/dll/win32/shell32/shellrecyclebin/CMakeLists.txt index ef5bf3da1c8..1c8f343ff65 100644 --- a/dll/win32/shell32/shellrecyclebin/CMakeLists.txt +++ b/dll/win32/shell32/shellrecyclebin/CMakeLists.txt @@ -8,11 +8,12 @@ list(APPEND SOURCE recyclebin.c recyclebin_generic.cpp recyclebin_generic_enumerator.cpp - recyclebin_v5.c + recyclebin_v5.cpp recyclebin_v5_enumerator.cpp recyclebin_private.h) add_library(recyclebin ${SOURCE} guid.c) +target_link_libraries(recyclebin PRIVATE atl_classes) add_pch(recyclebin recyclebin_private.h SOURCE) add_dependencies(recyclebin psdk) target_link_libraries(recyclebin PRIVATE atl_classes) diff --git a/dll/win32/shell32/shellrecyclebin/recyclebin_private.h b/dll/win32/shell32/shellrecyclebin/recyclebin_private.h index aba8decdfd1..42cffd22656 100644 --- a/dll/win32/shell32/shellrecyclebin/recyclebin_private.h +++ b/dll/win32/shell32/shellrecyclebin/recyclebin_private.h @@ -50,6 +50,7 @@ HRESULT RecycleBinGenericEnum_Constructor(OUT IRecycleBinEnumList **pprbel); /* recyclebin_v5.c */ -HRESULT RecycleBin5_Constructor(IN LPCWSTR VolumePath, OUT IUnknown **ppUnknown); +EXTERN_C +HRESULT RecycleBin5_Constructor(_In_ LPCWSTR VolumePath, _Out_ IUnknown **ppUnknown); #endif /* _RECYCLEBIN_PRIVATE_H_ */ diff --git a/dll/win32/shell32/shellrecyclebin/recyclebin_v5.c b/dll/win32/shell32/shellrecyclebin/recyclebin_v5.cpp similarity index 65% rename from dll/win32/shell32/shellrecyclebin/recyclebin_v5.c rename to dll/win32/shell32/shellrecyclebin/recyclebin_v5.cpp index 3344b2c035c..a98e56861bb 100644 --- a/dll/win32/shell32/shellrecyclebin/recyclebin_v5.c +++ b/dll/win32/shell32/shellrecyclebin/recyclebin_v5.cpp @@ -1,13 +1,14 @@ /* * PROJECT: Recycle bin management - * LICENSE: GPL v2 - See COPYING in the top level directory - * FILE: lib/recyclebin/recyclebin_v5.c + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Deals with recycle bins of Windows 2000/XP/2003 - * PROGRAMMERS: Copyright 2006-2007 Hervé Poussineau (hpoussin(a)reactos.org) + * COPYRIGHT: Copyright 2006-2007 Hervé Poussineau (hpoussin(a)reactos.org) + * Copyright 2024 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #include "recyclebin_private.h" - +#include <atlstr.h> +#include <shlwapi.h> #include "sddl.h" static BOOL @@ -38,7 +39,7 @@ IntDeleteRecursive( { /* Prepare file specification */ dwLength = wcslen(FullName); - FullPath = HeapAlloc(GetProcessHeap(), 0, (dwLength + 1 + MAX_PATH + 1) * sizeof(WCHAR)); + FullPath = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, (dwLength + 1 + MAX_PATH + 1) * sizeof(WCHAR)); if (!FullPath) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); @@ -91,99 +92,97 @@ cleanup: return ret; } -struct RecycleBin5 +class RecycleBin5 : public IRecycleBin5 { - ULONG ref; - IRecycleBin5 recycleBinImpl; - HANDLE hInfo; - HANDLE hInfoMapped; - - DWORD EnumeratorCount; - - LPWSTR VolumePath; - WCHAR Folder[ANY_SIZE]; /* [drive]:\[RECYCLE_BIN_DIRECTORY]\{SID} */ +public: + RecycleBin5(); + virtual ~RecycleBin5(); + + HRESULT Init(_In_ LPCWSTR VolumePath); + + /* IUnknown interface */ + STDMETHODIMP QueryInterface(_In_ REFIID riid, _Out_ void **ppvObject) override; + STDMETHODIMP_(ULONG) AddRef() override; + STDMETHODIMP_(ULONG) Release() override; + + /* IRecycleBin interface */ + STDMETHODIMP DeleteFile(_In_ LPCWSTR szFileName) override; + STDMETHODIMP EmptyRecycleBin() override; + STDMETHODIMP EnumObjects(_Out_ IRecycleBinEnumList **ppEnumList) override; + + /* IRecycleBin5 interface */ + STDMETHODIMP Delete( + _In_ LPCWSTR pDeletedFileName, + _In_ DELETED_FILE_RECORD *pDeletedFile) override; + STDMETHODIMP Restore( + _In_ LPCWSTR pDeletedFileName, + _In_ DELETED_FILE_RECORD *pDeletedFile) override; + STDMETHODIMP OnClosing(_In_ IRecycleBinEnumList *prbel) override; + +protected: + LONG m_ref; + HANDLE m_hInfo; + HANDLE m_hInfoMapped; + DWORD m_EnumeratorCount; + CStringW m_VolumePath; + CStringW m_Folder; /* [drive]:\[RECYCLE_BIN_DIRECTORY]\{SID} */ }; -static HRESULT STDMETHODCALLTYPE -RecycleBin5_RecycleBin5_QueryInterface( - IRecycleBin5 *This, - REFIID riid, - void **ppvObject) +STDMETHODIMP RecycleBin5::QueryInterface(_In_ REFIID riid, _Out_ void **ppvObject) { - struct RecycleBin5 *s = CONTAINING_RECORD(This, struct RecycleBin5, recycleBinImpl); - - TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppvObject); + TRACE("(%p, %s, %p)\n", this, debugstr_guid(&riid), ppvObject); if (!ppvObject) return E_POINTER; - if (IsEqualIID(riid, &IID_IUnknown)) - *ppvObject = &s->recycleBinImpl; - else if (IsEqualIID(riid, &IID_IRecycleBin)) - *ppvObject = &s->recycleBinImpl; - else if (IsEqualIID(riid, &IID_IRecycleBin5)) - *ppvObject = &s->recycleBinImpl; + if (IsEqualIID(riid, IID_IUnknown) || IsEqualIID(riid, IID_IRecycleBin)) + *ppvObject = static_cast<IRecycleBin5 *>(this); + else if (IsEqualIID(riid, IID_IRecycleBin5)) + *ppvObject = static_cast<IRecycleBin5 *>(this); else { *ppvObject = NULL; return E_NOINTERFACE; } - IUnknown_AddRef(This); + AddRef(); return S_OK; } -static ULONG STDMETHODCALLTYPE -RecycleBin5_RecycleBin5_AddRef( - IRecycleBin5 *This) +STDMETHODIMP_(ULONG) RecycleBin5::AddRef() { - struct RecycleBin5 *s = CONTAINING_RECORD(This, struct RecycleBin5, recycleBinImpl); - ULONG refCount = InterlockedIncrement((PLONG)&s->ref); - TRACE("(%p)\n", This); - return refCount; + TRACE("(%p)\n", this); + return InterlockedIncrement(&m_ref); } -static VOID -RecycleBin5_Destructor( - struct RecycleBin5 *s) +RecycleBin5::~RecycleBin5() { - TRACE("(%p)\n", s); + TRACE("(%p)\n", this); - if (s->hInfo && s->hInfo != INVALID_HANDLE_VALUE) - CloseHandle(s->hInfo); - if (s->hInfoMapped) - CloseHandle(s->hInfoMapped); - CoTaskMemFree(s); + if (m_hInfo && m_hInfo != INVALID_HANDLE_VALUE) + CloseHandle(m_hInfo); + if (m_hInfoMapped) + CloseHandle(m_hInfoMapped); } -static ULONG STDMETHODCALLTYPE -RecycleBin5_RecycleBin5_Release( - IRecycleBin5 *This) +STDMETHODIMP_(ULONG) RecycleBin5::Release() { - struct RecycleBin5 *s = CONTAINING_RECORD(This, struct RecycleBin5, recycleBinImpl); - ULONG refCount; - - TRACE("(%p)\n", This); - - refCount = InterlockedDecrement((PLONG)&s->ref); + TRACE("(%p)\n", this); + ULONG refCount = InterlockedDecrement(&m_ref); if (refCount == 0) - RecycleBin5_Destructor(s); - + delete this; return refCount; } -static HRESULT STDMETHODCALLTYPE -RecycleBin5_RecycleBin5_DeleteFile( - IN IRecycleBin5 *This, - IN LPCWSTR szFileName) +STDMETHODIMP RecycleBin5::DeleteFile(_In_ LPCWSTR szFileName) { - struct RecycleBin5 *s = CONTAINING_RECORD(This, struct RecycleBin5, recycleBinImpl); LPWSTR szFullName = NULL; DWORD dwBufferLength = 0; LPWSTR lpFilePart; LPCWSTR Extension; - WCHAR DeletedFileName[MAX_PATH]; + CStringW DeletedFileName; + WCHAR szUniqueId[64]; DWORD len; HANDLE hFile = INVALID_HANDLE_VALUE; PINFO2_HEADER pHeader = NULL; @@ -194,9 +193,9 @@ RecycleBin5_RecycleBin5_DeleteFile( DWORD ClusterSize, BytesPerSector, SectorsPerCluster; HRESULT hr; - TRACE("(%p, %s)\n", This, debugstr_w(szFileName)); + TRACE("(%p, %s)\n", this, debugstr_w(szFileName)); - if (s->EnumeratorCount != 0) + if (m_EnumeratorCount != 0) return HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION); /* Get full file name */ @@ -214,7 +213,7 @@ RecycleBin5_RecycleBin5_DeleteFile( if (szFullName) CoTaskMemFree(szFullName); dwBufferLength = len; - szFullName = CoTaskMemAlloc(dwBufferLength * sizeof(WCHAR)); + szFullName = (LPWSTR)CoTaskMemAlloc(dwBufferLength * sizeof(WCHAR)); if (!szFullName) return HRESULT_FROM_WIN32(ERROR_NOT_ENOUGH_MEMORY); } @@ -242,18 +241,18 @@ RecycleBin5_RecycleBin5_DeleteFile( } /* Increase INFO2 file size */ - CloseHandle(s->hInfoMapped); - SetFilePointer(s->hInfo, sizeof(DELETED_FILE_RECORD), NULL, FILE_END); - SetEndOfFile(s->hInfo); - s->hInfoMapped = CreateFileMappingW(s->hInfo, NULL, PAGE_READWRITE | SEC_COMMIT, 0, 0, NULL); - if (!s->hInfoMapped) + CloseHandle(m_hInfoMapped); + SetFilePointer(m_hInfo, sizeof(DELETED_FILE_RECORD), NULL, FILE_END); + SetEndOfFile(m_hInfo); + m_hInfoMapped = CreateFileMappingW(m_hInfo, NULL, PAGE_READWRITE | SEC_COMMIT, 0, 0, NULL); + if (!m_hInfoMapped) { hr = HRESULT_FROM_WIN32(GetLastError()); goto cleanup; } /* Open INFO2 file */ - pHeader = MapViewOfFile(s->hInfoMapped, FILE_MAP_WRITE, 0, 0, 0); + pHeader = (PINFO2_HEADER)MapViewOfFile(m_hInfoMapped, FILE_MAP_WRITE, 0, 0, 0); if (!pHeader) { hr = HRESULT_FROM_WIN32(GetLastError()); @@ -261,7 +260,7 @@ RecycleBin5_RecycleBin5_DeleteFile( } /* Get number of entries */ - FileSize.u.LowPart = GetFileSize(s->hInfo, &FileSize.u.HighPart); + FileSize.u.LowPart = GetFileSize(m_hInfo, &FileSize.u.HighPart); if (FileSize.u.LowPart < sizeof(INFO2_HEADER)) { hr = HRESULT_FROM_WIN32(GetLastError()); @@ -295,7 +294,7 @@ RecycleBin5_RecycleBin5_DeleteFile( pHeader->dwTotalLogicalSize += FileSize.u.LowPart; /* Generate new name */ - Extension = wcsrchr(szFullName, '.'); + Extension = PathFindExtensionW(szFullName); ZeroMemory(pDeletedFile, sizeof(DELETED_FILE_RECORD)); if (dwEntries == 0) pDeletedFile->dwRecordUniqueId = 0; @@ -304,11 +303,18 @@ RecycleBin5_RecycleBin5_DeleteFile( PDELETED_FILE_RECORD pLastDeleted = ((PDELETED_FILE_RECORD)(pHeader + 1)) + dwEntries - 1; pDeletedFile->dwRecordUniqueId = pLastDeleted->dwRecordUniqueId + 1; } + pDeletedFile->dwDriveNumber = tolower(szFullName[0]) - 'a'; - _snwprintf(DeletedFileName, MAX_PATH, L"%s\\D%c%lu%s", s->Folder, pDeletedFile->dwDriveNumber + 'a', pDeletedFile->dwRecordUniqueId, Extension); + _ultow(pDeletedFile->dwRecordUniqueId, szUniqueId, 10); + + DeletedFileName = m_Folder; + DeletedFileName += L"\\D"; + DeletedFileName += (WCHAR)(L'a' + pDeletedFile->dwDriveNumber); + DeletedFileName += szUniqueId; + DeletedFileName += Extension; /* Get cluster size */ - if (!GetDiskFreeSpaceW(s->VolumePath, &SectorsPerCluster, &BytesPerSector, NULL, NULL)) + if (!GetDiskFreeSpaceW(m_VolumePath, &SectorsPerCluster, &BytesPerSector, NULL, NULL)) { hr = HRESULT_FROM_WIN32(GetLastError()); goto cleanup; @@ -348,80 +354,69 @@ cleanup: return hr; } -static HRESULT STDMETHODCALLTYPE -RecycleBin5_RecycleBin5_EmptyRecycleBin( - IN IRecycleBin5 *This) +STDMETHODIMP RecycleBin5::EmptyRecycleBin() { - IRecycleBinEnumList *prbel; - IRecycleBinFile *prbf; - HRESULT hr; - - TRACE("(%p)\n", This); + TRACE("(%p)\n", this); while (TRUE) { - hr = IRecycleBin5_EnumObjects(This, &prbel); + IRecycleBinEnumList *prbel; + HRESULT hr = EnumObjects(&prbel); if (!SUCCEEDED(hr)) return hr; - hr = IRecycleBinEnumList_Next(prbel, 1, &prbf, NULL); - IRecycleBinEnumList_Release(prbel); + + IRecycleBinFile *prbf; + hr = prbel->Next(1, &prbf, NULL); + prbel->Release(); if (hr == S_FALSE) return S_OK; - hr = IRecycleBinFile_Delete(prbf); - IRecycleBinFile_Release(prbf); + hr = prbf->Delete(); + prbf->Release(); if (!SUCCEEDED(hr)) return hr; } } -static HRESULT STDMETHODCALLTYPE -RecycleBin5_RecycleBin5_EnumObjects( - IN IRecycleBin5 *This, - OUT IRecycleBinEnumList **ppEnumList) +STDMETHODIMP RecycleBin5::EnumObjects(_Out_ IRecycleBinEnumList **ppEnumList) { - struct RecycleBin5 *s = CONTAINING_RECORD(This, struct RecycleBin5, recycleBinImpl); - IRecycleBinEnumList *prbel; - HRESULT hr; - IUnknown *pUnk; - - TRACE("(%p, %p)\n", This, ppEnumList); + TRACE("(%p, %p)\n", this, ppEnumList); - hr = RecycleBin5Enum_Constructor(This, s->hInfo, s->hInfoMapped, s->Folder, &pUnk); + IUnknown *pUnk; + HRESULT hr = RecycleBin5Enum_Constructor(this, m_hInfo, m_hInfoMapped, m_Folder, &pUnk); if (!SUCCEEDED(hr)) return hr; - hr = IUnknown_QueryInterface(pUnk, &IID_IRecycleBinEnumList, (void **)&prbel); + IRecycleBinEnumList *prbel; + hr = pUnk->QueryInterface(IID_IRecycleBinEnumList, (void **)&prbel); if (SUCCEEDED(hr)) { - s->EnumeratorCount++; + m_EnumeratorCount++; *ppEnumList = prbel; } - IUnknown_Release(pUnk); + + pUnk->Release(); return hr; } -static HRESULT STDMETHODCALLTYPE -RecycleBin5_RecycleBin5_Delete( - IN IRecycleBin5 *This, - IN LPCWSTR pDeletedFileName, - IN DELETED_FILE_RECORD *pDeletedFile) +STDMETHODIMP RecycleBin5::Delete( + _In_ LPCWSTR pDeletedFileName, + _In_ DELETED_FILE_RECORD *pDeletedFile) { - struct RecycleBin5 *s = CONTAINING_RECORD(This, struct RecycleBin5, recycleBinImpl); ULARGE_INTEGER FileSize; PINFO2_HEADER pHeader; DELETED_FILE_RECORD *pRecord, *pLast; DWORD dwEntries, i; - TRACE("(%p, %s, %p)\n", This, debugstr_w(pDeletedFileName), pDeletedFile); + TRACE("(%p, %s, %p)\n", this, debugstr_w(pDeletedFileName), pDeletedFile); - if (s->EnumeratorCount != 0) + if (m_EnumeratorCount != 0) return HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION); - pHeader = MapViewOfFile(s->hInfoMapped, FILE_MAP_WRITE, 0, 0, 0); + pHeader = (PINFO2_HEADER)MapViewOfFile(m_hInfoMapped, FILE_MAP_WRITE, 0, 0, 0); if (!pHeader) return HRESULT_FROM_WIN32(GetLastError()); - FileSize.u.LowPart = GetFileSize(s->hInfo, &FileSize.u.HighPart); + FileSize.u.LowPart = GetFileSize(m_hInfo, &FileSize.u.HighPart); if (FileSize.u.LowPart == 0) { UnmapViewOfFile(pHeader); @@ -448,11 +443,11 @@ RecycleBin5_RecycleBin5_Delete( UnmapViewOfFile(pHeader); /* Resize file */ - CloseHandle(s->hInfoMapped); - SetFilePointer(s->hInfo, -(LONG)sizeof(DELETED_FILE_RECORD), NULL, FILE_END); - SetEndOfFile(s->hInfo); - s->hInfoMapped = CreateFileMappingW(s->hInfo, NULL, PAGE_READWRITE | SEC_COMMIT, 0, 0, NULL); - if (!s->hInfoMapped) + CloseHandle(m_hInfoMapped); + SetFilePointer(m_hInfo, -(LONG)sizeof(DELETED_FILE_RECORD), NULL, FILE_END); + SetEndOfFile(m_hInfo); + m_hInfoMapped = CreateFileMappingW(m_hInfo, NULL, PAGE_READWRITE | SEC_COMMIT, 0, 0, NULL); + if (!m_hInfoMapped) return HRESULT_FROM_WIN32(GetLastError()); return S_OK; } @@ -462,13 +457,10 @@ RecycleBin5_RecycleBin5_Delete( return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); } -static HRESULT STDMETHODCALLTYPE -RecycleBin5_RecycleBin5_Restore( - IN IRecycleBin5 *This, - IN LPCWSTR pDeletedFileName, - IN DELETED_FILE_RECORD *pDeletedFile) +STDMETHODIMP RecycleBin5::Restore( + _In_ LPCWSTR pDeletedFileName, + _In_ DELETED_FILE_RECORD *pDeletedFile) { - struct RecycleBin5 *s = CONTAINING_RECORD(This, struct RecycleBin5, recycleBinImpl); ULARGE_INTEGER FileSize; PINFO2_HEADER pHeader; DELETED_FILE_RECORD *pRecord, *pLast; @@ -476,16 +468,16 @@ RecycleBin5_RecycleBin5_Restore( SHFILEOPSTRUCTW op; int res; - TRACE("(%p, %s, %p)\n", This, debugstr_w(pDeletedFileName), pDeletedFile); + TRACE("(%p, %s, %p)\n", this, debugstr_w(pDeletedFileName), pDeletedFile); - if (s->EnumeratorCount != 0) + if (m_EnumeratorCount != 0) return HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION); - pHeader = MapViewOfFile(s->hInfoMapped, FILE_MAP_WRITE, 0, 0, 0); + pHeader = (PINFO2_HEADER)MapViewOfFile(m_hInfoMapped, FILE_MAP_WRITE, 0, 0, 0); if (!pHeader) return HRESULT_FROM_WIN32(GetLastError()); - FileSize.u.LowPart = GetFileSize(s->hInfo, &FileSize.u.HighPart); + FileSize.u.LowPart = GetFileSize(m_hInfo, &FileSize.u.HighPart); if (FileSize.u.LowPart == 0) { UnmapViewOfFile(pHeader); @@ -519,11 +511,11 @@ RecycleBin5_RecycleBin5_Restore( UnmapViewOfFile(pHeader); /* Resize file */ - CloseHandle(s->hInfoMapped); - SetFilePointer(s->hInfo, -(LONG)sizeof(DELETED_FILE_RECORD), NULL, FILE_END); - SetEndOfFile(s->hInfo); - s->hInfoMapped = CreateFileMappingW(s->hInfo, NULL, PAGE_READWRITE | SEC_COMMIT, 0, 0, NULL); - if (!s->hInfoMapped) + CloseHandle(m_hInfoMapped); + SetFilePointer(m_hInfo, -(LONG)sizeof(DELETED_FILE_RECORD), NULL, FILE_END); + SetEndOfFile(m_hInfo); + m_hInfoMapped = CreateFileMappingW(m_hInfo, NULL, PAGE_READWRITE | SEC_COMMIT, 0, 0, NULL); + if (!m_hInfoMapped) return HRESULT_FROM_WIN32(GetLastError()); return S_OK; } @@ -534,34 +526,17 @@ RecycleBin5_RecycleBin5_Restore( return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); } -static HRESULT STDMETHODCALLTYPE -RecycleBin5_RecycleBin5_OnClosing( - IN IRecycleBin5 *This, - IN IRecycleBinEnumList *prbel) +STDMETHODIMP RecycleBin5::OnClosing(_In_ IRecycleBinEnumList *prbel) { - struct RecycleBin5 *s = CONTAINING_RECORD(This, struct RecycleBin5, recycleBinImpl); - TRACE("(%p, %p)\n", This, prbel); - s->EnumeratorCount--; + TRACE("(%p, %p)\n", this, prbel); + m_EnumeratorCount--; return S_OK; } -CONST_VTBL struct IRecycleBin5Vtbl RecycleBin5Vtbl = -{ - RecycleBin5_RecycleBin5_QueryInterface, - RecycleBin5_RecycleBin5_AddRef, - RecycleBin5_RecycleBin5_Release, - RecycleBin5_RecycleBin5_DeleteFile, - RecycleBin5_RecycleBin5_EmptyRecycleBin, - RecycleBin5_RecycleBin5_EnumObjects, - RecycleBin5_RecycleBin5_Delete, - RecycleBin5_RecycleBin5_Restore, - RecycleBin5_RecycleBin5_OnClosing, -}; - static HRESULT RecycleBin5_Create( - IN LPCWSTR Folder, - IN PSID OwnerSid OPTIONAL) + _In_ LPCWSTR Folder, + _In_ PSID OwnerSid OPTIONAL) { LPWSTR BufferName = NULL; LPWSTR Separator; /* Pointer into BufferName buffer */ @@ -573,7 +548,7 @@ RecycleBin5_Create( HRESULT hr; Needed = (wcslen(Folder) + 1 + max(wcslen(RECYCLE_BIN_FILE_NAME), wcslen(L"desktop.ini")) + 1) * sizeof(WCHAR); - BufferName = HeapAlloc(GetProcessHeap(), 0, Needed); + BufferName = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, Needed); if (!BufferName) { hr = ERROR_NOT_ENOUGH_MEMORY; @@ -672,37 +647,38 @@ cleanup: return hr; } -HRESULT RecycleBin5_Constructor(IN LPCWSTR VolumePath, OUT IUnknown **ppUnknown) +RecycleBin5::RecycleBin5() + : m_ref(1) + , m_hInfo(NULL) + , m_hInfoMapped(NULL) + , m_EnumeratorCount(0) +{ +} + +HRESULT RecycleBin5::Init(_In_ LPCWSTR VolumePath) { - struct RecycleBin5 *s = NULL; DWORD FileSystemFlags; LPCWSTR RecycleBinDirectory; HANDLE tokenHandle = INVALID_HANDLE_VALUE; PTOKEN_USER TokenUserInfo = NULL; - LPWSTR StringSid = NULL, p; - DWORD Needed, DirectoryLength; + LPWSTR StringSid = NULL; + DWORD Needed; INT len; HRESULT hr; - if (!ppUnknown) - return E_POINTER; + m_VolumePath = VolumePath; /* Get information about file system */ - if (!GetVolumeInformationW( - VolumePath, - NULL, - 0, - NULL, - NULL, - &FileSystemFlags, - NULL, - 0)) + if (!GetVolumeInformationW(VolumePath, NULL, 0, NULL, NULL, &FileSystemFlags, NULL, 0)) { hr = HRESULT_FROM_WIN32(GetLastError()); goto cleanup; } + if (!(FileSystemFlags & FILE_PERSISTENT_ACLS)) + { RecycleBinDirectory = RECYCLE_BIN_DIRECTORY_WITHOUT_ACL; + } else { RecycleBinDirectory = RECYCLE_BIN_DIRECTORY_WITH_ACL; @@ -723,7 +699,7 @@ HRESULT RecycleBin5_Constructor(IN LPCWSTR VolumePath, OUT IUnknown **ppUnknown) hr = HRESULT_FROM_WIN32(GetLastError()); goto cleanup; } - TokenUserInfo = HeapAlloc(GetProcessHeap(), 0, Needed); + TokenUserInfo = (PTOKEN_USER)HeapAlloc(GetProcessHeap(), 0, Needed); if (!TokenUserInfo) { hr = E_OUTOFMEMORY; @@ -741,55 +717,42 @@ HRESULT RecycleBin5_Constructor(IN LPCWSTR VolumePath, OUT IUnknown **ppUnknown) } } - DirectoryLength = wcslen(VolumePath) + wcslen(RecycleBinDirectory) + 1; + m_Folder = VolumePath; + m_Folder += RecycleBinDirectory; if (StringSid) - DirectoryLength += wcslen(StringSid) + 1; - DirectoryLength += 1 + wcslen(RECYCLE_BIN_FILE_NAME); - DirectoryLength += wcslen(VolumePath) + 1; - Needed = (DirectoryLength + 1) * sizeof(WCHAR); - - s = CoTaskMemAlloc(sizeof(struct RecycleBin5) + Needed); - if (!s) { - hr = E_OUTOFMEMORY; - goto cleanup; + m_Folder += L'\\'; + m_Folder += StringSid; } - ZeroMemory(s, sizeof(struct RecycleBin5)); - s->recycleBinImpl.lpVtbl = &RecycleBin5Vtbl; - s->ref = 1; - if (StringSid) - len = swprintf(s->Folder, L"%s%s\\%s", VolumePath, RecycleBinDirectory, StringSid); - else - len = swprintf(s->Folder, L"%s%s", VolumePath, RecycleBinDirectory); - p = &s->Folder[len]; - wcscpy(p, L"\\" RECYCLE_BIN_FILE_NAME); - s->hInfo = CreateFileW(s->Folder, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); - if (s->hInfo == INVALID_HANDLE_VALUE && (GetLastError() == ERROR_PATH_NOT_FOUND || GetLastError() == ERROR_FILE_NOT_FOUND)) - { - *p = UNICODE_NULL; - hr = RecycleBin5_Create(s->Folder, TokenUserInfo ? TokenUserInfo->User.Sid : NULL); - *p = L'\\'; + len = m_Folder.GetLength(); + m_Folder += L"\\" RECYCLE_BIN_FILE_NAME; + + m_hInfo = CreateFileW(m_Folder, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); + if (m_hInfo == INVALID_HANDLE_VALUE && + (GetLastError() == ERROR_PATH_NOT_FOUND || GetLastError() == ERROR_FILE_NOT_FOUND)) + { + m_Folder = m_Folder.Left(len); + hr = RecycleBin5_Create(m_Folder, TokenUserInfo ? TokenUserInfo->User.Sid : NULL); + m_Folder += L"\\" RECYCLE_BIN_FILE_NAME; if (!SUCCEEDED(hr)) goto cleanup; - s->hInfo = CreateFileW(s->Folder, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); + m_hInfo = CreateFileW(m_Folder, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); } - if (s->hInfo == INVALID_HANDLE_VALUE) + + if (m_hInfo == INVALID_HANDLE_VALUE) { hr = HRESULT_FROM_WIN32(GetLastError()); goto cleanup; } - s->hInfoMapped = CreateFileMappingW(s->hInfo, NULL, PAGE_READWRITE | SEC_COMMIT, 0, 0, NULL); - if (!s->hInfoMapped) + + m_hInfoMapped = CreateFileMappingW(m_hInfo, NULL, PAGE_READWRITE | SEC_COMMIT, 0, 0, NULL); + if (!m_hInfoMapped) { hr = HRESULT_FROM_WIN32(GetLastError()); goto cleanup; } - *p = UNICODE_NULL; - s->VolumePath = p + 1; - wcscpy(s->VolumePath, VolumePath); - - *ppUnknown = (IUnknown *)&s->recycleBinImpl; + m_Folder = m_Folder.Left(len); hr = S_OK; cleanup: @@ -798,10 +761,28 @@ cleanup: HeapFree(GetProcessHeap(), 0, TokenUserInfo); if (StringSid) LocalFree(StringSid); - if (!SUCCEEDED(hr)) + return hr; +} + +EXTERN_C +HRESULT RecycleBin5_Constructor(_In_ LPCWSTR VolumePath, _Out_ IUnknown **ppUnknown) +{ + if (!ppUnknown) + return E_POINTER; + + *ppUnknown = NULL; + + RecycleBin5 *pThis = new RecycleBin5(); + if (!pThis) + return E_OUTOFMEMORY; + + HRESULT hr = pThis->Init(VolumePath); + if (FAILED(hr)) { - if (s) - RecycleBin5_Destructor(s); + delete pThis; + return hr; } - return hr; + + *ppUnknown = static_cast<IRecycleBin5 *>(pThis); + return S_OK; }

4 months, 4 weeks

[reactos] 01/01: [SHELL32] RecycleBin5Enum: Make it C++ (#7173)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=22b913928f4a1d13120b0… commit 22b913928f4a1d13120b0ec7a1c6889d37ec0e3a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jul 29 08:14:02 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jul 29 08:14:02 2024 +0900 [SHELL32] RecycleBin5Enum: Make it C++ (#7173) Modernize code. JIRA issue: CORE-19595 Rewrite RecycleBin5Enum in C++. --- dll/win32/shell32/shellrecyclebin/CMakeLists.txt | 3 +- dll/win32/shell32/shellrecyclebin/recyclebin_v5.h | 11 +- .../shellrecyclebin/recyclebin_v5_enumerator.c | 534 --------------------- .../shellrecyclebin/recyclebin_v5_enumerator.cpp | 492 +++++++++++++++++++ 4 files changed, 500 insertions(+), 540 deletions(-) diff --git a/dll/win32/shell32/shellrecyclebin/CMakeLists.txt b/dll/win32/shell32/shellrecyclebin/CMakeLists.txt index 5ff948c8a95..ef5bf3da1c8 100644 --- a/dll/win32/shell32/shellrecyclebin/CMakeLists.txt +++ b/dll/win32/shell32/shellrecyclebin/CMakeLists.txt @@ -9,9 +9,10 @@ list(APPEND SOURCE recyclebin_generic.cpp recyclebin_generic_enumerator.cpp recyclebin_v5.c - recyclebin_v5_enumerator.c + recyclebin_v5_enumerator.cpp recyclebin_private.h) add_library(recyclebin ${SOURCE} guid.c) add_pch(recyclebin recyclebin_private.h SOURCE) add_dependencies(recyclebin psdk) +target_link_libraries(recyclebin PRIVATE atl_classes) diff --git a/dll/win32/shell32/shellrecyclebin/recyclebin_v5.h b/dll/win32/shell32/shellrecyclebin/recyclebin_v5.h index 52681b584f9..f33b3adbe54 100644 --- a/dll/win32/shell32/shellrecyclebin/recyclebin_v5.h +++ b/dll/win32/shell32/shellrecyclebin/recyclebin_v5.h @@ -80,13 +80,14 @@ DECLARE_INTERFACE_(IRecycleBin5, IUnknown) (This)->lpVtbl->OnClosing(This, prb5el) #endif +EXTERN_C HRESULT RecycleBin5Enum_Constructor( - IN IRecycleBin5 *prb, - IN HANDLE hInfo, - IN HANDLE hInfoMapped, - IN LPCWSTR szPrefix, - OUT IUnknown **ppUnknown); + _In_ IRecycleBin5 *prb, + _In_ HANDLE hInfo, + _In_ HANDLE hInfoMapped, + _In_ LPCWSTR szPrefix, + _Out_ IUnknown **ppUnknown); #ifdef __cplusplus } diff --git a/dll/win32/shell32/shellrecyclebin/recyclebin_v5_enumerator.c b/dll/win32/shell32/shellrecyclebin/recyclebin_v5_enumerator.c deleted file mode 100644 index 411c623b3a2..00000000000 --- a/dll/win32/shell32/shellrecyclebin/recyclebin_v5_enumerator.c +++ /dev/null @@ -1,534 +0,0 @@ -/* - * PROJECT: Recycle bin management - * LICENSE: GPL v2 - See COPYING in the top level directory - * FILE: lib/recyclebin/recyclebin_v5_enumerator.c - * PURPOSE: Enumerates contents of a MS Windows 2000/XP/2003 recyclebin - * PROGRAMMERS: Copyright 2006-2007 Hervé Poussineau (hpoussin(a)reactos.org) - */ - -#include "recyclebin_private.h" - -struct RecycleBin5File -{ - ULONG ref; - IRecycleBin5 *recycleBin; - DELETED_FILE_RECORD deletedFile; - IRecycleBinFile recycleBinFileImpl; - WCHAR FullName[ANY_SIZE]; -}; - -static HRESULT STDMETHODCALLTYPE -RecycleBin5File_RecycleBinFile_GetAttributes( - IN IRecycleBinFile *This, - OUT DWORD *pAttributes); - -static HRESULT STDMETHODCALLTYPE -RecycleBin5File_RecycleBinFile_QueryInterface( - IN IRecycleBinFile *This, - IN REFIID riid, - OUT void **ppvObject) -{ - struct RecycleBin5File *s = CONTAINING_RECORD(This, struct RecycleBin5File, recycleBinFileImpl); - - TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppvObject); - - if (!ppvObject) - return E_POINTER; - - if (IsEqualIID(riid, &IID_IUnknown)) - *ppvObject = &s->recycleBinFileImpl; - else if (IsEqualIID(riid, &IID_IRecycleBinFile)) - *ppvObject = &s->recycleBinFileImpl; - else if (IsEqualIID(riid, &IID_IExtractIconA) || IsEqualIID(riid, &IID_IExtractIconW)) - { - DWORD dwAttributes; - if (RecycleBin5File_RecycleBinFile_GetAttributes(This, &dwAttributes) == S_OK) - return SHCreateFileExtractIconW(s->FullName, dwAttributes, riid, ppvObject); - else - return S_FALSE; - } - else - { - *ppvObject = NULL; - return E_NOINTERFACE; - } - - IUnknown_AddRef(This); - return S_OK; -} - -static ULONG STDMETHODCALLTYPE -RecycleBin5File_RecycleBinFile_AddRef( - IN IRecycleBinFile *This) -{ - struct RecycleBin5File *s = CONTAINING_RECORD(This, struct RecycleBin5File, recycleBinFileImpl); - ULONG refCount = InterlockedIncrement((PLONG)&s->ref); - TRACE("(%p)\n", This); - return refCount; -} - -static VOID -RecycleBin5File_Destructor( - struct RecycleBin5File *s) -{ - TRACE("(%p)\n", s); - - IRecycleBin5_Release(s->recycleBin); - CoTaskMemFree(s); -} - -static ULONG STDMETHODCALLTYPE -RecycleBin5File_RecycleBinFile_Release( - IN IRecycleBinFile *This) -{ - struct RecycleBin5File *s = CONTAINING_RECORD(This, struct RecycleBin5File, recycleBinFileImpl); - ULONG refCount; - - TRACE("(%p)\n", This); - - refCount = InterlockedDecrement((PLONG)&s->ref); - - if (refCount == 0) - RecycleBin5File_Destructor(s); - - return refCount; -} - -static HRESULT STDMETHODCALLTYPE -RecycleBin5File_RecycleBinFile_GetLastModificationTime( - IN IRecycleBinFile *This, - OUT FILETIME *pLastModificationTime) -{ - struct RecycleBin5File *s = CONTAINING_RECORD(This, struct RecycleBin5File, recycleBinFileImpl); - HRESULT hr; - DWORD dwAttributes; - HANDLE hFile; - - TRACE("(%p, %p)\n", This, pLastModificationTime); - - dwAttributes = GetFileAttributesW(s->FullName); - if (dwAttributes == INVALID_FILE_ATTRIBUTES) - return HRESULT_FROM_WIN32(GetLastError()); - if (dwAttributes & FILE_ATTRIBUTE_DIRECTORY) - hFile = CreateFileW(s->FullName, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL); - else - hFile = CreateFileW(s->FullName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); - if (hFile == INVALID_HANDLE_VALUE) - return HRESULT_FROM_WIN32(GetLastError()); - - if (GetFileTime(hFile, NULL, NULL, pLastModificationTime)) - hr = S_OK; - else - hr = HRESULT_FROM_WIN32(GetLastError()); - CloseHandle(hFile); - return hr; -} - -static HRESULT STDMETHODCALLTYPE -RecycleBin5File_RecycleBinFile_GetDeletionTime( - IN IRecycleBinFile *This, - OUT FILETIME *pDeletionTime) -{ - struct RecycleBin5File *s = CONTAINING_RECORD(This, struct RecycleBin5File, recycleBinFileImpl); - TRACE("(%p, %p)\n", This, pDeletionTime); - *pDeletionTime = s->deletedFile.DeletionTime; - return S_OK; -} - -static HRESULT STDMETHODCALLTYPE -RecycleBin5File_RecycleBinFile_GetFileSize( - IN IRecycleBinFile *This, - OUT ULARGE_INTEGER *pFileSize) -{ - struct RecycleBin5File *s = CONTAINING_RECORD(This, struct RecycleBin5File, recycleBinFileImpl); - HRESULT hr; - DWORD dwAttributes; - HANDLE hFile; - - TRACE("(%p, %p)\n", This, pFileSize); - - dwAttributes = GetFileAttributesW(s->FullName); - if (dwAttributes == INVALID_FILE_ATTRIBUTES) - return HRESULT_FROM_WIN32(GetLastError()); - if (dwAttributes & FILE_ATTRIBUTE_DIRECTORY) - { - pFileSize->QuadPart = 0; - return S_OK; - } - - hFile = CreateFileW(s->FullName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); - if (hFile == INVALID_HANDLE_VALUE) - return HRESULT_FROM_WIN32(GetLastError()); - pFileSize->u.LowPart = GetFileSize(hFile, &pFileSize->u.HighPart); - if (pFileSize->u.LowPart != INVALID_FILE_SIZE) - hr = S_OK; - else - hr = HRESULT_FROM_WIN32(GetLastError()); - CloseHandle(hFile); - return hr; -} - -static HRESULT STDMETHODCALLTYPE -RecycleBin5File_RecycleBinFile_GetPhysicalFileSize( - IN IRecycleBinFile *This, - OUT ULARGE_INTEGER *pPhysicalFileSize) -{ - struct RecycleBin5File *s = CONTAINING_RECORD(This, struct RecycleBin5File, recycleBinFileImpl); - TRACE("(%p, %p)\n", This, pPhysicalFileSize); - pPhysicalFileSize->u.HighPart = 0; - pPhysicalFileSize->u.LowPart = s->deletedFile.dwPhysicalFileSize; - return S_OK; -} - -static HRESULT STDMETHODCALLTYPE -RecycleBin5File_RecycleBinFile_GetAttributes( - IN IRecycleBinFile *This, - OUT DWORD *pAttributes) -{ - struct RecycleBin5File *s = CONTAINING_RECORD(This, struct RecycleBin5File, recycleBinFileImpl); - DWORD dwAttributes; - - TRACE("(%p, %p)\n", This, pAttributes); - - dwAttributes = GetFileAttributesW(s->FullName); - if (dwAttributes == INVALID_FILE_ATTRIBUTES) - return HRESULT_FROM_WIN32(GetLastError()); - - *pAttributes = dwAttributes; - return S_OK; -} - -static HRESULT STDMETHODCALLTYPE -RecycleBin5File_RecycleBinFile_GetFileName( - IN IRecycleBinFile *This, - IN SIZE_T BufferSize, - IN OUT LPWSTR Buffer, - OUT SIZE_T *RequiredSize) -{ - struct RecycleBin5File *s = CONTAINING_RECORD(This, struct RecycleBin5File, recycleBinFileImpl); - DWORD dwRequired; - - TRACE("(%p, %u, %p, %p)\n", This, BufferSize, Buffer, RequiredSize); - - dwRequired = (DWORD)(wcslen(s->deletedFile.FileNameW) + 1) * sizeof(WCHAR); - if (RequiredSize) - *RequiredSize = dwRequired; - - if (BufferSize == 0 && !Buffer) - return S_OK; - - if (BufferSize < dwRequired) - return E_OUTOFMEMORY; - CopyMemory(Buffer, s->deletedFile.FileNameW, dwRequired); - return S_OK; -} - -static HRESULT STDMETHODCALLTYPE -RecycleBin5File_RecycleBinFile_GetTypeName( - IN IRecycleBinFile *This, - IN SIZE_T BufferSize, - IN OUT LPWSTR Buffer, - OUT SIZE_T *RequiredSize) -{ - HRESULT hr; - - struct RecycleBin5File *s = CONTAINING_RECORD(This, struct RecycleBin5File, recycleBinFileImpl); - DWORD dwRequired; - DWORD dwAttributes; - SHFILEINFOW shFileInfo; - - TRACE("(%p, %u, %p, %p)\n", This, BufferSize, Buffer, RequiredSize); - - hr = RecycleBin5File_RecycleBinFile_GetAttributes(This, &dwAttributes); - if (!SUCCEEDED(hr)) - return hr; - - hr = SHGetFileInfoW(s->FullName, dwAttributes, &shFileInfo, sizeof(shFileInfo), SHGFI_TYPENAME | SHGFI_USEFILEATTRIBUTES); - if (!SUCCEEDED(hr)) - return hr; - - dwRequired = (DWORD)(wcslen(shFileInfo.szTypeName) + 1) * sizeof(WCHAR); - if (RequiredSize) - *RequiredSize = dwRequired; - - if (BufferSize == 0 && !Buffer) - return S_OK; - - if (BufferSize < dwRequired) - return E_OUTOFMEMORY; - CopyMemory(Buffer, shFileInfo.szTypeName, dwRequired); - return S_OK; -} - -static HRESULT STDMETHODCALLTYPE -RecycleBin5File_RecycleBinFile_Delete( - IN IRecycleBinFile *This) -{ - struct RecycleBin5File *s = CONTAINING_RECORD(This, struct RecycleBin5File, recycleBinFileImpl); - TRACE("(%p)\n", This); - return IRecycleBin5_Delete(s->recycleBin, s->FullName, &s->deletedFile); -} - -static HRESULT STDMETHODCALLTYPE -RecycleBin5File_RecycleBinFile_Restore( - IN IRecycleBinFile *This) -{ - struct RecycleBin5File *s = CONTAINING_RECORD(This, struct RecycleBin5File, recycleBinFileImpl); - TRACE("(%p)\n", This); - return IRecycleBin5_Restore(s->recycleBin, s->FullName, &s->deletedFile); -} - -CONST_VTBL struct IRecycleBinFileVtbl RecycleBin5FileVtbl = -{ - RecycleBin5File_RecycleBinFile_QueryInterface, - RecycleBin5File_RecycleBinFile_AddRef, - RecycleBin5File_RecycleBinFile_Release, - RecycleBin5File_RecycleBinFile_GetLastModificationTime, - RecycleBin5File_RecycleBinFile_GetDeletionTime, - RecycleBin5File_RecycleBinFile_GetFileSize, - RecycleBin5File_RecycleBinFile_GetPhysicalFileSize, - RecycleBin5File_RecycleBinFile_GetAttributes, - RecycleBin5File_RecycleBinFile_GetFileName, - RecycleBin5File_RecycleBinFile_GetTypeName, - RecycleBin5File_RecycleBinFile_Delete, - RecycleBin5File_RecycleBinFile_Restore, -}; - -static HRESULT -RecycleBin5File_Constructor( - IN IRecycleBin5 *prb, - IN LPCWSTR Folder, - IN PDELETED_FILE_RECORD pDeletedFile, - OUT IRecycleBinFile **ppFile) -{ - struct RecycleBin5File *s = NULL; - LPCWSTR Extension; - SIZE_T Needed; - - if (!ppFile) - return E_POINTER; - - Extension = wcsrchr(pDeletedFile->FileNameW, '.'); - if (Extension < wcsrchr(pDeletedFile->FileNameW, '\\')) - Extension = NULL; - Needed = wcslen(Folder) + 13; - if (Extension) - Needed += wcslen(Extension); - Needed *= sizeof(WCHAR); - - s = CoTaskMemAlloc(sizeof(struct RecycleBin5File) + Needed); - if (!s) - return E_OUTOFMEMORY; - ZeroMemory(s, sizeof(struct RecycleBin5File) + Needed); - s->recycleBinFileImpl.lpVtbl = &RecycleBin5FileVtbl; - s->ref = 1; - s->deletedFile = *pDeletedFile; - s->recycleBin = prb; - IRecycleBin5_AddRef(s->recycleBin); - *ppFile = &s->recycleBinFileImpl; - wsprintfW(s->FullName, L"%s\\D%c%lu%s", Folder, pDeletedFile->dwDriveNumber + 'a', pDeletedFile->dwRecordUniqueId, Extension); - if (GetFileAttributesW(s->FullName) == INVALID_FILE_ATTRIBUTES) - { - RecycleBin5File_Destructor(s); - return E_FAIL; - } - - return S_OK; -} - -struct RecycleBin5Enum -{ - ULONG ref; - IRecycleBin5 *recycleBin; - HANDLE hInfo; - INFO2_HEADER *pInfo; - DWORD dwCurrent; - IRecycleBinEnumList recycleBinEnumImpl; - WCHAR szPrefix[ANY_SIZE]; -}; - -static HRESULT STDMETHODCALLTYPE -RecycleBin5Enum_RecycleBinEnumList_QueryInterface( - IN IRecycleBinEnumList *This, - IN REFIID riid, - OUT void **ppvObject) -{ - struct RecycleBin5Enum *s = CONTAINING_RECORD(This, struct RecycleBin5Enum, recycleBinEnumImpl); - - TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppvObject); - - if (!ppvObject) - return E_POINTER; - - if (IsEqualIID(riid, &IID_IUnknown)) - *ppvObject = &s->recycleBinEnumImpl; - else if (IsEqualIID(riid, &IID_IRecycleBinEnumList)) - *ppvObject = &s->recycleBinEnumImpl; - else - { - *ppvObject = NULL; - return E_NOINTERFACE; - } - - IUnknown_AddRef(This); - return S_OK; -} - -static ULONG STDMETHODCALLTYPE -RecycleBin5Enum_RecycleBinEnumList_AddRef( - IN IRecycleBinEnumList *This) -{ - struct RecycleBin5Enum *s = CONTAINING_RECORD(This, struct RecycleBin5Enum, recycleBinEnumImpl); - ULONG refCount = InterlockedIncrement((PLONG)&s->ref); - TRACE("(%p)\n", This); - return refCount; -} - -static VOID -RecycleBin5Enum_Destructor( - struct RecycleBin5Enum *s) -{ - TRACE("(%p)\n", s); - - IRecycleBin5_OnClosing(s->recycleBin, &s->recycleBinEnumImpl); - UnmapViewOfFile(s->pInfo); - IRecycleBin5_Release(s->recycleBin); - CoTaskMemFree(s); -} - -static ULONG STDMETHODCALLTYPE -RecycleBin5Enum_RecycleBinEnumList_Release( - IN IRecycleBinEnumList *This) -{ - struct RecycleBin5Enum *s = CONTAINING_RECORD(This, struct RecycleBin5Enum, recycleBinEnumImpl); - ULONG refCount; - - TRACE("(%p)\n", This); - - refCount = InterlockedDecrement((PLONG)&s->ref); - - if (refCount == 0) - RecycleBin5Enum_Destructor(s); - - return refCount; -} - -static HRESULT STDMETHODCALLTYPE -RecycleBin5Enum_RecycleBinEnumList_Next( - IRecycleBinEnumList *This, - IN DWORD celt, - IN OUT IRecycleBinFile **rgelt, - OUT DWORD *pceltFetched) -{ - struct RecycleBin5Enum *s = CONTAINING_RECORD(This, struct RecycleBin5Enum, recycleBinEnumImpl); - ULARGE_INTEGER FileSize; - INFO2_HEADER *pHeader = s->pInfo; - DELETED_FILE_RECORD *pDeletedFile; - DWORD fetched = 0, i; - DWORD dwEntries; - HRESULT hr; - - TRACE("(%p, %u, %p, %p)\n", This, celt, rgelt, pceltFetched); - - if (!rgelt) - return E_POINTER; - if (!pceltFetched && celt > 1) - return E_INVALIDARG; - - FileSize.u.LowPart = GetFileSize(s->hInfo, &FileSize.u.HighPart); - if (FileSize.u.LowPart == 0) - return HRESULT_FROM_WIN32(GetLastError()); - dwEntries = (DWORD)((FileSize.QuadPart - sizeof(INFO2_HEADER)) / sizeof(DELETED_FILE_RECORD)); - - i = s->dwCurrent; - pDeletedFile = (DELETED_FILE_RECORD *)(pHeader + 1) + i; - for (; i < dwEntries && fetched < celt; i++) - { - hr = RecycleBin5File_Constructor(s->recycleBin, s->szPrefix, pDeletedFile, &rgelt[fetched]); - if (SUCCEEDED(hr)) - fetched++; - pDeletedFile++; - } - - s->dwCurrent = i; - if (pceltFetched) - *pceltFetched = fetched; - if (fetched == celt) - return S_OK; - else - return S_FALSE; -} - -static HRESULT STDMETHODCALLTYPE -RecycleBin5Enum_RecycleBinEnumList_Skip( - IN IRecycleBinEnumList *This, - IN DWORD celt) -{ - struct RecycleBin5Enum *s = CONTAINING_RECORD(This, struct RecycleBin5Enum, recycleBinEnumImpl); - TRACE("(%p, %u)\n", This, celt); - s->dwCurrent += celt; - return S_OK; -} - -static HRESULT STDMETHODCALLTYPE -RecycleBin5Enum_RecycleBinEnumList_Reset( - IN IRecycleBinEnumList *This) -{ - struct RecycleBin5Enum *s = CONTAINING_RECORD(This, struct RecycleBin5Enum, recycleBinEnumImpl); - TRACE("(%p)\n", This); - s->dwCurrent = 0; - return S_OK; -} - -CONST_VTBL struct IRecycleBinEnumListVtbl RecycleBin5EnumVtbl = -{ - RecycleBin5Enum_RecycleBinEnumList_QueryInterface, - RecycleBin5Enum_RecycleBinEnumList_AddRef, - RecycleBin5Enum_RecycleBinEnumList_Release, - RecycleBin5Enum_RecycleBinEnumList_Next, - RecycleBin5Enum_RecycleBinEnumList_Skip, - RecycleBin5Enum_RecycleBinEnumList_Reset, -}; - -HRESULT -RecycleBin5Enum_Constructor( - IN IRecycleBin5 *prb, - IN HANDLE hInfo, - IN HANDLE hInfoMapped, - IN LPCWSTR szPrefix, - OUT IUnknown **ppUnknown) -{ - struct RecycleBin5Enum *s = NULL; - SIZE_T Needed; - - if (!ppUnknown) - return E_POINTER; - - Needed = (wcslen(szPrefix) + 1) * sizeof(WCHAR); - - s = CoTaskMemAlloc(sizeof(struct RecycleBin5Enum) + Needed); - if (!s) - return E_OUTOFMEMORY; - ZeroMemory(s, sizeof(struct RecycleBin5Enum) + Needed); - s->recycleBinEnumImpl.lpVtbl = &RecycleBin5EnumVtbl; - s->ref = 1; - s->recycleBin = prb; - wcscpy(s->szPrefix, szPrefix); - s->hInfo = hInfo; - s->pInfo = MapViewOfFile(hInfoMapped, FILE_MAP_READ, 0, 0, 0); - if (!s->pInfo) - { - CoTaskMemFree(s); - return HRESULT_FROM_WIN32(GetLastError()); - } - if (s->pInfo->dwVersion != 5 || s->pInfo->dwRecordSize != sizeof(DELETED_FILE_RECORD)) - { - UnmapViewOfFile(s->pInfo); - CoTaskMemFree(s); - return E_FAIL; - } - IRecycleBin5_AddRef(s->recycleBin); - *ppUnknown = (IUnknown *)&s->recycleBinEnumImpl; - - return S_OK; -} diff --git a/dll/win32/shell32/shellrecyclebin/recyclebin_v5_enumerator.cpp b/dll/win32/shell32/shellrecyclebin/recyclebin_v5_enumerator.cpp new file mode 100644 index 00000000000..1f7855415d8 --- /dev/null +++ b/dll/win32/shell32/shellrecyclebin/recyclebin_v5_enumerator.cpp @@ -0,0 +1,492 @@ +/* + * PROJECT: Recycle bin management + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Enumerates contents of a MS Windows 2000/XP/2003 recyclebin + * COPYRIGHT: Copyright 2006-2007 Hervé Poussineau (hpoussin(a)reactos.org) + * Copyright 2024 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ + +#include "recyclebin_private.h" +#include <atlstr.h> +#include <shlwapi.h> +#include <strsafe.h> + +class RecycleBin5File : public IRecycleBinFile +{ +public: + RecycleBin5File(); + virtual ~RecycleBin5File(); + + HRESULT Init( + _In_ IRecycleBin5 *prb, + _In_ LPCWSTR Folder, + _In_ PDELETED_FILE_RECORD pDeletedFile); + + /* IUnknown methods */ + STDMETHODIMP QueryInterface(REFIID riid, void **ppvObject) override; + STDMETHODIMP_(ULONG) AddRef() override; + STDMETHODIMP_(ULONG) Release() override; + + /* IRecycleBinFile methods */ + STDMETHODIMP GetLastModificationTime(FILETIME *pLastModificationTime) override; + STDMETHODIMP GetDeletionTime(FILETIME *pDeletionTime) override; + STDMETHODIMP GetFileSize(ULARGE_INTEGER *pFileSize) override; + STDMETHODIMP GetPhysicalFileSize(ULARGE_INTEGER *pPhysicalFileSize) override; + STDMETHODIMP GetAttributes(DWORD *pAttributes) override; + STDMETHODIMP GetFileName(SIZE_T BufferSize, LPWSTR Buffer, SIZE_T *RequiredSize) override; + STDMETHODIMP GetTypeName(SIZE_T BufferSize, LPWSTR Buffer, SIZE_T *RequiredSize) override; + STDMETHODIMP Delete() override; + STDMETHODIMP Restore() override; + +protected: + LONG m_ref; + IRecycleBin5 *m_recycleBin; + DELETED_FILE_RECORD m_deletedFile; + LPWSTR m_FullName; +}; + +STDMETHODIMP RecycleBin5File::QueryInterface(REFIID riid, void **ppvObject) +{ + TRACE("(%p, %s, %p)\n", this, debugstr_guid(&riid), ppvObject); + + if (!ppvObject) + return E_POINTER; + + if (IsEqualIID(riid, IID_IUnknown) || IsEqualIID(riid, IID_IRecycleBinFile)) + *ppvObject = static_cast<IRecycleBinFile *>(this); + else if (IsEqualIID(riid, IID_IExtractIconA) || IsEqualIID(riid, IID_IExtractIconW)) + { + DWORD dwAttributes; + if (GetAttributes(&dwAttributes) == S_OK) + return SHCreateFileExtractIconW(m_FullName, dwAttributes, riid, ppvObject); + else + return S_FALSE; + } + else + { + *ppvObject = NULL; + return E_NOINTERFACE; + } + + AddRef(); + return S_OK; +} + +STDMETHODIMP_(ULONG) RecycleBin5File::AddRef() +{ + TRACE("(%p)\n", this); + return InterlockedIncrement(&m_ref); +} + +RecycleBin5File::~RecycleBin5File() +{ + TRACE("(%p)\n", this); + m_recycleBin->Release(); + SHFree(m_FullName); +} + +STDMETHODIMP_(ULONG) RecycleBin5File::Release() +{ + TRACE("(%p)\n", this); + ULONG refCount = InterlockedDecrement(&m_ref); + if (refCount == 0) + delete this; + return refCount; +} + +STDMETHODIMP RecycleBin5File::GetLastModificationTime(FILETIME *pLastModificationTime) +{ + TRACE("(%p, %p)\n", this, pLastModificationTime); + + DWORD dwAttributes = ::GetFileAttributesW(m_FullName); + if (dwAttributes == INVALID_FILE_ATTRIBUTES) + return HRESULT_FROM_WIN32(GetLastError()); + + HANDLE hFile; + hFile = CreateFileW(m_FullName, + GENERIC_READ, + FILE_SHARE_READ | + ((dwAttributes & FILE_ATTRIBUTE_DIRECTORY) ? (FILE_SHARE_WRITE | FILE_SHARE_DELETE) : 0), + NULL, + OPEN_EXISTING, + (dwAttributes & FILE_ATTRIBUTE_DIRECTORY) ? FILE_FLAG_BACKUP_SEMANTICS : 0, + NULL); + if (hFile == INVALID_HANDLE_VALUE) + return HRESULT_FROM_WIN32(GetLastError()); + + HRESULT hr; + if (GetFileTime(hFile, NULL, NULL, pLastModificationTime)) + hr = S_OK; + else + hr = HRESULT_FROM_WIN32(GetLastError()); + CloseHandle(hFile); + return hr; +} + +STDMETHODIMP RecycleBin5File::GetDeletionTime(FILETIME *pDeletionTime) +{ + TRACE("(%p, %p)\n", this, pDeletionTime); + *pDeletionTime = m_deletedFile.DeletionTime; + return S_OK; +} + +STDMETHODIMP RecycleBin5File::GetFileSize(ULARGE_INTEGER *pFileSize) +{ + TRACE("(%p, %p)\n", this, pFileSize); + + DWORD dwAttributes = GetFileAttributesW(m_FullName); + if (dwAttributes == INVALID_FILE_ATTRIBUTES) + return HRESULT_FROM_WIN32(GetLastError()); + if (dwAttributes & FILE_ATTRIBUTE_DIRECTORY) + { + pFileSize->QuadPart = 0; + return S_OK; + } + + HANDLE hFile = CreateFileW(m_FullName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); + if (hFile == INVALID_HANDLE_VALUE) + return HRESULT_FROM_WIN32(GetLastError()); + pFileSize->u.LowPart = ::GetFileSize(hFile, &pFileSize->u.HighPart); + + HRESULT hr; + if (pFileSize->u.LowPart != INVALID_FILE_SIZE) + hr = S_OK; + else + hr = HRESULT_FROM_WIN32(GetLastError()); + + CloseHandle(hFile); + return hr; +} + +STDMETHODIMP RecycleBin5File::GetPhysicalFileSize(ULARGE_INTEGER *pPhysicalFileSize) +{ + TRACE("(%p, %p)\n", this, pPhysicalFileSize); + pPhysicalFileSize->u.HighPart = 0; + pPhysicalFileSize->u.LowPart = m_deletedFile.dwPhysicalFileSize; + return S_OK; +} + +STDMETHODIMP RecycleBin5File::GetAttributes(DWORD *pAttributes) +{ + DWORD dwAttributes; + + TRACE("(%p, %p)\n", this, pAttributes); + + dwAttributes = GetFileAttributesW(m_FullName); + if (dwAttributes == INVALID_FILE_ATTRIBUTES) + return HRESULT_FROM_WIN32(GetLastError()); + + *pAttributes = dwAttributes; + return S_OK; +} + +STDMETHODIMP RecycleBin5File::GetFileName(SIZE_T BufferSize, LPWSTR Buffer, SIZE_T *RequiredSize) +{ + DWORD dwRequired; + + TRACE("(%p, %u, %p, %p)\n", this, BufferSize, Buffer, RequiredSize); + + dwRequired = (DWORD)(wcslen(m_deletedFile.FileNameW) + 1) * sizeof(WCHAR); + if (RequiredSize) + *RequiredSize = dwRequired; + + if (BufferSize == 0 && !Buffer) + return S_OK; + + if (BufferSize < dwRequired) + return E_OUTOFMEMORY; + CopyMemory(Buffer, m_deletedFile.FileNameW, dwRequired); + return S_OK; +} + +STDMETHODIMP RecycleBin5File::GetTypeName(SIZE_T BufferSize, LPWSTR Buffer, SIZE_T *RequiredSize) +{ + HRESULT hr; + DWORD dwRequired; + DWORD dwAttributes; + SHFILEINFOW shFileInfo; + + TRACE("(%p, %u, %p, %p)\n", this, BufferSize, Buffer, RequiredSize); + + hr = GetAttributes(&dwAttributes); + if (!SUCCEEDED(hr)) + return hr; + + hr = SHGetFileInfoW(m_FullName, dwAttributes, &shFileInfo, sizeof(shFileInfo), SHGFI_TYPENAME | SHGFI_USEFILEATTRIBUTES); + if (!SUCCEEDED(hr)) + return hr; + + dwRequired = (DWORD)(wcslen(shFileInfo.szTypeName) + 1) * sizeof(WCHAR); + if (RequiredSize) + *RequiredSize = dwRequired; + + if (BufferSize == 0 && !Buffer) + return S_OK; + + if (BufferSize < dwRequired) + return E_OUTOFMEMORY; + CopyMemory(Buffer, shFileInfo.szTypeName, dwRequired); + return S_OK; +} + +STDMETHODIMP RecycleBin5File::Delete() +{ + TRACE("(%p)\n", this); + return m_recycleBin->Delete(m_FullName, &m_deletedFile); +} + +STDMETHODIMP RecycleBin5File::Restore() +{ + TRACE("(%p)\n", this); + return m_recycleBin->Restore(m_FullName, &m_deletedFile); +} + +RecycleBin5File::RecycleBin5File() + : m_ref(1) + , m_recycleBin(NULL) + , m_FullName(NULL) +{ + ZeroMemory(&m_deletedFile, sizeof(m_deletedFile)); +} + +HRESULT +RecycleBin5File::Init( + _In_ IRecycleBin5 *prb, + _In_ LPCWSTR Folder, + _In_ PDELETED_FILE_RECORD pDeletedFile) +{ + m_recycleBin = prb; + m_recycleBin->AddRef(); + + WCHAR szUniqueId[32]; + StringCchPrintfW(szUniqueId, _countof(szUniqueId), L"%lu", pDeletedFile->dwRecordUniqueId); + + CStringW strFullName(Folder); + strFullName += L"\\D"; + strFullName += (WCHAR)(L'a' + pDeletedFile->dwDriveNumber); + strFullName += szUniqueId; + strFullName += PathFindExtensionW(pDeletedFile->FileNameW); + if (GetFileAttributesW(strFullName) == INVALID_FILE_ATTRIBUTES) + return E_FAIL; + + return SHStrDup(strFullName, &m_FullName); +} + +static HRESULT +RecycleBin5File_Constructor( + _In_ IRecycleBin5 *prb, + _In_ LPCWSTR Folder, + _In_ PDELETED_FILE_RECORD pDeletedFile, + _Out_ IRecycleBinFile **ppFile) +{ + if (!ppFile) + return E_POINTER; + + *ppFile = NULL; + + RecycleBin5File *pThis = new RecycleBin5File(); + if (!pThis) + return E_OUTOFMEMORY; + + HRESULT hr = pThis->Init(prb, Folder, pDeletedFile); + if (FAILED(hr)) + { + delete pThis; + return hr; + } + + *ppFile = static_cast<IRecycleBinFile *>(pThis); + return S_OK; +} + +class RecycleBin5Enum : public IRecycleBinEnumList +{ +public: + RecycleBin5Enum(); + virtual ~RecycleBin5Enum(); + + HRESULT Init( + _In_ IRecycleBin5 *prb, + _In_ HANDLE hInfo, + _In_ HANDLE hInfoMapped, + _In_ LPCWSTR pszPrefix); + + /* IUnknown methods */ + STDMETHODIMP QueryInterface(REFIID riid, void **ppvObject) override; + STDMETHODIMP_(ULONG) AddRef() override; + STDMETHODIMP_(ULONG) Release() override; + + /* IRecycleBinEnumList methods */ + STDMETHODIMP Next(DWORD celt, IRecycleBinFile **rgelt, DWORD *pceltFetched) override; + STDMETHODIMP Skip(DWORD celt) override; + STDMETHODIMP Reset() override; + +protected: + LONG m_ref; + IRecycleBin5 *m_recycleBin; + HANDLE m_hInfo; + INFO2_HEADER *m_pInfo; + DWORD m_dwCurrent; + LPWSTR m_pszPrefix; +}; + +STDMETHODIMP RecycleBin5Enum::QueryInterface(REFIID riid, void **ppvObject) +{ + TRACE("(%p, %s, %p)\n", this, debugstr_guid(&riid), ppvObject); + + if (!ppvObject) + return E_POINTER; + + if (IsEqualIID(riid, IID_IUnknown) || IsEqualIID(riid, IID_IRecycleBinEnumList)) + *ppvObject = static_cast<IRecycleBinEnumList *>(this); + else + { + *ppvObject = NULL; + return E_NOINTERFACE; + } + + AddRef(); + return S_OK; +} + +STDMETHODIMP_(ULONG) RecycleBin5Enum::AddRef() +{ + TRACE("(%p)\n", this); + return InterlockedIncrement(&m_ref); +} + +RecycleBin5Enum::~RecycleBin5Enum() +{ + TRACE("(%p)\n", this); + + m_recycleBin->OnClosing(this); + UnmapViewOfFile(m_pInfo); + m_recycleBin->Release(); + SHFree(m_pszPrefix); +} + +STDMETHODIMP_(ULONG) RecycleBin5Enum::Release() +{ + TRACE("(%p)\n", this); + + ULONG refCount = InterlockedDecrement(&m_ref); + if (refCount == 0) + delete this; + return refCount; +} + +STDMETHODIMP RecycleBin5Enum::Next(DWORD celt, IRecycleBinFile **rgelt, DWORD *pceltFetched) +{ + HRESULT hr; + + TRACE("(%p, %u, %p, %p)\n", this, celt, rgelt, pceltFetched); + + if (!rgelt) + return E_POINTER; + if (!pceltFetched && celt > 1) + return E_INVALIDARG; + + ULARGE_INTEGER FileSize; + FileSize.u.LowPart = GetFileSize(m_hInfo, &FileSize.u.HighPart); + if (FileSize.u.LowPart == 0) + return HRESULT_FROM_WIN32(GetLastError()); + + DWORD dwEntries = + (DWORD)((FileSize.QuadPart - sizeof(INFO2_HEADER)) / sizeof(DELETED_FILE_RECORD)); + + DWORD iEntry = m_dwCurrent, fetched = 0; + PDELETED_FILE_RECORD pDeletedFile = (PDELETED_FILE_RECORD)(m_pInfo + 1) + iEntry; + for (; iEntry < dwEntries && fetched < celt; ++iEntry) + { + hr = RecycleBin5File_Constructor(m_recycleBin, m_pszPrefix, pDeletedFile, &rgelt[fetched]); + if (SUCCEEDED(hr)) + fetched++; + pDeletedFile++; + } + + m_dwCurrent = iEntry; + if (pceltFetched) + *pceltFetched = fetched; + if (fetched == celt) + return S_OK; + else + return S_FALSE; +} + +STDMETHODIMP RecycleBin5Enum::Skip(DWORD celt) +{ + TRACE("(%p, %u)\n", this, celt); + m_dwCurrent += celt; + return S_OK; +} + +STDMETHODIMP RecycleBin5Enum::Reset() +{ + TRACE("(%p)\n", this); + m_dwCurrent = 0; + return S_OK; +} + +RecycleBin5Enum::RecycleBin5Enum() + : m_ref(1) + , m_recycleBin(NULL) + , m_hInfo(NULL) + , m_pInfo(NULL) + , m_dwCurrent(0) + , m_pszPrefix(NULL) +{ +} + +HRESULT +RecycleBin5Enum::Init( + _In_ IRecycleBin5 *prb, + _In_ HANDLE hInfo, + _In_ HANDLE hInfoMapped, + _In_ LPCWSTR pszPrefix) +{ + m_recycleBin = prb; + m_recycleBin->AddRef(); + + HRESULT hr = SHStrDup(pszPrefix, &m_pszPrefix); + if (FAILED(hr)) + return hr; + + m_hInfo = hInfo; + m_pInfo = (PINFO2_HEADER)MapViewOfFile(hInfoMapped, FILE_MAP_READ, 0, 0, 0); + if (!m_pInfo) + return HRESULT_FROM_WIN32(GetLastError()); + + if (m_pInfo->dwVersion != 5 || m_pInfo->dwRecordSize != sizeof(DELETED_FILE_RECORD)) + return E_FAIL; + + return S_OK; +} + +EXTERN_C +HRESULT +RecycleBin5Enum_Constructor( + _In_ IRecycleBin5 *prb, + _In_ HANDLE hInfo, + _In_ HANDLE hInfoMapped, + _In_ LPCWSTR szPrefix, + _Out_ IUnknown **ppUnknown) +{ + if (!ppUnknown) + return E_POINTER; + + *ppUnknown = NULL; + + RecycleBin5Enum *pThis = new RecycleBin5Enum(); + if (!pThis) + return E_OUTOFMEMORY; + + HRESULT hr = pThis->Init(prb, hInfo, hInfoMapped, szPrefix); + if (FAILED(hr)) + { + delete pThis; + return hr; + } + + *ppUnknown = static_cast<IRecycleBinEnumList *>(pThis); + return S_OK; +}

4 months, 4 weeks

[reactos] 01/01: [IMM32][NTUSER] Use HandleToUlong, UlongToHandle etc. macros (#7180)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ec24b547311110b47d330… commit ec24b547311110b47d33024691ac1eaaeab5b569 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jul 29 07:15:44 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jul 29 07:15:44 2024 +0900 [IMM32][NTUSER] Use HandleToUlong, UlongToHandle etc. macros (#7180) Respect coding standard. JIRA issue: N/A - Use HandleToUlong, UlongToHandle, UlongToPtr etc. macros for type casting. - Remove redundant casts. --- dll/win32/imm32/ctf.c | 4 ++-- dll/win32/imm32/ime.c | 4 ++-- dll/win32/imm32/imm.c | 4 ++-- dll/win32/imm32/utils.c | 8 ++++---- win32ss/user/ntuser/event.c | 2 +- win32ss/user/ntuser/ime.c | 6 +++--- win32ss/user/ntuser/kbdlayout.c | 10 +++++----- win32ss/user/ntuser/misc.c | 2 +- win32ss/user/ntuser/msgqueue.c | 2 +- win32ss/user/ntuser/simplecall.c | 2 +- win32ss/user/ntuser/window.c | 2 +- win32ss/user/ntuser/window.h | 2 +- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dll/win32/imm32/ctf.c b/dll/win32/imm32/ctf.c index 0c69428184d..e3ec6989b7a 100644 --- a/dll/win32/imm32/ctf.c +++ b/dll/win32/imm32/ctf.c @@ -665,7 +665,7 @@ Imm32LoadCtfIme(VOID) * NOTE: (HKL)0x04090409 is English US keyboard (default). * The Cicero keyboard logically uses English US keyboard. */ - if (!ImmLoadLayout((HKL)ULongToHandle(0x04090409), &ImeInfoEx)) + if (!ImmLoadLayout(ULongToHandle(0x04090409), &ImeInfoEx)) break; /* Build a path string in system32. The installed IME file must be in system32. */ @@ -1179,7 +1179,7 @@ CtfImmTIMActivate(_In_ HKL hKL) } if (IS_IME_HKL(hKL)) - hKL = (HKL)UlongToHandle(MAKELONG(LOWORD(hKL), LOWORD(hKL))); + hKL = UlongToHandle(MAKELONG(LOWORD(hKL), LOWORD(hKL))); if (!ImmLoadIME(hKL)) Imm32TF_InvalidAssemblyListCacheIfExist(); diff --git a/dll/win32/imm32/ime.c b/dll/win32/imm32/ime.c index ca61a3cf901..d4b748e5f98 100644 --- a/dll/win32/imm32/ime.c +++ b/dll/win32/imm32/ime.c @@ -297,7 +297,7 @@ PIMEDPI APIENTRY Imm32LoadImeDpi(HKL hKL, BOOL bLock) pImeDpiNew->hKL = hKL; lcid = LOWORD(hKL); - if (TranslateCharsetInfo((LPDWORD)(DWORD_PTR)lcid, &ci, TCI_SRCLOCALE)) + if (TranslateCharsetInfo(UlongToPtr(lcid), &ci, TCI_SRCLOCALE)) uCodePage = ci.ciACP; else uCodePage = CP_ACP; @@ -859,7 +859,7 @@ HKL WINAPI ImmInstallIMEW(LPCWSTR lpszIMEFileName, LPCWSTR lpszLayoutText) if (Imm32WriteImeLayout(hNewKL, pchFilePart, lpszLayoutText)) { /* Load the keyboard layout */ - StringCchPrintfW(szImeKey, _countof(szImeKey), L"%08X", (DWORD)(DWORD_PTR)hNewKL); + StringCchPrintfW(szImeKey, _countof(szImeKey), L"%08X", HandleToUlong(hNewKL)); hNewKL = LoadKeyboardLayoutW(szImeKey, KLF_REPLACELANG); } else diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 175432ca09b..edbc4bcdb4e 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -171,7 +171,7 @@ Retry: } else { - hNewKL = (HKL)(DWORD_PTR)dwUnknown; + hNewKL = UlongToHandle(dwUnknown); if (IS_IME_HKL(hNewKL) && hNewKL != hOldKL) Imm32ReleaseIME(hNewKL); } @@ -865,7 +865,7 @@ LPINPUTCONTEXT APIENTRY Imm32InternalLockIMC(HIMC hIMC, BOOL fSelect) { hOldKL = GetKeyboardLayout(0); LangID = LOWORD(hOldKL); - hNewKL = (HKL)(DWORD_PTR)MAKELONG(LangID, LangID); + hNewKL = UlongToHandle(MAKELONG(LangID, LangID)); pImeDpi = Imm32FindOrLoadImeDpi(hNewKL); if (pImeDpi) diff --git a/dll/win32/imm32/utils.c b/dll/win32/imm32/utils.c index c9c4effe783..9fc0375b64d 100644 --- a/dll/win32/imm32/utils.c +++ b/dll/win32/imm32/utils.c @@ -819,7 +819,7 @@ BOOL APIENTRY Imm32LoadImeLangAndDesc(PIMEINFOEX pInfoEx, LPCVOID pVerInfo) } if (pInfoEx->hkl == NULL) - pInfoEx->hkl = (HKL)(DWORD_PTR)*pw; + pInfoEx->hkl = UlongToHandle(*pw); /* Try the current language and the Unicode codepage (0x04B0) */ LangID = LANGIDFROMLCID(GetThreadLocale()); @@ -941,7 +941,7 @@ HKL APIENTRY Imm32AssignNewLayout(UINT cKLs, const REG_IME *pLayouts, WORD wLang if (!wNextID) return NULL; - return (HKL)(DWORD_PTR)MAKELONG(wLangID, wNextID); + return UlongToHandle(MAKELONG(wLangID, wNextID)); } // Win: GetImeLayout @@ -999,7 +999,7 @@ UINT APIENTRY Imm32GetImeLayout(PREG_IME pLayouts, UINT cLayouts) } Imm32StrToUInt(szImeKey, &Value, 16); - hKL = (HKL)(DWORD_PTR)Value; + hKL = UlongToHandle(Value); if (!IS_IME_HKL(hKL)) /* Not an IME */ { WARN("\n"); @@ -1036,7 +1036,7 @@ BOOL APIENTRY Imm32WriteImeLayout(HKL hKL, LPCWSTR pchFilePart, LPCWSTR pszLayou return FALSE; /* Get the IME key from hKL */ - StringCchPrintf(szImeKey, _countof(szImeKey), L"%08X", (DWORD)(DWORD_PTR)hKL); + StringCchPrintf(szImeKey, _countof(szImeKey), L"%08X", HandleToUlong(hKL)); /* Create a registry IME key */ lError = RegCreateKeyW(hkeyLayouts, szImeKey, &hkeyIME); diff --git a/win32ss/user/ntuser/event.c b/win32ss/user/ntuser/event.c index daf5bef14b3..e7e2c832d48 100644 --- a/win32ss/user/ntuser/event.c +++ b/win32ss/user/ntuser/event.c @@ -351,7 +351,7 @@ NtUserSetWinEventHook( if (idThread) { PETHREAD Thread; - Status = PsLookupThreadByThreadId((HANDLE)(DWORD_PTR)idThread, &Thread); + Status = PsLookupThreadByThreadId(UlongToHandle(idThread), &Thread); if (!NT_SUCCESS(Status)) { EngSetLastError(ERROR_INVALID_THREAD_ID); diff --git a/win32ss/user/ntuser/ime.c b/win32ss/user/ntuser/ime.c index 1548c08ce38..2daa28f3f40 100644 --- a/win32ss/user/ntuser/ime.c +++ b/win32ss/user/ntuser/ime.c @@ -939,7 +939,7 @@ NtUserGetAppImeLevel(HWND hWnd) pti = PsGetCurrentThreadWin32Thread(); if (pWnd->head.pti->ppi == pti->ppi) - ret = (DWORD)(ULONG_PTR)UserGetProp(pWnd, AtomImeLevel, TRUE); + ret = HandleToUlong(UserGetProp(pWnd, AtomImeLevel, TRUE)); Quit: UserLeave(); @@ -1078,7 +1078,7 @@ NtUserSetAppImeLevel(HWND hWnd, DWORD dwLevel) pti = PsGetCurrentThreadWin32Thread(); if (pWnd->head.pti->ppi == pti->ppi) - ret = UserSetProp(pWnd, AtomImeLevel, (HANDLE)(ULONG_PTR)dwLevel, TRUE); + ret = UserSetProp(pWnd, AtomImeLevel, UlongToHandle(dwLevel), TRUE); Quit: UserLeave(); @@ -1976,7 +1976,7 @@ PWND FASTCALL co_IntCreateDefaultImeWindow(PWND pwndTarget, HINSTANCE hInst) RtlInitLargeUnicodeString(&WindowName, L"Default IME", 0); - ClassName.Buffer = (PWCH)(ULONG_PTR)gpsi->atomSysClass[ICLS_IME]; + ClassName.Buffer = UlongToPtr(gpsi->atomSysClass[ICLS_IME]); ClassName.Length = 0; ClassName.MaximumLength = 0; diff --git a/win32ss/user/ntuser/kbdlayout.c b/win32ss/user/ntuser/kbdlayout.c index 08ea9ee531e..31c016d3e97 100644 --- a/win32ss/user/ntuser/kbdlayout.c +++ b/win32ss/user/ntuser/kbdlayout.c @@ -45,7 +45,7 @@ PKL FASTCALL IntHKLtoPKL(_Inout_ PTHREADINFO pti, _In_ HKL hKL) pKL = pFirstKL; /* hKL can have special value HKL_NEXT or HKL_PREV */ - if (hKL == (HKL)(ULONG_PTR)HKL_NEXT) /* Looking forward */ + if (hKL == UlongToHandle(HKL_NEXT)) /* Looking forward */ { do { @@ -54,7 +54,7 @@ PKL FASTCALL IntHKLtoPKL(_Inout_ PTHREADINFO pti, _In_ HKL hKL) return pKL; } while (pKL != pFirstKL); } - else if (hKL == (HKL)(ULONG_PTR)HKL_PREV) /* Looking backward */ + else if (hKL == UlongToHandle(HKL_PREV)) /* Looking backward */ { do { @@ -859,7 +859,7 @@ co_IntUnloadKeyboardLayoutEx( if (!(dwFlags & 0x80000000) && pti->KeyboardLayout == pKL) { - pNextKL = IntHKLtoPKL(pti, (HKL)(ULONG_PTR)HKL_NEXT); + pNextKL = IntHKLtoPKL(pti, UlongToHandle(HKL_NEXT)); if (pNextKL) { UserRefObjectCo(pNextKL, &Ref2); /* Add reference */ @@ -1152,7 +1152,7 @@ NtUserGetKeyboardLayoutName( if (IS_IME_HKL(pKl->hkl)) { - Status = RtlIntegerToUnicodeString((ULONG)(ULONG_PTR)pKl->hkl, 16, &ustrNameSafe); + Status = RtlIntegerToUnicodeString(HandleToUlong(pKl->hkl), 16, &ustrNameSafe); } else { @@ -1244,7 +1244,7 @@ NtUserLoadKeyboardLayoutEx( hSafeFile, hOldKL, &uszSafeKLID, - (HKL)(DWORD_PTR)dwNewKL, + UlongToHandle(dwNewKL), Flags); if (hSafeFile) ZwClose(hSafeFile); diff --git a/win32ss/user/ntuser/misc.c b/win32ss/user/ntuser/misc.c index 2b909893db6..0e2d851af41 100644 --- a/win32ss/user/ntuser/misc.c +++ b/win32ss/user/ntuser/misc.c @@ -435,7 +435,7 @@ NtUserGetGUIThreadInfo( pti = PsGetCurrentThreadWin32Thread(); // Validate Tread ID - W32Thread = IntTID2PTI((HANDLE)(DWORD_PTR)idThread); + W32Thread = IntTID2PTI(UlongToHandle(idThread)); if ( !W32Thread ) { diff --git a/win32ss/user/ntuser/msgqueue.c b/win32ss/user/ntuser/msgqueue.c index e26a3b65952..3a8b60704ff 100644 --- a/win32ss/user/ntuser/msgqueue.c +++ b/win32ss/user/ntuser/msgqueue.c @@ -910,7 +910,7 @@ co_MsqDispatchOneSentMessage( if (Message->HookMessage == MSQ_ISHOOK) { // Direct Hook Call processor Result = co_CallHook( Message->Msg.message, // HookId - (INT)(INT_PTR)Message->Msg.hwnd, // Code + HandleToLong(Message->Msg.hwnd), // Code Message->Msg.wParam, Message->Msg.lParam); } diff --git a/win32ss/user/ntuser/simplecall.c b/win32ss/user/ntuser/simplecall.c index 05ba8d018ec..fa7ee28d857 100644 --- a/win32ss/user/ntuser/simplecall.c +++ b/win32ss/user/ntuser/simplecall.c @@ -727,7 +727,7 @@ NtUserCallHwnd( return 0; } - HelpId = (DWORD)(DWORD_PTR)UserGetProp(Window, gpsi->atomContextHelpIdProp, TRUE); + HelpId = HandleToUlong(UserGetProp(Window, gpsi->atomContextHelpIdProp, TRUE)); UserLeave(); return HelpId; diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index ea67f811073..2d25e99cf67 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -441,7 +441,7 @@ DWORD FASTCALL IntGetWindowContextHelpId( PWND pWnd ) do { - HelpId = (DWORD)(DWORD_PTR)UserGetProp(pWnd, gpsi->atomContextHelpIdProp, TRUE); + HelpId = HandleToUlong(UserGetProp(pWnd, gpsi->atomContextHelpIdProp, TRUE)); if (!HelpId) break; pWnd = IntGetParent(pWnd); } diff --git a/win32ss/user/ntuser/window.h b/win32ss/user/ntuser/window.h index a6c60a6354c..284378604b8 100644 --- a/win32ss/user/ntuser/window.h +++ b/win32ss/user/ntuser/window.h @@ -80,7 +80,7 @@ LONG_PTR FASTCALL co_UserSetWindowLongPtr(HWND, DWORD, LONG_PTR, BOOL); HWND FASTCALL IntGetWindow(HWND,UINT); LRESULT co_UserFreeWindow(PWND,PPROCESSINFO,PTHREADINFO,BOOLEAN); -#define HWND_TERMINATOR ((HWND)(ULONG_PTR)1) +#define HWND_TERMINATOR ((HWND)UlongToHandle(1)) typedef struct tagWINDOWLIST {

4 months, 4 weeks

[reactos] 01/01: [PROGMAN] Tweak AUTORADIOBUTTONS (#7188)

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0cd20b7a1c1e88d344fa0… commit 0cd20b7a1c1e88d344fa0887a809d7b2fbfdd3a3 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Sun Jul 28 22:08:57 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jul 28 22:08:57 2024 +0200 [PROGMAN] Tweak AUTORADIOBUTTONS (#7188) AUTORADIOBUTTON implies BS_AUTORADIOBUTTON. This style is shorter in code, and has the tendency to shrink the binary size also when applied consistently. In case of progman the shrinking is not enough to reach the next lower quantum of binary size though, GCC8.4.0dbg sticks to 192.512 bytes. Because it's simply not enough of those buttons, since we have no localization for that module. No change in behavior in that dlg. --- base/shell/progman/new_resources.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/base/shell/progman/new_resources.rc b/base/shell/progman/new_resources.rc index 333c93cb6fe..28717c413ab 100644 --- a/base/shell/progman/new_resources.rc +++ b/base/shell/progman/new_resources.rc @@ -56,12 +56,12 @@ CAPTION "New Object" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "",IDC_STATIC,5,5,165,44 - CONTROL "Program &Group",PM_NEW_GROUP,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,10,4,66,11 - CONTROL "&Personal",PM_PERSONAL_GROUP,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,20,15,44,14 - CONTROL "&Common",PM_COMMON_GROUP,"Button",BS_AUTORADIOBUTTON,73,15,39,14 + AUTORADIOBUTTON "Program &Group",PM_NEW_GROUP,10,4,66,11,WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&Personal",PM_PERSONAL_GROUP,20,15,44,14,WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&Common",PM_COMMON_GROUP,73,15,39,14 LTEXT "&Format:",PM_FORMAT_TXT,20,33,35,11 COMBOBOX PM_FORMAT,61,31,104,15,CBS_DROPDOWNLIST | WS_TABSTOP - CONTROL "Program &Item",PM_NEW_PROGRAM,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,10,52,59,12 + AUTORADIOBUTTON "Program &Item",PM_NEW_PROGRAM,10,52,59,12,WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK",IDOK,175,5,60,15 PUSHBUTTON "Cancel",IDCANCEL,175,25,60,15 PUSHBUTTON "&Help",IDHELP,175,49,60,15

4 months, 4 weeks

[reactos] 01/01: [CALC] *.rc: AUTORADIOBUTTONS, ja-JP: Add accel &V (#7190)

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3f1c1c05572f28b46a8a1… commit 3f1c1c05572f28b46a8a1c68bbb8534b6592309d Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Sun Jul 28 22:02:54 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jul 28 22:02:54 2024 +0200 [CALC] *.rc: AUTORADIOBUTTONS, ja-JP: Add accel &V (#7190) * [CALC] *.rc: AUTORADIOBUTTONS, ja-JP: Add accel &V - Tweaks AUTORADIOBUTTONS, code shorter, binary smaller calc.exe shrinks for GCC8.4.0dbg cfg: 530.432 -> 527.360 bytes I checked, that there is no change in behavior with those radiobuttons, it is intended (and same on MS Windows Calc that we can not jump from one button to another by arrow-keys here, and also not with tab if any of those radiobuttons has keyboard focus. - ja-JP: Add missing accel &V in main menu - in some headers I worked slightly towards the modern style without going all the way yet. This also fixes the common ukraiaiaiaiaiaiainian typo --- base/applications/calc/lang/bg-BG.rc | 28 ++++++++------------ base/applications/calc/lang/cs-CZ.rc | 31 +++++++++------------- base/applications/calc/lang/de-DE.rc | 26 ++++++++---------- base/applications/calc/lang/el-GR.rc | 26 ++++++++---------- base/applications/calc/lang/en-US.rc | 26 ++++++++---------- base/applications/calc/lang/es-ES.rc | 26 ++++++++---------- base/applications/calc/lang/fr-FR.rc | 26 ++++++++---------- base/applications/calc/lang/he-IL.rc | 28 +++++++++----------- base/applications/calc/lang/hu-HU.rc | 51 ++++++++++++++++-------------------- base/applications/calc/lang/id-ID.rc | 26 ++++++++---------- base/applications/calc/lang/it-IT.rc | 26 ++++++++---------- base/applications/calc/lang/ja-JP.rc | 28 +++++++++----------- base/applications/calc/lang/ko-KR.rc | 26 ++++++++---------- base/applications/calc/lang/nl-NL.rc | 26 ++++++++---------- base/applications/calc/lang/no-NO.rc | 26 ++++++++---------- base/applications/calc/lang/pl-PL.rc | 36 +++++++++++-------------- base/applications/calc/lang/pt-BR.rc | 28 +++++++++----------- base/applications/calc/lang/pt-PT.rc | 28 +++++++++----------- base/applications/calc/lang/ro-RO.rc | 26 ++++++++---------- base/applications/calc/lang/ru-RU.rc | 26 ++++++++---------- base/applications/calc/lang/sk-SK.rc | 31 +++++++++------------- base/applications/calc/lang/sq-AL.rc | 29 +++++++++----------- base/applications/calc/lang/sv-SE.rc | 27 ++++++++----------- base/applications/calc/lang/th-TH.rc | 26 ++++++++---------- base/applications/calc/lang/tr-TR.rc | 30 +++++++++------------ base/applications/calc/lang/uk-UA.rc | 31 +++++++++------------- base/applications/calc/lang/zh-CN.rc | 26 ++++++++---------- base/applications/calc/lang/zh-HK.rc | 26 ++++++++---------- base/applications/calc/lang/zh-TW.rc | 28 +++++++++----------- 29 files changed, 348 insertions(+), 476 deletions(-) diff --git a/base/applications/calc/lang/bg-BG.rc b/base/applications/calc/lang/bg-BG.rc index 2a2b8d497e5..56dc24c61ab 100644 --- a/base/applications/calc/lang/bg-BG.rc +++ b/base/applications/calc/lang/bg-BG.rc @@ -1,7 +1,5 @@ /* Превод на Български/ Bulgarian translation * https://reactos.org/wiki/Bulgarian_translation - * FILE: base/applications/calc/lang/bg-BG.rc - * Недовършен / Incomplete */ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT @@ -15,10 +13,10 @@ MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20 - CONTROL "Шстн", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10 - CONTROL "Дстн", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10 - CONTROL "Осм", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10 - CONTROL "Двоич", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10 + AUTORADIOBUTTON "Шстн", IDC_RADIO_HEX, 8, 21, 30, 10 + AUTORADIOBUTTON "Дстн", IDC_RADIO_DEC, 41, 21, 30, 10 + AUTORADIOBUTTON "Осм", IDC_RADIO_OCT, 74, 21, 30, 10 + AUTORADIOBUTTON "Двоич", IDC_RADIO_BIN, 107, 21, 30, 10 GROUPBOX "", IDC_STATIC, 5, 34, 84, 20 CONTROL "Обр", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10 CONTROL "Хип", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10 @@ -135,17 +133,13 @@ BEGIN PUSHBUTTON "Дроб", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP GROUPBOX "", IDC_STATIC, 147, 14, 163, 20 - CONTROL "ЧДума", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 150, 21, 38, 10 - CONTROL "ДДума", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 190, 21, 38, 10 - CONTROL "Дума", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 230, 21, 38, 10 - CONTROL "Байт", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 270, 21, 38, 10 - CONTROL "Градуси", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10 - CONTROL "Радиани", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10 - CONTROL "Градиани", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10 + AUTORADIOBUTTON "ЧДума", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "ДДума", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Дума", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Байт", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Градуси", IDC_RADIO_DEG, 150, 21, 45, 10 + AUTORADIOBUTTON "Радиани", IDC_RADIO_RAD, 204, 21, 45, 10 + AUTORADIOBUTTON "Градиани", IDC_RADIO_GRAD, 258, 21, 45, 10 PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER | diff --git a/base/applications/calc/lang/cs-CZ.rc b/base/applications/calc/lang/cs-CZ.rc index ce7c139577c..135d9102531 100644 --- a/base/applications/calc/lang/cs-CZ.rc +++ b/base/applications/calc/lang/cs-CZ.rc @@ -1,6 +1,5 @@ -/* FILE: base/applications/calc/lang/cs-CZ.rc - * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) - * UPDATED: 2010-05-30 +/* + * TRANSLATOR: 2010 Radek Liska (Black_Fox) <radekliska(a)gmail.com> */ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT @@ -14,10 +13,10 @@ MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20 - CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10 - CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10 - CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10 - CONTROL "Bin", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10 + AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10 + AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10 + AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10 + AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10 GROUPBOX "", IDC_STATIC, 5, 34, 84, 20 CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10 CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10 @@ -134,17 +133,13 @@ BEGIN PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP GROUPBOX "", IDC_STATIC, 147, 14, 163, 20 - CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 150, 21, 38, 10 - CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 190, 21, 38, 10 - CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 230, 21, 38, 10 - CONTROL "Byte", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 270, 21, 38, 10 - CONTROL "Stupně", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10 - CONTROL "Radiány", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10 - CONTROL "Grady", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10 + AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Byte", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Stupně", IDC_RADIO_DEG, 150, 21, 45, 10 + AUTORADIOBUTTON "Radiány", IDC_RADIO_RAD, 204, 21, 45, 10 + AUTORADIOBUTTON "Grady", IDC_RADIO_GRAD, 258, 21, 45, 10 PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER | diff --git a/base/applications/calc/lang/de-DE.rc b/base/applications/calc/lang/de-DE.rc index adb698d612c..dcc06972495 100644 --- a/base/applications/calc/lang/de-DE.rc +++ b/base/applications/calc/lang/de-DE.rc @@ -9,10 +9,10 @@ MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20 - CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10 - CONTROL "Dez", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10 - CONTROL "Okt", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10 - CONTROL "Bin", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10 + AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10 + AUTORADIOBUTTON "Dez", IDC_RADIO_DEC, 41, 21, 30, 10 + AUTORADIOBUTTON "Okt", IDC_RADIO_OCT, 74, 21, 30, 10 + AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10 GROUPBOX "", IDC_STATIC, 5, 34, 84, 20 CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10 CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10 @@ -129,17 +129,13 @@ BEGIN PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP GROUPBOX "", IDC_STATIC, 147, 14, 163, 20 - CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 150, 21, 38, 10 - CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 190, 21, 38, 10 - CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 230, 21, 38, 10 - CONTROL "Byte", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 270, 21, 38, 10 - CONTROL "Degree", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10 - CONTROL "Radiant", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10 - CONTROL "Grad", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10 + AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Byte", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Degree", IDC_RADIO_DEG, 150, 21, 45, 10 + AUTORADIOBUTTON "Radiant", IDC_RADIO_RAD, 204, 21, 45, 10 + AUTORADIOBUTTON "Grad", IDC_RADIO_GRAD, 258, 21, 45, 10 PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER | diff --git a/base/applications/calc/lang/el-GR.rc b/base/applications/calc/lang/el-GR.rc index 749f8eeef33..8bad94ed768 100644 --- a/base/applications/calc/lang/el-GR.rc +++ b/base/applications/calc/lang/el-GR.rc @@ -9,10 +9,10 @@ MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20 - CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10 - CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10 - CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10 - CONTROL "Bin", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10 + AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10 + AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10 + AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10 + AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10 GROUPBOX "", IDC_STATIC, 5, 34, 84, 20 CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10 CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10 @@ -129,17 +129,13 @@ BEGIN PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP GROUPBOX "", IDC_STATIC, 147, 14, 163, 20 - CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 150, 21, 38, 10 - CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 190, 21, 38, 10 - CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 230, 21, 38, 10 - CONTROL "Byte", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 270, 21, 38, 10 - CONTROL "Βαθμοί", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10 - CONTROL "Μοίρες", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10 - CONTROL "Ακτίνια", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10 + AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Byte", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Βαθμοί", IDC_RADIO_DEG, 150, 21, 45, 10 + AUTORADIOBUTTON "Μοίρες", IDC_RADIO_RAD, 204, 21, 45, 10 + AUTORADIOBUTTON "Ακτίνια", IDC_RADIO_GRAD, 258, 21, 45, 10 PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER | diff --git a/base/applications/calc/lang/en-US.rc b/base/applications/calc/lang/en-US.rc index 52828ab62ce..2fde8038f49 100644 --- a/base/applications/calc/lang/en-US.rc +++ b/base/applications/calc/lang/en-US.rc @@ -9,10 +9,10 @@ MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20 - CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10 - CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10 - CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10 - CONTROL "Bin", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10 + AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10 + AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10 + AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10 + AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10 GROUPBOX "", IDC_STATIC, 5, 34, 84, 20 CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10 CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10 @@ -129,17 +129,13 @@ BEGIN PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP GROUPBOX "", IDC_STATIC, 147, 14, 163, 20 - CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 150, 21, 38, 10 - CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 190, 21, 38, 10 - CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 230, 21, 38, 10 - CONTROL "Byte", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 270, 21, 38, 10 - CONTROL "Degrees", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10 - CONTROL "Radians", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10 - CONTROL "Gradians", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10 + AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Byte", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Degrees", IDC_RADIO_DEG, 150, 21, 45, 10 + AUTORADIOBUTTON "Radians", IDC_RADIO_RAD, 204, 21, 45, 10 + AUTORADIOBUTTON "Gradians", IDC_RADIO_GRAD, 258, 21, 45, 10 PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER | diff --git a/base/applications/calc/lang/es-ES.rc b/base/applications/calc/lang/es-ES.rc index d20dcc547c5..0b9fdffc38e 100644 --- a/base/applications/calc/lang/es-ES.rc +++ b/base/applications/calc/lang/es-ES.rc @@ -15,10 +15,10 @@ MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20 - CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10 - CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10 - CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10 - CONTROL "Bin", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10 + AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10 + AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10 + AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10 + AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10 GROUPBOX "", IDC_STATIC, 5, 34, 84, 20 CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10 CONTROL "Hipotenusa", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 37, 41, 48, 10 @@ -135,17 +135,13 @@ BEGIN PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP GROUPBOX "", IDC_STATIC, 147, 14, 163, 20 - CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 150, 21, 38, 10 - CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 190, 21, 38, 10 - CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 230, 21, 38, 10 - CONTROL "Byte", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 270, 21, 38, 10 - CONTROL "Grados", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 151, 21, 45, 10 - CONTROL "Radianes", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 198, 21, 45, 10 - CONTROL "Gradianes", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 248, 21, 45, 10 + AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Byte", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Grados", IDC_RADIO_DEG, 150, 21, 45, 10 + AUTORADIOBUTTON "Radianes", IDC_RADIO_RAD, 204, 21, 45, 10 + AUTORADIOBUTTON "Gradianes", IDC_RADIO_GRAD, 258, 21, 45, 10 PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER | diff --git a/base/applications/calc/lang/fr-FR.rc b/base/applications/calc/lang/fr-FR.rc index b8288bf8883..9e68fbbffed 100644 --- a/base/applications/calc/lang/fr-FR.rc +++ b/base/applications/calc/lang/fr-FR.rc @@ -9,10 +9,10 @@ MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20 - CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10 - CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10 - CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10 - CONTROL "Bin", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10 + AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10 + AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10 + AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10 + AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10 GROUPBOX "", IDC_STATIC, 5, 34, 84, 20 CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10 CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10 @@ -129,17 +129,13 @@ BEGIN PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP GROUPBOX "", IDC_STATIC, 147, 14, 163, 20 - CONTROL "Q-mot", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 150, 21, 38, 10 - CONTROL "D-mot", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 190, 21, 38, 10 - CONTROL "Mot", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 230, 21, 38, 10 - CONTROL "Octet", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 270, 21, 38, 10 - CONTROL "Degrés", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10 - CONTROL "Radians", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10 - CONTROL "Grades", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10 + AUTORADIOBUTTON "Q-mot", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "D-mot", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Mot", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Octet", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Degrés", IDC_RADIO_DEG, 150, 21, 45, 10 + AUTORADIOBUTTON "Radians", IDC_RADIO_RAD, 204, 21, 45, 10 + AUTORADIOBUTTON "Grades", IDC_RADIO_GRAD, 258, 21, 45, 10 PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER | diff --git a/base/applications/calc/lang/he-IL.rc b/base/applications/calc/lang/he-IL.rc index 89273bb4d2a..6dfb5b13f8a 100644 --- a/base/applications/calc/lang/he-IL.rc +++ b/base/applications/calc/lang/he-IL.rc @@ -1,4 +1,4 @@ -/* Translated by Baruch Rutman */ +/* TRANSLATOR: Baruch Rutman */ LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT @@ -12,10 +12,10 @@ MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "", IDC_STATIC, 4 ,14, 141, 20 - CONTROL "הקס", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 6, 21, 30, 10 - CONTROL "עשרוני", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 36, 21, 34, 10 - CONTROL "אוקטלי", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 73, 21, 37, 10 - CONTROL "בינרי", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 113, 21, 30, 10 + AUTORADIOBUTTON "הקס", IDC_RADIO_HEX, 6, 21, 30, 10 + AUTORADIOBUTTON "עשרוני", IDC_RADIO_DEC, 36, 21, 34, 10 + AUTORADIOBUTTON "אוקטלי", IDC_RADIO_OCT, 73, 21, 37, 10 + AUTORADIOBUTTON "בינרי", IDC_RADIO_BIN, 113, 21, 30, 10 GROUPBOX "", IDC_STATIC, 4, 34, 84, 20 CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10 CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10 @@ -132,17 +132,13 @@ BEGIN PUSHBUTTON "A", IDC_BUTTON_A, 286, 140, 24, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP GROUPBOX "", IDC_STATIC, 147, 14, 163, 20 - CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 150, 21, 38, 10 - CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 190, 21, 38, 10 - CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 230, 21, 38, 10 - CONTROL "Byte", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 270, 21, 38, 10 - CONTROL "מעלות", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10 - CONTROL "רדיאנים", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10 - CONTROL "גרדיאנים", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10 + AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Byte", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "מעלות", IDC_RADIO_DEG, 150, 21, 45, 10 + AUTORADIOBUTTON "רדיאנים", IDC_RADIO_RAD, 204, 21, 45, 10 + AUTORADIOBUTTON "גרדיאנים", IDC_RADIO_GRAD, 258, 21, 45, 10 PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER | diff --git a/base/applications/calc/lang/hu-HU.rc b/base/applications/calc/lang/hu-HU.rc index 6242d48b2dc..d600f8d1039 100644 --- a/base/applications/calc/lang/hu-HU.rc +++ b/base/applications/calc/lang/hu-HU.rc @@ -1,9 +1,8 @@ /* * PROJECT: ReactOS Calculator * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/calc/lang/hu-HU.rc * PURPOSE: Hungarian Language File for ReactOS Calc - * TRANSLATOR: Nagy Tibor (xnagytibor at gmail dot com) + * TRANSLATOR: Nagy Tibor <xnagytibor(a)gmail.com> */ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT @@ -17,10 +16,10 @@ MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20 - CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10 - CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10 - CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10 - CONTROL "Bin", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10 + AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10 + AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10 + AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10 + AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10 GROUPBOX "", IDC_STATIC, 5, 34, 84, 20 CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10 CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10 @@ -137,17 +136,13 @@ BEGIN PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP GROUPBOX "", IDC_STATIC, 147, 14, 163, 20 - CONTROL "Négyszó", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 150, 21, 38, 10 - CONTROL "Duplaszó", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 190, 21, 38, 10 - CONTROL "Szó", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 230, 21, 38, 10 - CONTROL "Bájt", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 270, 21, 38, 10 - CONTROL "Fok", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10 - CONTROL "Radián", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10 - CONTROL "Gradián", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10 + AUTORADIOBUTTON "Négyszó", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Duplaszó", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Szó", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Bájt", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Fok", IDC_RADIO_DEG, 150, 21, 45, 10 + AUTORADIOBUTTON "Radián", IDC_RADIO_RAD, 204, 21, 45, 10 + AUTORADIOBUTTON "Gradián", IDC_RADIO_GRAD, 258, 21, 45, 10 PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER | @@ -452,12 +447,12 @@ BEGIN IDS_AREA_ACRES_FRANCE "Acre (Franciaország)" IDS_AREA_ACRES_SCOTS "Acre (Skót)" IDS_AREA_ACRES_US "Acre (Egyesült Államok)" - IDS_AREA_ARES "Are" // ? + IDS_AREA_ARES "Are" IDS_AREA_CHOU "Chou" IDS_AREA_DANBO "Danbo" IDS_AREA_HECTARES "Hektár" IDS_AREA_JEONGBO "Jeongbo" - IDS_AREA_MORGEN_HUNGARY "Hold (Magyarország)" // ? + IDS_AREA_MORGEN_HUNGARY "Hold (Magyarország)" IDS_AREA_MU "Mu" IDS_AREA_PING "Ping" IDS_AREA_PYEONG "Pyeong" @@ -465,19 +460,19 @@ BEGIN IDS_AREA_RAI "Rai" IDS_AREA_SE "Se" IDS_AREA_SQUARE_CENTIMETERS "Négyzetcentiméter" - IDS_AREA_SQUARE_CHR "Négyzetchr" // ? - IDS_AREA_SQUARE_FATHOMS "Négyzetöl" // Alt.: Négyszögöl - IDS_AREA_SQUARE_FATHOMS_HUNGARY "Négyzetöl (Magyarország)" // Alt.: Négyszögöl (Magyarország) - IDS_AREA_SQUARE_FEET "Négyzetláb" // Alt.: Négyszögláb - IDS_AREA_SQUARE_INCHES "Négyzethüvelyk" // Alt.: Négyszöghüvelyk + IDS_AREA_SQUARE_CHR "Négyzetchr" + IDS_AREA_SQUARE_FATHOMS "Négyzetöl" + IDS_AREA_SQUARE_FATHOMS_HUNGARY "Négyzetöl (Magyarország)" + IDS_AREA_SQUARE_FEET "Négyzetláb" + IDS_AREA_SQUARE_INCHES "Négyzethüvelyk" IDS_AREA_SQUARE_KILOMETERS "Négyzetkilométer" - IDS_AREA_SQUARE_LAR "Négyzetlar" // ? + IDS_AREA_SQUARE_LAR "Négyzetlar" IDS_AREA_SQUARE_METER "Négyzetméter" IDS_AREA_SQUARE_MILES "Négyzetmérföld" IDS_AREA_SQUARE_MILLIMETERS "Négyzetmilliméter" - IDS_AREA_SQUARE_SHAKU "Négyzetshaku" // ? - IDS_AREA_SQUARE_TSUEN "Négyzettsuen" // ? - IDS_AREA_SQUARE_VA "Négyzetva" // ? + IDS_AREA_SQUARE_SHAKU "Négyzetshaku" + IDS_AREA_SQUARE_TSUEN "Négyzettsuen" + IDS_AREA_SQUARE_VA "Négyzetva" IDS_AREA_SQUARE_YARD "Négyzetyard" IDS_AREA_TAN "Tan" IDS_AREA_TSUBO "Tsubo" diff --git a/base/applications/calc/lang/id-ID.rc b/base/applications/calc/lang/id-ID.rc index be621d57c6d..33020ff35ab 100644 --- a/base/applications/calc/lang/id-ID.rc +++ b/base/applications/calc/lang/id-ID.rc @@ -16,10 +16,10 @@ MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20 - CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10 - CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10 - CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10 - CONTROL "Bin", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10 + AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10 + AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10 + AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10 + AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10 GROUPBOX "", IDC_STATIC, 5, 34, 84, 20 CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10 CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10 @@ -136,17 +136,13 @@ BEGIN PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP GROUPBOX "", IDC_STATIC, 147, 14, 163, 20 - CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 150, 21, 38, 10 - CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 190, 21, 38, 10 - CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 230, 21, 38, 10 - CONTROL "Byte", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 270, 21, 38, 10 - CONTROL "Derajat", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10 - CONTROL "Radian", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10 - CONTROL "Gradian", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10 + AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Byte", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Derajat", IDC_RADIO_DEG, 150, 21, 45, 10 + AUTORADIOBUTTON "Radian", IDC_RADIO_RAD, 204, 21, 45, 10 + AUTORADIOBUTTON "Gradian", IDC_RADIO_GRAD, 258, 21, 45, 10 PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER | diff --git a/base/applications/calc/lang/it-IT.rc b/base/applications/calc/lang/it-IT.rc index 085bda75aa5..4b439b6fc89 100644 --- a/base/applications/calc/lang/it-IT.rc +++ b/base/applications/calc/lang/it-IT.rc @@ -9,10 +9,10 @@ MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20 - CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10 - CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10 - CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10 - CONTROL "Bin", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10 + AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10 + AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10 + AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10 + AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10 GROUPBOX "", IDC_STATIC, 5, 34, 84, 20 CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10 CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10 @@ -129,17 +129,13 @@ BEGIN PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP GROUPBOX "", IDC_STATIC, 147, 14, 163, 20 - CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 150, 21, 38, 10 - CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 190, 21, 38, 10 - CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 230, 21, 38, 10 - CONTROL "Byte", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 270, 21, 38, 10 - CONTROL "Gradi", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10 - CONTROL "Radianti", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10 - CONTROL "Gradienti", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10 + AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Byte", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Gradi", IDC_RADIO_DEG, 150, 21, 45, 10 + AUTORADIOBUTTON "Radianti", IDC_RADIO_RAD, 204, 21, 45, 10 + AUTORADIOBUTTON "Gradienti", IDC_RADIO_GRAD, 258, 21, 45, 10 PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER | diff --git a/base/applications/calc/lang/ja-JP.rc b/base/applications/calc/lang/ja-JP.rc index 6519bf5b5d5..4e7bc97f0b4 100644 --- a/base/applications/calc/lang/ja-JP.rc +++ b/base/applications/calc/lang/ja-JP.rc @@ -9,10 +9,10 @@ MENU IDR_MENU_SCIENTIFIC_1 FONT 9, "MS UI Gothic", 0, 0, 0x1 BEGIN GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20 - CONTROL "16進", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10 - CONTROL "10進", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10 - CONTROL "8進", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10 - CONTROL "2進", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10 + AUTORADIOBUTTON "16進", IDC_RADIO_HEX, 8, 21, 30, 10 + AUTORADIOBUTTON "10進", IDC_RADIO_DEC, 41, 21, 30, 10 + AUTORADIOBUTTON "8進", IDC_RADIO_OCT, 74, 21, 30, 10 + AUTORADIOBUTTON "2進", IDC_RADIO_BIN, 107, 21, 30, 10 GROUPBOX "", IDC_STATIC, 5, 34, 84, 20 CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10 CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10 @@ -129,17 +129,13 @@ BEGIN PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP GROUPBOX "", IDC_STATIC, 147, 14, 163, 20 - CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 150, 21, 38, 10 - CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 190, 21, 38, 10 - CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 230, 21, 38, 10 - CONTROL "Byte", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 270, 21, 38, 10 - CONTROL "Degrees", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10 - CONTROL "Radians", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10 - CONTROL "Gradians", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10 + AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Byte", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Degrees", IDC_RADIO_DEG, 150, 21, 45, 10 + AUTORADIOBUTTON "Radians", IDC_RADIO_RAD, 204, 21, 45, 10 + AUTORADIOBUTTON "Gradians", IDC_RADIO_GRAD, 258, 21, 45, 10 PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER | @@ -377,7 +373,7 @@ BEGIN MENUITEM "コピー(&C)\tCtrl+C", IDM_EDIT_COPY MENUITEM "貼り付け(&P)\tCtrl+V", IDM_EDIT_PASTE END - POPUP "表示" + POPUP "表示(&V)" BEGIN MENUITEM "標準(&T)", IDM_VIEW_STANDARD MENUITEM "関数電卓(&S)", IDM_VIEW_SCIENTIFIC diff --git a/base/applications/calc/lang/ko-KR.rc b/base/applications/calc/lang/ko-KR.rc index 87fbf0ed5cc..d4c5346941e 100644 --- a/base/applications/calc/lang/ko-KR.rc +++ b/base/applications/calc/lang/ko-KR.rc @@ -11,10 +11,10 @@ MENU IDR_MENU_SCIENTIFIC_1 FONT 9, "굴림", 0, 0, 0x1 BEGIN GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20 - CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10 - CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10 - CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10 - CONTROL "Bin", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10 + AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10 + AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10 + AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10 + AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10 GROUPBOX "", IDC_STATIC, 5, 34, 84, 20 CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10 CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10 @@ -131,17 +131,13 @@ BEGIN PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP GROUPBOX "", IDC_STATIC, 147, 14, 163, 20 - CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 150, 21, 38, 10 - CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 190, 21, 38, 10 - CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 230, 21, 38, 10 - CONTROL "Byte", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 270, 21, 38, 10 - CONTROL "Degrees", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10 - CONTROL "Radians", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10 - CONTROL "Gradians", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10 + AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Byte", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Degrees", IDC_RADIO_DEG, 150, 21, 45, 10 + AUTORADIOBUTTON "Radians", IDC_RADIO_RAD, 204, 21, 45, 10 + AUTORADIOBUTTON "Gradians", IDC_RADIO_GRAD, 258, 21, 45, 10 PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER | diff --git a/base/applications/calc/lang/nl-NL.rc b/base/applications/calc/lang/nl-NL.rc index 7b239b8aa12..8be319626f6 100644 --- a/base/applications/calc/lang/nl-NL.rc +++ b/base/applications/calc/lang/nl-NL.rc @@ -9,10 +9,10 @@ MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20 - CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10 - CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10 - CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10 - CONTROL "Bin", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10 + AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10 + AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10 + AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10 + AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10 GROUPBOX "", IDC_STATIC, 5, 34, 84, 20 CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10 CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10 @@ -129,17 +129,13 @@ BEGIN PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP GROUPBOX "", IDC_STATIC, 147, 14, 163, 20 - CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 150, 21, 38, 10 - CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 190, 21, 38, 10 - CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 230, 21, 38, 10 - CONTROL "Byte", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 270, 21, 38, 10 - CONTROL "Graden", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10 - CONTROL "Radialen", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10 - CONTROL "Gradiënten", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10 + AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Byte", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Graden", IDC_RADIO_DEG, 150, 21, 45, 10 + AUTORADIOBUTTON "Radialen", IDC_RADIO_RAD, 204, 21, 45, 10 + AUTORADIOBUTTON "Gradiënten", IDC_RADIO_GRAD, 258, 21, 45, 10 PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER | diff --git a/base/applications/calc/lang/no-NO.rc b/base/applications/calc/lang/no-NO.rc index a70a5ff53c4..7ccd2302de5 100644 --- a/base/applications/calc/lang/no-NO.rc +++ b/base/applications/calc/lang/no-NO.rc @@ -9,10 +9,10 @@ MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20 - CONTROL "Heks", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10 - CONTROL "Des", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10 - CONTROL "Okt", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10 - CONTROL "Bin", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10 + AUTORADIOBUTTON "Heks", IDC_RADIO_HEX, 8, 21, 30, 10 + AUTORADIOBUTTON "Des", IDC_RADIO_DEC, 41, 21, 30, 10 + AUTORADIOBUTTON "Okt", IDC_RADIO_OCT, 74, 21, 30, 10 + AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10 GROUPBOX "", IDC_STATIC, 5, 34, 84, 20 CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10 CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10 @@ -129,17 +129,13 @@ BEGIN PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP GROUPBOX "", IDC_STATIC, 147, 14, 163, 20 - CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 150, 21, 38, 10 - CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 190, 21, 38, 10 - CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 230, 21, 38, 10 - CONTROL "Tegn", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 270, 21, 38, 10 - CONTROL "Grader", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10 - CONTROL "Radianer", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10 - CONTROL "Gradienter", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10 + AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Tegn", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Grader", IDC_RADIO_DEG, 150, 21, 45, 10 + AUTORADIOBUTTON "Radianer", IDC_RADIO_RAD, 204, 21, 45, 10 + AUTORADIOBUTTON "Gradienter", IDC_RADIO_GRAD, 258, 21, 45, 10 PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER | diff --git a/base/applications/calc/lang/pl-PL.rc b/base/applications/calc/lang/pl-PL.rc index 93452712f7d..cd25dab6601 100644 --- a/base/applications/calc/lang/pl-PL.rc +++ b/base/applications/calc/lang/pl-PL.rc @@ -1,10 +1,8 @@ /* - * Translated by Caemyr - Olaf Siejka (Feb, Jun 2008) - * Use ReactOS forum PM or IRC to contact me - * https://reactos.org - * IRC: irc.freenode.net #reactos-pl; - * Updated by Saibamen - Adam Stachowicz (saibamenppl(a)gmail.com) (Apr, 2011) - * UTF-8 conversion by Caemyr (May, 2011) + * Translated by Caemyr - Olaf Siejka 2008-2011 + * Use ReactOS forum PM or IRC to contact me + * IRC: irc.freenode.net #reactos-pl; + * Updated by Saibamen - Adam Stachowicz <saibamenppl(a)gmail.com> 2011 */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT @@ -18,10 +16,10 @@ MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20 - CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10 - CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10 - CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10 - CONTROL "Bin", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10 + AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10 + AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10 + AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10 + AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10 GROUPBOX "", IDC_STATIC, 5, 34, 84, 20 CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10 CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10 @@ -138,17 +136,13 @@ BEGIN PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP GROUPBOX "", IDC_STATIC, 147, 14, 163, 20 - CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 150, 21, 38, 10 - CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 190, 21, 38, 10 - CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 230, 21, 38, 10 - CONTROL "Bajt", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 270, 21, 38, 10 - CONTROL "Stopnie", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10 - CONTROL "Radiany", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10 - CONTROL "Gradusy", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10 + AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Bajt", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Stopnie", IDC_RADIO_DEG, 150, 21, 45, 10 + AUTORADIOBUTTON "Radiany", IDC_RADIO_RAD, 204, 21, 45, 10 + AUTORADIOBUTTON "Gradusy", IDC_RADIO_GRAD, 258, 21, 45, 10 PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER | diff --git a/base/applications/calc/lang/pt-BR.rc b/base/applications/calc/lang/pt-BR.rc index 40697475081..72e9d91da57 100644 --- a/base/applications/calc/lang/pt-BR.rc +++ b/base/applications/calc/lang/pt-BR.rc @@ -1,4 +1,4 @@ -/* Translation and UTF-8 Conversion by mkbu95 <mkbu95(a)gmail.com> (August, 2011) */ +/* TRANSLATOR: 2011 mkbu95 <mkbu95(a)gmail.com> */ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN @@ -11,10 +11,10 @@ MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20 - CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10 - CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10 - CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10 - CONTROL "Bin", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10 + AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10 + AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10 + AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10 + AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10 GROUPBOX "", IDC_STATIC, 5, 34, 84, 20 CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10 CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10 @@ -131,17 +131,13 @@ BEGIN PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP GROUPBOX "", IDC_STATIC, 147, 14, 163, 20 - CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 150, 21, 38, 10 - CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 190, 21, 38, 10 - CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 230, 21, 38, 10 - CONTROL "Byte", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 270, 21, 38, 10 - CONTROL "Graus", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10 - CONTROL "Radianos", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10 - CONTROL "Grados", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10 + AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Byte", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Graus", IDC_RADIO_DEG, 150, 21, 45, 10 + AUTORADIOBUTTON "Radianos", IDC_RADIO_RAD, 204, 21, 45, 10 + AUTORADIOBUTTON "Grados", IDC_RADIO_GRAD, 258, 21, 45, 10 PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER | diff --git a/base/applications/calc/lang/pt-PT.rc b/base/applications/calc/lang/pt-PT.rc index 86a6bade983..90f8a8faf94 100644 --- a/base/applications/calc/lang/pt-PT.rc +++ b/base/applications/calc/lang/pt-PT.rc @@ -1,4 +1,4 @@ -/* Translation and UTF-8 Conversion by Gabriel Aguiar <fgygh5804@gmail.com,fgsoftwarestudio@gmail.com> (July, 2021) */ +/* TRANSLATOR: 2021 Gabriel Aguiar <fgygh5804@gmail.com,fgsoftwarestudio@gmail.com> */ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL @@ -11,10 +11,10 @@ MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20 - CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10 - CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10 - CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10 - CONTROL "Bin", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10 + AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10 + AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10 + AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10 + AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10 GROUPBOX "", IDC_STATIC, 5, 34, 84, 20 CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10 CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10 @@ -131,17 +131,13 @@ BEGIN PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP GROUPBOX "", IDC_STATIC, 147, 14, 163, 20 - CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 150, 21, 38, 10 - CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 190, 21, 38, 10 - CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 230, 21, 38, 10 - CONTROL "Byte", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 270, 21, 38, 10 - CONTROL "Graus", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10 - CONTROL "Radianos", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10 - CONTROL "Grados", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10 + AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Byte", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Graus", IDC_RADIO_DEG, 150, 21, 45, 10 + AUTORADIOBUTTON "Radianos", IDC_RADIO_RAD, 204, 21, 45, 10 + AUTORADIOBUTTON "Grados", IDC_RADIO_GRAD, 258, 21, 45, 10 PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER | diff --git a/base/applications/calc/lang/ro-RO.rc b/base/applications/calc/lang/ro-RO.rc index 6d365809af5..267f0ca8b6a 100644 --- a/base/applications/calc/lang/ro-RO.rc +++ b/base/applications/calc/lang/ro-RO.rc @@ -18,10 +18,10 @@ MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20 - CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10 - CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10 - CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10 - CONTROL "Bin", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10 + AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10 + AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10 + AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10 + AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10 GROUPBOX "", IDC_STATIC, 5, 34, 84, 20 CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10 CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10 @@ -138,17 +138,13 @@ BEGIN PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP GROUPBOX "", IDC_STATIC, 147, 14, 163, 20 - CONTROL "64 biți", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 150, 21, 38, 10 - CONTROL "32 biți", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 190, 21, 38, 10 - CONTROL "16 biți", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 230, 21, 38, 10 - CONTROL "8 biți", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 270, 21, 38, 10 - CONTROL "Grade", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10 - CONTROL "Radiani", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10 - CONTROL "Gradiani", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10 + AUTORADIOBUTTON "64 biți", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "32 biți", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "16 biți", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "8 biți", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Grade", IDC_RADIO_DEG, 150, 21, 45, 10 + AUTORADIOBUTTON "Radiani", IDC_RADIO_RAD, 204, 21, 45, 10 + AUTORADIOBUTTON "Gradiani", IDC_RADIO_GRAD, 258, 21, 45, 10 PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER | diff --git a/base/applications/calc/lang/ru-RU.rc b/base/applications/calc/lang/ru-RU.rc index 9103cc740bf..6187dc692fe 100644 --- a/base/applications/calc/lang/ru-RU.rc +++ b/base/applications/calc/lang/ru-RU.rc @@ -9,10 +9,10 @@ MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20 - CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10 - CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10 - CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10 - CONTROL "Bin", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10 + AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10 + AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10 + AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10 + AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10 GROUPBOX "", IDC_STATIC, 5, 34, 84, 20 CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10 CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10 @@ -129,17 +129,13 @@ BEGIN PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP GROUPBOX "", IDC_STATIC, 147, 14, 163, 20 - CONTROL "8 байт", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 150, 21, 38, 10 - CONTROL "4 байт", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 190, 21, 38, 10 - CONTROL "2 байт", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 230, 21, 38, 10 - CONTROL "1 байт", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 270, 21, 38, 10 - CONTROL "Градусы", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10 - CONTROL "Радианы", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10 - CONTROL "Грады", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10 + AUTORADIOBUTTON "8 байт", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "4 байт", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "2 байт", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "1 байт", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Градусы", IDC_RADIO_DEG, 150, 21, 45, 10 + AUTORADIOBUTTON "Радианы", IDC_RADIO_RAD, 204, 21, 45, 10 + AUTORADIOBUTTON "Грады", IDC_RADIO_GRAD, 258, 21, 45, 10 PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER | diff --git a/base/applications/calc/lang/sk-SK.rc b/base/applications/calc/lang/sk-SK.rc index 6aa757bf4d9..e8cb81bd1d7 100644 --- a/base/applications/calc/lang/sk-SK.rc +++ b/base/applications/calc/lang/sk-SK.rc @@ -1,7 +1,4 @@ -/* TRANSLATOR : Mário Kačmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) - * DATE OF TR.: 30-01-2008 - * LAST CHANGE: 09-08-2011 - * --------------------------------------- +/* TRANSLATOR: 2008-2011 Mário Kačmár /Mario Kacmar/ aka Kario <kario(a)szm.sk> * TODO: pridanie navigačných značiek "&" ? */ @@ -16,10 +13,10 @@ MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20 - CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10 - CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10 - CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10 - CONTROL "Bin", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10 + AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10 + AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10 + AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10 + AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10 GROUPBOX "", IDC_STATIC, 5, 34, 84, 20 CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10 CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10 @@ -136,17 +133,13 @@ BEGIN PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP GROUPBOX "", IDC_STATIC, 147, 14, 163, 20 - CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 150, 21, 38, 10 - CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 190, 21, 38, 10 - CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 230, 21, 38, 10 - CONTROL "Bajt", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 270, 21, 38, 10 - CONTROL "Stupne", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10 - CONTROL "Radiány", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10 - CONTROL "Grady", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10 + AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Bajt", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Stupne", IDC_RADIO_DEG, 150, 21, 45, 10 + AUTORADIOBUTTON "Radiány", IDC_RADIO_RAD, 204, 21, 45, 10 + AUTORADIOBUTTON "Grady", IDC_RADIO_GRAD, 258, 21, 45, 10 PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER | diff --git a/base/applications/calc/lang/sq-AL.rc b/base/applications/calc/lang/sq-AL.rc index c3b29193d85..2e58a6dda33 100644 --- a/base/applications/calc/lang/sq-AL.rc +++ b/base/applications/calc/lang/sq-AL.rc @@ -1,5 +1,4 @@ -/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani(a)gmail.com) - * DATE OF TR: 29-11-2013 +/* TRANSLATOR: 2013 Ardit Dani (Ard1t) <ardit.dani(a)gmail.com> */ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL @@ -13,10 +12,10 @@ MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20 - CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10 - CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10 - CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10 - CONTROL "Bin", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10 + AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10 + AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10 + AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10 + AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10 GROUPBOX "", IDC_STATIC, 5, 34, 84, 20 CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10 CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10 @@ -133,17 +132,13 @@ BEGIN PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP GROUPBOX "", IDC_STATIC, 147, 14, 163, 20 - CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 150, 21, 38, 10 - CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 190, 21, 38, 10 - CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 230, 21, 38, 10 - CONTROL "Byte", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 270, 21, 38, 10 - CONTROL "Degrees", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10 - CONTROL "Radians", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10 - CONTROL "Gradians", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10 + AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Byte", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Degrees", IDC_RADIO_DEG, 150, 21, 45, 10 + AUTORADIOBUTTON "Radians", IDC_RADIO_RAD, 204, 21, 45, 10 + AUTORADIOBUTTON "Gradians", IDC_RADIO_GRAD, 258, 21, 45, 10 PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER | diff --git a/base/applications/calc/lang/sv-SE.rc b/base/applications/calc/lang/sv-SE.rc index 7e5459dcad4..282d8d250d4 100644 --- a/base/applications/calc/lang/sv-SE.rc +++ b/base/applications/calc/lang/sv-SE.rc @@ -1,6 +1,5 @@ /* * PROJECT: ReactOS CALC - * FILE: base/applications/calc/lang/sv-SE.rc * PURPOSE: Swedish resource file * Translation: Jaix Bly */ @@ -16,10 +15,10 @@ MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20 - CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10 - CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10 - CONTROL "Okt", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10 - CONTROL "Bin", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10 + AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10 + AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10 + AUTORADIOBUTTON "Okt", IDC_RADIO_OCT, 74, 21, 30, 10 + AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10 GROUPBOX "", IDC_STATIC, 5, 34, 84, 20 CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10 CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10 @@ -136,17 +135,13 @@ BEGIN PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP GROUPBOX "", IDC_STATIC, 147, 14, 163, 20 - CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 150, 21, 38, 10 - CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 190, 21, 38, 10 - CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 230, 21, 38, 10 - CONTROL "Byte", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 270, 21, 38, 10 - CONTROL "Grader", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10 - CONTROL "Radianer", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10 - CONTROL "Gradienter", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10 + AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Byte", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Grader", IDC_RADIO_DEG, 150, 21, 45, 10 + AUTORADIOBUTTON "Radianer", IDC_RADIO_RAD, 204, 21, 45, 10 + AUTORADIOBUTTON "Gradienter", IDC_RADIO_GRAD, 258, 21, 45, 10 PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER | diff --git a/base/applications/calc/lang/th-TH.rc b/base/applications/calc/lang/th-TH.rc index 4333fd4a40b..2fd2bfbae04 100644 --- a/base/applications/calc/lang/th-TH.rc +++ b/base/applications/calc/lang/th-TH.rc @@ -9,10 +9,10 @@ MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20 - CONTROL "สิบหก", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10 - CONTROL "สิบ", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10 - CONTROL "แปด", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10 - CONTROL "สอง", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10 + AUTORADIOBUTTON "สิบหก", IDC_RADIO_HEX, 8, 21, 30, 10 + AUTORADIOBUTTON "สิบ", IDC_RADIO_DEC, 41, 21, 30, 10 + AUTORADIOBUTTON "แปด", IDC_RADIO_OCT, 74, 21, 30, 10 + AUTORADIOBUTTON "สอง", IDC_RADIO_BIN, 107, 21, 30, 10 GROUPBOX "", IDC_STATIC, 5, 34, 84, 20 CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10 CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10 @@ -129,17 +129,13 @@ BEGIN PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP GROUPBOX "", IDC_STATIC, 147, 14, 163, 20 - CONTROL "สี่เวิร์ด", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 150, 21, 38, 10 - CONTROL "สองเวิร์ด", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 190, 21, 38, 10 - CONTROL "เวิร์ด", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 230, 21, 38, 10 - CONTROL "ไบต์", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 270, 21, 38, 10 - CONTROL "องศา", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10 - CONTROL "เรเดียน", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10 - CONTROL "เกรเดียน", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10 + AUTORADIOBUTTON "สี่เวิร์ด", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "สองเวิร์ด", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "เวิร์ด", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "ไบต", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "องศา", IDC_RADIO_DEG, 150, 21, 45, 10 + AUTORADIOBUTTON "เกรเดียน", IDC_RADIO_RAD, 204, 21, 45, 10 + AUTORADIOBUTTON "Gradians", IDC_RADIO_GRAD, 258, 21, 45, 10 PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER | diff --git a/base/applications/calc/lang/tr-TR.rc b/base/applications/calc/lang/tr-TR.rc index c3247e22383..e632b6e0441 100644 --- a/base/applications/calc/lang/tr-TR.rc +++ b/base/applications/calc/lang/tr-TR.rc @@ -1,6 +1,6 @@ /* TRANSLATOR: -2013-2014, 2016, 2019 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net), -2021 Süleyman Poyraz (zaryob [dot] dev [at] gmail [dot] com) +2013-2019 Erdem Ersoy (eersoy93) <erdemersoy(a)erdemersoy.net> +2021 Süleyman Poyraz <zaryob.dev(a)gmail.com> */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -14,10 +14,10 @@ MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20 - CONTROL "Onaltılık", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10 - CONTROL "Onluk", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10 - CONTROL "Sekizlik", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10 - CONTROL "İkilik", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10 + AUTORADIOBUTTON "Onaltılık", IDC_RADIO_HEX, 8, 21, 30, 10 + AUTORADIOBUTTON "Onluk", IDC_RADIO_DEC, 41, 21, 30, 10 + AUTORADIOBUTTON "Sekizlik", IDC_RADIO_OCT, 74, 21, 30, 10 + AUTORADIOBUTTON "İkilik", IDC_RADIO_BIN, 107, 21, 30, 10 GROUPBOX "", IDC_STATIC, 5, 34, 84, 20 CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10 CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10 @@ -134,17 +134,13 @@ BEGIN PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP GROUPBOX "", IDC_STATIC, 147, 14, 163, 20 - CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 150, 21, 38, 10 - CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 190, 21, 38, 10 - CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 230, 21, 38, 10 - CONTROL "Byte", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 270, 21, 38, 10 - CONTROL "Derece", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10 - CONTROL "Radian", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10 - CONTROL "Gradian", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10 + AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Byte", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Derece", IDC_RADIO_DEG, 150, 21, 45, 10 + AUTORADIOBUTTON "Radian", IDC_RADIO_RAD, 204, 21, 45, 10 + AUTORADIOBUTTON "Gradian", IDC_RADIO_GRAD, 258, 21, 45, 10 PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER | diff --git a/base/applications/calc/lang/uk-UA.rc b/base/applications/calc/lang/uk-UA.rc index 795fa2df98b..ad223d37316 100644 --- a/base/applications/calc/lang/uk-UA.rc +++ b/base/applications/calc/lang/uk-UA.rc @@ -1,8 +1,7 @@ /* - * PROJECT: ReactOS Calculator + * PROJECT: ReactOS Calc * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/calc/lang/uk-UA.rc - * PURPOSE: Ukraianian Language File for ReactOS Calc + * PURPOSE: Ukrainian Language File * TRANSLATORS: Artem Reznikov & Sakara Yevhen */ @@ -17,10 +16,10 @@ MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20 - CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10 - CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10 - CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10 - CONTROL "Bin", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10 + AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10 + AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10 + AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10 + AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10 GROUPBOX "", IDC_STATIC, 5, 34, 84, 20 CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10 CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10 @@ -137,17 +136,13 @@ BEGIN PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP GROUPBOX "", IDC_STATIC, 147, 14, 163, 20 - CONTROL "8 байт", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 150, 21, 38, 10 - CONTROL "4 байт", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 190, 21, 38, 10 - CONTROL "2 байт", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 230, 21, 38, 10 - CONTROL "1 байт", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 270, 21, 38, 10 - CONTROL "Градуси", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10 - CONTROL "Радіани", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10 - CONTROL "Гради", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10 + AUTORADIOBUTTON "8 байт", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "4 байт", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "2 байт", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "1 байт", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Градуси", IDC_RADIO_DEG, 150, 21, 45, 10 + AUTORADIOBUTTON "Радіани", IDC_RADIO_RAD, 204, 21, 45, 10 + AUTORADIOBUTTON "Гради", IDC_RADIO_GRAD, 258, 21, 45, 10 PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER | diff --git a/base/applications/calc/lang/zh-CN.rc b/base/applications/calc/lang/zh-CN.rc index c6928aa8fa5..467b91cf1a7 100644 --- a/base/applications/calc/lang/zh-CN.rc +++ b/base/applications/calc/lang/zh-CN.rc @@ -17,10 +17,10 @@ MENU IDR_MENU_SCIENTIFIC_1 FONT 9, "宋体", 0, 0, 0x1 BEGIN GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20 - CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10 - CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10 - CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10 - CONTROL "Bin", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10 + AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10 + AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10 + AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10 + AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10 GROUPBOX "", IDC_STATIC, 5, 34, 84, 20 CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10 CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10 @@ -137,17 +137,13 @@ BEGIN PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP GROUPBOX "", IDC_STATIC, 147, 14, 163, 20 - CONTROL "四字", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 150, 21, 38, 10 - CONTROL "双字", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 190, 21, 38, 10 - CONTROL "字", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 230, 21, 38, 10 - CONTROL "字节", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 270, 21, 38, 10 - CONTROL "角度", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10 - CONTROL "弧度", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10 - CONTROL "梯度", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10 + AUTORADIOBUTTON "四字", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "双字", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "字", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "字节", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "角度", IDC_RADIO_DEG, 150, 21, 45, 10 + AUTORADIOBUTTON "弧度", IDC_RADIO_RAD, 204, 21, 45, 10 + AUTORADIOBUTTON "梯度", IDC_RADIO_GRAD, 258, 21, 45, 10 PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER | diff --git a/base/applications/calc/lang/zh-HK.rc b/base/applications/calc/lang/zh-HK.rc index 08f41c67de0..90474568b10 100644 --- a/base/applications/calc/lang/zh-HK.rc +++ b/base/applications/calc/lang/zh-HK.rc @@ -17,10 +17,10 @@ MENU IDR_MENU_SCIENTIFIC_1 FONT 9, "新細明體", 0, 0, 0x1 BEGIN GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20 - CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10 - CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10 - CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10 - CONTROL "Bin", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10 + AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10 + AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10 + AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10 + AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10 GROUPBOX "", IDC_STATIC, 5, 34, 84, 20 CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10 CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10 @@ -137,17 +137,13 @@ BEGIN PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP GROUPBOX "", IDC_STATIC, 147, 14, 163, 20 - CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 150, 21, 38, 10 - CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 190, 21, 38, 10 - CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 230, 21, 38, 10 - CONTROL "位元組", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 270, 21, 38, 10 - CONTROL "角度", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10 - CONTROL "弧度", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10 - CONTROL "梯度", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10 + AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "位元組", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "角度", IDC_RADIO_DEG, 150, 21, 45, 10 + AUTORADIOBUTTON "弧度", IDC_RADIO_RAD, 204, 21, 45, 10 + AUTORADIOBUTTON "梯度", IDC_RADIO_GRAD, 258, 21, 45, 10 PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER | diff --git a/base/applications/calc/lang/zh-TW.rc b/base/applications/calc/lang/zh-TW.rc index 037ef0319f9..1f8992bf57b 100644 --- a/base/applications/calc/lang/zh-TW.rc +++ b/base/applications/calc/lang/zh-TW.rc @@ -1,4 +1,4 @@ -// Traditional Chinese translation by 2021 Chan Chilung <eason066(a)gmail.com> +// TRANSLATOR: 2021 Chan Chilung <eason066(a)gmail.com> LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL @@ -11,10 +11,10 @@ MENU IDR_MENU_SCIENTIFIC_1 FONT 9, "新細明體", 0, 0, 0x1 BEGIN GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20 - CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10 - CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10 - CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10 - CONTROL "Bin", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10 + AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10 + AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10 + AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10 + AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10 GROUPBOX "", IDC_STATIC, 5, 34, 84, 20 CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10 CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10 @@ -131,17 +131,13 @@ BEGIN PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP GROUPBOX "", IDC_STATIC, 147, 14, 163, 20 - CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 150, 21, 38, 10 - CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 190, 21, 38, 10 - CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 230, 21, 38, 10 - CONTROL "位元組", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON | - NOT WS_VISIBLE, 270, 21, 38, 10 - CONTROL "角度", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10 - CONTROL "弧度", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10 - CONTROL "梯度", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10 + AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "位元組", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "角度", IDC_RADIO_DEG, 150, 21, 45, 10 + AUTORADIOBUTTON "弧度", IDC_RADIO_RAD, 204, 21, 45, 10 + AUTORADIOBUTTON "梯度", IDC_RADIO_GRAD, 258, 21, 45, 10 PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER |

4 months, 4 weeks

[reactos] 01/01: [USETUP] InstallDirectoryPage(): Pressing ESC erases the whole path line (#7185)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2136409fdac17f3e91ea7… commit 2136409fdac17f3e91ea736594d723d95c740d44 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Jul 25 21:30:50 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Jul 26 22:58:02 2024 +0200 [USETUP] InstallDirectoryPage(): Pressing ESC erases the whole path line (#7185) --- base/setup/usetup/usetup.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 81187430563..f765ce6f180 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -3043,6 +3043,14 @@ InstallDirectoryPage(PINPUT_RECORD Ir) CONSOLE_SetCursorXY(8 + Pos, 11); } } + else if (Ir->Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE) /* ESC */ + { + /* Erase the whole line */ + *InstallDir = UNICODE_NULL; + Pos = Length = 0; + CONSOLE_SetInputTextXY(8, 11, 51, InstallDir); + CONSOLE_SetCursorXY(8 + Pos, 11); + } else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ { CONSOLE_SetCursorType(TRUE, FALSE);

5 months

[reactos] 01/01: [EVENTVWR] IDD_LOGPROPERTIES Add some non-MS-accelerators (#7111)

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4956e249db37e51d1ebb4… commit 4956e249db37e51d1ebb41f6d9f3367a6214e98c Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Fri Jul 26 20:35:03 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Jul 26 20:35:03 2024 +0200 [EVENTVWR] IDD_LOGPROPERTIES Add some non-MS-accelerators (#7111) - Add some non-MS-accelerators into IDD_LOGPROPERTIES for some functionality where our eventvwr does outperform the MS version. We do have some edit-fields selectable, where MS decided to not have them selectable. Can be used for copying out text. - Therefore we considered that it may be beneficial to have accelerators for them as well. - I used &S &C &E &A (instead of Katayamas former &S &C &M &A because the M is already in use in that dlg) where that did fit, and tried to manage the other languages without introducing collisions - I also added a textual disclaimer on how to deal with that for the translators and with the aim to protect that diff to MS also fix some inconsistencies in the length of the IDS_COPY lines for some languages - fix some text cutoff for el-GR,pt-BR, pt-PT at the radio-buttons - improve german Help-accel - add some FIXMEs where some langs had accel collisions, let the native speakers with their native 2k3sp2 handle them later --- base/applications/mscutils/eventvwr/lang/bg-BG.rc | 14 ++++++---- base/applications/mscutils/eventvwr/lang/cs-CZ.rc | 28 +++++++++++-------- base/applications/mscutils/eventvwr/lang/de-DE.rc | 16 +++++++---- base/applications/mscutils/eventvwr/lang/el-GR.rc | 24 +++++++++------- base/applications/mscutils/eventvwr/lang/en-US.rc | 14 ++++++---- base/applications/mscutils/eventvwr/lang/es-ES.rc | 22 +++++++++------ base/applications/mscutils/eventvwr/lang/fr-FR.rc | 14 ++++++---- base/applications/mscutils/eventvwr/lang/he-IL.rc | 14 ++++++---- base/applications/mscutils/eventvwr/lang/it-IT.rc | 14 ++++++---- base/applications/mscutils/eventvwr/lang/ja-JP.rc | 14 ++++++---- base/applications/mscutils/eventvwr/lang/ko-KR.rc | 14 ++++++---- base/applications/mscutils/eventvwr/lang/no-NO.rc | 18 +++++++----- base/applications/mscutils/eventvwr/lang/pl-PL.rc | 18 +++++++----- base/applications/mscutils/eventvwr/lang/pt-BR.rc | 16 +++++++---- base/applications/mscutils/eventvwr/lang/pt-PT.rc | 18 +++++++----- base/applications/mscutils/eventvwr/lang/ro-RO.rc | 14 ++++++---- base/applications/mscutils/eventvwr/lang/ru-RU.rc | 14 ++++++---- base/applications/mscutils/eventvwr/lang/sk-SK.rc | 14 ++++++---- base/applications/mscutils/eventvwr/lang/sq-AL.rc | 14 ++++++---- base/applications/mscutils/eventvwr/lang/sv-SE.rc | 14 ++++++---- base/applications/mscutils/eventvwr/lang/tr-TR.rc | 34 +++++++++++++---------- base/applications/mscutils/eventvwr/lang/uk-UA.rc | 14 ++++++---- base/applications/mscutils/eventvwr/lang/zh-CN.rc | 28 +++++++++++-------- base/applications/mscutils/eventvwr/lang/zh-HK.rc | 32 +++++++++++---------- base/applications/mscutils/eventvwr/lang/zh-TW.rc | 28 +++++++++++-------- 25 files changed, 282 insertions(+), 182 deletions(-) diff --git a/base/applications/mscutils/eventvwr/lang/bg-BG.rc b/base/applications/mscutils/eventvwr/lang/bg-BG.rc index 486d947561f..26b7c2e4040 100644 --- a/base/applications/mscutils/eventvwr/lang/bg-BG.rc +++ b/base/applications/mscutils/eventvwr/lang/bg-BG.rc @@ -122,13 +122,16 @@ BEGIN EDITTEXT IDC_LOGNAME, 67, 23, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP LTEXT "Log &file:", IDC_STATIC, 7, 41, 60, 8 EDITTEXT IDC_LOGFILE, 67, 39, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - LTEXT "Size:", IDC_STATIC, 7, 57, 60, 8 +// The following 4 IDC_STATIC shall have accels in ReactOS, although MS doesn't have accels for them. +// Translation note: First fill out ALL accels that MS has in this dialog for your language, +// and only then as a final step use some remaining unused letters for those 4 controls! + LTEXT "&Size:", IDC_STATIC, 7, 57, 60, 8 EDITTEXT IDC_SIZE_LABEL, 67, 57, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Created:", IDC_STATIC, 7, 69, 60, 8 + LTEXT "&Created:", IDC_STATIC, 7, 69, 60, 8 EDITTEXT IDC_CREATED_LABEL, 67, 69, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Modified:", IDC_STATIC, 7, 81, 60, 8 + LTEXT "Modifi&ed:", IDC_STATIC, 7, 81, 60, 8 EDITTEXT IDC_MODIFIED_LABEL, 67, 81, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Accessed:", IDC_STATIC, 7, 93, 60, 8 + LTEXT "&Accessed:", IDC_STATIC, 7, 93, 60, 8 EDITTEXT IDC_ACCESSED_LABEL, 67, 93, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Log size", IDC_STATIC, 7, 106, 238, 99 LTEXT "&Maximum log size:", IDC_STATIC, 17, 122, 58, 8 @@ -216,7 +219,8 @@ END STRINGTABLE BEGIN - IDS_COPY "Event Type: %s\r\n\ + IDS_COPY "\ +Event Type: %s\r\n\ Event Source: %s\r\n\ Event Category: %s\r\n\ Event ID: %s\r\n\ diff --git a/base/applications/mscutils/eventvwr/lang/cs-CZ.rc b/base/applications/mscutils/eventvwr/lang/cs-CZ.rc index dcc3c5ad3a2..cbdc122be44 100644 --- a/base/applications/mscutils/eventvwr/lang/cs-CZ.rc +++ b/base/applications/mscutils/eventvwr/lang/cs-CZ.rc @@ -11,24 +11,24 @@ IDM_EVENTVWR MENU BEGIN POPUP "&Protokol" BEGIN - MENUITEM "&Otevřít...", IDM_OPEN_EVENTLOG - MENUITEM "Uložit &Protokol jako...", IDM_SAVE_EVENTLOG + MENUITEM "&Otevřít...", IDM_OPEN_EVENTLOG//FIXME: accel collision &O + MENUITEM "Uložit &Protokol jako...", IDM_SAVE_EVENTLOG//FIXME: accel collision &P MENUITEM "&Zavřít", IDM_CLOSE_EVENTLOG MENUITEM SEPARATOR - MENUITEM "&Odstranit události", IDM_CLEAR_EVENTS - MENUITEM "&Přejmenovat\tF2", IDM_RENAME_EVENTLOG + MENUITEM "&Odstranit události", IDM_CLEAR_EVENTS//FIXME: accel collision &O + MENUITEM "&Přejmenovat\tF2", IDM_RENAME_EVENTLOG//FIXME: accel collision &P MENUITEM "Nastavení protokolování...", IDM_EVENTLOG_SETTINGS MENUITEM SEPARATOR MENUITEM "&Konec", IDM_EXIT END POPUP "&Zobrazit" BEGIN - MENUITEM "&Od nejnovějšího", IDM_LIST_NEWEST + MENUITEM "&Od nejnovějšího", IDM_LIST_NEWEST//FIXME: accel collision &O MENUITEM "Od &nejstaršího", IDM_LIST_OLDEST MENUITEM SEPARATOR MENUITEM "&Podrobnosti...\tEnter", IDM_EVENT_DETAILS MENUITEM SEPARATOR - MENUITEM "&Obnovit\tF5", IDM_REFRESH + MENUITEM "&Obnovit\tF5", IDM_REFRESH//FIXME: accel collision &O END POPUP "&Možnosti" BEGIN @@ -122,13 +122,16 @@ BEGIN EDITTEXT IDC_LOGNAME, 67, 23, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP LTEXT "Soubor &protokolu:", IDC_STATIC, 7, 41, 60, 8//FIXME: accelerator collision &P EDITTEXT IDC_LOGFILE, 67, 39, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - LTEXT "Velikost:", IDC_STATIC, 7, 57, 60, 8 +// The following 4 IDC_STATIC shall have accels in ReactOS, although MS doesn't have accels for them. +// Translation note: First fill out ALL accels that MS has in this dialog for your language, +// and only then as a final step use some remaining unused letters for those 4 controls! + LTEXT "Veliko&st:", IDC_STATIC, 7, 57, 60, 8 EDITTEXT IDC_SIZE_LABEL, 67, 57, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Vytvořeno:", IDC_STATIC, 7, 69, 60, 8 + LTEXT "&Vytvořeno:", IDC_STATIC, 7, 69, 60, 8 EDITTEXT IDC_CREATED_LABEL, 67, 69, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Změněno:", IDC_STATIC, 7, 81, 60, 8 + LTEXT "Změněno:", IDC_STATIC, 7, 81, 60, 8//FIXME: add accel EDITTEXT IDC_MODIFIED_LABEL, 67, 81, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Poslední přístup:", IDC_STATIC, 7, 93, 60, 8 + LTEXT "Posle&dní přístup:", IDC_STATIC, 7, 93, 60, 8 EDITTEXT IDC_ACCESSED_LABEL, 67, 93, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Velikost výpisu", IDC_STATIC, 7, 106, 238, 99 LTEXT "&Maximální velikost:", IDC_STATIC, 17, 122, 58, 8 @@ -216,7 +219,8 @@ END STRINGTABLE BEGIN - IDS_COPY "Typ události: %s\r\n\ + IDS_COPY "\ +Typ: %s\r\n\ Zdroj: %s\r\n\ Kategorie: %s\r\n\ ID: %s\r\n\ @@ -224,7 +228,7 @@ Datum: %s\r\n\ Čas: %s\r\n\ Uživatel: %s\r\n\ Počítač: %s\r\n\ -Popis: \r\n%s" +Popis:\r\n%s" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/lang/de-DE.rc b/base/applications/mscutils/eventvwr/lang/de-DE.rc index 105a1159fa0..acb061a9078 100644 --- a/base/applications/mscutils/eventvwr/lang/de-DE.rc +++ b/base/applications/mscutils/eventvwr/lang/de-DE.rc @@ -40,7 +40,7 @@ BEGIN END POPUP "&Hilfe" BEGIN - MENUITEM "H&ilfe", IDM_HELP + MENUITEM "&Hilfe", IDM_HELP MENUITEM SEPARATOR MENUITEM "Ü&ber", IDM_ABOUT END @@ -123,13 +123,16 @@ BEGIN EDITTEXT IDC_LOGNAME, 67, 23, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP LTEXT "&Dateiname:", IDC_STATIC, 7, 41, 60, 8 EDITTEXT IDC_LOGFILE, 67, 39, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - LTEXT "Größe:", IDC_STATIC, 7, 57, 60, 8 +// The following 4 IDC_STATIC shall have accels in ReactOS, although MS doesn't have accels for them. +// Translation note: First fill out ALL accels that MS has in this dialog for your language, +// and only then as a final step use some remaining unused letters for those 4 controls! + LTEXT "Gr&öße:", IDC_STATIC, 7, 57, 60, 8 EDITTEXT IDC_SIZE_LABEL, 67, 57, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Erstellt:", IDC_STATIC, 7, 69, 60, 8 + LTEXT "Er&stellt:", IDC_STATIC, 7, 69, 60, 8 EDITTEXT IDC_CREATED_LABEL, 67, 69, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Geändert:", IDC_STATIC, 7, 81, 60, 8 + LTEXT "Geänder&t:", IDC_STATIC, 7, 81, 60, 8 EDITTEXT IDC_MODIFIED_LABEL, 67, 81, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Letzter Zugriff:", IDC_STATIC, 7, 93, 60, 8 + LTEXT "&Letzter Zugriff:", IDC_STATIC, 7, 93, 60, 8 EDITTEXT IDC_ACCESSED_LABEL, 67, 93, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Protokollgröße", IDC_STATIC, 7, 106, 238, 99 LTEXT "&Maximal:", IDC_STATIC, 17, 122, 58, 8 @@ -217,7 +220,8 @@ END STRINGTABLE BEGIN - IDS_COPY "Typ: %s\r\n\ + IDS_COPY "\ +Typ: %s\r\n\ Quelle: %s\r\n\ Kategorie: %s\r\n\ Ereignis-ID: %s\r\n\ diff --git a/base/applications/mscutils/eventvwr/lang/el-GR.rc b/base/applications/mscutils/eventvwr/lang/el-GR.rc index a73fded1dd0..542531f3b8f 100644 --- a/base/applications/mscutils/eventvwr/lang/el-GR.rc +++ b/base/applications/mscutils/eventvwr/lang/el-GR.rc @@ -21,7 +21,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Έ&ξοδος", IDM_EXIT END - POPUP "&Εμφάνιση" + POPUP "&Εμφάνιση"//FIXME: accelerator collision &E BEGIN MENUITEM "&Newest first", IDM_LIST_NEWEST MENUITEM "&Oldest first", IDM_LIST_OLDEST @@ -30,7 +30,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Ανανέωση\tF5", IDM_REFRESH END - POPUP "&Επιλογές" + POPUP "&Επιλογές"//FIXME: accelerator collision &E BEGIN MENUITEM "Event details &view", IDM_EVENT_DETAILS_VIEW MENUITEM "&Grid lines", IDM_LIST_GRID_LINES @@ -105,9 +105,9 @@ BEGIN LTEXT "&Περιγραφή:", IDC_STATIC, 8, 65, 39, 8 CONTROL "", IDC_EVENTTEXTEDIT, RICHEDIT_CLASS, ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER, 8, 76, 250, 60 - LTEXT "Δ&εδομένα:", IDC_DETAILS_STATIC, 8, 140, 20, 8 - AUTORADIOBUTTON "&Bytes", IDC_BYTESRADIO, 39, 140, 34, 8 - AUTORADIOBUTTON "&Word", IDC_WORDRADIO, 77, 140, 34, 8 + LTEXT "Δ&εδομένα:", IDC_DETAILS_STATIC, 8, 140, 40, 8 + AUTORADIOBUTTON "&Bytes", IDC_BYTESRADIO, 49, 140, 34, 8 + AUTORADIOBUTTON "&Word", IDC_WORDRADIO, 87, 140, 34, 8 EDITTEXT IDC_EVENTDATAEDIT, 8, 150, 250, 60, ES_MULTILINE | ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER END @@ -122,13 +122,16 @@ BEGIN EDITTEXT IDC_LOGNAME, 67, 23, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP LTEXT "Log &file:", IDC_STATIC, 7, 41, 60, 8 EDITTEXT IDC_LOGFILE, 67, 39, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - LTEXT "Size:", IDC_STATIC, 7, 57, 60, 8 +// The following 4 IDC_STATIC shall have accels in ReactOS, although MS doesn't have accels for them. +// Translation note: First fill out ALL accels that MS has in this dialog for your language, +// and only then as a final step use some remaining unused letters for those 4 controls! + LTEXT "&Size:", IDC_STATIC, 7, 57, 60, 8 EDITTEXT IDC_SIZE_LABEL, 67, 57, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Created:", IDC_STATIC, 7, 69, 60, 8 + LTEXT "&Created:", IDC_STATIC, 7, 69, 60, 8 EDITTEXT IDC_CREATED_LABEL, 67, 69, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Modified:", IDC_STATIC, 7, 81, 60, 8 + LTEXT "Modifi&ed:", IDC_STATIC, 7, 81, 60, 8 EDITTEXT IDC_MODIFIED_LABEL, 67, 81, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Accessed:", IDC_STATIC, 7, 93, 60, 8 + LTEXT "&Accessed:", IDC_STATIC, 7, 93, 60, 8 EDITTEXT IDC_ACCESSED_LABEL, 67, 93, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Log size", IDC_STATIC, 7, 106, 238, 99 LTEXT "&Maximum log size:", IDC_STATIC, 17, 122, 58, 8 @@ -216,7 +219,8 @@ END STRINGTABLE BEGIN - IDS_COPY "Event Type: %s\r\n\ + IDS_COPY "\ +Event Type: %s\r\n\ Event Source: %s\r\n\ Event Category: %s\r\n\ Event ID: %s\r\n\ diff --git a/base/applications/mscutils/eventvwr/lang/en-US.rc b/base/applications/mscutils/eventvwr/lang/en-US.rc index 5009273c1f6..917c26a60b0 100644 --- a/base/applications/mscutils/eventvwr/lang/en-US.rc +++ b/base/applications/mscutils/eventvwr/lang/en-US.rc @@ -124,13 +124,16 @@ BEGIN EDITTEXT IDC_LOGNAME, 67, 23, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP LTEXT "Log &file:", IDC_STATIC, 7, 41, 60, 8 EDITTEXT IDC_LOGFILE, 67, 39, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - LTEXT "Size:", IDC_STATIC, 7, 57, 60, 8 +// The following 4 IDC_STATIC shall have accels in ReactOS, although MS doesn't have accels for them. +// Translation note: First fill out ALL accels that MS has in this dialog for your language, +// and only then as a final step use some remaining unused letters for those 4 controls! + LTEXT "&Size:", IDC_STATIC, 7, 57, 60, 8 EDITTEXT IDC_SIZE_LABEL, 67, 57, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Created:", IDC_STATIC, 7, 69, 60, 8 + LTEXT "&Created:", IDC_STATIC, 7, 69, 60, 8 EDITTEXT IDC_CREATED_LABEL, 67, 69, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Modified:", IDC_STATIC, 7, 81, 60, 8 + LTEXT "Modifi&ed:", IDC_STATIC, 7, 81, 60, 8 EDITTEXT IDC_MODIFIED_LABEL, 67, 81, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Accessed:", IDC_STATIC, 7, 93, 60, 8 + LTEXT "&Accessed:", IDC_STATIC, 7, 93, 60, 8 EDITTEXT IDC_ACCESSED_LABEL, 67, 93, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Log size", IDC_STATIC, 7, 106, 238, 99 LTEXT "&Maximum log size:", IDC_STATIC, 17, 122, 58, 8 @@ -218,7 +221,8 @@ END STRINGTABLE BEGIN - IDS_COPY "Event Type: %s\r\n\ + IDS_COPY "\ +Event Type: %s\r\n\ Event Source: %s\r\n\ Event Category: %s\r\n\ Event ID: %s\r\n\ diff --git a/base/applications/mscutils/eventvwr/lang/es-ES.rc b/base/applications/mscutils/eventvwr/lang/es-ES.rc index c8d6cad6f1b..494632a8589 100644 --- a/base/applications/mscutils/eventvwr/lang/es-ES.rc +++ b/base/applications/mscutils/eventvwr/lang/es-ES.rc @@ -15,11 +15,11 @@ BEGIN POPUP "&Registros" BEGIN MENUITEM "&Abrir...", IDM_OPEN_EVENTLOG//FIXME: accelerator collision &A - MENUITEM "Guardar &registros de Eventos como...", IDM_SAVE_EVENTLOG + MENUITEM "Guardar &registros de Eventos como...", IDM_SAVE_EVENTLOG//FIXME: accelerator collision &R MENUITEM "&Cerrar", IDM_CLOSE_EVENTLOG MENUITEM SEPARATOR MENUITEM "&Borrar todos los eventos", IDM_CLEAR_EVENTS - MENUITEM "&Renombrar\tF2", IDM_RENAME_EVENTLOG + MENUITEM "&Renombrar\tF2", IDM_RENAME_EVENTLOG//FIXME: accelerator collision &R MENUITEM "C&onfiguración del diario...", IDM_EVENTLOG_SETTINGS MENUITEM SEPARATOR MENUITEM "S&alir", IDM_EXIT//FIXME: accelerator collision &A @@ -123,15 +123,18 @@ BEGIN EDITTEXT IDC_DISPLAYNAME, 67, 7, 178, 12, ES_LEFT | ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP LTEXT "Nombre del &Log:", IDC_STATIC, 7, 25, 60, 8 EDITTEXT IDC_LOGNAME, 67, 23, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - LTEXT "&Archivo del Log:", IDC_STATIC, 7, 41, 60, 8 + LTEXT "&Archivo del Log:", IDC_STATIC, 7, 41, 60, 8//FIXME: accelerator collision &A EDITTEXT IDC_LOGFILE, 67, 39, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - LTEXT "Tamaño:", IDC_STATIC, 7, 57, 60, 8 +// The following 4 IDC_STATIC shall have accels in ReactOS, although MS doesn't have accels for them. +// Translation note: First fill out ALL accels that MS has in this dialog for your language, +// and only then as a final step use some remaining unused letters for those 4 controls! + LTEXT "Tamañ&o:", IDC_STATIC, 7, 57, 60, 8 EDITTEXT IDC_SIZE_LABEL, 67, 57, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Creado:", IDC_STATIC, 7, 69, 60, 8 + LTEXT "&Creado:", IDC_STATIC, 7, 69, 60, 8 EDITTEXT IDC_CREATED_LABEL, 67, 69, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Modificado:", IDC_STATIC, 7, 81, 60, 8 + LTEXT "&Modificado:", IDC_STATIC, 7, 81, 60, 8 EDITTEXT IDC_MODIFIED_LABEL, 67, 81, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Ult. acceso:", IDC_STATIC, 7, 93, 60, 8 + LTEXT "&Ult. acceso:", IDC_STATIC, 7, 93, 60, 8 EDITTEXT IDC_ACCESSED_LABEL, 67, 93, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Tamaño del Log", IDC_STATIC, 7, 106, 238, 99 LTEXT "&Tamaño máximo del log:", IDC_STATIC, 17, 122, 58, 8 @@ -148,7 +151,7 @@ BEGIN UDS_AUTOBUDDY | UDS_ARROWKEYS, 157, 165, 10, 14 LTEXT "días", IDC_STATIC, 162, 168, 20, 8 PUSHBUTTON "&Restaurar configuración", IDC_RESTOREDEFAULTS, 166, 183, 70, 14 - AUTOCHECKBOX "Usando una conexión de b&aja velocidad", IDC_LOW_SPEED_CONNECTION, 7, 217, 167, 10 + AUTOCHECKBOX "Usando una conexión de b&aja velocidad", IDC_LOW_SPEED_CONNECTION, 7, 217, 167, 10//FIXME: accelerator collision &A PUSHBUTTON "&Borrar Log", ID_CLEARLOG, 195, 213, 50, 14 END @@ -219,7 +222,8 @@ END STRINGTABLE BEGIN - IDS_COPY "Tipo de evento: %s\r\n\ + IDS_COPY "\ +Tipo de evento: %s\r\n\ Fuente del evento: %s\r\n\ Categ. del evento: %s\r\n\ ID del evento: %s\r\n\ diff --git a/base/applications/mscutils/eventvwr/lang/fr-FR.rc b/base/applications/mscutils/eventvwr/lang/fr-FR.rc index 34e9966c23c..18a0cf12254 100644 --- a/base/applications/mscutils/eventvwr/lang/fr-FR.rc +++ b/base/applications/mscutils/eventvwr/lang/fr-FR.rc @@ -123,13 +123,16 @@ BEGIN EDITTEXT IDC_LOGNAME, 67, 23, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP LTEXT "&Fichier journal :", IDC_STATIC, 7, 41, 60, 8 EDITTEXT IDC_LOGFILE, 67, 39, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - LTEXT "Taille :", IDC_STATIC, 7, 57, 60, 8 +// The following 4 IDC_STATIC shall have accels in ReactOS, although MS doesn't have accels for them. +// Translation note: First fill out ALL accels that MS has in this dialog for your language, +// and only then as a final step use some remaining unused letters for those 4 controls! + LTEXT "&Taille :", IDC_STATIC, 7, 57, 60, 8 EDITTEXT IDC_SIZE_LABEL, 67, 57, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Créé le :", IDC_STATIC, 7, 69, 60, 8 + LTEXT "&Créé le :", IDC_STATIC, 7, 69, 60, 8 EDITTEXT IDC_CREATED_LABEL, 67, 69, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Modifié le :", IDC_STATIC, 7, 81, 60, 8 + LTEXT "M&odifié le :", IDC_STATIC, 7, 81, 60, 8 EDITTEXT IDC_MODIFIED_LABEL, 67, 81, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Dernier accès le :", IDC_STATIC, 7, 93, 60, 8 + LTEXT "De&rnier accès le :", IDC_STATIC, 7, 93, 60, 8 EDITTEXT IDC_ACCESSED_LABEL, 67, 93, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Taille de journal", IDC_STATIC, 7, 106, 238, 99 LTEXT "Taille &maximale du journal :", IDC_STATIC, 17, 122, 88, 8 @@ -217,7 +220,8 @@ END STRINGTABLE BEGIN - IDS_COPY "Type d'événement : %s\r\n\ + IDS_COPY "\ +Type d'événement : %s\r\n\ Source de l'événement : %s\r\n\ Catégorie de l'événement : %s\r\n\ ID de l'événement : %s\r\n\ diff --git a/base/applications/mscutils/eventvwr/lang/he-IL.rc b/base/applications/mscutils/eventvwr/lang/he-IL.rc index bb2833f717f..ac4b5e6a82e 100644 --- a/base/applications/mscutils/eventvwr/lang/he-IL.rc +++ b/base/applications/mscutils/eventvwr/lang/he-IL.rc @@ -122,13 +122,16 @@ BEGIN EDITTEXT IDC_LOGNAME, 67, 23, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP LTEXT "Log &file:", IDC_STATIC, 7, 41, 60, 8 EDITTEXT IDC_LOGFILE, 67, 39, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - LTEXT "Size:", IDC_STATIC, 7, 57, 60, 8 +// The following 4 IDC_STATIC shall have accels in ReactOS, although MS doesn't have accels for them. +// Translation note: First fill out ALL accels that MS has in this dialog for your language, +// and only then as a final step use some remaining unused letters for those 4 controls! + LTEXT "&Size:", IDC_STATIC, 7, 57, 60, 8 EDITTEXT IDC_SIZE_LABEL, 67, 57, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Created:", IDC_STATIC, 7, 69, 60, 8 + LTEXT "&Created:", IDC_STATIC, 7, 69, 60, 8 EDITTEXT IDC_CREATED_LABEL, 67, 69, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Modified:", IDC_STATIC, 7, 81, 60, 8 + LTEXT "Modifi&ed:", IDC_STATIC, 7, 81, 60, 8 EDITTEXT IDC_MODIFIED_LABEL, 67, 81, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Accessed:", IDC_STATIC, 7, 93, 60, 8 + LTEXT "&Accessed:", IDC_STATIC, 7, 93, 60, 8 EDITTEXT IDC_ACCESSED_LABEL, 67, 93, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Log size", IDC_STATIC, 7, 106, 238, 99 LTEXT "&Maximum log size:", IDC_STATIC, 17, 122, 58, 8 @@ -216,7 +219,8 @@ END STRINGTABLE BEGIN - IDS_COPY "Event Type: %s\r\n\ + IDS_COPY "\ +Event Type: %s\r\n\ Event Source: %s\r\n\ Event Category: %s\r\n\ Event ID: %s\r\n\ diff --git a/base/applications/mscutils/eventvwr/lang/it-IT.rc b/base/applications/mscutils/eventvwr/lang/it-IT.rc index 99feb0253f5..e2c6d3605fc 100644 --- a/base/applications/mscutils/eventvwr/lang/it-IT.rc +++ b/base/applications/mscutils/eventvwr/lang/it-IT.rc @@ -123,13 +123,16 @@ BEGIN EDITTEXT IDC_LOGNAME, 67, 23, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP LTEXT "Log &file:", IDC_STATIC, 7, 41, 60, 8 EDITTEXT IDC_LOGFILE, 67, 39, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - LTEXT "Size:", IDC_STATIC, 7, 57, 60, 8 +// The following 4 IDC_STATIC shall have accels in ReactOS, although MS doesn't have accels for them. +// Translation note: First fill out ALL accels that MS has in this dialog for your language, +// and only then as a final step use some remaining unused letters for those 4 controls! + LTEXT "&Size:", IDC_STATIC, 7, 57, 60, 8 EDITTEXT IDC_SIZE_LABEL, 67, 57, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Created:", IDC_STATIC, 7, 69, 60, 8 + LTEXT "&Created:", IDC_STATIC, 7, 69, 60, 8 EDITTEXT IDC_CREATED_LABEL, 67, 69, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Modified:", IDC_STATIC, 7, 81, 60, 8 + LTEXT "Modifi&ed:", IDC_STATIC, 7, 81, 60, 8 EDITTEXT IDC_MODIFIED_LABEL, 67, 81, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Accessed:", IDC_STATIC, 7, 93, 60, 8 + LTEXT "&Accessed:", IDC_STATIC, 7, 93, 60, 8 EDITTEXT IDC_ACCESSED_LABEL, 67, 93, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Log size", IDC_STATIC, 7, 106, 238, 99 LTEXT "&Maximum log size:", IDC_STATIC, 17, 122, 58, 8 @@ -217,7 +220,8 @@ END STRINGTABLE BEGIN - IDS_COPY "Event Type: %s\r\n\ + IDS_COPY "\ +Event Type: %s\r\n\ Event Source: %s\r\n\ Event Category: %s\r\n\ Event ID: %s\r\n\ diff --git a/base/applications/mscutils/eventvwr/lang/ja-JP.rc b/base/applications/mscutils/eventvwr/lang/ja-JP.rc index c0ea5094853..b2ce3e869eb 100644 --- a/base/applications/mscutils/eventvwr/lang/ja-JP.rc +++ b/base/applications/mscutils/eventvwr/lang/ja-JP.rc @@ -123,13 +123,16 @@ BEGIN EDITTEXT IDC_LOGNAME, 67, 23, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP LTEXT "ログファイル(&F):", IDC_STATIC, 7, 41, 60, 8 EDITTEXT IDC_LOGFILE, 67, 39, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - LTEXT "サイズ:", IDC_STATIC, 7, 57, 60, 8 +// The following 4 IDC_STATIC shall have accels in ReactOS, although MS doesn't have accels for them. +// Translation note: First fill out ALL accels that MS has in this dialog for your language, +// and only then as a final step use some remaining unused letters for those 4 controls! + LTEXT "サイズ(&S):", IDC_STATIC, 7, 57, 60, 8 EDITTEXT IDC_SIZE_LABEL, 67, 57, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "作成日時:", IDC_STATIC, 7, 69, 60, 8 + LTEXT "作成日時(&C):", IDC_STATIC, 7, 69, 60, 8 EDITTEXT IDC_CREATED_LABEL, 67, 69, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "変更日時:", IDC_STATIC, 7, 81, 60, 8 + LTEXT "変更日時(&E):", IDC_STATIC, 7, 81, 60, 8 EDITTEXT IDC_MODIFIED_LABEL, 67, 81, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "アクセス日時:", IDC_STATIC, 7, 93, 60, 8 + LTEXT "アクセス日時(&A):", IDC_STATIC, 7, 93, 60, 8 EDITTEXT IDC_ACCESSED_LABEL, 67, 93, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "ログサイズ", IDC_STATIC, 7, 106, 238, 99 LTEXT "最大ログサイズ(&M):", IDC_STATIC, 17, 122, 58, 8 @@ -217,7 +220,8 @@ END STRINGTABLE BEGIN - IDS_COPY "イベントの種類: %s\r\n\ + IDS_COPY "\ +イベントの種類: %s\r\n\ イベントのソース: %s\r\n\ イベントのカテゴリ: %s\r\n\ イベント ID: %s\r\n\ diff --git a/base/applications/mscutils/eventvwr/lang/ko-KR.rc b/base/applications/mscutils/eventvwr/lang/ko-KR.rc index 7bd0c2e29b2..867322cf33e 100644 --- a/base/applications/mscutils/eventvwr/lang/ko-KR.rc +++ b/base/applications/mscutils/eventvwr/lang/ko-KR.rc @@ -122,13 +122,16 @@ BEGIN EDITTEXT IDC_LOGNAME, 67, 23, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP LTEXT "Log &file:", IDC_STATIC, 7, 41, 60, 8 EDITTEXT IDC_LOGFILE, 67, 39, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - LTEXT "Size:", IDC_STATIC, 7, 57, 60, 8 +// The following 4 IDC_STATIC shall have accels in ReactOS, although MS doesn't have accels for them. +// Translation note: First fill out ALL accels that MS has in this dialog for your language, +// and only then as a final step use some remaining unused letters for those 4 controls! + LTEXT "&Size:", IDC_STATIC, 7, 57, 60, 8 EDITTEXT IDC_SIZE_LABEL, 67, 57, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Created:", IDC_STATIC, 7, 69, 60, 8 + LTEXT "&Created:", IDC_STATIC, 7, 69, 60, 8 EDITTEXT IDC_CREATED_LABEL, 67, 69, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Modified:", IDC_STATIC, 7, 81, 60, 8 + LTEXT "Modifi&ed:", IDC_STATIC, 7, 81, 60, 8 EDITTEXT IDC_MODIFIED_LABEL, 67, 81, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Accessed:", IDC_STATIC, 7, 93, 60, 8 + LTEXT "&Accessed:", IDC_STATIC, 7, 93, 60, 8 EDITTEXT IDC_ACCESSED_LABEL, 67, 93, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Log size", IDC_STATIC, 7, 106, 238, 99 LTEXT "&Maximum log size:", IDC_STATIC, 17, 122, 58, 8 @@ -216,7 +219,8 @@ END STRINGTABLE BEGIN - IDS_COPY "Event Type: %s\r\n\ + IDS_COPY "\ +Event Type: %s\r\n\ Event Source: %s\r\n\ Event Category: %s\r\n\ Event ID: %s\r\n\ diff --git a/base/applications/mscutils/eventvwr/lang/no-NO.rc b/base/applications/mscutils/eventvwr/lang/no-NO.rc index 6908fa82d40..e74b7300f55 100644 --- a/base/applications/mscutils/eventvwr/lang/no-NO.rc +++ b/base/applications/mscutils/eventvwr/lang/no-NO.rc @@ -30,14 +30,14 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Oppdater\tF5", IDM_REFRESH//FIXME: accelerator collision &O END - POPUP "&Handling"//FIXME: accelerator collision &H + POPUP "&Handling"//FIXME: accelerator collision &H. I would recommend to change the one for Handling, and not the one for Help BEGIN MENUITEM "Event details &view", IDM_EVENT_DETAILS_VIEW MENUITEM "&Grid lines", IDM_LIST_GRID_LINES MENUITEM SEPARATOR MENUITEM "&Save settings on exit", IDM_SAVE_SETTINGS END - POPUP "&Hjelp"//FIXME: accelerator collision &H + POPUP "&Hjelp"//FIXME: accelerator collision &H. I would recommend to change the one for Handling, and not the one for Help BEGIN MENUITEM "Hj&elp", IDM_HELP MENUITEM SEPARATOR @@ -122,13 +122,16 @@ BEGIN EDITTEXT IDC_LOGNAME, 67, 23, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP LTEXT "Log &file:", IDC_STATIC, 7, 41, 60, 8 EDITTEXT IDC_LOGFILE, 67, 39, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - LTEXT "Size:", IDC_STATIC, 7, 57, 60, 8 +// The following 4 IDC_STATIC shall have accels in ReactOS, although MS doesn't have accels for them. +// Translation note: First fill out ALL accels that MS has in this dialog for your language, +// and only then as a final step use some remaining unused letters for those 4 controls! + LTEXT "&Size:", IDC_STATIC, 7, 57, 60, 8 EDITTEXT IDC_SIZE_LABEL, 67, 57, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Created:", IDC_STATIC, 7, 69, 60, 8 + LTEXT "&Created:", IDC_STATIC, 7, 69, 60, 8 EDITTEXT IDC_CREATED_LABEL, 67, 69, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Modified:", IDC_STATIC, 7, 81, 60, 8 + LTEXT "Modifi&ed:", IDC_STATIC, 7, 81, 60, 8 EDITTEXT IDC_MODIFIED_LABEL, 67, 81, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Accessed:", IDC_STATIC, 7, 93, 60, 8 + LTEXT "&Accessed:", IDC_STATIC, 7, 93, 60, 8 EDITTEXT IDC_ACCESSED_LABEL, 67, 93, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Log size", IDC_STATIC, 7, 106, 238, 99 LTEXT "&Maximum log size:", IDC_STATIC, 17, 122, 58, 8 @@ -216,7 +219,8 @@ END STRINGTABLE BEGIN - IDS_COPY "Event Type: %s\r\n\ + IDS_COPY "\ +Event Type: %s\r\n\ Event Source: %s\r\n\ Event Category: %s\r\n\ Event ID: %s\r\n\ diff --git a/base/applications/mscutils/eventvwr/lang/pl-PL.rc b/base/applications/mscutils/eventvwr/lang/pl-PL.rc index 8b26b921058..7d3dd9d957a 100644 --- a/base/applications/mscutils/eventvwr/lang/pl-PL.rc +++ b/base/applications/mscutils/eventvwr/lang/pl-PL.rc @@ -16,10 +16,10 @@ BEGIN BEGIN MENUITEM "&Otwórz...", IDM_OPEN_EVENTLOG MENUITEM "Zapisz dziennik zdarzeń jako...", IDM_SAVE_EVENTLOG//FIXME: add accelerator. en-US uses &E and could be used here as well - MENUITEM "&Zamknij", IDM_CLOSE_EVENTLOG + MENUITEM "&Zamknij", IDM_CLOSE_EVENTLOG//FIXME: accelerator collision &Z MENUITEM SEPARATOR MENUITEM "W&yczyść wszystkie zdarzenia", IDM_CLEAR_EVENTS - MENUITEM "&Zmień nazwę\tF2", IDM_RENAME_EVENTLOG + MENUITEM "&Zmień nazwę\tF2", IDM_RENAME_EVENTLOG//FIXME: accelerator collision &Z MENUITEM "Wł&aściwości dziennika...", IDM_EVENTLOG_SETTINGS MENUITEM SEPARATOR MENUITEM "&Wyjście", IDM_EXIT @@ -125,13 +125,16 @@ BEGIN EDITTEXT IDC_LOGNAME, 67, 23, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP LTEXT "Plik &dziennika:", IDC_STATIC, 7, 41, 60, 8 EDITTEXT IDC_LOGFILE, 67, 39, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - LTEXT "Rozmiar:", IDC_STATIC, 7, 57, 60, 8 +// The following 4 IDC_STATIC shall have accels in ReactOS, although MS doesn't have accels for them. +// Translation note: First fill out ALL accels that MS has in this dialog for your language, +// and only then as a final step use some remaining unused letters for those 4 controls! + LTEXT "&Rozmiar:", IDC_STATIC, 7, 57, 60, 8 EDITTEXT IDC_SIZE_LABEL, 67, 57, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Utworzony:", IDC_STATIC, 7, 69, 60, 8 + LTEXT "U&tworzony:", IDC_STATIC, 7, 69, 60, 8 EDITTEXT IDC_CREATED_LABEL, 67, 69, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Zmodyfikowany:", IDC_STATIC, 7, 81, 60, 8 + LTEXT "Zmodyfi&kowany:", IDC_STATIC, 7, 81, 60, 8 EDITTEXT IDC_MODIFIED_LABEL, 67, 81, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Ostatnio używany:", IDC_STATIC, 7, 93, 80, 8 + LTEXT "&Ostatnio używany:", IDC_STATIC, 7, 93, 80, 8 EDITTEXT IDC_ACCESSED_LABEL, 67, 93, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Rozmiar dziennika", IDC_STATIC, 7, 106, 238, 99 LTEXT "&Maksymalny rozmiar dziennika:", IDC_STATIC, 17, 122, 58, 8 @@ -219,7 +222,8 @@ END STRINGTABLE BEGIN - IDS_COPY "Typ zdarzenia: %s\r\n\ + IDS_COPY "\ +Typ zdarzenia: %s\r\n\ Źródło zdarzenia: %s\r\n\ Kategoria zdarzenia: %s\r\n\ Idnetyfikator Zdarzenia: %s\r\n\ diff --git a/base/applications/mscutils/eventvwr/lang/pt-BR.rc b/base/applications/mscutils/eventvwr/lang/pt-BR.rc index d432c236c51..9302e01e9f4 100644 --- a/base/applications/mscutils/eventvwr/lang/pt-BR.rc +++ b/base/applications/mscutils/eventvwr/lang/pt-BR.rc @@ -105,7 +105,7 @@ BEGIN LTEXT "&Descrição:", IDC_STATIC, 8, 65, 39, 8 CONTROL "", IDC_EVENTTEXTEDIT, RICHEDIT_CLASS, ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER, 8, 76, 250, 60 - LTEXT "Dad&os:", IDC_DETAILS_STATIC, 8, 140, 20, 8 + LTEXT "Dad&os:", IDC_DETAILS_STATIC, 8, 140, 25, 8 AUTORADIOBUTTON "&Bytes", IDC_BYTESRADIO, 39, 140, 34, 8 AUTORADIOBUTTON "&Word", IDC_WORDRADIO, 77, 140, 34, 8 EDITTEXT IDC_EVENTDATAEDIT, 8, 150, 250, 60, ES_MULTILINE | ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER @@ -122,13 +122,16 @@ BEGIN EDITTEXT IDC_LOGNAME, 67, 23, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP LTEXT "Log &file:", IDC_STATIC, 7, 41, 60, 8 EDITTEXT IDC_LOGFILE, 67, 39, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - LTEXT "Size:", IDC_STATIC, 7, 57, 60, 8 +// The following 4 IDC_STATIC shall have accels in ReactOS, although MS doesn't have accels for them. +// Translation note: First fill out ALL accels that MS has in this dialog for your language, +// and only then as a final step use some remaining unused letters for those 4 controls! + LTEXT "&Size:", IDC_STATIC, 7, 57, 60, 8 EDITTEXT IDC_SIZE_LABEL, 67, 57, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Created:", IDC_STATIC, 7, 69, 60, 8 + LTEXT "&Created:", IDC_STATIC, 7, 69, 60, 8 EDITTEXT IDC_CREATED_LABEL, 67, 69, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Modified:", IDC_STATIC, 7, 81, 60, 8 + LTEXT "Modifi&ed:", IDC_STATIC, 7, 81, 60, 8 EDITTEXT IDC_MODIFIED_LABEL, 67, 81, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Accessed:", IDC_STATIC, 7, 93, 60, 8 + LTEXT "&Accessed:", IDC_STATIC, 7, 93, 60, 8 EDITTEXT IDC_ACCESSED_LABEL, 67, 93, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Log size", IDC_STATIC, 7, 106, 238, 99 LTEXT "&Maximum log size:", IDC_STATIC, 17, 122, 58, 8 @@ -216,7 +219,8 @@ END STRINGTABLE BEGIN - IDS_COPY "Event Type: %s\r\n\ + IDS_COPY "\ +Event Type: %s\r\n\ Event Source: %s\r\n\ Event Category: %s\r\n\ Event ID: %s\r\n\ diff --git a/base/applications/mscutils/eventvwr/lang/pt-PT.rc b/base/applications/mscutils/eventvwr/lang/pt-PT.rc index 5b0e6972445..fd0791aa3e0 100644 --- a/base/applications/mscutils/eventvwr/lang/pt-PT.rc +++ b/base/applications/mscutils/eventvwr/lang/pt-PT.rc @@ -105,7 +105,7 @@ BEGIN LTEXT "&Descrição:", IDC_STATIC, 8, 65, 39, 8 CONTROL "", IDC_EVENTTEXTEDIT, RICHEDIT_CLASS, ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER, 8, 76, 250, 60 - LTEXT "Dad&os:", IDC_DETAILS_STATIC, 8, 140, 20, 8 + LTEXT "Dad&os:", IDC_DETAILS_STATIC, 8, 140, 25, 8 AUTORADIOBUTTON "&Bytes", IDC_BYTESRADIO, 39, 140, 34, 8 AUTORADIOBUTTON "&Word", IDC_WORDRADIO, 77, 140, 34, 8 EDITTEXT IDC_EVENTDATAEDIT, 8, 150, 250, 60, ES_MULTILINE | ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER @@ -122,13 +122,16 @@ BEGIN EDITTEXT IDC_LOGNAME, 67, 23, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP LTEXT "&Ficheiro:", IDC_STATIC, 7, 41, 60, 8 EDITTEXT IDC_LOGFILE, 67, 39, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - LTEXT "Tamanho:", IDC_STATIC, 7, 57, 60, 8 +// The following 4 IDC_STATIC shall have accels in ReactOS, although MS doesn't have accels for them. +// Translation note: First fill out ALL accels that MS has in this dialog for your language, +// and only then as a final step use some remaining unused letters for those 4 controls! + LTEXT "Taman&ho:", IDC_STATIC, 7, 57, 60, 8 EDITTEXT IDC_SIZE_LABEL, 67, 57, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Criado:", IDC_STATIC, 7, 69, 60, 8 + LTEXT "&Criado:", IDC_STATIC, 7, 69, 60, 8 EDITTEXT IDC_CREATED_LABEL, 67, 69, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Modificado:", IDC_STATIC, 7, 81, 60, 8 + LTEXT "&Modificado:", IDC_STATIC, 7, 81, 60, 8 EDITTEXT IDC_MODIFIED_LABEL, 67, 81, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Acedido:", IDC_STATIC, 7, 93, 60, 8 + LTEXT "Ace&dido:", IDC_STATIC, 7, 93, 60, 8 EDITTEXT IDC_ACCESSED_LABEL, 67, 93, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Tamanho do registo", IDC_STATIC, 7, 106, 238, 99 LTEXT "&Tamanho máx. do registo:", IDC_STATIC, 17, 122, 108, 8 @@ -216,8 +219,9 @@ END STRINGTABLE BEGIN - IDS_COPY "Tipo de evento: %s\r\n\ -Origem do evento %s\r\n\ + IDS_COPY "\ +Tipo de evento: %s\r\n\ +Origem do evento: %s\r\n\ Categoria: %s\r\n\ ID do Evento: %s\r\n\ Data: %s\r\n\ diff --git a/base/applications/mscutils/eventvwr/lang/ro-RO.rc b/base/applications/mscutils/eventvwr/lang/ro-RO.rc index d8afc4e3c7e..baa02ec0431 100644 --- a/base/applications/mscutils/eventvwr/lang/ro-RO.rc +++ b/base/applications/mscutils/eventvwr/lang/ro-RO.rc @@ -124,13 +124,16 @@ BEGIN EDITTEXT IDC_LOGNAME, 67, 23, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP LTEXT "Fiși&er de jurnal:", IDC_STATIC, 7, 41, 60, 8 EDITTEXT IDC_LOGFILE, 67, 39, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - LTEXT "Dimensiune:", IDC_STATIC, 7, 57, 60, 8 +// The following 4 IDC_STATIC shall have accels in ReactOS, although MS doesn't have accels for them. +// Translation note: First fill out ALL accels that MS has in this dialog for your language, +// and only then as a final step use some remaining unused letters for those 4 controls! + LTEXT "Dimen&siune:", IDC_STATIC, 7, 57, 60, 8 EDITTEXT IDC_SIZE_LABEL, 67, 57, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Creat:", IDC_STATIC, 7, 69, 60, 8 + LTEXT "Crea&t:", IDC_STATIC, 7, 69, 60, 8 EDITTEXT IDC_CREATED_LABEL, 67, 69, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Modificat:", IDC_STATIC, 7, 81, 60, 8 + LTEXT "&Modificat:", IDC_STATIC, 7, 81, 60, 8 EDITTEXT IDC_MODIFIED_LABEL, 67, 81, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Accesat:", IDC_STATIC, 7, 93, 60, 8 + LTEXT "&Accesat:", IDC_STATIC, 7, 93, 60, 8 EDITTEXT IDC_ACCESSED_LABEL, 67, 93, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Dimensiune jurnal", IDC_STATIC, 7, 106, 238, 99 LTEXT "Dimensiune ma&ximă pentru jurnal:", IDC_STATIC, 17, 122, 58, 8 @@ -218,7 +221,8 @@ END STRINGTABLE BEGIN - IDS_COPY "Tip eveniment: %s\r\n\ + IDS_COPY "\ +Tip eveniment: %s\r\n\ Sursă eveniment: %s\r\n\ Categorie eveniment: %s\r\n\ ID eveniment: %s\r\n\ diff --git a/base/applications/mscutils/eventvwr/lang/ru-RU.rc b/base/applications/mscutils/eventvwr/lang/ru-RU.rc index 496e1cc997a..9d3423bfd66 100644 --- a/base/applications/mscutils/eventvwr/lang/ru-RU.rc +++ b/base/applications/mscutils/eventvwr/lang/ru-RU.rc @@ -126,13 +126,16 @@ BEGIN EDITTEXT IDC_LOGNAME, 67, 23, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP LTEXT "Файл &журнала:", IDC_STATIC, 7, 41, 60, 8 EDITTEXT IDC_LOGFILE, 67, 39, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - LTEXT "Размер:", IDC_STATIC, 7, 57, 60, 8 +// The following 4 IDC_STATIC shall have accels in ReactOS, although MS doesn't have accels for them. +// Translation note: First fill out ALL accels that MS has in this dialog for your language, +// and only then as a final step use some remaining unused letters for those 4 controls! + LTEXT "&Размер:", IDC_STATIC, 7, 57, 60, 8 EDITTEXT IDC_SIZE_LABEL, 67, 57, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Создан:", IDC_STATIC, 7, 69, 60, 8 + LTEXT "&Создан:", IDC_STATIC, 7, 69, 60, 8 EDITTEXT IDC_CREATED_LABEL, 67, 69, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Изменен:", IDC_STATIC, 7, 81, 60, 8 + LTEXT "И&зменен:", IDC_STATIC, 7, 81, 60, 8 EDITTEXT IDC_MODIFIED_LABEL, 67, 81, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Доступ:", IDC_STATIC, 7, 93, 60, 8 + LTEXT "&Доступ:", IDC_STATIC, 7, 93, 60, 8 EDITTEXT IDC_ACCESSED_LABEL, 67, 93, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Размер журнала", IDC_STATIC, 7, 106, 238, 99 LTEXT "&Максимальный размер журнала:", IDC_STATIC, 17, 122, 58, 8 @@ -220,7 +223,8 @@ END STRINGTABLE BEGIN - IDS_COPY "Тип события: %s\r\n\ + IDS_COPY "\ +Тип события: %s\r\n\ Источник события: %s\r\n\ Категория события: %s\r\n\ ID события: %s\r\n\ diff --git a/base/applications/mscutils/eventvwr/lang/sk-SK.rc b/base/applications/mscutils/eventvwr/lang/sk-SK.rc index d5fb6c49b3d..3f6a3fe5bb0 100644 --- a/base/applications/mscutils/eventvwr/lang/sk-SK.rc +++ b/base/applications/mscutils/eventvwr/lang/sk-SK.rc @@ -122,13 +122,16 @@ BEGIN EDITTEXT IDC_LOGNAME, 67, 23, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP LTEXT "Log &file:", IDC_STATIC, 7, 41, 60, 8 EDITTEXT IDC_LOGFILE, 67, 39, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - LTEXT "Size:", IDC_STATIC, 7, 57, 60, 8 +// The following 4 IDC_STATIC shall have accels in ReactOS, although MS doesn't have accels for them. +// Translation note: First fill out ALL accels that MS has in this dialog for your language, +// and only then as a final step use some remaining unused letters for those 4 controls! + LTEXT "&Size:", IDC_STATIC, 7, 57, 60, 8 EDITTEXT IDC_SIZE_LABEL, 67, 57, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Created:", IDC_STATIC, 7, 69, 60, 8 + LTEXT "&Created:", IDC_STATIC, 7, 69, 60, 8 EDITTEXT IDC_CREATED_LABEL, 67, 69, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Modified:", IDC_STATIC, 7, 81, 60, 8 + LTEXT "Modifi&ed:", IDC_STATIC, 7, 81, 60, 8 EDITTEXT IDC_MODIFIED_LABEL, 67, 81, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Accessed:", IDC_STATIC, 7, 93, 60, 8 + LTEXT "&Accessed:", IDC_STATIC, 7, 93, 60, 8 EDITTEXT IDC_ACCESSED_LABEL, 67, 93, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Log size", IDC_STATIC, 7, 106, 238, 99 LTEXT "&Maximum log size:", IDC_STATIC, 17, 122, 58, 8 @@ -216,7 +219,8 @@ END STRINGTABLE BEGIN - IDS_COPY "Event Type: %s\r\n\ + IDS_COPY "\ +Event Type: %s\r\n\ Event Source: %s\r\n\ Event Category: %s\r\n\ Event ID: %s\r\n\ diff --git a/base/applications/mscutils/eventvwr/lang/sq-AL.rc b/base/applications/mscutils/eventvwr/lang/sq-AL.rc index 629b13b2ae7..2a3b1a556b0 100644 --- a/base/applications/mscutils/eventvwr/lang/sq-AL.rc +++ b/base/applications/mscutils/eventvwr/lang/sq-AL.rc @@ -122,13 +122,16 @@ BEGIN EDITTEXT IDC_LOGNAME, 67, 23, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP LTEXT "Log &file:", IDC_STATIC, 7, 41, 60, 8 EDITTEXT IDC_LOGFILE, 67, 39, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - LTEXT "Size:", IDC_STATIC, 7, 57, 60, 8 +// The following 4 IDC_STATIC shall have accels in ReactOS, although MS doesn't have accels for them. +// Translation note: First fill out ALL accels that MS has in this dialog for your language, +// and only then as a final step use some remaining unused letters for those 4 controls! + LTEXT "&Size:", IDC_STATIC, 7, 57, 60, 8 EDITTEXT IDC_SIZE_LABEL, 67, 57, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Created:", IDC_STATIC, 7, 69, 60, 8 + LTEXT "&Created:", IDC_STATIC, 7, 69, 60, 8 EDITTEXT IDC_CREATED_LABEL, 67, 69, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Modified:", IDC_STATIC, 7, 81, 60, 8 + LTEXT "Modifi&ed:", IDC_STATIC, 7, 81, 60, 8 EDITTEXT IDC_MODIFIED_LABEL, 67, 81, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Accessed:", IDC_STATIC, 7, 93, 60, 8 + LTEXT "&Accessed:", IDC_STATIC, 7, 93, 60, 8 EDITTEXT IDC_ACCESSED_LABEL, 67, 93, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Log size", IDC_STATIC, 7, 106, 238, 99 LTEXT "&Maximum log size:", IDC_STATIC, 17, 122, 58, 8 @@ -216,7 +219,8 @@ END STRINGTABLE BEGIN - IDS_COPY "Event Type: %s\r\n\ + IDS_COPY "\ +Event Type: %s\r\n\ Event Source: %s\r\n\ Event Category: %s\r\n\ Event ID: %s\r\n\ diff --git a/base/applications/mscutils/eventvwr/lang/sv-SE.rc b/base/applications/mscutils/eventvwr/lang/sv-SE.rc index d7c1c582a96..d4205142932 100644 --- a/base/applications/mscutils/eventvwr/lang/sv-SE.rc +++ b/base/applications/mscutils/eventvwr/lang/sv-SE.rc @@ -122,13 +122,16 @@ BEGIN EDITTEXT IDC_LOGNAME, 67, 23, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP LTEXT "Log &file:", IDC_STATIC, 7, 41, 60, 8 EDITTEXT IDC_LOGFILE, 67, 39, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - LTEXT "Size:", IDC_STATIC, 7, 57, 60, 8 +// The following 4 IDC_STATIC shall have accels in ReactOS, although MS doesn't have accels for them. +// Translation note: First fill out ALL accels that MS has in this dialog for your language, +// and only then as a final step use some remaining unused letters for those 4 controls! + LTEXT "&Size:", IDC_STATIC, 7, 57, 60, 8 EDITTEXT IDC_SIZE_LABEL, 67, 57, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Created:", IDC_STATIC, 7, 69, 60, 8 + LTEXT "&Created:", IDC_STATIC, 7, 69, 60, 8 EDITTEXT IDC_CREATED_LABEL, 67, 69, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Modified:", IDC_STATIC, 7, 81, 60, 8 + LTEXT "Modifi&ed:", IDC_STATIC, 7, 81, 60, 8 EDITTEXT IDC_MODIFIED_LABEL, 67, 81, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Accessed:", IDC_STATIC, 7, 93, 60, 8 + LTEXT "&Accessed:", IDC_STATIC, 7, 93, 60, 8 EDITTEXT IDC_ACCESSED_LABEL, 67, 93, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Log size", IDC_STATIC, 7, 106, 238, 99 LTEXT "&Maximum log size:", IDC_STATIC, 17, 122, 58, 8 @@ -216,7 +219,8 @@ END STRINGTABLE BEGIN - IDS_COPY "Event Type: %s\r\n\ + IDS_COPY "\ +Event Type: %s\r\n\ Event Source: %s\r\n\ Event Category: %s\r\n\ Event ID: %s\r\n\ diff --git a/base/applications/mscutils/eventvwr/lang/tr-TR.rc b/base/applications/mscutils/eventvwr/lang/tr-TR.rc index 49dd14868ad..e9710e2c39a 100644 --- a/base/applications/mscutils/eventvwr/lang/tr-TR.rc +++ b/base/applications/mscutils/eventvwr/lang/tr-TR.rc @@ -121,15 +121,18 @@ BEGIN EDITTEXT IDC_DISPLAYNAME, 67, 7, 178, 12, ES_LEFT | ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP LTEXT "&Kayıt Adı:", IDC_STATIC, 7, 25, 60, 8 EDITTEXT IDC_LOGNAME, 67, 23, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - LTEXT "K&ayıt Dosyası:", IDC_STATIC, 7, 41, 60, 8 + LTEXT "K&ayıt Dosyası:", IDC_STATIC, 7, 41, 60, 8//FIXME: accelerator collision &A EDITTEXT IDC_LOGFILE, 67, 39, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - LTEXT "Boyut:", IDC_STATIC, 7, 57, 60, 8 +// The following 4 IDC_STATIC shall have accels in ReactOS, although MS doesn't have accels for them. +// Translation note: First fill out ALL accels that MS has in this dialog for your language, +// and only then as a final step use some remaining unused letters for those 4 controls! + LTEXT "&Boyut:", IDC_STATIC, 7, 57, 60, 8 EDITTEXT IDC_SIZE_LABEL, 67, 57, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Oluşturuldu:", IDC_STATIC, 7, 69, 60, 8 + LTEXT "Oluşturuld&u:", IDC_STATIC, 7, 69, 60, 8 EDITTEXT IDC_CREATED_LABEL, 67, 69, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Değiştirildi:", IDC_STATIC, 7, 81, 60, 8 + LTEXT "Değiş&tirildi:", IDC_STATIC, 7, 81, 60, 8 EDITTEXT IDC_MODIFIED_LABEL, 67, 81, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Erişildi:", IDC_STATIC, 7, 93, 60, 8 + LTEXT "E&rişildi:", IDC_STATIC, 7, 93, 60, 8 EDITTEXT IDC_ACCESSED_LABEL, 67, 93, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Günlük Boyutu", IDC_STATIC, 7, 106, 238, 99 LTEXT "&En Büyük Günlük Boyutu:", IDC_STATIC, 17, 122, 58, 8 @@ -145,7 +148,7 @@ BEGIN CONTROL "", IDC_UPDOWN_EVENTS_AGE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS, 157, 165, 10, 14 LTEXT "gün", IDC_STATIC, 162, 168, 20, 8 - PUSHBUTTON "V&arsayılanları Geri Getir", IDC_RESTOREDEFAULTS, 166, 183, 70, 14 + PUSHBUTTON "V&arsayılanları Geri Getir", IDC_RESTOREDEFAULTS, 166, 183, 70, 14//FIXME: accelerator collision &A AUTOCHECKBOX "&Düşük Hızlı Bir Bağlantı Kullan", IDC_LOW_SPEED_CONNECTION, 7, 217, 167, 10 PUSHBUTTON "Ka&yıtları Sil", ID_CLEARLOG, 195, 213, 50, 14 END @@ -172,7 +175,7 @@ BEGIN /* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ IDS_USAGE "ReactOS Olay Göstericisi\n\ \n\ -EventVwr [bilgisayar adı] [/l:<etkinlik günlüğü dosyası>] [/?]\n\ +EventVwr [bilgisayar adı] [/L:<etkinlik günlüğü dosyası>] [/?]\n\ \n\ ""bilgisayar adı"" : Görüntülenecek olayların alınacağı uzak\n\ \tbilgisayarı belirtir. İsim belirtilmezse yerel bilgisayar\n\ @@ -217,14 +220,15 @@ END STRINGTABLE BEGIN - IDS_COPY "Olay Türü: %s\r\n\ -Olay Kaynağı: %s\r\n\ -Olay Kategorisi: %s\r\n\ -Olay Kimliği: %s\r\n\ -Tarih: %s\r\n\ -Saat: %s\r\n\ -Kullanıcı: %s\r\n\ -Bilgisayar: %s\r\n\ + IDS_COPY "\ +Olay Türü: %s\r\n\ +Olay Kaynağı: %s\r\n\ +Olay Kategorisi: %s\r\n\ +Olay Kimliği: %s\r\n\ +Tarih: %s\r\n\ +Saat: %s\r\n\ +Kullanıcı: %s\r\n\ +Bilgisayar: %s\r\n\ Tanım:\r\n%s" END diff --git a/base/applications/mscutils/eventvwr/lang/uk-UA.rc b/base/applications/mscutils/eventvwr/lang/uk-UA.rc index 6c373646133..c50f93892e2 100644 --- a/base/applications/mscutils/eventvwr/lang/uk-UA.rc +++ b/base/applications/mscutils/eventvwr/lang/uk-UA.rc @@ -124,13 +124,16 @@ BEGIN EDITTEXT IDC_LOGNAME, 67, 23, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP LTEXT "Log &file:", IDC_STATIC, 7, 41, 60, 8 EDITTEXT IDC_LOGFILE, 67, 39, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - LTEXT "Size:", IDC_STATIC, 7, 57, 60, 8 +// The following 4 IDC_STATIC shall have accels in ReactOS, although MS doesn't have accels for them. +// Translation note: First fill out ALL accels that MS has in this dialog for your language, +// and only then as a final step use some remaining unused letters for those 4 controls! + LTEXT "&Size:", IDC_STATIC, 7, 57, 60, 8 EDITTEXT IDC_SIZE_LABEL, 67, 57, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Created:", IDC_STATIC, 7, 69, 60, 8 + LTEXT "&Created:", IDC_STATIC, 7, 69, 60, 8 EDITTEXT IDC_CREATED_LABEL, 67, 69, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Modified:", IDC_STATIC, 7, 81, 60, 8 + LTEXT "Modifi&ed:", IDC_STATIC, 7, 81, 60, 8 EDITTEXT IDC_MODIFIED_LABEL, 67, 81, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Accessed:", IDC_STATIC, 7, 93, 60, 8 + LTEXT "&Accessed:", IDC_STATIC, 7, 93, 60, 8 EDITTEXT IDC_ACCESSED_LABEL, 67, 93, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Log size", IDC_STATIC, 7, 106, 238, 99 LTEXT "&Maximum log size:", IDC_STATIC, 17, 122, 58, 8 @@ -218,7 +221,8 @@ END STRINGTABLE BEGIN - IDS_COPY "Event Type: %s\r\n\ + IDS_COPY "\ +Event Type: %s\r\n\ Event Source: %s\r\n\ Event Category: %s\r\n\ Event ID: %s\r\n\ diff --git a/base/applications/mscutils/eventvwr/lang/zh-CN.rc b/base/applications/mscutils/eventvwr/lang/zh-CN.rc index baf3aab6ba0..3a94b912034 100644 --- a/base/applications/mscutils/eventvwr/lang/zh-CN.rc +++ b/base/applications/mscutils/eventvwr/lang/zh-CN.rc @@ -124,13 +124,16 @@ BEGIN EDITTEXT IDC_LOGNAME, 67, 23, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP LTEXT "日志文件(&F)：", IDC_STATIC, 7, 41, 60, 8 EDITTEXT IDC_LOGFILE, 67, 39, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - LTEXT "大小：", IDC_STATIC, 7, 57, 60, 8 +// The following 4 IDC_STATIC shall have accels in ReactOS, although MS doesn't have accels for them. +// Translation note: First fill out ALL accels that MS has in this dialog for your language, +// and only then as a final step use some remaining unused letters for those 4 controls! + LTEXT "大小(&S)：", IDC_STATIC, 7, 57, 60, 8 EDITTEXT IDC_SIZE_LABEL, 67, 57, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "创建时间：", IDC_STATIC, 7, 69, 60, 8 + LTEXT "创建时间(&C)：", IDC_STATIC, 7, 69, 60, 8 EDITTEXT IDC_CREATED_LABEL, 67, 69, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "修改时间：", IDC_STATIC, 7, 81, 60, 8 + LTEXT "修改时间(&E)：", IDC_STATIC, 7, 81, 60, 8 EDITTEXT IDC_MODIFIED_LABEL, 67, 81, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "访问时间：", IDC_STATIC, 7, 93, 60, 8 + LTEXT "访问时间(&A)：", IDC_STATIC, 7, 93, 60, 8 EDITTEXT IDC_ACCESSED_LABEL, 67, 93, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "日志大小", IDC_STATIC, 7, 106, 238, 99 LTEXT "日志大小上限(&M)：", IDC_STATIC, 17, 122, 58, 8 @@ -217,14 +220,15 @@ END STRINGTABLE BEGIN - IDS_COPY "事件类型： %s\r\n\ -事件源： %s\r\n\ -事件类别： %s\r\n\ -事件 ID： %s\r\n\ -日期： %s\r\n\ -时间： %s\r\n\ -用户： %s\r\n\ -电脑： %s\r\n\ + IDS_COPY "\ +事件类型： %s\r\n\ +事件源： %s\r\n\ +事件类别： %s\r\n\ +事件 ID： %s\r\n\ +日期： %s\r\n\ +时间： %s\r\n\ +用户： %s\r\n\ +电脑： %s\r\n\ 描述：\r\n%s" END diff --git a/base/applications/mscutils/eventvwr/lang/zh-HK.rc b/base/applications/mscutils/eventvwr/lang/zh-HK.rc index b8c266f06e9..98097e61549 100644 --- a/base/applications/mscutils/eventvwr/lang/zh-HK.rc +++ b/base/applications/mscutils/eventvwr/lang/zh-HK.rc @@ -123,13 +123,16 @@ BEGIN EDITTEXT IDC_LOGNAME, 67, 23, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP LTEXT "記錄檔(&F)：", IDC_STATIC, 7, 41, 60, 8 EDITTEXT IDC_LOGFILE, 67, 39, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - LTEXT "大小；", IDC_STATIC, 7, 57, 60, 8 +// The following 4 IDC_STATIC shall have accels in ReactOS, although MS doesn't have accels for them. +// Translation note: First fill out ALL accels that MS has in this dialog for your language, +// and only then as a final step use some remaining unused letters for those 4 controls! + LTEXT "大小(&S)；", IDC_STATIC, 7, 57, 60, 8 EDITTEXT IDC_SIZE_LABEL, 67, 57, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "建立日期：", IDC_STATIC, 7, 69, 60, 8 + LTEXT "建立日期(&C)：", IDC_STATIC, 7, 69, 60, 8 EDITTEXT IDC_CREATED_LABEL, 67, 69, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "修改日期：", IDC_STATIC, 7, 81, 60, 8 + LTEXT "修改日期(&E)：", IDC_STATIC, 7, 81, 60, 8 EDITTEXT IDC_MODIFIED_LABEL, 67, 81, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "存取日期：", IDC_STATIC, 7, 93, 60, 8 + LTEXT "存取日期(&A)：", IDC_STATIC, 7, 93, 60, 8 EDITTEXT IDC_ACCESSED_LABEL, 67, 93, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "記錄檔大小", IDC_STATIC, 7, 106, 238, 99 LTEXT "最大記錄檔大小(&M)：", IDC_STATIC, 17, 122, 58, 8 @@ -172,13 +175,13 @@ BEGIN /* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ IDS_USAGE "ReactOS Event Viewer\n\ \n\ -EventVwr [電腦名稱] [/l:<事件記錄檔案>] [/?]\n\ +EventVwr [電腦名稱] [/L:<事件記錄檔案>] [/?]\n\ \n\ ""電腦名稱"" : 指定要連線的遠端電腦\n\ \t以擷取要顯示的事件。如果未指定名稱，\n\ \t則使用本地電腦。\n\ \n\ -/l:<事件記錄檔案> : 指定要開啟的事件記錄檔案。\n\ +/L:<事件記錄檔案> : 指定要開啟的事件記錄檔案。\n\ \t只支援 .evt 格式檔案 (NT ≤ 5.2)。\n\ \n\ /? : 顯示這個説明訊息。\n\ @@ -217,14 +220,15 @@ END STRINGTABLE BEGIN - IDS_COPY "事件種類: %s\r\n\ -事件源: %s\r\n\ -事件種類: %s\r\n\ -事件 ID: %s\r\n\ -日期: %s\r\n\ -時間: %s\r\n\ -使用者: %s\r\n\ -電腦: %s\r\n\ + IDS_COPY "\ +事件種類: %s\r\n\ +事件源: %s\r\n\ +事件種類: %s\r\n\ +事件 ID: %s\r\n\ +日期: %s\r\n\ +時間: %s\r\n\ +使用者: %s\r\n\ +電腦: %s\r\n\ 描述:\r\n%s" END diff --git a/base/applications/mscutils/eventvwr/lang/zh-TW.rc b/base/applications/mscutils/eventvwr/lang/zh-TW.rc index c75cc7e0f8a..43fafc0e500 100644 --- a/base/applications/mscutils/eventvwr/lang/zh-TW.rc +++ b/base/applications/mscutils/eventvwr/lang/zh-TW.rc @@ -123,13 +123,16 @@ BEGIN EDITTEXT IDC_LOGNAME, 67, 23, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP LTEXT "記錄檔(&F)：", IDC_STATIC, 7, 41, 60, 8 EDITTEXT IDC_LOGFILE, 67, 39, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - LTEXT "大小：", IDC_STATIC, 7, 57, 60, 8 +// The following 4 IDC_STATIC shall have accels in ReactOS, although MS doesn't have accels for them. +// Translation note: First fill out ALL accels that MS has in this dialog for your language, +// and only then as a final step use some remaining unused letters for those 4 controls! + LTEXT "大小(&S)：", IDC_STATIC, 7, 57, 60, 8 EDITTEXT IDC_SIZE_LABEL, 67, 57, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "建立日期：", IDC_STATIC, 7, 69, 60, 8 + LTEXT "建立日期(&C)：", IDC_STATIC, 7, 69, 60, 8 EDITTEXT IDC_CREATED_LABEL, 67, 69, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "修改日期：", IDC_STATIC, 7, 81, 60, 8 + LTEXT "修改日期(&E)：", IDC_STATIC, 7, 81, 60, 8 EDITTEXT IDC_MODIFIED_LABEL, 67, 81, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "存取日期：", IDC_STATIC, 7, 93, 60, 8 + LTEXT "存取日期(&A)：", IDC_STATIC, 7, 93, 60, 8 EDITTEXT IDC_ACCESSED_LABEL, 67, 93, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "記錄檔大小", IDC_STATIC, 7, 106, 238, 99 LTEXT "最大記錄檔大小(&M)：", IDC_STATIC, 17, 122, 58, 8 @@ -217,14 +220,15 @@ END STRINGTABLE BEGIN - IDS_COPY "事件種類: %s\r\n\ -事件源: %s\r\n\ -事件種類: %s\r\n\ -事件 ID: %s\r\n\ -日期: %s\r\n\ -時間: %s\r\n\ -使用者: %s\r\n\ -電腦: %s\r\n\ + IDS_COPY "\ +事件種類: %s\r\n\ +事件源: %s\r\n\ +事件種類: %s\r\n\ +事件 ID: %s\r\n\ +日期: %s\r\n\ +時間: %s\r\n\ +使用者: %s\r\n\ +電腦: %s\r\n\ 描述:\r\n%s" END

5 months

[reactos] 01/01: [GITHUB] Follow-up of #7181 (155a7c7)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a905ba2717f5c841134c9… commit a905ba2717f5c841134c9b3adc574fc8a9ef61ff Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Jul 26 18:49:21 2024 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Jul 26 18:49:34 2024 +0900 [GITHUB] Follow-up of #7181 (155a7c7) Add base/applications/ctfmon/**. JIRA issue: CORE-19268 --- .github/labeler.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/labeler.yml b/.github/labeler.yml index 3226170e699..115df3d99fb 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -47,6 +47,7 @@ Win32SS: "input method": - changed-files: - any-glob-to-any-file: + - base/applications/ctfmon/** - dll/ime/** - dll/win32/imm32/** - dll/win32/msctf/**

5 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2024