https://git.reactos.org/?p=reactos.git;a=commitdiff;h=067c08c23fe20f2dfa874…
commit 067c08c23fe20f2dfa874a0da7a48204e7a78683
Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com>
AuthorDate: Fri Dec 10 14:16:16 2021 +0000
Commit: GitHub <noreply(a)github.com>
CommitDate: Fri Dec 10 17:16:16 2021 +0300
[USETUP] Improve Portuguese (pt-PT) translation (#4131)
---
base/setup/usetup/lang/pt-PT.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/base/setup/usetup/lang/pt-PT.h b/base/setup/usetup/lang/pt-PT.h
index ab895a038de..3338810b0ac 100644
--- a/base/setup/usetup/lang/pt-PT.h
+++ b/base/setup/usetup/lang/pt-PT.h
@@ -1493,35 +1493,35 @@ static MUI_ENTRY ptPTBootLoaderEntries[] =
{
6,
8,
- "O instalador ir\240 configurar o gestor de inicializa\207\306o",
+ "O instalador ir\240 configurar o gestor de arranque.",
TEXT_STYLE_NORMAL,
TEXT_ID_STATIC
},
{
8,
12,
- "Instalar o gestor de inicializa\207\306o no disco r\241gido (MBR e VBR)",
+ "Instalar o gestor de arranque no disco r\241gido (MBR e VBR)",
TEXT_STYLE_NORMAL,
TEXT_ID_STATIC
},
{
8,
13,
- "Instalar o gestor de inicializa\207\306o no disco r\241gido (apenas VBR)",
+ "Instalar o gestor de arranque no disco r\241gido (apenas VBR)",
TEXT_STYLE_NORMAL,
TEXT_ID_STATIC
},
{
8,
14,
- "Instalar o gestor de inicializa\207\306o numa disquete",
+ "Instalar o gestor de arranque numa disquete",
TEXT_STYLE_NORMAL,
TEXT_ID_STATIC
},
{
8,
15,
- "Saltar a instala\207\306o do gestor de inicializa\207\306o",
+ "Saltar a instala\207\306o do gestor de arranque",
TEXT_STYLE_NORMAL,
TEXT_ID_STATIC
},
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8c9b6fdb5cb1fc111d39a…
commit 8c9b6fdb5cb1fc111d39a66920fee5e4351e850f
Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
AuthorDate: Fri Dec 10 13:37:43 2021 +0900
Commit: GitHub <noreply(a)github.com>
CommitDate: Fri Dec 10 13:37:43 2021 +0900
[USER32] Partially fix freezing of Task Switcher (#4148)
- Use SendMessageTimeout instead of SendMessage.
- Use SwitchToThisWindow instead of BringWindowToTop.
- Use ShowWindowAsync instead of ShowWindow.
- Use SWP_ASYNCWINDOWPOS for SetWindowPos.
CORE-17894
---
win32ss/user/user32/controls/appswitch.c | 80 +++++++++++++++++---------------
1 file changed, 42 insertions(+), 38 deletions(-)
diff --git a/win32ss/user/user32/controls/appswitch.c b/win32ss/user/user32/controls/appswitch.c
index 03531acfe85..61dff7ab6f5 100644
--- a/win32ss/user/user32/controls/appswitch.c
+++ b/win32ss/user/user32/controls/appswitch.c
@@ -127,8 +127,8 @@ void MakeWindowActive(HWND hwnd)
if (IsIconic(hwnd))
PostMessageW(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0);
- BringWindowToTop(hwnd); // same as: SetWindowPos(hwnd,HWND_TOP,0,0,0,0,SWP_NOMOVE|SWP_NOSIZE); ?
- SetForegroundWindow(hwnd);
+ // See also: https://microsoft.public.win32.programmer.ui.narkive.com/RqOdKqZ8/bringwind…
+ SwitchToThisWindow(hwnd, TRUE);
}
void CompleteSwitch(BOOL doSwitch)
@@ -139,7 +139,7 @@ void CompleteSwitch(BOOL doSwitch)
isOpen = FALSE;
TRACE("[ATbot] CompleteSwitch Hiding Window.\n");
- ShowWindow(switchdialog, SW_HIDE);
+ ShowWindowAsync(switchdialog, SW_HIDE);
if(doSwitch)
{
@@ -164,45 +164,49 @@ void CompleteSwitch(BOOL doSwitch)
BOOL CALLBACK EnumerateCallback(HWND window, LPARAM lParam)
{
- HICON hIcon;
+ HICON hIcon = NULL;
+ LRESULT bAlive;
- UNREFERENCED_PARAMETER(lParam);
+ UNREFERENCED_PARAMETER(lParam);
- // First try to get the big icon assigned to the window
- hIcon = (HICON)SendMessageW(window, WM_GETICON, ICON_BIG, 0);
- if (!hIcon)
- {
- // If no icon is assigned, try to get the icon assigned to the windows' class
- hIcon = (HICON)GetClassLongPtrW(window, GCL_HICON);
- if (!hIcon)
- {
- // If we still don't have an icon, see if we can do with the small icon,
- // or a default application icon
- hIcon = (HICON)SendMessageW(window, WM_GETICON, ICON_SMALL2, 0);
- if (!hIcon)
- {
- // using windows logo icon as default
- hIcon = gpsi->hIconWindows;
+ // First try to get the big icon assigned to the window
+#define ICON_TIMEOUT 100 // in milliseconds
+ bAlive = SendMessageTimeoutW(window, WM_GETICON, ICON_BIG, 0, SMTO_ABORTIFHUNG | SMTO_BLOCK,
+ ICON_TIMEOUT, (PDWORD_PTR)&hIcon);
+ if (!hIcon)
+ {
+ // If no icon is assigned, try to get the icon assigned to the windows' class
+ hIcon = (HICON)GetClassLongPtrW(window, GCL_HICON);
+ if (!hIcon)
+ {
+ // If we still don't have an icon, see if we can do with the small icon,
+ // or a default application icon
+ if (bAlive)
+ {
+ SendMessageTimeoutW(window, WM_GETICON, ICON_SMALL2, 0,
+ SMTO_ABORTIFHUNG | SMTO_BLOCK, ICON_TIMEOUT,
+ (PDWORD_PTR)&hIcon);
+ }
+#undef ICON_TIMEOUT
if (!hIcon)
{
- //if all attempts to get icon fails go to the next window
- return TRUE;
+ // using windows logo icon as default
+ hIcon = gpsi->hIconWindows;
+ if (!hIcon)
+ {
+ //if all attempts to get icon fails go to the next window
+ return TRUE;
+ }
}
- }
- }
- }
-
- windowList[windowCount] = window;
- iconList[windowCount] = CopyIcon(hIcon);
-
- windowCount++;
+ }
+ }
- // If we got to the max number of windows,
- // we won't be able to add any more
- if(windowCount >= MAX_WINDOWS)
- return FALSE;
+ windowList[windowCount] = window;
+ iconList[windowCount] = CopyIcon(hIcon);
+ windowCount++;
- return TRUE;
+ // If we got to the max number of windows, we won't be able to add any more
+ return (windowCount < MAX_WINDOWS);
}
static HWND GetNiceRootOwner(HWND hwnd)
@@ -491,7 +495,7 @@ BOOL ProcessHotKey(VOID)
selectedWindow = 1;
TRACE("[ATbot] HotKey Received. Opening window.\n");
- ShowWindow(switchdialog, SW_SHOWNORMAL);
+ ShowWindowAsync(switchdialog, SW_SHOWNORMAL);
MakeWindowActive(switchdialog);
isOpen = TRUE;
}
@@ -519,7 +523,7 @@ void RotateTasks(BOOL bShift)
{
SetWindowPos(hwndLast, HWND_TOP, 0, 0, 0, 0,
SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE |
- SWP_NOOWNERZORDER | SWP_NOREPOSITION);
+ SWP_NOOWNERZORDER | SWP_NOREPOSITION | SWP_ASYNCWINDOWPOS);
MakeWindowActive(hwndLast);
@@ -531,7 +535,7 @@ void RotateTasks(BOOL bShift)
{
SetWindowPos(hwndFirst, hwndLast, 0, 0, 0, 0,
SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE |
- SWP_NOOWNERZORDER | SWP_NOREPOSITION);
+ SWP_NOOWNERZORDER | SWP_NOREPOSITION | SWP_ASYNCWINDOWPOS);
MakeWindowActive(windowList[1]);