Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [RSHELL] Fix file headers (#7239)
by Katayama Hirofumi MZ 11 Aug '24

11 Aug '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6f86c05cfb3be472120a3… commit 6f86c05cfb3be472120a3e804e9d259113b0863d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Aug 12 04:47:02 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Aug 12 04:47:02 2024 +0900 [RSHELL] Fix file headers (#7239) Follow our standard. JIRA issue: CORE-18462 Adapt file headers to our coding style. --- base/shell/rshell/CQuickLaunchBand.cpp | 5 ++--- base/shell/rshell/CQuickLaunchBand.h | 5 ++--- base/shell/rshell/misc.cpp | 21 ++++----------------- 3 files changed, 8 insertions(+), 23 deletions(-) diff --git a/base/shell/rshell/CQuickLaunchBand.cpp b/base/shell/rshell/CQuickLaunchBand.cpp index 1507fc6ca10..44b24cdf135 100644 --- a/base/shell/rshell/CQuickLaunchBand.cpp +++ b/base/shell/rshell/CQuickLaunchBand.cpp @@ -1,9 +1,8 @@ /* * PROJECT: ReactOS shell extensions - * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/shellext/qcklnch/CQuickLaunchBand.cpp + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Quick Launch Toolbar (Taskbar Shell Extension) - * PROGRAMMERS: Shriraj Sawant a.k.a SR13 <sr.official(a)hotmail.com> + * COPYRIGHT: Copyright Shriraj Sawant a.k.a SR13 <sr.official(a)hotmail.com> */ #define WIN32_NO_STATUS diff --git a/base/shell/rshell/CQuickLaunchBand.h b/base/shell/rshell/CQuickLaunchBand.h index 09edd433c30..8f0f5de3fef 100644 --- a/base/shell/rshell/CQuickLaunchBand.h +++ b/base/shell/rshell/CQuickLaunchBand.h @@ -1,9 +1,8 @@ /* * PROJECT: ReactOS shell extensions - * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/shellext/qcklnch/CQuickLaunchBand.h + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Quick Launch Toolbar (Taskbar Shell Extension) - * PROGRAMMERS: Shriraj Sawant a.k.a SR13 <sr.official(a)hotmail.com> + * COPYRIGHT: Copyright Shriraj Sawant a.k.a SR13 <sr.official(a)hotmail.com> */ #pragma once diff --git a/base/shell/rshell/misc.cpp b/base/shell/rshell/misc.cpp index 075daefdbe4..d0ed8c83e1b 100644 --- a/base/shell/rshell/misc.cpp +++ b/base/shell/rshell/misc.cpp @@ -1,21 +1,8 @@ /* - * ReactOS Explorer - * - * Copyright 2014 Giannis Adamopoulos - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * PROJECT: ReactOS shell extensions + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Quick Launch Toolbar (Taskbar Shell Extension) + * COPYRIGHT: Copyright 2014 Giannis Adamopoulos */

1 0

[reactos] 01/01: [NTUSER] Rewrite Window Snap handling (#5705)
by Whindmar Saksit 11 Aug '24

11 Aug '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f3d03760e9202c18ce2eb… commit f3d03760e9202c18ce2ebc115ffb539f39fc2e3d Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Sun Aug 11 20:21:58 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Aug 11 20:21:58 2024 +0200 [NTUSER] Rewrite Window Snap handling (#5705) Fixes many Window Snap related bugs and uses the WS_EX2_VERTICALLYMAXIMIZED* styles to remember which edge it is snapped to. The most significant change is that GetWindowPlacement lies about the normal position when it is snapped, just like Windows. CORE-19160 CORE-19165 CORE-19166 --- win32ss/user/ntuser/defwnd.c | 110 +++++---------- win32ss/user/ntuser/nonclient.c | 288 ++++++++++++++++++++++------------------ win32ss/user/ntuser/winpos.c | 150 ++++++++++++++++++++- win32ss/user/ntuser/winpos.h | 31 +++++ 4 files changed, 370 insertions(+), 209 deletions(-) diff --git a/win32ss/user/ntuser/defwnd.c b/win32ss/user/ntuser/defwnd.c index 33911c5ea5b..368105afc42 100644 --- a/win32ss/user/ntuser/defwnd.c +++ b/win32ss/user/ntuser/defwnd.c @@ -788,112 +788,66 @@ IntDefWindowProc( } if (g_bWindowSnapEnabled && (IS_KEY_DOWN(gafAsyncKeyState, VK_LWIN) || IS_KEY_DOWN(gafAsyncKeyState, VK_RWIN))) { - BOOL IsTaskBar; - DWORD StyleTB; - DWORD ExStyleTB; HWND hwndTop = UserGetForegroundWindow(); PWND topWnd = UserGetWindowObject(hwndTop); + BOOL allowSnap; // MS Doc: foreground window can be NULL, e.g. when window is losing activation if (!topWnd) return 0; - // We want to forbid snapping operations on the TaskBar - // We use a heuristic for detecting the TaskBar Wnd by its typical Style & ExStyle Values - ExStyleTB = (topWnd->ExStyle & WS_EX_TOOLWINDOW); - StyleTB = (topWnd->style & (WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN)); - IsTaskBar = (StyleTB == (WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN)) - && (ExStyleTB == WS_EX_TOOLWINDOW); - TRACE("ExStyle=%x Style=%x IsTaskBar=%d\n", ExStyleTB, StyleTB, IsTaskBar); + allowSnap = IntIsSnapAllowedForWindow(topWnd); + /* Allow the minimize action if it has a minimize button, even if the window cannot be snapped (e.g. Calc.exe) */ + if (!allowSnap && (topWnd->style & (WS_MINIMIZEBOX|WS_THICKFRAME)) == WS_MINIMIZEBOX) + allowSnap = wParam == VK_DOWN; - if (!IsTaskBar) + if (allowSnap) { - if ((topWnd->style & WS_THICKFRAME) == 0) - return 0; + UINT snapped = IntGetWindowSnapEdge(topWnd); if (wParam == VK_DOWN) { if (topWnd->style & WS_MAXIMIZE) - { - co_IntSendMessage(hwndTop, WM_SYSCOMMAND, SC_RESTORE, lParam); - - /* "Normal size" must be erased after restoring, otherwise it will block next side snap actions */ - RECTL_vSetEmptyRect(&topWnd->InternalPos.NormalRect); - } + co_IntSendMessage(hwndTop, WM_SYSCOMMAND, SC_RESTORE, MAKELONG(0, 1)); + else if (snapped) + co_IntUnsnapWindow(topWnd); else - { - co_IntSendMessage(hwndTop, WM_SYSCOMMAND, SC_MINIMIZE, lParam); - } + co_IntSendMessage(hwndTop, WM_SYSCOMMAND, SC_MINIMIZE, MAKELONG(0, 1)); } else if (wParam == VK_UP) { - RECT currentRect; - if ((topWnd->InternalPos.NormalRect.right == topWnd->InternalPos.NormalRect.left) || - (topWnd->InternalPos.NormalRect.top == topWnd->InternalPos.NormalRect.bottom)) - { - currentRect = topWnd->rcWindow; - } - else - { - currentRect = topWnd->InternalPos.NormalRect; - } - co_IntSendMessage(hwndTop, WM_SYSCOMMAND, SC_MAXIMIZE, 0); - - // save normal rect if maximazing snapped window - topWnd->InternalPos.NormalRect = currentRect; + if (topWnd->style & WS_MINIMIZE) + co_IntSendMessage(hwndTop, WM_SYSCOMMAND, SC_RESTORE, MAKELONG(0, 1)); + else + co_IntSendMessage(hwndTop, WM_SYSCOMMAND, SC_MAXIMIZE, MAKELONG(0, 1)); } else if (wParam == VK_LEFT || wParam == VK_RIGHT) { - RECT snapRect, normalRect, windowRect; - BOOL snapped; - normalRect = topWnd->InternalPos.NormalRect; - snapped = (normalRect.left != 0 && normalRect.right != 0 && - normalRect.top != 0 && normalRect.bottom != 0); + UINT edge = wParam == VK_LEFT ? HTLEFT : HTRIGHT; + UINT otherEdge = edge == HTLEFT ? HTRIGHT : HTLEFT; if (topWnd->style & WS_MAXIMIZE) { - co_IntSendMessage(hwndTop, WM_SYSCOMMAND, SC_RESTORE, lParam); - snapped = FALSE; - } - windowRect = topWnd->rcWindow; - - UserSystemParametersInfo(SPI_GETWORKAREA, 0, &snapRect, 0); - if (wParam == VK_LEFT) - { - snapRect.right = (snapRect.left + snapRect.right) / 2; + /* SC_RESTORE + Snap causes the window to visually move twice, place it manually in the snap position */ + RECT normalRect = topWnd->InternalPos.NormalRect; + co_IntCalculateSnapPosition(topWnd, edge, &topWnd->InternalPos.NormalRect); /* Calculate edge position */ + IntSetSnapEdge(topWnd, edge); /* Tell everyone the edge we are snapped to */ + co_IntSendMessage(hwndTop, WM_SYSCOMMAND, SC_RESTORE, MAKELONG(0, 1)); + IntSetSnapInfo(topWnd, edge, &normalRect); /* Reset the real place to unsnap to */ + snapped = HTNOWHERE; /* Force snap */ } - else // VK_RIGHT +#if 0 /* Windows 8 does this but is it a good feature? */ + else if (snapped == edge) { - snapRect.left = (snapRect.left + snapRect.right) / 2; + /* Already snapped to this edge, snap to the opposite side */ + edge = otherEdge; } +#endif - if (snapped) - { - // if window was snapped but moved to other location - restore normal size - if (!IntEqualRect(&snapRect, &windowRect)) - { - RECT empty = {0, 0, 0, 0}; - co_WinPosSetWindowPos(topWnd, - 0, - normalRect.left, - normalRect.top, - normalRect.right - normalRect.left, - normalRect.bottom - normalRect.top, - 0); - topWnd->InternalPos.NormalRect = empty; - } - } + if (snapped == otherEdge) + co_IntUnsnapWindow(topWnd); else - { - co_WinPosSetWindowPos(topWnd, - 0, - snapRect.left, - snapRect.top, - snapRect.right - snapRect.left, - snapRect.bottom - snapRect.top, - 0); - topWnd->InternalPos.NormalRect = windowRect; - } + co_IntSnapWindow(topWnd, edge); } } } diff --git a/win32ss/user/ntuser/nonclient.c b/win32ss/user/ntuser/nonclient.c index 2324cc04afd..f3a0cdb8492 100644 --- a/win32ss/user/ntuser/nonclient.c +++ b/win32ss/user/ntuser/nonclient.c @@ -136,6 +136,18 @@ NC_GetSysPopupPos(PWND Wnd, RECT *Rect) } } +static UINT +GetSnapActivationPoint(PWND Wnd, POINT pt) +{ + RECT wa; + UserSystemParametersInfo(SPI_GETWORKAREA, 0, &wa, 0); /* FIXME: MultiMon of PWND */ + + if (pt.x <= wa.left) return HTLEFT; + if (pt.x >= wa.right-1) return HTRIGHT; + if (pt.y <= wa.top) return HTTOP; /* Maximize */ + return HTNOWHERE; +} + LONG FASTCALL DefWndStartSizeMove(PWND Wnd, WPARAM wParam, POINT *capturePoint) { @@ -239,13 +251,15 @@ VOID FASTCALL DefWndDoSizeMove(PWND pwnd, WORD wParam) { MSG msg; - RECT sizingRect, mouseRect, origRect, unmodRect; + RECT sizingRect, mouseRect, origRect, unmodRect, snapPreviewRect; + PRECT pFrameRect = &sizingRect; HDC hdc; LONG hittest = (LONG)(wParam & 0x0f); PCURICON_OBJECT DragCursor = NULL, OldCursor = NULL; POINT minTrack, maxTrack; POINT capturePoint, pt; ULONG Style, ExStyle; + UINT orgSnap = IntGetWindowSnapEdge(pwnd), snap = orgSnap; BOOL thickframe; BOOL iconic; BOOL moved = FALSE; @@ -262,6 +276,8 @@ DefWndDoSizeMove(PWND pwnd, WORD wParam) iconic = (Style & WS_MINIMIZE) != 0; if (((Style & WS_MAXIMIZE) && syscommand != SC_MOVE) || !IntIsWindowVisible(pwnd)) return; + if ((Style & (WS_MAXIMIZE | WS_CHILD)) == WS_MAXIMIZE) + orgSnap = snap = HTTOP; thickframe = UserHasThickFrameStyle(Style, ExStyle) && !iconic; @@ -294,7 +310,7 @@ DefWndDoSizeMove(PWND pwnd, WORD wParam) { co_UserSetCapture(UserHMGetHandle(pwnd)); hittest = DefWndStartSizeMove(pwnd, wParam, &capturePoint); - if (!hittest) + if (!hittest) { IntReleaseCapture(); return; @@ -402,56 +418,20 @@ DefWndDoSizeMove(PWND pwnd, WORD wParam) else if (g_bWindowSnapEnabled && (msg.message == WM_LBUTTONUP || (msg.message == WM_MOUSEMOVE && (msg.wParam & MK_LBUTTON) == 0))) { // If WindowSnapEnabled: Decide whether to snap before exiting - DWORD ExStyleTB, StyleTB; - BOOL IsTaskBar; - - // We want to forbid snapping operations on the TaskBar - // We use a heuristic for detecting the TaskBar Wnd by its typical Style & ExStyle Values - ExStyleTB = (ExStyle & WS_EX_TOOLWINDOW); - StyleTB = (Style & (WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN)); - IsTaskBar = (StyleTB == (WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN)) - && (ExStyleTB == WS_EX_TOOLWINDOW); - TRACE("ExStyle=%x Style=%x IsTaskBar=%d\n", ExStyleTB, StyleTB, IsTaskBar); - - // check for snapping if was moved by caption - if (!IsTaskBar && hittest == HTCAPTION && thickframe && (ExStyle & WS_EX_MDICHILD) == 0) + if (hittest == HTCAPTION && thickframe && /* Check for snapping if was moved by caption */ + IntIsSnapAllowedForWindow(pwnd) && (ExStyle & WS_EX_MDICHILD) == 0) { - RECT snapRect; - BOOL doSideSnap = FALSE; - UserSystemParametersInfo(SPI_GETWORKAREA, 0, &snapRect, 0); - - // snap to left - if (pt.x <= snapRect.left) - { - snapRect.right = (snapRect.right - snapRect.left) / 2 + snapRect.left; - doSideSnap = TRUE; - } - // snap to right - if (pt.x >= snapRect.right-1) + BOOLEAN wasSnap = IntIsWindowSnapped(pwnd); /* Need the live snap state, not orgSnap nor maximized state */ + UINT snapTo = iconic ? HTNOWHERE : GetSnapActivationPoint(pwnd, pt); + if (snapTo) { - snapRect.left = (snapRect.right - snapRect.left) / 2 + snapRect.left; - doSideSnap = TRUE; - } - - if (doSideSnap) - { - co_WinPosSetWindowPos(pwnd, - NULL, - snapRect.left, - snapRect.top, - snapRect.right - snapRect.left, - snapRect.bottom - snapRect.top, - SWP_NOACTIVATE); - pwnd->InternalPos.NormalRect = origRect; - } - else - { - // maximize if on dragged to top - if (pt.y <= snapRect.top) - { - co_IntSendMessage(UserHMGetHandle(pwnd), WM_SYSCOMMAND, SC_MAXIMIZE, 0); - pwnd->InternalPos.NormalRect = origRect; - } + if (DragFullWindows) + { + co_IntSnapWindow(pwnd, snapTo); + if (!wasSnap) + pwnd->InternalPos.NormalRect = origRect; + } + snap = snapTo; } } break; @@ -468,10 +448,10 @@ DefWndDoSizeMove(PWND pwnd, WORD wParam) if (msg.message == WM_KEYDOWN) switch(msg.wParam) { - case VK_UP: pt.y -= 8; break; - case VK_DOWN: pt.y += 8; break; - case VK_LEFT: pt.x -= 8; break; - case VK_RIGHT: pt.x += 8; break; + case VK_UP: pt.y -= 8; break; + case VK_DOWN: pt.y += 8; break; + case VK_LEFT: pt.x -= 8; break; + case VK_RIGHT: pt.x += 8; break; } pt.x = max( pt.x, mouseRect.left ); @@ -484,63 +464,99 @@ DefWndDoSizeMove(PWND pwnd, WORD wParam) if (dx || dy) { - if ( !moved ) - { - moved = TRUE; - if ( iconic ) /* ok, no system popup tracking */ + if (!moved) + { + moved = TRUE; + if (iconic) /* ok, no system popup tracking */ { OldCursor = UserSetCursor(DragCursor, FALSE); - UserShowCursor( TRUE ); + UserShowCursor(TRUE); } - else if(!DragFullWindows) - UserDrawMovingFrame( hdc, &sizingRect, thickframe ); - } + else if (!DragFullWindows) + UserDrawMovingFrame(hdc, &sizingRect, thickframe); + } - if (msg.message == WM_KEYDOWN) UserSetCursorPos(pt.x, pt.y, 0, 0, FALSE); - else - { - RECT newRect = unmodRect; + if (msg.message == WM_KEYDOWN) + { + UserSetCursorPos(pt.x, pt.y, 0, 0, FALSE); + } + else + { + RECT newRect = unmodRect; - if (!iconic && !DragFullWindows) UserDrawMovingFrame( hdc, &sizingRect, thickframe ); + if (!iconic && !DragFullWindows) + { + UserDrawMovingFrame(hdc, pFrameRect, thickframe); + pFrameRect = &sizingRect; + } if (hittest == HTCAPTION) { /* Restore window size if it is snapped */ - if (!RECTL_bIsEmptyRect(&pwnd->InternalPos.NormalRect) && - !IntEqualRect(&pwnd->InternalPos.NormalRect, &pwnd->rcWindow)) + PRECT pr = &newRect; + LONG width, height, capcy, snapTo; + if (snap && syscommand == SC_MOVE && !iconic && + !RECTL_bIsEmptyRect(&pwnd->InternalPos.NormalRect)) { - UserSetCursorPos(max(0, pwnd->InternalPos.NormalRect.left) + pt.x, pwnd->InternalPos.NormalRect.top + pt.y, 0, 0, FALSE); - - /* Save normal size - it required when window unsnapped from one side and snapped to another holding mouse down */ - origRect = pwnd->InternalPos.NormalRect; - - /* Restore from maximized state */ - if (Style & WS_MAXIMIZE) + *pr = pwnd->InternalPos.NormalRect; + origRect = *pr; /* Save normal size - is required when window unsnapped from one side and snapped to another holding mouse down */ + + /* Try to position the center of the caption where the mouse is horizontally */ + capcy = UserGetSystemMetrics((ExStyle & WS_EX_TOPMOST) ? SM_CYSMCAPTION : SM_CYCAPTION); /* No border, close enough */ + width = pr->right - pr->left; + height = pr->bottom - pr->top; + pr->left = pt.x - width / 2; + pr->right = pr->left + width; + pr->top = mouseRect.top; + pr->bottom = pr->top + height; + if (pr->left < mouseRect.left) { - co_IntSendMessage(UserHMGetHandle(pwnd), WM_SYSCOMMAND, SC_RESTORE, 0); + pr->left = mouseRect.left; + pr->right = pr->left + width; } - /* Restore snapped to left/right place */ - else + if ((pwnd->ExStyle & WS_EX_LAYOUTRTL) && pr->right > mouseRect.right) { - co_WinPosSetWindowPos(pwnd, - NULL, - pwnd->InternalPos.NormalRect.left, - pwnd->InternalPos.NormalRect.top, - pwnd->InternalPos.NormalRect.right - pwnd->InternalPos.NormalRect.left, - pwnd->InternalPos.NormalRect.bottom - pwnd->InternalPos.NormalRect.top, - 0); + pr->left = mouseRect.right - width; + pr->right = pr->left + width; + } + UserSetCursorPos(pt.x, pr->top + capcy / 2, 0, 0, FALSE); + snap = FALSE; + dx = dy = 0; /* Don't offset this move */ + if (DragFullWindows) + { + IntSetStyle(pwnd, 0, WS_MAXIMIZE); + IntSetSnapEdge(pwnd, HTNOWHERE); + + /* Have to move and size it now because we don't want SWP_NOSIZE */ + co_WinPosSetWindowPos(pwnd, HWND_TOP, pr->left, pr->top, width, height, SWP_NOACTIVATE); + } + } + else if (!snap && syscommand == SC_MOVE && !iconic) + { + if ((snapTo = GetSnapActivationPoint(pwnd, pt)) != 0) + { + co_IntCalculateSnapPosition(pwnd, snapTo, &snapPreviewRect); + if (DragFullWindows) + { + /* TODO: Show preview of snap */ + } + else + { + pFrameRect = &snapPreviewRect; + UserDrawMovingFrame(hdc, pFrameRect, thickframe); + continue; + } } - RECTL_vSetEmptyRect(&pwnd->InternalPos.NormalRect); - continue; } /* regular window moving */ RECTL_vOffsetRect(&newRect, dx, dy); } - if (ON_LEFT_BORDER(hittest)) newRect.left += dx; - else if (ON_RIGHT_BORDER(hittest)) newRect.right += dx; - if (ON_TOP_BORDER(hittest)) newRect.top += dy; - else if (ON_BOTTOM_BORDER(hittest)) newRect.bottom += dy; - capturePoint = pt; + if (ON_LEFT_BORDER(hittest)) newRect.left += dx; + else if (ON_RIGHT_BORDER(hittest)) newRect.right += dx; + if (ON_TOP_BORDER(hittest)) newRect.top += dy; + else if (ON_BOTTOM_BORDER(hittest)) newRect.bottom += dy; + + capturePoint = pt; // // Save the new position to the unmodified rectangle. This allows explorer task bar @@ -549,7 +565,7 @@ DefWndDoSizeMove(PWND pwnd, WORD wParam) // unmodRect = newRect; - /* determine the hit location */ + /* Determine the hit location */ if (syscommand == SC_SIZE) { WPARAM wpSizingHit = 0; @@ -561,7 +577,7 @@ DefWndDoSizeMove(PWND pwnd, WORD wParam) else co_IntSendMessage( UserHMGetHandle(pwnd), WM_MOVING, 0, (LPARAM)&newRect ); - if (!iconic) + if (!iconic) { if (!DragFullWindows) UserDrawMovingFrame( hdc, &newRect, thickframe ); @@ -609,7 +625,7 @@ DefWndDoSizeMove(PWND pwnd, WORD wParam) } } sizingRect = newRect; - } + } } } @@ -631,8 +647,12 @@ DefWndDoSizeMove(PWND pwnd, WORD wParam) */ if (OldCursor) UserDereferenceObject(OldCursor); } - else if ( moved && !DragFullWindows ) - UserDrawMovingFrame( hdc, &sizingRect, thickframe ); + else + { + UINT eraseFinalFrame = moved && !DragFullWindows; + if (eraseFinalFrame) + UserDrawMovingFrame(hdc, pFrameRect, thickframe); // Undo the XOR drawing + } UserReleaseDC(NULL, hdc, FALSE); @@ -656,49 +676,57 @@ DefWndDoSizeMove(PWND pwnd, WORD wParam) /* window moved or resized */ if (moved) { + BOOL forceSizing = !iconic && hittest == HTCAPTION && (!!orgSnap != !!snap); + UINT swp = (!forceSizing && hittest == HTCAPTION) ? SWP_NOSIZE : 0; + /* if the moving/resizing isn't canceled call SetWindowPos * with the new position or the new size of the window */ if (!((msg.message == WM_KEYDOWN) && (msg.wParam == VK_ESCAPE)) ) { - /* NOTE: SWP_NOACTIVATE prevents document window activation in Word 6 */ - if (!DragFullWindows || iconic ) - { - co_WinPosSetWindowPos( pwnd, - 0, - sizingRect.left, - sizingRect.top, - sizingRect.right - sizingRect.left, - sizingRect.bottom - sizingRect.top, - ( hittest == HTCAPTION ) ? SWP_NOSIZE : 0 ); - } + /* NOTE: SWP_NOACTIVATE prevents document window activation in Word 6 */ + if (!DragFullWindows || iconic) + { + if (snap) + { + co_IntSnapWindow(pwnd, snap); + } + else + { + if (orgSnap && !snap) + { + IntSetStyle(pwnd, 0, WS_MAXIMIZE); + IntSetSnapInfo(pwnd, HTNOWHERE, NULL); + } + co_WinPosSetWindowPos(pwnd, HWND_TOP, sizingRect.left, sizingRect.top, + sizingRect.right - sizingRect.left, + sizingRect.bottom - sizingRect.top, swp); + } + } } else - { /* restore previous size/position */ - if ( DragFullWindows ) - { - co_WinPosSetWindowPos( pwnd, - 0, - origRect.left, - origRect.top, - origRect.right - origRect.left, - origRect.bottom - origRect.top, - ( hittest == HTCAPTION ) ? SWP_NOSIZE : 0 ); - } + { + /* restore previous size/position */ + if (orgSnap) + { + co_IntSnapWindow(pwnd, orgSnap); + } + else if (DragFullWindows) + { + co_WinPosSetWindowPos(pwnd, HWND_TOP, origRect.left, origRect.top, + origRect.right - origRect.left, + origRect.bottom - origRect.top, swp); + } } } - if ( IntIsWindow(UserHMGetHandle(pwnd)) ) + if (IntIsWindow(UserHMGetHandle(pwnd))) { - if ( iconic ) - { - /* Single click brings up the system menu when iconized */ - if ( !moved ) - { - if( Style & WS_SYSMENU ) - co_IntSendMessage( UserHMGetHandle(pwnd), WM_SYSCOMMAND, SC_MOUSEMENU + HTSYSMENU, MAKELONG(pt.x,pt.y)); - } - } + /* Single click brings up the system menu when iconized */ + if (iconic && !moved && (Style & WS_SYSMENU)) + { + co_IntSendMessage(UserHMGetHandle(pwnd), WM_SYSCOMMAND, SC_MOUSEMENU + HTSYSMENU, MAKELONG(pt.x, pt.y)); + } } } diff --git a/win32ss/user/ntuser/winpos.c b/win32ss/user/ntuser/winpos.c index 227b03e8a5c..9c55ef7c0d9 100644 --- a/win32ss/user/ntuser/winpos.c +++ b/win32ss/user/ntuser/winpos.c @@ -549,7 +549,13 @@ WinPosInitInternalPos(PWND Wnd, RECTL *RestoreRect) } else { - Wnd->InternalPos.NormalRect = Rect; + /* Lie about the snap; Windows does this so applications don't save their + * position as a snap but rather the unsnapped "real" position. */ + if (!IntIsWindowSnapped(Wnd) || + RECTL_bIsEmptyRect(&Wnd->InternalPos.NormalRect)) + { + Wnd->InternalPos.NormalRect = Rect; + } } } @@ -2487,6 +2493,7 @@ co_WinPosMinMaximize(PWND Wnd, UINT ShowFlag, RECT* NewPos) case SW_MAXIMIZE: { //ERR("MinMaximize Maximize\n"); + IntSetSnapEdge(Wnd, HTNOWHERE); /* Mark as not snapped (for Win+Left,Up,Down) */ if ((Wnd->style & WS_MAXIMIZE) && (Wnd->style & WS_VISIBLE)) { SwpFlags = SWP_NOSIZE | SWP_NOMOVE; @@ -2535,6 +2542,12 @@ co_WinPosMinMaximize(PWND Wnd, UINT ShowFlag, RECT* NewPos) else { *NewPos = wpl.rcNormalPosition; + if (ShowFlag != SW_SHOWNORMAL && ShowFlag != SW_SHOWDEFAULT) + { + UINT edge = IntGetWindowSnapEdge(Wnd); + if (edge) + co_IntCalculateSnapPosition(Wnd, edge, NewPos); + } NewPos->right -= NewPos->left; NewPos->bottom -= NewPos->top; break; @@ -3863,4 +3876,139 @@ NtUserWindowFromPoint(LONG X, LONG Y) return Ret; } +/* Windows 10 (1903?) +BOOL APIENTRY +NtUserIsWindowArranged(HWND hWnd) +{ + PWND pwnd = UserGetWindowObject(hWnd); + return pwnd && IntIsWindowSnapped(pwnd); +} +*/ + +UINT FASTCALL +IntGetWindowSnapEdge(PWND Wnd) +{ + if (Wnd->ExStyle2 & WS_EX2_VERTICALLYMAXIMIZEDLEFT) return HTLEFT; + if (Wnd->ExStyle2 & WS_EX2_VERTICALLYMAXIMIZEDRIGHT) return HTRIGHT; + return HTNOWHERE; +} + +VOID FASTCALL +co_IntCalculateSnapPosition(PWND Wnd, UINT Edge, OUT RECT *Pos) +{ + POINT maxs, mint, maxt; + UINT width, height; + UserSystemParametersInfo(SPI_GETWORKAREA, 0, Pos, 0); /* FIXME: MultiMon of PWND */ + + co_WinPosGetMinMaxInfo(Wnd, &maxs, NULL, &mint, &maxt); + width = Pos->right - Pos->left; + width = min(min(max(width / 2, mint.x), maxt.x), width); + height = Pos->bottom - Pos->top; + height = min(max(height, mint.y), maxt.y); + + switch (Edge) + { + case HTTOP: /* Maximized (Calculate RECT snap preview for SC_MOVE) */ + height = min(Pos->bottom - Pos->top, maxs.y); + break; + case HTLEFT: + Pos->right = width; + break; + case HTRIGHT: + Pos->left = Pos->right - width; + break; + default: + ERR("Unexpected snap edge %#x\n", Edge); + } + Pos->bottom = Pos->top + height; +} + +VOID FASTCALL +co_IntSnapWindow(PWND Wnd, UINT Edge) +{ + RECT newPos; + BOOLEAN wasSnapped = IntIsWindowSnapped(Wnd); + UINT normal = !(Wnd->style & (WS_MAXIMIZE | WS_MINIMIZE)); + USER_REFERENCE_ENTRY ref; + BOOLEAN hasRef = FALSE; + + if (Edge == HTTOP) + { + co_IntSendMessage(UserHMGetHandle(Wnd), WM_SYSCOMMAND, SC_MAXIMIZE, 0); + return; + } + else if (Edge) + { + UserRefObjectCo(Wnd, &ref); + hasRef = TRUE; + co_IntCalculateSnapPosition(Wnd, Edge, &newPos); + IntSetSnapInfo(Wnd, Edge, (wasSnapped || !normal) ? NULL : &Wnd->rcWindow); + } + else if (wasSnapped) + { + if (!normal) + { + IntSetSnapEdge(Wnd, HTNOWHERE); + return; + } + newPos = Wnd->InternalPos.NormalRect; + IntSetSnapInfo(Wnd, HTNOWHERE, NULL); + } + else + { + return; /* Already unsnapped, do nothing */ + } + + TRACE("WindowSnap: %d->%d\n", IntGetWindowSnapEdge(Wnd), Edge); + co_WinPosSetWindowPos(Wnd, HWND_TOP, + newPos.left, + newPos.top, + newPos.right - newPos.left, + newPos.bottom - newPos.top, + 0); + if (hasRef) + UserDerefObjectCo(Wnd); +} + +VOID FASTCALL +IntSetSnapEdge(PWND Wnd, UINT Edge) +{ + UINT styleMask = WS_EX2_VERTICALLYMAXIMIZEDLEFT | WS_EX2_VERTICALLYMAXIMIZEDRIGHT; + UINT style = 0; + switch (Edge) + { + case HTNOWHERE: + style = 0; + break; + case HTTOP: /* Maximize throws away the snap */ + style = 0; + break; + case HTLEFT: + style = WS_EX2_VERTICALLYMAXIMIZEDLEFT; + break; + case HTRIGHT: + style = WS_EX2_VERTICALLYMAXIMIZEDRIGHT; + break; + default: + ERR("Unexpected snap edge %#x\n", Edge); + } + Wnd->ExStyle2 = (Wnd->ExStyle2 & ~styleMask) | style; +} + +VOID FASTCALL +IntSetSnapInfo(PWND Wnd, UINT Edge, IN const RECT *Pos OPTIONAL) +{ + RECT r; + IntSetSnapEdge(Wnd, Edge); + if (Edge != HTNOWHERE) + { + RECTL_vSetEmptyRect(&r); + Pos = (Wnd->style & WS_MINIMIZE) ? NULL : &r; + } + if (Pos) + { + Wnd->InternalPos.NormalRect = *Pos; + } +} + /* EOF */ diff --git a/win32ss/user/ntuser/winpos.h b/win32ss/user/ntuser/winpos.h index 03e1cd8923b..17d1c49cf33 100644 --- a/win32ss/user/ntuser/winpos.h +++ b/win32ss/user/ntuser/winpos.h @@ -71,3 +71,34 @@ BOOL FASTCALL IntClientToScreen(PWND,LPPOINT); BOOL FASTCALL IntGetWindowRect(PWND,RECTL*); BOOL UserHasWindowEdge(DWORD,DWORD); VOID UserGetWindowBorders(DWORD,DWORD,SIZE*,BOOL); + +UINT FASTCALL IntGetWindowSnapEdge(PWND Wnd); +VOID FASTCALL co_IntCalculateSnapPosition(PWND Wnd, UINT Edge, OUT RECT *Pos); +VOID FASTCALL co_IntSnapWindow(PWND Wnd, UINT Edge); +VOID FASTCALL IntSetSnapEdge(PWND Wnd, UINT Edge); +VOID FASTCALL IntSetSnapInfo(PWND Wnd, UINT Edge, IN const RECT *Pos OPTIONAL); + +FORCEINLINE VOID +co_IntUnsnapWindow(PWND Wnd) +{ + co_IntSnapWindow(Wnd, 0); +} + +FORCEINLINE BOOLEAN +IntIsWindowSnapped(PWND Wnd) +{ + return (Wnd->ExStyle2 & (WS_EX2_VERTICALLYMAXIMIZEDLEFT | WS_EX2_VERTICALLYMAXIMIZEDRIGHT)) != 0; +} + +FORCEINLINE BOOLEAN +IntIsSnapAllowedForWindow(PWND Wnd) +{ + /* We want to forbid snapping operations on the TaskBar and on child windows. + * We use a heuristic for detecting the TaskBar by its typical Style & ExStyle. */ + const UINT style = Wnd->style; + const UINT tbws = WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN; + const UINT tbes = WS_EX_TOOLWINDOW; + BOOLEAN istb = (style & tbws) == tbws && (Wnd->ExStyle & (tbes | WS_EX_APPWINDOW)) == tbes; + BOOLEAN thickframe = (style & WS_THICKFRAME) && (style & (WS_DLGFRAME | WS_BORDER)) != WS_DLGFRAME; + return thickframe && !(style & WS_CHILD) && !istb; +}

