Ros-diffs August 2022

ros-diffs@reactos.org

11 participants
86 discussions

[reactos] 01/01: [KERNEL32] Fix kernel32.rc for UTF-8 codepage (#4648)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bb9c5e8e3ea6c71c564cb… commit bb9c5e8e3ea6c71c564cb944df678752b75cefc0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Aug 31 12:04:21 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Aug 31 12:04:21 2022 +0900 [KERNEL32] Fix kernel32.rc for UTF-8 codepage (#4648) - Move #pragma code_page(65001) line. CORE-18177 --- dll/win32/kernel32/kernel32.rc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dll/win32/kernel32/kernel32.rc b/dll/win32/kernel32/kernel32.rc index 06d1647f64f..c099bca7013 100644 --- a/dll/win32/kernel32/kernel32.rc +++ b/dll/win32/kernel32/kernel32.rc @@ -7,13 +7,14 @@ //#include "windows.h" #include <errcodes.rc> +/* UTF-8 */ +#pragma code_page(65001) + #include "winnls/locale_rc.rc" /* FIXME */ #define NLSRC_OFFSET 5000 -/* UTF-8 */ -#pragma code_page(65001) #ifdef LANGUAGE_CS_CZ #include "winnls/lang/cs-CZ.rc" #endif

2 years, 3 months

[reactos] 01/01: [NTUSER] Move TL structure definition to ntuser.h (#4644)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=facc2837a10f9ea33e211… commit facc2837a10f9ea33e21135859859ea57d054a5b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Aug 30 09:35:27 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Aug 30 09:35:27 2022 +0900 [NTUSER] Move TL structure definition to ntuser.h (#4644) - Move struct _TL and TL definitions from win32.h to ntuser.h. - Modify the type of TL.pfnFree as newly-defined TL_FN_FREE function pointer. CORE-11700 --- win32ss/user/ntuser/ntuser.h | 9 +++++++++ win32ss/user/ntuser/win32.h | 9 ++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/win32ss/user/ntuser/ntuser.h b/win32ss/user/ntuser/ntuser.h index 090a7973690..a72571dc26f 100644 --- a/win32ss/user/ntuser/ntuser.h +++ b/win32ss/user/ntuser/ntuser.h @@ -9,6 +9,15 @@ #define UserEnterCo UserEnterExclusive #define UserLeaveCo UserLeave +typedef VOID (*TL_FN_FREE)(PVOID); + +typedef struct _TL +{ + struct _TL* next; + PVOID pobj; + TL_FN_FREE pfnFree; +} TL, *PTL; + extern PSERVERINFO gpsi; extern PTHREADINFO gptiCurrent; extern PPROCESSINFO gppiList; diff --git a/win32ss/user/ntuser/win32.h b/win32ss/user/ntuser/win32.h index dd30cf23fc8..9514b48c3ca 100644 --- a/win32ss/user/ntuser/win32.h +++ b/win32ss/user/ntuser/win32.h @@ -53,13 +53,8 @@ extern HANDLE hModuleWin; // This Win32k Instance. extern struct _CLS *SystemClassList; extern BOOL RegisteredSysClasses; -// FIXME: Move to ntuser.h -typedef struct _TL -{ - struct _TL* next; - PVOID pobj; - PVOID pfnFree; -} TL, *PTL; +struct _TL; +typedef struct _TL *PTL; typedef struct _W32THREAD {

2 years, 3 months

[reactos] 01/01: [KBSWITCH][NTUSER] Revert Shift+Alt handling

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8222c0e6d8a249fd47de3… commit 8222c0e6d8a249fd47de396306e9765b95a95268 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Aug 28 20:10:06 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Aug 28 20:15:33 2022 +0900 [KBSWITCH][NTUSER] Revert Shift+Alt handling The current Shift+Alt handling is buggy. The keyboard won't work frequently. It dislikes system-side Alt (VK_MENU) key handling. It seems like Shift+Alt handling should be in kernel. CORE-10667 --- base/applications/kbswitch/kbswitch.c | 31 ------------------------------- win32ss/user/ntuser/hotkey.c | 4 +--- 2 files changed, 1 insertion(+), 34 deletions(-) diff --git a/base/applications/kbswitch/kbswitch.c b/base/applications/kbswitch/kbswitch.c index 13a1470ce2b..d1b39320561 100644 --- a/base/applications/kbswitch/kbswitch.c +++ b/base/applications/kbswitch/kbswitch.c @@ -16,7 +16,6 @@ PKBSWITCHSETHOOKS KbSwitchSetHooks = NULL; PKBSWITCHDELETEHOOKS KbSwitchDeleteHooks = NULL; UINT ShellHookMessage = 0; -DWORD dwAltShiftHotKeyId = 0, dwShiftAltHotKeyId = 0; HINSTANCE hInst; HANDLE hProcessHeap; @@ -451,25 +450,6 @@ UpdateLanguageDisplayCurrent(HWND hwnd, WPARAM wParam) return UpdateLanguageDisplay(hwnd, hKL); } -VOID DoRegisterAltShiftHotKeys(HWND hwnd) -{ - dwAltShiftHotKeyId = GlobalAddAtom(TEXT("ReactOS Alt+Shift")); - dwShiftAltHotKeyId = GlobalAddAtom(TEXT("ReactOS Shift+Alt")); - - RegisterHotKey(hwnd, dwAltShiftHotKeyId, MOD_ALT | MOD_SHIFT, VK_SHIFT); - RegisterHotKey(hwnd, dwShiftAltHotKeyId, MOD_ALT | MOD_SHIFT, VK_MENU); -} - -VOID DoUnregisterAltShiftHotKeys(HWND hwnd) -{ - UnregisterHotKey(hwnd, dwAltShiftHotKeyId); - UnregisterHotKey(hwnd, dwShiftAltHotKeyId); - - GlobalDeleteAtom(dwAltShiftHotKeyId); - GlobalDeleteAtom(dwShiftAltHotKeyId); - dwAltShiftHotKeyId = dwShiftAltHotKeyId = 0; -} - LRESULT CALLBACK WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) { @@ -489,8 +469,6 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) ActivateLayout(hwnd, ulCurrentLayoutNum); s_uTaskbarRestart = RegisterWindowMessage(TEXT("TaskbarCreated")); - - DoRegisterAltShiftHotKeys(hwnd); break; } @@ -499,14 +477,6 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) return UpdateLanguageDisplay(hwnd, (HKL)lParam); } - case WM_HOTKEY: - { - if (wParam != dwAltShiftHotKeyId && wParam != dwShiftAltHotKeyId) - break; - - /* FALL THROUGH */ - } - case WM_LOAD_LAYOUT: { ULONG uNextNum = GetNextLayout(); @@ -599,7 +569,6 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) case WM_DESTROY: { - DoUnregisterAltShiftHotKeys(hwnd); DeleteHooks(); DestroyMenu(s_hMenu); DeleteTrayIcon(hwnd); diff --git a/win32ss/user/ntuser/hotkey.c b/win32ss/user/ntuser/hotkey.c index e9e11772a11..02b504fe668 100644 --- a/win32ss/user/ntuser/hotkey.c +++ b/win32ss/user/ntuser/hotkey.c @@ -211,9 +211,7 @@ co_UserProcessHotKeys(WORD wVk, BOOL bIsDown) if (IsModifier) { /* Modifier key up -- modifier-only keys are triggered here */ - pHotKey = IsHotKey(gfsModOnlyCandidate, wVk); - if (!pHotKey) - pHotKey = IsHotKey(gfsModOnlyCandidate, 0); + pHotKey = IsHotKey(gfsModOnlyCandidate, 0); gfsModOnlyCandidate = 0; } else

2 years, 3 months

[reactos] 01/01: [SYSDM] General page: Auto-update the system uptime (#4616)

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=efe25648a59d30b89141c… commit efe25648a59d30b89141ced89ce119ba11fe7cf2 Author: Thamatip Chitpong <tangaming123456(a)outlook.com> AuthorDate: Sun Aug 28 17:20:17 2022 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Aug 28 13:20:17 2022 +0300 [SYSDM] General page: Auto-update the system uptime (#4616) - Also insert curly-brackets for switch-case in GeneralPageProc - Use correct printf data type for the system uptime Reviewed-by: Stanislav Motylkov <x86corez(a)gmail.com> Reviewed-by: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> --- dll/cpl/sysdm/general.c | 122 +++++++++++++++++++++++++++++--------------- dll/cpl/sysdm/lang/bg-BG.rc | 2 +- dll/cpl/sysdm/lang/cs-CZ.rc | 2 +- dll/cpl/sysdm/lang/da-DK.rc | 2 +- dll/cpl/sysdm/lang/de-DE.rc | 2 +- dll/cpl/sysdm/lang/el-GR.rc | 2 +- dll/cpl/sysdm/lang/en-US.rc | 2 +- dll/cpl/sysdm/lang/es-ES.rc | 2 +- dll/cpl/sysdm/lang/fr-FR.rc | 2 +- dll/cpl/sysdm/lang/he-IL.rc | 2 +- dll/cpl/sysdm/lang/hu-HU.rc | 2 +- dll/cpl/sysdm/lang/id-ID.rc | 2 +- dll/cpl/sysdm/lang/it-IT.rc | 2 +- dll/cpl/sysdm/lang/ja-JP.rc | 2 +- dll/cpl/sysdm/lang/nl-NL.rc | 2 +- dll/cpl/sysdm/lang/no-NO.rc | 2 +- dll/cpl/sysdm/lang/pl-PL.rc | 2 +- dll/cpl/sysdm/lang/pt-PT.rc | 2 +- dll/cpl/sysdm/lang/ro-RO.rc | 2 +- dll/cpl/sysdm/lang/ru-RU.rc | 2 +- dll/cpl/sysdm/lang/sk-SK.rc | 2 +- dll/cpl/sysdm/lang/sq-AL.rc | 2 +- dll/cpl/sysdm/lang/sv-SE.rc | 2 +- dll/cpl/sysdm/lang/tr-TR.rc | 2 +- dll/cpl/sysdm/lang/uk-UA.rc | 2 +- dll/cpl/sysdm/lang/zh-CN.rc | 2 +- dll/cpl/sysdm/lang/zh-HK.rc | 2 +- dll/cpl/sysdm/lang/zh-TW.rc | 2 +- 28 files changed, 109 insertions(+), 67 deletions(-) diff --git a/dll/cpl/sysdm/general.c b/dll/cpl/sysdm/general.c index e1b8284d321..e09b4a44b6d 100644 --- a/dll/cpl/sysdm/general.c +++ b/dll/cpl/sysdm/general.c @@ -18,6 +18,7 @@ #define ANIM_STEP 2 #define ANIM_TIME 50 +#define ID_SYSUPTIME_UPDATE_TIMER 1 typedef struct _IMGINFO { @@ -28,8 +29,13 @@ typedef struct _IMGINFO INT iBits; } IMGINFO, *PIMGINFO; +typedef ULONGLONG (WINAPI *PFGETTICKCOUNT64)(VOID); + static PIMGINFO pImgInfo; static const BLENDFUNCTION BlendFunc = {AC_SRC_OVER, 0, 255, AC_SRC_ALPHA}; +static HMODULE hKernel32Vista = NULL; +static PFGETTICKCOUNT64 pGetTickCount64 = NULL; +static WCHAR szUptimeFormat[64]; VOID ShowLastWin32Error(HWND hWndOwner) { @@ -598,73 +604,85 @@ static VOID GetSystemVersion(HWND hwnd) HeapFree(GetProcessHeap(), 0, pwszStr); } -ULONGLONG GetSecondsQPC(VOID) +/** + * @brief + * An equivalent of GetTickCount64, implemented using QueryPerformanceCounter. + * + * @return + * The number of milliseconds that have elapsed since the system was started. + */ +static ULONGLONG GetTickCountQPC(VOID) { LARGE_INTEGER Counter, Frequency; QueryPerformanceCounter(&Counter); QueryPerformanceFrequency(&Frequency); - return Counter.QuadPart / Frequency.QuadPart; + return (Counter.QuadPart * 1000) / Frequency.QuadPart; } -ULONGLONG GetSeconds(VOID) +static VOID GetSystemUptime(HWND hwndDlg) { - ULONGLONG (WINAPI * pGetTickCount64)(VOID); - ULONGLONG Ticks64; - HMODULE hModule = GetModuleHandleW(L"kernel32.dll"); - - pGetTickCount64 = (PVOID)GetProcAddress(hModule, "GetTickCount64"); - if (pGetTickCount64) - { - return pGetTickCount64() / 1000; - } - - hModule = LoadLibraryW(L"kernel32_vista.dll"); + HWND hUptimeLabel; + ULONGLONG cMilliseconds; + ULONG cSeconds; + WCHAR szBuf[64]; - if (!hModule) + hUptimeLabel = GetDlgItem(hwndDlg, IDC_UPTIME); + if (!hUptimeLabel) { - return GetSecondsQPC(); + return; } - pGetTickCount64 = (PVOID)GetProcAddress(hModule, "GetTickCount64"); - if (pGetTickCount64) { - Ticks64 = pGetTickCount64() / 1000; + cMilliseconds = pGetTickCount64(); } else { - Ticks64 = GetSecondsQPC(); + cMilliseconds = GetTickCountQPC(); } - - FreeLibrary(hModule); - return Ticks64; + + cSeconds = cMilliseconds / 1000; + StringCchPrintfW(szBuf, _countof(szBuf), szUptimeFormat, + cSeconds / (60*60*24), // Days + (cSeconds / (60*60)) % 24, // Hours + (cSeconds / 60) % 60, // Minutes + cSeconds % 60); // Seconds + + SetWindowTextW(hUptimeLabel, szBuf); + + /* Set update timer (reset timeout if the timer exists) */ + SetTimer(hwndDlg, ID_SYSUPTIME_UPDATE_TIMER, 1000 - (cMilliseconds % 1000), NULL); } -VOID GetSystemUptime(HWND hwnd) +static VOID InitSystemUptime(HWND hwndDlg) { - HWND hRosUptime; - WCHAR szBuf[64], szStr[64]; - ULONG cSeconds; + HMODULE hKernel32; - hRosUptime = GetDlgItem(hwnd, IDC_UPTIME); - if (!hRosUptime) + /* Load time format string */ + if (LoadStringW(hApplet, IDS_UPTIME_FORMAT, szUptimeFormat, _countof(szUptimeFormat)) == 0) { return; } - if (!LoadStringW(hApplet, IDS_UPTIME_FORMAT, szStr, _countof(szStr))) + + /* Load required DLLs */ + hKernel32 = GetModuleHandleW(L"kernel32.dll"); + if (hKernel32) { - return; + pGetTickCount64 = (PFGETTICKCOUNT64)GetProcAddress(hKernel32, "GetTickCount64"); + if (!pGetTickCount64) + { + hKernel32Vista = LoadLibraryW(L"kernel32_vista.dll"); + if (hKernel32Vista) + { + pGetTickCount64 = (PFGETTICKCOUNT64)GetProcAddress(hKernel32Vista, "GetTickCount64"); + } + } } - cSeconds = GetSeconds(); - StringCchPrintfW(szBuf, _countof(szBuf), szStr, - cSeconds / (60*60*24), - (cSeconds / (60*60)) % 24, - (cSeconds / 60) % 60, - cSeconds % 60); - - SetWindowTextW(hRosUptime, szBuf); + + /* Show system uptime and set update timer */ + GetSystemUptime(hwndDlg); } /* Property page dialog callback */ @@ -676,6 +694,7 @@ INT_PTR CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM switch (uMsg) { case WM_INITDIALOG: + { pImgInfo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IMGINFO)); if (pImgInfo == NULL) { @@ -687,14 +706,36 @@ INT_PTR CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_ROSIMG), GWLP_WNDPROC, (LONG_PTR)RosImageProc); GetSystemInformation(hwndDlg); GetSystemVersion(hwndDlg); - GetSystemUptime(hwndDlg); + InitSystemUptime(hwndDlg); break; + } case WM_DESTROY: + { + KillTimer(hwndDlg, ID_SYSUPTIME_UPDATE_TIMER); + + if (hKernel32Vista) + { + FreeLibrary(hKernel32Vista); + } + HeapFree(GetProcessHeap(), 0, pImgInfo); break; + } + + case WM_TIMER: + { + if (wParam == ID_SYSUPTIME_UPDATE_TIMER) + { + /* Update system uptime */ + GetSystemUptime(hwndDlg); + } + + break; + } case WM_COMMAND: + { if (LOWORD(wParam) == IDC_LICENCE) { DialogBox(hApplet, MAKEINTRESOURCE(IDD_LICENCE), hwndDlg, LicenceDlgProc); @@ -702,6 +743,7 @@ INT_PTR CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM return TRUE; } break; + } case WM_DRAWITEM: { diff --git a/dll/cpl/sysdm/lang/bg-BG.rc b/dll/cpl/sysdm/lang/bg-BG.rc index 558982bff3d..4a262345e69 100644 --- a/dll/cpl/sysdm/lang/bg-BG.rc +++ b/dll/cpl/sysdm/lang/bg-BG.rc @@ -333,7 +333,7 @@ BEGIN IDS_PETABYTE "ПБ памет" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" - IDS_UPTIME_FORMAT "%u Days, %02u:%02u:%02u" + IDS_UPTIME_FORMAT "%lu Days, %02lu:%02lu:%02lu" IDS_VARIABLE "Променлива" IDS_VALUE "Стойност" IDS_NO_DUMP "(Няма)" diff --git a/dll/cpl/sysdm/lang/cs-CZ.rc b/dll/cpl/sysdm/lang/cs-CZ.rc index 5d833748da6..fee0ea9c048 100644 --- a/dll/cpl/sysdm/lang/cs-CZ.rc +++ b/dll/cpl/sysdm/lang/cs-CZ.rc @@ -338,7 +338,7 @@ BEGIN IDS_PETABYTE "PB RAM" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" - IDS_UPTIME_FORMAT "%u Days, %02u:%02u:%02u" + IDS_UPTIME_FORMAT "%lu Days, %02lu:%02lu:%02lu" IDS_VARIABLE "Proměnná" IDS_VALUE "Hodnota" IDS_NO_DUMP "(Není)" diff --git a/dll/cpl/sysdm/lang/da-DK.rc b/dll/cpl/sysdm/lang/da-DK.rc index 418896de88b..84bea27b355 100644 --- a/dll/cpl/sysdm/lang/da-DK.rc +++ b/dll/cpl/sysdm/lang/da-DK.rc @@ -333,7 +333,7 @@ BEGIN IDS_PETABYTE "PB of RAM" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" - IDS_UPTIME_FORMAT "%u Days, %02u:%02u:%02u" + IDS_UPTIME_FORMAT "%lu Days, %02lu:%02lu:%02lu" IDS_VARIABLE "Variable" IDS_VALUE "Value" IDS_NO_DUMP "(None)" diff --git a/dll/cpl/sysdm/lang/de-DE.rc b/dll/cpl/sysdm/lang/de-DE.rc index 16528627e51..94faf72da66 100644 --- a/dll/cpl/sysdm/lang/de-DE.rc +++ b/dll/cpl/sysdm/lang/de-DE.rc @@ -342,7 +342,7 @@ BEGIN IDS_PETABYTE "PB RAM" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" - IDS_UPTIME_FORMAT "%u Tage, %02u:%02u:%02u" + IDS_UPTIME_FORMAT "%lu Tage, %02lu:%02lu:%02lu" IDS_VARIABLE "Variable" IDS_VALUE "Wert" IDS_NO_DUMP "(Keine)" diff --git a/dll/cpl/sysdm/lang/el-GR.rc b/dll/cpl/sysdm/lang/el-GR.rc index 612d28c8faa..d705729c8c4 100644 --- a/dll/cpl/sysdm/lang/el-GR.rc +++ b/dll/cpl/sysdm/lang/el-GR.rc @@ -333,7 +333,7 @@ BEGIN IDS_PETABYTE "PB μνήμης RAM" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" - IDS_UPTIME_FORMAT "%u Days, %02u:%02u:%02u" + IDS_UPTIME_FORMAT "%lu Days, %02lu:%02lu:%02lu" IDS_VARIABLE "Μεταβλητή" IDS_VALUE "Τιμή" IDS_NO_DUMP "(Κανένα)" diff --git a/dll/cpl/sysdm/lang/en-US.rc b/dll/cpl/sysdm/lang/en-US.rc index a93d10644e3..55fd0d38b59 100644 --- a/dll/cpl/sysdm/lang/en-US.rc +++ b/dll/cpl/sysdm/lang/en-US.rc @@ -333,7 +333,7 @@ BEGIN IDS_PETABYTE "PB of RAM" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" - IDS_UPTIME_FORMAT "%u Days, %02u:%02u:%02u" + IDS_UPTIME_FORMAT "%lu Days, %02lu:%02lu:%02lu" IDS_VARIABLE "Variable" IDS_VALUE "Value" IDS_NO_DUMP "(None)" diff --git a/dll/cpl/sysdm/lang/es-ES.rc b/dll/cpl/sysdm/lang/es-ES.rc index d2ee506ef7a..0c84e31f48c 100644 --- a/dll/cpl/sysdm/lang/es-ES.rc +++ b/dll/cpl/sysdm/lang/es-ES.rc @@ -335,7 +335,7 @@ BEGIN IDS_PETABYTE "PB de RAM" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" - IDS_UPTIME_FORMAT "%u Days, %02u:%02u:%02u" + IDS_UPTIME_FORMAT "%lu Days, %02lu:%02lu:%02lu" IDS_VARIABLE "Variable" IDS_VALUE "Valor" IDS_NO_DUMP "(Ninguno)" diff --git a/dll/cpl/sysdm/lang/fr-FR.rc b/dll/cpl/sysdm/lang/fr-FR.rc index dc3482478c7..e8a308a0044 100644 --- a/dll/cpl/sysdm/lang/fr-FR.rc +++ b/dll/cpl/sysdm/lang/fr-FR.rc @@ -333,7 +333,7 @@ BEGIN IDS_PETABYTE "Po de RAM" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" - IDS_UPTIME_FORMAT "%u jours, %02u:%02u:%02u" + IDS_UPTIME_FORMAT "%lu jours, %02lu:%02lu:%02lu" IDS_VARIABLE "Variable" IDS_VALUE "Valeur" IDS_NO_DUMP "(Aucun)" diff --git a/dll/cpl/sysdm/lang/he-IL.rc b/dll/cpl/sysdm/lang/he-IL.rc index b23b4629aa2..7aa1b57250d 100644 --- a/dll/cpl/sysdm/lang/he-IL.rc +++ b/dll/cpl/sysdm/lang/he-IL.rc @@ -335,7 +335,7 @@ BEGIN IDS_PETABYTE "PB זיכרון פיזי" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" - IDS_UPTIME_FORMAT "%u Days, %02u:%02u:%02u" + IDS_UPTIME_FORMAT "%lu Days, %02lu:%02lu:%02lu" IDS_VARIABLE "משתנה" IDS_VALUE "ערך" IDS_NO_DUMP "(ללא)" diff --git a/dll/cpl/sysdm/lang/hu-HU.rc b/dll/cpl/sysdm/lang/hu-HU.rc index fb1516cf31f..f69277af7f3 100644 --- a/dll/cpl/sysdm/lang/hu-HU.rc +++ b/dll/cpl/sysdm/lang/hu-HU.rc @@ -335,7 +335,7 @@ BEGIN IDS_PETABYTE "PB RAM" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" - IDS_UPTIME_FORMAT "%u nap, %02u:%02u:%02u" + IDS_UPTIME_FORMAT "%lu nap, %02lu:%02lu:%02lu" IDS_VARIABLE "Változó" IDS_VALUE "Érték" IDS_NO_DUMP "(nincs)" diff --git a/dll/cpl/sysdm/lang/id-ID.rc b/dll/cpl/sysdm/lang/id-ID.rc index 893f9215422..62855c463b9 100644 --- a/dll/cpl/sysdm/lang/id-ID.rc +++ b/dll/cpl/sysdm/lang/id-ID.rc @@ -333,7 +333,7 @@ BEGIN IDS_PETABYTE "PB RAM" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" - IDS_UPTIME_FORMAT "%u Hari, %02u:%02u:%02u" + IDS_UPTIME_FORMAT "%lu Hari, %02lu:%02lu:%02lu" IDS_VARIABLE "Variabel" IDS_VALUE "Nilai" IDS_NO_DUMP "(Tidak ada)" diff --git a/dll/cpl/sysdm/lang/it-IT.rc b/dll/cpl/sysdm/lang/it-IT.rc index ae0905d9c76..7fb6788f968 100644 --- a/dll/cpl/sysdm/lang/it-IT.rc +++ b/dll/cpl/sysdm/lang/it-IT.rc @@ -333,7 +333,7 @@ BEGIN IDS_PETABYTE "PB di RAM" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" - IDS_UPTIME_FORMAT "%u Giorno, %02u:%02u:%02u" + IDS_UPTIME_FORMAT "%lu Giorno, %02lu:%02lu:%02lu" IDS_VARIABLE "Variabile" IDS_VALUE "Valore" IDS_NO_DUMP "(None)" diff --git a/dll/cpl/sysdm/lang/ja-JP.rc b/dll/cpl/sysdm/lang/ja-JP.rc index 35b92143abb..3400bfd46a9 100644 --- a/dll/cpl/sysdm/lang/ja-JP.rc +++ b/dll/cpl/sysdm/lang/ja-JP.rc @@ -333,7 +333,7 @@ BEGIN IDS_PETABYTE "PB RAM" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" - IDS_UPTIME_FORMAT "%u Days, %02u:%02u:%02u" + IDS_UPTIME_FORMAT "%lu Days, %02lu:%02lu:%02lu" IDS_VARIABLE "可変" IDS_VALUE "値" IDS_NO_DUMP "(なし)" diff --git a/dll/cpl/sysdm/lang/nl-NL.rc b/dll/cpl/sysdm/lang/nl-NL.rc index 7cf279ef079..8ae90af4081 100644 --- a/dll/cpl/sysdm/lang/nl-NL.rc +++ b/dll/cpl/sysdm/lang/nl-NL.rc @@ -333,7 +333,7 @@ BEGIN IDS_PETABYTE "PB of RAM" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" - IDS_UPTIME_FORMAT "%u Days, %02u:%02u:%02u" + IDS_UPTIME_FORMAT "%lu Days, %02lu:%02lu:%02lu" IDS_VARIABLE "Variable" IDS_VALUE "Value" IDS_NO_DUMP "(None)" diff --git a/dll/cpl/sysdm/lang/no-NO.rc b/dll/cpl/sysdm/lang/no-NO.rc index 3850664b13b..586db5ad4d7 100644 --- a/dll/cpl/sysdm/lang/no-NO.rc +++ b/dll/cpl/sysdm/lang/no-NO.rc @@ -333,7 +333,7 @@ BEGIN IDS_PETABYTE "PB Systemminne" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" - IDS_UPTIME_FORMAT "%u Days, %02u:%02u:%02u" + IDS_UPTIME_FORMAT "%lu Days, %02lu:%02lu:%02lu" IDS_VARIABLE "Variabel" IDS_VALUE "Verdi" IDS_NO_DUMP "(Ingen)" diff --git a/dll/cpl/sysdm/lang/pl-PL.rc b/dll/cpl/sysdm/lang/pl-PL.rc index bef7fb5ec40..0a2e968336e 100644 --- a/dll/cpl/sysdm/lang/pl-PL.rc +++ b/dll/cpl/sysdm/lang/pl-PL.rc @@ -342,7 +342,7 @@ BEGIN IDS_PETABYTE "PB RAM" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" - IDS_UPTIME_FORMAT "%u dni, %02u:%02u:%02u" + IDS_UPTIME_FORMAT "%lu dni, %02lu:%02lu:%02lu" IDS_VARIABLE "Zmienna" IDS_VALUE "Wartość" IDS_NO_DUMP "(Brak)" diff --git a/dll/cpl/sysdm/lang/pt-PT.rc b/dll/cpl/sysdm/lang/pt-PT.rc index 6ec4cd443f4..30ff57ff9ea 100644 --- a/dll/cpl/sysdm/lang/pt-PT.rc +++ b/dll/cpl/sysdm/lang/pt-PT.rc @@ -337,7 +337,7 @@ BEGIN IDS_PETABYTE "PB de RAM" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" - IDS_UPTIME_FORMAT "%u Dias, %02u:%02u:%02u" + IDS_UPTIME_FORMAT "%lu Dias, %02lu:%02lu:%02lu" IDS_VARIABLE "Variável" IDS_VALUE "Valor" IDS_NO_DUMP "(Nenhum)" diff --git a/dll/cpl/sysdm/lang/ro-RO.rc b/dll/cpl/sysdm/lang/ro-RO.rc index 4047aa40ee9..d9ae4bef0db 100644 --- a/dll/cpl/sysdm/lang/ro-RO.rc +++ b/dll/cpl/sysdm/lang/ro-RO.rc @@ -342,7 +342,7 @@ BEGIN IDS_PETABYTE "Po de memorie" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" - IDS_UPTIME_FORMAT "%u zile, %02u:%02u:%02u" + IDS_UPTIME_FORMAT "%lu zile, %02lu:%02lu:%02lu" IDS_VARIABLE "Variabilă" IDS_VALUE "Valoare" IDS_NO_DUMP "(Fără fișier de depanare)" diff --git a/dll/cpl/sysdm/lang/ru-RU.rc b/dll/cpl/sysdm/lang/ru-RU.rc index 6477c525a8b..522e7e4a21a 100644 --- a/dll/cpl/sysdm/lang/ru-RU.rc +++ b/dll/cpl/sysdm/lang/ru-RU.rc @@ -333,7 +333,7 @@ BEGIN IDS_PETABYTE "Пб ОЗУ" IDS_MEGAHERTZ "МГц" IDS_GIGAHERTZ "ГГц" - IDS_UPTIME_FORMAT "%u дней, %02u:%02u:%02u" + IDS_UPTIME_FORMAT "%lu дней, %02lu:%02lu:%02lu" IDS_VARIABLE "Переменная" IDS_VALUE "Значение" IDS_NO_DUMP "(Нет)" diff --git a/dll/cpl/sysdm/lang/sk-SK.rc b/dll/cpl/sysdm/lang/sk-SK.rc index a0d14702b4d..d52cca7a45e 100644 --- a/dll/cpl/sysdm/lang/sk-SK.rc +++ b/dll/cpl/sysdm/lang/sk-SK.rc @@ -341,7 +341,7 @@ BEGIN IDS_PETABYTE "PB pamäte RAM" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" - IDS_UPTIME_FORMAT "%u Days, %02u:%02u:%02u" + IDS_UPTIME_FORMAT "%lu Days, %02lu:%02lu:%02lu" IDS_VARIABLE "Premenná" IDS_VALUE "Hodnota" IDS_NO_DUMP "(Žiadne)" diff --git a/dll/cpl/sysdm/lang/sq-AL.rc b/dll/cpl/sysdm/lang/sq-AL.rc index 9126bda3707..ab35f18cef2 100644 --- a/dll/cpl/sysdm/lang/sq-AL.rc +++ b/dll/cpl/sysdm/lang/sq-AL.rc @@ -333,7 +333,7 @@ BEGIN IDS_PETABYTE "PB e RAM" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" - IDS_UPTIME_FORMAT "%u Days, %02u:%02u:%02u" + IDS_UPTIME_FORMAT "%lu Days, %02lu:%02lu:%02lu" IDS_VARIABLE "Variablë" IDS_VALUE "Vlera" IDS_NO_DUMP "(Asnjë)" diff --git a/dll/cpl/sysdm/lang/sv-SE.rc b/dll/cpl/sysdm/lang/sv-SE.rc index 15742e83844..b0434a7785e 100644 --- a/dll/cpl/sysdm/lang/sv-SE.rc +++ b/dll/cpl/sysdm/lang/sv-SE.rc @@ -335,7 +335,7 @@ BEGIN IDS_PETABYTE "PB RAM" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" - IDS_UPTIME_FORMAT "%u Days, %02u:%02u:%02u" + IDS_UPTIME_FORMAT "%lu Days, %02lu:%02lu:%02lu" IDS_VARIABLE "Variabel" IDS_VALUE "Värde" IDS_NO_DUMP "(None)" diff --git a/dll/cpl/sysdm/lang/tr-TR.rc b/dll/cpl/sysdm/lang/tr-TR.rc index e6869383553..a76d4e4d9d9 100644 --- a/dll/cpl/sysdm/lang/tr-TR.rc +++ b/dll/cpl/sysdm/lang/tr-TR.rc @@ -335,7 +335,7 @@ BEGIN IDS_PETABYTE "PB Bellek" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" - IDS_UPTIME_FORMAT "%u Gün, %02u:%02u:%02u" + IDS_UPTIME_FORMAT "%lu Gün, %02lu:%02lu:%02lu" IDS_VARIABLE "Değişken" IDS_VALUE "Değer" IDS_NO_DUMP "(Yok)" diff --git a/dll/cpl/sysdm/lang/uk-UA.rc b/dll/cpl/sysdm/lang/uk-UA.rc index fce6619efea..f184fc359bc 100644 --- a/dll/cpl/sysdm/lang/uk-UA.rc +++ b/dll/cpl/sysdm/lang/uk-UA.rc @@ -341,7 +341,7 @@ BEGIN IDS_PETABYTE "Пб ОЗП" IDS_MEGAHERTZ "МГц" IDS_GIGAHERTZ "ГГц" - IDS_UPTIME_FORMAT "%u Days, %02u:%02u:%02u" + IDS_UPTIME_FORMAT "%lu Days, %02lu:%02lu:%02lu" IDS_VARIABLE "Змінна" IDS_VALUE "Значення" IDS_NO_DUMP "(Немає)" diff --git a/dll/cpl/sysdm/lang/zh-CN.rc b/dll/cpl/sysdm/lang/zh-CN.rc index 34d97e6ba67..99ac61bac35 100644 --- a/dll/cpl/sysdm/lang/zh-CN.rc +++ b/dll/cpl/sysdm/lang/zh-CN.rc @@ -342,7 +342,7 @@ BEGIN IDS_PETABYTE "PB 内存" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" - IDS_UPTIME_FORMAT "%u 天，%02u:%02u:%02u" + IDS_UPTIME_FORMAT "%lu 天，%02lu:%02lu:%02lu" IDS_VARIABLE "变量" IDS_VALUE "值" IDS_NO_DUMP "（无）" diff --git a/dll/cpl/sysdm/lang/zh-HK.rc b/dll/cpl/sysdm/lang/zh-HK.rc index 70463f98957..6c10f7098ac 100644 --- a/dll/cpl/sysdm/lang/zh-HK.rc +++ b/dll/cpl/sysdm/lang/zh-HK.rc @@ -341,7 +341,7 @@ BEGIN IDS_PETABYTE "PB 記憶體" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" - IDS_UPTIME_FORMAT "%u 日， %02u:%02u:%02u" + IDS_UPTIME_FORMAT "%lu 日， %02lu:%02lu:%02lu" IDS_VARIABLE "變量" IDS_VALUE "值" IDS_NO_DUMP "（無）" diff --git a/dll/cpl/sysdm/lang/zh-TW.rc b/dll/cpl/sysdm/lang/zh-TW.rc index 6fb147503ce..7332b1d3cd2 100644 --- a/dll/cpl/sysdm/lang/zh-TW.rc +++ b/dll/cpl/sysdm/lang/zh-TW.rc @@ -342,7 +342,7 @@ BEGIN IDS_PETABYTE "PB 記憶體" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" - IDS_UPTIME_FORMAT "%u 天， %02u:%02u:%02u" + IDS_UPTIME_FORMAT "%lu 天， %02lu:%02lu:%02lu" IDS_VARIABLE "變量" IDS_VALUE "值" IDS_NO_DUMP "（無）"

2 years, 3 months

[reactos] 01/01: [TASKLIST] Add Russian (ru-RU) translation (#4630)

by Artyom Ovsyannikov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5f16fbcd4713a1282f6cb… commit 5f16fbcd4713a1282f6cbe2034a5186b80634764 Author: Artyom Ovsyannikov <artemka6834(a)gmail.com> AuthorDate: Wed Aug 24 19:34:56 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun Aug 28 13:00:03 2022 +0300 [TASKLIST] Add Russian (ru-RU) translation (#4630) Reviewed-by: Stanislav Motylkov <binarymaster(a)mail.ru> --- base/applications/cmdutils/tasklist/lang/ru-RU.rc | 32 ++++++++++++++--------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/base/applications/cmdutils/tasklist/lang/ru-RU.rc b/base/applications/cmdutils/tasklist/lang/ru-RU.rc index ed72ca602b7..484eb032a9b 100644 --- a/base/applications/cmdutils/tasklist/lang/ru-RU.rc +++ b/base/applications/cmdutils/tasklist/lang/ru-RU.rc @@ -1,20 +1,28 @@ +/* + * PROJECT: ReactOS Tasklist Command + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Russian resource file + * TRANSLATORS: Copyright 2022 Artyom Ovsyannikov <artemka6834(a)gmail.com> + * Copyright 2022 Stanislav Motylkov <binarymaster(a)mail.ru> + */ + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_USAGE, "Usage: TASKLIST [/?] [/NH]\n" + IDS_USAGE, "Использование: TASKLIST [/?] [/NH]\n" IDS_DESCRIPTION, "\n\ -Desciption:\ - This tool displays a list of currently running processes on\n\ - the machine.\n" - IDS_OPTION_TOO_MUCH, "Error: Invalid syntax. '%1' option is not allowed more than '%2!d!' time(s).\n" - IDS_INVALID_SYNTAX, "Error: Invalid syntax.\n" - IDS_INVALID_OPTION, "Error: Unknown or invalid command line option specified.\n" - IDS_ENUM_FAILED, "Error: Unable to enumerate the process list.\n" - IDS_OUT_OF_MEMORY, "Error: Out of memory.\n" - IDS_HEADER_IMAGENAME, "Image Name" +Описание:\ + Этот инструмент отображает список процессов, запущенных на\n\ + этой машине.\n" + IDS_OPTION_TOO_MUCH, "Ошибка: неверный синтаксис. Нельзя использовать опцию '%1' больше '%2!d!' раз(а).\n" + IDS_INVALID_SYNTAX, "Ошибка: неверный синтаксис.\n" + IDS_INVALID_OPTION, "Ошибка: неизвестный или неправильный параметр командной строки.\n" + IDS_ENUM_FAILED, "Ошибка: не удалось отобразить список процессов.\n" + IDS_OUT_OF_MEMORY, "Ошибка: недостаточно памяти.\n" + IDS_HEADER_IMAGENAME, "Имя образа" IDS_HEADER_PID, "PID" - IDS_HEADER_SESSION, "Session#" - IDS_HEADER_MEMUSAGE, "Mem Usage" + IDS_HEADER_SESSION, "Сессия №" + IDS_HEADER_MEMUSAGE, "Использование памяти" IDS_MEMORY_STR, "%s K" END

2 years, 3 months

[reactos] 01/01: [USER32] Follow-up of "Follow-up of 2ba41ad"

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6970b545af3658effef92… commit 6970b545af3658effef9201def2df8e0333665cb Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Aug 28 16:20:40 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Aug 28 16:20:40 2022 +0900 [USER32] Follow-up of "Follow-up of 2ba41ad" You are careless. Do test. CORE-18338 --- win32ss/user/user32/windows/input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/user/user32/windows/input.c b/win32ss/user/user32/windows/input.c index 64fa97deffd..1dfa587602e 100644 --- a/win32ss/user/user32/windows/input.c +++ b/win32ss/user/user32/windows/input.c @@ -711,7 +711,7 @@ IntLoadKeyboardLayout( if (RegQueryValueExW(hKey, L"IME File", NULL, &dwType, (LPBYTE)szImeFileName, &dwSize) != ERROR_SUCCESS) { - FIXME("Check IME file existence in system32\n") + FIXME("Check IME file existence in system32\n"); bIsIME = FALSE; dwhkl = LOWORD(dwhkl); }

2 years, 3 months

[reactos] 01/01: [USER32] Follow-up of 2ba41ad

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8edc22a2ca81af088843a… commit 8edc22a2ca81af088843af3aad5ffe8be3dbf134 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Aug 28 16:17:58 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Aug 28 16:17:58 2022 +0900 [USER32] Follow-up of 2ba41ad Be careful about every case. CORE-18338 --- win32ss/user/user32/windows/input.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/win32ss/user/user32/windows/input.c b/win32ss/user/user32/windows/input.c index 97f84bb0d59..64fa97deffd 100644 --- a/win32ss/user/user32/windows/input.c +++ b/win32ss/user/user32/windows/input.c @@ -704,12 +704,17 @@ IntLoadKeyboardLayout( dwhkl |= (0xf000 | wcstol(wszLayoutId, NULL, 16)) << 16; } - /* Check "IME File" value */ - dwSize = sizeof(szImeFileName); - if (RegQueryValueExW(hKey, L"IME File", NULL, &dwType, (LPBYTE)szImeFileName, - &dwSize) != ERROR_SUCCESS) + if (bIsIME) { - dwhkl = LOWORD(dwhkl); + /* Check "IME File" value */ + dwSize = sizeof(szImeFileName); + if (RegQueryValueExW(hKey, L"IME File", NULL, &dwType, (LPBYTE)szImeFileName, + &dwSize) != ERROR_SUCCESS) + { + FIXME("Check IME file existence in system32\n") + bIsIME = FALSE; + dwhkl = LOWORD(dwhkl); + } } /* Close the key now */

2 years, 3 months

[reactos] 01/01: [USER32] Retry: Fix build against 0aa9d9f and 1d10671

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2ba41ad4e0d2d845362d6… commit 2ba41ad4e0d2d845362d6807a22bef03029314e6 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Aug 28 16:12:55 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Aug 28 16:12:55 2022 +0900 [USER32] Retry: Fix build against 0aa9d9f and 1d10671 CORE-18338 --- win32ss/user/user32/windows/input.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/win32ss/user/user32/windows/input.c b/win32ss/user/user32/windows/input.c index 0fb6ad0a459..97f84bb0d59 100644 --- a/win32ss/user/user32/windows/input.c +++ b/win32ss/user/user32/windows/input.c @@ -658,21 +658,12 @@ IntLoadKeyboardLayout( WCHAR wszRegKey[256] = L"SYSTEM\\CurrentControlSet\\Control\\Keyboard Layouts\\"; WCHAR wszLayoutId[10], wszNewKLID[10], szImeFileName[80]; HKL hNewKL; + HKEY hKey; BOOL bIsIME; dwhkl = wcstoul(pwszKLID, NULL, 16); bIsIME = IS_IME_HKL(UlongToHandle(dwhkl)); - if (bIsIME) /* IME? */ - { - /* Check "IME File" value */ - dwSize = sizeof(szImeFileName); - if (RegQueryValueExW(hKey, L"IME File", NULL, &dwType, (LPBYTE)szImeFileName, - &dwSize) != ERROR_SUCCESS) - { - dwhkl = LOWORD(dwhkl); - } - } - else + if (!bIsIME) /* Not IME? */ { dwhkl = LOWORD(dwhkl); /* LOWORD of dwhkl is language identifier */ } @@ -713,6 +704,14 @@ IntLoadKeyboardLayout( dwhkl |= (0xf000 | wcstol(wszLayoutId, NULL, 16)) << 16; } + /* Check "IME File" value */ + dwSize = sizeof(szImeFileName); + if (RegQueryValueExW(hKey, L"IME File", NULL, &dwType, (LPBYTE)szImeFileName, + &dwSize) != ERROR_SUCCESS) + { + dwhkl = LOWORD(dwhkl); + } + /* Close the key now */ RegCloseKey(hKey); }

2 years, 3 months

[reactos] 01/01: [USER32] Fix build against 0aa9d9f (uninitalized variable hKey)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1d106717bfe40aa8c497f… commit 1d106717bfe40aa8c497f81eb254b097e8eba024 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Aug 28 16:06:21 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Aug 28 16:06:21 2022 +0900 [USER32] Fix build against 0aa9d9f (uninitalized variable hKey) 2022-08-28T00:37:16.2978407Z d:\a\reactos\reactos\src\win32ss\user\user32\windows\input.c(671) : error C4700: uninitialized local variable 'hKey' used CORE-18338 --- win32ss/user/user32/windows/input.c | 1 - 1 file changed, 1 deletion(-) diff --git a/win32ss/user/user32/windows/input.c b/win32ss/user/user32/windows/input.c index cad4930de28..0fb6ad0a459 100644 --- a/win32ss/user/user32/windows/input.c +++ b/win32ss/user/user32/windows/input.c @@ -657,7 +657,6 @@ IntLoadKeyboardLayout( UNICODE_STRING ustrKLID; WCHAR wszRegKey[256] = L"SYSTEM\\CurrentControlSet\\Control\\Keyboard Layouts\\"; WCHAR wszLayoutId[10], wszNewKLID[10], szImeFileName[80]; - HKEY hKey; HKL hNewKL; BOOL bIsIME;

2 years, 3 months

[reactos] 01/01: [KBSWITCH] Simplify checking NULLs

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=43108ba763b346fffad5a… commit 43108ba763b346fffad5a31c974fe70fe89ccc69 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Aug 28 09:48:56 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Aug 28 09:48:56 2022 +0900 [KBSWITCH] Simplify checking NULLs CORE-10667 --- base/applications/kbswitch/kbswitch.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/base/applications/kbswitch/kbswitch.c b/base/applications/kbswitch/kbswitch.c index aac2c895d9a..13a1470ce2b 100644 --- a/base/applications/kbswitch/kbswitch.c +++ b/base/applications/kbswitch/kbswitch.c @@ -169,16 +169,6 @@ CreateTrayIcon(LPTSTR szLCID) hdc = CreateCompatibleDC(NULL); hbmColor = CreateCompatibleBitmap(hdc, CX_ICON, CY_ICON); hbmMono = CreateBitmap(CX_ICON, CY_ICON, 1, 1, NULL); - if (!hdc || !hbmColor || !hbmMono) - { - if (hdc) - DeleteDC(hdc); - if (hbmColor) - DeleteObject(hbmColor); - if (hbmMono) - DeleteObject(hbmMono); - return NULL; - } /* Create a font */ ZeroMemory(&lf, sizeof(lf)); @@ -187,11 +177,18 @@ CreateTrayIcon(LPTSTR szLCID) lf.lfWeight = FW_NORMAL; StringCchCopy(lf.lfFaceName, ARRAYSIZE(lf.lfFaceName), _T("Tahoma")); hFont = CreateFontIndirect(&lf); - if (!hFont) + + /* Checking NULL */ + if (!hdc || !hbmColor || !hbmMono || !hFont) { - DeleteDC(hdc); - DeleteObject(hbmColor); - DeleteObject(hbmMono); + if (hdc) + DeleteDC(hdc); + if (hbmColor) + DeleteObject(hbmColor); + if (hbmMono) + DeleteObject(hbmMono); + if (hFont) + DeleteObject(hFont); return NULL; }

2 years, 4 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2022