Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [MSPAINT] Restrict drawing direction on Shift key (#5726)
by Katayama Hirofumi MZ 26 Sep '23

26 Sep '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=389d04650f1dd19cac8e5… commit 389d04650f1dd19cac8e5587030cb8922500d318 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Sep 26 22:47:23 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Sep 26 22:47:23 2023 +0900 [MSPAINT] Restrict drawing direction on Shift key (#5726) - While holding down the Shift key, drawing lines with the pen/brush is limited to either of 8 directions (horizontal/vertical/diagonal). - s/abs/labs/ CORE-19094 --- base/applications/mspaint/common.h | 5 +- base/applications/mspaint/dib.cpp | 5 - base/applications/mspaint/drawing.cpp | 6 +- base/applications/mspaint/mouse.cpp | 215 ++++++++++++++++++++++++------- base/applications/mspaint/precomp.h | 2 + base/applications/mspaint/toolsmodel.cpp | 17 ++- base/applications/mspaint/toolsmodel.h | 4 +- 7 files changed, 189 insertions(+), 65 deletions(-) diff --git a/base/applications/mspaint/common.h b/base/applications/mspaint/common.h index ee103d74911..d2e862b0114 100644 --- a/base/applications/mspaint/common.h +++ b/base/applications/mspaint/common.h @@ -45,6 +45,7 @@ enum HITTEST // hit BOOL zoomTo(int newZoom, int mouseX, int mouseY); BOOL nearlyEqualPoints(INT x0, INT y0, INT x1, INT y1); -void updateStartAndLast(LONG x, LONG y); -void updateLast(LONG x, LONG y); BOOL OpenMailer(HWND hWnd, LPCWSTR pszPathName); + +#define DEG2RAD(degree) (((degree) * M_PI) / 180) +#define RAD2DEG(radian) ((LONG)(((radian) * 180) / M_PI)) diff --git a/base/applications/mspaint/dib.cpp b/base/applications/mspaint/dib.cpp index ee899c74e98..cd069c9ef6f 100644 --- a/base/applications/mspaint/dib.cpp +++ b/base/applications/mspaint/dib.cpp @@ -6,7 +6,6 @@ */ #include "precomp.h" -#include <math.h> INT g_fileSize = 0; float g_xDpi = 96; @@ -339,10 +338,6 @@ HBITMAP Rotate90DegreeBlt(HDC hDC1, INT cx, INT cy, BOOL bRight, BOOL bMono) return hbm2; } -#ifndef M_PI - #define M_PI 3.14159265 -#endif - HBITMAP SkewDIB(HDC hDC1, HBITMAP hbm, INT nDegree, BOOL bVertical, BOOL bMono) { CWaitCursor waitCursor; diff --git a/base/applications/mspaint/drawing.cpp b/base/applications/mspaint/drawing.cpp index dc5e8c433c0..638e78396e2 100644 --- a/base/applications/mspaint/drawing.cpp +++ b/base/applications/mspaint/drawing.cpp @@ -115,7 +115,7 @@ Fill(HDC hdc, LONG x, LONG y, COLORREF color) void Erase(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF color, LONG radius) { - LONG b = max(1, max(abs(x2 - x1), abs(y2 - y1))); + LONG b = max(1, max(labs(x2 - x1), labs(y2 - y1))); HBRUSH hbr = ::CreateSolidBrush(color); for (LONG a = 0; a <= b; a++) @@ -132,7 +132,7 @@ Erase(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF color, LONG radius) void Replace(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF fg, COLORREF bg, LONG radius) { - LONG b = max(1, max(abs(x2 - x1), abs(y2 - y1))); + LONG b = max(1, max(labs(x2 - x1), labs(y2 - y1))); for (LONG a = 0; a <= b; a++) { @@ -169,7 +169,7 @@ Brush(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF color, LONG style) HPEN oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_SOLID, 1, color)); HBRUSH oldBrush = (HBRUSH) SelectObject(hdc, CreateSolidBrush(color)); LONG a, b; - b = max(1, max(abs(x2 - x1), abs(y2 - y1))); + b = max(1, max(labs(x2 - x1), labs(y2 - y1))); switch (style) { case 0: diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index f896ccd84f3..d8e3585c252 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -18,28 +18,28 @@ POINT ToolBase::s_pointStack[256] = { { 0 } }; void regularize(LONG x0, LONG y0, LONG& x1, LONG& y1) { - if (abs(x1 - x0) >= abs(y1 - y0)) - y1 = y0 + (y1 > y0 ? abs(x1 - x0) : -abs(x1 - x0)); + if (labs(x1 - x0) >= labs(y1 - y0)) + y1 = y0 + (y1 > y0 ? labs(x1 - x0) : -labs(x1 - x0)); else - x1 = x0 + (x1 > x0 ? abs(y1 - y0) : -abs(y1 - y0)); + x1 = x0 + (x1 > x0 ? labs(y1 - y0) : -labs(y1 - y0)); } void roundTo8Directions(LONG x0, LONG y0, LONG& x1, LONG& y1) { - if (abs(x1 - x0) >= abs(y1 - y0)) + if (labs(x1 - x0) >= labs(y1 - y0)) { - if (abs(y1 - y0) * 5 < abs(x1 - x0) * 2) + if (labs(y1 - y0) * 5 < labs(x1 - x0) * 2) y1 = y0; else - y1 = y0 + (y1 > y0 ? abs(x1 - x0) : -abs(x1 - x0)); + y1 = y0 + (y1 > y0 ? labs(x1 - x0) : -labs(x1 - x0)); } else { - if (abs(x1 - x0) * 5 < abs(y1 - y0) * 2) + if (labs(x1 - x0) * 5 < labs(y1 - y0) * 2) x1 = x0; else - x1 = x0 + (x1 > x0 ? abs(y1 - y0) : -abs(y1 - y0)); + x1 = x0 + (x1 > x0 ? labs(y1 - y0) : -labs(y1 - y0)); } } @@ -50,18 +50,6 @@ BOOL nearlyEqualPoints(INT x0, INT y0, INT x1, INT y1) return (abs(x1 - x0) <= cxThreshold) && (abs(y1 - y0) <= cyThreshold); } -void updateStartAndLast(LONG x, LONG y) -{ - g_ptStart.x = g_ptEnd.x = x; - g_ptStart.y = g_ptEnd.y = y; -} - -void updateLast(LONG x, LONG y) -{ - g_ptEnd.x = x; - g_ptEnd.y = y; -} - void ToolBase::reset() { s_pointSP = 0; @@ -153,7 +141,7 @@ struct FreeSelTool : ToolBase m_bLeftButton = bLeftButton; } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) override { if (bLeftButton) { @@ -162,9 +150,10 @@ struct FreeSelTool : ToolBase selectionModel.PushToPtStack(pt); imageModel.NotifyImageChanged(); } + return TRUE; } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override { if (bLeftButton) { @@ -186,6 +175,7 @@ struct FreeSelTool : ToolBase canvasWindow.ClientToScreen(&pt); mainWindow.TrackPopupMenu(pt, 0); } + return TRUE; } void OnFinishDraw() override @@ -246,7 +236,7 @@ struct RectSelTool : ToolBase m_bLeftButton = bLeftButton; } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) override { if (bLeftButton) { @@ -255,9 +245,10 @@ struct RectSelTool : ToolBase selectionModel.SetRectFromPoints(g_ptStart, pt); imageModel.NotifyImageChanged(); } + return TRUE; } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override { POINT pt = { x, y }; if (bLeftButton) @@ -272,6 +263,7 @@ struct RectSelTool : ToolBase canvasWindow.ClientToScreen(&pt); mainWindow.TrackPopupMenu(pt, 0); } + return TRUE; } void OnFinishDraw() override @@ -305,26 +297,22 @@ struct TwoPointDrawTool : ToolBase { m_bLeftButton = bLeftButton; m_bDrawing = TRUE; - g_ptStart.x = g_ptEnd.x = x; - g_ptStart.y = g_ptEnd.y = y; imageModel.NotifyImageChanged(); } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) override { - g_ptEnd.x = x; - g_ptEnd.y = y; imageModel.NotifyImageChanged(); + return TRUE; } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override { - g_ptEnd.x = x; - g_ptEnd.y = y; imageModel.PushImageForUndo(); OnDrawOverlayOnImage(m_hdc); m_bDrawing = FALSE; imageModel.NotifyImageChanged(); + return TRUE; } void OnFinishDraw() override @@ -340,8 +328,101 @@ struct TwoPointDrawTool : ToolBase } }; +typedef enum DIRECTION +{ + NO_DIRECTION = -1, + DIRECTION_HORIZONTAL, + DIRECTION_VERTICAL, + DIRECTION_DIAGONAL_RIGHT_DOWN, + DIRECTION_DIAGONAL_RIGHT_UP, +} DIRECTION; + +#define THRESHOULD_DEG 15 + +static DIRECTION +GetDirection(LONG x0, LONG y0, LONG x1, LONG y1) +{ + LONG dx = x1 - x0, dy = y1 - y0; + + if (labs(dx) <= 8 && labs(dy) <= 8) + return NO_DIRECTION; + + double radian = atan2((double)dy, (double)dx); + if (radian < DEG2RAD(-180 + THRESHOULD_DEG)) + { + ATLTRACE("DIRECTION_HORIZONTAL: %ld\n", RAD2DEG(radian)); + return DIRECTION_HORIZONTAL; + } + if (radian < DEG2RAD(-90 - THRESHOULD_DEG)) + { + ATLTRACE("DIRECTION_DIAGONAL_RIGHT_DOWN: %ld\n", RAD2DEG(radian)); + return DIRECTION_DIAGONAL_RIGHT_DOWN; + } + if (radian < DEG2RAD(-90 + THRESHOULD_DEG)) + { + ATLTRACE("DIRECTION_VERTICAL: %ld\n", RAD2DEG(radian)); + return DIRECTION_VERTICAL; + } + if (radian < DEG2RAD(-THRESHOULD_DEG)) + { + ATLTRACE("DIRECTION_DIAGONAL_RIGHT_UP: %ld\n", RAD2DEG(radian)); + return DIRECTION_DIAGONAL_RIGHT_UP; + } + if (radian < DEG2RAD(+THRESHOULD_DEG)) + { + ATLTRACE("DIRECTION_HORIZONTAL: %ld\n", RAD2DEG(radian)); + return DIRECTION_HORIZONTAL; + } + if (radian < DEG2RAD(+90 - THRESHOULD_DEG)) + { + ATLTRACE("DIRECTION_DIAGONAL_RIGHT_DOWN: %ld\n", RAD2DEG(radian)); + return DIRECTION_DIAGONAL_RIGHT_DOWN; + } + if (radian < DEG2RAD(+90 + THRESHOULD_DEG)) + { + ATLTRACE("DIRECTION_VERTICAL: %ld\n", RAD2DEG(radian)); + return DIRECTION_VERTICAL; + } + if (radian < DEG2RAD(+180 - THRESHOULD_DEG)) + { + ATLTRACE("DIRECTION_DIAGONAL_RIGHT_UP: %ld\n", RAD2DEG(radian)); + return DIRECTION_DIAGONAL_RIGHT_UP; + } + ATLTRACE("DIRECTION_HORIZONTAL: %ld\n", RAD2DEG(radian)); + return DIRECTION_HORIZONTAL; +} + +static void +RestrictDrawDirection(DIRECTION dir, LONG x0, LONG y0, LONG& x1, LONG& y1) +{ + switch (dir) + { + case NO_DIRECTION: + default: + return; + + case DIRECTION_HORIZONTAL: + y1 = y0; + break; + + case DIRECTION_VERTICAL: + x1 = x0; + break; + + case DIRECTION_DIAGONAL_RIGHT_DOWN: + y1 = y0 + (x1 - x0); + break; + + case DIRECTION_DIAGONAL_RIGHT_UP: + x1 = x0 - (y1 - y0); + break; + } +} + struct SmoothDrawTool : ToolBase { + DIRECTION m_direction = NO_DIRECTION; + SmoothDrawTool(TOOLTYPE type) : ToolBase(type) { } @@ -350,22 +431,51 @@ struct SmoothDrawTool : ToolBase void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) override { + m_direction = NO_DIRECTION; imageModel.PushImageForUndo(); - g_ptStart.x = g_ptEnd.x = x; - g_ptStart.y = g_ptEnd.y = y; imageModel.NotifyImageChanged(); } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) override { + if (::GetKeyState(VK_SHIFT) < 0) // Shift key is pressed + { + if (m_direction == NO_DIRECTION) + { + m_direction = GetDirection(g_ptStart.x, g_ptStart.y, x, y); + if (m_direction == NO_DIRECTION) + return FALSE; + } + + RestrictDrawDirection(m_direction, g_ptStart.x, g_ptStart.y, x, y); + } + else + { + if (m_direction != NO_DIRECTION) + { + m_direction = NO_DIRECTION; + draw(bLeftButton, x, y); + g_ptStart.x = g_ptEnd.x = x; + g_ptStart.y = g_ptEnd.y = y; + return TRUE; + } + } + draw(bLeftButton, x, y); imageModel.NotifyImageChanged(); + return TRUE; } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override { + if (m_direction != NO_DIRECTION) + { + RestrictDrawDirection(m_direction, g_ptStart.x, g_ptStart.y, x, y); + } + draw(bLeftButton, x, y); OnFinishDraw(); + return TRUE; } void OnFinishDraw() override @@ -375,7 +485,8 @@ struct SmoothDrawTool : ToolBase void OnCancelDraw() override { - OnButtonUp(FALSE, 0, 0); + LONG x = 0, y = 0; + OnButtonUp(FALSE, x, y); imageModel.Undo(TRUE); ToolBase::OnCancelDraw(); } @@ -435,15 +546,17 @@ struct ColorTool : ToolBase paletteModel.SetBgColor(rgbColor); } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) override { fetchColor(bLeftButton, x, y); + return TRUE; } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override { fetchColor(bLeftButton, x, y); toolsModel.SetActiveTool(toolsModel.GetOldActiveTool()); + return TRUE; } }; @@ -550,9 +663,10 @@ struct TextTool : ToolBase UpdatePoint(x, y); } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) override { UpdatePoint(x, y); + return TRUE; } void draw(HDC hdc) @@ -578,7 +692,7 @@ struct TextTool : ToolBase selectionModel.HideSelection(); } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override { POINT pt = { x, y }; imageModel.Clamp(pt); @@ -595,7 +709,7 @@ struct TextTool : ToolBase if (::IsRectEmpty(&selectionModel.m_rc)) { quit(); - return; + return TRUE; } } @@ -630,6 +744,7 @@ struct TextTool : ToolBase textEditWindow.ValidateEditRect(&rc); textEditWindow.ShowWindow(SW_SHOWNOACTIVATE); textEditWindow.SetFocus(); + return TRUE; } void OnFinishDraw() override @@ -720,23 +835,25 @@ struct BezierTool : ToolBase imageModel.NotifyImageChanged(); } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) override { s_pointStack[s_pointSP].x = x; s_pointStack[s_pointSP].y = y; imageModel.NotifyImageChanged(); + return TRUE; } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override { s_pointStack[s_pointSP].x = x; s_pointStack[s_pointSP].y = y; if (s_pointSP >= 3) { OnFinishDraw(); - return; + return TRUE; } imageModel.NotifyImageChanged(); + return TRUE; } void OnCancelDraw() override @@ -822,7 +939,7 @@ struct ShapeTool : ToolBase imageModel.NotifyImageChanged(); } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) override { if ((s_pointSP > 0) && (GetAsyncKeyState(VK_SHIFT) < 0)) roundTo8Directions(s_pointStack[s_pointSP - 1].x, s_pointStack[s_pointSP - 1].y, x, y); @@ -831,9 +948,10 @@ struct ShapeTool : ToolBase s_pointStack[s_pointSP].y = y; imageModel.NotifyImageChanged(); + return TRUE; } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override { if ((s_pointSP > 0) && (GetAsyncKeyState(VK_SHIFT) < 0)) roundTo8Directions(s_pointStack[s_pointSP - 1].x, s_pointStack[s_pointSP - 1].y, x, y); @@ -842,7 +960,7 @@ struct ShapeTool : ToolBase if (nearlyEqualPoints(x, y, s_pointStack[0].x, s_pointStack[0].y)) { OnFinishDraw(); - return; + return TRUE; } else { @@ -855,6 +973,7 @@ struct ShapeTool : ToolBase s_pointSP--; imageModel.NotifyImageChanged(); + return TRUE; } void OnCancelDraw() override diff --git a/base/applications/mspaint/precomp.h b/base/applications/mspaint/precomp.h index 51413a4ed6c..09775b0cb72 100644 --- a/base/applications/mspaint/precomp.h +++ b/base/applications/mspaint/precomp.h @@ -21,6 +21,8 @@ #include <commdlg.h> #include <commctrl.h> #include <stdlib.h> +#define _USE_MATH_DEFINES /* for M_PI */ +#include <math.h> #include <shellapi.h> #include <htmlhelp.h> #include "atlimagedx.h" diff --git a/base/applications/mspaint/toolsmodel.cpp b/base/applications/mspaint/toolsmodel.cpp index b9a5ac2e4b6..b787e6d591e 100644 --- a/base/applications/mspaint/toolsmodel.cpp +++ b/base/applications/mspaint/toolsmodel.cpp @@ -189,24 +189,31 @@ void ToolsModel::NotifyZoomChanged() void ToolsModel::OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) { m_pToolObject->beginEvent(); - updateStartAndLast(x, y); m_pToolObject->OnButtonDown(bLeftButton, x, y, bDoubleClick); + g_ptStart.x = g_ptEnd.x = x; + g_ptStart.y = g_ptEnd.y = y; m_pToolObject->endEvent(); } void ToolsModel::OnMouseMove(BOOL bLeftButton, LONG x, LONG y) { m_pToolObject->beginEvent(); - m_pToolObject->OnMouseMove(bLeftButton, x, y); - updateLast(x, y); + if (m_pToolObject->OnMouseMove(bLeftButton, x, y)) + { + g_ptEnd.x = x; + g_ptEnd.y = y; + } m_pToolObject->endEvent(); } void ToolsModel::OnButtonUp(BOOL bLeftButton, LONG x, LONG y) { m_pToolObject->beginEvent(); - m_pToolObject->OnButtonUp(bLeftButton, x, y); - updateLast(x, y); + if (m_pToolObject->OnButtonUp(bLeftButton, x, y)) + { + g_ptEnd.x = x; + g_ptEnd.y = y; + } m_pToolObject->endEvent(); } diff --git a/base/applications/mspaint/toolsmodel.h b/base/applications/mspaint/toolsmodel.h index 33335c07ffd..09f48672a01 100644 --- a/base/applications/mspaint/toolsmodel.h +++ b/base/applications/mspaint/toolsmodel.h @@ -42,8 +42,8 @@ struct ToolBase virtual ~ToolBase() { } virtual void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) { } - virtual void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) { } - virtual void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) { } + virtual BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) { return TRUE; } + virtual BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) { return TRUE; } virtual void OnCancelDraw(); virtual void OnFinishDraw();

1 0

[reactos] 01/01: [SHELL32][SDK] Implement SHTestTokenPrivilegeW (#5725)
by Katayama Hirofumi MZ 25 Sep '23

25 Sep '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d1e9fe13de06e9c6d17e8… commit d1e9fe13de06e9c6d17e80f2b3dd4804235b9650 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Sep 26 07:36:07 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Sep 26 07:36:07 2023 +0900 [SHELL32][SDK] Implement SHTestTokenPrivilegeW (#5725) and modify shell32.spec. --- dll/win32/shell32/shell32.spec | 2 +- dll/win32/shell32/stubs.cpp | 11 -------- dll/win32/shell32/utils.cpp | 61 ++++++++++++++++++++++++++++++++++++++++ sdk/include/reactos/undocshell.h | 3 ++ 4 files changed, 65 insertions(+), 12 deletions(-) diff --git a/dll/win32/shell32/shell32.spec b/dll/win32/shell32/shell32.spec index a89d475a913..9cc8bfd8cdc 100644 --- a/dll/win32/shell32/shell32.spec +++ b/dll/win32/shell32/shell32.spec @@ -232,7 +232,7 @@ 233 stdcall -noname SHGetUserPicturePathW(wstr long ptr) 234 stdcall -noname SHSetUserPicturePathW(wstr long ptr) 235 stdcall -noname SHOpenEffectiveToken(ptr) -236 stdcall -noname SHTestTokenPrivilegeW(ptr ptr) +236 stdcall -noname SHTestTokenPrivilegeW(ptr wstr) 237 stdcall -noname SHShouldShowWizards(ptr) 238 stdcall InternalExtractIconListW(ptr wstr ptr) 239 stdcall PathIsSlowW(wstr long) diff --git a/dll/win32/shell32/stubs.cpp b/dll/win32/shell32/stubs.cpp index ae4ce677e66..f8518336906 100644 --- a/dll/win32/shell32/stubs.cpp +++ b/dll/win32/shell32/stubs.cpp @@ -1099,17 +1099,6 @@ SHSetUserPicturePathW(LPCWSTR lpPath, int csidl, LPVOID lpUnknown) return E_FAIL; } -/* - * Unimplemented - */ -EXTERN_C BOOL -WINAPI -SHTestTokenPrivilegeW(HANDLE hToken, LPDWORD ReturnLength) -{ - FIXME("SHTestTokenPrivilegeW() stub\n"); - return FALSE; -} - /* * Unimplemented */ diff --git a/dll/win32/shell32/utils.cpp b/dll/win32/shell32/utils.cpp index 5f3e38175ec..57ade40713e 100644 --- a/dll/win32/shell32/utils.cpp +++ b/dll/win32/shell32/utils.cpp @@ -103,6 +103,67 @@ SHInvokePrivilegedFunctionW( return hr; } +/************************************************************************* + * SHTestTokenPrivilegeW (SHELL32.236) + * + * @see http://undoc.airesoft.co.uk/shell32.dll/SHTestTokenPrivilegeW.php + */ +EXTERN_C +BOOL WINAPI +SHTestTokenPrivilegeW(_In_opt_ HANDLE hToken, _In_z_ LPCWSTR lpName) +{ + LUID Luid; + DWORD dwLength; + PTOKEN_PRIVILEGES pTokenPriv; + HANDLE hNewToken = NULL; + BOOL ret = FALSE; + + TRACE("(%p, %s)\n", hToken, debugstr_w(lpName)); + + if (!lpName) + return FALSE; + + if (!hToken) + { + if (!SHOpenEffectiveToken(&hNewToken)) + goto Quit; + + if (!hNewToken) + return FALSE; + + hToken = hNewToken; + } + + if (!LookupPrivilegeValueW(NULL, lpName, &Luid)) + return FALSE; + + dwLength = 0; + if (!GetTokenInformation(hToken, TokenPrivileges, NULL, 0, &dwLength)) + goto Quit; + + pTokenPriv = (PTOKEN_PRIVILEGES)LocalAlloc(LPTR, dwLength); + if (!pTokenPriv) + goto Quit; + + if (GetTokenInformation(hToken, TokenPrivileges, pTokenPriv, dwLength, &dwLength)) + { + UINT iPriv, cPrivs; + cPrivs = pTokenPriv->PrivilegeCount; + for (iPriv = 0; !ret && iPriv < cPrivs; ++iPriv) + { + ret = RtlEqualLuid(&Luid, &pTokenPriv->Privileges[iPriv].Luid); + } + } + + LocalFree(pTokenPriv); + +Quit: + if (hToken == hNewToken) + CloseHandle(hNewToken); + + return ret; +} + /************************************************************************* * SHGetShellStyleHInstance (SHELL32.749) */ diff --git a/sdk/include/reactos/undocshell.h b/sdk/include/reactos/undocshell.h index 312804e7d73..1577466ab9f 100644 --- a/sdk/include/reactos/undocshell.h +++ b/sdk/include/reactos/undocshell.h @@ -695,6 +695,9 @@ SHInvokePrivilegedFunctionW( _In_ PRIVILEGED_FUNCTION fn, _In_opt_ LPARAM lParam); +BOOL WINAPI +SHTestTokenPrivilegeW(_In_opt_ HANDLE hToken, _In_z_ LPCWSTR lpName); + /***************************************************************************** * Shell32 resources */

1 0

[reactos] 01/01: [SHELL32] Fix for shlexec.cpp regressions (#5282)
by Doug Lyons 24 Sep '23

24 Sep '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1b3eed58cac4cd7f8ebfe… commit 1b3eed58cac4cd7f8ebfeecbe1f244076c83a8b8 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Sun Sep 24 15:35:28 2023 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 24 20:35:28 2023 +0000 [SHELL32] Fix for shlexec.cpp regressions (#5282) fixes CORE-18967 'Taskbar toolbar - Right click > Open folder fails' by restoring the code-path we removed with the guilty 0.4.15-dev-3847-g /9b716539182864bc077e362febcda74da50287ed and add test_sei_lpIDList to shell32:ShellExecuteEx apitest test to protect that functionality on future attempts to simplify. --- dll/win32/shell32/shlexec.cpp | 33 ++++++++++++++++ .../rostests/apitests/shell32/ShellExecuteEx.cpp | 45 ++++++++++++++++++++++ 2 files changed, 78 insertions(+) diff --git a/dll/win32/shell32/shlexec.cpp b/dll/win32/shell32/shlexec.cpp index 292c8db8292..ce8113aefa9 100644 --- a/dll/win32/shell32/shlexec.cpp +++ b/dll/win32/shell32/shlexec.cpp @@ -2124,6 +2124,39 @@ static BOOL SHELL_execute(LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc) *end = L'\0'; lpFile = wfileName; } + /* We have to test sei instead of sei_tmp because sei_tmp had its + * input fMask modified above in SHELL_translate_idlist. + * This code is needed to handle the case where we only have an + * lpIDList with multiple CLSID/PIDL's (not 'My Computer' only) */ + else if ((sei->fMask & SEE_MASK_IDLIST) == SEE_MASK_IDLIST) + { + WCHAR buffer[MAX_PATH], xlpFile[MAX_PATH]; + LPWSTR space, s; + + LPWSTR beg = wszApplicationName; + for(s = beg; (space = const_cast<LPWSTR>(strchrW(s, L' '))); s = space + 1) + { + int idx = space - sei_tmp.lpFile; + memcpy(buffer, sei_tmp.lpFile, idx * sizeof(WCHAR)); + buffer[idx] = '\0'; + + if (SearchPathW(*sei_tmp.lpDirectory ? sei_tmp.lpDirectory : NULL, + buffer, L".exe", _countof(xlpFile), xlpFile, NULL)) + { + /* separate out command from parameter string */ + LPCWSTR p = space + 1; + + while(isspaceW(*p)) + ++p; + + strcpyW(wszParameters, p); + *space = L'\0'; + + break; + } + } + lpFile = sei_tmp.lpFile; + } else { lpFile = sei_tmp.lpFile; diff --git a/modules/rostests/apitests/shell32/ShellExecuteEx.cpp b/modules/rostests/apitests/shell32/ShellExecuteEx.cpp index d239467d859..29f03be94b8 100644 --- a/modules/rostests/apitests/shell32/ShellExecuteEx.cpp +++ b/modules/rostests/apitests/shell32/ShellExecuteEx.cpp @@ -467,6 +467,48 @@ static void test_properties() ok_ptr(info.hInstApp, (HINSTANCE)2); } +static void test_sei_lpIDList() +{ + /* This tests ShellExecuteEx with lpIDList for explorer C:\ */ + + /* ITEMIDLIST for CLSID of 'My Computer' followed by PIDL for 'C:\' */ + BYTE lpitemidlist[30] = { 0x14, 0, 0x1f, 0, 0xe0, 0x4f, 0xd0, 0x20, 0xea, + 0x3a, 0x69, 0x10, 0xa2, 0xd8, 0x08, 0, 0x2b, 0x30, 0x30, 0x9d, // My Computer + 0x8, 0, 0x23, 0x43, 0x3a, 0x5c, 0x5c, 0, 0, 0,}; // C:\\ + NUL-NUL ending + BYTE *lpBytes; + lpBytes = lpitemidlist; + + SHELLEXECUTEINFOW ShellExecInfo; + BOOL Result; + STARTUPINFOW si; + PROCESS_INFORMATION pi; + HWND hWnd; + + ZeroMemory( &si, sizeof(si) ); + si.cb = sizeof(si); + ZeroMemory( &pi, sizeof(pi) ); + + ZeroMemory(&ShellExecInfo, sizeof(ShellExecInfo)); + ShellExecInfo.cbSize = sizeof(ShellExecInfo); + ShellExecInfo.fMask = SEE_MASK_IDLIST; + ShellExecInfo.hwnd = NULL; + ShellExecInfo.nShow = SW_SHOWNORMAL; + ShellExecInfo.lpFile = NULL; + ShellExecInfo.lpDirectory = NULL; + ShellExecInfo.lpIDList = lpBytes; + + Result = ShellExecuteExW(&ShellExecInfo); + ok(Result == TRUE, "ShellExecuteEx lpIDList 'C:\\' failed\n"); + trace("sei_lpIDList returned: %s\n", Result ? "SUCCESS" : "FAILURE"); + if (Result) + { + Sleep(700); + // Terminate Window + hWnd = FindWindowW(L"CabinetWClass", L"Local Disk (C:)"); + PostMessage(hWnd, WM_SYSCOMMAND, SC_CLOSE, 0); + } +} + START_TEST(ShellExecuteEx) { DoAppPathTest(); @@ -475,4 +517,7 @@ START_TEST(ShellExecuteEx) DoWaitForWindow(CLASSNAME, CLASSNAME, TRUE, TRUE); Sleep(100); + + test_sei_lpIDList(); + }

1 0

[reactos] 01/01: [SHELL32][SDK] Implement SHInvokePrivilegedFunctionW (#5718)
by Katayama Hirofumi MZ 23 Sep '23

23 Sep '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cc6e444ceb7f6b7b107d4… commit cc6e444ceb7f6b7b107d45e5e18579b14cf9f4c1 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Sep 24 07:11:38 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 24 07:11:38 2023 +0900 [SHELL32][SDK] Implement SHInvokePrivilegedFunctionW (#5718) Add it to <undocshell.h>. Modify shell32.spec. --- dll/win32/shell32/shell32.spec | 2 +- dll/win32/shell32/utils.cpp | 41 ++++++++++++++++++++++++++++++++++++++++ sdk/include/reactos/undocshell.h | 8 ++++++++ 3 files changed, 50 insertions(+), 1 deletion(-) diff --git a/dll/win32/shell32/shell32.spec b/dll/win32/shell32/shell32.spec index c050a87a122..a89d475a913 100644 --- a/dll/win32/shell32/shell32.spec +++ b/dll/win32/shell32/shell32.spec @@ -242,7 +242,7 @@ 243 stdcall -noname SHSetShellWindowEx(ptr ptr) user32.SetShellWindowEx 244 stdcall -noname SHSettingsChanged(ptr ptr) 245 stdcall SHTestTokenMembership(ptr ptr) -246 stub -noname SHInvokePrivilegedFunctionW +246 stdcall -noname SHInvokePrivilegedFunctionW(wstr ptr ptr) 247 stub -noname SHGetActiveConsoleSessionId 248 stdcall -noname SHGetUserSessionId(ptr) 249 stdcall -noname PathParseIconLocation(wstr) PathParseIconLocationW diff --git a/dll/win32/shell32/utils.cpp b/dll/win32/shell32/utils.cpp index 537f23a6504..5f3e38175ec 100644 --- a/dll/win32/shell32/utils.cpp +++ b/dll/win32/shell32/utils.cpp @@ -62,6 +62,47 @@ EXTERN_C DWORD WINAPI SHGetUserSessionId(_In_opt_ HANDLE hToken) return dwSessionId; } +/************************************************************************* + * SHInvokePrivilegedFunctionW (SHELL32.246) + */ +EXTERN_C +HRESULT WINAPI +SHInvokePrivilegedFunctionW( + _In_z_ LPCWSTR pszName, + _In_ PRIVILEGED_FUNCTION fn, + _In_opt_ LPARAM lParam) +{ + TRACE("(%s %p %p)\n", debugstr_w(pszName), fn, lParam); + + if (!pszName || !fn) + return E_INVALIDARG; + + HANDLE hToken = NULL; + TOKEN_PRIVILEGES NewPriv, PrevPriv; + BOOL bAdjusted = FALSE; + + if (SHOpenEffectiveToken(&hToken) && + ::LookupPrivilegeValueW(NULL, pszName, &NewPriv.Privileges[0].Luid)) + { + NewPriv.PrivilegeCount = 1; + NewPriv.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; + + DWORD dwReturnSize; + bAdjusted = ::AdjustTokenPrivileges(hToken, FALSE, &NewPriv, + sizeof(PrevPriv), &PrevPriv, &dwReturnSize); + } + + HRESULT hr = fn(lParam); + + if (bAdjusted) + ::AdjustTokenPrivileges(hToken, FALSE, &PrevPriv, 0, NULL, NULL); + + if (hToken) + ::CloseHandle(hToken); + + return hr; +} + /************************************************************************* * SHGetShellStyleHInstance (SHELL32.749) */ diff --git a/sdk/include/reactos/undocshell.h b/sdk/include/reactos/undocshell.h index 9c74f8d9b00..312804e7d73 100644 --- a/sdk/include/reactos/undocshell.h +++ b/sdk/include/reactos/undocshell.h @@ -687,6 +687,14 @@ LargeIntegerToString( BOOL WINAPI SHOpenEffectiveToken(_Out_ LPHANDLE phToken); DWORD WINAPI SHGetUserSessionId(_In_opt_ HANDLE hToken); +typedef HRESULT (CALLBACK *PRIVILEGED_FUNCTION)(LPARAM lParam); + +HRESULT WINAPI +SHInvokePrivilegedFunctionW( + _In_z_ LPCWSTR pszName, + _In_ PRIVILEGED_FUNCTION fn, + _In_opt_ LPARAM lParam); + /***************************************************************************** * Shell32 resources */

1 0

[reactos] 01/01: [NTOS:CM] Fix lock leak
by Timo Kreuzer 23 Sep '23

23 Sep '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ed06c06dcbccdc08a049b… commit ed06c06dcbccdc08a049bb659b6413be527118f3 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Sep 20 23:21:10 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Sep 23 18:34:00 2023 +0300 [NTOS:CM] Fix lock leak Triggered by low available pool memory during kmtest ExPools. --- ntoskrnl/config/cmalloc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ntoskrnl/config/cmalloc.c b/ntoskrnl/config/cmalloc.c index eda161da97e..7d44ff82135 100644 --- a/ntoskrnl/config/cmalloc.c +++ b/ntoskrnl/config/cmalloc.c @@ -176,6 +176,9 @@ SearchKcbList: /* Now go back and search the list */ goto SearchKcbList; } + + /* Release the allocation lock */ + KeReleaseGuardedMutex(&CmpAllocBucketLock); } /* Allocate a KCB only */

1 0

[reactos] 01/01: [THEMES] Optimize png for Lautus style (#5712)
by Andrew Dent 23 Sep '23

23 Sep '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aa84645bccda8d7095f60… commit aa84645bccda8d7095f6053cae67b1e9bf816345 Author: Andrew Dent <dent.ace(a)gmail.com> AuthorDate: Wed Sep 20 22:56:06 2023 +0100 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sat Sep 23 15:54:39 2023 +0300 [THEMES] Optimize png for Lautus style (#5712) Lossless optimization of new png Start button in Lautus style, original by @Splitwirez (ed134bf2, #5540). Slimmed 464 bytes, ~20% saving. This png is encoded as a grayscale+alpha, so should be tested. --- .../lautus.msstyles/bitmaps/NORMAL_STARTBUTTON.png | Bin 2341 -> 1877 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media/themes/Lautus/lautus.msstyles/bitmaps/NORMAL_STARTBUTTON.png b/media/themes/Lautus/lautus.msstyles/bitmaps/NORMAL_STARTBUTTON.png index 5508ccbc79f..c79d4711f09 100644 Binary files a/media/themes/Lautus/lautus.msstyles/bitmaps/NORMAL_STARTBUTTON.png and b/media/themes/Lautus/lautus.msstyles/bitmaps/NORMAL_STARTBUTTON.png differ

1 0

[reactos] 01/01: [RPCRT4] Fix x64 assembly code
by Timo Kreuzer 23 Sep '23

23 Sep '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=88808bad8a29213bc51ca… commit 88808bad8a29213bc51ca54db265e9425a457981 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Sep 10 14:35:20 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Sep 23 11:06:24 2023 +0300 [RPCRT4] Fix x64 assembly code movaps is a 128 bit aligned move, we need a 64 bit unaligned move, so use movsd. Fixes a crash in oleaut32_winetest tmarshal. Also add a comment about the use of movd instead of movq. --- dll/win32/rpcrt4/msvc.S | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dll/win32/rpcrt4/msvc.S b/dll/win32/rpcrt4/msvc.S index fca5ee5e612..a1da254285b 100644 --- a/dll/win32/rpcrt4/msvc.S +++ b/dll/win32/rpcrt4/msvc.S @@ -62,9 +62,9 @@ FUNC call_stubless_func add rdx, [rcx + 8] /* info->ProcFormatString + offset */ mov rcx, [rcx] /* info->pStubDesc */ - movaps [rsp + 20h], xmm1 - movaps [rsp + 28h], xmm2 - movaps [rsp + 30h], xmm3 + movsd qword ptr [rsp + 20h], xmm1 + movsd qword ptr [rsp + 28h], xmm2 + movsd qword ptr [rsp + 30h], xmm3 lea r9, [rsp + 18h] /* fpu_args */ call ndr_client_call add rsp, 38h @@ -97,6 +97,14 @@ FUNC call_server_func mov rdx, [rsp + 8] mov r8, [rsp + 16] mov r9, [rsp + 24] + + /* Usually the 64 bit SSE2 version of movd is called movq, as in GCC code + (see https://www.felixcloutier.com/x86/movd:movq). But there is another + movq with different encoding, which does not accept an integer register + as source (see https://www.felixcloutier.com/x86/movq). Older versions + of ML64 get confused and do not accept movq with integer registers, + but they translate movd to 64 bit, when 64 bit registers are used as + source, so we use that here. */ movd xmm0, rcx movd xmm1, rdx movd xmm2, r8

1 0

[reactos] 01/01: [MSPAINT] Introduce Ctrl+Plus / Ctrl+Minus (#5717)
by Katayama Hirofumi MZ 23 Sep '23

23 Sep '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ed9973f87621489568314… commit ed9973f876214895683144fa85a61d4695191b60 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Sep 23 09:26:11 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Sep 23 09:26:11 2023 +0900 [MSPAINT] Introduce Ctrl+Plus / Ctrl+Minus (#5717) - Add Ctrl+Plus and Ctrl+Minus accelerators. - Add IDM_CTRL_PLUS and IDM_CTRL_MINUS commands. - Stretch the selection area on IDM_CTRL_PLUS and IDM_CTRL_MINUS actions. CORE-19094 --- base/applications/mspaint/canvas.cpp | 4 +-- base/applications/mspaint/lang/bg-BG.rc | 4 +++ base/applications/mspaint/lang/cs-CZ.rc | 4 +++ base/applications/mspaint/lang/de-DE.rc | 4 +++ base/applications/mspaint/lang/en-GB.rc | 4 +++ base/applications/mspaint/lang/en-US.rc | 4 +++ base/applications/mspaint/lang/es-ES.rc | 4 +++ base/applications/mspaint/lang/et-EE.rc | 4 +++ base/applications/mspaint/lang/eu-ES.rc | 4 +++ base/applications/mspaint/lang/fr-FR.rc | 4 +++ base/applications/mspaint/lang/he-IL.rc | 4 +++ base/applications/mspaint/lang/hu-HU.rc | 4 +++ base/applications/mspaint/lang/id-ID.rc | 4 +++ base/applications/mspaint/lang/it-IT.rc | 4 +++ base/applications/mspaint/lang/ja-JP.rc | 4 +++ base/applications/mspaint/lang/nl-NL.rc | 4 +++ base/applications/mspaint/lang/no-NO.rc | 4 +++ base/applications/mspaint/lang/pl-PL.rc | 4 +++ base/applications/mspaint/lang/pt-BR.rc | 4 +++ base/applications/mspaint/lang/pt-PT.rc | 4 +++ base/applications/mspaint/lang/ro-RO.rc | 4 +++ base/applications/mspaint/lang/ru-RU.rc | 4 +++ base/applications/mspaint/lang/sk-SK.rc | 4 +++ base/applications/mspaint/lang/sq-AL.rc | 4 +++ base/applications/mspaint/lang/sv-SE.rc | 4 +++ base/applications/mspaint/lang/tr-TR.rc | 4 +++ base/applications/mspaint/lang/uk-UA.rc | 4 +++ base/applications/mspaint/lang/vi-VN.rc | 4 +++ base/applications/mspaint/lang/zh-CN.rc | 4 +++ base/applications/mspaint/lang/zh-HK.rc | 4 +++ base/applications/mspaint/lang/zh-TW.rc | 4 +++ base/applications/mspaint/mouse.cpp | 10 ++++++ base/applications/mspaint/resource.h | 3 ++ base/applications/mspaint/selectionmodel.cpp | 48 ++++++++++++++++++++++------ base/applications/mspaint/selectionmodel.h | 6 ++-- base/applications/mspaint/toolsmodel.cpp | 5 +++ base/applications/mspaint/toolsmodel.h | 4 +++ base/applications/mspaint/winproc.cpp | 7 ++++ 38 files changed, 193 insertions(+), 14 deletions(-) diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index 186b88dc044..a403c8bd456 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -750,8 +750,8 @@ LRESULT CCanvasWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH VOID CCanvasWindow::cancelDrawing() { - selectionModel.ClearColor(); - selectionModel.ClearMask(); + selectionModel.ClearColorImage(); + selectionModel.ClearMaskImage(); m_hitSelection = HIT_NONE; m_drawing = FALSE; toolsModel.OnCancelDraw(); diff --git a/base/applications/mspaint/lang/bg-BG.rc b/base/applications/mspaint/lang/bg-BG.rc index cf525cd4514..e880803577d 100644 --- a/base/applications/mspaint/lang/bg-BG.rc +++ b/base/applications/mspaint/lang/bg-BG.rc @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/cs-CZ.rc b/base/applications/mspaint/lang/cs-CZ.rc index c6a8c018a83..22f2387752a 100644 --- a/base/applications/mspaint/lang/cs-CZ.rc +++ b/base/applications/mspaint/lang/cs-CZ.rc @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/de-DE.rc b/base/applications/mspaint/lang/de-DE.rc index 97466efcbb1..07511f578ed 100644 --- a/base/applications/mspaint/lang/de-DE.rc +++ b/base/applications/mspaint/lang/de-DE.rc @@ -139,6 +139,10 @@ BEGIN "^U", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/en-GB.rc b/base/applications/mspaint/lang/en-GB.rc index 6a714ff0998..29b47c1b7de 100644 --- a/base/applications/mspaint/lang/en-GB.rc +++ b/base/applications/mspaint/lang/en-GB.rc @@ -139,6 +139,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/en-US.rc b/base/applications/mspaint/lang/en-US.rc index 029eaa11384..9119010ce53 100644 --- a/base/applications/mspaint/lang/en-US.rc +++ b/base/applications/mspaint/lang/en-US.rc @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/es-ES.rc b/base/applications/mspaint/lang/es-ES.rc index 5ad11ac1f2c..6af66999fea 100644 --- a/base/applications/mspaint/lang/es-ES.rc +++ b/base/applications/mspaint/lang/es-ES.rc @@ -142,6 +142,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/et-EE.rc b/base/applications/mspaint/lang/et-EE.rc index 6103e1608cb..c6fef7bb171 100644 --- a/base/applications/mspaint/lang/et-EE.rc +++ b/base/applications/mspaint/lang/et-EE.rc @@ -139,6 +139,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/eu-ES.rc b/base/applications/mspaint/lang/eu-ES.rc index 3340d338c46..fdda0e8edbd 100644 --- a/base/applications/mspaint/lang/eu-ES.rc +++ b/base/applications/mspaint/lang/eu-ES.rc @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/fr-FR.rc b/base/applications/mspaint/lang/fr-FR.rc index 6fb2dc383be..056a79f6f8e 100644 --- a/base/applications/mspaint/lang/fr-FR.rc +++ b/base/applications/mspaint/lang/fr-FR.rc @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/he-IL.rc b/base/applications/mspaint/lang/he-IL.rc index 1dff4387dc0..853dfb9852f 100644 --- a/base/applications/mspaint/lang/he-IL.rc +++ b/base/applications/mspaint/lang/he-IL.rc @@ -139,6 +139,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/hu-HU.rc b/base/applications/mspaint/lang/hu-HU.rc index ded0865a4d2..266ab21eeb2 100644 --- a/base/applications/mspaint/lang/hu-HU.rc +++ b/base/applications/mspaint/lang/hu-HU.rc @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/id-ID.rc b/base/applications/mspaint/lang/id-ID.rc index 3ae30e7f170..b03210330f4 100644 --- a/base/applications/mspaint/lang/id-ID.rc +++ b/base/applications/mspaint/lang/id-ID.rc @@ -139,6 +139,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/it-IT.rc b/base/applications/mspaint/lang/it-IT.rc index 9327ca498e5..6ef469f5923 100644 --- a/base/applications/mspaint/lang/it-IT.rc +++ b/base/applications/mspaint/lang/it-IT.rc @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/ja-JP.rc b/base/applications/mspaint/lang/ja-JP.rc index 5969044d5b4..5c41f90053b 100644 --- a/base/applications/mspaint/lang/ja-JP.rc +++ b/base/applications/mspaint/lang/ja-JP.rc @@ -141,6 +141,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/nl-NL.rc b/base/applications/mspaint/lang/nl-NL.rc index a6c32b7e7ab..de8539ebfc3 100644 --- a/base/applications/mspaint/lang/nl-NL.rc +++ b/base/applications/mspaint/lang/nl-NL.rc @@ -139,6 +139,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/no-NO.rc b/base/applications/mspaint/lang/no-NO.rc index 4c4f0398db5..001ca09b9f2 100644 --- a/base/applications/mspaint/lang/no-NO.rc +++ b/base/applications/mspaint/lang/no-NO.rc @@ -139,6 +139,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/pl-PL.rc b/base/applications/mspaint/lang/pl-PL.rc index d29933dd321..0f9b0076a7a 100644 --- a/base/applications/mspaint/lang/pl-PL.rc +++ b/base/applications/mspaint/lang/pl-PL.rc @@ -142,6 +142,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/pt-BR.rc b/base/applications/mspaint/lang/pt-BR.rc index c178150a2a5..be53b2cc1b4 100644 --- a/base/applications/mspaint/lang/pt-BR.rc +++ b/base/applications/mspaint/lang/pt-BR.rc @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/pt-PT.rc b/base/applications/mspaint/lang/pt-PT.rc index 155c6b3e9a2..f4b9638e03e 100644 --- a/base/applications/mspaint/lang/pt-PT.rc +++ b/base/applications/mspaint/lang/pt-PT.rc @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/ro-RO.rc b/base/applications/mspaint/lang/ro-RO.rc index b74925b6523..274c14a28ea 100644 --- a/base/applications/mspaint/lang/ro-RO.rc +++ b/base/applications/mspaint/lang/ro-RO.rc @@ -141,6 +141,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/ru-RU.rc b/base/applications/mspaint/lang/ru-RU.rc index 05bfa15efc9..964453968e6 100644 --- a/base/applications/mspaint/lang/ru-RU.rc +++ b/base/applications/mspaint/lang/ru-RU.rc @@ -143,6 +143,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/sk-SK.rc b/base/applications/mspaint/lang/sk-SK.rc index ab02f98cf27..5fa46a01124 100644 --- a/base/applications/mspaint/lang/sk-SK.rc +++ b/base/applications/mspaint/lang/sk-SK.rc @@ -139,6 +139,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/sq-AL.rc b/base/applications/mspaint/lang/sq-AL.rc index e19521d570e..5da01332cd3 100644 --- a/base/applications/mspaint/lang/sq-AL.rc +++ b/base/applications/mspaint/lang/sq-AL.rc @@ -139,6 +139,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/sv-SE.rc b/base/applications/mspaint/lang/sv-SE.rc index cdfc04e71a3..ec2f3205a74 100644 --- a/base/applications/mspaint/lang/sv-SE.rc +++ b/base/applications/mspaint/lang/sv-SE.rc @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/tr-TR.rc b/base/applications/mspaint/lang/tr-TR.rc index de836e273e4..b7768297a36 100644 --- a/base/applications/mspaint/lang/tr-TR.rc +++ b/base/applications/mspaint/lang/tr-TR.rc @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/uk-UA.rc b/base/applications/mspaint/lang/uk-UA.rc index e50eb7b1877..e54a662e1fe 100644 --- a/base/applications/mspaint/lang/uk-UA.rc +++ b/base/applications/mspaint/lang/uk-UA.rc @@ -141,6 +141,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/vi-VN.rc b/base/applications/mspaint/lang/vi-VN.rc index 07cc7fa0ae0..cebeb1d53cc 100644 --- a/base/applications/mspaint/lang/vi-VN.rc +++ b/base/applications/mspaint/lang/vi-VN.rc @@ -139,6 +139,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/zh-CN.rc b/base/applications/mspaint/lang/zh-CN.rc index 6a5e2d6349e..962479ab51f 100644 --- a/base/applications/mspaint/lang/zh-CN.rc +++ b/base/applications/mspaint/lang/zh-CN.rc @@ -142,6 +142,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/zh-HK.rc b/base/applications/mspaint/lang/zh-HK.rc index f3429ab9c1f..65dd0e96eb3 100644 --- a/base/applications/mspaint/lang/zh-HK.rc +++ b/base/applications/mspaint/lang/zh-HK.rc @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/zh-TW.rc b/base/applications/mspaint/lang/zh-TW.rc index 953bf47b481..f08299a24f1 100644 --- a/base/applications/mspaint/lang/zh-TW.rc +++ b/base/applications/mspaint/lang/zh-TW.rc @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index f6cb9e2ac22..f896ccd84f3 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -199,6 +199,11 @@ struct FreeSelTool : ToolBase selectionModel.HideSelection(); ToolBase::OnCancelDraw(); } + + void OnSpecialTweak(BOOL bMinus) override + { + selectionModel.StretchSelection(bMinus); + } }; // TOOL_RECTSEL @@ -280,6 +285,11 @@ struct RectSelTool : ToolBase selectionModel.HideSelection(); ToolBase::OnCancelDraw(); } + + void OnSpecialTweak(BOOL bMinus) override + { + selectionModel.StretchSelection(bMinus); + } }; struct TwoPointDrawTool : ToolBase diff --git a/base/applications/mspaint/resource.h b/base/applications/mspaint/resource.h index 310554de200..b41486cee4d 100644 --- a/base/applications/mspaint/resource.h +++ b/base/applications/mspaint/resource.h @@ -102,6 +102,9 @@ #define IDM_UNDERLINE 282 #define IDM_VERTICAL 283 +#define IDM_CTRL_PLUS 290 +#define IDM_CTRL_MINUS 291 + /* the following 16 numbers need to be in order, increasing by 1 */ #define ID_FREESEL 600 #define ID_RECTSEL 601 diff --git a/base/applications/mspaint/selectionmodel.cpp b/base/applications/mspaint/selectionmodel.cpp index b46a72263b9..c768c360744 100644 --- a/base/applications/mspaint/selectionmodel.cpp +++ b/base/applications/mspaint/selectionmodel.cpp @@ -28,8 +28,8 @@ SelectionModel::SelectionModel() SelectionModel::~SelectionModel() { - ClearColor(); - ClearMask(); + ClearColorImage(); + ClearMaskImage(); ResetPtStack(); } @@ -85,7 +85,7 @@ void SelectionModel::BuildMaskFromPtStack() m_rc = m_rcOld = rc; - ClearMask(); + ClearMaskImage(); ShiftPtStack(-m_rcOld.left, -m_rcOld.top); @@ -154,7 +154,7 @@ void SelectionModel::DrawSelection(HDC hDCImage, COLORREF crBg, BOOL bBgTranspar void SelectionModel::GetSelectionContents(HDC hDCImage) { - ClearColor(); + ClearColorImage(); HDC hMemDC = ::CreateCompatibleDC(NULL); m_hbmColor = CreateColorDIB(m_rc.Width(), m_rc.Height(), RGB(255, 255, 255)); @@ -174,12 +174,17 @@ BOOL SelectionModel::TakeOff() if (!IsLanded() || ::IsRectEmpty(&m_rc)) return FALSE; + // The background color is needed for transparency of selection m_rgbBack = paletteModel.GetBgColor(); + + // Get the contents of the selection area GetSelectionContents(imageModel.GetDC()); + // RectSel doesn't need the mask image if (toolsModel.GetActiveTool() == TOOL_RECTSEL) - ClearMask(); + ClearMaskImage(); + // Save the selection area m_rcOld = m_rc; imageModel.NotifyImageChanged(); @@ -225,7 +230,7 @@ void SelectionModel::InsertFromHBITMAP(HBITMAP hbmColor, INT x, INT y, HBITMAP h } else { - ClearMask(); + ClearMaskImage(); } NotifyContentChanged(); @@ -458,7 +463,7 @@ void SelectionModel::Dragging(HITTEST hit, POINT pt) m_ptHit = pt; } -void SelectionModel::ClearMask() +void SelectionModel::ClearMaskImage() { if (m_hbmMask) { @@ -467,7 +472,7 @@ void SelectionModel::ClearMask() } } -void SelectionModel::ClearColor() +void SelectionModel::ClearColorImage() { if (m_hbmColor) { @@ -479,8 +484,8 @@ void SelectionModel::ClearColor() void SelectionModel::HideSelection() { m_bShow = m_bContentChanged = FALSE; - ClearColor(); - ClearMask(); + ClearColorImage(); + ClearMaskImage(); ::SetRectEmpty(&m_rc); ::SetRectEmpty(&m_rcOld); imageModel.NotifyImageChanged(); @@ -540,3 +545,26 @@ void SelectionModel::UnlockBitmap(HBITMAP hbmLocked) { m_hbmColor = hbmLocked; } + +void SelectionModel::StretchSelection(BOOL bShrink) +{ + if (!m_bShow) + return; + + TakeOff(); + + INT cx = m_rc.Width(), cy = m_rc.Height(); + + if (bShrink) + m_rc.InflateRect(-cx / 4, -cy / 4); + else + m_rc.InflateRect(+cx / 2, +cy / 2); + + // The selection area must exist there + if (m_rc.Width() <= 0) + m_rc.right = m_rc.left + 1; + if (m_rc.Height() <= 0) + m_rc.bottom = m_rc.top + 1; + + imageModel.NotifyImageChanged(); +} diff --git a/base/applications/mspaint/selectionmodel.h b/base/applications/mspaint/selectionmodel.h index febc6072263..1d0c1b28614 100644 --- a/base/applications/mspaint/selectionmodel.h +++ b/base/applications/mspaint/selectionmodel.h @@ -58,10 +58,12 @@ public: void InvertSelection(); void Dragging(HITTEST hit, POINT pt); - void ClearMask(); - void ClearColor(); + void ClearMaskImage(); + void ClearColorImage(); void NotifyContentChanged(); + void StretchSelection(BOOL bShrink); + private: SelectionModel(const SelectionModel&); SelectionModel& operator=(const SelectionModel&); diff --git a/base/applications/mspaint/toolsmodel.cpp b/base/applications/mspaint/toolsmodel.cpp index 604d4bead54..b9a5ac2e4b6 100644 --- a/base/applications/mspaint/toolsmodel.cpp +++ b/base/applications/mspaint/toolsmodel.cpp @@ -248,3 +248,8 @@ void ToolsModel::selectAll() OnMouseMove(TRUE, imageModel.GetWidth(), imageModel.GetHeight()); OnButtonUp(TRUE, imageModel.GetWidth(), imageModel.GetHeight()); } + +void ToolsModel::SpecialTweak(BOOL bMinus) +{ + m_pToolObject->OnSpecialTweak(bMinus); +} diff --git a/base/applications/mspaint/toolsmodel.h b/base/applications/mspaint/toolsmodel.h index a00e8682a5f..33335c07ffd 100644 --- a/base/applications/mspaint/toolsmodel.h +++ b/base/applications/mspaint/toolsmodel.h @@ -51,6 +51,8 @@ struct ToolBase virtual void OnDrawOverlayOnImage(HDC hdc) { } virtual void OnDrawOverlayOnCanvas(HDC hdc) { } + virtual void OnSpecialTweak(BOOL bMinus) { } + void beginEvent(); void endEvent(); void reset(); @@ -115,6 +117,8 @@ public: void NotifyToolChanged(); void NotifyToolSettingsChanged(); void NotifyZoomChanged(); + + void SpecialTweak(BOOL bMinus); }; extern ToolsModel toolsModel; diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 130c81ebbd9..99658fccd52 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -1069,6 +1069,13 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH fullscreenWindow.DoCreate(); fullscreenWindow.ShowWindow(SW_SHOWMAXIMIZED); break; + + case IDM_CTRL_PLUS: + toolsModel.SpecialTweak(FALSE); + break; + case IDM_CTRL_MINUS: + toolsModel.SpecialTweak(TRUE); + break; } return 0; }

1 0

[reactos] 01/01: [MSPAINT] Don't show error message twice (#5715)
by Katayama Hirofumi MZ 22 Sep '23

22 Sep '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bbb33a6ed52e9adf4af07… commit bbb33a6ed52e9adf4af07f7d3cfdd74baa76bfbb Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Sep 22 10:48:13 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Sep 22 10:48:13 2023 +0900 [MSPAINT] Don't show error message twice (#5715) - Reduce display of error message on IDM_EDITCOPYTO and IDM_EDITPASTEFROM. - Introduce LockBitmap/UnlockBitmap mechanism for ImageModel and SelectionModel. CORE-19181, CORE-19182 --- base/applications/mspaint/history.cpp | 34 ++++++++++++++++++++-------- base/applications/mspaint/history.h | 2 ++ base/applications/mspaint/main.cpp | 6 ++--- base/applications/mspaint/selectionmodel.cpp | 12 ++++++++++ base/applications/mspaint/selectionmodel.h | 2 ++ base/applications/mspaint/winproc.cpp | 18 ++++++--------- 6 files changed, 50 insertions(+), 24 deletions(-) diff --git a/base/applications/mspaint/history.cpp b/base/applications/mspaint/history.cpp index 4451b06f927..e44eca7dc4d 100644 --- a/base/applications/mspaint/history.cpp +++ b/base/applications/mspaint/history.cpp @@ -261,27 +261,41 @@ void ImageModel::Clamp(POINT& pt) const HBITMAP ImageModel::CopyBitmap() { - // NOTE: An app cannot select a bitmap into more than one device context at a time. - ::SelectObject(m_hDrawingDC, m_hbmOld); // De-select - HBITMAP ret = CopyDIBImage(m_hBms[m_currInd]); - m_hbmOld = ::SelectObject(m_hDrawingDC, m_hBms[m_currInd]); // Re-select + HBITMAP hBitmap = LockBitmap(); + HBITMAP ret = CopyDIBImage(hBitmap); + UnlockBitmap(hBitmap); return ret; } BOOL ImageModel::IsBlackAndWhite() { - ::SelectObject(m_hDrawingDC, m_hbmOld); // De-select - BOOL bBlackAndWhite = IsBitmapBlackAndWhite(m_hBms[m_currInd]); - m_hbmOld = ::SelectObject(m_hDrawingDC, m_hBms[m_currInd]); // Re-select + HBITMAP hBitmap = LockBitmap(); + BOOL bBlackAndWhite = IsBitmapBlackAndWhite(hBitmap); + UnlockBitmap(hBitmap); return bBlackAndWhite; } void ImageModel::PushBlackAndWhite() { - ::SelectObject(m_hDrawingDC, m_hbmOld); // De-select - HBITMAP hNewBitmap = ConvertToBlackAndWhite(m_hBms[m_currInd]); - m_hbmOld = ::SelectObject(m_hDrawingDC, m_hBms[m_currInd]); // Re-select + HBITMAP hBitmap = LockBitmap(); + HBITMAP hNewBitmap = ConvertToBlackAndWhite(hBitmap); + UnlockBitmap(hBitmap); if (hNewBitmap) PushImageForUndo(hNewBitmap); } + +HBITMAP ImageModel::LockBitmap() +{ + // NOTE: An app cannot select a bitmap into more than one device context at a time. + ::SelectObject(m_hDrawingDC, m_hbmOld); // De-select + HBITMAP hbmLocked = m_hBms[m_currInd]; + m_hBms[m_currInd] = NULL; + return hbmLocked; +} + +void ImageModel::UnlockBitmap(HBITMAP hbmLocked) +{ + m_hBms[m_currInd] = hbmLocked; + m_hbmOld = ::SelectObject(m_hDrawingDC, hbmLocked); // Re-select +} diff --git a/base/applications/mspaint/history.h b/base/applications/mspaint/history.h index 5bee4105240..fb369dff72c 100644 --- a/base/applications/mspaint/history.h +++ b/base/applications/mspaint/history.h @@ -31,6 +31,8 @@ public: int GetWidth() const; int GetHeight() const; HBITMAP CopyBitmap(); + HBITMAP LockBitmap(); + void UnlockBitmap(HBITMAP hbmLocked); void InvertColors(); void FlipHorizontally(); void FlipVertically(); diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index ba7ad18c213..dda9db7618e 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -117,9 +117,9 @@ BOOL OpenMailer(HWND hWnd, LPCWSTR pszPathName) strFileTitle += L".png"; // Save it to the temporary file - HBITMAP hbm = imageModel.CopyBitmap(); - BOOL ret = SaveDIBToFile(hbm, g_szMailTempFile, FALSE, Gdiplus::ImageFormatPNG); - ::DeleteObject(hbm); + HBITMAP hbmLocked = imageModel.LockBitmap(); + BOOL ret = SaveDIBToFile(hbmLocked, g_szMailTempFile, FALSE, Gdiplus::ImageFormatPNG); + imageModel.UnlockBitmap(hbmLocked); if (!ret) { g_szMailTempFile[0] = UNICODE_NULL; diff --git a/base/applications/mspaint/selectionmodel.cpp b/base/applications/mspaint/selectionmodel.cpp index a5e81d5c41a..b46a72263b9 100644 --- a/base/applications/mspaint/selectionmodel.cpp +++ b/base/applications/mspaint/selectionmodel.cpp @@ -528,3 +528,15 @@ void SelectionModel::SwapWidthAndHeight() m_rc.right = m_rc.left + cy; m_rc.bottom = m_rc.top + cx; } + +HBITMAP SelectionModel::LockBitmap() +{ + HBITMAP hbm = m_hbmColor; + m_hbmColor = NULL; + return hbm; +} + +void SelectionModel::UnlockBitmap(HBITMAP hbmLocked) +{ + m_hbmColor = hbmLocked; +} diff --git a/base/applications/mspaint/selectionmodel.h b/base/applications/mspaint/selectionmodel.h index b47a0d40821..febc6072263 100644 --- a/base/applications/mspaint/selectionmodel.h +++ b/base/applications/mspaint/selectionmodel.h @@ -40,6 +40,8 @@ public: void DeleteSelection(); HBITMAP CopyBitmap(); + HBITMAP LockBitmap(); + void UnlockBitmap(HBITMAP hbmLocked); void GetSelectionContents(HDC hDCImage); void DrawFramePoly(HDC hDCImage); void DrawBackground(HDC hDCImage); diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 8f9e0ca9b31..130c81ebbd9 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -741,13 +741,13 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH selectionModel.TakeOff(); { - HBITMAP hbm = selectionModel.CopyBitmap(); - if (hbm) + HBITMAP hbmLocked = selectionModel.LockBitmap(); + if (hbmLocked) { - HGLOBAL hGlobal = BitmapToClipboardDIB(hbm); + HGLOBAL hGlobal = BitmapToClipboardDIB(hbmLocked); if (hGlobal) ::SetClipboardData(CF_DIB, hGlobal); - ::DeleteObject(hbm); + selectionModel.UnlockBitmap(hbmLocked); } } @@ -865,10 +865,9 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH WCHAR szFileName[MAX_LONG_PATH] = L"*.png"; if (GetSaveFileName(szFileName, _countof(szFileName))) { - HBITMAP hbm = selectionModel.CopyBitmap(); - if (!SaveDIBToFile(hbm, szFileName, FALSE)) - ShowError(IDS_SAVEERROR, szFileName); - ::DeleteObject(hbm); + HBITMAP hbmLocked = selectionModel.LockBitmap(); + SaveDIBToFile(hbmLocked, szFileName, FALSE); + selectionModel.UnlockBitmap(hbmLocked); } break; } @@ -880,8 +879,6 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH HBITMAP hbmNew = DoLoadImageFile(m_hWnd, szFileName, FALSE); if (hbmNew) InsertSelectionFromHBITMAP(hbmNew, m_hWnd); - else - ShowError(IDS_LOADERRORTEXT, szFileName); } break; } @@ -1008,7 +1005,6 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH imageModel.PushImageForUndo(selectionModel.CopyBitmap()); selectionModel.HideSelection(); break; - case IDM_VIEWTOOLBOX: registrySettings.ShowToolBox = !toolBoxContainer.IsWindowVisible(); toolBoxContainer.ShowWindow(registrySettings.ShowToolBox ? SW_SHOWNOACTIVATE : SW_HIDE);

1 0

[reactos] 01/01: [MSPAINT] Don't copy bits on resizing (#5716)
by Katayama Hirofumi MZ 21 Sep '23

21 Sep '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=98050f91390e1fc6f7034… commit 98050f91390e1fc6f7034c0033c44a66f1fd9f6e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Sep 22 07:35:03 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Sep 22 07:35:03 2023 +0900 [MSPAINT] Don't copy bits on resizing (#5716) - Fix the graphical glitches on resizing and moving toolbars. - Add SWP_NOCOPYBITS flag on positioning controls on resizing of main window. CORE-19137 --- base/applications/mspaint/winproc.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 8a6e259b12f..8f9e0ca9b31 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -77,6 +77,7 @@ void CMainWindow::alignChildrenToMainWindow() RECT clientRect, rc; GetClientRect(&clientRect); RECT rcSpace = clientRect; + const UINT uFlags = (SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREPOSITION | SWP_NOCOPYBITS); if (::IsWindowVisible(g_hStatusBar)) { @@ -93,7 +94,7 @@ void CMainWindow::alignChildrenToMainWindow() hDWP = ::DeferWindowPos(hDWP, toolBoxContainer, NULL, rcSpace.right - CX_TOOLBAR, rcSpace.top, CX_TOOLBAR, rcSpace.bottom - rcSpace.top, - SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREPOSITION); + uFlags); rcSpace.right -= CX_TOOLBAR; } else @@ -101,7 +102,7 @@ void CMainWindow::alignChildrenToMainWindow() hDWP = ::DeferWindowPos(hDWP, toolBoxContainer, NULL, rcSpace.left, rcSpace.top, CX_TOOLBAR, rcSpace.bottom - rcSpace.top, - SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREPOSITION); + uFlags); rcSpace.left += CX_TOOLBAR; } } @@ -113,7 +114,7 @@ void CMainWindow::alignChildrenToMainWindow() hDWP = ::DeferWindowPos(hDWP, paletteWindow, NULL, rcSpace.left, rcSpace.bottom - CY_PALETTE, rcSpace.right - rcSpace.left, CY_PALETTE, - SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREPOSITION); + uFlags); rcSpace.bottom -= CY_PALETTE; } else @@ -121,7 +122,7 @@ void CMainWindow::alignChildrenToMainWindow() hDWP = ::DeferWindowPos(hDWP, paletteWindow, NULL, rcSpace.left, rcSpace.top, rcSpace.right - rcSpace.left, CY_PALETTE, - SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREPOSITION); + uFlags); rcSpace.top += CY_PALETTE; } } @@ -131,7 +132,7 @@ void CMainWindow::alignChildrenToMainWindow() hDWP = ::DeferWindowPos(hDWP, canvasWindow, NULL, rcSpace.left, rcSpace.top, rcSpace.right - rcSpace.left, rcSpace.bottom - rcSpace.top, - SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREPOSITION); + uFlags); } ::EndDeferWindowPos(hDWP);

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