1 0

[reactos] 01/01: [REGEDIT] Strip ancient stuff from resource.h / framewnd.c (#7194)
by Joachim Henze 11 Aug '24

11 Aug '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6fb67ddc0ec0e1d963b12… commit 6fb67ddc0ec0e1d963b12d47140721f194e324a6 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Sun Aug 11 18:49:45 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Aug 11 18:49:45 2024 +0200 [REGEDIT] Strip ancient stuff from resource.h / framewnd.c (#7194) Stuff from the stone-age, not used anymore. * ID_REGISTRY_PRINTSUBTREE & ID_REGISTRY_PRINTERSETUP have been fused into one in newer MS regedit.exe. Older versions of MS regedt32.exe had that separated still, see https://github.com/reactos/reactos/pull/7194#discussion_r1695021919 for some details and screenshots about that. * ID_REGISTRY_OPENLOCAL is obsolete too for the same reason. * ID_REGISTRY_SELECTCOMPUTER can be stripped too, because it was historically replaced by ID_REGISTRY_(DIS)CONNECTNETWORKREGISTRY co-authored by hermes.belusca-maito(a)reactos.org --- base/applications/regedit/framewnd.c | 8 -------- base/applications/regedit/resource.h | 34 ---------------------------------- 2 files changed, 42 deletions(-) diff --git a/base/applications/regedit/framewnd.c b/base/applications/regedit/framewnd.c index 8b025f07729..e22f383d970 100644 --- a/base/applications/regedit/framewnd.c +++ b/base/applications/regedit/framewnd.c @@ -1338,14 +1338,6 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) case ID_EDIT_PERMISSIONS: RegKeyEditPermissions(hWnd, hKeyRoot, NULL, keyPath); break; - case ID_REGISTRY_PRINTERSETUP: - //PRINTDLG pd; - //PrintDlg(&pd); - //PAGESETUPDLG psd; - //PageSetupDlg(&psd); - break; - case ID_REGISTRY_OPENLOCAL: - break; case ID_VIEW_REFRESH: RefreshTreeView(g_pChildWnd->hTreeWnd); keyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); diff --git a/base/applications/regedit/resource.h b/base/applications/regedit/resource.h index 47abb06360d..1bb0e198ad6 100644 --- a/base/applications/regedit/resource.h +++ b/base/applications/regedit/resource.h @@ -34,7 +34,6 @@ #define IDD_REMOVEFAVORITES 139 #define IDD_FIND 140 #define IDD_FINDING 141 -#define IDC_LICENSE_EDIT 1029 #define ID_REGISTRY_EXIT 32770 #define ID_FAVOURITES_ADDTOFAVOURITES 32772 #define ID_FAVOURITES_REMOVEFAVOURITE 32773 @@ -60,48 +59,15 @@ #define ID_HELP_HELPTOPICS 32794 #define ID_HELP_ABOUT 32795 -#define ID_WINDOW_CASCADE 32797 -#define ID_WINDOW_TILE 32798 -#define ID_WINDOW_ARRANGEICONS 32799 -#define ID_OPTIONS_FONT 32800 -#define ID_OPTIONS_AUTOREFRESH 32801 -#define ID_OPTIONS_READONLYMODE 32802 -#define ID_OPTIONS_CONFIRMONDELETE 32803 -#define ID_OPTIONS_SAVESETTINGSONEXIT 32804 -#define ID_SECURITY_PERMISSIONS 32805 -#define ID_VIEW_TREEANDDATA 32806 -#define ID_VIEW_TREEONLY 32807 -#define ID_VIEW_DATAONLY 32808 -#define ID_VIEW_DISPLAYBINARYDATA 32810 -#define ID_VIEW_REFRESHALL 32811 -#define ID_VIEW_REFRESHACTIVE 32812 -#define ID_VIEW_FINDKEY 32813 -#define ID_TREE_EXPANDONELEVEL 32814 #define ID_TREE_EXPANDBRANCH 32815 -#define ID_TREE_EXPANDALL 32816 #define ID_TREE_COLLAPSEBRANCH 32817 -#define ID_EDIT_ADDKEY 32818 -#define ID_EDIT_ADDVALUE 32819 -#define ID_EDIT_BINARY 32821 -#define ID_EDIT_STRING 32822 -#define ID_EDIT_DWORD 32823 -#define ID_EDIT_MULTISTRING 32824 -#define ID_REGISTRY_OPENLOCAL 32825 -#define ID_REGISTRY_CLOSE 32826 #define ID_REGISTRY_LOADHIVE 32827 #define ID_REGISTRY_UNLOADHIVE 32828 -#define ID_REGISTRY_RESTORE 32829 -#define ID_REGISTRY_SAVEKEY 32830 -#define ID_REGISTRY_SELECTCOMPUTER 32831 -#define ID_REGISTRY_PRINTSUBTREE 32832 -#define ID_REGISTRY_PRINTERSETUP 32833 -#define ID_REGISTRY_SAVESUBTREEAS 32834 #define ID_HEXEDIT_CUT 32835 #define ID_HEXEDIT_COPY 32836 #define ID_HEXEDIT_PASTE 32837 #define ID_HEXEDIT_DELETE 32838 #define ID_HEXEDIT_SELECT_ALL 32839 -#define IDS_LICENSE 32835 #define IDS_ERROR 32836 #define IDS_BAD_VALUE 32837 #define IDS_UNSUPPORTED_TYPE 32838

1 0

[reactos] 01/01: [SDK] commctrl.h: Add missing Vista+ TTI_(INFO|WARNING|ERROR)_LARGE defines
by Hermès Bélusca-Maïto 11 Aug '24

11 Aug '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=50986d8470c9930972183… commit 50986d8470c9930972183c323d7ef3425644cacc Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Aug 11 17:52:06 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Aug 11 17:54:05 2024 +0200 [SDK] commctrl.h: Add missing Vista+ TTI_(INFO|WARNING|ERROR)_LARGE defines --- sdk/include/psdk/commctrl.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sdk/include/psdk/commctrl.h b/sdk/include/psdk/commctrl.h index 8647947ab04..989342c71d6 100644 --- a/sdk/include/psdk/commctrl.h +++ b/sdk/include/psdk/commctrl.h @@ -1780,6 +1780,11 @@ typedef struct tagNMBCDROPDOWN { #define TTI_INFO 1 #define TTI_WARNING 2 #define TTI_ERROR 3 +#if (_WIN32_WINNT >= 0x0600) +#define TTI_INFO_LARGE 4 +#define TTI_WARNING_LARGE 5 +#define TTI_ERROR_LARGE 6 +#endif #define TTM_ACTIVATE (WM_USER+1) #define TTM_SETDELAYTIME (WM_USER+3)

1 0

[reactos] 01/01: [CALC] Fix the "Porto"->"Portu"-typo for no-NO.rc (#7230)
by Joachim Henze 11 Aug '24

11 Aug '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=712629819567d346e24b5… commit 712629819567d346e24b5a5f29944b15f1208dec Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Sun Aug 11 17:52:38 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Aug 11 17:52:38 2024 +0200 [CALC] Fix the "Porto"->"Portu"-typo for no-NO.rc (#7230) And fix that typo also for the IDS-name itself. For the record: The it-IT.rc: is the only language where "Escudo portoghese" with O is actually correct according to google translator, and therefore not touched (confirmed also by native it-IT Carlo-Bramini). --- base/applications/calc/convert.c | 2 +- base/applications/calc/lang/bg-BG.rc | 2 +- base/applications/calc/lang/cs-CZ.rc | 2 +- base/applications/calc/lang/de-DE.rc | 2 +- base/applications/calc/lang/el-GR.rc | 2 +- base/applications/calc/lang/en-US.rc | 2 +- base/applications/calc/lang/es-ES.rc | 2 +- base/applications/calc/lang/fr-FR.rc | 2 +- base/applications/calc/lang/he-IL.rc | 2 +- base/applications/calc/lang/hu-HU.rc | 2 +- base/applications/calc/lang/id-ID.rc | 2 +- base/applications/calc/lang/it-IT.rc | 2 +- base/applications/calc/lang/ja-JP.rc | 2 +- base/applications/calc/lang/ko-KR.rc | 2 +- base/applications/calc/lang/nl-NL.rc | 2 +- base/applications/calc/lang/no-NO.rc | 2 +- base/applications/calc/lang/pl-PL.rc | 2 +- base/applications/calc/lang/pt-BR.rc | 2 +- base/applications/calc/lang/pt-PT.rc | 2 +- base/applications/calc/lang/ro-RO.rc | 2 +- base/applications/calc/lang/ru-RU.rc | 2 +- base/applications/calc/lang/sk-SK.rc | 2 +- base/applications/calc/lang/sq-AL.rc | 2 +- base/applications/calc/lang/sv-SE.rc | 2 +- base/applications/calc/lang/th-TH.rc | 2 +- base/applications/calc/lang/tr-TR.rc | 2 +- base/applications/calc/lang/uk-UA.rc | 2 +- base/applications/calc/lang/zh-CN.rc | 2 +- base/applications/calc/lang/zh-HK.rc | 2 +- base/applications/calc/lang/zh-TW.rc | 2 +- base/applications/calc/resource.h | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-) diff --git a/base/applications/calc/convert.c b/base/applications/calc/convert.c index 5e6c5de1d8e..ad3bd14c87e 100644 --- a/base/applications/calc/convert.c +++ b/base/applications/calc/convert.c @@ -181,7 +181,7 @@ static const conv_t conv_CURRENCY[] = { DECLARE_CONV_UNIT(CURRENCY, LITHUANIAN_LITAS, "$/3,45280", "$*3,45280") DECLARE_CONV_UNIT(CURRENCY, LUXEMBOURG_FRANC, "$/40,3399", "$*40,3399") DECLARE_CONV_UNIT(CURRENCY, MALTESE_LIRA, "$/0.42930", "$*0.42930") - DECLARE_CONV_UNIT(CURRENCY, PORTOGUESE_ESCUDO, "$/200,482", "$*200,482") + DECLARE_CONV_UNIT(CURRENCY, PORTUGUESE_ESCUDO, "$/200,482", "$*200,482") DECLARE_CONV_UNIT(CURRENCY, SLOVAK_KORUNA, "$/30,126", "$*30,126") DECLARE_CONV_UNIT(CURRENCY, SLOVENIAN_TOLAR, "$/239,640", "$*239,640") DECLARE_CONV_UNIT(CURRENCY, SPANISH_PESETA, "$/166,386", "$*166,386") diff --git a/base/applications/calc/lang/bg-BG.rc b/base/applications/calc/lang/bg-BG.rc index 2c5184d8b82..7fc355db036 100644 --- a/base/applications/calc/lang/bg-BG.rc +++ b/base/applications/calc/lang/bg-BG.rc @@ -504,7 +504,7 @@ BEGIN IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas" IDS_CURRENCY_LUXEMBOURG_FRANC "Люксембургски франк" IDS_CURRENCY_MALTESE_LIRA "Малтийска лира" - IDS_CURRENCY_PORTOGUESE_ESCUDO "Португалско ескудо" + IDS_CURRENCY_PORTUGUESE_ESCUDO "Португалско ескудо" IDS_CURRENCY_SLOVAK_KORUNA "Словашка крона" IDS_CURRENCY_SLOVENIAN_TOLAR "Словенси толар" IDS_CURRENCY_SPANISH_PESETA "Испанска песета" diff --git a/base/applications/calc/lang/cs-CZ.rc b/base/applications/calc/lang/cs-CZ.rc index eb423fe45c3..03e09321b84 100644 --- a/base/applications/calc/lang/cs-CZ.rc +++ b/base/applications/calc/lang/cs-CZ.rc @@ -504,7 +504,7 @@ BEGIN IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas" IDS_CURRENCY_LUXEMBOURG_FRANC "Lucemburský frank" IDS_CURRENCY_MALTESE_LIRA "Maltská lira" - IDS_CURRENCY_PORTOGUESE_ESCUDO "Portugalské escudo" + IDS_CURRENCY_PORTUGUESE_ESCUDO "Portugalské escudo" IDS_CURRENCY_SLOVAK_KORUNA "Slovenská koruna" IDS_CURRENCY_SLOVENIAN_TOLAR "Slovinský tolar" IDS_CURRENCY_SPANISH_PESETA "Španělská peseta" diff --git a/base/applications/calc/lang/de-DE.rc b/base/applications/calc/lang/de-DE.rc index f9d7dda54b1..a04ab72bc63 100644 --- a/base/applications/calc/lang/de-DE.rc +++ b/base/applications/calc/lang/de-DE.rc @@ -500,7 +500,7 @@ BEGIN IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas" IDS_CURRENCY_LUXEMBOURG_FRANC "Luxemburgische Franc" IDS_CURRENCY_MALTESE_LIRA "Maltesische Lire" - IDS_CURRENCY_PORTOGUESE_ESCUDO "Portugiesische Escudo" + IDS_CURRENCY_PORTUGUESE_ESCUDO "Portugiesische Escudo" IDS_CURRENCY_SLOVAK_KORUNA "Slowakische Krone" IDS_CURRENCY_SLOVENIAN_TOLAR "Slovenische Tolar" IDS_CURRENCY_SPANISH_PESETA "Spanische Peseta" diff --git a/base/applications/calc/lang/el-GR.rc b/base/applications/calc/lang/el-GR.rc index bcb193bb574..65d251efe21 100644 --- a/base/applications/calc/lang/el-GR.rc +++ b/base/applications/calc/lang/el-GR.rc @@ -500,7 +500,7 @@ BEGIN IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas" IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc" IDS_CURRENCY_MALTESE_LIRA "Μαλτέζικη λίρα" - IDS_CURRENCY_PORTOGUESE_ESCUDO "Πορτογαλικό εσκούδο" + IDS_CURRENCY_PORTUGUESE_ESCUDO "Πορτογαλικό εσκούδο" IDS_CURRENCY_SLOVAK_KORUNA "Slovak koruna" IDS_CURRENCY_SLOVENIAN_TOLAR "Slovenian tolar" IDS_CURRENCY_SPANISH_PESETA "Ισπανική πεσέτα" diff --git a/base/applications/calc/lang/en-US.rc b/base/applications/calc/lang/en-US.rc index c6762a3d947..b15f23b2373 100644 --- a/base/applications/calc/lang/en-US.rc +++ b/base/applications/calc/lang/en-US.rc @@ -500,7 +500,7 @@ BEGIN IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas" IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc" IDS_CURRENCY_MALTESE_LIRA "Maltese lira" - IDS_CURRENCY_PORTOGUESE_ESCUDO "Portuguese escudo" + IDS_CURRENCY_PORTUGUESE_ESCUDO "Portuguese escudo" IDS_CURRENCY_SLOVAK_KORUNA "Slovak koruna" IDS_CURRENCY_SLOVENIAN_TOLAR "Slovenian tolar" IDS_CURRENCY_SPANISH_PESETA "Spanish peseta" diff --git a/base/applications/calc/lang/es-ES.rc b/base/applications/calc/lang/es-ES.rc index 6ab1c005e87..873b7a2f467 100644 --- a/base/applications/calc/lang/es-ES.rc +++ b/base/applications/calc/lang/es-ES.rc @@ -506,7 +506,7 @@ BEGIN IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas" IDS_CURRENCY_LUXEMBOURG_FRANC "Franco luxemburgués" IDS_CURRENCY_MALTESE_LIRA "Lira maltesa" - IDS_CURRENCY_PORTOGUESE_ESCUDO "Escudo portugués" + IDS_CURRENCY_PORTUGUESE_ESCUDO "Escudo portugués" IDS_CURRENCY_SLOVAK_KORUNA "Corona eslovaca" IDS_CURRENCY_SLOVENIAN_TOLAR "Tolar esloveno" IDS_CURRENCY_SPANISH_PESETA "Peseta española" diff --git a/base/applications/calc/lang/fr-FR.rc b/base/applications/calc/lang/fr-FR.rc index 7c13665e373..3e6aa2c847f 100644 --- a/base/applications/calc/lang/fr-FR.rc +++ b/base/applications/calc/lang/fr-FR.rc @@ -500,7 +500,7 @@ BEGIN IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas" IDS_CURRENCY_LUXEMBOURG_FRANC "Franc luxembourgeois" IDS_CURRENCY_MALTESE_LIRA "Lire maltaise" - IDS_CURRENCY_PORTOGUESE_ESCUDO "Escudo portugaise" + IDS_CURRENCY_PORTUGUESE_ESCUDO "Escudo portugaise" IDS_CURRENCY_SLOVAK_KORUNA "Couronne slovaque" IDS_CURRENCY_SLOVENIAN_TOLAR "Tolar slovène" IDS_CURRENCY_SPANISH_PESETA "Peseta espagnole" diff --git a/base/applications/calc/lang/he-IL.rc b/base/applications/calc/lang/he-IL.rc index ed039acb4f8..6d99aecab53 100644 --- a/base/applications/calc/lang/he-IL.rc +++ b/base/applications/calc/lang/he-IL.rc @@ -506,7 +506,7 @@ BEGIN IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas" IDS_CURRENCY_LUXEMBOURG_FRANC "פרנק לוקסמבורגי" IDS_CURRENCY_MALTESE_LIRA "לירה מלטזי" - IDS_CURRENCY_PORTOGUESE_ESCUDO "אסקודו פורטגלי" + IDS_CURRENCY_PORTUGUESE_ESCUDO "אסקודו פורטגלי" IDS_CURRENCY_SLOVAK_KORUNA "קורונה סלובקית" IDS_CURRENCY_SLOVENIAN_TOLAR "טולר סלובני" IDS_CURRENCY_SPANISH_PESETA "פזטה ספרדית" diff --git a/base/applications/calc/lang/hu-HU.rc b/base/applications/calc/lang/hu-HU.rc index 7e5e2967a2b..1109bb21e1d 100644 --- a/base/applications/calc/lang/hu-HU.rc +++ b/base/applications/calc/lang/hu-HU.rc @@ -507,7 +507,7 @@ BEGIN IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas" IDS_CURRENCY_LUXEMBOURG_FRANC "Luxemburgi frank" IDS_CURRENCY_MALTESE_LIRA "Máltai líra" - IDS_CURRENCY_PORTOGUESE_ESCUDO "Portugál escudo" + IDS_CURRENCY_PORTUGUESE_ESCUDO "Portugál escudo" IDS_CURRENCY_SLOVAK_KORUNA "Szlovák korona" IDS_CURRENCY_SLOVENIAN_TOLAR "Szlovén tolár" IDS_CURRENCY_SPANISH_PESETA "Spanyol pezeta" diff --git a/base/applications/calc/lang/id-ID.rc b/base/applications/calc/lang/id-ID.rc index fe6dfb4a1e0..56e64382824 100644 --- a/base/applications/calc/lang/id-ID.rc +++ b/base/applications/calc/lang/id-ID.rc @@ -507,7 +507,7 @@ BEGIN IDS_CURRENCY_LITHUANIAN_LITAS "Litas Lithuania" IDS_CURRENCY_LUXEMBOURG_FRANC "Franc Luksemburg" IDS_CURRENCY_MALTESE_LIRA "Lira Malta" - IDS_CURRENCY_PORTOGUESE_ESCUDO "Escudo Portugis" + IDS_CURRENCY_PORTUGUESE_ESCUDO "Escudo Portugis" IDS_CURRENCY_SLOVAK_KORUNA "Koruna Slovakia" IDS_CURRENCY_SLOVENIAN_TOLAR "Tolar Slovenia" IDS_CURRENCY_SPANISH_PESETA "Peseta Spanyol" diff --git a/base/applications/calc/lang/it-IT.rc b/base/applications/calc/lang/it-IT.rc index 1f3342c5fb2..3a8dc1ead0c 100644 --- a/base/applications/calc/lang/it-IT.rc +++ b/base/applications/calc/lang/it-IT.rc @@ -500,7 +500,7 @@ BEGIN IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas" IDS_CURRENCY_LUXEMBOURG_FRANC "Franco Lussemburghese" IDS_CURRENCY_MALTESE_LIRA "Lira maltese" - IDS_CURRENCY_PORTOGUESE_ESCUDO "Escudo portoghese" + IDS_CURRENCY_PORTUGUESE_ESCUDO "Escudo portoghese" IDS_CURRENCY_SLOVAK_KORUNA "Corona slovacca" IDS_CURRENCY_SLOVENIAN_TOLAR "Tallero sloveno" IDS_CURRENCY_SPANISH_PESETA "Peseta spagnola" diff --git a/base/applications/calc/lang/ja-JP.rc b/base/applications/calc/lang/ja-JP.rc index 32a3b593e39..c58e4562004 100644 --- a/base/applications/calc/lang/ja-JP.rc +++ b/base/applications/calc/lang/ja-JP.rc @@ -500,7 +500,7 @@ BEGIN IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas" IDS_CURRENCY_LUXEMBOURG_FRANC "ルクセンブルクフラン" IDS_CURRENCY_MALTESE_LIRA "マルタリラ" - IDS_CURRENCY_PORTOGUESE_ESCUDO "ポルトガルエスクード" + IDS_CURRENCY_PORTUGUESE_ESCUDO "ポルトガルエスクード" IDS_CURRENCY_SLOVAK_KORUNA "スロバキアコルナ" IDS_CURRENCY_SLOVENIAN_TOLAR "スロベニア tolar" IDS_CURRENCY_SPANISH_PESETA "スペインペセタ" diff --git a/base/applications/calc/lang/ko-KR.rc b/base/applications/calc/lang/ko-KR.rc index 577b2d25725..2db12ca31cd 100644 --- a/base/applications/calc/lang/ko-KR.rc +++ b/base/applications/calc/lang/ko-KR.rc @@ -502,7 +502,7 @@ BEGIN IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas" IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc" IDS_CURRENCY_MALTESE_LIRA "Maltese lira" - IDS_CURRENCY_PORTOGUESE_ESCUDO "Portuguese escudo" + IDS_CURRENCY_PORTUGUESE_ESCUDO "Portuguese escudo" IDS_CURRENCY_SLOVAK_KORUNA "Slovak koruna" IDS_CURRENCY_SLOVENIAN_TOLAR "Slovenian tolar" IDS_CURRENCY_SPANISH_PESETA "Spanish peseta" diff --git a/base/applications/calc/lang/nl-NL.rc b/base/applications/calc/lang/nl-NL.rc index ad65c4aa863..a711cdc4cad 100644 --- a/base/applications/calc/lang/nl-NL.rc +++ b/base/applications/calc/lang/nl-NL.rc @@ -500,7 +500,7 @@ BEGIN IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas" IDS_CURRENCY_LUXEMBOURG_FRANC "Luxemburgse franc" IDS_CURRENCY_MALTESE_LIRA "Maltese lira" - IDS_CURRENCY_PORTOGUESE_ESCUDO "Portugese escudo" + IDS_CURRENCY_PORTUGUESE_ESCUDO "Portugese escudo" IDS_CURRENCY_SLOVAK_KORUNA "Slowaakse kroon" IDS_CURRENCY_SLOVENIAN_TOLAR "Sloveense tolar" IDS_CURRENCY_SPANISH_PESETA "Spaanse peseta" diff --git a/base/applications/calc/lang/no-NO.rc b/base/applications/calc/lang/no-NO.rc index e2a399895fc..7154915ec1a 100644 --- a/base/applications/calc/lang/no-NO.rc +++ b/base/applications/calc/lang/no-NO.rc @@ -500,7 +500,7 @@ BEGIN IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas" IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc" IDS_CURRENCY_MALTESE_LIRA "Maltesisk lira" - IDS_CURRENCY_PORTOGUESE_ESCUDO "Portogisisk escudo" + IDS_CURRENCY_PORTUGUESE_ESCUDO "Portugisisk escudo" IDS_CURRENCY_SLOVAK_KORUNA "Slovansk koruna" IDS_CURRENCY_SLOVENIAN_TOLAR "Slovenansk tolar" IDS_CURRENCY_SPANISH_PESETA "Spansk peseta" diff --git a/base/applications/calc/lang/pl-PL.rc b/base/applications/calc/lang/pl-PL.rc index bb8143f2805..99d3305bc3e 100644 --- a/base/applications/calc/lang/pl-PL.rc +++ b/base/applications/calc/lang/pl-PL.rc @@ -507,7 +507,7 @@ BEGIN IDS_CURRENCY_LITHUANIAN_LITAS "Litewski lit" IDS_CURRENCY_LUXEMBOURG_FRANC "Luksemburski frank" IDS_CURRENCY_MALTESE_LIRA "Maltańskie liry" - IDS_CURRENCY_PORTOGUESE_ESCUDO "Portugalskie escudo" + IDS_CURRENCY_PORTUGUESE_ESCUDO "Portugalskie escudo" IDS_CURRENCY_SLOVAK_KORUNA "Słowacka korona" IDS_CURRENCY_SLOVENIAN_TOLAR "Słoveński tolar" IDS_CURRENCY_SPANISH_PESETA "Hiszpańska peseta" diff --git a/base/applications/calc/lang/pt-BR.rc b/base/applications/calc/lang/pt-BR.rc index 967867aabf6..400730afc40 100644 --- a/base/applications/calc/lang/pt-BR.rc +++ b/base/applications/calc/lang/pt-BR.rc @@ -502,7 +502,7 @@ BEGIN IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas" IDS_CURRENCY_LUXEMBOURG_FRANC "Franco luxemburguês" IDS_CURRENCY_MALTESE_LIRA "Lira maltesa" - IDS_CURRENCY_PORTOGUESE_ESCUDO "Escudo português" + IDS_CURRENCY_PORTUGUESE_ESCUDO "Escudo português" IDS_CURRENCY_SLOVAK_KORUNA "Coroa eslovaca" IDS_CURRENCY_SLOVENIAN_TOLAR "Tolar" IDS_CURRENCY_SPANISH_PESETA "Peseta" diff --git a/base/applications/calc/lang/pt-PT.rc b/base/applications/calc/lang/pt-PT.rc index df0b7401d78..f3c11abfdfd 100644 --- a/base/applications/calc/lang/pt-PT.rc +++ b/base/applications/calc/lang/pt-PT.rc @@ -502,7 +502,7 @@ BEGIN IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas" IDS_CURRENCY_LUXEMBOURG_FRANC "Franco luxemburguês" IDS_CURRENCY_MALTESE_LIRA "Lira maltesa" - IDS_CURRENCY_PORTOGUESE_ESCUDO "Escudo português" + IDS_CURRENCY_PORTUGUESE_ESCUDO "Escudo português" IDS_CURRENCY_SLOVAK_KORUNA "Coroa eslovaca" IDS_CURRENCY_SLOVENIAN_TOLAR "Tolar" IDS_CURRENCY_SPANISH_PESETA "Peseta" diff --git a/base/applications/calc/lang/ro-RO.rc b/base/applications/calc/lang/ro-RO.rc index 1eff00f6642..a1f90b7153f 100644 --- a/base/applications/calc/lang/ro-RO.rc +++ b/base/applications/calc/lang/ro-RO.rc @@ -509,7 +509,7 @@ BEGIN IDS_CURRENCY_LITHUANIAN_LITAS "Litas lituanian" IDS_CURRENCY_LUXEMBOURG_FRANC "Franc luxemburghez" IDS_CURRENCY_MALTESE_LIRA "Litră malteză" - IDS_CURRENCY_PORTOGUESE_ESCUDO "Escudo portughez" + IDS_CURRENCY_PORTUGUESE_ESCUDO "Escudo portughez" IDS_CURRENCY_SLOVAK_KORUNA "Coroană slovacă" IDS_CURRENCY_SLOVENIAN_TOLAR "Tolar sloven" IDS_CURRENCY_SPANISH_PESETA "Peseta spaniolă" diff --git a/base/applications/calc/lang/ru-RU.rc b/base/applications/calc/lang/ru-RU.rc index 548452ea418..c90452352a0 100644 --- a/base/applications/calc/lang/ru-RU.rc +++ b/base/applications/calc/lang/ru-RU.rc @@ -500,7 +500,7 @@ BEGIN IDS_CURRENCY_LITHUANIAN_LITAS "Литовский лит" IDS_CURRENCY_LUXEMBOURG_FRANC "Люксембургский франк" IDS_CURRENCY_MALTESE_LIRA "Мальтийская лира" - IDS_CURRENCY_PORTOGUESE_ESCUDO "Португальское эскудо" + IDS_CURRENCY_PORTUGUESE_ESCUDO "Португальское эскудо" IDS_CURRENCY_SLOVAK_KORUNA "Словацкая крона" IDS_CURRENCY_SLOVENIAN_TOLAR "Словенский толар" IDS_CURRENCY_SPANISH_PESETA "Испанская песета" diff --git a/base/applications/calc/lang/sk-SK.rc b/base/applications/calc/lang/sk-SK.rc index 1a5b69a3bfc..7d1040e4b55 100644 --- a/base/applications/calc/lang/sk-SK.rc +++ b/base/applications/calc/lang/sk-SK.rc @@ -504,7 +504,7 @@ BEGIN IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas" IDS_CURRENCY_LUXEMBOURG_FRANC "Luxemburský frank" IDS_CURRENCY_MALTESE_LIRA "Maltská líra" - IDS_CURRENCY_PORTOGUESE_ESCUDO "Portugalské escudo" + IDS_CURRENCY_PORTUGUESE_ESCUDO "Portugalské escudo" IDS_CURRENCY_SLOVAK_KORUNA "Slovenská koruna" IDS_CURRENCY_SLOVENIAN_TOLAR "Slovinský toliar" IDS_CURRENCY_SPANISH_PESETA "Španielska peseta" diff --git a/base/applications/calc/lang/sq-AL.rc b/base/applications/calc/lang/sq-AL.rc index 8290e28e17d..8f8c3a7207a 100644 --- a/base/applications/calc/lang/sq-AL.rc +++ b/base/applications/calc/lang/sq-AL.rc @@ -503,7 +503,7 @@ BEGIN IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas" IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc" IDS_CURRENCY_MALTESE_LIRA "Lira Maltese" - IDS_CURRENCY_PORTOGUESE_ESCUDO "Escudo Portugez" + IDS_CURRENCY_PORTUGUESE_ESCUDO "Escudo Portugez" IDS_CURRENCY_SLOVAK_KORUNA "Koruna Sllovake" IDS_CURRENCY_SLOVENIAN_TOLAR "Tolari Slloven" IDS_CURRENCY_SPANISH_PESETA "Peseta Spanjolle" diff --git a/base/applications/calc/lang/sv-SE.rc b/base/applications/calc/lang/sv-SE.rc index e497a9c5b23..e6ac9aeec9b 100644 --- a/base/applications/calc/lang/sv-SE.rc +++ b/base/applications/calc/lang/sv-SE.rc @@ -506,7 +506,7 @@ BEGIN IDS_CURRENCY_LITHUANIAN_LITAS "Litauenisk litas" IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc" IDS_CURRENCY_MALTESE_LIRA "Maltesisk lire" - IDS_CURRENCY_PORTOGUESE_ESCUDO "Portugisisk escudo" + IDS_CURRENCY_PORTUGUESE_ESCUDO "Portugisisk escudo" IDS_CURRENCY_SLOVAK_KORUNA "Slovakisk koruna" IDS_CURRENCY_SLOVENIAN_TOLAR "Slovensk tolar" IDS_CURRENCY_SPANISH_PESETA "Spansk peseta" diff --git a/base/applications/calc/lang/th-TH.rc b/base/applications/calc/lang/th-TH.rc index b34e9afdd60..c2754ce2c81 100644 --- a/base/applications/calc/lang/th-TH.rc +++ b/base/applications/calc/lang/th-TH.rc @@ -500,7 +500,7 @@ BEGIN IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas" IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc" IDS_CURRENCY_MALTESE_LIRA "Maltese lira" - IDS_CURRENCY_PORTOGUESE_ESCUDO "Portuguese escudo" + IDS_CURRENCY_PORTUGUESE_ESCUDO "Portuguese escudo" IDS_CURRENCY_SLOVAK_KORUNA "Slovak koruna" IDS_CURRENCY_SLOVENIAN_TOLAR "Slovenian tolar" IDS_CURRENCY_SPANISH_PESETA "Spanish peseta" diff --git a/base/applications/calc/lang/tr-TR.rc b/base/applications/calc/lang/tr-TR.rc index 433de10c17c..5b2d7d125c4 100644 --- a/base/applications/calc/lang/tr-TR.rc +++ b/base/applications/calc/lang/tr-TR.rc @@ -505,7 +505,7 @@ BEGIN IDS_CURRENCY_LITHUANIAN_LITAS "Litvanya litas" IDS_CURRENCY_LUXEMBOURG_FRANC "Lüksemburg Frangı" IDS_CURRENCY_MALTESE_LIRA "Malta Lirası" - IDS_CURRENCY_PORTOGUESE_ESCUDO "Portekiz Esküdosu" + IDS_CURRENCY_PORTUGUESE_ESCUDO "Portekiz Esküdosu" IDS_CURRENCY_SLOVAK_KORUNA "Slovak Korunası" IDS_CURRENCY_SLOVENIAN_TOLAR "Slovenya Toları" IDS_CURRENCY_SPANISH_PESETA "İspanyol Pesetası" diff --git a/base/applications/calc/lang/uk-UA.rc b/base/applications/calc/lang/uk-UA.rc index d907373ea7f..c796f4e7cd8 100644 --- a/base/applications/calc/lang/uk-UA.rc +++ b/base/applications/calc/lang/uk-UA.rc @@ -507,7 +507,7 @@ BEGIN IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas" IDS_CURRENCY_LUXEMBOURG_FRANC "Люксембургський франк" IDS_CURRENCY_MALTESE_LIRA "Мальтийськая ліра" - IDS_CURRENCY_PORTOGUESE_ESCUDO "Португальське ескудо" + IDS_CURRENCY_PORTUGUESE_ESCUDO "Португальське ескудо" IDS_CURRENCY_SLOVAK_KORUNA "Словацька крона" IDS_CURRENCY_SLOVENIAN_TOLAR "Словенський толар" IDS_CURRENCY_SPANISH_PESETA "Іспанська песета" diff --git a/base/applications/calc/lang/zh-CN.rc b/base/applications/calc/lang/zh-CN.rc index 6030e84df92..edcfeca8a61 100644 --- a/base/applications/calc/lang/zh-CN.rc +++ b/base/applications/calc/lang/zh-CN.rc @@ -508,7 +508,7 @@ BEGIN IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas" IDS_CURRENCY_LUXEMBOURG_FRANC "卢森堡法郎" IDS_CURRENCY_MALTESE_LIRA "马耳他里拉" - IDS_CURRENCY_PORTOGUESE_ESCUDO "葡萄牙埃斯库多" + IDS_CURRENCY_PORTUGUESE_ESCUDO "葡萄牙埃斯库多" IDS_CURRENCY_SLOVAK_KORUNA "斯洛伐克克朗" IDS_CURRENCY_SLOVENIAN_TOLAR "斯洛文尼亚拖拉" IDS_CURRENCY_SPANISH_PESETA "西班牙比塞塔" diff --git a/base/applications/calc/lang/zh-HK.rc b/base/applications/calc/lang/zh-HK.rc index 284d2908349..a0fd1008024 100644 --- a/base/applications/calc/lang/zh-HK.rc +++ b/base/applications/calc/lang/zh-HK.rc @@ -508,7 +508,7 @@ BEGIN IDS_CURRENCY_LITHUANIAN_LITAS "拉脫維亞拉分" IDS_CURRENCY_LUXEMBOURG_FRANC "盧森堡法郎" IDS_CURRENCY_MALTESE_LIRA "馬爾他里拉" - IDS_CURRENCY_PORTOGUESE_ESCUDO "葡萄牙埃斯庫多" + IDS_CURRENCY_PORTUGUESE_ESCUDO "葡萄牙埃斯庫多" IDS_CURRENCY_SLOVAK_KORUNA "斯洛伐克克朗" IDS_CURRENCY_SLOVENIAN_TOLAR "斯洛維尼亞拖拉" IDS_CURRENCY_SPANISH_PESETA "西班牙比塞塔" diff --git a/base/applications/calc/lang/zh-TW.rc b/base/applications/calc/lang/zh-TW.rc index 7ede2b4c3f3..d8987d4748e 100644 --- a/base/applications/calc/lang/zh-TW.rc +++ b/base/applications/calc/lang/zh-TW.rc @@ -502,7 +502,7 @@ BEGIN IDS_CURRENCY_LITHUANIAN_LITAS "拉脫維亞拉分" IDS_CURRENCY_LUXEMBOURG_FRANC "盧森堡法郎" IDS_CURRENCY_MALTESE_LIRA "馬爾他里拉" - IDS_CURRENCY_PORTOGUESE_ESCUDO "葡萄牙埃斯庫多" + IDS_CURRENCY_PORTUGUESE_ESCUDO "葡萄牙埃斯庫多" IDS_CURRENCY_SLOVAK_KORUNA "斯洛伐克克朗" IDS_CURRENCY_SLOVENIAN_TOLAR "斯洛維尼亞拖拉" IDS_CURRENCY_SPANISH_PESETA "西班牙比塞塔" diff --git a/base/applications/calc/resource.h b/base/applications/calc/resource.h index 3840d649967..a092cf82bd1 100644 --- a/base/applications/calc/resource.h +++ b/base/applications/calc/resource.h @@ -194,7 +194,7 @@ #define IDS_CURRENCY_LITHUANIAN_LITAS 2414 #define IDS_CURRENCY_LUXEMBOURG_FRANC 2415 #define IDS_CURRENCY_MALTESE_LIRA 2416 -#define IDS_CURRENCY_PORTOGUESE_ESCUDO 2417 +#define IDS_CURRENCY_PORTUGUESE_ESCUDO 2417 #define IDS_CURRENCY_SLOVAK_KORUNA 2418 #define IDS_CURRENCY_SLOVENIAN_TOLAR 2419 #define IDS_CURRENCY_SPANISH_PESETA 2420

1 0

[reactos] 01/01: [COMCTL32] pt-PT: Fix accel collisions. Add missing accel keys. (#7234)
by Jose Carlos Jesus 11 Aug '24

11 Aug '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=709309d94fe43c1b06df3… commit 709309d94fe43c1b06df3164408cb2e6e25a32ac Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Sun Aug 11 10:56:38 2024 -0400 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Aug 11 16:56:38 2024 +0200 [COMCTL32] pt-PT: Fix accel collisions. Add missing accel keys. (#7234) --- dll/win32/comctl32/lang/comctl_Pt.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/win32/comctl32/lang/comctl_Pt.rc b/dll/win32/comctl32/lang/comctl_Pt.rc index 4f73e28b5d9..28325f662cd 100644 --- a/dll/win32/comctl32/lang/comctl_Pt.rc +++ b/dll/win32/comctl32/lang/comctl_Pt.rc @@ -60,7 +60,7 @@ BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP PUSHBUTTON "Cancelar", IDCANCEL,58,122,50,14 PUSHBUTTON "&Aplicar", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED - PUSHBUTTON "Ajuda", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP + PUSHBUTTON "A&juda", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP CONTROL "", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 END @@ -88,13 +88,13 @@ FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "&Fechar", IDCANCEL,320,6,70,14 PUSHBUTTON "R&estaurar", IDC_RESET_BTN,320,23,70,14 - PUSHBUTTON "&Ajuda", IDC_HELP_BTN,320,40,70,14 //FIXME: accelerator collision &A + PUSHBUTTON "A&juda", IDC_HELP_BTN,320,40,70,14 PUSHBUTTON "A&cima", IDC_MOVEUP_BTN,320,74,70,14 PUSHBUTTON "A&baixo", IDC_MOVEDN_BTN,320,91,70,14 LTEXT "Botões &disponíveis:", -1,4,5,120,10 LISTBOX IDC_AVAILBTN_LBOX,5,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP - PUSHBUTTON "&Adicionar ->", IDOK, 132, 42, 55, 14 //FIXME: accelerator collision &A + PUSHBUTTON "&Adicionar ->", IDOK, 132, 42, 55, 14 PUSHBUTTON "<- &Remover", IDC_REMOVE_BTN,132,62,55,14 - LTEXT "Botões da barra de ferramentas:", -1,194,5,120,10 //FIXME: should have an accelerator, but &B is in use atm + LTEXT "B&otões da barra de ferramentas:", -1,194,5,120,10 LISTBOX IDC_TOOLBARBTN_LBOX, 194,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP END

1 0

[reactos] 01/01: [ACLUI] Fix typo in pt-PT translation. (#7233)
by Jose Carlos Jesus 11 Aug '24

11 Aug '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eddd97f68c37722fdf6f0… commit eddd97f68c37722fdf6f052579e8667c005ab046 Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Sun Aug 11 10:46:14 2024 -0400 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Aug 11 16:46:14 2024 +0200 [ACLUI] Fix typo in pt-PT translation. (#7233) --- dll/win32/aclui/lang/pt-PT.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/aclui/lang/pt-PT.rc b/dll/win32/aclui/lang/pt-PT.rc index 9d4496b90dd..ec31a16b72a 100644 --- a/dll/win32/aclui/lang/pt-PT.rc +++ b/dll/win32/aclui/lang/pt-PT.rc @@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Segurança" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Nome do &grupo ou utilizadore:", -1, 7, 21, 105, 8 + LTEXT "Nome do &grupo ou utilizador:", -1, 7, 21, 105, 8 CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 31, 213, 52, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE LTEXT "&Administrador:", -1, 7, 7, 49, 8 EDITTEXT IDC_OWNER, 63, 4, 156, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY

1 0

[reactos] 01/01: [RSHELL] Fix indentation (#7238)
by Katayama Hirofumi MZ 11 Aug '24

11 Aug '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bf681c3a7c2fb499e66dd… commit bf681c3a7c2fb499e66dd86632f9366ed124a933 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Aug 11 23:35:02 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Aug 11 23:35:02 2024 +0900 [RSHELL] Fix indentation (#7238) Reduce coding stress. JIRA issue: CORE-18462 Just fix indentation. --- base/shell/rshell/CQuickLaunchBand.cpp | 476 ++++++++++++++++----------------- base/shell/rshell/CQuickLaunchBand.h | 3 +- base/shell/rshell/misc.cpp | 19 +- 3 files changed, 247 insertions(+), 251 deletions(-) diff --git a/base/shell/rshell/CQuickLaunchBand.cpp b/base/shell/rshell/CQuickLaunchBand.cpp index f5ae43ef7a5..1507fc6ca10 100644 --- a/base/shell/rshell/CQuickLaunchBand.cpp +++ b/base/shell/rshell/CQuickLaunchBand.cpp @@ -6,7 +6,6 @@ * PROGRAMMERS: Shriraj Sawant a.k.a SR13 <sr.official(a)hotmail.com> */ - #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H @@ -40,29 +39,29 @@ HRESULT WINAPI RSHELL_CISFBand_CreateInstance(REFIID riid, void** ppv); const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0, 0x79, 0x57, 0x5b, 0xaa, 0x60, 0xb7, 0x2f } }; // Componenet Category Registration - HRESULT RegisterComCat() +HRESULT RegisterComCat() +{ + CComPtr<ICatRegister> pcr; + HRESULT hr = CoCreateInstance(CLSID_StdComponentCategoriesMgr, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(ICatRegister, &pcr)); + if (SUCCEEDED(hr)) { - CComPtr<ICatRegister> pcr; - HRESULT hr = CoCreateInstance(CLSID_StdComponentCategoriesMgr, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(ICatRegister, &pcr)); - if (SUCCEEDED(hr)) - { - CATID catid = CATID_DeskBand; - hr = pcr->RegisterClassImplCategories(CLSID_QuickLaunchBand, 1, &catid); - } - return hr; + CATID catid = CATID_DeskBand; + hr = pcr->RegisterClassImplCategories(CLSID_QuickLaunchBand, 1, &catid); } - - HRESULT UnregisterComCat() + return hr; +} + +HRESULT UnregisterComCat() +{ + CComPtr<ICatRegister> pcr; + HRESULT hr = CoCreateInstance(CLSID_StdComponentCategoriesMgr, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(ICatRegister, &pcr)); + if (SUCCEEDED(hr)) { - CComPtr<ICatRegister> pcr; - HRESULT hr = CoCreateInstance(CLSID_StdComponentCategoriesMgr, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(ICatRegister, &pcr)); - if (SUCCEEDED(hr)) - { - CATID catid = CATID_DeskBand; - hr = pcr->UnRegisterClassImplCategories(CLSID_QuickLaunchBand, 1, &catid); - } - return hr; + CATID catid = CATID_DeskBand; + hr = pcr->UnRegisterClassImplCategories(CLSID_QuickLaunchBand, 1, &catid); } + return hr; +} // Pidl Browser /*++ @@ -79,28 +78,28 @@ const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0, 0x79, 0 * @return The PIDL to selected folder. * *--*/ - LPITEMIDLIST PidlBrowse(HWND hwnd, int nCSIDL) - { - CComHeapPtr<ITEMIDLIST> pidlRoot; +LPITEMIDLIST PidlBrowse(HWND hwnd, int nCSIDL) +{ + CComHeapPtr<ITEMIDLIST> pidlRoot; - WCHAR path[MAX_PATH]; + WCHAR path[MAX_PATH]; - if (nCSIDL) - { - SHGetSpecialFolderLocation(hwnd, nCSIDL, &pidlRoot); - } + if (nCSIDL) + { + SHGetSpecialFolderLocation(hwnd, nCSIDL, &pidlRoot); + } - BROWSEINFO bi = { hwnd, pidlRoot, path, L"Choose a folder", 0, NULL, 0, 0 }; - LPITEMIDLIST pidlSelected = SHBrowseForFolder(&bi); + BROWSEINFO bi = { hwnd, pidlRoot, path, L"Choose a folder", 0, NULL, 0, 0 }; + LPITEMIDLIST pidlSelected = SHBrowseForFolder(&bi); - return pidlSelected; - } + return pidlSelected; +} // CQuickLaunchBand - CQuickLaunchBand::CQuickLaunchBand() {} +CQuickLaunchBand::CQuickLaunchBand() {} - CQuickLaunchBand::~CQuickLaunchBand() {} +CQuickLaunchBand::~CQuickLaunchBand() {} /*****************************************************************************/ // ATL Construct @@ -112,260 +111,259 @@ const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0, 0x79, 0 * @return The error code. * *--*/ - HRESULT CQuickLaunchBand::FinalConstruct() - { - HRESULT hr = RSHELL_CISFBand_CreateInstance(IID_PPV_ARG(IUnknown, &m_punkISFB)); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; +HRESULT CQuickLaunchBand::FinalConstruct() +{ + HRESULT hr = RSHELL_CISFBand_CreateInstance(IID_PPV_ARG(IUnknown, &m_punkISFB)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; - CComPtr<IShellFolderBand> pISFB; - hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IShellFolderBand, &pISFB)); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; + CComPtr<IShellFolderBand> pISFB; + hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IShellFolderBand, &pISFB)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; - CComPtr<IShellFolder> pISF; - hr = SHGetDesktopFolder(&pISF); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; + CComPtr<IShellFolder> pISF; + hr = SHGetDesktopFolder(&pISF); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; - CComHeapPtr<ITEMIDLIST> pidl(PidlBrowse(m_hWndBro, CSIDL_DESKTOP)); - if (pidl == NULL) - return E_FAIL; - pISFB->InitializeSFB(pISF, pidl); + CComHeapPtr<ITEMIDLIST> pidl(PidlBrowse(m_hWndBro, CSIDL_DESKTOP)); + if (pidl == NULL) + return E_FAIL; + pISFB->InitializeSFB(pISF, pidl); - return hr; - } + return hr; +} // IObjectWithSite - STDMETHODIMP CQuickLaunchBand::SetSite(IUnknown *pUnkSite) - { - // Internal CISFBand Calls - CComPtr<IObjectWithSite> pIOWS; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IObjectWithSite, &pIOWS)); - if (FAILED(hr)) - return hr; +STDMETHODIMP CQuickLaunchBand::SetSite(IUnknown *pUnkSite) +{ + // Internal CISFBand Calls + CComPtr<IObjectWithSite> pIOWS; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IObjectWithSite, &pIOWS)); + if (FAILED(hr)) + return hr; - return pIOWS->SetSite(pUnkSite); - } + return pIOWS->SetSite(pUnkSite); +} - STDMETHODIMP CQuickLaunchBand::GetSite(IN REFIID riid, OUT VOID **ppvSite) - { - CComPtr<IObjectWithSite> pIOWS; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IObjectWithSite, &pIOWS)); - if (FAILED(hr)) - return hr; +STDMETHODIMP CQuickLaunchBand::GetSite(IN REFIID riid, OUT VOID **ppvSite) +{ + CComPtr<IObjectWithSite> pIOWS; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IObjectWithSite, &pIOWS)); + if (FAILED(hr)) + return hr; - return pIOWS->GetSite(riid, ppvSite); - } + return pIOWS->GetSite(riid, ppvSite); +} /*****************************************************************************/ // IDeskBand - STDMETHODIMP CQuickLaunchBand::GetWindow(OUT HWND *phwnd) - { - // Internal CISFBand Calls - CComPtr<IDeskBand> pIDB; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); - if (FAILED(hr)) - return hr; +STDMETHODIMP CQuickLaunchBand::GetWindow(OUT HWND *phwnd) +{ + // Internal CISFBand Calls + CComPtr<IDeskBand> pIDB; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); + if (FAILED(hr)) + return hr; - return pIDB->GetWindow(phwnd); - } + return pIDB->GetWindow(phwnd); +} - STDMETHODIMP CQuickLaunchBand::ContextSensitiveHelp(IN BOOL fEnterMode) - { - // Internal CISFBand Calls - CComPtr<IDeskBand> pIDB; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); - if (FAILED(hr)) - return hr; +STDMETHODIMP CQuickLaunchBand::ContextSensitiveHelp(IN BOOL fEnterMode) +{ + // Internal CISFBand Calls + CComPtr<IDeskBand> pIDB; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); + if (FAILED(hr)) + return hr; - return pIDB->ContextSensitiveHelp(fEnterMode); - } + return pIDB->ContextSensitiveHelp(fEnterMode); +} - STDMETHODIMP CQuickLaunchBand::ShowDW(IN BOOL bShow) - { - // Internal CISFBand Calls - CComPtr<IDeskBand> pIDB; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); - if (FAILED(hr)) - return hr; +STDMETHODIMP CQuickLaunchBand::ShowDW(IN BOOL bShow) +{ + // Internal CISFBand Calls + CComPtr<IDeskBand> pIDB; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); + if (FAILED(hr)) + return hr; - return pIDB->ShowDW(bShow); - } + return pIDB->ShowDW(bShow); +} - STDMETHODIMP CQuickLaunchBand::CloseDW(IN DWORD dwReserved) - { - // Internal CISFBand Calls - CComPtr<IDeskBand> pIDB; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); - if (FAILED(hr)) - return hr; +STDMETHODIMP CQuickLaunchBand::CloseDW(IN DWORD dwReserved) +{ + // Internal CISFBand Calls + CComPtr<IDeskBand> pIDB; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); + if (FAILED(hr)) + return hr; - return pIDB->CloseDW(dwReserved); - } + return pIDB->CloseDW(dwReserved); +} - STDMETHODIMP CQuickLaunchBand::ResizeBorderDW(LPCRECT prcBorder, IUnknown *punkToolbarSite, BOOL fReserved) - { - // Internal CISFBand Calls - CComPtr<IDeskBand> pIDB; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); - if (FAILED(hr)) - return hr; +STDMETHODIMP CQuickLaunchBand::ResizeBorderDW(LPCRECT prcBorder, IUnknown *punkToolbarSite, BOOL fReserved) +{ + // Internal CISFBand Calls + CComPtr<IDeskBand> pIDB; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); + if (FAILED(hr)) + return hr; - return pIDB->ResizeBorderDW(prcBorder, punkToolbarSite, fReserved); - } + return pIDB->ResizeBorderDW(prcBorder, punkToolbarSite, fReserved); +} - STDMETHODIMP CQuickLaunchBand::GetBandInfo(IN DWORD dwBandID, IN DWORD dwViewMode, IN OUT DESKBANDINFO *pdbi) - { - // Internal CISFBand Calls - CComPtr<IDeskBand> pIDB; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); - if (FAILED(hr)) - return hr; +STDMETHODIMP CQuickLaunchBand::GetBandInfo(IN DWORD dwBandID, IN DWORD dwViewMode, IN OUT DESKBANDINFO *pdbi) +{ + // Internal CISFBand Calls + CComPtr<IDeskBand> pIDB; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); + if (FAILED(hr)) + return hr; - return pIDB->GetBandInfo(dwBandID, dwViewMode, pdbi); - } + return pIDB->GetBandInfo(dwBandID, dwViewMode, pdbi); +} /*****************************************************************************/ // IPersistStream - STDMETHODIMP CQuickLaunchBand::GetClassID(OUT CLSID *pClassID) - { - // Internal CISFBand Calls - CComPtr<IPersistStream> pIPS; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS)); - if (FAILED(hr)) - return hr; - - return pIPS->GetClassID(pClassID); - } +STDMETHODIMP CQuickLaunchBand::GetClassID(OUT CLSID *pClassID) +{ + // Internal CISFBand Calls + CComPtr<IPersistStream> pIPS; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS)); + if (FAILED(hr)) + return hr; - STDMETHODIMP CQuickLaunchBand::IsDirty() - { - // Internal CISFBand Calls - CComPtr<IPersistStream> pIPS; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS)); - if (FAILED(hr)) - return hr; + return pIPS->GetClassID(pClassID); +} - return pIPS->IsDirty(); - } +STDMETHODIMP CQuickLaunchBand::IsDirty() +{ + // Internal CISFBand Calls + CComPtr<IPersistStream> pIPS; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS)); + if (FAILED(hr)) + return hr; - STDMETHODIMP CQuickLaunchBand::Load(IN IStream *pStm) - { - CComPtr<IPersistStream> pIPS; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS)); - if (FAILED(hr)) - return hr; + return pIPS->IsDirty(); +} - return pIPS->Load(pStm); - } +STDMETHODIMP CQuickLaunchBand::Load(IN IStream *pStm) +{ + CComPtr<IPersistStream> pIPS; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS)); + if (FAILED(hr)) + return hr; - STDMETHODIMP CQuickLaunchBand::Save(IN IStream *pStm, IN BOOL fClearDirty) - { - // Internal CISFBand Calls - CComPtr<IPersistStream> pIPS; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS)); - if (FAILED(hr)) - return hr; + return pIPS->Load(pStm); +} - return pIPS->Save(pStm, fClearDirty); - } +STDMETHODIMP CQuickLaunchBand::Save(IN IStream *pStm, IN BOOL fClearDirty) +{ + // Internal CISFBand Calls + CComPtr<IPersistStream> pIPS; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS)); + if (FAILED(hr)) + return hr; - STDMETHODIMP CQuickLaunchBand::GetSizeMax(OUT ULARGE_INTEGER *pcbSize) - { - CComPtr<IPersistStream> pIPS; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS)); - if (FAILED(hr)) - return hr; + return pIPS->Save(pStm, fClearDirty); +} - return pIPS->GetSizeMax(pcbSize); - } +STDMETHODIMP CQuickLaunchBand::GetSizeMax(OUT ULARGE_INTEGER *pcbSize) +{ + CComPtr<IPersistStream> pIPS; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS)); + if (FAILED(hr)) + return hr; + return pIPS->GetSizeMax(pcbSize); +} /*****************************************************************************/ // IWinEventHandler - STDMETHODIMP CQuickLaunchBand::ContainsWindow(IN HWND hWnd) - { - return E_NOTIMPL; - } - - STDMETHODIMP CQuickLaunchBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) - { - // Internal CISFBand Calls - CComPtr<IWinEventHandler> pWEH; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IWinEventHandler, &pWEH)); - if (FAILED(hr)) - return hr; - - return pWEH->OnWinEvent(hWnd, uMsg, wParam, lParam, theResult); - } +STDMETHODIMP CQuickLaunchBand::ContainsWindow(IN HWND hWnd) +{ + return E_NOTIMPL; +} + +STDMETHODIMP CQuickLaunchBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) +{ + // Internal CISFBand Calls + CComPtr<IWinEventHandler> pWEH; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IWinEventHandler, &pWEH)); + if (FAILED(hr)) + return hr; + + return pWEH->OnWinEvent(hWnd, uMsg, wParam, lParam, theResult); +} + +STDMETHODIMP CQuickLaunchBand::IsWindowOwner(HWND hWnd) +{ + // Internal CISFBand Calls + CComPtr<IWinEventHandler> pWEH; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IWinEventHandler, &pWEH)); + if (FAILED(hr)) + return hr; - STDMETHODIMP CQuickLaunchBand::IsWindowOwner(HWND hWnd) - { - // Internal CISFBand Calls - CComPtr<IWinEventHandler> pWEH; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IWinEventHandler, &pWEH)); - if (FAILED(hr)) - return hr; - - return pWEH->IsWindowOwner(hWnd); - } + return pWEH->IsWindowOwner(hWnd); +} /*****************************************************************************/ // *** IOleCommandTarget methods *** - STDMETHODIMP CQuickLaunchBand::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText) - { - // Internal CISFBand Calls - CComPtr<IOleCommandTarget> pOCT; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &pOCT)); - if (FAILED(hr)) - return hr; +STDMETHODIMP CQuickLaunchBand::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText) +{ + // Internal CISFBand Calls + CComPtr<IOleCommandTarget> pOCT; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &pOCT)); + if (FAILED(hr)) + return hr; - return pOCT->QueryStatus(pguidCmdGroup, cCmds, prgCmds, pCmdText); - } + return pOCT->QueryStatus(pguidCmdGroup, cCmds, prgCmds, pCmdText); +} - STDMETHODIMP CQuickLaunchBand::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) - { - // Internal CISFBand Calls - CComPtr<IOleCommandTarget> pOCT; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &pOCT)); - if (FAILED(hr)) - return hr; +STDMETHODIMP CQuickLaunchBand::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) +{ + // Internal CISFBand Calls + CComPtr<IOleCommandTarget> pOCT; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &pOCT)); + if (FAILED(hr)) + return hr; - return pOCT->Exec(pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut); - } + return pOCT->Exec(pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut); +} /*****************************************************************************/ // *** IContextMenu *** - STDMETHODIMP CQuickLaunchBand::GetCommandString(UINT_PTR idCmd, UINT uFlags, UINT *pwReserved, LPSTR pszName, UINT cchMax) - { - // Internal CISFBand Calls - CComPtr<IContextMenu> pICM; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IContextMenu, &pICM)); - if (FAILED(hr)) - return hr; +STDMETHODIMP CQuickLaunchBand::GetCommandString(UINT_PTR idCmd, UINT uFlags, UINT *pwReserved, LPSTR pszName, UINT cchMax) +{ + // Internal CISFBand Calls + CComPtr<IContextMenu> pICM; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IContextMenu, &pICM)); + if (FAILED(hr)) + return hr; - return pICM->GetCommandString(idCmd, uFlags, pwReserved, pszName, cchMax); - } + return pICM->GetCommandString(idCmd, uFlags, pwReserved, pszName, cchMax); +} - STDMETHODIMP CQuickLaunchBand::InvokeCommand(LPCMINVOKECOMMANDINFO pici) - { - // Internal CISFBand Calls - CComPtr<IContextMenu> pICM; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IContextMenu, &pICM)); - if (FAILED(hr)) - return hr; +STDMETHODIMP CQuickLaunchBand::InvokeCommand(LPCMINVOKECOMMANDINFO pici) +{ + // Internal CISFBand Calls + CComPtr<IContextMenu> pICM; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IContextMenu, &pICM)); + if (FAILED(hr)) + return hr; - return pICM->InvokeCommand(pici); - } + return pICM->InvokeCommand(pici); +} - STDMETHODIMP CQuickLaunchBand::QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) - { - // Internal CISFBand Calls - CComPtr<IContextMenu> pICM; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IContextMenu, &pICM)); - if (FAILED(hr)) - return hr; - - return pICM->QueryContextMenu(hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags); - } \ No newline at end of file +STDMETHODIMP CQuickLaunchBand::QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) +{ + // Internal CISFBand Calls + CComPtr<IContextMenu> pICM; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IContextMenu, &pICM)); + if (FAILED(hr)) + return hr; + + return pICM->QueryContextMenu(hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags); +} diff --git a/base/shell/rshell/CQuickLaunchBand.h b/base/shell/rshell/CQuickLaunchBand.h index 01a194ac6e4..09edd433c30 100644 --- a/base/shell/rshell/CQuickLaunchBand.h +++ b/base/shell/rshell/CQuickLaunchBand.h @@ -27,8 +27,7 @@ class CQuickLaunchBand : HWND m_hWndBro; CComPtr<IUnknown> m_punkISFB; - public: - +public: CQuickLaunchBand(); virtual ~CQuickLaunchBand(); diff --git a/base/shell/rshell/misc.cpp b/base/shell/rshell/misc.cpp index ee9fb672aa1..075daefdbe4 100644 --- a/base/shell/rshell/misc.cpp +++ b/base/shell/rshell/misc.cpp @@ -56,13 +56,13 @@ extern "C" { -extern HINSTANCE shell32_hInstance; + extern HINSTANCE shell32_hInstance; -HRESULT WINAPI RSHELL_CStartMenu_CreateInstance(REFIID riid, void **ppv); -HRESULT WINAPI RSHELL_CMenuDeskBar_CreateInstance(REFIID riid, LPVOID *ppv); -HRESULT WINAPI RSHELL_CMenuSite_CreateInstance(REFIID riid, LPVOID *ppv); -HRESULT WINAPI RSHELL_CMenuBand_CreateInstance(REFIID riid, LPVOID *ppv); -HRESULT WINAPI RSHELL_CMergedFolder_CreateInstance(REFIID riid, LPVOID *ppv); + HRESULT WINAPI RSHELL_CStartMenu_CreateInstance(REFIID riid, void **ppv); + HRESULT WINAPI RSHELL_CMenuDeskBar_CreateInstance(REFIID riid, LPVOID *ppv); + HRESULT WINAPI RSHELL_CMenuSite_CreateInstance(REFIID riid, LPVOID *ppv); + HRESULT WINAPI RSHELL_CMenuBand_CreateInstance(REFIID riid, LPVOID *ppv); + HRESULT WINAPI RSHELL_CMergedFolder_CreateInstance(REFIID riid, LPVOID *ppv); } DWORD WINAPI WinList_Init(void) @@ -263,9 +263,9 @@ public: STDAPI DllGetClassObject( -REFCLSID rclsid, -REFIID riid, -LPVOID *ppv) + REFCLSID rclsid, + REFIID riid, + LPVOID *ppv) { if (!ppv) return E_INVALIDARG; @@ -281,4 +281,3 @@ VOID WINAPI ShowFolderOptionsDialog(UINT Page, BOOL Async) wsprintfA(buf, "rundll32.exe shell32.dll,Options_RunDLL %u", Page); WinExec(buf, SW_SHOW); } -

1 0

[reactos] 01/01: [NTUSER] Fix popup menu placement when part way off right edge of screen (#7220)
by Doug Lyons 10 Aug '24

10 Aug '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9ee30c57fdcda9788fc83… commit 9ee30c57fdcda9788fc83f4193c6755282524e41 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Sat Aug 10 16:00:44 2024 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Aug 10 16:00:44 2024 -0500 [NTUSER] Fix popup menu placement when part way off right edge of screen (#7220) * Move the popup menu to the right edge of the screen when it is past the screen edge on the right. CORE-19706 --- win32ss/user/ntuser/menu.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c index 47cd4fc42b7..6c454ae4d87 100644 --- a/win32ss/user/ntuser/menu.c +++ b/win32ss/user/ntuser/menu.c @@ -2992,16 +2992,14 @@ static BOOL FASTCALL MENU_ShowPopup(PWND pwndOwner, PMENU menu, UINT id, UINT fl /* We are off the right side of the screen */ if (x + width > monitor->rcMonitor.right) { - if ((x - width) < monitor->rcMonitor.left || x >= monitor->rcMonitor.right) - x = monitor->rcMonitor.right - width; - else - x -= width; + /* Position menu at right edge of the screen */ + x = monitor->rcMonitor.right - width; } /* We are off the left side of the screen */ if (x < monitor->rcMonitor.left) { - /* Position menu at left edge of screen */ + /* Position menu at left edge of the screen */ x = 0; if (x < monitor->rcMonitor.left || x >= monitor->rcMonitor.right || bIsPopup)

1 0

[reactos] 01/01: [NOTEPAD] Don't leave junk behind when opening smaller file (#7227)
by Whindmar Saksit 10 Aug '24

10 Aug '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e546525eacc7deab3ee36… commit e546525eacc7deab3ee36a61d9821cfd5ec0e0a1 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Sat Aug 10 17:08:00 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Aug 10 17:08:00 2024 +0200 [NOTEPAD] Don't leave junk behind when opening smaller file (#7227) --- base/applications/notepad/dialog.c | 1 + 1 file changed, 1 insertion(+) diff --git a/base/applications/notepad/dialog.c b/base/applications/notepad/dialog.c index 17939fbd16d..6f61df4b899 100644 --- a/base/applications/notepad/dialog.c +++ b/base/applications/notepad/dialog.c @@ -343,6 +343,7 @@ VOID DoOpenFile(LPCTSTR szFileName) return; WaitCursor(TRUE); + SetWindowText(Globals.hEdit, NULL); hFile = CreateFile(szFileName, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs