Ros-diffs September 2022

ros-diffs@reactos.org

21 participants
142 discussions

[reactos] 01/01: [SYSSETUP] Improve Japanese translation (ja-JP)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f1ddb6c15fd3d03e2c616… commit f1ddb6c15fd3d03e2c616fb3f628fcc7e0c2914c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Sep 5 11:28:04 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Sep 5 11:28:04 2022 +0900 [SYSSETUP] Improve Japanese translation (ja-JP) --- dll/win32/syssetup/lang/ja-JP.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/win32/syssetup/lang/ja-JP.rc b/dll/win32/syssetup/lang/ja-JP.rc index f0515778dd5..15deb1f8384 100644 --- a/dll/win32/syssetup/lang/ja-JP.rc +++ b/dll/win32/syssetup/lang/ja-JP.rc @@ -178,12 +178,12 @@ BEGIN IDS_COMPUTERSUBTITLE "コンピュータ名と Administrator パスワードを入力する必要があります。" IDS_LOCALETITLE "地域の設定" IDS_LOCALESUBTITLE "ReactOS を様々な地域と言語にあわせてカスタマイズすることができます。" - IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set to %s." - IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" + IDS_LOCALETEXT "標準と形式は %s に、場所は %s に設定されています。" + IDS_LAYOUTTEXT "デフォルトのテキスト入力言語と方法は次のとおりです: %s キーボードレイアウト" IDS_DATETIMETITLE "日付と時刻" IDS_DATETIMESUBTITLE "コンピュータの日付と時刻を正しく設定して下さい。" - IDS_PROCESSTITLE "Finishing the Installation" - IDS_PROCESSSUBTITLE "Please wait while Setup completes the final steps." + IDS_PROCESSTITLE "インストールを完了中" + IDS_PROCESSSUBTITLE "セットアップの最終ステップが完了するまでお待ちください。" IDS_THEMESELECTIONTITLE "外観" IDS_THEMESELECTIONSUBTITLE "好きなテーマをお選び下さい" END

2 years, 3 months

[reactos] 01/01: [NTUSER][USER32][IMM32] Initialize pKL->piiex by using ImmLoadLayout (#4645)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=85e292d58f952f7941eed… commit 85e292d58f952f7941eed0b3056c94f08a7b53a3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Sep 5 08:34:00 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Sep 5 08:34:00 2022 +0900 [NTUSER][USER32][IMM32] Initialize pKL->piiex by using ImmLoadLayout (#4645) To recognize IME, we have to initialize pKL->piiex. - Add co_ClientImmLoadLayout and User32CallImmLoadLayoutFromKernel functions to call imm32!ImmLoadLayout on user mode from kernel. - Use co_ClientImmLoadLayout in NtUserLoadKeyboardLayoutEx. - Improve Imm32LoadIME to sanitize the IME table. CORE-11700 --- dll/win32/imm32/ime.c | 26 ++++++++++++++------- dll/win32/imm32/imm.c | 38 ++++++++++++------------------ dll/win32/imm32/utils.c | 1 + win32ss/include/callback.h | 17 +++++++++++++- win32ss/user/ntuser/callback.c | 46 +++++++++++++++++++++++++++++++++++++ win32ss/user/ntuser/callback.h | 6 +++++ win32ss/user/ntuser/kbdlayout.c | 30 +++++++++++++++++++++++- win32ss/user/ntuser/ntuser.h | 1 + win32ss/user/user32/misc/dllmain.c | 10 ++++++++ win32ss/user/user32/windows/input.c | 24 +++++++++++++++---- 10 files changed, 161 insertions(+), 38 deletions(-) diff --git a/dll/win32/imm32/ime.c b/dll/win32/imm32/ime.c index 79c40435188..dd3519087a4 100644 --- a/dll/win32/imm32/ime.c +++ b/dll/win32/imm32/ime.c @@ -149,6 +149,15 @@ BOOL APIENTRY Imm32InquireIme(PIMEDPI pImeDpi) return GetClassInfoW(pImeDpi->hInst, pImeDpi->szUIClass, &wcW); } +/* Define stub IME functions */ +#define DEFINE_IME_ENTRY(type, name, params, optional) \ + type APIENTRY Stub##name params { \ + FIXME("%s: Why stub called?\n", #name); \ + return (type)0; \ + } +#include "imetable.h" +#undef DEFINE_IME_ENTRY + // Win: LoadIME BOOL APIENTRY Imm32LoadIME(PIMEINFOEX pImeInfoEx, PIMEDPI pImeDpi) { @@ -160,18 +169,19 @@ BOOL APIENTRY Imm32LoadIME(PIMEINFOEX pImeInfoEx, PIMEDPI pImeDpi) if (!Imm32GetSystemLibraryPath(szPath, _countof(szPath), pImeInfoEx->wszImeFile)) return FALSE; - hIME = GetModuleHandleW(szPath); + pImeDpi->hInst = hIME = LoadLibraryW(szPath); if (hIME == NULL) { - hIME = LoadLibraryW(szPath); - if (hIME == NULL) - { - ERR("Imm32LoadIME: LoadLibraryW(%S) failed\n", szPath); - return FALSE; - } + ERR("Imm32LoadIME: LoadLibraryW(%s) failed\n", debugstr_w(szPath)); + return FALSE; } - pImeDpi->hInst = hIME; + /* Populate the table by stub IME functions */ +#define DEFINE_IME_ENTRY(type, name, params, optional) pImeDpi->name = Stub##name; +#include "imetable.h" +#undef DEFINE_IME_ENTRY + + /* Populate the table by real IME functions */ #define DEFINE_IME_ENTRY(type, name, params, optional) \ do { \ fn = GetProcAddress(hIME, #name); \ diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 94a1afcd488..13512cadb11 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -53,57 +53,49 @@ BOOL WINAPI ImmRegisterClient(PSHAREDINFO ptr, HINSTANCE hMod) */ BOOL WINAPI ImmLoadLayout(HKL hKL, PIMEINFOEX pImeInfoEx) { - DWORD cbData; - HKEY hLayoutKey = NULL, hLayoutsKey = NULL; + DWORD cbData, dwType; + HKEY hLayoutKey; LONG error; WCHAR szLayout[MAX_PATH]; TRACE("(%p, %p)\n", hKL, pImeInfoEx); + ZeroMemory(pImeInfoEx, sizeof(IMEINFOEX)); + if (IS_IME_HKL(hKL) || !Imm32IsCiceroMode() || Imm32Is16BitMode()) { - Imm32UIntToStr((DWORD)(DWORD_PTR)hKL, 16, szLayout, _countof(szLayout)); - - error = RegOpenKeyW(HKEY_LOCAL_MACHINE, REGKEY_KEYBOARD_LAYOUTS, &hLayoutsKey); - if (error) - { - ERR("RegOpenKeyW: 0x%08lX\n", error); - return FALSE; - } + StringCchPrintfW(szLayout, _countof(szLayout), L"%s\\%08lX", + REGKEY_KEYBOARD_LAYOUTS, HandleToUlong(hKL)); - error = RegOpenKeyW(hLayoutsKey, szLayout, &hLayoutKey); + error = RegOpenKeyExW(HKEY_LOCAL_MACHINE, szLayout, 0, KEY_READ, &hLayoutKey); if (error) { - ERR("RegOpenKeyW: 0x%08lX\n", error); - RegCloseKey(hLayoutsKey); + ERR("RegOpenKeyExW: 0x%08lX\n", error); return FALSE; } } else { - error = RegOpenKeyW(HKEY_LOCAL_MACHINE, REGKEY_IMM, &hLayoutKey); + error = RegOpenKeyExW(HKEY_LOCAL_MACHINE, REGKEY_IMM, 0, KEY_READ, &hLayoutKey); if (error) { - ERR("RegOpenKeyW: 0x%08lX\n", error); + ERR("RegOpenKeyExW: 0x%08lX\n", error); return FALSE; } } cbData = sizeof(pImeInfoEx->wszImeFile); - error = RegQueryValueExW(hLayoutKey, L"Ime File", 0, 0, + error = RegQueryValueExW(hLayoutKey, L"Ime File", NULL, &dwType, (LPBYTE)pImeInfoEx->wszImeFile, &cbData); - pImeInfoEx->wszImeFile[_countof(pImeInfoEx->wszImeFile) - 1] = 0; + pImeInfoEx->wszImeFile[_countof(pImeInfoEx->wszImeFile) - 1] = UNICODE_NULL; RegCloseKey(hLayoutKey); - if (hLayoutsKey) - RegCloseKey(hLayoutsKey); pImeInfoEx->fLoadFlag = 0; - if (error) + if (error != ERROR_SUCCESS || dwType != REG_SZ) { - ERR("RegQueryValueExW: 0x%08lX\n", error); - pImeInfoEx->hkl = NULL; + ERR("RegQueryValueExW: 0x%lX, 0x%lX\n", error, dwType); return FALSE; } @@ -116,7 +108,7 @@ BOOL WINAPI ImmLoadLayout(HKL hKL, PIMEINFOEX pImeInfoEx) */ BOOL WINAPI ImmFreeLayout(DWORD dwUnknown) { - WCHAR szKBD[9]; + WCHAR szKBD[KL_NAMELENGTH]; UINT iKL, cKLs; HKL hOldKL, hNewKL, *pList; PIMEDPI pImeDpi; diff --git a/dll/win32/imm32/utils.c b/dll/win32/imm32/utils.c index ca9385aed14..9e0c07195dd 100644 --- a/dll/win32/imm32/utils.c +++ b/dll/win32/imm32/utils.c @@ -776,6 +776,7 @@ BOOL APIENTRY Imm32LoadImeVerInfo(PIMEINFOEX pImeInfoEx) hinstVersion = LoadLibraryW(szPath); if (!hinstVersion) return FALSE; + bLoaded = TRUE; } diff --git a/win32ss/include/callback.h b/win32ss/include/callback.h index a75a6de3803..4c4d56323f0 100644 --- a/win32ss/include/callback.h +++ b/win32ss/include/callback.h @@ -20,7 +20,8 @@ #define USER32_CALLBACK_LPK (16) #define USER32_CALLBACK_UMPD (17) #define USER32_CALLBACK_IMMPROCESSKEY (18) -#define USER32_CALLBACK_MAXIMUM (18) +#define USER32_CALLBACK_IMMLOADLAYOUT (19) +#define USER32_CALLBACK_MAXIMUM USER32_CALLBACK_IMMLOADLAYOUT typedef struct _WINDOWPROC_CALLBACK_ARGUMENTS { @@ -178,6 +179,17 @@ typedef struct _IMMPROCESSKEY_CALLBACK_ARGUMENTS DWORD dwHotKeyID; } IMMPROCESSKEY_CALLBACK_ARGUMENTS, *PIMMPROCESSKEY_CALLBACK_ARGUMENTS; +typedef struct _IMMLOADLAYOUT_CALLBACK_ARGUMENTS +{ + HKL hKL; +} IMMLOADLAYOUT_CALLBACK_ARGUMENTS, *PIMMLOADLAYOUT_CALLBACK_ARGUMENTS; + +typedef struct _IMMLOADLAYOUT_CALLBACK_OUTPUT +{ + BOOL ret; + IMEINFOEX iiex; +} IMMLOADLAYOUT_CALLBACK_OUTPUT, *PIMMLOADLAYOUT_CALLBACK_OUTPUT; + NTSTATUS WINAPI User32CallCopyImageFromKernel(PVOID Arguments, ULONG ArgumentLength); NTSTATUS WINAPI @@ -216,4 +228,7 @@ NTSTATUS WINAPI User32CallUMPDFromKernel(PVOID Arguments, ULONG ArgumentLength); NTSTATUS WINAPI User32CallImmProcessKeyFromKernel(PVOID Arguments, ULONG ArgumentLength); +NTSTATUS WINAPI +User32CallImmLoadLayoutFromKernel(PVOID Arguments, ULONG ArgumentLength); + #endif /* __INCLUDE_USER32_CALLBACK_H */ diff --git a/win32ss/user/ntuser/callback.c b/win32ss/user/ntuser/callback.c index 4e1c053e4bf..801e8e971db 100644 --- a/win32ss/user/ntuser/callback.c +++ b/win32ss/user/ntuser/callback.c @@ -1272,4 +1272,50 @@ co_IntImmProcessKey(HWND hWnd, HKL hKL, UINT vKey, LPARAM lParam, DWORD dwHotKey return ret; } +/* Win: ClientImmLoadLayout */ +BOOL +APIENTRY +co_ClientImmLoadLayout( + _In_ HKL hKL, + _Inout_ PIMEINFOEX pImeInfoEx) +{ + BOOL ret; + NTSTATUS Status; + IMMLOADLAYOUT_CALLBACK_ARGUMENTS Common = { hKL }; + ULONG ResultLength = sizeof(IMMLOADLAYOUT_CALLBACK_OUTPUT); + PIMMLOADLAYOUT_CALLBACK_OUTPUT ResultPointer = NULL; + + RtlZeroMemory(pImeInfoEx, sizeof(IMEINFOEX)); + + UserLeaveCo(); + Status = KeUserModeCallback(USER32_CALLBACK_IMMLOADLAYOUT, + &Common, + sizeof(Common), + (PVOID*)&ResultPointer, + &ResultLength); + UserEnterCo(); + + if (!NT_SUCCESS(Status) || !ResultPointer || + ResultLength != sizeof(IMMLOADLAYOUT_CALLBACK_OUTPUT)) + { + ERR("0x%lX, %p, %lu\n", Status, ResultPointer, ResultLength); + return FALSE; + } + + _SEH2_TRY + { + ProbeForRead(ResultPointer, ResultLength, 1); + ret = ResultPointer->ret; + if (ret) + RtlCopyMemory(pImeInfoEx, &ResultPointer->iiex, sizeof(IMEINFOEX)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ret = FALSE; + } + _SEH2_END; + + return ret; +} + /* EOF */ diff --git a/win32ss/user/ntuser/callback.h b/win32ss/user/ntuser/callback.h index 79217f86425..dde7152a952 100644 --- a/win32ss/user/ntuser/callback.h +++ b/win32ss/user/ntuser/callback.h @@ -80,3 +80,9 @@ BOOL FASTCALL IntMsgCreateStructW(PWND,CREATESTRUCTW*,CREATESTRUCTW*,PVOID*,PVOI DWORD APIENTRY co_IntImmProcessKey(HWND hWnd, HKL hKL, UINT vKey, LPARAM lParam, DWORD dwHotKeyID); + +BOOL +APIENTRY +co_ClientImmLoadLayout( + _In_ HKL hKL, + _Inout_ PIMEINFOEX pImeInfoEx); diff --git a/win32ss/user/ntuser/kbdlayout.c b/win32ss/user/ntuser/kbdlayout.c index 83d89d9632a..d41f53d3472 100644 --- a/win32ss/user/ntuser/kbdlayout.c +++ b/win32ss/user/ntuser/kbdlayout.c @@ -497,6 +497,10 @@ UserUnloadKbl(PKL pKl) pKl->pklPrev->pklNext = pKl->pklNext; pKl->pklNext->pklPrev = pKl->pklPrev; UnloadKbdFile(pKl->spkf); + if (pKl->piiex) + { + ExFreePoolWithTag(pKl->piiex, USERTAG_IME); + } UserDeleteObject(pKl->head.h, TYPE_KBDLAYOUT); return TRUE; } @@ -995,12 +999,34 @@ cleanup: return bRet; } +/* Win: xxxImmLoadLayout */ +PIMEINFOEX FASTCALL co_UserImmLoadLayout(_In_ HKL hKL) +{ + PIMEINFOEX piiex; + + if (!IS_IME_HKL(hKL) && !IS_CICERO_MODE()) + return NULL; + + piiex = ExAllocatePoolWithTag(PagedPool, sizeof(IMEINFOEX), USERTAG_IME); + if (!piiex) + return NULL; + + if (!co_ClientImmLoadLayout(hKL, piiex)) + { + ExFreePoolWithTag(piiex, USERTAG_IME); + return NULL; + } + + return piiex; +} + /* * NtUserLoadKeyboardLayoutEx * * Loads keyboard layout with given locale id * * NOTE: We adopt a different design from Microsoft's one for security reason. + * We don't use the 1st and 3rd parameters of NtUserLoadKeyboardLayoutEx. */ HKL APIENTRY @@ -1015,7 +1041,7 @@ NtUserLoadKeyboardLayoutEx( { HKL hklRet = NULL; PKL pKl = NULL, pklLast; - WCHAR Buffer[9]; + WCHAR Buffer[KL_NAMELENGTH]; UNICODE_STRING ustrSafeKLID; if (Flags & ~(KLF_ACTIVATE|KLF_NOTELLSHELL|KLF_REORDER|KLF_REPLACELANG| @@ -1082,6 +1108,8 @@ NtUserLoadKeyboardLayoutEx( pKl->pklPrev = pKl; gspklBaseLayout = pKl; } + + pKl->piiex = co_UserImmLoadLayout(UlongToHandle(hkl)); } /* If this layout was prepared to unload, undo it */ diff --git a/win32ss/user/ntuser/ntuser.h b/win32ss/user/ntuser/ntuser.h index a72571dc26f..5060a661305 100644 --- a/win32ss/user/ntuser/ntuser.h +++ b/win32ss/user/ntuser/ntuser.h @@ -11,6 +11,7 @@ typedef VOID (*TL_FN_FREE)(PVOID); +/* Thread Lock structure */ typedef struct _TL { struct _TL* next; diff --git a/win32ss/user/user32/misc/dllmain.c b/win32ss/user/user32/misc/dllmain.c index 77fc525d913..18dd9ec0710 100644 --- a/win32ss/user/user32/misc/dllmain.c +++ b/win32ss/user/user32/misc/dllmain.c @@ -224,6 +224,7 @@ PVOID apfnDispatch[USER32_CALLBACK_MAXIMUM + 1] = User32CallLPKFromKernel, User32CallUMPDFromKernel, User32CallImmProcessKeyFromKernel, + User32CallImmLoadLayoutFromKernel, }; @@ -725,3 +726,12 @@ User32CallImmProcessKeyFromKernel(PVOID Arguments, ULONG ArgumentLength) return ZwCallbackReturn(&Result, sizeof(DWORD), STATUS_SUCCESS); } + +NTSTATUS WINAPI +User32CallImmLoadLayoutFromKernel(PVOID Arguments, ULONG ArgumentLength) +{ + PIMMLOADLAYOUT_CALLBACK_ARGUMENTS Common = Arguments; + IMMLOADLAYOUT_CALLBACK_OUTPUT Result; + Result.ret = IMM_FN(ImmLoadLayout)(Common->hKL, &Result.iiex); + return ZwCallbackReturn(&Result, sizeof(Result), STATUS_SUCCESS); +} diff --git a/win32ss/user/user32/windows/input.c b/win32ss/user/user32/windows/input.c index 1dfa587602e..a018d3aeca2 100644 --- a/win32ss/user/user32/windows/input.c +++ b/win32ss/user/user32/windows/input.c @@ -638,6 +638,13 @@ LoadKeyboardLayoutA(LPCSTR pszKLID, return LoadKeyboardLayoutW(wszKLID, Flags); } +inline BOOL IsValidKLID(_In_ LPCWSTR pwszKLID) +{ + return (pwszKLID != NULL) && (wcsspn(pwszKLID, L"0123456789ABCDEFabcdef") == (KL_NAMELENGTH - 1)); +} + +#define ENGLISH_US MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US) + /* * @unimplemented * @@ -656,12 +663,20 @@ IntLoadKeyboardLayout( UNICODE_STRING ustrKbdName; UNICODE_STRING ustrKLID; WCHAR wszRegKey[256] = L"SYSTEM\\CurrentControlSet\\Control\\Keyboard Layouts\\"; - WCHAR wszLayoutId[10], wszNewKLID[10], szImeFileName[80]; + WCHAR wszLayoutId[10], wszNewKLID[KL_NAMELENGTH], szImeFileName[80]; + PWCHAR endptr; HKL hNewKL; HKEY hKey; BOOL bIsIME; - dwhkl = wcstoul(pwszKLID, NULL, 16); + if (!IsValidKLID(pwszKLID)) + { + ERR("pwszKLID: %s\n", debugstr_w(pwszKLID)); + return UlongToHandle(MAKELONG(ENGLISH_US, ENGLISH_US)); + } + + dwhkl = wcstoul(pwszKLID, &endptr, 16); + bIsIME = IS_IME_HKL(UlongToHandle(dwhkl)); if (!bIsIME) /* Not IME? */ { @@ -690,8 +705,7 @@ IntLoadKeyboardLayout( StringCbCatW(wszRegKey, sizeof(wszRegKey), pwszKLID); /* Open layout registry key for read */ - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, wszRegKey, 0, - KEY_READ, &hKey) == ERROR_SUCCESS) + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, wszRegKey, 0, KEY_READ, &hKey) == ERROR_SUCCESS) { dwSize = sizeof(wszLayoutId); if (RegQueryValueExW(hKey, L"Layout Id", NULL, &dwType, (LPBYTE)wszLayoutId, &dwSize) == ERROR_SUCCESS) @@ -744,7 +758,7 @@ HKL WINAPI LoadKeyboardLayoutW(LPCWSTR pwszKLID, UINT Flags) { - TRACE("(%s, 0x%X)", debugstr_w(pwszKLID), Flags); + TRACE("(%s, 0x%X)\n", debugstr_w(pwszKLID), Flags); return IntLoadKeyboardLayout(NULL, pwszKLID, 0, Flags, FALSE); }

2 years, 3 months

[reactos] 01/01: [TASKMGR] Fix number formatting to respect NLS Number format settings (#4657)

by Kyle Katarn

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=15a0f7adb0694107b981b… commit 15a0f7adb0694107b981bbf6c5292036f1e55d79 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Sun Sep 4 19:10:11 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 4 19:10:11 2022 +0200 [TASKMGR] Fix number formatting to respect NLS Number format settings (#4657) TaskMgr currently does not respect local NLS settings and forces 3 digits + comma (US convention) formatting. Fix this with a direct reuse of SH_FormatInteger() as already implemented in other places (dll/win32/shell32/dialogs/filedefext.cpp ...) - Removal of CommaSeparateNumberString() and replace with SH_FormatInteger(). - PerfDataGetText(): Use a switch structure. Return TRUE iftext could be retrieved; FALSE if not. Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> Co-authored-by: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> --- base/applications/taskmgr/precomp.h | 1 + base/applications/taskmgr/procpage.c | 331 ++++++++++++++++++++--------------- 2 files changed, 187 insertions(+), 145 deletions(-) diff --git a/base/applications/taskmgr/precomp.h b/base/applications/taskmgr/precomp.h index d54dcb3c7f4..5593f401fcd 100644 --- a/base/applications/taskmgr/precomp.h +++ b/base/applications/taskmgr/precomp.h @@ -14,6 +14,7 @@ #include <windef.h> #include <winbase.h> #include <wingdi.h> +#include <winnls.h> #include <winuser.h> #include <winreg.h> #include <commctrl.h> diff --git a/base/applications/taskmgr/procpage.c b/base/applications/taskmgr/procpage.c index 6145a28dcfe..e916cae8ee0 100644 --- a/base/applications/taskmgr/procpage.c +++ b/base/applications/taskmgr/procpage.c @@ -58,7 +58,6 @@ void AddProcess(ULONG Index); void UpdateProcesses(); void gethmsfromlargeint(LARGE_INTEGER largeint, DWORD *dwHours, DWORD *dwMinutes, DWORD *dwSeconds); void ProcessPageOnNotify(WPARAM wParam, LPARAM lParam); -void CommaSeparateNumberString(LPWSTR strNumber, ULONG nMaxCount); void ProcessPageShowContextMenu(DWORD dwProcessId); BOOL PerfDataGetText(ULONG Index, ULONG ColumnIndex, LPTSTR lpText, ULONG nMaxCount); DWORD WINAPI ProcessPageRefreshThread(void *lpParameter); @@ -324,20 +323,68 @@ void ProcessPageOnNotify(WPARAM wParam, LPARAM lParam) } } -void CommaSeparateNumberString(LPWSTR strNumber, ULONG nMaxCount) +/* + * Adapted from SH_FormatInteger in dll/win32/shell32/dialogs/filedefext.cpp. + */ +UINT +SH_FormatInteger( + _In_ LONGLONG Num, + _Out_writes_z_(cchResultMax) LPWSTR pwszResult, + _In_ UINT cchResultMax) { - WCHAR temp[260]; - UINT i, j, k; - - for (i=0,j=0; i<(wcslen(strNumber) % 3); i++, j++) - temp[j] = strNumber[i]; - for (k=0; i<wcslen(strNumber); i++,j++,k++) { - if ((k % 3 == 0) && (j > 0)) - temp[j++] = L','; - temp[j] = strNumber[i]; + NUMBERFMTW nf; + INT i; + INT cchGrouping, cchResult; + WCHAR wszNumber[24]; + WCHAR wszDecimalSep[8], wszThousandSep[8]; + WCHAR wszGrouping[12]; + + /* Print the number in uniform mode */ + StringCchPrintfW(wszNumber, _countof(wszNumber), L"%I64u", Num); + + /* Get system strings for decimal and thousand separators */ + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, wszDecimalSep, _countof(wszDecimalSep)); + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, wszThousandSep, _countof(wszThousandSep)); + + /* Initialize format for printing the number in bytes */ + ZeroMemory(&nf, sizeof(nf)); + nf.lpDecimalSep = wszDecimalSep; + nf.lpThousandSep = wszThousandSep; + + /* Get system string for groups separator */ + cchGrouping = GetLocaleInfoW(LOCALE_USER_DEFAULT, + LOCALE_SGROUPING, + wszGrouping, + _countof(wszGrouping)); + + /* Convert grouping specs from string to integer */ + for (i = 0; i < cchGrouping; i++) + { + WCHAR wch = wszGrouping[i]; + + if (wch >= L'0' && wch <= L'9') + nf.Grouping = nf.Grouping * 10 + (wch - L'0'); + else if (wch != L';') + break; } - temp[j] = L'\0'; - wcsncpy(strNumber, temp, nMaxCount); + + if ((nf.Grouping % 10) == 0) + nf.Grouping /= 10; + else + nf.Grouping *= 10; + + /* Format the number */ + cchResult = GetNumberFormatW(LOCALE_USER_DEFAULT, + 0, + wszNumber, + &nf, + pwszResult, + cchResultMax); + if (!cchResult) + return 0; + + /* GetNumberFormatW returns number of characters including UNICODE_NULL */ + return cchResult - 1; } void ProcessPageShowContextMenu(DWORD dwProcessId) @@ -561,140 +608,134 @@ void AddProcess(ULONG Index) BOOL PerfDataGetText(ULONG Index, ULONG ColumnIndex, LPTSTR lpText, ULONG nMaxCount) { - IO_COUNTERS iocounters; - LARGE_INTEGER time; - - if (ColumnDataHints[ColumnIndex] == COLUMN_IMAGENAME) - PerfDataGetImageName(Index, lpText, nMaxCount); - if (ColumnDataHints[ColumnIndex] == COLUMN_PID) - wsprintfW(lpText, L"%lu", PerfDataGetProcessId(Index)); - if (ColumnDataHints[ColumnIndex] == COLUMN_USERNAME) - PerfDataGetUserName(Index, lpText, nMaxCount); - if (ColumnDataHints[ColumnIndex] == COLUMN_COMMANDLINE) - PerfDataGetCommandLine(Index, lpText, nMaxCount); - if (ColumnDataHints[ColumnIndex] == COLUMN_SESSIONID) - wsprintfW(lpText, L"%lu", PerfDataGetSessionId(Index)); - if (ColumnDataHints[ColumnIndex] == COLUMN_CPUUSAGE) - wsprintfW(lpText, L"%02lu", PerfDataGetCPUUsage(Index)); - if (ColumnDataHints[ColumnIndex] == COLUMN_CPUTIME) - { - DWORD dwHours; - DWORD dwMinutes; - DWORD dwSeconds; + IO_COUNTERS iocounters; - time = PerfDataGetCPUTime(Index); - gethmsfromlargeint(time, &dwHours, &dwMinutes, &dwSeconds); - wsprintfW(lpText, L"%lu:%02lu:%02lu", dwHours, dwMinutes, dwSeconds); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_MEMORYUSAGE) - { - wsprintfW(lpText, L"%lu", PerfDataGetWorkingSetSizeBytes(Index) / 1024); - CommaSeparateNumberString(lpText, nMaxCount); - wcscat(lpText, L" K"); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_PEAKMEMORYUSAGE) - { - wsprintfW(lpText, L"%lu", PerfDataGetPeakWorkingSetSizeBytes(Index) / 1024); - CommaSeparateNumberString(lpText, nMaxCount); - wcscat(lpText, L" K"); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_MEMORYUSAGEDELTA) - { - wsprintfW(lpText, L"%lu", PerfDataGetWorkingSetSizeDelta(Index) / 1024); - CommaSeparateNumberString(lpText, nMaxCount); - wcscat(lpText, L" K"); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_PAGEFAULTS) - { - wsprintfW(lpText, L"%lu", PerfDataGetPageFaultCount(Index)); - CommaSeparateNumberString(lpText, nMaxCount); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_PAGEFAULTSDELTA) - { - wsprintfW(lpText, L"%lu", PerfDataGetPageFaultCountDelta(Index)); - CommaSeparateNumberString(lpText, nMaxCount); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_VIRTUALMEMORYSIZE) - { - wsprintfW(lpText, L"%lu", PerfDataGetVirtualMemorySizeBytes(Index) / 1024); - CommaSeparateNumberString(lpText, nMaxCount); - wcscat(lpText, L" K"); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_PAGEDPOOL) - { - wsprintfW(lpText, L"%lu", PerfDataGetPagedPoolUsagePages(Index) / 1024); - CommaSeparateNumberString(lpText, nMaxCount); - wcscat(lpText, L" K"); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_NONPAGEDPOOL) - { - wsprintfW(lpText, L"%lu", PerfDataGetNonPagedPoolUsagePages(Index) / 1024); - CommaSeparateNumberString(lpText, nMaxCount); - wcscat(lpText, L" K"); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_BASEPRIORITY) - wsprintfW(lpText, L"%lu", PerfDataGetBasePriority(Index)); - if (ColumnDataHints[ColumnIndex] == COLUMN_HANDLECOUNT) - { - wsprintfW(lpText, L"%lu", PerfDataGetHandleCount(Index)); - CommaSeparateNumberString(lpText, nMaxCount); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_THREADCOUNT) - { - wsprintfW(lpText, L"%lu", PerfDataGetThreadCount(Index)); - CommaSeparateNumberString(lpText, nMaxCount); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_USEROBJECTS) - { - wsprintfW(lpText, L"%lu", PerfDataGetUSERObjectCount(Index)); - CommaSeparateNumberString(lpText, nMaxCount); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_GDIOBJECTS) - { - wsprintfW(lpText, L"%lu", PerfDataGetGDIObjectCount(Index)); - CommaSeparateNumberString(lpText, nMaxCount); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_IOREADS) - { - PerfDataGetIOCounters(Index, &iocounters); - /* wsprintfW(pnmdi->item.pszText, L"%d", iocounters.ReadOperationCount); */ - _ui64tow(iocounters.ReadOperationCount, lpText, 10); - CommaSeparateNumberString(lpText, nMaxCount); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_IOWRITES) - { - PerfDataGetIOCounters(Index, &iocounters); - /* wsprintfW(pnmdi->item.pszText, L"%d", iocounters.WriteOperationCount); */ - _ui64tow(iocounters.WriteOperationCount, lpText, 10); - CommaSeparateNumberString(lpText, nMaxCount); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_IOOTHER) - { - PerfDataGetIOCounters(Index, &iocounters); - /* wsprintfW(pnmdi->item.pszText, L"%d", iocounters.OtherOperationCount); */ - _ui64tow(iocounters.OtherOperationCount, lpText, 10); - CommaSeparateNumberString(lpText, nMaxCount); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_IOREADBYTES) + switch (ColumnDataHints[ColumnIndex]) { - PerfDataGetIOCounters(Index, &iocounters); - /* wsprintfW(pnmdi->item.pszText, L"%d", iocounters.ReadTransferCount); */ - _ui64tow(iocounters.ReadTransferCount, lpText, 10); - CommaSeparateNumberString(lpText, nMaxCount); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_IOWRITEBYTES) - { - PerfDataGetIOCounters(Index, &iocounters); - /* wsprintfW(pnmdi->item.pszText, L"%d", iocounters.WriteTransferCount); */ - _ui64tow(iocounters.WriteTransferCount, lpText, 10); - CommaSeparateNumberString(lpText, nMaxCount); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_IOOTHERBYTES) - { - PerfDataGetIOCounters(Index, &iocounters); - /* wsprintfW(pnmdi->item.pszText, L"%d", iocounters.OtherTransferCount); */ - _ui64tow(iocounters.OtherTransferCount, lpText, 10); - CommaSeparateNumberString(lpText, nMaxCount); + case COLUMN_IMAGENAME: + PerfDataGetImageName(Index, lpText, nMaxCount); + return TRUE; + + case COLUMN_PID: + StringCchPrintfW(lpText, nMaxCount, L"%lu", PerfDataGetProcessId(Index)); + return TRUE; + + case COLUMN_USERNAME: + PerfDataGetUserName(Index, lpText, nMaxCount); + return TRUE; + + case COLUMN_COMMANDLINE: + PerfDataGetCommandLine(Index, lpText, nMaxCount); + return TRUE; + + case COLUMN_SESSIONID: + StringCchPrintfW(lpText, nMaxCount, L"%lu", PerfDataGetSessionId(Index)); + return TRUE; + + case COLUMN_CPUUSAGE: + StringCchPrintfW(lpText, nMaxCount, L"%02lu", PerfDataGetCPUUsage(Index)); + return TRUE; + + case COLUMN_CPUTIME: + { + LARGE_INTEGER time; + DWORD dwHours; + DWORD dwMinutes; + DWORD dwSeconds; + + time = PerfDataGetCPUTime(Index); + gethmsfromlargeint(time, &dwHours, &dwMinutes, &dwSeconds); + StringCchPrintfW(lpText, nMaxCount, L"%lu:%02lu:%02lu", dwHours, dwMinutes, dwSeconds); + return TRUE; + } + + case COLUMN_MEMORYUSAGE: + SH_FormatInteger(PerfDataGetWorkingSetSizeBytes(Index) / 1024, lpText, nMaxCount); + StringCchCatW(lpText, nMaxCount, L" K"); + return TRUE; + + case COLUMN_PEAKMEMORYUSAGE: + SH_FormatInteger(PerfDataGetPeakWorkingSetSizeBytes(Index) / 1024, lpText, nMaxCount); + StringCchCatW(lpText, nMaxCount, L" K"); + return TRUE; + + case COLUMN_MEMORYUSAGEDELTA: + SH_FormatInteger(PerfDataGetWorkingSetSizeDelta(Index) / 1024, lpText, nMaxCount); + StringCchCatW(lpText, nMaxCount, L" K"); + return TRUE; + + case COLUMN_PAGEFAULTS: + SH_FormatInteger(PerfDataGetPageFaultCount(Index), lpText, nMaxCount); + return TRUE; + + case COLUMN_PAGEFAULTSDELTA: + SH_FormatInteger(PerfDataGetPageFaultCountDelta(Index), lpText, nMaxCount); + return TRUE; + + case COLUMN_VIRTUALMEMORYSIZE: + SH_FormatInteger(PerfDataGetVirtualMemorySizeBytes(Index) / 1024, lpText, nMaxCount); + StringCchCatW(lpText, nMaxCount, L" K"); + return TRUE; + + case COLUMN_PAGEDPOOL: + SH_FormatInteger(PerfDataGetPagedPoolUsagePages(Index) / 1024, lpText, nMaxCount); + StringCchCatW(lpText, nMaxCount, L" K"); + return TRUE; + + case COLUMN_NONPAGEDPOOL: + SH_FormatInteger(PerfDataGetNonPagedPoolUsagePages(Index) / 1024, lpText, nMaxCount); + StringCchCatW(lpText, nMaxCount, L" K"); + return TRUE; + + case COLUMN_BASEPRIORITY: + StringCchPrintfW(lpText, nMaxCount, L"%lu", PerfDataGetBasePriority(Index)); + return TRUE; + + case COLUMN_HANDLECOUNT: + SH_FormatInteger(PerfDataGetHandleCount(Index), lpText, nMaxCount); + return TRUE; + + case COLUMN_THREADCOUNT: + SH_FormatInteger(PerfDataGetThreadCount(Index), lpText, nMaxCount); + return TRUE; + + case COLUMN_USEROBJECTS: + SH_FormatInteger(PerfDataGetUSERObjectCount(Index), lpText, nMaxCount); + return TRUE; + + case COLUMN_GDIOBJECTS: + SH_FormatInteger(PerfDataGetGDIObjectCount(Index), lpText, nMaxCount); + return TRUE; + + case COLUMN_IOREADS: + PerfDataGetIOCounters(Index, &iocounters); + SH_FormatInteger(iocounters.ReadOperationCount, lpText, nMaxCount); + return TRUE; + + case COLUMN_IOWRITES: + PerfDataGetIOCounters(Index, &iocounters); + SH_FormatInteger(iocounters.WriteOperationCount, lpText, nMaxCount); + return TRUE; + + case COLUMN_IOOTHER: + PerfDataGetIOCounters(Index, &iocounters); + SH_FormatInteger(iocounters.OtherOperationCount, lpText, nMaxCount); + return TRUE; + + case COLUMN_IOREADBYTES: + PerfDataGetIOCounters(Index, &iocounters); + SH_FormatInteger(iocounters.ReadTransferCount, lpText, nMaxCount); + return TRUE; + + case COLUMN_IOWRITEBYTES: + PerfDataGetIOCounters(Index, &iocounters); + SH_FormatInteger(iocounters.WriteTransferCount, lpText, nMaxCount); + return TRUE; + + case COLUMN_IOOTHERBYTES: + PerfDataGetIOCounters(Index, &iocounters); + SH_FormatInteger(iocounters.OtherTransferCount, lpText, nMaxCount); + return TRUE; } return FALSE;

2 years, 3 months

[reactos] 01/01: [CODEOWNERS] Remove automatic assignment from cmake/apitests

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=15b54c4123c578fa84b50… commit 15b54c4123c578fa84b5018e1b6ee5c8c8545f69 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Sep 4 15:28:43 2022 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Sep 4 15:28:43 2022 +0200 [CODEOWNERS] Remove automatic assignment from cmake/apitests --- CODEOWNERS | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CODEOWNERS b/CODEOWNERS index 87496bb25be..18b6d1aa1ae 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -121,8 +121,8 @@ # R: learn-more, learn_more, Mark Jansen # R: ThFabba, Thomas Faber # S: Maintained -/sdk/cmake/ @learn-more -*.cmake @learn-more +/sdk/cmake/ +*.cmake # File Patch API # M: learn-more, learn_more, Mark Jansen @@ -225,7 +225,7 @@ # R: learn-more, learn_more, Mark Jansen # R: ThFabba, Thomas Faber # S: Maintained -/modules/rostests/apitests/ @learn-more +/modules/rostests/apitests/ # ReactOS Kernel-Mode Tests # M: ThFabba, Thomas Faber

2 years, 3 months

[reactos] 01/01: [NETSHELL] Fix "ghost" network activity when opening Network Status page (#4662)

by Kyle Katarn

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b42ddce11a7f9e60f434f… commit b42ddce11a7f9e60f434f2abcace59c5c938f21e Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Sat Sep 3 23:30:57 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Sep 3 23:30:57 2022 +0200 [NETSHELL] Fix "ghost" network activity when opening Network Status page (#4662) Opening Network Status page creates a systematic "ghost" network activity, activating RX+TX activity icon both on property page and tray, while no Rx/Tx. This is due to pContext->dw[In|Out]Octets being initialized to 0 and compared to refreshed interface data. To circumvent this, copy refreshed interface data to the context on first update. --- dll/shellext/netshell/lanstatusui.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dll/shellext/netshell/lanstatusui.cpp b/dll/shellext/netshell/lanstatusui.cpp index f6e88ea9d51..64f38ef4a0f 100644 --- a/dll/shellext/netshell/lanstatusui.cpp +++ b/dll/shellext/netshell/lanstatusui.cpp @@ -130,6 +130,17 @@ UpdateLanStatus(HWND hwndDlg, LANSTATUSUI_CONTEXT * pContext) return; } + if (pContext->Status == (UINT)-1) + { + /* + * On first execution, pContext->dw[In|Out]Octets will be zero while + * the interface info is already refreshed with non-null data, so a + * gap is normal and does not correspond to an effective TX or RX packet. + */ + pContext->dwInOctets = IfEntry.dwInOctets; + pContext->dwOutOctets = IfEntry.dwOutOctets; + } + hIcon = NULL; if (IfEntry.dwOperStatus == MIB_IF_OPER_STATUS_CONNECTED || IfEntry.dwOperStatus == MIB_IF_OPER_STATUS_OPERATIONAL) {

2 years, 3 months

[reactos] 01/01: [THEMES] Improve text colors of Modern Dark theme (#4655)

by Sam Watson

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7dc58ccb0c390b48c65d6… commit 7dc58ccb0c390b48c65d6dae9ae592f6b17d3cea Author: Sam Watson <multisniperism(a)gmail.com> AuthorDate: Sun Sep 4 09:18:36 2022 +1200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Sep 3 23:18:36 2022 +0200 [THEMES] Improve text colors of Modern Dark theme (#4655) - Update colors for all different font sizes. - Update caption color for other fonts too. --- .../Modern/modern.msstyles/textfiles/Dark/ExtraLargeDark.INI | 12 ++++++------ .../Modern/modern.msstyles/textfiles/Dark/LargeFontsDark.INI | 12 ++++++------ .../Modern/modern.msstyles/textfiles/Dark/RegularDark.INI | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/media/themes/Modern/modern.msstyles/textfiles/Dark/ExtraLargeDark.INI b/media/themes/Modern/modern.msstyles/textfiles/Dark/ExtraLargeDark.INI index 0b16d58e464..89183f37df6 100644 --- a/media/themes/Modern/modern.msstyles/textfiles/Dark/ExtraLargeDark.INI +++ b/media/themes/Modern/modern.msstyles/textfiles/Dark/ExtraLargeDark.INI @@ -93,10 +93,10 @@ ImageLayout = vertical MinSize = 10, 5 SizingMargins = 8, 8, 9, 9 SizingType = Stretch -TextColor = 112 112 112 +TextColor = 200 200 200 TEXTSHADOWOFFSET = 1,1 TextShadowType = Single -TextShadowColor = 221 221 221 +TextShadowColor = 42 42 42 [Button.Pushbutton(Defaulted)] AccentColorHint = 0 255 0 @@ -105,13 +105,13 @@ AccentColorHint = 0 255 0 TextColor = 153 153 153 [Button.Pushbutton(Hot)] -TextColor = 75 75 75 +TextColor = 200 200 200 [Button.Pushbutton(Normal)] -TextColor = 75 75 75 +TextColor = 200 200 200 [Button.Pushbutton(Pressed)] -TextColor = 75 75 75 +TextColor = 200 200 200 ;Checkboxes [Button.Checkbox] @@ -1488,7 +1488,7 @@ SizingType = stretch Transparent = True [Window.Caption(Active)] -TextColor = 42 42 42 +TextColor = 255 255 255 [Window.Caption(Disabled)] IconEffect = Alpha diff --git a/media/themes/Modern/modern.msstyles/textfiles/Dark/LargeFontsDark.INI b/media/themes/Modern/modern.msstyles/textfiles/Dark/LargeFontsDark.INI index bb93507eda7..817a35edda6 100644 --- a/media/themes/Modern/modern.msstyles/textfiles/Dark/LargeFontsDark.INI +++ b/media/themes/Modern/modern.msstyles/textfiles/Dark/LargeFontsDark.INI @@ -93,10 +93,10 @@ ImageLayout = vertical MinSize = 10, 5 SizingMargins = 8, 8, 9, 9 SizingType = Stretch -TextColor = 112 112 112 +TextColor = 200 200 200 TEXTSHADOWOFFSET = 1,1 TextShadowType = Single -TextShadowColor = 221 221 221 +TextShadowColor = 42 42 42 [Button.Pushbutton(Defaulted)] AccentColorHint = 0 255 0 @@ -105,13 +105,13 @@ AccentColorHint = 0 255 0 TextColor = 153 153 153 [Button.Pushbutton(Hot)] -TextColor = 75 75 75 +TextColor = 200 200 200 [Button.Pushbutton(Normal)] -TextColor = 75 75 75 +TextColor = 200 200 200 [Button.Pushbutton(Pressed)] -TextColor = 75 75 75 +TextColor = 200 200 200 ;Checkboxes [Button.Checkbox] @@ -1488,7 +1488,7 @@ SizingType = stretch Transparent = True [Window.Caption(Active)] -TextColor = 42 42 42 +TextColor = 255 255 255 [Window.Caption(Disabled)] IconEffect = Alpha diff --git a/media/themes/Modern/modern.msstyles/textfiles/Dark/RegularDark.INI b/media/themes/Modern/modern.msstyles/textfiles/Dark/RegularDark.INI index 775d3eccc25..0f3f624f137 100644 --- a/media/themes/Modern/modern.msstyles/textfiles/Dark/RegularDark.INI +++ b/media/themes/Modern/modern.msstyles/textfiles/Dark/RegularDark.INI @@ -93,10 +93,10 @@ ImageLayout = vertical MinSize = 10, 5 SizingMargins = 8, 8, 9, 9 SizingType = Stretch -TextColor = 112 112 112 +TextColor = 200 200 200 TEXTSHADOWOFFSET = 1,1 TextShadowType = Single -TextShadowColor = 221 221 221 +TextShadowColor = 42 42 42 [Button.Pushbutton(Defaulted)] AccentColorHint = 0 255 0 @@ -105,13 +105,13 @@ AccentColorHint = 0 255 0 TextColor = 153 153 153 [Button.Pushbutton(Hot)] -TextColor = 75 75 75 +TextColor = 200 200 200 [Button.Pushbutton(Normal)] -TextColor = 75 75 75 +TextColor = 200 200 200 [Button.Pushbutton(Pressed)] -TextColor = 75 75 75 +TextColor = 200 200 200 ;Checkboxes [Button.Checkbox] @@ -1488,7 +1488,7 @@ SizingType = stretch Transparent = True [Window.Caption(Active)] -TextColor = 42 42 42 +TextColor = 255 255 255 [Window.Caption(Disabled)] IconEffect = Alpha

2 years, 3 months

[reactos] 01/01: [TRANSLATION] French translation update (#4638)

by Kyle Katarn

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=22f0c3a84a24b75d7ebe5… commit 22f0c3a84a24b75d7ebe54913ae51185fb0c28a2 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Sat Sep 3 23:12:29 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Sep 3 23:12:29 2022 +0200 [TRANSLATION] French translation update (#4638) Update of various French translation files for several modules: CALC, LABEL, DXDIAG, MPLAY32, RAPPS, SHUTDOWN, SNDVOL32, EXPLORER, WINLOGON; CONSOLE.CPL, MMSYS.CPL; NETCFGX.DLL, SHELL32.DLL, SHLWAPI.DLL, SYSSETUP.DLL --- base/applications/calc/lang/fr-FR.rc | 6 +++--- base/applications/cmdutils/label/lang/fr-FR.rc | 19 +++++++++-------- base/applications/dxdiag/lang/fr-FR.rc | 14 ++++++------- base/applications/mplay32/lang/fr-FR.rc | 2 +- base/applications/rapps/lang/fr-FR.rc | 2 +- base/applications/shutdown/lang/fr-FR.rc | 2 +- base/applications/sndvol32/lang/fr-FR.rc | 28 +++++++++++++------------- base/shell/explorer/lang/fr-FR.rc | 4 ++-- base/system/winlogon/lang/fr-FR.rc | 4 ++-- dll/cpl/console/lang/fr-FR.rc | 12 +++++------ dll/cpl/mmsys/lang/fr-FR.rc | 6 +++--- dll/win32/netcfgx/lang/fr-FR.rc | 10 ++++----- dll/win32/shell32/lang/fr-FR.rc | 10 ++++----- dll/win32/shlwapi/lang/fr-FR.rc | 2 +- dll/win32/syssetup/lang/fr-FR.rc | 8 ++++---- 15 files changed, 64 insertions(+), 65 deletions(-) diff --git a/base/applications/calc/lang/fr-FR.rc b/base/applications/calc/lang/fr-FR.rc index edf5d672309..0e816ac319b 100644 --- a/base/applications/calc/lang/fr-FR.rc +++ b/base/applications/calc/lang/fr-FR.rc @@ -429,8 +429,8 @@ END /* Angles */ STRINGTABLE BEGIN - IDS_ANGLE_ARCMINUTES "Minute of arc" - IDS_ANGLE_ARCSECONDS "Second of arc" + IDS_ANGLE_ARCMINUTES "Minute d'arc" + IDS_ANGLE_ARCSECONDS "Seconde d'arc" IDS_ANGLE_DEGREES "Degrés" IDS_ANGLE_GRADIANS "Grades" IDS_ANGLE_RADIANS "Radians" @@ -599,7 +599,7 @@ BEGIN IDS_PRESSURE_KILOPASCALS "Kilopascals" IDS_PRESSURE_MM_OF_MERCURY "Millimètres de mercure" IDS_PRESSURE_PASCALS "Pascals" - IDS_PRESSURE_PSI "Pounds-force per square inch" + IDS_PRESSURE_PSI "Livre-force par pouce-carrés" END /* Temperatures */ diff --git a/base/applications/cmdutils/label/lang/fr-FR.rc b/base/applications/cmdutils/label/lang/fr-FR.rc index 8c56fce96fa..c40b306e95b 100644 --- a/base/applications/cmdutils/label/lang/fr-FR.rc +++ b/base/applications/cmdutils/label/lang/fr-FR.rc @@ -4,17 +4,16 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE BEGIN -// STRING_LABEL_HELP "Affiche ou change le nom de volume du disque.\n\nLABEL [disque:][nomdevolume]\n" - STRING_LABEL_HELP "Creates, changes or deletes the volume label of a disk.\n\n\ -LABEL [drive:][label]\n\n\ - drive: Specifies the drive letter of a drive.\n\ - label Specifies the label of the drive." + STRING_LABEL_HELP "Crée, modifie ou supprime le nom de volume d'un disque.\n\n\ +LABEL [disque:][nom_volume]\n\n\ + disque: Spécifie la lettre du disque.\n\ + nom_volume Spécifie le nom du volume." STRING_LABEL_TEXT1 "Le nom de volume du disque %c: est %s\n" STRING_LABEL_TEXT2 "Le disque %c: n'a pas de nom de volume\n" - STRING_LABEL_TEXT3 "Le numéro de serie du volume est %04X-%04X\n" - STRING_LABEL_TEXT4 "Nom de volume (32 Caractères, ENTREE si aucun) ? " - STRING_LABEL_PROMPT "Delete current volume label (Y/N)? " - STRING_LABEL_OPTIONS "YN" + STRING_LABEL_TEXT3 "Le numéro de série du volume est %04X-%04X\n" + STRING_LABEL_TEXT4 "Nom de volume (32 caractères, ENTRÉE si aucun) ? " + STRING_LABEL_PROMPT "Supprimer le nom actuel (O/N) ? " + STRING_LABEL_OPTIONS "ON" STRING_ERROR_INVALID_DRIVE "Lecteur spécifié introuvable\n" - STRING_ERROR_INVALID_LABEL "Invalid volume label\n" + STRING_ERROR_INVALID_LABEL "Nom de volume invalide\n" END diff --git a/base/applications/dxdiag/lang/fr-FR.rc b/base/applications/dxdiag/lang/fr-FR.rc index 65d9fcbba76..c3e48b23fe9 100644 --- a/base/applications/dxdiag/lang/fr-FR.rc +++ b/base/applications/dxdiag/lang/fr-FR.rc @@ -42,7 +42,7 @@ BEGIN EDITTEXT IDC_STATIC_MEM, 155, 130, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_SWAP, 155, 140, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_VERSION, 155, 150, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 135, 10, WS_DISABLED + CHECKBOX "Vérifier la signature numérique WHQL", IDC_WHQL_SIGN_CHECK, 15, 170, 135, 10, WS_DISABLED END IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220 @@ -182,11 +182,11 @@ IDD_HELP_DIALOG DIALOGEX 0, 0, 462, 220 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10 - PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED - LTEXT "Displays additional system information", IDC_STATIC, 90, 23, 300, 10 - PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED - LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 43, 300, 10 + LTEXT "Vous ne trouvez pas les informations que vous cherchez ? Voici ce que vous pouvez faire :", IDC_STATIC, 5, 0, 300, 10 + PUSHBUTTON "Informations système", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED + LTEXT "Affiche des informations système complémentaires", IDC_STATIC, 90, 23, 300, 10 + PUSHBUTTON "Remplacer la freq. de rafraichissement", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED + LTEXT "Remplacer la freq. de rafraichissement pour DirectDraw", IDC_STATIC, 90, 43, 300, 10 END STRINGTABLE @@ -250,5 +250,5 @@ BEGIN IDS_DMUSIC_DLS "Supports DLS" IDS_DMUSIC_EXT "External" IDS_DMUSIC_PORT "Default Port" - IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices.\nDo you wish to continue?\n" + IDS_DDDISABLE_MSG "Ceci va désactiver toute accélération graphique matérielle pour DirectDraw sur tous les périphériques.\nVoulez-vous continuer ?\n" END diff --git a/base/applications/mplay32/lang/fr-FR.rc b/base/applications/mplay32/lang/fr-FR.rc index 7c9af643858..90fc3e35773 100644 --- a/base/applications/mplay32/lang/fr-FR.rc +++ b/base/applications/mplay32/lang/fr-FR.rc @@ -63,5 +63,5 @@ BEGIN IDS_TOOLTIP_PAUSE "Pause" IDS_APPTITLE "ReactOS Multimedia Player" IDS_PLAY "Lire" - IDS_DEFAULTMCIERRMSG "No description is available for this error." + IDS_DEFAULTMCIERRMSG "Aucune description pour cette erreur." END diff --git a/base/applications/rapps/lang/fr-FR.rc b/base/applications/rapps/lang/fr-FR.rc index 499cdda5851..f58ab4ba2c1 100644 --- a/base/applications/rapps/lang/fr-FR.rc +++ b/base/applications/rapps/lang/fr-FR.rc @@ -214,7 +214,7 @@ BEGIN IDS_APP_DISPLAY_DETAILS "Détails" IDS_APP_DISPLAY_LIST "Liste" IDS_APP_DISPLAY_TILE "Tuile" - IDS_NO_SEARCH_RESULTS "No search results" + IDS_NO_SEARCH_RESULTS "Aucun résultat" END STRINGTABLE diff --git a/base/applications/shutdown/lang/fr-FR.rc b/base/applications/shutdown/lang/fr-FR.rc index f6b4b38bdbf..5a86716b0e6 100644 --- a/base/applications/shutdown/lang/fr-FR.rc +++ b/base/applications/shutdown/lang/fr-FR.rc @@ -30,7 +30,7 @@ END /* Information and error messages */ STRINGTABLE BEGIN - IDS_USAGE "ReactOS Shutdown Utility\n\ + IDS_USAGE "Utilitaire d'arrêt du système ReactOS\n\ \n\ Utilisation : shutdown [/?] [/i | /l | /s | /r | /g | /a | /p | /h | /e] [/f]\n\ [/m \\\\ordinateur][/t xxx][/d [p|u:]xx:yy [/c ""commentaire""]]\n\ diff --git a/base/applications/sndvol32/lang/fr-FR.rc b/base/applications/sndvol32/lang/fr-FR.rc index 76cd77e406b..c3d23778dd6 100644 --- a/base/applications/sndvol32/lang/fr-FR.rc +++ b/base/applications/sndvol32/lang/fr-FR.rc @@ -22,7 +22,7 @@ BEGIN IDS_SNDVOL32 "Contrôle du volume" IDS_NOMIXERDEVICES "Il n'y a pas de périphérique de mixage disponible ! L'application va se terminer." IDS_SELECT "&Select" - IDS_ADVANCED_CONTROLS "Advanced Controls for %s" + IDS_ADVANCED_CONTROLS "Contrôles avancés pour %s" IDS_OTHER_CONTROLS1 "&1 %s" IDS_OTHER_CONTROLS2 "&2 %s" END @@ -113,24 +113,24 @@ END IDD_ADVANCED DIALOGEX 0, 0, 255, 140 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Advanced Controls for Volume Control" +CAPTION "Contrôles avancés du volume" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_MAINAPP, -1, "static", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 32, 32 - LTEXT "These settings can be used to make fine adjustments to your audio.", -1, 44, 7, 200, 32 - GROUPBOX "Tone Controls", IDC_ADV_TONE_CONTROLS, 7, 33, 240, 80 - LTEXT "These settings control how the tone of your audio sounds.", -1, 17, 48, 200, 14 - LTEXT "&Bass:", -1, 17, 62, 50, 8 - LTEXT "Low", IDC_ADV_BASS_LOW, 77, 62, 20, 8 - LTEXT "High", IDC_ADV_BASS_HIGH, 182, 62, 20, 8 + LTEXT "Ces paramètres peuvent être utilisés pour des ajustements fins de l'audio.", -1, 44, 7, 200, 32 + GROUPBOX "Contrôles du ton", IDC_ADV_TONE_CONTROLS, 7, 33, 240, 80 + LTEXT "Ces paramètres contrôlent la tonalité de l'audio.", -1, 17, 48, 200, 14 + LTEXT "&Basses :", -1, 17, 62, 50, 8 + LTEXT "Bas", IDC_ADV_BASS_LOW, 77, 62, 20, 8 + LTEXT "Haut", IDC_ADV_BASS_HIGH, 182, 62, 20, 8 CONTROL "", IDC_ADV_BASS_SLIDER, "msctls_trackbar32", TBS_HORZ | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 97, 62, 80, 20 - LTEXT "&Treble:", -1, 17, 90, 50, 8 - LTEXT "Low", IDC_ADV_TREBLE_LOW, 77, 90, 20, 8 - LTEXT "High", IDC_ADV_TREBLE_HIGH, 182, 90, 20, 8 + LTEXT "&Aigus :", -1, 17, 90, 50, 8 + LTEXT "Bas", IDC_ADV_TREBLE_LOW, 77, 90, 20, 8 + LTEXT "Haut", IDC_ADV_TREBLE_HIGH, 182, 90, 20, 8 CONTROL "", IDC_ADV_TREBLE_SLIDER, "msctls_trackbar32", TBS_HORZ | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 97, 90, 80, 20 - GROUPBOX "Other Controls", IDC_ADV_OTHER_CONTROLS, 7, 119, 240, 66 - LTEXT "These settings make other changes to how your audio sounds. See your hardware documentation for details.", IDC_ADV_OTHER_TEXT, 17, 135, 220, 28 + GROUPBOX "Autres contrôles", IDC_ADV_OTHER_CONTROLS, 7, 119, 240, 66 + LTEXT "Ces paramètres apportent d'autres modifications sur l'audio. Consultez la documentation du matériel pour plus de détails.", IDC_ADV_OTHER_TEXT, 17, 135, 220, 28 AUTOCHECKBOX "&1 ", IDC_ADV_OTHER_CHECK1, 17, 159, 220, 14 AUTOCHECKBOX "&2 ", IDC_ADV_OTHER_CHECK2, 17, 174, 220, 14 - DEFPUSHBUTTON "Close", IDOK, 197, 120, 50, 14, WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Fermer", IDOK, 197, 120, 50, 14, WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP END diff --git a/base/shell/explorer/lang/fr-FR.rc b/base/shell/explorer/lang/fr-FR.rc index 46b247cd8e3..0d1ac38a692 100644 --- a/base/shell/explorer/lang/fr-FR.rc +++ b/base/shell/explorer/lang/fr-FR.rc @@ -193,6 +193,6 @@ END STRINGTABLE BEGIN - IDS_TASKBAR_STARTMENU_PROP_CAPTION "Barrre des tâches et menu démarrer" - IDS_RESTORE_ALL "&Show Open Windows" + IDS_TASKBAR_STARTMENU_PROP_CAPTION "Barre des tâches et Menu Démarrer" + IDS_RESTORE_ALL "&Afficher les fenêtres ouvertes" END diff --git a/base/system/winlogon/lang/fr-FR.rc b/base/system/winlogon/lang/fr-FR.rc index ca15609642f..2344c4f4cc7 100644 --- a/base/system/winlogon/lang/fr-FR.rc +++ b/base/system/winlogon/lang/fr-FR.rc @@ -46,8 +46,8 @@ BEGIN IDS_RUNNINGLOGONSCRIPTS "Exécution des scripts d'ouverture de session..." IDS_LOADINGYOURPERSONALSETTINGS "Chargement de vos paramètres personnels..." IDS_CLOSINGNETWORKCONNECTIONS "Fermeture des connections réseau..." - IDS_REACTOSISRESTARTING "Restarting..." - IDS_REACTOSISSHUTTINGDOWN "Shutting down..." + IDS_REACTOSISRESTARTING "Redémarrage..." + IDS_REACTOSISSHUTTINGDOWN "Arrêt en cours..." IDS_PREPARETOSTANDBY "Préparation de la Mise en Veille..." IDS_PREPARETOHIBERNATE "Préparation de l'hibernation..." IDS_SAVEYOURSETTINGS "Enregistrement de vos paramètres..." diff --git a/dll/cpl/console/lang/fr-FR.rc b/dll/cpl/console/lang/fr-FR.rc index b4db29fc9a3..b308d41c49a 100644 --- a/dll/cpl/console/lang/fr-FR.rc +++ b/dll/cpl/console/lang/fr-FR.rc @@ -15,11 +15,11 @@ BEGIN AUTORADIOBUTTON "&Fenêtre", IDC_RADIO_DISPLAY_WINDOW, 142, 20, 70, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP AUTORADIOBUTTON "P&lein écran", IDC_RADIO_DISPLAY_FULL, 142, 40, 70, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP GROUPBOX "Historique des commandes", IDC_STATIC, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Taille du &buffer :", IDC_STATIC, 14, 101, 70, 12 + LTEXT "&Taille de la mémoire tampon :", IDC_STATIC, 14, 97, 70, 24 EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 97, 12, 15 - LTEXT "&Nombre de buffers :", IDC_STATIC, 14, 124, 70, 12 + LTEXT "&Nombre de mémoires tampon :", IDC_STATIC, 14, 120, 70, 24 EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 120, 12, 15 @@ -36,7 +36,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Police" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Fenêtre de Prévisualisation :", IDC_STATIC, 7, 7, 115, 10 + LTEXT "Aperçu de la fenêtre :", IDC_STATIC, 7, 7, 115, 10 CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "WinPreview", WS_BORDER | WS_CHILD | WS_VISIBLE, 7, 20, 115, 70 LTEXT "Taille :", IDC_STATIC, 130, 7, 45, 10 LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 50, 86, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP @@ -46,7 +46,7 @@ BEGIN LTEXT "&Police :", IDC_STATIC, 10, 105, 33, 10 AUTOCHECKBOX "&Gras", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10 LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Selected Font", IDC_GROUPBOX_FONT_NAME, 7, 156, 240, 50 + GROUPBOX "Police sélectionnée", IDC_GROUPBOX_FONT_NAME, 7, 156, 240, 50 CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 12, 166, 104, 35, WS_EX_CLIENTEDGE LTEXT "Chaque caractère utilise :", IDC_STATIC, 125, 166, 85, 10 LTEXT "pixels en largeur\npixels en hauteur", IDC_STATIC, 138, 180, 100, 20 @@ -59,9 +59,9 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Disposition" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Fenêtre de Prévisualisation :", IDC_STATIC, 7, 7, 115, 10 + LTEXT "Aperçu de la fenêtre :", IDC_STATIC, 7, 7, 115, 10 CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "WinPreview", WS_BORDER | WS_CHILD | WS_VISIBLE, 7, 20, 115, 70 - GROUPBOX "Taille du buffer de l'écran", IDC_STATIC, 130, 12, 115, 50 + GROUPBOX "Taille de mémoire tampon écran", IDC_STATIC, 130, 12, 115, 50 LTEXT "&Largeur :", IDC_STATIC, 140, 28, 40, 10 LTEXT "&Hauteur :", IDC_STATIC, 140, 46, 39, 10 EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 203, 25, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP diff --git a/dll/cpl/mmsys/lang/fr-FR.rc b/dll/cpl/mmsys/lang/fr-FR.rc index 74ea03e1ec7..7b0b826c348 100644 --- a/dll/cpl/mmsys/lang/fr-FR.rc +++ b/dll/cpl/mmsys/lang/fr-FR.rc @@ -270,7 +270,7 @@ BEGIN 5851 "Menu démarrer" IDS_REACTOS_LOGOFF "Déconnexion ReactOS" IDS_REACTOS_LOGON "Connexion ReactOS" - 5854 "ReactOS Explorer" - IDS_BROWSE_FOR_SOUND "Search for new sounds" - IDS_WAVE_FILES_FILTER "Wave Files (*.wav)|*.wav|" + 5854 "Explorateur ReactOS" + IDS_BROWSE_FOR_SOUND "Chercher de nouveaux sons" + IDS_WAVE_FILES_FILTER "Fichiers Wave (*.wav)|*.wav|" END diff --git a/dll/win32/netcfgx/lang/fr-FR.rc b/dll/win32/netcfgx/lang/fr-FR.rc index d7827337393..4afe33ccbd0 100644 --- a/dll/win32/netcfgx/lang/fr-FR.rc +++ b/dll/win32/netcfgx/lang/fr-FR.rc @@ -197,18 +197,18 @@ END IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Advanced" +CAPTION "Avancé" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "The following properties are available for this network adapter. Click the property you want to change on the left, and then select its value on the right.", -1, 7, 7, 218, 24, WS_GROUP - LTEXT "&Property:", -1, 7, 37, 60, 8, WS_GROUP + LTEXT "Les propriétés suivantes sont disponibles pour cette carte réseau. Cliquez sur la propriété que vous souhaitez changer à gauche, puis choisissez sa valeur à droite.", -1, 7, 7, 218, 24, WS_GROUP + LTEXT "&Propriété :", -1, 7, 37, 60, 8, WS_GROUP LISTBOX IDC_PROPERTY_NAME, 7, 48, 124, 124, LBS_STANDARD | WS_TABSTOP - LTEXT "&Value:", -1, 151, 37, 60, 8, WS_GROUP + LTEXT "&Valeur :", -1, 151, 37, 60, 8, WS_GROUP EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP AUTORADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP - AUTORADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP + AUTORADIOBUTTON "&Absent", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index fdcb8e66a01..7d79c4653ac 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -842,8 +842,8 @@ BEGIN IDS_FORMAT_COMPLETE "Formatage terminé." /* Warning format system drive dialog strings */ - IDS_NO_FORMAT_TITLE "Cannot format this volume" - IDS_NO_FORMAT "This volume cannot be formatted! It contains important system files in order for ReactOS to run." + IDS_NO_FORMAT_TITLE "Impossible de formater ce volume" + IDS_NO_FORMAT "Ce volume ne peut pas être formaté. Il contient des fichiers systèmes indispensables pour le fonctionnement de ReactOS." /* Run File dialog */ IDS_RUNDLG_ERROR "Impossible d'afficher la boîte de dialogue pour l'exécution d'un fichier (erreur interne)" @@ -1029,8 +1029,8 @@ BEGIN IDS_SYSTEMFOLDER "Dossier système" /* For IDD_LOG_OFF_FANCY */ - IDS_LOG_OFF_DESC "Closes your programs and ends your ReactOS session." - IDS_SWITCH_USER_DESC "Lets another user log on while your programs and files remain open.\r\n\r\n(You can also switch users by pressing the Windows logo key + L.)" + IDS_LOG_OFF_DESC "Ferme vos programmes et termine votre session ReactOS." + IDS_SWITCH_USER_DESC "Permet à un autre utilisateur de se connecter, tout en gardant vos fichiers et programmes ouverts.\r\n\r\n(Vous pouvez également changer d'utilisateurs avec les touches Windows + L.)" IDS_LOG_OFF_TITLE "Fermer" - IDS_SWITCH_USER_TITLE "Switch User" + IDS_SWITCH_USER_TITLE "Changer d'utilisateur" END diff --git a/dll/win32/shlwapi/lang/fr-FR.rc b/dll/win32/shlwapi/lang/fr-FR.rc index 6de0bf5d286..b7b4d317e53 100644 --- a/dll/win32/shlwapi/lang/fr-FR.rc +++ b/dll/win32/shlwapi/lang/fr-FR.rc @@ -25,7 +25,7 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE { - IDS_BYTES_FORMAT "%ld bytes" + IDS_BYTES_FORMAT "%ld octets" IDS_TIME_INTERVAL_HOURS " h" IDS_TIME_INTERVAL_MINUTES " min" IDS_TIME_INTERVAL_SECONDS " s" diff --git a/dll/win32/syssetup/lang/fr-FR.rc b/dll/win32/syssetup/lang/fr-FR.rc index b83a731c7ea..798dbb7535d 100644 --- a/dll/win32/syssetup/lang/fr-FR.rc +++ b/dll/win32/syssetup/lang/fr-FR.rc @@ -178,12 +178,12 @@ BEGIN IDS_COMPUTERSUBTITLE "Vous devez fournir un nom et un mot de passe Administrateur pour votre ordinateur." IDS_LOCALETITLE "Options régionales" IDS_LOCALESUBTITLE "Vous pouvez modifier ReactOS pour différentes régions et langues." - IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set to %s." - IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" + IDS_LOCALETEXT "Les standards et formats sont définis à %s, et la localisation à %s." + IDS_LAYOUTTEXT "Votre langage par défaut est : agencement clavier %s" IDS_DATETIMETITLE "Date et Heure" IDS_DATETIMESUBTITLE "Configurez la date et l'heure correcte pour votre ordinateur." - IDS_PROCESSTITLE "Finishing the Installation" - IDS_PROCESSSUBTITLE "Please wait while Setup completes the final steps." + IDS_PROCESSTITLE "Finalisation de l'installation" + IDS_PROCESSSUBTITLE "Veuillez patienter pendant que l'Installation termine les étapes finales." IDS_THEMESELECTIONTITLE "Apparence" IDS_THEMESELECTIONSUBTITLE "Sélectionnez le thème que vous préférez" END

2 years, 3 months

[reactos] 01/01: [NTOS:EX] Fix returned number of handles for Idle System Process (#4661)

by Kyle Katarn

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7ed0284e8eb25b5512d55… commit 7ed0284e8eb25b5512d551bc9256cdfc945c0351 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Sat Sep 3 22:56:33 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Sep 3 22:56:33 2022 +0200 [NTOS:EX] Fix returned number of handles for Idle System Process (#4661) PsIdleProcess and PsInitialSystemProcess share the same handle table. This leads ObGetProcessHandleCount() to report the same number of handles when called on those system processes, when being enumerated by NtQuerySystemInformation(SystemProcessInformation). Instead, just return 0 for the handle count of the Idle process in SystemProcessInformation. This is not done in ObGetProcessHandleCount(), since a separate NtQueryInformationProcess(ProcessHandleCount) for the idle process should return a non-zero value. CORE-16577 --- ntoskrnl/ex/sysinfo.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/ex/sysinfo.c b/ntoskrnl/ex/sysinfo.c index 43ff88faaff..bf9b957fd42 100644 --- a/ntoskrnl/ex/sysinfo.c +++ b/ntoskrnl/ex/sysinfo.c @@ -1031,7 +1031,11 @@ QSI_DEF(SystemProcessInformation) SpiCurrent->BasePriority = Process->Pcb.BasePriority; SpiCurrent->UniqueProcessId = Process->UniqueProcessId; SpiCurrent->InheritedFromUniqueProcessId = Process->InheritedFromUniqueProcessId; - SpiCurrent->HandleCount = ObGetProcessHandleCount(Process); + + /* PsIdleProcess shares its handle table with PsInitialSystemProcess, + * so return the handle count for System only, not Idle one. */ + SpiCurrent->HandleCount = (Process == PsIdleProcess) ? 0 : ObGetProcessHandleCount(Process); + SpiCurrent->PeakVirtualSize = Process->PeakVirtualSize; SpiCurrent->VirtualSize = Process->VirtualSize; SpiCurrent->PageFaultCount = Process->Vm.PageFaultCount;

2 years, 3 months

[reactos] 01/01: [TASKMGR] Fix overlapping controls (French only) (#4658)

by Kyle Katarn

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=de5af76811bbd318cdef4… commit de5af76811bbd318cdef46e193f306833e3fa740 Author: Kyle Katarn <112266950+KRosUser(a)users.noreply.github.com> AuthorDate: Sat Sep 3 17:29:26 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Sep 3 17:29:26 2022 +0200 [TASKMGR] Fix overlapping controls (French only) (#4658) Controls are sized with 0 pixel gap, which is OK in general but show an overlap upon selection. Add the extra 1 pixel gap. --- base/applications/taskmgr/lang/fr-FR.rc | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/base/applications/taskmgr/lang/fr-FR.rc b/base/applications/taskmgr/lang/fr-FR.rc index 1963ca42aab..71d7dc4517d 100644 --- a/base/applications/taskmgr/lang/fr-FR.rc +++ b/base/applications/taskmgr/lang/fr-FR.rc @@ -294,19 +294,19 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 130, 177, 50, 14 PUSHBUTTON "Annuler", IDCANCEL, 187, 177, 50, 14 LTEXT "Sélectionnez les colonnes qui apparaîtront dans la page Processus du Gestionnaire des tâches", IDC_STATIC, 7, 7, 181, 17 - CONTROL "&Nom de l'image", IDC_IMAGENAME, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 7, 28, 123, 10 - CONTROL "&PID (Identificateur du Processus)", IDC_PID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 39, 123, 10 - CONTROL "Utilisation de l'UC", IDC_CPUUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 50, 123, 10 - CONTROL "T&emps processeur", IDC_CPUTIME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 61, 123, 10 - CONTROL "Utilisation de la &mémoire", IDC_MEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 72, 123, 10 - CONTROL "Écart &d'utilisation de la mémoire", IDC_MEMORYUSAGEDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 83, 123, 10 - CONTROL "Utilisation ma&ximale de la mémoire", IDC_PEAKMEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 94, 123, 10 - CONTROL "Erreurs de page", IDC_PAGEFAULTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 105, 123, 10 - CONTROL "Objets &USER", IDC_USEROBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 116, 123, 10 - CONTROL "Lectures E/S", IDC_IOREADS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 127, 123, 10 - CONTROL "Octets de lecture E/S", IDC_IOREADBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 138, 123, 10 - CONTROL "Identificateur de &session", IDC_SESSIONID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 149, 123, 10 - CONTROL "&Nom de l'utilisateur", IDC_USERNAME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 160, 123, 10 + CONTROL "&Nom de l'image", IDC_IMAGENAME, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 7, 28, 122, 10 + CONTROL "&PID (Identificateur du Processus)", IDC_PID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 39, 122, 10 + CONTROL "Utilisation de l'UC", IDC_CPUUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 50, 122, 10 + CONTROL "T&emps processeur", IDC_CPUTIME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 61, 122, 10 + CONTROL "Utilisation de la &mémoire", IDC_MEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 72, 122, 10 + CONTROL "Écart &d'utilisation de la mémoire", IDC_MEMORYUSAGEDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 83, 122, 10 + CONTROL "Utilisation ma&ximale de la mémoire", IDC_PEAKMEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 94, 122, 10 + CONTROL "Erreurs de page", IDC_PAGEFAULTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 105, 122, 10 + CONTROL "Objets &USER", IDC_USEROBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 116, 122, 10 + CONTROL "Lectures E/S", IDC_IOREADS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 127, 122, 10 + CONTROL "Octets de lecture E/S", IDC_IOREADBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 138, 122, 10 + CONTROL "Identificateur de &session", IDC_SESSIONID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 149, 122, 10 + CONTROL "&Nom de l'utilisateur", IDC_USERNAME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 160, 122, 10 CONTROL "Éc&art d'erreurs de pagination", IDC_PAGEFAULTSDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 129, 28, 108, 10 CONTROL "Taille de la mémoire &virtuelle", IDC_VIRTUALMEMORYSIZE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 129, 39, 108, 10 CONTROL "Réserve pa&ginée", IDC_PAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 129, 50, 108, 10

2 years, 3 months

[reactos] 01/01: [TASKMGR] Fix UI on SwitchTo for multiple application (#4652)

by Kyle Katarn

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f8c28b977363444ad3112… commit f8c28b977363444ad31124a6794347c53532b43f Author: Kyle Katarn <112266950+KRosUser(a)users.noreply.github.com> AuthorDate: Sat Sep 3 17:27:50 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Sep 3 17:27:50 2022 +0200 [TASKMGR] Fix UI on SwitchTo for multiple application (#4652) --- base/applications/taskmgr/applpage.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/base/applications/taskmgr/applpage.c b/base/applications/taskmgr/applpage.c index b249006e94b..e21de9922cf 100644 --- a/base/applications/taskmgr/applpage.c +++ b/base/applications/taskmgr/applpage.c @@ -512,15 +512,8 @@ void ApplicationPageUpdate(void) { EnableWindow(hApplicationPageEndTaskButton, FALSE); } - /* Enable "Switch To" button only if one app is selected */ - if (ListView_GetSelectedCount(hApplicationPageListCtrl) == 1 ) - { - EnableWindow(hApplicationPageSwitchToButton, TRUE); - } - else - { - EnableWindow(hApplicationPageSwitchToButton, FALSE); - } + /* Enable "Switch To" button only if only one app is selected */ + EnableWindow(hApplicationPageSwitchToButton, (ListView_GetSelectedCount(hApplicationPageListCtrl) == 1)); /* If we are on the applications tab the windows menu will be */ /* present on the menu bar so enable & disable the menu items */ @@ -693,6 +686,7 @@ void ApplicationPageShowContextMenu2(void) if (ListView_GetSelectedCount(hApplicationPageListCtrl) == 1) { + EnableMenuItem(hSubMenu, ID_APPLICATION_PAGE_SWITCHTO, MF_BYCOMMAND|MF_ENABLED); EnableMenuItem(hSubMenu, ID_WINDOWS_TILEHORIZONTALLY, MF_BYCOMMAND|MF_DISABLED|MF_GRAYED); EnableMenuItem(hSubMenu, ID_WINDOWS_TILEVERTICALLY, MF_BYCOMMAND|MF_DISABLED|MF_GRAYED); EnableMenuItem(hSubMenu, ID_WINDOWS_MINIMIZE, MF_BYCOMMAND|MF_ENABLED); @@ -702,6 +696,7 @@ void ApplicationPageShowContextMenu2(void) } else if (ListView_GetSelectedCount(hApplicationPageListCtrl) > 1) { + EnableMenuItem(hSubMenu, ID_APPLICATION_PAGE_SWITCHTO, MF_BYCOMMAND|MF_DISABLED|MF_GRAYED); EnableMenuItem(hSubMenu, ID_WINDOWS_TILEHORIZONTALLY, MF_BYCOMMAND|MF_ENABLED); EnableMenuItem(hSubMenu, ID_WINDOWS_TILEVERTICALLY, MF_BYCOMMAND|MF_ENABLED); EnableMenuItem(hSubMenu, ID_WINDOWS_MINIMIZE, MF_BYCOMMAND|MF_ENABLED); @@ -711,6 +706,7 @@ void ApplicationPageShowContextMenu2(void) } else { + EnableMenuItem(hSubMenu, ID_APPLICATION_PAGE_SWITCHTO, MF_BYCOMMAND|MF_DISABLED|MF_GRAYED); EnableMenuItem(hSubMenu, ID_WINDOWS_TILEHORIZONTALLY, MF_BYCOMMAND|MF_DISABLED|MF_GRAYED); EnableMenuItem(hSubMenu, ID_WINDOWS_TILEVERTICALLY, MF_BYCOMMAND|MF_DISABLED|MF_GRAYED); EnableMenuItem(hSubMenu, ID_WINDOWS_MINIMIZE, MF_BYCOMMAND|MF_DISABLED|MF_GRAYED);

2 years, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2022